diff --git a/.github/workflows/build-toolchains.yml b/.github/workflows/build-toolchains.yml index da90cfa39e..6718307971 100644 --- a/.github/workflows/build-toolchains.yml +++ b/.github/workflows/build-toolchains.yml @@ -19,25 +19,26 @@ jobs: runs-on: ${{ matrix.host }} strategy: matrix: - host: ["ubuntu-22.04", "macos-12"] + # host: ["ubuntu-22.04", "macos-14"] + host: ["ubuntu-22.04"] sample: ${{ fromJSON(inputs.samples) }} exclude: # Exclude both glibc & uClibc ARC Linux toolchains as # there's no known use of ARC Linux toolchains on Mac, # and anyway glibc fails to build for ARC700, # see https://github.com/crosstool-ng/crosstool-ng/pull/1456#issuecomment-779150246 - - {host: "macos-12", sample: "arc-multilib-linux-gnu"} - - {host: "macos-12", sample: "arc-multilib-linux-uclibc"} + - {host: "macos-14", sample: "arc-multilib-linux-gnu"} + - {host: "macos-14", sample: "arc-multilib-linux-uclibc"} # Exclude mips*-*-linux-gnu because of usage in # elf-entry.c for linux kernel headers. is a GNU # extension and doesn't exist on MacOS X - - {host: "macos-12", sample: "mips-unknown-linux-gnu"} - - {host: "macos-12", sample: "mips64-unknown-linux-gnu"} + - {host: "macos-14", sample: "mips-unknown-linux-gnu"} + - {host: "macos-14", sample: "mips64-unknown-linux-gnu"} # Exclude x86_64-w64-mingw32,x86_64-pc-linux-gnu because it crashes on m4 build with # a Segmentation fault - - {host: "macos-12", sample: "x86_64-w64-mingw32,x86_64-pc-linux-gnu"} + - {host: "macos-14", sample: "x86_64-w64-mingw32,x86_64-pc-linux-gnu"} steps: - name: create case sensitive workspace volume for macOS if: ${{ runner.os == 'macOS' }} @@ -72,7 +73,7 @@ jobs: if: ${{ runner.os == 'macOS' }} run: | brew install autoconf automake bash binutils gawk gnu-sed \ - gnu-tar help2man make ncurses pkg-config texinfo libtool + gnu-tar help2man make meson ncurses ninja pkg-config texinfo libtool echo "${{ github.workspace }}/.local/bin" >> "$GITHUB_PATH" - name: download x86_64-w64-mingw32.${{ matrix.host }} tarball if: ${{ inputs.canadian-cross }} @@ -94,7 +95,7 @@ jobs: sed -i -e '/CT_LOCAL_TARBALLS_DIR/s/HOME/CT_TOP_DIR/' .config sed -i -e '/CT_PREFIX_DIR/s/HOME/CT_TOP_DIR/' .config sed -i -e '/CT_GLIBC_ENABLE_DEBUG/s/y$/n/' .config - test ${{ matrix.host }} = "macos-12" && sed -i -e '/CT_GDB_CROSS_PYTHON/s/y$/n/' .config + test ${{ matrix.host }} = "macos-14" && sed -i -e '/CT_GDB_CROSS_PYTHON/s/y$/n/' .config ct-ng build - name: create ${{ matrix.sample }}.${{ matrix.host }} tarball if: ${{ matrix.sample == 'x86_64-w64-mingw32' }} diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index c25a721b71..bf6d65afaf 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -10,7 +10,8 @@ jobs: runs-on: ${{ matrix.host }} strategy: matrix: - host: ["ubuntu-22.04", "macos-12"] + # host: ["ubuntu-22.04", "macos-14"] + host: ["ubuntu-22.04"] steps: - name: "clone" uses: actions/checkout@v4 @@ -22,7 +23,7 @@ jobs: if: ${{ runner.os == 'macOS' }} run: | brew install autoconf automake bash binutils gawk gnu-sed \ - gnu-tar help2man make ncurses texinfo libtool + gnu-tar help2man libtool make meson ncurses ninja texinfo - name: "build ct-ng" run: | if [ "$RUNNER_OS" == "macOS" ]; then @@ -85,7 +86,7 @@ jobs: - name: "ct-ng source" run: | mkdir -p src - for sample in aarch64-unknown-linux-gnu arm-picolibc-eabi \ + for sample in aarch64-unknown-linux-gnu arm-none-eabi \ arm-unknown-linux-musleabi armv6-nommu-linux-uclibcgnueabi \ x86_64-w64-mingw32; do \ ct-ng $sample; \ @@ -95,6 +96,7 @@ jobs: sed -i -e 's/^.*CT_COMP_TOOLS_BISON.*$/CT_COMP_TOOLS_BISON=y/' .config; \ sed -i -e 's/^.*CT_COMP_TOOLS_M4.*$/CT_COMP_TOOLS_M4=y/' .config; \ sed -i -e 's/^.*CT_COMP_TOOLS_MAKE.*$/CT_COMP_TOOLS_MAKE=y/' .config; \ + sed -i -e 's/^.*CT_DOWNLOAD_WGET_OPTIONS.*$/CT_DOWNLOAD_WGET_OPTIONS="--tries=3 -nc --progress=dot:binary --no-use-server-timestamps"/' .config; \ ct-ng olddefconfig; \ ct-ng source; \ done @@ -129,6 +131,7 @@ jobs: "powerpc64-unknown-linux-musl", "riscv32-unknown-elf", "riscv64-unknown-elf", + "riscv64-unknown-linux-gnu", "s390-unknown-linux-gnu", "sh-unknown-elf", "sparc-unknown-linux-gnu", diff --git a/Makefile.am b/Makefile.am index 6f21739d63..caf266792d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,7 +65,7 @@ bash-completion/ct-ng: bash-completion/ct-ng.in Makefile # Also, lintian is picky about execute-bit on the scripts install-data-hook: rm -f $(DESTDIR)$(man1dir)/$(ctng_progname).1.gz - gzip -9 $(DESTDIR)$(man1dir)/$(ctng_progname).1 + gzip -n -9 $(DESTDIR)$(man1dir)/$(ctng_progname).1 chmod a+x $(DESTDIR)$(pkgdatadir)/scripts/config.guess chmod a+x $(DESTDIR)$(pkgdatadir)/scripts/config.sub rm -f $(DESTDIR)$(pkgdatadir)/LICENSE diff --git a/README.md b/README.md index 1320c0712c..41233dd739 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,7 @@ Crosstool-NG aims at building toolchains. Toolchains are an essential component Refer to [documentation at crosstool-NG website](http://crosstool-ng.github.io/docs/) for more information on how to configure, install and use crosstool-NG. -**Note 1:** If you elect to build a uClibc-based toolchain, you will have to prepare a config file for uClibc with <= crosstool-NG-1.21.0. In >= crosstool-NG-1.22.0 you only need to prepare a config file for uClibc(or uClibc-ng) if you really need a custom config for uClibc. - -**Note 2:** If you call `ct-ng --help` you will get help for `make(2)`. This is because ct-ng is in fact a `make(2)` script. There is no clean workaround for this. +**Note:** If you call `ct-ng --help` you will get help for `make(2)`. This is because ct-ng is in fact a `make(2)` script. There is no clean workaround for this. ## Repository layout diff --git a/config/arch/bpf.in b/config/arch/bpf.in index 9d0d7373dd..75cae2afad 100644 --- a/config/arch/bpf.in +++ b/config/arch/bpf.in @@ -3,7 +3,7 @@ ## no-package ## select ARCH_SUPPORTS_EITHER_ENDIAN ## select ARCH_DEFAULT_LE -## select GCC_VERY_NEW -## select BINUTILS_VERY_NEW +## select GCC_REQUIRE_12_or_later +## select BINUTILS_REQUIRE_2_41_or_later ## ## help The BPF architecture. diff --git a/config/arch/lm32.in b/config/arch/lm32.in new file mode 100644 index 0000000000..a2ae3b2d9d --- /dev/null +++ b/config/arch/lm32.in @@ -0,0 +1,10 @@ +# LatticeMico32 soft-core architecture + +## no-package +## select ARCH_SUPPORTS_32 +## select ARCH_DEFAULT_32 +## select ARCH_DEFAULT_BE +## depends on EXPERIMENTAL + +## help The LatticeMico32 soft-core architecture: +## help https://www.latticesemi.com/en/Products/DesignSoftwareAndIP/IntellectualProperty/IPCore/IPCores02/LatticeMico32.aspx diff --git a/config/arch/nios2.in b/config/arch/nios2.in index de28246f13..b5ebedb537 100644 --- a/config/arch/nios2.in +++ b/config/arch/nios2.in @@ -7,6 +7,10 @@ ## select ARCH_DEFAULT_LE ## select ARCH_SUPPORTS_WITH_ARCH ## select ARCH_SUPPORTS_FLAT_FORMAT +## select GCC_REQUIRE_older_than_15 +## select GDB_REQUIRE_older_than_16 if DEBUG_GDB +## select GLIBC_REQUIRE_older_than_2_41 if LIBC_GLIBC +## select BINUTILS_REQUIRE_older_than_2_44 ## ## help The NIOS2 architecture, as defined by: ## help http://www.altera.com diff --git a/config/arch/openrisc.in b/config/arch/openrisc.in new file mode 100644 index 0000000000..d4623ed17c --- /dev/null +++ b/config/arch/openrisc.in @@ -0,0 +1,13 @@ +# OpenRISC specific configuration file + +## no-package +## select ARCH_SUPPORTS_32 +## select ARCH_DEFAULT_32 +## select ARCH_SUPPORTS_BOTH_MMU +## select ARCH_DEFAULT_BE +## select ARCH_SUPPORTS_WITH_ARCH +## select ARCH_SUPPORTS_FLAT_FORMAT +## depends on EXPERIMENTAL +## +## help The OpenRISC architecture +## help https://openrisc.io/ diff --git a/config/arch/rx.in b/config/arch/rx.in new file mode 100644 index 0000000000..6e58d6280b --- /dev/null +++ b/config/arch/rx.in @@ -0,0 +1,11 @@ +## no-package +## select ARCH_SUPPORTS_32 +## select ARCH_DEFAULT_32 +## select ARCH_SUPPORTS_FLAT_FORMAT +## select ARCH_SUPPORTS_EITHER_ENDIAN +## select ARCH_DEFAULT_LE +## select ARCH_REQUIRES_MULTILIB +## select ARCH_SUPPORTS_WITH_ENDIAN + +## help The RX architecture, as defined by: +## help https://www.renesas.com/en/products/microcontrollers-microprocessors/rx-32-bit-performance-efficiency-mcus diff --git a/config/arch/sh.in b/config/arch/sh.in index ff2ec14272..8ebdd74424 100644 --- a/config/arch/sh.in +++ b/config/arch/sh.in @@ -3,8 +3,6 @@ ## no-package ## select ARCH_SUPPORTS_32 ## select ARCH_DEFAULT_32 -## select ARCH_SUPPORTS_BOTH_MMU -## select ARCH_DEFAULT_HAS_MMU ## select ARCH_SUPPORTS_FLAT_FORMAT ## select ARCH_SUPPORTS_EITHER_ENDIAN ## select ARCH_DEFAULT_LE @@ -21,6 +19,8 @@ choice # GCC supports both endiannesses even if a specific CPU is selected (so long # as that CPU can be both BE/LE), but the binutils (or specifically, ld) # configures for both endiannesses only if sh-*-linux target is selected. +# --with-cpu can be used to set the mmu and precision options, +# so dont include the options aswell config ARCH_SH_SH bool prompt "unspecified" @@ -62,16 +62,45 @@ config ARCH_SH_SH4A bool prompt "sh4a" +config ARCH_SH_SH4AL + bool + prompt "sh4al" + endchoice config ARCH_SH_VARIANT string - default "sh" if ARCH_SH_SH + default "sh" if ARCH_SH_SH default "sh1" if ARCH_SH_SH1 default "sh2" if ARCH_SH_SH2 - default "sh2e" if ARCH_SH_SH2E - default "sh2a" if ARCH_SH_SH2A + default "sh2e" if ARCH_SH_SH2E + default "sh2a" if ARCH_SH_SH2A default "sh3" if ARCH_SH_SH3 - default "sh3e" if ARCH_SH_SH3E + default "sh3e" if ARCH_SH_SH3E default "sh4" if ARCH_SH_SH4 default "sh4a" if ARCH_SH_SH4A + default "sh4al" if ARCH_SH_SH4AL + +config ARCH_SH_ENABLE_FPU_OPTIONS + bool + default y if ARCH_SH_SH2A + default y if ARCH_SH_SH4 + default y if ARCH_SH_SH4A + select ARCH_SUPPORTS_BOTH_MMU + select ARCH_DEFAULT_HAS_MMU + +config ARCH_SH_ENABLE_PRECISION_OPTIONS + bool + default y if ARCH_USE_MMU + select ARCH_SUPPORTS_WITH_FLOATING_PRECISION + select ARCH_SUPPORTS_PRECISION_UNSPECIFIED + select ARCH_SUPPORTS_PRECISION_SINGLE_ONLY + select ARCH_SUPPORTS_PRECISION_SINGLE_WITH_DOUBLE + select ARCH_DEFAULT_PRECISION_UNSPECIFIED + +config ARCH_SH_FLOAT_SUFFIX + string + default "" if !ARCH_SH_ENABLE_FPU_OPTIONS + default "_nofpu" if !ARCH_USE_MMU + default "_single" if ARCH_FLOATING_PRECISION_SINGLE_WITH_DOUBLE + default "_single_only" if ARCH_FLOATING_PRECISION_SINGLE_ONLY diff --git a/config/arch/tricore.in b/config/arch/tricore.in new file mode 100644 index 0000000000..cff8ca63c9 --- /dev/null +++ b/config/arch/tricore.in @@ -0,0 +1,10 @@ +# tricore specific configuration file + +## no-package +## depends on EXPERIMENTAL +## +## select ARCH_SUPPORTS_32 +## select ARCH_SUPPORTS_BOTH_ENDIAN +## select ARCH_DEFAULT_LE +## select ARCH_SUPPORTS_FLAT_FORMAT + diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in index 4a91a8f7ab..623c594214 100644 --- a/config/binutils/binutils.in +++ b/config/binutils/binutils.in @@ -13,10 +13,16 @@ config BINUTILS_GOLD_SUPPORTS_ARCH default y if ARCH_SPARC default y if ARCH_X86 +# Support for gold was deprecated and removed from binutils 2.44. +config BINUTILS_HAS_GOLD + bool + default y if !BINUTILS_2_44_or_later + default y if !BINUTILS_SRC_RELEASE + config BINUTILS_GOLD_SUPPORT bool default y - depends on BINUTILS_GOLD_SUPPORTS_ARCH + depends on BINUTILS_GOLD_SUPPORTS_ARCH && BINUTILS_HAS_GOLD # Force using the BFD linker if needed. There are two options: # - For some C libraries (eg. glibc at least), BFD ld must be @@ -34,6 +40,11 @@ config BINUTILS_DEP_BISON depends on BINUTILS_2_39_or_later && !CONFIGURE_has_bison_3_0_4_or_newer && (ARCH_X86 || (ARCH_ARM && ARCH_64)) select COMP_TOOLS_BISON +if BINUTILS_2_44_or_later && BINUTILS_GOLD_SUPPORT && !BINUTILS_SRC_RELEASE +comment "WARNING! For binutils >= 2.44 only enable gold support if supplied" +comment "| through custom source tree." +endif + choice bool prompt "Linkers to enable" @@ -132,6 +143,7 @@ config BINUTILS_LINKER_DEFAULT config BINUTILS_PLUGINS bool prompt "Enable support for plugins" + depends on !STATIC_TOOLCHAIN help binutils can be extended through the use of plugins. Especially, gold can use the lto-plugin, as installed @@ -175,6 +187,14 @@ config BINUTILS_FOR_TARGET Some utilities may need binutils libraries to be available on the target, eg. oprofile. +config BINUTILS_GPROFNG + bool + prompt "Enable the gprofng profiler" + help + The next generation GNU application profiling tool + Disabled by default since it contains non-portable code + (i.e. requires glibc on the host) + if BINUTILS_FOR_TARGET config BINUTILS_FOR_TARGET_IBERTY diff --git a/config/cc/gcc.in b/config/cc/gcc.in index 6e6bb8283d..7928468c1e 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -53,15 +53,6 @@ config CC_GCC_ENABLE_CXX_FLAGS Note: just pass in the option _value_, that is only the part that goes after the '=' sign. -config CC_GCC_EXTRA_LIBSTDCXX - bool "Re-enable libstdcxx" - default n - depends on LIBC_AVR_LIBC - select CC_CORE_PASS_2_NEEDED - help - libstdcxx is normally disabled on avr systems due to size limitations. - Set this option to re-enable libstdcxx support. - config CC_GCC_CORE_EXTRA_CONFIG_ARRAY string "Core gcc extra config" default "" @@ -240,6 +231,48 @@ config CC_GCC_ENABLE_TARGET_OPTSPACE This will compile crossgcc's libs with -Os. +config CC_GCC_LIBSTDCXX + tristate "Build libstdcxx" + default n if ARCH_AVR || LIBC_NONE + default m + depends on CC_LANG_CXX + select CC_CORE_NEEDED if ARCH_AVR + help + libstdcxx is normally disabled on some systems, like avr, due to size + limitations or it being not supported. + Set this option to force libstdcxx support. + + Option | libstdcxx build | Associated ./configure switch + ---------+--------------------+-------------------------------- + Y | forcibly | --enable-libstdcxx + M | auto | (none, ./configure decides) + N | forcibly not | --disable-libstdcxx + +config CC_GCC_LIBSTDCXX_HOSTED_DISABLE + bool "Build freestanding libstdcxx" + default y if LIBC_AVR_LIBC + default n + depends on CC_GCC_LIBSTDCXX + help + libstdcxx can be compiled in two modes: hosted and freestanding. + Hosted mode is the default, and is used when the OS is available. + Freestanding mode is used when the OS is not available, like in + bare-metal systems. + + Some architectures, like avr, do not support hosted mode, but default + to it, and will fail to build libstdcxx in hosted mode. + + Answer 'y' here to force freestanding mode, otherwise answer let + ./configure decide. + +config CC_GCC_LIBSTDCXX_TARGET_CXXFLAGS + string + prompt "Target CXXFLAGS for libstdc++" + default "" + help + Used to add extra CXXFLAGS when compiling the target libstdc++ + library (e.g. -fno-exceptions). + config CC_GCC_LIBMUDFLAP bool prompt "Compile libmudflap" diff --git a/config/comp_libs/gmp.in b/config/comp_libs/gmp.in index f49d1a71e6..7baac528aa 100644 --- a/config/comp_libs/gmp.in +++ b/config/comp_libs/gmp.in @@ -1 +1,6 @@ # GMP options +config GMP_EXTRA_CFLAGS + string "extra target CFLAGS" + default "-std=gnu17" if GCC_15_or_later + help + Extra target CFLAGS to use when building. diff --git a/config/comp_libs/mpc.in b/config/comp_libs/mpc.in index 422935f0d0..2d948a7884 100644 --- a/config/comp_libs/mpc.in +++ b/config/comp_libs/mpc.in @@ -1,3 +1 @@ # MPC options -# MPC 1.0.x and earlier break with MPFR 4.0.0. -## select MPFR_REQUIRE_older_than_4_0_0 if MPFR_NEEDED && !MPC_1_1_0_or_later diff --git a/config/comp_libs/ncurses.in b/config/comp_libs/ncurses.in index 4e7e6d47ba..3d257439bc 100644 --- a/config/comp_libs/ncurses.in +++ b/config/comp_libs/ncurses.in @@ -55,3 +55,8 @@ config NCURSES_TARGET_FALLBACKS List of terminal descriptions that will be compiled into the curses library for the target. +config NCURSES_EXTRA_CFLAGS + string "extra target CFLAGS" + default "-std=gnu17" if GCC_15_or_later + help + Extra target CFLAGS fto use when building. diff --git a/config/comp_libs/picolibc.in b/config/comp_libs/picolibc.in index 4b283aecc7..c978c35b09 100644 --- a/config/comp_libs/picolibc.in +++ b/config/comp_libs/picolibc.in @@ -27,6 +27,14 @@ config LIBC_PICOLIBC_GCC_LIBSTDCXX the picolibc companion library. This version is linked when "--specs=picolibcpp.specs" is specified. +config LIBC_PICOLIBC_GCC_LIBSTDCXX_TARGET_CXXFLAGS + string + prompt "Target CXXFLAGS for libstdc++ picolibc variant" + default "" + help + Used to add extra CXXFLAGS when compiling the target libstdc++ + picolibc library (e.g. -fno-exceptions). + comment "Configuration for picolibc can be found under" comment "* -> C-library" comment "* -> picolibc" diff --git a/config/contrib/gcc-test-suite.in b/config/contrib/gcc-test-suite.in new file mode 100644 index 0000000000..6a4c876f64 --- /dev/null +++ b/config/contrib/gcc-test-suite.in @@ -0,0 +1,47 @@ +choice + bool "How to execute tests" + default TEST_SUITE_GCC_SSH + +config TEST_SUITE_GCC_SSH + bool "Run test suite on remote host" + help + Select this option to execute GCC tests on a remote host, + specified by TEST_SUITE_GCC_HOST. + +config TEST_SUITE_GCC_QEMU + bool "Run test suite using qemu" + help + Select this option to execute GCC tests using qemu on the local + host. + +endchoice + +config TEST_SUITE_GCC_TARGET_HOSTNAME + string "Remote host to execute GCC tests" + default "127.0.0.1" + depends on TEST_SUITE_GCC_SSH + help + Set this to the remote host name where gcc tests will be run. + +config TEST_SUITE_GCC_TARGET_USERNAME + string "Username on remote host" + default "root" + depends on TEST_SUITE_GCC_SSH + help + Set this to the username on the remote hosts for GCC tests. + +config TEST_SUITE_GCC_QEMU_PROGRAM + string "Qemu program" + depends on TEST_SUITE_GCC_QEMU + help + Specifies the qemu program name. If unset, this will be "qemu-" + followed by the first component of the target name. + +config TEST_SUITE_GCC_QEMU_ARGS + string "Qemu program args" + depends on TEST_SUITE_GCC_QEMU + default "-L @SYSROOT@" + help + Specifies any arguments needed by qemu before the executable + filename. If unset, this will be "-L" followed by the path to + the sysroot in the installed toolchain. diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in index 61f5531d37..cdea71977a 100644 --- a/config/debug/ltrace.in +++ b/config/debug/ltrace.in @@ -1,5 +1,6 @@ # ltrace +## depends on ! BARE_METAL ## select LIBELF_TARGET ## ## help ltrace is a program that simply runs the specified command until it exits. diff --git a/config/global/download.in b/config/global/download.in index 57f42e6fd3..9a4d6cecda 100644 --- a/config/global/download.in +++ b/config/global/download.in @@ -67,7 +67,7 @@ if DOWNLOAD_AGENT_WGET config DOWNLOAD_WGET_OPTIONS string "Extra options to wget" - default "--passive-ftp --tries=3 -nc --progress=dot:binary" + default "--tries=3 -nc --progress=dot:binary" endif diff --git a/config/kernel/linux.in b/config/kernel/linux.in index 0f85ff89a8..6e929c23c9 100644 --- a/config/kernel/linux.in +++ b/config/kernel/linux.in @@ -1,6 +1,6 @@ # Linux kernel options -## depends on !ARCH_AVR && !ARCH_MSP430 && !ARCH_MOXIE && !ARCH_PRU +## depends on !ARCH_AVR && !ARCH_LM32 && !ARCH_MSP430 && !ARCH_MOXIE && !ARCH_PRU ## select KERNEL_SUPPORTS_SHARED_LIBS ## help Build a toolchain targeting systems running Linux as a kernel. diff --git a/config/kernel/windows.in b/config/kernel/windows.in index 66275cc4c1..8bb2881291 100644 --- a/config/kernel/windows.in +++ b/config/kernel/windows.in @@ -1,7 +1,7 @@ # windows config options ## no-package -## depends on ARCH_X86 +## depends on ARCH_X86 || (ARCH_ARM && ARCH_64) ## depends on EXPERIMENTAL ## ## select WINDOWS diff --git a/config/libc/glibc.in b/config/libc/glibc.in index 06709b4cb1..dab8985660 100644 --- a/config/libc/glibc.in +++ b/config/libc/glibc.in @@ -33,6 +33,7 @@ config GLIBC_DEP_KERNEL_HEADERS_VERSION config GLIBC_DEP_BINUTILS def_bool y select BINUTILS_REQUIRE_2_25_or_later if GLIBC_2_26_or_later + select BINUTILS_REQUIRE_2_39_or_later if GLIBC_2_42_or_later select BINUTILS_REQUIRE_older_than_2_30 if GLIBC_older_than_2_26 && ARCH_ARM && ARCH_64 # Glibc 2.26 requires GCC4.9 or newer @@ -45,6 +46,7 @@ config GLIBC_DEP_GCC select GCC_REQUIRE_5_or_later if GLIBC_2_29_or_later select GCC_REQUIRE_6_or_later if GLIBC_2_29_or_later && ARCH_POWERPC && ARCH_64 && ARCH_LE select GCC_REQUIRE_6_or_later if GLIBC_2_30_or_later + select GCC_REQUIRE_12_or_later if GLIBC_2_42_or_later # Glibc 2.29 requires bison 2.7 or later. All versions in ct-ng satisfy that # version requirement. @@ -168,11 +170,11 @@ config GLIBC_HAS_DEPRECATED_LIBCRYPT def_bool y depends on GLIBC_2_28_or_later -# As of 2.38 libcrypt is no longer built by default. It will likely be removed in a future -# version. +# As of 2.38 libcrypt is no longer built by default. It was completely removed +# as of 2.39 config GLIBC_HAS_OBSOLETE_LIBCRYPT def_bool y - depends on GLIBC_2_38_or_later + depends on GLIBC_2_38_or_later && !GLIBC_2_39_or_later select XCRYPT_TARGET config GLIBC_EXTRA_CONFIG_ARRAY @@ -312,6 +314,12 @@ comment "| Building GLIBC locales requires that GLIBC supports " comment "| the build machine as the target. " endif # LIBC_GLIBC && GLIBC_LOCALES +# Older Glibc versions are incompatible with newer makeinfo versions. Skip +# building the user manual if needed. +config GLIBC_MAKEINFO_WORKAROUND + def_bool y + depends on GLIBC_2_23_or_older + if KERNEL_LINUX choice GLIBC_SUPPORTED_KERNEL diff --git a/config/libc/picolibc.in b/config/libc/picolibc.in index 6c4c6cac79..c3014b1181 100644 --- a/config/libc/picolibc.in +++ b/config/libc/picolibc.in @@ -40,31 +40,47 @@ config LIBC_PICOLIBC_IO_C99FMT config LIBC_PICOLIBC_REGISTER_FINI bool - prompt "Enable finalization function registration using atexit" + prompt "Enable finalization function registration using atexit [unused]" help Enable finalization function registration using atexit. + This would be used when building with the legacy newlib exit + handling code which cannot be enabled in crosstool-ng, so + this option doesn't do anything. + config LIBC_PICOLIBC_ATEXIT_DYNAMIC_ALLOC bool - prompt "Enable dynamic allocation of atexit entries" + prompt "Enable dynamic allocation of atexit entries [unused]" help Enable dynamic allocation of atexit entries. + This would be used when building with the legacy newlib exit + handling code which cannot be enabled in crosstool-ng, so + this option doesn't do anything. + config LIBC_PICOLIBC_GLOBAL_ATEXIT bool - prompt "Enable atexit data structure as global variable" + prompt "Enable atexit data structure as global variable [unused]" help Enable atexit data structure as global variable, instead of being thread-local. + This would be used when building with the legacy newlib exit + handling code which cannot be enabled in crosstool-ng, so + this option doesn't do anything. + config LIBC_PICOLIBC_LITE_EXIT bool - prompt "Enable lite exit" + prompt "Enable lite exit [unused]" default y help Enable lite exit, a size-reduced implementation of exit that doesn't invoke clean-up functions such as _fini or global destructors. + This would be used when building with the legacy newlib exit + handling code which cannot be enabled in crosstool-ng, so + this option doesn't do anything. + config LIBC_PICOLIBC_MULTITHREAD bool prompt "Enable support for multiple threads" @@ -74,12 +90,15 @@ config LIBC_PICOLIBC_MULTITHREAD config LIBC_PICOLIBC_RETARGETABLE_LOCKING bool - prompt "Enable retargetable locking" + prompt "Enable retargetable locking [unused]" default y help Enable retargetable locking to allow the operating system to override the dummy lock functions defined within picolibc. + This value was always required to match + LIBC_PICOLIBC_MULTITHREAD, so it is no longer used. + config LIBC_PICOLIBC_EXTRA_SECTIONS bool prompt "Place each function & data element in their own section" diff --git a/config/target.in b/config/target.in index 2130262298..ed41539417 100644 --- a/config/target.in +++ b/config/target.in @@ -434,6 +434,132 @@ config ARCH_FLOAT_SW endchoice +#-------------------------------------- + +config ARCH_SUPPORTS_WITH_FLOATING_PRECISION + bool + +config ARCH_SUPPORTS_PRECISION_AUTO + bool + +config ARCH_SUPPORTS_PRECISION_SINGLE_ONLY + bool + +config ARCH_SUPPORTS_PRECISION_DOUBLE_ONLY + bool + +config ARCH_SUPPORTS_PRECISION_BOTH + bool + +config ARCH_SUPPORTS_PRECISION_SINGLE_WITH_DOUBLE + bool + +config ARCH_SUPPORTS_PRECISION_DOUBLE_WITH_SINGLE + bool + +config ARCH_SUPPORTS_PRECISION_UNSPECIFIED + bool + +config ARCH_DEFAULT_PRECISION_AUTO + bool + +config ARCH_DEFAULT_PRECISION_SINGLE_ONLY + bool + +config ARCH_DEFAULT_PRECISION_DOUBLE_ONLY + bool + +config ARCH_DEFAULT_PRECISION_BOTH + bool + +config ARCH_DEFAULT_PRECISION_SINGLE_WITH_DOUBLE + bool + +config ARCH_DEFAULT_PRECISION_DOUBLE_WITH_SINGLE + bool + +config ARCH_DEFAULT_PRECISION_UNSPECIFIED + bool + +choice + bool + prompt "Floating point precision:" + depends on ARCH_SUPPORTS_WITH_FLOATING_PRECISION + default ARCH_FLOATING_PRECISION_AUTO if ARCH_DEFAULT_PRECISION_AUTO + default ARCH_FLOATING_PRECISION_SINGLE_ONLY if ARCH_DEFAULT_PRECISION_SINGLE_ONLY + default ARCH_FLOATING_PRECISION_DOUBLE_ONLY if ARCH_DEFAULT_PRECISION_DOUBLE_ONLY + default ARCH_FLOATING_PRECISION_BOTH if ARCH_DEFAULT_PRECISION_BOTH + default ARCH_FLOATING_PRECISION_SINGLE_WITH_DOUBLE if ARCH_DEFAULT_PRECISION_SINGLE_WITH_DOUBLE + default ARCH_FLOATING_PRECISION_DOUBLE_WITH_SINGLE if ARCH_DEFAULT_PRECISION_DOUBLE_WITH_SINGLE + default ARCH_FLOATING_PRECISION_UNSPECIFIED if ARCH_DEFAULT_PRECISION_UNSPECIFIED + +config ARCH_FLOATING_PRECISION_AUTO + bool + prompt "auto (let gcc decide)" + depends on ARCH_SUPPORTS_PRECISION_AUTO + help + Instead of explicitly passing a float precision option, don't + pass any float precision options and let gcc figure it out. + +config ARCH_FLOATING_PRECISION_SINGLE_ONLY + bool + prompt "single (32-bit)" + depends on ARCH_SUPPORTS_PRECISION_SINGLE_ONLY + help + Use single precision floating point operations. + +config ARCH_FLOATING_PRECISION_DOUBLE_ONLY + bool + prompt "double (64-bit)" + depends on ARCH_SUPPORTS_PRECISION_DOUBLE_ONLY + help + Use double precision floating point operations. + +config ARCH_FLOATING_PRECISION_BOTH + bool + prompt "single and double (32-bit and 64-bit)" + depends on ARCH_SUPPORTS_PRECISION_BOTH + help + Use both single and double precision floating point operations. + +config ARCH_FLOATING_PRECISION_SINGLE_WITH_DOUBLE + bool + prompt "single with double (32-bit with 64-bit)" + depends on ARCH_SUPPORTS_PRECISION_SINGLE_WITH_DOUBLE + help + Use single precision floating point operations, but allow double + precision floating point operations when needed. + +config ARCH_FLOATING_PRECISION_DOUBLE_WITH_SINGLE + bool + prompt "double with single (64-bit with 32-bit)" + depends on ARCH_SUPPORTS_PRECISION_DOUBLE_WITH_SINGLE + help + Use double precision floating point operations, but allow single + precision floating point operations when needed. + +config ARCH_FLOATING_PRECISION_UNSPECIFIED + bool + prompt "default (leave unspecified)" + depends on ARCH_SUPPORTS_PRECISION_UNSPECIFIED + help + Use the default floating point precision for the architecture. + +endchoice + +config ARCH_FLOATING_PRECISION + string + depends on ARCH_SUPPORTS_WITH_FLOATING_PRECISION + default "auto" if ARCH_FLOATING_PRECISION_AUTO + default "single" if ARCH_FLOATING_PRECISION_SINGLE_ONLY + default "double" if ARCH_FLOATING_PRECISION_DOUBLE_ONLY + default "both" if ARCH_FLOATING_PRECISION_BOTH + default "single,double" if ARCH_FLOATING_PRECISION_SINGLE_WITH_DOUBLE + default "double,single" if ARCH_FLOATING_PRECISION_DOUBLE_WITH_SINGLE + default "" if ARCH_FLOATING_PRECISION_UNSPECIFIED + +#-------------------------------------- + config TARGET_CFLAGS string prompt "Target CFLAGS" diff --git a/config/test_suite.in b/config/test_suite.in index 978635d37e..8cfe14342e 100644 --- a/config/test_suite.in +++ b/config/test_suite.in @@ -17,11 +17,14 @@ config TEST_SUITE_GCC The GCC test suite includes a collection of various toolchain tests for GCC - it utilizes the DejaGnu test framework. - For some tests a network enabled target with ssh server is required. - A helper Makefile is provided for running the tests - please see the included README for information on how to run the test suite. +if TEST_SUITE_GCC +source "config/contrib/gcc-test-suite.in" +endif + endmenu endif + diff --git a/config/toolchain.in b/config/toolchain.in index 36a4782e1d..0042d769c4 100644 --- a/config/toolchain.in +++ b/config/toolchain.in @@ -333,4 +333,15 @@ config TOOLCHAIN_ENABLE_NLS help Say 'Y' here to enable native language support (nls). +config TOOLCHAIN_CMAKE_TOOLCHAIN_FILE + bool + prompt "Install cmake toolchain file" + default y if EXPERIMENTAL + help + Say 'Y' here if you want to have a simple toolchain file for + cmake build system. The file will be installed at + ${CT_PREFIX_DIR}/toolchain.cmake. Since paths in this file are + relative, it is safe to move the entire toolchain to other location, + but toolchain.cmake must be kept at the toplevel. + endmenu diff --git a/contrib/gcc-test-suite/Makefile b/contrib/gcc-test-suite/Makefile index c3e1794238..7dc836bc95 100644 --- a/contrib/gcc-test-suite/Makefile +++ b/contrib/gcc-test-suite/Makefile @@ -13,16 +13,23 @@ # # Internal configuration -TARGET:=@@DG_TARGET@@ TOPDIR:=$(shell pwd) LOGDIR:=$(TOPDIR)/tmp # Include default configuration include default.cfg +TARGET:=$(DG_TARGET) + # Add toolchain to path PATH:=$(shell cd ../../bin && pwd):$(PATH) +# Set sysroot +SYSROOT:=$(shell cd ../../$(TARGET)/sysroot && pwd) + +# Set qemu +DG_QEMU_PROGRAM:=qemu-$(shell echo $(TARGET) | sed 's/-.*$$//') + # Select test set ifeq ($(DG_TOOLNAME),gcc) DG_TESTS:=$(DG_C_TESTS) @@ -31,6 +38,12 @@ ifeq ($(DG_TOOLNAME),g++) DG_TESTS:=$(DG_CPP_TESTS) endif +ifeq ($(DG_QEMU),y) + TARGET_BOARD=unix +else + TARGET_BOARD=board +endif + # Check that we have 'runtest' installed RUNTEST=$(shell which runtest) ifeq ($(RUNTEST),) @@ -48,6 +61,7 @@ $(LOGDIR)/site.exp: $(TOPDIR)/default.cfg $(LOGDIR) echo 'set tmpdir "$(TOPDIR)"'; \ echo 'set target_alias $(TARGET)'; } > $@ +# Create config for remote execution $(LOGDIR)/board.exp: $(TOPDIR)/default.cfg $(LOGDIR) @{ echo 'load_generic_config "unix"'; \ echo 'process_multilib_options ""'; \ @@ -57,19 +71,26 @@ $(LOGDIR)/board.exp: $(TOPDIR)/default.cfg $(LOGDIR) echo 'set_board_info hostname $(DG_TARGET_HOSTNAME)'; \ echo 'set_board_info username $(DG_TARGET_USERNAME)'; } > $@ +# create config for local execution via qemu +$(LOGDIR)/unix.exp: $(TOPDIR)/default.cfg $(LOGDIR) + @{ echo 'load_generic_config "unix"'; \ + echo 'process_multilib_options ""'; \ + echo 'set_board_info bmk,use_alarm 1'; \ + echo 'set_board_info exec_shell "$(DG_QEMU_PROGRAM) $(DG_QEMU_ARGS)"'; } > $@ + # As Martin puts it: # > The thing is that when you run 50k+ test cases the odds are that at # > least one will fail and thus runtest basically always return an error # > despite the fact that the test session has executed successfully. # So just ignore any error reported by runtest -test: $(LOGDIR)/board.exp $(LOGDIR)/site.exp $(LOGDIR) +test: $(LOGDIR)/$(TARGET_BOARD).exp $(LOGDIR)/site.exp $(LOGDIR) @runtest --tool $(DG_TOOLNAME) \ --srcdir $(TOPDIR)/testsuite \ --objdir $(LOGDIR) \ --outdir $(LOGDIR) \ --all \ --target $(TARGET) \ - --target_board board \ + --target_board $(TARGET_BOARD) \ $(DG_TESTS) \ GXX_UNDER_TEST=$(TARGET)-g++ || true @printf "Result files available in '%s'\n" "$(LOGDIR)" diff --git a/contrib/gcc-test-suite/default.cfg b/contrib/gcc-test-suite/default.cfg index d523008b92..2089d77a01 100644 --- a/contrib/gcc-test-suite/default.cfg +++ b/contrib/gcc-test-suite/default.cfg @@ -1,9 +1,16 @@ # Default test suite configuration +DG_TARGET = @@DG_TARGET@@ + # Default DejaGnu configuration DG_TOOLNAME = gcc -DG_TARGET_HOSTNAME = 127.0.0.1 -DG_TARGET_USERNAME = root +DG_SSH = @@DG_SSH@@ +DG_QEMU = @@DG_QEMU@@ +DG_TARGET_HOSTNAME = @@DG_TARGET_HOSTNAME@@ +DG_TARGET_USERNAME = @@DG_TARGET_USERNAME@@ + +DG_QEMU_PROGRAM = @@DG_QEMU_PROGRAM@@ +DG_QEMU_ARGS = @@DG_QEMU_ARGS@@ # Default tests DG_C_TESTS = diff --git a/m4/ctng_python.m4 b/m4/ctng_python.m4 index a223b2be5f..c2dbbd1903 100644 --- a/m4/ctng_python.m4 +++ b/m4/ctng_python.m4 @@ -60,15 +60,17 @@ AC_DEFUN([CTNG_PYTHON], [ AC_MSG_CHECKING(for python build information) AC_MSG_RESULT([]) - for python in python3.12 python3.11 python3.10 python3.9 python3.8 python3.7 dnl + for python in python3.14 python3.13 python3.12 python3.11 python3.10 python3.9 python3.8 python3.7 dnl python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 dnl python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do AC_PATH_PROGS(PYTHON_BIN, [$python]) + AC_CHECK_PROGS(PYTHON_BIN_, [$python]) ctng_python_bin=$PYTHON_BIN + ctng_python_bin_=$PYTHON_BIN_ if test "$ctng_python_bin" != ""; then - AC_CHECK_LIB($ctng_python_bin, main, ctng_python_lib=$ctng_python_bin, ctng_python_lib=no) + AC_CHECK_LIB($ctng_python_bin_, main, ctng_python_lib=$ctng_python_bin_, ctng_python_lib=no) if test "$ctng_python_lib" = "no"; then - AC_CHECK_LIB(${ctng_python_bin}m, main, ctng_python_lib=${ctng_python_bin}m, ctng_python_lib=no) + AC_CHECK_LIB(${ctng_python_bin_}m, main, ctng_python_lib=${ctng_python_bin_}m, ctng_python_lib=no) fi if test "$ctng_python_lib" != "no"; then $ctng_python_bin -c 'import sysconfig' 2>&1 diff --git a/m4/ctng_python_version.m4 b/m4/ctng_python_version.m4 index b07cc36845..796c76382e 100644 --- a/m4/ctng_python_version.m4 +++ b/m4/ctng_python_version.m4 @@ -6,12 +6,16 @@ AC_DEFUN([CTNG_PYTHON_VERSION], [ AC_MSG_CHECKING(for python version greater than $1.$2) - pyvermajor=$($PYTHON_BIN -c "import sys; print(sys.version_info.major)") - pyverminor=$($PYTHON_BIN -c "import sys; print(sys.version_info.minor)") + AS_IF([test -n "$PYTHON_BIN"], + pyvermajor=$($PYTHON_BIN -c "import sys; print(sys.version_info.major)") + pyverminor=$($PYTHON_BIN -c "import sys; print(sys.version_info.minor)"), + pyvermajor=0 + pyverminor=0) AS_IF([test $pyvermajor -ge $1 -a $pyverminor -ge $2], eval "python_$1_$2_or_newer=y" - [CTNG_SET_KCONFIG_OPTION([python_$1_$2_or_newer]) - AC_MSG_RESULT([yes: ${pyvermajor}.${pyverminor}])], - AC_MSG_RESULT([no: ${pyvermajor}.${pyverminor}])) + AC_MSG_RESULT([yes: ${pyvermajor}.${pyverminor}]), + AC_MSG_RESULT([no])) + + CTNG_SET_KCONFIG_OPTION([python_$1_$2_or_newer]) ])dnl diff --git a/m4/host-cpu-c-abi.m4 b/m4/host-cpu-c-abi.m4 new file mode 100644 index 0000000000..6db2aa25ae --- /dev/null +++ b/m4/host-cpu-c-abi.m4 @@ -0,0 +1,675 @@ +# host-cpu-c-abi.m4 serial 13 +dnl Copyright (C) 2002-2020 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Bruno Haible and Sam Steingold. + +dnl Sets the HOST_CPU variable to the canonical name of the CPU. +dnl Sets the HOST_CPU_C_ABI variable to the canonical name of the CPU with its +dnl C language ABI (application binary interface). +dnl Also defines __${HOST_CPU}__ and __${HOST_CPU_C_ABI}__ as C macros in +dnl config.h. +dnl +dnl This canonical name can be used to select a particular assembly language +dnl source file that will interoperate with C code on the given host. +dnl +dnl For example: +dnl * 'i386' and 'sparc' are different canonical names, because code for i386 +dnl will not run on SPARC CPUs and vice versa. They have different +dnl instruction sets. +dnl * 'sparc' and 'sparc64' are different canonical names, because code for +dnl 'sparc' and code for 'sparc64' cannot be linked together: 'sparc' code +dnl contains 32-bit instructions, whereas 'sparc64' code contains 64-bit +dnl instructions. A process on a SPARC CPU can be in 32-bit mode or in 64-bit +dnl mode, but not both. +dnl * 'mips' and 'mipsn32' are different canonical names, because they use +dnl different argument passing and return conventions for C functions, and +dnl although the instruction set of 'mips' is a large subset of the +dnl instruction set of 'mipsn32'. +dnl * 'mipsn32' and 'mips64' are different canonical names, because they use +dnl different sizes for the C types like 'int' and 'void *', and although +dnl the instruction sets of 'mipsn32' and 'mips64' are the same. +dnl * The same canonical name is used for different endiannesses. You can +dnl determine the endianness through preprocessor symbols: +dnl - 'arm': test __ARMEL__. +dnl - 'mips', 'mipsn32', 'mips64': test _MIPSEB vs. _MIPSEL. +dnl - 'powerpc64': test _BIG_ENDIAN vs. _LITTLE_ENDIAN. +dnl * The same name 'i386' is used for CPUs of type i386, i486, i586 +dnl (Pentium), AMD K7, Pentium II, Pentium IV, etc., because +dnl - Instructions that do not exist on all of these CPUs (cmpxchg, +dnl MMX, SSE, SSE2, 3DNow! etc.) are not frequently used. If your +dnl assembly language source files use such instructions, you will +dnl need to make the distinction. +dnl - Speed of execution of the common instruction set is reasonable across +dnl the entire family of CPUs. If you have assembly language source files +dnl that are optimized for particular CPU types (like GNU gmp has), you +dnl will need to make the distinction. +dnl See . +AC_DEFUN([gl_HOST_CPU_C_ABI], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([gl_C_ASM]) + AC_CACHE_CHECK([host CPU and C ABI], [gl_cv_host_cpu_c_abi], + [case "$host_cpu" in + +changequote(,)dnl + i[34567]86 ) +changequote([,])dnl + gl_cv_host_cpu_c_abi=i386 + ;; + + x86_64 ) + # On x86_64 systems, the C compiler may be generating code in one of + # these ABIs: + # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64. + # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64 + # with native Windows (mingw, MSVC). + # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32. + # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if (defined __x86_64__ || defined __amd64__ \ + || defined _M_X64 || defined _M_AMD64) + int ok; + #else + error fail + #endif + ]])], + [AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __ILP32__ || defined _ILP32 + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=x86_64-x32], + [gl_cv_host_cpu_c_abi=x86_64])], + [gl_cv_host_cpu_c_abi=i386]) + ;; + +changequote(,)dnl + alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] ) +changequote([,])dnl + gl_cv_host_cpu_c_abi=alpha + ;; + + arm* | aarch64 ) + # Assume arm with EABI. + # On arm64 systems, the C compiler may be generating code in one of + # these ABIs: + # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64. + # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32. + # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#ifdef __aarch64__ + int ok; + #else + error fail + #endif + ]])], + [AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __ILP32__ || defined _ILP32 + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=arm64-ilp32], + [gl_cv_host_cpu_c_abi=arm64])], + [# Don't distinguish little-endian and big-endian arm, since they + # don't require different machine code for simple operations and + # since the user can distinguish them through the preprocessor + # defines __ARMEL__ vs. __ARMEB__. + # But distinguish arm which passes floating-point arguments and + # return values in integer registers (r0, r1, ...) - this is + # gcc -mfloat-abi=soft or gcc -mfloat-abi=softfp - from arm which + # passes them in float registers (s0, s1, ...) and double registers + # (d0, d1, ...) - this is gcc -mfloat-abi=hard. GCC 4.6 or newer + # sets the preprocessor defines __ARM_PCS (for the first case) and + # __ARM_PCS_VFP (for the second case), but older GCC does not. + echo 'double ddd; void func (double dd) { ddd = dd; }' > conftest.c + # Look for a reference to the register d0 in the .s file. + AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c) >/dev/null 2>&1 + if LC_ALL=C grep 'd0,' conftest.$gl_asmext >/dev/null; then + gl_cv_host_cpu_c_abi=armhf + else + gl_cv_host_cpu_c_abi=arm + fi + rm -f conftest* + ]) + ;; + + hppa1.0 | hppa1.1 | hppa2.0* | hppa64 ) + # On hppa, the C compiler may be generating 32-bit code or 64-bit + # code. In the latter case, it defines _LP64 and __LP64__. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#ifdef __LP64__ + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=hppa64], + [gl_cv_host_cpu_c_abi=hppa]) + ;; + + ia64* ) + # On ia64 on HP-UX, the C compiler may be generating 64-bit code or + # 32-bit code. In the latter case, it defines _ILP32. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#ifdef _ILP32 + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=ia64-ilp32], + [gl_cv_host_cpu_c_abi=ia64]) + ;; + + mips* ) + # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this + # at 32. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64) + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=mips64], + [# In the n32 ABI, _ABIN32 is defined, _ABIO32 is not defined (but + # may later get defined by ), and _MIPS_SIM == _ABIN32. + # In the 32 ABI, _ABIO32 is defined, _ABIN32 is not defined (but + # may later get defined by ), and _MIPS_SIM == _ABIO32. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if (_MIPS_SIM == _ABIN32) + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=mipsn32], + [gl_cv_host_cpu_c_abi=mips])]) + ;; + + powerpc* ) + # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD. + # No need to distinguish them here; the caller may distinguish + # them based on the OS. + # On powerpc64 systems, the C compiler may still be generating + # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may + # be generating 64-bit code. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __powerpc64__ || defined _ARCH_PPC64 + int ok; + #else + error fail + #endif + ]])], + [# On powerpc64, there are two ABIs on Linux: The AIX compatible + # one and the ELFv2 one. The latter defines _CALL_ELF=2. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined _CALL_ELF && _CALL_ELF == 2 + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=powerpc64-elfv2], + [gl_cv_host_cpu_c_abi=powerpc64]) + ], + [gl_cv_host_cpu_c_abi=powerpc]) + ;; + + rs6000 ) + gl_cv_host_cpu_c_abi=powerpc + ;; + + riscv32 | riscv64 ) + # There are 2 architectures (with variants): rv32* and rv64*. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if __riscv_xlen == 64 + int ok; + #else + error fail + #endif + ]])], + [cpu=riscv64], + [cpu=riscv32]) + # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d. + # Size of 'long' and 'void *': + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __LP64__ + int ok; + #else + error fail + #endif + ]])], + [main_abi=lp64], + [main_abi=ilp32]) + # Float ABIs: + # __riscv_float_abi_double: + # 'float' and 'double' are passed in floating-point registers. + # __riscv_float_abi_single: + # 'float' are passed in floating-point registers. + # __riscv_float_abi_soft: + # No values are passed in floating-point registers. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __riscv_float_abi_double + int ok; + #else + error fail + #endif + ]])], + [float_abi=d], + [AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __riscv_float_abi_single + int ok; + #else + error fail + #endif + ]])], + [float_abi=f], + [float_abi='']) + ]) + gl_cv_host_cpu_c_abi="${cpu}-${main_abi}${float_abi}" + ;; + + s390* ) + # On s390x, the C compiler may be generating 64-bit (= s390x) code + # or 31-bit (= s390) code. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __LP64__ || defined __s390x__ + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=s390x], + [gl_cv_host_cpu_c_abi=s390]) + ;; + + sparc | sparc64 ) + # UltraSPARCs running Linux have `uname -m` = "sparc64", but the + # C compiler still generates 32-bit code. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __sparcv9 || defined __arch64__ + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=sparc64], + [gl_cv_host_cpu_c_abi=sparc]) + ;; + + *) + gl_cv_host_cpu_c_abi="$host_cpu" + ;; + esac + ]) + + dnl In most cases, $HOST_CPU and $HOST_CPU_C_ABI are the same. + HOST_CPU=`echo "$gl_cv_host_cpu_c_abi" | sed -e 's/-.*//'` + HOST_CPU_C_ABI="$gl_cv_host_cpu_c_abi" + AC_SUBST([HOST_CPU]) + AC_SUBST([HOST_CPU_C_ABI]) + + # This was + # AC_DEFINE_UNQUOTED([__${HOST_CPU}__]) + # AC_DEFINE_UNQUOTED([__${HOST_CPU_C_ABI}__]) + # earlier, but KAI C++ 3.2d doesn't like this. + sed -e 's/-/_/g' >> confdefs.h < +Date: Mon, 8 Aug 2022 20:31:10 +1200 +Subject: [PATCH 0/8] sh conf + +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/configure ++++ b/configure +@@ -4056,7 +4056,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +--- a/configure.ac ++++ b/configure.ac +@@ -1278,7 +1278,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; diff --git a/packages/binutils/2.44/0001-check_ldrunpath_length.patch b/packages/binutils/2.44/0001-check_ldrunpath_length.patch new file mode 100644 index 0000000000..69c9d76a2a --- /dev/null +++ b/packages/binutils/2.44/0001-check_ldrunpath_length.patch @@ -0,0 +1,29 @@ +From aad130ddadd19ae40e5405a7b9ddd5ae1ec138f0 Mon Sep 17 00:00:00 2001 +From: Chris Packham +Date: Mon, 8 Aug 2022 20:36:31 +1200 +Subject: [PATCH 1/8] check_ldrunpath_length + +--- + ld/ldelf.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/ld/ldelf.c ++++ b/ld/ldelf.c +@@ -1134,6 +1134,8 @@ ldelf_handle_dt_needed (struct elf_link_ + && command_line.rpath == NULL) + { + path = (const char *) getenv ("LD_RUN_PATH"); ++ if (path && *path == '\0') ++ path = NULL; + if (path + && ldelf_search_needed (path, &n, force, + is_linux, elfsize)) +@@ -1811,6 +1813,8 @@ ldelf_before_allocation (char *audit, ch + rpath = command_line.rpath; + if (rpath == NULL) + rpath = (const char *) getenv ("LD_RUN_PATH"); ++ if (rpath && *rpath == '\0') ++ rpath = NULL; + + for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) + if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) diff --git a/packages/binutils/2.44/0002-Don-t-link-to-libfl-as-it-s-unnecessary.patch b/packages/binutils/2.44/0002-Don-t-link-to-libfl-as-it-s-unnecessary.patch new file mode 100644 index 0000000000..e089b50f2a --- /dev/null +++ b/packages/binutils/2.44/0002-Don-t-link-to-libfl-as-it-s-unnecessary.patch @@ -0,0 +1,110 @@ +From 3a84b957286a337379d36b530358c32576154b00 Mon Sep 17 00:00:00 2001 +From: Chris Packham +Date: Mon, 8 Aug 2022 20:37:24 +1200 +Subject: [PATCH 3/8] Don't link to libfl as it's unnecessary + +--- + binutils/configure | 3 +++ + binutils/configure.ac | 3 +++ + gas/configure | 3 +++ + gas/configure.ac | 3 +++ + ld/configure | 3 +++ + ld/configure.ac | 3 +++ + 6 files changed, 18 insertions(+) + +--- a/binutils/configure ++++ b/binutils/configure +@@ -12529,6 +12529,7 @@ fi + done + test -n "$YACC" || YACC="yacc" + ++save_LIBS=$LIBS + for ac_prog in flex lex + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -12692,6 +12693,8 @@ esac + if test "$LEX" = :; then + LEX=${am_missing_run}flex + fi ++LIBS=$save_LIBS ++LEXLIB= + + ALL_LINGUAS="bg ca da es fi fr hr id it ja pt ro ru rw sk sr sv tr uk vi zh_CN zh_TW" + +--- a/binutils/configure.ac ++++ b/binutils/configure.ac +@@ -153,7 +153,10 @@ if test -z "$host" ; then + fi + + AC_PROG_YACC ++save_LIBS=$LIBS + AM_PROG_LEX ++LIBS=$save_LIBS ++LEXLIB= + + ALL_LINGUAS="bg ca da es fi fr hr id it ja pt ro ru rw sk sr sv tr uk vi zh_CN zh_TW" + ZW_GNU_GETTEXT_SISTER_DIR +--- a/gas/configure ++++ b/gas/configure +@@ -13033,6 +13033,7 @@ fi + done + test -n "$YACC" || YACC="yacc" + ++save_LIBS=$LIBS + for ac_prog in flex lex + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -13196,6 +13197,8 @@ esac + if test "$LEX" = :; then + LEX=${am_missing_run}flex + fi ++LIBS=$save_LIBS ++LEXLIB= + + ALL_LINGUAS="es fi fr id ja ru rw sv tr uk zh_CN" + +--- a/gas/configure.ac ++++ b/gas/configure.ac +@@ -935,7 +935,10 @@ AC_DEFINE_UNQUOTED(TARGET_VENDOR, "${tar + AC_DEFINE_UNQUOTED(TARGET_OS, "${target_os}", [Target OS.]) + + AC_PROG_YACC ++save_LIBS=$LIBS + AM_PROG_LEX ++LIBS=$save_LIBS ++LEXLIB= + + ALL_LINGUAS="es fi fr id ja ru rw sv tr uk zh_CN" + ZW_GNU_GETTEXT_SISTER_DIR +--- a/ld/configure ++++ b/ld/configure +@@ -18501,6 +18501,7 @@ fi + done + test -n "$YACC" || YACC="yacc" + ++save_LIBS=$LIBS + for ac_prog in flex lex + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -18664,6 +18665,8 @@ esac + if test "$LEX" = :; then + LEX=${am_missing_run}flex + fi ++LIBS=$save_LIBS ++LEXLIB= + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -394,7 +394,10 @@ AM_PO_SUBDIRS + AC_EXEEXT + + AC_PROG_YACC ++save_LIBS=$LIBS + AM_PROG_LEX ++LIBS=$save_LIBS ++LEXLIB= + + AM_MAINTAINER_MODE + AM_CONDITIONAL(GENINSRC_NEVER, false) diff --git a/packages/binutils/2.44/0003-Fix-darwin-build.patch b/packages/binutils/2.44/0003-Fix-darwin-build.patch new file mode 100644 index 0000000000..5f6cc8d231 --- /dev/null +++ b/packages/binutils/2.44/0003-Fix-darwin-build.patch @@ -0,0 +1,46 @@ +From caeb8d1403fa6ce3334ac8527bc89d3103b3c604 Mon Sep 17 00:00:00 2001 +From: Andrew Hsieh +Date: Wed, 18 Mar 2015 10:57:24 +0800 +Subject: [PATCH 5/8] Fix darwin build + +1. In Drawin PTHREAD_ONCE_INIT is {0x30B1BCBA, {0}} and the GCC < 4.4 + doesn't support ended initializer list +2. wcsncasecmp doesn't exist in MacSDK10.6.x + +Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e +--- + bfd/peXXigen.c | 22 ++++++++++++++++++++++ + gold/gold-threads.cc | 15 ++++++++++++--- + 2 files changed, 34 insertions(+), 3 deletions(-) + +--- a/bfd/peXXigen.c ++++ b/bfd/peXXigen.c +@@ -3681,6 +3681,28 @@ u16_mbtouc (wint_t * puc, const unsigned + } + #endif /* not Cygwin/Mingw */ + ++#if defined __APPLE__ && __DARWIN_C_LEVEL < 200809L ++/* wcsncasecmp isn't always defined in Mac SDK */ ++static int ++wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n) ++{ ++ wchar_t c1, c2; ++ ++ if (n == 0) ++ return (0); ++ for (; *s1; s1++, s2++) ++ { ++ c1 = towlower(*s1); ++ c2 = towlower(*s2); ++ if (c1 != c2) ++ return ((int)c1 - c2); ++ if (--n == 0) ++ return (0); ++ } ++ return (-*s2); ++} ++#endif ++ + /* Perform a comparison of two entries. */ + static signed int + rsrc_cmp (bool is_name, rsrc_entry * a, rsrc_entry * b) diff --git a/packages/binutils/2.44/0004-sysroot.patch b/packages/binutils/2.44/0004-sysroot.patch new file mode 100644 index 0000000000..1cf3f673ab --- /dev/null +++ b/packages/binutils/2.44/0004-sysroot.patch @@ -0,0 +1,45 @@ +From 880742786662b8adc996cc639d123d1884559344 Mon Sep 17 00:00:00 2001 +From: Sven Rebhan +Date: Mon, 8 Aug 2022 20:46:29 +1200 +Subject: [PATCH 6/8] sysroot + +Always try to prepend the sysroot prefix to absolute filenames first. + +http://bugs.gentoo.org/275666 +http://sourceware.org/bugzilla/show_bug.cgi?id=10340 + +Signed-off-by: Sven Rebhan +--- + ld/ldfile.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -569,18 +569,25 @@ ldfile_open_file_search (const char *arc + directory first. */ + if (!entry->flags.maybe_archive) + { +- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)) ++ /* For absolute pathnames, try to always open the file in the ++ sysroot first. If this fails, try to open the file at the ++ given location. */ ++ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename); ++ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename) ++ && ld_sysroot) + { + char *name = concat (ld_sysroot, entry->filename, + (const char *) NULL); + if (ldfile_try_open_bfd (name, entry)) + { + entry->filename = name; ++ entry->flags.sysrooted = true; + return true; + } + free (name); + } +- else if (ldfile_try_open_bfd (entry->filename, entry)) ++ ++ if (ldfile_try_open_bfd (entry->filename, entry)) + return true; + + if (IS_ABSOLUTE_PATH (entry->filename)) diff --git a/packages/binutils/2.44/0005-poison-system-directories.patch b/packages/binutils/2.44/0005-poison-system-directories.patch new file mode 100644 index 0000000000..f3d557a856 --- /dev/null +++ b/packages/binutils/2.44/0005-poison-system-directories.patch @@ -0,0 +1,282 @@ +From 35d98249aecc005e426df0fba31e68af7370d7d7 Mon Sep 17 00:00:00 2001 +From: Scott Garman +Date: Mon, 8 Aug 2022 20:48:32 +1200 +Subject: [PATCH 7/8] poison system directories + +Patch adapted to binutils 2.23.2 and extended to use +BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. + +[Gustavo: adapt to binutils 2.25] +Signed-off-by: Thomas Petazzoni +Signed-off-by: Gustavo Zacarias + +Upstream-Status: Inappropriate [distribution: codesourcery] + +Patch originally created by Mark Hatle, forward-ported to +binutils 2.21 by Scott Garman. + +purpose: warn for uses of system directories when cross linking + +Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 + +2008-07-02 Joseph Myers + + ld/ + * ld.h (args_type): Add error_poison_system_directories. + * ld.texinfo (--error-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.error_poison_system_directories. + * ldmain.c (main): Initialize + command_line.error_poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --error-poison-system-directories. + (parse_args): Handle new option. + +2007-06-13 Joseph Myers + + ld/ + * config.in: Regenerate. + * ld.h (args_type): Add poison_system_directories. + * ld.texinfo (--no-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.poison_system_directories. + * ldmain.c (main): Initialize + command_line.poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_NO_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --no-poison-system-directories. + (parse_args): Handle new option. + +2007-04-20 Joseph Myers + + Merge from Sourcery G++ binutils 2.17: + + 2007-03-20 Joseph Myers + Based on patch by Mark Hatle . + ld/ + * configure.ac (--enable-poison-system-directories): New option. + * configure, config.in: Regenerate. + * ldfile.c (ldfile_add_library_path): If + ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, + /usr/lib, /usr/local/lib or /usr/X11R6/lib. + +Signed-off-by: Mark Hatle +Signed-off-by: Scott Garman +--- + ld/config.in | 3 +++ + ld/configure | 14 ++++++++++++++ + ld/configure.ac | 10 ++++++++++ + ld/ld.h | 8 ++++++++ + ld/ld.texi | 12 ++++++++++++ + ld/ldfile.c | 16 ++++++++++++++++ + ld/ldlex.h | 2 ++ + ld/ldmain.c | 2 ++ + ld/lexsup.c | 21 +++++++++++++++++++++ + 9 files changed, 88 insertions(+) + +--- a/ld/config.in ++++ b/ld/config.in +@@ -78,6 +78,9 @@ + language is requested. */ + #undef ENABLE_NLS + ++/* Define to warn for use of native system library directories */ ++#undef ENABLE_POISON_SYSTEM_DIRECTORIES ++ + /* Additional extension a shared object might have. */ + #undef EXTRA_SHLIB_EXTENSION + +--- a/ld/configure ++++ b/ld/configure +@@ -844,6 +844,7 @@ with_lib_path + enable_targets + enable_64_bit_bfd + with_sysroot ++enable_poison_system_directories + enable_gold + enable_got + enable_compressed_debug_sections +@@ -1537,6 +1538,8 @@ Optional Features: + --enable-checking enable run-time checks + --enable-targets alternative target configurations + --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) ++ --enable-poison-system-directories ++ warn for use of native system library directories + --enable-gold[=ARG] build gold [ARG={default,yes,no}] + --enable-got= GOT handling scheme (target, single, negative, + multigot) +@@ -15592,7 +15595,18 @@ else + fi + + ++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" = "xyes"; then + ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++ ++fi + + # Check whether --enable-got was given. + if test "${enable_got+set}" = set; then : +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -102,6 +102,16 @@ AC_SUBST(use_sysroot) + AC_SUBST(TARGET_SYSTEM_ROOT) + AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) + ++AC_ARG_ENABLE([poison-system-directories], ++ AS_HELP_STRING([--enable-poison-system-directories], ++ [warn for use of native system library directories]),, ++ [enable_poison_system_directories=no]) ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], ++ [1], ++ [Define to warn for use of native system library directories]) ++fi ++ + dnl Use --enable-gold to decide if this linker should be the default. + dnl "install_as_default" is set to false if gold is the default linker. + dnl "installed_linker" is the installed BFD linker name. +--- a/ld/ld.h ++++ b/ld/ld.h +@@ -161,6 +161,14 @@ typedef struct + /* If set, display the target memory usage (per memory region). */ + bool print_memory_usage; + ++ /* If TRUE (the default) warn for uses of system directories when ++ cross linking. */ ++ bool poison_system_directories; ++ ++ /* If TRUE (default FALSE) give an error for uses of system ++ directories when cross linking instead of a warning. */ ++ bool error_poison_system_directories; ++ + /* Should we force section groups to be resolved? Controlled with + --force-group-allocation on the command line or FORCE_GROUP_ALLOCATION + in the linker script. */ +--- a/ld/ld.texi ++++ b/ld/ld.texi +@@ -3279,6 +3279,18 @@ creation of the metadata note, if one ha + occurrence of the --package-metadata option. + If the linker has been built with libjansson, then the JSON string + will be validated. ++ ++@kindex --no-poison-system-directories ++@item --no-poison-system-directories ++Do not warn for @option{-L} options using system directories such as ++@file{/usr/lib} when cross linking. This option is intended for use ++in chroot environments when such directories contain the correct ++libraries for the target system rather than the host. ++ ++@kindex --error-poison-system-directories ++@item --error-poison-system-directories ++Give an error instead of a warning for @option{-L} options using ++system directories when cross linking. + @end table + + @c man end +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -328,6 +328,22 @@ ldfile_add_library_path (const char *nam + new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); + else + new_dirs->name = xstrdup (name); ++ ++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES ++ if (command_line.poison_system_directories ++ && ((!strncmp (name, "/lib", 4)) ++ || (!strncmp (name, "/usr/lib", 8)) ++ || (!strncmp (name, "/usr/local/lib", 14)) ++ || (!strncmp (name, "/usr/X11R6/lib", 14)))) ++ { ++ if (command_line.error_poison_system_directories) ++ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ else ++ einfo (_("%P: warning: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ } ++#endif + } + + static void +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -471,6 +471,8 @@ enum option_values + OPTION_NO_LITERAL_MOVEMENT, + OPTION_ABI_WINDOWED, + OPTION_ABI_CALL0, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, + }; + + /* The initial parser states. */ +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -351,6 +351,8 @@ main (int argc, char **argv) + command_line.warn_mismatch = true; + command_line.warn_search_mismatch = true; + command_line.check_section_addresses = -1; ++ command_line.poison_system_directories = true; ++ command_line.error_poison_system_directories = true; + + /* We initialize DEMANGLING based on the environment variable + COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -650,6 +650,14 @@ static const struct ld_option ld_options + " is: share-unconflicted (default),\n" + " share-duplicated"), + TWO_DASHES }, ++ { {"no-poison-system-directories", no_argument, NULL, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Do not warn for -L options using system directories"), ++ TWO_DASHES }, ++ { {"error-poison-system-directories", no_argument, NULL, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Give an error for -L options using system directories"), ++ TWO_DASHES }, + }; + + #define OPTION_COUNT ARRAY_SIZE (ld_options) +@@ -662,6 +670,7 @@ parse_args (unsigned argc, char **argv) + int ingroup = 0; + char *default_dirlist = NULL; + char *shortopts; ++ char *BR_paranoid_env; + struct option *longopts; + struct option *really_longopts; + int last_optind; +@@ -1789,6 +1798,14 @@ parse_args (unsigned argc, char **argv) + } + break; + ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = false; ++ break; ++ ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = true; ++ break; ++ + case OPTION_PUSH_STATE: + input_flags.pushed = xmemdup (&input_flags, + sizeof (input_flags), +@@ -1933,6 +1950,10 @@ parse_args (unsigned argc, char **argv) + command_line.soname = NULL; + } + ++ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); ++ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) ++ command_line.error_poison_system_directories = true; ++ + while (ingroup) + { + einfo (_("%P: missing --end-group; added as last command line option\n")); diff --git a/packages/binutils/2.44/chksum b/packages/binutils/2.44/chksum new file mode 100644 index 0000000000..d254e370de --- /dev/null +++ b/packages/binutils/2.44/chksum @@ -0,0 +1,12 @@ +md5 binutils-2.44.tar.xz 49912ce774666a30806141f106124294 +sha1 binutils-2.44.tar.xz c8c9f5ae46ab9e3722c71821982d2c270e267748 +sha256 binutils-2.44.tar.xz ce2017e059d63e67ddb9240e9d4ec49c2893605035cd60e92ad53177f4377237 +sha512 binutils-2.44.tar.xz b85d3bbc0e334cf67a96219d3c7c65fbf3e832b2c98a7417bf131f3645a0307057ec81cd2b29ff2563cec53e3d42f73e2c60cc5708e80d4a730efdcc6ae14ad7 +md5 binutils-2.44.tar.bz2 3cdb76e72469be836be726d456caf4ed +sha1 binutils-2.44.tar.bz2 8657069418bb4b198dddca6ff38cd355c2d5a04c +sha256 binutils-2.44.tar.bz2 f66390a661faa117d00fab2e79cf2dc9d097b42cc296bf3f8677d1e7b452dc3a +sha512 binutils-2.44.tar.bz2 d1783e109c28c5706bacadf31d2652afe8f09ca3dfa6fb8b4e530904280207b2e1825d202faa92ff753e4ee6261a68a8429be4cd564446c6e040d75f6c2afc2d +md5 binutils-2.44.tar.gz 6c02ef5e0de5096f0e9cd6f9d48a4be3 +sha1 binutils-2.44.tar.gz 568ba0a286cf79520572c1597a203c1aafd462de +sha256 binutils-2.44.tar.gz 0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e +sha512 binutils-2.44.tar.gz c8e394c12493bc5e87d49834068ba8f72e8e93be9141d3bd68d4d6fa2e53b3b42360d168a5381da043c596b82e7386f8dbce31ccbdbfdee1e6a89763326d46a7 diff --git a/packages/gdb/15.1/version.desc b/packages/binutils/2.44/version.desc similarity index 100% rename from packages/gdb/15.1/version.desc rename to packages/binutils/2.44/version.desc diff --git a/packages/binutils/2.45/0000-sh-conf.patch b/packages/binutils/2.45/0000-sh-conf.patch new file mode 100644 index 0000000000..4622e21344 --- /dev/null +++ b/packages/binutils/2.45/0000-sh-conf.patch @@ -0,0 +1,39 @@ +From 0f4f6c1cc9888c9637d5e9304661888597c5dde1 Mon Sep 17 00:00:00 2001 +From: Chris Packham +Date: Mon, 8 Aug 2022 20:31:10 +1200 +Subject: [PATCH 0/5] sh conf + +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index bbfb5979..bcd95684 100755 +--- a/configure ++++ b/configure +@@ -4056,7 +4056,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index 659388f7..eb1c20af 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1278,7 +1278,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +-- +2.50.1 + diff --git a/packages/binutils/2.45/0001-check_ldrunpath_length.patch b/packages/binutils/2.45/0001-check_ldrunpath_length.patch new file mode 100644 index 0000000000..3ff8e23cf7 --- /dev/null +++ b/packages/binutils/2.45/0001-check_ldrunpath_length.patch @@ -0,0 +1,34 @@ +From 822af88496022f8f2d267d3b399d36ab36248805 Mon Sep 17 00:00:00 2001 +From: Chris Packham +Date: Mon, 8 Aug 2022 20:36:31 +1200 +Subject: [PATCH 1/5] check_ldrunpath_length + +--- + ld/ldelf.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/ld/ldelf.c b/ld/ldelf.c +index f4f27fc3..8e69b879 100644 +--- a/ld/ldelf.c ++++ b/ld/ldelf.c +@@ -1134,6 +1134,8 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab, + && command_line.rpath == NULL) + { + path = (const char *) getenv ("LD_RUN_PATH"); ++ if (path && *path == '\0') ++ path = NULL; + if (path + && ldelf_search_needed (path, &n, force, + is_linux, elfsize)) +@@ -1808,6 +1810,8 @@ ldelf_before_allocation (char **audit, char **depaudit, + rpath = command_line.rpath; + if (rpath == NULL) + rpath = (const char *) getenv ("LD_RUN_PATH"); ++ if (rpath && *rpath == '\0') ++ rpath = NULL; + + for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) + if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) +-- +2.50.1 + diff --git a/packages/binutils/2.45/0002-Don-t-link-to-libfl-as-it-s-unnecessary.patch b/packages/binutils/2.45/0002-Don-t-link-to-libfl-as-it-s-unnecessary.patch new file mode 100644 index 0000000000..9a1ad01085 --- /dev/null +++ b/packages/binutils/2.45/0002-Don-t-link-to-libfl-as-it-s-unnecessary.patch @@ -0,0 +1,125 @@ +From 3d87c27335a19a13c928baa2a6ff1427a1354940 Mon Sep 17 00:00:00 2001 +From: Chris Packham +Date: Mon, 8 Aug 2022 20:37:24 +1200 +Subject: [PATCH 2/5] Don't link to libfl as it's unnecessary + +--- + binutils/configure | 3 +++ + binutils/configure.ac | 3 +++ + gas/configure | 3 +++ + gas/configure.ac | 3 +++ + ld/configure | 3 +++ + ld/configure.ac | 3 +++ + 6 files changed, 18 insertions(+) + +diff --git a/binutils/configure b/binutils/configure +index 94be2250..0a3540ee 100755 +--- a/binutils/configure ++++ b/binutils/configure +@@ -12529,6 +12529,7 @@ fi + done + test -n "$YACC" || YACC="yacc" + ++save_LIBS=$LIBS + for ac_prog in flex lex + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -12692,6 +12693,8 @@ esac + if test "$LEX" = :; then + LEX=${am_missing_run}flex + fi ++LIBS=$save_LIBS ++LEXLIB= + + ALL_LINGUAS="bg ca da es fi fr hr id it ja pt ro ru rw sk sr sv tr uk vi zh_CN zh_TW" + +diff --git a/binutils/configure.ac b/binutils/configure.ac +index cb65e503..8317d1be 100644 +--- a/binutils/configure.ac ++++ b/binutils/configure.ac +@@ -153,7 +153,10 @@ if test -z "$host" ; then + fi + + AC_PROG_YACC ++save_LIBS=$LIBS + AM_PROG_LEX ++LIBS=$save_LIBS ++LEXLIB= + + ALL_LINGUAS="bg ca da es fi fr hr id it ja pt ro ru rw sk sr sv tr uk vi zh_CN zh_TW" + AM_PO_SUBDIRS +diff --git a/gas/configure b/gas/configure +index 9c640c87..8fb28d6f 100755 +--- a/gas/configure ++++ b/gas/configure +@@ -13036,6 +13036,7 @@ fi + done + test -n "$YACC" || YACC="yacc" + ++save_LIBS=$LIBS + for ac_prog in flex lex + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -13199,6 +13200,8 @@ esac + if test "$LEX" = :; then + LEX=${am_missing_run}flex + fi ++LIBS=$save_LIBS ++LEXLIB= + + ALL_LINGUAS="es fi fr id ja ru rw sv tr uk zh_CN" + +diff --git a/gas/configure.ac b/gas/configure.ac +index 30fa5eb1..293babec 100644 +--- a/gas/configure.ac ++++ b/gas/configure.ac +@@ -938,7 +938,10 @@ AC_DEFINE_UNQUOTED(TARGET_VENDOR, "${target_vendor}", [Target vendor.]) + AC_DEFINE_UNQUOTED(TARGET_OS, "${target_os}", [Target OS.]) + + AC_PROG_YACC ++save_LIBS=$LIBS + AM_PROG_LEX ++LIBS=$save_LIBS ++LEXLIB= + + ALL_LINGUAS="es fi fr id ja ru rw sv tr uk zh_CN" + AM_PO_SUBDIRS +diff --git a/ld/configure b/ld/configure +index 78b54b39..956b8b1c 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -18016,6 +18016,7 @@ fi + done + test -n "$YACC" || YACC="yacc" + ++save_LIBS=$LIBS + for ac_prog in flex lex + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -18179,6 +18180,8 @@ esac + if test "$LEX" = :; then + LEX=${am_missing_run}flex + fi ++LIBS=$save_LIBS ++LEXLIB= + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +diff --git a/ld/configure.ac b/ld/configure.ac +index 3ee84958..a8f64fe7 100644 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -407,7 +407,10 @@ ZW_GNU_GETTEXT_SISTER_DIR + AC_EXEEXT + + AC_PROG_YACC ++save_LIBS=$LIBS + AM_PROG_LEX ++LIBS=$save_LIBS ++LEXLIB= + + AM_MAINTAINER_MODE + AM_CONDITIONAL(GENINSRC_NEVER, false) +-- +2.50.1 + diff --git a/packages/binutils/2.45/0003-Fix-darwin-build.patch b/packages/binutils/2.45/0003-Fix-darwin-build.patch new file mode 100644 index 0000000000..83a987d979 --- /dev/null +++ b/packages/binutils/2.45/0003-Fix-darwin-build.patch @@ -0,0 +1,50 @@ +From dcfc968ba2e71e1bae88f87b07d11f36758a74cd Mon Sep 17 00:00:00 2001 +From: Andrew Hsieh +Date: Wed, 18 Mar 2015 10:57:24 +0800 +Subject: [PATCH 3/5] Fix darwin build + +1. In Drawin PTHREAD_ONCE_INIT is {0x30B1BCBA, {0}} and the GCC < 4.4 + doesn't support ended initializer list +2. wcsncasecmp doesn't exist in MacSDK10.6.x + +Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e +--- + bfd/peXXigen.c | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c +index c337fc5b..5a0c4538 100644 +--- a/bfd/peXXigen.c ++++ b/bfd/peXXigen.c +@@ -3688,6 +3688,28 @@ u16_mbtouc (wint_t * puc, const unsigned short * s, unsigned int n) + } + #endif /* not Cygwin/Mingw */ + ++#if defined __APPLE__ && __DARWIN_C_LEVEL < 200809L ++/* wcsncasecmp isn't always defined in Mac SDK */ ++static int ++wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n) ++{ ++ wchar_t c1, c2; ++ ++ if (n == 0) ++ return (0); ++ for (; *s1; s1++, s2++) ++ { ++ c1 = towlower(*s1); ++ c2 = towlower(*s2); ++ if (c1 != c2) ++ return ((int)c1 - c2); ++ if (--n == 0) ++ return (0); ++ } ++ return (-*s2); ++} ++#endif ++ + /* Perform a comparison of two entries. */ + static signed int + rsrc_cmp (bool is_name, rsrc_entry * a, rsrc_entry * b) +-- +2.50.1 + diff --git a/packages/binutils/2.45/0004-sysroot.patch b/packages/binutils/2.45/0004-sysroot.patch new file mode 100644 index 0000000000..83a413dd74 --- /dev/null +++ b/packages/binutils/2.45/0004-sysroot.patch @@ -0,0 +1,50 @@ +From 471d1d6d49821cfadfc232d2e44eaaa76f6e4186 Mon Sep 17 00:00:00 2001 +From: Sven Rebhan +Date: Mon, 8 Aug 2022 20:46:29 +1200 +Subject: [PATCH 4/5] sysroot + +Always try to prepend the sysroot prefix to absolute filenames first. + +http://bugs.gentoo.org/275666 +http://sourceware.org/bugzilla/show_bug.cgi?id=10340 + +Signed-off-by: Sven Rebhan +--- + ld/ldfile.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 75fd360d..6d208be3 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -556,18 +556,25 @@ ldfile_open_file_search (const char *arch, + directory first. */ + if (!entry->flags.maybe_archive) + { +- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)) ++ /* For absolute pathnames, try to always open the file in the ++ sysroot first. If this fails, try to open the file at the ++ given location. */ ++ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename); ++ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename) ++ && ld_sysroot) + { + char *name = concat (ld_sysroot, entry->filename, + (const char *) NULL); + if (ldfile_try_open_bfd (name, entry)) + { + entry->filename = name; ++ entry->flags.sysrooted = true; + return true; + } + free (name); + } +- else if (ldfile_try_open_bfd (entry->filename, entry)) ++ ++ if (ldfile_try_open_bfd (entry->filename, entry)) + return true; + + if (IS_ABSOLUTE_PATH (entry->filename)) +-- +2.50.1 + diff --git a/packages/binutils/2.45/0005-poison-system-directories.patch b/packages/binutils/2.45/0005-poison-system-directories.patch new file mode 100644 index 0000000000..fccdaa289a --- /dev/null +++ b/packages/binutils/2.45/0005-poison-system-directories.patch @@ -0,0 +1,303 @@ +From 9a03e19656e8af3193ba7f8c30b56fb0b4153978 Mon Sep 17 00:00:00 2001 +From: Scott Garman +Date: Mon, 8 Aug 2022 20:48:32 +1200 +Subject: [PATCH 5/5] poison system directories + +Patch adapted to binutils 2.23.2 and extended to use +BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. + +[Gustavo: adapt to binutils 2.25] +Signed-off-by: Thomas Petazzoni +Signed-off-by: Gustavo Zacarias + +Upstream-Status: Inappropriate [distribution: codesourcery] + +Patch originally created by Mark Hatle, forward-ported to +binutils 2.21 by Scott Garman. + +purpose: warn for uses of system directories when cross linking + +Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 + +2008-07-02 Joseph Myers + + ld/ + * ld.h (args_type): Add error_poison_system_directories. + * ld.texinfo (--error-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.error_poison_system_directories. + * ldmain.c (main): Initialize + command_line.error_poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --error-poison-system-directories. + (parse_args): Handle new option. + +2007-06-13 Joseph Myers + + ld/ + * config.in: Regenerate. + * ld.h (args_type): Add poison_system_directories. + * ld.texinfo (--no-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.poison_system_directories. + * ldmain.c (main): Initialize + command_line.poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_NO_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --no-poison-system-directories. + (parse_args): Handle new option. + +2007-04-20 Joseph Myers + + Merge from Sourcery G++ binutils 2.17: + + 2007-03-20 Joseph Myers + Based on patch by Mark Hatle . + ld/ + * configure.ac (--enable-poison-system-directories): New option. + * configure, config.in: Regenerate. + * ldfile.c (ldfile_add_library_path): If + ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, + /usr/lib, /usr/local/lib or /usr/X11R6/lib. + +Signed-off-by: Mark Hatle +Signed-off-by: Scott Garman +--- + ld/config.in | 3 +++ + ld/configure | 14 ++++++++++++++ + ld/configure.ac | 10 ++++++++++ + ld/ld.h | 8 ++++++++ + ld/ld.texi | 12 ++++++++++++ + ld/ldfile.c | 16 ++++++++++++++++ + ld/ldlex.h | 2 ++ + ld/ldmain.c | 2 ++ + ld/lexsup.c | 21 +++++++++++++++++++++ + 9 files changed, 88 insertions(+) + +diff --git a/ld/config.in b/ld/config.in +index 37812241..be895711 100644 +--- a/ld/config.in ++++ b/ld/config.in +@@ -78,6 +78,9 @@ + language is requested. */ + #undef ENABLE_NLS + ++/* Define to warn for use of native system library directories */ ++#undef ENABLE_POISON_SYSTEM_DIRECTORIES ++ + /* Additional extension a shared object might have. */ + #undef EXTRA_SHLIB_EXTENSION + +diff --git a/ld/configure b/ld/configure +index 956b8b1c..4e019fce 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -841,6 +841,7 @@ enable_checking + with_lib_path + enable_targets + with_sysroot ++enable_poison_system_directories + enable_gold + enable_got + enable_compressed_debug_sections +@@ -1533,6 +1534,8 @@ Optional Features: + --disable-largefile omit support for large files + --enable-checking enable run-time checks + --enable-targets alternative target configurations ++ --enable-poison-system-directories ++ warn for use of native system library directories + --enable-gold[=ARG] build gold [ARG={default,yes,no}] + --enable-got= GOT handling scheme (target, single, negative, + multigot) +@@ -15388,7 +15391,18 @@ else + fi + + ++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" = "xyes"; then + ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++ ++fi + + # Check whether --enable-got was given. + if test "${enable_got+set}" = set; then : +diff --git a/ld/configure.ac b/ld/configure.ac +index a8f64fe7..ee5a18cd 100644 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -115,6 +115,16 @@ AC_SUBST(use_sysroot) + AC_SUBST(TARGET_SYSTEM_ROOT) + AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) + ++AC_ARG_ENABLE([poison-system-directories], ++ AS_HELP_STRING([--enable-poison-system-directories], ++ [warn for use of native system library directories]),, ++ [enable_poison_system_directories=no]) ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], ++ [1], ++ [Define to warn for use of native system library directories]) ++fi ++ + dnl Use --enable-gold to decide if this linker should be the default. + dnl "install_as_default" is set to false if gold is the default linker. + dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index c8688153..1edce28b 100644 +--- a/ld/ld.h ++++ b/ld/ld.h +@@ -161,6 +161,14 @@ typedef struct + /* If set, display the target memory usage (per memory region). */ + bool print_memory_usage; + ++ /* If TRUE (the default) warn for uses of system directories when ++ cross linking. */ ++ bool poison_system_directories; ++ ++ /* If TRUE (default FALSE) give an error for uses of system ++ directories when cross linking instead of a warning. */ ++ bool error_poison_system_directories; ++ + /* Should we force section groups to be resolved? Controlled with + --force-group-allocation on the command line or FORCE_GROUP_ALLOCATION + in the linker script. */ +diff --git a/ld/ld.texi b/ld/ld.texi +index 413335ad..7bea7fd7 100644 +--- a/ld/ld.texi ++++ b/ld/ld.texi +@@ -3350,6 +3350,18 @@ creation of the metadata note, if one had been enabled by an earlier + occurrence of the --package-metadata option. + If the linker has been built with libjansson, then the JSON string + will be validated. ++ ++@kindex --no-poison-system-directories ++@item --no-poison-system-directories ++Do not warn for @option{-L} options using system directories such as ++@file{/usr/lib} when cross linking. This option is intended for use ++in chroot environments when such directories contain the correct ++libraries for the target system rather than the host. ++ ++@kindex --error-poison-system-directories ++@item --error-poison-system-directories ++Give an error instead of a warning for @option{-L} options using ++system directories when cross linking. + @end table + + @c man end +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 6d208be3..7e3e39b5 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -328,6 +328,22 @@ ldfile_add_library_path (const char *name, bool cmdline) + new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); + else + new_dirs->name = xstrdup (name); ++ ++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES ++ if (command_line.poison_system_directories ++ && ((!strncmp (name, "/lib", 4)) ++ || (!strncmp (name, "/usr/lib", 8)) ++ || (!strncmp (name, "/usr/local/lib", 14)) ++ || (!strncmp (name, "/usr/X11R6/lib", 14)))) ++ { ++ if (command_line.error_poison_system_directories) ++ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ else ++ einfo (_("%P: warning: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ } ++#endif + } + + static void +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 815da76a..fe1df191 100644 +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -471,6 +471,8 @@ enum option_values + OPTION_NO_LITERAL_MOVEMENT, + OPTION_ABI_WINDOWED, + OPTION_ABI_CALL0, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, + }; + + /* The initial parser states. */ +diff --git a/ld/ldmain.c b/ld/ldmain.c +index 67c60c3f..58f7e9fe 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -671,6 +671,8 @@ main (int argc, char **argv) + command_line.warn_mismatch = true; + command_line.warn_search_mismatch = true; + command_line.check_section_addresses = -1; ++ command_line.poison_system_directories = true; ++ command_line.error_poison_system_directories = true; + + /* We initialize DEMANGLING based on the environment variable + COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index bde20465..422866f4 100644 +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -652,6 +652,14 @@ static const struct ld_option ld_options[] = + " is: share-unconflicted (default),\n" + " share-duplicated"), + TWO_DASHES }, ++ { {"no-poison-system-directories", no_argument, NULL, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Do not warn for -L options using system directories"), ++ TWO_DASHES }, ++ { {"error-poison-system-directories", no_argument, NULL, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Give an error for -L options using system directories"), ++ TWO_DASHES }, + }; + + #define OPTION_COUNT ARRAY_SIZE (ld_options) +@@ -664,6 +672,7 @@ parse_args (unsigned argc, char **argv) + int ingroup = 0; + char *default_dirlist = NULL; + char *shortopts; ++ char *BR_paranoid_env; + struct option *longopts; + struct option *really_longopts; + int last_optind; +@@ -1800,6 +1809,14 @@ parse_args (unsigned argc, char **argv) + } + break; + ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = false; ++ break; ++ ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = true; ++ break; ++ + case OPTION_PUSH_STATE: + input_flags.pushed = xmemdup (&input_flags, + sizeof (input_flags), +@@ -1944,6 +1961,10 @@ parse_args (unsigned argc, char **argv) + command_line.soname = NULL; + } + ++ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); ++ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) ++ command_line.error_poison_system_directories = true; ++ + while (ingroup) + { + einfo (_("%P: missing --end-group; added as last command line option\n")); +-- +2.50.1 + diff --git a/packages/binutils/2.45/0006-Adjust-pdata-function-table-entries-sorting-for-AArch64.patch b/packages/binutils/2.45/0006-Adjust-pdata-function-table-entries-sorting-for-AArch64.patch new file mode 100644 index 0000000000..2f1cc7f9bc --- /dev/null +++ b/packages/binutils/2.45/0006-Adjust-pdata-function-table-entries-sorting-for-AArch64.patch @@ -0,0 +1,51 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Evgeny Karpov +Date: Fri, 9 May 2025 12:51:00 +0200 +Subject: [PATCH v2 1/7] Adjust pdata function table entries sorting for AArch64 + +The .pdata section contains an array of function table entries that +are used for exception handling. The entries should be sorted by +begin address, which is usually the first 4 bytes RVA in the entry. +Entry sizes are different for x64 and AArch64. +This difference is addressed in this patch. + +bfd/ChangeLog: + + * peXXigen.c (defined): New. + (_bfd_XXi_final_link_postscript): Use + FUNCTION_TABLE_ENTRY_SIZE. +--- + bfd/peXXigen.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c +index 9938108ce6b..3230f465d63 100644 +--- a/bfd/peXXigen.c ++++ b/bfd/peXXigen.c +@@ -4655,6 +4655,13 @@ _bfd_XXi_final_link_postscript (bfd * abfd, struct coff_final_link_info *pfinfo) + #if !defined(COFF_WITH_pep) && (defined(COFF_WITH_pex64) || defined(COFF_WITH_peAArch64) || defined(COFF_WITH_peLoongArch64) || defined (COFF_WITH_peRiscV64)) + { + asection *sec = bfd_get_section_by_name (abfd, ".pdata"); ++#if defined (COFF_WITH_peAArch64) ++/* https://learn.microsoft.com/en-us/cpp/build/arm64-exception-handling#pdata-records. */ ++ #define FUNCTION_TABLE_ENTRY_SIZE 8 ++#else ++/* https://learn.microsoft.com/en-us/windows/win32/debug/pe-format#the-pdata-section. */ ++ #define FUNCTION_TABLE_ENTRY_SIZE 12 ++#endif + + if (sec) + { +@@ -4664,8 +4671,8 @@ _bfd_XXi_final_link_postscript (bfd * abfd, struct coff_final_link_info *pfinfo) + if (bfd_malloc_and_get_section (abfd, sec, &tmp_data)) + { + qsort (tmp_data, +- (size_t) (x / 12), +- 12, sort_x64_pdata); ++ (size_t) (x / FUNCTION_TABLE_ENTRY_SIZE), ++ FUNCTION_TABLE_ENTRY_SIZE, sort_x64_pdata); + bfd_set_section_contents (pfinfo->output_bfd, sec, + tmp_data, 0, x); + free (tmp_data); +-- +2.34.1 diff --git a/packages/binutils/2.45/0007-Define-unwinding-and-SEH-data-structures-for-aarch64.patch b/packages/binutils/2.45/0007-Define-unwinding-and-SEH-data-structures-for-aarch64.patch new file mode 100644 index 0000000000..6842d22247 --- /dev/null +++ b/packages/binutils/2.45/0007-Define-unwinding-and-SEH-data-structures-for-aarch64.patch @@ -0,0 +1,245 @@ +From 1111111111111111111111111111111111111111 Mon Sep 17 00:00:00 2001 +From: Evgeny Karpov +Date: Fri, 9 May 2025 12:57:00 +0200 +Subject: [PATCH v2 2/7] Define unwinding and SEH data structures for aarch64 + +This patch adds unwinding codes and records that are needed to emit +SEH data to pdata and xdata sections, and an arm64 context to store +data required for emitting. + +gas/ChangeLog: + + * config/obj-coff-seh.h (ARM64_MAX_UNWIND_CODES): New. + (ARM64_MAX_EPILOGUE_SCOPES): New. + (ARM64_UNOP_ALLOCS): New. + (ARM64_UNOP_SAVER19R20X): New. + (ARM64_UNOP_SAVEFPLR): New. + (ARM64_UNOP_SAVEFPLRX): New. + (ARM64_UNOP_ALLOCM): New. + (ARM64_UNOP_SAVEREGP): New. + (ARM64_UNOP_SAVEREGPX): New. + (ARM64_UNOP_SAVEREG): New. + (ARM64_UNOP_SAVEREGX): New. + (ARM64_UNOP_SAVELRPAIR): New. + (ARM64_UNOP_SAVEFREGP): New. + (ARM64_UNOP_SAVEFREGPX): New. + (ARM64_UNOP_SAVEFREG): New. + (ARM64_UNOP_SAVEFREGX): New. + (ARM64_UNOP_ALLOCL): New. + (ARM64_UNOP_SETFP): New. + (ARM64_UNOP_ADDFP): New. + (ARM64_UNOP_NOP): New. + (ARM64_UNOP_END): New. + (ARM64_UNOP_ENDC): New. + (ARM64_UNOP_SAVENEXT): New. + (ARM64_UNOP_PACSIGNLR): New. +--- + gas/config/obj-coff-seh.h | 154 +++++++++++++++++++++++++++++++++++++- + 1 file changed, 152 insertions(+), 2 deletions(-) + +diff --git a/gas/config/obj-coff-seh.h b/gas/config/obj-coff-seh.h +index 598870ae4e0..f926fc8622c 100644 +--- a/gas/config/obj-coff-seh.h ++++ b/gas/config/obj-coff-seh.h +@@ -19,12 +19,13 @@ + 02110-1301, USA. */ + + /* Short overview: +- There are at the moment three different function entry formats preset. ++ There are at the moment four different function entry formats preset. + The first is the MIPS one. The second version + is for ARM, PPC, SH3, and SH4 mainly for Windows CE. + The third is the IA64 and x64 version. Note, the IA64 isn't implemented yet, + but to find information about it, please see specification about IA64 on + http://download.intel.com/design/Itanium/Downloads/245358.pdf file. ++ The fourth is the Arm64 version. + + The first version has just entries in the pdata section: BeginAddress, + EndAddress, ExceptionHandler, HandlerData, and PrologueEndAddress. Each +@@ -57,8 +58,43 @@ + .seh_savexmm + .seh_pushframe + .seh_code ++ ++ The fourth version for Arm64 partially intersects with the x64 ++ version, however it has a different extension to the unwind codes. ++ It emits SEH data to pdata and xdata sections. In some cases SEH ++ data could be emitted to a packed record in the pdata section ++ without the need for data in the xdata section. However, the packed ++ pdata record is not implemented yet. ++ + */ + ++typedef enum seh_arm64_unwind_types ++{ ++ alloc_s, ++ alloc_m, ++ alloc_l, ++ save_reg, ++ save_reg_x, ++ save_regp, ++ save_regp_x, ++ save_fregp, ++ save_fregp_x, ++ save_freg, ++ save_freg_x, ++ save_lrpair, ++ save_fplr, ++ save_fplr_x, ++ save_r19r20_x, ++ add_fp, ++ set_fp, ++ save_next, ++ nop, ++ pac_sign_lr, ++ end, ++ end_c, ++ unwind_last_type = end_c ++} seh_arm64_unwind_types; ++ + /* architecture specific pdata/xdata handling. */ + #define SEH_CMDS \ + {"seh_proc", obj_coff_seh_proc, 0}, \ +@@ -87,6 +123,91 @@ typedef struct seh_prologue_element + symbolS *pc_addr; + } seh_prologue_element; + ++typedef struct seh_arm64_unwind_code ++{ ++ uint32_t value; ++ seh_arm64_unwind_types type; ++} seh_arm64_unwind_code; ++ ++typedef struct seh_arm64_packed_unwind_data ++{ ++ uint32_t flag : 2; ++ uint32_t func_length : 11; ++ uint32_t frame_size : 9; ++ uint32_t cr : 2; ++ uint32_t h : 1; ++ uint32_t regI : 4; ++ uint32_t regF : 3; ++} seh_arm64_packed_unwind_data; ++ ++typedef struct seh_arm64_except_info ++{ ++ uint32_t flag : 2; ++ uint32_t except_info_rva : 30; ++} seh_arm64_except_info; ++ ++typedef union seh_arm64_unwind_info ++{ ++ seh_arm64_except_info except_info; ++ seh_arm64_packed_unwind_data packed_unwind_data; ++} seh_arm64_unwind_info; ++ ++typedef struct seh_arm64_pdata ++{ ++ unsigned int func_start_rva; ++ seh_arm64_unwind_info except_info_unwind; ++} seh_arm64_pdata; ++ ++typedef struct seh_arm64_xdata_header ++{ ++ uint32_t func_length : 18; ++ uint32_t vers : 2; ++ uint32_t x : 1; ++ uint32_t e : 1; ++ uint32_t epilogue_count : 5; ++ uint32_t code_words : 5; ++ uint32_t ext_epilogue_count : 16; ++ uint32_t ext_code_words : 8; ++ uint32_t reserved : 8; ++} seh_arm64_xdata_header; ++ ++typedef struct seh_arm64_epilogue_scope ++{ ++ uint32_t epilogue_start_offset_reduced : 18; ++ uint32_t reserved : 4; ++ uint32_t epilogue_start_index : 10; ++ uintptr_t epilogue_start_offset; ++ uintptr_t epilogue_end_offset; ++} seh_arm64_epilogue_scope; ++ ++typedef struct seh_arm64_func_fragment ++{ ++ uintptr_t offset; ++ symbolS *xdata_addr; ++ struct seh_arm64_func_fragment *next; ++} seh_arm64_func_fragment; ++ ++#define ARM64_MAX_UNWIND_CODES 286 ++#define ARM64_MAX_EPILOGUE_SCOPES 32 ++ ++typedef struct seh_arm64_context ++{ ++ seh_arm64_pdata pdata; ++ union { ++ seh_arm64_xdata_header xdata_header; ++ valueT xdata_header_value; ++ }; ++ unsigned int unwind_codes_count; ++ unsigned int unwind_codes_byte_count; ++ seh_arm64_unwind_code unwind_codes[ARM64_MAX_UNWIND_CODES]; ++ unsigned int epilogue_scopes_count; ++ seh_arm64_epilogue_scope epilogue_scopes[ARM64_MAX_EPILOGUE_SCOPES]; ++ expressionS except_handler; ++ expressionS except_handler_data; ++ /* The function fragments. */ ++ seh_arm64_func_fragment func_fragment; ++} seh_arm64_context; ++ + typedef struct seh_context + { + /* Initial code-segment. */ +@@ -126,13 +247,17 @@ typedef struct seh_context + int elems_count; + int elems_max; + seh_prologue_element *elems; ++ ++ /* arm64-specific context. */ ++ seh_arm64_context arm64_ctx; + } seh_context; + + typedef enum seh_kind { + seh_kind_unknown = 0, + seh_kind_mips = 1, /* Used for MIPS and x86 pdata generation. */ + seh_kind_arm = 2, /* Used for ARM, PPC, SH3, and SH4 pdata (PDATA_EH) generation. */ +- seh_kind_x64 = 3 /* Used for IA64 and x64 pdata/xdata generation. */ ++ seh_kind_x64 = 3, /* Used for IA64 and x64 pdata/xdata generation. */ ++ seh_kind_arm64 = 4 /* Used for ARM64 pdata/xdata generation. */ + } seh_kind; + + /* Forward declarations. */ +@@ -201,4 +326,29 @@ static void obj_coff_seh_code (int); + (PEX64_OFFSET_TO_SCOPE_COUNT(COUNTOFUNWINDCODES) + \ + PEX64_SCOPE_ENTRY_SIZE * (IDX)) + ++/* arm64 unwind code structs. */ ++ ++#define ARM64_UNOP_ALLOCS 0b000U ++#define ARM64_UNOP_SAVER19R20X 0b001U ++#define ARM64_UNOP_SAVEFPLR 0b01U ++#define ARM64_UNOP_SAVEFPLRX 0b10U ++#define ARM64_UNOP_ALLOCM 0b11000U ++#define ARM64_UNOP_SAVEREGP 0b110010U ++#define ARM64_UNOP_SAVEREGPX 0b110011U ++#define ARM64_UNOP_SAVEREG 0b110100U ++#define ARM64_UNOP_SAVEREGX 0b1101010U ++#define ARM64_UNOP_SAVELRPAIR 0b1101011U ++#define ARM64_UNOP_SAVEFREGP 0b1101100U ++#define ARM64_UNOP_SAVEFREGPX 0b1101101U ++#define ARM64_UNOP_SAVEFREG 0b1101110U ++#define ARM64_UNOP_SAVEFREGX 0b11011110U ++#define ARM64_UNOP_ALLOCL 0b11100000U ++#define ARM64_UNOP_SETFP 0b11100001U ++#define ARM64_UNOP_ADDFP 0b11100010U ++#define ARM64_UNOP_NOP 0b11100011U ++#define ARM64_UNOP_END 0b11100100U ++#define ARM64_UNOP_ENDC 0b11100101U ++#define ARM64_UNOP_SAVENEXT 0b11100110U ++#define ARM64_UNOP_PACSIGNLR 0b11111100U ++ + #endif +-- +2.34.1 diff --git a/packages/binutils/2.45/0008-Adjust-x64-SEH-implementation-for-AArch64.patch b/packages/binutils/2.45/0008-Adjust-x64-SEH-implementation-for-AArch64.patch new file mode 100644 index 0000000000..a98fac033a --- /dev/null +++ b/packages/binutils/2.45/0008-Adjust-x64-SEH-implementation-for-AArch64.patch @@ -0,0 +1,448 @@ +From 2222222222222222222222222222222222222222 Mon Sep 17 00:00:00 2001 +From: Evgeny Karpov +Date: Fri, 9 May 2025 13:03:00 +0200 +Subject: [PATCH v2 3/7] Adjust x64 SEH implementation for AArch64 + +This patch defines the required unwind codes for AArch64 and updates handlers +for SEH commands that are used by both x64 and AArch64. +It implements encoding for unwind elements that will be emitted +to pdata/xdata sections. + +gas/ChangeLog: + + * config/obj-coff-seh.c (struct unwind_code_pack_info): New. + (defined): Add COFFAARCH64 guard. + (obj_coff_seh_code): Update. + (seh_get_target_kind): Update. + (verify_context_and_targets): New. + (obj_coff_seh_eh): Add COFFAARCH64 guard. + (obj_coff_seh_handler): Update. + (obj_coff_seh_handlerdata): Update. + (seh_arm64_add_unwind_element): New. + (obj_coff_seh_proc): Update. + (obj_coff_seh_endprologue): Update. + (obj_coff_seh_save): Add COFFAARCH64 guard. + (obj_coff_seh_setframe): Likewise. + * config/obj-coff-seh.h (obj_coff_seh_setframe): Add COFFAARCH64 guard. + (obj_coff_seh_endproc): Likewise. + (obj_coff_seh_proc): Likewise. + (obj_coff_seh_handler): Likewise. + (obj_coff_seh_handlerdata): Likewise. + (defined): Likewise. + (obj_coff_seh_code): Likewise. +--- + gas/config/obj-coff-seh.c | 260 +++++++++++++++++++++++++++++++++++--- + gas/config/obj-coff-seh.h | 12 +- + 2 files changed, 246 insertions(+), 26 deletions(-) + +diff --git a/gas/config/obj-coff-seh.c b/gas/config/obj-coff-seh.c +index 70cb4e4aa64..d861be4418e 100644 +--- a/gas/config/obj-coff-seh.c ++++ b/gas/config/obj-coff-seh.c +@@ -28,6 +28,20 @@ struct seh_seg_list { + char *seg_name; + }; + ++struct unwind_code_pack_info { ++ const char *directive; ++ int offset_bits; ++ int reg_bits; ++ int code_bits; ++ int code; ++ int offset_right_shift; ++ int offset; ++ int reg_right_shift; ++ int reg_offset; ++ int type; ++ int size; ++}; ++ + /* Local data. */ + static seh_context *seh_ctx_cur = NULL; + +@@ -36,6 +50,51 @@ static htab_t seh_hash; + static struct seh_seg_list *x_segcur = NULL; + static struct seh_seg_list *p_segcur = NULL; + ++const struct unwind_code_pack_info unwind_code_pack_infos[] = { ++ {NULL, 5, 0, 3, ARM64_UNOP_ALLOCS, 4, 0, 0, 0, ++ alloc_s, 1}, ++ {NULL, 11, 0, 5, ARM64_UNOP_ALLOCM, 4, 0, 0, 0, ++ alloc_m, 2}, ++ {NULL, 24, 0, 8, ARM64_UNOP_ALLOCL, 4, 0, 0, 0, ++ alloc_l, 4}, ++ {".seh_save_reg", 6, 4, 6, ARM64_UNOP_SAVEREG, 3, 0, 0, 19, ++ save_reg, 2}, ++ {".seh_save_reg_x", 5, 4, 7, ARM64_UNOP_SAVEREGX, 3, 1, 0, 19, ++ save_reg_x, 2}, ++ {".seh_save_regp", 6, 4, 6, ARM64_UNOP_SAVEREGP, 3, 0, 0, 19, ++ save_regp, 2}, ++ {".seh_save_regp_x", 6, 4, 6, ARM64_UNOP_SAVEREGPX, 3, 1, 0, 19, ++ save_regp_x, 2}, ++ {".seh_save_lrpair", 6, 3, 7, ARM64_UNOP_SAVELRPAIR, 3, 0, 1, 19, ++ save_lrpair, 2}, ++ {".seh_save_fregp", 6, 3, 7, ARM64_UNOP_SAVEFREGP, 3, 0, 0, 8, ++ save_fregp, 2}, ++ {".seh_save_fregp_x", 6, 3, 7, ARM64_UNOP_SAVEFREGPX, 3, 1, 0, 8, ++ save_fregp_x, 2}, ++ {".seh_save_freg", 6, 3, 7, ARM64_UNOP_SAVEFREG, 3, 0, 0, 8, ++ save_freg, 2}, ++ {".seh_save_freg_x", 5, 3, 8, ARM64_UNOP_SAVEFREGX, 3, 1, 0, 8, ++ save_freg_x, 2}, ++ {".seh_save_fplr", 6, 0, 2, ARM64_UNOP_SAVEFPLR, 3, 0, 0, 0, ++ save_fplr, 1}, ++ {".seh_save_fplr_x", 6, 0, 6, ARM64_UNOP_SAVEFPLRX, 3, 1, 0, 0, ++ save_fplr_x, 1}, ++ {".seh_save_r19r20_x", 5, 0, 3, ARM64_UNOP_SAVER19R20X, 3, 0, 0, 0, ++ save_r19r20_x, 1}, ++ {".seh_add_fp", 8, 0, 8, ARM64_UNOP_ADDFP, 0, 0, 0, 0, ++ add_fp, 2}, ++ {".seh_set_fp", 0, 0, 8, ARM64_UNOP_SETFP, 0, 0, 0, 0, ++ set_fp, 1}, ++ {".seh_save_next", 0, 0, 8, ARM64_UNOP_SAVENEXT, 0, 0, 0, 0, ++ save_next, 1}, ++ {".seh_nop", 0, 0, 8, ARM64_UNOP_NOP, 0, 0, 0, 0, ++ nop, 1}, ++ {".seh_pac_sign_lr", 0, 0, 8, ARM64_UNOP_PACSIGNLR, 0, 0, 0, 0, ++ pac_sign_lr, 1}, ++ {NULL, 0, 0, 8, ARM64_UNOP_END, 0, 0, 0, 0, ++ end, 1}, ++}; ++ + static void write_function_xdata (seh_context *); + static void write_function_pdata (seh_context *); + +@@ -164,12 +223,14 @@ seh_validate_seg (const char *directive) + return 0; + } + ++#if !defined (COFFAARCH64) + /* Switch back to the code section, whatever that may be. */ + static void + obj_coff_seh_code (int ignored ATTRIBUTE_UNUSED) + { + subseg_set (seh_ctx_cur->code_seg, 0); + } ++#endif + + static void + switch_xdata (int subseg, segT code_seg) +@@ -200,6 +261,8 @@ seh_get_target_kind (void) + switch (bfd_get_arch (stdoutput)) + { + case bfd_arch_aarch64: ++ return seh_kind_arm64; ++ + case bfd_arch_arm: + case bfd_arch_powerpc: + case bfd_arch_sh: +@@ -270,6 +333,32 @@ verify_context_and_target (const char *directive, seh_kind target) + return verify_context (directive); + } + ++/* Verify mulitple targets. */ ++ ++static int ++verify_context_and_targets (const char *directive, const seh_kind targets[], ++ int count_targets) ++{ ++ bool match = false; ++ for (int i = 0; i < count_targets; ++i) ++ { ++ if (seh_get_target_kind () == targets[i]) ++ { ++ match = true; ++ break; ++ } ++ } ++ ++ if (!match) ++ { ++ as_warn (_("%s ignored for this target"), directive); ++ ignore_rest_of_line (); ++ return 0; ++ } ++ ++ return verify_context (directive); ++} ++ + /* Skip whitespace and a comma. Error if the comma is not seen. */ + + static int +@@ -292,6 +381,7 @@ skip_whitespace_and_comma (int required) + return 0; + } + ++#if !defined (COFFAARCH64) + /* Mark current context to use 32-bit instruction (arm). */ + + static void +@@ -320,6 +410,7 @@ obj_coff_seh_eh (int what ATTRIBUTE_UNUSED) + + demand_empty_rest_of_line (); + } ++#endif + + /* Set for current context the default handler (x64). */ + +@@ -362,6 +453,10 @@ obj_coff_seh_handler (int what ATTRIBUTE_UNUSED) + else + expression (&seh_ctx_cur->handler); + ++ const seh_kind target_kind = seh_get_target_kind (); ++ if (target_kind == seh_kind_arm64) ++ seh_ctx_cur->arm64_ctx.xdata_header.x = 1; ++ + seh_ctx_cur->handler_data.X_op = O_constant; + seh_ctx_cur->handler_data.X_add_number = 0; + seh_ctx_cur->handler_flags = 0; +@@ -369,7 +464,7 @@ obj_coff_seh_handler (int what ATTRIBUTE_UNUSED) + if (!skip_whitespace_and_comma (0)) + return; + +- if (seh_get_target_kind () == seh_kind_x64) ++ if (target_kind == seh_kind_x64 || target_kind == seh_kind_arm64) + { + do + { +@@ -401,13 +496,65 @@ obj_coff_seh_handler (int what ATTRIBUTE_UNUSED) + static void + obj_coff_seh_handlerdata (int what ATTRIBUTE_UNUSED) + { +- if (!verify_context_and_target (".seh_handlerdata", seh_kind_x64)) ++ const seh_kind targets[] = { seh_kind_x64, seh_kind_arm64 }; ++ if (!verify_context_and_targets (".seh_handlerdata", targets, ++ sizeof (targets) / sizeof (seh_kind))) + return; + demand_empty_rest_of_line (); + + switch_xdata (seh_ctx_cur->subsection + 1, seh_ctx_cur->code_seg); + } + ++/* Obtain available unwind element. */ ++ ++static void ++seh_arm64_add_unwind_element (seh_arm64_unwind_types unwind_type, int offset, ++ int reg) ++{ ++ if (seh_ctx_cur == NULL ++ || seh_ctx_cur->arm64_ctx.unwind_codes_count >= ARM64_MAX_UNWIND_CODES) ++ { ++ as_warn (_("no unwind element available.")); ++ return; ++ } ++ ++ seh_arm64_unwind_code *arm64_element = seh_ctx_cur->arm64_ctx.unwind_codes ++ + seh_ctx_cur->arm64_ctx.unwind_codes_count++; ++ const struct unwind_code_pack_info *unwind_code_pack_info; ++ unwind_code_pack_info = unwind_code_pack_infos + unwind_type; ++ arm64_element->value = 0; ++ int value_offset_bits = 0; ++ ++ if (unwind_code_pack_info->offset_bits) ++ { ++ offset = (offset >> unwind_code_pack_info->offset_right_shift) ++ - unwind_code_pack_info->offset; ++ offset &= (1 << unwind_code_pack_info->offset_bits) - 1; ++ arm64_element->value |= offset << value_offset_bits; ++ value_offset_bits += unwind_code_pack_info->offset_bits; ++ } ++ ++ if (unwind_code_pack_info->reg_bits) ++ { ++ reg = (reg >> unwind_code_pack_info->reg_right_shift) ++ - unwind_code_pack_info->reg_offset; ++ reg &= (1 << unwind_code_pack_info->reg_bits) - 1; ++ arm64_element->value |= reg << value_offset_bits; ++ value_offset_bits += unwind_code_pack_info->reg_bits; ++ } ++ ++ if (unwind_code_pack_info->code_bits) ++ { ++ int code = unwind_code_pack_info->code; ++ code &= (1 << unwind_code_pack_info->code_bits) - 1; ++ arm64_element->value |= code << value_offset_bits; ++ } ++ ++ arm64_element->type = unwind_code_pack_info->type; ++ seh_ctx_cur->arm64_ctx.unwind_codes_byte_count += unwind_code_pack_info->size; ++} ++ ++ + /* Mark end of current context. */ + + static void +@@ -419,6 +566,16 @@ do_seh_endproc (void) + write_function_pdata (seh_ctx_cur); + free (seh_ctx_cur->elems); + free (seh_ctx_cur->func_name); ++#if defined (COFFAARCH64) ++ seh_arm64_func_fragment *fragment; ++ fragment = seh_ctx_cur->arm64_ctx.func_fragment.next; ++ while (fragment) ++ { ++ seh_arm64_func_fragment *next = fragment->next; ++ XDELETE (fragment); ++ fragment = next; ++ } ++#endif + free (seh_ctx_cur); + seh_ctx_cur = NULL; + } +@@ -465,11 +622,18 @@ obj_coff_seh_proc (int what ATTRIBUTE_UNUSED) + + seh_ctx_cur->code_seg = now_seg; + +- if (seh_get_target_kind () == seh_kind_x64) ++ seh_kind kind = seh_get_target_kind (); ++ if (kind == seh_kind_x64 || kind == seh_kind_arm64) + { + x_segcur = seh_hash_find_or_make (seh_ctx_cur->code_seg, ".xdata"); + seh_ctx_cur->subsection = x_segcur->subseg; + x_segcur->subseg += 2; ++ ++ if (kind == seh_kind_arm64) ++ { ++ seh_ctx_cur->arm64_ctx.unwind_codes_count = 0; ++ seh_ctx_cur->arm64_ctx.epilogue_scopes_count = 0; ++ } + } + + SKIP_WHITESPACE (); +@@ -498,6 +662,23 @@ obj_coff_seh_endprologue (int what ATTRIBUTE_UNUSED) + as_warn (_("duplicate .seh_endprologue in .seh_proc block")); + else + seh_ctx_cur->endprologue_addr = symbol_temp_new_now (); ++ ++ if (seh_get_target_kind () == seh_kind_arm64) ++ { ++ const int n = seh_ctx_cur->arm64_ctx.unwind_codes_count; ++ ++ /* Unwind codes need to be reversed. */ ++ for (int i = 0; i < n / 2; ++i) ++ { ++ seh_arm64_unwind_code *unwind_codes; ++ unwind_codes = seh_ctx_cur->arm64_ctx.unwind_codes; ++ seh_arm64_unwind_code temp = unwind_codes[i]; ++ unwind_codes[i] = unwind_codes[n-i-1]; ++ unwind_codes[n-i-1] = temp; ++ } ++ ++ seh_arm64_add_unwind_element (end, 0, 0); ++ } + } + + /* End-of-file hook. */ +@@ -533,6 +714,7 @@ seh_x64_make_prologue_element (int code, int info, offsetT off) + n->pc_addr = symbol_temp_new_now (); + } + ++#if !defined (COFFAARCH64) + /* Helper to read a register name from input stream (x64). */ + + static int +@@ -682,6 +864,7 @@ obj_coff_seh_save (int what) + + seh_x64_make_prologue_element (code, reg, off); + } ++#endif + + /* Add a stack-allocation token to current context. */ + +@@ -691,36 +874,69 @@ obj_coff_seh_stackalloc (int what ATTRIBUTE_UNUSED) + offsetT off; + int code, info; + +- if (!verify_context_and_target (".seh_stackalloc", seh_kind_x64) ++ const seh_kind targets[] = { seh_kind_x64, seh_kind_arm64 }; ++ if (!verify_context_and_targets (".seh_stackalloc", targets, ++ sizeof (targets) / sizeof (seh_kind)) + || !seh_validate_seg (".seh_stackalloc")) + return; + + off = get_absolute_expression (); + demand_empty_rest_of_line (); + +- if (off == 0) +- return; +- if (off < 0) ++ switch (seh_get_target_kind ()) + { +- as_bad (_(".seh_stackalloc offset is negative")); +- return; +- } ++ case seh_kind_x64: ++ if (off == 0) ++ return; ++ if (off < 0) ++ { ++ as_bad (_(".seh_stackalloc offset is negative")); ++ return; ++ } + +- if ((off & 7) == 0 && off <= 128) +- code = UWOP_ALLOC_SMALL, info = (off - 8) >> 3, off = 0; +- else if ((off & 7) == 0 && off <= (offsetT) (0xffff * 8)) +- code = UWOP_ALLOC_LARGE, info = 0, off >>= 3; +- else if (off <= (offsetT) 0xffffffff) +- code = UWOP_ALLOC_LARGE, info = 1; +- else +- { +- as_bad (_(".seh_stackalloc offset out of range")); ++ if ((off & 7) == 0 && off <= 128) ++ code = UWOP_ALLOC_SMALL, info = (off - 8) >> 3, off = 0; ++ else if ((off & 7) == 0 && off <= (offsetT) (0xffff * 8)) ++ code = UWOP_ALLOC_LARGE, info = 0, off >>= 3; ++ else if (off <= (offsetT) 0xffffffff) ++ code = UWOP_ALLOC_LARGE, info = 1; ++ else ++ { ++ as_bad (_(".seh_stackalloc offset out of range")); ++ return; ++ } ++ ++ seh_x64_make_prologue_element (code, info, off); ++ break; ++ ++ case seh_kind_arm64: ++ /* arm64 offset should be encoded in multiples of sixteen. */ ++ if ((off & 0xf) != 0) ++ { ++ as_bad (_(".seh_stackalloc offset < 16-byte stack alignment")); ++ return; ++ } ++ ++ if (off < 0x200) ++ seh_arm64_add_unwind_element (alloc_s, off, 0); ++ else if (off < 0x8000) ++ seh_arm64_add_unwind_element (alloc_m, off, 0); ++ else if (off < 0x10000000) ++ seh_arm64_add_unwind_element (alloc_l, off, 0); ++ else ++ { ++ as_bad (_(".seh_stackalloc offset out of range")); ++ return; ++ } ++ break; ++ ++ default: ++ as_bad (_(".seh_stackalloc invalid target")); + return; + } +- +- seh_x64_make_prologue_element (code, info, off); + } + ++#if !defined (COFFAARCH64) + /* Add a frame-pointer token to current context. */ + + static void +@@ -758,7 +974,7 @@ obj_coff_seh_setframe (int what ATTRIBUTE_UNUSED) + seh_x64_make_prologue_element (UWOP_SET_FPREG, 0, 0); + } + } +- ++#endif + /* Data writing routines. */ + + /* Output raw integers in 1, 2, or 4 bytes. */ diff --git a/packages/binutils/2.45/0009-Add-aarch64-specific-SEH-commands.patch b/packages/binutils/2.45/0009-Add-aarch64-specific-SEH-commands.patch new file mode 100644 index 0000000000..53de4220fa --- /dev/null +++ b/packages/binutils/2.45/0009-Add-aarch64-specific-SEH-commands.patch @@ -0,0 +1,178 @@ +From 3333333333333333333333333333333333333333 Mon Sep 17 00:00:00 2001 +From: Evgeny Karpov +Date: Fri, 9 May 2025 13:07:00 +0200 +Subject: [PATCH v2 4/7] Add aarch64-specific SEH commands + +Implementation for aarch64 contains SEH commands that are not present for +x64 architecture, such as .seh_startepilogue/.seh_endepilogue, +.seh_save_reg*, .seh_save_freg*, and others. + +gas/ChangeLog: + + * config/obj-coff-seh.c (defined): Use COFFAARCH64 guard. + (obj_coff_seh_startepilogue): New. + (obj_coff_seh_endepilogue): New. + (obj_coff_seh_endfunclet): New. + (obj_coff_seh_save_reg): New. +--- + gas/config/obj-coff-seh.c | 138 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 138 insertions(+) + +diff --git a/gas/config/obj-coff-seh.c b/gas/config/obj-coff-seh.c +index d861be4418e..8f9562ee234 100644 +--- a/gas/config/obj-coff-seh.c ++++ b/gas/config/obj-coff-seh.c +@@ -681,6 +681,86 @@ obj_coff_seh_endprologue (int what ATTRIBUTE_UNUSED) + } + } + ++#if defined (COFFAARCH64) ++static void ++obj_coff_seh_startepilogue (int what ATTRIBUTE_UNUSED) ++{ ++ symbolS *epilogue_start_addr; ++ expressionS exp; ++ ++ if (!verify_context (".seh_startepilogue") ++ || !seh_validate_seg (".seh_startepilogue")) ++ return; ++ demand_empty_rest_of_line (); ++ ++ if (seh_get_target_kind () != seh_kind_arm64) ++ return; ++ ++ epilogue_start_addr = symbol_temp_new_now (); ++ exp.X_op = O_subtract; ++ exp.X_add_symbol = epilogue_start_addr; ++ exp.X_op_symbol = seh_ctx_cur->start_addr; ++ exp.X_add_number = 0; ++ ++ if (!resolve_expression (&exp) || exp.X_op != O_constant ++ || exp.X_add_number < 0) ++ as_bad (_(".seh_startepilog offset expression for %s " ++ "does not evaluate to a non-negative constant"), ++ S_GET_NAME (epilogue_start_addr)); ++ ++ seh_arm64_epilogue_scope *epilogue_scope; ++ epilogue_scope = seh_ctx_cur->arm64_ctx.epilogue_scopes ++ + seh_ctx_cur->arm64_ctx.epilogue_scopes_count; ++ epilogue_scope->epilogue_start_offset = exp.X_add_number / 4; ++ epilogue_scope->reserved = 0; ++ epilogue_scope->epilogue_start_index ++ = seh_ctx_cur->arm64_ctx.unwind_codes_byte_count; ++ seh_ctx_cur->arm64_ctx.epilogue_scopes_count++; ++} ++ ++static void ++obj_coff_seh_endepilogue (int what ATTRIBUTE_UNUSED) ++{ ++ if (!verify_context (".seh_endepilogue") ++ || !seh_validate_seg (".seh_endepilogue")) ++ return; ++ ++ demand_empty_rest_of_line (); ++ ++ expressionS exp; ++ symbolS *epilogue_end_addr = symbol_temp_new_now (); ++ exp.X_op = O_subtract; ++ exp.X_add_symbol = epilogue_end_addr; ++ exp.X_op_symbol = seh_ctx_cur->start_addr; ++ exp.X_add_number = 0; ++ ++ if (!resolve_expression (&exp) || exp.X_op != O_constant ++ || exp.X_add_number < 0) ++ as_bad (_(".seh_endepilogue offset expression for %s " ++ "does not evaluate to a non-negative constant"), ++ S_GET_NAME (epilogue_end_addr)); ++ ++ seh_arm64_epilogue_scope *epilogue_scope; ++ epilogue_scope = seh_ctx_cur->arm64_ctx.epilogue_scopes ++ + seh_ctx_cur->arm64_ctx.epilogue_scopes_count - 1; ++ ++ epilogue_scope->epilogue_end_offset = exp.X_add_number; ++ ++ /* End code. */ ++ seh_arm64_add_unwind_element (end, 0, 0); ++} ++ ++static void ++obj_coff_seh_endfunclet (int what ATTRIBUTE_UNUSED) ++{ ++ if (!verify_context (".seh_endfunclet") ++ || !seh_validate_seg (".seh_endfunclet")) ++ return; ++ ++ demand_empty_rest_of_line (); ++} ++#endif ++ + /* End-of-file hook. */ + + void +@@ -866,6 +946,64 @@ obj_coff_seh_save (int what) + } + #endif + ++#if defined (COFFAARCH64) ++static void ++obj_coff_seh_save_reg (int type) ++{ ++ if (type < 0 || type > unwind_last_type) ++ { ++ as_bad (_("invalid pseudo operation.")); ++ return; ++ } ++ ++ const struct unwind_code_pack_info *unwind_code_pack_info; ++ unwind_code_pack_info = unwind_code_pack_infos + type; ++ ++ if (!unwind_code_pack_info->directive ++ || !verify_context_and_target (unwind_code_pack_info->directive, ++ seh_kind_arm64) ++ || !seh_validate_seg (unwind_code_pack_info->directive)) ++ return; ++ ++ SKIP_WHITESPACE (); ++ ++ char *symbol_name = NULL; ++ int reg = -1; ++ ++ if (unwind_code_pack_info->reg_bits) ++ { ++ char name_end = get_symbol_name (&symbol_name); ++ reg = atoi (symbol_name + 1); ++ (void) restore_line_pointer (name_end); ++ ++ if (!skip_whitespace_and_comma (1)) ++ return; ++ ++ if (reg < 0) ++ { ++ as_bad (_("register is negative")); ++ return; ++ } ++ } ++ ++ offsetT off = -1; ++ if (unwind_code_pack_info->offset_bits) ++ { ++ off = get_absolute_expression (); ++ ++ if (off < 0) ++ { ++ as_bad (_("offset is negative")); ++ return; ++ } ++ } ++ ++ demand_empty_rest_of_line (); ++ ++ seh_arm64_add_unwind_element (type, off, reg); ++} ++#endif ++ + /* Add a stack-allocation token to current context. */ + + static void +-- +2.34.1 diff --git a/packages/binutils/2.45/0010-Write-SEH-records-to-pdata-xdata.patch b/packages/binutils/2.45/0010-Write-SEH-records-to-pdata-xdata.patch new file mode 100644 index 0000000000..66c24945c0 --- /dev/null +++ b/packages/binutils/2.45/0010-Write-SEH-records-to-pdata-xdata.patch @@ -0,0 +1,366 @@ +From 4444444444444444444444444444444444444444 Mon Sep 17 00:00:00 2001 +From: Evgeny Karpov +Date: Fri, 9 May 2025 13:09:00 +0200 +Subject: [PATCH v2 5/7] Write SEH records to pdata/xdata + +The patch emits the required records to the pdata/xdata sections that contain +unwinding information for SEH. + +gas/ChangeLog: + + * config/obj-coff-seh.c (seh_arm64_emit_epilog_scopes): New. + (seh_arm64_emit_unwind_codes): New. + (seh_arm64_write_function_xdata): New. + (write_function_xdata): Update. + (write_function_pdata): Update. +--- + gas/config/obj-coff-seh.c | 308 +++++++++++++++++++++++++++++++++++++- + 1 file changed, 306 insertions(+), 2 deletions(-) + +diff --git a/gas/config/obj-coff-seh.c b/gas/config/obj-coff-seh.c +index 8f9562ee234..0ce70564368 100644 +--- a/gas/config/obj-coff-seh.c ++++ b/gas/config/obj-coff-seh.c +@@ -1192,6 +1192,78 @@ seh_x64_write_prologue_data (const seh_context *c) + } + } + ++static void ++seh_arm64_emit_epilog_scopes (uint64_t fragment_offset, ++ uint32_t prolog_size, ++ unsigned int first_fragment_scope, ++ unsigned int last_fragment_scope, ++ bool has_phantom_prolog) ++{ ++ int32_t start_index_offset = 0; ++ const ++ seh_arm64_epilogue_scope *scopes = seh_ctx_cur->arm64_ctx.epilogue_scopes; ++ if (first_fragment_scope < seh_ctx_cur->arm64_ctx.epilogue_scopes_count) ++ start_index_offset = scopes[first_fragment_scope].epilogue_start_index ++ - prolog_size; ++ if (has_phantom_prolog) ++ start_index_offset -= 1; ++ for (unsigned int i = first_fragment_scope; i < last_fragment_scope; ++i) ++ { ++ seh_arm64_epilogue_scope scope; ++ scope = seh_ctx_cur->arm64_ctx.epilogue_scopes[i]; ++ scope.epilogue_start_offset_reduced = (scope.epilogue_start_offset ++ - fragment_offset) >> 2; ++ scope.epilogue_start_index -= start_index_offset; ++ uint32_t scope_code; ++ memcpy (&scope_code, &scope, sizeof (scope_code)); ++ out_four (scope_code); ++ } ++} ++ ++static void ++seh_arm64_emit_unwind_codes (const seh_context *c, uint32_t prolog_size, ++ uint32_t first_epilog_index, ++ uint32_t last_epilog_index, ++ bool has_phantom_prolog) ++{ ++ uint32_t total_byte_count = 0; ++ ++ if (has_phantom_prolog) ++ { ++ ++total_byte_count; ++ md_number_to_chars (frag_more (1), ARM64_UNOP_ENDC, 1); ++ } ++ ++ uint32_t unwind_bytes_offset = 0; ++ for (int i = 0; i < (int)c->arm64_ctx.unwind_codes_count; ++i) ++ { ++ const seh_arm64_unwind_code *code = c->arm64_ctx.unwind_codes + i; ++ const int byte_count = unwind_code_pack_infos[code->type].size; ++ unwind_bytes_offset += byte_count; ++ ++ if (unwind_bytes_offset > last_epilog_index) ++ break; ++ ++ if (unwind_bytes_offset > prolog_size ++ && unwind_bytes_offset <= first_epilog_index) ++ continue; ++ ++ /* emit unwind code bytes in big endian. */ ++ number_to_chars_bigendian (frag_more (byte_count), code->value, ++ byte_count); ++ total_byte_count += byte_count; ++ } ++ ++ /* handle word alignment. */ ++ int required_padding = (4 - total_byte_count % 4) % 4; ++ if (required_padding) ++ { ++ const uint32_t nop_chain = 0xe3e3e3e3; ++ md_number_to_chars (frag_more (required_padding), nop_chain, ++ required_padding); ++ } ++} ++ + static int + seh_x64_size_prologue_data (const seh_context *c) + { +@@ -1286,6 +1358,205 @@ seh_x64_write_function_xdata (seh_context *c) + /* Handler data will be tacked in here by subsections. */ + } + ++/* Write out the xdata information for one function (arm64). */ ++static void ++seh_arm64_write_function_xdata (seh_context *c) ++{ ++ if (!seh_ctx_cur->arm64_ctx.unwind_codes_byte_count) ++ return; ++ ++ /* Set 4-byte alignment. */ ++ frag_align (2, 0, 0); ++ ++ uintptr_t func_length = 0; ++ expressionS exp; ++ exp.X_op = O_subtract; ++ exp.X_add_symbol = c->end_addr; ++ exp.X_op_symbol = c->start_addr; ++ exp.X_add_number = 0; ++ if (!resolve_expression (&exp) || exp.X_op != O_constant ++ || exp.X_add_number < 0) ++ as_bad (_("the function size expression for %s " ++ "does not evaluate to a non-negative constant"), ++ S_GET_NAME (c->start_addr)); ++ ++ func_length = exp.X_add_number; ++ ++ const uint32_t max_frag_size = ((1 << 18) - 1) << 2; ++ uintptr_t fragment_offset = 0; ++ bool is_fragmented_function = func_length > max_frag_size; ++ ++ /* [first_fragment_scope, last_fragment_scope). */ ++ unsigned int first_fragment_scope = 0; ++ unsigned int last_fragment_scope = 0; ++ uint32_t prolog_size = 0; ++ uint32_t prolog_insruction_count = 0; ++ for (unsigned int i = 0; i < c->arm64_ctx.unwind_codes_count; ++i) ++ { ++ if (c->arm64_ctx.unwind_codes[i].type == end) ++ { ++ prolog_insruction_count = i + 1; ++ break; ++ } ++ } ++ ++ if (c->arm64_ctx.epilogue_scopes_count) ++ prolog_size = c->arm64_ctx.epilogue_scopes[0].epilogue_start_index; ++ else ++ prolog_size = c->arm64_ctx.unwind_codes_byte_count; ++ ++ seh_arm64_func_fragment *fragment; ++ fragment = &seh_ctx_cur->arm64_ctx.func_fragment; ++ ++ while (true) ++ { ++ fragment->xdata_addr = symbol_temp_new_now (); ++ fragment->offset = fragment_offset; ++ fragment->next = NULL; ++ ++ uintptr_t frag_size = func_length - fragment_offset; ++ if (frag_size > max_frag_size) ++ frag_size = max_frag_size; ++ ++ bool is_first_frag = fragment_offset == 0; ++ bool is_last_frag = (fragment_offset + frag_size) == func_length; ++ ++ if (!is_fragmented_function) ++ last_fragment_scope = c->arm64_ctx.epilogue_scopes_count; ++ else ++ { ++ first_fragment_scope = last_fragment_scope; ++ for (unsigned int i = first_fragment_scope; ++ i < c->arm64_ctx.epilogue_scopes_count; ++i) ++ { ++ const seh_arm64_epilogue_scope *scope; ++ scope = c->arm64_ctx.epilogue_scopes; ++ scope += i; ++ if (scope->epilogue_start_offset >= (fragment_offset + frag_size)) ++ break; ++ ++ if (scope->epilogue_end_offset >= (fragment_offset + frag_size)) ++ { ++ frag_size = scope->epilogue_start_offset - fragment_offset; ++ break; ++ } ++ ++ if (scope->epilogue_start_offset >= fragment_offset) ++ last_fragment_scope = i + 1; ++ } ++ } ++ ++ seh_arm64_xdata_header *header = &c->arm64_ctx.xdata_header; ++ const ++ seh_arm64_epilogue_scope *scopes = seh_ctx_cur->arm64_ctx.epilogue_scopes; ++ ++ header->func_length = frag_size >> 2; ++ header->vers = 0; ++ header->e = 0; ++ header->code_words = 0; ++ header->epilogue_count = 0; ++ ++ header->ext_code_words = 0; ++ header->ext_epilogue_count = last_fragment_scope ++ - first_fragment_scope; ++ header->reserved = 0; ++ ++ uint32_t first_epilog_index = 0; ++ uint32_t last_epilog_index = 0; ++ if (!header->ext_epilogue_count) ++ { ++ first_epilog_index = prolog_size; ++ last_epilog_index = prolog_size; ++ } ++ else ++ { ++ const seh_arm64_epilogue_scope *scope; ++ scope = scopes + first_fragment_scope; ++ first_epilog_index = scope->epilogue_start_index; ++ if (last_fragment_scope == c->arm64_ctx.epilogue_scopes_count) ++ last_epilog_index = c->arm64_ctx.unwind_codes_byte_count; ++ else ++ { ++ scope = scopes + last_fragment_scope; ++ last_epilog_index = scope->epilogue_start_index; ++ } ++ } ++ ++ uint32_t unwind_bytes = 0; ++ if (is_first_frag || is_last_frag) ++ unwind_bytes += prolog_size; ++ ++ if (header->ext_epilogue_count) ++ unwind_bytes += last_epilog_index - first_epilog_index; ++ ++ if (is_fragmented_function && is_last_frag && unwind_bytes) ++ { ++ unwind_bytes += 1; ++ ++header->ext_epilogue_count; ++ } ++ ++ header->ext_code_words = (unwind_bytes + 3) / 4; ++ ++ if ((header->ext_code_words == 0 && header->ext_epilogue_count == 0) ++ || header->ext_code_words > 31 ++ || header->ext_epilogue_count > 31) ++ md_number_to_chars (frag_more (8), c->arm64_ctx.xdata_header_value, 8); ++ else ++ { ++ header->code_words = header->ext_code_words; ++ header->epilogue_count = header->ext_epilogue_count; ++ if (header->epilogue_count == 1) ++ { ++ header->e = 1; ++ if (is_fragmented_function && is_last_frag) ++ header->ext_epilogue_count = 0; ++ else ++ { ++ const seh_arm64_epilogue_scope *scope; ++ scope = scopes + first_fragment_scope; ++ header->ext_epilogue_count = scope->epilogue_start_index; ++ } ++ } ++ out_four (c->arm64_ctx.xdata_header_value); ++ } ++ ++ bool has_phantom_prolog = is_fragmented_function && is_last_frag; ++ if (header->ext_epilogue_count && !header->e) ++ { ++ seh_arm64_emit_epilog_scopes (fragment_offset, prolog_size, ++ first_fragment_scope, ++ last_fragment_scope, ++ has_phantom_prolog); ++ if (is_fragmented_function && is_last_frag) ++ { ++ uint32_t epilog_start_offset; ++ epilog_start_offset = frag_size - prolog_insruction_count * 4; ++ md_number_to_chars (frag_more (4), ++ (1 << 22) | (epilog_start_offset >> 2), 4); ++ } ++ } ++ ++ if (header->ext_code_words) ++ seh_arm64_emit_unwind_codes (c, prolog_size, first_epilog_index, ++ last_epilog_index, has_phantom_prolog); ++ ++ if (header->x == 1) ++ { ++ if (c->handler.X_op == O_symbol) ++ c->handler.X_op = O_symbol_rva; ++ ++ emit_expr (&c->handler, 4); ++ } ++ ++ fragment_offset += frag_size; ++ if (fragment_offset == func_length) ++ break; ++ ++ fragment->next = XCNEW (seh_arm64_func_fragment); ++ fragment = fragment->next; ++ } ++} ++ + /* Write out xdata for one function. */ + + static void +@@ -1294,13 +1565,25 @@ write_function_xdata (seh_context *c) + segT save_seg = now_seg; + int save_subseg = now_subseg; + ++ seh_kind target_kind = seh_get_target_kind (); ++ + /* MIPS, SH, ARM don't have xdata. */ +- if (seh_get_target_kind () != seh_kind_x64) ++ if ((target_kind != seh_kind_x64) && (target_kind != seh_kind_arm64)) + return; + + switch_xdata (c->subsection, c->code_seg); + +- seh_x64_write_function_xdata (c); ++ switch (target_kind) ++ { ++ case seh_kind_x64: ++ seh_x64_write_function_xdata (c); ++ break; ++ case seh_kind_arm64: ++ seh_arm64_write_function_xdata (c); ++ break; ++ default: ++ break; ++ } + + subseg_set (save_seg, save_subseg); + } +@@ -1385,6 +1668,27 @@ write_function_pdata (seh_context *c) + emit_expr (&exp, 4); + break; + ++ case seh_kind_arm64: ++ if (!seh_ctx_cur->arm64_ctx.unwind_codes_byte_count) ++ break; ++ ++ seh_arm64_func_fragment *fragment = &seh_ctx_cur->arm64_ctx.func_fragment; ++ while (fragment) ++ { ++ exp.X_op = O_symbol_rva; ++ exp.X_add_number = fragment->offset; ++ exp.X_add_symbol = c->start_addr; ++ emit_expr (&exp, 4); ++ ++ exp.X_op = O_symbol_rva; ++ /* TODO: Implementing packed unwind data. */ ++ exp.X_add_number = 0; ++ exp.X_add_symbol = fragment->xdata_addr; ++ emit_expr (&exp, 4); ++ fragment = fragment->next; ++ } ++ break; ++ + case seh_kind_mips: + exp.X_op = O_symbol; + exp.X_add_number = 0; +-- +2.34.1 diff --git a/packages/binutils/2.45/0011-Apply-SEH-to-AArch64.patch b/packages/binutils/2.45/0011-Apply-SEH-to-AArch64.patch new file mode 100644 index 0000000000..47b0edf09a --- /dev/null +++ b/packages/binutils/2.45/0011-Apply-SEH-to-AArch64.patch @@ -0,0 +1,59 @@ +From 5555555555555555555555555555555555555555 Mon Sep 17 00:00:00 2001 +From: Evgeny Karpov +Date: Fri, 9 May 2025 13:11:00 +0200 +Subject: [PATCH v2 6/7] Apply SEH to AArch64 + +This change introduces the required commands for SEH on AArch64. + +gas/ChangeLog: + + * config/obj-coff-seh.h (defined): Use COFFAARCH64 guard. + (SEH_CMDS): New. +--- + gas/config/obj-coff-seh.h | 31 +++++++++++++++++++++++++++++++ + 1 file changed, 31 insertions(+) + +diff --git a/gas/config/obj-coff-seh.h b/gas/config/obj-coff-seh.h +index 63af8780a75..3d090c0d5ed 100644 +--- a/gas/config/obj-coff-seh.h ++++ b/gas/config/obj-coff-seh.h +@@ -113,6 +113,37 @@ typedef enum seh_arm64_unwind_types + {"seh_code", obj_coff_seh_code, 0}, \ + {"seh_handlerdata", obj_coff_seh_handlerdata, 0}, + ++#if defined (COFFAARCH64) ++#undef SEH_CMDS ++#define SEH_CMDS \ ++ {"seh_proc", obj_coff_seh_proc, 0}, \ ++ {"seh_endproc", obj_coff_seh_endproc, 0}, \ ++ {"seh_endprologue", obj_coff_seh_endprologue, 0}, \ ++ {"seh_startepilogue", obj_coff_seh_startepilogue, 0}, \ ++ {"seh_endepilogue", obj_coff_seh_endepilogue, 0}, \ ++ {"seh_stackalloc", obj_coff_seh_stackalloc, 0}, \ ++ {"seh_handler", obj_coff_seh_handler, 0}, \ ++ {"seh_handlerdata", obj_coff_seh_handlerdata, 0}, \ ++ {"seh_endfunclet", obj_coff_seh_endfunclet, 0}, \ ++ {"seh_save_reg", obj_coff_seh_save_reg, save_reg}, \ ++ {"seh_save_reg_x", obj_coff_seh_save_reg, save_reg_x}, \ ++ {"seh_save_regp", obj_coff_seh_save_reg, save_regp}, \ ++ {"seh_save_regp_x", obj_coff_seh_save_reg, save_regp_x}, \ ++ {"seh_save_lrpair", obj_coff_seh_save_reg, save_lrpair}, \ ++ {"seh_save_fregp", obj_coff_seh_save_reg, save_fregp}, \ ++ {"seh_save_fregp_x", obj_coff_seh_save_reg, save_fregp_x}, \ ++ {"seh_save_freg", obj_coff_seh_save_reg, save_freg}, \ ++ {"seh_save_freg_x", obj_coff_seh_save_reg, save_freg_x}, \ ++ {"seh_save_fplr", obj_coff_seh_save_reg, save_fplr}, \ ++ {"seh_save_fplr_x", obj_coff_seh_save_reg, save_fplr_x}, \ ++ {"seh_save_r19r20_x", obj_coff_seh_save_reg, save_r19r20_x}, \ ++ {"seh_add_fp", obj_coff_seh_save_reg, add_fp}, \ ++ {"seh_nop", obj_coff_seh_save_reg, nop}, \ ++ {"seh_pac_sign_lr", obj_coff_seh_save_reg, pac_sign_lr}, \ ++ {"seh_set_fp", obj_coff_seh_save_reg, set_fp}, \ ++ {"seh_save_next", obj_coff_seh_save_reg, save_next}, ++#endif ++ + /* Type definitions. */ + + typedef struct seh_prologue_element +-- +2.34.1 diff --git a/packages/binutils/2.45/0012-Fix-the-calculation-of-the-function-length.patch b/packages/binutils/2.45/0012-Fix-the-calculation-of-the-function-length.patch new file mode 100644 index 0000000000..6e8073d502 --- /dev/null +++ b/packages/binutils/2.45/0012-Fix-the-calculation-of-the-function-length.patch @@ -0,0 +1,40 @@ +From 6666666666666666666666666666666666666666 Mon Sep 17 00:00:00 2001 +From: Evgeny Karpov +Date: Fri, 9 May 2025 13:13:00 +0200 +Subject: [PATCH v2 7/7] Fix the calculation of the function length + +The patch fixes an issue when alignment is applied in the middle of +executed code, affecting the calculation of the function length. +It can be resolved by using the MAP_DATA state. + +gas/ChangeLog: + + * config/tc-aarch64.h (HANDLE_ALIGN): Update. +--- + gas/config/tc-aarch64.h | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/gas/config/tc-aarch64.h b/gas/config/tc-aarch64.h +index 3cd7be5ba34..32e3aafc545 100644 +--- a/gas/config/tc-aarch64.h ++++ b/gas/config/tc-aarch64.h +@@ -210,10 +210,16 @@ struct aarch64_frag_type + (fr_fix) plus 4 bytes to contain the repeating NOP (fr_var). */ + #define MAX_MEM_FOR_RS_ALIGN_CODE(p2align, max) (3 + 4) + ++/* Sections are assumed to start aligned. In executable section, there is no ++ MAP_DATA symbol pending. So we only align the address during ++ MAP_DATA --> MAP_INSN transition. ++ For other sections, this is not guaranteed. */ + #define md_do_align(N, FILL, LEN, MAX, LABEL) \ + if (FILL == NULL && (N) != 0 && ! need_pass_2 && subseg_text_p (now_seg)) \ + { \ +- frag_align_code (N, MAX); \ ++ enum mstate mapstate = seg_info (now_seg)->tc_segment_info_data.mapstate;\ ++ if (mapstate == MAP_DATA) \ ++ frag_align_code (N, MAX); \ + goto LABEL; \ + } + +-- +2.34.1 diff --git a/packages/binutils/2.45/0013-zlib-darwin-fdopen.patch b/packages/binutils/2.45/0013-zlib-darwin-fdopen.patch new file mode 100644 index 0000000000..141b6acbb6 --- /dev/null +++ b/packages/binutils/2.45/0013-zlib-darwin-fdopen.patch @@ -0,0 +1,29 @@ +From 3fd6f6f8e0a8a6e0b62b0e3a1a9aa04a6b7c9a3a Mon Sep 17 00:00:00 2001 +From: Ahmed ARIF +Date: Sat, 20 Dec 2025 20:05:00 +0100 +Subject: [PATCH] zlib: do not redefine fdopen on Darwin + +Apple clang predefines TARGET_OS_MAC, which triggers the classic-Mac +fallback in zutil.h that defines fdopen() to NULL. When stdio.h is later +included, the fdopen prototype gets macro-expanded and the build fails. + +Skip the classic-Mac block on Darwin (where fdopen is available). +--- + zlib/zutil.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/zlib/zutil.h b/zlib/zutil.h +index 0b5b8ad..4e5f4f3 100644 +--- a/zlib/zutil.h ++++ b/zlib/zutil.h +@@ -137,7 +137,7 @@ + #endif + +-#if defined(MACOS) || defined(TARGET_OS_MAC) ++#if (defined(MACOS) || defined(TARGET_OS_MAC)) && !(defined(__APPLE__) && defined(__MACH__)) + # define OS_CODE 7 + # ifndef Z_SOLO + # if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os + # include /* for fdopen */ +-- +2.50.1 diff --git a/packages/binutils/2.45/chksum b/packages/binutils/2.45/chksum new file mode 100644 index 0000000000..73b89542e2 --- /dev/null +++ b/packages/binutils/2.45/chksum @@ -0,0 +1,12 @@ +md5 binutils-2.45.tar.bz2 6a58b4ae5c4be0ec3fd06cfa2bccb830 +sha1 binutils-2.45.tar.bz2 7117fc18f6008e83a6a3239cfaf9d7e2e22a57df +sha256 binutils-2.45.tar.bz2 1393f90db70c2ebd785fb434d6127f8888c559d5eeb9c006c354b203bab3473e +sha512 binutils-2.45.tar.bz2 b804005b94fd8d77f055716c90709e3f08a4c2f2f3beae9260ca43843d0903121a27429425c766fada3c9b15cfd51d37146e6f8f41ffb1e9840bfb90929ee523 +md5 binutils-2.45.tar.gz 1e548acef5d308fa1a002122126de22c +sha1 binutils-2.45.tar.gz 80bb9891aeaeceee6374a32302c0a918c9e70b67 +sha256 binutils-2.45.tar.gz 8a3eb4b10e7053312790f21ee1a38f7e2bbd6f4096abb590d3429e5119592d96 +sha512 binutils-2.45.tar.gz 5c71ec80884c0b4c0f7a4f8600946f1f6feebe584261b63185b0942cba4062d5b6cf2337539132d0ca03505c0a74f3c2760bc62ed08843c3b7db03df7f5798ad +md5 binutils-2.45.tar.xz dee5b4267e0305a99a3c9d6131f45759 +sha1 binutils-2.45.tar.xz 09fd8a50a95be4a94412fe3847d16280996679c5 +sha256 binutils-2.45.tar.xz c50c0e7f9cb188980e2cc97e4537626b1672441815587f1eab69d2a1bfbef5d2 +sha512 binutils-2.45.tar.xz c7b10a7466d9fd398d7a0b3f2a43318432668d714f2ec70069a31bdc93c86d28e0fe83792195727167743707fbae45337c0873a0786416db53bbf22860c16ce7 diff --git a/packages/linux/4.19.318/version.desc b/packages/binutils/2.45/version.desc similarity index 100% rename from packages/linux/4.19.318/version.desc rename to packages/binutils/2.45/version.desc diff --git a/packages/binutils/2.46.0/0000-sh-conf.patch b/packages/binutils/2.46.0/0000-sh-conf.patch new file mode 100644 index 0000000000..f278187d28 --- /dev/null +++ b/packages/binutils/2.46.0/0000-sh-conf.patch @@ -0,0 +1,39 @@ +From bdb18461e4d78d701c7d4a43667b55af6eb2ad13 Mon Sep 17 00:00:00 2001 +From: Chris Packham +Date: Mon, 8 Aug 2022 20:31:10 +1200 +Subject: [PATCH 0/5] sh conf + +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 2551fe02..4d50547e 100755 +--- a/configure ++++ b/configure +@@ -4196,7 +4196,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index fe7c1cb4..e5f1e828 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1365,7 +1365,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +-- +2.53.0 + diff --git a/packages/binutils/2.46.0/0001-check_ldrunpath_length.patch b/packages/binutils/2.46.0/0001-check_ldrunpath_length.patch new file mode 100644 index 0000000000..2e068bb2a9 --- /dev/null +++ b/packages/binutils/2.46.0/0001-check_ldrunpath_length.patch @@ -0,0 +1,34 @@ +From d1902b4290c4008b5014caf22fa45a4a8355c943 Mon Sep 17 00:00:00 2001 +From: Chris Packham +Date: Mon, 8 Aug 2022 20:36:31 +1200 +Subject: [PATCH 1/5] check_ldrunpath_length + +--- + ld/ldelf.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/ld/ldelf.c b/ld/ldelf.c +index a623d37c..8a7ca72e 100644 +--- a/ld/ldelf.c ++++ b/ld/ldelf.c +@@ -1134,6 +1134,8 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab, + && command_line.rpath == NULL) + { + path = (const char *) getenv ("LD_RUN_PATH"); ++ if (path && *path == '\0') ++ path = NULL; + if (path + && ldelf_search_needed (path, &n, force, + is_linux, elfsize)) +@@ -1807,6 +1809,8 @@ ldelf_before_allocation (char **audit, char **depaudit, + rpath = command_line.rpath; + if (rpath == NULL) + rpath = (const char *) getenv ("LD_RUN_PATH"); ++ if (rpath && *rpath == '\0') ++ rpath = NULL; + + for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) + if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) +-- +2.53.0 + diff --git a/packages/binutils/2.46.0/0002-Don-t-link-to-libfl-as-it-s-unnecessary.patch b/packages/binutils/2.46.0/0002-Don-t-link-to-libfl-as-it-s-unnecessary.patch new file mode 100644 index 0000000000..1a141e864b --- /dev/null +++ b/packages/binutils/2.46.0/0002-Don-t-link-to-libfl-as-it-s-unnecessary.patch @@ -0,0 +1,125 @@ +From db91403b2a4958f12601c65a0fb11cbd89828118 Mon Sep 17 00:00:00 2001 +From: Chris Packham +Date: Mon, 8 Aug 2022 20:37:24 +1200 +Subject: [PATCH 2/5] Don't link to libfl as it's unnecessary + +--- + binutils/configure | 3 +++ + binutils/configure.ac | 3 +++ + gas/configure | 3 +++ + gas/configure.ac | 3 +++ + ld/configure | 3 +++ + ld/configure.ac | 3 +++ + 6 files changed, 18 insertions(+) + +diff --git a/binutils/configure b/binutils/configure +index 196cd142..6a6c774d 100755 +--- a/binutils/configure ++++ b/binutils/configure +@@ -12903,6 +12903,7 @@ fi + done + test -n "$YACC" || YACC="yacc" + ++save_LIBS=$LIBS + for ac_prog in flex lex + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -13066,6 +13067,8 @@ esac + if test "$LEX" = :; then + LEX=${am_missing_run}flex + fi ++LIBS=$save_LIBS ++LEXLIB= + + ALL_LINGUAS="bg ca da es fi fr hr id it ja pt ro ru rw sk sr sv tr uk vi zh_CN zh_TW" + +diff --git a/binutils/configure.ac b/binutils/configure.ac +index 5553942b..857ffc17 100644 +--- a/binutils/configure.ac ++++ b/binutils/configure.ac +@@ -153,7 +153,10 @@ if test -z "$host" ; then + fi + + AC_PROG_YACC ++save_LIBS=$LIBS + AM_PROG_LEX ++LIBS=$save_LIBS ++LEXLIB= + + ALL_LINGUAS="bg ca da es fi fr hr id it ja pt ro ru rw sk sr sv tr uk vi zh_CN zh_TW" + ZW_GNU_GETTEXT_SISTER_DIR +diff --git a/gas/configure b/gas/configure +index b97a2c6e..cb6f23c4 100755 +--- a/gas/configure ++++ b/gas/configure +@@ -13399,6 +13399,7 @@ fi + done + test -n "$YACC" || YACC="yacc" + ++save_LIBS=$LIBS + for ac_prog in flex lex + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -13562,6 +13563,8 @@ esac + if test "$LEX" = :; then + LEX=${am_missing_run}flex + fi ++LIBS=$save_LIBS ++LEXLIB= + + ALL_LINGUAS="es fi fr id ja ru rw sv tr uk zh_CN" + +diff --git a/gas/configure.ac b/gas/configure.ac +index 7fb573f8..e072b05d 100644 +--- a/gas/configure.ac ++++ b/gas/configure.ac +@@ -929,7 +929,10 @@ AC_DEFINE_UNQUOTED(TARGET_VENDOR, "${target_vendor}", [Target vendor.]) + AC_DEFINE_UNQUOTED(TARGET_OS, "${target_os}", [Target OS.]) + + AC_PROG_YACC ++save_LIBS=$LIBS + AM_PROG_LEX ++LIBS=$save_LIBS ++LEXLIB= + + ALL_LINGUAS="es fi fr id ja ru rw sv tr uk zh_CN" + ZW_GNU_GETTEXT_SISTER_DIR +diff --git a/ld/configure b/ld/configure +index 85584402..d0e9072d 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -18419,6 +18419,7 @@ fi + done + test -n "$YACC" || YACC="yacc" + ++save_LIBS=$LIBS + for ac_prog in flex lex + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -18582,6 +18583,8 @@ esac + if test "$LEX" = :; then + LEX=${am_missing_run}flex + fi ++LIBS=$save_LIBS ++LEXLIB= + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +diff --git a/ld/configure.ac b/ld/configure.ac +index 8c5e9606..6dc69290 100644 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -427,7 +427,10 @@ ZW_GNU_GETTEXT_SISTER_DIR + AC_EXEEXT + + AC_PROG_YACC ++save_LIBS=$LIBS + AM_PROG_LEX ++LIBS=$save_LIBS ++LEXLIB= + + AM_MAINTAINER_MODE + AM_CONDITIONAL(GENINSRC_NEVER, false) +-- +2.53.0 + diff --git a/packages/binutils/2.46.0/0003-Fix-darwin-build.patch b/packages/binutils/2.46.0/0003-Fix-darwin-build.patch new file mode 100644 index 0000000000..6cf2504340 --- /dev/null +++ b/packages/binutils/2.46.0/0003-Fix-darwin-build.patch @@ -0,0 +1,50 @@ +From 05a49a0ff165fc67775d37382e15b1f2c444c85d Mon Sep 17 00:00:00 2001 +From: Andrew Hsieh +Date: Wed, 18 Mar 2015 10:57:24 +0800 +Subject: [PATCH 3/5] Fix darwin build + +1. In Drawin PTHREAD_ONCE_INIT is {0x30B1BCBA, {0}} and the GCC < 4.4 + doesn't support ended initializer list +2. wcsncasecmp doesn't exist in MacSDK10.6.x + +Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e +--- + bfd/peXXigen.c | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c +index 2ab0dd50..4540a7ac 100644 +--- a/bfd/peXXigen.c ++++ b/bfd/peXXigen.c +@@ -3698,6 +3698,28 @@ u16_mbtouc (wint_t * puc, const unsigned short * s, unsigned int n) + } + #endif /* not Cygwin/Mingw */ + ++#if defined __APPLE__ && __DARWIN_C_LEVEL < 200809L ++/* wcsncasecmp isn't always defined in Mac SDK */ ++static int ++wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n) ++{ ++ wchar_t c1, c2; ++ ++ if (n == 0) ++ return (0); ++ for (; *s1; s1++, s2++) ++ { ++ c1 = towlower(*s1); ++ c2 = towlower(*s2); ++ if (c1 != c2) ++ return ((int)c1 - c2); ++ if (--n == 0) ++ return (0); ++ } ++ return (-*s2); ++} ++#endif ++ + /* Perform a comparison of two entries. */ + static signed int + rsrc_cmp (bool is_name, rsrc_entry * a, rsrc_entry * b) +-- +2.53.0 + diff --git a/packages/binutils/2.46.0/0004-sysroot.patch b/packages/binutils/2.46.0/0004-sysroot.patch new file mode 100644 index 0000000000..d4f120d371 --- /dev/null +++ b/packages/binutils/2.46.0/0004-sysroot.patch @@ -0,0 +1,50 @@ +From c4c80ba1a902cb1c35452eb2ad415cce52e792a6 Mon Sep 17 00:00:00 2001 +From: Sven Rebhan +Date: Mon, 8 Aug 2022 20:46:29 +1200 +Subject: [PATCH 4/5] sysroot + +Always try to prepend the sysroot prefix to absolute filenames first. + +http://bugs.gentoo.org/275666 +http://sourceware.org/bugzilla/show_bug.cgi?id=10340 + +Signed-off-by: Sven Rebhan +--- + ld/ldfile.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/ld/ldfile.c b/ld/ldfile.c +index f47e860d..9672d032 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -548,18 +548,25 @@ ldfile_open_file_search (const char *arch, + directory first. */ + if (!entry->flags.maybe_archive) + { +- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)) ++ /* For absolute pathnames, try to always open the file in the ++ sysroot first. If this fails, try to open the file at the ++ given location. */ ++ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename); ++ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename) ++ && ld_sysroot) + { + char *name = concat (ld_sysroot, entry->filename, + (const char *) NULL); + if (ldfile_try_open_bfd (name, entry)) + { + entry->filename = name; ++ entry->flags.sysrooted = true; + return true; + } + free (name); + } +- else if (ldfile_try_open_bfd (entry->filename, entry)) ++ ++ if (ldfile_try_open_bfd (entry->filename, entry)) + return true; + + if (IS_ABSOLUTE_PATH (entry->filename)) +-- +2.53.0 + diff --git a/packages/binutils/2.46.0/0005-poison-system-directories.patch b/packages/binutils/2.46.0/0005-poison-system-directories.patch new file mode 100644 index 0000000000..5695abd18f --- /dev/null +++ b/packages/binutils/2.46.0/0005-poison-system-directories.patch @@ -0,0 +1,303 @@ +From 07623e4f03619d7ef92d4eecb7d4678ca7eeca8a Mon Sep 17 00:00:00 2001 +From: Scott Garman +Date: Mon, 8 Aug 2022 20:48:32 +1200 +Subject: [PATCH 5/5] poison system directories + +Patch adapted to binutils 2.23.2 and extended to use +BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. + +[Gustavo: adapt to binutils 2.25] +Signed-off-by: Thomas Petazzoni +Signed-off-by: Gustavo Zacarias + +Upstream-Status: Inappropriate [distribution: codesourcery] + +Patch originally created by Mark Hatle, forward-ported to +binutils 2.21 by Scott Garman. + +purpose: warn for uses of system directories when cross linking + +Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 + +2008-07-02 Joseph Myers + + ld/ + * ld.h (args_type): Add error_poison_system_directories. + * ld.texinfo (--error-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.error_poison_system_directories. + * ldmain.c (main): Initialize + command_line.error_poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --error-poison-system-directories. + (parse_args): Handle new option. + +2007-06-13 Joseph Myers + + ld/ + * config.in: Regenerate. + * ld.h (args_type): Add poison_system_directories. + * ld.texinfo (--no-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.poison_system_directories. + * ldmain.c (main): Initialize + command_line.poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_NO_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --no-poison-system-directories. + (parse_args): Handle new option. + +2007-04-20 Joseph Myers + + Merge from Sourcery G++ binutils 2.17: + + 2007-03-20 Joseph Myers + Based on patch by Mark Hatle . + ld/ + * configure.ac (--enable-poison-system-directories): New option. + * configure, config.in: Regenerate. + * ldfile.c (ldfile_add_library_path): If + ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, + /usr/lib, /usr/local/lib or /usr/X11R6/lib. + +Signed-off-by: Mark Hatle +Signed-off-by: Scott Garman +--- + ld/config.in | 3 +++ + ld/configure | 14 ++++++++++++++ + ld/configure.ac | 10 ++++++++++ + ld/ld.h | 8 ++++++++ + ld/ld.texi | 12 ++++++++++++ + ld/ldfile.c | 16 ++++++++++++++++ + ld/ldlex.h | 2 ++ + ld/ldmain.c | 2 ++ + ld/lexsup.c | 21 +++++++++++++++++++++ + 9 files changed, 88 insertions(+) + +diff --git a/ld/config.in b/ld/config.in +index 7fac3b5c..630190b5 100644 +--- a/ld/config.in ++++ b/ld/config.in +@@ -86,6 +86,9 @@ + language is requested. */ + #undef ENABLE_NLS + ++/* Define to warn for use of native system library directories */ ++#undef ENABLE_POISON_SYSTEM_DIRECTORIES ++ + /* Additional extension a shared object might have. */ + #undef EXTRA_SHLIB_EXTENSION + +diff --git a/ld/configure b/ld/configure +index d0e9072d..7aab1c4a 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -843,6 +843,7 @@ enable_checking + with_lib_path + enable_targets + with_sysroot ++enable_poison_system_directories + enable_gold + enable_got + enable_compressed_debug_sections +@@ -1537,6 +1538,8 @@ Optional Features: + --disable-largefile omit support for large files + --enable-checking enable run-time checks + --enable-targets alternative target configurations ++ --enable-poison-system-directories ++ warn for use of native system library directories + --enable-gold[=ARG] build gold [ARG={default,yes,no}] + --enable-got= GOT handling scheme (target, single, negative, + multigot) +@@ -15768,7 +15771,18 @@ else + fi + + ++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" = "xyes"; then + ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++ ++fi + + # Check whether --enable-got was given. + if test "${enable_got+set}" = set; then : +diff --git a/ld/configure.ac b/ld/configure.ac +index 6dc69290..dca39fba 100644 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -115,6 +115,16 @@ AC_SUBST(use_sysroot) + AC_SUBST(TARGET_SYSTEM_ROOT) + AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) + ++AC_ARG_ENABLE([poison-system-directories], ++ AS_HELP_STRING([--enable-poison-system-directories], ++ [warn for use of native system library directories]),, ++ [enable_poison_system_directories=no]) ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], ++ [1], ++ [Define to warn for use of native system library directories]) ++fi ++ + dnl Use --enable-gold to decide if this linker should be the default. + dnl "install_as_default" is set to false if gold is the default linker. + dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index 76825e42..9869d6cf 100644 +--- a/ld/ld.h ++++ b/ld/ld.h +@@ -161,6 +161,14 @@ typedef struct + /* If set, display the target memory usage (per memory region). */ + bool print_memory_usage; + ++ /* If TRUE (the default) warn for uses of system directories when ++ cross linking. */ ++ bool poison_system_directories; ++ ++ /* If TRUE (default FALSE) give an error for uses of system ++ directories when cross linking instead of a warning. */ ++ bool error_poison_system_directories; ++ + /* Should we force section groups to be resolved? Controlled with + --force-group-allocation on the command line or FORCE_GROUP_ALLOCATION + in the linker script. */ +diff --git a/ld/ld.texi b/ld/ld.texi +index 3dc76a1f..f0b30d3f 100644 +--- a/ld/ld.texi ++++ b/ld/ld.texi +@@ -3391,6 +3391,18 @@ creation of the metadata note, if one had been enabled by an earlier + occurrence of the --package-metadata option. + If the linker has been built with libjansson, then the JSON string + will be validated. ++ ++@kindex --no-poison-system-directories ++@item --no-poison-system-directories ++Do not warn for @option{-L} options using system directories such as ++@file{/usr/lib} when cross linking. This option is intended for use ++in chroot environments when such directories contain the correct ++libraries for the target system rather than the host. ++ ++@kindex --error-poison-system-directories ++@item --error-poison-system-directories ++Give an error instead of a warning for @option{-L} options using ++system directories when cross linking. + @end table + + @c man end +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 9672d032..0eba3c83 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -326,6 +326,22 @@ ldfile_add_library_path (const char *name, bool cmdline) + new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); + else + new_dirs->name = xstrdup (name); ++ ++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES ++ if (command_line.poison_system_directories ++ && ((!strncmp (name, "/lib", 4)) ++ || (!strncmp (name, "/usr/lib", 8)) ++ || (!strncmp (name, "/usr/local/lib", 14)) ++ || (!strncmp (name, "/usr/X11R6/lib", 14)))) ++ { ++ if (command_line.error_poison_system_directories) ++ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ else ++ einfo (_("%P: warning: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ } ++#endif + } + + static void +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 85e06b6f..e8346424 100644 +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -477,6 +477,8 @@ enum option_values + /* Used by emultempl/elf-i386-glibc.em. */ + OPTION_GNU_TLS_VERSION_TAG, + OPTION_NO_GNU_TLS_VERSION_TAG, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, + }; + + /* The initial parser states. */ +diff --git a/ld/ldmain.c b/ld/ldmain.c +index a2711d23..c113c742 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -749,6 +749,8 @@ main (int argc, char **argv) + command_line.warn_mismatch = true; + command_line.warn_search_mismatch = true; + command_line.check_section_addresses = -1; ++ command_line.poison_system_directories = true; ++ command_line.error_poison_system_directories = true; + + /* We initialize DEMANGLING based on the environment variable + COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 158abb6d..d5e9df75 100644 +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -643,6 +643,14 @@ static const struct ld_option ld_options[] = + " is: share-unconflicted (default),\n" + " share-duplicated"), + TWO_DASHES }, ++ { {"no-poison-system-directories", no_argument, NULL, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Do not warn for -L options using system directories"), ++ TWO_DASHES }, ++ { {"error-poison-system-directories", no_argument, NULL, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Give an error for -L options using system directories"), ++ TWO_DASHES }, + }; + + #define OPTION_COUNT ARRAY_SIZE (ld_options) +@@ -655,6 +663,7 @@ parse_args (unsigned argc, char **argv) + int ingroup = 0; + char *default_dirlist = NULL; + char *shortopts; ++ char *BR_paranoid_env; + struct option *longopts; + struct option *really_longopts; + int last_optind; +@@ -1789,6 +1798,14 @@ parse_args (unsigned argc, char **argv) + } + break; + ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = false; ++ break; ++ ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = true; ++ break; ++ + case OPTION_PUSH_STATE: + input_flags.pushed = xmemdup (&input_flags, + sizeof (input_flags), +@@ -1933,6 +1950,10 @@ parse_args (unsigned argc, char **argv) + command_line.soname = NULL; + } + ++ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); ++ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) ++ command_line.error_poison_system_directories = true; ++ + while (ingroup) + { + einfo (_("%P: missing --end-group; added as last command line option\n")); +-- +2.53.0 + diff --git a/packages/binutils/2.46.0/0006-Adjust-pdata-function-table-entries-sorting-for-AArch64.patch b/packages/binutils/2.46.0/0006-Adjust-pdata-function-table-entries-sorting-for-AArch64.patch new file mode 100644 index 0000000000..2f1cc7f9bc --- /dev/null +++ b/packages/binutils/2.46.0/0006-Adjust-pdata-function-table-entries-sorting-for-AArch64.patch @@ -0,0 +1,51 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Evgeny Karpov +Date: Fri, 9 May 2025 12:51:00 +0200 +Subject: [PATCH v2 1/7] Adjust pdata function table entries sorting for AArch64 + +The .pdata section contains an array of function table entries that +are used for exception handling. The entries should be sorted by +begin address, which is usually the first 4 bytes RVA in the entry. +Entry sizes are different for x64 and AArch64. +This difference is addressed in this patch. + +bfd/ChangeLog: + + * peXXigen.c (defined): New. + (_bfd_XXi_final_link_postscript): Use + FUNCTION_TABLE_ENTRY_SIZE. +--- + bfd/peXXigen.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c +index 9938108ce6b..3230f465d63 100644 +--- a/bfd/peXXigen.c ++++ b/bfd/peXXigen.c +@@ -4655,6 +4655,13 @@ _bfd_XXi_final_link_postscript (bfd * abfd, struct coff_final_link_info *pfinfo) + #if !defined(COFF_WITH_pep) && (defined(COFF_WITH_pex64) || defined(COFF_WITH_peAArch64) || defined(COFF_WITH_peLoongArch64) || defined (COFF_WITH_peRiscV64)) + { + asection *sec = bfd_get_section_by_name (abfd, ".pdata"); ++#if defined (COFF_WITH_peAArch64) ++/* https://learn.microsoft.com/en-us/cpp/build/arm64-exception-handling#pdata-records. */ ++ #define FUNCTION_TABLE_ENTRY_SIZE 8 ++#else ++/* https://learn.microsoft.com/en-us/windows/win32/debug/pe-format#the-pdata-section. */ ++ #define FUNCTION_TABLE_ENTRY_SIZE 12 ++#endif + + if (sec) + { +@@ -4664,8 +4671,8 @@ _bfd_XXi_final_link_postscript (bfd * abfd, struct coff_final_link_info *pfinfo) + if (bfd_malloc_and_get_section (abfd, sec, &tmp_data)) + { + qsort (tmp_data, +- (size_t) (x / 12), +- 12, sort_x64_pdata); ++ (size_t) (x / FUNCTION_TABLE_ENTRY_SIZE), ++ FUNCTION_TABLE_ENTRY_SIZE, sort_x64_pdata); + bfd_set_section_contents (pfinfo->output_bfd, sec, + tmp_data, 0, x); + free (tmp_data); +-- +2.34.1 diff --git a/packages/binutils/2.46.0/0007-Define-unwinding-and-SEH-data-structures-for-aarch64.patch b/packages/binutils/2.46.0/0007-Define-unwinding-and-SEH-data-structures-for-aarch64.patch new file mode 100644 index 0000000000..6842d22247 --- /dev/null +++ b/packages/binutils/2.46.0/0007-Define-unwinding-and-SEH-data-structures-for-aarch64.patch @@ -0,0 +1,245 @@ +From 1111111111111111111111111111111111111111 Mon Sep 17 00:00:00 2001 +From: Evgeny Karpov +Date: Fri, 9 May 2025 12:57:00 +0200 +Subject: [PATCH v2 2/7] Define unwinding and SEH data structures for aarch64 + +This patch adds unwinding codes and records that are needed to emit +SEH data to pdata and xdata sections, and an arm64 context to store +data required for emitting. + +gas/ChangeLog: + + * config/obj-coff-seh.h (ARM64_MAX_UNWIND_CODES): New. + (ARM64_MAX_EPILOGUE_SCOPES): New. + (ARM64_UNOP_ALLOCS): New. + (ARM64_UNOP_SAVER19R20X): New. + (ARM64_UNOP_SAVEFPLR): New. + (ARM64_UNOP_SAVEFPLRX): New. + (ARM64_UNOP_ALLOCM): New. + (ARM64_UNOP_SAVEREGP): New. + (ARM64_UNOP_SAVEREGPX): New. + (ARM64_UNOP_SAVEREG): New. + (ARM64_UNOP_SAVEREGX): New. + (ARM64_UNOP_SAVELRPAIR): New. + (ARM64_UNOP_SAVEFREGP): New. + (ARM64_UNOP_SAVEFREGPX): New. + (ARM64_UNOP_SAVEFREG): New. + (ARM64_UNOP_SAVEFREGX): New. + (ARM64_UNOP_ALLOCL): New. + (ARM64_UNOP_SETFP): New. + (ARM64_UNOP_ADDFP): New. + (ARM64_UNOP_NOP): New. + (ARM64_UNOP_END): New. + (ARM64_UNOP_ENDC): New. + (ARM64_UNOP_SAVENEXT): New. + (ARM64_UNOP_PACSIGNLR): New. +--- + gas/config/obj-coff-seh.h | 154 +++++++++++++++++++++++++++++++++++++- + 1 file changed, 152 insertions(+), 2 deletions(-) + +diff --git a/gas/config/obj-coff-seh.h b/gas/config/obj-coff-seh.h +index 598870ae4e0..f926fc8622c 100644 +--- a/gas/config/obj-coff-seh.h ++++ b/gas/config/obj-coff-seh.h +@@ -19,12 +19,13 @@ + 02110-1301, USA. */ + + /* Short overview: +- There are at the moment three different function entry formats preset. ++ There are at the moment four different function entry formats preset. + The first is the MIPS one. The second version + is for ARM, PPC, SH3, and SH4 mainly for Windows CE. + The third is the IA64 and x64 version. Note, the IA64 isn't implemented yet, + but to find information about it, please see specification about IA64 on + http://download.intel.com/design/Itanium/Downloads/245358.pdf file. ++ The fourth is the Arm64 version. + + The first version has just entries in the pdata section: BeginAddress, + EndAddress, ExceptionHandler, HandlerData, and PrologueEndAddress. Each +@@ -57,8 +58,43 @@ + .seh_savexmm + .seh_pushframe + .seh_code ++ ++ The fourth version for Arm64 partially intersects with the x64 ++ version, however it has a different extension to the unwind codes. ++ It emits SEH data to pdata and xdata sections. In some cases SEH ++ data could be emitted to a packed record in the pdata section ++ without the need for data in the xdata section. However, the packed ++ pdata record is not implemented yet. ++ + */ + ++typedef enum seh_arm64_unwind_types ++{ ++ alloc_s, ++ alloc_m, ++ alloc_l, ++ save_reg, ++ save_reg_x, ++ save_regp, ++ save_regp_x, ++ save_fregp, ++ save_fregp_x, ++ save_freg, ++ save_freg_x, ++ save_lrpair, ++ save_fplr, ++ save_fplr_x, ++ save_r19r20_x, ++ add_fp, ++ set_fp, ++ save_next, ++ nop, ++ pac_sign_lr, ++ end, ++ end_c, ++ unwind_last_type = end_c ++} seh_arm64_unwind_types; ++ + /* architecture specific pdata/xdata handling. */ + #define SEH_CMDS \ + {"seh_proc", obj_coff_seh_proc, 0}, \ +@@ -87,6 +123,91 @@ typedef struct seh_prologue_element + symbolS *pc_addr; + } seh_prologue_element; + ++typedef struct seh_arm64_unwind_code ++{ ++ uint32_t value; ++ seh_arm64_unwind_types type; ++} seh_arm64_unwind_code; ++ ++typedef struct seh_arm64_packed_unwind_data ++{ ++ uint32_t flag : 2; ++ uint32_t func_length : 11; ++ uint32_t frame_size : 9; ++ uint32_t cr : 2; ++ uint32_t h : 1; ++ uint32_t regI : 4; ++ uint32_t regF : 3; ++} seh_arm64_packed_unwind_data; ++ ++typedef struct seh_arm64_except_info ++{ ++ uint32_t flag : 2; ++ uint32_t except_info_rva : 30; ++} seh_arm64_except_info; ++ ++typedef union seh_arm64_unwind_info ++{ ++ seh_arm64_except_info except_info; ++ seh_arm64_packed_unwind_data packed_unwind_data; ++} seh_arm64_unwind_info; ++ ++typedef struct seh_arm64_pdata ++{ ++ unsigned int func_start_rva; ++ seh_arm64_unwind_info except_info_unwind; ++} seh_arm64_pdata; ++ ++typedef struct seh_arm64_xdata_header ++{ ++ uint32_t func_length : 18; ++ uint32_t vers : 2; ++ uint32_t x : 1; ++ uint32_t e : 1; ++ uint32_t epilogue_count : 5; ++ uint32_t code_words : 5; ++ uint32_t ext_epilogue_count : 16; ++ uint32_t ext_code_words : 8; ++ uint32_t reserved : 8; ++} seh_arm64_xdata_header; ++ ++typedef struct seh_arm64_epilogue_scope ++{ ++ uint32_t epilogue_start_offset_reduced : 18; ++ uint32_t reserved : 4; ++ uint32_t epilogue_start_index : 10; ++ uintptr_t epilogue_start_offset; ++ uintptr_t epilogue_end_offset; ++} seh_arm64_epilogue_scope; ++ ++typedef struct seh_arm64_func_fragment ++{ ++ uintptr_t offset; ++ symbolS *xdata_addr; ++ struct seh_arm64_func_fragment *next; ++} seh_arm64_func_fragment; ++ ++#define ARM64_MAX_UNWIND_CODES 286 ++#define ARM64_MAX_EPILOGUE_SCOPES 32 ++ ++typedef struct seh_arm64_context ++{ ++ seh_arm64_pdata pdata; ++ union { ++ seh_arm64_xdata_header xdata_header; ++ valueT xdata_header_value; ++ }; ++ unsigned int unwind_codes_count; ++ unsigned int unwind_codes_byte_count; ++ seh_arm64_unwind_code unwind_codes[ARM64_MAX_UNWIND_CODES]; ++ unsigned int epilogue_scopes_count; ++ seh_arm64_epilogue_scope epilogue_scopes[ARM64_MAX_EPILOGUE_SCOPES]; ++ expressionS except_handler; ++ expressionS except_handler_data; ++ /* The function fragments. */ ++ seh_arm64_func_fragment func_fragment; ++} seh_arm64_context; ++ + typedef struct seh_context + { + /* Initial code-segment. */ +@@ -126,13 +247,17 @@ typedef struct seh_context + int elems_count; + int elems_max; + seh_prologue_element *elems; ++ ++ /* arm64-specific context. */ ++ seh_arm64_context arm64_ctx; + } seh_context; + + typedef enum seh_kind { + seh_kind_unknown = 0, + seh_kind_mips = 1, /* Used for MIPS and x86 pdata generation. */ + seh_kind_arm = 2, /* Used for ARM, PPC, SH3, and SH4 pdata (PDATA_EH) generation. */ +- seh_kind_x64 = 3 /* Used for IA64 and x64 pdata/xdata generation. */ ++ seh_kind_x64 = 3, /* Used for IA64 and x64 pdata/xdata generation. */ ++ seh_kind_arm64 = 4 /* Used for ARM64 pdata/xdata generation. */ + } seh_kind; + + /* Forward declarations. */ +@@ -201,4 +326,29 @@ static void obj_coff_seh_code (int); + (PEX64_OFFSET_TO_SCOPE_COUNT(COUNTOFUNWINDCODES) + \ + PEX64_SCOPE_ENTRY_SIZE * (IDX)) + ++/* arm64 unwind code structs. */ ++ ++#define ARM64_UNOP_ALLOCS 0b000U ++#define ARM64_UNOP_SAVER19R20X 0b001U ++#define ARM64_UNOP_SAVEFPLR 0b01U ++#define ARM64_UNOP_SAVEFPLRX 0b10U ++#define ARM64_UNOP_ALLOCM 0b11000U ++#define ARM64_UNOP_SAVEREGP 0b110010U ++#define ARM64_UNOP_SAVEREGPX 0b110011U ++#define ARM64_UNOP_SAVEREG 0b110100U ++#define ARM64_UNOP_SAVEREGX 0b1101010U ++#define ARM64_UNOP_SAVELRPAIR 0b1101011U ++#define ARM64_UNOP_SAVEFREGP 0b1101100U ++#define ARM64_UNOP_SAVEFREGPX 0b1101101U ++#define ARM64_UNOP_SAVEFREG 0b1101110U ++#define ARM64_UNOP_SAVEFREGX 0b11011110U ++#define ARM64_UNOP_ALLOCL 0b11100000U ++#define ARM64_UNOP_SETFP 0b11100001U ++#define ARM64_UNOP_ADDFP 0b11100010U ++#define ARM64_UNOP_NOP 0b11100011U ++#define ARM64_UNOP_END 0b11100100U ++#define ARM64_UNOP_ENDC 0b11100101U ++#define ARM64_UNOP_SAVENEXT 0b11100110U ++#define ARM64_UNOP_PACSIGNLR 0b11111100U ++ + #endif +-- +2.34.1 diff --git a/packages/binutils/2.46.0/0008-Adjust-x64-SEH-implementation-for-AArch64.patch b/packages/binutils/2.46.0/0008-Adjust-x64-SEH-implementation-for-AArch64.patch new file mode 100644 index 0000000000..a98fac033a --- /dev/null +++ b/packages/binutils/2.46.0/0008-Adjust-x64-SEH-implementation-for-AArch64.patch @@ -0,0 +1,448 @@ +From 2222222222222222222222222222222222222222 Mon Sep 17 00:00:00 2001 +From: Evgeny Karpov +Date: Fri, 9 May 2025 13:03:00 +0200 +Subject: [PATCH v2 3/7] Adjust x64 SEH implementation for AArch64 + +This patch defines the required unwind codes for AArch64 and updates handlers +for SEH commands that are used by both x64 and AArch64. +It implements encoding for unwind elements that will be emitted +to pdata/xdata sections. + +gas/ChangeLog: + + * config/obj-coff-seh.c (struct unwind_code_pack_info): New. + (defined): Add COFFAARCH64 guard. + (obj_coff_seh_code): Update. + (seh_get_target_kind): Update. + (verify_context_and_targets): New. + (obj_coff_seh_eh): Add COFFAARCH64 guard. + (obj_coff_seh_handler): Update. + (obj_coff_seh_handlerdata): Update. + (seh_arm64_add_unwind_element): New. + (obj_coff_seh_proc): Update. + (obj_coff_seh_endprologue): Update. + (obj_coff_seh_save): Add COFFAARCH64 guard. + (obj_coff_seh_setframe): Likewise. + * config/obj-coff-seh.h (obj_coff_seh_setframe): Add COFFAARCH64 guard. + (obj_coff_seh_endproc): Likewise. + (obj_coff_seh_proc): Likewise. + (obj_coff_seh_handler): Likewise. + (obj_coff_seh_handlerdata): Likewise. + (defined): Likewise. + (obj_coff_seh_code): Likewise. +--- + gas/config/obj-coff-seh.c | 260 +++++++++++++++++++++++++++++++++++--- + gas/config/obj-coff-seh.h | 12 +- + 2 files changed, 246 insertions(+), 26 deletions(-) + +diff --git a/gas/config/obj-coff-seh.c b/gas/config/obj-coff-seh.c +index 70cb4e4aa64..d861be4418e 100644 +--- a/gas/config/obj-coff-seh.c ++++ b/gas/config/obj-coff-seh.c +@@ -28,6 +28,20 @@ struct seh_seg_list { + char *seg_name; + }; + ++struct unwind_code_pack_info { ++ const char *directive; ++ int offset_bits; ++ int reg_bits; ++ int code_bits; ++ int code; ++ int offset_right_shift; ++ int offset; ++ int reg_right_shift; ++ int reg_offset; ++ int type; ++ int size; ++}; ++ + /* Local data. */ + static seh_context *seh_ctx_cur = NULL; + +@@ -36,6 +50,51 @@ static htab_t seh_hash; + static struct seh_seg_list *x_segcur = NULL; + static struct seh_seg_list *p_segcur = NULL; + ++const struct unwind_code_pack_info unwind_code_pack_infos[] = { ++ {NULL, 5, 0, 3, ARM64_UNOP_ALLOCS, 4, 0, 0, 0, ++ alloc_s, 1}, ++ {NULL, 11, 0, 5, ARM64_UNOP_ALLOCM, 4, 0, 0, 0, ++ alloc_m, 2}, ++ {NULL, 24, 0, 8, ARM64_UNOP_ALLOCL, 4, 0, 0, 0, ++ alloc_l, 4}, ++ {".seh_save_reg", 6, 4, 6, ARM64_UNOP_SAVEREG, 3, 0, 0, 19, ++ save_reg, 2}, ++ {".seh_save_reg_x", 5, 4, 7, ARM64_UNOP_SAVEREGX, 3, 1, 0, 19, ++ save_reg_x, 2}, ++ {".seh_save_regp", 6, 4, 6, ARM64_UNOP_SAVEREGP, 3, 0, 0, 19, ++ save_regp, 2}, ++ {".seh_save_regp_x", 6, 4, 6, ARM64_UNOP_SAVEREGPX, 3, 1, 0, 19, ++ save_regp_x, 2}, ++ {".seh_save_lrpair", 6, 3, 7, ARM64_UNOP_SAVELRPAIR, 3, 0, 1, 19, ++ save_lrpair, 2}, ++ {".seh_save_fregp", 6, 3, 7, ARM64_UNOP_SAVEFREGP, 3, 0, 0, 8, ++ save_fregp, 2}, ++ {".seh_save_fregp_x", 6, 3, 7, ARM64_UNOP_SAVEFREGPX, 3, 1, 0, 8, ++ save_fregp_x, 2}, ++ {".seh_save_freg", 6, 3, 7, ARM64_UNOP_SAVEFREG, 3, 0, 0, 8, ++ save_freg, 2}, ++ {".seh_save_freg_x", 5, 3, 8, ARM64_UNOP_SAVEFREGX, 3, 1, 0, 8, ++ save_freg_x, 2}, ++ {".seh_save_fplr", 6, 0, 2, ARM64_UNOP_SAVEFPLR, 3, 0, 0, 0, ++ save_fplr, 1}, ++ {".seh_save_fplr_x", 6, 0, 6, ARM64_UNOP_SAVEFPLRX, 3, 1, 0, 0, ++ save_fplr_x, 1}, ++ {".seh_save_r19r20_x", 5, 0, 3, ARM64_UNOP_SAVER19R20X, 3, 0, 0, 0, ++ save_r19r20_x, 1}, ++ {".seh_add_fp", 8, 0, 8, ARM64_UNOP_ADDFP, 0, 0, 0, 0, ++ add_fp, 2}, ++ {".seh_set_fp", 0, 0, 8, ARM64_UNOP_SETFP, 0, 0, 0, 0, ++ set_fp, 1}, ++ {".seh_save_next", 0, 0, 8, ARM64_UNOP_SAVENEXT, 0, 0, 0, 0, ++ save_next, 1}, ++ {".seh_nop", 0, 0, 8, ARM64_UNOP_NOP, 0, 0, 0, 0, ++ nop, 1}, ++ {".seh_pac_sign_lr", 0, 0, 8, ARM64_UNOP_PACSIGNLR, 0, 0, 0, 0, ++ pac_sign_lr, 1}, ++ {NULL, 0, 0, 8, ARM64_UNOP_END, 0, 0, 0, 0, ++ end, 1}, ++}; ++ + static void write_function_xdata (seh_context *); + static void write_function_pdata (seh_context *); + +@@ -164,12 +223,14 @@ seh_validate_seg (const char *directive) + return 0; + } + ++#if !defined (COFFAARCH64) + /* Switch back to the code section, whatever that may be. */ + static void + obj_coff_seh_code (int ignored ATTRIBUTE_UNUSED) + { + subseg_set (seh_ctx_cur->code_seg, 0); + } ++#endif + + static void + switch_xdata (int subseg, segT code_seg) +@@ -200,6 +261,8 @@ seh_get_target_kind (void) + switch (bfd_get_arch (stdoutput)) + { + case bfd_arch_aarch64: ++ return seh_kind_arm64; ++ + case bfd_arch_arm: + case bfd_arch_powerpc: + case bfd_arch_sh: +@@ -270,6 +333,32 @@ verify_context_and_target (const char *directive, seh_kind target) + return verify_context (directive); + } + ++/* Verify mulitple targets. */ ++ ++static int ++verify_context_and_targets (const char *directive, const seh_kind targets[], ++ int count_targets) ++{ ++ bool match = false; ++ for (int i = 0; i < count_targets; ++i) ++ { ++ if (seh_get_target_kind () == targets[i]) ++ { ++ match = true; ++ break; ++ } ++ } ++ ++ if (!match) ++ { ++ as_warn (_("%s ignored for this target"), directive); ++ ignore_rest_of_line (); ++ return 0; ++ } ++ ++ return verify_context (directive); ++} ++ + /* Skip whitespace and a comma. Error if the comma is not seen. */ + + static int +@@ -292,6 +381,7 @@ skip_whitespace_and_comma (int required) + return 0; + } + ++#if !defined (COFFAARCH64) + /* Mark current context to use 32-bit instruction (arm). */ + + static void +@@ -320,6 +410,7 @@ obj_coff_seh_eh (int what ATTRIBUTE_UNUSED) + + demand_empty_rest_of_line (); + } ++#endif + + /* Set for current context the default handler (x64). */ + +@@ -362,6 +453,10 @@ obj_coff_seh_handler (int what ATTRIBUTE_UNUSED) + else + expression (&seh_ctx_cur->handler); + ++ const seh_kind target_kind = seh_get_target_kind (); ++ if (target_kind == seh_kind_arm64) ++ seh_ctx_cur->arm64_ctx.xdata_header.x = 1; ++ + seh_ctx_cur->handler_data.X_op = O_constant; + seh_ctx_cur->handler_data.X_add_number = 0; + seh_ctx_cur->handler_flags = 0; +@@ -369,7 +464,7 @@ obj_coff_seh_handler (int what ATTRIBUTE_UNUSED) + if (!skip_whitespace_and_comma (0)) + return; + +- if (seh_get_target_kind () == seh_kind_x64) ++ if (target_kind == seh_kind_x64 || target_kind == seh_kind_arm64) + { + do + { +@@ -401,13 +496,65 @@ obj_coff_seh_handler (int what ATTRIBUTE_UNUSED) + static void + obj_coff_seh_handlerdata (int what ATTRIBUTE_UNUSED) + { +- if (!verify_context_and_target (".seh_handlerdata", seh_kind_x64)) ++ const seh_kind targets[] = { seh_kind_x64, seh_kind_arm64 }; ++ if (!verify_context_and_targets (".seh_handlerdata", targets, ++ sizeof (targets) / sizeof (seh_kind))) + return; + demand_empty_rest_of_line (); + + switch_xdata (seh_ctx_cur->subsection + 1, seh_ctx_cur->code_seg); + } + ++/* Obtain available unwind element. */ ++ ++static void ++seh_arm64_add_unwind_element (seh_arm64_unwind_types unwind_type, int offset, ++ int reg) ++{ ++ if (seh_ctx_cur == NULL ++ || seh_ctx_cur->arm64_ctx.unwind_codes_count >= ARM64_MAX_UNWIND_CODES) ++ { ++ as_warn (_("no unwind element available.")); ++ return; ++ } ++ ++ seh_arm64_unwind_code *arm64_element = seh_ctx_cur->arm64_ctx.unwind_codes ++ + seh_ctx_cur->arm64_ctx.unwind_codes_count++; ++ const struct unwind_code_pack_info *unwind_code_pack_info; ++ unwind_code_pack_info = unwind_code_pack_infos + unwind_type; ++ arm64_element->value = 0; ++ int value_offset_bits = 0; ++ ++ if (unwind_code_pack_info->offset_bits) ++ { ++ offset = (offset >> unwind_code_pack_info->offset_right_shift) ++ - unwind_code_pack_info->offset; ++ offset &= (1 << unwind_code_pack_info->offset_bits) - 1; ++ arm64_element->value |= offset << value_offset_bits; ++ value_offset_bits += unwind_code_pack_info->offset_bits; ++ } ++ ++ if (unwind_code_pack_info->reg_bits) ++ { ++ reg = (reg >> unwind_code_pack_info->reg_right_shift) ++ - unwind_code_pack_info->reg_offset; ++ reg &= (1 << unwind_code_pack_info->reg_bits) - 1; ++ arm64_element->value |= reg << value_offset_bits; ++ value_offset_bits += unwind_code_pack_info->reg_bits; ++ } ++ ++ if (unwind_code_pack_info->code_bits) ++ { ++ int code = unwind_code_pack_info->code; ++ code &= (1 << unwind_code_pack_info->code_bits) - 1; ++ arm64_element->value |= code << value_offset_bits; ++ } ++ ++ arm64_element->type = unwind_code_pack_info->type; ++ seh_ctx_cur->arm64_ctx.unwind_codes_byte_count += unwind_code_pack_info->size; ++} ++ ++ + /* Mark end of current context. */ + + static void +@@ -419,6 +566,16 @@ do_seh_endproc (void) + write_function_pdata (seh_ctx_cur); + free (seh_ctx_cur->elems); + free (seh_ctx_cur->func_name); ++#if defined (COFFAARCH64) ++ seh_arm64_func_fragment *fragment; ++ fragment = seh_ctx_cur->arm64_ctx.func_fragment.next; ++ while (fragment) ++ { ++ seh_arm64_func_fragment *next = fragment->next; ++ XDELETE (fragment); ++ fragment = next; ++ } ++#endif + free (seh_ctx_cur); + seh_ctx_cur = NULL; + } +@@ -465,11 +622,18 @@ obj_coff_seh_proc (int what ATTRIBUTE_UNUSED) + + seh_ctx_cur->code_seg = now_seg; + +- if (seh_get_target_kind () == seh_kind_x64) ++ seh_kind kind = seh_get_target_kind (); ++ if (kind == seh_kind_x64 || kind == seh_kind_arm64) + { + x_segcur = seh_hash_find_or_make (seh_ctx_cur->code_seg, ".xdata"); + seh_ctx_cur->subsection = x_segcur->subseg; + x_segcur->subseg += 2; ++ ++ if (kind == seh_kind_arm64) ++ { ++ seh_ctx_cur->arm64_ctx.unwind_codes_count = 0; ++ seh_ctx_cur->arm64_ctx.epilogue_scopes_count = 0; ++ } + } + + SKIP_WHITESPACE (); +@@ -498,6 +662,23 @@ obj_coff_seh_endprologue (int what ATTRIBUTE_UNUSED) + as_warn (_("duplicate .seh_endprologue in .seh_proc block")); + else + seh_ctx_cur->endprologue_addr = symbol_temp_new_now (); ++ ++ if (seh_get_target_kind () == seh_kind_arm64) ++ { ++ const int n = seh_ctx_cur->arm64_ctx.unwind_codes_count; ++ ++ /* Unwind codes need to be reversed. */ ++ for (int i = 0; i < n / 2; ++i) ++ { ++ seh_arm64_unwind_code *unwind_codes; ++ unwind_codes = seh_ctx_cur->arm64_ctx.unwind_codes; ++ seh_arm64_unwind_code temp = unwind_codes[i]; ++ unwind_codes[i] = unwind_codes[n-i-1]; ++ unwind_codes[n-i-1] = temp; ++ } ++ ++ seh_arm64_add_unwind_element (end, 0, 0); ++ } + } + + /* End-of-file hook. */ +@@ -533,6 +714,7 @@ seh_x64_make_prologue_element (int code, int info, offsetT off) + n->pc_addr = symbol_temp_new_now (); + } + ++#if !defined (COFFAARCH64) + /* Helper to read a register name from input stream (x64). */ + + static int +@@ -682,6 +864,7 @@ obj_coff_seh_save (int what) + + seh_x64_make_prologue_element (code, reg, off); + } ++#endif + + /* Add a stack-allocation token to current context. */ + +@@ -691,36 +874,69 @@ obj_coff_seh_stackalloc (int what ATTRIBUTE_UNUSED) + offsetT off; + int code, info; + +- if (!verify_context_and_target (".seh_stackalloc", seh_kind_x64) ++ const seh_kind targets[] = { seh_kind_x64, seh_kind_arm64 }; ++ if (!verify_context_and_targets (".seh_stackalloc", targets, ++ sizeof (targets) / sizeof (seh_kind)) + || !seh_validate_seg (".seh_stackalloc")) + return; + + off = get_absolute_expression (); + demand_empty_rest_of_line (); + +- if (off == 0) +- return; +- if (off < 0) ++ switch (seh_get_target_kind ()) + { +- as_bad (_(".seh_stackalloc offset is negative")); +- return; +- } ++ case seh_kind_x64: ++ if (off == 0) ++ return; ++ if (off < 0) ++ { ++ as_bad (_(".seh_stackalloc offset is negative")); ++ return; ++ } + +- if ((off & 7) == 0 && off <= 128) +- code = UWOP_ALLOC_SMALL, info = (off - 8) >> 3, off = 0; +- else if ((off & 7) == 0 && off <= (offsetT) (0xffff * 8)) +- code = UWOP_ALLOC_LARGE, info = 0, off >>= 3; +- else if (off <= (offsetT) 0xffffffff) +- code = UWOP_ALLOC_LARGE, info = 1; +- else +- { +- as_bad (_(".seh_stackalloc offset out of range")); ++ if ((off & 7) == 0 && off <= 128) ++ code = UWOP_ALLOC_SMALL, info = (off - 8) >> 3, off = 0; ++ else if ((off & 7) == 0 && off <= (offsetT) (0xffff * 8)) ++ code = UWOP_ALLOC_LARGE, info = 0, off >>= 3; ++ else if (off <= (offsetT) 0xffffffff) ++ code = UWOP_ALLOC_LARGE, info = 1; ++ else ++ { ++ as_bad (_(".seh_stackalloc offset out of range")); ++ return; ++ } ++ ++ seh_x64_make_prologue_element (code, info, off); ++ break; ++ ++ case seh_kind_arm64: ++ /* arm64 offset should be encoded in multiples of sixteen. */ ++ if ((off & 0xf) != 0) ++ { ++ as_bad (_(".seh_stackalloc offset < 16-byte stack alignment")); ++ return; ++ } ++ ++ if (off < 0x200) ++ seh_arm64_add_unwind_element (alloc_s, off, 0); ++ else if (off < 0x8000) ++ seh_arm64_add_unwind_element (alloc_m, off, 0); ++ else if (off < 0x10000000) ++ seh_arm64_add_unwind_element (alloc_l, off, 0); ++ else ++ { ++ as_bad (_(".seh_stackalloc offset out of range")); ++ return; ++ } ++ break; ++ ++ default: ++ as_bad (_(".seh_stackalloc invalid target")); + return; + } +- +- seh_x64_make_prologue_element (code, info, off); + } + ++#if !defined (COFFAARCH64) + /* Add a frame-pointer token to current context. */ + + static void +@@ -758,7 +974,7 @@ obj_coff_seh_setframe (int what ATTRIBUTE_UNUSED) + seh_x64_make_prologue_element (UWOP_SET_FPREG, 0, 0); + } + } +- ++#endif + /* Data writing routines. */ + + /* Output raw integers in 1, 2, or 4 bytes. */ diff --git a/packages/binutils/2.46.0/0009-Add-aarch64-specific-SEH-commands.patch b/packages/binutils/2.46.0/0009-Add-aarch64-specific-SEH-commands.patch new file mode 100644 index 0000000000..53de4220fa --- /dev/null +++ b/packages/binutils/2.46.0/0009-Add-aarch64-specific-SEH-commands.patch @@ -0,0 +1,178 @@ +From 3333333333333333333333333333333333333333 Mon Sep 17 00:00:00 2001 +From: Evgeny Karpov +Date: Fri, 9 May 2025 13:07:00 +0200 +Subject: [PATCH v2 4/7] Add aarch64-specific SEH commands + +Implementation for aarch64 contains SEH commands that are not present for +x64 architecture, such as .seh_startepilogue/.seh_endepilogue, +.seh_save_reg*, .seh_save_freg*, and others. + +gas/ChangeLog: + + * config/obj-coff-seh.c (defined): Use COFFAARCH64 guard. + (obj_coff_seh_startepilogue): New. + (obj_coff_seh_endepilogue): New. + (obj_coff_seh_endfunclet): New. + (obj_coff_seh_save_reg): New. +--- + gas/config/obj-coff-seh.c | 138 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 138 insertions(+) + +diff --git a/gas/config/obj-coff-seh.c b/gas/config/obj-coff-seh.c +index d861be4418e..8f9562ee234 100644 +--- a/gas/config/obj-coff-seh.c ++++ b/gas/config/obj-coff-seh.c +@@ -681,6 +681,86 @@ obj_coff_seh_endprologue (int what ATTRIBUTE_UNUSED) + } + } + ++#if defined (COFFAARCH64) ++static void ++obj_coff_seh_startepilogue (int what ATTRIBUTE_UNUSED) ++{ ++ symbolS *epilogue_start_addr; ++ expressionS exp; ++ ++ if (!verify_context (".seh_startepilogue") ++ || !seh_validate_seg (".seh_startepilogue")) ++ return; ++ demand_empty_rest_of_line (); ++ ++ if (seh_get_target_kind () != seh_kind_arm64) ++ return; ++ ++ epilogue_start_addr = symbol_temp_new_now (); ++ exp.X_op = O_subtract; ++ exp.X_add_symbol = epilogue_start_addr; ++ exp.X_op_symbol = seh_ctx_cur->start_addr; ++ exp.X_add_number = 0; ++ ++ if (!resolve_expression (&exp) || exp.X_op != O_constant ++ || exp.X_add_number < 0) ++ as_bad (_(".seh_startepilog offset expression for %s " ++ "does not evaluate to a non-negative constant"), ++ S_GET_NAME (epilogue_start_addr)); ++ ++ seh_arm64_epilogue_scope *epilogue_scope; ++ epilogue_scope = seh_ctx_cur->arm64_ctx.epilogue_scopes ++ + seh_ctx_cur->arm64_ctx.epilogue_scopes_count; ++ epilogue_scope->epilogue_start_offset = exp.X_add_number / 4; ++ epilogue_scope->reserved = 0; ++ epilogue_scope->epilogue_start_index ++ = seh_ctx_cur->arm64_ctx.unwind_codes_byte_count; ++ seh_ctx_cur->arm64_ctx.epilogue_scopes_count++; ++} ++ ++static void ++obj_coff_seh_endepilogue (int what ATTRIBUTE_UNUSED) ++{ ++ if (!verify_context (".seh_endepilogue") ++ || !seh_validate_seg (".seh_endepilogue")) ++ return; ++ ++ demand_empty_rest_of_line (); ++ ++ expressionS exp; ++ symbolS *epilogue_end_addr = symbol_temp_new_now (); ++ exp.X_op = O_subtract; ++ exp.X_add_symbol = epilogue_end_addr; ++ exp.X_op_symbol = seh_ctx_cur->start_addr; ++ exp.X_add_number = 0; ++ ++ if (!resolve_expression (&exp) || exp.X_op != O_constant ++ || exp.X_add_number < 0) ++ as_bad (_(".seh_endepilogue offset expression for %s " ++ "does not evaluate to a non-negative constant"), ++ S_GET_NAME (epilogue_end_addr)); ++ ++ seh_arm64_epilogue_scope *epilogue_scope; ++ epilogue_scope = seh_ctx_cur->arm64_ctx.epilogue_scopes ++ + seh_ctx_cur->arm64_ctx.epilogue_scopes_count - 1; ++ ++ epilogue_scope->epilogue_end_offset = exp.X_add_number; ++ ++ /* End code. */ ++ seh_arm64_add_unwind_element (end, 0, 0); ++} ++ ++static void ++obj_coff_seh_endfunclet (int what ATTRIBUTE_UNUSED) ++{ ++ if (!verify_context (".seh_endfunclet") ++ || !seh_validate_seg (".seh_endfunclet")) ++ return; ++ ++ demand_empty_rest_of_line (); ++} ++#endif ++ + /* End-of-file hook. */ + + void +@@ -866,6 +946,64 @@ obj_coff_seh_save (int what) + } + #endif + ++#if defined (COFFAARCH64) ++static void ++obj_coff_seh_save_reg (int type) ++{ ++ if (type < 0 || type > unwind_last_type) ++ { ++ as_bad (_("invalid pseudo operation.")); ++ return; ++ } ++ ++ const struct unwind_code_pack_info *unwind_code_pack_info; ++ unwind_code_pack_info = unwind_code_pack_infos + type; ++ ++ if (!unwind_code_pack_info->directive ++ || !verify_context_and_target (unwind_code_pack_info->directive, ++ seh_kind_arm64) ++ || !seh_validate_seg (unwind_code_pack_info->directive)) ++ return; ++ ++ SKIP_WHITESPACE (); ++ ++ char *symbol_name = NULL; ++ int reg = -1; ++ ++ if (unwind_code_pack_info->reg_bits) ++ { ++ char name_end = get_symbol_name (&symbol_name); ++ reg = atoi (symbol_name + 1); ++ (void) restore_line_pointer (name_end); ++ ++ if (!skip_whitespace_and_comma (1)) ++ return; ++ ++ if (reg < 0) ++ { ++ as_bad (_("register is negative")); ++ return; ++ } ++ } ++ ++ offsetT off = -1; ++ if (unwind_code_pack_info->offset_bits) ++ { ++ off = get_absolute_expression (); ++ ++ if (off < 0) ++ { ++ as_bad (_("offset is negative")); ++ return; ++ } ++ } ++ ++ demand_empty_rest_of_line (); ++ ++ seh_arm64_add_unwind_element (type, off, reg); ++} ++#endif ++ + /* Add a stack-allocation token to current context. */ + + static void +-- +2.34.1 diff --git a/packages/binutils/2.46.0/0010-Write-SEH-records-to-pdata-xdata.patch b/packages/binutils/2.46.0/0010-Write-SEH-records-to-pdata-xdata.patch new file mode 100644 index 0000000000..66c24945c0 --- /dev/null +++ b/packages/binutils/2.46.0/0010-Write-SEH-records-to-pdata-xdata.patch @@ -0,0 +1,366 @@ +From 4444444444444444444444444444444444444444 Mon Sep 17 00:00:00 2001 +From: Evgeny Karpov +Date: Fri, 9 May 2025 13:09:00 +0200 +Subject: [PATCH v2 5/7] Write SEH records to pdata/xdata + +The patch emits the required records to the pdata/xdata sections that contain +unwinding information for SEH. + +gas/ChangeLog: + + * config/obj-coff-seh.c (seh_arm64_emit_epilog_scopes): New. + (seh_arm64_emit_unwind_codes): New. + (seh_arm64_write_function_xdata): New. + (write_function_xdata): Update. + (write_function_pdata): Update. +--- + gas/config/obj-coff-seh.c | 308 +++++++++++++++++++++++++++++++++++++- + 1 file changed, 306 insertions(+), 2 deletions(-) + +diff --git a/gas/config/obj-coff-seh.c b/gas/config/obj-coff-seh.c +index 8f9562ee234..0ce70564368 100644 +--- a/gas/config/obj-coff-seh.c ++++ b/gas/config/obj-coff-seh.c +@@ -1192,6 +1192,78 @@ seh_x64_write_prologue_data (const seh_context *c) + } + } + ++static void ++seh_arm64_emit_epilog_scopes (uint64_t fragment_offset, ++ uint32_t prolog_size, ++ unsigned int first_fragment_scope, ++ unsigned int last_fragment_scope, ++ bool has_phantom_prolog) ++{ ++ int32_t start_index_offset = 0; ++ const ++ seh_arm64_epilogue_scope *scopes = seh_ctx_cur->arm64_ctx.epilogue_scopes; ++ if (first_fragment_scope < seh_ctx_cur->arm64_ctx.epilogue_scopes_count) ++ start_index_offset = scopes[first_fragment_scope].epilogue_start_index ++ - prolog_size; ++ if (has_phantom_prolog) ++ start_index_offset -= 1; ++ for (unsigned int i = first_fragment_scope; i < last_fragment_scope; ++i) ++ { ++ seh_arm64_epilogue_scope scope; ++ scope = seh_ctx_cur->arm64_ctx.epilogue_scopes[i]; ++ scope.epilogue_start_offset_reduced = (scope.epilogue_start_offset ++ - fragment_offset) >> 2; ++ scope.epilogue_start_index -= start_index_offset; ++ uint32_t scope_code; ++ memcpy (&scope_code, &scope, sizeof (scope_code)); ++ out_four (scope_code); ++ } ++} ++ ++static void ++seh_arm64_emit_unwind_codes (const seh_context *c, uint32_t prolog_size, ++ uint32_t first_epilog_index, ++ uint32_t last_epilog_index, ++ bool has_phantom_prolog) ++{ ++ uint32_t total_byte_count = 0; ++ ++ if (has_phantom_prolog) ++ { ++ ++total_byte_count; ++ md_number_to_chars (frag_more (1), ARM64_UNOP_ENDC, 1); ++ } ++ ++ uint32_t unwind_bytes_offset = 0; ++ for (int i = 0; i < (int)c->arm64_ctx.unwind_codes_count; ++i) ++ { ++ const seh_arm64_unwind_code *code = c->arm64_ctx.unwind_codes + i; ++ const int byte_count = unwind_code_pack_infos[code->type].size; ++ unwind_bytes_offset += byte_count; ++ ++ if (unwind_bytes_offset > last_epilog_index) ++ break; ++ ++ if (unwind_bytes_offset > prolog_size ++ && unwind_bytes_offset <= first_epilog_index) ++ continue; ++ ++ /* emit unwind code bytes in big endian. */ ++ number_to_chars_bigendian (frag_more (byte_count), code->value, ++ byte_count); ++ total_byte_count += byte_count; ++ } ++ ++ /* handle word alignment. */ ++ int required_padding = (4 - total_byte_count % 4) % 4; ++ if (required_padding) ++ { ++ const uint32_t nop_chain = 0xe3e3e3e3; ++ md_number_to_chars (frag_more (required_padding), nop_chain, ++ required_padding); ++ } ++} ++ + static int + seh_x64_size_prologue_data (const seh_context *c) + { +@@ -1286,6 +1358,205 @@ seh_x64_write_function_xdata (seh_context *c) + /* Handler data will be tacked in here by subsections. */ + } + ++/* Write out the xdata information for one function (arm64). */ ++static void ++seh_arm64_write_function_xdata (seh_context *c) ++{ ++ if (!seh_ctx_cur->arm64_ctx.unwind_codes_byte_count) ++ return; ++ ++ /* Set 4-byte alignment. */ ++ frag_align (2, 0, 0); ++ ++ uintptr_t func_length = 0; ++ expressionS exp; ++ exp.X_op = O_subtract; ++ exp.X_add_symbol = c->end_addr; ++ exp.X_op_symbol = c->start_addr; ++ exp.X_add_number = 0; ++ if (!resolve_expression (&exp) || exp.X_op != O_constant ++ || exp.X_add_number < 0) ++ as_bad (_("the function size expression for %s " ++ "does not evaluate to a non-negative constant"), ++ S_GET_NAME (c->start_addr)); ++ ++ func_length = exp.X_add_number; ++ ++ const uint32_t max_frag_size = ((1 << 18) - 1) << 2; ++ uintptr_t fragment_offset = 0; ++ bool is_fragmented_function = func_length > max_frag_size; ++ ++ /* [first_fragment_scope, last_fragment_scope). */ ++ unsigned int first_fragment_scope = 0; ++ unsigned int last_fragment_scope = 0; ++ uint32_t prolog_size = 0; ++ uint32_t prolog_insruction_count = 0; ++ for (unsigned int i = 0; i < c->arm64_ctx.unwind_codes_count; ++i) ++ { ++ if (c->arm64_ctx.unwind_codes[i].type == end) ++ { ++ prolog_insruction_count = i + 1; ++ break; ++ } ++ } ++ ++ if (c->arm64_ctx.epilogue_scopes_count) ++ prolog_size = c->arm64_ctx.epilogue_scopes[0].epilogue_start_index; ++ else ++ prolog_size = c->arm64_ctx.unwind_codes_byte_count; ++ ++ seh_arm64_func_fragment *fragment; ++ fragment = &seh_ctx_cur->arm64_ctx.func_fragment; ++ ++ while (true) ++ { ++ fragment->xdata_addr = symbol_temp_new_now (); ++ fragment->offset = fragment_offset; ++ fragment->next = NULL; ++ ++ uintptr_t frag_size = func_length - fragment_offset; ++ if (frag_size > max_frag_size) ++ frag_size = max_frag_size; ++ ++ bool is_first_frag = fragment_offset == 0; ++ bool is_last_frag = (fragment_offset + frag_size) == func_length; ++ ++ if (!is_fragmented_function) ++ last_fragment_scope = c->arm64_ctx.epilogue_scopes_count; ++ else ++ { ++ first_fragment_scope = last_fragment_scope; ++ for (unsigned int i = first_fragment_scope; ++ i < c->arm64_ctx.epilogue_scopes_count; ++i) ++ { ++ const seh_arm64_epilogue_scope *scope; ++ scope = c->arm64_ctx.epilogue_scopes; ++ scope += i; ++ if (scope->epilogue_start_offset >= (fragment_offset + frag_size)) ++ break; ++ ++ if (scope->epilogue_end_offset >= (fragment_offset + frag_size)) ++ { ++ frag_size = scope->epilogue_start_offset - fragment_offset; ++ break; ++ } ++ ++ if (scope->epilogue_start_offset >= fragment_offset) ++ last_fragment_scope = i + 1; ++ } ++ } ++ ++ seh_arm64_xdata_header *header = &c->arm64_ctx.xdata_header; ++ const ++ seh_arm64_epilogue_scope *scopes = seh_ctx_cur->arm64_ctx.epilogue_scopes; ++ ++ header->func_length = frag_size >> 2; ++ header->vers = 0; ++ header->e = 0; ++ header->code_words = 0; ++ header->epilogue_count = 0; ++ ++ header->ext_code_words = 0; ++ header->ext_epilogue_count = last_fragment_scope ++ - first_fragment_scope; ++ header->reserved = 0; ++ ++ uint32_t first_epilog_index = 0; ++ uint32_t last_epilog_index = 0; ++ if (!header->ext_epilogue_count) ++ { ++ first_epilog_index = prolog_size; ++ last_epilog_index = prolog_size; ++ } ++ else ++ { ++ const seh_arm64_epilogue_scope *scope; ++ scope = scopes + first_fragment_scope; ++ first_epilog_index = scope->epilogue_start_index; ++ if (last_fragment_scope == c->arm64_ctx.epilogue_scopes_count) ++ last_epilog_index = c->arm64_ctx.unwind_codes_byte_count; ++ else ++ { ++ scope = scopes + last_fragment_scope; ++ last_epilog_index = scope->epilogue_start_index; ++ } ++ } ++ ++ uint32_t unwind_bytes = 0; ++ if (is_first_frag || is_last_frag) ++ unwind_bytes += prolog_size; ++ ++ if (header->ext_epilogue_count) ++ unwind_bytes += last_epilog_index - first_epilog_index; ++ ++ if (is_fragmented_function && is_last_frag && unwind_bytes) ++ { ++ unwind_bytes += 1; ++ ++header->ext_epilogue_count; ++ } ++ ++ header->ext_code_words = (unwind_bytes + 3) / 4; ++ ++ if ((header->ext_code_words == 0 && header->ext_epilogue_count == 0) ++ || header->ext_code_words > 31 ++ || header->ext_epilogue_count > 31) ++ md_number_to_chars (frag_more (8), c->arm64_ctx.xdata_header_value, 8); ++ else ++ { ++ header->code_words = header->ext_code_words; ++ header->epilogue_count = header->ext_epilogue_count; ++ if (header->epilogue_count == 1) ++ { ++ header->e = 1; ++ if (is_fragmented_function && is_last_frag) ++ header->ext_epilogue_count = 0; ++ else ++ { ++ const seh_arm64_epilogue_scope *scope; ++ scope = scopes + first_fragment_scope; ++ header->ext_epilogue_count = scope->epilogue_start_index; ++ } ++ } ++ out_four (c->arm64_ctx.xdata_header_value); ++ } ++ ++ bool has_phantom_prolog = is_fragmented_function && is_last_frag; ++ if (header->ext_epilogue_count && !header->e) ++ { ++ seh_arm64_emit_epilog_scopes (fragment_offset, prolog_size, ++ first_fragment_scope, ++ last_fragment_scope, ++ has_phantom_prolog); ++ if (is_fragmented_function && is_last_frag) ++ { ++ uint32_t epilog_start_offset; ++ epilog_start_offset = frag_size - prolog_insruction_count * 4; ++ md_number_to_chars (frag_more (4), ++ (1 << 22) | (epilog_start_offset >> 2), 4); ++ } ++ } ++ ++ if (header->ext_code_words) ++ seh_arm64_emit_unwind_codes (c, prolog_size, first_epilog_index, ++ last_epilog_index, has_phantom_prolog); ++ ++ if (header->x == 1) ++ { ++ if (c->handler.X_op == O_symbol) ++ c->handler.X_op = O_symbol_rva; ++ ++ emit_expr (&c->handler, 4); ++ } ++ ++ fragment_offset += frag_size; ++ if (fragment_offset == func_length) ++ break; ++ ++ fragment->next = XCNEW (seh_arm64_func_fragment); ++ fragment = fragment->next; ++ } ++} ++ + /* Write out xdata for one function. */ + + static void +@@ -1294,13 +1565,25 @@ write_function_xdata (seh_context *c) + segT save_seg = now_seg; + int save_subseg = now_subseg; + ++ seh_kind target_kind = seh_get_target_kind (); ++ + /* MIPS, SH, ARM don't have xdata. */ +- if (seh_get_target_kind () != seh_kind_x64) ++ if ((target_kind != seh_kind_x64) && (target_kind != seh_kind_arm64)) + return; + + switch_xdata (c->subsection, c->code_seg); + +- seh_x64_write_function_xdata (c); ++ switch (target_kind) ++ { ++ case seh_kind_x64: ++ seh_x64_write_function_xdata (c); ++ break; ++ case seh_kind_arm64: ++ seh_arm64_write_function_xdata (c); ++ break; ++ default: ++ break; ++ } + + subseg_set (save_seg, save_subseg); + } +@@ -1385,6 +1668,27 @@ write_function_pdata (seh_context *c) + emit_expr (&exp, 4); + break; + ++ case seh_kind_arm64: ++ if (!seh_ctx_cur->arm64_ctx.unwind_codes_byte_count) ++ break; ++ ++ seh_arm64_func_fragment *fragment = &seh_ctx_cur->arm64_ctx.func_fragment; ++ while (fragment) ++ { ++ exp.X_op = O_symbol_rva; ++ exp.X_add_number = fragment->offset; ++ exp.X_add_symbol = c->start_addr; ++ emit_expr (&exp, 4); ++ ++ exp.X_op = O_symbol_rva; ++ /* TODO: Implementing packed unwind data. */ ++ exp.X_add_number = 0; ++ exp.X_add_symbol = fragment->xdata_addr; ++ emit_expr (&exp, 4); ++ fragment = fragment->next; ++ } ++ break; ++ + case seh_kind_mips: + exp.X_op = O_symbol; + exp.X_add_number = 0; +-- +2.34.1 diff --git a/packages/binutils/2.46.0/0011-Apply-SEH-to-AArch64.patch b/packages/binutils/2.46.0/0011-Apply-SEH-to-AArch64.patch new file mode 100644 index 0000000000..47b0edf09a --- /dev/null +++ b/packages/binutils/2.46.0/0011-Apply-SEH-to-AArch64.patch @@ -0,0 +1,59 @@ +From 5555555555555555555555555555555555555555 Mon Sep 17 00:00:00 2001 +From: Evgeny Karpov +Date: Fri, 9 May 2025 13:11:00 +0200 +Subject: [PATCH v2 6/7] Apply SEH to AArch64 + +This change introduces the required commands for SEH on AArch64. + +gas/ChangeLog: + + * config/obj-coff-seh.h (defined): Use COFFAARCH64 guard. + (SEH_CMDS): New. +--- + gas/config/obj-coff-seh.h | 31 +++++++++++++++++++++++++++++++ + 1 file changed, 31 insertions(+) + +diff --git a/gas/config/obj-coff-seh.h b/gas/config/obj-coff-seh.h +index 63af8780a75..3d090c0d5ed 100644 +--- a/gas/config/obj-coff-seh.h ++++ b/gas/config/obj-coff-seh.h +@@ -113,6 +113,37 @@ typedef enum seh_arm64_unwind_types + {"seh_code", obj_coff_seh_code, 0}, \ + {"seh_handlerdata", obj_coff_seh_handlerdata, 0}, + ++#if defined (COFFAARCH64) ++#undef SEH_CMDS ++#define SEH_CMDS \ ++ {"seh_proc", obj_coff_seh_proc, 0}, \ ++ {"seh_endproc", obj_coff_seh_endproc, 0}, \ ++ {"seh_endprologue", obj_coff_seh_endprologue, 0}, \ ++ {"seh_startepilogue", obj_coff_seh_startepilogue, 0}, \ ++ {"seh_endepilogue", obj_coff_seh_endepilogue, 0}, \ ++ {"seh_stackalloc", obj_coff_seh_stackalloc, 0}, \ ++ {"seh_handler", obj_coff_seh_handler, 0}, \ ++ {"seh_handlerdata", obj_coff_seh_handlerdata, 0}, \ ++ {"seh_endfunclet", obj_coff_seh_endfunclet, 0}, \ ++ {"seh_save_reg", obj_coff_seh_save_reg, save_reg}, \ ++ {"seh_save_reg_x", obj_coff_seh_save_reg, save_reg_x}, \ ++ {"seh_save_regp", obj_coff_seh_save_reg, save_regp}, \ ++ {"seh_save_regp_x", obj_coff_seh_save_reg, save_regp_x}, \ ++ {"seh_save_lrpair", obj_coff_seh_save_reg, save_lrpair}, \ ++ {"seh_save_fregp", obj_coff_seh_save_reg, save_fregp}, \ ++ {"seh_save_fregp_x", obj_coff_seh_save_reg, save_fregp_x}, \ ++ {"seh_save_freg", obj_coff_seh_save_reg, save_freg}, \ ++ {"seh_save_freg_x", obj_coff_seh_save_reg, save_freg_x}, \ ++ {"seh_save_fplr", obj_coff_seh_save_reg, save_fplr}, \ ++ {"seh_save_fplr_x", obj_coff_seh_save_reg, save_fplr_x}, \ ++ {"seh_save_r19r20_x", obj_coff_seh_save_reg, save_r19r20_x}, \ ++ {"seh_add_fp", obj_coff_seh_save_reg, add_fp}, \ ++ {"seh_nop", obj_coff_seh_save_reg, nop}, \ ++ {"seh_pac_sign_lr", obj_coff_seh_save_reg, pac_sign_lr}, \ ++ {"seh_set_fp", obj_coff_seh_save_reg, set_fp}, \ ++ {"seh_save_next", obj_coff_seh_save_reg, save_next}, ++#endif ++ + /* Type definitions. */ + + typedef struct seh_prologue_element +-- +2.34.1 diff --git a/packages/binutils/2.46.0/0012-Fix-the-calculation-of-the-function-length.patch b/packages/binutils/2.46.0/0012-Fix-the-calculation-of-the-function-length.patch new file mode 100644 index 0000000000..6e8073d502 --- /dev/null +++ b/packages/binutils/2.46.0/0012-Fix-the-calculation-of-the-function-length.patch @@ -0,0 +1,40 @@ +From 6666666666666666666666666666666666666666 Mon Sep 17 00:00:00 2001 +From: Evgeny Karpov +Date: Fri, 9 May 2025 13:13:00 +0200 +Subject: [PATCH v2 7/7] Fix the calculation of the function length + +The patch fixes an issue when alignment is applied in the middle of +executed code, affecting the calculation of the function length. +It can be resolved by using the MAP_DATA state. + +gas/ChangeLog: + + * config/tc-aarch64.h (HANDLE_ALIGN): Update. +--- + gas/config/tc-aarch64.h | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/gas/config/tc-aarch64.h b/gas/config/tc-aarch64.h +index 3cd7be5ba34..32e3aafc545 100644 +--- a/gas/config/tc-aarch64.h ++++ b/gas/config/tc-aarch64.h +@@ -210,10 +210,16 @@ struct aarch64_frag_type + (fr_fix) plus 4 bytes to contain the repeating NOP (fr_var). */ + #define MAX_MEM_FOR_RS_ALIGN_CODE(p2align, max) (3 + 4) + ++/* Sections are assumed to start aligned. In executable section, there is no ++ MAP_DATA symbol pending. So we only align the address during ++ MAP_DATA --> MAP_INSN transition. ++ For other sections, this is not guaranteed. */ + #define md_do_align(N, FILL, LEN, MAX, LABEL) \ + if (FILL == NULL && (N) != 0 && ! need_pass_2 && subseg_text_p (now_seg)) \ + { \ +- frag_align_code (N, MAX); \ ++ enum mstate mapstate = seg_info (now_seg)->tc_segment_info_data.mapstate;\ ++ if (mapstate == MAP_DATA) \ ++ frag_align_code (N, MAX); \ + goto LABEL; \ + } + +-- +2.34.1 diff --git a/packages/binutils/2.46.0/chksum b/packages/binutils/2.46.0/chksum new file mode 100644 index 0000000000..04f5870edd --- /dev/null +++ b/packages/binutils/2.46.0/chksum @@ -0,0 +1,12 @@ +md5 binutils-2.46.0.tar.bz2 a77b618847835bb29f43853a3666c190 +sha1 binutils-2.46.0.tar.bz2 0a64618bb1d511a9ebe9eba12b54cdd9847b329d +sha256 binutils-2.46.0.tar.bz2 0f3152632a2a9ce066f20963e9bb40af7cf85b9b6c409ed892fd0676e84ecd12 +sha512 binutils-2.46.0.tar.bz2 0706f565112981eea5f6f412a928f14ffcd7afec0e289259709c5d6a41fd54d0ebe675de0580684affe20ac71b7686e235555f8f3ca20537f99330ca46491ab9 +md5 binutils-2.46.0.tar.gz f2.46.007e7260febe074568d224dc6d35 +sha1 binutils-2.46.0.tar.gz 1a5915371e906516ad6870b59aa450c96dc1d56e +sha256 binutils-2.46.0.tar.gz 8608fe44ab7de645f6ad0a898313b75338842490d609adb85c9fb2827c376af2 +sha512 binutils-2.46.0.tar.gz 30d24f7461d459dcbd04e506bb74e487a92748ed411878aacf7388a79ac5b73f968569f43385c9f12c669a5c0b0295d3083a8a4f3ab1be1bb826b3a15ec1f029 +md5 binutils-2.46.0.tar.xz 81bb6810bcd1119819dc0804956e1c92 +sha1 binutils-2.46.0.tar.xz ca9c3b9f829d4243adfec46108417cec7c6985bb +sha256 binutils-2.46.0.tar.xz d75a94f4d73e7a4086f7513e67e439e8fcdcbb726ffe63f4661744e6256b2cf2 +sha512 binutils-2.46.0.tar.xz 32f880bb4f69351f4ae54a5d00359625c6c49d8e76624fb5cffdf174c79c8d3212f66225b81c12933c6ed59604ab652560773dd92fab384b930c97a9d4e1fdf2 diff --git a/packages/linux/5.10.222/version.desc b/packages/binutils/2.46.0/version.desc similarity index 100% rename from packages/linux/5.10.222/version.desc rename to packages/binutils/2.46.0/version.desc diff --git a/packages/binutils/package.desc b/packages/binutils/package.desc index 259ce6c7f4..3ec49c63bb 100644 --- a/packages/binutils/package.desc +++ b/packages/binutils/package.desc @@ -2,6 +2,6 @@ repository='git git://sourceware.org/git/binutils-gdb.git' mirrors='$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)' relevantpattern='*.*|.' origin='GNU' -milestones='2.26 2.27 2.30 2.39' +milestones='2.26 2.27 2.30 2.39 2.41 2.44 2.45 2.46.0' archive_formats='.tar.xz .tar.bz2 .tar.gz' signature_format='packed/.sig' diff --git a/packages/bison/3.8.2/chksum b/packages/bison/3.8.2/chksum new file mode 100644 index 0000000000..11c5aeb94b --- /dev/null +++ b/packages/bison/3.8.2/chksum @@ -0,0 +1,8 @@ +md5 bison-3.8.2.tar.xz c28f119f405a2304ff0a7ccdcc629713 +sha1 bison-3.8.2.tar.xz da1522a00f8c23c1abf69dbd2e99078d2a484b96 +sha256 bison-3.8.2.tar.xz 9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2 +sha512 bison-3.8.2.tar.xz d4d23af6671406e97257892f90651b67f2ab95219831372be032190b7156c10a3435d457857e677445df8b2327aacccc15344acbbc3808a6f332a93cce23b444 +md5 bison-3.8.2.tar.gz 1e541a097cda9eca675d29dd2832921f +sha1 bison-3.8.2.tar.gz 8e4b861eb765a7797ea0a6257ec600b3ff5ee37d +sha256 bison-3.8.2.tar.gz 06c9e13bdf7eb24d4ceb6b59205a4f67c2c7e7213119644430fe82fbd14a0abb +sha512 bison-3.8.2.tar.gz bdf21dc063d12cc3fe742d3716cf44c3ddc642e1b236825460f6b9a74c4412b891cd9b8f7e139b02e7897176cd0be202bf4838179c355d89fdfb128cf3649971 diff --git a/packages/linux/5.15.163/version.desc b/packages/bison/3.8.2/version.desc similarity index 100% rename from packages/linux/5.15.163/version.desc rename to packages/bison/3.8.2/version.desc diff --git a/packages/cloog/0.18.1/chksum b/packages/cloog/0.18.1/chksum new file mode 100644 index 0000000000..8c4fa5afb2 --- /dev/null +++ b/packages/cloog/0.18.1/chksum @@ -0,0 +1,4 @@ +md5 cloog-0.18.1.tar.gz e34fca0540d840e5d0f6427e98c92252 +sha1 cloog-0.18.1.tar.gz 2dc70313e8e2c6610b856d627bce9c9c3f848077 +sha256 cloog-0.18.1.tar.gz 02500a4edd14875f94fe84cbeda4290425cb0c1c2474c6f75d75a303d64b4196 +sha512 cloog-0.18.1.tar.gz 0b12d9f3c39a2425e28e1d7c0a2b3787287fe3e6e3052f094d2ab6cffeb205ce19044100cbfd805659b3e6b3d21ac2f5a3c92848f476de54edfe6b1cbd2172e9 diff --git a/packages/gnuprumcu/0.5.0/version.desc b/packages/cloog/0.18.1/version.desc similarity index 100% rename from packages/gnuprumcu/0.5.0/version.desc rename to packages/cloog/0.18.1/version.desc diff --git a/packages/dtc/1.4.7/version.desc b/packages/dtc/1.4.7/version.desc index e69de29bb2..fcfe38915a 100644 --- a/packages/dtc/1.4.7/version.desc +++ b/packages/dtc/1.4.7/version.desc @@ -0,0 +1 @@ +obsolete='yes' diff --git a/packages/dtc/1.5.1/version.desc b/packages/dtc/1.5.1/version.desc index e69de29bb2..fcfe38915a 100644 --- a/packages/dtc/1.5.1/version.desc +++ b/packages/dtc/1.5.1/version.desc @@ -0,0 +1 @@ +obsolete='yes' diff --git a/packages/dtc/1.6.1/version.desc b/packages/dtc/1.6.1/version.desc index e69de29bb2..fcfe38915a 100644 --- a/packages/dtc/1.6.1/version.desc +++ b/packages/dtc/1.6.1/version.desc @@ -0,0 +1 @@ +obsolete='yes' diff --git a/packages/dtc/1.7.2/chksum b/packages/dtc/1.7.2/chksum new file mode 100644 index 0000000000..9b369ff18e --- /dev/null +++ b/packages/dtc/1.7.2/chksum @@ -0,0 +1,8 @@ +md5 dtc-1.7.2.tar.xz 0f193be84172556027da22d4fe3464e0 +sha1 dtc-1.7.2.tar.xz 531ef5c31a080d7fd25955a75a29c56f0e0f9f97 +sha256 dtc-1.7.2.tar.xz 92d8ca769805ae1f176204230438fe52808f4e1c7944053c9eec0e649b237539 +sha512 dtc-1.7.2.tar.xz 30f3611175a5c29556282f3f2894701a5837eb869608d89d78c280af448bbc3a5b6c83f51c28f991847c0eb7c42aa57599bbc31433f1b3b2c8d162cb2169b91f +md5 dtc-1.7.2.tar.gz 81a06ba696bd91d55b4531cdc0b09dc6 +sha1 dtc-1.7.2.tar.gz 8a4e9432aec9d81a48a57f6afd685f9cfb5f0bea +sha256 dtc-1.7.2.tar.gz f200e5ebd7afd20d4b3804a3085af0870fcf3c194f8d7f0f6985cf8bbb4ac0f4 +sha512 dtc-1.7.2.tar.gz 87c9a8d99bc275a5ff155d58ac1206749ff5be4a0874e8a66b4d4509f92e746a55e9d4ae04be9745be61c35d172786a5d5ef6613931bac201280a253b22c041a diff --git a/packages/linux/5.4.280/version.desc b/packages/dtc/1.7.2/version.desc similarity index 100% rename from packages/linux/5.4.280/version.desc rename to packages/dtc/1.7.2/version.desc diff --git a/packages/expat/2.5.0/chksum b/packages/expat/2.5.0/chksum index e81826d7fe..d485ea74c0 100644 --- a/packages/expat/2.5.0/chksum +++ b/packages/expat/2.5.0/chksum @@ -14,4 +14,3 @@ md5 expat-2.5.0.tar.gz 686e9d986f85966c7924dfc041cdc15e sha1 expat-2.5.0.tar.gz 061c1232188dff35e44aa7137aec7757d3d90d27 sha256 expat-2.5.0.tar.gz 6b902ab103843592be5e99504f846ec109c1abb692e85347587f237a4ffa1033 sha512 expat-2.5.0.tar.gz f1ff7da5fafb47dcd6e0f0d892826aba6de76509c8497bc00382f1109ab8e2a93d396943dbb52216457044993a39d73728048adf650d8e83e28189edc7b78402 - diff --git a/packages/expat/2.6.4/chksum b/packages/expat/2.6.4/chksum new file mode 100644 index 0000000000..5a4aa3cfa2 --- /dev/null +++ b/packages/expat/2.6.4/chksum @@ -0,0 +1,16 @@ +md5 expat-2.6.4.tar.xz 101fe3e320a2800f36af8cf4045b45c7 +sha1 expat-2.6.4.tar.xz 97d653e8f5a30dfdec7d6e525151efeac7890942 +sha256 expat-2.6.4.tar.xz a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee +sha512 expat-2.6.4.tar.xz 620da34d98524478b445038bf1dd439790fe11169496516425fca922226797835c27549fc5fb825792b516563b24eb922d9ad8f27d20a0229e7ee8cd640dfb25 +md5 expat-2.6.4.tar.lz b39fd697eedc931fa8dd5a2cce866234 +sha1 expat-2.6.4.tar.lz 883349d398cd35e2c5c258984ab25780be138bc5 +sha256 expat-2.6.4.tar.lz 80a5bec283c7cababb3c6ec145feb4f34a7741eae69f9e6654cc82f5890f05e2 +sha512 expat-2.6.4.tar.lz 6790db69fe3de70f5422306aec9092cf9ca0aea1ab28874604c6dfa36e048024f034b1e5fc3afca2623b41856b2b52d3582ab1a384bc93e2e13553359d6b49a7 +md5 expat-2.6.4.tar.bz2 f1acfb75967648230d37629e02afbadc +sha1 expat-2.6.4.tar.bz2 93082742ac825a8d399ab8f94c41d9f246c6d8bc +sha256 expat-2.6.4.tar.bz2 8dc480b796163d4436e6f1352e71800a774f73dbae213f1860b60607d2a83ada +sha512 expat-2.6.4.tar.bz2 cd21a5cfafe15b747e6e8964e35eed52a446373811d02bc3730b3e616ccd066f07e4cdbd48f445d6fddfb931841b28072016248b19a8add9cf087cbf83ba18da +md5 expat-2.6.4.tar.gz 943af565caffb46dca104c6b946dacaf +sha1 expat-2.6.4.tar.gz 963c5d99c2f206367bbc504d3b8dc74a51300c02 +sha256 expat-2.6.4.tar.gz fd03b7172b3bd7427a3e7a812063f74754f24542429b634e0db6511b53fb2278 +sha512 expat-2.6.4.tar.gz b6dd72dd7b691bd1d619c4a2d0a08357e47d7fab9839a43d456cb6b804508124889fc923e9ba2388872d4e7602e4b0a902bdc92d31bdbda81555be27bcc557e1 diff --git a/packages/linux/6.1.100/version.desc b/packages/expat/2.6.4/version.desc similarity index 100% rename from packages/linux/6.1.100/version.desc rename to packages/expat/2.6.4/version.desc diff --git a/packages/expat/2.7.1/chksum b/packages/expat/2.7.1/chksum new file mode 100644 index 0000000000..c7e1aa59dd --- /dev/null +++ b/packages/expat/2.7.1/chksum @@ -0,0 +1,16 @@ +md5 expat-2.7.1.tar.xz 9f0c266ff4b9720beae0c6bd53ae4469 +sha1 expat-2.7.1.tar.xz 4a6170d6b2abf6dc1ca665aa1b6285768f00c2d4 +sha256 expat-2.7.1.tar.xz 354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30 +sha512 expat-2.7.1.tar.xz 4c9a6c1c1769d2c4404da083dd3013dbc73883da50e2b7353db2349a420e9b6d27cac7dbcb645991d6c7cdbf79bd88486fc1ac353084ce48e61081fb56e13d46 +md5 expat-2.7.1.tar.lz 5299a3fcb2a7877d840526ab1493ba4a +sha1 expat-2.7.1.tar.lz dff036b5ab6873a9dcd0ee7fbe3b9bc507908b5c +sha256 expat-2.7.1.tar.lz baacdd8d98d5d3b753f2a2780d84b0bc7731be11cacdc1b98cb8ad73f0504e68 +sha512 expat-2.7.1.tar.lz f82efd9c05168d68598301bf5e841d96d4cd6a8218ab73fe9f8295b0ecb73567fea45a67ec93a5cb57d84e9328d78b06bc2c1e42d97ba70415f207e9dbd913db +md5 expat-2.7.1.tar.bz2 e01e02f2a7012f76bdb44b08415097be +sha1 expat-2.7.1.tar.bz2 8a91a899f3f6650a246d56152d1677df0b19992e +sha256 expat-2.7.1.tar.bz2 45c98ae1e9b5127325d25186cf8c511fa814078e9efeae7987a574b482b79b3d +sha512 expat-2.7.1.tar.bz2 ea78781ca03367a014afc1bb37c2306883b6f666d7cd90dc84a39c4abc6b7ec261636b8668540aa286c708a41dd02baae8249dc4391306da56431700460a0f23 +md5 expat-2.7.1.tar.gz 7dffeee9daf061217fb123b83414a736 +sha1 expat-2.7.1.tar.gz d03e5df29d98ecc652efbe8bd836df1e15fc0d5e +sha256 expat-2.7.1.tar.gz 0cce2e6e69b327fc607b8ff264f4b66bdf71ead55a87ffd5f3143f535f15cfa2 +sha512 expat-2.7.1.tar.gz 1b6b94f3253ac3ab3f8c69d1c852db2334c99cb7990b9656f5f2458198d1eb854e79cce0e39151aef0d5e01a740fc965651c6a57fda585f9a24c543f2693f78c diff --git a/packages/linux/6.10/version.desc b/packages/expat/2.7.1/version.desc similarity index 100% rename from packages/linux/6.10/version.desc rename to packages/expat/2.7.1/version.desc diff --git a/packages/expat/package.desc b/packages/expat/package.desc index 84dba8ff3c..4b7026b412 100644 --- a/packages/expat/package.desc +++ b/packages/expat/package.desc @@ -1,6 +1,6 @@ repository='git https://github.com/libexpat/libexpat.git' repository_subdir='expat' -bootstrap='./buildconf.sh && make -C doc all' +bootstrap='./buildconf.sh' mirrors='http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION} https://github.com/libexpat/libexpat/releases/download/R_${CT_EXPAT_VERSION//./_}' archive_formats='.tar.xz .tar.lz .tar.bz2 .tar.gz' relevantpattern='*.*|.' diff --git a/packages/gcc/12.4.0/chksum b/packages/gcc/12.4.0/chksum deleted file mode 100644 index 228b42d4a7..0000000000 --- a/packages/gcc/12.4.0/chksum +++ /dev/null @@ -1,8 +0,0 @@ -md5 gcc-12.4.0.tar.xz fd7779aee878db67456575922281fa71 -sha1 gcc-12.4.0.tar.xz b373d4ac29bb06ca64d288621906cbf63ab5a1f5 -sha256 gcc-12.4.0.tar.xz 704f652604ccbccb14bdabf3478c9511c89788b12cb3bbffded37341916a9175 -sha512 gcc-12.4.0.tar.xz 5bd29402cad2deb5d9388d0236c7146414d77e5b8d5f1c6c941c7a1f47691c3389f08656d5f6e8e2d6717bf2c81f018d326f632fb468f42925b40bd217fc4853 -md5 gcc-12.4.0.tar.gz 2c34e2879ee25358417dc53ed8896d9a -sha1 gcc-12.4.0.tar.gz 02f5483b3114a1704943e832dff95a512f3e6ae7 -sha256 gcc-12.4.0.tar.gz 5a30de2be740062bb3ddd3fd13c9b1bb4584d8f85616d33f23a713439d714148 -sha512 gcc-12.4.0.tar.gz 13b2054a761b96d1d9b448999ea9978027deb54c5ea21af5344997efc74ca7da2df6fea462e4513c8307c672a35a74a1354de46e23d4005c60b9d50c8e5a89c8 diff --git a/packages/gcc/12.4.0/0000-libtool-leave-framework-alone.patch b/packages/gcc/12.5.0/0000-libtool-leave-framework-alone.patch similarity index 100% rename from packages/gcc/12.4.0/0000-libtool-leave-framework-alone.patch rename to packages/gcc/12.5.0/0000-libtool-leave-framework-alone.patch diff --git a/packages/gcc/12.4.0/0001-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc/12.5.0/0001-gcc-plugin-POSIX-include-sys-select-h.patch similarity index 100% rename from packages/gcc/12.4.0/0001-gcc-plugin-POSIX-include-sys-select-h.patch rename to packages/gcc/12.5.0/0001-gcc-plugin-POSIX-include-sys-select-h.patch diff --git a/packages/gcc/12.4.0/0002-arm-softfloat-libgcc.patch b/packages/gcc/12.5.0/0002-arm-softfloat-libgcc.patch similarity index 100% rename from packages/gcc/12.4.0/0002-arm-softfloat-libgcc.patch rename to packages/gcc/12.5.0/0002-arm-softfloat-libgcc.patch diff --git a/packages/gcc/12.4.0/0003-libgcc-disable-split-stack-nothreads.patch b/packages/gcc/12.5.0/0003-libgcc-disable-split-stack-nothreads.patch similarity index 100% rename from packages/gcc/12.4.0/0003-libgcc-disable-split-stack-nothreads.patch rename to packages/gcc/12.5.0/0003-libgcc-disable-split-stack-nothreads.patch diff --git a/packages/gcc/12.4.0/0004-Remove-use-of-include_next-from-c-headers.patch b/packages/gcc/12.5.0/0004-Remove-use-of-include_next-from-c-headers.patch similarity index 100% rename from packages/gcc/12.4.0/0004-Remove-use-of-include_next-from-c-headers.patch rename to packages/gcc/12.5.0/0004-Remove-use-of-include_next-from-c-headers.patch diff --git a/packages/gcc/12.4.0/0005-Allow-default-libc-to-be-specified-to-configure.patch b/packages/gcc/12.5.0/0005-Allow-default-libc-to-be-specified-to-configure.patch similarity index 100% rename from packages/gcc/12.4.0/0005-Allow-default-libc-to-be-specified-to-configure.patch rename to packages/gcc/12.5.0/0005-Allow-default-libc-to-be-specified-to-configure.patch diff --git a/packages/gcc/12.4.0/0006-driver-Extend-getenv-function-to-allow-default-value.patch b/packages/gcc/12.5.0/0006-driver-Extend-getenv-function-to-allow-default-value.patch similarity index 100% rename from packages/gcc/12.4.0/0006-driver-Extend-getenv-function-to-allow-default-value.patch rename to packages/gcc/12.5.0/0006-driver-Extend-getenv-function-to-allow-default-value.patch diff --git a/packages/gcc/12.4.0/0007-Add-newlib-and-picolibc-as-default-C-library-choices.patch b/packages/gcc/12.5.0/0007-Add-newlib-and-picolibc-as-default-C-library-choices.patch similarity index 100% rename from packages/gcc/12.4.0/0007-Add-newlib-and-picolibc-as-default-C-library-choices.patch rename to packages/gcc/12.5.0/0007-Add-newlib-and-picolibc-as-default-C-library-choices.patch diff --git a/packages/gcc/12.4.0/0008-Support-picolibc-targets.patch b/packages/gcc/12.5.0/0008-Support-picolibc-targets.patch similarity index 100% rename from packages/gcc/12.4.0/0008-Support-picolibc-targets.patch rename to packages/gcc/12.5.0/0008-Support-picolibc-targets.patch diff --git a/packages/gcc/12.4.0/0009-gcc-Allow-g-to-work-differently-from-gcc.patch b/packages/gcc/12.5.0/0009-gcc-Allow-g-to-work-differently-from-gcc.patch similarity index 100% rename from packages/gcc/12.4.0/0009-gcc-Allow-g-to-work-differently-from-gcc.patch rename to packages/gcc/12.5.0/0009-gcc-Allow-g-to-work-differently-from-gcc.patch diff --git a/packages/gcc/12.4.0/0010-Remove-crypt-and-crypt_r-interceptors.patch b/packages/gcc/12.5.0/0010-Remove-crypt-and-crypt_r-interceptors.patch similarity index 100% rename from packages/gcc/12.4.0/0010-Remove-crypt-and-crypt_r-interceptors.patch rename to packages/gcc/12.5.0/0010-Remove-crypt-and-crypt_r-interceptors.patch diff --git a/packages/gcc/12.5.0/0011-always-define-win32-lean-and-mean-before-windows-h.patch b/packages/gcc/12.5.0/0011-always-define-win32-lean-and-mean-before-windows-h.patch new file mode 100644 index 0000000000..688ad8fee9 --- /dev/null +++ b/packages/gcc/12.5.0/0011-always-define-win32-lean-and-mean-before-windows-h.patch @@ -0,0 +1,379 @@ +Original patch for GCC 13 by LIU Hao + +Recently, mingw-w64 has got updated from Wine which is included +indirectly by if `WIN32_LEAN_AND_MEAN` is not defined. The +`IXMLDOMDocument` class has a member function named `abort()`, which gets +affected by our `abort()` macro in "system.h". + +`WIN32_LEAN_AND_MEAN` should, nevertheless, always be defined. This +can exclude 'APIs such as Cryptography, DDE, RPC, Shell, and Windows +Sockets' [1], and speed up compilation of these files a bit. + +[1] https://learn.microsoft.com/en-us/windows/win32/winprog/using-the-windows-headers + +--- a/gcc/ada/adaint.c ++++ b/gcc/ada/adaint.c +@@ -227,6 +227,7 @@ UINT __gnat_current_ccs_encoding; + + #elif defined (_WIN32) + ++#define WIN32_LEAN_AND_MEAN + #include + #include + #include +--- a/gcc/ada/cio.c ++++ b/gcc/ada/cio.c +@@ -67,6 +67,7 @@ extern "C" { + #endif + + #ifdef RTX ++#define WIN32_LEAN_AND_MEAN + #include + #include + #endif +--- a/gcc/ada/ctrl_c.c ++++ b/gcc/ada/ctrl_c.c +@@ -126,6 +126,7 @@ __gnat_uninstall_int_handler (void) + + #elif defined (__MINGW32__) + ++#define WIN32_LEAN_AND_MEAN + #include "mingw32.h" + #include + +--- a/gcc/ada/expect.c ++++ b/gcc/ada/expect.c +@@ -71,6 +71,7 @@ + + #ifdef _WIN32 + ++#define WIN32_LEAN_AND_MEAN + #include + #include + #include +--- a/gcc/ada/gsocket.h ++++ b/gcc/ada/gsocket.h +@@ -167,6 +167,7 @@ + + #endif + ++#define WIN32_LEAN_AND_MEAN + #include + + #elif defined(VMS) +--- a/gcc/ada/mingw32.h ++++ b/gcc/ada/mingw32.h +@@ -53,6 +53,7 @@ + #define _X86INTRIN_H_INCLUDED + #define _EMMINTRIN_H_INCLUDED + #endif ++#define WIN32_LEAN_AND_MEAN + #include + + /* After including this file it is possible to use the character t as prefix +--- a/gcc/ada/mkdir.c ++++ b/gcc/ada/mkdir.c +@@ -43,6 +43,7 @@ + #endif + + #ifdef __MINGW32__ ++#define WIN32_LEAN_AND_MEAN + #include "mingw32.h" + #include + #ifdef MAXPATHLEN +--- a/gcc/ada/rtfinal.c ++++ b/gcc/ada/rtfinal.c +@@ -46,6 +46,7 @@ extern int __gnat_rt_init_count; + /* see initialize.c */ + + #if defined (__MINGW32__) ++#define WIN32_LEAN_AND_MEAN + #include "mingw32.h" + #include + +--- a/gcc/ada/rtinit.c ++++ b/gcc/ada/rtinit.c +@@ -70,6 +70,7 @@ int __gnat_rt_init_count = 0; + and finalize properly the run-time. */ + + #if defined (__MINGW32__) ++#define WIN32_LEAN_AND_MEAN + #include "mingw32.h" + #include + +--- a/gcc/ada/seh_init.c ++++ b/gcc/ada/seh_init.c +@@ -34,6 +34,7 @@ + + #if defined (_WIN32) || (defined (__CYGWIN__) && defined (__SEH__)) + /* Include system headers, before system.h poisons malloc. */ ++#define WIN32_LEAN_AND_MEAN + #include + #include + #endif +--- a/gcc/ada/sysdep.c ++++ b/gcc/ada/sysdep.c +@@ -217,6 +217,7 @@ __gnat_ttyname (int filedes) + #endif /* __CYGWIN__ */ + + #if defined (__CYGWIN__) || defined (__MINGW32__) ++#define WIN32_LEAN_AND_MEAN + #include + + int __gnat_is_windows_xp (void); +@@ -589,6 +590,7 @@ getc_immediate_common (FILE *stream, + Ada programs. */ + + #ifdef WINNT ++#define WIN32_LEAN_AND_MEAN + #include + + /* Provide functions to echo the values passed to WinMain (windows bindings +--- a/gcc/ada/terminals.c ++++ b/gcc/ada/terminals.c +@@ -151,6 +151,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED, + #include + #include + ++#define WIN32_LEAN_AND_MEAN + #include + #include + #include +--- a/gcc/ada/tracebak.c ++++ b/gcc/ada/tracebak.c +@@ -93,6 +93,7 @@ extern void (*Unlock_Task) (void); + + #if defined (_WIN64) && defined (__SEH__) + ++#define WIN32_LEAN_AND_MEAN + #include + + #define IS_BAD_PTR(ptr) (IsBadCodePtr((FARPROC)ptr)) +@@ -455,6 +456,7 @@ struct layout + #elif defined (__i386__) || defined (__x86_64__) + + #if defined (__WIN32) ++#define WIN32_LEAN_AND_MEAN + #include + #define IS_BAD_PTR(ptr) (IsBadCodePtr((FARPROC)ptr)) + #elif defined (__sun__) +--- a/gcc/diagnostic-color.cc ++++ b/gcc/diagnostic-color.cc +@@ -22,6 +22,7 @@ + #include "diagnostic-url.h" + + #ifdef __MINGW32__ ++# define WIN32_LEAN_AND_MEAN + # include + #endif + +--- a/gcc/jit/jit-w32.h ++++ b/gcc/jit/jit-w32.h +@@ -20,6 +20,7 @@ along with GCC; see the file COPYING3. If not see + + #include "config.h" + ++#define WIN32_LEAN_AND_MEAN + #include + + namespace gcc { +--- a/gcc/plugin.cc ++++ b/gcc/plugin.cc +@@ -41,6 +41,7 @@ along with GCC; see the file COPYING3. If not see + #ifndef NOMINMAX + #define NOMINMAX + #endif ++#define WIN32_LEAN_AND_MEAN + #include + #endif + +--- a/gcc/prefix.cc ++++ b/gcc/prefix.cc +@@ -67,6 +67,7 @@ License along with GCC; see the file COPYING3. If not see + #include "system.h" + #include "coretypes.h" + #if defined(_WIN32) && defined(ENABLE_WIN32_REGISTRY) ++#define WIN32_LEAN_AND_MEAN + #include + #endif + #include "prefix.h" +--- a/libatomic/config/mingw/lock.c ++++ b/libatomic/config/mingw/lock.c +@@ -23,6 +23,7 @@ + . */ + + #define UWORD __shadow_UWORD ++#define WIN32_LEAN_AND_MEAN + #include + #undef UWORD + #include "libatomic_i.h" +--- a/libffi/src/aarch64/ffi.c ++++ b/libffi/src/aarch64/ffi.c +@@ -28,6 +28,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + #include + #include "internal.h" + #ifdef _WIN32 ++#define WIN32_LEAN_AND_MEAN + #include /* FlushInstructionCache */ + #endif + #include +--- a/libgcc/config/i386/enable-execute-stack-mingw32.c ++++ b/libgcc/config/i386/enable-execute-stack-mingw32.c +@@ -22,6 +22,7 @@ + see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + . */ + ++#define WIN32_LEAN_AND_MEAN + #include + + extern void __enable_execute_stack (void *); +--- a/libgcc/libgcc2.c ++++ b/libgcc/libgcc2.c +@@ -2273,6 +2273,7 @@ __clear_cache (void *beg __attribute__((__unused__)), + /* Jump to a trampoline, loading the static chain address. */ + + #if defined(WINNT) && ! defined(__CYGWIN__) ++#define WIN32_LEAN_AND_MEAN + #include + int getpagesize (void); + int mprotect (char *,int, int); +--- a/libgcc/unwind-generic.h ++++ b/libgcc/unwind-generic.h +@@ -30,6 +30,7 @@ + + #if defined (__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__) + /* Only for _GCC_specific_handler. */ ++#define WIN32_LEAN_AND_MEAN + #include + #endif + +--- a/libgfortran/intrinsics/sleep.c ++++ b/libgfortran/intrinsics/sleep.c +@@ -30,6 +30,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + #endif + + #ifdef __MINGW32__ ++# define WIN32_LEAN_AND_MEAN + # include + # undef sleep + # define sleep(x) Sleep(1000*(x)) +--- a/libgo/misc/cgo/test/callback_c.c ++++ b/libgo/misc/cgo/test/callback_c.c +@@ -32,6 +32,7 @@ IntoC(void) + } + + #ifdef WIN32 ++#define WIN32_LEAN_AND_MEAN + #include + long long + mysleep(int seconds) { +--- a/libgomp/config/mingw32/proc.c ++++ b/libgomp/config/mingw32/proc.c +@@ -30,6 +30,7 @@ + The following implementation uses win32 API routines. */ + + #include "libgomp.h" ++#define WIN32_LEAN_AND_MEAN + #include + + /* Count the CPU's currently available to this process. */ +--- a/libiberty/make-temp-file.c ++++ b/libiberty/make-temp-file.c +@@ -37,6 +37,7 @@ Boston, MA 02110-1301, USA. */ + #include /* May get R_OK, etc. on some systems. */ + #endif + #if defined(_WIN32) && !defined(__CYGWIN__) ++#define WIN32_LEAN_AND_MEAN + #include + #endif + #if HAVE_SYS_STAT_H +--- a/libiberty/pex-win32.c ++++ b/libiberty/pex-win32.c +@@ -20,6 +20,7 @@ Boston, MA 02110-1301, USA. */ + + #include "pex-common.h" + ++#define WIN32_LEAN_AND_MEAN + #include + + #ifdef HAVE_STDLIB_H +--- a/libssp/ssp.c ++++ b/libssp/ssp.c +@@ -55,6 +55,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + /* Native win32 apps don't know about /dev/tty but can print directly + to the console using "CONOUT$" */ + #if defined (_WIN32) && !defined (__CYGWIN__) ++#define WIN32_LEAN_AND_MEAN + #include + #include + # define _PATH_TTY "CONOUT$" +--- a/libstdc++-v3/src/c++11/system_error.cc ++++ b/libstdc++-v3/src/c++11/system_error.cc +@@ -33,6 +33,7 @@ + #undef __sso_string + + #if defined(_WIN32) && !defined(__CYGWIN__) ++#define WIN32_LEAN_AND_MEAN + #include + #include + #endif +--- a/libstdc++-v3/src/c++11/thread.cc ++++ b/libstdc++-v3/src/c++11/thread.cc +@@ -34,6 +34,7 @@ + # ifdef _GLIBCXX_HAVE_SLEEP + # include + # elif defined(_GLIBCXX_HAVE_WIN32_SLEEP) ++# define WIN32_LEAN_AND_MEAN + # include + # elif defined _GLIBCXX_NO_SLEEP && defined _GLIBCXX_HAS_GTHREADS + // We expect to be able to sleep for targets that support multiple threads: +--- a/libstdc++-v3/src/c++17/fs_ops.cc ++++ b/libstdc++-v3/src/c++17/fs_ops.cc +@@ -54,6 +54,7 @@ + # include // utime + #endif + #ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS ++# define WIN32_LEAN_AND_MEAN + # include + #endif + +--- a/libstdc++-v3/src/filesystem/ops.cc ++++ b/libstdc++-v3/src/filesystem/ops.cc +@@ -55,6 +55,7 @@ + # include // utime + #endif + #ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS ++# define WIN32_LEAN_AND_MEAN + # include + #endif + +--- a/libvtv/vtv_malloc.cc ++++ b/libvtv/vtv_malloc.cc +@@ -33,6 +33,7 @@ + #include + #include + #if defined (__CYGWIN__) || defined (__MINGW32__) ++#define WIN32_LEAN_AND_MEAN + #include + #else + #include +--- a/libvtv/vtv_rts.cc ++++ b/libvtv/vtv_rts.cc +@@ -121,6 +121,7 @@ + #include + #include + #if defined (__CYGWIN__) || defined (__MINGW32__) ++#define WIN32_LEAN_AND_MEAN + #include + #include + #include +--- a/libvtv/vtv_utils.cc ++++ b/libvtv/vtv_utils.cc +@@ -33,6 +33,7 @@ + #include + #include + #if defined (__CYGWIN__) || defined (__MINGW32__) ++#define WIN32_LEAN_AND_MEAN + #include + #else + #include diff --git a/packages/gcc/12.5.0/chksum b/packages/gcc/12.5.0/chksum new file mode 100644 index 0000000000..f9b85c5004 --- /dev/null +++ b/packages/gcc/12.5.0/chksum @@ -0,0 +1,8 @@ +md5 gcc-12.5.0.tar.xz 605d4923d9daabcd8c8c22d844af57e5 +sha1 gcc-12.5.0.tar.xz a045ea36603aaea19b1b0994e22a87600dd93bd0 +sha256 gcc-12.5.0.tar.xz 71cd373d0f04615e66c5b5b14d49c1a4c1a08efa7b30625cd240b11bab4062b3 +sha512 gcc-12.5.0.tar.xz c76020e4c844b53485502cb8a4e295221c9d37487d66c9f4559031fb14c85de20602e6387310005386cb0ef25e55067d2cfef141423bb445f3b77e7456a23533 +md5 gcc-12.5.0.tar.gz 5bead3e14af6d18a1f925e888a74efba +sha1 gcc-12.5.0.tar.gz 8ddf92c626dac1a3ebc60bc7750a510e51680d0a +sha256 gcc-12.5.0.tar.gz f2dfac9c026c58b04251732aa459db614ae1017d32a18a296b1ae5af3dcad927 +sha512 gcc-12.5.0.tar.gz d95040f3ac5004158ccea0b28569b933a2b36c7dc003aebbadab07712039c63b753f99c44ae0c3fc7be079332067e0ccb6b378d27e2a3ded7b584b373de61bda diff --git a/packages/gcc/12.4.0/experimental/0001-picolibc-Add-custom-spec-file-fragments-for-using-pi.patch b/packages/gcc/12.5.0/experimental/0001-picolibc-Add-custom-spec-file-fragments-for-using-pi.patch similarity index 100% rename from packages/gcc/12.4.0/experimental/0001-picolibc-Add-custom-spec-file-fragments-for-using-pi.patch rename to packages/gcc/12.5.0/experimental/0001-picolibc-Add-custom-spec-file-fragments-for-using-pi.patch diff --git a/packages/linux/6.2.12/version.desc b/packages/gcc/12.5.0/version.desc similarity index 100% rename from packages/linux/6.2.12/version.desc rename to packages/gcc/12.5.0/version.desc diff --git a/packages/gcc/13.3.0/chksum b/packages/gcc/13.3.0/chksum deleted file mode 100644 index edfec5ca29..0000000000 --- a/packages/gcc/13.3.0/chksum +++ /dev/null @@ -1,8 +0,0 @@ -md5 gcc-13.3.0.tar.xz 726726a73eaaacad4259fe5d7e978020 -sha1 gcc-13.3.0.tar.xz 6501872415823c95d48be28853ce3ebd6c1040c4 -sha256 gcc-13.3.0.tar.xz 0845e9621c9543a13f484e94584a49ffc0129970e9914624235fc1d061a0c083 -sha512 gcc-13.3.0.tar.xz ed5f2f4c6ed2c796fcf2c93707159e9dbd3ddb1ba063d549804dd68cdabbb6d550985ae1c8465ae9a336cfe29274a6eb0f42e21924360574ebd8e5d5c7c9a801 -md5 gcc-13.3.0.tar.gz f6e5402827861cd5397b3947bc7b8ff2 -sha1 gcc-13.3.0.tar.gz 19ae2771e6bc4b803576cc0250d214a67cc7617d -sha256 gcc-13.3.0.tar.gz 3a2b10cab86e32358fdac871546d57e2700e9bdb5875ef33fff5b601265b9e32 -sha512 gcc-13.3.0.tar.gz a2973a57b028ae20920f00402c15a36e7a37f86c8d26f8ba1947fe2fb6ed06c474dea06cccb178a2b9144103ca213e32b5f263735139f5c67e27254959e76bdb diff --git a/packages/gcc/13.3.0/0000-libtool-leave-framework-alone.patch b/packages/gcc/13.4.0/0000-libtool-leave-framework-alone.patch similarity index 100% rename from packages/gcc/13.3.0/0000-libtool-leave-framework-alone.patch rename to packages/gcc/13.4.0/0000-libtool-leave-framework-alone.patch diff --git a/packages/gcc/13.3.0/0001-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc/13.4.0/0001-gcc-plugin-POSIX-include-sys-select-h.patch similarity index 100% rename from packages/gcc/13.3.0/0001-gcc-plugin-POSIX-include-sys-select-h.patch rename to packages/gcc/13.4.0/0001-gcc-plugin-POSIX-include-sys-select-h.patch diff --git a/packages/gcc/13.3.0/0002-arm-softfloat-libgcc.patch b/packages/gcc/13.4.0/0002-arm-softfloat-libgcc.patch similarity index 100% rename from packages/gcc/13.3.0/0002-arm-softfloat-libgcc.patch rename to packages/gcc/13.4.0/0002-arm-softfloat-libgcc.patch diff --git a/packages/gcc/13.3.0/0003-libgcc-disable-split-stack-nothreads.patch b/packages/gcc/13.4.0/0003-libgcc-disable-split-stack-nothreads.patch similarity index 100% rename from packages/gcc/13.3.0/0003-libgcc-disable-split-stack-nothreads.patch rename to packages/gcc/13.4.0/0003-libgcc-disable-split-stack-nothreads.patch diff --git a/packages/gcc/13.3.0/0004-Remove-use-of-include_next-from-c-headers.patch b/packages/gcc/13.4.0/0004-Remove-use-of-include_next-from-c-headers.patch similarity index 100% rename from packages/gcc/13.3.0/0004-Remove-use-of-include_next-from-c-headers.patch rename to packages/gcc/13.4.0/0004-Remove-use-of-include_next-from-c-headers.patch diff --git a/packages/gcc/13.3.0/0005-Allow-default-libc-to-be-specified-to-configure.patch b/packages/gcc/13.4.0/0005-Allow-default-libc-to-be-specified-to-configure.patch similarity index 100% rename from packages/gcc/13.3.0/0005-Allow-default-libc-to-be-specified-to-configure.patch rename to packages/gcc/13.4.0/0005-Allow-default-libc-to-be-specified-to-configure.patch diff --git a/packages/gcc/13.3.0/0006-driver-Extend-getenv-function-to-allow-default-value.patch b/packages/gcc/13.4.0/0006-driver-Extend-getenv-function-to-allow-default-value.patch similarity index 100% rename from packages/gcc/13.3.0/0006-driver-Extend-getenv-function-to-allow-default-value.patch rename to packages/gcc/13.4.0/0006-driver-Extend-getenv-function-to-allow-default-value.patch diff --git a/packages/gcc/13.3.0/0007-Add-newlib-and-picolibc-as-default-C-library-choices.patch b/packages/gcc/13.4.0/0007-Add-newlib-and-picolibc-as-default-C-library-choices.patch similarity index 100% rename from packages/gcc/13.3.0/0007-Add-newlib-and-picolibc-as-default-C-library-choices.patch rename to packages/gcc/13.4.0/0007-Add-newlib-and-picolibc-as-default-C-library-choices.patch diff --git a/packages/gcc/13.3.0/0008-Support-picolibc-targets.patch b/packages/gcc/13.4.0/0008-Support-picolibc-targets.patch similarity index 100% rename from packages/gcc/13.3.0/0008-Support-picolibc-targets.patch rename to packages/gcc/13.4.0/0008-Support-picolibc-targets.patch diff --git a/packages/gcc/13.3.0/0009-gcc-Allow-g-to-work-differently-from-gcc.patch b/packages/gcc/13.4.0/0009-gcc-Allow-g-to-work-differently-from-gcc.patch similarity index 100% rename from packages/gcc/13.3.0/0009-gcc-Allow-g-to-work-differently-from-gcc.patch rename to packages/gcc/13.4.0/0009-gcc-Allow-g-to-work-differently-from-gcc.patch diff --git a/packages/gcc/13.3.0/0010-RISC-V-fix-build-issue-with-gcc-4.9.x.patch b/packages/gcc/13.4.0/0010-RISC-V-fix-build-issue-with-gcc-4.9.x.patch similarity index 100% rename from packages/gcc/13.3.0/0010-RISC-V-fix-build-issue-with-gcc-4.9.x.patch rename to packages/gcc/13.4.0/0010-RISC-V-fix-build-issue-with-gcc-4.9.x.patch diff --git a/packages/gcc/13.3.0/0011-Remove-crypt-and-crypt_r-interceptors.patch b/packages/gcc/13.4.0/0011-Remove-crypt-and-crypt_r-interceptors.patch similarity index 100% rename from packages/gcc/13.3.0/0011-Remove-crypt-and-crypt_r-interceptors.patch rename to packages/gcc/13.4.0/0011-Remove-crypt-and-crypt_r-interceptors.patch diff --git a/packages/gcc/13.3.0/0012-libgcc-m68k-Fixes-for-soft-float.patch b/packages/gcc/13.4.0/0012-libgcc-m68k-Fixes-for-soft-float.patch similarity index 100% rename from packages/gcc/13.3.0/0012-libgcc-m68k-Fixes-for-soft-float.patch rename to packages/gcc/13.4.0/0012-libgcc-m68k-Fixes-for-soft-float.patch diff --git a/packages/gcc/13.3.0/0013-libgcc-Exclude-UCLIBC-from-GLIBC-thread-check.patch b/packages/gcc/13.4.0/0013-libgcc-Exclude-UCLIBC-from-GLIBC-thread-check.patch similarity index 100% rename from packages/gcc/13.3.0/0013-libgcc-Exclude-UCLIBC-from-GLIBC-thread-check.patch rename to packages/gcc/13.4.0/0013-libgcc-Exclude-UCLIBC-from-GLIBC-thread-check.patch diff --git a/packages/gcc/13.3.0/0014-LoongArch-Use-lib-instead-of-lib64-as-the-library-se.patch b/packages/gcc/13.4.0/0014-LoongArch-Use-lib-instead-of-lib64-as-the-library-se.patch similarity index 100% rename from packages/gcc/13.3.0/0014-LoongArch-Use-lib-instead-of-lib64-as-the-library-se.patch rename to packages/gcc/13.4.0/0014-LoongArch-Use-lib-instead-of-lib64-as-the-library-se.patch diff --git a/packages/gcc/13.4.0/chksum b/packages/gcc/13.4.0/chksum new file mode 100644 index 0000000000..32b23f25f2 --- /dev/null +++ b/packages/gcc/13.4.0/chksum @@ -0,0 +1,8 @@ +md5 gcc-13.4.0.tar.xz 260096adee8b1cf3dde6e61c11cccca6 +sha1 gcc-13.4.0.tar.xz 419c4f1a4b58134a34c00afa7327c6848a58050a +sha256 gcc-13.4.0.tar.xz 9c4ce6dbb040568fdc545588ac03c5cbc95a8dbf0c7aa490170843afb59ca8f5 +sha512 gcc-13.4.0.tar.xz 9b4b83ecf51ef355b868608b8d257b2fa435c06d2719cb86657a7c2c2a0828ff4ce04e9bac1055bbcad8ed5b4da524cafaef654785e23a50233d95d89201e35f +md5 gcc-13.4.0.tar.gz b5109687acfc3fc61c891b9a0dfe71b2 +sha1 gcc-13.4.0.tar.gz 36712b3b575715b8dc555113403e2082138ce9d1 +sha256 gcc-13.4.0.tar.gz bf0baf3e570c9c74c17c8201f0196c6924b4bd98c90e69d6b2ac0cd823f33bbc +sha512 gcc-13.4.0.tar.gz c4c1ab3c65690c4d872988113db0c402206fd250110ed3cd6c4df47a5030ce95865869bb3638873f123f75d5983bcb8c8c99a6e7f8978efd9f3cbb66faa9a8fb diff --git a/packages/gcc/13.3.0/experimental/0001-picolibc-Add-custom-spec-file-fragments-for-using-pi.patch b/packages/gcc/13.4.0/experimental/0001-picolibc-Add-custom-spec-file-fragments-for-using-pi.patch similarity index 100% rename from packages/gcc/13.3.0/experimental/0001-picolibc-Add-custom-spec-file-fragments-for-using-pi.patch rename to packages/gcc/13.4.0/experimental/0001-picolibc-Add-custom-spec-file-fragments-for-using-pi.patch diff --git a/packages/linux/6.3.9/version.desc b/packages/gcc/13.4.0/version.desc similarity index 100% rename from packages/linux/6.3.9/version.desc rename to packages/gcc/13.4.0/version.desc diff --git a/packages/gcc/14.2.0/0011-aarch64-Fix-invalid-nested-subregs-PR115464.patch b/packages/gcc/14.2.0/0011-aarch64-Fix-invalid-nested-subregs-PR115464.patch deleted file mode 100644 index 2625c308fb..0000000000 --- a/packages/gcc/14.2.0/0011-aarch64-Fix-invalid-nested-subregs-PR115464.patch +++ /dev/null @@ -1,139 +0,0 @@ -From cb547fed9177c2a28f376c881facfcf4b64e70a9 Mon Sep 17 00:00:00 2001 -From: Richard Sandiford -Date: Thu, 13 Jun 2024 12:48:21 +0100 -Subject: [PATCH 11/16] aarch64: Fix invalid nested subregs [PR115464] - -The testcase extracts one arm_neon.h vector from a pair (one subreg) -and then reinterprets the result as an SVE vector (another subreg). -Each subreg makes sense individually, but we can't fold them together -into a single subreg: it's 32 bytes -> 16 bytes -> 16*N bytes, -but the interpretation of 32 bytes -> 16*N bytes depends on -whether N==1 or N>1. - -Since the second subreg makes sense individually, simplify_subreg -should bail out rather than ICE on it. simplify_gen_subreg will -then do the same (because it already checks validate_subreg). -This leaves simplify_gen_subreg returning null, requiring the -caller to take appropriate action. - -I think this is relatively likely to occur elsewhere, so the patch -adds a helper for forcing a subreg, allowing a temporary pseudo to -be created where necessary. - -I'll follow up by using force_subreg in more places. This patch -is intended to be a minimal backportable fix for the PR. - -gcc/ - PR target/115464 - * simplify-rtx.cc (simplify_context::simplify_subreg): Don't try - to fold two subregs together if their relationship isn't known - at compile time. - * explow.h (force_subreg): Declare. - * explow.cc (force_subreg): New function. - * config/aarch64/aarch64-sve-builtins-base.cc - (svset_neonq_impl::expand): Use it instead of simplify_gen_subreg. - -gcc/testsuite/ - PR target/115464 - * gcc.target/aarch64/sve/acle/general/pr115464.c: New test. - -(cherry picked from commit 0970ff46ba6330fc80e8736fc05b2eaeeae0b6a0) ---- - gcc/config/aarch64/aarch64-sve-builtins-base.cc | 2 +- - gcc/explow.cc | 15 +++++++++++++++ - gcc/explow.h | 2 ++ - gcc/simplify-rtx.cc | 5 +++++ - .../aarch64/sve/acle/general/pr115464.c | 13 +++++++++++++ - 5 files changed, 36 insertions(+), 1 deletion(-) - create mode 100644 gcc/testsuite/gcc.target/aarch64/sve/acle/general/pr115464.c - -diff --git a/gcc/config/aarch64/aarch64-sve-builtins-base.cc b/gcc/config/aarch64/aarch64-sve-builtins-base.cc -index 0d2edf3f19e..c9182594bc1 100644 ---- a/gcc/config/aarch64/aarch64-sve-builtins-base.cc -+++ b/gcc/config/aarch64/aarch64-sve-builtins-base.cc -@@ -1174,7 +1174,7 @@ public: - Advanced SIMD argument as an SVE vector. */ - if (!BYTES_BIG_ENDIAN - && is_undef (CALL_EXPR_ARG (e.call_expr, 0))) -- return simplify_gen_subreg (mode, e.args[1], GET_MODE (e.args[1]), 0); -+ return force_subreg (mode, e.args[1], GET_MODE (e.args[1]), 0); - - rtx_vector_builder builder (VNx16BImode, 16, 2); - for (unsigned int i = 0; i < 16; i++) -diff --git a/gcc/explow.cc b/gcc/explow.cc -index 8e5f6b8e680..f6843398c4b 100644 ---- a/gcc/explow.cc -+++ b/gcc/explow.cc -@@ -745,6 +745,21 @@ force_reg (machine_mode mode, rtx x) - return temp; - } - -+/* Like simplify_gen_subreg, but force OP into a new register if the -+ subreg cannot be formed directly. */ -+ -+rtx -+force_subreg (machine_mode outermode, rtx op, -+ machine_mode innermode, poly_uint64 byte) -+{ -+ rtx x = simplify_gen_subreg (outermode, op, innermode, byte); -+ if (x) -+ return x; -+ -+ op = copy_to_mode_reg (innermode, op); -+ return simplify_gen_subreg (outermode, op, innermode, byte); -+} -+ - /* If X is a memory ref, copy its contents to a new temp reg and return - that reg. Otherwise, return X. */ - -diff --git a/gcc/explow.h b/gcc/explow.h -index 16aa02cfb68..cbd1fcb7eb3 100644 ---- a/gcc/explow.h -+++ b/gcc/explow.h -@@ -42,6 +42,8 @@ extern rtx copy_to_suggested_reg (rtx, rtx, machine_mode); - Args are mode (in case value is a constant) and the value. */ - extern rtx force_reg (machine_mode, rtx); - -+extern rtx force_subreg (machine_mode, rtx, machine_mode, poly_uint64); -+ - /* Return given rtx, copied into a new temp reg if it was in memory. */ - extern rtx force_not_mem (rtx); - -diff --git a/gcc/simplify-rtx.cc b/gcc/simplify-rtx.cc -index dceaa13333c..729d408aa55 100644 ---- a/gcc/simplify-rtx.cc -+++ b/gcc/simplify-rtx.cc -@@ -7612,6 +7612,11 @@ simplify_context::simplify_subreg (machine_mode outermode, rtx op, - poly_uint64 innermostsize = GET_MODE_SIZE (innermostmode); - rtx newx; - -+ /* Make sure that the relationship between the two subregs is -+ known at compile time. */ -+ if (!ordered_p (outersize, innermostsize)) -+ return NULL_RTX; -+ - if (outermode == innermostmode - && known_eq (byte, 0U) - && known_eq (SUBREG_BYTE (op), 0)) -diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general/pr115464.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general/pr115464.c -new file mode 100644 -index 00000000000..d728d1325ed ---- /dev/null -+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general/pr115464.c -@@ -0,0 +1,13 @@ -+/* { dg-options "-O2" } */ -+ -+#include -+#include -+#include -+ -+svuint16_t -+convolve4_4_x (uint16x8x2_t permute_tbl) -+{ -+ return svset_neonq_u16 (svundef_u16 (), permute_tbl.val[1]); -+} -+ -+/* { dg-final { scan-assembler {\tmov\tz0\.d, z1\.d\n} } } */ --- -2.44.2 - diff --git a/packages/gcc/14.2.0/0012-aarch64-Use-force_subreg-in-more-places.patch b/packages/gcc/14.2.0/0012-aarch64-Use-force_subreg-in-more-places.patch deleted file mode 100644 index bddf39775f..0000000000 --- a/packages/gcc/14.2.0/0012-aarch64-Use-force_subreg-in-more-places.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 12d860b5b700b5218461a0b9e4a1a3ddb55eb211 Mon Sep 17 00:00:00 2001 -From: Richard Sandiford -Date: Tue, 18 Jun 2024 12:22:30 +0100 -Subject: [PATCH 12/16] aarch64: Use force_subreg in more places - -This patch makes the aarch64 code use force_subreg instead of -simplify_gen_subreg in more places. The criteria were: - -(1) The code is obviously specific to expand (where new pseudos - can be created). - -(2) The value is obviously an rvalue rather than an lvalue. - -(3) The offset wasn't a simple lowpart or highpart calculation; - a later patch will deal with those. - -gcc/ - * config/aarch64/aarch64-builtins.cc (aarch64_expand_fcmla_builtin): - Use force_subreg instead of simplify_gen_subreg. - * config/aarch64/aarch64-simd.md (ctz2): Likewise. - * config/aarch64/aarch64-sve-builtins-base.cc - (svget_impl::expand): Likewise. - (svget_neonq_impl::expand): Likewise. - * config/aarch64/aarch64-sve-builtins-functions.h - (multireg_permute::expand): Likewise. - -(cherry picked from commit 1474a8eead4ab390e59ee014befa8c40346679f4) ---- - gcc/config/aarch64/aarch64-builtins.cc | 4 ++-- - gcc/config/aarch64/aarch64-simd.md | 4 ++-- - gcc/config/aarch64/aarch64-sve-builtins-base.cc | 8 +++----- - gcc/config/aarch64/aarch64-sve-builtins-functions.h | 6 +++--- - 4 files changed, 10 insertions(+), 12 deletions(-) - -diff --git a/gcc/config/aarch64/aarch64-builtins.cc b/gcc/config/aarch64/aarch64-builtins.cc -index 75d21de1401..b2e46a073a8 100644 ---- a/gcc/config/aarch64/aarch64-builtins.cc -+++ b/gcc/config/aarch64/aarch64-builtins.cc -@@ -2510,12 +2510,12 @@ aarch64_expand_fcmla_builtin (tree exp, rtx target, int fcode) - rtx temp2 = gen_reg_rtx (DImode); - temp1 = simplify_gen_subreg (d->mode, op2, quadmode, - subreg_lowpart_offset (d->mode, quadmode)); -- temp1 = simplify_gen_subreg (V2DImode, temp1, d->mode, 0); -+ temp1 = force_subreg (V2DImode, temp1, d->mode, 0); - if (BYTES_BIG_ENDIAN) - emit_insn (gen_aarch64_get_lanev2di (temp2, temp1, const0_rtx)); - else - emit_insn (gen_aarch64_get_lanev2di (temp2, temp1, const1_rtx)); -- op2 = simplify_gen_subreg (d->mode, temp2, GET_MODE (temp2), 0); -+ op2 = force_subreg (d->mode, temp2, GET_MODE (temp2), 0); - - /* And recalculate the index. */ - lane -= nunits / 4; -diff --git a/gcc/config/aarch64/aarch64-simd.md b/gcc/config/aarch64/aarch64-simd.md -index 33ab0741e87..5b9efe0b165 100644 ---- a/gcc/config/aarch64/aarch64-simd.md -+++ b/gcc/config/aarch64/aarch64-simd.md -@@ -412,8 +412,8 @@ - "TARGET_SIMD" - { - emit_insn (gen_bswap2 (operands[0], operands[1])); -- rtx op0_castsi2qi = simplify_gen_subreg(mode, operands[0], -- mode, 0); -+ rtx op0_castsi2qi = force_subreg (mode, operands[0], -+ mode, 0); - emit_insn (gen_aarch64_rbit (op0_castsi2qi, op0_castsi2qi)); - emit_insn (gen_clz2 (operands[0], operands[0])); - DONE; -diff --git a/gcc/config/aarch64/aarch64-sve-builtins-base.cc b/gcc/config/aarch64/aarch64-sve-builtins-base.cc -index c9182594bc1..2c95da79572 100644 ---- a/gcc/config/aarch64/aarch64-sve-builtins-base.cc -+++ b/gcc/config/aarch64/aarch64-sve-builtins-base.cc -@@ -1121,9 +1121,8 @@ public: - expand (function_expander &e) const override - { - /* Fold the access into a subreg rvalue. */ -- return simplify_gen_subreg (e.vector_mode (0), e.args[0], -- GET_MODE (e.args[0]), -- INTVAL (e.args[1]) * BYTES_PER_SVE_VECTOR); -+ return force_subreg (e.vector_mode (0), e.args[0], GET_MODE (e.args[0]), -+ INTVAL (e.args[1]) * BYTES_PER_SVE_VECTOR); - } - }; - -@@ -1157,8 +1156,7 @@ public: - e.add_fixed_operand (indices); - return e.generate_insn (icode); - } -- return simplify_gen_subreg (e.result_mode (), e.args[0], -- GET_MODE (e.args[0]), 0); -+ return force_subreg (e.result_mode (), e.args[0], GET_MODE (e.args[0]), 0); - } - }; - -diff --git a/gcc/config/aarch64/aarch64-sve-builtins-functions.h b/gcc/config/aarch64/aarch64-sve-builtins-functions.h -index 3b8e575e98e..7d06a57ff83 100644 ---- a/gcc/config/aarch64/aarch64-sve-builtins-functions.h -+++ b/gcc/config/aarch64/aarch64-sve-builtins-functions.h -@@ -639,9 +639,9 @@ public: - { - machine_mode elt_mode = e.vector_mode (0); - rtx arg = e.args[0]; -- e.args[0] = simplify_gen_subreg (elt_mode, arg, GET_MODE (arg), 0); -- e.args.safe_push (simplify_gen_subreg (elt_mode, arg, GET_MODE (arg), -- GET_MODE_SIZE (elt_mode))); -+ e.args[0] = force_subreg (elt_mode, arg, GET_MODE (arg), 0); -+ e.args.safe_push (force_subreg (elt_mode, arg, GET_MODE (arg), -+ GET_MODE_SIZE (elt_mode))); - } - return e.use_exact_insn (icode); - } --- -2.44.2 - diff --git a/packages/gcc/14.2.0/0013-aarch64-Add-some-uses-of-force_lowpart_subreg.patch b/packages/gcc/14.2.0/0013-aarch64-Add-some-uses-of-force_lowpart_subreg.patch deleted file mode 100644 index fd4d984721..0000000000 --- a/packages/gcc/14.2.0/0013-aarch64-Add-some-uses-of-force_lowpart_subreg.patch +++ /dev/null @@ -1,167 +0,0 @@ -From eb49bbb886ef374eddb93e866c9c9f5f314c8014 Mon Sep 17 00:00:00 2001 -From: Richard Sandiford -Date: Tue, 18 Jun 2024 12:22:31 +0100 -Subject: [PATCH 13/16] aarch64: Add some uses of force_lowpart_subreg - -This patch makes more use of force_lowpart_subreg, similarly -to the recent patch for force_subreg. The criteria were: - -(1) The code is obviously specific to expand (where new pseudos - can be created). - -(2) The value is obviously an rvalue rather than an lvalue. - -gcc/ - PR target/115464 - * config/aarch64/aarch64-builtins.cc (aarch64_expand_fcmla_builtin) - (aarch64_expand_rwsr_builtin): Use force_lowpart_subreg instead of - simplify_gen_subreg and lowpart_subreg. - * config/aarch64/aarch64-sve-builtins-base.cc - (svset_neonq_impl::expand): Likewise. - * config/aarch64/aarch64-sve-builtins-sme.cc - (add_load_store_slice_operand): Likewise. - * config/aarch64/aarch64.cc (aarch64_sve_reinterpret): Likewise. - (aarch64_addti_scratch_regs, aarch64_subvti_scratch_regs): Likewise. - -gcc/testsuite/ - PR target/115464 - * gcc.target/aarch64/sve/acle/general/pr115464_2.c: New test. - -(cherry picked from commit 6bd4fbae45d11795a9a6f54b866308d4d7134def) ---- - gcc/config/aarch64/aarch64-builtins.cc | 11 +++++------ - gcc/config/aarch64/aarch64-sve-builtins-base.cc | 2 +- - gcc/config/aarch64/aarch64-sve-builtins-sme.cc | 2 +- - gcc/config/aarch64/aarch64.cc | 14 +++++--------- - .../aarch64/sve/acle/general/pr115464_2.c | 11 +++++++++++ - 5 files changed, 23 insertions(+), 17 deletions(-) - create mode 100644 gcc/testsuite/gcc.target/aarch64/sve/acle/general/pr115464_2.c - -diff --git a/gcc/config/aarch64/aarch64-builtins.cc b/gcc/config/aarch64/aarch64-builtins.cc -index b2e46a073a8..264b9560709 100644 ---- a/gcc/config/aarch64/aarch64-builtins.cc -+++ b/gcc/config/aarch64/aarch64-builtins.cc -@@ -2497,8 +2497,7 @@ aarch64_expand_fcmla_builtin (tree exp, rtx target, int fcode) - int lane = INTVAL (lane_idx); - - if (lane < nunits / 4) -- op2 = simplify_gen_subreg (d->mode, op2, quadmode, -- subreg_lowpart_offset (d->mode, quadmode)); -+ op2 = force_lowpart_subreg (d->mode, op2, quadmode); - else - { - /* Select the upper 64 bits, either a V2SF or V4HF, this however -@@ -2508,8 +2507,7 @@ aarch64_expand_fcmla_builtin (tree exp, rtx target, int fcode) - gen_highpart_mode generates code that isn't optimal. */ - rtx temp1 = gen_reg_rtx (d->mode); - rtx temp2 = gen_reg_rtx (DImode); -- temp1 = simplify_gen_subreg (d->mode, op2, quadmode, -- subreg_lowpart_offset (d->mode, quadmode)); -+ temp1 = force_lowpart_subreg (d->mode, op2, quadmode); - temp1 = force_subreg (V2DImode, temp1, d->mode, 0); - if (BYTES_BIG_ENDIAN) - emit_insn (gen_aarch64_get_lanev2di (temp2, temp1, const0_rtx)); -@@ -2754,7 +2752,7 @@ aarch64_expand_rwsr_builtin (tree exp, rtx target, int fcode) - case AARCH64_WSR64: - case AARCH64_WSRF64: - case AARCH64_WSR128: -- subreg = lowpart_subreg (sysreg_mode, input_val, mode); -+ subreg = force_lowpart_subreg (sysreg_mode, input_val, mode); - break; - case AARCH64_WSRF: - subreg = gen_lowpart_SUBREG (SImode, input_val); -@@ -2789,7 +2787,8 @@ aarch64_expand_rwsr_builtin (tree exp, rtx target, int fcode) - case AARCH64_RSR64: - case AARCH64_RSRF64: - case AARCH64_RSR128: -- return lowpart_subreg (TYPE_MODE (TREE_TYPE (exp)), target, sysreg_mode); -+ return force_lowpart_subreg (TYPE_MODE (TREE_TYPE (exp)), -+ target, sysreg_mode); - case AARCH64_RSRF: - subreg = gen_lowpart_SUBREG (SImode, target); - return gen_lowpart_SUBREG (SFmode, subreg); -diff --git a/gcc/config/aarch64/aarch64-sve-builtins-base.cc b/gcc/config/aarch64/aarch64-sve-builtins-base.cc -index 2c95da79572..3c970e9c5f8 100644 ---- a/gcc/config/aarch64/aarch64-sve-builtins-base.cc -+++ b/gcc/config/aarch64/aarch64-sve-builtins-base.cc -@@ -1183,7 +1183,7 @@ public: - if (BYTES_BIG_ENDIAN) - return e.use_exact_insn (code_for_aarch64_sve_set_neonq (mode)); - insn_code icode = code_for_vcond_mask (mode, mode); -- e.args[1] = lowpart_subreg (mode, e.args[1], GET_MODE (e.args[1])); -+ e.args[1] = force_lowpart_subreg (mode, e.args[1], GET_MODE (e.args[1])); - e.add_output_operand (icode); - e.add_input_operand (icode, e.args[1]); - e.add_input_operand (icode, e.args[0]); -diff --git a/gcc/config/aarch64/aarch64-sve-builtins-sme.cc b/gcc/config/aarch64/aarch64-sve-builtins-sme.cc -index f4c91bcbb95..b66b35ae60b 100644 ---- a/gcc/config/aarch64/aarch64-sve-builtins-sme.cc -+++ b/gcc/config/aarch64/aarch64-sve-builtins-sme.cc -@@ -112,7 +112,7 @@ add_load_store_slice_operand (function_expander &e, insn_code icode, - rtx base = e.args[argno]; - if (e.mode_suffix_id == MODE_vnum) - { -- rtx vnum = lowpart_subreg (SImode, e.args[vnum_argno], DImode); -+ rtx vnum = force_lowpart_subreg (SImode, e.args[vnum_argno], DImode); - base = simplify_gen_binary (PLUS, SImode, base, vnum); - } - e.add_input_operand (icode, base); -diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc -index 1beec94629d..a064aeecbc0 100644 ---- a/gcc/config/aarch64/aarch64.cc -+++ b/gcc/config/aarch64/aarch64.cc -@@ -3284,7 +3284,7 @@ aarch64_sve_reinterpret (machine_mode mode, rtx x) - /* can_change_mode_class must only return true if subregs and svreinterprets - have the same semantics. */ - if (targetm.can_change_mode_class (GET_MODE (x), mode, FP_REGS)) -- return lowpart_subreg (mode, x, GET_MODE (x)); -+ return force_lowpart_subreg (mode, x, GET_MODE (x)); - - rtx res = gen_reg_rtx (mode); - x = force_reg (GET_MODE (x), x); -@@ -26979,9 +26979,8 @@ aarch64_addti_scratch_regs (rtx op1, rtx op2, rtx *low_dest, - rtx *high_in2) - { - *low_dest = gen_reg_rtx (DImode); -- *low_in1 = gen_lowpart (DImode, op1); -- *low_in2 = simplify_gen_subreg (DImode, op2, TImode, -- subreg_lowpart_offset (DImode, TImode)); -+ *low_in1 = force_lowpart_subreg (DImode, op1, TImode); -+ *low_in2 = force_lowpart_subreg (DImode, op2, TImode); - *high_dest = gen_reg_rtx (DImode); - *high_in1 = gen_highpart (DImode, op1); - *high_in2 = simplify_gen_subreg (DImode, op2, TImode, -@@ -27013,11 +27012,8 @@ aarch64_subvti_scratch_regs (rtx op1, rtx op2, rtx *low_dest, - rtx *high_in2) - { - *low_dest = gen_reg_rtx (DImode); -- *low_in1 = simplify_gen_subreg (DImode, op1, TImode, -- subreg_lowpart_offset (DImode, TImode)); -- -- *low_in2 = simplify_gen_subreg (DImode, op2, TImode, -- subreg_lowpart_offset (DImode, TImode)); -+ *low_in1 = force_lowpart_subreg (DImode, op1, TImode); -+ *low_in2 = force_lowpart_subreg (DImode, op2, TImode); - *high_dest = gen_reg_rtx (DImode); - - *high_in1 = simplify_gen_subreg (DImode, op1, TImode, -diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general/pr115464_2.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general/pr115464_2.c -new file mode 100644 -index 00000000000..f561c34f732 ---- /dev/null -+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general/pr115464_2.c -@@ -0,0 +1,11 @@ -+/* { dg-options "-O2" } */ -+ -+#include -+#include -+#include -+ -+svuint16_t -+convolve4_4_x (uint16x8x2_t permute_tbl, svuint16_t a) -+{ -+ return svset_neonq_u16 (a, permute_tbl.val[1]); -+} --- -2.44.2 - diff --git a/packages/gcc/14.2.0/0014-Add-force_lowpart_subreg.patch b/packages/gcc/14.2.0/0014-Add-force_lowpart_subreg.patch deleted file mode 100644 index 17fc7b64f9..0000000000 --- a/packages/gcc/14.2.0/0014-Add-force_lowpart_subreg.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 2dcdf9d026ed2e881b0bd8b378ed072e410490fe Mon Sep 17 00:00:00 2001 -From: Richard Sandiford -Date: Tue, 18 Jun 2024 12:22:31 +0100 -Subject: [PATCH 14/16] Add force_lowpart_subreg - -optabs had a local function called lowpart_subreg_maybe_copy -that is very similar to the lowpart version of force_subreg. -This patch adds a force_lowpart_subreg wrapper around -force_subreg and uses it in optabs.cc. - -The only difference between the old and new functions is that -the old one asserted success while the new one doesn't. -It's common not to assert elsewhere when taking subregs; -normally a null result is enough. - -Later patches will make more use of the new function. - -gcc/ - * explow.h (force_lowpart_subreg): Declare. - * explow.cc (force_lowpart_subreg): New function. - * optabs.cc (lowpart_subreg_maybe_copy): Delete. - (expand_absneg_bit): Use force_lowpart_subreg instead of - lowpart_subreg_maybe_copy. - (expand_copysign_bit): Likewise. - -(cherry picked from commit 5f40d1c0cc6ce91ef28d326b8707b3f05e6f239c) ---- - gcc/explow.cc | 14 ++++++++++++++ - gcc/explow.h | 1 + - gcc/optabs.cc | 24 ++---------------------- - 3 files changed, 17 insertions(+), 22 deletions(-) - -diff --git a/gcc/explow.cc b/gcc/explow.cc -index f6843398c4b..5fdfa81f69b 100644 ---- a/gcc/explow.cc -+++ b/gcc/explow.cc -@@ -760,6 +760,20 @@ force_subreg (machine_mode outermode, rtx op, - return simplify_gen_subreg (outermode, op, innermode, byte); - } - -+/* Try to return an rvalue expression for the OUTERMODE lowpart of OP, -+ which has mode INNERMODE. Allow OP to be forced into a new register -+ if necessary. -+ -+ Return null on failure. */ -+ -+rtx -+force_lowpart_subreg (machine_mode outermode, rtx op, -+ machine_mode innermode) -+{ -+ auto byte = subreg_lowpart_offset (outermode, innermode); -+ return force_subreg (outermode, op, innermode, byte); -+} -+ - /* If X is a memory ref, copy its contents to a new temp reg and return - that reg. Otherwise, return X. */ - -diff --git a/gcc/explow.h b/gcc/explow.h -index cbd1fcb7eb3..dd654649b06 100644 ---- a/gcc/explow.h -+++ b/gcc/explow.h -@@ -43,6 +43,7 @@ extern rtx copy_to_suggested_reg (rtx, rtx, machine_mode); - extern rtx force_reg (machine_mode, rtx); - - extern rtx force_subreg (machine_mode, rtx, machine_mode, poly_uint64); -+extern rtx force_lowpart_subreg (machine_mode, rtx, machine_mode); - - /* Return given rtx, copied into a new temp reg if it was in memory. */ - extern rtx force_not_mem (rtx); -diff --git a/gcc/optabs.cc b/gcc/optabs.cc -index ce91f94ed43..804c0dc73ba 100644 ---- a/gcc/optabs.cc -+++ b/gcc/optabs.cc -@@ -3096,26 +3096,6 @@ expand_ffs (scalar_int_mode mode, rtx op0, rtx target) - return 0; - } - --/* Extract the OMODE lowpart from VAL, which has IMODE. Under certain -- conditions, VAL may already be a SUBREG against which we cannot generate -- a further SUBREG. In this case, we expect forcing the value into a -- register will work around the situation. */ -- --static rtx --lowpart_subreg_maybe_copy (machine_mode omode, rtx val, -- machine_mode imode) --{ -- rtx ret; -- ret = lowpart_subreg (omode, val, imode); -- if (ret == NULL) -- { -- val = force_reg (imode, val); -- ret = lowpart_subreg (omode, val, imode); -- gcc_assert (ret != NULL); -- } -- return ret; --} -- - /* Expand a floating point absolute value or negation operation via a - logical operation on the sign bit. */ - -@@ -3204,7 +3184,7 @@ expand_absneg_bit (enum rtx_code code, scalar_float_mode mode, - gen_lowpart (imode, op0), - immed_wide_int_const (mask, imode), - gen_lowpart (imode, target), 1, OPTAB_LIB_WIDEN); -- target = lowpart_subreg_maybe_copy (mode, temp, imode); -+ target = force_lowpart_subreg (mode, temp, imode); - - set_dst_reg_note (get_last_insn (), REG_EQUAL, - gen_rtx_fmt_e (code, mode, copy_rtx (op0)), -@@ -4043,7 +4023,7 @@ expand_copysign_bit (scalar_float_mode mode, rtx op0, rtx op1, rtx target, - - temp = expand_binop (imode, ior_optab, op0, op1, - gen_lowpart (imode, target), 1, OPTAB_LIB_WIDEN); -- target = lowpart_subreg_maybe_copy (mode, temp, imode); -+ target = force_lowpart_subreg (mode, temp, imode); - } - - return target; --- -2.44.2 - diff --git a/packages/gcc/14.2.0/0015-Make-more-use-of-force_subreg.patch b/packages/gcc/14.2.0/0015-Make-more-use-of-force_subreg.patch deleted file mode 100644 index 697c87604c..0000000000 --- a/packages/gcc/14.2.0/0015-Make-more-use-of-force_subreg.patch +++ /dev/null @@ -1,194 +0,0 @@ -From d02fe5a6bfdfcae086e5374db3f8fd076df9b1a5 Mon Sep 17 00:00:00 2001 -From: Richard Sandiford -Date: Tue, 18 Jun 2024 12:22:30 +0100 -Subject: [PATCH 15/16] Make more use of force_subreg - -This patch makes target-independent code use force_subreg instead -of simplify_gen_subreg in some places. The criteria were: - -(1) The code is obviously specific to expand (where new pseudos - can be created), or at least would be invalid to call when - !can_create_pseudo_p () and temporaries are needed. - -(2) The value is obviously an rvalue rather than an lvalue. - -(3) The offset wasn't a simple lowpart or highpart calculation; - a later patch will deal with those. - -Doing this should reduce the likelihood of bugs like PR115464 -occuring in other situations. - -gcc/ - * expmed.cc (store_bit_field_using_insv): Use force_subreg - instead of simplify_gen_subreg. - (store_bit_field_1): Likewise. - (extract_bit_field_as_subreg): Likewise. - (extract_integral_bit_field): Likewise. - (emit_store_flag_1): Likewise. - * expr.cc (convert_move): Likewise. - (convert_modes): Likewise. - (emit_group_load_1): Likewise. - (emit_group_store): Likewise. - (expand_assignment): Likewise. - -(cherry picked from commit d4047da6a070175aae7121c739d1cad6b08ff4b2) ---- - gcc/expmed.cc | 22 ++++++++-------------- - gcc/expr.cc | 27 ++++++++++++--------------- - 2 files changed, 20 insertions(+), 29 deletions(-) - -diff --git a/gcc/expmed.cc b/gcc/expmed.cc -index 19765311b95..bd190722de6 100644 ---- a/gcc/expmed.cc -+++ b/gcc/expmed.cc -@@ -695,13 +695,7 @@ store_bit_field_using_insv (const extraction_insn *insv, rtx op0, - if we must narrow it, be sure we do it correctly. */ - - if (GET_MODE_SIZE (value_mode) < GET_MODE_SIZE (op_mode)) -- { -- tmp = simplify_subreg (op_mode, value1, value_mode, 0); -- if (! tmp) -- tmp = simplify_gen_subreg (op_mode, -- force_reg (value_mode, value1), -- value_mode, 0); -- } -+ tmp = force_subreg (op_mode, value1, value_mode, 0); - else - { - tmp = gen_lowpart_if_possible (op_mode, value1); -@@ -800,7 +794,7 @@ store_bit_field_1 (rtx str_rtx, poly_uint64 bitsize, poly_uint64 bitnum, - if (known_eq (bitnum, 0U) - && known_eq (bitsize, GET_MODE_BITSIZE (GET_MODE (op0)))) - { -- sub = simplify_gen_subreg (GET_MODE (op0), value, fieldmode, 0); -+ sub = force_subreg (GET_MODE (op0), value, fieldmode, 0); - if (sub) - { - if (reverse) -@@ -1627,7 +1621,7 @@ extract_bit_field_as_subreg (machine_mode mode, rtx op0, - && known_eq (bitsize, GET_MODE_BITSIZE (mode)) - && lowpart_bit_field_p (bitnum, bitsize, op0_mode) - && TRULY_NOOP_TRUNCATION_MODES_P (mode, op0_mode)) -- return simplify_gen_subreg (mode, op0, op0_mode, bytenum); -+ return force_subreg (mode, op0, op0_mode, bytenum); - return NULL_RTX; - } - -@@ -1994,11 +1988,11 @@ extract_integral_bit_field (rtx op0, opt_scalar_int_mode op0_mode, - return convert_extracted_bit_field (target, mode, tmode, unsignedp); - } - /* If OP0 is a hard register, copy it to a pseudo before calling -- simplify_gen_subreg. */ -+ force_subreg. */ - if (REG_P (op0) && HARD_REGISTER_P (op0)) - op0 = copy_to_reg (op0); -- op0 = simplify_gen_subreg (word_mode, op0, op0_mode.require (), -- bitnum / BITS_PER_WORD * UNITS_PER_WORD); -+ op0 = force_subreg (word_mode, op0, op0_mode.require (), -+ bitnum / BITS_PER_WORD * UNITS_PER_WORD); - op0_mode = word_mode; - bitnum %= BITS_PER_WORD; - } -@@ -5759,8 +5753,8 @@ emit_store_flag_1 (rtx target, enum rtx_code code, rtx op0, rtx op1, - - /* Do a logical OR or AND of the two words and compare the - result. */ -- op00 = simplify_gen_subreg (word_mode, op0, int_mode, 0); -- op01 = simplify_gen_subreg (word_mode, op0, int_mode, UNITS_PER_WORD); -+ op00 = force_subreg (word_mode, op0, int_mode, 0); -+ op01 = force_subreg (word_mode, op0, int_mode, UNITS_PER_WORD); - tem = expand_binop (word_mode, - op1 == const0_rtx ? ior_optab : and_optab, - op00, op01, NULL_RTX, unsignedp, -diff --git a/gcc/expr.cc b/gcc/expr.cc -index 9f66d479445..8ffa76b1bb8 100644 ---- a/gcc/expr.cc -+++ b/gcc/expr.cc -@@ -302,7 +302,7 @@ convert_move (rtx to, rtx from, int unsignedp) - GET_MODE_BITSIZE (to_mode))); - - if (VECTOR_MODE_P (to_mode)) -- from = simplify_gen_subreg (to_mode, from, GET_MODE (from), 0); -+ from = force_subreg (to_mode, from, GET_MODE (from), 0); - else - to = simplify_gen_subreg (from_mode, to, GET_MODE (to), 0); - -@@ -936,7 +936,7 @@ convert_modes (machine_mode mode, machine_mode oldmode, rtx x, int unsignedp) - { - gcc_assert (known_eq (GET_MODE_BITSIZE (mode), - GET_MODE_BITSIZE (oldmode))); -- return simplify_gen_subreg (mode, x, oldmode, 0); -+ return force_subreg (mode, x, oldmode, 0); - } - - temp = gen_reg_rtx (mode); -@@ -3076,8 +3076,8 @@ emit_group_load_1 (rtx *tmps, rtx dst, rtx orig_src, tree type, - } - } - else if (CONSTANT_P (src) && GET_MODE (dst) != BLKmode -- && XVECLEN (dst, 0) > 1) -- tmps[i] = simplify_gen_subreg (mode, src, GET_MODE (dst), bytepos); -+ && XVECLEN (dst, 0) > 1) -+ tmps[i] = force_subreg (mode, src, GET_MODE (dst), bytepos); - else if (CONSTANT_P (src)) - { - if (known_eq (bytelen, ssize)) -@@ -3301,7 +3301,7 @@ emit_group_store (rtx orig_dst, rtx src, tree type ATTRIBUTE_UNUSED, - if (known_eq (rtx_to_poly_int64 (XEXP (XVECEXP (src, 0, start), 1)), - bytepos)) - { -- temp = simplify_gen_subreg (outer, tmps[start], inner, 0); -+ temp = force_subreg (outer, tmps[start], inner, 0); - if (temp) - { - emit_move_insn (dst, temp); -@@ -3321,7 +3321,7 @@ emit_group_store (rtx orig_dst, rtx src, tree type ATTRIBUTE_UNUSED, - finish - 1), 1)), - bytepos)) - { -- temp = simplify_gen_subreg (outer, tmps[finish - 1], inner, 0); -+ temp = force_subreg (outer, tmps[finish - 1], inner, 0); - if (temp) - { - emit_move_insn (dst, temp); -@@ -6195,11 +6195,9 @@ expand_assignment (tree to, tree from, bool nontemporal) - to_mode = GET_MODE_INNER (to_mode); - machine_mode from_mode = GET_MODE_INNER (GET_MODE (result)); - rtx from_real -- = simplify_gen_subreg (to_mode, XEXP (result, 0), -- from_mode, 0); -+ = force_subreg (to_mode, XEXP (result, 0), from_mode, 0); - rtx from_imag -- = simplify_gen_subreg (to_mode, XEXP (result, 1), -- from_mode, 0); -+ = force_subreg (to_mode, XEXP (result, 1), from_mode, 0); - if (!from_real || !from_imag) - goto concat_store_slow; - emit_move_insn (XEXP (to_rtx, 0), from_real); -@@ -6215,8 +6213,7 @@ expand_assignment (tree to, tree from, bool nontemporal) - if (MEM_P (result)) - from_rtx = change_address (result, to_mode, NULL_RTX); - else -- from_rtx -- = simplify_gen_subreg (to_mode, result, from_mode, 0); -+ from_rtx = force_subreg (to_mode, result, from_mode, 0); - if (from_rtx) - { - emit_move_insn (XEXP (to_rtx, 0), -@@ -6228,10 +6225,10 @@ expand_assignment (tree to, tree from, bool nontemporal) - { - to_mode = GET_MODE_INNER (to_mode); - rtx from_real -- = simplify_gen_subreg (to_mode, result, from_mode, 0); -+ = force_subreg (to_mode, result, from_mode, 0); - rtx from_imag -- = simplify_gen_subreg (to_mode, result, from_mode, -- GET_MODE_SIZE (to_mode)); -+ = force_subreg (to_mode, result, from_mode, -+ GET_MODE_SIZE (to_mode)); - if (!from_real || !from_imag) - goto concat_store_slow; - emit_move_insn (XEXP (to_rtx, 0), from_real); --- -2.44.2 - diff --git a/packages/gcc/14.2.0/0016-Revert-one-of-the-force_subreg-changes.patch b/packages/gcc/14.2.0/0016-Revert-one-of-the-force_subreg-changes.patch deleted file mode 100644 index 629cfbdadf..0000000000 --- a/packages/gcc/14.2.0/0016-Revert-one-of-the-force_subreg-changes.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5468439a1f987b7d801c6c76d6c989e57af8916a Mon Sep 17 00:00:00 2001 -From: Richard Sandiford -Date: Tue, 25 Jun 2024 09:41:21 +0100 -Subject: [PATCH 16/16] Revert one of the force_subreg changes - -One of the changes in g:d4047da6a070175aae7121c739d1cad6b08ff4b2 -caused a regression in ft32-elf; see: - - https://gcc.gnu.org/pipermail/gcc-patches/2024-June/655418.html - -for details. This change was different from the others in that the -original call was to simplify_subreg rather than simplify_lowpart_subreg. -The old code would therefore go on to do the force_reg for more cases -than the new code would. - -gcc/ - * expmed.cc (store_bit_field_using_insv): Revert earlier change - to use force_subreg instead of simplify_gen_subreg. - -(cherry picked from commit b694bf417cdd7d0a4d78e9927bab6bc202b7df6c) ---- - gcc/expmed.cc | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/gcc/expmed.cc b/gcc/expmed.cc -index bd190722de6..85ec2614a3f 100644 ---- a/gcc/expmed.cc -+++ b/gcc/expmed.cc -@@ -695,7 +695,13 @@ store_bit_field_using_insv (const extraction_insn *insv, rtx op0, - if we must narrow it, be sure we do it correctly. */ - - if (GET_MODE_SIZE (value_mode) < GET_MODE_SIZE (op_mode)) -- tmp = force_subreg (op_mode, value1, value_mode, 0); -+ { -+ tmp = simplify_subreg (op_mode, value1, value_mode, 0); -+ if (! tmp) -+ tmp = simplify_gen_subreg (op_mode, -+ force_reg (value_mode, value1), -+ value_mode, 0); -+ } - else - { - tmp = gen_lowpart_if_possible (op_mode, value1); --- -2.44.2 - diff --git a/packages/gcc/14.2.0/chksum b/packages/gcc/14.2.0/chksum deleted file mode 100644 index 40000f5ce5..0000000000 --- a/packages/gcc/14.2.0/chksum +++ /dev/null @@ -1,8 +0,0 @@ -md5 gcc-14.2.0.tar.xz 2268420ba02dc01821960e274711bde0 -sha1 gcc-14.2.0.tar.xz d91ecc3d20ce6298bd95f9b09cc51dc6d3c73ae3 -sha256 gcc-14.2.0.tar.xz a7b39bc69cbf9e25826c5a60ab26477001f7c08d85cec04bc0e29cabed6f3cc9 -sha512 gcc-14.2.0.tar.xz 932bdef0cda94bacedf452ab17f103c0cb511ff2cec55e9112fc0328cbf1d803b42595728ea7b200e0a057c03e85626f937012e49a7515bc5dd256b2bf4bc396 -md5 gcc-14.2.0.tar.gz b89ddcdaf5c1b6214abad40d9761a6ba -sha1 gcc-14.2.0.tar.gz d4d09500ace1dc9ab69f6c4c791de012da8607ed -sha256 gcc-14.2.0.tar.gz 7d376d445f93126dc545e2c0086d0f647c3094aae081cdb78f42ce2bc25e7293 -sha512 gcc-14.2.0.tar.gz d6828a5702ff4b667cc3e1e7e9f180191041b7efb68ffdc54248a42aa1799f41db6743acfe9ab74ea59977ba06f425fcf943a9fe3a77f9db706fc6bdbd657c1a diff --git a/packages/gcc/14.3.0/0000-libtool-leave-framework-alone.patch b/packages/gcc/14.3.0/0000-libtool-leave-framework-alone.patch new file mode 100644 index 0000000000..a5f6f66b96 --- /dev/null +++ b/packages/gcc/14.3.0/0000-libtool-leave-framework-alone.patch @@ -0,0 +1,21 @@ +--- + libtool-ldflags | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/libtool-ldflags b/libtool-ldflags +index 5de9e2978d40..0dde24bedfc5 100755 +--- a/libtool-ldflags ++++ b/libtool-ldflags +@@ -36,6 +36,11 @@ prev_arg= + for arg + do + case $arg in ++ -framework) ++ # libtool handles this option. It should not be prefixed with ++ # -Xcompiler, as that would split it from the argument that ++ # follows. ++ ;; + -f*|--*|-static-lib*|-shared-lib*|-B*) + # Libtool does not ascribe any special meaning options + # that begin with -f or with a double-dash. So, it will + diff --git a/packages/gcc/14.3.0/0001-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc/14.3.0/0001-gcc-plugin-POSIX-include-sys-select-h.patch new file mode 100644 index 0000000000..181d6332b1 --- /dev/null +++ b/packages/gcc/14.3.0/0001-gcc-plugin-POSIX-include-sys-select-h.patch @@ -0,0 +1,17 @@ +--- + libcc1/connection.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libcc1/connection.cc b/libcc1/connection.cc +index 175e7a176b9e..60e37c2ce0c5 100644 +--- a/libcc1/connection.cc ++++ b/libcc1/connection.cc +@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see + #include + #include + #include ++#include + #include + #include + #include "marshall.hh" + diff --git a/packages/gcc/14.3.0/0002-0002-arm-softfloat-libgcc.patch.patch b/packages/gcc/14.3.0/0002-0002-arm-softfloat-libgcc.patch.patch new file mode 100644 index 0000000000..d2a7dfce55 --- /dev/null +++ b/packages/gcc/14.3.0/0002-0002-arm-softfloat-libgcc.patch.patch @@ -0,0 +1,43 @@ +From c18ad43db5808bf40b9ceb877df7bcd438b59cdd Mon Sep 17 00:00:00 2001 +From: Chris Packham +Date: Sun, 25 May 2025 10:34:00 +1200 +Subject: [PATCH] 0002-arm-softfloat-libgcc.patch + +--- + gcc/config/arm/linux-elf.h | 2 +- + libgcc/config/arm/t-linux | 7 ++++++- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h +index ccae8abf6f6c..fcd180dff243 100644 +--- a/gcc/config/arm/linux-elf.h ++++ b/gcc/config/arm/linux-elf.h +@@ -58,7 +58,7 @@ + %{shared:-lc} \ + %{!shared:%{profile:-lc_p}%{!profile:-lc}}" + +-#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" ++#define LIBGCC_SPEC "-lgcc" + + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" + +diff --git a/libgcc/config/arm/t-linux b/libgcc/config/arm/t-linux +index 3d520decafbc..e7bc042d4e40 100644 +--- a/libgcc/config/arm/t-linux ++++ b/libgcc/config/arm/t-linux +@@ -1,6 +1,11 @@ + LIB1ASMSRC = arm/lib1funcs.S + LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \ +- _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 ++ _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \ ++ _arm_addsubdf3 _arm_addsubsf3 \ ++ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \ ++ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \ ++ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \ ++ _arm_fixsfsi _arm_fixunssfsi + + # Just for these, we omit the frame pointer since it makes such a big + # difference. +-- +2.49.0 + diff --git a/packages/gcc/14.3.0/0003-0003-libgcc-disable-split-stack-nothreads.patch.patch b/packages/gcc/14.3.0/0003-0003-libgcc-disable-split-stack-nothreads.patch.patch new file mode 100644 index 0000000000..2fea1b630d --- /dev/null +++ b/packages/gcc/14.3.0/0003-0003-libgcc-disable-split-stack-nothreads.patch.patch @@ -0,0 +1,23 @@ +From 9b74f600cb69cf86c9a8e29e8cea775effd780c2 Mon Sep 17 00:00:00 2001 +From: Chris Packham +Date: Sun, 25 May 2025 10:34:01 +1200 +Subject: [PATCH] 0003-libgcc-disable-split-stack-nothreads.patch + +--- + libgcc/config/t-stack | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libgcc/config/t-stack b/libgcc/config/t-stack +index cc0366b4cd81..f3f97e86d60e 100644 +--- a/libgcc/config/t-stack ++++ b/libgcc/config/t-stack +@@ -1,4 +1,6 @@ + # Makefile fragment to provide generic support for -fsplit-stack. + # This should be used in config.host for any host which supports + # -fsplit-stack. ++ifeq ($(enable_threads),yes) + LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c ++endif +-- +2.49.0 + diff --git a/packages/gcc/14.3.0/0004-Remove-use-of-include_next-from-c-headers.patch b/packages/gcc/14.3.0/0004-Remove-use-of-include_next-from-c-headers.patch new file mode 100644 index 0000000000..2dbe28a545 --- /dev/null +++ b/packages/gcc/14.3.0/0004-Remove-use-of-include_next-from-c-headers.patch @@ -0,0 +1,307 @@ +From a9766b7fd69768ec614f838edcb6a38fd7b3cb0d Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Sun, 24 Jan 2021 14:20:33 -0800 +Subject: [PATCH] Remove use of include_next from c++ headers + +Using include_next bypasses the default header search path and lets +files later in the include path take priority over earlier files. + +This makes replacing libc impossible as the default libc headers will +occur after the libstdc++ headers, and so be picked up in place of +headers inserted at the begining of the search path or appended to the +end of the search path. + +Using include_next is a hack to work-around broken combinations of +libraries, and is not necessary in a well constructed toolchain. + +Signed-off-by: Keith Packard +--- + libstdc++-v3/include/bits/std_abs.h | 4 ++-- + libstdc++-v3/include/c/cassert | 2 +- + libstdc++-v3/include/c/cctype | 2 +- + libstdc++-v3/include/c/cerrno | 2 +- + libstdc++-v3/include/c/cfloat | 2 +- + libstdc++-v3/include/c/climits | 2 +- + libstdc++-v3/include/c/clocale | 2 +- + libstdc++-v3/include/c/cmath | 2 +- + libstdc++-v3/include/c/csetjmp | 2 +- + libstdc++-v3/include/c/csignal | 2 +- + libstdc++-v3/include/c/cstdarg | 2 +- + libstdc++-v3/include/c/cstddef | 2 +- + libstdc++-v3/include/c/cstdio | 2 +- + libstdc++-v3/include/c/cstdlib | 2 +- + libstdc++-v3/include/c/cstring | 2 +- + libstdc++-v3/include/c/ctime | 2 +- + libstdc++-v3/include/c/cuchar | 2 +- + libstdc++-v3/include/c/cwchar | 2 +- + libstdc++-v3/include/c/cwctype | 2 +- + libstdc++-v3/include/c_global/cmath | 2 +- + libstdc++-v3/include/c_global/cstdlib | 2 +- + 21 files changed, 22 insertions(+), 22 deletions(-) + +diff --git a/libstdc++-v3/include/bits/std_abs.h b/libstdc++-v3/include/bits/std_abs.h +index 48d44160baba..d30c44e51896 100644 +--- a/libstdc++-v3/include/bits/std_abs.h ++++ b/libstdc++-v3/include/bits/std_abs.h +@@ -35,9 +35,9 @@ + #include + + #define _GLIBCXX_INCLUDE_NEXT_C_HEADERS +-#include_next ++#include + #ifdef __CORRECT_ISO_CPP_MATH_H_PROTO +-# include_next ++# include + #endif + #undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS + +diff --git a/libstdc++-v3/include/c/cassert b/libstdc++-v3/include/c/cassert +index 5cd11fff9ece..01d8c7fa5fcd 100644 +--- a/libstdc++-v3/include/c/cassert ++++ b/libstdc++-v3/include/c/cassert +@@ -31,4 +31,4 @@ + #pragma GCC system_header + + #include +-#include_next ++#include +diff --git a/libstdc++-v3/include/c/cctype b/libstdc++-v3/include/c/cctype +index c6f650394357..1540a3259454 100644 +--- a/libstdc++-v3/include/c/cctype ++++ b/libstdc++-v3/include/c/cctype +@@ -31,6 +31,6 @@ + + #pragma GCC system_header + +-#include_next ++#include + + #endif +diff --git a/libstdc++-v3/include/c/cerrno b/libstdc++-v3/include/c/cerrno +index 9e47b182d25c..250ea5d7744a 100644 +--- a/libstdc++-v3/include/c/cerrno ++++ b/libstdc++-v3/include/c/cerrno +@@ -41,7 +41,7 @@ + #pragma GCC system_header + + #include +-#include_next ++#include + + // Adhere to section 17.4.1.2 clause 5 of ISO 14882:1998 + #ifndef errno +diff --git a/libstdc++-v3/include/c/cfloat b/libstdc++-v3/include/c/cfloat +index 81d9772ed9f6..660440fc810b 100644 +--- a/libstdc++-v3/include/c/cfloat ++++ b/libstdc++-v3/include/c/cfloat +@@ -32,6 +32,6 @@ + #pragma GCC system_header + + #include +-#include_next ++#include + + #endif +diff --git a/libstdc++-v3/include/c/climits b/libstdc++-v3/include/c/climits +index 255bed411259..919e1ec4855d 100644 +--- a/libstdc++-v3/include/c/climits ++++ b/libstdc++-v3/include/c/climits +@@ -32,6 +32,6 @@ + #pragma GCC system_header + + #include +-#include_next ++#include + + #endif +diff --git a/libstdc++-v3/include/c/clocale b/libstdc++-v3/include/c/clocale +index 4258df1958b6..95357d40ca1b 100644 +--- a/libstdc++-v3/include/c/clocale ++++ b/libstdc++-v3/include/c/clocale +@@ -31,6 +31,6 @@ + + #pragma GCC system_header + +-#include_next ++#include + + #endif +diff --git a/libstdc++-v3/include/c/cmath b/libstdc++-v3/include/c/cmath +index 43020eee9d29..619031ba8e4a 100644 +--- a/libstdc++-v3/include/c/cmath ++++ b/libstdc++-v3/include/c/cmath +@@ -33,7 +33,7 @@ + + #include + +-#include_next ++#include + + // Get rid of those macros defined in in lieu of real functions. + #undef abs +diff --git a/libstdc++-v3/include/c/csetjmp b/libstdc++-v3/include/c/csetjmp +index 4a5b0334590f..4a7744ba1c7e 100644 +--- a/libstdc++-v3/include/c/csetjmp ++++ b/libstdc++-v3/include/c/csetjmp +@@ -31,7 +31,7 @@ + + #pragma GCC system_header + +-#include_next ++#include + + // Get rid of those macros defined in in lieu of real functions. + #undef longjmp +diff --git a/libstdc++-v3/include/c/csignal b/libstdc++-v3/include/c/csignal +index 040b48368f94..afe91f7c7866 100644 +--- a/libstdc++-v3/include/c/csignal ++++ b/libstdc++-v3/include/c/csignal +@@ -31,6 +31,6 @@ + + #pragma GCC system_header + +-#include_next ++#include + + #endif +diff --git a/libstdc++-v3/include/c/cstdarg b/libstdc++-v3/include/c/cstdarg +index 5d97e043da84..568dc07994f6 100644 +--- a/libstdc++-v3/include/c/cstdarg ++++ b/libstdc++-v3/include/c/cstdarg +@@ -32,6 +32,6 @@ + #pragma GCC system_header + + #undef __need___va_list +-#include_next ++#include + + #endif +diff --git a/libstdc++-v3/include/c/cstddef b/libstdc++-v3/include/c/cstddef +index 4fd889a1dffc..28997b73a647 100644 +--- a/libstdc++-v3/include/c/cstddef ++++ b/libstdc++-v3/include/c/cstddef +@@ -35,6 +35,6 @@ + #define __need_ptrdiff_t + #define __need_NULL + #define __need_offsetof +-#include_next ++#include + + #endif +diff --git a/libstdc++-v3/include/c/cstdio b/libstdc++-v3/include/c/cstdio +index 01293054d501..6632e5b09586 100644 +--- a/libstdc++-v3/include/c/cstdio ++++ b/libstdc++-v3/include/c/cstdio +@@ -31,7 +31,7 @@ + + #pragma GCC system_header + +-#include_next ++#include + + // Get rid of those macros defined in in lieu of real functions. + #undef clearerr +diff --git a/libstdc++-v3/include/c/cstdlib b/libstdc++-v3/include/c/cstdlib +index f5707f8a8ce4..4156882e09aa 100644 +--- a/libstdc++-v3/include/c/cstdlib ++++ b/libstdc++-v3/include/c/cstdlib +@@ -31,6 +31,6 @@ + + #pragma GCC system_header + +-#include_next ++#include + + #endif +diff --git a/libstdc++-v3/include/c/cstring b/libstdc++-v3/include/c/cstring +index 0082080fcab0..209ccd112faa 100644 +--- a/libstdc++-v3/include/c/cstring ++++ b/libstdc++-v3/include/c/cstring +@@ -31,6 +31,6 @@ + + #pragma GCC system_header + +-#include_next ++#include + + #endif +diff --git a/libstdc++-v3/include/c/ctime b/libstdc++-v3/include/c/ctime +index 5476ff7da399..33c61aa08d73 100644 +--- a/libstdc++-v3/include/c/ctime ++++ b/libstdc++-v3/include/c/ctime +@@ -31,6 +31,6 @@ + + #pragma GCC system_header + +-#include_next ++#include + + #endif +diff --git a/libstdc++-v3/include/c/cuchar b/libstdc++-v3/include/c/cuchar +index 430d1ff50ba1..7b2c9d738269 100644 +--- a/libstdc++-v3/include/c/cuchar ++++ b/libstdc++-v3/include/c/cuchar +@@ -39,7 +39,7 @@ + #include + + #if _GLIBCXX_USE_C11_UCHAR_CXX11 +-# include_next ++# include + #endif + + #endif // C++11 +diff --git a/libstdc++-v3/include/c/cwchar b/libstdc++-v3/include/c/cwchar +index 7a62eb74abbf..c1857099ef12 100644 +--- a/libstdc++-v3/include/c/cwchar ++++ b/libstdc++-v3/include/c/cwchar +@@ -36,7 +36,7 @@ + #include + + #if _GLIBCXX_HAVE_WCHAR_H +-#include_next ++#include + #endif + + // Need to do a bit of trickery here with mbstate_t as char_traits +diff --git a/libstdc++-v3/include/c/cwctype b/libstdc++-v3/include/c/cwctype +index 011ceadbb1b4..6a67549ea4bd 100644 +--- a/libstdc++-v3/include/c/cwctype ++++ b/libstdc++-v3/include/c/cwctype +@@ -34,7 +34,7 @@ + #include + + #if _GLIBCXX_HAVE_WCTYPE_H +-#include_next ++#include + #endif + + #endif +diff --git a/libstdc++-v3/include/c_global/cmath b/libstdc++-v3/include/c_global/cmath +index 114b0693151e..bea5665a293d 100644 +--- a/libstdc++-v3/include/c_global/cmath ++++ b/libstdc++-v3/include/c_global/cmath +@@ -44,7 +44,7 @@ + #include + #include + #define _GLIBCXX_INCLUDE_NEXT_C_HEADERS +-#include_next ++#include + #undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS + #include + +diff --git a/libstdc++-v3/include/c_global/cstdlib b/libstdc++-v3/include/c_global/cstdlib +index 7bb11f5b788a..5a6a28898221 100644 +--- a/libstdc++-v3/include/c_global/cstdlib ++++ b/libstdc++-v3/include/c_global/cstdlib +@@ -76,7 +76,7 @@ namespace std + // Need to ensure this finds the C library's not a libstdc++ + // wrapper that might already be installed later in the include search path. + #define _GLIBCXX_INCLUDE_NEXT_C_HEADERS +-#include_next ++#include + #undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS + #include + +-- +2.49.0 + diff --git a/packages/gcc/14.3.0/0005-Allow-default-libc-to-be-specified-to-configure.patch b/packages/gcc/14.3.0/0005-Allow-default-libc-to-be-specified-to-configure.patch new file mode 100644 index 0000000000..b55b8a1b97 --- /dev/null +++ b/packages/gcc/14.3.0/0005-Allow-default-libc-to-be-specified-to-configure.patch @@ -0,0 +1,141 @@ +From d87c4fb35576c61b75c0a003f9bbccea8321b3a3 Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Fri, 2 Sep 2022 23:07:05 -0700 +Subject: [PATCH] Allow default libc to be specified to configure + +The default C library is normally computed based on the target +triplet. However, for embedded systems, it can be useful to leave the +triplet alone while changing which C library is used by default. Other +C libraries may still be available on the system so the compiler and +can be used by specifying suitable include and library paths at build +time. + +If an unknown --with-default-libc= value is provided, emit an error +and stop. + +Signed-off-by: Keith Packard +--- + gcc/config.gcc | 48 ++++++++++++++++++++++++++++++++++++++++-------- + gcc/configure.ac | 4 ++++ + 2 files changed, 44 insertions(+), 8 deletions(-) + +diff --git a/gcc/config.gcc b/gcc/config.gcc +index a3566f5c77da..f993b4b26c4c 100644 +--- a/gcc/config.gcc ++++ b/gcc/config.gcc +@@ -695,6 +695,8 @@ esac + # Common C libraries. + tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4" + ++default_libc="" ++ + # 32-bit x86 processors supported by --with-arch=. Each processor + # MUST be separated by exactly one space. + x86_archs="athlon athlon-4 athlon-fx athlon-mp athlon-tbird \ +@@ -911,16 +913,16 @@ case ${target} in + esac + case $target in + *-*-*android*) +- tm_defines="$tm_defines DEFAULT_LIBC=LIBC_BIONIC" ++ default_libc=LIBC_BIONIC + ;; + *-*-*uclibc* | *-*-uclinuxfdpiceabi) +- tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC" ++ default_libc=LIBC_UCLIBC + ;; + *-*-*musl*) +- tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL" ++ default_libc=LIBC_MUSL + ;; + *) +- tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" ++ default_libc=LIBC_GLIBC + ;; + esac + # Assume that glibc or uClibc or Bionic are being used and so __cxa_atexit +@@ -1035,7 +1037,8 @@ case ${target} in + case ${enable_threads} in + "" | yes | posix) thread_file='posix' ;; + esac +- tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC" ++ tm_defines="$tm_defines SINGLE_LIBC" ++ default_libc=LIBC_UCLIBC + ;; + *-*-rdos*) + use_gcc_stdint=wrap +@@ -1721,13 +1724,13 @@ csky-*-*) + + case ${target} in + csky-*-linux-gnu*) +- tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" ++ default_libc=LIBC_GLIBC + # Force .init_array support. The configure script cannot always + # automatically detect that GAS supports it, yet we require it. + gcc_cv_initfini_array=yes + ;; + csky-*-linux-uclibc*) +- tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC" ++ default_libc=LIBC_UCLIBC + default_use_cxa_atexit=no + ;; + *) +@@ -3125,7 +3128,7 @@ powerpc*-wrs-vxworks7r*) + tmake_file="${tmake_file} t-linux rs6000/t-linux64 rs6000/t-fprules rs6000/t-ppccomm" + tmake_file="${tmake_file} rs6000/t-vxworks" + +- tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" ++ default_libc=LIBC_GLIBC + extra_objs="$extra_objs linux.o rs6000-linux.o" + ;; + powerpc-wrs-vxworks*) +@@ -6079,3 +6082,32 @@ i[34567]86-*-* | x86_64-*-*) + fi + ;; + esac ++ ++case "${with_default_libc}" in ++glibc) ++ default_libc=LIBC_GLIBC ++ ;; ++uclibc) ++ default_libc=LIBC_UCLIBC ++ ;; ++bionic) ++ default_libc=LIBC_BIONIC ++ ;; ++musl) ++ default_libc=LIBC_MUSL ++ ;; ++"") ++ ;; ++*) ++ echo "Unknown libc in --with-default-libc=$with_default_libc" 1>&2 ++ exit 1 ++ ;; ++esac ++ ++case "$default_libc" in ++"") ++ ;; ++*) ++ tm_defines="$tm_defines DEFAULT_LIBC=$default_libc" ++ ;; ++esac +diff --git a/gcc/configure.ac b/gcc/configure.ac +index cb743b5a875a..5213bf64a6d4 100644 +--- a/gcc/configure.ac ++++ b/gcc/configure.ac +@@ -2561,6 +2561,10 @@ if { { test x$host != x$target && test "x$with_sysroot" = x ; } || + fi + AC_SUBST(inhibit_libc) + ++AC_ARG_WITH(default-libc, ++ [AS_HELP_STRING([--with-default-libc], ++ [Use specified default C library])]) ++ + # When building gcc with a cross-compiler, we need to adjust things so + # that the generator programs are still built with the native compiler. + # Also, we cannot run fixincludes. +-- +2.49.0 + diff --git a/packages/gcc/14.3.0/0006-driver-Extend-getenv-function-to-allow-default-value.patch b/packages/gcc/14.3.0/0006-driver-Extend-getenv-function-to-allow-default-value.patch new file mode 100644 index 0000000000..e262eb5847 --- /dev/null +++ b/packages/gcc/14.3.0/0006-driver-Extend-getenv-function-to-allow-default-value.patch @@ -0,0 +1,102 @@ +From 2663eed443ff0cb465f28c0598713dc6ca83feeb Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Fri, 26 Aug 2022 14:30:03 -0700 +Subject: [PATCH] driver: Extend 'getenv' function to allow default value + +Right now, a missing environment variable provided to the 'getenv' +function in a .specs file causes a fatal error. That makes writing a +spec file that uses the GCC_EXEC_PREFIX value difficult as that +variable is only set when the driver has been relocated, but not when +run from the defined location. This makes building a relocatable +toolchain difficult to extend to other ancilary pieces which use specs +files to locate header and library files adjacent to the toolchain. + +This patch adds an optional third argument to the getenv function that +can be used to fall back to the standard installation path when the +driver hasn't set GCC_EXEC_PREFIX in the environment. + +For example, if an alternate C library is installed in +${prefix}/extra, then this change allows the specs file to locate that +relative to the gcc directory, if gcc is located in the original +installation directory (which would leave GCC_EXEC_PREFIX unset), or +if the gcc tree has been moved to a different location (where gcc +would set GCC_EXEC_PREFIX itself): + +*cpp: +-isystem %:getenv(GCC_EXEC_PREFIX ../../extra/include ${prefix}/extra/include) + +I considered changing the behavior of either the %R sequence so that +it had a defined behavior when there was no sysroot defined, or making +the driver always set the GCC_EXEC_PREFIX environment variable and +decided that the approach of adding functionality to getenv where it +was previously invalid would cause the least potential for affecting +existing usage. + +Signed-off-by: Keith Packard +--- + gcc/doc/invoke.texi | 18 +++++++++++------- + gcc/gcc.cc | 10 +++++++++- + 2 files changed, 20 insertions(+), 8 deletions(-) + +diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi +index 64728fead512..3f487db6cad7 100644 +--- a/gcc/doc/invoke.texi ++++ b/gcc/doc/invoke.texi +@@ -37065,17 +37065,21 @@ The following built-in spec functions are provided: + + @table @code + @item @code{getenv} +-The @code{getenv} spec function takes two arguments: an environment +-variable name and a string. If the environment variable is not +-defined, a fatal error is issued. Otherwise, the return value is the +-value of the environment variable concatenated with the string. For +-example, if @env{TOPDIR} is defined as @file{/path/to/top}, then: ++ ++The @code{getenv} spec function takes two or three arguments: an ++environment variable name, a string and an optional default value. If ++the environment variable is not defined and a default value is ++provided, that is used as the return value; otherwise a fatal error is ++issued. Otherwise, the return value is the value of the environment ++variable concatenated with the string. For example, if @env{TOPDIR} ++is defined as @file{/path/to/top}, then: + + @smallexample +-%:getenv(TOPDIR /include) ++%:getenv(TOPDIR /include /path/to/default/include) + @end smallexample + +-expands to @file{/path/to/top/include}. ++expands to @file{/path/to/top/include}. If @env{TOPDIR} is not ++defined, then this expands to @file{/path/to/default/include}. + + @item @code{if-exists} + The @code{if-exists} spec function takes one argument, an absolute +diff --git a/gcc/gcc.cc b/gcc/gcc.cc +index fc9f1f545dc8..8e6e25d935be 100644 +--- a/gcc/gcc.cc ++++ b/gcc/gcc.cc +@@ -10318,12 +10318,20 @@ getenv_spec_function (int argc, const char **argv) + char *ptr; + size_t len; + +- if (argc != 2) ++ if (argc != 2 && argc != 3) + return NULL; + + varname = argv[0]; + value = env.get (varname); + ++ if (!value && argc == 3) ++ { ++ value = argv[2]; ++ result = XNEWVAR(char, strlen(value) + 1); ++ strcpy(result, value); ++ return result; ++ } ++ + /* If the variable isn't defined and this is allowed, craft our expected + return value. Assume variable names used in specs strings don't contain + any active spec character so don't need escaping. */ +-- +2.49.0 + diff --git a/packages/gcc/14.3.0/0007-Add-newlib-and-picolibc-as-default-C-library-choices.patch b/packages/gcc/14.3.0/0007-Add-newlib-and-picolibc-as-default-C-library-choices.patch new file mode 100644 index 0000000000..cfc815574c --- /dev/null +++ b/packages/gcc/14.3.0/0007-Add-newlib-and-picolibc-as-default-C-library-choices.patch @@ -0,0 +1,42 @@ +From d4b4b5159d270bb4bfec71847d041b4b2d71759d Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Tue, 23 Aug 2022 22:12:06 -0700 +Subject: [PATCH] Add newlib and picolibc as default C library choices + +Signed-off-by: Keith Packard +--- + gcc/config.gcc | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/gcc/config.gcc b/gcc/config.gcc +index f993b4b26c4c..bcf23f9d0a42 100644 +--- a/gcc/config.gcc ++++ b/gcc/config.gcc +@@ -693,7 +693,7 @@ case ${target} in + esac + + # Common C libraries. +-tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4" ++tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4 LIBC_NEWLIB=5 LIBC_PICOLIBC=6" + + default_libc="" + +@@ -6096,6 +6096,15 @@ bionic) + musl) + default_libc=LIBC_MUSL + ;; ++newlib) ++ # Newlib configurations don't set the DEFAULT_LIBC variable, so ++ # avoid changing those by allowing --with-default-libc=newlib but ++ # not actually setting the DEFAULT_LIBC variable. ++ default_libc= ++ ;; ++picolibc) ++ default_libc=LIBC_PICOLIBC ++ ;; + "") + ;; + *) +-- +2.49.0 + diff --git a/packages/gcc/14.3.0/0008-Support-picolibc-targets.patch b/packages/gcc/14.3.0/0008-Support-picolibc-targets.patch new file mode 100644 index 0000000000..20914c3772 --- /dev/null +++ b/packages/gcc/14.3.0/0008-Support-picolibc-targets.patch @@ -0,0 +1,38 @@ +From a3fb1dcf2b7146c1ae6014c655957a775e1ea6b0 Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Sun, 12 Feb 2023 14:23:32 -0800 +Subject: [PATCH] Support picolibc targets + +Match *-picolibc-* and select picolibc as the default C library, plus continuing to use +the newlib-based logic for other configuration items. + +Signed-off-by: Keith Packard +--- + gcc/config.gcc | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/gcc/config.gcc b/gcc/config.gcc +index bcf23f9d0a42..f770d21e5d4c 100644 +--- a/gcc/config.gcc ++++ b/gcc/config.gcc +@@ -1168,6 +1168,17 @@ case ${target} in + ;; + esac + ;; ++*-picolibc-*) ++ # __cxa_atexit is provided. ++ default_use_cxa_atexit=yes ++ use_gcc_stdint=wrap ++ default_libc=LIBC_PICOLIBC ++ case "${with_newlib}-${with_headers}" in ++ no-no) use_gcc_stdint=provide ;; ++ *) ;; ++ esac ++ ;; ++ + *-*-elf|arc*-*-elf*) + # Assume that newlib is being used and so __cxa_atexit is provided. + default_use_cxa_atexit=yes +-- +2.49.0 + diff --git a/packages/gcc/14.3.0/0009-gcc-Allow-g-to-work-differently-from-gcc.patch b/packages/gcc/14.3.0/0009-gcc-Allow-g-to-work-differently-from-gcc.patch new file mode 100644 index 0000000000..9e94f94ee2 --- /dev/null +++ b/packages/gcc/14.3.0/0009-gcc-Allow-g-to-work-differently-from-gcc.patch @@ -0,0 +1,68 @@ +From 905b18c94f5792a2e08caa41576f9cb5d1dad526 Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Sat, 11 Feb 2023 23:07:08 -0800 +Subject: [PATCH] gcc: Allow g++ to work differently from gcc + +Compile gcc.cc with -DIN_GPP defined when building g++ so that the +code can respond appropriately for the default target language. This +allows the driver to customize the specs used, selecting different +linker scripts, adjusting the use of crtbegin.o/crtend.o etc. + +By default, this change has no effect; targets need to explicitly +check for IN_GPP to have alternate behavior. + +Signed-off-by: Keith Packard +--- + gcc/cp/Make-lang.in | 7 ++++++- + gcc/gpp.cc | 21 +++++++++++++++++++++ + 2 files changed, 27 insertions(+), 1 deletion(-) + create mode 100644 gcc/gpp.cc + +diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in +index f153891a1ef6..ec980d95e3b4 100644 +--- a/gcc/cp/Make-lang.in ++++ b/gcc/cp/Make-lang.in +@@ -77,7 +77,12 @@ CFLAGS-cp/module.o += -DMODULE_VERSION='$(shell cat s-cp-module-version)' + endif + + # Create the compiler driver for g++. +-GXX_OBJS = $(GCC_OBJS) cp/g++spec.o ++GXX_OBJS = $(GCC_OBJS:gcc.o=gpp.o) cp/g++spec.o ++ ++CFLAGS-gpp.o = $(CFLAGS-gcc.o) ++gpp.o: $(BASEVER) ++gpp.o: gcc.o ++ + xg++$(exeext): $(GXX_OBJS) $(EXTRA_GCC_OBJS) libcommon-target.a $(LIBDEPS) + +$(LINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ \ + $(GXX_OBJS) $(EXTRA_GCC_OBJS) libcommon-target.a \ +diff --git a/gcc/gpp.cc b/gcc/gpp.cc +new file mode 100644 +index 000000000000..3cd7b45e8086 +--- /dev/null ++++ b/gcc/gpp.cc +@@ -0,0 +1,21 @@ ++/* Compiler driver program that can handle many languages. ++ Copyright (C) 1987-2022 Free Software Foundation, Inc. ++ ++This file is part of GCC. ++ ++GCC 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, or (at your option) any later ++version. ++ ++GCC is distributed in the hope that it will be useful, but WITHOUT ANY ++WARRANTY; without even the implied warranty of MERCHANTABILITY or ++FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++for more details. ++ ++You should have received a copy of the GNU General Public License ++along with GCC; see the file COPYING3. If not see ++. */ ++ ++#define IN_GPP ++#include "gcc.cc" +-- +2.49.0 + diff --git a/packages/gcc/14.3.0/0010-libgcc-Exclude-UCLIBC-from-GLIBC-thread-check.patch b/packages/gcc/14.3.0/0010-libgcc-Exclude-UCLIBC-from-GLIBC-thread-check.patch new file mode 100644 index 0000000000..46c6788e4e --- /dev/null +++ b/packages/gcc/14.3.0/0010-libgcc-Exclude-UCLIBC-from-GLIBC-thread-check.patch @@ -0,0 +1,35 @@ +From e1c06be963b4048902ee5c19d589b7619d3c5fa2 Mon Sep 17 00:00:00 2001 +From: Chris Packham +Date: Thu, 7 Sep 2023 19:26:49 +1200 +Subject: [PATCH] libgcc: Exclude UCLIBC from GLIBC thread check + +UBLIBC defines __GLIBC__ but also marks __pthread_key_create() as +protected. Leading to link errors with newer binutils such as: + + ld.bfd: isl_test_cpp17.o: non-canonical reference to canonical protected function `__pthread_key_create' in x86_64-multilib-linux-uclibc/sysroot/lib64/libc.so.1 + ld.bfd: failed to set dynamic section sizes: bad value + +Add a condition on !__UCLIBC__ when selecting a symbol to detect pthread +usage so it picks the intended pthread_cancel(). + +Signed-off-by: Chris Packham +--- + libgcc/gthr-posix.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libgcc/gthr-posix.h b/libgcc/gthr-posix.h +index 82e8f9ffcf66..e63d02fb8dcc 100644 +--- a/libgcc/gthr-posix.h ++++ b/libgcc/gthr-posix.h +@@ -246,7 +246,7 @@ __gthread_active_p (void) + library does not provide pthread_cancel, so we do use pthread_create + there (and interceptor libraries lose). */ + +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !defined(__UCLIBC__) + __gthrw2(__gthrw_(__pthread_key_create), + __pthread_key_create, + pthread_key_create) +-- +2.49.0 + diff --git a/packages/gcc/14.3.0/chksum b/packages/gcc/14.3.0/chksum new file mode 100644 index 0000000000..2db0b8d1c6 --- /dev/null +++ b/packages/gcc/14.3.0/chksum @@ -0,0 +1,8 @@ +md5 gcc-14.3.0.tar.xz 2e2f25966bbb5321bf6a3beafcd241b5 +sha1 gcc-14.3.0.tar.xz e33b9ffb8baf1528d72a8a26a1ee678928ca9121 +sha256 gcc-14.3.0.tar.xz e0dc77297625631ac8e50fa92fffefe899a4eb702592da5c32ef04e2293aca3a +sha512 gcc-14.3.0.tar.xz cb4e3259640721bbd275c723fe4df53d12f9b1673afb3db274c22c6aa457865dccf2d6ea20b4fd4c591f6152e6d4b87516c402015900f06ce9d43af66d3b7a93 +md5 gcc-14.3.0.tar.gz 1ba56546c0274ea75457bf5c00c61506 +sha1 gcc-14.3.0.tar.gz 1866e57122db9f31ba3117175bf50d46d1146eb8 +sha256 gcc-14.3.0.tar.gz ace8b8b0dbfe6abfc22f821cb093e195aa5498b7ccf7cd23e4424b9f14afed22 +sha512 gcc-14.3.0.tar.gz b2c3ab244f809217eb9d71c2b4e7f7e1d9d8b0c8ab3d4c737939075c1fef528cb4629d1cbec717a4839612f3123ca0ebf81af8398fa42a5bf88f99e12bf223b4 diff --git a/packages/gcc/14.2.0/experimental/0001-picolibc-Add-custom-spec-file-fragments-for-using-pi.patch b/packages/gcc/14.3.0/experimental/0001-picolibc-Add-custom-spec-file-fragments-for-using-pi.patch similarity index 100% rename from packages/gcc/14.2.0/experimental/0001-picolibc-Add-custom-spec-file-fragments-for-using-pi.patch rename to packages/gcc/14.3.0/experimental/0001-picolibc-Add-custom-spec-file-fragments-for-using-pi.patch diff --git a/packages/linux/6.5.11/version.desc b/packages/gcc/14.3.0/version.desc similarity index 100% rename from packages/linux/6.5.11/version.desc rename to packages/gcc/14.3.0/version.desc diff --git a/packages/gcc/14.2.0/0000-libtool-leave-framework-alone.patch b/packages/gcc/15.2.0/0000-libtool-leave-framework-alone.patch similarity index 94% rename from packages/gcc/14.2.0/0000-libtool-leave-framework-alone.patch rename to packages/gcc/15.2.0/0000-libtool-leave-framework-alone.patch index 1a86e41576..b5804ea1b1 100644 --- a/packages/gcc/14.2.0/0000-libtool-leave-framework-alone.patch +++ b/packages/gcc/15.2.0/0000-libtool-leave-framework-alone.patch @@ -4,7 +4,7 @@ --- a/libtool-ldflags +++ b/libtool-ldflags -@@ -36,6 +36,11 @@ +@@ -36,6 +36,11 @@ prev_arg= for arg do case $arg in diff --git a/packages/gcc/14.2.0/0001-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc/15.2.0/0001-gcc-plugin-POSIX-include-sys-select-h.patch similarity index 82% rename from packages/gcc/14.2.0/0001-gcc-plugin-POSIX-include-sys-select-h.patch rename to packages/gcc/15.2.0/0001-gcc-plugin-POSIX-include-sys-select-h.patch index 5f9a07a2b5..3040e23c37 100644 --- a/packages/gcc/14.2.0/0001-gcc-plugin-POSIX-include-sys-select-h.patch +++ b/packages/gcc/15.2.0/0001-gcc-plugin-POSIX-include-sys-select-h.patch @@ -4,7 +4,7 @@ --- a/libcc1/connection.cc +++ b/libcc1/connection.cc -@@ -21,6 +21,7 @@ +@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. #include #include #include diff --git a/packages/gcc/14.2.0/0002-arm-softfloat-libgcc.patch b/packages/gcc/15.2.0/0002-arm-softfloat-libgcc.patch similarity index 100% rename from packages/gcc/14.2.0/0002-arm-softfloat-libgcc.patch rename to packages/gcc/15.2.0/0002-arm-softfloat-libgcc.patch diff --git a/packages/gcc/14.2.0/0003-libgcc-disable-split-stack-nothreads.patch b/packages/gcc/15.2.0/0003-libgcc-disable-split-stack-nothreads.patch similarity index 100% rename from packages/gcc/14.2.0/0003-libgcc-disable-split-stack-nothreads.patch rename to packages/gcc/15.2.0/0003-libgcc-disable-split-stack-nothreads.patch diff --git a/packages/gcc/14.2.0/0004-Remove-use-of-include_next-from-c-headers.patch b/packages/gcc/15.2.0/0004-Remove-use-of-include_next-from-c-headers.patch similarity index 69% rename from packages/gcc/14.2.0/0004-Remove-use-of-include_next-from-c-headers.patch rename to packages/gcc/15.2.0/0004-Remove-use-of-include_next-from-c-headers.patch index 429d3bd39b..2612262a34 100644 --- a/packages/gcc/14.2.0/0004-Remove-use-of-include_next-from-c-headers.patch +++ b/packages/gcc/15.2.0/0004-Remove-use-of-include_next-from-c-headers.patch @@ -41,8 +41,8 @@ Signed-off-by: Keith Packard --- a/libstdc++-v3/include/bits/std_abs.h +++ b/libstdc++-v3/include/bits/std_abs.h -@@ -35,9 +35,9 @@ - #include +@@ -41,9 +41,9 @@ + #pragma GCC diagnostic ignored "-Wlong-long" #define _GLIBCXX_INCLUDE_NEXT_C_HEADERS -#include_next @@ -55,159 +55,171 @@ Signed-off-by: Keith Packard --- a/libstdc++-v3/include/c/cassert +++ b/libstdc++-v3/include/c/cassert -@@ -31,4 +31,4 @@ - #pragma GCC system_header +@@ -36,6 +36,6 @@ + #pragma GCC diagnostic ignored "-Wpedantic" // include_next #include -#include_next +#include + + #pragma GCC diagnostic pop --- a/libstdc++-v3/include/c/cctype +++ b/libstdc++-v3/include/c/cctype -@@ -31,6 +31,6 @@ - - #pragma GCC system_header +@@ -36,7 +36,7 @@ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wpedantic" // include_next -#include_next +#include - #endif + #pragma GCC diagnostic pop + --- a/libstdc++-v3/include/c/cerrno +++ b/libstdc++-v3/include/c/cerrno -@@ -41,7 +41,7 @@ - #pragma GCC system_header +@@ -46,7 +46,7 @@ + #pragma GCC diagnostic ignored "-Wpedantic" // include_next #include -#include_next +#include - // Adhere to section 17.4.1.2 clause 5 of ISO 14882:1998 - #ifndef errno + #pragma GCC diagnostic pop + --- a/libstdc++-v3/include/c/cfloat +++ b/libstdc++-v3/include/c/cfloat -@@ -32,6 +32,6 @@ - #pragma GCC system_header +@@ -37,7 +37,7 @@ + #pragma GCC diagnostic ignored "-Wpedantic" // include_next #include -#include_next +#include - #endif + #pragma GCC diagnostic pop + --- a/libstdc++-v3/include/c/climits +++ b/libstdc++-v3/include/c/climits -@@ -32,6 +32,6 @@ - #pragma GCC system_header +@@ -37,7 +37,7 @@ + #pragma GCC diagnostic ignored "-Wpedantic" // include_next #include -#include_next +#include - #endif + #pragma GCC diagnostic pop + --- a/libstdc++-v3/include/c/clocale +++ b/libstdc++-v3/include/c/clocale -@@ -31,6 +31,6 @@ - - #pragma GCC system_header +@@ -36,7 +36,7 @@ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wpedantic" // include_next -#include_next +#include - #endif + #pragma GCC diagnostic pop + --- a/libstdc++-v3/include/c/cmath +++ b/libstdc++-v3/include/c/cmath -@@ -33,7 +33,7 @@ - - #include +@@ -38,7 +38,7 @@ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wpedantic" // include_next -#include_next +#include - // Get rid of those macros defined in in lieu of real functions. - #undef abs + #pragma GCC diagnostic pop + --- a/libstdc++-v3/include/c/csetjmp +++ b/libstdc++-v3/include/c/csetjmp -@@ -31,7 +31,7 @@ - - #pragma GCC system_header +@@ -36,7 +36,7 @@ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wpedantic" // include_next -#include_next +#include - // Get rid of those macros defined in in lieu of real functions. - #undef longjmp + #pragma GCC diagnostic pop + --- a/libstdc++-v3/include/c/csignal +++ b/libstdc++-v3/include/c/csignal -@@ -31,6 +31,6 @@ - - #pragma GCC system_header +@@ -36,7 +36,7 @@ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wpedantic" // include_next -#include_next +#include - #endif + #pragma GCC diagnostic pop + --- a/libstdc++-v3/include/c/cstdarg +++ b/libstdc++-v3/include/c/cstdarg -@@ -32,6 +32,6 @@ - #pragma GCC system_header +@@ -37,7 +37,7 @@ + #pragma GCC diagnostic ignored "-Wpedantic" // include_next #undef __need___va_list -#include_next +#include - #endif + #pragma GCC diagnostic pop + --- a/libstdc++-v3/include/c/cstddef +++ b/libstdc++-v3/include/c/cstddef -@@ -35,6 +35,6 @@ +@@ -40,7 +40,7 @@ #define __need_ptrdiff_t #define __need_NULL #define __need_offsetof -#include_next +#include - #endif + #pragma GCC diagnostic pop + --- a/libstdc++-v3/include/c/cstdio +++ b/libstdc++-v3/include/c/cstdio -@@ -31,7 +31,7 @@ - - #pragma GCC system_header +@@ -36,7 +36,7 @@ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wpedantic" // include_next -#include_next +#include - // Get rid of those macros defined in in lieu of real functions. - #undef clearerr + #pragma GCC diagnostic pop + --- a/libstdc++-v3/include/c/cstdlib +++ b/libstdc++-v3/include/c/cstdlib -@@ -31,6 +31,6 @@ - - #pragma GCC system_header +@@ -36,7 +36,7 @@ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wpedantic" // include_next -#include_next +#include - #endif + #pragma GCC diagnostic pop + --- a/libstdc++-v3/include/c/cstring +++ b/libstdc++-v3/include/c/cstring -@@ -31,6 +31,6 @@ - - #pragma GCC system_header +@@ -36,7 +36,7 @@ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wpedantic" // include_next -#include_next +#include - #endif + #pragma GCC diagnostic pop + --- a/libstdc++-v3/include/c/ctime +++ b/libstdc++-v3/include/c/ctime -@@ -31,6 +31,6 @@ - - #pragma GCC system_header +@@ -36,7 +36,7 @@ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wpedantic" // include_next -#include_next +#include - #endif + #pragma GCC diagnostic pop + --- a/libstdc++-v3/include/c/cuchar +++ b/libstdc++-v3/include/c/cuchar -@@ -39,7 +39,7 @@ +@@ -41,7 +41,7 @@ #include #if _GLIBCXX_USE_C11_UCHAR_CXX11 @@ -218,18 +230,18 @@ Signed-off-by: Keith Packard #endif // C++11 --- a/libstdc++-v3/include/c/cwchar +++ b/libstdc++-v3/include/c/cwchar -@@ -36,7 +36,7 @@ - #include +@@ -41,7 +41,7 @@ + #pragma GCC diagnostic ignored "-Wpedantic" // include_next #if _GLIBCXX_HAVE_WCHAR_H -#include_next +#include #endif - // Need to do a bit of trickery here with mbstate_t as char_traits + #pragma GCC diagnostic pop --- a/libstdc++-v3/include/c/cwctype +++ b/libstdc++-v3/include/c/cwctype -@@ -34,7 +34,7 @@ +@@ -39,7 +39,7 @@ #include #if _GLIBCXX_HAVE_WCTYPE_H @@ -237,26 +249,26 @@ Signed-off-by: Keith Packard +#include #endif - #endif + #pragma GCC diagnostic pop --- a/libstdc++-v3/include/c_global/cmath +++ b/libstdc++-v3/include/c_global/cmath -@@ -44,7 +44,7 @@ - #include - #include +@@ -52,7 +52,7 @@ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wpedantic" // include_next #define _GLIBCXX_INCLUDE_NEXT_C_HEADERS -#include_next +#include #undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS - #include + #pragma GCC diagnostic pop --- a/libstdc++-v3/include/c_global/cstdlib +++ b/libstdc++-v3/include/c_global/cstdlib -@@ -76,7 +76,7 @@ - // Need to ensure this finds the C library's not a libstdc++ - // wrapper that might already be installed later in the include search path. +@@ -80,7 +80,7 @@ namespace std + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wpedantic" // include_next #define _GLIBCXX_INCLUDE_NEXT_C_HEADERS -#include_next +#include #undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS - #include + #pragma GCC diagnostic pop diff --git a/packages/gcc/14.2.0/0005-Allow-default-libc-to-be-specified-to-configure.patch b/packages/gcc/15.2.0/0005-Allow-default-libc-to-be-specified-to-configure.patch similarity index 92% rename from packages/gcc/14.2.0/0005-Allow-default-libc-to-be-specified-to-configure.patch rename to packages/gcc/15.2.0/0005-Allow-default-libc-to-be-specified-to-configure.patch index 9a7a2a855c..4dee0f3822 100644 --- a/packages/gcc/14.2.0/0005-Allow-default-libc-to-be-specified-to-configure.patch +++ b/packages/gcc/15.2.0/0005-Allow-default-libc-to-be-specified-to-configure.patch @@ -21,7 +21,7 @@ Signed-off-by: Keith Packard --- a/gcc/config.gcc +++ b/gcc/config.gcc -@@ -695,6 +695,8 @@ +@@ -696,6 +696,8 @@ esac # Common C libraries. tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4" @@ -30,7 +30,7 @@ Signed-off-by: Keith Packard # 32-bit x86 processors supported by --with-arch=. Each processor # MUST be separated by exactly one space. x86_archs="athlon athlon-4 athlon-fx athlon-mp athlon-tbird \ -@@ -911,16 +913,16 @@ +@@ -912,16 +914,16 @@ case ${target} in esac case $target in *-*-*android*) @@ -51,7 +51,7 @@ Signed-off-by: Keith Packard ;; esac # Assume that glibc or uClibc or Bionic are being used and so __cxa_atexit -@@ -1035,7 +1037,8 @@ +@@ -1036,7 +1038,8 @@ case ${target} in case ${enable_threads} in "" | yes | posix) thread_file='posix' ;; esac @@ -61,7 +61,7 @@ Signed-off-by: Keith Packard ;; *-*-rdos*) use_gcc_stdint=wrap -@@ -1721,13 +1724,13 @@ +@@ -1747,13 +1750,13 @@ csky-*-*) case ${target} in csky-*-linux-gnu*) @@ -77,7 +77,7 @@ Signed-off-by: Keith Packard default_use_cxa_atexit=no ;; *) -@@ -3125,7 +3128,7 @@ +@@ -3144,7 +3147,7 @@ powerpc*-wrs-vxworks7r*) tmake_file="${tmake_file} t-linux rs6000/t-linux64 rs6000/t-fprules rs6000/t-ppccomm" tmake_file="${tmake_file} rs6000/t-vxworks" @@ -86,7 +86,7 @@ Signed-off-by: Keith Packard extra_objs="$extra_objs linux.o rs6000-linux.o" ;; powerpc-wrs-vxworks*) -@@ -6079,3 +6082,32 @@ +@@ -6161,3 +6164,32 @@ i[34567]86-*-* | x86_64-*-*) fi ;; esac @@ -121,7 +121,7 @@ Signed-off-by: Keith Packard +esac --- a/gcc/configure.ac +++ b/gcc/configure.ac -@@ -2546,6 +2546,10 @@ +@@ -2582,6 +2582,10 @@ if { { test x$host != x$target && test " fi AC_SUBST(inhibit_libc) diff --git a/packages/gcc/14.2.0/0006-driver-Extend-getenv-function-to-allow-default-value.patch b/packages/gcc/15.2.0/0006-driver-Extend-getenv-function-to-allow-default-value.patch similarity index 96% rename from packages/gcc/14.2.0/0006-driver-Extend-getenv-function-to-allow-default-value.patch rename to packages/gcc/15.2.0/0006-driver-Extend-getenv-function-to-allow-default-value.patch index 955ff3cad4..cd29b91cc3 100644 --- a/packages/gcc/14.2.0/0006-driver-Extend-getenv-function-to-allow-default-value.patch +++ b/packages/gcc/15.2.0/0006-driver-Extend-getenv-function-to-allow-default-value.patch @@ -40,7 +40,7 @@ Signed-off-by: Keith Packard --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi -@@ -36963,17 +36963,21 @@ +@@ -37564,17 +37564,21 @@ The following built-in spec functions ar @table @code @item @code{getenv} @@ -71,7 +71,7 @@ Signed-off-by: Keith Packard The @code{if-exists} spec function takes one argument, an absolute --- a/gcc/gcc.cc +++ b/gcc/gcc.cc -@@ -10300,12 +10300,20 @@ +@@ -10338,12 +10338,20 @@ getenv_spec_function (int argc, const ch char *ptr; size_t len; diff --git a/packages/gcc/14.2.0/0007-Add-newlib-and-picolibc-as-default-C-library-choices.patch b/packages/gcc/15.2.0/0007-Add-newlib-and-picolibc-as-default-C-library-choices.patch similarity index 93% rename from packages/gcc/14.2.0/0007-Add-newlib-and-picolibc-as-default-C-library-choices.patch rename to packages/gcc/15.2.0/0007-Add-newlib-and-picolibc-as-default-C-library-choices.patch index 5443630b9f..2f839fad72 100644 --- a/packages/gcc/14.2.0/0007-Add-newlib-and-picolibc-as-default-C-library-choices.patch +++ b/packages/gcc/15.2.0/0007-Add-newlib-and-picolibc-as-default-C-library-choices.patch @@ -10,7 +10,7 @@ Signed-off-by: Keith Packard --- a/gcc/config.gcc +++ b/gcc/config.gcc -@@ -693,7 +693,7 @@ +@@ -694,7 +694,7 @@ case ${target} in esac # Common C libraries. @@ -19,7 +19,7 @@ Signed-off-by: Keith Packard default_libc="" -@@ -6096,6 +6096,15 @@ +@@ -6178,6 +6178,15 @@ bionic) musl) default_libc=LIBC_MUSL ;; diff --git a/packages/gcc/14.2.0/0008-Support-picolibc-targets.patch b/packages/gcc/15.2.0/0008-Support-picolibc-targets.patch similarity index 95% rename from packages/gcc/14.2.0/0008-Support-picolibc-targets.patch rename to packages/gcc/15.2.0/0008-Support-picolibc-targets.patch index 987baf39d9..c52c68d5d7 100644 --- a/packages/gcc/14.2.0/0008-Support-picolibc-targets.patch +++ b/packages/gcc/15.2.0/0008-Support-picolibc-targets.patch @@ -13,7 +13,7 @@ Signed-off-by: Keith Packard --- a/gcc/config.gcc +++ b/gcc/config.gcc -@@ -1168,6 +1168,17 @@ +@@ -1165,6 +1165,17 @@ case ${target} in ;; esac ;; diff --git a/packages/gcc/14.2.0/0009-gcc-Allow-g-to-work-differently-from-gcc.patch b/packages/gcc/15.2.0/0009-gcc-Allow-g-to-work-differently-from-gcc.patch similarity index 97% rename from packages/gcc/14.2.0/0009-gcc-Allow-g-to-work-differently-from-gcc.patch rename to packages/gcc/15.2.0/0009-gcc-Allow-g-to-work-differently-from-gcc.patch index 57a22f98fb..483a2280a8 100644 --- a/packages/gcc/14.2.0/0009-gcc-Allow-g-to-work-differently-from-gcc.patch +++ b/packages/gcc/15.2.0/0009-gcc-Allow-g-to-work-differently-from-gcc.patch @@ -20,7 +20,7 @@ Signed-off-by: Keith Packard --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in -@@ -77,7 +77,12 @@ +@@ -77,7 +77,12 @@ CFLAGS-cp/module.o += -DMODULE_VERSION=' endif # Create the compiler driver for g++. diff --git a/packages/gcc/14.2.0/0010-libgcc-Exclude-UCLIBC-from-GLIBC-thread-check.patch b/packages/gcc/15.2.0/0010-libgcc-Exclude-UCLIBC-from-GLIBC-thread-check.patch similarity index 96% rename from packages/gcc/14.2.0/0010-libgcc-Exclude-UCLIBC-from-GLIBC-thread-check.patch rename to packages/gcc/15.2.0/0010-libgcc-Exclude-UCLIBC-from-GLIBC-thread-check.patch index c0a32648e0..f5c3e1fd71 100644 --- a/packages/gcc/14.2.0/0010-libgcc-Exclude-UCLIBC-from-GLIBC-thread-check.patch +++ b/packages/gcc/15.2.0/0010-libgcc-Exclude-UCLIBC-from-GLIBC-thread-check.patch @@ -19,7 +19,7 @@ Signed-off-by: Chris Packham --- a/libgcc/gthr-posix.h +++ b/libgcc/gthr-posix.h -@@ -246,7 +246,7 @@ +@@ -270,7 +270,7 @@ __gthread_active_p (void) library does not provide pthread_cancel, so we do use pthread_create there (and interceptor libraries lose). */ diff --git a/packages/gcc/15.2.0/0011-zlib-darwin-fdopen.patch b/packages/gcc/15.2.0/0011-zlib-darwin-fdopen.patch new file mode 100644 index 0000000000..988eb723b7 --- /dev/null +++ b/packages/gcc/15.2.0/0011-zlib-darwin-fdopen.patch @@ -0,0 +1,30 @@ +From 0ddaa7b241d91b0a23ea6c3edc8a0990a77b6b5f Mon Sep 17 00:00:00 2001 +From: Ahmed ARIF +Date: Sat, 20 Dec 2025 22:25:00 +0100 +Subject: [PATCH] zlib: do not redefine fdopen on Darwin + +Apple clang predefines TARGET_OS_MAC, which triggers the classic-Mac +fallback in zutil.h that defines fdopen() to NULL. When stdio.h is later +included, the fdopen prototype gets macro-expanded and the build fails. + +Skip the classic-Mac block on Darwin (where fdopen is available). +--- + zlib/zutil.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/zlib/zutil.h b/zlib/zutil.h +index 0b5b8ad..4e5f4f3 100644 +--- a/zlib/zutil.h ++++ b/zlib/zutil.h +@@ -131,7 +131,7 @@ + #endif + +-#if defined(MACOS) || defined(TARGET_OS_MAC) ++#if (defined(MACOS) || defined(TARGET_OS_MAC)) && !(defined(__APPLE__) && defined(__MACH__)) + # define OS_CODE 7 + # ifndef Z_SOLO + # if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os + # include /* for fdopen */ +-- +2.50.1 + diff --git a/packages/gcc/15.2.0/0020-aarch64-mingw-fix-exception-handling.patch b/packages/gcc/15.2.0/0020-aarch64-mingw-fix-exception-handling.patch new file mode 100644 index 0000000000..cc416e831d --- /dev/null +++ b/packages/gcc/15.2.0/0020-aarch64-mingw-fix-exception-handling.patch @@ -0,0 +1,24 @@ +From: Ahmed ARIF +Date: Thu, 18 Sep 2025 12:00:00 +0000 +Subject: [PATCH] aarch64-mingw: Fix exception handling to respect configure options + +The aarch64-mingw configuration was hardcoding DWARF2_UNWIND_INFO to 0, +forcing SJLJ exceptions regardless of configure options. This patch makes +it respect --disable-sjlj-exceptions like i386-mingw does. + +--- a/gcc/config/aarch64/cygming.h ++++ b/gcc/config/aarch64/cygming.h +@@ -26,8 +26,13 @@ along with GCC; see the file COPYING3. If not see + #undef PREFERRED_DEBUGGING_TYPE + #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG + +-#undef DWARF2_UNWIND_INFO ++#ifndef DWARF2_UNWIND_INFO ++#if (defined (CONFIG_SJLJ_EXCEPTIONS) && !CONFIG_SJLJ_EXCEPTIONS) ++#define DWARF2_UNWIND_INFO 1 ++#else + #define DWARF2_UNWIND_INFO 0 ++#endif ++#endif + + #define FASTCALL_PREFIX '@' diff --git a/packages/gcc/15.2.0/0021-aarch64-Bypass-some-warnings-in-MinGW.patch b/packages/gcc/15.2.0/0021-aarch64-Bypass-some-warnings-in-MinGW.patch new file mode 100644 index 0000000000..8eee30e6da --- /dev/null +++ b/packages/gcc/15.2.0/0021-aarch64-Bypass-some-warnings-in-MinGW.patch @@ -0,0 +1,20 @@ +From 1a6a99e9d9cf5f4672bf2b8a96df28ed4e6f0fb3 Mon Sep 17 00:00:00 2001 +From: Ahmed ARIF +Date: Sun, 21 Sep 2025 16:35:43 +0200 +Subject: [PATCH] Apply 0021-aarch64-Bypass-some-warnings-in-MinGW + +--- + libgcc/config/aarch64/t-mingw | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libgcc/config/aarch64/t-mingw b/libgcc/config/aarch64/t-mingw +index a72a2f701..cff4f8cea 100644 +--- a/libgcc/config/aarch64/t-mingw ++++ b/libgcc/config/aarch64/t-mingw +@@ -1,2 +1,2 @@ + # Bypass hidden attribute warnings in MinGW until it is implemented +-LIBGCC2_CFLAGS += -Wno-error=attributes ++LIBGCC2_CFLAGS += -Wno-error=attributes -Wno-error=missing-prototypes +-- +2.48.1 + diff --git a/packages/gcc/15.2.0/0022-aarch64-Add-stdcall-and-cdecl-attributes.patch b/packages/gcc/15.2.0/0022-aarch64-Add-stdcall-and-cdecl-attributes.patch new file mode 100644 index 0000000000..2b83eb838b --- /dev/null +++ b/packages/gcc/15.2.0/0022-aarch64-Add-stdcall-and-cdecl-attributes.patch @@ -0,0 +1,25 @@ +From f63c04752f8692e317c5f0b294121f2b7287399e Mon Sep 17 00:00:00 2001 +From: Ahmed ARIF +Date: Sun, 21 Sep 2025 16:35:57 +0200 +Subject: [PATCH] Apply 0022-aarch64-Add-stdcall-and-cdecl-attributes + +--- + gcc/config/aarch64/aarch64.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc +index 6d6b6552a..767a8bec6 100644 +--- a/gcc/config/aarch64/aarch64.cc ++++ b/gcc/config/aarch64/aarch64.cc +@@ -870,6 +870,8 @@ static const attribute_spec aarch64_gnu_attributes[] = + { "Advanced SIMD type", 1, 1, false, true, false, true, NULL, NULL }, + { "SVE type", 3, 3, false, true, false, true, NULL, NULL }, + { "SVE sizeless type", 0, 0, false, true, false, true, NULL, NULL }, ++ { "cdecl", 0, 0, false, false, false, false, NULL, NULL }, ++ { "stdcall", 0, 0, false, false, false, false, NULL, NULL }, + #if TARGET_DLLIMPORT_DECL_ATTRIBUTES + { "dllimport", 0, 0, false, false, false, false, handle_dll_attribute, NULL }, + { "dllexport", 0, 0, false, false, false, false, handle_dll_attribute, NULL }, +-- +2.48.1 + diff --git a/packages/gcc/15.2.0/0023-Rename-SEH-functions-for-reuse-in-AArch64.patch b/packages/gcc/15.2.0/0023-Rename-SEH-functions-for-reuse-in-AArch64.patch new file mode 100644 index 0000000000..dc750541e9 --- /dev/null +++ b/packages/gcc/15.2.0/0023-Rename-SEH-functions-for-reuse-in-AArch64.patch @@ -0,0 +1,235 @@ +From b6286a17be0340781180fd3098a840c61c026de7 Mon Sep 17 00:00:00 2001 +From: Ahmed ARIF +Date: Sun, 21 Sep 2025 16:39:37 +0200 +Subject: [PATCH] Apply 0023-Rename-SEH-functions-for-reuse-in-AArch64 + +--- + gcc/config/i386/cygming.h | 14 +++++++------- + gcc/config/i386/i386-protos.h | 7 ------- + gcc/config/mingw/winnt.cc | 20 ++++++++++---------- + gcc/config/mingw/winnt.h | 7 +++++++ + libgcc/config.host | 4 ++-- + libgcc/config/i386/t-seh-eh | 6 ------ + libgcc/config/mingw/t-seh-eh | 6 ++++++ + 7 files changed, 32 insertions(+), 32 deletions(-) + delete mode 100644 libgcc/config/i386/t-seh-eh + create mode 100644 libgcc/config/mingw/t-seh-eh + +diff --git a/gcc/config/i386/cygming.h b/gcc/config/i386/cygming.h +index 3ddcbecb2..172c986d6 100644 +--- a/gcc/config/i386/cygming.h ++++ b/gcc/config/i386/cygming.h +@@ -44,12 +44,12 @@ along with GCC; see the file COPYING3. If not see + #undef TARGET_ASM_UNWIND_EMIT_BEFORE_INSN + #define TARGET_ASM_UNWIND_EMIT_BEFORE_INSN false + #undef TARGET_ASM_FUNCTION_END_PROLOGUE +-#define TARGET_ASM_FUNCTION_END_PROLOGUE i386_pe_seh_end_prologue ++#define TARGET_ASM_FUNCTION_END_PROLOGUE mingw_pe_seh_end_prologue + #undef TARGET_ASM_EMIT_EXCEPT_PERSONALITY +-#define TARGET_ASM_EMIT_EXCEPT_PERSONALITY i386_pe_seh_emit_except_personality ++#define TARGET_ASM_EMIT_EXCEPT_PERSONALITY mingw_pe_seh_emit_except_personality + #undef TARGET_ASM_INIT_SECTIONS +-#define TARGET_ASM_INIT_SECTIONS i386_pe_seh_init_sections +-#define SUBTARGET_ASM_UNWIND_INIT i386_pe_seh_init ++#define TARGET_ASM_INIT_SECTIONS mingw_pe_seh_init_sections ++#define SUBTARGET_ASM_UNWIND_INIT mingw_pe_seh_init + + #undef DEFAULT_ABI + #define DEFAULT_ABI (TARGET_64BIT ? MS_ABI : SYSV_ABI) +@@ -310,18 +310,18 @@ do { \ + do \ + { \ + mingw_pe_declare_type (FILE, NAME, 0, 1); \ +- i386_pe_seh_cold_init (FILE, NAME); \ ++ mingw_pe_seh_cold_init (FILE, NAME); \ + ASM_OUTPUT_LABEL (FILE, NAME); \ + } \ + while (0) + + #undef ASM_DECLARE_FUNCTION_SIZE + #define ASM_DECLARE_FUNCTION_SIZE(FILE,NAME,DECL) \ +- i386_pe_end_function (FILE, NAME, DECL) ++ mingw_pe_end_function (FILE, NAME, DECL) + + #undef ASM_DECLARE_COLD_FUNCTION_SIZE + #define ASM_DECLARE_COLD_FUNCTION_SIZE(FILE,NAME,DECL) \ +- i386_pe_end_cold_function (FILE, NAME, DECL) ++ mingw_pe_end_cold_function (FILE, NAME, DECL) + + /* Add an external function to the list of functions to be declared at + the end of the file. */ +diff --git a/gcc/config/i386/i386-protos.h b/gcc/config/i386/i386-protos.h +index bea3fd4b2..1b7db0ee8 100644 +--- a/gcc/config/i386/i386-protos.h ++++ b/gcc/config/i386/i386-protos.h +@@ -321,18 +321,11 @@ extern void i386_pe_asm_output_aligned_decl_common (FILE *, tree, + HOST_WIDE_INT, + HOST_WIDE_INT); + extern void i386_pe_start_function (FILE *, const char *, tree); +-extern void i386_pe_end_function (FILE *, const char *, tree); +-extern void i386_pe_end_cold_function (FILE *, const char *, tree); + extern void i386_pe_assemble_visibility (tree, int); + extern tree i386_pe_mangle_decl_assembler_name (tree, tree); + extern tree i386_pe_mangle_assembler_name (const char *); + +-extern void i386_pe_seh_init (FILE *); +-extern void i386_pe_seh_end_prologue (FILE *); +-extern void i386_pe_seh_cold_init (FILE *, const char *); + extern void i386_pe_seh_unwind_emit (FILE *, rtx_insn *); +-extern void i386_pe_seh_emit_except_personality (rtx); +-extern void i386_pe_seh_init_sections (void); + + /* In winnt-cxx.cc and winnt-stubs.cc */ + extern void i386_pe_adjust_class_at_definition (tree); +diff --git a/gcc/config/mingw/winnt.cc b/gcc/config/mingw/winnt.cc +index 08a761d3a..79c0471d7 100644 +--- a/gcc/config/mingw/winnt.cc ++++ b/gcc/config/mingw/winnt.cc +@@ -882,7 +882,7 @@ struct seh_frame_state + /* Set up data structures beginning output for SEH. */ + + void +-i386_pe_seh_init (FILE *f) ++mingw_pe_seh_init (FILE *f) + { + struct seh_frame_state *seh; + +@@ -910,7 +910,7 @@ i386_pe_seh_init (FILE *f) + /* Emit an assembler directive for the end of the prologue. */ + + void +-i386_pe_seh_end_prologue (FILE *f) ++mingw_pe_seh_end_prologue (FILE *f) + { + if (!TARGET_SEH) + return; +@@ -923,7 +923,7 @@ i386_pe_seh_end_prologue (FILE *f) + /* Emit assembler directives to reconstruct the SEH state. */ + + void +-i386_pe_seh_cold_init (FILE *f, const char *name) ++mingw_pe_seh_cold_init (FILE *f, const char *name) + { + struct seh_frame_state *seh; + HOST_WIDE_INT alloc_offset, offset; +@@ -1006,7 +1006,7 @@ i386_pe_seh_cold_init (FILE *f, const char *name) + /* Emit an assembler directive for the end of the function. */ + + static void +-i386_pe_seh_fini (FILE *f, bool cold) ++mingw_pe_seh_fini (FILE *f, bool cold) + { + struct seh_frame_state *seh; + +@@ -1330,7 +1330,7 @@ i386_pe_seh_unwind_emit (FILE *out_file, rtx_insn *insn) + } + + void +-i386_pe_seh_emit_except_personality (rtx personality) ++mingw_pe_seh_emit_except_personality (rtx personality) + { + int flags = 0; + +@@ -1364,7 +1364,7 @@ i386_pe_seh_emit_except_personality (rtx personality) + } + + void +-i386_pe_seh_init_sections (void) ++mingw_pe_seh_init_sections (void) + { + if (TARGET_SEH) + exception_section = get_unnamed_section (0, output_section_asm_op, +@@ -1383,15 +1383,15 @@ i386_pe_start_function (FILE *f, const char *name, tree decl) + } + + void +-i386_pe_end_function (FILE *f, const char *, tree) ++mingw_pe_end_function (FILE *f, const char *, tree) + { +- i386_pe_seh_fini (f, false); ++ mingw_pe_seh_fini (f, false); + } + + void +-i386_pe_end_cold_function (FILE *f, const char *, tree) ++mingw_pe_end_cold_function (FILE *f, const char *, tree) + { +- i386_pe_seh_fini (f, true); ++ mingw_pe_seh_fini (f, true); + } + + #include "gt-winnt.h" +diff --git a/gcc/config/mingw/winnt.h b/gcc/config/mingw/winnt.h +index fa2d6c09a..c95ee429d 100644 +--- a/gcc/config/mingw/winnt.h ++++ b/gcc/config/mingw/winnt.h +@@ -27,6 +27,8 @@ extern void mingw_pe_asm_lto_start (void); + extern void mingw_pe_asm_lto_end (void); + extern void mingw_pe_declare_type (FILE *, const char *, bool, bool); + extern void mingw_pe_encode_section_info (tree, rtx, int); ++extern void mingw_pe_end_cold_function (FILE *, const char *, tree); ++extern void mingw_pe_end_function (FILE *, const char *, tree); + extern void mingw_pe_file_end (void); + extern void mingw_pe_maybe_record_exported_symbol (tree, const char *, int); + extern void mingw_pe_record_stub (const char *, bool); +@@ -34,6 +36,11 @@ extern unsigned int mingw_pe_section_type_flags (tree, const char *, int); + extern void mingw_pe_unique_section (tree, int); + extern bool mingw_pe_valid_dllimport_attribute_p (const_tree); + ++extern void mingw_pe_seh_init (FILE *); ++extern void mingw_pe_seh_init_sections (void); ++extern void mingw_pe_seh_cold_init (FILE *, const char *); ++extern void mingw_pe_seh_emit_except_personality (rtx); ++extern void mingw_pe_seh_end_prologue (FILE *); + #endif /* not USED_FOR_TARGET. */ + + #endif /* GCC_MINGW_WINNT_H. */ +diff --git a/libgcc/config.host b/libgcc/config.host +index 6a88ee5a2..d59d06c49 100644 +--- a/libgcc/config.host ++++ b/libgcc/config.host +@@ -880,7 +880,7 @@ x86_64-*-cygwin*) + # biarch -m32 with --disable-sjlj-exceptions + tmake_eh_file="i386/t-dw2-eh" + else +- tmake_eh_file="i386/t-seh-eh" ++ tmake_eh_file="mingw/t-seh-eh" + fi + # Shared libgcc DLL install dir depends on cross/native build. + if test x${build} = x${host} ; then +@@ -942,7 +942,7 @@ x86_64-*-mingw*) + tmake_eh_file="i386/t-dw2-eh" + md_unwind_header=i386/w32-unwind.h + else +- tmake_eh_file="i386/t-seh-eh" ++ tmake_eh_file="mingw/t-seh-eh" + fi + # Shared libgcc DLL install dir depends on cross/native build. + if test x${build} = x${host} ; then +diff --git a/libgcc/config/i386/t-seh-eh b/libgcc/config/i386/t-seh-eh +deleted file mode 100644 +index 28b2411..0000000 +--- a/libgcc/config/i386/t-seh-eh ++++ /dev/null +@@ -1,6 +0,0 @@ +- +-# We are using SEH EH. +-EH_MODEL = seh +- +-# Use SEH exception handling. +-LIB2ADDEH = $(srcdir)/unwind-seh.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c +diff --git a/libgcc/config/mingw/t-seh-eh b/libgcc/config/mingw/t-seh-eh +new file mode 100644 +index 0000000..28b2411 +--- /dev/null ++++ b/libgcc/config/mingw/t-seh-eh +@@ -0,0 +1,6 @@ ++ ++# We are using SEH EH. ++EH_MODEL = seh ++ ++# Use SEH exception handling. ++LIB2ADDEH = $(srcdir)/unwind-seh.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c +-- +2.48.1 + diff --git a/packages/gcc/15.2.0/0024-aarch64-Add-SEH-stack-unwinding-and-C-exceptions.patch b/packages/gcc/15.2.0/0024-aarch64-Add-SEH-stack-unwinding-and-C-exceptions.patch new file mode 100644 index 0000000000..61c4abe2b9 --- /dev/null +++ b/packages/gcc/15.2.0/0024-aarch64-Add-SEH-stack-unwinding-and-C-exceptions.patch @@ -0,0 +1,609 @@ +From 777e0c512b1159c501023a91d458f7610461dcad Mon Sep 17 00:00:00 2001 +From: Ahmed ARIF +Date: Sun, 21 Sep 2025 17:03:21 +0200 +Subject: [PATCH] Apply 0024-aarch64-Add-SEH-stack-unwinding-and-C++ exceptions + +--- + gcc/common/config/aarch64/aarch64-common.cc | 30 +++ + gcc/config/aarch64/aarch64.cc | 15 ++ + gcc/config/aarch64/cygming.h | 51 +++- + gcc/config/mingw/winnt.cc | 258 +++++++++++++++++++- + libgcc/config.host | 2 +- + libgcc/unwind-seh.c | 37 ++- + 6 files changed, 380 insertions(+), 13 deletions(-) + +diff --git a/gcc/common/config/aarch64/aarch64-common.cc b/gcc/common/config/aarch64/aarch64-common.cc +index b9ed83642..431e9b858 100644 +--- a/gcc/common/config/aarch64/aarch64-common.cc ++++ b/gcc/common/config/aarch64/aarch64-common.cc +@@ -811,6 +811,36 @@ is_host_cpu_not_armv8_base (int argc, const char **argv) + return ""; + } + ++#if TARGET_AARCH64_MS_ABI ++ ++/* Implement TARGET_EXCEPT_UNWIND_INFO. */ ++ ++static enum unwind_info_type ++aarch64_except_unwind_info (struct gcc_options *opts) ++{ ++ /* Honor the --enable-sjlj-exceptions configure switch. */ ++#ifdef CONFIG_SJLJ_EXCEPTIONS ++ if (CONFIG_SJLJ_EXCEPTIONS) ++ return UI_SJLJ; ++#endif ++ ++ /* On windows 64, prefer SEH exceptions over anything else. */ ++#if defined (TARGET_AARCH64_MS_ABI) ++ if (opts->x_flag_unwind_tables) ++ return UI_SEH; ++#endif ++ ++ if (DWARF2_UNWIND_INFO) ++ return UI_DWARF2; ++ ++ return UI_SJLJ; ++} ++ ++#undef TARGET_EXCEPT_UNWIND_INFO ++#define TARGET_EXCEPT_UNWIND_INFO aarch64_except_unwind_info ++ ++#endif // TARGET_AARCH64_MS_ABI ++ + struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER; + + #undef AARCH64_CPU_NAME_LENGTH +diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc +index 767a8bec6..c9a103de5 100644 +--- a/gcc/config/aarch64/aarch64.cc ++++ b/gcc/config/aarch64/aarch64.cc +@@ -12963,6 +12963,12 @@ aarch64_label_mentioned_p (rtx x) + return 0; + } + ++void ++aarch64_print_reg (rtx x, int code, FILE *file) ++{ ++ aarch64_print_operand (file, x, code); ++} ++ + /* Implement REGNO_REG_CLASS. */ + + enum reg_class +@@ -18698,6 +18704,12 @@ aarch64_override_options_after_change_1 (struct gcc_options *opts) + intermediary step for the former. */ + if (flag_mlow_precision_sqrt) + flag_mrecip_low_precision_sqrt = true; ++ ++ /* Enable unwind tables for MS. */ ++#if defined (TARGET_AARCH64_MS_ABI) ++ if (opts->x_flag_unwind_tables == 0) ++ opts->x_flag_unwind_tables = 1; ++#endif // TARGET_AARCH64_MS_ABI + } + + /* 'Unpack' up the internal tuning structs and update the options +@@ -25153,6 +25165,9 @@ aarch64_declare_function_name (FILE *stream, const char* name, + + /* Don't forget the type directive for ELF. */ + ASM_OUTPUT_TYPE_DIRECTIVE (stream, name, "function"); ++#ifdef SUBTARGET_ASM_UNWIND_INIT ++ SUBTARGET_ASM_UNWIND_INIT (stream); ++#endif + ASM_OUTPUT_FUNCTION_LABEL (stream, name, fndecl); + + cfun->machine->label_is_assembled = true; +diff --git a/gcc/config/aarch64/cygming.h b/gcc/config/aarch64/cygming.h +index 47c231395..5ba8a574d 100644 +--- a/gcc/config/aarch64/cygming.h ++++ b/gcc/config/aarch64/cygming.h +@@ -50,14 +50,39 @@ along with GCC; see the file COPYING3. If not see + #define SYMBOL_REF_STUBVAR_P(X) \ + ((SYMBOL_REF_FLAGS (X) & SYMBOL_FLAG_STUBVAR) != 0) + +-/* Disable SEH and declare the required SEH-related macros that are ++/* Declare the required SEH-related macros that are + still needed for compilation. */ + #undef TARGET_SEH +-#define TARGET_SEH 0 ++#define TARGET_SEH 1 + + #define SSE_REGNO_P(N) (gcc_unreachable (), 0) + #define GENERAL_REGNO_P(N) (gcc_unreachable (), 0) +-#define SEH_MAX_FRAME_SIZE (gcc_unreachable (), 0) ++ ++/* Support hooks for SEH. */ ++#undef TARGET_ASM_UNWIND_EMIT ++#define TARGET_ASM_UNWIND_EMIT aarch64_pe_seh_unwind_emit ++#undef TARGET_ASM_UNWIND_EMIT_BEFORE_INSN ++#define TARGET_ASM_UNWIND_EMIT_BEFORE_INSN false ++#undef TARGET_ASM_FUNCTION_END_PROLOGUE ++#define TARGET_ASM_FUNCTION_END_PROLOGUE mingw_pe_seh_end_prologue ++#undef TARGET_ASM_EMIT_EXCEPT_PERSONALITY ++#define TARGET_ASM_EMIT_EXCEPT_PERSONALITY mingw_pe_seh_emit_except_personality ++#undef TARGET_ASM_INIT_SECTIONS ++#define TARGET_ASM_INIT_SECTIONS mingw_pe_seh_init_sections ++#undef SUBTARGET_ASM_UNWIND_INIT ++#define SUBTARGET_ASM_UNWIND_INIT mingw_pe_seh_init ++ ++/* According to Windows x64 software convention, the maximum stack allocatable ++ in the prologue is 4G - 8 bytes. Furthermore, there is a limited set of ++ instructions allowed to adjust the stack pointer in the epilog, forcing the ++ use of frame pointer for frames larger than 2 GB. This theorical limit ++ is reduced by 256, an over-estimated upper bound for the stack use by the ++ prologue. ++ We define only one threshold for both the prolog and the epilog. When the ++ frame size is larger than this threshold, we allocate the area to save SSE ++ regs, then save them, and then allocate the remaining. There is no SEH ++ unwind info for this later allocation. */ ++#define SEH_MAX_FRAME_SIZE ((2U << 30) - 256) + + #undef TARGET_PECOFF + #define TARGET_PECOFF 1 +@@ -75,6 +100,9 @@ still needed for compilation. */ + #define TARGET_ASM_UNIQUE_SECTION mingw_pe_unique_section + #define TARGET_ENCODE_SECTION_INFO mingw_pe_encode_section_info + ++extern void aarch64_pe_seh_unwind_emit (FILE *, rtx_insn *); ++extern void aarch64_print_reg (rtx, int, FILE*); ++ + #define TARGET_VALID_DLLIMPORT_ATTRIBUTE_P mingw_pe_valid_dllimport_attribute_p + + /* Output function declarations at the end of the file. */ +@@ -123,6 +151,7 @@ still needed for compilation. */ + builtin_define ("__MSVCRT__"); \ + builtin_define ("__MINGW32__"); \ + builtin_define ("_WIN32"); \ ++ builtin_define ("__SEH__"); \ + builtin_define_std ("WIN32"); \ + builtin_define_std ("WINNT"); \ + builtin_define_with_int_value ("_INTEGRAL_MAX_BITS", \ +@@ -208,6 +237,14 @@ still needed for compilation. */ + flag_stack_check = STATIC_BUILTIN_STACK_CHECK; \ + } while (0) + ++#undef ASM_DECLARE_FUNCTION_SIZE ++#define ASM_DECLARE_FUNCTION_SIZE(FILE,NAME,DECL) \ ++ mingw_pe_end_function (FILE, NAME, DECL) ++ ++#undef ASM_DECLARE_COLD_FUNCTION_SIZE ++#define ASM_DECLARE_COLD_FUNCTION_SIZE(FILE,NAME,DECL) \ ++ mingw_pe_end_cold_function (FILE, NAME, DECL) ++ + #define SUBTARGET_ATTRIBUTE_TABLE \ + { "selectany", 0, 0, true, false, false, false, \ + mingw_handle_selectany_attribute, NULL } +@@ -233,6 +270,14 @@ still needed for compilation. */ + aarch64_declare_function_name (STREAM, NAME, DECL); \ + } while (0) + ++#define ASM_DECLARE_COLD_FUNCTION_NAME(FILE, NAME, DECL) \ ++ do \ ++ { \ ++ mingw_pe_declare_type (FILE, NAME, 0, 1); \ ++ mingw_pe_seh_cold_init (FILE, NAME); \ ++ ASM_OUTPUT_LABEL (FILE, NAME); \ ++ } \ ++ while (0) + + /* Define this to be nonzero if static stack checking is supported. */ + #define STACK_CHECK_STATIC_BUILTIN 1 +diff --git a/gcc/config/mingw/winnt.cc b/gcc/config/mingw/winnt.cc +index 79c0471d7..8b3ef36a9 100644 +--- a/gcc/config/mingw/winnt.cc ++++ b/gcc/config/mingw/winnt.cc +@@ -169,6 +169,8 @@ mingw_pe_valid_dllimport_attribute_p (const_tree decl) + return true; + } + ++#if !defined (TARGET_AARCH64_MS_ABI) ++ + /* Return string which is the function name, identified by ID, modified + with a suffix consisting of an atsign (@) followed by the number of + bytes of arguments. If ID is NULL use the DECL_NAME as base. If +@@ -224,8 +226,6 @@ gen_stdcall_or_fastcall_suffix (tree decl, tree id, bool fastcall) + return get_identifier (new_str); + } + +-#if !defined (TARGET_AARCH64_MS_ABI) +- + /* Maybe decorate and get a new identifier for the DECL of a stdcall or + fastcall function. The original identifier is supplied in ID. */ + +@@ -925,6 +925,11 @@ mingw_pe_seh_end_prologue (FILE *f) + void + mingw_pe_seh_cold_init (FILE *f, const char *name) + { ++#if defined (TARGET_AARCH64_MS_ABI) ++ mingw_pe_seh_init (f); ++ return; ++#endif ++ + struct seh_frame_state *seh; + HOST_WIDE_INT alloc_offset, offset; + +@@ -1048,6 +1053,14 @@ seh_emit_save (FILE *f, struct seh_frame_state *seh, + rtx reg, HOST_WIDE_INT cfa_offset) + { + const unsigned int regno = REGNO (reg); ++#if defined (TARGET_AARCH64_MS_ABI) ++ fputs ((FP_REGNUM_P (regno) ? " \t.seh_save_freg\t" ++ : GP_REGNUM_P (regno) ? " \t.seh_save_reg\t" ++ : (gcc_unreachable (), "")), f); ++ aarch64_print_reg (reg, 0, f); ++ fprintf (f, ", " HOST_WIDE_INT_PRINT_DEC " \n", abs (cfa_offset)); ++ return; ++#endif + HOST_WIDE_INT offset; + + seh->reg_offset[regno] = cfa_offset; +@@ -1072,8 +1085,12 @@ seh_emit_stackalloc (FILE *f, struct seh_frame_state *seh, + { + /* We're only concerned with prologue stack allocations, which all + are subtractions from the stack pointer. */ ++#if defined (TARGET_AARCH64_MS_ABI) ++ offset = abs (offset); ++#else + gcc_assert (offset < 0); + offset = -offset; ++#endif + + if (seh->cfa_reg == stack_pointer_rtx) + seh->cfa_offset += offset; +@@ -1329,6 +1346,243 @@ i386_pe_seh_unwind_emit (FILE *out_file, rtx_insn *insn) + seh_frame_related_expr (out_file, seh, pat); + } + ++#if defined (TARGET_AARCH64_MS_ABI) ++#define CALLEE_SAVED_REG_NUMBER(r) \ ++ (((r) >= R19_REGNUM && (r) <= R30_REGNUM) \ ++ || ((r) >= V8_REGNUM && (r) <= V15_REGNUM)) ++ ++static HOST_WIDE_INT ++seh_parallel_offset (rtx pat, HOST_WIDE_INT wanted_regnum) ++{ ++ rtx dest, src; ++ HOST_WIDE_INT result = 0; ++ ++ if (GET_CODE (pat) == PARALLEL) ++ { ++ int i, n = XVECLEN (pat, 0); ++ ++ for (i = 0; i < n; ++i) ++ { ++ rtx ele = XVECEXP (pat, 0, i); ++ ++ if (GET_CODE (ele) != SET) ++ continue; ++ ++ dest = SET_DEST (ele); ++ src = SET_SRC (ele); ++ ++ if (GET_CODE (dest) == REG ++ && REGNO (dest) == wanted_regnum ++ && GET_CODE (src) == MEM ++ && GET_CODE (XEXP (src, 0)) == PLUS ++ && XEXP (XEXP (src, 0), 0) == stack_pointer_rtx) ++ { ++ result = INTVAL (XEXP (XEXP (src, 0), 1)); ++ } ++ ++ if (GET_CODE (src) == REG ++ && REGNO (src) == wanted_regnum ++ && GET_CODE (dest) == MEM ++ && GET_CODE (XEXP (dest, 0)) == PLUS ++ && XEXP (XEXP (dest, 0), 0) == stack_pointer_rtx) ++ { ++ result = INTVAL (XEXP (XEXP (dest, 0), 1)); ++ } ++ } ++ } ++ ++ return result; ++} ++ ++static void ++seh_pattern_emit (FILE *f, struct seh_frame_state *seh, rtx pat) ++{ ++ rtx dest, src; ++ ++ if (GET_CODE (pat) == PARALLEL) ++ { ++ int i, n = XVECLEN (pat, 0); ++ HOST_WIDE_INT regno, min_regno = 32; ++ int reg_count = 0; ++ HOST_WIDE_INT increment = 0; ++ ++ for (i = 0; i < n; ++i) ++ { ++ rtx ele = XVECEXP (pat, 0, i); ++ ++ if (GET_CODE (ele) != SET) ++ continue; ++ ++ dest = SET_DEST (ele); ++ src = SET_SRC (ele); ++ ++ if (GET_CODE (dest) == REG ++ && GET_CODE (src) == PLUS ++ && XEXP (src, 0) == stack_pointer_rtx) ++ increment = INTVAL (XEXP (src, 1)); ++ ++ if (!seh->after_prologue && GET_CODE (src) == REG) ++ { ++ regno = REGNO (src); ++ ++ if (CALLEE_SAVED_REG_NUMBER (regno)) ++ { ++ reg_count += 1; ++ min_regno = MIN (regno, min_regno); ++ } ++ } ++ ++ if (seh->after_prologue && GET_CODE (dest) == REG) ++ { ++ regno = REGNO (dest); ++ ++ if (CALLEE_SAVED_REG_NUMBER (regno)) ++ { ++ reg_count += 1; ++ min_regno = MIN (regno, min_regno); ++ } ++ } ++ } ++ ++ if (reg_count == 2) ++ { ++ fprintf (f, "\t.seh_save_%s\tx%ld, %ld\n", ++ increment != 0 ? "regp_x" : "regp", ++ min_regno, ++ increment != 0 ? abs (increment) ++ : seh_parallel_offset (pat, min_regno)); ++ } ++ } ++ else ++ { ++ src = SET_SRC (pat); ++ ++ if (GET_CODE (pat) == SET) ++ { ++ HOST_WIDE_INT increment = 0; ++ dest = SET_DEST (pat); ++ ++ switch (GET_CODE (dest)) ++ { ++ case REG: ++ switch (GET_CODE (src)) ++ { ++ case REG: ++ if (dest == hard_frame_pointer_rtx ++ && src == stack_pointer_rtx) ++ fputs ("\t.seh_set_fp\n", f); ++ else if (CALLEE_SAVED_REG_NUMBER (REGNO (dest)) ++ && src == stack_pointer_rtx) ++ seh_emit_save (f, seh, dest, INTVAL (XEXP (src, 1))); ++ break; ++ ++ case PLUS: ++ increment = INTVAL (XEXP (src, 1)); ++ src = XEXP (src, 0); ++ if (dest == stack_pointer_rtx) ++ seh_emit_stackalloc (f, seh, increment); ++ break; ++ ++ case MEM: ++ src = XEXP (src, 0); ++ if (GET_CODE (src) == PLUS ++ && GET_CODE (XEXP (src, 0)) == REG ++ && CALLEE_SAVED_REG_NUMBER (REGNO (dest)) ++ && XEXP (src, 0) == stack_pointer_rtx) ++ seh_emit_save (f, seh, dest, INTVAL (XEXP (src, 1))); ++ break; ++ ++ default: ++ break; ++ } ++ break; ++ ++ case MEM: ++ dest = XEXP (dest, 0); ++ if (GET_CODE (dest) == PRE_DEC ++ && CALLEE_SAVED_REG_NUMBER (REGNO (src)) ++ && XEXP (dest, 0) == stack_pointer_rtx) ++ seh_emit_save (f, seh, src, INTVAL (XEXP (dest, 1))); ++ else if (GET_CODE (dest) == PLUS ++ && CALLEE_SAVED_REG_NUMBER (REGNO (src)) ++ && XEXP (dest, 0) == stack_pointer_rtx) ++ seh_emit_save (f, seh, src, INTVAL (XEXP (dest, 1))); ++ break; ++ ++ default: ++ break; ++ } ++ } ++ else if (seh->after_prologue ++ && (GET_CODE (pat) == RETURN || GET_CODE (pat) == JUMP_INSN)) ++ fputs ("\t.seh_endepilogue\n", f); ++ } ++} ++ ++/* This function looks at a single insn and emits any SEH directives ++ required for unwind of this insn. */ ++ ++void ++aarch64_pe_seh_unwind_emit (FILE *out_file, rtx_insn *insn) ++{ ++ rtx note, pat; ++ struct seh_frame_state *seh; ++ ++ if (!TARGET_SEH) ++ return; ++ ++ if (NOTE_P (insn)) ++ return; ++ ++ seh = cfun->machine->seh; ++ ++ if (!seh || seh->after_prologue) ++ return; ++ ++ pat = PATTERN (insn); ++ ++ if (GET_CODE (pat) == SET) ++ { ++ rtx dest = SET_DEST (pat); ++ if (GET_CODE (dest) == MEM && GET_CODE (XEXP (dest, 0)) == SCRATCH) ++ return; ++ } ++ ++ bool related_exp_needed = true; ++ ++ for (note = REG_NOTES (insn); note ; note = XEXP (note, 1)) ++ { ++ switch (REG_NOTE_KIND (note)) ++ { ++ case REG_FRAME_RELATED_EXPR: ++ pat = XEXP (note, 0); ++ seh_pattern_emit (out_file, seh, pat); ++ related_exp_needed = false; ++ break; ++ ++ case REG_CFA_EXPRESSION: ++ case REG_CFA_REGISTER: ++ case REG_CFA_ADJUST_CFA: ++ case REG_CFA_OFFSET: ++ related_exp_needed = false; ++ break; ++ ++ default: ++ break; ++ } ++ } ++ ++ if (related_exp_needed) ++ { ++ pat = PATTERN (insn); ++ seh_pattern_emit (out_file, seh, pat); ++ } ++} ++ ++#else ++#define CALLEE_SAVED_REG_NUMBER(r) 0 ++#endif ++ + void + mingw_pe_seh_emit_except_personality (rtx personality) + { +diff --git a/libgcc/config.host b/libgcc/config.host +index d59d06c49..1bc2b56eb 100644 +--- a/libgcc/config.host ++++ b/libgcc/config.host +@@ -473,7 +473,7 @@ aarch64-*-mingw*) + tmake_thr_file="mingw/t-mingw-pthread" + ;; + esac +- tmake_file="${tmake_file} ${cpu_type}/t-no-eh ${tmake_thr_file}" ++ tmake_file="${tmake_file} ${tmake_thr_file} mingw/t-seh-eh" + tmake_file="${tmake_file} t-dfprules" + tmake_file="${tmake_file} ${cpu_type}/t-aarch64" + tmake_file="${tmake_file} ${cpu_type}/t-mingw" +diff --git a/libgcc/unwind-seh.c b/libgcc/unwind-seh.c +index b1ea3262a..ad85a0f29 100644 +--- a/libgcc/unwind-seh.c ++++ b/libgcc/unwind-seh.c +@@ -32,7 +32,7 @@ + + /* At the moment everything is written for x64, but in theory this could + also be used for i386, arm, mips and other extant embedded Windows. */ +-#ifndef __x86_64__ ++#if !defined (__x86_64__) && !defined (__aarch64__) + #error "Unsupported architecture." + #endif + +@@ -209,7 +209,11 @@ _GCC_specific_handler (PEXCEPTION_RECORD ms_exc, void *this_frame, + "installed" the target_ip and RAX value via the arguments + to RtlUnwindEx. All that's left is to set the RDX value + and "continue" to have the context installed. */ ++#ifdef __x86_64__ + ms_disp->ContextRecord->Rdx = ms_exc->ExceptionInformation[3]; ++#elif defined (__aarch64__) ++ ms_disp->ContextRecord->X1 = ms_exc->ExceptionInformation[3]; ++#endif + return ExceptionContinueSearch; + } + +@@ -229,7 +233,11 @@ _GCC_specific_handler (PEXCEPTION_RECORD ms_exc, void *this_frame, + return ExceptionContinueSearch; + } + ++#ifdef __x86_64__ + gcc_context.cfa = ms_disp->ContextRecord->Rsp; ++#elif defined (__aarch64__) ++ gcc_context.cfa = ms_disp->ContextRecord->Sp; ++#endif + gcc_context.ra = ms_disp->ControlPc; + gcc_context.reg[0] = 0xdeadbeef; /* These are write-only. */ + gcc_context.reg[1] = 0xdeadbeef; +@@ -438,6 +446,8 @@ _Unwind_Backtrace(_Unwind_Trace_Fn trace, + CONTEXT ms_context; + struct _Unwind_Context gcc_context; + DISPATCHER_CONTEXT disp_context; ++ ULONG64 ip; ++ ULONG64 sp; + + memset (&ms_history, 0, sizeof(ms_history)); + memset (&gcc_context, 0, sizeof(gcc_context)); +@@ -452,31 +462,44 @@ _Unwind_Backtrace(_Unwind_Trace_Fn trace, + + while (1) + { +- gcc_context.disp->ControlPc = ms_context.Rip; ++ ip = ++#ifdef __x86_64__ ++ ms_context.Rip; ++#elif defined (__aarch64__) ++ ms_context.Pc; ++#endif ++ gcc_context.disp->ControlPc = ip; + gcc_context.disp->FunctionEntry +- = RtlLookupFunctionEntry (ms_context.Rip, &gcc_context.disp->ImageBase, ++ = RtlLookupFunctionEntry (ip, &gcc_context.disp->ImageBase, + &ms_history); + + if (!gcc_context.disp->FunctionEntry) + return _URC_END_OF_STACK; + + gcc_context.disp->LanguageHandler +- = RtlVirtualUnwind (0, gcc_context.disp->ImageBase, ms_context.Rip, ++ = RtlVirtualUnwind (0, gcc_context.disp->ImageBase, ip, + gcc_context.disp->FunctionEntry, &ms_context, + &gcc_context.disp->HandlerData, + &gcc_context.disp->EstablisherFrame, NULL); + + /* Set values that the callback can inspect via _Unwind_GetIP + * and _Unwind_GetCFA. */ +- gcc_context.ra = ms_context.Rip; +- gcc_context.cfa = ms_context.Rsp; ++#ifdef __x86_64__ ++ ip = ms_context.Rip; ++ sp = ms_context.Rsp; ++#elif defined (__aarch64__) ++ ip = ms_context.Pc; ++ sp = ms_context.Sp; ++#endif ++ gcc_context.ra = ip; ++ gcc_context.cfa = sp; + + /* Call trace function. */ + if (trace (&gcc_context, trace_argument) != _URC_NO_REASON) + return _URC_FATAL_PHASE1_ERROR; + + /* ??? Check for invalid stack pointer. */ +- if (ms_context.Rip == 0) ++ if (ip == 0) + return _URC_END_OF_STACK; + } + } +-- +2.48.1 + diff --git a/packages/gcc/15.2.0/0025-aarch64-mingw-fix-gthr-win32-libgcc.patch b/packages/gcc/15.2.0/0025-aarch64-mingw-fix-gthr-win32-libgcc.patch new file mode 100644 index 0000000000..ce702e4fae --- /dev/null +++ b/packages/gcc/15.2.0/0025-aarch64-mingw-fix-gthr-win32-libgcc.patch @@ -0,0 +1,31 @@ +From: Ahmed ARIF +Date: Mon, 01 Dec 2025 12:00:00 +0000 +Subject: [PATCH] aarch64-mingw: ensure gthr-win32-thread is linked into libgcc + +For aarch64-*-mingw*, libgcc currently includes the t-files in the +order: + + t-gthr-win32, then t-seh-eh + +where t-gthr-win32 appends gthr-win32-thread.c to LIB2ADDEH using +`+=`, but t-seh-eh later *overwrites* LIB2ADDEH with `=`, dropping +gthr-win32-thread.c from the build. As a result, the Win32 thread +entry points (__gthr_win32_create, __gthr_win32_join, ...) are +missing from libgcc, and the final libstdc++ link fails with +undefined references to these symbols. + +Mirror the x86_64-*-mingw* logic by including t-seh-eh first and +then t-gthr-win32, so that LIB2ADDEH is initialized by t-seh-eh and +augmented by t-gthr-win32. + +--- a/libgcc/config.host ++++ b/libgcc/config.host +@@ -469,7 +469,7 @@ aarch64*-*-vxworks7*) + tmake_thr_file="mingw/t-mingw-pthread" + ;; + esac +- tmake_file="${tmake_file} ${tmake_thr_file} mingw/t-seh-eh" ++ tmake_file="${tmake_file} mingw/t-seh-eh ${tmake_thr_file}" + tmake_file="${tmake_file} t-dfprules" + tmake_file="${tmake_file} ${cpu_type}/t-aarch64" + tmake_file="${tmake_file} ${cpu_type}/t-mingw" diff --git a/packages/gcc/15.2.0/0026-fix-clang-print-multi-os-directory.patch b/packages/gcc/15.2.0/0026-fix-clang-print-multi-os-directory.patch new file mode 100644 index 0000000000..c4e38d33be --- /dev/null +++ b/packages/gcc/15.2.0/0026-fix-clang-print-multi-os-directory.patch @@ -0,0 +1,236 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ahmed ARIF +Date: Mon, 12 Jan 2026 00:00:00 +0000 +Subject: [PATCH] gcc: fix clang print-multi-os-directory fallback + +When using clang as the host compiler, -print-multi-os-directory may +fail. Add error handling to default to "." when the command fails. + +--- a/libgfortran/configure ++++ b/libgfortran/configure +@@ -5203,7 +5203,10 @@ + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' + fi +- multi_os_directory=`$CC -print-multi-os-directory` ++ multi_os_directory=`$CC -print-multi-os-directory 2>/dev/null` ++ if test $? -ne 0 || test -z "$multi_os_directory"; then ++ multi_os_directory="." ++ fi + case $multi_os_directory in + .) ;; # Avoid trailing /. + *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;; +@@ -11734,6 +11737,9 @@ + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ if test $? -ne 0 || test -z "$lt_multi_os_dir"; then ++ lt_multi_os_dir="." ++ fi + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" +--- a/libstdc++-v3/configure ++++ b/libstdc++-v3/configure +@@ -11167,6 +11167,9 @@ + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ if test $? -ne 0 || test -z "$lt_multi_os_dir"; then ++ lt_multi_os_dir="." ++ fi + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" +@@ -55733,7 +55736,10 @@ + glibcxx_toolexecdir='${libdir}/gcc/${host_alias}' + glibcxx_toolexeclibdir='${libdir}' + fi +- multi_os_directory=`$CXX -print-multi-os-directory` ++ multi_os_directory=`$CXX -print-multi-os-directory 2>/dev/null` ++ if test $? -ne 0 || test -z "$multi_os_directory"; then ++ multi_os_directory="." ++ fi + case $multi_os_directory in + .) ;; # Avoid trailing /. + *) glibcxx_toolexeclibdir=$glibcxx_toolexeclibdir/$multi_os_directory ;; +--- a/gcc/configure ++++ b/gcc/configure +@@ -20425,6 +20425,9 @@ + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ if test $? -ne 0 || test -z "$lt_multi_os_dir"; then ++ lt_multi_os_dir="." ++ fi + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" +--- a/libatomic/configure ++++ b/libatomic/configure +@@ -3399,7 +3399,10 @@ + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' + fi +- multi_os_directory=`$CC -print-multi-os-directory` ++ multi_os_directory=`$CC -print-multi-os-directory 2>/dev/null` ++ if test $? -ne 0 || test -z "$multi_os_directory"; then ++ multi_os_directory="." ++ fi + case $multi_os_directory in + .) ;; # Avoid trailing /. + *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;; +@@ -10361,6 +10364,9 @@ + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ if test $? -ne 0 || test -z "$lt_multi_os_dir"; then ++ lt_multi_os_dir="." ++ fi + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" +--- a/libgomp/configure ++++ b/libgomp/configure +@@ -3517,7 +3517,10 @@ + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' + fi +- multi_os_directory=`$CC -print-multi-os-directory` ++ multi_os_directory=`$CC -print-multi-os-directory 2>/dev/null` ++ if test $? -ne 0 || test -z "$multi_os_directory"; then ++ multi_os_directory="." ++ fi + case $multi_os_directory in + .) ;; # Avoid trailing /. + *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;; +@@ -10374,6 +10377,9 @@ + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ if test $? -ne 0 || test -z "$lt_multi_os_dir"; then ++ lt_multi_os_dir="." ++ fi + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" +--- a/libitm/configure ++++ b/libitm/configure +@@ -3581,7 +3581,10 @@ + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' + fi +- multi_os_directory=`$CC -print-multi-os-directory` ++ multi_os_directory=`$CC -print-multi-os-directory 2>/dev/null` ++ if test $? -ne 0 || test -z "$multi_os_directory"; then ++ multi_os_directory="." ++ fi + case $multi_os_directory in + .) ;; # Avoid trailing /. + *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;; +@@ -11036,6 +11039,9 @@ + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ if test $? -ne 0 || test -z "$lt_multi_os_dir"; then ++ lt_multi_os_dir="." ++ fi + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" +--- a/libsanitizer/configure ++++ b/libsanitizer/configure +@@ -5072,7 +5072,10 @@ + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' + fi +- multi_os_directory=`$CC -print-multi-os-directory` ++ multi_os_directory=`$CC -print-multi-os-directory 2>/dev/null` ++ if test $? -ne 0 || test -z "$multi_os_directory"; then ++ multi_os_directory="." ++ fi + case $multi_os_directory in + .) ;; # Avoid trailing /. + *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;; +@@ -11380,6 +11383,9 @@ + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ if test $? -ne 0 || test -z "$lt_multi_os_dir"; then ++ lt_multi_os_dir="." ++ fi + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" +--- a/libquadmath/configure ++++ b/libquadmath/configure +@@ -9809,6 +9809,9 @@ + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ if test $? -ne 0 || test -z "$lt_multi_os_dir"; then ++ lt_multi_os_dir="." ++ fi + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" +@@ -12251,7 +12254,10 @@ + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' + fi +- multi_os_directory=`$CC -print-multi-os-directory` ++ multi_os_directory=`$CC -print-multi-os-directory 2>/dev/null` ++ if test $? -ne 0 || test -z "$multi_os_directory"; then ++ multi_os_directory="." ++ fi + case $multi_os_directory in + .) ;; # Avoid trailing /. + *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;; +--- a/libssp/configure ++++ b/libssp/configure +@@ -10051,6 +10051,9 @@ + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ if test $? -ne 0 || test -z "$lt_multi_os_dir"; then ++ lt_multi_os_dir="." ++ fi + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" +@@ -11584,7 +11587,10 @@ + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' + fi +- multi_os_directory=`$CC -print-multi-os-directory` ++ multi_os_directory=`$CC -print-multi-os-directory 2>/dev/null` ++ if test $? -ne 0 || test -z "$multi_os_directory"; then ++ multi_os_directory="." ++ fi + case $multi_os_directory in + .) ;; # Avoid trailing /. + *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;; +--- a/libvtv/configure ++++ b/libvtv/configure +@@ -4860,7 +4860,10 @@ + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' + fi +- multi_os_directory=`$CC -print-multi-os-directory` ++ multi_os_directory=`$CC -print-multi-os-directory 2>/dev/null` ++ if test $? -ne 0 || test -z "$multi_os_directory"; then ++ multi_os_directory="." ++ fi + case $multi_os_directory in + .) ;; # Avoid trailing /. + *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;; +@@ -11274,6 +11277,9 @@ + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ if test $? -ne 0 || test -z "$lt_multi_os_dir"; then ++ lt_multi_os_dir="." ++ fi + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" diff --git a/packages/gcc/15.2.0/chksum b/packages/gcc/15.2.0/chksum new file mode 100644 index 0000000000..e847c511ac --- /dev/null +++ b/packages/gcc/15.2.0/chksum @@ -0,0 +1,8 @@ +md5 gcc-15.2.0.tar.gz cf60f34f786cebd4dfed65ace858a11f +sha1 gcc-15.2.0.tar.gz ba53f88cc7265f7a9039b8943eb31e7568afc54f +sha256 gcc-15.2.0.tar.gz 7294d65cc1a0558cb815af0ca8c7763d86f7a31199794ede3f630c0d1b0a5723 +sha512 gcc-15.2.0.tar.gz 59b9f409b8047ed10954542c7a3404f10bf413ed1a79e78aeeb3dadcc55c13c8d1eef199452d3e271a20b7914c1a197ad8eb0c64a1cfd6a5344316cdefe34199 +md5 gcc-15.2.0.tar.xz b861b092bf1af683c46a8aa2e689a6fd +sha1 gcc-15.2.0.tar.xz e9265c98ae18a6d952a636749d98c475ba2ca006 +sha256 gcc-15.2.0.tar.xz 438fd996826b0c82485a29da03a72d71d6e3541a83ec702df4271f6fe025d24e +sha512 gcc-15.2.0.tar.xz 89047a2e07bd9da265b507b516ed3635adb17491c7f4f67cf090f0bd5b3fc7f2ee6e4cc4008beef7ca884b6b71dffe2bb652b21f01a702e17b468cca2d10b2de diff --git a/packages/gcc/15.2.0/experimental/0001-picolibc-Add-custom-spec-file-fragments-for-using-pi.patch b/packages/gcc/15.2.0/experimental/0001-picolibc-Add-custom-spec-file-fragments-for-using-pi.patch new file mode 100644 index 0000000000..4bbd0c6810 --- /dev/null +++ b/packages/gcc/15.2.0/experimental/0001-picolibc-Add-custom-spec-file-fragments-for-using-pi.patch @@ -0,0 +1,127 @@ +From b0f9ac365f91952f6f920c8e6aa4ddb819f47cc8 Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Tue, 23 Aug 2022 22:13:08 -0700 +Subject: [PATCH] picolibc: Add custom spec file fragments for using + picolibc + +The '--oslib=' option allows targets to insert an OS library after the +C library in the LIB_PATH spec file fragment. This library maps a few +POSIX APIs used by picolibc to underlying system capabilities. + +The '--crt0=' option allows targets to use an alternate crt0 in place +of the usual one as provided by Picolibc. + +For example, picolibc provides 'libsemihost' and 'crt0-semihost.o' on +various targets which maps some POSIX APIs to semihosting capabilities +and signals the semihosting environment when 'main' returns. These +would be used by specifying --oslib=semihost --crt0=semihost. + +This patch also takes advantage of the IN_GPP conditional when +building g++ to elide exception handling contents from the executable +when not linking with the g++ driver. + +Signed-off-by: Keith Packard +--- + gcc/config.gcc | 7 +++++++ + gcc/config/picolibc.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ + gcc/config/picolibc.opt | 33 +++++++++++++++++++++++++++++++++ + 3 files changed, 84 insertions(+) + create mode 100644 gcc/config/picolibc.h + create mode 100644 gcc/config/picolibc.opt + +--- a/gcc/config.gcc ++++ b/gcc/config.gcc +@@ -6213,3 +6213,10 @@ + tm_defines="$tm_defines DEFAULT_LIBC=$default_libc" + ;; + esac ++ ++case "$default_libc" in ++ LIBC_PICOLIBC) ++ extra_options="${extra_options} picolibc.opt" ++ tm_file="${tm_file} picolibc.h" ++ ;; ++esac +--- /dev/null ++++ b/gcc/config/picolibc.h +@@ -0,0 +1,44 @@ ++/* Configuration common to all targets running Picolibc. ++ Copyright (C) 2023 Free Software Foundation, Inc. ++ ++ This file is part of GCC. ++ ++ GCC 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, or (at your ++ option) any later version. ++ ++ GCC is distributed in the hope that it will be useful, but WITHOUT ++ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ++ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public ++ License for more details. ++ ++ Under Section 7 of GPL version 3, you are granted additional ++ permissions described in the GCC Runtime Library Exception, version ++ 3.1, as published by the Free Software Foundation. ++ ++ You should have received a copy of the GNU General Public License and ++ a copy of the GCC Runtime Library Exception along with this program; ++ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see ++ . */ ++ ++#ifdef IN_GPP ++#define PICOLIBC_LD "picolibcpp.ld" ++#define PICOLIBC_BEGIN " crtbegin%O%s" ++#define PICOLIBC_END "crtend%O%s" ++#else ++#define PICOLIBC_LD "picolibc.ld" ++#define PICOLIBC_BEGIN "" ++#define PICOLIBC_END "" ++#endif ++ ++#undef LIB_SPEC ++#define LIB_SPEC "%{!T:-T" PICOLIBC_LD "} --start-group -lc %{-oslib=*:-l%*} %(libgcc) --end-group" ++ ++#undef STARTFILE_SPEC ++#define STARTFILE_SPEC "%{-crt0=*:crt0-%*%O%s; :crt0%O%s}" PICOLIBC_BEGIN ++ ++#undef ENDFILE_SPEC ++#define ENDFILE_SPEC PICOLIBC_END ++ ++#define EH_TABLES_CAN_BE_READ_ONLY 1 +--- /dev/null ++++ b/gcc/config/picolibc.opt +@@ -0,0 +1,33 @@ ++; Processor-independent options for picolibc. ++; ++; Copyright (C) 2022 Free Software Foundation, Inc. ++; ++; This file is part of GCC. ++; ++; GCC 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, or (at your option) any later ++; version. ++; ++; GCC is distributed in the hope that it will be useful, but WITHOUT ANY ++; WARRANTY; without even the implied warranty of MERCHANTABILITY or ++; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++; for more details. ++; ++; You should have received a copy of the GNU General Public License ++; along with GCC; see the file COPYING3. If not see ++; . ++ ++-oslib ++Driver Separate Alias(-oslib=) ++ ++-oslib= ++Driver Joined ++Specify an OS support library to load after libc. ++ ++-crt0 ++Driver Separate Alias(-crt0=) ++ ++-crt0= ++Driver Joined ++Specify an alternate startup file. diff --git a/packages/linux/6.6.41/version.desc b/packages/gcc/15.2.0/version.desc similarity index 100% rename from packages/linux/6.6.41/version.desc rename to packages/gcc/15.2.0/version.desc diff --git a/packages/gcc/7.5.0/0031-riscv-Add-.type-and-.size-directives-to-riscv-libgcc-funct.patch b/packages/gcc/7.5.0/0031-riscv-Add-.type-and-.size-directives-to-riscv-libgcc-funct.patch new file mode 100644 index 0000000000..e613c62834 --- /dev/null +++ b/packages/gcc/7.5.0/0031-riscv-Add-.type-and-.size-directives-to-riscv-libgcc-funct.patch @@ -0,0 +1,602 @@ +From 3a4c600f389e8c5aa6dcbd6cd14bd0c546af0bb2 Mon Sep 17 00:00:00 2001 +From: Jim Wilson +Date: Sat, 9 Dec 2017 03:00:57 +0000 +Subject: [PATCH] Add .type and .size directives to riscv libgcc functions. + + libgcc/ + * config/riscv/div.S: Use FUNC_* macros. + * config/riscv/muldi3.S, config/riscv/multi3.S: Likewise + * config/riscv/save-restore.S: Likewise. + * config/riscv/riscv-asm.h: New. + +From-SVN: r255521 +--- + libgcc/ChangeLog | 7 ++ + libgcc/config/riscv/div.S | 33 ++--- + libgcc/config/riscv/muldi3.S | 6 +- + libgcc/config/riscv/multi3.S | 13 +- + libgcc/config/riscv/riscv-asm.h | 35 ++++++ + libgcc/config/riscv/save-restore.S | 190 ++++++++++++++++------------- + 6 files changed, 182 insertions(+), 102 deletions(-) + create mode 100644 libgcc/config/riscv/riscv-asm.h + +diff --git a/libgcc/config/riscv/div.S b/libgcc/config/riscv/div.S +index 63d542e846..4366c5ce1d 100644 +--- a/libgcc/config/riscv/div.S ++++ b/libgcc/config/riscv/div.S +@@ -23,6 +23,8 @@ a copy of the GCC Runtime Library Exception along with this program; + see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + . */ + ++#include "riscv-asm.h" ++ + .text + .align 2 + +@@ -33,8 +35,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + # define __divdi3 __divsi3 + # define __moddi3 __modsi3 + #else +- .globl __udivsi3 +-__udivsi3: ++FUNC_BEGIN (__udivsi3) + /* Compute __udivdi3(a0 << 32, a1 << 32); cast result to uint32_t. */ + sll a0, a0, 32 + sll a1, a1, 32 +@@ -42,9 +43,9 @@ __udivsi3: + jal __udivdi3 + sext.w a0, a0 + jr t0 ++FUNC_END (__udivsi3) + +- .globl __umodsi3 +-__umodsi3: ++FUNC_BEGIN (__umodsi3) + /* Compute __udivdi3((uint32_t)a0, (uint32_t)a1); cast a1 to uint32_t. */ + sll a0, a0, 32 + sll a1, a1, 32 +@@ -54,25 +55,22 @@ __umodsi3: + jal __udivdi3 + sext.w a0, a1 + jr t0 ++FUNC_END (__umodsi3) + +- .globl __modsi3 +- __modsi3 = __moddi3 ++FUNC_ALIAS (__modsi3, __moddi3) + +- .globl __divsi3 +-__divsi3: ++FUNC_BEGIN( __divsi3) + /* Check for special case of INT_MIN/-1. Otherwise, fall into __divdi3. */ + li t0, -1 + beq a1, t0, .L20 + #endif + +- .globl __divdi3 +-__divdi3: ++FUNC_BEGIN (__divdi3) + bltz a0, .L10 + bltz a1, .L11 + /* Since the quotient is positive, fall into __udivdi3. */ + +- .globl __udivdi3 +-__udivdi3: ++FUNC_BEGIN (__udivdi3) + mv a2, a1 + mv a1, a0 + li a0, -1 +@@ -96,14 +94,15 @@ __udivdi3: + bnez a3, .L3 + .L5: + ret ++FUNC_END (__udivdi3) + +- .globl __umoddi3 +-__umoddi3: ++FUNC_BEGIN (__umoddi3) + /* Call __udivdi3(a0, a1), then return the remainder, which is in a1. */ + move t0, ra + jal __udivdi3 + move a0, a1 + jr t0 ++FUNC_END (__umoddi3) + + /* Handle negative arguments to __divdi3. */ + .L10: +@@ -118,9 +117,9 @@ __umoddi3: + jal __udivdi3 + neg a0, a0 + jr t0 ++FUNC_END (__divdi3) + +- .globl __moddi3 +-__moddi3: ++FUNC_BEGIN (__moddi3) + move t0, ra + bltz a1, .L31 + bltz a0, .L32 +@@ -136,6 +135,7 @@ __moddi3: + jal __udivdi3 /* The dividend is hella negative. */ + neg a0, a1 + jr t0 ++FUNC_END (__moddi3) + + #if __riscv_xlen == 64 + /* continuation of __divsi3 */ +@@ -143,4 +143,5 @@ __moddi3: + sll t0, t0, 31 + bne a0, t0, __divdi3 + ret ++FUNC_END (__divsi3) + #endif +diff --git a/libgcc/config/riscv/muldi3.S b/libgcc/config/riscv/muldi3.S +index eb3d9b0df3..7c07878eea 100644 +--- a/libgcc/config/riscv/muldi3.S ++++ b/libgcc/config/riscv/muldi3.S +@@ -23,6 +23,8 @@ a copy of the GCC Runtime Library Exception along with this program; + see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + . */ + ++#include "riscv-asm.h" ++ + .text + .align 2 + +@@ -31,8 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + # define __muldi3 __mulsi3 + #endif + +- .globl __muldi3 +-__muldi3: ++FUNC_BEGIN (__muldi3) + mv a2, a0 + li a0, 0 + .L1: +@@ -44,3 +45,4 @@ __muldi3: + slli a2, a2, 1 + bnez a1, .L1 + ret ++FUNC_END (__muldi3) +diff --git a/libgcc/config/riscv/multi3.S b/libgcc/config/riscv/multi3.S +index 4d454e6501..a3b89c6520 100644 +--- a/libgcc/config/riscv/multi3.S ++++ b/libgcc/config/riscv/multi3.S +@@ -23,6 +23,8 @@ a copy of the GCC Runtime Library Exception along with this program; + see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + . */ + ++#include "riscv-asm.h" ++ + .text + .align 2 + +@@ -31,8 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + # define __multi3 __muldi3 + #endif + +- .globl __multi3 +-__multi3: ++FUNC_BEGIN (__multi3) + + #if __riscv_xlen == 32 + /* Our RV64 64-bit routines are equivalent to our RV32 32-bit routines. */ +@@ -79,3 +80,11 @@ __multi3: + mv a0, t2 + mv a1, t4 + jr t0 ++ ++#if __riscv_xlen == 32 ++/* Our RV64 64-bit routines are equivalent to our RV32 32-bit routines. */ ++# undef __muldi3 ++#endif ++ ++FUNC_END (__multi3) ++ +diff --git a/libgcc/config/riscv/riscv-asm.h b/libgcc/config/riscv/riscv-asm.h +new file mode 100644 +index 0000000000..fbfe5f0dbf +--- /dev/null ++++ b/libgcc/config/riscv/riscv-asm.h +@@ -0,0 +1,35 @@ ++/* Copyright (C) 2017 Free Software Foundation, Inc. ++ ++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, or (at your option) any ++later version. ++ ++This file is distributed in the hope that it will be useful, but ++WITHOUT ANY WARRANTY; without even the implied warranty of ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++General Public License for more details. ++ ++Under Section 7 of GPL version 3, you are granted additional ++permissions described in the GCC Runtime Library Exception, version ++3.1, as published by the Free Software Foundation. ++ ++You should have received a copy of the GNU General Public License and ++a copy of the GCC Runtime Library Exception along with this program; ++see the files COPYING3 and COPYING.RUNTIME respectively. If not, see ++. */ ++ ++#define FUNC_TYPE(X) .type X,@function ++#define FUNC_SIZE(X) .size X,.-X ++ ++#define FUNC_BEGIN(X) \ ++ .globl X; \ ++ FUNC_TYPE (X); \ ++X: ++ ++#define FUNC_END(X) \ ++ FUNC_SIZE(X) ++ ++#define FUNC_ALIAS(X,Y) \ ++ .globl X; \ ++ X = Y +diff --git a/libgcc/config/riscv/save-restore.S b/libgcc/config/riscv/save-restore.S +index 2073a73089..c2f1740f42 100644 +--- a/libgcc/config/riscv/save-restore.S ++++ b/libgcc/config/riscv/save-restore.S +@@ -23,39 +23,13 @@ a copy of the GCC Runtime Library Exception along with this program; + see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + . */ + +- .text ++#include "riscv-asm.h" + +- .globl __riscv_save_12 +- .globl __riscv_save_11 +- .globl __riscv_save_10 +- .globl __riscv_save_9 +- .globl __riscv_save_8 +- .globl __riscv_save_7 +- .globl __riscv_save_6 +- .globl __riscv_save_5 +- .globl __riscv_save_4 +- .globl __riscv_save_3 +- .globl __riscv_save_2 +- .globl __riscv_save_1 +- .globl __riscv_save_0 +- +- .globl __riscv_restore_12 +- .globl __riscv_restore_11 +- .globl __riscv_restore_10 +- .globl __riscv_restore_9 +- .globl __riscv_restore_8 +- .globl __riscv_restore_7 +- .globl __riscv_restore_6 +- .globl __riscv_restore_5 +- .globl __riscv_restore_4 +- .globl __riscv_restore_3 +- .globl __riscv_restore_2 +- .globl __riscv_restore_1 +- .globl __riscv_restore_0 ++ .text + + #if __riscv_xlen == 64 + +-__riscv_save_12: ++FUNC_BEGIN (__riscv_save_12) + .cfi_startproc + # __riscv_save_* routine use t0/x5 as return address + .cfi_return_column 5 +@@ -66,8 +40,8 @@ __riscv_save_12: + .cfi_offset 27, -104 + j .Ls10 + +-__riscv_save_11: +-__riscv_save_10: ++FUNC_BEGIN (__riscv_save_11) ++FUNC_BEGIN (__riscv_save_10) + .cfi_restore 27 + addi sp, sp, -112 + .cfi_def_cfa_offset 112 +@@ -79,8 +53,8 @@ __riscv_save_10: + .cfi_offset 25, -88 + j .Ls8 + +-__riscv_save_9: +-__riscv_save_8: ++FUNC_BEGIN (__riscv_save_9) ++FUNC_BEGIN (__riscv_save_8) + .cfi_restore 25 + .cfi_restore 26 + .cfi_restore 27 +@@ -94,8 +68,8 @@ __riscv_save_8: + .cfi_offset 23, -72 + j .Ls6 + +-__riscv_save_7: +-__riscv_save_6: ++FUNC_BEGIN (__riscv_save_7) ++FUNC_BEGIN (__riscv_save_6) + .cfi_restore 23 + .cfi_restore 24 + .cfi_restore 25 +@@ -111,8 +85,8 @@ __riscv_save_6: + .cfi_offset 21, -56 + j .Ls4 + +-__riscv_save_5: +-__riscv_save_4: ++FUNC_BEGIN (__riscv_save_5) ++FUNC_BEGIN (__riscv_save_4) + .cfi_restore 21 + .cfi_restore 22 + .cfi_restore 24 +@@ -133,8 +107,8 @@ __riscv_save_4: + .cfi_offset 19, -40 + j .Ls2 + +-__riscv_save_3: +-__riscv_save_2: ++FUNC_BEGIN (__riscv_save_3) ++FUNC_BEGIN (__riscv_save_2) + .cfi_restore 19 + .cfi_restore 20 + .cfi_restore 21 +@@ -164,9 +138,20 @@ __riscv_save_2: + sub sp, sp, t1 + jr t0 + .cfi_endproc +- +-__riscv_save_1: +-__riscv_save_0: ++FUNC_END (__riscv_save_12) ++FUNC_END (__riscv_save_11) ++FUNC_END (__riscv_save_10) ++FUNC_END (__riscv_save_9) ++FUNC_END (__riscv_save_8) ++FUNC_END (__riscv_save_7) ++FUNC_END (__riscv_save_6) ++FUNC_END (__riscv_save_5) ++FUNC_END (__riscv_save_4) ++FUNC_END (__riscv_save_3) ++FUNC_END (__riscv_save_2) ++ ++FUNC_BEGIN (__riscv_save_1) ++FUNC_BEGIN (__riscv_save_0) + .cfi_startproc + # __riscv_save_* routine use t0/x5 as return address + .cfi_return_column 5 +@@ -178,8 +163,10 @@ __riscv_save_0: + .cfi_offset 1, -8 + jr t0 + .cfi_endproc ++FUNC_END (__riscv_save_1) ++FUNC_END (__riscv_save_0) + +-__riscv_restore_12: ++FUNC_BEGIN (__riscv_restore_12) + .cfi_startproc + .cfi_def_cfa_offset 112 + .cfi_offset 27, -104 +@@ -199,8 +186,8 @@ __riscv_restore_12: + .cfi_restore 27 + addi sp, sp, 16 + +-__riscv_restore_11: +-__riscv_restore_10: ++FUNC_BEGIN (__riscv_restore_11) ++FUNC_BEGIN (__riscv_restore_10) + .cfi_restore 27 + .cfi_def_cfa_offset 96 + ld s10, 0(sp) +@@ -209,8 +196,8 @@ __riscv_restore_10: + .cfi_restore 25 + addi sp, sp, 16 + +-__riscv_restore_9: +-__riscv_restore_8: ++FUNC_BEGIN (__riscv_restore_9) ++FUNC_BEGIN (__riscv_restore_8) + .cfi_restore 25 + .cfi_restore 26 + .cfi_restore 27 +@@ -221,8 +208,8 @@ __riscv_restore_8: + .cfi_restore 23 + addi sp, sp, 16 + +-__riscv_restore_7: +-__riscv_restore_6: ++FUNC_BEGIN (__riscv_restore_7) ++FUNC_BEGIN (__riscv_restore_6) + .cfi_restore 23 + .cfi_restore 24 + .cfi_restore 25 +@@ -235,8 +222,8 @@ __riscv_restore_6: + .cfi_restore 21 + addi sp, sp, 16 + +-__riscv_restore_5: +-__riscv_restore_4: ++FUNC_BEGIN (__riscv_restore_5) ++FUNC_BEGIN (__riscv_restore_4) + .cfi_restore 21 + .cfi_restore 22 + .cfi_restore 23 +@@ -251,8 +238,8 @@ __riscv_restore_4: + .cfi_restore 19 + addi sp, sp, 16 + +-__riscv_restore_3: +-__riscv_restore_2: ++FUNC_BEGIN (__riscv_restore_3) ++FUNC_BEGIN (__riscv_restore_2) + .cfi_restore 19 + .cfi_restore 20 + .cfi_restore 21 +@@ -269,8 +256,8 @@ __riscv_restore_2: + .cfi_restore 9 + addi sp, sp, 16 + +-__riscv_restore_1: +-__riscv_restore_0: ++FUNC_BEGIN (__riscv_restore_1) ++FUNC_BEGIN (__riscv_restore_0) + .cfi_restore 9 + .cfi_restore 18 + .cfi_restore 19 +@@ -291,10 +278,23 @@ __riscv_restore_0: + .cfi_def_cfa_offset 0 + ret + .cfi_endproc ++FUNC_END (__riscv_restore_12) ++FUNC_END (__riscv_restore_11) ++FUNC_END (__riscv_restore_10) ++FUNC_END (__riscv_restore_9) ++FUNC_END (__riscv_restore_8) ++FUNC_END (__riscv_restore_7) ++FUNC_END (__riscv_restore_6) ++FUNC_END (__riscv_restore_5) ++FUNC_END (__riscv_restore_4) ++FUNC_END (__riscv_restore_3) ++FUNC_END (__riscv_restore_2) ++FUNC_END (__riscv_restore_1) ++FUNC_END (__riscv_restore_0) + + #else + +-__riscv_save_12: ++FUNC_BEGIN (__riscv_save_12) + .cfi_startproc + # __riscv_save_* routine use t0/x5 as return address + .cfi_return_column 5 +@@ -305,10 +305,10 @@ __riscv_save_12: + .cfi_offset 27, -52 + j .Ls10 + +-__riscv_save_11: +-__riscv_save_10: +-__riscv_save_9: +-__riscv_save_8: ++FUNC_BEGIN (__riscv_save_11) ++FUNC_BEGIN (__riscv_save_10) ++FUNC_BEGIN (__riscv_save_9) ++FUNC_BEGIN (__riscv_save_8) + .cfi_restore 27 + addi sp, sp, -64 + .cfi_def_cfa_offset 64 +@@ -324,10 +324,10 @@ __riscv_save_8: + .cfi_offset 23, -36 + j .Ls6 + +-__riscv_save_7: +-__riscv_save_6: +-__riscv_save_5: +-__riscv_save_4: ++FUNC_BEGIN (__riscv_save_7) ++FUNC_BEGIN (__riscv_save_6) ++FUNC_BEGIN (__riscv_save_5) ++FUNC_BEGIN (__riscv_save_4) + .cfi_restore 23 + .cfi_restore 24 + .cfi_restore 25 +@@ -358,11 +358,20 @@ __riscv_save_4: + sub sp, sp, t1 + jr t0 + .cfi_endproc +- +-__riscv_save_3: +-__riscv_save_2: +-__riscv_save_1: +-__riscv_save_0: ++FUNC_END (__riscv_save_12) ++FUNC_END (__riscv_save_11) ++FUNC_END (__riscv_save_10) ++FUNC_END (__riscv_save_9) ++FUNC_END (__riscv_save_8) ++FUNC_END (__riscv_save_7) ++FUNC_END (__riscv_save_6) ++FUNC_END (__riscv_save_5) ++FUNC_END (__riscv_save_4) ++ ++FUNC_BEGIN (__riscv_save_3) ++FUNC_BEGIN (__riscv_save_2) ++FUNC_BEGIN (__riscv_save_1) ++FUNC_BEGIN (__riscv_save_0) + .cfi_startproc + # __riscv_save_* routine use t0/x5 as return address + .cfi_return_column 5 +@@ -377,8 +386,12 @@ __riscv_save_0: + .cfi_offset 1, -4 + jr t0 + .cfi_endproc ++FUNC_END (__riscv_save_3) ++FUNC_END (__riscv_save_2) ++FUNC_END (__riscv_save_1) ++FUNC_END (__riscv_save_0) + +-__riscv_restore_12: ++FUNC_BEGIN (__riscv_restore_12) + .cfi_startproc + .cfi_def_cfa_offset 64 + .cfi_offset 27, -52 +@@ -398,10 +411,10 @@ __riscv_restore_12: + .cfi_restore 27 + addi sp, sp, 16 + +-__riscv_restore_11: +-__riscv_restore_10: +-__riscv_restore_9: +-__riscv_restore_8: ++FUNC_BEGIN (__riscv_restore_11) ++FUNC_BEGIN (__riscv_restore_10) ++FUNC_BEGIN (__riscv_restore_9) ++FUNC_BEGIN (__riscv_restore_8) + .cfi_restore 27 + .cfi_def_cfa_offset 48 + lw s10, 0(sp) +@@ -414,10 +427,10 @@ __riscv_restore_8: + .cfi_restore 23 + addi sp, sp, 16 + +-__riscv_restore_7: +-__riscv_restore_6: +-__riscv_restore_5: +-__riscv_restore_4: ++FUNC_BEGIN (__riscv_restore_7) ++FUNC_BEGIN (__riscv_restore_6) ++FUNC_BEGIN (__riscv_restore_5) ++FUNC_BEGIN (__riscv_restore_4) + .cfi_restore 23 + .cfi_restore 24 + .cfi_restore 25 +@@ -434,10 +447,10 @@ __riscv_restore_4: + .cfi_restore 19 + addi sp, sp, 16 + +-__riscv_restore_3: +-__riscv_restore_2: +-__riscv_restore_1: +-__riscv_restore_0: ++FUNC_BEGIN (__riscv_restore_3) ++FUNC_BEGIN (__riscv_restore_2) ++FUNC_BEGIN (__riscv_restore_1) ++FUNC_BEGIN (__riscv_restore_0) + .cfi_restore 19 + .cfi_restore 20 + .cfi_restore 21 +@@ -459,5 +472,18 @@ __riscv_restore_0: + .cfi_def_cfa_offset 0 + ret + .cfi_endproc ++FUNC_END (__riscv_restore_12) ++FUNC_END (__riscv_restore_11) ++FUNC_END (__riscv_restore_10) ++FUNC_END (__riscv_restore_9) ++FUNC_END (__riscv_restore_8) ++FUNC_END (__riscv_restore_7) ++FUNC_END (__riscv_restore_6) ++FUNC_END (__riscv_restore_5) ++FUNC_END (__riscv_restore_4) ++FUNC_END (__riscv_restore_3) ++FUNC_END (__riscv_restore_2) ++FUNC_END (__riscv_restore_1) ++FUNC_END (__riscv_restore_0) + + #endif +-- +2.49.0 + diff --git a/packages/gcc/7.5.0/0032-riscv-Make-__divdi3-handle-div-by-zero-same-as-hard.patch b/packages/gcc/7.5.0/0032-riscv-Make-__divdi3-handle-div-by-zero-same-as-hard.patch new file mode 100644 index 0000000000..47c251049c --- /dev/null +++ b/packages/gcc/7.5.0/0032-riscv-Make-__divdi3-handle-div-by-zero-same-as-hard.patch @@ -0,0 +1,40 @@ +From 4013baf99c38f7bca06a51f8301e8fb195ccfa33 Mon Sep 17 00:00:00 2001 +From: Jim Wilson +Date: Tue, 2 Jun 2020 11:19:39 -0700 +Subject: [PATCH] RISC-V: Make __divdi3 handle div by zero same as hardware. + +The ISA manual specifies that divide by zero always returns -1 as the result. +We were failing to do that when the dividend was negative. + +Original patch from Virginie Moser. + + libgcc/ + * config/riscv/div.S (__divdi3): For negative arguments, change bgez + to bgtz. +--- + libgcc/config/riscv/div.S | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/libgcc/config/riscv/div.S b/libgcc/config/riscv/div.S +index 151f8e273a..17234324c1 100644 +--- a/libgcc/config/riscv/div.S ++++ b/libgcc/config/riscv/div.S +@@ -107,10 +107,12 @@ FUNC_END (__umoddi3) + /* Handle negative arguments to __divdi3. */ + .L10: + neg a0, a0 +- bgez a1, .L12 /* Compute __udivdi3(-a0, a1), then negate the result. */ ++ /* Zero is handled as a negative so that the result will not be inverted. */ ++ bgtz a1, .L12 /* Compute __udivdi3(-a0, a1), then negate the result. */ ++ + neg a1, a1 +- j __udivdi3 /* Compute __udivdi3(-a0, -a1). */ +-.L11: /* Compute __udivdi3(a0, -a1), then negate the result. */ ++ j __udivdi3 /* Compute __udivdi3(-a0, -a1). */ ++.L11: /* Compute __udivdi3(a0, -a1), then negate the result. */ + neg a1, a1 + .L12: + move t0, ra +-- +2.49.0 + diff --git a/packages/gcc/7.5.0/0033-riscv-jal-cannot-refer-to-a-default-visibility-symb.patch b/packages/gcc/7.5.0/0033-riscv-jal-cannot-refer-to-a-default-visibility-symb.patch new file mode 100644 index 0000000000..1422c69d9d --- /dev/null +++ b/packages/gcc/7.5.0/0033-riscv-jal-cannot-refer-to-a-default-visibility-symb.patch @@ -0,0 +1,120 @@ +From 45116f342057b7facecd3d05c2091ce3a77eda59 Mon Sep 17 00:00:00 2001 +From: Nelson Chu +Date: Mon, 29 Nov 2021 04:48:20 -0800 +Subject: [PATCH] RISC-V: jal cannot refer to a default visibility symbol for + shared object. + +This is the original binutils bugzilla report, +https://sourceware.org/bugzilla/show_bug.cgi?id=28509 + +And this is the first version of the proposed binutils patch, +https://sourceware.org/pipermail/binutils/2021-November/118398.html + +After applying the binutils patch, I get the the unexpected error when +building libgcc, + +/scratch/nelsonc/riscv-gnu-toolchain/riscv-gcc/libgcc/config/riscv/div.S:42: +/scratch/nelsonc/build-upstream/rv64gc-linux/build-install/riscv64-unknown-linux-gnu/bin/ld: relocation R_RISCV_JAL against `__udivdi3' which may bind externally can not be used when making a shared object; recompile with -fPIC + +Therefore, this patch add an extra hidden alias symbol for __udivdi3, and +then use HIDDEN_JUMPTARGET to target a non-preemptible symbol instead. +The solution is similar to glibc as follows, +https://sourceware.org/git/?p=glibc.git;a=commit;h=68389203832ab39dd0dbaabbc4059e7fff51c29b + +libgcc/ChangeLog: + + * config/riscv/div.S: Add the hidden alias symbol for __udivdi3, and + then use HIDDEN_JUMPTARGET to target it since it is non-preemptible. + * config/riscv/riscv-asm.h: Added new macros HIDDEN_JUMPTARGET and + HIDDEN_DEF. +--- + libgcc/config/riscv/div.S | 15 ++++++++------- + libgcc/config/riscv/riscv-asm.h | 6 ++++++ + 2 files changed, 14 insertions(+), 7 deletions(-) + +diff --git a/libgcc/config/riscv/div.S b/libgcc/config/riscv/div.S +index c9bd7879c1..723c3b82e4 100644 +--- a/libgcc/config/riscv/div.S ++++ b/libgcc/config/riscv/div.S +@@ -40,7 +40,7 @@ FUNC_BEGIN (__udivsi3) + sll a0, a0, 32 + sll a1, a1, 32 + move t0, ra +- jal __udivdi3 ++ jal HIDDEN_JUMPTARGET(__udivdi3) + sext.w a0, a0 + jr t0 + FUNC_END (__udivsi3) +@@ -52,7 +52,7 @@ FUNC_BEGIN (__umodsi3) + srl a0, a0, 32 + srl a1, a1, 32 + move t0, ra +- jal __udivdi3 ++ jal HIDDEN_JUMPTARGET(__udivdi3) + sext.w a0, a1 + jr t0 + FUNC_END (__umodsi3) +@@ -95,11 +95,12 @@ FUNC_BEGIN (__udivdi3) + .L5: + ret + FUNC_END (__udivdi3) ++HIDDEN_DEF (__udivdi3) + + FUNC_BEGIN (__umoddi3) + /* Call __udivdi3(a0, a1), then return the remainder, which is in a1. */ + move t0, ra +- jal __udivdi3 ++ jal HIDDEN_JUMPTARGET(__udivdi3) + move a0, a1 + jr t0 + FUNC_END (__umoddi3) +@@ -111,12 +112,12 @@ FUNC_END (__umoddi3) + bgtz a1, .L12 /* Compute __udivdi3(-a0, a1), then negate the result. */ + + neg a1, a1 +- j __udivdi3 /* Compute __udivdi3(-a0, -a1). */ ++ j HIDDEN_JUMPTARGET(__udivdi3) /* Compute __udivdi3(-a0, -a1). */ + .L11: /* Compute __udivdi3(a0, -a1), then negate the result. */ + neg a1, a1 + .L12: + move t0, ra +- jal __udivdi3 ++ jal HIDDEN_JUMPTARGET(__udivdi3) + neg a0, a0 + jr t0 + FUNC_END (__divdi3) +@@ -126,7 +127,7 @@ FUNC_BEGIN (__moddi3) + bltz a1, .L31 + bltz a0, .L32 + .L30: +- jal __udivdi3 /* The dividend is not negative. */ ++ jal HIDDEN_JUMPTARGET(__udivdi3) /* The dividend is not negative. */ + move a0, a1 + jr t0 + .L31: +@@ -134,7 +135,7 @@ FUNC_BEGIN (__moddi3) + bgez a0, .L30 + .L32: + neg a0, a0 +- jal __udivdi3 /* The dividend is hella negative. */ ++ jal HIDDEN_JUMPTARGET(__udivdi3) /* The dividend is hella negative. */ + neg a0, a1 + jr t0 + FUNC_END (__moddi3) +diff --git a/libgcc/config/riscv/riscv-asm.h b/libgcc/config/riscv/riscv-asm.h +index 8550707a4a..96dd85b0df 100644 +--- a/libgcc/config/riscv/riscv-asm.h ++++ b/libgcc/config/riscv/riscv-asm.h +@@ -33,3 +33,9 @@ X: + #define FUNC_ALIAS(X,Y) \ + .globl X; \ + X = Y ++ ++#define CONCAT1(a, b) CONCAT2(a, b) ++#define CONCAT2(a, b) a ## b ++#define HIDDEN_JUMPTARGET(X) CONCAT1(__hidden_, X) ++#define HIDDEN_DEF(X) FUNC_ALIAS(HIDDEN_JUMPTARGET(X), X); \ ++ .hidden HIDDEN_JUMPTARGET(X) +-- +2.49.0 + diff --git a/packages/gcc/8.5.0/0033-riscv-Make-__divdi3-handle-div-by-zero-same-as-hard.patch b/packages/gcc/8.5.0/0033-riscv-Make-__divdi3-handle-div-by-zero-same-as-hard.patch new file mode 100644 index 0000000000..47c251049c --- /dev/null +++ b/packages/gcc/8.5.0/0033-riscv-Make-__divdi3-handle-div-by-zero-same-as-hard.patch @@ -0,0 +1,40 @@ +From 4013baf99c38f7bca06a51f8301e8fb195ccfa33 Mon Sep 17 00:00:00 2001 +From: Jim Wilson +Date: Tue, 2 Jun 2020 11:19:39 -0700 +Subject: [PATCH] RISC-V: Make __divdi3 handle div by zero same as hardware. + +The ISA manual specifies that divide by zero always returns -1 as the result. +We were failing to do that when the dividend was negative. + +Original patch from Virginie Moser. + + libgcc/ + * config/riscv/div.S (__divdi3): For negative arguments, change bgez + to bgtz. +--- + libgcc/config/riscv/div.S | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/libgcc/config/riscv/div.S b/libgcc/config/riscv/div.S +index 151f8e273a..17234324c1 100644 +--- a/libgcc/config/riscv/div.S ++++ b/libgcc/config/riscv/div.S +@@ -107,10 +107,12 @@ FUNC_END (__umoddi3) + /* Handle negative arguments to __divdi3. */ + .L10: + neg a0, a0 +- bgez a1, .L12 /* Compute __udivdi3(-a0, a1), then negate the result. */ ++ /* Zero is handled as a negative so that the result will not be inverted. */ ++ bgtz a1, .L12 /* Compute __udivdi3(-a0, a1), then negate the result. */ ++ + neg a1, a1 +- j __udivdi3 /* Compute __udivdi3(-a0, -a1). */ +-.L11: /* Compute __udivdi3(a0, -a1), then negate the result. */ ++ j __udivdi3 /* Compute __udivdi3(-a0, -a1). */ ++.L11: /* Compute __udivdi3(a0, -a1), then negate the result. */ + neg a1, a1 + .L12: + move t0, ra +-- +2.49.0 + diff --git a/packages/gcc/8.5.0/0034-riscv-jal-cannot-refer-to-a-default-visibility-symb.patch b/packages/gcc/8.5.0/0034-riscv-jal-cannot-refer-to-a-default-visibility-symb.patch new file mode 100644 index 0000000000..1422c69d9d --- /dev/null +++ b/packages/gcc/8.5.0/0034-riscv-jal-cannot-refer-to-a-default-visibility-symb.patch @@ -0,0 +1,120 @@ +From 45116f342057b7facecd3d05c2091ce3a77eda59 Mon Sep 17 00:00:00 2001 +From: Nelson Chu +Date: Mon, 29 Nov 2021 04:48:20 -0800 +Subject: [PATCH] RISC-V: jal cannot refer to a default visibility symbol for + shared object. + +This is the original binutils bugzilla report, +https://sourceware.org/bugzilla/show_bug.cgi?id=28509 + +And this is the first version of the proposed binutils patch, +https://sourceware.org/pipermail/binutils/2021-November/118398.html + +After applying the binutils patch, I get the the unexpected error when +building libgcc, + +/scratch/nelsonc/riscv-gnu-toolchain/riscv-gcc/libgcc/config/riscv/div.S:42: +/scratch/nelsonc/build-upstream/rv64gc-linux/build-install/riscv64-unknown-linux-gnu/bin/ld: relocation R_RISCV_JAL against `__udivdi3' which may bind externally can not be used when making a shared object; recompile with -fPIC + +Therefore, this patch add an extra hidden alias symbol for __udivdi3, and +then use HIDDEN_JUMPTARGET to target a non-preemptible symbol instead. +The solution is similar to glibc as follows, +https://sourceware.org/git/?p=glibc.git;a=commit;h=68389203832ab39dd0dbaabbc4059e7fff51c29b + +libgcc/ChangeLog: + + * config/riscv/div.S: Add the hidden alias symbol for __udivdi3, and + then use HIDDEN_JUMPTARGET to target it since it is non-preemptible. + * config/riscv/riscv-asm.h: Added new macros HIDDEN_JUMPTARGET and + HIDDEN_DEF. +--- + libgcc/config/riscv/div.S | 15 ++++++++------- + libgcc/config/riscv/riscv-asm.h | 6 ++++++ + 2 files changed, 14 insertions(+), 7 deletions(-) + +diff --git a/libgcc/config/riscv/div.S b/libgcc/config/riscv/div.S +index c9bd7879c1..723c3b82e4 100644 +--- a/libgcc/config/riscv/div.S ++++ b/libgcc/config/riscv/div.S +@@ -40,7 +40,7 @@ FUNC_BEGIN (__udivsi3) + sll a0, a0, 32 + sll a1, a1, 32 + move t0, ra +- jal __udivdi3 ++ jal HIDDEN_JUMPTARGET(__udivdi3) + sext.w a0, a0 + jr t0 + FUNC_END (__udivsi3) +@@ -52,7 +52,7 @@ FUNC_BEGIN (__umodsi3) + srl a0, a0, 32 + srl a1, a1, 32 + move t0, ra +- jal __udivdi3 ++ jal HIDDEN_JUMPTARGET(__udivdi3) + sext.w a0, a1 + jr t0 + FUNC_END (__umodsi3) +@@ -95,11 +95,12 @@ FUNC_BEGIN (__udivdi3) + .L5: + ret + FUNC_END (__udivdi3) ++HIDDEN_DEF (__udivdi3) + + FUNC_BEGIN (__umoddi3) + /* Call __udivdi3(a0, a1), then return the remainder, which is in a1. */ + move t0, ra +- jal __udivdi3 ++ jal HIDDEN_JUMPTARGET(__udivdi3) + move a0, a1 + jr t0 + FUNC_END (__umoddi3) +@@ -111,12 +112,12 @@ FUNC_END (__umoddi3) + bgtz a1, .L12 /* Compute __udivdi3(-a0, a1), then negate the result. */ + + neg a1, a1 +- j __udivdi3 /* Compute __udivdi3(-a0, -a1). */ ++ j HIDDEN_JUMPTARGET(__udivdi3) /* Compute __udivdi3(-a0, -a1). */ + .L11: /* Compute __udivdi3(a0, -a1), then negate the result. */ + neg a1, a1 + .L12: + move t0, ra +- jal __udivdi3 ++ jal HIDDEN_JUMPTARGET(__udivdi3) + neg a0, a0 + jr t0 + FUNC_END (__divdi3) +@@ -126,7 +127,7 @@ FUNC_BEGIN (__moddi3) + bltz a1, .L31 + bltz a0, .L32 + .L30: +- jal __udivdi3 /* The dividend is not negative. */ ++ jal HIDDEN_JUMPTARGET(__udivdi3) /* The dividend is not negative. */ + move a0, a1 + jr t0 + .L31: +@@ -134,7 +135,7 @@ FUNC_BEGIN (__moddi3) + bgez a0, .L30 + .L32: + neg a0, a0 +- jal __udivdi3 /* The dividend is hella negative. */ ++ jal HIDDEN_JUMPTARGET(__udivdi3) /* The dividend is hella negative. */ + neg a0, a1 + jr t0 + FUNC_END (__moddi3) +diff --git a/libgcc/config/riscv/riscv-asm.h b/libgcc/config/riscv/riscv-asm.h +index 8550707a4a..96dd85b0df 100644 +--- a/libgcc/config/riscv/riscv-asm.h ++++ b/libgcc/config/riscv/riscv-asm.h +@@ -33,3 +33,9 @@ X: + #define FUNC_ALIAS(X,Y) \ + .globl X; \ + X = Y ++ ++#define CONCAT1(a, b) CONCAT2(a, b) ++#define CONCAT2(a, b) a ## b ++#define HIDDEN_JUMPTARGET(X) CONCAT1(__hidden_, X) ++#define HIDDEN_DEF(X) FUNC_ALIAS(HIDDEN_JUMPTARGET(X), X); \ ++ .hidden HIDDEN_JUMPTARGET(X) +-- +2.49.0 + diff --git a/packages/gcc/9.5.0/0031-riscv-Make-__divdi3-handle-div-by-zero-same-as-hard.patch b/packages/gcc/9.5.0/0031-riscv-Make-__divdi3-handle-div-by-zero-same-as-hard.patch new file mode 100644 index 0000000000..47c251049c --- /dev/null +++ b/packages/gcc/9.5.0/0031-riscv-Make-__divdi3-handle-div-by-zero-same-as-hard.patch @@ -0,0 +1,40 @@ +From 4013baf99c38f7bca06a51f8301e8fb195ccfa33 Mon Sep 17 00:00:00 2001 +From: Jim Wilson +Date: Tue, 2 Jun 2020 11:19:39 -0700 +Subject: [PATCH] RISC-V: Make __divdi3 handle div by zero same as hardware. + +The ISA manual specifies that divide by zero always returns -1 as the result. +We were failing to do that when the dividend was negative. + +Original patch from Virginie Moser. + + libgcc/ + * config/riscv/div.S (__divdi3): For negative arguments, change bgez + to bgtz. +--- + libgcc/config/riscv/div.S | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/libgcc/config/riscv/div.S b/libgcc/config/riscv/div.S +index 151f8e273a..17234324c1 100644 +--- a/libgcc/config/riscv/div.S ++++ b/libgcc/config/riscv/div.S +@@ -107,10 +107,12 @@ FUNC_END (__umoddi3) + /* Handle negative arguments to __divdi3. */ + .L10: + neg a0, a0 +- bgez a1, .L12 /* Compute __udivdi3(-a0, a1), then negate the result. */ ++ /* Zero is handled as a negative so that the result will not be inverted. */ ++ bgtz a1, .L12 /* Compute __udivdi3(-a0, a1), then negate the result. */ ++ + neg a1, a1 +- j __udivdi3 /* Compute __udivdi3(-a0, -a1). */ +-.L11: /* Compute __udivdi3(a0, -a1), then negate the result. */ ++ j __udivdi3 /* Compute __udivdi3(-a0, -a1). */ ++.L11: /* Compute __udivdi3(a0, -a1), then negate the result. */ + neg a1, a1 + .L12: + move t0, ra +-- +2.49.0 + diff --git a/packages/gcc/9.5.0/0032-riscv-jal-cannot-refer-to-a-default-visibility-symb.patch b/packages/gcc/9.5.0/0032-riscv-jal-cannot-refer-to-a-default-visibility-symb.patch new file mode 100644 index 0000000000..1422c69d9d --- /dev/null +++ b/packages/gcc/9.5.0/0032-riscv-jal-cannot-refer-to-a-default-visibility-symb.patch @@ -0,0 +1,120 @@ +From 45116f342057b7facecd3d05c2091ce3a77eda59 Mon Sep 17 00:00:00 2001 +From: Nelson Chu +Date: Mon, 29 Nov 2021 04:48:20 -0800 +Subject: [PATCH] RISC-V: jal cannot refer to a default visibility symbol for + shared object. + +This is the original binutils bugzilla report, +https://sourceware.org/bugzilla/show_bug.cgi?id=28509 + +And this is the first version of the proposed binutils patch, +https://sourceware.org/pipermail/binutils/2021-November/118398.html + +After applying the binutils patch, I get the the unexpected error when +building libgcc, + +/scratch/nelsonc/riscv-gnu-toolchain/riscv-gcc/libgcc/config/riscv/div.S:42: +/scratch/nelsonc/build-upstream/rv64gc-linux/build-install/riscv64-unknown-linux-gnu/bin/ld: relocation R_RISCV_JAL against `__udivdi3' which may bind externally can not be used when making a shared object; recompile with -fPIC + +Therefore, this patch add an extra hidden alias symbol for __udivdi3, and +then use HIDDEN_JUMPTARGET to target a non-preemptible symbol instead. +The solution is similar to glibc as follows, +https://sourceware.org/git/?p=glibc.git;a=commit;h=68389203832ab39dd0dbaabbc4059e7fff51c29b + +libgcc/ChangeLog: + + * config/riscv/div.S: Add the hidden alias symbol for __udivdi3, and + then use HIDDEN_JUMPTARGET to target it since it is non-preemptible. + * config/riscv/riscv-asm.h: Added new macros HIDDEN_JUMPTARGET and + HIDDEN_DEF. +--- + libgcc/config/riscv/div.S | 15 ++++++++------- + libgcc/config/riscv/riscv-asm.h | 6 ++++++ + 2 files changed, 14 insertions(+), 7 deletions(-) + +diff --git a/libgcc/config/riscv/div.S b/libgcc/config/riscv/div.S +index c9bd7879c1..723c3b82e4 100644 +--- a/libgcc/config/riscv/div.S ++++ b/libgcc/config/riscv/div.S +@@ -40,7 +40,7 @@ FUNC_BEGIN (__udivsi3) + sll a0, a0, 32 + sll a1, a1, 32 + move t0, ra +- jal __udivdi3 ++ jal HIDDEN_JUMPTARGET(__udivdi3) + sext.w a0, a0 + jr t0 + FUNC_END (__udivsi3) +@@ -52,7 +52,7 @@ FUNC_BEGIN (__umodsi3) + srl a0, a0, 32 + srl a1, a1, 32 + move t0, ra +- jal __udivdi3 ++ jal HIDDEN_JUMPTARGET(__udivdi3) + sext.w a0, a1 + jr t0 + FUNC_END (__umodsi3) +@@ -95,11 +95,12 @@ FUNC_BEGIN (__udivdi3) + .L5: + ret + FUNC_END (__udivdi3) ++HIDDEN_DEF (__udivdi3) + + FUNC_BEGIN (__umoddi3) + /* Call __udivdi3(a0, a1), then return the remainder, which is in a1. */ + move t0, ra +- jal __udivdi3 ++ jal HIDDEN_JUMPTARGET(__udivdi3) + move a0, a1 + jr t0 + FUNC_END (__umoddi3) +@@ -111,12 +112,12 @@ FUNC_END (__umoddi3) + bgtz a1, .L12 /* Compute __udivdi3(-a0, a1), then negate the result. */ + + neg a1, a1 +- j __udivdi3 /* Compute __udivdi3(-a0, -a1). */ ++ j HIDDEN_JUMPTARGET(__udivdi3) /* Compute __udivdi3(-a0, -a1). */ + .L11: /* Compute __udivdi3(a0, -a1), then negate the result. */ + neg a1, a1 + .L12: + move t0, ra +- jal __udivdi3 ++ jal HIDDEN_JUMPTARGET(__udivdi3) + neg a0, a0 + jr t0 + FUNC_END (__divdi3) +@@ -126,7 +127,7 @@ FUNC_BEGIN (__moddi3) + bltz a1, .L31 + bltz a0, .L32 + .L30: +- jal __udivdi3 /* The dividend is not negative. */ ++ jal HIDDEN_JUMPTARGET(__udivdi3) /* The dividend is not negative. */ + move a0, a1 + jr t0 + .L31: +@@ -134,7 +135,7 @@ FUNC_BEGIN (__moddi3) + bgez a0, .L30 + .L32: + neg a0, a0 +- jal __udivdi3 /* The dividend is hella negative. */ ++ jal HIDDEN_JUMPTARGET(__udivdi3) /* The dividend is hella negative. */ + neg a0, a1 + jr t0 + FUNC_END (__moddi3) +diff --git a/libgcc/config/riscv/riscv-asm.h b/libgcc/config/riscv/riscv-asm.h +index 8550707a4a..96dd85b0df 100644 +--- a/libgcc/config/riscv/riscv-asm.h ++++ b/libgcc/config/riscv/riscv-asm.h +@@ -33,3 +33,9 @@ X: + #define FUNC_ALIAS(X,Y) \ + .globl X; \ + X = Y ++ ++#define CONCAT1(a, b) CONCAT2(a, b) ++#define CONCAT2(a, b) a ## b ++#define HIDDEN_JUMPTARGET(X) CONCAT1(__hidden_, X) ++#define HIDDEN_DEF(X) FUNC_ALIAS(HIDDEN_JUMPTARGET(X), X); \ ++ .hidden HIDDEN_JUMPTARGET(X) +-- +2.49.0 + diff --git a/packages/gcc/package.desc b/packages/gcc/package.desc index 689c539560..35ff82d8ac 100644 --- a/packages/gcc/package.desc +++ b/packages/gcc/package.desc @@ -2,5 +2,5 @@ repository='git git://gcc.gnu.org/git/gcc.git' mirrors='$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})' relevantpattern='4.*|. *|.' origin='GNU' -milestones='4.9 5 6 7 8 9 10 11 12 13 14' +milestones='4.9 5 6 7 8 9 10 11 12 13 14 15' archive_formats='.tar.xz .tar.gz' diff --git a/packages/gdb/15.1/chksum b/packages/gdb/15.1/chksum deleted file mode 100644 index bd0694fa8e..0000000000 --- a/packages/gdb/15.1/chksum +++ /dev/null @@ -1,8 +0,0 @@ -md5 gdb-15.1.tar.xz 494e3beaac44e66367c3e443a4414529 -sha1 gdb-15.1.tar.xz 2b4e9357e498c66bbedf791883569104edea0472 -sha256 gdb-15.1.tar.xz 38254eacd4572134bca9c5a5aa4d4ca564cbbd30c369d881f733fb6b903354f2 -sha512 gdb-15.1.tar.xz 0217434073023a8b8316088bf3ee95d53a1b6a7897f6269095429016a8900f9a05e130c390d8d5d5550cc515c16519de1071d8eef96aa58e38056c7e37da1d8b -md5 gdb-15.1.tar.gz 58dadf8ff03f3341ff05a02f3301150a -sha1 gdb-15.1.tar.gz a6c190017b9620103d71343cfadd88172d382565 -sha256 gdb-15.1.tar.gz 8b61b0c2bdd9d9c83b113c9167866bdb474651d291fedcaa5eb7cde49bd47036 -sha512 gdb-15.1.tar.gz 0999d58a70614743ccb364f42fb2203e5f531c45ff83e1b8dcfefe281e001c9af9be668c05d757bed76d86cbf1c1f4275afdef5c779aafc88672c63c4d3e1093 diff --git a/packages/gdb/15.2/0000-readline-bring-in-signal.c-from-gdb-16-branch.patch b/packages/gdb/15.2/0000-readline-bring-in-signal.c-from-gdb-16-branch.patch new file mode 100644 index 0000000000..e5c58ea411 --- /dev/null +++ b/packages/gdb/15.2/0000-readline-bring-in-signal.c-from-gdb-16-branch.patch @@ -0,0 +1,164 @@ +From 6c96a41828a0f34cc4480c08a9c23e0ab2ed2cc0 Mon Sep 17 00:00:00 2001 +From: Chris Packham +Date: Mon, 2 Jun 2025 15:15:05 +1200 +Subject: [PATCH] readline: bring in signal.c from gdb-16 branch + +Readline is updated in gdb-16. This has fixes for some build issues with +newer C23 compilers but is a little too big to just bring in on it's +own. Bring in signal.c from the gdb-16 branch to resolve the immediate +issues. +--- + readline/readline/signals.c | 71 +++++++++++++------------------------------- + 1 file changed, 22 insertions(+), 49 deletions(-) + +--- a/readline/readline/signals.c ++++ b/readline/readline/signals.c +@@ -1,6 +1,6 @@ + /* signals.c -- signal handling support for readline. */ + +-/* Copyright (C) 1987-2017 Free Software Foundation, Inc. ++/* Copyright (C) 1987-2021 Free Software Foundation, Inc. + + This file is part of the GNU Readline Library (Readline), a library + for reading lines of text with interactive input and history editing. +@@ -48,23 +48,11 @@ + + #if defined (HANDLE_SIGNALS) + +-#if !defined (RETSIGTYPE) +-# if defined (VOID_SIGHANDLER) +-# define RETSIGTYPE void +-# else +-# define RETSIGTYPE int +-# endif /* !VOID_SIGHANDLER */ +-#endif /* !RETSIGTYPE */ +- +-#if defined (VOID_SIGHANDLER) +-# define SIGHANDLER_RETURN return +-#else +-# define SIGHANDLER_RETURN return (0) +-#endif ++#define SIGHANDLER_RETURN return + + /* This typedef is equivalent to the one for Function; it allows us + to say SigHandler *foo = signal (SIGKILL, SIG_IGN); */ +-typedef RETSIGTYPE SigHandler (); ++typedef void SigHandler (int); + + #if defined (HAVE_POSIX_SIGNALS) + typedef struct sigaction sighandler_cxt; +@@ -78,12 +66,12 @@ + # define SA_RESTART 0 + #endif + +-static SigHandler *rl_set_sighandler PARAMS((int, SigHandler *, sighandler_cxt *)); +-static void rl_maybe_set_sighandler PARAMS((int, SigHandler *, sighandler_cxt *)); +-static void rl_maybe_restore_sighandler PARAMS((int, sighandler_cxt *)); ++static SigHandler *rl_set_sighandler (int, SigHandler *, sighandler_cxt *); ++static void rl_maybe_set_sighandler (int, SigHandler *, sighandler_cxt *); ++static void rl_maybe_restore_sighandler (int, sighandler_cxt *); + +-static RETSIGTYPE rl_signal_handler PARAMS((int)); +-static RETSIGTYPE _rl_handle_signal PARAMS((int)); ++static void rl_signal_handler (int); ++static void _rl_handle_signal (int); + + /* Exported variables for use by applications. */ + +@@ -136,7 +124,7 @@ + /* Readline signal handler functions. */ + + /* Called from RL_CHECK_SIGNALS() macro to run signal handling code. */ +-RETSIGTYPE ++void + _rl_signal_handler (int sig) + { + _rl_caught_signal = 0; /* XXX */ +@@ -163,7 +151,7 @@ + SIGHANDLER_RETURN; + } + +-static RETSIGTYPE ++static void + rl_signal_handler (int sig) + { + _rl_caught_signal = sig; +@@ -173,7 +161,7 @@ + /* This is called to handle a signal when it is safe to do so (out of the + signal handler execution path). Called by _rl_signal_handler for all the + signals readline catches except SIGWINCH. */ +-static RETSIGTYPE ++static void + _rl_handle_signal (int sig) + { + int block_sig; +@@ -222,6 +210,9 @@ + switch (sig) + { + case SIGINT: ++ /* We will end up blocking SIGTTOU while we are resetting the tty, so ++ watch out for this if it causes problems. We could prevent this by ++ setting block_sig to 1 without modifying SET. */ + _rl_reset_completion_state (); + rl_free_line_state (); + #if defined (READLINE_CALLBACKS) +@@ -242,8 +233,11 @@ + this even if we've been stopped on SIGTTOU, since we handle signals + when we have returned from the signal handler and the signal is no + longer blocked. */ +- sigaddset (&set, SIGTTOU); +- block_sig = 1; ++ if (block_sig == 0) ++ { ++ sigaddset (&set, SIGTTOU); ++ block_sig = 1; ++ } + # endif + #endif /* SIGTSTP */ + /* Any signals that should be blocked during cleanup should go here. */ +@@ -285,19 +279,6 @@ + + /* We don't have to bother unblocking the signal because we are not + running in a signal handler context. */ +-#if 0 +-#if defined (HAVE_POSIX_SIGNALS) +- /* Make sure this signal is not blocked when we resend it to the +- calling application. */ +- sigemptyset (&set); +- sigprocmask (SIG_BLOCK, (sigset_t *)NULL, &set); +- sigdelset (&set, sig); +-#else /* !HAVE_POSIX_SIGNALS */ +-# if defined (HAVE_BSD_SIGNALS) +- omask = sigblock (0); +-# endif /* HAVE_BSD_SIGNALS */ +-#endif /* !HAVE_POSIX_SIGNALS */ +-#endif + + #if defined (__EMX__) + signal (sig, SIG_ACK); +@@ -311,16 +292,6 @@ + + /* We don't need to modify the signal mask now that this is not run in + a signal handler context. */ +-#if 0 +- /* Let the signal that we just sent through if it is blocked. */ +-#if defined (HAVE_POSIX_SIGNALS) +- sigprocmask (SIG_SETMASK, &set, (sigset_t *)NULL); +-#else /* !HAVE_POSIX_SIGNALS */ +-# if defined (HAVE_BSD_SIGNALS) +- sigsetmask (omask & ~(sigmask (sig))); +-# endif /* HAVE_BSD_SIGNALS */ +-#endif /* !HAVE_POSIX_SIGNALS */ +-#endif + + rl_reset_after_signal (); + } +@@ -330,7 +301,7 @@ + } + + #if defined (SIGWINCH) +-static RETSIGTYPE ++static void + rl_sigwinch_handler (int sig) + { + SigHandler *oh; diff --git a/packages/gdb/15.2/0001-readline-tcap.h-Update-definitions-for-C23.patch b/packages/gdb/15.2/0001-readline-tcap.h-Update-definitions-for-C23.patch new file mode 100644 index 0000000000..d62b2fc785 --- /dev/null +++ b/packages/gdb/15.2/0001-readline-tcap.h-Update-definitions-for-C23.patch @@ -0,0 +1,49 @@ +From 11d45226114bf2e1405964c81c7610a8d6074947 Mon Sep 17 00:00:00 2001 +From: Chris Packham +Date: Wed, 30 Apr 2025 16:37:48 +1200 +Subject: [PATCH] readline/tcap.h: Update definitions for C23 + +C23 changes how function definitions like int `int tputs ()` are +interpreted. In older standards this meant that the function arguments +are unknown. In C23 this is interpreted as `int tputs (void)` so now +when we compile with GCC15 (which defaults to -std=gnu23) we get an +error such as + + readline/display.c:2839:17: error: too many arguments to function 'tputs'; expected 0, have 3 + +Add the function arguments for tgetent(), tgetflag(), tgetnum(), +tgetstr(), tputs() and tgoto(). + +Signed-off-by: Chris Packham +--- + readline/readline/tcap.h | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/readline/readline/tcap.h b/readline/readline/tcap.h +index 859e6eed5aa..9e2ed124e49 100644 +--- a/readline/readline/tcap.h ++++ b/readline/readline/tcap.h +@@ -46,14 +46,14 @@ extern char *UP, *BC; + + extern short ospeed; + +-extern int tgetent (); +-extern int tgetflag (); +-extern int tgetnum (); +-extern char *tgetstr (); ++extern int tgetent (char *bp, const char *name); ++extern int tgetflag (char *id); ++extern int tgetnum (char *id); ++extern char *tgetstr (char *id, char **area); + +-extern int tputs (); ++extern int tputs (const char *str, int affcnt, int (*putc)(int)); + +-extern char *tgoto (); ++extern char *tgoto (const char *cap, int col, int row); + + #endif /* HAVE_TERMCAP_H */ + +-- +2.49.0 + diff --git a/packages/gdb/15.2/chksum b/packages/gdb/15.2/chksum new file mode 100644 index 0000000000..05e00e63b8 --- /dev/null +++ b/packages/gdb/15.2/chksum @@ -0,0 +1,8 @@ +md5 gdb-15.2.tar.xz 85c722e2f2baea2b7820a6a7eaea2ce8 +sha1 gdb-15.2.tar.xz f06b8694d2019e03f55560059aac4a5b70a32677 +sha256 gdb-15.2.tar.xz 83350ccd35b5b5a0cba6b334c41294ea968158c573940904f00b92f76345314d +sha512 gdb-15.2.tar.xz 624007deceb5b15ba89c0725883d1a699fa46714ef30887f3d0165e17c5d65d634671740a135aa69e437d916218abb08cfa2a38ed309ff19d48f51da56b2a8ba +md5 gdb-15.2.tar.gz e50e995c8c0b76be73c68bed6e747037 +sha1 gdb-15.2.tar.gz ae3666d429f4a8eab65667d300e2cba1233c4235 +sha256 gdb-15.2.tar.gz 9d16bc2539a2a20dc3ef99b48b8414d51c51305c8577eb7a1da00996f6dea223 +sha512 gdb-15.2.tar.gz 479bd15f0652bab53b71259fe433a4f583d7f1be7bbffba17a84398e4900c8baa29a0607cc6ff36b654e044da09c8b63ef37f0b852e780b7a2ab826cd06a2efa diff --git a/packages/linux/6.8.10/version.desc b/packages/gdb/15.2/version.desc similarity index 100% rename from packages/linux/6.8.10/version.desc rename to packages/gdb/15.2/version.desc diff --git a/packages/gdb/16.3/0001-readline-tcap.h-Update-definitions-for-C23.patch b/packages/gdb/16.3/0001-readline-tcap.h-Update-definitions-for-C23.patch new file mode 100644 index 0000000000..d62b2fc785 --- /dev/null +++ b/packages/gdb/16.3/0001-readline-tcap.h-Update-definitions-for-C23.patch @@ -0,0 +1,49 @@ +From 11d45226114bf2e1405964c81c7610a8d6074947 Mon Sep 17 00:00:00 2001 +From: Chris Packham +Date: Wed, 30 Apr 2025 16:37:48 +1200 +Subject: [PATCH] readline/tcap.h: Update definitions for C23 + +C23 changes how function definitions like int `int tputs ()` are +interpreted. In older standards this meant that the function arguments +are unknown. In C23 this is interpreted as `int tputs (void)` so now +when we compile with GCC15 (which defaults to -std=gnu23) we get an +error such as + + readline/display.c:2839:17: error: too many arguments to function 'tputs'; expected 0, have 3 + +Add the function arguments for tgetent(), tgetflag(), tgetnum(), +tgetstr(), tputs() and tgoto(). + +Signed-off-by: Chris Packham +--- + readline/readline/tcap.h | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/readline/readline/tcap.h b/readline/readline/tcap.h +index 859e6eed5aa..9e2ed124e49 100644 +--- a/readline/readline/tcap.h ++++ b/readline/readline/tcap.h +@@ -46,14 +46,14 @@ extern char *UP, *BC; + + extern short ospeed; + +-extern int tgetent (); +-extern int tgetflag (); +-extern int tgetnum (); +-extern char *tgetstr (); ++extern int tgetent (char *bp, const char *name); ++extern int tgetflag (char *id); ++extern int tgetnum (char *id); ++extern char *tgetstr (char *id, char **area); + +-extern int tputs (); ++extern int tputs (const char *str, int affcnt, int (*putc)(int)); + +-extern char *tgoto (); ++extern char *tgoto (const char *cap, int col, int row); + + #endif /* HAVE_TERMCAP_H */ + +-- +2.49.0 + diff --git a/packages/gdb/16.3/chksum b/packages/gdb/16.3/chksum new file mode 100644 index 0000000000..1d2fa479ad --- /dev/null +++ b/packages/gdb/16.3/chksum @@ -0,0 +1,8 @@ +md5 gdb-16.3.tar.xz f7a7e2d0a6d28622ac69a3623b23876b +sha1 gdb-16.3.tar.xz ac4b56773e6abe4a5467a0708a185b4279e8faf4 +sha256 gdb-16.3.tar.xz bcfcd095528a987917acf9fff3f1672181694926cc18d609c99d0042c00224c5 +sha512 gdb-16.3.tar.xz fffd6689c3405466a179670b04720dc825e4f210a761f63dd2b33027432f8cd5d1c059c431a5ec9e165eedd1901220b5329d73c522f9a444788888c731b29e9c +md5 gdb-16.3.tar.gz f7114f25fd3707bddf6d1c8eca61f614 +sha1 gdb-16.3.tar.gz 0e327ebcc557c9c3a3b7de3a541c6830491550aa +sha256 gdb-16.3.tar.gz 86015081217dc82c5485db9ce864dcc0b703759d2bdbe4441b095c5f900a6a37 +sha512 gdb-16.3.tar.gz 68fa3a1ac67cb07759210cf464d70dddbb89bc6d480112102c343ac111db2698c321aa5ddbc23d84da8cc3f54ecd32d9149d969be5ce666ac77c24be473f4f50 diff --git a/packages/linux/6.9.10/version.desc b/packages/gdb/16.3/version.desc similarity index 100% rename from packages/linux/6.9.10/version.desc rename to packages/gdb/16.3/version.desc diff --git a/packages/gdb/package.desc b/packages/gdb/package.desc index 08493b31ea..3250d1a440 100644 --- a/packages/gdb/package.desc +++ b/packages/gdb/package.desc @@ -2,5 +2,5 @@ origin='GNU' repository='git git://sourceware.org/git/binutils-gdb.git' mirrors='$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb/releases)' relevantpattern='[78].*|. *|.' -milestones='8.3 10 11 12 13 14 15' +milestones='8.3 10 11 12 13 14 15 16' archive_formats='.tar.xz .tar.gz' diff --git a/packages/gettext/0.20.1/0002-tparam-configure-fix.patch b/packages/gettext/0.20.1/0002-tparam-configure-fix.patch new file mode 100644 index 0000000000..331808e500 --- /dev/null +++ b/packages/gettext/0.20.1/0002-tparam-configure-fix.patch @@ -0,0 +1,49 @@ +[PATCH] tparam configure fix + +With a newer compiler the configure check for tparam/tparm fails with + +conftest.c: In function 'main': +conftest.c:95:8: error: returning 'char *' from a function with return type 'int' makes integer from pointer without a cast [-Wint-conversion] + 95 | return tparam ("\033\133%dm", &buf, 1, 8); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +configure:23675: $? = 1 +conftest.c: In function 'main': +conftest.c:94:8: error: returning 'char *' from a function with return type 'int' makes integer from pointer without a cast [-Wint-conversion] + 94 | return tparm ("\033\133%dm", 8); + | ^~~~~~~~~~~~~~~~~~~~~~~~ +configure:23719: $? = 1 + +This causes libtextstyle to backfill these two functions from gnulib which +eventually causes a link error + +ld.bfd: buildtools/complibs-host/lib/libncurses.a(lib_tparm.o): in function `tparm': +src/ncurses/ncurses/tinfo/lib_tparm.c:1093: multiple definition of `tparm'; ../lib/.libs/libtextstyle.a(tparm.o):src/gettext/libtextstyle/lib/tparm.c:256: first defined here + +Update the configure check to something that will correctly determine if +tparam/tparm need to be back-filled. + +Signed-off-by: Chris Packham +--- + libtextstyle/configure | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/libtextstyle/configure ++++ b/libtextstyle/configure +@@ -23667,7 +23667,7 @@ + int + main () + { +-return tparam ("\033\133%dm", &buf, 1, 8); ++return ! tparam ("\033\133%dm", &buf, 1, 8); + ; + return 0; + } +@@ -23711,7 +23711,7 @@ + int + main () + { +-return tparm ("\033\133%dm", 8); ++return ! tparm ("\033\133%dm", 8); + ; + return 0; + } diff --git a/packages/gettext/0.20.1/0003-Fix-compilation-errors-with-ISO-C-23-compilers.patch b/packages/gettext/0.20.1/0003-Fix-compilation-errors-with-ISO-C-23-compilers.patch new file mode 100644 index 0000000000..c0ab21b4a6 --- /dev/null +++ b/packages/gettext/0.20.1/0003-Fix-compilation-errors-with-ISO-C-23-compilers.patch @@ -0,0 +1,51 @@ +From eb8a76522689a010a595071ce753ed489cbad7ff Mon Sep 17 00:00:00 2001 +From: Bruno Haible +Date: Thu, 9 Feb 2023 16:58:20 +0100 +Subject: [PATCH] Fix compilation errors with ISO C 23 compilers. + +* gettext-runtime/intl/dcigettext.c (getwd, getcwd): Assume a declaration in the +system header files. +* gettext-runtime/intl/gettextP.h (SWAP): Drop K&C compatibility. +--- + gettext-runtime/intl/dcigettext.c | 3 --- + gettext-runtime/intl/gettextP.h | 5 ----- + 2 files changed, 8 deletions(-) + +diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c +index ba333303f..85e0d6aad 100644 +--- a/gettext-runtime/intl/dcigettext.c ++++ b/gettext-runtime/intl/dcigettext.c +@@ -138,13 +138,10 @@ extern int errno; + # define tfind __tfind + #else + # if !defined HAVE_GETCWD +-char *getwd (); + # define getcwd(buf, max) getwd (buf) + # else + # if VMS + # define getcwd(buf, max) (getcwd) (buf, max, 0) +-# else +-char *getcwd (); + # endif + # endif + # ifndef HAVE_STPCPY +diff --git a/gettext-runtime/intl/gettextP.h b/gettext-runtime/intl/gettextP.h +index 0d7dbd6d4..1b7186552 100644 +--- a/gettext-runtime/intl/gettextP.h ++++ b/gettext-runtime/intl/gettextP.h +@@ -113,12 +113,7 @@ extern char *libintl_dcigettext (const char *__domainname, + # define SWAP(i) bswap_32 (i) + #else + static inline nls_uint32 +-# ifdef __cplusplus + SWAP (nls_uint32 i) +-# else +-SWAP (i) +- nls_uint32 i; +-# endif + { + return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24); + } +-- +2.49.0 + diff --git a/packages/gettext/0.22.5/chksum b/packages/gettext/0.22.5/chksum index 953db4bc1a..699fc1b586 100644 --- a/packages/gettext/0.22.5/chksum +++ b/packages/gettext/0.22.5/chksum @@ -1,8 +1,8 @@ -md5 gettext-0.22.5.tar.gz 1245c87cfa0b123f55540681af396880 -sha1 gettext-0.22.5.tar.gz 1c3911796312efd8119da7a292edef305bdb71bb -sha256 gettext-0.22.5.tar.gz ec1705b1e969b83a9f073144ec806151db88127f5e40fe5a94cb6c8fa48996a0 -sha512 gettext-0.22.5.tar.gz d8b22d7fba10052a2045f477f0a5b684d932513bdb3b295c22fbd9dfc2a9d8fccd9aefd90692136c62897149aa2f7d1145ce6618aa1f0be787cb88eba5bc09be md5 gettext-0.22.5.tar.xz 3ae5580599d84be93e6213930facb2db sha1 gettext-0.22.5.tar.xz 396a3b2a0c66ca113f6a91fca8772f752f1696e4 sha256 gettext-0.22.5.tar.xz fe10c37353213d78a5b83d48af231e005c4da84db5ce88037d88355938259640 sha512 gettext-0.22.5.tar.xz a60999bb9d09441f138214d87acb7e59aab81e765bb9253a77c54902681c5de164a5a04de2a9778dfb479dbdefaab2d5de1fbaf6095c555c43e7e9fd7a1c09bd +md5 gettext-0.22.5.tar.gz 1245c87cfa0b123f55540681af396880 +sha1 gettext-0.22.5.tar.gz 1c3911796312efd8119da7a292edef305bdb71bb +sha256 gettext-0.22.5.tar.gz ec1705b1e969b83a9f073144ec806151db88127f5e40fe5a94cb6c8fa48996a0 +sha512 gettext-0.22.5.tar.gz d8b22d7fba10052a2045f477f0a5b684d932513bdb3b295c22fbd9dfc2a9d8fccd9aefd90692136c62897149aa2f7d1145ce6618aa1f0be787cb88eba5bc09be diff --git a/packages/gettext/0.23.1/chksum b/packages/gettext/0.23.1/chksum new file mode 100644 index 0000000000..3f68a404b7 --- /dev/null +++ b/packages/gettext/0.23.1/chksum @@ -0,0 +1,8 @@ +md5 gettext-0.23.1.tar.xz 1a174902c396e95c7d9761033fe1360e +sha1 gettext-0.23.1.tar.xz 21e0c340de0c79f9d93f970f4a6bdafaa7dc8fe7 +sha256 gettext-0.23.1.tar.xz c1f97a72a7385b7e71dd07b5fea6cdaf12c9b88b564976b23bd8c11857af2970 +sha512 gettext-0.23.1.tar.xz d75908f73eabe36c01d72d342ca694dbefad5f43da54f0ccb43bfd0518baff5becc8f50e787f21fadb7c29b3123638e4559334ea4f8e48a97107e8c5e22453b6 +md5 gettext-0.23.1.tar.gz 50889348408eb278ed0c9c913c325f30 +sha1 gettext-0.23.1.tar.gz 3faf57a14ada2a9772360beb6659374cc20ca8c8 +sha256 gettext-0.23.1.tar.gz 52a578960fe308742367d75cd1dff8552c5797bd0beba7639e12bdcda28c0e49 +sha512 gettext-0.23.1.tar.gz 39ccf78961e4baae761a6117dcec02957bbbdbd398197b8b11ea18e53c04bf2500a7c143d3f9ea3ded48c55f71a323eb05ee0e461c1d9b397297e971b8ad6eef diff --git a/packages/m4/1.4.19/version.desc b/packages/gettext/0.23.1/version.desc similarity index 100% rename from packages/m4/1.4.19/version.desc rename to packages/gettext/0.23.1/version.desc diff --git a/packages/gettext/0.26/chksum b/packages/gettext/0.26/chksum new file mode 100644 index 0000000000..570388e52c --- /dev/null +++ b/packages/gettext/0.26/chksum @@ -0,0 +1,8 @@ +md5 gettext-0.26.tar.xz 8e14e926f088e292f5f2bce95b81d10e +sha1 gettext-0.26.tar.xz 06caeffe13e4e9f92912e8c4d99d340790f463ae +sha256 gettext-0.26.tar.xz d1fb86e260cfe7da6031f94d2e44c0da55903dbae0a2fa0fae78c91ae1b56f00 +sha512 gettext-0.26.tar.xz 544e41c9390695df1c21542842e9ca027a03cb7d4045d8cd759dec1a3dfb624aae900751b458bdb31d6454b37c40c474a952059b884555a03c7c95d6d0e687b1 +md5 gettext-0.26.tar.gz ee66cf742805c0027a7f3db5f2d3f7eb +sha1 gettext-0.26.tar.gz 303f56fa7f0acba9400b6e92afe2f9cdcf0ce8e7 +sha256 gettext-0.26.tar.gz 39acf4b0371e9b110b60005562aace5b3631fed9b1bb9ecccfc7f56e58bb1d7f +sha512 gettext-0.26.tar.gz 6c2afb0737843028e1cd27f1cd7dd5b81372ccff8cd8e01e17cfdc517afdd9a849c232f1ff5adca5eb4b03f2cc64f4a3f689ae8b84e523ceeae85384f3844083 diff --git a/packages/make/4.4/version.desc b/packages/gettext/0.26/version.desc similarity index 100% rename from packages/make/4.4/version.desc rename to packages/gettext/0.26/version.desc diff --git a/packages/gettext/package.desc b/packages/gettext/package.desc index 2341b4bda9..f5108ca6f5 100644 --- a/packages/gettext/package.desc +++ b/packages/gettext/package.desc @@ -5,4 +5,4 @@ bootstrap='./autogen.sh' mirrors='$(CT_Mirrors GNU gettext)' archive_formats='.tar.xz .tar.gz' signature_format='packed/.sig' -milestones='0.21' +milestones='0.21 0.23' diff --git a/packages/glibc/2.29/0005-riscv-Fix-incorrect-jal-with-HIDDEN_JUMPTARGET.patch b/packages/glibc/2.29/0005-riscv-Fix-incorrect-jal-with-HIDDEN_JUMPTARGET.patch new file mode 100644 index 0000000000..a73f2588c5 --- /dev/null +++ b/packages/glibc/2.29/0005-riscv-Fix-incorrect-jal-with-HIDDEN_JUMPTARGET.patch @@ -0,0 +1,62 @@ +From 0f562f885b72250007c05a008b1ebafdf7ce41b1 Mon Sep 17 00:00:00 2001 +Message-ID: <0f562f885b72250007c05a008b1ebafdf7ce41b1.1743754721.git.rsworktech@outlook.com> +From: Fangrui Song +Date: Thu, 28 Oct 2021 11:39:49 -0700 +Subject: [PATCH] riscv: Fix incorrect jal with HIDDEN_JUMPTARGET + +A non-local STV_DEFAULT defined symbol is by default preemptible in a +shared object. j/jal cannot target a preemptible symbol. On other +architectures, such a jump instruction either causes PLT [BZ #18822], or +if short-ranged, sometimes rejected by the linker (but not by GNU ld's +riscv port [ld PR/28509]). + +Use HIDDEN_JUMPTARGET to target a non-preemptible symbol instead. + +With this patch, ld.so and libc.so can be linked with LLD if source +files are compiled/assembled with -mno-relax/-Wa,-mno-relax. + +Acked-by: Palmer Dabbelt +Reviewed-by: Adhemerval Zanella +--- + sysdeps/riscv/setjmp.S | 2 +- + sysdeps/unix/sysv/linux/riscv/setcontext.S | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/sysdeps/riscv/setjmp.S b/sysdeps/riscv/setjmp.S +index 38a93b78e8..435e25d044 100644 +--- a/sysdeps/riscv/setjmp.S ++++ b/sysdeps/riscv/setjmp.S +@@ -21,7 +21,7 @@ + + ENTRY (_setjmp) + li a1, 0 +- j __sigsetjmp ++ j HIDDEN_JUMPTARGET (__sigsetjmp) + END (_setjmp) + ENTRY (setjmp) + li a1, 1 +diff --git a/sysdeps/unix/sysv/linux/riscv/setcontext.S b/sysdeps/unix/sysv/linux/riscv/setcontext.S +index a494b100be..f0dce4fbad 100644 +--- a/sysdeps/unix/sysv/linux/riscv/setcontext.S ++++ b/sysdeps/unix/sysv/linux/riscv/setcontext.S +@@ -95,6 +95,7 @@ LEAF (__setcontext) + 99: j __syscall_error + + END (__setcontext) ++libc_hidden_def (__setcontext) + weak_alias (__setcontext, setcontext) + + LEAF (__start_context) +@@ -108,7 +109,7 @@ LEAF (__start_context) + /* Invoke subsequent context if present, else exit(0). */ + mv a0, s2 + beqz s2, 1f +- jal __setcontext +-1: j exit ++ jal HIDDEN_JUMPTARGET (__setcontext) ++1: j HIDDEN_JUMPTARGET (exit) + + END (__start_context) +-- +2.49.0 + diff --git a/packages/glibc/2.30/0005-riscv-Fix-incorrect-jal-with-HIDDEN_JUMPTARGET.patch b/packages/glibc/2.30/0005-riscv-Fix-incorrect-jal-with-HIDDEN_JUMPTARGET.patch new file mode 100644 index 0000000000..5867ded806 --- /dev/null +++ b/packages/glibc/2.30/0005-riscv-Fix-incorrect-jal-with-HIDDEN_JUMPTARGET.patch @@ -0,0 +1,62 @@ +From b88a116d880eebf8b0ff52146ddd5c8120d55545 Mon Sep 17 00:00:00 2001 +Message-ID: +From: Fangrui Song +Date: Thu, 28 Oct 2021 11:39:49 -0700 +Subject: [PATCH] riscv: Fix incorrect jal with HIDDEN_JUMPTARGET + +A non-local STV_DEFAULT defined symbol is by default preemptible in a +shared object. j/jal cannot target a preemptible symbol. On other +architectures, such a jump instruction either causes PLT [BZ #18822], or +if short-ranged, sometimes rejected by the linker (but not by GNU ld's +riscv port [ld PR/28509]). + +Use HIDDEN_JUMPTARGET to target a non-preemptible symbol instead. + +With this patch, ld.so and libc.so can be linked with LLD if source +files are compiled/assembled with -mno-relax/-Wa,-mno-relax. + +Acked-by: Palmer Dabbelt +Reviewed-by: Adhemerval Zanella +--- + sysdeps/riscv/setjmp.S | 2 +- + sysdeps/unix/sysv/linux/riscv/setcontext.S | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/sysdeps/riscv/setjmp.S b/sysdeps/riscv/setjmp.S +index 38a93b78e8..435e25d044 100644 +--- a/sysdeps/riscv/setjmp.S ++++ b/sysdeps/riscv/setjmp.S +@@ -21,7 +21,7 @@ + + ENTRY (_setjmp) + li a1, 0 +- j __sigsetjmp ++ j HIDDEN_JUMPTARGET (__sigsetjmp) + END (_setjmp) + ENTRY (setjmp) + li a1, 1 +diff --git a/sysdeps/unix/sysv/linux/riscv/setcontext.S b/sysdeps/unix/sysv/linux/riscv/setcontext.S +index a494b100be..f0dce4fbad 100644 +--- a/sysdeps/unix/sysv/linux/riscv/setcontext.S ++++ b/sysdeps/unix/sysv/linux/riscv/setcontext.S +@@ -95,6 +95,7 @@ LEAF (__setcontext) + 99: j __syscall_error + + END (__setcontext) ++libc_hidden_def (__setcontext) + weak_alias (__setcontext, setcontext) + + LEAF (__start_context) +@@ -108,7 +109,7 @@ LEAF (__start_context) + /* Invoke subsequent context if present, else exit(0). */ + mv a0, s2 + beqz s2, 1f +- jal __setcontext +-1: j exit ++ jal HIDDEN_JUMPTARGET (__setcontext) ++1: j HIDDEN_JUMPTARGET (exit) + + END (__start_context) +-- +2.49.0 + diff --git a/packages/glibc/2.31/0004-riscv-Fix-incorrect-jal-with-HIDDEN_JUMPTARGET.patch b/packages/glibc/2.31/0004-riscv-Fix-incorrect-jal-with-HIDDEN_JUMPTARGET.patch new file mode 100644 index 0000000000..97147973e5 --- /dev/null +++ b/packages/glibc/2.31/0004-riscv-Fix-incorrect-jal-with-HIDDEN_JUMPTARGET.patch @@ -0,0 +1,62 @@ +From 4423c20665378a30bb75828b041835b8b75995db Mon Sep 17 00:00:00 2001 +Message-ID: <4423c20665378a30bb75828b041835b8b75995db.1743754847.git.rsworktech@outlook.com> +From: Fangrui Song +Date: Thu, 28 Oct 2021 11:39:49 -0700 +Subject: [PATCH] riscv: Fix incorrect jal with HIDDEN_JUMPTARGET + +A non-local STV_DEFAULT defined symbol is by default preemptible in a +shared object. j/jal cannot target a preemptible symbol. On other +architectures, such a jump instruction either causes PLT [BZ #18822], or +if short-ranged, sometimes rejected by the linker (but not by GNU ld's +riscv port [ld PR/28509]). + +Use HIDDEN_JUMPTARGET to target a non-preemptible symbol instead. + +With this patch, ld.so and libc.so can be linked with LLD if source +files are compiled/assembled with -mno-relax/-Wa,-mno-relax. + +Acked-by: Palmer Dabbelt +Reviewed-by: Adhemerval Zanella +--- + sysdeps/riscv/setjmp.S | 2 +- + sysdeps/unix/sysv/linux/riscv/setcontext.S | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/sysdeps/riscv/setjmp.S b/sysdeps/riscv/setjmp.S +index 2cf31deeb4..3e61597b7a 100644 +--- a/sysdeps/riscv/setjmp.S ++++ b/sysdeps/riscv/setjmp.S +@@ -21,7 +21,7 @@ + + ENTRY (_setjmp) + li a1, 0 +- j __sigsetjmp ++ j HIDDEN_JUMPTARGET (__sigsetjmp) + END (_setjmp) + ENTRY (setjmp) + li a1, 1 +diff --git a/sysdeps/unix/sysv/linux/riscv/setcontext.S b/sysdeps/unix/sysv/linux/riscv/setcontext.S +index fb9937517d..e7f1e6481b 100644 +--- a/sysdeps/unix/sysv/linux/riscv/setcontext.S ++++ b/sysdeps/unix/sysv/linux/riscv/setcontext.S +@@ -95,6 +95,7 @@ LEAF (__setcontext) + 99: j __syscall_error + + END (__setcontext) ++libc_hidden_def (__setcontext) + weak_alias (__setcontext, setcontext) + + LEAF (__start_context) +@@ -108,7 +109,7 @@ LEAF (__start_context) + /* Invoke subsequent context if present, else exit(0). */ + mv a0, s2 + beqz s2, 1f +- jal __setcontext +-1: j exit ++ jal HIDDEN_JUMPTARGET (__setcontext) ++1: j HIDDEN_JUMPTARGET (exit) + + END (__start_context) +-- +2.49.0 + diff --git a/packages/glibc/2.32/0004-riscv-Fix-incorrect-jal-with-HIDDEN_JUMPTARGET.patch b/packages/glibc/2.32/0004-riscv-Fix-incorrect-jal-with-HIDDEN_JUMPTARGET.patch new file mode 100644 index 0000000000..c366cb592a --- /dev/null +++ b/packages/glibc/2.32/0004-riscv-Fix-incorrect-jal-with-HIDDEN_JUMPTARGET.patch @@ -0,0 +1,62 @@ +From 855529f1a6bf492ec169c2dbd1bd29ed668352e6 Mon Sep 17 00:00:00 2001 +Message-ID: <855529f1a6bf492ec169c2dbd1bd29ed668352e6.1743754974.git.rsworktech@outlook.com> +From: Fangrui Song +Date: Thu, 28 Oct 2021 11:39:49 -0700 +Subject: [PATCH] riscv: Fix incorrect jal with HIDDEN_JUMPTARGET + +A non-local STV_DEFAULT defined symbol is by default preemptible in a +shared object. j/jal cannot target a preemptible symbol. On other +architectures, such a jump instruction either causes PLT [BZ #18822], or +if short-ranged, sometimes rejected by the linker (but not by GNU ld's +riscv port [ld PR/28509]). + +Use HIDDEN_JUMPTARGET to target a non-preemptible symbol instead. + +With this patch, ld.so and libc.so can be linked with LLD if source +files are compiled/assembled with -mno-relax/-Wa,-mno-relax. + +Acked-by: Palmer Dabbelt +Reviewed-by: Adhemerval Zanella +--- + sysdeps/riscv/setjmp.S | 2 +- + sysdeps/unix/sysv/linux/riscv/setcontext.S | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/sysdeps/riscv/setjmp.S b/sysdeps/riscv/setjmp.S +index 2cf31deeb4..3e61597b7a 100644 +--- a/sysdeps/riscv/setjmp.S ++++ b/sysdeps/riscv/setjmp.S +@@ -21,7 +21,7 @@ + + ENTRY (_setjmp) + li a1, 0 +- j __sigsetjmp ++ j HIDDEN_JUMPTARGET (__sigsetjmp) + END (_setjmp) + ENTRY (setjmp) + li a1, 1 +diff --git a/sysdeps/unix/sysv/linux/riscv/setcontext.S b/sysdeps/unix/sysv/linux/riscv/setcontext.S +index fb9937517d..e7f1e6481b 100644 +--- a/sysdeps/unix/sysv/linux/riscv/setcontext.S ++++ b/sysdeps/unix/sysv/linux/riscv/setcontext.S +@@ -95,6 +95,7 @@ LEAF (__setcontext) + 99: j __syscall_error + + END (__setcontext) ++libc_hidden_def (__setcontext) + weak_alias (__setcontext, setcontext) + + LEAF (__start_context) +@@ -108,7 +109,7 @@ LEAF (__start_context) + /* Invoke subsequent context if present, else exit(0). */ + mv a0, s2 + beqz s2, 1f +- jal __setcontext +-1: j exit ++ jal HIDDEN_JUMPTARGET (__setcontext) ++1: j HIDDEN_JUMPTARGET (exit) + + END (__start_context) +-- +2.49.0 + diff --git a/packages/glibc/2.33/0004-riscv-Fix-incorrect-jal-with-HIDDEN_JUMPTARGET.patch b/packages/glibc/2.33/0004-riscv-Fix-incorrect-jal-with-HIDDEN_JUMPTARGET.patch new file mode 100644 index 0000000000..b81d975e12 --- /dev/null +++ b/packages/glibc/2.33/0004-riscv-Fix-incorrect-jal-with-HIDDEN_JUMPTARGET.patch @@ -0,0 +1,62 @@ +From 57e68a67fc6185b5952c62683274045561e5c880 Mon Sep 17 00:00:00 2001 +Message-ID: <57e68a67fc6185b5952c62683274045561e5c880.1743754995.git.rsworktech@outlook.com> +From: Fangrui Song +Date: Thu, 28 Oct 2021 11:39:49 -0700 +Subject: [PATCH] riscv: Fix incorrect jal with HIDDEN_JUMPTARGET + +A non-local STV_DEFAULT defined symbol is by default preemptible in a +shared object. j/jal cannot target a preemptible symbol. On other +architectures, such a jump instruction either causes PLT [BZ #18822], or +if short-ranged, sometimes rejected by the linker (but not by GNU ld's +riscv port [ld PR/28509]). + +Use HIDDEN_JUMPTARGET to target a non-preemptible symbol instead. + +With this patch, ld.so and libc.so can be linked with LLD if source +files are compiled/assembled with -mno-relax/-Wa,-mno-relax. + +Acked-by: Palmer Dabbelt +Reviewed-by: Adhemerval Zanella +--- + sysdeps/riscv/setjmp.S | 2 +- + sysdeps/unix/sysv/linux/riscv/setcontext.S | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/sysdeps/riscv/setjmp.S b/sysdeps/riscv/setjmp.S +index 0b92016b31..bec7ff80f4 100644 +--- a/sysdeps/riscv/setjmp.S ++++ b/sysdeps/riscv/setjmp.S +@@ -21,7 +21,7 @@ + + ENTRY (_setjmp) + li a1, 0 +- j __sigsetjmp ++ j HIDDEN_JUMPTARGET (__sigsetjmp) + END (_setjmp) + ENTRY (setjmp) + li a1, 1 +diff --git a/sysdeps/unix/sysv/linux/riscv/setcontext.S b/sysdeps/unix/sysv/linux/riscv/setcontext.S +index 9510518750..e44a68aad4 100644 +--- a/sysdeps/unix/sysv/linux/riscv/setcontext.S ++++ b/sysdeps/unix/sysv/linux/riscv/setcontext.S +@@ -95,6 +95,7 @@ LEAF (__setcontext) + 99: j __syscall_error + + END (__setcontext) ++libc_hidden_def (__setcontext) + weak_alias (__setcontext, setcontext) + + LEAF (__start_context) +@@ -108,7 +109,7 @@ LEAF (__start_context) + /* Invoke subsequent context if present, else exit(0). */ + mv a0, s2 + beqz s2, 1f +- jal __setcontext +-1: j exit ++ jal HIDDEN_JUMPTARGET (__setcontext) ++1: j HIDDEN_JUMPTARGET (exit) + + END (__start_context) +-- +2.49.0 + diff --git a/packages/glibc/2.34/0003-riscv-Fix-incorrect-jal-with-HIDDEN_JUMPTARGET.patch b/packages/glibc/2.34/0003-riscv-Fix-incorrect-jal-with-HIDDEN_JUMPTARGET.patch new file mode 100644 index 0000000000..ded830e913 --- /dev/null +++ b/packages/glibc/2.34/0003-riscv-Fix-incorrect-jal-with-HIDDEN_JUMPTARGET.patch @@ -0,0 +1,62 @@ +From 4ccc5a45723f2051aa823ed72b88cb1ae1683a60 Mon Sep 17 00:00:00 2001 +Message-ID: <4ccc5a45723f2051aa823ed72b88cb1ae1683a60.1743755185.git.rsworktech@outlook.com> +From: Fangrui Song +Date: Thu, 28 Oct 2021 11:39:49 -0700 +Subject: [PATCH] riscv: Fix incorrect jal with HIDDEN_JUMPTARGET + +A non-local STV_DEFAULT defined symbol is by default preemptible in a +shared object. j/jal cannot target a preemptible symbol. On other +architectures, such a jump instruction either causes PLT [BZ #18822], or +if short-ranged, sometimes rejected by the linker (but not by GNU ld's +riscv port [ld PR/28509]). + +Use HIDDEN_JUMPTARGET to target a non-preemptible symbol instead. + +With this patch, ld.so and libc.so can be linked with LLD if source +files are compiled/assembled with -mno-relax/-Wa,-mno-relax. + +Acked-by: Palmer Dabbelt +Reviewed-by: Adhemerval Zanella +--- + sysdeps/riscv/setjmp.S | 2 +- + sysdeps/unix/sysv/linux/riscv/setcontext.S | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/sysdeps/riscv/setjmp.S b/sysdeps/riscv/setjmp.S +index 0b92016b31..bec7ff80f4 100644 +--- a/sysdeps/riscv/setjmp.S ++++ b/sysdeps/riscv/setjmp.S +@@ -21,7 +21,7 @@ + + ENTRY (_setjmp) + li a1, 0 +- j __sigsetjmp ++ j HIDDEN_JUMPTARGET (__sigsetjmp) + END (_setjmp) + ENTRY (setjmp) + li a1, 1 +diff --git a/sysdeps/unix/sysv/linux/riscv/setcontext.S b/sysdeps/unix/sysv/linux/riscv/setcontext.S +index 9510518750..e44a68aad4 100644 +--- a/sysdeps/unix/sysv/linux/riscv/setcontext.S ++++ b/sysdeps/unix/sysv/linux/riscv/setcontext.S +@@ -95,6 +95,7 @@ LEAF (__setcontext) + 99: j __syscall_error + + END (__setcontext) ++libc_hidden_def (__setcontext) + weak_alias (__setcontext, setcontext) + + LEAF (__start_context) +@@ -108,7 +109,7 @@ LEAF (__start_context) + /* Invoke subsequent context if present, else exit(0). */ + mv a0, s2 + beqz s2, 1f +- jal __setcontext +-1: j exit ++ jal HIDDEN_JUMPTARGET (__setcontext) ++1: j HIDDEN_JUMPTARGET (exit) + + END (__start_context) +-- +2.49.0 + diff --git a/packages/glibc/2.41/0000-Add-ARC700-support.patch b/packages/glibc/2.41/0000-Add-ARC700-support.patch new file mode 100644 index 0000000000..1b93a94c2c --- /dev/null +++ b/packages/glibc/2.41/0000-Add-ARC700-support.patch @@ -0,0 +1,92 @@ +From 36449920c501177b61c6fdc1f72875ca41084a8e Mon Sep 17 00:00:00 2001 +From: Rosen Penev +Date: Sat, 13 Feb 2021 17:08:21 +0300 +Subject: [PATCH] Add ARC700 support + +glibc does not officially support ARC700 so this adds the missing +pieces. I looked at uClibc-ng and a patch by Synopsis for glibc. + +[Alexey] Taken from https://github.com/openwrt/openwrt/commit/33646a51abcf15ff5c5363848287e1ed778b7467 + +Signed-off-by: Rosen Penev +Signed-off-by: Alexey Brodkin +--- + sysdeps/arc/atomic-machine.h | 4 ++++ + sysdeps/unix/sysv/linux/arc/syscall.S | 5 +++++ + sysdeps/unix/sysv/linux/arc/syscall_cancel.S | 6 ++++++ + sysdeps/unix/sysv/linux/arc/sysdep.h | 8 ++++++++ + 4 files changed, 23 insertions(+) + +--- a/sysdeps/arc/atomic-machine.h ++++ b/sysdeps/arc/atomic-machine.h +@@ -52,6 +52,10 @@ + __atomic_val_bysize (__arch_compare_and_exchange_val, int, \ + mem, new, old, __ATOMIC_ACQUIRE) + ++#ifdef __ARC700__ ++#define atomic_full_barrier() ({ asm volatile ("sync":::"memory"); }) ++#else + #define atomic_full_barrier() ({ asm volatile ("dmb 3":::"memory"); }) ++#endif + + #endif /* _ARC_BITS_ATOMIC_H */ +--- a/sysdeps/unix/sysv/linux/arc/syscall.S ++++ b/sysdeps/unix/sysv/linux/arc/syscall.S +@@ -24,8 +24,13 @@ + mov_s r1, r2 + mov_s r2, r3 + mov_s r3, r4 ++#ifdef __ARC700__ ++ mov r4, r5 ++ mov r5, r6 ++#else + mov_s r4, r5 + mov_s r5, r6 ++#endif + + ARC_TRAP_INSN + brhi r0, -4096, L (call_syscall_err) +--- a/sysdeps/unix/sysv/linux/arc/syscall_cancel.S ++++ b/sysdeps/unix/sysv/linux/arc/syscall_cancel.S +@@ -38,9 +38,15 @@ + mov_s r0, r2 + mov_s r1, r3 + mov_s r2, r4 ++#ifdef __ARC700__ ++ mov r3, r5 ++ mov r4, r6 ++ mov r5, r7 ++#else + mov_s r3, r5 + mov_s r4, r6 + mov_s r5, r7 ++#endif + trap_s 0 + + .globl __syscall_cancel_arch_end +--- a/sysdeps/unix/sysv/linux/arc/sysdep.h ++++ b/sysdeps/unix/sysv/linux/arc/sysdep.h +@@ -130,7 +130,11 @@ + mov r8, __NR_##syscall_name ASM_LINE_SEP \ + ARC_TRAP_INSN ASM_LINE_SEP + ++# ifdef __ARC700__ ++# define ARC_TRAP_INSN trap0 ++# else + # define ARC_TRAP_INSN trap_s 0 ++# endif + + #else /* !__ASSEMBLER__ */ + +@@ -139,7 +143,11 @@ + hidden_proto (__syscall_error) + # endif + ++# ifdef __ARC700__ ++# define ARC_TRAP_INSN "trap0 \n\t" ++# else + # define ARC_TRAP_INSN "trap_s 0 \n\t" ++#endif + + # define HAVE_CLONE3_WRAPPER 1 + diff --git a/packages/glibc/2.41/chksum b/packages/glibc/2.41/chksum new file mode 100644 index 0000000000..b2eae604f5 --- /dev/null +++ b/packages/glibc/2.41/chksum @@ -0,0 +1,12 @@ +md5 glibc-2.41.tar.xz 19862601af60f73ac69e067d3e9267d4 +sha1 glibc-2.41.tar.xz 51151d596f4ca800e3220825f6ac07e5e9bc5d23 +sha256 glibc-2.41.tar.xz a5a26b22f545d6b7d7b3dd828e11e428f24f4fac43c934fb071b6a7d0828e901 +sha512 glibc-2.41.tar.xz 894a3e5a796bc13df30c26a5bfbe4d60b5dbdaac54e7763432235124b547070c7dda88c50584536870cab79183d8cad73a3ac6ed09bfe54fa8482aad07253169 +md5 glibc-2.41.tar.bz2 b696289e331b03d4920f01a5e40a1b19 +sha1 glibc-2.41.tar.bz2 f183c3fbd185b143ffec1e3ae3ee56badb914775 +sha256 glibc-2.41.tar.bz2 13cffc682feef721d575250bd4845f92950d3aab23c471279c0f70e497b08442 +sha512 glibc-2.41.tar.bz2 0c8a4493e2b3abc15d20d7d52e387656db8b619774cd555ce9b20709cee42526b68375884f92f9acb6e9a86ce82a8cb62141f78f92bd29db8d94fa413c81510f +md5 glibc-2.41.tar.gz 74e52947360bba6654272f6bdb90a1d9 +sha1 glibc-2.41.tar.gz 093600f3c3b15dd2d2cf488163fb3dfdc2d95b1e +sha256 glibc-2.41.tar.gz c7be6e25eeaf4b956f5d4d56a04d23e4db453fc07760f872903bb61a49519b80 +sha512 glibc-2.41.tar.gz 85943f8b0e0298d1db11da3c92d77364acd0d74f374651adc0289df9ba8a55230acded6ed5bac726be715318b8e879eb96daf5edb28239caa13a217f4f752898 diff --git a/packages/mpfr/4.2.1/version.desc b/packages/glibc/2.41/version.desc similarity index 100% rename from packages/mpfr/4.2.1/version.desc rename to packages/glibc/2.41/version.desc diff --git a/packages/glibc/2.42/0000-Add-ARC700-support.patch b/packages/glibc/2.42/0000-Add-ARC700-support.patch new file mode 100644 index 0000000000..af91b0c7eb --- /dev/null +++ b/packages/glibc/2.42/0000-Add-ARC700-support.patch @@ -0,0 +1,103 @@ +From 9a641363800eacf7ae6b54da11b39b7976d6bc31 Mon Sep 17 00:00:00 2001 +From: Rosen Penev +Date: Sat, 13 Feb 2021 17:08:21 +0300 +Subject: [PATCH] Add ARC700 support + +glibc does not officially support ARC700 so this adds the missing +pieces. I looked at uClibc-ng and a patch by Synopsis for glibc. + +[Alexey] Taken from https://github.com/openwrt/openwrt/commit/33646a51abcf15ff5c5363848287e1ed778b7467 + +Signed-off-by: Rosen Penev +Signed-off-by: Alexey Brodkin +--- + sysdeps/arc/atomic-machine.h | 4 ++++ + sysdeps/unix/sysv/linux/arc/syscall.S | 5 +++++ + sysdeps/unix/sysv/linux/arc/syscall_cancel.S | 6 ++++++ + sysdeps/unix/sysv/linux/arc/sysdep.h | 8 ++++++++ + 4 files changed, 23 insertions(+) + +diff --git a/sysdeps/arc/atomic-machine.h b/sysdeps/arc/atomic-machine.h +index 0133277d3b..93c2d98a57 100644 +--- a/sysdeps/arc/atomic-machine.h ++++ b/sysdeps/arc/atomic-machine.h +@@ -52,6 +52,10 @@ + __atomic_val_bysize (__arch_compare_and_exchange_val, int, \ + mem, new, old, __ATOMIC_ACQUIRE) + ++#ifdef __ARC700__ ++#define atomic_full_barrier() ({ asm volatile ("sync":::"memory"); }) ++#else + #define atomic_full_barrier() ({ asm volatile ("dmb 3":::"memory"); }) ++#endif + + #endif /* _ARC_BITS_ATOMIC_H */ +diff --git a/sysdeps/unix/sysv/linux/arc/syscall.S b/sysdeps/unix/sysv/linux/arc/syscall.S +index 71177e1139..6522bbf72f 100644 +--- a/sysdeps/unix/sysv/linux/arc/syscall.S ++++ b/sysdeps/unix/sysv/linux/arc/syscall.S +@@ -24,8 +24,13 @@ ENTRY (syscall) + mov_s r1, r2 + mov_s r2, r3 + mov_s r3, r4 ++#ifdef __ARC700__ ++ mov r4, r5 ++ mov r5, r6 ++#else + mov_s r4, r5 + mov_s r5, r6 ++#endif + + ARC_TRAP_INSN + brhi r0, -4096, L (call_syscall_err) +diff --git a/sysdeps/unix/sysv/linux/arc/syscall_cancel.S b/sysdeps/unix/sysv/linux/arc/syscall_cancel.S +index ccffef3fd6..f62cac11a8 100644 +--- a/sysdeps/unix/sysv/linux/arc/syscall_cancel.S ++++ b/sysdeps/unix/sysv/linux/arc/syscall_cancel.S +@@ -38,9 +38,15 @@ __syscall_cancel_arch_start: + mov_s r0, r2 + mov_s r1, r3 + mov_s r2, r4 ++#ifdef __ARC700__ ++ mov r3, r5 ++ mov r4, r6 ++ mov r5, r7 ++#else + mov_s r3, r5 + mov_s r4, r6 + mov_s r5, r7 ++#endif + trap_s 0 + + .globl __syscall_cancel_arch_end +diff --git a/sysdeps/unix/sysv/linux/arc/sysdep.h b/sysdeps/unix/sysv/linux/arc/sysdep.h +index 06e31404ec..f1a251bf84 100644 +--- a/sysdeps/unix/sysv/linux/arc/sysdep.h ++++ b/sysdeps/unix/sysv/linux/arc/sysdep.h +@@ -130,7 +130,11 @@ L (call_syscall_err): ASM_LINE_SEP \ + mov r8, __NR_##syscall_name ASM_LINE_SEP \ + ARC_TRAP_INSN ASM_LINE_SEP + ++# ifdef __ARC700__ ++# define ARC_TRAP_INSN trap0 ++# else + # define ARC_TRAP_INSN trap_s 0 ++# endif + + #else /* !__ASSEMBLER__ */ + +@@ -139,7 +143,11 @@ extern long int __syscall_error (long int); + hidden_proto (__syscall_error) + # endif + ++# ifdef __ARC700__ ++# define ARC_TRAP_INSN "trap0 \n\t" ++# else + # define ARC_TRAP_INSN "trap_s 0 \n\t" ++#endif + + # define HAVE_CLONE3_WRAPPER 1 + +-- +2.50.1 + diff --git a/packages/glibc/2.42/chksum b/packages/glibc/2.42/chksum new file mode 100644 index 0000000000..20508fd653 --- /dev/null +++ b/packages/glibc/2.42/chksum @@ -0,0 +1,12 @@ +md5 glibc-2.42.tar.xz 23c6f5a27932b435cae94e087cb8b1f5 +sha1 glibc-2.42.tar.xz b5c170f2941cd39292ee0b986921334c004dd562 +sha256 glibc-2.42.tar.xz d1775e32e4628e64ef930f435b67bb63af7599acb6be2b335b9f19f16509f17f +sha512 glibc-2.42.tar.xz 73a617db8e0f0958c0575f7a1c5a35b72b7e070b6cbdd02a9bb134995ca7ca0909f1e50d7362c53d2572d72f1879bb201a61d5275bac16136895d9a34ef0c068 +md5 glibc-2.42.tar.bz2 0537f3bbc8180d0698f1572a1a96d715 +sha1 glibc-2.42.tar.bz2 bb589b5b1bcace575444d557f81417fa140ec02b +sha256 glibc-2.42.tar.bz2 19677e43429c035523c001589bf06ef405819c72b88adfa1104665bd8271bb92 +sha512 glibc-2.42.tar.bz2 7aad65998408b07159b10397d02337aec60a7425af66b9c7dabe91f97e40b1ca124b219ce7be07b0dcca7f0ca493bd851fb49d1e0d113adf2e9655bbcc5a0ef1 +md5 glibc-2.42.tar.gz de45cdb246eb3a73dd3ccd5012f787fd +sha1 glibc-2.42.tar.gz d036df82c64e6f1d2e2022fe860564f760fde478 +sha256 glibc-2.42.tar.gz d4468d3e3267068c1b0623ca6424aac9a28766df774c8d8fb4978127fca7125a +sha512 glibc-2.42.tar.gz 3f438dd27f8f6ab68ae3b50845366efbf8fc174ce94f8b1ddd38fd1c1fef762a23044ee525651c5a0ff28a04802df97efd7045a9f732fcb5ba9740e0f9ae3b11 diff --git a/packages/picolibc/1.8.6/version.desc b/packages/glibc/2.42/version.desc similarity index 100% rename from packages/picolibc/1.8.6/version.desc rename to packages/glibc/2.42/version.desc diff --git a/packages/glibc/2.43/0000-Add-ARC700-support.patch b/packages/glibc/2.43/0000-Add-ARC700-support.patch new file mode 100644 index 0000000000..f9e1ef3bbf --- /dev/null +++ b/packages/glibc/2.43/0000-Add-ARC700-support.patch @@ -0,0 +1,87 @@ +From bb4b07668bb852f755e40e979c2325dbfba91e77 Mon Sep 17 00:00:00 2001 +From: Rosen Penev +Date: Sat, 13 Feb 2021 17:08:21 +0300 +Subject: [PATCH] Add ARC700 support + +glibc does not officially support ARC700 so this adds the missing +pieces. I looked at uClibc-ng and a patch by Synopsis for glibc. + +[Alexey] Taken from https://github.com/openwrt/openwrt/commit/33646a51abcf15ff5c5363848287e1ed778b7467 + +Signed-off-by: Rosen Penev +Signed-off-by: Alexey Brodkin +--- + sysdeps/unix/sysv/linux/arc/syscall.S | 5 +++++ + sysdeps/unix/sysv/linux/arc/syscall_cancel.S | 6 ++++++ + sysdeps/unix/sysv/linux/arc/sysdep.h | 8 ++++++++ + 3 files changed, 19 insertions(+) + +diff --git a/sysdeps/unix/sysv/linux/arc/syscall.S b/sysdeps/unix/sysv/linux/arc/syscall.S +index 335b9692..14f3adc9 100644 +--- a/sysdeps/unix/sysv/linux/arc/syscall.S ++++ b/sysdeps/unix/sysv/linux/arc/syscall.S +@@ -24,8 +24,13 @@ ENTRY (syscall) + mov_s r1, r2 + mov_s r2, r3 + mov_s r3, r4 ++#ifdef __ARC700__ ++ mov r4, r5 ++ mov r5, r6 ++#else + mov_s r4, r5 + mov_s r5, r6 ++#endif + + ARC_TRAP_INSN + brhi r0, -4096, L (call_syscall_err) +diff --git a/sysdeps/unix/sysv/linux/arc/syscall_cancel.S b/sysdeps/unix/sysv/linux/arc/syscall_cancel.S +index 842132a4..a7d61e67 100644 +--- a/sysdeps/unix/sysv/linux/arc/syscall_cancel.S ++++ b/sysdeps/unix/sysv/linux/arc/syscall_cancel.S +@@ -38,9 +38,15 @@ __syscall_cancel_arch_start: + mov_s r0, r2 + mov_s r1, r3 + mov_s r2, r4 ++#ifdef __ARC700__ ++ mov r3, r5 ++ mov r4, r6 ++ mov r5, r7 ++#else + mov_s r3, r5 + mov_s r4, r6 + mov_s r5, r7 ++#endif + trap_s 0 + + .globl __syscall_cancel_arch_end +diff --git a/sysdeps/unix/sysv/linux/arc/sysdep.h b/sysdeps/unix/sysv/linux/arc/sysdep.h +index 90cea3f8..e9167f06 100644 +--- a/sysdeps/unix/sysv/linux/arc/sysdep.h ++++ b/sysdeps/unix/sysv/linux/arc/sysdep.h +@@ -130,7 +130,11 @@ L (call_syscall_err): ASM_LINE_SEP \ + mov r8, __NR_##syscall_name ASM_LINE_SEP \ + ARC_TRAP_INSN ASM_LINE_SEP + ++# ifdef __ARC700__ ++# define ARC_TRAP_INSN trap0 ++# else + # define ARC_TRAP_INSN trap_s 0 ++# endif + + #else /* !__ASSEMBLER__ */ + +@@ -139,7 +143,11 @@ extern long int __syscall_error (long int); + hidden_proto (__syscall_error) + # endif + ++# ifdef __ARC700__ ++# define ARC_TRAP_INSN "trap0 \n\t" ++# else + # define ARC_TRAP_INSN "trap_s 0 \n\t" ++#endif + + # define HAVE_CLONE3_WRAPPER 1 + +-- +2.52.0 + diff --git a/packages/glibc/2.43/chksum b/packages/glibc/2.43/chksum new file mode 100644 index 0000000000..d179fc3812 --- /dev/null +++ b/packages/glibc/2.43/chksum @@ -0,0 +1,12 @@ +md5 glibc-2.43.tar.xz 7ec2588300b299215a65aec7e6afa04f +sha1 glibc-2.43.tar.xz d6bf2cc5439107b73a013284f7dd130c66b3d4f8 +sha256 glibc-2.43.tar.xz d9c86c6b5dbddb43a3e08270c5844fc5177d19442cf5b8df4be7c07cd5fa3831 +sha512 glibc-2.43.tar.xz 25765f86bf54a22fc69dd13023ec9be59bd7e1f9d6ea1630cf21851898df2043bb8a01538c4b5fdd06495d0163289362b0768b391b0617f709b89a777168291c +md5 glibc-2.43.tar.bz2 9f6587f43a27fd6d1cf04a6c98b05e98 +sha1 glibc-2.43.tar.bz2 04bf10fc1c0254176007ba875127ec7c47f16886 +sha256 glibc-2.43.tar.bz2 ccfa28fc1a4c029693c711fb68756eea6ef5fbb0cefbefb5740a90c6e44a8a43 +sha512 glibc-2.43.tar.bz2 d1fef0122a194f0ecc25344c78a8747fe00d05ceb8210e7458de8224e94ff06d6c30a0ba8f437be3da95573e9eb0eba94fe5e5f4dde7cac6f3e3b19cf96883a2 +md5 glibc-2.43.tar.gz c2707c7d2e638d305378139ef0ef7d81 +sha1 glibc-2.43.tar.gz 33ea643db4ac6ee6a3eeda8354d4823f597469d6 +sha256 glibc-2.43.tar.gz e1e622cbd635019090fa23260e5d9ec219b12f97ae7ae02f033d4ae42cf2c004 +sha512 glibc-2.43.tar.gz 832c0a2a1fcfb89e754ae0de4e9418993afb3f2041c4251cb09bed33b74ab396ab5c95e8ce190acc58b5233213a506ab0018055601fd5e0864364e5ce0785e48 diff --git a/packages/strace/6.10/version.desc b/packages/glibc/2.43/version.desc similarity index 100% rename from packages/strace/6.10/version.desc rename to packages/glibc/2.43/version.desc diff --git a/packages/glibc/package.desc b/packages/glibc/package.desc index 80deae670a..83fc169cee 100644 --- a/packages/glibc/package.desc +++ b/packages/glibc/package.desc @@ -3,6 +3,6 @@ repository='git git://sourceware.org/git/glibc.git' mirrors='$(CT_Mirrors GNU glibc)' # Cannot use MAJOR.MINOR as the relevant part because of 2.12: 2.12.2 was the most recent # bugfix release, but it didn't have glibc-ports released alongside it. -milestones='2.10 2.14 2.16 2.17 2.20 2.23 2.24 2.25 2.26 2.27 2.28 2.29 2.30 2.31 2.32 2.34 2.36 2.37 2.38' +milestones='2.14 2.17 2.20 2.23 2.24 2.25 2.26 2.27 2.28 2.29 2.30 2.31 2.32 2.34 2.36 2.37 2.38 2.41 2.42 2.43' archive_formats='.tar.xz .tar.bz2 .tar.gz' signature_format='packed/.sig' diff --git a/packages/gmp/6.3.0/0000-Complete-function-prototype-in-acinclude.patch b/packages/gmp/6.3.0/0000-Complete-function-prototype-in-acinclude.patch new file mode 100644 index 0000000000..d61285d792 --- /dev/null +++ b/packages/gmp/6.3.0/0000-Complete-function-prototype-in-acinclude.patch @@ -0,0 +1,31 @@ +From: Marc Glisse +Date: Wed, 29 Jan 2025 22:38:02 +0100 +Subject: [PATCH] Complete function prototype in acinclude.m4 for C23 + compatibility +--- + acinclude.m4 | 2 +- + configure | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -609,7 +609,7 @@ + + #if defined (__GNUC__) && ! defined (__cplusplus) + typedef unsigned long long t1;typedef t1*t2; +-void g(){} ++void g(int p1,t1 const* p2,t1 p3,t2 p4,t1 const* p5,int p6){} + void h(){} + static __inline__ t1 e(t2 rp,t2 up,int n,t1 v0) + {t1 c,x,r;int i;if(v0){c=1;for(i=1;i -Date: Fri, 15 Jan 2021 18:52:09 +0200 -Subject: [PATCH] HACK: Fix paths for crosstool-ng - -For some reason crosstool-ng modifies the default -binutils/ld path for ldscripts. Align our respective -path. - -Signed-off-by: Dimitar Dimitrov ---- - ldscripts/Makefile.am | 2 +- - ldscripts/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - ---- a/ldscripts/Makefile.am -+++ b/ldscripts/Makefile.am -@@ -47,4 +47,4 @@ - pruelf-tda4vm.icssg1.tx_pru1.x - - --prudir = $(exec_prefix)/$(target_alias)/lib -+prudir = $(libdir) ---- a/ldscripts/Makefile.in -+++ b/ldscripts/Makefile.in -@@ -300,7 +300,7 @@ - pruelf-tda4vm.icssg1.tx_pru0.x \ - pruelf-tda4vm.icssg1.tx_pru1.x - --prudir = $(exec_prefix)/$(target_alias)/lib -+prudir = $(libdir) - all: all-am - - .SUFFIXES: diff --git a/packages/gnuprumcu/0.5.0/chksum b/packages/gnuprumcu/0.5.0/chksum deleted file mode 100644 index 808703327e..0000000000 --- a/packages/gnuprumcu/0.5.0/chksum +++ /dev/null @@ -1,4 +0,0 @@ -md5 gnuprumcu-0.5.0.tar.gz ee6110995491dac1a834ca7045931391 -sha1 gnuprumcu-0.5.0.tar.gz 94eb2aeb88f5654fa041bed07c2fb7860af95047 -sha256 gnuprumcu-0.5.0.tar.gz 917043152188ad4626f888dbb620e816a523c0599f9a758230a7d687daf915af -sha512 gnuprumcu-0.5.0.tar.gz cc3071913db9c364c2e3966ab580b703700c85a3d292e230b5536df45b54e0137dc1e83a2fae80947e3c1ad178e5b6b6d8319a3d576653b423178c443386bd17 diff --git a/packages/gnuprumcu/0.6.0/chksum b/packages/gnuprumcu/0.6.0/chksum deleted file mode 100644 index 09838087a0..0000000000 --- a/packages/gnuprumcu/0.6.0/chksum +++ /dev/null @@ -1,4 +0,0 @@ -md5 gnuprumcu-0.6.0.tar.gz 9f2a2bc8410e4a7ca5d61ebfbf8b364c -sha1 gnuprumcu-0.6.0.tar.gz 4c5d2be7bb9132553415e11a42261c7e2901ed30 -sha256 gnuprumcu-0.6.0.tar.gz 1f488578edfc7da404fe7d59d2864fffbc00a9cea540d43ac508a68741428a9b -sha512 gnuprumcu-0.6.0.tar.gz ee2f4f25e2f77825832db96915ec34d1fa27db3804eef17728591ee439d00ee668b321e8ae9f7c7564bf5d5ba09216ee3415cf94a946b4861313580d51d2e6ff diff --git a/packages/gnuprumcu/0.6.0/version.desc b/packages/gnuprumcu/0.6.0/version.desc deleted file mode 100644 index fcfe38915a..0000000000 --- a/packages/gnuprumcu/0.6.0/version.desc +++ /dev/null @@ -1 +0,0 @@ -obsolete='yes' diff --git a/packages/gnuprumcu/0.9.7/chksum b/packages/gnuprumcu/0.9.7/chksum new file mode 100644 index 0000000000..93447ad955 --- /dev/null +++ b/packages/gnuprumcu/0.9.7/chksum @@ -0,0 +1,4 @@ +md5 gnuprumcu-0.9.7.tar.gz 1cce9bcf5d5b35081fa09e09eb213994 +sha1 gnuprumcu-0.9.7.tar.gz 1a8a01fde92f3ecf38fb5a94f87cac139f523577 +sha256 gnuprumcu-0.9.7.tar.gz 93cfb4027196f0b426ae138cf9949c6fab37263b69643f018a236ca49c0f2a23 +sha512 gnuprumcu-0.9.7.tar.gz ef2ed14045effbce3114b147c5a0f8f3bfdf22443ba3b76ec33eb16d597ad90f199db23f0b16fab9887692e1f407cc9392b61c6ce326394a54c99dd5b6a926dd diff --git a/packages/gnuprumcu/0.9.7/version.desc b/packages/gnuprumcu/0.9.7/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/isl/0.11.2/chksum b/packages/isl/0.11.2/chksum new file mode 100644 index 0000000000..f0607b022e --- /dev/null +++ b/packages/isl/0.11.2/chksum @@ -0,0 +1,12 @@ +md5 isl-0.11.2.tar.lzma e51b54b8f174b0590751929405115583 +sha1 isl-0.11.2.tar.lzma cd9b2b6d681f86ef966b8f6a566795c3e0503f34 +sha256 isl-0.11.2.tar.lzma 55b90ed18a7471542ed7ad1d4f593bd17cd4553514dfef15808a32229c20b558 +sha512 isl-0.11.2.tar.lzma 0882e617a97c8af0e721ba8bc4b77a660c3a4ae774ffe3acb928ebe3a400dd9968b2aa0425a5233dc4a93cebdae1c86d5039652976a1be60f152ca02b9083644 +md5 isl-0.11.2.tar.bz2 c40daa17d2995d1c98a0c1aca607541f +sha1 isl-0.11.2.tar.bz2 ca2c93a58e899379d39f2956b2299c62e3975018 +sha256 isl-0.11.2.tar.bz2 e6d83347d254449577299ec86ffefd79361dc51f6de7480723c9c43b075cdc23 +sha512 isl-0.11.2.tar.bz2 6c4e370b66ee1d3656f4e028e08d70c4e897f88de6bad048493a9385655939574a42e97b0aa2b09d88f82b2de1004340073c32a5456adefdfb649c25c2d562c0 +md5 isl-0.11.2.tar.gz c37600005ad5a3889db61a5675628a51 +sha1 isl-0.11.2.tar.gz 11a19d66fa5781188373964089e09012d603b6fc +sha256 isl-0.11.2.tar.gz e3976c7af97b916aa84a46a64db4fb1b74a0af94592347a53fc5a286dc4b58fe +sha512 isl-0.11.2.tar.gz 9c30ae502dbe9c3ed7e3e8338aa4c71d339998556032e139fa2cf1939d554c088a866bd047c01ff5f1c5ed3e95985484f7db1596e035b608009a6140cc66b8b2 diff --git a/packages/isl/0.11.2/version.desc b/packages/isl/0.11.2/version.desc new file mode 100644 index 0000000000..f96c492909 --- /dev/null +++ b/packages/isl/0.11.2/version.desc @@ -0,0 +1,2 @@ +obsolete='yes' +archive_formats='.tar.lzma .tar.bz2 .tar.gz' diff --git a/packages/isl/0.27/chksum b/packages/isl/0.27/chksum new file mode 100644 index 0000000000..ecbb93302a --- /dev/null +++ b/packages/isl/0.27/chksum @@ -0,0 +1,12 @@ +md5 isl-0.27.tar.xz 11ee9d335b227ea2e8579c4ba6e56138 +sha1 isl-0.27.tar.xz 8778bdabc1fbebe392564440c1ebbaaa45cdaf85 +sha256 isl-0.27.tar.xz 6d8babb59e7b672e8cb7870e874f3f7b813b6e00e6af3f8b04f7579965643d5c +sha512 isl-0.27.tar.xz 6d6f50c3f6f26e0d3f67586dee6427d87999c426c94069a6f3012ec3c9a41adeebd50f43b5d2705db6abc12e38eb01c19f55dba113c0799da5f667eef46b2be0 +md5 isl-0.27.tar.bz2 d9b7700a2f326e6c755cde8161055e59 +sha1 isl-0.27.tar.bz2 92703e84d607daae25044af104acc0118caef842 +sha256 isl-0.27.tar.bz2 626335529331f7c89fec493de929e2e92fb3d8cc860fc7af554e0518ee0029ee +sha512 isl-0.27.tar.bz2 e14ab1a622d3f6219b264b8e2512487aecd6725b7b88f40bc8f31651bfe7d89db4649aae12eaa0052dd904bac21607f63c83fbab73251767425d91989a969f7e +md5 isl-0.27.tar.gz daabe07703432804ccc37cce3b9eee47 +sha1 isl-0.27.tar.gz a307052a50643b859b7d90559ea746be972adea6 +sha256 isl-0.27.tar.gz 7a1a3f04d57c7c72fee5a6148cd3b02b05db6a6dd9a58def7bdc00972a6301c3 +sha512 isl-0.27.tar.gz eb7debab52f402b55e8d8544fcc7ca45bc3baaa57f69bcc17696e817d933ee41174e678893908e1423c5d4b5371301facb435d70b6d2103ee374f43908217368 diff --git a/packages/isl/0.27/version.desc b/packages/isl/0.27/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libelf/0.8.13/0002-fix-configure-for-gcc14-part2.patch b/packages/libelf/0.8.13/0002-fix-configure-for-gcc14-part2.patch new file mode 100644 index 0000000000..19f1a450dd --- /dev/null +++ b/packages/libelf/0.8.13/0002-fix-configure-for-gcc14-part2.patch @@ -0,0 +1,51 @@ +diff -Naur libelf-0.8.13-orig/configure libelf-0.8.13/configure +--- libelf-0.8.13-orig/configure 2025-02-01 13:58:59.204951646 +1300 ++++ libelf-0.8.13/configure 2025-02-01 14:30:18.978354125 +1300 +@@ -1114,6 +1114,7 @@ + cat > conftest.$ac_ext < + #include + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') + #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +@@ -1484,6 +1485,7 @@ + #line 1485 "configure" + #include "confdefs.h" + #include ++#include + int main() + { + FILE *f=fopen("conftestval", "w"); +@@ -1524,6 +1526,7 @@ + #line 1524 "configure" + #include "confdefs.h" + #include ++#include + int main() + { + FILE *f=fopen("conftestval", "w"); +@@ -1564,6 +1567,7 @@ + #line 1563 "configure" + #include "confdefs.h" + #include ++#include + int main() + { + FILE *f=fopen("conftestval", "w"); +@@ -1604,6 +1608,7 @@ + #line 1602 "configure" + #include "confdefs.h" + #include ++#include + int main() + { + FILE *f=fopen("conftestval", "w"); +@@ -1645,6 +1650,7 @@ + #line 1642 "configure" + #include "confdefs.h" + #include ++#include + int main() + { + FILE *f=fopen("conftestval", "w"); diff --git a/packages/libiconv/1.18/chksum b/packages/libiconv/1.18/chksum new file mode 100644 index 0000000000..02e1dfdfbd --- /dev/null +++ b/packages/libiconv/1.18/chksum @@ -0,0 +1,4 @@ +md5 libiconv-1.18.tar.gz 1af69958b42981d3c3029ffb4c7ebaed +sha1 libiconv-1.18.tar.gz 3402aae249ec56e04114767c8f6bdaafc87a048c +sha256 libiconv-1.18.tar.gz 3b08f5f4f9b4eb82f151a7040bfd6fe6c6fb922efe4b1659c66ea933276965e8 +sha512 libiconv-1.18.tar.gz a55eb3b7b785a78ab8918db8af541c9e11deb5ff4f89d54483287711ed797d87848ce0eafffa7ce26d9a7adb4b5a9891cb484f94bd4f51d3ce97a6a47b4c719a diff --git a/packages/libiconv/1.18/version.desc b/packages/libiconv/1.18/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libtool/2.5.4/chksum b/packages/libtool/2.5.4/chksum new file mode 100644 index 0000000000..7f51a98c99 --- /dev/null +++ b/packages/libtool/2.5.4/chksum @@ -0,0 +1,8 @@ +md5 libtool-2.5.4.tar.xz 22e0a29df8af5fdde276ea3a7d351d30 +sha1 libtool-2.5.4.tar.xz 9781a113fe6af1b150571410b29d3eee2e792516 +sha256 libtool-2.5.4.tar.xz f81f5860666b0bc7d84baddefa60d1cb9fa6fceb2398cc3baca6afaa60266675 +sha512 libtool-2.5.4.tar.xz eed207094bcc444f4bfbb13710e395e062e3f1d312ca8b186ab0cbd22dc92ddef176a0b3ecd43e02676e37bd9e328791c59a38ef15846d4eae15da4f20315724 +md5 libtool-2.5.4.tar.gz 862d906983d9b423b072285d999d8672 +sha1 libtool-2.5.4.tar.gz 77227188ead223ed8ba447301eda3761cb68ef57 +sha256 libtool-2.5.4.tar.gz da8ebb2ce4dcf46b90098daf962cffa68f4b4f62ea60f798d0ef12929ede6adf +sha512 libtool-2.5.4.tar.gz 60599f5c3168a287fe3a35062fd2e32e0b73433fce820bfd18d28b0e3bd7a8fefde6d6f0505fbbc2d664119ab7c539269184993843289932c895847ea1ab9f04 diff --git a/packages/libtool/2.5.4/version.desc b/packages/libtool/2.5.4/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/4.10.17/version.desc b/packages/linux/4.10.17/version.desc index e69de29bb2..fcfe38915a 100644 --- a/packages/linux/4.10.17/version.desc +++ b/packages/linux/4.10.17/version.desc @@ -0,0 +1 @@ +obsolete='yes' diff --git a/packages/linux/4.11.12/version.desc b/packages/linux/4.11.12/version.desc index e69de29bb2..fcfe38915a 100644 --- a/packages/linux/4.11.12/version.desc +++ b/packages/linux/4.11.12/version.desc @@ -0,0 +1 @@ +obsolete='yes' diff --git a/packages/linux/4.12.14/version.desc b/packages/linux/4.12.14/version.desc index e69de29bb2..fcfe38915a 100644 --- a/packages/linux/4.12.14/version.desc +++ b/packages/linux/4.12.14/version.desc @@ -0,0 +1 @@ +obsolete='yes' diff --git a/packages/linux/4.13.16/version.desc b/packages/linux/4.13.16/version.desc index e69de29bb2..fcfe38915a 100644 --- a/packages/linux/4.13.16/version.desc +++ b/packages/linux/4.13.16/version.desc @@ -0,0 +1 @@ +obsolete='yes' diff --git a/packages/linux/4.15.18/version.desc b/packages/linux/4.15.18/version.desc index e69de29bb2..dbd2de60d7 100644 --- a/packages/linux/4.15.18/version.desc +++ b/packages/linux/4.15.18/version.desc @@ -0,0 +1 @@ +# Not obsolete: used by Ubuntu 18.04, ELTS EOL 04/2028 diff --git a/packages/linux/4.16.18/version.desc b/packages/linux/4.16.18/version.desc index e69de29bb2..fcfe38915a 100644 --- a/packages/linux/4.16.18/version.desc +++ b/packages/linux/4.16.18/version.desc @@ -0,0 +1 @@ +obsolete='yes' diff --git a/packages/linux/4.17.19/version.desc b/packages/linux/4.17.19/version.desc index e69de29bb2..fcfe38915a 100644 --- a/packages/linux/4.17.19/version.desc +++ b/packages/linux/4.17.19/version.desc @@ -0,0 +1 @@ +obsolete='yes' diff --git a/packages/linux/4.18.20/version.desc b/packages/linux/4.18.20/version.desc index e69de29bb2..4b86eee0f7 100644 --- a/packages/linux/4.18.20/version.desc +++ b/packages/linux/4.18.20/version.desc @@ -0,0 +1 @@ +# Not obsolete: used by RHEL 8.x, EOL 05/2029 for maintenance, 05/2032 for ELTS diff --git a/packages/linux/4.19.318/chksum b/packages/linux/4.19.318/chksum deleted file mode 100644 index ab6733e988..0000000000 --- a/packages/linux/4.19.318/chksum +++ /dev/null @@ -1,8 +0,0 @@ -md5 linux-4.19.318.tar.xz b667a467c0fdaf4387547370687811b1 -sha1 linux-4.19.318.tar.xz 9b35d8951cfda18756bf0fd59cb9148834278c09 -sha256 linux-4.19.318.tar.xz 0d5fa562a3c53f524f02fc11abe502c01096df73dd27d57736875e8590007493 -sha512 linux-4.19.318.tar.xz d82e25ec93b196dba2e21b6b792bb7ac37860340f98de4953c41152b54e4d952f62e05b2afe80b3aaa668d5ef3e62d562fb6b7dd7754b1b0065b4d0a45117ed7 -md5 linux-4.19.318.tar.gz a742c33cb16507cd3dd45a145df89b8b -sha1 linux-4.19.318.tar.gz 4364e85a603de363be6c2af765e0ba10a6aeb5a2 -sha256 linux-4.19.318.tar.gz 671cd4565222414bc0b9232c9440191abf827c01c72af9a63a1d3b286ab5c061 -sha512 linux-4.19.318.tar.gz d5a50baac95086ea6a4ec26b9fd39b5f82ade2ce493c5204f99ad113730006b5d39d0637fadb2be6efafd63ad3d00401f9014f76e2bf84d57f2baf7ea0c6bb2e diff --git a/packages/linux/4.19.325/chksum b/packages/linux/4.19.325/chksum new file mode 100644 index 0000000000..9219f0962e --- /dev/null +++ b/packages/linux/4.19.325/chksum @@ -0,0 +1,8 @@ +md5 linux-4.19.325.tar.xz 131a73cceb435e39e6394ed3db9e416a +sha1 linux-4.19.325.tar.xz 1a9779150ea605fc3e0ded3f3666743f1268dec3 +sha256 linux-4.19.325.tar.xz 607bed7de5cda31a443df4c8a78dbe5e8a9ad31afde2a4d28fe99ab4730e8de1 +sha512 linux-4.19.325.tar.xz 4a2c5f358e9caf47061d707db67738e0d1b1f24aebeeaab81dc2701cc3793ab574a7e0a3a5df2f99d6ff1d777acdca1d885da87ee31098c5b901853d8b580310 +md5 linux-4.19.325.tar.gz d8201f438135d2dc50302de5e6b7febc +sha1 linux-4.19.325.tar.gz 1a882796a187bbb2145d0e091ed370eed3d7f31b +sha256 linux-4.19.325.tar.gz 8f360bb8ba9fb692507f27596422c7ceddec5f7fed4d8f3df2b7656b6042cfee +sha512 linux-4.19.325.tar.gz 4e8cbfed3211b1c53122905ce588c421aedb05138581cd64986ddcba89b10ffcea8a3b1c63ec273abc02eac7c31f0f901e17677f4c3ed749b26fc47b75bce5f1 diff --git a/packages/linux/4.19.325/version.desc b/packages/linux/4.19.325/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/5.0.19/version.desc b/packages/linux/5.0.19/version.desc index e69de29bb2..fcfe38915a 100644 --- a/packages/linux/5.0.19/version.desc +++ b/packages/linux/5.0.19/version.desc @@ -0,0 +1 @@ +obsolete='yes' diff --git a/packages/linux/5.1.21/version.desc b/packages/linux/5.1.21/version.desc index e69de29bb2..fcfe38915a 100644 --- a/packages/linux/5.1.21/version.desc +++ b/packages/linux/5.1.21/version.desc @@ -0,0 +1 @@ +obsolete='yes' diff --git a/packages/linux/5.10.222/chksum b/packages/linux/5.10.222/chksum deleted file mode 100644 index c2082f9d4d..0000000000 --- a/packages/linux/5.10.222/chksum +++ /dev/null @@ -1,8 +0,0 @@ -md5 linux-5.10.222.tar.xz e5381e26d4dafff71c8dd519b3fa6f24 -sha1 linux-5.10.222.tar.xz 54cb199fb3cd66f04bba015c4b9813104917ab29 -sha256 linux-5.10.222.tar.xz 7b2d06803b5abb03c85f171100ca9d7acd6ba245036fe9a16eb998f088b150cb -sha512 linux-5.10.222.tar.xz 384b3b816daea1579116f86e0e0271101093ed82854a986351b1a5936f003ed1c469856c26410ab503480531acfe9ba1fbc39dffea03d32ee58849ad20af8877 -md5 linux-5.10.222.tar.gz 1e2bab72eb9edc39485a2724d629b4d7 -sha1 linux-5.10.222.tar.gz 169154b0f9e1784118a0083a47ce348e902c0690 -sha256 linux-5.10.222.tar.gz b3ee7d2d2d539a4874c4a14490cec566fca5ea2ec0535ac9924ed40fc76bed4d -sha512 linux-5.10.222.tar.gz 56c333620f5802d259189f1882028ed5252e500852f3180f7bfdd13b32524dd8ce875d62d1b28946a7e657430b7137f52043ec4d53b4fbe0820e81083bb467f1 diff --git a/packages/linux/5.10.247/chksum b/packages/linux/5.10.247/chksum new file mode 100644 index 0000000000..bed7b1ab41 --- /dev/null +++ b/packages/linux/5.10.247/chksum @@ -0,0 +1,8 @@ +md5 linux-5.10.247.tar.xz 17581ec89f0f55e78d1c662ceca39a83 +sha1 linux-5.10.247.tar.xz 5a5880705adedeee1cd53fc5539e09144495c57e +sha256 linux-5.10.247.tar.xz 70c8b87ba1fcd8bfa663661934dc9bda92d0b5f3c0fc3197bb56399f69d9fe0c +sha512 linux-5.10.247.tar.xz 1e5e564cc0b612b087b3e00fc62d0983d11db55063108163b7f5f9cd86eba832b387380c08ab1852413f157b96d3c13335e54e96ed49ac6b64fecfd9bb3852dc +md5 linux-5.10.247.tar.gz 41571017c155258127f03519c84b935e +sha1 linux-5.10.247.tar.gz 37d5699dcafa3ffaffcd859d0a876a96555d2e0d +sha256 linux-5.10.247.tar.gz d7065d11c348976dcd89884b73867562c5a527a18230be15bede96f657399375 +sha512 linux-5.10.247.tar.gz 164426769c5f6d4da0f26c800e1be0b492da8e31ddca01142faec32448d66a651197eadc1e8a1aa59685e5eeeeac3cc9999c1d0f184ad1c1e3bc8fb0fb9b7e7e diff --git a/packages/linux/5.10.247/version.desc b/packages/linux/5.10.247/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/5.15.163/chksum b/packages/linux/5.15.163/chksum deleted file mode 100644 index 11d01a321f..0000000000 --- a/packages/linux/5.15.163/chksum +++ /dev/null @@ -1,8 +0,0 @@ -md5 linux-5.15.163.tar.xz f782dcb6329e0b65436d1bfe1d7b1bab -sha1 linux-5.15.163.tar.xz 5d3f20a1b2df876d907d8bc829516ac1282cbe80 -sha256 linux-5.15.163.tar.xz 025fc7d8b1560cf456ccae50591fe1ca21c990645df9791aed25820fe78db302 -sha512 linux-5.15.163.tar.xz 8145c55476e56355bc785fd999ae514ebfb6426d9d0d9ef937f7a8c55d6c2734e9b2221013b596cee5e01b69340533353f80d99b59a4fbbd297c37acd57be3b0 -md5 linux-5.15.163.tar.gz 94e5ccba95052ebb35e5a3ce1daa2ba5 -sha1 linux-5.15.163.tar.gz bd925fbc922e43a73fdcf279879cd6849193e209 -sha256 linux-5.15.163.tar.gz f9dffca68a88b3699af5d5e9b8f43ad943b87d3c22474340e7e85a41aeb0abe5 -sha512 linux-5.15.163.tar.gz d4d8dcc4287b3e5d43d413c219bf1ac441afd3641203d8a766d6f5b91ee716b4aa29c033d9e8245c4325bafc9a3bbc49a342f57e72b23a29165e76d0afe88c6e diff --git a/packages/linux/5.15.197/chksum b/packages/linux/5.15.197/chksum new file mode 100644 index 0000000000..574b6da816 --- /dev/null +++ b/packages/linux/5.15.197/chksum @@ -0,0 +1,8 @@ +md5 linux-5.15.197.tar.xz 8f71d75c16337e3351d2312a82deef4a +sha1 linux-5.15.197.tar.xz 5de80283c3b7650a89cbbb7dfe56833ec95e40e8 +sha256 linux-5.15.197.tar.xz fd218df8e2107a4443b6c29fef7f95aad167031e0fbdbc7a858ae8471360668a +sha512 linux-5.15.197.tar.xz 9d83666747f7a7484551e4278805ed4461ba3bb4d5b8ced2220de6703d1e66aa45a690774bc79ff8334b8010bfc958b25225e7224db07f5dfe04d47ad9eca94a +md5 linux-5.15.197.tar.gz d8df0ffa11d562d8739ff7b4cb622218 +sha1 linux-5.15.197.tar.gz ec1d98adfd63d929fa2579e9dd67022c59be4b64 +sha256 linux-5.15.197.tar.gz 1a2718e05bb1734c56c058a1301c2e0a6ab784034ab9afd2ef7be8883c56c435 +sha512 linux-5.15.197.tar.gz 0dd006009da603ae0198e3160816307f0e58a4dd9b9b592255e9ecc177a04422e2e8f1916bb8fe41df7d12a0a7cf47a8fb198bb808e56a6d9ba18f0e197ab1cf diff --git a/packages/linux/5.15.197/version.desc b/packages/linux/5.15.197/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/5.2.17/version.desc b/packages/linux/5.2.17/version.desc index e69de29bb2..fcfe38915a 100644 --- a/packages/linux/5.2.17/version.desc +++ b/packages/linux/5.2.17/version.desc @@ -0,0 +1 @@ +obsolete='yes' diff --git a/packages/linux/5.3.18/version.desc b/packages/linux/5.3.18/version.desc index e69de29bb2..fcfe38915a 100644 --- a/packages/linux/5.3.18/version.desc +++ b/packages/linux/5.3.18/version.desc @@ -0,0 +1 @@ +obsolete='yes' diff --git a/packages/linux/5.4.280/chksum b/packages/linux/5.4.280/chksum deleted file mode 100644 index 0a54243aef..0000000000 --- a/packages/linux/5.4.280/chksum +++ /dev/null @@ -1,8 +0,0 @@ -md5 linux-5.4.280.tar.xz 66a0f04f43802b557b2216c415c8ef9d -sha1 linux-5.4.280.tar.xz bf883b341b0966fb8b8605f437746812b70e4a71 -sha256 linux-5.4.280.tar.xz a976c67eb8270cac310faf1acc61305d1f9967955aca38fbdfcb0bc77d033d42 -sha512 linux-5.4.280.tar.xz ee9c0689e6554f5fdc828730d38a4cb83be850108309fe7d8864b84a1040a50a79d89a1fe146a322e5e5fe2e756e85d2ebb8f0fcb9bc090918dbc18840d0e0cd -md5 linux-5.4.280.tar.gz b3451c7b0daa3db614648ffa6930995a -sha1 linux-5.4.280.tar.gz c5a7f148421dda0fc4b7029228f219662ddb19a1 -sha256 linux-5.4.280.tar.gz 3c3bfbb27ff756aa94c7d4ae66aca7f14cddcfd2e886de2443b26f2beb12a16d -sha512 linux-5.4.280.tar.gz 10770961bf3e5174711edc2a188182d5f559b10834b7112985c49c73f2f4d2050b82ba39f707e4222be559a2210ea15020a255d87c5efd57c8ac45c063ed444e diff --git a/packages/linux/5.4.302/chksum b/packages/linux/5.4.302/chksum new file mode 100644 index 0000000000..e602a77234 --- /dev/null +++ b/packages/linux/5.4.302/chksum @@ -0,0 +1,8 @@ +md5 linux-5.4.302.tar.xz f0ebaa98ada172815e972df854386a9e +sha1 linux-5.4.302.tar.xz 2c81367cf4d52b57c19ed3194042cbd8fb85bf7b +sha256 linux-5.4.302.tar.xz ae6a3207f12aa4d6cfb0fa793ec9da4a6fcdfdcb57d869d63d6b77e3a8c1423d +sha512 linux-5.4.302.tar.xz b4f67ba747a4813fe71d9bb41151b13273bbf2de370c9867a6deca11e05aa702351d33f746d8f7a8fe0a56f58dc89ea7555915e127d75ee151b231b5c49ef4c2 +md5 linux-5.4.302.tar.gz e177dc9f2e0ca359794cd6317b277e39 +sha1 linux-5.4.302.tar.gz 9508e9665df2c98d95bd5a10151fabbd83077bad +sha256 linux-5.4.302.tar.gz 573242a47528acc2e6122ed277a6f1fda2dcf9a58556a97243543d5f3122c9dc +sha512 linux-5.4.302.tar.gz 1d9f7af54c8f830f121a6ed34ffbe27d519fe9527c45fe96197fa5912afdc78b5e42ecd60c618a4d48b52cc5ccb81d6b638c055fc1a7d1845491d2699006efdf diff --git a/packages/linux/5.4.302/version.desc b/packages/linux/5.4.302/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/6.1.100/chksum b/packages/linux/6.1.100/chksum deleted file mode 100644 index 09126b2e31..0000000000 --- a/packages/linux/6.1.100/chksum +++ /dev/null @@ -1,8 +0,0 @@ -md5 linux-6.1.100.tar.xz 4d5f24481210a8857ffd528703304e6d -sha1 linux-6.1.100.tar.xz 49d075022276c627bf9ef583d5415d46a9aec665 -sha256 linux-6.1.100.tar.xz b9aa6ec1a00f234d6c6f2d428fbb0a6bf459606c259263df978f86685b65a8b9 -sha512 linux-6.1.100.tar.xz 842c5ee1109f6414b0173b83abf9ae0655a8bf1bf36299d86d83db1dd2a70147f7f637afe202c3899984fe340ce4633e4e5d3cb9d7b0b89014226a413bc79d8d -md5 linux-6.1.100.tar.gz 5221ae3243e8d45e1a02e4735c36ec4d -sha1 linux-6.1.100.tar.gz d0ccf9f92cad4028bfcf4000783a9daf4ba8ee6f -sha256 linux-6.1.100.tar.gz 86820b8e5847030fddc12bfcc14963de6c9e99b1a30861cb27944f1eea1e846c -sha512 linux-6.1.100.tar.gz fb2f10b102367ccecc498cc3b4bc3a5a5fc9fecd3038ecc5c28c8a6b9a9d21420927677b2c2cfa09cc1f04d065de6a6baab4fdb04f430fd0f50a1e8db73ad11a diff --git a/packages/linux/6.1.159/chksum b/packages/linux/6.1.159/chksum new file mode 100644 index 0000000000..ac72485de6 --- /dev/null +++ b/packages/linux/6.1.159/chksum @@ -0,0 +1,8 @@ +md5 linux-6.1.159.tar.xz b5a7d737830841014596e2a9ec6308f4 +sha1 linux-6.1.159.tar.xz ef37713d9c65024acd8ba51606a656be42362f0a +sha256 linux-6.1.159.tar.xz 1f207ebe93980829ecc0a18b694816f22b715e9893767731651969a168342b9e +sha512 linux-6.1.159.tar.xz ee40a5d418600ba1b6f9c3456a3f00abdefa0df5c3af11b8982de71d6b233df40918885f02f17d6df46bb01aa76783e594881b89536e8113d95beaf0e2da5a68 +md5 linux-6.1.159.tar.gz 55f6da08d3295d56624feea1a6cf2bfa +sha1 linux-6.1.159.tar.gz 17dc847fb7e54ebfce262e0d6d3ba7f2209e5cb0 +sha256 linux-6.1.159.tar.gz 49bd83e59469b5d6097c6a8dd9a84e9a87214a9ed726e9d4bb80015f9b7ee43e +sha512 linux-6.1.159.tar.gz f0ea76fd8737f2836fa967a882797a84380060eaaf2b98dfbea6dfa205992d2dadc351bdfdbdcb66ac3ad9b1491f500822346ada8d9a6ca511265e8100cc4ca8 diff --git a/packages/linux/6.1.159/version.desc b/packages/linux/6.1.159/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/6.10.14/chksum b/packages/linux/6.10.14/chksum new file mode 100644 index 0000000000..3bb4743c17 --- /dev/null +++ b/packages/linux/6.10.14/chksum @@ -0,0 +1,8 @@ +md5 linux-6.10.14.tar.xz 37212bd36eeacdae65a43fb677502f87 +sha1 linux-6.10.14.tar.xz 72b57fde9d3aa1f36bfdc4f57f0e1712b4156529 +sha256 linux-6.10.14.tar.xz 55e5bcbc68d66776fc46896291f0a24844beb57817345a854d65e3d055fa423e +sha512 linux-6.10.14.tar.xz 1dccdc084b47ccbb270ddc1f4d9b020c4314eec198141690f83fe3cf78959a7b15638b7d69bead235b18ddcf8e6c99c8e8a62bc1c17a983d911d647b07c3919d +md5 linux-6.10.14.tar.gz b815c9cec9f4b2b7c451c6667d5f2b62 +sha1 linux-6.10.14.tar.gz fefa6209a37e5768090b0fa39624051560b5820c +sha256 linux-6.10.14.tar.gz 228b37a5e9a7ff072cc65dde1f637a98b6b2baf55ee564cce4ccce39e606ddec +sha512 linux-6.10.14.tar.gz 1b6a7f6f33051d4ae393cbcaaed7a5f3b0f6b1147e53a2e2f852962633678e30a0eef5ccbdf3f757bc198561c980dc0a59862979f0e16ba0446db43b703bb4f3 diff --git a/packages/linux/6.10.14/version.desc b/packages/linux/6.10.14/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/6.10/chksum b/packages/linux/6.10/chksum deleted file mode 100644 index f1bf7d9519..0000000000 --- a/packages/linux/6.10/chksum +++ /dev/null @@ -1,8 +0,0 @@ -md5 linux-6.10.tar.xz c0ce046a9a0d041e13cf222f81eae574 -sha1 linux-6.10.tar.xz 1e9cb1c45e24c18128f4529cc4b93cf3b36d06be -sha256 linux-6.10.tar.xz 774698422ee54c5f1e704456f37c65c06b51b4e9a8b0866f34580d86fef8e226 -sha512 linux-6.10.tar.xz baa2487954044f991d2ae254d77d14a1f0185dd62c9f0fcaff69f586c9f906823017b8db1c4588f27b076dfa3ebb606929fec859f60ea419e7974330b9289cc2 -md5 linux-6.10.tar.gz b75f5c9c879ffd035e3a6fd400c277ba -sha1 linux-6.10.tar.gz 6466209931241249d66d34e3b7b2fabc90ca0dc5 -sha256 linux-6.10.tar.gz 37041701dab67f8e1bd699d728fec07d6098abd147b366f0c7ad1a3fb1b58619 -sha512 linux-6.10.tar.gz 5e180a7ff5c2034f70ea954d2546c22bbb4d206b846f87d4c37fafe67f202917a20affdbade3b6fcb8b0e623f0331eec80172f0294647654f78ee6a7a995689f diff --git a/packages/linux/6.11.11/chksum b/packages/linux/6.11.11/chksum new file mode 100644 index 0000000000..65655eb0d8 --- /dev/null +++ b/packages/linux/6.11.11/chksum @@ -0,0 +1,8 @@ +md5 linux-6.11.11.tar.xz 68eaa260b20f8daf7cdd7f514fd59dd4 +sha1 linux-6.11.11.tar.xz 629b997b57608983211ec8776aa52669316b4df5 +sha256 linux-6.11.11.tar.xz 62148e7e17f54c4a5ab5e75ad4882682c54bee818948be61a5963234fc0849fc +sha512 linux-6.11.11.tar.xz 2eb783c5e7a06178971acd594d8aa5b9d50cf02b266a2afe4d2c664037c86a3df131ff9073be20b2354c6b50f14860febae401181f97ca4b2b308e23bea9003d +md5 linux-6.11.11.tar.gz e2e1c875a366fe39529b8cdbfed29719 +sha1 linux-6.11.11.tar.gz f7c0bc945004c932b7d99c75c767e5b3b7bfdbfb +sha256 linux-6.11.11.tar.gz 049abd343d7647cc14546a4d6bfbd5a3966bbd88c2e4c9c77c9f2e14d9171e5f +sha512 linux-6.11.11.tar.gz 92a98ad45406870f0e3cb7da1fedcea89a505cfc799b56f76a85984ba9ce457806d77cabc211d95bb77a0741133874456a4cad8385fd94532aad8221d26850c9 diff --git a/packages/linux/6.11.11/version.desc b/packages/linux/6.11.11/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/6.12.63/chksum b/packages/linux/6.12.63/chksum new file mode 100644 index 0000000000..bde9743521 --- /dev/null +++ b/packages/linux/6.12.63/chksum @@ -0,0 +1,8 @@ +md5 linux-6.12.63.tar.xz 5302136bc890b24a14d54175edd32403 +sha1 linux-6.12.63.tar.xz 1c6700396125422fee073b0bd60961e5fc8d07e0 +sha256 linux-6.12.63.tar.xz 9502c5ffe4b894383c97abfccf74430a84732f04ee476b9c0d87635b29df7db3 +sha512 linux-6.12.63.tar.xz 89a4aaa7f924b2c579d0bf384742c3ec2fc9b11c272b9d68ad645a99127043a4f55f8a07067a99ff6220ba9c3efb29dbf27baa298d2b5980d811771873afac1d +md5 linux-6.12.63.tar.gz 42513dffe3871648f204f46dc37a138c +sha1 linux-6.12.63.tar.gz 3ac1ee449e85710d005770358e5e9dea3d6f4467 +sha256 linux-6.12.63.tar.gz 9557e9915b9b4325804968fe7cd8e762e4afdc97e6998f7ee1b6a6101d2ab7dc +sha512 linux-6.12.63.tar.gz 49c3b166391d139586bbee2071349a11892173ef91bab0fa3b376323f6cc5971c790292536ebd76c01d8b99339c7330885cce7a3d4e8fbdfb45ef9981fa8d896 diff --git a/packages/linux/6.12.63/version.desc b/packages/linux/6.12.63/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/6.13.12/chksum b/packages/linux/6.13.12/chksum new file mode 100644 index 0000000000..1d8bd8a084 --- /dev/null +++ b/packages/linux/6.13.12/chksum @@ -0,0 +1,8 @@ +md5 linux-6.13.12.tar.xz d65975e151d5af33d911312c97d96466 +sha1 linux-6.13.12.tar.xz 21dc04c81611dc2e5320b3d1aaff0c0d19f970ba +sha256 linux-6.13.12.tar.xz 611fbb669cf5539da48137a9c052becd499f3f862afaf21ab84cea3966221242 +sha512 linux-6.13.12.tar.xz 9580b40d17281846f8795729297e45cb4ffcde16a3ff355ccafe61fd05fd6b24f109256ebf5c7294026fe94a01b5c699c968043427e5ad5b73330995662b8d0e +md5 linux-6.13.12.tar.gz e25a78dd579e5c5005c0d1e032dc26e7 +sha1 linux-6.13.12.tar.gz 0145d6704aa4917daaa2e04f855d168dce3adcff +sha256 linux-6.13.12.tar.gz eab0580a93d0bd3898da77dcbf558f74ca1d07a9884241b4c83181e5ebc8562d +sha512 linux-6.13.12.tar.gz 59a352633469d43cac8ef8eb32cb2db78cd1cc840c5ace09af826e668ca51fc8fc88b826b46f6b5305b6afa4e88d0676055e124e414a50f8f5b75ea5a6842072 diff --git a/packages/linux/6.13.12/version.desc b/packages/linux/6.13.12/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/6.14.11/chksum b/packages/linux/6.14.11/chksum new file mode 100644 index 0000000000..377857d6b9 --- /dev/null +++ b/packages/linux/6.14.11/chksum @@ -0,0 +1,8 @@ +md5 linux-6.14.11.tar.xz a7231ee7a61b4b5d058cd92c424d5058 +sha1 linux-6.14.11.tar.xz b3906735338a98bd726c8bf7eb6d4399efa31626 +sha256 linux-6.14.11.tar.xz 3f1ccd0a6dc9c9777cb6fcef357c77e4a2386c84c52b6d5bbcda79c16af33b1b +sha512 linux-6.14.11.tar.xz d025b67b8b85edaeb94ca3d40ff4cb463542a3117e3dbe98345f58e477f3efe4660e2b936151fafca5fb8257c488beaf4276ccfaaf8af8a62977341e55d25767 +md5 linux-6.14.11.tar.gz 92f5ce379f53decd90868f1e8e4c5259 +sha1 linux-6.14.11.tar.gz 3f70c18ccfa34b7b3e735f8939a4f038092524ba +sha256 linux-6.14.11.tar.gz 5baf8ee036ca94a4a4dacb21218e43225baf270f0227271d0106160eda6e6f31 +sha512 linux-6.14.11.tar.gz 1bd624b535f9dcbb98882b3c29c81f485477a43c4aae7a6751ac069ce171181397b482231f2d4ae1382ffe96224104e6fce993c317705671dc092949cd46b8d1 diff --git a/packages/linux/6.14.11/version.desc b/packages/linux/6.14.11/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/6.15.9/chksum b/packages/linux/6.15.9/chksum new file mode 100644 index 0000000000..0329461935 --- /dev/null +++ b/packages/linux/6.15.9/chksum @@ -0,0 +1,8 @@ +md5 linux-6.15.9.tar.xz 439fcb0223a3ba828ffd5107953697ee +sha1 linux-6.15.9.tar.xz 2fc55daffd1fb42c9fd9cedf50d6d053db348d43 +sha256 linux-6.15.9.tar.xz e94f3af85492302f7a819441458f80bca0ad9912e5a4c83c699ff3c63c52957d +sha512 linux-6.15.9.tar.xz 46eb38197d7105dd2ef2b9a5d8d17d40849f18ee0719437acafc9b031f5373060fc1f60527ff2c251f792cc7ab9b1d5e9f3260021825c937ffbb2331320827a4 +md5 linux-6.15.9.tar.gz c795a6a675cb3297546dc0810e80aaab +sha1 linux-6.15.9.tar.gz 773bbc94f53e6d90d1ce4aac5cf316d2dee2e2b6 +sha256 linux-6.15.9.tar.gz b4c33c370104e38a66cf0d85bed77942411ce841fef92b7df6dae2bb5c5f86a4 +sha512 linux-6.15.9.tar.gz 9bde556eb247784b80a7011c38f63160fa68da2bd710a4f8e7e56a576c1b34f6bd5c9e7dd191c11081db6f3f0c1743848f92a2212d60a604b343fe2578ee5e5e diff --git a/packages/linux/6.15.9/version.desc b/packages/linux/6.15.9/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/6.16.9/chksum b/packages/linux/6.16.9/chksum new file mode 100644 index 0000000000..325115c085 --- /dev/null +++ b/packages/linux/6.16.9/chksum @@ -0,0 +1,8 @@ +md5 linux-6.16.9.tar.xz feb0a3d5ecf5a4628aed7d9f8f7ab3f6 +sha1 linux-6.16.9.tar.xz 32a49bad6972f7ea81e28bbc227b3fe80164a625 +sha256 linux-6.16.9.tar.xz 7ac8c8a3cf05476375deaaa85dfcee095a826ffe557b437f43774fc3b64ce58d +sha512 linux-6.16.9.tar.xz 4a3e704edb7a880422d6d19ec749e9a591520aca5c5614043e6e36887b5dd6a2a0c813ea761f405350c7c49433d37e9df5d9f85a54f290038b7a2af7cbef8a8b +md5 linux-6.16.9.tar.gz 8decc29ce59bb420d6468e121e07248a +sha1 linux-6.16.9.tar.gz 9628d3e5ff8848b83353d74828110ac7f71a70c4 +sha256 linux-6.16.9.tar.gz 9e24b71efcaf005ad68efbbad1e08b6bbbbf9c3477d58e9a17b70cc343a4bed9 +sha512 linux-6.16.9.tar.gz 08debd4e042b509a471b3911e568e4625f4ce3fb2faaffb6b1fdbdaaf50eb72df049c680e74bcf2290664adb31ac64454581b4f70587157a0b663d8edd1f116b diff --git a/packages/linux/6.16.9/version.desc b/packages/linux/6.16.9/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/6.17.13/chksum b/packages/linux/6.17.13/chksum new file mode 100644 index 0000000000..2a189ebe0c --- /dev/null +++ b/packages/linux/6.17.13/chksum @@ -0,0 +1,8 @@ +md5 linux-6.17.13.tar.xz d437e374e45da47b252c80c6ad9e7f77 +sha1 linux-6.17.13.tar.xz 43a992cea60d6c4fe63c8cfbe2d681c710783384 +sha256 linux-6.17.13.tar.xz 116802dc3ad1646163cc6ffe9bddba24a8069b569135ec0523cd799064f2edb9 +sha512 linux-6.17.13.tar.xz 91450681e4d07ba20f8dfd5863748d5bb190615c17ab31f27b65e2b70f2785d70a1be4e565efc956f971bedc9806344f680c584560e2f132f3190c6c888ba981 +md5 linux-6.17.13.tar.gz 3a3be003e8d3e30652117b13244cbd08 +sha1 linux-6.17.13.tar.gz 36f98a312d3b5e2132a6a0fb353135c4d435905e +sha256 linux-6.17.13.tar.gz c888d83fd426c817a31e70d8460bc3e4c7f2e07567060171b1ffb0beadff6de8 +sha512 linux-6.17.13.tar.gz 330fc7a5bc448f20821f7d93d24881e60e6e3774fa9da15d9d3720a8a442c5ab90a9de8b5e11b2207cdb81cee99e1fc06d7c09478e584b993e77b872f96e8981 diff --git a/packages/linux/6.17.13/version.desc b/packages/linux/6.17.13/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/6.18.3/chksum b/packages/linux/6.18.3/chksum new file mode 100644 index 0000000000..0cce56f334 --- /dev/null +++ b/packages/linux/6.18.3/chksum @@ -0,0 +1,8 @@ +md5 linux-6.18.3.tar.xz 57f0cb3f23afba114a78d656d04be91b +sha1 linux-6.18.3.tar.xz 110822728cd5ac3976b6a0345fb20fdc2a6d6e71 +sha256 linux-6.18.3.tar.xz 7a8879167b89c4bae077d6f39c4f2130769f05dbdad2aad914adab9afb7d7f9a +sha512 linux-6.18.3.tar.xz 09e46cd42dba82ba3ca5febd0ab9b9a6b5cac5e2c214a1374c79f82ecf826979d9bb52b543a187bc0c1257b7b45c7160bb28ff2d2a224a4d55a4560cdf2a5f95 +md5 linux-6.18.3.tar.gz 84573ed9d5d61eb57f12e595366f08b6 +sha1 linux-6.18.3.tar.gz 5ec324aa119a8f2a1e86039416e1b016e7d27ce0 +sha256 linux-6.18.3.tar.gz 894fc53491d527df3c092742a06c2b8c587d052b6be86eb336254adc459a05fc +sha512 linux-6.18.3.tar.gz 7282a0a2d93427eaa218d30913e7e4b6ca9118010e985231ed7a6d830f55483b9efc4b7fb1eea203599ab8c3992579f41f9cfdf28055b78f33ac4e82f6561528 diff --git a/packages/linux/6.18.3/version.desc b/packages/linux/6.18.3/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/6.2.12/chksum b/packages/linux/6.2.12/chksum deleted file mode 100644 index 0b9d485fa7..0000000000 --- a/packages/linux/6.2.12/chksum +++ /dev/null @@ -1,8 +0,0 @@ -md5 linux-6.2.12.tar.xz 8ad2168e5aff669fffb6e6aa7006b5a8 -sha1 linux-6.2.12.tar.xz d19fbb521a3f8abfb828f474dc04eaf10dbea676 -sha256 linux-6.2.12.tar.xz c7e146b52737adfa4c724bfa41bf4721c5ee3cf220c074fbc60eb3ea62b0ccc8 -sha512 linux-6.2.12.tar.xz 9d6de9301c8277df63aa3e4b6790917908ac333d05b2ef436726653f68e7acdf9e5a1bd72226c85a251380156757da13abd4d0c4a28a9520a875c479ca8aaa32 -md5 linux-6.2.12.tar.gz b14ef0f9255e0fa9d806b2e972bce75d -sha1 linux-6.2.12.tar.gz 2e00c55781d27f8904da9933ae1e6a8a3c925ef9 -sha256 linux-6.2.12.tar.gz 9a3b0d30b85844c05bc7571f900a72f1146c67fffe33b275c25be6393b8b46ef -sha512 linux-6.2.12.tar.gz 30a0a8353d9573d34625b1465293a6c9ff3905484c43f63666e0ccf9d10fbde46649e2bb90f4420a2093f865c985d4e16ee64f64bab554ee8158254cc5eccaa8 diff --git a/packages/linux/6.2.16/chksum b/packages/linux/6.2.16/chksum new file mode 100644 index 0000000000..f25ecb2e14 --- /dev/null +++ b/packages/linux/6.2.16/chksum @@ -0,0 +1,8 @@ +md5 linux-6.2.16.tar.xz bef2a6e690b2bcbd693f15559d54930d +sha1 linux-6.2.16.tar.xz b601afb22ca614d68bc8deef579f5c67ea19e4e6 +sha256 linux-6.2.16.tar.xz 06ff0d780a6934b46140f6d8c1a15792c78aa337d8b2411bf90747371d358713 +sha512 linux-6.2.16.tar.xz 7f98d8ee2417272e2ab1517f6b7150f74033622e24a9426fc924c75aea46ab22b8ec8c73fc2523378fdb80f8899a3c6a55036a20dd30e438c1d6d39ea036f2c3 +md5 linux-6.2.16.tar.gz 028f02ffbd315c54e3b74b6eeecd3578 +sha1 linux-6.2.16.tar.gz 88dbca45901ccf96e622ad165c27628ac917cd4e +sha256 linux-6.2.16.tar.gz 727433b8468633de65bcc9a85be7b28a2db17f8cdfbedab1e73f4ab51a1b5f3b +sha512 linux-6.2.16.tar.gz 1d5c53249126639f5245c0b7528181368f4f4f05cb1d30ef157a5b77096223485bbf2452dd8035d073f2229982a2b7b4613b90dc93c6f24b31d500be434f0c1c diff --git a/packages/linux/6.2.16/version.desc b/packages/linux/6.2.16/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/6.3.13/chksum b/packages/linux/6.3.13/chksum new file mode 100644 index 0000000000..301eaec997 --- /dev/null +++ b/packages/linux/6.3.13/chksum @@ -0,0 +1,8 @@ +md5 linux-6.3.13.tar.xz 8a994a9fc31e9e092885be8ffd7f2367 +sha1 linux-6.3.13.tar.xz 8b02f92e698b07ffed3899eaa08a52165624871d +sha256 linux-6.3.13.tar.xz ea460560e2898022c5f3c4649908694dcd75a094ffde726e8c6ca5e0a09491fb +sha512 linux-6.3.13.tar.xz 850f56587c49c7ad3e4873a4b9d8160b0b015ac00dbe272d3fd4b661d18a6e73d1d9dea69376fa002d47b195648c617ef0143a54cdf3bf7c361f0b90cc262e16 +md5 linux-6.3.13.tar.gz cc4e6b3870a3cd83720c4fd4b4b1593c +sha1 linux-6.3.13.tar.gz db3be966955298b9512b21b9f4d81f572e6f2db8 +sha256 linux-6.3.13.tar.gz 49cf51e0abe164bc5442ad989d4fadf0bb01adeb46f5148fe9f3648e97f366c3 +sha512 linux-6.3.13.tar.gz b5bf94f7c5b5324c87c09fdf918c3f86d2a0dce1ec06abba83ae0baff26b5fc26bceb8248cd100a512e4a6a39f59ab9b9ef5e5cd70a5de460aac47c45affe0ea diff --git a/packages/linux/6.3.13/version.desc b/packages/linux/6.3.13/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/6.3.9/chksum b/packages/linux/6.3.9/chksum deleted file mode 100644 index e90bac09e0..0000000000 --- a/packages/linux/6.3.9/chksum +++ /dev/null @@ -1,8 +0,0 @@ -md5 linux-6.3.9.tar.xz d4e45bcf3f0df8077d37eaa76e7cf307 -sha1 linux-6.3.9.tar.xz cd2236895a59fa581a3dc92571c792f1be861f68 -sha256 linux-6.3.9.tar.xz 41ecf21399b17ab85163750ba22347d09b54fa099b80b63d0e2ef0066129b13e -sha512 linux-6.3.9.tar.xz e01ee91378b348bd1ce60a974b6b58ebb422b7b1964b145488fc2272a2b52f9bc2003501c216febcb6672213770de053720b6584d16690cbc00ca2ca633e18ac -md5 linux-6.3.9.tar.gz f69bcdcc2d9627c60c069a7d32fc15fa -sha1 linux-6.3.9.tar.gz 2c2dc0cf8b82bf5a263ddf5f3587b503696924f3 -sha256 linux-6.3.9.tar.gz 465376ada6ac429c2da41cd7e90343c13970b5a7e978c48748ff490fc98e39f9 -sha512 linux-6.3.9.tar.gz e5f98f9e60b3020f5177585e0c7812932afc06f788d572c122eb1cc3343f876a4cc8d99f06a7834aa8f8821b4340b9c475c15d07f5322e11d25622813306bf50 diff --git a/packages/linux/6.5.11/chksum b/packages/linux/6.5.11/chksum deleted file mode 100644 index fa6481213b..0000000000 --- a/packages/linux/6.5.11/chksum +++ /dev/null @@ -1,8 +0,0 @@ -md5 linux-6.5.11.tar.xz 6c765c929938c9890004196e0f01b91e -sha1 linux-6.5.11.tar.xz f3ef7f2c503bfd13f4b24408b6e2e6f695b22ec3 -sha256 linux-6.5.11.tar.xz 2ee24af9282b80923b2da56b70aad7df2e8ee4e3f076452e05ba66be2059b519 -sha512 linux-6.5.11.tar.xz bfb086ac52d9895695a5f1d7c35ee6ce560fd935ab99ede7bdc60142f714bf025dbae5e304e5e32acabdc900e940bfb0f7b02494f1fef04e9e8fc5afb9d3066a -md5 linux-6.5.11.tar.gz b944b23a420fd1ac2de2a0a40f9f398f -sha1 linux-6.5.11.tar.gz 142321ec84c2debfb4e7024b4cdd0fe228ea807f -sha256 linux-6.5.11.tar.gz 2fb291d181ac9d2eab318ed1dbc2429822eac63d09e593aff55cc0083e2862ef -sha512 linux-6.5.11.tar.gz 90b49bda24f03cfd279b6c6840db7fa88d430cbbe17a3696abf90a3fb03576920a77263fa0e58149add52075e3d3295abf9be9d66892950385255b1aa94fa546 diff --git a/packages/linux/6.5.13/chksum b/packages/linux/6.5.13/chksum new file mode 100644 index 0000000000..4387b02736 --- /dev/null +++ b/packages/linux/6.5.13/chksum @@ -0,0 +1,8 @@ +md5 linux-6.5.13.tar.xz 4de467d715e83e0f5fbec981208d467e +sha1 linux-6.5.13.tar.xz 458cbc8ff44bc4ea5c302e7ef595cb6d4b6db541 +sha256 linux-6.5.13.tar.xz 78fbd43822f4c56bc16e89e8874767f592532e1a0ffcd1af4dd279559b5fcbb5 +sha512 linux-6.5.13.tar.xz bf309b8f174de89169c6190fc21e1b41f094939d58b426ed7d5d44821122648f143f61b64778b2423fc4f4452fcef9628e4f8b16feb3f74053bfb69b231a40e6 +md5 linux-6.5.13.tar.gz 295bfed4c92d3392c60a06b20a9c8746 +sha1 linux-6.5.13.tar.gz 296c182751f30014fe8ba1927884138c372b6973 +sha256 linux-6.5.13.tar.gz 514875fd49f1d8de7079f0cac113eb2e4c896e624303795ee55341f3e7b82182 +sha512 linux-6.5.13.tar.gz d8d6cc8541f02d544eb6829af58e46309fcf3a1e0fd636bdc8bcf930745e3064279b9ded902febfb498cd04d2b39f3290cd6520adbdf99fe79184f56114e83fb diff --git a/packages/linux/6.5.13/version.desc b/packages/linux/6.5.13/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/6.6.119/chksum b/packages/linux/6.6.119/chksum new file mode 100644 index 0000000000..d79d2656dc --- /dev/null +++ b/packages/linux/6.6.119/chksum @@ -0,0 +1,8 @@ +md5 linux-6.6.119.tar.xz 98fab2a81b48c92490692e3dd6f71995 +sha1 linux-6.6.119.tar.xz 1462329ebb007d25cd4d00ccdc44985d791df903 +sha256 linux-6.6.119.tar.xz 3da09b980bb404cc28793479bb2d6c636522679215ffa65a04c893575253e5e8 +sha512 linux-6.6.119.tar.xz 4a9c52bea73621f446155fcd801bc7b8e9f81d3008e220e9726517b39949d03abd317bb27cef854317b398153b1896dae2bc10c3207bf57acbea61e5c3fa4ac2 +md5 linux-6.6.119.tar.gz 4228337fcaef195bb34d409cb23e2d7f +sha1 linux-6.6.119.tar.gz 4bcb1aa32e846a584d4f9858e86903c75e9b1760 +sha256 linux-6.6.119.tar.gz 8746989ee49541eae752c219eb5260cf730bd1400052792ab74674a3b0827e0b +sha512 linux-6.6.119.tar.gz 1866100f4bc1ad7a9be5cb83fcd214ec2a97a286a14cdfd69f9f2f2630e19b2f16110e838d1ed7635a087b2323b4f52e7c9cb77a7306edd3b9417b9af84f4b32 diff --git a/packages/linux/6.6.119/version.desc b/packages/linux/6.6.119/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/6.6.41/chksum b/packages/linux/6.6.41/chksum deleted file mode 100644 index 4aa8337a0a..0000000000 --- a/packages/linux/6.6.41/chksum +++ /dev/null @@ -1,8 +0,0 @@ -md5 linux-6.6.41.tar.xz 2201c0201a2a803da345a38dbdc38fcf -sha1 linux-6.6.41.tar.xz 3a161b770dcb6b4501b79a533722ee74d13a3af3 -sha256 linux-6.6.41.tar.xz 9ec99c578158ab85d99b37791a76643d2ea4c3f72ecbef7b5eb6d60f3de032ef -sha512 linux-6.6.41.tar.xz d623e13d482683c47b1e00e346658928597522b45fca94b6713e75dbd57deca92cf6b1189ddaadb7b37a04e509ff713eecc76f5a818f241e328635f77f09f504 -md5 linux-6.6.41.tar.gz 4e8785660b19af85fd72552f70a87a26 -sha1 linux-6.6.41.tar.gz de8765cb692418af27ee6ed0b3b06d4abf990d11 -sha256 linux-6.6.41.tar.gz fe72a3ef65aa422f78e7b782f33f9085d7da24555716ffacab1892cd26b14b57 -sha512 linux-6.6.41.tar.gz bc0adb67cd6af19568e030ad3cada2549544700c9ab3da804e057a55271fc9ecd4f2b12680aa84d276cc5dbc29243ad701a657e86061531921048b821781deb1 diff --git a/packages/linux/6.8.10/chksum b/packages/linux/6.8.10/chksum deleted file mode 100644 index 115c8b40bb..0000000000 --- a/packages/linux/6.8.10/chksum +++ /dev/null @@ -1,8 +0,0 @@ -md5 linux-6.8.10.tar.xz e6f7eebefb85cad7cb4609f1232ecceb -sha1 linux-6.8.10.tar.xz c68103f5dd100d92bde365c2ef9422fc82213394 -sha256 linux-6.8.10.tar.xz b0bb92d982f88380e5b2059349c3a862e0afa712e0646eb0e082b9c2c5cb5176 -sha512 linux-6.8.10.tar.xz 97869a0271ae7f36a16e0a73eba3962fef96129bc33fea98909020127336b2cac54184cac1fcafacae2e4fa1fa24fa27dd68a2d43e4c588636782fdaef6b9fff -md5 linux-6.8.10.tar.gz ea4956460c0def3cc4796c856824e7bb -sha1 linux-6.8.10.tar.gz 6e056905452481655cc23adb44d1cb88e840192a -sha256 linux-6.8.10.tar.gz 8d0873af7962fcaa31e7dd9a518d54665ef8307aca0e0ed26057617978cc3688 -sha512 linux-6.8.10.tar.gz 3970d26ca9f689bcd6bff986ebb8cfdcd88f7270ecf5a4d88228179a21fd95e4fae1693684ac8b7be83bbeeccb485b778aae32a4de5e8101b8522ced473c4644 diff --git a/packages/linux/6.8.12/chksum b/packages/linux/6.8.12/chksum new file mode 100644 index 0000000000..7071449073 --- /dev/null +++ b/packages/linux/6.8.12/chksum @@ -0,0 +1,8 @@ +md5 linux-6.8.12.tar.xz b70560dc3641087e198e04f4b99bd249 +sha1 linux-6.8.12.tar.xz e9e007154550e70ae94993a6e0066303b9c94cda +sha256 linux-6.8.12.tar.xz 19b31956d229b5b9ca5671fa1c74320179682a3d8d00fc86794114b21da86039 +sha512 linux-6.8.12.tar.xz 95c4c814a0257ae4678889249cb36867451e59e106d615cdcc1be929fbd6f44a925db98ee6bf1c01ae59f976a66e481231e6131348dd7da60dd08a7901dfeab9 +md5 linux-6.8.12.tar.gz 31c6dcf563b96c1708bb667350966486 +sha1 linux-6.8.12.tar.gz 03cb2f016ac912ad052353febfcfd157cd926e95 +sha256 linux-6.8.12.tar.gz 1f6134265066aa2bef94103c1e4485d6ed8c2e08ba2a24202ea0c757c6c2c0de +sha512 linux-6.8.12.tar.gz c0f27daa9fb6c7cde79deb6eec180439ed579be6cea76f43a7bd4c33a45c84fc48c441136e27309b8fe4ae16e44b43a35c68be90c50c31430a24a75365be3910 diff --git a/packages/linux/6.8.12/version.desc b/packages/linux/6.8.12/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/6.9.10/chksum b/packages/linux/6.9.10/chksum deleted file mode 100644 index 72cc5e0acd..0000000000 --- a/packages/linux/6.9.10/chksum +++ /dev/null @@ -1,8 +0,0 @@ -md5 linux-6.9.10.tar.xz f51a016f44cdc61a4402b046656c33e0 -sha1 linux-6.9.10.tar.xz c44d83ae4d9d5d4c150fd845af3ef14633767c2e -sha256 linux-6.9.10.tar.xz efd12e335fa67d13a3eae30e4b7b7546e74b8ccc90682e4c3fffab0b22654da1 -sha512 linux-6.9.10.tar.xz 043885652363f935049744585d72fd7a1fac30baa6fc222f4ef8ca95b66d0ebf0c9492fdc9208009a849527076d1f6586ea557cde75aaa547e46e624ca759625 -md5 linux-6.9.10.tar.gz 8aada4175f1f5da00b9a10e495a21c7f -sha1 linux-6.9.10.tar.gz 5ff3c6ace284d23cd9362a51484fa5ed936fce2f -sha256 linux-6.9.10.tar.gz f025c39b604741d7c60fc42efe6f892084af1ff237d96f1b78f71e3247b77bb6 -sha512 linux-6.9.10.tar.gz 7bab09ee2a3f48fa2794dd5c8be8c7b99a13b22648c87c407f2c1f88e4f0047ee83f0d88e5765a8fa756bf4e4bd71581a22fc414d4ab643f91a36ece1c09f477 diff --git a/packages/linux/6.9.12/chksum b/packages/linux/6.9.12/chksum new file mode 100644 index 0000000000..26614d1be2 --- /dev/null +++ b/packages/linux/6.9.12/chksum @@ -0,0 +1,8 @@ +md5 linux-6.9.12.tar.xz 04094266fbf9379cb97b6701bb95c2cf +sha1 linux-6.9.12.tar.xz a77c1853e0e3b8e7927e97c2aba65088bdd69190 +sha256 linux-6.9.12.tar.xz 5ae7cc4e0e2f6b9ba630f643985ba0522c7d5e5b9571ba478a3cb513edd4cf22 +sha512 linux-6.9.12.tar.xz 6b6c157625c4880a1c381d74fad636d4b57ef78068bc8e19387ab7dc97095b82cbd88287205472adeccaf322703a1aa30a1a45d6e82e9e70af969b8de433873f +md5 linux-6.9.12.tar.gz 5d93d11089f747db2e14e800089d6e17 +sha1 linux-6.9.12.tar.gz 590786b195c1d0f008d9f4007d0f5a48509919a9 +sha256 linux-6.9.12.tar.gz 0fc253179fb6b738ecaca2d016103f02e73a21ffe4ebee147bc6edf403c17738 +sha512 linux-6.9.12.tar.gz 6932bd9ce925e7965b6172aadc99b40e4c11993e99c8c362c0a1344caf1f4dd5ca1ab848c6fbf71fc35130c02c77240340236bee4929ec9d39ed29942743c733 diff --git a/packages/linux/6.9.12/version.desc b/packages/linux/6.9.12/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/ltrace/package.desc b/packages/ltrace/package.desc index 10797fb188..bdc762c61b 100644 --- a/packages/ltrace/package.desc +++ b/packages/ltrace/package.desc @@ -1,4 +1,4 @@ -repository='git git://git.debian.org/git/collab-maint/ltrace.git' +repository='git https://gitlab.com/cespedes/ltrace.git' bootstrap='./autogen.sh' mirrors='http://ftp.debian.org/debian/pool/main/l/ltrace ftp://ftp.debian.org/debian/pool/main/l/ltrace' archive_filename='@{pkg_name}_@{version}.orig' diff --git a/packages/m4/1.4.19/chksum b/packages/m4/1.4.19/chksum deleted file mode 100644 index 093966e7b6..0000000000 --- a/packages/m4/1.4.19/chksum +++ /dev/null @@ -1,12 +0,0 @@ -md5 m4-1.4.19.tar.xz 0d90823e1426f1da2fd872df0311298d -sha1 m4-1.4.19.tar.xz b44b5c9746b69ee19204b7cb76d3a7b3eac69259 -sha256 m4-1.4.19.tar.xz 63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96 -sha512 m4-1.4.19.tar.xz 47f595845c89709727bda0b3fc78e3188ef78ec818965b395532e7041cabe9e49677ee4aca3d042930095a7f8df81de3da1026b23b6897be471f6cf13ddd512b -md5 m4-1.4.19.tar.bz2 a8ff6fc3235eab3a4adb53611fdddacd -sha1 m4-1.4.19.tar.bz2 7dd5aab713b50108bfbce47aea4968d630bf9511 -sha256 m4-1.4.19.tar.bz2 b306a91c0fd93bc4280cfc2e98cb7ab3981ff75a187bea3293811f452c89a8c8 -sha512 m4-1.4.19.tar.bz2 91c85925b83dd735dad34860756ab636f88e276d39827e81ec13f33b0b36cd42c9729c53faf4e1db101e32eecebec933799fc64cb16d138e68dbba7710d4bd19 -md5 m4-1.4.19.tar.gz f4a2b0284d80353b995f8ef2385ed73c -sha1 m4-1.4.19.tar.gz 1b9141800f481353b8bcfafe8ec03d3d95f03f64 -sha256 m4-1.4.19.tar.gz 3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70 -sha512 m4-1.4.19.tar.gz f5dd0f02fcae65a176a16af9a8e1747c26e9440c6c224003ba458d3298b777a75ffb189aee9051fb0c4840b2a48278be4a51d959381af0b1d627570f478c58f2 diff --git a/packages/m4/1.4.20/chksum b/packages/m4/1.4.20/chksum new file mode 100644 index 0000000000..83e42a5434 --- /dev/null +++ b/packages/m4/1.4.20/chksum @@ -0,0 +1,12 @@ +md5 m4-1.4.20.tar.xz 6eb2ebed5b24e74b6e890919331d2132 +sha1 m4-1.4.20.tar.xz 025df51430845178f926b20a078f994eefaa50fd +sha256 m4-1.4.20.tar.xz e236ea3a1ccf5f6c270b1c4bb60726f371fa49459a8eaaebc90b216b328daf2b +sha512 m4-1.4.20.tar.xz dc7b4f61452e564b095010029bf6ce4246e5a03959989cd76b09eb8012db7424c52819143020fab21a3471ff57ab026d3eccbd00dd3969819208980565a9fec0 +md5 m4-1.4.20.tar.bz2 92d1e42cb75f49381915275cb8e23c03 +sha1 m4-1.4.20.tar.bz2 17b6f32ed5c30b066aafdc61bc2cd577407233aa +sha256 m4-1.4.20.tar.bz2 ac6989ee5d2aed81739780630cc2ce097e2a6546feb96a4a54db37d46a1452e4 +sha512 m4-1.4.20.tar.bz2 9393bcc3ed8361b4d1824a463f0680d02e00a78702ba8dba3c696b59b8a365b5e9e73ac5ab45963af451a4185db8f5c37364e63cc9637fdf2036cfbffdaa9852 +md5 m4-1.4.20.tar.gz bbf90a6f5c1663d423c60217b31f3a0d +sha1 m4-1.4.20.tar.gz 4234ef3811c45d917b12bfb0694c793d548a27d2 +sha256 m4-1.4.20.tar.gz 6ac4fc31ce440debe63987c2ebbf9d7b6634e67a7c3279257dc7361de8bdb3ef +sha512 m4-1.4.20.tar.gz 0db92e37b984bcac0e640bccb9d3463757793b1fef665601f6d8052906d1ed26078af37c751e3e0cd9ee8d9ff165e51cfe9560422a5b3559f4b58de446b7429c diff --git a/packages/m4/1.4.20/version.desc b/packages/m4/1.4.20/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/make/4.2.1/0000-glob-v2.patch b/packages/make/4.2.1/0000-glob-v2.patch deleted file mode 100644 index ad8ddd877b..0000000000 --- a/packages/make/4.2.1/0000-glob-v2.patch +++ /dev/null @@ -1,39 +0,0 @@ -commit 48c8a116a914a325a0497721f5d8b58d5bba34d4 -Author: Paul Smith -Date: Sun Nov 19 15:09:16 2017 -0500 - - * configure.ac: Support GLIBC glob interface version 2 - ---- - configure | 3 +-- - configure.ac | 3 +-- - 2 files changed, 2 insertions(+), 4 deletions(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -399,10 +399,9 @@ - #include - #include - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 - gnu glob - # endif - #endif], ---- a/configure -+++ b/configure -@@ -11481,10 +11481,9 @@ - #include - #include - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 - gnu glob - # endif - #endif diff --git a/packages/make/4.2.1/0001-glob-v2-gl_lstat.patch b/packages/make/4.2.1/0001-glob-v2-gl_lstat.patch deleted file mode 100644 index ae755e3e11..0000000000 --- a/packages/make/4.2.1/0001-glob-v2-gl_lstat.patch +++ /dev/null @@ -1,64 +0,0 @@ -commit 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 -Author: Paul Eggert -Date: Sun Sep 24 09:12:58 2017 -0400 - - glob: Do not assume glibc glob internals. - - It has been proposed that glibc glob start using gl_lstat, - which the API allows it to do. GNU 'make' should not get in - the way of this. See: - https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - - * dir.c (local_lstat): New function, like local_stat. - (dir_setup_glob): Use it to initialize gl_lstat too, as the API - requires. - ---- - dir.c | 29 +++++++++++++++++++++++++++-- - 1 file changed, 27 insertions(+), 2 deletions(-) - ---- a/dir.c -+++ b/dir.c -@@ -1299,15 +1299,40 @@ - } - #endif - -+/* Similarly for lstat. */ -+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) -+# ifndef VMS -+# ifndef HAVE_SYS_STAT_H -+int lstat (const char *path, struct stat *sbuf); -+# endif -+# else -+ /* We are done with the fake lstat. Go back to the real lstat */ -+# ifdef lstat -+# undef lstat -+# endif -+# endif -+# define local_lstat lstat -+#elif defined(WINDOWS32) -+/* Windows doesn't support lstat(). */ -+# define local_lstat local_stat -+#else -+static int -+local_lstat (const char *path, struct stat *buf) -+{ -+ int e; -+ EINTRLOOP (e, lstat (path, buf)); -+ return e; -+} -+#endif -+ - void - dir_setup_glob (glob_t *gl) - { - gl->gl_opendir = open_dirstream; - gl->gl_readdir = read_dirstream; - gl->gl_closedir = free; -+ gl->gl_lstat = local_lstat; - gl->gl_stat = local_stat; -- /* We don't bother setting gl_lstat, since glob never calls it. -- The slot is only there for compatibility with 4.4 BSD. */ - } - - void diff --git a/packages/make/4.2.1/chksum b/packages/make/4.2.1/chksum deleted file mode 100644 index b76fffdaad..0000000000 --- a/packages/make/4.2.1/chksum +++ /dev/null @@ -1,8 +0,0 @@ -md5 make-4.2.1.tar.bz2 15b012617e7c44c0ed482721629577ac -sha1 make-4.2.1.tar.bz2 7d9d11eb36cfb752da1fb11bb3e521d2a3cc8830 -sha256 make-4.2.1.tar.bz2 d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589 -sha512 make-4.2.1.tar.bz2 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8 -md5 make-4.2.1.tar.gz 7d0dcb6c474b258aab4d54098f2cf5a7 -sha1 make-4.2.1.tar.gz 9cb7f45f6e32c977164ba790e626c359d3a24fee -sha256 make-4.2.1.tar.gz e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7 -sha512 make-4.2.1.tar.gz d5f6ce3ac7c9a55cf8c1c04afa7d967dd311c9bb3167275ebb2649cf144f3740cf08450dc010a6acdea1fd529fd528a50b3c3381f4c9a7e83ec59b761817a038 diff --git a/packages/make/4.2.1/version.desc b/packages/make/4.2.1/version.desc deleted file mode 100644 index f26b5a26a7..0000000000 --- a/packages/make/4.2.1/version.desc +++ /dev/null @@ -1,2 +0,0 @@ -obsolete='yes' -archive_formats='.tar.bz2 .tar.gz' diff --git a/packages/make/4.4.1/chksum b/packages/make/4.4.1/chksum new file mode 100644 index 0000000000..a05fb42d26 --- /dev/null +++ b/packages/make/4.4.1/chksum @@ -0,0 +1,8 @@ +md5 make-4.4.1.tar.lz c8b13b7477e812d4213a9b88ff0ff1d6 +sha1 make-4.4.1.tar.lz 5ca1a6115781798aa0a7a9efa5c8321b04bf4738 +sha256 make-4.4.1.tar.lz 8814ba072182b605d156d7589c19a43b89fc58ea479b9355146160946f8cf6e9 +sha512 make-4.4.1.tar.lz 591e9fab2f807bfda908f3376fdbf304c3377a6b15d13f3029456722972e361d205b692855de8ddbce64ff3f404873cbfb65f4097ca4a3b81029dc83bafcc67c +md5 make-4.4.1.tar.gz c8469a3713cbbe04d955d4ae4be23eeb +sha1 make-4.4.1.tar.gz 5ca41d365c35a4ded07d616190baf38814c25f2a +sha256 make-4.4.1.tar.gz dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3 +sha512 make-4.4.1.tar.gz 145260cbd6a8226cef3dfef0c8baba31847beaebc7e6b65d39d02715fd4f4cab9b139b6c3772e550088d4f9ae80c6d3ed20b9a7664c693644dfb96b4cb60e67c diff --git a/packages/make/4.4.1/version.desc b/packages/make/4.4.1/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/make/4.4/chksum b/packages/make/4.4/chksum deleted file mode 100644 index 7254bea030..0000000000 --- a/packages/make/4.4/chksum +++ /dev/null @@ -1,8 +0,0 @@ -md5 make-4.4.tar.lz 5da8b0fcc500de9c254ca59e58558b27 -sha1 make-4.4.tar.lz bd8e12c82af57e4db7c35b43e09f802f3922696d -sha256 make-4.4.tar.lz 48d0fc0b2a04bb50f2911c16da65723285f7f4804c74fc5a2124a3df6c5f78c4 -sha512 make-4.4.tar.lz 937945e1de5e370e79f379c867ca37bf7b3559a8b002a9e67c4973071e706f7afc5e419ac5d3348e7a677d5673cdcaa2476120297ec3e5f1c8f28f282cff2579 -md5 make-4.4.tar.gz d7575a26a94ee8427130e9db23cdaa78 -sha1 make-4.4.tar.gz 02910501c2065479c6c7a4855b6ecdf3ac4464d8 -sha256 make-4.4.tar.gz 581f4d4e872da74b3941c874215898a7d35802f03732bdccee1d4a7979105d18 -sha512 make-4.4.tar.gz 4be73f494295dcfa10034531b0d920cfdb5438bc20625f863f5c878549c140e1e67195162580c53060c3c11c67a2c739c09051f02cdd283e5aa9ebcd68975a1f diff --git a/packages/mingw-w64/v11.0.1/0001-crt-ssp-fix-stack-smashing-protection-bootstrapping.patch b/packages/mingw-w64/v11.0.1/0001-crt-ssp-fix-stack-smashing-protection-bootstrapping.patch new file mode 100644 index 0000000000..df20b2ddbd --- /dev/null +++ b/packages/mingw-w64/v11.0.1/0001-crt-ssp-fix-stack-smashing-protection-bootstrapping.patch @@ -0,0 +1,47 @@ +From 872a73abe6ccb45c617b30f30ded8d6c7ca5b21e Mon Sep 17 00:00:00 2001 +From: Igor Kostenko +Date: Thu, 3 Jul 2025 19:02:20 +0200 +Subject: [PATCH] crt/ssp: fix stack smashing protection bootstrapping + +Fix stack protection bootstrapping issue where the guard initialization +function itself triggers false positive stack overflow detection. + +This issue occurs when the mingw-w64 CRT library is built with GCC's +-fstack-protector-strong flag, which effectively renders any resulting +binary (whether statically or dynamically linked) corrupted. The final +binary crashes during startup, before it even reaches the main function. + +The problem is that the init() function starts with __stack_chk_guard = 0 +but initializes it to a random value, causing the stack protection check +to always fail (0 != random) at function exit. + +By introducing attribute __no_stack_protector__ we prevent early testing +of the uninitialized guard value. + +Signed-off-by: Igor Kostenko +(cherry picked from commit a0e69f7bc83a29b40e68355aac3e0c39b113b20f) +Signed-off-by: LIU Hao +--- + mingw-w64-crt/ssp/stack_chk_guard.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/mingw-w64-crt/ssp/stack_chk_guard.c b/mingw-w64-crt/ssp/stack_chk_guard.c +index 3ff22e020..be43d8c7e 100644 +--- a/mingw-w64-crt/ssp/stack_chk_guard.c ++++ b/mingw-w64-crt/ssp/stack_chk_guard.c +@@ -10,7 +10,11 @@ + + void *__stack_chk_guard; + +-static void __cdecl __attribute__((__constructor__)) init(void) ++// This function requires `no_stack_protector` because it changes the ++// value of `__stack_chk_guard`, causing stack checks to fail before ++// returning from this function. ++__attribute__((__constructor__, __no_stack_protector__)) ++static void __cdecl init(void) + { + unsigned int ui; + if (__stack_chk_guard != 0) +-- +2.24.0.windows.2 + diff --git a/packages/mingw-w64/v12.0.0/0001-crt-ssp-fix-stack-smashing-protection-bootstrapping.patch b/packages/mingw-w64/v12.0.0/0001-crt-ssp-fix-stack-smashing-protection-bootstrapping.patch new file mode 100644 index 0000000000..54691db280 --- /dev/null +++ b/packages/mingw-w64/v12.0.0/0001-crt-ssp-fix-stack-smashing-protection-bootstrapping.patch @@ -0,0 +1,47 @@ +From 9c6efb3c9969a7b24d31624ce00d3cfc17e6f7d3 Mon Sep 17 00:00:00 2001 +From: Igor Kostenko +Date: Thu, 3 Jul 2025 19:02:20 +0200 +Subject: [PATCH] crt/ssp: fix stack smashing protection bootstrapping + +Fix stack protection bootstrapping issue where the guard initialization +function itself triggers false positive stack overflow detection. + +This issue occurs when the mingw-w64 CRT library is built with GCC's +-fstack-protector-strong flag, which effectively renders any resulting +binary (whether statically or dynamically linked) corrupted. The final +binary crashes during startup, before it even reaches the main function. + +The problem is that the init() function starts with __stack_chk_guard = 0 +but initializes it to a random value, causing the stack protection check +to always fail (0 != random) at function exit. + +By introducing attribute __no_stack_protector__ we prevent early testing +of the uninitialized guard value. + +Signed-off-by: Igor Kostenko +(cherry picked from commit a0e69f7bc83a29b40e68355aac3e0c39b113b20f) +Signed-off-by: LIU Hao +--- + mingw-w64-crt/ssp/stack_chk_guard.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/mingw-w64-crt/ssp/stack_chk_guard.c b/mingw-w64-crt/ssp/stack_chk_guard.c +index 3ff22e020..be43d8c7e 100644 +--- a/mingw-w64-crt/ssp/stack_chk_guard.c ++++ b/mingw-w64-crt/ssp/stack_chk_guard.c +@@ -10,7 +10,11 @@ + + void *__stack_chk_guard; + +-static void __cdecl __attribute__((__constructor__)) init(void) ++// This function requires `no_stack_protector` because it changes the ++// value of `__stack_chk_guard`, causing stack checks to fail before ++// returning from this function. ++__attribute__((__constructor__, __no_stack_protector__)) ++static void __cdecl init(void) + { + unsigned int ui; + if (__stack_chk_guard != 0) +-- +2.24.0.windows.2 + diff --git a/packages/mingw-w64/v13.0.0/0000-mingw64-malloc.patch b/packages/mingw-w64/v13.0.0/0000-mingw64-malloc.patch new file mode 100644 index 0000000000..8e0add1f06 --- /dev/null +++ b/packages/mingw-w64/v13.0.0/0000-mingw64-malloc.patch @@ -0,0 +1,30 @@ +--- + mingw-w64-tools/genidl/src/genidl_cfg.h | 2 ++ + mingw-w64-tools/genidl/src/genidl_typinfo.c | 3 +++ + 2 files changed, 5 insertions(+) + +--- a/mingw-w64-tools/genidl/src/genidl_cfg.h ++++ b/mingw-w64-tools/genidl/src/genidl_cfg.h +@@ -26,7 +26,9 @@ + #include + #include + #include ++#if defined(HAVE_MALLOC_H) + #include ++#endif + #include + #include + #include +--- a/mingw-w64-tools/genidl/src/genidl_typinfo.c ++++ b/mingw-w64-tools/genidl/src/genidl_typinfo.c +@@ -21,7 +21,10 @@ + #include "genidl_cfg.h" + #include "genidl_typeinfo.h" + #include "genidl_typinfo.h" ++#if defined(HAVE_MALLOC_H) + #include ++#endif ++#include + #include + #include + diff --git a/packages/mingw-w64/v13.0.0/0001-fix-arm64-fabsl-asm-constraint.patch b/packages/mingw-w64/v13.0.0/0001-fix-arm64-fabsl-asm-constraint.patch new file mode 100644 index 0000000000..038f3d16b6 --- /dev/null +++ b/packages/mingw-w64/v13.0.0/0001-fix-arm64-fabsl-asm-constraint.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ahmed ARIF +Date: Mon, 12 Jan 2026 00:00:00 +0000 +Subject: [PATCH] mingw-w64: fix arm64 fabsl asm constraint + +Use __builtin_fabsl on ARM64 and other architectures where long double +equals double, avoiding architecture-specific inline assembly. + +--- a/mingw-w64-headers/crt/math.h ++++ b/mingw-w64-headers/crt/math.h +@@ -206,7 +206,7 @@ + + __CRT_INLINE long double __cdecl fabsl (long double x) + { +-#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__ ++#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__ || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || defined(_ARM64_) + return __builtin_fabsl (x); + #else + long double res = 0.0l; diff --git a/packages/mingw-w64/v13.0.0/0002-winpthreads-fix-aarch64-support.patch b/packages/mingw-w64/v13.0.0/0002-winpthreads-fix-aarch64-support.patch new file mode 100644 index 0000000000..98003f16d6 --- /dev/null +++ b/packages/mingw-w64/v13.0.0/0002-winpthreads-fix-aarch64-support.patch @@ -0,0 +1,31 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ahmed ARIF +Date: Mon, 12 Jan 2026 00:00:00 +0000 +Subject: [PATCH] winpthreads: fix aarch64 support + +Fix constructor priority and linker directives for ARM64 support +in winpthreads. + +--- a/mingw-w64-libraries/winpthreads/src/misc.c 2025-06-04 07:00:28.000000000 +0200 ++++ b/mingw-w64-libraries/winpthreads/src/misc.c 2025-09-16 17:11:44.273898239 +0200 +@@ -39,7 +39,7 @@ + #if defined(__GNUC__) || defined(__clang__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wprio-ctor-dtor" +-__attribute__((constructor(0))) ++__attribute__((constructor)) + #endif + static void winpthreads_init(void) + { +@@ -74,8 +74,10 @@ + * from discarding the variable. */ + + /* On x86, symbols are prefixed with an underscore. */ +-# if defined(_M_IX86) ++# if defined(_M_IX86) || defined(_M_ARM) + # pragma comment(linker, "/include:___xc_t") ++# elif defined(_M_X64) || defined(_M_AMD64) || defined(_M_ARM64) || defined(_M_ARM64EC) ++# pragma comment(linker, "/include:__xc_t") + # else + # pragma comment(linker, "/include:__xc_t") + # endif diff --git a/packages/mingw-w64/v13.0.0/0003-frexpl-aarch64-support.patch b/packages/mingw-w64/v13.0.0/0003-frexpl-aarch64-support.patch new file mode 100644 index 0000000000..36b2d1f1e2 --- /dev/null +++ b/packages/mingw-w64/v13.0.0/0003-frexpl-aarch64-support.patch @@ -0,0 +1,100 @@ +From 69d1f430f0000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ahmed ARIF +Date: Thu, 20 Feb 2025 00:00:00 +0000 +Subject: [PATCH] mingw-w64: add frexpl support for AArch64 long double + +Provide an implementation of `frexpl` for Windows on Arm64 where `long + double` follows the IEEE-754 binary128 format. This mirrors the + existing x87 version by normalising the mantissa into the [0.5, 1) + interval while returning the adjusted exponent. + +--- + mingw-w64-crt/math/frexpl.c | 75 +++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 75 insertions(+) + +diff --git a/mingw-w64-crt/math/frexpl.c b/mingw-w64-crt/math/frexpl.c +index 8c96d6ce0..659d8b6c8 100644 +--- a/mingw-w64-crt/math/frexpl.c ++++ b/mingw-w64-crt/math/frexpl.c +@@ -15,6 +15,81 @@ long double frexpl(long double value, int* exp) + return frexp(value, exp); + } + ++#elif defined(__aarch64__) ++ ++#include ++ ++typedef union ieee_quad_ ++{ ++ struct ++ { ++ uint64_t lo; ++ uint64_t hi; ++ } u; ++ long double f; ++} ieee_quad; ++ ++long double frexpl (long double value, int *exp) ++{ ++ ieee_quad reg; ++ uint64_t hi, lo; ++ uint64_t sign; ++ uint16_t exponent; ++ ++ reg.f = value; ++ hi = reg.u.hi; ++ lo = reg.u.lo; ++ ++ sign = hi & 0x8000000000000000ULL; ++ exponent = (uint16_t) ((hi >> 48) & 0x7FFF); ++ ++ if (exponent == 0x7FFF) ++ { ++ *exp = 0; ++ return reg.f; ++ } ++ ++ if (exponent != 0) ++ { ++ *exp = (int) exponent - 0x3FFE; ++ hi = sign | ((uint64_t) 0x3FFE << 48) | (hi & 0x0000FFFFFFFFFFFFULL); ++ reg.u.hi = hi; ++ return reg.f; ++ } ++ ++ if ((hi & 0x0000FFFFFFFFFFFFULL) == 0 && lo == 0) ++ { ++ *exp = 0; ++ return reg.f; ++ } ++ ++ { ++ unsigned __int128 mant; ++ int leading; ++ int shift; ++ ++ mant = ((unsigned __int128) (hi & 0x0000FFFFFFFFFFFFULL) << 64) | lo; ++ ++ if ((uint64_t) (mant >> 64) != 0) ++ leading = __builtin_clzll ((uint64_t) (mant >> 64)); ++ else ++ leading = 64 + __builtin_clzll ((uint64_t) mant); ++ ++ shift = leading - 16; ++ mant <<= shift; ++ ++ hi = (uint64_t) (mant >> 64); ++ lo = (uint64_t) mant; ++ ++ *exp = 1 - 0x3FFE - shift; ++ ++ reg.u.hi = sign | ((uint64_t) 0x3FFE << 48) ++ | (hi & 0x0000FFFFFFFFFFFFULL); ++ reg.u.lo = lo; ++ return reg.f; ++ } ++} ++ + #elif defined(_AMD64_) || defined(__x86_64__) || defined(_X86_) || defined(__i386__) + + #include diff --git a/packages/mingw-w64/v13.0.0/0004-fmal-aarch64-support.patch b/packages/mingw-w64/v13.0.0/0004-fmal-aarch64-support.patch new file mode 100644 index 0000000000..7e6ead95b8 --- /dev/null +++ b/packages/mingw-w64/v13.0.0/0004-fmal-aarch64-support.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ahmed ARIF +Date: Mon, 12 Jan 2026 00:00:00 +0000 +Subject: [PATCH] mingw-w64: add fmal support for AArch64 + +Provide a basic implementation of fmal for AArch64 Windows. + +--- a/mingw-w64-crt/math/fmal.c ++++ b/mingw-w64-crt/math/fmal.c +@@ -12,6 +12,13 @@ + /* On ARM `long double` is 64 bits. And ARM has hardware FMA. */ + long double fmal(long double x, long double y, long double z){ + return fma(x, y, z); ++} ++ ++#elif defined(__aarch64__) ++ ++long double fmal(long double x, long double y, long double z) ++{ ++ return x * y + z; + } + + #elif defined(_AMD64_) || defined(__x86_64__) || defined(_X86_) || defined(__i386__) diff --git a/packages/mingw-w64/v13.0.0/0005-truncl-aarch64-support.patch b/packages/mingw-w64/v13.0.0/0005-truncl-aarch64-support.patch new file mode 100644 index 0000000000..fd32436f42 --- /dev/null +++ b/packages/mingw-w64/v13.0.0/0005-truncl-aarch64-support.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ahmed ARIF +Date: Mon, 12 Jan 2026 00:00:00 +0000 +Subject: [PATCH] mingw-w64: add truncl support for AArch64 + +Use trunc() for truncl on AArch64 where long double may have different +representation. + +--- a/mingw-w64-crt/math/truncl.c ++++ b/mingw-w64-crt/math/truncl.c +@@ -11,6 +11,8 @@ + { + #if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__ + return trunc(_x); ++#elif defined(__aarch64__) ++ return trunc(_x); + #else + long double retval = 0.0L; + unsigned short saved_cw; diff --git a/packages/mingw-w64/v13.0.0/0006-export-missing-__mingw_strtold.patch b/packages/mingw-w64/v13.0.0/0006-export-missing-__mingw_strtold.patch new file mode 100644 index 0000000000..b55ca519c3 --- /dev/null +++ b/packages/mingw-w64/v13.0.0/0006-export-missing-__mingw_strtold.patch @@ -0,0 +1,51 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ahmed ARIF +Date: Mon, 12 Jan 2026 00:00:00 +0000 +Subject: [PATCH] mingw-w64: export missing __mingw_strtold + +Rename internal strtold to __mingw_strtold and provide aliases +to fix linker issues on non-x86 architectures. + +--- a/mingw-w64-crt/gdtoa/strtopx.c ++++ b/mingw-w64-crt/gdtoa/strtopx.c +@@ -59,11 +59,19 @@ + * functions, to avoid linker conflicts if object files import both 'strtold' + * from libucrt*.a and the object file providing '__strtod'. */ + long double __cdecl +-strtold (const char * __restrict__ src, char ** __restrict__ endptr) ++__mingw_strtold (const char * __restrict__ src, char ** __restrict__ endptr) + { + return __mingw_strtod(src, endptr); + } + ++long double __cdecl ++__strtold (const char * __restrict__ src, char ** __restrict__ endptr) ++ __attribute__((alias("__mingw_strtold"))); ++ ++long double __cdecl ++strtold (const char * __restrict__ src, char ** __restrict__ endptr) ++ __attribute__((alias("__mingw_strtold"))); ++ + /* This is specific to the x86 80 bit long doubles. */ + #elif defined(_AMD64_) || defined(__x86_64__) || \ + defined(_X86_) || defined(__i386__) +@@ -144,4 +148,19 @@ + strtold (const char * __restrict__ src, char ** __restrict__ endptr) + __attribute__((alias("__strtold"))); + ++#else ++long double __cdecl ++__mingw_strtold (const char * __restrict__ src, char ** __restrict__ endptr) ++{ ++ return (long double)__mingw_strtod(src, endptr); ++} ++ ++long double __cdecl ++__strtold (const char * __restrict__ src, char ** __restrict__ endptr) ++ __attribute__((alias("__mingw_strtold"))); ++ ++long double __cdecl ++strtold (const char * __restrict__ src, char ** __restrict__ endptr) ++ __attribute__((alias("__mingw_strtold"))); ++ + #endif diff --git a/packages/mingw-w64/v13.0.0/chksum b/packages/mingw-w64/v13.0.0/chksum new file mode 100644 index 0000000000..975b782989 --- /dev/null +++ b/packages/mingw-w64/v13.0.0/chksum @@ -0,0 +1,8 @@ +md5 mingw-w64-v13.0.0.tar.bz2 b8c58e04a9cb8f2f9474e043ecad2f27 +sha1 mingw-w64-v13.0.0.tar.bz2 c2a7ca700fdcccbd0dd1818e2978fbc9963f71d2 +sha256 mingw-w64-v13.0.0.tar.bz2 5afe822af5c4edbf67daaf45eec61d538f49eef6b19524de64897c6b95828caf +sha512 mingw-w64-v13.0.0.tar.bz2 39a22bd92465f571df1d90ac80b88dc6846998f71e4b7db79d1c9aa6e04cb3e41b632990a7238fc2c384ea67e4a77d103230db2c0d741869340d24ea79b6dda8 +md5 mingw-w64-v13.0.0.zip ba0243df470b9e735fa993eb8b5af9af +sha1 mingw-w64-v13.0.0.zip b8732d0f8437e9c07fe292f6d6887d3a1264a1a0 +sha256 mingw-w64-v13.0.0.zip ba8876404cbf250d4b40c80b4be335b1fbf92e69a161ce4af8a5c628903d31cc +sha512 mingw-w64-v13.0.0.zip 3e015f1596b61ae4276943ae191dcdd574579ba205e9143b54975a4221cf5c7417deef5898adc51c9d88f819080745f43e999d4f637fd79e03515127ac9d7880 diff --git a/packages/mingw-w64/v13.0.0/version.desc b/packages/mingw-w64/v13.0.0/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mold/2.31.0/chksum b/packages/mold/2.31.0/chksum index b9aafe4e51..3056696a2e 100644 --- a/packages/mold/2.31.0/chksum +++ b/packages/mold/2.31.0/chksum @@ -1,4 +1,4 @@ -md5sum v2.31.0.tar.gz fdfcddefc039071f5a7611c051a8f5ea -sha1sum v2.31.0.tar.gz 0168ecab12d87a6197cfec4824a3e82115c6a2bd -sha256sum v2.31.0.tar.gz 3dc3af83a5d22a4b29971bfad17261851d426961c665480e2ca294e5c74aa1e5 -sha512sum v2.31.0.tar.gz 343c62d8c67b74988f762c46999d2d866b2e9a0c69d2b910b12384ea5abc620b30468cd1b1bacfe41474d1c97c8ce2e49d55ca70479691238fb73d83d9adc683 +md5 v2.31.0.tar.gz fdfcddefc039071f5a7611c051a8f5ea +sha1 v2.31.0.tar.gz 0168ecab12d87a6197cfec4824a3e82115c6a2bd +sha256 v2.31.0.tar.gz 3dc3af83a5d22a4b29971bfad17261851d426961c665480e2ca294e5c74aa1e5 +sha512 v2.31.0.tar.gz 343c62d8c67b74988f762c46999d2d866b2e9a0c69d2b910b12384ea5abc620b30468cd1b1bacfe41474d1c97c8ce2e49d55ca70479691238fb73d83d9adc683 diff --git a/packages/mold/2.31.0/version.desc b/packages/mold/2.31.0/version.desc index e69de29bb2..fcfe38915a 100644 --- a/packages/mold/2.31.0/version.desc +++ b/packages/mold/2.31.0/version.desc @@ -0,0 +1 @@ +obsolete='yes' diff --git a/packages/mold/2.32.0/version.desc b/packages/mold/2.32.0/version.desc index e69de29bb2..fcfe38915a 100644 --- a/packages/mold/2.32.0/version.desc +++ b/packages/mold/2.32.0/version.desc @@ -0,0 +1 @@ +obsolete='yes' diff --git a/packages/mold/2.33.0/version.desc b/packages/mold/2.33.0/version.desc index e69de29bb2..fcfe38915a 100644 --- a/packages/mold/2.33.0/version.desc +++ b/packages/mold/2.33.0/version.desc @@ -0,0 +1 @@ +obsolete='yes' diff --git a/packages/mold/2.36.0/chksum b/packages/mold/2.36.0/chksum new file mode 100644 index 0000000000..b25ee487da --- /dev/null +++ b/packages/mold/2.36.0/chksum @@ -0,0 +1,4 @@ +md5 v2.36.0.tar.gz 6607c30d681342d5edf8deebdd888ae3 +sha1 v2.36.0.tar.gz 2ce2e8e8d1f1e2c1afd8e363f0b350858338c5d2 +sha256 v2.36.0.tar.gz 3f57fe75535500ecce7a80fa1ba33675830b7d7deb1e5ee9a737e2bc43cdb1c7 +sha512 v2.36.0.tar.gz 985ca22400b2d957b4ea8d35d6716cc6f13d1abe9c9e1eed461efda6f2612a5fbfa707aff879c616c756111fea751a335ad3a3fc224c7573855e7b2795596164 diff --git a/packages/mold/2.36.0/version.desc b/packages/mold/2.36.0/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mold/2.37.1/chksum b/packages/mold/2.37.1/chksum new file mode 100644 index 0000000000..8897a8d20e --- /dev/null +++ b/packages/mold/2.37.1/chksum @@ -0,0 +1,4 @@ +md5 v2.37.1.tar.gz 008ce940e0c512db09a0b1719d6bc270 +sha1 v2.37.1.tar.gz 0f5191c09a1758b9c51b7d45207e04c0c6812b93 +sha256 v2.37.1.tar.gz b8e36086c95bd51e9829c9755c138f5c4daccdd63b6c35212b84229419f3ccbe +sha512 v2.37.1.tar.gz 641c6668ee31368409d80ea01c0d84a58eac827eedc110495ca075bfce22081c906308d027e4723750995fc0d8b6bba8be3c3472c20f765ef45d14e1c4e36cd4 diff --git a/packages/mold/2.37.1/version.desc b/packages/mold/2.37.1/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mold/2.38.1/chksum b/packages/mold/2.38.1/chksum new file mode 100644 index 0000000000..09067e028d --- /dev/null +++ b/packages/mold/2.38.1/chksum @@ -0,0 +1,4 @@ +md5 v2.38.1.tar.gz 28d611644ecfdb7a1e1c443ed76fa4e8 +sha1 v2.38.1.tar.gz 22400cb2a794814bd66d43d1a76421127bc5952e +sha256 v2.38.1.tar.gz 14bfb259fd7d0a1fdce9b66f8ed2dd0b134d15019cb359699646afeee1f18118 +sha512 v2.38.1.tar.gz 608c2cdb20ae671f540caeda2d0406154b03b0c352cb4cf98ea65c888691a1ac96b0a0ac26fc947fd1a3df2ed2809096e8ca0649deeac7b811bf2902a49cf66e diff --git a/packages/mold/2.38.1/version.desc b/packages/mold/2.38.1/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mold/2.39.1/chksum b/packages/mold/2.39.1/chksum new file mode 100644 index 0000000000..1cfb5adbb2 --- /dev/null +++ b/packages/mold/2.39.1/chksum @@ -0,0 +1,4 @@ +md5 v2.39.1.tar.gz f77ab354c41189e3c447733f7dc10757 +sha1 v2.39.1.tar.gz 86a9d852c11d921f5fc9c92e4cbd071a989c1f5b +sha256 v2.39.1.tar.gz 231ea3643a14fe5b88478c97b68b31f7c975b57b247a81356ffd889d015b5cc1 +sha512 v2.39.1.tar.gz 2d6d3d892d0dc6b256fbb2a1bbe7519948c2cd683549d23727da9cbccf1dad80a3af2826bf96b9d02ed56a765fa46ffc8fcd23168bb5624a1fa4b9dd21606005 diff --git a/packages/mold/2.39.1/version.desc b/packages/mold/2.39.1/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mold/2.40.4/chksum b/packages/mold/2.40.4/chksum new file mode 100644 index 0000000000..699bfef314 --- /dev/null +++ b/packages/mold/2.40.4/chksum @@ -0,0 +1,4 @@ +md5 v2.40.4.tar.gz a7e9856dd8fab0d48617dfff06a8cddd +sha1 v2.40.4.tar.gz b690bc45d43dbdfb50c6834d04749243c962f759 +sha256 v2.40.4.tar.gz 69414c702ec1084e1fa8ca16da24f167f549e5e11e9ecd5d70a8dcda6f08c249 +sha512 v2.40.4.tar.gz d28501d827eca861179218566521c14b0f76cecc501145b34b3fbf7739b125e4ccd411358c8871e788ddbd8b4c7229cb8839018dc671db76db1aaa8defae0abe diff --git a/packages/mold/2.40.4/version.desc b/packages/mold/2.40.4/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mpc/1.2.1/chksum b/packages/mpc/1.2.1/chksum deleted file mode 100644 index 3f124c6771..0000000000 --- a/packages/mpc/1.2.1/chksum +++ /dev/null @@ -1,4 +0,0 @@ -md5 mpc-1.2.1.tar.gz 9f16c976c25bb0f76b50be749cd7a3a8 -sha1 mpc-1.2.1.tar.gz 2a4919abf445c6eda4e120cd669b8733ce337227 -sha256 mpc-1.2.1.tar.gz 17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459 -sha512 mpc-1.2.1.tar.gz 3279f813ab37f47fdcc800e4ac5f306417d07f539593ca715876e43e04896e1d5bceccfb288ef2908a3f24b760747d0dbd0392a24b9b341bc3e12082e5c836ee diff --git a/packages/mpc/1.2.1/version.desc b/packages/mpc/1.2.1/version.desc deleted file mode 100644 index fcfe38915a..0000000000 --- a/packages/mpc/1.2.1/version.desc +++ /dev/null @@ -1 +0,0 @@ -obsolete='yes' diff --git a/packages/mpc/package.desc b/packages/mpc/package.desc index c97dd956a7..3700e5d4e7 100644 --- a/packages/mpc/package.desc +++ b/packages/mpc/package.desc @@ -4,4 +4,3 @@ mirrors='https://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)' relevantpattern='*.*|.' archive_formats='.tar.gz' signature_format='packed/.sig' -milestones='1.1.0' diff --git a/packages/mpfr/4.2.1/chksum b/packages/mpfr/4.2.1/chksum deleted file mode 100644 index d3b5183af6..0000000000 --- a/packages/mpfr/4.2.1/chksum +++ /dev/null @@ -1,16 +0,0 @@ -md5 mpfr-4.2.1.tar.xz 523c50c6318dde6f9dc523bc0244690a -sha1 mpfr-4.2.1.tar.xz 31ffb4244cb469e2b4937cce1f50150300971dfb -sha256 mpfr-4.2.1.tar.xz 277807353a6726978996945af13e52829e3abd7a9a5b7fb2793894e18f1fcbb2 -sha512 mpfr-4.2.1.tar.xz bc68c0d755d5446403644833ecbb07e37360beca45f474297b5d5c40926df1efc3e2067eecffdf253f946288bcca39ca89b0613f545d46a9e767d1d4cf358475 -md5 mpfr-4.2.1.tar.bz2 7765afa036e4ce7fb0e02bce0fef894b -sha1 mpfr-4.2.1.tar.bz2 f9dbe49b092e4c8e0a039e6d46c059696cc2f51c -sha256 mpfr-4.2.1.tar.bz2 b9df93635b20e4089c29623b19420c4ac848a1b29df1cfd59f26cab0d2666aa0 -sha512 mpfr-4.2.1.tar.bz2 c81842532ecc663348deb7400d911ad71933d3b525a2f9e5adcd04265c9c0fdd1f22eca229f482703ac7f222ef209fc9e339dd1fa47d72ae57f7f70b2336a76f -md5 mpfr-4.2.1.tar.gz e1932041a649253affa1999eb06780be -sha1 mpfr-4.2.1.tar.gz ca7a96560f09b548855f7f97b20cba8106f2f203 -sha256 mpfr-4.2.1.tar.gz 116715552bd966c85b417c424db1bbdf639f53836eb361549d1f8d6ded5cb4c6 -sha512 mpfr-4.2.1.tar.gz 858b7c2c3018e4099a7cd6d9d38eca7c46af90fa2c307d9417518027f07b6c43c51152c60b56359a53e7101a5d0629753f3eb5c54e17574742c374830832fcfe -md5 mpfr-4.2.1.zip 247871848808e2e10a419df6db550b1c -sha1 mpfr-4.2.1.zip 8e1d9b1c4260dfb172b294997c1b133df2cff188 -sha256 mpfr-4.2.1.zip 0c2e85bef65070897bd4fd9647e4dcfc850619b6bacefe769ce5592f21f42f0b -sha512 mpfr-4.2.1.zip 3de08deefdf7a660a4830885446f3615f8b459a8f7521e30c486708cb1f7516b5ff4c7dbfa4d3683cd85c7446d6d9505c8dcf795fb1d8983b4bdd888cbdf33b6 diff --git a/packages/mpfr/4.2.2/chksum b/packages/mpfr/4.2.2/chksum new file mode 100644 index 0000000000..528153ea6b --- /dev/null +++ b/packages/mpfr/4.2.2/chksum @@ -0,0 +1,16 @@ +md5 mpfr-4.2.2.tar.xz 7c32c39b8b6e3ae85f25156228156061 +sha1 mpfr-4.2.2.tar.xz a63a264b273a652e27518443640e69567da498ce +sha256 mpfr-4.2.2.tar.xz b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01 +sha512 mpfr-4.2.2.tar.xz eb9e7f51b5385fb349cc4fba3a45ffdf0dd53be6dfc74932dc01258158a10514667960c530c47dd9dfc5aa18be2bd94859d80499844c5713710581e6ac6259a9 +md5 mpfr-4.2.2.tar.bz2 afe8268360bc8702fbc8297d351c8b5e +sha1 mpfr-4.2.2.tar.bz2 7e21e5bcfa67db572e5f2f38029fc731a19aecce +sha256 mpfr-4.2.2.tar.bz2 9ad62c7dc910303cd384ff8f1f4767a655124980bb6d8650fe62c815a231bb7b +sha512 mpfr-4.2.2.tar.bz2 0176e50808dcc07afbf5bc3e38bf9b7b21918e5f194aa0bfd860d99b00c470630aef149776c4be814a61c44269c3a5b9a4b0b1c0fcd4c9feb1459d8466452da8 +md5 mpfr-4.2.2.tar.gz 7cab7ebfcf087b5c710ab362e2fe2026 +sha1 mpfr-4.2.2.tar.gz 03aa176cf35d1477e2b6725cde74a728b4ef1a9a +sha256 mpfr-4.2.2.tar.gz 826cbb24610bd193f36fde172233fb8c009f3f5c2ad99f644d0dea2e16a20e42 +sha512 mpfr-4.2.2.tar.gz 373c5ce2c9636e45685dfa94f45bc4f8f6c2c0512d634b9e065ec33cb29da727b3ea13cf23aff307c1da765a40064f0fd4a347a3849ebd97252984fc85a0a400 +md5 mpfr-4.2.2.zip e177854976035717ff7426d8bb074607 +sha1 mpfr-4.2.2.zip 2291ef02a41a8cbf27382a77a4ac7ec672f72d57 +sha256 mpfr-4.2.2.zip 8c47f73c17df30bfc975079ebe4ea3cbb11e0a70d70b48768eec41e760f508af +sha512 mpfr-4.2.2.zip 1e8767df1ecb90d02135476d02928b3c9c3a33bf0e38d5418af55e056d7464561ce97c31a1ca2db5575a439486ed1cb2c7e46f4b0314ffdfcf5efd4bedb0ef1c diff --git a/packages/mpfr/4.2.2/version.desc b/packages/mpfr/4.2.2/version.desc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mpfr/package.desc b/packages/mpfr/package.desc index cbd629fead..c39fa637bf 100644 --- a/packages/mpfr/package.desc +++ b/packages/mpfr/package.desc @@ -5,4 +5,3 @@ mirrors='https://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)' relevantpattern='*.*|.' archive_formats='.tar.xz .tar.bz2 .tar.gz .zip' signature_format='packed/.asc' -milestones='4.0.0' diff --git a/packages/musl/1.2.5/0001-loongarch64-add-hwcap-header.patch b/packages/musl/1.2.5/0001-loongarch64-add-hwcap-header.patch new file mode 100644 index 0000000000..08b47ba004 --- /dev/null +++ b/packages/musl/1.2.5/0001-loongarch64-add-hwcap-header.patch @@ -0,0 +1,39 @@ +Message-Id: <20241115072642.858623-1-lixing@loongson.cn> +Date: Fri, 15 Nov 2024 15:26:42 +0800 +From: Xing Li +To: musl@...ts.openwall.com +Cc: wanghongliang@...ngson.cn +Subject: [PATCH] loongarch64: add bits/hwcap.h + + loongarch64 have cpu feature bits defined in linux + for AT_HWCAP auxv entry. +--- + arch/loongarch64/bits/hwcap.h | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + create mode 100644 arch/loongarch64/bits/hwcap.h + +diff --git a/arch/loongarch64/bits/hwcap.h b/arch/loongarch64/bits/hwcap.h +new file mode 100644 +index 00000000..355beda7 +--- /dev/null ++++ b/arch/loongarch64/bits/hwcap.h +@@ -0,0 +1,16 @@ ++/* The following must match the kernel's . */ ++/* HWCAP flags */ ++#define HWCAP_LOONGARCH_CPUCFG (1 << 0) ++#define HWCAP_LOONGARCH_LAM (1 << 1) ++#define HWCAP_LOONGARCH_UAL (1 << 2) ++#define HWCAP_LOONGARCH_FPU (1 << 3) ++#define HWCAP_LOONGARCH_LSX (1 << 4) ++#define HWCAP_LOONGARCH_LASX (1 << 5) ++#define HWCAP_LOONGARCH_CRC32 (1 << 6) ++#define HWCAP_LOONGARCH_COMPLEX (1 << 7) ++#define HWCAP_LOONGARCH_CRYPTO (1 << 8) ++#define HWCAP_LOONGARCH_LVZ (1 << 9) ++#define HWCAP_LOONGARCH_LBT_X86 (1 << 10) ++#define HWCAP_LOONGARCH_LBT_ARM (1 << 11) ++#define HWCAP_LOONGARCH_LBT_MIPS (1 << 12) ++#define HWCAP_LOONGARCH_PTW (1 << 13) +-- +2.27.0 + diff --git a/packages/musl/package.desc b/packages/musl/package.desc index 18f743845c..985a1945f3 100644 --- a/packages/musl/package.desc +++ b/packages/musl/package.desc @@ -1,4 +1,4 @@ repository='git git://git.musl-libc.org/musl' -mirrors='http://www.musl-libc.org/releases' +mirrors='https://www.musl-libc.org/releases' archive_formats='.tar.gz' signature_format='packed/.asc' diff --git a/packages/ncurses/6.5/chksum b/packages/ncurses/6.5/chksum new file mode 100644 index 0000000000..714c4bb068 --- /dev/null +++ b/packages/ncurses/6.5/chksum @@ -0,0 +1,4 @@ +md5 ncurses-6.5.tar.gz ac2d2629296f04c8537ca706b6977687 +sha1 ncurses-6.5.tar.gz cde3024ac3f9ef21eaed6f001476ea8fffcaa381 +sha256 ncurses-6.5.tar.gz 136d91bc269a9a5785e5f9e980bc76ab57428f604ce3e5a5a90cebc767971cc6 +sha512 ncurses-6.5.tar.gz fc5a13409d2a530a1325776dcce3a99127ddc2c03999cfeb0065d0eee2d68456274fb1c7b3cc99c1937bc657d0e7fca97016e147f93c7821b5a4a6837db821e8 diff --git a/packages/ncurses/6.5/ncurses-6.5-20240504.patch b/packages/ncurses/6.5/ncurses-6.5-20240504.patch new file mode 100644 index 0000000000..bfac905a18 --- /dev/null +++ b/packages/ncurses/6.5/ncurses-6.5-20240504.patch @@ -0,0 +1,1209 @@ +# ncurses 6.5 - patch 20240504 - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 6.5 is at +# https://invisible-island.net/archives/ncurses/ +# https://invisible-mirror.net/archives/ncurses/ +# https://ftp.gnu.org/gnu/ncurses/ +# +# Patches for ncurses 6.5 can be found at +# https://invisible-island.net/archives/ncurses/6.5 +# https://invisible-mirror.net/archives/ncurses/6.5 +# +# ------------------------------------------------------------------------------ +# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20240504.patch.gz +# patch by Thomas E. Dickey +# created Sat May 4 20:37:35 UTC 2024 +# ------------------------------------------------------------------------------ +# INSTALL | 10 +# NEWS | 6 +# VERSION | 2 +# dist.mk | 4 +# include/nc_mingw.h | 8 +# include/nc_win32.h | 8 +# ncurses/curses.priv.h | 4 +# ncurses/wcwidth.h | 743 ++++++++++++++++++++++++++++++------- +# ncurses/win32con/wcwidth.c | 13 +# 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, 659 insertions(+), 161 deletions(-) +# ------------------------------------------------------------------------------ +Index: INSTALL +Prereq: 1.254 +--- ncurses-6.5-20240427+/INSTALL 2024-04-27 14:21:05.000000000 +0000 ++++ ncurses-6.5-20240504/INSTALL 2024-05-04 15:54:00.000000000 +0000 +@@ -26,7 +26,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: INSTALL,v 1.254 2024/04/27 14:21:05 tom Exp $ ++-- $Id: INSTALL,v 1.255 2024/05/04 15:54:00 tom Exp $ + --------------------------------------------------------------------- + How to install Ncurses/Terminfo on your system + --------------------------------------------------------------------- +@@ -1351,11 +1351,9 @@ + several builds, some symbols will be listed in the the ".map" files + that do not happen to be present in one configuration or another. + +- The sample ".map" (and ".sym") files are generated using a set of +- scripts which build several configurations for each release version, +- checking to see which of the "_nc_" symbols can be made local. In +- addition to the ncurses libraries and programs, the symbols used +- by the "tack" program before version 1.08 are made global. ++ The sample ".map" (and ".sym") files were generated using a set of ++ scripts which built several configurations for each release version, ++ checking to see which of the "_nc_" symbols can be made local. + + These sample ".map" files will not cover all possible combinations. + In some cases, e.g., when using the --with-weak-symbols option, you +Index: NEWS +Prereq: 1.4114 +--- ncurses-6.5-20240427+/NEWS 2024-04-27 18:00:35.000000000 +0000 ++++ ncurses-6.5-20240504/NEWS 2024-05-04 18:43:01.000000000 +0000 +@@ -26,7 +26,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.4114 2024/04/27 18:00:35 tom Exp $ ++-- $Id: NEWS,v 1.4117 2024/05/04 18:43:01 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. + ++20240504 ++ + update ncurses/wcwidth.c, for MinGW ports, from xterm. ++ + trim obsolete comment about tack from INSTALL. ++ + 20240427 6.5 release for upload to ftp.gnu.org + + update announcement + + fixes/corrections for manpages (patches by Branden Robinson). +Index: VERSION +--- ncurses-6.5-20240427+/VERSION 2024-04-27 13:56:53.000000000 +0000 ++++ ncurses-6.5-20240504/VERSION 2024-05-04 10:21:09.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.5 20240427 ++5:0:10 6.5 20240504 +Index: dist.mk +Prereq: 1.1610 +--- ncurses-6.5-20240427+/dist.mk 2024-04-27 13:55:54.000000000 +0000 ++++ ncurses-6.5-20240504/dist.mk 2024-05-04 10:21:09.000000000 +0000 +@@ -26,7 +26,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1610 2024/04/27 13:55:54 tom Exp $ ++# $Id: dist.mk,v 1.1611 2024/05/04 10:21:09 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 = 5 +-NCURSES_PATCH = 20240427 ++NCURSES_PATCH = 20240504 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: include/nc_mingw.h +Prereq: 1.10 +--- ncurses-6.5-20240427+/include/nc_mingw.h 2023-02-25 19:59:24.000000000 +0000 ++++ ncurses-6.5-20240504/include/nc_mingw.h 2024-05-04 19:16:38.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2018-2020,2023 Thomas E. Dickey * ++ * Copyright 2018-2023,2024 Thomas E. Dickey * + * Copyright 2008-2010,2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -31,7 +31,7 @@ + * Author: Thomas Dickey, 2008-on * + ****************************************************************************/ + +-/* $Id: nc_mingw.h,v 1.10 2023/02/25 19:59:24 tom Exp $ */ ++/* $Id: nc_mingw.h,v 1.12 2024/05/04 19:16:38 tom Exp $ */ + + #ifndef NC_MINGW_H + #define NC_MINGW_H 1 +@@ -58,6 +58,8 @@ + #include /* for struct timeval */ + #endif + ++#include /* for uint32_t */ ++ + #ifdef __cplusplus + extern "C" { + #endif +@@ -77,7 +79,7 @@ + + #undef wcwidth + #define wcwidth(ucs) _nc_wcwidth((wchar_t)(ucs)) +-NCURSES_EXPORT(int) _nc_wcwidth(wchar_t); ++NCURSES_EXPORT(int) _nc_wcwidth(uint32_t); + + #ifdef __cplusplus + } +Index: include/nc_win32.h +Prereq: 1.10 +--- ncurses-6.5-20240427+/include/nc_win32.h 2023-02-25 20:09:23.000000000 +0000 ++++ ncurses-6.5-20240504/include/nc_win32.h 2024-05-04 19:17:03.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2018-2020,2023 Thomas E. Dickey * ++ * Copyright 2018-2023,2024 Thomas E. Dickey * + * Copyright 2008-2010,2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -31,7 +31,7 @@ + * Author: Thomas Dickey, 2008-on * + ****************************************************************************/ + +-/* $Id: nc_win32.h,v 1.10 2023/02/25 20:09:23 tom Exp $ */ ++/* $Id: nc_win32.h,v 1.12 2024/05/04 19:17:03 tom Exp $ */ + + #ifndef NC_WIN32_H + #define NC_WIN32_H 1 +@@ -73,6 +73,8 @@ + #include /* for struct timeval */ + #endif + ++#include /* for uint32_t */ ++ + #ifdef __cplusplus + extern "C" { + #endif +@@ -87,7 +89,7 @@ + + #undef wcwidth + #define wcwidth(ucs) _nc_wcwidth((wchar_t)(ucs)) +-extern NCURSES_EXPORT(int) _nc_wcwidth(wchar_t); ++extern NCURSES_EXPORT(int) _nc_wcwidth(uint32_t); + + #ifdef EVENTLIST_2nd /* test.priv.h just needs the preceding */ + +Index: ncurses/curses.priv.h +Prereq: 1.687 +--- ncurses-6.5-20240427+/ncurses/curses.priv.h 2024-04-23 22:28:25.000000000 +0000 ++++ ncurses-6.5-20240504/ncurses/curses.priv.h 2024-05-04 18:30:25.000000000 +0000 +@@ -35,7 +35,7 @@ + ****************************************************************************/ + + /* +- * $Id: curses.priv.h,v 1.687 2024/04/23 22:28:25 tom Exp $ ++ * $Id: curses.priv.h,v 1.688 2024/05/04 18:30:25 tom Exp $ + * + * curses.priv.h + * +@@ -2250,7 +2250,7 @@ + + #if defined(_NC_WINDOWS) || defined(_NC_MINGW) + /* see wcwidth.c */ +-extern NCURSES_EXPORT(int) mk_wcwidth(wchar_t); ++extern NCURSES_EXPORT(int) mk_wcwidth(uint32_t); + #define wcwidth(ucs) _nc_wcwidth(ucs) + #endif + +Index: ncurses/wcwidth.h +--- ncurses-6.5-20240427+/ncurses/wcwidth.h 2021-08-18 19:47:03.000000000 +0000 ++++ ncurses-6.5-20240504/ncurses/wcwidth.h 2024-05-04 18:44:25.000000000 +0000 +@@ -1,4 +1,57 @@ ++/* $Id: wcwidth.h,v 1.6 2024/05/04 18:44:25 tom Exp $ */ ++ + /* ++ * Copyright 2002-2023,2024 by Thomas E. Dickey ++ * ++ * All Rights Reserved ++ * ++ * 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, 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 LISTED COPYRIGHT HOLDER(S) 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. ++ *----------------------------------------------------------------------------- ++ * This is an updated version of Markus Kuhn's implementation of wcwidth. ++ * ++ * Originally added to xterm in 2000 (patch #141), there were a couple of ++ * updates from Kuhn until 2005 (patch #202), renaming entrypoints and applying ++ * data from Unicode.org (e.g., 3.2, 4.0, 4.1.0). The Unicode data is ++ * transformed into tables in this file by a script "uniset" written by Kuhn. ++ * ++ * While Kuhn implemented the original CJK variant, it was unused by xterm ++ * until Jungshik Shin used it in 2002 to implement the -cjk_width command-line ++ * option. ++ * ++ * Kuhn added a check for the vertical forms block (double-width) in 2007; ++ * other updates were derived from the Unicode.org data (release 5.0). ++ * ++ * Since then, additional updates have been made: ++ * + data-type fixes ++ * + new Unicode releases (6.2.0, 9.0.0, etc), ++ * + additional special symbol blocks have been added to the special cases. ++ * + soft-hyphen behavior has been made configurable. ++ * + added table shows when a character is not part of Unicode. ++ * ++ * Kuhn's original header follows giving the design information: ++ *----------------------------------------------------------------------------- + * This is an implementation of wcwidth() and wcswidth() (defined in + * IEEE Std 1002.1-2001) for Unicode. + * +@@ -50,13 +103,14 @@ + * + * http://www.unicode.org/unicode/reports/tr11/ + * +- * Markus Kuhn -- 2007-05-26 (Unicode 5.0) ++ * Markus Kuhn -- 2007-05-25 (Unicode 5.0) + * + * Permission to use, copy, modify, and distribute this software + * for any purpose and without fee is hereby granted. The author + * disclaims all warranties with regard to this software. + * + * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c ++ *----------------------------------------------------------------------------- + */ + + #ifndef _WCWIDTH_H_incl +@@ -72,30 +126,42 @@ + #include + + struct interval { +- int first; +- int last; ++ unsigned long first; ++ unsigned long last; + }; + ++static int use_latin1 = 1; ++ + /* auxiliary function for binary search in interval table */ +-static int bisearch(wchar_t ucs, const struct interval *table, int max) { +- int min = 0; +- int mid; +- +- if (ucs < table[0].first || ucs > table[max].last) +- return 0; +- while (max >= min) { +- mid = (min + max) / 2; +- if (ucs > table[mid].last) +- min = mid + 1; +- else if (ucs < table[mid].first) +- max = mid - 1; +- else +- return 1; ++static int bisearch(unsigned long ucs, const struct interval *table, int max) ++{ ++ ++ if (ucs >= table[0].first && ucs <= table[max].last) { ++ int min = 0; ++ ++ while (max >= min) { ++ int mid; ++ ++ mid = (min + max) / 2; ++ if (ucs > table[mid].last) ++ min = mid + 1; ++ else if (ucs < table[mid].first) ++ max = mid - 1; ++ else ++ return 1; ++ } + } + + return 0; + } + ++/* ++ * Provide a way to change the behavior of soft-hyphen. ++ */ ++NCURSES_EXPORT(void) mk_wcwidth_init(int mode) ++{ ++ use_latin1 = (mode == 0); ++} + + /* The following two functions define the column width of an ISO 10646 + * character as follows: +@@ -109,7 +175,10 @@ + * category code Mn or Me in the Unicode database) have a + * column width of 0. + * +- * - SOFT HYPHEN (U+00AD) has a column width of 1. ++ * - A few spacing combining marks have a column width of 0. ++ * ++ * - SOFT HYPHEN (U+00AD) has a column width of 1 in Latin-1, 0 in Unicode. ++ * An initialization function is used to switch between the two. + * + * - Other format characters (general category code Cf in the Unicode + * database) and ZERO WIDTH SPACE (U+200B) have a column width of 0. +@@ -117,115 +186,513 @@ + * - Hangul Jamo medial vowels and final consonants (U+1160-U+11FF) + * have a column width of 0. + * ++ * - Hangul Jamo Extended-B medial vowels and final consonants for old ++ * Korean (U+D7B0-U+D7FF) have a column width of 0. ++ * + * - Spacing characters in the East Asian Wide (W) or East Asian + * Full-width (F) category as defined in Unicode Technical +- * Report #11 have a column width of 2. ++ * Report #11 have a column width of 2. In that report, some codes ++ * were unassigned. Characters in these blocks use a column width of 1: ++ * 4DC0..4DFF; Yijing Hexagram Symbols ++ * A960..A97F; Hangul Jamo Extended-A + * + * - All remaining characters (including all printable + * ISO 8859-1 and WGL4 characters, Unicode control characters, + * etc.) have a column width of 1. + * ++ * - Codes which do not correspond to a Unicode character have a column ++ * width of -1. ++ * + * This implementation assumes that wchar_t characters are encoded + * in ISO 10646. + */ + +-NCURSES_EXPORT(int) mk_wcwidth(wchar_t ucs) ++NCURSES_EXPORT(int) mk_wcwidth(uint32_t ucs) + { ++ unsigned long cmp = (unsigned long) ucs; ++ ++ /* sorted list of non-overlapping intervals of formatting characters */ ++ /* generated by ++ * uniset +cat=Cf -00AD -0600-0605 -061C -06DD -070F c ++ */ ++ /* *INDENT-OFF* */ ++ /* generated by run-uniset_ctl 1.1 */ ++ static const struct interval formatting[] = { ++ { 0x0890, 0x0891 }, { 0x08E2, 0x08E2 }, { 0x180E, 0x180E }, ++ { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2064 }, ++ { 0x2066, 0x206F }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB }, ++ { 0x110BD, 0x110BD }, { 0x110CD, 0x110CD }, { 0x13430, 0x1343F }, ++ { 0x1BCA0, 0x1BCA3 }, { 0x1D173, 0x1D17A }, { 0xE0001, 0xE0001 }, ++ { 0xE0020, 0xE007F } ++ }; ++ /* *INDENT-OFF* */ ++ + /* sorted list of non-overlapping intervals of non-spacing characters */ +- /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */ ++ /* generated by ++ * uniset +cat=Me +cat=Mn +0600-0605 +061C +06DD +070F +1160-11FF +D7B0-D7C6 +D7CB-D7FB c ++ */ ++ /* *INDENT-OFF* */ ++ /* generated by run-uniset 1.9 */ + static const struct interval combining[] = { +- { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 }, +- { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 }, +- { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 }, +- { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 }, +- { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED }, +- { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A }, +- { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 }, +- { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D }, +- { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 }, +- { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD }, +- { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C }, +- { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D }, +- { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC }, +- { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD }, +- { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C }, +- { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D }, +- { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 }, +- { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 }, +- { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC }, +- { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD }, +- { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D }, ++ { 0x0300, 0x036F }, { 0x0483, 0x0489 }, { 0x0591, 0x05BD }, ++ { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 }, { 0x05C4, 0x05C5 }, ++ { 0x05C7, 0x05C7 }, { 0x0600, 0x0605 }, { 0x0610, 0x061A }, ++ { 0x061C, 0x061C }, { 0x064B, 0x065F }, { 0x0670, 0x0670 }, ++ { 0x06D6, 0x06DD }, { 0x06DF, 0x06E4 }, { 0x06E7, 0x06E8 }, ++ { 0x06EA, 0x06ED }, { 0x070F, 0x070F }, { 0x0711, 0x0711 }, ++ { 0x0730, 0x074A }, { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, ++ { 0x07FD, 0x07FD }, { 0x0816, 0x0819 }, { 0x081B, 0x0823 }, ++ { 0x0825, 0x0827 }, { 0x0829, 0x082D }, { 0x0859, 0x085B }, ++ { 0x0898, 0x089F }, { 0x08CA, 0x08E1 }, { 0x08E3, 0x0902 }, ++ { 0x093A, 0x093A }, { 0x093C, 0x093C }, { 0x0941, 0x0948 }, ++ { 0x094D, 0x094D }, { 0x0951, 0x0957 }, { 0x0962, 0x0963 }, ++ { 0x0981, 0x0981 }, { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, ++ { 0x09CD, 0x09CD }, { 0x09E2, 0x09E3 }, { 0x09FE, 0x09FE }, ++ { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C }, { 0x0A41, 0x0A42 }, ++ { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D }, { 0x0A51, 0x0A51 }, ++ { 0x0A70, 0x0A71 }, { 0x0A75, 0x0A75 }, { 0x0A81, 0x0A82 }, ++ { 0x0ABC, 0x0ABC }, { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, ++ { 0x0ACD, 0x0ACD }, { 0x0AE2, 0x0AE3 }, { 0x0AFA, 0x0AFF }, ++ { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C }, { 0x0B3F, 0x0B3F }, ++ { 0x0B41, 0x0B44 }, { 0x0B4D, 0x0B4D }, { 0x0B55, 0x0B56 }, ++ { 0x0B62, 0x0B63 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 }, ++ { 0x0BCD, 0x0BCD }, { 0x0C00, 0x0C00 }, { 0x0C04, 0x0C04 }, ++ { 0x0C3C, 0x0C3C }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 }, ++ { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0C62, 0x0C63 }, ++ { 0x0C81, 0x0C81 }, { 0x0CBC, 0x0CBC }, { 0x0CBF, 0x0CBF }, ++ { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD }, { 0x0CE2, 0x0CE3 }, ++ { 0x0D00, 0x0D01 }, { 0x0D3B, 0x0D3C }, { 0x0D41, 0x0D44 }, ++ { 0x0D4D, 0x0D4D }, { 0x0D62, 0x0D63 }, { 0x0D81, 0x0D81 }, + { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 }, + { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E }, +- { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC }, +- { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 }, +- { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E }, +- { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 }, +- { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 }, +- { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 }, +- { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F }, +- { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 }, +- { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD }, +- { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD }, +- { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 }, +- { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B }, +- { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 }, +- { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 }, +- { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF }, +- { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 }, +- { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F }, +- { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B }, +- { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F }, +- { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB }, +- { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F }, +- { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 }, +- { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD }, +- { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F }, ++ { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EBC }, { 0x0EC8, 0x0ECE }, ++ { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 }, { 0x0F37, 0x0F37 }, ++ { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E }, { 0x0F80, 0x0F84 }, ++ { 0x0F86, 0x0F87 }, { 0x0F8D, 0x0F97 }, { 0x0F99, 0x0FBC }, ++ { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 }, { 0x1032, 0x1037 }, ++ { 0x1039, 0x103A }, { 0x103D, 0x103E }, { 0x1058, 0x1059 }, ++ { 0x105E, 0x1060 }, { 0x1071, 0x1074 }, { 0x1082, 0x1082 }, ++ { 0x1085, 0x1086 }, { 0x108D, 0x108D }, { 0x109D, 0x109D }, ++ { 0x1160, 0x11FF }, { 0x135D, 0x135F }, { 0x1712, 0x1714 }, ++ { 0x1732, 0x1733 }, { 0x1752, 0x1753 }, { 0x1772, 0x1773 }, ++ { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD }, { 0x17C6, 0x17C6 }, ++ { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD }, { 0x180B, 0x180D }, ++ { 0x180F, 0x180F }, { 0x1885, 0x1886 }, { 0x18A9, 0x18A9 }, ++ { 0x1920, 0x1922 }, { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, ++ { 0x1939, 0x193B }, { 0x1A17, 0x1A18 }, { 0x1A1B, 0x1A1B }, ++ { 0x1A56, 0x1A56 }, { 0x1A58, 0x1A5E }, { 0x1A60, 0x1A60 }, ++ { 0x1A62, 0x1A62 }, { 0x1A65, 0x1A6C }, { 0x1A73, 0x1A7C }, ++ { 0x1A7F, 0x1A7F }, { 0x1AB0, 0x1ACE }, { 0x1B00, 0x1B03 }, ++ { 0x1B34, 0x1B34 }, { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, ++ { 0x1B42, 0x1B42 }, { 0x1B6B, 0x1B73 }, { 0x1B80, 0x1B81 }, ++ { 0x1BA2, 0x1BA5 }, { 0x1BA8, 0x1BA9 }, { 0x1BAB, 0x1BAD }, ++ { 0x1BE6, 0x1BE6 }, { 0x1BE8, 0x1BE9 }, { 0x1BED, 0x1BED }, ++ { 0x1BEF, 0x1BF1 }, { 0x1C2C, 0x1C33 }, { 0x1C36, 0x1C37 }, ++ { 0x1CD0, 0x1CD2 }, { 0x1CD4, 0x1CE0 }, { 0x1CE2, 0x1CE8 }, ++ { 0x1CED, 0x1CED }, { 0x1CF4, 0x1CF4 }, { 0x1CF8, 0x1CF9 }, ++ { 0x1DC0, 0x1DFF }, { 0x20D0, 0x20F0 }, { 0x2CEF, 0x2CF1 }, ++ { 0x2D7F, 0x2D7F }, { 0x2DE0, 0x2DFF }, { 0x302A, 0x302D }, ++ { 0x3099, 0x309A }, { 0xA66F, 0xA672 }, { 0xA674, 0xA67D }, ++ { 0xA69E, 0xA69F }, { 0xA6F0, 0xA6F1 }, { 0xA802, 0xA802 }, ++ { 0xA806, 0xA806 }, { 0xA80B, 0xA80B }, { 0xA825, 0xA826 }, ++ { 0xA82C, 0xA82C }, { 0xA8C4, 0xA8C5 }, { 0xA8E0, 0xA8F1 }, ++ { 0xA8FF, 0xA8FF }, { 0xA926, 0xA92D }, { 0xA947, 0xA951 }, ++ { 0xA980, 0xA982 }, { 0xA9B3, 0xA9B3 }, { 0xA9B6, 0xA9B9 }, ++ { 0xA9BC, 0xA9BD }, { 0xA9E5, 0xA9E5 }, { 0xAA29, 0xAA2E }, ++ { 0xAA31, 0xAA32 }, { 0xAA35, 0xAA36 }, { 0xAA43, 0xAA43 }, ++ { 0xAA4C, 0xAA4C }, { 0xAA7C, 0xAA7C }, { 0xAAB0, 0xAAB0 }, ++ { 0xAAB2, 0xAAB4 }, { 0xAAB7, 0xAAB8 }, { 0xAABE, 0xAABF }, ++ { 0xAAC1, 0xAAC1 }, { 0xAAEC, 0xAAED }, { 0xAAF6, 0xAAF6 }, ++ { 0xABE5, 0xABE5 }, { 0xABE8, 0xABE8 }, { 0xABED, 0xABED }, ++ { 0xD7B0, 0xD7C6 }, { 0xD7CB, 0xD7FB }, { 0xFB1E, 0xFB1E }, ++ { 0xFE00, 0xFE0F }, { 0xFE20, 0xFE2F }, { 0x101FD, 0x101FD }, ++ { 0x102E0, 0x102E0 }, { 0x10376, 0x1037A }, { 0x10A01, 0x10A03 }, ++ { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F }, { 0x10A38, 0x10A3A }, ++ { 0x10A3F, 0x10A3F }, { 0x10AE5, 0x10AE6 }, { 0x10D24, 0x10D27 }, ++ { 0x10EAB, 0x10EAC }, { 0x10EFD, 0x10EFF }, { 0x10F46, 0x10F50 }, ++ { 0x10F82, 0x10F85 }, { 0x11001, 0x11001 }, { 0x11038, 0x11046 }, ++ { 0x11070, 0x11070 }, { 0x11073, 0x11074 }, { 0x1107F, 0x11081 }, ++ { 0x110B3, 0x110B6 }, { 0x110B9, 0x110BA }, { 0x110C2, 0x110C2 }, ++ { 0x11100, 0x11102 }, { 0x11127, 0x1112B }, { 0x1112D, 0x11134 }, ++ { 0x11173, 0x11173 }, { 0x11180, 0x11181 }, { 0x111B6, 0x111BE }, ++ { 0x111C9, 0x111CC }, { 0x111CF, 0x111CF }, { 0x1122F, 0x11231 }, ++ { 0x11234, 0x11234 }, { 0x11236, 0x11237 }, { 0x1123E, 0x1123E }, ++ { 0x11241, 0x11241 }, { 0x112DF, 0x112DF }, { 0x112E3, 0x112EA }, ++ { 0x11300, 0x11301 }, { 0x1133B, 0x1133C }, { 0x11340, 0x11340 }, ++ { 0x11366, 0x1136C }, { 0x11370, 0x11374 }, { 0x11438, 0x1143F }, ++ { 0x11442, 0x11444 }, { 0x11446, 0x11446 }, { 0x1145E, 0x1145E }, ++ { 0x114B3, 0x114B8 }, { 0x114BA, 0x114BA }, { 0x114BF, 0x114C0 }, ++ { 0x114C2, 0x114C3 }, { 0x115B2, 0x115B5 }, { 0x115BC, 0x115BD }, ++ { 0x115BF, 0x115C0 }, { 0x115DC, 0x115DD }, { 0x11633, 0x1163A }, ++ { 0x1163D, 0x1163D }, { 0x1163F, 0x11640 }, { 0x116AB, 0x116AB }, ++ { 0x116AD, 0x116AD }, { 0x116B0, 0x116B5 }, { 0x116B7, 0x116B7 }, ++ { 0x1171D, 0x1171F }, { 0x11722, 0x11725 }, { 0x11727, 0x1172B }, ++ { 0x1182F, 0x11837 }, { 0x11839, 0x1183A }, { 0x1193B, 0x1193C }, ++ { 0x1193E, 0x1193E }, { 0x11943, 0x11943 }, { 0x119D4, 0x119D7 }, ++ { 0x119DA, 0x119DB }, { 0x119E0, 0x119E0 }, { 0x11A01, 0x11A0A }, ++ { 0x11A33, 0x11A38 }, { 0x11A3B, 0x11A3E }, { 0x11A47, 0x11A47 }, ++ { 0x11A51, 0x11A56 }, { 0x11A59, 0x11A5B }, { 0x11A8A, 0x11A96 }, ++ { 0x11A98, 0x11A99 }, { 0x11C30, 0x11C36 }, { 0x11C38, 0x11C3D }, ++ { 0x11C3F, 0x11C3F }, { 0x11C92, 0x11CA7 }, { 0x11CAA, 0x11CB0 }, ++ { 0x11CB2, 0x11CB3 }, { 0x11CB5, 0x11CB6 }, { 0x11D31, 0x11D36 }, ++ { 0x11D3A, 0x11D3A }, { 0x11D3C, 0x11D3D }, { 0x11D3F, 0x11D45 }, ++ { 0x11D47, 0x11D47 }, { 0x11D90, 0x11D91 }, { 0x11D95, 0x11D95 }, ++ { 0x11D97, 0x11D97 }, { 0x11EF3, 0x11EF4 }, { 0x11F00, 0x11F01 }, ++ { 0x11F36, 0x11F3A }, { 0x11F40, 0x11F40 }, { 0x11F42, 0x11F42 }, ++ { 0x13440, 0x13440 }, { 0x13447, 0x13455 }, { 0x16AF0, 0x16AF4 }, ++ { 0x16B30, 0x16B36 }, { 0x16F4F, 0x16F4F }, { 0x16F8F, 0x16F92 }, ++ { 0x16FE4, 0x16FE4 }, { 0x1BC9D, 0x1BC9E }, { 0x1CF00, 0x1CF2D }, ++ { 0x1CF30, 0x1CF46 }, { 0x1D167, 0x1D169 }, { 0x1D17B, 0x1D182 }, ++ { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD }, { 0x1D242, 0x1D244 }, ++ { 0x1DA00, 0x1DA36 }, { 0x1DA3B, 0x1DA6C }, { 0x1DA75, 0x1DA75 }, ++ { 0x1DA84, 0x1DA84 }, { 0x1DA9B, 0x1DA9F }, { 0x1DAA1, 0x1DAAF }, ++ { 0x1E000, 0x1E006 }, { 0x1E008, 0x1E018 }, { 0x1E01B, 0x1E021 }, ++ { 0x1E023, 0x1E024 }, { 0x1E026, 0x1E02A }, { 0x1E08F, 0x1E08F }, ++ { 0x1E130, 0x1E136 }, { 0x1E2AE, 0x1E2AE }, { 0x1E2EC, 0x1E2EF }, ++ { 0x1E4EC, 0x1E4EF }, { 0x1E8D0, 0x1E8D6 }, { 0x1E944, 0x1E94A }, + { 0xE0100, 0xE01EF } + }; ++ /* *INDENT-ON* */ + +- /* test for 8-bit control characters */ +- if (ucs == 0) +- return 0; +- if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0)) +- return -1; ++ /* sorted list of non-overlapping intervals of non-characters */ ++ /* generated by ++ * uniset +0000..DFFF -4e00..9fd5 +F900..10FFFD unknown +2028..2029 c ++ */ ++ /* *INDENT-OFF* */ ++ /* generated by run-uniset_unk 1.6 */ ++ static const struct interval unknowns[] = { ++ { 0x0378, 0x0379 }, { 0x0380, 0x0383 }, { 0x038B, 0x038B }, ++ { 0x038D, 0x038D }, { 0x03A2, 0x03A2 }, { 0x0530, 0x0530 }, ++ { 0x0557, 0x0558 }, { 0x058B, 0x058C }, { 0x0590, 0x0590 }, ++ { 0x05C8, 0x05CF }, { 0x05EB, 0x05EE }, { 0x05F5, 0x05FF }, ++ { 0x070E, 0x070E }, { 0x074B, 0x074C }, { 0x07B2, 0x07BF }, ++ { 0x07FB, 0x07FC }, { 0x082E, 0x082F }, { 0x083F, 0x083F }, ++ { 0x085C, 0x085D }, { 0x085F, 0x085F }, { 0x086B, 0x086F }, ++ { 0x088F, 0x088F }, { 0x0892, 0x0897 }, { 0x0984, 0x0984 }, ++ { 0x098D, 0x098E }, { 0x0991, 0x0992 }, { 0x09A9, 0x09A9 }, ++ { 0x09B1, 0x09B1 }, { 0x09B3, 0x09B5 }, { 0x09BA, 0x09BB }, ++ { 0x09C5, 0x09C6 }, { 0x09C9, 0x09CA }, { 0x09CF, 0x09D6 }, ++ { 0x09D8, 0x09DB }, { 0x09DE, 0x09DE }, { 0x09E4, 0x09E5 }, ++ { 0x09FF, 0x0A00 }, { 0x0A04, 0x0A04 }, { 0x0A0B, 0x0A0E }, ++ { 0x0A11, 0x0A12 }, { 0x0A29, 0x0A29 }, { 0x0A31, 0x0A31 }, ++ { 0x0A34, 0x0A34 }, { 0x0A37, 0x0A37 }, { 0x0A3A, 0x0A3B }, ++ { 0x0A3D, 0x0A3D }, { 0x0A43, 0x0A46 }, { 0x0A49, 0x0A4A }, ++ { 0x0A4E, 0x0A50 }, { 0x0A52, 0x0A58 }, { 0x0A5D, 0x0A5D }, ++ { 0x0A5F, 0x0A65 }, { 0x0A77, 0x0A80 }, { 0x0A84, 0x0A84 }, ++ { 0x0A8E, 0x0A8E }, { 0x0A92, 0x0A92 }, { 0x0AA9, 0x0AA9 }, ++ { 0x0AB1, 0x0AB1 }, { 0x0AB4, 0x0AB4 }, { 0x0ABA, 0x0ABB }, ++ { 0x0AC6, 0x0AC6 }, { 0x0ACA, 0x0ACA }, { 0x0ACE, 0x0ACF }, ++ { 0x0AD1, 0x0ADF }, { 0x0AE4, 0x0AE5 }, { 0x0AF2, 0x0AF8 }, ++ { 0x0B00, 0x0B00 }, { 0x0B04, 0x0B04 }, { 0x0B0D, 0x0B0E }, ++ { 0x0B11, 0x0B12 }, { 0x0B29, 0x0B29 }, { 0x0B31, 0x0B31 }, ++ { 0x0B34, 0x0B34 }, { 0x0B3A, 0x0B3B }, { 0x0B45, 0x0B46 }, ++ { 0x0B49, 0x0B4A }, { 0x0B4E, 0x0B54 }, { 0x0B58, 0x0B5B }, ++ { 0x0B5E, 0x0B5E }, { 0x0B64, 0x0B65 }, { 0x0B78, 0x0B81 }, ++ { 0x0B84, 0x0B84 }, { 0x0B8B, 0x0B8D }, { 0x0B91, 0x0B91 }, ++ { 0x0B96, 0x0B98 }, { 0x0B9B, 0x0B9B }, { 0x0B9D, 0x0B9D }, ++ { 0x0BA0, 0x0BA2 }, { 0x0BA5, 0x0BA7 }, { 0x0BAB, 0x0BAD }, ++ { 0x0BBA, 0x0BBD }, { 0x0BC3, 0x0BC5 }, { 0x0BC9, 0x0BC9 }, ++ { 0x0BCE, 0x0BCF }, { 0x0BD1, 0x0BD6 }, { 0x0BD8, 0x0BE5 }, ++ { 0x0BFB, 0x0BFF }, { 0x0C0D, 0x0C0D }, { 0x0C11, 0x0C11 }, ++ { 0x0C29, 0x0C29 }, { 0x0C3A, 0x0C3B }, { 0x0C45, 0x0C45 }, ++ { 0x0C49, 0x0C49 }, { 0x0C4E, 0x0C54 }, { 0x0C57, 0x0C57 }, ++ { 0x0C5B, 0x0C5C }, { 0x0C5E, 0x0C5F }, { 0x0C64, 0x0C65 }, ++ { 0x0C70, 0x0C76 }, { 0x0C8D, 0x0C8D }, { 0x0C91, 0x0C91 }, ++ { 0x0CA9, 0x0CA9 }, { 0x0CB4, 0x0CB4 }, { 0x0CBA, 0x0CBB }, ++ { 0x0CC5, 0x0CC5 }, { 0x0CC9, 0x0CC9 }, { 0x0CCE, 0x0CD4 }, ++ { 0x0CD7, 0x0CDC }, { 0x0CDF, 0x0CDF }, { 0x0CE4, 0x0CE5 }, ++ { 0x0CF0, 0x0CF0 }, { 0x0CF4, 0x0CFF }, { 0x0D0D, 0x0D0D }, ++ { 0x0D11, 0x0D11 }, { 0x0D45, 0x0D45 }, { 0x0D49, 0x0D49 }, ++ { 0x0D50, 0x0D53 }, { 0x0D64, 0x0D65 }, { 0x0D80, 0x0D80 }, ++ { 0x0D84, 0x0D84 }, { 0x0D97, 0x0D99 }, { 0x0DB2, 0x0DB2 }, ++ { 0x0DBC, 0x0DBC }, { 0x0DBE, 0x0DBF }, { 0x0DC7, 0x0DC9 }, ++ { 0x0DCB, 0x0DCE }, { 0x0DD5, 0x0DD5 }, { 0x0DD7, 0x0DD7 }, ++ { 0x0DE0, 0x0DE5 }, { 0x0DF0, 0x0DF1 }, { 0x0DF5, 0x0E00 }, ++ { 0x0E3B, 0x0E3E }, { 0x0E5C, 0x0E80 }, { 0x0E83, 0x0E83 }, ++ { 0x0E85, 0x0E85 }, { 0x0E8B, 0x0E8B }, { 0x0EA4, 0x0EA4 }, ++ { 0x0EA6, 0x0EA6 }, { 0x0EBE, 0x0EBF }, { 0x0EC5, 0x0EC5 }, ++ { 0x0EC7, 0x0EC7 }, { 0x0ECF, 0x0ECF }, { 0x0EDA, 0x0EDB }, ++ { 0x0EE0, 0x0EFF }, { 0x0F48, 0x0F48 }, { 0x0F6D, 0x0F70 }, ++ { 0x0F98, 0x0F98 }, { 0x0FBD, 0x0FBD }, { 0x0FCD, 0x0FCD }, ++ { 0x0FDB, 0x0FFF }, { 0x10C6, 0x10C6 }, { 0x10C8, 0x10CC }, ++ { 0x10CE, 0x10CF }, { 0x1249, 0x1249 }, { 0x124E, 0x124F }, ++ { 0x1257, 0x1257 }, { 0x1259, 0x1259 }, { 0x125E, 0x125F }, ++ { 0x1289, 0x1289 }, { 0x128E, 0x128F }, { 0x12B1, 0x12B1 }, ++ { 0x12B6, 0x12B7 }, { 0x12BF, 0x12BF }, { 0x12C1, 0x12C1 }, ++ { 0x12C6, 0x12C7 }, { 0x12D7, 0x12D7 }, { 0x1311, 0x1311 }, ++ { 0x1316, 0x1317 }, { 0x135B, 0x135C }, { 0x137D, 0x137F }, ++ { 0x139A, 0x139F }, { 0x13F6, 0x13F7 }, { 0x13FE, 0x13FF }, ++ { 0x169D, 0x169F }, { 0x16F9, 0x16FF }, { 0x1716, 0x171E }, ++ { 0x1737, 0x173F }, { 0x1754, 0x175F }, { 0x176D, 0x176D }, ++ { 0x1771, 0x1771 }, { 0x1774, 0x177F }, { 0x17DE, 0x17DF }, ++ { 0x17EA, 0x17EF }, { 0x17FA, 0x17FF }, { 0x181A, 0x181F }, ++ { 0x1879, 0x187F }, { 0x18AB, 0x18AF }, { 0x18F6, 0x18FF }, ++ { 0x191F, 0x191F }, { 0x192C, 0x192F }, { 0x193C, 0x193F }, ++ { 0x1941, 0x1943 }, { 0x196E, 0x196F }, { 0x1975, 0x197F }, ++ { 0x19AC, 0x19AF }, { 0x19CA, 0x19CF }, { 0x19DB, 0x19DD }, ++ { 0x1A1C, 0x1A1D }, { 0x1A5F, 0x1A5F }, { 0x1A7D, 0x1A7E }, ++ { 0x1A8A, 0x1A8F }, { 0x1A9A, 0x1A9F }, { 0x1AAE, 0x1AAF }, ++ { 0x1ACF, 0x1AFF }, { 0x1B4D, 0x1B4F }, { 0x1B7F, 0x1B7F }, ++ { 0x1BF4, 0x1BFB }, { 0x1C38, 0x1C3A }, { 0x1C4A, 0x1C4C }, ++ { 0x1C89, 0x1C8F }, { 0x1CBB, 0x1CBC }, { 0x1CC8, 0x1CCF }, ++ { 0x1CFB, 0x1CFF }, { 0x1F16, 0x1F17 }, { 0x1F1E, 0x1F1F }, ++ { 0x1F46, 0x1F47 }, { 0x1F4E, 0x1F4F }, { 0x1F58, 0x1F58 }, ++ { 0x1F5A, 0x1F5A }, { 0x1F5C, 0x1F5C }, { 0x1F5E, 0x1F5E }, ++ { 0x1F7E, 0x1F7F }, { 0x1FB5, 0x1FB5 }, { 0x1FC5, 0x1FC5 }, ++ { 0x1FD4, 0x1FD5 }, { 0x1FDC, 0x1FDC }, { 0x1FF0, 0x1FF1 }, ++ { 0x1FF5, 0x1FF5 }, { 0x1FFF, 0x1FFF }, { 0x2028, 0x2029 }, ++ { 0x2065, 0x2065 }, { 0x2072, 0x2073 }, { 0x208F, 0x208F }, ++ { 0x209D, 0x209F }, { 0x20C1, 0x20CF }, { 0x20F1, 0x20FF }, ++ { 0x218C, 0x218F }, { 0x2427, 0x243F }, { 0x244B, 0x245F }, ++ { 0x2B74, 0x2B75 }, { 0x2B96, 0x2B96 }, { 0x2CF4, 0x2CF8 }, ++ { 0x2D26, 0x2D26 }, { 0x2D28, 0x2D2C }, { 0x2D2E, 0x2D2F }, ++ { 0x2D68, 0x2D6E }, { 0x2D71, 0x2D7E }, { 0x2D97, 0x2D9F }, ++ { 0x2DA7, 0x2DA7 }, { 0x2DAF, 0x2DAF }, { 0x2DB7, 0x2DB7 }, ++ { 0x2DBF, 0x2DBF }, { 0x2DC7, 0x2DC7 }, { 0x2DCF, 0x2DCF }, ++ { 0x2DD7, 0x2DD7 }, { 0x2DDF, 0x2DDF }, { 0x2E5E, 0x2E7F }, ++ { 0x2E9A, 0x2E9A }, { 0x2EF4, 0x2EFF }, { 0x2FD6, 0x2FEF }, ++ { 0x3040, 0x3040 }, { 0x3097, 0x3098 }, { 0x3100, 0x3104 }, ++ { 0x3130, 0x3130 }, { 0x318F, 0x318F }, { 0x31E4, 0x31EE }, ++ { 0x321F, 0x321F }, { 0x4DB6, 0x4DBF }, { 0x9FD6, 0x9FFF }, ++ { 0xA48D, 0xA48F }, { 0xA4C7, 0xA4CF }, { 0xA62C, 0xA63F }, ++ { 0xA6F8, 0xA6FF }, { 0xA7CB, 0xA7CF }, { 0xA7D2, 0xA7D2 }, ++ { 0xA7D4, 0xA7D4 }, { 0xA7DA, 0xA7F1 }, { 0xA82D, 0xA82F }, ++ { 0xA83A, 0xA83F }, { 0xA878, 0xA87F }, { 0xA8C6, 0xA8CD }, ++ { 0xA8DA, 0xA8DF }, { 0xA954, 0xA95E }, { 0xA97D, 0xA97F }, ++ { 0xA9CE, 0xA9CE }, { 0xA9DA, 0xA9DD }, { 0xA9FF, 0xA9FF }, ++ { 0xAA37, 0xAA3F }, { 0xAA4E, 0xAA4F }, { 0xAA5A, 0xAA5B }, ++ { 0xAAC3, 0xAADA }, { 0xAAF7, 0xAB00 }, { 0xAB07, 0xAB08 }, ++ { 0xAB0F, 0xAB10 }, { 0xAB17, 0xAB1F }, { 0xAB27, 0xAB27 }, ++ { 0xAB2F, 0xAB2F }, { 0xAB6C, 0xAB6F }, { 0xABEE, 0xABEF }, ++ { 0xABFA, 0xABFF }, { 0xD7A4, 0xD7AF }, { 0xD7C7, 0xD7CA }, ++ { 0xD7FC, 0xDFFF }, { 0xFA6E, 0xFA6F }, { 0xFADA, 0xFAFF }, ++ { 0xFB07, 0xFB12 }, { 0xFB18, 0xFB1C }, { 0xFB37, 0xFB37 }, ++ { 0xFB3D, 0xFB3D }, { 0xFB3F, 0xFB3F }, { 0xFB42, 0xFB42 }, ++ { 0xFB45, 0xFB45 }, { 0xFBC3, 0xFBD2 }, { 0xFD90, 0xFD91 }, ++ { 0xFDC8, 0xFDCE }, { 0xFDD0, 0xFDEF }, { 0xFE1A, 0xFE1F }, ++ { 0xFE53, 0xFE53 }, { 0xFE67, 0xFE67 }, { 0xFE6C, 0xFE6F }, ++ { 0xFE75, 0xFE75 }, { 0xFEFD, 0xFEFE }, { 0xFF00, 0xFF00 }, ++ { 0xFFBF, 0xFFC1 }, { 0xFFC8, 0xFFC9 }, { 0xFFD0, 0xFFD1 }, ++ { 0xFFD8, 0xFFD9 }, { 0xFFDD, 0xFFDF }, { 0xFFE7, 0xFFE7 }, ++ { 0xFFEF, 0xFFF8 }, { 0xFFFE, 0xFFFF }, { 0x1000C, 0x1000C }, ++ { 0x10027, 0x10027 }, { 0x1003B, 0x1003B }, { 0x1003E, 0x1003E }, ++ { 0x1004E, 0x1004F }, { 0x1005E, 0x1007F }, { 0x100FB, 0x100FF }, ++ { 0x10103, 0x10106 }, { 0x10134, 0x10136 }, { 0x1018F, 0x1018F }, ++ { 0x1019D, 0x1019F }, { 0x101A1, 0x101CF }, { 0x101FE, 0x1027F }, ++ { 0x1029D, 0x1029F }, { 0x102D1, 0x102DF }, { 0x102FC, 0x102FF }, ++ { 0x10324, 0x1032C }, { 0x1034B, 0x1034F }, { 0x1037B, 0x1037F }, ++ { 0x1039E, 0x1039E }, { 0x103C4, 0x103C7 }, { 0x103D6, 0x103FF }, ++ { 0x1049E, 0x1049F }, { 0x104AA, 0x104AF }, { 0x104D4, 0x104D7 }, ++ { 0x104FC, 0x104FF }, { 0x10528, 0x1052F }, { 0x10564, 0x1056E }, ++ { 0x1057B, 0x1057B }, { 0x1058B, 0x1058B }, { 0x10593, 0x10593 }, ++ { 0x10596, 0x10596 }, { 0x105A2, 0x105A2 }, { 0x105B2, 0x105B2 }, ++ { 0x105BA, 0x105BA }, { 0x105BD, 0x105FF }, { 0x10737, 0x1073F }, ++ { 0x10756, 0x1075F }, { 0x10768, 0x1077F }, { 0x10786, 0x10786 }, ++ { 0x107B1, 0x107B1 }, { 0x107BB, 0x107FF }, { 0x10806, 0x10807 }, ++ { 0x10809, 0x10809 }, { 0x10836, 0x10836 }, { 0x10839, 0x1083B }, ++ { 0x1083D, 0x1083E }, { 0x10856, 0x10856 }, { 0x1089F, 0x108A6 }, ++ { 0x108B0, 0x108DF }, { 0x108F3, 0x108F3 }, { 0x108F6, 0x108FA }, ++ { 0x1091C, 0x1091E }, { 0x1093A, 0x1093E }, { 0x10940, 0x1097F }, ++ { 0x109B8, 0x109BB }, { 0x109D0, 0x109D1 }, { 0x10A04, 0x10A04 }, ++ { 0x10A07, 0x10A0B }, { 0x10A14, 0x10A14 }, { 0x10A18, 0x10A18 }, ++ { 0x10A36, 0x10A37 }, { 0x10A3B, 0x10A3E }, { 0x10A49, 0x10A4F }, ++ { 0x10A59, 0x10A5F }, { 0x10AA0, 0x10ABF }, { 0x10AE7, 0x10AEA }, ++ { 0x10AF7, 0x10AFF }, { 0x10B36, 0x10B38 }, { 0x10B56, 0x10B57 }, ++ { 0x10B73, 0x10B77 }, { 0x10B92, 0x10B98 }, { 0x10B9D, 0x10BA8 }, ++ { 0x10BB0, 0x10BFF }, { 0x10C49, 0x10C7F }, { 0x10CB3, 0x10CBF }, ++ { 0x10CF3, 0x10CF9 }, { 0x10D28, 0x10D2F }, { 0x10D3A, 0x10E5F }, ++ { 0x10E7F, 0x10E7F }, { 0x10EAA, 0x10EAA }, { 0x10EAE, 0x10EAF }, ++ { 0x10EB2, 0x10EFC }, { 0x10F28, 0x10F2F }, { 0x10F5A, 0x10F6F }, ++ { 0x10F8A, 0x10FAF }, { 0x10FCC, 0x10FDF }, { 0x10FF7, 0x10FFF }, ++ { 0x1104E, 0x11051 }, { 0x11076, 0x1107E }, { 0x110C3, 0x110CC }, ++ { 0x110CE, 0x110CF }, { 0x110E9, 0x110EF }, { 0x110FA, 0x110FF }, ++ { 0x11135, 0x11135 }, { 0x11148, 0x1114F }, { 0x11177, 0x1117F }, ++ { 0x111E0, 0x111E0 }, { 0x111F5, 0x111FF }, { 0x11212, 0x11212 }, ++ { 0x11242, 0x1127F }, { 0x11287, 0x11287 }, { 0x11289, 0x11289 }, ++ { 0x1128E, 0x1128E }, { 0x1129E, 0x1129E }, { 0x112AA, 0x112AF }, ++ { 0x112EB, 0x112EF }, { 0x112FA, 0x112FF }, { 0x11304, 0x11304 }, ++ { 0x1130D, 0x1130E }, { 0x11311, 0x11312 }, { 0x11329, 0x11329 }, ++ { 0x11331, 0x11331 }, { 0x11334, 0x11334 }, { 0x1133A, 0x1133A }, ++ { 0x11345, 0x11346 }, { 0x11349, 0x1134A }, { 0x1134E, 0x1134F }, ++ { 0x11351, 0x11356 }, { 0x11358, 0x1135C }, { 0x11364, 0x11365 }, ++ { 0x1136D, 0x1136F }, { 0x11375, 0x113FF }, { 0x1145C, 0x1145C }, ++ { 0x11462, 0x1147F }, { 0x114C8, 0x114CF }, { 0x114DA, 0x1157F }, ++ { 0x115B6, 0x115B7 }, { 0x115DE, 0x115FF }, { 0x11645, 0x1164F }, ++ { 0x1165A, 0x1165F }, { 0x1166D, 0x1167F }, { 0x116BA, 0x116BF }, ++ { 0x116CA, 0x116FF }, { 0x1171B, 0x1171C }, { 0x1172C, 0x1172F }, ++ { 0x11747, 0x117FF }, { 0x1183C, 0x1189F }, { 0x118F3, 0x118FE }, ++ { 0x11907, 0x11908 }, { 0x1190A, 0x1190B }, { 0x11914, 0x11914 }, ++ { 0x11917, 0x11917 }, { 0x11936, 0x11936 }, { 0x11939, 0x1193A }, ++ { 0x11947, 0x1194F }, { 0x1195A, 0x1199F }, { 0x119A8, 0x119A9 }, ++ { 0x119D8, 0x119D9 }, { 0x119E5, 0x119FF }, { 0x11A48, 0x11A4F }, ++ { 0x11AA3, 0x11AAF }, { 0x11AF9, 0x11AFF }, { 0x11B0A, 0x11BFF }, ++ { 0x11C09, 0x11C09 }, { 0x11C37, 0x11C37 }, { 0x11C46, 0x11C4F }, ++ { 0x11C6D, 0x11C6F }, { 0x11C90, 0x11C91 }, { 0x11CA8, 0x11CA8 }, ++ { 0x11CB7, 0x11CFF }, { 0x11D07, 0x11D07 }, { 0x11D0A, 0x11D0A }, ++ { 0x11D37, 0x11D39 }, { 0x11D3B, 0x11D3B }, { 0x11D3E, 0x11D3E }, ++ { 0x11D48, 0x11D4F }, { 0x11D5A, 0x11D5F }, { 0x11D66, 0x11D66 }, ++ { 0x11D69, 0x11D69 }, { 0x11D8F, 0x11D8F }, { 0x11D92, 0x11D92 }, ++ { 0x11D99, 0x11D9F }, { 0x11DAA, 0x11EDF }, { 0x11EF9, 0x11EFF }, ++ { 0x11F11, 0x11F11 }, { 0x11F3B, 0x11F3D }, { 0x11F5A, 0x11FAF }, ++ { 0x11FB1, 0x11FBF }, { 0x11FF2, 0x11FFE }, { 0x1239A, 0x123FF }, ++ { 0x1246F, 0x1246F }, { 0x12475, 0x1247F }, { 0x12544, 0x12F8F }, ++ { 0x12FF3, 0x12FFF }, { 0x13456, 0x143FF }, { 0x14647, 0x167FF }, ++ { 0x16A39, 0x16A3F }, { 0x16A5F, 0x16A5F }, { 0x16A6A, 0x16A6D }, ++ { 0x16ABF, 0x16ABF }, { 0x16ACA, 0x16ACF }, { 0x16AEE, 0x16AEF }, ++ { 0x16AF6, 0x16AFF }, { 0x16B46, 0x16B4F }, { 0x16B5A, 0x16B5A }, ++ { 0x16B62, 0x16B62 }, { 0x16B78, 0x16B7C }, { 0x16B90, 0x16E3F }, ++ { 0x16E9B, 0x16EFF }, { 0x16F4B, 0x16F4E }, { 0x16F88, 0x16F8E }, ++ { 0x16FA0, 0x16FDF }, { 0x16FE5, 0x16FEF }, { 0x16FF2, 0x187FF }, ++ { 0x18CD6, 0x1AFEF }, { 0x1AFF4, 0x1AFF4 }, { 0x1AFFC, 0x1AFFC }, ++ { 0x1AFFF, 0x1AFFF }, { 0x1B123, 0x1B131 }, { 0x1B133, 0x1B14F }, ++ { 0x1B153, 0x1B154 }, { 0x1B156, 0x1B163 }, { 0x1B168, 0x1B16F }, ++ { 0x1B2FC, 0x1BBFF }, { 0x1BC6B, 0x1BC6F }, { 0x1BC7D, 0x1BC7F }, ++ { 0x1BC89, 0x1BC8F }, { 0x1BC9A, 0x1BC9B }, { 0x1BCA4, 0x1CEFF }, ++ { 0x1CF2E, 0x1CF2F }, { 0x1CF47, 0x1CF4F }, { 0x1CFC4, 0x1CFFF }, ++ { 0x1D0F6, 0x1D0FF }, { 0x1D127, 0x1D128 }, { 0x1D1EB, 0x1D1FF }, ++ { 0x1D246, 0x1D2BF }, { 0x1D2D4, 0x1D2DF }, { 0x1D2F4, 0x1D2FF }, ++ { 0x1D357, 0x1D35F }, { 0x1D379, 0x1D3FF }, { 0x1D455, 0x1D455 }, ++ { 0x1D49D, 0x1D49D }, { 0x1D4A0, 0x1D4A1 }, { 0x1D4A3, 0x1D4A4 }, ++ { 0x1D4A7, 0x1D4A8 }, { 0x1D4AD, 0x1D4AD }, { 0x1D4BA, 0x1D4BA }, ++ { 0x1D4BC, 0x1D4BC }, { 0x1D4C4, 0x1D4C4 }, { 0x1D506, 0x1D506 }, ++ { 0x1D50B, 0x1D50C }, { 0x1D515, 0x1D515 }, { 0x1D51D, 0x1D51D }, ++ { 0x1D53A, 0x1D53A }, { 0x1D53F, 0x1D53F }, { 0x1D545, 0x1D545 }, ++ { 0x1D547, 0x1D549 }, { 0x1D551, 0x1D551 }, { 0x1D6A6, 0x1D6A7 }, ++ { 0x1D7CC, 0x1D7CD }, { 0x1DA8C, 0x1DA9A }, { 0x1DAA0, 0x1DAA0 }, ++ { 0x1DAB0, 0x1DEFF }, { 0x1DF1F, 0x1DF24 }, { 0x1DF2B, 0x1DFFF }, ++ { 0x1E007, 0x1E007 }, { 0x1E019, 0x1E01A }, { 0x1E022, 0x1E022 }, ++ { 0x1E025, 0x1E025 }, { 0x1E02B, 0x1E02F }, { 0x1E06E, 0x1E08E }, ++ { 0x1E090, 0x1E0FF }, { 0x1E12D, 0x1E12F }, { 0x1E13E, 0x1E13F }, ++ { 0x1E14A, 0x1E14D }, { 0x1E150, 0x1E28F }, { 0x1E2AF, 0x1E2BF }, ++ { 0x1E2FA, 0x1E2FE }, { 0x1E300, 0x1E4CF }, { 0x1E4FA, 0x1E7DF }, ++ { 0x1E7E7, 0x1E7E7 }, { 0x1E7EC, 0x1E7EC }, { 0x1E7EF, 0x1E7EF }, ++ { 0x1E7FF, 0x1E7FF }, { 0x1E8C5, 0x1E8C6 }, { 0x1E8D7, 0x1E8FF }, ++ { 0x1E94C, 0x1E94F }, { 0x1E95A, 0x1E95D }, { 0x1E960, 0x1EC70 }, ++ { 0x1ECB5, 0x1ED00 }, { 0x1ED3E, 0x1EDFF }, { 0x1EE04, 0x1EE04 }, ++ { 0x1EE20, 0x1EE20 }, { 0x1EE23, 0x1EE23 }, { 0x1EE25, 0x1EE26 }, ++ { 0x1EE28, 0x1EE28 }, { 0x1EE33, 0x1EE33 }, { 0x1EE38, 0x1EE38 }, ++ { 0x1EE3A, 0x1EE3A }, { 0x1EE3C, 0x1EE41 }, { 0x1EE43, 0x1EE46 }, ++ { 0x1EE48, 0x1EE48 }, { 0x1EE4A, 0x1EE4A }, { 0x1EE4C, 0x1EE4C }, ++ { 0x1EE50, 0x1EE50 }, { 0x1EE53, 0x1EE53 }, { 0x1EE55, 0x1EE56 }, ++ { 0x1EE58, 0x1EE58 }, { 0x1EE5A, 0x1EE5A }, { 0x1EE5C, 0x1EE5C }, ++ { 0x1EE5E, 0x1EE5E }, { 0x1EE60, 0x1EE60 }, { 0x1EE63, 0x1EE63 }, ++ { 0x1EE65, 0x1EE66 }, { 0x1EE6B, 0x1EE6B }, { 0x1EE73, 0x1EE73 }, ++ { 0x1EE78, 0x1EE78 }, { 0x1EE7D, 0x1EE7D }, { 0x1EE7F, 0x1EE7F }, ++ { 0x1EE8A, 0x1EE8A }, { 0x1EE9C, 0x1EEA0 }, { 0x1EEA4, 0x1EEA4 }, ++ { 0x1EEAA, 0x1EEAA }, { 0x1EEBC, 0x1EEEF }, { 0x1EEF2, 0x1EFFF }, ++ { 0x1F02C, 0x1F02F }, { 0x1F094, 0x1F09F }, { 0x1F0AF, 0x1F0B0 }, ++ { 0x1F0C0, 0x1F0C0 }, { 0x1F0D0, 0x1F0D0 }, { 0x1F0F6, 0x1F0FF }, ++ { 0x1F1AE, 0x1F1E5 }, { 0x1F203, 0x1F20F }, { 0x1F23C, 0x1F23F }, ++ { 0x1F249, 0x1F24F }, { 0x1F252, 0x1F25F }, { 0x1F266, 0x1F2FF }, ++ { 0x1F6D8, 0x1F6DB }, { 0x1F6ED, 0x1F6EF }, { 0x1F6FD, 0x1F6FF }, ++ { 0x1F777, 0x1F77A }, { 0x1F7DA, 0x1F7DF }, { 0x1F7EC, 0x1F7EF }, ++ { 0x1F7F1, 0x1F7FF }, { 0x1F80C, 0x1F80F }, { 0x1F848, 0x1F84F }, ++ { 0x1F85A, 0x1F85F }, { 0x1F888, 0x1F88F }, { 0x1F8AE, 0x1F8AF }, ++ { 0x1F8B2, 0x1F8FF }, { 0x1FA54, 0x1FA5F }, { 0x1FA6E, 0x1FA6F }, ++ { 0x1FA7D, 0x1FA7F }, { 0x1FA89, 0x1FA8F }, { 0x1FABE, 0x1FABE }, ++ { 0x1FAC6, 0x1FACD }, { 0x1FADC, 0x1FADF }, { 0x1FAE9, 0x1FAEF }, ++ { 0x1FAF9, 0x1FAFF }, { 0x1FB93, 0x1FB93 }, { 0x1FBCB, 0x1FBEF }, ++ { 0x1FBFA, 0x1FFFF }, { 0x2A6D7, 0x2F7FF }, { 0x2FA1E, 0xE0000 }, ++ { 0xE0002, 0xE001F }, { 0xE0080, 0xE00FF }, { 0xE01F0, 0x10FFFD } ++ }; ++ /* *INDENT-ON* */ + +- /* binary search in table of non-spacing characters */ +- if (bisearch(ucs, combining, +- sizeof(combining) / sizeof(struct interval) - 1)) +- return 0; +- +- /* if we arrive here, ucs is not a combining or C0/C1 control character */ +- +- return 1 + +- (ucs >= 0x1100 && +- (ucs <= 0x115f || /* Hangul Jamo init. consonants */ +- ucs == 0x2329 || ucs == 0x232a || +- (ucs >= 0x2e80 && ucs <= 0xa4cf && +- ucs != 0x303f) /* CJK ... Yi */ +- || (ucs >= 0xac00 && ucs <= 0xd7a3) /* Hangul Syllables */ +- || (ucs >= 0xf900 && ucs <= 0xfaff) /* CJK Compatibility Ideographs */ +- || (ucs >= 0xfe10 && ucs <= 0xfe19) /* Vertical forms */ +- || (ucs >= 0xfe30 && ucs <= 0xfe6f) /* CJK Compatibility Forms */ +- || (ucs >= 0xff00 && ucs <= 0xff60) /* Fullwidth Forms */ +- || (ucs >= 0xffe0 && ucs <= 0xffe6) +-#if !defined(SIZEOF_WCHAR_T) || (SIZEOF_WCHAR_T >= 4) +- || (ucs >= 0x20000 && ucs <= 0x2fffd) +- || (ucs >= 0x30000 && ucs <= 0x3fffd) +-#endif +- )); ++ /* sorted list of non-overlapping intervals of non-characters */ ++ /* generated by ++ * uniset +WIDTH-W -cat=Cn -cat=Mn c ++ */ ++ /* *INDENT-OFF* */ ++ /* generated by run-uniset_dbl 1.2 */ ++ static const struct interval doublewidth[] = { ++ { 0x1100, 0x115F }, { 0x231A, 0x231B }, { 0x2329, 0x232A }, ++ { 0x23E9, 0x23EC }, { 0x23F0, 0x23F0 }, { 0x23F3, 0x23F3 }, ++ { 0x25FD, 0x25FE }, { 0x2614, 0x2615 }, { 0x2648, 0x2653 }, ++ { 0x267F, 0x267F }, { 0x2693, 0x2693 }, { 0x26A1, 0x26A1 }, ++ { 0x26AA, 0x26AB }, { 0x26BD, 0x26BE }, { 0x26C4, 0x26C5 }, ++ { 0x26CE, 0x26CE }, { 0x26D4, 0x26D4 }, { 0x26EA, 0x26EA }, ++ { 0x26F2, 0x26F3 }, { 0x26F5, 0x26F5 }, { 0x26FA, 0x26FA }, ++ { 0x26FD, 0x26FD }, { 0x2705, 0x2705 }, { 0x270A, 0x270B }, ++ { 0x2728, 0x2728 }, { 0x274C, 0x274C }, { 0x274E, 0x274E }, ++ { 0x2753, 0x2755 }, { 0x2757, 0x2757 }, { 0x2795, 0x2797 }, ++ { 0x27B0, 0x27B0 }, { 0x27BF, 0x27BF }, { 0x2B1B, 0x2B1C }, ++ { 0x2B50, 0x2B50 }, { 0x2B55, 0x2B55 }, { 0x2E80, 0x2E99 }, ++ { 0x2E9B, 0x2EF3 }, { 0x2F00, 0x2FD5 }, { 0x2FF0, 0x3029 }, ++ { 0x302E, 0x303E }, { 0x3041, 0x3096 }, { 0x309B, 0x30FF }, ++ { 0x3105, 0x312F }, { 0x3131, 0x318E }, { 0x3190, 0x31E3 }, ++ { 0x31EF, 0x321E }, { 0x3220, 0x3247 }, { 0x3250, 0x4DBF }, ++ { 0x4E00, 0xA48C }, { 0xA490, 0xA4C6 }, { 0xA960, 0xA97C }, ++ { 0xAC00, 0xD7A3 }, { 0xF900, 0xFAFF }, { 0xFE10, 0xFE19 }, ++ { 0xFE30, 0xFE52 }, { 0xFE54, 0xFE66 }, { 0xFE68, 0xFE6B }, ++ { 0xFF01, 0xFF60 }, { 0xFFE0, 0xFFE6 }, { 0x16FE0, 0x16FE3 }, ++ { 0x16FF0, 0x16FF1 }, { 0x17000, 0x187F7 }, { 0x18800, 0x18CD5 }, ++ { 0x18D00, 0x18D08 }, { 0x1AFF0, 0x1AFF3 }, { 0x1AFF5, 0x1AFFB }, ++ { 0x1AFFD, 0x1AFFE }, { 0x1B000, 0x1B122 }, { 0x1B132, 0x1B132 }, ++ { 0x1B150, 0x1B152 }, { 0x1B155, 0x1B155 }, { 0x1B164, 0x1B167 }, ++ { 0x1B170, 0x1B2FB }, { 0x1F004, 0x1F004 }, { 0x1F0CF, 0x1F0CF }, ++ { 0x1F18E, 0x1F18E }, { 0x1F191, 0x1F19A }, { 0x1F200, 0x1F202 }, ++ { 0x1F210, 0x1F23B }, { 0x1F240, 0x1F248 }, { 0x1F250, 0x1F251 }, ++ { 0x1F260, 0x1F265 }, { 0x1F300, 0x1F320 }, { 0x1F32D, 0x1F335 }, ++ { 0x1F337, 0x1F37C }, { 0x1F37E, 0x1F393 }, { 0x1F3A0, 0x1F3CA }, ++ { 0x1F3CF, 0x1F3D3 }, { 0x1F3E0, 0x1F3F0 }, { 0x1F3F4, 0x1F3F4 }, ++ { 0x1F3F8, 0x1F43E }, { 0x1F440, 0x1F440 }, { 0x1F442, 0x1F4FC }, ++ { 0x1F4FF, 0x1F53D }, { 0x1F54B, 0x1F54E }, { 0x1F550, 0x1F567 }, ++ { 0x1F57A, 0x1F57A }, { 0x1F595, 0x1F596 }, { 0x1F5A4, 0x1F5A4 }, ++ { 0x1F5FB, 0x1F64F }, { 0x1F680, 0x1F6C5 }, { 0x1F6CC, 0x1F6CC }, ++ { 0x1F6D0, 0x1F6D2 }, { 0x1F6D5, 0x1F6D7 }, { 0x1F6DC, 0x1F6DF }, ++ { 0x1F6EB, 0x1F6EC }, { 0x1F6F4, 0x1F6FC }, { 0x1F7E0, 0x1F7EB }, ++ { 0x1F7F0, 0x1F7F0 }, { 0x1F90C, 0x1F93A }, { 0x1F93C, 0x1F945 }, ++ { 0x1F947, 0x1F9FF }, { 0x1FA70, 0x1FA7C }, { 0x1FA80, 0x1FA88 }, ++ { 0x1FA90, 0x1FABD }, { 0x1FABF, 0x1FAC5 }, { 0x1FACE, 0x1FADB }, ++ { 0x1FAE0, 0x1FAE8 }, { 0x1FAF0, 0x1FAF8 }, { 0x20000, 0x2FFFD }, ++ { 0x30000, 0x3FFFD } ++ }; ++ /* *INDENT-ON* */ ++ ++ int result; ++ ++#define Lookup(cmp, table) \ ++ bisearch(cmp, table, \ ++ (int) (sizeof(table) / sizeof(struct interval) - 1)) ++ ++ /* test for 8-bit control characters */ ++ if (cmp == 0) { ++ result = 0; ++ } else if (cmp < 32 || (cmp >= 0x7f && cmp < 0xa0)) { ++ result = -1; ++ } else if (cmp == 0xad) { ++ result = use_latin1; ++ } else if (Lookup(cmp, formatting)) { ++ /* treat formatting characters like control characters */ ++ result = -1; ++ } else if (Lookup(cmp, combining)) { ++ /* binary search in table of non-spacing characters */ ++ result = 0; ++ } else { ++ /* if we arrive here, cmp is not a combining or C0/C1 control character */ ++ result = 1; ++ ++ if (Lookup(cmp, doublewidth)) { ++ result = 2; ++ } else if (cmp >= unknowns[0].first && Lookup(cmp, unknowns)) { ++ result = -1; ++ } ++ } ++ return result; + } + + +-NCURSES_EXPORT(int) mk_wcswidth(const wchar_t *pwcs, size_t n) ++NCURSES_EXPORT(int) mk_wcswidth(const uint32_t *pwcs, size_t n) + { +- int w, width = 0; ++ int width = 0; ++ ++ for (; *pwcs && n-- > 0; pwcs++) { ++ int w; + +- for (;*pwcs && n-- > 0; pwcs++) + if ((w = mk_wcwidth(*pwcs)) < 0) + return -1; + else + width += w; ++ } + + return width; + } +@@ -233,17 +700,31 @@ + + /* + * The following functions are the same as mk_wcwidth() and +- * mk_wcswidth(), except that spacing characters in the East Asian ++ * mk_wcwidth_cjk(), except that spacing characters in the East Asian + * Ambiguous (A) category as defined in Unicode Technical Report #11 + * have a column width of 2. This variant might be useful for users of + * CJK legacy encodings who want to migrate to UCS without changing + * the traditional terminal character-width behaviour. It is not + * otherwise recommended for general use. + */ +-NCURSES_EXPORT(int) mk_wcwidth_cjk(wchar_t ucs) ++NCURSES_EXPORT(int) mk_wcwidth_cjk(uint32_t ucs) + { + /* sorted list of non-overlapping intervals of East Asian Ambiguous +- * characters, generated by "uniset +WIDTH-A -cat=Me -cat=Mn -cat=Cf c" */ ++ * characters, generated by ++ * ++ * uniset +WIDTH-A -cat=Me -cat=Mn -cat=Cf \ ++ * +E000..F8FF \ ++ * +F0000..FFFFD \ ++ * +100000..10FFFD c ++ * ++ * "WIDTH-A" is a file extracted from EastAsianWidth.txt by selecting ++ * only those with width "A", and omitting: ++ * ++ * 0xAD ++ * all lines with "COMBINING" ++ */ ++ /* *INDENT-OFF* */ ++ /* generated by run-uniset_cjk 1.5 */ + static const struct interval ambiguous[] = { + { 0x00A1, 0x00A1 }, { 0x00A4, 0x00A4 }, { 0x00A7, 0x00A8 }, + { 0x00AA, 0x00AA }, { 0x00AE, 0x00AE }, { 0x00B0, 0x00B4 }, +@@ -274,49 +755,59 @@ + { 0x2113, 0x2113 }, { 0x2116, 0x2116 }, { 0x2121, 0x2122 }, + { 0x2126, 0x2126 }, { 0x212B, 0x212B }, { 0x2153, 0x2154 }, + { 0x215B, 0x215E }, { 0x2160, 0x216B }, { 0x2170, 0x2179 }, +- { 0x2190, 0x2199 }, { 0x21B8, 0x21B9 }, { 0x21D2, 0x21D2 }, +- { 0x21D4, 0x21D4 }, { 0x21E7, 0x21E7 }, { 0x2200, 0x2200 }, +- { 0x2202, 0x2203 }, { 0x2207, 0x2208 }, { 0x220B, 0x220B }, +- { 0x220F, 0x220F }, { 0x2211, 0x2211 }, { 0x2215, 0x2215 }, +- { 0x221A, 0x221A }, { 0x221D, 0x2220 }, { 0x2223, 0x2223 }, +- { 0x2225, 0x2225 }, { 0x2227, 0x222C }, { 0x222E, 0x222E }, +- { 0x2234, 0x2237 }, { 0x223C, 0x223D }, { 0x2248, 0x2248 }, +- { 0x224C, 0x224C }, { 0x2252, 0x2252 }, { 0x2260, 0x2261 }, +- { 0x2264, 0x2267 }, { 0x226A, 0x226B }, { 0x226E, 0x226F }, +- { 0x2282, 0x2283 }, { 0x2286, 0x2287 }, { 0x2295, 0x2295 }, +- { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 }, { 0x22BF, 0x22BF }, +- { 0x2312, 0x2312 }, { 0x2460, 0x24E9 }, { 0x24EB, 0x254B }, +- { 0x2550, 0x2573 }, { 0x2580, 0x258F }, { 0x2592, 0x2595 }, +- { 0x25A0, 0x25A1 }, { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 }, +- { 0x25B6, 0x25B7 }, { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 }, +- { 0x25C6, 0x25C8 }, { 0x25CB, 0x25CB }, { 0x25CE, 0x25D1 }, +- { 0x25E2, 0x25E5 }, { 0x25EF, 0x25EF }, { 0x2605, 0x2606 }, +- { 0x2609, 0x2609 }, { 0x260E, 0x260F }, { 0x2614, 0x2615 }, ++ { 0x2189, 0x2189 }, { 0x2190, 0x2199 }, { 0x21B8, 0x21B9 }, ++ { 0x21D2, 0x21D2 }, { 0x21D4, 0x21D4 }, { 0x21E7, 0x21E7 }, ++ { 0x2200, 0x2200 }, { 0x2202, 0x2203 }, { 0x2207, 0x2208 }, ++ { 0x220B, 0x220B }, { 0x220F, 0x220F }, { 0x2211, 0x2211 }, ++ { 0x2215, 0x2215 }, { 0x221A, 0x221A }, { 0x221D, 0x2220 }, ++ { 0x2223, 0x2223 }, { 0x2225, 0x2225 }, { 0x2227, 0x222C }, ++ { 0x222E, 0x222E }, { 0x2234, 0x2237 }, { 0x223C, 0x223D }, ++ { 0x2248, 0x2248 }, { 0x224C, 0x224C }, { 0x2252, 0x2252 }, ++ { 0x2260, 0x2261 }, { 0x2264, 0x2267 }, { 0x226A, 0x226B }, ++ { 0x226E, 0x226F }, { 0x2282, 0x2283 }, { 0x2286, 0x2287 }, ++ { 0x2295, 0x2295 }, { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 }, ++ { 0x22BF, 0x22BF }, { 0x2312, 0x2312 }, { 0x2460, 0x24E9 }, ++ { 0x24EB, 0x254B }, { 0x2550, 0x2573 }, { 0x2580, 0x258F }, ++ { 0x2592, 0x2595 }, { 0x25A0, 0x25A1 }, { 0x25A3, 0x25A9 }, ++ { 0x25B2, 0x25B3 }, { 0x25B6, 0x25B7 }, { 0x25BC, 0x25BD }, ++ { 0x25C0, 0x25C1 }, { 0x25C6, 0x25C8 }, { 0x25CB, 0x25CB }, ++ { 0x25CE, 0x25D1 }, { 0x25E2, 0x25E5 }, { 0x25EF, 0x25EF }, ++ { 0x2605, 0x2606 }, { 0x2609, 0x2609 }, { 0x260E, 0x260F }, + { 0x261C, 0x261C }, { 0x261E, 0x261E }, { 0x2640, 0x2640 }, + { 0x2642, 0x2642 }, { 0x2660, 0x2661 }, { 0x2663, 0x2665 }, + { 0x2667, 0x266A }, { 0x266C, 0x266D }, { 0x266F, 0x266F }, +- { 0x273D, 0x273D }, { 0x2776, 0x277F }, { 0xE000, 0xF8FF }, +- { 0xFFFD, 0xFFFD }, { 0xF0000, 0xFFFFD }, { 0x100000, 0x10FFFD } ++ { 0x269E, 0x269F }, { 0x26BF, 0x26BF }, { 0x26C6, 0x26CD }, ++ { 0x26CF, 0x26D3 }, { 0x26D5, 0x26E1 }, { 0x26E3, 0x26E3 }, ++ { 0x26E8, 0x26E9 }, { 0x26EB, 0x26F1 }, { 0x26F4, 0x26F4 }, ++ { 0x26F6, 0x26F9 }, { 0x26FB, 0x26FC }, { 0x26FE, 0x26FF }, ++ { 0x273D, 0x273D }, { 0x2776, 0x277F }, { 0x2B56, 0x2B59 }, ++ { 0x3248, 0x324F }, { 0xE000, 0xF8FF }, { 0xFFFD, 0xFFFD }, ++ { 0x1F100, 0x1F10A }, { 0x1F110, 0x1F12D }, { 0x1F130, 0x1F169 }, ++ { 0x1F170, 0x1F18D }, { 0x1F18F, 0x1F190 }, { 0x1F19B, 0x1F1AC }, ++ { 0xF0000, 0xFFFFD }, { 0x100000, 0x10FFFD } + }; ++ /* *INDENT-ON* */ + + /* binary search in table of non-spacing characters */ +- if (bisearch(ucs, ambiguous, +- sizeof(ambiguous) / sizeof(struct interval) - 1)) ++ if (Lookup((unsigned long) ucs, ambiguous)) + return 2; + + return mk_wcwidth(ucs); + } + + +-NCURSES_EXPORT(int) mk_wcswidth_cjk(const wchar_t *pwcs, size_t n) ++NCURSES_EXPORT(int) mk_wcswidth_cjk(const uint32_t *pwcs, size_t n) + { +- int w, width = 0; ++ int width = 0; ++ ++ for (; *pwcs && n-- > 0; pwcs++) { ++ int w; + +- for (;*pwcs && n-- > 0; pwcs++) + if ((w = mk_wcwidth_cjk(*pwcs)) < 0) + return -1; + else + width += w; ++ } + + return width; + } +Index: ncurses/win32con/wcwidth.c +Prereq: 1.4 +--- ncurses-6.5-20240427+/ncurses/win32con/wcwidth.c 2020-07-11 21:02:10.000000000 +0000 ++++ ncurses-6.5-20240504/ncurses/win32con/wcwidth.c 2024-05-04 18:31:39.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2020 Thomas E. Dickey * ++ * Copyright 2020,2024 Thomas E. Dickey * + * Copyright 2010 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -28,7 +28,7 @@ + ****************************************************************************/ + #include + +-MODULE_ID("$Id: wcwidth.c,v 1.4 2020/07/11 21:02:10 tom Exp $") ++MODULE_ID("$Id: wcwidth.c,v 1.5 2024/05/04 18:31:39 tom Exp $") + + #if USE_WIDEC_SUPPORT + #define mk_wcwidth(ucs) _nc_wcwidth(ucs) +@@ -36,10 +36,11 @@ + #define mk_wcwidth_cjk(ucs) _nc_wcwidth_cjk(ucs) + #define mk_wcswidth_cjk(pwcs, n) _nc_wcswidth_cjk(pwcs, n) + +-NCURSES_EXPORT(int) mk_wcwidth(wchar_t); +-NCURSES_EXPORT(int) mk_wcswidth(const wchar_t *, size_t); +-NCURSES_EXPORT(int) mk_wcwidth_cjk(wchar_t); +-NCURSES_EXPORT(int) mk_wcswidth_cjk(const wchar_t *, size_t); ++NCURSES_EXPORT(void) mk_wcwidth_init(int); ++NCURSES_EXPORT(int) mk_wcwidth(uint32_t); ++NCURSES_EXPORT(int) mk_wcswidth(const uint32_t *, size_t); ++NCURSES_EXPORT(int) mk_wcwidth_cjk(uint32_t); ++NCURSES_EXPORT(int) mk_wcswidth_cjk(const uint32_t *, size_t); + + #include + #else +Index: package/debian-mingw/changelog +--- ncurses-6.5-20240427+/package/debian-mingw/changelog 2024-04-27 13:56:53.000000000 +0000 ++++ ncurses-6.5-20240504/package/debian-mingw/changelog 2024-05-04 10:21:09.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.5+20240427) unstable; urgency=low ++ncurses6 (6.5+20240504) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 27 Apr 2024 09:56:53 -0400 ++ -- Thomas E. Dickey Sat, 04 May 2024 06:21:09 -0400 + + ncurses6 (5.9+20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.5-20240427+/package/debian-mingw64/changelog 2024-04-27 13:56:53.000000000 +0000 ++++ ncurses-6.5-20240504/package/debian-mingw64/changelog 2024-05-04 10:21:09.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.5+20240427) unstable; urgency=low ++ncurses6 (6.5+20240504) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 27 Apr 2024 09:56:53 -0400 ++ -- Thomas E. Dickey Sat, 04 May 2024 06:21:09 -0400 + + ncurses6 (5.9+20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.5-20240427+/package/debian/changelog 2024-04-27 13:56:53.000000000 +0000 ++++ ncurses-6.5-20240504/package/debian/changelog 2024-05-04 10:21:09.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.5+20240427) unstable; urgency=low ++ncurses6 (6.5+20240504) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 27 Apr 2024 09:56:53 -0400 ++ -- Thomas E. Dickey Sat, 04 May 2024 06:21:09 -0400 + + ncurses6 (5.9+20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.645 +--- ncurses-6.5-20240427+/package/mingw-ncurses.nsi 2024-04-27 13:56:53.000000000 +0000 ++++ ncurses-6.5-20240504/package/mingw-ncurses.nsi 2024-05-04 10:21:09.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.645 2024/04/27 13:56:53 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.646 2024/05/04 10:21:09 tom Exp $ + + ; TODO add examples + ; TODO bump ABI to 6 +@@ -10,7 +10,7 @@ + !define VERSION_MAJOR "6" + !define VERSION_MINOR "5" + !define VERSION_YYYY "2024" +-!define VERSION_MMDD "0427" ++!define VERSION_MMDD "0504" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.5-20240427+/package/mingw-ncurses.spec 2024-04-27 13:56:53.000000000 +0000 ++++ ncurses-6.5-20240504/package/mingw-ncurses.spec 2024-05-04 10:21:09.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.5 +-Release: 20240427 ++Release: 20240504 + License: X11 + Group: Development/Libraries + URL: https://invisible-island.net/ncurses/ +Index: package/ncurses.spec +--- ncurses-6.5-20240427+/package/ncurses.spec 2024-04-27 13:56:53.000000000 +0000 ++++ ncurses-6.5-20240504/package/ncurses.spec 2024-05-04 10:21:09.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.5 +-Release: 20240427 ++Release: 20240504 + License: X11 + Group: Development/Libraries + URL: https://invisible-island.net/ncurses/ +Index: package/ncursest.spec +--- ncurses-6.5-20240427+/package/ncursest.spec 2024-04-27 13:56:53.000000000 +0000 ++++ ncurses-6.5-20240504/package/ncursest.spec 2024-05-04 10:21:09.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.5 +-Release: 20240427 ++Release: 20240504 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz diff --git a/packages/ncurses/6.5/ncurses-6.5-20240511.patch b/packages/ncurses/6.5/ncurses-6.5-20240511.patch new file mode 100644 index 0000000000..88a9dc7a7b --- /dev/null +++ b/packages/ncurses/6.5/ncurses-6.5-20240511.patch @@ -0,0 +1,8153 @@ +# ncurses 6.5 - patch 20240511 - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 6.5 is at +# https://invisible-island.net/archives/ncurses/ +# https://invisible-mirror.net/archives/ncurses/ +# https://ftp.gnu.org/gnu/ncurses/ +# +# Patches for ncurses 6.5 can be found at +# https://invisible-island.net/archives/ncurses/6.5 +# https://invisible-mirror.net/archives/ncurses/6.5 +# +# ------------------------------------------------------------------------------ +# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20240511.patch.gz +# patch by Thomas E. Dickey +# created Sun May 12 00:16:58 UTC 2024 +# ------------------------------------------------------------------------------ +# NEWS | 9 +# VERSION | 2 +# dist.mk | 4 +# doc/html/man/curs_add_wch.3x.html | 270 +++++++------ +# doc/html/man/curs_add_wchstr.3x.html | 63 +-- +# doc/html/man/curs_addch.3x.html | 236 ++++++----- +# doc/html/man/curs_addchstr.3x.html | 51 +- +# doc/html/man/curs_attr.3x.html | 13 +# doc/html/man/curs_delch.3x.html | 30 - +# doc/html/man/curs_get_wch.3x.html | 71 +-- +# doc/html/man/curs_getch.3x.html | 128 +++--- +# doc/html/man/curs_getstr.3x.html | 10 +# doc/html/man/curs_getyx.3x.html | 68 +-- +# doc/html/man/curs_inch.3x.html | 90 +--- +# doc/html/man/curs_mouse.3x.html | 20 +# doc/html/man/curs_outopts.3x.html | 32 - +# doc/html/man/curs_sp_funcs.3x.html | 8 +# doc/html/man/curs_termattrs.3x.html | 12 +# doc/html/man/curs_util.3x.html | 165 ++++---- +# doc/html/man/infocmp.1m.html | 8 +# doc/html/man/infotocap.1m.html | 8 +# doc/html/man/ncurses.3x.html | 673 ++++++++++++++++----------------- +# doc/html/man/ncursesw6-config.1.html | 8 +# doc/html/man/term.5.html | 233 +++++------ +# doc/html/man/term.7.html | 8 +# doc/html/man/terminfo.5.html | 10 +# doc/html/man/tic.1m.html | 8 +# doc/html/man/toe.1m.html | 8 +# doc/html/man/tput.1.html | 8 +# doc/html/man/tset.1.html | 8 +# man/MKncu_config.in | 4 +# man/curs_add_wch.3x | 312 +++++++++------ +# man/curs_add_wchstr.3x | 95 ++-- +# man/curs_addch.3x | 148 +++---- +# man/curs_addchstr.3x | 89 ++-- +# man/curs_attr.3x | 14 +# man/curs_delch.3x | 17 +# man/curs_get_wch.3x | 51 +- +# man/curs_getch.3x | 120 +++-- +# man/curs_getstr.3x | 6 +# man/curs_getyx.3x | 139 ++++-- +# man/curs_inch.3x | 123 +++--- +# man/curs_mouse.3x | 13 +# man/curs_outopts.3x | 28 - +# man/curs_sp_funcs.3x | 4 +# man/curs_termattrs.3x | 6 +# man/curs_util.3x | 9 +# man/infocmp.1m | 7 +# man/infotocap.1m | 7 +# man/man_db.renames.in | 6 +# man/manhtml.aliases | 7 +# man/manhtml.externs | 3 +# man/ncurses.3x | 188 +++++---- +# man/term.5 | 427 +++++++++++++------- +# man/term.7 | 11 +# man/terminfo.head | 7 +# man/terminfo.tail | 8 +# man/tic.1m | 16 +# man/toe.1m | 7 +# man/tput.1 | 7 +# man/tset.1 | 7 +# ncurses/base/lib_newterm.c | 5 +# ncurses/curses.priv.h | 8 +# ncurses/tinfo/lib_setup.c | 6 +# ncurses/tinfo/tinfo_driver.c | 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 +# 72 files changed, 2329 insertions(+), 1868 deletions(-) +# ------------------------------------------------------------------------------ +Index: NEWS +Prereq: 1.4117 +--- ncurses-6.5-20240504+/NEWS 2024-05-04 18:43:01.000000000 +0000 ++++ ncurses-6.5-20240511/NEWS 2024-05-11 21:38:14.000000000 +0000 +@@ -26,7 +26,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.4117 2024/05/04 18:43:01 tom Exp $ ++-- $Id: NEWS,v 1.4119 2024/05/11 21:38:14 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. + ++20240511 ++ + improve formatting/style of manpages (patches by Branden Robinson). ++ + limit value from ESCDELAY environment variable to 30 seconds, like ++ other delay limits. ++ + limit values from LINES and COLUMNS environment variables to 512 ++ (report by Miroslav Lichvar). ++ + 20240504 + + update ncurses/wcwidth.c, for MinGW ports, from xterm. + + trim obsolete comment about tack from INSTALL. +Index: VERSION +--- ncurses-6.5-20240504+/VERSION 2024-05-04 10:21:09.000000000 +0000 ++++ ncurses-6.5-20240511/VERSION 2024-05-11 10:20:08.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.5 20240504 ++5:0:10 6.5 20240511 +Index: dist.mk +Prereq: 1.1611 +--- ncurses-6.5-20240504+/dist.mk 2024-05-04 10:21:09.000000000 +0000 ++++ ncurses-6.5-20240511/dist.mk 2024-05-11 10:20:08.000000000 +0000 +@@ -26,7 +26,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1611 2024/05/04 10:21:09 tom Exp $ ++# $Id: dist.mk,v 1.1612 2024/05/11 10:20: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 = 5 +-NCURSES_PATCH = 20240504 ++NCURSES_PATCH = 20240511 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: doc/html/man/curs_add_wch.3x.html +--- ncurses-6.5-20240504+/doc/html/man/curs_add_wch.3x.html 2024-04-27 18:38:45.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/curs_add_wch.3x.html 2024-05-11 22:32:32.000000000 +0000 +@@ -28,19 +28,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_add_wch.3x,v 1.62 2024/04/20 21:20:07 tom Exp @ ++ * @Id: curs_add_wch.3x,v 1.63 2024/05/11 21:31:45 tom Exp @ + --> + + + + + +-curs_add_wch 3x 2024-04-20 ncurses 6.5 Library calls ++curs_add_wch 3x 2024-05-11 ncurses 6.5 Library calls + + + + +-

curs_add_wch 3x 2024-04-20 ncurses 6.5 Library calls

++

curs_add_wch 3x 2024-05-11 ncurses 6.5 Library calls

+ 
+ curs_add_wch(3x)                 Library calls                curs_add_wch(3x)
+ 
+@@ -49,7 +49,7 @@
+ 
+

NAME

+        add_wch, wadd_wch, mvadd_wch, mvwadd_wch, echo_wchar, wecho_wchar - add
+-       a curses complex character to a window and advance the cursor
++       a curses complex character to a window, possibly advancing the cursor
+ 
+ 
+

SYNOPSIS

+@@ -66,55 +66,85 @@
+ 
+

DESCRIPTION

+ 
+-

add_wch

+-       The add_wch, wadd_wch, mvadd_wch,  and  mvwadd_wch  functions  put  the
+-       complex  character  wch  into the given window at its current position,
+-       which is then advanced.  These functions perform wrapping and  special-
+-       character processing as follows:
+-
+-       o   If  wch  refers to a spacing character, then any previous character
+-           at that location is removed.  A new character specified by  wch  is
+-           placed  at  that  location  with  rendition  specified by wch.  The
+-           cursor then advances after this spacing character, to  prepare  for
+-           writing the next character on the screen.
+-
+-           The newly added spacing character is the base of the active complex
+-           character.  Subsequent non-spacing characters can be combined  with
+-           this base until another spacing character is written to the screen,
+-           or the cursor is moved, e.g., using wmove.
+-
+-       o   If wch refers to a non-spacing character, it  is  appended  to  the
+-           active complex character, retaining the previous characters at that
+-           location.  The rendition specified by wch is ignored.
++

wadd_wch

++       wadd_wch writes the complex character wch to the window win,  then  may
++       advance  the  cursor  position, analogously to the standard C library's
++       putwchar(3).  ncurses(3x) describes the variants of this function.
++
++       Much behavior depends on whether the wide characters in wch are spacing
++       or non-spacing; see subsection "Complex Characters" below.
++
++       o   If  wch  contains  a  spacing  character, then any character at the
++           cursor is first removed.   The  complex  character  wch,  with  its
++           attributes  and  color  pair  identifier,  becomes  the base of the
++           active complex character.
++
++       o   If wch contains only non-spacing characters, they are combined with
++           the  active  complex  character.  curses ignores its attributes and
++           color pair identifier, and does not advance the cursor.
++
++       Further non-spacing characters added with wadd_wch are not  written  at
++       the  new  cursor position but combine with the active complex character
++       until another spacing character is written to the window or the  cursor
++       is moved.
++
++       If advancement occurs at the right margin,
++
++       o   the  cursor  automatically wraps to the beginning of the next line,
++           then,
++
++       o   if  it  was  at  the  bottom  of  the  scrolling  region,  and   if
++           scrollok(3x)  is  enabled  for win, the scrolling region scrolls up
++           one line.
++
++       If wch is a backspace, carriage return, line feed, or tab,  the  cursor
++       moves appropriately within the window.
++
++       o   Backspace  moves  the cursor one character left; at the left margin
++           of a window, it does nothing.
++
++       o   Carriage return moves the cursor to the left margin on the  current
++           line of the window.
++
++       o   Line  feed  does a clrtoeol(3x), then advances as if from the right
++           margin.
++
++       o   Tab advances the cursor to the next tab stop (possibly on the  next
++           line);  these  are placed at every eighth column by default.  Alter
++           the   tab   interval    with    the    TABSIZE    extension;    see
++           curs_variables(3x).
++
++       If  wch  is  any other nonprintable character, it is drawn in printable
++       form using the same convention as wunctrl(3x).
++
++       Calling win_wch(3x) on the location of a  nonprintable  character  does
++       not return the character itself, but its wunctrl(3x) representation.
++
++
++

wecho_wchar

++       echo_wchar   and  wecho_wchar  are  equivalent  to  calling  (w)add_wch
++       followed by (w)refresh.  curses interprets these functions  as  a  hint
++       that only a single (complex) character is being output; for non-control
++       characters, a considerable performance gain may be enjoyed by employing
++       them.
++
++
++

Forms-Drawing Characters

++       curses  defines  macros  starting  with  WACS_  that  can  be used with
++       wadd_wch to write line-drawing and  other  special  characters  to  the
++       screen.  ncurses terms these forms-drawing characters.  The ACS default
++       listed below is used if the acs_chars (acsc) terminfo  capability  does
++       not  define  a terminal-specific replacement for it, or if the terminal
++       and locale configuration requires Unicode to  access  these  characters
++       but  the  library  is  unable  to  use Unicode.  The "acsc char" column
++       corresponds to how the characters are specified in the acs_chars (acsc)
++       string capability, and the characters in it may appear on the screen if
++       the terminal type's database entry incorrectly advertises ACS  support.
++       The name "ACS" originates in the Alternate Character Set feature of the
++       DEC VT100 terminal.
+ 
+-           The cursor is not advanced after adding  a  non-spacing  character.
+-           Subsequent calls to add non-spacing characters will update the same
+-           position.
+-
+-       o   If the character part of wch is a tab, newline, backspace or  other
+-           control character, the window is updated and the cursor moves as if
+-           addch were called.
+-
+-
+-

echo_wchar

+-       The echo_wchar function is functionally equivalent to a call to add_wch
+-       followed  by  a  call  to  refresh(3x).   Similarly, the wecho_wchar is
+-       functionally equivalent to a call to wadd_wch followed  by  a  call  to
+-       wrefresh.   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  the *echo*
+-       functions instead of their equivalents.
+-
+-
+-

Line Graphics

+-       Like addch(3x), addch_wch accepts symbols which make it simple to  draw
+-       lines  and  other  frequently  used  special characters.  These symbols
+-       correspond to the same VT100 line-drawing set as addch(3x).
+-
+-                       Unicode   ASCII     acsc
+-
+-
+-       ACS Name        Default   Default   Char   Glyph Name
++                       Unicode   ACS       acsc
++       Symbol          Default   Default   char   Glyph Name
+        ------------------------------------------------------------------------
+        WACS_BLOCK      0x25ae    #         0      solid square block
+        WACS_BOARD      0x2592    #         h      board of squares
+@@ -179,7 +209,6 @@
+        WACS_D_LTEE       0x2560    +         F      double tee pointing right
+        WACS_D_PLUS       0x256c    +         E      double large plus
+        WACS_D_RTEE       0x2563    +         G      double tee pointing left
+-
+        WACS_D_TTEE       0x2566    +         I      double tee pointing down
+        WACS_D_ULCORNER   0x2554    +         C      double upper left corner
+        WACS_D_URCORNER   0x2557    +         B      double upper right corner
+@@ -198,124 +227,122 @@
+ 
+ 
+

RETURN VALUE

+-       All routines return the integer ERR upon failure and OK on success.
++       These functions return OK on success and ERR on failure.   In  ncurses,
++       wadd_wch returns ERR if
+ 
+-       X/Open  Curses  does  not   specify   any   error   conditions.    This
+-       implementation returns an error
++       o   win is NULL,
+ 
+-       o   if the window pointer is null or
++       o   wrapping  to  a new line is impossible because scrollok(3x) has not
++           been called on win when writing to its  bottom  right  location  is
++           attempted, or
+ 
+-       o   if it is not possible to add a complete character in the window.
++       o   it  is  not  possible  to  add  a  complete character at the cursor
++           position.
+ 
+-       The latter may be due to different causes:
++       Functions prefixed with "mv" first perform cursor movement and fail  if
++       the position (y, x) is outside the window boundaries.
+ 
+-       o   If  scrollok(3x)  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.
+ 
+-       o   If  an error is detected when converting a multibyte character to a
+-           sequence of bytes, or if it is not  possible  to  add  all  of  the
+-           resulting bytes in the window, an error is returned.
++

NOTES

++       add_wch,  mvadd_wch,  mvwadd_wch,  and echo_wchar may be implemented as
++       macros.
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
+-       the position (y, x) is outside the window boundaries.
+ 
++

EXTENSIONS

+ 
+-

NOTES

+-       Note that add_wch, mvadd_wch, mvwadd_wch, and echo_wchar may be macros.
++

TABSIZE

++       The TABSIZE variable is implemented  in  SVr4  and  other  versions  of
++       curses, but is not specified by X/Open Curses (see curs_variables(3x)).
+ 
+ 
+

PORTABILITY

+-       These functions are described in X/Open Curses, Issue 4.  The  defaults
+-       specified for line-drawing characters apply in the POSIX locale.
++       These  functions are described in X/Open Curses, Issue 4.  It specifies
++       no error conditions for them.
+ 
++       SVr4 curses describes a successful return value  only  as  "an  integer
++       value other than ERR".
+ 
+-

WACS Symbols

+-       X/Open  Curses  makes it clear that the WACS_ symbols should be defined
+-       as a pointer to cchar_t data, e.g., in the discussion of border_set.  A
+-       few implementations are problematic:
++       The  defaults specified for forms-drawing characters apply in the POSIX
++       locale.  X/Open Curses makes it clear that the WACS_ symbols should  be
++       defined  as  a  pointer  to  cchar_t  data,  e.g., in the discussion of
++       border_set.  A few implementations are problematic:
+ 
+        o   NetBSD curses defines the symbols as a wchar_t within a cchar_t.
+ 
+-       o   HP-UX  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
++       o   HP-UX 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.
+ 
+-       X/Open Curses does not specify  symbols  for  thick-  or  double-lines.
++       X/Open  Curses  does  not  specify  symbols for thick- or double-lines.
+        SVr4 curses implementations defined their line-drawing symbols in terms
+-       of intermediate symbols.  This implementation  extends  those  symbols,
++       of  intermediate  symbols.   This implementation extends those symbols,
+        providing new definitions which are not in the SVr4 implementations.
+ 
+-       Not  all  Unicode-capable  terminals  provide  support  for VT100-style
+-       alternate character  sets  (i.e.,  the  acsc  capability),  with  their
+-       corresponding  line-drawing  characters.  X/Open Curses did not address
+-       the  aspect  of  integrating  Unicode  with  line-drawing   characters.
+-       Existing  implementations of Unix curses (AIX, HP-UX, Solaris) use only
++       Not all  Unicode-capable  terminals  provide  support  for  VT100-style
++       alternate  character  sets  (i.e.,  the  acsc  capability),  with their
++       corresponding line-drawing characters.  X/Open Curses did  not  address
++       the   aspect  of  integrating  Unicode  with  line-drawing  characters.
++       Existing implementations of Unix curses (AIX, HP-UX, Solaris) use  only
+        the acsc character-mapping to provide this feature.  As a result, those
+        implementations  can  only  use  single-byte  line-drawing  characters.
+-       ncurses 5.3 (2002) provided a table of Unicode values  to  solve  these
++       ncurses  5.3  (2002)  provided a table of Unicode values to solve these
+        problems.  NetBSD curses incorporated that table in 2010.
+ 
+-       In  this  implementation,  the  Unicode  values are used instead of the
++       In this implementation, the Unicode values  are  used  instead  of  the
+        terminal description's acsc mapping as discussed in ncurses(3x) for the
+-       environment  variable  NCURSES_NO_UTF8_ACS.   In contrast, for the same
++       environment variable NCURSES_NO_UTF8_ACS.  In contrast,  for  the  same
+        cases, the line-drawing characters described in addch(3x) will use only
+        the ASCII default values.
+ 
+-       Having  Unicode available does not solve all of the problems with line-
++       Having Unicode available does not solve all of the problems with  line-
+        drawing for curses:
+ 
+-       o   The closest Unicode equivalents to the VT100 graphics  S1,  S3,  S7
+-           and  S9 frequently are not displayed at the regular intervals which
++       o   The  closest  Unicode  equivalents to the VT100 graphics S1, S3, S7
++           and S9 frequently are not displayed at the regular intervals  which
+            the terminal used.
+ 
+-       o   The lantern is a special case.  It originated with  the  AT&T  4410
+-           terminal  in the early 1980s.  There is no accessible documentation
++       o   The  lantern  is  a special case.  It originated with the AT&T 4410
++           terminal in the early 1980s.  There is no accessible  documentation
+            depicting the lantern symbol on the AT&T terminal.
+ 
+            Lacking documentation, most readers assume that a storm lantern was
+            intended.  But there are several possibilities, all with problems.
+ 
+-           Unicode  6.0  (2010)  does provide two lantern symbols: U+1F383 and
+-           U+1F3EE.  Those were not available  in  2002,  and  are  irrelevant
+-           since  they  lie  outside the BMP and as a result are not generally
++           Unicode 6.0 (2010) does provide two lantern  symbols:  U+1F383  and
++           U+1F3EE.   Those  were  not  available  in 2002, and are irrelevant
++           since they lie outside the BMP and as a result  are  not  generally
+            available in terminals.  They are not storm lanterns, in any case.
+ 
+            Most storm lanterns have a tapering glass chimney (to guard against
+            tipping); some have a wire grid protecting the chimney.
+ 
+-           For  the  tapering  appearance,   U+2603 was adequate.  In use on a
++           For the tapering appearance,  U+2603 was adequate.   In  use  on  a
+            terminal, no one can tell what the image represents.  Unicode calls
+            it a snowman.
+ 
+            Others have suggested these alternatives: <section> U+00A7 (section
+-           mark), <Theta> U+0398 (theta), <Phi> U+03A6 (phi),  <delta>  U+03B4
++           mark),  <Theta>  U+0398 (theta), <Phi> U+03A6 (phi), <delta> U+03B4
+            (delta),  U+2327 (x in a rectangle),  U+256C (forms double vertical
+            and horizontal), and  U+2612 (ballot box with x).
+ 
+ 
+

Complex Characters

+-       The complex character  type  cchar_t  can  store  more  than  one  wide
+-       character  (wchar_t).   The  X/Open Curses description does not mention
+-       this possibility, describing only the cases  where  wch  is  a  spacing
+-       character or a non-spacing character.
++       The  complex  character  type  cchar_t  can  store  more  than one wide
++       character (wchar_t).  X/Open Curses does not mention this  possibility,
++       specifying  behavior  only  where  wch  is  a  single character, either
++       spacing or non-spacing.
+ 
+-       This implementation assumes that wch is constructed using setcchar(3x),
+-       and in turn that the result
++       ncurses assumes that wch is constructed using setcchar(3x), and in turn
++       that the result
+ 
+-       o   contains at most one spacing character in the beginning of its list
+-           of wide characters, and zero or more non-spacing characters or
++       o   contains at most one spacing character at the beginning of its list
++           of wide characters, and zero or more non-spacing characters, or
+ 
+-       o   may hold one non-spacing character.
++       o   holds one non-spacing character.
+ 
+-       In  the  latter  case,  ncurses  adds  the non-spacing character to the
+-       active (base) spacing character.
+-
+-
+-

TABSIZE

+-       The TABSIZE variable is implemented  in  SVr4  and  other  versions  of
+-       curses, but is not specified by X/Open Curses (see curs_variables(3x)).
++       In the latter case, ncurses  adds  the  non-spacing  character  to  the
++       active complex character.
+ 
+ 
+

SEE ALSO

+@@ -328,7 +355,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                  curs_add_wch(3x)
++ncurses 6.5                       2024-05-11                  curs_add_wch(3x)
+
+
+
    +@@ -336,18 +363,21 @@ +
  • SYNOPSIS
    • +
  • DESCRIPTION + +
    • +
  • RETURN VALUE
    • +
  • NOTES
    • ++
  • EXTENSIONS ++ ++
    • +
  • PORTABILITY + +
    • +
  • SEE ALSO
    • +Index: doc/html/man/curs_add_wchstr.3x.html +--- ncurses-6.5-20240504+/doc/html/man/curs_add_wchstr.3x.html 2024-04-27 18:38:45.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/curs_add_wchstr.3x.html 2024-05-11 22:32:32.000000000 +0000 +@@ -27,19 +27,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_add_wchstr.3x,v 1.39 2024/04/20 21:20:07 tom Exp @ ++ * @Id: curs_add_wchstr.3x,v 1.40 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-curs_add_wchstr 3x 2024-04-20 ncurses 6.5 Library calls ++curs_add_wchstr 3x 2024-05-11 ncurses 6.5 Library calls + + + + +-

    curs_add_wchstr 3x 2024-04-20 ncurses 6.5 Library calls

    ++

    curs_add_wchstr 3x 2024-05-11 ncurses 6.5 Library calls

    + 
    + curs_add_wchstr(3x)              Library calls             curs_add_wchstr(3x)
+ 
+@@ -67,53 +67,50 @@
+ 
+ 
+

    DESCRIPTION

    +-       These  functions copy the (null-terminated) array of complex characters
+-       wchstr into the window image structure starting at the  current  cursor
+-       position.
++       wadd_wchstr  copies  the  string  of  complex  characters wchstr to the
++       window win.  A null complex character  terminates  the  string.   If  a
++       complex  character  does  completely fit at the end of the line, curses
++       fills the remaining columns with the window background; see bkgrnd(3x).
++       wadd_wchnstr does the same, but copies at most n characters, or as many
++       as possible if n is -1.  ncurses(3x) describes the  variants  of  these
++       functions.
++
++       Because  these  functions do not call wadd_wch(3x) internally, they are
++       faster than waddwstr(3x) and waddnwstr(3x).  On the other hand, they
++
++       o   do  not  treat  the  backspace,  carriage  return,  or  line   feed
++           characters specially;
+ 
+-       The four functions with n as the last argument copy at most n elements,
+-       but no more than will fit on the line.  If n=-1 then the whole array is
+-       copied, to the maximum number of characters that will fit on the line.
++       o   do not represent unprintable characters with wunctrl(3x);
+ 
+-       The  window  cursor  is  not advanced.  These functions are faster than
+-       waddnstr.  On the other hand:
++       o   do  not  update  the  cursor  position to follow the last character
++           written;
+ 
+-       o   they do not perform checking (such as for the  newline,  backspace,
+-           or carriage return characters),
+-
+-       o   they do not advance the current cursor position,
+-
+-       o   they do not expand other control characters to ^-escapes, and
+-
+-       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
+-       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.
++       o   truncate the string at  the  window's  right  margin,  rather  than
++           wrapping it to the next line and potentially scrolling.
+ 
+ 
+

    RETURN VALUE

    +-       All functions return the integer ERR upon failure and OK on success.
++       These functions return OK on success and ERR on failure.
+ 
+-       X/Open   Curses   does   not   specify   any  error  conditions.   This
+-       implementation returns an error
++       X/Open  Curses  does not specify any error conditions.  ncurses returns
++       ERR if
+ 
+-       o   if the win parameter is null or
++       o   win is NULL or
+ 
+-       o   if the wchstr parameter is null.
++       o   wchstr is NULL.
+ 
+        Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+

    NOTES

    +-       All functions except wadd_wchnstr may be macros.
++       All  of  these  functions  except  wadd_wchnstr  may  be implemented as
++       macros.
+ 
+ 
+

    PORTABILITY

    +-       These functions are described in X/Open Curses, Issue 4.
++       X/Open Curses, Issue 4 describes these functions.
+ 
+ 
+

    SEE ALSO

    +@@ -124,7 +121,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20               curs_add_wchstr(3x)
++ncurses 6.5                       2024-05-11               curs_add_wchstr(3x)
+
    +
    +
      +Index: doc/html/man/curs_addch.3x.html +--- ncurses-6.5-20240504+/doc/html/man/curs_addch.3x.html 2024-04-27 18:38:45.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/curs_addch.3x.html 2024-05-11 21:39:56.000000000 +0000 +@@ -28,19 +28,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_addch.3x,v 1.85 2024/04/20 19:03:47 tom Exp @ ++ * @Id: curs_addch.3x,v 1.86 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-curs_addch 3x 2024-04-20 ncurses 6.5 Library calls ++curs_addch 3x 2024-05-11 ncurses 6.5 Library calls + + + + +-

      curs_addch 3x 2024-04-20 ncurses 6.5 Library calls

      ++

      curs_addch 3x 2024-05-11 ncurses 6.5 Library calls

      + 
      + curs_addch(3x)                   Library calls                  curs_addch(3x)
+ 
+@@ -66,71 +66,70 @@
+ 
+

      DESCRIPTION

      + 
+-

      Adding Characters

      +-       waddch puts the character ch at the cursor position of window win, then
+-       advances  the  cursor position, analogously to the standard C library's
++

      waddch

      ++       waddch writes the curses character ch to the window win, then  advances
++       the   cursor   position,   analogously  to  the  standard  C  library's
+        putchar(3).  ncurses(3x) describes the variants of this function.
+ 
+        If advancement occurs at the right margin,
+ 
+-       o   the cursor automatically wraps to the beginning of the  next  line;
+-           and
++       o   the cursor automatically wraps to the beginning of the  next  line,
++           then,
+ 
+-       o   at  the bottom of the current scrolling region, and if scrollok(3x)
+-           is enabled for win, the scrolling region scrolls up one line.
++       o   if   it  was  at  the  bottom  of  the  scrolling  region,  and  if
++           scrollok(3x) is enabled for win, the scrolling  region  scrolls  up
++           one line.
+ 
+-       If ch is a backspace, carriage return, line feed, or  tab,  the  cursor
++       If  ch  is  a backspace, carriage return, line feed, or tab, the cursor
+        moves appropriately within the window.
+ 
+-       o   Backspace  moves  the cursor one character left; at the left margin
++       o   Backspace moves the cursor one character left; at the  left  margin
+            of a window, it does nothing.
+ 
+-       o   Carriage return moves the cursor to the left margin on the  current
++       o   Carriage  return moves the cursor to the left margin on the current
+            line of the window.
+ 
+-       o   Line  feed  does  a clrtoeol(3x), then moves the cursor to the left
+-           margin on the next line of  the  window,  and  if  scrollok(3x)  is
+-           enabled  for  win,  scrolls the window if the cursor was already on
+-           the last line.
+-
+-       o   Tab advances the cursor to the next tab stop (possibly on the  next
+-           line);  these  are placed at every eighth column by default.  Alter
+-           the   tab   interval    with    the    TABSIZE    extension;    see
++       o   Line feed does a clrtoeol(3x), then advances as if from  the  right
++           margin.
++
++       o   Tab  advances the cursor to the next tab stop (possibly on the next
++           line); these are placed at every eighth column by  default.   Alter
++           the    tab    interval    with    the    TABSIZE   extension;   see
+            curs_variables(3x).
+ 
+-       If  ch  is  any  other nonprintable character, it is drawn in printable
+-       form, using the same convention as unctrl(3x).
++       If ch is any other nonprintable character, it  is  drawn  in  printable
++       form using the same convention as unctrl(3x).
+ 
+-       Calling winch(3x) on the location of a nonprintable character does  not
++       Calling  winch(3x) on the location of a nonprintable character does not
+        return the character itself, but its unctrl(3x) representation.
+ 
+-       ch  may  contain  rendering  and/or color attributes, and others can be
+-       combined with the parameter by logically "or"ing with it.  (A character
+-       with  its  attributes can be copied from place to place using winch(3x)
+-       and  waddch.)   See  curs_attr(3x)  for  values  of  predefined   video
+-       attribute constants that can be usefully "or"ed with characters.
++       The object or expression ch may contain attributes and/or a color  pair
++       identifier.   (A character with its attributes can be copied from place
++       to place using winch(3x) and waddch.)  See curs_attr(3x) for values  of
++       predefined  video  attribute constants that can be usefully "or"ed with
++       characters.
+ 
+ 
+-

      Echoing Characters

      +-       echochar  and  wechochar are equivalent to calling (w)addch followed by
+-       (w)refresh.  curses interprets these functions as a hint  that  only  a
++

      wechochar

      ++       echochar and wechochar are equivalent to calling (w)addch  followed  by
++       (w)refresh.   curses  interprets  these functions as a hint that only a
+        single  character  is  being  output;  for  non-control  characters,  a
+        considerable performance gain may be enjoyed by employing them.
+ 
+ 
+

      Forms-Drawing Characters

      +-       curses defines macros starting with ACS_ that can be used  with  waddch
+-       to  write  line-drawing  and  other  special  characters to the screen.
+-       ncurses terms these forms-drawing characters.  The ACS  default  listed
+-       below  is  used  if  the  acs_chars (acsc) terminfo capability does not
+-       define a terminal-specific replacement for it, or if the  terminal  and
+-       locale  configuration  requires  Unicode to access these characters but
++       curses  defines  macros starting with ACS_ that can be used with waddch
++       to write line-drawing and  other  special  characters  to  the  screen.
++       ncurses  terms  these forms-drawing characters.  The ACS default listed
++       below is used if the acs_chars  (acsc)  terminfo  capability  does  not
++       define  a  terminal-specific replacement for it, or if the terminal and
++       locale configuration requires Unicode to access  these  characters  but
+        the  library  is  unable  to  use  Unicode.   The  "acsc  char"  column
+-       corresponds to how the characters are specified in the acs_chars string
+-       capability, and the characters in it may appear on the  screen  if  the
+-       terminal's database entry incorrectly advertises ACS support.  The name
+-       "ACS" originates in the Alternate Character  Set  feature  of  the  DEC
+-       VT100 terminal.
++       corresponds to how the characters are specified in the acs_chars (acsc)
++       string capability, and the characters in it may appear on the screen if
++       the terminal type's database entry incorrectly advertises ACS  support.
++       The name "ACS" originates in the Alternate Character Set feature of the
++       DEC VT100 terminal.
+ 
+                       ACS       acsc
+        Symbol         Default   char   Glyph Name
+@@ -172,16 +171,25 @@
+

      RETURN VALUE

      +        These functions return OK on success and ERR on failure.
+ 
+-       In  ncurses, waddch returns ERR if it is not possible to add a complete
+-       character at the cursor position, as when  conversion  of  a  multibyte
+-       character  to  a  byte sequence fails, or at least one of the resulting
+-       bytes cannot be added to the window.  See section  "PORTABILITY"  below
+-       regarding the use of waddch with multibyte characters.
+-
+-       waddch  can successfully write a character at the bottom right location
+-       of the window.  However, ncurses returns ERR  if  scrollok(3x)  is  not
+-       enabled  in  that  event,  because  it is not possible to wrap to a new
+-       line.
++       In ncurses, waddch returns ERR if
++
++       o   win is NULL,
++
++       o   wrapping to a new line is impossible because scrollok(3x)  has  not
++           been  called  on  win  when a write to its bottom right location is
++           attempted, or
++
++       o   it is not possible to  add  a  complete  character  at  the  cursor
++           position.
++
++       The last may be due to different causes:
++
++       o   conversion of a multibyte character to a byte sequence can fail, or
++
++       o   at  least  one  of  the  bytes  resulting  from  conversion  from a
++           multibyte sequence cannot be added  to  the  window.   See  section
++           "PORTABILITY"  below  regarding  the  use  of waddch with multibyte
++           characters.
+ 
+        Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+@@ -191,14 +199,21 @@
+        addch, mvaddch, mvwaddch, and echochar may be implemented as macros.
+ 
+ 
++

      EXTENSIONS

      ++
++

      TABSIZE

      ++       SVr4  and  other versions of curses implement the TABSIZE variable, but
++       X/Open Curses does not specify it; see curs_variables(3x).
++
++
+

      PORTABILITY

      +-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
++       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+        error conditions for them.
+ 
+-       SVr4 curses describes a successful return value  only  as  "an  integer
++       SVr4  curses  describes  a  successful return value only as "an integer
+        value other than ERR".
+ 
+-       The  defaults specified for forms-drawing characters apply in the POSIX
++       The defaults specified for forms-drawing characters apply in the  POSIX
+        locale.
+ 
+ 
+@@ -207,89 +222,82 @@
+ 
+        Some implementations are problematic.
+ 
+-       o   Solaris curses, for example, define the ACS symbols  as  constants;
++       o   Solaris  curses, for example, defines the ACS symbols as constants;
+            others define them as elements of an array.
+ 
+-           This  implementation  uses  an  array, acs_map, as did SVr4 curses.
++           This implementation uses an array, acs_map,  as  did  SVr4  curses.
+            NetBSD also uses an array, actually named _acs_char, with a #define
+            for compatibility.
+ 
+-       o   HP-UX  curses  equates  some  of  the ACS_ symbols to the analogous
+-           WACS_ symbols as if the ACS_  symbols  were  wide  characters  (see
+-           curs_add_wch(3x)).   The  misdefined  symbols  are  the  arrows and
++       o   HP-UX curses equates some of the  ACS_  symbols  to  the  analogous
++           WACS_  symbols  as  if  the  ACS_ symbols were wide characters (see
++           curs_add_wch(3x)).  The  misdefined  symbols  are  the  arrows  and
+            others that are not used for line drawing.
+ 
+-       o   X/Open Curses (Issues 2 through 7) has a  typographical  error  for
+-           the  ACS_LANTERN  symbol,  equating  its  "VT100+ Character" to "I"
+-           (capital I), while the header  files  for  SVr4  curses  and  other
++       o   X/Open  Curses  (Issues  2 through 7) has a typographical error for
++           the ACS_LANTERN symbol, equating  its  "VT100+  Character"  to  "I"
++           (capital  I),  while  the  header  files  for SVr4 curses and other
+            implementations use "i" (small i).
+ 
+-           None  of  the terminal descriptions on Unix platforms use uppercase
+-           I, except  for  Solaris  (in  its  terminfo  entry  for  screen(1),
+-           apparently  based on the X/Open documentation around 1995).  On the
+-           other hand, its gs6300 (AT&T PC6300 with EMOTS  Terminal  Emulator)
++           None of the terminal descriptions on Unix platforms  use  uppercase
++           I,  except  for  Solaris  (in  its  terminfo  entry  for screen(1),
++           apparently based on the X/Open documentation around 1995).  On  the
++           other  hand,  its gs6300 (AT&T PC6300 with EMOTS Terminal Emulator)
+            description uses lowercase i.
+ 
+-       Some  ACS  symbols  (ACS_S3,  ACS_S7,  ACS_LEQUAL,  ACS_GEQUAL, ACS_PI,
+-       ACS_NEQUAL, and ACS_STERLING)  were  not  documented  in  any  publicly
+-       released  System V.   However, many publicly available terminfo entries
+-       include acsc strings  in  which  their  key  characters  (pryz{|})  are
+-       embedded,  and  a  second-hand list of their character descriptions has
+-       come to light.  The ncurses developers invented ACS-prefixed names  for
++       Some ACS  symbols  (ACS_S3,  ACS_S7,  ACS_LEQUAL,  ACS_GEQUAL,  ACS_PI,
++       ACS_NEQUAL,  and  ACS_STERLING)  were  not  documented  in any publicly
++       released System V.  However, many publicly available  terminfo  entries
++       include  acsc  capabilities in which their key characters (pryz{|}) are
++       embedded, and a second-hand list of their  character  descriptions  has
++       come  to light.  The ncurses developers invented ACS-prefixed names for
+        them.
+ 
+        The displayed values of ACS_ constants depend on
+ 
+        o   the  ncurses  ABI--for  example,  wide-character  versus  non-wide-
+-           character configurations  (the  former  is  capable  of  displaying
++           character  configurations  (the  former  is  capable  of displaying
+            Unicode while the latter is not), and
+ 
+        o   whether the locale uses UTF-8 encoding.
+ 
+-       In  certain  cases,  the  terminal  is  unable to display forms-drawing
+-       characters  except  by  using  UTF-8;  see  the   discussion   of   the
+-       NCURSES_NO_UTF8_ACS environment variable in ncurses(3x)).
++       In certain cases, the  terminal  is  unable  to  display  forms-drawing
++       characters   except   by   using  UTF-8;  see  the  discussion  of  the
++       NCURSES_NO_UTF8_ACS environment variable in ncurses(3x).
+ 
+ 
+

      Character Set

      +-       X/Open  Curses  assumes  that the parameter passed to waddch contains a
+-       single character.  As discussed in curs_attr(3x),  that  character  may
+-       have  been more than eight bits wide in an SVr3 or SVr4 implementation,
+-       but in the X/Open  Curses  model,  the  details  are  not  given.   The
+-       important distinction between SVr4 curses and X/Open Curses is that the
+-       latter separates non-character information (attributes and color)  from
+-       the  character  code,  which  SVr4  packs  into a chtype for passage to
+-       waddch.
+-
+-       In ncurses, chtype holds  an  eight-bit  character.   But  the  library
+-       allows  a  multibyte character to be passed in a succession of calls to
+-       waddch.  Other implementations do not; a waddch call transmits  exactly
+-       one  character,  which  may be rendered in one or more screen locations
+-       depending on whether it is printable.
+-
+-       Depending on the locale settings, ncurses inspects the byte  passed  in
+-       each  waddch  call,  and  checks  whether  the  latest call continues a
+-       multibyte sequence.  When a character is complete, ncurses displays the
+-       character and advances the cursor.
+-
+-       If  the  calling  application  interrupts  the succession of bytes in a
+-       multibyte character sequence  by  changing  the  current  location--for
++       X/Open Curses assumes that the parameter passed to  waddch  contains  a
++       single  character.   That  character may have been more than eight bits
++       wide in an SVr3 or SVr4 implementation, but X/Open  Curses  leaves  the
++       width  of  a non-wide character code unspecified.  The standard further
++       does not specify the internal structure of a chtype, though the use  of
++       bit  operations  to  combine  the  character code with attributes and a
++       color pair identifier into a chtype for passage to waddch is common.  A
++       portable application uses only the macros discussed in curs_attr(3x) to
++       manipulate a chtype.
++
++       In ncurses, chtype holds an eight-bit character, but the library allows
++       a  multibyte character to be passed in a succession of calls to waddch.
++       Other implementations do not;  a  waddch  call  transmits  exactly  one
++       character,  which  may  be  rendered  in  one  or more screen locations
++       depending on whether it is printable (see  unctrl(3x)).   Depending  on
++       the  locale,  ncurses  inspects the byte passed in each waddch call and
++       checks whether the latest call continues a multibyte sequence.  When  a
++       character  is complete, ncurses displays the character and advances the
++       cursor.  If the calling application interrupts the succession of  bytes
++       in a multibyte character sequence by changing the current location--for
+        example, with wmove(3x)--ncurses discards the incomplete character.
+ 
+-       For  portability  to  other  implementations,  do  not  rely  upon this
+-       behavior.  Check whether a character can be  represented  as  a  single
+-       byte in the current locale.
++       For  portability  to  other  implementations,  do  not  rely  upon  the
++       foregoing  behavior.  Check whether a character can be represented as a
++       single byte in the current locale.
+ 
+        o   If it can, call either waddch or wadd_wch(3x).
+ 
+        o   If it cannot, use only wadd_wch(3x).
+ 
+ 
+-

      TABSIZE

      +-       SVr4  and  other versions of curses implement the TABSIZE variable, but
+-       X/Open Curses does not specify it (see curs_variables(3x)).
+-
+-
+

      SEE ALSO

      +        curs_add_wch(3x) describes comparable functions of the ncurses  library
+        in its wide-character configuration (ncursesw).
+@@ -300,7 +308,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                    curs_addch(3x)
++ncurses 6.5                       2024-05-11                    curs_addch(3x)
+
      +
      +
        +@@ -308,18 +316,22 @@ +
      • SYNOPSIS
        • +
      • DESCRIPTION + +
        • +
      • RETURN VALUE
        • +
      • NOTES
        • ++
      • EXTENSIONS ++ ++
        • +
      • PORTABILITY + +
        • +
      • SEE ALSO
        • +Index: doc/html/man/curs_addchstr.3x.html +--- ncurses-6.5-20240504+/doc/html/man/curs_addchstr.3x.html 2024-04-27 18:38:45.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/curs_addchstr.3x.html 2024-05-11 22:32:32.000000000 +0000 +@@ -27,19 +27,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_addchstr.3x,v 1.45 2024/04/20 21:20:07 tom Exp @ ++ * @Id: curs_addchstr.3x,v 1.46 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-curs_addchstr 3x 2024-04-20 ncurses 6.5 Library calls ++curs_addchstr 3x 2024-05-11 ncurses 6.5 Library calls + + + + +-

        curs_addchstr 3x 2024-04-20 ncurses 6.5 Library calls

        ++

        curs_addchstr 3x 2024-05-11 ncurses 6.5 Library calls

        + 
        + curs_addchstr(3x)                Library calls               curs_addchstr(3x)
+ 
+@@ -66,47 +66,46 @@
+ 
+ 
+

        DESCRIPTION

        +-       These functions copy the (null-terminated) chstr array into the  window
+-       image structure starting at the current cursor position.
++       waddchstr copies the string of curses characters chstr  to  the  window
++       win.   A  null curses character terminates the string.  waddchnstr does
++       the same, but copies at most n characters, or as many as possible if  n
++       is -1.  ncurses(3x) describes the variants of these functions.
+ 
+-       The four functions with n as the last argument copy at most n elements,
+-       but no more than will fit on the line.  If n=-1 then the whole array is
+-       copied, to the maximum number of characters that will fit on the line.
++       Because  these  functions  do  not call waddch(3x) internally, they are
++       faster than waddstr(3x) and waddnstr(3x).  On the other hand, they
+ 
+-       The  window  cursor  is  not advanced.  These functions are faster than
+-       waddnstr.  On the other hand:
++       o   do  not  treat  the  backspace,  carriage  return,  or  line   feed
++           characters specially;
+ 
+-       o   they do not perform checking (such as for the  newline,  backspace,
+-           or carriage return characters),
++       o   do not represent unprintable characters with unctrl(3x);
+ 
+-       o   they do not advance the current cursor position,
++       o   do  not  update  the  cursor  position to follow the last character
++           written;
+ 
+-       o   they do not expand other control characters to ^-escapes, and
+-
+-       o   they  truncate  the  string  if it crosses the right margin, rather
+-           than wrapping it around to the new line.
++       o   truncate the string at  the  window's  right  margin,  rather  than
++           wrapping it to the next line and potentially scrolling.
+ 
+ 
+

        RETURN VALUE

        +-       All functions return the integer ERR upon failure and OK on success.
++       These functions return OK on success and ERR on failure.
+ 
+-       X/Open  Curses  does  not   specify   any   error   conditions.    This
+-       implementation returns an error
++       X/Open  Curses  does not specify any error conditions.  ncurses returns
++       ERR if
+ 
+-       o   if the win parameter is null or
++       o   win is NULL or
+ 
+-       o   if the wchstr parameter is null.
++       o   chstr is NULL.
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
++       Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+

        NOTES

        +-       All functions except waddchnstr may be macros.
++       All of these functions except waddchnstr may be implemented as macros.
+ 
+ 
+

        PORTABILITY

        +-       These functions are described in X/Open Curses, Issue 4.
++       X/Open Curses, Issue 4 describes these functions.
+ 
+ 
+

        SEE ALSO

        +@@ -117,7 +116,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                 curs_addchstr(3x)
++ncurses 6.5                       2024-05-11                 curs_addchstr(3x)
+
        +
        +
          +Index: doc/html/man/curs_attr.3x.html +--- ncurses-6.5-20240504+/doc/html/man/curs_attr.3x.html 2024-04-27 18:38:46.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/curs_attr.3x.html 2024-05-11 21:39:56.000000000 +0000 +@@ -28,19 +28,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_attr.3x,v 1.105 2024/04/27 17:54:42 tom Exp @ ++ * @Id: curs_attr.3x,v 1.106 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-curs_attr 3x 2024-04-27 ncurses 6.5 Library calls ++curs_attr 3x 2024-05-11 ncurses 6.5 Library calls + + + + +-

          curs_attr 3x 2024-04-27 ncurses 6.5 Library calls

          ++

          curs_attr 3x 2024-05-11 ncurses 6.5 Library calls

          + 
          + curs_attr(3x)                    Library calls                   curs_attr(3x)
+ 
+@@ -220,6 +220,10 @@
+               A_CHARTEXT     Bit-mask to extract a character
+               A_COLOR        Bit-mask to extract a color (legacy routines)
+ 
++       You can thus use A_CHARTEXT to extract the  character  from  a  chtype,
++       A_ATTRIBUTES  to  obtain  its rendering attributes, and A_COLOR to find
++       the color pair it uses.
++
+        These video attributes are supported by attr_on and  related  functions
+        (which also support the attributes recognized by attron, etc.):
+ 
+@@ -332,7 +336,6 @@
+               WA_BLINK        Blinking
+               WA_DIM          Half bright
+               WA_BOLD         Extra bright or bold
+-
+               WA_ALTCHARSET   Alternate character set
+ 
+        X/Open Curses does not assign values to  these  symbols,  nor  does  it
+@@ -497,7 +500,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-27                     curs_attr(3x)
++ncurses 6.5                       2024-05-11                     curs_attr(3x)
+
          +
          +
            +Index: doc/html/man/curs_delch.3x.html +--- ncurses-6.5-20240504+/doc/html/man/curs_delch.3x.html 2024-04-27 18:38:46.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/curs_delch.3x.html 2024-05-11 21:39:56.000000000 +0000 +@@ -27,19 +27,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_delch.3x,v 1.34 2024/04/20 19:24:14 tom Exp @ ++ * @Id: curs_delch.3x,v 1.35 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-curs_delch 3x 2024-04-20 ncurses 6.5 Library calls ++curs_delch 3x 2024-05-11 ncurses 6.5 Library calls + + + + +-

            curs_delch 3x 2024-04-20 ncurses 6.5 Library calls

            ++

            curs_delch 3x 2024-05-11 ncurses 6.5 Library calls

            + 
            + curs_delch(3x)                   Library calls                  curs_delch(3x)
+ 
+@@ -61,14 +61,13 @@
+ 
+ 
+

            DESCRIPTION

            +-       wdelch  deletes  the  character  at  the  cursor   position   in   win.
+-       ncurses(3x) describes the variants of this function.
+-
+-       wdelch moves all characters to the right of the cursor on the same line
+-       to the left one position and replaces the  contents  of  the  rightmost
+-       position  on  the  line with the window's blank character; see bkgd(3x)
+-       (wide-character API users may consult bkgrnd(3x) instead).  The  cursor
+-       position does not change (after moving to (y, x), if specified).
++       wdelch deletes the character at the cursor position in win.   It  moves
++       all  characters to the right of the cursor on the same line to the left
++       one position and replaces the contents of the rightmost position on the
++       line  with  the  window's blank character; see bkgd(3x) (wide-character
++       API users: bkgrnd(3x)).  The cursor position  does  not  change  (after
++       moving to (y, x), if specified).  ncurses(3x) describes the variants of
++       this function.
+ 
+ 
+

            RETURN VALUE

            +@@ -76,19 +75,20 @@
+ 
+        Functions taking a WINDOW pointer argument fail if the pointer is NULL.
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
++       Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+

            NOTES

            +        delch, mvdelch, and mvwdelch may be implemented as macros.
+ 
+-       A terminal's delete_character  (dch1)  capability  is  not  necessarily
++       A  terminal's  delete_character  (dch1)  capability  is not necessarily
+        employed.
+ 
+ 
+

            PORTABILITY

            +-       X/Open Curses, Issue 4 describes these functions.
++       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
++       error conditions for them.
+ 
+        SVr4  curses  describes  a  successful return value only as "an integer
+        value other than ERR".
+@@ -99,7 +99,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                    curs_delch(3x)
++ncurses 6.5                       2024-05-11                    curs_delch(3x)
+
            +
            +
              +Index: doc/html/man/curs_get_wch.3x.html +--- ncurses-6.5-20240504+/doc/html/man/curs_get_wch.3x.html 2024-04-27 18:38:46.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/curs_get_wch.3x.html 2024-05-11 21:39:56.000000000 +0000 +@@ -27,19 +27,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_get_wch.3x,v 1.40 2024/04/20 19:23:03 tom Exp @ ++ * @Id: curs_get_wch.3x,v 1.41 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-curs_get_wch 3x 2024-04-20 ncurses 6.5 Library calls ++curs_get_wch 3x 2024-05-11 ncurses 6.5 Library calls + + + + +-

              curs_get_wch 3x 2024-04-20 ncurses 6.5 Library calls

              ++

              curs_get_wch 3x 2024-05-11 ncurses 6.5 Library calls

              + 
              + curs_get_wch(3x)                 Library calls                curs_get_wch(3x)
+ 
+@@ -65,47 +65,49 @@
+

              DESCRIPTION

              + 
+

              Reading Characters

              +-       wget_wch gathers a key stroke wch from the terminal keyboard associated
+-       with  a  curses  window  win, returning OK if a wide character is read,
++       wget_wch gathers a key event from the terminal keyboard associated with
++       a  curses  window  win,  returning  OK  if  a  wide  character is read,
+        KEY_CODE_YES if a function key is read, and ERR  if  no  key  event  is
+        available.  ncurses(3x) describes the variants of this function.
+ 
+        When  input  is pending, wget_wch stores an integer identifying the key
+-       stroke in wch;  for  alphanumeric  and  punctuation  keys,  this  value
++       event in  wch;  for  alphanumeric  and  punctuation  keys,  this  value
+        corresponds to the character encoding used by the terminal.  Use of the
+-       control key as a modifier  often  results  in  a  distinct  code.   The
+-       behavior  of  other  keys depends on whether win is in keypad mode; see
+-       subsections "Keypad Mode" and "Predefined Key Codes" in getch(3x).
+-
+-       If no input is pending, then if the no-delay flag is set in the  window
+-       (see  nodelay(3x)),  the  function returns ERR; otherwise, curses waits
+-       until the terminal has input.  If  cbreak(3x)  has  been  called,  this
+-       happens  after one character is read.  If nocbreak(3x) has been called,
+-       it occurs when the next newline is read.   If  halfdelay(3x)  has  been
+-       called,  curses waits until a character is typed or the specified delay
++       control key as a modifier,  by  holding  it  down  while  pressing  and
++       releasing  another key, often results in a distinct code.  The behavior
++       of other keys depends on whether win is in keypad mode; see subsections
++       "Keypad Mode" and "Predefined Key Codes" in getch(3x).
++
++       If  no input is pending, then if the no-delay flag is set in the window
++       (see nodelay(3x)), the function returns ERR;  otherwise,  curses  waits
++       until  the  terminal  has  input.   If cbreak(3x) has been called, this
++       happens after one character is read.  If nocbreak(3x) has been  called,
++       it  occurs  when  the  next newline is read.  If halfdelay(3x) has been
++       called, curses waits until input is available or  the  specified  delay
+        elapses.
+ 
+        If echo(3x) has been called, and the window is not a pad, curses writes
+        wch to the window (at the cursor position) per the following rules.
+ 
+-       o   If  wch  matches  the  terminal's erase character, the cursor moves
+-           leftward one  position  and  the  new  position  is  erased  as  if
+-           wmove(3x)  and  then  wdelch(3x)  were  called.   When the window's
+-           keypad mode is enabled (see below), KEY_LEFT and KEY_BACKSPACE  are
++       o   If wch matches the terminal's erase  character,  the  cursor  moves
++           leftward  one  position  and  the  new  position  is  erased  as if
++           wmove(3x) and then  wdelch(3x)  were  called.   When  the  window's
++           keypad  mode is enabled (see below), KEY_LEFT and KEY_BACKSPACE are
+            handled the same way.
+ 
+        o   curses writes any other wch to the window, as with wecho_wchar(3x).
+ 
+-       o   If  the  window  has  been moved or modified since the last call to
+-           wrefresh(3x), curses calls wrefresh.
++       o   If the window win has been moved or modified since the last call to
++           wrefresh(3x), curses calls wrefresh on it.
+ 
+-       If wch is a carriage return and nl(3x) has been called,  wgetch  stores
+-       the the character code for newline (line feed) in wch instead.
++       If  wch  is a carriage return and nl(3x) has been called, wgetch stores
++       the the character code for line feed in wch instead.
+ 
+ 
+

              Ungetting Characters

              +-       unget_wch  places  wch  into the input queue to be returned by the next
+-       call to wget_wch.  A single input queue serves all windows.
++       unget_wch places wch into the input queue to be returned  by  the  next
++       call  to  wget_wch.  A single input queue serves all windows associated
++       with the terminal.
+ 
+ 
+

              RETURN VALUE

              +@@ -136,11 +138,10 @@
+        input character in an additional wch parameter instead  of  the  return
+        value.
+ 
+-       Unlike   ungetch,  unget_wch  cannot  distinguish  function  key  codes
+-       wget_wch  from  conventional  character  codes.   An  application   can
+-       overcome this limitation by pushing function key codes with ungetch and
+-       subsequently checking the return value of wget_wch  for  a  match  with
+-       KEY_CODE_YES.
++       Unlike  ungetch,  unget_wch  cannot distinguish function key codes from
++       conventional  character  codes.   An  application  can  overcome   this
++       limitation  by pushing function key codes with ungetch and subsequently
++       checking the return value of wget_wch for a match with KEY_CODE_YES.
+ 
+ 
+

              EXTENSIONS

              +@@ -151,10 +152,10 @@
+        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
++       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+        error conditions for them.
+ 
+-       See  the  "PORTABILITY" section of wgetch(3x) regarding the interaction
++       See the "PORTABILITY" section of wgetch(3x) regarding  the  interaction
+        of wget_wch with signal handlers.
+ 
+ 
+@@ -162,12 +163,12 @@
+        curs_getch(3x) describes comparable functions of the ncurses library in
+        its non-wide-character configuration.
+ 
+-       curses(3x),     curs_add_wch(3x),    curs_inopts(3x),    curs_move(3x),
++       curses(3x),    curs_add_wch(3x),    curs_inopts(3x),     curs_move(3x),
+        curs_refresh(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                  curs_get_wch(3x)
++ncurses 6.5                       2024-05-11                  curs_get_wch(3x)
+
              +
              +
                +Index: doc/html/man/curs_getch.3x.html +--- ncurses-6.5-20240504+/doc/html/man/curs_getch.3x.html 2024-04-27 18:38:46.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/curs_getch.3x.html 2024-05-11 21:39:56.000000000 +0000 +@@ -28,19 +28,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_getch.3x,v 1.87 2024/04/20 19:18:18 tom Exp @ ++ * @Id: curs_getch.3x,v 1.88 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-curs_getch 3x 2024-04-20 ncurses 6.5 Library calls ++curs_getch 3x 2024-05-11 ncurses 6.5 Library calls + + + + +-

                curs_getch 3x 2024-04-20 ncurses 6.5 Library calls

                ++

                curs_getch 3x 2024-05-11 ncurses 6.5 Library calls

                + 
                + curs_getch(3x)                   Library calls                  curs_getch(3x)
+ 
+@@ -69,89 +69,91 @@
+

                DESCRIPTION

                + 
+

                Reading Characters

                +-       wgetch gathers a key stroke from the terminal keyboard associated  with
+-       a  curses  window  win.   ncurses(3x)  describes  the  variants of this
++       wgetch gathers a key event from the terminal keyboard associated with a
++       curses   window  win.   ncurses(3x)  describes  the  variants  of  this
+        function.
+ 
+        When input is pending, wgetch returns an integer  identifying  the  key
+-       stroke;  for  alphanumeric and punctuation keys, this value corresponds
+-       to the character encoding used by the terminal.  Use of the control key
+-       as  a modifier often results in a distinct code.  The behavior of other
+-       keys depends on whether win is in keypad mode; see  subsection  "Keypad
+-       Mode" below.
+-
+-       If  no input is pending, then if the no-delay flag is set in the window
+-       (see nodelay(3x)), the function returns ERR;  otherwise,  curses  waits
+-       until  the  terminal  has  input.   If cbreak(3x) has been called, this
+-       happens after one character is read.  If nocbreak(3x) has been  called,
+-       it  occurs  when  the  next newline is read.  If halfdelay(3x) has been
+-       called, curses waits until a character is typed or the specified  delay
++       event; for alphanumeric and punctuation keys, this value corresponds to
++       the character encoding used by the terminal.  Use of the control key as
++       a  modifier,  by  holding  it down while pressing and releasing another
++       key, often results in a distinct code.   The  behavior  of  other  keys
++       depends  on whether win is in keypad mode; see subsection "Keypad Mode"
++       below.
++
++       If no input is pending, then if the no-delay flag is set in the  window
++       (see  nodelay(3x)),  the  function returns ERR; otherwise, curses waits
++       until the terminal has input.  If  cbreak(3x)  has  been  called,  this
++       happens  after one character is read.  If nocbreak(3x) has been called,
++       it occurs when the next newline is read.   If  halfdelay(3x)  has  been
++       called,  curses  waits  until input is available or the specified delay
+        elapses.
+ 
+        If echo(3x) has been called, and the window is not a pad, curses writes
+        the returned character c to the window (at the cursor position) per the
+        following rules.
+ 
+-       o   If  c  matches  the  terminal's  erase  character, the cursor moves
+-           leftward one  position  and  the  new  position  is  erased  as  if
+-           wmove(3x)  and  then  wdelch(3x)  were  called.   When the window's
+-           keypad mode is enabled (see below), KEY_LEFT and KEY_BACKSPACE  are
++       o   If c matches the  terminal's  erase  character,  the  cursor  moves
++           leftward  one  position  and  the  new  position  is  erased  as if
++           wmove(3x) and then  wdelch(3x)  were  called.   When  the  window's
++           keypad  mode is enabled (see below), KEY_LEFT and KEY_BACKSPACE are
+            handled the same way.
+ 
+        o   curses writes any other c to the window, as with wechochar(3x).
+ 
+-       o   If  the  window  has  been moved or modified since the last call to
+-           wrefresh(3x), curses calls wrefresh.
++       o   If the window win has been moved or modified since the last call to
++           wrefresh(3x), curses calls wrefresh on it.
+ 
+-       If c is a carriage return and nl(3x) has been  called,  wgetch  returns
++       If  c  is  a carriage return and nl(3x) has been called, wgetch returns
+        the character code for line feed instead.
+ 
+ 
+

                Keypad Mode

                +-       To  curses, key strokes not from the alphabetic section of the keyboard
++       To curses, key strokes not from the alphabetic section of the  keyboard
+        (those    corresponding    to    the    ECMA-6    character    set--see
+-       ascii(7)--optionally  modified by either the control or shift keys) are
++       ascii(7)--optionally modified by either the control or shift keys)  are
+        treated as function keys.  (In curses, the term "function key" includes
+-       but  is  not  limited to keycaps engraved with "F1", "PF1", and so on.)
+-       If the  window  is  in  keypad  mode,  these  produce  a  numeric  code
+-       corresponding  to the KEY_ symbols listed in subsection "Predefined Key
+-       Codes" below; otherwise, they transmit a sequence  of  codes  typically
+-       starting  with  the  escape character, and which must be collected with
++       but is not limited to keycaps engraved with "F1", "PF1",  and  so  on.)
++       If  the  window  is  in  keypad  mode,  these  produce  a  numeric code
++       corresponding to the KEY_ symbols listed in subsection "Predefined  Key
++       Codes"  below;  otherwise,  they transmit a sequence of codes typically
++       starting with the escape character, and which must  be  collected  with
+        multiple wgetch calls.
+ 
+-       o   The curses.h header file declares  many  predefined  function  keys
+-           whose  names  begin with KEY_; these object-like macros have values
++       o   The  curses.h  header  file  declares many predefined function keys
++           whose names begin with KEY_; these object-like macros  have  values
+            outside the range of eight-bit character codes.
+ 
+-       o   In  ncurses,  user-defined  function  keys  are   configured   with
+-           define_key(3x);  they  have no names, but are also expected to have
++       o   In   ncurses,   user-defined  function  keys  are  configured  with
++           define_key(3x); they have no names, but are also expected  to  have
+            values outside the range of eight-bit codes.
+ 
+-       A variable intended to hold a function key code must thus  be  of  type
++       A  variable  intended  to hold a function key code must thus be of type
+        short or larger.
+ 
+-       Most  terminals  one  encounters follow the ECMA-48 standard insofar as
+-       their function keys  produce  character  sequences  prefixed  with  the
+-       escape  character  ESC.   This  fact  implies  that  curses cannot know
+-       whether the terminal has sent an ESC key stroke or the beginning  of  a
+-       function  key's  character  sequence without waiting to see if, and how
+-       soon, further input arrives.   When  curses  reads  such  an  ambiguous
+-       character,  it sets a timer.  If the remainder of the sequence does not
+-       arrive within the designated time, wgetch returns the prefix character;
+-       otherwise, it returns the function key code corresponding to the unique
+-       sequence defined by the terminal.  Consequently, a  user  of  a  curses
+-       application  may  experience  a  delay  after pressing ESC while curses
+-       disambiguates the input; see section "EXTENSIONS" below.  If the window
+-       is  in "no time-out" mode, the timer does not expire; it is an infinite
+-       (or very  large)  value.   See  notimeout(3x).   Because  function  key
+-       sequences  usually  begin  with  an  escape character, the terminal may
+-       appear to hang in no time-out mode after  the  user  has  pressed  ESC.
+-       Generally, further typing "awakens" curses.
++       Most terminals one encounters follow the ECMA-48  standard  insofar  as
++       their  function  keys  produce  character  sequences  prefixed with the
++       escape character ESC.  This fact implies that curses cannot distinguish
++       a  user's  press  of  the  escape  key (assuming it sends ESC) from the
++       beginning of a function key's character sequence without waiting to see
++       if,  and  how  soon,  further input arrives.  When curses reads such an
++       ambiguous character, it sets a timer.  If the remainder of the sequence
++       does  not  arrive within the designated time, wgetch returns the prefix
++       character; otherwise, it returns the function key code corresponding to
++       the unique sequence defined by the terminal.  Consequently, a user of a
++       curses application may experience a delay  after  they  escape  key  is
++       pressed  while curses disambiguates the input; see section "EXTENSIONS"
++       below.  If the window is in "no time-out"  mode,  the  timer  does  not
++       expire;  it  is  an infinite (or very large) value.  See notimeout(3x).
++       Because function key sequences usually begin with ESC, the terminal may
++       appear  to  hang  in no time-out mode after the user presses the escape
++       key.  Generally, further typing "awakens" curses.
+ 
+ 
+

                Ungetting Characters

                +-       ungetch  places  c into the input queue to be returned by the next call
+-       to wgetch.  A single input queue serves all windows.
++       ungetch places c into the input queue to be returned by the  next  call
++       to wgetch.  A single input queue serves all windows associated with the
++       terminal.
+ 
+ 
+

                Predefined Key Codes

                +@@ -178,9 +180,9 @@
+               KEY_RIGHT
+               KEY_HOME        Home key (upward+left arrow)
+               KEY_BACKSPACE   Backspace
++
+               KEY_F0          Function keys; space for 64 keys is reserved
+               KEY_F(n)        Function key n where 0 <= n <= 63
+-
+               KEY_DL          Delete line
+               KEY_IL          Insert line
+               KEY_DC          Delete character
+@@ -244,9 +246,9 @@
+               KEY_SCREATE     Shifted create key
+               KEY_SDC         Shifted delete character key
+               KEY_SDL         Shifted delete line key
++
+               KEY_SEND        Shifted end key
+               KEY_SEOL        Shifted clear line key
+-
+               KEY_SEXIT       Shifted exit key
+               KEY_SFIND       Shifted find key
+               KEY_SHELP       Shifted help key
+@@ -332,7 +334,7 @@
+        curses  distinguishes  the  Enter  keys  in  the alphabetic and numeric
+        keypad sections of a keyboard because (most) terminals  do.   KEY_ENTER
+        refers  to the key on the numeric keypad and, like other function keys,
+-       and is reliably recognized only if the window's keypad mode is enabled.
++       is reliably recognized only if the window's keypad mode is enabled.
+ 
+        o   The terminfo key_enter (kent) capability  describes  the  character
+            (sequence)  sent  by  the  Enter  key  of  a terminal's numeric (or
+@@ -372,8 +374,8 @@
+        function  key character sequence from a series of key strokes beginning
+        with ESC typed by the user; see curs_variables(3x).
+ 
+-       has_key was designed for ncurses(3x), and is not found in SVr4  curses,
+-       4.4BSD curses, or any other previous curses implementation.
++       has_key was designed for ncurses, and is  not  found  in  SVr4  curses,
++       4.4BSD curses, or any other previous curses implementation.
+ 
+ 
+

                PORTABILITY

                +@@ -392,9 +394,9 @@
+        The   behavior  of  wgetch  in  the  presence  of  signal  handlers  is
+        unspecified in the SVr4 documentation and X/Open Curses.  In historical
+        curses  implementations,  it  varied depending on whether the operating
+-       system's dispatch of a signal to a handler interrupting a read(2)  call
++       system's dispatch of a signal to a handler interrupted a  read(2)  call
+        in  progress,  and  also  (in  some  implementations)  whether an input
+-       timeout or non-blocking mode has been set.  Programmers concerned about
++       timeout or non-blocking mode had been set.  Programmers concerned about
+        portability  should  be  prepared  for  either of two cases: (a) signal
+        receipt does not interrupt wgetch; or  (b)  signal  receipt  interrupts
+        wgetch and causes it to return ERR with errno set to EINTR.
+@@ -424,7 +426,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                    curs_getch(3x)
++ncurses 6.5                       2024-05-11                    curs_getch(3x)
+
                +
                +
                  +Index: doc/html/man/curs_getstr.3x.html +--- ncurses-6.5-20240504+/doc/html/man/curs_getstr.3x.html 2024-04-27 18:38:46.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/curs_getstr.3x.html 2024-05-11 21:39:56.000000000 +0000 +@@ -27,19 +27,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_getstr.3x,v 1.58 2024/04/20 19:18:18 tom Exp @ ++ * @Id: curs_getstr.3x,v 1.59 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-curs_getstr 3x 2024-04-20 ncurses 6.5 Library calls ++curs_getstr 3x 2024-05-11 ncurses 6.5 Library calls + + + + +-

                  curs_getstr 3x 2024-04-20 ncurses 6.5 Library calls

                  ++

                  curs_getstr 3x 2024-05-11 ncurses 6.5 Library calls

                  + 
                  + curs_getstr(3x)                  Library calls                 curs_getstr(3x)
+ 
+@@ -156,7 +156,7 @@
+        documented in SVr4.
+ 
+        X/Open Curses, Issue 5 (2007) stated that these functions "read at most
+-       n bytes" but did not state whether the terminating NUL  is  counted  in
++       n bytes" but did not state whether the terminating NUL  counted  toward
+        that  limit.   X/Open  Curses,  Issue 7 (2009) changed that to say they
+        "read at most n-1 bytes" to allow for the terminating NUL.  As of 2018,
+        some implementations count it, some do not:
+@@ -242,7 +242,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                   curs_getstr(3x)
++ncurses 6.5                       2024-05-11                   curs_getstr(3x)
+
                  +
                  +
                    +Index: doc/html/man/curs_getyx.3x.html +--- ncurses-6.5-20240504+/doc/html/man/curs_getyx.3x.html 2024-04-27 18:38:46.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/curs_getyx.3x.html 2024-05-11 21:39:56.000000000 +0000 +@@ -27,19 +27,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_getyx.3x,v 1.44 2024/04/20 21:20:07 tom Exp @ ++ * @Id: curs_getyx.3x,v 1.45 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-curs_getyx 3x 2024-04-20 ncurses 6.5 Library calls ++curs_getyx 3x 2024-05-11 ncurses 6.5 Library calls + + + + +-

                    curs_getyx 3x 2024-04-20 ncurses 6.5 Library calls

                    ++

                    curs_getyx 3x 2024-05-11 ncurses 6.5 Library calls

                    + 
                    + curs_getyx(3x)                   Library calls                  curs_getyx(3x)
+ 
+@@ -55,53 +55,53 @@
+        #include <curses.h>
+ 
+        void getyx(WINDOW *win, int y, int x);
+-       void getparyx(WINDOW *win, int y, int x);
+        void getbegyx(WINDOW *win, int y, int x);
+        void getmaxyx(WINDOW *win, int y, int x);
+ 
++       void getparyx(WINDOW *win, int y, int x);
+ 
+-

                    DESCRIPTION

                    +-       The getyx macro places the current cursor position of the given  window
+-       in the two integer variables y and x.
+-
+-       If  win  is  a  subwindow,  the  getparyx  macro  places  the beginning
+-       coordinates of the subwindow relative to the  parent  window  into  two
+-       integer variables y and x.  Otherwise, -1 is placed into y and x.
+ 
+-       Like  getyx,  the  getbegyx  and  getmaxyx  macros  store  the  current
+-       beginning coordinates and size of the specified window.
++

                    DESCRIPTION

                    ++       These macros obtain the cursor position and  bounds  information  of  a
++       curses window win.  getyx stores win's cursor position in the variables
++       y and x.  getmaxyx stores win's maximum valid row and column numbers in
++       y and x, respectively.  getbegyx similarly stores the position of win's
++       origin relative to that of the screen (for  stdscr,  these  coordinates
++       are always 0).
++
++       If  win  is a subwindow (see subwin(3x)), the getparyx macro places the
++       coordinates of its origin relative to its parent window into y  and  x,
++       and -1 into both if it is not.
+ 
+ 
+

                    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).
++       No return values are defined for macros.  Do not use them as the right-
++       hand side of assignment statements.
+ 
+ 
+

                    NOTES

                    +-       All  of these interfaces are macros.  A "&" is not necessary before the
+-       variables y and x.
++       All of these interfaces are implemented as macros.  An "&" operator  is
++       not necessary before the variables y and x.
+ 
+ 
+

                    PORTABILITY

                    +-       The getyx, getparyx, getbegyx and  getmaxyx  macros  are  described  in
+-       X/Open Curses, Issue 4.
++       These macros are described in X/Open Curses, Issue 4.
+ 
+-       This  implementation also provides functions getbegx, getbegy, getcurx,
+-       getcury, getmaxx, getmaxy, getparx and getpary for  compatibility  with
+-       older versions of curses; see curs_legacy(3x).
+-
+-       Although  X/Open  Curses  does  not  address this, many implementations
+-       provide members of the WINDOW structure containing values corresponding
+-       to  these  macros.  For best portability, do not rely on using the data
+-       in WINDOW, since some implementations make WINDOW opaque (do not  allow
+-       direct use of its members).
++       ncurses  also  provides  functions  getbegx, getbegy, getcurx, getcury,
++       getmaxx, getmaxy, getparx, and getpary  for  compatibility  with  older
++       versions of curses; see curs_legacy(3x).
++
++       Although X/Open Curses does not address the issue, many implementations
++       expose members of the WINDOW structure containing values  corresponding
++       to   these   macros.    Do   not   rely  on  their  availability;  some
++       implementations make WINDOW opaque (that is, they do not  allow  direct
++       access to its members).
+ 
+        Besides the problem of opaque structures, the data stored in like-named
+-       members may not have like-values  in  different  implementations.   For
+-       example,  the  WINDOW._maxx and WINDOW._maxy values in ncurses have (at
+-       least  since  release  1.8.1)  differed  by   one   from   some   other
+-       implementations.   The  difference  is  hidden  by  means  of the macro
+-       getmaxyx.
++       members  may  not  have  values   of   the   same   meaning   different
++       implementations.    For   example,   the  values  of  WINDOW._maxx  and
++       WINDOW._maxy in ncurses have long  differed  by  one  from  some  other
++       implementations.  The getmaxyx macro hides this difference.
+ 
+ 
+

                    SEE ALSO

                    +@@ -109,7 +109,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                    curs_getyx(3x)
++ncurses 6.5                       2024-05-11                    curs_getyx(3x)
+
                    +
                    +
                      +Index: doc/html/man/curs_inch.3x.html +--- ncurses-6.5-20240504+/doc/html/man/curs_inch.3x.html 2024-04-27 18:38:46.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/curs_inch.3x.html 2024-05-11 21:39:56.000000000 +0000 +@@ -28,19 +28,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_inch.3x,v 1.51 2024/04/20 21:20:07 tom Exp @ ++ * @Id: curs_inch.3x,v 1.52 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-curs_inch 3x 2024-04-20 ncurses 6.5 Library calls ++curs_inch 3x 2024-05-11 ncurses 6.5 Library calls + + + + +-

                      curs_inch 3x 2024-04-20 ncurses 6.5 Library calls

                      ++

                      curs_inch 3x 2024-05-11 ncurses 6.5 Library calls

                      + 
                      + curs_inch(3x)                    Library calls                   curs_inch(3x)
+ 
+@@ -56,67 +56,56 @@
+ 
+        chtype inch(void);
+        chtype winch(WINDOW *win);
+-
+        chtype mvinch(int y, int x);
+        chtype mvwinch(WINDOW *win, int y, int x);
+ 
+ 
+

                      DESCRIPTION

                      +-       These  routines  return  the  character, of type chtype, 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 <curses.h> can be used with the & (logical AND) operator  to
+-       extract the character or attributes alone.
+-
+-
+-

                      Attributes

                      +-       The  following  bit  masks  may  be  AND-ed with characters returned by
+-       winch.
+-
+-       Name           Description
+-       ------------------------------------------------------------------------
+-       A_CHARTEXT     Extract character
+-       A_ATTRIBUTES   Extract attributes
+-       A_COLOR        Extract color pair information
++       winch  returns the curses character, including rendering attributes and
++       color pair identifier, at  the  cursor  position  in  the  window  win.
++       Subsection  "Video  Attributes"  of  attron(3x) explains how to extract
++       these data from a chtype.  ncurses(3x) describes the variants  of  this
++       function.
+ 
+ 
+

                      RETURN VALUE

                      +-       Functions prefixed with "mv" first perform cursor movement and fail  if
++       Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+-       The  winch  function  does  not  return an error if the window contains
+-       characters larger than 8-bits (255).  Only the low-order 8 bits of  the
+-       character are used by winch.
++       These functions do not return an error if the window comprises cells of
++       curses  complex characters (that is, they contain characters with codes
++       wider than eight bits, or greater  than  255  as  an  unsigned  decimal
++       integer).   They  instead  extract  only  the  low-order  eight bits of
++       character data in the cell.
+ 
+ 
+

                      NOTES

                      +-       Note that all of these routines may be macros.
++       inch, mvinch, and mvwinch may be implemented as macros.
+ 
+ 
+

                      PORTABILITY

                      +-       These functions are described in X/Open Curses, Issue 4.
+-
+-       Very  old systems (before standardization) provide a different function
+-       with the same name:
+-
+-       o   The winch function was part of the  original  BSD  curses  library,
+-           which   stored   a  7-bit  character  combined  with  the  standout
+-           attribute.
+-
+-           In BSD curses, winch returned only the character  (as  an  integer)
+-           with the standout attribute removed.
++       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
++       error conditions for them.
+ 
+-       o   System  V  curses  added support for several video attributes which
+-           could be combined with characters in the window.
+ 
+-           Reflecting this improvement, the function was altered to return the
+-           character combined with all video attributes in a chtype value.
+-
+-       X/Open Curses does not specify the size and layout of attributes, color
+-       and character values in chtype; it is  implementation-dependent.   This
+-       implementation  uses 8 bits for character values.  An application using
+-       more bits,  e.g.,  a  Unicode  value,  should  use  the  wide-character
+-       equivalents to these functions.
++

                      HISTORY

                      ++       winch  was  implemented  in  the original 4BSD curses library (November
++       1980).  It returned only the character code (as an  integer)  with  the
++       "standout"  attribute bit (the only one it supported) cleared.  Because
++       7-bit ASCII was the only character  encoding  supported,  4BSD's  winch
++       returned a char type.
++
++       System V  curses  (1983)  permitted  several rendering attributes to be
++       combined with a character in a window.   Reflecting  this  improvement,
++       winch  returned  an int in SVr3.2 (1988) and switched to chtype in SVr4
++       (1989).
++
++       X/Open Curses does not specify the sizes of the character code or color
++       pair  identifier,  nor  the  quantity  of  rendering attribute bits, in
++       chtype; these are implementation-dependent.  ncurses  uses  eight  bits
++       for  the  character  code.   An application requiring a wider character
++       type, for instance to handle Unicode,  should  use  the  wide-character
++       counterparts of these functions.
+ 
+ 
+

                      SEE ALSO

                      +@@ -127,20 +116,17 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                     curs_inch(3x)
++ncurses 6.5                       2024-05-11                     curs_inch(3x)
+
                      +
                      + +
                      +Index: doc/html/man/curs_mouse.3x.html +--- ncurses-6.5-20240504+/doc/html/man/curs_mouse.3x.html 2024-04-27 18:38:46.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/curs_mouse.3x.html 2024-05-11 21:39:57.000000000 +0000 +@@ -28,19 +28,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_mouse.3x,v 1.98 2024/04/20 19:02:07 tom Exp @ ++ * @Id: curs_mouse.3x,v 1.99 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-curs_mouse 3x 2024-04-20 ncurses 6.5 Library calls ++curs_mouse 3x 2024-05-11 ncurses 6.5 Library calls + + + + +-

                      curs_mouse 3x 2024-04-20 ncurses 6.5 Library calls

                      ++

                      curs_mouse 3x 2024-05-11 ncurses 6.5 Library calls

                      + 
                      + curs_mouse(3x)                   Library calls                  curs_mouse(3x)
+ 
+@@ -373,12 +373,12 @@
+        been  enabled  by  mousemask.  Instead, the xterm mouse report sequence
+        appears in the string read.
+ 
+-       Mouse event reports from xterm are not detected correctly in  a  window
+-       with  keypad application mode disabled, since they are interpreted as a
+-       variety of function key.  Set the terminal's terminfo capability  kmous
+-       to  "\E[M" (the beginning of the response from xterm for mouse clicks).
+-       Other values of kmous are permitted under the same assumption, that is,
+-       the report begins with that sequence.
++       An ncurses window must enable keypad(3x)  to  correctly  receive  mouse
++       event  reports  from  xterm  since they are encoded like function keys.
++       Set the terminal's terminfo capability kmous to "\E[M"  (the  beginning
++       of  the  response  from xterm for mouse clicks).  Other values of kmous
++       are permitted under the same assumption, that  is,  the  report  begins
++       with that sequence.
+ 
+        Because there are no standard response sequences that serve to identify
+        terminals supporting the xterm mouse protocol, ncurses assumes that  if
+@@ -394,7 +394,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                    curs_mouse(3x)
++ncurses 6.5                       2024-05-11                    curs_mouse(3x)
+
                      +
                      +
                        +Index: doc/html/man/curs_outopts.3x.html +--- ncurses-6.5-20240504+/doc/html/man/curs_outopts.3x.html 2024-04-27 18:38:46.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/curs_outopts.3x.html 2024-05-11 21:39:57.000000000 +0000 +@@ -27,19 +27,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_outopts.3x,v 1.64 2024/04/20 21:24:19 tom Exp @ ++ * @Id: curs_outopts.3x,v 1.65 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-curs_outopts 3x 2024-04-20 ncurses 6.5 Library calls ++curs_outopts 3x 2024-05-11 ncurses 6.5 Library calls + + + + +-

                        curs_outopts 3x 2024-04-20 ncurses 6.5 Library calls

                        ++

                        curs_outopts 3x 2024-05-11 ncurses 6.5 Library calls

                        + 
                        + curs_outopts(3x)                 Library calls                curs_outopts(3x)
+ 
+@@ -47,16 +47,16 @@
+ 
+ 
+

                        NAME

                        +-       clearok,   idlok,   idcok,  immedok,  leaveok,  setscrreg,  wsetscrreg,
+-       scrollok - set curses output options
++       clearok,   idcok,   idlok,   immedok,   leaveok,  scrollok,  setscrreg,
++       wsetscrreg - set curses output options
+ 
+ 
+

                        SYNOPSIS

                        +        #include <curses.h>
+ 
+        int clearok(WINDOW *win, bool bf);
+-       int idlok(WINDOW *win, bool bf);
+        void idcok(WINDOW *win, bool bf);
++       int idlok(WINDOW *win, bool bf);
+        void immedok(WINDOW *win, bool bf);
+        int leaveok(WINDOW *win, bool bf);
+        int scrollok(WINDOW *win, bool bf);
+@@ -81,6 +81,14 @@
+        repainted from scratch.
+ 
+ 
++

                        idcok

                        ++       If idcok is called with FALSE as  second  argument,  curses  no  longer
++       considers   using  the  hardware  insert/delete  character  feature  of
++       terminals so equipped.  Use of character insert/delete  is  enabled  by
++       default.   Calling idcok with TRUE as second argument re-enables use of
++       character insertion and deletion.
++
++
+

                        idlok

                        +        If idlok is called with TRUE as second argument, curses considers using
+        the  hardware  insert/delete  line  feature  of  terminals so equipped.
+@@ -93,14 +101,6 @@
+        changed portions of all lines.
+ 
+ 
+-

                        idcok

                        +-       If idcok is called with FALSE as  second  argument,  curses  no  longer
+-       considers   using  the  hardware  insert/delete  character  feature  of
+-       terminals so equipped.  Use of character insert/delete  is  enabled  by
+-       default.   Calling idcok with TRUE as second argument re-enables use of
+-       character insertion and deletion.
+-
+-
+

                        immedok

                        +        If immedok is called with TRUE as second argument, any  change  in  the
+        window  image,  such  as  the  ones caused by waddch, wclrtobot, wscrl,
+@@ -196,7 +196,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                  curs_outopts(3x)
++ncurses 6.5                       2024-05-11                  curs_outopts(3x)
+
                        +
                        +
                          +@@ -205,8 +205,8 @@ +
                        • DESCRIPTION +
                            +
                          • clearok
                            • +-
                          • idlok
                            • +
                          • idcok
                            • ++
                          • idlok
                            • +
                          • immedok
                            • +
                          • leaveok
                            • +
                          • scrollok
                            • +Index: doc/html/man/curs_sp_funcs.3x.html +--- ncurses-6.5-20240504+/doc/html/man/curs_sp_funcs.3x.html 2024-04-27 18:38:47.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/curs_sp_funcs.3x.html 2024-05-11 21:39:57.000000000 +0000 +@@ -27,19 +27,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_sp_funcs.3x,v 1.50 2024/04/20 18:56:31 tom Exp @ ++ * @Id: curs_sp_funcs.3x,v 1.51 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-curs_sp_funcs 3x 2024-04-20 ncurses 6.5 Library calls ++curs_sp_funcs 3x 2024-05-11 ncurses 6.5 Library calls + + + + +-

                            curs_sp_funcs 3x 2024-04-20 ncurses 6.5 Library calls

                            ++

                            curs_sp_funcs 3x 2024-05-11 ncurses 6.5 Library calls

                            + 
                            + curs_sp_funcs(3x)                Library calls               curs_sp_funcs(3x)
+ 
+@@ -294,7 +294,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                 curs_sp_funcs(3x)
++ncurses 6.5                       2024-05-11                 curs_sp_funcs(3x)
+
                            +
                            +
                              +Index: doc/html/man/curs_termattrs.3x.html +--- ncurses-6.5-20240504+/doc/html/man/curs_termattrs.3x.html 2024-04-27 18:38:47.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/curs_termattrs.3x.html 2024-05-11 21:39:57.000000000 +0000 +@@ -27,19 +27,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_termattrs.3x,v 1.41 2024/04/20 21:20:07 tom Exp @ ++ * @Id: curs_termattrs.3x,v 1.42 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-curs_termattrs 3x 2024-04-20 ncurses 6.5 Library calls ++curs_termattrs 3x 2024-05-11 ncurses 6.5 Library calls + + + + +-

                              curs_termattrs 3x 2024-04-20 ncurses 6.5 Library calls

                              ++

                              curs_termattrs 3x 2024-05-11 ncurses 6.5 Library calls

                              + 
                              + curs_termattrs(3x)               Library calls              curs_termattrs(3x)
+ 
+@@ -48,8 +48,8 @@
+ 
+

                              NAME

                              +        baudrate,  erasechar,  erasewchar, has_ic, has_il, killchar, killwchar,
+-       longname, term_attrs, termattrs, termname -  curses  environment  query
+-       routines
++       longname, term_attrs,  termattrs,  termname  -  get  and  set  terminal
++       attributes with curses
+ 
+ 
+

                              SYNOPSIS

                              +@@ -149,7 +149,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                curs_termattrs(3x)
++ncurses 6.5                       2024-05-11                curs_termattrs(3x)
+
                              +
                              +
                                +Index: doc/html/man/curs_util.3x.html +--- ncurses-6.5-20240504+/doc/html/man/curs_util.3x.html 2024-04-27 18:38:47.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/curs_util.3x.html 2024-05-11 21:39:57.000000000 +0000 +@@ -28,19 +28,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_util.3x,v 1.101 2024/04/20 21:20:07 tom Exp @ ++ * @Id: curs_util.3x,v 1.102 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-curs_util 3x 2024-04-20 ncurses 6.5 Library calls ++curs_util 3x 2024-05-11 ncurses 6.5 Library calls + + + + +-

                                curs_util 3x 2024-04-20 ncurses 6.5 Library calls

                                ++

                                curs_util 3x 2024-05-11 ncurses 6.5 Library calls

                                + 
                                + curs_util(3x)                    Library calls                   curs_util(3x)
+ 
+@@ -64,7 +64,7 @@
+ 
+        void filter(void);
+ 
+-       void use_env(bool f);
++       void use_env(bool bf);
+ 
+        int putwin(WINDOW *win, FILE *filep);
+        WINDOW *getwin(FILE *filep);
+@@ -74,7 +74,7 @@
+ 
+        /* extensions */
+        void nofilter(void);
+-       void use_tioctl(bool f);
++       void use_tioctl(bool bf);
+ 
+ 
+

                                DESCRIPTION

                                +@@ -192,159 +192,158 @@
+ 
+               use_env   use_tioctl   Summary
+               -----------------------------------------------------------------
+-              TRUE      FALSE        This  is  the  default behavior.  ncurses
+-                                     uses  operating   system   calls   unless
+-                                     overridden    by    LINES    or   COLUMNS
++              TRUE      FALSE        ncurses   uses   operating  system  calls
++                                     unless overridden  by  LINES  or  COLUMNS
+                                      environment variables; default.
+-              TRUE      TRUE         ncurses updates LINES and  COLUMNS  based
++              TRUE      TRUE         ncurses  updates  LINES and COLUMNS based
+                                      on operating system calls.
+-              FALSE     TRUE         ncurses  ignores LINES and COLUMNS, using
++              FALSE     TRUE         ncurses ignores LINES and COLUMNS,  using
+                                      operating system calls to obtain size.
+ 
+ 
+

                                putwin, getwin

                                +-       The putwin routine writes all data associated with window (or pad)  win
+-       into  the  file  to  which filep points.  This information can be later
++       The  putwin routine writes all data associated with window (or pad) win
++       into the file to which filep points.  This  information  can  be  later
+        retrieved using the getwin function.
+ 
+-       The getwin routine reads window related data  stored  in  the  file  by
+-       putwin.   The  routine  then creates and initializes a new window using
+-       that data.  It returns a pointer to the new window.  There  are  a  few
++       The  getwin  routine  reads  window  related data stored in the file by
++       putwin.  The routine then creates and initializes a  new  window  using
++       that  data.   It  returns a pointer to the new window.  There are a few
+        caveats:
+ 
+-       o   the  data  written  is  a  copy  of  the  WINDOW structure, and its
+-           associated character cells.  The format differs between  the  wide-
+-           character  (ncursesw)  and  non-wide  (ncurses) libraries.  You can
++       o   the data written is  a  copy  of  the  WINDOW  structure,  and  its
++           associated  character  cells.  The format differs between the wide-
++           character (ncursesw) and non-wide  (ncurses)  libraries.   You  can
+            transfer data between the two, however.
+ 
+-       o   the retrieved window is always created as a  top-level  window  (or
++       o   the  retrieved  window  is always created as a top-level window (or
+            pad), rather than a subwindow.
+ 
+-       o   the  window's character cells contain the color pair value, but not
+-           the actual color numbers.  If cells in  the  retrieved  window  use
+-           color  pairs  which  have not been created in the application using
++       o   the window's character cells contain the color pair value, but  not
++           the  actual  color  numbers.   If cells in the retrieved window use
++           color pairs which have not been created in  the  application  using
+            init_pair, they will not be colored when the window is refreshed.
+ 
+ 
+

                                delay_output

                                +-       The delay_output routine inserts an ms  millisecond  pause  in  output.
+-       Employ  this  function  judiciously  when terminal output uses padding,
+-       because ncurses  transmits  null  characters  (consuming  CPU  and  I/O
+-       resources)  instead  of  sleeping  and  requesting  resumption from the
++       The  delay_output  routine  inserts  an ms millisecond pause in output.
++       Employ this function judiciously when  terminal  output  uses  padding,
++       because  ncurses  transmits  null  characters  (consuming  CPU  and I/O
++       resources) instead of  sleeping  and  requesting  resumption  from  the
+        operating system.  Padding is used unless:
+ 
+        o   the terminal description has npc (no_pad_char) capability, or
+ 
+        o   the environment variable NCURSES_NO_PADDING is set.
+ 
+-       If padding is not in use, ncurses uses napms to perform the delay.   If
+-       the  value  of ms exceeds 30,000 (thirty seconds), it is capped at that
++       If  padding is not in use, ncurses uses napms to perform the delay.  If
++       the value of ms exceeds 30,000 (thirty seconds), it is capped  at  that
+        value.
+ 
+ 
+

                                flushinp

                                +-       The flushinp routine throws away any typeahead that has been  typed  by
++       The  flushinp  routine throws away any typeahead that has been typed by
+        the user and has not yet been read by the program.
+ 
+ 
+

                                RETURN VALUE

                                +-       Except  for  flushinp,  routines that return an integer return ERR upon
+-       failure and OK (SVr4 specifies only "an integer value other than  ERR")
++       Except for flushinp, routines that return an integer  return  ERR  upon
++       failure  and OK (SVr4 specifies only "an integer value other than ERR")
+        upon successful completion.
+ 
+        Routines that return pointers return NULL on error.
+ 
+-       X/Open   Curses  does  not  specify  any  error  conditions.   In  this
++       X/Open  Curses  does  not  specify  any  error  conditions.   In   this
+        implementation
+ 
+           flushinp
+                returns an error if the terminal was not initialized.
+ 
+           putwin
+-               returns an error if  the  associated  fwrite  calls  return  an
++               returns  an  error  if  the  associated  fwrite calls return an
+                error.
+ 
+ 
+

                                PORTABILITY

                                + 
+

                                filter

                                +-       The  SVr4  documentation  describes  the  action  of filter only in the
+-       vaguest terms.  The description here  is  adapted  from  X/Open  Curses
++       The SVr4 documentation describes the  action  of  filter  only  in  the
++       vaguest  terms.   The  description  here  is adapted from X/Open Curses
+        (which erroneously fails to describe the disabling of cuu).
+ 
+ 
+

                                delay_output padding

                                +-       The  limitation  to  30  seconds and the use of napms differ from other
++       The limitation to 30 seconds and the use of  napms  differ  from  other
+        implementations.
+ 
+        o   SVr4 curses does not delay if no padding character is available.
+ 
+-       o   NetBSD curses uses napms when no padding  character  is  available,
+-           but  does  not  take  timing  into  account  when using the padding
++       o   NetBSD  curses  uses  napms when no padding character is available,
++           but does not take  timing  into  account  when  using  the  padding
+            character.
+ 
+        Neither limits the delay.
+ 
+ 
+

                                keyname

                                +-       The keyname function  may  return  the  names  of  user-defined  string
+-       capabilities  which are defined in the terminfo entry via the -x option
++       The  keyname  function  may  return  the  names  of user-defined string
++       capabilities which are defined in the terminfo entry via the -x  option
+        of tic.  This implementation automatically assigns at run-time keycodes
+-       to  user-defined  strings  which begin with "k".  The keycodes start at
++       to user-defined strings which begin with "k".  The  keycodes  start  at
+        KEY_MAX, but are not guaranteed to be the same value for different runs
+-       because  user-defined  codes  are merged from all terminal descriptions
+-       which have been loaded.  The use_extended_names(3x)  function  controls
+-       whether  this  data  is loaded when the terminal description is read by
++       because user-defined codes are merged from  all  terminal  descriptions
++       which  have  been loaded.  The use_extended_names(3x) function controls
++       whether this data is loaded when the terminal description  is  read  by
+        the library.
+ 
+ 
+

                                nofilter, use_tioctl

                                +-       The nofilter and use_tioctl routines are  specific  to  ncurses.   They
+-       were  not  supported on Version 7, BSD or System V implementations.  It
+-       is recommended  that  any  code  depending  on  ncurses  extensions  be
++       The  nofilter  and  use_tioctl  routines are specific to ncurses.  They
++       were not supported on Version 7, BSD or System V  implementations.   It
++       is  recommended  that  any  code  depending  on  ncurses  extensions be
+        conditioned using NCURSES_VERSION.
+ 
+ 
+

                                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
+-           implementation-specific format.  Although the format is an  obvious
++       o   The  files  written  and   read   by   these   functions   use   an
++           implementation-specific  format.  Although the format is an obvious
+            target for standardization, it has been overlooked.
+ 
+-           Interestingly  enough,  according to the copyright dates in Solaris
+-           source, the functions (along with scr_init, etc.)  originated  with
++           Interestingly enough, according to the copyright dates  in  Solaris
++           source,  the  functions (along with scr_init, etc.) originated with
+            the University of California, Berkeley (in 1982) and were later (in
+-           1988) incorporated into SVr4.  Oddly, there are no  such  functions
++           1988)  incorporated  into SVr4.  Oddly, there are no such functions
+            in the 4.3BSD curses sources.
+ 
+        o   Most implementations simply dump the binary WINDOW structure to the
+-           file.  These include SVr4 curses, NetBSD and PDCurses, as  well  as
++           file.   These  include SVr4 curses, NetBSD and PDCurses, as well as
+            older ncurses versions.  This implementation (as well as the X/Open
+            variant of Solaris curses, dated 1995) uses textual dumps.
+ 
+-           The implementations which  use  binary  dumps  use  block-I/O  (the
+-           fwrite  and  fread  functions).   Those  that use textual dumps use
++           The  implementations  which  use  binary  dumps  use block-I/O (the
++           fwrite and fread functions).  Those  that  use  textual  dumps  use
+            buffered-I/O.  A few applications may happen to write extra data in
+-           the  file  using these functions.  Doing that can run into problems
+-           mixing block- and buffered-I/O.  This  implementation  reduces  the
+-           problem  on writes by flushing the output.  However, reading from a
++           the file using these functions.  Doing that can run  into  problems
++           mixing  block-  and  buffered-I/O.  This implementation reduces the
++           problem on writes by flushing the output.  However, reading from  a
+            file written using mixed schemes may not be successful.
+ 
+ 
+

                                unctrl, wunctrl

                                +-       X/Open Curses, Issue 4  describes  these  functions.   It  states  that
++       X/Open  Curses,  Issue  4  describes  these  functions.  It states that
+        unctrl and wunctrl will return a null pointer if unsuccessful, but does
+-       not define any error conditions.  This implementation checks for  three
++       not  define any error conditions.  This implementation checks for three
+        cases:
+ 
+-       o   the  parameter  is  a  7-bit  US-ASCII code.  This is the case that
++       o   the parameter is a 7-bit US-ASCII code.   This  is  the  case  that
+            X/Open Curses documented.
+ 
+        o   the parameter is in the range 128-159, i.e., a C1 control code.  If
+-           use_legacy_coding(3x)  has  been  called with a 2 parameter, unctrl
+-           returns the  parameter,  i.e.,  a  one-character  string  with  the
+-           parameter  as  the  first  character.   Otherwise, it returns "~@",
++           use_legacy_coding(3x) has been called with a  2  parameter,  unctrl
++           returns  the  parameter,  i.e.,  a  one-character  string  with the
++           parameter as the first  character.   Otherwise,  it  returns  "~@",
+            "~A", etc., analogous to "^@", "^A", C0 controls.
+ 
+            X/Open Curses does not document whether unctrl can be called before
+@@ -355,44 +354,44 @@
+            pointer.
+ 
+        The strings returned by unctrl in this implementation are determined at
+-       compile time, showing C1 controls from the upper-128 codes with  a  "~"
+-       prefix   rather   than   "^".   Other  implementations  have  different
+-       conventions.   For  example,  they  may  show  both  sets  of   control
+-       characters  with  "^",  and strip the parameter to 7 bits.  Or they may
+-       ignore C1 controls and treat all of the upper-128 codes  as  printable.
+-       This  implementation  uses  8  bits  but  does not modify the string to
+-       reflect locale.  The use_legacy_coding(3x) function allows  the  caller
++       compile  time,  showing C1 controls from the upper-128 codes with a "~"
++       prefix  rather  than  "^".   Other   implementations   have   different
++       conventions.    For  example,  they  may  show  both  sets  of  control
++       characters with "^", and strip the parameter to 7 bits.   Or  they  may
++       ignore  C1  controls and treat all of the upper-128 codes as printable.
++       This implementation uses 8 bits but  does  not  modify  the  string  to
++       reflect  locale.   The use_legacy_coding(3x) function allows the caller
+        to change the output of unctrl.
+ 
+-       Likewise,  the meta(3x) function allows the caller to change the output
+-       of keyname, i.e., it determines whether to  use  the  "M-"  prefix  for
+-       "meta"    keys    (codes    in   the   range   128   to   255).    Both
+-       use_legacy_coding(3x)  and  meta(3x)  succeed  only  after  curses   is
+-       initialized.   X/Open  Curses  does not document the treatment of codes
++       Likewise, the meta(3x) function allows the caller to change the  output
++       of  keyname,  i.e.,  it  determines  whether to use the "M-" prefix for
++       "meta"   keys   (codes   in   the   range   128    to    255).     Both
++       use_legacy_coding(3x)   and  meta(3x)  succeed  only  after  curses  is
++       initialized.  X/Open Curses does not document the  treatment  of  codes
+        128 to 159.  When treating them as "meta" keys (or if keyname is called
+-       before   initializing  curses),  this  implementation  returns  strings
++       before  initializing  curses),  this  implementation  returns   strings
+        "M-^@", "M-^A", etc.
+ 
+        X/Open Curses documents unctrl as declared in <unctrl.h>, which ncurses
+-       does.   However,  ncurses' <curses.h> includes <unctrl.h>, matching the
++       does.  However, ncurses' <curses.h> includes <unctrl.h>,  matching  the
+        behavior of SVr4 curses.  Other implementations may not do that.
+ 
+ 
+

                                use_env, use_tioctl

                                +-       If ncurses is configured to provide  the  sp-functions  extension,  the
+-       state  of  use_env  and  use_tioctl may be updated before creating each
+-       screen rather than once  only  (curs_sp_funcs(3x)).   This  feature  of
++       If  ncurses  is  configured  to provide the sp-functions extension, the
++       state of use_env and use_tioctl may be  updated  before  creating  each
++       screen  rather  than  once  only  (curs_sp_funcs(3x)).  This feature of
+        use_env is not provided by other implementations of curses.
+ 
+ 
+

                                SEE ALSO

                                +-       curses(3x),    curs_initscr(3x),    curs_inopts(3x),   curs_kernel(3x),
++       curses(3x),   curs_initscr(3x),    curs_inopts(3x),    curs_kernel(3x),
+        curs_scr_dump(3x),        curs_sp_funcs(3x),        curs_variables(3x),
+        legacy_coding(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                     curs_util(3x)
++ncurses 6.5                       2024-05-11                     curs_util(3x)
+
                                +
                                +
                                  +Index: doc/html/man/infocmp.1m.html +--- ncurses-6.5-20240504+/doc/html/man/infocmp.1m.html 2024-04-27 18:38:48.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/infocmp.1m.html 2024-05-11 21:39:58.000000000 +0000 +@@ -28,19 +28,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: infocmp.1m,v 1.109 2024/03/16 15:35:01 tom Exp @ ++ * @Id: infocmp.1m,v 1.110 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-infocmp 1m 2024-03-16 ncurses 6.5 User commands ++infocmp 1m 2024-05-11 ncurses 6.5 User commands + + + + +-

                                  infocmp 1m 2024-03-16 ncurses 6.5 User commands

                                  ++

                                  infocmp 1m 2024-05-11 ncurses 6.5 User commands

                                  + 
                                  + infocmp(1m)                      User commands                     infocmp(1m)
+ 
+@@ -531,7 +531,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                       infocmp(1m)
++ncurses 6.5                       2024-05-11                       infocmp(1m)
+
                                  +
                                  +
                                    +Index: doc/html/man/infotocap.1m.html +--- ncurses-6.5-20240504+/doc/html/man/infotocap.1m.html 2024-04-27 18:38:48.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/infotocap.1m.html 2024-05-11 21:39:58.000000000 +0000 +@@ -27,19 +27,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: infotocap.1m,v 1.41 2024/03/16 15:35:01 tom Exp @ ++ * @Id: infotocap.1m,v 1.42 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-infotocap 1m 2024-03-16 ncurses 6.5 User commands ++infotocap 1m 2024-05-11 ncurses 6.5 User commands + + + + +-

                                    infotocap 1m 2024-03-16 ncurses 6.5 User commands

                                    ++

                                    infotocap 1m 2024-05-11 ncurses 6.5 User commands

                                    + 
                                    + infotocap(1m)                    User commands                   infotocap(1m)
+ 
+@@ -90,7 +90,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                     infotocap(1m)
++ncurses 6.5                       2024-05-11                     infotocap(1m)
+
                                    +
                                    +
                                      +Index: doc/html/man/ncurses.3x.html +--- ncurses-6.5-20240504+/doc/html/man/ncurses.3x.html 2024-04-27 18:38:49.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/ncurses.3x.html 2024-05-11 21:39:59.000000000 +0000 +@@ -28,19 +28,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: ncurses.3x,v 1.214 2024/04/27 17:55:43 tom Exp @ ++ * @Id: ncurses.3x,v 1.215 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-ncurses 3x 2024-04-27 ncurses 6.5 Library calls ++ncurses 3x 2024-05-11 ncurses 6.5 Library calls + + + + +-

                                      ncurses 3x 2024-04-27 ncurses 6.5 Library calls

                                      ++

                                      ncurses 3x 2024-05-11 ncurses 6.5 Library calls

                                      + 
                                      + ncurses(3x)                      Library calls                     ncurses(3x)
+ 
+@@ -61,20 +61,20 @@
+        terminals  with  output  optimized to minimize screen updates.  ncurses
+        replaces the curses libraries from System V Release 4 Unix ("SVr4") and
+        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
+-       document describes ncurses version 6.5 (patch 20240427).
++       document describes ncurses version 6.5 (patch 20240511).
+ 
+        ncurses permits control of the terminal screen's contents;  abstraction
+-       and  subdivision thereof with windows and pads; the reading of terminal
+-       input; control of terminal input and output options; environment  query
+-       routines;  color  manipulation;  the  definition  and use of soft label
+-       keys; terminfo capability access; a  termcap  compatibility  interface;
+-       and  an  abstraction  of the system's API for manipulating the terminal
+-       (such as termios(3)).
+-
+-       ncurses implements the standard interface described  by  X/Open  Curses
+-       Issue 7.   In  many  behavioral  details  not  standardized  by X/Open,
+-       ncurses emulates the curses  library  of  SVr4  and  provides  numerous
+-       useful extensions.
++       and  subdivision thereof with windows and pads; acquisition of keyboard
++       and mouse  events;  control  of  terminal  input  and  output  options;
++       selection   of   color  and  rendering  attributes  (such  as  bold  or
++       underline); the definition and use of soft label keys;  access  to  the
++       terminfo   terminal   capability   database;  a  termcap  compatibility
++       interface; and an abstraction of the system's API for manipulating  the
++       terminal (such as termios(3)).
++
++       ncurses  implements  the  interface described by X/Open Curses Issue 7.
++       In many behavioral details not standardized by X/Open, ncurses emulates
++       the curses library of SVr4 and provides numerous useful extensions.
+ 
+        ncurses  man  pages employ several sections to clarify matters of usage
+        and interoperability with other curses implementations.
+@@ -160,63 +160,63 @@
+        cursor and write a character to stdscr, respectively.
+ 
+        Frequent changes to the terminal screen can cause unpleasant flicker or
+-       inefficient use of the communication channel  to  the  device,  so  the
+-       library  does  not generally update it automatically.  Therefore, after
++       inefficient use of the communication channel to the  device,  so  as  a
++       rule  the  library  does not update it automatically.  Therefore, after
+        using curses functions to accumulate a set of desired updates that make
+        sense to present together, call refresh(3x) to tell the library to make
+        the user's screen look like stdscr.  The library optimizes  its  output
+-       by  computing  a minimal number of operations to mutate the screen from
++       by  computing  a minimal volume of operations to mutate the screen from
+        its  state  at  the  previous  refresh  to  the  new  one.    Effective
+        optimization  demands  accurate  information about the terminal device:
+        the management of such information is the province of the  terminfo(3x)
+        API, a feature of every standard curses implementation.
+ 
+-       Special windows called pads may also be manipulated.  These are windows
+-       that are not constrained to the size of the terminal screen  and  whose
+-       contents need not be completely displayed.  See curs_pad(3x).
+-
+-       In  addition  to drawing characters on the screen, rendering 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.  See curs_attr(3x).
++       Special  windows  called  pads  may also be manipulated.  These are not
++       constrained to the size of the terminal screen and their contents  need
++       not be completely displayed.  See curs_pad(3x).
++
++       Many  terminals  support configuration of character cell foreground and
++       background colors  as  well  as  rendering  attributes  ,  which  cause
++       characters  to  show  up  in such modes as boldfaced, underlined, or in
++       reverse video.  See curs_attr(3x).
+ 
+        curses predefines constants for a small set of  forms-drawing  graphics
+        corresponding  to  the  DEC Alternate Character Set (ACS), a feature of
+-       VT100 and other terminals.  See waddch(3x).
++       VT100 and other terminals.  See addch(3x).
+ 
+-       curses is implemented using the  operating  system's  terminal  driver;
+-       keystroke  events are received not as scan codes but as byte sequences.
+-       Graphical keycaps (alphanumeric and punctuation keys,  and  the  space)
+-       appear  as-is.   Everything  else,  including  the  tab,  enter/return,
+-       keypad, arrow, and function keys, appears as a control character  or  a
+-       multibyte  escape  sequence.   curses  translates these into unique key
+-       codes.  See getch(3x).
++       curses is implemented using the operating system's terminal driver; key
++       events are received not as scan codes but as byte sequences.  Graphical
++       keycaps (alphanumeric and punctuation keys, and the space)  appear  as-
++       is.   Everything  else, including the tab, enter/return, keypad, arrow,
++       and function keys, appears as a control character or a multibyte escape
++       sequence.   curses  translates  the  latter into unique key codes.  See
++       getch(3x).
+ 
+        ncurses provides reimplementations of the SVr4 panel(3x), form(3x), and
+-       menu(3x) libraries to ease construction of user interfaces with curses.
++       menu(3x)   libraries;   they   permit   overlapping  windows  and  ease
++       construction of user interfaces with curses.
+ 
+ 
+

                                      Initialization

                                      +-       The   selection  of  an  appropriate  value  of  TERM  in  the  process
++       The  selection  of  an  appropriate  value  of  TERM  in  the   process
+        environment  is  essential  to  correct  curses  and  terminfo  library
+-       operation.   A  well-configured  system  selects  a  correct TERM value
+-       automatically;  tset(1)  may   assist   with   troubleshooting   exotic
++       operation.  A well-configured  system  selects  a  correct  TERM  value
++       automatically;   tset(1)   may   assist   with  troubleshooting  exotic
+        situations.
+ 
+-       If  you  change the terminal type, export the TERM environment variable
+-       in the shell, then  run  tset(1)  or  the  "tput  init"  command.   See
+-       subsection "Tabs and Initialization" of terminfo(5).
+-
+-       If  the  environment  variables  LINES  and  COLUMNS are set, or if the
+-       curses program is executing in a graphical windowing  environment,  the
+-       information  obtained  thence  overrides that obtained by terminfo.  An
++       If you change the terminal type, export the shell's TERM variable, then
++       run  tset(1)  or  the  "tput  init"  command.  See subsection "Tabs and
++       Initialization" of terminfo(5).
++
++       If the environment variables LINES and  COLUMNS  are  set,  or  if  the
++       curses  program  is executing in a graphical windowing environment, the
++       information obtained thence overrides that obtained  by  terminfo.   An
+        ncurses extension supports resizable terminals; see wresize(3x).
+ 
+-       If the environment variable  TERMINFO  is  defined,  a  curses  program
+-       checks  first  for  a  terminal  type  description  in  the location it
+-       identifies.   TERMINFO  is  useful  for  developing  experimental  type
+-       descriptions  or  when  write  permission to /usr/share/terminfo is not
+-       available.
++       If  the  environment  variable  TERMINFO  is  defined, a curses program
++       checks first for  a  terminal  type  description  in  the  location  it
++       identifies.   TERMINFO  is  useful  for developing type descriptions or
++       when write permission to /usr/share/terminfo is not available.
+ 
+        See section "ENVIRONMENT" below.
+ 
+@@ -234,7 +234,7 @@
+        In  function  synopses,  ncurses man pages apply the following names to
+        parameters.
+ 
+-                       bf    bool (TRUE or FALSE)
++                       bf    a bool (TRUE or FALSE)
+                        c     a char or int
+                        ch    a chtype
+                        wc    a wchar_t or wint_t
+@@ -244,17 +244,21 @@
+ 
+ 
+

                                      Wide and Non-wide Character Configurations

                                      +-       This manual page describes functions that appear in  any  configuration
+-       of  the  library.   There  are  two  common configurations; see section
+-       "ALTERNATE CONFIGURATIONS" below.
++       This  man  page  primarily  surveys  functions  that  appear   in   any
++       configuration of the library.  There are two common configurations; see
++       section "ALTERNATE CONFIGURATIONS" below.
+ 
+        ncurses   is the library in its "non-wide" configuration, handling only
+                  eight-bit  characters.   It  stores a character combined with
+-                 attributes in a chtype datum, which is often an alias of int.
+-
+-                 Attributes alone (with no  corresponding  character)  can  be
+-                 stored  in  variables  of  chtype  or attr_t type.  In either
+-                 case, they are represented as an integral bit mask.
++                 attributes and a color pair in a chtype datum, which is often
++                 an alias of int.  A string of curses characters is similar to
++                 a C char string; a chtype string ends with an integral 0, the
++                 null curses character.
++
++                 Attributes  and a color pair selection (with no corresponding
++                 character) can be stored in variables  of  chtype  or  attr_t
++                 type.   In either case, they are accessed via an integral bit
++                 mask.
+ 
+                  Each cell of a WINDOW is stored as a chtype.
+ 
+@@ -272,53 +276,56 @@
+                           cell  (as  with  accent marks and other diacritics).
+                           Each  character  is  of  type  wchar_t;  a   complex
+                           character contains one spacing character and zero or
+-                          more non-spacing characters (see below).  Attributes
+-                          and  color data are stored in separate fields of the
+-                          structure, not combined as in chtype.
++                          more non-spacing characters (see below).   A  string
++                          of  complex  characters  ends  with  a cchar_t whose
++                          wchar_t  member  is   the   null   wide   character.
++                          Attributes  and a color pair selection are stored in
++                          separate fields of the structure, not combined  into
++                          an integer as in chtype.
+ 
+                  Each cell of a WINDOW is stored as a cchar_t.
+ 
+-                 setcchar(3x) and  getcchar(3x)  store  and  retrieve  cchar_t
+-                 data.   The  wide  library API of ncurses depends on two data
++                 setcchar(3x)  and  getcchar(3x)  store  and  retrieve cchar_t
++                 data.  The wide library API of ncurses depends  on  two  data
+                  types standardized by ISO C95.
+ 
+-                 wchar_t  stores a wide character.  Like chtype, it may be  an
+-                          alias  of int.  Depending on the character encoding,
+-                          a wide character may be  spacing,  meaning  that  it
+-                          occupies  a  character  cell by itself and typically
+-                          accompanies  cursor  advancement,  or   non-spacing,
+-                          meaning  that it occupies the same cell as a spacing
+-                          character, is often regarded as a "modifier" of  the
+-                          base  glyph  with  which  it combines, and typically
++                 wchar_t  stores  a wide character.  Like chtype, it may be an
++                          alias of int.  Depending on the character  encoding,
++                          a  wide  character  may  be spacing, meaning that it
++                          occupies a character cell by  itself  and  typically
++                          accompanies   cursor  advancement,  or  non-spacing,
++                          meaning that it occupies the same cell as a  spacing
++                          character,  is often regarded as a "modifier" of the
++                          base glyph with which  it  combines,  and  typically
+                           does not advance the cursor.
+ 
+-                 wint_t   can  store  a  wchar_t   or   the   constant   WEOF,
+-                          analogously  to the int-sized character manipulation
++                 wint_t   can   store   a   wchar_t   or  the  constant  WEOF,
++                          analogously to the int-sized character  manipulation
+                           functions of ISO C and its constant EOF.
+ 
+-                 The  wide  library   provides   additional   functions   that
+-                 complement  those  in  the non-wide library where the size of
+-                 the underlying character type  is  significant.   A  somewhat
+-                 regular  naming  convention relates many of the wide variants
+-                 to their non-wide counterparts;  where  a  non-wide  function
+-                 name  contains  "ch"  or "str", prefix it with "_w" to obtain
+-                 the wide counterpart.  For example, waddch becomes  wadd_wch.
+-                 (Exceptions  that  add only "w" comprise addwstr, inwstr, and
++                 The   wide   library   provides   additional  functions  that
++                 complement those in the non-wide library where  the  size  of
++                 the  underlying  character  type  is significant.  A somewhat
++                 regular naming convention relates many of the  wide  variants
++                 to  their  non-wide  counterparts;  where a non-wide function
++                 name contains "ch" or "str", prefix it with  "_w"  to  obtain
++                 the  wide counterpart.  For example, waddch becomes wadd_wch.
++                 (Exceptions that add only "w" comprise addwstr,  inwstr,  and
+                  their variants.)
+ 
+-                 This convention is inapplicable  to  some  non-wide  function
++                 This  convention  is  inapplicable  to some non-wide function
+                  names,  so  other  transformations  are  used  for  the  wide
+                  configuration:  the  window  background  management  function
+-                 "bkgd"   becomes  "bkgrnd";  the  window  border-drawing  and
+-                 -clearing functions are suffixed with "_set";  and  character
+-                 attribute   manipulation   functions   like  "attron"  become
++                 "bkgd"  becomes  "bkgrnd";  the  window  border-drawing   and
++                 -clearing  functions  are suffixed with "_set"; and character
++                 attribute  manipulation  functions   like   "attron"   become
+                  "attr_on".
+ 
+ 
+

                                      Function Name Index

                                      +        The following table lists the curses functions provided in the non-wide
+-       and  wide  APIs  and  the  corresponding  man pages that describe them.
+-       Those flagged with  "*"  are  ncurses-specific,  neither  described  by
++       and wide APIs and the  corresponding  man  pages  that  describe  them.
++       Those  flagged  with  "*"  are  ncurses-specific,  neither described by
+        X/Open Curses nor present in SVr4.
+ 
+                     curses Function Name     Man Page
+@@ -375,12 +382,12 @@
+                     delch                    curs_delch(3x)
+                     deleteln                 curs_deleteln(3x)
+                     delscreen                curs_initscr(3x)
++
+                     delwin                   curs_window(3x)
+                     derwin                   curs_window(3x)
+                     doupdate                 curs_refresh(3x)
+                     dupwin                   curs_window(3x)
+                     echo                     curs_inopts(3x)
+-
+                     echo_wchar               curs_add_wch(3x)
+                     echochar                 curs_addch(3x)
+                     endwin                   curs_initscr(3x)
+@@ -442,11 +449,11 @@
+                     inchstr                  curs_inchstr(3x)
+                     init_color               curs_color(3x)
+                     init_extended_color      curs_color(3x)*
++
+                     init_extended_pair       curs_color(3x)*
+                     init_pair                curs_color(3x)
+                     initscr                  curs_initscr(3x)
+                     innstr                   curs_instr(3x)
+-
+                     innwstr                  curs_inwstr(3x)
+                     ins_nwstr                curs_ins_wstr(3x)
+                     ins_wch                  curs_ins_wch(3x)
+@@ -509,10 +516,10 @@
+                     mvcur                    curs_terminfo(3x)
+                     mvdelch                  curs_delch(3x)
+                     mvderwin                 curs_window(3x)
++
+                     mvget_wch                curs_get_wch(3x)
+                     mvget_wstr               curs_get_wstr(3x)
+                     mvgetch                  curs_getch(3x)
+-
+                     mvgetn_wstr              curs_get_wstr(3x)
+                     mvgetnstr                curs_getstr(3x)
+                     mvgetstr                 curs_getstr(3x)
+@@ -576,9 +583,9 @@
+                     mvwinstr                 curs_instr(3x)
+                     mvwinwstr                curs_inwstr(3x)
+                     mvwprintw                curs_printw(3x)
++
+                     mvwscanw                 curs_scanw(3x)
+                     mvwvline                 curs_border(3x)
+-
+                     mvwvline_set             curs_border_set(3x)
+                     napms                    curs_kernel(3x)
+                     newpad                   curs_pad(3x)
+@@ -643,8 +650,8 @@
+                     slk_color                curs_slk(3x)
+                     slk_init                 curs_slk(3x)
+                     slk_label                curs_slk(3x)
+-                    slk_noutrefresh          curs_slk(3x)
+ 
++                    slk_noutrefresh          curs_slk(3x)
+                     slk_refresh              curs_slk(3x)
+                     slk_restore              curs_slk(3x)
+                     slk_set                  curs_slk(3x)
+@@ -776,8 +783,8 @@
+                     wscanw                   curs_scanw(3x)
+                     wscrl                    curs_scroll(3x)
+                     wsetscrreg               curs_outopts(3x)
+-
+                     wstandend                curs_attr(3x)
++
+                     wstandout                curs_attr(3x)
+                     wsyncdown                curs_window(3x)
+                     wsyncup                  curs_window(3x)
+@@ -787,235 +794,235 @@
+                     wvline                   curs_border(3x)
+                     wvline_set               curs_border_set(3x)
+ 
+-       ncurses's    screen-pointer   extension   adds   additional   functions
+-       corresponding to many of the above, each  with  an  "_sp"  suffix;  see
++       ncurses's   screen-pointer   extension   adds   additional    functions
++       corresponding  to  many  of  the  above, each with an "_sp" suffix; see
+        curs_sp_funcs(3x).
+ 
+-       The  availability  of  some  extensions is configurable when ncurses is
+-       compiled; see  sections  "ALTERNATE  CONFIGURATIONS"  and  "EXTENSIONS"
++       The availability of some extensions is  configurable  when  ncurses  is
++       compiled;  see  sections  "ALTERNATE  CONFIGURATIONS"  and "EXTENSIONS"
+        below.
+ 
+ 
+

                                      RETURN VALUE

                                      +-       Unless  otherwise  noted, functions that return an integer return OK on
+-       success and ERR on failure.  Functions that return pointers return NULL
+-       on  failure.   Typically,  ncurses  treats  a  null pointer passed as a
+-       function parameter as a failure.  Functions prefixed  with  "mv"  first
+-       perform  cursor movement and fail if the position (y, x) is outside the
+-       window boundaries.
++       Unless otherwise noted,  functions  that  return  integers  return  the
++       constants  OK  on  success  and ERR on failure; see curs_variables(3x).
++       Functions that return pointers  return  NULL  on  failure.   Typically,
++       ncurses  treats  a  null  pointer  passed  as a function parameter as a
++       failure.  Functions prefixed with "mv" first  perform  cursor  movement
++       and fail if the position (y, x) is outside the window boundaries.
+ 
+ 
+

                                      ENVIRONMENT

                                      +-       The following  symbols  from  the  process  environment  customize  the
+-       runtime   behavior   of  ncurses  applications.   The  library  may  be
+-       configured  to  disregard  the   variables   TERMINFO,   TERMINFO_DIRS,
+-       TERMPATH,  and  HOME,  if  the  user  is  the  superuser (root), or the
++       The  following  symbols  from  the  process  environment  customize the
++       runtime  behavior  of  ncurses  applications.   The  library   may   be
++       configured   to   disregard   the  variables  TERMINFO,  TERMINFO_DIRS,
++       TERMPATH, and HOME, if  the  user  is  the  superuser  (root),  or  the
+        application uses setuid(2) or setgid(2).
+ 
+ 
+

                                      BAUDRATE

                                      +-       The debugging library checks this variable  when  the  application  has
+-       redirected  output  to a file.  Its integral value is used for the baud
+-       rate.  If that value is absent or invalid,  ncurses  uses  9600.   This
+-       feature  allows  testers  to  construct repeatable test cases that take
++       The  debugging  library  checks  this variable when the application has
++       redirected output to a file.  Its integral value is used for  the  baud
++       rate.   If  that  value  is absent or invalid, ncurses uses 9600.  This
++       feature allows developers to construct repeatable test cases that  take
+        into account optimization decisions that depend on baud rate.
+ 
+ 
+

                                      CC (command character)

                                      +-       When set, the command_character  (cmdch)  capability  value  of  loaded
++       When  set,  the  command_character  (cmdch)  capability value of loaded
+        terminfo entries changes to the value of this variable.  Very few term-
+        info entries provide this feature.
+ 
+        Because this name is also used in development environments to represent
+-       the  C  compiler's  name,  ncurses  ignores  its value if it is not one
++       the C compiler's name, ncurses ignores its  value  if  it  is  not  one
+        character in length.
+ 
+ 
+

                                      COLUMNS

                                      +        This  variable  specifies  the  width  of  the  screen  in  characters.
+-       Applications  running  in  a  windowing environment usually are able to
++       Applications running in a windowing environment  usually  are  able  to
+        obtain the width of the window in which they are executing.  If COLUMNS
+        is not defined and the terminal's screen size is not available from the
+-       terminal driver, ncurses uses the size specified by the columns  (cols)
+-       capability  of  the  terminal type's entry in the terminfo database, if
++       terminal  driver, ncurses uses the size specified by the columns (cols)
++       capability of the terminal type's entry in the  terminfo  database,  if
+        any.
+ 
+-       It is important that your application  use  the  correct  screen  size.
+-       Automatic   detection   thereof  is  not  always  possible  because  an
+-       application may  be  running  on  a  host  that  does  not  honor  NAWS
+-       (Negotiations  About  Window  Size)  or as a different user ID than the
+-       owner of the  terminal  device  file.   Setting  COLUMNS  and/or  LINES
+-       overrides  the  library's  use  of  the  screen  size obtained from the
++       It  is  important  that  your  application use the correct screen size.
++       Automatic  detection  thereof  is  not  always  possible   because   an
++       application  may  be  running  on  a  host  that  does  not  honor NAWS
++       (Negotiations About Window Size) or as a different  user  ID  than  the
++       owner  of  the  terminal  device  file.   Setting  COLUMNS and/or LINES
++       overrides the library's use  of  the  screen  size  obtained  from  the
+        operating system.
+ 
+-       The COLUMNS and LINES variables may be specified  independently.   This
+-       property  is  useful  to circumvent misfeatures of legacy terminal type
+-       descriptions; xterm(1)  descriptions  specifying  65  lines  were  once
+-       notorious.    For   best  results,  avoid  specifying  cols  and  lines
++       The  COLUMNS  and LINES variables may be specified independently.  This
++       property is useful to circumvent misfeatures of  legacy  terminal  type
++       descriptions;  xterm(1)  descriptions  specifying  65  lines  were once
++       notorious.   For  best  results,  avoid  specifying  cols   and   lines
+        capability codes in terminfo descriptions of terminal emulators.
+ 
+-       use_env(3x) can disable use of the process environment  in  determining
+-       the  screen size.  use_tioctl(3x) can update COLUMNS and LINES to match
++       use_env(3x)  can  disable use of the process environment in determining
++       the screen size.  use_tioctl(3x) can update COLUMNS and LINES to  match
+        the screen size obtained from system calls or the terminal database.
+ 
+ 
+

                                      ESCDELAY

                                      +-       For curses to distinguish the ESC character  resulting  from  a  user's
+-       press  of  the  "Escape"  key on the input device from one beginning an
++       For  curses  to  distinguish  the ESC character resulting from a user's
++       press of the "Escape" key on the input device  from  one  beginning  an
+        escape sequence (as commonly produced by function keys), it waits after
+-       receiving  the  escape  character  to  see  if  further  characters are
+-       available on the input  stream  within  a  short  interval.   A  global
+-       variable  ESCDELAY  stores  this interval in milliseconds.  The default
++       receiving the  escape  character  to  see  if  further  characters  are
++       available  on  the  input  stream  within  a  short interval.  A global
++       variable ESCDELAY stores this interval in  milliseconds.   The  default
+        value of 1000 (one second) is adequate for most uses.  This environment
+        variable overrides it.
+ 
+-       The  most common instance where you may wish to change this value is to
++       The most common instance where you may wish to change this value is  to
+        work with a remote host over a slow communication channel.  If the host
+-       running  a  curses  application  does  not receive the characters of an
+-       escape sequence in a timely manner, the library can interpret  them  as
++       running a curses application does not  receive  the  characters  of  an
++       escape  sequence  in a timely manner, the library can interpret them as
+        multiple key stroke events.
+ 
+        xterm(1) mouse events are a form of escape sequence; therefore, if your
+-       application makes heavy use  of  multiple-clicking,  you  may  wish  to
+-       lengthen  the  default value because the delay applies to the composite
++       application  makes  heavy  use  of  multiple-clicking,  you may wish to
++       lengthen the default value because the delay applies to  the  composite
+        multi-click event as well as the individual clicks.
+ 
+-       Portable applications should not rely upon the presence of ESCDELAY  in
+-       either  form,  but  setting  the  environment  variable rather than the
++       Portable  applications should not rely upon the presence of ESCDELAY in
++       either form, but setting  the  environment  variable  rather  than  the
+        global variable does not create problems when compiling an application.
+ 
+-       If keypad(3x) is disabled for the  curses  window  receiving  input,  a
++       If  keypad(3x)  is  disabled  for  the curses window receiving input, a
+        program must disambiguate escape sequences itself.
+ 
+ 
+

                                      HOME

                                      +-       ncurses  may read and write auxiliary terminal descriptions in .termcap
++       ncurses may read and write auxiliary terminal descriptions in  .termcap
+        and .terminfo files in the user's home directory.
+ 
+ 
+

                                      LINES

                                      +-       This counterpart to COLUMNS specifies  the  height  of  the  screen  in
+-       characters.   The  corresponding terminfo capability and code is lines.
++       This  counterpart  to  COLUMNS  specifies  the  height of the screen in
++       characters.  The corresponding terminfo capability and code  is  lines.
+        See the description of the COLUMNS variable above.
+ 
+ 
+

                                      MOUSE_BUTTONS_123

                                      +-       (OS/2 EMX port only) OS/2 numbers a three-button  mouse  inconsistently
+-       with  other platforms, such that 1 is the left button, 2 the right, and
+-       3 the middle.  This variable customizes  the  mouse  button  numbering.
+-       Its  value  must be three digits 1-3 in any order.  By default, ncurses
++       (OS/2  EMX  port only) OS/2 numbers a three-button mouse inconsistently
++       with other platforms, such that 1 is the left button, 2 the right,  and
++       3  the  middle.   This  variable customizes the mouse button numbering.
++       Its value must be three digits 1-3 in any order.  By  default,  ncurses
+        assumes a numbering of "132".
+ 
+ 
+

                                      NCURSES_ASSUMED_COLORS

                                      +-       If set, this  variable  overrides  the  ncurses  library's  compiled-in
+-       assumption  that  the terminal's default colors are white on black; see
+-       default_colors(3x).  Set the foreground  and  background  color  values
+-       with  this  environment  variable  by  assigning  it two integer values
++       If  set,  this  variable  overrides  the  ncurses library's compiled-in
++       assumption that the terminal's default colors are white on  black;  see
++       default_colors(3x).   Set  the  foreground  and background color values
++       with this environment variable  by  assigning  it  two  integer  values
+        separated  by  a  comma,  indicating  foregound  and  background  color
+        numbers, respectively.
+ 
+-       For  example,  to tell ncurses not to assume anything about the colors,
+-       use a value of "-1,-1".  To make the  default  color  scheme  green  on
+-       black,  use  "2,0".   ncurses accepts integral values from -1 up to the
++       For example, to tell ncurses not to assume anything about  the  colors,
++       use  a  value  of  "-1,-1".   To make the default color scheme green on
++       black, use "2,0".  ncurses accepts integral values from -1  up  to  the
+        value of the terminfo max_colors (colors) capability.
+ 
+ 
+

                                      NCURSES_CONSOLE2

                                      +-       (MinGW  port  only)  The  Console2  program  defectively  handles   the
+-       Microsoft  Console  API  call  CreateConsoleScreenBuffer.  Applications
+-       that use it will hang.  However, it is possible to simulate the  action
+-       of  this  call  by mapping coordinates, explicitly saving and restoring
+-       the original screen contents.  Setting the environment  variable  NCGDB
++       (MinGW   port  only)  The  Console2  program  defectively  handles  the
++       Microsoft Console  API  call  CreateConsoleScreenBuffer.   Applications
++       that  use it will hang.  However, it is possible to simulate the action
++       of this call by mapping coordinates, explicitly  saving  and  restoring
++       the  original  screen contents.  Setting the environment variable NCGDB
+        has the same effect.
+ 
+ 
+

                                      NCURSES_GPM_TERMS

                                      +-       (Linux  only) When ncurses is configured to use the GPM interface, this
+-       variable may list one or more terminal names  against  which  the  TERM
+-       variable  (see  below)  is  matched.   An  empty value disables the GPM
+-       interface,  using  ncurses's  built-in  support  for   xterm(1)   mouse
++       (Linux only) When ncurses is configured to use the GPM interface,  this
++       variable  may  list  one  or more terminal type names against which the
++       TERM variable (see below) is matched.  An empty value disables the  GPM
++       interface,   using   ncurses's  built-in  support  for  xterm(1)  mouse
+        protocols instead.  If the variable is absent, ncurses attempts to open
+        GPM if TERM contains "linux".
+ 
+ 
+

                                      NCURSES_NO_HARD_TABS

                                      +-       ncurses may use tab characters in  cursor  movement  optimization.   In
+-       some  cases,  your  terminal  driver may not handle them properly.  Set
++       ncurses  may  use  tab  characters in cursor movement optimization.  In
++       some cases, your terminal driver may not  handle  them  properly.   Set
+        this environment variable to any value to disable the feature.  You can
+        also adjust your stty(1) settings to avoid the problem.
+ 
+ 
+

                                      NCURSES_NO_MAGIC_COOKIE

                                      +-       Many  terminals  store  video  attributes  as a property of a character
+-       cell, as curses does.  Historically, some  recorded  changes  in  video
+-       attributes  as  data  that  logically  occupies  character cells on the
+-       display, switching attributes on or off, similarly to tags in a  markup
+-       language;  these  are  termed "magic cookies", and must be subsequently
+-       overprinted.  If the terminfo entry for your  terminal  type  does  not
++       Many terminals store video attributes as  a  property  of  a  character
++       cell,  as  curses  does.   Historically, some recorded changes in video
++       attributes as data that  logically  occupies  character  cells  on  the
++       display,  switching attributes on or off, similarly to tags in a markup
++       language; these are termed "magic cookies", and  must  be  subsequently
++       overprinted.   If  the  terminfo  entry for your terminal type does not
+        adequately describe its handling of magic cookies, set this variable to
+        any value to instruct ncurses to disable attributes entirely.
+ 
+ 
+

                                      NCURSES_NO_PADDING

                                      +        Most  terminal  type  descriptions  in  the  terminfo  database  detail
+-       hardware   devices.   Many  people  use  curses-based  applications  in
+-       terminal emulator programs that run in a windowing environment.   These
+-       programs  can  duplicate  all  of  the important features of a hardware
+-       terminal, but often lack their limitations.  Chief among  these  absent
++       hardware  devices.   Many  people  use  curses-based  applications   in
++       terminal  emulator programs that run in a windowing environment.  These
++       programs can duplicate all of the  important  features  of  a  hardware
++       terminal,  but  often lack their limitations.  Chief among these absent
+        drawbacks is the problem of data flow management; that is, limiting the
+-       speed of communication to what the hardware  could  handle.   Unless  a
+-       hardware  terminal  is  interfaced  into a terminal concentrator (which
+-       does flow control), an application must manage flow control  itself  to
+-       prevent overruns and data loss.
+-
+-       A  solution  that  comes  at  no hardware cost is for an application to
+-       pause after directing a  terminal  to  execute  an  operation  that  it
+-       performs  slowly,  such  as  clearing  the display.  Many terminal type
+-       descriptions, including that for the VT100, embed delay  specifications
+-       in  capabilities.   You  may  wish  to  use these terminal descriptions
+-       without paying the performance penalty.  Set NCURSES_NO_PADDING to  any
+-       value  to disable all but mandatory padding.  Mandatory padding is used
++       speed  of  communication  to  what the hardware could handle.  Unless a
++       hardware terminal is interfaced into  a  terminal  concentrator  (which
++       does  flow  control), an application must manage flow itself to prevent
++       overruns and data loss.
++
++       A solution that comes at no hardware cost  is  for  an  application  to
++       pause  after  directing  a  terminal  to  execute  an operation that it
++       performs slowly, such as clearing  the  display.   Many  terminal  type
++       descriptions,  including that for the VT100, embed delay specifications
++       in capabilities.  You may  wish  to  use  these  terminal  descriptions
++       without  paying the performance penalty.  Set NCURSES_NO_PADDING to any
++       value to disable all but mandatory padding.  Mandatory padding is  used
+        by such terminal capabilities as flash_screen (flash).
+ 
+ 
+

                                      NCURSES_NO_SETBUF

                                      +-       (Obsolete) Prior to internal changes developed in ncurses 5.9  (patches
+-       20120825  through 20130126), the library used setbuf(3) to enable fully
+-       buffered output when initializing the terminal.  This was done,  as  in
+-       SVr4  curses,  to  increase performance.  For testing purposes, both of
+-       ncurses and of certain applications, this feature  was  made  optional.
+-       Setting  this  variable  disabled  output buffering, leaving the output
++       (Obsolete)  Prior to internal changes developed in ncurses 5.9 (patches
++       20120825 through 20130126), the library used setbuf(3) to enable  fully
++       buffered  output  when initializing the terminal.  This was done, as in
++       SVr4 curses, to increase performance.  For testing  purposes,  both  of
++       ncurses  and  of  certain applications, this feature was made optional.
++       Setting this variable disabled output  buffering,  leaving  the  output
+        stream in the original (usually line-buffered) mode.
+ 
+-       Nowadays, ncurses performs its own buffering and does not require  this
+-       workaround;  it  does  not  modify the buffering of the standard output
+-       stream.  This approach makes signal handling, as for  interrupts,  more
+-       robust.   A  drawback  is  that  certain  unconventional programs mixed
+-       stdio(3) calls with ncurses calls and (usually) got the  behavior  they
+-       expected.   This  is  no longer the case; ncurses does not write to the
++       Nowadays,  ncurses performs its own buffering and does not require this
++       workaround; it does not modify the buffering  of  the  standard  output
++       stream.   This  approach makes signal handling, as for interrupts, more
++       robust.  A drawback  is  that  certain  unconventional  programs  mixed
++       stdio(3)  calls  with ncurses calls and (usually) got the behavior they
++       expected.  This is no longer the case; ncurses does not  write  to  the
+        standard output file descriptor through a stdio-buffered stream.
+ 
+-       As a special case, low-level API calls such as putp(3x) still  use  the
+-       standard  output stream.  High-level curses calls such as printw(3x) do
++       As  a  special case, low-level API calls such as putp(3x) still use the
++       standard output stream.  High-level curses calls such as printw(3x)  do
+        not.
+ 
+ 
+

                                      NCURSES_NO_UTF8_ACS

                                      +-       At initialization, ncurses inspects the TERM environment  variable  for
+-       special   cases   where   VT100   forms-drawing   characters  (and  the
+-       corresponding alternate character set terminfo capabilities) are  known
++       At  initialization,  ncurses inspects the TERM environment variable for
++       special  cases  where   VT100   forms-drawing   characters   (and   the
++       corresponding  alternate character set terminfo capabilities) are known
+        to  be  unsupported  by  terminal  types  that  otherwise  claim  VT100
+        compatibility.  Specifically, when running in a UTF-8 locale, the Linux
+-       virtual  console device and the GNU screen(1) program ignore them.  Set
++       virtual console device and the GNU screen(1) program ignore them.   Set
+        this  variable  to  a  nonzero  value  to  instruct  ncurses  that  the
+        terminal's ACS support is broken; the library then outputs Unicode code
+        points that correspond to the forms-drawing characters.  Set it to zero
+        (or a non-integer) to disable the special check for terminal type names
+-       matching "linux" or "screen", directing ncurses to assume that the  ACS
++       matching  "linux" or "screen", directing ncurses to assume that the ACS
+        feature works if the terminal type description advertises it.
+ 
+-       As  an  alternative  to  use  of  this  variable, ncurses checks for an
++       As an alternative to use  of  this  variable,  ncurses  checks  for  an
+        extended terminfo numeric capability U8 that can be compiled using "tic
+        -x".  Examples follow.
+ 
+@@ -1028,62 +1035,62 @@
+           xterm-utf8|xterm relying on UTF-8 line-graphics,
+                   U8#1, use=xterm,
+ 
+-       The  two-character name "U8" was chosen to permit its use via ncurses's
++       The two-character name "U8" was chosen to permit its use via  ncurses's
+        termcap interface.
+ 
+ 
+

                                      NCURSES_TRACE

                                      +-       At initialization, ncurses (in its debugging configuration) checks  for
+-       this  variable's  presence.   If  defined  with  an integral value, the
++       At  initialization, ncurses (in its debugging configuration) checks for
++       this variable's presence.  If  defined  with  an  integral  value,  the
+        library calls curses_trace(3x) with that value as the argument.
+ 
+ 
+

                                      TERM

                                      +-       The TERM variable denotes the terminal type.  Each is distinct,  though
+-       many  are  similar.   It  is commonly set by terminal emulators to help
+-       applications find a  workable  terminal  description.   Some  choose  a
+-       popular  approximation  such as "ansi", "vt100", or "xterm" rather than
+-       an exact fit to their capabilities.  Not infrequently,  an  application
+-       will  have  problems  with that approach; for example, a key stroke may
+-       not operate  correctly,  or  produce  no  effect  but  seeming  garbage
++       The  TERM variable denotes the terminal type.  Each is distinct, though
++       many are similar.  It is commonly set by  terminal  emulators  to  help
++       applications  find  a  workable  terminal  description.   Some choose a
++       popular approximation such as "ansi", "vt100", or "xterm"  rather  than
++       an  exact  fit to their capabilities.  Not infrequently, an application
++       will have problems with that approach; for example, a  key  stroke  may
++       not  operate  correctly,  or  produce  no  effect  but  seeming garbage
+        characters on the screen.
+ 
+-       Setting  TERM  has  no effect on hardware operation; it affects the way
+-       applications communicate with the terminal.   Likewise,  as  a  general
+-       rule  (xterm(1)  being a rare exception), terminal emulators that allow
++       Setting TERM has no effect on hardware operation; it  affects  the  way
++       applications  communicate  with  the  terminal.  Likewise, as a general
++       rule (xterm(1) being a rare exception), terminal emulators  that  allow
+        you to specify TERM as a parameter or configuration value do not change
+        their behavior to match that setting.
+ 
+ 
+

                                      TERMCAP

                                      +        If ncurses is configured with termcap support, it checks for a terminal
+-       type description in termcap format if one in  terminfo  format  is  not
+-       available.   Setting  this variable directs ncurses to ignore the usual
+-       termcap database location, /etc/termcap; see TERMPATH  below.   TERMCAP
+-       should  contain  either  a terminal description (with newlines stripped
+-       out), or a file name indicating where the information required  by  the
++       type  description  in  termcap  format if one in terminfo format is not
++       available.  Setting this variable directs ncurses to ignore  the  usual
++       termcap  database  location, /etc/termcap; see TERMPATH below.  TERMCAP
++       should contain either a terminal description  (with  newlines  stripped
++       out),  or  a file name indicating where the information required by the
+        TERM environment variable is stored.
+ 
+ 
+

                                      TERMINFO

                                      +-       ncurses  can  be configured to read terminal type description databases
+-       in various locations using different formats.  This variable  overrides
++       ncurses can be configured to read terminal type  description  databases
++       in  various locations using different formats.  This variable overrides
+        the default location.
+ 
+-       o   Descriptions  in terminfo format are normally stored in a directory
+-           tree using subdirectories named by the common first letters of  the
++       o   Descriptions in terminfo format are normally stored in a  directory
++           tree  using subdirectories named by the common first letters of the
+            terminal types named therein.  This is the scheme used in System V.
+ 
+        o   If ncurses is configured to use hashed databases, then TERMINFO may
+-           name its location,  such  as  /usr/share/terminfo.db,  rather  than
++           name  its  location,  such  as  /usr/share/terminfo.db, rather than
+            /usr/share/terminfo/.
+ 
+-       The  hashed  database  uses less disk space and is a little faster than
++       The hashed database uses less disk space and is a  little  faster  than
+        the directory tree.  However, some applications assume the existence of
+        the directory tree, and read it directly rather than using the terminfo
+        API.
+ 
+-       o   If ncurses is configured with termcap support,  this  variable  may
++       o   If  ncurses  is  configured with termcap support, this variable may
+            contain the location of a termcap file.
+ 
+        o   If the value of TERMINFO begins with "hex:" or "b64:", ncurses uses
+@@ -1093,10 +1100,10 @@
+                   TERMINFO=$(infocmp -0 -Q2 -q)
+                   export TERMINFO
+ 
+-           The  compiled  description  is  used  only if it corresponds to the
++           The compiled description is used only  if  it  corresponds  to  the
+            terminal type identified by TERM.
+ 
+-       Setting TERMINFO is the simplest, but  not  the  only,  way  to  direct
++       Setting  TERMINFO  is  the  simplest,  but  not the only, way to direct
+        ncurses to a terminal database.  The search path is as follows.
+ 
+        o   the last terminal database to which the running ncurses application
+@@ -1110,20 +1117,20 @@
+ 
+        o   location(s) configured and compiled into ncurses
+ 
+-          o   /usr/share/terminfo
++           o   /usr/share/terminfo
+ 
+ 
+

                                      TERMINFO_DIRS

                                      +-       This variable specifies a list of locations, akin  to  PATH,  in  which
+-       ncurses  searches  for  the  terminal  type  descriptions  described by
+-       TERMINFO above.  The list items are separated by  colons  on  Unix  and
+-       semicolons  on  OS/2  EMX.   System V  terminfo  lacks  a corresponding
++       This  variable  specifies  a  list of locations, akin to PATH, in which
++       ncurses searches  for  the  terminal  type  descriptions  described  by
++       TERMINFO  above.   The  list  items are separated by colons on Unix and
++       semicolons on  OS/2  EMX.   System V  terminfo  lacks  a  corresponding
+        feature; TERMINFO_DIRS is an ncurses extension.
+ 
+ 
+

                                      TERMPATH

                                      +        If TERMCAP does not hold a terminal type description or file name, then
+-       ncurses  checks  the contents of TERMPATH, a list of locations, akin to
++       ncurses checks the contents of TERMPATH, a list of locations,  akin  to
+        PATH, in which it searches for termcap terminal type descriptions.  The
+        list items are separated by colons on Unix and semicolons on OS/2 EMX.
+ 
+@@ -1133,25 +1140,30 @@
+ 
+ 
+

                                      ALTERNATE CONFIGURATIONS

                                      +-       Many  different  ncurses configurations are possible, determined by the
+-       options given to the configure script when building the  library.   Run
+-       the  script  with  the  --help option to peruse them all.  A few are of
++       Many different ncurses configurations are possible, determined  by  the
++       options  given  to the configure script when building the library.  Run
++       the script with the --help option to peruse them all.   A  few  are  of
+        particular significance to the application developer employing ncurses.
+ 
+        --disable-overwrite
+-            The standard include for ncurses is as noted in SYNOPSIS:
++            The standard C preprocessor inclusion for the curses library is as
++            follows.
+ 
+                 #include <curses.h>
+ 
+-            This option is used to avoid filename conflicts  when  ncurses  is
+-            not the main implementation of curses of the computer.  If ncurses
+-            is installed  disabling  overwrite,  it  puts  its  headers  in  a
+-            subdirectory, e.g.,
++            This option is used to avoid file name conflicts  between  ncurses
++            and  an existing curses installation on the system.  If ncurses is
++            installed disabling overwrite, it  puts  its  header  files  in  a
++            subdirectory.  Here is an example.
+ 
+                 #include <ncurses/curses.h>
+ 
+-            It  also  omits  a  symbolic  link  which  would  allow you to use
+-            -lcurses to build executables.
++            Installation  also  omits  a  symbolic  link  that would cause the
++            compiler's -lcurses option  to  link  object  files  with  ncurses
++            instead of the system curses library.
++
++            The  directory  used  by this configuration of ncurses is shown in
++            section "SYNOPSIS" above.
+ 
+        --enable-widec
+             The  configure  script   renames   the   library   and   (if   the
+@@ -1265,7 +1277,7 @@
+        o   to  reuse functions (for example, those that move the cursor before
+            another operation), and
+ 
+-       o   a few special cases.
++       o   in a few special cases.
+ 
+        If the standard  output  file  descriptor  of  an  ncurses  program  is
+        redirected  to  something  that  is  not a terminal device, the library
+@@ -1302,8 +1314,8 @@
+        An  ncurses  application  can  eschew  knowledge  of  WINDOW  structure
+        internals, instead using accessor functions such as is_scrollok(3x).
+ 
+-       ncurses  enables  an  application  to  direct  application  output to a
+-       printer attached to the terminal device; see curs_print(3x).
++       ncurses  enables  an  application  to  direct  its  output to a printer
++       attached to the terminal device; see curs_print(3x).
+ 
+        ncurses offers slk_attr(3x) as a counterpart of attr_get(3x) for  soft-
+        label  key lines, and extended_slk_color(3x) as a form of slk_color(3x)
+@@ -1314,155 +1326,158 @@
+        unctrl(3x)'s behavior; see use_legacy_coding(3x).  ncurses is  compiled
+        to support them; section "ALTERNATE CONFIGURATIONS" describes how.
+ 
+-       o   Rudimentary   support   for   multi-threaded  applications  may  be
+-           available; see curs_threads(3x).
++       ncurses    permits   modification   of   unctrl(3x)'s   behavior;   see
++       use_legacy_coding(3x).
++
++       Rudimentary support for multi-threaded applications may  be  available;
++       see curs_threads(3x).
+ 
+-       o   Functions that ease the  management  of  multiple  screens  can  be
+-           exposed; see curs_sp_funcs(3x).
++       Functions  that ease the management of multiple screens can be exposed;
++       see curs_sp_funcs(3x).
+ 
+-       o   To aid applications to debug their memory usage, ncurses optionally
+-           offers functions to more aggressively free  memory  it  dynamically
+-           allocates itself; see curs_memleaks(3x).
+-
+-       o   The   library  facilitates  auditing  and  troubleshooting  of  its
+-           behavior; see curs_trace(3x).
+-
+-       o   The compiler option -DUSE_GETCAP causes the library to fall back to
+-           reading /etc/termcap if the terminal setup code cannot find a term-
+-           info entry corresponding to TERM.   Use  of  this  feature  is  not
+-           recommended,  as it essentially includes an entire termcap compiler
+-           in the ncurses  startup  code,  at  a  cost  in  memory  usage  and
+-           application launch latency.
++       To aid applications to debug their  memory  usage,  ncurses  optionally
++       offers  functions  to  more  aggressively  free  memory  it dynamically
++       allocates itself; see curs_memleaks(3x).
++
++       The library facilitates auditing and troubleshooting of  its  behavior;
++       see curs_trace(3x).
++
++       Compiling  ncurses  with the option -DUSE_GETCAP causes it to fall back
++       to reading /etc/termcap if the terminal setup code cannot find a  term-
++       info  entry  corresponding  to  TERM.   Use  of  this  feature  is  not
++       recommended, as it essentially includes an entire termcap  compiler  in
++       the  ncurses  startup  code,  at a cost in memory usage and application
++       launch latency.
+ 
+-       PDCurses   and  NetBSD  curses  incorporate  some  ncurses  extensions.
++       PDCurses  and  NetBSD  curses  incorporate  some  ncurses   extensions.
+        Individual man pages indicate where this is the case.
+ 
+ 
+

                                      PORTABILITY

                                      +        X/Open Curses defines two levels of conformance, "base" and "enhanced".
+        The latter includes several additional features, such as wide-character
+-       and color support.  ncurses intends base-level conformance with  X/Open
+-       Curses,  and  supports  all  features  of its enhanced level except the
++       and  color support.  ncurses intends base-level conformance with X/Open
++       Curses, and supports all features of  its  enhanced  level  except  the
+        untic utility.
+ 
+-       Differences between X/Open Curses and ncurses  are  documented  in  the
++       Differences  between  X/Open  Curses  and ncurses are documented in the
+        "PORTABILITY" sections of applicable man pages.
+ 
+ 
+

                                      Error Checking

                                      +-       In  many cases, X/Open Curses is vague about error conditions, omitting
++       In many cases, X/Open Curses is vague about error conditions,  omitting
+        some of the SVr4 documentation.
+ 
+-       Unlike other implementations, ncurses checks pointer  parameters,  such
+-       as  those to WINDOW structures, to ensure that they are not null.  This
+-       is done primarily to guard  against  programmer  error.   The  standard
++       Unlike  other  implementations, ncurses checks pointer parameters, such
++       as those to WINDOW structures, to ensure that they are not null.   This
++       is  done  primarily  to  guard  against programmer error.  The standard
+        interface does not provide a way for the library to tell an application
+-       which of several possible errors occurred.  Relying on  this  (or  some
+-       other)   extension   adversely   affects   the  portability  of  curses
+-       applications.
++       which  of several possible errors occurred.  An application that relies
++       on ncurses to check its function parameters  for  validity  limits  its
++       portability and robustness.
+ 
+ 
+

                                      Padding Differences

                                      +-       In historical curses implementations, delays embedded in  the  terminfo
+-       capabilities  carriage_return  (cr),  scroll_forward (ind), cursor_left
++       In  historical  curses implementations, delays embedded in the terminfo
++       capabilities carriage_return (cr),  scroll_forward  (ind),  cursor_left
+        (cub1), form_feed (ff), and tab (ht) activated corresponding delay bits
+-       in  the  Unix terminal driver.  ncurses performs all padding by sending
+-       NUL bytes to the device.  This method is slightly more  expensive,  but
+-       narrows   the   interface   to   the   Unix  kernel  significantly  and
++       in the Unix terminal driver.  ncurses performs all padding  by  sending
++       NUL  bytes  to the device.  This method is slightly more expensive, but
++       narrows  the  interface  to   the   Unix   kernel   significantly   and
+        correspondingly increases the package's portability.
+ 
+ 
+

                                      Header Files

                                      +-       The header file curses.h itself includes the header files  stdio.h  and
++       The  header  file curses.h itself includes the header files stdio.h and
+        unctrl.h.
+ 
+        X/Open Curses has more to say,
+ 
+-           The  inclusion  of  curses.h  may make visible all symbols from the
++           The inclusion of curses.h may make visible  all  symbols  from  the
+            headers stdio.h, term.h, termios.h, and wchar.h.
+ 
+        but does not finish the story.  A more complete account follows.
+ 
+-       o   Starting with 4BSD curses (1980) all implementations have  provided
++       o   Starting  with 4BSD curses (1980) all implementations have provided
+            a curses.h file.
+ 
+-           BSD  curses  code  included  curses.h and unctrl.h from an internal
++           BSD curses code included curses.h and  unctrl.h  from  an  internal
+            header file curses.ext, where "ext" abbreviated "externs".
+ 
+-           The implementations of printw and scanw used undocumented  internal
+-           functions  of  the  standard I/O library (_doprnt and _doscan), but
++           The  implementations of printw and scanw used undocumented internal
++           functions of the standard I/O library (_doprnt  and  _doscan),  but
+            nothing in curses.h itself relied upon stdio.h.
+ 
+-       o   SVr2 curses added newterm, which relies upon  stdio.h  because  its
++       o   SVr2  curses  added  newterm, which relies upon stdio.h because its
+            function prototype employs the FILE type.
+ 
+            SVr4 curses added putwin and getwin, which also use stdio.h.
+ 
+            X/Open Curses specifies all three of these functions.
+ 
+-           SVr4  curses  and  X/Open  Curses  do  not require the developer to
+-           include stdio.h before curses.h.  Both document use  of  curses  as
++           SVr4 curses and X/Open Curses  do  not  require  the  developer  to
++           include  stdio.h  before  curses.h.  Both document use of curses as
+            requiring only curses.h.
+ 
+            As a result, standard curses.h always includes stdio.h.
+ 
+-       o   X/Open  Curses  and  SVr4  curses  are inconsistent with respect to
++       o   X/Open Curses and SVr4 curses  are  inconsistent  with  respect  to
+            unctrl.h.
+ 
+-           As noted in curs_util(3x), ncurses includes unctrl.h from  curses.h
++           As  noted in curs_util(3x), ncurses includes unctrl.h from curses.h
+            (as SVr4 does).
+ 
+-       o   X/Open  Curses's  comments  about term.h and termios.h may refer to
++       o   X/Open Curses's comments about term.h and termios.h  may  refer  to
+            HP-UX and AIX.
+ 
+-           HP-UX curses includes term.h from curses.h to declare setupterm  in
++           HP-UX  curses includes term.h from curses.h to declare setupterm in
+            curses.h, but ncurses and Solaris curses do not.
+ 
+-           AIX  curses  includes  term.h  and  termios.h.   Again, ncurses and
++           AIX curses includes  term.h  and  termios.h.   Again,  ncurses  and
+            Solaris curses do not.
+ 
+-       o   X/Open Curses says that curses.h may include term.h, but  does  not
++       o   X/Open  Curses  says that curses.h may include term.h, but does not
+            require it to do so.
+ 
+-           Some  programs  use functions declared in both curses.h and term.h,
+-           and must include both header files in the same  module.   Very  old
+-           versions  of  AIX  curses  required  inclusion  of  curses.h before
++           Some programs use functions declared in both curses.h  and  term.h,
++           and  must  include  both header files in the same module.  Very old
++           versions of  AIX  curses  required  inclusion  of  curses.h  before
+            term.h.
+ 
+-           The header files supplied by ncurses include the  standard  library
+-           headers  required  for  its  declarations,  so ncurses's own header
+-           files can be included in  any  order.   But  for  portability,  you
++           The  header  files supplied by ncurses include the standard library
++           headers required for its  declarations,  so  ncurses's  own  header
++           files  can  be  included  in  any  order.  But for portability, you
+            should include curses.h before term.h.
+ 
+-       o   X/Open  Curses  says  "may make visible" because including a header
+-           file does not necessarily make visible all of  the  symbols  in  it
++       o   X/Open Curses says "may make visible" because  including  a  header
++           file  does  not  necessarily  make visible all of the symbols in it
+            (consider #ifdef and similar).
+ 
+-           For  instance, ncurses's curses.h may include wchar.h if the proper
+-           symbol is defined, and if ncurses is configured for  wide-character
+-           support.   If  wchar.h is included, its symbols may be made visible
++           For instance, ncurses's curses.h may include wchar.h if the  proper
++           symbol  is defined, and if ncurses is configured for wide-character
++           support.  If wchar.h is included, its symbols may be  made  visible
+            depending on the value of the _XOPEN_SOURCE feature test macro.
+ 
+        o   X/Open Curses mandates an application's inclusion of one standard C
+-           library  header  in  a  special  case:  stdarg.h before curses.h to
+-           prototype the functions vw_printw and  vw_scanw  (as  well  as  the
+-           obsolete  vwprintw  and  vwscanw).   Each of these takes a variadic
++           library header in a  special  case:  stdarg.h  before  curses.h  to
++           prototype  the  functions  vw_printw  and  vw_scanw (as well as the
++           obsolete vwprintw and vwscanw).  Each of  these  takes  a  variadic
+            argument list, a va_list parameter, like that of printf(3).
+ 
+-           SVr3 curses introduced  the  two  obsolete  functions,  and  X/Open
+-           Curses  the  others.   In  between,  SVr4  curses  provided for the
+-           possibility that an application might include either  varargs.h  or
+-           stdarg.h.   These  represented  contrasting  approaches to handling
+-           variadic argument lists.  The older interface,  varargs.h,  used  a
+-           pointer  to char for variadic functions' va_list parameter.  Later,
+-           the list acquired its own standard data type, va_list,  defined  in
+-           stdarg.h,  empowering the compiler to check the types of a function
+-           call's actual parameters against the formal ones  declared  in  its
++           SVr3  curses  introduced  the  two  obsolete  functions, and X/Open
++           Curses the others.   In  between,  SVr4  curses  provided  for  the
++           possibility  that  an application might include either varargs.h or
++           stdarg.h.  These represented  contrasting  approaches  to  handling
++           variadic  argument  lists.   The older interface, varargs.h, used a
++           pointer to char for variadic functions' va_list parameter.   Later,
++           the  list  acquired its own standard data type, va_list, defined in
++           stdarg.h, empowering the compiler to check the types of a  function
++           call's  actual  parameters  against the formal ones declared in its
+            prototype.
+ 
+-           No   conforming   implementations   of  X/Open  Curses  require  an
++           No  conforming  implementations  of  X/Open   Curses   require   an
+            application to include stdarg.h before curses.h because they either
+-           have  allowed  for  a  special type, or, like ncurses, they include
++           have allowed for a special type, or,  like  ncurses,  they  include
+            stdarg.h themselves to provide a portable interface.
+ 
+ 
+@@ -1476,7 +1491,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-27                       ncurses(3x)
++ncurses 6.5                       2024-05-11                       ncurses(3x)
+
                                      +
                                      +
                                        +Index: doc/html/man/ncursesw6-config.1.html +--- ncurses-6.5-20240504+/doc/html/man/ncursesw6-config.1.html 2024-04-27 18:38:49.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/ncursesw6-config.1.html 2024-05-11 21:39:59.000000000 +0000 +@@ -27,19 +27,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: MKncu_config.in,v 1.24 2024/04/20 21:13:38 tom Exp @ ++ * @Id: MKncu_config.in,v 1.25 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-ncursesw6-config 1 2024-04-20 ncurses 6.5 User commands ++ncursesw6\-config 1 2024-05-11 ncurses 6.5 User commands + + + + +-

                                        ncursesw6-config 1 2024-04-20 ncurses 6.5 User commands

                                        ++

                                        ncursesw6\-config 1 2024-05-11 ncurses 6.5 User commands

                                        + 
                                        + ncursesw6-config(1)              User commands             ncursesw6-config(1)
+ 
+@@ -112,7 +112,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20               ncursesw6-config(1)
++ncurses 6.5                       2024-05-11               ncursesw6-config(1)
+
                                        +
                                        +
                                          +Index: doc/html/man/term.5.html +--- ncurses-6.5-20240504+/doc/html/man/term.5.html 2024-04-27 18:38:49.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/term.5.html 2024-05-11 22:32:35.000000000 +0000 +@@ -28,19 +28,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: term.5,v 1.77 2024/04/20 21:24:19 tom Exp @ ++ * @Id: term.5,v 1.78 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-term 5 2024-04-20 ncurses 6.5 File formats ++term 5 2024-05-11 ncurses 6.5 File formats + + + + +-

                                          term 5 2024-04-20 ncurses 6.5 File formats

                                          ++

                                          term 5 2024-05-11 ncurses 6.5 File formats

                                          + 
                                          + term(5)                          File formats                          term(5)
+ 
+@@ -51,103 +51,103 @@
+        term - compiled terminfo terminal description
+ 
+ 
+-

                                          SYNOPSIS

                                          +-       term
+-
+-
+

                                          DESCRIPTION

                                          ++       tic(1) compiles a terminfo terminal type description, and setupterm(3x)
++       reads it.  A compiled description may be stored  in  a  file  or  in  a
++       database  of, potentially, many such descriptions.  Further, a compiled
++       description may be in one of two formats: one similar to that  used  by
++       System V,  and  a  newer,  extensible  format  employed  exclusively by
++       ncurses.
++
+ 
+

                                          Storage Location

                                          +-       Compiled   terminfo   descriptions   are  placed  under  the  directory
+-       /usr/share/terminfo.  Two configurations are supported  (when  building
+-       the ncurses libraries):
++       Compiled  terminfo  descriptions  are  placed   under   the   directory
++       /usr/share/terminfo.   One  of  two  configurations  is  selected  when
++       building the ncurses libraries.
+ 
+        directory tree
+             A two-level scheme is used to avoid a linear search of a huge Unix
+-            system directory: /usr/share/terminfo/c/name  where  name  is  the
++            system  directory:  /usr/share/terminfo/c/name  where  name is the
+             name of the terminal, and c is the first character of name.  Thus,
+-            act4  can  be  found  in  the   file   /usr/share/terminfo/a/act4.
+-            Synonyms  for  the same terminal are implemented by multiple links
+-            to the same compiled file.
++            the  compiled  description of terminal type "act4" is found in the
++            file /usr/share/terminfo/a/act4.  Synonyms for the  same  terminal
++            are implemented by multiple links to the same compiled file.
+ 
+        hashed database
+-            Using Berkeley database, two types  of  records  are  stored:  the
+-            terminfo  data  in  the  same format as stored in a directory tree
+-            with the terminfo's primary name as a key, and records  containing
+-            only aliases pointing to the primary name.
+-
+-            If  built  to  write  hashed  databases,  ncurses  can  still read
+-            terminfo databases organized as a directory tree, but cannot write
+-            entries  into  the  directory  tree.   It  can  write (or rewrite)
++            Using  the Berkeley database API, two types of records are stored:
++            the terminfo data in the same format as that stored in a directory
++            tree  with  the terminal's primary type name as a key, and records
++            containing only aliases pointing to the primary name.
++
++            If built to write hashed databases, ncurses can still  read  term-
++            info  databases  organized  as  a directory tree, but cannot write
++            entries into the  directory  tree.   It  can  write  (or  rewrite)
+             entries in the hashed database.
+ 
+-            ncurses  distinguishes  the  two  cases  in   the   TERMINFO   and
+-            TERMINFO_DIRS  environment  variable  by assuming a directory tree
+-            for entries that correspond to an existing directory,  and  hashed
++            ncurses   distinguishes   the   two  cases  in  the  TERMINFO  and
++            TERMINFO_DIRS environment variable by assuming  a  directory  tree
++            for entries that correspond to an existing directory, and a hashed
+             database otherwise.
+ 
+ 
+

                                          Legacy Storage Format

                                          +        The format has been chosen so that it will be the same on all hardware.
+-       An 8 or more bit  byte  is  assumed,  but  no  assumptions  about  byte
+-       ordering or sign extension are made.
++       A  byte  of  at  least eight bits' width is assumed, but no assumptions
++       about bit ordering or sign extension are made.
+ 
+-       The  compiled  file  is  created  with the tic program, and read by the
+-       routine setupterm(3x).  The file is divided into six parts:
++       The file is divided into six parts:
+ 
+-            a) header,
++            (a) header,
+ 
+-            b) terminal names,
++            (b) terminal names,
+ 
+-            c) Boolean flags,
++            (c) Boolean flags,
+ 
+-            d) numbers,
++            (d) numbers,
+ 
+-            e) strings, and
++            (e) strings, and
+ 
+-            f) string table.
++            (f) a string table.
+ 
+        The header section begins the file.  This section  contains  six  short
+        integers in the format described below.  These integers are
+ 
+-            (1) the magic number (octal 0432);
++            (1) the magic number
++                 (octal 0432);
+ 
+-            (2) the size, in bytes, of the terminal names section;
++            (2) the size,
++                 in bytes, of the terminal names section;
+ 
+             (3) the number of bytes in the Boolean flags section;
+ 
+             (4) the number of short integers in the numbers section;
+ 
+-            (5) the number of offsets (short integers) in the strings section;
++            (5) the number of offsets
++                 (short integers) in the strings section;
+ 
+-            (6) the size, in bytes, of the string table.
++            (6) the size,
++                 in bytes, of the string table.
+ 
+        The  capabilities  in  the Boolean flags, numbers, and strings sections
+-       are in the same order as the file <term.h>.
++       are in the same order as in the header file term.h.
+ 
+-       Short integers are signed, in the range  -32768  to  32767.   They  are
+-       stored  as  two  8-bit  bytes.   The  first  byte  contains  the  least
+-       significant 8 bits of the value, and the second byte contains the  most
+-       significant 8 bits.  (Thus, the value represented is 256*second+first.)
+-       This format corresponds to the hardware of the VAX and PDP-11 (that is,
+-       little-endian  machines).   Machines  where this does not correspond to
+-       the hardware must read the  integers  as  two  bytes  and  compute  the
+-       little-endian value.
++       Short integers are signed, in the range -32768 to 32767, and stored  in
++       little-endian format.
+ 
+        Numbers  in  a  terminal  description,  whether they are entries in the
+        numbers or strings table, are positive  integers.   Boolean  flags  are
+        treated  as  positive  one-byte integers.  In each case, those positive
+-       integers represent a terminal capability.  The  terminal  compiler  tic
++       integers represent a terminal capability.  The  terminal  compiler  tic
+        uses  negative  integers  to handle the cases where a capability is not
+        available:
+ 
+-       o   If a capability is absent from this terminal, tic stores  a  -1  in
++       o   If a capability is absent from this terminal, tic stores  a  -1  in
+            the corresponding table.
+ 
+            The integer value -1 is represented by two bytes 0377, 0377.
+            Absent Boolean values are represented by the byte 0 (false).
+ 
+-       o   If  a capability has been canceled from this terminal, tic stores a
++       o   If  a capability has been canceled from this terminal, tic stores a
+            -2 in the corresponding table.
+ 
+            The integer value -2 is represented by two bytes 0377, 0376.
+@@ -156,7 +156,7 @@
+        o   Other negative values are illegal.
+ 
+        The terminal names section comes after the  header.   It  contains  the
+-       first  line  of the terminfo description, listing the various names for
++       first  line  of the terminfo description, listing the various names for
+        the terminal, separated by  the  "|"  character.   The  terminal  names
+        section is terminated with an ASCII NUL character.
+ 
+@@ -182,23 +182,23 @@
+        string capabilities referenced in the strings section.  Each string  is
+        null-terminated.  Special characters in ^X or \c notation are stored in
+        their interpreted  form,  not  the  printing  representation.   Padding
+-       information  $<nn>  and  parameter  information %x are stored intact in
++       information  $<nn>  and  parameter  information %x are stored intact in
+        uninterpreted form.
+ 
+ 
+

                                          Extended Storage Format

                                          +-       The previous section describes the conventional terminfo binary format.
++       The previous section describes the conventional terminfo binary format.
+        With  some  minor variations of the offsets (see PORTABILITY), the same
+        binary format is used in all modern Unix systems.  Each system  uses  a
+        predefined set of Boolean, number or string capabilities.
+ 
+-       The ncurses libraries and applications support extended terminfo binary
+-       format, allowing users to  define  capabilities  which  are  loaded  at
++       The ncurses libraries and applications support extended terminfo binary
++       format, allowing users  to  define  capabilities  that  are  loaded  at
+        runtime.   This  extension  is made possible by using the fact that the
+-       other implementations stop reading the terminfo  data  when  they  have
+-       reached  the  end  of the size given in the header.  ncurses checks the
+-       size, and if it exceeds that due to the predefined data,  continues  to
+-       parse according to its own scheme.
++       other implementations stop reading the terminfo data  when  they  reach
++       the  end of the size given in the header.  ncurses checks the size, and
++       if it exceeds that due to  the  predefined  data,  continues  to  parse
++       according to its own scheme.
+ 
+        First, it reads the extended header (5 short integers):
+ 
+@@ -220,24 +220,22 @@
+ 
+        The  extended  string  table  contains  values for string capabilities.
+        After the end of these values, it contains the names for  each  of  the
+-       extended  capabilities  in  order,  e.g.,  Booleans,  then  numbers and
+-       finally strings.
++       extended capabilities in order: Boolean, numeric, and string.
+ 
+-       By storing terminal descriptions  in  this  way,  ncurses  is  able  to
++       By  storing  terminal  descriptions  in  this  way,  ncurses is able to
+        provide  a  database  useful  with  legacy  applications,  as  well  as
+-       providing data for applications which need  more  than  the  predefined
+-       capabilities.  See user_caps(5) for an overview of the way ncurses uses
+-       this extended information.
+-
+-       Applications which manipulate terminal data  can  use  the  definitions
+-       described  in  term_variables(3x)  which  associate the long capability
+-       names with members of a TERMTYPE structure.
++       providing  data  for applications that require more information about a
++       terminal type than was anticipated by X/Open Curses.  See  user_caps(5)
++       for an overview of the way ncurses uses this extended information.
++
++       Applications  that  manipulate  terminal  data  can use the definitions
++       described in term_variables(3x) associating the long  capability  names
++       with members of a TERMTYPE structure.
+ 
+ 
+

                                          Extended Number Format

                                          +-       On occasion, 16-bit signed integers are not large enough.  With ncurses
+-       6.1,  a new format was introduced by making a few changes to the legacy
+-       format:
++       On  occasion, 16-bit signed integers are not large enough.  ncurses 6.1
++       introduced a new format by making a few changes to the legacy format:
+ 
+        o   a different magic number (octal 01036)
+ 
+@@ -245,10 +243,10 @@
+            to signed 32-bit integers.
+ 
+        To   maintain   compatibility,  the  library  presents  the  same  data
+-       structures to direct users of the TERMTYPE  structure  as  in  previous
++       structures to direct users of the TERMTYPE  structure  as  in  previous
+        formats.   However,  that  cannot  provide  callers  with  the extended
+        numbers.   The  library  uses  a  similar  but  hidden  data  structure
+-       TERMTYPE2 to provide data for the terminfo functions.
++       TERMTYPE2 to provide data for the terminfo functions.
+ 
+ 
+

                                          FILES

                                          +@@ -271,85 +269,84 @@
+ 
+ 
+

                                          Binary Format

                                          +-       X/Open  Curses  does  not  specify  a format for the terminfo database.
+-       System V curses used a directory-tree of binary files, one per terminal
++       X/Open  Curses  does  not  specify  a format for the terminfo database.
++       System V curses used a directory-tree of binary files, one per terminal
+        description.
+ 
+-       Despite  the  consistent  use  of  little-endian  for  numbers  and the
+-       otherwise  self-describing  format,  it  is  not  wise  to   count   on
+-       portability   of   binary  terminfo  entries  between  commercial  Unix
+-       versions.  The problem is that there are at  least  three  versions  of
+-       terminfo  (under  HP-UX,  AIX,  and OSF/1) which 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
+-       X/Open Curses extensions.  See terminfo(5) for detailed  discussion  of
+-       terminfo source compatibility issues.
++       Despite  the  consistent use of little-endian numbers and the otherwise
++       self-describing format, it is not  wise  to  count  on  portability  of
++       binary  terminfo entries between commercial Unix versions.  The problem
++       is that there are at least three versions  of  terminfo  (under  HP-UX,
++       AIX,  and  OSF/1)  each  of which diverged from System V terminfo after
++       SVr1, and added extension capabilities to the string table that (in the
++       binary format) collide with System V and X/Open Curses extensions.  See
++       terminfo(5) for detailed discussion of  terminfo  source  compatibility
++       issues.
+ 
+-       This  implementation  is by default compatible with the binary terminfo
+-       format used by Solaris curses, except in a few less-used details  where
++       This  implementation  is by default compatible with the binary terminfo
++       format used by Solaris curses, except in a few less-used details  where
+        it  was  found that the latter did not match X/Open Curses.  The format
+        used by the other Unix versions can be matched by building ncurses with
+        different configuration options.
+ 
+ 
+

                                          Magic Codes

                                          +-       The  magic  number  in a binary terminfo file is the first 16-bits (two
++       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(1) also use that to tell
++       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
+-       Direct  access  to  the  TERMTYPE  structure  is  provided  for  legacy
+-       applications.  Portable  applications  should  use  the  tigetflag  and
+-       related  functions  described in curs_terminfo(3x) for reading terminal
+-       capabilities.
++       Direct  access  to  the  TERMTYPE  structure  is  provided  for  legacy
++       applications.   Portable  applications  should  use  tigetflag(3x)  and
++       related functions to read terminal capabilities.
+ 
+ 
+

                                          Mixed-case Terminal Names

                                          +-       A small number of terminal descriptions  use  uppercase  characters  in
+-       their  names.   If  the  underlying  filesystem  ignores the difference
+-       between  uppercase  and  lowercase,  ncurses  represents   the   "first
+-       character"  of  the  terminal  name used as the intermediate level of a
++       A  small  number  of  terminal descriptions use uppercase characters in
++       their names.  If the underlying  file  system  ignores  the  difference
++       between   uppercase   and  lowercase,  ncurses  represents  the  "first
++       character" of the terminal name used as the  intermediate  level  of  a
+        directory tree in (two-character) hexadecimal form.
+ 
+ 
+

                                          Limits

                                          +        ncurses stores compiled terminal descriptions in three related formats,
+-       described in the sections
++       described in the subsections
+ 
+-       o   LEGACY STORAGE FORMAT, and
++       o   Legacy Storage Format, and
+ 
+-       o   EXTENDED STORAGE FORMAT, and
++       o   Extended Storage Format, and
+ 
+-       o   EXTENDED NUMBER FORMAT.
++       o   Extended Number Format.
+ 
+-       The  legacy storage format and the extended number format differ by the
+-       types of numeric capability which they can store (i.e.,  16-bit  versus
+-       32-bit  integers).   The  extended storage format introduced by ncurses
+-       5.0 adds data to either of these formats.
++       The legacy storage format and the extended number format differ by  the
++       types  of  numeric  capability  that  they  can store (for example, 16-
++       versus 32-bit integers).  The extended  storage  format  introduced  by
++       ncurses 5.0 adds data to either of these formats.
+ 
+        Some limitations apply:
+ 
+-       o   total compiled entries cannot  exceed  4096  bytes  in  the  legacy
++       o   total  compiled  entries  cannot  exceed  4096  bytes in the legacy
+            format.
+ 
+-       o   total  compiled  entries  cannot exceed 32768 bytes in the extended
++       o   total compiled entries cannot exceed 32768 bytes  in  the  extended
+            format.
+ 
+        o   the name field cannot exceed 128 bytes.
+ 
+-       Compiled entries are limited to 32768 bytes because  offsets  into  the
+-       strings  table  use  two-byte  integers.   The legacy format could have
+-       supported 32768-byte entries, but  was  limited  to  a  virtual  memory
++       Compiled  entries  are  limited to 32768 bytes because offsets into the
++       strings table use two-byte integers.   The  legacy  format  could  have
++       supported  32768-byte  entries,  but  was  limited  to a virtual memory
+        page's 4096 bytes.
+ 
+ 
+

                                          EXAMPLES

                                          +-       As  an  example,  here  is  a description for the Lear-Siegler ADM-3, a
+-       popular though rather stupid early terminal:
++       Here is a terminfo description of the  Lear-Siegler  ADM-3,  a  popular
++       though rather stupid early terminal.
+ 
+        adm3a|lsi adm3a,
+                am,
+@@ -358,7 +355,8 @@
+                cuf1=^L, cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K,
+                home=^^, ind=^J,
+ 
+-       and a hexadecimal dump of the compiled terminal description:
++       A  hexadecimal  dump  of  its  compiled terminal description (in legacy
++       format) follows.
+ 
+        0000  1a 01 10 00 02 00 03 00  82 00 31 00 61 64 6d 33  ........ ..1.adm3
+        0010  61 7c 6c 73 69 20 61 64  6d 33 61 00 00 01 50 00  a|lsi ad m3a...P.
+@@ -386,12 +384,12 @@
+ 
+

                                          AUTHORS

                                          +        Thomas E. Dickey
+-       extended terminfo format for ncurses 5.0
++       extended terminfo format for ncurses 5.0
+        hashed database support for ncurses 5.6
+        extended number support for ncurses 6.1
+ 
+        Eric S. Raymond
+-       documented legacy terminfo format, e.g., from pcurses.
++       documented legacy terminfo format (that used by pcurses).
+ 
+ 
+

                                          SEE ALSO

                                          +@@ -399,12 +397,11 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                           term(5)
++ncurses 6.5                       2024-05-11                           term(5)
+
                                          +
                                          +
                                            +
                                          • NAME
                                            • +-
                                          • SYNOPSIS
                                            • +
                                          • DESCRIPTION +
                                              +
                                            • Storage Location
                                              • +Index: doc/html/man/term.7.html +--- ncurses-6.5-20240504+/doc/html/man/term.7.html 2024-04-27 18:38:49.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/term.7.html 2024-05-11 21:39:59.000000000 +0000 +@@ -27,19 +27,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: term.7,v 1.48 2024/03/16 15:35:01 tom Exp @ ++ * @Id: term.7,v 1.49 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-term 7 2024-03-16 ncurses 6.5 Miscellaneous ++term 7 2024-05-11 ncurses 6.5 Miscellaneous + + + + +-

                                              term 7 2024-03-16 ncurses 6.5 Miscellaneous

                                              ++

                                              term 7 2024-05-11 ncurses 6.5 Miscellaneous

                                              + 
                                              + term(7)                          Miscellaneous                         term(7)
+ 
+@@ -216,7 +216,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                           term(7)
++ncurses 6.5                       2024-05-11                           term(7)
+
                                              +
                                              +
                                                +Index: doc/html/man/terminfo.5.html +--- ncurses-6.5-20240504+/doc/html/man/terminfo.5.html 2024-04-27 18:38:49.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/terminfo.5.html 2024-05-11 21:39:59.000000000 +0000 +@@ -32,19 +32,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: terminfo.head,v 1.65 2024/04/20 21:14:00 tom Exp @ ++ * @Id: terminfo.head,v 1.66 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-terminfo 5 2024-04-20 ncurses 6.5 File formats ++terminfo 5 2024-05-11 ncurses 6.5 File formats + + + + +-

                                                terminfo 5 2024-04-20 ncurses 6.5 File formats

                                                ++

                                                terminfo 5 2024-05-11 ncurses 6.5 File formats

                                                + 
                                                + terminfo(5)                      File formats                      terminfo(5)
+ 
+@@ -71,7 +71,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This document describes ncurses version 6.5 (patch 20240427).
++       This document describes ncurses version 6.5 (patch 20240511).
+ 
+ 
+

                                                terminfo Entry Syntax

                                                +@@ -2487,7 +2487,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                       terminfo(5)
++ncurses 6.5                       2024-05-11                       terminfo(5)
+
                                                +
                                                +
                                                  +Index: doc/html/man/tic.1m.html +--- ncurses-6.5-20240504+/doc/html/man/tic.1m.html 2024-04-27 18:38:49.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/tic.1m.html 2024-05-11 21:39:59.000000000 +0000 +@@ -27,19 +27,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: tic.1m,v 1.110 2024/04/27 17:57:06 tom Exp @ ++ * @Id: tic.1m,v 1.111 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-tic 1m 2024-04-27 ncurses 6.5 User commands ++tic 1m 2024-05-11 ncurses 6.5 User commands + + + + +-

                                                  tic 1m 2024-04-27 ncurses 6.5 User commands

                                                  ++

                                                  tic 1m 2024-05-11 ncurses 6.5 User commands

                                                  + 
                                                  + tic(1m)                          User commands                         tic(1m)
+ 
+@@ -482,7 +482,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-27                           tic(1m)
++ncurses 6.5                       2024-05-11                           tic(1m)
+
                                                  +
                                                  +
                                                    +Index: doc/html/man/toe.1m.html +--- ncurses-6.5-20240504+/doc/html/man/toe.1m.html 2024-04-27 18:38:49.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/toe.1m.html 2024-05-11 21:39:59.000000000 +0000 +@@ -28,19 +28,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: toe.1m,v 1.68 2024/04/20 18:59:26 tom Exp @ ++ * @Id: toe.1m,v 1.69 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-toe 1m 2024-04-20 ncurses 6.5 User commands ++toe 1m 2024-05-11 ncurses 6.5 User commands + + + + +-

                                                    toe 1m 2024-04-20 ncurses 6.5 User commands

                                                    ++

                                                    toe 1m 2024-05-11 ncurses 6.5 User commands

                                                    + 
                                                    + toe(1m)                          User commands                         toe(1m)
+ 
+@@ -185,7 +185,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                           toe(1m)
++ncurses 6.5                       2024-05-11                           toe(1m)
+
                                                    +
                                                    +
                                                      +Index: doc/html/man/tput.1.html +--- ncurses-6.5-20240504+/doc/html/man/tput.1.html 2024-04-27 18:38:49.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/tput.1.html 2024-05-11 21:39:59.000000000 +0000 +@@ -28,19 +28,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: tput.1,v 1.113 2024/04/20 19:58:50 tom Exp @ ++ * @Id: tput.1,v 1.114 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-tput 1 2024-04-20 ncurses 6.5 User commands ++tput 1 2024-05-11 ncurses 6.5 User commands + + + + +-

                                                      tput 1 2024-04-20 ncurses 6.5 User commands

                                                      ++

                                                      tput 1 2024-05-11 ncurses 6.5 User commands

                                                      + 
                                                      + tput(1)                          User commands                         tput(1)
+ 
+@@ -555,7 +555,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                           tput(1)
++ncurses 6.5                       2024-05-11                           tput(1)
+
                                                      +
                                                      +
                                                        +Index: doc/html/man/tset.1.html +--- ncurses-6.5-20240504+/doc/html/man/tset.1.html 2024-04-27 18:38:49.000000000 +0000 ++++ ncurses-6.5-20240511/doc/html/man/tset.1.html 2024-05-11 21:39:59.000000000 +0000 +@@ -27,19 +27,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: tset.1,v 1.85 2024/04/27 17:57:47 tom Exp @ ++ * @Id: tset.1,v 1.86 2024/05/11 20:39:53 tom Exp @ + --> + + + + + +-tset 1 2024-04-27 ncurses 6.5 User commands ++tset 1 2024-05-11 ncurses 6.5 User commands + + + + +-

                                                        tset 1 2024-04-27 ncurses 6.5 User commands

                                                        ++

                                                        tset 1 2024-05-11 ncurses 6.5 User commands

                                                        + 
                                                        + tset(1)                          User commands                         tset(1)
+ 
+@@ -393,7 +393,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-27                           tset(1)
++ncurses 6.5                       2024-05-11                           tset(1)
+
                                                        +
                                                        +
                                                          +Index: man/MKncu_config.in +Prereq: 1.24 +--- ncurses-6.5-20240504+/man/MKncu_config.in 2024-04-20 21:13:38.000000000 +0000 ++++ ncurses-6.5-20240511/man/MKncu_config.in 2024-05-11 20:39:53.000000000 +0000 +@@ -27,8 +27,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: MKncu_config.in,v 1.24 2024/04/20 21:13:38 tom Exp $ +-.TH @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config 1 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands" ++.\" $Id: MKncu_config.in,v 1.25 2024/05/11 20:39:53 tom Exp $ ++.TH @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@\-config 1 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands" + .SH NAME + \fB\%@LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config\fP \- + configuration helper for \fI\%ncurses\fP libraries +Index: man/curs_add_wch.3x +Prereq: 1.62 +--- ncurses-6.5-20240504+/man/curs_add_wch.3x 2024-04-20 21:20:07.000000000 +0000 ++++ ncurses-6.5-20240511/man/curs_add_wch.3x 2024-05-11 21:31:45.000000000 +0000 +@@ -28,8 +28,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: curs_add_wch.3x,v 1.62 2024/04/20 21:20:07 tom Exp $ +-.TH curs_add_wch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" ++.\" $Id: curs_add_wch.3x,v 1.63 2024/05/11 21:31:45 tom Exp $ ++.TH curs_add_wch 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" + .ie \n(.g \{\ + .ds `` \(lq + .ds '' \(rq +@@ -52,7 +52,7 @@ + \fB\%mvwadd_wch\fP, + \fB\%echo_wchar\fP, + \fB\%wecho_wchar\fP \- +-add a \fIcurses\fR complex character to a window and advance the cursor ++add a \fIcurses\fR complex character to a window, possibly advancing the cursor + .SH SYNOPSIS + .nf + \fB#include +@@ -66,70 +66,143 @@ + \fBint wecho_wchar(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fP); + .fi + .SH DESCRIPTION +-.SS add_wch +-The +-\fBadd_wch\fP, +-\fBwadd_wch\fP, +-\fBmvadd_wch\fP, and +-\fBmvwadd_wch\fP +-functions put the complex character \fIwch\fP into the given +-window at its current position, +-which is then advanced. +-These functions perform +-wrapping and special-character processing as follows: +-.bP +-If \fIwch\fP refers to a spacing character, +-then any previous character at that location is removed. +-A new character specified by \fIwch\fP is +-placed at that location with rendition specified by \fIwch\fP. +-The cursor then advances after this spacing character, +-to prepare for writing the next character on the screen. +-.IP +-The newly added spacing character is the base of the active complex character. +-Subsequent non-spacing characters can be combined with this base +-until another spacing character is written to the screen, +-or the cursor is moved, e.g., using \fBwmove\fP. +-.bP +-If \fIwch\fP refers to a non-spacing character, +-it is appended to the active complex character, +-retaining the previous characters at that location. +-The rendition specified by \fIwch\fP is ignored. +-.IP +-The cursor is not advanced after adding a non-spacing character. +-Subsequent calls to add non-spacing characters will update the same position. ++.SS wadd_wch ++.B \%wadd_wch ++writes the complex character ++.I wch ++to the window ++.IR win "," ++then may advance the cursor position, ++analogously to the standard C library's \fI\%putwchar\fP(3). ++\fB\%ncurses\fP(3X) describes the variants of this function. ++.PP ++Much behavior depends on whether the wide characters in ++.I wch ++are spacing or non-spacing; ++see subsection \*(``Complex Characters\*('' below. ++.bP ++If ++.I wch ++contains a spacing character, ++then any character at the cursor is first removed. ++The complex character ++.IR wch "," ++with its attributes and color pair identifier, ++becomes the ++.I base ++of the ++.IR "active complex character" "." ++.bP ++If ++.I wch ++contains only non-spacing characters, ++.\" XXX: see wadd_wch_literal (the beginning of the array may be nonspacing) ++they are combined with the active complex character. ++.I curses ++ignores its attributes and color pair identifier, ++and does not advance the cursor. ++.PP ++Further non-spacing characters added with ++.B \%wadd_wch ++are not written at the new cursor position but combine with the active ++complex character until another spacing character is written to the ++window or the cursor is moved. ++.PP ++If advancement occurs at the right margin, ++.bP ++the cursor automatically wraps to the beginning of the next line, ++then, ++.bP ++if it was at the bottom of the scrolling region, ++and if \fB\%scrollok\fP(3X) is enabled for ++.IR win , ++the scrolling region scrolls up one line. ++.PP ++If ++.I wch ++is a ++backspace, ++carriage return, ++line feed, ++or ++tab, ++the cursor moves appropriately within the window. + .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\fP were called. +-.SS echo_wchar +-The \fBecho_wchar\fP +-function is functionally equivalent to a call to +-\fBadd_wch\fP +-followed by a call to +-\fB\%refresh\fP(3X). +-Similarly, the +-\fBwecho_wchar\fP +-is functionally equivalent to a call to +-\fBwadd_wch\fP +-followed by a call to +-\fBwrefresh\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 the *\fBecho\fP* functions instead of their equivalents. +-.SS "Line Graphics" +-Like \fB\%addch\fP(3X), +-\fBaddch_wch\fP accepts symbols which make it simple to draw lines and other +-frequently used special characters. +-These symbols correspond to the same VT100 line-drawing set as +-\fB\%addch\fP(3X). ++Backspace moves the cursor one character left; ++at the left margin of a window, ++it does nothing. ++.bP ++Carriage return moves the cursor to the left margin on the current line ++of the window. ++.bP ++Line feed does a \fB\%clrtoeol\fP(3X), ++then advances as if from the right margin. ++.bP ++Tab advances the cursor to the next tab stop ++(possibly on the next line); ++these are placed at every eighth column by default. ++Alter the tab interval with the ++.B \%TABSIZE ++extension; ++see \fB\%curs_variables\fP(3X). ++.PP ++If ++.I wch ++is any other nonprintable character, ++it is drawn in printable form using the same convention as ++\fB\%wunctrl\fP(3X). ++.PP ++Calling \fB\%win_wch\fP(3X) on the location of a nonprintable character ++does not return the character itself, ++but its \fB\%wunctrl\fP(3X) representation. ++.SS wecho_wchar ++.B \%echo_wchar ++and ++.B \%wecho_wchar ++are equivalent to calling ++.RB \%( w ) add_wch ++followed by ++.RB \%( w ) refresh . ++.I curses ++interprets these functions as a hint that only a single (complex) ++character is being output; ++for non-control characters, ++a considerable performance gain may be enjoyed by employing them. ++.\" TODO: Combine the following with the "Line Drawing" subsection of ++.\" terminfo(5) and replace this with a cross reference there. ++.SS "Forms-Drawing Characters" ++.I curses ++defines macros starting with ++.B \%WACS_ ++that can be used with ++.B \%wadd_wch ++to write line-drawing and other special characters to the screen. ++.I \%ncurses ++terms these ++.I "forms-drawing characters." ++The ACS default listed below is used if the ++.B \%acs_chars ++.RB ( \%acsc ) ++.I \%term\%info ++capability does not define a terminal-specific replacement for it, ++or if the terminal and locale configuration requires Unicode to access ++these characters but the library is unable to use Unicode. ++The \*(``acsc char\*('' column corresponds to how the characters are ++specified in the ++.B \%acs_chars ++.RB ( \%acsc ) ++string capability, ++and the characters in it may appear on the screen if the terminal type's ++database entry incorrectly advertises ACS support. ++The name \*(``ACS\*('' originates in the Alternate Character Set feature ++of the DEC VT100 terminal. + .PP + .TS + Lb Lb Lb Lb Lb + Lb Lb Lb Lb Lb + Lb L L L Lx. +-\& Unicode ASCII acsc \& +-ACS Name Default Default Char Glyph Name ++\& Unicode ACS acsc \& ++Symbol Default Default char Glyph Name + _ + WACS_BLOCK 0x25ae # 0 T{ + solid square block +@@ -291,26 +364,29 @@ + .bP + U+2550 BOX DRAWINGS DOUBLE HORIZONTAL + .SH RETURN VALUE +-All routines return the integer \fBERR\fP upon failure and \fBOK\fP on success. +-.PP +-X/Open Curses does not specify any error conditions. +-This implementation returns an error +-.bP +-if the window pointer is null or +-.bP +-if it is not possible to add a complete character in the window. +-.PP +-The latter may be due to different causes: +-.bP +-If \fB\%scrollok\fP(3X) 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. ++These functions return ++.B OK ++on success and ++.B ERR ++on failure. ++In ++.IR \%ncurses , ++.B \%wadd_wch ++returns ++.B ERR ++if ++.bP ++.I win ++is ++.BR NULL "," ++.bP ++wrapping to a new line is impossible because \fB\%scrollok\fP(3X) has ++not been called on ++.I win ++when writing to its bottom right location is attempted, ++or + .bP +-If an error is detected when converting a multibyte character to a sequence +-of bytes, +-or if it is not possible to add all of the resulting bytes in the window, +-an error is returned. ++it is not possible to add a complete character at the cursor position. + .PP + Functions prefixed with \*(``mv\*('' first perform cursor movement and + fail if the position +@@ -318,16 +394,32 @@ + .IR x ) + is outside the window boundaries. + .SH NOTES +-Note that +-\fBadd_wch\fP, +-\fBmvadd_wch\fP, +-\fBmvwadd_wch\fP, and +-\fBecho_wchar\fP +-may be macros. ++.BR add_wch "," ++.BR mvadd_wch "," ++.BR mvwadd_wch "," ++and ++.B echo_wchar ++may be implemented as macros. ++.SH EXTENSIONS ++.SS TABSIZE ++The ++.B TABSIZE ++variable is implemented in SVr4 and other versions of ++.IR curses , ++but is not specified by X/Open Curses ++(see \fBcurs_variables\fP(3X)). + .SH PORTABILITY + These functions are described in X/Open Curses, Issue 4. +-The defaults specified for line-drawing characters apply in the POSIX locale. +-.SS "WACS Symbols" ++It specifies no error conditions for them. ++.PP ++SVr4 ++.I curses ++describes a successful return value only as ++\*(``an integer value other than ++.BR ERR \*(''. ++.PP ++The defaults specified for forms-drawing characters apply in the POSIX ++locale. + 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\fP. + A few implementations are problematic: +@@ -406,32 +498,32 @@ + \[u256C] U+256C (forms double vertical and horizontal), and + \[u2612] U+2612 (ballot box with x). + .SS "Complex Characters" +-The complex character type \fBcchar_t\fR +-can store more than one wide character (\fBwchar_t\fR). +-The X/Open Curses description does not mention this possibility, +-describing only the cases where \fIwch\fP is a spacing character +-or a non-spacing character. +-.PP +-This implementation assumes that \fIwch\fP is constructed using +-\fB\%setcchar\fP(3X), and in turn that the result +-.bP +-contains at most one spacing character in the beginning of its list of wide +-characters, +-and zero or more non-spacing characters ++The complex character type ++.I \%cchar_t ++can store more than one wide character ++.RI ( \%wchar_t ). ++X/Open Curses does not mention this possibility, ++specifying behavior only where ++.I wch ++is a single character, ++either spacing or non-spacing. ++.PP ++.I \%ncurses ++assumes that ++.I wch ++is constructed using \fB\%setcchar\fP(3X), ++and in turn that the result ++.bP ++contains at most one spacing character at the beginning of its list of ++wide characters, ++and zero or more non-spacing characters, + or + .bP +-may hold one non-spacing character. ++holds one non-spacing character. + .PP + In the latter case, +-\fI\%ncurses\fP adds the non-spacing character to the active +-(base) spacing character. +-.SS TABSIZE +-The +-.B TABSIZE +-variable is implemented in SVr4 and other versions of +-.IR curses , +-but is not specified by X/Open Curses +-(see \fBcurs_variables\fP(3X)). ++.I \%ncurses ++adds the non-spacing character to the active complex character. + .SH SEE ALSO + \fB\%curs_addch\fP(3X) describes comparable functions of the + .I \%ncurses +Index: man/curs_add_wchstr.3x +Prereq: 1.39 +--- ncurses-6.5-20240504+/man/curs_add_wchstr.3x 2024-04-20 21:20:07.000000000 +0000 ++++ ncurses-6.5-20240511/man/curs_add_wchstr.3x 2024-05-11 20:39:53.000000000 +0000 +@@ -27,8 +27,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: curs_add_wchstr.3x,v 1.39 2024/04/20 21:20:07 tom Exp $ +-.TH curs_add_wchstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" ++.\" $Id: curs_add_wchstr.3x,v 1.40 2024/05/11 20:39:53 tom Exp $ ++.TH curs_add_wchstr 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" + .ie \n(.g \{\ + .ds `` \(lq + .ds '' \(rq +@@ -69,45 +69,63 @@ + \fBint mvwadd_wchnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t *\fIwchstr\fP, int \fIn\fP); + .fi + .SH DESCRIPTION +-These functions copy the (null-terminated) +-array of complex characters \fIwchstr\fP +-into the window image structure +-starting at the current cursor position. +-.PP +-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\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\fP advanced. +-These functions are faster than \fBwaddnstr\fP. +-On the other hand: ++.B \%wadd_wchstr ++copies the string of complex characters ++.I \%wchstr ++to the window ++.IR win "." ++A null complex character terminates the string. ++If a complex character does completely fit at the end of the line, ++.I curses ++fills the remaining columns with the window background; ++see \fB\%bkgrnd\fP(3X). ++.B \%wadd_wchnstr ++does the same, ++but copies at most ++.I n ++characters, ++or as many as possible if ++.I n ++is ++.BR \-1 "." ++\fB\%ncurses\fP(3X) describes the variants of these functions. ++.PP ++Because these functions do not call \fB\%wadd_wch\fP(3X) internally, ++they are faster than \fB\%waddwstr\fP(3X) and \fB\%waddnwstr\fP(3X). ++On the other hand, ++they ++.bP ++do not treat the backspace, ++carriage return, ++or line feed characters specially; + .bP +-they do not perform checking +-(such as for the newline, backspace, or carriage return characters), ++do not represent unprintable characters with \fB\%wunctrl\fP(3X); + .bP +-they do not advance the current cursor position, ++do not update the cursor position to follow the last character written; + .bP +-they do not expand other control characters to ^-escapes, and +-.bP +-they truncate the string if it crosses the right margin, +-rather than wrapping it around to the new line. +-.PP +-These functions end successfully +-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. ++truncate the string at the window's right margin, ++rather than wrapping it to the next line and potentially scrolling. + .SH RETURN VALUE +-All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success. ++These functions return ++.B OK ++on success and ++.B ERR ++on failure. + .PP + X/Open Curses does not specify any error conditions. +-This implementation returns an error +-.bP +-if the \fIwin\fP parameter is null or +-.bP +-if the \fIwchstr\fP parameter is null. ++.I \%ncurses ++returns ++.B ERR ++if ++.bP ++.I win ++is ++.B NULL ++or ++.bP ++.I wchstr ++is ++.BR NULL "." + .PP + Functions prefixed with \*(``mv\*('' first perform cursor movement and + fail if the position +@@ -115,9 +133,12 @@ + .IR x ) + is outside the window boundaries. + .SH NOTES +-All functions except \fBwadd_wchnstr\fP may be macros. ++All of these functions except ++.B \%wadd_wchnstr ++may be implemented as macros. + .SH PORTABILITY +-These functions are described in X/Open Curses, Issue 4. ++X/Open Curses, ++Issue 4 describes these functions. + .SH SEE ALSO + \fB\%curs_addchstr\fP(3X) describes comparable functions of the + .I \%ncurses +Index: man/curs_addch.3x +Prereq: 1.85 +--- ncurses-6.5-20240504+/man/curs_addch.3x 2024-04-20 19:03:47.000000000 +0000 ++++ ncurses-6.5-20240511/man/curs_addch.3x 2024-05-11 20:39:53.000000000 +0000 +@@ -28,8 +28,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: curs_addch.3x,v 1.85 2024/04/20 19:03:47 tom Exp $ +-.TH curs_addch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" ++.\" $Id: curs_addch.3x,v 1.86 2024/05/11 20:39:53 tom Exp $ ++.TH curs_addch 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" + .ie \n(.g \{\ + .ds `` \(lq + .ds '' \(rq +@@ -72,22 +72,24 @@ + \fBint wechochar(WINDOW *\fIwin\fP, const chtype \fIch\fP); + .fi + .SH DESCRIPTION +-.SS "Adding Characters" ++.SS waddch + .B \%waddch +-puts the character ++writes the ++.I curses ++character + .I ch +-at the cursor position of window +-.IR win , ++to the window ++.IR win "," + then advances the cursor position, + analogously to the standard C library's \fI\%putchar\fP(3). + \fB\%ncurses\fP(3X) describes the variants of this function. + .PP + If advancement occurs at the right margin, + .bP +-the cursor automatically wraps to the beginning of the next line; +-and ++the cursor automatically wraps to the beginning of the next line, ++then, + .bP +-at the bottom of the current scrolling region, ++if it was at the bottom of the scrolling region, + and if \fB\%scrollok\fP(3X) is enabled for + .IR win , + the scrolling region scrolls up one line. +@@ -110,10 +112,7 @@ + of the window. + .bP + Line feed does a \fB\%clrtoeol\fP(3X), +-then moves the cursor to the left margin on the next line of the window, +-and if \fB\%scrollok\fP(3X) is enabled for +-.IR win , +-scrolls the window if the cursor was already on the last line. ++then advances as if from the right margin. + .bP + Tab advances the cursor to the next tab stop + (possibly on the next line); +@@ -126,23 +125,22 @@ + If + .I ch + is any other nonprintable character, +-it is drawn in printable form, +-using the same convention as \fB\%unctrl\fP(3X). ++it is drawn in printable form using the same convention as ++\fB\%unctrl\fP(3X). + .PP + Calling \fB\%winch\fP(3X) on the location of a nonprintable character + does not return the character itself, + but its \fB\%unctrl\fP(3X) representation. + .PP ++The object or expression + .I ch +-may contain rendering and/or color attributes, +-and others can be combined with the parameter +-by logically \*(``or\*(''ing with it. ++may contain attributes and/or a color pair identifier. + (A character with its attributes can be copied from place to place + using \fB\%winch\fP(3X) and + .BR \%waddch .) + See \fB\%curs_attr\fP(3X) for values of predefined video attribute + constants that can be usefully \*(``or\*(''ed with characters. +-.SS "Echoing Characters" ++.SS wechochar + .B \%echochar + and + .B \%wechochar +@@ -177,8 +175,9 @@ + The \*(``acsc char\*('' column corresponds to how the characters are + specified in the + .B \%acs_chars ++.RB ( \%acsc ) + string capability, +-and the characters in it may appear on the screen if the terminal's ++and the characters in it may appear on the screen if the terminal type's + database entry incorrectly advertises ACS support. + The name \*(``ACS\*('' originates in the Alternate Character Set feature + of the DEC VT100 terminal. +@@ -235,36 +234,52 @@ + .B \%waddch + returns + .B ERR +-if it is not possible to add a complete character at the cursor +-position, +-as when conversion of a multibyte character to a byte sequence fails, +-or at least one of the resulting bytes cannot be added to the window. ++if ++.bP ++.I win ++is ++.BR NULL "," ++.bP ++wrapping to a new line is impossible because \fB\%scrollok\fP(3X) has ++not been called on ++.I win ++when a write to its bottom right location is attempted, ++or ++.bP ++it is not possible to add a complete character at the cursor position. ++.PP ++The last may be due to different causes: ++.bP ++conversion of a multibyte character to a byte sequence can fail, ++or ++.bP ++at least one of the bytes resulting from conversion from a multibyte ++sequence cannot be added to the window. + See section \*(``PORTABILITY\*('' below regarding the use of + .B \%waddch + with multibyte characters. + .PP +-.B \%waddch +-can successfully write a character at the bottom right location of the +-window. +-However, +-.I \%ncurses +-returns +-.B ERR +-if \fB\%scrollok\fP(3X) is not enabled in that event, +-because it is not possible to wrap to a new line. +-.PP + Functions prefixed with \*(``mv\*('' first perform cursor movement and + fail if the position + .RI ( y , + .IR x ) + is outside the window boundaries. + .SH NOTES +-.BR \%addch , +-.BR \%mvaddch , +-.BR \%mvwaddch , ++.BR \%addch "," ++.BR \%mvaddch "," ++.BR \%mvwaddch "," + and + .B \%echochar + may be implemented as macros. ++.SH EXTENSIONS ++.SS TABSIZE ++SVr4 and other versions of ++.I curses ++implement the ++.B \%TABSIZE ++variable, ++but X/Open Curses does not specify it; ++see \fB\%curs_variables\fP(3X). + .SH PORTABILITY + X/Open Curses, + Issue 4 describes these functions. +@@ -290,7 +305,7 @@ + Solaris + .IR curses , + for example, +-define the ACS symbols as constants; ++defines the ACS symbols as constants; + others define them as elements of an array. + .IP + This implementation uses an array, +@@ -356,8 +371,8 @@ + .I \%term\%info + entries include + .B \%acsc +-strings in which their key characters +-.BR ( pryz{|} ) ++capabilities in which their key characters ++.RB ( pryz{|} ) + are embedded, + and a second-hand list of their character descriptions has come to + light. +@@ -386,51 +401,50 @@ + by using UTF-8; + see the discussion of the + .I \%NCURSES_NO_UTF8_ACS +-environment variable in \fB\%ncurses\fP(3X)). ++environment variable in \fB\%ncurses\fP(3X). + .SS "Character Set" + X/Open Curses assumes that the parameter passed to + .B \%waddch + contains a single character. +-As discussed in \fB\%curs_attr\fP(3X), +-that character may have been more than eight bits wide in an SVr3 or ++That character may have been more than eight bits wide in an SVr3 or + SVr4 implementation, +-but in the X/Open Curses model, +-the details are not given. +-The important distinction between SVr4 +-.I curses +-and X/Open Curses is that the latter separates non-character information +-(attributes and color) +-from the character code, +-which SVr4 packs into a ++but X/Open Curses leaves the width of a non-wide character code ++unspecified. ++The standard further does not specify the internal structure of a ++.IR chtype "," ++though the use of bit operations to combine the character code with ++attributes and a color pair identifier into a + .I \%chtype + for passage to +-.BR \%waddch . ++.B \%waddch ++is common. ++A portable application uses only the macros discussed in ++\fB\%curs_attr\fP(3X) to manipulate a ++.IR \%chtype "." + .PP + In + .IR \%ncurses , + .I \%chtype +-holds an eight-bit character. +-But the library allows a multibyte character to be passed in a ++holds an eight-bit character, ++but the library allows a multibyte character to be passed in a + succession of calls to +-.BR \%waddch . ++.BR \%waddch "." + Other implementations do not; + a + .B \%waddch + call transmits exactly one character, + which may be rendered in one or more screen locations depending on +-whether it is printable. +-.PP +-Depending on the locale settings, ++whether it is printable ++(see \fB\%unctrl\fP(3X)). ++Depending on the locale, + .I \%ncurses + inspects the byte passed in each + .B \%waddch +-call, +-and checks whether the latest call continues a multibyte sequence. ++call and checks whether the latest call continues a multibyte sequence. + When a character is +-.IR complete , ++.IR complete "," + .I \%ncurses + displays the character and advances the cursor. +-.PP + If the calling application interrupts the succession of bytes in + a multibyte character sequence by changing the current location\(emfor + example, +@@ -439,7 +453,7 @@ + discards the incomplete character. + .PP + For portability to other implementations, +-do not rely upon this behavior. ++do not rely upon the foregoing behavior. + Check whether a character can be represented as a single byte in the + current locale. + .bP +@@ -451,14 +465,6 @@ + If it cannot, + use only + \fB\%wadd_wch\fP(3X). +-.SS TABSIZE +-SVr4 and other versions of +-.I curses +-implement the +-.B \%TABSIZE +-variable, +-but X/Open Curses does not specify it +-(see \fB\%curs_variables\fP(3X)). + .SH SEE ALSO + \fB\%curs_add_wch\fP(3X) describes comparable functions of the + .I \%ncurses +Index: man/curs_addchstr.3x +Prereq: 1.45 +--- ncurses-6.5-20240504+/man/curs_addchstr.3x 2024-04-20 21:20:07.000000000 +0000 ++++ ncurses-6.5-20240511/man/curs_addchstr.3x 2024-05-11 20:39:53.000000000 +0000 +@@ -27,8 +27,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: curs_addchstr.3x,v 1.45 2024/04/20 21:20:07 tom Exp $ +-.TH curs_addchstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" ++.\" $Id: curs_addchstr.3x,v 1.46 2024/05/11 20:39:53 tom Exp $ ++.TH curs_addchstr 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" + .ie \n(.g \{\ + .ds `` \(lq + .ds '' \(rq +@@ -69,39 +69,63 @@ + \fBint mvwaddchnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype *\fIchstr\fP, int \fIn\fP); + .fi + .SH DESCRIPTION +-These functions copy the (null-terminated) +-\fIchstr\fP array +-into the window image structure +-starting at the current cursor position. +-.PP +-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\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\fP advanced. +-These functions are faster than \fBwaddnstr\fP. +-On the other hand: +-.bP +-they do not perform checking +-(such as for the newline, backspace, or carriage return characters), ++.B \%waddchstr ++copies the string of ++.I curses ++characters ++.I \%chstr ++to the window ++.IR win "." ++A null ++.I curses ++character terminates the string. ++.B \%waddchnstr ++does the same, ++but copies at most ++.I n ++characters, ++or as many as possible if ++.I n ++is ++.BR \-1 "." ++\fB\%ncurses\fP(3X) describes the variants of these functions. ++.PP ++Because these functions do not call \fB\%waddch\fP(3X) internally, ++they are faster than \fB\%waddstr\fP(3X) and \fB\%waddnstr\fP(3X). ++On the other hand, ++they ++.bP ++do not treat the backspace, ++carriage return, ++or line feed characters specially; + .bP +-they do not advance the current cursor position, ++do not represent unprintable characters with \fB\%unctrl\fP(3X); + .bP +-they do not expand other control characters to ^-escapes, and ++do not update the cursor position to follow the last character written; + .bP +-they truncate the string if it crosses the right margin, +-rather than wrapping it around to the new line. ++truncate the string at the window's right margin, ++rather than wrapping it to the next line and potentially scrolling. + .SH RETURN VALUE +-All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success. ++These functions return ++.B OK ++on success and ++.B ERR ++on failure. + .PP + X/Open Curses does not specify any error conditions. +-This implementation returns an error +-.bP +-if the \fIwin\fP parameter is null or +-.bP +-if the \fIwchstr\fP parameter is null. ++.I \%ncurses ++returns ++.B ERR ++if ++.bP ++.I win ++is ++.B NULL ++or ++.bP ++.I chstr ++is ++.BR NULL "." + .PP + Functions prefixed with \*(``mv\*('' first perform cursor movement and + fail if the position +@@ -109,9 +133,12 @@ + .IR x ) + is outside the window boundaries. + .SH NOTES +-All functions except \fBwaddchnstr\fP may be macros. ++All of these functions except ++.B \%waddchnstr ++may be implemented as macros. + .SH PORTABILITY +-These functions are described in X/Open Curses, Issue 4. ++X/Open Curses, ++Issue 4 describes these functions. + .SH SEE ALSO + \fB\%curs_add_wchstr\fP(3X) describes comparable functions of the + .I \%ncurses +Index: man/curs_attr.3x +Prereq: 1.105 +--- ncurses-6.5-20240504+/man/curs_attr.3x 2024-04-27 17:54:42.000000000 +0000 ++++ ncurses-6.5-20240511/man/curs_attr.3x 2024-05-11 20:39:53.000000000 +0000 +@@ -28,8 +28,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: curs_attr.3x,v 1.105 2024/04/27 17:54:42 tom Exp $ +-.TH curs_attr 3X 2024-04-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" ++.\" $Id: curs_attr.3x,v 1.106 2024/05/11 20:39:53 tom Exp $ ++.TH curs_attr 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" + .ie \n(.g \{\ + .ds `` \(lq + .ds '' \(rq +@@ -271,6 +271,16 @@ + .TE + .RE + .PP ++You can thus use ++.B \%A_CHARTEXT ++to extract the character from a ++.IR chtype "," ++.B \%A_ATTRIBUTES ++to obtain its rendering attributes, ++and ++.B \%A_COLOR ++to find the color pair it uses. ++.PP + These video attributes are supported by \fBattr_on\fP and related functions + (which also support the attributes recognized by \fBattron\fP, etc.): + .PP +Index: man/curs_delch.3x +Prereq: 1.34 +--- ncurses-6.5-20240504+/man/curs_delch.3x 2024-04-20 19:24:14.000000000 +0000 ++++ ncurses-6.5-20240511/man/curs_delch.3x 2024-05-11 20:39:53.000000000 +0000 +@@ -27,8 +27,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: curs_delch.3x,v 1.34 2024/04/20 19:24:14 tom Exp $ +-.TH curs_delch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" ++.\" $Id: curs_delch.3x,v 1.35 2024/05/11 20:39:53 tom Exp $ ++.TH curs_delch 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" + .ie \n(.g \{\ + .ds `` \(lq + .ds '' \(rq +@@ -58,19 +58,17 @@ + .B \%wdelch + deletes the character at the cursor position in + .IR win . +-\fB\%ncurses\fP(3X) describes the variants of this function. +-.PP +-.B \%wdelch +-moves all characters to the right of the cursor on the same line to the +-left one position and replaces the contents of the rightmost position on +-the line with the window's blank character; ++It moves all characters to the right of the cursor on the same line to ++the left one position and replaces the contents of the rightmost ++position on the line with the window's blank character; + see \fB\%bkgd\fP(3X) +-(wide-character API users may consult \fB\%bkgrnd\fP(3X) instead). ++(wide-character API users: \fB\%bkgrnd\fP(3X)). + The cursor position does not change + (after moving to + .RI ( y , + .IR x ), + if specified). ++\fB\%ncurses\fP(3X) describes the variants of this function. + .SH RETURN VALUE + These functions return + .B OK +@@ -103,6 +101,7 @@ + .SH PORTABILITY + X/Open Curses, + Issue 4 describes these functions. ++It specifies no error conditions for them. + .PP + SVr4 + .I curses +Index: man/curs_get_wch.3x +Prereq: 1.40 +--- ncurses-6.5-20240504+/man/curs_get_wch.3x 2024-04-20 19:23:03.000000000 +0000 ++++ ncurses-6.5-20240511/man/curs_get_wch.3x 2024-05-11 20:39:53.000000000 +0000 +@@ -27,8 +27,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: curs_get_wch.3x,v 1.40 2024/04/20 19:23:03 tom Exp $ +-.TH curs_get_wch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" ++.\" $Id: curs_get_wch.3x,v 1.41 2024/05/11 20:39:53 tom Exp $ ++.TH curs_get_wch 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" + .ie \n(.g \{\ + .ds `` \(lq + .ds '' \(rq +@@ -65,12 +65,10 @@ + .SH DESCRIPTION + .SS "Reading Characters" + .B \%wget_wch +-gathers a key stroke +-.I wch +-from the terminal keyboard associated with a ++gathers a key event from the terminal keyboard associated with a + .I curses + window +-.IR win , ++.IR win "," + returning + .B OK + if a wide character is read, +@@ -84,11 +82,13 @@ + When input is pending, + .B \%wget_wch + stores an integer +-identifying the key stroke in +-.IR wch ; ++identifying the key event in ++.IR wch ";" + for alphanumeric and punctuation keys, + this value corresponds to the character encoding used by the terminal. +-Use of the control key as a modifier often results in a distinct code. ++Use of the control key as a modifier, ++by holding it down while pressing and releasing another key, ++often results in a distinct code. + The behavior of other keys depends on whether + .I win + is in keypad mode; +@@ -99,7 +99,7 @@ + then if the no-delay flag is set in the window + (see \fB\%nodelay\fP(3X)), + the function returns +-.BR ERR ; ++.BR ERR ";" + otherwise, + .I curses + waits until the terminal has input. +@@ -112,7 +112,7 @@ + If \fB\%halfdelay\fP(3X) + has been called, + .I curses +-waits until a character is typed or the specified delay elapses. ++waits until input is available or the specified delay elapses. + .PP + If \fB\%echo\fP(3X) has been called, + and the window is not a pad, +@@ -142,19 +142,20 @@ + to the window, + as with \fB\%wecho_wchar\fP(3X). + .bP +-If the window has been moved or modified since the last call to ++If the window ++.I win ++has been moved or modified since the last call to + \fB\%wrefresh\fP(3X), + .I curses + calls +-.BR \%wrefresh . ++.B \%wrefresh ++on it. + .PP + If + .I wch + is a carriage return and \fBnl\fP(3X) has been called, + .B \%wgetch +-stores the the character code for newline +-(line feed) +-in ++stores the the character code for line feed in + .I wch + instead. + .SS "Ungetting Characters" +@@ -162,8 +163,8 @@ + places + .I wch + into the input queue to be returned by the next call to +-.BR \%wget_wch . +-A single input queue serves all windows. ++.BR \%wget_wch "." ++A single input queue serves all windows associated with the terminal. + .SH RETURN VALUE + .B \%wget_wch + returns +@@ -178,7 +179,7 @@ + the + .I \%WINDOW + pointer is +-.BR NULL , ++.BR NULL "," + or + .bP + its timeout expires without any data arriving, +@@ -188,12 +189,12 @@ + in which case + .B \%errno + is set to +-.BR \%EINTR . ++.BR \%EINTR "." + .PP + Functions prefixed with \*(``mv\*('' first perform cursor movement and + fail if the position + .RI ( y , +-.IR x ) ++.IR x ")" + is outside the window boundaries. + .PP + .B \%unget_wch +@@ -218,18 +219,16 @@ + parameter instead of the return value. + .PP + Unlike +-.BR \%ungetch , ++.BR \%ungetch "," + .B \%unget_wch +-cannot distinguish function key codes +-.B \%wget_wch +-from conventional character codes. ++cannot distinguish function key codes from conventional character codes. + An application can overcome this limitation by pushing function key + codes with + .B \%ungetch + and subsequently checking the return value of + .B \%wget_wch + for a match with +-.BR \%KEY_CODE_YES . ++.BR \%KEY_CODE_YES "." + .SH EXTENSIONS + See the \*(``EXTENSIONS\*('' section of \fB\%wgetch\fP(3X). + .SH PORTABILITY +Index: man/curs_getch.3x +Prereq: 1.87 +--- ncurses-6.5-20240504+/man/curs_getch.3x 2024-04-20 19:18:18.000000000 +0000 ++++ ncurses-6.5-20240511/man/curs_getch.3x 2024-05-11 20:39:53.000000000 +0000 +@@ -28,8 +28,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: curs_getch.3x,v 1.87 2024/04/20 19:18:18 tom Exp $ +-.TH curs_getch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" ++.\" $Id: curs_getch.3x,v 1.88 2024/05/11 20:39:53 tom Exp $ ++.TH curs_getch 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" + .ie \n(.g \{\ + .ds `` \(lq + .ds '' \(rq +@@ -76,18 +76,20 @@ + .SH DESCRIPTION + .SS "Reading Characters" + .B \%wgetch +-gathers a key stroke from the terminal keyboard associated with a ++gathers a key event from the terminal keyboard associated with a + .I curses + window +-.IR win . ++.IR win "." + \fB\%ncurses\fP(3X) describes the variants of this function. + .PP + When input is pending, + .B \%wgetch +-returns an integer identifying the key stroke; ++returns an integer identifying the key event; + for alphanumeric and punctuation keys, + this value corresponds to the character encoding used by the terminal. +-Use of the control key as a modifier often results in a distinct code. ++Use of the control key as a modifier, ++by holding it down while pressing and releasing another key, ++often results in a distinct code. + The behavior of other keys depends on whether + .I win + is in keypad mode; +@@ -97,7 +99,7 @@ + then if the no-delay flag is set in the window + (see \fB\%nodelay\fP(3X)), + the function returns +-.BR ERR ; ++.BR ERR ";" + otherwise, + .I curses + waits until the terminal has input. +@@ -110,7 +112,7 @@ + If \fB\%halfdelay\fP(3X) + has been called, + .I curses +-waits until a character is typed or the specified delay elapses. ++waits until input is available or the specified delay elapses. + .PP + If \fB\%echo\fP(3X) has been called, + and the window is not a pad, +@@ -140,11 +142,14 @@ + to the window, + as with \fB\%wechochar\fP(3X). + .bP +-If the window has been moved or modified since the last call to ++If the window ++.I win ++has been moved or modified since the last call to + \fB\%wrefresh\fP(3X), + .I curses + calls +-.BR \%wrefresh . ++.B \%wrefresh ++on it. + .PP + If + .I c +@@ -153,7 +158,7 @@ + returns the character code for line feed instead. + .SS "Keypad Mode" + To +-.IR curses , ++.IR curses "," + key strokes not from the alphabetic section of the keyboard + (those corresponding to the ECMA-6 character set\(emsee + \fIascii\fP(7)\(emoptionally modified by either the control or shift +@@ -162,7 +167,7 @@ + .I function + keys. + (In +-.IR curses , ++.IR curses "," + the term \*(``function key\*('' includes but is not limited to keycaps + engraved with \*(``F1\*('', + \*(``PF1\*('', +@@ -183,12 +188,12 @@ + header file declares many + .I "predefined function keys" + whose names begin with +-.BR KEY_ ; ++.BR KEY_ ";" + these object-like macros have values outside the range of eight-bit + character codes. + .bP + In +-.IR \%ncurses , ++.IR \%ncurses "," + .I "user-defined function keys" + are configured with \fB\%define_key\fP(3X); + they have no names, +@@ -204,9 +209,10 @@ + escape character ESC. + This fact implies that + .I curses +-cannot know whether the terminal has sent an ESC key stroke or the +-beginning of a function key's character sequence without waiting to see +-if, ++cannot distinguish a user's press of the escape key ++(assuming it sends ESC) ++from the beginning of a function key's character sequence without ++waiting to see if, + and how soon, + further input arrives. + When +@@ -223,7 +229,8 @@ + Consequently, + a user of a + .I curses +-application may experience a delay after pressing ESC while ++application may experience a delay after they escape key is pressed ++while + .I curses + disambiguates the input; + see section \*(``EXTENSIONS\*('' below. +@@ -233,26 +240,26 @@ + (or very large) + value. + See \fB\%notimeout\fP(3X). +-Because function key sequences usually begin with an escape character, +-the terminal may appear to hang in no time-out mode after the user has +-pressed ESC. ++Because function key sequences usually begin with ESC, ++the terminal may appear to hang in no time-out mode after the user ++presses the escape key. + Generally, + further typing \*(``awakens\*('' +-.IR curses . ++.IR curses "." + .SS "Ungetting Characters" + .B \%ungetch + places + .I c + into the input queue to be returned by the next call to +-.BR \%wgetch . +-A single input queue serves all windows. ++.BR \%wgetch "." ++A single input queue serves all windows associated with the terminal. + .SS "Predefined Key Codes" + The header file + .I \%curses.h + defines the following function key codes. + .bP + Except for the special case of +-.BR \%KEY_RESIZE , ++.BR \%KEY_RESIZE "," + a window's keypad mode must be enabled for + .B \%wgetch + to read these codes from it. +@@ -394,7 +401,7 @@ + .bP + .B \%wgetch + returns +-.BR \%KEY_RESIZE , ++.BR \%KEY_RESIZE "," + even if the window's keypad mode is disabled, + when + .I \%ncurses +@@ -416,7 +423,7 @@ + as with a function key. + .SS "Testing Key Codes" + In +-.IR \%ncurses , ++.IR \%ncurses "," + .B \%has_key + returns a Boolean value indicating whether the terminal type recognizes + its parameter as a key code value. +@@ -424,7 +431,7 @@ + \fB\%define_key\fP(3X) and \fB\%key_defined\fP(3X). + .SH RETURN VALUE + Except for +-.BR \%has_key , ++.BR \%has_key "," + these functions return + .B OK + on success and +@@ -434,12 +441,12 @@ + Functions taking a + .I \%WINDOW + pointer argument fail if the pointer is +-.BR NULL . ++.BR NULL "." + .PP + Functions prefixed with \*(``mv\*('' first perform cursor movement and + fail if the position + .RI ( y , +-.IR x ) ++.IR x ")" + is outside the window boundaries. + .PP + .B \%wgetch +@@ -452,7 +459,7 @@ + in which case + .B \%errno + is set to +-.BR \%EINTR . ++.BR \%EINTR "." + .PP + .B \%ungetch + fails if there is no more room in the input queue. +@@ -461,7 +468,7 @@ + returns + .B TRUE + or +-.BR FALSE . ++.BR FALSE "." + .SH NOTES + .I curses + discourages assignment of the ESC key to a discrete function by the +@@ -472,7 +479,7 @@ + for example, + .B \%KEY_ENTER + may be the same as +-.BR \*^M , ++.BR \*^M "," + .\" as with att630 or pccon+keys + and + .B \%KEY_BACKSPACE +@@ -480,7 +487,7 @@ + .B \*^H + .\" as with att505 or vt52-basic + or +-.BR \*^? . ++.BR \*^? "." + .\" as with pccon+keys or vt320 + Consult the terminal's + .I \%term\%info +@@ -490,7 +497,7 @@ + .I curses + implementations, + including +-.IR \%ncurses , ++.IR \%ncurses "," + honor the + .I \%term\%info + key definitions; +@@ -502,7 +509,7 @@ + .B \%KEY_ENTER + refers to the key on the numeric keypad and, + like other function keys, +-and is reliably recognized only if the window's keypad mode is enabled. ++is reliably recognized only if the window's keypad mode is enabled. + .bP + The + .I \%term\%info +@@ -551,12 +558,12 @@ + A + .I curses + application can expect such a keyboard to transmit key codes +-.BR \%KEY_UP , +-.BR \%KEY_DOWN , +-.BR \%KEY_LEFT , +-.BR \%KEY_RIGHT , +-.BR \%KEY_HOME , +-.BR \%KEY_END , ++.BR \%KEY_UP "," ++.BR \%KEY_DOWN "," ++.BR \%KEY_LEFT "," ++.BR \%KEY_RIGHT "," ++.BR \%KEY_HOME "," ++.BR \%KEY_END "," + .B \%KEY_PPAGE + (Page Up), + .B \%KEY_NPAGE +@@ -571,14 +578,14 @@ + .I n + \(<= 12. + .PP +-.BR \%getch , +-.BR \%mvgetch , ++.BR \%getch "," ++.BR \%mvgetch "," + and + .B \%mvwgetch + may be implemented as macros. + .SH EXTENSIONS + In +-.IR \%ncurses , ++.IR \%ncurses "," + when a window's \*(``no time-out\*('' mode is + .I not + set, +@@ -590,12 +597,15 @@ + see + \fB\%curs_variables\fP(3X). + .PP +-\fB\%has_key\fP was designed for \fB\%ncurses\fP(3X), ++\fB\%has_key\fP was designed for ++.IR \%ncurses "," + and is not found in SVr4 +-.IR curses , ++.IR curses "," + 4.4BSD +-.IR curses , +-or any other previous curses implementation. ++.IR curses "," ++or any other previous ++.I curses ++implementation. + .SH PORTABILITY + Applications employing + .I \%ncurses +@@ -629,14 +639,14 @@ + .I curses + implementations, + it varied depending on whether the operating system's dispatch of a +-signal to a handler interrupting a \fIread\fP(2) call in progress, ++signal to a handler interrupted a \fIread\fP(2) call in progress, + and also + (in some implementations) +-whether an input timeout or non-blocking mode has been set. ++whether an input timeout or non-blocking mode had been set. + Programmers concerned about portability should be prepared for either of + two cases: + (a) signal receipt does not interrupt +-.BR \%wgetch ; ++.BR \%wgetch ";" + or + (b) signal receipt interrupts + .B \%wgetch +@@ -645,7 +655,7 @@ + with + .B \%errno + set to +-.BR \%EINTR . ++.BR \%EINTR "." + .PP + .B \%KEY_MOUSE + is mentioned in X/Open Curses, +@@ -661,7 +671,7 @@ + and + .B \%has_key + are extensions first implemented for +-.IR \%ncurses . ++.IR \%ncurses "." + By 2022, + .I \%PDCurses + .\" https://web.archive.org/web/20220117232009/https://pdcurses.org/docs/MANUAL.html +@@ -670,7 +680,7 @@ + .I curses + .\" https://web.archive.org/web/20200923185647/https://man.netbsd.org/curses_input.3 + had added them along with +-.BR \%KEY_MOUSE . ++.BR \%KEY_MOUSE "." + .SH SEE ALSO + \fB\%curs_get_wch\fP(3X) describes comparable functions of the + .I \%ncurses +Index: man/curs_getstr.3x +Prereq: 1.58 +--- ncurses-6.5-20240504+/man/curs_getstr.3x 2024-04-20 19:18:18.000000000 +0000 ++++ ncurses-6.5-20240511/man/curs_getstr.3x 2024-05-11 20:39:53.000000000 +0000 +@@ -27,8 +27,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: curs_getstr.3x,v 1.58 2024/04/20 19:18:18 tom Exp $ +-.TH curs_getstr 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" ++.\" $Id: curs_getstr.3x,v 1.59 2024/05/11 20:39:53 tom Exp $ ++.TH curs_getstr 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" + .ie \n(.g \{\ + .ds `` \(lq + .ds '' \(rq +@@ -199,7 +199,7 @@ + .PP + X/Open Curses, Issue 5 (2007) stated that these functions + \*(``read at most \fIn\fP bytes\*('' +-but did not state whether the terminating NUL is counted in that limit. ++but did not state whether the terminating NUL counted toward that limit. + X/Open Curses, Issue 7 (2009) changed that to say they + \*(``read at most \fIn\fP\-1 bytes\*('' + to allow for the terminating NUL. +Index: man/curs_getyx.3x +Prereq: 1.44 +--- ncurses-6.5-20240504+/man/curs_getyx.3x 2024-04-20 21:20:07.000000000 +0000 ++++ ncurses-6.5-20240511/man/curs_getyx.3x 2024-05-11 20:39:53.000000000 +0000 +@@ -27,8 +27,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: curs_getyx.3x,v 1.44 2024/04/20 21:20:07 tom Exp $ +-.TH curs_getyx 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" ++.\" $Id: curs_getyx.3x,v 1.45 2024/05/11 20:39:53 tom Exp $ ++.TH curs_getyx 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" + .ie \n(.g \{\ + .ds `` \(lq + .ds '' \(rq +@@ -51,62 +51,109 @@ + \fB#include + .PP + \fBvoid getyx(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP); +-\fBvoid getparyx(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP); + \fBvoid getbegyx(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP); + \fBvoid getmaxyx(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP); ++.PP ++\fBvoid getparyx(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP); + .fi + .SH DESCRIPTION +-The \fB\%getyx\fP macro places the current cursor position +-of the given window in the two integer variables \fIy\fP and \fIx\fP. +-.PP +-If \fIwin\fP is a subwindow, the \fB\%getparyx\fP macro places the beginning +-coordinates of the subwindow relative to the parent window into two integer +-variables \fIy\fP and \fIx\fP. +-Otherwise, \fB\-1\fP is placed into \fIy\fP and \fIx\fP. +-.PP +-Like \fB\%getyx\fP, the \fB\%getbegyx\fP and \fB\%getmaxyx\fP macros store +-the current beginning coordinates and size of the specified window. ++These macros obtain the cursor position and bounds information of a ++.I curses ++window ++.IR win "." ++.B \%getyx ++stores ++.IR win "'s" ++cursor position in the variables ++.I y ++and ++.IR x "." ++.B \%getmaxyx ++stores ++.IR win "'s" ++maximum valid row and column numbers in ++.I y ++and ++.IR x "," ++respectively. ++.B \%getbegyx ++similarly stores the position of ++.IR win "'s" ++origin relative to that of the screen ++(for ++.BR stdscr "," ++these coordinates are always ++.BR 0 ")." ++.PP ++If ++.I win ++is a subwindow ++(see \fB\%subwin\fP(3X)), ++the ++.B \%getparyx ++macro places the coordinates of its origin relative to its parent window ++into ++.I y ++and ++.IR x "," ++and ++.B \-1 ++into both if it is not. + .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). ++No return values are defined for macros. ++Do not use them as the right-hand side of assignment statements. + .SH NOTES +-All of these interfaces are macros. +-A \*(``&\*('' is not necessary before the variables \fIy\fP and \fIx\fP. ++All of these interfaces are implemented as macros. ++An \*(``&\*('' operator is not necessary before the variables ++.I y ++and ++.IR x "." + .SH PORTABILITY +-The +-\fB\%getyx\fP, +-\fB\%getparyx\fP, +-\fB\%getbegyx\fP and +-\fB\%getmaxyx\fP +-macros are described in X/Open Curses, Issue 4. +-.PP +-This implementation also provides functions +-\fB\%getbegx\fP, +-\fB\%getbegy\fP, +-\fB\%getcurx\fP, +-\fB\%getcury\fP, +-\fB\%getmaxx\fP, +-\fB\%getmaxy\fP, +-\fB\%getparx\fP and +-\fB\%getpary\fP +-for compatibility with older versions of \fIcurses\fP; ++These macros are described in X/Open Curses, ++Issue 4. ++.PP ++.I \%ncurses ++also provides functions ++.BR \%getbegx "," ++.BR \%getbegy "," ++.BR \%getcurx "," ++.BR \%getcury "," ++.BR \%getmaxx "," ++.BR \%getmaxy "," ++.BR \%getparx "," ++and ++.B \%getpary ++for compatibility with older versions of ++.IR curses ";" + see \fB\%curs_legacy\fP(3X). + .PP +-Although X/Open Curses does not address this, +-many implementations provide members of the \fB\%WINDOW\fP structure +-containing values corresponding to these macros. +-For best portability, do not rely on using the data in \fB\%WINDOW\fP, +-since some implementations make \fB\%WINDOW\fP opaque (do not allow +-direct use of its members). ++Although X/Open Curses does not address the issue, ++many implementations expose members of the ++.I \%WINDOW ++structure containing values corresponding to these macros. ++Do not rely on their availability; ++some implementations make ++.I \%WINDOW ++opaque ++(that is, ++they do not allow direct access to its members). + .PP + Besides the problem of opaque structures, +-the data stored in like-named members may not have like-values in +-different implementations. +-For example, the \fB\%WINDOW._maxx\fP and \fB\%WINDOW._maxy\fP values +-in \fI\%ncurses\fP have +-(at least since release 1.8.1) ++the data stored in like-named members may not have values of the same ++meaning different implementations. ++For example, ++the values of ++.B \%WINDOW._maxx ++and ++.B \%WINDOW._maxy ++in ++.I \%ncurses ++have long ++.\" (at least since its initial release, 1.8.1) + differed by one from some other implementations. +-The difference is hidden by means of the macro \fB\%getmaxyx\fP. ++The ++.B \%getmaxyx ++macro hides this difference. + .SH SEE ALSO + \fB\%curses\fP(3X), + \fB\%curs_legacy\fP(3X), +Index: man/curs_inch.3x +Prereq: 1.51 +--- ncurses-6.5-20240504+/man/curs_inch.3x 2024-04-20 21:20:07.000000000 +0000 ++++ ncurses-6.5-20240511/man/curs_inch.3x 2024-05-11 20:39:53.000000000 +0000 +@@ -28,8 +28,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: curs_inch.3x,v 1.51 2024/04/20 21:20:07 tom Exp $ +-.TH curs_inch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" ++.\" $Id: curs_inch.3x,v 1.52 2024/05/11 20:39:53 tom Exp $ ++.TH curs_inch 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" + .ie \n(.g \{\ + .ds `` \(lq + .ds '' \(rq +@@ -57,31 +57,21 @@ + .PP + \fBchtype inch(void); + \fBchtype winch(WINDOW *\fIwin\fP); +-.PP + \fBchtype mvinch(int \fIy\fP, int \fIx\fP); + \fBchtype mvwinch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP); + .fi + .SH DESCRIPTION +-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\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\fP. +-.PP +-.TS +-Lb Lb +-Lb Lx. +-Name Description +-_ +-A_CHARTEXT Extract character +-A_ATTRIBUTES Extract attributes +-A_COLOR Extract color pair information +-.TE ++.B \%winch ++returns the ++.I curses ++character, ++including rendering attributes and color pair identifier, ++at the cursor position in the window ++.IR win "." ++Subsection \*(``Video Attributes\*('' of \fB\%attron\fP(3X) explains ++how to extract these data from a ++.IR chtype "." ++\fB\%ncurses\fP(3X) describes the variants of this function. + .SH RETURN VALUE + Functions prefixed with \*(``mv\*('' first perform cursor movement and + fail if the position +@@ -89,35 +79,68 @@ + .IR x ) + is outside the window boundaries. + .PP +-The \fBwinch\fP function does not return an error if the window contains +-characters larger than 8-bits (255). +-Only the low-order 8 bits of the character are used by \fBwinch\fP. ++These functions do not return an error if the window comprises cells of ++.I curses ++complex characters ++(that is, ++they contain characters with codes wider than eight bits, ++or greater than 255 as an unsigned decimal integer). ++They instead extract only the low-order eight bits of character data ++in the cell. + .SH NOTES +-Note that all of these routines may be macros. ++.BR \%inch , ++.BR \%mvinch , ++and ++.B \%mvwinch ++may be implemented as macros. + .SH PORTABILITY +-These functions are described in X/Open Curses, Issue 4. +-.PP +-Very old systems (before standardization) provide a different function +-with the same name: +-.bP +-The \fBwinch\fP function was part of the original BSD curses library, +-which stored a 7-bit character combined with the \fIstandout\fP attribute. +-.IP +-In BSD curses, \fBwinch\fP returned only the character (as an integer) +-with the \fIstandout\fP attribute removed. +-.bP +-System V curses added support for several video attributes which +-could be combined with characters in the window. +-.IP +-Reflecting this improvement, the function was altered to return the +-character combined with all video attributes in a \fBchtype\fP value. +-.PP +-X/Open Curses does not specify +-the size and layout of attributes, color and character values in +-\fBchtype\fP; it is implementation-dependent. +-This implementation uses 8 bits for character values. +-An application using more bits, e.g., a Unicode value, +-should use the wide-character equivalents to these functions. ++X/Open Curses, ++Issue 4 describes these functions. ++It specifies no error conditions for them. ++.SH HISTORY ++.B \%winch ++was implemented in the original 4BSD ++.I curses ++library ++(November 1980). ++It returned only the character code ++(as an integer) ++with the \*(``standout\*(`` attribute bit ++(the only one it supported) ++cleared. ++Because 7-bit ASCII was the only character encoding supported, ++4BSD's ++.B \%winch ++returned a ++.I char ++type. ++.\" Through macros, it directly accessed a `char` structure member. ++.PP ++System\ V ++.I curses ++(1983) permitted several rendering attributes to be combined with a ++character in a window. ++Reflecting this improvement, ++.B \%winch ++.\" XXX: possibly returned a `short` in SVr1 through SVr3 --GBR ++returned an ++.I int ++in SVr3.2 (1988) ++and switched to ++.I chtype ++in SVr4 (1989). ++.PP ++X/Open Curses does not specify the sizes of the character code or ++color pair identifier, ++nor the quantity of rendering attribute bits, ++in ++.IR chtype ";" ++these are implementation-dependent. ++.I \%ncurses ++uses eight bits for the character code. ++An application requiring a wider character type, ++for instance to handle Unicode, ++should use the wide-character counterparts of these functions. + .SH SEE ALSO + \fB\%curs_in_wch\fP(3X) describes comparable functions of the + .I \%ncurses +Index: man/curs_mouse.3x +Prereq: 1.98 +--- ncurses-6.5-20240504+/man/curs_mouse.3x 2024-04-20 19:02:07.000000000 +0000 ++++ ncurses-6.5-20240511/man/curs_mouse.3x 2024-05-11 20:39:53.000000000 +0000 +@@ -28,8 +28,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: curs_mouse.3x,v 1.98 2024/04/20 19:02:07 tom Exp $ +-.TH curs_mouse 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" ++.\" $Id: curs_mouse.3x,v 1.99 2024/05/11 20:39:53 tom Exp $ ++.TH curs_mouse 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" + .ie \n(.g \{\ + .ds `` \(lq + .ds '' \(rq +@@ -487,11 +487,12 @@ + .I \%xterm + mouse report sequence appears in the string read. + .PP +-Mouse event reports from ++An ++.I \%ncurses ++window must enable \fB\%keypad\fP(3X) to correctly receive mouse event ++reports from + .I \%xterm +-are not detected correctly in a window with keypad application mode +-disabled, +-since they are interpreted as a variety of function key. ++since they are encoded like function keys. + Set the terminal's + .I \%term\%info + capability \fB\%kmous\fP to \*(``\eE[M\*('' +Index: man/curs_outopts.3x +Prereq: 1.64 +--- ncurses-6.5-20240504+/man/curs_outopts.3x 2024-04-20 21:24:19.000000000 +0000 ++++ ncurses-6.5-20240511/man/curs_outopts.3x 2024-05-11 20:39:53.000000000 +0000 +@@ -27,29 +27,29 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: curs_outopts.3x,v 1.64 2024/04/20 21:24:19 tom Exp $ +-.TH curs_outopts 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" ++.\" $Id: curs_outopts.3x,v 1.65 2024/05/11 20:39:53 tom Exp $ ++.TH curs_outopts 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" + .de bP + .ie n .IP \(bu 4 + .el .IP \(bu 2 + .. + .SH NAME + \fB\%clearok\fP, +-\fB\%idlok\fP, + \fB\%idcok\fP, ++\fB\%idlok\fP, + \fB\%immedok\fP, + \fB\%leaveok\fP, ++\fB\%scrollok\fP, + \fB\%setscrreg\fP, +-\fB\%wsetscrreg\fP, +-\fB\%scrollok\fP \- ++\fB\%wsetscrreg\fP \- + set \fIcurses\fR output options + .SH SYNOPSIS + .nf + \fB#include + .PP + \fBint clearok(WINDOW *\fIwin\fP, bool \fIbf\fP); +-\fBint idlok(WINDOW *\fIwin\fP, bool \fIbf\fP); + \fBvoid idcok(WINDOW *\fIwin\fP, bool \fIbf\fP); ++\fBint idlok(WINDOW *\fIwin\fP, bool \fIbf\fP); + \fBvoid immedok(WINDOW *\fIwin\fP, bool \fIbf\fP); + \fBint leaveok(WINDOW *\fIwin\fP, bool \fIbf\fP); + \fBint scrollok(WINDOW *\fIwin\fP, bool \fIbf\fP); +@@ -72,6 +72,13 @@ + 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 idcok ++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\fP with \fBTRUE\fP as second argument re-enables use ++of character insertion and deletion. + .SS idlok + If \fBidlok\fP is called with \fBTRUE\fP as second argument, \fBcurses\fP + considers using the hardware insert/delete line feature of terminals so +@@ -85,13 +92,6 @@ + when used in applications where it is not really needed. + If insert/delete line + cannot be used, \fBcurses\fP redraws the changed portions of all lines. +-.SS idcok +-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\fP with \fBTRUE\fP as second argument re-enables use +-of character insertion and deletion. + .SS immedok + If \fBimmedok\fP is called with \fBTRUE\fP as second argument, + any change in the window image, +@@ -119,7 +119,7 @@ + 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\fP). +-.SS "setscrreg, wsetscrreg" ++.SS "setscrreg, wsetscrreg" + The \fBsetscrreg\fP and \fBwsetscrreg\fP routines allow the application + programmer to set a software scrolling region in a window. + The \fItop\fP and +Index: man/curs_sp_funcs.3x +Prereq: 1.50 +--- ncurses-6.5-20240504+/man/curs_sp_funcs.3x 2024-04-20 18:56:31.000000000 +0000 ++++ ncurses-6.5-20240511/man/curs_sp_funcs.3x 2024-05-11 20:39:53.000000000 +0000 +@@ -27,8 +27,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: curs_sp_funcs.3x,v 1.50 2024/04/20 18:56:31 tom Exp $ +-.TH curs_sp_funcs 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" ++.\" $Id: curs_sp_funcs.3x,v 1.51 2024/05/11 20:39:53 tom Exp $ ++.TH curs_sp_funcs 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" + .ie \n(.g \{\ + .ds `` \(lq + .ds '' \(rq +Index: man/curs_termattrs.3x +Prereq: 1.41 +--- ncurses-6.5-20240504+/man/curs_termattrs.3x 2024-04-20 21:20:07.000000000 +0000 ++++ ncurses-6.5-20240511/man/curs_termattrs.3x 2024-05-11 20:39:53.000000000 +0000 +@@ -27,8 +27,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: curs_termattrs.3x,v 1.41 2024/04/20 21:20:07 tom Exp $ +-.TH curs_termattrs 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" ++.\" $Id: curs_termattrs.3x,v 1.42 2024/05/11 20:39:53 tom Exp $ ++.TH curs_termattrs 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" + .SH NAME + \fB\%baudrate\fP, + \fB\%erasechar\fP, +@@ -41,7 +41,7 @@ + \fB\%term_attrs\fP, + \fB\%termattrs\fP, + \fB\%termname\fP \- +-\fIcurses\fR environment query routines ++get and set terminal attributes with \fIcurses\fP + .SH SYNOPSIS + .nf + \fB#include +Index: man/curs_util.3x +Prereq: 1.101 +--- ncurses-6.5-20240504+/man/curs_util.3x 2024-04-20 21:20:07.000000000 +0000 ++++ ncurses-6.5-20240511/man/curs_util.3x 2024-05-11 20:39:53.000000000 +0000 +@@ -28,8 +28,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: curs_util.3x,v 1.101 2024/04/20 21:20:07 tom Exp $ +-.TH curs_util 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" ++.\" $Id: curs_util.3x,v 1.102 2024/05/11 20:39:53 tom Exp $ ++.TH curs_util 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" + .ie \n(.g \{\ + .ds `` \(lq + .ds '' \(rq +@@ -71,7 +71,7 @@ + .PP + \fBvoid filter(void); + .PP +-\fBvoid use_env(bool \fIf\fP); ++\fBvoid use_env(bool \fIbf\fP); + .PP + \fBint putwin(WINDOW *\fIwin\fP, FILE *\fIfilep\fP); + \fBWINDOW *getwin(FILE *\fIfilep\fP); +@@ -81,7 +81,7 @@ + .PP + \fI/* extensions */ + \fBvoid nofilter(void); +-\fBvoid use_tioctl(bool \fIf\fP); ++\fBvoid use_tioctl(bool \fIbf\fP); + .fi + .SH DESCRIPTION + .SS unctrl +@@ -217,7 +217,6 @@ + use_env use_tioctl Summary + _ + TRUE FALSE T{ +-This is the default behavior. + \fI\%ncurses\fP uses operating system calls + unless overridden by \fILINES\fP or \fI\%COLUMNS\fP environment + variables; +Index: man/infocmp.1m +Prereq: 1.109 +--- ncurses-6.5-20240504+/man/infocmp.1m 2024-03-16 15:35:01.000000000 +0000 ++++ ncurses-6.5-20240511/man/infocmp.1m 2024-05-11 20:39:53.000000000 +0000 +@@ -28,8 +28,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: infocmp.1m,v 1.109 2024/03/16 15:35:01 tom Exp $ +-.TH @INFOCMP@ 1M 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands" ++.\" $Id: infocmp.1m,v 1.110 2024/05/11 20:39:53 tom Exp $ ++.TH @INFOCMP@ 1M 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands" + .ie \n(.g \{\ + .ds `` \(lq + .ds '' \(rq +@@ -49,7 +49,6 @@ + .el .IP \(bu 2 + .. + . +-.ds d @TERMINFO@ + .SH NAME + \fB@INFOCMP@\fP \- + compare or print out \fIterminfo\fP descriptions +@@ -584,7 +583,7 @@ + using the \fB\-x\fP option of \fB@TIC@\fP. + .SH FILES + .TP +-.I \*d ++.I @TERMINFO@ + compiled terminal description database + .SH EXTENSIONS + The +Index: man/infotocap.1m +Prereq: 1.41 +--- ncurses-6.5-20240504+/man/infotocap.1m 2024-03-16 15:35:01.000000000 +0000 ++++ ncurses-6.5-20240511/man/infotocap.1m 2024-05-11 20:39:53.000000000 +0000 +@@ -27,8 +27,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: infotocap.1m,v 1.41 2024/03/16 15:35:01 tom Exp $ +-.TH @INFOTOCAP@ 1M 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands" ++.\" $Id: infotocap.1m,v 1.42 2024/05/11 20:39:53 tom Exp $ ++.TH @INFOTOCAP@ 1M 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands" + .ie \n(.g \{\ + .ds `` \(lq + .ds '' \(rq +@@ -40,7 +40,6 @@ + .el .ds '' "" + .\} + . +-.ds d @TERMINFO@ + .SH NAME + \fB\%@INFOTOCAP@\fP \- + convert a \fI\%terminfo\fR description into a \fI\%termcap\fR description +@@ -78,7 +77,7 @@ + with this program and exits with a successful status. + .SH FILES + .TP +-.I \*d ++.I @TERMINFO@ + compiled terminal description database + .SH PORTABILITY + None of X/Open Curses, +Index: man/man_db.renames.in +Prereq: 1.73 +--- ncurses-6.5-20240504+/man/man_db.renames.in 2024-04-13 23:39:11.000000000 +0000 ++++ ncurses-6.5-20240511/man/man_db.renames.in 2024-05-11 20:30:32.000000000 +0000 +@@ -26,7 +26,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: man_db.renames.in,v 1.73 2024/04/13 23:39:11 tom Exp $ ++# $Id: man_db.renames.in,v 1.74 2024/05/11 20:30:32 tom Exp $ + # Manual-page renamings for the man_db program + # + # Files: +@@ -251,6 +251,7 @@ + subwin.3x subwin.3ncurses + syncok.3x syncok.3ncurses + terminfo.3x terminfo.3ncurses ++tigetflag.3x tigetflag.3ncurses + tigetstr.3x tigetstr.3ncurses + touchline.3x touchline.3ncurses + touchwin.3x touchwin.3ncurses +@@ -266,6 +267,8 @@ + vidputs.3x vidputs.3ncurses + wadd_wch.3x wadd_wch.3ncurses + waddch.3x waddch.3ncurses ++waddnstr.3x waddnstr.3ncurses ++waddnwstr.3x waddnwstr.3ncurses + waddstr.3x waddstr.3ncurses + waddwstr.3x waddwstr.3ncurses + wattr_set.3x wattr_set.3ncurses +@@ -286,6 +289,7 @@ + wrefresh.3x wrefresh.3ncurses + wsetscrreg.3x wsetscrreg.3ncurses + wtimeout.3x wtimeout.3ncurses ++wunctrl.3x wunctrl.3ncurses + # + # Other: + getty.8 getty.8 +Index: man/manhtml.aliases +Prereq: 1.35 +--- ncurses-6.5-20240504+/man/manhtml.aliases 2024-04-14 00:36:21.000000000 +0000 ++++ ncurses-6.5-20240511/man/manhtml.aliases 2024-05-11 21:52:17.000000000 +0000 +@@ -1,4 +1,4 @@ +-# $Id: manhtml.aliases,v 1.35 2024/04/14 00:36:21 tom Exp $ ++# $Id: manhtml.aliases,v 1.36 2024/05/11 21:52:17 tom Exp $ + #*************************************************************************** + # Copyright 2019-2023,2024 Thomas E. Dickey * + # Copyright 2013,2017 Free Software Foundation, Inc. * +@@ -99,6 +99,7 @@ + start_color(3X) curs_color(3X) + terminfo(3X) curs_terminfo(3X) + tic(1) tic(1M) ++tigetflag(3X) curs_terminfo(3X) + tigetstr(3X) curs_terminfo(3X) + touchline(3X) curs_touch(3X) + touchwin(3X) curs_touch(3X) +@@ -112,6 +113,8 @@ + vidputs(3X) curs_terminfo(3X) + wadd_wch(3X) curs_add_wch(3X) + waddch(3X) curs_addch(3X) ++waddnstr(3X) curs_addstr(3X) ++waddnwstr(3X) curs_addwstr(3X) + waddstr(3X) curs_addstr(3X) + waddwstr(3X) curs_addwstr(3X) + wattr_set(3X) curs_attr(3X) +@@ -124,6 +127,7 @@ + wget_wch(3X) curs_get_wch(3X) + wgetch(3X) curs_getch(3X) + wgetstr(3X) curs_getstr(3X) ++win_wch(3X) curs_in_wch(3X) + winch(3X) curs_inch(3X) + wins_wch(3X) curs_ins_wch(3X) + winsch(3X) curs_insch(3X) +@@ -131,3 +135,4 @@ + wnoutrefresh(3X) curs_refresh(3X) + wrefresh(3X) curs_refresh(3X) + wsetscrreg(3X) curs_outopts(3X) ++wunctrl(3X) curs_util(3X) +Index: man/manhtml.externs +Prereq: 1.25 +--- ncurses-6.5-20240504+/man/manhtml.externs 2024-04-20 19:26:05.000000000 +0000 ++++ ncurses-6.5-20240511/man/manhtml.externs 2024-05-11 20:35:15.000000000 +0000 +@@ -1,4 +1,4 @@ +-# $Id: manhtml.externs,v 1.25 2024/04/20 19:26:05 tom Exp $ ++# $Id: manhtml.externs,v 1.26 2024/05/11 20:35:15 tom Exp $ + # Items in this list will not be linked by man2html + #*************************************************************************** + # Copyright 2019-2023,2024 Thomas E. Dickey * +@@ -53,6 +53,7 @@ + profile(5) + putc(3) + putchar(3) ++putwchar(3) + putwc(3) + read(2) + readline(3) +Index: man/ncurses.3x +Prereq: 1.214 +--- ncurses-6.5-20240504+/man/ncurses.3x 2024-04-27 17:55:43.000000000 +0000 ++++ ncurses-6.5-20240511/man/ncurses.3x 2024-05-11 20:39:53.000000000 +0000 +@@ -28,8 +28,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: ncurses.3x,v 1.214 2024/04/27 17:55:43 tom Exp $ +-.TH ncurses 3X 2024-04-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" ++.\" $Id: ncurses.3x,v 1.215 2024/05/11 20:39:53 tom Exp $ ++.TH ncurses 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" + .ie \n(.g \{\ + .ds `` \(lq + .ds '' \(rq +@@ -54,7 +54,6 @@ + . TP + .. + . +-.ds d @TERMINFO@ + .SH NAME + \fB\%ncurses\fP \- + character-cell terminal interface with optimized output +@@ -86,15 +85,16 @@ + .I windows + and + .IR pads ; +-the reading of terminal input; ++acquisition of keyboard and mouse events; + control of terminal input and output options; +-environment query routines; +-color manipulation; ++selection of color and rendering attributes ++(such as bold or underline); + the definition and use of + .I "soft label" + keys; ++access to the + .I \%term\%info +-capability access; ++terminal capability database; + a + .I termcap + compatibility interface; +@@ -102,8 +102,7 @@ + (such as \fI\%termios\fP(3)). + .PP + .I \%ncurses +-implements the standard interface described by +-X/Open Curses Issue\ 7. ++implements the interface described by X/Open Curses Issue\ 7. + In many behavioral details not standardized by X/Open, + .I \%ncurses + emulates the +@@ -272,7 +271,7 @@ + .PP + Frequent changes to the terminal screen can cause unpleasant flicker or + inefficient use of the communication channel to the device, +-so the library does not generally update it automatically. ++so as a rule the library does not update it automatically. + Therefore, + after using + .I curses +@@ -284,7 +283,7 @@ + .\" X/Open Curses Issue 7 assumes some optimization will be done, but + .\" does not mandate it in any way. + .I optimizes +-its output by computing a minimal number of operations to mutate the ++its output by computing a minimal volume of operations to mutate the + screen from its state at the previous refresh to the new one. + Effective optimization demands accurate information about the terminal + device: +@@ -297,26 +296,28 @@ + Special windows called + .I pads + may also be manipulated. +-These are windows that are not constrained to the size of the terminal +-screen and whose contents need not be completely displayed. ++These are not constrained to the size of the terminal screen and their ++contents need not be completely displayed. + See \fB\%curs_pad\fP(3X). + .PP +-In addition to drawing characters on the screen, +-rendering 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. ++Many terminals support configuration of character cell foreground and ++background colors as well as rendering ++.I attributes , ++which cause characters to show up in such modes as ++boldfaced, ++underlined, ++or in reverse video. + See \fB\%curs_attr\fP(3X). + .PP + .I curses + predefines constants for a small set of forms-drawing graphics + corresponding to the DEC Alternate Character Set (ACS), + a feature of VT100 and other terminals. +-See \fB\%waddch\fP(3X). ++See \fB\%addch\fP(3X). + .PP + .I curses + is implemented using the operating system's terminal driver; +-keystroke events are received not as scan codes but as byte sequences. ++key events are received not as scan codes but as byte sequences. + Graphical keycaps + (alphanumeric and punctuation keys, + and the space) +@@ -330,13 +331,14 @@ + appears as a control character or a multibyte + .I "escape sequence." + .I curses +-translates these into unique ++translates the latter into unique + .I "key codes." + See \fB\%getch\fP(3X). + .PP + .I \%ncurses + provides reimplementations of the SVr4 \fBpanel\fP(3X), \fBform\fP(3X), +-and \fBmenu\fP(3X) libraries to ease construction of user interfaces ++and \fBmenu\fP(3X) libraries; ++they permit overlapping windows and ease construction of user interfaces + with + .IR curses . + .SS "Initialization" +@@ -353,9 +355,9 @@ + \fB\%tset\fP(1) may assist with troubleshooting exotic situations. + .PP + If you change the terminal type, +-export the ++export the shell's + .I TERM +-environment variable in the shell, ++variable, + then run \fB\%tset\fP(1) or the + .RB \*(`` "@TPUT@ init" \*('' + command. +@@ -384,9 +386,8 @@ + program checks first for a terminal type description in the location it + identifies. + .I \%TERMINFO +-is useful for developing experimental type descriptions or when write +-permission to +-.I \%\*d ++is useful for developing type descriptions or when write permission to ++.I \%@TERMINFO@ + is not available. + .PP + See section \*(``ENVIRONMENT\*('' below. +@@ -413,7 +414,7 @@ + .TS + center; + Li L. +-bf \fIbool\fP (\fBTRUE\fP or \fBFALSE\fP) ++bf a \fIbool\fP (\fBTRUE\fP or \fBFALSE\fP) + c a \fIchar\fP or \fIint\fP + ch a \fIchtype\fP + wc a \fIwchar_t\fP or \fIwint_t\fP +@@ -422,21 +423,33 @@ + pad pointer to a \fIWINDOW\fP that is a pad + .TE + .SS "Wide and Non-wide Character Configurations" +-This manual page describes functions that appear in any configuration +-of the library. ++This man page primarily surveys functions that appear in any ++configuration of the library. + There are two common configurations; + see section \*(``ALTERNATE CONFIGURATIONS\*('' below. + .TP 10 \" "ncursesw" + 2n + .I \%ncurses + is the library in its \*(``non-wide\*('' configuration, + handling only eight-bit characters. +-It stores a character combined with attributes in a ++It stores a character combined with attributes and a color pair in a + .I \%chtype + datum, + which is often an alias of + .IR int . ++A string of ++.I curses ++characters is similar to a C ++.I char ++string; ++a ++.I chtype ++string ends with an integral ++.BR 0 "," ++the null ++.I curses ++character. + .IP +-Attributes alone ++Attributes and a color pair selection + (with no corresponding character) + can be stored in variables of + .I \%chtype +@@ -444,7 +457,7 @@ + .I \%attr_t + type. + In either case, +-they are represented as an integral bit mask. ++they are accessed via an integral bit mask. + .IP + Each cell of a + .I \%WINDOW +@@ -477,9 +490,14 @@ + a complex character contains one spacing character and zero or more + non-spacing characters + (see below). +-Attributes and color data are stored in separate fields of the +-structure, +-not combined as in ++A string of complex characters ends with a ++.I \%cchar_t ++whose ++.I \%wchar_t ++member is the null wide character. ++Attributes and a color pair selection are stored in separate fields of ++the structure, ++not combined into an integer as in + .IR \%chtype . + .PP + Each cell of a +@@ -1033,11 +1051,12 @@ + below. + .SH RETURN VALUE + Unless otherwise noted, +-functions that return an integer return ++functions that return integers return the constants + .B OK + on success and + .B ERR +-on failure. ++on failure; ++see \fB\%curs_variables\fP(3X). + Functions that return pointers return + .B NULL + on failure. +@@ -1069,7 +1088,7 @@ + If that value is absent or invalid, + .I \%ncurses + uses 9600. +-This feature allows testers to construct repeatable test cases ++This feature allows developers to construct repeatable test cases + that take into account optimization decisions that depend on baud rate. + .SS "\fICC\fP (command character)" + When set, +@@ -1256,7 +1275,7 @@ + When + .I \%ncurses + is configured to use the GPM interface, +-this variable may list one or more terminal names ++this variable may list one or more terminal type names + against which the + .I TERM + variable +@@ -1265,7 +1284,7 @@ + An empty value disables the GPM interface, + using + .IR \%ncurses 's +-built-in support for \fIxterm\fP(1) mouse protocols instead. ++built-in support for \fI\%xterm\fP(1) mouse protocols instead. + If the variable is absent, + .I \%ncurses + attempts to open GPM if +@@ -1315,8 +1334,8 @@ + limiting the speed of communication to what the hardware could handle. + Unless a hardware terminal is interfaced into a terminal concentrator + (which does flow control), +-an application must manage flow control itself to prevent overruns and +-data loss. ++an application must manage flow itself to prevent overruns and data ++loss. + .PP + A solution that comes at no hardware cost is for an application to pause + after directing a terminal to execute an operation that it performs +@@ -1588,7 +1607,7 @@ + .bP + location(s) configured and compiled into + .I \%ncurses +-.RS 3 ++.RS + .if !'\*(td'' \{\ + .bP + .I \%@TERMINFO_DIRS@ +@@ -1661,29 +1680,49 @@ + .IR \%ncurses . + .TP 5 + .B \-\-disable\-overwrite +-The standard include for \fI\%ncurses\fP is as noted in \fBSYNOPSIS\fP: ++The standard C preprocessor inclusion for the ++.I curses ++library is as follows. + .RS 5 + .PP + .RS 4 + .EX +-\fB#include \fP ++.\" The dummy character prevents undesired rewriting of the next line on ++.\" installation of the man page. ++\fB#\&include \fP + .EE + .RE + .PP +-This option is used to avoid filename conflicts when \fI\%ncurses\fP +-is not the main implementation of curses of the computer. +-If \fI\%ncurses\fP is installed disabling overwrite, +-it puts its headers in a subdirectory, +-e.g., ++This option is used to avoid file name conflicts between ++.I \%ncurses ++and an existing ++.I curses ++installation on the system. ++If ++.I \%ncurses ++is installed disabling overwrite, ++it puts its header files in a subdirectory. ++Here is an example. + .PP + .RS 4 + .EX +-\fB#include \fP ++.\" The dummy character prevents undesired rewriting of the next line on ++.\" installation of the man page. ++\fB#\&include \fP + .EE + .RE + .PP +-It also omits a symbolic link which would allow you to use \fB\-lcurses\fP +-to build executables. ++Installation also omits a symbolic link that would cause the compiler's ++.B \-lcurses ++option to link object files with ++.I \%ncurses ++instead of the system ++.I curses ++library. ++.PP ++The directory used by this configuration of ++.I \%ncurses ++is shown in section \*(``SYNOPSIS\*('' above. + .RE + .TP 5 + .B \-\-enable\-widec +@@ -1801,7 +1840,7 @@ + .I @DATADIR@/tabset + tab stop initialization database + .TP +-.I \*d ++.I @TERMINFO@ + compiled terminal capability database + .SH NOTES + X/Open Curses permits most functions it specifies to be made available +@@ -1819,7 +1858,7 @@ + those that move the cursor before another operation), + and + .bP +-a few special cases. ++in a few special cases. + .PP + If the standard output file descriptor of an + .I \%ncurses +@@ -1878,8 +1917,8 @@ + \fB\%is_scrollok\fP(3X). + .PP + .I \%ncurses +-enables an application to direct application output to a printer +-attached to the terminal device; ++enables an application to direct its output to a printer attached to the ++terminal device; + see \fB\%curs_print\fP(3X). + .PP + .I \%ncurses +@@ -1896,25 +1935,31 @@ + .I \%ncurses + is compiled to support them; + section \*(``ALTERNATE CONFIGURATIONS\*('' describes how. +-.bP ++.PP ++.I \%ncurses ++permits modification of \fB\%unctrl\fP(3X)'s behavior; ++see \fB\%use_legacy_coding\fP(3X). ++.PP + Rudimentary support for multi-threaded applications may be available; + see \fBcurs_threads\fP(3X). +-.bP ++.PP + Functions that ease the management of multiple screens can be exposed; + see \fBcurs_sp_funcs\fP(3X). +-.bP ++.PP + To aid applications to debug their memory usage, +-.I ncurses ++.I \%ncurses + optionally offers functions to more aggressively free memory it + dynamically allocates itself; + see \fBcurs_memleaks\fP(3X). +-.bP ++.PP + The library facilitates auditing and troubleshooting of its behavior; + see \fBcurs_trace\fP(3X). +-.bP +-The compiler option ++.PP ++Compiling ++.I \%ncurses ++with the option + .B \%\-DUSE_GETCAP +-causes the library to fall back to reading ++causes it to fall back to reading + .I \%/etc/termcap + if the terminal setup code cannot find a + .I \%term\%info +@@ -1963,11 +2008,10 @@ + This is done primarily to guard against programmer error. + The standard interface does not provide a way for the library + to tell an application which of several possible errors occurred. +-Relying on this +-(or some other) +-extension adversely affects the portability of +-.I curses +-applications. ++An application that relies on ++.I \%ncurses ++to check its function parameters for validity limits its portability and ++robustness. + .SS "Padding Differences" + In historical + .I curses +@@ -2125,7 +2169,7 @@ + includes + .I \%term.h + and +-.IR \% termios.h . ++.IR \%termios.h . + Again, + .I \%ncurses + and Solaris +Index: man/term.5 +Prereq: 1.77 +--- ncurses-6.5-20240504+/man/term.5 2024-04-20 21:24:19.000000000 +0000 ++++ ncurses-6.5-20240511/man/term.5 2024-05-11 20:39:53.000000000 +0000 +@@ -28,8 +28,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: term.5,v 1.77 2024/04/20 21:24:19 tom Exp $ +-.TH term 5 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats" ++.\" $Id: term.5,v 1.78 2024/05/11 20:39:53 tom Exp $ ++.TH term 5 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats" + .ie \n(.g \{\ + .ds `` \(lq + .ds '' \(rq +@@ -55,69 +55,101 @@ + .el .IP \(bu 2 + .. + . +-.ds d @TERMINFO@ + .SH NAME + term \- +-compiled \fIterminfo\fR terminal description +-.SH SYNOPSIS +-.B term ++compiled \fI\%term\%info\fP terminal description + .SH DESCRIPTION ++\fB\%@TIC@\fP(1) compiles a ++.I \%term\%info ++terminal type description, ++and \fB\%setupterm\fP(3X) reads it. ++A compiled description may be stored in a file or in a database of, ++potentially, ++many such descriptions. ++Further, ++a compiled description may be in one of two formats: ++one similar to that used by System\ V, ++and a newer, ++extensible format employed exclusively by ++.IR \%ncurses . + .SS "Storage Location" +-Compiled terminfo descriptions are placed under the directory \fB\*d\fP. +-Two configurations are supported +-(when building the \fI\%ncurses\fP libraries): ++Compiled ++.I \%term\%info descriptions are placed ++under the directory ++.IR \%@TERMINFO@ . ++One of two configurations is selected ++when building the ++.I \%ncurses ++libraries. + .TP 5 + .B directory tree + A two-level scheme is used to avoid a linear search +-of a huge Unix system directory: \fB\*d/c/name\fP where ++of a huge Unix system directory: ++.IR \%@TERMINFO@/ c / name ++where + .I name +-is the name of the terminal, and ++is the name of the terminal, ++and + .I c + is the first character of + .IR name . + Thus, +-.I act4 +-can be found in the file \fB\*d/a/act4\fP. ++the compiled description of terminal type \*(``act4\*('' ++is found in the file ++.IR \%@TERMINFO@/a/act4 . + Synonyms for the same terminal are implemented by multiple + links to the same compiled file. + .TP 5 + .B hashed database +-Using Berkeley database, two types of records are stored: +-the terminfo data in the same format as stored in a directory tree with +-the terminfo's primary name as a key, ++Using the Berkeley database API, ++two types of records are stored: ++the ++.I \%term\%info ++data in the same format as that stored in a directory tree with ++the terminal's primary type name as a key, + and records containing only aliases pointing to the primary name. + .IP + If built to write hashed databases, +-\fI\%ncurses\fP can still read terminfo databases organized as a ++.I \%ncurses ++can still read ++.I \%term\%info ++databases organized as a + directory tree, + but cannot write entries into the directory tree. +-It can write (or rewrite) entries in the hashed database. ++It can write ++(or rewrite) ++entries in the hashed database. + .IP +-\fI\%ncurses\fP distinguishes the two cases in the \fI\%TERMINFO\fP and +-\fI\%TERMINFO_DIRS\fP environment variable by assuming a directory tree +-for entries that correspond to an existing directory, +-and hashed database otherwise. ++.I \%ncurses ++distinguishes the two cases in the ++.I \%TERMINFO ++and ++.I \%TERMINFO_DIRS ++environment variable by assuming a directory tree for entries that ++correspond to an existing directory, ++and a hashed database otherwise. + .SS "Legacy Storage Format" + The format has been chosen so that it will be the same on all hardware. +-An 8 or more bit byte is assumed, but no assumptions about byte ordering ++A byte of at least eight bits' width is assumed, ++but no assumptions about bit ordering + or sign extension are made. + .PP +-The compiled file is created with the \fB@TIC@\fP program, +-and read by the routine \fBsetupterm\fP(3X). + The file is divided into six parts: + .RS 5 +-.TP 3 +-a) \fIheader\fP, +-.TP 3 +-b) \fIterminal names\fP, +-.TP 3 +-c) \fIBoolean flags\fP, +-.TP 3 +-d) \fInumbers\fP, +-.TP 3 +-e) \fIstrings\fP, and +-.TP 3 +-f) \fIstring table\fP. ++.IP (a) 4 ++.IR header , ++.IP (b) ++.IR "terminal names" , ++.IP (c) ++.IR "Boolean flags" , ++.IP (d) ++.IR numbers , ++.IP (e) ++.IR strings , ++and ++.IP (f) ++a ++.IR "string table" . + .RE + .PP + The \fIheader\fP section begins the file. +@@ -126,54 +158,64 @@ + These integers are + .RS 5 + .TP 5 +-(1) the \fImagic number\fP (octal 0432); ++(1) the \fImagic number\fP ++(octal 0432); + .TP 5 +-(2) the size, in bytes, of the \fIterminal names\fP section; ++(2) the size, ++in bytes, ++of the \fIterminal names\fP section; + .TP 5 + (3) the number of bytes in the \fIBoolean flags\fP section; + .TP 5 + (4) the number of short integers in the \fInumbers\fP section; + .TP 5 +-(5) the number of offsets (short integers) in the \fIstrings\fP section; +-.TP 5 +-(6) the size, in bytes, of the \fIstring table\fP. ++(5) the number of offsets ++(short integers) ++in the \fIstrings\fP section; ++.TP 5 ++(6) the size, ++in bytes, ++of the \fIstring table\fP. + .RE + .PP + The capabilities in the + \fIBoolean flags\fP, +-\fInumbers\fP, and ++\fInumbers\fP, ++and + \fIstrings\fP +-sections are in the same order as the file . ++sections are in the same order as in the header file ++.IR term.h . + .PP +-Short integers are signed, in the range \-32768 to 32767. +-They are stored as two 8-bit bytes. +-The first byte contains the least significant 8 bits of the value, +-and the second byte contains the most significant 8 bits. +-(Thus, the value represented is 256*second+first.) +-This format corresponds to the hardware of the \s-1VAX\s+1 +-and \s-1PDP\s+1-11 (that is, little-endian machines). +-Machines where this does not correspond to the hardware must read the +-integers as two bytes and compute the little-endian value. ++Short integers are signed, ++in the range \-32768 to 32767, ++and stored in little-endian format. + .PP + Numbers in a terminal description, + whether they are entries in the \fInumbers\fP or \fIstrings\fP table, + are positive integers. + Boolean flags are treated as positive one-byte integers. +-In each case, those positive integers represent a terminal capability. +-The terminal compiler @TIC@ uses negative integers to handle the cases where +-a capability is not available: ++In each case, ++those positive integers represent a terminal capability. ++The terminal compiler ++.I \%@TIC@ ++uses negative integers to handle the cases where a capability is not ++available: + .bP + If a capability is absent from this terminal, +-@TIC@ stores a \-1 in the corresponding table. ++.I \%@TIC@ ++stores a \-1 in the corresponding table. + .IP +-The integer value \-1 is represented by two bytes 0377, 0377. ++The integer value \-1 is represented by two bytes 0377, ++0377. + .br + Absent Boolean values are represented by the byte 0 (false). + .bP + If a capability has been canceled from this terminal, +-@TIC@ stores a \-2 in the corresponding table. ++.I \%@TIC@ ++stores a \-2 in the corresponding table. + .IP +-The integer value \-2 is represented by two bytes 0377, 0376. ++The integer value \-2 is represented by two bytes 0377, ++0376. + .br + The Boolean value \-2 is represented by the byte 0376. + .br +@@ -181,18 +223,22 @@ + Other negative values are illegal. + .PP + The \fIterminal names\fP section comes after the \fIheader\fP. +-It contains the first line of the terminfo description, ++It contains the first line of the ++.I \%term\%info ++description, + listing the various names for the terminal, + separated by the \*(``|\*('' character. + The \fIterminal names\fP section is terminated + with an \s-1ASCII NUL\s+1 character. + .PP + The \fIBoolean flags\fP section has one byte for each flag. +-Boolean capabilities are either 1 or 0 (true or false) ++Boolean capabilities are either 1 or 0 ++(true or false) + according to whether the terminal supports the given capability or not. + .PP + Between the \fIBoolean flags\fP section and the \fInumber\fP section, +-a null byte will be inserted, if necessary, ++a null byte will be inserted, ++if necessary, + to ensure that the \fInumber\fP section begins on an even byte + This is a relic of the PDP\-11's word-addressed architecture, + originally designed to avoid traps induced +@@ -212,27 +258,41 @@ + the \fIstrings\fP section. + Each string is null-terminated. + Special characters in \*^X or \ec notation are stored in their +-interpreted form, not the printing representation. +-Padding information $ and parameter information %x are +-stored intact in uninterpreted form. ++interpreted form, ++not the printing representation. ++Padding information ++.BI $< nn > ++and parameter information ++.B %x ++are stored intact in uninterpreted form. + .SS "Extended Storage Format" +-The previous section describes the conventional terminfo binary format. +-With some minor variations of the offsets (see PORTABILITY), ++The previous section describes the conventional ++.I \%term\%info ++binary format. ++With some minor variations of the offsets ++(see PORTABILITY), + the same binary format is used in all modern Unix systems. +-Each system uses a predefined set of Boolean, number or string capabilities. ++Each system uses a predefined set of Boolean, ++number or string capabilities. + .PP +-The \fI\%ncurses\fP libraries and applications support +-extended terminfo binary format, +-allowing users to define capabilities which are loaded at runtime. +-This +-extension is made possible by using the fact that the other implementations +-stop reading the terminfo data when they have reached the end of the size given +-in the header. +-\fI\%ncurses\fP checks the size, ++The ++.I \%ncurses ++libraries and applications support extended ++.I \%term\%info ++binary format, ++allowing users to define capabilities that are loaded at runtime. ++This extension is made possible by using the fact that the other ++implementations stop reading the ++.I \%term\%info ++data when they reach the end of the size given in the header. ++.I \%ncurses ++checks the size, + and if it exceeds that due to the predefined data, + continues to parse according to its own scheme. + .PP +-First, it reads the extended header (5 short integers): ++First, ++it reads the extended header ++(5 short integers): + .RS 5 + .TP 5 + (1) +@@ -256,45 +316,62 @@ + extended capability \fIvalues\fP. + .PP + Using the counts and sizes, +-\fI\%ncurses\fP allocates arrays and reads data for the extended +-capabilities in the same order as the header information. ++.I \%ncurses ++allocates arrays and reads data for the extended capabilities in the ++same order as the header information. + .PP + The extended string table contains values for string capabilities. +-After the end of these values, it contains the names for each of +-the extended capabilities in order, e.g., Booleans, then numbers and +-finally strings. ++After the end of these values, ++it contains the names for each of ++the extended capabilities in order: ++Boolean, ++numeric, ++and string. + .PP + By storing terminal descriptions in this way, +-\fI\%ncurses\fP is able to provide a database useful with legacy +-applications, +-as well as providing data for applications which need more than the +-predefined capabilities. +-See \fBuser_caps\fP(5) for an overview +-of the way \fI\%ncurses\fP uses this extended information. +-.PP +-Applications which manipulate terminal data can use the definitions +-described in \fBterm_variables\fP(3X) which associate the long capability +-names with members of a \fBTERMTYPE\fP structure. ++.I \%ncurses ++is able to provide a database useful with legacy applications, ++as well as providing data for applications that require more information ++about a terminal type than was anticipated ++by X/Open Curses. ++See \fB\%user_caps\fP(5) for an overview of the way ++.I \%ncurses ++uses this extended information. ++.PP ++Applications that manipulate terminal data can use the definitions ++described in \fB\%term_variables\fP(3X) associating the long capability ++names with members of a ++.I \%TERMTYPE ++structure. + . + .SS "Extended Number Format" +-On occasion, 16-bit signed integers are not large enough. +-With \fI\%ncurses\fP 6.1, +-a new format was introduced by making a few changes +-to the legacy format: ++On occasion, ++16-bit signed integers are not large enough. ++.I \%ncurses ++6.1 introduced a new format ++by making a few changes to the legacy format: + .bP +-a different magic number (octal 01036) ++a different magic number ++(octal 01036) + .bP + changing the type for the \fInumber\fP array from signed 16-bit integers + to signed 32-bit integers. + .PP +-To maintain compatibility, the library presents the same data structures +-to direct users of the \fBTERMTYPE\fP structure as in previous formats. +-However, that cannot provide callers with the extended numbers. +-The library uses a similar but hidden data structure \fBTERMTYPE2\fP +-to provide data for the terminfo functions. ++To maintain compatibility, ++the library presents the same data structures ++to direct users of the ++.I \%TERMTYPE ++structure as in previous formats. ++However, ++that cannot provide callers with the extended numbers. ++The library uses a similar but hidden data structure ++.I \%TERMTYPE2 ++to provide data for the ++.I \%term\%info ++functions. + .SH FILES + .TP +-.I \*d ++.I @TERMINFO@ + compiled terminal description database + .SH PORTABILITY + .SS setupterm +@@ -313,69 +390,101 @@ + .B setupterm + must be prepared for both possibilities \- + this is why the numbers and sizes are included. +-Also, new capabilities must always be added at the end of the lists +-of Boolean, number, and string capabilities. ++Also, ++new capabilities must always be added at the end of the lists ++of Boolean, ++number, ++and string capabilities. + .SS "Binary Format" +-X/Open Curses does not specify a format for the terminfo database. +-System V curses used a directory-tree of binary files, ++X/Open Curses does not specify a format for the ++.I \%term\%info ++database. ++System\ V ++.I curses ++used a directory-tree of binary files, + one per terminal description. + .PP +-Despite the consistent use of little-endian for numbers and the otherwise +-self-describing format, it is not wise to count on portability of binary +-terminfo entries between commercial Unix versions. +-The problem is that there +-are at least three versions of terminfo (under HP\-UX, AIX, and OSF/1) which +-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 X/Open Curses extensions. +-See \fBterminfo\fP(5) for detailed +-discussion of terminfo source compatibility issues. ++Despite the consistent use of little-endian numbers and the otherwise ++self-describing format, ++it is not wise to count on portability of binary ++.I \%term\%info ++entries between commercial Unix versions. ++The problem is that there are at least three versions of ++.I \%term\%info ++(under HP\-UX, ++AIX, ++and OSF/1) ++each of which diverged from System\ V ++.I \%term\%info ++after SVr1, ++and added extension capabilities to the string table that ++(in the binary format) ++collide with System\ V and X/Open Curses extensions. ++See \fB\%terminfo\fP(5) for detailed ++discussion of ++.I \%term\%info ++source compatibility issues. + .PP + This implementation is by default compatible with the binary +-terminfo format used by Solaris curses, ++.I \%term\%info ++format used by Solaris ++.IR curses , + except in a few less-used details + where it was found that the latter did not match X/Open Curses. + The format used by the other Unix versions +-can be matched by building \fI\%ncurses\fP ++can be matched by building ++.I \%ncurses + with different configuration options. + .SS "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 \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)). ++The magic number in a binary ++.I \%term\%info ++file is the first 16 bits ++(two bytes). ++Besides making it more reliable for the library to check that a file is ++.IR \%term\%info , ++utilities such as \fIfile\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 \fB\%scr_dump\fP(5)). + This implementation uses 01036 as a continuation of that sequence, + but with a different high-order byte to avoid confusion. + .SS "The \fITERMTYPE\fP Structure" +-Direct access to the \fBTERMTYPE\fP structure is provided for legacy +-applications. +-Portable applications should use the \fBtigetflag\fP and related functions +-described in \fBcurs_terminfo\fP(3X) for reading terminal capabilities. ++Direct access to the ++.I \%TERMTYPE ++structure is provided for legacy applications. ++Portable applications should use \fB\%tigetflag\fP(3X) and related ++functions to read terminal capabilities. + .SS "Mixed-case Terminal Names" + A small number of terminal descriptions use uppercase characters in + their names. +-If the underlying filesystem ignores the difference between ++If the underlying file system ignores the difference between + uppercase and lowercase, +-\fI\%ncurses\fP represents the \*(``first character\*('' +-of the terminal name used as +-the intermediate level of a directory tree in (two-character) hexadecimal form. ++.I \%ncurses ++represents the \*(``first character\*('' of the terminal name used as ++the intermediate level of a directory tree in (two-character) ++hexadecimal form. + .SS Limits +-\fI\%ncurses\fP stores compiled terminal descriptions +-in three related formats, +-described in the sections ++.I \%ncurses ++stores compiled terminal descriptions in three related formats, ++described in the subsections + .bP +-\fBLEGACY STORAGE FORMAT\fP, and ++.BR "Legacy Storage Format" , ++and + .bP +-\fBEXTENDED STORAGE FORMAT\fP, and ++.BR "Extended Storage Format" , ++and + .bP +-\fBEXTENDED NUMBER FORMAT\fP. ++.BR "Extended Number Format" . + .PP + The legacy storage format and the extended number format differ by +-the types of numeric capability which they can store +-(i.e., 16-bit versus 32-bit integers). +-The extended storage format introduced by \fI\%ncurses\fP 5.0 adds data +-to either of these formats. ++the types of numeric capability that they can store ++(for example, ++16- versus 32-bit integers). ++The extended storage format introduced by ++.I \%ncurses ++5.0 adds data to either of these formats. + .PP + Some limitations apply: + .bP +@@ -390,8 +499,10 @@ + The legacy format could have supported 32768-byte entries, + but was limited to a virtual memory page's 4096 bytes. + .SH EXAMPLES +-As an example, here is a description for the Lear-Siegler +-ADM\-3, a popular though rather stupid early terminal: ++Here is a ++.I \%term\%info ++description of the Lear-Siegler ADM-3, ++a popular though rather stupid early terminal. + .PP + .EX + adm3a|lsi adm3a, +@@ -402,7 +513,9 @@ + home=\*^\*^, ind=\*^J, + .EE + .PP +-and a hexadecimal dump of the compiled terminal description: ++A hexadecimal dump of its compiled terminal description ++(in legacy format) ++follows. + .PP + .if t .in +4n + .ft \*(CW +@@ -436,15 +549,27 @@ + .SH AUTHORS + Thomas E. Dickey + .br +-extended terminfo format for \fI\%ncurses\fP 5.0 ++extended ++.I \%term\%info ++format for ++.I \%ncurses ++5.0 + .br +-hashed database support for \fI\%ncurses\fP 5.6 ++hashed database support for ++.I \%ncurses ++5.6 + .br +-extended number support for \fI\%ncurses\fP 6.1 ++extended number support for ++.I \%ncurses ++6.1 + .sp + Eric S. Raymond + .br +-documented legacy terminfo format, e.g., from \fIpcurses\fP. ++documented legacy ++.I \%term\%info ++format ++(that used by ++.IR \%pcurses ). + .SH SEE ALSO + \fB\%curses\fP(3X), + \fB\%curs_terminfo\fP(3X), +Index: man/term.7 +Prereq: 1.48 +--- ncurses-6.5-20240504+/man/term.7 2024-03-16 15:35:01.000000000 +0000 ++++ ncurses-6.5-20240511/man/term.7 2024-05-11 20:39:53.000000000 +0000 +@@ -27,8 +27,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: term.7,v 1.48 2024/03/16 15:35:01 tom Exp $ +-.TH term 7 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" Miscellaneous ++.\" $Id: term.7,v 1.49 2024/05/11 20:39:53 tom Exp $ ++.TH term 7 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" Miscellaneous + .ie \n(.g \{\ + .ds `` \(lq + .ds '' \(rq +@@ -40,7 +40,6 @@ + .el .ds '' "" + .\} + . +-.ds d @TERMINFO@ + .SH NAME + term \- + conventions for naming terminal types +@@ -83,7 +82,7 @@ + which you wish to override the system default type for your line. + .PP + Terminal type descriptions are stored as files of capability data underneath +-\*d. ++@TERMINFO@. + To browse a list of all terminal names recognized by the system, do + .sp + @TOE@ | more +@@ -97,7 +96,7 @@ + @INFOCMP@ \fIentry_name\fP + .sp + 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 ++name of its capability file the subdirectory of @TERMINFO@ named for its first + letter). + This command dumps a capability file in the text format described by + \fBterminfo\fP(5). +@@ -221,7 +220,7 @@ + on the \fITERM\fP environment variable when no \-T option is specified. + .SH FILES + .TP +-.I \*d ++.I @TERMINFO@ + compiled terminal description database + .TP + .I /etc/inittab +Index: man/terminfo.head +Prereq: 1.65 +--- ncurses-6.5-20240504+/man/terminfo.head 2024-04-20 21:14:00.000000000 +0000 ++++ ncurses-6.5-20240511/man/terminfo.head 2024-05-11 20:39:53.000000000 +0000 +@@ -27,8 +27,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: terminfo.head,v 1.65 2024/04/20 21:14:00 tom Exp $ +-.TH terminfo 5 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats" ++.\" $Id: terminfo.head,v 1.66 2024/05/11 20:39:53 tom Exp $ ++.TH terminfo 5 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats" + .ie \n(.g \{\ + .ds `` \(lq + .ds '' \(rq +@@ -51,12 +51,11 @@ + .el .IP \(bu 2 + .. + . +-.ds d @TERMINFO@ + .SH NAME + \fB\%terminfo\fP \- + terminal capability database + .SH SYNOPSIS +-\*d/*/* ++@TERMINFO@/*/* + .SH DESCRIPTION + .I Terminfo + is a database describing terminals, +Index: man/terminfo.tail +Prereq: 1.148 +--- ncurses-6.5-20240504+/man/terminfo.tail 2024-04-20 21:24:19.000000000 +0000 ++++ ncurses-6.5-20240511/man/terminfo.tail 2024-05-11 20:28:54.000000000 +0000 +@@ -27,7 +27,7 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: terminfo.tail,v 1.148 2024/04/20 21:24:19 tom Exp $ ++.\" $Id: terminfo.tail,v 1.149 2024/05/11 20:28:54 tom Exp $ + .ps +1 + .SS "User-Defined Capabilities" + . +@@ -277,14 +277,14 @@ + .IP + An empty pathname (i.e., if the variable begins or ends + with a colon, or contains adjacent colons) +-is interpreted as the system location \fI\*d\fP. ++is interpreted as the system location \fI@TERMINFO@\fP. + .bP + Finally, \fI\%ncurses\fP searches these compiled-in locations: + .RS + .bP + a list of directories (@TERMINFO_DIRS@), and + .bP +-the system terminfo directory, \fI\*d\fP ++the system terminfo directory, \fI@TERMINFO@\fP + .RE + .PP + The \fBTERMINFO\fP variable can contain a terminal description instead +@@ -2019,7 +2019,7 @@ + expansion) lengths. + .SH FILES + .TP +-.I \*d ++.I @TERMINFO@ + compiled terminal description database directory + .SH EXTENSIONS + Searching for terminal descriptions in +Index: man/tic.1m +Prereq: 1.110 +--- ncurses-6.5-20240504+/man/tic.1m 2024-04-27 17:57:06.000000000 +0000 ++++ ncurses-6.5-20240511/man/tic.1m 2024-05-11 20:39:53.000000000 +0000 +@@ -27,8 +27,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: tic.1m,v 1.110 2024/04/27 17:57:06 tom Exp $ +-.TH @TIC@ 1M 2024-04-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands" ++.\" $Id: tic.1m,v 1.111 2024/05/11 20:39:53 tom Exp $ ++.TH @TIC@ 1M 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands" + .ie \n(.g \{\ + .ds `` \(lq + .ds '' \(rq +@@ -45,7 +45,6 @@ + .el .IP \(bu 2 + .. + . +-.ds d @TERMINFO@ + .SH NAME + \fB\%@TIC@\fP \- + compile terminal descriptions for \fIterminfo\fR or \fItermcap\fR +@@ -109,7 +108,8 @@ + 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\fP. ++The results are normally placed ++in the system terminfo database \fB@TERMINFO@\fP. + The compiled terminal description can be placed + in a different terminfo database. + There are two ways to achieve this: +@@ -119,7 +119,7 @@ + or by setting the variable \fI\%TERMINFO\fP + in your shell environment to a valid database location. + .bP +-Secondly, if \fB@TIC@\fP cannot write in \fI\*d\fP ++Secondly, if \fB@TIC@\fP cannot write in \fI@TERMINFO@\fP + or the location specified using your \fI\%TERMINFO\fP variable, + it looks for the directory \fI$HOME/.terminfo\fP + (or hashed database \fI$HOME/.terminfo.db)\fP; +@@ -135,7 +135,7 @@ + .bP + a compiled-in list of directories (@TERMINFO_DIRS@), and + .bP +-the system terminfo database (\fI\*d\fP). ++the system terminfo database (\fI@TERMINFO@\fP). + .PP + The \fIFetching Compiled Descriptions\fP section in the \fBterminfo\fR(5) + manual goes into further detail. +@@ -419,7 +419,7 @@ + .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. ++from \fB@TERMINFO@\fP to complete the entry. + (Entries created from + \fIfile\fP will be used first. + \fB@TIC@\fP duplicates the capabilities in +@@ -443,7 +443,7 @@ + and a warning message will be printed. + .SH FILES + .TP +-.I \*d ++.I @TERMINFO@ + compiled terminal description database + .SH NOTES + There is some evidence that historic \fB@TIC@\fP implementations treated +Index: man/toe.1m +Prereq: 1.68 +--- ncurses-6.5-20240504+/man/toe.1m 2024-04-20 18:59:26.000000000 +0000 ++++ ncurses-6.5-20240511/man/toe.1m 2024-05-11 20:39:53.000000000 +0000 +@@ -28,8 +28,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: toe.1m,v 1.68 2024/04/20 18:59:26 tom Exp $ +-.TH @TOE@ 1M 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands" ++.\" $Id: toe.1m,v 1.69 2024/05/11 20:39:53 tom Exp $ ++.TH @TOE@ 1M 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands" + .ie \n(.g \{\ + .ds `` \(lq + .ds '' \(rq +@@ -50,7 +50,6 @@ + .ie n .IP \(bu 4 + .el .IP \(bu 2 + .. +-.ds d @TERMINFO@ + .SH NAME + \fB\%@TOE@\fP \- + list table of entries of \fIterminfo\fR terminal types +@@ -143,7 +142,7 @@ + with this program and exits with a successful status. + .SH FILES + .TP +-.I \*d ++.I @TERMINFO@ + compiled terminal description database + .SH PORTABILITY + \fB\%@TOE@\fP is not provided by other implementations. +Index: man/tput.1 +Prereq: 1.113 +--- ncurses-6.5-20240504+/man/tput.1 2024-04-20 19:58:50.000000000 +0000 ++++ ncurses-6.5-20240511/man/tput.1 2024-05-11 20:39:53.000000000 +0000 +@@ -28,8 +28,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: tput.1,v 1.113 2024/04/20 19:58:50 tom Exp $ +-.TH @TPUT@ 1 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands" ++.\" $Id: tput.1,v 1.114 2024/05/11 20:39:53 tom Exp $ ++.TH @TPUT@ 1 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands" + .ie \n(.g \{\ + .ds `` \(lq + .ds '' \(rq +@@ -45,7 +45,6 @@ + .ie n .IP \(bu 4 + .el .IP \(bu 2 + .. +-.ds d @TERMINFO@ + .SH NAME + \fB\%@TPUT@\fP \- + initialize a terminal, exercise its capabilities, or query \fI\%term\%info\fP database +@@ -434,7 +433,7 @@ + .I @DATADIR@/tabset + tab stop initialization database + .TP +-.I \*d ++.I @TERMINFO@ + compiled terminal description database + .SH PORTABILITY + Over time +Index: man/tset.1 +Prereq: 1.85 +--- ncurses-6.5-20240504+/man/tset.1 2024-04-27 17:57:47.000000000 +0000 ++++ ncurses-6.5-20240511/man/tset.1 2024-05-11 20:39:53.000000000 +0000 +@@ -27,8 +27,8 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: tset.1,v 1.85 2024/04/27 17:57:47 tom Exp $ +-.TH @TSET@ 1 2024-04-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands" ++.\" $Id: tset.1,v 1.86 2024/05/11 20:39:53 tom Exp $ ++.TH @TSET@ 1 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands" + .ie \n(.g \{\ + .ds `` \(lq + .ds '' \(rq +@@ -47,7 +47,6 @@ + .el .IP \(bu 2 + .. + . +-.ds d @TERMINFO@ + .SH NAME + \fB\%@TSET@\fP, + \fB\%@RESET@\fP \- +@@ -314,7 +313,7 @@ + .I /etc/ttys + system port name to terminal type mapping database (BSD versions only). + .TP +-.I \*d ++.I @TERMINFO@ + compiled terminal description database directory + .SH PORTABILITY + Neither IEEE Std 1003.1/The Open Group Base Specifications Issue 7 +Index: ncurses/base/lib_newterm.c +Prereq: 1.104 +--- ncurses-6.5-20240504+/ncurses/base/lib_newterm.c 2022-07-09 18:58:58.000000000 +0000 ++++ ncurses-6.5-20240511/ncurses/base/lib_newterm.c 2024-05-11 19:06:59.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2018-2020,2022 Thomas E. Dickey * ++ * Copyright 2018-2022,2024 Thomas E. Dickey * + * Copyright 1998-2016,2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -49,7 +49,7 @@ + + #include + +-MODULE_ID("$Id: lib_newterm.c,v 1.104 2022/07/09 18:58:58 tom Exp $") ++MODULE_ID("$Id: lib_newterm.c,v 1.105 2024/05/11 19:06:59 tom Exp $") + + #ifdef USE_TERM_DRIVER + #define NumLabels InfoOf(SP_PARM).numlabels +@@ -279,6 +279,7 @@ + + /* allow user to set maximum escape delay from the environment */ + if ((value = _nc_getenv_num("ESCDELAY")) >= 0) { ++ value = Min(value, MAX_DELAY_MSECS); + #if NCURSES_EXT_FUNCS + NCURSES_SP_NAME(set_escdelay) (NCURSES_SP_ARGx value); + #else +Index: ncurses/curses.priv.h +Prereq: 1.688 +--- ncurses-6.5-20240504+/ncurses/curses.priv.h 2024-05-04 18:30:25.000000000 +0000 ++++ ncurses-6.5-20240511/ncurses/curses.priv.h 2024-05-11 19:05:45.000000000 +0000 +@@ -35,7 +35,7 @@ + ****************************************************************************/ + + /* +- * $Id: curses.priv.h,v 1.688 2024/05/04 18:30:25 tom Exp $ ++ * $Id: curses.priv.h,v 1.689 2024/05/11 19:05:45 tom Exp $ + * + * curses.priv.h + * +@@ -877,6 +877,12 @@ + #define MAX_DELAY_MSECS 30000 + + /* ++ * Limit screen dimensions read from environment variables. ++ */ ++#define MAX_ENV_LINES 512 ++#define MAX_ENV_COLUMNS 512 ++ ++/* + * When converting from terminfo to termcap, check for cases where we can trim + * octal escapes down to 2-character form. It is useful for terminfo format + * also, but not as important. +Index: ncurses/tinfo/lib_setup.c +Prereq: 1.240 +--- ncurses-6.5-20240504+/ncurses/tinfo/lib_setup.c 2024-04-20 17:04:05.000000000 +0000 ++++ ncurses-6.5-20240511/ncurses/tinfo/lib_setup.c 2024-05-11 19:07:34.000000000 +0000 +@@ -49,7 +49,7 @@ + #include + #endif + +-MODULE_ID("$Id: lib_setup.c,v 1.240 2024/04/20 17:04:05 tom Exp $") ++MODULE_ID("$Id: lib_setup.c,v 1.241 2024/05/11 19:07:34 tom Exp $") + + /**************************************************************************** + * +@@ -569,11 +569,11 @@ + * variable. + */ + if ((value = _nc_getenv_num("LINES")) > 0) { +- *linep = value; ++ *linep = Min(value, MAX_ENV_LINES); + T(("screen size: environment LINES = %d", *linep)); + } + if ((value = _nc_getenv_num("COLUMNS")) > 0) { +- *colp = value; ++ *colp = Min(value, MAX_ENV_COLUMNS); + T(("screen size: environment COLUMNS = %d", *colp)); + } + +Index: ncurses/tinfo/tinfo_driver.c +Prereq: 1.74 +--- ncurses-6.5-20240504+/ncurses/tinfo/tinfo_driver.c 2023-09-16 10:44:33.000000000 +0000 ++++ ncurses-6.5-20240511/ncurses/tinfo/tinfo_driver.c 2024-05-11 19:20:44.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2018-2022,2023 Thomas E. Dickey * ++ * Copyright 2018-2023,2024 Thomas E. Dickey * + * Copyright 2008-2016,2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -52,7 +52,7 @@ + # endif + #endif + +-MODULE_ID("$Id: tinfo_driver.c,v 1.74 2023/09/16 10:44:33 tom Exp $") ++MODULE_ID("$Id: tinfo_driver.c,v 1.75 2024/05/11 19:20:44 tom Exp $") + + /* + * SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS, +@@ -504,11 +504,11 @@ + * variable. + */ + if ((value = _nc_getenv_num("LINES")) > 0) { +- *linep = value; ++ *linep = Min(value, MAX_ENV_LINES); + T(("screen size: environment LINES = %d", *linep)); + } + if ((value = _nc_getenv_num("COLUMNS")) > 0) { +- *colp = value; ++ *colp = Min(value, MAX_ENV_COLUMNS); + T(("screen size: environment COLUMNS = %d", *colp)); + } + } +Index: package/debian-mingw/changelog +--- ncurses-6.5-20240504+/package/debian-mingw/changelog 2024-05-04 10:21:09.000000000 +0000 ++++ ncurses-6.5-20240511/package/debian-mingw/changelog 2024-05-11 10:20:08.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.5+20240504) unstable; urgency=low ++ncurses6 (6.5+20240511) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 04 May 2024 06:21:09 -0400 ++ -- Thomas E. Dickey Sat, 11 May 2024 06:20:08 -0400 + + ncurses6 (5.9+20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.5-20240504+/package/debian-mingw64/changelog 2024-05-04 10:21:09.000000000 +0000 ++++ ncurses-6.5-20240511/package/debian-mingw64/changelog 2024-05-11 10:20:08.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.5+20240504) unstable; urgency=low ++ncurses6 (6.5+20240511) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 04 May 2024 06:21:09 -0400 ++ -- Thomas E. Dickey Sat, 11 May 2024 06:20:08 -0400 + + ncurses6 (5.9+20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.5-20240504+/package/debian/changelog 2024-05-04 10:21:09.000000000 +0000 ++++ ncurses-6.5-20240511/package/debian/changelog 2024-05-11 10:20:08.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.5+20240504) unstable; urgency=low ++ncurses6 (6.5+20240511) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 04 May 2024 06:21:09 -0400 ++ -- Thomas E. Dickey Sat, 11 May 2024 06:20:08 -0400 + + ncurses6 (5.9+20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.646 +--- ncurses-6.5-20240504+/package/mingw-ncurses.nsi 2024-05-04 10:21:09.000000000 +0000 ++++ ncurses-6.5-20240511/package/mingw-ncurses.nsi 2024-05-11 10:20:08.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.646 2024/05/04 10:21:09 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.647 2024/05/11 10:20:08 tom Exp $ + + ; TODO add examples + ; TODO bump ABI to 6 +@@ -10,7 +10,7 @@ + !define VERSION_MAJOR "6" + !define VERSION_MINOR "5" + !define VERSION_YYYY "2024" +-!define VERSION_MMDD "0504" ++!define VERSION_MMDD "0511" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.5-20240504+/package/mingw-ncurses.spec 2024-05-04 10:21:09.000000000 +0000 ++++ ncurses-6.5-20240511/package/mingw-ncurses.spec 2024-05-11 10:20:08.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.5 +-Release: 20240504 ++Release: 20240511 + License: X11 + Group: Development/Libraries + URL: https://invisible-island.net/ncurses/ +Index: package/ncurses.spec +--- ncurses-6.5-20240504+/package/ncurses.spec 2024-05-04 10:21:09.000000000 +0000 ++++ ncurses-6.5-20240511/package/ncurses.spec 2024-05-11 10:20:08.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.5 +-Release: 20240504 ++Release: 20240511 + License: X11 + Group: Development/Libraries + URL: https://invisible-island.net/ncurses/ +Index: package/ncursest.spec +--- ncurses-6.5-20240504+/package/ncursest.spec 2024-05-04 10:21:09.000000000 +0000 ++++ ncurses-6.5-20240511/package/ncursest.spec 2024-05-11 10:20:08.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.5 +-Release: 20240504 ++Release: 20240511 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz diff --git a/packages/ncurses/6.5/ncurses-6.5-20240518.patch b/packages/ncurses/6.5/ncurses-6.5-20240518.patch new file mode 100644 index 0000000000..8a66561b5b --- /dev/null +++ b/packages/ncurses/6.5/ncurses-6.5-20240518.patch @@ -0,0 +1,33957 @@ +# ncurses 6.5 - patch 20240518 - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 6.5 is at +# https://invisible-island.net/archives/ncurses/ +# https://invisible-mirror.net/archives/ncurses/ +# https://ftp.gnu.org/gnu/ncurses/ +# +# Patches for ncurses 6.5 can be found at +# https://invisible-island.net/archives/ncurses/6.5 +# https://invisible-mirror.net/archives/ncurses/6.5 +# +# ------------------------------------------------------------------------------ +# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20240518.patch.gz +# patch by Thomas E. Dickey +# created Sat May 18 23:30:00 UTC 2024 +# ------------------------------------------------------------------------------ +# Ada95/aclocal.m4 | 83 +# Ada95/configure | 3556 ++++++++-------- +# Ada95/configure.in | 9 +# NEWS | 10 +# VERSION | 2 +# aclocal.m4 | 83 +# configure | 5662 +++++++++++++-------------- +# configure.in | 21 +# dist.mk | 4 +# doc/html/man/curs_beep.3x.html | 47 +# doc/html/man/curs_getch.3x.html | 18 +# doc/html/man/curs_in_wch.3x.html | 42 +# doc/html/man/curs_inch.3x.html | 77 +# doc/html/man/curs_mouse.3x.html | 10 +# doc/html/man/define_key.3x.html | 55 +# doc/html/man/key_defined.3x.html | 35 +# doc/html/man/keybound.3x.html | 45 +# doc/html/man/keyok.3x.html | 47 +# doc/html/man/ncurses.3x.html | 12 +# doc/html/man/terminfo.5.html | 2 +# include/ncurses_defs | 3 +# man/curs_beep.3x | 83 +# man/curs_getch.3x | 10 +# man/curs_in_wch.3x | 64 +# man/curs_inch.3x | 119 +# man/curs_mouse.3x | 6 +# man/define_key.3x | 108 +# man/key_defined.3x | 59 +# man/keybound.3x | 79 +# man/keyok.3x | 86 +# man/ncurses.3x | 6 +# package/debian-mingw/changelog | 4 +# package/debian-mingw64/changelog | 4 +# package/debian/changelog | 4 +# package/debian/ncurses6.lintian-overrides | 2 +# package/debian/ncursest6.lintian-overrides | 2 +# package/mingw-ncurses.nsi | 4 +# package/mingw-ncurses.spec | 2 +# package/ncurses.spec | 2 +# package/ncursest.spec | 2 +# test/aclocal.m4 | 27 +# test/configure | 1153 +++-- +# 42 files changed, 6294 insertions(+), 5355 deletions(-) +# ------------------------------------------------------------------------------ +Index: Ada95/aclocal.m4 +Prereq: 1.210 +--- ncurses-6.5-20240511+/Ada95/aclocal.m4 2024-03-30 22:17:13.000000000 +0000 ++++ ncurses-6.5-20240518/Ada95/aclocal.m4 2024-05-18 19:51:00.000000000 +0000 +@@ -29,7 +29,7 @@ + dnl + dnl Author: Thomas E. Dickey + dnl +-dnl $Id: aclocal.m4,v 1.210 2024/03/30 22:17:13 tom Exp $ ++dnl $Id: aclocal.m4,v 1.212 2024/05/18 19:51:00 tom Exp $ + dnl Macros used in NCURSES Ada95 auto-configuration script. + dnl + dnl These macros are maintained separately from NCURSES. The copyright on +@@ -477,7 +477,7 @@ + AC_SUBST(ARFLAGS) + ]) + dnl --------------------------------------------------------------------------- +-dnl CF_BUILD_CC version: 11 updated: 2022/12/04 15:40:08 ++dnl CF_BUILD_CC version: 12 updated: 2024/03/17 09:17:26 + dnl ----------- + dnl If we're cross-compiling, allow the user to override the tools and their + dnl options. The configure script is oriented toward identifying the host +@@ -577,9 +577,9 @@ + : ${BUILD_CC:='${CC}'} + : ${BUILD_CPP:='${CPP}'} + : ${BUILD_CFLAGS:='${CFLAGS}'} +- : ${BUILD_CPPFLAGS:='${CPPFLAGS}'} ++ : ${BUILD_CPPFLAGS:='ifelse([$1],,'${CPPFLAGS}',[$1])'} + : ${BUILD_LDFLAGS:='${LDFLAGS}'} +- : ${BUILD_LIBS:='${LIBS}'} ++ : ${BUILD_LIBS:='ifelse([$2],,'${LIBS}',[$2])'} + : ${BUILD_EXEEXT:='$x'} + : ${BUILD_OBJEXT:='o'} + fi +@@ -1395,19 +1395,36 @@ + AC_SUBST(EXTRA_CFLAGS) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_FUNC_GETTIME version: 2 updated: 2023/02/25 08:45:56 ++dnl CF_FUNC_GETTIME version: 3 updated: 2024/05/11 13:40:02 + dnl --------------- + dnl Check for gettimeofday or clock_gettime. In 2023, the former is still more + dnl widely supported, but "deprecated" (2008), so we will use the latter if it + dnl is available, to reduce compiler warnings. + AC_DEFUN([CF_FUNC_GETTIME],[ +-AC_CACHE_CHECK(for clock_gettime,cf_cv_func_clock_gettime,[ +- AC_TRY_LINK([#include ], ++cf_save_libs="$LIBS" ++AC_CHECK_FUNC(clock_gettime, ++ cf_cv_test_clock_gettime=yes, ++ AC_CHECK_LIB(rt, clock_gettime, ++ [LIBS="-lrt $LIBS" ++ cf_cv_test_clock_gettime=yes], ++ cf_cv_test_clock_gettime=no)) ++ ++if test "$cf_cv_test_clock_gettime" = yes ; then ++AC_CACHE_CHECK(if clock_gettime links,cf_cv_func_clock_gettime,[ ++ AC_TRY_LINK([ ++$ac_includes_default ++#include ++ ], + [struct timespec ts; +- int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts], ++ int rc = clock_gettime(CLOCK_REALTIME, &ts) ++ + clock_gettime(CLOCK_MONOTONIC, &ts); ++ (void) rc; (void)ts], + [cf_cv_func_clock_gettime=yes], + [cf_cv_func_clock_gettime=no]) + ]) ++else ++ cf_cv_func_clock_gettime=no ++fi + + if test "$cf_cv_func_clock_gettime" = yes + then +@@ -4747,6 +4764,56 @@ + ]) + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_WITH_ADA version: 1 updated: 2024/05/18 13:55:23 ++dnl ----------- ++dnl Check for the Ada compiler (unless requested to not do this), which causes ++dnl a further check for a C compiler which can work with the Ada compiler. ++AC_DEFUN([CF_WITH_ADA],[ ++AC_ARG_WITH(ada, ++ [ --without-ada suppress check for Ada compiler], ++ [cf_with_ada=$withval], ++ [cf_with_ada=yes]) ++ ++cf_prog_cc="gcc cc" ++if test "x$cf_with_ada" = xyes ++then ++ CF_PROG_GNAT ++ if test "x$cf_cv_prog_gnat_correct" = xyes; then ++ # gcc's developers chose to deprecate gnatgcc before making gprconfig ++ # work. They replaced gnatgcc in gcc 13 with a script which spits out ++ # a warning offering advice which could never work. ++ # ++ # Here is a workaround. ++ AC_PATH_PROG(cf_cv_path_gnatgcc,gnatgcc,no) ++ if test "$cf_cv_path_gnatgcc" != no ++ then ++ AC_MSG_CHECKING(for improvement) ++ cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null` ++ case "x$cf_file_gnatgcc" in ++ (*script*) ++ cf_cv_path_gnatgcc=`sh -x "$cf_cv_path_gnatgcc" --version 2>&1 | grep -w exec | sed -e 's/^[[ ]]*+[[ ]]*//' -e 's/exec[[ ]]//' -e 's/ .*//'` ++ ;; ++ (*) ++ cf_cv_path_gnatgcc=no ++ ;; ++ esac ++ AC_MSG_RESULT($cf_cv_path_gnatgcc) ++ test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc ++ cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc" ++ fi ++ fi ++fi ++case "$cf_prog_cc" in ++(*/*) ++ CC="$cf_prog_cc" ++ AC_SUBST(CC) ++ ;; ++(*) ++ CF_PROG_CC($cf_prog_cc) ++ ;; ++esac ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_WITH_ADA_COMPILER version: 3 updated: 2023/10/28 11:59:01 + dnl -------------------- + dnl Command-line option to specify the Ada95 compiler. +Index: Ada95/configure +--- ncurses-6.5-20240511+/Ada95/configure 2024-03-30 22:17:42.000000000 +0000 ++++ ncurses-6.5-20240518/Ada95/configure 2024-05-18 19:51:20.000000000 +0000 +@@ -1,5 +1,5 @@ + #! /bin/sh +-# From configure.in Revision: 1.91 . ++# From configure.in Revision: 1.92 . + # Guess values for system-dependent variables and create Makefiles. + # Generated by Autoconf 2.52.20231210. + # +@@ -703,6 +703,7 @@ + + General Options: + --with-system-type=XXX test: override derived host system-type ++ --without-ada suppress check for Ada compiler + --disable-stripping do not strip (debug info) installed executables + --with-strip-program=XX specify program to use when stripping in install + --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD +@@ -947,7 +948,7 @@ + fi + for ac_site_file in $CONFIG_SITE; do + if test -r "$ac_site_file"; then +- { echo "$as_me:950: loading site script $ac_site_file" >&5 ++ { echo "$as_me:951: loading site script $ac_site_file" >&5 + echo "$as_me: loading site script $ac_site_file" >&6;} + cat "$ac_site_file" >&5 + . "$ac_site_file" +@@ -958,7 +959,7 @@ + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then +- { echo "$as_me:961: loading cache $cache_file" >&5 ++ { echo "$as_me:962: loading cache $cache_file" >&5 + echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . $cache_file;; +@@ -966,7 +967,7 @@ + esac + fi + else +- { echo "$as_me:969: creating cache $cache_file" >&5 ++ { echo "$as_me:970: creating cache $cache_file" >&5 + echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file + fi +@@ -982,21 +983,21 @@ + eval ac_new_val="\$ac_env_${ac_var}_value" + case "$ac_old_set,$ac_new_set" in + set,) +- { echo "$as_me:985: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++ { echo "$as_me:986: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) +- { echo "$as_me:989: error: \`$ac_var' was not set in the previous run" >&5 ++ { echo "$as_me:990: error: \`$ac_var' was not set in the previous run" >&5 + echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then +- { echo "$as_me:995: error: \`$ac_var' has changed since the previous run:" >&5 ++ { echo "$as_me:996: error: \`$ac_var' has changed since the previous run:" >&5 + echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} +- { echo "$as_me:997: former value: $ac_old_val" >&5 ++ { echo "$as_me:998: former value: $ac_old_val" >&5 + echo "$as_me: former value: $ac_old_val" >&2;} +- { echo "$as_me:999: current value: $ac_new_val" >&5 ++ { echo "$as_me:1000: current value: $ac_new_val" >&5 + echo "$as_me: current value: $ac_new_val" >&2;} + ac_cache_corrupted=: + fi;; +@@ -1015,9 +1016,9 @@ + fi + done + if "$ac_cache_corrupted"; then +- { echo "$as_me:1018: error: changes in the environment can compromise the build" >&5 ++ { echo "$as_me:1019: error: changes in the environment can compromise the build" >&5 + echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- { { echo "$as_me:1020: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 ++ { { echo "$as_me:1021: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -1046,10 +1047,10 @@ + echo "#! $SHELL" >conftest.sh + echo "exit 0" >>conftest.sh + chmod +x conftest.sh +-if { (echo "$as_me:1049: PATH=\".;.\"; conftest.sh") >&5 ++if { (echo "$as_me:1050: PATH=\".;.\"; conftest.sh") >&5 + (PATH=".;."; conftest.sh) 2>&5 + ac_status=$? +- echo "$as_me:1052: \$? = $ac_status" >&5 ++ echo "$as_me:1053: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + ac_path_separator=';' + else +@@ -1081,7 +1082,7 @@ + fi + done + if test -z "$ac_aux_dir"; then +- { { echo "$as_me:1084: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 ++ { { echo "$as_me:1085: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} + { (exit 1); exit 1; }; } + fi +@@ -1091,11 +1092,11 @@ + + # Make sure we can run config.sub. + $ac_config_sub sun4 >/dev/null 2>&1 || +- { { echo "$as_me:1094: error: cannot run $ac_config_sub" >&5 ++ { { echo "$as_me:1095: error: cannot run $ac_config_sub" >&5 + echo "$as_me: error: cannot run $ac_config_sub" >&2;} + { (exit 1); exit 1; }; } + +-echo "$as_me:1098: checking build system type" >&5 ++echo "$as_me:1099: checking build system type" >&5 + echo $ECHO_N "checking build system type... $ECHO_C" >&6 + if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1104,23 +1105,23 @@ + test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` + test -z "$ac_cv_build_alias" && +- { { echo "$as_me:1107: error: cannot guess build type; you must specify one" >&5 ++ { { echo "$as_me:1108: error: cannot guess build type; you must specify one" >&5 + echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } + ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` || +- { { echo "$as_me:1111: error: $ac_config_sub $ac_cv_build_alias failed." >&5 ++ { { echo "$as_me:1112: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:1116: result: $ac_cv_build" >&5 ++echo "$as_me:1117: result: $ac_cv_build" >&5 + echo "${ECHO_T}$ac_cv_build" >&6 + build=$ac_cv_build + build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` + build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` + build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + +-echo "$as_me:1123: checking host system type" >&5 ++echo "$as_me:1124: checking host system type" >&5 + echo $ECHO_N "checking host system type... $ECHO_C" >&6 + if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1129,12 +1130,12 @@ + test -z "$ac_cv_host_alias" && + ac_cv_host_alias=$ac_cv_build_alias + ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` || +- { { echo "$as_me:1132: error: $ac_config_sub $ac_cv_host_alias failed" >&5 ++ { { echo "$as_me:1133: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:1137: result: $ac_cv_host" >&5 ++echo "$as_me:1138: result: $ac_cv_host" >&5 + echo "${ECHO_T}$ac_cv_host" >&6 + host=$ac_cv_host + host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +@@ -1142,7 +1143,7 @@ + host_os=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then +- echo "$as_me:1145: checking target system type" >&5 ++ echo "$as_me:1146: checking target system type" >&5 + echo $ECHO_N "checking target system type... $ECHO_C" >&6 + if test "${ac_cv_target+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1151,12 +1152,12 @@ + test "x$ac_cv_target_alias" = "x" && + ac_cv_target_alias=$ac_cv_host_alias + ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` || +- { { echo "$as_me:1154: error: $ac_config_sub $ac_cv_target_alias failed" >&5 ++ { { echo "$as_me:1155: error: $ac_config_sub $ac_cv_target_alias failed" >&5 + echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:1159: result: $ac_cv_target" >&5 ++echo "$as_me:1160: result: $ac_cv_target" >&5 + echo "${ECHO_T}$ac_cv_target" >&6 + target=$ac_cv_target + target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +@@ -1188,13 +1189,13 @@ + fi + + test -z "$system_name" && system_name="$cf_cv_system_name" +-test -n "$cf_cv_system_name" && echo "$as_me:1191: result: Configuring for $cf_cv_system_name" >&5 ++test -n "$cf_cv_system_name" && echo "$as_me:1192: result: Configuring for $cf_cv_system_name" >&5 + echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 + + if test ".$system_name" != ".$cf_cv_system_name" ; then +- echo "$as_me:1195: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 ++ echo "$as_me:1196: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 +- { { echo "$as_me:1197: error: \"Please remove config.cache and try again.\"" >&5 ++ { { echo "$as_me:1198: error: \"Please remove config.cache and try again.\"" >&5 + echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -1202,7 +1203,7 @@ + # Check whether --with-system-type or --without-system-type was given. + if test "${with_system_type+set}" = set; then + withval="$with_system_type" +- { echo "$as_me:1205: WARNING: overriding system type to $withval" >&5 ++ { echo "$as_me:1206: WARNING: overriding system type to $withval" >&5 + echo "$as_me: WARNING: overriding system type to $withval" >&2;} + cf_cv_system_name=$withval + host_os=$withval +@@ -1217,7 +1218,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:1220: checking for $ac_word" >&5 ++echo "$as_me:1221: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1232,7 +1233,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_GREP="$ac_prog" +-echo "$as_me:1235: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1236: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1240,10 +1241,10 @@ + fi + GREP=$ac_cv_prog_GREP + if test -n "$GREP"; then +- echo "$as_me:1243: result: $GREP" >&5 ++ echo "$as_me:1244: result: $GREP" >&5 + echo "${ECHO_T}$GREP" >&6 + else +- echo "$as_me:1246: result: no" >&5 ++ echo "$as_me:1247: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1251,7 +1252,7 @@ + done + test -n "$GREP" || GREP=": " + +-echo "$as_me:1254: checking for fgrep" >&5 ++echo "$as_me:1255: checking for fgrep" >&5 + echo $ECHO_N "checking for fgrep... $ECHO_C" >&6 + if test "${ac_cv_path_FGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1263,7 +1264,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:1266: checking for $ac_word" >&5 ++echo "$as_me:1267: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_FGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1280,7 +1281,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_FGREP="$ac_dir/$ac_word" +- echo "$as_me:1283: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:1284: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -1291,10 +1292,10 @@ + FGREP=$ac_cv_path_FGREP + + if test -n "$FGREP"; then +- echo "$as_me:1294: result: $FGREP" >&5 ++ echo "$as_me:1295: result: $FGREP" >&5 + echo "${ECHO_T}$FGREP" >&6 + else +- echo "$as_me:1297: result: no" >&5 ++ echo "$as_me:1298: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1302,16 +1303,16 @@ + done + test -n "$FGREP" || FGREP=": " + +- test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1305: error: cannot find workable fgrep" >&5 ++ test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1306: error: cannot find workable fgrep" >&5 + echo "$as_me: error: cannot find workable fgrep" >&2;} + { (exit 1); exit 1; }; } + fi + fi +-echo "$as_me:1310: result: $ac_cv_path_FGREP" >&5 ++echo "$as_me:1311: result: $ac_cv_path_FGREP" >&5 + echo "${ECHO_T}$ac_cv_path_FGREP" >&6 + FGREP="$ac_cv_path_FGREP" + +-echo "$as_me:1314: checking for prefix" >&5 ++echo "$as_me:1315: checking for prefix" >&5 + echo $ECHO_N "checking for prefix... $ECHO_C" >&6 + if test "x$prefix" = "xNONE" ; then + case "$cf_cv_system_name" in +@@ -1323,11 +1324,11 @@ + ;; + esac + fi +-echo "$as_me:1326: result: $prefix" >&5 ++echo "$as_me:1327: result: $prefix" >&5 + echo "${ECHO_T}$prefix" >&6 + + if test "x$prefix" = "xNONE" ; then +-echo "$as_me:1330: checking for default include-directory" >&5 ++echo "$as_me:1331: checking for default include-directory" >&5 + echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6 + test -n "$verbose" && echo 1>&6 + for cf_symbol in \ +@@ -1350,12 +1351,322 @@ + fi + test -n "$verbose" && echo " tested $cf_dir" 1>&6 + done +-echo "$as_me:1353: result: $includedir" >&5 ++echo "$as_me:1354: result: $includedir" >&5 + echo "${ECHO_T}$includedir" >&6 + fi + + ### Checks for programs. + ++# Check whether --with-ada or --without-ada was given. ++if test "${with_ada+set}" = set; then ++ withval="$with_ada" ++ cf_with_ada=$withval ++else ++ cf_with_ada=yes ++fi; ++ ++cf_prog_cc="gcc cc" ++if test "x$cf_with_ada" = xyes ++then ++ ++for cf_prog_gnat in gnat gnatmake gprconfig gprbuild ++do ++ ++cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` ++ ++ unset ac_cv_path_cf_TEMP_gnat ++ 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:1381: 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 ++else ++ case $cf_TEMP_gnat in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_cf_TEMP_gnat="$cf_TEMP_gnat" # Let the user override the test with a path. ++ ;; ++ *) ++ ac_save_IFS=$IFS; IFS=$ac_path_separator ++ac_dummy="$PATH" ++for ac_dir in $ac_dummy; do ++ IFS=$ac_save_IFS ++ test -z "$ac_dir" && ac_dir=. ++ if $as_executable_p "$ac_dir/$ac_word"; then ++ ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" ++ echo "$as_me:1398: found $ac_dir/$ac_word" >&5 ++ break ++fi ++done ++ ++ test -z "$ac_cv_path_cf_TEMP_gnat" && ac_cv_path_cf_TEMP_gnat="no" ++ ;; ++esac ++fi ++cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat ++ ++if test -n "$cf_TEMP_gnat"; then ++ echo "$as_me:1410: result: $cf_TEMP_gnat" >&5 ++echo "${ECHO_T}$cf_TEMP_gnat" >&6 ++else ++ echo "$as_me:1413: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++ ++ eval "cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat" ++ ++ if test "x$cf_TEMP_gnat" != xno; then ++ unset cf_cv_gnat_version ++ unset cf_TEMP_gnat ++ ++echo "$as_me:1423: 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 ++else ++ ++cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \ ++ grep '[0-9].[0-9][0-9]*' |\ ++ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` ++ ++fi ++echo "$as_me:1434: 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 ++ ++ fi ++ eval "cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat" ++ ++ unset cf_TEMP_gnat ++ unset cf_cv_gnat_version ++ unset ac_cv_path_cf_TEMP_gnat ++done ++ ++if test "x$cf_cv_VERSION_GNATMAKE" = "xno"; then ++ cf_ada_make= ++ cf_cv_prog_gnat_correct=no ++else ++ cf_ada_make=gnatmake ++ if test "x$cf_cv_VERSION_GPRCONFIG" = "xno"; then ++ # gprconfig is newer than gnatmake; we can continue... ++ cf_ada_config="##" ++ else ++ rm -rf ./conftest* ./*~conftest* ++ if mkdir conftest.src ++ then ++ cf_ada_config="" ++ cd conftest.src ++ for cf_gprconfig in Ada C ++ do ++ echo "$as_me:1463: 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 ++ for cf_gprconfig_param in \ ++ "$cf_gprconfig,,,,GNATGCC" \ ++ "$cf_gprconfig,,,,GCC" \ ++ "$cf_gprconfig" ++ do ++ cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` ++ test -n "$cf_gprconfig_value" && break ++ done ++ else ++ cf_gprconfig_param=$cf_gprconfig ++ cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` ++ fi ++ if test -n "$cf_gprconfig_value" ++ then ++ eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" ++ echo "$as_me:1482: result: $cf_gprconfig_value" >&5 ++echo "${ECHO_T}$cf_gprconfig_value" >&6 ++ else ++ echo "$as_me:1485: result: missing" >&5 ++echo "${ECHO_T}missing" >&6 ++ cf_ada_config="#" ++ break ++ fi ++ done ++ cd .. ++ rm -rf ./conftest* ./*~conftest* ++ fi ++ fi ++ if test "x$cf_ada_config" != "x#" ++ then ++ ++echo "$as_me:1498: 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 ++else ++ ++cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \ ++ grep '[0-9].[0-9][0-9]*' |\ ++ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` ++ ++fi ++echo "$as_me:1509: 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 ++ ++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]) ++ cf_cv_prog_gnat_correct=yes ++ ;; ++(*) ++ { echo "$as_me:1518: 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 ++ ;; ++esac ++ ++ # Extract the first word of "m4", so it can be a program name with args. ++set dummy m4; ac_word=$2 ++echo "$as_me:1526: 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 ++else ++ if test -n "$M4_exists"; then ++ ac_cv_prog_M4_exists="$M4_exists" # Let the user override the test. ++else ++ ac_save_IFS=$IFS; IFS=$ac_path_separator ++ac_dummy="$PATH" ++for ac_dir in $ac_dummy; do ++ IFS=$ac_save_IFS ++ test -z "$ac_dir" && ac_dir=. ++ $as_executable_p "$ac_dir/$ac_word" || continue ++ac_cv_prog_M4_exists="yes" ++echo "$as_me:1541: found $ac_dir/$ac_word" >&5 ++break ++done ++ ++ test -z "$ac_cv_prog_M4_exists" && ac_cv_prog_M4_exists="no" ++fi ++fi ++M4_exists=$ac_cv_prog_M4_exists ++if test -n "$M4_exists"; then ++ echo "$as_me:1550: result: $M4_exists" >&5 ++echo "${ECHO_T}$M4_exists" >&6 ++else ++ echo "$as_me:1553: 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:1559: 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:1563: checking if GNAT works" >&5 ++echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 ++ ++rm -rf ./conftest* ./*~conftest* ++cat >>conftest.ads <>conftest.adb <&5 2>&1 ) ; then ++ if ( ./conftest 1>&5 2>&1 ) ; then ++ cf_cv_prog_gnat_correct=yes ++ else ++ cf_cv_prog_gnat_correct=no ++ fi ++else ++ cf_cv_prog_gnat_correct=no ++fi ++rm -rf ./conftest* ./*~conftest* ++ ++ echo "$as_me:1591: result: $cf_cv_prog_gnat_correct" >&5 ++echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 ++ fi ++ else ++ cf_cv_prog_gnat_correct=no ++ fi ++fi ++ ++ if test "x$cf_cv_prog_gnat_correct" = xyes; then ++ # gcc's developers chose to deprecate gnatgcc before making gprconfig ++ # work. They replaced gnatgcc in gcc 13 with a script which spits out ++ # a warning offering advice which could never work. ++ # ++ # Here is a workaround. ++ # Extract the first word of "gnatgcc", so it can be a program name with args. ++set dummy gnatgcc; ac_word=$2 ++echo "$as_me:1607: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_path_cf_cv_path_gnatgcc+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $cf_cv_path_gnatgcc in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_cf_cv_path_gnatgcc="$cf_cv_path_gnatgcc" # Let the user override the test with a path. ++ ;; ++ *) ++ ac_save_IFS=$IFS; IFS=$ac_path_separator ++ac_dummy="$PATH" ++for ac_dir in $ac_dummy; do ++ IFS=$ac_save_IFS ++ test -z "$ac_dir" && ac_dir=. ++ if $as_executable_p "$ac_dir/$ac_word"; then ++ ac_cv_path_cf_cv_path_gnatgcc="$ac_dir/$ac_word" ++ echo "$as_me:1624: found $ac_dir/$ac_word" >&5 ++ break ++fi ++done ++ ++ test -z "$ac_cv_path_cf_cv_path_gnatgcc" && ac_cv_path_cf_cv_path_gnatgcc="no" ++ ;; ++esac ++fi ++cf_cv_path_gnatgcc=$ac_cv_path_cf_cv_path_gnatgcc ++ ++if test -n "$cf_cv_path_gnatgcc"; then ++ echo "$as_me:1636: result: $cf_cv_path_gnatgcc" >&5 ++echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6 ++else ++ echo "$as_me:1639: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++ ++ if test "$cf_cv_path_gnatgcc" != no ++ then ++ echo "$as_me:1645: checking for improvement" >&5 ++echo $ECHO_N "checking for improvement... $ECHO_C" >&6 ++ cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null` ++ case "x$cf_file_gnatgcc" in ++ (*script*) ++ cf_cv_path_gnatgcc=`sh -x "$cf_cv_path_gnatgcc" --version 2>&1 | grep -w exec | sed -e 's/^[ ]*+[ ]*//' -e 's/exec[ ]//' -e 's/ .*//'` ++ ;; ++ (*) ++ cf_cv_path_gnatgcc=no ++ ;; ++ esac ++ echo "$as_me:1656: result: $cf_cv_path_gnatgcc" >&5 ++echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6 ++ test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc ++ cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc" ++ fi ++ fi ++fi ++case "$cf_prog_cc" in ++(*/*) ++ CC="$cf_prog_cc" ++ ++ ;; ++(*) ++ + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +@@ -1363,11 +1674,11 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return="return" + if test -n "$ac_tool_prefix"; then +- for ac_prog in gnatgcc gcc cc ++ for ac_prog in $cf_prog_cc + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:1370: checking for $ac_word" >&5 ++echo "$as_me:1681: 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 +@@ -1382,7 +1693,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:1385: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1696: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1390,10 +1701,10 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:1393: result: $CC" >&5 ++ echo "$as_me:1704: result: $CC" >&5 + echo "${ECHO_T}$CC" >&6 + else +- echo "$as_me:1396: result: no" >&5 ++ echo "$as_me:1707: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1402,11 +1713,11 @@ + fi + if test -z "$CC"; then + ac_ct_CC=$CC +- for ac_prog in gnatgcc gcc cc ++ for ac_prog in $cf_prog_cc + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:1409: checking for $ac_word" >&5 ++echo "$as_me:1720: 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 +@@ -1421,7 +1732,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:1424: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1735: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1429,10 +1740,10 @@ + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- echo "$as_me:1432: result: $ac_ct_CC" >&5 ++ echo "$as_me:1743: result: $ac_ct_CC" >&5 + echo "${ECHO_T}$ac_ct_CC" >&6 + else +- echo "$as_me:1435: result: no" >&5 ++ echo "$as_me:1746: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1442,32 +1753,32 @@ + CC=$ac_ct_CC + fi + +-test -z "$CC" && { { echo "$as_me:1445: error: no acceptable cc found in \$PATH" >&5 ++test -z "$CC" && { { echo "$as_me:1756: 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:1450:" \ ++echo "$as_me:1761:" \ + "checking for C compiler version" >&5 + ac_compiler=`set X $ac_compile; echo "$2"` +-{ (eval echo "$as_me:1453: \"$ac_compiler --version &5\"") >&5 ++{ (eval echo "$as_me:1764: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 + ac_status=$? +- echo "$as_me:1456: \$? = $ac_status" >&5 ++ echo "$as_me:1767: \$? = $ac_status" >&5 + (exit "$ac_status"); } +-{ (eval echo "$as_me:1458: \"$ac_compiler -v &5\"") >&5 ++{ (eval echo "$as_me:1769: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 + ac_status=$? +- echo "$as_me:1461: \$? = $ac_status" >&5 ++ echo "$as_me:1772: \$? = $ac_status" >&5 + (exit "$ac_status"); } +-{ (eval echo "$as_me:1463: \"$ac_compiler -V &5\"") >&5 ++{ (eval echo "$as_me:1774: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 + ac_status=$? +- echo "$as_me:1466: \$? = $ac_status" >&5 ++ echo "$as_me:1777: \$? = $ac_status" >&5 + (exit "$ac_status"); } + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 1470 "configure" ++#line 1781 "configure" + #include "confdefs.h" + + int +@@ -1483,13 +1794,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:1486: checking for C compiler default output" >&5 ++echo "$as_me:1797: 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:1489: \"$ac_link_default\"") >&5 ++if { (eval echo "$as_me:1800: \"$ac_link_default\"") >&5 + (eval $ac_link_default) 2>&5 + ac_status=$? +- echo "$as_me:1492: \$? = $ac_status" >&5 ++ echo "$as_me:1803: \$? = $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 +@@ -1512,34 +1823,34 @@ + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-{ { echo "$as_me:1515: error: C compiler cannot create executables" >&5 ++{ { echo "$as_me:1826: 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:1521: result: $ac_file" >&5 ++echo "$as_me:1832: 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:1526: checking whether the C compiler works" >&5 ++echo "$as_me:1837: 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:1532: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1843: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1535: \$? = $ac_status" >&5 ++ echo "$as_me:1846: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else +- { { echo "$as_me:1542: error: cannot run C compiled programs. ++ { { echo "$as_me:1853: 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;} +@@ -1547,24 +1858,24 @@ + fi + fi + fi +-echo "$as_me:1550: result: yes" >&5 ++echo "$as_me:1861: 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:1557: checking whether we are cross compiling" >&5 ++echo "$as_me:1868: checking whether we are cross compiling" >&5 + echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +-echo "$as_me:1559: result: $cross_compiling" >&5 ++echo "$as_me:1870: result: $cross_compiling" >&5 + echo "${ECHO_T}$cross_compiling" >&6 + +-echo "$as_me:1562: checking for executable suffix" >&5 ++echo "$as_me:1873: checking for executable suffix" >&5 + echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 +-if { (eval echo "$as_me:1564: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:1875: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:1567: \$? = $ac_status" >&5 ++ echo "$as_me:1878: \$? = $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 +@@ -1580,25 +1891,25 @@ + esac + done + else +- { { echo "$as_me:1583: error: cannot compute EXEEXT: cannot compile and link" >&5 ++ { { echo "$as_me:1894: 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:1589: result: $ac_cv_exeext" >&5 ++echo "$as_me:1900: 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:1595: checking for object suffix" >&5 ++echo "$as_me:1906: 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 1601 "configure" ++#line 1912 "configure" + #include "confdefs.h" + + int +@@ -1610,10 +1921,10 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (eval echo "$as_me:1613: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1924: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1616: \$? = $ac_status" >&5 ++ echo "$as_me:1927: \$? = $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 +@@ -1625,24 +1936,24 @@ + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-{ { echo "$as_me:1628: error: cannot compute OBJEXT: cannot compile" >&5 ++{ { echo "$as_me:1939: 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:1635: result: $ac_cv_objext" >&5 ++echo "$as_me:1946: result: $ac_cv_objext" >&5 + echo "${ECHO_T}$ac_cv_objext" >&6 + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-echo "$as_me:1639: checking whether we are using the GNU C compiler" >&5 ++echo "$as_me:1950: 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 1645 "configure" ++#line 1956 "configure" + #include "confdefs.h" + + int +@@ -1657,16 +1968,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:1660: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1971: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1663: \$? = $ac_status" >&5 ++ echo "$as_me:1974: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:1666: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1977: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1669: \$? = $ac_status" >&5 ++ echo "$as_me:1980: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_compiler_gnu=yes + else +@@ -1678,19 +1989,19 @@ + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-echo "$as_me:1681: result: $ac_cv_c_compiler_gnu" >&5 ++echo "$as_me:1992: 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:1687: checking whether $CC accepts -g" >&5 ++echo "$as_me:1998: 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 1693 "configure" ++#line 2004 "configure" + #include "confdefs.h" + + int +@@ -1702,16 +2013,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:1705: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2016: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1708: \$? = $ac_status" >&5 ++ echo "$as_me:2019: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:1711: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2022: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1714: \$? = $ac_status" >&5 ++ echo "$as_me:2025: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_prog_cc_g=yes + else +@@ -1721,7 +2032,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:1724: result: $ac_cv_prog_cc_g" >&5 ++echo "$as_me:2035: 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 +@@ -1748,16 +2059,16 @@ + #endif + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:1751: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2062: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1754: \$? = $ac_status" >&5 ++ echo "$as_me:2065: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:1757: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2068: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1760: \$? = $ac_status" >&5 ++ echo "$as_me:2071: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + for ac_declaration in \ + ''\ +@@ -1769,7 +2080,7 @@ + 'void exit (int);' + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 1772 "configure" ++#line 2083 "configure" + #include "confdefs.h" + #include + $ac_declaration +@@ -1782,16 +2093,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:1785: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2096: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1788: \$? = $ac_status" >&5 ++ echo "$as_me:2099: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:1791: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2102: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1794: \$? = $ac_status" >&5 ++ echo "$as_me:2105: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -1801,7 +2112,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 1804 "configure" ++#line 2115 "configure" + #include "confdefs.h" + $ac_declaration + int +@@ -1813,16 +2124,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:1816: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2127: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1819: \$? = $ac_status" >&5 ++ echo "$as_me:2130: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:1822: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2133: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1825: \$? = $ac_status" >&5 ++ echo "$as_me:2136: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -1852,11 +2163,11 @@ + + GCC_VERSION=none + if test "$GCC" = yes ; then +- echo "$as_me:1855: checking version of $CC" >&5 ++ echo "$as_me:2166: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + test -z "$GCC_VERSION" && GCC_VERSION=unknown +- echo "$as_me:1859: result: $GCC_VERSION" >&5 ++ echo "$as_me:2170: result: $GCC_VERSION" >&5 + echo "${ECHO_T}$GCC_VERSION" >&6 + fi + +@@ -1865,12 +2176,12 @@ + if test "$GCC" = yes ; then + case "$host_os" in + (linux*|gnu*) +- echo "$as_me:1868: checking if this is really Intel C compiler" >&5 ++ echo "$as_me:2179: 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 1873 "configure" ++#line 2184 "configure" + #include "confdefs.h" + + int +@@ -1887,16 +2198,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:1890: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2201: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1893: \$? = $ac_status" >&5 ++ echo "$as_me:2204: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:1896: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2207: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1899: \$? = $ac_status" >&5 ++ echo "$as_me:2210: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + INTEL_COMPILER=yes + cf_save_CFLAGS="$cf_save_CFLAGS -we147" +@@ -1907,7 +2218,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CFLAGS="$cf_save_CFLAGS" +- echo "$as_me:1910: result: $INTEL_COMPILER" >&5 ++ echo "$as_me:2221: result: $INTEL_COMPILER" >&5 + echo "${ECHO_T}$INTEL_COMPILER" >&6 + ;; + esac +@@ -1916,11 +2227,11 @@ + CLANG_COMPILER=no + + if test "$GCC" = yes ; then +- echo "$as_me:1919: checking if this is really Clang C compiler" >&5 ++ echo "$as_me:2230: 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 1923 "configure" ++#line 2234 "configure" + #include "confdefs.h" + + int +@@ -1937,16 +2248,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:1940: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2251: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1943: \$? = $ac_status" >&5 ++ echo "$as_me:2254: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:1946: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2257: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1949: \$? = $ac_status" >&5 ++ echo "$as_me:2260: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + CLANG_COMPILER=yes + +@@ -1956,7 +2267,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CFLAGS="$cf_save_CFLAGS" +- echo "$as_me:1959: result: $CLANG_COMPILER" >&5 ++ echo "$as_me:2270: result: $CLANG_COMPILER" >&5 + echo "${ECHO_T}$CLANG_COMPILER" >&6 + fi + +@@ -1965,30 +2276,30 @@ + if test "x$CLANG_COMPILER" = "xyes" ; then + case "$CC" in + (c[1-9][0-9]|*/c[1-9][0-9]) +- { echo "$as_me:1968: WARNING: replacing broken compiler alias $CC" >&5 ++ { echo "$as_me:2279: 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:1975: checking version of $CC" >&5 ++ echo "$as_me:2286: 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:1979: result: $CLANG_VERSION" >&5 ++ echo "$as_me:2290: 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:1986: checking if option $cf_clang_opt works" >&5 ++ echo "$as_me:2297: 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 1991 "configure" ++#line 2302 "configure" + #include "confdefs.h" + + #include +@@ -2002,16 +2313,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:2005: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:2316: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:2008: \$? = $ac_status" >&5 ++ echo "$as_me:2319: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:2011: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2322: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2014: \$? = $ac_status" >&5 ++ echo "$as_me:2325: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_clang_optok=yes +@@ -2022,13 +2333,13 @@ + cf_clang_optok=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:2025: result: $cf_clang_optok" >&5 ++ echo "$as_me:2336: 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}:2031: testing adding option $cf_clang_opt ..." 1>&5 ++echo "${as_me:-configure}:2342: testing adding option $cf_clang_opt ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_clang_opt" +@@ -2037,7 +2348,7 @@ + done + fi + +-echo "$as_me:2040: checking for $CC option to accept ANSI C" >&5 ++echo "$as_me:2351: 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 +@@ -2045,7 +2356,7 @@ + ac_cv_prog_cc_stdc=no + ac_save_CC=$CC + cat >"conftest.$ac_ext" <<_ACEOF +-#line 2048 "configure" ++#line 2359 "configure" + #include "confdefs.h" + #include + #include +@@ -2092,16 +2403,16 @@ + do + CC="$ac_save_CC $ac_arg" + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:2095: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2406: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2098: \$? = $ac_status" >&5 ++ echo "$as_me:2409: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:2101: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2412: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2104: \$? = $ac_status" >&5 ++ echo "$as_me:2415: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_prog_cc_stdc=$ac_arg + break +@@ -2118,10 +2429,10 @@ + + case "x$ac_cv_prog_cc_stdc" in + x|xno) +- echo "$as_me:2121: result: none needed" >&5 ++ echo "$as_me:2432: result: none needed" >&5 + echo "${ECHO_T}none needed" >&6 ;; + *) +- echo "$as_me:2124: result: $ac_cv_prog_cc_stdc" >&5 ++ echo "$as_me:2435: result: $ac_cv_prog_cc_stdc" >&5 + echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; + esac +@@ -2129,13 +2440,13 @@ + # This should have been defined by AC_PROG_CC + : "${CC:=cc}" + +-echo "$as_me:2132: checking \$CFLAGS variable" >&5 ++echo "$as_me:2443: checking \$CFLAGS variable" >&5 + echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 + case "x$CFLAGS" in + (*-[IUD]*) +- echo "$as_me:2136: result: broken" >&5 ++ echo "$as_me:2447: result: broken" >&5 + echo "${ECHO_T}broken" >&6 +- { echo "$as_me:2138: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 ++ { echo "$as_me:2449: 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= +@@ -2243,18 +2554,18 @@ + done + ;; + (*) +- echo "$as_me:2246: result: ok" >&5 ++ echo "$as_me:2557: result: ok" >&5 + echo "${ECHO_T}ok" >&6 + ;; + esac + +-echo "$as_me:2251: checking \$CC variable" >&5 ++echo "$as_me:2562: checking \$CC variable" >&5 + echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 + case "$CC" in + (*[\ \ ]-*) +- echo "$as_me:2255: result: broken" >&5 ++ echo "$as_me:2566: result: broken" >&5 + echo "${ECHO_T}broken" >&6 +- { echo "$as_me:2257: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 ++ { echo "$as_me:2568: 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/[ ]*[ ]-[^ ].*//'` +@@ -2371,24 +2682,27 @@ + done + test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 + +-echo "${as_me:-configure}:2374: testing resulting CC: '$CC' ..." 1>&5 ++echo "${as_me:-configure}:2685: testing resulting CC: '$CC' ..." 1>&5 + + test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 + +-echo "${as_me:-configure}:2378: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 ++echo "${as_me:-configure}:2689: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 + + test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 + +-echo "${as_me:-configure}:2382: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 ++echo "${as_me:-configure}:2693: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 + + ;; + (*) +- echo "$as_me:2386: result: ok" >&5 ++ echo "$as_me:2697: result: ok" >&5 + echo "${ECHO_T}ok" >&6 + ;; + esac + +-echo "$as_me:2391: checking for egrep" >&5 ++ ;; ++esac ++ ++echo "$as_me:2705: checking for egrep" >&5 + echo $ECHO_N "checking for egrep... $ECHO_C" >&6 + if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2400,7 +2714,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:2403: checking for $ac_word" >&5 ++echo "$as_me:2717: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2417,7 +2731,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_EGREP="$ac_dir/$ac_word" +- echo "$as_me:2420: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:2734: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -2428,10 +2742,10 @@ + EGREP=$ac_cv_path_EGREP + + if test -n "$EGREP"; then +- echo "$as_me:2431: result: $EGREP" >&5 ++ echo "$as_me:2745: result: $EGREP" >&5 + echo "${ECHO_T}$EGREP" >&6 + else +- echo "$as_me:2434: result: no" >&5 ++ echo "$as_me:2748: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2439,12 +2753,12 @@ + done + test -n "$EGREP" || EGREP=": " + +- test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2442: error: cannot find workable egrep" >&5 ++ test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2756: error: cannot find workable egrep" >&5 + echo "$as_me: error: cannot find workable egrep" >&2;} + { (exit 1); exit 1; }; } + fi + fi +-echo "$as_me:2447: result: $ac_cv_path_EGREP" >&5 ++echo "$as_me:2761: result: $ac_cv_path_EGREP" >&5 + echo "${ECHO_T}$ac_cv_path_EGREP" >&6 + EGREP="$ac_cv_path_EGREP" + +@@ -2454,7 +2768,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:2457: checking how to run the C preprocessor" >&5 ++echo "$as_me:2771: 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 +@@ -2475,18 +2789,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 2478 "configure" ++#line 2792 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:2483: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:2797: \"$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:2489: \$? = $ac_status" >&5 ++ echo "$as_me:2803: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2509,17 +2823,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 2512 "configure" ++#line 2826 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:2516: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:2830: \"$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:2522: \$? = $ac_status" >&5 ++ echo "$as_me:2836: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2556,7 +2870,7 @@ + else + ac_cv_prog_CPP=$CPP + fi +-echo "$as_me:2559: result: $CPP" >&5 ++echo "$as_me:2873: result: $CPP" >&5 + echo "${ECHO_T}$CPP" >&6 + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes +@@ -2566,18 +2880,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 2569 "configure" ++#line 2883 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:2574: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:2888: \"$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:2580: \$? = $ac_status" >&5 ++ echo "$as_me:2894: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2600,17 +2914,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 2603 "configure" ++#line 2917 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:2607: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:2921: \"$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:2613: \$? = $ac_status" >&5 ++ echo "$as_me:2927: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2638,7 +2952,7 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:2641: error: C preprocessor \"$CPP\" fails sanity check" >&5 ++ { { echo "$as_me:2955: error: C preprocessor \"$CPP\" fails sanity check" >&5 + echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -2651,14 +2965,14 @@ + ac_main_return="return" + + if test $ac_cv_c_compiler_gnu = yes; then +- echo "$as_me:2654: checking whether $CC needs -traditional" >&5 ++ echo "$as_me:2968: 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 2661 "configure" ++#line 2975 "configure" + #include "confdefs.h" + #include + int Autoconf = TIOCGETP; +@@ -2673,7 +2987,7 @@ + + if test $ac_cv_prog_gcc_traditional = no; then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 2676 "configure" ++#line 2990 "configure" + #include "confdefs.h" + #include + int Autoconf = TCGETA; +@@ -2686,14 +3000,14 @@ + + fi + fi +-echo "$as_me:2689: result: $ac_cv_prog_gcc_traditional" >&5 ++echo "$as_me:3003: 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:2696: checking whether $CC understands -c and -o together" >&5 ++echo "$as_me:3010: 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 +@@ -2708,15 +3022,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:2711: \"$ac_try\"") >&5 ++if { (eval echo "$as_me:3025: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2714: \$? = $ac_status" >&5 ++ echo "$as_me:3028: \$? = $ac_status" >&5 + (exit "$ac_status"); } && +- test -f conftest2.$ac_objext && { (eval echo "$as_me:2716: \"$ac_try\"") >&5 ++ test -f conftest2.$ac_objext && { (eval echo "$as_me:3030: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2719: \$? = $ac_status" >&5 ++ echo "$as_me:3033: \$? = $ac_status" >&5 + (exit "$ac_status"); }; + then + eval cf_cv_prog_CC_c_o=yes +@@ -2727,10 +3041,10 @@ + + fi + if test "$cf_cv_prog_CC_c_o" = yes; then +- echo "$as_me:2730: result: yes" >&5 ++ echo "$as_me:3044: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:2733: result: no" >&5 ++ echo "$as_me:3047: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2751,7 +3065,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:2754: checking for $ac_word" >&5 ++echo "$as_me:3068: 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 +@@ -2766,7 +3080,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AWK="$ac_prog" +-echo "$as_me:2769: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3083: found $ac_dir/$ac_word" >&5 + break + done + +@@ -2774,21 +3088,21 @@ + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- echo "$as_me:2777: result: $AWK" >&5 ++ echo "$as_me:3091: result: $AWK" >&5 + echo "${ECHO_T}$AWK" >&6 + else +- echo "$as_me:2780: result: no" >&5 ++ echo "$as_me:3094: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + test -n "$AWK" && break + done + +-test -z "$AWK" && { { echo "$as_me:2787: error: No awk program found" >&5 ++test -z "$AWK" && { { echo "$as_me:3101: error: No awk program found" >&5 + echo "$as_me: error: No awk program found" >&2;} + { (exit 1); exit 1; }; } + +-echo "$as_me:2791: checking for egrep" >&5 ++echo "$as_me:3105: checking for egrep" >&5 + echo $ECHO_N "checking for egrep... $ECHO_C" >&6 + if test "${ac_cv_prog_egrep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2798,11 +3112,11 @@ + else ac_cv_prog_egrep='egrep' + fi + fi +-echo "$as_me:2801: result: $ac_cv_prog_egrep" >&5 ++echo "$as_me:3115: result: $ac_cv_prog_egrep" >&5 + echo "${ECHO_T}$ac_cv_prog_egrep" >&6 + EGREP=$ac_cv_prog_egrep + +- test -z "$EGREP" && { { echo "$as_me:2805: error: No egrep program found" >&5 ++ test -z "$EGREP" && { { echo "$as_me:3119: error: No egrep program found" >&5 + echo "$as_me: error: No egrep program found" >&2;} + { (exit 1); exit 1; }; } + +@@ -2818,7 +3132,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:2821: checking for a BSD compatible install" >&5 ++echo "$as_me:3135: 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 +@@ -2867,7 +3181,7 @@ + INSTALL=$ac_install_sh + fi + fi +-echo "$as_me:2870: result: $INSTALL" >&5 ++echo "$as_me:3184: result: $INSTALL" >&5 + echo "${ECHO_T}$INSTALL" >&6 + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. +@@ -2878,18 +3192,18 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-echo "$as_me:2881: checking whether ln -s works" >&5 ++echo "$as_me:3195: 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:2885: result: yes" >&5 ++ echo "$as_me:3199: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:2888: result: no, using $LN_S" >&5 ++ echo "$as_me:3202: result: no, using $LN_S" >&5 + echo "${ECHO_T}no, using $LN_S" >&6 + fi + +-echo "$as_me:2892: checking if $LN_S -f options work" >&5 ++echo "$as_me:3206: 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 +@@ -2901,7 +3215,7 @@ + cf_prog_ln_sf=no + fi + rm -f conf$$.dst conf$$src +-echo "$as_me:2904: result: $cf_prog_ln_sf" >&5 ++echo "$as_me:3218: 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" +@@ -2918,7 +3232,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:2921: checking for a BSD compatible install" >&5 ++echo "$as_me:3235: 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 +@@ -2967,7 +3281,7 @@ + INSTALL=$ac_install_sh + fi + fi +-echo "$as_me:2970: result: $INSTALL" >&5 ++echo "$as_me:3284: result: $INSTALL" >&5 + echo "${ECHO_T}$INSTALL" >&6 + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. +@@ -2988,7 +3302,7 @@ + ;; + esac + +-echo "$as_me:2991: checking if you want to install stripped executables" >&5 ++echo "$as_me:3305: 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. +@@ -3005,7 +3319,7 @@ + enable_stripping=yes + + fi; +-echo "$as_me:3008: result: $enable_stripping" >&5 ++echo "$as_me:3322: result: $enable_stripping" >&5 + echo "${ECHO_T}$enable_stripping" >&6 + + if test "$enable_stripping" = yes +@@ -3016,7 +3330,7 @@ + fi + + : "${INSTALL:=install}" +-echo "$as_me:3019: checking if install accepts -p option" >&5 ++echo "$as_me:3333: 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 +@@ -3047,10 +3361,10 @@ + rm -rf ./conftest* + + fi +-echo "$as_me:3050: result: $cf_cv_install_p" >&5 ++echo "$as_me:3364: result: $cf_cv_install_p" >&5 + echo "${ECHO_T}$cf_cv_install_p" >&6 + +-echo "$as_me:3053: checking if install needs to be told about ownership" >&5 ++echo "$as_me:3367: 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) +@@ -3061,7 +3375,7 @@ + ;; + esac + +-echo "$as_me:3064: result: $with_install_o" >&5 ++echo "$as_me:3378: result: $with_install_o" >&5 + echo "${ECHO_T}$with_install_o" >&6 + if test "x$with_install_o" = xyes + then +@@ -3072,7 +3386,7 @@ + + if test -n "$INSTALL_OPT_S" + then +- echo "$as_me:3075: checking if you want to specify strip-program" >&5 ++ echo "$as_me:3389: checking if you want to specify strip-program" >&5 + echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6 + + # Check whether --with-strip-program or --without-strip-program was given. +@@ -3082,11 +3396,11 @@ + else + with_strip_program=no + fi; +- echo "$as_me:3085: result: $with_strip_program" >&5 ++ echo "$as_me:3399: result: $with_strip_program" >&5 + echo "${ECHO_T}$with_strip_program" >&6 + if test "$with_strip_program" != no + then +- echo "$as_me:3089: checking if strip-program is supported with this installer" >&5 ++ echo "$as_me:3403: checking if strip-program is supported with this installer" >&5 + echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6 + cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'` + check_install_strip=no +@@ -3107,11 +3421,11 @@ + done + fi + fi +- echo "$as_me:3110: result: $check_install_strip" >&5 ++ echo "$as_me:3424: result: $check_install_strip" >&5 + echo "${ECHO_T}$check_install_strip" >&6 + case "$check_install_strip" in + (no) +- { echo "$as_me:3114: WARNING: $cf_install_program does not support strip program option" >&5 ++ { echo "$as_me:3428: WARNING: $cf_install_program does not support strip program option" >&5 + echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;} + with_strip_program=no + ;; +@@ -3126,7 +3440,7 @@ + chmod +x "$INSTALL" + test -n "$verbose" && echo " created $INSTALL" 1>&6 + +-echo "${as_me:-configure}:3129: testing created $INSTALL ..." 1>&5 ++echo "${as_me:-configure}:3443: testing created $INSTALL ..." 1>&5 + + ;; + (option) +@@ -3136,7 +3450,7 @@ + fi + fi + +-echo "$as_me:3139: checking for long file names" >&5 ++echo "$as_me:3453: 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 +@@ -3175,7 +3489,7 @@ + rm -rf "$ac_xdir" 2>/dev/null + done + fi +-echo "$as_me:3178: result: $ac_cv_sys_long_file_names" >&5 ++echo "$as_me:3492: 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 + +@@ -3187,7 +3501,7 @@ + + # if we find pkg-config, check if we should install the ".pc" files. + +-echo "$as_me:3190: checking if you want to use pkg-config" >&5 ++echo "$as_me:3504: 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. +@@ -3197,7 +3511,7 @@ + else + cf_pkg_config=yes + fi; +-echo "$as_me:3200: result: $cf_pkg_config" >&5 ++echo "$as_me:3514: result: $cf_pkg_config" >&5 + echo "${ECHO_T}$cf_pkg_config" >&6 + + case "$cf_pkg_config" in +@@ -3209,7 +3523,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:3212: checking for $ac_word" >&5 ++echo "$as_me:3526: 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 +@@ -3226,7 +3540,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:3229: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:3543: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -3237,10 +3551,10 @@ + PKG_CONFIG=$ac_cv_path_PKG_CONFIG + + if test -n "$PKG_CONFIG"; then +- echo "$as_me:3240: result: $PKG_CONFIG" >&5 ++ echo "$as_me:3554: result: $PKG_CONFIG" >&5 + echo "${ECHO_T}$PKG_CONFIG" >&6 + else +- echo "$as_me:3243: result: no" >&5 ++ echo "$as_me:3557: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3249,7 +3563,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:3252: checking for $ac_word" >&5 ++echo "$as_me:3566: 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 +@@ -3266,7 +3580,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:3269: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:3583: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -3278,10 +3592,10 @@ + ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + + if test -n "$ac_pt_PKG_CONFIG"; then +- echo "$as_me:3281: result: $ac_pt_PKG_CONFIG" >&5 ++ echo "$as_me:3595: result: $ac_pt_PKG_CONFIG" >&5 + echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 + else +- echo "$as_me:3284: result: no" >&5 ++ echo "$as_me:3598: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3324,24 +3638,24 @@ + PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:3327: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 ++ { { echo "$as_me:3641: 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:3334: WARNING: pkg-config is not installed" >&5 ++ { echo "$as_me:3648: 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:3340: checking for pkg-config library directory" >&5 ++ echo "$as_me:3654: checking for pkg-config library directory" >&5 + echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6 + ;; + (*) +- echo "$as_me:3344: checking for $PKG_CONFIG library directory" >&5 ++ echo "$as_me:3658: checking for $PKG_CONFIG library directory" >&5 + echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6 + ;; + esac +@@ -3368,7 +3682,7 @@ + case "x$cf_search_path" in + (xlibdir) + PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' +- echo "$as_me:3371: result: $PKG_CONFIG_LIBDIR" >&5 ++ echo "$as_me:3685: result: $PKG_CONFIG_LIBDIR" >&5 + echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 + cf_search_path= + ;; +@@ -3379,16 +3693,16 @@ + ;; + (x/*) + PKG_CONFIG_LIBDIR="$cf_search_path" +- echo "$as_me:3382: result: $PKG_CONFIG_LIBDIR" >&5 ++ echo "$as_me:3696: result: $PKG_CONFIG_LIBDIR" >&5 + echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 + cf_search_path= + ;; + (xyes|xauto) +- echo "$as_me:3387: result: auto" >&5 ++ echo "$as_me:3701: 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:3391: checking for search-list" >&5 ++ echo "$as_me:3705: checking for search-list" >&5 + echo $ECHO_N "checking for search-list... $ECHO_C" >&6 + if test "x$PKG_CONFIG" != xnone + then +@@ -3415,11 +3729,11 @@ + "` + fi + +- echo "$as_me:3418: result: $cf_search_path" >&5 ++ echo "$as_me:3732: result: $cf_search_path" >&5 + echo "${ECHO_T}$cf_search_path" >&6 + ;; + (*) +- { { echo "$as_me:3422: error: Unexpected option value: $cf_search_path" >&5 ++ { { echo "$as_me:3736: error: Unexpected option value: $cf_search_path" >&5 + echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -3427,7 +3741,7 @@ + + if test -n "$cf_search_path" + then +- echo "$as_me:3430: checking for first directory" >&5 ++ echo "$as_me:3744: 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 +@@ -3438,7 +3752,7 @@ + break + fi + done +- echo "$as_me:3441: result: $cf_pkg_config_path" >&5 ++ echo "$as_me:3755: result: $cf_pkg_config_path" >&5 + echo "${ECHO_T}$cf_pkg_config_path" >&6 + + if test "x$cf_pkg_config_path" != xnone ; then +@@ -3448,7 +3762,7 @@ + + if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path" + then +- echo "$as_me:3451: checking for workaround" >&5 ++ echo "$as_me:3765: checking for workaround" >&5 + echo $ECHO_N "checking for workaround... $ECHO_C" >&6 + if test "$prefix" = "NONE" ; then + cf_prefix="$ac_default_prefix" +@@ -3471,12 +3785,12 @@ + esac + done + test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup +- echo "$as_me:3474: result: $PKG_CONFIG_LIBDIR" >&5 ++ echo "$as_me:3788: result: $PKG_CONFIG_LIBDIR" >&5 + echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 + fi + fi + +-echo "$as_me:3479: checking if you want to build test-programs" >&5 ++echo "$as_me:3793: 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. +@@ -3486,10 +3800,10 @@ + else + cf_with_tests=yes + fi; +-echo "$as_me:3489: result: $cf_with_tests" >&5 ++echo "$as_me:3803: result: $cf_with_tests" >&5 + echo "${ECHO_T}$cf_with_tests" >&6 + +-echo "$as_me:3492: checking if we should assume mixed-case filenames" >&5 ++echo "$as_me:3806: 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. +@@ -3499,11 +3813,11 @@ + else + enable_mixedcase=auto + fi; +-echo "$as_me:3502: result: $enable_mixedcase" >&5 ++echo "$as_me:3816: result: $enable_mixedcase" >&5 + echo "${ECHO_T}$enable_mixedcase" >&6 + if test "$enable_mixedcase" = "auto" ; then + +-echo "$as_me:3506: checking if filesystem supports mixed-case filenames" >&5 ++echo "$as_me:3820: 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 +@@ -3530,7 +3844,7 @@ + fi + + fi +-echo "$as_me:3533: result: $cf_cv_mixedcase" >&5 ++echo "$as_me:3847: result: $cf_cv_mixedcase" >&5 + echo "${ECHO_T}$cf_cv_mixedcase" >&6 + test "$cf_cv_mixedcase" = yes && + cat >>confdefs.h <<\EOF +@@ -3548,7 +3862,7 @@ + fi + + # do this after mixed-case option (tags/TAGS is not as important as tic). +-echo "$as_me:3551: checking whether ${MAKE-make} sets \${MAKE}" >&5 ++echo "$as_me:3865: 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 +@@ -3568,16 +3882,16 @@ + rm -f conftest.make + fi + if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then +- echo "$as_me:3571: result: yes" >&5 ++ echo "$as_me:3885: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + SET_MAKE= + else +- echo "$as_me:3575: result: no" >&5 ++ echo "$as_me:3889: result: no" >&5 + echo "${ECHO_T}no" >&6 + SET_MAKE="MAKE=${MAKE-make}" + fi + +-echo "$as_me:3580: checking for \".PHONY\" make-support" >&5 ++echo "$as_me:3894: 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 +@@ -3632,7 +3946,7 @@ + rm -rf conftest* + + fi +-echo "$as_me:3635: result: $cf_cv_make_PHONY" >&5 ++echo "$as_me:3949: result: $cf_cv_make_PHONY" >&5 + echo "${ECHO_T}$cf_cv_make_PHONY" >&6 + MAKE_NO_PHONY="#" + MAKE_PHONY="#" +@@ -3643,7 +3957,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:3646: checking for $ac_word" >&5 ++echo "$as_me:3960: 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 +@@ -3658,7 +3972,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CTAGS="$ac_prog" +-echo "$as_me:3661: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3975: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3666,10 +3980,10 @@ + fi + CTAGS=$ac_cv_prog_CTAGS + if test -n "$CTAGS"; then +- echo "$as_me:3669: result: $CTAGS" >&5 ++ echo "$as_me:3983: result: $CTAGS" >&5 + echo "${ECHO_T}$CTAGS" >&6 + else +- echo "$as_me:3672: result: no" >&5 ++ echo "$as_me:3986: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3680,7 +3994,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:3683: checking for $ac_word" >&5 ++echo "$as_me:3997: 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 +@@ -3695,7 +4009,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ETAGS="$ac_prog" +-echo "$as_me:3698: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4012: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3703,10 +4017,10 @@ + fi + ETAGS=$ac_cv_prog_ETAGS + if test -n "$ETAGS"; then +- echo "$as_me:3706: result: $ETAGS" >&5 ++ echo "$as_me:4020: result: $ETAGS" >&5 + echo "${ECHO_T}$ETAGS" >&6 + else +- echo "$as_me:3709: result: no" >&5 ++ echo "$as_me:4023: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3715,7 +4029,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:3718: checking for $ac_word" >&5 ++echo "$as_me:4032: 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 +@@ -3730,7 +4044,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:3733: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4047: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3739,17 +4053,17 @@ + fi + MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS + if test -n "$MAKE_LOWER_TAGS"; then +- echo "$as_me:3742: result: $MAKE_LOWER_TAGS" >&5 ++ echo "$as_me:4056: result: $MAKE_LOWER_TAGS" >&5 + echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 + else +- echo "$as_me:3745: result: no" >&5 ++ echo "$as_me:4059: 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:3752: checking for $ac_word" >&5 ++echo "$as_me:4066: 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 +@@ -3764,7 +4078,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:3767: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4081: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3773,10 +4087,10 @@ + fi + MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS + if test -n "$MAKE_UPPER_TAGS"; then +- echo "$as_me:3776: result: $MAKE_UPPER_TAGS" >&5 ++ echo "$as_me:4090: result: $MAKE_UPPER_TAGS" >&5 + echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 + else +- echo "$as_me:3779: result: no" >&5 ++ echo "$as_me:4093: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3796,7 +4110,7 @@ + MAKE_LOWER_TAGS="#" + fi + +-echo "$as_me:3799: checking for makeflags variable" >&5 ++echo "$as_me:4113: 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 +@@ -3826,7 +4140,7 @@ + ;; + (*) + +-echo "${as_me:-configure}:3829: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 ++echo "${as_me:-configure}:4143: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 + + ;; + esac +@@ -3834,13 +4148,13 @@ + rm -f cf_makeflags.tmp + + fi +-echo "$as_me:3837: result: $cf_cv_makeflags" >&5 ++echo "$as_me:4151: 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:3843: checking for $ac_word" >&5 ++echo "$as_me:4157: 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 +@@ -3855,7 +4169,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:3858: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4172: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3863,10 +4177,10 @@ + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- echo "$as_me:3866: result: $RANLIB" >&5 ++ echo "$as_me:4180: result: $RANLIB" >&5 + echo "${ECHO_T}$RANLIB" >&6 + else +- echo "$as_me:3869: result: no" >&5 ++ echo "$as_me:4183: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3875,7 +4189,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:3878: checking for $ac_word" >&5 ++echo "$as_me:4192: 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 +@@ -3890,7 +4204,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:3893: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4207: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3899,10 +4213,10 @@ + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- echo "$as_me:3902: result: $ac_ct_RANLIB" >&5 ++ echo "$as_me:4216: result: $ac_ct_RANLIB" >&5 + echo "${ECHO_T}$ac_ct_RANLIB" >&6 + else +- echo "$as_me:3905: result: no" >&5 ++ echo "$as_me:4219: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3914,7 +4228,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:3917: checking for $ac_word" >&5 ++echo "$as_me:4231: 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 +@@ -3929,7 +4243,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:3932: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4246: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3937,10 +4251,10 @@ + fi + LD=$ac_cv_prog_LD + if test -n "$LD"; then +- echo "$as_me:3940: result: $LD" >&5 ++ echo "$as_me:4254: result: $LD" >&5 + echo "${ECHO_T}$LD" >&6 + else +- echo "$as_me:3943: result: no" >&5 ++ echo "$as_me:4257: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3949,7 +4263,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:3952: checking for $ac_word" >&5 ++echo "$as_me:4266: 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 +@@ -3964,7 +4278,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:3967: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4281: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3973,10 +4287,10 @@ + fi + ac_ct_LD=$ac_cv_prog_ac_ct_LD + if test -n "$ac_ct_LD"; then +- echo "$as_me:3976: result: $ac_ct_LD" >&5 ++ echo "$as_me:4290: result: $ac_ct_LD" >&5 + echo "${ECHO_T}$ac_ct_LD" >&6 + else +- echo "$as_me:3979: result: no" >&5 ++ echo "$as_me:4293: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3988,7 +4302,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:3991: checking for $ac_word" >&5 ++echo "$as_me:4305: 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 +@@ -4003,7 +4317,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:4006: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4320: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4011,10 +4325,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:4014: result: $AR" >&5 ++ echo "$as_me:4328: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:4017: result: no" >&5 ++ echo "$as_me:4331: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4023,7 +4337,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:4026: checking for $ac_word" >&5 ++echo "$as_me:4340: 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 +@@ -4038,7 +4352,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:4041: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4355: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4047,10 +4361,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:4050: result: $ac_ct_AR" >&5 ++ echo "$as_me:4364: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:4053: result: no" >&5 ++ echo "$as_me:4367: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4062,7 +4376,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:4065: checking for $ac_word" >&5 ++echo "$as_me:4379: 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 +@@ -4077,7 +4391,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:4080: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4394: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4085,10 +4399,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:4088: result: $AR" >&5 ++ echo "$as_me:4402: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:4091: result: no" >&5 ++ echo "$as_me:4405: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4097,7 +4411,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:4100: checking for $ac_word" >&5 ++echo "$as_me:4414: 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 +@@ -4112,7 +4426,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:4115: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4429: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4121,10 +4435,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:4124: result: $ac_ct_AR" >&5 ++ echo "$as_me:4438: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:4127: result: no" >&5 ++ echo "$as_me:4441: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4133,7 +4447,7 @@ + AR="$ac_cv_prog_AR" + fi + +-echo "$as_me:4136: checking for options to update archives" >&5 ++echo "$as_me:4450: 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 +@@ -4170,13 +4484,13 @@ + rm -f conftest.a + + cat >"conftest.$ac_ext" <&5 ++ if { (eval echo "$as_me:4490: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4179: \$? = $ac_status" >&5 ++ echo "$as_me:4493: \$? = $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 +@@ -4187,7 +4501,7 @@ + else + test -n "$verbose" && echo " cannot compile test-program" 1>&6 + +-echo "${as_me:-configure}:4190: testing cannot compile test-program ..." 1>&5 ++echo "${as_me:-configure}:4504: testing cannot compile test-program ..." 1>&5 + + break + fi +@@ -4197,7 +4511,7 @@ + esac + + fi +-echo "$as_me:4200: result: $cf_cv_ar_flags" >&5 ++echo "$as_me:4514: result: $cf_cv_ar_flags" >&5 + echo "${ECHO_T}$cf_cv_ar_flags" >&6 + + if test -n "$ARFLAGS" ; then +@@ -4208,17 +4522,17 @@ + ARFLAGS=$cf_cv_ar_flags + fi + +- echo "$as_me:4211: checking for PATH separator" >&5 ++ echo "$as_me:4525: 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:4218: result: $PATH_SEPARATOR" >&5 ++ echo "$as_me:4532: result: $PATH_SEPARATOR" >&5 + echo "${ECHO_T}$PATH_SEPARATOR" >&6 + +-echo "$as_me:4221: checking if you have specified an install-prefix" >&5 ++echo "$as_me:4535: 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. +@@ -4231,7 +4545,7 @@ + ;; + esac + fi; +-echo "$as_me:4234: result: $DESTDIR" >&5 ++echo "$as_me:4548: result: $DESTDIR" >&5 + echo "${ECHO_T}$DESTDIR" >&6 + + ############################################################################### +@@ -4259,7 +4573,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:4262: checking for $ac_word" >&5 ++echo "$as_me:4576: 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 +@@ -4274,7 +4588,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:4277: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4591: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4282,10 +4596,10 @@ + fi + BUILD_CC=$ac_cv_prog_BUILD_CC + if test -n "$BUILD_CC"; then +- echo "$as_me:4285: result: $BUILD_CC" >&5 ++ echo "$as_me:4599: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + else +- echo "$as_me:4288: result: no" >&5 ++ echo "$as_me:4602: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4294,12 +4608,12 @@ + test -n "$BUILD_CC" || BUILD_CC="none" + + fi; +- echo "$as_me:4297: checking for native build C compiler" >&5 ++ echo "$as_me:4611: checking for native build C compiler" >&5 + echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 +- echo "$as_me:4299: result: $BUILD_CC" >&5 ++ echo "$as_me:4613: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + +- echo "$as_me:4302: checking for native build C preprocessor" >&5 ++ echo "$as_me:4616: 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. +@@ -4309,10 +4623,10 @@ + else + BUILD_CPP='${BUILD_CC} -E' + fi; +- echo "$as_me:4312: result: $BUILD_CPP" >&5 ++ echo "$as_me:4626: result: $BUILD_CPP" >&5 + echo "${ECHO_T}$BUILD_CPP" >&6 + +- echo "$as_me:4315: checking for native build C flags" >&5 ++ echo "$as_me:4629: 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. +@@ -4320,10 +4634,10 @@ + withval="$with_build_cflags" + BUILD_CFLAGS="$withval" + fi; +- echo "$as_me:4323: result: $BUILD_CFLAGS" >&5 ++ echo "$as_me:4637: result: $BUILD_CFLAGS" >&5 + echo "${ECHO_T}$BUILD_CFLAGS" >&6 + +- echo "$as_me:4326: checking for native build C preprocessor-flags" >&5 ++ echo "$as_me:4640: 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. +@@ -4331,10 +4645,10 @@ + withval="$with_build_cppflags" + BUILD_CPPFLAGS="$withval" + fi; +- echo "$as_me:4334: result: $BUILD_CPPFLAGS" >&5 ++ echo "$as_me:4648: result: $BUILD_CPPFLAGS" >&5 + echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 + +- echo "$as_me:4337: checking for native build linker-flags" >&5 ++ echo "$as_me:4651: 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. +@@ -4342,10 +4656,10 @@ + withval="$with_build_ldflags" + BUILD_LDFLAGS="$withval" + fi; +- echo "$as_me:4345: result: $BUILD_LDFLAGS" >&5 ++ echo "$as_me:4659: result: $BUILD_LDFLAGS" >&5 + echo "${ECHO_T}$BUILD_LDFLAGS" >&6 + +- echo "$as_me:4348: checking for native build linker-libraries" >&5 ++ echo "$as_me:4662: 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. +@@ -4353,7 +4667,7 @@ + withval="$with_build_libs" + BUILD_LIBS="$withval" + fi; +- echo "$as_me:4356: result: $BUILD_LIBS" >&5 ++ echo "$as_me:4670: result: $BUILD_LIBS" >&5 + echo "${ECHO_T}$BUILD_LIBS" >&6 + + # this assumes we're on Unix. +@@ -4362,7 +4676,7 @@ + + : ${BUILD_CC:='${CC}'} + +- echo "$as_me:4365: checking if the build-compiler \"$BUILD_CC\" works" >&5 ++ echo "$as_me:4679: checking if the build-compiler \"$BUILD_CC\" works" >&5 + echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6 + + cf_save_crossed=$cross_compiling +@@ -4376,7 +4690,7 @@ + cf_ok_build_cc=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 4379 "configure" ++#line 4693 "configure" + #include "confdefs.h" + #include + int main(int argc, char *argv[]) +@@ -4386,15 +4700,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:4389: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4703: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4392: \$? = $ac_status" >&5 ++ echo "$as_me:4706: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:4394: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4708: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4397: \$? = $ac_status" >&5 ++ echo "$as_me:4711: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_ok_build_cc=yes + else +@@ -4409,12 +4723,12 @@ + cross_compiling=$cf_save_crossed + ac_link=$cf_save_ac_link + +- echo "$as_me:4412: result: $cf_ok_build_cc" >&5 ++ echo "$as_me:4726: result: $cf_ok_build_cc" >&5 + echo "${ECHO_T}$cf_ok_build_cc" >&6 + + if test "$cf_ok_build_cc" != yes + then +- { { echo "$as_me:4417: error: Cross-build requires two compilers. ++ { { echo "$as_me:4731: 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;} +@@ -4425,9 +4739,9 @@ + : ${BUILD_CC:='${CC}'} + : ${BUILD_CPP:='${CPP}'} + : ${BUILD_CFLAGS:='${CFLAGS}'} +- : ${BUILD_CPPFLAGS:='${CPPFLAGS}'} ++ : ${BUILD_CPPFLAGS:=''${CPPFLAGS}''} + : ${BUILD_LDFLAGS:='${LDFLAGS}'} +- : ${BUILD_LIBS:='${LIBS}'} ++ : ${BUILD_LIBS:=''${LIBS}''} + : ${BUILD_EXEEXT:='$x'} + : ${BUILD_OBJEXT:='o'} + fi +@@ -4439,7 +4753,7 @@ + ### shared, for example. + cf_list_models="" + +-echo "$as_me:4442: checking if you want to build shared C-objects" >&5 ++echo "$as_me:4756: 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. +@@ -4449,27 +4763,27 @@ + else + with_shared=no + fi; +-echo "$as_me:4452: result: $with_shared" >&5 ++echo "$as_me:4766: result: $with_shared" >&5 + echo "${ECHO_T}$with_shared" >&6 + test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" + +-echo "$as_me:4456: checking for specified models" >&5 ++echo "$as_me:4770: 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:4459: result: $cf_list_models" >&5 ++echo "$as_me:4773: 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:4464: checking for default model" >&5 ++echo "$as_me:4778: 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:4467: result: $DFT_LWR_MODEL" >&5 ++echo "$as_me:4781: 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:4472: checking for specific curses-directory" >&5 ++echo "$as_me:4786: 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. +@@ -4479,7 +4793,7 @@ + else + cf_cv_curses_dir=no + fi; +-echo "$as_me:4482: result: $cf_cv_curses_dir" >&5 ++echo "$as_me:4796: 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" +@@ -4510,7 +4824,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:4513: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:4827: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -4546,7 +4860,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 4549 "configure" ++#line 4863 "configure" + #include "confdefs.h" + #include + int +@@ -4558,16 +4872,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:4561: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4875: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4564: \$? = $ac_status" >&5 ++ echo "$as_me:4878: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:4567: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4881: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4570: \$? = $ac_status" >&5 ++ echo "$as_me:4884: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -4584,7 +4898,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}:4587: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:4901: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -4620,7 +4934,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}:4623: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:4937: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -4635,13 +4949,13 @@ + cf_have_ncuconfig=no + + if test "x${PKG_CONFIG:=none}" != xnone; then +- echo "$as_me:4638: checking pkg-config for $cf_ncuconfig_root" >&5 ++ echo "$as_me:4952: 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:4641: result: yes" >&5 ++ echo "$as_me:4955: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + +- echo "$as_me:4644: checking if the $cf_ncuconfig_root package files work" >&5 ++ echo "$as_me:4958: 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 + +@@ -4774,7 +5088,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 4777 "configure" ++#line 5091 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -4786,37 +5100,37 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:4789: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5103: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4792: \$? = $ac_status" >&5 ++ echo "$as_me:5106: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:4795: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5109: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4798: \$? = $ac_status" >&5 ++ echo "$as_me:5112: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_test_ncuconfig=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 4804 "configure" ++#line 5118 "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:4811: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5125: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4814: \$? = $ac_status" >&5 ++ echo "$as_me:5128: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:4816: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5130: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4819: \$? = $ac_status" >&5 ++ echo "$as_me:5133: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_test_ncuconfig=yes + else +@@ -4990,7 +5304,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 4993 "configure" ++#line 5307 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -5002,37 +5316,37 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:5005: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5319: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5008: \$? = $ac_status" >&5 ++ echo "$as_me:5322: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:5011: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5325: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5014: \$? = $ac_status" >&5 ++ echo "$as_me:5328: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_have_ncuconfig=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5020 "configure" ++#line 5334 "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:5027: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5341: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5030: \$? = $ac_status" >&5 ++ echo "$as_me:5344: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:5032: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5346: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5035: \$? = $ac_status" >&5 ++ echo "$as_me:5349: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_have_ncuconfig=yes + else +@@ -5049,7 +5363,7 @@ + cf_have_ncuconfig=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:5052: result: $cf_have_ncuconfig" >&5 ++ echo "$as_me:5366: 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" +@@ -5065,7 +5379,7 @@ + + NCURSES_CONFIG_PKG=$cf_ncuconfig_root + +-echo "$as_me:5068: checking for terminfo header" >&5 ++echo "$as_me:5382: 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 +@@ -5083,7 +5397,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5086 "configure" ++#line 5400 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -5098,16 +5412,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5101: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5415: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5104: \$? = $ac_status" >&5 ++ echo "$as_me:5418: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5107: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5421: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5110: \$? = $ac_status" >&5 ++ echo "$as_me:5424: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +@@ -5123,7 +5437,7 @@ + done + + fi +-echo "$as_me:5126: result: $cf_cv_term_header" >&5 ++echo "$as_me:5440: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -5158,7 +5472,7 @@ + fi + + else +- echo "$as_me:5161: result: no" >&5 ++ echo "$as_me:5475: result: no" >&5 + echo "${ECHO_T}no" >&6 + NCURSES_CONFIG_PKG=none + fi +@@ -5174,7 +5488,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:5177: checking for $ac_word" >&5 ++echo "$as_me:5491: 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 +@@ -5189,7 +5503,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:5192: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5506: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5197,10 +5511,10 @@ + fi + NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG + if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:5200: result: $NCURSES_CONFIG" >&5 ++ echo "$as_me:5514: result: $NCURSES_CONFIG" >&5 + echo "${ECHO_T}$NCURSES_CONFIG" >&6 + else +- echo "$as_me:5203: result: no" >&5 ++ echo "$as_me:5517: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5213,7 +5527,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:5216: checking for $ac_word" >&5 ++echo "$as_me:5530: 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 +@@ -5228,7 +5542,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:5231: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5545: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5236,10 +5550,10 @@ + fi + ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG + if test -n "$ac_ct_NCURSES_CONFIG"; then +- echo "$as_me:5239: result: $ac_ct_NCURSES_CONFIG" >&5 ++ echo "$as_me:5553: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 + else +- echo "$as_me:5242: result: no" >&5 ++ echo "$as_me:5556: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5396,7 +5710,7 @@ + + # even with config script, some packages use no-override for curses.h + +-echo "$as_me:5399: checking if we have identified curses headers" >&5 ++echo "$as_me:5713: 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 +@@ -5408,7 +5722,7 @@ + curses.h ncurses/curses.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5411 "configure" ++#line 5725 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -5420,16 +5734,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5423: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5737: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5426: \$? = $ac_status" >&5 ++ echo "$as_me:5740: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5429: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5743: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5432: \$? = $ac_status" >&5 ++ echo "$as_me:5746: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -5440,11 +5754,11 @@ + done + + fi +-echo "$as_me:5443: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:5757: 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:5447: error: No curses header-files found" >&5 ++ { { echo "$as_me:5761: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5454,23 +5768,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:5457: checking for $ac_header" >&5 ++echo "$as_me:5771: 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 5463 "configure" ++#line 5777 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:5467: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:5781: \"$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:5473: \$? = $ac_status" >&5 ++ echo "$as_me:5787: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -5489,7 +5803,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:5492: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:5806: 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 5548 "configure" ++#line 5862 "configure" + #include "confdefs.h" + #include + int +@@ -5557,16 +5871,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5560: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5874: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5563: \$? = $ac_status" >&5 ++ echo "$as_me:5877: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5566: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5880: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5569: \$? = $ac_status" >&5 ++ echo "$as_me:5883: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -5583,7 +5897,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}:5586: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:5900: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -5602,7 +5916,7 @@ + + } + +-echo "$as_me:5605: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:5919: 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 +@@ -5614,7 +5928,7 @@ + do + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5617 "configure" ++#line 5931 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -5638,16 +5952,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5641: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5955: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5644: \$? = $ac_status" >&5 ++ echo "$as_me:5958: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5647: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5961: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5650: \$? = $ac_status" >&5 ++ echo "$as_me:5964: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -5662,14 +5976,14 @@ + done + + fi +-echo "$as_me:5665: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:5979: 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:5672: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:5986: 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 +@@ -5790,7 +6104,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5793 "configure" ++#line 6107 "configure" + #include "confdefs.h" + #include + int +@@ -5802,16 +6116,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5805: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6119: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5808: \$? = $ac_status" >&5 ++ echo "$as_me:6122: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5811: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6125: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5814: \$? = $ac_status" >&5 ++ echo "$as_me:6128: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -5828,7 +6142,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}:5831: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:6145: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -5851,7 +6165,7 @@ + do + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5854 "configure" ++#line 6168 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -5875,16 +6189,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5878: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6192: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5881: \$? = $ac_status" >&5 ++ echo "$as_me:6195: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5884: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6198: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5887: \$? = $ac_status" >&5 ++ echo "$as_me:6201: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -5905,12 +6219,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5908: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6222: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:5913: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:6227: 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%/[^/]*$%%'` +@@ -5946,7 +6260,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5949 "configure" ++#line 6263 "configure" + #include "confdefs.h" + #include + int +@@ -5958,16 +6272,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5961: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6275: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5964: \$? = $ac_status" >&5 ++ echo "$as_me:6278: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5967: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6281: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5970: \$? = $ac_status" >&5 ++ echo "$as_me:6284: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -5984,7 +6298,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}:5987: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:6301: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -6032,7 +6346,7 @@ + ;; + esac + +-echo "$as_me:6035: checking for terminfo header" >&5 ++echo "$as_me:6349: 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 +@@ -6050,7 +6364,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6053 "configure" ++#line 6367 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -6065,16 +6379,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:6068: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6382: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6071: \$? = $ac_status" >&5 ++ echo "$as_me:6385: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:6074: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6388: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6077: \$? = $ac_status" >&5 ++ echo "$as_me:6391: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +@@ -6090,7 +6404,7 @@ + done + + fi +-echo "$as_me:6093: result: $cf_cv_term_header" >&5 ++echo "$as_me:6407: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -6128,7 +6442,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:6131: checking for ncurses version" >&5 ++echo "$as_me:6445: 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 +@@ -6154,10 +6468,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:6157: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:6471: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:6160: \$? = $ac_status" >&5 ++ echo "$as_me:6474: \$? = $ac_status" >&5 + (exit "$ac_status"); } + if test -f conftest.out ; then + cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` +@@ -6167,7 +6481,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6170 "configure" ++#line 6484 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -6194,15 +6508,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:6197: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6511: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6200: \$? = $ac_status" >&5 ++ echo "$as_me:6514: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:6202: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6516: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6205: \$? = $ac_status" >&5 ++ echo "$as_me:6519: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -6216,7 +6530,7 @@ + rm -f "$cf_tempfile" + + fi +-echo "$as_me:6219: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:6533: result: $cf_cv_ncurses_version" >&5 + echo "${ECHO_T}$cf_cv_ncurses_version" >&6 + test "$cf_cv_ncurses_version" = no || + cat >>confdefs.h <<\EOF +@@ -6229,7 +6543,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:6232: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:6546: 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 +@@ -6237,7 +6551,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6240 "configure" ++#line 6554 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6256,16 +6570,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6259: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6573: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6262: \$? = $ac_status" >&5 ++ echo "$as_me:6576: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6265: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6579: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6268: \$? = $ac_status" >&5 ++ echo "$as_me:6582: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -6276,10 +6590,10 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6279: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:6593: 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:6282: checking for initscr in -lgpm" >&5 ++ echo "$as_me:6596: 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 +@@ -6287,7 +6601,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6290 "configure" ++#line 6604 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6306,16 +6620,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6309: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6623: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6312: \$? = $ac_status" >&5 ++ echo "$as_me:6626: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6315: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6629: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6318: \$? = $ac_status" >&5 ++ echo "$as_me:6632: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -6326,7 +6640,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6329: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:6643: 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" +@@ -6341,7 +6655,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:6344: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:6658: 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 +@@ -6349,7 +6663,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6352 "configure" ++#line 6666 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6368,16 +6682,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6371: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6685: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6374: \$? = $ac_status" >&5 ++ echo "$as_me:6688: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6377: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6691: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6380: \$? = $ac_status" >&5 ++ echo "$as_me:6694: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -6388,7 +6702,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6391: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:6705: 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" +@@ -6437,13 +6751,13 @@ + + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' + cf_libdir="" +- echo "$as_me:6440: checking for initscr" >&5 ++ echo "$as_me:6754: 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 6446 "configure" ++#line 6760 "configure" + #include "confdefs.h" + #define initscr autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -6474,16 +6788,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6477: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6791: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6480: \$? = $ac_status" >&5 ++ echo "$as_me:6794: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6483: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6797: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6486: \$? = $ac_status" >&5 ++ echo "$as_me:6800: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_initscr=yes + else +@@ -6493,18 +6807,18 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:6496: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:6810: 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:6503: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:6817: 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 6507 "configure" ++#line 6821 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -6516,25 +6830,25 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6519: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6833: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6522: \$? = $ac_status" >&5 ++ echo "$as_me:6836: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6525: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6839: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6528: \$? = $ac_status" >&5 ++ echo "$as_me:6842: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:6530: result: yes" >&5 ++ echo "$as_me:6844: 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:6537: result: no" >&5 ++echo "$as_me:6851: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -6602,11 +6916,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:6605: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:6919: 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 6609 "configure" ++#line 6923 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -6618,25 +6932,25 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6621: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6935: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6624: \$? = $ac_status" >&5 ++ echo "$as_me:6938: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6627: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6941: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6630: \$? = $ac_status" >&5 ++ echo "$as_me:6944: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:6632: result: yes" >&5 ++ echo "$as_me:6946: 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:6639: result: no" >&5 ++echo "$as_me:6953: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -6651,7 +6965,7 @@ + eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" + + if test "$cf_found_library" = no ; then +- { { echo "$as_me:6654: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:6968: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -6659,7 +6973,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:6662: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:6976: 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 +@@ -6669,7 +6983,7 @@ + fi + done + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6672 "configure" ++#line 6986 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -6681,23 +6995,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6684: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6998: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6687: \$? = $ac_status" >&5 ++ echo "$as_me:7001: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6690: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7004: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6693: \$? = $ac_status" >&5 ++ echo "$as_me:7007: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:6695: result: yes" >&5 ++ echo "$as_me:7009: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:6700: result: no" >&5 ++echo "$as_me:7014: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -6715,7 +7029,7 @@ + NCURSES_CONFIG=none + fi + +-echo "$as_me:6718: checking if you want wide-character code" >&5 ++echo "$as_me:7032: 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. +@@ -6725,30 +7039,30 @@ + else + with_widec=no + fi; +-echo "$as_me:6728: result: $with_widec" >&5 ++echo "$as_me:7042: 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:6735: checking for $ac_header" >&5 ++echo "$as_me:7049: 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 6741 "configure" ++#line 7055 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:6745: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:7059: \"$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:6751: \$? = $ac_status" >&5 ++ echo "$as_me:7065: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -6767,7 +7081,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:6770: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:7084: 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:7094: 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 +@@ -6785,7 +7099,7 @@ + + cf_save_LIBS="$LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6788 "configure" ++#line 7102 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -6802,16 +7116,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6805: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7119: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6808: \$? = $ac_status" >&5 ++ echo "$as_me:7122: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6811: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7125: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6814: \$? = $ac_status" >&5 ++ echo "$as_me:7128: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_utf8_lib=yes + else +@@ -6823,12 +7137,12 @@ + cf_cv_header_path_utf8= + cf_cv_library_path_utf8= + +-echo "${as_me:-configure}:6826: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:7140: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6831 "configure" ++#line 7145 "configure" + #include "confdefs.h" + + #include +@@ -6841,16 +7155,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6844: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7158: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6847: \$? = $ac_status" >&5 ++ echo "$as_me:7161: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6850: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7164: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6853: \$? = $ac_status" >&5 ++ echo "$as_me:7167: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -6864,7 +7178,7 @@ + LIBS="-lutf8 $cf_save_LIBS" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6867 "configure" ++#line 7181 "configure" + #include "confdefs.h" + + #include +@@ -6877,16 +7191,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6880: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7194: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6883: \$? = $ac_status" >&5 ++ echo "$as_me:7197: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6886: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7200: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6889: \$? = $ac_status" >&5 ++ echo "$as_me:7203: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -6903,9 +7217,9 @@ + + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 + +-echo "${as_me:-configure}:6906: testing find linkage for utf8 library ..." 1>&5 ++echo "${as_me:-configure}:7220: testing find linkage for utf8 library ..." 1>&5 + +-echo "${as_me:-configure}:6908: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:7222: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -6996,7 +7310,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}:6999: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:7313: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_save_CPPFLAGS" + +@@ -7004,7 +7318,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7007 "configure" ++#line 7321 "configure" + #include "confdefs.h" + + #include +@@ -7017,21 +7331,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:7020: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7334: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7023: \$? = $ac_status" >&5 ++ echo "$as_me:7337: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:7026: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7340: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7029: \$? = $ac_status" >&5 ++ echo "$as_me:7343: \$? = $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}:7034: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:7348: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -7049,7 +7363,7 @@ + + if test "$cf_cv_find_linkage_utf8" = maybe ; then + +-echo "${as_me:-configure}:7052: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:7366: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -7124,13 +7438,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}:7127: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:7441: 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 7133 "configure" ++#line 7447 "configure" + #include "confdefs.h" + + #include +@@ -7143,21 +7457,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7146: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7460: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7149: \$? = $ac_status" >&5 ++ echo "$as_me:7463: \$? = $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:7466: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7155: \$? = $ac_status" >&5 ++ echo "$as_me:7469: \$? = $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}:7160: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:7474: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=yes + cf_cv_library_file_utf8="-lutf8" +@@ -7199,7 +7513,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:7202: result: $cf_cv_utf8_lib" >&5 ++echo "$as_me:7516: 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 +@@ -7237,7 +7551,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7240 "configure" ++#line 7554 "configure" + #include "confdefs.h" + #include + int +@@ -7249,16 +7563,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:7252: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7566: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7255: \$? = $ac_status" >&5 ++ echo "$as_me:7569: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:7258: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7572: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7261: \$? = $ac_status" >&5 ++ echo "$as_me:7575: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -7275,7 +7589,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}:7278: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:7592: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -7311,7 +7625,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}:7314: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:7628: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -7341,13 +7655,13 @@ + cf_have_ncuconfig=no + + if test "x${PKG_CONFIG:=none}" != xnone; then +- echo "$as_me:7344: checking pkg-config for $cf_ncuconfig_root" >&5 ++ echo "$as_me:7658: 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:7347: result: yes" >&5 ++ echo "$as_me:7661: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + +- echo "$as_me:7350: checking if the $cf_ncuconfig_root package files work" >&5 ++ echo "$as_me:7664: 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 + +@@ -7480,7 +7794,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7483 "configure" ++#line 7797 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -7492,37 +7806,37 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7495: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7809: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7498: \$? = $ac_status" >&5 ++ echo "$as_me:7812: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7501: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7815: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7504: \$? = $ac_status" >&5 ++ echo "$as_me:7818: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_test_ncuconfig=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7510 "configure" ++#line 7824 "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:7517: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7831: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7520: \$? = $ac_status" >&5 ++ echo "$as_me:7834: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:7522: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7836: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7525: \$? = $ac_status" >&5 ++ echo "$as_me:7839: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_test_ncuconfig=yes + else +@@ -7696,7 +8010,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7699 "configure" ++#line 8013 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -7708,37 +8022,37 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7711: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8025: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7714: \$? = $ac_status" >&5 ++ echo "$as_me:8028: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7717: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8031: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7720: \$? = $ac_status" >&5 ++ echo "$as_me:8034: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_have_ncuconfig=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7726 "configure" ++#line 8040 "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:7733: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8047: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7736: \$? = $ac_status" >&5 ++ echo "$as_me:8050: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:7738: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8052: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7741: \$? = $ac_status" >&5 ++ echo "$as_me:8055: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_have_ncuconfig=yes + else +@@ -7755,7 +8069,7 @@ + cf_have_ncuconfig=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:7758: result: $cf_have_ncuconfig" >&5 ++ echo "$as_me:8072: 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" +@@ -7771,7 +8085,7 @@ + + NCURSES_CONFIG_PKG=$cf_ncuconfig_root + +-echo "$as_me:7774: checking for terminfo header" >&5 ++echo "$as_me:8088: 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 +@@ -7789,7 +8103,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7792 "configure" ++#line 8106 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -7804,16 +8118,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:7807: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8121: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7810: \$? = $ac_status" >&5 ++ echo "$as_me:8124: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:7813: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8127: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7816: \$? = $ac_status" >&5 ++ echo "$as_me:8130: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +@@ -7829,7 +8143,7 @@ + done + + fi +-echo "$as_me:7832: result: $cf_cv_term_header" >&5 ++echo "$as_me:8146: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -7864,7 +8178,7 @@ + fi + + else +- echo "$as_me:7867: result: no" >&5 ++ echo "$as_me:8181: result: no" >&5 + echo "${ECHO_T}no" >&6 + NCURSES_CONFIG_PKG=none + fi +@@ -7880,7 +8194,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:7883: checking for $ac_word" >&5 ++echo "$as_me:8197: 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 +@@ -7895,7 +8209,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:7898: found $ac_dir/$ac_word" >&5 ++echo "$as_me:8212: found $ac_dir/$ac_word" >&5 + break + done + +@@ -7903,10 +8217,10 @@ + fi + NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG + if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:7906: result: $NCURSES_CONFIG" >&5 ++ echo "$as_me:8220: result: $NCURSES_CONFIG" >&5 + echo "${ECHO_T}$NCURSES_CONFIG" >&6 + else +- echo "$as_me:7909: result: no" >&5 ++ echo "$as_me:8223: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -7919,7 +8233,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:7922: checking for $ac_word" >&5 ++echo "$as_me:8236: 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 +@@ -7934,7 +8248,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:7937: found $ac_dir/$ac_word" >&5 ++echo "$as_me:8251: found $ac_dir/$ac_word" >&5 + break + done + +@@ -7942,10 +8256,10 @@ + fi + ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG + if test -n "$ac_ct_NCURSES_CONFIG"; then +- echo "$as_me:7945: result: $ac_ct_NCURSES_CONFIG" >&5 ++ echo "$as_me:8259: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 + else +- echo "$as_me:7948: result: no" >&5 ++ echo "$as_me:8262: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8102,7 +8416,7 @@ + + # even with config script, some packages use no-override for curses.h + +-echo "$as_me:8105: checking if we have identified curses headers" >&5 ++echo "$as_me:8419: 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 +@@ -8114,7 +8428,7 @@ + curses.h ncursesw/curses.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8117 "configure" ++#line 8431 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -8126,16 +8440,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8129: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8443: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8132: \$? = $ac_status" >&5 ++ echo "$as_me:8446: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8135: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8449: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8138: \$? = $ac_status" >&5 ++ echo "$as_me:8452: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -8146,11 +8460,11 @@ + done + + fi +-echo "$as_me:8149: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:8463: 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:8153: error: No curses header-files found" >&5 ++ { { echo "$as_me:8467: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -8160,23 +8474,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:8163: checking for $ac_header" >&5 ++echo "$as_me:8477: 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 8169 "configure" ++#line 8483 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:8173: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:8487: \"$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:8179: \$? = $ac_status" >&5 ++ echo "$as_me:8493: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -8195,7 +8509,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:8198: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:8512: 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 8254 "configure" ++#line 8568 "configure" + #include "confdefs.h" + #include + int +@@ -8263,16 +8577,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8266: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8580: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8269: \$? = $ac_status" >&5 ++ echo "$as_me:8583: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8272: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8586: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8275: \$? = $ac_status" >&5 ++ echo "$as_me:8589: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -8289,7 +8603,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}:8292: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:8606: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -8308,7 +8622,7 @@ + + } + +-echo "$as_me:8311: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:8625: 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 +@@ -8320,7 +8634,7 @@ + do + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8323 "configure" ++#line 8637 "configure" + #include "confdefs.h" + + #define _XOPEN_SOURCE_EXTENDED +@@ -8352,16 +8666,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8355: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8669: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8358: \$? = $ac_status" >&5 ++ echo "$as_me:8672: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8361: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8675: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8364: \$? = $ac_status" >&5 ++ echo "$as_me:8678: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -8376,14 +8690,14 @@ + done + + fi +-echo "$as_me:8379: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:8693: 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:8386: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:8700: 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 +@@ -8504,7 +8818,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8507 "configure" ++#line 8821 "configure" + #include "confdefs.h" + #include + int +@@ -8516,16 +8830,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8519: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8833: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8522: \$? = $ac_status" >&5 ++ echo "$as_me:8836: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8525: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8839: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8528: \$? = $ac_status" >&5 ++ echo "$as_me:8842: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -8542,7 +8856,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}:8545: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:8859: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -8565,7 +8879,7 @@ + do + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8568 "configure" ++#line 8882 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -8589,16 +8903,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8592: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8906: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8595: \$? = $ac_status" >&5 ++ echo "$as_me:8909: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8598: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8912: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8601: \$? = $ac_status" >&5 ++ echo "$as_me:8915: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -8619,12 +8933,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8622: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8936: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:8627: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:8941: 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%/[^/]*$%%'` +@@ -8660,7 +8974,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8663 "configure" ++#line 8977 "configure" + #include "confdefs.h" + #include + int +@@ -8672,16 +8986,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8675: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8989: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8678: \$? = $ac_status" >&5 ++ echo "$as_me:8992: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8681: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8995: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8684: \$? = $ac_status" >&5 ++ echo "$as_me:8998: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -8698,7 +9012,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}:8701: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:9015: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -8746,7 +9060,7 @@ + ;; + esac + +-echo "$as_me:8749: checking for terminfo header" >&5 ++echo "$as_me:9063: 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 +@@ -8764,7 +9078,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8767 "configure" ++#line 9081 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -8779,16 +9093,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8782: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9096: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8785: \$? = $ac_status" >&5 ++ echo "$as_me:9099: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8788: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9102: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8791: \$? = $ac_status" >&5 ++ echo "$as_me:9105: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +@@ -8804,7 +9118,7 @@ + done + + fi +-echo "$as_me:8807: result: $cf_cv_term_header" >&5 ++echo "$as_me:9121: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -8842,7 +9156,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:8845: checking for ncurses version" >&5 ++echo "$as_me:9159: 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 +@@ -8868,10 +9182,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:8871: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:9185: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:8874: \$? = $ac_status" >&5 ++ echo "$as_me:9188: \$? = $ac_status" >&5 + (exit "$ac_status"); } + if test -f conftest.out ; then + cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` +@@ -8881,7 +9195,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8884 "configure" ++#line 9198 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -8908,15 +9222,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:8911: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9225: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8914: \$? = $ac_status" >&5 ++ echo "$as_me:9228: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:8916: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9230: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8919: \$? = $ac_status" >&5 ++ echo "$as_me:9233: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -8930,7 +9244,7 @@ + rm -f "$cf_tempfile" + + fi +-echo "$as_me:8933: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:9247: result: $cf_cv_ncurses_version" >&5 + echo "${ECHO_T}$cf_cv_ncurses_version" >&6 + test "$cf_cv_ncurses_version" = no || + cat >>confdefs.h <<\EOF +@@ -8943,7 +9257,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:8946: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:9260: 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 +@@ -8951,7 +9265,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8954 "configure" ++#line 9268 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -8970,16 +9284,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:8973: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9287: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8976: \$? = $ac_status" >&5 ++ echo "$as_me:9290: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:8979: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9293: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8982: \$? = $ac_status" >&5 ++ echo "$as_me:9296: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -8990,10 +9304,10 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:8993: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:9307: 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:8996: checking for initscr in -lgpm" >&5 ++ echo "$as_me:9310: 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 +@@ -9001,7 +9315,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9004 "configure" ++#line 9318 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -9020,16 +9334,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9023: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9337: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9026: \$? = $ac_status" >&5 ++ echo "$as_me:9340: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9029: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9343: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9032: \$? = $ac_status" >&5 ++ echo "$as_me:9346: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -9040,7 +9354,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:9043: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:9357: 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" +@@ -9055,7 +9369,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:9058: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:9372: 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 +@@ -9063,7 +9377,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9066 "configure" ++#line 9380 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -9082,16 +9396,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9085: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9399: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9088: \$? = $ac_status" >&5 ++ echo "$as_me:9402: \$? = $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:9405: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9094: \$? = $ac_status" >&5 ++ echo "$as_me:9408: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -9102,7 +9416,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:9105: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:9419: 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" +@@ -9151,13 +9465,13 @@ + + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' + cf_libdir="" +- echo "$as_me:9154: checking for initscr" >&5 ++ echo "$as_me:9468: 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 9160 "configure" ++#line 9474 "configure" + #include "confdefs.h" + #define initscr autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -9188,16 +9502,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9191: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9505: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9194: \$? = $ac_status" >&5 ++ echo "$as_me:9508: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9197: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9511: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9200: \$? = $ac_status" >&5 ++ echo "$as_me:9514: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_initscr=yes + else +@@ -9207,18 +9521,18 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:9210: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:9524: 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:9217: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:9531: 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 9221 "configure" ++#line 9535 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9230,25 +9544,25 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9233: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9547: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9236: \$? = $ac_status" >&5 ++ echo "$as_me:9550: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9239: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9553: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9242: \$? = $ac_status" >&5 ++ echo "$as_me:9556: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:9244: result: yes" >&5 ++ echo "$as_me:9558: 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:9251: result: no" >&5 ++echo "$as_me:9565: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -9316,11 +9630,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:9319: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:9633: 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 9323 "configure" ++#line 9637 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9332,25 +9646,25 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9335: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9649: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9338: \$? = $ac_status" >&5 ++ echo "$as_me:9652: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9341: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9655: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9344: \$? = $ac_status" >&5 ++ echo "$as_me:9658: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:9346: result: yes" >&5 ++ echo "$as_me:9660: 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:9353: result: no" >&5 ++echo "$as_me:9667: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -9365,7 +9679,7 @@ + eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" + + if test "$cf_found_library" = no ; then +- { { echo "$as_me:9368: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:9682: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -9373,7 +9687,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:9376: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:9690: 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 +@@ -9383,7 +9697,7 @@ + fi + done + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9386 "configure" ++#line 9700 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9395,23 +9709,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9398: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9712: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9401: \$? = $ac_status" >&5 ++ echo "$as_me:9715: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9404: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9718: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9407: \$? = $ac_status" >&5 ++ echo "$as_me:9721: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:9409: result: yes" >&5 ++ echo "$as_me:9723: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:9414: result: no" >&5 ++echo "$as_me:9728: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -9435,13 +9749,13 @@ + cf_have_ncuconfig=no + + if test "x${PKG_CONFIG:=none}" != xnone; then +- echo "$as_me:9438: checking pkg-config for $cf_ncuconfig_root" >&5 ++ echo "$as_me:9752: 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:9441: result: yes" >&5 ++ echo "$as_me:9755: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + +- echo "$as_me:9444: checking if the $cf_ncuconfig_root package files work" >&5 ++ echo "$as_me:9758: 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 + +@@ -9574,7 +9888,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9577 "configure" ++#line 9891 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9586,37 +9900,37 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9589: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9903: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9592: \$? = $ac_status" >&5 ++ echo "$as_me:9906: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9595: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9909: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9598: \$? = $ac_status" >&5 ++ echo "$as_me:9912: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_test_ncuconfig=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9604 "configure" ++#line 9918 "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:9611: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9925: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9614: \$? = $ac_status" >&5 ++ echo "$as_me:9928: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:9616: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9930: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9619: \$? = $ac_status" >&5 ++ echo "$as_me:9933: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_test_ncuconfig=yes + else +@@ -9790,7 +10104,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9793 "configure" ++#line 10107 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9802,37 +10116,37 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9805: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10119: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9808: \$? = $ac_status" >&5 ++ echo "$as_me:10122: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9811: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10125: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9814: \$? = $ac_status" >&5 ++ echo "$as_me:10128: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_have_ncuconfig=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9820 "configure" ++#line 10134 "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:9827: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10141: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9830: \$? = $ac_status" >&5 ++ echo "$as_me:10144: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:9832: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10146: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9835: \$? = $ac_status" >&5 ++ echo "$as_me:10149: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_have_ncuconfig=yes + else +@@ -9849,7 +10163,7 @@ + cf_have_ncuconfig=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:9852: result: $cf_have_ncuconfig" >&5 ++ echo "$as_me:10166: 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" +@@ -9865,7 +10179,7 @@ + + NCURSES_CONFIG_PKG=$cf_ncuconfig_root + +-echo "$as_me:9868: checking for terminfo header" >&5 ++echo "$as_me:10182: 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 +@@ -9883,7 +10197,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9886 "configure" ++#line 10200 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -9898,16 +10212,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:9901: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10215: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9904: \$? = $ac_status" >&5 ++ echo "$as_me:10218: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:9907: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10221: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9910: \$? = $ac_status" >&5 ++ echo "$as_me:10224: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +@@ -9923,7 +10237,7 @@ + done + + fi +-echo "$as_me:9926: result: $cf_cv_term_header" >&5 ++echo "$as_me:10240: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -9958,7 +10272,7 @@ + fi + + else +- echo "$as_me:9961: result: no" >&5 ++ echo "$as_me:10275: result: no" >&5 + echo "${ECHO_T}no" >&6 + NCURSES_CONFIG_PKG=none + fi +@@ -9974,7 +10288,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:9977: checking for $ac_word" >&5 ++echo "$as_me:10291: 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 +@@ -9989,7 +10303,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:9992: found $ac_dir/$ac_word" >&5 ++echo "$as_me:10306: found $ac_dir/$ac_word" >&5 + break + done + +@@ -9997,10 +10311,10 @@ + fi + NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG + if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:10000: result: $NCURSES_CONFIG" >&5 ++ echo "$as_me:10314: result: $NCURSES_CONFIG" >&5 + echo "${ECHO_T}$NCURSES_CONFIG" >&6 + else +- echo "$as_me:10003: result: no" >&5 ++ echo "$as_me:10317: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -10013,7 +10327,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:10016: checking for $ac_word" >&5 ++echo "$as_me:10330: 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 +@@ -10028,7 +10342,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:10031: found $ac_dir/$ac_word" >&5 ++echo "$as_me:10345: found $ac_dir/$ac_word" >&5 + break + done + +@@ -10036,10 +10350,10 @@ + fi + ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG + if test -n "$ac_ct_NCURSES_CONFIG"; then +- echo "$as_me:10039: result: $ac_ct_NCURSES_CONFIG" >&5 ++ echo "$as_me:10353: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 + else +- echo "$as_me:10042: result: no" >&5 ++ echo "$as_me:10356: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -10196,7 +10510,7 @@ + + # even with config script, some packages use no-override for curses.h + +-echo "$as_me:10199: checking if we have identified curses headers" >&5 ++echo "$as_me:10513: 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 +@@ -10208,7 +10522,7 @@ + curses.h ncurses/curses.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10211 "configure" ++#line 10525 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -10220,16 +10534,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10223: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10537: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10226: \$? = $ac_status" >&5 ++ echo "$as_me:10540: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10229: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10543: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10232: \$? = $ac_status" >&5 ++ echo "$as_me:10546: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -10240,11 +10554,11 @@ + done + + fi +-echo "$as_me:10243: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:10557: 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:10247: error: No curses header-files found" >&5 ++ { { echo "$as_me:10561: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -10254,23 +10568,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:10257: checking for $ac_header" >&5 ++echo "$as_me:10571: 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 10263 "configure" ++#line 10577 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:10267: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:10581: \"$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:10273: \$? = $ac_status" >&5 ++ echo "$as_me:10587: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -10289,7 +10603,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:10292: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:10606: 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 10348 "configure" ++#line 10662 "configure" + #include "confdefs.h" + #include + int +@@ -10357,16 +10671,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10360: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10674: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10363: \$? = $ac_status" >&5 ++ echo "$as_me:10677: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10366: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10680: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10369: \$? = $ac_status" >&5 ++ echo "$as_me:10683: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -10383,7 +10697,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}:10386: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:10700: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -10402,7 +10716,7 @@ + + } + +-echo "$as_me:10405: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:10719: 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 +@@ -10414,7 +10728,7 @@ + do + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10417 "configure" ++#line 10731 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -10438,16 +10752,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10441: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10755: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10444: \$? = $ac_status" >&5 ++ echo "$as_me:10758: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10447: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10761: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10450: \$? = $ac_status" >&5 ++ echo "$as_me:10764: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -10462,14 +10776,14 @@ + done + + fi +-echo "$as_me:10465: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:10779: 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:10472: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:10786: 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 +@@ -10590,7 +10904,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10593 "configure" ++#line 10907 "configure" + #include "confdefs.h" + #include + int +@@ -10602,16 +10916,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10605: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10919: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10608: \$? = $ac_status" >&5 ++ echo "$as_me:10922: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10611: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10925: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10614: \$? = $ac_status" >&5 ++ echo "$as_me:10928: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -10628,7 +10942,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}:10631: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:10945: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -10651,7 +10965,7 @@ + do + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10654 "configure" ++#line 10968 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -10675,16 +10989,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10678: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10992: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10681: \$? = $ac_status" >&5 ++ echo "$as_me:10995: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10684: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10998: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10687: \$? = $ac_status" >&5 ++ echo "$as_me:11001: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -10705,12 +11019,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10708: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11022: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:10713: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:11027: 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%/[^/]*$%%'` +@@ -10746,7 +11060,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10749 "configure" ++#line 11063 "configure" + #include "confdefs.h" + #include + int +@@ -10758,16 +11072,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10761: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11075: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10764: \$? = $ac_status" >&5 ++ echo "$as_me:11078: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10767: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11081: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10770: \$? = $ac_status" >&5 ++ echo "$as_me:11084: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -10784,7 +11098,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}:10787: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:11101: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -10832,7 +11146,7 @@ + ;; + esac + +-echo "$as_me:10835: checking for terminfo header" >&5 ++echo "$as_me:11149: 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 +@@ -10850,7 +11164,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10853 "configure" ++#line 11167 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -10865,16 +11179,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10868: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11182: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10871: \$? = $ac_status" >&5 ++ echo "$as_me:11185: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10874: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11188: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10877: \$? = $ac_status" >&5 ++ echo "$as_me:11191: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +@@ -10890,7 +11204,7 @@ + done + + fi +-echo "$as_me:10893: result: $cf_cv_term_header" >&5 ++echo "$as_me:11207: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -10928,7 +11242,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:10931: checking for ncurses version" >&5 ++echo "$as_me:11245: 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 +@@ -10954,10 +11268,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:10957: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:11271: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:10960: \$? = $ac_status" >&5 ++ echo "$as_me:11274: \$? = $ac_status" >&5 + (exit "$ac_status"); } + if test -f conftest.out ; then + cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` +@@ -10967,7 +11281,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10970 "configure" ++#line 11284 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -10994,15 +11308,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:10997: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11311: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11000: \$? = $ac_status" >&5 ++ echo "$as_me:11314: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:11002: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11316: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11005: \$? = $ac_status" >&5 ++ echo "$as_me:11319: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -11016,7 +11330,7 @@ + rm -f "$cf_tempfile" + + fi +-echo "$as_me:11019: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:11333: result: $cf_cv_ncurses_version" >&5 + echo "${ECHO_T}$cf_cv_ncurses_version" >&6 + test "$cf_cv_ncurses_version" = no || + cat >>confdefs.h <<\EOF +@@ -11029,7 +11343,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:11032: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:11346: 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 +@@ -11037,7 +11351,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11040 "configure" ++#line 11354 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11056,16 +11370,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11059: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11373: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11062: \$? = $ac_status" >&5 ++ echo "$as_me:11376: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11065: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11379: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11068: \$? = $ac_status" >&5 ++ echo "$as_me:11382: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -11076,10 +11390,10 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11079: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:11393: 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:11082: checking for initscr in -lgpm" >&5 ++ echo "$as_me:11396: 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 +@@ -11087,7 +11401,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11090 "configure" ++#line 11404 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11106,16 +11420,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11109: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11423: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11112: \$? = $ac_status" >&5 ++ echo "$as_me:11426: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11115: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11429: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11118: \$? = $ac_status" >&5 ++ echo "$as_me:11432: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -11126,7 +11440,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11129: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:11443: 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" +@@ -11141,7 +11455,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:11144: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:11458: 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 +@@ -11149,7 +11463,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11152 "configure" ++#line 11466 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11168,16 +11482,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11171: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11485: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11174: \$? = $ac_status" >&5 ++ echo "$as_me:11488: \$? = $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:11491: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11180: \$? = $ac_status" >&5 ++ echo "$as_me:11494: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -11188,7 +11502,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11191: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:11505: 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" +@@ -11237,13 +11551,13 @@ + + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' + cf_libdir="" +- echo "$as_me:11240: checking for initscr" >&5 ++ echo "$as_me:11554: 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 11246 "configure" ++#line 11560 "configure" + #include "confdefs.h" + #define initscr autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -11274,16 +11588,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11277: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11591: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11280: \$? = $ac_status" >&5 ++ echo "$as_me:11594: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11283: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11597: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11286: \$? = $ac_status" >&5 ++ echo "$as_me:11600: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_initscr=yes + else +@@ -11293,18 +11607,18 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:11296: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:11610: 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:11303: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:11617: 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 11307 "configure" ++#line 11621 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -11316,25 +11630,25 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11319: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11633: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11322: \$? = $ac_status" >&5 ++ echo "$as_me:11636: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11325: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11639: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11328: \$? = $ac_status" >&5 ++ echo "$as_me:11642: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:11330: result: yes" >&5 ++ echo "$as_me:11644: 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:11337: result: no" >&5 ++echo "$as_me:11651: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -11402,11 +11716,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:11405: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:11719: 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 11409 "configure" ++#line 11723 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -11418,25 +11732,25 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11421: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11735: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11424: \$? = $ac_status" >&5 ++ echo "$as_me:11738: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11427: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11741: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11430: \$? = $ac_status" >&5 ++ echo "$as_me:11744: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:11432: result: yes" >&5 ++ echo "$as_me:11746: 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:11439: result: no" >&5 ++echo "$as_me:11753: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -11451,7 +11765,7 @@ + eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" + + if test "$cf_found_library" = no ; then +- { { echo "$as_me:11454: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:11768: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -11459,7 +11773,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:11462: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:11776: 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 +@@ -11469,7 +11783,7 @@ + fi + done + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11472 "configure" ++#line 11786 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -11481,23 +11795,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11484: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11798: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11487: \$? = $ac_status" >&5 ++ echo "$as_me:11801: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11490: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11804: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11493: \$? = $ac_status" >&5 ++ echo "$as_me:11807: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:11495: result: yes" >&5 ++ echo "$as_me:11809: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:11500: result: no" >&5 ++echo "$as_me:11814: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -11550,10 +11864,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:11553: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:11867: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:11556: \$? = $ac_status" >&5 ++ echo "$as_me:11870: \$? = $ac_status" >&5 + (exit "$ac_status"); } + if test -f conftest.out ; then + cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ ][ ]*//" conftest.out` +@@ -11571,10 +11885,10 @@ + + cf_cv_timestamp=`date` + +-echo "$as_me:11574: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 ++echo "$as_me:11888: 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:11577: checking if you want to have a library-prefix" >&5 ++echo "$as_me:11891: 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. +@@ -11584,7 +11898,7 @@ + else + with_lib_prefix=auto + fi; +-echo "$as_me:11587: result: $with_lib_prefix" >&5 ++echo "$as_me:11901: result: $with_lib_prefix" >&5 + echo "${ECHO_T}$with_lib_prefix" >&6 + + if test "$with_lib_prefix" = auto +@@ -11622,7 +11936,7 @@ + test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT='' + fi + +-echo "$as_me:11625: checking for default loader flags" >&5 ++echo "$as_me:11939: 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='' ;; +@@ -11630,13 +11944,13 @@ + (profile) LD_MODEL='-pg';; + (shared) LD_MODEL='' ;; + esac +-echo "$as_me:11633: result: $LD_MODEL" >&5 ++echo "$as_me:11947: 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:11639: checking for an rpath option" >&5 ++ echo "$as_me:11953: checking for an rpath option" >&5 + echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 + case "$cf_cv_system_name" in + (irix*) +@@ -11667,12 +11981,12 @@ + (*) + ;; + esac +- echo "$as_me:11670: result: $LD_RPATH_OPT" >&5 ++ echo "$as_me:11984: result: $LD_RPATH_OPT" >&5 + echo "${ECHO_T}$LD_RPATH_OPT" >&6 + + case "x$LD_RPATH_OPT" in + (x-R*) +- echo "$as_me:11675: checking if we need a space after rpath option" >&5 ++ echo "$as_me:11989: 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" + +@@ -11693,7 +12007,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11696 "configure" ++#line 12010 "configure" + #include "confdefs.h" + + int +@@ -11705,16 +12019,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11708: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12022: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11711: \$? = $ac_status" >&5 ++ echo "$as_me:12025: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11714: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12028: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11717: \$? = $ac_status" >&5 ++ echo "$as_me:12031: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_rpath_space=no + else +@@ -11724,7 +12038,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save_LIBS" +- echo "$as_me:11727: result: $cf_rpath_space" >&5 ++ echo "$as_me:12041: result: $cf_rpath_space" >&5 + echo "${ECHO_T}$cf_rpath_space" >&6 + test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " + ;; +@@ -11746,7 +12060,7 @@ + cf_ld_rpath_opt= + test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" + +- echo "$as_me:11749: checking whether to use release or ABI version in shared library file names" >&5 ++ echo "$as_me:12063: checking whether to use release or ABI version in shared library file names" >&5 + echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6 + + # Check whether --with-shlib-version or --without-shlib-version was given. +@@ -11761,9 +12075,9 @@ + cf_cv_shlib_version=$withval + ;; + (*) +- echo "$as_me:11764: result: $withval" >&5 ++ echo "$as_me:12078: result: $withval" >&5 + echo "${ECHO_T}$withval" >&6 +- { { echo "$as_me:11766: error: option value must be one of: rel, abi, or auto" >&5 ++ { { echo "$as_me:12080: 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; }; } + ;; +@@ -11772,7 +12086,7 @@ + else + cf_cv_shlib_version=auto + fi; +- echo "$as_me:11775: result: $cf_cv_shlib_version" >&5 ++ echo "$as_me:12089: result: $cf_cv_shlib_version" >&5 + echo "${ECHO_T}$cf_cv_shlib_version" >&6 + + cf_cv_rm_so_locs=no +@@ -11795,14 +12109,14 @@ + + if test "$cf_try_fPIC" = yes + then +- echo "$as_me:11798: checking which $CC option to use" >&5 ++ echo "$as_me:12112: 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 11805 "configure" ++#line 12119 "configure" + #include "confdefs.h" + #include + int +@@ -11814,16 +12128,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11817: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12131: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11820: \$? = $ac_status" >&5 ++ echo "$as_me:12134: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11823: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12137: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11826: \$? = $ac_status" >&5 ++ echo "$as_me:12140: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -11832,7 +12146,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + done +- echo "$as_me:11835: result: $CC_SHARED_OPTS" >&5 ++ echo "$as_me:12149: result: $CC_SHARED_OPTS" >&5 + echo "${ECHO_T}$CC_SHARED_OPTS" >&6 + CFLAGS="$cf_save_CFLAGS" + fi +@@ -11903,7 +12217,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:11906: checking if ld -search_paths_first works" >&5 ++ echo "$as_me:12220: 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 +@@ -11912,7 +12226,7 @@ + cf_save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11915 "configure" ++#line 12229 "configure" + #include "confdefs.h" + + int +@@ -11924,16 +12238,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11927: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12241: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11930: \$? = $ac_status" >&5 ++ echo "$as_me:12244: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11933: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12247: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11936: \$? = $ac_status" >&5 ++ echo "$as_me:12250: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ldflags_search_paths_first=yes + else +@@ -11944,7 +12258,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LDFLAGS=$cf_save_LDFLAGS + fi +-echo "$as_me:11947: result: $cf_cv_ldflags_search_paths_first" >&5 ++echo "$as_me:12261: 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" +@@ -12294,7 +12608,7 @@ + do + CFLAGS="$cf_shared_opts $cf_save_CFLAGS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12297 "configure" ++#line 12611 "configure" + #include "confdefs.h" + #include + int +@@ -12306,16 +12620,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12309: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12623: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12312: \$? = $ac_status" >&5 ++ echo "$as_me:12626: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12315: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12629: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12318: \$? = $ac_status" >&5 ++ echo "$as_me:12632: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -12352,7 +12666,7 @@ + test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes + ;; + (*) +- { echo "$as_me:12355: WARNING: ignored --with-shlib-version" >&5 ++ { echo "$as_me:12669: WARNING: ignored --with-shlib-version" >&5 + echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} + ;; + esac +@@ -12362,7 +12676,7 @@ + if test -n "$cf_try_cflags" + then + cat > conftest.$ac_ext < + int main(int argc, char *argv[]) + { +@@ -12374,18 +12688,18 @@ + for cf_opt in $cf_try_cflags + do + CFLAGS="$cf_save_CFLAGS -$cf_opt" +- echo "$as_me:12377: checking if CFLAGS option -$cf_opt works" >&5 ++ echo "$as_me:12691: 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:12379: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:12693: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12382: \$? = $ac_status" >&5 ++ echo "$as_me:12696: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- echo "$as_me:12384: result: yes" >&5 ++ echo "$as_me:12698: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + cf_save_CFLAGS="$CFLAGS" + else +- echo "$as_me:12388: result: no" >&5 ++ echo "$as_me:12702: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + done +@@ -12400,17 +12714,17 @@ + + test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 + +-echo "${as_me:-configure}:12403: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 ++echo "${as_me:-configure}:12717: 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}:12407: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ++echo "${as_me:-configure}:12721: 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:12413: checking if you want to link sample programs with rpath option" >&5 ++ echo "$as_me:12727: 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. +@@ -12420,7 +12734,7 @@ + else + with_rpath_link=yes + fi; +- echo "$as_me:12423: result: $with_rpath_link" >&5 ++ echo "$as_me:12737: result: $with_rpath_link" >&5 + echo "${ECHO_T}$with_rpath_link" >&6 + if test "$with_rpath_link" = no + then +@@ -12433,7 +12747,7 @@ + + ### use option --enable-broken-linker to force on use of broken-linker support + +-echo "$as_me:12436: checking if you want broken-linker support code" >&5 ++echo "$as_me:12750: 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. +@@ -12443,7 +12757,7 @@ + else + with_broken_linker=no + fi; +-echo "$as_me:12446: result: $with_broken_linker" >&5 ++echo "$as_me:12760: result: $with_broken_linker" >&5 + echo "${ECHO_T}$with_broken_linker" >&6 + + : "${BROKEN_LINKER:=0}" +@@ -12458,14 +12772,14 @@ + + # Check to define _XOPEN_SOURCE "automatically" + +-echo "$as_me:12461: checking if the POSIX test-macros are already defined" >&5 ++echo "$as_me:12775: 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 12468 "configure" ++#line 12782 "configure" + #include "confdefs.h" + #include + int +@@ -12484,16 +12798,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12487: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12801: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12490: \$? = $ac_status" >&5 ++ echo "$as_me:12804: \$? = $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:12807: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12496: \$? = $ac_status" >&5 ++ echo "$as_me:12810: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_visible=no + else +@@ -12504,7 +12818,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:12507: result: $cf_cv_posix_visible" >&5 ++echo "$as_me:12821: result: $cf_cv_posix_visible" >&5 + echo "${ECHO_T}$cf_cv_posix_visible" >&6 + + if test "$cf_cv_posix_visible" = no; then +@@ -12546,14 +12860,14 @@ + + cf_gnu_xopen_source=$cf_XOPEN_SOURCE + +-echo "$as_me:12549: checking if this is the GNU C library" >&5 ++echo "$as_me:12863: 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 12556 "configure" ++#line 12870 "configure" + #include "confdefs.h" + #include + int +@@ -12572,16 +12886,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12575: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12889: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12578: \$? = $ac_status" >&5 ++ echo "$as_me:12892: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12581: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12895: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12584: \$? = $ac_status" >&5 ++ echo "$as_me:12898: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_library=yes + else +@@ -12592,7 +12906,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:12595: result: $cf_cv_gnu_library" >&5 ++echo "$as_me:12909: result: $cf_cv_gnu_library" >&5 + echo "${ECHO_T}$cf_cv_gnu_library" >&6 + + if test x$cf_cv_gnu_library = xyes; then +@@ -12600,7 +12914,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:12603: checking if _DEFAULT_SOURCE can be used as a basis" >&5 ++ echo "$as_me:12917: 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 +@@ -12612,7 +12926,7 @@ + CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12615 "configure" ++#line 12929 "configure" + #include "confdefs.h" + #include + int +@@ -12631,16 +12945,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12634: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12948: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12637: \$? = $ac_status" >&5 ++ echo "$as_me:12951: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12640: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12954: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12643: \$? = $ac_status" >&5 ++ echo "$as_me:12957: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_library_219=yes + else +@@ -12652,12 +12966,12 @@ + CPPFLAGS="$cf_save" + + fi +-echo "$as_me:12655: result: $cf_cv_gnu_library_219" >&5 ++echo "$as_me:12969: 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:12660: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 ++ echo "$as_me:12974: 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 +@@ -12762,7 +13076,7 @@ + fi + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12765 "configure" ++#line 13079 "configure" + #include "confdefs.h" + + #include +@@ -12782,16 +13096,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12785: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13099: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12788: \$? = $ac_status" >&5 ++ echo "$as_me:13102: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12791: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13105: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12794: \$? = $ac_status" >&5 ++ echo "$as_me:13108: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_dftsrc_219=yes + else +@@ -12802,7 +13116,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:12805: result: $cf_cv_gnu_dftsrc_219" >&5 ++echo "$as_me:13119: 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 +@@ -12811,14 +13125,14 @@ + + if test "x$cf_cv_gnu_dftsrc_219" != xyes; then + +- echo "$as_me:12814: checking if we must define _GNU_SOURCE" >&5 ++ echo "$as_me:13128: 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 12821 "configure" ++#line 13135 "configure" + #include "confdefs.h" + #include + int +@@ -12833,16 +13147,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12836: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13150: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12839: \$? = $ac_status" >&5 ++ echo "$as_me:13153: \$? = $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:13156: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12845: \$? = $ac_status" >&5 ++ echo "$as_me:13159: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_source=no + else +@@ -12949,7 +13263,7 @@ + fi + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12952 "configure" ++#line 13266 "configure" + #include "confdefs.h" + #include + int +@@ -12964,16 +13278,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12967: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13281: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12970: \$? = $ac_status" >&5 ++ echo "$as_me:13284: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12973: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13287: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12976: \$? = $ac_status" >&5 ++ echo "$as_me:13290: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_source=no + else +@@ -12988,12 +13302,12 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:12991: result: $cf_cv_gnu_source" >&5 ++echo "$as_me:13305: 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:12996: checking if we should also define _DEFAULT_SOURCE" >&5 ++ echo "$as_me:13310: 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 +@@ -13003,7 +13317,7 @@ + CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13006 "configure" ++#line 13320 "configure" + #include "confdefs.h" + #include + int +@@ -13018,16 +13332,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13021: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13335: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13024: \$? = $ac_status" >&5 ++ echo "$as_me:13338: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13027: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13341: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13030: \$? = $ac_status" >&5 ++ echo "$as_me:13344: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_default_source=no + else +@@ -13038,7 +13352,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:13041: result: $cf_cv_default_source" >&5 ++echo "$as_me:13355: result: $cf_cv_default_source" >&5 + echo "${ECHO_T}$cf_cv_default_source" >&6 + if test "$cf_cv_default_source" = yes + then +@@ -13075,16 +13389,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:13078: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:13392: 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}:13084: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:13398: testing if the symbol is already defined go no further ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13087 "configure" ++#line 13401 "configure" + #include "confdefs.h" + #include + int +@@ -13099,16 +13413,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13102: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13416: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13105: \$? = $ac_status" >&5 ++ echo "$as_me:13419: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13108: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13422: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13111: \$? = $ac_status" >&5 ++ echo "$as_me:13425: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_c_source=no + else +@@ -13129,7 +13443,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13132 "configure" ++#line 13446 "configure" + #include "confdefs.h" + #include + int +@@ -13144,16 +13458,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13147: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13461: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13150: \$? = $ac_status" >&5 ++ echo "$as_me:13464: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13153: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13467: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13156: \$? = $ac_status" >&5 ++ echo "$as_me:13470: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -13164,7 +13478,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + +-echo "${as_me:-configure}:13167: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:13481: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" +@@ -13172,10 +13486,10 @@ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +-echo "${as_me:-configure}:13175: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:13489: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13178 "configure" ++#line 13492 "configure" + #include "confdefs.h" + #include + int +@@ -13190,16 +13504,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13193: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13507: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13196: \$? = $ac_status" >&5 ++ echo "$as_me:13510: \$? = $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:13513: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13202: \$? = $ac_status" >&5 ++ echo "$as_me:13516: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -13215,7 +13529,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:13218: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:13532: 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 +@@ -13332,7 +13646,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:13335: WARNING: this system does not provide usable locale support" >&5 ++ { echo "$as_me:13649: 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 +@@ -13364,14 +13678,14 @@ + ;; + (*) + +-echo "$as_me:13367: checking if we should define _XOPEN_SOURCE" >&5 ++echo "$as_me:13681: 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 13374 "configure" ++#line 13688 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -13389,16 +13703,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13392: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13706: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13395: \$? = $ac_status" >&5 ++ echo "$as_me:13709: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13398: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13712: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13401: \$? = $ac_status" >&5 ++ echo "$as_me:13715: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -13410,7 +13724,7 @@ + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13413 "configure" ++#line 13727 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -13428,16 +13742,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13431: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13745: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13434: \$? = $ac_status" >&5 ++ echo "$as_me:13748: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13437: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13751: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13440: \$? = $ac_status" >&5 ++ echo "$as_me:13754: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -13452,7 +13766,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:13455: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:13769: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 + + if test "$cf_cv_xopen_source" != no ; then +@@ -13612,16 +13926,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:13615: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:13929: 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}:13621: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:13935: testing if the symbol is already defined go no further ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13624 "configure" ++#line 13938 "configure" + #include "confdefs.h" + #include + int +@@ -13636,16 +13950,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13639: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13953: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13642: \$? = $ac_status" >&5 ++ echo "$as_me:13956: \$? = $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:13959: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13648: \$? = $ac_status" >&5 ++ echo "$as_me:13962: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_c_source=no + else +@@ -13666,7 +13980,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13669 "configure" ++#line 13983 "configure" + #include "confdefs.h" + #include + int +@@ -13681,16 +13995,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13684: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13998: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13687: \$? = $ac_status" >&5 ++ echo "$as_me:14001: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13690: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14004: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13693: \$? = $ac_status" >&5 ++ echo "$as_me:14007: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -13701,7 +14015,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + +-echo "${as_me:-configure}:13704: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:14018: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" +@@ -13709,10 +14023,10 @@ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +-echo "${as_me:-configure}:13712: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:14026: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13715 "configure" ++#line 14029 "configure" + #include "confdefs.h" + #include + int +@@ -13727,16 +14041,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13730: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14044: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13733: \$? = $ac_status" >&5 ++ echo "$as_me:14047: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13736: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14050: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13739: \$? = $ac_status" >&5 ++ echo "$as_me:14053: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -13752,7 +14066,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:13755: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:14069: 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 +@@ -13865,10 +14179,10 @@ + if test "$cf_cv_xopen_source" = no ; then + test -n "$verbose" && echo " checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6 + +-echo "${as_me:-configure}:13868: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:14182: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13871 "configure" ++#line 14185 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -13886,23 +14200,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13889: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14203: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13892: \$? = $ac_status" >&5 ++ echo "$as_me:14206: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13895: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14209: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13898: \$? = $ac_status" >&5 ++ echo "$as_me:14212: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + +- { echo "$as_me:13905: WARNING: _POSIX_C_SOURCE definition is not usable" >&5 ++ { echo "$as_me:14219: WARNING: _POSIX_C_SOURCE definition is not usable" >&5 + echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;} + CPPFLAGS="$cf_save_xopen_cppflags" + fi +@@ -13925,7 +14239,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}:13928: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:14242: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 + + CFLAGS="$cf_old_cflag" + done +@@ -13937,7 +14251,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}:13940: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:14254: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 + + CPPFLAGS="$cf_old_cflag" + done +@@ -14025,7 +14339,7 @@ + if test -n "$cf_new_cflags" ; then + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 + +-echo "${as_me:-configure}:14028: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 ++echo "${as_me:-configure}:14342: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" +@@ -14035,7 +14349,7 @@ + if test -n "$cf_new_cppflags" ; then + test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 + +-echo "${as_me:-configure}:14038: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 ++echo "${as_me:-configure}:14352: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +@@ -14045,7 +14359,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}:14048: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 ++echo "${as_me:-configure}:14362: 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" +@@ -14057,10 +14371,10 @@ + fi + + if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then +- echo "$as_me:14060: checking if _XOPEN_SOURCE really is set" >&5 ++ echo "$as_me:14374: 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 14063 "configure" ++#line 14377 "configure" + #include "confdefs.h" + #include + int +@@ -14075,16 +14389,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14078: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14392: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14081: \$? = $ac_status" >&5 ++ echo "$as_me:14395: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14084: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14398: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14087: \$? = $ac_status" >&5 ++ echo "$as_me:14401: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_XOPEN_SOURCE_set=yes + else +@@ -14093,12 +14407,12 @@ + cf_XOPEN_SOURCE_set=no + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:14096: result: $cf_XOPEN_SOURCE_set" >&5 ++ echo "$as_me:14410: 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 14101 "configure" ++#line 14415 "configure" + #include "confdefs.h" + #include + int +@@ -14113,16 +14427,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14116: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14430: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14119: \$? = $ac_status" >&5 ++ echo "$as_me:14433: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14122: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14436: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14125: \$? = $ac_status" >&5 ++ echo "$as_me:14439: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_XOPEN_SOURCE_set_ok=yes + else +@@ -14133,19 +14447,19 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + if test "$cf_XOPEN_SOURCE_set_ok" = no + then +- { echo "$as_me:14136: WARNING: _XOPEN_SOURCE is lower than requested" >&5 ++ { echo "$as_me:14450: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} + fi + else + +-echo "$as_me:14141: checking if we should define _XOPEN_SOURCE" >&5 ++echo "$as_me:14455: 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 14148 "configure" ++#line 14462 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -14163,16 +14477,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14166: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14480: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14169: \$? = $ac_status" >&5 ++ echo "$as_me:14483: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14172: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14486: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14175: \$? = $ac_status" >&5 ++ echo "$as_me:14489: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -14184,7 +14498,7 @@ + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14187 "configure" ++#line 14501 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -14202,16 +14516,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14205: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14519: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14208: \$? = $ac_status" >&5 ++ echo "$as_me:14522: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14211: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14525: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14214: \$? = $ac_status" >&5 ++ echo "$as_me:14528: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -14226,7 +14540,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:14229: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:14543: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 + + if test "$cf_cv_xopen_source" != no ; then +@@ -14373,13 +14687,13 @@ + fi + fi # cf_cv_posix_visible + +-echo "$as_me:14376: checking for ANSI C header files" >&5 ++echo "$as_me:14690: 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 14382 "configure" ++#line 14696 "configure" + #include "confdefs.h" + #include + #include +@@ -14387,13 +14701,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:14390: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:14704: \"$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:14396: \$? = $ac_status" >&5 ++ echo "$as_me:14710: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -14415,7 +14729,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 14418 "configure" ++#line 14732 "configure" + #include "confdefs.h" + #include + +@@ -14433,7 +14747,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 14436 "configure" ++#line 14750 "configure" + #include "confdefs.h" + #include + +@@ -14454,7 +14768,7 @@ + : + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14457 "configure" ++#line 14771 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -14480,15 +14794,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:14483: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14797: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14486: \$? = $ac_status" >&5 ++ echo "$as_me:14800: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:14488: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14802: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14491: \$? = $ac_status" >&5 ++ echo "$as_me:14805: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -14501,7 +14815,7 @@ + fi + fi + fi +-echo "$as_me:14504: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:14818: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -14517,28 +14831,28 @@ + inttypes.h stdint.h unistd.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:14520: checking for $ac_header" >&5 ++echo "$as_me:14834: 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 14526 "configure" ++#line 14840 "configure" + #include "confdefs.h" + $ac_includes_default + #include <$ac_header> + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14532: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14846: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14535: \$? = $ac_status" >&5 ++ echo "$as_me:14849: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14538: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14852: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14541: \$? = $ac_status" >&5 ++ echo "$as_me:14855: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Header=yes" + else +@@ -14548,7 +14862,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:14551: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:14865: 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:14875: checking whether exit is declared" >&5 + echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6 + if test "${ac_cv_have_decl_exit+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14567 "configure" ++#line 14881 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14579,16 +14893,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14582: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14896: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14585: \$? = $ac_status" >&5 ++ echo "$as_me:14899: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14588: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14902: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14591: \$? = $ac_status" >&5 ++ echo "$as_me:14905: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_have_decl_exit=yes + else +@@ -14598,7 +14912,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:14601: result: $ac_cv_have_decl_exit" >&5 ++echo "$as_me:14915: result: $ac_cv_have_decl_exit" >&5 + echo "${ECHO_T}$ac_cv_have_decl_exit" >&6 + + # Check whether --enable-largefile or --disable-largefile was given. +@@ -14608,7 +14922,7 @@ + fi; + if test "$enable_largefile" != no; then + +- echo "$as_me:14611: checking for special C compiler options needed for large files" >&5 ++ echo "$as_me:14925: 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 +@@ -14620,7 +14934,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 14623 "configure" ++#line 14937 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -14640,16 +14954,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14643: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14957: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14646: \$? = $ac_status" >&5 ++ echo "$as_me:14960: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14649: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14963: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14652: \$? = $ac_status" >&5 ++ echo "$as_me:14966: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -14659,16 +14973,16 @@ + rm -f "conftest.$ac_objext" + CC="$CC -n32" + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14662: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14976: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14665: \$? = $ac_status" >&5 ++ echo "$as_me:14979: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14668: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14982: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14671: \$? = $ac_status" >&5 ++ echo "$as_me:14985: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_largefile_CC=' -n32'; break + else +@@ -14682,13 +14996,13 @@ + rm -f "conftest.$ac_ext" + fi + fi +-echo "$as_me:14685: result: $ac_cv_sys_largefile_CC" >&5 ++echo "$as_me:14999: 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:14691: checking for _FILE_OFFSET_BITS value needed for large files" >&5 ++ echo "$as_me:15005: 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 +@@ -14696,7 +15010,7 @@ + while :; do + ac_cv_sys_file_offset_bits=no + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14699 "configure" ++#line 15013 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -14716,16 +15030,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14719: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15033: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14722: \$? = $ac_status" >&5 ++ echo "$as_me:15036: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14725: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15039: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14728: \$? = $ac_status" >&5 ++ echo "$as_me:15042: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -14734,7 +15048,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14737 "configure" ++#line 15051 "configure" + #include "confdefs.h" + #define _FILE_OFFSET_BITS 64 + #include +@@ -14755,16 +15069,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14758: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15072: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14761: \$? = $ac_status" >&5 ++ echo "$as_me:15075: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14764: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15078: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14767: \$? = $ac_status" >&5 ++ echo "$as_me:15081: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_file_offset_bits=64; break + else +@@ -14775,7 +15089,7 @@ + break + done + fi +-echo "$as_me:14778: result: $ac_cv_sys_file_offset_bits" >&5 ++echo "$as_me:15092: 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 + +@@ -14785,7 +15099,7 @@ + + fi + rm -rf conftest* +- echo "$as_me:14788: checking for _LARGE_FILES value needed for large files" >&5 ++ echo "$as_me:15102: 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 +@@ -14793,7 +15107,7 @@ + while :; do + ac_cv_sys_large_files=no + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14796 "configure" ++#line 15110 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -14813,16 +15127,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14816: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15130: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14819: \$? = $ac_status" >&5 ++ echo "$as_me:15133: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14822: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15136: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14825: \$? = $ac_status" >&5 ++ echo "$as_me:15139: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -14831,7 +15145,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14834 "configure" ++#line 15148 "configure" + #include "confdefs.h" + #define _LARGE_FILES 1 + #include +@@ -14852,16 +15166,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14855: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15169: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14858: \$? = $ac_status" >&5 ++ echo "$as_me:15172: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14861: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15175: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14864: \$? = $ac_status" >&5 ++ echo "$as_me:15178: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_large_files=1; break + else +@@ -14872,7 +15186,7 @@ + break + done + fi +-echo "$as_me:14875: result: $ac_cv_sys_large_files" >&5 ++echo "$as_me:15189: 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 + +@@ -14885,7 +15199,7 @@ + fi + + if test "$enable_largefile" != no ; then +- echo "$as_me:14888: checking for _LARGEFILE_SOURCE value needed for large files" >&5 ++ echo "$as_me:15202: 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 +@@ -14893,7 +15207,7 @@ + while :; do + ac_cv_sys_largefile_source=no + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14896 "configure" ++#line 15210 "configure" + #include "confdefs.h" + #include + #include +@@ -14908,16 +15222,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14911: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15225: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14914: \$? = $ac_status" >&5 ++ echo "$as_me:15228: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14917: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15231: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14920: \$? = $ac_status" >&5 ++ echo "$as_me:15234: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -14926,7 +15240,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14929 "configure" ++#line 15243 "configure" + #include "confdefs.h" + #define _LARGEFILE_SOURCE 1 + #include +@@ -14942,16 +15256,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14945: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15259: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14948: \$? = $ac_status" >&5 ++ echo "$as_me:15262: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14951: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15265: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14954: \$? = $ac_status" >&5 ++ echo "$as_me:15268: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_largefile_source=1; break + else +@@ -14962,7 +15276,7 @@ + break + done + fi +-echo "$as_me:14965: result: $ac_cv_sys_largefile_source" >&5 ++echo "$as_me:15279: 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 + +@@ -14976,13 +15290,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:14979: checking for fseeko" >&5 ++echo "$as_me:15293: 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 14985 "configure" ++#line 15299 "configure" + #include "confdefs.h" + #include + #include +@@ -14996,16 +15310,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:14999: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15313: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15002: \$? = $ac_status" >&5 ++ echo "$as_me:15316: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:15005: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15319: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15008: \$? = $ac_status" >&5 ++ echo "$as_me:15322: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_fseeko=yes + else +@@ -15015,7 +15329,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:15018: result: $ac_cv_func_fseeko" >&5 ++echo "$as_me:15332: result: $ac_cv_func_fseeko" >&5 + echo "${ECHO_T}$ac_cv_func_fseeko" >&6 + if test $ac_cv_func_fseeko = yes; then + +@@ -15054,14 +15368,14 @@ + + fi + +- echo "$as_me:15057: checking whether to use struct dirent64" >&5 ++ echo "$as_me:15371: 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 15064 "configure" ++#line 15378 "configure" + #include "confdefs.h" + + #pragma GCC diagnostic error "-Wincompatible-pointer-types" +@@ -15088,16 +15402,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:15091: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15405: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15094: \$? = $ac_status" >&5 ++ echo "$as_me:15408: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:15097: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15411: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15100: \$? = $ac_status" >&5 ++ echo "$as_me:15414: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_struct_dirent64=yes + else +@@ -15108,7 +15422,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:15111: result: $cf_cv_struct_dirent64" >&5 ++echo "$as_me:15425: result: $cf_cv_struct_dirent64" >&5 + echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 + test "$cf_cv_struct_dirent64" = yes && + cat >>confdefs.h <<\EOF +@@ -15118,7 +15432,7 @@ + fi + + ### Enable compiling-in rcs id's +-echo "$as_me:15121: checking if RCS identifiers should be compiled-in" >&5 ++echo "$as_me:15435: 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. +@@ -15128,7 +15442,7 @@ + else + with_rcs_ids=no + fi; +-echo "$as_me:15131: result: $with_rcs_ids" >&5 ++echo "$as_me:15445: result: $with_rcs_ids" >&5 + echo "${ECHO_T}$with_rcs_ids" >&6 + test "$with_rcs_ids" = yes && + cat >>confdefs.h <<\EOF +@@ -15138,7 +15452,7 @@ + ############################################################################### + + ### Note that some functions (such as const) are normally disabled anyway. +-echo "$as_me:15141: checking if you want to build with function extensions" >&5 ++echo "$as_me:15455: 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. +@@ -15148,7 +15462,7 @@ + else + with_ext_funcs=yes + fi; +-echo "$as_me:15151: result: $with_ext_funcs" >&5 ++echo "$as_me:15465: result: $with_ext_funcs" >&5 + echo "${ECHO_T}$with_ext_funcs" >&6 + if test "$with_ext_funcs" = yes ; then + NCURSES_EXT_FUNCS=1 +@@ -15166,7 +15480,7 @@ + fi + + ### use option --enable-const to turn on use of const beyond that in XSI. +-echo "$as_me:15169: checking for extended use of const keyword" >&5 ++echo "$as_me:15483: 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. +@@ -15176,7 +15490,7 @@ + else + with_ext_const=no + fi; +-echo "$as_me:15179: result: $with_ext_const" >&5 ++echo "$as_me:15493: result: $with_ext_const" >&5 + echo "${ECHO_T}$with_ext_const" >&6 + NCURSES_CONST='/*nothing*/' + if test "$with_ext_const" = yes ; then +@@ -15186,7 +15500,7 @@ + ############################################################################### + # These options are relatively safe to experiment with. + +-echo "$as_me:15189: checking if you want all development code" >&5 ++echo "$as_me:15503: 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. +@@ -15196,7 +15510,7 @@ + else + with_develop=no + fi; +-echo "$as_me:15199: result: $with_develop" >&5 ++echo "$as_me:15513: result: $with_develop" >&5 + echo "${ECHO_T}$with_develop" >&6 + + ############################################################################### +@@ -15205,7 +15519,7 @@ + # This is still experimental (20080329), but should ultimately be moved to + # the script-block --with-normal, etc. + +-echo "$as_me:15208: checking if you want to link with the pthread library" >&5 ++echo "$as_me:15522: 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. +@@ -15215,27 +15529,27 @@ + else + with_pthread=no + fi; +-echo "$as_me:15218: result: $with_pthread" >&5 ++echo "$as_me:15532: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 + + if test "$with_pthread" != no ; then +- echo "$as_me:15222: checking for pthread.h" >&5 ++ echo "$as_me:15536: 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 15228 "configure" ++#line 15542 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:15232: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:15546: \"$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:15238: \$? = $ac_status" >&5 ++ echo "$as_me:15552: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -15254,7 +15568,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:15257: result: $ac_cv_header_pthread_h" >&5 ++echo "$as_me:15571: 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 + +@@ -15264,7 +15578,7 @@ + + for cf_lib_pthread in pthread c_r + do +- echo "$as_me:15267: checking if we can link with the $cf_lib_pthread library" >&5 ++ echo "$as_me:15581: 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" + +@@ -15285,7 +15599,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15288 "configure" ++#line 15602 "configure" + #include "confdefs.h" + + #include +@@ -15302,16 +15616,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:15305: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15619: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15308: \$? = $ac_status" >&5 ++ echo "$as_me:15622: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:15311: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15625: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15314: \$? = $ac_status" >&5 ++ echo "$as_me:15628: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + with_pthread=yes + else +@@ -15321,7 +15635,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save_LIBS" +- echo "$as_me:15324: result: $with_pthread" >&5 ++ echo "$as_me:15638: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 + test "$with_pthread" = yes && break + done +@@ -15349,7 +15663,7 @@ + EOF + + else +- { { echo "$as_me:15352: error: Cannot link with pthread library" >&5 ++ { { echo "$as_me:15666: error: Cannot link with pthread library" >&5 + echo "$as_me: error: Cannot link with pthread library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -15358,7 +15672,7 @@ + + fi + +-echo "$as_me:15361: checking if you want to use weak-symbols for pthreads" >&5 ++echo "$as_me:15675: 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. +@@ -15368,18 +15682,18 @@ + else + use_weak_symbols=no + fi; +-echo "$as_me:15371: result: $use_weak_symbols" >&5 ++echo "$as_me:15685: result: $use_weak_symbols" >&5 + echo "${ECHO_T}$use_weak_symbols" >&6 + if test "$use_weak_symbols" = yes ; then + +-echo "$as_me:15375: checking if $CC supports weak symbols" >&5 ++echo "$as_me:15689: 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 15382 "configure" ++#line 15696 "configure" + #include "confdefs.h" + + #include +@@ -15405,16 +15719,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:15408: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15722: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15411: \$? = $ac_status" >&5 ++ echo "$as_me:15725: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:15414: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15728: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15417: \$? = $ac_status" >&5 ++ echo "$as_me:15731: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_weak_symbols=yes + else +@@ -15425,7 +15739,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:15428: result: $cf_cv_weak_symbols" >&5 ++echo "$as_me:15742: result: $cf_cv_weak_symbols" >&5 + echo "${ECHO_T}$cf_cv_weak_symbols" >&6 + + else +@@ -15454,13 +15768,13 @@ + fi + + # OpenSUSE is installing ncurses6, using reentrant option. +-echo "$as_me:15457: checking for _nc_TABSIZE" >&5 ++echo "$as_me:15771: 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 15463 "configure" ++#line 15777 "configure" + #include "confdefs.h" + #define _nc_TABSIZE autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -15491,16 +15805,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:15494: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15808: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15497: \$? = $ac_status" >&5 ++ echo "$as_me:15811: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:15500: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15814: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15503: \$? = $ac_status" >&5 ++ echo "$as_me:15817: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func__nc_TABSIZE=yes + else +@@ -15510,7 +15824,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:15513: result: $ac_cv_func__nc_TABSIZE" >&5 ++echo "$as_me:15827: 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 +@@ -15522,7 +15836,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:15525: checking if you want experimental reentrant code" >&5 ++echo "$as_me:15839: 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. +@@ -15532,7 +15846,7 @@ + else + with_reentrant=$assume_reentrant + fi; +-echo "$as_me:15535: result: $with_reentrant" >&5 ++echo "$as_me:15849: result: $with_reentrant" >&5 + echo "${ECHO_T}$with_reentrant" >&6 + if test "$with_reentrant" = yes ; then + cf_cv_enable_reentrant=1 +@@ -15555,7 +15869,7 @@ + + ### Allow using a different wrap-prefix + if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then +- echo "$as_me:15558: checking for prefix used to wrap public variables" >&5 ++ echo "$as_me:15872: 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. +@@ -15565,7 +15879,7 @@ + else + NCURSES_WRAP_PREFIX=_nc_ + fi; +- echo "$as_me:15568: result: $NCURSES_WRAP_PREFIX" >&5 ++ echo "$as_me:15882: result: $NCURSES_WRAP_PREFIX" >&5 + echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 + else + NCURSES_WRAP_PREFIX=_nc_ +@@ -15579,7 +15893,7 @@ + + ### use option --disable-echo to suppress full display compiling commands + +-echo "$as_me:15582: checking if you want to see long compiling messages" >&5 ++echo "$as_me:15896: 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. +@@ -15613,10 +15927,10 @@ + ECHO_CC='' + + fi; +-echo "$as_me:15616: result: $enableval" >&5 ++echo "$as_me:15930: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + +-echo "$as_me:15619: checking if you want to use C11 _Noreturn feature" >&5 ++echo "$as_me:15933: 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. +@@ -15633,17 +15947,17 @@ + enable_stdnoreturn=no + + fi; +-echo "$as_me:15636: result: $enable_stdnoreturn" >&5 ++echo "$as_me:15950: result: $enable_stdnoreturn" >&5 + echo "${ECHO_T}$enable_stdnoreturn" >&6 + + if test $enable_stdnoreturn = yes; then +-echo "$as_me:15640: checking for C11 _Noreturn feature" >&5 ++echo "$as_me:15954: 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 15646 "configure" ++#line 15960 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -15659,16 +15973,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:15662: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15976: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15665: \$? = $ac_status" >&5 ++ echo "$as_me:15979: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:15668: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15982: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15671: \$? = $ac_status" >&5 ++ echo "$as_me:15985: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_c11_noreturn=yes + else +@@ -15679,7 +15993,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:15682: result: $cf_cv_c11_noreturn" >&5 ++echo "$as_me:15996: result: $cf_cv_c11_noreturn" >&5 + echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 + else + cf_cv_c11_noreturn=no, +@@ -15735,16 +16049,16 @@ + then + test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 + +-echo "${as_me:-configure}:15738: testing repairing CFLAGS: $CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16052: testing repairing CFLAGS: $CFLAGS ..." 1>&5 + + CFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 + +-echo "${as_me:-configure}:15743: testing ... fixed $CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16057: testing ... fixed $CFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:15747: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16061: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi + ;; +@@ -15783,16 +16097,16 @@ + then + test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:15786: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16100: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 + + CPPFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:15791: testing ... fixed $CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16105: testing ... fixed $CPPFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:15795: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16109: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi + ;; +@@ -15831,23 +16145,23 @@ + then + test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:15834: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16148: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 + + LDFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:15839: testing ... fixed $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16153: testing ... fixed $LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:15843: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16157: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi + ;; + esac + fi + +-echo "$as_me:15850: checking if you want to turn on gcc warnings" >&5 ++echo "$as_me:16164: 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. +@@ -15864,7 +16178,7 @@ + enable_warnings=no + + fi; +-echo "$as_me:15867: result: $enable_warnings" >&5 ++echo "$as_me:16181: result: $enable_warnings" >&5 + echo "${ECHO_T}$enable_warnings" >&6 + if test "$enable_warnings" = "yes" + then +@@ -15888,7 +16202,7 @@ + done + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15891 "configure" ++#line 16205 "configure" + #include "confdefs.h" + + #include +@@ -15903,26 +16217,26 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:15906: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16220: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15909: \$? = $ac_status" >&5 ++ echo "$as_me:16223: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:15912: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16226: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15915: \$? = $ac_status" >&5 ++ echo "$as_me:16229: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + +-echo "$as_me:15918: checking for X11/Xt const-feature" >&5 ++echo "$as_me:16232: 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 15925 "configure" ++#line 16239 "configure" + #include "confdefs.h" + + #undef _CONST_X_STRING +@@ -15940,16 +16254,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:15943: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16257: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15946: \$? = $ac_status" >&5 ++ echo "$as_me:16260: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:15949: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16263: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15952: \$? = $ac_status" >&5 ++ echo "$as_me:16266: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_const_x_string=no +@@ -15964,7 +16278,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:15967: result: $cf_cv_const_x_string" >&5 ++echo "$as_me:16281: result: $cf_cv_const_x_string" >&5 + echo "${ECHO_T}$cf_cv_const_x_string" >&6 + + LIBS="$cf_save_LIBS_CF_CONST_X_STRING" +@@ -15993,7 +16307,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + cat > "conftest.$ac_ext" <&5 ++ { echo "$as_me:16326: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" +@@ -16025,12 +16339,12 @@ + wd981 + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:16028: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:16342: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16031: \$? = $ac_status" >&5 ++ echo "$as_me:16345: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:16033: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:16347: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" + fi +@@ -16038,7 +16352,7 @@ + CFLAGS="$cf_save_CFLAGS" + elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" + then +- { echo "$as_me:16041: checking for $CC warning options..." >&5 ++ { echo "$as_me:16355: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + cf_warn_CONST="" +@@ -16061,12 +16375,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:16064: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:16378: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16067: \$? = $ac_status" >&5 ++ echo "$as_me:16381: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:16069: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:16383: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + case "$cf_opt" in + (Winline) +@@ -16074,7 +16388,7 @@ + ([34].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:16077: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:16391: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -16084,7 +16398,7 @@ + ([12].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:16087: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:16401: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -16117,10 +16431,10 @@ + EOF + if test "$GCC" = yes + then +- { echo "$as_me:16120: checking for $CC __attribute__ directives..." >&5 ++ { echo "$as_me:16434: checking for $CC __attribute__ directives..." >&5 + echo "$as_me: checking for $CC __attribute__ directives..." >&6;} + cat > "conftest.$ac_ext" < + #include "confdefs.h" + #include "conftest.h" +@@ -16170,12 +16484,12 @@ + ;; + esac + +- if { (eval echo "$as_me:16173: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:16487: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16176: \$? = $ac_status" >&5 ++ echo "$as_me:16490: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:16178: result: ... $cf_attribute" >&5 ++ test -n "$verbose" && echo "$as_me:16492: result: ... $cf_attribute" >&5 + echo "${ECHO_T}... $cf_attribute" >&6 + cat conftest.h >>confdefs.h + case "$cf_attribute" in +@@ -16243,7 +16557,7 @@ + fi + + ### use option --enable-assertions to turn on generation of assertion code +-echo "$as_me:16246: checking if you want to enable runtime assertions" >&5 ++echo "$as_me:16560: 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. +@@ -16253,7 +16567,7 @@ + else + with_assertions=no + fi; +-echo "$as_me:16256: result: $with_assertions" >&5 ++echo "$as_me:16570: result: $with_assertions" >&5 + echo "${ECHO_T}$with_assertions" >&6 + if test -n "$GCC" + then +@@ -16306,7 +16620,7 @@ + ;; + esac + +-echo "$as_me:16309: checking whether to add trace feature to all models" >&5 ++echo "$as_me:16623: 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. +@@ -16316,7 +16630,7 @@ + else + cf_with_trace=$cf_all_traces + fi; +-echo "$as_me:16319: result: $cf_with_trace" >&5 ++echo "$as_me:16633: result: $cf_with_trace" >&5 + echo "${ECHO_T}$cf_with_trace" >&6 + + if test "$cf_with_trace" = yes ; then +@@ -16424,7 +16738,7 @@ + ADA_TRACE=FALSE + fi + +-echo "$as_me:16427: checking if we want to use GNAT projects" >&5 ++echo "$as_me:16741: 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. +@@ -16441,21 +16755,21 @@ + enable_gnat_projects=yes + + fi; +-echo "$as_me:16444: result: $enable_gnat_projects" >&5 ++echo "$as_me:16758: 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:16451: checking if ssp library is needed" >&5 ++echo "$as_me:16765: 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 16458 "configure" ++#line 16772 "configure" + #include "confdefs.h" + + #include +@@ -16472,16 +16786,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16475: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16789: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16478: \$? = $ac_status" >&5 ++ echo "$as_me:16792: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16481: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16795: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16484: \$? = $ac_status" >&5 ++ echo "$as_me:16798: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_need_libssp=no + else +@@ -16491,7 +16805,7 @@ + cf_save_LIBS="$LIBS" + LIBS="$LIBS -lssp" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16494 "configure" ++#line 16808 "configure" + #include "confdefs.h" + + #include +@@ -16508,16 +16822,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16511: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16825: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16514: \$? = $ac_status" >&5 ++ echo "$as_me:16828: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16517: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16831: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16520: \$? = $ac_status" >&5 ++ echo "$as_me:16834: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_need_libssp=yes + else +@@ -16531,7 +16845,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:16534: result: $cf_cv_need_libssp" >&5 ++echo "$as_me:16848: result: $cf_cv_need_libssp" >&5 + echo "${ECHO_T}$cf_cv_need_libssp" >&6 + + if test "x$cf_cv_need_libssp" = xyes +@@ -16558,36 +16872,162 @@ + ;; + (*) + +-echo "$as_me:16561: checking for clock_gettime" >&5 ++cf_save_libs="$LIBS" ++echo "$as_me:16876: checking for clock_gettime" >&5 + echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6 ++if test "${ac_cv_func_clock_gettime+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >"conftest.$ac_ext" <<_ACEOF ++#line 16882 "configure" ++#include "confdefs.h" ++#define clock_gettime autoconf_temporary ++#include /* least-intrusive standard header which defines gcc2 __stub macros */ ++#undef clock_gettime ++ ++#ifdef __cplusplus ++extern "C" ++#endif ++ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char clock_gettime (void); ++ ++int ++main (void) ++{ ++ ++/* The GNU C library defines stubs for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_clock_gettime) || defined (__stub___clock_gettime) ++#error found stub for clock_gettime ++#endif ++ ++ return clock_gettime (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f "conftest.$ac_objext" "conftest$ac_exeext" ++if { (eval echo "$as_me:16913: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:16916: \$? = $ac_status" >&5 ++ (exit "$ac_status"); } && ++ { ac_try='test -s "conftest$ac_exeext"' ++ { (eval echo "$as_me:16919: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:16922: \$? = $ac_status" >&5 ++ (exit "$ac_status"); }; }; then ++ ac_cv_func_clock_gettime=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat "conftest.$ac_ext" >&5 ++ac_cv_func_clock_gettime=no ++fi ++rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ++fi ++echo "$as_me:16932: result: $ac_cv_func_clock_gettime" >&5 ++echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6 ++if test "$ac_cv_func_clock_gettime" = yes; then ++ cf_cv_test_clock_gettime=yes ++else ++ echo "$as_me:16937: checking for clock_gettime in -lrt" >&5 ++echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6 ++if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lrt $LIBS" ++cat >"conftest.$ac_ext" <<_ACEOF ++#line 16945 "configure" ++#include "confdefs.h" ++ ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char clock_gettime (void); ++int ++main (void) ++{ ++clock_gettime (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f "conftest.$ac_objext" "conftest$ac_exeext" ++if { (eval echo "$as_me:16964: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:16967: \$? = $ac_status" >&5 ++ (exit "$ac_status"); } && ++ { ac_try='test -s "conftest$ac_exeext"' ++ { (eval echo "$as_me:16970: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:16973: \$? = $ac_status" >&5 ++ (exit "$ac_status"); }; }; then ++ ac_cv_lib_rt_clock_gettime=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat "conftest.$ac_ext" >&5 ++ac_cv_lib_rt_clock_gettime=no ++fi ++rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ++LIBS=$ac_check_lib_save_LIBS ++fi ++echo "$as_me:16984: result: $ac_cv_lib_rt_clock_gettime" >&5 ++echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6 ++if test "$ac_cv_lib_rt_clock_gettime" = yes; then ++ LIBS="-lrt $LIBS" ++ cf_cv_test_clock_gettime=yes ++else ++ cf_cv_test_clock_gettime=no ++fi ++ ++fi ++ ++if test "$cf_cv_test_clock_gettime" = yes ; then ++echo "$as_me:16996: checking if clock_gettime links" >&5 ++echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6 + if test "${cf_cv_func_clock_gettime+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16568 "configure" ++#line 17003 "configure" + #include "confdefs.h" ++ ++$ac_includes_default + #include ++ + int + main (void) + { + struct timespec ts; +- int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts ++ int rc = clock_gettime(CLOCK_REALTIME, &ts) ++ + clock_gettime(CLOCK_MONOTONIC, &ts); ++ (void) rc; (void)ts + ; + return 0; + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16581: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17021: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16584: \$? = $ac_status" >&5 ++ echo "$as_me:17024: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16587: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17027: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16590: \$? = $ac_status" >&5 ++ echo "$as_me:17030: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_clock_gettime=yes + else +@@ -16598,8 +17038,11 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:16601: result: $cf_cv_func_clock_gettime" >&5 ++echo "$as_me:17041: result: $cf_cv_func_clock_gettime" >&5 + echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6 ++else ++ cf_cv_func_clock_gettime=no ++fi + + if test "$cf_cv_func_clock_gettime" = yes + then +@@ -16609,13 +17052,13 @@ + EOF + + else +-echo "$as_me:16612: checking for gettimeofday" >&5 ++echo "$as_me:17055: 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 16618 "configure" ++#line 17061 "configure" + #include "confdefs.h" + #define gettimeofday autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -16646,16 +17089,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16649: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17092: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16652: \$? = $ac_status" >&5 ++ echo "$as_me:17095: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16655: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17098: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16658: \$? = $ac_status" >&5 ++ echo "$as_me:17101: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_gettimeofday=yes + else +@@ -16665,7 +17108,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:16668: result: $ac_cv_func_gettimeofday" >&5 ++echo "$as_me:17111: result: $ac_cv_func_gettimeofday" >&5 + echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 + if test "$ac_cv_func_gettimeofday" = yes; then + +@@ -16675,7 +17118,7 @@ + + else + +-echo "$as_me:16678: checking for gettimeofday in -lbsd" >&5 ++echo "$as_me:17121: 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 +@@ -16683,7 +17126,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16686 "configure" ++#line 17129 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -16702,16 +17145,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16705: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17148: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16708: \$? = $ac_status" >&5 ++ echo "$as_me:17151: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16711: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17154: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16714: \$? = $ac_status" >&5 ++ echo "$as_me:17157: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_bsd_gettimeofday=yes + else +@@ -16722,7 +17165,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:16725: result: $ac_cv_lib_bsd_gettimeofday" >&5 ++echo "$as_me:17168: 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 + +@@ -16755,13 +17198,13 @@ + esac + + ### Checks for header files. +-echo "$as_me:16758: checking for signed char" >&5 ++echo "$as_me:17201: 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 16764 "configure" ++#line 17207 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16776,16 +17219,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16779: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17222: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16782: \$? = $ac_status" >&5 ++ echo "$as_me:17225: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16785: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17228: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16788: \$? = $ac_status" >&5 ++ echo "$as_me:17231: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_signed_char=yes + else +@@ -16795,10 +17238,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:16798: result: $ac_cv_type_signed_char" >&5 ++echo "$as_me:17241: result: $ac_cv_type_signed_char" >&5 + echo "${ECHO_T}$ac_cv_type_signed_char" >&6 + +-echo "$as_me:16801: checking size of signed char" >&5 ++echo "$as_me:17244: 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 +@@ -16807,7 +17250,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16810 "configure" ++#line 17253 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16819,21 +17262,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16822: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17265: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16825: \$? = $ac_status" >&5 ++ echo "$as_me:17268: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16828: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17271: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16831: \$? = $ac_status" >&5 ++ echo "$as_me:17274: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16836 "configure" ++#line 17279 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16845,16 +17288,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16848: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17291: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16851: \$? = $ac_status" >&5 ++ echo "$as_me:17294: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16854: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17297: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16857: \$? = $ac_status" >&5 ++ echo "$as_me:17300: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -16870,7 +17313,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16873 "configure" ++#line 17316 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16882,16 +17325,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16885: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17328: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16888: \$? = $ac_status" >&5 ++ echo "$as_me:17331: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16891: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17334: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16894: \$? = $ac_status" >&5 ++ echo "$as_me:17337: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -16907,7 +17350,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 16910 "configure" ++#line 17353 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16919,16 +17362,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16922: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17365: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16925: \$? = $ac_status" >&5 ++ echo "$as_me:17368: \$? = $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:17371: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16931: \$? = $ac_status" >&5 ++ echo "$as_me:17374: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -16941,12 +17384,12 @@ + ac_cv_sizeof_signed_char=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:16944: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:17387: 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 16949 "configure" ++#line 17392 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16962,15 +17405,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:16965: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17408: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16968: \$? = $ac_status" >&5 ++ echo "$as_me:17411: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:16970: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17413: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16973: \$? = $ac_status" >&5 ++ echo "$as_me:17416: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_signed_char=`cat conftest.val` + else +@@ -16986,7 +17429,7 @@ + ac_cv_sizeof_signed_char=0 + fi + fi +-echo "$as_me:16989: result: $ac_cv_sizeof_signed_char" >&5 ++echo "$as_me:17432: result: $ac_cv_sizeof_signed_char" >&5 + echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:17441: 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 17004 "configure" ++#line 17447 "configure" + #include "confdefs.h" + #include + #include <$ac_hdr> +@@ -17016,16 +17459,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:17019: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17462: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17022: \$? = $ac_status" >&5 ++ echo "$as_me:17465: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:17025: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17468: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17028: \$? = $ac_status" >&5 ++ echo "$as_me:17471: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Header=yes" + else +@@ -17035,7 +17478,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:17038: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:17481: 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:17494: 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 +@@ -17056,7 +17499,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldir $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17059 "configure" ++#line 17502 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -17075,16 +17518,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:17078: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17521: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17081: \$? = $ac_status" >&5 ++ echo "$as_me:17524: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:17084: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17527: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17087: \$? = $ac_status" >&5 ++ echo "$as_me:17530: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dir_opendir=yes + else +@@ -17095,14 +17538,14 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:17098: result: $ac_cv_lib_dir_opendir" >&5 ++echo "$as_me:17541: 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:17105: checking for opendir in -lx" >&5 ++ echo "$as_me:17548: 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 +@@ -17110,7 +17553,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lx $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17113 "configure" ++#line 17556 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -17129,16 +17572,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:17132: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17575: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17135: \$? = $ac_status" >&5 ++ echo "$as_me:17578: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:17138: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17581: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17141: \$? = $ac_status" >&5 ++ echo "$as_me:17584: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_x_opendir=yes + else +@@ -17149,7 +17592,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:17152: result: $ac_cv_lib_x_opendir" >&5 ++echo "$as_me:17595: 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" +@@ -17157,13 +17600,13 @@ + + fi + +-echo "$as_me:17160: checking whether time.h and sys/time.h may both be included" >&5 ++echo "$as_me:17603: 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 17166 "configure" ++#line 17609 "configure" + #include "confdefs.h" + #include + #include +@@ -17179,16 +17622,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:17182: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17625: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17185: \$? = $ac_status" >&5 ++ echo "$as_me:17628: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:17188: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17631: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17191: \$? = $ac_status" >&5 ++ echo "$as_me:17634: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_header_time=yes + else +@@ -17198,7 +17641,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:17201: result: $ac_cv_header_time" >&5 ++echo "$as_me:17644: result: $ac_cv_header_time" >&5 + echo "${ECHO_T}$ac_cv_header_time" >&6 + if test $ac_cv_header_time = yes; then + +@@ -17216,13 +17659,13 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return="return" + +-echo "$as_me:17219: checking for an ANSI C-conforming const" >&5 ++echo "$as_me:17662: 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 17225 "configure" ++#line 17668 "configure" + #include "confdefs.h" + + int +@@ -17284,16 +17727,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:17287: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17730: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17290: \$? = $ac_status" >&5 ++ echo "$as_me:17733: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:17293: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17736: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17296: \$? = $ac_status" >&5 ++ echo "$as_me:17739: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_c_const=yes + else +@@ -17303,7 +17746,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:17306: result: $ac_cv_c_const" >&5 ++echo "$as_me:17749: result: $ac_cv_c_const" >&5 + echo "${ECHO_T}$ac_cv_c_const" >&6 + if test $ac_cv_c_const = no; then + +@@ -17315,7 +17758,7 @@ + + ### Checks for external-data + +-echo "$as_me:17318: checking if data-only library module links" >&5 ++echo "$as_me:17761: 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 +@@ -17323,20 +17766,20 @@ + + rm -f conftest.a + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:17772: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17332: \$? = $ac_status" >&5 ++ echo "$as_me:17775: \$? = $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:17799: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17359: \$? = $ac_status" >&5 ++ echo "$as_me:17802: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + mv conftest.o func.o && \ + ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null +@@ -17369,7 +17812,7 @@ + cf_cv_link_dataonly=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17372 "configure" ++#line 17815 "configure" + #include "confdefs.h" + + extern int testfunc(void); +@@ -17380,15 +17823,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:17383: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17826: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17386: \$? = $ac_status" >&5 ++ echo "$as_me:17829: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:17388: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17831: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17391: \$? = $ac_status" >&5 ++ echo "$as_me:17834: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_link_dataonly=yes + else +@@ -17403,7 +17846,7 @@ + + fi + +-echo "$as_me:17406: result: $cf_cv_link_dataonly" >&5 ++echo "$as_me:17849: result: $cf_cv_link_dataonly" >&5 + echo "${ECHO_T}$cf_cv_link_dataonly" >&6 + + if test "$cf_cv_link_dataonly" = no ; then +@@ -17422,23 +17865,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:17425: checking for $ac_header" >&5 ++echo "$as_me:17868: 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 17431 "configure" ++#line 17874 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:17435: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:17878: \"$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:17441: \$? = $ac_status" >&5 ++ echo "$as_me:17884: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -17457,7 +17900,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:17460: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:17903: 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:17913: 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 +@@ -17478,7 +17921,7 @@ + cf_cv_func_mkstemp=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17481 "configure" ++#line 17924 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -17513,15 +17956,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:17516: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17959: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17519: \$? = $ac_status" >&5 ++ echo "$as_me:17962: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:17521: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17964: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17524: \$? = $ac_status" >&5 ++ echo "$as_me:17967: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_mkstemp=yes + +@@ -17536,16 +17979,16 @@ + fi + + fi +-echo "$as_me:17539: result: $cf_cv_func_mkstemp" >&5 ++echo "$as_me:17982: 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:17542: checking for mkstemp" >&5 ++ echo "$as_me:17985: 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 17548 "configure" ++#line 17991 "configure" + #include "confdefs.h" + #define mkstemp autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -17576,16 +18019,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:17579: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18022: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17582: \$? = $ac_status" >&5 ++ echo "$as_me:18025: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:17585: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18028: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17588: \$? = $ac_status" >&5 ++ echo "$as_me:18031: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_mkstemp=yes + else +@@ -17595,7 +18038,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:17598: result: $ac_cv_func_mkstemp" >&5 ++echo "$as_me:18041: result: $ac_cv_func_mkstemp" >&5 + echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 + + fi +@@ -17614,237 +18057,9 @@ + + cf_with_ada=yes + if test "$cf_with_ada" != "no" ; then +- +-for cf_prog_gnat in gnat gnatmake gprconfig gprbuild +-do +- +-cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +- +- unset ac_cv_path_cf_TEMP_gnat +- 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:17627: 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 +-else +- case $cf_TEMP_gnat in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_cf_TEMP_gnat="$cf_TEMP_gnat" # Let the user override the test with a path. +- ;; +- *) +- ac_save_IFS=$IFS; IFS=$ac_path_separator +-ac_dummy="$PATH" +-for ac_dir in $ac_dummy; do +- IFS=$ac_save_IFS +- test -z "$ac_dir" && ac_dir=. +- if $as_executable_p "$ac_dir/$ac_word"; then +- ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" +- echo "$as_me:17644: found $ac_dir/$ac_word" >&5 +- break +-fi +-done +- +- test -z "$ac_cv_path_cf_TEMP_gnat" && ac_cv_path_cf_TEMP_gnat="no" +- ;; +-esac +-fi +-cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat +- +-if test -n "$cf_TEMP_gnat"; then +- echo "$as_me:17656: result: $cf_TEMP_gnat" >&5 +-echo "${ECHO_T}$cf_TEMP_gnat" >&6 +-else +- echo "$as_me:17659: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- eval "cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat" +- +- if test "x$cf_TEMP_gnat" != xno; then +- unset cf_cv_gnat_version +- unset cf_TEMP_gnat +- +-echo "$as_me:17669: 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 +-else +- +-cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \ +- grep '[0-9].[0-9][0-9]*' |\ +- sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` +- +-fi +-echo "$as_me:17680: 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 +- +- fi +- eval "cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat" +- +- unset cf_TEMP_gnat +- unset cf_cv_gnat_version +- unset ac_cv_path_cf_TEMP_gnat +-done +- +-if test "x$cf_cv_VERSION_GNATMAKE" = "xno"; then +- cf_ada_make= +- cf_cv_prog_gnat_correct=no +-else +- cf_ada_make=gnatmake +- if test "x$cf_cv_VERSION_GPRCONFIG" = "xno"; then +- # gprconfig is newer than gnatmake; we can continue... +- cf_ada_config="##" +- else +- rm -rf ./conftest* ./*~conftest* +- if mkdir conftest.src +- then +- cf_ada_config="" +- cd conftest.src +- for cf_gprconfig in Ada C +- do +- echo "$as_me:17709: 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 +- for cf_gprconfig_param in \ +- "$cf_gprconfig,,,,GNATGCC" \ +- "$cf_gprconfig,,,,GCC" \ +- "$cf_gprconfig" +- do +- cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` +- test -n "$cf_gprconfig_value" && break +- done +- else +- cf_gprconfig_param=$cf_gprconfig +- cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` +- fi +- if test -n "$cf_gprconfig_value" +- then +- eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" +- echo "$as_me:17728: result: $cf_gprconfig_value" >&5 +-echo "${ECHO_T}$cf_gprconfig_value" >&6 +- else +- echo "$as_me:17731: result: missing" >&5 +-echo "${ECHO_T}missing" >&6 +- cf_ada_config="#" +- break +- fi +- done +- cd .. +- rm -rf ./conftest* ./*~conftest* +- fi +- fi +- if test "x$cf_ada_config" != "x#" +- then +- +-echo "$as_me:17744: 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 +-else +- +-cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \ +- grep '[0-9].[0-9][0-9]*' |\ +- sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` +- +-fi +-echo "$as_me:17755: 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 +- +-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]) +- cf_cv_prog_gnat_correct=yes +- ;; +-(*) +- { echo "$as_me:17764: 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 +- ;; +-esac +- +- # Extract the first word of "m4", so it can be a program name with args. +-set dummy m4; ac_word=$2 +-echo "$as_me:17772: 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 +-else +- if test -n "$M4_exists"; then +- ac_cv_prog_M4_exists="$M4_exists" # Let the user override the test. +-else +- ac_save_IFS=$IFS; IFS=$ac_path_separator +-ac_dummy="$PATH" +-for ac_dir in $ac_dummy; do +- IFS=$ac_save_IFS +- test -z "$ac_dir" && ac_dir=. +- $as_executable_p "$ac_dir/$ac_word" || continue +-ac_cv_prog_M4_exists="yes" +-echo "$as_me:17787: found $ac_dir/$ac_word" >&5 +-break +-done +- +- test -z "$ac_cv_prog_M4_exists" && ac_cv_prog_M4_exists="no" +-fi +-fi +-M4_exists=$ac_cv_prog_M4_exists +-if test -n "$M4_exists"; then +- echo "$as_me:17796: result: $M4_exists" >&5 +-echo "${ECHO_T}$M4_exists" >&6 +-else +- echo "$as_me:17799: 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:17805: 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:17809: checking if GNAT works" >&5 +-echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 +- +-rm -rf ./conftest* ./*~conftest* +-cat >>conftest.ads <>conftest.adb <&5 2>&1 ) ; then +- if ( ./conftest 1>&5 2>&1 ) ; then +- cf_cv_prog_gnat_correct=yes +- else +- cf_cv_prog_gnat_correct=no +- fi +-else +- cf_cv_prog_gnat_correct=no +-fi +-rm -rf ./conftest* ./*~conftest* +- +- echo "$as_me:17837: result: $cf_cv_prog_gnat_correct" >&5 +-echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 +- fi +- else +- cf_cv_prog_gnat_correct=no +- fi +-fi +- + if test "$cf_cv_prog_gnat_correct" = yes; then + +- echo "$as_me:17847: checking optimization options for ADAFLAGS" >&5 ++ echo "$as_me:18062: checking optimization options for ADAFLAGS" >&5 + echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 + case "$CFLAGS" in + (*-g*) +@@ -17861,10 +18076,10 @@ + + ;; + esac +- echo "$as_me:17864: result: $ADAFLAGS" >&5 ++ echo "$as_me:18079: result: $ADAFLAGS" >&5 + echo "${ECHO_T}$ADAFLAGS" >&6 + +-echo "$as_me:17867: checking if GNATPREP supports -T option" >&5 ++echo "$as_me:18082: 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 +@@ -17874,11 +18089,11 @@ + gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes + + fi +-echo "$as_me:17877: result: $cf_cv_gnatprep_opt_t" >&5 ++echo "$as_me:18092: 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:17881: checking if GNAT supports generics" >&5 ++echo "$as_me:18096: 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]) +@@ -17888,7 +18103,7 @@ + cf_gnat_generics=no + ;; + esac +-echo "$as_me:17891: result: $cf_gnat_generics" >&5 ++echo "$as_me:18106: result: $cf_gnat_generics" >&5 + echo "${ECHO_T}$cf_gnat_generics" >&6 + + if test "$cf_gnat_generics" = yes +@@ -17900,7 +18115,7 @@ + cf_generic_objects= + fi + +-echo "$as_me:17903: checking if GNAT supports SIGINT" >&5 ++echo "$as_me:18118: 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 +@@ -17948,7 +18163,7 @@ + rm -rf ./conftest* ./*~conftest* + + fi +-echo "$as_me:17951: result: $cf_cv_gnat_sigint" >&5 ++echo "$as_me:18166: result: $cf_cv_gnat_sigint" >&5 + echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 + + if test "$cf_cv_gnat_sigint" = yes ; then +@@ -17961,7 +18176,7 @@ + cf_gnat_projects=no + + if test "$enable_gnat_projects" != no ; then +-echo "$as_me:17964: checking if GNAT supports project files" >&5 ++echo "$as_me:18179: 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]*) +@@ -18024,15 +18239,15 @@ + esac + ;; + esac +-echo "$as_me:18027: result: $cf_gnat_projects" >&5 ++echo "$as_me:18242: 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:18033: checking if GNAT supports libraries" >&5 ++ echo "$as_me:18248: checking if GNAT supports libraries" >&5 + echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 +- echo "$as_me:18035: result: $cf_gnat_libraries" >&5 ++ echo "$as_me:18250: result: $cf_gnat_libraries" >&5 + echo "${ECHO_T}$cf_gnat_libraries" >&6 + fi + +@@ -18052,7 +18267,7 @@ + then + USE_GNAT_MAKE_GPR="" + else +- { echo "$as_me:18055: WARNING: use old makefile rules since tools are missing" >&5 ++ { echo "$as_me:18270: 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 +@@ -18064,7 +18279,7 @@ + USE_GNAT_LIBRARIES="#" + fi + +-echo "$as_me:18067: checking for Ada95 compiler" >&5 ++echo "$as_me:18282: checking for Ada95 compiler" >&5 + echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6 + + # Check whether --with-ada-compiler or --without-ada-compiler was given. +@@ -18075,12 +18290,12 @@ + cf_ada_compiler=gnatmake + fi; + +-echo "$as_me:18078: result: $cf_ada_compiler" >&5 ++echo "$as_me:18293: result: $cf_ada_compiler" >&5 + echo "${ECHO_T}$cf_ada_compiler" >&6 + + cf_ada_package=terminal_interface + +-echo "$as_me:18083: checking for Ada95 include directory" >&5 ++echo "$as_me:18298: checking for Ada95 include directory" >&5 + echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6 + + # Check whether --with-ada-include or --without-ada-include was given. +@@ -18116,7 +18331,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:18119: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:18334: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -18125,10 +18340,10 @@ + fi + eval ADA_INCLUDE="$withval" + +-echo "$as_me:18128: result: $ADA_INCLUDE" >&5 ++echo "$as_me:18343: result: $ADA_INCLUDE" >&5 + echo "${ECHO_T}$ADA_INCLUDE" >&6 + +-echo "$as_me:18131: checking for Ada95 object directory" >&5 ++echo "$as_me:18346: checking for Ada95 object directory" >&5 + echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6 + + # Check whether --with-ada-objects or --without-ada-objects was given. +@@ -18164,7 +18379,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:18167: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:18382: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -18173,10 +18388,10 @@ + fi + eval ADA_OBJECTS="$withval" + +-echo "$as_me:18176: result: $ADA_OBJECTS" >&5 ++echo "$as_me:18391: result: $ADA_OBJECTS" >&5 + echo "${ECHO_T}$ADA_OBJECTS" >&6 + +-echo "$as_me:18179: checking whether to build an Ada95 shared library" >&5 ++echo "$as_me:18394: checking whether to build an Ada95 shared library" >&5 + echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6 + + # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. +@@ -18197,11 +18412,11 @@ + fi + fi + +-echo "$as_me:18200: result: $with_ada_sharedlib" >&5 ++echo "$as_me:18415: result: $with_ada_sharedlib" >&5 + echo "${ECHO_T}$with_ada_sharedlib" >&6 + if test "x$cf_ada_sharedlib_warn" != xno + then +- { echo "$as_me:18204: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5 ++ { echo "$as_me:18419: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5 + echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;} + fi + +@@ -18219,7 +18434,7 @@ + + # allow the Ada binding to be renamed + +-echo "$as_me:18222: checking for Ada95 curses library name" >&5 ++echo "$as_me:18437: checking for Ada95 curses library name" >&5 + echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6 + + # Check whether --with-ada-libname or --without-ada-libname was given. +@@ -18235,16 +18450,16 @@ + ;; + esac + +-echo "$as_me:18238: result: $ADA_LIBNAME" >&5 ++echo "$as_me:18453: result: $ADA_LIBNAME" >&5 + echo "${ECHO_T}$ADA_LIBNAME" >&6 + + else +- { { echo "$as_me:18242: error: No usable Ada compiler found" >&5 ++ { { echo "$as_me:18457: 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:18247: error: The Ada compiler is needed for this package" >&5 ++ { { echo "$as_me:18462: 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 +@@ -18284,7 +18499,7 @@ + fi + + ### Build up pieces for makefile rules +-echo "$as_me:18287: checking default library suffix" >&5 ++echo "$as_me:18502: checking default library suffix" >&5 + echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -18295,10 +18510,10 @@ + (shared) DFT_ARG_SUFFIX='' ;; + esac + test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" +-echo "$as_me:18298: result: $DFT_ARG_SUFFIX" >&5 ++echo "$as_me:18513: result: $DFT_ARG_SUFFIX" >&5 + echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 + +-echo "$as_me:18301: checking default library-dependency suffix" >&5 ++echo "$as_me:18516: checking default library-dependency suffix" >&5 + echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 + + case X$DFT_LWR_MODEL in +@@ -18381,10 +18596,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:18384: result: $DFT_DEP_SUFFIX" >&5 ++echo "$as_me:18599: result: $DFT_DEP_SUFFIX" >&5 + echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 + +-echo "$as_me:18387: checking default object directory" >&5 ++echo "$as_me:18602: checking default object directory" >&5 + echo $ECHO_N "checking default object directory... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -18400,7 +18615,7 @@ + DFT_OBJ_SUBDIR='obj_s' ;; + esac + esac +-echo "$as_me:18403: result: $DFT_OBJ_SUBDIR" >&5 ++echo "$as_me:18618: result: $DFT_OBJ_SUBDIR" >&5 + echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 + + ### Set up low-level terminfo dependencies for makefiles. +@@ -18542,7 +18757,7 @@ + : "${CONFIG_STATUS=./config.status}" + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:18545: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:18760: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >"$CONFIG_STATUS" <<_ACEOF + #! $SHELL +@@ -18723,7 +18938,7 @@ + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header +- { { echo "$as_me:18726: error: ambiguous option: $1 ++ { { echo "$as_me:18941: 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;} +@@ -18742,7 +18957,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:18745: error: unrecognized option: $1 ++ -*) { { echo "$as_me:18960: 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;} +@@ -18817,7 +19032,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:18820: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:19035: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -18917,6 +19132,13 @@ + s,@target_os@,$target_os,;t t + s,@GREP@,$GREP,;t t + s,@FGREP@,$FGREP,;t t ++s,@cf_TEMP_gnat@,$cf_TEMP_gnat,;t t ++s,@M4_exists@,$M4_exists,;t t ++s,@cf_ada_make@,$cf_ada_make,;t t ++s,@cf_ada_config@,$cf_ada_config,;t t ++s,@cf_ada_config_Ada@,$cf_ada_config_Ada,;t t ++s,@cf_ada_config_C@,$cf_ada_config_C,;t t ++s,@cf_cv_path_gnatgcc@,$cf_cv_path_gnatgcc,;t t + s,@CC@,$CC,;t t + s,@CFLAGS@,$CFLAGS,;t t + s,@LDFLAGS@,$LDFLAGS,;t t +@@ -19007,12 +19229,6 @@ + s,@STDC_NORETURN@,$STDC_NORETURN,;t t + s,@ADAFLAGS@,$ADAFLAGS,;t t + s,@ADA_TRACE@,$ADA_TRACE,;t t +-s,@cf_TEMP_gnat@,$cf_TEMP_gnat,;t t +-s,@M4_exists@,$M4_exists,;t t +-s,@cf_ada_make@,$cf_ada_make,;t t +-s,@cf_ada_config@,$cf_ada_config,;t t +-s,@cf_ada_config_Ada@,$cf_ada_config_Ada,;t t +-s,@cf_ada_config_C@,$cf_ada_config_C,;t t + s,@GNATPREP_OPTS@,$GNATPREP_OPTS,;t t + s,@cf_compile_generics@,$cf_compile_generics,;t t + s,@cf_generic_objects@,$cf_generic_objects,;t t +@@ -19178,7 +19394,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:19181: creating $ac_file" >&5 ++ { echo "$as_me:19397: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -19196,7 +19412,7 @@ + -) echo "$tmp"/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:19199: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:19415: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo "$f";; +@@ -19209,7 +19425,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:19212: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:19428: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -19225,7 +19441,7 @@ + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' "$ac_item"` + if test -z "$ac_used"; then +- { echo "$as_me:19228: WARNING: datarootdir was used implicitly but not set: ++ { echo "$as_me:19444: 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;} +@@ -19234,7 +19450,7 @@ + fi + ac_seen=`grep '${datarootdir}' "$ac_item"` + if test -n "$ac_seen"; then +- { echo "$as_me:19237: WARNING: datarootdir was used explicitly but not set: ++ { echo "$as_me:19453: 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;} +@@ -19279,7 +19495,7 @@ + ac_init=`$EGREP '[ ]*'$ac_name'[ ]*=' "$ac_file"` + if test -z "$ac_init"; then + ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'` +- { echo "$as_me:19282: WARNING: Variable $ac_name is used but was not set: ++ { echo "$as_me:19498: 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;} +@@ -19290,7 +19506,7 @@ + $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:19293: WARNING: Some variables may not be substituted: ++ { echo "$as_me:19509: WARNING: Some variables may not be substituted: + $ac_seen" >&5 + echo "$as_me: WARNING: Some variables may not be substituted: + $ac_seen" >&2;} +@@ -19339,7 +19555,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:19342: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:19558: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -19350,7 +19566,7 @@ + -) echo "$tmp"/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:19353: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:19569: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -19363,7 +19579,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:19366: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:19582: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -19421,7 +19637,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:19424: $ac_file is unchanged" >&5 ++ { echo "$as_me:19640: $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.91 +--- ncurses-6.5-20240511+/Ada95/configure.in 2023-02-18 23:21:29.000000000 +0000 ++++ ncurses-6.5-20240518/Ada95/configure.in 2024-05-18 14:31:03.000000000 +0000 +@@ -1,5 +1,5 @@ + dnl*************************************************************************** +-dnl Copyright 2018-2022,2023 Thomas E. Dickey * ++dnl Copyright 2018-2023,2024 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.91 2023/02/18 23:21:29 tom Exp $ ++dnl $Id: configure.in,v 1.92 2024/05/18 14:31:03 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.91 $) ++AC_REVISION($Revision: 1.92 $) + AC_INIT(gen/gen.c) + AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) + +@@ -59,7 +59,7 @@ + CF_CFG_DEFAULTS + + ### Checks for programs. +-CF_PROG_CC(gnatgcc gcc cc) ++CF_WITH_ADA + AC_PROG_CPP + AC_PROG_GCC_TRADITIONAL + CF_PROG_CC_C_O(CC,[$CFLAGS $CPPFLAGS]) +@@ -455,7 +455,6 @@ + dnl Check for availability of GNU Ada Translator (GNAT). + dnl At the moment we support no other Ada95 compiler. + if test "$cf_with_ada" != "no" ; then +- CF_PROG_GNAT + if test "$cf_cv_prog_gnat_correct" = yes; then + CF_FIXUP_ADAFLAGS + +Index: NEWS +Prereq: 1.4119 +--- ncurses-6.5-20240511+/NEWS 2024-05-11 21:38:14.000000000 +0000 ++++ ncurses-6.5-20240518/NEWS 2024-05-18 21:35:34.000000000 +0000 +@@ -26,7 +26,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.4119 2024/05/11 21:38:14 tom Exp $ ++-- $Id: NEWS,v 1.4123 2024/05/18 21:35:34 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. + ++20240518 ++ + improve formatting/style of manpages (patches by Branden Robinson). ++ + move makefile's -DTRACE into include/ncurses_cfg.h, to simplify use ++ of CFLAGS/CPPFLAGS. ++ + improve check for clock_gettime(), from xterm. ++ + modify configure script to work around broken gnatgcc script found in ++ gcc-13 builds. ++ + 20240511 + + improve formatting/style of manpages (patches by Branden Robinson). + + limit value from ESCDELAY environment variable to 30 seconds, like +Index: VERSION +--- ncurses-6.5-20240511+/VERSION 2024-05-11 10:20:08.000000000 +0000 ++++ ncurses-6.5-20240518/VERSION 2024-05-18 10:54:27.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.5 20240511 ++5:0:10 6.5 20240518 +Index: aclocal.m4 +Prereq: 1.1069 +--- ncurses-6.5-20240511+/aclocal.m4 2024-03-30 22:15:45.000000000 +0000 ++++ ncurses-6.5-20240518/aclocal.m4 2024-05-18 19:49:14.000000000 +0000 +@@ -29,7 +29,7 @@ + dnl + dnl Author: Thomas E. Dickey 1995-on + dnl +-dnl $Id: aclocal.m4,v 1.1069 2024/03/30 22:15:45 tom Exp $ ++dnl $Id: aclocal.m4,v 1.1071 2024/05/18 19:49:14 tom Exp $ + dnl Macros used in NCURSES auto-configuration script. + dnl + dnl These macros are maintained separately from NCURSES. The copyright on +@@ -741,7 +741,7 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_BUILD_CC version: 11 updated: 2022/12/04 15:40:08 ++dnl CF_BUILD_CC version: 12 updated: 2024/03/17 09:17:26 + dnl ----------- + dnl If we're cross-compiling, allow the user to override the tools and their + dnl options. The configure script is oriented toward identifying the host +@@ -841,9 +841,9 @@ + : ${BUILD_CC:='${CC}'} + : ${BUILD_CPP:='${CPP}'} + : ${BUILD_CFLAGS:='${CFLAGS}'} +- : ${BUILD_CPPFLAGS:='${CPPFLAGS}'} ++ : ${BUILD_CPPFLAGS:='ifelse([$1],,'${CPPFLAGS}',[$1])'} + : ${BUILD_LDFLAGS:='${LDFLAGS}'} +- : ${BUILD_LIBS:='${LIBS}'} ++ : ${BUILD_LIBS:='ifelse([$2],,'${LIBS}',[$2])'} + : ${BUILD_EXEEXT:='$x'} + : ${BUILD_OBJEXT:='o'} + fi +@@ -2623,19 +2623,36 @@ + fi + ]) + dnl --------------------------------------------------------------------------- +-dnl CF_FUNC_GETTIME version: 2 updated: 2023/02/25 08:45:56 ++dnl CF_FUNC_GETTIME version: 3 updated: 2024/05/11 13:40:02 + dnl --------------- + dnl Check for gettimeofday or clock_gettime. In 2023, the former is still more + dnl widely supported, but "deprecated" (2008), so we will use the latter if it + dnl is available, to reduce compiler warnings. + AC_DEFUN([CF_FUNC_GETTIME],[ +-AC_CACHE_CHECK(for clock_gettime,cf_cv_func_clock_gettime,[ +- AC_TRY_LINK([#include ], ++cf_save_libs="$LIBS" ++AC_CHECK_FUNC(clock_gettime, ++ cf_cv_test_clock_gettime=yes, ++ AC_CHECK_LIB(rt, clock_gettime, ++ [LIBS="-lrt $LIBS" ++ cf_cv_test_clock_gettime=yes], ++ cf_cv_test_clock_gettime=no)) ++ ++if test "$cf_cv_test_clock_gettime" = yes ; then ++AC_CACHE_CHECK(if clock_gettime links,cf_cv_func_clock_gettime,[ ++ AC_TRY_LINK([ ++$ac_includes_default ++#include ++ ], + [struct timespec ts; +- int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts], ++ int rc = clock_gettime(CLOCK_REALTIME, &ts) ++ + clock_gettime(CLOCK_MONOTONIC, &ts); ++ (void) rc; (void)ts], + [cf_cv_func_clock_gettime=yes], + [cf_cv_func_clock_gettime=no]) + ]) ++else ++ cf_cv_func_clock_gettime=no ++fi + + if test "$cf_cv_func_clock_gettime" = yes + then +@@ -9001,6 +9018,56 @@ + cf_cv_abi_default=$cf_cv_abi_version + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_WITH_ADA version: 1 updated: 2024/05/18 13:55:23 ++dnl ----------- ++dnl Check for the Ada compiler (unless requested to not do this), which causes ++dnl a further check for a C compiler which can work with the Ada compiler. ++AC_DEFUN([CF_WITH_ADA],[ ++AC_ARG_WITH(ada, ++ [ --without-ada suppress check for Ada compiler], ++ [cf_with_ada=$withval], ++ [cf_with_ada=yes]) ++ ++cf_prog_cc="gcc cc" ++if test "x$cf_with_ada" = xyes ++then ++ CF_PROG_GNAT ++ if test "x$cf_cv_prog_gnat_correct" = xyes; then ++ # gcc's developers chose to deprecate gnatgcc before making gprconfig ++ # work. They replaced gnatgcc in gcc 13 with a script which spits out ++ # a warning offering advice which could never work. ++ # ++ # Here is a workaround. ++ AC_PATH_PROG(cf_cv_path_gnatgcc,gnatgcc,no) ++ if test "$cf_cv_path_gnatgcc" != no ++ then ++ AC_MSG_CHECKING(for improvement) ++ cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null` ++ case "x$cf_file_gnatgcc" in ++ (*script*) ++ cf_cv_path_gnatgcc=`sh -x "$cf_cv_path_gnatgcc" --version 2>&1 | grep -w exec | sed -e 's/^[[ ]]*+[[ ]]*//' -e 's/exec[[ ]]//' -e 's/ .*//'` ++ ;; ++ (*) ++ cf_cv_path_gnatgcc=no ++ ;; ++ esac ++ AC_MSG_RESULT($cf_cv_path_gnatgcc) ++ test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc ++ cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc" ++ fi ++ fi ++fi ++case "$cf_prog_cc" in ++(*/*) ++ CC="$cf_prog_cc" ++ AC_SUBST(CC) ++ ;; ++(*) ++ CF_PROG_CC($cf_prog_cc) ++ ;; ++esac ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_WITH_ADA_COMPILER version: 3 updated: 2023/10/28 11:59:01 + dnl -------------------- + dnl Command-line option to specify the Ada95 compiler. +Index: configure +--- ncurses-6.5-20240511+/configure 2024-04-10 08:09:48.000000000 +0000 ++++ ncurses-6.5-20240518/configure 2024-05-18 19:49:45.000000000 +0000 +@@ -1,5 +1,5 @@ + #! /bin/sh +-# From configure.in Revision: 1.779 . ++# From configure.in Revision: 1.781 . + # Guess values for system-dependent variables and create Makefiles. + # Generated by Autoconf 2.52.20231210. + # +@@ -717,7 +717,7 @@ + --with-abi-version=XXX override derived ABI version + --with-system-type=XXX test: override derived host system-type + --with-abi-altered=XXX override visible ABI version, for packaging +- --without-ada suppress check for Ada compiler, don't build demo ++ --without-ada suppress check for Ada compiler + --without-cxx do not adjust ncurses bool to match C++ + --without-cxx-binding do not build C++ binding and demo + --disable-db-install suppress install of terminal database +@@ -1818,12 +1818,307 @@ + cf_with_ada=yes + fi; + ++cf_prog_cc="gcc cc" + if test "x$cf_with_ada" = xyes + then +- cf_prog_cc="gnatgcc gcc cc" ++ ++for cf_prog_gnat in gnat gnatmake gprconfig gprbuild ++do ++ ++cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` ++ ++ unset ac_cv_path_cf_TEMP_gnat ++ 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:1834: 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 ++else ++ case $cf_TEMP_gnat in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_cf_TEMP_gnat="$cf_TEMP_gnat" # Let the user override the test with a path. ++ ;; ++ *) ++ ac_save_IFS=$IFS; IFS=$ac_path_separator ++ac_dummy="$PATH" ++for ac_dir in $ac_dummy; do ++ IFS=$ac_save_IFS ++ test -z "$ac_dir" && ac_dir=. ++ if $as_executable_p "$ac_dir/$ac_word"; then ++ ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" ++ echo "$as_me:1851: found $ac_dir/$ac_word" >&5 ++ break ++fi ++done ++ ++ test -z "$ac_cv_path_cf_TEMP_gnat" && ac_cv_path_cf_TEMP_gnat="no" ++ ;; ++esac ++fi ++cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat ++ ++if test -n "$cf_TEMP_gnat"; then ++ echo "$as_me:1863: result: $cf_TEMP_gnat" >&5 ++echo "${ECHO_T}$cf_TEMP_gnat" >&6 ++else ++ echo "$as_me:1866: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++ ++ eval "cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat" ++ ++ if test "x$cf_TEMP_gnat" != xno; then ++ unset cf_cv_gnat_version ++ unset cf_TEMP_gnat ++ ++echo "$as_me:1876: 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 ++else ++ ++cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \ ++ grep '[0-9].[0-9][0-9]*' |\ ++ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` ++ ++fi ++echo "$as_me:1887: 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 ++ ++ fi ++ eval "cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat" ++ ++ unset cf_TEMP_gnat ++ unset cf_cv_gnat_version ++ unset ac_cv_path_cf_TEMP_gnat ++done ++ ++if test "x$cf_cv_VERSION_GNATMAKE" = "xno"; then ++ cf_ada_make= ++ cf_cv_prog_gnat_correct=no ++else ++ cf_ada_make=gnatmake ++ if test "x$cf_cv_VERSION_GPRCONFIG" = "xno"; then ++ # gprconfig is newer than gnatmake; we can continue... ++ cf_ada_config="##" ++ else ++ rm -rf ./conftest* ./*~conftest* ++ if mkdir conftest.src ++ then ++ cf_ada_config="" ++ cd conftest.src ++ for cf_gprconfig in Ada C ++ do ++ echo "$as_me:1916: 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 ++ for cf_gprconfig_param in \ ++ "$cf_gprconfig,,,,GNATGCC" \ ++ "$cf_gprconfig,,,,GCC" \ ++ "$cf_gprconfig" ++ do ++ cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` ++ test -n "$cf_gprconfig_value" && break ++ done ++ else ++ cf_gprconfig_param=$cf_gprconfig ++ cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` ++ fi ++ if test -n "$cf_gprconfig_value" ++ then ++ eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" ++ echo "$as_me:1935: result: $cf_gprconfig_value" >&5 ++echo "${ECHO_T}$cf_gprconfig_value" >&6 ++ else ++ echo "$as_me:1938: result: missing" >&5 ++echo "${ECHO_T}missing" >&6 ++ cf_ada_config="#" ++ break ++ fi ++ done ++ cd .. ++ rm -rf ./conftest* ./*~conftest* ++ fi ++ fi ++ if test "x$cf_ada_config" != "x#" ++ then ++ ++echo "$as_me:1951: 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 ++else ++ ++cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \ ++ grep '[0-9].[0-9][0-9]*' |\ ++ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` ++ ++fi ++echo "$as_me:1962: 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 ++ ++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]) ++ cf_cv_prog_gnat_correct=yes ++ ;; ++(*) ++ { echo "$as_me:1971: 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 ++ ;; ++esac ++ ++ # Extract the first word of "m4", so it can be a program name with args. ++set dummy m4; ac_word=$2 ++echo "$as_me:1979: 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 ++else ++ if test -n "$M4_exists"; then ++ ac_cv_prog_M4_exists="$M4_exists" # Let the user override the test. ++else ++ ac_save_IFS=$IFS; IFS=$ac_path_separator ++ac_dummy="$PATH" ++for ac_dir in $ac_dummy; do ++ IFS=$ac_save_IFS ++ test -z "$ac_dir" && ac_dir=. ++ $as_executable_p "$ac_dir/$ac_word" || continue ++ac_cv_prog_M4_exists="yes" ++echo "$as_me:1994: found $ac_dir/$ac_word" >&5 ++break ++done ++ ++ test -z "$ac_cv_prog_M4_exists" && ac_cv_prog_M4_exists="no" ++fi ++fi ++M4_exists=$ac_cv_prog_M4_exists ++if test -n "$M4_exists"; then ++ echo "$as_me:2003: result: $M4_exists" >&5 ++echo "${ECHO_T}$M4_exists" >&6 ++else ++ echo "$as_me:2006: 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:2012: 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:2016: checking if GNAT works" >&5 ++echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 ++ ++rm -rf ./conftest* ./*~conftest* ++cat >>conftest.ads <>conftest.adb <&5 2>&1 ) ; then ++ if ( ./conftest 1>&5 2>&1 ) ; then ++ cf_cv_prog_gnat_correct=yes ++ else ++ cf_cv_prog_gnat_correct=no ++ fi + else +- cf_prog_cc="gcc cc" ++ cf_cv_prog_gnat_correct=no + fi ++rm -rf ./conftest* ./*~conftest* ++ ++ echo "$as_me:2044: result: $cf_cv_prog_gnat_correct" >&5 ++echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 ++ fi ++ else ++ cf_cv_prog_gnat_correct=no ++ fi ++fi ++ ++ if test "x$cf_cv_prog_gnat_correct" = xyes; then ++ # gcc's developers chose to deprecate gnatgcc before making gprconfig ++ # work. They replaced gnatgcc in gcc 13 with a script which spits out ++ # a warning offering advice which could never work. ++ # ++ # Here is a workaround. ++ # Extract the first word of "gnatgcc", so it can be a program name with args. ++set dummy gnatgcc; ac_word=$2 ++echo "$as_me:2060: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_path_cf_cv_path_gnatgcc+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $cf_cv_path_gnatgcc in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_cf_cv_path_gnatgcc="$cf_cv_path_gnatgcc" # Let the user override the test with a path. ++ ;; ++ *) ++ ac_save_IFS=$IFS; IFS=$ac_path_separator ++ac_dummy="$PATH" ++for ac_dir in $ac_dummy; do ++ IFS=$ac_save_IFS ++ test -z "$ac_dir" && ac_dir=. ++ if $as_executable_p "$ac_dir/$ac_word"; then ++ ac_cv_path_cf_cv_path_gnatgcc="$ac_dir/$ac_word" ++ echo "$as_me:2077: found $ac_dir/$ac_word" >&5 ++ break ++fi ++done ++ ++ test -z "$ac_cv_path_cf_cv_path_gnatgcc" && ac_cv_path_cf_cv_path_gnatgcc="no" ++ ;; ++esac ++fi ++cf_cv_path_gnatgcc=$ac_cv_path_cf_cv_path_gnatgcc ++ ++if test -n "$cf_cv_path_gnatgcc"; then ++ echo "$as_me:2089: result: $cf_cv_path_gnatgcc" >&5 ++echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6 ++else ++ echo "$as_me:2092: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++ ++ if test "$cf_cv_path_gnatgcc" != no ++ then ++ echo "$as_me:2098: checking for improvement" >&5 ++echo $ECHO_N "checking for improvement... $ECHO_C" >&6 ++ cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null` ++ case "x$cf_file_gnatgcc" in ++ (*script*) ++ cf_cv_path_gnatgcc=`sh -x "$cf_cv_path_gnatgcc" --version 2>&1 | grep -w exec | sed -e 's/^[ ]*+[ ]*//' -e 's/exec[ ]//' -e 's/ .*//'` ++ ;; ++ (*) ++ cf_cv_path_gnatgcc=no ++ ;; ++ esac ++ echo "$as_me:2109: result: $cf_cv_path_gnatgcc" >&5 ++echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6 ++ test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc ++ cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc" ++ fi ++ fi ++fi ++case "$cf_prog_cc" in ++(*/*) ++ CC="$cf_prog_cc" ++ ++ ;; ++(*) + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -1836,7 +2131,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:1839: checking for $ac_word" >&5 ++echo "$as_me:2134: 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 +@@ -1851,7 +2146,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:1854: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2149: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1859,10 +2154,10 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:1862: result: $CC" >&5 ++ echo "$as_me:2157: result: $CC" >&5 + echo "${ECHO_T}$CC" >&6 + else +- echo "$as_me:1865: result: no" >&5 ++ echo "$as_me:2160: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1875,7 +2170,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:1878: checking for $ac_word" >&5 ++echo "$as_me:2173: 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 +@@ -1890,7 +2185,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:1893: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2188: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1898,10 +2193,10 @@ + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- echo "$as_me:1901: result: $ac_ct_CC" >&5 ++ echo "$as_me:2196: result: $ac_ct_CC" >&5 + echo "${ECHO_T}$ac_ct_CC" >&6 + else +- echo "$as_me:1904: result: no" >&5 ++ echo "$as_me:2199: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1911,32 +2206,32 @@ + CC=$ac_ct_CC + fi + +-test -z "$CC" && { { echo "$as_me:1914: error: no acceptable cc found in \$PATH" >&5 ++test -z "$CC" && { { echo "$as_me:2209: 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:1919:" \ ++echo "$as_me:2214:" \ + "checking for C compiler version" >&5 + ac_compiler=`set X $ac_compile; echo "$2"` +-{ (eval echo "$as_me:1922: \"$ac_compiler --version &5\"") >&5 ++{ (eval echo "$as_me:2217: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 + ac_status=$? +- echo "$as_me:1925: \$? = $ac_status" >&5 ++ echo "$as_me:2220: \$? = $ac_status" >&5 + (exit "$ac_status"); } +-{ (eval echo "$as_me:1927: \"$ac_compiler -v &5\"") >&5 ++{ (eval echo "$as_me:2222: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 + ac_status=$? +- echo "$as_me:1930: \$? = $ac_status" >&5 ++ echo "$as_me:2225: \$? = $ac_status" >&5 + (exit "$ac_status"); } +-{ (eval echo "$as_me:1932: \"$ac_compiler -V &5\"") >&5 ++{ (eval echo "$as_me:2227: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 + ac_status=$? +- echo "$as_me:1935: \$? = $ac_status" >&5 ++ echo "$as_me:2230: \$? = $ac_status" >&5 + (exit "$ac_status"); } + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 1939 "configure" ++#line 2234 "configure" + #include "confdefs.h" + + int +@@ -1952,13 +2247,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:1955: checking for C compiler default output" >&5 ++echo "$as_me:2250: 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:1958: \"$ac_link_default\"") >&5 ++if { (eval echo "$as_me:2253: \"$ac_link_default\"") >&5 + (eval $ac_link_default) 2>&5 + ac_status=$? +- echo "$as_me:1961: \$? = $ac_status" >&5 ++ echo "$as_me:2256: \$? = $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 +@@ -1981,34 +2276,34 @@ + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-{ { echo "$as_me:1984: error: C compiler cannot create executables" >&5 ++{ { echo "$as_me:2279: 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:1990: result: $ac_file" >&5 ++echo "$as_me:2285: 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:1995: checking whether the C compiler works" >&5 ++echo "$as_me:2290: 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:2001: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2296: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2004: \$? = $ac_status" >&5 ++ echo "$as_me:2299: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else +- { { echo "$as_me:2011: error: cannot run C compiled programs. ++ { { echo "$as_me:2306: 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;} +@@ -2016,24 +2311,24 @@ + fi + fi + fi +-echo "$as_me:2019: result: yes" >&5 ++echo "$as_me:2314: 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:2026: checking whether we are cross compiling" >&5 ++echo "$as_me:2321: checking whether we are cross compiling" >&5 + echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +-echo "$as_me:2028: result: $cross_compiling" >&5 ++echo "$as_me:2323: result: $cross_compiling" >&5 + echo "${ECHO_T}$cross_compiling" >&6 + +-echo "$as_me:2031: checking for executable suffix" >&5 ++echo "$as_me:2326: checking for executable suffix" >&5 + echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 +-if { (eval echo "$as_me:2033: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:2328: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:2036: \$? = $ac_status" >&5 ++ echo "$as_me:2331: \$? = $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 +@@ -2049,25 +2344,25 @@ + esac + done + else +- { { echo "$as_me:2052: error: cannot compute EXEEXT: cannot compile and link" >&5 ++ { { echo "$as_me:2347: 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:2058: result: $ac_cv_exeext" >&5 ++echo "$as_me:2353: 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:2064: checking for object suffix" >&5 ++echo "$as_me:2359: 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 2070 "configure" ++#line 2365 "configure" + #include "confdefs.h" + + int +@@ -2079,10 +2374,10 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (eval echo "$as_me:2082: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2377: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2085: \$? = $ac_status" >&5 ++ echo "$as_me:2380: \$? = $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 +@@ -2094,24 +2389,24 @@ + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-{ { echo "$as_me:2097: error: cannot compute OBJEXT: cannot compile" >&5 ++{ { echo "$as_me:2392: 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:2104: result: $ac_cv_objext" >&5 ++echo "$as_me:2399: result: $ac_cv_objext" >&5 + echo "${ECHO_T}$ac_cv_objext" >&6 + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-echo "$as_me:2108: checking whether we are using the GNU C compiler" >&5 ++echo "$as_me:2403: 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 2114 "configure" ++#line 2409 "configure" + #include "confdefs.h" + + int +@@ -2126,16 +2421,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:2129: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2424: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2132: \$? = $ac_status" >&5 ++ echo "$as_me:2427: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:2135: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2430: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2138: \$? = $ac_status" >&5 ++ echo "$as_me:2433: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_compiler_gnu=yes + else +@@ -2147,19 +2442,19 @@ + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-echo "$as_me:2150: result: $ac_cv_c_compiler_gnu" >&5 ++echo "$as_me:2445: 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:2156: checking whether $CC accepts -g" >&5 ++echo "$as_me:2451: 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 2162 "configure" ++#line 2457 "configure" + #include "confdefs.h" + + int +@@ -2171,16 +2466,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:2174: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2469: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2177: \$? = $ac_status" >&5 ++ echo "$as_me:2472: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:2180: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2475: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2183: \$? = $ac_status" >&5 ++ echo "$as_me:2478: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_prog_cc_g=yes + else +@@ -2190,7 +2485,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:2193: result: $ac_cv_prog_cc_g" >&5 ++echo "$as_me:2488: 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 +@@ -2217,16 +2512,16 @@ + #endif + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:2220: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2515: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2223: \$? = $ac_status" >&5 ++ echo "$as_me:2518: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:2226: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2521: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2229: \$? = $ac_status" >&5 ++ echo "$as_me:2524: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + for ac_declaration in \ + ''\ +@@ -2238,7 +2533,7 @@ + 'void exit (int);' + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 2241 "configure" ++#line 2536 "configure" + #include "confdefs.h" + #include + $ac_declaration +@@ -2251,16 +2546,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:2254: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2549: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2257: \$? = $ac_status" >&5 ++ echo "$as_me:2552: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:2260: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2555: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2263: \$? = $ac_status" >&5 ++ echo "$as_me:2558: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -2270,7 +2565,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 2273 "configure" ++#line 2568 "configure" + #include "confdefs.h" + $ac_declaration + int +@@ -2282,16 +2577,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:2285: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2580: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2288: \$? = $ac_status" >&5 ++ echo "$as_me:2583: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:2291: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2586: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2294: \$? = $ac_status" >&5 ++ echo "$as_me:2589: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -2321,11 +2616,11 @@ + + GCC_VERSION=none + if test "$GCC" = yes ; then +- echo "$as_me:2324: checking version of $CC" >&5 ++ echo "$as_me:2619: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + test -z "$GCC_VERSION" && GCC_VERSION=unknown +- echo "$as_me:2328: result: $GCC_VERSION" >&5 ++ echo "$as_me:2623: result: $GCC_VERSION" >&5 + echo "${ECHO_T}$GCC_VERSION" >&6 + fi + +@@ -2334,12 +2629,12 @@ + if test "$GCC" = yes ; then + case "$host_os" in + (linux*|gnu*) +- echo "$as_me:2337: checking if this is really Intel C compiler" >&5 ++ echo "$as_me:2632: 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 2342 "configure" ++#line 2637 "configure" + #include "confdefs.h" + + int +@@ -2356,16 +2651,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:2359: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2654: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2362: \$? = $ac_status" >&5 ++ echo "$as_me:2657: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:2365: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2660: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2368: \$? = $ac_status" >&5 ++ echo "$as_me:2663: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + INTEL_COMPILER=yes + cf_save_CFLAGS="$cf_save_CFLAGS -we147" +@@ -2376,7 +2671,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CFLAGS="$cf_save_CFLAGS" +- echo "$as_me:2379: result: $INTEL_COMPILER" >&5 ++ echo "$as_me:2674: result: $INTEL_COMPILER" >&5 + echo "${ECHO_T}$INTEL_COMPILER" >&6 + ;; + esac +@@ -2385,11 +2680,11 @@ + CLANG_COMPILER=no + + if test "$GCC" = yes ; then +- echo "$as_me:2388: checking if this is really Clang C compiler" >&5 ++ echo "$as_me:2683: 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 2392 "configure" ++#line 2687 "configure" + #include "confdefs.h" + + int +@@ -2406,16 +2701,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:2409: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2704: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2412: \$? = $ac_status" >&5 ++ echo "$as_me:2707: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:2415: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2710: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2418: \$? = $ac_status" >&5 ++ echo "$as_me:2713: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + CLANG_COMPILER=yes + +@@ -2425,7 +2720,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CFLAGS="$cf_save_CFLAGS" +- echo "$as_me:2428: result: $CLANG_COMPILER" >&5 ++ echo "$as_me:2723: result: $CLANG_COMPILER" >&5 + echo "${ECHO_T}$CLANG_COMPILER" >&6 + fi + +@@ -2434,30 +2729,30 @@ + if test "x$CLANG_COMPILER" = "xyes" ; then + case "$CC" in + (c[1-9][0-9]|*/c[1-9][0-9]) +- { echo "$as_me:2437: WARNING: replacing broken compiler alias $CC" >&5 ++ { echo "$as_me:2732: 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:2444: checking version of $CC" >&5 ++ echo "$as_me:2739: 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:2448: result: $CLANG_VERSION" >&5 ++ echo "$as_me:2743: 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:2455: checking if option $cf_clang_opt works" >&5 ++ echo "$as_me:2750: 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 2460 "configure" ++#line 2755 "configure" + #include "confdefs.h" + + #include +@@ -2471,16 +2766,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:2474: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:2769: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:2477: \$? = $ac_status" >&5 ++ echo "$as_me:2772: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:2480: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2775: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2483: \$? = $ac_status" >&5 ++ echo "$as_me:2778: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_clang_optok=yes +@@ -2491,13 +2786,13 @@ + cf_clang_optok=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:2494: result: $cf_clang_optok" >&5 ++ echo "$as_me:2789: 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}:2500: testing adding option $cf_clang_opt ..." 1>&5 ++echo "${as_me:-configure}:2795: testing adding option $cf_clang_opt ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_clang_opt" +@@ -2506,7 +2801,7 @@ + done + fi + +-echo "$as_me:2509: checking for $CC option to accept ANSI C" >&5 ++echo "$as_me:2804: 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 +@@ -2514,7 +2809,7 @@ + ac_cv_prog_cc_stdc=no + ac_save_CC=$CC + cat >"conftest.$ac_ext" <<_ACEOF +-#line 2517 "configure" ++#line 2812 "configure" + #include "confdefs.h" + #include + #include +@@ -2561,16 +2856,16 @@ + do + CC="$ac_save_CC $ac_arg" + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:2564: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2859: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2567: \$? = $ac_status" >&5 ++ echo "$as_me:2862: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:2570: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2865: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2573: \$? = $ac_status" >&5 ++ echo "$as_me:2868: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_prog_cc_stdc=$ac_arg + break +@@ -2587,10 +2882,10 @@ + + case "x$ac_cv_prog_cc_stdc" in + x|xno) +- echo "$as_me:2590: result: none needed" >&5 ++ echo "$as_me:2885: result: none needed" >&5 + echo "${ECHO_T}none needed" >&6 ;; + *) +- echo "$as_me:2593: result: $ac_cv_prog_cc_stdc" >&5 ++ echo "$as_me:2888: result: $ac_cv_prog_cc_stdc" >&5 + echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; + esac +@@ -2598,13 +2893,13 @@ + # This should have been defined by AC_PROG_CC + : "${CC:=cc}" + +-echo "$as_me:2601: checking \$CFLAGS variable" >&5 ++echo "$as_me:2896: checking \$CFLAGS variable" >&5 + echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 + case "x$CFLAGS" in + (*-[IUD]*) +- echo "$as_me:2605: result: broken" >&5 ++ echo "$as_me:2900: result: broken" >&5 + echo "${ECHO_T}broken" >&6 +- { echo "$as_me:2607: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 ++ { echo "$as_me:2902: 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= +@@ -2712,18 +3007,18 @@ + done + ;; + (*) +- echo "$as_me:2715: result: ok" >&5 ++ echo "$as_me:3010: result: ok" >&5 + echo "${ECHO_T}ok" >&6 + ;; + esac + +-echo "$as_me:2720: checking \$CC variable" >&5 ++echo "$as_me:3015: checking \$CC variable" >&5 + echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 + case "$CC" in + (*[\ \ ]-*) +- echo "$as_me:2724: result: broken" >&5 ++ echo "$as_me:3019: result: broken" >&5 + echo "${ECHO_T}broken" >&6 +- { echo "$as_me:2726: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 ++ { echo "$as_me:3021: 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/[ ]*[ ]-[^ ].*//'` +@@ -2840,30 +3135,33 @@ + done + test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 + +-echo "${as_me:-configure}:2843: testing resulting CC: '$CC' ..." 1>&5 ++echo "${as_me:-configure}:3138: testing resulting CC: '$CC' ..." 1>&5 + + test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 + +-echo "${as_me:-configure}:2847: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 ++echo "${as_me:-configure}:3142: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 + + test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 + +-echo "${as_me:-configure}:2851: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 ++echo "${as_me:-configure}:3146: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 + + ;; + (*) +- echo "$as_me:2855: result: ok" >&5 ++ echo "$as_me:3150: result: ok" >&5 + echo "${ECHO_T}ok" >&6 + ;; + esac + ++ ;; ++esac ++ + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' + 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:2866: checking how to run the C preprocessor" >&5 ++echo "$as_me:3164: 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 +@@ -2884,18 +3182,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 2887 "configure" ++#line 3185 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:2892: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:3190: \"$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:2898: \$? = $ac_status" >&5 ++ echo "$as_me:3196: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2918,17 +3216,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 2921 "configure" ++#line 3219 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:2925: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:3223: \"$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:2931: \$? = $ac_status" >&5 ++ echo "$as_me:3229: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2965,7 +3263,7 @@ + else + ac_cv_prog_CPP=$CPP + fi +-echo "$as_me:2968: result: $CPP" >&5 ++echo "$as_me:3266: result: $CPP" >&5 + echo "${ECHO_T}$CPP" >&6 + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes +@@ -2975,18 +3273,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 2978 "configure" ++#line 3276 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:2983: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:3281: \"$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:2989: \$? = $ac_status" >&5 ++ echo "$as_me:3287: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -3009,17 +3307,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 3012 "configure" ++#line 3310 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:3016: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:3314: \"$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:3022: \$? = $ac_status" >&5 ++ echo "$as_me:3320: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -3047,7 +3345,7 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:3050: error: C preprocessor \"$CPP\" fails sanity check" >&5 ++ { { echo "$as_me:3348: error: C preprocessor \"$CPP\" fails sanity check" >&5 + echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -3060,14 +3358,14 @@ + ac_main_return="return" + + if test $ac_cv_c_compiler_gnu = yes; then +- echo "$as_me:3063: checking whether $CC needs -traditional" >&5 ++ echo "$as_me:3361: 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 3070 "configure" ++#line 3368 "configure" + #include "confdefs.h" + #include + int Autoconf = TIOCGETP; +@@ -3082,7 +3380,7 @@ + + if test $ac_cv_prog_gcc_traditional = no; then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 3085 "configure" ++#line 3383 "configure" + #include "confdefs.h" + #include + int Autoconf = TCGETA; +@@ -3095,14 +3393,14 @@ + + fi + fi +-echo "$as_me:3098: result: $ac_cv_prog_gcc_traditional" >&5 ++echo "$as_me:3396: 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:3105: checking whether $CC understands -c and -o together" >&5 ++echo "$as_me:3403: 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 +@@ -3117,15 +3415,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:3120: \"$ac_try\"") >&5 ++if { (eval echo "$as_me:3418: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3123: \$? = $ac_status" >&5 ++ echo "$as_me:3421: \$? = $ac_status" >&5 + (exit "$ac_status"); } && +- test -f conftest2.$ac_objext && { (eval echo "$as_me:3125: \"$ac_try\"") >&5 ++ test -f conftest2.$ac_objext && { (eval echo "$as_me:3423: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3128: \$? = $ac_status" >&5 ++ echo "$as_me:3426: \$? = $ac_status" >&5 + (exit "$ac_status"); }; + then + eval cf_cv_prog_CC_c_o=yes +@@ -3136,10 +3434,10 @@ + + fi + if test "$cf_cv_prog_CC_c_o" = yes; then +- echo "$as_me:3139: result: yes" >&5 ++ echo "$as_me:3437: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:3142: result: no" >&5 ++ echo "$as_me:3440: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3153,7 +3451,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:3156: checking for $ac_word" >&5 ++echo "$as_me:3454: 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 +@@ -3170,7 +3468,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:3173: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:3471: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -3181,10 +3479,10 @@ + LDCONFIG=$ac_cv_path_LDCONFIG + + if test -n "$LDCONFIG"; then +- echo "$as_me:3184: result: $LDCONFIG" >&5 ++ echo "$as_me:3482: result: $LDCONFIG" >&5 + echo "${ECHO_T}$LDCONFIG" >&6 + else +- echo "$as_me:3187: result: no" >&5 ++ echo "$as_me:3485: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3192,7 +3490,7 @@ + esac + fi + +-echo "$as_me:3195: checking if you want to ensure bool is consistent with C++" >&5 ++echo "$as_me:3493: 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. +@@ -3202,7 +3500,7 @@ + else + cf_with_cxx=yes + fi; +-echo "$as_me:3205: result: $cf_with_cxx" >&5 ++echo "$as_me:3503: result: $cf_with_cxx" >&5 + echo "${ECHO_T}$cf_with_cxx" >&6 + if test "X$cf_with_cxx" = Xno ; then + CXX="" +@@ -3220,7 +3518,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:3223: checking for $ac_word" >&5 ++echo "$as_me:3521: 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 +@@ -3235,7 +3533,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:3238: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3536: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3243,10 +3541,10 @@ + fi + CXX=$ac_cv_prog_CXX + if test -n "$CXX"; then +- echo "$as_me:3246: result: $CXX" >&5 ++ echo "$as_me:3544: result: $CXX" >&5 + echo "${ECHO_T}$CXX" >&6 + else +- echo "$as_me:3249: result: no" >&5 ++ echo "$as_me:3547: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3259,7 +3557,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:3262: checking for $ac_word" >&5 ++echo "$as_me:3560: 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 +@@ -3274,7 +3572,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:3277: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3575: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3282,10 +3580,10 @@ + fi + ac_ct_CXX=$ac_cv_prog_ac_ct_CXX + if test -n "$ac_ct_CXX"; then +- echo "$as_me:3285: result: $ac_ct_CXX" >&5 ++ echo "$as_me:3583: result: $ac_ct_CXX" >&5 + echo "${ECHO_T}$ac_ct_CXX" >&6 + else +- echo "$as_me:3288: result: no" >&5 ++ echo "$as_me:3586: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3297,32 +3595,32 @@ + fi + + # Provide some information about the compiler. +-echo "$as_me:3300:" \ ++echo "$as_me:3598:" \ + "checking for C++ compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` +-{ (eval echo "$as_me:3303: \"$ac_compiler --version &5\"") >&5 ++{ (eval echo "$as_me:3601: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 + ac_status=$? +- echo "$as_me:3306: \$? = $ac_status" >&5 ++ echo "$as_me:3604: \$? = $ac_status" >&5 + (exit "$ac_status"); } +-{ (eval echo "$as_me:3308: \"$ac_compiler -v &5\"") >&5 ++{ (eval echo "$as_me:3606: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 + ac_status=$? +- echo "$as_me:3311: \$? = $ac_status" >&5 ++ echo "$as_me:3609: \$? = $ac_status" >&5 + (exit "$ac_status"); } +-{ (eval echo "$as_me:3313: \"$ac_compiler -V &5\"") >&5 ++{ (eval echo "$as_me:3611: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 + ac_status=$? +- echo "$as_me:3316: \$? = $ac_status" >&5 ++ echo "$as_me:3614: \$? = $ac_status" >&5 + (exit "$ac_status"); } + +-echo "$as_me:3319: checking whether we are using the GNU C++ compiler" >&5 ++echo "$as_me:3617: 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 3325 "configure" ++#line 3623 "configure" + #include "confdefs.h" + + int +@@ -3337,16 +3635,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:3340: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3638: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3343: \$? = $ac_status" >&5 ++ echo "$as_me:3641: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:3346: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3644: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3349: \$? = $ac_status" >&5 ++ echo "$as_me:3647: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_compiler_gnu=yes + else +@@ -3358,19 +3656,19 @@ + ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + + fi +-echo "$as_me:3361: result: $ac_cv_cxx_compiler_gnu" >&5 ++echo "$as_me:3659: 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:3367: checking whether $CXX accepts -g" >&5 ++echo "$as_me:3665: 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 3373 "configure" ++#line 3671 "configure" + #include "confdefs.h" + + int +@@ -3382,16 +3680,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:3385: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3683: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3388: \$? = $ac_status" >&5 ++ echo "$as_me:3686: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:3391: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3689: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3394: \$? = $ac_status" >&5 ++ echo "$as_me:3692: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_prog_cxx_g=yes + else +@@ -3401,7 +3699,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:3404: result: $ac_cv_prog_cxx_g" >&5 ++echo "$as_me:3702: 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 +@@ -3428,7 +3726,7 @@ + 'void exit (int);' + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 3431 "configure" ++#line 3729 "configure" + #include "confdefs.h" + #include + $ac_declaration +@@ -3441,16 +3739,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:3444: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3742: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3447: \$? = $ac_status" >&5 ++ echo "$as_me:3745: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:3450: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3748: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3453: \$? = $ac_status" >&5 ++ echo "$as_me:3751: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -3460,7 +3758,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 3463 "configure" ++#line 3761 "configure" + #include "confdefs.h" + $ac_declaration + int +@@ -3472,16 +3770,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:3475: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3773: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3478: \$? = $ac_status" >&5 ++ echo "$as_me:3776: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:3481: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3779: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3484: \$? = $ac_status" >&5 ++ echo "$as_me:3782: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -3515,7 +3813,7 @@ + then + # Several of the C++ configurations do not work, particularly when + # cross-compiling (20140913 -TD) +- echo "$as_me:3518: checking if $CXX works" >&5 ++ echo "$as_me:3816: checking if $CXX works" >&5 + echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6 + + save_CPPFLAGS="$CPPFLAGS" +@@ -3523,7 +3821,7 @@ + CPPFLAGS="$CPPFLAGS -I${cf_includedir}" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 3526 "configure" ++#line 3824 "configure" + #include "confdefs.h" + + #include +@@ -3540,16 +3838,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:3543: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3841: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3546: \$? = $ac_status" >&5 ++ echo "$as_me:3844: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:3549: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3847: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3552: \$? = $ac_status" >&5 ++ echo "$as_me:3850: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cxx_works=yes + else +@@ -3560,11 +3858,11 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CPPFLAGS="$save_CPPFLAGS" + +- echo "$as_me:3563: result: $cf_cxx_works" >&5 ++ echo "$as_me:3861: result: $cf_cxx_works" >&5 + echo "${ECHO_T}$cf_cxx_works" >&6 + if test "x$cf_cxx_works" = xno + then +- { echo "$as_me:3567: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5 ++ { echo "$as_me:3865: 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 +@@ -3580,7 +3878,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:3583: checking for $ac_word" >&5 ++echo "$as_me:3881: 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 +@@ -3597,7 +3895,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:3600: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:3898: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -3608,17 +3906,17 @@ + CXX=$ac_cv_path_CXX + + if test -n "$CXX"; then +- echo "$as_me:3611: result: $CXX" >&5 ++ echo "$as_me:3909: result: $CXX" >&5 + echo "${ECHO_T}$CXX" >&6 + else +- echo "$as_me:3614: result: no" >&5 ++ echo "$as_me:3912: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + fi + case "x$CXX" in + (x|xg++) +- { echo "$as_me:3621: WARNING: You don't have any C++ compiler, too bad" >&5 ++ { echo "$as_me:3919: 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=""; + ;; +@@ -3627,7 +3925,7 @@ + + GXX_VERSION=none + if test "$GXX" = yes; then +- echo "$as_me:3630: checking version of ${CXX:-g++}" >&5 ++ echo "$as_me:3928: checking version of ${CXX:-g++}" >&5 + echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6 + GXX_VERSION="`${CXX:-g++} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + if test -z "$GXX_VERSION" +@@ -3635,7 +3933,7 @@ + GXX_VERSION=unknown + GXX=no + fi +- echo "$as_me:3638: result: $GXX_VERSION" >&5 ++ echo "$as_me:3936: result: $GXX_VERSION" >&5 + echo "${ECHO_T}$GXX_VERSION" >&6 + fi + +@@ -3643,12 +3941,12 @@ + ([1-9][0-9].*) + ;; + (1.*|2.[0-6]*) +- { echo "$as_me:3646: WARNING: templates do not work" >&5 ++ { echo "$as_me:3944: WARNING: templates do not work" >&5 + echo "$as_me: WARNING: templates do not work" >&2;} + ;; + esac + +-echo "$as_me:3651: checking if you want to build C++ binding and demo" >&5 ++echo "$as_me:3949: 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. +@@ -3658,15 +3956,15 @@ + else + cf_with_cxx_binding=$cf_with_cxx + fi; +-echo "$as_me:3661: result: $cf_with_cxx_binding" >&5 ++echo "$as_me:3959: result: $cf_with_cxx_binding" >&5 + echo "${ECHO_T}$cf_with_cxx_binding" >&6 + +-echo "$as_me:3664: checking if you want to build with Ada" >&5 ++echo "$as_me:3962: 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:3666: result: $cf_with_ada" >&5 ++echo "$as_me:3964: result: $cf_with_ada" >&5 + echo "${ECHO_T}$cf_with_ada" >&6 + +-echo "$as_me:3669: checking if you want to install terminal database" >&5 ++echo "$as_me:3967: 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. +@@ -3676,10 +3974,10 @@ + else + cf_with_db_install=yes + fi; +-echo "$as_me:3679: result: $cf_with_db_install" >&5 ++echo "$as_me:3977: result: $cf_with_db_install" >&5 + echo "${ECHO_T}$cf_with_db_install" >&6 + +-echo "$as_me:3682: checking if you want to install manpages" >&5 ++echo "$as_me:3980: 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. +@@ -3689,10 +3987,10 @@ + else + cf_with_manpages=yes + fi; +-echo "$as_me:3692: result: $cf_with_manpages" >&5 ++echo "$as_me:3990: result: $cf_with_manpages" >&5 + echo "${ECHO_T}$cf_with_manpages" >&6 + +-echo "$as_me:3695: checking if you want to build programs such as tic" >&5 ++echo "$as_me:3993: 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. +@@ -3702,10 +4000,10 @@ + else + cf_with_progs=yes + fi; +-echo "$as_me:3705: result: $cf_with_progs" >&5 ++echo "$as_me:4003: result: $cf_with_progs" >&5 + echo "${ECHO_T}$cf_with_progs" >&6 + +-echo "$as_me:3708: checking if you want to build test-programs" >&5 ++echo "$as_me:4006: 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. +@@ -3715,10 +4013,10 @@ + else + cf_with_tests=yes + fi; +-echo "$as_me:3718: result: $cf_with_tests" >&5 ++echo "$as_me:4016: result: $cf_with_tests" >&5 + echo "${ECHO_T}$cf_with_tests" >&6 + +-echo "$as_me:3721: checking if you wish to install curses.h" >&5 ++echo "$as_me:4019: 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. +@@ -3728,7 +4026,7 @@ + else + with_curses_h=yes + fi; +-echo "$as_me:3731: result: $with_curses_h" >&5 ++echo "$as_me:4029: result: $with_curses_h" >&5 + echo "${ECHO_T}$with_curses_h" >&6 + + modules_to_build="ncurses" +@@ -3752,7 +4050,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:3755: checking for $ac_word" >&5 ++echo "$as_me:4053: 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 +@@ -3767,7 +4065,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AWK="$ac_prog" +-echo "$as_me:3770: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4068: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3775,17 +4073,17 @@ + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- echo "$as_me:3778: result: $AWK" >&5 ++ echo "$as_me:4076: result: $AWK" >&5 + echo "${ECHO_T}$AWK" >&6 + else +- echo "$as_me:3781: result: no" >&5 ++ echo "$as_me:4079: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + test -n "$AWK" && break + done + +-test -z "$AWK" && { { echo "$as_me:3788: error: No awk program found" >&5 ++test -z "$AWK" && { { echo "$as_me:4086: error: No awk program found" >&5 + echo "$as_me: error: No awk program found" >&2;} + { (exit 1); exit 1; }; } + +@@ -3801,7 +4099,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:3804: checking for a BSD compatible install" >&5 ++echo "$as_me:4102: 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 +@@ -3850,7 +4148,7 @@ + INSTALL=$ac_install_sh + fi + fi +-echo "$as_me:3853: result: $INSTALL" >&5 ++echo "$as_me:4151: result: $INSTALL" >&5 + echo "${ECHO_T}$INSTALL" >&6 + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. +@@ -3875,7 +4173,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:3878: checking for $ac_word" >&5 ++echo "$as_me:4176: 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 +@@ -3890,7 +4188,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_LINT="$ac_prog" +-echo "$as_me:3893: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4191: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3898,10 +4196,10 @@ + fi + LINT=$ac_cv_prog_LINT + if test -n "$LINT"; then +- echo "$as_me:3901: result: $LINT" >&5 ++ echo "$as_me:4199: result: $LINT" >&5 + echo "${ECHO_T}$LINT" >&6 + else +- echo "$as_me:3904: result: no" >&5 ++ echo "$as_me:4202: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3914,18 +4212,18 @@ + ;; + esac + +-echo "$as_me:3917: checking whether ln -s works" >&5 ++echo "$as_me:4215: 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:3921: result: yes" >&5 ++ echo "$as_me:4219: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:3924: result: no, using $LN_S" >&5 ++ echo "$as_me:4222: result: no, using $LN_S" >&5 + echo "${ECHO_T}no, using $LN_S" >&6 + fi + +-echo "$as_me:3928: checking if $LN_S -f options work" >&5 ++echo "$as_me:4226: 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 +@@ -3937,12 +4235,12 @@ + cf_prog_ln_sf=no + fi + rm -f conf$$.dst conf$$src +-echo "$as_me:3940: result: $cf_prog_ln_sf" >&5 ++echo "$as_me:4238: 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:3945: checking for long file names" >&5 ++echo "$as_me:4243: 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 +@@ -3981,7 +4279,7 @@ + rm -rf "$ac_xdir" 2>/dev/null + done + fi +-echo "$as_me:3984: result: $ac_cv_sys_long_file_names" >&5 ++echo "$as_me:4282: 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 + +@@ -4000,7 +4298,7 @@ + withval="$with_config_suffix" + case "x$withval" in + (xyes|xno) +- { echo "$as_me:4003: WARNING: expected a value for config-suffix option" >&5 ++ { echo "$as_me:4301: 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" +@@ -4010,7 +4308,7 @@ + + # If we find pkg-config, check if we should install the ".pc" files. + +-echo "$as_me:4013: checking if you want to use pkg-config" >&5 ++echo "$as_me:4311: 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. +@@ -4020,7 +4318,7 @@ + else + cf_pkg_config=yes + fi; +-echo "$as_me:4023: result: $cf_pkg_config" >&5 ++echo "$as_me:4321: result: $cf_pkg_config" >&5 + echo "${ECHO_T}$cf_pkg_config" >&6 + + case "$cf_pkg_config" in +@@ -4032,7 +4330,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:4035: checking for $ac_word" >&5 ++echo "$as_me:4333: 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 +@@ -4049,7 +4347,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:4052: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:4350: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -4060,10 +4358,10 @@ + PKG_CONFIG=$ac_cv_path_PKG_CONFIG + + if test -n "$PKG_CONFIG"; then +- echo "$as_me:4063: result: $PKG_CONFIG" >&5 ++ echo "$as_me:4361: result: $PKG_CONFIG" >&5 + echo "${ECHO_T}$PKG_CONFIG" >&6 + else +- echo "$as_me:4066: result: no" >&5 ++ echo "$as_me:4364: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4072,7 +4370,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:4075: checking for $ac_word" >&5 ++echo "$as_me:4373: 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 +@@ -4089,7 +4387,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:4092: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:4390: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -4101,10 +4399,10 @@ + ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + + if test -n "$ac_pt_PKG_CONFIG"; then +- echo "$as_me:4104: result: $ac_pt_PKG_CONFIG" >&5 ++ echo "$as_me:4402: result: $ac_pt_PKG_CONFIG" >&5 + echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 + else +- echo "$as_me:4107: result: no" >&5 ++ echo "$as_me:4405: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4147,24 +4445,24 @@ + PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:4150: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 ++ { { echo "$as_me:4448: 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:4157: WARNING: pkg-config is not installed" >&5 ++ { echo "$as_me:4455: 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:4163: checking for pkg-config library directory" >&5 ++ echo "$as_me:4461: checking for pkg-config library directory" >&5 + echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6 + ;; + (*) +- echo "$as_me:4167: checking for $PKG_CONFIG library directory" >&5 ++ echo "$as_me:4465: checking for $PKG_CONFIG library directory" >&5 + echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6 + ;; + esac +@@ -4191,7 +4489,7 @@ + case "x$cf_search_path" in + (xlibdir) + PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' +- echo "$as_me:4194: result: $PKG_CONFIG_LIBDIR" >&5 ++ echo "$as_me:4492: result: $PKG_CONFIG_LIBDIR" >&5 + echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 + cf_search_path= + ;; +@@ -4202,16 +4500,16 @@ + ;; + (x/*) + PKG_CONFIG_LIBDIR="$cf_search_path" +- echo "$as_me:4205: result: $PKG_CONFIG_LIBDIR" >&5 ++ echo "$as_me:4503: result: $PKG_CONFIG_LIBDIR" >&5 + echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 + cf_search_path= + ;; + (xyes|xauto) +- echo "$as_me:4210: result: auto" >&5 ++ echo "$as_me:4508: 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:4214: checking for search-list" >&5 ++ echo "$as_me:4512: checking for search-list" >&5 + echo $ECHO_N "checking for search-list... $ECHO_C" >&6 + if test "x$PKG_CONFIG" != xnone + then +@@ -4238,11 +4536,11 @@ + "` + fi + +- echo "$as_me:4241: result: $cf_search_path" >&5 ++ echo "$as_me:4539: result: $cf_search_path" >&5 + echo "${ECHO_T}$cf_search_path" >&6 + ;; + (*) +- { { echo "$as_me:4245: error: Unexpected option value: $cf_search_path" >&5 ++ { { echo "$as_me:4543: error: Unexpected option value: $cf_search_path" >&5 + echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -4250,7 +4548,7 @@ + + if test -n "$cf_search_path" + then +- echo "$as_me:4253: checking for first directory" >&5 ++ echo "$as_me:4551: 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 +@@ -4261,7 +4559,7 @@ + break + fi + done +- echo "$as_me:4264: result: $cf_pkg_config_path" >&5 ++ echo "$as_me:4562: result: $cf_pkg_config_path" >&5 + echo "${ECHO_T}$cf_pkg_config_path" >&6 + + if test "x$cf_pkg_config_path" != xnone ; then +@@ -4271,7 +4569,7 @@ + + if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path" + then +- echo "$as_me:4274: checking for workaround" >&5 ++ echo "$as_me:4572: checking for workaround" >&5 + echo $ECHO_N "checking for workaround... $ECHO_C" >&6 + if test "$prefix" = "NONE" ; then + cf_prefix="$ac_default_prefix" +@@ -4294,17 +4592,17 @@ + esac + done + test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup +- echo "$as_me:4297: result: $PKG_CONFIG_LIBDIR" >&5 ++ echo "$as_me:4595: result: $PKG_CONFIG_LIBDIR" >&5 + echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 + fi + fi + + if test "x$PKG_CONFIG" != xnone + then +- echo "$as_me:4304: checking if we should install .pc files for $PKG_CONFIG" >&5 ++ echo "$as_me:4602: 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:4307: checking if we should install .pc files" >&5 ++ echo "$as_me:4605: checking if we should install .pc files" >&5 + echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6 + fi + +@@ -4315,7 +4613,7 @@ + else + enable_pc_files=no + fi; +-echo "$as_me:4318: result: $enable_pc_files" >&5 ++echo "$as_me:4616: result: $enable_pc_files" >&5 + echo "${ECHO_T}$enable_pc_files" >&6 + + if test "x$enable_pc_files" != xno +@@ -4323,7 +4621,7 @@ + MAKE_PC_FILES= + case "x$PKG_CONFIG_LIBDIR" in + (xno|xnone|xyes|x) +- { echo "$as_me:4326: WARNING: no PKG_CONFIG_LIBDIR was found" >&5 ++ { echo "$as_me:4624: WARNING: no PKG_CONFIG_LIBDIR was found" >&5 + echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;} + ;; + (*) +@@ -4354,7 +4652,7 @@ + cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:4357: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5 ++ { { echo "$as_me:4655: 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; }; } + ;; +@@ -4368,7 +4666,7 @@ + + if test -z "$MAKE_PC_FILES" + then +- echo "$as_me:4371: checking for suffix to add to pkg-config files" >&5 ++ echo "$as_me:4669: checking for suffix to add to pkg-config files" >&5 + echo $ECHO_N "checking for suffix to add to pkg-config files... $ECHO_C" >&6 + + # Check whether --with-pc-suffix or --without-pc-suffix was given. +@@ -4383,13 +4681,13 @@ + esac + fi; + test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none +- echo "$as_me:4386: result: $PC_MODULE_SUFFIX" >&5 ++ echo "$as_me:4684: result: $PC_MODULE_SUFFIX" >&5 + echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6 + test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX= + + fi + +-echo "$as_me:4392: checking if we should assume mixed-case filenames" >&5 ++echo "$as_me:4690: 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. +@@ -4399,11 +4697,11 @@ + else + enable_mixedcase=auto + fi; +-echo "$as_me:4402: result: $enable_mixedcase" >&5 ++echo "$as_me:4700: result: $enable_mixedcase" >&5 + echo "${ECHO_T}$enable_mixedcase" >&6 + if test "$enable_mixedcase" = "auto" ; then + +-echo "$as_me:4406: checking if filesystem supports mixed-case filenames" >&5 ++echo "$as_me:4704: 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 +@@ -4430,7 +4728,7 @@ + fi + + fi +-echo "$as_me:4433: result: $cf_cv_mixedcase" >&5 ++echo "$as_me:4731: result: $cf_cv_mixedcase" >&5 + echo "${ECHO_T}$cf_cv_mixedcase" >&6 + test "$cf_cv_mixedcase" = yes && + cat >>confdefs.h <<\EOF +@@ -4449,7 +4747,7 @@ + fi + + # do this after mixed-case option (tags/TAGS is not as important as tic). +-echo "$as_me:4452: checking whether ${MAKE-make} sets \${MAKE}" >&5 ++echo "$as_me:4750: 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 +@@ -4469,16 +4767,16 @@ + rm -f conftest.make + fi + if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then +- echo "$as_me:4472: result: yes" >&5 ++ echo "$as_me:4770: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + SET_MAKE= + else +- echo "$as_me:4476: result: no" >&5 ++ echo "$as_me:4774: result: no" >&5 + echo "${ECHO_T}no" >&6 + SET_MAKE="MAKE=${MAKE-make}" + fi + +-echo "$as_me:4481: checking for \".PHONY\" make-support" >&5 ++echo "$as_me:4779: 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 +@@ -4533,7 +4831,7 @@ + rm -rf conftest* + + fi +-echo "$as_me:4536: result: $cf_cv_make_PHONY" >&5 ++echo "$as_me:4834: result: $cf_cv_make_PHONY" >&5 + echo "${ECHO_T}$cf_cv_make_PHONY" >&6 + MAKE_NO_PHONY="#" + MAKE_PHONY="#" +@@ -4544,7 +4842,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:4547: checking for $ac_word" >&5 ++echo "$as_me:4845: 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 +@@ -4559,7 +4857,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CTAGS="$ac_prog" +-echo "$as_me:4562: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4860: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4567,10 +4865,10 @@ + fi + CTAGS=$ac_cv_prog_CTAGS + if test -n "$CTAGS"; then +- echo "$as_me:4570: result: $CTAGS" >&5 ++ echo "$as_me:4868: result: $CTAGS" >&5 + echo "${ECHO_T}$CTAGS" >&6 + else +- echo "$as_me:4573: result: no" >&5 ++ echo "$as_me:4871: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4581,7 +4879,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:4584: checking for $ac_word" >&5 ++echo "$as_me:4882: 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 +@@ -4596,7 +4894,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ETAGS="$ac_prog" +-echo "$as_me:4599: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4897: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4604,10 +4902,10 @@ + fi + ETAGS=$ac_cv_prog_ETAGS + if test -n "$ETAGS"; then +- echo "$as_me:4607: result: $ETAGS" >&5 ++ echo "$as_me:4905: result: $ETAGS" >&5 + echo "${ECHO_T}$ETAGS" >&6 + else +- echo "$as_me:4610: result: no" >&5 ++ echo "$as_me:4908: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4616,7 +4914,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:4619: checking for $ac_word" >&5 ++echo "$as_me:4917: 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 +@@ -4631,7 +4929,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:4634: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4932: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4640,17 +4938,17 @@ + fi + MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS + if test -n "$MAKE_LOWER_TAGS"; then +- echo "$as_me:4643: result: $MAKE_LOWER_TAGS" >&5 ++ echo "$as_me:4941: result: $MAKE_LOWER_TAGS" >&5 + echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 + else +- echo "$as_me:4646: result: no" >&5 ++ echo "$as_me:4944: 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:4653: checking for $ac_word" >&5 ++echo "$as_me:4951: 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 +@@ -4665,7 +4963,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:4668: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4966: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4674,10 +4972,10 @@ + fi + MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS + if test -n "$MAKE_UPPER_TAGS"; then +- echo "$as_me:4677: result: $MAKE_UPPER_TAGS" >&5 ++ echo "$as_me:4975: result: $MAKE_UPPER_TAGS" >&5 + echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 + else +- echo "$as_me:4680: result: no" >&5 ++ echo "$as_me:4978: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4697,7 +4995,7 @@ + MAKE_LOWER_TAGS="#" + fi + +-echo "$as_me:4700: checking for makeflags variable" >&5 ++echo "$as_me:4998: 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 +@@ -4727,7 +5025,7 @@ + ;; + (*) + +-echo "${as_me:-configure}:4730: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 ++echo "${as_me:-configure}:5028: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 + + ;; + esac +@@ -4735,13 +5033,13 @@ + rm -f cf_makeflags.tmp + + fi +-echo "$as_me:4738: result: $cf_cv_makeflags" >&5 ++echo "$as_me:5036: 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:4744: checking for $ac_word" >&5 ++echo "$as_me:5042: 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 +@@ -4756,7 +5054,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:4759: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5057: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4764,10 +5062,10 @@ + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- echo "$as_me:4767: result: $RANLIB" >&5 ++ echo "$as_me:5065: result: $RANLIB" >&5 + echo "${ECHO_T}$RANLIB" >&6 + else +- echo "$as_me:4770: result: no" >&5 ++ echo "$as_me:5068: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4776,7 +5074,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:4779: checking for $ac_word" >&5 ++echo "$as_me:5077: 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 +@@ -4791,7 +5089,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:4794: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5092: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4800,10 +5098,10 @@ + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- echo "$as_me:4803: result: $ac_ct_RANLIB" >&5 ++ echo "$as_me:5101: result: $ac_ct_RANLIB" >&5 + echo "${ECHO_T}$ac_ct_RANLIB" >&6 + else +- echo "$as_me:4806: result: no" >&5 ++ echo "$as_me:5104: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4815,7 +5113,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:4818: checking for $ac_word" >&5 ++echo "$as_me:5116: 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 +@@ -4830,7 +5128,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:4833: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5131: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4838,10 +5136,10 @@ + fi + LD=$ac_cv_prog_LD + if test -n "$LD"; then +- echo "$as_me:4841: result: $LD" >&5 ++ echo "$as_me:5139: result: $LD" >&5 + echo "${ECHO_T}$LD" >&6 + else +- echo "$as_me:4844: result: no" >&5 ++ echo "$as_me:5142: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4850,7 +5148,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:4853: checking for $ac_word" >&5 ++echo "$as_me:5151: 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 +@@ -4865,7 +5163,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:4868: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5166: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4874,10 +5172,10 @@ + fi + ac_ct_LD=$ac_cv_prog_ac_ct_LD + if test -n "$ac_ct_LD"; then +- echo "$as_me:4877: result: $ac_ct_LD" >&5 ++ echo "$as_me:5175: result: $ac_ct_LD" >&5 + echo "${ECHO_T}$ac_ct_LD" >&6 + else +- echo "$as_me:4880: result: no" >&5 ++ echo "$as_me:5178: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4889,7 +5187,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:4892: checking for $ac_word" >&5 ++echo "$as_me:5190: 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 +@@ -4904,7 +5202,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:4907: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5205: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4912,10 +5210,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:4915: result: $AR" >&5 ++ echo "$as_me:5213: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:4918: result: no" >&5 ++ echo "$as_me:5216: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4924,7 +5222,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:4927: checking for $ac_word" >&5 ++echo "$as_me:5225: 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 +@@ -4939,7 +5237,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:4942: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5240: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4948,10 +5246,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:4951: result: $ac_ct_AR" >&5 ++ echo "$as_me:5249: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:4954: result: no" >&5 ++ echo "$as_me:5252: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4963,7 +5261,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:4966: checking for $ac_word" >&5 ++echo "$as_me:5264: 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 +@@ -4978,7 +5276,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:4981: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5279: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4986,10 +5284,10 @@ + fi + NM=$ac_cv_prog_NM + if test -n "$NM"; then +- echo "$as_me:4989: result: $NM" >&5 ++ echo "$as_me:5287: result: $NM" >&5 + echo "${ECHO_T}$NM" >&6 + else +- echo "$as_me:4992: result: no" >&5 ++ echo "$as_me:5290: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4998,7 +5296,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:5001: checking for $ac_word" >&5 ++echo "$as_me:5299: 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 +@@ -5013,7 +5311,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:5016: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5314: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5022,10 +5320,10 @@ + fi + ac_ct_NM=$ac_cv_prog_ac_ct_NM + if test -n "$ac_ct_NM"; then +- echo "$as_me:5025: result: $ac_ct_NM" >&5 ++ echo "$as_me:5323: result: $ac_ct_NM" >&5 + echo "${ECHO_T}$ac_ct_NM" >&6 + else +- echo "$as_me:5028: result: no" >&5 ++ echo "$as_me:5326: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5037,7 +5335,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:5040: checking for $ac_word" >&5 ++echo "$as_me:5338: 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 +@@ -5052,7 +5350,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:5055: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5353: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5060,10 +5358,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:5063: result: $AR" >&5 ++ echo "$as_me:5361: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:5066: result: no" >&5 ++ echo "$as_me:5364: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5072,7 +5370,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:5075: checking for $ac_word" >&5 ++echo "$as_me:5373: 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 +@@ -5087,7 +5385,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:5090: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5388: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5096,10 +5394,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:5099: result: $ac_ct_AR" >&5 ++ echo "$as_me:5397: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:5102: result: no" >&5 ++ echo "$as_me:5400: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5108,7 +5406,7 @@ + AR="$ac_cv_prog_AR" + fi + +-echo "$as_me:5111: checking for options to update archives" >&5 ++echo "$as_me:5409: 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 +@@ -5145,13 +5443,13 @@ + rm -f conftest.a + + cat >"conftest.$ac_ext" <&5 ++ if { (eval echo "$as_me:5449: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5154: \$? = $ac_status" >&5 ++ echo "$as_me:5452: \$? = $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 +@@ -5162,7 +5460,7 @@ + else + test -n "$verbose" && echo " cannot compile test-program" 1>&6 + +-echo "${as_me:-configure}:5165: testing cannot compile test-program ..." 1>&5 ++echo "${as_me:-configure}:5463: testing cannot compile test-program ..." 1>&5 + + break + fi +@@ -5172,7 +5470,7 @@ + esac + + fi +-echo "$as_me:5175: result: $cf_cv_ar_flags" >&5 ++echo "$as_me:5473: result: $cf_cv_ar_flags" >&5 + echo "${ECHO_T}$cf_cv_ar_flags" >&6 + + if test -n "$ARFLAGS" ; then +@@ -5183,7 +5481,7 @@ + ARFLAGS=$cf_cv_ar_flags + fi + +-echo "$as_me:5186: checking for an installation directory prefix" >&5 ++echo "$as_me:5484: checking for an installation directory prefix" >&5 + echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6 + + # Check whether --with-install-prefix or --without-install-prefix was given. +@@ -5196,7 +5494,7 @@ + ;; + esac + fi; +-echo "$as_me:5199: result: ${DESTDIR:-(none)}" >&5 ++echo "$as_me:5497: result: ${DESTDIR:-(none)}" >&5 + echo "${ECHO_T}${DESTDIR:-(none)}" >&6 + + ############################################################################### +@@ -5231,7 +5529,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:5234: checking for $ac_word" >&5 ++echo "$as_me:5532: 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 +@@ -5246,7 +5544,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:5249: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5547: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5254,10 +5552,10 @@ + fi + BUILD_CC=$ac_cv_prog_BUILD_CC + if test -n "$BUILD_CC"; then +- echo "$as_me:5257: result: $BUILD_CC" >&5 ++ echo "$as_me:5555: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + else +- echo "$as_me:5260: result: no" >&5 ++ echo "$as_me:5558: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5266,12 +5564,12 @@ + test -n "$BUILD_CC" || BUILD_CC="none" + + fi; +- echo "$as_me:5269: checking for native build C compiler" >&5 ++ echo "$as_me:5567: checking for native build C compiler" >&5 + echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 +- echo "$as_me:5271: result: $BUILD_CC" >&5 ++ echo "$as_me:5569: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + +- echo "$as_me:5274: checking for native build C preprocessor" >&5 ++ echo "$as_me:5572: 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. +@@ -5281,10 +5579,10 @@ + else + BUILD_CPP='${BUILD_CC} -E' + fi; +- echo "$as_me:5284: result: $BUILD_CPP" >&5 ++ echo "$as_me:5582: result: $BUILD_CPP" >&5 + echo "${ECHO_T}$BUILD_CPP" >&6 + +- echo "$as_me:5287: checking for native build C flags" >&5 ++ echo "$as_me:5585: 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. +@@ -5292,10 +5590,10 @@ + withval="$with_build_cflags" + BUILD_CFLAGS="$withval" + fi; +- echo "$as_me:5295: result: $BUILD_CFLAGS" >&5 ++ echo "$as_me:5593: result: $BUILD_CFLAGS" >&5 + echo "${ECHO_T}$BUILD_CFLAGS" >&6 + +- echo "$as_me:5298: checking for native build C preprocessor-flags" >&5 ++ echo "$as_me:5596: 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. +@@ -5303,10 +5601,10 @@ + withval="$with_build_cppflags" + BUILD_CPPFLAGS="$withval" + fi; +- echo "$as_me:5306: result: $BUILD_CPPFLAGS" >&5 ++ echo "$as_me:5604: result: $BUILD_CPPFLAGS" >&5 + echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 + +- echo "$as_me:5309: checking for native build linker-flags" >&5 ++ echo "$as_me:5607: 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. +@@ -5314,10 +5612,10 @@ + withval="$with_build_ldflags" + BUILD_LDFLAGS="$withval" + fi; +- echo "$as_me:5317: result: $BUILD_LDFLAGS" >&5 ++ echo "$as_me:5615: result: $BUILD_LDFLAGS" >&5 + echo "${ECHO_T}$BUILD_LDFLAGS" >&6 + +- echo "$as_me:5320: checking for native build linker-libraries" >&5 ++ echo "$as_me:5618: 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. +@@ -5325,7 +5623,7 @@ + withval="$with_build_libs" + BUILD_LIBS="$withval" + fi; +- echo "$as_me:5328: result: $BUILD_LIBS" >&5 ++ echo "$as_me:5626: result: $BUILD_LIBS" >&5 + echo "${ECHO_T}$BUILD_LIBS" >&6 + + # this assumes we're on Unix. +@@ -5334,7 +5632,7 @@ + + : ${BUILD_CC:='${CC}'} + +- echo "$as_me:5337: checking if the build-compiler \"$BUILD_CC\" works" >&5 ++ echo "$as_me:5635: checking if the build-compiler \"$BUILD_CC\" works" >&5 + echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6 + + cf_save_crossed=$cross_compiling +@@ -5348,7 +5646,7 @@ + cf_ok_build_cc=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5351 "configure" ++#line 5649 "configure" + #include "confdefs.h" + #include + int main(int argc, char *argv[]) +@@ -5358,15 +5656,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:5361: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5659: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5364: \$? = $ac_status" >&5 ++ echo "$as_me:5662: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:5366: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5664: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5369: \$? = $ac_status" >&5 ++ echo "$as_me:5667: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_ok_build_cc=yes + else +@@ -5381,12 +5679,12 @@ + cross_compiling=$cf_save_crossed + ac_link=$cf_save_ac_link + +- echo "$as_me:5384: result: $cf_ok_build_cc" >&5 ++ echo "$as_me:5682: result: $cf_ok_build_cc" >&5 + echo "${ECHO_T}$cf_ok_build_cc" >&6 + + if test "$cf_ok_build_cc" != yes + then +- { { echo "$as_me:5389: error: Cross-build requires two compilers. ++ { { echo "$as_me:5687: 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;} +@@ -5397,9 +5695,9 @@ + : ${BUILD_CC:='${CC}'} + : ${BUILD_CPP:='${CPP}'} + : ${BUILD_CFLAGS:='${CFLAGS}'} +- : ${BUILD_CPPFLAGS:='${CPPFLAGS}'} ++ : ${BUILD_CPPFLAGS:=''${CPPFLAGS}''} + : ${BUILD_LDFLAGS:='${LDFLAGS}'} +- : ${BUILD_LIBS:='${LIBS}'} ++ : ${BUILD_LIBS:=''${LIBS}''} + : ${BUILD_EXEEXT:='$x'} + : ${BUILD_OBJEXT:='o'} + fi +@@ -5411,7 +5709,7 @@ + ### shared, for example. + cf_list_models="" + +-echo "$as_me:5414: checking if libtool -version-number should be used" >&5 ++echo "$as_me:5712: 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. +@@ -5428,7 +5726,7 @@ + cf_libtool_version=yes + + fi; +-echo "$as_me:5431: result: $cf_libtool_version" >&5 ++echo "$as_me:5729: result: $cf_libtool_version" >&5 + echo "${ECHO_T}$cf_libtool_version" >&6 + + if test "$cf_libtool_version" = yes ; then +@@ -5437,25 +5735,25 @@ + LIBTOOL_VERSION="-version-info" + case "x$VERSION" in + (x) +- { echo "$as_me:5440: WARNING: VERSION was not set" >&5 ++ { echo "$as_me:5738: 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}:5447: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 ++echo "${as_me:-configure}:5745: 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}:5454: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 ++echo "${as_me:-configure}:5752: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 + + ;; + (*) +- { echo "$as_me:5458: WARNING: unexpected VERSION value: $VERSION" >&5 ++ { echo "$as_me:5756: WARNING: unexpected VERSION value: $VERSION" >&5 + echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;} + ;; + esac +@@ -5477,7 +5775,7 @@ + LIB_INSTALL= + LIB_UNINSTALL= + +-echo "$as_me:5480: checking if you want to build libraries with libtool" >&5 ++echo "$as_me:5778: 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. +@@ -5487,7 +5785,7 @@ + else + with_libtool=no + fi; +-echo "$as_me:5490: result: $with_libtool" >&5 ++echo "$as_me:5788: result: $with_libtool" >&5 + echo "${ECHO_T}$with_libtool" >&6 + if test "$with_libtool" != "no"; then + +@@ -5518,7 +5816,7 @@ + with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:5521: error: expected a pathname, not \"$with_libtool\"" >&5 ++ { { echo "$as_me:5819: error: expected a pathname, not \"$with_libtool\"" >&5 + echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -5531,7 +5829,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:5534: checking for $ac_word" >&5 ++echo "$as_me:5832: 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 +@@ -5546,7 +5844,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:5549: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5847: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5554,10 +5852,10 @@ + fi + LIBTOOL=$ac_cv_prog_LIBTOOL + if test -n "$LIBTOOL"; then +- echo "$as_me:5557: result: $LIBTOOL" >&5 ++ echo "$as_me:5855: result: $LIBTOOL" >&5 + echo "${ECHO_T}$LIBTOOL" >&6 + else +- echo "$as_me:5560: result: no" >&5 ++ echo "$as_me:5858: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5570,7 +5868,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:5573: checking for $ac_word" >&5 ++echo "$as_me:5871: 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 +@@ -5585,7 +5883,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:5588: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5886: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5593,10 +5891,10 @@ + fi + ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL + if test -n "$ac_ct_LIBTOOL"; then +- echo "$as_me:5596: result: $ac_ct_LIBTOOL" >&5 ++ echo "$as_me:5894: result: $ac_ct_LIBTOOL" >&5 + echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 + else +- echo "$as_me:5599: result: no" >&5 ++ echo "$as_me:5897: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5627,7 +5925,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:5630: checking for $ac_word" >&5 ++echo "$as_me:5928: 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 +@@ -5642,7 +5940,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:5645: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5943: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5650,10 +5948,10 @@ + fi + LIBTOOL=$ac_cv_prog_LIBTOOL + if test -n "$LIBTOOL"; then +- echo "$as_me:5653: result: $LIBTOOL" >&5 ++ echo "$as_me:5951: result: $LIBTOOL" >&5 + echo "${ECHO_T}$LIBTOOL" >&6 + else +- echo "$as_me:5656: result: no" >&5 ++ echo "$as_me:5954: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5666,7 +5964,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:5669: checking for $ac_word" >&5 ++echo "$as_me:5967: 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 +@@ -5681,7 +5979,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:5684: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5982: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5689,10 +5987,10 @@ + fi + ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL + if test -n "$ac_ct_LIBTOOL"; then +- echo "$as_me:5692: result: $ac_ct_LIBTOOL" >&5 ++ echo "$as_me:5990: result: $ac_ct_LIBTOOL" >&5 + echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 + else +- echo "$as_me:5695: result: no" >&5 ++ echo "$as_me:5993: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5714,7 +6012,7 @@ + fi + fi + if test -z "$LIBTOOL" ; then +- { { echo "$as_me:5717: error: Cannot find libtool" >&5 ++ { { echo "$as_me:6015: error: Cannot find libtool" >&5 + echo "$as_me: error: Cannot find libtool" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5730,7 +6028,7 @@ + + if test -n "$LIBTOOL" && test "$LIBTOOL" != none + then +- echo "$as_me:5733: checking version of $LIBTOOL" >&5 ++ echo "$as_me:6031: checking version of $LIBTOOL" >&5 + echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6 + + if test -n "$LIBTOOL" && test "$LIBTOOL" != none +@@ -5741,7 +6039,7 @@ + fi + test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version + +- echo "$as_me:5744: result: $cf_cv_libtool_version" >&5 ++ echo "$as_me:6042: result: $cf_cv_libtool_version" >&5 + echo "${ECHO_T}$cf_cv_libtool_version" >&6 + if test -n "$cf_cv_libtool_version" + then +@@ -5750,18 +6048,18 @@ + (*...GNU-libtool...*) + ;; + (*) +- { { echo "$as_me:5753: error: This is not GNU libtool" >&5 ++ { { echo "$as_me:6051: 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:5759: error: No version found for $LIBTOOL" >&5 ++ { { echo "$as_me:6057: 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:5764: error: GNU libtool has not been found" >&5 ++ { { echo "$as_me:6062: error: GNU libtool has not been found" >&5 + echo "$as_me: error: GNU libtool has not been found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5797,7 +6095,7 @@ + + else + +-echo "$as_me:5800: checking if you want to build shared libraries" >&5 ++echo "$as_me:6098: 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. +@@ -5807,11 +6105,11 @@ + else + with_shared=no + fi; +-echo "$as_me:5810: result: $with_shared" >&5 ++echo "$as_me:6108: 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:5814: checking if you want to build static libraries" >&5 ++echo "$as_me:6112: 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. +@@ -5821,11 +6119,11 @@ + else + with_normal=yes + fi; +-echo "$as_me:5824: result: $with_normal" >&5 ++echo "$as_me:6122: 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:5828: checking if you want to build debug libraries" >&5 ++echo "$as_me:6126: 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. +@@ -5835,11 +6133,11 @@ + else + with_debug=yes + fi; +-echo "$as_me:5838: result: $with_debug" >&5 ++echo "$as_me:6136: 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:5842: checking if you want to build profiling libraries" >&5 ++echo "$as_me:6140: 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. +@@ -5849,7 +6147,7 @@ + else + with_profile=no + fi; +-echo "$as_me:5852: result: $with_profile" >&5 ++echo "$as_me:6150: result: $with_profile" >&5 + echo "${ECHO_T}$with_profile" >&6 + test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile" + +@@ -5857,7 +6155,7 @@ + + if test "X$cf_with_cxx_binding" != Xno; then + if test "x$with_shared" = "xyes"; then +-echo "$as_me:5860: checking if you want to build C++ shared libraries" >&5 ++echo "$as_me:6158: 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. +@@ -5867,26 +6165,26 @@ + else + with_shared_cxx=no + fi; +-echo "$as_me:5870: result: $with_shared_cxx" >&5 ++echo "$as_me:6168: result: $with_shared_cxx" >&5 + echo "${ECHO_T}$with_shared_cxx" >&6 + fi + fi + + ############################################################################### + +-echo "$as_me:5877: checking for specified models" >&5 ++echo "$as_me:6175: 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:5881: result: $cf_list_models" >&5 ++echo "$as_me:6179: 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:5886: checking for default model" >&5 ++echo "$as_me:6184: 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:5889: result: $DFT_LWR_MODEL" >&5 ++echo "$as_me:6187: result: $DFT_LWR_MODEL" >&5 + echo "${ECHO_T}$DFT_LWR_MODEL" >&6 + + DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +@@ -5900,7 +6198,7 @@ + LIB_DIR=../lib + LIB_2ND=../../lib + +-echo "$as_me:5903: checking if you want to have a library-prefix" >&5 ++echo "$as_me:6201: 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. +@@ -5910,7 +6208,7 @@ + else + with_lib_prefix=auto + fi; +-echo "$as_me:5913: result: $with_lib_prefix" >&5 ++echo "$as_me:6211: result: $with_lib_prefix" >&5 + echo "${ECHO_T}$with_lib_prefix" >&6 + + if test "$with_lib_prefix" = auto +@@ -5941,24 +6239,24 @@ + + LIB_SUFFIX= + +- echo "$as_me:5944: checking for PATH separator" >&5 ++ echo "$as_me:6242: 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:5951: result: $PATH_SEPARATOR" >&5 ++ echo "$as_me:6249: result: $PATH_SEPARATOR" >&5 + echo "${ECHO_T}$PATH_SEPARATOR" >&6 + + # headers needed for checks... +-echo "$as_me:5955: checking for ANSI C header files" >&5 ++echo "$as_me:6253: 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 5961 "configure" ++#line 6259 "configure" + #include "confdefs.h" + #include + #include +@@ -5966,13 +6264,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:5969: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:6267: \"$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:5975: \$? = $ac_status" >&5 ++ echo "$as_me:6273: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -5994,7 +6292,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 5997 "configure" ++#line 6295 "configure" + #include "confdefs.h" + #include + +@@ -6012,7 +6310,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 6015 "configure" ++#line 6313 "configure" + #include "confdefs.h" + #include + +@@ -6033,7 +6331,7 @@ + : + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6036 "configure" ++#line 6334 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -6059,15 +6357,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:6062: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6360: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6065: \$? = $ac_status" >&5 ++ echo "$as_me:6363: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:6067: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6365: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6070: \$? = $ac_status" >&5 ++ echo "$as_me:6368: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -6080,7 +6378,7 @@ + fi + fi + fi +-echo "$as_me:6083: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:6381: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -6096,28 +6394,28 @@ + inttypes.h stdint.h unistd.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:6099: checking for $ac_header" >&5 ++echo "$as_me:6397: 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 6105 "configure" ++#line 6403 "configure" + #include "confdefs.h" + $ac_includes_default + #include <$ac_header> + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:6111: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6409: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6114: \$? = $ac_status" >&5 ++ echo "$as_me:6412: \$? = $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:6415: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6120: \$? = $ac_status" >&5 ++ echo "$as_me:6418: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Header=yes" + else +@@ -6127,7 +6425,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:6130: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:6428: 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:6438: checking whether exit is declared" >&5 + echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6 + if test "${ac_cv_have_decl_exit+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6146 "configure" ++#line 6444 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -6158,16 +6456,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:6161: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6459: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6164: \$? = $ac_status" >&5 ++ echo "$as_me:6462: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:6167: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6465: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6170: \$? = $ac_status" >&5 ++ echo "$as_me:6468: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_have_decl_exit=yes + else +@@ -6177,19 +6475,19 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:6180: result: $ac_cv_have_decl_exit" >&5 ++echo "$as_me:6478: result: $ac_cv_have_decl_exit" >&5 + echo "${ECHO_T}$ac_cv_have_decl_exit" >&6 + + 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:6186: checking for $ac_hdr that defines DIR" >&5 ++echo "$as_me:6484: 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 6192 "configure" ++#line 6490 "configure" + #include "confdefs.h" + #include + #include <$ac_hdr> +@@ -6204,16 +6502,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:6207: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6505: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6210: \$? = $ac_status" >&5 ++ echo "$as_me:6508: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:6213: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6511: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6216: \$? = $ac_status" >&5 ++ echo "$as_me:6514: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Header=yes" + else +@@ -6223,7 +6521,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:6226: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:6524: 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:6537: 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 +@@ -6244,7 +6542,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldir $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6247 "configure" ++#line 6545 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6263,16 +6561,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6266: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6564: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6269: \$? = $ac_status" >&5 ++ echo "$as_me:6567: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6272: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6570: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6275: \$? = $ac_status" >&5 ++ echo "$as_me:6573: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dir_opendir=yes + else +@@ -6283,14 +6581,14 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6286: result: $ac_cv_lib_dir_opendir" >&5 ++echo "$as_me:6584: 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:6293: checking for opendir in -lx" >&5 ++ echo "$as_me:6591: 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 +@@ -6298,7 +6596,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lx $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6301 "configure" ++#line 6599 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6317,16 +6615,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6320: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6618: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6323: \$? = $ac_status" >&5 ++ echo "$as_me:6621: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6326: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6624: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6329: \$? = $ac_status" >&5 ++ echo "$as_me:6627: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_x_opendir=yes + else +@@ -6337,7 +6635,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6340: result: $ac_cv_lib_x_opendir" >&5 ++echo "$as_me:6638: 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" +@@ -6347,7 +6645,7 @@ + + ############################################################################### + +-echo "$as_me:6350: checking if you want to build a separate terminfo library" >&5 ++echo "$as_me:6648: 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. +@@ -6357,10 +6655,10 @@ + else + with_termlib=no + fi; +-echo "$as_me:6360: result: $with_termlib" >&5 ++echo "$as_me:6658: result: $with_termlib" >&5 + echo "${ECHO_T}$with_termlib" >&6 + +-echo "$as_me:6363: checking if you want to build a separate tic library" >&5 ++echo "$as_me:6661: 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. +@@ -6370,7 +6668,7 @@ + else + with_ticlib=no + fi; +-echo "$as_me:6373: result: $with_ticlib" >&5 ++echo "$as_me:6671: result: $with_ticlib" >&5 + echo "${ECHO_T}$with_ticlib" >&6 + + if test X"$CC_G_OPT" = X"" ; then +@@ -6383,7 +6681,7 @@ + test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT='' + fi + +-echo "$as_me:6386: checking for default loader flags" >&5 ++echo "$as_me:6684: 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='' ;; +@@ -6392,13 +6690,13 @@ + (profile) LD_MODEL='-pg';; + (shared) LD_MODEL='' ;; + esac +-echo "$as_me:6395: result: ${LD_MODEL:-(none)}" >&5 ++echo "$as_me:6693: result: ${LD_MODEL:-(none)}" >&5 + echo "${ECHO_T}${LD_MODEL:-(none)}" >&6 + + case "$DFT_LWR_MODEL" in + (shared) + +-echo "$as_me:6401: checking if rpath option should be used" >&5 ++echo "$as_me:6699: 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. +@@ -6408,10 +6706,10 @@ + else + cf_cv_enable_rpath=no + fi; +-echo "$as_me:6411: result: $cf_cv_enable_rpath" >&5 ++echo "$as_me:6709: result: $cf_cv_enable_rpath" >&5 + echo "${ECHO_T}$cf_cv_enable_rpath" >&6 + +-echo "$as_me:6414: checking if shared libraries should be relinked during install" >&5 ++echo "$as_me:6712: 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. +@@ -6421,7 +6719,7 @@ + else + cf_cv_do_relink=yes + fi; +-echo "$as_me:6424: result: $cf_cv_do_relink" >&5 ++echo "$as_me:6722: result: $cf_cv_do_relink" >&5 + echo "${ECHO_T}$cf_cv_do_relink" >&6 + ;; + esac +@@ -6432,7 +6730,7 @@ + LD_RPATH_OPT= + if test "x$cf_cv_enable_rpath" != xno + then +- echo "$as_me:6435: checking for an rpath option" >&5 ++ echo "$as_me:6733: checking for an rpath option" >&5 + echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 + case "$cf_cv_system_name" in + (irix*) +@@ -6463,12 +6761,12 @@ + (*) + ;; + esac +- echo "$as_me:6466: result: $LD_RPATH_OPT" >&5 ++ echo "$as_me:6764: result: $LD_RPATH_OPT" >&5 + echo "${ECHO_T}$LD_RPATH_OPT" >&6 + + case "x$LD_RPATH_OPT" in + (x-R*) +- echo "$as_me:6471: checking if we need a space after rpath option" >&5 ++ echo "$as_me:6769: 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" + +@@ -6489,7 +6787,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6492 "configure" ++#line 6790 "configure" + #include "confdefs.h" + + int +@@ -6501,16 +6799,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6504: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6802: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6507: \$? = $ac_status" >&5 ++ echo "$as_me:6805: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6510: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6808: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6513: \$? = $ac_status" >&5 ++ echo "$as_me:6811: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_rpath_space=no + else +@@ -6520,7 +6818,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save_LIBS" +- echo "$as_me:6523: result: $cf_rpath_space" >&5 ++ echo "$as_me:6821: result: $cf_rpath_space" >&5 + echo "${ECHO_T}$cf_rpath_space" >&6 + test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " + ;; +@@ -6542,7 +6840,7 @@ + cf_ld_rpath_opt= + test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" + +- echo "$as_me:6545: checking whether to use release or ABI version in shared library file names" >&5 ++ echo "$as_me:6843: checking whether to use release or ABI version in shared library file names" >&5 + echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6 + + # Check whether --with-shlib-version or --without-shlib-version was given. +@@ -6557,9 +6855,9 @@ + cf_cv_shlib_version=$withval + ;; + (*) +- echo "$as_me:6560: result: $withval" >&5 ++ echo "$as_me:6858: result: $withval" >&5 + echo "${ECHO_T}$withval" >&6 +- { { echo "$as_me:6562: error: option value must be one of: rel, abi, or auto" >&5 ++ { { echo "$as_me:6860: 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; }; } + ;; +@@ -6568,7 +6866,7 @@ + else + cf_cv_shlib_version=auto + fi; +- echo "$as_me:6571: result: $cf_cv_shlib_version" >&5 ++ echo "$as_me:6869: result: $cf_cv_shlib_version" >&5 + echo "${ECHO_T}$cf_cv_shlib_version" >&6 + + cf_cv_rm_so_locs=no +@@ -6591,14 +6889,14 @@ + + if test "$cf_try_fPIC" = yes + then +- echo "$as_me:6594: checking which $CC option to use" >&5 ++ echo "$as_me:6892: 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 6601 "configure" ++#line 6899 "configure" + #include "confdefs.h" + #include + int +@@ -6610,16 +6908,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:6613: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6911: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6616: \$? = $ac_status" >&5 ++ echo "$as_me:6914: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:6619: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6917: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6622: \$? = $ac_status" >&5 ++ echo "$as_me:6920: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -6628,7 +6926,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + done +- echo "$as_me:6631: result: $CC_SHARED_OPTS" >&5 ++ echo "$as_me:6929: result: $CC_SHARED_OPTS" >&5 + echo "${ECHO_T}$CC_SHARED_OPTS" >&6 + CFLAGS="$cf_save_CFLAGS" + fi +@@ -6699,7 +6997,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:6702: checking if ld -search_paths_first works" >&5 ++ echo "$as_me:7000: 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 +@@ -6708,7 +7006,7 @@ + cf_save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6711 "configure" ++#line 7009 "configure" + #include "confdefs.h" + + int +@@ -6720,16 +7018,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6723: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7021: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6726: \$? = $ac_status" >&5 ++ echo "$as_me:7024: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6729: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7027: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6732: \$? = $ac_status" >&5 ++ echo "$as_me:7030: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ldflags_search_paths_first=yes + else +@@ -6740,7 +7038,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LDFLAGS=$cf_save_LDFLAGS + fi +-echo "$as_me:6743: result: $cf_cv_ldflags_search_paths_first" >&5 ++echo "$as_me:7041: 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" +@@ -7090,7 +7388,7 @@ + do + CFLAGS="$cf_shared_opts $cf_save_CFLAGS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7093 "configure" ++#line 7391 "configure" + #include "confdefs.h" + #include + int +@@ -7102,16 +7400,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:7105: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7403: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7108: \$? = $ac_status" >&5 ++ echo "$as_me:7406: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:7111: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7409: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7114: \$? = $ac_status" >&5 ++ echo "$as_me:7412: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -7148,7 +7446,7 @@ + test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes + ;; + (*) +- { echo "$as_me:7151: WARNING: ignored --with-shlib-version" >&5 ++ { echo "$as_me:7449: WARNING: ignored --with-shlib-version" >&5 + echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} + ;; + esac +@@ -7158,7 +7456,7 @@ + if test -n "$cf_try_cflags" + then + cat > conftest.$ac_ext < + int main(int argc, char *argv[]) + { +@@ -7170,18 +7468,18 @@ + for cf_opt in $cf_try_cflags + do + CFLAGS="$cf_save_CFLAGS -$cf_opt" +- echo "$as_me:7173: checking if CFLAGS option -$cf_opt works" >&5 ++ echo "$as_me:7471: 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:7175: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:7473: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7178: \$? = $ac_status" >&5 ++ echo "$as_me:7476: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- echo "$as_me:7180: result: yes" >&5 ++ echo "$as_me:7478: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + cf_save_CFLAGS="$CFLAGS" + else +- echo "$as_me:7184: result: no" >&5 ++ echo "$as_me:7482: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + done +@@ -7196,17 +7494,17 @@ + + test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 + +-echo "${as_me:-configure}:7199: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 ++echo "${as_me:-configure}:7497: 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}:7203: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ++echo "${as_me:-configure}:7501: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + + for model in $cf_list_models ; do + case "$model" in + (libtool) + +-echo "$as_me:7209: checking for additional libtool options" >&5 ++echo "$as_me:7507: 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. +@@ -7216,7 +7514,7 @@ + else + with_libtool_opts=no + fi; +-echo "$as_me:7219: result: $with_libtool_opts" >&5 ++echo "$as_me:7517: result: $with_libtool_opts" >&5 + echo "${ECHO_T}$with_libtool_opts" >&6 + + case .$with_libtool_opts in +@@ -7227,7 +7525,7 @@ + ;; + esac + +-echo "$as_me:7230: checking if exported-symbols file should be used" >&5 ++echo "$as_me:7528: 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. +@@ -7242,7 +7540,7 @@ + with_export_syms='${top_srcdir}/package/${PACKAGE}.sym' + + fi +-echo "$as_me:7245: result: $with_export_syms" >&5 ++echo "$as_me:7543: result: $with_export_syms" >&5 + echo "${ECHO_T}$with_export_syms" >&6 + if test "x$with_export_syms" != xno + then +@@ -7253,15 +7551,15 @@ + ;; + (shared) + if test "$CC_SHARED_OPTS" = "unknown"; then +- { { echo "$as_me:7256: error: Shared libraries are not supported in this version" >&5 ++ { { echo "$as_me:7554: 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:7261: checking if current CFLAGS link properly" >&5 ++ echo "$as_me:7559: 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 7264 "configure" ++#line 7562 "configure" + #include "confdefs.h" + #include + int +@@ -7273,16 +7571,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7276: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7574: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7279: \$? = $ac_status" >&5 ++ echo "$as_me:7577: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7282: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7580: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7285: \$? = $ac_status" >&5 ++ echo "$as_me:7583: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cflags_work=yes + else +@@ -7291,18 +7589,18 @@ + cf_cflags_work=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:7294: result: $cf_cflags_work" >&5 ++ echo "$as_me:7592: 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}:7300: testing try to work around by appending shared-options ..." 1>&5 ++echo "${as_me:-configure}:7598: testing try to work around by appending shared-options ..." 1>&5 + + CFLAGS="$CFLAGS $CC_SHARED_OPTS" + fi + +-echo "$as_me:7305: checking if versioned-symbols file should be used" >&5 ++echo "$as_me:7603: 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. +@@ -7320,18 +7618,18 @@ + (xno) + ;; + (x/*) +- test -f "$with_versioned_syms" || { { echo "$as_me:7323: error: expected a filename: $with_versioned_syms" >&5 ++ test -f "$with_versioned_syms" || { { echo "$as_me:7621: 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:7328: error: expected a filename: $with_versioned_syms" >&5 ++ test -f "$with_versioned_syms" || { { echo "$as_me:7626: 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:7334: result: $with_versioned_syms" >&5 ++echo "$as_me:7632: result: $with_versioned_syms" >&5 + echo "${ECHO_T}$with_versioned_syms" >&6 + + RESULTING_SYMS= +@@ -7347,7 +7645,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}:7350: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ++echo "${as_me:-configure}:7648: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + + ;; + (*-dy\ *) +@@ -7355,11 +7653,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}:7358: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ++echo "${as_me:-configure}:7656: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + + ;; + (*) +- { echo "$as_me:7362: WARNING: this system does not support versioned-symbols" >&5 ++ { echo "$as_me:7660: WARNING: this system does not support versioned-symbols" >&5 + echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;} + ;; + esac +@@ -7371,7 +7669,7 @@ + # symbols. + if test "x$VERSIONED_SYMS" != "x" + then +- echo "$as_me:7374: checking if wildcards can be used to selectively omit symbols" >&5 ++ echo "$as_me:7672: 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 + +@@ -7408,7 +7706,7 @@ + } submodule_1.0; + EOF + cat >conftest.$ac_ext <&5 ++ echo "$as_me:7740: result: $WILDCARD_SYMS" >&5 + echo "${ECHO_T}$WILDCARD_SYMS" >&6 + rm -f conftest.* + fi +@@ -7452,7 +7750,7 @@ + ### Checks for special libraries, must be done up-front. + SHLIB_LIST="" + +-echo "$as_me:7455: checking if you want to link with the GPM mouse library" >&5 ++echo "$as_me:7753: 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. +@@ -7462,27 +7760,27 @@ + else + with_gpm=maybe + fi; +-echo "$as_me:7465: result: $with_gpm" >&5 ++echo "$as_me:7763: result: $with_gpm" >&5 + echo "${ECHO_T}$with_gpm" >&6 + + if test "$with_gpm" != no ; then +- echo "$as_me:7469: checking for gpm.h" >&5 ++ echo "$as_me:7767: 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 7475 "configure" ++#line 7773 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:7479: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:7777: \"$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:7485: \$? = $ac_status" >&5 ++ echo "$as_me:7783: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -7501,7 +7799,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:7504: result: $ac_cv_header_gpm_h" >&5 ++echo "$as_me:7802: 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 + +@@ -7512,7 +7810,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}:7515: testing assuming we really have GPM library ..." 1>&5 ++echo "${as_me:-configure}:7813: testing assuming we really have GPM library ..." 1>&5 + + cat >>confdefs.h <<\EOF + #define HAVE_LIBGPM 1 +@@ -7520,7 +7818,7 @@ + + with_gpm=yes + else +- echo "$as_me:7523: checking for Gpm_Open in -lgpm" >&5 ++ echo "$as_me:7821: 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 +@@ -7528,7 +7826,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7531 "configure" ++#line 7829 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7547,16 +7845,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7550: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7848: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7553: \$? = $ac_status" >&5 ++ echo "$as_me:7851: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7556: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7854: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7559: \$? = $ac_status" >&5 ++ echo "$as_me:7857: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -7567,18 +7865,18 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7570: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:7868: 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:7577: WARNING: Cannot link with GPM library" >&5 ++ { echo "$as_me:7875: WARNING: Cannot link with GPM library" >&5 + echo "$as_me: WARNING: Cannot link with GPM library" >&2;} + with_gpm=no + else +- { { echo "$as_me:7581: error: Cannot link with GPM library" >&5 ++ { { echo "$as_me:7879: error: Cannot link with GPM library" >&5 + echo "$as_me: error: Cannot link with GPM library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -7589,7 +7887,7 @@ + + else + +- test "$with_gpm" != maybe && { echo "$as_me:7592: WARNING: Cannot find GPM header" >&5 ++ test "$with_gpm" != maybe && { echo "$as_me:7890: WARNING: Cannot find GPM header" >&5 + echo "$as_me: WARNING: Cannot find GPM header" >&2;} + with_gpm=no + +@@ -7598,7 +7896,7 @@ + fi + + if test "$with_gpm" != no ; then +- echo "$as_me:7601: checking if you want to load GPM dynamically" >&5 ++ echo "$as_me:7899: 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. +@@ -7608,18 +7906,18 @@ + else + with_dlsym=yes + fi; +- echo "$as_me:7611: result: $with_dlsym" >&5 ++ echo "$as_me:7909: result: $with_dlsym" >&5 + echo "${ECHO_T}$with_dlsym" >&6 + if test "x$with_dlsym" = xyes ; then + + cf_have_dlsym=no +-echo "$as_me:7616: checking for dlsym" >&5 ++echo "$as_me:7914: 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 7622 "configure" ++#line 7920 "configure" + #include "confdefs.h" + #define dlsym autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -7650,16 +7948,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7653: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7951: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7656: \$? = $ac_status" >&5 ++ echo "$as_me:7954: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7659: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7957: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7662: \$? = $ac_status" >&5 ++ echo "$as_me:7960: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_dlsym=yes + else +@@ -7669,14 +7967,14 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:7672: result: $ac_cv_func_dlsym" >&5 ++echo "$as_me:7970: 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:7679: checking for dlsym in -ldl" >&5 ++echo "$as_me:7977: 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 +@@ -7684,7 +7982,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7687 "configure" ++#line 7985 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7703,16 +8001,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7706: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8004: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7709: \$? = $ac_status" >&5 ++ echo "$as_me:8007: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7712: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8010: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7715: \$? = $ac_status" >&5 ++ echo "$as_me:8013: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dl_dlsym=yes + else +@@ -7723,7 +8021,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7726: result: $ac_cv_lib_dl_dlsym" >&5 ++echo "$as_me:8024: 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 + +@@ -7752,10 +8050,10 @@ + LIBS="$cf_add_libs" + } + +- echo "$as_me:7755: checking whether able to link to dl*() functions" >&5 ++ echo "$as_me:8053: 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 7758 "configure" ++#line 8056 "configure" + #include "confdefs.h" + #include + int +@@ -7773,16 +8071,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7776: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8074: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7779: \$? = $ac_status" >&5 ++ echo "$as_me:8077: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7782: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8080: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7785: \$? = $ac_status" >&5 ++ echo "$as_me:8083: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cat >>confdefs.h <<\EOF +@@ -7793,15 +8091,15 @@ + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + +- { { echo "$as_me:7796: error: Cannot link test program for libdl" >&5 ++ { { echo "$as_me:8094: 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:7801: result: ok" >&5 ++ echo "$as_me:8099: result: ok" >&5 + echo "${ECHO_T}ok" >&6 + else +- { { echo "$as_me:7804: error: Cannot find dlsym function" >&5 ++ { { echo "$as_me:8102: error: Cannot find dlsym function" >&5 + echo "$as_me: error: Cannot find dlsym function" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -7809,12 +8107,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}:7812: testing assuming soname for gpm is $with_gpm ..." 1>&5 ++echo "${as_me:-configure}:8110: testing assuming soname for gpm is $with_gpm ..." 1>&5 + + cf_cv_gpm_soname="$with_gpm" + else + +-echo "$as_me:7817: checking for soname of gpm library" >&5 ++echo "$as_me:8115: 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 +@@ -7848,15 +8146,15 @@ + done + LIBS="$cf_add_libs" + +- if { (eval echo "$as_me:7851: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:8149: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7854: \$? = $ac_status" >&5 ++ echo "$as_me:8152: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then +- if { (eval echo "$as_me:7856: \"$ac_link\"") >&5 ++ if { (eval echo "$as_me:8154: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7859: \$? = $ac_status" >&5 ++ echo "$as_me:8157: \$? = $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 +@@ -7867,7 +8165,7 @@ + fi + + fi +-echo "$as_me:7870: result: $cf_cv_gpm_soname" >&5 ++echo "$as_me:8168: result: $cf_cv_gpm_soname" >&5 + echo "${ECHO_T}$cf_cv_gpm_soname" >&6 + + fi +@@ -7935,7 +8233,7 @@ + #define HAVE_LIBGPM 1 + EOF + +-echo "$as_me:7938: checking for Gpm_Wgetch in -lgpm" >&5 ++echo "$as_me:8236: 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 +@@ -7943,7 +8241,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7946 "configure" ++#line 8244 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7962,16 +8260,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7965: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8263: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7968: \$? = $ac_status" >&5 ++ echo "$as_me:8266: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7971: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8269: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7974: \$? = $ac_status" >&5 ++ echo "$as_me:8272: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_Gpm_Wgetch=yes + else +@@ -7982,11 +8280,11 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7985: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 ++echo "$as_me:8283: 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:7989: checking if GPM is weakly bound to curses library" >&5 ++echo "$as_me:8287: 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 +@@ -8010,15 +8308,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:8013: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:8311: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8016: \$? = $ac_status" >&5 ++ echo "$as_me:8314: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then +- if { (eval echo "$as_me:8018: \"$ac_link\"") >&5 ++ if { (eval echo "$as_me:8316: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8021: \$? = $ac_status" >&5 ++ echo "$as_me:8319: \$? = $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 +@@ -8030,11 +8328,11 @@ + fi + + fi +-echo "$as_me:8033: result: $cf_cv_check_gpm_wgetch" >&5 ++echo "$as_me:8331: 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:8037: WARNING: GPM library is already linked with curses - read the FAQ" >&5 ++ { echo "$as_me:8335: 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 + +@@ -8042,7 +8340,7 @@ + + fi + +-echo "$as_me:8045: checking if you want to use PCRE2 for regular-expressions" >&5 ++echo "$as_me:8343: 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. +@@ -8051,7 +8349,7 @@ + + fi; + test -z "$with_pcre2" && with_pcre2=no +-echo "$as_me:8054: result: $with_pcre2" >&5 ++echo "$as_me:8352: result: $with_pcre2" >&5 + echo "${ECHO_T}$with_pcre2" >&6 + + if test "x$with_pcre2" != xno ; then +@@ -8062,17 +8360,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}:8065: testing found package $cf_with_pcre2 ..." 1>&5 ++echo "${as_me:-configure}:8363: 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}:8071: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:8369: 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}:8075: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:8373: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -8196,7 +8494,7 @@ + fi + + done +- cf_with_pcre2_ok=yes || { { echo "$as_me:8199: error: Cannot find PCRE2 library" >&5 ++ cf_with_pcre2_ok=yes || { { echo "$as_me:8497: error: Cannot find PCRE2 library" >&5 + echo "$as_me: error: Cannot find PCRE2 library" >&2;} + { (exit 1); exit 1; }; } + +@@ -8209,7 +8507,7 @@ + (*pcre2-posix*|*pcreposix*) + ;; + (*) +- echo "$as_me:8212: checking for regcomp in -lpcre2-posix" >&5 ++ echo "$as_me:8510: 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 +@@ -8217,7 +8515,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lpcre2-posix $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8220 "configure" ++#line 8518 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -8236,16 +8534,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:8239: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8537: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8242: \$? = $ac_status" >&5 ++ echo "$as_me:8540: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:8245: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8543: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8248: \$? = $ac_status" >&5 ++ echo "$as_me:8546: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_pcre2_posix_regcomp=yes + else +@@ -8256,7 +8554,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:8259: result: $ac_cv_lib_pcre2_posix_regcomp" >&5 ++echo "$as_me:8557: 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 + +@@ -8277,7 +8575,7 @@ + LIBS="$cf_add_libs" + + else +- echo "$as_me:8280: checking for regcomp in -lpcreposix" >&5 ++ echo "$as_me:8578: 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 +@@ -8285,7 +8583,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lpcreposix $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8288 "configure" ++#line 8586 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -8304,16 +8602,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:8307: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8605: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8310: \$? = $ac_status" >&5 ++ echo "$as_me:8608: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:8313: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8611: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8316: \$? = $ac_status" >&5 ++ echo "$as_me:8614: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_pcreposix_regcomp=yes + else +@@ -8324,7 +8622,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:8327: result: $ac_cv_lib_pcreposix_regcomp" >&5 ++echo "$as_me:8625: 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 + +@@ -8345,7 +8643,7 @@ + LIBS="$cf_add_libs" + + else +- { { echo "$as_me:8348: error: Cannot find PCRE2 POSIX library" >&5 ++ { { echo "$as_me:8646: error: Cannot find PCRE2 POSIX library" >&5 + echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -8360,23 +8658,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:8363: checking for $ac_header" >&5 ++echo "$as_me:8661: 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 8369 "configure" ++#line 8667 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:8373: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:8671: \"$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:8379: \$? = $ac_status" >&5 ++ echo "$as_me:8677: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -8395,7 +8693,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:8398: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:8696: 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:8709: 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 8417 "configure" ++#line 8715 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -8445,16 +8743,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:8448: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8746: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8451: \$? = $ac_status" >&5 ++ echo "$as_me:8749: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:8454: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8752: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8457: \$? = $ac_status" >&5 ++ echo "$as_me:8755: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -8464,7 +8762,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:8467: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:8765: 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:8481: checking if you want to use sysmouse" >&5 ++echo "$as_me:8779: 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. +@@ -8490,7 +8788,7 @@ + fi; + if test "$cf_with_sysmouse" != no ; then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8493 "configure" ++#line 8791 "configure" + #include "confdefs.h" + + #include +@@ -8513,16 +8811,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8516: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8814: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8519: \$? = $ac_status" >&5 ++ echo "$as_me:8817: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8522: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8820: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8525: \$? = $ac_status" >&5 ++ echo "$as_me:8823: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_with_sysmouse=yes + else +@@ -8532,7 +8830,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:8535: result: $cf_with_sysmouse" >&5 ++echo "$as_me:8833: result: $cf_with_sysmouse" >&5 + echo "${ECHO_T}$cf_with_sysmouse" >&6 + test "$cf_with_sysmouse" = yes && + cat >>confdefs.h <<\EOF +@@ -8542,7 +8840,7 @@ + fi + + # pretend that ncurses==ncursesw==ncursest +-echo "$as_me:8545: checking if you want to disable library suffixes" >&5 ++echo "$as_me:8843: 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. +@@ -8559,13 +8857,13 @@ + disable_lib_suffixes=no + + fi; +-echo "$as_me:8562: result: $disable_lib_suffixes" >&5 ++echo "$as_me:8860: 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:8568: checking if rpath-hack should be disabled" >&5 ++echo "$as_me:8866: 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. +@@ -8583,22 +8881,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:8586: result: $cf_disable_rpath_hack" >&5 ++echo "$as_me:8884: result: $cf_disable_rpath_hack" >&5 + echo "${ECHO_T}$cf_disable_rpath_hack" >&6 + + if test "$enable_rpath_hack" = yes ; then + +-echo "$as_me:8591: checking for updated LDFLAGS" >&5 ++echo "$as_me:8889: 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:8594: result: maybe" >&5 ++ echo "$as_me:8892: 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:8601: checking for $ac_word" >&5 ++echo "$as_me:8899: 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 +@@ -8613,7 +8911,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:8616: found $ac_dir/$ac_word" >&5 ++echo "$as_me:8914: found $ac_dir/$ac_word" >&5 + break + done + +@@ -8621,10 +8919,10 @@ + fi + cf_ldd_prog=$ac_cv_prog_cf_ldd_prog + if test -n "$cf_ldd_prog"; then +- echo "$as_me:8624: result: $cf_ldd_prog" >&5 ++ echo "$as_me:8922: result: $cf_ldd_prog" >&5 + echo "${ECHO_T}$cf_ldd_prog" >&6 + else +- echo "$as_me:8627: result: no" >&5 ++ echo "$as_me:8925: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8638,7 +8936,7 @@ + cf_rpath_oops= + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8641 "configure" ++#line 8939 "configure" + #include "confdefs.h" + #include + int +@@ -8650,16 +8948,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:8653: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8951: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8656: \$? = $ac_status" >&5 ++ echo "$as_me:8954: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:8659: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8957: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8662: \$? = $ac_status" >&5 ++ echo "$as_me:8960: \$? = $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` +@@ -8687,7 +8985,7 @@ + then + test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 + +-echo "${as_me:-configure}:8690: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 ++echo "${as_me:-configure}:8988: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 + + LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" + break +@@ -8699,11 +8997,11 @@ + + test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:8702: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:9000: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:8706: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:9004: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 + + cf_rpath_dst= + for cf_rpath_src in $LDFLAGS +@@ -8740,7 +9038,7 @@ + then + test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 + +-echo "${as_me:-configure}:8743: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 ++echo "${as_me:-configure}:9041: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 + + EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" + fi +@@ -8753,11 +9051,11 @@ + + test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:8756: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:9054: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 + +-echo "${as_me:-configure}:8760: testing ...checking LIBS $LIBS ..." 1>&5 ++echo "${as_me:-configure}:9058: testing ...checking LIBS $LIBS ..." 1>&5 + + cf_rpath_dst= + for cf_rpath_src in $LIBS +@@ -8794,7 +9092,7 @@ + then + test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 + +-echo "${as_me:-configure}:8797: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 ++echo "${as_me:-configure}:9095: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 + + EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" + fi +@@ -8807,14 +9105,14 @@ + + test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 + +-echo "${as_me:-configure}:8810: testing ...checked LIBS $LIBS ..." 1>&5 ++echo "${as_me:-configure}:9108: testing ...checked LIBS $LIBS ..." 1>&5 + + test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:8814: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:9112: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 + + else +- echo "$as_me:8817: result: no" >&5 ++ echo "$as_me:9115: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8828,7 +9126,7 @@ + EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" + if test -n "$EXTRA_PKG_LDFLAGS" + then +- echo "$as_me:8831: checking if you want to disable extra LDFLAGS for package-scripts" >&5 ++ echo "$as_me:9129: 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. +@@ -8845,7 +9143,7 @@ + disable_pkg_ldflags=no + + fi; +- echo "$as_me:8848: result: $disable_pkg_ldflags" >&5 ++ echo "$as_me:9146: result: $disable_pkg_ldflags" >&5 + echo "${ECHO_T}$disable_pkg_ldflags" >&6 + test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS= + fi +@@ -8853,7 +9151,7 @@ + ############################################################################### + + ### use option --with-extra-suffix to append suffix to headers and libraries +-echo "$as_me:8856: checking for extra suffix to append to header/library paths" >&5 ++echo "$as_me:9154: checking for extra suffix to append to header/library paths" >&5 + echo $ECHO_N "checking for extra suffix to append to header/library paths... $ECHO_C" >&6 + EXTRA_SUFFIX= + +@@ -8872,11 +9170,11 @@ + esac + + fi; +-echo "$as_me:8875: result: ${EXTRA_SUFFIX:-(none)}" >&5 ++echo "$as_me:9173: result: ${EXTRA_SUFFIX:-(none)}" >&5 + echo "${ECHO_T}${EXTRA_SUFFIX:-(none)}" >&6 + + ### use option --disable-overwrite to leave out the link to -lcurses +-echo "$as_me:8879: checking if you wish to install ncurses overwriting curses" >&5 ++echo "$as_me:9177: 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. +@@ -8886,10 +9184,10 @@ + else + if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi + fi; +-echo "$as_me:8889: result: $with_overwrite" >&5 ++echo "$as_me:9187: result: $with_overwrite" >&5 + echo "${ECHO_T}$with_overwrite" >&6 + +-echo "$as_me:8892: checking if external terminfo-database is used" >&5 ++echo "$as_me:9190: 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. +@@ -8899,7 +9197,7 @@ + else + use_database=yes + fi; +-echo "$as_me:8902: result: $use_database" >&5 ++echo "$as_me:9200: result: $use_database" >&5 + echo "${ECHO_T}$use_database" >&6 + + case "$host_os" in +@@ -8915,7 +9213,7 @@ + if test "$use_database" != no ; then + NCURSES_USE_DATABASE=1 + +- echo "$as_me:8918: checking which terminfo source-file will be installed" >&5 ++ echo "$as_me:9216: 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. +@@ -8923,10 +9221,10 @@ + withval="$with_database" + TERMINFO_SRC=$withval + fi; +- echo "$as_me:8926: result: $TERMINFO_SRC" >&5 ++ echo "$as_me:9224: result: $TERMINFO_SRC" >&5 + echo "${ECHO_T}$TERMINFO_SRC" >&6 + +- echo "$as_me:8929: checking whether to use hashed database instead of directory/tree" >&5 ++ echo "$as_me:9227: 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. +@@ -8936,13 +9234,13 @@ + else + with_hashed_db=no + fi; +- echo "$as_me:8939: result: $with_hashed_db" >&5 ++ echo "$as_me:9237: result: $with_hashed_db" >&5 + echo "${ECHO_T}$with_hashed_db" >&6 + else + with_hashed_db=no + fi + +-echo "$as_me:8945: checking for list of fallback terminal descriptions" >&5 ++echo "$as_me:9243: checking for list of fallback terminal descriptions" >&5 + echo $ECHO_N "checking for list of fallback terminal descriptions... $ECHO_C" >&6 + + # Check whether --with-fallbacks or --without-fallbacks was given. +@@ -8952,7 +9250,7 @@ + else + with_fallback= + fi; +-echo "$as_me:8955: result: ${with_fallback:-(none)}" >&5 ++echo "$as_me:9253: result: ${with_fallback:-(none)}" >&5 + echo "${ECHO_T}${with_fallback:-(none)}" >&6 + + case ".$with_fallback" in +@@ -8960,7 +9258,7 @@ + FALLBACK_LIST= + ;; + (.yes) +- { echo "$as_me:8963: WARNING: expected a list of terminal descriptions" >&5 ++ { echo "$as_me:9261: WARNING: expected a list of terminal descriptions" >&5 + echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;} + ;; + (*) +@@ -8976,7 +9274,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:8979: checking for $ac_word" >&5 ++echo "$as_me:9277: 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 +@@ -8991,7 +9289,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:8994: found $ac_dir/$ac_word" >&5 ++echo "$as_me:9292: found $ac_dir/$ac_word" >&5 + break + done + +@@ -8999,10 +9297,10 @@ + fi + TIC=$ac_cv_prog_TIC + if test -n "$TIC"; then +- echo "$as_me:9002: result: $TIC" >&5 ++ echo "$as_me:9300: result: $TIC" >&5 + echo "${ECHO_T}$TIC" >&6 + else +- echo "$as_me:9005: result: no" >&5 ++ echo "$as_me:9303: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -9011,7 +9309,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:9014: checking for $ac_word" >&5 ++echo "$as_me:9312: 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 +@@ -9026,7 +9324,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:9029: found $ac_dir/$ac_word" >&5 ++echo "$as_me:9327: found $ac_dir/$ac_word" >&5 + break + done + +@@ -9034,10 +9332,10 @@ + fi + ac_ct_TIC=$ac_cv_prog_ac_ct_TIC + if test -n "$ac_ct_TIC"; then +- echo "$as_me:9037: result: $ac_ct_TIC" >&5 ++ echo "$as_me:9335: result: $ac_ct_TIC" >&5 + echo "${ECHO_T}$ac_ct_TIC" >&6 + else +- echo "$as_me:9040: result: no" >&5 ++ echo "$as_me:9338: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -9049,7 +9347,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:9052: checking for $ac_word" >&5 ++echo "$as_me:9350: 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 +@@ -9064,7 +9362,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:9067: found $ac_dir/$ac_word" >&5 ++echo "$as_me:9365: found $ac_dir/$ac_word" >&5 + break + done + +@@ -9072,10 +9370,10 @@ + fi + INFOCMP=$ac_cv_prog_INFOCMP + if test -n "$INFOCMP"; then +- echo "$as_me:9075: result: $INFOCMP" >&5 ++ echo "$as_me:9373: result: $INFOCMP" >&5 + echo "${ECHO_T}$INFOCMP" >&6 + else +- echo "$as_me:9078: result: no" >&5 ++ echo "$as_me:9376: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -9084,7 +9382,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:9087: checking for $ac_word" >&5 ++echo "$as_me:9385: 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 +@@ -9099,7 +9397,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:9102: found $ac_dir/$ac_word" >&5 ++echo "$as_me:9400: found $ac_dir/$ac_word" >&5 + break + done + +@@ -9107,10 +9405,10 @@ + fi + ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP + if test -n "$ac_ct_INFOCMP"; then +- echo "$as_me:9110: result: $ac_ct_INFOCMP" >&5 ++ echo "$as_me:9408: result: $ac_ct_INFOCMP" >&5 + echo "${ECHO_T}$ac_ct_INFOCMP" >&6 + else +- echo "$as_me:9113: result: no" >&5 ++ echo "$as_me:9411: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -9125,10 +9423,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:9128: checking for tic program for fallbacks" >&5 ++ echo "$as_me:9426: checking for tic program for fallbacks" >&5 + echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6 + TIC=$withval +- echo "$as_me:9131: result: $TIC" >&5 ++ echo "$as_me:9429: result: $TIC" >&5 + echo "${ECHO_T}$TIC" >&6 + + if test "x$prefix" != xNONE; then +@@ -9156,7 +9454,7 @@ + TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:9159: error: expected a pathname, not \"$TIC\"" >&5 ++ { { echo "$as_me:9457: error: expected a pathname, not \"$TIC\"" >&5 + echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -9169,7 +9467,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:9172: checking for $ac_word" >&5 ++echo "$as_me:9470: 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 +@@ -9186,7 +9484,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:9189: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:9487: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -9197,10 +9495,10 @@ + TIC=$ac_cv_path_TIC + + if test -n "$TIC"; then +- echo "$as_me:9200: result: $TIC" >&5 ++ echo "$as_me:9498: result: $TIC" >&5 + echo "${ECHO_T}$TIC" >&6 + else +- echo "$as_me:9203: result: no" >&5 ++ echo "$as_me:9501: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -9259,7 +9557,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me:-configure}:9262: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me:-configure}:9560: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++ { echo "$as_me:9575: WARNING: no tic program found for fallbacks" >&5 + echo "$as_me: WARNING: no tic program found for fallbacks" >&2;} + fi + +@@ -9283,10 +9581,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:9286: checking for infocmp program for fallbacks" >&5 ++ echo "$as_me:9584: checking for infocmp program for fallbacks" >&5 + echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6 + INFOCMP=$withval +- echo "$as_me:9289: result: $INFOCMP" >&5 ++ echo "$as_me:9587: result: $INFOCMP" >&5 + echo "${ECHO_T}$INFOCMP" >&6 + + if test "x$prefix" != xNONE; then +@@ -9314,7 +9612,7 @@ + INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:9317: error: expected a pathname, not \"$INFOCMP\"" >&5 ++ { { echo "$as_me:9615: error: expected a pathname, not \"$INFOCMP\"" >&5 + echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -9327,7 +9625,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:9330: checking for $ac_word" >&5 ++echo "$as_me:9628: 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 +@@ -9344,7 +9642,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:9347: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:9645: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -9355,10 +9653,10 @@ + INFOCMP=$ac_cv_path_INFOCMP + + if test -n "$INFOCMP"; then +- echo "$as_me:9358: result: $INFOCMP" >&5 ++ echo "$as_me:9656: result: $INFOCMP" >&5 + echo "${ECHO_T}$INFOCMP" >&6 + else +- echo "$as_me:9361: result: no" >&5 ++ echo "$as_me:9659: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -9417,7 +9715,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me:-configure}:9420: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me:-configure}:9718: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++ { echo "$as_me:9733: WARNING: no infocmp program found for fallbacks" >&5 + echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;} + fi + +@@ -9442,7 +9740,7 @@ + test -z "$INFOCMP" && FALLBACK_LIST= + if test -z "$FALLBACK_LIST" + then +- { echo "$as_me:9445: WARNING: ignoring fallback option because tic/infocmp are not available" >&5 ++ { echo "$as_me:9743: 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 +@@ -9450,7 +9748,7 @@ + USE_FALLBACKS= + test -z "$FALLBACK_LIST" && USE_FALLBACKS="#" + +-echo "$as_me:9453: checking if you want modern xterm or antique" >&5 ++echo "$as_me:9751: 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. +@@ -9464,7 +9762,7 @@ + (no) with_xterm_new=xterm-old;; + (*) with_xterm_new=xterm-new;; + esac +-echo "$as_me:9467: result: $with_xterm_new" >&5 ++echo "$as_me:9765: result: $with_xterm_new" >&5 + echo "${ECHO_T}$with_xterm_new" >&6 + WHICH_XTERM=$with_xterm_new + +@@ -9477,7 +9775,7 @@ + ;; + esac + +-echo "$as_me:9480: checking if xterm backspace sends BS or DEL" >&5 ++echo "$as_me:9778: 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. +@@ -9501,13 +9799,13 @@ + with_xterm_kbs=$withval + ;; + esac +-echo "$as_me:9504: result: $with_xterm_kbs" >&5 ++echo "$as_me:9802: result: $with_xterm_kbs" >&5 + echo "${ECHO_T}$with_xterm_kbs" >&6 + XTERM_KBS=$with_xterm_kbs + + if test "x$with_xterm_kbs" != "x$want_xterm_kbs" + then +- { echo "$as_me:9510: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5 ++ { echo "$as_me:9808: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5 + echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;} + fi + +@@ -9517,7 +9815,7 @@ + MAKE_TERMINFO="#" + else + +-echo "$as_me:9520: checking for list of terminfo directories" >&5 ++echo "$as_me:9818: 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. +@@ -9557,7 +9855,7 @@ + cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:9560: error: expected a pathname, not \"$cf_src_path\"" >&5 ++ { { echo "$as_me:9858: 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; }; } + ;; +@@ -9580,7 +9878,7 @@ + ;; + esac + +-echo "$as_me:9583: result: $TERMINFO_DIRS" >&5 ++echo "$as_me:9881: result: $TERMINFO_DIRS" >&5 + echo "${ECHO_T}$TERMINFO_DIRS" >&6 + test -n "$TERMINFO_DIRS" && + cat >>confdefs.h <&5 ++ { echo "$as_me:9890: 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:9598: checking for default terminfo directory" >&5 ++echo "$as_me:9896: 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. +@@ -9631,7 +9929,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:9634: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:9932: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -9640,7 +9938,7 @@ + fi + eval TERMINFO="$withval" + +-echo "$as_me:9643: result: $TERMINFO" >&5 ++echo "$as_me:9941: result: $TERMINFO" >&5 + echo "${ECHO_T}$TERMINFO" >&6 + + cat >>confdefs.h <&5 ++echo "$as_me:9952: 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. +@@ -9663,7 +9961,7 @@ + with_big_core=no + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9666 "configure" ++#line 9964 "configure" + #include "confdefs.h" + + #include +@@ -9677,15 +9975,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:9680: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9978: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9683: \$? = $ac_status" >&5 ++ echo "$as_me:9981: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:9685: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9983: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9688: \$? = $ac_status" >&5 ++ echo "$as_me:9986: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + with_big_core=yes + else +@@ -9697,7 +9995,7 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi; +-echo "$as_me:9700: result: $with_big_core" >&5 ++echo "$as_me:9998: result: $with_big_core" >&5 + echo "${ECHO_T}$with_big_core" >&6 + test "x$with_big_core" = "xyes" && + cat >>confdefs.h <<\EOF +@@ -9707,7 +10005,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:9710: checking if big-strings option selected" >&5 ++echo "$as_me:10008: 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. +@@ -9731,14 +10029,14 @@ + esac + + fi; +-echo "$as_me:9734: result: $with_big_strings" >&5 ++echo "$as_me:10032: 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:9741: checking if you want termcap-fallback support" >&5 ++echo "$as_me:10039: 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. +@@ -9748,14 +10046,14 @@ + else + with_termcap=no + fi; +-echo "$as_me:9751: result: $with_termcap" >&5 ++echo "$as_me:10049: 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:9758: error: You have disabled the database w/o specifying fallbacks" >&5 ++ { { echo "$as_me:10056: 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 +@@ -9768,13 +10066,13 @@ + else + + if test "$with_ticlib" != no ; then +- { { echo "$as_me:9771: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 ++ { { echo "$as_me:10069: 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:9777: checking for list of termcap files" >&5 ++ echo "$as_me:10075: 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. +@@ -9814,7 +10112,7 @@ + cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:9817: error: expected a pathname, not \"$cf_src_path\"" >&5 ++ { { echo "$as_me:10115: 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; }; } + ;; +@@ -9837,7 +10135,7 @@ + ;; + esac + +- echo "$as_me:9840: result: $TERMPATH" >&5 ++ echo "$as_me:10138: result: $TERMPATH" >&5 + echo "${ECHO_T}$TERMPATH" >&6 + test -n "$TERMPATH" && + cat >>confdefs.h <&5 ++ echo "$as_me:10146: 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. +@@ -9855,14 +10153,14 @@ + else + with_getcap=no + fi; +- echo "$as_me:9858: result: $with_getcap" >&5 ++ echo "$as_me:10156: 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:9865: checking if translated termcaps will be cached in ~/.terminfo" >&5 ++ echo "$as_me:10163: 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. +@@ -9872,7 +10170,7 @@ + else + with_getcap_cache=no + fi; +- echo "$as_me:9875: result: $with_getcap_cache" >&5 ++ echo "$as_me:10173: result: $with_getcap_cache" >&5 + echo "${ECHO_T}$with_getcap_cache" >&6 + test "x$with_getcap_cache" = "xyes" && + cat >>confdefs.h <<\EOF +@@ -9882,7 +10180,7 @@ + fi + + ### Use option --disable-home-terminfo to completely remove ~/.terminfo +-echo "$as_me:9885: checking if ~/.terminfo is wanted" >&5 ++echo "$as_me:10183: 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. +@@ -9892,14 +10190,14 @@ + else + with_home_terminfo=yes + fi; +-echo "$as_me:9895: result: $with_home_terminfo" >&5 ++echo "$as_me:10193: 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:9902: checking if you want to permit root to use ncurses environment variables" >&5 ++echo "$as_me:10200: 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. +@@ -9909,14 +10207,14 @@ + else + with_root_environ=yes + fi; +-echo "$as_me:9912: result: $with_root_environ" >&5 ++echo "$as_me:10210: 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:9919: checking if you want to permit setuid programs to access all files" >&5 ++echo "$as_me:10217: 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-access or --disable-root-access was given. +@@ -9926,14 +10224,14 @@ + else + with_root_access=yes + fi; +-echo "$as_me:9929: result: $with_root_access" >&5 ++echo "$as_me:10227: result: $with_root_access" >&5 + echo "${ECHO_T}$with_root_access" >&6 + test "x$with_root_access" = xyes && + cat >>confdefs.h <<\EOF + #define USE_ROOT_ACCESS 1 + EOF + +-echo "$as_me:9936: checking if you want to permit setuid use of ncurses environment variables" >&5 ++echo "$as_me:10234: checking if you want to permit setuid use of ncurses environment variables" >&5 + echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6 + + # Check whether --enable-setuid-environ or --disable-setuid-environ was given. +@@ -9943,7 +10241,7 @@ + else + with_setuid_environ=$with_root_environ + fi; +-echo "$as_me:9946: result: $with_setuid_environ" >&5 ++echo "$as_me:10244: result: $with_setuid_environ" >&5 + echo "${ECHO_T}$with_setuid_environ" >&6 + test "x$with_setuid_environ" = xyes && + cat >>confdefs.h <<\EOF +@@ -9958,23 +10256,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:9961: checking for $ac_header" >&5 ++echo "$as_me:10259: 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 9967 "configure" ++#line 10265 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:9971: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:10269: \"$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:9977: \$? = $ac_status" >&5 ++ echo "$as_me:10275: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -9993,7 +10291,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:9996: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:10294: 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:10309: 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 10017 "configure" ++#line 10315 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -10045,16 +10343,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:10048: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10346: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10051: \$? = $ac_status" >&5 ++ echo "$as_me:10349: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:10054: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10352: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10057: \$? = $ac_status" >&5 ++ echo "$as_me:10355: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -10064,7 +10362,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:10067: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:10365: 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:10382: 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 10090 "configure" ++#line 10388 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -10118,16 +10416,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:10121: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10419: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10124: \$? = $ac_status" >&5 ++ echo "$as_me:10422: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:10127: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10425: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10130: \$? = $ac_status" >&5 ++ echo "$as_me:10428: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -10137,7 +10435,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:10140: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:10438: 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:10449: 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 +@@ -10161,7 +10459,7 @@ + eval 'ac_cv_func_'$cf_func'=error' + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10164 "configure" ++#line 10462 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -10195,15 +10493,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:10198: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10496: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10201: \$? = $ac_status" >&5 ++ echo "$as_me:10499: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:10203: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10501: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10206: \$? = $ac_status" >&5 ++ echo "$as_me:10504: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_link_funcs="$cf_cv_link_funcs $cf_func" +@@ -10221,7 +10519,7 @@ + test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no + + fi +-echo "$as_me:10224: result: $cf_cv_link_funcs" >&5 ++echo "$as_me:10522: result: $cf_cv_link_funcs" >&5 + echo "${ECHO_T}$cf_cv_link_funcs" >&6 + test "$ac_cv_func_link" = yes && + cat >>confdefs.h <<\EOF +@@ -10241,7 +10539,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:10244: checking if tic should use symbolic links" >&5 ++ echo "$as_me:10542: 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. +@@ -10251,21 +10549,21 @@ + else + with_symlinks=no + fi; +- echo "$as_me:10254: result: $with_symlinks" >&5 ++ echo "$as_me:10552: 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:10261: checking if tic should use hard links" >&5 ++ echo "$as_me:10559: 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:10268: result: $with_links" >&5 ++ echo "$as_me:10566: result: $with_links" >&5 + echo "${ECHO_T}$with_links" >&6 + fi + +@@ -10281,7 +10579,7 @@ + + ### use option --enable-broken-linker to force on use of broken-linker support + +-echo "$as_me:10284: checking if you want broken-linker support code" >&5 ++echo "$as_me:10582: 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. +@@ -10291,7 +10589,7 @@ + else + with_broken_linker=no + fi; +-echo "$as_me:10294: result: $with_broken_linker" >&5 ++echo "$as_me:10592: result: $with_broken_linker" >&5 + echo "${ECHO_T}$with_broken_linker" >&6 + + : "${BROKEN_LINKER:=0}" +@@ -10305,7 +10603,7 @@ + fi + + ### use option --enable-bsdpad to have tputs process BSD-style prefix padding +-echo "$as_me:10308: checking if tputs should process BSD-style prefix padding" >&5 ++echo "$as_me:10606: 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. +@@ -10315,7 +10613,7 @@ + else + with_bsdpad=no + fi; +-echo "$as_me:10318: result: $with_bsdpad" >&5 ++echo "$as_me:10616: result: $with_bsdpad" >&5 + echo "${ECHO_T}$with_bsdpad" >&6 + test "x$with_bsdpad" = xyes && + cat >>confdefs.h <<\EOF +@@ -10334,14 +10632,14 @@ + # Check to define _XOPEN_SOURCE "automatically" + CPPFLAGS_before_XOPEN="$CPPFLAGS" + +-echo "$as_me:10337: checking if the POSIX test-macros are already defined" >&5 ++echo "$as_me:10635: 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 10344 "configure" ++#line 10642 "configure" + #include "confdefs.h" + #include + int +@@ -10360,16 +10658,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10363: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10661: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10366: \$? = $ac_status" >&5 ++ echo "$as_me:10664: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10369: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10667: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10372: \$? = $ac_status" >&5 ++ echo "$as_me:10670: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_visible=no + else +@@ -10380,7 +10678,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:10383: result: $cf_cv_posix_visible" >&5 ++echo "$as_me:10681: result: $cf_cv_posix_visible" >&5 + echo "${ECHO_T}$cf_cv_posix_visible" >&6 + + if test "$cf_cv_posix_visible" = no; then +@@ -10422,14 +10720,14 @@ + + cf_gnu_xopen_source=$cf_XOPEN_SOURCE + +-echo "$as_me:10425: checking if this is the GNU C library" >&5 ++echo "$as_me:10723: 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 10432 "configure" ++#line 10730 "configure" + #include "confdefs.h" + #include + int +@@ -10448,16 +10746,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10451: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10749: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10454: \$? = $ac_status" >&5 ++ echo "$as_me:10752: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10457: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10755: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10460: \$? = $ac_status" >&5 ++ echo "$as_me:10758: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_library=yes + else +@@ -10468,7 +10766,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:10471: result: $cf_cv_gnu_library" >&5 ++echo "$as_me:10769: result: $cf_cv_gnu_library" >&5 + echo "${ECHO_T}$cf_cv_gnu_library" >&6 + + if test x$cf_cv_gnu_library = xyes; then +@@ -10476,7 +10774,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:10479: checking if _DEFAULT_SOURCE can be used as a basis" >&5 ++ echo "$as_me:10777: 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 +@@ -10488,7 +10786,7 @@ + CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10491 "configure" ++#line 10789 "configure" + #include "confdefs.h" + #include + int +@@ -10507,16 +10805,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10510: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10808: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10513: \$? = $ac_status" >&5 ++ echo "$as_me:10811: \$? = $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:10814: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10519: \$? = $ac_status" >&5 ++ echo "$as_me:10817: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_library_219=yes + else +@@ -10528,12 +10826,12 @@ + CPPFLAGS="$cf_save" + + fi +-echo "$as_me:10531: result: $cf_cv_gnu_library_219" >&5 ++echo "$as_me:10829: 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:10536: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 ++ echo "$as_me:10834: 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 +@@ -10638,7 +10936,7 @@ + fi + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10641 "configure" ++#line 10939 "configure" + #include "confdefs.h" + + #include +@@ -10658,16 +10956,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10661: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10959: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10664: \$? = $ac_status" >&5 ++ echo "$as_me:10962: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10667: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10965: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10670: \$? = $ac_status" >&5 ++ echo "$as_me:10968: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_dftsrc_219=yes + else +@@ -10678,7 +10976,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:10681: result: $cf_cv_gnu_dftsrc_219" >&5 ++echo "$as_me:10979: 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 +@@ -10687,14 +10985,14 @@ + + if test "x$cf_cv_gnu_dftsrc_219" != xyes; then + +- echo "$as_me:10690: checking if we must define _GNU_SOURCE" >&5 ++ echo "$as_me:10988: 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 10697 "configure" ++#line 10995 "configure" + #include "confdefs.h" + #include + int +@@ -10709,16 +11007,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10712: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11010: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10715: \$? = $ac_status" >&5 ++ echo "$as_me:11013: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10718: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11016: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10721: \$? = $ac_status" >&5 ++ echo "$as_me:11019: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_source=no + else +@@ -10825,7 +11123,7 @@ + fi + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10828 "configure" ++#line 11126 "configure" + #include "confdefs.h" + #include + int +@@ -10840,16 +11138,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10843: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11141: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10846: \$? = $ac_status" >&5 ++ echo "$as_me:11144: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10849: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11147: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10852: \$? = $ac_status" >&5 ++ echo "$as_me:11150: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_source=no + else +@@ -10864,12 +11162,12 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:10867: result: $cf_cv_gnu_source" >&5 ++echo "$as_me:11165: 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:10872: checking if we should also define _DEFAULT_SOURCE" >&5 ++ echo "$as_me:11170: 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 +@@ -10879,7 +11177,7 @@ + CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10882 "configure" ++#line 11180 "configure" + #include "confdefs.h" + #include + int +@@ -10894,16 +11192,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10897: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11195: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10900: \$? = $ac_status" >&5 ++ echo "$as_me:11198: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10903: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11201: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10906: \$? = $ac_status" >&5 ++ echo "$as_me:11204: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_default_source=no + else +@@ -10914,7 +11212,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:10917: result: $cf_cv_default_source" >&5 ++echo "$as_me:11215: result: $cf_cv_default_source" >&5 + echo "${ECHO_T}$cf_cv_default_source" >&6 + if test "$cf_cv_default_source" = yes + then +@@ -10951,16 +11249,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:10954: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:11252: 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}:10960: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:11258: testing if the symbol is already defined go no further ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10963 "configure" ++#line 11261 "configure" + #include "confdefs.h" + #include + int +@@ -10975,16 +11273,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10978: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11276: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10981: \$? = $ac_status" >&5 ++ echo "$as_me:11279: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10984: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11282: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10987: \$? = $ac_status" >&5 ++ echo "$as_me:11285: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_c_source=no + else +@@ -11005,7 +11303,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11008 "configure" ++#line 11306 "configure" + #include "confdefs.h" + #include + int +@@ -11020,16 +11318,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11023: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11321: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11026: \$? = $ac_status" >&5 ++ echo "$as_me:11324: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11029: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11327: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11032: \$? = $ac_status" >&5 ++ echo "$as_me:11330: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -11040,7 +11338,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + +-echo "${as_me:-configure}:11043: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:11341: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" +@@ -11048,10 +11346,10 @@ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +-echo "${as_me:-configure}:11051: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:11349: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11054 "configure" ++#line 11352 "configure" + #include "confdefs.h" + #include + int +@@ -11066,16 +11364,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11069: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11367: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11072: \$? = $ac_status" >&5 ++ echo "$as_me:11370: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11075: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11373: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11078: \$? = $ac_status" >&5 ++ echo "$as_me:11376: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -11091,7 +11389,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:11094: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:11392: 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 +@@ -11208,7 +11506,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:11211: WARNING: this system does not provide usable locale support" >&5 ++ { echo "$as_me:11509: 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 +@@ -11240,14 +11538,14 @@ + ;; + (*) + +-echo "$as_me:11243: checking if we should define _XOPEN_SOURCE" >&5 ++echo "$as_me:11541: 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 11250 "configure" ++#line 11548 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -11265,16 +11563,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11268: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11566: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11271: \$? = $ac_status" >&5 ++ echo "$as_me:11569: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11274: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11572: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11277: \$? = $ac_status" >&5 ++ echo "$as_me:11575: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -11286,7 +11584,7 @@ + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11289 "configure" ++#line 11587 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -11304,16 +11602,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11307: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11605: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11310: \$? = $ac_status" >&5 ++ echo "$as_me:11608: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11313: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11611: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11316: \$? = $ac_status" >&5 ++ echo "$as_me:11614: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -11328,7 +11626,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:11331: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:11629: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 + + if test "$cf_cv_xopen_source" != no ; then +@@ -11488,16 +11786,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:11491: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:11789: 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}:11497: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:11795: testing if the symbol is already defined go no further ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11500 "configure" ++#line 11798 "configure" + #include "confdefs.h" + #include + int +@@ -11512,16 +11810,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11515: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11813: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11518: \$? = $ac_status" >&5 ++ echo "$as_me:11816: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11521: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11819: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11524: \$? = $ac_status" >&5 ++ echo "$as_me:11822: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_c_source=no + else +@@ -11542,7 +11840,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11545 "configure" ++#line 11843 "configure" + #include "confdefs.h" + #include + int +@@ -11557,16 +11855,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11560: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11858: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11563: \$? = $ac_status" >&5 ++ echo "$as_me:11861: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11566: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11864: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11569: \$? = $ac_status" >&5 ++ echo "$as_me:11867: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -11577,7 +11875,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + +-echo "${as_me:-configure}:11580: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:11878: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" +@@ -11585,10 +11883,10 @@ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +-echo "${as_me:-configure}:11588: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:11886: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11591 "configure" ++#line 11889 "configure" + #include "confdefs.h" + #include + int +@@ -11603,16 +11901,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11606: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11904: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11609: \$? = $ac_status" >&5 ++ echo "$as_me:11907: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11612: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11910: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11615: \$? = $ac_status" >&5 ++ echo "$as_me:11913: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -11628,7 +11926,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:11631: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:11929: 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 +@@ -11741,10 +12039,10 @@ + if test "$cf_cv_xopen_source" = no ; then + test -n "$verbose" && echo " checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6 + +-echo "${as_me:-configure}:11744: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:12042: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11747 "configure" ++#line 12045 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -11762,23 +12060,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11765: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12063: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11768: \$? = $ac_status" >&5 ++ echo "$as_me:12066: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11771: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12069: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11774: \$? = $ac_status" >&5 ++ echo "$as_me:12072: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + +- { echo "$as_me:11781: WARNING: _POSIX_C_SOURCE definition is not usable" >&5 ++ { echo "$as_me:12079: WARNING: _POSIX_C_SOURCE definition is not usable" >&5 + echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;} + CPPFLAGS="$cf_save_xopen_cppflags" + fi +@@ -11801,7 +12099,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}:11804: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:12102: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 + + CFLAGS="$cf_old_cflag" + done +@@ -11813,7 +12111,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}:11816: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:12114: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 + + CPPFLAGS="$cf_old_cflag" + done +@@ -11901,7 +12199,7 @@ + if test -n "$cf_new_cflags" ; then + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 + +-echo "${as_me:-configure}:11904: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 ++echo "${as_me:-configure}:12202: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" +@@ -11911,7 +12209,7 @@ + if test -n "$cf_new_cppflags" ; then + test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 + +-echo "${as_me:-configure}:11914: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 ++echo "${as_me:-configure}:12212: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +@@ -11921,7 +12219,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}:11924: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 ++echo "${as_me:-configure}:12222: 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" +@@ -11933,10 +12231,10 @@ + fi + + if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then +- echo "$as_me:11936: checking if _XOPEN_SOURCE really is set" >&5 ++ echo "$as_me:12234: 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 11939 "configure" ++#line 12237 "configure" + #include "confdefs.h" + #include + int +@@ -11951,16 +12249,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11954: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12252: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11957: \$? = $ac_status" >&5 ++ echo "$as_me:12255: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11960: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12258: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11963: \$? = $ac_status" >&5 ++ echo "$as_me:12261: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_XOPEN_SOURCE_set=yes + else +@@ -11969,12 +12267,12 @@ + cf_XOPEN_SOURCE_set=no + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:11972: result: $cf_XOPEN_SOURCE_set" >&5 ++ echo "$as_me:12270: 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 11977 "configure" ++#line 12275 "configure" + #include "confdefs.h" + #include + int +@@ -11989,16 +12287,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11992: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12290: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11995: \$? = $ac_status" >&5 ++ echo "$as_me:12293: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11998: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12296: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12001: \$? = $ac_status" >&5 ++ echo "$as_me:12299: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_XOPEN_SOURCE_set_ok=yes + else +@@ -12009,19 +12307,19 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + if test "$cf_XOPEN_SOURCE_set_ok" = no + then +- { echo "$as_me:12012: WARNING: _XOPEN_SOURCE is lower than requested" >&5 ++ { echo "$as_me:12310: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} + fi + else + +-echo "$as_me:12017: checking if we should define _XOPEN_SOURCE" >&5 ++echo "$as_me:12315: 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 12024 "configure" ++#line 12322 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -12039,16 +12337,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12042: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12340: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12045: \$? = $ac_status" >&5 ++ echo "$as_me:12343: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12048: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12346: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12051: \$? = $ac_status" >&5 ++ echo "$as_me:12349: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -12060,7 +12358,7 @@ + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12063 "configure" ++#line 12361 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -12078,16 +12376,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12081: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12379: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12084: \$? = $ac_status" >&5 ++ echo "$as_me:12382: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12087: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12385: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12090: \$? = $ac_status" >&5 ++ echo "$as_me:12388: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -12102,7 +12400,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:12105: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:12403: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 + + if test "$cf_cv_xopen_source" != no ; then +@@ -12253,14 +12551,14 @@ + + # Work around breakage on OS X + +-echo "$as_me:12256: checking if SIGWINCH is defined" >&5 ++echo "$as_me:12554: 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 12263 "configure" ++#line 12561 "configure" + #include "confdefs.h" + + #include +@@ -12275,23 +12573,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12278: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12576: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12281: \$? = $ac_status" >&5 ++ echo "$as_me:12579: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12284: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12582: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12287: \$? = $ac_status" >&5 ++ echo "$as_me:12585: \$? = $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 12294 "configure" ++#line 12592 "configure" + #include "confdefs.h" + + #undef _XOPEN_SOURCE +@@ -12309,16 +12607,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12312: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12610: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12315: \$? = $ac_status" >&5 ++ echo "$as_me:12613: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12318: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12616: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12321: \$? = $ac_status" >&5 ++ echo "$as_me:12619: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_define_sigwinch=maybe + else +@@ -12332,11 +12630,11 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:12335: result: $cf_cv_define_sigwinch" >&5 ++echo "$as_me:12633: 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:12339: checking for actual SIGWINCH definition" >&5 ++echo "$as_me:12637: 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 +@@ -12347,7 +12645,7 @@ + while test "$cf_sigwinch" != 1 + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12350 "configure" ++#line 12648 "configure" + #include "confdefs.h" + + #undef _XOPEN_SOURCE +@@ -12369,16 +12667,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12372: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12670: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12375: \$? = $ac_status" >&5 ++ echo "$as_me:12673: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12378: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12676: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12381: \$? = $ac_status" >&5 ++ echo "$as_me:12679: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_fixup_sigwinch=$cf_sigwinch + break +@@ -12392,7 +12690,7 @@ + done + + fi +-echo "$as_me:12395: result: $cf_cv_fixup_sigwinch" >&5 ++echo "$as_me:12693: result: $cf_cv_fixup_sigwinch" >&5 + echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 + + if test "$cf_cv_fixup_sigwinch" != unknown ; then +@@ -12402,13 +12700,13 @@ + + # Checks for CODESET support. + +-echo "$as_me:12405: checking for nl_langinfo and CODESET" >&5 ++echo "$as_me:12703: 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 12411 "configure" ++#line 12709 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -12422,16 +12720,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:12425: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12723: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12428: \$? = $ac_status" >&5 ++ echo "$as_me:12726: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:12431: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12729: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12434: \$? = $ac_status" >&5 ++ echo "$as_me:12732: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + am_cv_langinfo_codeset=yes + else +@@ -12442,7 +12740,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:12445: result: $am_cv_langinfo_codeset" >&5 ++echo "$as_me:12743: result: $am_cv_langinfo_codeset" >&5 + echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 + if test "$am_cv_langinfo_codeset" = yes; then + +@@ -12456,7 +12754,7 @@ + NCURSES_OK_WCHAR_T= + NCURSES_OK_WINT_T= + +-echo "$as_me:12459: checking if you want wide-character code" >&5 ++echo "$as_me:12757: 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. +@@ -12466,7 +12764,7 @@ + else + with_widec=$cf_dft_widec + fi; +-echo "$as_me:12469: result: $with_widec" >&5 ++echo "$as_me:12767: result: $with_widec" >&5 + echo "${ECHO_T}$with_widec" >&6 + + NCURSES_WCWIDTH_GRAPHICS=1 +@@ -12488,7 +12786,7 @@ + (*_XOPEN_SOURCE=*) + ;; + (*) +- { echo "$as_me:12491: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5 ++ { echo "$as_me:12789: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5 + echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;} + # CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR" + CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR" +@@ -12501,23 +12799,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:12504: checking for $ac_header" >&5 ++echo "$as_me:12802: 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 12510 "configure" ++#line 12808 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:12514: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:12812: \"$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:12520: \$? = $ac_status" >&5 ++ echo "$as_me:12818: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -12536,7 +12834,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:12539: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:12837: 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:12847: 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 12556 "configure" ++#line 12854 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -12575,16 +12873,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12578: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12876: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12581: \$? = $ac_status" >&5 ++ echo "$as_me:12879: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12584: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12882: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12587: \$? = $ac_status" >&5 ++ echo "$as_me:12885: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wchar_h_okay=yes + else +@@ -12594,16 +12892,16 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:12597: result: $cf_cv_wchar_h_okay" >&5 ++echo "$as_me:12895: 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:12603: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 ++echo "$as_me:12901: 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 12606 "configure" ++#line 12904 "configure" + #include "confdefs.h" + #include + +@@ -12619,16 +12917,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12622: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12920: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12625: \$? = $ac_status" >&5 ++ echo "$as_me:12923: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12628: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12926: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12631: \$? = $ac_status" >&5 ++ echo "$as_me:12929: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=no + else +@@ -12637,16 +12935,16 @@ + cf_result=yes + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +-echo "$as_me:12640: result: $cf_result" >&5 ++echo "$as_me:12938: 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:12646: checking checking for compatible value versus " >&5 ++ echo "$as_me:12944: 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 12649 "configure" ++#line 12947 "configure" + #include "confdefs.h" + #include + +@@ -12662,16 +12960,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12665: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12963: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12668: \$? = $ac_status" >&5 ++ echo "$as_me:12966: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12671: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12969: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12674: \$? = $ac_status" >&5 ++ echo "$as_me:12972: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=yes + else +@@ -12680,7 +12978,7 @@ + cf_result=no + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:12683: result: $cf_result" >&5 ++ echo "$as_me:12981: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" = no ; then + # perhaps we can override it - try... +@@ -12690,7 +12988,7 @@ + + fi + +-echo "$as_me:12693: checking if wcwidth agrees graphics are single-width" >&5 ++echo "$as_me:12991: 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 +@@ -12761,7 +13059,7 @@ + cf_cv_wcwidth_graphics=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12764 "configure" ++#line 13062 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -12806,15 +13104,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:12809: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13107: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12812: \$? = $ac_status" >&5 ++ echo "$as_me:13110: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:12814: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13112: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12817: \$? = $ac_status" >&5 ++ echo "$as_me:13115: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wcwidth_graphics=yes + else +@@ -12827,7 +13125,7 @@ + fi + + fi +-echo "$as_me:12830: result: $cf_cv_wcwidth_graphics" >&5 ++echo "$as_me:13128: result: $cf_cv_wcwidth_graphics" >&5 + echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6 + + test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0 +@@ -12838,13 +13136,13 @@ + for ac_func in putwc btowc wctob wmemchr 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:12841: checking for $ac_func" >&5 ++echo "$as_me:13139: 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 12847 "configure" ++#line 13145 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -12875,16 +13173,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:12878: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13176: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12881: \$? = $ac_status" >&5 ++ echo "$as_me:13179: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:12884: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13182: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12887: \$? = $ac_status" >&5 ++ echo "$as_me:13185: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -12894,7 +13192,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:12897: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:13195: 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:13210: 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 12918 "configure" ++#line 13216 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:12922: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:13220: \"$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:12928: \$? = $ac_status" >&5 ++ echo "$as_me:13226: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -12944,7 +13242,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:12947: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:13245: 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:13255: 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 +@@ -12962,7 +13260,7 @@ + + cf_save_LIBS="$LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12965 "configure" ++#line 13263 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -12979,16 +13277,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:12982: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13280: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12985: \$? = $ac_status" >&5 ++ echo "$as_me:13283: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:12988: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13286: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12991: \$? = $ac_status" >&5 ++ echo "$as_me:13289: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_utf8_lib=yes + else +@@ -13000,12 +13298,12 @@ + cf_cv_header_path_utf8= + cf_cv_library_path_utf8= + +-echo "${as_me:-configure}:13003: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:13301: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13008 "configure" ++#line 13306 "configure" + #include "confdefs.h" + + #include +@@ -13018,16 +13316,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:13021: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13319: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13024: \$? = $ac_status" >&5 ++ echo "$as_me:13322: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:13027: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13325: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13030: \$? = $ac_status" >&5 ++ echo "$as_me:13328: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -13041,7 +13339,7 @@ + LIBS="-lutf8 $cf_save_LIBS" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13044 "configure" ++#line 13342 "configure" + #include "confdefs.h" + + #include +@@ -13054,16 +13352,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:13057: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13355: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13060: \$? = $ac_status" >&5 ++ echo "$as_me:13358: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:13063: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13361: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13066: \$? = $ac_status" >&5 ++ echo "$as_me:13364: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -13080,9 +13378,9 @@ + + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 + +-echo "${as_me:-configure}:13083: testing find linkage for utf8 library ..." 1>&5 ++echo "${as_me:-configure}:13381: testing find linkage for utf8 library ..." 1>&5 + +-echo "${as_me:-configure}:13085: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:13383: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -13173,7 +13471,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}:13176: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:13474: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_save_CPPFLAGS" + +@@ -13181,7 +13479,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13184 "configure" ++#line 13482 "configure" + #include "confdefs.h" + + #include +@@ -13194,21 +13492,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13197: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13495: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13200: \$? = $ac_status" >&5 ++ echo "$as_me:13498: \$? = $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:13501: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13206: \$? = $ac_status" >&5 ++ echo "$as_me:13504: \$? = $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}:13211: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:13509: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -13226,7 +13524,7 @@ + + if test "$cf_cv_find_linkage_utf8" = maybe ; then + +-echo "${as_me:-configure}:13229: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:13527: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -13301,13 +13599,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}:13304: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:13602: 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 13310 "configure" ++#line 13608 "configure" + #include "confdefs.h" + + #include +@@ -13320,21 +13618,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:13323: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13621: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13326: \$? = $ac_status" >&5 ++ echo "$as_me:13624: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:13329: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13627: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13332: \$? = $ac_status" >&5 ++ echo "$as_me:13630: \$? = $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}:13337: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:13635: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=yes + cf_cv_library_file_utf8="-lutf8" +@@ -13376,7 +13674,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:13379: result: $cf_cv_utf8_lib" >&5 ++echo "$as_me:13677: 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 +@@ -13414,7 +13712,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13417 "configure" ++#line 13715 "configure" + #include "confdefs.h" + #include + int +@@ -13426,16 +13724,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13429: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13727: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13432: \$? = $ac_status" >&5 ++ echo "$as_me:13730: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13435: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13733: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13438: \$? = $ac_status" >&5 ++ echo "$as_me:13736: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -13452,7 +13750,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}:13455: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:13753: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -13488,7 +13786,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}:13491: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:13789: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -13520,14 +13818,14 @@ + fi + + # This is needed on Tru64 5.0 to declare mbstate_t +-echo "$as_me:13523: checking if we must include wchar.h to declare mbstate_t" >&5 ++echo "$as_me:13821: 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 13530 "configure" ++#line 13828 "configure" + #include "confdefs.h" + + #include +@@ -13545,23 +13843,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13548: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13846: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13551: \$? = $ac_status" >&5 ++ echo "$as_me:13849: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13554: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13852: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13557: \$? = $ac_status" >&5 ++ echo "$as_me:13855: \$? = $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 13564 "configure" ++#line 13862 "configure" + #include "confdefs.h" + + #include +@@ -13580,16 +13878,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13583: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13881: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13586: \$? = $ac_status" >&5 ++ echo "$as_me:13884: \$? = $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:13887: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13592: \$? = $ac_status" >&5 ++ echo "$as_me:13890: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_mbstate_t=yes + else +@@ -13601,7 +13899,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:13604: result: $cf_cv_mbstate_t" >&5 ++echo "$as_me:13902: result: $cf_cv_mbstate_t" >&5 + echo "${ECHO_T}$cf_cv_mbstate_t" >&6 + + if test "$cf_cv_mbstate_t" = yes ; then +@@ -13619,14 +13917,14 @@ + fi + + # This is needed on Tru64 5.0 to declare wchar_t +-echo "$as_me:13622: checking if we must include wchar.h to declare wchar_t" >&5 ++echo "$as_me:13920: 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 13629 "configure" ++#line 13927 "configure" + #include "confdefs.h" + + #include +@@ -13644,23 +13942,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13647: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13945: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13650: \$? = $ac_status" >&5 ++ echo "$as_me:13948: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13653: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13951: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13656: \$? = $ac_status" >&5 ++ echo "$as_me:13954: \$? = $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 13663 "configure" ++#line 13961 "configure" + #include "confdefs.h" + + #include +@@ -13679,16 +13977,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13682: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13980: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13685: \$? = $ac_status" >&5 ++ echo "$as_me:13983: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13688: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13986: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13691: \$? = $ac_status" >&5 ++ echo "$as_me:13989: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wchar_t=yes + else +@@ -13700,7 +13998,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:13703: result: $cf_cv_wchar_t" >&5 ++echo "$as_me:14001: result: $cf_cv_wchar_t" >&5 + echo "${ECHO_T}$cf_cv_wchar_t" >&6 + + if test "$cf_cv_wchar_t" = yes ; then +@@ -13723,14 +14021,14 @@ + fi + + # This is needed on Tru64 5.0 to declare wint_t +-echo "$as_me:13726: checking if we must include wchar.h to declare wint_t" >&5 ++echo "$as_me:14024: 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 13733 "configure" ++#line 14031 "configure" + #include "confdefs.h" + + #include +@@ -13748,23 +14046,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13751: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14049: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13754: \$? = $ac_status" >&5 ++ echo "$as_me:14052: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13757: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14055: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13760: \$? = $ac_status" >&5 ++ echo "$as_me:14058: \$? = $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 13767 "configure" ++#line 14065 "configure" + #include "confdefs.h" + + #include +@@ -13783,16 +14081,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13786: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14084: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13789: \$? = $ac_status" >&5 ++ echo "$as_me:14087: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13792: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14090: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13795: \$? = $ac_status" >&5 ++ echo "$as_me:14093: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wint_t=yes + else +@@ -13804,7 +14102,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:13807: result: $cf_cv_wint_t" >&5 ++echo "$as_me:14105: result: $cf_cv_wint_t" >&5 + echo "${ECHO_T}$cf_cv_wint_t" >&6 + + if test "$cf_cv_wint_t" = yes ; then +@@ -13836,7 +14134,7 @@ + fi + + ### use option --disable-lp64 to allow long chtype +-echo "$as_me:13839: checking whether to enable _LP64 definition in curses.h" >&5 ++echo "$as_me:14137: 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. +@@ -13846,7 +14144,7 @@ + else + with_lp64=$cf_dft_with_lp64 + fi; +-echo "$as_me:13849: result: $with_lp64" >&5 ++echo "$as_me:14147: result: $with_lp64" >&5 + echo "${ECHO_T}$with_lp64" >&6 + + if test "x$with_lp64" = xyes ; then +@@ -13862,7 +14160,7 @@ + fi; + if test "$enable_largefile" != no; then + +- echo "$as_me:13865: checking for special C compiler options needed for large files" >&5 ++ echo "$as_me:14163: 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 +@@ -13874,7 +14172,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 13877 "configure" ++#line 14175 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -13894,16 +14192,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13897: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14195: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13900: \$? = $ac_status" >&5 ++ echo "$as_me:14198: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13903: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14201: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13906: \$? = $ac_status" >&5 ++ echo "$as_me:14204: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -13913,16 +14211,16 @@ + rm -f "conftest.$ac_objext" + CC="$CC -n32" + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13916: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14214: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13919: \$? = $ac_status" >&5 ++ echo "$as_me:14217: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13922: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14220: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13925: \$? = $ac_status" >&5 ++ echo "$as_me:14223: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_largefile_CC=' -n32'; break + else +@@ -13936,13 +14234,13 @@ + rm -f "conftest.$ac_ext" + fi + fi +-echo "$as_me:13939: result: $ac_cv_sys_largefile_CC" >&5 ++echo "$as_me:14237: 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:13945: checking for _FILE_OFFSET_BITS value needed for large files" >&5 ++ echo "$as_me:14243: 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 +@@ -13950,7 +14248,7 @@ + while :; do + ac_cv_sys_file_offset_bits=no + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13953 "configure" ++#line 14251 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -13970,16 +14268,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13973: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14271: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13976: \$? = $ac_status" >&5 ++ echo "$as_me:14274: \$? = $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:14277: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13982: \$? = $ac_status" >&5 ++ echo "$as_me:14280: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -13988,7 +14286,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13991 "configure" ++#line 14289 "configure" + #include "confdefs.h" + #define _FILE_OFFSET_BITS 64 + #include +@@ -14009,16 +14307,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14012: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14310: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14015: \$? = $ac_status" >&5 ++ echo "$as_me:14313: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14018: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14316: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14021: \$? = $ac_status" >&5 ++ echo "$as_me:14319: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_file_offset_bits=64; break + else +@@ -14029,7 +14327,7 @@ + break + done + fi +-echo "$as_me:14032: result: $ac_cv_sys_file_offset_bits" >&5 ++echo "$as_me:14330: 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 + +@@ -14039,7 +14337,7 @@ + + fi + rm -rf conftest* +- echo "$as_me:14042: checking for _LARGE_FILES value needed for large files" >&5 ++ echo "$as_me:14340: 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 +@@ -14047,7 +14345,7 @@ + while :; do + ac_cv_sys_large_files=no + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14050 "configure" ++#line 14348 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -14067,16 +14365,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14070: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14368: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14073: \$? = $ac_status" >&5 ++ echo "$as_me:14371: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14076: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14374: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14079: \$? = $ac_status" >&5 ++ echo "$as_me:14377: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -14085,7 +14383,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14088 "configure" ++#line 14386 "configure" + #include "confdefs.h" + #define _LARGE_FILES 1 + #include +@@ -14106,16 +14404,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14109: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14407: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14112: \$? = $ac_status" >&5 ++ echo "$as_me:14410: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14115: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14413: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14118: \$? = $ac_status" >&5 ++ echo "$as_me:14416: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_large_files=1; break + else +@@ -14126,7 +14424,7 @@ + break + done + fi +-echo "$as_me:14129: result: $ac_cv_sys_large_files" >&5 ++echo "$as_me:14427: 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 + +@@ -14139,7 +14437,7 @@ + fi + + if test "$enable_largefile" != no ; then +- echo "$as_me:14142: checking for _LARGEFILE_SOURCE value needed for large files" >&5 ++ echo "$as_me:14440: 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 +@@ -14147,7 +14445,7 @@ + while :; do + ac_cv_sys_largefile_source=no + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14150 "configure" ++#line 14448 "configure" + #include "confdefs.h" + #include + #include +@@ -14162,16 +14460,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14165: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14463: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14168: \$? = $ac_status" >&5 ++ echo "$as_me:14466: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14171: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14469: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14174: \$? = $ac_status" >&5 ++ echo "$as_me:14472: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -14180,7 +14478,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14183 "configure" ++#line 14481 "configure" + #include "confdefs.h" + #define _LARGEFILE_SOURCE 1 + #include +@@ -14196,16 +14494,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14199: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14497: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14202: \$? = $ac_status" >&5 ++ echo "$as_me:14500: \$? = $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:14503: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14208: \$? = $ac_status" >&5 ++ echo "$as_me:14506: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_largefile_source=1; break + else +@@ -14216,7 +14514,7 @@ + break + done + fi +-echo "$as_me:14219: result: $ac_cv_sys_largefile_source" >&5 ++echo "$as_me:14517: 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 + +@@ -14230,13 +14528,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:14233: checking for fseeko" >&5 ++echo "$as_me:14531: 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 14239 "configure" ++#line 14537 "configure" + #include "confdefs.h" + #include + #include +@@ -14250,16 +14548,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:14253: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14551: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14256: \$? = $ac_status" >&5 ++ echo "$as_me:14554: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:14259: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14557: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14262: \$? = $ac_status" >&5 ++ echo "$as_me:14560: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_fseeko=yes + else +@@ -14269,7 +14567,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:14272: result: $ac_cv_func_fseeko" >&5 ++echo "$as_me:14570: result: $ac_cv_func_fseeko" >&5 + echo "${ECHO_T}$ac_cv_func_fseeko" >&6 + if test $ac_cv_func_fseeko = yes; then + +@@ -14308,14 +14606,14 @@ + + fi + +- echo "$as_me:14311: checking whether to use struct dirent64" >&5 ++ echo "$as_me:14609: 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 14318 "configure" ++#line 14616 "configure" + #include "confdefs.h" + + #pragma GCC diagnostic error "-Wincompatible-pointer-types" +@@ -14342,16 +14640,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14345: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14643: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14348: \$? = $ac_status" >&5 ++ echo "$as_me:14646: \$? = $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:14649: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14354: \$? = $ac_status" >&5 ++ echo "$as_me:14652: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_struct_dirent64=yes + else +@@ -14362,7 +14660,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:14365: result: $cf_cv_struct_dirent64" >&5 ++echo "$as_me:14663: result: $cf_cv_struct_dirent64" >&5 + echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 + test "$cf_cv_struct_dirent64" = yes && + cat >>confdefs.h <<\EOF +@@ -14372,7 +14670,7 @@ + fi + + ### use option --disable-tparm-varargs to make tparm() conform to X/Open +-echo "$as_me:14375: checking if you want tparm not to use X/Open fixed-parameter list" >&5 ++echo "$as_me:14673: 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. +@@ -14382,14 +14680,14 @@ + else + with_tparm_varargs=yes + fi; +-echo "$as_me:14385: result: $with_tparm_varargs" >&5 ++echo "$as_me:14683: 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:14392: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 ++echo "$as_me:14690: 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. +@@ -14399,14 +14697,14 @@ + else + with_tic_depends=yes + fi; +-echo "$as_me:14402: result: $with_tic_depends" >&5 ++echo "$as_me:14700: 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:14409: checking if you want to enable wattr* macros" >&5 ++echo "$as_me:14707: 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. +@@ -14418,15 +14716,15 @@ + fi; + if [ "x$with_wattr_macros" != xyes ]; then + NCURSES_WATTR_MACROS=0 +- echo "$as_me:14421: result: no" >&5 ++ echo "$as_me:14719: result: no" >&5 + echo "${ECHO_T}no" >&6 + else + NCURSES_WATTR_MACROS=1 +- echo "$as_me:14425: result: yes" >&5 ++ echo "$as_me:14723: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + fi + +-echo "$as_me:14429: checking for X11 rgb file" >&5 ++echo "$as_me:14727: 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. +@@ -14490,7 +14788,7 @@ + cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:14493: error: expected a pathname, not \"$cf_path\"" >&5 ++ { { echo "$as_me:14791: error: expected a pathname, not \"$cf_path\"" >&5 + echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -14498,7 +14796,7 @@ + + fi + +-echo "$as_me:14501: result: $RGB_PATH" >&5 ++echo "$as_me:14799: result: $RGB_PATH" >&5 + echo "${ECHO_T}$RGB_PATH" >&6 + + cat >>confdefs.h <&5 ++echo "$as_me:14814: 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. +@@ -14523,17 +14821,17 @@ + else + NCURSES_BOOL=auto + fi; +-echo "$as_me:14526: result: $NCURSES_BOOL" >&5 ++echo "$as_me:14824: result: $NCURSES_BOOL" >&5 + echo "${ECHO_T}$NCURSES_BOOL" >&6 + case x$NCURSES_BOOL in + (x|xyes|xno) +- { { echo "$as_me:14530: error: expected a type name for bool" >&5 ++ { { echo "$as_me:14828: error: expected a type name for bool" >&5 + echo "$as_me: error: expected a type name for bool" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + +-echo "$as_me:14536: checking for alternate terminal capabilities file" >&5 ++echo "$as_me:14834: 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. +@@ -14545,16 +14843,16 @@ + fi; + if test ! -f "${srcdir}/include/${TERMINFO_CAPS}" + then +- { echo "$as_me:14548: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5 ++ { echo "$as_me:14846: 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:14552: result: $TERMINFO_CAPS" >&5 ++echo "$as_me:14850: result: $TERMINFO_CAPS" >&5 + echo "${ECHO_T}$TERMINFO_CAPS" >&6 + + ### use option --with-chtype to override chtype's type + +-echo "$as_me:14557: checking for type of chtype" >&5 ++echo "$as_me:14855: 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. +@@ -14564,11 +14862,11 @@ + else + NCURSES_CHTYPE=$cf_dft_chtype + fi; +-echo "$as_me:14567: result: $NCURSES_CHTYPE" >&5 ++echo "$as_me:14865: result: $NCURSES_CHTYPE" >&5 + echo "${ECHO_T}$NCURSES_CHTYPE" >&6 + case x$NCURSES_CHTYPE in + (x|xyes|xno) +- { { echo "$as_me:14571: error: expected a type name for chtype" >&5 ++ { { echo "$as_me:14869: error: expected a type name for chtype" >&5 + echo "$as_me: error: expected a type name for chtype" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -14576,7 +14874,7 @@ + + ### use option --with-ospeed to override ospeed's type + +-echo "$as_me:14579: checking for type of ospeed" >&5 ++echo "$as_me:14877: 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. +@@ -14586,11 +14884,11 @@ + else + NCURSES_OSPEED=short + fi; +-echo "$as_me:14589: result: $NCURSES_OSPEED" >&5 ++echo "$as_me:14887: result: $NCURSES_OSPEED" >&5 + echo "${ECHO_T}$NCURSES_OSPEED" >&6 + case x$NCURSES_OSPEED in + (x|xyes|xno) +- { { echo "$as_me:14593: error: expected a type name for ospeed" >&5 ++ { { echo "$as_me:14891: error: expected a type name for ospeed" >&5 + echo "$as_me: error: expected a type name for ospeed" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -14598,7 +14896,7 @@ + + ### use option --with-mmask-t to override mmask_t's type + +-echo "$as_me:14601: checking for type of mmask-t" >&5 ++echo "$as_me:14899: 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. +@@ -14608,18 +14906,18 @@ + else + NCURSES_MMASK_T=$cf_dft_mmask_t + fi; +-echo "$as_me:14611: result: $NCURSES_MMASK_T" >&5 ++echo "$as_me:14909: result: $NCURSES_MMASK_T" >&5 + echo "${ECHO_T}$NCURSES_MMASK_T" >&6 + case x$NCURSES_MMASK_T in + (x|xyes|xno) +- { { echo "$as_me:14615: error: expected a type name for mmask-t" >&5 ++ { { echo "$as_me:14913: error: expected a type name for mmask-t" >&5 + echo "$as_me: error: expected a type name for mmask-t" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + + ### use option --with-ccharw-max to override CCHARW_MAX size +-echo "$as_me:14622: checking for size CCHARW_MAX" >&5 ++echo "$as_me:14920: 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. +@@ -14629,16 +14927,16 @@ + else + NCURSES_CCHARW_MAX=$cf_dft_ccharw_max + fi; +-echo "$as_me:14632: result: $NCURSES_CCHARW_MAX" >&5 ++echo "$as_me:14930: result: $NCURSES_CCHARW_MAX" >&5 + echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6 + +-echo "$as_me:14635: checking for signed char" >&5 ++echo "$as_me:14933: 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 14641 "configure" ++#line 14939 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14653,16 +14951,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14656: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14954: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14659: \$? = $ac_status" >&5 ++ echo "$as_me:14957: \$? = $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:14960: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14665: \$? = $ac_status" >&5 ++ echo "$as_me:14963: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_signed_char=yes + else +@@ -14672,10 +14970,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:14675: result: $ac_cv_type_signed_char" >&5 ++echo "$as_me:14973: result: $ac_cv_type_signed_char" >&5 + echo "${ECHO_T}$ac_cv_type_signed_char" >&6 + +-echo "$as_me:14678: checking size of signed char" >&5 ++echo "$as_me:14976: 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 +@@ -14684,7 +14982,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14687 "configure" ++#line 14985 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14696,21 +14994,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14699: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14997: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14702: \$? = $ac_status" >&5 ++ echo "$as_me:15000: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14705: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15003: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14708: \$? = $ac_status" >&5 ++ echo "$as_me:15006: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14713 "configure" ++#line 15011 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14722,16 +15020,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14725: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15023: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14728: \$? = $ac_status" >&5 ++ echo "$as_me:15026: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14731: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15029: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14734: \$? = $ac_status" >&5 ++ echo "$as_me:15032: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -14747,7 +15045,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14750 "configure" ++#line 15048 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14759,16 +15057,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14762: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15060: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14765: \$? = $ac_status" >&5 ++ echo "$as_me:15063: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14768: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15066: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14771: \$? = $ac_status" >&5 ++ echo "$as_me:15069: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -14784,7 +15082,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 14787 "configure" ++#line 15085 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14796,16 +15094,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14799: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15097: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14802: \$? = $ac_status" >&5 ++ echo "$as_me:15100: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14805: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15103: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14808: \$? = $ac_status" >&5 ++ echo "$as_me:15106: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -14818,12 +15116,12 @@ + ac_cv_sizeof_signed_char=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:14821: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:15119: 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 14826 "configure" ++#line 15124 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14839,15 +15137,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:14842: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15140: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14845: \$? = $ac_status" >&5 ++ echo "$as_me:15143: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:14847: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15145: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14850: \$? = $ac_status" >&5 ++ echo "$as_me:15148: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_signed_char=`cat conftest.val` + else +@@ -14863,7 +15161,7 @@ + ac_cv_sizeof_signed_char=0 + fi + fi +-echo "$as_me:14866: result: $ac_cv_sizeof_signed_char" >&5 ++echo "$as_me:15164: result: $ac_cv_sizeof_signed_char" >&5 + echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:15175: checking whether to use signed chars for Boolean array in term.h" >&5 + echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6 + + # Check whether --enable-signed-char or --disable-signed-char was given. +@@ -14884,13 +15182,13 @@ + else + with_signed_char=$cf_dft_signed_char + fi; +-echo "$as_me:14887: result: $with_signed_char" >&5 ++echo "$as_me:15185: 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:14893: checking for type of tparm-arg" >&5 ++echo "$as_me:15191: checking for type of tparm-arg" >&5 + echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6 + + # Check whether --with-tparm-arg or --without-tparm-arg was given. +@@ -14900,18 +15198,18 @@ + else + NCURSES_TPARM_ARG=$cf_dft_tparm_arg + fi; +-echo "$as_me:14903: result: $NCURSES_TPARM_ARG" >&5 ++echo "$as_me:15201: result: $NCURSES_TPARM_ARG" >&5 + echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6 + case x$NCURSES_TPARM_ARG in + (x|xyes|xno) +- { { echo "$as_me:14907: error: expected a type name for tparm-arg" >&5 ++ { { echo "$as_me:15205: error: expected a type name for tparm-arg" >&5 + echo "$as_me: error: expected a type name for tparm-arg" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + + ### Enable compiling-in rcs id's +-echo "$as_me:14914: checking if RCS identifiers should be compiled-in" >&5 ++echo "$as_me:15212: 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. +@@ -14921,7 +15219,7 @@ + else + with_rcs_ids=no + fi; +-echo "$as_me:14924: result: $with_rcs_ids" >&5 ++echo "$as_me:15222: result: $with_rcs_ids" >&5 + echo "${ECHO_T}$with_rcs_ids" >&6 + test "x$with_rcs_ids" = xyes && + cat >>confdefs.h <<\EOF +@@ -14930,7 +15228,7 @@ + + ############################################################################### + +-echo "$as_me:14933: checking format of man-pages" >&5 ++echo "$as_me:15231: 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. +@@ -15021,10 +15319,10 @@ + ;; + esac + +-echo "$as_me:15024: result: $MANPAGE_FORMAT" >&5 ++echo "$as_me:15322: result: $MANPAGE_FORMAT" >&5 + echo "${ECHO_T}$MANPAGE_FORMAT" >&6 + if test -n "$cf_unknown" ; then +- { echo "$as_me:15027: WARNING: Unexpected manpage-format $cf_unknown" >&5 ++ { echo "$as_me:15325: WARNING: Unexpected manpage-format $cf_unknown" >&5 + echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} + fi + +@@ -15065,7 +15363,7 @@ + esac + done + +-echo "$as_me:15068: checking for manpage renaming" >&5 ++echo "$as_me:15366: 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. +@@ -15094,15 +15392,15 @@ + elif test "$MANPAGE_RENAMES" = no ; then + : + elif test ! -f "$MANPAGE_RENAMES" ; then +- { { echo "$as_me:15097: error: not a filename: $MANPAGE_RENAMES" >&5 ++ { { echo "$as_me:15395: error: not a filename: $MANPAGE_RENAMES" >&5 + echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} + { (exit 1); exit 1; }; } + fi + +-echo "$as_me:15102: result: $MANPAGE_RENAMES" >&5 ++echo "$as_me:15400: result: $MANPAGE_RENAMES" >&5 + echo "${ECHO_T}$MANPAGE_RENAMES" >&6 + +-echo "$as_me:15105: checking if manpage aliases will be installed" >&5 ++echo "$as_me:15403: 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. +@@ -15113,7 +15411,7 @@ + MANPAGE_ALIASES=yes + fi; + +-echo "$as_me:15116: result: $MANPAGE_ALIASES" >&5 ++echo "$as_me:15414: result: $MANPAGE_ALIASES" >&5 + echo "${ECHO_T}$MANPAGE_ALIASES" >&6 + + case "x$LN_S" in +@@ -15127,7 +15425,7 @@ + + MANPAGE_SYMLINKS=no + if test "$MANPAGE_ALIASES" = yes ; then +-echo "$as_me:15130: checking if manpage symlinks should be used" >&5 ++echo "$as_me:15428: 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. +@@ -15140,17 +15438,17 @@ + + if test "$cf_use_symlinks" = no; then + if test "$MANPAGE_SYMLINKS" = yes ; then +- { echo "$as_me:15143: WARNING: cannot make symlinks" >&5 ++ { echo "$as_me:15441: WARNING: cannot make symlinks" >&5 + echo "$as_me: WARNING: cannot make symlinks" >&2;} + MANPAGE_SYMLINKS=no + fi + fi + +-echo "$as_me:15149: result: $MANPAGE_SYMLINKS" >&5 ++echo "$as_me:15447: result: $MANPAGE_SYMLINKS" >&5 + echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 + fi + +-echo "$as_me:15153: checking for manpage tbl" >&5 ++echo "$as_me:15451: 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. +@@ -15161,7 +15459,7 @@ + MANPAGE_TBL=no + fi; + +-echo "$as_me:15164: result: $MANPAGE_TBL" >&5 ++echo "$as_me:15462: result: $MANPAGE_TBL" >&5 + echo "${ECHO_T}$MANPAGE_TBL" >&6 + + if test "$prefix" = "NONE" ; then +@@ -15479,7 +15777,7 @@ + ############################################################################### + + ### Note that some functions (such as const) are normally disabled anyway. +-echo "$as_me:15482: checking if you want to build with function extensions" >&5 ++echo "$as_me:15780: 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. +@@ -15489,7 +15787,7 @@ + else + with_ext_funcs=yes + fi; +-echo "$as_me:15492: result: $with_ext_funcs" >&5 ++echo "$as_me:15790: result: $with_ext_funcs" >&5 + echo "${ECHO_T}$with_ext_funcs" >&6 + if test "x$with_ext_funcs" = xyes ; then + NCURSES_EXT_FUNCS=1 +@@ -15545,7 +15843,7 @@ + GENERATED_EXT_FUNCS= + fi + +-echo "$as_me:15548: checking if you want to build with SCREEN extensions" >&5 ++echo "$as_me:15846: 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. +@@ -15555,7 +15853,7 @@ + else + with_sp_funcs=$cf_dft_ext_spfuncs + fi; +-echo "$as_me:15558: result: $with_sp_funcs" >&5 ++echo "$as_me:15856: result: $with_sp_funcs" >&5 + echo "${ECHO_T}$with_sp_funcs" >&6 + if test "x$with_sp_funcs" = xyes ; then + NCURSES_SP_FUNCS=1 +@@ -15574,7 +15872,7 @@ + GENERATED_SP_FUNCS= + fi + +-echo "$as_me:15577: checking if you want to build with terminal-driver" >&5 ++echo "$as_me:15875: 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. +@@ -15584,7 +15882,7 @@ + else + with_term_driver=no + fi; +-echo "$as_me:15587: result: $with_term_driver" >&5 ++echo "$as_me:15885: result: $with_term_driver" >&5 + echo "${ECHO_T}$with_term_driver" >&6 + if test "x$with_term_driver" = xyes ; then + +@@ -15593,19 +15891,19 @@ + EOF + + if test "x$with_termlib" != xno ; then +- { { echo "$as_me:15596: error: The term-driver option conflicts with the termlib option" >&5 ++ { { echo "$as_me:15894: 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:15601: error: The term-driver option relies upon sp-funcs" >&5 ++ { { echo "$as_me:15899: 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:15608: checking for extended use of const keyword" >&5 ++echo "$as_me:15906: 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. +@@ -15615,7 +15913,7 @@ + else + with_ext_const=$cf_dft_ext_const + fi; +-echo "$as_me:15618: result: $with_ext_const" >&5 ++echo "$as_me:15916: result: $with_ext_const" >&5 + echo "${ECHO_T}$with_ext_const" >&6 + NCURSES_CONST='/*nothing*/' + if test "x$with_ext_const" = xyes ; then +@@ -15623,7 +15921,7 @@ + fi + + ### use option --enable-ext-colors to turn on use of colors beyond 16. +-echo "$as_me:15626: checking if you want to use extended colors" >&5 ++echo "$as_me:15924: 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. +@@ -15633,12 +15931,12 @@ + else + with_ext_colors=$cf_dft_ext_colors + fi; +-echo "$as_me:15636: result: $with_ext_colors" >&5 ++echo "$as_me:15934: 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:15641: WARNING: This option applies only to wide-character library" >&5 ++ { echo "$as_me:15939: 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) +@@ -15649,7 +15947,7 @@ + cf_cv_rel_version=6.0 + cf_cv_abi_version=6 + cf_cv_abi_default=6 +- { echo "$as_me:15652: WARNING: overriding ABI version to $cf_cv_abi_default" >&5 ++ { echo "$as_me:15950: WARNING: overriding ABI version to $cf_cv_abi_default" >&5 + echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;} + ;; + esac +@@ -15677,7 +15975,7 @@ + fi + + ### use option --enable-ext-mouse to modify coding to support 5-button mice +-echo "$as_me:15680: checking if you want to use extended mouse encoding" >&5 ++echo "$as_me:15978: 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. +@@ -15687,7 +15985,7 @@ + else + with_ext_mouse=$cf_dft_ext_mouse + fi; +-echo "$as_me:15690: result: $with_ext_mouse" >&5 ++echo "$as_me:15988: result: $with_ext_mouse" >&5 + echo "${ECHO_T}$with_ext_mouse" >&6 + if test "x$with_ext_mouse" = xyes ; then + +@@ -15697,7 +15995,7 @@ + cf_cv_rel_version=6.0 + cf_cv_abi_version=6 + cf_cv_abi_default=6 +- { echo "$as_me:15700: WARNING: overriding ABI version to $cf_cv_abi_default" >&5 ++ { echo "$as_me:15998: WARNING: overriding ABI version to $cf_cv_abi_default" >&5 + echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;} + ;; + esac +@@ -15714,7 +16012,7 @@ + fi + + ### use option --enable-ext-putwin to turn on extended screendumps +-echo "$as_me:15717: checking if you want to use extended putwin/screendump" >&5 ++echo "$as_me:16015: 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. +@@ -15724,7 +16022,7 @@ + else + with_ext_putwin=$cf_dft_ext_putwin + fi; +-echo "$as_me:15727: result: $with_ext_putwin" >&5 ++echo "$as_me:16025: result: $with_ext_putwin" >&5 + echo "${ECHO_T}$with_ext_putwin" >&6 + if test "x$with_ext_putwin" = xyes ; then + +@@ -15734,7 +16032,7 @@ + + fi + +-echo "$as_me:15737: checking if you want \$NCURSES_NO_PADDING code" >&5 ++echo "$as_me:16035: 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. +@@ -15744,7 +16042,7 @@ + else + with_no_padding=$with_ext_funcs + fi; +-echo "$as_me:15747: result: $with_no_padding" >&5 ++echo "$as_me:16045: result: $with_no_padding" >&5 + echo "${ECHO_T}$with_no_padding" >&6 + test "x$with_no_padding" = xyes && + cat >>confdefs.h <<\EOF +@@ -15752,7 +16050,7 @@ + EOF + + ### use option --enable-sigwinch to turn on use of SIGWINCH logic +-echo "$as_me:15755: checking if you want SIGWINCH handler" >&5 ++echo "$as_me:16053: 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. +@@ -15762,7 +16060,7 @@ + else + with_sigwinch=$with_ext_funcs + fi; +-echo "$as_me:15765: result: $with_sigwinch" >&5 ++echo "$as_me:16063: result: $with_sigwinch" >&5 + echo "${ECHO_T}$with_sigwinch" >&6 + if test "x$with_sigwinch" = xyes + then +@@ -15777,7 +16075,7 @@ + fi + + ### use option --enable-tcap-names to allow user to define new capabilities +-echo "$as_me:15780: checking if you want user-definable terminal capabilities like termcap" >&5 ++echo "$as_me:16078: 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. +@@ -15787,7 +16085,7 @@ + else + with_tcap_names=$with_ext_funcs + fi; +-echo "$as_me:15790: result: $with_tcap_names" >&5 ++echo "$as_me:16088: result: $with_tcap_names" >&5 + echo "${ECHO_T}$with_tcap_names" >&6 + NCURSES_XNAMES=0 + if test "x$with_tcap_names" = xyes; then +@@ -15801,7 +16099,7 @@ + + ############################################################################## + +-echo "$as_me:15804: checking if you want to link with the pthread library" >&5 ++echo "$as_me:16102: 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. +@@ -15811,27 +16109,27 @@ + else + with_pthread=no + fi; +-echo "$as_me:15814: result: $with_pthread" >&5 ++echo "$as_me:16112: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 + + if test "$with_pthread" != no ; then +- echo "$as_me:15818: checking for pthread.h" >&5 ++ echo "$as_me:16116: 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 15824 "configure" ++#line 16122 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:15828: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:16126: \"$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:15834: \$? = $ac_status" >&5 ++ echo "$as_me:16132: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -15850,7 +16148,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:15853: result: $ac_cv_header_pthread_h" >&5 ++echo "$as_me:16151: 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 + +@@ -15860,7 +16158,7 @@ + + for cf_lib_pthread in pthread c_r + do +- echo "$as_me:15863: checking if we can link with the $cf_lib_pthread library" >&5 ++ echo "$as_me:16161: 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" + +@@ -15881,7 +16179,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15884 "configure" ++#line 16182 "configure" + #include "confdefs.h" + + #include +@@ -15898,16 +16196,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:15901: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16199: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15904: \$? = $ac_status" >&5 ++ echo "$as_me:16202: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:15907: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16205: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15910: \$? = $ac_status" >&5 ++ echo "$as_me:16208: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + with_pthread=yes + else +@@ -15917,7 +16215,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save_LIBS" +- echo "$as_me:15920: result: $with_pthread" >&5 ++ echo "$as_me:16218: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 + test "$with_pthread" = yes && break + done +@@ -15945,7 +16243,7 @@ + EOF + + else +- { { echo "$as_me:15948: error: Cannot link with pthread library" >&5 ++ { { echo "$as_me:16246: error: Cannot link with pthread library" >&5 + echo "$as_me: error: Cannot link with pthread library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -15955,13 +16253,13 @@ + fi + + if test "x$with_pthread" != xno; then +- echo "$as_me:15958: checking for pthread_kill" >&5 ++ echo "$as_me:16256: 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 15964 "configure" ++#line 16262 "configure" + #include "confdefs.h" + #define pthread_kill autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -15992,16 +16290,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:15995: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16293: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15998: \$? = $ac_status" >&5 ++ echo "$as_me:16296: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16001: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16299: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16004: \$? = $ac_status" >&5 ++ echo "$as_me:16302: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_pthread_kill=yes + else +@@ -16011,11 +16309,11 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:16014: result: $ac_cv_func_pthread_kill" >&5 ++echo "$as_me:16312: 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:16018: checking if you want to allow EINTR in wgetch with pthreads" >&5 ++ echo "$as_me:16316: 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. +@@ -16025,7 +16323,7 @@ + else + use_pthreads_eintr=no + fi; +- echo "$as_me:16028: result: $use_pthreads_eintr" >&5 ++ echo "$as_me:16326: result: $use_pthreads_eintr" >&5 + echo "${ECHO_T}$use_pthreads_eintr" >&6 + if test "x$use_pthreads_eintr" = xyes ; then + +@@ -16036,7 +16334,7 @@ + fi + fi + +- echo "$as_me:16039: checking if you want to use weak-symbols for pthreads" >&5 ++ echo "$as_me:16337: 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. +@@ -16046,18 +16344,18 @@ + else + use_weak_symbols=no + fi; +- echo "$as_me:16049: result: $use_weak_symbols" >&5 ++ echo "$as_me:16347: result: $use_weak_symbols" >&5 + echo "${ECHO_T}$use_weak_symbols" >&6 + if test "x$use_weak_symbols" = xyes ; then + +-echo "$as_me:16053: checking if $CC supports weak symbols" >&5 ++echo "$as_me:16351: 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 16060 "configure" ++#line 16358 "configure" + #include "confdefs.h" + + #include +@@ -16083,16 +16381,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16086: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16384: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16089: \$? = $ac_status" >&5 ++ echo "$as_me:16387: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16092: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16390: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16095: \$? = $ac_status" >&5 ++ echo "$as_me:16393: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_weak_symbols=yes + else +@@ -16103,7 +16401,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:16106: result: $cf_cv_weak_symbols" >&5 ++echo "$as_me:16404: result: $cf_cv_weak_symbols" >&5 + echo "${ECHO_T}$cf_cv_weak_symbols" >&6 + + else +@@ -16153,7 +16451,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:16156: checking if you want reentrant code" >&5 ++echo "$as_me:16454: 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. +@@ -16163,7 +16461,7 @@ + else + with_reentrant=no + fi; +-echo "$as_me:16166: result: $with_reentrant" >&5 ++echo "$as_me:16464: result: $with_reentrant" >&5 + echo "${ECHO_T}$with_reentrant" >&6 + if test "x$with_reentrant" = xyes ; then + cf_cv_enable_reentrant=1 +@@ -16252,7 +16550,7 @@ + cf_cv_rel_version=6.0 + cf_cv_abi_version=6 + cf_cv_abi_default=6 +- { echo "$as_me:16255: WARNING: overriding ABI version to $cf_cv_abi_default" >&5 ++ { echo "$as_me:16553: WARNING: overriding ABI version to $cf_cv_abi_default" >&5 + echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;} + ;; + esac +@@ -16264,7 +16562,7 @@ + NCURSES_SIZE_T=$cf_dft_ordinate_type + fi + +-echo "$as_me:16267: checking whether curses library structures should be opaque" >&5 ++echo "$as_me:16565: checking whether curses library structures should be opaque" >&5 + echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6 + + # Check whether --enable-opaque-curses or --disable-opaque-curses was given. +@@ -16286,16 +16584,16 @@ + test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses + + fi; +-echo "$as_me:16289: result: $enable_opaque_curses" >&5 ++echo "$as_me:16587: 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:16294: error: reentrant configuration requires opaque library" >&5 ++{ { echo "$as_me:16592: error: reentrant configuration requires opaque library" >&5 + echo "$as_me: error: reentrant configuration requires opaque library" >&2;} + { (exit 1); exit 1; }; } + +-echo "$as_me:16298: checking whether form library structures should be opaque" >&5 ++echo "$as_me:16596: checking whether form library structures should be opaque" >&5 + echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6 + + # Check whether --enable-opaque-form or --disable-opaque-form was given. +@@ -16312,10 +16610,10 @@ + enable_opaque_form=$cf_dft_opaque_curses + + fi; +-echo "$as_me:16315: result: $enable_opaque_form" >&5 ++echo "$as_me:16613: result: $enable_opaque_form" >&5 + echo "${ECHO_T}$enable_opaque_form" >&6 + +-echo "$as_me:16318: checking whether menu library structures should be opaque" >&5 ++echo "$as_me:16616: checking whether menu library structures should be opaque" >&5 + echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6 + + # Check whether --enable-opaque-menu or --disable-opaque-menu was given. +@@ -16332,10 +16630,10 @@ + enable_opaque_menu=$cf_dft_opaque_curses + + fi; +-echo "$as_me:16335: result: $enable_opaque_menu" >&5 ++echo "$as_me:16633: result: $enable_opaque_menu" >&5 + echo "${ECHO_T}$enable_opaque_menu" >&6 + +-echo "$as_me:16338: checking whether panel library structures should be opaque" >&5 ++echo "$as_me:16636: checking whether panel library structures should be opaque" >&5 + echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6 + + # Check whether --enable-opaque-panel or --disable-opaque-panel was given. +@@ -16352,7 +16650,7 @@ + enable_opaque_panel=$cf_dft_opaque_curses + + fi; +-echo "$as_me:16355: result: $enable_opaque_panel" >&5 ++echo "$as_me:16653: result: $enable_opaque_panel" >&5 + echo "${ECHO_T}$enable_opaque_panel" >&6 + + NCURSES_OPAQUE=0; test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1 +@@ -16362,7 +16660,7 @@ + + ### Allow using a different wrap-prefix + if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then +- echo "$as_me:16365: checking for prefix used to wrap public variables" >&5 ++ echo "$as_me:16663: 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. +@@ -16372,7 +16670,7 @@ + else + NCURSES_WRAP_PREFIX=_nc_ + fi; +- echo "$as_me:16375: result: $NCURSES_WRAP_PREFIX" >&5 ++ echo "$as_me:16673: result: $NCURSES_WRAP_PREFIX" >&5 + echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 + else + NCURSES_WRAP_PREFIX=_nc_ +@@ -16385,7 +16683,7 @@ + ############################################################################### + # These options are relatively safe to experiment with. + +-echo "$as_me:16388: checking if you want all development code" >&5 ++echo "$as_me:16686: 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. +@@ -16395,11 +16693,11 @@ + else + with_develop=no + fi; +-echo "$as_me:16398: result: $with_develop" >&5 ++echo "$as_me:16696: result: $with_develop" >&5 + echo "${ECHO_T}$with_develop" >&6 + + ### use option --enable-check-size to detect screensize with CPR +-echo "$as_me:16402: checking if you want to check screensize of serial terminals" >&5 ++echo "$as_me:16700: checking if you want to check screensize of serial terminals" >&5 + echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6 + + # Check whether --enable-check-size or --disable-check-size was given. +@@ -16409,7 +16707,7 @@ + else + enable_check_size=$with_develop + fi; +-echo "$as_me:16412: result: $enable_check_size" >&5 ++echo "$as_me:16710: result: $enable_check_size" >&5 + echo "${ECHO_T}$enable_check_size" >&6 + test "x$enable_check_size" = xyes && + cat >>confdefs.h <<\EOF +@@ -16417,7 +16715,7 @@ + EOF + + ### use option --enable-hard-tabs to turn on use of hard-tabs optimize +-echo "$as_me:16420: checking if you want hard-tabs code" >&5 ++echo "$as_me:16718: 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. +@@ -16427,7 +16725,7 @@ + else + enable_hard_tabs=$with_develop + fi; +-echo "$as_me:16430: result: $enable_hard_tabs" >&5 ++echo "$as_me:16728: result: $enable_hard_tabs" >&5 + echo "${ECHO_T}$enable_hard_tabs" >&6 + test "x$enable_hard_tabs" = xyes && + cat >>confdefs.h <<\EOF +@@ -16435,7 +16733,7 @@ + EOF + + ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize +-echo "$as_me:16438: checking if you want limited support for xmc" >&5 ++echo "$as_me:16736: 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. +@@ -16445,7 +16743,7 @@ + else + enable_xmc_glitch=$with_develop + fi; +-echo "$as_me:16448: result: $enable_xmc_glitch" >&5 ++echo "$as_me:16746: result: $enable_xmc_glitch" >&5 + echo "${ECHO_T}$enable_xmc_glitch" >&6 + test "x$enable_xmc_glitch" = xyes && + cat >>confdefs.h <<\EOF +@@ -16455,7 +16753,7 @@ + ############################################################################### + # These are just experimental, probably should not be in a package: + +-echo "$as_me:16458: checking if you do not want to assume colors are white-on-black" >&5 ++echo "$as_me:16756: 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. +@@ -16465,7 +16763,7 @@ + else + with_assumed_color=yes + fi; +-echo "$as_me:16468: result: $with_assumed_color" >&5 ++echo "$as_me:16766: result: $with_assumed_color" >&5 + echo "${ECHO_T}$with_assumed_color" >&6 + test "x$with_assumed_color" = xyes && + cat >>confdefs.h <<\EOF +@@ -16473,7 +16771,7 @@ + EOF + + ### use option --enable-hashmap to turn on use of hashmap scrolling logic +-echo "$as_me:16476: checking if you want hashmap scrolling-optimization code" >&5 ++echo "$as_me:16774: 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. +@@ -16483,7 +16781,7 @@ + else + with_hashmap=yes + fi; +-echo "$as_me:16486: result: $with_hashmap" >&5 ++echo "$as_me:16784: result: $with_hashmap" >&5 + echo "${ECHO_T}$with_hashmap" >&6 + test "x$with_hashmap" = xyes && + cat >>confdefs.h <<\EOF +@@ -16491,7 +16789,7 @@ + EOF + + ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment +-echo "$as_me:16494: checking if you want colorfgbg code" >&5 ++echo "$as_me:16792: 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. +@@ -16501,7 +16799,7 @@ + else + with_colorfgbg=no + fi; +-echo "$as_me:16504: result: $with_colorfgbg" >&5 ++echo "$as_me:16802: result: $with_colorfgbg" >&5 + echo "${ECHO_T}$with_colorfgbg" >&6 + test "x$with_colorfgbg" = xyes && + cat >>confdefs.h <<\EOF +@@ -16509,7 +16807,7 @@ + EOF + + ### use option --enable-fvisibility to turn on use of gcc-specific feature +-echo "$as_me:16512: checking if you want to use gcc -fvisibility option" >&5 ++echo "$as_me:16810: 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. +@@ -16519,14 +16817,14 @@ + else + cf_with_fvisibility=no + fi; +-echo "$as_me:16522: result: $cf_with_fvisibility" >&5 ++echo "$as_me:16820: 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:16529: checking if $CC -fvisibility=hidden option works" >&5 ++echo "$as_me:16827: 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 +@@ -16535,7 +16833,7 @@ + cf_save_cflags="$CFLAGS" + CFLAGS="$CFLAGS -fvisibility=hidden" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16538 "configure" ++#line 16836 "configure" + #include "confdefs.h" + + __attribute__ ((visibility("default"))) int somefunc() {return 42;} +@@ -16551,16 +16849,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16554: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16852: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16557: \$? = $ac_status" >&5 ++ echo "$as_me:16855: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16560: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16858: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16563: \$? = $ac_status" >&5 ++ echo "$as_me:16861: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_fvisibility_hidden=yes + else +@@ -16572,7 +16870,7 @@ + CFLAGS=$cf_save_cflags + + fi +-echo "$as_me:16575: result: $cf_cv_fvisibility_hidden" >&5 ++echo "$as_me:16873: result: $cf_cv_fvisibility_hidden" >&5 + echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6 + + if test "x$cf_cv_fvisibility_hidden" = xyes +@@ -16687,7 +16985,7 @@ + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + ac_main_return="return" + +-echo "$as_me:16690: checking if $CXX -fvisibility=hidden option works" >&5 ++echo "$as_me:16988: 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 +@@ -16696,7 +16994,7 @@ + cf_save_cflags="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -fvisibility=hidden" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16699 "configure" ++#line 16997 "configure" + #include "confdefs.h" + + __attribute__ ((visibility("default"))) int somefunc() {return 42;} +@@ -16712,16 +17010,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16715: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17013: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16718: \$? = $ac_status" >&5 ++ echo "$as_me:17016: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16721: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17019: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16724: \$? = $ac_status" >&5 ++ echo "$as_me:17022: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_fvisibility_hidden2=yes + else +@@ -16733,7 +17031,7 @@ + CXXFLAGS=$cf_save_cflags + + fi +-echo "$as_me:16736: result: $cf_cv_fvisibility_hidden2" >&5 ++echo "$as_me:17034: result: $cf_cv_fvisibility_hidden2" >&5 + echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6 + + if test "x$cf_cv_fvisibility_hidden2" = xyes +@@ -16856,7 +17154,7 @@ + fi + + ### use option --enable-interop to turn on use of bindings used for interop +-echo "$as_me:16859: checking if you want interop bindings" >&5 ++echo "$as_me:17157: 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. +@@ -16866,13 +17164,13 @@ + else + with_exp_interop=$cf_dft_interop + fi; +-echo "$as_me:16869: result: $with_exp_interop" >&5 ++echo "$as_me:17167: 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:16875: checking if you want experimental safe-sprintf code" >&5 ++echo "$as_me:17173: 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. +@@ -16882,13 +17180,13 @@ + else + with_safe_sprintf=no + fi; +-echo "$as_me:16885: result: $with_safe_sprintf" >&5 ++echo "$as_me:17183: 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:16891: checking if you want to experiment without scrolling-hints code" >&5 ++echo "$as_me:17189: 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. +@@ -16898,7 +17196,7 @@ + else + with_scroll_hints=yes + fi; +-echo "$as_me:16901: result: $with_scroll_hints" >&5 ++echo "$as_me:17199: result: $with_scroll_hints" >&5 + echo "${ECHO_T}$with_scroll_hints" >&6 + test "x$with_scroll_hints" = xyes && + cat >>confdefs.h <<\EOF +@@ -16907,7 +17205,7 @@ + + fi + +-echo "$as_me:16910: checking if you want wgetch-events code" >&5 ++echo "$as_me:17208: 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. +@@ -16917,7 +17215,7 @@ + else + with_wgetch_events=no + fi; +-echo "$as_me:16920: result: $with_wgetch_events" >&5 ++echo "$as_me:17218: result: $with_wgetch_events" >&5 + echo "${ECHO_T}$with_wgetch_events" >&6 + if test "x$with_wgetch_events" = xyes ; then + +@@ -16932,7 +17230,7 @@ + + case "$cf_cv_system_name" in + (*mingw32*|*mingw64*|*-msvc*) +- echo "$as_me:16935: checking if you want experimental-Windows driver" >&5 ++ echo "$as_me:17233: 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. +@@ -16942,7 +17240,7 @@ + else + with_exp_win32=no + fi; +- echo "$as_me:16945: result: $with_exp_win32" >&5 ++ echo "$as_me:17243: result: $with_exp_win32" >&5 + echo "${ECHO_T}$with_exp_win32" >&6 + if test "x$with_exp_win32" = xyes + then +@@ -16968,7 +17266,7 @@ + + ### use option --disable-echo to suppress full display compiling commands + +-echo "$as_me:16971: checking if you want to see long compiling messages" >&5 ++echo "$as_me:17269: 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. +@@ -17002,7 +17300,7 @@ + ECHO_CC='' + + fi; +-echo "$as_me:17005: result: $enableval" >&5 ++echo "$as_me:17303: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + + if test "x$enable_echo" = xyes; then +@@ -17015,7 +17313,7 @@ + + # --disable-stripping is used for debugging + +-echo "$as_me:17018: checking if you want to install stripped executables" >&5 ++echo "$as_me:17316: 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. +@@ -17032,7 +17330,7 @@ + enable_stripping=yes + + fi; +-echo "$as_me:17035: result: $enable_stripping" >&5 ++echo "$as_me:17333: result: $enable_stripping" >&5 + echo "${ECHO_T}$enable_stripping" >&6 + + if test "$enable_stripping" = yes +@@ -17043,7 +17341,7 @@ + fi + + : "${INSTALL:=install}" +-echo "$as_me:17046: checking if install accepts -p option" >&5 ++echo "$as_me:17344: 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 +@@ -17074,10 +17372,10 @@ + rm -rf ./conftest* + + fi +-echo "$as_me:17077: result: $cf_cv_install_p" >&5 ++echo "$as_me:17375: result: $cf_cv_install_p" >&5 + echo "${ECHO_T}$cf_cv_install_p" >&6 + +-echo "$as_me:17080: checking if install needs to be told about ownership" >&5 ++echo "$as_me:17378: 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) +@@ -17088,7 +17386,7 @@ + ;; + esac + +-echo "$as_me:17091: result: $with_install_o" >&5 ++echo "$as_me:17389: result: $with_install_o" >&5 + echo "${ECHO_T}$with_install_o" >&6 + if test "x$with_install_o" = xyes + then +@@ -17099,7 +17397,7 @@ + + if test -n "$INSTALL_OPT_S" + then +- echo "$as_me:17102: checking if you want to specify strip-program" >&5 ++ echo "$as_me:17400: checking if you want to specify strip-program" >&5 + echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6 + + # Check whether --with-strip-program or --without-strip-program was given. +@@ -17109,11 +17407,11 @@ + else + with_strip_program=no + fi; +- echo "$as_me:17112: result: $with_strip_program" >&5 ++ echo "$as_me:17410: result: $with_strip_program" >&5 + echo "${ECHO_T}$with_strip_program" >&6 + if test "$with_strip_program" != no + then +- echo "$as_me:17116: checking if strip-program is supported with this installer" >&5 ++ echo "$as_me:17414: checking if strip-program is supported with this installer" >&5 + echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6 + cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'` + check_install_strip=no +@@ -17134,11 +17432,11 @@ + done + fi + fi +- echo "$as_me:17137: result: $check_install_strip" >&5 ++ echo "$as_me:17435: result: $check_install_strip" >&5 + echo "${ECHO_T}$check_install_strip" >&6 + case "$check_install_strip" in + (no) +- { echo "$as_me:17141: WARNING: $cf_install_program does not support strip program option" >&5 ++ { echo "$as_me:17439: WARNING: $cf_install_program does not support strip program option" >&5 + echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;} + with_strip_program=no + ;; +@@ -17153,7 +17451,7 @@ + chmod +x "$INSTALL" + test -n "$verbose" && echo " created $INSTALL" 1>&6 + +-echo "${as_me:-configure}:17156: testing created $INSTALL ..." 1>&5 ++echo "${as_me:-configure}:17454: testing created $INSTALL ..." 1>&5 + + ;; + (option) +@@ -17179,7 +17477,7 @@ + + ### use option --enable-warnings to turn on all gcc warnings + +-echo "$as_me:17182: checking if you want to use C11 _Noreturn feature" >&5 ++echo "$as_me:17480: 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. +@@ -17196,17 +17494,17 @@ + enable_stdnoreturn=no + + fi; +-echo "$as_me:17199: result: $enable_stdnoreturn" >&5 ++echo "$as_me:17497: result: $enable_stdnoreturn" >&5 + echo "${ECHO_T}$enable_stdnoreturn" >&6 + + if test $enable_stdnoreturn = yes; then +-echo "$as_me:17203: checking for C11 _Noreturn feature" >&5 ++echo "$as_me:17501: 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 17209 "configure" ++#line 17507 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -17222,16 +17520,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:17225: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17523: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17228: \$? = $ac_status" >&5 ++ echo "$as_me:17526: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:17231: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17529: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17234: \$? = $ac_status" >&5 ++ echo "$as_me:17532: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_c11_noreturn=yes + else +@@ -17242,7 +17540,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:17245: result: $cf_cv_c11_noreturn" >&5 ++echo "$as_me:17543: result: $cf_cv_c11_noreturn" >&5 + echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 + else + cf_cv_c11_noreturn=no, +@@ -17298,16 +17596,16 @@ + then + test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 + +-echo "${as_me:-configure}:17301: testing repairing CFLAGS: $CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:17599: testing repairing CFLAGS: $CFLAGS ..." 1>&5 + + CFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 + +-echo "${as_me:-configure}:17306: testing ... fixed $CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:17604: testing ... fixed $CFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:17310: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:17608: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi + ;; +@@ -17346,16 +17644,16 @@ + then + test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:17349: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:17647: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 + + CPPFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:17354: testing ... fixed $CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:17652: testing ... fixed $CPPFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:17358: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:17656: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi + ;; +@@ -17394,23 +17692,23 @@ + then + test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:17397: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:17695: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 + + LDFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:17402: testing ... fixed $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:17700: testing ... fixed $LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:17406: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:17704: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi + ;; + esac + fi + +-echo "$as_me:17413: checking if you want to turn on gcc warnings" >&5 ++echo "$as_me:17711: 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. +@@ -17427,7 +17725,7 @@ + enable_warnings=no + + fi; +-echo "$as_me:17430: result: $enable_warnings" >&5 ++echo "$as_me:17728: result: $enable_warnings" >&5 + echo "${ECHO_T}$enable_warnings" >&6 + if test "$enable_warnings" = "yes" + then +@@ -17451,7 +17749,7 @@ + done + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17454 "configure" ++#line 17752 "configure" + #include "confdefs.h" + + #include +@@ -17466,26 +17764,26 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:17469: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17767: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17472: \$? = $ac_status" >&5 ++ echo "$as_me:17770: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:17475: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17773: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17478: \$? = $ac_status" >&5 ++ echo "$as_me:17776: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + +-echo "$as_me:17481: checking for X11/Xt const-feature" >&5 ++echo "$as_me:17779: 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 17488 "configure" ++#line 17786 "configure" + #include "confdefs.h" + + #undef _CONST_X_STRING +@@ -17503,16 +17801,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:17506: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17804: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17509: \$? = $ac_status" >&5 ++ echo "$as_me:17807: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:17512: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17810: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17515: \$? = $ac_status" >&5 ++ echo "$as_me:17813: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_const_x_string=no +@@ -17527,7 +17825,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:17530: result: $cf_cv_const_x_string" >&5 ++echo "$as_me:17828: result: $cf_cv_const_x_string" >&5 + echo "${ECHO_T}$cf_cv_const_x_string" >&6 + + LIBS="$cf_save_LIBS_CF_CONST_X_STRING" +@@ -17556,7 +17854,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + cat > "conftest.$ac_ext" <&5 ++ { echo "$as_me:17873: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" +@@ -17588,12 +17886,12 @@ + wd981 + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:17591: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:17889: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17594: \$? = $ac_status" >&5 ++ echo "$as_me:17892: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:17596: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:17894: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" + fi +@@ -17601,7 +17899,7 @@ + CFLAGS="$cf_save_CFLAGS" + elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" + then +- { echo "$as_me:17604: checking for $CC warning options..." >&5 ++ { echo "$as_me:17902: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + cf_warn_CONST="" +@@ -17624,12 +17922,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:17627: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:17925: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17630: \$? = $ac_status" >&5 ++ echo "$as_me:17928: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:17632: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:17930: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + case "$cf_opt" in + (Winline) +@@ -17637,7 +17935,7 @@ + ([34].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:17640: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:17938: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -17647,7 +17945,7 @@ + ([12].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:17650: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:17948: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -17680,10 +17978,10 @@ + EOF + if test "$GCC" = yes + then +- { echo "$as_me:17683: checking for $CC __attribute__ directives..." >&5 ++ { echo "$as_me:17981: checking for $CC __attribute__ directives..." >&5 + echo "$as_me: checking for $CC __attribute__ directives..." >&6;} + cat > "conftest.$ac_ext" < + #include "confdefs.h" + #include "conftest.h" +@@ -17733,12 +18031,12 @@ + ;; + esac + +- if { (eval echo "$as_me:17736: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:18034: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17739: \$? = $ac_status" >&5 ++ echo "$as_me:18037: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:17741: result: ... $cf_attribute" >&5 ++ test -n "$verbose" && echo "$as_me:18039: result: ... $cf_attribute" >&5 + echo "${ECHO_T}... $cf_attribute" >&6 + cat conftest.h >>confdefs.h + case "$cf_attribute" in +@@ -17810,12 +18108,12 @@ + if test "$GCC" = yes ; then + case "$host_os" in + (linux*|gnu*) +- echo "$as_me:17813: checking if this is really Intel C++ compiler" >&5 ++ echo "$as_me:18111: 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 17818 "configure" ++#line 18116 "configure" + #include "confdefs.h" + + int +@@ -17832,16 +18130,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:17835: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18133: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17838: \$? = $ac_status" >&5 ++ echo "$as_me:18136: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:17841: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18139: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17844: \$? = $ac_status" >&5 ++ echo "$as_me:18142: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + INTEL_CPLUSPLUS=yes + cf_save_CFLAGS="$cf_save_CFLAGS -we147" +@@ -17852,7 +18150,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CXXFLAGS="$cf_save_CFLAGS" +- echo "$as_me:17855: result: $INTEL_CPLUSPLUS" >&5 ++ echo "$as_me:18153: result: $INTEL_CPLUSPLUS" >&5 + echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 + ;; + esac +@@ -17861,11 +18159,11 @@ + CLANG_CPLUSPLUS=no + + if test "$GCC" = yes ; then +- echo "$as_me:17864: checking if this is really Clang C++ compiler" >&5 ++ echo "$as_me:18162: 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 17868 "configure" ++#line 18166 "configure" + #include "confdefs.h" + + int +@@ -17882,16 +18180,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:17885: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18183: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17888: \$? = $ac_status" >&5 ++ echo "$as_me:18186: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:17891: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18189: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17894: \$? = $ac_status" >&5 ++ echo "$as_me:18192: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + CLANG_CPLUSPLUS=yes + +@@ -17901,7 +18199,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CXXFLAGS="$cf_save_CFLAGS" +- echo "$as_me:17904: result: $CLANG_CPLUSPLUS" >&5 ++ echo "$as_me:18202: result: $CLANG_CPLUSPLUS" >&5 + echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6 + fi + +@@ -17910,30 +18208,30 @@ + if test "x$CLANG_CPLUSPLUS" = "xyes" ; then + case "$CC" in + (c[1-9][0-9]|*/c[1-9][0-9]) +- { echo "$as_me:17913: WARNING: replacing broken compiler alias $CC" >&5 ++ { echo "$as_me:18211: 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:17920: checking version of $CC" >&5 ++ echo "$as_me:18218: 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:17924: result: $CLANG_VERSION" >&5 ++ echo "$as_me:18222: 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:17931: checking if option $cf_clang_opt works" >&5 ++ echo "$as_me:18229: 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 17936 "configure" ++#line 18234 "configure" + #include "confdefs.h" + + #include +@@ -17947,16 +18245,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:17950: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18248: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17953: \$? = $ac_status" >&5 ++ echo "$as_me:18251: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:17956: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18254: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17959: \$? = $ac_status" >&5 ++ echo "$as_me:18257: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_clang_optok=yes +@@ -17967,13 +18265,13 @@ + cf_clang_optok=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:17970: result: $cf_clang_optok" >&5 ++ echo "$as_me:18268: 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}:17976: testing adding option $cf_clang_opt ..." 1>&5 ++echo "${as_me:-configure}:18274: testing adding option $cf_clang_opt ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_clang_opt" +@@ -17990,7 +18288,7 @@ + ac_main_return="return" + + cat > conftest.$ac_ext <&5 ++ { echo "$as_me:18309: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CXXFLAGS="$CXXFLAGS" + EXTRA_CXXFLAGS="-Wall" +@@ -18025,12 +18323,12 @@ + wd981 + do + CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt" +- if { (eval echo "$as_me:18028: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:18326: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18031: \$? = $ac_status" >&5 ++ echo "$as_me:18329: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:18033: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:18331: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" + fi +@@ -18039,7 +18337,7 @@ + + elif test "$GXX" = yes + then +- { echo "$as_me:18042: checking for $CXX warning options..." >&5 ++ { echo "$as_me:18340: checking for $CXX warning options..." >&5 + echo "$as_me: checking for $CXX warning options..." >&6;} + cf_save_CXXFLAGS="$CXXFLAGS" + EXTRA_CXXFLAGS="-W -Wall" +@@ -18069,16 +18367,16 @@ + Wundef $cf_gxx_extra_warnings Wno-unused + do + CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" +- if { (eval echo "$as_me:18072: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:18370: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18075: \$? = $ac_status" >&5 ++ echo "$as_me:18373: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:18077: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:18375: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" + else +- test -n "$verbose" && echo "$as_me:18081: result: ... no -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:18379: result: ... no -$cf_opt" >&5 + echo "${ECHO_T}... no -$cf_opt" >&6 + fi + done +@@ -18096,7 +18394,7 @@ + fi + fi + +-echo "$as_me:18099: checking if you want to work around bogus compiler/loader warnings" >&5 ++echo "$as_me:18397: 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. +@@ -18106,7 +18404,7 @@ + else + enable_string_hacks=no + fi; +-echo "$as_me:18109: result: $enable_string_hacks" >&5 ++echo "$as_me:18407: result: $enable_string_hacks" >&5 + echo "${ECHO_T}$enable_string_hacks" >&6 + + if test "x$enable_string_hacks" = "xyes"; then +@@ -18115,15 +18413,15 @@ + #define USE_STRING_HACKS 1 + EOF + +- { echo "$as_me:18118: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 ++ { echo "$as_me:18416: 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:18120: checking for strlcat" >&5 ++ echo "$as_me:18418: 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 18126 "configure" ++#line 18424 "configure" + #include "confdefs.h" + #define strlcat autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -18154,16 +18452,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:18157: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18455: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18160: \$? = $ac_status" >&5 ++ echo "$as_me:18458: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:18163: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18461: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18166: \$? = $ac_status" >&5 ++ echo "$as_me:18464: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_strlcat=yes + else +@@ -18173,7 +18471,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:18176: result: $ac_cv_func_strlcat" >&5 ++echo "$as_me:18474: result: $ac_cv_func_strlcat" >&5 + echo "${ECHO_T}$ac_cv_func_strlcat" >&6 + if test "$ac_cv_func_strlcat" = yes; then + +@@ -18183,7 +18481,7 @@ + + else + +- echo "$as_me:18186: checking for strlcat in -lbsd" >&5 ++ echo "$as_me:18484: 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 +@@ -18191,7 +18489,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18194 "configure" ++#line 18492 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -18210,16 +18508,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:18213: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18511: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18216: \$? = $ac_status" >&5 ++ echo "$as_me:18514: \$? = $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:18517: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18222: \$? = $ac_status" >&5 ++ echo "$as_me:18520: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_bsd_strlcat=yes + else +@@ -18230,7 +18528,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_bsd_strlcat" >&5 ++echo "$as_me:18531: 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 + +@@ -18253,23 +18551,23 @@ + for ac_header in bsd/string.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:18256: checking for $ac_header" >&5 ++echo "$as_me:18554: 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 18262 "configure" ++#line 18560 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:18266: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:18564: \"$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:18272: \$? = $ac_status" >&5 ++ echo "$as_me:18570: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -18288,7 +18586,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:18291: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:18589: 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:18610: 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 18318 "configure" ++#line 18616 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -18346,16 +18644,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:18349: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18647: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18352: \$? = $ac_status" >&5 ++ echo "$as_me:18650: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:18355: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18653: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18358: \$? = $ac_status" >&5 ++ echo "$as_me:18656: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -18365,7 +18663,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:18368: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:18666: 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:18679: 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. +@@ -18388,7 +18686,7 @@ + else + with_assertions=no + fi; +-echo "$as_me:18391: result: $with_assertions" >&5 ++echo "$as_me:18689: result: $with_assertions" >&5 + echo "${ECHO_T}$with_assertions" >&6 + if test -n "$GCC" + then +@@ -18404,7 +18702,7 @@ + + ### use option --disable-leaks to suppress "permanent" leaks, for testing + +-echo "$as_me:18407: checking if you want to use dmalloc for testing" >&5 ++echo "$as_me:18705: 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. +@@ -18426,7 +18724,7 @@ + else + with_dmalloc= + fi; +-echo "$as_me:18429: result: ${with_dmalloc:-no}" >&5 ++echo "$as_me:18727: result: ${with_dmalloc:-no}" >&5 + echo "${ECHO_T}${with_dmalloc:-no}" >&6 + + case ".$with_cflags" in +@@ -18540,23 +18838,23 @@ + esac + + if test "$with_dmalloc" = yes ; then +- echo "$as_me:18543: checking for dmalloc.h" >&5 ++ echo "$as_me:18841: 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 18549 "configure" ++#line 18847 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:18553: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:18851: \"$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:18559: \$? = $ac_status" >&5 ++ echo "$as_me:18857: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -18575,11 +18873,11 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:18578: result: $ac_cv_header_dmalloc_h" >&5 ++echo "$as_me:18876: 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:18582: checking for dmalloc_debug in -ldmalloc" >&5 ++echo "$as_me:18880: 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 +@@ -18587,7 +18885,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldmalloc $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18590 "configure" ++#line 18888 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -18606,16 +18904,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:18609: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18907: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18612: \$? = $ac_status" >&5 ++ echo "$as_me:18910: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:18615: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18913: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18618: \$? = $ac_status" >&5 ++ echo "$as_me:18916: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dmalloc_dmalloc_debug=yes + else +@@ -18626,7 +18924,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:18629: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 ++echo "$as_me:18927: 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:18942: 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. +@@ -18663,7 +18961,7 @@ + else + with_dbmalloc= + fi; +-echo "$as_me:18666: result: ${with_dbmalloc:-no}" >&5 ++echo "$as_me:18964: result: ${with_dbmalloc:-no}" >&5 + echo "${ECHO_T}${with_dbmalloc:-no}" >&6 + + case ".$with_cflags" in +@@ -18777,23 +19075,23 @@ + esac + + if test "$with_dbmalloc" = yes ; then +- echo "$as_me:18780: checking for dbmalloc.h" >&5 ++ echo "$as_me:19078: 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 18786 "configure" ++#line 19084 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:18790: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:19088: \"$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:18796: \$? = $ac_status" >&5 ++ echo "$as_me:19094: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -18812,11 +19110,11 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:18815: result: $ac_cv_header_dbmalloc_h" >&5 ++echo "$as_me:19113: 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:18819: checking for debug_malloc in -ldbmalloc" >&5 ++echo "$as_me:19117: 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 +@@ -18824,7 +19122,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldbmalloc $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18827 "configure" ++#line 19125 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -18843,16 +19141,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:18846: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19144: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18849: \$? = $ac_status" >&5 ++ echo "$as_me:19147: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:18852: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19150: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18855: \$? = $ac_status" >&5 ++ echo "$as_me:19153: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dbmalloc_debug_malloc=yes + else +@@ -18863,7 +19161,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:18866: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 ++echo "$as_me:19164: 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:19179: 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. +@@ -18900,7 +19198,7 @@ + else + with_valgrind= + fi; +-echo "$as_me:18903: result: ${with_valgrind:-no}" >&5 ++echo "$as_me:19201: result: ${with_valgrind:-no}" >&5 + echo "${ECHO_T}${with_valgrind:-no}" >&6 + + case ".$with_cflags" in +@@ -19013,7 +19311,7 @@ + ;; + esac + +-echo "$as_me:19016: checking if you want to perform memory-leak testing" >&5 ++echo "$as_me:19314: 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. +@@ -19024,7 +19322,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:19027: result: $with_no_leaks" >&5 ++echo "$as_me:19325: result: $with_no_leaks" >&5 + echo "${ECHO_T}$with_no_leaks" >&6 + + if test "$enable_leaks" = no ; then +@@ -19076,7 +19374,7 @@ + ;; + esac + +-echo "$as_me:19079: checking whether to add trace feature to all models" >&5 ++echo "$as_me:19377: 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. +@@ -19086,110 +19384,16 @@ + else + cf_with_trace=$cf_all_traces + fi; +-echo "$as_me:19089: result: $cf_with_trace" >&5 ++echo "$as_me:19387: result: $cf_with_trace" >&5 + echo "${ECHO_T}$cf_with_trace" >&6 + + if test "x$cf_with_trace" = xyes ; then + LIB_TRACING=all + ADA_TRACE=TRUE + +-cf_fix_cppflags=no +-cf_new_cflags= +-cf_new_cppflags= +-cf_new_extra_cppflags= +- +-for cf_add_cflags in -DTRACE +-do +-case "$cf_fix_cppflags" in +-(no) +- case "$cf_add_cflags" in +- (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) +- case "$cf_add_cflags" in +- (-D*) +- cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` +- +- test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ +- && test -z "${cf_tst_cflags}" \ +- && cf_fix_cppflags=yes +- +- if test "$cf_fix_cppflags" = yes ; then +- +- test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " +- cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +- +- continue +- elif test "${cf_tst_cflags}" = "\"'" ; then +- +- test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " +- cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +- +- continue +- fi +- ;; +- esac +- case "$CPPFLAGS" in +- (*$cf_add_cflags) +- ;; +- (*) +- case "$cf_add_cflags" in +- (-D*) +- cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` +- +-CPPFLAGS=`echo "$CPPFLAGS" | \ +- sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ +- -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` +- +- ;; +- esac +- +- test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " +- cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" +- +- ;; +- esac +- ;; +- (*) +- +- test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " +- cf_new_cflags="${cf_new_cflags}$cf_add_cflags" +- +- ;; +- esac +- ;; +-(yes) +- +- test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " +- cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +- +- cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` +- +- test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ +- && test -z "${cf_tst_cflags}" \ +- && cf_fix_cppflags=no +- ;; +-esac +-done +- +-if test -n "$cf_new_cflags" ; then +- +- test -n "$CFLAGS" && CFLAGS="$CFLAGS " +- CFLAGS="${CFLAGS}$cf_new_cflags" +- +-fi +- +-if test -n "$cf_new_cppflags" ; then +- +- test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " +- CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +- +-fi +- +-if test -n "$cf_new_extra_cppflags" ; then +- +- test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " +- EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" +- +-fi ++cat >>confdefs.h <<\EOF ++#define TRACE 1 ++EOF + + cat >>confdefs.h <<\EOF + #define HAVE__TRACEF 1 +@@ -19200,7 +19404,7 @@ + ADA_TRACE=FALSE + fi + +-echo "$as_me:19203: checking if we want to use GNAT projects" >&5 ++echo "$as_me:19407: 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. +@@ -19217,7 +19421,7 @@ + enable_gnat_projects=yes + + fi; +-echo "$as_me:19220: result: $enable_gnat_projects" >&5 ++echo "$as_me:19424: result: $enable_gnat_projects" >&5 + echo "${ECHO_T}$enable_gnat_projects" >&6 + + ### Checks for libraries. +@@ -19230,14 +19434,14 @@ + CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN" + fi + +-echo "$as_me:19233: checking if ssp library is needed" >&5 ++echo "$as_me:19437: 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 19240 "configure" ++#line 19444 "configure" + #include "confdefs.h" + + #include +@@ -19254,16 +19458,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19257: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19461: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19260: \$? = $ac_status" >&5 ++ echo "$as_me:19464: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19263: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19467: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19266: \$? = $ac_status" >&5 ++ echo "$as_me:19470: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_need_libssp=no + else +@@ -19273,7 +19477,7 @@ + cf_save_LIBS="$LIBS" + LIBS="$LIBS -lssp" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19276 "configure" ++#line 19480 "configure" + #include "confdefs.h" + + #include +@@ -19290,16 +19494,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19293: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19497: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19296: \$? = $ac_status" >&5 ++ echo "$as_me:19500: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19299: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19503: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19302: \$? = $ac_status" >&5 ++ echo "$as_me:19506: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_need_libssp=yes + else +@@ -19313,7 +19517,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:19316: result: $cf_cv_need_libssp" >&5 ++echo "$as_me:19520: result: $cf_cv_need_libssp" >&5 + echo "${ECHO_T}$cf_cv_need_libssp" >&6 + + if test "x$cf_cv_need_libssp" = xyes +@@ -19342,14 +19546,14 @@ + ;; + esac + +-echo "$as_me:19345: checking if -lm needed for math functions" >&5 ++echo "$as_me:19549: 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 19352 "configure" ++#line 19556 "configure" + #include "confdefs.h" + + #include +@@ -19365,16 +19569,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19368: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19572: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19371: \$? = $ac_status" >&5 ++ echo "$as_me:19575: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19374: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19578: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19377: \$? = $ac_status" >&5 ++ echo "$as_me:19581: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_need_libm=no + else +@@ -19384,7 +19588,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:19387: result: $cf_cv_need_libm" >&5 ++echo "$as_me:19591: result: $cf_cv_need_libm" >&5 + echo "${ECHO_T}$cf_cv_need_libm" >&6 + + if test "$cf_cv_need_libm" = yes +@@ -19392,14 +19596,14 @@ + + cf_save_LIBS="$LIBS" + LIBS="$LIBS -lm" +- echo "$as_me:19395: checking if -lm is available for math functions" >&5 ++ echo "$as_me:19599: checking if -lm is available for math functions" >&5 + echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6 + if test "${cf_cv_have_libm+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19402 "configure" ++#line 19606 "configure" + #include "confdefs.h" + + #include +@@ -19415,16 +19619,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19418: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19622: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19421: \$? = $ac_status" >&5 ++ echo "$as_me:19625: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19424: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19628: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19427: \$? = $ac_status" >&5 ++ echo "$as_me:19631: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_libm=yes + else +@@ -19434,7 +19638,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:19437: result: $cf_cv_have_libm" >&5 ++echo "$as_me:19641: result: $cf_cv_have_libm" >&5 + echo "${ECHO_T}$cf_cv_have_libm" >&6 + LIBS="$cf_save_LIBS" + +@@ -19456,13 +19660,13 @@ + fi + + ### Checks for header files. +-echo "$as_me:19459: checking whether time.h and sys/time.h may both be included" >&5 ++echo "$as_me:19663: 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 19465 "configure" ++#line 19669 "configure" + #include "confdefs.h" + #include + #include +@@ -19478,16 +19682,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:19481: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19685: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19484: \$? = $ac_status" >&5 ++ echo "$as_me:19688: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:19487: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19691: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19490: \$? = $ac_status" >&5 ++ echo "$as_me:19694: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_header_time=yes + else +@@ -19497,7 +19701,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:19500: result: $ac_cv_header_time" >&5 ++echo "$as_me:19704: result: $ac_cv_header_time" >&5 + echo "${ECHO_T}$ac_cv_header_time" >&6 + if test $ac_cv_header_time = yes; then + +@@ -19512,7 +19716,7 @@ + case "$host_os" in + (mingw*) + # -lsystre -ltre -lintl -liconv +- echo "$as_me:19515: checking for regcomp in -lsystre" >&5 ++ echo "$as_me:19719: 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 +@@ -19520,7 +19724,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsystre $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19523 "configure" ++#line 19727 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19539,16 +19743,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19542: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19746: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19545: \$? = $ac_status" >&5 ++ echo "$as_me:19749: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19548: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19752: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19551: \$? = $ac_status" >&5 ++ echo "$as_me:19755: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_systre_regcomp=yes + else +@@ -19559,11 +19763,11 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19562: result: $ac_cv_lib_systre_regcomp" >&5 ++echo "$as_me:19766: 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:19566: checking for libiconv_open in -liconv" >&5 ++ echo "$as_me:19770: 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 +@@ -19571,7 +19775,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-liconv $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19574 "configure" ++#line 19778 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19590,16 +19794,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19593: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19797: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19596: \$? = $ac_status" >&5 ++ echo "$as_me:19800: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19599: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19803: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19602: \$? = $ac_status" >&5 ++ echo "$as_me:19806: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_iconv_libiconv_open=yes + else +@@ -19610,7 +19814,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19613: result: $ac_cv_lib_iconv_libiconv_open" >&5 ++echo "$as_me:19817: 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 + +@@ -19632,7 +19836,7 @@ + + fi + +- echo "$as_me:19635: checking for libintl_gettext in -lintl" >&5 ++ echo "$as_me:19839: 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 +@@ -19640,7 +19844,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19643 "configure" ++#line 19847 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19659,16 +19863,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19662: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19866: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19665: \$? = $ac_status" >&5 ++ echo "$as_me:19869: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19668: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19872: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19671: \$? = $ac_status" >&5 ++ echo "$as_me:19875: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_intl_libintl_gettext=yes + else +@@ -19679,7 +19883,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19682: result: $ac_cv_lib_intl_libintl_gettext" >&5 ++echo "$as_me:19886: 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 + +@@ -19701,7 +19905,7 @@ + + fi + +- echo "$as_me:19704: checking for tre_regcomp in -ltre" >&5 ++ echo "$as_me:19908: 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 +@@ -19709,7 +19913,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ltre $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19712 "configure" ++#line 19916 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19728,16 +19932,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19731: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19935: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19734: \$? = $ac_status" >&5 ++ echo "$as_me:19938: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19737: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19941: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19740: \$? = $ac_status" >&5 ++ echo "$as_me:19944: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_tre_tre_regcomp=yes + else +@@ -19748,7 +19952,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19751: result: $ac_cv_lib_tre_tre_regcomp" >&5 ++echo "$as_me:19955: 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 + +@@ -19790,7 +19994,7 @@ + + else + +- echo "$as_me:19793: checking for regcomp in -lgnurx" >&5 ++ echo "$as_me:19997: 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 +@@ -19798,7 +20002,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgnurx $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19801 "configure" ++#line 20005 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19817,16 +20021,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19820: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20024: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19823: \$? = $ac_status" >&5 ++ echo "$as_me:20027: \$? = $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:20030: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19829: \$? = $ac_status" >&5 ++ echo "$as_me:20033: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gnurx_regcomp=yes + else +@@ -19837,7 +20041,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19840: result: $ac_cv_lib_gnurx_regcomp" >&5 ++echo "$as_me:20044: 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 + +@@ -19865,13 +20069,13 @@ + ;; + (*) + cf_regex_libs="regex re" +- echo "$as_me:19868: checking for regcomp" >&5 ++ echo "$as_me:20072: 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 19874 "configure" ++#line 20078 "configure" + #include "confdefs.h" + #define regcomp autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -19902,16 +20106,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19905: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20109: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19908: \$? = $ac_status" >&5 ++ echo "$as_me:20112: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19911: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20115: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19914: \$? = $ac_status" >&5 ++ echo "$as_me:20118: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_regcomp=yes + else +@@ -19921,7 +20125,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:19924: result: $ac_cv_func_regcomp" >&5 ++echo "$as_me:20128: 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 +@@ -19930,7 +20134,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:19933: checking for regcomp in -l$cf_regex_lib" >&5 ++echo "$as_me:20137: 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 +@@ -19938,7 +20142,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$cf_regex_lib $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19941 "configure" ++#line 20145 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19957,16 +20161,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19960: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20164: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19963: \$? = $ac_status" >&5 ++ echo "$as_me:20167: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19966: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20170: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19969: \$? = $ac_status" >&5 ++ echo "$as_me:20173: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Lib=yes" + else +@@ -19977,7 +20181,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19980: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 ++echo "$as_me:20184: 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 + +@@ -20009,13 +20213,13 @@ + esac + + if test "$cf_regex_func" = no ; then +- echo "$as_me:20012: checking for compile" >&5 ++ echo "$as_me:20216: 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 20018 "configure" ++#line 20222 "configure" + #include "confdefs.h" + #define compile autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -20046,16 +20250,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:20049: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20253: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20052: \$? = $ac_status" >&5 ++ echo "$as_me:20256: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:20055: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20259: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20058: \$? = $ac_status" >&5 ++ echo "$as_me:20262: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_compile=yes + else +@@ -20065,13 +20269,13 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:20068: result: $ac_cv_func_compile" >&5 ++echo "$as_me:20272: 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:20074: checking for compile in -lgen" >&5 ++ echo "$as_me:20278: 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 +@@ -20079,7 +20283,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgen $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20082 "configure" ++#line 20286 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -20098,16 +20302,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:20101: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20305: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20104: \$? = $ac_status" >&5 ++ echo "$as_me:20308: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:20107: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20311: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20110: \$? = $ac_status" >&5 ++ echo "$as_me:20314: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gen_compile=yes + else +@@ -20118,7 +20322,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:20121: result: $ac_cv_lib_gen_compile" >&5 ++echo "$as_me:20325: 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 + +@@ -20146,11 +20350,11 @@ + fi + + if test "$cf_regex_func" = no ; then +- { echo "$as_me:20149: WARNING: cannot find regular expression library" >&5 ++ { echo "$as_me:20353: WARNING: cannot find regular expression library" >&5 + echo "$as_me: WARNING: cannot find regular expression library" >&2;} + fi + +-echo "$as_me:20153: checking for regular-expression headers" >&5 ++echo "$as_me:20357: 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 +@@ -20162,7 +20366,7 @@ + for cf_regex_hdr in regexp.h regexpr.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20165 "configure" ++#line 20369 "configure" + #include "confdefs.h" + #include <$cf_regex_hdr> + int +@@ -20179,16 +20383,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:20182: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20386: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20185: \$? = $ac_status" >&5 ++ echo "$as_me:20389: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:20188: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20392: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20191: \$? = $ac_status" >&5 ++ echo "$as_me:20395: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_regex_hdrs=$cf_regex_hdr +@@ -20205,7 +20409,7 @@ + for cf_regex_hdr in regex.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20208 "configure" ++#line 20412 "configure" + #include "confdefs.h" + #include + #include <$cf_regex_hdr> +@@ -20225,16 +20429,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:20228: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20432: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20231: \$? = $ac_status" >&5 ++ echo "$as_me:20435: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:20234: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20438: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20237: \$? = $ac_status" >&5 ++ echo "$as_me:20441: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_regex_hdrs=$cf_regex_hdr +@@ -20250,11 +20454,11 @@ + esac + + fi +-echo "$as_me:20253: result: $cf_cv_regex_hdrs" >&5 ++echo "$as_me:20457: result: $cf_cv_regex_hdrs" >&5 + echo "${ECHO_T}$cf_cv_regex_hdrs" >&6 + + case "$cf_cv_regex_hdrs" in +- (no) { echo "$as_me:20257: WARNING: no regular expression header found" >&5 ++ (no) { echo "$as_me:20461: WARNING: no regular expression header found" >&5 + echo "$as_me: WARNING: no regular expression header found" >&2;} ;; + (regex.h) + cat >>confdefs.h <<\EOF +@@ -20292,23 +20496,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:20295: checking for $ac_header" >&5 ++echo "$as_me:20499: 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 20301 "configure" ++#line 20505 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:20305: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:20509: \"$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:20311: \$? = $ac_status" >&5 ++ echo "$as_me:20515: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -20327,7 +20531,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:20330: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:20534: 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:20547: 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 20349 "configure" ++#line 20553 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:20353: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:20557: \"$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:20359: \$? = $ac_status" >&5 ++ echo "$as_me:20563: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -20375,7 +20579,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:20378: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:20582: 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:20592: 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 +@@ -20395,7 +20599,7 @@ + for cf_header in stdio.h stdlib.h unistd.h getopt.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20398 "configure" ++#line 20602 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -20408,16 +20612,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20411: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20615: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20414: \$? = $ac_status" >&5 ++ echo "$as_me:20618: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20417: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20621: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20420: \$? = $ac_status" >&5 ++ echo "$as_me:20624: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_getopt_header=$cf_header + break +@@ -20429,7 +20633,7 @@ + done + + fi +-echo "$as_me:20432: result: $cf_cv_getopt_header" >&5 ++echo "$as_me:20636: result: $cf_cv_getopt_header" >&5 + echo "${ECHO_T}$cf_cv_getopt_header" >&6 + if test "$cf_cv_getopt_header" != none ; then + +@@ -20446,14 +20650,14 @@ + + fi + +-echo "$as_me:20449: checking if external environ is declared" >&5 ++echo "$as_me:20653: 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 20456 "configure" ++#line 20660 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -20466,16 +20670,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20469: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20673: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20472: \$? = $ac_status" >&5 ++ echo "$as_me:20676: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20475: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20679: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20478: \$? = $ac_status" >&5 ++ echo "$as_me:20682: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_dcl_environ=yes + else +@@ -20486,7 +20690,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:20489: result: $cf_cv_dcl_environ" >&5 ++echo "$as_me:20693: result: $cf_cv_dcl_environ" >&5 + echo "${ECHO_T}$cf_cv_dcl_environ" >&6 + + if test "$cf_cv_dcl_environ" = no ; then +@@ -20501,14 +20705,14 @@ + + # It's possible (for near-UNIX clones) that the data doesn't exist + +-echo "$as_me:20504: checking if external environ exists" >&5 ++echo "$as_me:20708: 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 20511 "configure" ++#line 20715 "configure" + #include "confdefs.h" + + #undef environ +@@ -20523,16 +20727,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:20526: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20730: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20529: \$? = $ac_status" >&5 ++ echo "$as_me:20733: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:20532: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20736: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20535: \$? = $ac_status" >&5 ++ echo "$as_me:20739: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_environ=yes + else +@@ -20543,7 +20747,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:20546: result: $cf_cv_have_environ" >&5 ++echo "$as_me:20750: result: $cf_cv_have_environ" >&5 + echo "${ECHO_T}$cf_cv_have_environ" >&6 + + if test "$cf_cv_have_environ" = yes ; then +@@ -20556,13 +20760,13 @@ + + fi + +-echo "$as_me:20559: checking for getenv" >&5 ++echo "$as_me:20763: 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 20565 "configure" ++#line 20769 "configure" + #include "confdefs.h" + #define getenv autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -20593,16 +20797,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:20596: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20800: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20599: \$? = $ac_status" >&5 ++ echo "$as_me:20803: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:20602: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20806: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20605: \$? = $ac_status" >&5 ++ echo "$as_me:20809: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_getenv=yes + else +@@ -20612,19 +20816,19 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:20615: result: $ac_cv_func_getenv" >&5 ++echo "$as_me:20819: 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:20621: checking for $ac_func" >&5 ++echo "$as_me:20825: 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 20627 "configure" ++#line 20831 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -20655,16 +20859,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:20658: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20862: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20661: \$? = $ac_status" >&5 ++ echo "$as_me:20865: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:20664: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20868: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20667: \$? = $ac_status" >&5 ++ echo "$as_me:20871: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -20674,7 +20878,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:20677: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:20881: 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:20891: 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 +@@ -20694,7 +20898,7 @@ + cf_cv_consistent_getenv=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20697 "configure" ++#line 20901 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -20799,15 +21003,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:20802: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21006: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20805: \$? = $ac_status" >&5 ++ echo "$as_me:21009: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:20807: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21011: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20810: \$? = $ac_status" >&5 ++ echo "$as_me:21014: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_consistent_getenv=yes + else +@@ -20820,7 +21024,7 @@ + fi + + fi +-echo "$as_me:20823: result: $cf_cv_consistent_getenv" >&5 ++echo "$as_me:21027: result: $cf_cv_consistent_getenv" >&5 + echo "${ECHO_T}$cf_cv_consistent_getenv" >&6 + + if test "x$cf_cv_consistent_getenv" = xno +@@ -20835,18 +21039,18 @@ + if test "x$cf_cv_consistent_getenv" = xno && \ + test "x$cf_with_trace" = xyes + then +- { echo "$as_me:20838: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5 ++ { echo "$as_me:21042: 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:20842: checking if sys/time.h works with sys/select.h" >&5 ++echo "$as_me:21046: 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 20849 "configure" ++#line 21053 "configure" + #include "confdefs.h" + + #include +@@ -20866,16 +21070,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20869: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21073: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20872: \$? = $ac_status" >&5 ++ echo "$as_me:21076: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20875: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21079: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20878: \$? = $ac_status" >&5 ++ echo "$as_me:21082: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_sys_time_select=yes + else +@@ -20887,7 +21091,7 @@ + + fi + +-echo "$as_me:20890: result: $cf_cv_sys_time_select" >&5 ++echo "$as_me:21094: 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 +@@ -20902,13 +21106,13 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return="return" + +-echo "$as_me:20905: checking for an ANSI C-conforming const" >&5 ++echo "$as_me:21109: 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 20911 "configure" ++#line 21115 "configure" + #include "confdefs.h" + + int +@@ -20970,16 +21174,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20973: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21177: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20976: \$? = $ac_status" >&5 ++ echo "$as_me:21180: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20979: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21183: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20982: \$? = $ac_status" >&5 ++ echo "$as_me:21186: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_c_const=yes + else +@@ -20989,7 +21193,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:20992: result: $ac_cv_c_const" >&5 ++echo "$as_me:21196: result: $ac_cv_c_const" >&5 + echo "${ECHO_T}$ac_cv_c_const" >&6 + if test $ac_cv_c_const = no; then + +@@ -20999,7 +21203,7 @@ + + fi + +-echo "$as_me:21002: checking for inline" >&5 ++echo "$as_me:21206: 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 +@@ -21007,7 +21211,7 @@ + ac_cv_c_inline=no + for ac_kw in inline __inline__ __inline; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21010 "configure" ++#line 21214 "configure" + #include "confdefs.h" + #ifndef __cplusplus + static $ac_kw int static_foo (void) {return 0; } +@@ -21016,16 +21220,16 @@ + + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21019: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21223: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21022: \$? = $ac_status" >&5 ++ echo "$as_me:21226: \$? = $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:21229: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21028: \$? = $ac_status" >&5 ++ echo "$as_me:21232: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_c_inline=$ac_kw; break + else +@@ -21036,7 +21240,7 @@ + done + + fi +-echo "$as_me:21039: result: $ac_cv_c_inline" >&5 ++echo "$as_me:21243: result: $ac_cv_c_inline" >&5 + echo "${ECHO_T}$ac_cv_c_inline" >&6 + case $ac_cv_c_inline in + inline | yes) ;; +@@ -21062,7 +21266,7 @@ + : + elif test "$GCC" = yes + then +- echo "$as_me:21065: checking if $CC supports options to tune inlining" >&5 ++ echo "$as_me:21269: 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 +@@ -21071,7 +21275,7 @@ + cf_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS --param max-inline-insns-single=1200" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21074 "configure" ++#line 21278 "configure" + #include "confdefs.h" + inline int foo(void) { return 1; } + int +@@ -21083,16 +21287,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21086: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21290: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21089: \$? = $ac_status" >&5 ++ echo "$as_me:21293: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21092: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21296: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21095: \$? = $ac_status" >&5 ++ echo "$as_me:21299: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gcc_inline=yes + else +@@ -21104,7 +21308,7 @@ + CFLAGS=$cf_save_CFLAGS + + fi +-echo "$as_me:21107: result: $cf_cv_gcc_inline" >&5 ++echo "$as_me:21311: result: $cf_cv_gcc_inline" >&5 + echo "${ECHO_T}$cf_cv_gcc_inline" >&6 + if test "$cf_cv_gcc_inline" = yes ; then + +@@ -21210,7 +21414,7 @@ + fi + fi + +-echo "$as_me:21213: checking for signal global datatype" >&5 ++echo "$as_me:21417: 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 +@@ -21222,7 +21426,7 @@ + "int" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21225 "configure" ++#line 21429 "configure" + #include "confdefs.h" + + #include +@@ -21246,16 +21450,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21249: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21453: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21252: \$? = $ac_status" >&5 ++ echo "$as_me:21456: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21255: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21459: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21258: \$? = $ac_status" >&5 ++ echo "$as_me:21462: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_sig_atomic_t=$cf_type + else +@@ -21269,7 +21473,7 @@ + + fi + +-echo "$as_me:21272: result: $cf_cv_sig_atomic_t" >&5 ++echo "$as_me:21476: 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:21485: 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 +@@ -21288,7 +21492,7 @@ + cf_cv_typeof_chtype=long + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21291 "configure" ++#line 21495 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -21323,15 +21527,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:21326: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21530: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21329: \$? = $ac_status" >&5 ++ echo "$as_me:21533: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:21331: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21535: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21334: \$? = $ac_status" >&5 ++ echo "$as_me:21538: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_typeof_chtype=`cat cf_test.out` + else +@@ -21346,7 +21550,7 @@ + + fi + +-echo "$as_me:21349: result: $cf_cv_typeof_chtype" >&5 ++echo "$as_me:21553: result: $cf_cv_typeof_chtype" >&5 + echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 + + cat >>confdefs.h <&5 ++echo "$as_me:21565: 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 21368 "configure" ++#line 21572 "configure" + #include "confdefs.h" + + int +@@ -21377,16 +21581,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21380: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21584: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21383: \$? = $ac_status" >&5 ++ echo "$as_me:21587: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21386: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21590: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21389: \$? = $ac_status" >&5 ++ echo "$as_me:21593: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_unsigned_literals=yes + else +@@ -21398,7 +21602,7 @@ + + fi + +-echo "$as_me:21401: result: $cf_cv_unsigned_literals" >&5 ++echo "$as_me:21605: result: $cf_cv_unsigned_literals" >&5 + echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 + + cf_cv_1UL="1" +@@ -21414,14 +21618,14 @@ + + ### Checks for external-data + +-echo "$as_me:21417: checking if external errno is declared" >&5 ++echo "$as_me:21621: 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 21424 "configure" ++#line 21628 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -21435,16 +21639,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21438: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21642: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21441: \$? = $ac_status" >&5 ++ echo "$as_me:21645: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21444: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21648: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21447: \$? = $ac_status" >&5 ++ echo "$as_me:21651: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_dcl_errno=yes + else +@@ -21455,7 +21659,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:21458: result: $cf_cv_dcl_errno" >&5 ++echo "$as_me:21662: result: $cf_cv_dcl_errno" >&5 + echo "${ECHO_T}$cf_cv_dcl_errno" >&6 + + if test "$cf_cv_dcl_errno" = no ; then +@@ -21470,14 +21674,14 @@ + + # It's possible (for near-UNIX clones) that the data doesn't exist + +-echo "$as_me:21473: checking if external errno exists" >&5 ++echo "$as_me:21677: 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 21480 "configure" ++#line 21684 "configure" + #include "confdefs.h" + + #undef errno +@@ -21492,16 +21696,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21495: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21699: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21498: \$? = $ac_status" >&5 ++ echo "$as_me:21702: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21501: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21705: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21504: \$? = $ac_status" >&5 ++ echo "$as_me:21708: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_errno=yes + else +@@ -21512,7 +21716,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:21515: result: $cf_cv_have_errno" >&5 ++echo "$as_me:21719: result: $cf_cv_have_errno" >&5 + echo "${ECHO_T}$cf_cv_have_errno" >&6 + + if test "$cf_cv_have_errno" = yes ; then +@@ -21525,7 +21729,7 @@ + + fi + +-echo "$as_me:21528: checking if data-only library module links" >&5 ++echo "$as_me:21732: 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 +@@ -21533,20 +21737,20 @@ + + rm -f conftest.a + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:21743: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21542: \$? = $ac_status" >&5 ++ echo "$as_me:21746: \$? = $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:21770: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21569: \$? = $ac_status" >&5 ++ echo "$as_me:21773: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + mv conftest.o func.o && \ + ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null +@@ -21579,7 +21783,7 @@ + cf_cv_link_dataonly=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21582 "configure" ++#line 21786 "configure" + #include "confdefs.h" + + extern int testfunc(void); +@@ -21590,15 +21794,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:21593: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21797: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21596: \$? = $ac_status" >&5 ++ echo "$as_me:21800: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:21598: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21802: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21601: \$? = $ac_status" >&5 ++ echo "$as_me:21805: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_link_dataonly=yes + else +@@ -21613,7 +21817,7 @@ + + fi + +-echo "$as_me:21616: result: $cf_cv_link_dataonly" >&5 ++echo "$as_me:21820: result: $cf_cv_link_dataonly" >&5 + echo "${ECHO_T}$cf_cv_link_dataonly" >&6 + + if test "$cf_cv_link_dataonly" = no ; then +@@ -21627,36 +21831,162 @@ + + ### Checks for library functions. + +-echo "$as_me:21630: checking for clock_gettime" >&5 ++cf_save_libs="$LIBS" ++echo "$as_me:21835: checking for clock_gettime" >&5 + echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6 ++if test "${ac_cv_func_clock_gettime+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >"conftest.$ac_ext" <<_ACEOF ++#line 21841 "configure" ++#include "confdefs.h" ++#define clock_gettime autoconf_temporary ++#include /* least-intrusive standard header which defines gcc2 __stub macros */ ++#undef clock_gettime ++ ++#ifdef __cplusplus ++extern "C" ++#endif ++ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char clock_gettime (void); ++ ++int ++main (void) ++{ ++ ++/* The GNU C library defines stubs for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_clock_gettime) || defined (__stub___clock_gettime) ++#error found stub for clock_gettime ++#endif ++ ++ return clock_gettime (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f "conftest.$ac_objext" "conftest$ac_exeext" ++if { (eval echo "$as_me:21872: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:21875: \$? = $ac_status" >&5 ++ (exit "$ac_status"); } && ++ { ac_try='test -s "conftest$ac_exeext"' ++ { (eval echo "$as_me:21878: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:21881: \$? = $ac_status" >&5 ++ (exit "$ac_status"); }; }; then ++ ac_cv_func_clock_gettime=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat "conftest.$ac_ext" >&5 ++ac_cv_func_clock_gettime=no ++fi ++rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ++fi ++echo "$as_me:21891: result: $ac_cv_func_clock_gettime" >&5 ++echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6 ++if test "$ac_cv_func_clock_gettime" = yes; then ++ cf_cv_test_clock_gettime=yes ++else ++ echo "$as_me:21896: checking for clock_gettime in -lrt" >&5 ++echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6 ++if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lrt $LIBS" ++cat >"conftest.$ac_ext" <<_ACEOF ++#line 21904 "configure" ++#include "confdefs.h" ++ ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char clock_gettime (void); ++int ++main (void) ++{ ++clock_gettime (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f "conftest.$ac_objext" "conftest$ac_exeext" ++if { (eval echo "$as_me:21923: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:21926: \$? = $ac_status" >&5 ++ (exit "$ac_status"); } && ++ { ac_try='test -s "conftest$ac_exeext"' ++ { (eval echo "$as_me:21929: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:21932: \$? = $ac_status" >&5 ++ (exit "$ac_status"); }; }; then ++ ac_cv_lib_rt_clock_gettime=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat "conftest.$ac_ext" >&5 ++ac_cv_lib_rt_clock_gettime=no ++fi ++rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ++LIBS=$ac_check_lib_save_LIBS ++fi ++echo "$as_me:21943: result: $ac_cv_lib_rt_clock_gettime" >&5 ++echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6 ++if test "$ac_cv_lib_rt_clock_gettime" = yes; then ++ LIBS="-lrt $LIBS" ++ cf_cv_test_clock_gettime=yes ++else ++ cf_cv_test_clock_gettime=no ++fi ++ ++fi ++ ++if test "$cf_cv_test_clock_gettime" = yes ; then ++echo "$as_me:21955: checking if clock_gettime links" >&5 ++echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6 + if test "${cf_cv_func_clock_gettime+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21637 "configure" ++#line 21962 "configure" + #include "confdefs.h" ++ ++$ac_includes_default + #include ++ + int + main (void) + { + struct timespec ts; +- int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts ++ int rc = clock_gettime(CLOCK_REALTIME, &ts) ++ + clock_gettime(CLOCK_MONOTONIC, &ts); ++ (void) rc; (void)ts + ; + return 0; + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21650: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21980: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21653: \$? = $ac_status" >&5 ++ echo "$as_me:21983: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21656: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21986: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21659: \$? = $ac_status" >&5 ++ echo "$as_me:21989: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_clock_gettime=yes + else +@@ -21667,8 +21997,11 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:21670: result: $cf_cv_func_clock_gettime" >&5 ++echo "$as_me:22000: result: $cf_cv_func_clock_gettime" >&5 + echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6 ++else ++ cf_cv_func_clock_gettime=no ++fi + + if test "$cf_cv_func_clock_gettime" = yes + then +@@ -21678,13 +22011,13 @@ + EOF + + else +-echo "$as_me:21681: checking for gettimeofday" >&5 ++echo "$as_me:22014: 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 21687 "configure" ++#line 22020 "configure" + #include "confdefs.h" + #define gettimeofday autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -21715,16 +22048,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21718: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22051: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21721: \$? = $ac_status" >&5 ++ echo "$as_me:22054: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21724: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22057: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21727: \$? = $ac_status" >&5 ++ echo "$as_me:22060: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_gettimeofday=yes + else +@@ -21734,7 +22067,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:21737: result: $ac_cv_func_gettimeofday" >&5 ++echo "$as_me:22070: result: $ac_cv_func_gettimeofday" >&5 + echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 + if test "$ac_cv_func_gettimeofday" = yes; then + +@@ -21744,7 +22077,7 @@ + + else + +-echo "$as_me:21747: checking for gettimeofday in -lbsd" >&5 ++echo "$as_me:22080: 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 +@@ -21752,7 +22085,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21755 "configure" ++#line 22088 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -21771,16 +22104,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21774: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22107: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21777: \$? = $ac_status" >&5 ++ echo "$as_me:22110: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21780: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22113: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21783: \$? = $ac_status" >&5 ++ echo "$as_me:22116: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_bsd_gettimeofday=yes + else +@@ -21791,7 +22124,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:21794: result: $ac_cv_lib_bsd_gettimeofday" >&5 ++echo "$as_me:22127: 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 + +@@ -21850,13 +22183,13 @@ + + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:21853: checking for $ac_func" >&5 ++echo "$as_me:22186: 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 21859 "configure" ++#line 22192 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -21887,16 +22220,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21890: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22223: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21893: \$? = $ac_status" >&5 ++ echo "$as_me:22226: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21896: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22229: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21899: \$? = $ac_status" >&5 ++ echo "$as_me:22232: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -21906,7 +22239,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:21909: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:22242: 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:22252: 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 21926 "configure" ++#line 22259 "configure" + #include "confdefs.h" + + #include +@@ -21938,16 +22271,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21941: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22274: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21944: \$? = $ac_status" >&5 ++ echo "$as_me:22277: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21947: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22280: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21950: \$? = $ac_status" >&5 ++ echo "$as_me:22283: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_PATH_TTYS=yes + else +@@ -21957,7 +22290,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:21960: result: $cf_cv_PATH_TTYS" >&5 ++echo "$as_me:22293: result: $cf_cv_PATH_TTYS" >&5 + echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6 + + if test $cf_cv_PATH_TTYS = no +@@ -21979,7 +22312,7 @@ + + if test $cf_cv_PATH_TTYS != no + then +- echo "$as_me:21982: checking if _PATH_TTYS file exists" >&5 ++ echo "$as_me:22315: 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 +@@ -21989,7 +22322,7 @@ + cf_cv_have_PATH_TTYS=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21992 "configure" ++#line 22325 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -22002,15 +22335,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:22005: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22338: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22008: \$? = $ac_status" >&5 ++ echo "$as_me:22341: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:22010: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22343: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22013: \$? = $ac_status" >&5 ++ echo "$as_me:22346: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_PATH_TTYS=yes + else +@@ -22022,7 +22355,7 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:22025: result: $cf_cv_have_PATH_TTYS" >&5 ++echo "$as_me:22358: 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 +@@ -22034,14 +22367,14 @@ + #define HAVE_PATH_TTYS 1 + EOF + +- echo "$as_me:22037: checking for getttynam" >&5 ++ echo "$as_me:22370: 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 22044 "configure" ++#line 22377 "configure" + #include "confdefs.h" + #include + int +@@ -22053,16 +22386,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22056: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22389: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22059: \$? = $ac_status" >&5 ++ echo "$as_me:22392: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22062: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22395: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22065: \$? = $ac_status" >&5 ++ echo "$as_me:22398: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_getttynam=yes + else +@@ -22072,7 +22405,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22075: result: $cf_cv_func_getttynam" >&5 ++echo "$as_me:22408: 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 +@@ -22082,7 +22415,7 @@ + + if test "x$ac_cv_func_getopt" = xno && \ + test "x$cf_with_progs$cf_with_tests" != xnono; then +- { { echo "$as_me:22085: error: getopt is required for building programs" >&5 ++ { { echo "$as_me:22418: error: getopt is required for building programs" >&5 + echo "$as_me: error: getopt is required for building programs" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -22091,7 +22424,7 @@ + then + if test "x$ac_cv_func_vsnprintf" = xyes + then +- { echo "$as_me:22094: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 ++ { echo "$as_me:22427: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 + echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;} + else + +@@ -22104,14 +22437,14 @@ + + if test "x$with_getcap" = "xyes" ; then + +-echo "$as_me:22107: checking for terminal-capability database functions" >&5 ++echo "$as_me:22440: 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 22114 "configure" ++#line 22447 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -22131,16 +22464,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22134: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22467: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22137: \$? = $ac_status" >&5 ++ echo "$as_me:22470: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22140: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22473: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22143: \$? = $ac_status" >&5 ++ echo "$as_me:22476: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cgetent=yes + else +@@ -22151,7 +22484,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:22154: result: $cf_cv_cgetent" >&5 ++echo "$as_me:22487: result: $cf_cv_cgetent" >&5 + echo "${ECHO_T}$cf_cv_cgetent" >&6 + + if test "$cf_cv_cgetent" = yes +@@ -22161,14 +22494,14 @@ + #define HAVE_BSD_CGETENT 1 + EOF + +-echo "$as_me:22164: checking if cgetent uses const parameter" >&5 ++echo "$as_me:22497: 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 22171 "configure" ++#line 22504 "configure" + #include "confdefs.h" + + #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers" +@@ -22191,16 +22524,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22194: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22527: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22197: \$? = $ac_status" >&5 ++ echo "$as_me:22530: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22200: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22533: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22203: \$? = $ac_status" >&5 ++ echo "$as_me:22536: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cgetent_const=yes + else +@@ -22211,7 +22544,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:22214: result: $cf_cv_cgetent_const" >&5 ++echo "$as_me:22547: result: $cf_cv_cgetent_const" >&5 + echo "${ECHO_T}$cf_cv_cgetent_const" >&6 + if test "$cf_cv_cgetent_const" = yes + then +@@ -22225,14 +22558,14 @@ + + fi + +-echo "$as_me:22228: checking for isascii" >&5 ++echo "$as_me:22561: 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 22235 "configure" ++#line 22568 "configure" + #include "confdefs.h" + #include + int +@@ -22244,16 +22577,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22247: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22580: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22250: \$? = $ac_status" >&5 ++ echo "$as_me:22583: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22253: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22586: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22256: \$? = $ac_status" >&5 ++ echo "$as_me:22589: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_isascii=yes + else +@@ -22264,7 +22597,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:22267: result: $cf_cv_have_isascii" >&5 ++echo "$as_me:22600: result: $cf_cv_have_isascii" >&5 + echo "${ECHO_T}$cf_cv_have_isascii" >&6 + test "$cf_cv_have_isascii" = yes && + cat >>confdefs.h <<\EOF +@@ -22272,10 +22605,10 @@ + EOF + + if test "$ac_cv_func_sigaction" = yes; then +-echo "$as_me:22275: checking whether sigaction needs _POSIX_SOURCE" >&5 ++echo "$as_me:22608: 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 22278 "configure" ++#line 22611 "configure" + #include "confdefs.h" + + #include +@@ -22289,16 +22622,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22292: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22625: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22295: \$? = $ac_status" >&5 ++ echo "$as_me:22628: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22298: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22631: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22301: \$? = $ac_status" >&5 ++ echo "$as_me:22634: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + sigact_bad=no + else +@@ -22306,7 +22639,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22309 "configure" ++#line 22642 "configure" + #include "confdefs.h" + + #define _POSIX_SOURCE +@@ -22321,16 +22654,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22324: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22657: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22327: \$? = $ac_status" >&5 ++ echo "$as_me:22660: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22330: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22663: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22333: \$? = $ac_status" >&5 ++ echo "$as_me:22666: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + sigact_bad=yes + +@@ -22346,11 +22679,11 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +-echo "$as_me:22349: result: $sigact_bad" >&5 ++echo "$as_me:22682: result: $sigact_bad" >&5 + echo "${ECHO_T}$sigact_bad" >&6 + fi + +-echo "$as_me:22353: checking if nanosleep really works" >&5 ++echo "$as_me:22686: 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 +@@ -22360,7 +22693,7 @@ + cf_cv_func_nanosleep=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22363 "configure" ++#line 22696 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -22386,15 +22719,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:22389: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22722: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22392: \$? = $ac_status" >&5 ++ echo "$as_me:22725: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:22394: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22727: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22397: \$? = $ac_status" >&5 ++ echo "$as_me:22730: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_nanosleep=yes + else +@@ -22406,7 +22739,7 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:22409: result: $cf_cv_func_nanosleep" >&5 ++echo "$as_me:22742: result: $cf_cv_func_nanosleep" >&5 + echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 + + test "$cf_cv_func_nanosleep" = "yes" && +@@ -22423,23 +22756,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:22426: checking for $ac_header" >&5 ++echo "$as_me:22759: 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 22432 "configure" ++#line 22765 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:22436: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:22769: \"$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:22442: \$? = $ac_status" >&5 ++ echo "$as_me:22775: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -22458,7 +22791,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:22461: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:22794: 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:22811: 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 22481 "configure" ++#line 22814 "configure" + #include "confdefs.h" + #include + int +@@ -22490,16 +22823,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22493: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22826: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22496: \$? = $ac_status" >&5 ++ echo "$as_me:22829: \$? = $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:22832: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22502: \$? = $ac_status" >&5 ++ echo "$as_me:22835: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + termios_bad=no + else +@@ -22507,7 +22840,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22510 "configure" ++#line 22843 "configure" + #include "confdefs.h" + + #define _POSIX_SOURCE +@@ -22521,16 +22854,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22524: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22857: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22527: \$? = $ac_status" >&5 ++ echo "$as_me:22860: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22530: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22863: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22533: \$? = $ac_status" >&5 ++ echo "$as_me:22866: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + termios_bad=unknown + else +@@ -22546,19 +22879,19 @@ + + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:22549: result: $termios_bad" >&5 ++ echo "$as_me:22882: result: $termios_bad" >&5 + echo "${ECHO_T}$termios_bad" >&6 + fi + fi + +-echo "$as_me:22554: checking for tcgetattr" >&5 ++echo "$as_me:22887: 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 22561 "configure" ++#line 22894 "configure" + #include "confdefs.h" + + #include +@@ -22586,16 +22919,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22589: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22922: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22592: \$? = $ac_status" >&5 ++ echo "$as_me:22925: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22595: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22928: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22598: \$? = $ac_status" >&5 ++ echo "$as_me:22931: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_tcgetattr=yes + else +@@ -22605,21 +22938,21 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22608: result: $cf_cv_have_tcgetattr" >&5 ++echo "$as_me:22941: 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:22615: checking for vsscanf function or workaround" >&5 ++echo "$as_me:22948: 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 22622 "configure" ++#line 22955 "configure" + #include "confdefs.h" + + #include +@@ -22645,16 +22978,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22648: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22981: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22651: \$? = $ac_status" >&5 ++ echo "$as_me:22984: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22654: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22987: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22657: \$? = $ac_status" >&5 ++ echo "$as_me:22990: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_vsscanf=vsscanf + else +@@ -22662,7 +22995,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22665 "configure" ++#line 22998 "configure" + #include "confdefs.h" + + #include +@@ -22684,16 +23017,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22687: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23020: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22690: \$? = $ac_status" >&5 ++ echo "$as_me:23023: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22693: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23026: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22696: \$? = $ac_status" >&5 ++ echo "$as_me:23029: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_vsscanf=vfscanf + else +@@ -22701,7 +23034,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22704 "configure" ++#line 23037 "configure" + #include "confdefs.h" + + #include +@@ -22723,16 +23056,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22726: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23059: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22729: \$? = $ac_status" >&5 ++ echo "$as_me:23062: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22732: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23065: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22735: \$? = $ac_status" >&5 ++ echo "$as_me:23068: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_vsscanf=_doscan + else +@@ -22747,7 +23080,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22750: result: $cf_cv_func_vsscanf" >&5 ++echo "$as_me:23083: result: $cf_cv_func_vsscanf" >&5 + echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 + + case "$cf_cv_func_vsscanf" in +@@ -22773,23 +23106,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:22776: checking for $ac_header" >&5 ++echo "$as_me:23109: 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 22782 "configure" ++#line 23115 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:22786: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:23119: \"$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:22792: \$? = $ac_status" >&5 ++ echo "$as_me:23125: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -22808,7 +23141,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:22811: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:23144: 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:23154: 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 +@@ -22829,7 +23162,7 @@ + cf_cv_func_mkstemp=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22832 "configure" ++#line 23165 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -22864,15 +23197,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:22867: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23200: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22870: \$? = $ac_status" >&5 ++ echo "$as_me:23203: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:22872: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23205: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22875: \$? = $ac_status" >&5 ++ echo "$as_me:23208: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_mkstemp=yes + +@@ -22887,16 +23220,16 @@ + fi + + fi +-echo "$as_me:22890: result: $cf_cv_func_mkstemp" >&5 ++echo "$as_me:23223: 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:22893: checking for mkstemp" >&5 ++ echo "$as_me:23226: 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 22899 "configure" ++#line 23232 "configure" + #include "confdefs.h" + #define mkstemp autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -22927,16 +23260,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22930: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23263: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22933: \$? = $ac_status" >&5 ++ echo "$as_me:23266: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22936: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23269: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22939: \$? = $ac_status" >&5 ++ echo "$as_me:23272: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_mkstemp=yes + else +@@ -22946,7 +23279,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22949: result: $ac_cv_func_mkstemp" >&5 ++echo "$as_me:23282: result: $ac_cv_func_mkstemp" >&5 + echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 + + fi +@@ -22967,21 +23300,21 @@ + fi + + if test "x$cross_compiling" = xyes ; then +- { echo "$as_me:22970: WARNING: cross compiling: assume setvbuf params not reversed" >&5 ++ { echo "$as_me:23303: 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:22973: checking whether setvbuf arguments are reversed" >&5 ++ echo "$as_me:23306: 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:22979: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:23312: 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 22984 "configure" ++#line 23317 "configure" + #include "confdefs.h" + #include + /* If setvbuf has the reversed format, exit 0. */ +@@ -22998,15 +23331,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:23001: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23334: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23004: \$? = $ac_status" >&5 ++ echo "$as_me:23337: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:23006: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23339: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23009: \$? = $ac_status" >&5 ++ echo "$as_me:23342: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_setvbuf_reversed=yes + else +@@ -23019,7 +23352,7 @@ + fi + rm -f core ./core.* ./*.core + fi +-echo "$as_me:23022: result: $ac_cv_func_setvbuf_reversed" >&5 ++echo "$as_me:23355: 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 + +@@ -23030,13 +23363,13 @@ + fi + + fi +-echo "$as_me:23033: checking for intptr_t" >&5 ++echo "$as_me:23366: 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 23039 "configure" ++#line 23372 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -23051,16 +23384,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:23054: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:23387: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23057: \$? = $ac_status" >&5 ++ echo "$as_me:23390: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:23060: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23393: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23063: \$? = $ac_status" >&5 ++ echo "$as_me:23396: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_intptr_t=yes + else +@@ -23070,7 +23403,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:23073: result: $ac_cv_type_intptr_t" >&5 ++echo "$as_me:23406: 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 + : +@@ -23082,13 +23415,13 @@ + + fi + +-echo "$as_me:23085: checking for ssize_t" >&5 ++echo "$as_me:23418: 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 23091 "configure" ++#line 23424 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -23103,16 +23436,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:23106: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:23439: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23109: \$? = $ac_status" >&5 ++ echo "$as_me:23442: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:23112: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23445: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23115: \$? = $ac_status" >&5 ++ echo "$as_me:23448: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_ssize_t=yes + else +@@ -23122,7 +23455,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:23125: result: $ac_cv_type_ssize_t" >&5 ++echo "$as_me:23458: 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 + : +@@ -23134,14 +23467,14 @@ + + fi + +-echo "$as_me:23137: checking for type sigaction_t" >&5 ++echo "$as_me:23470: 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 23144 "configure" ++#line 23477 "configure" + #include "confdefs.h" + + #include +@@ -23154,16 +23487,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:23157: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:23490: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23160: \$? = $ac_status" >&5 ++ echo "$as_me:23493: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:23163: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23496: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23166: \$? = $ac_status" >&5 ++ echo "$as_me:23499: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_type_sigaction=yes + else +@@ -23174,14 +23507,14 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + +-echo "$as_me:23177: result: $cf_cv_type_sigaction" >&5 ++echo "$as_me:23510: 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:23184: checking declaration of size-change" >&5 ++echo "$as_me:23517: 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 +@@ -23202,7 +23535,7 @@ + + fi + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23205 "configure" ++#line 23538 "configure" + #include "confdefs.h" + #include + #ifdef HAVE_TERMIOS_H +@@ -23252,16 +23585,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:23255: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:23588: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23258: \$? = $ac_status" >&5 ++ echo "$as_me:23591: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:23261: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23594: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23264: \$? = $ac_status" >&5 ++ echo "$as_me:23597: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_sizechange=yes + else +@@ -23280,7 +23613,7 @@ + done + + fi +-echo "$as_me:23283: result: $cf_cv_sizechange" >&5 ++echo "$as_me:23616: result: $cf_cv_sizechange" >&5 + echo "${ECHO_T}$cf_cv_sizechange" >&6 + if test "$cf_cv_sizechange" != no ; then + +@@ -23298,13 +23631,13 @@ + esac + fi + +-echo "$as_me:23301: checking for memmove" >&5 ++echo "$as_me:23634: 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 23307 "configure" ++#line 23640 "configure" + #include "confdefs.h" + #define memmove autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -23335,16 +23668,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23338: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23671: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23341: \$? = $ac_status" >&5 ++ echo "$as_me:23674: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23344: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23677: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23347: \$? = $ac_status" >&5 ++ echo "$as_me:23680: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_memmove=yes + else +@@ -23354,19 +23687,19 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23357: result: $ac_cv_func_memmove" >&5 ++echo "$as_me:23690: 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:23363: checking for bcopy" >&5 ++echo "$as_me:23696: 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 23369 "configure" ++#line 23702 "configure" + #include "confdefs.h" + #define bcopy autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -23397,16 +23730,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23400: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23733: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23403: \$? = $ac_status" >&5 ++ echo "$as_me:23736: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23406: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23739: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23409: \$? = $ac_status" >&5 ++ echo "$as_me:23742: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_bcopy=yes + else +@@ -23416,11 +23749,11 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23419: result: $ac_cv_func_bcopy" >&5 ++echo "$as_me:23752: 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:23423: checking if bcopy does overlapping moves" >&5 ++ echo "$as_me:23756: 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 +@@ -23430,7 +23763,7 @@ + cf_cv_good_bcopy=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23433 "configure" ++#line 23766 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -23446,15 +23779,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:23449: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23782: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23452: \$? = $ac_status" >&5 ++ echo "$as_me:23785: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:23454: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23787: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23457: \$? = $ac_status" >&5 ++ echo "$as_me:23790: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_good_bcopy=yes + else +@@ -23467,7 +23800,7 @@ + fi + + fi +-echo "$as_me:23470: result: $cf_cv_good_bcopy" >&5 ++echo "$as_me:23803: result: $cf_cv_good_bcopy" >&5 + echo "${ECHO_T}$cf_cv_good_bcopy" >&6 + + else +@@ -23494,13 +23827,13 @@ + for ac_func in posix_openpt + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:23497: checking for $ac_func" >&5 ++echo "$as_me:23830: 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 23503 "configure" ++#line 23836 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -23531,16 +23864,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23534: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23867: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23537: \$? = $ac_status" >&5 ++ echo "$as_me:23870: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23540: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23873: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23543: \$? = $ac_status" >&5 ++ echo "$as_me:23876: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -23550,7 +23883,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23553: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:23886: 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:23896: 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 +@@ -23570,7 +23903,7 @@ + cf_cv_working_poll=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23573 "configure" ++#line 23906 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -23623,15 +23956,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:23626: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23959: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23629: \$? = $ac_status" >&5 ++ echo "$as_me:23962: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:23631: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23964: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23634: \$? = $ac_status" >&5 ++ echo "$as_me:23967: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_working_poll=yes + else +@@ -23643,21 +23976,21 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:23646: result: $cf_cv_working_poll" >&5 ++echo "$as_me:23979: 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:23653: checking if MB_LEN_MAX is usable" >&5 ++echo "$as_me:23986: checking if MB_LEN_MAX is usable" >&5 + echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6 + if test "${cf_cv_mb_len_max+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23660 "configure" ++#line 23993 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -23677,16 +24010,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:23680: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24013: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23683: \$? = $ac_status" >&5 ++ echo "$as_me:24016: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:23686: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24019: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23689: \$? = $ac_status" >&5 ++ echo "$as_me:24022: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_mb_len_max=yes + else +@@ -23696,7 +24029,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:23699: result: $cf_cv_mb_len_max" >&5 ++echo "$as_me:24032: result: $cf_cv_mb_len_max" >&5 + echo "${ECHO_T}$cf_cv_mb_len_max" >&6 + if test "$cf_cv_mb_len_max" = yes + then +@@ -23706,18 +24039,18 @@ + EOF + + else +- { echo "$as_me:23709: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5 ++ { echo "$as_me:24042: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5 + echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;} + fi + +-echo "$as_me:23713: checking for va_copy" >&5 ++echo "$as_me:24046: 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 23720 "configure" ++#line 24053 "configure" + #include "confdefs.h" + + #include +@@ -23734,16 +24067,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23737: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24070: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23740: \$? = $ac_status" >&5 ++ echo "$as_me:24073: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23743: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24076: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23746: \$? = $ac_status" >&5 ++ echo "$as_me:24079: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_va_copy=yes + else +@@ -23753,7 +24086,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23756: result: $cf_cv_have_va_copy" >&5 ++echo "$as_me:24089: result: $cf_cv_have_va_copy" >&5 + echo "${ECHO_T}$cf_cv_have_va_copy" >&6 + + if test "$cf_cv_have_va_copy" = yes; +@@ -23765,14 +24098,14 @@ + + else # !cf_cv_have_va_copy + +-echo "$as_me:23768: checking for __va_copy" >&5 ++echo "$as_me:24101: 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 23775 "configure" ++#line 24108 "configure" + #include "confdefs.h" + + #include +@@ -23789,16 +24122,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23792: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24125: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23795: \$? = $ac_status" >&5 ++ echo "$as_me:24128: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23798: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24131: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23801: \$? = $ac_status" >&5 ++ echo "$as_me:24134: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have___va_copy=yes + else +@@ -23808,7 +24141,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23811: result: $cf_cv_have___va_copy" >&5 ++echo "$as_me:24144: result: $cf_cv_have___va_copy" >&5 + echo "${ECHO_T}$cf_cv_have___va_copy" >&6 + + if test "$cf_cv_have___va_copy" = yes +@@ -23820,14 +24153,14 @@ + + else # !cf_cv_have___va_copy + +-echo "$as_me:23823: checking for __builtin_va_copy" >&5 ++echo "$as_me:24156: 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 23830 "configure" ++#line 24163 "configure" + #include "confdefs.h" + + #include +@@ -23844,16 +24177,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23847: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24180: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23850: \$? = $ac_status" >&5 ++ echo "$as_me:24183: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23853: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24186: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23856: \$? = $ac_status" >&5 ++ echo "$as_me:24189: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have___builtin_va_copy=yes + else +@@ -23863,7 +24196,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23866: result: $cf_cv_have___builtin_va_copy" >&5 ++echo "$as_me:24199: 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 && +@@ -23881,14 +24214,14 @@ + ;; + + (*) +- echo "$as_me:23884: checking if we can simply copy va_list" >&5 ++ echo "$as_me:24217: 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 23891 "configure" ++#line 24224 "configure" + #include "confdefs.h" + + #include +@@ -23905,16 +24238,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23908: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24241: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23911: \$? = $ac_status" >&5 ++ echo "$as_me:24244: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23914: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24247: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23917: \$? = $ac_status" >&5 ++ echo "$as_me:24250: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_pointer_va_list=yes + else +@@ -23924,19 +24257,19 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23927: result: $cf_cv_pointer_va_list" >&5 ++echo "$as_me:24260: 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:23932: checking if we can copy va_list indirectly" >&5 ++ echo "$as_me:24265: 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 23939 "configure" ++#line 24272 "configure" + #include "confdefs.h" + + #include +@@ -23953,16 +24286,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23956: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24289: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23959: \$? = $ac_status" >&5 ++ echo "$as_me:24292: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23962: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24295: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23965: \$? = $ac_status" >&5 ++ echo "$as_me:24298: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_array_va_list=yes + else +@@ -23972,7 +24305,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23975: result: $cf_cv_array_va_list" >&5 ++echo "$as_me:24308: 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 +@@ -23983,13 +24316,13 @@ + ;; + esac + +-echo "$as_me:23986: checking for pid_t" >&5 ++echo "$as_me:24319: 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 23992 "configure" ++#line 24325 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -24004,16 +24337,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24007: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24340: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24010: \$? = $ac_status" >&5 ++ echo "$as_me:24343: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24013: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24346: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24016: \$? = $ac_status" >&5 ++ echo "$as_me:24349: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_pid_t=yes + else +@@ -24023,7 +24356,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:24026: result: $ac_cv_type_pid_t" >&5 ++echo "$as_me:24359: 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 + : +@@ -24038,23 +24371,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:24041: checking for $ac_header" >&5 ++echo "$as_me:24374: 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 24047 "configure" ++#line 24380 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:24051: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:24384: \"$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:24057: \$? = $ac_status" >&5 ++ echo "$as_me:24390: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -24073,7 +24406,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:24076: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:24409: 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:24422: 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 24095 "configure" ++#line 24428 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -24123,16 +24456,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24126: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24459: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24129: \$? = $ac_status" >&5 ++ echo "$as_me:24462: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24132: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24465: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24135: \$? = $ac_status" >&5 ++ echo "$as_me:24468: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -24142,7 +24475,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:24145: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:24478: 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:24490: 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 +@@ -24177,15 +24510,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:24180: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24513: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24183: \$? = $ac_status" >&5 ++ echo "$as_me:24516: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:24185: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24518: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24188: \$? = $ac_status" >&5 ++ echo "$as_me:24521: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_fork_works=yes + else +@@ -24197,7 +24530,7 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:24200: result: $ac_cv_func_fork_works" >&5 ++echo "$as_me:24533: result: $ac_cv_func_fork_works" >&5 + echo "${ECHO_T}$ac_cv_func_fork_works" >&6 + + fi +@@ -24211,12 +24544,12 @@ + ac_cv_func_fork_works=yes + ;; + esac +- { echo "$as_me:24214: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 ++ { echo "$as_me:24547: 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:24219: checking for working vfork" >&5 ++ echo "$as_me:24552: 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 +@@ -24225,7 +24558,7 @@ + ac_cv_func_vfork_works=cross + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24228 "configure" ++#line 24561 "configure" + #include "confdefs.h" + /* Thanks to Paul Eggert for this test. */ + #include +@@ -24318,15 +24651,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:24321: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24654: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24324: \$? = $ac_status" >&5 ++ echo "$as_me:24657: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:24326: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24659: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24329: \$? = $ac_status" >&5 ++ echo "$as_me:24662: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_vfork_works=yes + else +@@ -24338,13 +24671,13 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:24341: result: $ac_cv_func_vfork_works" >&5 ++echo "$as_me:24674: 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:24347: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 ++ { echo "$as_me:24680: 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 + +@@ -24369,7 +24702,7 @@ + + fi + +-echo "$as_me:24372: checking if fopen accepts explicit binary mode" >&5 ++echo "$as_me:24705: 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 +@@ -24379,7 +24712,7 @@ + cf_cv_fopen_bin_r=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24382 "configure" ++#line 24715 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -24414,15 +24747,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:24417: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24750: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24420: \$? = $ac_status" >&5 ++ echo "$as_me:24753: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:24422: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24755: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24425: \$? = $ac_status" >&5 ++ echo "$as_me:24758: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_fopen_bin_r=yes + else +@@ -24435,7 +24768,7 @@ + fi + + fi +-echo "$as_me:24438: result: $cf_cv_fopen_bin_r" >&5 ++echo "$as_me:24771: 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 +@@ -24444,7 +24777,7 @@ + + # special check for test/ditto.c + +-echo "$as_me:24447: checking for openpty in -lutil" >&5 ++echo "$as_me:24780: 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 +@@ -24452,7 +24785,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lutil $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24455 "configure" ++#line 24788 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -24471,16 +24804,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24474: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24807: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24477: \$? = $ac_status" >&5 ++ echo "$as_me:24810: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24480: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24813: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24483: \$? = $ac_status" >&5 ++ echo "$as_me:24816: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_util_openpty=yes + else +@@ -24491,7 +24824,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:24494: result: $ac_cv_lib_util_openpty" >&5 ++echo "$as_me:24827: 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 +@@ -24499,7 +24832,7 @@ + cf_cv_lib_util=no + fi + +-echo "$as_me:24502: checking for openpty header" >&5 ++echo "$as_me:24835: 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 +@@ -24526,7 +24859,7 @@ + for cf_header in pty.h libutil.h util.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24529 "configure" ++#line 24862 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -24544,16 +24877,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24547: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24880: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24550: \$? = $ac_status" >&5 ++ echo "$as_me:24883: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24553: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24886: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24556: \$? = $ac_status" >&5 ++ echo "$as_me:24889: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_func_openpty=$cf_header +@@ -24571,7 +24904,7 @@ + LIBS="$cf_save_LIBS" + + fi +-echo "$as_me:24574: result: $cf_cv_func_openpty" >&5 ++echo "$as_me:24907: result: $cf_cv_func_openpty" >&5 + echo "${ECHO_T}$cf_cv_func_openpty" >&6 + + if test "$cf_cv_func_openpty" != no ; then +@@ -24644,7 +24977,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24647 "configure" ++#line 24980 "configure" + #include "confdefs.h" + #include + int +@@ -24656,16 +24989,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24659: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24992: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24662: \$? = $ac_status" >&5 ++ echo "$as_me:24995: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24665: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24998: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24668: \$? = $ac_status" >&5 ++ echo "$as_me:25001: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -24682,7 +25015,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}:24685: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:25018: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -24718,7 +25051,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}:24721: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:25054: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -24729,7 +25062,7 @@ + else + case "$with_hashed_db" in + (./*|../*|/*) +- { echo "$as_me:24732: WARNING: no such directory $with_hashed_db" >&5 ++ { echo "$as_me:25065: WARNING: no such directory $with_hashed_db" >&5 + echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;} + ;; + (*) +@@ -24801,7 +25134,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24804 "configure" ++#line 25137 "configure" + #include "confdefs.h" + #include + int +@@ -24813,16 +25146,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24816: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25149: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24819: \$? = $ac_status" >&5 ++ echo "$as_me:25152: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24822: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25155: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24825: \$? = $ac_status" >&5 ++ echo "$as_me:25158: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -24839,7 +25172,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}:24842: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:25175: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -24919,7 +25252,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}:24922: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:25255: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -24936,23 +25269,23 @@ + fi + esac + +-echo "$as_me:24939: checking for db.h" >&5 ++echo "$as_me:25272: 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 24945 "configure" ++#line 25278 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:24949: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25282: \"$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:24955: \$? = $ac_status" >&5 ++ echo "$as_me:25288: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -24971,11 +25304,11 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:24974: result: $ac_cv_header_db_h" >&5 ++echo "$as_me:25307: 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:24978: checking for version of db" >&5 ++echo "$as_me:25311: 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 +@@ -24986,10 +25319,10 @@ + for cf_db_version in 1 2 3 4 5 6 + do + +-echo "${as_me:-configure}:24989: testing checking for db version $cf_db_version ..." 1>&5 ++echo "${as_me:-configure}:25322: testing checking for db version $cf_db_version ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24992 "configure" ++#line 25325 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -25019,16 +25352,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25022: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25355: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25025: \$? = $ac_status" >&5 ++ echo "$as_me:25358: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25028: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25361: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25031: \$? = $ac_status" >&5 ++ echo "$as_me:25364: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_hashed_db_version=$cf_db_version +@@ -25042,16 +25375,16 @@ + done + + fi +-echo "$as_me:25045: result: $cf_cv_hashed_db_version" >&5 ++echo "$as_me:25378: 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:25049: error: Cannot determine version of db" >&5 ++ { { echo "$as_me:25382: 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:25054: checking for db libraries" >&5 ++echo "$as_me:25387: 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 +@@ -25081,10 +25414,10 @@ + + fi + +-echo "${as_me:-configure}:25084: testing checking for library $cf_db_libs ..." 1>&5 ++echo "${as_me:-configure}:25417: testing checking for library $cf_db_libs ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25087 "configure" ++#line 25420 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -25139,16 +25472,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:25142: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:25475: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:25145: \$? = $ac_status" >&5 ++ echo "$as_me:25478: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:25148: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25481: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25151: \$? = $ac_status" >&5 ++ echo "$as_me:25484: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + if test -n "$cf_db_libs" ; then +@@ -25168,11 +25501,11 @@ + done + + fi +-echo "$as_me:25171: result: $cf_cv_hashed_db_libs" >&5 ++echo "$as_me:25504: 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:25175: error: Cannot determine library for db" >&5 ++ { { echo "$as_me:25508: 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 +@@ -25198,7 +25531,7 @@ + + else + +- { { echo "$as_me:25201: error: Cannot find db.h" >&5 ++ { { echo "$as_me:25534: error: Cannot find db.h" >&5 + echo "$as_me: error: Cannot find db.h" >&2;} + { (exit 1); exit 1; }; } + +@@ -25213,7 +25546,7 @@ + + # Just in case, check if the C compiler has a bool type. + +-echo "$as_me:25216: checking if we should include stdbool.h" >&5 ++echo "$as_me:25549: 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 +@@ -25221,7 +25554,7 @@ + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25224 "configure" ++#line 25557 "configure" + #include "confdefs.h" + + int +@@ -25233,23 +25566,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25236: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25569: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25239: \$? = $ac_status" >&5 ++ echo "$as_me:25572: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25242: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25575: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25245: \$? = $ac_status" >&5 ++ echo "$as_me:25578: \$? = $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 25252 "configure" ++#line 25585 "configure" + #include "confdefs.h" + + #ifndef __BEOS__ +@@ -25265,16 +25598,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25268: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25601: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25271: \$? = $ac_status" >&5 ++ echo "$as_me:25604: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25274: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25607: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25277: \$? = $ac_status" >&5 ++ echo "$as_me:25610: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_header_stdbool_h=1 + else +@@ -25288,13 +25621,13 @@ + fi + + if test "$cf_cv_header_stdbool_h" = 1 +-then echo "$as_me:25291: result: yes" >&5 ++then echo "$as_me:25624: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:25293: result: no" >&5 ++else echo "$as_me:25626: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:25297: checking for builtin bool type" >&5 ++echo "$as_me:25630: 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 +@@ -25302,7 +25635,7 @@ + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25305 "configure" ++#line 25638 "configure" + #include "confdefs.h" + + #include +@@ -25317,16 +25650,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25320: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25653: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25323: \$? = $ac_status" >&5 ++ echo "$as_me:25656: \$? = $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:25659: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25329: \$? = $ac_status" >&5 ++ echo "$as_me:25662: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cc_bool_type=1 + else +@@ -25339,9 +25672,9 @@ + fi + + if test "$cf_cv_cc_bool_type" = 1 +-then echo "$as_me:25342: result: yes" >&5 ++then echo "$as_me:25675: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:25344: result: no" >&5 ++else echo "$as_me:25677: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -25358,10 +25691,10 @@ + + cf_save="$LIBS" + LIBS="$LIBS $CXXLIBS" +- echo "$as_me:25361: checking if we already have C++ library" >&5 ++ echo "$as_me:25694: 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 25364 "configure" ++#line 25697 "configure" + #include "confdefs.h" + + #include +@@ -25375,16 +25708,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:25378: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:25711: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:25381: \$? = $ac_status" >&5 ++ echo "$as_me:25714: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:25384: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25717: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25387: \$? = $ac_status" >&5 ++ echo "$as_me:25720: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_have_libstdcpp=yes + else +@@ -25393,7 +25726,7 @@ + cf_have_libstdcpp=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:25396: result: $cf_have_libstdcpp" >&5 ++ echo "$as_me:25729: result: $cf_have_libstdcpp" >&5 + echo "${ECHO_T}$cf_have_libstdcpp" >&6 + LIBS="$cf_save" + +@@ -25412,7 +25745,7 @@ + ;; + esac + +- echo "$as_me:25415: checking for library $cf_stdcpp_libname" >&5 ++ echo "$as_me:25748: 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 +@@ -25438,7 +25771,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25441 "configure" ++#line 25774 "configure" + #include "confdefs.h" + + #include +@@ -25452,16 +25785,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:25455: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:25788: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:25458: \$? = $ac_status" >&5 ++ echo "$as_me:25791: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:25461: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25794: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25464: \$? = $ac_status" >&5 ++ echo "$as_me:25797: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_libstdcpp=yes + else +@@ -25473,7 +25806,7 @@ + LIBS="$cf_save" + + fi +-echo "$as_me:25476: result: $cf_cv_libstdcpp" >&5 ++echo "$as_me:25809: result: $cf_cv_libstdcpp" >&5 + echo "${ECHO_T}$cf_cv_libstdcpp" >&6 + test "$cf_cv_libstdcpp" = yes && { + cf_add_libs="$CXXLIBS" +@@ -25495,7 +25828,7 @@ + fi + fi + +- echo "$as_me:25498: checking whether $CXX understands -c and -o together" >&5 ++ echo "$as_me:25831: 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 +@@ -25510,15 +25843,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:25513: \"$ac_try\"") >&5 ++if { (eval echo "$as_me:25846: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25516: \$? = $ac_status" >&5 ++ echo "$as_me:25849: \$? = $ac_status" >&5 + (exit "$ac_status"); } && +- test -f conftest2.$ac_objext && { (eval echo "$as_me:25518: \"$ac_try\"") >&5 ++ test -f conftest2.$ac_objext && { (eval echo "$as_me:25851: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25521: \$? = $ac_status" >&5 ++ echo "$as_me:25854: \$? = $ac_status" >&5 + (exit "$ac_status"); }; + then + eval cf_cv_prog_CXX_c_o=yes +@@ -25529,10 +25862,10 @@ + + fi + if test "$cf_cv_prog_CXX_c_o" = yes; then +- echo "$as_me:25532: result: yes" >&5 ++ echo "$as_me:25865: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:25535: result: no" >&5 ++ echo "$as_me:25868: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -25552,7 +25885,7 @@ + ;; + esac + if test "$GXX" = yes; then +- echo "$as_me:25555: checking for lib$cf_gpp_libname" >&5 ++ echo "$as_me:25888: checking for lib$cf_gpp_libname" >&5 + echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 + cf_save="$LIBS" + +@@ -25573,7 +25906,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25576 "configure" ++#line 25909 "configure" + #include "confdefs.h" + + #include <$cf_gpp_libname/builtin.h> +@@ -25587,16 +25920,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:25590: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:25923: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:25593: \$? = $ac_status" >&5 ++ echo "$as_me:25926: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:25596: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25929: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25599: \$? = $ac_status" >&5 ++ echo "$as_me:25932: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cxx_library=yes + +@@ -25633,7 +25966,7 @@ + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25636 "configure" ++#line 25969 "configure" + #include "confdefs.h" + + #include +@@ -25647,16 +25980,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:25650: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:25983: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:25653: \$? = $ac_status" >&5 ++ echo "$as_me:25986: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:25656: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25989: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25659: \$? = $ac_status" >&5 ++ echo "$as_me:25992: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cxx_library=yes + +@@ -25689,7 +26022,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save" +- echo "$as_me:25692: result: $cf_cxx_library" >&5 ++ echo "$as_me:26025: result: $cf_cxx_library" >&5 + echo "${ECHO_T}$cf_cxx_library" >&6 + fi + +@@ -25705,7 +26038,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:25708: checking how to run the C++ preprocessor" >&5 ++echo "$as_me:26041: 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 +@@ -25722,18 +26055,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 25725 "configure" ++#line 26058 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:25730: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:26063: \"$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:25736: \$? = $ac_status" >&5 ++ echo "$as_me:26069: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25756,17 +26089,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25759 "configure" ++#line 26092 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:25763: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:26096: \"$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:25769: \$? = $ac_status" >&5 ++ echo "$as_me:26102: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25803,7 +26136,7 @@ + else + ac_cv_prog_CXXCPP=$CXXCPP + fi +-echo "$as_me:25806: result: $CXXCPP" >&5 ++echo "$as_me:26139: result: $CXXCPP" >&5 + echo "${ECHO_T}$CXXCPP" >&6 + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes +@@ -25813,18 +26146,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 25816 "configure" ++#line 26149 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:25821: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:26154: \"$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:25827: \$? = $ac_status" >&5 ++ echo "$as_me:26160: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25847,17 +26180,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25850 "configure" ++#line 26183 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:25854: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:26187: \"$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:25860: \$? = $ac_status" >&5 ++ echo "$as_me:26193: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25885,7 +26218,7 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:25888: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 ++ { { echo "$as_me:26221: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -25900,23 +26233,23 @@ + for ac_header in typeinfo + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:25903: checking for $ac_header" >&5 ++echo "$as_me:26236: 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 25909 "configure" ++#line 26242 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:25913: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:26246: \"$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:25919: \$? = $ac_status" >&5 ++ echo "$as_me:26252: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25935,7 +26268,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:25938: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:26271: 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:26284: 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 25957 "configure" ++#line 26290 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:25961: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:26294: \"$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:25967: \$? = $ac_status" >&5 ++ echo "$as_me:26300: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25983,7 +26316,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:25986: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:26319: 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:26330: 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 26000 "configure" ++#line 26333 "configure" + #include "confdefs.h" + + #include +@@ -26014,16 +26347,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26017: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26350: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26020: \$? = $ac_status" >&5 ++ echo "$as_me:26353: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26023: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26356: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26026: \$? = $ac_status" >&5 ++ echo "$as_me:26359: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_iostream_namespace=yes + else +@@ -26032,7 +26365,7 @@ + cf_iostream_namespace=no + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:26035: result: $cf_iostream_namespace" >&5 ++ echo "$as_me:26368: result: $cf_iostream_namespace" >&5 + echo "${ECHO_T}$cf_iostream_namespace" >&6 + if test "$cf_iostream_namespace" = yes ; then + +@@ -26043,7 +26376,7 @@ + fi + fi + +-echo "$as_me:26046: checking if we should include stdbool.h" >&5 ++echo "$as_me:26379: 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 +@@ -26051,7 +26384,7 @@ + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26054 "configure" ++#line 26387 "configure" + #include "confdefs.h" + + int +@@ -26063,23 +26396,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26066: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26399: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26069: \$? = $ac_status" >&5 ++ echo "$as_me:26402: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26072: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26405: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26075: \$? = $ac_status" >&5 ++ echo "$as_me:26408: \$? = $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 26082 "configure" ++#line 26415 "configure" + #include "confdefs.h" + + #ifndef __BEOS__ +@@ -26095,16 +26428,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26098: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26431: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26101: \$? = $ac_status" >&5 ++ echo "$as_me:26434: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26104: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26437: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26107: \$? = $ac_status" >&5 ++ echo "$as_me:26440: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_header_stdbool_h=1 + else +@@ -26118,13 +26451,13 @@ + fi + + if test "$cf_cv_header_stdbool_h" = 1 +-then echo "$as_me:26121: result: yes" >&5 ++then echo "$as_me:26454: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:26123: result: no" >&5 ++else echo "$as_me:26456: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:26127: checking for builtin bool type" >&5 ++echo "$as_me:26460: 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 +@@ -26132,7 +26465,7 @@ + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26135 "configure" ++#line 26468 "configure" + #include "confdefs.h" + + #include +@@ -26147,16 +26480,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26150: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26483: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26153: \$? = $ac_status" >&5 ++ echo "$as_me:26486: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26156: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26489: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26159: \$? = $ac_status" >&5 ++ echo "$as_me:26492: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_builtin_bool=1 + else +@@ -26169,19 +26502,19 @@ + fi + + if test "$cf_cv_builtin_bool" = 1 +-then echo "$as_me:26172: result: yes" >&5 ++then echo "$as_me:26505: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:26174: result: no" >&5 ++else echo "$as_me:26507: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:26178: checking for bool" >&5 ++echo "$as_me:26511: 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 26184 "configure" ++#line 26517 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -26216,16 +26549,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26219: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26552: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26222: \$? = $ac_status" >&5 ++ echo "$as_me:26555: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26225: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26558: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26228: \$? = $ac_status" >&5 ++ echo "$as_me:26561: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_bool=yes + else +@@ -26235,10 +26568,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:26238: result: $ac_cv_type_bool" >&5 ++echo "$as_me:26571: result: $ac_cv_type_bool" >&5 + echo "${ECHO_T}$ac_cv_type_bool" >&6 + +-echo "$as_me:26241: checking size of bool" >&5 ++echo "$as_me:26574: 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 +@@ -26247,7 +26580,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26250 "configure" ++#line 26583 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -26279,21 +26612,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26282: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26615: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26285: \$? = $ac_status" >&5 ++ echo "$as_me:26618: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26288: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26621: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26291: \$? = $ac_status" >&5 ++ echo "$as_me:26624: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26296 "configure" ++#line 26629 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -26325,16 +26658,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26328: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26661: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26331: \$? = $ac_status" >&5 ++ echo "$as_me:26664: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26334: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26667: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26337: \$? = $ac_status" >&5 ++ echo "$as_me:26670: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -26350,7 +26683,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26353 "configure" ++#line 26686 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -26382,16 +26715,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26385: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26718: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26388: \$? = $ac_status" >&5 ++ echo "$as_me:26721: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26391: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26724: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26394: \$? = $ac_status" >&5 ++ echo "$as_me:26727: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -26407,7 +26740,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 26410 "configure" ++#line 26743 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -26439,16 +26772,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26442: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26775: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26445: \$? = $ac_status" >&5 ++ echo "$as_me:26778: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26448: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26781: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26451: \$? = $ac_status" >&5 ++ echo "$as_me:26784: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -26461,12 +26794,12 @@ + ac_cv_sizeof_bool=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:26464: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:26797: 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 26469 "configure" ++#line 26802 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -26502,15 +26835,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:26505: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26838: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26508: \$? = $ac_status" >&5 ++ echo "$as_me:26841: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:26510: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26843: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26513: \$? = $ac_status" >&5 ++ echo "$as_me:26846: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_bool=`cat conftest.val` + else +@@ -26526,13 +26859,13 @@ + ac_cv_sizeof_bool=0 + fi + fi +-echo "$as_me:26529: result: $ac_cv_sizeof_bool" >&5 ++echo "$as_me:26862: result: $ac_cv_sizeof_bool" >&5 + echo "${ECHO_T}$ac_cv_sizeof_bool" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:26868: 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 +@@ -26551,7 +26884,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26554 "configure" ++#line 26887 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -26592,15 +26925,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:26595: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26928: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26598: \$? = $ac_status" >&5 ++ echo "$as_me:26931: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:26600: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26933: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26603: \$? = $ac_status" >&5 ++ echo "$as_me:26936: \$? = $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 +@@ -26617,19 +26950,19 @@ + rm -f cf_test.out + + fi +-echo "$as_me:26620: result: $cf_cv_type_of_bool" >&5 ++echo "$as_me:26953: 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:26627: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 ++ { echo "$as_me:26960: 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:26632: checking for special defines needed for etip.h" >&5 ++echo "$as_me:26965: 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" +@@ -26647,7 +26980,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 26650 "configure" ++#line 26983 "configure" + #include "confdefs.h" + + #include +@@ -26661,16 +26994,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26664: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26997: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26667: \$? = $ac_status" >&5 ++ echo "$as_me:27000: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26670: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27003: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26673: \$? = $ac_status" >&5 ++ echo "$as_me:27006: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + test -n "$cf_math" && cat >>confdefs.h <&5 ++echo "$as_me:27027: result: ${cf_result:-(none)}" >&5 + echo "${ECHO_T}${cf_result:-(none)}" >&6 + CXXFLAGS="$cf_save_CXXFLAGS" + + if test -n "$CXX"; then +-echo "$as_me:26699: checking if $CXX accepts override keyword" >&5 ++echo "$as_me:27032: checking if $CXX accepts override keyword" >&5 + echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6 + if test "${cf_cv_cpp_override+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26713,7 +27046,7 @@ + cf_cv_cpp_override=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26716 "configure" ++#line 27049 "configure" + #include "confdefs.h" + + class base +@@ -26732,15 +27065,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:26735: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:27068: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26738: \$? = $ac_status" >&5 ++ echo "$as_me:27071: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:26740: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27073: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26743: \$? = $ac_status" >&5 ++ echo "$as_me:27076: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cpp_override=yes + else +@@ -26759,7 +27092,7 @@ + ac_main_return="return" + + fi +-echo "$as_me:26762: result: $cf_cv_cpp_override" >&5 ++echo "$as_me:27095: result: $cf_cv_cpp_override" >&5 + echo "${ECHO_T}$cf_cv_cpp_override" >&6 + fi + test "$cf_cv_cpp_override" = yes && +@@ -26768,7 +27101,7 @@ + EOF + + if test -n "$CXX"; then +-echo "$as_me:26771: checking if $CXX accepts parameter initialization" >&5 ++echo "$as_me:27104: 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 +@@ -26785,7 +27118,7 @@ + cf_cv_cpp_param_init=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26788 "configure" ++#line 27121 "configure" + #include "confdefs.h" + + class TEST { +@@ -26804,15 +27137,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:26807: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:27140: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26810: \$? = $ac_status" >&5 ++ echo "$as_me:27143: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:26812: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27145: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26815: \$? = $ac_status" >&5 ++ echo "$as_me:27148: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cpp_param_init=yes + else +@@ -26831,7 +27164,7 @@ + ac_main_return="return" + + fi +-echo "$as_me:26834: result: $cf_cv_cpp_param_init" >&5 ++echo "$as_me:27167: result: $cf_cv_cpp_param_init" >&5 + echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 + fi + test "$cf_cv_cpp_param_init" = yes && +@@ -26841,7 +27174,7 @@ + + if test -n "$CXX"; then + +-echo "$as_me:26844: checking if $CXX accepts static_cast" >&5 ++echo "$as_me:27177: 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 +@@ -26855,7 +27188,7 @@ + ac_main_return="return" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26858 "configure" ++#line 27191 "configure" + #include "confdefs.h" + + class NCursesPanel +@@ -26899,16 +27232,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26902: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27235: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26905: \$? = $ac_status" >&5 ++ echo "$as_me:27238: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26908: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27241: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26911: \$? = $ac_status" >&5 ++ echo "$as_me:27244: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cpp_static_cast=yes + else +@@ -26926,7 +27259,7 @@ + ac_main_return="return" + + fi +-echo "$as_me:26929: result: $cf_cv_cpp_static_cast" >&5 ++echo "$as_me:27262: result: $cf_cv_cpp_static_cast" >&5 + echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 + + fi +@@ -26975,13 +27308,13 @@ + else + if test "$cf_cv_header_stdbool_h" = 1 ; then + +-echo "$as_me:26978: checking for bool" >&5 ++echo "$as_me:27311: 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 26984 "configure" ++#line 27317 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -27016,16 +27349,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27019: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27352: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27022: \$? = $ac_status" >&5 ++ echo "$as_me:27355: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27025: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27358: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27028: \$? = $ac_status" >&5 ++ echo "$as_me:27361: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_bool=yes + else +@@ -27035,10 +27368,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:27038: result: $ac_cv_type_bool" >&5 ++echo "$as_me:27371: result: $ac_cv_type_bool" >&5 + echo "${ECHO_T}$ac_cv_type_bool" >&6 + +-echo "$as_me:27041: checking size of bool" >&5 ++echo "$as_me:27374: 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 +@@ -27047,7 +27380,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27050 "configure" ++#line 27383 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -27079,21 +27412,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27082: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27415: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27085: \$? = $ac_status" >&5 ++ echo "$as_me:27418: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27088: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27421: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27091: \$? = $ac_status" >&5 ++ echo "$as_me:27424: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27096 "configure" ++#line 27429 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -27125,16 +27458,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27128: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27461: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27131: \$? = $ac_status" >&5 ++ echo "$as_me:27464: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27134: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27467: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27137: \$? = $ac_status" >&5 ++ echo "$as_me:27470: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -27150,7 +27483,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27153 "configure" ++#line 27486 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -27182,16 +27515,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27185: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27518: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27188: \$? = $ac_status" >&5 ++ echo "$as_me:27521: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27191: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27524: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27194: \$? = $ac_status" >&5 ++ echo "$as_me:27527: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -27207,7 +27540,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 27210 "configure" ++#line 27543 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -27239,16 +27572,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27242: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27575: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27245: \$? = $ac_status" >&5 ++ echo "$as_me:27578: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27248: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27581: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27251: \$? = $ac_status" >&5 ++ echo "$as_me:27584: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -27261,12 +27594,12 @@ + ac_cv_sizeof_bool=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:27264: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:27597: 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 27269 "configure" ++#line 27602 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -27302,15 +27635,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:27305: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:27638: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:27308: \$? = $ac_status" >&5 ++ echo "$as_me:27641: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:27310: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27643: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27313: \$? = $ac_status" >&5 ++ echo "$as_me:27646: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_bool=`cat conftest.val` + else +@@ -27326,13 +27659,13 @@ + ac_cv_sizeof_bool=0 + fi + fi +-echo "$as_me:27329: result: $ac_cv_sizeof_bool" >&5 ++echo "$as_me:27662: result: $ac_cv_sizeof_bool" >&5 + echo "${ECHO_T}$ac_cv_sizeof_bool" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:27668: 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 +@@ -27351,7 +27684,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27354 "configure" ++#line 27687 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -27392,15 +27725,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:27395: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:27728: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:27398: \$? = $ac_status" >&5 ++ echo "$as_me:27731: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:27400: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27733: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27403: \$? = $ac_status" >&5 ++ echo "$as_me:27736: \$? = $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 +@@ -27417,26 +27750,26 @@ + rm -f cf_test.out + + fi +-echo "$as_me:27420: result: $cf_cv_type_of_bool" >&5 ++echo "$as_me:27753: 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:27427: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 ++ { echo "$as_me:27760: 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:27433: checking for fallback type of bool" >&5 ++ echo "$as_me:27766: 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:27439: result: $cf_cv_type_of_bool" >&5 ++ echo "$as_me:27772: result: $cf_cv_type_of_bool" >&5 + echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + fi + fi +@@ -27465,246 +27798,18 @@ + + if test "$cf_with_ada" != "no" ; then + if test "$with_libtool" != "no"; then +- { echo "$as_me:27468: WARNING: libtool does not support Ada - disabling feature" >&5 ++ { echo "$as_me:27801: 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 + fi + + if test "$cf_with_ada" != "no" ; then +- +-for cf_prog_gnat in gnat gnatmake gprconfig gprbuild +-do +- +-cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +- +- unset ac_cv_path_cf_TEMP_gnat +- 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:27485: 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 +-else +- case $cf_TEMP_gnat in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_cf_TEMP_gnat="$cf_TEMP_gnat" # Let the user override the test with a path. +- ;; +- *) +- ac_save_IFS=$IFS; IFS=$ac_path_separator +-ac_dummy="$PATH" +-for ac_dir in $ac_dummy; do +- IFS=$ac_save_IFS +- test -z "$ac_dir" && ac_dir=. +- if $as_executable_p "$ac_dir/$ac_word"; then +- ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" +- echo "$as_me:27502: found $ac_dir/$ac_word" >&5 +- break +-fi +-done +- +- test -z "$ac_cv_path_cf_TEMP_gnat" && ac_cv_path_cf_TEMP_gnat="no" +- ;; +-esac +-fi +-cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat +- +-if test -n "$cf_TEMP_gnat"; then +- echo "$as_me:27514: result: $cf_TEMP_gnat" >&5 +-echo "${ECHO_T}$cf_TEMP_gnat" >&6 +-else +- echo "$as_me:27517: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- eval "cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat" +- +- if test "x$cf_TEMP_gnat" != xno; then +- unset cf_cv_gnat_version +- unset cf_TEMP_gnat +- +-echo "$as_me:27527: 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 +-else +- +-cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \ +- grep '[0-9].[0-9][0-9]*' |\ +- sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` +- +-fi +-echo "$as_me:27538: 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 +- +- fi +- eval "cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat" +- +- unset cf_TEMP_gnat +- unset cf_cv_gnat_version +- unset ac_cv_path_cf_TEMP_gnat +-done +- +-if test "x$cf_cv_VERSION_GNATMAKE" = "xno"; then +- cf_ada_make= +- cf_cv_prog_gnat_correct=no +-else +- cf_ada_make=gnatmake +- if test "x$cf_cv_VERSION_GPRCONFIG" = "xno"; then +- # gprconfig is newer than gnatmake; we can continue... +- cf_ada_config="##" +- else +- rm -rf ./conftest* ./*~conftest* +- if mkdir conftest.src +- then +- cf_ada_config="" +- cd conftest.src +- for cf_gprconfig in Ada C +- do +- echo "$as_me:27567: 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 +- for cf_gprconfig_param in \ +- "$cf_gprconfig,,,,GNATGCC" \ +- "$cf_gprconfig,,,,GCC" \ +- "$cf_gprconfig" +- do +- cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` +- test -n "$cf_gprconfig_value" && break +- done +- else +- cf_gprconfig_param=$cf_gprconfig +- cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` +- fi +- if test -n "$cf_gprconfig_value" +- then +- eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" +- echo "$as_me:27586: result: $cf_gprconfig_value" >&5 +-echo "${ECHO_T}$cf_gprconfig_value" >&6 +- else +- echo "$as_me:27589: result: missing" >&5 +-echo "${ECHO_T}missing" >&6 +- cf_ada_config="#" +- break +- fi +- done +- cd .. +- rm -rf ./conftest* ./*~conftest* +- fi +- fi +- if test "x$cf_ada_config" != "x#" +- then +- +-echo "$as_me:27602: 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 +-else +- +-cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \ +- grep '[0-9].[0-9][0-9]*' |\ +- sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` +- +-fi +-echo "$as_me:27613: 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 +- +-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]) +- cf_cv_prog_gnat_correct=yes +- ;; +-(*) +- { echo "$as_me:27622: 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 +- ;; +-esac +- +- # Extract the first word of "m4", so it can be a program name with args. +-set dummy m4; ac_word=$2 +-echo "$as_me:27630: 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 +-else +- if test -n "$M4_exists"; then +- ac_cv_prog_M4_exists="$M4_exists" # Let the user override the test. +-else +- ac_save_IFS=$IFS; IFS=$ac_path_separator +-ac_dummy="$PATH" +-for ac_dir in $ac_dummy; do +- IFS=$ac_save_IFS +- test -z "$ac_dir" && ac_dir=. +- $as_executable_p "$ac_dir/$ac_word" || continue +-ac_cv_prog_M4_exists="yes" +-echo "$as_me:27645: found $ac_dir/$ac_word" >&5 +-break +-done +- +- test -z "$ac_cv_prog_M4_exists" && ac_cv_prog_M4_exists="no" +-fi +-fi +-M4_exists=$ac_cv_prog_M4_exists +-if test -n "$M4_exists"; then +- echo "$as_me:27654: result: $M4_exists" >&5 +-echo "${ECHO_T}$M4_exists" >&6 +-else +- echo "$as_me:27657: 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:27663: 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:27667: checking if GNAT works" >&5 +-echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 +- +-rm -rf ./conftest* ./*~conftest* +-cat >>conftest.ads <>conftest.adb <&5 2>&1 ) ; then +- if ( ./conftest 1>&5 2>&1 ) ; then +- cf_cv_prog_gnat_correct=yes +- else +- cf_cv_prog_gnat_correct=no +- fi +-else +- cf_cv_prog_gnat_correct=no +-fi +-rm -rf ./conftest* ./*~conftest* +- +- echo "$as_me:27695: result: $cf_cv_prog_gnat_correct" >&5 +-echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 +- fi +- else +- cf_cv_prog_gnat_correct=no +- fi +-fi +- + if test "x$cf_cv_prog_gnat_correct" = xyes; then + + ADAFLAGS="$ADAFLAGS -gnatpn" + +- echo "$as_me:27707: checking optimization options for ADAFLAGS" >&5 ++ echo "$as_me:27812: checking optimization options for ADAFLAGS" >&5 + echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 + case "$CFLAGS" in + (*-g*) +@@ -27721,10 +27826,10 @@ + + ;; + esac +- echo "$as_me:27724: result: $ADAFLAGS" >&5 ++ echo "$as_me:27829: result: $ADAFLAGS" >&5 + echo "${ECHO_T}$ADAFLAGS" >&6 + +-echo "$as_me:27727: checking if GNATPREP supports -T option" >&5 ++echo "$as_me:27832: 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 +@@ -27734,11 +27839,11 @@ + gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes + + fi +-echo "$as_me:27737: result: $cf_cv_gnatprep_opt_t" >&5 ++echo "$as_me:27842: 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:27741: checking if GNAT supports generics" >&5 ++echo "$as_me:27846: 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]) +@@ -27748,7 +27853,7 @@ + cf_gnat_generics=no + ;; + esac +-echo "$as_me:27751: result: $cf_gnat_generics" >&5 ++echo "$as_me:27856: result: $cf_gnat_generics" >&5 + echo "${ECHO_T}$cf_gnat_generics" >&6 + + if test "$cf_gnat_generics" = yes +@@ -27760,7 +27865,7 @@ + cf_generic_objects= + fi + +-echo "$as_me:27763: checking if GNAT supports SIGINT" >&5 ++echo "$as_me:27868: 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 +@@ -27808,7 +27913,7 @@ + rm -rf ./conftest* ./*~conftest* + + fi +-echo "$as_me:27811: result: $cf_cv_gnat_sigint" >&5 ++echo "$as_me:27916: result: $cf_cv_gnat_sigint" >&5 + echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 + + if test "$cf_cv_gnat_sigint" = yes ; then +@@ -27821,7 +27926,7 @@ + cf_gnat_projects=no + + if test "$enable_gnat_projects" != no ; then +-echo "$as_me:27824: checking if GNAT supports project files" >&5 ++echo "$as_me:27929: 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]*) +@@ -27884,15 +27989,15 @@ + esac + ;; + esac +-echo "$as_me:27887: result: $cf_gnat_projects" >&5 ++echo "$as_me:27992: 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:27893: checking if GNAT supports libraries" >&5 ++ echo "$as_me:27998: checking if GNAT supports libraries" >&5 + echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 +- echo "$as_me:27895: result: $cf_gnat_libraries" >&5 ++ echo "$as_me:28000: result: $cf_gnat_libraries" >&5 + echo "${ECHO_T}$cf_gnat_libraries" >&6 + fi + +@@ -27912,7 +28017,7 @@ + then + USE_GNAT_MAKE_GPR="" + else +- { echo "$as_me:27915: WARNING: use old makefile rules since tools are missing" >&5 ++ { echo "$as_me:28020: 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 +@@ -27924,7 +28029,7 @@ + USE_GNAT_LIBRARIES="#" + fi + +-echo "$as_me:27927: checking for Ada95 compiler" >&5 ++echo "$as_me:28032: checking for Ada95 compiler" >&5 + echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6 + + # Check whether --with-ada-compiler or --without-ada-compiler was given. +@@ -27935,12 +28040,12 @@ + cf_ada_compiler=gnatmake + fi; + +-echo "$as_me:27938: result: $cf_ada_compiler" >&5 ++echo "$as_me:28043: result: $cf_ada_compiler" >&5 + echo "${ECHO_T}$cf_ada_compiler" >&6 + + cf_ada_package=terminal_interface + +-echo "$as_me:27943: checking for Ada95 include directory" >&5 ++echo "$as_me:28048: checking for Ada95 include directory" >&5 + echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6 + + # Check whether --with-ada-include or --without-ada-include was given. +@@ -27976,7 +28081,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:27979: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:28084: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -27985,10 +28090,10 @@ + fi + eval ADA_INCLUDE="$withval" + +-echo "$as_me:27988: result: $ADA_INCLUDE" >&5 ++echo "$as_me:28093: result: $ADA_INCLUDE" >&5 + echo "${ECHO_T}$ADA_INCLUDE" >&6 + +-echo "$as_me:27991: checking for Ada95 object directory" >&5 ++echo "$as_me:28096: checking for Ada95 object directory" >&5 + echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6 + + # Check whether --with-ada-objects or --without-ada-objects was given. +@@ -28024,7 +28129,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:28027: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:28132: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -28033,10 +28138,10 @@ + fi + eval ADA_OBJECTS="$withval" + +-echo "$as_me:28036: result: $ADA_OBJECTS" >&5 ++echo "$as_me:28141: result: $ADA_OBJECTS" >&5 + echo "${ECHO_T}$ADA_OBJECTS" >&6 + +-echo "$as_me:28039: checking whether to build an Ada95 shared library" >&5 ++echo "$as_me:28144: checking whether to build an Ada95 shared library" >&5 + echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6 + + # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. +@@ -28057,11 +28162,11 @@ + fi + fi + +-echo "$as_me:28060: result: $with_ada_sharedlib" >&5 ++echo "$as_me:28165: result: $with_ada_sharedlib" >&5 + echo "${ECHO_T}$with_ada_sharedlib" >&6 + if test "x$cf_ada_sharedlib_warn" != xno + then +- { echo "$as_me:28064: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5 ++ { echo "$as_me:28169: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5 + echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;} + fi + +@@ -28079,7 +28184,7 @@ + + # allow the Ada binding to be renamed + +-echo "$as_me:28082: checking for Ada95 curses library name" >&5 ++echo "$as_me:28187: checking for Ada95 curses library name" >&5 + echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6 + + # Check whether --with-ada-libname or --without-ada-libname was given. +@@ -28095,7 +28200,7 @@ + ;; + esac + +-echo "$as_me:28098: result: $ADA_LIBNAME" >&5 ++echo "$as_me:28203: result: $ADA_LIBNAME" >&5 + echo "${ECHO_T}$ADA_LIBNAME" >&6 + + fi +@@ -28106,13 +28211,13 @@ + + # do this "late" to avoid conflict with header-checks + if test "x$with_widec" = xyes ; then +- echo "$as_me:28109: checking for wchar_t" >&5 ++ echo "$as_me:28214: 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 28115 "configure" ++#line 28220 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -28127,16 +28232,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:28130: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:28235: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28133: \$? = $ac_status" >&5 ++ echo "$as_me:28238: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:28136: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28241: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28139: \$? = $ac_status" >&5 ++ echo "$as_me:28244: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_wchar_t=yes + else +@@ -28146,10 +28251,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:28149: result: $ac_cv_type_wchar_t" >&5 ++echo "$as_me:28254: result: $ac_cv_type_wchar_t" >&5 + echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 + +-echo "$as_me:28152: checking size of wchar_t" >&5 ++echo "$as_me:28257: 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 +@@ -28158,7 +28263,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 28161 "configure" ++#line 28266 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -28170,21 +28275,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:28173: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:28278: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28176: \$? = $ac_status" >&5 ++ echo "$as_me:28281: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:28179: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28284: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28182: \$? = $ac_status" >&5 ++ echo "$as_me:28287: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 28187 "configure" ++#line 28292 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -28196,16 +28301,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:28199: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:28304: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28202: \$? = $ac_status" >&5 ++ echo "$as_me:28307: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:28205: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28310: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28208: \$? = $ac_status" >&5 ++ echo "$as_me:28313: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -28221,7 +28326,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 28224 "configure" ++#line 28329 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -28233,16 +28338,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:28236: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:28341: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28239: \$? = $ac_status" >&5 ++ echo "$as_me:28344: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:28242: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28347: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28245: \$? = $ac_status" >&5 ++ echo "$as_me:28350: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -28258,7 +28363,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 28261 "configure" ++#line 28366 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -28270,16 +28375,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:28273: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:28378: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28276: \$? = $ac_status" >&5 ++ echo "$as_me:28381: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:28279: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28384: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28282: \$? = $ac_status" >&5 ++ echo "$as_me:28387: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -28292,12 +28397,12 @@ + ac_cv_sizeof_wchar_t=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:28295: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:28400: 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 28300 "configure" ++#line 28405 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -28313,15 +28418,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:28316: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:28421: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:28319: \$? = $ac_status" >&5 ++ echo "$as_me:28424: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:28321: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28426: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28324: \$? = $ac_status" >&5 ++ echo "$as_me:28429: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_wchar_t=`cat conftest.val` + else +@@ -28337,7 +28442,7 @@ + ac_cv_sizeof_wchar_t=0 + fi + fi +-echo "$as_me:28340: result: $ac_cv_sizeof_wchar_t" >&5 ++echo "$as_me:28445: result: $ac_cv_sizeof_wchar_t" >&5 + echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 + cat >>confdefs.h <&6 + +-echo "${as_me:-configure}:28353: testing test failed (assume 2) ..." 1>&5 ++echo "${as_me:-configure}:28458: testing test failed (assume 2) ..." 1>&5 + + sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp + mv confdefs.tmp confdefs.h +@@ -28368,7 +28473,7 @@ + ### chooses to split module lists into libraries. + ### + ### (see CF_LIB_RULES). +-echo "$as_me:28371: checking for library subsets" >&5 ++echo "$as_me:28476: checking for library subsets" >&5 + echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 + LIB_SUBSETS= + +@@ -28422,7 +28527,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:28425: result: $LIB_SUBSETS" >&5 ++echo "$as_me:28530: result: $LIB_SUBSETS" >&5 + echo "${ECHO_T}$LIB_SUBSETS" >&6 + + ### Construct the list of include-directories to be generated +@@ -28453,7 +28558,7 @@ + fi + + ### Build up pieces for makefile rules +-echo "$as_me:28456: checking default library suffix" >&5 ++echo "$as_me:28561: checking default library suffix" >&5 + echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -28464,10 +28569,10 @@ + (shared) DFT_ARG_SUFFIX='' ;; + esac + test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" +-echo "$as_me:28467: result: $DFT_ARG_SUFFIX" >&5 ++echo "$as_me:28572: result: $DFT_ARG_SUFFIX" >&5 + echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 + +-echo "$as_me:28470: checking default library-dependency suffix" >&5 ++echo "$as_me:28575: checking default library-dependency suffix" >&5 + echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 + + case X$DFT_LWR_MODEL in +@@ -28550,10 +28655,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:28553: result: $DFT_DEP_SUFFIX" >&5 ++echo "$as_me:28658: result: $DFT_DEP_SUFFIX" >&5 + echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 + +-echo "$as_me:28556: checking default object directory" >&5 ++echo "$as_me:28661: checking default object directory" >&5 + echo $ECHO_N "checking default object directory... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -28569,11 +28674,11 @@ + DFT_OBJ_SUBDIR='obj_s' ;; + esac + esac +-echo "$as_me:28572: result: $DFT_OBJ_SUBDIR" >&5 ++echo "$as_me:28677: result: $DFT_OBJ_SUBDIR" >&5 + echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 + + if test "x$cf_with_cxx" = xyes ; then +-echo "$as_me:28576: checking c++ library-dependency suffix" >&5 ++echo "$as_me:28681: 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++) +@@ -28666,7 +28771,7 @@ + fi + + fi +-echo "$as_me:28669: result: $CXX_LIB_SUFFIX" >&5 ++echo "$as_me:28774: result: $CXX_LIB_SUFFIX" >&5 + echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 + + fi +@@ -28842,19 +28947,19 @@ + + if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" + then +- echo "$as_me:28845: checking if linker supports switching between static/dynamic" >&5 ++ echo "$as_me:28950: 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:28854: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:28959: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28857: \$? = $ac_status" >&5 ++ echo "$as_me:28962: \$? = $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 +@@ -28865,10 +28970,10 @@ + + LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 28868 "configure" ++#line 28973 "configure" + #include "confdefs.h" + +-#line 28871 "configure" ++#line 28976 "configure" + #include + int cf_ldflags_static(FILE *fp); + +@@ -28883,16 +28988,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:28886: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:28991: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:28889: \$? = $ac_status" >&5 ++ echo "$as_me:28994: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:28892: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28997: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28895: \$? = $ac_status" >&5 ++ echo "$as_me:29000: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + # some linkers simply ignore the -dynamic +@@ -28915,7 +29020,7 @@ + rm -f libconftest.* + LIBS="$cf_save_LIBS" + +- echo "$as_me:28918: result: $cf_ldflags_static" >&5 ++ echo "$as_me:29023: result: $cf_ldflags_static" >&5 + echo "${ECHO_T}$cf_ldflags_static" >&6 + + if test "$cf_ldflags_static" != yes +@@ -28931,7 +29036,7 @@ + ;; + esac + +-echo "$as_me:28934: checking where we will install curses.h" >&5 ++echo "$as_me:29039: checking where we will install curses.h" >&5 + echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 + + includesubdir= +@@ -28941,7 +29046,7 @@ + then + includesubdir="/ncurses${USE_LIB_SUFFIX}" + fi +-echo "$as_me:28944: result: ${includedir}${includesubdir}" >&5 ++echo "$as_me:29049: result: ${includedir}${includesubdir}" >&5 + echo "${ECHO_T}${includedir}${includesubdir}" >&6 + + ### Resolve a conflict between normal and wide-curses by forcing applications +@@ -28949,7 +29054,7 @@ + if test "$with_overwrite" != no ; then + if test "$NCURSES_LIBUTF8" = 1 ; then + NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' +- { echo "$as_me:28952: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 ++ { echo "$as_me:29057: 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 +@@ -28974,7 +29079,7 @@ + + # pkgsrc uses these + +-echo "$as_me:28977: checking for desired basename for form library" >&5 ++echo "$as_me:29082: 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. +@@ -28994,10 +29099,10 @@ + ;; + esac + +-echo "$as_me:28997: result: $FORM_NAME" >&5 ++echo "$as_me:29102: result: $FORM_NAME" >&5 + echo "${ECHO_T}$FORM_NAME" >&6 + +-echo "$as_me:29000: checking for desired basename for menu library" >&5 ++echo "$as_me:29105: 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. +@@ -29017,10 +29122,10 @@ + ;; + esac + +-echo "$as_me:29020: result: $MENU_NAME" >&5 ++echo "$as_me:29125: result: $MENU_NAME" >&5 + echo "${ECHO_T}$MENU_NAME" >&6 + +-echo "$as_me:29023: checking for desired basename for panel library" >&5 ++echo "$as_me:29128: 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. +@@ -29040,10 +29145,10 @@ + ;; + esac + +-echo "$as_me:29043: result: $PANEL_NAME" >&5 ++echo "$as_me:29148: result: $PANEL_NAME" >&5 + echo "${ECHO_T}$PANEL_NAME" >&6 + +-echo "$as_me:29046: checking for desired basename for cxx library" >&5 ++echo "$as_me:29151: 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. +@@ -29063,13 +29168,13 @@ + ;; + esac + +-echo "$as_me:29066: result: $CXX_NAME" >&5 ++echo "$as_me:29171: 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:29072: checking for src modules" >&5 ++echo "$as_me:29177: checking for src modules" >&5 + echo $ECHO_N "checking for src modules... $ECHO_C" >&6 + + # dependencies and linker-arguments for test-programs +@@ -29128,7 +29233,7 @@ + fi + fi + done +-echo "$as_me:29131: result: $cf_cv_src_modules" >&5 ++echo "$as_me:29236: result: $cf_cv_src_modules" >&5 + echo "${ECHO_T}$cf_cv_src_modules" >&6 + + TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" +@@ -29289,7 +29394,7 @@ + (*-D_XOPEN_SOURCE_EXTENDED*) + test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6 + +-echo "${as_me:-configure}:29292: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 ++echo "${as_me:-configure}:29397: 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//'` +@@ -29300,7 +29405,7 @@ + + # Help to automatically enable the extended curses features when using either + # the *-config or the ".pc" files by adding defines. +-echo "$as_me:29303: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5 ++echo "$as_me:29408: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5 + echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6 + PKG_CFLAGS= + for cf_loop1 in $CPPFLAGS_after_XOPEN +@@ -29316,7 +29421,7 @@ + done + test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" + done +-echo "$as_me:29319: result: $PKG_CFLAGS" >&5 ++echo "$as_me:29424: result: $PKG_CFLAGS" >&5 + echo "${ECHO_T}$PKG_CFLAGS" >&6 + + # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. +@@ -29377,7 +29482,7 @@ + cf_filter_syms=$cf_dft_filter_syms + test -n "$verbose" && echo " will map symbols to ABI=$cf_cv_abi_default" 1>&6 + +-echo "${as_me:-configure}:29380: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5 ++echo "${as_me:-configure}:29485: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5 + + fi + +@@ -29404,7 +29509,7 @@ + + # This is used for the *-config script and *.pc data files. + +-echo "$as_me:29407: checking for linker search path" >&5 ++echo "$as_me:29512: 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 +@@ -29452,7 +29557,7 @@ + cf_pathlist="$cf_pathlist /lib /usr/lib" + ;; + (*) +- { echo "$as_me:29455: WARNING: problem with Solaris architecture" >&5 ++ { echo "$as_me:29560: WARNING: problem with Solaris architecture" >&5 + echo "$as_me: WARNING: problem with Solaris architecture" >&2;} + ;; + esac +@@ -29493,7 +29598,7 @@ + test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib + + fi +-echo "$as_me:29496: result: $cf_cv_ld_searchpath" >&5 ++echo "$as_me:29601: 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'` +@@ -29579,7 +29684,7 @@ + : "${CONFIG_STATUS=./config.status}" + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:29582: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:29687: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >"$CONFIG_STATUS" <<_ACEOF + #! $SHELL +@@ -29760,7 +29865,7 @@ + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header +- { { echo "$as_me:29763: error: ambiguous option: $1 ++ { { echo "$as_me:29868: 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;} +@@ -29779,7 +29884,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:29782: error: unrecognized option: $1 ++ -*) { { echo "$as_me:29887: 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;} +@@ -29909,7 +30014,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:29912: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:30017: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -30023,6 +30128,13 @@ + s,@target_vendor@,$target_vendor,;t t + s,@target_os@,$target_os,;t t + s,@FGREP@,$FGREP,;t t ++s,@cf_TEMP_gnat@,$cf_TEMP_gnat,;t t ++s,@M4_exists@,$M4_exists,;t t ++s,@cf_ada_make@,$cf_ada_make,;t t ++s,@cf_ada_config@,$cf_ada_config,;t t ++s,@cf_ada_config_Ada@,$cf_ada_config_Ada,;t t ++s,@cf_ada_config_C@,$cf_ada_config_C,;t t ++s,@cf_cv_path_gnatgcc@,$cf_cv_path_gnatgcc,;t t + s,@CC@,$CC,;t t + s,@CFLAGS@,$CFLAGS,;t t + s,@LDFLAGS@,$LDFLAGS,;t t +@@ -30221,12 +30333,6 @@ + s,@CXX_ARFLAGS@,$CXX_ARFLAGS,;t t + s,@CXXLIBS@,$CXXLIBS,;t t + s,@USE_CXX_BOOL@,$USE_CXX_BOOL,;t t +-s,@cf_TEMP_gnat@,$cf_TEMP_gnat,;t t +-s,@M4_exists@,$M4_exists,;t t +-s,@cf_ada_make@,$cf_ada_make,;t t +-s,@cf_ada_config@,$cf_ada_config,;t t +-s,@cf_ada_config_Ada@,$cf_ada_config_Ada,;t t +-s,@cf_ada_config_C@,$cf_ada_config_C,;t t + s,@GNATPREP_OPTS@,$GNATPREP_OPTS,;t t + s,@cf_compile_generics@,$cf_compile_generics,;t t + s,@cf_generic_objects@,$cf_generic_objects,;t t +@@ -30430,7 +30536,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:30433: creating $ac_file" >&5 ++ { echo "$as_me:30539: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -30448,7 +30554,7 @@ + -) echo "$tmp"/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:30451: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:30557: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo "$f";; +@@ -30461,7 +30567,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:30464: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:30570: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -30477,7 +30583,7 @@ + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' "$ac_item"` + if test -z "$ac_used"; then +- { echo "$as_me:30480: WARNING: datarootdir was used implicitly but not set: ++ { echo "$as_me:30586: 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;} +@@ -30486,7 +30592,7 @@ + fi + ac_seen=`grep '${datarootdir}' "$ac_item"` + if test -n "$ac_seen"; then +- { echo "$as_me:30489: WARNING: datarootdir was used explicitly but not set: ++ { echo "$as_me:30595: 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;} +@@ -30531,7 +30637,7 @@ + ac_init=`$EGREP '[ ]*'$ac_name'[ ]*=' "$ac_file"` + if test -z "$ac_init"; then + ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'` +- { echo "$as_me:30534: WARNING: Variable $ac_name is used but was not set: ++ { echo "$as_me:30640: 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;} +@@ -30542,7 +30648,7 @@ + $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:30545: WARNING: Some variables may not be substituted: ++ { echo "$as_me:30651: WARNING: Some variables may not be substituted: + $ac_seen" >&5 + echo "$as_me: WARNING: Some variables may not be substituted: + $ac_seen" >&2;} +@@ -30591,7 +30697,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:30594: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:30700: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -30602,7 +30708,7 @@ + -) echo "$tmp"/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:30605: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:30711: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -30615,7 +30721,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:30618: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:30724: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -30673,7 +30779,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:30676: $ac_file is unchanged" >&5 ++ { echo "$as_me:30782: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +@@ -31060,7 +31166,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}:31063: testing overriding CXX_MODEL to SHARED ..." 1>&5 ++echo "${as_me:-configure}:31169: testing overriding CXX_MODEL to SHARED ..." 1>&5 + + with_shared_cxx=yes + ;; +Index: configure.in +Prereq: 1.779 +--- ncurses-6.5-20240511+/configure.in 2024-04-10 08:04:00.000000000 +0000 ++++ ncurses-6.5-20240518/configure.in 2024-05-18 19:42:53.000000000 +0000 +@@ -29,7 +29,7 @@ + dnl + dnl Author: Thomas E. Dickey 1995-on + dnl +-dnl $Id: configure.in,v 1.779 2024/04/10 08:04:00 tom Exp $ ++dnl $Id: configure.in,v 1.781 2024/05/18 19:42:53 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.779 $) ++AC_REVISION($Revision: 1.781 $) + AC_INIT(ncurses/base/lib_initscr.c) + AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) + +@@ -65,19 +65,7 @@ + CF_WITH_ABI_ALTERED + + ### Checks for programs. +-AC_ARG_WITH(ada, +- [ --without-ada suppress check for Ada compiler, don't build demo], +- [cf_with_ada=$withval], +- [cf_with_ada=yes]) +- +-if test "x$cf_with_ada" = xyes +-then +- cf_prog_cc="gnatgcc gcc cc" +-else +- cf_prog_cc="gcc cc" +-fi +-CF_PROG_CC($cf_prog_cc) +- ++CF_WITH_ADA + AC_PROG_CPP + AC_PROG_GCC_TRADITIONAL + CF_PROG_CC_C_O(CC,[$CFLAGS $CPPFLAGS]) +@@ -1721,7 +1709,7 @@ + if test "x$cf_with_trace" = xyes ; then + LIB_TRACING=all + ADA_TRACE=TRUE +- CF_ADD_CFLAGS(-DTRACE) ++ AC_DEFINE(TRACE,1,[Define to 1 if we have support trace functions]) + AC_DEFINE(HAVE__TRACEF,1,[Define to 1 if we have _tracef function]) + else + LIB_TRACING=DEBUG +@@ -2019,7 +2007,6 @@ + dnl Check for availability of GNU Ada Translator (GNAT). + dnl At the moment we support no other Ada compiler. + if test "$cf_with_ada" != "no" ; then +- CF_PROG_GNAT + if test "x$cf_cv_prog_gnat_correct" = xyes; then + CF_ADD_ADAFLAGS(-gnatpn) + CF_FIXUP_ADAFLAGS +Index: dist.mk +Prereq: 1.1612 +--- ncurses-6.5-20240511+/dist.mk 2024-05-11 10:20:08.000000000 +0000 ++++ ncurses-6.5-20240518/dist.mk 2024-05-18 10:54:27.000000000 +0000 +@@ -26,7 +26,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1612 2024/05/11 10:20:08 tom Exp $ ++# $Id: dist.mk,v 1.1613 2024/05/18 10:54:27 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 = 5 +-NCURSES_PATCH = 20240511 ++NCURSES_PATCH = 20240518 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: doc/html/man/curs_beep.3x.html +--- ncurses-6.5-20240511+/doc/html/man/curs_beep.3x.html 2024-04-27 18:38:46.000000000 +0000 ++++ ncurses-6.5-20240518/doc/html/man/curs_beep.3x.html 2024-05-18 20:27:54.000000000 +0000 +@@ -27,19 +27,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_beep.3x,v 1.29 2024/04/20 21:20:07 tom Exp @ ++ * @Id: curs_beep.3x,v 1.31 2024/05/18 20:06:33 tom Exp @ + --> + + + + + +-curs_beep 3x 2024-04-20 ncurses 6.5 Library calls ++curs_beep 3x 2024-05-18 ncurses 6.5 Library calls + + + + +-

                                                          curs_beep 3x 2024-04-20 ncurses 6.5 Library calls

                                                          ++

                                                          curs_beep 3x 2024-05-18 ncurses 6.5 Library calls

                                                          + 
                                                          + curs_beep(3x)                    Library calls                   curs_beep(3x)
+ 
+@@ -58,35 +58,47 @@
+ 
+ 
+

                                                          DESCRIPTION

                                                          +-       The  beep  and flash routines are used to alert the terminal user.  The
+-       routine beep sounds an audible alarm  on  the  terminal,  if  possible;
+-       otherwise  it  flashes  the  screen  (visible bell).  The routine flash
+-       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.
++       beep  and  flash  alert  the  terminal user: the former by sounding the
++       terminal's audible alarm, and the latter  by  visibly  attracting  user
++       attention.    Commonly,   a   terminal  implements  a  visual  bell  by
++       momentarily reversing the character foreground and background colors on
++       the  entire  display;  even  a  monochrome  device  can do this.  These
++       functions each attempt the other alert type if  the  one  requested  is
++       unavailable.   If  neither  is  available,  curses  performs no action.
++       Nearly all terminals have an audible alert mechanism such as a bell  or
++       piezoelectric buzzer, but only some can flash the screen.
+ 
+ 
+

                                                          RETURN VALUE

                                                          +-       These routines return OK if they succeed in beeping  or  flashing,  ERR
+-       otherwise.
++       These functions return OK on success and ERR on failure.
++
++       In  ncurses, beep and flash return OK if the terminal type supports the
++       corresponding capability: bell (bel) for beep and flash_screen  (flash)
++       for flash.  Otherwise they return ERR.
+ 
+ 
+

                                                          EXTENSIONS

                                                          +-       SVr4's  beep  and  flash  routines  always  returned  OK, so it was not
+-       possible to tell when the beep or flash failed.
++       In ncurses, these functions can return ERR.
+ 
+ 
+

                                                          PORTABILITY

                                                          +-       These functions are described in X/Open Curses, Issue 4.  Like SVr4, it
+-       specifies that they always return OK.
++       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
++       error conditions for them.
++
++       On SVr4 curses, they always return OK, and X/Open Curses specifies them
++       as doing so.
++
++
++

                                                          HISTORY

                                                          ++       beep and flash appeared in SVr2 (1984).
+ 
+ 
+

                                                          SEE ALSO

                                                          +-       curses(3x)
++       curses(3x), terminfo(5)
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                     curs_beep(3x)
++ncurses 6.5                       2024-05-18                     curs_beep(3x)
+
                                                          +
                                                          + +
                                                          +Index: doc/html/man/curs_getch.3x.html +--- ncurses-6.5-20240511+/doc/html/man/curs_getch.3x.html 2024-05-11 21:39:56.000000000 +0000 ++++ ncurses-6.5-20240518/doc/html/man/curs_getch.3x.html 2024-05-18 20:27:54.000000000 +0000 +@@ -28,19 +28,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_getch.3x,v 1.88 2024/05/11 20:39:53 tom Exp @ ++ * @Id: curs_getch.3x,v 1.91 2024/05/18 20:23:57 tom Exp @ + --> + + + + + +-curs_getch 3x 2024-05-11 ncurses 6.5 Library calls ++curs_getch 3x 2024-05-18 ncurses 6.5 Library calls + + + + +-

                                                          curs_getch 3x 2024-05-11 ncurses 6.5 Library calls

                                                          ++

                                                          curs_getch 3x 2024-05-18 ncurses 6.5 Library calls

                                                          + 
                                                          + curs_getch(3x)                   Library calls                  curs_getch(3x)
+ 
+@@ -288,7 +288,7 @@
+        o   wgetch  returns KEY_MOUSE to indicate that a mouse event is pending
+            collection; see curs_mouse(3x).  Receipt of this  code  requires  a
+            window's  keypad  mode  to  be  enabled, because to interpret mouse
+-           input (as with with xterm(1)'s mouse prototocol), ncurses must read
++           input (as with with xterm(1)'s mouse protocol), ncurses  must  read
+            an escape sequence, as with a function key.
+ 
+ 
+@@ -326,10 +326,10 @@
+ 
+        Some key strokes are indistinguishable  from  control  characters;  for
+        example,  KEY_ENTER may be the same as ^M, and KEY_BACKSPACE may be the
+-       same as ^H or ^?.  Consult the terminal's terminfo entry  to  determine
+-       whether this is the case; see infocmp(1).  Some curses implementations,
+-       including ncurses, honor the terminfo  key  definitions;  others  treat
+-       such control characters specially.
++       same as ^H or ^?.  Consult the terminfo entry for the terminal type  to
++       determine  whether  this  is  the  case;  see  infocmp(1).  Some curses
++       implementations, including ncurses, honor the terminfo key definitions;
++       others treat such control characters specially.
+ 
+        curses  distinguishes  the  Enter  keys  in  the alphabetic and numeric
+        keypad sections of a keyboard because (most) terminals  do.   KEY_ENTER
+@@ -426,7 +426,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-11                    curs_getch(3x)
++ncurses 6.5                       2024-05-18                    curs_getch(3x)
+
                                                          +
                                                          +
                                                            +Index: doc/html/man/curs_in_wch.3x.html +--- ncurses-6.5-20240511+/doc/html/man/curs_in_wch.3x.html 2024-04-27 18:38:46.000000000 +0000 ++++ ncurses-6.5-20240518/doc/html/man/curs_in_wch.3x.html 2024-05-18 20:27:54.000000000 +0000 +@@ -27,19 +27,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_in_wch.3x,v 1.31 2024/04/20 21:20:07 tom Exp @ ++ * @Id: curs_in_wch.3x,v 1.33 2024/05/18 20:19:38 tom Exp @ + --> + + + + + +-curs_in_wch 3x 2024-04-20 ncurses 6.5 Library calls ++curs_in_wch 3x 2024-05-18 ncurses 6.5 Library calls + + + + +-

                                                            curs_in_wch 3x 2024-04-20 ncurses 6.5 Library calls

                                                            ++

                                                            curs_in_wch 3x 2024-05-18 ncurses 6.5 Library calls

                                                            + 
                                                            + curs_in_wch(3x)                  Library calls                 curs_in_wch(3x)
+ 
+@@ -54,46 +54,50 @@
+

                                                            SYNOPSIS

                                                            +        #include <curses.h>
+ 
+-       int in_wch(cchar_t *wch);
+-       int win_wch(WINDOW *win, cchar_t *wch);
+-
+-       int mvin_wch(int y, int x, cchar_t *wch);
+-       int mvwin_wch(WINDOW *win, int y, int x, cchar_t *wch);
++       int in_wch(cchar_t * wch);
++       int win_wch(WINDOW * win, cchar_t * wch);
++       int mvin_wch(int y, int x, cchar_t * wch);
++       int mvwin_wch(WINDOW * win, int y, int x, cchar_t * wch);
+ 
+ 
+

                                                            DESCRIPTION

                                                            +-       These functions extract the complex character and  rendition  from  the
+-       current position in the named window into the cchar_t object referenced
+-       by wch.
++       win_wch copies the curses complex character at the cursor  position  in
++       win  into  wch.   Use  getcchar(3x)  to  extract  its  character  code,
++       attributes, and  color  pair  identifier.   ncurses(3x)  describes  the
++       variants of this function.
+ 
+ 
+

                                                            RETURN VALUE

                                                            +-       No errors are defined in X/Open Curses.  This implementation checks for
+-       null  pointers,  returns ERR in that case.  Also, the mv routines check
+-       for error moving the cursor, returning ERR  in  that  case.   Otherwise
+-       they return OK.
++       These functions return OK on success and ERR on failure.
++
++       In ncurses, win_wch returns ERR if win is NULL.
+ 
+        Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+

                                                            NOTES

                                                            +-       Note that all of these routines may be macros.
++       in_wch, mvin_wch, and mvwin_wch may be implemented as macros.
++
++       Unlike winch(3x), win_wch and its  variants  store  the  value  of  the
++       retrieved  character  in  an  additional  wch  parameter instead of the
++       return value.
+ 
+ 
+

                                                            PORTABILITY

                                                            +-       These functions are described in X/Open Curses, Issue 4.
++       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
++       error conditions for them.
+ 
+ 
+

                                                            SEE ALSO

                                                            +-       curs_inch(3x) describes comparable functions of the ncurses library  in
++       curs_inch(3x)  describes comparable functions of the ncurses library in
+        its non-wide-character configuration.
+ 
+        curses(3x), curs_inwstr(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                   curs_in_wch(3x)
++ncurses 6.5                       2024-05-18                   curs_in_wch(3x)
+
                                                            +
                                                            +
                                                              +Index: doc/html/man/curs_inch.3x.html +--- ncurses-6.5-20240511+/doc/html/man/curs_inch.3x.html 2024-05-11 21:39:56.000000000 +0000 ++++ ncurses-6.5-20240518/doc/html/man/curs_inch.3x.html 2024-05-18 20:27:55.000000000 +0000 +@@ -28,19 +28,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_inch.3x,v 1.52 2024/05/11 20:39:53 tom Exp @ ++ * @Id: curs_inch.3x,v 1.54 2024/05/18 20:07:52 tom Exp @ + --> + + + + + +-curs_inch 3x 2024-05-11 ncurses 6.5 Library calls ++curs_inch 3x 2024-05-18 ncurses 6.5 Library calls + + + + +-

                                                              curs_inch 3x 2024-05-11 ncurses 6.5 Library calls

                                                              ++

                                                              curs_inch 3x 2024-05-18 ncurses 6.5 Library calls

                                                              + 
                                                              + curs_inch(3x)                    Library calls                   curs_inch(3x)
+ 
+@@ -55,68 +55,77 @@
+        #include <curses.h>
+ 
+        chtype inch(void);
+-       chtype winch(WINDOW *win);
++       chtype winch(WINDOW * win);
+        chtype mvinch(int y, int x);
+-       chtype mvwinch(WINDOW *win, int y, int x);
++       chtype mvwinch(WINDOW * win, int y, int x);
+ 
+ 
+

                                                              DESCRIPTION

                                                              +-       winch  returns the curses character, including rendering attributes and
+-       color pair identifier, at  the  cursor  position  in  the  window  win.
+-       Subsection  "Video  Attributes"  of  attron(3x) explains how to extract
+-       these data from a chtype.  ncurses(3x) describes the variants  of  this
+-       function.
++       winch  returns the curses character, including its attributes and color
++       pair identifier, at the cursor position in the window win.   Subsection
++       "Video  Attributes"  of  attron(3x)  explains how to extract these data
++       from a chtype.  ncurses(3x) describes the variants of this function.
+ 
+ 
+

                                                              RETURN VALUE

                                                              +-       Functions  prefixed with "mv" first perform cursor movement and fail if
+-       the position (y, x) is outside the window boundaries.
++       These functions return OK on success and ERR on failure.
++
++       In ncurses, winch returns ERR if win is NULL.
+ 
+-       These functions do not return an error if the window comprises cells of
+-       curses  complex characters (that is, they contain characters with codes
+-       wider than eight bits, or greater  than  255  as  an  unsigned  decimal
+-       integer).   They  instead  extract  only  the  low-order  eight bits of
+-       character data in the cell.
++       Functions prefixed with "mv" first perform cursor movement and fail  if
++       the position (y, x) is outside the window boundaries.
+ 
+ 
+

                                                              NOTES

                                                              +        inch, mvinch, and mvwinch may be implemented as macros.
+ 
++       These  functions do not return an error if the window contains cells of
++       curses complex characters; that is, if  they  contain  characters  with
++       codes wider than eight bits (or greater than 255 as an unsigned decimal
++       integer).  They instead extract only the low-order eight  bits  of  the
++       character code from the cell.
++
+ 
+

                                                              PORTABILITY

                                                              +-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
++       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+        error conditions for them.
+ 
+ 
+

                                                              HISTORY

                                                              +-       winch  was  implemented  in  the original 4BSD curses library (November
+-       1980).  It returned only the character code (as an  integer)  with  the
+-       "standout"  attribute bit (the only one it supported) cleared.  Because
+-       7-bit ASCII was the only character  encoding  supported,  4BSD's  winch
+-       returned a char type.
+-
+-       System V  curses  (1983)  permitted  several rendering attributes to be
+-       combined with a character in a window.   Reflecting  this  improvement,
+-       winch  returned  an int in SVr3.2 (1988) and switched to chtype in SVr4
+-       (1989).
++       The original curses in 4BSD (1980) defined winch as a  macro  accessing
++       the  WINDOW  structure member representing character cell data, at that
++       time a char, containing  only  a  7-bit  ASCII  character  code  and  a
++       "standout" attribute bit, the only one the library supported.
++
++       SVr2  curses (1984) extended this approach, widening the character code
++       to eight bits and permitting several attributes to be combined with  it
++       by  storing  them  together  in  a  chtype, an alias of unsigned short.
++       Because a macro was used, its value was not type-checked as a  function
++       return  value  could have been.  Goodheart documented SVr3 (1987) winch
++       as returning an  int.   SVr3.1's  (1987)  chtype  became  an  alias  of
++       unsigned  long,  using  16 bits for the character code and widening the
++       type in practical terms to 32 bits, as 64-bit Unix systems were not yet
++       in wide use, and fixed-width integral types would not be standard until
++       ISO C99.  SVr3.2 (1988) added a 6-bit color pair  identifier  alongside
++       the attributes.
+ 
+        X/Open Curses does not specify the sizes of the character code or color
+-       pair  identifier,  nor  the  quantity  of  rendering attribute bits, in
+-       chtype; these are implementation-dependent.  ncurses  uses  eight  bits
+-       for  the  character  code.   An application requiring a wider character
+-       type, for instance to handle Unicode,  should  use  the  wide-character
++       pair identifier, nor the quantity of attribute bits, in  chtype;  these
++       are   implementation-dependent.    ncurses  uses  eight  bits  for  the
++       character code.  An application requiring a wider character  type,  for
++       instance   to   represent   Unicode,   should  use  the  wide-character
+        counterparts of these functions.
+ 
+ 
+

                                                              SEE ALSO

                                                              +-       curs_in_wch(3x)  describes  comparable functions of the ncurses library
++       curs_in_wch(3x) describes comparable functions of the  ncurses  library
+        in its wide-character configuration (ncursesw).
+ 
+        curses(3x), curs_instr(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-11                     curs_inch(3x)
++ncurses 6.5                       2024-05-18                     curs_inch(3x)
+
                                                              +
                                                              +
                                                                +Index: doc/html/man/curs_mouse.3x.html +--- ncurses-6.5-20240511+/doc/html/man/curs_mouse.3x.html 2024-05-11 21:39:57.000000000 +0000 ++++ ncurses-6.5-20240518/doc/html/man/curs_mouse.3x.html 2024-05-18 20:27:55.000000000 +0000 +@@ -28,19 +28,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_mouse.3x,v 1.99 2024/05/11 20:39:53 tom Exp @ ++ * @Id: curs_mouse.3x,v 1.101 2024/05/18 20:03:51 tom Exp @ + --> + + + + + +-curs_mouse 3x 2024-05-11 ncurses 6.5 Library calls ++curs_mouse 3x 2024-05-18 ncurses 6.5 Library calls + + + + +-

                                                                curs_mouse 3x 2024-05-11 ncurses 6.5 Library calls

                                                                ++

                                                                curs_mouse 3x 2024-05-18 ncurses 6.5 Library calls

                                                                + 
                                                                + curs_mouse(3x)                   Library calls                  curs_mouse(3x)
+ 
+@@ -222,7 +222,7 @@
+ 
+ 
+

                                                                mouseinterval

                                                                +-       The  mouseinterval  function  sets  the maximum time (in thousands of a
++       The  mouseinterval  function sets the maximum time (in thousandths of a
+        second) that can elapse between press and release events for them to be
+        resolved  as  a click.  An application might interpret button press and
+        release events separated by more than the mouse  interval  as  a  "long
+@@ -394,7 +394,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-11                    curs_mouse(3x)
++ncurses 6.5                       2024-05-18                    curs_mouse(3x)
+
                                                                +
                                                                +
                                                                  +Index: doc/html/man/define_key.3x.html +--- ncurses-6.5-20240511+/doc/html/man/define_key.3x.html 2024-04-27 18:38:47.000000000 +0000 ++++ ncurses-6.5-20240518/doc/html/man/define_key.3x.html 2024-05-18 20:27:56.000000000 +0000 +@@ -28,19 +28,19 @@ + * authorization. * + **************************************************************************** + * Author: Thomas E. Dickey 1997 +- * @Id: define_key.3x,v 1.42 2024/03/16 15:35:01 tom Exp @ ++ * @Id: define_key.3x,v 1.44 2024/05/18 20:04:21 tom Exp @ + --> + + + + + +-define_key 3x 2024-03-16 ncurses 6.5 Library calls ++define_key 3x 2024-05-18 ncurses 6.5 Library calls + + + + +-

                                                                  define_key 3x 2024-03-16 ncurses 6.5 Library calls

                                                                  ++

                                                                  define_key 3x 2024-05-18 ncurses 6.5 Library calls

                                                                  + 
                                                                  + define_key(3x)                   Library calls                  define_key(3x)
+ 
+@@ -48,37 +48,46 @@
+ 
+ 
+

                                                                  NAME

                                                                  +-       define_key - define a curses keycode
++       define_key - define a curses function key code
+ 
+ 
+

                                                                  SYNOPSIS

                                                                  +        #include <curses.h>
+ 
+-       int define_key(const char *definition, int keycode);
++       int define_key(const char * definition, int key-code);
+ 
+ 
+

                                                                  DESCRIPTION

                                                                  +-       This  is an extension to the curses library.  It permits an application
+-       to define keycodes with their corresponding control  strings,  so  that
+-       the ncurses library will interpret them just as it would the predefined
+-       codes in the terminfo database.
+-
+-       If definition is NULL, any existing one for  the  keycode  is  removed.
+-       Similarly,  if  the  given  keycode  is  negative or zero, any existing
+-       string for the given definition is removed.
++       The define_key ncurses extension permits a curses application to bind a
++       string definition to the function key key-code returned  by  wgetch(3x)
++       (wide-character  API users: wget_wch(3x)) when keypad(3x) is enabled in
++       a window and a function key is  pressed.   ncurses  interprets  such  a
++       binding  as  it  does  those  in  the  terminfo  database entry for the
++       terminal type.
++
++       A definition of NULL removes any existing one key-code.   Similarly,  a
++       non-positive key-code removes any existing bindings for definition.
+ 
+ 
+

                                                                  RETURN VALUE

                                                                  +-       Either keycode must be greater than zero, or definition  must  be  non-
+-       NULL,  otherwise ERR is returned.  ERR may also be returned if there is
+-       insufficient memory to allocate the data to store the  definition.   If
+-       no error is detected, OK is returned.
++       define_key returns ERR if
++
++       o   definition is NULL and key-code is nonpositive, or
++
++       o   insufficient memory is available to bind definition to key-code.
++
++       Otherwise, define_key returns OK.
++
++
++

                                                                  EXTENSIONS

                                                                  ++       define_key is an ncurses extension.
+ 
+ 
+

                                                                  PORTABILITY

                                                                  +-       These  routines  are  specific  to ncurses.  They were not supported on
+-       Version 7, BSD or System V implementations.  It is recommended that any
+-       code depending on them be conditioned using NCURSES_VERSION.
++       Applications employing ncurses extensions should condition their use on
++       the visibility of the NCURSES_VERSION preprocessor macro.
++
++       NetBSD curses since 2.0 (2004) supports define_key.
+ 
+ 
+

                                                                  AUTHORS

                                                                  +@@ -86,11 +95,12 @@
+ 
+ 
+

                                                                  SEE ALSO

                                                                  +-       keyok(3x), key_defined(3x)
++       ncurses(3x),  keyok(3x),  key_defined(3x),   keybound(3x),   keyok(3x),
++       terminfo(5)
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                    define_key(3x)
++ncurses 6.5                       2024-05-18                    define_key(3x)
+
                                                                  +
                                                                  +
                                                                    +@@ -98,6 +108,7 @@ +
                                                                  • SYNOPSIS
                                                                    • +
                                                                  • DESCRIPTION
                                                                    • +
                                                                  • RETURN VALUE
                                                                    • ++
                                                                  • EXTENSIONS
                                                                    • +
                                                                  • PORTABILITY
                                                                    • +
                                                                  • AUTHORS
                                                                    • +
                                                                  • SEE ALSO
                                                                    • +Index: doc/html/man/key_defined.3x.html +--- ncurses-6.5-20240511+/doc/html/man/key_defined.3x.html 2024-04-27 18:38:48.000000000 +0000 ++++ ncurses-6.5-20240518/doc/html/man/key_defined.3x.html 2024-05-18 20:27:56.000000000 +0000 +@@ -28,19 +28,19 @@ + * authorization. * + **************************************************************************** + * Author: Thomas E. Dickey 2003 +- * @Id: key_defined.3x,v 1.34 2024/03/16 15:35:01 tom Exp @ ++ * @Id: key_defined.3x,v 1.36 2024/05/18 20:04:53 tom Exp @ + --> + + + + + +-key_defined 3x 2024-03-16 ncurses 6.5 Library calls ++key_defined 3x 2024-05-18 ncurses 6.5 Library calls + + + + +-

                                                                    key_defined 3x 2024-03-16 ncurses 6.5 Library calls

                                                                    ++

                                                                    key_defined 3x 2024-05-18 ncurses 6.5 Library calls

                                                                    + 
                                                                    + key_defined(3x)                  Library calls                 key_defined(3x)
+ 
+@@ -48,30 +48,34 @@
+ 
+ 
+

                                                                    NAME

                                                                    +-       key_defined - test whether a curses keycode is defined
++       key_defined - test whether a curses function key code is defined
+ 
+ 
+

                                                                    SYNOPSIS

                                                                    +        #include <curses.h>
+ 
+-       int key_defined(const char *definition);
++       int key_defined(const char * definition);
+ 
+ 
+

                                                                    DESCRIPTION

                                                                    +-       This  is an extension to the curses library.  It permits an application
+-       to determine if a string is currently bound to any keycode.
++       The  key_defined  ncurses  extension  permits  a  curses application to
++       determine the function key code, if any, to which the string definition
++       is bound.
+ 
+ 
+

                                                                    RETURN VALUE

                                                                    +-       If the string is bound to a keycode, its value (greater than  zero)  is
+-       returned.   If  no  keycode  is bound, zero is returned.  If the string
+-       conflicts with longer strings which are bound to keys, -1 is returned.
++       key_defined  returns the first key code to which definition is bound if
++       any exists.  If none does, it returns 0.  If definition is a prefix  of
++       another binding, key_defined returns -1.
++
++
++

                                                                    EXTENSIONS

                                                                    ++       define_key is an ncurses extension.
+ 
+ 
+

                                                                    PORTABILITY

                                                                    +-       This routine is specific to ncurses.  It was not supported  on  Version
+-       7,  BSD  or  System V implementations.  It is recommended that any code
+-       depending on them be conditioned using NCURSES_VERSION.
++       Applications employing ncurses extensions should condition their use on
++       the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+ 
+

                                                                    AUTHORS

                                                                    +@@ -79,11 +83,11 @@
+ 
+ 
+

                                                                    SEE ALSO

                                                                    +-       define_key(3x)
++       ncurses(3x), define_key(3x), keyok(3x), keybound(3x), keyok(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                   key_defined(3x)
++ncurses 6.5                       2024-05-18                   key_defined(3x)
+
                                                                    +
                                                                    +
                                                                      +@@ -91,6 +95,7 @@ +
                                                                    • SYNOPSIS
                                                                      • +
                                                                    • DESCRIPTION
                                                                      • +
                                                                    • RETURN VALUE
                                                                      • ++
                                                                    • EXTENSIONS
                                                                      • +
                                                                    • PORTABILITY
                                                                      • +
                                                                    • AUTHORS
                                                                      • +
                                                                    • SEE ALSO
                                                                      • +Index: doc/html/man/keybound.3x.html +--- ncurses-6.5-20240511+/doc/html/man/keybound.3x.html 2024-04-27 18:38:48.000000000 +0000 ++++ ncurses-6.5-20240518/doc/html/man/keybound.3x.html 2024-05-18 20:27:56.000000000 +0000 +@@ -28,19 +28,19 @@ + * authorization. * + **************************************************************************** + * Author: Thomas E. Dickey 1999 +- * @Id: keybound.3x,v 1.36 2024/03/16 15:35:01 tom Exp @ ++ * @Id: keybound.3x,v 1.38 2024/05/18 20:05:36 tom Exp @ + --> + + + + + +-keybound 3x 2024-03-16 ncurses 6.5 Library calls ++keybound 3x 2024-05-18 ncurses 6.5 Library calls + + + + +-

                                                                      keybound 3x 2024-03-16 ncurses 6.5 Library calls

                                                                      ++

                                                                      keybound 3x 2024-05-18 ncurses 6.5 Library calls

                                                                      + 
                                                                      + keybound(3x)                     Library calls                    keybound(3x)
+ 
+@@ -48,33 +48,41 @@
+ 
+ 
+

                                                                      NAME

                                                                      +-       keybound - get definition of curses keycode
++       keybound - get definition of a curses function key code
+ 
+ 
+

                                                                      SYNOPSIS

                                                                      +        #include <curses.h>
+ 
+-       char * keybound(int keycode, int count);
++       char * keybound(int key-code, int count);
+ 
+ 
+

                                                                      DESCRIPTION

                                                                      +-       This  is an extension to the curses library.  It permits an application
+-       to determine the string which is defined in the terminfo  for  specific
+-       keycodes.
++       The  keybound  ncurses extension permits a curses application to obtain
++       the value of the  string  bound  to  the  function  key  key-code;  see
++       wgetch(3x)  (wide-character API users: wget_wch(3x)).  By default, such
++       bindings are string  capabilities  from  the  terminfo  database  entry
++       corresponding   to   the  terminal  type.   The  application  can  non-
++       destructively   and   repeatedly   override   such   definitions   with
++       define_key(3x),  as  if  by  pushing new definitions onto a stack.  The
++       count parameter accesses the  nth  most  recently  defined  binding;  0
++       selects the binding that is used on input.
+ 
+ 
+

                                                                      RETURN VALUE

                                                                      +-       The keycode parameter must be greater than zero, else NULL is returned.
+-       If it does not correspond to a defined key, then NULL is returned.  The
+-       count  parameter  is  used  to allow the application to iterate through
+-       multiple  definitions,  counting  from  zero.   When  successful,   the
+-       function returns a string which must be freed by the caller.
++       If key-code corresponds to a function key defined by the application or
++       the terminal type in use, keybound allocates and returns a string  that
++       must be freed by the application.  keybound returns NULL if key-code is
++       not positive or if it does not correspond to a key code definition.
++
++
++

                                                                      EXTENSIONS

                                                                      ++       keybound is an ncurses extension.
+ 
+ 
+

                                                                      PORTABILITY

                                                                      +-       This  routine  is specific to ncurses.  It was not supported on Version
+-       7, BSD or System V implementations.  It is recommended  that  any  code
+-       depending on them be conditioned using NCURSES_VERSION.
++       Applications employing ncurses extensions should condition their use on
++       the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+ 
+

                                                                      AUTHORS

                                                                      +@@ -82,11 +90,11 @@
+ 
+ 
+

                                                                      SEE ALSO

                                                                      +-       define_key(3x), keyok(3x)
++       ncurses(3x), define_key(3x), key_defined(3x), keyok(3x), terminfo(5)
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                      keybound(3x)
++ncurses 6.5                       2024-05-18                      keybound(3x)
+
                                                                      +
                                                                      +
                                                                        +@@ -94,6 +102,7 @@ +
                                                                      • SYNOPSIS
                                                                        • +
                                                                      • DESCRIPTION
                                                                        • +
                                                                      • RETURN VALUE
                                                                        • ++
                                                                      • EXTENSIONS
                                                                        • +
                                                                      • PORTABILITY
                                                                        • +
                                                                      • AUTHORS
                                                                        • +
                                                                      • SEE ALSO
                                                                        • +Index: doc/html/man/keyok.3x.html +--- ncurses-6.5-20240511+/doc/html/man/keyok.3x.html 2024-04-27 18:38:48.000000000 +0000 ++++ ncurses-6.5-20240518/doc/html/man/keyok.3x.html 2024-05-18 20:27:56.000000000 +0000 +@@ -28,19 +28,19 @@ + * authorization. * + **************************************************************************** + * Author: Thomas E. Dickey 1997 +- * @Id: keyok.3x,v 1.40 2024/03/16 15:35:01 tom Exp @ ++ * @Id: keyok.3x,v 1.42 2024/05/18 20:06:09 tom Exp @ + --> + + + + + +-keyok 3x 2024-03-16 ncurses 6.5 Library calls ++keyok 3x 2024-05-18 ncurses 6.5 Library calls + + + + +-

                                                                        keyok 3x 2024-03-16 ncurses 6.5 Library calls

                                                                        ++

                                                                        keyok 3x 2024-05-18 ncurses 6.5 Library calls

                                                                        + 
                                                                        + keyok(3x)                        Library calls                       keyok(3x)
+ 
+@@ -48,32 +48,44 @@
+ 
+ 
+

                                                                        NAME

                                                                        +-       keyok - enable or disable a curses keycode
++       keyok - enable or disable a curses function key code
+ 
+ 
+

                                                                        SYNOPSIS

                                                                        +        #include <curses.h>
+ 
+-       int keyok(int keycode, bool enable);
++       int keyok(int key-code, bool bf);
+ 
+ 
+

                                                                        DESCRIPTION

                                                                        +-       This  is an extension to the curses library.  It permits an application
+-       to disable specific keycodes, rather than use the  keypad  function  to
+-       disable all keycodes.  Keys that have been disabled can be re-enabled.
++       The  keyok  ncurses extension permits a curses application to disable a
++       function key key-code returned by wgetch(3x) (wide-character API users:
++       wget_wch(3x)).   Key  codes  that have been disabled can be re-enabled.
++       bf indicates the desired enablement status.   This  operation  is  more
++       fine-grained than calling keypad(3x), which affects all function keys.
+ 
+ 
+

                                                                        RETURN VALUE

                                                                        +-       The  keycode  must  be  greater than zero, else ERR is returned.  If it
+-       does not correspond to a defined key, then ERR  is  returned.   If  the
+-       enable  parameter  is  true,  then the key must have been disabled, and
+-       vice versa.  Otherwise, the function returns OK.
++       keyok returns ERR if
++
++       o   key-code is nonpositive,
++
++       o   key-code is not a recognized value, or
++
++       o   enablement of key-code is already in the desired state.
++
++       Otherwise, keyok returns OK.
++
++
++

                                                                        EXTENSIONS

                                                                        ++       keyok is an ncurses extension.
+ 
+ 
+

                                                                        PORTABILITY

                                                                        +-       This routine is specific to ncurses.  It was not supported  on  Version
+-       7,  BSD  or  System V implementations.  It is recommended that any code
+-       depending on them be conditioned using NCURSES_VERSION.
++       Applications employing ncurses extensions should condition their use on
++       the visibility of the NCURSES_VERSION preprocessor macro.
++
++       NetBSD curses since 2.0 (2004) supports keyok.
+ 
+ 
+

                                                                        AUTHORS

                                                                        +@@ -81,11 +93,11 @@
+ 
+ 
+

                                                                        SEE ALSO

                                                                        +-       define_key(3x)
++       ncurses(3x), define_key(3x), key_defined(3x), keybound(3x), keyok(3x),
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                         keyok(3x)
++ncurses 6.5                       2024-05-18                         keyok(3x)
+
                                                                        +
                                                                        +
                                                                          +@@ -93,6 +105,7 @@ +
                                                                        • SYNOPSIS
                                                                          • +
                                                                        • DESCRIPTION
                                                                          • +
                                                                        • RETURN VALUE
                                                                          • ++
                                                                        • EXTENSIONS
                                                                          • +
                                                                        • PORTABILITY
                                                                          • +
                                                                        • AUTHORS
                                                                          • +
                                                                        • SEE ALSO
                                                                          • +Index: doc/html/man/ncurses.3x.html +--- ncurses-6.5-20240511+/doc/html/man/ncurses.3x.html 2024-05-11 21:39:59.000000000 +0000 ++++ ncurses-6.5-20240518/doc/html/man/ncurses.3x.html 2024-05-18 20:27:57.000000000 +0000 +@@ -28,19 +28,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: ncurses.3x,v 1.215 2024/05/11 20:39:53 tom Exp @ ++ * @Id: ncurses.3x,v 1.217 2024/05/18 20:02:27 tom Exp @ + --> + + + + + +-ncurses 3x 2024-05-11 ncurses 6.5 Library calls ++ncurses 3x 2024-05-18 ncurses 6.5 Library calls + + + + +-

                                                                          ncurses 3x 2024-05-11 ncurses 6.5 Library calls

                                                                          ++

                                                                          ncurses 3x 2024-05-18 ncurses 6.5 Library calls

                                                                          + 
                                                                          + ncurses(3x)                      Library calls                     ncurses(3x)
+ 
+@@ -61,7 +61,7 @@
+        terminals  with  output  optimized to minimize screen updates.  ncurses
+        replaces the curses libraries from System V Release 4 Unix ("SVr4") and
+        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
+-       document describes ncurses version 6.5 (patch 20240511).
++       document describes ncurses version 6.5 (patch 20240518).
+ 
+        ncurses permits control of the terminal screen's contents;  abstraction
+        and  subdivision thereof with windows and pads; acquisition of keyboard
+@@ -176,7 +176,7 @@
+        not be completely displayed.  See curs_pad(3x).
+ 
+        Many  terminals  support configuration of character cell foreground and
+-       background colors  as  well  as  rendering  attributes  ,  which  cause
++       background  colors  as  well  as  rendering  attributes,  which   cause
+        characters  to  show  up  in such modes as boldfaced, underlined, or in
+        reverse video.  See curs_attr(3x).
+ 
+@@ -1491,7 +1491,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-11                       ncurses(3x)
++ncurses 6.5                       2024-05-18                       ncurses(3x)
+
                                                                          +
                                                                          +
                                                                            +Index: doc/html/man/terminfo.5.html +--- ncurses-6.5-20240511+/doc/html/man/terminfo.5.html 2024-05-11 21:39:59.000000000 +0000 ++++ ncurses-6.5-20240518/doc/html/man/terminfo.5.html 2024-05-18 20:27:57.000000000 +0000 +@@ -71,7 +71,7 @@ + have, by specifying how to perform screen operations, and by specifying + padding requirements and initialization sequences. + +- This document describes ncurses version 6.5 (patch 20240511). ++ This document describes ncurses version 6.5 (patch 20240518). + + +

                                                                            terminfo Entry Syntax

                                                                            +Index: include/ncurses_defs
+Prereq:  1.110 
+--- ncurses-6.5-20240511+/include/ncurses_defs	2024-03-02 20:38:23.000000000 +0000
++++ ncurses-6.5-20240518/include/ncurses_defs	2024-05-18 19:41:39.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: ncurses_defs,v 1.110 2024/03/02 20:38:23 tom Exp $
++# $Id: ncurses_defs,v 1.111 2024/05/18 19:41:39 tom Exp $
+ ##############################################################################
+ # Copyright 2018-2023,2024 Thomas E. Dickey                                  #
+ # Copyright 2000-2016,2017 Free Software Foundation, Inc.                    #
+@@ -253,6 +253,7 @@
+ TERMINFO	"none"
+ TERMPATH	"none"
+ TIME_WITH_SYS_TIME
++TRACE
+ TYPEOF_CHTYPE
+ USE_COLORFGBG
+ USE_FOPEN_BIN_R
+Index: man/curs_beep.3x
+Prereq:  1.29 
+--- ncurses-6.5-20240511+/man/curs_beep.3x	2024-04-20 21:20:07.000000000 +0000
++++ ncurses-6.5-20240518/man/curs_beep.3x	2024-05-18 20:06:33.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_beep.3x,v 1.29 2024/04/20 21:20:07 tom Exp $
+-.TH curs_beep 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_beep.3x,v 1.31 2024/05/18 20:06:33 tom Exp $
++.TH curs_beep 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%beep\fP,
+ \fB\%flash\fP \-
+@@ -41,23 +41,70 @@
+ \fBint flash(void);
+ .fi
+ .SH DESCRIPTION
+-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\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.
++.B beep
++and
++.B flash
++alert the terminal user:
++the former by sounding the terminal's audible alarm,
++and the latter by visibly attracting user attention.
++Commonly,
++a terminal implements a visual bell by momentarily reversing the
++character foreground and background colors on the entire display;
++even a monochrome device can do this.
++These functions each attempt the other alert type if the one requested
++is unavailable.
++If neither is available,
++.I curses
++performs no action.
++Nearly all terminals have an audible alert mechanism such as a bell or
++piezoelectric buzzer,
++but only some can flash the screen.
+ .SH RETURN VALUE
+-These routines return \fBOK\fP if they succeed in beeping or flashing,
+-\fBERR\fP otherwise.
++These functions return
++.B OK
++on success and
++.B ERR
++on failure.
++.PP
++In
++.IR \%ncurses ","
++.B beep
++and
++.B flash
++return
++.B OK
++if the terminal type supports the corresponding capability:
++.B bell
++.RB ( bel )
++for
++.B beep
++and
++.B \%flash_screen
++.RB ( flash )
++for
++.BR flash "."
++Otherwise they return
++.BR ERR "."
+ .SH EXTENSIONS
+-SVr4's beep and flash routines always returned \fBOK\fP, so it was not
+-possible to tell when the beep or flash failed.
++In
++.IR \%ncurses ","
++these functions can return
++.BR ERR "."
+ .SH PORTABILITY
+-These functions are described in X/Open Curses, Issue 4.
+-Like SVr4, it specifies that they always return \fBOK\fP.
++X/Open Curses,
++Issue 4 describes these functions.
++It specifies no error conditions for them.
++.PP
++On SVr4
++.IR curses ","
++they always return
++.BR OK ","
++and X/Open Curses specifies them as doing so.
++.SH HISTORY
++.B beep
++and
++.B flash
++appeared in SVr2 (1984).
+ .SH SEE ALSO
+-\fB\%curses\fP(3X)
++\fB\%curses\fP(3X),
++\fB\%terminfo\fP(5)
+Index: man/curs_getch.3x
+Prereq:  1.88 
+--- ncurses-6.5-20240511+/man/curs_getch.3x	2024-05-11 20:39:53.000000000 +0000
++++ ncurses-6.5-20240518/man/curs_getch.3x	2024-05-18 20:23:57.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getch.3x,v 1.88 2024/05/11 20:39:53 tom Exp $
+-.TH curs_getch 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_getch.3x,v 1.91 2024/05/18 20:23:57 tom Exp $
++.TH curs_getch 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -417,7 +417,7 @@
+ see \fB\%curs_mouse\fP(3X).
+ Receipt of this code requires a window's keypad mode to be enabled,
+ because to interpret mouse input
+-(as with with \fI\%xterm\fP(1)'s mouse prototocol),
++(as with with \fI\%xterm\fP(1)'s mouse protocol),
+ .I \%ncurses
+ must read an escape sequence,
+ as with a function key.
+@@ -489,9 +489,9 @@
+ or
+ .BR \*^? "."
+ .\" as with pccon+keys or vt320
+-Consult the terminal's
++Consult the
+ .I \%term\%info
+-entry to determine whether this is the case;
++entry for the terminal type to determine whether this is the case;
+ see \fB\%infocmp\fP(1).
+ Some
+ .I curses
+Index: man/curs_in_wch.3x
+Prereq:  1.31 
+--- ncurses-6.5-20240511+/man/curs_in_wch.3x	2024-04-20 21:20:07.000000000 +0000
++++ ncurses-6.5-20240518/man/curs_in_wch.3x	2024-05-18 20:19:38.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_in_wch.3x,v 1.31 2024/04/20 21:20:07 tom Exp $
+-.TH curs_in_wch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_in_wch.3x,v 1.33 2024/05/18 20:19:38 tom Exp $
++.TH curs_in_wch 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -49,22 +49,39 @@
+ .nf
+ \fB#include 
+ .PP
+-\fBint in_wch(cchar_t *\fIwch\fP);
+-\fBint win_wch(WINDOW *\fIwin\fP, cchar_t *\fIwch\fP);
+-.PP
+-\fBint mvin_wch(int \fIy\fP, int \fIx\fP, cchar_t *\fIwch\fP);
+-\fBint mvwin_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, cchar_t *\fIwch\fP);
++\fBint in_wch(cchar_t * \fIwch\fP);
++\fBint win_wch(WINDOW * \fIwin\fP, cchar_t * \fIwch\fP);
++\fBint mvin_wch(int \fIy\fP, int \fIx\fP, cchar_t * \fIwch\fP);
++\fBint mvwin_wch(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, cchar_t * \fIwch\fP);
+ .fi
+ .SH DESCRIPTION
+-These functions extract the complex character and rendition from
+-the current position in the named window into the \fBcchar_t\fP object
+-referenced by wch.
++.B \%win_wch
++copies the
++.I curses
++complex character at the cursor position in
++.I win
++into
++.IR wch "."
++Use \fB\%getcchar\fP(3X) to extract its character code,
++attributes,
++and color pair identifier.
++\fB\%ncurses\fP(3X) describes the variants of this function.
+ .SH RETURN VALUE
+-No errors are defined in X/Open Curses.
+-This implementation checks for null pointers, returns \fBERR\fP in that case.
+-Also, the \fImv\fP routines check for error moving the cursor,
+-returning \fBERR\fP in that case.
+-Otherwise they return \fBOK\fP.
++These functions return
++.B OK
++on success and
++.B ERR
++on failure.
++.PP
++In
++.IR \%ncurses ","
++.B \%win_wch
++returns
++.B ERR
++if
++.I win
++is
++.BR NULL "."
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+@@ -72,9 +89,22 @@
+ .IR x )
+ is outside the window boundaries.
+ .SH NOTES
+-Note that all of these routines may be macros.
++.BR \%in_wch ","
++.BR mvin_wch ","
++and
++.B mvwin_wch
++may be implemented as macros.
++.PP
++Unlike \fB\%winch\fP(3X),
++.B \%win_wch
++and its variants store the value of the retrieved character in an
++additional
++.I wch
++parameter instead of the return value.
+ .SH PORTABILITY
+-These functions are described in X/Open Curses, Issue 4.
++X/Open Curses,
++Issue 4 describes these functions.
++It specifies no error conditions for them.
+ .SH SEE ALSO
+ \fB\%curs_inch\fP(3X) describes comparable functions of the
+ .I \%ncurses
+Index: man/curs_inch.3x
+Prereq:  1.52 
+--- ncurses-6.5-20240511+/man/curs_inch.3x	2024-05-11 20:39:53.000000000 +0000
++++ ncurses-6.5-20240518/man/curs_inch.3x	2024-05-18 20:07:52.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inch.3x,v 1.52 2024/05/11 20:39:53 tom Exp $
+-.TH curs_inch 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inch.3x,v 1.54 2024/05/18 20:07:52 tom Exp $
++.TH curs_inch 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -56,16 +56,16 @@
+ \fB#include 
+ .PP
+ \fBchtype inch(void);
+-\fBchtype winch(WINDOW *\fIwin\fP);
++\fBchtype winch(WINDOW * \fIwin\fP);
+ \fBchtype mvinch(int \fIy\fP, int \fIx\fP);
+-\fBchtype mvwinch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
++\fBchtype mvwinch(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP);
+ .fi
+ .SH DESCRIPTION
+ .B \%winch
+ returns the
+ .I curses
+ character,
+-including rendering attributes and color pair identifier,
++including its attributes and color pair identifier,
+ at the cursor position in the window
+ .IR win "."
+ Subsection \*(``Video Attributes\*('' of \fB\%attron\fP(3X) explains
+@@ -73,73 +73,104 @@
+ .IR chtype "."
+ \fB\%ncurses\fP(3X) describes the variants of this function.
+ .SH RETURN VALUE
++These functions return
++.B OK
++on success and
++.B ERR
++on failure.
++.PP
++In
++.IR \%ncurses ","
++.B \%winch
++returns
++.B ERR
++if
++.I win
++is
++.BR NULL "."
++.PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+ .RI ( y ,
+ .IR x )
+ is outside the window boundaries.
+-.PP
+-These functions do not return an error if the window comprises cells of
+-.I curses
+-complex characters
+-(that is,
+-they contain characters with codes wider than eight bits,
+-or greater than 255 as an unsigned decimal integer).
+-They instead extract only the low-order eight bits of character data
+-in the cell.
+ .SH NOTES
+ .BR \%inch ,
+ .BR \%mvinch ,
+ and
+ .B \%mvwinch
+ may be implemented as macros.
++.PP
++These functions do not return an error if the window contains cells of
++.I curses
++complex characters;
++that is,
++if they contain characters with codes wider than eight bits
++(or greater than 255 as an unsigned decimal integer).
++They instead extract only the low-order eight bits of the character code
++from the cell.
+ .SH PORTABILITY
+ X/Open Curses,
+ Issue 4 describes these functions.
+ It specifies no error conditions for them.
+ .SH HISTORY
+-.B \%winch
+-was implemented in the original 4BSD
++The original
+ .I curses
+-library
+-(November 1980).
+-It returned only the character code
+-(as an integer)
+-with the \*(``standout\*(`` attribute bit
+-(the only one it supported)
+-cleared.
+-Because 7-bit ASCII was the only character encoding supported,
+-4BSD's
+-.B \%winch
+-returned a
+-.I char
+-type.
+-.\" Through macros, it directly accessed a `char` structure member.
++in 4BSD (1980) defined
++.I \%winch
++as a macro accessing the
++.I \%WINDOW
++structure member representing character cell data,
++at that time a
++.IR char ","
++containing only a 7-bit ASCII character code
++and a \*(``standout\*(`` attribute bit,
++the only one the library supported.
+ .PP
+-System\ V
++SVr2
+ .I curses
+-(1983) permitted several rendering attributes to be combined with a
+-character in a window.
+-Reflecting this improvement,
+-.B \%winch
+-.\" XXX: possibly returned a `short` in SVr1 through SVr3 --GBR
+-returned an
+-.I int
+-in SVr3.2 (1988)
+-and switched to
+-.I chtype
+-in SVr4 (1989).
++(1984)
++extended this approach,
++widening the character code to eight bits
++and permitting several attributes to be combined with it
++by storing them together in a
++.IR \%chtype ","
++an alias of
++.IR "unsigned short" "."
++.\" ...indirectly through a preprocessor macro named CHTYPE, encouraging
++.\" builders to change the typedef to `char` or `long` as desired.  More
++.\" innocent times with respect to ABI compatibility concerns... --GBR
++Because a macro was used,
++its value was not type-checked
++as a function return value could have been.
++Goodheart documented SVr3 (1987)
++.I \%winch
++as returning an
++.IR int "."
++.\" ...but the implementation remained unchanged.
++SVr3.1's (1987)
++.I \%chtype
++became an alias of
++.IR "unsigned long" ","
++using 16 bits for the character code and
++widening the type in practical terms to 32 bits,
++as 64-bit Unix systems were not yet in wide use,
++and fixed-width integral types would not be standard until ISO C99.
++.\" Cray's UNICOS was 1985 (how many shops had Crays?).  DEC OSF/1 for
++.\" the Alpha arrived in 1993.  --GBR
++SVr3.2 (1988)
++added a 6-bit color pair identifier alongside the attributes.
+ .PP
+ X/Open Curses does not specify the sizes of the character code or
+ color pair identifier,
+-nor the quantity of rendering attribute bits,
++nor the quantity of attribute bits,
+ in
+ .IR chtype ";"
+ these are implementation-dependent.
+ .I \%ncurses
+ uses eight bits for the character code.
+ An application requiring a wider character type,
+-for instance to handle Unicode,
++for instance to represent Unicode,
+ should use the wide-character counterparts of these functions.
+ .SH SEE ALSO
+ \fB\%curs_in_wch\fP(3X) describes comparable functions of the
+Index: man/curs_mouse.3x
+Prereq:  1.99 
+--- ncurses-6.5-20240511+/man/curs_mouse.3x	2024-05-11 20:39:53.000000000 +0000
++++ ncurses-6.5-20240518/man/curs_mouse.3x	2024-05-18 20:03:51.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_mouse.3x,v 1.99 2024/05/11 20:39:53 tom Exp $
+-.TH curs_mouse 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_mouse.3x,v 1.101 2024/05/18 20:03:51 tom Exp $
++.TH curs_mouse 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -238,7 +238,7 @@
+ using \fB\%stdscr\fP for \fIwin\fP.
+ .SS mouseinterval
+ The \fB\%mouseinterval\fP function sets the maximum time
+-(in thousands of a second)
++(in thousandths of a second)
+ that can elapse between press and release events for them to
+ be resolved as a
+ .IR click .
+Index: man/define_key.3x
+Prereq:  1.42 
+--- ncurses-6.5-20240511+/man/define_key.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20240518/man/define_key.3x	2024-05-18 20:04:21.000000000 +0000
+@@ -29,43 +29,101 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1997
+ .\"
+-.\" $Id: define_key.3x,v 1.42 2024/03/16 15:35:01 tom Exp $
+-.TH define_key 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: define_key.3x,v 1.44 2024/05/18 20:04:21 tom Exp $
++.TH define_key 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.
++.de bP
++.ie n  .IP \(bu 4
++.el    .IP \(bu 2
++..
++.
+ .SH NAME
+ \fB\%define_key\fP \-
+-define a \fIcurses\fR keycode
++define a \fIcurses\fP function key code
+ .SH SYNOPSIS
+ .nf
+ \fB#include 
+ .PP
+-\fBint define_key(const char *\fIdefinition\fP, int \fIkeycode\fP);
++\fBint define_key(const char * \fIdefinition\fP, int \fIkey-code\fP);
+ .fi
+ .SH DESCRIPTION
+-This is an extension to the \fIcurses\fP library.
+-It permits an application to define keycodes with their corresponding control
+-strings,
+-so that the \fI\%ncurses\fP library will interpret them just as it would
+-the predefined codes in the terminfo database.
++The
++.B \%define_key
++.I \%ncurses
++extension permits a
++.I curses
++application to
++.I bind
++a string
++.I definition
++to the function key
++.I key-code
++returned by \fB\%wgetch\fP(3X)
++(wide-character API users:
++\fB\%wget_wch\fP(3X))
++when \fB\%keypad\fP(3X) is enabled in a window and a function key is
++pressed.
++.I \%ncurses
++interprets such a binding as it does those in the
++.I \%term\%info
++database entry for the terminal type.
+ .PP
+-If \fIdefinition\fP is \fBNULL\fP,
+-any existing one for the keycode is removed.
+-Similarly, if the given keycode is negative or zero, any existing string
+-for the given definition is removed.
++A
++.I definition
++of
++.B NULL
++removes any existing one
++.IR key-code "."
++Similarly,
++a non-positive
++.I key-code
++removes any existing bindings for
++.IR definition "."
+ .SH RETURN VALUE
+-Either \fIkeycode\fP must be greater than zero,
+-or \fIdefinition\fP must be non-\fBNULL\fP,
+-otherwise \fBERR\fP is returned.
+-\fBERR\fP may also be returned if there is insufficient memory to allocate the
+-data to store the definition.
+-If no error is detected, \fBOK\fP is returned.
++.B \%define_key
++returns
++.B ERR
++if
++.bP
++.I definition
++is
++.B NULL
++and
++.I key-code
++is nonpositive,
++or
++.bP
++insufficient memory is available to bind
++.I definition
++to
++.IR key-code "."
++.PP
++Otherwise,
++.B \%define_key
++returns
++.BR OK "."
++.SH EXTENSIONS
++.B \%define_key
++is an
++.I \%ncurses
++extension.
+ .SH PORTABILITY
+-These routines are specific to \fI\%ncurses\fP.
+-They were not supported on
+-Version 7, BSD or System V implementations.
+-It is recommended that
+-any code depending on them be conditioned using \fB\%NCURSES_VERSION\fP.
++Applications employing
++.I \%ncurses
++extensions should condition their use on the visibility of the
++.B \%NCURSES_VERSION
++preprocessor macro.
++.PP
++NetBSD
++.I curses
++since 2.0 (2004) supports
++.BR \%define_key "."
+ .SH AUTHORS
+ Thomas Dickey
+ .SH SEE ALSO
++\fB\%ncurses\fP(3X),
++\fB\%keyok\fP(3X),
++\fB\%key_defined\fP(3X),
++\fB\%keybound\fP(3X),
+ \fB\%keyok\fP(3X),
+-\fB\%key_defined\fP(3X)
++\fB\%terminfo\fP(5)
+Index: man/key_defined.3x
+Prereq:  1.34 
+--- ncurses-6.5-20240511+/man/key_defined.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20240518/man/key_defined.3x	2024-05-18 20:04:53.000000000 +0000
+@@ -29,33 +29,58 @@
+ .\"
+ .\" Author: Thomas E. Dickey 2003
+ .\"
+-.\" $Id: key_defined.3x,v 1.34 2024/03/16 15:35:01 tom Exp $
+-.TH key_defined 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: key_defined.3x,v 1.36 2024/05/18 20:04:53 tom Exp $
++.TH key_defined 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%key_defined\fP \-
+-test whether a \fIcurses\fR keycode is defined
++test whether a \fIcurses\fP function key code is defined
+ .SH SYNOPSIS
+ .nf
+ \fB#include 
+ .PP
+-\fBint key_defined(const char *\fIdefinition\fP);
++\fBint key_defined(const char * \fIdefinition\fP);
+ .fi
+ .SH DESCRIPTION
+-This is an extension to the \fIcurses\fP library.
+-It permits an application to determine if a string is currently bound
+-to any keycode.
++The
++.B \%key_defined
++.I \%ncurses
++extension permits a
++.I curses
++application to determine the function key code,
++if any,
++to which the string
++.I definition
++is bound.
+ .SH RETURN VALUE
+-If the string is bound to a keycode, its value (greater than zero) is returned.
+-If no keycode is bound, zero is returned.
+-If the string conflicts with longer strings
+-which are bound to keys, \-1 is returned.
++.B \%key_defined
++returns the first key code to which
++.I definition
++is bound if any exists.
++If none does,
++it returns
++.BR 0 "."
++If
++.I definition
++is a prefix of another binding,
++.B \%key_defined
++returns
++.BR \-1 "."
++.SH EXTENSIONS
++.B \%define_key
++is an
++.I \%ncurses
++extension.
+ .SH PORTABILITY
+-This routine is specific to \fI\%ncurses\fP.
+-It was not supported on
+-Version 7, BSD or System V implementations.
+-It is recommended that
+-any code depending on them be conditioned using \fB\%NCURSES_VERSION\fP.
++Applications employing
++.I \%ncurses
++extensions should condition their use on the visibility of the
++.B \%NCURSES_VERSION
++preprocessor macro.
+ .SH AUTHORS
+ Thomas Dickey
+ .SH SEE ALSO
+-\fB\%define_key\fP(3X)
++\fB\%ncurses\fP(3X),
++\fB\%define_key\fP(3X),
++\fB\%keyok\fP(3X),
++\fB\%keybound\fP(3X),
++\fB\%keyok\fP(3X)
+Index: man/keybound.3x
+Prereq:  1.36 
+--- ncurses-6.5-20240511+/man/keybound.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20240518/man/keybound.3x	2024-05-18 20:05:36.000000000 +0000
+@@ -29,37 +29,76 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1999
+ .\"
+-.\" $Id: keybound.3x,v 1.36 2024/03/16 15:35:01 tom Exp $
+-.TH keybound 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: keybound.3x,v 1.38 2024/05/18 20:05:36 tom Exp $
++.TH keybound 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%keybound\fP \-
+-get definition of \fIcurses\fR keycode
++get definition of a \fIcurses\fP function key code
+ .SH SYNOPSIS
+ .nf
+ \fB#include 
+ .PP
+-\fBchar * keybound(int \fIkeycode\fP, int \fIcount\fP);
++\fBchar * keybound(int \fIkey-code\fP, int \fIcount\fP);
+ .fi
+ .SH DESCRIPTION
+-This is an extension to the \fIcurses\fP library.
+-It permits an application to determine the string which is defined
+-in the terminfo for specific keycodes.
++The
++.B \%keybound
++.I \%ncurses
++extension permits a
++.I curses
++application to obtain the value of the string
++.I bound
++to the function key
++.IR key-code ";"
++see \fB\%wgetch\fP(3X)
++(wide-character API users: \fB\%wget_wch\fP(3X)).
++By default,
++such bindings are string capabilities from the
++.I \%term\%info
++database entry corresponding to the terminal type.
++The application can non-destructively and repeatedly
++override such definitions with
++\fB\%define_key\fP(3X),
++as if by pushing new definitions onto a stack.
++The
++.I count
++parameter accesses the
++.IR n th
++most recently defined binding;
++.B 0
++selects the binding that is used on input.
+ .SH RETURN VALUE
+-The \fIkeycode\fP parameter must be greater than zero,
+-else \fBNULL\fP is returned.
+-If it does not correspond to a defined key, then \fBNULL\fP is returned.
+-The \fIcount\fP parameter is used to allow the application to iterate
+-through multiple definitions, counting from zero.
+-When successful,
+-the function returns a string which must be freed by the caller.
++If
++.I key-code
++corresponds to a function key defined
++by the application
++or the terminal type in use,
++.B \%keybound
++allocates and returns a string
++that must be freed by the application.
++.B \%keybound
++returns
++.B NULL
++if
++.I key-code
++is not positive
++or if it does not correspond to a key code definition.
++.SH EXTENSIONS
++.B \%keybound
++is an
++.I \%ncurses
++extension.
+ .SH PORTABILITY
+-This routine is specific to \fI\%ncurses\fP.
+-It was not supported on
+-Version 7, BSD or System V implementations.
+-It is recommended that
+-any code depending on them be conditioned using \fB\%NCURSES_VERSION\fP.
++Applications employing
++.I \%ncurses
++extensions should condition their use on the visibility of the
++.B \%NCURSES_VERSION
++preprocessor macro.
+ .SH AUTHORS
+ Thomas Dickey
+ .SH SEE ALSO
++\fB\%ncurses\fP(3X),
+ \fB\%define_key\fP(3X),
+-\fB\%keyok\fP(3X)
++\fB\%key_defined\fP(3X),
++\fB\%keyok\fP(3X),
++\fB\%terminfo\fP(5)
+Index: man/keyok.3x
+Prereq:  1.40 
+--- ncurses-6.5-20240511+/man/keyok.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20240518/man/keyok.3x	2024-05-18 20:06:09.000000000 +0000
+@@ -29,35 +29,83 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1997
+ .\"
+-.\" $Id: keyok.3x,v 1.40 2024/03/16 15:35:01 tom Exp $
+-.TH keyok 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: keyok.3x,v 1.42 2024/05/18 20:06:09 tom Exp $
++.TH keyok 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.
++.de bP
++.ie n  .IP \(bu 4
++.el    .IP \(bu 2
++..
++.
+ .SH NAME
+ \fB\%keyok\fP \-
+-enable or disable a \fIcurses\fR keycode
++enable or disable a \fIcurses\fP function key code
+ .SH SYNOPSIS
+ .nf
+ \fB#include 
+ .PP
+-\fBint keyok(int \fIkeycode\fP, bool \fIenable\fP);
++\fBint keyok(int \fIkey-code\fP, bool \fIbf\fP);
+ .fi
+ .SH DESCRIPTION
+-This is an extension to the \fIcurses\fP library.
+-It permits an application to disable specific keycodes, rather than
+-use the \fB\%keypad\fP function to disable all keycodes.
+-Keys that have been disabled can be re-enabled.
++The
++.B \%keyok
++.I \%ncurses
++extension permits a
++.I curses
++application to disable a function key
++.I key-code
++returned by \fB\%wgetch\fP(3X)
++(wide-character API users:
++\fB\%wget_wch\fP(3X)).
++Key codes that have been disabled can be re-enabled.
++.I bf
++indicates the desired enablement status.
++This operation is more fine-grained than calling \fB\%keypad\fP(3X),
++which affects
++.I all
++function keys.
+ .SH RETURN VALUE
+-The keycode must be greater than zero, else \fBERR\fP is returned.
+-If it does not correspond to a defined key, then \fBERR\fP is returned.
+-If the \fIenable\fP parameter is true, then the key must have been disabled,
+-and vice versa.
+-Otherwise, the function returns \fBOK\fP.
++.B \%keyok
++returns
++.B ERR
++if
++.bP
++.I key-code
++is nonpositive,
++.bP
++.I key-code
++is not a recognized value,
++or
++.bP
++enablement of
++.I key-code
++is already in the desired state.
++.PP
++Otherwise,
++.B \%keyok
++returns
++.BR OK "."
++.SH EXTENSIONS
++.B \%keyok
++is an
++.I \%ncurses
++extension.
+ .SH PORTABILITY
+-This routine is specific to \fI\%ncurses\fP.
+-It was not supported on
+-Version 7, BSD or System V implementations.
+-It is recommended that
+-any code depending on them be conditioned using \fB\%NCURSES_VERSION\fP.
++Applications employing
++.I \%ncurses
++extensions should condition their use on the visibility of the
++.B \%NCURSES_VERSION
++preprocessor macro.
++.PP
++NetBSD
++.I curses
++since 2.0 (2004) supports
++.BR \%keyok "."
+ .SH AUTHORS
+ Thomas Dickey
+ .SH SEE ALSO
+-\fB\%define_key\fP(3X)
++\fB\%ncurses\fP(3X),
++\fB\%define_key\fP(3X),
++\fB\%key_defined\fP(3X),
++\fB\%keybound\fP(3X),
++\fB\%keyok\fP(3X),
+Index: man/ncurses.3x
+Prereq:  1.215 
+--- ncurses-6.5-20240511+/man/ncurses.3x	2024-05-11 20:39:53.000000000 +0000
++++ ncurses-6.5-20240518/man/ncurses.3x	2024-05-18 20:02:27.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: ncurses.3x,v 1.215 2024/05/11 20:39:53 tom Exp $
+-.TH ncurses 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: ncurses.3x,v 1.217 2024/05/18 20:02:27 tom Exp $
++.TH ncurses 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -302,7 +302,7 @@
+ .PP
+ Many terminals support configuration of character cell foreground and
+ background colors as well as rendering
+-.I attributes ,
++.IR attributes ","
+ which cause characters to show up in such modes as
+ boldfaced,
+ underlined,
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20240511+/package/debian-mingw/changelog	2024-05-11 10:20:08.000000000 +0000
++++ ncurses-6.5-20240518/package/debian-mingw/changelog	2024-05-18 10:54:27.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.5+20240511) unstable; urgency=low
++ncurses6 (6.5+20240518) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 11 May 2024 06:20:08 -0400
++ -- Thomas E. Dickey   Sat, 18 May 2024 06:54:27 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20240511+/package/debian-mingw64/changelog	2024-05-11 10:20:08.000000000 +0000
++++ ncurses-6.5-20240518/package/debian-mingw64/changelog	2024-05-18 10:54:27.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.5+20240511) unstable; urgency=low
++ncurses6 (6.5+20240518) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 11 May 2024 06:20:08 -0400
++ -- Thomas E. Dickey   Sat, 18 May 2024 06:54:27 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20240511+/package/debian/changelog	2024-05-11 10:20:08.000000000 +0000
++++ ncurses-6.5-20240518/package/debian/changelog	2024-05-18 10:54:27.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.5+20240511) unstable; urgency=low
++ncurses6 (6.5+20240518) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 11 May 2024 06:20:08 -0400
++ -- Thomas E. Dickey   Sat, 18 May 2024 06:54:27 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/debian/ncurses6.lintian-overrides
+--- ncurses-6.5-20240511+/package/debian/ncurses6.lintian-overrides	2024-04-08 15:42:08.000000000 +0000
++++ ncurses-6.5-20240518/package/debian/ncurses6.lintian-overrides	2024-05-18 19:21:47.000000000 +0000
+@@ -4,6 +4,6 @@
+ # This is intentional.
+ ncurses6: binary-without-manpage
+ ncurses6: non-dev-pkg-with-shlib-symlink
+-ncurses6: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfow6.so.6.4]
++ncurses6: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfow6.so.6.5]
+ 
+ # vile: confmode
+Index: package/debian/ncursest6.lintian-overrides
+--- ncurses-6.5-20240511+/package/debian/ncursest6.lintian-overrides	2024-04-08 15:42:31.000000000 +0000
++++ ncurses-6.5-20240518/package/debian/ncursest6.lintian-overrides	2024-05-18 19:21:02.000000000 +0000
+@@ -4,6 +4,6 @@
+ # This is intentional.
+ ncursest6: binary-without-manpage
+ ncursest6: non-dev-pkg-with-shlib-symlink
+-ncursest6: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfotw6.so.6.4]
++ncursest6: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfotw6.so.6.5]
+ 
+ # vile: confmode
+Index: package/mingw-ncurses.nsi
+Prereq:  1.647 
+--- ncurses-6.5-20240511+/package/mingw-ncurses.nsi	2024-05-11 10:20:08.000000000 +0000
++++ ncurses-6.5-20240518/package/mingw-ncurses.nsi	2024-05-18 10:54:27.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.647 2024/05/11 10:20:08 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.648 2024/05/18 10:54:27 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "0511"
++!define VERSION_MMDD  "0518"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20240511+/package/mingw-ncurses.spec	2024-05-11 10:20:08.000000000 +0000
++++ ncurses-6.5-20240518/package/mingw-ncurses.spec	2024-05-18 10:54:27.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20240511
++Release: 20240518
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20240511+/package/ncurses.spec	2024-05-11 10:20:08.000000000 +0000
++++ ncurses-6.5-20240518/package/ncurses.spec	2024-05-18 10:54:27.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20240511
++Release: 20240518
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20240511+/package/ncursest.spec	2024-05-11 10:20:08.000000000 +0000
++++ ncurses-6.5-20240518/package/ncursest.spec	2024-05-18 10:54:27.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20240511
++Release: 20240518
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/aclocal.m4
+Prereq:  1.221 
+--- ncurses-6.5-20240511+/test/aclocal.m4	2024-01-19 18:27:20.000000000 +0000
++++ ncurses-6.5-20240518/test/aclocal.m4	2024-05-18 18:08:04.000000000 +0000
+@@ -27,7 +27,7 @@
+ dnl authorization.                                                           *
+ dnl***************************************************************************
+ dnl
+-dnl $Id: aclocal.m4,v 1.221 2024/01/19 18:27:20 tom Exp $
++dnl $Id: aclocal.m4,v 1.222 2024/05/18 18:08:04 tom Exp $
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+@@ -1685,19 +1685,36 @@
+ test "$cf_cv_func_curses_version" = yes && AC_DEFINE(HAVE_CURSES_VERSION,1,[Define to 1 if we have curses_version function])
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_FUNC_GETTIME version: 2 updated: 2023/02/25 08:45:56
++dnl CF_FUNC_GETTIME version: 3 updated: 2024/05/11 13:40:02
+ dnl ---------------
+ dnl Check for gettimeofday or clock_gettime.  In 2023, the former is still more
+ dnl widely supported, but "deprecated" (2008), so we will use the latter if it
+ dnl is available, to reduce compiler warnings.
+ AC_DEFUN([CF_FUNC_GETTIME],[
+-AC_CACHE_CHECK(for clock_gettime,cf_cv_func_clock_gettime,[
+-		AC_TRY_LINK([#include ],
++cf_save_libs="$LIBS"
++AC_CHECK_FUNC(clock_gettime,
++	cf_cv_test_clock_gettime=yes,
++	AC_CHECK_LIB(rt, clock_gettime,
++		[LIBS="-lrt $LIBS"
++		 cf_cv_test_clock_gettime=yes],
++		 cf_cv_test_clock_gettime=no))
++
++if test "$cf_cv_test_clock_gettime" = yes ; then
++AC_CACHE_CHECK(if clock_gettime links,cf_cv_func_clock_gettime,[
++		AC_TRY_LINK([
++$ac_includes_default
++#include 
++		],
+ 		[struct timespec ts;
+-		int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts],
++		int rc = clock_gettime(CLOCK_REALTIME, &ts)
++			   + clock_gettime(CLOCK_MONOTONIC, &ts);
++		 (void) rc; (void)ts],
+ 		[cf_cv_func_clock_gettime=yes],
+ 		[cf_cv_func_clock_gettime=no])
+ ])
++else
++	cf_cv_func_clock_gettime=no
++fi
+ 
+ if test "$cf_cv_func_clock_gettime" = yes
+ then
+Index: test/configure
+--- ncurses-6.5-20240511+/test/configure	2024-03-30 14:58:02.000000000 +0000
++++ ncurses-6.5-20240518/test/configure	2024-05-18 18:08:31.000000000 +0000
+@@ -18629,36 +18629,162 @@
+ 
+ fi
+ 
+-echo "$as_me:18632: checking for clock_gettime" >&5
++cf_save_libs="$LIBS"
++echo "$as_me:18633: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
++if test "${ac_cv_func_clock_gettime+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >"conftest.$ac_ext" <<_ACEOF
++#line 18639 "configure"
++#include "confdefs.h"
++#define clock_gettime autoconf_temporary
++#include 	/* least-intrusive standard header which defines gcc2 __stub macros */
++#undef clock_gettime
++
++#ifdef __cplusplus
++extern "C"
++#endif
++
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char clock_gettime (void);
++
++int
++main (void)
++{
++
++/* The GNU C library defines stubs for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_clock_gettime) || defined (__stub___clock_gettime)
++#error found stub for clock_gettime
++#endif
++
++	return clock_gettime ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f "conftest.$ac_objext" "conftest$ac_exeext"
++if { (eval echo "$as_me:18670: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:18673: \$? = $ac_status" >&5
++  (exit "$ac_status"); } &&
++         { ac_try='test -s "conftest$ac_exeext"'
++  { (eval echo "$as_me:18676: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:18679: \$? = $ac_status" >&5
++  (exit "$ac_status"); }; }; then
++  ac_cv_func_clock_gettime=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat "conftest.$ac_ext" >&5
++ac_cv_func_clock_gettime=no
++fi
++rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
++fi
++echo "$as_me:18689: result: $ac_cv_func_clock_gettime" >&5
++echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
++if test "$ac_cv_func_clock_gettime" = yes; then
++  cf_cv_test_clock_gettime=yes
++else
++  echo "$as_me:18694: checking for clock_gettime in -lrt" >&5
++echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
++if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lrt  $LIBS"
++cat >"conftest.$ac_ext" <<_ACEOF
++#line 18702 "configure"
++#include "confdefs.h"
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char clock_gettime (void);
++int
++main (void)
++{
++clock_gettime ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f "conftest.$ac_objext" "conftest$ac_exeext"
++if { (eval echo "$as_me:18721: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:18724: \$? = $ac_status" >&5
++  (exit "$ac_status"); } &&
++         { ac_try='test -s "conftest$ac_exeext"'
++  { (eval echo "$as_me:18727: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:18730: \$? = $ac_status" >&5
++  (exit "$ac_status"); }; }; then
++  ac_cv_lib_rt_clock_gettime=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat "conftest.$ac_ext" >&5
++ac_cv_lib_rt_clock_gettime=no
++fi
++rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:18741: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
++if test "$ac_cv_lib_rt_clock_gettime" = yes; then
++  LIBS="-lrt $LIBS"
++		 cf_cv_test_clock_gettime=yes
++else
++  cf_cv_test_clock_gettime=no
++fi
++
++fi
++
++if test "$cf_cv_test_clock_gettime" = yes ; then
++echo "$as_me:18753: checking if clock_gettime links" >&5
++echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18639 "configure"
++#line 18760 "configure"
+ #include "confdefs.h"
++
++$ac_includes_default
+ #include 
++
+ int
+ main (void)
+ {
+ struct timespec ts;
+-		int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts
++		int rc = clock_gettime(CLOCK_REALTIME, &ts)
++			   + clock_gettime(CLOCK_MONOTONIC, &ts);
++		 (void) rc; (void)ts
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18652: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18778: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18655: \$? = $ac_status" >&5
++  echo "$as_me:18781: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18658: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18784: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18661: \$? = $ac_status" >&5
++  echo "$as_me:18787: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -18669,8 +18795,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:18672: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:18798: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
++else
++	cf_cv_func_clock_gettime=no
++fi
+ 
+ if test "$cf_cv_func_clock_gettime" = yes
+ then
+@@ -18680,13 +18809,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:18683: checking for gettimeofday" >&5
++echo "$as_me:18812: 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 18689 "configure"
++#line 18818 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18717,16 +18846,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18720: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18849: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18723: \$? = $ac_status" >&5
++  echo "$as_me:18852: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18726: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18855: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18729: \$? = $ac_status" >&5
++  echo "$as_me:18858: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -18736,7 +18865,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18739: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:18868: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -18746,7 +18875,7 @@
+ 
+ else
+ 
+-echo "$as_me:18749: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:18878: 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
+@@ -18754,7 +18883,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18757 "configure"
++#line 18886 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18773,16 +18902,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18776: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18905: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18779: \$? = $ac_status" >&5
++  echo "$as_me:18908: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18782: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18911: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18785: \$? = $ac_status" >&5
++  echo "$as_me:18914: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -18793,7 +18922,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18796: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:18925: 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
+ 
+@@ -18831,13 +18960,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:18834: checking for $ac_func" >&5
++echo "$as_me:18963: 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 18840 "configure"
++#line 18969 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18868,16 +18997,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18871: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19000: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18874: \$? = $ac_status" >&5
++  echo "$as_me:19003: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18877: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19006: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18880: \$? = $ac_status" >&5
++  echo "$as_me:19009: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -18887,7 +19016,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18890: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:19019: 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:19030: checking if we can use termcap.h" >&5
+ echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
+ if test "${cf_cv_have_termcap_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18908 "configure"
++#line 19037 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18926,16 +19055,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18929: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19058: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18932: \$? = $ac_status" >&5
++  echo "$as_me:19061: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18935: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19064: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18938: \$? = $ac_status" >&5
++  echo "$as_me:19067: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_termcap_h=yes
+ else
+@@ -18945,7 +19074,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18948: result: $cf_cv_have_termcap_h" >&5
++echo "$as_me:19077: result: $cf_cv_have_termcap_h" >&5
+ echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
+ if test "x$cf_cv_have_termcap_h" = xyes
+ then
+@@ -18955,14 +19084,14 @@
+ EOF
+ 
+ else
+-echo "$as_me:18958: checking if we can use ncurses/termcap.h" >&5
++echo "$as_me:19087: checking if we can use ncurses/termcap.h" >&5
+ echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
+ if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18965 "configure"
++#line 19094 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18983,16 +19112,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18986: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19115: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18989: \$? = $ac_status" >&5
++  echo "$as_me:19118: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18992: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19121: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18995: \$? = $ac_status" >&5
++  echo "$as_me:19124: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_ncurses_termcap_h=yes
+ else
+@@ -19002,7 +19131,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19005: result: $cf_cv_have_ncurses_termcap_h" >&5
++echo "$as_me:19134: result: $cf_cv_have_ncurses_termcap_h" >&5
+ echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
+ test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -19012,7 +19141,7 @@
+ fi
+ 
+ if test "x$ac_cv_func_getopt" = xno; then
+-	{ { echo "$as_me:19015: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:19144: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -19031,13 +19160,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:19034: checking for $ac_func" >&5
++echo "$as_me:19163: 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 19040 "configure"
++#line 19169 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19068,16 +19197,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19071: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19200: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19074: \$? = $ac_status" >&5
++  echo "$as_me:19203: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19077: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19206: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19080: \$? = $ac_status" >&5
++  echo "$as_me:19209: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -19087,7 +19216,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19090: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:19219: 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:19231: checking definition to turn on extended curses functions" >&5
+ echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
+ if test "${cf_cv_need_xopen_extension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19107,7 +19236,7 @@
+ 
+ cf_cv_need_xopen_extension=unknown
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19110 "configure"
++#line 19239 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -19140,16 +19269,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19143: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19272: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19146: \$? = $ac_status" >&5
++  echo "$as_me:19275: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19149: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19278: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19152: \$? = $ac_status" >&5
++  echo "$as_me:19281: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_xopen_extension=none
+ else
+@@ -19159,7 +19288,7 @@
+ 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19162 "configure"
++#line 19291 "configure"
+ #include "confdefs.h"
+ 
+ #define $cf_try_xopen_extension 1
+@@ -19185,16 +19314,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19188: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19317: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19191: \$? = $ac_status" >&5
++  echo "$as_me:19320: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19194: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19323: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19197: \$? = $ac_status" >&5
++  echo "$as_me:19326: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
+ else
+@@ -19208,7 +19337,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:19211: result: $cf_cv_need_xopen_extension" >&5
++echo "$as_me:19340: result: $cf_cv_need_xopen_extension" >&5
+ echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
+ 
+ case "$cf_cv_need_xopen_extension" in
+@@ -19220,7 +19349,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19223: checking for term.h" >&5
++echo "$as_me:19352: checking for term.h" >&5
+ echo $ECHO_N "checking for term.h... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19241,7 +19370,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19244 "configure"
++#line 19373 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19255,16 +19384,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19258: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19387: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19261: \$? = $ac_status" >&5
++  echo "$as_me:19390: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19264: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19393: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19267: \$? = $ac_status" >&5
++  echo "$as_me:19396: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_term_header=$cf_header
+ 	 break
+@@ -19283,7 +19412,7 @@
+ 	for cf_header in ncurses/term.h ncursesw/term.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19286 "configure"
++#line 19415 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19301,16 +19430,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19304: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19433: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19307: \$? = $ac_status" >&5
++  echo "$as_me:19436: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19310: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19439: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19313: \$? = $ac_status" >&5
++  echo "$as_me:19442: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_term_header=$cf_header
+ 			 break
+@@ -19325,7 +19454,7 @@
+ esac
+ 
+ fi
+-echo "$as_me:19328: result: $cf_cv_term_header" >&5
++echo "$as_me:19457: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ case "$cf_cv_term_header" in
+@@ -19352,7 +19481,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19355: checking for unctrl.h" >&5
++echo "$as_me:19484: checking for unctrl.h" >&5
+ echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
+ if test "${cf_cv_unctrl_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19373,7 +19502,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19376 "configure"
++#line 19505 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19387,16 +19516,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19390: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19519: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19393: \$? = $ac_status" >&5
++  echo "$as_me:19522: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19396: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19525: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19399: \$? = $ac_status" >&5
++  echo "$as_me:19528: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unctrl_header=$cf_header
+ 	 break
+@@ -19409,12 +19538,12 @@
+ done
+ 
+ fi
+-echo "$as_me:19412: result: $cf_cv_unctrl_header" >&5
++echo "$as_me:19541: result: $cf_cv_unctrl_header" >&5
+ echo "${ECHO_T}$cf_cv_unctrl_header" >&6
+ 
+ case "$cf_cv_unctrl_header" in
+ (no)
+-	{ echo "$as_me:19417: WARNING: unctrl.h header not found" >&5
++	{ echo "$as_me:19546: WARNING: unctrl.h header not found" >&5
+ echo "$as_me: WARNING: unctrl.h header not found" >&2;}
+ 	;;
+ esac
+@@ -19512,10 +19641,10 @@
+ 
+ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 
+-	echo "$as_me:19515: checking for ${cf_func}" >&5
++	echo "$as_me:19644: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:19518: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:19647: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19524,7 +19653,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19527 "configure"
++#line 19656 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -19557,16 +19686,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19560: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19689: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19563: \$? = $ac_status" >&5
++  echo "$as_me:19692: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19566: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19695: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19569: \$? = $ac_status" >&5
++  echo "$as_me:19698: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -19582,7 +19711,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:19585: result: $cf_result" >&5
++	echo "$as_me:19714: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" != no; then
+ 		cat >>confdefs.h <&5
++	echo "$as_me:19729: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:19603: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:19732: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19609,7 +19738,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19612 "configure"
++#line 19741 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -19642,16 +19771,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19645: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19774: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19648: \$? = $ac_status" >&5
++  echo "$as_me:19777: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19651: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19780: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19654: \$? = $ac_status" >&5
++  echo "$as_me:19783: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -19667,7 +19796,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:19670: result: $cf_result" >&5
++	echo "$as_me:19799: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" != no; then
+ 		cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF
+-#line 19694 "configure"
++#line 19823 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19711,21 +19840,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19714: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19843: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19717: \$? = $ac_status" >&5
++  echo "$as_me:19846: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19720: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19849: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19723: \$? = $ac_status" >&5
++  echo "$as_me:19852: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
+ 
+-echo "${as_me:-configure}:19728: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
++echo "${as_me:-configure}:19857: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+ 
+ 		cat >>confdefs.h <&5
++echo "$as_me:19877: checking for ncurses extended functions" >&5
+ echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19755 "configure"
++#line 19884 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19767,16 +19896,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19770: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19899: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19773: \$? = $ac_status" >&5
++  echo "$as_me:19902: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19776: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19905: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19779: \$? = $ac_status" >&5
++  echo "$as_me:19908: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_ext_funcs=defined
+ else
+@@ -19784,7 +19913,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19787 "configure"
++#line 19916 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19809,16 +19938,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19812: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19941: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19815: \$? = $ac_status" >&5
++  echo "$as_me:19944: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19818: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19947: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19821: \$? = $ac_status" >&5
++  echo "$as_me:19950: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_ext_funcs=yes
+ else
+@@ -19832,7 +19961,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:19835: result: $cf_cv_ncurses_ext_funcs" >&5
++echo "$as_me:19964: result: $cf_cv_ncurses_ext_funcs" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
+ test "$cf_cv_ncurses_ext_funcs" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -19846,11 +19975,11 @@
+ 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
+ 	then
+ 		cf_define_xpg5=no
+-		echo "$as_me:19849: checking if _XPG5 should be defined to enable wide-characters" >&5
++		echo "$as_me:19978: checking if _XPG5 should be defined to enable wide-characters" >&5
+ echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19853 "configure"
++#line 19982 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19863,16 +19992,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19866: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19995: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19869: \$? = $ac_status" >&5
++  echo "$as_me:19998: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19872: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20001: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19875: \$? = $ac_status" >&5
++  echo "$as_me:20004: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -19881,7 +20010,7 @@
+ cf_save_cppflags="$CPPFLAGS"
+ 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19884 "configure"
++#line 20013 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19894,16 +20023,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19897: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20026: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19900: \$? = $ac_status" >&5
++  echo "$as_me:20029: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19903: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20032: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19906: \$? = $ac_status" >&5
++  echo "$as_me:20035: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_define_xpg5=yes
+ else
+@@ -19914,7 +20043,7 @@
+ 			 CPPFLAGS="$cf_save_cppflags"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-		echo "$as_me:19917: result: $cf_define_xpg5" >&5
++		echo "$as_me:20046: result: $cf_define_xpg5" >&5
+ echo "${ECHO_T}$cf_define_xpg5" >&6
+ 
+ 		if test "$cf_define_xpg5" = yes
+@@ -19923,14 +20052,14 @@
+ 		fi
+ 	fi
+ 
+-	echo "$as_me:19926: checking for wide-character functions" >&5
++	echo "$as_me:20055: checking for wide-character functions" >&5
+ echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
+ if test "${cf_cv_widechar_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19933 "configure"
++#line 20062 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19947,16 +20076,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19950: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20079: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19953: \$? = $ac_status" >&5
++  echo "$as_me:20082: \$? = $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:20085: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19959: \$? = $ac_status" >&5
++  echo "$as_me:20088: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_widechar_funcs=yes
+ else
+@@ -19967,7 +20096,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:19970: result: $cf_cv_widechar_funcs" >&5
++echo "$as_me:20099: result: $cf_cv_widechar_funcs" >&5
+ echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
+ 	if test "$cf_cv_widechar_funcs" != no ; then
+ 
+@@ -19988,14 +20117,14 @@
+ 
+ fi
+ 
+-echo "$as_me:19991: checking if $cf_cv_screen library uses pthreads" >&5
++echo "$as_me:20120: checking if $cf_cv_screen library uses pthreads" >&5
+ echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
+ if test "${cf_cv_use_pthreads+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19998 "configure"
++#line 20127 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20013,16 +20142,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20016: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20145: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20019: \$? = $ac_status" >&5
++  echo "$as_me:20148: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20022: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20151: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20025: \$? = $ac_status" >&5
++  echo "$as_me:20154: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_use_pthreads=yes
+ else
+@@ -20033,21 +20162,21 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20036: result: $cf_cv_use_pthreads" >&5
++echo "$as_me:20165: result: $cf_cv_use_pthreads" >&5
+ echo "${ECHO_T}$cf_cv_use_pthreads" >&6
+ test $cf_cv_use_pthreads = yes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_PTHREADS 1
+ EOF
+ 
+-echo "$as_me:20043: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:20172: 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 20050 "configure"
++#line 20179 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20067,16 +20196,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20070: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20199: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20073: \$? = $ac_status" >&5
++  echo "$as_me:20202: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20076: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20205: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20079: \$? = $ac_status" >&5
++  echo "$as_me:20208: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -20088,7 +20217,7 @@
+ 
+ fi
+ 
+-echo "$as_me:20091: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:20220: 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
+@@ -20097,7 +20226,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:20100: checking for openpty in -lutil" >&5
++echo "$as_me:20229: 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
+@@ -20105,7 +20234,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20108 "configure"
++#line 20237 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20124,16 +20253,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20127: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20256: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20130: \$? = $ac_status" >&5
++  echo "$as_me:20259: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20133: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20262: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20136: \$? = $ac_status" >&5
++  echo "$as_me:20265: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -20144,7 +20273,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20147: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:20276: 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
+@@ -20152,7 +20281,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:20155: checking for openpty header" >&5
++echo "$as_me:20284: 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
+@@ -20179,7 +20308,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20182 "configure"
++#line 20311 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20197,16 +20326,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20200: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20329: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20203: \$? = $ac_status" >&5
++  echo "$as_me:20332: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20206: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20335: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20209: \$? = $ac_status" >&5
++  echo "$as_me:20338: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -20224,7 +20353,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:20227: result: $cf_cv_func_openpty" >&5
++echo "$as_me:20356: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -20258,7 +20387,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:20261: checking for function curses_version" >&5
++echo "$as_me:20390: checking for function curses_version" >&5
+ echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
+ if test "${cf_cv_func_curses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20268,7 +20397,7 @@
+   cf_cv_func_curses_version=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20271 "configure"
++#line 20400 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -20284,15 +20413,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:20287: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20416: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20290: \$? = $ac_status" >&5
++  echo "$as_me:20419: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:20292: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20421: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20295: \$? = $ac_status" >&5
++  echo "$as_me:20424: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_curses_version=yes
+ 
+@@ -20307,14 +20436,14 @@
+ fi
+ rm -f core
+ fi
+-echo "$as_me:20310: result: $cf_cv_func_curses_version" >&5
++echo "$as_me:20439: result: $cf_cv_func_curses_version" >&5
+ echo "${ECHO_T}$cf_cv_func_curses_version" >&6
+ test "$cf_cv_func_curses_version" = yes &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_CURSES_VERSION 1
+ EOF
+ 
+-echo "$as_me:20317: checking for alternate character set array" >&5
++echo "$as_me:20446: checking for alternate character set array" >&5
+ echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_acs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20324,7 +20453,7 @@
+ for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20327 "configure"
++#line 20456 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20340,16 +20469,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20343: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20472: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20346: \$? = $ac_status" >&5
++  echo "$as_me:20475: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20349: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20478: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20352: \$? = $ac_status" >&5
++  echo "$as_me:20481: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_acs_map=$name; break
+ else
+@@ -20360,7 +20489,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20363: result: $cf_cv_curses_acs_map" >&5
++echo "$as_me:20492: result: $cf_cv_curses_acs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
+ 
+ test "$cf_cv_curses_acs_map" != unknown &&
+@@ -20370,7 +20499,7 @@
+ 
+ if test "$cf_enable_widec" = yes; then
+ 
+-echo "$as_me:20373: checking for wide alternate character set array" >&5
++echo "$as_me:20502: checking for wide alternate character set array" >&5
+ echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20380,7 +20509,7 @@
+ 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20383 "configure"
++#line 20512 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20396,16 +20525,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20399: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20528: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20402: \$? = $ac_status" >&5
++  echo "$as_me:20531: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20405: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20534: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20408: \$? = $ac_status" >&5
++  echo "$as_me:20537: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_wacs_map=$name
+ 	 break
+@@ -20416,7 +20545,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	done
+ fi
+-echo "$as_me:20419: result: $cf_cv_curses_wacs_map" >&5
++echo "$as_me:20548: result: $cf_cv_curses_wacs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
+ 
+ test "$cf_cv_curses_wacs_map" != unknown &&
+@@ -20424,7 +20553,7 @@
+ #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
+ EOF
+ 
+-echo "$as_me:20427: checking for wide alternate character constants" >&5
++echo "$as_me:20556: checking for wide alternate character constants" >&5
+ echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_symbols+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20434,7 +20563,7 @@
+ if test "$cf_cv_curses_wacs_map" != unknown
+ then
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20437 "configure"
++#line 20566 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20451,16 +20580,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20454: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20583: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20457: \$? = $ac_status" >&5
++  echo "$as_me:20586: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20460: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20589: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20463: \$? = $ac_status" >&5
++  echo "$as_me:20592: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -20470,7 +20599,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ else
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20473 "configure"
++#line 20602 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20486,16 +20615,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20489: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20618: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20492: \$? = $ac_status" >&5
++  echo "$as_me:20621: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20495: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20624: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20498: \$? = $ac_status" >&5
++  echo "$as_me:20627: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -20506,7 +20635,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:20509: result: $cf_cv_curses_wacs_symbols" >&5
++echo "$as_me:20638: result: $cf_cv_curses_wacs_symbols" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
+ 
+ test "$cf_cv_curses_wacs_symbols" != no &&
+@@ -20516,10 +20645,10 @@
+ 
+ fi
+ 
+-echo "$as_me:20519: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:20648: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20522 "configure"
++#line 20651 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20537,16 +20666,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20540: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20669: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20543: \$? = $ac_status" >&5
++  echo "$as_me:20672: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20546: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20675: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20549: \$? = $ac_status" >&5
++  echo "$as_me:20678: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -20555,7 +20684,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:20558: result: $cf_result" >&5
++echo "$as_me:20687: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -20576,14 +20705,14 @@
+ if test "$cf_enable_widec" = yes; then
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:20579: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:20708: 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 20586 "configure"
++#line 20715 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20601,23 +20730,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20604: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20733: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20607: \$? = $ac_status" >&5
++  echo "$as_me:20736: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20610: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20739: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20613: \$? = $ac_status" >&5
++  echo "$as_me:20742: \$? = $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 20620 "configure"
++#line 20749 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20636,16 +20765,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20639: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20768: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20642: \$? = $ac_status" >&5
++  echo "$as_me:20771: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20645: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20774: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20648: \$? = $ac_status" >&5
++  echo "$as_me:20777: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -20657,7 +20786,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20660: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:20789: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -20680,14 +20809,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:20683: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:20812: 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 20690 "configure"
++#line 20819 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20705,23 +20834,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20708: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20837: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20711: \$? = $ac_status" >&5
++  echo "$as_me:20840: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20714: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20843: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20717: \$? = $ac_status" >&5
++  echo "$as_me:20846: \$? = $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 20724 "configure"
++#line 20853 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20740,16 +20869,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20743: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20872: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20746: \$? = $ac_status" >&5
++  echo "$as_me:20875: \$? = $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:20878: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20752: \$? = $ac_status" >&5
++  echo "$as_me:20881: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -20761,7 +20890,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20764: result: $cf_cv_wchar_t" >&5
++echo "$as_me:20893: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -20784,14 +20913,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:20787: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:20916: 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 20794 "configure"
++#line 20923 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20809,23 +20938,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20812: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20941: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20815: \$? = $ac_status" >&5
++  echo "$as_me:20944: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20818: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20947: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20821: \$? = $ac_status" >&5
++  echo "$as_me:20950: \$? = $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 20828 "configure"
++#line 20957 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20844,16 +20973,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20847: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20976: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20850: \$? = $ac_status" >&5
++  echo "$as_me:20979: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20853: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20982: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20856: \$? = $ac_status" >&5
++  echo "$as_me:20985: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -20865,7 +20994,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20868: result: $cf_cv_wint_t" >&5
++echo "$as_me:20997: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -20889,10 +21018,10 @@
+ 
+ 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
+ 
+-echo "$as_me:20892: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21021: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20895 "configure"
++#line 21024 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20910,16 +21039,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20913: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21042: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20916: \$? = $ac_status" >&5
++  echo "$as_me:21045: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20919: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21048: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20922: \$? = $ac_status" >&5
++  echo "$as_me:21051: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -20928,7 +21057,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:20931: result: $cf_result" >&5
++echo "$as_me:21060: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -20950,10 +21079,10 @@
+ 
+ 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
+ 
+-echo "$as_me:20953: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21082: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20956 "configure"
++#line 21085 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20971,16 +21100,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20974: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21103: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20977: \$? = $ac_status" >&5
++  echo "$as_me:21106: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20980: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21109: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20983: \$? = $ac_status" >&5
++  echo "$as_me:21112: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -20989,7 +21118,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:20992: result: $cf_result" >&5
++echo "$as_me:21121: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -21011,10 +21140,10 @@
+ 
+ 	if test "$NCURSES_OK_WINT_T" = 0 ; then
+ 
+-echo "$as_me:21014: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21143: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21017 "configure"
++#line 21146 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21032,16 +21161,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21035: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21164: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21038: \$? = $ac_status" >&5
++  echo "$as_me:21167: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21041: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21170: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21044: \$? = $ac_status" >&5
++  echo "$as_me:21173: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21050,7 +21179,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21053: result: $cf_result" >&5
++echo "$as_me:21182: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -21079,11 +21208,11 @@
+ boolfnames \
+ ttytype
+ do
+-echo "$as_me:21082: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21211: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21086 "configure"
++#line 21215 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -21116,16 +21245,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21119: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21248: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21122: \$? = $ac_status" >&5
++  echo "$as_me:21251: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21125: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21254: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21128: \$? = $ac_status" >&5
++  echo "$as_me:21257: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ 
+@@ -21135,7 +21264,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21138: result: $cf_result" >&5
++echo "$as_me:21267: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test "$cf_result" = yes ; then
+@@ -21147,14 +21276,14 @@
+ EOF
+ 
+ else
+-	echo "$as_me:21150: checking for data $cf_data in library" >&5
++	echo "$as_me:21279: checking for data $cf_data in library" >&5
+ echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6
+ 	# BSD linkers insist on making weak linkage, but resolve at runtime.
+ 	if test "$cross_compiling" = yes; then
+ 
+ 	# cross-compiling
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21157 "configure"
++#line 21286 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -21193,16 +21322,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21196: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21325: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21199: \$? = $ac_status" >&5
++  echo "$as_me:21328: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21202: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21331: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21205: \$? = $ac_status" >&5
++  echo "$as_me:21334: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21214,7 +21343,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21217 "configure"
++#line 21346 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -21246,15 +21375,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21249: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21378: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21252: \$? = $ac_status" >&5
++  echo "$as_me:21381: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21254: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21383: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21257: \$? = $ac_status" >&5
++  echo "$as_me:21386: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ 
+@@ -21266,7 +21395,7 @@
+ fi
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-	echo "$as_me:21269: result: $cf_result" >&5
++	echo "$as_me:21398: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = yes ; then
+ 
+@@ -21283,7 +21412,7 @@
+ 
+ if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
+ then
+-	echo "$as_me:21286: checking for X" >&5
++	echo "$as_me:21415: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
+ # Check whether --with-x or --without-x was given.
+@@ -21387,17 +21516,17 @@
+   # Guess where to find include files, by looking for Intrinsic.h.
+   # First, try using that file with no special directory specified.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21390 "configure"
++#line 21519 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:21394: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:21523: \"$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:21400: \$? = $ac_status" >&5
++  echo "$as_me:21529: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -21430,7 +21559,7 @@
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21433 "configure"
++#line 21562 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -21442,16 +21571,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21445: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21574: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21448: \$? = $ac_status" >&5
++  echo "$as_me:21577: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21451: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21580: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21454: \$? = $ac_status" >&5
++  echo "$as_me:21583: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -21489,7 +21618,7 @@
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:21492: result: $have_x" >&5
++  echo "$as_me:21621: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+   no_x=yes
+ else
+@@ -21499,7 +21628,7 @@
+   # Update the cache value to reflect the command line values.
+   ac_cv_have_x="have_x=yes \
+ 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  echo "$as_me:21502: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "$as_me:21631: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+@@ -21526,11 +21655,11 @@
+     # others require no space.  Words are not sufficient . . . .
+     case `(uname -sr) 2>/dev/null` in
+     "SunOS 5"*)
+-      echo "$as_me:21529: checking whether -R must be followed by a space" >&5
++      echo "$as_me:21658: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+       cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21533 "configure"
++#line 21662 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21542,16 +21671,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21545: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21674: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21548: \$? = $ac_status" >&5
++  echo "$as_me:21677: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21551: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21680: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21554: \$? = $ac_status" >&5
++  echo "$as_me:21683: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_nospace=yes
+ else
+@@ -21561,13 +21690,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+       if test $ac_R_nospace = yes; then
+-	echo "$as_me:21564: result: no" >&5
++	echo "$as_me:21693: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	X_LIBS="$X_LIBS -R$x_libraries"
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21570 "configure"
++#line 21699 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21579,16 +21708,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21582: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21711: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21585: \$? = $ac_status" >&5
++  echo "$as_me:21714: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21588: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21717: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21591: \$? = $ac_status" >&5
++  echo "$as_me:21720: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_space=yes
+ else
+@@ -21598,11 +21727,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	if test $ac_R_space = yes; then
+-	  echo "$as_me:21601: result: yes" >&5
++	  echo "$as_me:21730: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ 	else
+-	  echo "$as_me:21605: result: neither works" >&5
++	  echo "$as_me:21734: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ 	fi
+       fi
+@@ -21622,7 +21751,7 @@
+     # the Alpha needs dnet_stub (dnet does not exist).
+     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21625 "configure"
++#line 21754 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21641,22 +21770,22 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21644: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21773: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21647: \$? = $ac_status" >&5
++  echo "$as_me:21776: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21650: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21779: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21653: \$? = $ac_status" >&5
++  echo "$as_me:21782: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:21659: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:21788: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21664,7 +21793,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21667 "configure"
++#line 21796 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21683,16 +21812,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21686: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21815: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21689: \$? = $ac_status" >&5
++  echo "$as_me:21818: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21692: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21821: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21695: \$? = $ac_status" >&5
++  echo "$as_me:21824: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -21703,14 +21832,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21706: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:21835: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      echo "$as_me:21713: checking for dnet_ntoa in -ldnet_stub" >&5
++      echo "$as_me:21842: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21718,7 +21847,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21721 "configure"
++#line 21850 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21737,16 +21866,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21740: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21869: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21743: \$? = $ac_status" >&5
++  echo "$as_me:21872: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21746: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21875: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21749: \$? = $ac_status" >&5
++  echo "$as_me:21878: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -21757,7 +21886,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21760: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:21889: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -21776,13 +21905,13 @@
+     # on Irix 5.2, according to T.E. Dickey.
+     # The functions gethostbyname, getservbyname, and inet_addr are
+     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+-    echo "$as_me:21779: checking for gethostbyname" >&5
++    echo "$as_me:21908: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21785 "configure"
++#line 21914 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21813,16 +21942,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21816: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21945: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21819: \$? = $ac_status" >&5
++  echo "$as_me:21948: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21822: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21951: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21825: \$? = $ac_status" >&5
++  echo "$as_me:21954: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gethostbyname=yes
+ else
+@@ -21832,11 +21961,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21835: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:21964: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+-      echo "$as_me:21839: checking for gethostbyname in -lnsl" >&5
++      echo "$as_me:21968: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21844,7 +21973,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21847 "configure"
++#line 21976 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21863,16 +21992,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21866: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21995: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21869: \$? = $ac_status" >&5
++  echo "$as_me:21998: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21872: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22001: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21875: \$? = $ac_status" >&5
++  echo "$as_me:22004: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -21883,14 +22012,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21886: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:22015: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test "$ac_cv_lib_nsl_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+-        echo "$as_me:21893: checking for gethostbyname in -lbsd" >&5
++        echo "$as_me:22022: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21898,7 +22027,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21901 "configure"
++#line 22030 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21917,16 +22046,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21920: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22049: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21923: \$? = $ac_status" >&5
++  echo "$as_me:22052: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21926: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22055: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21929: \$? = $ac_status" >&5
++  echo "$as_me:22058: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -21937,7 +22066,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21940: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:22069: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test "$ac_cv_lib_bsd_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -21953,13 +22082,13 @@
+     # variants that don't use the nameserver (or something).  -lsocket
+     # must be given before -lnsl if both are needed.  We assume that
+     # if connect needs -lnsl, so does gethostbyname.
+-    echo "$as_me:21956: checking for connect" >&5
++    echo "$as_me:22085: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21962 "configure"
++#line 22091 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21990,16 +22119,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21993: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22122: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21996: \$? = $ac_status" >&5
++  echo "$as_me:22125: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21999: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22128: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22002: \$? = $ac_status" >&5
++  echo "$as_me:22131: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_connect=yes
+ else
+@@ -22009,11 +22138,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22012: result: $ac_cv_func_connect" >&5
++echo "$as_me:22141: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+ 
+     if test $ac_cv_func_connect = no; then
+-      echo "$as_me:22016: checking for connect in -lsocket" >&5
++      echo "$as_me:22145: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22021,7 +22150,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22024 "configure"
++#line 22153 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22040,16 +22169,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22043: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22172: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22046: \$? = $ac_status" >&5
++  echo "$as_me:22175: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22049: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22178: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22052: \$? = $ac_status" >&5
++  echo "$as_me:22181: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_socket_connect=yes
+ else
+@@ -22060,7 +22189,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22063: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:22192: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test "$ac_cv_lib_socket_connect" = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -22069,13 +22198,13 @@
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    echo "$as_me:22072: checking for remove" >&5
++    echo "$as_me:22201: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22078 "configure"
++#line 22207 "configure"
+ #include "confdefs.h"
+ #define remove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22106,16 +22235,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22109: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22238: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22112: \$? = $ac_status" >&5
++  echo "$as_me:22241: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22115: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22244: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22118: \$? = $ac_status" >&5
++  echo "$as_me:22247: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_remove=yes
+ else
+@@ -22125,11 +22254,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22128: result: $ac_cv_func_remove" >&5
++echo "$as_me:22257: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+ 
+     if test $ac_cv_func_remove = no; then
+-      echo "$as_me:22132: checking for remove in -lposix" >&5
++      echo "$as_me:22261: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22137,7 +22266,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22140 "configure"
++#line 22269 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22156,16 +22285,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22159: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22288: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22162: \$? = $ac_status" >&5
++  echo "$as_me:22291: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22165: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22294: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22168: \$? = $ac_status" >&5
++  echo "$as_me:22297: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_posix_remove=yes
+ else
+@@ -22176,7 +22305,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22179: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:22308: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test "$ac_cv_lib_posix_remove" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -22185,13 +22314,13 @@
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    echo "$as_me:22188: checking for shmat" >&5
++    echo "$as_me:22317: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22194 "configure"
++#line 22323 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22222,16 +22351,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22225: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22354: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22228: \$? = $ac_status" >&5
++  echo "$as_me:22357: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22231: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22360: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22234: \$? = $ac_status" >&5
++  echo "$as_me:22363: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_shmat=yes
+ else
+@@ -22241,11 +22370,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22244: result: $ac_cv_func_shmat" >&5
++echo "$as_me:22373: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+ 
+     if test $ac_cv_func_shmat = no; then
+-      echo "$as_me:22248: checking for shmat in -lipc" >&5
++      echo "$as_me:22377: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22253,7 +22382,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22256 "configure"
++#line 22385 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22272,16 +22401,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22275: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22404: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22278: \$? = $ac_status" >&5
++  echo "$as_me:22407: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22281: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22410: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22284: \$? = $ac_status" >&5
++  echo "$as_me:22413: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+@@ -22292,7 +22421,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22295: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:22424: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test "$ac_cv_lib_ipc_shmat" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -22310,7 +22439,7 @@
+   # These have to be linked with before -lX11, unlike the other
+   # libraries we check for below, so use a different variable.
+   # John Interrante, Karl Berry
+-  echo "$as_me:22313: checking for IceConnectionNumber in -lICE" >&5
++  echo "$as_me:22442: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22318,7 +22447,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22321 "configure"
++#line 22450 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22337,16 +22466,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22340: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22469: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22343: \$? = $ac_status" >&5
++  echo "$as_me:22472: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22346: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22475: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22349: \$? = $ac_status" >&5
++  echo "$as_me:22478: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -22357,7 +22486,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22360: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:22489: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -22404,16 +22533,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22407: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22536: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22412: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22541: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22416: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22545: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -22452,16 +22581,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22455: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:22584: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22460: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:22589: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22464: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22593: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -22500,23 +22629,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22503: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:22632: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22508: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:22637: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22512: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22641: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:22519: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:22648: 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.
+@@ -22533,7 +22662,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:22536: result: $enable_warnings" >&5
++echo "$as_me:22665: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -22556,10 +22685,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:22559: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:22688: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -22609,12 +22738,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:22612: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:22741: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22615: \$? = $ac_status" >&5
++  echo "$as_me:22744: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:22617: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:22746: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -22692,7 +22821,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22695 "configure"
++#line 22824 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22707,26 +22836,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22710: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22839: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22713: \$? = $ac_status" >&5
++  echo "$as_me:22842: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22716: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22845: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22719: \$? = $ac_status" >&5
++  echo "$as_me:22848: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:22722: checking for X11/Xt const-feature" >&5
++echo "$as_me:22851: 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 22729 "configure"
++#line 22858 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -22744,16 +22873,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22747: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22876: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22750: \$? = $ac_status" >&5
++  echo "$as_me:22879: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22753: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22882: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22756: \$? = $ac_status" >&5
++  echo "$as_me:22885: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -22768,7 +22897,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22771: result: $cf_cv_const_x_string" >&5
++echo "$as_me:22900: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -22797,7 +22926,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:22945: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -22829,12 +22958,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:22832: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:22961: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22835: \$? = $ac_status" >&5
++  echo "$as_me:22964: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:22837: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:22966: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -22842,7 +22971,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:22845: checking for $CC warning options..." >&5
++	{ echo "$as_me:22974: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -22865,12 +22994,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:22868: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:22997: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22871: \$? = $ac_status" >&5
++  echo "$as_me:23000: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:22873: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:23002: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -22878,7 +23007,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:22881: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:23010: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -22888,7 +23017,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:22891: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:23020: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -22905,7 +23034,7 @@
+ 
+ fi
+ 
+-echo "$as_me:22908: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:23037: 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.
+@@ -22927,7 +23056,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:22930: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:23059: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -23041,23 +23170,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:23044: checking for dmalloc.h" >&5
++	echo "$as_me:23173: 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 23050 "configure"
++#line 23179 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:23054: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23183: \"$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:23060: \$? = $ac_status" >&5
++  echo "$as_me:23189: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23076,11 +23205,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23079: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:23208: 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:23083: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:23212: 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
+@@ -23088,7 +23217,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23091 "configure"
++#line 23220 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -23107,16 +23236,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23110: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23239: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23113: \$? = $ac_status" >&5
++  echo "$as_me:23242: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23116: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23245: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23119: \$? = $ac_status" >&5
++  echo "$as_me:23248: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -23127,7 +23256,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23130: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:23259: 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:23274: 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.
+@@ -23164,7 +23293,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:23167: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:23296: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -23278,23 +23407,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:23281: checking for dbmalloc.h" >&5
++	echo "$as_me:23410: 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 23287 "configure"
++#line 23416 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:23291: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23420: \"$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:23297: \$? = $ac_status" >&5
++  echo "$as_me:23426: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23313,11 +23442,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23316: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:23445: 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:23320: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:23449: 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
+@@ -23325,7 +23454,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23328 "configure"
++#line 23457 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -23344,16 +23473,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23347: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23476: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23350: \$? = $ac_status" >&5
++  echo "$as_me:23479: \$? = $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:23482: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23356: \$? = $ac_status" >&5
++  echo "$as_me:23485: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -23364,7 +23493,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23367: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:23496: 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:23511: 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.
+@@ -23401,7 +23530,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:23404: result: ${with_valgrind:-no}" >&5
++echo "$as_me:23533: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -23514,7 +23643,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:23517: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:23646: 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.
+@@ -23525,7 +23654,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:23528: result: $with_no_leaks" >&5
++echo "$as_me:23657: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -23543,7 +23672,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:23546: checking for an rpath option" >&5
++	echo "$as_me:23675: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -23574,12 +23703,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:23577: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:23706: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:23582: checking if we need a space after rpath option" >&5
++		echo "$as_me:23711: 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"
+ 
+@@ -23600,7 +23729,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23603 "configure"
++#line 23732 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -23612,16 +23741,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23615: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23744: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23618: \$? = $ac_status" >&5
++  echo "$as_me:23747: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23621: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23750: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23624: \$? = $ac_status" >&5
++  echo "$as_me:23753: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -23631,14 +23760,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:23634: result: $cf_rpath_space" >&5
++		echo "$as_me:23763: 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:23641: checking if rpath-hack should be disabled" >&5
++echo "$as_me:23770: 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.
+@@ -23656,22 +23785,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:23659: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:23788: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:23664: checking for updated LDFLAGS" >&5
++echo "$as_me:23793: 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:23667: result: maybe" >&5
++	echo "$as_me:23796: 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:23674: checking for $ac_word" >&5
++echo "$as_me:23803: 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
+@@ -23686,7 +23815,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:23689: found $ac_dir/$ac_word" >&5
++echo "$as_me:23818: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -23694,10 +23823,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:23697: result: $cf_ldd_prog" >&5
++  echo "$as_me:23826: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:23700: result: no" >&5
++  echo "$as_me:23829: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -23711,7 +23840,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23714 "configure"
++#line 23843 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -23723,16 +23852,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23726: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23855: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23729: \$? = $ac_status" >&5
++  echo "$as_me:23858: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23732: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23861: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23735: \$? = $ac_status" >&5
++  echo "$as_me:23864: \$? = $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`
+@@ -23760,7 +23889,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:23763: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:23892: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -23772,11 +23901,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23775: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23904: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23779: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23908: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -23813,7 +23942,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:23816: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:23945: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -23826,11 +23955,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23829: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23958: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:23833: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:23962: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -23867,7 +23996,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:23870: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:23999: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -23880,14 +24009,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:23883: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:24012: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23887: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:24016: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:23890: result: no" >&5
++	echo "$as_me:24019: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -23977,7 +24106,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:23980: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:24109: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -24158,7 +24287,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:24161: error: ambiguous option: $1
++    { { echo "$as_me:24290: 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;}
+@@ -24177,7 +24306,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:24180: error: unrecognized option: $1
++  -*) { { echo "$as_me:24309: 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;}
+@@ -24227,7 +24356,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:24230: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:24359: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -24535,7 +24664,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:24538: creating $ac_file" >&5
++    { echo "$as_me:24667: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -24553,7 +24682,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:24556: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:24685: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -24566,7 +24695,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:24569: error: cannot find input file: $f" >&5
++           { { echo "$as_me:24698: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -24582,7 +24711,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:24585: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:24714: 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;}
+@@ -24591,7 +24720,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:24594: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:24723: 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;}
+@@ -24636,7 +24765,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:24639: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:24768: 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;}
+@@ -24647,7 +24776,7 @@
+     $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:24650: WARNING: Some variables may not be substituted:
++      { echo "$as_me:24779: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -24696,7 +24825,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:24699: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:24828: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -24707,7 +24836,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:24710: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:24839: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -24720,7 +24849,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:24723: error: cannot find input file: $f" >&5
++           { { echo "$as_me:24852: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -24778,7 +24907,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:24781: $ac_file is unchanged" >&5
++      { echo "$as_me:24910: $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/packages/ncurses/6.5/ncurses-6.5-20240519.patch b/packages/ncurses/6.5/ncurses-6.5-20240519.patch
new file mode 100644
index 0000000000..74d88ac882
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20240519.patch
@@ -0,0 +1,1717 @@
+# ncurses 6.5 - patch 20240519 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20240519.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun May 19 23:39:14 UTC 2024
+# ------------------------------------------------------------------------------
+# Ada95/configure                  |  502 +++++++++++++++----------------------
+# Ada95/configure.in               |    6 
+# NEWS                             |    7 
+# VERSION                          |    2 
+# dist.mk                          |    4 
+# include/ncurses_defs             |    3 
+# 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 
+# 13 files changed, 228 insertions(+), 318 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/configure
+--- ncurses-6.5-20240518+/Ada95/configure	2024-05-18 19:51:20.000000000 +0000
++++ ncurses-6.5-20240519/Ada95/configure	2024-05-19 09:14:43.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.92 .
++# From configure.in Revision: 1.93 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20231210.
+ #
+@@ -16636,109 +16636,15 @@
+ if test "$cf_with_trace" = yes ; then
+ 	ADA_TRACE=TRUE
+ 
+-cf_fix_cppflags=no
+-cf_new_cflags=
+-cf_new_cppflags=
+-cf_new_extra_cppflags=
+-
+-for cf_add_cflags in -DTRACE
+-do
+-case "$cf_fix_cppflags" in
+-(no)
+-	case "$cf_add_cflags" in
+-	(-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
+-		case "$cf_add_cflags" in
+-		(-D*)
+-			cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+-
+-			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+-				&& test -z "${cf_tst_cflags}" \
+-				&& cf_fix_cppflags=yes
+-
+-			if test "$cf_fix_cppflags" = yes ; then
+-
+-	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+-	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+-
+-				continue
+-			elif test "${cf_tst_cflags}" = "\"'" ; then
+-
+-	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+-	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+-
+-				continue
+-			fi
+-			;;
+-		esac
+-		case "$CPPFLAGS" in
+-		(*$cf_add_cflags)
+-			;;
+-		(*)
+-			case "$cf_add_cflags" in
+-			(-D*)
+-				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+-
+-CPPFLAGS=`echo "$CPPFLAGS" | \
+-	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
+-		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
+-
+-				;;
+-			esac
+-
+-	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+-	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+-
+-			;;
+-		esac
+-		;;
+-	(*)
+-
+-	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+-	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+-
+-		;;
+-	esac
+-	;;
+-(yes)
+-
+-	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+-	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+-
+-	cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'`
+-
+-	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+-		&& test -z "${cf_tst_cflags}" \
+-		&& cf_fix_cppflags=no
+-	;;
+-esac
+-done
+-
+-if test -n "$cf_new_cflags" ; then
+-
+-	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+-	CFLAGS="${CFLAGS}$cf_new_cflags"
+-
+-fi
+-
+-if test -n "$cf_new_cppflags" ; then
+-
+-	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+-	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+-
+-fi
+-
+-if test -n "$cf_new_extra_cppflags" ; then
+-
+-	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+-	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+-
+-fi
++cat >>confdefs.h <<\EOF
++#define TRACE 1
++EOF
+ 
+ else
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:16741: checking if we want to use GNAT projects" >&5
++echo "$as_me:16647: 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.
+@@ -16755,21 +16661,21 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:16758: result: $enable_gnat_projects" >&5
++echo "$as_me:16664: 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:16765: checking if ssp library is needed" >&5
++echo "$as_me:16671: 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 16772 "configure"
++#line 16678 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16786,16 +16692,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16789: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16695: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16792: \$? = $ac_status" >&5
++  echo "$as_me:16698: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16795: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16701: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16798: \$? = $ac_status" >&5
++  echo "$as_me:16704: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -16805,7 +16711,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16808 "configure"
++#line 16714 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16822,16 +16728,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16825: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16731: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16828: \$? = $ac_status" >&5
++  echo "$as_me:16734: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16831: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16737: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16834: \$? = $ac_status" >&5
++  echo "$as_me:16740: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -16845,7 +16751,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16848: result: $cf_cv_need_libssp" >&5
++echo "$as_me:16754: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -16873,13 +16779,13 @@
+ (*)
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:16876: checking for clock_gettime" >&5
++echo "$as_me:16782: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16882 "configure"
++#line 16788 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16910,16 +16816,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16913: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16819: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16916: \$? = $ac_status" >&5
++  echo "$as_me:16822: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16919: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16825: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16922: \$? = $ac_status" >&5
++  echo "$as_me:16828: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -16929,12 +16835,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16932: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:16838: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:16937: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:16843: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16942,7 +16848,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16945 "configure"
++#line 16851 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16961,16 +16867,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16964: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16870: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16967: \$? = $ac_status" >&5
++  echo "$as_me:16873: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16970: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16876: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16973: \$? = $ac_status" >&5
++  echo "$as_me:16879: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -16981,7 +16887,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16984: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:16890: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -16993,14 +16899,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:16996: checking if clock_gettime links" >&5
++echo "$as_me:16902: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17003 "configure"
++#line 16909 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17018,16 +16924,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17021: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16927: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17024: \$? = $ac_status" >&5
++  echo "$as_me:16930: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17027: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16933: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17030: \$? = $ac_status" >&5
++  echo "$as_me:16936: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -17038,7 +16944,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17041: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:16947: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -17052,13 +16958,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:17055: checking for gettimeofday" >&5
++echo "$as_me:16961: 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 17061 "configure"
++#line 16967 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17089,16 +16995,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17092: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16998: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17095: \$? = $ac_status" >&5
++  echo "$as_me:17001: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17098: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17004: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17101: \$? = $ac_status" >&5
++  echo "$as_me:17007: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -17108,7 +17014,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17111: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:17017: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -17118,7 +17024,7 @@
+ 
+ else
+ 
+-echo "$as_me:17121: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:17027: 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
+@@ -17126,7 +17032,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17129 "configure"
++#line 17035 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17145,16 +17051,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17148: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17054: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17151: \$? = $ac_status" >&5
++  echo "$as_me:17057: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17154: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17060: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17157: \$? = $ac_status" >&5
++  echo "$as_me:17063: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -17165,7 +17071,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17168: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:17074: 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
+ 
+@@ -17198,13 +17104,13 @@
+ esac
+ 
+ ###	Checks for header files.
+-echo "$as_me:17201: checking for signed char" >&5
++echo "$as_me:17107: 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 17207 "configure"
++#line 17113 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17219,16 +17125,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17222: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17128: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17225: \$? = $ac_status" >&5
++  echo "$as_me:17131: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17228: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17134: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17231: \$? = $ac_status" >&5
++  echo "$as_me:17137: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -17238,10 +17144,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17241: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:17147: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:17244: checking size of signed char" >&5
++echo "$as_me:17150: 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
+@@ -17250,7 +17156,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17253 "configure"
++#line 17159 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17262,21 +17168,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17265: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17171: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17268: \$? = $ac_status" >&5
++  echo "$as_me:17174: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17271: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17177: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17274: \$? = $ac_status" >&5
++  echo "$as_me:17180: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17279 "configure"
++#line 17185 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17288,16 +17194,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17291: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17197: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17294: \$? = $ac_status" >&5
++  echo "$as_me:17200: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17297: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17203: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17300: \$? = $ac_status" >&5
++  echo "$as_me:17206: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -17313,7 +17219,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17316 "configure"
++#line 17222 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17325,16 +17231,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17328: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17234: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17331: \$? = $ac_status" >&5
++  echo "$as_me:17237: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17334: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17240: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17337: \$? = $ac_status" >&5
++  echo "$as_me:17243: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -17350,7 +17256,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 17353 "configure"
++#line 17259 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17362,16 +17268,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17365: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17271: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17368: \$? = $ac_status" >&5
++  echo "$as_me:17274: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17371: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17277: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17374: \$? = $ac_status" >&5
++  echo "$as_me:17280: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -17384,12 +17290,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:17387: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:17293: 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 17392 "configure"
++#line 17298 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17405,15 +17311,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17408: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17314: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17411: \$? = $ac_status" >&5
++  echo "$as_me:17317: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17413: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17319: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17416: \$? = $ac_status" >&5
++  echo "$as_me:17322: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -17429,7 +17335,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:17432: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:17338: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:17347: 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 17447 "configure"
++#line 17353 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -17459,16 +17365,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17462: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17368: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17465: \$? = $ac_status" >&5
++  echo "$as_me:17371: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17468: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17374: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17471: \$? = $ac_status" >&5
++  echo "$as_me:17377: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -17478,7 +17384,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17481: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17387: 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:17400: 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
+@@ -17499,7 +17405,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17502 "configure"
++#line 17408 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17518,16 +17424,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17521: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17427: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17524: \$? = $ac_status" >&5
++  echo "$as_me:17430: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17527: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17433: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17530: \$? = $ac_status" >&5
++  echo "$as_me:17436: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -17538,14 +17444,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17541: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:17447: 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:17548: checking for opendir in -lx" >&5
++  echo "$as_me:17454: 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
+@@ -17553,7 +17459,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17556 "configure"
++#line 17462 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17572,16 +17478,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17575: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17481: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17578: \$? = $ac_status" >&5
++  echo "$as_me:17484: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17581: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17487: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17584: \$? = $ac_status" >&5
++  echo "$as_me:17490: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -17592,7 +17498,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17595: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:17501: 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"
+@@ -17600,13 +17506,13 @@
+ 
+ fi
+ 
+-echo "$as_me:17603: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:17509: 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 17609 "configure"
++#line 17515 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -17622,16 +17528,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17625: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17531: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17628: \$? = $ac_status" >&5
++  echo "$as_me:17534: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17631: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17537: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17634: \$? = $ac_status" >&5
++  echo "$as_me:17540: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -17641,7 +17547,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17644: result: $ac_cv_header_time" >&5
++echo "$as_me:17550: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -17659,13 +17565,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:17662: checking for an ANSI C-conforming const" >&5
++echo "$as_me:17568: 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 17668 "configure"
++#line 17574 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17727,16 +17633,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17730: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17636: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17733: \$? = $ac_status" >&5
++  echo "$as_me:17639: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17736: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17642: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17739: \$? = $ac_status" >&5
++  echo "$as_me:17645: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -17746,7 +17652,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17749: result: $ac_cv_c_const" >&5
++echo "$as_me:17655: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -17758,7 +17664,7 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:17761: checking if data-only library module links" >&5
++echo "$as_me:17667: 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
+@@ -17766,20 +17672,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:17678: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17775: \$? = $ac_status" >&5
++  echo "$as_me:17681: \$? = $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:17705: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17802: \$? = $ac_status" >&5
++  echo "$as_me:17708: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -17812,7 +17718,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17815 "configure"
++#line 17721 "configure"
+ #include "confdefs.h"
+ 
+ 	extern int testfunc(void);
+@@ -17823,15 +17729,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17826: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17732: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17829: \$? = $ac_status" >&5
++  echo "$as_me:17735: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17831: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17737: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17834: \$? = $ac_status" >&5
++  echo "$as_me:17740: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -17846,7 +17752,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17849: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:17755: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -17865,23 +17771,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17868: checking for $ac_header" >&5
++echo "$as_me:17774: 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 17874 "configure"
++#line 17780 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17878: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:17784: \"$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:17884: \$? = $ac_status" >&5
++  echo "$as_me:17790: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17900,7 +17806,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17903: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17809: 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:17819: 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
+@@ -17921,7 +17827,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17924 "configure"
++#line 17830 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17956,15 +17862,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17959: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17865: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17962: \$? = $ac_status" >&5
++  echo "$as_me:17868: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17964: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17870: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17967: \$? = $ac_status" >&5
++  echo "$as_me:17873: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -17979,16 +17885,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:17982: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:17888: 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:17985: checking for mkstemp" >&5
++	echo "$as_me:17891: 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 17991 "configure"
++#line 17897 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18019,16 +17925,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18022: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17928: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18025: \$? = $ac_status" >&5
++  echo "$as_me:17931: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18028: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17934: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18031: \$? = $ac_status" >&5
++  echo "$as_me:17937: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -18038,7 +17944,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18041: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:17947: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -18059,7 +17965,7 @@
+ if test "$cf_with_ada" != "no" ; then
+ 	if test	"$cf_cv_prog_gnat_correct" = yes; then
+ 
+-	echo "$as_me:18062: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:17968: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -18076,10 +17982,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:18079: result: $ADAFLAGS" >&5
++	echo "$as_me:17985: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:18082: checking if GNATPREP supports -T option" >&5
++echo "$as_me:17988: 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
+@@ -18089,11 +17995,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:18092: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:17998: 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:18096: checking if GNAT supports generics" >&5
++echo "$as_me:18002: 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])
+@@ -18103,7 +18009,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:18106: result: $cf_gnat_generics" >&5
++echo "$as_me:18012: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -18115,7 +18021,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:18118: checking if GNAT supports SIGINT" >&5
++echo "$as_me:18024: 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
+@@ -18163,7 +18069,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:18166: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:18072: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -18176,7 +18082,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:18179: checking if GNAT supports project files" >&5
++echo "$as_me:18085: 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]*)
+@@ -18239,15 +18145,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:18242: result: $cf_gnat_projects" >&5
++echo "$as_me:18148: 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:18248: checking if GNAT supports libraries" >&5
++	echo "$as_me:18154: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:18250: result: $cf_gnat_libraries" >&5
++	echo "$as_me:18156: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -18267,7 +18173,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:18270: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:18176: 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
+@@ -18279,7 +18185,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:18282: checking for Ada95 compiler" >&5
++echo "$as_me:18188: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -18290,12 +18196,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:18293: result: $cf_ada_compiler" >&5
++echo "$as_me:18199: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 		cf_ada_package=terminal_interface
+ 
+-echo "$as_me:18298: checking for Ada95 include directory" >&5
++echo "$as_me:18204: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -18331,7 +18237,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:18334: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:18240: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -18340,10 +18246,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:18343: result: $ADA_INCLUDE" >&5
++echo "$as_me:18249: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:18346: checking for Ada95 object directory" >&5
++echo "$as_me:18252: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -18379,7 +18285,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:18382: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:18288: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -18388,10 +18294,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:18391: result: $ADA_OBJECTS" >&5
++echo "$as_me:18297: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:18394: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:18300: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -18412,11 +18318,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:18415: result: $with_ada_sharedlib" >&5
++echo "$as_me:18321: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+-	{ echo "$as_me:18419: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++	{ echo "$as_me:18325: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+ 
+@@ -18434,7 +18340,7 @@
+ 
+ 		# allow the Ada binding to be renamed
+ 
+-echo "$as_me:18437: checking for Ada95 curses library name" >&5
++echo "$as_me:18343: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -18450,16 +18356,16 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18453: result: $ADA_LIBNAME" >&5
++echo "$as_me:18359: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 	else
+-		{ { echo "$as_me:18457: error: No usable Ada compiler found" >&5
++		{ { echo "$as_me:18363: 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:18462: error: The Ada compiler is needed for this package" >&5
++	{ { echo "$as_me:18368: 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
+@@ -18499,7 +18405,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:18502: checking default library suffix" >&5
++echo "$as_me:18408: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -18510,10 +18416,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:18513: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:18419: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:18516: checking default library-dependency suffix" >&5
++echo "$as_me:18422: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -18596,10 +18502,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:18599: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:18505: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:18602: checking default object directory" >&5
++echo "$as_me:18508: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -18615,7 +18521,7 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:18618: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:18524: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ ### Set up low-level terminfo dependencies for makefiles.
+@@ -18757,7 +18663,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:18760: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:18666: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -18938,7 +18844,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:18941: error: ambiguous option: $1
++    { { echo "$as_me:18847: 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;}
+@@ -18957,7 +18863,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:18960: error: unrecognized option: $1
++  -*) { { echo "$as_me:18866: 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;}
+@@ -19032,7 +18938,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:19035: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:18941: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -19394,7 +19300,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:19397: creating $ac_file" >&5
++    { echo "$as_me:19303: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -19412,7 +19318,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:19415: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:19321: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -19425,7 +19331,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:19428: error: cannot find input file: $f" >&5
++           { { echo "$as_me:19334: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -19441,7 +19347,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:19444: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:19350: 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;}
+@@ -19450,7 +19356,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:19453: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:19359: 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;}
+@@ -19495,7 +19401,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:19498: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:19404: 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;}
+@@ -19506,7 +19412,7 @@
+     $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:19509: WARNING: Some variables may not be substituted:
++      { echo "$as_me:19415: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -19555,7 +19461,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:19558: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:19464: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -19566,7 +19472,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:19569: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:19475: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -19579,7 +19485,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:19582: error: cannot find input file: $f" >&5
++           { { echo "$as_me:19488: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -19637,7 +19543,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:19640: $ac_file is unchanged" >&5
++      { echo "$as_me:19546: $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.92 
+--- ncurses-6.5-20240518+/Ada95/configure.in	2024-05-18 14:31:03.000000000 +0000
++++ ncurses-6.5-20240519/Ada95/configure.in	2024-05-19 09:12:05.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: configure.in,v 1.92 2024/05/18 14:31:03 tom Exp $
++dnl $Id: configure.in,v 1.93 2024/05/19 09:12:05 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.92 $)
++AC_REVISION($Revision: 1.93 $)
+ AC_INIT(gen/gen.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -410,7 +410,7 @@
+ 
+ if test "$cf_with_trace" = yes ; then
+ 	ADA_TRACE=TRUE
+-	CF_ADD_CFLAGS(-DTRACE)
++	AC_DEFINE(TRACE,1,[Define to 1 if we have support trace functions])
+ else
+ 	ADA_TRACE=FALSE
+ fi
+Index: NEWS
+Prereq:  1.4123 
+--- ncurses-6.5-20240518+/NEWS	2024-05-18 21:35:34.000000000 +0000
++++ ncurses-6.5-20240519/NEWS	2024-05-19 09:13:07.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4123 2024/05/18 21:35:34 tom Exp $
++-- $Id: NEWS,v 1.4126 2024/05/19 09:13:07 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.
+ 
++20240519
++	+ update Ada95/configure to match change for -DTRACE
++	+ revert change to include/ncurses_defs, which caused build failure if
++	  tracing was not enabled (report by Branden Robinson).
++
+ 20240518
+ 	+ improve formatting/style of manpages (patches by Branden Robinson).
+ 	+ move makefile's -DTRACE into include/ncurses_cfg.h, to simplify use
+Index: VERSION
+--- ncurses-6.5-20240518+/VERSION	2024-05-18 10:54:27.000000000 +0000
++++ ncurses-6.5-20240519/VERSION	2024-05-19 08:58:02.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20240518
++5:0:10	6.5	20240519
+Index: dist.mk
+Prereq:  1.1613 
+--- ncurses-6.5-20240518+/dist.mk	2024-05-18 10:54:27.000000000 +0000
++++ ncurses-6.5-20240519/dist.mk	2024-05-19 08:58:02.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1613 2024/05/18 10:54:27 tom Exp $
++# $Id: dist.mk,v 1.1614 2024/05/19 08:58:02 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 = 5
+-NCURSES_PATCH = 20240518
++NCURSES_PATCH = 20240519
+ 
+ # 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.111 
+--- ncurses-6.5-20240518+/include/ncurses_defs	2024-05-18 19:41:39.000000000 +0000
++++ ncurses-6.5-20240519/include/ncurses_defs	2024-05-19 09:02:51.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: ncurses_defs,v 1.111 2024/05/18 19:41:39 tom Exp $
++# $Id: ncurses_defs,v 1.112 2024/05/19 09:02:51 tom Exp $
+ ##############################################################################
+ # Copyright 2018-2023,2024 Thomas E. Dickey                                  #
+ # Copyright 2000-2016,2017 Free Software Foundation, Inc.                    #
+@@ -253,7 +253,6 @@
+ TERMINFO	"none"
+ TERMPATH	"none"
+ TIME_WITH_SYS_TIME
+-TRACE
+ TYPEOF_CHTYPE
+ USE_COLORFGBG
+ USE_FOPEN_BIN_R
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20240518+/package/debian-mingw/changelog	2024-05-18 10:54:27.000000000 +0000
++++ ncurses-6.5-20240519/package/debian-mingw/changelog	2024-05-19 08:58:02.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.5+20240518) unstable; urgency=low
++ncurses6 (6.5+20240519) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 18 May 2024 06:54:27 -0400
++ -- Thomas E. Dickey   Sun, 19 May 2024 04:58:02 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20240518+/package/debian-mingw64/changelog	2024-05-18 10:54:27.000000000 +0000
++++ ncurses-6.5-20240519/package/debian-mingw64/changelog	2024-05-19 08:58:02.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.5+20240518) unstable; urgency=low
++ncurses6 (6.5+20240519) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 18 May 2024 06:54:27 -0400
++ -- Thomas E. Dickey   Sun, 19 May 2024 04:58:02 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20240518+/package/debian/changelog	2024-05-18 10:54:27.000000000 +0000
++++ ncurses-6.5-20240519/package/debian/changelog	2024-05-19 08:58:02.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.5+20240518) unstable; urgency=low
++ncurses6 (6.5+20240519) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 18 May 2024 06:54:27 -0400
++ -- Thomas E. Dickey   Sun, 19 May 2024 04:58:02 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.648 
+--- ncurses-6.5-20240518+/package/mingw-ncurses.nsi	2024-05-18 10:54:27.000000000 +0000
++++ ncurses-6.5-20240519/package/mingw-ncurses.nsi	2024-05-19 08:58:02.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.648 2024/05/18 10:54:27 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.649 2024/05/19 08:58:02 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "0518"
++!define VERSION_MMDD  "0519"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20240518+/package/mingw-ncurses.spec	2024-05-18 10:54:27.000000000 +0000
++++ ncurses-6.5-20240519/package/mingw-ncurses.spec	2024-05-19 08:58:02.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20240518
++Release: 20240519
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20240518+/package/ncurses.spec	2024-05-18 10:54:27.000000000 +0000
++++ ncurses-6.5-20240519/package/ncurses.spec	2024-05-19 08:58:02.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20240518
++Release: 20240519
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20240518+/package/ncursest.spec	2024-05-18 10:54:27.000000000 +0000
++++ ncurses-6.5-20240519/package/ncursest.spec	2024-05-19 08:58:02.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20240518
++Release: 20240519
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/packages/ncurses/6.5/ncurses-6.5-20240525.patch b/packages/ncurses/6.5/ncurses-6.5-20240525.patch
new file mode 100644
index 0000000000..1eea19f789
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20240525.patch
@@ -0,0 +1,16327 @@
+# ncurses 6.5 - patch 20240525 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20240525.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun May 26 00:05:13 UTC 2024
+# ------------------------------------------------------------------------------
+# NEWS                                 |    7 
+# VERSION                              |    2 
+# configure                            | 2465 ++++++++++++++++-----------------
+# configure.in                         |    7 
+# dist.mk                              |    4 
+# doc/html/man/curs_add_wch.3x.html    |    8 
+# doc/html/man/curs_addch.3x.html      |    8 
+# doc/html/man/curs_addstr.3x.html     |   22 
+# doc/html/man/curs_addwstr.3x.html    |   10 
+# doc/html/man/curs_attr.3x.html       |   18 
+# doc/html/man/curs_border.3x.html     |   10 
+# doc/html/man/curs_border_set.3x.html |   10 
+# doc/html/man/curs_clear.3x.html      |   27 
+# doc/html/man/curs_color.3x.html      |   10 
+# doc/html/man/curs_get_wstr.3x.html   |   10 
+# doc/html/man/curs_getch.3x.html      |   28 
+# doc/html/man/curs_getstr.3x.html     |   10 
+# doc/html/man/curs_in_wchstr.3x.html  |   10 
+# doc/html/man/curs_inch.3x.html       |   14 
+# doc/html/man/curs_inchstr.3x.html    |   10 
+# doc/html/man/curs_initscr.3x.html    |   18 
+# doc/html/man/curs_inopts.3x.html     |  412 ++---
+# doc/html/man/curs_ins_wch.3x.html    |   12 
+# doc/html/man/curs_ins_wstr.3x.html   |   12 
+# doc/html/man/curs_insstr.3x.html     |   12 
+# doc/html/man/curs_instr.3x.html      |   10 
+# doc/html/man/curs_inwstr.3x.html     |   25 
+# doc/html/man/curs_kernel.3x.html     |   87 -
+# doc/html/man/curs_legacy.3x.html     |   26 
+# doc/html/man/curs_mouse.3x.html      |   10 
+# doc/html/man/curs_outopts.3x.html    |   14 
+# doc/html/man/curs_overlay.3x.html    |   12 
+# doc/html/man/curs_pad.3x.html        |   71 
+# doc/html/man/curs_refresh.3x.html    |   23 
+# doc/html/man/curs_scroll.3x.html     |   16 
+# doc/html/man/curs_slk.3x.html        |   67 
+# doc/html/man/curs_terminfo.3x.html   |  220 +-
+# doc/html/man/curs_touch.3x.html      |   12 
+# doc/html/man/curs_util.3x.html       |  111 -
+# doc/html/man/curs_window.3x.html     |   85 -
+# doc/html/man/define_key.3x.html      |   15 
+# doc/html/man/form.3x.html            |   10 
+# doc/html/man/index.html              |   69 
+# doc/html/man/menu.3x.html            |   10 
+# doc/html/man/ncurses.3x.html         |  384 ++---
+# doc/html/man/panel.3x.html           |   14 
+# doc/html/man/terminfo.5.html         |    2 
+# doc/html/ncurses-intro.html          |   10 
+# man/curs_add_wch.3x                  |   12 
+# man/curs_addch.3x                    |   12 
+# man/curs_addstr.3x                   |   26 
+# man/curs_addwstr.3x                  |    7 
+# man/curs_attr.3x                     |   14 
+# man/curs_border.3x                   |    7 
+# man/curs_border_set.3x               |    8 
+# man/curs_clear.3x                    |    8 
+# man/curs_color.3x                    |    8 
+# man/curs_get_wstr.3x                 |    7 
+# man/curs_getch.3x                    |   40 
+# man/curs_getstr.3x                   |    7 
+# man/curs_in_wchstr.3x                |    7 
+# man/curs_inch.3x                     |    6 
+# man/curs_inchstr.3x                  |    7 
+# man/curs_initscr.3x                  |   15 
+# man/curs_inopts.3x                   |  806 +++++++---
+# man/curs_ins_wch.3x                  |   16 
+# man/curs_ins_wstr.3x                 |   10 
+# man/curs_insstr.3x                   |   10 
+# man/curs_instr.3x                    |    7 
+# man/curs_inwstr.3x                   |    7 
+# man/curs_kernel.3x                   |  127 +
+# man/curs_legacy.3x                   |   22 
+# man/curs_mouse.3x                    |    8 
+# man/curs_outopts.3x                  |   12 
+# man/curs_overlay.3x                  |    7 
+# man/curs_pad.3x                      |   19 
+# man/curs_refresh.3x                  |   13 
+# man/curs_scroll.3x                   |   65 
+# man/curs_slk.3x                      |   25 
+# man/curs_terminfo.3x                 |   81 -
+# man/curs_touch.3x                    |   10 
+# man/curs_util.3x                     |   13 
+# man/curs_window.3x                   |  112 -
+# man/define_key.3x                    |   11 
+# man/form.3x                          |    6 
+# man/man_db.renames.in                |    4 
+# man/manhtml.aliases                  |    3 
+# man/menu.3x                          |    6 
+# man/ncurses.3x                       |   46 
+# man/panel.3x                         |   11 
+# misc/terminfo.src                    |   82 -
+# ncurses/base/lib_color.c             |    8 
+# ncurses/new_pair.h                   |    6 
+# ncurses/report_offsets.c             |    4 
+# ncurses/tinfo/lib_raw.c              |   12 
+# 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 
+# 102 files changed, 3343 insertions(+), 2898 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4126 
+--- ncurses-6.5-20240519+/NEWS	2024-05-19 09:13:07.000000000 +0000
++++ ncurses-6.5-20240525/NEWS	2024-05-25 23:09:24.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4126 2024/05/19 09:13:07 tom Exp $
++-- $Id: NEWS,v 1.4129 2024/05/25 23:09:24 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.
+ 
++20240525
++	+ build-fix for configure option --disable-ext-funcs
++	+ improve formatting/style of manpages (patches by Branden Robinson).
++	+ review/update iTerm2 for 3.5.0 -TD
++
+ 20240519
+ 	+ update Ada95/configure to match change for -DTRACE
+ 	+ revert change to include/ncurses_defs, which caused build failure if
+Index: VERSION
+--- ncurses-6.5-20240519+/VERSION	2024-05-19 08:58:02.000000000 +0000
++++ ncurses-6.5-20240525/VERSION	2024-05-25 10:33:51.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20240519
++5:0:10	6.5	20240525
+Index: configure
+--- ncurses-6.5-20240519+/configure	2024-05-18 19:49:45.000000000 +0000
++++ ncurses-6.5-20240525/configure	2024-05-25 23:08:49.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.781 .
++# From configure.in Revision: 1.782 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20231210.
+ #
+@@ -15837,13 +15837,14 @@
+ EOF
+ 
+ 	GENERATED_EXT_FUNCS=generated
+-	test "x$with_ext_funcs" = xyes || cf_dft_ext_spfuncs=no
+ else
++	cf_dft_ext_spfuncs=no
++	cf_dft_ext_colors=no
+ 	NCURSES_EXT_FUNCS=0
+ 	GENERATED_EXT_FUNCS=
+ fi
+ 
+-echo "$as_me:15846: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:15847: 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.
+@@ -15853,7 +15854,7 @@
+ else
+   with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:15856: result: $with_sp_funcs" >&5
++echo "$as_me:15857: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ 	NCURSES_SP_FUNCS=1
+@@ -15872,7 +15873,7 @@
+ 	GENERATED_SP_FUNCS=
+ fi
+ 
+-echo "$as_me:15875: checking if you want to build with terminal-driver" >&5
++echo "$as_me:15876: 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.
+@@ -15882,7 +15883,7 @@
+ else
+   with_term_driver=no
+ fi;
+-echo "$as_me:15885: result: $with_term_driver" >&5
++echo "$as_me:15886: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+ 
+@@ -15891,19 +15892,19 @@
+ EOF
+ 
+ 	if test "x$with_termlib" != xno ; then
+-		{ { echo "$as_me:15894: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:15895: 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:15899: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:15900: 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:15906: checking for extended use of const keyword" >&5
++echo "$as_me:15907: 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.
+@@ -15913,7 +15914,7 @@
+ else
+   with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:15916: result: $with_ext_const" >&5
++echo "$as_me:15917: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -15921,7 +15922,7 @@
+ fi
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:15924: checking if you want to use extended colors" >&5
++echo "$as_me:15925: 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.
+@@ -15931,12 +15932,12 @@
+ else
+   with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:15934: result: $with_ext_colors" >&5
++echo "$as_me:15935: 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:15939: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:15940: 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)
+@@ -15947,7 +15948,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:15950: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:15951: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -15975,7 +15976,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:15978: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:15979: 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.
+@@ -15985,7 +15986,7 @@
+ else
+   with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:15988: result: $with_ext_mouse" >&5
++echo "$as_me:15989: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ if test "x$with_ext_mouse" = xyes ; then
+ 
+@@ -15995,7 +15996,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:15998: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:15999: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16012,7 +16013,7 @@
+ fi
+ 
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:16015: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:16016: 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.
+@@ -16022,7 +16023,7 @@
+ else
+   with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:16025: result: $with_ext_putwin" >&5
++echo "$as_me:16026: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+ 
+@@ -16032,7 +16033,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16035: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:16036: 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.
+@@ -16042,7 +16043,7 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:16045: result: $with_no_padding" >&5
++echo "$as_me:16046: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16050,7 +16051,7 @@
+ EOF
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:16053: checking if you want SIGWINCH handler" >&5
++echo "$as_me:16054: 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.
+@@ -16060,7 +16061,7 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:16063: result: $with_sigwinch" >&5
++echo "$as_me:16064: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ if test "x$with_sigwinch" = xyes
+ then
+@@ -16075,7 +16076,7 @@
+ fi
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:16078: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:16079: 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.
+@@ -16085,7 +16086,7 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:16088: result: $with_tcap_names" >&5
++echo "$as_me:16089: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ if test "x$with_tcap_names" = xyes; then
+@@ -16099,7 +16100,7 @@
+ 
+ ##############################################################################
+ 
+-echo "$as_me:16102: checking if you want to link with the pthread library" >&5
++echo "$as_me:16103: 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.
+@@ -16109,27 +16110,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:16112: result: $with_pthread" >&5
++echo "$as_me:16113: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:16116: checking for pthread.h" >&5
++	echo "$as_me:16117: 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 16122 "configure"
++#line 16123 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16126: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16127: \"$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:16132: \$? = $ac_status" >&5
++  echo "$as_me:16133: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16148,7 +16149,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16151: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:16152: 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
+ 
+@@ -16158,7 +16159,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:16161: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:16162: 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"
+ 
+@@ -16179,7 +16180,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16182 "configure"
++#line 16183 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16196,16 +16197,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16199: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16200: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16202: \$? = $ac_status" >&5
++  echo "$as_me:16203: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16205: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16206: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16208: \$? = $ac_status" >&5
++  echo "$as_me:16209: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -16215,7 +16216,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:16218: result: $with_pthread" >&5
++	    echo "$as_me:16219: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -16243,7 +16244,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:16246: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:16247: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -16253,13 +16254,13 @@
+ fi
+ 
+ if test "x$with_pthread" != xno; then
+-	echo "$as_me:16256: checking for pthread_kill" >&5
++	echo "$as_me:16257: 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 16262 "configure"
++#line 16263 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16290,16 +16291,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16293: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16294: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16296: \$? = $ac_status" >&5
++  echo "$as_me:16297: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16299: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16300: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16302: \$? = $ac_status" >&5
++  echo "$as_me:16303: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_pthread_kill=yes
+ else
+@@ -16309,11 +16310,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16312: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:16313: 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:16316: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:16317: 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.
+@@ -16323,7 +16324,7 @@
+ else
+   use_pthreads_eintr=no
+ fi;
+-		echo "$as_me:16326: result: $use_pthreads_eintr" >&5
++		echo "$as_me:16327: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ 		if test "x$use_pthreads_eintr" = xyes ; then
+ 
+@@ -16334,7 +16335,7 @@
+ 		fi
+ fi
+ 
+-	echo "$as_me:16337: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:16338: 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.
+@@ -16344,18 +16345,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-	echo "$as_me:16347: result: $use_weak_symbols" >&5
++	echo "$as_me:16348: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ 	if test "x$use_weak_symbols" = xyes ; then
+ 
+-echo "$as_me:16351: checking if $CC supports weak symbols" >&5
++echo "$as_me:16352: 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 16358 "configure"
++#line 16359 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16381,16 +16382,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16384: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16385: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16387: \$? = $ac_status" >&5
++  echo "$as_me:16388: \$? = $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:16391: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16393: \$? = $ac_status" >&5
++  echo "$as_me:16394: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -16401,7 +16402,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16404: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:16405: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ 	else
+@@ -16451,7 +16452,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:16454: checking if you want reentrant code" >&5
++echo "$as_me:16455: 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.
+@@ -16461,7 +16462,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:16464: result: $with_reentrant" >&5
++echo "$as_me:16465: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -16550,7 +16551,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16553: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16554: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16562,7 +16563,7 @@
+ 	NCURSES_SIZE_T=$cf_dft_ordinate_type
+ fi
+ 
+-echo "$as_me:16565: checking whether curses library structures should be opaque" >&5
++echo "$as_me:16566: checking whether curses library structures should be opaque" >&5
+ echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
+@@ -16584,16 +16585,16 @@
+ 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16587: result: $enable_opaque_curses" >&5
++echo "$as_me:16588: 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:16592: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:16593: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:16596: checking whether form library structures should be opaque" >&5
++echo "$as_me:16597: checking whether form library structures should be opaque" >&5
+ echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-form or --disable-opaque-form was given.
+@@ -16610,10 +16611,10 @@
+ 	enable_opaque_form=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16613: result: $enable_opaque_form" >&5
++echo "$as_me:16614: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+ 
+-echo "$as_me:16616: checking whether menu library structures should be opaque" >&5
++echo "$as_me:16617: checking whether menu library structures should be opaque" >&5
+ echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
+@@ -16630,10 +16631,10 @@
+ 	enable_opaque_menu=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16633: result: $enable_opaque_menu" >&5
++echo "$as_me:16634: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+ 
+-echo "$as_me:16636: checking whether panel library structures should be opaque" >&5
++echo "$as_me:16637: checking whether panel library structures should be opaque" >&5
+ echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
+@@ -16650,7 +16651,7 @@
+ 	enable_opaque_panel=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16653: result: $enable_opaque_panel" >&5
++echo "$as_me:16654: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+ 
+ NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -16660,7 +16661,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:16663: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:16664: 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.
+@@ -16670,7 +16671,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:16673: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:16674: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -16683,7 +16684,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:16686: checking if you want all development code" >&5
++echo "$as_me:16687: 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.
+@@ -16693,11 +16694,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:16696: result: $with_develop" >&5
++echo "$as_me:16697: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###   use option --enable-check-size to detect screensize with CPR
+-echo "$as_me:16700: checking if you want to check screensize of serial terminals" >&5
++echo "$as_me:16701: checking if you want to check screensize of serial terminals" >&5
+ echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
+ 
+ # Check whether --enable-check-size or --disable-check-size was given.
+@@ -16707,7 +16708,7 @@
+ else
+   enable_check_size=$with_develop
+ fi;
+-echo "$as_me:16710: result: $enable_check_size" >&5
++echo "$as_me:16711: result: $enable_check_size" >&5
+ echo "${ECHO_T}$enable_check_size" >&6
+ test "x$enable_check_size" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16715,7 +16716,7 @@
+ EOF
+ 
+ ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
+-echo "$as_me:16718: checking if you want hard-tabs code" >&5
++echo "$as_me:16719: 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.
+@@ -16725,7 +16726,7 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:16728: result: $enable_hard_tabs" >&5
++echo "$as_me:16729: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16733,7 +16734,7 @@
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:16736: checking if you want limited support for xmc" >&5
++echo "$as_me:16737: 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.
+@@ -16743,7 +16744,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:16746: result: $enable_xmc_glitch" >&5
++echo "$as_me:16747: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16753,7 +16754,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:16756: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:16757: 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.
+@@ -16763,7 +16764,7 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:16766: result: $with_assumed_color" >&5
++echo "$as_me:16767: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16771,7 +16772,7 @@
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:16774: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:16775: 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.
+@@ -16781,7 +16782,7 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:16784: result: $with_hashmap" >&5
++echo "$as_me:16785: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16789,7 +16790,7 @@
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:16792: checking if you want colorfgbg code" >&5
++echo "$as_me:16793: 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.
+@@ -16799,7 +16800,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:16802: result: $with_colorfgbg" >&5
++echo "$as_me:16803: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16807,7 +16808,7 @@
+ EOF
+ 
+ ###   use option --enable-fvisibility to turn on use of gcc-specific feature
+-echo "$as_me:16810: checking if you want to use gcc -fvisibility option" >&5
++echo "$as_me:16811: 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.
+@@ -16817,14 +16818,14 @@
+ else
+   cf_with_fvisibility=no
+ fi;
+-echo "$as_me:16820: result: $cf_with_fvisibility" >&5
++echo "$as_me:16821: 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:16827: checking if $CC -fvisibility=hidden option works" >&5
++echo "$as_me:16828: 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
+@@ -16833,7 +16834,7 @@
+     cf_save_cflags="$CFLAGS"
+     CFLAGS="$CFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16836 "configure"
++#line 16837 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16849,16 +16850,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16852: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16853: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16855: \$? = $ac_status" >&5
++  echo "$as_me:16856: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16858: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16859: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16861: \$? = $ac_status" >&5
++  echo "$as_me:16862: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden=yes
+ else
+@@ -16870,7 +16871,7 @@
+     CFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16873: result: $cf_cv_fvisibility_hidden" >&5
++echo "$as_me:16874: result: $cf_cv_fvisibility_hidden" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
+ 
+ 	if test "x$cf_cv_fvisibility_hidden" = xyes
+@@ -16985,7 +16986,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:16988: checking if $CXX -fvisibility=hidden option works" >&5
++echo "$as_me:16989: 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
+@@ -16994,7 +16995,7 @@
+     cf_save_cflags="$CXXFLAGS"
+     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16997 "configure"
++#line 16998 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -17010,16 +17011,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17013: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17014: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17016: \$? = $ac_status" >&5
++  echo "$as_me:17017: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17019: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17020: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17022: \$? = $ac_status" >&5
++  echo "$as_me:17023: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden2=yes
+ else
+@@ -17031,7 +17032,7 @@
+     CXXFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:17034: result: $cf_cv_fvisibility_hidden2" >&5
++echo "$as_me:17035: result: $cf_cv_fvisibility_hidden2" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
+ 
+ 		if test "x$cf_cv_fvisibility_hidden2" = xyes
+@@ -17154,7 +17155,7 @@
+ fi
+ 
+ ###   use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:17157: checking if you want interop bindings" >&5
++echo "$as_me:17158: 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.
+@@ -17164,13 +17165,13 @@
+ else
+   with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:17167: result: $with_exp_interop" >&5
++echo "$as_me:17168: 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:17173: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:17174: 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.
+@@ -17180,13 +17181,13 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:17183: result: $with_safe_sprintf" >&5
++echo "$as_me:17184: 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:17189: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:17190: 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.
+@@ -17196,7 +17197,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:17199: result: $with_scroll_hints" >&5
++echo "$as_me:17200: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -17205,7 +17206,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17208: checking if you want wgetch-events code" >&5
++echo "$as_me:17209: 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.
+@@ -17215,7 +17216,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:17218: result: $with_wgetch_events" >&5
++echo "$as_me:17219: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ if test "x$with_wgetch_events" = xyes ; then
+ 
+@@ -17230,7 +17231,7 @@
+ 
+ case "$cf_cv_system_name" in
+ (*mingw32*|*mingw64*|*-msvc*)
+-	echo "$as_me:17233: checking if you want experimental-Windows driver" >&5
++	echo "$as_me:17234: 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.
+@@ -17240,7 +17241,7 @@
+ else
+   with_exp_win32=no
+ fi;
+-	echo "$as_me:17243: result: $with_exp_win32" >&5
++	echo "$as_me:17244: result: $with_exp_win32" >&5
+ echo "${ECHO_T}$with_exp_win32" >&6
+ 	if test "x$with_exp_win32" = xyes
+ 	then
+@@ -17266,7 +17267,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:17269: checking if you want to see long compiling messages" >&5
++echo "$as_me:17270: 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.
+@@ -17300,7 +17301,7 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:17303: result: $enableval" >&5
++echo "$as_me:17304: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ if test "x$enable_echo" = xyes; then
+@@ -17313,7 +17314,7 @@
+ 
+ # --disable-stripping is used for debugging
+ 
+-echo "$as_me:17316: checking if you want to install stripped executables" >&5
++echo "$as_me:17317: 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.
+@@ -17330,7 +17331,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:17333: result: $enable_stripping" >&5
++echo "$as_me:17334: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -17341,7 +17342,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:17344: checking if install accepts -p option" >&5
++echo "$as_me:17345: 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
+@@ -17372,10 +17373,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:17375: result: $cf_cv_install_p" >&5
++echo "$as_me:17376: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:17378: checking if install needs to be told about ownership" >&5
++echo "$as_me:17379: 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)
+@@ -17386,7 +17387,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17389: result: $with_install_o" >&5
++echo "$as_me:17390: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -17397,7 +17398,7 @@
+ 
+ if test -n "$INSTALL_OPT_S"
+ then
+-	echo "$as_me:17400: checking if you want to specify strip-program" >&5
++	echo "$as_me:17401: checking if you want to specify strip-program" >&5
+ echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
+ 
+ # Check whether --with-strip-program or --without-strip-program was given.
+@@ -17407,11 +17408,11 @@
+ else
+   with_strip_program=no
+ fi;
+-	echo "$as_me:17410: result: $with_strip_program" >&5
++	echo "$as_me:17411: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ 	if test "$with_strip_program" != no
+ 	then
+-		echo "$as_me:17414: checking if strip-program is supported with this installer" >&5
++		echo "$as_me:17415: checking if strip-program is supported with this installer" >&5
+ echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
+ 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
+ 		check_install_strip=no
+@@ -17432,11 +17433,11 @@
+ 				done
+ 			fi
+ 		fi
+-		echo "$as_me:17435: result: $check_install_strip" >&5
++		echo "$as_me:17436: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ 		case "$check_install_strip" in
+ 		(no)
+-			{ echo "$as_me:17439: WARNING: $cf_install_program does not support strip program option" >&5
++			{ echo "$as_me:17440: WARNING: $cf_install_program does not support strip program option" >&5
+ echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
+ 			with_strip_program=no
+ 			;;
+@@ -17451,7 +17452,7 @@
+ 			chmod +x "$INSTALL"
+ 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
+ 
+-echo "${as_me:-configure}:17454: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:17455: testing created $INSTALL ..." 1>&5
+ 
+ 			;;
+ 		(option)
+@@ -17477,7 +17478,7 @@
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+ 
+-echo "$as_me:17480: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:17481: 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.
+@@ -17494,17 +17495,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:17497: result: $enable_stdnoreturn" >&5
++echo "$as_me:17498: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:17501: checking for C11 _Noreturn feature" >&5
++echo "$as_me:17502: 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 17507 "configure"
++#line 17508 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17520,16 +17521,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-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"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17529: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17530: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17532: \$? = $ac_status" >&5
++  echo "$as_me:17533: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -17540,7 +17541,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17543: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:17544: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -17596,16 +17597,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17599: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17600: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17604: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17605: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17608: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17609: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17644,16 +17645,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17647: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17648: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17652: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17653: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17656: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17657: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17692,23 +17693,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17695: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17696: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17700: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17701: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17704: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17705: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:17711: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:17712: 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.
+@@ -17725,7 +17726,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:17728: result: $enable_warnings" >&5
++echo "$as_me:17729: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -17749,7 +17750,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17752 "configure"
++#line 17753 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17764,26 +17765,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17767: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17768: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17770: \$? = $ac_status" >&5
++  echo "$as_me:17771: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17773: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17774: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17776: \$? = $ac_status" >&5
++  echo "$as_me:17777: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:17779: checking for X11/Xt const-feature" >&5
++echo "$as_me:17780: 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 17786 "configure"
++#line 17787 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -17801,16 +17802,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17804: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17805: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17807: \$? = $ac_status" >&5
++  echo "$as_me:17808: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17810: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17811: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17813: \$? = $ac_status" >&5
++  echo "$as_me:17814: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -17825,7 +17826,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17828: result: $cf_cv_const_x_string" >&5
++echo "$as_me:17829: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -17854,7 +17855,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:17874: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -17886,12 +17887,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17889: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17890: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17892: \$? = $ac_status" >&5
++  echo "$as_me:17893: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17894: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17895: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -17899,7 +17900,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:17902: checking for $CC warning options..." >&5
++	{ echo "$as_me:17903: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -17922,12 +17923,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:17925: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17926: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17928: \$? = $ac_status" >&5
++  echo "$as_me:17929: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17930: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17931: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -17935,7 +17936,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17938: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17939: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17945,7 +17946,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17948: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17949: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17978,10 +17979,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:17981: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:17982: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -18031,12 +18032,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:18034: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18035: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18037: \$? = $ac_status" >&5
++  echo "$as_me:18038: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18039: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:18040: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -18108,12 +18109,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:18111: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:18112: 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 18116 "configure"
++#line 18117 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18130,16 +18131,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18133: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18134: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18136: \$? = $ac_status" >&5
++  echo "$as_me:18137: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18139: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18140: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18142: \$? = $ac_status" >&5
++  echo "$as_me:18143: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -18150,7 +18151,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:18153: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:18154: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -18159,11 +18160,11 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:18162: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:18163: 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 18166 "configure"
++#line 18167 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18180,16 +18181,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18183: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18184: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18186: \$? = $ac_status" >&5
++  echo "$as_me:18187: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18189: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18190: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18192: \$? = $ac_status" >&5
++  echo "$as_me:18193: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_CPLUSPLUS=yes
+ 
+@@ -18199,7 +18200,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:18202: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:18203: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -18208,30 +18209,30 @@
+ if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:18211: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:18212: 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:18218: checking version of $CC" >&5
++	echo "$as_me:18219: 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:18222: result: $CLANG_VERSION" >&5
++	echo "$as_me:18223: 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:18229: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:18230: 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 18234 "configure"
++#line 18235 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -18245,16 +18246,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18248: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18249: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18251: \$? = $ac_status" >&5
++  echo "$as_me:18252: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18254: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18255: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18257: \$? = $ac_status" >&5
++  echo "$as_me:18258: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -18265,13 +18266,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:18268: result: $cf_clang_optok" >&5
++		echo "$as_me:18269: 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}:18274: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:18275: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -18288,7 +18289,7 @@
+ ac_main_return="return"
+ 
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:18310: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -18323,12 +18324,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:18326: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18327: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18329: \$? = $ac_status" >&5
++  echo "$as_me:18330: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18331: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18332: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -18337,7 +18338,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:18340: checking for $CXX warning options..." >&5
++	{ echo "$as_me:18341: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -18367,16 +18368,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:18370: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18371: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18373: \$? = $ac_status" >&5
++  echo "$as_me:18374: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18375: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18376: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:18379: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18380: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -18394,7 +18395,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:18397: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:18398: 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.
+@@ -18404,7 +18405,7 @@
+ else
+   enable_string_hacks=no
+ fi;
+-echo "$as_me:18407: result: $enable_string_hacks" >&5
++echo "$as_me:18408: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+ 
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -18413,15 +18414,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:18416: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:18417: 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:18418: checking for strlcat" >&5
++	echo "$as_me:18419: 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 18424 "configure"
++#line 18425 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18452,16 +18453,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18455: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18456: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18458: \$? = $ac_status" >&5
++  echo "$as_me:18459: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18461: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18462: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18464: \$? = $ac_status" >&5
++  echo "$as_me:18465: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -18471,7 +18472,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18474: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:18475: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+ 
+@@ -18481,7 +18482,7 @@
+ 
+ else
+ 
+-		echo "$as_me:18484: checking for strlcat in -lbsd" >&5
++		echo "$as_me:18485: 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
+@@ -18489,7 +18490,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18492 "configure"
++#line 18493 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18508,16 +18509,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18511: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18512: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18514: \$? = $ac_status" >&5
++  echo "$as_me:18515: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18517: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18518: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18520: \$? = $ac_status" >&5
++  echo "$as_me:18521: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -18528,7 +18529,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18531: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:18532: 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
+ 
+@@ -18551,23 +18552,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18554: checking for $ac_header" >&5
++echo "$as_me:18555: 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 18560 "configure"
++#line 18561 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18564: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18565: \"$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:18570: \$? = $ac_status" >&5
++  echo "$as_me:18571: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18586,7 +18587,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18589: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18590: 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:18611: 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 18616 "configure"
++#line 18617 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18644,16 +18645,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18647: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18648: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18650: \$? = $ac_status" >&5
++  echo "$as_me:18651: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18653: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18654: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18656: \$? = $ac_status" >&5
++  echo "$as_me:18657: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -18663,7 +18664,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18666: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:18667: 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:18680: 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.
+@@ -18686,7 +18687,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:18689: result: $with_assertions" >&5
++echo "$as_me:18690: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -18702,7 +18703,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:18705: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:18706: 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.
+@@ -18724,7 +18725,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:18727: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:18728: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18838,23 +18839,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:18841: checking for dmalloc.h" >&5
++	echo "$as_me:18842: 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 18847 "configure"
++#line 18848 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:18851: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18852: \"$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:18857: \$? = $ac_status" >&5
++  echo "$as_me:18858: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18873,11 +18874,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18876: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:18877: 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:18880: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:18881: 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
+@@ -18885,7 +18886,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18888 "configure"
++#line 18889 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18904,16 +18905,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18907: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18908: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18910: \$? = $ac_status" >&5
++  echo "$as_me:18911: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18913: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18914: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18916: \$? = $ac_status" >&5
++  echo "$as_me:18917: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -18924,7 +18925,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18927: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:18928: 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:18943: 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.
+@@ -18961,7 +18962,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:18964: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:18965: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19075,23 +19076,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:19078: checking for dbmalloc.h" >&5
++	echo "$as_me:19079: 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 19084 "configure"
++#line 19085 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:19088: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:19089: \"$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:19094: \$? = $ac_status" >&5
++  echo "$as_me:19095: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19110,11 +19111,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:19113: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:19114: 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:19117: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:19118: 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
+@@ -19122,7 +19123,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19125 "configure"
++#line 19126 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19141,16 +19142,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19144: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19145: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19147: \$? = $ac_status" >&5
++  echo "$as_me:19148: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19150: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19151: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19153: \$? = $ac_status" >&5
++  echo "$as_me:19154: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -19161,7 +19162,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19164: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:19165: 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:19180: 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.
+@@ -19198,7 +19199,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:19201: result: ${with_valgrind:-no}" >&5
++echo "$as_me:19202: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19311,7 +19312,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19314: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:19315: 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.
+@@ -19322,7 +19323,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:19325: result: $with_no_leaks" >&5
++echo "$as_me:19326: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -19374,7 +19375,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19377: checking whether to add trace feature to all models" >&5
++echo "$as_me:19378: 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.
+@@ -19384,7 +19385,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:19387: result: $cf_with_trace" >&5
++echo "$as_me:19388: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -19404,7 +19405,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:19407: checking if we want to use GNAT projects" >&5
++echo "$as_me:19408: 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.
+@@ -19421,7 +19422,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:19424: result: $enable_gnat_projects" >&5
++echo "$as_me:19425: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -19434,14 +19435,14 @@
+ 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+ 	fi
+ 
+-echo "$as_me:19437: checking if ssp library is needed" >&5
++echo "$as_me:19438: 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 19444 "configure"
++#line 19445 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19458,16 +19459,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19461: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19462: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19464: \$? = $ac_status" >&5
++  echo "$as_me:19465: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19467: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19468: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19470: \$? = $ac_status" >&5
++  echo "$as_me:19471: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -19477,7 +19478,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19480 "configure"
++#line 19481 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19494,16 +19495,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19497: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19498: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19500: \$? = $ac_status" >&5
++  echo "$as_me:19501: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19503: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19504: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19506: \$? = $ac_status" >&5
++  echo "$as_me:19507: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -19517,7 +19518,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19520: result: $cf_cv_need_libssp" >&5
++echo "$as_me:19521: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -19546,14 +19547,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19549: checking if -lm needed for math functions" >&5
++echo "$as_me:19550: 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 19556 "configure"
++#line 19557 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19569,16 +19570,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19572: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19573: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19575: \$? = $ac_status" >&5
++  echo "$as_me:19576: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19578: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19579: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19581: \$? = $ac_status" >&5
++  echo "$as_me:19582: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -19588,7 +19589,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19591: result: $cf_cv_need_libm" >&5
++echo "$as_me:19592: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ 
+ if test "$cf_cv_need_libm" = yes
+@@ -19596,14 +19597,14 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lm"
+-	echo "$as_me:19599: checking if -lm is available for math functions" >&5
++	echo "$as_me:19600: checking if -lm is available for math functions" >&5
+ echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
+ if test "${cf_cv_have_libm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19606 "configure"
++#line 19607 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19619,16 +19620,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19622: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19623: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19625: \$? = $ac_status" >&5
++  echo "$as_me:19626: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19628: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19629: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19631: \$? = $ac_status" >&5
++  echo "$as_me:19632: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_libm=yes
+ else
+@@ -19638,7 +19639,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19641: result: $cf_cv_have_libm" >&5
++echo "$as_me:19642: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ 	LIBS="$cf_save_LIBS"
+ 
+@@ -19660,13 +19661,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:19663: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:19664: 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 19669 "configure"
++#line 19670 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -19682,16 +19683,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19685: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19686: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19688: \$? = $ac_status" >&5
++  echo "$as_me:19689: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19691: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19692: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19694: \$? = $ac_status" >&5
++  echo "$as_me:19695: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -19701,7 +19702,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19704: result: $ac_cv_header_time" >&5
++echo "$as_me:19705: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -19716,7 +19717,7 @@
+ case "$host_os" in
+ (mingw*)
+ 	# -lsystre -ltre -lintl -liconv
+-	echo "$as_me:19719: checking for regcomp in -lsystre" >&5
++	echo "$as_me:19720: 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
+@@ -19724,7 +19725,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsystre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19727 "configure"
++#line 19728 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19743,16 +19744,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19746: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19747: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19749: \$? = $ac_status" >&5
++  echo "$as_me:19750: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19752: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19753: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19755: \$? = $ac_status" >&5
++  echo "$as_me:19756: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_systre_regcomp=yes
+ else
+@@ -19763,11 +19764,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19766: result: $ac_cv_lib_systre_regcomp" >&5
++echo "$as_me:19767: 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:19770: checking for libiconv_open in -liconv" >&5
++		echo "$as_me:19771: 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
+@@ -19775,7 +19776,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19778 "configure"
++#line 19779 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19794,16 +19795,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19797: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19798: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19800: \$? = $ac_status" >&5
++  echo "$as_me:19801: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19803: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19804: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19806: \$? = $ac_status" >&5
++  echo "$as_me:19807: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_iconv_libiconv_open=yes
+ else
+@@ -19814,7 +19815,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19817: result: $ac_cv_lib_iconv_libiconv_open" >&5
++echo "$as_me:19818: 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
+ 
+@@ -19836,7 +19837,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19839: checking for libintl_gettext in -lintl" >&5
++		echo "$as_me:19840: 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
+@@ -19844,7 +19845,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19847 "configure"
++#line 19848 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19863,16 +19864,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19866: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19867: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19869: \$? = $ac_status" >&5
++  echo "$as_me:19870: \$? = $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:19873: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19875: \$? = $ac_status" >&5
++  echo "$as_me:19876: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_intl_libintl_gettext=yes
+ else
+@@ -19883,7 +19884,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19886: result: $ac_cv_lib_intl_libintl_gettext" >&5
++echo "$as_me:19887: 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
+ 
+@@ -19905,7 +19906,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19908: checking for tre_regcomp in -ltre" >&5
++		echo "$as_me:19909: 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
+@@ -19913,7 +19914,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19916 "configure"
++#line 19917 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19932,16 +19933,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19935: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19936: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19938: \$? = $ac_status" >&5
++  echo "$as_me:19939: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19941: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19942: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19944: \$? = $ac_status" >&5
++  echo "$as_me:19945: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_tre_tre_regcomp=yes
+ else
+@@ -19952,7 +19953,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19955: result: $ac_cv_lib_tre_tre_regcomp" >&5
++echo "$as_me:19956: 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
+ 
+@@ -19994,7 +19995,7 @@
+ 
+ else
+ 
+-		echo "$as_me:19997: checking for regcomp in -lgnurx" >&5
++		echo "$as_me:19998: 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
+@@ -20002,7 +20003,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgnurx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20005 "configure"
++#line 20006 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20021,16 +20022,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20024: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20025: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20027: \$? = $ac_status" >&5
++  echo "$as_me:20028: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20030: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20031: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20033: \$? = $ac_status" >&5
++  echo "$as_me:20034: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gnurx_regcomp=yes
+ else
+@@ -20041,7 +20042,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20044: result: $ac_cv_lib_gnurx_regcomp" >&5
++echo "$as_me:20045: 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
+ 
+@@ -20069,13 +20070,13 @@
+ 	;;
+ (*)
+ 	cf_regex_libs="regex re"
+-	echo "$as_me:20072: checking for regcomp" >&5
++	echo "$as_me:20073: 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 20078 "configure"
++#line 20079 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20106,16 +20107,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20109: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20110: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20112: \$? = $ac_status" >&5
++  echo "$as_me:20113: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20115: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20116: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20118: \$? = $ac_status" >&5
++  echo "$as_me:20119: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -20125,7 +20126,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20128: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:20129: 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
+@@ -20134,7 +20135,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:20137: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:20138: 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
+@@ -20142,7 +20143,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20145 "configure"
++#line 20146 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20161,16 +20162,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20164: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20165: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20167: \$? = $ac_status" >&5
++  echo "$as_me:20168: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20170: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20171: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20173: \$? = $ac_status" >&5
++  echo "$as_me:20174: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -20181,7 +20182,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20184: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:20185: 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
+ 
+@@ -20213,13 +20214,13 @@
+ esac
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:20216: checking for compile" >&5
++	echo "$as_me:20217: 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 20222 "configure"
++#line 20223 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20250,16 +20251,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20253: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20254: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20256: \$? = $ac_status" >&5
++  echo "$as_me:20257: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20259: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20260: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20262: \$? = $ac_status" >&5
++  echo "$as_me:20263: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -20269,13 +20270,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20272: result: $ac_cv_func_compile" >&5
++echo "$as_me:20273: 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:20278: checking for compile in -lgen" >&5
++		echo "$as_me:20279: 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
+@@ -20283,7 +20284,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20286 "configure"
++#line 20287 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20302,16 +20303,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20305: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20306: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20308: \$? = $ac_status" >&5
++  echo "$as_me:20309: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20311: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20312: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20314: \$? = $ac_status" >&5
++  echo "$as_me:20315: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -20322,7 +20323,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20325: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:20326: 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
+ 
+@@ -20350,11 +20351,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:20353: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:20354: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:20357: checking for regular-expression headers" >&5
++echo "$as_me:20358: 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
+@@ -20366,7 +20367,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20369 "configure"
++#line 20370 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -20383,16 +20384,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20386: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20387: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20389: \$? = $ac_status" >&5
++  echo "$as_me:20390: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20392: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20393: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20395: \$? = $ac_status" >&5
++  echo "$as_me:20396: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20409,7 +20410,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20412 "configure"
++#line 20413 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$cf_regex_hdr>
+@@ -20429,16 +20430,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20432: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20433: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20435: \$? = $ac_status" >&5
++  echo "$as_me:20436: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20438: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20439: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20441: \$? = $ac_status" >&5
++  echo "$as_me:20442: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20454,11 +20455,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:20457: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:20458: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case "$cf_cv_regex_hdrs" in
+-	(no)		{ echo "$as_me:20461: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:20462: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -20496,23 +20497,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20499: checking for $ac_header" >&5
++echo "$as_me:20500: 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 20505 "configure"
++#line 20506 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20509: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20510: \"$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:20515: \$? = $ac_status" >&5
++  echo "$as_me:20516: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20531,7 +20532,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20534: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20535: 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:20548: 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 20553 "configure"
++#line 20554 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20557: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20558: \"$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:20563: \$? = $ac_status" >&5
++  echo "$as_me:20564: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20579,7 +20580,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20582: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20583: 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:20593: 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
+@@ -20599,7 +20600,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20602 "configure"
++#line 20603 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20612,16 +20613,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20615: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20616: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20618: \$? = $ac_status" >&5
++  echo "$as_me:20619: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20621: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20622: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20624: \$? = $ac_status" >&5
++  echo "$as_me:20625: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -20633,7 +20634,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20636: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20637: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -20650,14 +20651,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20653: checking if external environ is declared" >&5
++echo "$as_me:20654: 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 20660 "configure"
++#line 20661 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -20670,16 +20671,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20673: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20674: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20676: \$? = $ac_status" >&5
++  echo "$as_me:20677: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20679: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20680: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20682: \$? = $ac_status" >&5
++  echo "$as_me:20683: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_environ=yes
+ else
+@@ -20690,7 +20691,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20693: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20694: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+ 
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20705,14 +20706,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:20708: checking if external environ exists" >&5
++echo "$as_me:20709: 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 20715 "configure"
++#line 20716 "configure"
+ #include "confdefs.h"
+ 
+ #undef environ
+@@ -20727,16 +20728,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20730: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20731: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20733: \$? = $ac_status" >&5
++  echo "$as_me:20734: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20736: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20737: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20739: \$? = $ac_status" >&5
++  echo "$as_me:20740: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_environ=yes
+ else
+@@ -20747,7 +20748,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20750: result: $cf_cv_have_environ" >&5
++echo "$as_me:20751: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+ 
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20760,13 +20761,13 @@
+ 
+ fi
+ 
+-echo "$as_me:20763: checking for getenv" >&5
++echo "$as_me:20764: 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 20769 "configure"
++#line 20770 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20797,16 +20798,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20800: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20801: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20803: \$? = $ac_status" >&5
++  echo "$as_me:20804: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20806: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20807: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20809: \$? = $ac_status" >&5
++  echo "$as_me:20810: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_getenv=yes
+ else
+@@ -20816,19 +20817,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20819: result: $ac_cv_func_getenv" >&5
++echo "$as_me:20820: 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:20825: checking for $ac_func" >&5
++echo "$as_me:20826: 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 20831 "configure"
++#line 20832 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20859,16 +20860,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20862: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20863: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20865: \$? = $ac_status" >&5
++  echo "$as_me:20866: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20868: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20869: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20871: \$? = $ac_status" >&5
++  echo "$as_me:20872: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -20878,7 +20879,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20881: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:20882: 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:20892: 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
+@@ -20898,7 +20899,7 @@
+   cf_cv_consistent_getenv=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20901 "configure"
++#line 20902 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21003,15 +21004,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21006: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21007: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21009: \$? = $ac_status" >&5
++  echo "$as_me:21010: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21011: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21012: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21014: \$? = $ac_status" >&5
++  echo "$as_me:21015: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_consistent_getenv=yes
+ else
+@@ -21024,7 +21025,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:21027: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:21028: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+ 
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -21039,18 +21040,18 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ 	test "x$cf_with_trace" = xyes
+ then
+-	{ echo "$as_me:21042: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++	{ echo "$as_me:21043: 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:21046: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:21047: 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 21053 "configure"
++#line 21054 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21070,16 +21071,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21073: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21074: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21076: \$? = $ac_status" >&5
++  echo "$as_me:21077: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21079: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21080: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21082: \$? = $ac_status" >&5
++  echo "$as_me:21083: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -21091,7 +21092,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21094: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:21095: 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
+@@ -21106,13 +21107,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:21109: checking for an ANSI C-conforming const" >&5
++echo "$as_me:21110: 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 21115 "configure"
++#line 21116 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21174,16 +21175,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21177: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21178: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21180: \$? = $ac_status" >&5
++  echo "$as_me:21181: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21183: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21184: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21186: \$? = $ac_status" >&5
++  echo "$as_me:21187: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -21193,7 +21194,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21196: result: $ac_cv_c_const" >&5
++echo "$as_me:21197: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -21203,7 +21204,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21206: checking for inline" >&5
++echo "$as_me:21207: 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
+@@ -21211,7 +21212,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21214 "configure"
++#line 21215 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo (void) {return 0; }
+@@ -21220,16 +21221,16 @@
+ 
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21223: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21224: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21226: \$? = $ac_status" >&5
++  echo "$as_me:21227: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21229: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21230: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21232: \$? = $ac_status" >&5
++  echo "$as_me:21233: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -21240,7 +21241,7 @@
+ done
+ 
+ fi
+-echo "$as_me:21243: result: $ac_cv_c_inline" >&5
++echo "$as_me:21244: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -21266,7 +21267,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:21269: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:21270: 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
+@@ -21275,7 +21276,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21278 "configure"
++#line 21279 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -21287,16 +21288,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21290: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21291: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21293: \$? = $ac_status" >&5
++  echo "$as_me:21294: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21296: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21297: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21299: \$? = $ac_status" >&5
++  echo "$as_me:21300: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -21308,7 +21309,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:21311: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:21312: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -21414,7 +21415,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:21417: checking for signal global datatype" >&5
++echo "$as_me:21418: 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
+@@ -21426,7 +21427,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21429 "configure"
++#line 21430 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21450,16 +21451,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21453: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21454: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21456: \$? = $ac_status" >&5
++  echo "$as_me:21457: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21459: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21460: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21462: \$? = $ac_status" >&5
++  echo "$as_me:21463: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21473,7 +21474,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21476: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21477: 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:21486: 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
+@@ -21492,7 +21493,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21495 "configure"
++#line 21496 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21527,15 +21528,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21530: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21531: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21533: \$? = $ac_status" >&5
++  echo "$as_me:21534: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21535: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21536: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21538: \$? = $ac_status" >&5
++  echo "$as_me:21539: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21550,7 +21551,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21553: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21554: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:21566: 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 21572 "configure"
++#line 21573 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21581,16 +21582,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21584: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21585: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21587: \$? = $ac_status" >&5
++  echo "$as_me:21588: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21590: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21591: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21593: \$? = $ac_status" >&5
++  echo "$as_me:21594: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -21602,7 +21603,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21605: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21606: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -21618,14 +21619,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:21621: checking if external errno is declared" >&5
++echo "$as_me:21622: 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 21628 "configure"
++#line 21629 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21639,16 +21640,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21642: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21643: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21645: \$? = $ac_status" >&5
++  echo "$as_me:21646: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21648: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21649: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21651: \$? = $ac_status" >&5
++  echo "$as_me:21652: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -21659,7 +21660,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21662: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21663: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21674,14 +21675,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:21677: checking if external errno exists" >&5
++echo "$as_me:21678: 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 21684 "configure"
++#line 21685 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -21696,16 +21697,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21699: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21700: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21702: \$? = $ac_status" >&5
++  echo "$as_me:21703: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21705: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21706: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21708: \$? = $ac_status" >&5
++  echo "$as_me:21709: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -21716,7 +21717,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21719: result: $cf_cv_have_errno" >&5
++echo "$as_me:21720: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21729,7 +21730,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21732: checking if data-only library module links" >&5
++echo "$as_me:21733: 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
+@@ -21737,20 +21738,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:21744: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21746: \$? = $ac_status" >&5
++  echo "$as_me:21747: \$? = $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:21771: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21773: \$? = $ac_status" >&5
++  echo "$as_me:21774: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -21783,7 +21784,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21786 "configure"
++#line 21787 "configure"
+ #include "confdefs.h"
+ 
+ 	extern int testfunc(void);
+@@ -21794,15 +21795,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21797: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21798: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21800: \$? = $ac_status" >&5
++  echo "$as_me:21801: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21802: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21803: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21805: \$? = $ac_status" >&5
++  echo "$as_me:21806: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -21817,7 +21818,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21820: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21821: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21832,13 +21833,13 @@
+ ###	Checks for library functions.
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:21835: checking for clock_gettime" >&5
++echo "$as_me:21836: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21841 "configure"
++#line 21842 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21869,16 +21870,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21872: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21873: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21875: \$? = $ac_status" >&5
++  echo "$as_me:21876: \$? = $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:21879: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21881: \$? = $ac_status" >&5
++  echo "$as_me:21882: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -21888,12 +21889,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21891: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:21892: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:21896: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:21897: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21901,7 +21902,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21904 "configure"
++#line 21905 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21920,16 +21921,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21923: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21924: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21926: \$? = $ac_status" >&5
++  echo "$as_me:21927: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21929: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21930: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21932: \$? = $ac_status" >&5
++  echo "$as_me:21933: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -21940,7 +21941,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21943: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:21944: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -21952,14 +21953,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:21955: checking if clock_gettime links" >&5
++echo "$as_me:21956: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21962 "configure"
++#line 21963 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21977,16 +21978,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21980: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21981: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21983: \$? = $ac_status" >&5
++  echo "$as_me:21984: \$? = $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:21987: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21989: \$? = $ac_status" >&5
++  echo "$as_me:21990: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -21997,7 +21998,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22000: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:22001: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -22011,13 +22012,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:22014: checking for gettimeofday" >&5
++echo "$as_me:22015: 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 22020 "configure"
++#line 22021 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22048,16 +22049,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22051: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22052: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22054: \$? = $ac_status" >&5
++  echo "$as_me:22055: \$? = $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:22058: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22060: \$? = $ac_status" >&5
++  echo "$as_me:22061: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -22067,7 +22068,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22070: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:22071: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -22077,7 +22078,7 @@
+ 
+ else
+ 
+-echo "$as_me:22080: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:22081: 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
+@@ -22085,7 +22086,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22088 "configure"
++#line 22089 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22104,16 +22105,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22107: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22108: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22110: \$? = $ac_status" >&5
++  echo "$as_me:22111: \$? = $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:22114: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22116: \$? = $ac_status" >&5
++  echo "$as_me:22117: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -22124,7 +22125,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22127: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:22128: 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
+ 
+@@ -22183,13 +22184,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:22186: checking for $ac_func" >&5
++echo "$as_me:22187: 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 22192 "configure"
++#line 22193 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22220,16 +22221,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22223: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22224: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22226: \$? = $ac_status" >&5
++  echo "$as_me:22227: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22229: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22230: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22232: \$? = $ac_status" >&5
++  echo "$as_me:22233: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -22239,7 +22240,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22242: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:22243: 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:22253: 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 22259 "configure"
++#line 22260 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22271,16 +22272,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22274: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22275: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22277: \$? = $ac_status" >&5
++  echo "$as_me:22278: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22280: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22281: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22283: \$? = $ac_status" >&5
++  echo "$as_me:22284: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_PATH_TTYS=yes
+ else
+@@ -22290,7 +22291,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22293: result: $cf_cv_PATH_TTYS" >&5
++echo "$as_me:22294: result: $cf_cv_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
+ 
+ if test $cf_cv_PATH_TTYS = no
+@@ -22312,7 +22313,7 @@
+ 
+ if test $cf_cv_PATH_TTYS != no
+ then
+-	echo "$as_me:22315: checking if _PATH_TTYS file exists" >&5
++	echo "$as_me:22316: 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
+@@ -22322,7 +22323,7 @@
+   cf_cv_have_PATH_TTYS=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22325 "configure"
++#line 22326 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22335,15 +22336,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22338: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22339: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22341: \$? = $ac_status" >&5
++  echo "$as_me:22342: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22343: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22344: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22346: \$? = $ac_status" >&5
++  echo "$as_me:22347: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_PATH_TTYS=yes
+ else
+@@ -22355,7 +22356,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22358: result: $cf_cv_have_PATH_TTYS" >&5
++echo "$as_me:22359: 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
+@@ -22367,14 +22368,14 @@
+ #define HAVE_PATH_TTYS 1
+ EOF
+ 
+-	echo "$as_me:22370: checking for getttynam" >&5
++	echo "$as_me:22371: 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 22377 "configure"
++#line 22378 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22386,16 +22387,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22389: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22390: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22392: \$? = $ac_status" >&5
++  echo "$as_me:22393: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22395: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22396: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22398: \$? = $ac_status" >&5
++  echo "$as_me:22399: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_getttynam=yes
+ else
+@@ -22405,7 +22406,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22408: result: $cf_cv_func_getttynam" >&5
++echo "$as_me:22409: 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
+@@ -22415,7 +22416,7 @@
+ 
+ if test "x$ac_cv_func_getopt" = xno && \
+    test "x$cf_with_progs$cf_with_tests" != xnono; then
+-	{ { echo "$as_me:22418: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:22419: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -22424,7 +22425,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:22427: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:22428: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -22437,14 +22438,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:22440: checking for terminal-capability database functions" >&5
++echo "$as_me:22441: 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 22447 "configure"
++#line 22448 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22464,16 +22465,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22467: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22468: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22470: \$? = $ac_status" >&5
++  echo "$as_me:22471: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22473: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22474: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22476: \$? = $ac_status" >&5
++  echo "$as_me:22477: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -22484,7 +22485,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22487: result: $cf_cv_cgetent" >&5
++echo "$as_me:22488: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -22494,14 +22495,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:22497: checking if cgetent uses const parameter" >&5
++echo "$as_me:22498: 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 22504 "configure"
++#line 22505 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -22524,16 +22525,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22527: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22528: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22530: \$? = $ac_status" >&5
++  echo "$as_me:22531: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22533: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22534: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22536: \$? = $ac_status" >&5
++  echo "$as_me:22537: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -22544,7 +22545,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22547: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:22548: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -22558,14 +22559,14 @@
+ 
+ fi
+ 
+-echo "$as_me:22561: checking for isascii" >&5
++echo "$as_me:22562: 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 22568 "configure"
++#line 22569 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22577,16 +22578,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22580: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22581: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22583: \$? = $ac_status" >&5
++  echo "$as_me:22584: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22586: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22587: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22589: \$? = $ac_status" >&5
++  echo "$as_me:22590: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -22597,7 +22598,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22600: result: $cf_cv_have_isascii" >&5
++echo "$as_me:22601: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -22605,10 +22606,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:22608: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:22609: 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 22611 "configure"
++#line 22612 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22622,16 +22623,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22625: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22626: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22628: \$? = $ac_status" >&5
++  echo "$as_me:22629: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22631: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22632: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22634: \$? = $ac_status" >&5
++  echo "$as_me:22635: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=no
+ else
+@@ -22639,7 +22640,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22642 "configure"
++#line 22643 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22654,16 +22655,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22657: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22658: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22660: \$? = $ac_status" >&5
++  echo "$as_me:22661: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22663: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22664: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22666: \$? = $ac_status" >&5
++  echo "$as_me:22667: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=yes
+ 
+@@ -22679,11 +22680,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:22682: result: $sigact_bad" >&5
++echo "$as_me:22683: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:22686: checking if nanosleep really works" >&5
++echo "$as_me:22687: 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
+@@ -22693,7 +22694,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22696 "configure"
++#line 22697 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22719,15 +22720,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22722: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22723: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22725: \$? = $ac_status" >&5
++  echo "$as_me:22726: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22727: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22728: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22730: \$? = $ac_status" >&5
++  echo "$as_me:22731: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -22739,7 +22740,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22742: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:22743: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -22756,23 +22757,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22759: checking for $ac_header" >&5
++echo "$as_me:22760: 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 22765 "configure"
++#line 22766 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22769: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22770: \"$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:22775: \$? = $ac_status" >&5
++  echo "$as_me:22776: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22791,7 +22792,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22794: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22795: 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:22812: 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 22814 "configure"
++#line 22815 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22823,16 +22824,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22826: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22827: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22829: \$? = $ac_status" >&5
++  echo "$as_me:22830: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22832: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22833: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22835: \$? = $ac_status" >&5
++  echo "$as_me:22836: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=no
+ else
+@@ -22840,7 +22841,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22843 "configure"
++#line 22844 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22854,16 +22855,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22857: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22858: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22860: \$? = $ac_status" >&5
++  echo "$as_me:22861: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22863: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22864: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22866: \$? = $ac_status" >&5
++  echo "$as_me:22867: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=unknown
+ else
+@@ -22879,19 +22880,19 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:22882: result: $termios_bad" >&5
++	echo "$as_me:22883: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:22887: checking for tcgetattr" >&5
++echo "$as_me:22888: 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 22894 "configure"
++#line 22895 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22919,16 +22920,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22922: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22923: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22925: \$? = $ac_status" >&5
++  echo "$as_me:22926: \$? = $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:22929: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22931: \$? = $ac_status" >&5
++  echo "$as_me:22932: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -22938,21 +22939,21 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22941: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:22942: 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:22948: checking for vsscanf function or workaround" >&5
++echo "$as_me:22949: 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 22955 "configure"
++#line 22956 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22978,16 +22979,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22981: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22982: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22984: \$? = $ac_status" >&5
++  echo "$as_me:22985: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22987: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22988: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22990: \$? = $ac_status" >&5
++  echo "$as_me:22991: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -22995,7 +22996,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22998 "configure"
++#line 22999 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23017,16 +23018,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23020: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23021: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23023: \$? = $ac_status" >&5
++  echo "$as_me:23024: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23026: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23027: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23029: \$? = $ac_status" >&5
++  echo "$as_me:23030: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -23034,7 +23035,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23037 "configure"
++#line 23038 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23056,16 +23057,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23059: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23060: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23062: \$? = $ac_status" >&5
++  echo "$as_me:23063: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23065: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23066: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23068: \$? = $ac_status" >&5
++  echo "$as_me:23069: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -23080,7 +23081,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23083: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:23084: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case "$cf_cv_func_vsscanf" in
+@@ -23106,23 +23107,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:23109: checking for $ac_header" >&5
++echo "$as_me:23110: 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 23115 "configure"
++#line 23116 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23119: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23120: \"$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:23125: \$? = $ac_status" >&5
++  echo "$as_me:23126: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23141,7 +23142,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23144: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23145: 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:23155: 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
+@@ -23162,7 +23163,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23165 "configure"
++#line 23166 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23197,15 +23198,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23200: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23201: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23203: \$? = $ac_status" >&5
++  echo "$as_me:23204: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23205: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23206: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23208: \$? = $ac_status" >&5
++  echo "$as_me:23209: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -23220,16 +23221,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:23223: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:23224: 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:23226: checking for mkstemp" >&5
++	echo "$as_me:23227: 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 23232 "configure"
++#line 23233 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23260,16 +23261,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23263: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23264: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23266: \$? = $ac_status" >&5
++  echo "$as_me:23267: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23269: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23270: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23272: \$? = $ac_status" >&5
++  echo "$as_me:23273: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -23279,7 +23280,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23282: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:23283: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -23300,21 +23301,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:23303: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:23304: 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:23306: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:23307: 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:23312: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:23313: 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 23317 "configure"
++#line 23318 "configure"
+ #include "confdefs.h"
+ #include 
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -23331,15 +23332,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23334: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23335: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23337: \$? = $ac_status" >&5
++  echo "$as_me:23338: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23339: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23340: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23342: \$? = $ac_status" >&5
++  echo "$as_me:23343: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -23352,7 +23353,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:23355: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:23356: 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
+ 
+@@ -23363,13 +23364,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:23366: checking for intptr_t" >&5
++echo "$as_me:23367: 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 23372 "configure"
++#line 23373 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23384,16 +23385,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23387: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23388: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23390: \$? = $ac_status" >&5
++  echo "$as_me:23391: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23393: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23394: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23396: \$? = $ac_status" >&5
++  echo "$as_me:23397: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -23403,7 +23404,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23406: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:23407: 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
+   :
+@@ -23415,13 +23416,13 @@
+ 
+ fi
+ 
+-echo "$as_me:23418: checking for ssize_t" >&5
++echo "$as_me:23419: 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 23424 "configure"
++#line 23425 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23436,16 +23437,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23439: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23440: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23442: \$? = $ac_status" >&5
++  echo "$as_me:23443: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23445: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23446: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23448: \$? = $ac_status" >&5
++  echo "$as_me:23449: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -23455,7 +23456,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23458: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:23459: 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
+   :
+@@ -23467,14 +23468,14 @@
+ 
+ fi
+ 
+-echo "$as_me:23470: checking for type sigaction_t" >&5
++echo "$as_me:23471: 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 23477 "configure"
++#line 23478 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23487,16 +23488,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23490: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23491: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23493: \$? = $ac_status" >&5
++  echo "$as_me:23494: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23496: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23497: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23499: \$? = $ac_status" >&5
++  echo "$as_me:23500: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -23507,14 +23508,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:23510: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:23511: 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:23517: checking declaration of size-change" >&5
++echo "$as_me:23518: 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
+@@ -23535,7 +23536,7 @@
+ 
+ 	fi
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23538 "configure"
++#line 23539 "configure"
+ #include "confdefs.h"
+ #include 
+ #ifdef HAVE_TERMIOS_H
+@@ -23585,16 +23586,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23588: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23589: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23591: \$? = $ac_status" >&5
++  echo "$as_me:23592: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23594: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23595: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23597: \$? = $ac_status" >&5
++  echo "$as_me:23598: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -23613,7 +23614,7 @@
+ done
+ 
+ fi
+-echo "$as_me:23616: result: $cf_cv_sizechange" >&5
++echo "$as_me:23617: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -23631,13 +23632,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:23634: checking for memmove" >&5
++echo "$as_me:23635: 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 23640 "configure"
++#line 23641 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23668,16 +23669,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23671: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23672: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23674: \$? = $ac_status" >&5
++  echo "$as_me:23675: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23677: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23678: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23680: \$? = $ac_status" >&5
++  echo "$as_me:23681: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -23687,19 +23688,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23690: result: $ac_cv_func_memmove" >&5
++echo "$as_me:23691: 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:23696: checking for bcopy" >&5
++echo "$as_me:23697: 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 23702 "configure"
++#line 23703 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23730,16 +23731,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23733: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23734: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23736: \$? = $ac_status" >&5
++  echo "$as_me:23737: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23739: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23740: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23742: \$? = $ac_status" >&5
++  echo "$as_me:23743: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -23749,11 +23750,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23752: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:23753: 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:23756: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:23757: 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
+@@ -23763,7 +23764,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23766 "configure"
++#line 23767 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23779,15 +23780,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23782: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23783: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23785: \$? = $ac_status" >&5
++  echo "$as_me:23786: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23787: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23788: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23790: \$? = $ac_status" >&5
++  echo "$as_me:23791: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -23800,7 +23801,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:23803: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:23804: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -23827,13 +23828,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23830: checking for $ac_func" >&5
++echo "$as_me:23831: 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 23836 "configure"
++#line 23837 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23864,16 +23865,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23867: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23868: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23870: \$? = $ac_status" >&5
++  echo "$as_me:23871: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23873: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23874: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23876: \$? = $ac_status" >&5
++  echo "$as_me:23877: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23883,7 +23884,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23886: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23887: 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:23897: 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
+@@ -23903,7 +23904,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23906 "configure"
++#line 23907 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23956,15 +23957,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23959: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23960: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23962: \$? = $ac_status" >&5
++  echo "$as_me:23963: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23964: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23965: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23967: \$? = $ac_status" >&5
++  echo "$as_me:23968: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -23976,21 +23977,21 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23979: result: $cf_cv_working_poll" >&5
++echo "$as_me:23980: 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:23986: checking if MB_LEN_MAX is usable" >&5
++echo "$as_me:23987: checking if MB_LEN_MAX is usable" >&5
+ echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
+ if test "${cf_cv_mb_len_max+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23993 "configure"
++#line 23994 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24010,16 +24011,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24013: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24014: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24016: \$? = $ac_status" >&5
++  echo "$as_me:24017: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24019: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24020: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24022: \$? = $ac_status" >&5
++  echo "$as_me:24023: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mb_len_max=yes
+ else
+@@ -24029,7 +24030,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24032: result: $cf_cv_mb_len_max" >&5
++echo "$as_me:24033: result: $cf_cv_mb_len_max" >&5
+ echo "${ECHO_T}$cf_cv_mb_len_max" >&6
+ if test "$cf_cv_mb_len_max" = yes
+ then
+@@ -24039,18 +24040,18 @@
+ EOF
+ 
+ else
+-	{ echo "$as_me:24042: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
++	{ echo "$as_me:24043: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+ echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
+ fi
+ 
+-echo "$as_me:24046: checking for va_copy" >&5
++echo "$as_me:24047: 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 24053 "configure"
++#line 24054 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24067,16 +24068,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24070: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24071: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24073: \$? = $ac_status" >&5
++  echo "$as_me:24074: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24076: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24077: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24079: \$? = $ac_status" >&5
++  echo "$as_me:24080: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -24086,7 +24087,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24089: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:24090: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -24098,14 +24099,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:24101: checking for __va_copy" >&5
++echo "$as_me:24102: 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 24108 "configure"
++#line 24109 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24122,16 +24123,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24125: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24126: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24128: \$? = $ac_status" >&5
++  echo "$as_me:24129: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24131: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24132: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24134: \$? = $ac_status" >&5
++  echo "$as_me:24135: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -24141,7 +24142,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24144: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:24145: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -24153,14 +24154,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:24156: checking for __builtin_va_copy" >&5
++echo "$as_me:24157: 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 24163 "configure"
++#line 24164 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24177,16 +24178,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24180: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24181: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24183: \$? = $ac_status" >&5
++  echo "$as_me:24184: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24186: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24187: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24189: \$? = $ac_status" >&5
++  echo "$as_me:24190: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -24196,7 +24197,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24199: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:24200: 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 &&
+@@ -24214,14 +24215,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:24217: checking if we can simply copy va_list" >&5
++	echo "$as_me:24218: 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 24224 "configure"
++#line 24225 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24238,16 +24239,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24241: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24242: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24244: \$? = $ac_status" >&5
++  echo "$as_me:24245: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24247: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24248: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24250: \$? = $ac_status" >&5
++  echo "$as_me:24251: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -24257,19 +24258,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24260: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:24261: 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:24265: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:24266: 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 24272 "configure"
++#line 24273 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24286,16 +24287,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24289: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24290: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24292: \$? = $ac_status" >&5
++  echo "$as_me:24293: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24295: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24296: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24298: \$? = $ac_status" >&5
++  echo "$as_me:24299: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -24305,7 +24306,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24308: result: $cf_cv_array_va_list" >&5
++echo "$as_me:24309: 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
+@@ -24316,13 +24317,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:24319: checking for pid_t" >&5
++echo "$as_me:24320: 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 24325 "configure"
++#line 24326 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24337,16 +24338,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24340: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24341: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24343: \$? = $ac_status" >&5
++  echo "$as_me:24344: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24346: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24347: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24349: \$? = $ac_status" >&5
++  echo "$as_me:24350: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -24356,7 +24357,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24359: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:24360: 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
+   :
+@@ -24371,23 +24372,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:24374: checking for $ac_header" >&5
++echo "$as_me:24375: 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 24380 "configure"
++#line 24381 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:24384: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:24385: \"$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:24390: \$? = $ac_status" >&5
++  echo "$as_me:24391: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -24406,7 +24407,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24409: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:24410: 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:24423: 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 24428 "configure"
++#line 24429 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -24456,16 +24457,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24459: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24460: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24462: \$? = $ac_status" >&5
++  echo "$as_me:24463: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24465: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24466: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24468: \$? = $ac_status" >&5
++  echo "$as_me:24469: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -24475,7 +24476,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24478: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:24479: 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:24491: 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
+@@ -24510,15 +24511,15 @@
+       }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24513: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24514: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24516: \$? = $ac_status" >&5
++  echo "$as_me:24517: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24518: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24519: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24521: \$? = $ac_status" >&5
++  echo "$as_me:24522: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -24530,7 +24531,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24533: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:24534: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -24544,12 +24545,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:24547: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24548: 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:24552: checking for working vfork" >&5
++  echo "$as_me:24553: 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
+@@ -24558,7 +24559,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24561 "configure"
++#line 24562 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include 
+@@ -24651,15 +24652,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24654: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24655: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24657: \$? = $ac_status" >&5
++  echo "$as_me:24658: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24659: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24660: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24662: \$? = $ac_status" >&5
++  echo "$as_me:24663: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -24671,13 +24672,13 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24674: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:24675: 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:24680: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24681: 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
+ 
+@@ -24702,7 +24703,7 @@
+ 
+ fi
+ 
+-echo "$as_me:24705: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:24706: 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
+@@ -24712,7 +24713,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24715 "configure"
++#line 24716 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24747,15 +24748,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24750: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24751: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24753: \$? = $ac_status" >&5
++  echo "$as_me:24754: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24755: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24756: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24758: \$? = $ac_status" >&5
++  echo "$as_me:24759: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fopen_bin_r=yes
+ else
+@@ -24768,7 +24769,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:24771: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:24772: 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
+@@ -24777,7 +24778,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:24780: checking for openpty in -lutil" >&5
++echo "$as_me:24781: 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
+@@ -24785,7 +24786,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24788 "configure"
++#line 24789 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -24804,16 +24805,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24807: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24808: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24810: \$? = $ac_status" >&5
++  echo "$as_me:24811: \$? = $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:24814: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24816: \$? = $ac_status" >&5
++  echo "$as_me:24817: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -24824,7 +24825,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:24827: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:24828: 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
+@@ -24832,7 +24833,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:24835: checking for openpty header" >&5
++echo "$as_me:24836: 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
+@@ -24859,7 +24860,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24862 "configure"
++#line 24863 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -24877,16 +24878,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24880: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24881: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24883: \$? = $ac_status" >&5
++  echo "$as_me:24884: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24886: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24887: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24889: \$? = $ac_status" >&5
++  echo "$as_me:24890: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -24904,7 +24905,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:24907: result: $cf_cv_func_openpty" >&5
++echo "$as_me:24908: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -24977,7 +24978,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24980 "configure"
++#line 24981 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -24989,16 +24990,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24992: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24993: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24995: \$? = $ac_status" >&5
++  echo "$as_me:24996: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24998: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24999: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25001: \$? = $ac_status" >&5
++  echo "$as_me:25002: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25015,7 +25016,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}:25018: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25019: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25051,7 +25052,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}:25054: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25055: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25062,7 +25063,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:25065: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:25066: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -25134,7 +25135,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25137 "configure"
++#line 25138 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -25146,16 +25147,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25149: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25150: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25152: \$? = $ac_status" >&5
++  echo "$as_me:25153: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25155: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25156: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25158: \$? = $ac_status" >&5
++  echo "$as_me:25159: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25172,7 +25173,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}:25175: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25176: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25252,7 +25253,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}:25255: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25256: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25269,23 +25270,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:25272: checking for db.h" >&5
++echo "$as_me:25273: 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 25278 "configure"
++#line 25279 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:25282: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25283: \"$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:25288: \$? = $ac_status" >&5
++  echo "$as_me:25289: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -25304,11 +25305,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25307: result: $ac_cv_header_db_h" >&5
++echo "$as_me:25308: 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:25311: checking for version of db" >&5
++echo "$as_me:25312: 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
+@@ -25319,10 +25320,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:25322: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:25323: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25325 "configure"
++#line 25326 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25352,16 +25353,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25355: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25356: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25358: \$? = $ac_status" >&5
++  echo "$as_me:25359: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25361: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25362: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25364: \$? = $ac_status" >&5
++  echo "$as_me:25365: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -25375,16 +25376,16 @@
+ done
+ 
+ fi
+-echo "$as_me:25378: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:25379: 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:25382: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:25383: 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:25387: checking for db libraries" >&5
++echo "$as_me:25388: 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
+@@ -25414,10 +25415,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:25417: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:25418: testing checking for library $cf_db_libs ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25420 "configure"
++#line 25421 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25472,16 +25473,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25475: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25476: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25478: \$? = $ac_status" >&5
++  echo "$as_me:25479: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25481: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25482: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25484: \$? = $ac_status" >&5
++  echo "$as_me:25485: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -25501,11 +25502,11 @@
+ done
+ 
+ fi
+-echo "$as_me:25504: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:25505: 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:25508: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:25509: 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
+@@ -25531,7 +25532,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:25534: error: Cannot find db.h" >&5
++	{ { echo "$as_me:25535: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -25546,7 +25547,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:25549: checking if we should include stdbool.h" >&5
++echo "$as_me:25550: 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
+@@ -25554,7 +25555,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25557 "configure"
++#line 25558 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -25566,23 +25567,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25569: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25570: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25572: \$? = $ac_status" >&5
++  echo "$as_me:25573: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25575: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25576: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25578: \$? = $ac_status" >&5
++  echo "$as_me:25579: \$? = $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 25585 "configure"
++#line 25586 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -25598,16 +25599,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25601: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25602: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25604: \$? = $ac_status" >&5
++  echo "$as_me:25605: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25607: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25608: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25610: \$? = $ac_status" >&5
++  echo "$as_me:25611: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -25621,13 +25622,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:25624: result: yes" >&5
++then	echo "$as_me:25625: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25626: result: no" >&5
++else	echo "$as_me:25627: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:25630: checking for builtin bool type" >&5
++echo "$as_me:25631: 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
+@@ -25635,7 +25636,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25638 "configure"
++#line 25639 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25650,16 +25651,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25653: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25654: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25656: \$? = $ac_status" >&5
++  echo "$as_me:25657: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25659: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25660: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25662: \$? = $ac_status" >&5
++  echo "$as_me:25663: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -25672,9 +25673,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:25675: result: yes" >&5
++then	echo "$as_me:25676: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25677: result: no" >&5
++else	echo "$as_me:25678: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -25691,10 +25692,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:25694: checking if we already have C++ library" >&5
++	echo "$as_me:25695: 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 25697 "configure"
++#line 25698 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -25708,16 +25709,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25711: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25712: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25714: \$? = $ac_status" >&5
++  echo "$as_me:25715: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25717: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25718: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25720: \$? = $ac_status" >&5
++  echo "$as_me:25721: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -25726,7 +25727,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-	echo "$as_me:25729: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:25730: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -25745,7 +25746,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:25748: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:25749: 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
+@@ -25771,7 +25772,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25774 "configure"
++#line 25775 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -25785,16 +25786,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25788: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25789: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25791: \$? = $ac_status" >&5
++  echo "$as_me:25792: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25794: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25795: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25797: \$? = $ac_status" >&5
++  echo "$as_me:25798: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -25806,7 +25807,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:25809: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:25810: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -25828,7 +25829,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:25831: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:25832: 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
+@@ -25843,15 +25844,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:25846: \"$ac_try\"") >&5
++if { (eval echo "$as_me:25847: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25849: \$? = $ac_status" >&5
++  echo "$as_me:25850: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25851: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:25852: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25854: \$? = $ac_status" >&5
++  echo "$as_me:25855: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -25862,10 +25863,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+-  echo "$as_me:25865: result: yes" >&5
++  echo "$as_me:25866: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:25868: result: no" >&5
++  echo "$as_me:25869: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -25885,7 +25886,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:25888: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:25889: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -25906,7 +25907,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25909 "configure"
++#line 25910 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -25920,16 +25921,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25923: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25924: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25926: \$? = $ac_status" >&5
++  echo "$as_me:25927: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25929: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25930: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25932: \$? = $ac_status" >&5
++  echo "$as_me:25933: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -25966,7 +25967,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25969 "configure"
++#line 25970 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25980,16 +25981,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25983: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25984: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25986: \$? = $ac_status" >&5
++  echo "$as_me:25987: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25989: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25990: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25992: \$? = $ac_status" >&5
++  echo "$as_me:25993: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -26022,7 +26023,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	LIBS="$cf_save"
+-	echo "$as_me:26025: result: $cf_cxx_library" >&5
++	echo "$as_me:26026: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -26038,7 +26039,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:26041: checking how to run the C++ preprocessor" >&5
++echo "$as_me:26042: 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
+@@ -26055,18 +26056,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 26058 "configure"
++#line 26059 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26063: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26064: \"$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:26069: \$? = $ac_status" >&5
++  echo "$as_me:26070: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26089,17 +26090,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26092 "configure"
++#line 26093 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26096: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26097: \"$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:26102: \$? = $ac_status" >&5
++  echo "$as_me:26103: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26136,7 +26137,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:26139: result: $CXXCPP" >&5
++echo "$as_me:26140: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -26146,18 +26147,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 26149 "configure"
++#line 26150 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26154: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26155: \"$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:26160: \$? = $ac_status" >&5
++  echo "$as_me:26161: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26180,17 +26181,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26183 "configure"
++#line 26184 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26187: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26188: \"$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:26193: \$? = $ac_status" >&5
++  echo "$as_me:26194: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26218,7 +26219,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:26221: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:26222: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -26233,23 +26234,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:26236: checking for $ac_header" >&5
++echo "$as_me:26237: 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 26242 "configure"
++#line 26243 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26246: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26247: \"$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:26252: \$? = $ac_status" >&5
++  echo "$as_me:26253: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26268,7 +26269,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26271: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26272: 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:26285: 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 26290 "configure"
++#line 26291 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26294: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26295: \"$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:26300: \$? = $ac_status" >&5
++  echo "$as_me:26301: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26316,7 +26317,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26319: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26320: 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:26331: 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 26333 "configure"
++#line 26334 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26347,16 +26348,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26350: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26351: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26353: \$? = $ac_status" >&5
++  echo "$as_me:26354: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26356: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26357: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26359: \$? = $ac_status" >&5
++  echo "$as_me:26360: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -26365,7 +26366,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:26368: result: $cf_iostream_namespace" >&5
++	echo "$as_me:26369: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -26376,7 +26377,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:26379: checking if we should include stdbool.h" >&5
++echo "$as_me:26380: 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
+@@ -26384,7 +26385,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26387 "configure"
++#line 26388 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -26396,23 +26397,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26399: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26400: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26402: \$? = $ac_status" >&5
++  echo "$as_me:26403: \$? = $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:26406: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26408: \$? = $ac_status" >&5
++  echo "$as_me:26409: \$? = $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 26415 "configure"
++#line 26416 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -26428,16 +26429,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26431: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26432: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26434: \$? = $ac_status" >&5
++  echo "$as_me:26435: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26437: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26438: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26440: \$? = $ac_status" >&5
++  echo "$as_me:26441: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -26451,13 +26452,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:26454: result: yes" >&5
++then	echo "$as_me:26455: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:26456: result: no" >&5
++else	echo "$as_me:26457: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:26460: checking for builtin bool type" >&5
++echo "$as_me:26461: 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
+@@ -26465,7 +26466,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26468 "configure"
++#line 26469 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26480,16 +26481,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26483: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26484: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26486: \$? = $ac_status" >&5
++  echo "$as_me:26487: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26489: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26490: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26492: \$? = $ac_status" >&5
++  echo "$as_me:26493: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -26502,19 +26503,19 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:26505: result: yes" >&5
++then	echo "$as_me:26506: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:26507: result: no" >&5
++else	echo "$as_me:26508: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:26511: checking for bool" >&5
++echo "$as_me:26512: 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 26517 "configure"
++#line 26518 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26549,16 +26550,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26552: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26553: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26555: \$? = $ac_status" >&5
++  echo "$as_me:26556: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26558: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26559: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26561: \$? = $ac_status" >&5
++  echo "$as_me:26562: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -26568,10 +26569,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26571: result: $ac_cv_type_bool" >&5
++echo "$as_me:26572: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:26574: checking size of bool" >&5
++echo "$as_me:26575: 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
+@@ -26580,7 +26581,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26583 "configure"
++#line 26584 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26612,21 +26613,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26615: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26616: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26618: \$? = $ac_status" >&5
++  echo "$as_me:26619: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26621: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26622: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26624: \$? = $ac_status" >&5
++  echo "$as_me:26625: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26629 "configure"
++#line 26630 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26658,16 +26659,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26661: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26662: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26664: \$? = $ac_status" >&5
++  echo "$as_me:26665: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26667: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26668: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26670: \$? = $ac_status" >&5
++  echo "$as_me:26671: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -26683,7 +26684,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26686 "configure"
++#line 26687 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26715,16 +26716,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26718: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26719: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26721: \$? = $ac_status" >&5
++  echo "$as_me:26722: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26724: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26725: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26727: \$? = $ac_status" >&5
++  echo "$as_me:26728: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -26740,7 +26741,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 26743 "configure"
++#line 26744 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26772,16 +26773,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26775: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26776: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26778: \$? = $ac_status" >&5
++  echo "$as_me:26779: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26781: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26782: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26784: \$? = $ac_status" >&5
++  echo "$as_me:26785: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -26794,12 +26795,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:26797: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:26798: 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 26802 "configure"
++#line 26803 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26835,15 +26836,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26838: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26839: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26841: \$? = $ac_status" >&5
++  echo "$as_me:26842: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26843: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26844: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26846: \$? = $ac_status" >&5
++  echo "$as_me:26847: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -26859,13 +26860,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:26862: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:26863: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:26869: 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
+@@ -26884,7 +26885,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26887 "configure"
++#line 26888 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26925,15 +26926,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26928: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26929: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26931: \$? = $ac_status" >&5
++  echo "$as_me:26932: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26933: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26934: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26936: \$? = $ac_status" >&5
++  echo "$as_me:26937: \$? = $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
+@@ -26950,19 +26951,19 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:26953: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:26954: 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:26960: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:26961: 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:26965: checking for special defines needed for etip.h" >&5
++echo "$as_me:26966: 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"
+@@ -26980,7 +26981,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 26983 "configure"
++#line 26984 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26994,16 +26995,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26997: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26998: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27000: \$? = $ac_status" >&5
++  echo "$as_me:27001: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27003: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27004: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27006: \$? = $ac_status" >&5
++  echo "$as_me:27007: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:27028: result: ${cf_result:-(none)}" >&5
+ echo "${ECHO_T}${cf_result:-(none)}" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27032: checking if $CXX accepts override keyword" >&5
++echo "$as_me:27033: checking if $CXX accepts override keyword" >&5
+ echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
+ if test "${cf_cv_cpp_override+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27046,7 +27047,7 @@
+   cf_cv_cpp_override=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27049 "configure"
++#line 27050 "configure"
+ #include "confdefs.h"
+ 
+ class base
+@@ -27065,15 +27066,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27068: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27069: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27071: \$? = $ac_status" >&5
++  echo "$as_me:27072: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27073: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27074: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27076: \$? = $ac_status" >&5
++  echo "$as_me:27077: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_override=yes
+ else
+@@ -27092,7 +27093,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27095: result: $cf_cv_cpp_override" >&5
++echo "$as_me:27096: result: $cf_cv_cpp_override" >&5
+ echo "${ECHO_T}$cf_cv_cpp_override" >&6
+ fi
+ test "$cf_cv_cpp_override" = yes &&
+@@ -27101,7 +27102,7 @@
+ EOF
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27104: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:27105: 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
+@@ -27118,7 +27119,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27121 "configure"
++#line 27122 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -27137,15 +27138,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27140: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27141: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27143: \$? = $ac_status" >&5
++  echo "$as_me:27144: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27145: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27146: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27148: \$? = $ac_status" >&5
++  echo "$as_me:27149: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -27164,7 +27165,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27167: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:27168: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -27174,7 +27175,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:27177: checking if $CXX accepts static_cast" >&5
++echo "$as_me:27178: 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
+@@ -27188,7 +27189,7 @@
+ ac_main_return="return"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27191 "configure"
++#line 27192 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -27232,16 +27233,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27235: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27236: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27238: \$? = $ac_status" >&5
++  echo "$as_me:27239: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27241: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27242: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27244: \$? = $ac_status" >&5
++  echo "$as_me:27245: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -27259,7 +27260,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27262: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:27263: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -27308,13 +27309,13 @@
+ 	else
+ 		if test "$cf_cv_header_stdbool_h" = 1 ; then
+ 
+-echo "$as_me:27311: checking for bool" >&5
++echo "$as_me:27312: 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 27317 "configure"
++#line 27318 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27349,16 +27350,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27352: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27353: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27355: \$? = $ac_status" >&5
++  echo "$as_me:27356: \$? = $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:27359: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27361: \$? = $ac_status" >&5
++  echo "$as_me:27362: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -27368,10 +27369,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27371: result: $ac_cv_type_bool" >&5
++echo "$as_me:27372: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:27374: checking size of bool" >&5
++echo "$as_me:27375: 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
+@@ -27380,7 +27381,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27383 "configure"
++#line 27384 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27412,21 +27413,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27415: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27416: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27418: \$? = $ac_status" >&5
++  echo "$as_me:27419: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27421: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27422: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27424: \$? = $ac_status" >&5
++  echo "$as_me:27425: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27429 "configure"
++#line 27430 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27458,16 +27459,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27461: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27462: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27464: \$? = $ac_status" >&5
++  echo "$as_me:27465: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27467: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27468: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27470: \$? = $ac_status" >&5
++  echo "$as_me:27471: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -27483,7 +27484,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27486 "configure"
++#line 27487 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27515,16 +27516,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27518: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27519: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27521: \$? = $ac_status" >&5
++  echo "$as_me:27522: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27524: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27525: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27527: \$? = $ac_status" >&5
++  echo "$as_me:27528: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27540,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 27543 "configure"
++#line 27544 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27572,16 +27573,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27575: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27576: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27578: \$? = $ac_status" >&5
++  echo "$as_me:27579: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27581: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27582: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27584: \$? = $ac_status" >&5
++  echo "$as_me:27585: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27594,12 +27595,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27597: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27598: 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 27602 "configure"
++#line 27603 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27635,15 +27636,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27638: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27639: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27641: \$? = $ac_status" >&5
++  echo "$as_me:27642: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27643: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27644: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27646: \$? = $ac_status" >&5
++  echo "$as_me:27647: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27659,13 +27660,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27662: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27663: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27669: 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
+@@ -27684,7 +27685,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27687 "configure"
++#line 27688 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27725,15 +27726,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27728: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27729: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27731: \$? = $ac_status" >&5
++  echo "$as_me:27732: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27733: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27734: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27736: \$? = $ac_status" >&5
++  echo "$as_me:27737: \$? = $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
+@@ -27750,26 +27751,26 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:27753: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:27754: 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:27760: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:27761: 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:27766: checking for fallback type of bool" >&5
++			echo "$as_me:27767: 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:27772: result: $cf_cv_type_of_bool" >&5
++			echo "$as_me:27773: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 		fi
+ 	fi
+@@ -27798,7 +27799,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:27801: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:27802: 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
+@@ -27809,7 +27810,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:27812: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:27813: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -27826,10 +27827,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:27829: result: $ADAFLAGS" >&5
++	echo "$as_me:27830: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:27832: checking if GNATPREP supports -T option" >&5
++echo "$as_me:27833: 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
+@@ -27839,11 +27840,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:27842: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:27843: 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:27846: checking if GNAT supports generics" >&5
++echo "$as_me:27847: 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])
+@@ -27853,7 +27854,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:27856: result: $cf_gnat_generics" >&5
++echo "$as_me:27857: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -27865,7 +27866,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:27868: checking if GNAT supports SIGINT" >&5
++echo "$as_me:27869: 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
+@@ -27913,7 +27914,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:27916: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:27917: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -27926,7 +27927,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:27929: checking if GNAT supports project files" >&5
++echo "$as_me:27930: 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]*)
+@@ -27989,15 +27990,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:27992: result: $cf_gnat_projects" >&5
++echo "$as_me:27993: 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:27998: checking if GNAT supports libraries" >&5
++	echo "$as_me:27999: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:28000: result: $cf_gnat_libraries" >&5
++	echo "$as_me:28001: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -28017,7 +28018,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:28020: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:28021: 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
+@@ -28029,7 +28030,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:28032: checking for Ada95 compiler" >&5
++echo "$as_me:28033: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -28040,12 +28041,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:28043: result: $cf_ada_compiler" >&5
++echo "$as_me:28044: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:28048: checking for Ada95 include directory" >&5
++echo "$as_me:28049: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -28081,7 +28082,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28084: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28085: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28090,10 +28091,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:28093: result: $ADA_INCLUDE" >&5
++echo "$as_me:28094: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:28096: checking for Ada95 object directory" >&5
++echo "$as_me:28097: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -28129,7 +28130,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28132: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28133: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28138,10 +28139,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:28141: result: $ADA_OBJECTS" >&5
++echo "$as_me:28142: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:28144: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:28145: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -28162,11 +28163,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:28165: result: $with_ada_sharedlib" >&5
++echo "$as_me:28166: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+-	{ echo "$as_me:28169: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++	{ echo "$as_me:28170: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+ 
+@@ -28184,7 +28185,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:28187: checking for Ada95 curses library name" >&5
++echo "$as_me:28188: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -28200,7 +28201,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28203: result: $ADA_LIBNAME" >&5
++echo "$as_me:28204: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -28211,13 +28212,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:28214: checking for wchar_t" >&5
++	echo "$as_me:28215: 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 28220 "configure"
++#line 28221 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28232,16 +28233,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28235: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28236: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28238: \$? = $ac_status" >&5
++  echo "$as_me:28239: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28241: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28242: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28244: \$? = $ac_status" >&5
++  echo "$as_me:28245: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -28251,10 +28252,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:28254: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:28255: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:28257: checking size of wchar_t" >&5
++echo "$as_me:28258: 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
+@@ -28263,7 +28264,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28266 "configure"
++#line 28267 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28275,21 +28276,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28278: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28279: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28281: \$? = $ac_status" >&5
++  echo "$as_me:28282: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28284: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28285: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28287: \$? = $ac_status" >&5
++  echo "$as_me:28288: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28292 "configure"
++#line 28293 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28301,16 +28302,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28304: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28305: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28307: \$? = $ac_status" >&5
++  echo "$as_me:28308: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28310: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28311: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28313: \$? = $ac_status" >&5
++  echo "$as_me:28314: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -28326,7 +28327,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28329 "configure"
++#line 28330 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28338,16 +28339,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28341: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28342: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28344: \$? = $ac_status" >&5
++  echo "$as_me:28345: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28347: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28348: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28350: \$? = $ac_status" >&5
++  echo "$as_me:28351: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -28363,7 +28364,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 28366 "configure"
++#line 28367 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28375,16 +28376,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28378: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28379: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28381: \$? = $ac_status" >&5
++  echo "$as_me:28382: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28384: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28385: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28387: \$? = $ac_status" >&5
++  echo "$as_me:28388: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -28397,12 +28398,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:28400: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:28401: 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 28405 "configure"
++#line 28406 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28418,15 +28419,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:28421: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28422: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28424: \$? = $ac_status" >&5
++  echo "$as_me:28425: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:28426: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28427: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28429: \$? = $ac_status" >&5
++  echo "$as_me:28430: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -28442,7 +28443,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:28445: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:28446: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&6
+ 
+-echo "${as_me:-configure}:28458: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:28459: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -28473,7 +28474,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:28476: checking for library subsets" >&5
++echo "$as_me:28477: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -28527,7 +28528,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:28530: result: $LIB_SUBSETS" >&5
++echo "$as_me:28531: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -28558,7 +28559,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:28561: checking default library suffix" >&5
++echo "$as_me:28562: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28569,10 +28570,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:28572: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:28573: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:28575: checking default library-dependency suffix" >&5
++echo "$as_me:28576: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -28655,10 +28656,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:28658: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28659: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:28661: checking default object directory" >&5
++echo "$as_me:28662: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28674,11 +28675,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:28677: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28678: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28681: checking c++ library-dependency suffix" >&5
++echo "$as_me:28682: 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++)
+@@ -28771,7 +28772,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:28774: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:28775: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -28947,19 +28948,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:28950: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:28951: 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:28959: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:28960: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28962: \$? = $ac_status" >&5
++  echo "$as_me:28963: \$? = $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
+@@ -28970,10 +28971,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28973 "configure"
++#line 28974 "configure"
+ #include "confdefs.h"
+ 
+-#line 28976 "configure"
++#line 28977 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -28988,16 +28989,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:28991: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28992: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28994: \$? = $ac_status" >&5
++  echo "$as_me:28995: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:28997: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28998: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:29000: \$? = $ac_status" >&5
++  echo "$as_me:29001: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -29020,7 +29021,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:29023: result: $cf_ldflags_static" >&5
++	echo "$as_me:29024: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test "$cf_ldflags_static" != yes
+@@ -29036,7 +29037,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29039: checking where we will install curses.h" >&5
++echo "$as_me:29040: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -29046,7 +29047,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:29049: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:29050: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -29054,7 +29055,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:29057: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:29058: 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
+@@ -29079,7 +29080,7 @@
+ 
+ # pkgsrc uses these
+ 
+-echo "$as_me:29082: checking for desired basename for form library" >&5
++echo "$as_me:29083: 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.
+@@ -29099,10 +29100,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29102: result: $FORM_NAME" >&5
++echo "$as_me:29103: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:29105: checking for desired basename for menu library" >&5
++echo "$as_me:29106: 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.
+@@ -29122,10 +29123,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29125: result: $MENU_NAME" >&5
++echo "$as_me:29126: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:29128: checking for desired basename for panel library" >&5
++echo "$as_me:29129: 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.
+@@ -29145,10 +29146,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29148: result: $PANEL_NAME" >&5
++echo "$as_me:29149: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:29151: checking for desired basename for cxx library" >&5
++echo "$as_me:29152: 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.
+@@ -29168,13 +29169,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29171: result: $CXX_NAME" >&5
++echo "$as_me:29172: 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:29177: checking for src modules" >&5
++echo "$as_me:29178: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -29233,7 +29234,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:29236: result: $cf_cv_src_modules" >&5
++echo "$as_me:29237: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -29394,7 +29395,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:29397: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:29398: 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//'`
+@@ -29405,7 +29406,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:29408: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
++echo "$as_me:29409: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -29421,7 +29422,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:29424: result: $PKG_CFLAGS" >&5
++echo "$as_me:29425: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
+@@ -29482,7 +29483,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
+ 
+-echo "${as_me:-configure}:29485: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
++echo "${as_me:-configure}:29486: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+ 
+ fi
+ 
+@@ -29509,7 +29510,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:29512: checking for linker search path" >&5
++echo "$as_me:29513: 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
+@@ -29557,7 +29558,7 @@
+ 			cf_pathlist="$cf_pathlist /lib /usr/lib"
+ 			;;
+ 		(*)
+-			{ echo "$as_me:29560: WARNING: problem with Solaris architecture" >&5
++			{ echo "$as_me:29561: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ 			;;
+ 		esac
+@@ -29598,7 +29599,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:29601: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29602: 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'`
+@@ -29684,7 +29685,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29687: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29688: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -29865,7 +29866,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:29868: error: ambiguous option: $1
++    { { echo "$as_me:29869: 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;}
+@@ -29884,7 +29885,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:29887: error: unrecognized option: $1
++  -*) { { echo "$as_me:29888: 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;}
+@@ -30014,7 +30015,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:30017: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:30018: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -30536,7 +30537,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:30539: creating $ac_file" >&5
++    { echo "$as_me:30540: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -30554,7 +30555,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30557: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30558: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -30567,7 +30568,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30570: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30571: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30583,7 +30584,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:30586: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:30587: 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;}
+@@ -30592,7 +30593,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:30595: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:30596: 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;}
+@@ -30637,7 +30638,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:30640: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:30641: 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;}
+@@ -30648,7 +30649,7 @@
+     $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:30651: WARNING: Some variables may not be substituted:
++      { echo "$as_me:30652: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30697,7 +30698,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:30700: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:30701: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -30708,7 +30709,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30711: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30712: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -30721,7 +30722,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30724: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30725: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30779,7 +30780,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:30782: $ac_file is unchanged" >&5
++      { echo "$as_me:30783: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -31166,7 +31167,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}:31169: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:31170: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: configure.in
+Prereq:  1.781 
+--- ncurses-6.5-20240519+/configure.in	2024-05-18 19:42:53.000000000 +0000
++++ ncurses-6.5-20240525/configure.in	2024-05-25 23:05:44.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.781 2024/05/18 19:42:53 tom Exp $
++dnl $Id: configure.in,v 1.782 2024/05/25 23:05:44 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.781 $)
++AC_REVISION($Revision: 1.782 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -1151,8 +1151,9 @@
+ 	AC_DEFINE(HAVE_USE_WINDOW,1,[Define to 1 to enable use_window() function in test-programs])
+ 	AC_DEFINE(HAVE_WRESIZE,1,[Define to 1 to enable wresize() function in test-programs])
+ 	GENERATED_EXT_FUNCS=generated
+-	test "x$with_ext_funcs" = xyes || cf_dft_ext_spfuncs=no
+ else
++	cf_dft_ext_spfuncs=no
++	cf_dft_ext_colors=no
+ 	NCURSES_EXT_FUNCS=0
+ 	GENERATED_EXT_FUNCS=
+ fi
+Index: dist.mk
+Prereq:  1.1614 
+--- ncurses-6.5-20240519+/dist.mk	2024-05-19 08:58:02.000000000 +0000
++++ ncurses-6.5-20240525/dist.mk	2024-05-25 10:33:51.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1614 2024/05/19 08:58:02 tom Exp $
++# $Id: dist.mk,v 1.1615 2024/05/25 10:33:51 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 = 5
+-NCURSES_PATCH = 20240519
++NCURSES_PATCH = 20240525
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/curs_add_wch.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_add_wch.3x.html	2024-05-11 22:32:32.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_add_wch.3x.html	2024-05-25 22:33:41.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_add_wch.3x,v 1.63 2024/05/11 21:31:45 tom Exp @
++  * @Id: curs_add_wch.3x,v 1.65 2024/05/25 21:13:15 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_add_wch 3x 2024-05-11 ncurses 6.5 Library calls
++curs_add_wch 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                            curs_add_wch 3x 2024-05-11 ncurses 6.5 Library calls
                                                                            
++
                                                                            curs_add_wch 3x 2024-05-25 ncurses 6.5 Library calls
                                                                            
+ 
                                                                            + curs_add_wch(3x)                 Library calls                curs_add_wch(3x)
+ 
+@@ -355,7 +355,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-11                  curs_add_wch(3x)
++ncurses 6.5                       2024-05-25                  curs_add_wch(3x)
+ 
                                                                            
+ 
                                                                            
+ 
                                                                              
+Index: doc/html/man/curs_addch.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_addch.3x.html	2024-05-11 21:39:56.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_addch.3x.html	2024-05-25 22:33:41.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addch.3x,v 1.86 2024/05/11 20:39:53 tom Exp @
++  * @Id: curs_addch.3x,v 1.88 2024/05/25 21:13:32 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addch 3x 2024-05-11 ncurses 6.5 Library calls
++curs_addch 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                              curs_addch 3x 2024-05-11 ncurses 6.5 Library calls
                                                                              
++
                                                                              curs_addch 3x 2024-05-25 ncurses 6.5 Library calls
                                                                              
+ 
                                                                              + curs_addch(3x)                   Library calls                  curs_addch(3x)
+ 
+@@ -308,7 +308,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-11                    curs_addch(3x)
++ncurses 6.5                       2024-05-25                    curs_addch(3x)
+ 
                                                                              
+ 
                                                                              
+ 
                                                                                
+Index: doc/html/man/curs_addstr.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_addstr.3x.html	2024-04-27 18:38:45.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_addstr.3x.html	2024-05-25 22:33:41.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addstr.3x,v 1.45 2024/04/20 19:18:18 tom Exp @
++  * @Id: curs_addstr.3x,v 1.47 2024/05/25 20:45:40 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addstr 3x 2024-04-20 ncurses 6.5 Library calls
++curs_addstr 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                curs_addstr 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                
++
                                                                                curs_addstr 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                
+ 
                                                                                + curs_addstr(3x)                  Library calls                 curs_addstr(3x)
+ 
+@@ -80,16 +80,15 @@
+ 
                                                                                RETURN VALUE
                                                                                +        These functions return OK on success and ERR on failure.
+ 
+-       X/Open Curses does not specify any error conditions.   ncurses  returns
+-       an error
++       In ncurses, they return ERR if
+ 
+-       o   if the window pointer is NULL,
++       o   win is NULL,
+ 
+-       o   if the string pointer is NULL, or
++       o   str is NULL, or
+ 
+-       o   if an internal waddch(3x) call returns an error.
++       o   an internal waddch(3x) call returns ERR.
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
++       Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+@@ -98,7 +97,8 @@
+ 
+ 
+ 
                                                                                PORTABILITY
                                                                                +-       X/Open Curses, Issue 4 describes these functions.
++       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
++       error conditions for them.
+ 
+ 
+ 
                                                                                SEE ALSO
                                                                                +@@ -109,7 +109,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                   curs_addstr(3x)
++ncurses 6.5                       2024-05-25                   curs_addstr(3x)
+ 
                                                                                
+ 
                                                                                
+ 
                                                                                  
+Index: doc/html/man/curs_addwstr.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_addwstr.3x.html	2024-04-27 18:38:45.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_addwstr.3x.html	2024-05-25 22:33:41.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addwstr.3x,v 1.37 2024/04/20 19:18:18 tom Exp @
++  * @Id: curs_addwstr.3x,v 1.39 2024/05/25 20:10:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addwstr 3x 2024-04-20 ncurses 6.5 Library calls
++curs_addwstr 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                  curs_addwstr 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                  
++
                                                                                  curs_addwstr 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                  
+ 
                                                                                  + curs_addwstr(3x)                 Library calls                curs_addwstr(3x)
+ 
+@@ -88,7 +88,7 @@
+        These functions return OK on success and ERR on failure.
+ 
+        X/Open  Curses  does not specify any error conditions.  ncurses returns
+-       an error
++       ERR
+ 
+        o   if the window pointer is NULL,
+ 
+@@ -116,7 +116,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                  curs_addwstr(3x)
++ncurses 6.5                       2024-05-25                  curs_addwstr(3x)
+ 
                                                                                  
+ 
                                                                                  
+ 
                                                                                    
+Index: doc/html/man/curs_attr.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_attr.3x.html	2024-05-11 21:39:56.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_attr.3x.html	2024-05-25 22:33:41.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_attr.3x,v 1.106 2024/05/11 20:39:53 tom Exp @
++  * @Id: curs_attr.3x,v 1.108 2024/05/25 20:10:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_attr 3x 2024-05-11 ncurses 6.5 Library calls
++curs_attr 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                    curs_attr 3x 2024-05-11 ncurses 6.5 Library calls
                                                                                    
++
                                                                                    curs_attr 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                    
+ 
                                                                                    + curs_attr(3x)                    Library calls                   curs_attr(3x)
+ 
+@@ -249,13 +249,13 @@
+ 
+        This implementation
+ 
+-       o   returns an error if the window pointer is null.
++       o   returns ERR if the window pointer is null.
+ 
+-       o   returns an error if the color  pair  parameter  for  wcolor_set  is
+-           outside the range 0..COLOR_PAIRS-1.
++       o   returns ERR if the color pair parameter for wcolor_set  is  outside
++           the range 0..COLOR_PAIRS-1.
+ 
+-       o   does  not  return an error if either of the parameters of wattr_get
+-           used for retrieving attribute or color pair values is NULL.
++       o   does  not  fail  if  either of the parameters of wattr_get used for
++           retrieving attribute or color pair values is NULL.
+ 
+        Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+@@ -500,7 +500,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-11                     curs_attr(3x)
++ncurses 6.5                       2024-05-25                     curs_attr(3x)
+ 
                                                                                    
+ 
                                                                                    
+ 
                                                                                      
+Index: doc/html/man/curs_border.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_border.3x.html	2024-04-27 18:38:46.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_border.3x.html	2024-05-25 22:33:41.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_border.3x,v 1.49 2024/04/20 21:20:07 tom Exp @
++  * @Id: curs_border.3x,v 1.51 2024/05/25 20:10:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_border 3x 2024-04-20 ncurses 6.5 Library calls
++curs_border 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                      curs_border 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                      
++
                                                                                      curs_border 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                      
+ 
                                                                                      + curs_border(3x)                  Library calls                 curs_border(3x)
+ 
+@@ -119,7 +119,7 @@
+        negative integer if immedok is set", but this appears to be an error.
+ 
+        X/Open  Curses  does  not   specify   any   error   conditions.    This
+-       implementation returns an error if the window pointer is null.
++       implementation returns ERR if the window pointer is null.
+ 
+        Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+@@ -141,7 +141,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                   curs_border(3x)
++ncurses 6.5                       2024-05-25                   curs_border(3x)
+ 
                                                                                      
+ 
                                                                                      
+ 
                                                                                        
+Index: doc/html/man/curs_border_set.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_border_set.3x.html	2024-04-27 18:38:46.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_border_set.3x.html	2024-05-25 22:33:41.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_border_set.3x,v 1.36 2024/04/20 21:20:07 tom Exp @
++  * @Id: curs_border_set.3x,v 1.38 2024/05/25 20:10:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_border_set 3x 2024-04-20 ncurses 6.5 Library calls
++curs_border_set 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                        curs_border_set 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                        
++
                                                                                        curs_border_set 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                        
+ 
                                                                                        + curs_border_set(3x)              Library calls             curs_border_set(3x)
+ 
+@@ -144,7 +144,7 @@
+        Upon successful completion, these functions return OK.  Otherwise, they
+        return ERR.
+ 
+-       Functions using a window parameter return an error if it is null.
++       Functions using a window parameter return ERR if it is null.
+ 
+        Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+@@ -164,7 +164,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20               curs_border_set(3x)
++ncurses 6.5                       2024-05-25               curs_border_set(3x)
+ 
                                                                                        
+ 
                                                                                        
+ 
                                                                                          
+Index: doc/html/man/curs_clear.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_clear.3x.html	2024-04-27 18:38:46.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_clear.3x.html	2024-05-25 22:33:41.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_clear.3x,v 1.48 2024/04/20 21:20:07 tom Exp @
++  * @Id: curs_clear.3x,v 1.50 2024/05/25 20:10:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_clear 3x 2024-04-20 ncurses 6.5 Library calls
++curs_clear 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                          curs_clear 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                          
++
                                                                                          curs_clear 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                          
+ 
                                                                                          + curs_clear(3x)                   Library calls                  curs_clear(3x)
+ 
+@@ -100,36 +100,35 @@
+ 
+        X/Open defines no error conditions.  In this implementation,
+ 
+-       o   functions using a window pointer parameter return an error if it is
+-           null
++       o   functions using a window pointer parameter return ERR if it is null
+ 
+        o   wclrtoeol returns an error if the cursor position is about to wrap.
+ 
+ 
+ 
                                                                                          NOTES
                                                                                          +-       Note  that  erase, werase, clear, wclear, clrtobot, and clrtoeol may be
++       Note that erase, werase, clear, wclear, clrtobot, and clrtoeol  may  be
+        macros.
+ 
+ 
+ 
                                                                                          PORTABILITY
                                                                                          +        These functions are described in X/Open Curses, Issue 4.
+ 
+-       The SVr4.0 manual says that these functions could  return  "or  a  non-
+-       negative  integer  if immedok is set", referring to the return-value of
++       The  SVr4.0  manual  says  that these functions could return "or a non-
++       negative integer if immedok is set", referring to the  return-value  of
+        wrefresh.  In that implementation, wrefresh would return a count of the
+        number of characters written to the terminal.
+ 
+-       Some  historic  curses implementations had, as an undocumented feature,
++       Some historic curses implementations had, as an  undocumented  feature,
+        the  ability  to  do  the  equivalent  of  clearok(...,  1)  by  saying
+        touchwin(stdscr) or clear(stdscr).  This will not work under ncurses.
+ 
+-       This  implementation,  and  others  such  as  Solaris, sets the current
+-       position to 0,0 after erasing via werase and wclear.  That fact is  not
+-       documented   in   other   implementations,  and  may  not  be  true  of
++       This implementation, and others  such  as  Solaris,  sets  the  current
++       position  to 0,0 after erasing via werase and wclear.  That fact is not
++       documented  in  other  implementations,  and  may  not   be   true   of
+        implementations which were not derived from SVr4 source.
+ 
+        Not obvious from the description, most implementations clear the screen
+-       after  wclear  even  for  a subwindow or derived window.  If you do not
++       after wclear even for a subwindow or derived window.   If  you  do  not
+        want to clear the screen during the next wrefresh, use werase instead.
+ 
+ 
+@@ -138,7 +137,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                    curs_clear(3x)
++ncurses 6.5                       2024-05-25                    curs_clear(3x)
+ 
                                                                                          
+ 
                                                                                          
+ 
                                                                                            
+Index: doc/html/man/curs_color.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_color.3x.html	2024-04-27 18:38:46.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_color.3x.html	2024-05-25 22:33:41.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_color.3x,v 1.100 2024/04/20 21:24:19 tom Exp @
++  * @Id: curs_color.3x,v 1.102 2024/05/25 20:10:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_color 3x 2024-04-20 ncurses 6.5 Library calls
++curs_color 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                            curs_color 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                            
++
                                                                                            curs_color 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                            
+ 
                                                                                            + curs_color(3x)                   Library calls                  curs_color(3x)
+ 
+@@ -417,7 +417,7 @@
+        Specific functions make additional checks:
+ 
+           init_color
+-               returns an error if the terminal does not support this feature,
++               returns ERR if the terminal  does  not  support  this  feature,
+                e.g.,  if  the  initialize_color  capability is absent from the
+                terminal description.
+ 
+@@ -539,7 +539,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                    curs_color(3x)
++ncurses 6.5                       2024-05-25                    curs_color(3x)
+ 
                                                                                            
+ 
                                                                                            
+ 
                                                                                              
+Index: doc/html/man/curs_get_wstr.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_get_wstr.3x.html	2024-04-27 18:38:46.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_get_wstr.3x.html	2024-05-25 22:33:42.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_get_wstr.3x,v 1.48 2024/04/20 19:18:18 tom Exp @
++  * @Id: curs_get_wstr.3x,v 1.50 2024/05/25 20:10:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_get_wstr 3x 2024-04-20 ncurses 6.5 Library calls
++curs_get_wstr 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                              curs_get_wstr 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                              
++
                                                                                              curs_get_wstr 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                              
+ 
                                                                                              + curs_get_wstr(3x)                Library calls               curs_get_wstr(3x)
+ 
+@@ -117,7 +117,7 @@
+ 
+        X/Open defines no error conditions.
+ 
+-       In this implementation, these functions return an error
++       In this implementation, these functions return ERR
+ 
+        o   if the window pointer is null,
+ 
+@@ -189,7 +189,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                 curs_get_wstr(3x)
++ncurses 6.5                       2024-05-25                 curs_get_wstr(3x)
+ 
                                                                                              
+ 
                                                                                              
+ 
                                                                                                
+Index: doc/html/man/curs_getch.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_getch.3x.html	2024-05-18 20:27:54.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_getch.3x.html	2024-05-25 22:33:42.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_getch.3x,v 1.91 2024/05/18 20:23:57 tom Exp @
++  * @Id: curs_getch.3x,v 1.93 2024/05/25 20:57:17 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_getch 3x 2024-05-18 ncurses 6.5 Library calls
++curs_getch 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                curs_getch 3x 2024-05-18 ncurses 6.5 Library calls
                                                                                                
++
                                                                                                curs_getch 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                
+ 
                                                                                                + curs_getch(3x)                   Library calls                  curs_getch(3x)
+ 
+@@ -357,8 +357,8 @@
+        well-defined.
+ 
+        Historically, the list of key code macros above was influenced  by  the
+-       function-key-rich  keyboard  of  the AT&T 7300 (also known variously as
+-       the "3B1", "Safari  4",  and  "UNIX  PC"),  a  1985  machine.   Today's
++       keyboard  of  the AT&T 7300 (also known variously as the "3B1", "Safari
++       4", and "UNIX PC"), a 1985 machine  rich  in  function  keys.   Today's
+        computer  keyboards  are  based  that of the IBM PC/AT and tend to have
+        fewer.  A curses application can expect such a keyboard to transmit key
+        codes   KEY_UP,   KEY_DOWN,  KEY_LEFT,  KEY_RIGHT,  KEY_HOME,  KEY_END,
+@@ -382,8 +382,8 @@
+        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       X/Open Curses, Issue 4 describes getch, wgetch, mvgetch, mvwgetch,  and
+-       ungetch.  It specifies no error conditions for them.
++       Except as noted in section "EXTENSIONS" above, X/Open Curses,  Issue  4
++       describes these functions.  It specifies no error conditions for them.
+ 
+        wgetch reads only single-byte characters.
+ 
+@@ -411,6 +411,12 @@
+ 
+ 
+ 
                                                                                                SEE ALSO
                                                                                                ++       ECMA-6  "7-bit  coded  Character  Set" <https://ecma-international.org/
++       publications-and-standards/standards/ecma-6/>
++
++       ECMA-48  "Control  Functions  for  Coded  Character   Sets"   <https://
++       ecma-international.org/publications-and-standards/standards/ecma-48/>
++
+        curs_get_wch(3x)  describes comparable functions of the ncurses library
+        in its wide-character configuration (ncursesw).
+ 
+@@ -418,15 +424,9 @@
+        curs_move(3x),  curs_outopts(3x), curs_refresh(3x), curs_variables(3x),
+        resizeterm(3x), ascii(7)
+ 
+-       ECMA-6 "7-bit  coded  Character  Set"  <https://ecma-international.org/
+-       publications-and-standards/standards/ecma-6/>
+-
+-       ECMA-48   "Control   Functions  for  Coded  Character  Sets"  <https://
+-       ecma-international.org/publications-and-standards/standards/ecma-48/>
+-
+ 
+ 
+-ncurses 6.5                       2024-05-18                    curs_getch(3x)
++ncurses 6.5                       2024-05-25                    curs_getch(3x)
+ 
                                                                                                
+ 
                                                                                                
+ 
                                                                                                  
+Index: doc/html/man/curs_getstr.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_getstr.3x.html	2024-05-11 21:39:56.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_getstr.3x.html	2024-05-25 22:33:42.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_getstr.3x,v 1.59 2024/05/11 20:39:53 tom Exp @
++  * @Id: curs_getstr.3x,v 1.61 2024/05/25 20:10:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_getstr 3x 2024-05-11 ncurses 6.5 Library calls
++curs_getstr 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                  curs_getstr 3x 2024-05-11 ncurses 6.5 Library calls
                                                                                                  
++
                                                                                                  curs_getstr 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                  
+ 
                                                                                                  + curs_getstr(3x)                  Library calls                 curs_getstr(3x)
+ 
+@@ -112,7 +112,7 @@
+ 
+        X/Open defines no error conditions.
+ 
+-       In this implementation, these functions return an error
++       In this implementation, these functions return ERR
+ 
+        o   if the window pointer is null,
+ 
+@@ -242,7 +242,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-11                   curs_getstr(3x)
++ncurses 6.5                       2024-05-25                   curs_getstr(3x)
+ 
                                                                                                  
+ 
                                                                                                  
+ 
                                                                                                    
+Index: doc/html/man/curs_in_wchstr.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_in_wchstr.3x.html	2024-04-27 18:38:46.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_in_wchstr.3x.html	2024-05-25 22:33:42.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_in_wchstr.3x,v 1.39 2024/04/20 21:24:19 tom Exp @
++  * @Id: curs_in_wchstr.3x,v 1.41 2024/05/25 20:10:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_in_wchstr 3x 2024-04-20 ncurses 6.5 Library calls
++curs_in_wchstr 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                    curs_in_wchstr 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                    
++
                                                                                                    curs_in_wchstr 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                    
+ 
                                                                                                    + curs_in_wchstr(3x)               Library calls              curs_in_wchstr(3x)
+ 
+@@ -86,7 +86,7 @@
+        return ERR.
+ 
+        X/Open Curses defines no error conditions.  This implementation returns
+-       an error
++       ERR
+ 
+        o   if the win parameter is null or
+ 
+@@ -118,7 +118,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                curs_in_wchstr(3x)
++ncurses 6.5                       2024-05-25                curs_in_wchstr(3x)
+ 
                                                                                                    
+ 
                                                                                                    
+ 
                                                                                                      
+Index: doc/html/man/curs_inch.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_inch.3x.html	2024-05-18 20:27:55.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_inch.3x.html	2024-05-25 22:33:42.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inch.3x,v 1.54 2024/05/18 20:07:52 tom Exp @
++  * @Id: curs_inch.3x,v 1.56 2024/05/25 20:10:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inch 3x 2024-05-18 ncurses 6.5 Library calls
++curs_inch 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                      curs_inch 3x 2024-05-18 ncurses 6.5 Library calls
                                                                                                      
++
                                                                                                      curs_inch 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                      
+ 
                                                                                                      + curs_inch(3x)                    Library calls                   curs_inch(3x)
+ 
+@@ -79,9 +79,9 @@
+ 
                                                                                                      NOTES
                                                                                                      +        inch, mvinch, and mvwinch may be implemented as macros.
+ 
+-       These  functions do not return an error if the window contains cells of
+-       curses complex characters; that is, if  they  contain  characters  with
+-       codes wider than eight bits (or greater than 255 as an unsigned decimal
++       These  functions  do  not  fail  if the window contains cells of curses
++       complex characters; that is, if  they  contain  characters  with  codes
++       wider  than  eight  bits  (or  greater  than 255 as an unsigned decimal
+        integer).  They instead extract only the low-order eight  bits  of  the
+        character code from the cell.
+ 
+@@ -125,7 +125,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-18                     curs_inch(3x)
++ncurses 6.5                       2024-05-25                     curs_inch(3x)
+ 
                                                                                                      
+ 
                                                                                                      
+ 
                                                                                                        
+Index: doc/html/man/curs_inchstr.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_inchstr.3x.html	2024-04-27 18:38:46.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_inchstr.3x.html	2024-05-25 22:33:42.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inchstr.3x,v 1.45 2024/04/20 21:20:07 tom Exp @
++  * @Id: curs_inchstr.3x,v 1.47 2024/05/25 20:10:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inchstr 3x 2024-04-20 ncurses 6.5 Library calls
++curs_inchstr 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                        curs_inchstr 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                        
++
                                                                                                        curs_inchstr 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                        
+ 
                                                                                                        + curs_inchstr(3x)                 Library calls                curs_inchstr(3x)
+ 
+@@ -86,7 +86,7 @@
+        retrieved, exclusive of the trailing 0).
+ 
+        X/Open Curses defines no error conditions.  This implementation returns
+-       an error
++       ERR
+ 
+        o   if the win parameter is null or
+ 
+@@ -120,7 +120,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                  curs_inchstr(3x)
++ncurses 6.5                       2024-05-25                  curs_inchstr(3x)
+ 
                                                                                                        
+ 
                                                                                                        
+ 
                                                                                                          
+Index: doc/html/man/curs_initscr.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_initscr.3x.html	2024-04-27 18:38:46.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_initscr.3x.html	2024-05-25 22:33:42.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_initscr.3x,v 1.69 2024/04/20 21:24:19 tom Exp @
++  * @Id: curs_initscr.3x,v 1.71 2024/05/25 20:10:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_initscr 3x 2024-04-20 ncurses 6.5 Library calls
++curs_initscr 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                          curs_initscr 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                          
++
                                                                                                          curs_initscr 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                          
+ 
                                                                                                          + curs_initscr(3x)                 Library calls                curs_initscr(3x)
+ 
+@@ -157,17 +157,17 @@
+ 
+        X/Open defines no error conditions.  In this implementation
+ 
+-       o   endwin returns an error if
++       o   endwin returns ERR if
+ 
+            o   the terminal was not initialized, or
+ 
+            o   endwin is called more than once without updating the screen, or
+ 
+-           o   reset_shell_mode(3x) returns an error.
++           o   reset_shell_mode(3x) return ERR.
+ 
+-       o   newterm returns an error if it cannot allocate the data  structures
+-           for  the  screen,  or  for the top-level windows within the screen,
+-           i.e., curscr, newscr, or stdscr.
++       o   newterm returns ERR if it cannot allocate the data  structures  for
++           the  screen,  or for the top-level windows within the screen, i.e.,
++           curscr, newscr, or stdscr.
+ 
+        o   set_term returns no error.
+ 
+@@ -299,7 +299,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                  curs_initscr(3x)
++ncurses 6.5                       2024-05-25                  curs_initscr(3x)
+ 
                                                                                                          
+ 
                                                                                                          
+ 
                                                                                                            
+Index: doc/html/man/curs_inopts.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_inopts.3x.html	2024-04-27 18:38:46.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_inopts.3x.html	2024-05-25 22:42:50.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inopts.3x,v 1.66 2024/04/13 22:20:29 tom Exp @
++  * @Id: curs_inopts.3x,v 1.68 2024/05/25 20:41:48 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inopts 3x 2024-04-13 ncurses 6.5 Library calls
++curs_inopts 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                            curs_inopts 3x 2024-04-13 ncurses 6.5 Library calls
                                                                                                            
++
                                                                                                            curs_inopts 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                            
+ 
                                                                                                            + curs_inopts(3x)                  Library calls                 curs_inopts(3x)
+ 
+@@ -63,24 +63,24 @@
+        int echo(void);
+        int noecho(void);
+ 
+-       int intrflush(WINDOW *win, bool bf);
+-       int keypad(WINDOW *win, bool bf);
+-       int meta(WINDOW *win, bool bf);
+-       int nodelay(WINDOW *win, bool bf);
+-       int notimeout(WINDOW *win, bool bf);
++       int intrflush(WINDOW * win /* ignored */, bool bf);
++       int keypad(WINDOW * win, bool bf);
++       int meta(WINDOW * win /* ignored */, bool bf);
++       int nodelay(WINDOW * win, bool bf);
++       int notimeout(WINDOW * win, bool bf);
+ 
+        int nl(void);
+        int nonl(void);
+ 
+-       int raw(void);
+-       int noraw(void);
+-
+        void qiflush(void);
+        void noqiflush(void);
+ 
++       int raw(void);
++       int noraw(void);
++
+        int halfdelay(int tenths);
+        void timeout(int delay);
+-       void wtimeout(WINDOW *win, int delay);
++       void wtimeout(WINDOW * win, int delay);
+ 
+        int typeahead(int fd);
+ 
+@@ -92,158 +92,177 @@
+ 
+ 
+ 
                                                                                                            DESCRIPTION
                                                                                                            +-       ncurses provides several functions that let an application  change  the
+-       way  input  from the terminal is handled.  Some are global, applying to
+-       all windows.  Others apply only to a specific window.   Window-specific
+-       settings  are  not automatically applied to new or derived windows.  An
+-       application must apply these to each window if  the  same  behavior  is
+-       desired.
++       curses offers configurable  parameters  permitting  an  application  to
++       control  the  handling  of  input  from the terminal.  Some are global,
++       applying to all windows; others apply only to a specific  window.   The
++       library  does not automatically apply such parameters to new or derived
++       windows; an application must configure  each  window  for  the  desired
++       behavior.
++
++       Some  descriptions  below  make reference to an input character reading
++       function: this is wgetch(3x) in the non-wide character curses  API  and
++       wget_wch(3x)  in  the  wide  character API.  In addition to the variant
++       forms  of  these  described  in  ncurses(3x),  the   curses   functions
++       wgetstr(3x)   and   wget_wstr(3x)  and  their  own  variants  call  the
++       appropriate input character reading function.
+ 
+ 
+ 
                                                                                                            cbreak, nocbreak
                                                                                                            +-       Normally,  the terminal driver buffers typed characters until a newline
+-       or  carriage  return  is  typed.   The  cbreak  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 nocbreak routine returns the
+-       terminal to normal (cooked) mode.
+-
+-       Initially the terminal may or may not be in cbreak mode, as the mode is
+-       inherited;   therefore,  a  program  should  call  cbreak  or  nocbreak
+-       explicitly.  Most interactive programs  using  curses  set  the  cbreak
+-       mode.   Note  that  cbreak  overrides  raw.   [See curs_getch(3x) for a
+-       discussion of how these routines interact with echo and noecho.]
++       Normally, the terminal driver buffers typed characters, not  delivering
++       them  to  an application until a line feed or carriage return is typed.
++       cbreak configures the terminal in  cbreak  mode,  which  disables  line
++       buffering and erase and kill character processing (the interrupt, quit,
++       suspend,  and  flow  control  characters  are  unaffected)  and   makes
++       characters  typed  by  the  user  immediately available to the program.
++       nocbreak returns the terminal to normal ("cooked") mode.
++
++       The state of the terminal is unknown to a curses  application  when  it
++       starts; therefore, a program should call cbreak or nocbreak explicitly.
++       Most interactive programs using curses set cbreak mode.  Calling cbreak
++       overrides  raw.   The man page for the input character reading function
++       discusses how cbreak and nocbreak interact with echo and noecho.
+ 
+ 
+ 
                                                                                                            echo, noecho
                                                                                                            +-       The echo and noecho routines control whether characters  typed  by  the
+-       user  are  echoed  by  getch(3x)  as  they  are  typed.  Echoing by the
+-       terminal driver is always disabled, but  initially  getch  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
+-       noecho.  [See curs_getch(3x) for a discussion  of  how  these  routines
+-       interact with cbreak and nocbreak.]
++       echo and noecho determine whether characters  typed  by  the  user  are
++       written to the curses window by the input character reading function as
++       they are typed.  curses  always  disables  the  terminal  driver's  own
++       echoing.   By  default, a curses window has its echo flag set.  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 call
++       noecho.   The  man  page  for  the  input  character  reading  function
++       discusses how echo and noecho interact with cbreak and nocbreak.
+ 
+ 
+ 
                                                                                                            halfdelay
                                                                                                            +-       The  halfdelay routine is used for half-delay mode, which is similar to
+-       cbreak mode in that  characters  typed  by  the  user  are  immediately
+-       available to the program.  However, after blocking for tenths tenths of
+-       seconds, ERR is returned if nothing  has  been  typed.   The  value  of
+-       tenths must be a number between 1 and 255.  Use nocbreak to leave half-
+-       delay mode.
++       halfdelay  configures  half-delay mode, which is similar to cbreak mode
++       in that characters typed by the user are immediately available  to  the
++       program.   However,  after  blocking  for  tenths tenths of seconds, an
++       input character reading function returns ERR if no  input  is  pending.
++       The  value  of tenths must be between 1 and 255.  Use nocbreak to leave
++       half-delay mode.
+ 
+ 
+ 
                                                                                                            intrflush
                                                                                                            +-       If the intrflush option is enabled (bf is TRUE), and an  interrupt  key
+-       is  pressed on the keyboard (interrupt, break, quit), all output in the
+-       terminal driver queue is flushed, giving the effect of faster  response
+-       to  the interrupt, but causing curses to have the wrong idea of what is
+-       on the screen.  Disabling the option (bf is FALSE), prevents the flush.
+-       The  default  for  the  option  is  inherited  from the terminal driver
+-       settings.  The win argument is ignored.
++       intrflush calls qiflush (see below) if bf is TRUE, and noqiflush if  bf
++       is FALSE.  It ignores its win argument.
+ 
+ 
+ 
                                                                                                            keypad
                                                                                                            +-       The keypad option enables  the  keypad  of  the  user's  terminal.   If
+-       enabled  (bf  is  TRUE),  the user can press a function key (such as an
+-       arrow key) and wgetch(3x)  returns  a  single  value  representing  the
+-       function  key,  as in KEY_LEFT.  If disabled (bf is FALSE), curses 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 wgetch(3x) is
+-       called.  The default value for keypad is FALSE.
++       keypad  enables  recognition of a terminal's function keys.  If enabled
++       (bf is TRUE), the input character  reading  function  returns  a  value
++       representing  the  function key, such as KEY_LEFT.  (Wide-character API
++       users: wget_wch(3x) returns KEY_CODE_YES to indicate  the  availability
++       of  a  function  key  code  in  its wch parameter.)  If disabled (bf is
++       FALSE), curses does not treat function keys specially and  the  program
++       has to interpret escape sequences itself.  If the terminal's keypad can
++       be turned on (made to transmit) and off (made to work locally),  keypad
++       configures  it  consistently  with  the  bf  parameter.   By default, a
++       window's keypad mode is off.
+ 
+ 
+ 
                                                                                                            meta
                                                                                                            +-       Initially, whether the terminal returns 7  or  8  significant  bits  on
+-       input  depends  on  the  control  mode  of  the  terminal  driver  [see
+-       termios(3)].  To force 8 bits to be returned, invoke  meta(win,  TRUE);
+-       this  is  equivalent,  under  POSIX,  to  setting  the  CS8 flag on the
+-       terminal.  To force 7 bits to be  returned,  invoke  meta(win,  FALSE);
+-       this  is  equivalent,  under  POSIX,  to  setting  the  CS7 flag on the
+-       terminal.  The  window  argument,  win,  is  always  ignored.   If  the
+-       terminfo  capabilities smm (meta_on) and rmm (meta_off) are defined for
+-       the terminal, smm is sent to  the  terminal  when  meta(win,  TRUE)  is
+-       called and rmm is sent when meta(win, FALSE) is called.
++       Initially, whether the terminal returns 7- or 8-bit character codes  on
++       input  depends  on  the  configuration  of  the  terminal  driver;  see
++       termios(3).  To force 8 bits to be returned, call meta(..., TRUE); this
++       is  equivalent,  on  POSIX  systems,  to  setting  the  CS8 flag on the
++       terminal.  To force 7 bits to be returned, call meta(..., FALSE);  this
++       is  equivalent,  on  POSIX  systems,  to  setting  the  CS7 flag on the
++       terminal.  The window argument, win, is always ignored.  If  the  term-
++       info  string  capabilities meta_on (smm) and meta_off (rmm) are defined
++       for the terminal type, enabling meta mode sends smm to the terminal and
++       disabling it sends rmm to the terminal.
+ 
+ 
+ 
                                                                                                            nl, nonl
                                                                                                            +-       The  nl and nonl routines control whether the underlying display device
+-       translates the return key into newline on input.
++       Initially,  whether  the  terminal  reports a carriage return using the
++       character code for a line feed depends  on  the  configuration  of  the
++       terminal driver; see termios(3).  nl configures the terminal to perform
++       this translation.  nonl disables it.
+ 
+ 
+ 
                                                                                                            nodelay
                                                                                                            +-       The nodelay option causes getch to be a non-blocking call.  If no input
+-       is  ready,  getch  returns ERR.  If disabled (bf is FALSE), getch waits
+-       until a key is pressed.
++       nodelay configures the input character  reading  function  to  be  non-
++       blocking  for  window  win.  If no input is ready, the reading function
++       returns ERR.  If disabled (bf is FALSE), the reading function does  not
++       return until it has input.
+ 
+ 
+ 
                                                                                                            notimeout
                                                                                                            +-       When interpreting an escape sequence, wgetch(3x)  sets  a  timer  while
+-       waiting  for  the  next  character.  If notimeout(win, TRUE) is called,
+-       then wgetch does not set a timer.  The purpose of  the  timeout  is  to
+-       distinguish  sequences produced by a function key from those typed by a
+-       user.
++       When  the  input  character reading function reads an ESC character, it
++       sets a timer while waiting  for  the  next  character.   notimeout(win,
++       TRUE)   disables  this  timer.   The  purpose  of  the  timeout  is  to
++       distinguish sequences produced by a function key from those typed by  a
++       user.   To configure the timeout rather than disabling it, see wtimeout
++       below.
++
++
++
                                                                                                            qiflush, noqiflush
                                                                                                            ++       qiflush and noqiflush configure the terminal driver's treatment of  its
++       input and output queues when it handles the interrupt, suspend, or quit
++       characters  in  cbreak  and  "cooked"  modes;  on  POSIX  systems,  see
++       termios(3).  The default behavior is inherited from the terminal driver
++       settings.  Calling qiflush configures the terminal to flush the  queues
++       when  any  of  these  events  occurs,  giving  the impression of faster
++       response to user input, but making the library's model  of  the  screen
++       contents  incorrect.   Calling  noqiflush  prevents  such flushing, but
++       might frustrate impatient users on slow connections if a curses  update
++       of the screen is in progress when the event occurs; see typeahead below
++       for a mitigation of this problem.  You may want to call noqiflush in  a
++       signal  handler  if you want output to continue after the handler exits
++       as though the interrupt had not occurred.
+ 
+ 
+ 
                                                                                                            raw, noraw
                                                                                                            +-       The raw and noraw routines place the terminal into or out of raw  mode.
+-       Raw  mode  is  similar  to  cbreak  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
+-       terminal driver that are not set by curses.
+-
+-
+-
                                                                                                            qiflush, nqiflush
                                                                                                            +-       When the noqiflush routine is used, normal flush of  input  and  output
+-       queues  associated  with the INTR, QUIT and SUSP characters will not be
+-       done [see termios(3)].  When qiflush is  called,  the  queues  will  be
+-       flushed  when  these control characters are read.  You may want to call
+-       noqiflush in a signal handler if you want output to continue as  though
+-       the interrupt had not occurred, after the handler exits.
++       raw configures the terminal to read input in raw mode, which is similar
++       to  cbreak  mode  (see  cbreak above) except that it furthermore passes
++       through the terminal's configured interrupt, quit,  suspend,  and  flow
++       control   characters  uninterpreted  to  the  application,  instead  of
++       generating a signal or  acting  on  I/O  flow.   The  behavior  of  the
++       terminal's   "Break"   key   (if   any)   depends  on  terminal  driver
++       configuration parameters that curses does not handle.  noraw exits  raw
++       mode.
+ 
+ 
+ 
                                                                                                            timeout, wtimeout
                                                                                                            +-       The timeout and wtimeout routines set blocking or non-blocking read for
+-       a given window.  If delay is negative, a blocking read is  used  (i.e.,
+-       waits  indefinitely  for input).  If delay is zero, then a non-blocking
+-       read is used (i.e., read returns ERR if no input is waiting).  If delay
+-       is  positive,  then read blocks for delay milliseconds, and returns ERR
+-       if there is still no input.  Hence, these  routines  provide  the  same
+-       functionality  as nodelay, plus the additional capability of being able
+-       to block for only delay milliseconds (where delay is positive).
++       wtimeout  configures  whether a curses input character reading function
++       called on window win uses blocking or non-blocking reads.  If delay  is
++       negative,  a blocking read is used, waiting indefinitely for input.  If
++       delay is zero, a non-blocking read is used; an input character  reading
++       function  returns ERR if no input is pending.  If delay is positive, an
++       input character reading function blocks  for  delay  milliseconds,  and
++       returns  ERR  if the delay elapses and there is still no input pending.
++       timeout calls wtimeout on stdscr.
+ 
+ 
+ 
                                                                                                            typeahead
                                                                                                            +-       curses does  "line-breakout  optimization"  by  looking  for  typeahead
+-       periodically  while  updating the screen.  If input is found, and it is
+-       coming  from  a  terminal,  the  current  update  is  postponed   until
+-       refresh(3x)  or  doupdate is called again.  This allows faster response
+-       to commands typed in advance.  Normally, the input FILE pointer  passed
+-       to newterm, or stdin in the case that initscr was used, will be used to
+-       do this typeahead checking.  The typeahead routine specifies  that  the
+-       file descriptor fd is to be used to check for typeahead instead.  If fd
+-       is -1, then no typeahead checking is done.
++       Normally, a curses library checks the terminal for input while updating
++       the  screen.   If  any is found, the update is postponed until the next
++       wrefresh(3x) or doupdate(3x) call, allowing faster response to user key
++       strokes.   The  library  tests the file descriptor corresponding to the
++       FILE stream pointer passed to newterm(3x) (or stdin if initscr(3x)  was
++       called),  for  pending  input.  typeahead instructs curses to test file
++       descriptor fd instead.  An fd of -1 disables the check.
+ 
+ 
+ 
                                                                                                            RETURN VALUE
                                                                                                            +-       All routines that return an integer return  ERR  upon  failure  and  OK
+-       (SVr4 specifies only "an integer value other than ERR") upon successful
+-       completion,  unless  otherwise   noted   in   the   preceding   routine
+-       descriptions.
+-
+-       X/Open   Curses  does  not  specify  any  error  conditions.   In  this
+-       implementation, functions with a window parameter will return an  error
+-       if  it is null.  Any function will also return an error if the terminal
+-       was not initialized.  Also,
++       timeout and wtimeout return no value.
++
++       cbreak, nocbreak, echo, noecho,  halfdelay,  intrflush,  keypad,  meta,
++       nodelay,  notimeout,  nl,  nonl, raw, noraw, and typeahead return OK on
++       success and ERR on failure.
+ 
+-          halfdelay
+-               returns an error if its parameter is outside the range 1..255.
++       In ncurses, the functions in the previous paragraph return ERR if
++
++       o   the terminal is not initialized or
++
++       o   win is NULL (except  for  intrflush  and  meta,  which  ignore  its
++           value).
++
++       Further, halfdelay returns ERR if delay is outside the range 1..255.
++
++       See  section  "EXTENSIONS"  below  for  the return values of is_cbreak,
++       is_echo, is_nl, and is_raw.
+ 
+ 
+ 
                                                                                                            NOTES
                                                                                                            +@@ -251,15 +270,15 @@
+        noqiflush, qiflush, timeout, and wtimeout may be implemented as macros.
+ 
+        noraw  and  nocbreak follow historical practice in that they attempt to
+-       restore normal ("cooked") mode from raw and cbreak modes  respectively.
+-       Mixing  raw/noraw  and  cbreak/nocbreak  calls leads to terminal driver
+-       control states that are hard to predict or understand; doing so is  not
+-       recommended.
++       restore normal ("cooked") mode from raw and cbreak modes, respectively.
++       Mixing  raw/noraw  calls  with  cbreak/nocbreak calls leads to terminal
++       driver control states that are hard to predict or understand; doing  so
++       is not recommended.
+ 
+ 
+ 
                                                                                                            EXTENSIONS
                                                                                                            +-       ncurses provides four "is_" functions that may be used to detect if the
+-       corresponding flags were set or reset.
++       ncurses  provides  four  "is_" functions corresponding to cbreak, echo,
++       nl, and raw, permitting their states to be queried by the application.
+ 
+                             Query       Set      Reset
+                             ------------------------------
+@@ -270,86 +289,99 @@
+ 
+        In each case, the function returns
+ 
+-       1   if the flag is set,
++       1    if the flag is set,
+ 
+-       0   if the flag is reset, or
++       0    if the flag is reset, or
+ 
+-       -1  if the library is not initialized.
+-
+-       They were designed for ncurses(3x), and are not found in  SVr4  curses,
+-       4.4BSD curses, or any other previous curses implementation.
++       -1   if the library is not initialized.
+ 
+ 
+ 
                                                                                                            PORTABILITY
                                                                                                            +        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       Except as noted in section "EXTENSIONS" above, X/Open Curses, Issue  4,
+-       Version 2 describes these functions.
++       Except  as  noted in section "EXTENSIONS" above, X/Open Curses, Issue 4
++       describes these functions.  It specifies no error conditions for them.
++
++       SVr4 curses describes a successful return value  only  as  "an  integer
++       value other than ERR".
+ 
+-       ncurses  follows  X/Open  Curses  and  the  historical practice of 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  raw
+-       call turned it off as a side effect.  For best portability, set echo or
+-       noecho explicitly just  after  initialization,  even  if  your  program
+-       remains in cooked mode.
+-
+-       X/Open  Curses  is  ambiguous  regarding whether raw should disable the
+-       CR/LF translations controlled by nl and nonl.  BSD curses did turn  off
+-       these  translations;  AT&T  curses  (at least as late as SVr1) did not.
+-       ncurses does so, on the assumption that  a  programmer  requesting  raw
+-       input  wants  a  clean  (ideally,  8-bit  clean)  connection  that  the
++       ncurses  follows  X/Open Curses and the historical practice of System V
++       curses, clearing the terminal driver's "echo"  flag  when  initializing
++       the  screen.  BSD curses did not, but its raw function turned it off as
++       a side effect.  For best portability, call echo  or  noecho  explicitly
++       just  after  initialization,  even  if  your  program remains in normal
++       ("cooked") mode.
++
++       X/Open Curses is ambiguous regarding whether  raw  should  disable  the
++       carriage  return and line feed translation feature controlled by nl and
++       nonl.  BSD curses did turn off these translations; System V curses  did
++       not.   ncurses  does so, on the assumption that a programmer requesting
++       raw input wants a clean (ideally,  8-bit  clean)  connection  that  the
+        operating system will not alter.
+ 
+        When keypad is first enabled, ncurses loads the key definitions for the
+-       current  terminal  description.   If  the terminal description includes
+-       extended string capabilities, e.g., from using the -x  option  of  tic,
+-       then  ncurses  also defines keys for the capabilities whose names begin
+-       with "k".  The corresponding keycodes are generated and  (depending  on
+-       previous  loads of terminal descriptions) may differ from one execution
+-       of a program to the next.  The generated keycodes are recognized by the
+-       keyname(3x)  function (which will then return a name beginning with "k"
+-       denoting the terminfo capability name rather than "K", used for  curses
+-       key  names).   On the other hand, an application can use define_key(3x)
+-       to establish a specific keycode for a  given  string.   This  makes  it
+-       possible  for  an  application  to  check  for an extended capability's
+-       presence with tigetstr, and reassign  the  keycode  to  match  its  own
+-       needs.
+-
+-       Low-level applications can use tigetstr to obtain the definition of any
+-       particular string capability.  Higher-level applications which use  the
+-       curses  wgetch  and  similar functions to return keycodes rely upon the
+-       order in which the strings are loaded.  If more than one key definition
+-       has  the  same  string  value, then wgetch can return only one keycode.
+-       Most curses implementations (including ncurses) load key definitions in
+-       the  order  defined  by the array of string capability names.  The last
+-       key to be loaded determines the keycode which  will  be  returned.   In
+-       ncurses,  you  may  also  have extended capabilities interpreted as key
+-       definitions.  These are loaded after the  predefined  keys,  and  if  a
+-       capability's  value  is the same as a previously-loaded key definition,
+-       the later definition is the one used.
++       current terminal description.  If  the  terminal  description  includes
++       extended  string  capabilities,  for example, by using the -x option of
++       tic(1), then ncurses also defines keys for the capabilities whose names
++       begin  with  "k".  Corresponding key codes are generated and (depending
++       on previous  loads  of  terminal  descriptions)  may  differ  from  one
++       execution  of  a  program  to  the  next.   The  generated keycodes are
++       recognized by the keyname(3x)  function  (which  then  returns  a  name
++       beginning  with  "k"  denoting the terminfo capability name rather than
++       "K", used for curses key names).  On the other hand, an application can
++       use  define_key(3x)  to  bind  a  specific  key  to  a  string  of  the
++       programmer's choice.  This feature enables an application to check  for
++       an  extended  capability's presence with tigetstr(3x), and reassign the
++       keycode to match its own needs.
++
++       Low-level applications can use tigetstr(3x) to obtain the definition of
++       any  string  capability.   curses  applications use the input character
++       reading function to obtain key codes from input and rely upon the order
++       in  which  the string capabilities are loaded.  Multiple key capability
++       strings can have the  same  value,  but  the  input  character  reading
++       function  can  report  only  one key code.  Most curses implementations
++       (including ncurses) load key definitions in the order  they  appear  in
++       the strfnames array of string capability names; see term_variables(3x).
++       The last capability read using a particular definition  determines  the
++       key  code  to  be  reported.   In ncurses, extended capabilities can be
++       interpreted as key definitions.  These are loaded after the  predefined
++       keys,  and  if  a capability's value is the same as a previously loaded
++       key definition, the later definition is the one used.
+ 
+ 
+ 
                                                                                                            HISTORY
                                                                                                            +-       Formerly, ncurses used  nl  and  nonl  to  control  the  conversion  of
+-       newlines  to  carriage  return/line  feed  on  output as well as input.
+-       X/Open Curses documents the use of  these  functions  only  for  input.
+-       This  difference arose from converting the pcurses source (1986), which
+-       used ioctl(2) calls and the sgttyb structure,  to  termios  (the  POSIX
+-       terminal  API).   In  the former, both input and output were controlled
+-       via a single option CRMOD, while the latter separates  these  features.
+-       Because  that  conversion  interferes with output optimization, ncurses
+-       6.2 (2020) amended nl and nonl to eliminate their effect on output.
++       4BSD curses (1980) introduced echo, noecho, nl, nonl, raw, and noraw.
++
++       SVr2 (1984) featured a new terminal driver, extending the curses API to
++       support it with cbreak, nocbreak, intrflush, keypad, meta, nodelay, and
++       typeahead.
++
++       SVr3 (1987) added halfdelay,  notimeout,  and  wtimeout.   qiflush  and
++       noqiflush  appeared in SVr3.1 (1987), at which point intrflush became a
++       wrapper for either of these functions, depending on the  value  of  its
++       Boolean argument.  SVr3.1 also added timeout.
++
++       ncurses 6.5 (2024) introduced is_cbreak, is_echo, is_nl, and is_raw.
++
++       Formerly,  ncurses  used  nl  and  nonl  to  control  the conversion of
++       newlines to carriage return/line feed  on  output  as  well  as  input.
++       X/Open  Curses  documents  the  use  of these functions only for input.
++       This difference arose from converting the pcurses source (1986),  which
++       used  ioctl(2)  calls  and  the sgttyb structure, to termios (the POSIX
++       terminal API).  In the former, both input and  output  were  controlled
++       via a single option "CRMOD", while the latter separates these features.
++       Because that conversion interferes with  output  optimization,  ncurses
++       6.2 (2020) amended nl and nonl to eliminate their effect on output.
+ 
+ 
+ 
                                                                                                            SEE ALSO
                                                                                                            +-       curses(3x),    curs_getch(3x),     curs_initscr(3x),     curs_util(3x),
+-       define_key(3x), termios(3)
++       curses(3x),     curs_getch(3x),     curs_initscr(3x),    curs_util(3x),
++       define_key(3x), term_variables(3x), termios(3)
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-13                   curs_inopts(3x)
++ncurses 6.5                       2024-05-25                   curs_inopts(3x)
+ 
                                                                                                            
+ 
                                                                                                            
+ 
+Index: doc/html/man/curs_ins_wch.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_ins_wch.3x.html	2024-04-27 18:38:46.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_ins_wch.3x.html	2024-05-25 22:33:42.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_ins_wch.3x,v 1.30 2024/04/20 19:18:18 tom Exp @
++  * @Id: curs_ins_wch.3x,v 1.32 2024/05/25 20:16:27 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_ins_wch 3x 2024-04-20 ncurses 6.5 Library calls
++curs_ins_wch 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                            curs_ins_wch 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                            
++
                                                                                                            curs_ins_wch 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                            
+ 
                                                                                                            + curs_ins_wch(3x)                 Library calls                curs_ins_wch(3x)
+ 
+@@ -78,11 +78,11 @@
+ 
+ 
+ 
                                                                                                            NOTES
                                                                                                            ++       ins_wch, mvins_wch, and mvwins_wch may be implemented as macros.
++
+        A  terminal's  insert_character  (ich1)  capability  is not necessarily
+        employed.
+ 
+-       ins_wch, mvins_wch, and mvwins_wch may be implemented as macros.
+-
+ 
+ 
                                                                                                            PORTABILITY
                                                                                                            +        X/Open Curses, Issue 4 describes these functions.
+@@ -104,7 +104,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                  curs_ins_wch(3x)
++ncurses 6.5                       2024-05-25                  curs_ins_wch(3x)
+ 
                                                                                                            
+ 
                                                                                                            
+ 
                                                                                                              
+Index: doc/html/man/curs_ins_wstr.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_ins_wstr.3x.html	2024-04-27 18:38:46.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_ins_wstr.3x.html	2024-05-25 22:33:42.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_ins_wstr.3x,v 1.38 2024/04/20 21:23:08 tom Exp @
++  * @Id: curs_ins_wstr.3x,v 1.40 2024/05/25 20:10:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_ins_wstr 3x 2024-04-20 ncurses 6.5 Library calls
++curs_ins_wstr 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                              curs_ins_wstr 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                              
++
                                                                                                              curs_ins_wstr 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                              
+ 
                                                                                                              + curs_ins_wstr(3x)                Library calls               curs_ins_wstr(3x)
+ 
+@@ -87,13 +87,13 @@
+        All functions return the integer ERR upon failure and OK on success.
+ 
+        X/Open  Curses  does  not   specify   any   error   conditions.    This
+-       implementation returns an error
++       implementation returns ERR
+ 
+        o   if the win parameter is null or
+ 
+        o   if the wstr parameter is null or
+ 
+-       o   if the wins_wch function returns an error.
++       o   if the wins_wch function returns ERR.
+ 
+        Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+@@ -124,7 +124,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                 curs_ins_wstr(3x)
++ncurses 6.5                       2024-05-25                 curs_ins_wstr(3x)
+ 
                                                                                                              
+ 
                                                                                                              
+ 
                                                                                                                
+Index: doc/html/man/curs_insstr.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_insstr.3x.html	2024-04-27 18:38:46.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_insstr.3x.html	2024-05-25 22:33:42.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_insstr.3x,v 1.51 2024/04/20 21:20:07 tom Exp @
++  * @Id: curs_insstr.3x,v 1.53 2024/05/25 20:10:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_insstr 3x 2024-04-20 ncurses 6.5 Library calls
++curs_insstr 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                curs_insstr 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                                
++
                                                                                                                curs_insstr 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                
+ 
                                                                                                                + curs_insstr(3x)                  Library calls                 curs_insstr(3x)
+ 
+@@ -85,13 +85,13 @@
+        All functions return the integer ERR upon failure and OK on success.
+ 
+        X/Open   Curses   does   not   specify   any  error  conditions.   This
+-       implementation returns an error
++       implementation returns ERR
+ 
+        o   if the win parameter is null or
+ 
+        o   if the str parameter is null or
+ 
+-       o   the winsch(3x) function returns an error.
++       o   the winsch(3x) function returns ERR.
+ 
+        Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+@@ -121,7 +121,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                   curs_insstr(3x)
++ncurses 6.5                       2024-05-25                   curs_insstr(3x)
+ 
                                                                                                                
+ 
                                                                                                                
+ 
                                                                                                                  
+Index: doc/html/man/curs_instr.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_instr.3x.html	2024-04-27 18:38:46.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_instr.3x.html	2024-05-25 22:33:42.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_instr.3x,v 1.51 2024/04/20 21:24:19 tom Exp @
++  * @Id: curs_instr.3x,v 1.53 2024/05/25 20:10:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_instr 3x 2024-04-20 ncurses 6.5 Library calls
++curs_instr 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                  curs_instr 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                                  
++
                                                                                                                  curs_instr 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                  
+ 
                                                                                                                  + curs_instr(3x)                   Library calls                  curs_instr(3x)
+ 
+@@ -81,7 +81,7 @@
+        characters actually read into the string.
+ 
+        X/Open Curses defines no error conditions.  This implementation returns
+-       an error
++       ERR
+ 
+        o   if the win parameter is null or
+ 
+@@ -116,7 +116,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                    curs_instr(3x)
++ncurses 6.5                       2024-05-25                    curs_instr(3x)
+ 
                                                                                                                  
+ 
                                                                                                                  
+ 
                                                                                                                    
+Index: doc/html/man/curs_inwstr.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_inwstr.3x.html	2024-04-27 18:38:46.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_inwstr.3x.html	2024-05-25 22:33:42.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inwstr.3x,v 1.41 2024/04/20 21:20:07 tom Exp @
++  * @Id: curs_inwstr.3x,v 1.43 2024/05/25 20:10:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inwstr 3x 2024-04-20 ncurses 6.5 Library calls
++curs_inwstr 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                    curs_inwstr 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                                    
++
                                                                                                                    curs_inwstr 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                    
+ 
                                                                                                                    + curs_inwstr(3x)                  Library calls                 curs_inwstr(3x)
+ 
+@@ -83,8 +83,7 @@
+        *inwstr routines return OK, and the *innwstr routines return the number
+        of characters read into the string.
+ 
+-       X/Open  defines  no  error  conditions.  This implementation returns an
+-       error
++       X/Open defines no error conditions.  This implementation returns ERR
+ 
+        o   if the win parameter is null or
+ 
+@@ -92,21 +91,21 @@
+ 
+        o   if no characters could be read.
+ 
+-       Functions prefixed with "mv" first perform cursor movement and fail  if
++       Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                    NOTES
                                                                                                                    +        All routines except winnwstr may be macros.
+ 
+-       Each  cell in the window holds a complex character (a spacing character
+-       and zero or more non-spacing characters) together with  attributes  and
+-       color.   These  functions  store  only  the  wide  characters, ignoring
+-       attributes and color.  Use in_wchstr to return the  complex  characters
++       Each cell in the window holds a complex character (a spacing  character
++       and  zero  or more non-spacing characters) together with attributes and
++       color.  These  functions  store  only  the  wide  characters,  ignoring
++       attributes  and  color.  Use in_wchstr to return the complex characters
+        from a window.
+ 
+        Reading a line that overflows the array pointed to by wstr with inwstr,
+-       mvinwstr, mvwinwstr or winwstr causes  undefined  results.   Therefore,
++       mvinwstr,  mvwinwstr  or  winwstr causes undefined results.  Therefore,
+        the use of innwstr, mvinnwstr, mvwinnwstr, or winnwstr is recommended.
+ 
+ 
+@@ -115,12 +114,12 @@
+ 
+ 
+ 
                                                                                                                    SEE ALSO
                                                                                                                    +-       curses(3x),     curs_inch(3x),     curs_inchstr(3x),    curs_instr(3x),
++       curses(3x),    curs_inch(3x),     curs_inchstr(3x),     curs_instr(3x),
+        curs_in_wchstr(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                   curs_inwstr(3x)
++ncurses 6.5                       2024-05-25                   curs_inwstr(3x)
+ 
                                                                                                                    
+ 
                                                                                                                    
+ 
                                                                                                                      
+Index: doc/html/man/curs_kernel.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_kernel.3x.html	2024-04-27 18:38:46.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_kernel.3x.html	2024-05-25 22:33:42.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_kernel.3x,v 1.61 2024/04/20 21:24:19 tom Exp @
++  * @Id: curs_kernel.3x,v 1.63 2024/05/25 21:13:56 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_kernel 3x 2024-04-20 ncurses 6.5 Library calls
++curs_kernel 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                      curs_kernel 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                                      
++
                                                                                                                      curs_kernel 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                      
+ 
                                                                                                                      + curs_kernel(3x)                  Library calls                 curs_kernel(3x)
+ 
+@@ -48,8 +48,8 @@
+ 
+ 
                                                                                                                      NAME
                                                                                                                      +        def_prog_mode,   def_shell_mode,   reset_prog_mode,   reset_shell_mode,
+-       resetty, savetty, getsyx, setsyx, ripoffline, curs_set,  napms  -  low-
+-       level curses routines
++       resetty, savetty, getsyx, setsyx, curs_set, mvcur, napms, ripoffline  -
++       low-level curses routines
+ 
+ 
+ 
                                                                                                                      SYNOPSIS
                                                                                                                      +@@ -67,9 +67,10 @@
+        void getsyx(int y, int x);
+        void setsyx(int y, int x);
+ 
+-       int ripoffline(int line, int (*init)(WINDOW *, int));
+        int curs_set(int visibility);
++       int mvcur(int oldrow, int oldcol, int newrow, int newcol);
+        int napms(int ms);
++       int ripoffline(int line, int (*init)(WINDOW *, int));
+ 
+ 
+ 
                                                                                                                      DESCRIPTION
                                                                                                                      +@@ -121,6 +122,34 @@
+        Few applications will use this feature, most use wmove instead.
+ 
+ 
++
                                                                                                                      curs_set
                                                                                                                      ++       The curs_set routine sets the cursor state  to  invisible,  normal,  or
++       very  visible  for visibility equal to 0, 1, or 2 respectively.  If the
++       terminal supports the visibility requested, the previous  cursor  state
++       is returned; otherwise, ERR is returned.
++
++
++
                                                                                                                      mvcur
                                                                                                                      ++       mvcur  provides  low-level cursor motion.  It takes effect immediately,
++       rather than at the next refresh.  Unlike  the  other  low-level  output
++       functions,  which  either  write  to  the standard output stream or are
++       passed a  function  pointer  to  perform  output,  mvcur  uses  a  file
++       descriptor derived from the output stream parameter of newterm(3x).
++
++       One  application  of  mvcur  accompanies  the  temporary use of another
++       program to write to the  terminal  screen.   For  example,  first  call
++       refresh(3x)  to ensure that the screen and the library's model of it is
++       up to date; then call reset_shell_mode; write to the  screen  with  the
++       external  application;  call reset_prog_mode; and finally call mvcur to
++       set the cursor's location to where  curses  thinks  it  is,  since  the
++       library has no knowledge of how the external application moved it.
++
++
++
                                                                                                                      napms
                                                                                                                      ++       napms  sleeps  for  ms  milliseconds.   If  ms  exceeds  30,000 (thirty
++       seconds), it is capped at that value.
++
++
+ 
                                                                                                                      ripoffline
                                                                                                                      +        ripoffline provides access to the same facility that slk_init(3x)  uses
+        to  reduce  the  size  of the screen.  ripoffline must be called before
+@@ -146,18 +175,6 @@
+        newterm.
+ 
+ 
+-
                                                                                                                      curs_set
                                                                                                                      +-       The  curs_set  routine  sets  the cursor state to invisible, normal, or
+-       very visible for visibility equal to 0, 1, or 2 respectively.   If  the
+-       terminal  supports  the visibility requested, the previous cursor state
+-       is returned; otherwise, ERR is returned.
+-
+-
+-
                                                                                                                      napms
                                                                                                                      +-       napms sleeps  for  ms  milliseconds.   If  ms  exceeds  30,000  (thirty
+-       seconds), it is capped at that value.
+-
+-
+ 
                                                                                                                      RETURN VALUE
                                                                                                                      +        Except for curs_set, these routines always return OK.
+ 
+@@ -167,12 +184,12 @@
+        X/Open defines no error conditions.  In this implementation
+ 
+        def_prog_mode, def_shell_mode, reset_prog_mode, reset_shell_mode
+-            return an error if the terminal was not initialized, or if the I/O
+-            call to obtain the terminal settings fails.
++            return ERR if the terminal was not initialized, or if the I/O call
++            to obtain the terminal settings fails.
+ 
+        ripoffline
+-            returns an error if the maximum number of ripped-off lines exceeds
+-            the maximum (5).
++            returns  ERR if the maximum number of ripped-off lines exceeds the
++            maximum (5).
+ 
+ 
+ 
                                                                                                                      NOTES
                                                                                                                      +@@ -189,6 +206,14 @@
+        cursor state to restore that.
+ 
+ 
++
                                                                                                                      EXTENSIONS
                                                                                                                      ++       In ncurses, mvcur accepts -1 for either or both old coordinates.   This
++       value  tells ncurses that the old location is unknown, and that it must
++       use only absolute motion, as with the cursor_address (cup)  capability,
++       rather  than  the  least  costly  combination  of absolute and relative
++       motion.
++
++
+ 
                                                                                                                      PORTABILITY
                                                                                                                      +        The virtual screen functions setsyx and getsyx  are  not  described  in
+        X/Open Curses, Issue 4.  All other functions are as described in X/Open
+@@ -198,6 +223,18 @@
+        type  int.   This  is misleading, as they are macros with no documented
+        semantics for the return value.
+ 
++       X/Open Curses notes:
++
++              "After use of mvcur(), the model Curses maintains of  the  state
++              of  the  terminal  might  not  match  the  actual  state  of the
++              terminal.  An application should touch and  refresh  the  window
++              before resuming conventional use of Curses."
++
++       Both  ncurses  and  SVr4  curses  implement mvcur using the SCREEN data
++       allocated in either initscr(3x) or newterm(3x).  X/Open  Curses  states
++       that  the old location must be given for mvcur to accommodate terminals
++       that lack absolute cursor positioning.
++
+        If interrupted, ncurses restarts napms.  That, and the limitation to 30
+        seconds, are different from other implementations.
+ 
+@@ -208,7 +245,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                   curs_kernel(3x)
++ncurses 6.5                       2024-05-25                   curs_kernel(3x)
+ 
                                                                                                                      
+ 
                                                                                                                      
+ 
+ 
+ 
                                                                                                                    • RETURN VALUE
                                                                                                                      • 
+ 
                                                                                                                    • NOTES
                                                                                                                      • 
++
                                                                                                                    • EXTENSIONS
                                                                                                                      • 
+ 
                                                                                                                    • PORTABILITY
                                                                                                                      • 
+ 
                                                                                                                    • SEE ALSO
                                                                                                                      • 
+ 
                                                                                                                    
+Index: doc/html/man/curs_legacy.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_legacy.3x.html	2024-04-27 18:38:46.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_legacy.3x.html	2024-05-25 22:33:42.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_legacy.3x,v 1.32 2024/03/16 15:35:01 tom Exp @
++  * @Id: curs_legacy.3x,v 1.34 2024/05/25 20:15:31 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_legacy 3x 2024-03-16 ncurses 6.5 Library calls
++curs_legacy 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                    curs_legacy 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                    
++
                                                                                                                    curs_legacy 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                    
+ 
                                                                                                                    + curs_legacy(3x)                  Library calls                 curs_legacy(3x)
+ 
+@@ -101,23 +101,12 @@
+        window parameter is null.
+ 
+ 
+-
                                                                                                                    NOTES
                                                                                                                    +-       All of these interfaces are implemented as macros and  functions.   The
+-       macros  are suppressed (and only the functions provided) in an "opaque"
+-       ncurses build, which defines the  preprocessor  symbol  NCURSES_OPAQUE.
+-       See section "ALTERNATE CONFIGURATIONS" in ncurses(3x).
+-
+-       The standard forms such as getyx must be implemented as macros, and (in
+-       this implementation) are defined in terms of  the  functions  described
+-       here, to avoid reliance on internal details of the WINDOW structure.
+-
+-
+ 
                                                                                                                    PORTABILITY
                                                                                                                    +-       These   functions  were  supported  on  Version  7,  BSD  or  System  V
+-       implementations.  None of  those  implementations  checked  the  window
++       These  functions  were  supported  on  Version  7,  BSD  or  System   V
++       implementations.   None  of  those  implementations  checked the window
+        parameter.
+ 
+-       The  getattrs  function  and  macro  are  defined  to return a (signed)
++       The getattrs function and  macro  are  defined  to  return  a  (signed)
+        integer  for  compatibility  with  those  implementations  although  an
+        unsigned type would have been more appropriate.
+ 
+@@ -127,7 +116,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                   curs_legacy(3x)
++ncurses 6.5                       2024-05-25                   curs_legacy(3x)
+ 
                                                                                                                    
+ 
                                                                                                                    
+ 
+Index: doc/html/man/curs_mouse.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_mouse.3x.html	2024-05-18 20:27:55.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_mouse.3x.html	2024-05-25 22:33:42.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_mouse.3x,v 1.101 2024/05/18 20:03:51 tom Exp @
++  * @Id: curs_mouse.3x,v 1.103 2024/05/25 20:10:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_mouse 3x 2024-05-18 ncurses 6.5 Library calls
++curs_mouse 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                    curs_mouse 3x 2024-05-18 ncurses 6.5 Library calls
                                                                                                                    
++
                                                                                                                    curs_mouse 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                    
+ 
                                                                                                                    + curs_mouse(3x)                   Library calls                  curs_mouse(3x)
+ 
+@@ -259,7 +259,7 @@
+ 
+        o   or if no more events remain in the queue.
+ 
+-       ungetmouse returns an error if the event queue is full.
++       ungetmouse returns ERR if the event queue is full.
+ 
+        mousemask returns the mask of reportable events.
+ 
+@@ -394,7 +394,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-18                    curs_mouse(3x)
++ncurses 6.5                       2024-05-25                    curs_mouse(3x)
+ 
                                                                                                                    
+ 
                                                                                                                    
+ 
                                                                                                                      
+Index: doc/html/man/curs_outopts.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_outopts.3x.html	2024-05-11 21:39:57.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_outopts.3x.html	2024-05-25 22:33:42.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_outopts.3x,v 1.65 2024/05/11 20:39:53 tom Exp @
++  * @Id: curs_outopts.3x,v 1.67 2024/05/25 20:10:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_outopts 3x 2024-05-11 ncurses 6.5 Library calls
++curs_outopts 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                      curs_outopts 3x 2024-05-11 ncurses 6.5 Library calls
                                                                                                                      
++
                                                                                                                      curs_outopts 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                      
+ 
                                                                                                                      + curs_outopts(3x)                 Library calls                curs_outopts(3x)
+ 
+@@ -152,10 +152,10 @@
+ 
+        In this implementation,
+ 
+-       o   those functions that have a window pointer will return an error  if
+-           the window pointer is null
++       o   those functions that have a window pointer will return ERR  if  the
++           window pointer is null
+ 
+-       o   wsetscrreg  returns  an error if the scrolling region limits extend
++       o   wsetscrreg  returns  ERR  if  the  scrolling  region  limits extend
+            outside the window boundaries.
+ 
+ 
+@@ -196,7 +196,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-11                  curs_outopts(3x)
++ncurses 6.5                       2024-05-25                  curs_outopts(3x)
+ 
                                                                                                                      
+ 
                                                                                                                      
+ 
                                                                                                                        
+Index: doc/html/man/curs_overlay.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_overlay.3x.html	2024-04-27 18:38:47.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_overlay.3x.html	2024-05-25 22:33:42.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_overlay.3x,v 1.43 2024/04/20 21:20:07 tom Exp @
++  * @Id: curs_overlay.3x,v 1.45 2024/05/25 20:10:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_overlay 3x 2024-04-20 ncurses 6.5 Library calls
++curs_overlay 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                        curs_overlay 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                                        
++
                                                                                                                        curs_overlay 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                        
+ 
                                                                                                                        + curs_overlay(3x)                 Library calls                curs_overlay(3x)
+ 
+@@ -86,8 +86,8 @@
+        completion.
+ 
+        X/Open  defines  no error conditions.  In this implementation, copywin,
+-       overlay and overwrite return an error if either of the window  pointers
+-       are null, or if some part of the window would be placed off-screen.
++       overlay and overwrite return ERR if either of the window  pointers  are
++       null, or if some part of the window would be placed off-screen.
+ 
+ 
+ 
                                                                                                                        NOTES
                                                                                                                        +@@ -106,7 +106,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                  curs_overlay(3x)
++ncurses 6.5                       2024-05-25                  curs_overlay(3x)
+ 
                                                                                                                        
+ 
                                                                                                                        
+ 
                                                                                                                          
+Index: doc/html/man/curs_pad.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_pad.3x.html	2024-04-27 18:38:47.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_pad.3x.html	2024-05-25 22:33:42.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_pad.3x,v 1.61 2024/04/27 17:55:43 tom Exp @
++  * @Id: curs_pad.3x,v 1.63 2024/05/25 20:10:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_pad 3x 2024-04-27 ncurses 6.5 Library calls
++curs_pad 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                          curs_pad 3x 2024-04-27 ncurses 6.5 Library calls
                                                                                                                          
++
                                                                                                                          curs_pad 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                          
+ 
                                                                                                                          + curs_pad(3x)                     Library calls                    curs_pad(3x)
+ 
+@@ -140,18 +140,17 @@
+        implementation
+ 
+           prefresh and pnoutrefresh
+-               return an error if the window pointer is null, or if the window
+-               is not really a pad or if the  area  to  refresh  extends  off-
+-               screen  or  if  the  minimum  coordinates  are greater than the
+-               maximum.
++               return  ERR  if the window pointer is null, or if the window is
++               not really a pad or if the area to refresh  extends  off-screen
++               or if the minimum coordinates are greater than the maximum.
+ 
+           pechochar
+-               returns an error if the window is not really  a  pad,  and  the
+-               associated call to wechochar returns an error.
++               returns  ERR  if  the  window  is  not  really  a  pad, and the
++               associated call to wechochar returns ERR.
+ 
+           pecho_wchar
+-               returns  an  error  if  the window is not really a pad, and the
+-               associated call to wecho_wchar returns an error.
++               returns ERR if  the  window  is  not  really  a  pad,  and  the
++               associated call to wecho_wchar returns ERR.
+ 
+ 
+ 
                                                                                                                          NOTES
                                                                                                                          +@@ -161,67 +160,67 @@
+ 
                                                                                                                          PORTABILITY
                                                                                                                          +        BSD curses has no pad feature.
+ 
+-       SVr2  curses  (1986)  provided  the  newpad  and   related   functions,
+-       documenting  them  in  a  single  line each.  SVr3 (1987) provided more
++       SVr2   curses   (1986)  provided  the  newpad  and  related  functions,
++       documenting them in a single line  each.   SVr3  (1987)  provided  more
+        extensive documentation.
+ 
+-       The documentation does not explain the term pad.  However,  the  Apollo
++       The  documentation  does not explain the term pad.  However, the Apollo
+        Aegis workstation operating system supported a graphical pad feature:
+ 
+-       o   These  graphical  pads  could  be  much  larger than the computer's
++       o   These graphical pads could  be  much  larger  than  the  computer's
+            display.
+ 
+-       o   The read-only output from a  command  could  be  scrolled  back  to
++       o   The  read-only  output  from  a  command  could be scrolled back to
+            inspect, and select text from the pad.
+ 
+        The two uses may be related.
+ 
+-       X/Open  Curses,  Issue 4 describes these functions, without significant
+-       change from the SVr3 documentation.  It describes no error  conditions.
++       X/Open Curses, Issue 4 describes these functions,  without  significant
++       change  from the SVr3 documentation.  It describes no error conditions.
+        The  behavior  of  subpad  if  the  parent  window  is  not  a  pad  is
+        undocumented, and is not checked by the vendor Unix implementations:
+ 
+-       o   SVr4 curses sets a flag in the WINDOW  structure  in  newpad  which
++       o   SVr4  curses  sets  a  flag in the WINDOW structure in newpad which
+            tells if the window is a pad.
+ 
+-           However,  it  uses this information only in waddch (to decide if it
+-           should call wrefresh) and wscrl (to avoid  scrolling  a  pad),  and
+-           does  not  check  in  wrefresh  to ensure that the pad is refreshed
++           However, it uses this information only in waddch (to decide  if  it
++           should  call  wrefresh)  and  wscrl (to avoid scrolling a pad), and
++           does not check in wrefresh to ensure  that  the  pad  is  refreshed
+            properly.
+ 
+-       o   Solaris xcurses checks whether a window is a pad  in  wnoutrefresh,
++       o   Solaris  xcurses  checks whether a window is a pad in wnoutrefresh,
+            returning ERR in that case.
+ 
+-           However,  it only sets the flag for subwindows if the parent window
+-           is a pad.  Its newpad  function  does  not  set  this  information.
++           However, it only sets the flag for subwindows if the parent  window
++           is  a  pad.   Its  newpad  function  does not set this information.
+            Consequently, the check will never fail.
+ 
+-           It  makes no comparable check in pnoutrefresh, though interestingly
+-           enough, a comment in the source code states  that  the  lack  of  a
++           It makes no comparable check in pnoutrefresh, though  interestingly
++           enough,  a  comment  in  the  source code states that the lack of a
+            check was an MKS extension.
+ 
+-       o   NetBSD  7 curses sets a flag in the WINDOW structure for newpad and
+-           subpad,  using  this  to  help   with   the   distinction   between
++       o   NetBSD 7 curses sets a flag in the WINDOW structure for newpad  and
++           subpad,   using   this   to   help  with  the  distinction  between
+            wnoutrefresh and pnoutrefresh.
+ 
+-           It  does  not  check for the case where a subwindow is created in a
++           It does not check for the case where a subwindow is  created  in  a
+            pad using subwin or derwin.
+ 
+-           The dupwin function returns a regular  window  when  duplicating  a
+-           pad.   Likewise,  getwin always returns a window, even if the saved
++           The  dupwin  function  returns  a regular window when duplicating a
++           pad.  Likewise, getwin always returns a window, even if  the  saved
+            data was from a pad.
+ 
+        This implementation
+ 
+        o   sets a flag in the WINDOW structure for newpad and subpad,
+ 
+-       o   allows a subwin or derwin call to succeed having a  pad  parent  by
++       o   allows  a  subwin  or derwin call to succeed having a pad parent by
+            forcing the subwindow to be a pad,
+ 
+-       o   checks  in  both  wnoutrefresh and pnoutrefresh to ensure that pads
++       o   checks in both wnoutrefresh and pnoutrefresh to  ensure  that  pads
+            and windows are handled distinctly, and
+ 
+-       o   ensures  that  dupwin  and  getwin  treat   pads   versus   windows
++       o   ensures   that   dupwin   and  getwin  treat  pads  versus  windows
+            consistently.
+ 
+ 
+@@ -230,7 +229,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-27                      curs_pad(3x)
++ncurses 6.5                       2024-05-25                      curs_pad(3x)
+ 
                                                                                                                          
+ 
                                                                                                                          
+ 
                                                                                                                            
+Index: doc/html/man/curs_refresh.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_refresh.3x.html	2024-04-27 18:38:47.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_refresh.3x.html	2024-05-25 22:33:42.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_refresh.3x,v 1.46 2024/04/20 21:20:07 tom Exp @
++  * @Id: curs_refresh.3x,v 1.48 2024/05/25 20:10:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_refresh 3x 2024-04-20 ncurses 6.5 Library calls
++curs_refresh 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                            curs_refresh 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                                            
++
                                                                                                                            curs_refresh 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                            
+ 
                                                                                                                            + curs_refresh(3x)                 Library calls                curs_refresh(3x)
+ 
+@@ -131,12 +131,11 @@
+        implementation
+ 
+           wnoutrefresh
+-               returns an error if the window  pointer  is  null,  or  if  the
+-               window is really a pad.
++               returns ERR if the window pointer is null, or if the window  is
++               really a pad.
+ 
+           wredrawln
+-               returns  an  error if the associated call to touchln returns an
+-               error.
++               return ERR if the associated call to touchln returns ERR.
+ 
+ 
+ 
                                                                                                                            NOTES
                                                                                                                            +@@ -146,12 +145,12 @@
+ 
                                                                                                                            PORTABILITY
                                                                                                                            +        X/Open Curses, Issue 4 describes these functions.
+ 
+-       Whether wnoutrefresh copies to the virtual screen the  entire  contents
++       Whether  wnoutrefresh  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
++       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 touchwin
+-       before  the  wnoutrefresh  call  to  guarantee  an entire-contents copy
++       before the wnoutrefresh  call  to  guarantee  an  entire-contents  copy
+        anywhere.
+ 
+ 
+@@ -160,7 +159,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                  curs_refresh(3x)
++ncurses 6.5                       2024-05-25                  curs_refresh(3x)
+ 
                                                                                                                            
+ 
                                                                                                                            
+ 
                                                                                                                              
+Index: doc/html/man/curs_scroll.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_scroll.3x.html	2024-04-27 18:38:47.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_scroll.3x.html	2024-05-25 22:33:42.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_scroll.3x,v 1.43 2024/04/20 18:54:36 tom Exp @
++  * @Id: curs_scroll.3x,v 1.45 2024/05/25 20:16:27 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_scroll 3x 2024-04-20 ncurses 6.5 Library calls
++curs_scroll 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                              curs_scroll 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                                              
++
                                                                                                                              curs_scroll 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                              
+ 
                                                                                                                              + curs_scroll(3x)                  Library calls                 curs_scroll(3x)
+ 
+@@ -53,10 +53,10 @@
+ 
                                                                                                                              SYNOPSIS
                                                                                                                              +        #include <curses.h>
+ 
+-       int scroll(WINDOW *win);
++       int scroll(WINDOW * win);
+ 
+        int scrl(int n);
+-       int wscrl(WINDOW *win, int n);
++       int wscrl(WINDOW * win, int n);
+ 
+ 
+ 
                                                                                                                              DESCRIPTION
                                                                                                                              +@@ -86,11 +86,11 @@
+ 
+ 
+ 
                                                                                                                              NOTES
                                                                                                                              ++       scrl and wscrl may be implemented as macros.
++
+        Unusually,  there  is  no wscroll function; scroll behaves as one would
+        expect wscroll to, accepting a WINDOW pointer argument.
+ 
+-       scrl and scroll may be implemented as macros.
+-
+ 
+ 
                                                                                                                              PORTABILITY
                                                                                                                              +        X/Open Curses, Issue 4 describes these functions.  It defines no  error
+@@ -115,7 +115,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                   curs_scroll(3x)
++ncurses 6.5                       2024-05-25                   curs_scroll(3x)
+ 
                                                                                                                              
+ 
                                                                                                                              
+ 
                                                                                                                                
+Index: doc/html/man/curs_slk.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_slk.3x.html	2024-04-27 18:38:47.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_slk.3x.html	2024-05-25 22:33:42.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_slk.3x,v 1.71 2024/04/20 18:54:36 tom Exp @
++  * @Id: curs_slk.3x,v 1.73 2024/05/25 20:10:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_slk 3x 2024-04-20 ncurses 6.5 Library calls
++curs_slk 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                curs_slk 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                                                
++
                                                                                                                                curs_slk 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                                
+ 
                                                                                                                                + curs_slk(3x)                     Library calls                    curs_slk(3x)
+ 
+@@ -176,50 +176,49 @@
+ 
+           slk_attroff,  slk_attron,  slk_clear,  slk_noutrefresh, slk_refresh,
+           slk_touch
+-               return an error if  the  terminal  or  the  softkeys  were  not
++               return  ERR  if  the  terminal  or  the   softkeys   were   not
+                initialized.
+ 
+           slk_attrset
+-               returns  an  error  if  the  terminal  or the softkeys were not
++               returns   ERR   if  the  terminal  or  the  softkeys  were  not
+                initialized.
+ 
+           slk_attr_set
+-               returns an error if the  terminal  or  the  softkeys  were  not
++               returns  ERR  if  the  terminal  or  the  softkeys   were   not
+                initialized,   or   the   color   pair  is  outside  the  range
+                0..COLOR_PAIRS-1.
+ 
+           slk_color
+-               returns an error if the  terminal  or  the  softkeys  were  not
++               returns  ERR  if  the  terminal  or  the  softkeys   were   not
+                initialized,   or   the   color   pair  is  outside  the  range
+                0..COLOR_PAIRS-1.
+ 
+           slk_init
+-               returns an error if the format parameter is outside  the  range
+-               0..3.
++               returns ERR if the format parameter is outside the range 0..3.
+ 
+           slk_label
+                returns NULL on error.
+ 
+           slk_set
+-               returns  an  error  if  the  terminal  or the softkeys were not
+-               initialized, or the labnum parameter is outside  the  range  of
+-               label  counts,  or if the format parameter is outside the range
++               returns  ERR  if  the  terminal  or  the  softkeys   were   not
++               initialized,  or  the  labnum parameter is outside the range of
++               label counts, or if the format parameter is outside  the  range
+                0..2, or if memory for the labels cannot be allocated.
+ 
+ 
+ 
                                                                                                                                NOTES
                                                                                                                                +-       Most applications would  use  slk_noutrefresh  because  a  wrefresh  is
++       Most  applications  would  use  slk_noutrefresh  because  a wrefresh is
+        likely to follow soon.
+ 
+ 
+ 
                                                                                                                                EXTENSIONS
                                                                                                                                +-       X/Open  Curses  documents the opts argument as reserved for future use,
+-       saying that it must be null.  This implementation uses  that  parameter
++       X/Open Curses documents the opts argument as reserved for  future  use,
++       saying  that  it must be null.  This implementation uses that parameter
+        in ABI 6 for the functions which have a color pair parameter to support
+        extended color pairs.
+ 
+-       For functions which modify the color, e.g., slk_attr_set,  if  opts  is
+-       set  it  is treated as a pointer to int, and used to set the color pair
++       For  functions  which  modify the color, e.g., slk_attr_set, if opts is
++       set it is treated as a pointer to int, and used to set the  color  pair
+        instead of the short pair parameter.
+ 
+ 
+@@ -227,12 +226,12 @@
+        X/Open Curses, Issue 4 describes these functions, with some differences
+        from SVr4 curses:
+ 
+-       o   X/Open   added   functions  like  the  SVr4  attribute-manipulation
+-           functions slk_attron, slk_attroff, and slk_attrset, but  which  use
+-           attr_t  parameters (rather than chtype), along with a reserved opts
++       o   X/Open  added  functions  like  the   SVr4   attribute-manipulation
++           functions  slk_attron,  slk_attroff, and slk_attrset, but which use
++           attr_t parameters (rather than chtype), along with a reserved  opts
+            parameter.
+ 
+-           Two of these new functions (unlike  the  SVr4  functions)  have  no
++           Two  of  these  new  functions  (unlike the SVr4 functions) have no
+            provision for color: slk_attr_on and slk_attr_off.
+ 
+            The third function (slk_attr_set) has a color pair parameter.
+@@ -241,7 +240,7 @@
+ 
+        o   It added slk_color.
+ 
+-       Although  slk_start  is  declared in the curses header file, it was not
++       Although slk_start is declared in the curses header file,  it  was  not
+        documented by SVr4 other than its presence in a list of libtermlib.so.1
+        symbols.  Reading the source code (i.e., Illumos):
+ 
+@@ -253,32 +252,32 @@
+ 
+        o   Soft-key groups are an array of ng integers.
+ 
+-       o   In  SVr4, slk_init calls slk_start passing a null for gp.  For this
+-           case, slk_start uses the number of  groups  ng  (3  for  the  3-2-3
++       o   In SVr4, slk_init calls slk_start passing a null for gp.  For  this
++           case,  slk_start  uses  the  number  of  groups ng (3 for the 3-2-3
+            layout, 2 for the 4-4 layout) which slk_init provided.
+ 
+-           If  ng  is  neither  2  or  3,  slk_start  checks  the terminfo fln
+-           (label_format) capability, interpreting that as  a  comma-separated
++           If ng is  neither  2  or  3,  slk_start  checks  the  terminfo  fln
++           (label_format)  capability,  interpreting that as a comma-separated
+            list of numbers, e.g., "3,2,3" for the 3-2-3 layout.
+ 
+            Finally, if there is no fln capability, slk_start returns ERR.
+ 
+-       o   If  slk_start  is given a non-null gp, it copies the ng elements of
++       o   If slk_start is given a non-null gp, it copies the ng  elements  of
+            the group of soft-keys, up to 16.
+ 
+-           If there are more than 16 elements, slk_start returns an error.
++           If there are more than 16 elements, slk_start returns ERR.
+ 
+-       o   The format codes 2 and 3 for slk_init  were  added  by  ncurses  in
++       o   The  format  codes  2  and  3 for slk_init were added by ncurses in
+            1996.  PDCurses 2.4 added this feature in 2001.
+ 
+        The function slk_attr was added by ncurses in 1996.
+ 
+-       X/Open  Curses  does  not  specify a limit for the number of colors and
++       X/Open Curses does not specify a limit for the  number  of  colors  and
+        color pairs which a terminal can support.  However, in its use of short
+-       for  the  parameters,  it carries over SVr4's implementation detail for
++       for the parameters, it carries over SVr4's  implementation  detail  for
+        the compiled terminfo database, which uses signed 16-bit numbers.  This
+-       implementation  provides extended versions of those functions which use
+-       int parameters, allowing applications to use larger  color-  and  pair-
++       implementation provides extended versions of those functions which  use
++       int  parameters,  allowing  applications to use larger color- and pair-
+        numbers.
+ 
+ 
+@@ -313,7 +312,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                      curs_slk(3x)
++ncurses 6.5                       2024-05-25                      curs_slk(3x)
+ 
                                                                                                                                
+ 
                                                                                                                                
+ 
                                                                                                                                  
+Index: doc/html/man/curs_terminfo.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_terminfo.3x.html	2024-04-27 18:38:47.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_terminfo.3x.html	2024-05-25 22:33:43.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_terminfo.3x,v 1.136 2024/04/14 00:14:40 tom Exp @
++  * @Id: curs_terminfo.3x,v 1.138 2024/05/25 21:02:40 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_terminfo 3x 2024-04-13 ncurses 6.5 Library calls
++curs_terminfo 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                  curs_terminfo 3x 2024-04-13 ncurses 6.5 Library calls
                                                                                                                                  
++
                                                                                                                                  curs_terminfo 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                                  
+ 
                                                                                                                                  + curs_terminfo(3x)                Library calls               curs_terminfo(3x)
+ 
+@@ -48,10 +48,9 @@
+ 
+ 
+ 
                                                                                                                                  NAME
                                                                                                                                  +-       del_curterm,   mvcur,   putp,   restartterm,   set_curterm,  setupterm,
+-       tigetflag,  tigetnum,  tigetstr,  tiparm,  tiparm_s,  tiscan_s,  tparm,
+-       tputs,  vid_attr,  vid_puts,  vidattr,  vidputs  - curses interfaces to
+-       terminfo database
++       del_curterm,  putp,  restartterm,  set_curterm,  setupterm,  tigetflag,
++       tigetnum, tigetstr, tiparm, tiparm_s, tiscan_s, tparm, tputs, vid_attr,
++       vid_puts, vidattr, vidputs - curses interfaces to terminfo database
+ 
+ 
+ 
                                                                                                                                  SYNOPSIS
                                                                                                                                  +@@ -87,8 +86,6 @@
+        int vid_puts(attr_t attrs, short pair, void *opts, int (*putc)(int));
+        int vid_attr(attr_t attrs, short pair, void *opts);
+ 
+-       int mvcur(int oldrow, int oldcol, int newrow, int newcol);
+-
+        int tigetflag(const char *cap-code);
+        int tigetnum(const char *cap-code);
+        char *tigetstr(const char *cap-code);
+@@ -105,45 +102,45 @@
+ 
+ 
                                                                                                                                  DESCRIPTION
                                                                                                                                  +        These low-level functions must be called by programs that deal directly
+-       with  the  terminfo  database  to handle certain terminal capabilities,
++       with the terminfo database to  handle  certain  terminal  capabilities,
+        such as programming function keys.  For all other functionality, curses
+        functions are more suitable and their use is recommended.
+ 
+-       None  of  these  functions  use  (or  are aware of) multibyte character
++       None of these functions use  (or  are  aware  of)  multibyte  character
+        strings such as UTF-8.
+ 
+        o   Capability names and codes use the POSIX portable character set.
+ 
+-       o   Capability string values have  no  associated  encoding;  they  are
++       o   Capability  string  values  have  no  associated encoding; they are
+            strings of 8-bit characters.
+ 
+ 
+ 
                                                                                                                                  Initialization
                                                                                                                                  +        Initially, setupterm should be called.  The high-level curses functions
+-       initscr and newterm call setupterm to initialize the low-level  set  of
++       initscr  and  newterm call setupterm to initialize the low-level set of
+        terminal-dependent variables listed in term_variables(3x).
+ 
+-       Applications  can  use  the  terminal capabilities either directly (via
++       Applications can use the terminal  capabilities  either  directly  (via
+        header  definitions),  or  by  special  functions.   The  header  files
+-       curses.h  and  term.h  should  be  included  (in that order) to get the
++       curses.h and term.h should be included  (in  that  order)  to  get  the
+        definitions for these strings, numbers, and flags.
+ 
+-       The terminfo variables lines and columns are initialized  by  setupterm
++       The  terminfo  variables lines and columns are initialized by setupterm
+        as follows.
+ 
+-       o   If  use_env(FALSE)  has  been  called, values for lines and columns
++       o   If use_env(FALSE) has been called, values  for  lines  and  columns
+            specified in terminfo are used.
+ 
+-       o   Otherwise, if the environment variables LINES  and  COLUMNS  exist,
++       o   Otherwise,  if  the  environment variables LINES and COLUMNS 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
++           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 lines and columns specified in the terminfo database are
+            used.
+ 
+-       Parameterized  strings  should  be  passed through tparm to instantiate
+-       them.  All terminfo strings (including the output of tparm)  should  be
+-       sent  to the terminal device with tputs or putp.  Call reset_shell_mode
++       Parameterized strings should be passed  through  tparm  to  instantiate
++       them.   All  terminfo strings (including the output of tparm) should be
++       sent to the terminal device with tputs or putp.  Call  reset_shell_mode
+        to restore the terminal modes before exiting; see curs_kernel(3x).
+ 
+        Programs that use cursor addressing should
+@@ -154,54 +151,54 @@
+ 
+        Programs that execute shell subprocesses should
+ 
+-       o   call reset_shell_mode and output exit_ca_mode before the  shell  is
++       o   call  reset_shell_mode  and output exit_ca_mode before the shell is
+            called and
+ 
+-       o   output  enter_ca_mode and call reset_prog_mode after returning from
++       o   output enter_ca_mode and call reset_prog_mode after returning  from
+            the shell.
+ 
+-       setupterm reads in the terminfo  database,  initializing  the  terminfo
+-       structures,  but  does  not set up the output virtualization structures
++       setupterm  reads  in  the  terminfo database, initializing the terminfo
++       structures, but does not set up the  output  virtualization  structures
+        used by curses.  Its parameters follow.
+ 
+           term is the terminal type, a character string.  If term is null, the
+                environment variable TERM is read.
+ 
+           filedes
+-               is  the  file  descriptor used for getting and setting terminal
++               is the file descriptor used for getting  and  setting  terminal
+                I/O modes.
+ 
+-               Higher-level applications use  newterm(3x)  to  initialize  the
+-               terminal,  passing  an  output stream rather than a descriptor.
+-               In  curses,  the  two  are  the  same  because  newterm   calls
+-               setupterm,  passing the file descriptor derived from its output
++               Higher-level  applications  use  newterm(3x)  to initialize the
++               terminal, passing an output stream rather  than  a  descriptor.
++               In   curses,  the  two  are  the  same  because  newterm  calls
++               setupterm, passing the file descriptor derived from its  output
+                stream parameter.
+ 
+           errret
+-               points to an optional location where an  error  status  can  be
+-               returned  to the caller.  If errret is not null, then setupterm
+-               returns OK or ERR and stores a  status  value  in  the  integer
+-               pointed  to  by  errret.   A  return  value of OK combined with
++               points  to  an  optional  location where an error status can be
++               returned to the caller.  If errret is not null, then  setupterm
++               returns  OK  or  ERR  and  stores a status value in the integer
++               pointed to by errret.  A  return  value  of  OK  combined  with
+                status of 1 in errret is normal.
+ 
+                If ERR is returned, examine errret:
+ 
+-               1    means that the terminal is hardcopy, and  cannot  be  used
++               1    means  that  the  terminal is hardcopy, and cannot be used
+                     for curses applications.
+ 
+-                    setupterm  determines  if  the entry is a hardcopy type by
++                    setupterm determines if the entry is a  hardcopy  type  by
+                     checking the hardcopy (hc) capability.
+ 
+-               0    means that the terminal could not be found, or that it  is
+-                    a  generic  type, having too little information for curses
++               0    means  that the terminal could not be found, or that it is
++                    a generic type, having too little information  for  curses
+                     applications to run.
+ 
+-                    setupterm determines if the entry is  a  generic  type  by
++                    setupterm  determines  if  the  entry is a generic type by
+                     checking the generic_type (gn) capability.
+ 
+                -1   means that the terminfo database could not be found.
+ 
+-               If  errret  is  null,  setupterm  reports an error message upon
++               If errret is null, setupterm  reports  an  error  message  upon
+                finding an error and exits.  Thus, the simplest call is:
+ 
+                       setupterm((char *)0, 1, (int *)0);
+@@ -210,88 +207,85 @@
+ 
+ 
+ 
                                                                                                                                  The Terminal State
                                                                                                                                  +-       setupterm stores its information  about  the  terminal  in  a  TERMINAL
++       setupterm  stores  its  information  about  the  terminal in a TERMINAL
+        structure pointed to by the global variable cur_term.  If it detects an
+        error,  or  decides  that  the  terminal  is  unsuitable  (hardcopy  or
+-       generic),  it  discards  this  information,  making it not available to
++       generic), it discards this information,  making  it  not  available  to
+        applications.
+ 
+-       If setupterm is called repeatedly for the same terminal type,  it  will
++       If  setupterm  is called repeatedly for the same terminal type, it will
+        reuse  the  information.   It  maintains  only  one  copy  of  a  given
+-       terminal's capabilities in memory.   If  it  is  called  for  different
+-       terminal  types,  setupterm  allocates  new  storage  for  each  set of
++       terminal's  capabilities  in  memory.   If  it  is called for different
++       terminal types,  setupterm  allocates  new  storage  for  each  set  of
+        terminal capabilities.
+ 
+-       set_curterm sets cur_term to nterm,  and  makes  all  of  the  terminfo
+-       Boolean,  numeric,  and string variables use the values from nterm.  It
++       set_curterm  sets  cur_term  to  nterm,  and  makes all of the terminfo
++       Boolean, numeric, and string variables use the values from  nterm.   It
+        returns the old value of cur_term.
+ 
+-       del_curterm frees the space pointed to by oterm and makes it  available
+-       for  further  use.  If oterm is the same as cur_term, references to any
+-       of the terminfo Boolean, numeric, and string variables  thereafter  may
+-       refer  to  invalid  memory  locations  until another setupterm has been
++       del_curterm  frees the space pointed to by oterm and makes it available
++       for further use.  If oterm is the same as cur_term, references  to  any
++       of  the  terminfo Boolean, numeric, and string variables thereafter may
++       refer to invalid memory locations  until  another  setupterm  has  been
+        called.
+ 
+-       restartterm is similar to setupterm and  initscr,  except  that  it  is
+-       called  after  restoring  memory to a previous state (for example, when
++       restartterm  is  similar  to  setupterm  and initscr, except that it is
++       called after restoring memory to a previous state  (for  example,  when
+        reloading a game saved as a core image dump).  restartterm assumes that
+-       the  windows  and  the  input  and  output options are the same as when
++       the windows and the input and output  options  are  the  same  as  when
+        memory was saved, but the terminal type and baud rate may be different.
+-       Accordingly,  restartterm  saves  various  terminal  state  bits, calls
++       Accordingly, restartterm  saves  various  terminal  state  bits,  calls
+        setupterm, and then restores the bits.
+ 
+ 
+ 
                                                                                                                                  Formatting Output
                                                                                                                                  +-       tparm instantiates the string str with parameters  pi.   A  pointer  is
++       tparm  instantiates  the  string  str with parameters pi.  A pointer is
+        returned to the result of str with the parameters applied.  Application
+        developers should keep in mind these quirks of the interface:
+ 
+-       o   Although tparm's actual parameters may be integers or strings,  the
++       o   Although  tparm's actual parameters may be integers or strings, the
+            prototype expects long (integer) values.
+ 
+-       o   Aside  from  the  set_attributes  (sgr)  capability,  most terminal
++       o   Aside from  the  set_attributes  (sgr)  capability,  most  terminal
+            capabilities require no more than one or two parameters.
+ 
+-       o   Padding information is ignored  by  tparm;  it  is  interpreted  by
++       o   Padding  information  is  ignored  by  tparm;  it is interpreted by
+            tputs.
+ 
+-       o   The  capability  string  is  null-terminated.   Use "\200" where an
++       o   The capability string is  null-terminated.   Use  "\200"  where  an
+            ASCII NUL is needed in the output.
+ 
+-       tiparm is a newer form of tparm  which  uses  stdarg.h  rather  than  a
+-       fixed-parameter  list.   Its  numeric  parameters  are ints rather than
++       tiparm  is  a  newer  form  of  tparm which uses stdarg.h rather than a
++       fixed-parameter list.  Its numeric  parameters  are  ints  rather  than
+        longs.
+ 
+-       Both tparm and tiparm assume that  the  application  passes  parameters
+-       consistent  with the terminal description.  Two extensions are provided
++       Both  tparm  and  tiparm  assume that the application passes parameters
++       consistent with the terminal description.  Two extensions are  provided
+        as alternatives to deal with untrusted data.
+ 
+-       o   tiparm_s is an extension which is a safer formatting function  than
++       o   tiparm_s  is an extension which is a safer formatting function than
+            tparm or tiparm, because it allows the developer to tell the curses
+-           library how many parameters to expect in the  parameter  list,  and
++           library  how  many  parameters to expect in the parameter list, and
+            which may be string parameters.
+ 
+-           The  mask  parameter has one bit set for each of the parameters (up
++           The mask parameter has one bit set for each of the  parameters  (up
+            to 9) passed as char pointers rather than numbers.
+ 
+-       o   The  extension  tiscan_s  allows  the  application  to  inspect   a
++       o   The   extension  tiscan_s  allows  the  application  to  inspect  a
+            formatting capability to see what the curses library would assume.
+ 
+ 
+ 
                                                                                                                                  Output Functions
                                                                                                                                  +-       String  capabilities  can  contain  padding  information,  a time delay
++       String capabilities can  contain  padding  information,  a  time  delay
+        (accommodating performance limitations of hardware terminals) expressed
+        as $<n>, where n is a nonnegative integral count of milliseconds.  If n
+        exceeds 30,000 (thirty seconds), it is capped at that value.
+ 
+-       tputs interprets time-delay information in the string str  and  outputs
++       tputs  interprets  time-delay information in the string str and outputs
+        it, executing the delays:
+ 
+-       o   The  str parameter must be a terminfo string variable or the return
+-           value of tparm, tiparm, tgetstr, or tgoto.
+-
+-           The tgetstr and tgoto functions are part of the termcap  interface,
+-           which happens to share these function names with the terminfo API.
++       o   The str parameter must be a terminfo string variable or the  return
++           value of tparm or tiparm.
+ 
+        o   affcnt is the number of lines affected, or 1 if not applicable.
+ 
+@@ -326,15 +320,9 @@
+        applications  must  provide  a  null pointer for that argument; but see
+        section "EXTENSIONS" below.
+ 
+-       mvcur provides low-level cursor motion.  It  takes  effect  immediately
+-       (rather  than  at the next refresh).  Unlike the other low-level output
+-       functions, which either write to the standard output or pass an  output
+-       function  parameter,  mvcur uses an output file descriptor derived from
+-       the output stream parameter of newterm(3x).
+-
+-       While putp and mvcur are low-level functions that do not use high-level
+-       curses  state,  ncurses  declares them in curses.h because System V did
+-       this (see section "HISTORY" below).
++       While putp is a low-level function that does not use high-level  curses
++       state,  ncurses  declares it in curses.h because System V did this (see
++       section "HISTORY" below).
+ 
+ 
+ 
                                                                                                                                  Terminal Capability Functions
                                                                                                                                  +@@ -415,7 +403,7 @@
+        putp calls tputs, returning the same error codes.
+ 
+        restartterm
+-            fails if the associated call to setupterm returns an error.
++            fails if the associated call to setupterm returns ERR.
+ 
+        setupterm
+             fails if it cannot allocate enough memory, or create  the  initial
+@@ -548,9 +536,9 @@
+            keys).
+ 
+            The ncurses library checks usage of these capabilities, and returns
+-           an error if the capability mishandles string  parameters.   But  it
+-           cannot  check  if  a  calling program provides strings in the right
+-           places for the tparm calls.
++           ERR if the capability mishandles string parameters.  But it  cannot
++           check if a calling program provides strings in the right places for
++           the tparm calls.
+ 
+            The tput(1) program checks its use of  these  capabilities  with  a
+            table, so that it calls tparm correctly.
+@@ -582,24 +570,9 @@
+        other than OK or ERR from tputs.  It instead returns the length of  the
+        string, and does no error checking.
+ 
+-       X/Open  Curses notes that after calling mvcur, 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
+-       ncurses and SVr4 curses implement mvcur using the SCREEN data allocated
+-       in either initscr or newterm.  So though it is documented as a terminfo
+-       function, mvcur is really a curses function that is not well specified.
+-
+-       X/Open Curses states that the old location must be given for  mvcur  to
+-       accommodate  terminals  that lack absolute cursor positioning.  ncurses
+-       allows the caller to use -1 for either or both old coordinates.  The -1
+-       tells  ncurses  that  the old location is unknown, and that it must use
+-       only absolute motion, as  with  the  cursor_address  (cup)  capability,
+-       rather  than  the  least  costly  combination  of absolute and relative
+-       motion.
+-
+ 
+ 
                                                                                                                                  HISTORY
                                                                                                                                  +-       SVr2 (1984) introduced the terminfo feature.   Its  programming  manual
++       SVr2  (1984)  introduced  the terminfo feature.  Its programming manual
+        mentioned the following low-level functions.
+ 
+        Function    Description
+@@ -609,7 +582,6 @@
+        mvcur       low level cursor motion
+        putp        use tputs to send characters via putchar
+        resetterm   set terminal modes to "out of curses" state
+-
+        resetty     reset terminal flags to stored value
+        saveterm    save current modes as "in curses" state
+        savetty     store current terminal flags
+@@ -620,7 +592,7 @@
+        vidattr     like vidputs, but output through putchar
+        vidputs     write string to terminal, applying specified attributes
+ 
+-       The  programming  manual  also mentioned functions provided for termcap
++       The programming manual also mentioned functions  provided  for  termcap
+        compatibility (commenting that they "may go away at a later date").
+ 
+        Function   Description
+@@ -632,11 +604,11 @@
+        tgoto      apply parameters to given capability
+        tputs      write characters via a function parameter, applying padding
+ 
+-       Early terminfo programs obtained capability values  from  the  TERMINAL
++       Early  terminfo  programs  obtained capability values from the TERMINAL
+        structure initialized by setupterm.
+ 
+-       SVr3   (1987)   extended  terminfo  by  adding  functions  to  retrieve
+-       capability values (like the termcap interface), and reusing  tgoto  and
++       SVr3  (1987)  extended  terminfo  by  adding  functions   to   retrieve
++       capability  values  (like the termcap interface), and reusing tgoto and
+        tputs.
+ 
+        Function    Description
+@@ -645,7 +617,7 @@
+        tigetnum    get numeric entry for given id
+        tigetstr    get string entry for given id
+ 
+-       SVr3  also  replaced several of the SVr2 terminfo functions that had no
++       SVr3 also replaced several of the SVr2 terminfo functions that  had  no
+        counterpart in the termcap interface, documenting them as obsolete.
+ 
+        Function    Replaced by
+@@ -658,37 +630,37 @@
+        saveterm    def_prog_mode
+        setterm     setupterm
+ 
+-       SVr3 kept the mvcur, vidattr, and vidputs functions, along  with  putp,
+-       tparm,  and  tputs.   The latter were needed to support padding, and to
+-       handle capabilities accessed by functions such as vidattr  (which  used
++       SVr3  kept  the mvcur, vidattr, and vidputs functions, along with putp,
++       tparm, and tputs.  The latter were needed to support  padding,  and  to
++       handle  capabilities  accessed by functions such as vidattr (which used
+        more than the two parameters supported by tgoto).
+ 
+-       SVr3   introduced   the   functions   for  switching  between  terminal
+-       descriptions;  for  example,  set_curterm.   Some   changes   reflected
++       SVr3  introduced  the  functions   for   switching   between   terminal
++       descriptions;   for   example,  set_curterm.   Some  changes  reflected
+        incremental improvements to the SVr2 library.
+ 
+-       o   The  TERMINAL  type  definition  was introduced in SVr3.01, for the
++       o   The TERMINAL type definition was introduced  in  SVr3.01,  for  the
+            term structure provided in SVr2.
+ 
+-       o   Various global variables such as boolnames were  mentioned  in  the
+-           programming  manual  at  this  point, though the variables had been
++       o   Various  global  variables  such as boolnames were mentioned in the
++           programming manual at this point, though  the  variables  had  been
+            provided in SVr2.
+ 
+        SVr4 (1989) added the vid_attr and vid_puts functions.
+ 
+-       Other low-level functions are declared in the curses  header  files  of
+-       Unix  systems,  but  none are documented.  Those noted as "obsolete" by
++       Other  low-level  functions  are declared in the curses header files of
++       Unix systems, but none are documented.  Those noted  as  "obsolete"  by
+        SVr3 remained in use by System V's vi(1) editor.
+ 
+ 
+ 
                                                                                                                                  SEE ALSO
                                                                                                                                  +        curses(3x),   curs_initscr(3x),   curs_kernel(3x),   curs_memleaks(3x),
+-       curs_termcap(3x),   curs_variables(3x),   putc(3),  term_variables(3x),
++       curs_termcap(3x),  curs_variables(3x),   putc(3),   term_variables(3x),
+        terminfo(5)
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-13                 curs_terminfo(3x)
++ncurses 6.5                       2024-05-25                 curs_terminfo(3x)
+ 
                                                                                                                                  
+ 
                                                                                                                                  
+ 
                                                                                                                                    
+Index: doc/html/man/curs_touch.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_touch.3x.html	2024-04-27 18:38:47.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_touch.3x.html	2024-05-25 22:33:43.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_touch.3x,v 1.47 2024/04/20 21:20:07 tom Exp @
++  * @Id: curs_touch.3x,v 1.49 2024/05/25 20:10:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_touch 3x 2024-04-20 ncurses 6.5 Library calls
++curs_touch 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                    curs_touch 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                                                    
++
                                                                                                                                    curs_touch 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                                    
+ 
                                                                                                                                    + curs_touch(3x)                   Library calls                  curs_touch(3x)
+ 
+@@ -97,7 +97,7 @@
+        implementation
+ 
+           is_linetouched
+-               returns an error if the window pointer is null, or if the  line
++               returns ERR if the window pointer  is  null,  or  if  the  line
+                number is outside the window boundaries.
+ 
+                The constant ERR is distinct from TRUE and FALSE, which are the
+@@ -110,7 +110,7 @@
+                The actual function returns FALSE when it detects an error.
+ 
+           wtouchln
+-               returns an error if the window pointer is null, or if the  line
++               returns ERR if the window pointer  is  null,  or  if  the  line
+                number is outside the window boundaries.
+ 
+ 
+@@ -134,7 +134,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                    curs_touch(3x)
++ncurses 6.5                       2024-05-25                    curs_touch(3x)
+ 
                                                                                                                                    
+ 
                                                                                                                                    
+ 
                                                                                                                                      
+Index: doc/html/man/curs_util.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_util.3x.html	2024-05-11 21:39:57.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_util.3x.html	2024-05-25 22:33:43.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_util.3x,v 1.102 2024/05/11 20:39:53 tom Exp @
++  * @Id: curs_util.3x,v 1.104 2024/05/25 20:10:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_util 3x 2024-05-11 ncurses 6.5 Library calls
++curs_util 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                      curs_util 3x 2024-05-11 ncurses 6.5 Library calls
                                                                                                                                      
++
                                                                                                                                      curs_util 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                                      
+ 
                                                                                                                                      + curs_util(3x)                    Library calls                   curs_util(3x)
+ 
+@@ -257,93 +257,92 @@
+        implementation
+ 
+           flushinp
+-               returns an error if the terminal was not initialized.
++               returns ERR if the terminal was not initialized.
+ 
+           putwin
+-               returns  an  error  if  the  associated  fwrite calls return an
+-               error.
++               returns ERR if the associated fwrite calls return ERR.
+ 
+ 
+ 
                                                                                                                                      PORTABILITY
                                                                                                                                      + 
+ 
                                                                                                                                      filter
                                                                                                                                      +-       The SVr4 documentation describes the  action  of  filter  only  in  the
+-       vaguest  terms.   The  description  here  is adapted from X/Open Curses
++       The  SVr4  documentation  describes  the  action  of filter only in the
++       vaguest terms.  The description here  is  adapted  from  X/Open  Curses
+        (which erroneously fails to describe the disabling of cuu).
+ 
+ 
+ 
                                                                                                                                      delay_output padding
                                                                                                                                      +-       The limitation to 30 seconds and the use of  napms  differ  from  other
++       The  limitation  to  30  seconds and the use of napms differ from other
+        implementations.
+ 
+        o   SVr4 curses does not delay if no padding character is available.
+ 
+-       o   NetBSD  curses  uses  napms when no padding character is available,
+-           but does not take  timing  into  account  when  using  the  padding
++       o   NetBSD curses uses napms when no padding  character  is  available,
++           but  does  not  take  timing  into  account  when using the padding
+            character.
+ 
+        Neither limits the delay.
+ 
+ 
+ 
                                                                                                                                      keyname
                                                                                                                                      +-       The  keyname  function  may  return  the  names  of user-defined string
+-       capabilities which are defined in the terminfo entry via the -x  option
++       The keyname function  may  return  the  names  of  user-defined  string
++       capabilities  which are defined in the terminfo entry via the -x option
+        of tic.  This implementation automatically assigns at run-time keycodes
+-       to user-defined strings which begin with "k".  The  keycodes  start  at
++       to  user-defined  strings  which begin with "k".  The keycodes start at
+        KEY_MAX, but are not guaranteed to be the same value for different runs
+-       because user-defined codes are merged from  all  terminal  descriptions
+-       which  have  been loaded.  The use_extended_names(3x) function controls
+-       whether this data is loaded when the terminal description  is  read  by
++       because  user-defined  codes  are merged from all terminal descriptions
++       which have been loaded.  The use_extended_names(3x)  function  controls
++       whether  this  data  is loaded when the terminal description is read by
+        the library.
+ 
+ 
+ 
                                                                                                                                      nofilter, use_tioctl
                                                                                                                                      +-       The  nofilter  and  use_tioctl  routines are specific to ncurses.  They
+-       were not supported on Version 7, BSD or System V  implementations.   It
+-       is  recommended  that  any  code  depending  on  ncurses  extensions be
++       The nofilter and use_tioctl routines are  specific  to  ncurses.   They
++       were  not  supported on Version 7, BSD or System V implementations.  It
++       is recommended  that  any  code  depending  on  ncurses  extensions  be
+        conditioned using NCURSES_VERSION.
+ 
+ 
+ 
                                                                                                                                      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
+-           implementation-specific  format.  Although the format is an obvious
++       o   The   files   written   and   read   by   these  functions  use  an
++           implementation-specific format.  Although the format is an  obvious
+            target for standardization, it has been overlooked.
+ 
+-           Interestingly enough, according to the copyright dates  in  Solaris
+-           source,  the  functions (along with scr_init, etc.) originated with
++           Interestingly  enough,  according to the copyright dates in Solaris
++           source, the functions (along with scr_init, etc.)  originated  with
+            the University of California, Berkeley (in 1982) and were later (in
+-           1988)  incorporated  into SVr4.  Oddly, there are no such functions
++           1988) incorporated into SVr4.  Oddly, there are no  such  functions
+            in the 4.3BSD curses sources.
+ 
+        o   Most implementations simply dump the binary WINDOW structure to the
+-           file.   These  include SVr4 curses, NetBSD and PDCurses, as well as
++           file.  These include SVr4 curses, NetBSD and PDCurses, as  well  as
+            older ncurses versions.  This implementation (as well as the X/Open
+            variant of Solaris curses, dated 1995) uses textual dumps.
+ 
+-           The  implementations  which  use  binary  dumps  use block-I/O (the
+-           fwrite and fread functions).  Those  that  use  textual  dumps  use
++           The implementations which  use  binary  dumps  use  block-I/O  (the
++           fwrite  and  fread  functions).   Those  that use textual dumps use
+            buffered-I/O.  A few applications may happen to write extra data in
+-           the file using these functions.  Doing that can run  into  problems
+-           mixing  block-  and  buffered-I/O.  This implementation reduces the
+-           problem on writes by flushing the output.  However, reading from  a
++           the  file  using these functions.  Doing that can run into problems
++           mixing block- and buffered-I/O.  This  implementation  reduces  the
++           problem  on writes by flushing the output.  However, reading from a
+            file written using mixed schemes may not be successful.
+ 
+ 
+ 
                                                                                                                                      unctrl, wunctrl
                                                                                                                                      +-       X/Open  Curses,  Issue  4  describes  these  functions.  It states that
++       X/Open Curses, Issue 4  describes  these  functions.   It  states  that
+        unctrl and wunctrl will return a null pointer if unsuccessful, but does
+-       not  define any error conditions.  This implementation checks for three
++       not define any error conditions.  This implementation checks for  three
+        cases:
+ 
+-       o   the parameter is a 7-bit US-ASCII code.   This  is  the  case  that
++       o   the  parameter  is  a  7-bit  US-ASCII code.  This is the case that
+            X/Open Curses documented.
+ 
+        o   the parameter is in the range 128-159, i.e., a C1 control code.  If
+-           use_legacy_coding(3x) has been called with a  2  parameter,  unctrl
+-           returns  the  parameter,  i.e.,  a  one-character  string  with the
+-           parameter as the first  character.   Otherwise,  it  returns  "~@",
++           use_legacy_coding(3x)  has  been  called with a 2 parameter, unctrl
++           returns the  parameter,  i.e.,  a  one-character  string  with  the
++           parameter  as  the  first  character.   Otherwise, it returns "~@",
+            "~A", etc., analogous to "^@", "^A", C0 controls.
+ 
+            X/Open Curses does not document whether unctrl can be called before
+@@ -354,44 +353,44 @@
+            pointer.
+ 
+        The strings returned by unctrl in this implementation are determined at
+-       compile  time,  showing C1 controls from the upper-128 codes with a "~"
+-       prefix  rather  than  "^".   Other   implementations   have   different
+-       conventions.    For  example,  they  may  show  both  sets  of  control
+-       characters with "^", and strip the parameter to 7 bits.   Or  they  may
+-       ignore  C1  controls and treat all of the upper-128 codes as printable.
+-       This implementation uses 8 bits but  does  not  modify  the  string  to
+-       reflect  locale.   The use_legacy_coding(3x) function allows the caller
++       compile time, showing C1 controls from the upper-128 codes with  a  "~"
++       prefix   rather   than   "^".   Other  implementations  have  different
++       conventions.   For  example,  they  may  show  both  sets  of   control
++       characters  with  "^",  and strip the parameter to 7 bits.  Or they may
++       ignore C1 controls and treat all of the upper-128 codes  as  printable.
++       This  implementation  uses  8  bits  but  does not modify the string to
++       reflect locale.  The use_legacy_coding(3x) function allows  the  caller
+        to change the output of unctrl.
+ 
+-       Likewise, the meta(3x) function allows the caller to change the  output
+-       of  keyname,  i.e.,  it  determines  whether to use the "M-" prefix for
+-       "meta"   keys   (codes   in   the   range   128    to    255).     Both
+-       use_legacy_coding(3x)   and  meta(3x)  succeed  only  after  curses  is
+-       initialized.  X/Open Curses does not document the  treatment  of  codes
++       Likewise,  the meta(3x) function allows the caller to change the output
++       of keyname, i.e., it determines whether to  use  the  "M-"  prefix  for
++       "meta"    keys    (codes    in   the   range   128   to   255).    Both
++       use_legacy_coding(3x)  and  meta(3x)  succeed  only  after  curses   is
++       initialized.   X/Open  Curses  does not document the treatment of codes
+        128 to 159.  When treating them as "meta" keys (or if keyname is called
+-       before  initializing  curses),  this  implementation  returns   strings
++       before   initializing  curses),  this  implementation  returns  strings
+        "M-^@", "M-^A", etc.
+ 
+        X/Open Curses documents unctrl as declared in <unctrl.h>, which ncurses
+-       does.  However, ncurses' <curses.h> includes <unctrl.h>,  matching  the
++       does.   However,  ncurses' <curses.h> includes <unctrl.h>, matching the
+        behavior of SVr4 curses.  Other implementations may not do that.
+ 
+ 
+ 
                                                                                                                                      use_env, use_tioctl
                                                                                                                                      +-       If  ncurses  is  configured  to provide the sp-functions extension, the
+-       state of use_env and use_tioctl may be  updated  before  creating  each
+-       screen  rather  than  once  only  (curs_sp_funcs(3x)).  This feature of
++       If ncurses is configured to provide  the  sp-functions  extension,  the
++       state  of  use_env  and  use_tioctl may be updated before creating each
++       screen rather than once  only  (curs_sp_funcs(3x)).   This  feature  of
+        use_env is not provided by other implementations of curses.
+ 
+ 
+ 
                                                                                                                                      SEE ALSO
                                                                                                                                      +-       curses(3x),   curs_initscr(3x),    curs_inopts(3x),    curs_kernel(3x),
++       curses(3x),    curs_initscr(3x),    curs_inopts(3x),   curs_kernel(3x),
+        curs_scr_dump(3x),        curs_sp_funcs(3x),        curs_variables(3x),
+        legacy_coding(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-11                     curs_util(3x)
++ncurses 6.5                       2024-05-25                     curs_util(3x)
+ 
                                                                                                                                      
+ 
                                                                                                                                      
+ 
                                                                                                                                        
+Index: doc/html/man/curs_window.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/curs_window.3x.html	2024-04-27 18:38:47.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/curs_window.3x.html	2024-05-25 22:33:43.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_window.3x,v 1.48 2024/04/20 21:20:07 tom Exp @
++  * @Id: curs_window.3x,v 1.50 2024/05/25 20:43:47 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_window 3x 2024-04-20 ncurses 6.5 Library calls
++curs_window 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                        curs_window 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                                                        
++
                                                                                                                                        curs_window 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                                        
+ 
                                                                                                                                        + curs_window(3x)                  Library calls                 curs_window(3x)
+ 
+@@ -167,41 +167,41 @@
+        X/Open defines no error conditions.  In this implementation
+ 
+        delwin
+-            returns an error if the window pointer is null, or if  the  window
+-            is the parent of another window.
++            returns ERR if the window pointer is null, or if the window is the
++            parent of another window.
+ 
+        derwin
+-            returns  an  error if the parent window pointer is null, or if any
+-            of its ordinates or dimensions is negative, or  if  the  resulting
+-            window does not fit inside the parent window.
++            returns ERR if the parent window pointer is null, or if any of its
++            ordinates or dimensions is negative, or if  the  resulting  window
++            does not fit inside the parent window.
+ 
+        dupwin
+-            returns an error if the window pointer is null.
++            returns ERR if the window pointer is null.
+ 
+             This  implementation  also maintains a list of windows, and checks
+             that the  pointer  passed  to  delwin  is  one  that  it  created,
+             returning an error if it was not..
+ 
+        mvderwin
+-            returns an error if the window pointer is null, or if some part of
+-            the window would be placed off-screen.
++            returns  ERR if the window pointer is null, or if some part of the
++            window would be placed off-screen.
+ 
+        mvwin
+-            returns an error if the window pointer is null, or if  the  window
+-            is  really  a  pad,  or if some part of the window would be placed
+-            off-screen.
++            returns ERR if the window pointer is null, or  if  the  window  is
++            really  a  pad, or if some part of the window would be placed off-
++            screen.
+ 
+        newwin
+             will fail if either of its beginning ordinates is negative, or  if
+             either the number of lines or columns is negative.
+ 
+        syncok
+-            returns an error if the window pointer is null.
++            returns ERR if the window pointer is null.
+ 
+        subwin
+-            returns  an  error if the parent window pointer is null, or if any
+-            of its ordinates or dimensions is negative, or  if  the  resulting
+-            window does not fit inside the parent window.
++            returns ERR if the parent window pointer is null, or if any of its
++            ordinates or dimensions is negative, or if  the  resulting  window
++            does not fit inside the parent window.
+ 
+        The  functions  which return a window pointer may also fail if there is
+        insufficient memory for its data structures.  Any  of  these  functions
+@@ -219,44 +219,36 @@
+ 
                                                                                                                                        PORTABILITY
                                                                                                                                        +        X/Open Curses, Issue 4 describes these functions.
+ 
+-       X/Open Curses states regarding delwin:
++       Regarding delwin, X/Open Curses states that
+ 
+-       o   It must delete subwindows before deleting their parent.
++              [t]he  application  must  delete  subwindows before deleting the
++              main window.
+ 
+-       o   If  delwin  is asked to delete a parent window, it can only succeed
+-           if the curses library keeps a list of the subwindows.  SVr4  curses
+-           kept  a  count  of the number of subwindows rather than a list.  It
+-           simply returned ERR when asked  to  delete  a  subwindow.   Solaris
+-           X/Open  curses  does  not  even  make that check, and will delete a
+-           parent window which still has subwindows.
+-
+-       o   Since release 4.0 (1996), ncurses maintains a list of  windows  for
+-           each  screen,  to  ensure  that  a  window has no subwindows before
+-           allowing deletion.
+-
+-       o   NetBSD copied this feature of ncurses in 2003.
+-           PDCurses follows the scheme used in Solaris X/Open curses.
+-
+-
+-
                                                                                                                                        BUGS
                                                                                                                                        +-       The subwindow functions subwin, derwin, mvderwin,  wsyncup,  wsyncdown,
+-       wcursyncup,  and  syncok  are  flaky, incompletely implemented, and not
+-       well tested.
+-
+-       System V's curses documentation  is  unclear  about  what  wsyncup  and
+-       wsyncdown  actually  do.   It  seems to imply that they are supposed to
+-       touch only those lines that are  affected  by  changes  to  a  window's
+-       ancestors.  The language here, and behavior of ncurses, is patterned on
++       If delwin is asked to delete a parent window, it can  succeed  only  if
++       the  curses library keeps a list of its subwindows.  SVr4 curses kept a
++       count of the number of  subwindows  rather  than  a  list.   It  simply
++       returned  ERR  when asked to delete a subwindow.  Solaris X/Open curses
++       (xcurses) does not make even that  check,  and  will  delete  a  parent
++       window that still has subwindows.  PDCurses also behaves this way.
++
++       ncurses  4.0  (1996)  and  later  maintains  a list of windows for each
++       screen to ensure that a window has no subwindows  before  allowing  its
++       deletion.  NetBSD curses has followed suit since 2003.
++
++       SVr4  curses  documentation is unclear about what wsyncup and wsyncdown
++       actually do.  It seems to imply that they are supposed  to  touch  only
++       those  lines that are affected by changes to a window's ancestors.  The
++       description and behavior of these functions in ncurses is patterned  on
+        the X/Open Curses standard; this approach may result in slower updates.
+ 
+ 
+ 
                                                                                                                                        SEE ALSO
                                                                                                                                        +-       curses(3x),   curs_initscr(3x),    curs_refresh(3x),    curs_touch(3x),
++       curses(3x),    curs_initscr(3x),    curs_refresh(3x),   curs_touch(3x),
+        curs_variables(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                   curs_window(3x)
++ncurses 6.5                       2024-05-25                   curs_window(3x)
+ 
                                                                                                                                        
+ 
                                                                                                                                        
+ 
+ 
                                                                                                                                        
+Index: doc/html/man/define_key.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/define_key.3x.html	2024-05-18 20:27:56.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/define_key.3x.html	2024-05-25 22:33:43.000000000 +0000
+@@ -28,19 +28,19 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey 1997
+-  * @Id: define_key.3x,v 1.44 2024/05/18 20:04:21 tom Exp @
++  * @Id: define_key.3x,v 1.46 2024/05/25 20:15:04 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-define_key 3x 2024-05-18 ncurses 6.5 Library calls
++define_key 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                        define_key 3x 2024-05-18 ncurses 6.5 Library calls
                                                                                                                                        
++
                                                                                                                                        define_key 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                                        
+ 
                                                                                                                                        + define_key(3x)                   Library calls                  define_key(3x)
+ 
+@@ -65,8 +65,9 @@
+        binding  as  it  does  those  in  the  terminfo  database entry for the
+        terminal type.
+ 
+-       A definition of NULL removes any existing one key-code.   Similarly,  a
+-       non-positive key-code removes any existing bindings for definition.
++       A definition of  NULL  removes  any  existing  binding  from  key-code.
++       Similarly,  a  non-positive  key-code  removes  an existing binding for
++       definition, if any.
+ 
+ 
+ 
                                                                                                                                        RETURN VALUE
                                                                                                                                        +@@ -95,12 +96,12 @@
+ 
+ 
+ 
                                                                                                                                        SEE ALSO
                                                                                                                                        +-       ncurses(3x),  keyok(3x),  key_defined(3x),   keybound(3x),   keyok(3x),
++       ncurses(3x),   keyok(3x),   key_defined(3x),  keybound(3x),  keyok(3x),
+        terminfo(5)
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-18                    define_key(3x)
++ncurses 6.5                       2024-05-25                    define_key(3x)
+ 
                                                                                                                                        
+ 
                                                                                                                                        
+ 
                                                                                                                                          
+Index: doc/html/man/form.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/form.3x.html	2024-04-27 18:38:47.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/form.3x.html	2024-05-25 22:33:43.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: form.3x,v 1.54 2024/03/16 15:35:01 tom Exp @
++  * @Id: form.3x,v 1.56 2024/05/25 20:52:38 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-form 3x 2024-03-16 ncurses 6.5 Library calls
++form 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                          form 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                          
++
                                                                                                                                          form 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                                          
+ 
                                                                                                                                          + form(3x)                         Library calls                        form(3x)
+ 
+@@ -48,7 +48,7 @@
+ 
+ 
+ 
                                                                                                                                          NAME
                                                                                                                                          +-       form - curses extension for programming forms
++       form - present user-fillable forms in curses windows
+ 
+ 
+ 
                                                                                                                                          SYNOPSIS
                                                                                                                                          +@@ -245,7 +245,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                          form(3x)
++ncurses 6.5                       2024-05-25                          form(3x)
+ 
                                                                                                                                          
+ 
                                                                                                                                          
+ 
                                                                                                                                            
+Index: doc/html/man/index.html
+Prereq:  1.12 
+--- ncurses-6.5-20240519+/doc/html/man/index.html	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/index.html	2024-05-25 22:27:27.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+-
+ 
+ 
+   
+-
++  "HTML Tidy for HTML5 for Linux version 5.6.0">
+   NCURSES – Manual Pages
+   
+   
+ 
+-
+ 
+   
                                                                                                                                              
+     
                                                                                                                                            • Programs:
+-
+       
+     
                                                                                                                                              • 
+ 
+     
                                                                                                                                            • Scripts:
+-
+       
                                                                                                                                                
+         
                                                                                                                                              • adacurses*-config –
+-        helper script for AdaCurses libraries
                                                                                                                                                • 
++        configuration helper for AdaCurses libraries
+ 
+         
                                                                                                                                              • ncurses*-config
+-        – helper script for ncurses libraries
                                                                                                                                                • 
++        – configuration helper for ncurses libraries
+       
                                                                                                                                              
+     
                                                                                                                                              • 
+ 
+     
                                                                                                                                            • Libraries:
+-
+       
+     
                                                                                                                                              • 
+ 
+     
                                                                                                                                            • File formats:
+-
+       
++    
                                                                                                                                              • 
++
++    
                                                                                                                                            • Other information:
++      
+Index: doc/html/man/menu.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/menu.3x.html	2024-04-27 18:38:48.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/menu.3x.html	2024-05-25 22:33:44.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: menu.3x,v 1.45 2024/03/16 15:35:01 tom Exp @
++  * @Id: menu.3x,v 1.47 2024/05/25 20:52:38 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-menu 3x 2024-03-16 ncurses 6.5 Library calls
++menu 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                              menu 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                              
++
                                                                                                                                              menu 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                                              
+ 
                                                                                                                                              + menu(3x)                         Library calls                        menu(3x)
+ 
+@@ -48,7 +48,7 @@
+ 
+ 
+ 
                                                                                                                                              NAME
                                                                                                                                              +-       menu - curses extension for programming menus
++       menu - present menus in curses windows
+ 
+ 
+ 
                                                                                                                                              SYNOPSIS
                                                                                                                                              +@@ -220,7 +220,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                          menu(3x)
++ncurses 6.5                       2024-05-25                          menu(3x)
+ 
                                                                                                                                              
+ 
                                                                                                                                              
+ 
                                                                                                                                                
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/ncurses.3x.html	2024-05-18 20:27:57.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/ncurses.3x.html	2024-05-25 22:33:44.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: ncurses.3x,v 1.217 2024/05/18 20:02:27 tom Exp @
++  * @Id: ncurses.3x,v 1.219 2024/05/25 20:57:45 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-ncurses 3x 2024-05-18 ncurses 6.5 Library calls
++ncurses 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                ncurses 3x 2024-05-18 ncurses 6.5 Library calls
                                                                                                                                                
++
                                                                                                                                                ncurses 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                                                
+ 
                                                                                                                                                + ncurses(3x)                      Library calls                     ncurses(3x)
+ 
+@@ -61,7 +61,7 @@
+        terminals  with  output  optimized to minimize screen updates.  ncurses
+        replaces the curses libraries from System V Release 4 Unix ("SVr4") and
+        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
+-       document describes ncurses version 6.5 (patch 20240518).
++       document describes ncurses version 6.5 (patch 20240525).
+ 
+        ncurses permits control of the terminal screen's contents;  abstraction
+        and  subdivision thereof with windows and pads; acquisition of keyboard
+@@ -131,9 +131,9 @@
+ 
+            initscr(); cbreak(); noecho();
+ 
+-       Most applications perform further setup as follows.
++       Most applications would perform further setup as follows.
+ 
+-           intrflush(stdscr, FALSE);
++           noqiflush();
+            keypad(stdscr, TRUE);
+ 
+        A curses program then often enters an event loop of  some  sort.   Call
+@@ -176,9 +176,9 @@
+        not be completely displayed.  See curs_pad(3x).
+ 
+        Many  terminals  support configuration of character cell foreground and
+-       background  colors  as  well  as  rendering  attributes,  which   cause
+-       characters  to  show  up  in such modes as boldfaced, underlined, or in
+-       reverse video.  See curs_attr(3x).
++       background colors as well as  attributes,  which  cause  characters  to
++       render  in  such  modes  as boldfaced, underlined, or in reverse video.
++       See curs_attr(3x).
+ 
+        curses predefines constants for a small set of  forms-drawing  graphics
+        corresponding  to  the  DEC Alternate Character Set (ACS), a feature of
+@@ -189,8 +189,8 @@
+        keycaps (alphanumeric and punctuation keys, and the space)  appear  as-
+        is.   Everything  else, including the tab, enter/return, keypad, arrow,
+        and function keys, appears as a control character or a multibyte escape
+-       sequence.   curses  translates  the  latter into unique key codes.  See
+-       getch(3x).
++       sequence.   curses can translate the latter into unique key codes.  See
++       keypad(3x) and getch(3x).
+ 
+        ncurses provides reimplementations of the SVr4 panel(3x), form(3x), and
+        menu(3x)   libraries;   they   permit   overlapping  windows  and  ease
+@@ -855,26 +855,28 @@
+        overrides the library's use  of  the  screen  size  obtained  from  the
+        operating system.
+ 
+-       The  COLUMNS  and LINES variables may be specified independently.  This
+-       property is useful to circumvent misfeatures of  legacy  terminal  type
+-       descriptions;  xterm(1)  descriptions  specifying  65  lines  were once
+-       notorious.   For  best  results,  avoid  specifying  cols   and   lines
++       The  COLUMNS  and  LINES  variables  may  be  specified  independently.
++       ncurses enforces an upper limit of 512 on each when reading the  value.
++       This  property  is  useful to circumvent misfeatures of legacy terminal
++       type descriptions; xterm(1) descriptions specifying 65 lines were  once
++       notorious.    For   best  results,  avoid  specifying  cols  and  lines
+        capability codes in terminfo descriptions of terminal emulators.
+ 
+-       use_env(3x)  can  disable use of the process environment in determining
+-       the screen size.  use_tioctl(3x) can update COLUMNS and LINES to  match
++       use_env(3x) can disable use of the process environment  in  determining
++       the  screen size.  use_tioctl(3x) can update COLUMNS and LINES to match
+        the screen size obtained from system calls or the terminal database.
+ 
+ 
+ 
                                                                                                                                                ESCDELAY
                                                                                                                                                +-       For  curses  to  distinguish  the ESC character resulting from a user's
+-       press of the "Escape" key on the input device  from  one  beginning  an
++       For curses to distinguish the ESC character  resulting  from  a  user's
++       press  of  the  "Escape"  key on the input device from one beginning an
+        escape sequence (as commonly produced by function keys), it waits after
+-       receiving the  escape  character  to  see  if  further  characters  are
+-       available  on  the  input  stream  within  a  short interval.  A global
+-       variable ESCDELAY stores this interval in  milliseconds.   The  default
++       receiving  the  escape  character  to  see  if  further  characters are
++       available on the input  stream  within  a  short  interval.   A  global
++       variable  ESCDELAY  stores  this interval in milliseconds.  The default
+        value of 1000 (one second) is adequate for most uses.  This environment
+-       variable overrides it.
++       variable  overrides  it;  ncurses enforces an upper limit of 30,000 (30
++       seconds) when reading the value.
+ 
+        The most common instance where you may wish to change this value is  to
+        work with a remote host over a slow communication channel.  If the host
+@@ -939,90 +941,91 @@
+ 
+ 
                                                                                                                                                NCURSES_GPM_TERMS
                                                                                                                                                +        (Linux only) When ncurses is configured to use the GPM interface,  this
+-       variable  may  list  one  or more terminal type names against which the
+-       TERM variable (see below) is matched.  An empty value disables the  GPM
+-       interface,   using   ncurses's  built-in  support  for  xterm(1)  mouse
+-       protocols instead.  If the variable is absent, ncurses attempts to open
+-       GPM if TERM contains "linux".
++       variable  may  list  one  or  more  terminal  type  names, delimited by
++       vertical bars (|) or colons (:), against which the TERM  variable  (see
++       below)  is  matched.   An empty value disables the GPM interface, using
++       ncurses's built-in support for xterm(1) mouse  protocols  instead.   If
++       the  variable  is absent, ncurses attempts to open GPM if TERM contains
++       "linux".
+ 
+ 
+ 
                                                                                                                                                NCURSES_NO_HARD_TABS
                                                                                                                                                +-       ncurses  may  use  tab  characters in cursor movement optimization.  In
+-       some cases, your terminal driver may not  handle  them  properly.   Set
++       ncurses may use tab characters in  cursor  movement  optimization.   In
++       some  cases,  your  terminal  driver may not handle them properly.  Set
+        this environment variable to any value to disable the feature.  You can
+        also adjust your stty(1) settings to avoid the problem.
+ 
+ 
+ 
                                                                                                                                                NCURSES_NO_MAGIC_COOKIE
                                                                                                                                                +-       Many terminals store video attributes as  a  property  of  a  character
+-       cell,  as  curses  does.   Historically, some recorded changes in video
+-       attributes as data that  logically  occupies  character  cells  on  the
+-       display,  switching attributes on or off, similarly to tags in a markup
+-       language; these are termed "magic cookies", and  must  be  subsequently
+-       overprinted.   If  the  terminfo  entry for your terminal type does not
++       Many  terminals  store  video  attributes  as a property of a character
++       cell, as curses does.  Historically, some  recorded  changes  in  video
++       attributes  as  data  that  logically  occupies  character cells on the
++       display, switching attributes on or off, similarly to tags in a  markup
++       language;  these  are  termed "magic cookies", and must be subsequently
++       overprinted.  If the terminfo entry for your  terminal  type  does  not
+        adequately describe its handling of magic cookies, set this variable to
+        any value to instruct ncurses to disable attributes entirely.
+ 
+ 
+ 
                                                                                                                                                NCURSES_NO_PADDING
                                                                                                                                                +        Most  terminal  type  descriptions  in  the  terminfo  database  detail
+-       hardware  devices.   Many  people  use  curses-based  applications   in
+-       terminal  emulator programs that run in a windowing environment.  These
+-       programs can duplicate all of the  important  features  of  a  hardware
+-       terminal,  but  often lack their limitations.  Chief among these absent
++       hardware   devices.   Many  people  use  curses-based  applications  in
++       terminal emulator programs that run in a windowing environment.   These
++       programs  can  duplicate  all  of  the important features of a hardware
++       terminal, but often lack their limitations.  Chief among  these  absent
+        drawbacks is the problem of data flow management; that is, limiting the
+-       speed  of  communication  to  what the hardware could handle.  Unless a
+-       hardware terminal is interfaced into  a  terminal  concentrator  (which
+-       does  flow  control), an application must manage flow itself to prevent
++       speed of communication to what the hardware  could  handle.   Unless  a
++       hardware  terminal  is  interfaced  into a terminal concentrator (which
++       does flow control), an application must manage flow itself  to  prevent
+        overruns and data loss.
+ 
+-       A solution that comes at no hardware cost  is  for  an  application  to
+-       pause  after  directing  a  terminal  to  execute  an operation that it
+-       performs slowly, such as clearing  the  display.   Many  terminal  type
+-       descriptions,  including that for the VT100, embed delay specifications
+-       in capabilities.  You may  wish  to  use  these  terminal  descriptions
+-       without  paying the performance penalty.  Set NCURSES_NO_PADDING to any
+-       value to disable all but mandatory padding.  Mandatory padding is  used
++       A  solution  that  comes  at  no hardware cost is for an application to
++       pause after directing a  terminal  to  execute  an  operation  that  it
++       performs  slowly,  such  as  clearing  the display.  Many terminal type
++       descriptions, including that for the VT100, embed delay  specifications
++       in  capabilities.   You  may  wish  to  use these terminal descriptions
++       without paying the performance penalty.  Set NCURSES_NO_PADDING to  any
++       value  to disable all but mandatory padding.  Mandatory padding is used
+        by such terminal capabilities as flash_screen (flash).
+ 
+ 
+ 
                                                                                                                                                NCURSES_NO_SETBUF
                                                                                                                                                +-       (Obsolete)  Prior to internal changes developed in ncurses 5.9 (patches
+-       20120825 through 20130126), the library used setbuf(3) to enable  fully
+-       buffered  output  when initializing the terminal.  This was done, as in
+-       SVr4 curses, to increase performance.  For testing  purposes,  both  of
+-       ncurses  and  of  certain applications, this feature was made optional.
+-       Setting this variable disabled output  buffering,  leaving  the  output
++       (Obsolete) Prior to internal changes developed in ncurses 5.9  (patches
++       20120825  through 20130126), the library used setbuf(3) to enable fully
++       buffered output when initializing the terminal.  This was done,  as  in
++       SVr4  curses,  to  increase performance.  For testing purposes, both of
++       ncurses and of certain applications, this feature  was  made  optional.
++       Setting  this  variable  disabled  output buffering, leaving the output
+        stream in the original (usually line-buffered) mode.
+ 
+-       Nowadays,  ncurses performs its own buffering and does not require this
+-       workaround; it does not modify the buffering  of  the  standard  output
+-       stream.   This  approach makes signal handling, as for interrupts, more
+-       robust.  A drawback  is  that  certain  unconventional  programs  mixed
+-       stdio(3)  calls  with ncurses calls and (usually) got the behavior they
+-       expected.  This is no longer the case; ncurses does not  write  to  the
++       Nowadays, ncurses performs its own buffering and does not require  this
++       workaround;  it  does  not  modify the buffering of the standard output
++       stream.  This approach makes signal handling, as for  interrupts,  more
++       robust.   A  drawback  is  that  certain  unconventional programs mixed
++       stdio(3) calls with ncurses calls and (usually) got the  behavior  they
++       expected.   This  is  no longer the case; ncurses does not write to the
+        standard output file descriptor through a stdio-buffered stream.
+ 
+-       As  a  special case, low-level API calls such as putp(3x) still use the
+-       standard output stream.  High-level curses calls such as printw(3x)  do
++       As a special case, low-level API calls such as putp(3x) still  use  the
++       standard  output stream.  High-level curses calls such as printw(3x) do
+        not.
+ 
+ 
+ 
                                                                                                                                                NCURSES_NO_UTF8_ACS
                                                                                                                                                +-       At  initialization,  ncurses inspects the TERM environment variable for
+-       special  cases  where   VT100   forms-drawing   characters   (and   the
+-       corresponding  alternate character set terminfo capabilities) are known
++       At initialization, ncurses inspects the TERM environment  variable  for
++       special   cases   where   VT100   forms-drawing   characters  (and  the
++       corresponding alternate character set terminfo capabilities) are  known
+        to  be  unsupported  by  terminal  types  that  otherwise  claim  VT100
+        compatibility.  Specifically, when running in a UTF-8 locale, the Linux
+-       virtual console device and the GNU screen(1) program ignore them.   Set
++       virtual  console device and the GNU screen(1) program ignore them.  Set
+        this  variable  to  a  nonzero  value  to  instruct  ncurses  that  the
+        terminal's ACS support is broken; the library then outputs Unicode code
+        points that correspond to the forms-drawing characters.  Set it to zero
+        (or a non-integer) to disable the special check for terminal type names
+-       matching  "linux" or "screen", directing ncurses to assume that the ACS
++       matching "linux" or "screen", directing ncurses to assume that the  ACS
+        feature works if the terminal type description advertises it.
+ 
+-       As an alternative to use  of  this  variable,  ncurses  checks  for  an
++       As  an  alternative  to  use  of  this  variable, ncurses checks for an
+        extended terminfo numeric capability U8 that can be compiled using "tic
+        -x".  Examples follow.
+ 
+@@ -1035,62 +1038,62 @@
+           xterm-utf8|xterm relying on UTF-8 line-graphics,
+                   U8#1, use=xterm,
+ 
+-       The two-character name "U8" was chosen to permit its use via  ncurses's
++       The  two-character name "U8" was chosen to permit its use via ncurses's
+        termcap interface.
+ 
+ 
+ 
                                                                                                                                                NCURSES_TRACE
                                                                                                                                                +-       At  initialization, ncurses (in its debugging configuration) checks for
+-       this variable's presence.  If  defined  with  an  integral  value,  the
++       At initialization, ncurses (in its debugging configuration) checks  for
++       this  variable's  presence.   If  defined  with  an integral value, the
+        library calls curses_trace(3x) with that value as the argument.
+ 
+ 
+ 
                                                                                                                                                TERM
                                                                                                                                                +-       The  TERM variable denotes the terminal type.  Each is distinct, though
+-       many are similar.  It is commonly set by  terminal  emulators  to  help
+-       applications  find  a  workable  terminal  description.   Some choose a
+-       popular approximation such as "ansi", "vt100", or "xterm"  rather  than
+-       an  exact  fit to their capabilities.  Not infrequently, an application
+-       will have problems with that approach; for example, a  key  stroke  may
+-       not  operate  correctly,  or  produce  no  effect  but  seeming garbage
++       The TERM variable denotes the terminal type.  Each is distinct,  though
++       many  are  similar.   It  is commonly set by terminal emulators to help
++       applications find a  workable  terminal  description.   Some  choose  a
++       popular  approximation  such as "ansi", "vt100", or "xterm" rather than
++       an exact fit to their capabilities.  Not infrequently,  an  application
++       will  have  problems  with that approach; for example, a key stroke may
++       not operate  correctly,  or  produce  no  effect  but  seeming  garbage
+        characters on the screen.
+ 
+-       Setting TERM has no effect on hardware operation; it  affects  the  way
+-       applications  communicate  with  the  terminal.  Likewise, as a general
+-       rule (xterm(1) being a rare exception), terminal emulators  that  allow
++       Setting  TERM  has  no effect on hardware operation; it affects the way
++       applications communicate with the terminal.   Likewise,  as  a  general
++       rule  (xterm(1)  being a rare exception), terminal emulators that allow
+        you to specify TERM as a parameter or configuration value do not change
+        their behavior to match that setting.
+ 
+ 
+ 
                                                                                                                                                TERMCAP
                                                                                                                                                +        If ncurses is configured with termcap support, it checks for a terminal
+-       type  description  in  termcap  format if one in terminfo format is not
+-       available.  Setting this variable directs ncurses to ignore  the  usual
+-       termcap  database  location, /etc/termcap; see TERMPATH below.  TERMCAP
+-       should contain either a terminal description  (with  newlines  stripped
+-       out),  or  a file name indicating where the information required by the
++       type description in termcap format if one in  terminfo  format  is  not
++       available.   Setting  this variable directs ncurses to ignore the usual
++       termcap database location, /etc/termcap; see TERMPATH  below.   TERMCAP
++       should  contain  either  a terminal description (with newlines stripped
++       out), or a file name indicating where the information required  by  the
+        TERM environment variable is stored.
+ 
+ 
+ 
                                                                                                                                                TERMINFO
                                                                                                                                                +-       ncurses can be configured to read terminal type  description  databases
+-       in  various locations using different formats.  This variable overrides
++       ncurses  can  be configured to read terminal type description databases
++       in various locations using different formats.  This variable  overrides
+        the default location.
+ 
+-       o   Descriptions in terminfo format are normally stored in a  directory
+-           tree  using subdirectories named by the common first letters of the
++       o   Descriptions  in terminfo format are normally stored in a directory
++           tree using subdirectories named by the common first letters of  the
+            terminal types named therein.  This is the scheme used in System V.
+ 
+        o   If ncurses is configured to use hashed databases, then TERMINFO may
+-           name  its  location,  such  as  /usr/share/terminfo.db, rather than
++           name its location,  such  as  /usr/share/terminfo.db,  rather  than
+            /usr/share/terminfo/.
+ 
+-       The hashed database uses less disk space and is a  little  faster  than
++       The  hashed  database  uses less disk space and is a little faster than
+        the directory tree.  However, some applications assume the existence of
+        the directory tree, and read it directly rather than using the terminfo
+        API.
+ 
+-       o   If  ncurses  is  configured with termcap support, this variable may
++       o   If ncurses is configured with termcap support,  this  variable  may
+            contain the location of a termcap file.
+ 
+        o   If the value of TERMINFO begins with "hex:" or "b64:", ncurses uses
+@@ -1100,10 +1103,10 @@
+                   TERMINFO=$(infocmp -0 -Q2 -q)
+                   export TERMINFO
+ 
+-           The compiled description is used only  if  it  corresponds  to  the
++           The  compiled  description  is  used  only if it corresponds to the
+            terminal type identified by TERM.
+ 
+-       Setting  TERMINFO  is  the  simplest,  but  not the only, way to direct
++       Setting TERMINFO is the simplest, but  not  the  only,  way  to  direct
+        ncurses to a terminal database.  The search path is as follows.
+ 
+        o   the last terminal database to which the running ncurses application
+@@ -1121,16 +1124,16 @@
+ 
+ 
+ 
                                                                                                                                                TERMINFO_DIRS
                                                                                                                                                +-       This  variable  specifies  a  list of locations, akin to PATH, in which
+-       ncurses searches  for  the  terminal  type  descriptions  described  by
+-       TERMINFO  above.   The  list  items are separated by colons on Unix and
+-       semicolons on  OS/2  EMX.   System V  terminfo  lacks  a  corresponding
++       This variable specifies a list of locations, akin  to  PATH,  in  which
++       ncurses  searches  for  the  terminal  type  descriptions  described by
++       TERMINFO above.  The list items are separated by  colons  on  Unix  and
++       semicolons  on  OS/2  EMX.   System V  terminfo  lacks  a corresponding
+        feature; TERMINFO_DIRS is an ncurses extension.
+ 
+ 
+ 
                                                                                                                                                TERMPATH
                                                                                                                                                +        If TERMCAP does not hold a terminal type description or file name, then
+-       ncurses checks the contents of TERMPATH, a list of locations,  akin  to
++       ncurses  checks  the contents of TERMPATH, a list of locations, akin to
+        PATH, in which it searches for termcap terminal type descriptions.  The
+        list items are separated by colons on Unix and semicolons on OS/2 EMX.
+ 
+@@ -1140,9 +1143,9 @@
+ 
+ 
+ 
                                                                                                                                                ALTERNATE CONFIGURATIONS
                                                                                                                                                +-       Many different ncurses configurations are possible, determined  by  the
+-       options  given  to the configure script when building the library.  Run
+-       the script with the --help option to peruse them all.   A  few  are  of
++       Many  different  ncurses configurations are possible, determined by the
++       options given to the configure script when building the  library.   Run
++       the  script  with  the  --help option to peruse them all.  A few are of
+        particular significance to the application developer employing ncurses.
+ 
+        --disable-overwrite
+@@ -1151,24 +1154,24 @@
+ 
+                 #include <curses.h>
+ 
+-            This option is used to avoid file name conflicts  between  ncurses
+-            and  an existing curses installation on the system.  If ncurses is
+-            installed disabling overwrite, it  puts  its  header  files  in  a
++            This  option  is used to avoid file name conflicts between ncurses
++            and an existing curses installation on the system.  If ncurses  is
++            installed  disabling  overwrite,  it  puts  its  header files in a
+             subdirectory.  Here is an example.
+ 
+                 #include <ncurses/curses.h>
+ 
+-            Installation  also  omits  a  symbolic  link  that would cause the
+-            compiler's -lcurses option  to  link  object  files  with  ncurses
++            Installation also omits a  symbolic  link  that  would  cause  the
++            compiler's  -lcurses  option  to  link  object  files with ncurses
+             instead of the system curses library.
+ 
+-            The  directory  used  by this configuration of ncurses is shown in
++            The directory used by this configuration of ncurses  is  shown  in
+             section "SYNOPSIS" above.
+ 
+        --enable-widec
+-            The  configure  script   renames   the   library   and   (if   the
+-            --disable-overwrite  option  is  used)  puts the header files in a
+-            different subdirectory.  All of  the  library  names  have  a  "w"
++            The   configure   script   renames   the   library   and  (if  the
++            --disable-overwrite option is used) puts the  header  files  in  a
++            different  subdirectory.   All  of  the  library  names have a "w"
+             appended to them, i.e., instead of
+ 
+                 -lncurses
+@@ -1177,62 +1180,62 @@
+ 
+                 -lncursesw
+ 
+-            You  must  also  enable  the wide-character features in the header
+-            file when compiling for the  wide-character  library  to  use  the
+-            extended  (wide-character)  functions.   The  symbol which enables
++            You must also enable the wide-character  features  in  the  header
++            file  when  compiling  for  the  wide-character library to use the
++            extended (wide-character) functions.   The  symbol  which  enables
+             these features has changed since X/Open Curses, Issue 4:
+ 
+-            o   Originally, the wide-character  feature  required  the  symbol
++            o   Originally,  the  wide-character  feature  required the symbol
+                 _XOPEN_SOURCE_EXTENDED  but  that  was  only  valid  for  XPG4
+                 (1996).
+ 
+-            o   Later, that was deemed conflicting with _XOPEN_SOURCE  defined
++            o   Later,  that was deemed conflicting with _XOPEN_SOURCE defined
+                 to 500.
+ 
+-            o   As  of  mid-2018,  none of the features in this implementation
+-                require a _XOPEN_SOURCE feature greater  than  600.   However,
++            o   As of mid-2018, none of the features  in  this  implementation
++                require  a  _XOPEN_SOURCE  feature greater than 600.  However,
+                 X/Open Curses, Issue 7 (2009) recommends defining it to 700.
+ 
+-            o   Alternatively,   you   can  enable  the  feature  by  defining
+-                NCURSES_WIDECHAR with the caveat that some other  header  file
+-                than  curses.h  may require a specific value for _XOPEN_SOURCE
++            o   Alternatively,  you  can  enable  the  feature   by   defining
++                NCURSES_WIDECHAR  with  the caveat that some other header file
++                than curses.h may require a specific value  for  _XOPEN_SOURCE
+                 (or a system-specific symbol).
+ 
+-            The curses.h header file installed for the wide-character  library
+-            is  designed  to be compatible with the non-wide library's header.
+-            Only the size of the WINDOW structure  differs;  few  applications
++            The  curses.h header file installed for the wide-character library
++            is designed to be compatible with the non-wide  library's  header.
++            Only  the  size  of the WINDOW structure differs; few applications
+             require more than pointers to WINDOWs.
+ 
+             If  the  headers  are  installed  allowing  overwrite,  the  wide-
+-            character library's headers should be  installed  last,  to  allow
++            character  library's  headers  should  be installed last, to allow
+             applications to be built using either library from the same set of
+             headers.
+ 
+        --with-pthread
+-            The configure script renames the  library.   All  of  the  library
+-            names  have  a  "t"  appended  to  them  (before  any "w" added by
++            The  configure  script  renames  the  library.  All of the library
++            names have a "t"  appended  to  them  (before  any  "w"  added  by
+             --enable-widec).
+ 
+             The global variables such as LINES are replaced by macros to allow
+             read-only access.  At the same time, setter-functions are provided
+-            to set these values.  Some applications  (very  few)  may  require
++            to  set  these  values.   Some applications (very few) may require
+             changes to work with this convention.
+ 
+        --with-shared
+        --with-normal
+        --with-debug
+        --with-profile
+-            The  shared  and  normal  (static)  library  names differ by their
+-            suffixes, e.g., libncurses.so and  libncurses.a.   The  debug  and
+-            profiling  libraries  add  a  "_g"  and  a  "_p" to the root names
++            The shared and normal  (static)  library  names  differ  by  their
++            suffixes,  e.g.,  libncurses.so  and  libncurses.a.  The debug and
++            profiling libraries add a "_g"  and  a  "_p"  to  the  root  names
+             respectively, e.g., libncurses_g.a and libncurses_p.a.
+ 
+        --with-termlib
+-            Low-level functions which do not depend upon whether  the  library
++            Low-level  functions  which do not depend upon whether the library
+             supports wide-characters, are provided in the tinfo library.
+ 
+-            By  doing  this, it is possible to share the tinfo library between
+-            wide/normal configurations as well  as  reduce  the  size  of  the
++            By doing this, it is possible to share the tinfo  library  between
++            wide/normal  configurations  as  well  as  reduce  the size of the
+             library when only low-level functions are needed.
+ 
+             Those functions are described in these pages:
+@@ -1252,8 +1255,8 @@
+             o   curs_util(3x) - miscellaneous curses utility routines
+ 
+        --with-trace
+-            The  trace  function normally resides in the debug library, but it
+-            is sometimes useful to  configure  this  in  the  shared  library.
++            The trace function normally resides in the debug library,  but  it
++            is  sometimes  useful  to  configure  this  in the shared library.
+             Configure scripts should check for the function's existence rather
+             than assuming it is always in the debug library.
+ 
+@@ -1267,139 +1270,134 @@
+ 
+ 
+ 
                                                                                                                                                NOTES
                                                                                                                                                +-       X/Open Curses permits most functions it specifies to be made  available
++       X/Open  Curses permits most functions it specifies to be made available
+        as macros as well.  ncurses does so
+ 
+        o   for functions that return values via their parameters,
+ 
+        o   to support obsolete features,
+ 
+-       o   to  reuse functions (for example, those that move the cursor before
++       o   to reuse functions (for example, those that move the cursor  before
+            another operation), and
+ 
+        o   in a few special cases.
+ 
+-       If the standard  output  file  descriptor  of  an  ncurses  program  is
+-       redirected  to  something  that  is  not a terminal device, the library
+-       writes screen updates to the standard error file descriptor.  This  was
++       If  the  standard  output  file  descriptor  of  an  ncurses program is
++       redirected to something that is not  a  terminal  device,  the  library
++       writes  screen updates to the standard error file descriptor.  This was
+        an undocumented feature of SVr3 curses.
+ 
+-       See  subsection  "Header  Files"  below  regarding  symbols  exposed by
++       See subsection  "Header  Files"  below  regarding  symbols  exposed  by
+        inclusion of curses.h.
+ 
+ 
+ 
                                                                                                                                                EXTENSIONS
                                                                                                                                                +-       ncurses enables an application  to  capture  mouse  events  on  certain
++       ncurses  enables  an  application  to  capture  mouse events on certain
+        terminals, including xterm(1); see curs_mouse(3x).
+ 
+-       ncurses  provides  a  means of responding to window resizing events, as
+-       when running in a GUI terminal emulator application such as xterm;  see
++       ncurses provides a means of responding to window  resizing  events,  as
++       when  running in a GUI terminal emulator application such as xterm; see
+        resizeterm(3x) and wresize(3x).
+ 
+        ncurses allows an application to query the terminal for the presence of
+        a wide variety of special keys; see has_key(3x).
+ 
+        ncurses extends the fixed set of function key capabilities specified by
+-       X/Open   Curses  by  allowing  the  application  programmer  to  define
+-       additional key events at runtime; see define_key(3x),  key_defined(3x),
++       X/Open  Curses  by  allowing  the  application  programmer  to   define
++       additional  key events at runtime; see define_key(3x), key_defined(3x),
+        keybound(3x), and keyok(3x).
+ 
+-       ncurses   can   exploit  the  capabilities  of  terminals  implementing
+-       ISO 6429/ECMA-48  SGR 39  and  SGR 49   sequences,   which   allow   an
+-       application  to  reset  the  terminal  to  its  original foreground and
+-       background colors.  From a user's perspective, the application is  able
+-       to  draw colored text on a background whose color is set independently,
++       ncurses  can  exploit  the  capabilities  of   terminals   implementing
++       ISO 6429/ECMA-48   SGR 39   and   SGR 49   sequences,  which  allow  an
++       application to reset  the  terminal  to  its  original  foreground  and
++       background  colors.  From a user's perspective, the application is able
++       to draw colored text on a background whose color is set  independently,
+        providing better control over color contrasts.  See default_colors(3x).
+ 
+        An  ncurses  application  can  eschew  knowledge  of  WINDOW  structure
+        internals, instead using accessor functions such as is_scrollok(3x).
+ 
+-       ncurses  enables  an  application  to  direct  its  output to a printer
++       ncurses enables an application  to  direct  its  output  to  a  printer
+        attached to the terminal device; see curs_print(3x).
+ 
+-       ncurses offers slk_attr(3x) as a counterpart of attr_get(3x) for  soft-
+-       label  key lines, and extended_slk_color(3x) as a form of slk_color(3x)
+-       that can gather color  information  from  them  when  many  colors  are
++       ncurses  offers slk_attr(3x) as a counterpart of attr_get(3x) for soft-
++       label key lines, and extended_slk_color(3x) as a form of  slk_color(3x)
++       that  can  gather  color  information  from  them  when many colors are
+        supported.
+ 
+-       Some  extensions  are available only if ncurses permits modification of
+-       unctrl(3x)'s behavior; see use_legacy_coding(3x).  ncurses is  compiled
+-       to support them; section "ALTERNATE CONFIGURATIONS" describes how.
+-
+-       ncurses    permits   modification   of   unctrl(3x)'s   behavior;   see
++       ncurses   permits   modification   of   unctrl(3x)'s   behavior;    see
+        use_legacy_coding(3x).
+ 
+-       Rudimentary support for multi-threaded applications may  be  available;
++       Rudimentary  support  for multi-threaded applications may be available;
+        see curs_threads(3x).
+ 
+-       Functions  that ease the management of multiple screens can be exposed;
++       Functions that ease the management of multiple screens can be  exposed;
+        see curs_sp_funcs(3x).
+ 
+-       To aid applications to debug their  memory  usage,  ncurses  optionally
+-       offers  functions  to  more  aggressively  free  memory  it dynamically
++       To  aid  applications  to  debug their memory usage, ncurses optionally
++       offers functions  to  more  aggressively  free  memory  it  dynamically
+        allocates itself; see curs_memleaks(3x).
+ 
+-       The library facilitates auditing and troubleshooting of  its  behavior;
++       The  library  facilitates auditing and troubleshooting of its behavior;
+        see curs_trace(3x).
+ 
+-       Compiling  ncurses  with the option -DUSE_GETCAP causes it to fall back
+-       to reading /etc/termcap if the terminal setup code cannot find a  term-
++       Compiling ncurses with the option -DUSE_GETCAP causes it to  fall  back
++       to  reading /etc/termcap if the terminal setup code cannot find a term-
+        info  entry  corresponding  to  TERM.   Use  of  this  feature  is  not
+-       recommended, as it essentially includes an entire termcap  compiler  in
+-       the  ncurses  startup  code,  at a cost in memory usage and application
++       recommended,  as  it essentially includes an entire termcap compiler in
++       the ncurses startup code, at a cost in  memory  usage  and  application
+        launch latency.
+ 
+-       PDCurses  and  NetBSD  curses  incorporate  some  ncurses   extensions.
++       PDCurses   and  NetBSD  curses  incorporate  some  ncurses  extensions.
+        Individual man pages indicate where this is the case.
+ 
+ 
+ 
                                                                                                                                                PORTABILITY
                                                                                                                                                +        X/Open Curses defines two levels of conformance, "base" and "enhanced".
+        The latter includes several additional features, such as wide-character
+-       and  color support.  ncurses intends base-level conformance with X/Open
+-       Curses, and supports all features of  its  enhanced  level  except  the
++       and color support.  ncurses intends base-level conformance with  X/Open
++       Curses,  and  supports  all  features  of its enhanced level except the
+        untic utility.
+ 
+-       Differences  between  X/Open  Curses  and ncurses are documented in the
++       Differences between X/Open Curses and ncurses  are  documented  in  the
+        "PORTABILITY" sections of applicable man pages.
+ 
+ 
+ 
                                                                                                                                                Error Checking
                                                                                                                                                +-       In many cases, X/Open Curses is vague about error conditions,  omitting
++       In  many cases, X/Open Curses is vague about error conditions, omitting
+        some of the SVr4 documentation.
+ 
+-       Unlike  other  implementations, ncurses checks pointer parameters, such
+-       as those to WINDOW structures, to ensure that they are not null.   This
+-       is  done  primarily  to  guard  against programmer error.  The standard
++       Unlike other implementations, ncurses checks pointer  parameters,  such
++       as  those to WINDOW structures, to ensure that they are not null.  This
++       is done primarily to guard  against  programmer  error.   The  standard
+        interface does not provide a way for the library to tell an application
+-       which  of several possible errors occurred.  An application that relies
+-       on ncurses to check its function parameters  for  validity  limits  its
++       which of several possible errors occurred.  An application that  relies
++       on  ncurses  to  check  its function parameters for validity limits its
+        portability and robustness.
+ 
+ 
+ 
                                                                                                                                                Padding Differences
                                                                                                                                                +-       In  historical  curses implementations, delays embedded in the terminfo
+-       capabilities carriage_return (cr),  scroll_forward  (ind),  cursor_left
++       In historical curses implementations, delays embedded in  the  terminfo
++       capabilities  carriage_return  (cr),  scroll_forward (ind), cursor_left
+        (cub1), form_feed (ff), and tab (ht) activated corresponding delay bits
+-       in the Unix terminal driver.  ncurses performs all padding  by  sending
+-       NUL  bytes  to the device.  This method is slightly more expensive, but
+-       narrows  the  interface  to   the   Unix   kernel   significantly   and
++       in  the  Unix terminal driver.  ncurses performs all padding by sending
++       NUL bytes to the device.  This method is slightly more  expensive,  but
++       narrows   the   interface   to   the   Unix  kernel  significantly  and
+        correspondingly increases the package's portability.
+ 
+ 
+ 
                                                                                                                                                Header Files
                                                                                                                                                +-       The  header  file curses.h itself includes the header files stdio.h and
++       The header file curses.h itself includes the header files  stdio.h  and
+        unctrl.h.
+ 
+        X/Open Curses has more to say,
+ 
+-           The inclusion of curses.h may make visible  all  symbols  from  the
++           The  inclusion  of  curses.h  may make visible all symbols from the
+            headers stdio.h, term.h, termios.h, and wchar.h.
+ 
+        but does not finish the story.  A more complete account follows.
+ 
+-       o   Starting  with 4BSD curses (1980) all implementations have provided
+-           a curses.h file.
++       o   The first curses, in 4BSD, provided a curses.h file.
+ 
+            BSD curses code included curses.h and  unctrl.h  from  an  internal
+            header file curses.ext, where "ext" abbreviated "externs".
+@@ -1491,7 +1489,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-18                       ncurses(3x)
++ncurses 6.5                       2024-05-25                       ncurses(3x)
+ 
                                                                                                                                                
+ 
                                                                                                                                                
+ 
                                                                                                                                                  
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.5-20240519+/doc/html/man/panel.3x.html	2024-04-27 18:38:49.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/panel.3x.html	2024-05-25 22:33:44.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: panel.3x,v 1.63 2024/03/16 15:35:01 tom Exp @
++  * @Id: panel.3x,v 1.65 2024/05/25 21:14:41 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-panel 3x 2024-03-16 ncurses 6.5 Library calls
++panel 3x 2024-05-25 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                  panel 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                  
++
                                                                                                                                                  panel 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                                                  
+ 
                                                                                                                                                  + panel(3x)                        Library calls                       panel(3x)
+ 
+@@ -47,7 +47,7 @@
+ 
+ 
+ 
                                                                                                                                                  NAME
                                                                                                                                                  +-       panel - panel stack extension for curses
++       panel - manage overlapping curses windows
+ 
+ 
+ 
                                                                                                                                                  SYNOPSIS
                                                                                                                                                  +@@ -200,8 +200,8 @@
+        Except as noted, the pan and window parameters must  be  non-null.   If
+        either is null, an error is returned.
+ 
+-       The  move_panel  function uses mvwin(3x), and returns an error if mvwin
+-       returns an error.
++       The  move_panel  function  uses  mvwin(3x),  and  returns  ERR if mvwin
++       returns ERR.
+ 
+ 
+ 
                                                                                                                                                  NOTES
                                                                                                                                                  +@@ -266,7 +266,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                         panel(3x)
++ncurses 6.5                       2024-05-25                         panel(3x)
+ 
                                                                                                                                                  
+ 
                                                                                                                                                  
+ 
                                                                                                                                                    
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.5-20240519+/doc/html/man/terminfo.5.html	2024-05-18 20:27:57.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/man/terminfo.5.html	2024-05-25 22:33:45.000000000 +0000
+@@ -71,7 +71,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This document describes ncurses version 6.5 (patch 20240518).
++       This document describes ncurses version 6.5 (patch 20240525).
+ 
+ 
+

                                                                            terminfo Entry Syntax

                                                                            +Index: doc/html/ncurses-intro.html
+Prereq:  1.57 
+--- ncurses-6.5-20240519+/doc/html/ncurses-intro.html	2022-11-26 19:33:46.000000000 +0000
++++ ncurses-6.5-20240525/doc/html/ncurses-intro.html	2024-05-25 22:29:49.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_add_wch 3x 2024-05-25 ncurses 6.5 Library calls
++curs_add_wch 3x 2024-06-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                            curs_add_wch 3x 2024-05-25 ncurses 6.5 Library calls
                                                                            
++
                                                                            curs_add_wch 3x 2024-06-01 ncurses 6.5 Library calls
                                                                            
+ 
                                                                            + curs_add_wch(3x)                 Library calls                curs_add_wch(3x)
+ 
+@@ -115,10 +115,12 @@
+            curs_variables(3x).
+ 
+        If  wch  is  any other nonprintable character, it is drawn in printable
+-       form using the same convention as wunctrl(3x).
++       form using the same convention as wunctrl(3x).  Calling win_wch(3x)  on
++       the  location of a nonprintable character does not return the character
++       itself, but its wunctrl(3x) representation.
+ 
+-       Calling win_wch(3x) on the location of a  nonprintable  character  does
+-       not return the character itself, but its wunctrl(3x) representation.
++       A cchar_t can be copied from  place  to  place  using  win_wch(3x)  and
++       wadd_wch.
+ 
+ 
+ 
                                                                            wecho_wchar
                                                                            +@@ -177,6 +179,7 @@
+        WACS_UARROW     0x2191    ^         -      arrow pointing up
+        WACS_ULCORNER   0x250c    +         l      upper left-hand corner
+        WACS_URCORNER   0x2510    +         k      upper right-hand corner
++
+        WACS_VLINE      0x2502    |         x      vertical line
+ 
+        The wide-character configuration of ncurses also  defines  symbols  for
+@@ -259,78 +262,75 @@
+        These  functions are described in X/Open Curses, Issue 4.  It specifies
+        no error conditions for them.
+ 
+-       SVr4 curses describes a successful return value  only  as  "an  integer
+-       value other than ERR".
+-
+-       The  defaults specified for forms-drawing characters apply in the POSIX
+-       locale.  X/Open Curses makes it clear that the WACS_ symbols should  be
+-       defined  as  a  pointer  to  cchar_t  data,  e.g., in the discussion of
++       The defaults specified for forms-drawing characters apply in the  POSIX
++       locale.   X/Open Curses makes it clear that the WACS_ symbols should be
++       defined as a pointer to  cchar_t  data,  e.g.,  in  the  discussion  of
+        border_set.  A few implementations are problematic:
+ 
+        o   NetBSD curses defines the symbols as a wchar_t within a cchar_t.
+ 
+-       o   HP-UX 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
++       o   HP-UX  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.
+ 
+-       X/Open  Curses  does  not  specify  symbols for thick- or double-lines.
++       X/Open Curses does not specify  symbols  for  thick-  or  double-lines.
+        SVr4 curses implementations defined their line-drawing symbols in terms
+-       of  intermediate  symbols.   This implementation extends those symbols,
++       of intermediate symbols.  This implementation  extends  those  symbols,
+        providing new definitions which are not in the SVr4 implementations.
+ 
+-       Not all  Unicode-capable  terminals  provide  support  for  VT100-style
+-       alternate  character  sets  (i.e.,  the  acsc  capability),  with their
+-       corresponding line-drawing characters.  X/Open Curses did  not  address
+-       the   aspect  of  integrating  Unicode  with  line-drawing  characters.
+-       Existing implementations of Unix curses (AIX, HP-UX, Solaris) use  only
++       Not  all  Unicode-capable  terminals  provide  support  for VT100-style
++       alternate character  sets  (i.e.,  the  acsc  capability),  with  their
++       corresponding  line-drawing  characters.  X/Open Curses did not address
++       the  aspect  of  integrating  Unicode  with  line-drawing   characters.
++       Existing  implementations of Unix curses (AIX, HP-UX, Solaris) use only
+        the acsc character-mapping to provide this feature.  As a result, those
+        implementations  can  only  use  single-byte  line-drawing  characters.
+-       ncurses  5.3  (2002)  provided a table of Unicode values to solve these
++       ncurses 5.3 (2002) provided a table of Unicode values  to  solve  these
+        problems.  NetBSD curses incorporated that table in 2010.
+ 
+-       In this implementation, the Unicode values  are  used  instead  of  the
++       In  this  implementation,  the  Unicode  values are used instead of the
+        terminal description's acsc mapping as discussed in ncurses(3x) for the
+-       environment variable NCURSES_NO_UTF8_ACS.  In contrast,  for  the  same
++       environment  variable  NCURSES_NO_UTF8_ACS.   In contrast, for the same
+        cases, the line-drawing characters described in addch(3x) will use only
+        the ASCII default values.
+ 
+-       Having Unicode available does not solve all of the problems with  line-
++       Having  Unicode available does not solve all of the problems with line-
+        drawing for curses:
+ 
+-       o   The  closest  Unicode  equivalents to the VT100 graphics S1, S3, S7
+-           and S9 frequently are not displayed at the regular intervals  which
++       o   The closest Unicode equivalents to the VT100 graphics  S1,  S3,  S7
++           and  S9 frequently are not displayed at the regular intervals which
+            the terminal used.
+ 
+-       o   The  lantern  is  a special case.  It originated with the AT&T 4410
+-           terminal in the early 1980s.  There is no accessible  documentation
++       o   The lantern is a special case.  It originated with  the  AT&T  4410
++           terminal  in the early 1980s.  There is no accessible documentation
+            depicting the lantern symbol on the AT&T terminal.
+ 
+            Lacking documentation, most readers assume that a storm lantern was
+            intended.  But there are several possibilities, all with problems.
+ 
+-           Unicode 6.0 (2010) does provide two lantern  symbols:  U+1F383  and
+-           U+1F3EE.   Those  were  not  available  in 2002, and are irrelevant
+-           since they lie outside the BMP and as a result  are  not  generally
++           Unicode  6.0  (2010)  does provide two lantern symbols: U+1F383 and
++           U+1F3EE.  Those were not available  in  2002,  and  are  irrelevant
++           since  they  lie  outside the BMP and as a result are not generally
+            available in terminals.  They are not storm lanterns, in any case.
+ 
+            Most storm lanterns have a tapering glass chimney (to guard against
+            tipping); some have a wire grid protecting the chimney.
+ 
+-           For the tapering appearance,  U+2603 was adequate.   In  use  on  a
++           For  the  tapering  appearance,   U+2603 was adequate.  In use on a
+            terminal, no one can tell what the image represents.  Unicode calls
+            it a snowman.
+ 
+            Others have suggested these alternatives: <section> U+00A7 (section
+-           mark),  <Theta>  U+0398 (theta), <Phi> U+03A6 (phi), <delta> U+03B4
++           mark), <Theta> U+0398 (theta), <Phi> U+03A6 (phi),  <delta>  U+03B4
+            (delta),  U+2327 (x in a rectangle),  U+256C (forms double vertical
+            and horizontal), and  U+2612 (ballot box with x).
+ 
+ 
+ 
                                                                            Complex Characters
                                                                            +-       The  complex  character  type  cchar_t  can  store  more  than one wide
+-       character (wchar_t).  X/Open Curses does not mention this  possibility,
+-       specifying  behavior  only  where  wch  is  a  single character, either
++       The complex character  type  cchar_t  can  store  more  than  one  wide
++       character  (wchar_t).  X/Open Curses does not mention this possibility,
++       specifying behavior only  where  wch  is  a  single  character,  either
+        spacing or non-spacing.
+ 
+        ncurses assumes that wch is constructed using setcchar(3x), and in turn
+@@ -341,10 +341,19 @@
+ 
+        o   holds one non-spacing character.
+ 
+-       In the latter case, ncurses  adds  the  non-spacing  character  to  the
++       In  the  latter  case,  ncurses  adds  the non-spacing character to the
+        active complex character.
+ 
+ 
++
                                                                            HISTORY
                                                                            ++       These functions were initially specified by  X/Open  Curses,  Issue  4.
++       The   System V   Interface  Definition,  Version  4  (1995),  specified
++       functions named waddwch and wechowchar (and the usual variants).  These
++       were later additions to SVr4.x, not appearing in the first SVr4 (1989).
++       They differed from X/Open's wadd_wch and wecho_wchar in that they  each
++       took an argument of type wchar_t instead of cchar_t.
++
++
+ 
                                                                            SEE ALSO
                                                                            +        curs_addch(3x) describes comparable functions of the ncurses library in
+        its non-wide-character configuration.
+@@ -355,7 +364,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                  curs_add_wch(3x)
++ncurses 6.5                       2024-06-01                  curs_add_wch(3x)
+ 
                                                                            
+ 
                                                                            
+ 
+ 
++
                                                                          • HISTORY
                                                                            • 
+ 
                                                                          • SEE ALSO
                                                                            • 
+
                                                                          +
                                                                          +Index: doc/html/man/curs_addch.3x.html +--- ncurses-6.5-20240525+/doc/html/man/curs_addch.3x.html 2024-05-25 22:33:41.000000000 +0000 ++++ ncurses-6.5-20240601/doc/html/man/curs_addch.3x.html 2024-06-01 23:07:15.000000000 +0000 +@@ -28,19 +28,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_addch.3x,v 1.88 2024/05/25 21:13:32 tom Exp @ ++ * @Id: curs_addch.3x,v 1.90 2024/06/01 22:29:08 tom Exp @ + --> + + + + + +-curs_addch 3x 2024-05-25 ncurses 6.5 Library calls ++curs_addch 3x 2024-06-01 ncurses 6.5 Library calls + + + + +-

                                                                          curs_addch 3x 2024-05-25 ncurses 6.5 Library calls

                                                                          ++

                                                                          curs_addch 3x 2024-06-01 ncurses 6.5 Library calls

                                                                          + 
                                                                          + curs_addch(3x)                   Library calls                  curs_addch(3x)
+ 
+@@ -98,16 +98,14 @@
+            curs_variables(3x).
+ 
+        If ch is any other nonprintable character, it  is  drawn  in  printable
+-       form using the same convention as unctrl(3x).
+-
+-       Calling  winch(3x) on the location of a nonprintable character does not
+-       return the character itself, but its unctrl(3x) representation.
+-
+-       The object or expression ch may contain attributes and/or a color  pair
+-       identifier.   (A character with its attributes can be copied from place
+-       to place using winch(3x) and waddch.)  See curs_attr(3x) for values  of
+-       predefined  video  attribute constants that can be usefully "or"ed with
+-       characters.
++       form using the same convention as unctrl(3x).  Calling winch(3x) on the
++       location of a nonprintable character  does  not  return  the  character
++       itself, but its unctrl(3x) representation.
++
++       The  object or expression ch may contain attributes and/or a color pair
++       identifier.  (A  chtype  can  be  copied  from  place  to  place  using
++       winch(3x)  and  waddch.)   See  curs_attr(3x)  for values of predefined
++       constants that can be usefully "or"ed with characters.
+ 
+ 
+

                                                                          wechochar

                                                                          +@@ -184,14 +182,15 @@
+ 
+        The last may be due to different causes:
+ 
+-       o   conversion of a multibyte character to a byte sequence can fail, or
++       o   conversion  of  a  wide character to a multibyte character sequence
++           can fail, or
+ 
+-       o   at  least  one  of  the  bytes  resulting  from  conversion  from a
+-           multibyte sequence cannot be added  to  the  window.   See  section
+-           "PORTABILITY"  below  regarding  the  use  of waddch with multibyte
+-           characters.
++       o   at least one of the bytes resulting from wide character  conversion
++           to  a  multibyte  character sequence cannot be added to the window.
++           See section "PORTABILITY" below regarding the use  of  waddch  with
++           wide characters.
+ 
+-       Functions prefixed with "mv" first perform cursor movement and fail  if
++       Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+@@ -202,18 +201,18 @@
+

                                                                          EXTENSIONS

                                                                          + 
+

                                                                          TABSIZE

                                                                          +-       SVr4  and  other versions of curses implement the TABSIZE variable, but
++       SVr4 and other versions of curses implement the TABSIZE  variable,  but
+        X/Open Curses does not specify it; see curs_variables(3x).
+ 
+ 
+

                                                                          PORTABILITY

                                                                          +-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
++       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+        error conditions for them.
+ 
+-       SVr4  curses  describes  a  successful return value only as "an integer
++       SVr4 curses describes a successful return value  only  as  "an  integer
+        value other than ERR".
+ 
+-       The defaults specified for forms-drawing characters apply in the  POSIX
++       The  defaults specified for forms-drawing characters apply in the POSIX
+        locale.
+ 
+ 
+@@ -222,72 +221,73 @@
+ 
+        Some implementations are problematic.
+ 
+-       o   Solaris  curses, for example, defines the ACS symbols as constants;
++       o   Solaris curses, for example, defines the ACS symbols as  constants;
+            others define them as elements of an array.
+ 
+-           This implementation uses an array, acs_map,  as  did  SVr4  curses.
++           This  implementation  uses  an  array, acs_map, as did SVr4 curses.
+            NetBSD also uses an array, actually named _acs_char, with a #define
+            for compatibility.
+ 
+-       o   HP-UX curses equates some of the  ACS_  symbols  to  the  analogous
+-           WACS_  symbols  as  if  the  ACS_ symbols were wide characters (see
+-           curs_add_wch(3x)).  The  misdefined  symbols  are  the  arrows  and
++       o   HP-UX  curses  equates  some  of  the ACS_ symbols to the analogous
++           WACS_ symbols as if the ACS_  symbols  were  wide  characters  (see
++           curs_add_wch(3x)).   The  misdefined  symbols  are  the  arrows and
+            others that are not used for line drawing.
+ 
+-       o   X/Open  Curses  (Issues  2 through 7) has a typographical error for
+-           the ACS_LANTERN symbol, equating  its  "VT100+  Character"  to  "I"
+-           (capital  I),  while  the  header  files  for SVr4 curses and other
++       o   X/Open Curses (Issues 2 through 7) has a  typographical  error  for
++           the  ACS_LANTERN  symbol,  equating  its  "VT100+ Character" to "I"
++           (capital I), while the header  files  for  SVr4  curses  and  other
+            implementations use "i" (small i).
+ 
+-           None of the terminal descriptions on Unix platforms  use  uppercase
+-           I,  except  for  Solaris  (in  its  terminfo  entry  for screen(1),
+-           apparently based on the X/Open documentation around 1995).  On  the
+-           other  hand,  its gs6300 (AT&T PC6300 with EMOTS Terminal Emulator)
++           None  of  the terminal descriptions on Unix platforms use uppercase
++           I, except  for  Solaris  (in  its  terminfo  entry  for  screen(1),
++           apparently  based on the X/Open documentation around 1995).  On the
++           other hand, its gs6300 (AT&T PC6300 with EMOTS  Terminal  Emulator)
+            description uses lowercase i.
+ 
+-       Some ACS  symbols  (ACS_S3,  ACS_S7,  ACS_LEQUAL,  ACS_GEQUAL,  ACS_PI,
+-       ACS_NEQUAL,  and  ACS_STERLING)  were  not  documented  in any publicly
+-       released System V.  However, many publicly available  terminfo  entries
+-       include  acsc  capabilities in which their key characters (pryz{|}) are
+-       embedded, and a second-hand list of their  character  descriptions  has
+-       come  to light.  The ncurses developers invented ACS-prefixed names for
++       Some  ACS  symbols  (ACS_S3,  ACS_S7,  ACS_LEQUAL,  ACS_GEQUAL, ACS_PI,
++       ACS_NEQUAL, and ACS_STERLING)  were  not  documented  in  any  publicly
++       released  System V.   However, many publicly available terminfo entries
++       include acsc capabilities in which their key characters  (pryz{|})  are
++       embedded,  and  a  second-hand list of their character descriptions has
++       come to light.  The ncurses developers invented ACS-prefixed names  for
+        them.
+ 
+        The displayed values of ACS_ constants depend on
+ 
+        o   the  ncurses  ABI--for  example,  wide-character  versus  non-wide-
+-           character  configurations  (the  former  is  capable  of displaying
++           character configurations  (the  former  is  capable  of  displaying
+            Unicode while the latter is not), and
+ 
+        o   whether the locale uses UTF-8 encoding.
+ 
+-       In certain cases, the  terminal  is  unable  to  display  forms-drawing
+-       characters   except   by   using  UTF-8;  see  the  discussion  of  the
++       In  certain  cases,  the  terminal  is  unable to display forms-drawing
++       characters  except  by  using  UTF-8;  see  the   discussion   of   the
+        NCURSES_NO_UTF8_ACS environment variable in ncurses(3x).
+ 
+ 
+

                                                                          Character Set

                                                                          +-       X/Open Curses assumes that the parameter passed to  waddch  contains  a
+-       single  character.   That  character may have been more than eight bits
+-       wide in an SVr3 or SVr4 implementation, but X/Open  Curses  leaves  the
+-       width  of  a non-wide character code unspecified.  The standard further
+-       does not specify the internal structure of a chtype, though the use  of
+-       bit  operations  to  combine  the  character code with attributes and a
++       X/Open  Curses  assumes  that the parameter passed to waddch contains a
++       single character.  That character may have been more  than  eight  bits
++       wide  in  an  SVr3 or SVr4 implementation, but X/Open Curses leaves the
++       width of a non-wide character code unspecified.  The  standard  further
++       does  not specify the internal structure of a chtype, though the use of
++       bit operations to combine the character  code  with  attributes  and  a
+        color pair identifier into a chtype for passage to waddch is common.  A
+        portable application uses only the macros discussed in curs_attr(3x) to
+        manipulate a chtype.
+ 
+        In ncurses, chtype holds an eight-bit character, but the library allows
+-       a  multibyte character to be passed in a succession of calls to waddch.
+-       Other implementations do not;  a  waddch  call  transmits  exactly  one
+-       character,  which  may  be  rendered  in  one  or more screen locations
+-       depending on whether it is printable (see  unctrl(3x)).   Depending  on
+-       the  locale,  ncurses  inspects the byte passed in each waddch call and
+-       checks whether the latest call continues a multibyte sequence.  When  a
+-       character  is complete, ncurses displays the character and advances the
+-       cursor.  If the calling application interrupts the succession of  bytes
+-       in a multibyte character sequence by changing the current location--for
+-       example, with wmove(3x)--ncurses discards the incomplete character.
++       a multibyte character sequence to be passed via a succession  of  calls
++       to  waddch.   Other  implementations  do  not;  a waddch call transmits
++       exactly one character, which may be rendered  in  one  or  more  screen
++       locations  depending  on  whether  it  is  printable  (see unctrl(3x)).
++       Depending on the locale, ncurses  inspects  the  byte  passed  in  each
++       waddch  call  and  checks whether the latest call continues a multibyte
++       character.   When  a  character  is  complete,  ncurses  displays   the
++       character   and  advances  the  cursor.   If  the  calling  application
++       interrupts the succession of bytes in a multibyte character sequence by
++       changing  the  current  location--for  example, with wmove(3x)--ncurses
++       discards the incomplete character.
+ 
+        For  portability  to  other  implementations,  do  not  rely  upon  the
+        foregoing  behavior.  Check whether a character can be represented as a
+@@ -298,6 +298,12 @@
+        o   If it cannot, use only wadd_wch(3x).
+ 
+ 
++

                                                                          HISTORY

                                                                          ++       The original curses in 4BSD (1980) introduced waddch.
++
++       SVr3 (1987) added wechochar.
++
++
+

                                                                          SEE ALSO

                                                                          +        curs_add_wch(3x) describes comparable functions of the ncurses  library
+        in its wide-character configuration (ncursesw).
+@@ -308,7 +314,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                    curs_addch(3x)
++ncurses 6.5                       2024-06-01                    curs_addch(3x)
+
                                                                          +
                                                                          + + ++
                                                                        • HISTORY
                                                                          • +
                                                                        • SEE ALSO
                                                                          • +
                                                                        +
                                                                        +Index: doc/html/man/curs_addchstr.3x.html +--- ncurses-6.5-20240525+/doc/html/man/curs_addchstr.3x.html 2024-05-11 22:32:32.000000000 +0000 ++++ ncurses-6.5-20240601/doc/html/man/curs_addchstr.3x.html 2024-06-01 23:07:15.000000000 +0000 +@@ -27,19 +27,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_addchstr.3x,v 1.46 2024/05/11 20:39:53 tom Exp @ ++ * @Id: curs_addchstr.3x,v 1.48 2024/06/01 22:29:08 tom Exp @ + --> + + + + + +-curs_addchstr 3x 2024-05-11 ncurses 6.5 Library calls ++curs_addchstr 3x 2024-06-01 ncurses 6.5 Library calls + + + + +-

                                                                        curs_addchstr 3x 2024-05-11 ncurses 6.5 Library calls

                                                                        ++

                                                                        curs_addchstr 3x 2024-06-01 ncurses 6.5 Library calls

                                                                        + 
                                                                        + curs_addchstr(3x)                Library calls               curs_addchstr(3x)
+ 
+@@ -116,7 +116,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-11                 curs_addchstr(3x)
++ncurses 6.5                       2024-06-01                 curs_addchstr(3x)
+
                                                                        +
                                                                        +
                                                                          +Index: doc/html/man/curs_addstr.3x.html +--- ncurses-6.5-20240525+/doc/html/man/curs_addstr.3x.html 2024-05-25 22:33:41.000000000 +0000 ++++ ncurses-6.5-20240601/doc/html/man/curs_addstr.3x.html 2024-06-01 23:07:15.000000000 +0000 +@@ -27,19 +27,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_addstr.3x,v 1.47 2024/05/25 20:45:40 tom Exp @ ++ * @Id: curs_addstr.3x,v 1.49 2024/06/01 22:29:08 tom Exp @ + --> + + + + + +-curs_addstr 3x 2024-05-25 ncurses 6.5 Library calls ++curs_addstr 3x 2024-06-01 ncurses 6.5 Library calls + + + + +-

                                                                          curs_addstr 3x 2024-05-25 ncurses 6.5 Library calls

                                                                          ++

                                                                          curs_addstr 3x 2024-06-01 ncurses 6.5 Library calls

                                                                          + 
                                                                          + curs_addstr(3x)                  Library calls                 curs_addstr(3x)
+ 
+@@ -109,7 +109,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                   curs_addstr(3x)
++ncurses 6.5                       2024-06-01                   curs_addstr(3x)
+
                                                                          +
                                                                          +
                                                                            +Index: doc/html/man/curs_addwstr.3x.html +--- ncurses-6.5-20240525+/doc/html/man/curs_addwstr.3x.html 2024-05-25 22:33:41.000000000 +0000 ++++ ncurses-6.5-20240601/doc/html/man/curs_addwstr.3x.html 2024-06-01 23:07:15.000000000 +0000 +@@ -27,19 +27,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_addwstr.3x,v 1.39 2024/05/25 20:10:58 tom Exp @ ++ * @Id: curs_addwstr.3x,v 1.41 2024/06/01 22:30:17 tom Exp @ + --> + + + + + +-curs_addwstr 3x 2024-05-25 ncurses 6.5 Library calls ++curs_addwstr 3x 2024-06-01 ncurses 6.5 Library calls + + + + +-

                                                                            curs_addwstr 3x 2024-05-25 ncurses 6.5 Library calls

                                                                            ++

                                                                            curs_addwstr 3x 2024-06-01 ncurses 6.5 Library calls

                                                                            + 
                                                                            + curs_addwstr(3x)                 Library calls                curs_addwstr(3x)
+ 
+@@ -87,16 +87,15 @@
+

                                                                            RETURN VALUE

                                                                            +        These functions return OK on success and ERR on failure.
+ 
+-       X/Open  Curses  does not specify any error conditions.  ncurses returns
+-       ERR
++       In ncurses, they return ERR if
+ 
+-       o   if the window pointer is NULL,
++       o   win is NULL,
+ 
+-       o   if the string pointer is NULL, or
++       o   wstr is NULL, or
+ 
+-       o   if an internal wadd_wch(3x) call returns an error.
++       o   an internal wadd_wch(3x) call returns ERR.
+ 
+-       Functions prefixed with "mv" first perform cursor movement and fail  if
++       Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+@@ -109,14 +108,14 @@
+ 
+ 
+

                                                                            SEE ALSO

                                                                            +-       curs_addstr(3x)  describes  comparable functions of the ncurses library
++       curs_addstr(3x) describes comparable functions of the  ncurses  library
+        in its non-wide-character configuration.
+ 
+        curses(3x), curs_add_wch(3x), curs_add_wchstr(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                  curs_addwstr(3x)
++ncurses 6.5                       2024-06-01                  curs_addwstr(3x)
+
                                                                            +
                                                                            +
                                                                              +Index: doc/html/man/curs_getch.3x.html +--- ncurses-6.5-20240525+/doc/html/man/curs_getch.3x.html 2024-05-25 22:33:42.000000000 +0000 ++++ ncurses-6.5-20240601/doc/html/man/curs_getch.3x.html 2024-06-01 23:07:16.000000000 +0000 +@@ -28,19 +28,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_getch.3x,v 1.93 2024/05/25 20:57:17 tom Exp @ ++ * @Id: curs_getch.3x,v 1.95 2024/06/01 22:29:08 tom Exp @ + --> + + + + + +-curs_getch 3x 2024-05-25 ncurses 6.5 Library calls ++curs_getch 3x 2024-06-01 ncurses 6.5 Library calls + + + + +-

                                                                              curs_getch 3x 2024-05-25 ncurses 6.5 Library calls

                                                                              ++

                                                                              curs_getch 3x 2024-06-01 ncurses 6.5 Library calls

                                                                              + 
                                                                              + curs_getch(3x)                   Library calls                  curs_getch(3x)
+ 
+@@ -141,7 +141,7 @@
+        does  not  arrive within the designated time, wgetch returns the prefix
+        character; otherwise, it returns the function key code corresponding to
+        the unique sequence defined by the terminal.  Consequently, a user of a
+-       curses application may experience a delay  after  they  escape  key  is
++       curses application may experience a  delay  after  the  escape  key  is
+        pressed  while curses disambiguates the input; see section "EXTENSIONS"
+        below.  If the window is in "no time-out"  mode,  the  timer  does  not
+        expire;  it  is  an infinite (or very large) value.  See notimeout(3x).
+@@ -320,6 +320,8 @@
+ 
+ 
+

                                                                              NOTES

                                                                              ++       getch, mvgetch, and mvwgetch may be implemented as macros.
++
+        curses discourages assignment of the ESC key to a discrete function  by
+        the programmer because the library requires a delay while it awaits the
+        potential remainder of a terminal escape sequence.
+@@ -359,14 +361,12 @@
+        Historically, the list of key code macros above was influenced  by  the
+        keyboard  of  the AT&T 7300 (also known variously as the "3B1", "Safari
+        4", and "UNIX PC"), a 1985 machine  rich  in  function  keys.   Today's
+-       computer  keyboards  are  based  that of the IBM PC/AT and tend to have
++       computer  keyboards are based on that of the IBM PC/AT and tend to have
+        fewer.  A curses application can expect such a keyboard to transmit key
+        codes   KEY_UP,   KEY_DOWN,  KEY_LEFT,  KEY_RIGHT,  KEY_HOME,  KEY_END,
+        KEY_PPAGE (Page Up), KEY_NPAGE (Page  Down),  KEY_IC  (Insert),  KEY_DC
+        (Delete), and KEY_F(n) for 1 <= n <= 12.
+ 
+-       getch, mvgetch, and mvwgetch may be implemented as macros.
+-
+ 
+

                                                                              EXTENSIONS

                                                                              +        In ncurses, when a window's "no time-out" mode is not set, the ESCDELAY
+@@ -396,10 +396,10 @@
+        curses  implementations,  it  varied depending on whether the operating
+        system's dispatch of a signal to a handler interrupted a  read(2)  call
+        in  progress,  and  also  (in  some  implementations)  whether an input
+-       timeout or non-blocking mode had been set.  Programmers concerned about
+-       portability  should  be  prepared  for  either of two cases: (a) signal
+-       receipt does not interrupt wgetch; or  (b)  signal  receipt  interrupts
+-       wgetch and causes it to return ERR with errno set to EINTR.
++       timeout  or  non-blocking  mode  had  been  set.   A  portable   curses
++       application  prepares  for  two  cases:  (a)  signal  receipt  does not
++       interrupt wgetch; or (b) signal receipt interrupts wgetch and causes it
++       to return ERR with errno set to EINTR.
+ 
+        KEY_MOUSE is mentioned in X/Open Curses, along with a few related term-
+        info capabilities, but no higher-level functions use the feature.   The
+@@ -426,7 +426,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                    curs_getch(3x)
++ncurses 6.5                       2024-06-01                    curs_getch(3x)
+
                                                                              +
                                                                              +
                                                                                +Index: doc/html/man/curs_getstr.3x.html +--- ncurses-6.5-20240525+/doc/html/man/curs_getstr.3x.html 2024-05-25 22:33:42.000000000 +0000 ++++ ncurses-6.5-20240601/doc/html/man/curs_getstr.3x.html 2024-06-01 23:07:16.000000000 +0000 +@@ -27,19 +27,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_getstr.3x,v 1.61 2024/05/25 20:10:58 tom Exp @ ++ * @Id: curs_getstr.3x,v 1.63 2024/06/01 22:29:08 tom Exp @ + --> + + + + + +-curs_getstr 3x 2024-05-25 ncurses 6.5 Library calls ++curs_getstr 3x 2024-06-01 ncurses 6.5 Library calls + + + + +-

                                                                                curs_getstr 3x 2024-05-25 ncurses 6.5 Library calls

                                                                                ++

                                                                                curs_getstr 3x 2024-06-01 ncurses 6.5 Library calls

                                                                                + 
                                                                                + curs_getstr(3x)                  Library calls                 curs_getstr(3x)
+ 
+@@ -242,7 +242,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                   curs_getstr(3x)
++ncurses 6.5                       2024-06-01                   curs_getstr(3x)
+
                                                                                +
                                                                                +
                                                                                  +Index: doc/html/man/curs_inch.3x.html +--- ncurses-6.5-20240525+/doc/html/man/curs_inch.3x.html 2024-05-25 22:33:42.000000000 +0000 ++++ ncurses-6.5-20240601/doc/html/man/curs_inch.3x.html 2024-06-01 23:07:16.000000000 +0000 +@@ -28,19 +28,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_inch.3x,v 1.56 2024/05/25 20:10:58 tom Exp @ ++ * @Id: curs_inch.3x,v 1.58 2024/06/01 22:29:08 tom Exp @ + --> + + + + + +-curs_inch 3x 2024-05-25 ncurses 6.5 Library calls ++curs_inch 3x 2024-06-01 ncurses 6.5 Library calls + + + + +-

                                                                                  curs_inch 3x 2024-05-25 ncurses 6.5 Library calls

                                                                                  ++

                                                                                  curs_inch 3x 2024-06-01 ncurses 6.5 Library calls

                                                                                  + 
                                                                                  + curs_inch(3x)                    Library calls                   curs_inch(3x)
+ 
+@@ -125,7 +125,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                     curs_inch(3x)
++ncurses 6.5                       2024-06-01                     curs_inch(3x)
+
                                                                                  +
                                                                                  +
                                                                                    +Index: doc/html/man/curs_initscr.3x.html +--- ncurses-6.5-20240525+/doc/html/man/curs_initscr.3x.html 2024-05-25 22:33:42.000000000 +0000 ++++ ncurses-6.5-20240601/doc/html/man/curs_initscr.3x.html 2024-06-01 23:07:16.000000000 +0000 +@@ -27,19 +27,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_initscr.3x,v 1.71 2024/05/25 20:10:58 tom Exp @ ++ * @Id: curs_initscr.3x,v 1.73 2024/06/01 22:38:43 tom Exp @ + --> + + + + + +-curs_initscr 3x 2024-05-25 ncurses 6.5 Library calls ++curs_initscr 3x 2024-06-01 ncurses 6.5 Library calls + + + + +-

                                                                                    curs_initscr 3x 2024-05-25 ncurses 6.5 Library calls

                                                                                    ++

                                                                                    curs_initscr 3x 2024-06-01 ncurses 6.5 Library calls

                                                                                    + 
                                                                                    + curs_initscr(3x)                 Library calls                curs_initscr(3x)
+ 
+@@ -286,11 +286,15 @@
+        SIGWINCH
+             This handles the window-size changes which  were  ignored  in  the
+             standardization   efforts.    The  handler  sets  a  (signal-safe)
+-            variable which is later tested in wgetch(3x).  If keypad has  been
+-            enabled  for  the  corresponding  window,  wgetch  returns the key
+-            symbol KEY_RESIZE.  At the same time, wgetch calls  resizeterm  to
+-            adjust  the  standard screen stdscr, and update other data such as
+-            LINES and COLS.
++            variable that is later tested by wgetch(3x) and wget_wch(3x):
++
++            o   wgetch returns the key code KEY_RESIZE.
++
++            o   wget_wch returns KEY_CODE_YES and sets its  wch  parameter  to
++                KEY_RESIZE.
++
++            At  the same time, ncurses calls resizeterm to adjust the standard
++            screen stdscr, and update other data such as LINES and COLS.
+ 
+ 
+

                                                                                    SEE ALSO

                                                                                    +@@ -299,7 +303,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                  curs_initscr(3x)
++ncurses 6.5                       2024-06-01                  curs_initscr(3x)
+
                                                                                    +
                                                                                    +
                                                                                      +Index: doc/html/man/curs_inopts.3x.html +--- ncurses-6.5-20240525+/doc/html/man/curs_inopts.3x.html 2024-05-25 22:42:50.000000000 +0000 ++++ ncurses-6.5-20240601/doc/html/man/curs_inopts.3x.html 2024-06-01 23:07:16.000000000 +0000 +@@ -28,19 +28,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_inopts.3x,v 1.68 2024/05/25 20:41:48 tom Exp @ ++ * @Id: curs_inopts.3x,v 1.70 2024/06/01 22:28:41 tom Exp @ + --> + + + + + +-curs_inopts 3x 2024-05-25 ncurses 6.5 Library calls ++curs_inopts 3x 2024-06-01 ncurses 6.5 Library calls + + + + +-

                                                                                      curs_inopts 3x 2024-05-25 ncurses 6.5 Library calls

                                                                                      ++

                                                                                      curs_inopts 3x 2024-06-01 ncurses 6.5 Library calls

                                                                                      + 
                                                                                      + curs_inopts(3x)                  Library calls                 curs_inopts(3x)
+ 
+@@ -220,8 +220,8 @@
+        control   characters  uninterpreted  to  the  application,  instead  of
+        generating a signal or  acting  on  I/O  flow.   The  behavior  of  the
+        terminal's   "Break"   key   (if   any)   depends  on  terminal  driver
+-       configuration parameters that curses does not handle.  noraw exits  raw
+-       mode.
++       configuration parameters that curses does not  handle.   noraw  returns
++       the terminal to normal ("cooked") mode.
+ 
+ 
+

                                                                                      timeout, wtimeout

                                                                                      +@@ -326,27 +326,26 @@
+        tic(1), then ncurses also defines keys for the capabilities whose names
+        begin  with  "k".  Corresponding key codes are generated and (depending
+        on previous  loads  of  terminal  descriptions)  may  differ  from  one
+-       execution  of  a  program  to  the  next.   The  generated keycodes are
+-       recognized by the keyname(3x)  function  (which  then  returns  a  name
+-       beginning  with  "k"  denoting the terminfo capability name rather than
+-       "K", used for curses key names).  On the other hand, an application can
+-       use  define_key(3x)  to  bind  a  specific  key  to  a  string  of  the
+-       programmer's choice.  This feature enables an application to check  for
+-       an  extended  capability's presence with tigetstr(3x), and reassign the
+-       keycode to match its own needs.
++       execution  of  a  program  to  the  next.   The generated key codes are
++       recognized by keyname(3x), which then returns a name beginning with "k"
++       denoting  the terminfo capability name rather than "K", used for curses
++       key names.  On the other hand, an application can use define_key(3x) to
++       bind  a  specific  key  to  a  string of the programmer's choice.  This
++       feature  enables  an  application  to  check  for  its  presence   with
++       tigetstr(3x), and reassign the key code to match its own needs.
+ 
+        Low-level applications can use tigetstr(3x) to obtain the definition of
+-       any  string  capability.   curses  applications use the input character
++       any string capability.  curses applications  use  the  input  character
+        reading function to obtain key codes from input and rely upon the order
+-       in  which  the string capabilities are loaded.  Multiple key capability
+-       strings can have the  same  value,  but  the  input  character  reading
+-       function  can  report  only  one key code.  Most curses implementations
+-       (including ncurses) load key definitions in the order  they  appear  in
++       in which the string capabilities are loaded.  Multiple  key  capability
++       strings  can  have  the  same  value,  but  the input character reading
++       function can report only one key  code.   Most  curses  implementations
++       (including  ncurses)  load  key definitions in the order they appear in
+        the strfnames array of string capability names; see term_variables(3x).
+-       The last capability read using a particular definition  determines  the
+-       key  code  to  be  reported.   In ncurses, extended capabilities can be
+-       interpreted as key definitions.  These are loaded after the  predefined
+-       keys,  and  if  a capability's value is the same as a previously loaded
++       The  last  capability read using a particular definition determines the
++       key code to be reported.  In  ncurses,  extended  capabilities  can  be
++       interpreted  as key definitions.  These are loaded after the predefined
++       keys, and if a capability's value is the same as  a  previously  loaded
+        key definition, the later definition is the one used.
+ 
+ 
+@@ -357,31 +356,31 @@
+        support it with cbreak, nocbreak, intrflush, keypad, meta, nodelay, and
+        typeahead.
+ 
+-       SVr3 (1987) added halfdelay,  notimeout,  and  wtimeout.   qiflush  and
+-       noqiflush  appeared in SVr3.1 (1987), at which point intrflush became a
+-       wrapper for either of these functions, depending on the  value  of  its
++       SVr3  (1987)  added  halfdelay,  notimeout,  and wtimeout.  qiflush and
++       noqiflush appeared in SVr3.1 (1987), at which point intrflush became  a
++       wrapper  for  either  of these functions, depending on the value of its
+        Boolean argument.  SVr3.1 also added timeout.
+ 
+        ncurses 6.5 (2024) introduced is_cbreak, is_echo, is_nl, and is_raw.
+ 
+-       Formerly,  ncurses  used  nl  and  nonl  to  control  the conversion of
+-       newlines to carriage return/line feed  on  output  as  well  as  input.
+-       X/Open  Curses  documents  the  use  of these functions only for input.
+-       This difference arose from converting the pcurses source (1986),  which
+-       used  ioctl(2)  calls  and  the sgttyb structure, to termios (the POSIX
+-       terminal API).  In the former, both input and  output  were  controlled
++       Formerly, ncurses used  nl  and  nonl  to  control  the  conversion  of
++       newlines  to  carriage  return/line  feed  on  output as well as input.
++       X/Open Curses documents the use of  these  functions  only  for  input.
++       This  difference arose from converting the pcurses source (1986), which
++       used ioctl(2) calls and the sgttyb structure,  to  termios  (the  POSIX
++       terminal  API).   In  the former, both input and output were controlled
+        via a single option "CRMOD", while the latter separates these features.
+-       Because that conversion interferes with  output  optimization,  ncurses
++       Because  that  conversion  interferes with output optimization, ncurses
+        6.2 (2020) amended nl and nonl to eliminate their effect on output.
+ 
+ 
+

                                                                                      SEE ALSO

                                                                                      +-       curses(3x),     curs_getch(3x),     curs_initscr(3x),    curs_util(3x),
++       curses(3x),    curs_getch(3x),     curs_initscr(3x),     curs_util(3x),
+        define_key(3x), term_variables(3x), termios(3)
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                   curs_inopts(3x)
++ncurses 6.5                       2024-06-01                   curs_inopts(3x)
+
                                                                                      +
                                                                                      +
                                                                                        +Index: doc/html/man/curs_instr.3x.html +--- ncurses-6.5-20240525+/doc/html/man/curs_instr.3x.html 2024-05-25 22:33:42.000000000 +0000 ++++ ncurses-6.5-20240601/doc/html/man/curs_instr.3x.html 2024-06-01 23:07:16.000000000 +0000 +@@ -27,19 +27,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_instr.3x,v 1.53 2024/05/25 20:10:58 tom Exp @ ++ * @Id: curs_instr.3x,v 1.55 2024/06/01 22:29:08 tom Exp @ + --> + + + + + +-curs_instr 3x 2024-05-25 ncurses 6.5 Library calls ++curs_instr 3x 2024-06-01 ncurses 6.5 Library calls + + + + +-

                                                                                        curs_instr 3x 2024-05-25 ncurses 6.5 Library calls

                                                                                        ++

                                                                                        curs_instr 3x 2024-06-01 ncurses 6.5 Library calls

                                                                                        + 
                                                                                        + curs_instr(3x)                   Library calls                  curs_instr(3x)
+ 
+@@ -116,7 +116,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                    curs_instr(3x)
++ncurses 6.5                       2024-06-01                    curs_instr(3x)
+
                                                                                        +
                                                                                        +
                                                                                          +Index: doc/html/man/curs_scr_dump.3x.html +--- ncurses-6.5-20240525+/doc/html/man/curs_scr_dump.3x.html 2024-04-27 18:38:47.000000000 +0000 ++++ ncurses-6.5-20240601/doc/html/man/curs_scr_dump.3x.html 2024-06-01 23:07:17.000000000 +0000 +@@ -27,19 +27,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_scr_dump.3x,v 1.43 2024/04/20 18:54:36 tom Exp @ ++ * @Id: curs_scr_dump.3x,v 1.45 2024/06/01 22:29:45 tom Exp @ + --> + + + + + +-curs_scr_dump 3x 2024-04-20 ncurses 6.5 Library calls ++curs_scr_dump 3x 2024-06-01 ncurses 6.5 Library calls + + + + +-

                                                                                          curs_scr_dump 3x 2024-04-20 ncurses 6.5 Library calls

                                                                                          ++

                                                                                          curs_scr_dump 3x 2024-06-01 ncurses 6.5 Library calls

                                                                                          + 
                                                                                          + curs_scr_dump(3x)                Library calls               curs_scr_dump(3x)
+ 
+@@ -54,10 +54,10 @@
+

                                                                                          SYNOPSIS

                                                                                          +        #include <curses.h>
+ 
+-       int scr_dump(const char *filename);
+-       int scr_restore(const char *filename);
+-       int scr_init(const char *filename);
+-       int scr_set(const char *filename);
++       int scr_dump(const char * filename);
++       int scr_restore(const char * filename);
++       int scr_init(const char * filename);
++       int scr_set(const char * filename);
+ 
+ 
+

                                                                                          DESCRIPTION

                                                                                          +@@ -73,65 +73,85 @@
+ 
+ 
+

                                                                                          scr_restore

                                                                                          +-       scr_restore updates the virtual  screen  to  contain  the  contents  of
+-       filename  (if  it  was  validly  written with scr_dump).  No refresh is
+-       performed;  after  performing  any  further   desired   updates,   call
+-       doupdate(3x) or similar.
++       scr_restore updates  the  virtual  screen  to  match  the  contents  of
++       filename (if validly written with scr_dump).  curses does not perform a
++       refresh;  after  making  any  desired  changes,  call  doupdate(3x)  or
++       similar.
+ 
+ 
+

                                                                                          scr_init

                                                                                          +        scr_init  reads filename, using it to initialize curses data structures
+-       describing the state of the terminal screen.  If these data are  valid,
+-       curses  bases  its next update of the screen on this information rather
+-       than clearing it and starting from scratch.
++       describing the state of  the  terminal  screen.   curses  then,  if  it
++       decides  the  terminal  state  is  valid,  bases its next update of the
++       screen on this information rather than clearing it  and  starting  from
++       scratch.
+ 
+-       The data fail the validity check
++       curses  regards  the terminal being in an invalid state for computation
++       of updates based on the contents of filename if
+ 
+-       o   if the terminal employs terminfo capabilities exit_ca_mode  (rmcup)
+-           or non_rev_rmcup (nrrmc) are defined, or
++       o   the terminal type supports the terminfo  capabilities  exit_ca_mode
++           (rmcup) or non_rev_rmcup (nrrmc), or
+ 
+-       o   if  curses  knows  that  the terminal has been written to since the
++       o   curses  knows  that  the  terminal  has  been  written to since the
+            preceding scr_dump call.
+ 
+-       scr_init could be used after initscr(3x)  or  system(3)  to  share  the
+-       screen with another process that has done a scr_dump after endwin(3x).
++       Either of the foregoing conditions means that curses cannot assume that
++       the  terminal's  contents  match their representation in filename.  The
++       former is due to  terminal  features  (such  as  xterm(1)'s  "alternate
++       screen")  that  couple  cursor-positioning  mode  with a local cache of
++       screen contents.  curses cannot know  whether  terminal  is  displaying
++       from that local cache at the time the application calls scr_init, so it
++       makes a pessimistic assumption that a  full  redraw  is  required;  see
++       subsection "Cursor Motions" of terminfo(5).
++
++       scr_init  could  be  used  after  initscr(3x) or system(3) to share the
++       screen with another process that has done a scr_dump after  endwin(3x).
++       An   application  that  supports  suspending  its  state  on  exit  and
++       subsequent resumption upon  later  execution  might  use  scr_dump  and
++       scr_init thus.
+ 
+ 
+

                                                                                          scr_set

                                                                                          +-       The  scr_set  routine is a combination of scr_restore and scr_init.  It
+-       tells the program that the information in filename 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.
++       scr_set  combines  scr_restore and scr_init, synchronizing the contents
++       of filename with the virtual screen.  It can be regarded  as  a  screen
++       inheritance function; consider a real-time screen-sharing application.
+ 
+ 
+

                                                                                          RETURN VALUE

                                                                                          +        These functions return OK on success and ERR on failure.
+ 
+-       X/Open defines no failure conditions.   In  this  implementation,  each
+-       function fails if it cannot open filename.
++       In  ncurses,  each  function  returns  ERR  if it cannot open filename.
++       scr_init, scr_restore, and  scr_set  return  ERR  if  the  contents  of
++       filename are invalid.
+ 
+ 
+

                                                                                          NOTES

                                                                                          +-       scr_init, scr_set, and scr_restore may be macros.
++       scr_init, scr_restore, and scr_set may be implemented as macros.
+ 
+ 
+

                                                                                          PORTABILITY

                                                                                          +-       X/Open Curses, Issue 4 describes these functions.
++       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
++       error conditions for them.
+ 
+        SVr4 omitted the const qualifiers.
+ 
+-       SVr4  documentation  describes scr_init such that the dump data is also
+-       considered invalid "if the time-stamp of the tty is old" but  does  not
++       SVr4 documentation describes scr_init such that the dump data  is  also
++       considered  invalid  "if the time-stamp of the tty is old" but does not
+        define "old".
+ 
+ 
++

                                                                                          HISTORY

                                                                                          ++       SVr3 (1987) introduced scr_dump,  scr_init,  and  scr_restore.   SVr3.1
++       added scr_set.
++
++
+

                                                                                          SEE ALSO

                                                                                          +        curses(3x),    curs_initscr(3x),    curs_refresh(3x),    curs_util(3x),
+-       system(3), scr_dump(5)
++       system(3), scr_dump(5), terminfo(5)
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                 curs_scr_dump(3x)
++ncurses 6.5                       2024-06-01                 curs_scr_dump(3x)
+
                                                                                          +
                                                                                          + +
                                                                                          +Index: doc/html/man/curs_terminfo.3x.html +--- ncurses-6.5-20240525+/doc/html/man/curs_terminfo.3x.html 2024-05-25 22:33:43.000000000 +0000 ++++ ncurses-6.5-20240601/doc/html/man/curs_terminfo.3x.html 2024-06-01 23:07:17.000000000 +0000 +@@ -28,19 +28,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_terminfo.3x,v 1.138 2024/05/25 21:02:40 tom Exp @ ++ * @Id: curs_terminfo.3x,v 1.140 2024/06/01 22:29:08 tom Exp @ + --> + + + + + +-curs_terminfo 3x 2024-05-25 ncurses 6.5 Library calls ++curs_terminfo 3x 2024-06-01 ncurses 6.5 Library calls + + + + +-

                                                                                          curs_terminfo 3x 2024-05-25 ncurses 6.5 Library calls

                                                                                          ++

                                                                                          curs_terminfo 3x 2024-06-01 ncurses 6.5 Library calls

                                                                                          + 
                                                                                          + curs_terminfo(3x)                Library calls               curs_terminfo(3x)
+ 
+@@ -660,7 +660,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                 curs_terminfo(3x)
++ncurses 6.5                       2024-06-01                 curs_terminfo(3x)
+
                                                                                          +
                                                                                          +
                                                                                            +Index: doc/html/man/curs_util.3x.html +--- ncurses-6.5-20240525+/doc/html/man/curs_util.3x.html 2024-05-25 22:33:43.000000000 +0000 ++++ ncurses-6.5-20240601/doc/html/man/curs_util.3x.html 2024-06-01 23:07:17.000000000 +0000 +@@ -28,19 +28,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_util.3x,v 1.104 2024/05/25 20:10:58 tom Exp @ ++ * @Id: curs_util.3x,v 1.106 2024/06/01 22:28:18 tom Exp @ + --> + + + + + +-curs_util 3x 2024-05-25 ncurses 6.5 Library calls ++curs_util 3x 2024-06-01 ncurses 6.5 Library calls + + + + +-

                                                                                            curs_util 3x 2024-05-25 ncurses 6.5 Library calls

                                                                                            ++

                                                                                            curs_util 3x 2024-06-01 ncurses 6.5 Library calls

                                                                                            + 
                                                                                            + curs_util(3x)                    Library calls                   curs_util(3x)
+ 
+@@ -121,7 +121,7 @@
+            implementations return rather than null.
+ 
+        The   corresponding  key_name  returns  a  multibyte  character  string
+-       corresponding  to  the  wide-character  value  w.   The  two  functions
++       corresponding to  the  wide-character  value  wc.   The  two  functions
+        (keyname and key_name) do not return the same set of strings:
+ 
+        o   keyname returns null where key_name would display a meta character.
+@@ -287,13 +287,13 @@
+

                                                                                            keyname

                                                                                            +        The keyname function  may  return  the  names  of  user-defined  string
+        capabilities  which are defined in the terminfo entry via the -x option
+-       of tic.  This implementation automatically assigns at run-time keycodes
+-       to  user-defined  strings  which begin with "k".  The keycodes start at
+-       KEY_MAX, but are not guaranteed to be the same value for different runs
+-       because  user-defined  codes  are merged from all terminal descriptions
+-       which have been loaded.  The use_extended_names(3x)  function  controls
+-       whether  this  data  is loaded when the terminal description is read by
+-       the library.
++       of tic.  This implementation  automatically  assigns  at  run-time  key
++       codes  to  user-defined  strings  which  begin with "k".  The key codes
++       start at KEY_MAX, but are not guaranteed  to  be  the  same  value  for
++       different  runs because user-defined codes are merged from all terminal
++       descriptions  which  have  been  loaded.   The   use_extended_names(3x)
++       function  controls  whether  this  data  is  loaded  when  the terminal
++       description is read by the library.
+ 
+ 
+

                                                                                            nofilter, use_tioctl

                                                                                            +@@ -390,7 +390,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                     curs_util(3x)
++ncurses 6.5                       2024-06-01                     curs_util(3x)
+
                                                                                            +
                                                                                            +
                                                                                              +Index: doc/html/man/curs_window.3x.html +--- ncurses-6.5-20240525+/doc/html/man/curs_window.3x.html 2024-05-25 22:33:43.000000000 +0000 ++++ ncurses-6.5-20240601/doc/html/man/curs_window.3x.html 2024-06-01 23:07:17.000000000 +0000 +@@ -27,19 +27,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_window.3x,v 1.50 2024/05/25 20:43:47 tom Exp @ ++ * @Id: curs_window.3x,v 1.52 2024/06/01 22:29:08 tom Exp @ + --> + + + + + +-curs_window 3x 2024-05-25 ncurses 6.5 Library calls ++curs_window 3x 2024-06-01 ncurses 6.5 Library calls + + + + +-

                                                                                              curs_window 3x 2024-05-25 ncurses 6.5 Library calls

                                                                                              ++

                                                                                              curs_window 3x 2024-06-01 ncurses 6.5 Library calls

                                                                                              + 
                                                                                              + curs_window(3x)                  Library calls                 curs_window(3x)
+ 
+@@ -248,7 +248,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                   curs_window(3x)
++ncurses 6.5                       2024-06-01                   curs_window(3x)
+
                                                                                              +
                                                                                              +
                                                                                                +Index: doc/html/man/ncurses.3x.html +--- ncurses-6.5-20240525+/doc/html/man/ncurses.3x.html 2024-05-25 22:33:44.000000000 +0000 ++++ ncurses-6.5-20240601/doc/html/man/ncurses.3x.html 2024-06-01 23:07:19.000000000 +0000 +@@ -28,19 +28,19 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: ncurses.3x,v 1.219 2024/05/25 20:57:45 tom Exp @ ++ * @Id: ncurses.3x,v 1.221 2024/06/01 22:29:08 tom Exp @ + --> + + + + + +-ncurses 3x 2024-05-25 ncurses 6.5 Library calls ++ncurses 3x 2024-06-01 ncurses 6.5 Library calls + + + + +-

                                                                                                ncurses 3x 2024-05-25 ncurses 6.5 Library calls

                                                                                                ++

                                                                                                ncurses 3x 2024-06-01 ncurses 6.5 Library calls

                                                                                                + 
                                                                                                + ncurses(3x)                      Library calls                     ncurses(3x)
+ 
+@@ -61,7 +61,7 @@
+        terminals  with  output  optimized to minimize screen updates.  ncurses
+        replaces the curses libraries from System V Release 4 Unix ("SVr4") and
+        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
+-       document describes ncurses version 6.5 (patch 20240525).
++       document describes ncurses version 6.5 (patch 20240601).
+ 
+        ncurses permits control of the terminal screen's contents;  abstraction
+        and  subdivision thereof with windows and pads; acquisition of keyboard
+@@ -157,7 +157,7 @@
+        Functions permit manipulation of a window and  the  cursor  identifying
+        the  cell  within  it  at  which  the next output operation will occur.
+        Among those, the most basic are move(3x) and addch(3x): these place the
+-       cursor and write a character to stdscr, respectively.
++       cursor within and write a character to stdscr, respectively.
+ 
+        Frequent changes to the terminal screen can cause unpleasant flicker or
+        inefficient use of the communication channel to the  device,  so  as  a
+@@ -232,7 +232,7 @@
+        Four functions prefixed with "p" require a pad argument.
+ 
+        In  function  synopses,  ncurses man pages apply the following names to
+-       parameters.
++       parameters.  We introduce the character types in the next subsection.
+ 
+                        bf    a bool (TRUE or FALSE)
+                        c     a char or int
+@@ -264,13 +264,27 @@
+ 
+        ncursesw  is the library in its  "wide"  configuration,  which  handles
+                  character encodings requiring a larger data type than char (a
+-                 byte-sized type) can represent.  It adds about one third more
+-                 calls  using  additional  data  types  that  can  store  such
+-                 multibyte characters.
++                 byte-sized  type)  can  represent.   It  provides  additional
++                 functions that complement those in the non-wide library where
++                 the size of the underlying character type is significant.   A
++                 somewhat  regular  naming convention relates many of the wide
++                 variants to their non-wide  counterparts;  where  a  non-wide
++                 function  name contains "ch" or "str", prefix it with "_w" to
++                 obtain the wide counterpart.   For  example,  waddch  becomes
++                 wadd_wch.   (Exceptions  that  add only "w" comprise addwstr,
++                 inwstr, and their variants.)
++
++                 This convention is inapplicable  to  some  non-wide  function
++                 names,  so  other  transformations  are  used  for  the  wide
++                 configuration:  the  window  background  management  function
++                 "bkgd"   becomes  "bkgrnd";  the  window  border-drawing  and
++                 -clearing functions are suffixed with "_set";  and  character
++                 attribute   manipulation   functions   like  "attron"  become
++                 "attr_on".
+ 
+                  cchar_t  corresponds to the non-wide configuration's  chtype.
+-                          It  always  a structure type, because it stores more
+-                          data than  fit  into  a  standard  scalar  type.   A
++                          It  is  a  structure  type  because it requires more
++                          storage than fits into a standard  scalar  type.   A
+                           character  code  may not be representable as a char,
+                           and moreover more than one character  may  occupy  a
+                           cell  (as  with  accent marks and other diacritics).
+@@ -303,24 +317,6 @@
+                           analogously to the int-sized character  manipulation
+                           functions of ISO C and its constant EOF.
+ 
+-                 The   wide   library   provides   additional  functions  that
+-                 complement those in the non-wide library where  the  size  of
+-                 the  underlying  character  type  is significant.  A somewhat
+-                 regular naming convention relates many of the  wide  variants
+-                 to  their  non-wide  counterparts;  where a non-wide function
+-                 name contains "ch" or "str", prefix it with  "_w"  to  obtain
+-                 the  wide counterpart.  For example, waddch becomes wadd_wch.
+-                 (Exceptions that add only "w" comprise addwstr,  inwstr,  and
+-                 their variants.)
+-
+-                 This  convention  is  inapplicable  to some non-wide function
+-                 names,  so  other  transformations  are  used  for  the  wide
+-                 configuration:  the  window  background  management  function
+-                 "bkgd"  becomes  "bkgrnd";  the  window  border-drawing   and
+-                 -clearing  functions  are suffixed with "_set"; and character
+-                 attribute  manipulation  functions   like   "attron"   become
+-                 "attr_on".
+-
+ 
+

                                                                                                Function Name Index

                                                                                                +        The following table lists the curses functions provided in the non-wide
+@@ -382,11 +378,11 @@
+                     delch                    curs_delch(3x)
+                     deleteln                 curs_deleteln(3x)
+                     delscreen                curs_initscr(3x)
+-
+                     delwin                   curs_window(3x)
+                     derwin                   curs_window(3x)
+                     doupdate                 curs_refresh(3x)
+                     dupwin                   curs_window(3x)
++
+                     echo                     curs_inopts(3x)
+                     echo_wchar               curs_add_wch(3x)
+                     echochar                 curs_addch(3x)
+@@ -449,11 +445,11 @@
+                     inchstr                  curs_inchstr(3x)
+                     init_color               curs_color(3x)
+                     init_extended_color      curs_color(3x)*
+-
+                     init_extended_pair       curs_color(3x)*
+                     init_pair                curs_color(3x)
+                     initscr                  curs_initscr(3x)
+                     innstr                   curs_instr(3x)
++
+                     innwstr                  curs_inwstr(3x)
+                     ins_nwstr                curs_ins_wstr(3x)
+                     ins_wch                  curs_ins_wch(3x)
+@@ -513,14 +509,14 @@
+                     mvaddstr                 curs_addstr(3x)
+                     mvaddwstr                curs_addwstr(3x)
+                     mvchgat                  curs_attr(3x)
+-                    mvcur                    curs_terminfo(3x)
++                    mvcur                    curs_kernel(3x)
+                     mvdelch                  curs_delch(3x)
+                     mvderwin                 curs_window(3x)
+-
+                     mvget_wch                curs_get_wch(3x)
+                     mvget_wstr               curs_get_wstr(3x)
+                     mvgetch                  curs_getch(3x)
+                     mvgetn_wstr              curs_get_wstr(3x)
++
+                     mvgetnstr                curs_getstr(3x)
+                     mvgetstr                 curs_getstr(3x)
+                     mvhline                  curs_border(3x)
+@@ -583,11 +579,11 @@
+                     mvwinstr                 curs_instr(3x)
+                     mvwinwstr                curs_inwstr(3x)
+                     mvwprintw                curs_printw(3x)
+-
+                     mvwscanw                 curs_scanw(3x)
+                     mvwvline                 curs_border(3x)
+                     mvwvline_set             curs_border_set(3x)
+                     napms                    curs_kernel(3x)
++
+                     newpad                   curs_pad(3x)
+                     newterm                  curs_initscr(3x)
+                     newwin                   curs_window(3x)
+@@ -650,11 +646,11 @@
+                     slk_color                curs_slk(3x)
+                     slk_init                 curs_slk(3x)
+                     slk_label                curs_slk(3x)
+-
+                     slk_noutrefresh          curs_slk(3x)
+                     slk_refresh              curs_slk(3x)
+                     slk_restore              curs_slk(3x)
+                     slk_set                  curs_slk(3x)
++
+                     slk_touch                curs_slk(3x)
+                     slk_wset                 curs_slk(3x)
+                     standend                 curs_attr(3x)
+@@ -717,11 +713,11 @@
+                     waddnwstr                curs_addwstr(3x)
+                     waddstr                  curs_addstr(3x)
+                     waddwstr                 curs_addwstr(3x)
+-
+                     wattr_get                curs_attr(3x)
+                     wattr_off                curs_attr(3x)
+                     wattr_on                 curs_attr(3x)
+                     wattr_set                curs_attr(3x)
++
+                     wattroff                 curs_attr(3x)
+                     wattron                  curs_attr(3x)
+                     wattrset                 curs_attr(3x)
+@@ -784,11 +780,11 @@
+                     wscrl                    curs_scroll(3x)
+                     wsetscrreg               curs_outopts(3x)
+                     wstandend                curs_attr(3x)
+-
+                     wstandout                curs_attr(3x)
+                     wsyncdown                curs_window(3x)
+                     wsyncup                  curs_window(3x)
+                     wtimeout                 curs_inopts(3x)
++
+                     wtouchln                 curs_touch(3x)
+                     wunctrl                  curs_util(3x)
+                     wvline                   curs_border(3x)
+@@ -833,9 +829,9 @@
+        terminfo entries changes to the value of this variable.  Very few term-
+        info entries provide this feature.
+ 
+-       Because this name is also used in development environments to represent
+-       the C compiler's name, ncurses ignores its  value  if  it  is  not  one
+-       character in length.
++       Because this name is also used in development environments to store the
++       C compiler's name, ncurses ignores its value if it is not one character
++       in length.
+ 
+ 
+

                                                                                                COLUMNS

                                                                                                +@@ -1489,7 +1485,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                       ncurses(3x)
++ncurses 6.5                       2024-06-01                       ncurses(3x)
+
                                                                                                +
                                                                                                +
                                                                                                  +Index: doc/html/man/terminfo.5.html +--- ncurses-6.5-20240525+/doc/html/man/terminfo.5.html 2024-05-25 22:33:45.000000000 +0000 ++++ ncurses-6.5-20240601/doc/html/man/terminfo.5.html 2024-06-01 23:07:19.000000000 +0000 +@@ -71,7 +71,7 @@ + have, by specifying how to perform screen operations, and by specifying + padding requirements and initialization sequences. + +- This document describes ncurses version 6.5 (patch 20240525). ++ This document describes ncurses version 6.5 (patch 20240601). + + +

                                                                                                  terminfo Entry Syntax

                                                                                                  +Index: doc/ncurses-intro.doc
+--- ncurses-6.5-20240525+/doc/ncurses-intro.doc	2022-12-31 20:38:47.000000000 +0000
++++ ncurses-6.5-20240601/doc/ncurses-intro.doc	2024-06-01 23:15:23.000000000 +0000
+@@ -153,9 +153,8 @@
+    source-code  or  documentation;  the  tic and infocmp programs are the
+    exceptions.
+ 
+-   System  V  Release  3  (System  III  UNIX)  from  Bell Labs featured a
+-   rewritten and much-improved curses library, along with the tic program
+-   (late 1986).
++   System   V   Release  3  from  Bell  Labs  featured  a  rewritten  and
++   much-improved curses library, along with the tic program (late 1986).
+ 
+    To  recap,  terminfo  is  based  on  Berkeley's  termcap database, but
+    contains  a  number  of  improvements  and  extensions.  Parameterized
+Index: man/curs_add_wch.3x
+Prereq:  1.65 
+--- ncurses-6.5-20240525+/man/curs_add_wch.3x	2024-05-25 21:13:15.000000000 +0000
++++ ncurses-6.5-20240601/man/curs_add_wch.3x	2024-06-01 22:29:08.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_add_wch.3x,v 1.65 2024/05/25 21:13:15 tom Exp $
+-.TH curs_add_wch 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_add_wch.3x,v 1.67 2024/06/01 22:29:08 tom Exp $
++.TH curs_add_wch 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -151,10 +151,14 @@
+ is any other nonprintable character,
+ it is drawn in printable form using the same convention as
+ \fB\%wunctrl\fP(3X).
+-.PP
+ Calling \fB\%win_wch\fP(3X) on the location of a nonprintable character
+ does not return the character itself,
+ but its \fB\%wunctrl\fP(3X) representation.
++.PP
++A
++.I \%cchar_t
++can be copied from place to place using \fB\%win_wch\fP(3X) and
++.BR \%wadd_wch "."
+ .SS wecho_wchar
+ .B \%echo_wchar
+ and
+@@ -196,7 +200,7 @@
+ database entry incorrectly advertises ACS support.
+ The name \*(``ACS\*('' originates in the Alternate Character Set feature
+ of the DEC VT100 terminal.
+-.br
++.PP
+ .ie t .ne 4v
+ .el   .ne 5v
+ .TS
+@@ -414,12 +418,6 @@
+ These functions are described in X/Open Curses, Issue 4.
+ It specifies no error conditions for them.
+ .PP
+-SVr4
+-.I curses
+-describes a successful return value only as
+-\*(``an integer value other than
+-.BR ERR \*(''.
+-.PP
+ The defaults specified for forms-drawing characters apply in the POSIX
+ locale.
+ X/Open Curses makes it clear that the WACS_ symbols should be defined as
+@@ -503,7 +501,7 @@
+ The complex character type
+ .I \%cchar_t
+ can store more than one wide character
+-.RI ( \%wchar_t ).
++.RI \%( wchar_t ).
+ X/Open Curses does not mention this possibility,
+ specifying behavior only where
+ .I wch
+@@ -526,6 +524,27 @@
+ In the latter case,
+ .I \%ncurses
+ adds the non-spacing character to the active complex character.
++.SH HISTORY
++These functions were initially specified by X/Open Curses,
++Issue 4.
++The System\ V Interface Definition,
++Version 4 (1995),
++specified functions named
++.I \%waddwch
++and
++.I \%wechowchar
++(and the usual variants).
++These were later additions to
++.RI SVr4. x ,
++not appearing in the first SVr4 (1989).
++They differed from X/Open's
++.I \%wadd_wch
++and
++.I \%wecho_wchar
++in that they each took an argument of type
++.I \%wchar_t
++instead of
++.IR \%cchar_t "."
+ .SH SEE ALSO
+ \fB\%curs_addch\fP(3X) describes comparable functions of the
+ .I \%ncurses
+Index: man/curs_addch.3x
+Prereq:  1.88 
+--- ncurses-6.5-20240525+/man/curs_addch.3x	2024-05-25 21:13:32.000000000 +0000
++++ ncurses-6.5-20240601/man/curs_addch.3x	2024-06-01 22:29:08.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addch.3x,v 1.88 2024/05/25 21:13:32 tom Exp $
+-.TH curs_addch 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addch.3x,v 1.90 2024/06/01 22:29:08 tom Exp $
++.TH curs_addch 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -127,7 +127,6 @@
+ is any other nonprintable character,
+ it is drawn in printable form using the same convention as
+ \fB\%unctrl\fP(3X).
+-.PP
+ Calling \fB\%winch\fP(3X) on the location of a nonprintable character
+ does not return the character itself,
+ but its \fB\%unctrl\fP(3X) representation.
+@@ -135,11 +134,12 @@
+ The object or expression
+ .I ch
+ may contain attributes and/or a color pair identifier.
+-(A character with its attributes can be copied from place to place
+-using \fB\%winch\fP(3X) and
++(A
++.I \%chtype
++can be copied from place to place using \fB\%winch\fP(3X) and
+ .BR \%waddch .)
+-See \fB\%curs_attr\fP(3X) for values of predefined video attribute
+-constants that can be usefully \*(``or\*(''ed with characters.
++See \fB\%curs_attr\fP(3X) for values of predefined constants that can be
++usefully \*(``or\*(''ed with characters.
+ .SS wechochar
+ .B \%echochar
+ and
+@@ -181,7 +181,7 @@
+ database entry incorrectly advertises ACS support.
+ The name \*(``ACS\*('' originates in the Alternate Character Set feature
+ of the DEC VT100 terminal.
+-.br
++.PP
+ .ie t .ne 4v
+ .el   .ne 5v
+ .TS
+@@ -252,14 +252,15 @@
+ .PP
+ The last may be due to different causes:
+ .bP
+-conversion of a multibyte character to a byte sequence can fail,
++conversion of a wide character to a multibyte character sequence can
++fail,
+ or
+ .bP
+-at least one of the bytes resulting from conversion from a multibyte
+-sequence cannot be added to the window.
++at least one of the bytes resulting from wide character conversion to a
++multibyte character sequence cannot be added to the window.
+ See section \*(``PORTABILITY\*('' below regarding the use of
+ .B \%waddch
+-with multibyte characters.
++with wide characters.
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+@@ -359,7 +360,7 @@
+ description uses lowercase i.
+ .PP
+ Some ACS symbols
+-.RB ( \%ACS_S3 ,
++.RB \%( ACS_S3 ,
+ .BR \%ACS_S7 ,
+ .BR \%ACS_LEQUAL ,
+ .BR \%ACS_GEQUAL ,
+@@ -368,6 +369,9 @@
+ and
+ .BR \%ACS_STERLING )
+ were not documented in any publicly released System\ V.
++.\" And did not exist yet as late as SVr4.
++.\" https://github.com/ryanwoodsmall/oldsysv/blob/master/\
++.\"   sysvr4/svr4/lib/xlibcurses/screen/curses.ed
+ However,
+ many publicly available
+ .I \%term\%info
+@@ -428,7 +432,7 @@
+ .IR \%ncurses ,
+ .I \%chtype
+ holds an eight-bit character,
+-but the library allows a multibyte character to be passed in a
++but the library allows a multibyte character sequence to be passed via a
+ succession of calls to
+ .BR \%waddch "."
+ Other implementations do not;
+@@ -442,7 +446,7 @@
+ .I \%ncurses
+ inspects the byte passed in each
+ .B \%waddch
+-call and checks whether the latest call continues a multibyte sequence.
++call and checks whether the latest call continues a multibyte character.
+ When a character is
+ .IR complete ","
+ .I \%ncurses
+@@ -467,11 +471,20 @@
+ If it cannot,
+ use only
+ \fB\%wadd_wch\fP(3X).
++.SH HISTORY
++The original
++.I curses
++in 4BSD (1980) introduced
++.IR \%waddch "."
++.PP
++SVr3 (1987)
++added
++.IR \%wechochar "."
+ .SH SEE ALSO
+ \fB\%curs_add_wch\fP(3X) describes comparable functions of the
+ .I \%ncurses
+ library in its wide-character configuration
+-.RI ( \%ncursesw ).
++.RI \%( ncursesw ).
+ .PP
+ \fB\%curses\fP(3X),
+ \fB\%curs_addchstr\fP(3X),
+Index: man/curs_addchstr.3x
+Prereq:  1.46 
+--- ncurses-6.5-20240525+/man/curs_addchstr.3x	2024-05-11 20:39:53.000000000 +0000
++++ ncurses-6.5-20240601/man/curs_addchstr.3x	2024-06-01 22:29:08.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addchstr.3x,v 1.46 2024/05/11 20:39:53 tom Exp $
+-.TH curs_addchstr 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addchstr.3x,v 1.48 2024/06/01 22:29:08 tom Exp $
++.TH curs_addchstr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -143,7 +143,7 @@
+ \fB\%curs_add_wchstr\fP(3X) describes comparable functions of the
+ .I \%ncurses
+ library in its wide-character configuration
+-.RI ( \%ncursesw ).
++.RI \%( ncursesw ).
+ .PP
+ \fB\%curses\fP(3X),
+ \fB\%curs_addch\fP(3X),
+Index: man/curs_addstr.3x
+Prereq:  1.47 
+--- ncurses-6.5-20240525+/man/curs_addstr.3x	2024-05-25 20:45:40.000000000 +0000
++++ ncurses-6.5-20240601/man/curs_addstr.3x	2024-06-01 22:29:08.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addstr.3x,v 1.47 2024/05/25 20:45:40 tom Exp $
+-.TH curs_addstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addstr.3x,v 1.49 2024/06/01 22:29:08 tom Exp $
++.TH curs_addstr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -134,7 +134,7 @@
+ \fB\%curs_addwstr\fP(3X) describes comparable functions of the
+ .I \%ncurses
+ library in its wide-character configuration
+-.RI ( \%ncursesw ).
++.RI \%( ncursesw ).
+ .PP
+ \fB\%curses\fP(3X),
+ \fB\%curs_addch\fP(3X),
+Index: man/curs_addwstr.3x
+Prereq:  1.39 
+--- ncurses-6.5-20240525+/man/curs_addwstr.3x	2024-05-25 20:10:58.000000000 +0000
++++ ncurses-6.5-20240601/man/curs_addwstr.3x	2024-06-01 22:30:17.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addwstr.3x,v 1.39 2024/05/25 20:10:58 tom Exp $
+-.TH curs_addwstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addwstr.3x,v 1.41 2024/06/01 22:30:17 tom Exp $
++.TH curs_addwstr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -111,19 +111,23 @@
+ .B ERR
+ on failure.
+ .PP
+-X/Open Curses does not specify any error conditions.
+-.I \%ncurses
+-returns
++In
++.IR \%ncurses ","
++they return
+ .B ERR
++if
+ .bP
+-if the window pointer is
+-.BR NULL ,
++.I win
++is
++.BR NULL ","
+ .bP
+-if the string pointer is
+-.BR NULL ,
++.I wstr
++is
++.BR NULL ","
+ or
+ .bP
+-if an internal \fB\%wadd_wch\fP(3X) call returns an error.
++an internal \fB\%wadd_wch\fP(3X) call returns
++.BR ERR "."
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+Index: man/curs_getch.3x
+Prereq:  1.93 
+--- ncurses-6.5-20240525+/man/curs_getch.3x	2024-05-25 20:57:17.000000000 +0000
++++ ncurses-6.5-20240601/man/curs_getch.3x	2024-06-01 22:29:08.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getch.3x,v 1.93 2024/05/25 20:57:17 tom Exp $
+-.TH curs_getch 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_getch.3x,v 1.95 2024/06/01 22:29:08 tom Exp $
++.TH curs_getch 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -229,7 +229,7 @@
+ Consequently,
+ a user of a
+ .I curses
+-application may experience a delay after they escape key is pressed
++application may experience a delay after the escape key is pressed
+ while
+ .I curses
+ disambiguates the input;
+@@ -470,6 +470,12 @@
+ or
+ .BR FALSE "."
+ .SH NOTES
++.BR \%getch ","
++.BR \%mvgetch ","
++and
++.B \%mvwgetch
++may be implemented as macros.
++.PP
+ .I curses
+ discourages assignment of the ESC key to a discrete function by the
+ programmer because the library requires a delay while it awaits the
+@@ -553,8 +559,8 @@
+ (also known variously as the \*(``3B1\*('', \*(``Safari 4\*('', and
+ \*(``UNIX PC\*(''),
+ a 1985 machine rich in function keys.
+-Today's computer keyboards are based that of the IBM PC/AT and tend to
+-have fewer.
++Today's computer keyboards are based on that of the IBM PC/AT
++and tend to have fewer.
+ A
+ .I curses
+ application can expect such a keyboard to transmit key codes
+@@ -577,12 +583,6 @@
+ for 1 \(<=
+ .I n
+ \(<= 12.
+-.PP
+-.BR \%getch ","
+-.BR \%mvgetch ","
+-and
+-.B \%mvwgetch
+-may be implemented as macros.
+ .SH EXTENSIONS
+ In
+ .IR \%ncurses ","
+@@ -639,8 +639,9 @@
+ and also
+ (in some implementations)
+ whether an input timeout or non-blocking mode had been set.
+-Programmers concerned about portability should be prepared for either of
+-two cases:
++A portable
++.I curses
++application prepares for two cases:
+ (a) signal receipt does not interrupt
+ .BR \%wgetch ";"
+ or
+@@ -689,7 +690,7 @@
+ \fB\%curs_get_wch\fP(3X) describes comparable functions of the
+ .I \%ncurses
+ library in its wide-character configuration
+-.RI ( \%ncursesw ).
++.RI \%( ncursesw ).
+ .PP
+ \fB\%curses\fP(3X),
+ \fB\%curs_addch\fP(3X),
+Index: man/curs_getstr.3x
+Prereq:  1.61 
+--- ncurses-6.5-20240525+/man/curs_getstr.3x	2024-05-25 20:10:58.000000000 +0000
++++ ncurses-6.5-20240601/man/curs_getstr.3x	2024-06-01 22:29:08.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getstr.3x,v 1.61 2024/05/25 20:10:58 tom Exp $
+-.TH curs_getstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_getstr.3x,v 1.63 2024/06/01 22:29:08 tom Exp $
++.TH curs_getstr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -294,7 +294,7 @@
+ \fB\%curs_get_wstr\fP(3X) describes comparable functions of the
+ .I \%ncurses
+ library in its wide-character configuration
+-.RI ( \%ncursesw ).
++.RI \%( ncursesw ).
+ .PP
+ \fB\%curses\fP(3X),
+ \fB\%curs_getch\fP(3X),
+Index: man/curs_inch.3x
+Prereq:  1.56 
+--- ncurses-6.5-20240525+/man/curs_inch.3x	2024-05-25 20:10:58.000000000 +0000
++++ ncurses-6.5-20240601/man/curs_inch.3x	2024-06-01 22:29:08.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inch.3x,v 1.56 2024/05/25 20:10:58 tom Exp $
+-.TH curs_inch 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inch.3x,v 1.58 2024/06/01 22:29:08 tom Exp $
++.TH curs_inch 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -176,7 +176,7 @@
+ \fB\%curs_in_wch\fP(3X) describes comparable functions of the
+ .I \%ncurses
+ library in its wide-character configuration
+-.RI ( \%ncursesw ).
++.RI \%( ncursesw ).
+ .PP
+ \fB\%curses\fP(3X),
+ \fB\%curs_instr\fP(3X)
+Index: man/curs_initscr.3x
+Prereq:  1.71 
+--- ncurses-6.5-20240525+/man/curs_initscr.3x	2024-05-25 20:10:58.000000000 +0000
++++ ncurses-6.5-20240601/man/curs_initscr.3x	2024-06-01 22:38:43.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_initscr.3x,v 1.71 2024/05/25 20:10:58 tom Exp $
+-.TH curs_initscr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_initscr.3x,v 1.73 2024/06/01 22:38:43 tom Exp $
++.TH curs_initscr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -308,10 +308,23 @@
+ This handles the window-size changes which were ignored in
+ the standardization efforts.
+ The handler sets a (signal-safe) variable
+-which is later tested in \fB\%wgetch\fP(3X).
+-If \fBkeypad\fP has been enabled for the corresponding window,
+-\fBwgetch\fP returns the key symbol \fBKEY_RESIZE\fP.
+-At the same time, \fBwgetch\fP calls \fBresizeterm\fP to adjust the
++that is later tested by \fB\%wgetch\fP(3X) and \fB\%wget_wch\fP(3X):
++.RS
++.bP
++.B \%wgetch
++returns the key code
++.BR \%KEY_RESIZE "."
++.bP
++.B \%wget_wch
++returns
++.B \%KEY_CODE_YES
++and sets its
++.I wch
++parameter to
++.BR \%KEY_RESIZE "."
++.RE
++.IP
++At the same time, \fI\%ncurses\fP calls \fBresizeterm\fP to adjust the
+ standard screen \fBstdscr\fP,
+ and update other data such as \fBLINES\fP and \fBCOLS\fP.
+ .SH SEE ALSO
+Index: man/curs_inopts.3x
+Prereq:  1.68 
+--- ncurses-6.5-20240525+/man/curs_inopts.3x	2024-05-25 20:41:48.000000000 +0000
++++ ncurses-6.5-20240601/man/curs_inopts.3x	2024-06-01 22:28:41.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inopts.3x,v 1.68 2024/05/25 20:41:48 tom Exp $
+-.TH curs_inopts 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inopts.3x,v 1.70 2024/06/01 22:28:41 tom Exp $
++.TH curs_inopts 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -410,7 +410,7 @@
+ .I curses
+ does not handle.
+ .B \%noraw
+-exits raw mode.
++returns the terminal to normal (\*(``cooked\*('') mode.
+ .\"
+ .SS "timeout, wtimeout"
+ .B \%wtimeout
+@@ -678,20 +678,19 @@
+ Corresponding key codes are generated and
+ (depending on previous loads of terminal descriptions)
+ may differ from one execution of a program to the next.
+-The generated keycodes are recognized by the \fB\%keyname\fP(3X)
+-function
+-(which then returns a name beginning with \*(``k\*('' denoting the
++The generated key codes are recognized by \fB\%keyname\fP(3X),
++which then returns a name beginning with \*(``k\*('' denoting the
+ .I \%term\%info
+ capability name rather than \*(``K\*('',
+ used for
+ .I curses
+-key names).
++key names.
+ On the other hand,
+ an application can use \fB\%define_key\fP(3X) to bind
+ a specific key to a string of the programmer's choice.
+-This feature enables an application to check for an extended
+-capability's presence with \fB\%tigetstr\fP(3X),
+-and reassign the keycode to match its own needs.
++This feature enables an application to check for its presence
++with \fB\%tigetstr\fP(3X),
++and reassign the key code to match its own needs.
+ .PP
+ Low-level applications can use \fB\%tigetstr\fP(3X) to obtain the
+ definition of any string capability.
+Index: man/curs_instr.3x
+Prereq:  1.53 
+--- ncurses-6.5-20240525+/man/curs_instr.3x	2024-05-25 20:10:58.000000000 +0000
++++ ncurses-6.5-20240601/man/curs_instr.3x	2024-06-01 22:29:08.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_instr.3x,v 1.53 2024/05/25 20:10:58 tom Exp $
+-.TH curs_instr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_instr.3x,v 1.55 2024/06/01 22:29:08 tom Exp $
++.TH curs_instr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -124,7 +124,7 @@
+ \fB\%curs_ins_wstr\fP(3X) describes comparable functions of the
+ .I \%ncurses
+ library in its wide-character configuration
+-.RI ( \%ncursesw ).
++.RI \%( ncursesw ).
+ .PP
+ \fB\%curses\fP(3X),
+ \fB\%curs_inch\fP(3X),
+Index: man/curs_scr_dump.3x
+Prereq:  1.43 
+--- ncurses-6.5-20240525+/man/curs_scr_dump.3x	2024-04-20 18:54:36.000000000 +0000
++++ ncurses-6.5-20240601/man/curs_scr_dump.3x	2024-06-01 22:29:45.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_scr_dump.3x,v 1.43 2024/04/20 18:54:36 tom Exp $
+-.TH curs_scr_dump 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_scr_dump.3x,v 1.45 2024/06/01 22:29:45 tom Exp $
++.TH curs_scr_dump 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -54,10 +54,10 @@
+ .nf
+ \fB#include 
+ .PP
+-\fBint scr_dump(const char *\fIfilename\fP);
+-\fBint scr_restore(const char *\fIfilename\fP);
+-\fBint scr_init(const char *\fIfilename\fP);
+-\fBint scr_set(const char *\fIfilename\fP);
++\fBint scr_dump(const char * \fIfilename\fP);
++\fBint scr_restore(const char * \fIfilename\fP);
++\fBint scr_init(const char * \fIfilename\fP);
++\fBint scr_set(const char * \fIfilename\fP);
+ .fi
+ .SH DESCRIPTION
+ .I curses
+@@ -70,83 +70,151 @@
+ \fB\%putwin\fP(3X),
+ respectively.
+ .SS scr_dump
+-\fB\%scr_dump\fP writes to
++.B \%scr_dump
++writes to
+ .I filename
+ the contents of the virtual screen;
+ see \fB\%curscr\fP(3X).
+ .SS scr_restore
+-\fB\%scr_restore\fP updates the virtual screen to contain the contents
+-of
++.B \%scr_restore
++updates the virtual screen to match the contents of
+ .I filename
+-(if it was validly written with \fB\%scr_dump\fP).
+-No refresh is performed;
+-after performing any further desired updates,
++(if validly written with
++.BR \%scr_dump ")."
++.I curses
++does not perform a refresh;
++after making any desired changes,
+ call \fB\%doupdate\fP(3X) or similar.
+ .SS scr_init
+-\fB\%scr_init\fP reads
+-.IR filename ,
++.B \%scr_init
++reads
++.IR filename ","
+ using it to initialize
+ .I curses
+ data structures describing the state of the terminal screen.
+-If these data are valid,
+ .I curses
++then,
++if it decides the terminal state is valid,
+ bases its next update of the screen on this information rather than
+ clearing it and starting from scratch.
+ .PP
+-The data fail the validity check
++.I curses
++regards the terminal being in an invalid state for computation of
++updates based on the contents of
++.I filename
++if
+ .bP
+-if the terminal employs
++the terminal type supports the
+ .I \%term\%info
+ capabilities
+ .B \%exit_ca_mode
+-.RB ( \%rmcup )
++.RB \%( rmcup )
+ or
+ .B \%non_rev_rmcup
+-.RB ( \%nrrmc )
+-are defined,
++.RB \%( nrrmc ),
+ or
+ .bP
+-if
+ .I curses
+ knows that the terminal has been written to since the preceding
+-\fB\%scr_dump\fP call.
++.B \%scr_dump
++call.
+ .PP
+-\fB\%scr_init\fP could be used after \fB\%initscr\fP(3X) or
+-\fB\%system\fP(3) to share the screen with another process that has
+-done a \fBscr_dump\fP after \fB\%endwin\fP(3X).
++Either of the foregoing conditions means that
++.I curses
++cannot assume that the terminal's contents
++match their representation in
++.IR filename "."
++The former is due to terminal features
++(such as \fI\%xterm\fP(1)'s \*(``alternate screen\*('')
++that couple cursor-positioning mode with a local cache of screen
++contents.
++.I curses
++cannot know whether terminal is displaying from that local cache at the
++time the application calls
++.BR \%scr_init ","
++so it makes a pessimistic assumption that a full redraw is required;
++see subsection \*(``Cursor Motions\*('' of \fB\%terminfo\fP(5).
++.PP
++.B \%scr_init
++could be used after \fB\%initscr\fP(3X) or \fI\%system\fP(3) to share
++the screen with another process that has done a
++.B \%scr_dump
++after \fB\%endwin\fP(3X).
++An application that supports suspending its state on exit and subsequent
++resumption upon later execution might use
++.B \%scr_dump
++and
++.B \%scr_init
++thus.
+ .SS scr_set
+-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.
++.B \%scr_set
++combines
++.B \%scr_restore
++and
++.BR \%scr_init ","
++synchronizing the contents of
++.I filename
++with the virtual screen.
++It can be regarded as a screen inheritance function;
++consider a real-time screen-sharing application.
+ .SH RETURN VALUE
+-These functions return \fBOK\fP on success and \fBERR\fP on failure.
+-.PP
+-X/Open defines no failure conditions.
+-In this implementation,
+-each function fails if it cannot open
+-.IR filename .
++These functions return
++.B OK
++on success and
++.B ERR
++on failure.
++.PP
++In
++.IR \%ncurses ","
++each function returns
++.B ERR
++if it cannot open
++.IR filename "."
++.BR \%scr_init ","
++.BR \%scr_restore ","
++and
++.B \%scr_set
++return
++.B ERR
++if the contents of
++.I filename
++are invalid.
+ .SH NOTES
+-\fB\%scr_init\fP,
+-\fB\%scr_set\fP,
++.BR \%scr_init ","
++.BR \%scr_restore ","
+ and
+-\fB\%scr_restore\fP may be macros.
++.B \%scr_set
++may be implemented as macros.
+ .SH PORTABILITY
+ X/Open Curses,
+ Issue 4 describes these functions.
++It specifies no error conditions for them.
++.\" Unusually, SVID 4 explicitly indicated "OK" as a possible return
++.\" value, rather than the "integer other than ERR" refrain (p. 529).
+ .PP
+ .\" SVID 4, p. 529
+ SVr4 omitted the
+ .I \%const
+ qualifiers.
+ .PP
+-SVr4 documentation describes \fB\%scr_init\fP such that the dump data is
+-also considered invalid \*(``if the time-stamp of the tty is old\*(''
++SVr4 documentation describes
++.B \%scr_init
++such that the dump data is also considered invalid
++\*(``if the time-stamp of the tty is old\*(''
+ but does not define \*(``old\*(''.
++.SH HISTORY
++SVr3 (1987) introduced
++.BR \%scr_dump ","
++.BR \%scr_init ","
++and
++.BR \%scr_restore "."
++SVr3.1 added
++.BR \%scr_set "."
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_initscr\fP(3X),
+ \fB\%curs_refresh\fP(3X),
+ \fB\%curs_util\fP(3X),
+ \fB\%system\fP(3),
+-\fB\%scr_dump\fP(5)
++\fB\%scr_dump\fP(5),
++\fB\%terminfo\fP(5)
+Index: man/curs_terminfo.3x
+Prereq:  1.138 
+--- ncurses-6.5-20240525+/man/curs_terminfo.3x	2024-05-25 21:02:40.000000000 +0000
++++ ncurses-6.5-20240601/man/curs_terminfo.3x	2024-06-01 22:29:08.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_terminfo.3x,v 1.138 2024/05/25 21:02:40 tom Exp $
+-.TH curs_terminfo 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_terminfo.3x,v 1.140 2024/06/01 22:29:08 tom Exp $
++.TH curs_terminfo 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -681,7 +681,7 @@
+ .B setupterm
+ fails if it cannot allocate enough memory,
+ or create the initial windows
+-.RB ( \%stdscr ,
++.RB \%( stdscr ,
+ .BR \%curscr ,
+ and
+ .BR \%newscr )
+Index: man/curs_util.3x
+Prereq:  1.104 
+--- ncurses-6.5-20240525+/man/curs_util.3x	2024-05-25 20:10:58.000000000 +0000
++++ ncurses-6.5-20240601/man/curs_util.3x	2024-06-01 22:28:18.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_util.3x,v 1.104 2024/05/25 20:10:58 tom Exp $
+-.TH curs_util 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_util.3x,v 1.106 2024/06/01 22:28:18 tom Exp $
++.TH curs_util 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -128,7 +128,7 @@
+ .LP
+ The corresponding \fBkey_name\fP returns
+ a multibyte character string corresponding
+-to the wide-character value \fIw\fP.
++to the wide-character value \fIwc\fP.
+ The two functions (\fBkeyname\fP and \fBkey_name\fP)
+ do not return the same set of strings:
+ .bP
+@@ -323,9 +323,9 @@
+ The \fBkeyname\fP function may return the names of user-defined
+ string capabilities which are defined in the terminfo entry via the \fB\-x\fP
+ option of \fB@TIC@\fP.
+-This implementation automatically assigns at run-time keycodes to
++This implementation automatically assigns at run-time key codes to
+ user-defined strings which begin with \*(``k\*(''.
+-The keycodes start at KEY_MAX, but are not guaranteed to be
++The key codes start at KEY_MAX, but are not guaranteed to be
+ the same value for different runs because user-defined codes are
+ merged from all terminal descriptions which have been loaded.
+ The \fBuse_extended_names\fP(3X) function controls whether this data is
+Index: man/curs_window.3x
+Prereq:  1.50 
+--- ncurses-6.5-20240525+/man/curs_window.3x	2024-05-25 20:43:47.000000000 +0000
++++ ncurses-6.5-20240601/man/curs_window.3x	2024-06-01 22:29:08.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_window.3x,v 1.50 2024/05/25 20:43:47 tom Exp $
+-.TH curs_window 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_window.3x,v 1.52 2024/06/01 22:29:08 tom Exp $
++.TH curs_window 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%newwin\fP,
+ \fB\%delwin\fP,
+@@ -254,7 +254,7 @@
+ when asked to delete a subwindow.
+ Solaris X/Open
+ .I curses
+-.RI ( \%xcurses )
++.RI \%( xcurses )
+ does not make even that check,
+ and will delete a parent window that still has subwindows.
+ .I \%PDCurses
+Index: man/ncurses.3x
+Prereq:  1.219 
+--- ncurses-6.5-20240525+/man/ncurses.3x	2024-05-25 20:57:45.000000000 +0000
++++ ncurses-6.5-20240601/man/ncurses.3x	2024-06-01 22:29:08.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: ncurses.3x,v 1.219 2024/05/25 20:57:45 tom Exp $
+-.TH ncurses 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: ncurses.3x,v 1.221 2024/06/01 22:29:08 tom Exp $
++.TH ncurses 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -265,7 +265,7 @@
+ occur.
+ Among those,
+ the most basic are \fB\%move\fP(3X) and \fB\%addch\fP(3X):
+-these place the cursor and write a character to
++these place the cursor within and write a character to
+ .BR \%stdscr ,
+ respectively.
+ .PP
+@@ -410,6 +410,7 @@
+ In function synopses,
+ .I \%ncurses
+ man pages apply the following names to parameters.
++We introduce the character types in the next subsection.
+ .PP
+ .TS
+ center;
+@@ -470,17 +471,35 @@
+ .I \%char
+ (a byte-sized type)
+ can represent.
+-It adds about one third more calls using additional data types that
+-can store such
+-.I multibyte
+-characters.
++It provides additional functions that complement those in
++the non-wide library where the size of the underlying character type is
++significant.
++A somewhat regular naming convention relates many of the wide variants
++to their non-wide counterparts;
++where a non-wide function name contains \*(``ch\*('' or \*(``str\*('',
++prefix it with \*(``_w\*('' to obtain the wide counterpart.
++For example,
++\fB\%waddch\fP becomes \fB\%wadd_wch\fP.
++(Exceptions that add only \*(``w\*('' comprise
++.BR \%addwstr ,
++.BR \%inwstr ,
++and their variants.)
++.IP
++This convention is inapplicable to some non-wide function names,
++so other transformations are used for the wide configuration:
++the window background management function \*(``bkgd\*('' becomes
++\*(``bkgrnd\*('';
++the window border-drawing and -clearing functions are suffixed with
++\*(``_set\*('';
++and character attribute manipulation functions like
++\*(``attron\*('' become \*(``attr_on\*(''.
+ .RS 10 \" same as foregoing tag width
+ .TP 9 \" "cchar_t" + 2n
+ .I \%cchar_t
+ corresponds to the non-wide configuration's
+ .IR \%chtype .
+-It always a structure type,
+-because it stores more data than fit into a standard scalar type.
++It is a structure type
++because it requires more storage than fits into a standard scalar type.
+ A character code may not be representable as a
+ .IR \%char ,
+ and moreover more than one character may occupy a cell
+@@ -541,29 +560,6 @@
+ character manipulation functions of ISO C and its constant
+ .BR \%EOF .
+ .RE
+-.IP
+-The wide library provides additional functions that complement those in
+-the non-wide library where the size of the underlying character type is
+-significant.
+-A somewhat regular naming convention relates many of the wide variants
+-to their non-wide counterparts;
+-where a non-wide function name contains \*(``ch\*('' or \*(``str\*('',
+-prefix it with \*(``_w\*('' to obtain the wide counterpart.
+-For example,
+-\fB\%waddch\fP becomes \fB\%wadd_wch\fP.
+-(Exceptions that add only \*(``w\*('' comprise
+-.BR \%addwstr ,
+-.BR \%inwstr ,
+-and their variants.)
+-.IP
+-This convention is inapplicable to some non-wide function names,
+-so other transformations are used for the wide configuration:
+-the window background management function \*(``bkgd\*('' becomes
+-\*(``bkgrnd\*('';
+-the window border-drawing and -clearing functions are suffixed with
+-\*(``_set\*('';
+-and character attribute manipulation functions like
+-\*(``attron\*('' become \*(``attr_on\*(''.
+ .\"
+ .SS "Function Name Index"
+ The following table lists the
+@@ -761,7 +757,7 @@
+ mvaddstr/\fBcurs_addstr\fP(3X)
+ mvaddwstr/\fBcurs_addwstr\fP(3X)
+ mvchgat/\fBcurs_attr\fP(3X)
+-mvcur/\fBcurs_terminfo\fP(3X)
++mvcur/\fBcurs_kernel\fP(3X)
+ mvdelch/\fBcurs_delch\fP(3X)
+ mvderwin/\fBcurs_window\fP(3X)
+ mvget_wch/\fBcurs_get_wch\fP(3X)
+@@ -1094,7 +1090,7 @@
+ When set,
+ the
+ .B \%command_character
+-.RB ( \%cmdch )
++.RB \%( cmdch )
+ capability value of loaded
+ .I \%term\%info
+ entries changes to the value of this variable.
+@@ -1102,8 +1098,8 @@
+ .I \%term\%info
+ entries provide this feature.
+ .PP
+-Because this name is also used in development environments to represent
+-the C compiler's name,
++Because this name is also used in development environments to store the
++C compiler's name,
+ .I \%ncurses
+ ignores its value if it is not one character in length.
+ .SS "\fICOLUMNS\fP"
+@@ -1117,7 +1113,7 @@
+ .I \%ncurses
+ uses the size specified by the
+ .B \%columns
+-.RB ( \%cols )
++.RB \%( cols )
+ capability of the terminal type's entry in the
+ .I \%term\%info
+ database,
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20240525+/package/debian-mingw/changelog	2024-05-25 10:33:51.000000000 +0000
++++ ncurses-6.5-20240601/package/debian-mingw/changelog	2024-06-01 11:06:41.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.5+20240525) unstable; urgency=low
++ncurses6 (6.5+20240601) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 25 May 2024 06:33:51 -0400
++ -- Thomas E. Dickey   Sat, 01 Jun 2024 07:06:41 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20240525+/package/debian-mingw64/changelog	2024-05-25 10:33:51.000000000 +0000
++++ ncurses-6.5-20240601/package/debian-mingw64/changelog	2024-06-01 11:06:41.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.5+20240525) unstable; urgency=low
++ncurses6 (6.5+20240601) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 25 May 2024 06:33:51 -0400
++ -- Thomas E. Dickey   Sat, 01 Jun 2024 07:06:41 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20240525+/package/debian/changelog	2024-05-25 10:33:51.000000000 +0000
++++ ncurses-6.5-20240601/package/debian/changelog	2024-06-01 11:06:41.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.5+20240525) unstable; urgency=low
++ncurses6 (6.5+20240601) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 25 May 2024 06:33:51 -0400
++ -- Thomas E. Dickey   Sat, 01 Jun 2024 07:06:41 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.650 
+--- ncurses-6.5-20240525+/package/mingw-ncurses.nsi	2024-05-25 10:33:51.000000000 +0000
++++ ncurses-6.5-20240601/package/mingw-ncurses.nsi	2024-06-01 11:06:41.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.650 2024/05/25 10:33:51 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.651 2024/06/01 11:06:41 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "0525"
++!define VERSION_MMDD  "0601"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20240525+/package/mingw-ncurses.spec	2024-05-25 10:33:51.000000000 +0000
++++ ncurses-6.5-20240601/package/mingw-ncurses.spec	2024-06-01 11:06:41.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20240525
++Release: 20240601
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20240525+/package/ncurses.spec	2024-05-25 10:33:51.000000000 +0000
++++ ncurses-6.5-20240601/package/ncurses.spec	2024-06-01 11:06:41.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20240525
++Release: 20240601
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20240525+/package/ncursest.spec	2024-05-25 10:33:51.000000000 +0000
++++ ncurses-6.5-20240601/package/ncursest.spec	2024-06-01 11:06:41.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20240525
++Release: 20240601
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/package/debian/rules
+--- ncurses-6.5-20240525+/test/package/debian/rules	2021-12-19 00:23:00.000000000 +0000
++++ ncurses-6.5-20240601/test/package/debian/rules	2024-06-01 23:42:46.000000000 +0000
+@@ -75,7 +75,7 @@
+ 
+ 	cd t/ncurses6; $(configure) \
+ 		--datadir=\$${datarootdir}/$(NCURSES_PKG) \
+-		--with-screen=ncursesw6
++		--with-screen=ncurses6
+ 
+ 	touch $@
+ 
+@@ -87,7 +87,7 @@
+ 
+ 	cd t/ncursest6; $(configure) \
+ 		--datadir=\$${datarootdir}/$(NCURSEST_PKG) \
+-		--with-screen=ncursestw6
++		--with-screen=ncursest6
+ 
+ 	touch $@
+ 
diff --git a/packages/ncurses/6.5/ncurses-6.5-20240608.patch b/packages/ncurses/6.5/ncurses-6.5-20240608.patch
new file mode 100644
index 0000000000..b391bb6713
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20240608.patch
@@ -0,0 +1,5487 @@
+# ncurses 6.5 - patch 20240608 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20240608.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Jun  9 01:06:48 UTC 2024
+# ------------------------------------------------------------------------------
+# Ada95/include/ncurses_cfg.hin                                                    |    6 
+# Ada95/package/AdaCurses-doc.spec                                                 |    4 
+# Ada95/package/AdaCurses.spec                                                     |    4 
+# Ada95/package/debian/rules                                                       |    2 
+# Ada95/package/debian/watch                                                       |    2 
+# INSTALL                                                                          |    6 
+# MANIFEST                                                                         |   12 
+# NEWS                                                                             |    9 
+# VERSION                                                                          |    2 
+# dist.mk                                                                          |    4 
+# doc/html/man/curs_addch.3x.html                                                  |   89 ++--
+# doc/html/man/curs_get_wch.3x.html                                                |   40 +
+# doc/html/man/curs_get_wstr.3x.html                                               |   12 
+# doc/html/man/curs_getch.3x.html                                                  |   67 +--
+# doc/html/man/curs_getstr.3x.html                                                 |   89 ++--
+# doc/html/man/curs_getyx.3x.html                                                  |   16 
+# doc/html/man/curs_inch.3x.html                                                   |   17 
+# doc/html/man/curs_initscr.3x.html                                                |   10 
+# doc/html/man/curs_inopts.3x.html                                                 |   26 -
+# doc/html/man/curs_ins_wstr.3x.html                                               |   37 -
+# doc/html/man/curs_insstr.3x.html                                                 |   29 -
+# doc/html/man/curs_instr.3x.html                                                  |   96 ++--
+# doc/html/man/curs_inwstr.3x.html                                                 |  105 ++--
+# doc/html/man/curs_kernel.3x.html                                                 |  100 ++--
+# doc/html/man/curs_scr_dump.3x.html                                               |   22 -
+# doc/html/man/curs_terminfo.3x.html                                               |    8 
+# doc/html/man/curs_util.3x.html                                                   |   40 -
+# doc/html/man/define_key.3x.html                                                  |   11 
+# doc/html/man/key_defined.3x.html                                                 |   10 
+# doc/html/man/keybound.3x.html                                                    |   10 
+# doc/html/man/keyok.3x.html                                                       |   10 
+# doc/html/man/ncurses.3x.html                                                     |   40 +
+# doc/html/man/terminfo.5.html                                                     |   34 -
+# doc/html/man/tput.1.html                                                         |   30 -
+# doc/html/man/tset.1.html                                                         |   14 
+# doc/html/man/user_caps.5.html                                                    |   12 
+# include/ncurses_cfg.hin                                                          |    6 
+# man/curs_addch.3x                                                                |    5 
+# man/curs_get_wch.3x                                                              |   32 -
+# man/curs_get_wstr.3x                                                             |    9 
+# man/curs_getch.3x                                                                |   31 -
+# man/curs_getstr.3x                                                               |   12 
+# man/curs_getyx.3x                                                                |    6 
+# man/curs_inch.3x                                                                 |   16 
+# man/curs_initscr.3x                                                              |    6 
+# man/curs_inopts.3x                                                               |   21 
+# man/curs_ins_wstr.3x                                                             |   56 +-
+# man/curs_insstr.3x                                                               |   45 +-
+# man/curs_instr.3x                                                                |  180 ++++++--
+# man/curs_inwstr.3x                                                               |  213 +++++++---
+# man/curs_kernel.3x                                                               |   91 +++-
+# man/curs_scr_dump.3x                                                             |   26 -
+# man/curs_terminfo.3x                                                             |    5 
+# man/curs_util.3x                                                                 |  197 +++++----
+# man/define_key.3x                                                                |    9 
+# man/key_defined.3x                                                               |    7 
+# man/keybound.3x                                                                  |    8 
+# man/keyok.3x                                                                     |    8 
+# man/man_db.renames.in                                                            |    6 
+# man/manhtml.aliases                                                              |    6 
+# man/ncurses.3x                                                                   |   28 +
+# man/terminfo.tail                                                                |   28 -
+# man/tput.1                                                                       |   26 -
+# man/tset.1                                                                       |    9 
+# man/user_caps.5                                                                  |   11 
+# ncurses-6.5-20240608/package/debian-mingw/mingw32-ncurses6td.lintian-overrides   |    7 
+# ncurses-6.5-20240608/package/debian-mingw64/mingw64-ncurses6td.lintian-overrides |    7 
+# ncurses-6.5-20240608/package/debian/ncurses6td.lintian-overrides                 |    9 
+# ncurses-6.5-20240608/package/debian/ncurses6td.triggers                          |    1 
+# ncurses-6.5-20240608/package/debian/ncursest6td.lintian-overrides                |    9 
+# ncurses-6.5-20240608/package/debian/ncursest6td.triggers                         |    1 
+# ncurses/widechar/lib_inwstr.c                                                    |   19 
+# package/debian-mingw/changelog                                                   |    4 
+# package/debian-mingw/control                                                     |    7 
+# package/debian-mingw/rules                                                       |    4 
+# package/debian-mingw/watch                                                       |    2 
+# package/debian-mingw64/changelog                                                 |    4 
+# package/debian-mingw64/control                                                   |    7 
+# package/debian-mingw64/rules                                                     |    4 
+# package/debian-mingw64/watch                                                     |    2 
+# package/debian/changelog                                                         |    4 
+# package/debian/control                                                           |   22 -
+# package/debian/rules                                                             |   80 +--
+# package/debian/watch                                                             |    2 
+# package/mingw-ncurses.nsi                                                        |    4 
+# package/mingw-ncurses.spec                                                       |    2 
+# package/ncurses.spec                                                             |    2 
+# package/ncursest.spec                                                            |    2 
+# test/package/debian-mingw/rules                                                  |    2 
+# test/package/debian-mingw/watch                                                  |    2 
+# test/package/debian-mingw64/rules                                                |    2 
+# test/package/debian-mingw64/watch                                                |    2 
+# test/package/debian/rules                                                        |    4 
+# test/package/debian/watch                                                        |    2 
+# 94 files changed, 1407 insertions(+), 940 deletions(-)
+# ------------------------------------------------------------------------------
+# Please remove the following files before applying this patch.
+# (You can feed this patch to 'sh' to do so.)
+
+rm -f package/debian-mingw/mingw32-ncurses6.lintian-overrides
+rm -f package/debian-mingw64/mingw64-ncurses6.lintian-overrides
+rm -f package/debian/ncurses6.lintian-overrides
+rm -f package/debian/ncurses6.triggers
+rm -f package/debian/ncursest6.lintian-overrides
+rm -f package/debian/ncursest6.triggers
+exit
+
+Index: Ada95/include/ncurses_cfg.hin
+Prereq:  1.11 
+--- ncurses-6.5-20240601+/Ada95/include/ncurses_cfg.hin	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20240608/Ada95/include/ncurses_cfg.hin	2024-06-08 14:04:14.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 2005-2017,2018 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -31,7 +31,7 @@
+  *  Author: Thomas E. Dickey  1997                        *
+  ****************************************************************************/
+ /*
+- * $Id: ncurses_cfg.hin,v 1.11 2020/02/02 23:34:34 tom Exp $
++ * $Id: ncurses_cfg.hin,v 1.13 2024/06/08 14:04:14 tom Exp $
+  *
+  * This is a template-file used to generate the "ncurses_cfg.h" file.
+  *
+@@ -41,7 +41,7 @@
+  *
+  * See:
+  *	https://invisible-island.net/autoconf/
+- *	ftp://ftp.invisible-island.net/autoconf/
++ *	https://invisible-island.net/archives/autoconf/
+  */
+ #ifndef NC_CONFIG_H
+ #define NC_CONFIG_H
+Index: Ada95/package/AdaCurses-doc.spec
+Prereq:  1.7 
+--- ncurses-6.5-20240601+/Ada95/package/AdaCurses-doc.spec	2019-11-23 21:15:53.000000000 +0000
++++ ncurses-6.5-20240608/Ada95/package/AdaCurses-doc.spec	2024-06-08 13:54:31.000000000 +0000
+@@ -3,13 +3,13 @@
+ %define AppVersion MAJOR.MINOR
+ %define AppRelease YYYYMMDD
+ %define AppPackage %{AppProgram}-doc
+-# $Id: AdaCurses-doc.spec,v 1.7 2019/11/23 21:15:53 tom Exp $
++# $Id: AdaCurses-doc.spec,v 1.8 2024/06/08 13:54:31 tom Exp $
+ Name: %{AppPackage}
+ Version: %{AppVersion}
+ Release: %{AppRelease}
+ License: MIT
+ Group: Applications/Development
+-URL: ftp://ftp.invisible-island.net/%{AppProgram}
++URL: https://invisible-island.net/%{AppProgram}
+ Source0: %{AppProgram}-%{AppRelease}.tgz
+ Packager: Thomas Dickey 
+ 
+Index: Ada95/package/AdaCurses.spec
+Prereq:  1.33 
+--- ncurses-6.5-20240601+/Ada95/package/AdaCurses.spec	2024-06-01 22:51:57.000000000 +0000
++++ ncurses-6.5-20240608/Ada95/package/AdaCurses.spec	2024-06-08 13:53:14.000000000 +0000
+@@ -2,13 +2,13 @@
+ %define AppProgram AdaCurses
+ %define AppVersion MAJOR.MINOR
+ %define AppRelease YYYYMMDD
+-# $Id: AdaCurses.spec,v 1.33 2024/06/01 22:51:57 tom Exp $
++# $Id: AdaCurses.spec,v 1.34 2024/06/08 13:53:14 tom Exp $
+ Name: %{AppProgram}
+ Version: %{AppVersion}
+ Release: %{AppRelease}
+ License: MIT
+ Group: Applications/Development
+-URL: ftp://ftp.invisible-island.net/%{AppProgram}
++URL: https://invisible-island.net/%{AppProgram}
+ Source0: %{AppProgram}-%{AppRelease}.tgz
+ Packager: Thomas Dickey 
+ 
+Index: Ada95/package/debian/rules
+--- ncurses-6.5-20240601+/Ada95/package/debian/rules	2024-06-01 23:42:04.000000000 +0000
++++ ncurses-6.5-20240608/Ada95/package/debian/rules	2024-06-08 19:53:02.000000000 +0000
+@@ -41,7 +41,7 @@
+ 		--disable-rpath-link \
+ 		--with-shared \
+ 		--with-ada-sharedlib \
+-		--with-screen=ncurses6 \
++		--with-screen=ncursesw6td \
+ 		--without-pkg-config
+ 
+ 	touch configure-stamp
+Index: Ada95/package/debian/watch
+--- ncurses-6.5-20240601+/Ada95/package/debian/watch	2017-12-09 20:41:34.000000000 +0000
++++ ncurses-6.5-20240608/Ada95/package/debian/watch	2024-06-08 13:54:56.000000000 +0000
+@@ -1,4 +1,4 @@
+ version=3
+ 
+-opts=passive ftp://ftp.invisible-island.net/AdaCurses/AdaCurses-([\d.]+)\.tgz \
++opts=passive https://invisible-island.net/archives/AdaCurses/AdaCurses-([\d.]+)\.tgz \
+  debian  uupdate
+Index: INSTALL
+Prereq:  1.255 
+--- ncurses-6.5-20240601+/INSTALL	2024-05-04 15:54:00.000000000 +0000
++++ ncurses-6.5-20240608/INSTALL	2024-06-08 21:06:02.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: INSTALL,v 1.255 2024/05/04 15:54:00 tom Exp $
++-- $Id: INSTALL,v 1.256 2024/06/08 21:06:02 Branden.Robinson Exp $
+ ---------------------------------------------------------------------
+              How to install Ncurses/Terminfo on your system
+ ---------------------------------------------------------------------
+@@ -550,8 +550,8 @@
+ 	problem.
+ 
+     --enable-bsdpad
+-	Recognize BSD-style prefix padding.  Some ancient BSD programs (such as
+-	nethack) call tputs("50") to implement delays.
++	Recognize BSD-style prefix padding.  Some programs written using
++	the BSD curses API use tputs("50") to implement delays.
+ 
+     --enable-check-size
+ 	Compile-in feature to detect screensize for terminals which do not
+Index: MANIFEST
+--- ncurses-6.5-20240601+/MANIFEST	2023-11-10 11:30:02.000000000 +0000
++++ ncurses-6.5-20240608/MANIFEST	2024-06-08 15:02:30.000000000 +0000
+@@ -1012,7 +1012,7 @@
+ ./package/debian-mingw/compat
+ ./package/debian-mingw/control
+ ./package/debian-mingw/copyright
+-./package/debian-mingw/mingw32-ncurses6.lintian-overrides
++./package/debian-mingw/mingw32-ncurses6td.lintian-overrides
+ ./package/debian-mingw/rules
+ ./package/debian-mingw/source/format
+ ./package/debian-mingw/watch
+@@ -1020,7 +1020,7 @@
+ ./package/debian-mingw64/compat
+ ./package/debian-mingw64/control
+ ./package/debian-mingw64/copyright
+-./package/debian-mingw64/mingw64-ncurses6.lintian-overrides
++./package/debian-mingw64/mingw64-ncurses6td.lintian-overrides
+ ./package/debian-mingw64/rules
+ ./package/debian-mingw64/source/format
+ ./package/debian-mingw64/watch
+@@ -1028,10 +1028,10 @@
+ ./package/debian/compat
+ ./package/debian/control
+ ./package/debian/copyright
+-./package/debian/ncurses6.lintian-overrides
+-./package/debian/ncurses6.triggers
+-./package/debian/ncursest6.lintian-overrides
+-./package/debian/ncursest6.triggers
++./package/debian/ncurses6td.lintian-overrides
++./package/debian/ncurses6td.triggers
++./package/debian/ncursest6td.lintian-overrides
++./package/debian/ncursest6td.triggers
+ ./package/debian/rules
+ ./package/debian/source/format
+ ./package/debian/watch
+Index: NEWS
+Prereq:  1.4131 
+--- ncurses-6.5-20240601+/NEWS	2024-06-01 22:49:52.000000000 +0000
++++ ncurses-6.5-20240608/NEWS	2024-06-08 21:21:25.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4131 2024/06/01 22:49:52 tom Exp $
++-- $Id: NEWS,v 1.4134 2024/06/08 21:21:25 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.
+ 
++20240608
++	+ change winwstr to return wide character count instead of OK (patch
++	  by Branden Robinson).
++	+ improve formatting/style of manpages (patches by Branden Robinson).
++	+ rename testing dpkg's for ncurses6 to resolve a naming conflict with
++	  Debian's ncurses packages.
++
+ 20240601
+ 	+ improve formatting/style of manpages (patches by Branden Robinson).
+ 	+ change Ada95/configure to use --with-screen option rather than
+Index: VERSION
+--- ncurses-6.5-20240601+/VERSION	2024-06-01 11:06:41.000000000 +0000
++++ ncurses-6.5-20240608/VERSION	2024-06-08 09:49:40.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20240601
++5:0:10	6.5	20240608
+Index: dist.mk
+Prereq:  1.1616 
+--- ncurses-6.5-20240601+/dist.mk	2024-06-01 11:06:41.000000000 +0000
++++ ncurses-6.5-20240608/dist.mk	2024-06-08 09:49:40.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1616 2024/06/01 11:06:41 tom Exp $
++# $Id: dist.mk,v 1.1617 2024/06/08 09:49:40 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 = 5
+-NCURSES_PATCH = 20240601
++NCURSES_PATCH = 20240608
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/curs_addch.3x.html
+--- ncurses-6.5-20240601+/doc/html/man/curs_addch.3x.html	2024-06-01 23:07:15.000000000 +0000
++++ ncurses-6.5-20240608/doc/html/man/curs_addch.3x.html	2024-06-08 23:12:48.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addch.3x,v 1.90 2024/06/01 22:29:08 tom Exp @
++  * @Id: curs_addch.3x,v 1.92 2024/06/08 20:51:41 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addch 3x 2024-06-01 ncurses 6.5 Library calls
++curs_addch 3x 2024-06-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                  curs_addch 3x 2024-06-01 ncurses 6.5 Library calls
                                                                                                  
++
                                                                                                  curs_addch 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                  
+ 
                                                                                                  + curs_addch(3x)                   Library calls                  curs_addch(3x)
+ 
+@@ -217,80 +217,79 @@
+ 
+ 
+ 
                                                                                                  ACS Symbols
                                                                                                  +-       X/Open Curses states that the ACS_ definitions are char constants.
+-
++       X/Open Curses states that the  ACS_  definitions  are  char  constants.
+        Some implementations are problematic.
+ 
+-       o   Solaris curses, for example, defines the ACS symbols as  constants;
++       o   Solaris  curses, for example, defines the ACS symbols as constants;
+            others define them as elements of an array.
+ 
+-           This  implementation  uses  an  array, acs_map, as did SVr4 curses.
++           This implementation uses an array, acs_map,  as  did  SVr4  curses.
+            NetBSD also uses an array, actually named _acs_char, with a #define
+            for compatibility.
+ 
+-       o   HP-UX  curses  equates  some  of  the ACS_ symbols to the analogous
+-           WACS_ symbols as if the ACS_  symbols  were  wide  characters  (see
+-           curs_add_wch(3x)).   The  misdefined  symbols  are  the  arrows and
++       o   HP-UX curses equates some of the  ACS_  symbols  to  the  analogous
++           WACS_  symbols  as  if  the  ACS_ symbols were wide characters (see
++           curs_add_wch(3x)).  The  misdefined  symbols  are  the  arrows  and
+            others that are not used for line drawing.
+ 
+-       o   X/Open Curses (Issues 2 through 7) has a  typographical  error  for
+-           the  ACS_LANTERN  symbol,  equating  its  "VT100+ Character" to "I"
+-           (capital I), while the header  files  for  SVr4  curses  and  other
++       o   X/Open  Curses  (Issues  2 through 7) has a typographical error for
++           the ACS_LANTERN symbol, equating  its  "VT100+  Character"  to  "I"
++           (capital  I),  while  the  header  files  for SVr4 curses and other
+            implementations use "i" (small i).
+ 
+-           None  of  the terminal descriptions on Unix platforms use uppercase
+-           I, except  for  Solaris  (in  its  terminfo  entry  for  screen(1),
+-           apparently  based on the X/Open documentation around 1995).  On the
+-           other hand, its gs6300 (AT&T PC6300 with EMOTS  Terminal  Emulator)
++           None of the terminal descriptions on Unix platforms  use  uppercase
++           I,  except  for  Solaris  (in  its  terminfo  entry  for screen(1),
++           apparently based on the X/Open documentation around 1995).  On  the
++           other  hand,  its gs6300 (AT&T PC6300 with EMOTS Terminal Emulator)
+            description uses lowercase i.
+ 
+-       Some  ACS  symbols  (ACS_S3,  ACS_S7,  ACS_LEQUAL,  ACS_GEQUAL, ACS_PI,
+-       ACS_NEQUAL, and ACS_STERLING)  were  not  documented  in  any  publicly
+-       released  System V.   However, many publicly available terminfo entries
+-       include acsc capabilities in which their key characters  (pryz{|})  are
+-       embedded,  and  a  second-hand list of their character descriptions has
+-       come to light.  The ncurses developers invented ACS-prefixed names  for
++       Some ACS  symbols  (ACS_S3,  ACS_S7,  ACS_LEQUAL,  ACS_GEQUAL,  ACS_PI,
++       ACS_NEQUAL,  and  ACS_STERLING)  were  not  documented  in any publicly
++       released System V.  However, many publicly available  terminfo  entries
++       include  acsc  capabilities in which their key characters (pryz{|}) are
++       embedded, and a second-hand list of their  character  descriptions  has
++       come  to light.  The ncurses developers invented ACS-prefixed names for
+        them.
+ 
+        The displayed values of ACS_ constants depend on
+ 
+        o   the  ncurses  ABI--for  example,  wide-character  versus  non-wide-
+-           character configurations  (the  former  is  capable  of  displaying
++           character  configurations  (the  former  is  capable  of displaying
+            Unicode while the latter is not), and
+ 
+        o   whether the locale uses UTF-8 encoding.
+ 
+-       In  certain  cases,  the  terminal  is  unable to display forms-drawing
+-       characters  except  by  using  UTF-8;  see  the   discussion   of   the
++       In certain cases, the  terminal  is  unable  to  display  forms-drawing
++       characters   except   by   using  UTF-8;  see  the  discussion  of  the
+        NCURSES_NO_UTF8_ACS environment variable in ncurses(3x).
+ 
+ 
+ 
                                                                                                  Character Set
                                                                                                  +-       X/Open  Curses  assumes  that the parameter passed to waddch contains a
+-       single character.  That character may have been more  than  eight  bits
+-       wide  in  an  SVr3 or SVr4 implementation, but X/Open Curses leaves the
+-       width of a non-wide character code unspecified.  The  standard  further
+-       does  not specify the internal structure of a chtype, though the use of
+-       bit operations to combine the character  code  with  attributes  and  a
++       X/Open Curses assumes that the parameter passed to  waddch  contains  a
++       single  character.   That  character may have been more than eight bits
++       wide in an SVr3 or SVr4 implementation, but X/Open  Curses  leaves  the
++       width  of  a non-wide character code unspecified.  The standard further
++       does not specify the internal structure of a chtype, though the use  of
++       bit  operations  to  combine  the  character code with attributes and a
+        color pair identifier into a chtype for passage to waddch is common.  A
+        portable application uses only the macros discussed in curs_attr(3x) to
+        manipulate a chtype.
+ 
+        In ncurses, chtype holds an eight-bit character, but the library allows
+-       a multibyte character sequence to be passed via a succession  of  calls
+-       to  waddch.   Other  implementations  do  not;  a waddch call transmits
+-       exactly one character, which may be rendered  in  one  or  more  screen
+-       locations  depending  on  whether  it  is  printable  (see unctrl(3x)).
+-       Depending on the locale, ncurses  inspects  the  byte  passed  in  each
+-       waddch  call  and  checks whether the latest call continues a multibyte
+-       character.   When  a  character  is  complete,  ncurses  displays   the
+-       character   and  advances  the  cursor.   If  the  calling  application
++       a  multibyte  character sequence to be passed via a succession of calls
++       to waddch.  Other implementations  do  not;  a  waddch  call  transmits
++       exactly  one  character,  which  may  be rendered in one or more screen
++       locations depending  on  whether  it  is  printable  (see  unctrl(3x)).
++       Depending  on  the  locale,  ncurses  inspects  the byte passed in each
++       waddch call and checks whether the latest call  continues  a  multibyte
++       character.    When  a  character  is  complete,  ncurses  displays  the
++       character  and  advances  the  cursor.   If  the  calling   application
+        interrupts the succession of bytes in a multibyte character sequence by
+-       changing  the  current  location--for  example, with wmove(3x)--ncurses
++       changing the current  location--for  example,  with  wmove(3x)--ncurses
+        discards the incomplete character.
+ 
+        For  portability  to  other  implementations,  do  not  rely  upon  the
+-       foregoing  behavior.  Check whether a character can be represented as a
++       foregoing behavior.  Check whether a character can be represented as  a
+        single byte in the current locale.
+ 
+        o   If it can, call either waddch or wadd_wch(3x).
+@@ -305,16 +304,16 @@
+ 
+ 
+ 
                                                                                                  SEE ALSO
                                                                                                  +-       curs_add_wch(3x) describes comparable functions of the ncurses  library
++       curs_add_wch(3x)  describes comparable functions of the ncurses library
+        in its wide-character configuration (ncursesw).
+ 
+        curses(3x),    curs_addchstr(3x),    curs_addstr(3x),    curs_attr(3x),
+-       curs_clear(3x),  curs_inch(3x),   curs_outopts(3x),   curs_refresh(3x),
++       curs_clear(3x),   curs_inch(3x),   curs_outopts(3x),  curs_refresh(3x),
+        curs_variables(3x), putchar(3)
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-01                    curs_addch(3x)
++ncurses 6.5                       2024-06-08                    curs_addch(3x)
+ 
                                                                                                  
+ 
                                                                                                  
+ 
                                                                                                    
+Index: doc/html/man/curs_get_wch.3x.html
+--- ncurses-6.5-20240601+/doc/html/man/curs_get_wch.3x.html	2024-05-11 21:39:56.000000000 +0000
++++ ncurses-6.5-20240608/doc/html/man/curs_get_wch.3x.html	2024-06-08 23:21:18.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_get_wch.3x,v 1.41 2024/05/11 20:39:53 tom Exp @
++  * @Id: curs_get_wch.3x,v 1.43 2024/06/08 20:25:25 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_get_wch 3x 2024-05-11 ncurses 6.5 Library calls
++curs_get_wch 3x 2024-06-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                    curs_get_wch 3x 2024-05-11 ncurses 6.5 Library calls
                                                                                                    
++
                                                                                                    curs_get_wch 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                    
+ 
                                                                                                    + curs_get_wch(3x)                 Library calls                curs_get_wch(3x)
+ 
+@@ -81,31 +81,35 @@
+        If  no input is pending, then if the no-delay flag is set in the window
+        (see nodelay(3x)), the function returns ERR;  otherwise,  curses  waits
+        until  the  terminal  has  input.   If cbreak(3x) has been called, this
+-       happens after one character is read.  If nocbreak(3x) has been  called,
+-       it  occurs  when  the  next newline is read.  If halfdelay(3x) has been
+-       called, curses waits until input is available or  the  specified  delay
+-       elapses.
++       happens after one character is read.  If nocbreak(3x) or noraw(3x)  has
++       been  called,  it  occurs  when the next newline is read.  (Because the
++       terminal's normal or "cooked" mode is line-buffered, multiple  wget_wch
++       calls   may   then   be  necessary  to  empty  the  input  queue.)   If
++       halfdelay(3x) has been called, curses waits until input is available or
++       the specified delay elapses.
+ 
+        If echo(3x) has been called, and the window is not a pad, curses writes
+-       wch to the window (at the cursor position) per the following rules.
++       the wide character from the input queue to the window  (at  the  cursor
++       position) per the following rules.
+ 
+-       o   If wch matches the terminal's erase  character,  the  cursor  moves
+-           leftward  one  position  and  the  new  position  is  erased  as if
+-           wmove(3x) and then  wdelch(3x)  were  called.   When  the  window's
+-           keypad  mode is enabled (see below), KEY_LEFT and KEY_BACKSPACE are
+-           handled the same way.
++       o   If  the  wide character matches the terminal's erase character (see
++           erasewchar(3x)), the cursor moves leftward one position and the new
++           position is erased as if wmove(3x) and then wdelch(3x) were called.
++           When the window's keypad mode is enabled (see below), KEY_LEFT  and
++           KEY_BACKSPACE are handled the same way.
+ 
+-       o   curses writes any other wch to the window, as with wecho_wchar(3x).
++       o   curses  writes  any  other  wide  character  to the window, as with
++           wecho_wchar(3x).
+ 
+        o   If the window win has been moved or modified since the last call to
+            wrefresh(3x), curses calls wrefresh on it.
+ 
+-       If  wch  is a carriage return and nl(3x) has been called, wgetch stores
+-       the the character code for line feed in wch instead.
++       If  the wide character is a carriage return and nl(3x) has been called,
++       wgetch stores the the wide character code for line feed in wch instead.
+ 
+ 
+ 
                                                                                                    Ungetting Characters
                                                                                                    +-       unget_wch places wch into the input queue to be returned  by  the  next
++       unget_wch places wc into the input queue to be retrieved  by  the  next
+        call  to  wget_wch.  A single input queue serves all windows associated
+        with the terminal.
+ 
+@@ -168,7 +172,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-11                  curs_get_wch(3x)
++ncurses 6.5                       2024-06-08                  curs_get_wch(3x)
+ 
                                                                                                    
+ 
                                                                                                    
+ 
                                                                                                      
+Index: doc/html/man/curs_get_wstr.3x.html
+--- ncurses-6.5-20240601+/doc/html/man/curs_get_wstr.3x.html	2024-05-25 22:33:42.000000000 +0000
++++ ncurses-6.5-20240608/doc/html/man/curs_get_wstr.3x.html	2024-06-08 23:12:48.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_get_wstr.3x,v 1.50 2024/05/25 20:10:58 tom Exp @
++  * @Id: curs_get_wstr.3x,v 1.52 2024/06/08 21:01:53 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_get_wstr 3x 2024-05-25 ncurses 6.5 Library calls
++curs_get_wstr 3x 2024-06-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                      curs_get_wstr 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                      
++
                                                                                                      curs_get_wstr 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                      
+ 
                                                                                                      + curs_get_wstr(3x)                Library calls               curs_get_wstr(3x)
+ 
+@@ -142,8 +142,8 @@
+ 
+ 
+ 
                                                                                                      PORTABILITY
                                                                                                      +-       These functions are described in The Single Unix Specification, Version
+-       2.  No error conditions are defined.
++       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
++       error conditions for them.
+ 
+        This  implementation  returns  ERR if the window pointer is null, or if
+        the lower-level wget_wch call returns an ERR.  In the latter  case,  an
+@@ -189,7 +189,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                 curs_get_wstr(3x)
++ncurses 6.5                       2024-06-08                 curs_get_wstr(3x)
+ 
                                                                                                      
+ 
                                                                                                      
+ 
                                                                                                        
+Index: doc/html/man/curs_getch.3x.html
+--- ncurses-6.5-20240601+/doc/html/man/curs_getch.3x.html	2024-06-01 23:07:16.000000000 +0000
++++ ncurses-6.5-20240608/doc/html/man/curs_getch.3x.html	2024-06-08 23:21:18.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_getch.3x,v 1.95 2024/06/01 22:29:08 tom Exp @
++  * @Id: curs_getch.3x,v 1.97 2024/06/08 20:26:46 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_getch 3x 2024-06-01 ncurses 6.5 Library calls
++curs_getch 3x 2024-06-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                        curs_getch 3x 2024-06-01 ncurses 6.5 Library calls
                                                                                                        
++
                                                                                                        curs_getch 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                        
+ 
                                                                                                        + curs_getch(3x)                   Library calls                  curs_getch(3x)
+ 
+@@ -84,20 +84,22 @@
+        If no input is pending, then if the no-delay flag is set in the  window
+        (see  nodelay(3x)),  the  function returns ERR; otherwise, curses waits
+        until the terminal has input.  If  cbreak(3x)  has  been  called,  this
+-       happens  after one character is read.  If nocbreak(3x) has been called,
+-       it occurs when the next newline is read.   If  halfdelay(3x)  has  been
+-       called,  curses  waits  until input is available or the specified delay
+-       elapses.
++       happens  after one character is read.  If nocbreak(3x) or noraw(3x) has
++       been called, it occurs when the next newline  is  read.   (Because  the
++       terminal's  normal  or  "cooked" mode is line-buffered, multiple wgetch
++       calls  may  then  be  necessary  to  empty  the   input   queue.)    If
++       halfdelay(3x) has been called, curses waits until input is available or
++       the specified delay elapses.
+ 
+        If echo(3x) has been called, and the window is not a pad, curses writes
+        the returned character c to the window (at the cursor position) per the
+        following rules.
+ 
+-       o   If c matches the  terminal's  erase  character,  the  cursor  moves
+-           leftward  one  position  and  the  new  position  is  erased  as if
+-           wmove(3x) and then  wdelch(3x)  were  called.   When  the  window's
+-           keypad  mode is enabled (see below), KEY_LEFT and KEY_BACKSPACE are
+-           handled the same way.
++       o   If c matches the terminal's erase  character  (see  erasechar(3x)),
++           the  cursor  moves  leftward  one  position and the new position is
++           erased as if wmove(3x) and then wdelch(3x) were called.   When  the
++           window's   keypad   mode  is  enabled  (see  below),  KEY_LEFT  and
++           KEY_BACKSPACE are handled the same way.
+ 
+        o   curses writes any other c to the window, as with wechochar(3x).
+ 
+@@ -178,9 +180,9 @@
+               KEY_UP          Arrow keys
+               KEY_LEFT
+               KEY_RIGHT
++
+               KEY_HOME        Home key (upward+left arrow)
+               KEY_BACKSPACE   Backspace
+-
+               KEY_F0          Function keys; space for 64 keys is reserved
+               KEY_F(n)        Function key n where 0 <= n <= 63
+               KEY_DL          Delete line
+@@ -244,9 +246,9 @@
+               KEY_SCOMMAND    Shifted command key
+               KEY_SCOPY       Shifted copy key
+               KEY_SCREATE     Shifted create key
++
+               KEY_SDC         Shifted delete character key
+               KEY_SDL         Shifted delete line key
+-
+               KEY_SEND        Shifted end key
+               KEY_SEOL        Shifted clear line key
+               KEY_SEXIT       Shifted exit key
+@@ -282,8 +284,8 @@
+        key.
+ 
+        o   wgetch  returns  KEY_RESIZE,  even  if  the window's keypad mode is
+-           disabled, when ncurses handles a SIGWINCH signal;  see  initscr(3x)
+-           and resizeterm(3x).
++           disabled, if ncurses has handled a SIGWINCH signal since wgetch was
++           called; see initscr(3x) and resizeterm(3x).
+ 
+        o   wgetch  returns KEY_MOUSE to indicate that a mouse event is pending
+            collection; see curs_mouse(3x).  Receipt of this  code  requires  a
+@@ -388,45 +390,44 @@
+        wgetch reads only single-byte characters.
+ 
+        The  echo  behavior  of  these  functions on input of KEY_ or backspace
+-       characters  was  not  specified  in  the  SVr4   documentation.    This
+-       description is adapted from X/Open Curses.
++       characters is not documented in SVr4 curses.
+ 
+-       The   behavior  of  wgetch  in  the  presence  of  signal  handlers  is
+-       unspecified in the SVr4 documentation and X/Open Curses.  In historical
+-       curses  implementations,  it  varied depending on whether the operating
+-       system's dispatch of a signal to a handler interrupted a  read(2)  call
+-       in  progress,  and  also  (in  some  implementations)  whether an input
+-       timeout  or  non-blocking  mode  had  been  set.   A  portable   curses
+-       application  prepares  for  two  cases:  (a)  signal  receipt  does not
++       The behavior of wgetch in  the  presence  of  signal  handlers  is  not
++       documented  in  SVr4  curses  and  is unspecified by X/Open Curses.  In
++       historical curses implementations, it varied depending on  whether  the
++       operating  system's  dispatch  of  a  signal to a handler interrupted a
++       read(2) call in progress, and also (in some implementations) whether an
++       input  timeout  or  non-blocking  mode had been set.  A portable curses
++       application prepares  for  two  cases:  (a)  signal  receipt  does  not
+        interrupt wgetch; or (b) signal receipt interrupts wgetch and causes it
+        to return ERR with errno set to EINTR.
+ 
+        KEY_MOUSE is mentioned in X/Open Curses, along with a few related term-
+-       info capabilities, but no higher-level functions use the feature.   The
++       info  capabilities, but no higher-level functions use the feature.  The
+        implementation in ncurses is an extension.
+ 
+-       KEY_RESIZE  and  has_key  are extensions first implemented for ncurses.
++       KEY_RESIZE and has_key are extensions first  implemented  for  ncurses.
+        By  2022,  PDCurses  and  NetBSD  curses  had  added  them  along  with
+        KEY_MOUSE.
+ 
+ 
+ 
                                                                                                        SEE ALSO
                                                                                                        +-       ECMA-6  "7-bit  coded  Character  Set" <https://ecma-international.org/
++       ECMA-6 "7-bit  coded  Character  Set"  <https://ecma-international.org/
+        publications-and-standards/standards/ecma-6/>
+ 
+-       ECMA-48  "Control  Functions  for  Coded  Character   Sets"   <https://
++       ECMA-48   "Control   Functions  for  Coded  Character  Sets"  <https://
+        ecma-international.org/publications-and-standards/standards/ecma-48/>
+ 
+-       curs_get_wch(3x)  describes comparable functions of the ncurses library
++       curs_get_wch(3x) describes comparable functions of the ncurses  library
+        in its wide-character configuration (ncursesw).
+ 
+-       curses(3x),    curs_addch(3x),     curs_inopts(3x),     curs_mouse(3x),
+-       curs_move(3x),  curs_outopts(3x), curs_refresh(3x), curs_variables(3x),
++       curses(3x),     curs_addch(3x),     curs_inopts(3x),    curs_mouse(3x),
++       curs_move(3x), curs_outopts(3x), curs_refresh(3x),  curs_variables(3x),
+        resizeterm(3x), ascii(7)
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-01                    curs_getch(3x)
++ncurses 6.5                       2024-06-08                    curs_getch(3x)
+ 
                                                                                                        
+ 
                                                                                                        
+ 
                                                                                                          
+Index: doc/html/man/curs_getstr.3x.html
+--- ncurses-6.5-20240601+/doc/html/man/curs_getstr.3x.html	2024-06-01 23:07:16.000000000 +0000
++++ ncurses-6.5-20240608/doc/html/man/curs_getstr.3x.html	2024-06-08 23:12:48.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_getstr.3x,v 1.63 2024/06/01 22:29:08 tom Exp @
++  * @Id: curs_getstr.3x,v 1.65 2024/06/08 21:04:32 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_getstr 3x 2024-06-01 ncurses 6.5 Library calls
++curs_getstr 3x 2024-06-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                          curs_getstr 3x 2024-06-01 ncurses 6.5 Library calls
                                                                                                          
++
                                                                                                          curs_getstr 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                          
+ 
                                                                                                          + curs_getstr(3x)                  Library calls                 curs_getstr(3x)
+ 
+@@ -138,99 +138,96 @@
+ 
+ 
+ 
                                                                                                          PORTABILITY
                                                                                                          +-       These functions are described in The Single Unix Specification, Version
+-       2.  No error conditions are defined.
++       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
++       error conditions for them.
+ 
+-       This  implementation  returns  ERR if the window pointer is null, or if
+-       the lower-level wgetch(3x) call returns an ERR.
+-
+-       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,  etc.)  are  "interpreted",
+-       without  giving  details.   It  lied.   In  fact, the "character" value
++       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,  etc.)  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_
++       useful (being, in fact, the low-order eight  bits  of  the  key's  KEY_
+        value).
+ 
+-       The functions getnstr, mvgetnstr, and mvwgetnstr were present  but  not
++       The  functions  getnstr, mvgetnstr, and mvwgetnstr were present but not
+        documented in SVr4.
+ 
+        X/Open Curses, Issue 5 (2007) stated that these functions "read at most
+-       n bytes" but did not state whether the terminating NUL  counted  toward
+-       that  limit.   X/Open  Curses,  Issue 7 (2009) changed that to say they
++       n  bytes"  but did not state whether the terminating NUL counted toward
++       that limit.  X/Open Curses, Issue 7 (2009) changed  that  to  say  they
+        "read at most n-1 bytes" to allow for the terminating NUL.  As of 2018,
+        some implementations count it, some do not:
+ 
+-       o   ncurses  6.1  and PDCurses do not count the NUL in the given limit,
++       o   ncurses 6.1 and PDCurses do not count the NUL in the  given  limit,
+            while
+ 
+        o   Solaris SVr4 and NetBSD curses count the NUL as part of the limit.
+ 
+-       o   Solaris  xcurses  provides  both:  its   wide-character   wget_nstr
+-           reserves   a   NUL,  but  its  wgetnstr  does  not  count  the  NUL
++       o   Solaris   xcurses   provides  both:  its  wide-character  wget_nstr
++           reserves  a  NUL,  but  its  wgetnstr  does  not  count   the   NUL
+            consistently.
+ 
+        In SVr4 curses, a negative value of n tells wgetnstr to assume that the
+-       caller's  buffer  is large enough to hold the result, i.e., to act like
+-       wgetstr.  X/Open Curses does not mention this (or anything  related  to
+-       negative  or  zero  values  of n), however most implementations use the
++       caller's buffer is large enough to hold the result, i.e., to  act  like
++       wgetstr.   X/Open  Curses does not mention this (or anything related to
++       negative or zero values of n), however  most  implementations  use  the
+        feature, with different limits:
+ 
+-       o   Solaris SVr4 curses and PDCurses limit the  result  to  255  bytes.
++       o   Solaris  SVr4  curses  and  PDCurses limit the result to 255 bytes.
+            Other Unix systems than Solaris are likely to use the same limit.
+ 
+        o   Solaris xcurses limits the result to LINE_MAX bytes.
+ 
+-       o   NetBSD  7  assumes no particular limit for the result from wgetstr.
+-           However, it limits the wgetnstr parameter n to ensure  that  it  is
++       o   NetBSD 7 assumes no particular limit for the result  from  wgetstr.
++           However,  it  limits  the wgetnstr parameter n to ensure that it is
+            greater than zero.
+ 
+-           A  comment in NetBSD's source code states that this is specified in
++           A comment in NetBSD's source code states that this is specified  in
+            SUSv2.
+ 
+-       o   ncurses (before 6.2) assumes no particular  limit  for  the  result
+-           from  wgetstr,  and  treats  the  n parameter of wgetnstr like SVr4
++       o   ncurses  (before  6.2)  assumes  no particular limit for the result
++           from wgetstr, and treats the n  parameter  of  wgetnstr  like  SVr4
+            curses.
+ 
+-       o   ncurses 6.2 uses LINE_MAX, or  a  larger  (system-dependent)  value
+-           which  the  sysconf  function  may provide.  If neither LINE_MAX or
+-           sysconf is available, ncurses uses the POSIX value for LINE_MAX  (a
+-           2048  byte  limit).   In  either  case,  it reserves a byte for the
++       o   ncurses  6.2  uses  LINE_MAX,  or a larger (system-dependent) value
++           which the sysconf function may provide.   If  neither  LINE_MAX  or
++           sysconf  is available, ncurses uses the POSIX value for LINE_MAX (a
++           2048 byte limit).  In either case,  it  reserves  a  byte  for  the
+            terminating NUL.
+ 
+-       Although getnstr is equivalent to a series of calls to getch,  it  also
+-       makes  changes to the curses modes to allow simple editing of the input
++       Although  getnstr  is equivalent to a series of calls to getch, it also
++       makes changes to the curses modes to allow simple editing of the  input
+        buffer:
+ 
+-       o   getnstr saves the current value of the nl,  echo,  raw  and  cbreak
++       o   getnstr  saves  the  current  value of the nl, echo, raw and cbreak
+            modes, and sets nl, noecho, noraw, and cbreak.
+ 
+-           getnstr  handles  the echoing of characters, rather than relying on
++           getnstr handles the echoing of characters, rather than  relying  on
+            the caller to set an appropriate mode.
+ 
+-       o   It also obtains the erase and kill characters  from  erasechar  and
++       o   It  also  obtains  the erase and kill characters from erasechar and
+            killchar, respectively.
+ 
+        o   On return, getnstr restores the modes to their previous values.
+ 
+        Other implementations differ in their treatment of special characters:
+ 
+-       o   While  they  may  set  the  echo mode, other implementations do not
+-           modify the raw mode, They may take  the  cbreak  mode  set  by  the
+-           caller  into account when deciding whether to handle echoing within
++       o   While they may set the echo  mode,  other  implementations  do  not
++           modify  the  raw  mode,  They  may  take the cbreak mode set by the
++           caller 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
+-           accepting  input  for  getnstr.   That  may  have been done to make
++           accepting input for getnstr.  That  may  have  been  done  to  make
+            function- and cursor-keys work; it is not necessary with ncurses.
+ 
+-           Since 1995, ncurses has provided signal handlers for INTR and  QUIT
+-           (e.g.,  ^C  or  ^\).  With the noraw and cbreak settings, those may
+-           catch a signal and stop the program,  where  other  implementations
++           Since  1995, ncurses has provided signal handlers for INTR and QUIT
++           (e.g., ^C or ^\).  With the noraw and cbreak  settings,  those  may
++           catch  a  signal  and stop the program, where other implementations
+            allow one to enter those characters in the buffer.
+ 
+        o   Starting in 2021 (ncurses 6.3), getnstr sets raw, rather than noraw
+-           and  cbreak  for  better  compatibility  with  SVr4-curses,   e.g.,
++           and   cbreak  for  better  compatibility  with  SVr4-curses,  e.g.,
+            allowing one to enter a ^C into the buffer.
+ 
+ 
+@@ -242,7 +239,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-01                   curs_getstr(3x)
++ncurses 6.5                       2024-06-08                   curs_getstr(3x)
+ 
                                                                                                          
+ 
                                                                                                          
+ 
                                                                                                            
+Index: doc/html/man/curs_getyx.3x.html
+--- ncurses-6.5-20240601+/doc/html/man/curs_getyx.3x.html	2024-05-11 21:39:56.000000000 +0000
++++ ncurses-6.5-20240608/doc/html/man/curs_getyx.3x.html	2024-06-08 23:12:48.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_getyx.3x,v 1.45 2024/05/11 20:39:53 tom Exp @
++  * @Id: curs_getyx.3x,v 1.47 2024/06/08 20:42:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_getyx 3x 2024-05-11 ncurses 6.5 Library calls
++curs_getyx 3x 2024-06-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                            curs_getyx 3x 2024-05-11 ncurses 6.5 Library calls
                                                                                                            
++
                                                                                                            curs_getyx 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                            
+ 
                                                                                                            + curs_getyx(3x)                   Library calls                  curs_getyx(3x)
+ 
+@@ -64,10 +64,10 @@
+ 
                                                                                                            DESCRIPTION
                                                                                                            +        These macros obtain the cursor position and  bounds  information  of  a
+        curses window win.  getyx stores win's cursor position in the variables
+-       y and x.  getmaxyx stores win's maximum valid row and column numbers in
+-       y and x, respectively.  getbegyx similarly stores the position of win's
+-       origin relative to that of the screen (for  stdscr,  these  coordinates
+-       are always 0).
++       y and x.  getmaxyx stores win's maximum valid line and  column  numbers
++       in  y  and  x, respectively.  getbegyx similarly stores the position of
++       win's origin  relative  to  that  of  the  screen  (for  stdscr,  these
++       coordinates are always 0).
+ 
+        If  win  is a subwindow (see subwin(3x)), the getparyx macro places the
+        coordinates of its origin relative to its parent window into y  and  x,
+@@ -109,7 +109,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-11                    curs_getyx(3x)
++ncurses 6.5                       2024-06-08                    curs_getyx(3x)
+ 
                                                                                                            
+ 
                                                                                                            
+ 
                                                                                                              
+Index: doc/html/man/curs_inch.3x.html
+--- ncurses-6.5-20240601+/doc/html/man/curs_inch.3x.html	2024-06-01 23:07:16.000000000 +0000
++++ ncurses-6.5-20240608/doc/html/man/curs_inch.3x.html	2024-06-08 23:12:49.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inch.3x,v 1.58 2024/06/01 22:29:08 tom Exp @
++  * @Id: curs_inch.3x,v 1.60 2024/06/08 20:45:43 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inch 3x 2024-06-01 ncurses 6.5 Library calls
++curs_inch 3x 2024-06-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                              curs_inch 3x 2024-06-01 ncurses 6.5 Library calls
                                                                                                              
++
                                                                                                              curs_inch 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                              
+ 
                                                                                                              + curs_inch(3x)                    Library calls                   curs_inch(3x)
+ 
+@@ -109,23 +109,16 @@
+        ISO C99.  SVr3.2 (1988) added a 6-bit color pair  identifier  alongside
+        the attributes.
+ 
+-       X/Open Curses does not specify the sizes of the character code or color
+-       pair identifier, nor the quantity of attribute bits, in  chtype;  these
+-       are   implementation-dependent.    ncurses  uses  eight  bits  for  the
+-       character code.  An application requiring a wider character  type,  for
+-       instance   to   represent   Unicode,   should  use  the  wide-character
+-       counterparts of these functions.
+-
+ 
+ 
                                                                                                              SEE ALSO
                                                                                                              +-       curs_in_wch(3x) describes comparable functions of the  ncurses  library
++       curs_in_wch(3x)  describes  comparable functions of the ncurses library
+        in its wide-character configuration (ncursesw).
+ 
+        curses(3x), curs_instr(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-01                     curs_inch(3x)
++ncurses 6.5                       2024-06-08                     curs_inch(3x)
+ 
                                                                                                              
+ 
                                                                                                              
+ 
                                                                                                                
+Index: doc/html/man/curs_initscr.3x.html
+--- ncurses-6.5-20240601+/doc/html/man/curs_initscr.3x.html	2024-06-01 23:07:16.000000000 +0000
++++ ncurses-6.5-20240608/doc/html/man/curs_initscr.3x.html	2024-06-08 23:12:49.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_initscr.3x,v 1.73 2024/06/01 22:38:43 tom Exp @
++  * @Id: curs_initscr.3x,v 1.75 2024/06/08 20:34:23 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_initscr 3x 2024-06-01 ncurses 6.5 Library calls
++curs_initscr 3x 2024-06-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                curs_initscr 3x 2024-06-01 ncurses 6.5 Library calls
                                                                                                                
++
                                                                                                                curs_initscr 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                
+ 
                                                                                                                + curs_initscr(3x)                 Library calls                curs_initscr(3x)
+ 
+@@ -286,7 +286,7 @@
+        SIGWINCH
+             This handles the window-size changes which  were  ignored  in  the
+             standardization   efforts.    The  handler  sets  a  (signal-safe)
+-            variable that is later tested by wgetch(3x) and wget_wch(3x):
++            variable that is later tested by wgetch(3x) and wget_wch(3x).
+ 
+             o   wgetch returns the key code KEY_RESIZE.
+ 
+@@ -303,7 +303,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-01                  curs_initscr(3x)
++ncurses 6.5                       2024-06-08                  curs_initscr(3x)
+ 
                                                                                                                
+ 
                                                                                                                
+ 
                                                                                                                  
+Index: doc/html/man/curs_inopts.3x.html
+--- ncurses-6.5-20240601+/doc/html/man/curs_inopts.3x.html	2024-06-01 23:07:16.000000000 +0000
++++ ncurses-6.5-20240608/doc/html/man/curs_inopts.3x.html	2024-06-08 23:29:39.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inopts.3x,v 1.70 2024/06/01 22:28:41 tom Exp @
++  * @Id: curs_inopts.3x,v 1.73 2024/06/08 23:24:17 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inopts 3x 2024-06-01 ncurses 6.5 Library calls
++curs_inopts 3x 2024-06-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                  curs_inopts 3x 2024-06-01 ncurses 6.5 Library calls
                                                                                                                  
++
                                                                                                                  curs_inopts 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                  
+ 
                                                                                                                  + curs_inopts(3x)                  Library calls                 curs_inopts(3x)
+ 
+@@ -127,8 +127,8 @@
+        echo and noecho determine whether characters  typed  by  the  user  are
+        written to the curses window by the input character reading function as
+        they are typed.  curses  always  disables  the  terminal  driver's  own
+-       echoing.   By  default, a curses window has its echo flag set.  Authors
+-       of most interactive programs prefer  to  do  their  own  echoing  in  a
++       echoing.  By default, a curses screen's echo option is set.  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 call
+        noecho.   The  man  page  for  the  input  character  reading  function
+        discusses how echo and noecho interact with cbreak and nocbreak.
+@@ -176,9 +176,11 @@
+ 
+ 
                                                                                                                  nl, nonl
                                                                                                                  +        Initially,  whether  the  terminal  reports a carriage return using the
+-       character code for a line feed depends  on  the  configuration  of  the
+-       terminal driver; see termios(3).  nl configures the terminal to perform
+-       this translation.  nonl disables it.
++       character code for a line feed in cbreak or raw modes  depends  on  the
++       configuration  of  the  terminal driver; see termios(3).  nl configures
++       the terminal to perform this translation.  nonl disables it.  In normal
++       (or  "cooked")  mode,  the  terminal  driver always translates carriage
++       returns to line feeds.
+ 
+ 
+ 
                                                                                                                  nodelay
                                                                                                                  +@@ -289,9 +291,9 @@
+ 
+        In each case, the function returns
+ 
+-       1    if the flag is set,
++       1    if the option is set,
+ 
+-       0    if the flag is reset, or
++       0    if the option is reset, or
+ 
+        -1   if the library is not initialized.
+ 
+@@ -376,11 +378,11 @@
+ 
+ 
                                                                                                                  SEE ALSO
                                                                                                                  +        curses(3x),    curs_getch(3x),     curs_initscr(3x),     curs_util(3x),
+-       define_key(3x), term_variables(3x), termios(3)
++       define_key(3x), termios(3), term_variables(3x).
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-01                   curs_inopts(3x)
++ncurses 6.5                       2024-06-08                   curs_inopts(3x)
+ 
                                                                                                                  
+ 
                                                                                                                  
+ 
                                                                                                                    
+Index: doc/html/man/curs_ins_wstr.3x.html
+--- ncurses-6.5-20240601+/doc/html/man/curs_ins_wstr.3x.html	2024-05-25 22:33:42.000000000 +0000
++++ ncurses-6.5-20240608/doc/html/man/curs_ins_wstr.3x.html	2024-06-08 23:12:49.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_ins_wstr.3x,v 1.40 2024/05/25 20:10:58 tom Exp @
++  * @Id: curs_ins_wstr.3x,v 1.42 2024/06/08 21:04:04 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_ins_wstr 3x 2024-05-25 ncurses 6.5 Library calls
++curs_ins_wstr 3x 2024-06-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                    curs_ins_wstr 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                    
++
                                                                                                                    curs_ins_wstr 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                    
+ 
                                                                                                                    + curs_ins_wstr(3x)                Library calls               curs_ins_wstr(3x)
+ 
+@@ -84,47 +84,48 @@
+ 
+ 
+ 
                                                                                                                    RETURN VALUE
                                                                                                                    +-       All functions return the integer ERR upon failure and OK on success.
++       These functions return OK on success and ERR on failure.
+ 
+-       X/Open  Curses  does  not   specify   any   error   conditions.    This
+-       implementation returns ERR
++       X/Open Curses does not specify any error conditions.  In ncurses,  they
++       return ERR if
+ 
+-       o   if the win parameter is null or
++       o   win is NULL,
+ 
+-       o   if the wstr parameter is null or
++       o   wstr is NULL, or
+ 
+-       o   if the wins_wch function returns ERR.
++       o   an internal wins_wch(3x) call returns ERR.
+ 
+        Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                    NOTES
                                                                                                                    +-       All but wins_nwstr may be macros.
++       All of these functions except wins_nwstr may be implemented as macros.
+ 
+        If the first character in the string is a non-spacing character,  these
+-       functions will fail.  X/Open Curses does not define what will happen if
+-       a non-spacing character follows a control character.
++       functions return ERR.  X/Open Curses does not specify what happens if a
++       non-spacing character follows a control character.
+ 
+ 
+ 
                                                                                                                    PORTABILITY
                                                                                                                    +-       These functions are described in X/Open Curses,  Issue  4,  which  adds
+-       const qualifiers to the arguments.
++       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
++       error conditions for them.
+ 
+-       X/Open  states  that the entire string is inserted if n is less than 1.
++       Issue  4 states that the entire string is inserted if n is less than 1.
+        This is probably an  error,  because  it  is  inconsistent  with  other
+-       functions, and differs from the X/Open implementation on Solaris.
++       functions,  and  differs  from  the  SVr4  curses  and  Solaris xcurses
++       implementations.  Nevertheless, Issue 7 retains it.
+ 
+ 
+ 
                                                                                                                    SEE ALSO
                                                                                                                    +-       curs_insstr(3x)  describes  comparable functions of the ncurses library
++       curs_insstr(3x) describes comparable functions of the  ncurses  library
+        in its non-wide-character configuration.
+ 
+        curses(3x), curs_ins_wch(3x), curs_in_wch(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                 curs_ins_wstr(3x)
++ncurses 6.5                       2024-06-08                 curs_ins_wstr(3x)
+ 
                                                                                                                    
+ 
                                                                                                                    
+ 
                                                                                                                      
+Index: doc/html/man/curs_insstr.3x.html
+--- ncurses-6.5-20240601+/doc/html/man/curs_insstr.3x.html	2024-05-25 22:33:42.000000000 +0000
++++ ncurses-6.5-20240608/doc/html/man/curs_insstr.3x.html	2024-06-08 23:12:49.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_insstr.3x,v 1.53 2024/05/25 20:10:58 tom Exp @
++  * @Id: curs_insstr.3x,v 1.55 2024/06/08 21:03:03 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_insstr 3x 2024-05-25 ncurses 6.5 Library calls
++curs_insstr 3x 2024-06-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                      curs_insstr 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                      
++
                                                                                                                      curs_insstr 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                      
+ 
                                                                                                                      + curs_insstr(3x)                  Library calls                 curs_insstr(3x)
+ 
+@@ -102,26 +102,29 @@
+ 
+ 
+ 
                                                                                                                      PORTABILITY
                                                                                                                      +-       These  functions  are  described  in X/Open Curses, Issue 4, which adds
+-       const qualifiers to the arguments.
++       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
++       error conditions for them.
+ 
+-       The Single Unix  Specification,  Version  2  states  that  insnstr  and
+-       winsnstr  perform  wrapping.  This is probably an error, since it makes
+-       this group of  functions  inconsistent.   Also,  no  implementation  of
+-       curses documents this inconsistency.
++       Issue 4 distinguished insnstr and winsnstr  by  stating  they  "do  not
++       perform  wrapping".   This  was  probably an error, since it makes this
++       group of functions inconsistent.  No implementation of curses documents
++       this inconsistency, and Issue 7 removed it.
+ 
+-       X/Open  states  that the entire string is inserted if n is less than 1.
++       Issue  4 states that the entire string is inserted if n is less than 1.
+        This is probably an  error,  because  it  is  inconsistent  with  other
+-       functions,  and  differs  from  the  SVr4 and X/Open implementations on
+-       Solaris.
++       functions,  and  differs  from  the  SVr4  curses  and  Solaris xcurses
++       implementations.  Nevertheless, Issue 7 retains it.
+ 
+ 
+ 
                                                                                                                      SEE ALSO
                                                                                                                      ++       curs_ins_wstr(3x) describes comparable functions of the ncurses library
++       in its wide-character configuration (ncursesw).
++
+        curses(3x), curs_inch(3x), curs_ins_wstr(3x), curs_util(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                   curs_insstr(3x)
++ncurses 6.5                       2024-06-08                   curs_insstr(3x)
+ 
                                                                                                                      
+ 
                                                                                                                      
+ 
                                                                                                                        
+Index: doc/html/man/curs_instr.3x.html
+--- ncurses-6.5-20240601+/doc/html/man/curs_instr.3x.html	2024-06-01 23:07:16.000000000 +0000
++++ ncurses-6.5-20240608/doc/html/man/curs_instr.3x.html	2024-06-08 23:12:49.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_instr.3x,v 1.55 2024/06/01 22:29:08 tom Exp @
++  * @Id: curs_instr.3x,v 1.57 2024/06/08 20:47:39 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_instr 3x 2024-06-01 ncurses 6.5 Library calls
++curs_instr 3x 2024-06-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                        curs_instr 3x 2024-06-01 ncurses 6.5 Library calls
                                                                                                                        
++
                                                                                                                        curs_instr 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                        
+ 
                                                                                                                        + curs_instr(3x)                   Library calls                  curs_instr(3x)
+ 
+@@ -54,69 +54,91 @@
+ 
                                                                                                                        SYNOPSIS
                                                                                                                        +        #include <curses.h>
+ 
+-       int instr(char *str);
+-       int innstr(char *str, int n);
+-       int winstr(WINDOW *win, char *str);
+-       int winnstr(WINDOW *win, char *str, int n);
+-
+-       int mvinstr(int y, int x, char *str);
+-       int mvinnstr(int y, int x, char *str, int n);
+-       int mvwinstr(WINDOW *win, int y, int x, char *str);
+-       int mvwinnstr(WINDOW *win, int y, int x, char *str, int n);
++       int instr(char * str);
++       int winstr(WINDOW * win, char * str);
++       int mvinstr(int y, int x, char * str);
++       int mvwinstr(WINDOW * win, int y, int x, char * str);
++
++       int innstr(char * str, int n);
++       int winnstr(WINDOW * win, char * str, int n);
++       int mvinnstr(int y, int x, char * str, int n);
++       int mvwinnstr(WINDOW * win, int y, int x, char * str, int n);
+ 
+ 
+ 
                                                                                                                        DESCRIPTION
                                                                                                                        +-       These routines return a string of characters in str,  starting  at  the
+-       current  cursor  position in the named window.  Attributes are stripped
+-       from the characters.
+-
+-       The four functions with  n  as  the  last  argument  return  a  leading
+-       substring  at  most  n characters long (exclusive of the trailing NUL).
+-       Transfer stops at the end of the current line,  or  when  n  characters
+-       have been stored at the location referenced by str.
++       winstr extracts a string from a curses  window  win,  starting  at  the
++       cursor  and  stopping  at  the  end  of the line, and stores it in str,
++       terminating it with a null character and omitting  any  attributes  and
++       color  pair  identifier  that  curses  associates  with each character.
++       winnstr does the same, but copies at most n characters from win.  An  n
++       of  -1  implies  no limit; winnstr then works like winstr.  ncurses(3x)
++       describes the variants of these functions.
+ 
+ 
+ 
                                                                                                                        RETURN VALUE
                                                                                                                        +-       All  of  the  functions  return  ERR  upon  failure,  or  the number of
+-       characters actually read into the string.
++       These functions return the count of characters copied from win to  str,
++       or ERR upon failure.
+ 
+-       X/Open Curses defines no error conditions.  This implementation returns
+-       ERR
++       In ncurses, they return ERR if
+ 
+-       o   if the win parameter is null or
++       o   win is NULL or
+ 
+-       o   if the chstr parameter is null.
++       o   str is NULL.
+ 
+        Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                        NOTES
                                                                                                                        +-       All routines except winnstr may be macros.
++       All of these functions except winnstr may be implemented as macros.
+ 
+        Reading a line that overflows the array pointed to by str  with  instr,
+-       mvinstr,  mvwinstr  or winstr causes undefined results.  Therefore, the
+-       use of innstr, mvinnstr, mvwinnstr, or winnstr is recommended.
++       winstr,  mvinstr, or mvwinstr causes undefined results.  Use of innstr,
++       winnstr, mvinnstr, and mvwinnstr is recommended instead.
++
++
++
                                                                                                                        EXTENSIONS
                                                                                                                        ++       innstr, winnstr, mvinnstr, and mvwinnstr's treatment of -1 as  a  valid
++       value of n is an ncurses extension.
+ 
+ 
+ 
                                                                                                                        PORTABILITY
                                                                                                                        +-       SVr4 does not document whether a length limit includes or excludes  the
+-       trailing NUL.
++       Applications employing ncurses extensions should condition their use on
++       the visibility of the NCURSES_VERSION preprocessor macro.
++
++       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
++       error conditions for them.
++
++       X/Open  Curses  Issues  4 and 7 both state that instr, winstr, mvinstr,
++       and mvwinstr return OK rather than a character count.  This  is  likely
++       an erratum.
++
++       o   SVr3.1  and  SVr4  implemented  winstr as a wrapper around winnstr,
++           returning the latter's return value.  X/Open Curses's specification
++           thus  may  have  been  an editorial solecism copied from System V's
++           documentation (see below) by X/Open,  rather  than  an  intentional
++           change.
++
++       o   ncurses retains compatibility with System V curses behavior.
++
++       SVr4  documents no return values apart from OK and ERR for any of these
++       functions.  SVr4 does not document whether n counts the null terminator
++       that these functions write to str.
++
+ 
+-       The ncurses library extends the X/Open Curses description by allowing a
+-       negative value for n.  In this case, the functions  return  the  string
+-       ending at the right margin.
++
                                                                                                                        HISTORY
                                                                                                                        ++       SVr3.1 (1987) introduced these functions.
+ 
+ 
+ 
                                                                                                                        SEE ALSO
                                                                                                                        +-       curs_ins_wstr(3x) describes comparable functions of the ncurses library
++       curs_inwstr(3x)  describes  comparable functions of the ncurses library
+        in its wide-character configuration (ncursesw).
+ 
+        curses(3x), curs_inch(3x), curs_inchstr(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-01                    curs_instr(3x)
++ncurses 6.5                       2024-06-08                    curs_instr(3x)
+ 
                                                                                                                        
+ 
                                                                                                                        
+ 
+ 
                                                                                                                        
+Index: doc/html/man/curs_inwstr.3x.html
+--- ncurses-6.5-20240601+/doc/html/man/curs_inwstr.3x.html	2024-05-25 22:33:42.000000000 +0000
++++ ncurses-6.5-20240608/doc/html/man/curs_inwstr.3x.html	2024-06-08 23:12:49.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inwstr.3x,v 1.43 2024/05/25 20:10:58 tom Exp @
++  * @Id: curs_inwstr.3x,v 1.45 2024/06/08 21:19:18 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inwstr 3x 2024-05-25 ncurses 6.5 Library calls
++curs_inwstr 3x 2024-06-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                        curs_inwstr 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                        
++
                                                                                                                        curs_inwstr 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                        
+ 
                                                                                                                        + curs_inwstr(3x)                  Library calls                 curs_inwstr(3x)
+ 
+@@ -54,72 +54,88 @@
+ 
                                                                                                                        SYNOPSIS
                                                                                                                        +        #include <curses.h>
+ 
+-       int inwstr(wchar_t *wstr);
+-       int innwstr(wchar_t *wstr, int n);
+-       int winwstr(WINDOW *win, wchar_t *wstr);
+-       int winnwstr(WINDOW *win, wchar_t *wstr, int n);
+-
+-       int mvinwstr(int y, int x, wchar_t *wstr);
+-       int mvinnwstr(int y, int x, wchar_t *wstr, int n);
+-       int mvwinwstr(WINDOW *win, int y, int x, wchar_t *wstr);
+-       int mvwinnwstr(WINDOW *win, int y, int x, wchar_t *wstr, int n);
++       int inwstr(wchar_t * wstr);
++       int winwstr(WINDOW * win, wchar_t * wstr);
++       int mvinwstr(int y, int x, wchar_t * wstr);
++       int mvwinwstr(WINDOW * win, int y, int x, wchar_t * wstr);
++
++       int innwstr(wchar_t * wstr, int n);
++       int winnwstr(WINDOW * win, wchar_t * wstr, int n);
++       int mvinnwstr(int y, int x, wchar_t * wstr, int n);
++       int mvwinnwstr(WINDOW * win, int y, int x, wchar_t * wstr, int n);
+ 
+ 
+ 
                                                                                                                        DESCRIPTION
                                                                                                                        +-       These routines return a string of  wchar_t  wide  characters  in  wstr,
+-       starting at the current cursor position in the named window.
+-
+-       The  four  functions  with  n  as  the  last  argument return a leading
+-       substring at most n characters long (exclusive of  the  trailing  NUL).
+-       Transfer  stops  at  the  end of the current line, or when n characters
+-       have been stored at the location referenced by wstr.
+-
+-       If the size  n  is  not  large  enough  to  store  a  complete  complex
+-       character, an error is generated.
++       winwstr extracts a wide-character string  from  a  curses  window  win,
++       starting  at the cursor and stopping at the end of the line, and stores
++       it in wstr, terminating it with a wide null character and omitting  any
++       attributes  and  color pair identifier that curses associates with each
++       character.  winnwstr does the same, but copies  at  most  n  characters
++       from  win.   An  n  of  -1  implies  no limit; winnwstr then works like
++       winwstr.  ncurses(3x) describes the variants of these functions.
+ 
+ 
+ 
                                                                                                                        RETURN VALUE
                                                                                                                        +-       All  routines return ERR upon failure.  Upon successful completion, the
+-       *inwstr routines return OK, and the *innwstr routines return the number
+-       of characters read into the string.
++       On successful operation, these  functions  return  the  count  of  wide
++       characters  copied  from  win  to  wstr.  They return ERR upon failure.
++       innwstr, winnwstr,  mvinnwstr,  and  mvwinnwstr  return  ERR  if  n  is
++       insufficiently  large  to  store  a  complete  wide  character  string.
++       (Recall that a curses  complex  character  can  contain  multiple  wide
++       characters, some of which may be non-spacing.)
+ 
+-       X/Open defines no error conditions.  This implementation returns ERR
++       In ncurses, these functions return ERR if
+ 
+-       o   if the win parameter is null or
++       o   win is NULL or
+ 
+-       o   if the wstr parameter is null, or
+-
+-       o   if no characters could be read.
++       o   wstr is NULL.
+ 
+        Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                        NOTES
                                                                                                                        +-       All routines except winnwstr may be macros.
++       All of these functions except winnwstr may be implemented as macros.
++
++       Reading a line that overflows the array pointed to by str with  inwstr,
++       winwstr,  mvinwstr,  or  mvwinwstr  causes  undefined  results.  Use of
++       innwstr, winnwstr, mvinnwstr, and mvwinnwstr is recommended instead.
+ 
+-       Each cell in the window holds a complex character (a spacing  character
+-       and  zero  or more non-spacing characters) together with attributes and
+-       color.  These  functions  store  only  the  wide  characters,  ignoring
+-       attributes  and  color.  Use in_wchstr to return the complex characters
+-       from a window.
+-
+-       Reading a line that overflows the array pointed to by wstr with inwstr,
+-       mvinwstr,  mvwinwstr  or  winwstr causes undefined results.  Therefore,
+-       the use of innwstr, mvinnwstr, mvwinnwstr, or winnwstr is recommended.
++
++
                                                                                                                        EXTENSIONS
                                                                                                                        ++       innwstr, winnwstr, mvinnwstr, and mvwinnwstr's treatment  of  -1  as  a
++       valid value of n is an ncurses extension.
+ 
+ 
+ 
                                                                                                                        PORTABILITY
                                                                                                                        +-       These functions are described in X/Open Curses, Issue 4.
++       Applications employing ncurses extensions should condition their use on
++       the visibility of the NCURSES_VERSION preprocessor macro.
++
++       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
++       error conditions for them.
++
++       Notwithstanding  the foregoing, X/Open Curses Issues 4 and 7 both state
++       that innwstr, winnwstr, mvinnwstr, and mvwinnwstr "fail  ...  [i]f  the
++       array  is  not  large  enough  to  contain  any  complete  characters".
++       Strictly interpreted, this means  that  a  caller  of  these  functions
++       cannot use their return values to detect truncation of a wide-character
++       string copied from more  than  one  character  cell  in  win.   ncurses
++       reports any truncation with ERR.
++
++       X/Open  Curses  specifies  inwstr,  winwstr, mvinwstr, and mvwinwstr as
++       returning OK rather than a (wide) character count,  unlike  their  non-
++       wide  counterparts  instr,  winstr,  mvinstr,  and  mvwinstr.   ncurses
++       regards this inconsistency as an error in the standard.
+ 
+ 
+ 
                                                                                                                        SEE ALSO
                                                                                                                        +-       curses(3x),    curs_inch(3x),     curs_inchstr(3x),     curs_instr(3x),
+-       curs_in_wchstr(3x)
++       curs_instr(3x) describes comparable functions of the ncurses library in
++       its non-wide-character configuration.
++
++       curses(3x), curs_in_wch(3x), curs_in_wchstr(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                   curs_inwstr(3x)
++ncurses 6.5                       2024-06-08                   curs_inwstr(3x)
+ 
                                                                                                                        
+ 
                                                                                                                        
+ 
+Index: doc/html/man/curs_kernel.3x.html
+--- ncurses-6.5-20240601+/doc/html/man/curs_kernel.3x.html	2024-05-25 22:33:42.000000000 +0000
++++ ncurses-6.5-20240608/doc/html/man/curs_kernel.3x.html	2024-06-08 23:21:18.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_kernel.3x,v 1.63 2024/05/25 21:13:56 tom Exp @
++  * @Id: curs_kernel.3x,v 1.65 2024/06/08 21:00:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_kernel 3x 2024-05-25 ncurses 6.5 Library calls
++curs_kernel 3x 2024-06-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                        curs_kernel 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                        
++
                                                                                                                        curs_kernel 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                        
+ 
                                                                                                                        + curs_kernel(3x)                  Library calls                 curs_kernel(3x)
+ 
+@@ -101,84 +101,85 @@
+ 
+ 
+ 
                                                                                                                        getsyx
                                                                                                                        +-       The getsyx routine returns  the  current  coordinates  of  the  virtual
+-       screen  cursor in y and x.  If leaveok is currently TRUE, then -1,-1 is
+-       returned.  If lines have been removed from the top of the screen, using
+-       ripoffline,  y  and x include these lines; therefore, y and x should be
+-       used only as arguments for setsyx.
++       getsyx stores the coordinates of virtual screen (newscr)  cursor  in  y
++       and x.  If newscr's leaveok(3x) output option is TRUE, getsyx stores -1
++       in both y and x.  If lines have been removed from the top of the screen
++       using  ripoffline, y includes these lines; therefore, y and x populated
++       by getsyx should be used only as arguments for setsyx.
+ 
+-       Few applications will use this feature, most use getyx instead.
++       Few applications use this feature; most call getyx(3x) instead.
+ 
+ 
+ 
                                                                                                                        setsyx
                                                                                                                        +-       The setsyx routine sets the virtual screen cursor to y, x.  If y and  x
+-       are  both  -1, then leaveok is set.  The two routines getsyx and setsyx
+-       are designed to be used by a library routine, which manipulates  curses
+-       windows  but  does  not  want  to  change  the  current position of the
+-       program's cursor.   The  library  routine  would  call  getsyx  at  the
+-       beginning, do its manipulation of its own windows, do a wnoutrefresh on
+-       its windows, call setsyx, and then call doupdate.
++       setsyx sets the virtual screen (newscr)  cursor  location  to  (y,  x).
++       setsyx(-1, -1) is equivalent to leaveok(newscr, TRUE).
+ 
+-       Few applications will use this feature, most use wmove instead.
++       getsyx  and  setsyx  are  designed  to  be  used  by  a  function  that
++       manipulates curses windows but  seeks  to  avoid  changing  the  cursor
++       position.  Such a function would first call getsyx, modify its windows'
++       content,  call  wnoutrefresh(3x)  on  them,  call  setsyx,  then   call
++       doupdate(3x).
++
++       Few applications use this feature; most call wmove(3x) instead.
+ 
+ 
+ 
                                                                                                                        curs_set
                                                                                                                        +-       The curs_set routine sets the cursor state  to  invisible,  normal,  or
+-       very  visible  for visibility equal to 0, 1, or 2 respectively.  If the
+-       terminal supports the visibility requested, the previous  cursor  state
++       The  curs_set  routine  sets  the cursor state to invisible, normal, or
++       very visible for visibility equal to 0, 1, or 2 respectively.   If  the
++       terminal  supports  the visibility requested, the previous cursor state
+        is returned; otherwise, ERR is returned.
+ 
+ 
+ 
                                                                                                                        mvcur
                                                                                                                        +-       mvcur  provides  low-level cursor motion.  It takes effect immediately,
+-       rather than at the next refresh.  Unlike  the  other  low-level  output
+-       functions,  which  either  write  to  the standard output stream or are
+-       passed a  function  pointer  to  perform  output,  mvcur  uses  a  file
++       mvcur provides low-level cursor motion.  It takes  effect  immediately,
++       rather  than  at  the  next refresh.  Unlike the other low-level output
++       functions, which either write to the  standard  output  stream  or  are
++       passed  a  function  pointer  to  perform  output,  mvcur  uses  a file
+        descriptor derived from the output stream parameter of newterm(3x).
+ 
+-       One  application  of  mvcur  accompanies  the  temporary use of another
+-       program to write to the  terminal  screen.   For  example,  first  call
+-       refresh(3x)  to ensure that the screen and the library's model of it is
+-       up to date; then call reset_shell_mode; write to the  screen  with  the
+-       external  application;  call reset_prog_mode; and finally call mvcur to
+-       set the cursor's location to where  curses  thinks  it  is,  since  the
++       One application of mvcur  accompanies  the  temporary  use  of  another
++       program  to  write  to  the  terminal  screen.  For example, first call
++       refresh(3x) to ensure that the screen and the library's model of it  is
++       up  to  date;  then call reset_shell_mode; write to the screen with the
++       external application; call reset_prog_mode; and finally call  mvcur  to
++       set  the  cursor's  location  to  where  curses thinks it is, since the
+        library has no knowledge of how the external application moved it.
+ 
+ 
+ 
                                                                                                                        napms
                                                                                                                        +-       napms  sleeps  for  ms  milliseconds.   If  ms  exceeds  30,000 (thirty
++       napms sleeps  for  ms  milliseconds.   If  ms  exceeds  30,000  (thirty
+        seconds), it is capped at that value.
+ 
+ 
+ 
                                                                                                                        ripoffline
                                                                                                                        +-       ripoffline provides access to the same facility that slk_init(3x)  uses
+-       to  reduce  the  size  of the screen.  ripoffline must be called before
++       ripoffline  provides access to the same facility that slk_init(3x) uses
++       to reduce the size of the screen.  ripoffline  must  be  called  before
+        initscr or newterm is called, to prepare these initial actions:
+ 
+        o   If line is positive, a line is removed from the top of stdscr.
+ 
+        o   if line is negative, a line is removed from the bottom.
+ 
+-       When the resulting initialization is done inside initscr,  the  routine
++       When  the  resulting initialization is done inside initscr, the routine
+        init (supplied by the user) is called with two arguments:
+ 
+        o   a window pointer to the one-line window that has been allocated and
+ 
+        o   an integer with the number of columns in the window.
+ 
+-       Inside  this  initialization  routine,  the integer variables LINES and
+-       COLS (defined in <curses.h>) are not  guaranteed  to  be  accurate  and
+-       wrefresh  or  doupdate  must  not  be  called.  It is allowable to call
++       Inside this initialization routine, the  integer  variables  LINES  and
++       COLS  (defined  in  <curses.h>)  are  not guaranteed to be accurate and
++       wrefresh or doupdate must not be  called.   It  is  allowable  to  call
+        wnoutrefresh during the initialization routine.
+ 
+-       ripoffline can be called up to five times  before  calling  initscr  or
++       ripoffline  can  be  called  up to five times before calling initscr or
+        newterm.
+ 
+ 
+ 
                                                                                                                        RETURN VALUE
                                                                                                                        +        Except for curs_set, these routines always return OK.
+ 
+-       curs_set  returns  the  previous  cursor state, or ERR if the requested
++       curs_set returns the previous cursor state, or  ERR  if  the  requested
+        visibility is not supported.
+ 
+        X/Open defines no error conditions.  In this implementation
+@@ -188,7 +189,7 @@
+             to obtain the terminal settings fails.
+ 
+        ripoffline
+-            returns  ERR if the maximum number of ripped-off lines exceeds the
++            returns ERR if the maximum number of ripped-off lines exceeds  the
+             maximum (5).
+ 
+ 
+@@ -196,25 +197,28 @@
+        Note that getsyx is a macro, so & is not necessary before the variables
+        y and x.
+ 
+-       Older  SVr4  man  pages  warn  that  the  return  value of curs_set "is
++       Older SVr4 man pages  warn  that  the  return  value  of  curs_set  "is
+        currently incorrect".  This implementation gets it right, but it may be
+        unwise to count on the correctness of the return value anywhere else.
+ 
+        Both ncurses and SVr4 will call curs_set in endwin if curs_set 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
++       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.
+ 
+ 
+ 
                                                                                                                        EXTENSIONS
                                                                                                                        +-       In ncurses, mvcur accepts -1 for either or both old coordinates.   This
+-       value  tells ncurses that the old location is unknown, and that it must
+-       use only absolute motion, as with the cursor_address (cup)  capability,
+-       rather  than  the  least  costly  combination  of absolute and relative
++       In  ncurses, mvcur accepts -1 for either or both old coordinates.  This
++       value tells ncurses that the old location is unknown, and that it  must
++       use  only absolute motion, as with the cursor_address (cup) capability,
++       rather than the least  costly  combination  of  absolute  and  relative
+        motion.
+ 
+ 
+ 
                                                                                                                        PORTABILITY
                                                                                                                        ++       Applications employing ncurses extensions should condition their use on
++       the visibility of the NCURSES_VERSION preprocessor macro.
++
+        The virtual screen functions setsyx and getsyx  are  not  described  in
+        X/Open Curses, Issue 4.  All other functions are as described in X/Open
+        Curses.
+@@ -245,7 +249,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                   curs_kernel(3x)
++ncurses 6.5                       2024-06-08                   curs_kernel(3x)
+ 
                                                                                                                        
+ 
                                                                                                                        
+ 
                                                                                                                          
+Index: doc/html/man/curs_scr_dump.3x.html
+--- ncurses-6.5-20240601+/doc/html/man/curs_scr_dump.3x.html	2024-06-01 23:07:17.000000000 +0000
++++ ncurses-6.5-20240608/doc/html/man/curs_scr_dump.3x.html	2024-06-08 23:12:49.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_scr_dump.3x,v 1.45 2024/06/01 22:29:45 tom Exp @
++  * @Id: curs_scr_dump.3x,v 1.47 2024/06/08 20:33:56 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_scr_dump 3x 2024-06-01 ncurses 6.5 Library calls
++curs_scr_dump 3x 2024-06-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                          curs_scr_dump 3x 2024-06-01 ncurses 6.5 Library calls
                                                                                                                          
++
                                                                                                                          curs_scr_dump 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                          
+ 
                                                                                                                          + curs_scr_dump(3x)                Library calls               curs_scr_dump(3x)
+ 
+@@ -86,20 +86,20 @@
+        screen on this information rather than clearing it  and  starting  from
+        scratch.
+ 
+-       curses  regards  the terminal being in an invalid state for computation
+-       of updates based on the contents of filename if
++       curses  regards  the terminal as in an invalid state for computation of
++       updates based on the contents of filename if
+ 
+-       o   the terminal type supports the terminfo  capabilities  exit_ca_mode
+-           (rmcup) or non_rev_rmcup (nrrmc), or
++       o   curses knows that the  terminal  has  been  written  to  since  the
++           preceding scr_dump call, or
+ 
+-       o   curses  knows  that  the  terminal  has  been  written to since the
+-           preceding scr_dump call.
++       o   the  terminal  type supports the terminfo capabilities exit_ca_mode
++           (rmcup) or non_rev_rmcup (nrrmc).
+ 
+        Either of the foregoing conditions means that curses cannot assume that
+        the  terminal's  contents  match their representation in filename.  The
+        former is due to  terminal  features  (such  as  xterm(1)'s  "alternate
+        screen")  that  couple  cursor-positioning  mode  with a local cache of
+-       screen contents.  curses cannot know  whether  terminal  is  displaying
++       screen contents.  curses cannot know whether the terminal is displaying
+        from that local cache at the time the application calls scr_init, so it
+        makes a pessimistic assumption that a  full  redraw  is  required;  see
+        subsection "Cursor Motions" of terminfo(5).
+@@ -151,7 +151,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-01                 curs_scr_dump(3x)
++ncurses 6.5                       2024-06-08                 curs_scr_dump(3x)
+ 
                                                                                                                          
+ 
                                                                                                                          
+ 
                                                                                                                            
+Index: doc/html/man/curs_terminfo.3x.html
+--- ncurses-6.5-20240601+/doc/html/man/curs_terminfo.3x.html	2024-06-01 23:07:17.000000000 +0000
++++ ncurses-6.5-20240608/doc/html/man/curs_terminfo.3x.html	2024-06-08 23:12:49.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_terminfo.3x,v 1.140 2024/06/01 22:29:08 tom Exp @
++  * @Id: curs_terminfo.3x,v 1.142 2024/06/08 23:05:52 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_terminfo 3x 2024-06-01 ncurses 6.5 Library calls
++curs_terminfo 3x 2024-06-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                            curs_terminfo 3x 2024-06-01 ncurses 6.5 Library calls
                                                                                                                            
++
                                                                                                                            curs_terminfo 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                            
+ 
                                                                                                                            + curs_terminfo(3x)                Library calls               curs_terminfo(3x)
+ 
+@@ -660,7 +660,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-01                 curs_terminfo(3x)
++ncurses 6.5                       2024-06-08                 curs_terminfo(3x)
+ 
                                                                                                                            
+ 
                                                                                                                            
+ 
                                                                                                                              
+Index: doc/html/man/curs_util.3x.html
+--- ncurses-6.5-20240601+/doc/html/man/curs_util.3x.html	2024-06-01 23:07:17.000000000 +0000
++++ ncurses-6.5-20240608/doc/html/man/curs_util.3x.html	2024-06-08 23:12:50.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_util.3x,v 1.106 2024/06/01 22:28:18 tom Exp @
++  * @Id: curs_util.3x,v 1.108 2024/06/08 22:38:18 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_util 3x 2024-06-01 ncurses 6.5 Library calls
++curs_util 3x 2024-06-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                              curs_util 3x 2024-06-01 ncurses 6.5 Library calls
                                                                                                                              
++
                                                                                                                              curs_util 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                              
+ 
                                                                                                                              + curs_util(3x)                    Library calls                   curs_util(3x)
+ 
+@@ -80,7 +80,7 @@
+ 
                                                                                                                              DESCRIPTION
                                                                                                                              + 
+ 
                                                                                                                              unctrl
                                                                                                                              +-       The  unctrl  routine  returns  a  character string which is a printable
++       The   unctrl   routine  returns  a  character  string  as  a  printable
+        representation of the character ch:
+ 
+        o   Printable characters are displayed  as  themselves,  e.g.,  a  one-
+@@ -186,7 +186,7 @@
+            from the terminal database.
+ 
+        o   ncurses re-fetches the value of the environment variables  so  that
+-           it is still the environment variables which set the screen size.
++           it is still the environment variables that set the screen size.
+ 
+        The use_env and use_tioctl routines combine as follows.
+ 
+@@ -221,7 +221,7 @@
+ 
+        o   the window's character cells contain the color pair value, but  not
+            the  actual  color  numbers.   If cells in the retrieved window use
+-           color pairs which have not been created in  the  application  using
++           color pairs that have not been created  in  the  application  using
+            init_pair, they will not be colored when the window is refreshed.
+ 
+ 
+@@ -260,7 +260,7 @@
+                returns ERR if the terminal was not initialized.
+ 
+           putwin
+-               returns ERR if the associated fwrite calls return ERR.
++               returns ERR if the associated write(2) calls return ERR.
+ 
+ 
+ 
                                                                                                                              PORTABILITY
                                                                                                                              +@@ -286,12 +286,12 @@
+ 
+ 
                                                                                                                              keyname
                                                                                                                              +        The keyname function  may  return  the  names  of  user-defined  string
+-       capabilities  which are defined in the terminfo entry via the -x option
++       capabilities  that  are defined in the terminfo entry via the -x option
+        of tic.  This implementation  automatically  assigns  at  run-time  key
+-       codes  to  user-defined  strings  which  begin with "k".  The key codes
+-       start at KEY_MAX, but are not guaranteed  to  be  the  same  value  for
+-       different  runs because user-defined codes are merged from all terminal
+-       descriptions  which  have  been  loaded.   The   use_extended_names(3x)
++       codes to user-defined strings that begin with "k".  The key codes start
++       at KEY_MAX, but are not guaranteed to be the same value  for  different
++       runs   because   user-defined   codes  are  merged  from  all  terminal
++       descriptions  that  have  been  loaded.    The   use_extended_names(3x)
+        function  controls  whether  this  data  is  loaded  when  the terminal
+        description is read by the library.
+ 
+@@ -321,13 +321,13 @@
+            older ncurses versions.  This implementation (as well as the X/Open
+            variant of Solaris curses, dated 1995) uses textual dumps.
+ 
+-           The implementations which  use  binary  dumps  use  block-I/O  (the
+-           fwrite  and  fread  functions).   Those  that use textual dumps use
+-           buffered-I/O.  A few applications may happen to write extra data in
+-           the  file  using these functions.  Doing that can run into problems
+-           mixing block- and buffered-I/O.  This  implementation  reduces  the
+-           problem  on writes by flushing the output.  However, reading from a
+-           file written using mixed schemes may not be successful.
++           The implementations that use binary dumps use  block-I/O  (write(2)
++           and read(2) functions).  Those that use textual dumps use buffered-
++           I/O.  A few applications may happen to write extra data in the file
++           using  these  functions.   Doing  that can run into problems mixing
++           block- and buffered-I/O.  This implementation reduces  the  problem
++           on  writes  by  flushing  the output.  However, reading from a file
++           written using mixed schemes may not be successful.
+ 
+ 
+ 
                                                                                                                              unctrl, wunctrl
                                                                                                                              +@@ -390,7 +390,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-01                     curs_util(3x)
++ncurses 6.5                       2024-06-08                     curs_util(3x)
+ 
                                                                                                                              
+ 
                                                                                                                              
+ 
                                                                                                                                
+Index: doc/html/man/define_key.3x.html
+--- ncurses-6.5-20240601+/doc/html/man/define_key.3x.html	2024-05-25 22:33:43.000000000 +0000
++++ ncurses-6.5-20240608/doc/html/man/define_key.3x.html	2024-06-08 23:29:40.000000000 +0000
+@@ -28,19 +28,19 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey 1997
+-  * @Id: define_key.3x,v 1.46 2024/05/25 20:15:04 tom Exp @
++  * @Id: define_key.3x,v 1.48 2024/06/08 23:25:11 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-define_key 3x 2024-05-25 ncurses 6.5 Library calls
++define_key 3x 2024-06-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                define_key 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                                
++
                                                                                                                                define_key 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                                
+ 
                                                                                                                                + define_key(3x)                   Library calls                  define_key(3x)
+ 
+@@ -96,12 +96,11 @@
+ 
+ 
+ 
                                                                                                                                SEE ALSO
                                                                                                                                +-       ncurses(3x),   keyok(3x),   key_defined(3x),  keybound(3x),  keyok(3x),
+-       terminfo(5)
++       curses(3x), keybound(3x), keyok(3x), key_defined(3x), terminfo(5)
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                    define_key(3x)
++ncurses 6.5                       2024-06-08                    define_key(3x)
+ 
                                                                                                                                
+ 
                                                                                                                                
+ 
                                                                                                                                  
+Index: doc/html/man/key_defined.3x.html
+--- ncurses-6.5-20240601+/doc/html/man/key_defined.3x.html	2024-05-18 20:27:56.000000000 +0000
++++ ncurses-6.5-20240608/doc/html/man/key_defined.3x.html	2024-06-08 23:29:41.000000000 +0000
+@@ -28,19 +28,19 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey 2003
+-  * @Id: key_defined.3x,v 1.36 2024/05/18 20:04:53 tom Exp @
++  * @Id: key_defined.3x,v 1.38 2024/06/08 23:25:34 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-key_defined 3x 2024-05-18 ncurses 6.5 Library calls
++key_defined 3x 2024-06-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                  key_defined 3x 2024-05-18 ncurses 6.5 Library calls
                                                                                                                                  
++
                                                                                                                                  key_defined 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                                  
+ 
                                                                                                                                  + key_defined(3x)                  Library calls                 key_defined(3x)
+ 
+@@ -83,11 +83,11 @@
+ 
+ 
+ 
                                                                                                                                  SEE ALSO
                                                                                                                                  +-       ncurses(3x), define_key(3x), keyok(3x), keybound(3x), keyok(3x)
++       curses(3x), define_key(3x), keybound(3x), keyok(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-18                   key_defined(3x)
++ncurses 6.5                       2024-06-08                   key_defined(3x)
+ 
                                                                                                                                  
+ 
                                                                                                                                  
+ 
                                                                                                                                    
+Index: doc/html/man/keybound.3x.html
+--- ncurses-6.5-20240601+/doc/html/man/keybound.3x.html	2024-05-18 20:27:56.000000000 +0000
++++ ncurses-6.5-20240608/doc/html/man/keybound.3x.html	2024-06-08 23:29:41.000000000 +0000
+@@ -28,19 +28,19 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey 1999
+-  * @Id: keybound.3x,v 1.38 2024/05/18 20:05:36 tom Exp @
++  * @Id: keybound.3x,v 1.40 2024/06/08 23:25:57 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-keybound 3x 2024-05-18 ncurses 6.5 Library calls
++keybound 3x 2024-06-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                    keybound 3x 2024-05-18 ncurses 6.5 Library calls
                                                                                                                                    
++
                                                                                                                                    keybound 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                                    
+ 
                                                                                                                                    + keybound(3x)                     Library calls                    keybound(3x)
+ 
+@@ -90,11 +90,11 @@
+ 
+ 
+ 
                                                                                                                                    SEE ALSO
                                                                                                                                    +-       ncurses(3x), define_key(3x), key_defined(3x), keyok(3x), terminfo(5)
++       curses(3x), define_key(3x), keyok(3x), key_defined(3x), terminfo(5)
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-18                      keybound(3x)
++ncurses 6.5                       2024-06-08                      keybound(3x)
+ 
                                                                                                                                    
+ 
                                                                                                                                    
+ 
                                                                                                                                      
+Index: doc/html/man/keyok.3x.html
+--- ncurses-6.5-20240601+/doc/html/man/keyok.3x.html	2024-05-18 20:27:56.000000000 +0000
++++ ncurses-6.5-20240608/doc/html/man/keyok.3x.html	2024-06-08 23:29:41.000000000 +0000
+@@ -28,19 +28,19 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey 1997
+-  * @Id: keyok.3x,v 1.42 2024/05/18 20:06:09 tom Exp @
++  * @Id: keyok.3x,v 1.44 2024/06/08 23:26:27 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-keyok 3x 2024-05-18 ncurses 6.5 Library calls
++keyok 3x 2024-06-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                      keyok 3x 2024-05-18 ncurses 6.5 Library calls
                                                                                                                                      
++
                                                                                                                                      keyok 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                                      
+ 
                                                                                                                                      + keyok(3x)                        Library calls                       keyok(3x)
+ 
+@@ -93,11 +93,11 @@
+ 
+ 
+ 
                                                                                                                                      SEE ALSO
                                                                                                                                      +-       ncurses(3x), define_key(3x), key_defined(3x), keybound(3x), keyok(3x),
++       curses(3x), define_key(3x), keybound(3x), keyok(3x), key_defined(3x).
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-18                         keyok(3x)
++ncurses 6.5                       2024-06-08                         keyok(3x)
+ 
                                                                                                                                      
+ 
                                                                                                                                      
+

                                                                                                  terminfo Entry Syntax

                                                                                                  +@@ -1186,9 +1186,9 @@
+        printing terminal, with no soft copy unit, give it both hc and os.  (os
+        applies  to  storage scope terminals, such as TEKTRONIX 4010 series, as
+        well as hard copy and APL terminals.)  If there is a code to  move  the
+-       cursor to the left edge of the current row, give this as cr.  (Normally
+-       this will be carriage return,  control/M.)   If  there  is  a  code  to
+-       produce an audible signal (bell, beep, etc) give this as bel.
++       cursor  to  the  left  edge  of  the  current  line,  give  this as cr.
++       (Normally this will be carriage return, control/M.)  If there is a code
++       to produce an audible signal (bell, beep, etc) give this as bel.
+ 
+        If there is a code to move the cursor one position to the left (such as
+        backspace) that capability should be given as cub1.   Similarly,  codes
+@@ -1217,7 +1217,7 @@
+        the  screen when text is output, but this does not necessarily apply to
+        a cuf1 from the last column.  The only local motion  which  is  defined
+        from  the  left  edge is if bw is given, then a cub1 from the left edge
+-       will move to the right edge of the previous row.  If bw is  not  given,
++       will move to the right edge of the previous line.  If bw is not  given,
+        the  effect  is undefined.  This is useful for drawing a box around the
+        edge of the screen, for example.  If the terminal has switch selectable
+        automatic  margins,  the terminfo file usually assumes that this is on;
+@@ -1244,8 +1244,8 @@
+        Cursor  addressing  and  other  strings  requiring  parameters  in  the
+        terminal are described  by  a  parameterized  string  capability,  with
+        printf-like  escapes  such  as  %x  in it.  For example, to address the
+-       cursor, the cup capability is given, using two parameters: the row  and
+-       column  to  address  to.   (Rows and columns are numbered from zero and
++       cursor, the cup capability is given, using two parameters: the line and
++       column  to  address  to.  (Lines and columns are numbered from zero and
+        refer to the physical screen visible to the user,  not  to  any  unseen
+        memory.)   If  the terminal has memory relative cursor addressing, that
+        can be indicated by mrcup.
+@@ -1365,14 +1365,14 @@
+        order.  That is, to get x-5 one  would  use  "%gx%{5}%-".   %P  and  %g
+        variables are persistent across escape-string evaluations.
+ 
+-       Consider  the HP2645, which, to get to row 3 and column 12, needs to be
+-       sent \E&a12c03Y padded for 6 milliseconds.  The order of the  rows  and
+-       columns  is  inverted  here,  and the row and column are printed as two
++       Consider the HP2645, which, to get to line 3 and column 12, needs to be
++       sent \E&a12c03Y padded for 6 milliseconds.  The order of the lines  and
++       columns  is  inverted here, and the lines and column are printed as two
+        digits.  The corresponding terminal description is expressed thus:
+               cup=\E&a%p2%dc%p1%dY$<6>,
+ 
+-       The Microterm ACT-IV needs the current row and column sent preceded  by
+-       a ^T, with the row and column simply encoded in binary,
++       The Microterm ACT-IV needs the current line and column sent preceded by
++       a ^T, with the line and column simply encoded in binary,
+               cup=^T%p1%c%p2%c
+ 
+        Terminals  which  use  "%c"  need  to  be  able to backspace the cursor
+@@ -1382,7 +1382,7 @@
+        with  terminfo  set tty modes so that tabs are never expanded, so \t is
+        safe to send.  This turns out to be essential for the Ann Arbor 4080.)
+ 
+-       A final example is the LSI ADM-3a, which uses row and column offset  by
++       A final example is the LSI ADM-3a, which uses line and column offset by
+        a blank character, thus
+               cup=\E=%p1%' '%+%c%p2%' '%+%c
+ 
+@@ -1404,8 +1404,8 @@
+        corner of the screen, not of memory.  (Thus, the  \EH  sequence  on  HP
+        terminals cannot be used for home.)
+ 
+-       If the terminal has row or column absolute cursor addressing, these can
+-       be given as single  parameter  capabilities  hpa  (horizontal  position
++       If  the  terminal  has line or column absolute cursor addressing, these
++       can be given as single parameter capabilities hpa (horizontal  position
+        absolute)  and  vpa  (vertical position absolute).  Sometimes these are
+        shorter than the more general  two  parameter  sequence  (as  with  the
+        hp2645)   and  can  be  used  in  preference  to  cup.   If  there  are
+@@ -1443,7 +1443,7 @@
+                line position, and
+ 
+            o   parameterized  capabilities  for setting the top, bottom, left,
+-               right margins given the number of rows or columns.
++               right margins given the number of lines or columns.
+ 
+        In practice, the categorization into "terminal" and  "printer"  is  not
+        suitable:
+@@ -1948,7 +1948,7 @@
+ 
+        If there are commands to set and clear tab stops, they can be given  as
+        tbc (clear all tab stops) and hts (set a tab stop in the current column
+-       of every row).  If a more complex sequence is needed to  set  the  tabs
++       of every line).  If a more complex sequence is needed to set  the  tabs
+        than can be described by this, the sequence can be placed in is2 or if.
+ 
+        The  tput  reset  command uses the same capability strings as the reset
+Index: doc/html/man/tput.1.html
+--- ncurses-6.5-20240601+/doc/html/man/tput.1.html	2024-05-11 21:39:59.000000000 +0000
++++ ncurses-6.5-20240608/doc/html/man/tput.1.html	2024-06-08 23:12:52.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tput.1,v 1.114 2024/05/11 20:39:53 tom Exp @
++  * @Id: tput.1,v 1.116 2024/06/08 20:50:34 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-tput 1 2024-05-11 ncurses 6.5 User commands
++tput 1 2024-06-08 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                  tput 1 2024-05-11 ncurses 6.5 User commands
                                                                                                  
++
                                                                                                  tput 1 2024-06-08 ncurses 6.5 User commands
                                                                                                  
+ 
                                                                                                  + tput(1)                          User commands                         tput(1)
+ 
+@@ -53,19 +53,19 @@
+ 
+ 
+ 
                                                                                                  SYNOPSIS
                                                                                                  +-       tput [-T terminal-type] {cap-code [parameter ...]} ...
++       tput [-v] [-T terminal-type] {cap-code [parameter ...]} ...
+ 
+-       tput [-T terminal-type] [-x] clear
++       tput [-v] [-T terminal-type] [-x] clear
+ 
+-       tput [-T terminal-type] init
++       tput [-v] [-T terminal-type] init
+ 
+-       tput [-T terminal-type] reset
++       tput [-v] [-T terminal-type] reset
+ 
+-       tput [-T terminal-type] longname
++       tput [-v] [-T terminal-type] longname
+ 
+-       tput -S
++       tput [-v] -S
+ 
+-       tput -V
++       tput [-v] -V
+ 
+ 
+ 
                                                                                                  DESCRIPTION
                                                                                                  +@@ -259,6 +259,8 @@
+                 environment variable.  If specified, the environment variables
+                 LINES and COLUMNS are also ignored.
+ 
++       -v       causes tput to operate verbosely, reporting warnings.
++
+        -V       reports the version of ncurses associated with tput, and exits
+                 with a successful status.
+ 
+@@ -498,8 +500,8 @@
+               Set cursor to normal visibility.
+ 
+        tput home
+-              Move the cursor to row 0, column 0: the upper left corner of the
+-              screen, usually known as the "home" cursor position.
++              Move the cursor to line 0, column 0: the upper  left  corner  of
++              the screen, usually known as the "home" cursor position.
+ 
+        tput clear
+               Clear  the  screen: write the clear_screen capability's value to
+@@ -523,7 +525,7 @@
+               device.
+ 
+        tput cup 23 4
+-              Move the cursor to row 23, column 4.
++              Move the cursor to line 23, column 4.
+ 
+        tput cup
+               Report  the  value  of the cursor_address (cup) capability (used
+@@ -555,7 +557,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-11                           tput(1)
++ncurses 6.5                       2024-06-08                           tput(1)
+ 
                                                                                                  
+ 
                                                                                                  
+ 
                                                                                                    
+Index: doc/html/man/tset.1.html
+--- ncurses-6.5-20240601+/doc/html/man/tset.1.html	2024-05-11 21:39:59.000000000 +0000
++++ ncurses-6.5-20240608/doc/html/man/tset.1.html	2024-06-08 23:12:52.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tset.1,v 1.86 2024/05/11 20:39:53 tom Exp @
++  * @Id: tset.1,v 1.88 2024/06/08 20:51:12 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-tset 1 2024-05-11 ncurses 6.5 User commands
++tset 1 2024-06-08 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                    tset 1 2024-05-11 ncurses 6.5 User commands
                                                                                                    
++
                                                                                                    tset 1 2024-06-08 ncurses 6.5 User commands
                                                                                                    
+ 
                                                                                                    + tset(1)                          User commands                         tset(1)
+ 
+@@ -115,8 +115,10 @@
+            kill characters (among many other things) are set
+ 
+        o   unless   the   "-I"   option  is  enabled,  the  terminal  and  tab
+-           initialization strings are sent to the standard error  output,  and
+-           tset waits one second (in case a hardware reset was issued).
++           initialization strings are sent to the standard error output,  and,
++           if  the  terminal device does not appear to be a pseudoterminal (as
++           might be used by a  terminal  emulator  program),  tset  waits  one
++           second in case a hardware reset was issued.
+ 
+        o   Finally,  if  the  erase,  interrupt  and line kill characters have
+            changed, or are not set to their default values, their  values  are
+@@ -393,7 +395,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-11                           tset(1)
++ncurses 6.5                       2024-06-08                           tset(1)
+ 
                                                                                                    
+ 
                                                                                                    
+ 
                                                                                                      
+Index: doc/html/man/user_caps.5.html
+--- ncurses-6.5-20240601+/doc/html/man/user_caps.5.html	2024-04-27 18:38:49.000000000 +0000
++++ ncurses-6.5-20240608/doc/html/man/user_caps.5.html	2024-06-08 23:12:52.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: user_caps.5,v 1.49 2024/03/16 15:35:01 tom Exp @
++  * @Id: user_caps.5,v 1.51 2024/06/08 21:01:53 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-user_caps 5 2024-03-16 ncurses 6.5 File formats
++user_caps 5 2024-06-08 ncurses 6.5 File formats
+ 
+ 
+ 
+ 
+-
                                                                                                      user_caps 5 2024-03-16 ncurses 6.5 File formats
                                                                                                      
++
                                                                                                      user_caps 5 2024-06-08 ncurses 6.5 File formats
                                                                                                      
+ 
                                                                                                      + user_caps(5)                     File formats                     user_caps(5)
+ 
+@@ -62,8 +62,8 @@
+ 
                                                                                                      Background
                                                                                                      +        Before  ncurses  5.0,  terminfo  databases  used  a fixed repertoire of
+        terminal capabilities designed for the SVr2 terminal database in  1984,
+-       and  extended  in  stages  through SVr4 (1989), and standardized in the
+-       Single Unix Specification beginning in 1995.
++       and  extended in stages through SVr4 (1989), and standardized in X/Open
++       Curses starting in 1995.
+ 
+        Most of the extensions in this fixed repertoire were additions  to  the
+        tables of Boolean, numeric and string capabilities.  Rather than change
+@@ -403,7 +403,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                      user_caps(5)
++ncurses 6.5                       2024-06-08                      user_caps(5)
+ 
                                                                                                      
+ 
                                                                                                      
+ 
                                                                                                        
+Index: include/ncurses_cfg.hin
+Prereq:  1.13 
+--- ncurses-6.5-20240601+/include/ncurses_cfg.hin	2020-03-08 12:37:59.000000000 +0000
++++ ncurses-6.5-20240608/include/ncurses_cfg.hin	2024-06-08 14:04:14.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -31,7 +31,7 @@
+  *  Author: Thomas E. Dickey      1997-on                                   *
+  ****************************************************************************/
+ /*
+- * $Id: ncurses_cfg.hin,v 1.13 2020/03/08 12:37:59 tom Exp $
++ * $Id: ncurses_cfg.hin,v 1.15 2024/06/08 14:04:14 tom Exp $
+  *
+  * Both ncurses_cfg.h and ncurses_def.h are internal header-files used when
+  * building ncurses.
+@@ -44,7 +44,7 @@
+  *
+  * See:
+  *	https://invisible-island.net/autoconf/
+- *	ftp://ftp.invisible-island.net/autoconf/
++ *	https://invisible-island.net/archives/autoconf/
+  */
+ #ifndef NC_CONFIG_H
+ #define NC_CONFIG_H
+Index: man/curs_addch.3x
+Prereq:  1.90 
+--- ncurses-6.5-20240601+/man/curs_addch.3x	2024-06-01 22:29:08.000000000 +0000
++++ ncurses-6.5-20240608/man/curs_addch.3x	2024-06-08 20:51:41.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addch.3x,v 1.90 2024/06/01 22:29:08 tom Exp $
+-.TH curs_addch 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addch.3x,v 1.92 2024/06/08 20:51:41 tom Exp $
++.TH curs_addch 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -302,7 +302,6 @@
+ definitions are
+ .I char
+ constants.
+-.PP
+ Some implementations are problematic.
+ .bP
+ Solaris
+Index: man/curs_get_wch.3x
+Prereq:  1.41 
+--- ncurses-6.5-20240601+/man/curs_get_wch.3x	2024-05-11 20:39:53.000000000 +0000
++++ ncurses-6.5-20240608/man/curs_get_wch.3x	2024-06-08 20:25:25.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_get_wch.3x,v 1.41 2024/05/11 20:39:53 tom Exp $
+-.TH curs_get_wch 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_get_wch.3x,v 1.43 2024/06/08 20:25:25 tom Exp $
++.TH curs_get_wch 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -106,9 +106,14 @@
+ If \fB\%cbreak\fP(3X)
+ has been called,
+ this happens after one character is read.
+-If \fB\%nocbreak\fP(3X)
++If \fB\%nocbreak\fP(3X) or \fB\%noraw\fP(3X)
+ has been called,
+ it occurs when the next newline is read.
++(Because the terminal's normal or \*(``cooked\*('' mode
++is line-buffered,
++multiple
++.B \%wget_wch
++calls may then be necessary to empty the input queue.)
+ If \fB\%halfdelay\fP(3X)
+ has been called,
+ .I curses
+@@ -117,15 +122,15 @@
+ If \fB\%echo\fP(3X) has been called,
+ and the window is not a pad,
+ .I curses
+-writes
+-.I wch
++writes the wide character
++from the input queue
+ to the window
+ (at the cursor position)
+ per the following rules.
+ .bP
+-If
+-.I wch
+-matches the terminal's erase character,
++If the wide character
++matches the terminal's erase character
++(see \fB\%erasewchar\fP(3X)),
+ the cursor moves leftward one position
+ and the new position is erased
+ as if \fB\%wmove\fP(3X) and then \fB\%wdelch\fP(3X) were called.
+@@ -138,7 +143,7 @@
+ .bP
+ .I curses
+ writes any other
+-.I wch
++wide character
+ to the window,
+ as with \fB\%wecho_wchar\fP(3X).
+ .bP
+@@ -151,18 +156,17 @@
+ .B \%wrefresh
+ on it.
+ .PP
+-If
+-.I wch
++If the wide character
+ is a carriage return and \fBnl\fP(3X) has been called,
+ .B \%wgetch
+-stores the the character code for line feed in
++stores the the wide character code for line feed in
+ .I wch
+ instead.
+ .SS "Ungetting Characters"
+ .B \%unget_wch
+ places
+-.I wch
+-into the input queue to be returned by the next call to
++.I wc
++into the input queue to be retrieved by the next call to
+ .BR \%wget_wch "."
+ A single input queue serves all windows associated with the terminal.
+ .SH RETURN VALUE
+Index: man/curs_get_wstr.3x
+Prereq:  1.50 
+--- ncurses-6.5-20240601+/man/curs_get_wstr.3x	2024-05-25 20:10:58.000000000 +0000
++++ ncurses-6.5-20240608/man/curs_get_wstr.3x	2024-06-08 21:01:53.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_get_wstr.3x,v 1.50 2024/05/25 20:10:58 tom Exp $
+-.TH curs_get_wstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_get_wstr.3x,v 1.52 2024/06/08 21:01:53 tom Exp $
++.TH curs_get_wstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -178,8 +178,9 @@
+ 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.
+ .SH PORTABILITY
+-These functions are described in The Single Unix Specification, Version 2.
+-No error conditions are defined.
++X/Open Curses,
++Issue 4 describes these functions.
++It specifies no error conditions for them.
+ .PP
+ This implementation returns \fBERR\fP if the window pointer is null,
+ or if the lower-level \fBwget_wch\fP call returns an \fBERR\fP.
+Index: man/curs_getch.3x
+Prereq:  1.95 
+--- ncurses-6.5-20240601+/man/curs_getch.3x	2024-06-01 22:29:08.000000000 +0000
++++ ncurses-6.5-20240608/man/curs_getch.3x	2024-06-08 20:26:46.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getch.3x,v 1.95 2024/06/01 22:29:08 tom Exp $
+-.TH curs_getch 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_getch.3x,v 1.97 2024/06/08 20:26:46 tom Exp $
++.TH curs_getch 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -106,9 +106,14 @@
+ If \fB\%cbreak\fP(3X)
+ has been called,
+ this happens after one character is read.
+-If \fB\%nocbreak\fP(3X)
++If \fB\%nocbreak\fP(3X) or \fB\%noraw\fP(3X)
+ has been called,
+ it occurs when the next newline is read.
++(Because the terminal's normal or \*(``cooked\*('' mode
++is line-buffered,
++multiple
++.B \%wgetch
++calls may then be necessary to empty the input queue.)
+ If \fB\%halfdelay\fP(3X)
+ has been called,
+ .I curses
+@@ -125,7 +130,8 @@
+ .bP
+ If
+ .I c
+-matches the terminal's erase character,
++matches the terminal's erase character
++(see \fB\%erasechar\fP(3X)),
+ the cursor moves leftward one position
+ and the new position is erased
+ as if \fB\%wmove\fP(3X) and then \fB\%wdelch\fP(3X) were called.
+@@ -403,11 +409,13 @@
+ returns
+ .BR \%KEY_RESIZE ","
+ even if the window's keypad mode is disabled,
+-when
++if
+ .I \%ncurses
+-handles a
++has handled a
+ .B \%SIGWINCH
+-signal;
++signal since
++.B \%wgetch
++was called;
+ see \fB\%initscr\fP(3X) and \fB\%resizeterm\fP(3X).
+ .bP
+ .B \%wgetch
+@@ -624,13 +632,14 @@
+ .PP
+ The echo behavior of these functions on input of
+ .B KEY_
+-or backspace characters was not specified in the SVr4 documentation.
+-This description is adapted from X/Open Curses.
++or backspace characters is not documented in SVr4
++.IR curses "."
+ .PP
+ The behavior of
+ .B \%wgetch
+-in the presence of signal handlers is unspecified in the SVr4
+-documentation and X/Open Curses.
++in the presence of signal handlers is not documented in SVr4
++.I curses
++and is unspecified by X/Open Curses.
+ In historical
+ .I curses
+ implementations,
+Index: man/curs_getstr.3x
+Prereq:  1.63 
+--- ncurses-6.5-20240601+/man/curs_getstr.3x	2024-06-01 22:29:08.000000000 +0000
++++ ncurses-6.5-20240608/man/curs_getstr.3x	2024-06-08 21:04:32.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getstr.3x,v 1.63 2024/06/01 22:29:08 tom Exp $
+-.TH curs_getstr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_getstr.3x,v 1.65 2024/06/08 21:04:32 tom Exp $
++.TH curs_getstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -177,11 +177,9 @@
+ \fBwgetnstr\fP,
+ respectively, is recommended.
+ .SH PORTABILITY
+-These functions are described in The Single Unix Specification, Version 2.
+-No error conditions are defined.
+-.PP
+-This implementation returns \fBERR\fP if the window pointer is null,
+-or if the lower-level \fBwgetch\fP(3X) call returns an \fBERR\fP.
++X/Open Curses,
++Issue 4 describes these functions.
++It specifies no error conditions for them.
+ .PP
+ SVr3 and early SVr4 curses implementations did not reject function keys;
+ the SVr4.0 documentation claimed that \*(``special keys\*(''
+Index: man/curs_getyx.3x
+Prereq:  1.45 
+--- ncurses-6.5-20240601+/man/curs_getyx.3x	2024-05-11 20:39:53.000000000 +0000
++++ ncurses-6.5-20240608/man/curs_getyx.3x	2024-06-08 20:42:50.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getyx.3x,v 1.45 2024/05/11 20:39:53 tom Exp $
+-.TH curs_getyx 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_getyx.3x,v 1.47 2024/06/08 20:42:50 tom Exp $
++.TH curs_getyx 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -71,7 +71,7 @@
+ .B \%getmaxyx
+ stores
+ .IR win "'s"
+-maximum valid row and column numbers in
++maximum valid line and column numbers in
+ .I y
+ and
+ .IR x ","
+Index: man/curs_inch.3x
+Prereq:  1.58 
+--- ncurses-6.5-20240601+/man/curs_inch.3x	2024-06-01 22:29:08.000000000 +0000
++++ ncurses-6.5-20240608/man/curs_inch.3x	2024-06-08 20:45:43.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inch.3x,v 1.58 2024/06/01 22:29:08 tom Exp $
+-.TH curs_inch 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inch.3x,v 1.60 2024/06/08 20:45:43 tom Exp $
++.TH curs_inch 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -160,18 +160,6 @@
+ .\" the Alpha arrived in 1993.  --GBR
+ SVr3.2 (1988)
+ added a 6-bit color pair identifier alongside the attributes.
+-.PP
+-X/Open Curses does not specify the sizes of the character code or
+-color pair identifier,
+-nor the quantity of attribute bits,
+-in
+-.IR chtype ";"
+-these are implementation-dependent.
+-.I \%ncurses
+-uses eight bits for the character code.
+-An application requiring a wider character type,
+-for instance to represent Unicode,
+-should use the wide-character counterparts of these functions.
+ .SH SEE ALSO
+ \fB\%curs_in_wch\fP(3X) describes comparable functions of the
+ .I \%ncurses
+Index: man/curs_initscr.3x
+Prereq:  1.73 
+--- ncurses-6.5-20240601+/man/curs_initscr.3x	2024-06-01 22:38:43.000000000 +0000
++++ ncurses-6.5-20240608/man/curs_initscr.3x	2024-06-08 20:34:23.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_initscr.3x,v 1.73 2024/06/01 22:38:43 tom Exp $
+-.TH curs_initscr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_initscr.3x,v 1.75 2024/06/08 20:34:23 tom Exp $
++.TH curs_initscr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -308,7 +308,7 @@
+ This handles the window-size changes which were ignored in
+ the standardization efforts.
+ The handler sets a (signal-safe) variable
+-that is later tested by \fB\%wgetch\fP(3X) and \fB\%wget_wch\fP(3X):
++that is later tested by \fB\%wgetch\fP(3X) and \fB\%wget_wch\fP(3X).
+ .RS
+ .bP
+ .B \%wgetch
+Index: man/curs_inopts.3x
+Prereq:  1.70 
+--- ncurses-6.5-20240601+/man/curs_inopts.3x	2024-06-01 22:28:41.000000000 +0000
++++ ncurses-6.5-20240608/man/curs_inopts.3x	2024-06-08 23:24:17.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inopts.3x,v 1.70 2024/06/01 22:28:41 tom Exp $
+-.TH curs_inopts 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inopts.3x,v 1.73 2024/06/08 23:24:17 tom Exp $
++.TH curs_inopts 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -188,7 +188,7 @@
+ By default,
+ a
+ .I curses
+-window has its echo flag set.
++screen's echo option is set.
+ Authors of most interactive programs prefer
+ to do their own echoing in a controlled area of the screen,
+ or not to echo at all,
+@@ -320,12 +320,15 @@
+ Initially,
+ whether the terminal reports a carriage return
+ using the character code for a line feed
++in cbreak or raw modes
+ depends on the configuration of the terminal driver;
+ see \fI\%termios\fP(3).
+ .B nl
+ configures the terminal to perform this translation.
+ .B nonl
+ disables it.
++In normal (or \*(``cooked\*('') mode,
++the terminal driver always translates carriage returns to line feeds.
+ .\"
+ .SS nodelay
+ .B \%nodelay
+@@ -559,9 +562,9 @@
+ (\*(``cooked\*('') mode from raw and cbreak modes,
+ respectively.
+ Mixing
+-.BR raw / \%noraw
++.BR \%raw / noraw
+ calls with
+-.BR cbreak / \%nocbreak
++.BR \%cbreak / nocbreak
+ calls leads to terminal driver control states that are hard to predict
+ or understand;
+ doing so is not recommended.
+@@ -591,10 +594,10 @@
+ the function returns
+ .TP 5 \" "-1" + 2n tag separation + 1n fudge for typesetters like grops
+ .B 1
+-if the flag is set,
++if the option is set,
+ .TP
+ .B 0
+-if the flag is reset,
++if the option is reset,
+ or
+ .TP
+ .B \-1
+@@ -807,5 +810,5 @@
+ \fB\%curs_initscr\fP(3X),
+ \fB\%curs_util\fP(3X),
+ \fB\%define_key\fP(3X),
+-\fB\%term_variables\fP(3X),
+-\fB\%termios\fP(3)
++\fB\%termios\fP(3),
++\fB\%term_variables\fP(3X).
+Index: man/curs_ins_wstr.3x
+Prereq:  1.40 
+--- ncurses-6.5-20240601+/man/curs_ins_wstr.3x	2024-05-25 20:10:58.000000000 +0000
++++ ncurses-6.5-20240608/man/curs_ins_wstr.3x	2024-06-08 21:04:04.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_ins_wstr.3x,v 1.40 2024/05/25 20:10:58 tom Exp $
+-.TH curs_ins_wstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_ins_wstr.3x,v 1.42 2024/06/08 21:04:04 tom Exp $
++.TH curs_ins_wstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -87,17 +87,29 @@
+ .PP
+ Special characters are handled as in \fBwadd_wch\fP(3X).
+ .SH RETURN VALUE
+-All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
++These functions return
++.B OK
++on success and
++.B ERR
++on failure.
+ .PP
+ X/Open Curses does not specify any error conditions.
+-This implementation returns
++In
++.IR \%ncurses ","
++they return
+ .B ERR
++if
+ .bP
+-if the \fIwin\fP parameter is null or
++.I win
++is
++.BR NULL ","
+ .bP
+-if the \fIwstr\fP parameter is null or
++.I wstr
++is
++.BR NULL ","
++or
+ .bP
+-if the \fBwins_wch\fP function returns
++an internal \fB\%wins_wch\fP(3X) call returns
+ .BR ERR "."
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+@@ -106,20 +118,32 @@
+ .IR x )
+ is outside the window boundaries.
+ .SH NOTES
+-All but \fBwins_nwstr\fP may be macros.
++All of these functions except
++.B \%wins_nwstr
++may be implemented as macros.
+ .PP
+-If the first character in the string is a non-spacing character, these
+-functions will fail.
+-X/Open Curses does not define what will happen
++If the first character in the string is a non-spacing character,
++these functions return
++.BR ERR "."
++X/Open Curses does not specify what happens
+ if a non-spacing character follows a control character.
+ .SH PORTABILITY
+-These functions are described in X/Open Curses, Issue 4,
+-which adds \fI\%const\fP qualifiers to the arguments.
+-.PP
+-X/Open states that the entire string is inserted if \fIn\fP is less than 1.
++X/Open Curses,
++Issue 4 describes these functions.
++It specifies no error conditions for them.
++.PP
++Issue 4 states that the entire string is inserted if
++.I n
++is less than 1.
+ This is probably an error,
+ because it is inconsistent with other functions,
+-and differs from the X/Open implementation on Solaris.
++and differs from the SVr4
++.I curses
++and Solaris
++.I xcurses
++implementations.
++Nevertheless,
++Issue 7 retains it.
+ .SH SEE ALSO
+ \fB\%curs_insstr\fP(3X) describes comparable functions of the
+ .I \%ncurses
+Index: man/curs_insstr.3x
+Prereq:  1.53 
+--- ncurses-6.5-20240601+/man/curs_insstr.3x	2024-05-25 20:10:58.000000000 +0000
++++ ncurses-6.5-20240608/man/curs_insstr.3x	2024-06-08 21:03:03.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_insstr.3x,v 1.53 2024/05/25 20:10:58 tom Exp $
+-.TH curs_insstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_insstr.3x,v 1.55 2024/06/08 21:03:03 tom Exp $
++.TH curs_insstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -107,19 +107,40 @@
+ .SH NOTES
+ All but \fBwinsnstr\fP may be macros.
+ .SH PORTABILITY
+-These functions are described in X/Open Curses, Issue 4,
+-which adds \fI\%const\fP qualifiers to the arguments.
+-.PP
+-The Single Unix Specification, Version 2 states that
+-\fBinsnstr\fP and \fBwinsnstr\fP perform wrapping.
+-This is probably an error, since it makes this group of functions inconsistent.
+-Also, no implementation of curses documents this inconsistency.
+-.PP
+-X/Open states that the entire string is inserted if \fIn\fP is less than 1.
++X/Open Curses,
++Issue 4 describes these functions.
++It specifies no error conditions for them.
++.PP
++Issue 4 distinguished
++.B \%insnstr
++and
++.B \%winsnstr
++by stating they \*(``do not perform wrapping\*(''.
++This was probably an error,
++since it makes this group of functions inconsistent.
++No implementation of
++.I curses
++documents this inconsistency,
++and Issue 7 removed it.
++.PP
++Issue 4 states that the entire string is inserted if
++.I n
++is less than 1.
+ This is probably an error,
+ because it is inconsistent with other functions,
+-and differs from the SVr4 and X/Open implementations on Solaris.
++and differs from the SVr4
++.I curses
++and Solaris
++.I xcurses
++implementations.
++Nevertheless,
++Issue 7 retains it.
+ .SH SEE ALSO
++\fB\%curs_ins_wstr\fP(3X) describes comparable functions of the
++.I \%ncurses
++library in its wide-character configuration
++.RI \%( ncursesw ).
++.PP
+ \fB\%curses\fP(3X),
+ \fB\%curs_inch\fP(3X),
+ \fB\%curs_ins_wstr\fP(3X),
+Index: man/curs_instr.3x
+Prereq:  1.55 
+--- ncurses-6.5-20240601+/man/curs_instr.3x	2024-06-01 22:29:08.000000000 +0000
++++ ncurses-6.5-20240608/man/curs_instr.3x	2024-06-08 20:47:39.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_instr.3x,v 1.55 2024/06/01 22:29:08 tom Exp $
+-.TH curs_instr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_instr.3x,v 1.57 2024/06/08 20:47:39 tom Exp $
++.TH curs_instr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -58,37 +58,69 @@
+ .nf
+ \fB#include 
+ .PP
+-\fBint instr(char *\fIstr\fP);
+-\fBint innstr(char *\fIstr\fP, int \fIn\fP);
+-\fBint winstr(WINDOW *\fIwin\fP, char *\fIstr\fP);
+-\fBint winnstr(WINDOW *\fIwin\fP, char *\fIstr\fP, int \fIn\fP);
+-.PP
+-\fBint mvinstr(int \fIy\fP, int \fIx\fP, char *\fIstr\fP);
+-\fBint mvinnstr(int \fIy\fP, int \fIx\fP, char *\fIstr\fP, int \fIn\fP);
+-\fBint mvwinstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, char *\fIstr\fP);
+-\fBint mvwinnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, char *\fIstr\fP, int \fIn\fP);
++\fBint instr(char *\ \fIstr\fP);
++\fBint winstr(WINDOW *\ \fIwin\fP, char *\ \fIstr\fP);
++\fBint mvinstr(int \fIy\fP, int \fIx\fP, char *\ \fIstr\fP);
++\fBint mvwinstr(WINDOW *\ \fIwin\fP, int \fIy\fP, int \fIx\fP, char *\ \fIstr\fP);
++.PP
++\fBint innstr(char *\ \fIstr\fP, int \fIn\fP);
++\fBint winnstr(WINDOW *\ \fIwin\fP, char *\ \fIstr\fP, int \fIn\fP);
++\fBint mvinnstr(int \fIy\fP, int \fIx\fP, char *\ \fIstr\fP, int \fIn\fP);
++\fBint mvwinnstr(WINDOW *\ \fIwin\fP, int \fIy\fP, int \fIx\fP, char *\ \fIstr\fP, int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
+-These routines return a string of characters in \fIstr\fP,
+-starting at the current cursor position in the named window.
+-Attributes are stripped from the characters.
+-.PP
+-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\fP characters have
+-been stored at the location referenced by \fIstr\fP.
++.B \%winstr
++extracts a string from a
++.I curses
++window
++.IR win ","
++starting at the cursor and stopping at the end of the line,
++and stores it in
++.IR str ","
++terminating it with a null character
++and
++omitting any attributes and color pair identifier
++that
++.I curses
++associates with each character.
++.B \%winnstr
++does the same,
++but copies at most
++.I n
++characters from
++.IR win "."
++An
++.I n
++of
++.B \-1
++implies no limit;
++.B \%winnstr
++then works like
++.BR \%winstr "."
++\fB\%ncurses\fP(3X) describes the variants of these functions.
+ .SH RETURN VALUE
+-All of the functions return \fBERR\fP upon failure,
+-or the number of characters actually read into the string.
++These functions return the count of characters copied from
++.I win
++to
++.IR str ","
++or
++.B ERR
++upon failure.
+ .PP
+-X/Open Curses defines no error conditions.
+-This implementation returns
++In
++.IR \%ncurses ","
++they return
+ .B ERR
++if
+ .bP
+-if the \fIwin\fP parameter is null or
++.I win
++is
++.B NULL
++or
+ .bP
+-if the \fIchstr\fP parameter is null.
++.I str
++is
++.BR NULL "."
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+@@ -96,32 +128,92 @@
+ .IR x )
+ is outside the window boundaries.
+ .SH NOTES
+-All routines except \fBwinnstr\fP may be macros.
++All of these functions except
++.B \%winnstr
++may be implemented as macros.
+ .PP
+ Reading a line that overflows the array pointed to by
+-\fIstr\fP
++.I str
+ with
+-\fBinstr\fP,
+-\fBmvinstr\fP,
+-\fBmvwinstr\fP
++.BR \%instr ","
++.BR \%winstr ","
++.BR \%mvinstr ","
+ or
+-\fBwinstr\fP
++.B \%mvwinstr
+ causes undefined results.
+-Therefore, the use of
+-\fBinnstr\fP,
+-\fBmvinnstr\fP,
+-\fBmvwinnstr\fP, or
+-\fBwinnstr\fP
+-is recommended.
++Use of
++.BR \%innstr ","
++.BR \%winnstr ","
++.BR \%mvinnstr ","
++and
++.B \%mvwinnstr
++is recommended instead.
++.SH EXTENSIONS
++.BR \%innstr ","
++.BR \%winnstr ","
++.BR \%mvinnstr ","
++and
++.BR \%mvwinnstr "'s"
++treatment of
++.B \-1
++as a valid value of
++.I n
++is an
++.I \%ncurses
++extension.
+ .SH PORTABILITY
++Applications employing
++.I \%ncurses
++extensions should condition their use on the visibility of the
++.B \%NCURSES_VERSION
++preprocessor macro.
++.PP
++X/Open Curses,
++Issue 4 describes these functions.
++It specifies no error conditions for them.
++.PP
++X/Open Curses Issues 4 and 7 both state that
++.BR \%instr ","
++.BR \%winstr ","
++.BR \%mvinstr ","
++and
++.B \%mvwinstr
++return
++.B OK
++rather than a character count.
++This is likely an erratum.
++.bP
++SVr3.1 and SVr4 implemented
++.B \%winstr
++as a wrapper around
++.BR \%winnstr ","
++returning the latter's return value.
++X/Open Curses's specification thus may have been an editorial solecism
++copied from System\ V's documentation
++(see below)
++by X/Open,
++rather than an intentional change.
++.bP
++.I \%ncurses
++retains compatibility with System\ V
++.I curses
++behavior.
++.PP
++SVr4 documents no return values apart from
++.B OK
++and
++.B ERR
++for any of these functions.
+ SVr4 does not
+-document whether a length limit includes or excludes the trailing NUL.
+-.PP
+-The \fI\%ncurses\fP library extends the X/Open Curses description by allowing a
+-negative value for \fIn\fP.
+-In this case, the functions return the string ending at the right margin.
++document whether
++.I n
++counts the null terminator that these functions write to
++.IR str "."
++.SH HISTORY
++SVr3.1 (1987)
++introduced these functions.
+ .SH SEE ALSO
+-\fB\%curs_ins_wstr\fP(3X) describes comparable functions of the
++\fB\%curs_inwstr\fP(3X) describes comparable functions of the
+ .I \%ncurses
+ library in its wide-character configuration
+ .RI \%( ncursesw ).
+Index: man/curs_inwstr.3x
+Prereq:  1.43 
+--- ncurses-6.5-20240601+/man/curs_inwstr.3x	2024-05-25 20:10:58.000000000 +0000
++++ ncurses-6.5-20240608/man/curs_inwstr.3x	2024-06-08 21:19:18.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inwstr.3x,v 1.43 2024/05/25 20:10:58 tom Exp $
+-.TH curs_inwstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inwstr.3x,v 1.45 2024/06/08 21:19:18 tom Exp $
++.TH curs_inwstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -57,48 +57,84 @@
+ .nf
+ \fB#include 
+ .PP
+-\fBint inwstr(wchar_t *\fIwstr\fP);
+-\fBint innwstr(wchar_t *\fIwstr\fP, int \fIn\fP);
+-\fBint winwstr(WINDOW *\fIwin\fP, wchar_t *\fIwstr\fP);
+-\fBint winnwstr(WINDOW *\fIwin\fP, wchar_t *\fIwstr\fP, int \fIn\fP);
+-.PP
+-\fBint mvinwstr(int \fIy\fP, int \fIx\fP, wchar_t *\fIwstr\fP);
+-\fBint mvinnwstr(int \fIy\fP, int \fIx\fP, wchar_t *\fIwstr\fP, int \fIn\fP);
+-\fBint mvwinwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t *\fIwstr\fP);
+-\fBint mvwinnwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t *\fIwstr\fP, int \fIn\fP);
++\fBint inwstr(wchar_t *\ \fIwstr\fP);
++\fBint winwstr(WINDOW *\ \fIwin\fP, wchar_t *\ \fIwstr\fP);
++\fBint mvinwstr(int \fIy\fP, int \fIx\fP, wchar_t *\ \fIwstr\fP);
++\fBint mvwinwstr(WINDOW *\ \fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t *\ \fIwstr\fP);
++.PP
++\fBint innwstr(wchar_t *\ \fIwstr\fP, int \fIn\fP);
++\fBint winnwstr(WINDOW *\ \fIwin\fP, wchar_t *\ \fIwstr\fP, int \fIn\fP);
++\fBint mvinnwstr(int \fIy\fP, int \fIx\fP, wchar_t *\ \fIwstr\fP, int \fIn\fP);
++\fBint mvwinnwstr(WINDOW *\ \fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t *\ \fIwstr\fP, int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
+-These routines return a string of \fBwchar_t\fP wide characters in \fIwstr\fP,
+-starting at the current cursor position in the named window.
+-.PP
+-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\fP characters have
+-been stored at the location referenced by \fIwstr\fP.
+-.PP
+-If the size \fIn\fP is not large enough to store a complete complex character,
+-an error is generated.
++.B \%winwstr
++extracts a wide-character string from a
++.I curses
++window
++.IR win ","
++starting at the cursor and stopping at the end of the line,
++and stores it in
++.IR wstr ","
++terminating it with a wide null character
++and
++omitting any attributes and color pair identifier
++that
++.I curses
++associates with each character.
++.B \%winnwstr
++does the same,
++but copies at most
++.I n
++characters from
++.IR win "."
++An
++.I n
++of
++.B \-1
++implies no limit;
++.B \%winnwstr
++then works like
++.BR \%winwstr "."
++\fB\%ncurses\fP(3X) describes the variants of these functions.
+ .SH RETURN VALUE
+-All routines return
+-\fBERR\fP
++On successful operation,
++these functions return the count of wide characters copied from
++.I win
++to
++.IR wstr "."
++They return
++.B ERR
+ upon failure.
+-Upon
+-successful completion, the *\fBinwstr\fP
+-routines return
+-\fBOK\fP, and the *\fBinnwstr\fP
+-routines return the
+-number of characters read into the string.
+-.PP
+-X/Open defines no error conditions.
+-This implementation returns
++.BR \%innwstr ","
++.BR \%winnwstr ","
++.BR \%mvinnwstr ","
++and
++.B \%mvwinnwstr
++return
+ .B ERR
++if
++.I n
++is insufficiently large to store a complete wide character string.
++(Recall that a
++.I curses
++complex character can contain multiple wide characters,
++some of which may be non-spacing.)
++.PP
++In
++.IR \%ncurses ","
++these functions return
++.B ERR
++if
+ .bP
+-if the \fIwin\fP parameter is null or
+-.bP
+-if the \fIwstr\fP parameter is null, or
++.I win
++is
++.B NULL
++or
+ .bP
+-if no characters could be read.
++.I wstr
++is
++.BR NULL "."
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+@@ -106,37 +142,90 @@
+ .IR x )
+ is outside the window boundaries.
+ .SH NOTES
+-All routines except
+-\fBwinnwstr\fP
+-may be macros.
+-.PP
+-Each cell in the window holds a complex character
+-(a spacing character and zero or more non-spacing characters)
+-together with attributes and color.
+-These functions store only the wide characters,
+-ignoring attributes and color.
+-Use \fBin_wchstr\fP to return the complex characters from a window.
++All of these functions except
++.B \%winnwstr
++may be implemented as macros.
+ .PP
+ Reading a line that overflows the array pointed to by
+-\fIwstr\fP
++.I str
+ with
+-\fBinwstr\fP,
+-\fBmvinwstr\fP,
+-\fBmvwinwstr\fP
++.BR \%inwstr ","
++.BR \%winwstr ","
++.BR \%mvinwstr ","
+ or
+-\fBwinwstr\fP
++.B \%mvwinwstr
+ causes undefined results.
+-Therefore, the use of
+-\fBinnwstr\fP,
+-\fBmvinnwstr\fP,
+-\fBmvwinnwstr\fP, or
+-\fBwinnwstr\fP
+-is recommended.
++Use of
++.BR \%innwstr ","
++.BR \%winnwstr ","
++.BR \%mvinnwstr ","
++and
++.B \%mvwinnwstr
++is recommended instead.
++.SH EXTENSIONS
++.BR \%innwstr ","
++.BR \%winnwstr ","
++.BR \%mvinnwstr ","
++and
++.BR \%mvwinnwstr "'s"
++treatment of
++.B \-1
++as a valid value of
++.I n
++is an
++.I \%ncurses
++extension.
+ .SH PORTABILITY
+-These functions are described in X/Open Curses, Issue 4.
++Applications employing
++.I \%ncurses
++extensions should condition their use on the visibility of the
++.B \%NCURSES_VERSION
++preprocessor macro.
++.PP
++X/Open Curses,
++Issue 4 describes these functions.
++It specifies no error conditions for them.
++.PP
++Notwithstanding the foregoing,
++X/Open Curses Issues 4 and 7 both state that
++.BR \%innwstr ","
++.BR \%winnwstr ","
++.BR \%mvinnwstr ","
++and
++.B \%mvwinnwstr
++\*(``fail .\|.\|. [i]f the array is not large enough to contain any
++complete characters\*(''.
++Strictly interpreted,
++this means that a caller of these functions cannot use their return
++values to detect truncation of a wide-character string copied from more
++than one character cell in
++.IR win "."
++.I \%ncurses
++reports any truncation with
++.BR ERR "."
++.PP
++X/Open Curses specifies
++.BR \%inwstr ","
++.BR \%winwstr ","
++.BR \%mvinwstr ","
++and
++.B \%mvwinwstr
++as returning
++.B OK
++rather than a (wide) character count,
++unlike their non-wide counterparts
++.BR \%instr ","
++.BR \%winstr ","
++.BR \%mvinstr ","
++and
++.BR \%mvwinstr "."
++.I \%ncurses
++regards this inconsistency as an error in the standard.
+ .SH SEE ALSO
++\fB\%curs_instr\fP(3X) describes comparable functions of the
++.I \%ncurses
++library in its non-wide-character configuration.
++.PP
+ \fB\%curses\fP(3X),
+-\fB\%curs_inch\fP(3X),
+-\fB\%curs_inchstr\fP(3X),
+-\fB\%curs_instr\fP(3X),
++\fB\%curs_in_wch\fP(3X),
+ \fB\%curs_in_wchstr\fP(3X)
+Index: man/curs_kernel.3x
+Prereq:  1.63 
+--- ncurses-6.5-20240601+/man/curs_kernel.3x	2024-05-25 21:13:56.000000000 +0000
++++ ncurses-6.5-20240608/man/curs_kernel.3x	2024-06-08 21:00:58.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_kernel.3x,v 1.63 2024/05/25 21:13:56 tom Exp $
+-.TH curs_kernel 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_kernel.3x,v 1.65 2024/06/08 21:00:58 tom Exp $
++.TH curs_kernel 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -106,33 +106,66 @@
+ a buffer and \fBresetty\fP restores the state to what it was at the
+ last call to \fBsavetty\fP.
+ .SS getsyx
+-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\fP, \fIy\fP and \fIx\fP include these lines;
+-therefore, \fIy\fP and \fIx\fP should be used only as arguments for
+-\fBsetsyx\fP.
++.B \%getsyx
++stores the coordinates of virtual screen
++.RB \%( newscr )
++cursor in
++.I y
++and
++.IR x "."
++If
++.BR \%newscr 's
++\fB\%leaveok\fP(3X) output option is
++.BR TRUE ","
++.B \%getsyx
++stores
++.B \-1
++in both
++.I y
++and
++.IR x "."
++If lines have been removed from the top of the screen using
++.BR \%ripoffline ","
++.I y
++includes these lines;
++therefore,
++.I y
++and
++.I x
++populated by
++.B \%getsyx
++should be used only as arguments for
++.BR \%setsyx "."
+ .PP
+-Few applications will use this feature,
+-most use \fBgetyx\fP instead.
++Few applications use this feature;
++most call \fB\%getyx\fP(3X) instead.
+ .SS setsyx
+-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\fP windows but does not want to change the current position
+-of the program's cursor.
+-The library routine would call \fBgetsyx\fP
+-at the beginning, do its manipulation of its own windows, do a
+-\fBwnoutrefresh\fP on its windows, call \fBsetsyx\fP, and then call
+-\fBdoupdate\fP.
++.B \%setsyx
++sets the virtual screen
++.RB \%( newscr )
++cursor location to
++.RI ( y ,
++.IR x ")."
++.B "\%setsyx(\-1, \-1)"
++is equivalent to
++.BR "\%leaveok(newscr, TRUE)" "."
++.PP
++.B \%getsyx
++and
++.B \%setsyx
++are designed to be used by a function that manipulates
++.I curses
++windows but seeks to avoid changing the cursor position.
++Such a function would first call
++.BR \%getsyx ","
++modify its windows' content,
++call \fB\%wnoutrefresh\fP(3X) on them,
++call
++.BR \%setsyx ","
++then call \fB\%doupdate\fP(3X).
+ .PP
+-Few applications will use this feature,
+-most use \fBwmove\fP instead.
++Few applications use this feature;
++most call \fB\%wmove\fP(3X) instead.
+ .SS curs_set
+ The \fBcurs_set\fP routine sets the cursor state to invisible,
+ normal, or very visible for \fBvisibility\fP equal to \fB0\fP,
+@@ -263,6 +296,12 @@
+ rather than the least costly combination of absolute and relative
+ motion.
+ .SH PORTABILITY
++Applications employing
++.I \%ncurses
++extensions should condition their use on the visibility of the
++.B \%NCURSES_VERSION
++preprocessor macro.
++.PP
+ The \fIvirtual screen\fP functions \fBsetsyx\fP and \fBgetsyx\fP
+ are not described in X/Open Curses, Issue 4.
+ All other functions are as described in X/Open Curses.
+Index: man/curs_scr_dump.3x
+Prereq:  1.45 
+--- ncurses-6.5-20240601+/man/curs_scr_dump.3x	2024-06-01 22:29:45.000000000 +0000
++++ ncurses-6.5-20240608/man/curs_scr_dump.3x	2024-06-08 20:33:56.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_scr_dump.3x,v 1.45 2024/06/01 22:29:45 tom Exp $
+-.TH curs_scr_dump 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_scr_dump.3x,v 1.47 2024/06/08 20:33:56 tom Exp $
++.TH curs_scr_dump 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -99,11 +99,17 @@
+ clearing it and starting from scratch.
+ .PP
+ .I curses
+-regards the terminal being in an invalid state for computation of
+-updates based on the contents of
++regards the terminal as in an invalid state for computation of updates
++based on the contents of
+ .I filename
+ if
+ .bP
++.I curses
++knows that the terminal has been written to since the preceding
++.B \%scr_dump
++call,
++or
++.bP
+ the terminal type supports the
+ .I \%term\%info
+ capabilities
+@@ -111,13 +117,7 @@
+ .RB \%( rmcup )
+ or
+ .B \%non_rev_rmcup
+-.RB \%( nrrmc ),
+-or
+-.bP
+-.I curses
+-knows that the terminal has been written to since the preceding
+-.B \%scr_dump
+-call.
++.RB \%( nrrmc ).
+ .PP
+ Either of the foregoing conditions means that
+ .I curses
+@@ -129,8 +129,8 @@
+ that couple cursor-positioning mode with a local cache of screen
+ contents.
+ .I curses
+-cannot know whether terminal is displaying from that local cache at the
+-time the application calls
++cannot know whether the terminal is displaying from that local cache
++at the time the application calls
+ .BR \%scr_init ","
+ so it makes a pessimistic assumption that a full redraw is required;
+ see subsection \*(``Cursor Motions\*('' of \fB\%terminfo\fP(5).
+Index: man/curs_terminfo.3x
+Prereq:  1.140 
+--- ncurses-6.5-20240601+/man/curs_terminfo.3x	2024-06-01 22:29:08.000000000 +0000
++++ ncurses-6.5-20240608/man/curs_terminfo.3x	2024-06-08 23:05:52.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_terminfo.3x,v 1.140 2024/06/01 22:29:08 tom Exp $
+-.TH curs_terminfo 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_terminfo.3x,v 1.142 2024/06/08 23:05:52 tom Exp $
++.TH curs_terminfo 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -1007,6 +1007,7 @@
+ interface),
+ and reusing \fB\%tgoto\fP and \fB\%tputs\fP.
+ .PP
++.ne 4v
+ .TS
+ lB lB
+ lB lx.
+Index: man/curs_util.3x
+Prereq:  1.106 
+--- ncurses-6.5-20240601+/man/curs_util.3x	2024-06-01 22:28:18.000000000 +0000
++++ ncurses-6.5-20240608/man/curs_util.3x	2024-06-08 22:38:18.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_util.3x,v 1.106 2024/06/01 22:28:18 tom Exp $
+-.TH curs_util 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_util.3x,v 1.108 2024/06/08 22:38:18 tom Exp $
++.TH curs_util 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -85,30 +85,35 @@
+ .fi
+ .SH DESCRIPTION
+ .SS unctrl
+-The \fBunctrl\fP routine returns a character string which is a printable
++The \fBunctrl\fP routine returns a character string as a printable
+ representation of the character \fIch\fP:
+ .bP
+ Printable characters are displayed as themselves,
+-e.g., a one-character string containing the key.
++e.g.,
++a one-character string containing the key.
+ .bP
+ Control characters are displayed in the \fB^\fIX\fR notation.
+ .bP
+ Printing characters are displayed as is.
+ .bP
+-DEL (character 127) is displayed as \fB^?\fP.
++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\-\fIX\fR notation,
+ or are displayed as themselves.
+-In the latter case, the values may not be printable;
++In the latter case,
++the values may not be printable;
+ this follows the X/Open specification.
+ .PP
+ The corresponding \fBwunctrl\fP returns a printable representation of
+ a complex character \fIwch\fP.
+ .PP
+-In both \fBunctrl\fP and \fBwunctrl\fP the attributes and color associated
++In both \fBunctrl\fP and \fBwunctrl\fP the attributes
++and color associated
+ with the character parameter are ignored.
+ .SS "keyname, key_name"
+ The \fBkeyname\fP routine returns a character string
+@@ -121,22 +126,28 @@
+ Values above 256 may be the codes for function keys.
+ The function key name is displayed.
+ .bP
+-Otherwise (if there is no corresponding name and the key is not a character)
+-the function returns null, to denote an error.
++Otherwise
++(if there is no corresponding name and the key is not a character)
++the function returns null,
++to denote an error.
+ X/Open also lists an \*(``UNKNOWN KEY\*('' return value,
+ which some implementations return rather than null.
+ .LP
+ The corresponding \fBkey_name\fP returns
+ a multibyte character string corresponding
+ to the wide-character value \fIwc\fP.
+-The two functions (\fBkeyname\fP and \fBkey_name\fP)
++The two functions
++(\fBkeyname\fP and \fBkey_name\fP)
+ do not return the same set of strings:
+ .bP
+-\fBkeyname\fP returns null where \fBkey_name\fP would display a meta character.
++\fBkeyname\fP returns null where \fBkey_name\fP
++would display a meta character.
+ .bP
+ \fBkey_name\fP does not return the name of a function key.
+ .SS "filter, nofilter"
+-The \fBfilter\fP routine, if used, must be called before \fBinitscr\fP or
++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
+@@ -156,14 +167,15 @@
+ .bP
+ 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.
++The \fBnofilter\fP routine cancels the effect
++of a preceding \fBfilter\fP call.
+ That allows the caller to initialize a screen on a different device,
+ using a different value of \fB$TERM\fP.
+ The limitation arises because the \fBfilter\fP routine modifies the
+ in-memory copy of the terminal information.
+ .SS use_env
+-The \fBuse_env\fP routine, if used,
++The \fBuse_env\fP routine,
++if used,
+ should be called before \fBinitscr\fP or
+ \fBnewterm\fP are called
+ (because those compute the screen size).
+@@ -181,7 +193,8 @@
+ If successful,
+ it overrides the values from the terminal database.
+ .bP
+-Finally (unless \fBuse_env\fP was called with \fBFALSE\fP parameter),
++Finally
++(unless \fBuse_env\fP was called with \fBFALSE\fP parameter),
+ \fI\%ncurses\fP examines the \fILINES\fP or \fI\%COLUMNS\fP environment
+ variables,
+ using a value in those to override the results
+@@ -192,7 +205,8 @@
+ unless overridden by the \fILINES\fP or \fI\%COLUMNS\fP environment
+ variables,
+ .SS use_tioctl
+-The \fBuse_tioctl\fP routine, if used,
++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\fP is called with \fBTRUE\fP as an argument,
+@@ -202,12 +216,13 @@
+ checks if the \fILINES\fP and \fI\%COLUMNS\fP environment variables
+ are set to a number greater than zero.
+ .bP
+-for each, \fI\%ncurses\fP updates the corresponding environment variable
++for each,
++\fI\%ncurses\fP updates the corresponding environment variable
+ with the value that it has obtained via operating system call
+ or from the terminal database.
+ .bP
+ \fI\%ncurses\fP re-fetches the value of the environment variables so
+-that it is still the environment variables which set the screen size.
++that it is still the environment variables that set the screen size.
+ .PP
+ The \fB\%use_env\fP and \fB\%use_tioctl\fP routines combine as follows.
+ .IP
+@@ -233,7 +248,9 @@
+ .TE
+ .SS "putwin, getwin"
+ The \fBputwin\fP routine writes all data associated
+-with window (or pad) \fIwin\fP into
++with window
++(or pad)
++\fIwin\fP into
+ the file to which \fIfilep\fP points.
+ This information can be later retrieved
+ using the \fBgetwin\fP function.
+@@ -249,14 +266,16 @@
+ and its associated character cells.
+ The format differs between the wide-character (\fI\%ncursesw\fP) and
+ non-wide (\fI\%ncurses\fP) libraries.
+-You can transfer data between the two, however.
++You can transfer data between the two,
++however.
+ .bP
+-the retrieved window is always created as a top-level window (or pad),
++the retrieved window is always created as a top-level window
++(or pad),
+ rather than a subwindow.
+ .bP
+ the window's character cells contain the color pair \fIvalue\fP,
+ but not the actual color \fInumbers\fP.
+-If cells in the retrieved window use color pairs which have not been
++If cells in the retrieved window use color pairs that have not been
+ created in the application using \fBinit_pair\fP,
+ they will not be colored when the window is refreshed.
+ .SS delay_output
+@@ -268,7 +287,8 @@
+ instead of sleeping and requesting resumption from the operating system.
+ Padding is used unless:
+ .bP
+-the terminal description has \fBnpc\fP (\fBno_pad_char\fP) capability, or
++the terminal description has \fBnpc\fP (\fBno_pad_char\fP) capability,
++or
+ .bP
+ the environment variable \fB\%NCURSES_NO_PADDING\fP is set.
+ .PP
+@@ -278,12 +298,15 @@
+ (thirty seconds),
+ it is capped at that value.
+ .SS flushinp
+-The \fBflushinp\fP routine throws away any typeahead that has been typed by the
+-user and has not yet been read by the program.
++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\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.
++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\fP on error.
+ .PP
+@@ -299,15 +322,15 @@
+ \fBputwin\fP
+ returns
+ .B ERR
+-if the associated \fBfwrite\fP calls return
++if the associated \fIwrite\fP(2) calls return
+ .BR ERR "."
+ .RE
+ .SH PORTABILITY
+ .SS filter
+-The SVr4 documentation describes the action of \fBfilter\fP only in the vaguest
+-terms.
+-The description here is adapted from X/Open Curses (which
+-erroneously fails to describe the disabling of \fBcuu\fP).
++The SVr4 documentation describes the action of \fBfilter\fP
++only in the vaguest terms.
++The description here is adapted from X/Open Curses
++(which erroneously fails to describe the disabling of \fBcuu\fP).
+ .SS "delay_output padding"
+ The limitation to 30 seconds
+ and the use of \fBnapms\fP
+@@ -321,19 +344,22 @@
+ Neither limits the delay.
+ .SS keyname
+ The \fBkeyname\fP function may return the names of user-defined
+-string capabilities which are defined in the terminfo entry via the \fB\-x\fP
++string capabilities that are defined in the terminfo entry
++via the \fB\-x\fP
+ option of \fB@TIC@\fP.
+ This implementation automatically assigns at run-time key codes to
+-user-defined strings which begin with \*(``k\*(''.
+-The key codes start at KEY_MAX, but are not guaranteed to be
+-the same value for different runs because user-defined codes are
+-merged from all terminal descriptions which have been loaded.
++user-defined strings that begin with \*(``k\*(''.
++The key codes start at KEY_MAX,
++but are not guaranteed to be the same value for different runs
++because user-defined codes are merged
++from all terminal descriptions that have been loaded.
+ The \fBuse_extended_names\fP(3X) function controls whether this data is
+ loaded when the terminal description is read by the library.
+ .SS "nofilter, use_tioctl"
+ The \fBnofilter\fP and \fBuse_tioctl\fP routines are specific to
+ \fI\%ncurses\fP.
+-They were not supported on Version 7, BSD or System V implementations.
++They were not supported on Version 7,
++BSD or System V implementations.
+ It is recommended that any code depending on \fI\%ncurses\fP extensions
+ be conditioned using \fBNCURSES_VERSION\fP.
+ .SS "putwin/getwin file-format"
+@@ -345,68 +371,96 @@
+ Although the format is an obvious target for standardization,
+ it has been overlooked.
+ .IP
+-Interestingly enough, according to the copyright dates in Solaris source,
+-the functions (along with \fBscr_init\fP, etc.) originated with
+-the University of California, Berkeley (in 1982)
+-and were later (in 1988) incorporated into SVr4.
+-Oddly, there are no such functions in the 4.3BSD curses sources.
++Interestingly enough,
++according to the copyright dates in Solaris source,
++the functions
++(along with \fBscr_init\fP,
++etc.\&)
++originated with the University of California,
++Berkeley
++(in 1982)
++and were later
++(in 1988)
++incorporated into SVr4.
++Oddly,
++there are no such functions in the 4.3BSD curses sources.
+ .bP
+ Most implementations simply dump the binary \fI\%WINDOW\fP structure
+ to the file.
+-These include SVr4 curses, NetBSD and PDCurses,
++These include SVr4 curses,
++NetBSD and PDCurses,
+ as well as older \fI\%ncurses\fP versions.
+ This implementation
+-(as well as the X/Open variant of Solaris curses, dated 1995)
++(as well as the X/Open variant of Solaris curses,
++dated 1995)
+ uses textual dumps.
+ .IP
+-The implementations which use binary dumps use block-I/O
+-(the \fBfwrite\fP and \fBfread\fP functions).
++The implementations that use binary dumps use block-I/O
++(\fIwrite\fP(2) and \fIread\fP(2) functions).
+ Those that use textual dumps use buffered-I/O.
+ A few applications may happen to write extra data in the file using
+ these functions.
+ Doing that can run into problems mixing block- and buffered-I/O.
+-This implementation reduces the problem on writes by flushing the output.
+-However, reading from a file written using mixed schemes may not be successful.
++This implementation reduces the problem on writes by flushing the
++output.
++However,
++reading from a file written using mixed schemes may not be successful.
+ .SS "unctrl, wunctrl"
+-X/Open Curses, Issue 4 describes these functions.
+-It states that \fBunctrl\fP and \fBwunctrl\fP will return a null pointer if
+-unsuccessful, but does not define any error conditions.
++X/Open Curses,
++Issue 4 describes these functions.
++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
+ the parameter is a 7-bit US\-ASCII code.
+ This is the case that X/Open Curses documented.
+ .bP
+-the parameter is in the range 128\-159, i.e., a C1 control code.
++the parameter is in the range 128\-159,
++i.e.,
++a C1 control code.
+ If \fBuse_legacy_coding\fP(3X) has been called with a \fB2\fP parameter,
+-\fBunctrl\fP returns the parameter, i.e., a one-character string with
++\fBunctrl\fP returns the parameter,
++i.e.,
++a one-character string with
+ the parameter as the first character.
+-Otherwise, it returns \*(``~@\*('', \*(``~A\*('', etc.,
+-analogous to \*(``^@\*('', \*(``^A\*('', C0 controls.
++Otherwise,
++it returns \*(``~@\*('',
++\*(``~A\*('',
++etc.,
++analogous to \*(``^@\*('',
++\*(``^A\*('',
++C0 controls.
+ .IP
+-X/Open Curses does not document whether \fBunctrl\fP can be called before
+-initializing curses.
++X/Open Curses does not document whether \fBunctrl\fP can be called
++before initializing curses.
+ This implementation permits that,
+-and returns the \*(``~@\*('', etc., values in that case.
++and returns the \*(``~@\*('',
++etc.,
++values in that case.
+ .bP
+ parameter values outside the 0 to 255 range.
+ \fBunctrl\fP returns a null pointer.
+ .PP
+-The strings returned by \fBunctrl\fP in this implementation are determined
+-at compile time,
++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 \*(``^\*(''.
+ Other implementations have different conventions.
+-For example, they may show both sets of control characters with \*(``^\*('',
++For example,
++they may show both sets of control characters with \*(``^\*('',
+ and strip the parameter to 7 bits.
+ Or they may ignore C1 controls and treat all of the upper-128 codes as
+ printable.
+-This implementation uses 8 bits but does not modify the string to reflect
+-locale.
++This implementation uses 8 bits
++but does not modify the string to reflect locale.
+ The \fBuse_legacy_coding\fP(3X) function allows the caller to
+ change the output of \fBunctrl\fP.
+ .PP
+-Likewise, the \fBmeta\fP(3X) function allows the caller to change the
+-output of \fBkeyname\fP, i.e.,
++Likewise,
++the \fBmeta\fP(3X) function allows the caller to change the output
++of \fBkeyname\fP,
++i.e.,
+ it determines whether to use the \*(``M\-\*('' prefix
+ for \*(``meta\*('' keys (codes in the range 128 to 255).
+ Both \fBuse_legacy_coding\fP(3X) and \fBmeta\fP(3X) succeed only after
+@@ -414,11 +468,14 @@
+ X/Open Curses does not document the treatment of codes 128 to 159.
+ When treating them as \*(``meta\*('' keys
+ (or if \fBkeyname\fP is called before initializing curses),
+-this implementation returns strings \*(``M\-^@\*('', \*(``M\-^A\*('', etc.
++this implementation returns strings \*(``M\-^@\*('',
++\*(``M\-^A\*('',
++etc.
+ .PP
+ X/Open Curses documents \fBunctrl\fP as declared in \fB\fP,
+ which \fI\%ncurses\fP does.
+-However, \fI\%ncurses\fP' \fB\fP includes \fB\fP,
++However,
++\fI\%ncurses\fP' \fB\fP includes \fB\fP,
+ matching the behavior of SVr4 curses.
+ Other implementations may not do that.
+ .SS "use_env, use_tioctl"
+Index: man/define_key.3x
+Prereq:  1.46 
+--- ncurses-6.5-20240601+/man/define_key.3x	2024-05-25 20:15:04.000000000 +0000
++++ ncurses-6.5-20240608/man/define_key.3x	2024-06-08 23:25:11.000000000 +0000
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1997
+ .\"
+-.\" $Id: define_key.3x,v 1.46 2024/05/25 20:15:04 tom Exp $
+-.TH define_key 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: define_key.3x,v 1.48 2024/06/08 23:25:11 tom Exp $
++.TH define_key 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .
+ .de bP
+ .ie n  .IP \(bu 4
+@@ -122,9 +122,8 @@
+ .SH AUTHORS
+ Thomas Dickey
+ .SH SEE ALSO
+-\fB\%ncurses\fP(3X),
+-\fB\%keyok\fP(3X),
+-\fB\%key_defined\fP(3X),
++\fB\%curses\fP(3X),
+ \fB\%keybound\fP(3X),
+ \fB\%keyok\fP(3X),
++\fB\%key_defined\fP(3X),
+ \fB\%terminfo\fP(5)
+Index: man/key_defined.3x
+Prereq:  1.36 
+--- ncurses-6.5-20240601+/man/key_defined.3x	2024-05-18 20:04:53.000000000 +0000
++++ ncurses-6.5-20240608/man/key_defined.3x	2024-06-08 23:25:34.000000000 +0000
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey 2003
+ .\"
+-.\" $Id: key_defined.3x,v 1.36 2024/05/18 20:04:53 tom Exp $
+-.TH key_defined 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: key_defined.3x,v 1.38 2024/06/08 23:25:34 tom Exp $
++.TH key_defined 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%key_defined\fP \-
+ test whether a \fIcurses\fP function key code is defined
+@@ -79,8 +79,7 @@
+ .SH AUTHORS
+ Thomas Dickey
+ .SH SEE ALSO
+-\fB\%ncurses\fP(3X),
++\fB\%curses\fP(3X),
+ \fB\%define_key\fP(3X),
+-\fB\%keyok\fP(3X),
+ \fB\%keybound\fP(3X),
+ \fB\%keyok\fP(3X)
+Index: man/keybound.3x
+Prereq:  1.38 
+--- ncurses-6.5-20240601+/man/keybound.3x	2024-05-18 20:05:36.000000000 +0000
++++ ncurses-6.5-20240608/man/keybound.3x	2024-06-08 23:25:57.000000000 +0000
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1999
+ .\"
+-.\" $Id: keybound.3x,v 1.38 2024/05/18 20:05:36 tom Exp $
+-.TH keybound 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: keybound.3x,v 1.40 2024/06/08 23:25:57 tom Exp $
++.TH keybound 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%keybound\fP \-
+ get definition of a \fIcurses\fP function key code
+@@ -97,8 +97,8 @@
+ .SH AUTHORS
+ Thomas Dickey
+ .SH SEE ALSO
+-\fB\%ncurses\fP(3X),
++\fB\%curses\fP(3X),
+ \fB\%define_key\fP(3X),
+-\fB\%key_defined\fP(3X),
+ \fB\%keyok\fP(3X),
++\fB\%key_defined\fP(3X),
+ \fB\%terminfo\fP(5)
+Index: man/keyok.3x
+Prereq:  1.42 
+--- ncurses-6.5-20240601+/man/keyok.3x	2024-05-18 20:06:09.000000000 +0000
++++ ncurses-6.5-20240608/man/keyok.3x	2024-06-08 23:26:27.000000000 +0000
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1997
+ .\"
+-.\" $Id: keyok.3x,v 1.42 2024/05/18 20:06:09 tom Exp $
+-.TH keyok 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: keyok.3x,v 1.44 2024/06/08 23:26:27 tom Exp $
++.TH keyok 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .
+ .de bP
+ .ie n  .IP \(bu 4
+@@ -104,8 +104,8 @@
+ .SH AUTHORS
+ Thomas Dickey
+ .SH SEE ALSO
+-\fB\%ncurses\fP(3X),
++\fB\%curses\fP(3X),
+ \fB\%define_key\fP(3X),
+-\fB\%key_defined\fP(3X),
+ \fB\%keybound\fP(3X),
+ \fB\%keyok\fP(3X),
++\fB\%key_defined\fP(3X).
+Index: man/man_db.renames.in
+Prereq:  1.75 
+--- ncurses-6.5-20240601+/man/man_db.renames.in	2024-05-25 20:26:02.000000000 +0000
++++ ncurses-6.5-20240608/man/man_db.renames.in	2024-06-08 20:52:35.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: man_db.renames.in,v 1.75 2024/05/25 20:26:02 tom Exp $
++# $Id: man_db.renames.in,v 1.76 2024/06/08 20:52:35 Branden.Robinson Exp $
+ # Manual-page renamings for the man_db program
+ #
+ # Files:
+@@ -195,6 +195,8 @@
+ doupdate.3x			doupdate.3ncurses
+ echo.3x				echo.3ncurses
+ endwin.3x			endwin.3ncurses
++erasechar.3x			erasechar.3ncurses
++erasewchar.3x			erasewchar.3ncurses
+ extended_slk_color.3x		extended_slk_color.3ncurses
+ filter.3x			filter.3ncurses
+ flushinp.3x			flushinp.3ncurses
+@@ -203,6 +205,7 @@
+ getcchar.3x			getcchar.3ncurses
+ getch.3x			getch.3ncurses
+ getwin.3x			getwin.3ncurses
++getyx.3x			getyx.3ncurses
+ halfdelay.3x			halfdelay.3ncurses
+ has_key.3x			has_key.3ncurses
+ idcok.3x			idcok.3ncurses
+@@ -227,6 +230,7 @@
+ nocbreak.3x			nocbreak.3ncurses
+ nodelay.3x			nodelay.3ncurses
+ nonl.3x				nonl.3ncurses
++noraw.3x			noraw.3ncurses
+ notimeout.3x			notimeout.3ncurses
+ pnoutrefresh.3x			pnoutrefresh.3ncurses
+ prefresh.3x			prefresh.3ncurses
+Index: man/manhtml.aliases
+Prereq:  1.37 
+--- ncurses-6.5-20240601+/man/manhtml.aliases	2024-05-25 22:40:43.000000000 +0000
++++ ncurses-6.5-20240608/man/manhtml.aliases	2024-06-08 23:34:02.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: manhtml.aliases,v 1.37 2024/05/25 22:40:43 tom Exp $
++# $Id: manhtml.aliases,v 1.39 2024/06/08 23:34:02 tom Exp $
+ #***************************************************************************
+ # Copyright 2019-2023,2024 Thomas E. Dickey                                *
+ # Copyright 2013,2017 Free Software Foundation, Inc.                       *
+@@ -51,6 +51,8 @@
+ doupdate(3X)		curs_refresh(3X)
+ echo(3X)		curs_inopts(3X)
+ endwin(3X)		curs_initscr(3X)
++erasechar(3X)		curs_termattrs(3X)
++erasewchar(3X)		curs_termattrs(3X)
+ extended_slk_color(3X)	curs_slk(3X)
+ filter(3X)		curs_util(3X)
+ flushinp(3X)		curs_util(3X)
+@@ -58,6 +60,7 @@
+ getcchar(3X)		curs_getcchar(3X)
+ getch(3X)		curs_getch(3X)
+ getwin(3X)		curs_util(3X)
++getyx(3X)		curs_getyx(3X)
+ halfdelay(3X)		curs_inopts(3X)
+ has_key(3X)		curs_getch(3X)
+ immedok(3X)		curs_outopts(3X)
+@@ -78,6 +81,7 @@
+ nl(3X)			curs_inopts(3X)
+ nocbreak(3X)		curs_inopts(3X)
+ nonl(3X)		curs_inopts(3X)
++noraw(3X)		curs_inopts(3X)
+ pnoutrefresh(3X)	curs_pad(3X)
+ prefresh(3X)		curs_pad(3X)
+ printw(3X)		curs_printw(3X)
+Index: man/ncurses.3x
+Prereq:  1.221 
+--- ncurses-6.5-20240601+/man/ncurses.3x	2024-06-01 22:29:08.000000000 +0000
++++ ncurses-6.5-20240608/man/ncurses.3x	2024-06-08 20:45:43.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: ncurses.3x,v 1.221 2024/06/01 22:29:08 tom Exp $
+-.TH ncurses 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: ncurses.3x,v 1.223 2024/06/08 20:45:43 tom Exp $
++.TH ncurses 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -236,7 +236,7 @@
+ A
+ .I window
+ is a rectangular grid of character cells,
+-addressed by row and column coordinates
++addressed by line and column coordinates
+ .RI ( y ,
+ .IR x ),
+ with the upper left corner as (0, 0).
+@@ -261,8 +261,7 @@
+ .PP
+ Functions permit manipulation of a window and the
+ .I cursor
+-identifying the cell within it at which the next output operation will
+-occur.
++identifying the cell within it at which the next operation will occur.
+ Among those,
+ the most basic are \fB\%move\fP(3X) and \fB\%addch\fP(3X):
+ these place the cursor within and write a character to
+@@ -464,6 +463,17 @@
+ .I \%WINDOW
+ is stored as a
+ .IR \%chtype .
++X/Open Curses does not specify the sizes of the character code or
++color pair identifier,
++nor the quantity of attribute bits,
++in
++.IR chtype ";"
++these are implementation-dependent.
++.I \%ncurses
++uses eight bits for the character code.
++An application requiring a wider character type,
++for instance to represent Unicode,
++should use the wide-character API.
+ .TP 10
+ .I \%ncursesw
+ is the library in its \*(``wide\*('' configuration,
+@@ -484,6 +494,12 @@
+ .BR \%addwstr ,
+ .BR \%inwstr ,
+ and their variants.)
++.\" This is because they operate on "plain" wide-character strings
++.\" (`wchar_t*`) and not curses complex character strings (`cchar_t*`).
++.\" SVID 4 did specify functions like `addwch()` and `inswch()` that
++.\" operated on `chtype`s assuming that they were wide enough for a
++.\" `wchar_t` plus attribute and color pair bits; X/Open Curses did not
++.\" standardize these.
+ .IP
+ This convention is inapplicable to some non-wide function names,
+ so other transformations are used for the wide configuration:
+@@ -499,7 +515,7 @@
+ corresponds to the non-wide configuration's
+ .IR \%chtype .
+ It is a structure type
+-because it requires more storage than fits into a standard scalar type.
++because it requires more storage than a standard scalar type offers.
+ A character code may not be representable as a
+ .IR \%char ,
+ and moreover more than one character may occupy a cell
+Index: man/terminfo.tail
+Prereq:  1.149 
+--- ncurses-6.5-20240601+/man/terminfo.tail	2024-05-11 20:28:54.000000000 +0000
++++ ncurses-6.5-20240608/man/terminfo.tail	2024-06-08 20:42:50.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: terminfo.tail,v 1.149 2024/05/11 20:28:54 tom Exp $
++.\" $Id: terminfo.tail,v 1.150 2024/06/08 20:42:50 Branden.Robinson Exp $
+ .ps +1
+ .SS "User-Defined Capabilities"
+ .
+@@ -348,7 +348,7 @@
+ applies to storage scope terminals, such as \s-1TEKTRONIX\s+1 4010
+ series, as well as hard copy and APL terminals.)
+ If there is a code to move the cursor to the left edge of the current
+-row, give this as
++line, give this as
+ .BR cr .
+ (Normally this will be carriage return, control/M.)
+ If there is a code to produce an audible signal (bell, beep, etc)
+@@ -412,7 +412,7 @@
+ .B bw
+ is given, then a
+ .B cub1
+-from the left edge will move to the right edge of the previous row.
++from the left edge will move to the right edge of the previous line.
+ If
+ .B bw
+ is not given, the effect is undefined.
+@@ -462,8 +462,8 @@
+ For example, to address the cursor, the
+ .B cup
+ capability is given, using two parameters:
+-the row and column to address to.
+-(Rows and columns are numbered from zero and refer to the
++the line and column to address to.
++(Lines and columns are numbered from zero and refer to the
+ physical screen visible to the user, not to any unseen memory.)
+ If the terminal has memory relative cursor addressing,
+ that can be indicated by
+@@ -608,17 +608,17 @@
+ \fB%P\fP and \fB%g\fP variables are
+ persistent across escape-string evaluations.
+ .PP
+-Consider the HP2645, which, to get to row 3 and column 12, needs
++Consider the HP2645, which, to get to line 3 and column 12, needs
+ to be sent \eE&a12c03Y padded for 6 milliseconds.
+-The order of the rows and columns is inverted here,
+-and the row and column are printed as two digits.
++The order of the lines and columns is inverted here,
++and the lines and column are printed as two digits.
+ The corresponding terminal description is expressed thus:
+ .RS
+ cup=\eE&a%p2%dc%p1%dY$<6>,
+ .RE
+ .PP
+-The Microterm \s-1ACT-IV\s0 needs the current row and column sent
+-preceded by a \fB\*^T\fP, with the row and column simply encoded in binary,
++The Microterm \s-1ACT-IV\s0 needs the current line and column sent
++preceded by a \fB\*^T\fP, with the line and column simply encoded in binary,
+ .RS
+ cup=\*^T%p1%c%p2%c
+ .RE
+@@ -632,7 +632,7 @@
+ tabs are never expanded, so \et is safe to send.
+ This turns out to be essential for the Ann Arbor 4080.)
+ .PP
+-A final example is the \s-1LSI ADM\s0-3a, which uses row and column
++A final example is the \s-1LSI ADM\s0-3a, which uses line and column
+ offset by a blank character, thus
+ .RS
+ cup=\eE=%p1%\*' \*'%+%c%p2%\*' \*'%+%c
+@@ -656,7 +656,7 @@
+ (Thus, the \eEH sequence on HP terminals cannot be used for
+ .BR home .)
+ .PP
+-If the terminal has row or column absolute cursor addressing,
++If the terminal has line or column absolute cursor addressing,
+ these can be given as single parameter capabilities
+ .B hpa
+ (horizontal position absolute)
+@@ -713,7 +713,7 @@
+ line position, and
+ .bP
+ parameterized capabilities for setting the top, bottom, left, right margins
+-given the number of rows or columns.
++given the number of lines or columns.
+ .RE
+ .PP
+ In practice, the categorization into \*(``terminal\*('' and \*(``printer\*(''
+@@ -1446,7 +1446,7 @@
+ (clear all tab stops)
+ and
+ .B hts
+-(set a tab stop in the current column of every row).
++(set a tab stop in the current column of every line).
+ If a more complex sequence is needed to set the tabs than can be
+ described by this, the sequence can be placed in
+ .B is2
+Index: man/tput.1
+Prereq:  1.114 
+--- ncurses-6.5-20240601+/man/tput.1	2024-05-11 20:39:53.000000000 +0000
++++ ncurses-6.5-20240608/man/tput.1	2024-06-08 20:50:34.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tput.1,v 1.114 2024/05/11 20:39:53 tom Exp $
+-.TH @TPUT@ 1 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: tput.1,v 1.116 2024/06/08 20:50:34 tom Exp $
++.TH @TPUT@ 1 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -49,20 +49,20 @@
+ \fB\%@TPUT@\fP \-
+ initialize a terminal, exercise its capabilities, or query \fI\%term\%info\fP database
+ .SH SYNOPSIS
+-\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP]
++\fB@TPUT@\fP [\fB\-v\fP] [\fB\-T\fP \fIterminal-type\fP]
+ {\fIcap-code\fP [\fIparameter\fP .\|.\|.\&]} .\|.\|.
+ .PP
+-\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP] [\fB\-x\fP] \fBclear\fP
++\fB@TPUT@\fP [\fB\-v\fP] [\fB\-T\fP \fIterminal-type\fP] [\fB\-x\fP] \fBclear\fP
+ .PP
+-\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP] \fBinit\fP
++\fB@TPUT@\fP [\fB\-v\fP] [\fB\-T\fP \fIterminal-type\fP] \fBinit\fP
+ .PP
+-\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP] \fB\%reset\fP
++\fB@TPUT@\fP [\fB\-v\fP] [\fB\-T\fP \fIterminal-type\fP] \fB\%reset\fP
+ .PP
+-\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP] \fB\%longname\fP
++\fB@TPUT@\fP [\fB\-v\fP] [\fB\-T\fP \fIterminal-type\fP] \fB\%longname\fP
+ .PP
+-\fB@TPUT@ \-S\fP
++\fB@TPUT@\fP [\fB\-v\fP] \fB\-S\fP
+ .PP
+-\fB@TPUT@ \-V\fP
++\fB@TPUT@\fP [\fB\-v\fP] \fB\-V\fP
+ .SH DESCRIPTION
+ \fB\%@TPUT@\fP uses the
+ .I \%term\%info
+@@ -373,6 +373,10 @@
+ .I \%COLUMNS
+ are also ignored.
+ .TP
++.B \-v
++causes \fB\%@TPUT@\fP to operate verbosely,
++reporting warnings.
++.TP
+ .B \-V
+ reports the version of
+ .I \%ncurses
+@@ -913,7 +917,7 @@
+ Set cursor to normal visibility.
+ .TP
+ .B "@TPUT@ home"
+-Move the cursor to row 0,
++Move the cursor to line 0,
+ column 0:
+ the upper left corner of the screen,
+ usually known as the \*(``home\*('' cursor position.
+@@ -950,7 +954,7 @@
+ Indicate via exit status whether the terminal is a hard copy device.
+ .TP
+ .B "@TPUT@ cup 23 4"
+-Move the cursor to row 23,
++Move the cursor to line 23,
+ column 4.
+ .TP
+ .B "@TPUT@ cup"
+Index: man/tset.1
+Prereq:  1.86 
+--- ncurses-6.5-20240601+/man/tset.1	2024-05-11 20:39:53.000000000 +0000
++++ ncurses-6.5-20240608/man/tset.1	2024-06-08 20:51:12.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tset.1,v 1.86 2024/05/11 20:39:53 tom Exp $
+-.TH @TSET@ 1 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: tset.1,v 1.88 2024/06/08 20:51:12 tom Exp $
++.TH @TSET@ 1 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -123,7 +123,10 @@
+ unless the \*(``\fB\-I\fP\*('' option is enabled,
+ the terminal
+ and tab \fIinitialization\fP strings are sent to the standard error output,
+-and \fB@TSET@\fP waits one second (in case a hardware reset was issued).
++and,
++if the terminal device does not appear to be a pseudoterminal
++(as might be used by a terminal emulator program),
++\fB@TSET@\fP waits one second in case a hardware reset was issued.
+ .bP
+ Finally, if the erase, interrupt and line kill characters have changed,
+ or are not set to their default values, their values are displayed to the
+Index: man/user_caps.5
+Prereq:  1.49 
+--- ncurses-6.5-20240601+/man/user_caps.5	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20240608/man/user_caps.5	2024-06-08 21:01:53.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: user_caps.5,v 1.49 2024/03/16 15:35:01 tom Exp $
+-.TH user_caps 5 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
++.\" $Id: user_caps.5,v 1.51 2024/06/08 21:01:53 tom Exp $
++.TH user_caps 5 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -58,7 +58,12 @@
+ terminfo databases used a \fIfixed repertoire\fP of terminal
+ capabilities designed for the SVr2 terminal database in 1984,
+ and extended in stages through SVr4 (1989),
+-and standardized in the Single Unix Specification beginning in 1995.
++and standardized in X/Open Curses starting in 1995.
++.\" That date is a surmise based on the capability list appearing in
++.\" Issue 4, Version 2 (1996).  That list is not in man page format in
++.\" the standard, so lacks a "HISTORY" section.  However, `tigetstr()`
++.\" and `tputs()` are identified in the same document as new to Issue 4,
++.\" so GBR conjectures that the list came in at the same time.
+ .PP
+ Most of the \fIextensions\fP in this fixed repertoire were additions
+ to the tables of Boolean, numeric and string capabilities.
+Index: ncurses/widechar/lib_inwstr.c
+Prereq:  1.9 
+--- ncurses-6.5-20240601+/ncurses/widechar/lib_inwstr.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20240608/ncurses/widechar/lib_inwstr.c	2024-06-08 21:22:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 2002-2016,2017 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_inwstr.c,v 1.9 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_inwstr.c,v 1.10 2024/06/08 21:22:24 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ winnwstr(WINDOW *win, wchar_t *wstr, int n)
+@@ -93,22 +93,15 @@
+     returnCode(count);
+ }
+ 
+-/*
+- * X/Open says winwstr() returns OK if not ERR.  If that is not a blunder, it
+- * must have a null termination on the string (see above).  Unlike winnstr(),
+- * it does not define what happens for a negative count with winnwstr().
+- */
+ NCURSES_EXPORT(int)
+ winwstr(WINDOW *win, wchar_t *wstr)
+ {
+-    int result = OK;
++    int result = ERR;
+ 
+     T((T_CALLED("winwstr(%p,%p)"), (void *) win, (void *) wstr));
+-    if (win == 0) {
+-	result = ERR;
+-    } else if (winnwstr(win, wstr,
+-			CCHARW_MAX * (win->_maxx - win->_curx + 1)) == ERR) {
+-	result = ERR;
++    if (win != 0) {
++	result = winnwstr(win, wstr,
++			  CCHARW_MAX * (win->_maxx - win->_curx + 1));
+     }
+     returnCode(result);
+ }
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20240601+/package/debian-mingw/changelog	2024-06-01 11:06:41.000000000 +0000
++++ ncurses-6.5-20240608/package/debian-mingw/changelog	2024-06-08 14:10:18.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.5+20240601) unstable; urgency=low
++ncurses6td (6.5+20240608) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 01 Jun 2024 07:06:41 -0400
++ -- Thomas E. Dickey   Sat, 08 Jun 2024 05:49:40 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw/control
+--- ncurses-6.5-20240601+/package/debian-mingw/control	2022-11-19 17:23:28.000000000 +0000
++++ ncurses-6.5-20240608/package/debian-mingw/control	2024-06-08 18:11:05.000000000 +0000
+@@ -1,4 +1,4 @@
+-Source: ncurses6
++Source: ncurses6td
+ Section: libdevel
+ Priority: optional
+ Maintainer: Thomas E. Dickey 
+@@ -9,8 +9,11 @@
+   binutils-mingw-w64-i686
+ Standards-Version: 4.6.1.0
+ 
+-Package: mingw32-ncurses6
++Package: mingw32-ncurses6td
+ Architecture: any
++Conflicts: mingw32-ncurses6
++Provides: mingw32-ncurses6
++Replaces: mingw32-ncurses6
+ Depends: ${misc:Depends}
+ Description: shared libraries for terminal handling
+  The ncurses library routines are a terminal-independent method of
+Index: package/debian-mingw/mingw32-ncurses6td.lintian-overrides
+--- /dev/null	2024-06-08 09:33:50.735999959 +0000
++++ ncurses-6.5-20240608/package/debian-mingw/mingw32-ncurses6td.lintian-overrides	2024-06-08 14:10:05.000000000 +0000
+@@ -0,0 +1,7 @@
++mingw32-ncurses6td: latest-debian-changelog-entry-changed-to-native
++
++mingw32-ncurses6td: non-standard-dir-in-usr
++mingw32-ncurses6td: file-in-unusual-dir
++
++mingw32-ncurses6td: binary-without-manpage
++mingw32-ncurses6td: executable-not-elf-or-script
+Index: package/debian-mingw/rules
+--- ncurses-6.5-20240601+/package/debian-mingw/rules	2023-07-01 19:53:07.000000000 +0000
++++ ncurses-6.5-20240608/package/debian-mingw/rules	2024-06-08 18:54:55.000000000 +0000
+@@ -21,7 +21,7 @@
+ TARGET    = i686-w64-mingw32
+ MINGW_BIN = /usr/bin
+ MINGW_TOP = /usr/$(TARGET)
+-MINGW_TMP = $(CURDIR)/debian/mingw32-ncurses$(MY_ABI)
++MINGW_TMP = $(CURDIR)/debian/mingw32-ncurses$(MY_ABI)td
+ 
+ CFLAGS = $(CC_NORMAL)
+ 
+@@ -83,7 +83,7 @@
+ 		--target=$(TARGET) \
+ 		--prefix=$(MINGW_TOP) \
+ 		--with-build-cc=$(BUILD_CC) \
+-		--with-pc-suffix=$(MY_ABI) \
++		--with-pc-suffix=$(MY_ABI)td \
+ 		--with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig \
+ 		$(CONFIG_OPTIONS)
+ 
+Index: package/debian-mingw/watch
+--- ncurses-6.5-20240601+/package/debian-mingw/watch	2017-12-09 20:40:49.000000000 +0000
++++ ncurses-6.5-20240608/package/debian-mingw/watch	2024-06-08 13:55:54.000000000 +0000
+@@ -1,4 +1,4 @@
+ version=3
+ 
+-opts=passive ftp://ftp.invisible-island.net/ncurses/current/ncurses\.tar.gz \
++opts=passive https://invisible-island.net/archives/ncurses/current/ncurses\.tar.gz \
+  debian  uupdate
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20240601+/package/debian-mingw64/changelog	2024-06-01 11:06:41.000000000 +0000
++++ ncurses-6.5-20240608/package/debian-mingw64/changelog	2024-06-08 14:13:09.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.5+20240601) unstable; urgency=low
++ncurses6td (6.5+20240608) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 01 Jun 2024 07:06:41 -0400
++ -- Thomas E. Dickey   Sat, 08 Jun 2024 05:49:40 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/control
+--- ncurses-6.5-20240601+/package/debian-mingw64/control	2022-11-19 17:22:37.000000000 +0000
++++ ncurses-6.5-20240608/package/debian-mingw64/control	2024-06-08 18:46:29.000000000 +0000
+@@ -1,4 +1,4 @@
+-Source: ncurses6
++Source: ncurses6td
+ Section: libdevel
+ Priority: optional
+ Maintainer: Thomas E. Dickey 
+@@ -9,8 +9,11 @@
+   binutils-mingw-w64-x86-64
+ Standards-Version: 4.6.1.0
+ 
+-Package: mingw64-ncurses6
++Package: mingw64-ncurses6td
+ Architecture: any
++Conflicts: mingw64-ncurses6
++Provides: mingw64-ncurses6
++Replaces: mingw64-ncurses6
+ Depends: ${misc:Depends}
+ Description: shared libraries for terminal handling
+  The ncurses library routines are a terminal-independent method of
+Index: package/debian-mingw64/mingw64-ncurses6td.lintian-overrides
+--- /dev/null	2024-06-08 09:33:50.735999959 +0000
++++ ncurses-6.5-20240608/package/debian-mingw64/mingw64-ncurses6td.lintian-overrides	2024-06-08 14:13:35.000000000 +0000
+@@ -0,0 +1,7 @@
++mingw64-ncurses6td: latest-debian-changelog-entry-changed-to-native
++
++mingw64-ncurses6td: non-standard-dir-in-usr
++mingw64-ncurses6td: file-in-unusual-dir
++
++mingw64-ncurses6td: binary-without-manpage
++mingw64-ncurses6td: executable-not-elf-or-script
+Index: package/debian-mingw64/rules
+--- ncurses-6.5-20240601+/package/debian-mingw64/rules	2023-07-01 19:53:24.000000000 +0000
++++ ncurses-6.5-20240608/package/debian-mingw64/rules	2024-06-08 18:52:55.000000000 +0000
+@@ -21,7 +21,7 @@
+ TARGET    = x86_64-w64-mingw32
+ MINGW_BIN = /usr/bin
+ MINGW_TOP = /usr/$(TARGET)
+-MINGW_TMP = $(CURDIR)/debian/mingw64-ncurses$(MY_ABI)
++MINGW_TMP = $(CURDIR)/debian/mingw64-ncurses$(MY_ABI)td
+ 
+ CFLAGS = $(CC_NORMAL)
+ 
+@@ -83,7 +83,7 @@
+ 		--target=$(TARGET) \
+ 		--prefix=$(MINGW_TOP) \
+ 		--with-build-cc=$(BUILD_CC) \
+-		--with-pc-suffix=$(MY_ABI) \
++		--with-pc-suffix=$(MY_ABI)td \
+ 		--with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig \
+ 		$(CONFIG_OPTIONS)
+ 
+Index: package/debian-mingw64/watch
+--- ncurses-6.5-20240601+/package/debian-mingw64/watch	2017-12-09 20:40:43.000000000 +0000
++++ ncurses-6.5-20240608/package/debian-mingw64/watch	2024-06-08 13:56:08.000000000 +0000
+@@ -1,4 +1,4 @@
+ version=3
+ 
+-opts=passive ftp://ftp.invisible-island.net/ncurses/current/ncurses\.tar.gz \
++opts=passive https://invisible-island.net/archives/ncurses/current/ncurses\.tar.gz \
+  debian  uupdate
+Index: package/debian/changelog
+--- ncurses-6.5-20240601+/package/debian/changelog	2024-06-01 11:06:41.000000000 +0000
++++ ncurses-6.5-20240608/package/debian/changelog	2024-06-08 13:51:38.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.5+20240601) unstable; urgency=low
++ncurses6td (6.5+20240608) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 01 Jun 2024 07:06:41 -0400
++ -- Thomas E. Dickey   Sat, 08 Jun 2024 05:49:40 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/debian/control
+--- ncurses-6.5-20240601+/package/debian/control	2022-11-19 17:24:06.000000000 +0000
++++ ncurses-6.5-20240608/package/debian/control	2024-06-08 18:33:30.000000000 +0000
+@@ -1,4 +1,4 @@
+-Source: ncurses6
++Source: ncurses6td
+ Section: libdevel
+ Priority: optional
+ Maintainer: Thomas E. Dickey 
+@@ -6,8 +6,11 @@
+ Build-Depends: debhelper (>= 8.1.3)
+ Standards-Version: 4.6.1.0
+ 
+-Package: ncurses6
++Package: ncurses6td
+ Architecture: any
++Conflicts: ncurses6 (>= 6.5)
++Provides: ncurses6 (= 6.5)
++Replaces: ncurses6 (>= 6.5)
+ Depends: ${misc:Depends}, libc6 (>= 2.4)
+ Description: shared libraries for terminal handling
+  The ncurses library routines are a terminal-independent method of
+@@ -15,8 +18,11 @@
+  .
+  This package is used for testing ABI 6.
+ 
+-Package: ncursest6
++Package: ncursest6td
+ Architecture: any
++Conflicts: ncursest6 (>= 6.5)
++Provides: ncursest6 (= 6.5)
++Replaces: ncursest6 (>= 6.5)
+ Depends: ${misc:Depends}, libc6 (>= 2.4)
+ Description: shared libraries for terminal handling
+  The ncurses library routines are a terminal-independent method of
+@@ -24,9 +30,12 @@
+  .
+  This package is used for testing ABI 6 with pthreads.
+ 
+-Package: ncurses6-doc
++Package: ncurses6td-doc
+ Section: doc
+ Architecture: all
++Conflicts: ncurses6-doc
++Provides: ncurses6-doc
++Replaces: ncurses6-doc
+ Depends: groff-base
+ Description: shared libraries for terminal handling
+  The ncurses library routines are a terminal-independent method of
+@@ -34,9 +43,12 @@
+  .
+  This package is used for testing ncurses6 document packaging.
+ 
+-Package: ncurses6-doc-html
++Package: ncurses6td-doc-html
+ Section: doc
+ Architecture: all
++Conflicts: ncurses6-doc-html
++Provides: ncurses6-doc-html
++Replaces: ncurses6-doc-html
+ Description: shared libraries for terminal handling
+  The ncurses library routines are a terminal-independent method of
+  updating character screens with reasonable optimization.
+Index: package/debian/ncurses6td.lintian-overrides
+--- /dev/null	2024-06-08 09:33:50.735999959 +0000
++++ ncurses-6.5-20240608/package/debian/ncurses6td.lintian-overrides	2024-06-08 15:03:11.000000000 +0000
+@@ -0,0 +1,9 @@
++# This is intentional.
++ncurses6td: package-name-doesnt-match-sonames libformw6-6 libmenuw6-6 libncurses++w6-6 libncursesw6-6 libpanelw6-6 libticw6-6 libtinfow6-6
++
++# This is intentional.
++ncurses6td: binary-without-manpage
++ncurses6td: non-dev-pkg-with-shlib-symlink
++ncurses6td: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfow6.so.6.5]
++
++# vile: confmode
+Index: package/debian/ncurses6td.triggers
+--- /dev/null	2024-06-08 09:33:50.735999959 +0000
++++ ncurses-6.5-20240608/package/debian/ncurses6td.triggers	2018-03-03 19:55:16.000000000 +0000
+@@ -0,0 +1 @@
++activate-noawait ldconfig
+Index: package/debian/ncursest6td.lintian-overrides
+--- /dev/null	2024-06-08 09:33:50.735999959 +0000
++++ ncurses-6.5-20240608/package/debian/ncursest6td.lintian-overrides	2024-06-08 15:02:57.000000000 +0000
+@@ -0,0 +1,9 @@
++# This is intentional.
++ncursest6td: package-name-doesnt-match-sonames libformtw6-6 libmenutw6-6 libncurses++tw6-6 libncursestw6-6 libpaneltw6-6 libtictw6-6 libtinfotw6-6
++
++# This is intentional.
++ncursest6td: binary-without-manpage
++ncursest6td: non-dev-pkg-with-shlib-symlink
++ncursest6td: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfotw6.so.6.5]
++
++# vile: confmode
+Index: package/debian/ncursest6td.triggers
+--- /dev/null	2024-06-08 09:33:50.735999959 +0000
++++ ncurses-6.5-20240608/package/debian/ncursest6td.triggers	2018-03-03 19:55:16.000000000 +0000
+@@ -0,0 +1 @@
++activate-noawait ldconfig
+Index: package/debian/rules
+Prereq:  1.53 
+--- ncurses-6.5-20240601+/package/debian/rules	2024-04-08 15:31:32.000000000 +0000
++++ ncurses-6.5-20240608/package/debian/rules	2024-06-08 17:51:52.000000000 +0000
+@@ -1,5 +1,5 @@
+ #!/usr/bin/make -f
+-# $Id: rules,v 1.53 2024/04/08 15:31:32 tom Exp $
++# $Id: rules,v 1.57 2024/06/08 17:51:52 tom Exp $
+ 
+ # Uncomment this to turn on verbose mode.
+ #export DH_VERBOSE=1
+@@ -12,8 +12,8 @@
+ include /usr/share/dpkg/buildflags.mk
+ 
+ # packages
+-PACKAGES.indep = ncurses6-doc ncurses6-doc-html
+-PACKAGES.arch  = ncurses6 ncursest6
++PACKAGES.indep = ncurses6td-doc ncurses6td-doc-html
++PACKAGES.arch  = ncurses6td ncursest6td
+ 
+ # These are used for cross-compiling and for saving the configure script
+ # from having to guess our platform (since we know it already)
+@@ -86,7 +86,8 @@
+ 		--program-suffix=$(MY_ABI) \
+ 		--verbose \
+ 		--with-abi-version=$(MY_ABI) \
+-		--with-config-suffix=dev \
++		--with-config-suffix=td \
++		--with-pc-suffix=td \
+ 		--with-cxx-shared \
+ 		--with-default-terminfo-dir=$(MYDATA) \
+ 		--with-develop \
+@@ -104,8 +105,8 @@
+ 		--with-manpage-symlinks \
+ 		--without-normal
+ 
+-NCURSES6_DIR = $(CURDIR)/debian/ncurses6
+-NCURSEST6_DIR = $(CURDIR)/debian/ncursest6
++NCURSES6_DIR = $(CURDIR)/debian/ncurses6td
++NCURSEST6_DIR = $(CURDIR)/debian/ncursest6td
+ 
+ .PHONY: all config build install binary clean config-indep config-arch \
+     build-indep build-arch install-indep install-arch binary-indep \
+@@ -118,6 +119,7 @@
+ install: install-indep install-arch
+ binary: binary-indep binary-arch
+ clean:
++	pwd; ls -l
+ 	dh_testdir
+ 	dh_testroot
+ 	dh_clean $(verbose)
+@@ -133,7 +135,7 @@
+ install-arch: $(PACKAGES.arch:%=install-%-stamp)
+ 
+ # make the doc-package installable by renaming everything to avoid clashing
+-patch-ncurses6-stamp:
++patch-ncurses6td-stamp:
+ 	dh_testdir
+ 	sed -i.bak \
+ 		-e 's/-config\.1$$/dev-config.1/;t' \
+@@ -147,91 +149,91 @@
+ 	diff -u man/man_db.renames.in.bak man/man_db.renames.in || true
+ 	touch $@
+ 
+-config-ncurses6-stamp: patch-ncurses6-stamp
++config-ncurses6td-stamp: patch-ncurses6td-stamp
+ 	dh_testdir
+-	rm -rf t/ncurses6
+-	mkdir -p t/ncurses6
+-	cd t/ncurses6; $(configure)
++	rm -rf t/ncurses6td
++	mkdir -p t/ncurses6td
++	cd t/ncurses6td; $(configure)
+ 	touch $@
+ 
+-config-ncursest6-stamp: patch-ncurses6-stamp
++config-ncursest6td-stamp: patch-ncurses6td-stamp
+ 	dh_testdir
+-	rm -rf t/ncursest6
+-	mkdir -p t/ncursest6
+-	cd t/ncursest6; $(configure) \
++	rm -rf t/ncursest6td
++	mkdir -p t/ncursest6td
++	cd t/ncursest6td; $(configure) \
+ 		--enable-interop \
+ 		--enable-sp-funcs \
+ 		--program-suffix=t$(MY_ABI) \
+ 		--with-pthread
+ 	touch $@
+ 
+-config-ncurses6-doc-stamp \
+-config-ncurses6-doc-html-stamp: config-ncurses6-stamp
++config-ncurses6td-doc-stamp \
++config-ncurses6td-doc-html-stamp: config-ncurses6td-stamp
+ 	touch $@
+ 
+-build-ncurses6-stamp: config-ncurses6-stamp
++build-ncurses6td-stamp: config-ncurses6td-stamp
+ 	dh_testdir
+ 
+-	$(MAKE) -C t/ncurses6
++	$(MAKE) -C t/ncurses6td
+ 
+ 	touch $@
+ 
+-build-ncursest6-stamp: config-ncursest6-stamp
++build-ncursest6td-stamp: config-ncursest6td-stamp
+ 	dh_testdir
+ 
+-	$(MAKE) -C t/ncursest6
++	$(MAKE) -C t/ncursest6td
+ 
+ 	touch $@
+ 
+-build-ncurses6-doc-stamp \
+-build-ncurses6-doc-html-stamp: build-ncurses6-stamp
++build-ncurses6td-doc-stamp \
++build-ncurses6td-doc-html-stamp: build-ncurses6td-stamp
+ 	touch $@
+ 
+-install-ncurses6-stamp: build-ncurses6-stamp
++install-ncurses6td-stamp: build-ncurses6td-stamp
+ 	dh_testdir
+ 	dh_testroot
+ 	dh_installdirs $(verbose)
+-	dh_prep        $(verbose) -pncurses6
++	dh_prep        $(verbose) -pncurses6td
+ 
+-	$(MAKE) -C t/ncurses6 install.libs install.progs DESTDIR=$(NCURSES6_DIR)
+-	$(MAKE) -C t/ncurses6/test ncurses LOCAL_LIBDIR=$(LIBDIR)
++	$(MAKE) -C t/ncurses6td install.libs install.progs DESTDIR=$(NCURSES6_DIR)
++	$(MAKE) -C t/ncurses6td/test ncurses LOCAL_LIBDIR=$(LIBDIR)
+ 
+-	mv t/ncurses6/test/ncurses $(NCURSES6_DIR)$(BINDIR)/ncurses$(MY_ABI)
++	mv t/ncurses6td/test/ncurses $(NCURSES6_DIR)$(BINDIR)/ncurses$(MY_ABI)
+ 
+ 	touch $@
+ 
+-install-ncursest6-stamp: build-ncursest6-stamp
++install-ncursest6td-stamp: build-ncursest6td-stamp
+ 	dh_testdir
+ 	dh_testroot
+ 	dh_installdirs $(verbose)
+-	dh_prep        $(verbose) -pncursest6
++	dh_prep        $(verbose) -pncursest6td
+ 
+-	$(MAKE) -C t/ncursest6 install.libs install.progs DESTDIR=$(NCURSEST6_DIR)
+-	$(MAKE) -C t/ncursest6/test ncurses LOCAL_LIBDIR=$(LIBDIR)
++	$(MAKE) -C t/ncursest6td install.libs install.progs DESTDIR=$(NCURSEST6_DIR)
++	$(MAKE) -C t/ncursest6td/test ncurses LOCAL_LIBDIR=$(LIBDIR)
+ 
+-	mv t/ncursest6/test/ncurses $(NCURSEST6_DIR)$(BINDIR)/ncursest$(MY_ABI)
++	mv t/ncursest6td/test/ncurses $(NCURSEST6_DIR)$(BINDIR)/ncursest$(MY_ABI)
+ 
+ 	touch $@
+ 
+-install-ncurses6-doc-stamp: build-ncurses6-stamp
++install-ncurses6td-doc-stamp: build-ncurses6td-stamp
+ 	dh_testdir
+ 	dh_testroot
+ 	dh_installdirs $(verbose)
+-	dh_prep        $(verbose) -pncurses6-doc
++	dh_prep        $(verbose) -pncurses6td-doc
+ 
+-	$(MAKE) -C t/ncurses6 install.man DESTDIR=$(NCURSES6_DIR)-doc
++	$(MAKE) -C t/ncurses6td install.man DESTDIR=$(NCURSES6_DIR)-doc
+ 	find $(NCURSES6_DIR)-doc -name 'ncursesw6-config.*' -print -delete
+ 
+ 	cd $(NCURSES6_DIR)-doc/usr/share/man/man1 && ln -sf tset6.1.gz reset6.1.gz
+ 
+ 	touch $@
+ 
+-HTML_DESTDIR=$(NCURSES6_DIR)-doc-html/usr/share/doc/ncurses6-doc-html
+-install-ncurses6-doc-html-stamp: build-ncurses6-stamp
++HTML_DESTDIR=$(NCURSES6_DIR)-doc-html/usr/share/doc/ncurses6td-doc-html
++install-ncurses6td-doc-html-stamp: build-ncurses6td-stamp
+ 	dh_testdir
+ 	dh_testroot
+ 	dh_installdirs $(verbose)
+-	dh_prep        $(verbose) -pncurses6-doc-html
++	dh_prep        $(verbose) -pncurses6td-doc-html
+ 
+ 	cd doc/html && find * -type d | sort | xargs -I{} mkdir -p -v $(HTML_DESTDIR)/{}
+ 	cd doc/html && find * -type f -name '*.html' | sort | xargs -I{} install -m 644 -p -v -T {} $(HTML_DESTDIR)/{}
+Index: package/debian/watch
+--- ncurses-6.5-20240601+/package/debian/watch	2017-12-09 20:40:54.000000000 +0000
++++ ncurses-6.5-20240608/package/debian/watch	2024-06-08 13:52:15.000000000 +0000
+@@ -1,4 +1,4 @@
+ version=3
+ 
+-opts=passive ftp://ftp.invisible-island.net/ncurses/current/ncurses\.tar.gz \
++opts=passive https://invisible-island.net/archives/ncurses/current/ncurses\.tar.gz \
+  debian  uupdate
+Index: package/mingw-ncurses.nsi
+Prereq:  1.651 
+--- ncurses-6.5-20240601+/package/mingw-ncurses.nsi	2024-06-01 11:06:41.000000000 +0000
++++ ncurses-6.5-20240608/package/mingw-ncurses.nsi	2024-06-08 09:49:40.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.651 2024/06/01 11:06:41 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.652 2024/06/08 09:49:40 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "0601"
++!define VERSION_MMDD  "0608"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20240601+/package/mingw-ncurses.spec	2024-06-01 11:06:41.000000000 +0000
++++ ncurses-6.5-20240608/package/mingw-ncurses.spec	2024-06-08 09:49:40.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20240601
++Release: 20240608
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20240601+/package/ncurses.spec	2024-06-01 11:06:41.000000000 +0000
++++ ncurses-6.5-20240608/package/ncurses.spec	2024-06-08 09:49:40.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20240601
++Release: 20240608
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20240601+/package/ncursest.spec	2024-06-01 11:06:41.000000000 +0000
++++ ncurses-6.5-20240608/package/ncursest.spec	2024-06-08 09:49:40.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20240601
++Release: 20240608
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/package/debian-mingw/rules
+--- ncurses-6.5-20240601+/test/package/debian-mingw/rules	2022-11-27 01:39:00.000000000 +0000
++++ ncurses-6.5-20240608/test/package/debian-mingw/rules	2024-06-08 19:48:01.000000000 +0000
+@@ -43,7 +43,7 @@
+ 		--prefix=$(MINGW_TOP) \
+ 		--bindir=\$${prefix}/bin/$(NCURSES_PKG) \
+ 		--datadir=\$${prefix}/share/$(NCURSES_PKG) \
+-		--with-screen=ncursesw6 \
++		--with-screen=ncursesw6td \
+ 		--with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig
+ 
+ 	touch configure-stamp
+Index: test/package/debian-mingw/watch
+--- ncurses-6.5-20240601+/test/package/debian-mingw/watch	2017-12-09 20:41:05.000000000 +0000
++++ ncurses-6.5-20240608/test/package/debian-mingw/watch	2024-06-08 13:55:25.000000000 +0000
+@@ -1,4 +1,4 @@
+ version=3
+ 
+-opts=passive ftp://ftp.invisible-island.net/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \
++opts=passive https://invisible-island.net/archives/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \
+  debian  uupdate
+Index: test/package/debian-mingw64/rules
+--- ncurses-6.5-20240601+/test/package/debian-mingw64/rules	2022-11-27 01:39:00.000000000 +0000
++++ ncurses-6.5-20240608/test/package/debian-mingw64/rules	2024-06-08 19:48:07.000000000 +0000
+@@ -43,7 +43,7 @@
+ 		--prefix=$(MINGW_TOP) \
+ 		--bindir=\$${prefix}/bin/$(NCURSES_PKG) \
+ 		--datadir=\$${prefix}/share/$(NCURSES_PKG) \
+-		--with-screen=ncursesw6 \
++		--with-screen=ncursesw6td \
+ 		--with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig
+ 
+ 	touch configure-stamp
+Index: test/package/debian-mingw64/watch
+--- ncurses-6.5-20240601+/test/package/debian-mingw64/watch	2017-12-09 20:41:00.000000000 +0000
++++ ncurses-6.5-20240608/test/package/debian-mingw64/watch	2024-06-08 13:55:39.000000000 +0000
+@@ -1,4 +1,4 @@
+ version=3
+ 
+-opts=passive ftp://ftp.invisible-island.net/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \
++opts=passive https://invisible-island.net/archives/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \
+  debian  uupdate
+Index: test/package/debian/rules
+--- ncurses-6.5-20240601+/test/package/debian/rules	2024-06-01 23:42:46.000000000 +0000
++++ ncurses-6.5-20240608/test/package/debian/rules	2024-06-08 19:41:08.000000000 +0000
+@@ -75,7 +75,7 @@
+ 
+ 	cd t/ncurses6; $(configure) \
+ 		--datadir=\$${datarootdir}/$(NCURSES_PKG) \
+-		--with-screen=ncurses6
++		--with-screen=ncursesw6td
+ 
+ 	touch $@
+ 
+@@ -87,7 +87,7 @@
+ 
+ 	cd t/ncursest6; $(configure) \
+ 		--datadir=\$${datarootdir}/$(NCURSEST_PKG) \
+-		--with-screen=ncursest6
++		--with-screen=ncursestw6td
+ 
+ 	touch $@
+ 
+Index: test/package/debian/watch
+--- ncurses-6.5-20240601+/test/package/debian/watch	2017-12-09 20:41:10.000000000 +0000
++++ ncurses-6.5-20240608/test/package/debian/watch	2024-06-08 13:55:11.000000000 +0000
+@@ -1,4 +1,4 @@
+ version=3
+ 
+-opts=passive ftp://ftp.invisible-island.net/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \
++opts=passive https://invisible-island.net/archives/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \
+  debian  uupdate
diff --git a/packages/ncurses/6.5/ncurses-6.5-20240615.patch b/packages/ncurses/6.5/ncurses-6.5-20240615.patch
new file mode 100644
index 0000000000..bbe27c0610
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20240615.patch
@@ -0,0 +1,1125 @@
+# ncurses 6.5 - patch 20240615 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20240615.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sat Jun 15 23:59:02 UTC 2024
+# ------------------------------------------------------------------------------
+# AUTHORS                          |    7 +--
+# Ada95/gen/Makefile.in            |   62 ++++++++++++++++--------------
+# Ada95/samples/Makefile.in        |    6 +-
+# Ada95/src/modules                |    6 +-
+# NEWS                             |    8 +++
+# VERSION                          |    2 
+# c++/cursslk.cc                   |    5 --
+# c++/modules                      |   20 ++++-----
+# dist.mk                          |    4 -
+# doc/html/man/curs_inopts.3x.html |   10 ++--
+# doc/html/man/curs_util.3x.html   |   25 ++++++++++--
+# doc/html/man/keyok.3x.html       |   10 ++--
+# doc/html/man/ncurses.3x.html     |    2 
+# doc/html/man/term.5.html         |    8 +--
+# doc/html/man/terminfo.5.html     |    2 
+# man/curs_inopts.3x               |    6 +-
+# man/curs_util.3x                 |   42 +++++++++++++++++++-
+# man/keyok.3x                     |    6 +-
+# man/manhtml.externs              |   10 ++--
+# man/term.5                       |    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/modules                    |   28 ++++++-------
+# test/bs.6                        |   75 ++++++++++++++++++++++++-------------
+# test/gdc.6                       |   40 +++++++++++++------
+# test/modules                     |   30 +++++++-------
+# 31 files changed, 274 insertions(+), 167 deletions(-)
+# ------------------------------------------------------------------------------
+Index: AUTHORS
+Prereq:  1.5 
+--- ncurses-6.5-20240608+/AUTHORS	2021-06-17 21:20:30.000000000 +0000
++++ ncurses-6.5-20240615/AUTHORS	2024-06-15 20:43:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ -------------------------------------------------------------------------------
+--- Copyright 2020,2021 Thomas E. Dickey                                      --
++-- Copyright 2020-2021,2024 Thomas E. Dickey                                 --
+ -- Copyright 2006,2017 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: AUTHORS,v 1.5 2021/06/17 21:20:30 tom Exp $
++-- $Id: AUTHORS,v 1.7 2024/06/15 20:43:32 tom Exp $
+ -------------------------------------------------------------------------------
+ These are the principal authors/contributors of ncurses since 1.9.9e,
+ in decreasing order of their contribution:
+@@ -37,4 +37,5 @@
+ AVL	Alexander V Lukyanov
+ PB	Philippe Blain
+ SV	Sven Verdoolaege
+-NB  Nicolas Boulenguez
++NB	Nicolas Boulenguez
++GBR	Branden Robinson
+Index: Ada95/gen/Makefile.in
+Prereq:  1.103 
+--- ncurses-6.5-20240608+/Ada95/gen/Makefile.in	2024-01-19 16:51:56.000000000 +0000
++++ ncurses-6.5-20240615/Ada95/gen/Makefile.in	2024-06-15 14:56:14.000000000 +0000
+@@ -30,7 +30,7 @@
+ #  Author:  Juergen Pfeifer, 1996
+ #     and:  Thomas E. Dickey, 1997
+ #
+-#  $Id: Makefile.in,v 1.103 2024/01/19 16:51:56 tom Exp $
++#  $Id: Makefile.in,v 1.104 2024/06/15 14:56:14 tom Exp $
+ #
+ .SUFFIXES:
+ 
+@@ -111,36 +111,37 @@
+ 
+ ADA_SRCDIR	= ../src
+ 
+-GEN_TARGETS     = $(ADA_SRCDIR)/$(ABASE).ads         			\
+-		  $(ADA_SRCDIR)/$(ABASE).adb         			\
+-	          $(ADA_SRCDIR)/$(ABASE)-aux.ads   			\
+-	          $(ADA_SRCDIR)/$(ABASE)-trace.ads   			\
+-	          $(ADA_SRCDIR)/$(ABASE)-menus.ads   			\
+-	          $(ADA_SRCDIR)/$(ABASE)-forms.ads   			\
+-	          $(ADA_SRCDIR)/$(ABASE)-mouse.ads 			\
+-	          $(ADA_SRCDIR)/$(ABASE)-panels.ads			\
+-	          $(ADA_SRCDIR)/$(ABASE)-menus-menu_user_data.ads	\
+-	          $(ADA_SRCDIR)/$(ABASE)-menus-item_user_data.ads	\
+-	          $(ADA_SRCDIR)/$(ABASE)-forms-form_user_data.ads	\
+-	          $(ADA_SRCDIR)/$(ABASE)-forms-field_types.ads		\
+-	          $(ADA_SRCDIR)/$(ABASE)-forms-field_user_data.ads	\
+-	          $(ADA_SRCDIR)/$(ABASE)-panels-user_data.ads           \
+-                  $(ADA_SRCDIR)/$(ABASE)_constants.ads
++GEN_TARGETS     = options.m4						\
++		  $(ADA_SRCDIR)/$(ABASE).ads				\
++		  $(ADA_SRCDIR)/$(ABASE).adb				\
++		  $(ADA_SRCDIR)/$(ABASE)-aux.ads			\
++		  $(ADA_SRCDIR)/$(ABASE)-trace.ads			\
++		  $(ADA_SRCDIR)/$(ABASE)-menus.ads			\
++		  $(ADA_SRCDIR)/$(ABASE)-forms.ads			\
++		  $(ADA_SRCDIR)/$(ABASE)-mouse.ads			\
++		  $(ADA_SRCDIR)/$(ABASE)-panels.ads			\
++		  $(ADA_SRCDIR)/$(ABASE)-menus-menu_user_data.ads	\
++		  $(ADA_SRCDIR)/$(ABASE)-menus-item_user_data.ads	\
++		  $(ADA_SRCDIR)/$(ABASE)-forms-form_user_data.ads	\
++		  $(ADA_SRCDIR)/$(ABASE)-forms-field_types.ads		\
++		  $(ADA_SRCDIR)/$(ABASE)-forms-field_user_data.ads	\
++		  $(ADA_SRCDIR)/$(ABASE)-panels-user_data.ads		\
++		  $(ADA_SRCDIR)/$(ABASE)_constants.ads
+ 
+ GEN_SRC		= $(srcdir)/$(ABASE).ads.m4				\
+ 		  $(srcdir)/$(ABASE).adb.m4				\
+-	          $(srcdir)/$(ABASE)-aux.ads.m4 	  		\
+-	          $(srcdir)/$(ABASE)-trace.ads.m4 	  		\
+-	          $(srcdir)/$(ABASE)-menus.ads.m4 	  		\
+-	          $(srcdir)/$(ABASE)-forms.ads.m4   			\
+-	          $(srcdir)/$(ABASE)-mouse.ads.m4			\
+-	          $(srcdir)/$(ABASE)-panels.ads.m4			\
+-	          $(srcdir)/$(ABASE)-menus-menu_user_data.ads.m4	\
+-	          $(srcdir)/$(ABASE)-menus-item_user_data.ads.m4	\
+-	          $(srcdir)/$(ABASE)-forms-form_user_data.ads.m4	\
+-	          $(srcdir)/$(ABASE)-forms-field_types.ads.m4		\
+-	          $(srcdir)/$(ABASE)-forms-field_user_data.ads.m4	\
+-	          $(srcdir)/$(ABASE)-panels-user_data.ads.m4
++		  $(srcdir)/$(ABASE)-aux.ads.m4				\
++		  $(srcdir)/$(ABASE)-trace.ads.m4			\
++		  $(srcdir)/$(ABASE)-menus.ads.m4			\
++		  $(srcdir)/$(ABASE)-forms.ads.m4			\
++		  $(srcdir)/$(ABASE)-mouse.ads.m4			\
++		  $(srcdir)/$(ABASE)-panels.ads.m4			\
++		  $(srcdir)/$(ABASE)-menus-menu_user_data.ads.m4	\
++		  $(srcdir)/$(ABASE)-menus-item_user_data.ads.m4	\
++		  $(srcdir)/$(ABASE)-forms-form_user_data.ads.m4	\
++		  $(srcdir)/$(ABASE)-forms-field_types.ads.m4		\
++		  $(srcdir)/$(ABASE)-forms-field_user_data.ads.m4	\
++		  $(srcdir)/$(ABASE)-panels-user_data.ads.m4
+ 
+ ################################################################################
+ 
+@@ -166,7 +167,10 @@
+ 	mkdir -p $@
+ 
+ install \
+-install.libs :: $(DESTDIR)$(bindir) $(ADACURSES_CONFIG)
++install.libs :: \
++		$(GEN_TARGETS) \
++		$(DESTDIR)$(bindir) \
++		$(ADACURSES_CONFIG)
+ 	$(INSTALL_SCRIPT) $(ADACURSES_CONFIG) $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
+ 
+ uninstall \
+Index: Ada95/samples/Makefile.in
+Prereq:  1.64 
+--- ncurses-6.5-20240608+/Ada95/samples/Makefile.in	2021-07-03 15:45:33.000000000 +0000
++++ ncurses-6.5-20240615/Ada95/samples/Makefile.in	2024-06-15 15:13:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ ##############################################################################
+-# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
++# Copyright 2018-2021,2024 Thomas E. Dickey                                  #
+ # Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -29,7 +29,7 @@
+ #
+ #  Author:  Juergen Pfeifer, 1996
+ #
+-#  $Id: Makefile.in,v 1.64 2021/07/03 15:45:33 tom Exp $
++#  $Id: Makefile.in,v 1.65 2024/06/15 15:13:11 tom Exp $
+ #
+ .SUFFIXES:
+ 
+@@ -133,7 +133,7 @@
+ 
+ libs \
+ install \
+-install.libs ::
++install.libs ::	$(PROGS)
+ 	@echo made $@
+ 
+ uninstall \
+Index: Ada95/src/modules
+Prereq:  1.4 
+--- ncurses-6.5-20240608+/Ada95/src/modules	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20240615/Ada95/src/modules	2024-06-15 20:51:03.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: modules,v 1.4 2020/02/02 23:34:34 tom Exp $
++# $Id: modules,v 1.5 2024/06/15 20:51:03 tom Exp $
+ ##############################################################################
+-# Copyright 2020 Thomas E. Dickey                                            #
++# Copyright 2020,2024 Thomas E. Dickey                                       #
+ # Copyright 2010 Free Software Foundation, Inc.                              #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -69,3 +69,5 @@
+ $(ABASE)-text_io-enumeration_io		$(srcdir)	$(srcdir)	body
+ $(ABASE)-text_io-modular_io		$(srcdir)	$(srcdir)	body
+ $(ABASE)-text_io-complex_io		$(srcdir)	$(srcdir)	body
++
++# vile:makemode
+Index: NEWS
+Prereq:  1.4134 
+--- ncurses-6.5-20240608+/NEWS	2024-06-08 21:21:25.000000000 +0000
++++ ncurses-6.5-20240615/NEWS	2024-06-15 20:49:04.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4134 2024/06/08 21:21:25 tom Exp $
++-- $Id: NEWS,v 1.4139 2024/06/15 20:49:04 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.
+ 
++20240615
++	+ improve formatting/style of manpages (patches by Branden Robinson).
++	+ review/update modules files.
++	+ improve install-rules in Ada95 makefiles (report by Branden Robinson).
++	+ improve formatting/style of manpages in test-directory.
++
+ 20240608
+ 	+ change winwstr to return wide character count instead of OK (patch
+ 	  by Branden Robinson).
+Index: VERSION
+--- ncurses-6.5-20240608+/VERSION	2024-06-08 09:49:40.000000000 +0000
++++ ncurses-6.5-20240615/VERSION	2024-06-15 09:33:15.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20240608
++5:0:10	6.5	20240615
+Index: c++/cursslk.cc
+Prereq:  1.21 
+--- ncurses-6.5-20240608+/c++/cursslk.cc	2023-02-25 23:36:06.000000000 +0000
++++ ncurses-6.5-20240615/c++/cursslk.cc	2024-06-15 21:07:30.000000000 +0000
+@@ -1,6 +1,6 @@
+ // * this is for making emacs happy: -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2005,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -33,10 +33,9 @@
+  ****************************************************************************/
+ 
+ #include "internal.h"
+-#include "cursslk.h"
+ #include "cursesapp.h"
+ 
+-MODULE_ID("$Id: cursslk.cc,v 1.21 2023/02/25 23:36:06 tom Exp $")
++MODULE_ID("$Id: cursslk.cc,v 1.22 2024/06/15 21:07:30 tom Exp $")
+ 
+ Soft_Label_Key_Set::Soft_Label_Key&
+   Soft_Label_Key_Set::Soft_Label_Key::operator=(char *text)
+Index: c++/modules
+Prereq:  1.12 
+--- ncurses-6.5-20240608+/c++/modules	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20240615/c++/modules	2024-06-15 21:07:41.000000000 +0000
+@@ -1,7 +1,7 @@
+ # Program modules
+-# $Id: modules,v 1.12 2020/02/02 23:34:34 tom Exp $
++# $Id: modules,v 1.13 2024/06/15 21:07:41 tom Exp $
+ ##############################################################################
+-# Copyright 2020 Thomas E. Dickey                                            #
++# Copyright 2020,2024 Thomas E. Dickey                                       #
+ # Copyright 1998-2006,2013 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -33,13 +33,13 @@
+ #
+ 
+ @ base
+-cursesf		c++		$(srcdir)	$(internal_h) $(cursesf_h) $(cursesapp_h)
+-cursesm		c++		$(srcdir)	$(internal_h) $(cursesm_h) $(cursesapp_h)
+-cursesw		c++		$(srcdir)	$(internal_h) $(cursesw_h)
+-cursespad	c++		$(srcdir)	$(internal_h) $(cursesw_h)
+-cursesp		c++		$(srcdir)	$(internal_h) $(cursesp_h)
+-cursslk		c++		$(srcdir)	$(internal_h) $(cursesapp_h)
+-cursesapp	c++		$(srcdir)	$(internal_h) $(cursesapp_h)
+-cursesmain	c++		$(srcdir)	$(internal_h) $(cursesapp_h) $(INCDIR)/nc_alloc.h
++cursesf		c++		$(srcdir)	$(HEADER_DEPS)	$(internal_h) $(cursesf_h) $(cursesapp_h)
++cursesm		c++		$(srcdir)	$(HEADER_DEPS)	$(internal_h) $(cursesm_h) $(cursesapp_h)
++cursesw		c++		$(srcdir)	$(HEADER_DEPS)	$(internal_h) $(cursesw_h)
++cursespad	c++		$(srcdir)	$(HEADER_DEPS)	$(internal_h) $(cursesw_h)
++cursesp		c++		$(srcdir)	$(HEADER_DEPS)	$(internal_h) $(cursesp_h)
++cursslk		c++		$(srcdir)	$(HEADER_DEPS)	$(internal_h) $(cursesapp_h)
++cursesapp	c++		$(srcdir)	$(HEADER_DEPS)	$(internal_h) $(cursesapp_h)
++cursesmain	c++		$(srcdir)	$(HEADER_DEPS)	$(internal_h) $(cursesapp_h) $(INCDIR)/nc_alloc.h
+ 
+ # vile:makemode
+Index: dist.mk
+Prereq:  1.1617 
+--- ncurses-6.5-20240608+/dist.mk	2024-06-08 09:49:40.000000000 +0000
++++ ncurses-6.5-20240615/dist.mk	2024-06-15 09:33:15.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1617 2024/06/08 09:49:40 tom Exp $
++# $Id: dist.mk,v 1.1618 2024/06/15 09:33: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 = 5
+-NCURSES_PATCH = 20240608
++NCURSES_PATCH = 20240615
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/curs_inopts.3x.html
+--- ncurses-6.5-20240608+/doc/html/man/curs_inopts.3x.html	2024-06-08 23:29:39.000000000 +0000
++++ ncurses-6.5-20240615/doc/html/man/curs_inopts.3x.html	2024-06-15 20:39:28.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inopts.3x,v 1.73 2024/06/08 23:24:17 tom Exp @
++  * @Id: curs_inopts.3x,v 1.75 2024/06/15 19:49:39 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inopts 3x 2024-06-08 ncurses 6.5 Library calls
++curs_inopts 3x 2024-06-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                        curs_inopts 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                        
++
                                                                                                        curs_inopts 3x 2024-06-15 ncurses 6.5 Library calls
                                                                                                        
+ 
                                                                                                        + curs_inopts(3x)                  Library calls                 curs_inopts(3x)
+ 
+@@ -378,11 +378,11 @@
+ 
+ 
                                                                                                        SEE ALSO
                                                                                                        +        curses(3x),    curs_getch(3x),     curs_initscr(3x),     curs_util(3x),
+-       define_key(3x), termios(3), term_variables(3x).
++       define_key(3x), termios(3), term_variables(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                   curs_inopts(3x)
++ncurses 6.5                       2024-06-15                   curs_inopts(3x)
+ 
                                                                                                        
+ 
                                                                                                        
+ 
                                                                                                          
+Index: doc/html/man/curs_util.3x.html
+--- ncurses-6.5-20240608+/doc/html/man/curs_util.3x.html	2024-06-08 23:12:50.000000000 +0000
++++ ncurses-6.5-20240615/doc/html/man/curs_util.3x.html	2024-06-15 20:39:29.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_util.3x,v 1.108 2024/06/08 22:38:18 tom Exp @
++  * @Id: curs_util.3x,v 1.110 2024/06/15 20:20:12 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_util 3x 2024-06-08 ncurses 6.5 Library calls
++curs_util 3x 2024-06-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                          curs_util 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                          
++
                                                                                                          curs_util 3x 2024-06-15 ncurses 6.5 Library calls
                                                                                                          
+ 
                                                                                                          + curs_util(3x)                    Library calls                   curs_util(3x)
+ 
+@@ -383,6 +383,22 @@
+        use_env is not provided by other implementations of curses.
+ 
+ 
++
                                                                                                          HISTORY
                                                                                                          ++       4BSD (1980) defined unctrl (as a macro, in unctrl.h).
++
++       SVr2 (1984) introduced delay_output, flushinp, and keyname.
++
++       SVr3  (1987)  added filter.  Later that year, SVr3.1 brought getwin and
++       putwin, reading and writing window dumps with fread(3)  and  fwrite(3),
++       respectively.
++
++       SVr4 (1989) supplied use_env.
++
++       X/Open Curses Issue 4 (1995) specified key_name and wunctrl.
++
++       ncurses 5.6 (2006) added nofilter, and 6.0 (2015) use_tioctl.
++
++
+ 
                                                                                                          SEE ALSO
                                                                                                          +        curses(3x),    curs_initscr(3x),    curs_inopts(3x),   curs_kernel(3x),
+        curs_scr_dump(3x),        curs_sp_funcs(3x),        curs_variables(3x),
+@@ -390,7 +406,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                     curs_util(3x)
++ncurses 6.5                       2024-06-15                     curs_util(3x)
+ 
                                                                                                          
+ 
                                                                                                          
+ 
+ 
++
                                                                                                        • HISTORY
                                                                                                          • 
+ 
                                                                                                        • SEE ALSO
                                                                                                          • 
+ 
                                                                                                        
+ 
                                                                                                        
+Index: doc/html/man/keyok.3x.html
+--- ncurses-6.5-20240608+/doc/html/man/keyok.3x.html	2024-06-08 23:29:41.000000000 +0000
++++ ncurses-6.5-20240615/doc/html/man/keyok.3x.html	2024-06-15 20:39:30.000000000 +0000
+@@ -28,19 +28,19 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey 1997
+-  * @Id: keyok.3x,v 1.44 2024/06/08 23:26:27 tom Exp @
++  * @Id: keyok.3x,v 1.46 2024/06/15 19:49:39 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-keyok 3x 2024-06-08 ncurses 6.5 Library calls
++keyok 3x 2024-06-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                        keyok 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                        
++
                                                                                                        keyok 3x 2024-06-15 ncurses 6.5 Library calls
                                                                                                        
+ 
                                                                                                        + keyok(3x)                        Library calls                       keyok(3x)
+ 
+@@ -93,11 +93,11 @@
+ 
+ 
+ 
                                                                                                        SEE ALSO
                                                                                                        +-       curses(3x), define_key(3x), keybound(3x), keyok(3x), key_defined(3x).
++       curses(3x), define_key(3x), keybound(3x), keyok(3x), key_defined(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                         keyok(3x)
++ncurses 6.5                       2024-06-15                         keyok(3x)
+ 
                                                                                                        
+ 
                                                                                                        
+ 
                                                                                                          
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.5-20240608+/doc/html/man/ncurses.3x.html	2024-06-08 23:12:51.000000000 +0000
++++ ncurses-6.5-20240615/doc/html/man/ncurses.3x.html	2024-06-15 20:39:31.000000000 +0000
+@@ -61,7 +61,7 @@
+        terminals  with  output  optimized to minimize screen updates.  ncurses
+        replaces the curses libraries from System V Release 4 Unix ("SVr4") and
+        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
+-       document describes ncurses version 6.5 (patch 20240608).
++       document describes ncurses version 6.5 (patch 20240615).
+ 
+        ncurses permits control of the terminal screen's contents;  abstraction
+        and  subdivision thereof with windows and pads; acquisition of keyboard
+Index: doc/html/man/term.5.html
+--- ncurses-6.5-20240608+/doc/html/man/term.5.html	2024-05-11 22:32:35.000000000 +0000
++++ ncurses-6.5-20240615/doc/html/man/term.5.html	2024-06-15 20:39:31.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: term.5,v 1.78 2024/05/11 20:39:53 tom Exp @
++  * @Id: term.5,v 1.80 2024/06/15 20:23:33 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-term 5 2024-05-11 ncurses 6.5 File formats
++term 5 2024-06-15 ncurses 6.5 File formats
+ 
+ 
+ 
+ 
+-
                                                                                                          term 5 2024-05-11 ncurses 6.5 File formats
                                                                                                          
++
                                                                                                          term 5 2024-06-15 ncurses 6.5 File formats
                                                                                                          
+ 
                                                                                                          + term(5)                          File formats                          term(5)
+ 
+@@ -397,7 +397,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-11                           term(5)
++ncurses 6.5                       2024-06-15                           term(5)
+ 
                                                                                                          
+ 
                                                                                                          
+ 
                                                                                                            
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.5-20240608+/doc/html/man/terminfo.5.html	2024-06-08 23:35:45.000000000 +0000
++++ ncurses-6.5-20240615/doc/html/man/terminfo.5.html	2024-06-15 20:39:31.000000000 +0000
+@@ -71,7 +71,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This document describes ncurses version 6.5 (patch 20240608).
++       This document describes ncurses version 6.5 (patch 20240615).
+ 
+ 
+

                                                                                                  terminfo Entry Syntax

                                                                                                  +Index: man/curs_inopts.3x
+Prereq:  1.73 
+--- ncurses-6.5-20240608+/man/curs_inopts.3x	2024-06-08 23:24:17.000000000 +0000
++++ ncurses-6.5-20240615/man/curs_inopts.3x	2024-06-15 19:49:39.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inopts.3x,v 1.73 2024/06/08 23:24:17 tom Exp $
+-.TH curs_inopts 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inopts.3x,v 1.75 2024/06/15 19:49:39 tom Exp $
++.TH curs_inopts 3X 2024-06-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -811,4 +811,4 @@
+ \fB\%curs_util\fP(3X),
+ \fB\%define_key\fP(3X),
+ \fB\%termios\fP(3),
+-\fB\%term_variables\fP(3X).
++\fB\%term_variables\fP(3X)
+Index: man/curs_util.3x
+Prereq:  1.108 
+--- ncurses-6.5-20240608+/man/curs_util.3x	2024-06-08 22:38:18.000000000 +0000
++++ ncurses-6.5-20240615/man/curs_util.3x	2024-06-15 20:20:12.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_util.3x,v 1.108 2024/06/08 22:38:18 tom Exp $
+-.TH curs_util 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_util.3x,v 1.110 2024/06/15 20:20:12 tom Exp $
++.TH curs_util 3X 2024-06-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -485,6 +485,44 @@
+ (\fBcurs_sp_funcs\fP(3X)).
+ This feature of \fBuse_env\fP
+ is not provided by other implementations of curses.
++.SH HISTORY
++4BSD (1980)
++defined
++.I \%unctrl
++(as a macro,
++in
++.IR \%unctrl.h ")."
++.PP
++SVr2 (1984) introduced
++.IR \%delay_output ","
++.IR \%flushinp ","
++and
++.IR \%keyname "."
++.PP
++SVr3 (1987) added
++.IR \%filter "."
++Later that year,
++SVr3.1 brought
++.I \%getwin
++and
++.IR \%putwin ","
++reading and writing window dumps
++with \fI\%fread\fP(3) and \fI\%fwrite\fP(3),
++respectively.
++.PP
++SVr4 (1989) supplied
++.IR \%use_env "."
++.PP
++X/Open Curses Issue 4 (1995) specified
++.I \%key_name
++and
++.IR \%wunctrl "."
++.PP
++.I \%ncurses
++5.6 (2006) added
++.IR \%nofilter "," \" 20060107
++and 6.0 (2015)
++.IR \%use_tioctl "." \" 20120714
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_initscr\fP(3X),
+Index: man/keyok.3x
+Prereq:  1.44 
+--- ncurses-6.5-20240608+/man/keyok.3x	2024-06-08 23:26:27.000000000 +0000
++++ ncurses-6.5-20240615/man/keyok.3x	2024-06-15 19:49:39.000000000 +0000
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1997
+ .\"
+-.\" $Id: keyok.3x,v 1.44 2024/06/08 23:26:27 tom Exp $
+-.TH keyok 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: keyok.3x,v 1.46 2024/06/15 19:49:39 tom Exp $
++.TH keyok 3X 2024-06-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .
+ .de bP
+ .ie n  .IP \(bu 4
+@@ -108,4 +108,4 @@
+ \fB\%define_key\fP(3X),
+ \fB\%keybound\fP(3X),
+ \fB\%keyok\fP(3X),
+-\fB\%key_defined\fP(3X).
++\fB\%key_defined\fP(3X)
+Index: man/manhtml.externs
+Prereq:  1.26 
+--- ncurses-6.5-20240608+/man/manhtml.externs	2024-05-11 20:35:15.000000000 +0000
++++ ncurses-6.5-20240615/man/manhtml.externs	2024-06-15 20:24:43.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: manhtml.externs,v 1.26 2024/05/11 20:35:15 tom Exp $
++# $Id: manhtml.externs,v 1.27 2024/06/15 20:24:43 tom Exp $
+ # Items in this list will not be linked by man2html
+ #***************************************************************************
+ # Copyright 2019-2023,2024 Thomas E. Dickey                                *
+@@ -41,20 +41,22 @@
+ environ(7)
+ errno(3)
+ file(1)
++fread(3)
++fwrite(3)
+ getty(8)
++ioctl(2)
++isprint(3)
+ jove(1)
+ lynx(1)
+ mutt(1)
+ nvi(1)
+ od(1)
+-ioctl(2)
+-isprint(3)
+ printf(3)
+ profile(5)
+ putc(3)
+ putchar(3)
+-putwchar(3)
+ putwc(3)
++putwchar(3)
+ read(2)
+ readline(3)
+ resize(1)
+Index: man/term.5
+Prereq:  1.78 
+--- ncurses-6.5-20240608+/man/term.5	2024-05-11 20:39:53.000000000 +0000
++++ ncurses-6.5-20240615/man/term.5	2024-06-15 20:23:33.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: term.5,v 1.78 2024/05/11 20:39:53 tom Exp $
+-.TH term 5 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
++.\" $Id: term.5,v 1.80 2024/06/15 20:23:33 tom Exp $
++.TH term 5 2024-06-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -58,6 +58,7 @@
+ .SH NAME
+ term \-
+ compiled \fI\%term\%info\fP terminal description
++.\"SH SYNOPSIS
+ .SH DESCRIPTION
+ \fB\%@TIC@\fP(1) compiles a
+ .I \%term\%info
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20240608+/package/debian-mingw/changelog	2024-06-08 14:10:18.000000000 +0000
++++ ncurses-6.5-20240615/package/debian-mingw/changelog	2024-06-15 09:33:15.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240608) unstable; urgency=low
++ncurses6td (6.5+20240615) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 08 Jun 2024 05:49:40 -0400
++ -- Thomas E. Dickey   Sat, 15 Jun 2024 05:33:15 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20240608+/package/debian-mingw64/changelog	2024-06-08 14:13:09.000000000 +0000
++++ ncurses-6.5-20240615/package/debian-mingw64/changelog	2024-06-15 09:33:15.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240608) unstable; urgency=low
++ncurses6td (6.5+20240615) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 08 Jun 2024 05:49:40 -0400
++ -- Thomas E. Dickey   Sat, 15 Jun 2024 05:33:15 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20240608+/package/debian/changelog	2024-06-08 13:51:38.000000000 +0000
++++ ncurses-6.5-20240615/package/debian/changelog	2024-06-15 09:33:15.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240608) unstable; urgency=low
++ncurses6td (6.5+20240615) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 08 Jun 2024 05:49:40 -0400
++ -- Thomas E. Dickey   Sat, 15 Jun 2024 05:33:15 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.652 
+--- ncurses-6.5-20240608+/package/mingw-ncurses.nsi	2024-06-08 09:49:40.000000000 +0000
++++ ncurses-6.5-20240615/package/mingw-ncurses.nsi	2024-06-15 09:33:15.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.652 2024/06/08 09:49:40 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.653 2024/06/15 09:33:15 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "0608"
++!define VERSION_MMDD  "0615"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20240608+/package/mingw-ncurses.spec	2024-06-08 09:49:40.000000000 +0000
++++ ncurses-6.5-20240615/package/mingw-ncurses.spec	2024-06-15 09:33:15.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20240608
++Release: 20240615
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20240608+/package/ncurses.spec	2024-06-08 09:49:40.000000000 +0000
++++ ncurses-6.5-20240615/package/ncurses.spec	2024-06-15 09:33:15.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20240608
++Release: 20240615
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20240608+/package/ncursest.spec	2024-06-08 09:49:40.000000000 +0000
++++ ncurses-6.5-20240615/package/ncursest.spec	2024-06-15 09:33:15.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20240608
++Release: 20240615
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/modules
+Prereq:  1.25 
+--- ncurses-6.5-20240608+/progs/modules	2021-04-18 17:21:03.000000000 +0000
++++ ncurses-6.5-20240615/progs/modules	2024-06-15 23:34:33.000000000 +0000
+@@ -1,7 +1,7 @@
+-# $Id: modules,v 1.25 2021/04/18 17:21:03 tom Exp $
++# $Id: modules,v 1.29 2024/06/15 23:34:33 tom Exp $
+ # Program modules (some are in ncurses lib!)
+ ##############################################################################
+-# Copyright 2020,2021 Thomas E. Dickey                                       #
++# Copyright 2020-2021,2024 Thomas E. Dickey                                  #
+ # Copyright 1998-2014,2016 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -33,18 +33,18 @@
+ #
+ 
+ @ base
+-clear		progs		$(srcdir)	$(HEADER_DEPS) tty_settings.h
+-tic		progs		$(srcdir)	$(HEADER_DEPS) transform.h $(srcdir)/dump_entry.h $(srcdir)/tparm_type.h
+-toe		progs		$(srcdir)	$(HEADER_DEPS)             $(INCDIR)/hashed_db.h
+-clear_cmd	progs		$(srcdir)	$(HEADER_DEPS) clear_cmd.h
+-dump_entry	progs		$(srcdir)	$(HEADER_DEPS)             $(srcdir)/dump_entry.h ../include/parametrized.h $(INCDIR)/capdefaults.c termsort.h
+-infocmp		progs		$(srcdir)	$(HEADER_DEPS)             $(srcdir)/dump_entry.h
+-reset_cmd	progs		$(srcdir)	$(HEADER_DEPS) reset_cmd.h tty_settings.h
+-tabs		progs		$(srcdir)	$(HEADER_DEPS)
+-tparm_type	progs		$(srcdir)	$(HEADER_DEPS)             $(srcdir)/tparm_type.h
+-tput		progs		$(srcdir)	$(HEADER_DEPS) transform.h $(srcdir)/tparm_type.h reset_cmd.h tty_settings.h
+-tset		progs		$(srcdir)	$(HEADER_DEPS) transform.h ../include/termcap.h reset_cmd.h  tty_settings.h
++clear		progs		$(srcdir)	$(HEADER_DEPS) $(srcdir)/clear_cmd.h $(srcdir)/tty_settings.h
++tic		progs		$(srcdir)	$(HEADER_DEPS) $(INCDIR)/hashed_db.h $(srcdir)/dump_entry.h $(srcdir)/tparm_type.h ../include/parametrized.h transform.h
++toe		progs		$(srcdir)	$(HEADER_DEPS) $(INCDIR)/hashed_db.h
++clear_cmd	progs		$(srcdir)	$(HEADER_DEPS) $(srcdir)/clear_cmd.h
++dump_entry	progs		$(srcdir)	$(HEADER_DEPS) $(srcdir)/dump_entry.h ../include/capdefaults.c ../include/parametrized.h termsort.h
++infocmp		progs		$(srcdir)	$(HEADER_DEPS) $(srcdir)/dump_entry.h
++reset_cmd	progs		$(srcdir)	$(HEADER_DEPS) $(srcdir)/reset_cmd.h $(srcdir)/tty_settings.h
++tabs		progs		$(srcdir)	$(HEADER_DEPS) $(srcdir)/tty_settings.h
++tparm_type	progs		$(srcdir)	$(HEADER_DEPS) $(srcdir)/tparm_type.h
++tput		progs		$(srcdir)	$(HEADER_DEPS) $(srcdir)/clear_cmd.h $(srcdir)/reset_cmd.h $(srcdir)/tparm_type.h $(srcdir)/tty_settings.h transform.h
++tset		progs		$(srcdir)	$(HEADER_DEPS) ../include/termcap.h $(srcdir)/reset_cmd.h $(srcdir)/tty_settings.h transform.h 
+ transform	progs		$(srcdir)	$(HEADER_DEPS) transform.h
+-tty_settings	progs		$(srcdir)	$(HEADER_DEPS) tty_settings.h
++tty_settings	progs		$(srcdir)	$(HEADER_DEPS) $(srcdir)/tty_settings.h
+ 
+ # vile:makemode
+Index: test/bs.6
+Prereq:  1.5 
+--- ncurses-6.5-20240608+/test/bs.6	2021-06-17 21:20:30.000000000 +0000
++++ ncurses-6.5-20240615/test/bs.6	2024-06-15 20:32:28.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2020,2021 Thomas E. Dickey                                     *
++.\" Copyright 2020-2021,2024 Thomas E. Dickey                                *
+ .\" Copyright 1998,2006 Free Software Foundation, Inc.                       *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,46 +27,69 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: bs.6,v 1.5 2021/06/17 21:20:30 tom Exp $
+-.TH BATTLESHIPS 6 2021-06-17 ncurses-examples Games
++.\" $Id: bs.6,v 1.8 2024/06/15 20:32:28 tom Exp $
++.TH BATTLESHIPS 6 2024-06-15 ncurses-examples Games
++.ie \n(.g \{\
++.ds `` \(lq
++.ds '' \(rq
++.\}
++.el \{\
++.ie t .ds `` ``
++.el   .ds `` ""
++.ie t .ds '' ''
++.el   .ds '' ""
++.\}
+ .SH NAME
+-bs \- battleships game
++bs \-
++battleships game
+ .SH SYNOPSIS
+-battle [ -b | -s ] [ -c ]
++battle [ \-b | \-s ] [ \-c ]
+ .SH DESCRIPTION
+ This program allows you to play the familiar Battleships game against the
+-computer on a 10x10 board. The interface is visual and largely
+-self-explanatory; you place your ships and pick your shots by moving the
+-cursor around the `sea' with the rogue/hack motion keys hjklyubn.
++computer on a 10x10 board.
++The interface is visual and largely self-explanatory;
++you place your ships and pick your shots by moving the
++cursor around the \*(``sea\*('' with the rogue/hack motion keys hjklyubn.
+ .PP
+-Note that when selecting a ship to place, you must type the capital letter
+-(these are, after all, capital ships). During ship placement, the `r' command
++Note that when selecting a ship to place,
++you must type the capital letter
++(these are, after all, capital ships).
++During ship placement,
++the \*(``r\*('' command
+ may be used to ignore the current position and randomly place your currently
+-selected ship. The `R' command will place all remaining ships randomly. The ^L
+-command (form feed, ASCII 12) will force a screen redraw).
++selected ship.
++The \*(``R\*('' command will place all remaining ships randomly.
++The ^L command (form feed,
++ASCII 12) will force a screen redraw).
+ .PP
+ The command-line arguments control game modes.
+ 
+ .nf
+-	-b selects a `blitz' variant
+-	-s selects a `salvo' variant
+-	-c permits ships to be placed adjacently
++	\-b selects a \*(``blitz\*('' variant
++	\-s selects a \*(``salvo\*('' variant
++	\-c permits ships to be placed adjacently
+ .fi
+ 
+-The `blitz' variant allows a side to shoot for as long as it continues to
+-score hits.
++The \*(``blitz\*('' variant allows a side to shoot
++for as long as it continues to score hits.
+ .PP
+-The `salvo' game allows a player one shot per turn for each of his/her ships
+-still afloat.  This puts a premium scoring hits early and knocking out some
++The \*(``salvo\*('' game allows a player one shot per turn
++for each of his/her ships still afloat.
++This puts a premium scoring hits early and knocking out some
+ ships and also makes much harder the situation where you face a superior force
+ with only your PT-boat.
+ .PP
+-Normally, ships must be separated by at least one square of open water. The
+--c option disables this check and allows them to close-pack.
++Normally, ships must be separated by at least one square of open water.
++The \-c option disables this check and allows them to close-pack.
+ .PP
+-The algorithm the computer uses once it has found a ship to sink is provably
+-optimal. The dispersion criterion for the random-fire algorithm may not be.
++The algorithm the computer uses
++once it has found a ship to sink is provably optimal.
++The dispersion criterion for the random-fire algorithm may not be.
+ .SH AUTHORS
+-Originally written by one Bruce Holloway in 1986. Salvo mode added by Chuck A.
+-DeGaul (cbosgd!cad). Visual user interface, `closepack' option, code rewrite
+-and manual page by Eric S. Raymond  August 1989.
++Originally written by Bruce Holloway in 1986.
++Salvo mode added by Chuck A. DeGaul (cbosgd!cad).
++Visual user interface,
++\*(``closepack\*('' option,
++code rewrite,
++and manual page by Eric S. Raymond
++ August 1989.
+Index: test/gdc.6
+Prereq:  1.6 
+--- ncurses-6.5-20240608+/test/gdc.6	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20240615/test/gdc.6	2024-06-15 15:16:34.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2020 Thomas E. Dickey                                          *
++.\" Copyright 2020,2024 Thomas E. Dickey                                     *
+ .\" Copyright 1998-2006,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,42 +27,56 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: gdc.6,v 1.6 2020/02/02 23:34:34 tom Exp $
+-.TH GDC 6 2020-02-02 ncurses-examples Games
++.\" $Id: gdc.6,v 1.9 2024/06/15 15:16:34 tom Exp $
++.TH GDC 6 2024-06-15 ncurses-examples Games
++.ie \n(.g \{\
++.ds `` \(lq
++.ds '' \(rq
++.\}
++.el \{\
++.ie t .ds `` ``
++.el   .ds `` ""
++.ie t .ds '' ''
++.el   .ds '' ""
++.\}
+ .SH NAME
+-gdc \- grand digital clock (curses)
++gdc \-
++grand digital clock (curses)
+ .SH SYNOPSIS
+ .B gdc \fP[\fIoptions\fP] [\fIn\fP]
+ .SH DESCRIPTION
+ .I Gdc
+ runs a digital clock made of reverse-video blanks on a terminal screen.
+-If the terminal supports color, the clock is drawn in red.
+-You can make the clock stop, pause or resume by pressing a ``q'',
+-``s'' or space, respectively.
++If the terminal supports color,
++the clock is drawn in red.
++You can make the clock stop, pause, or resume by pressing a \*(``q\*('',
++\*(``s\*('' or space, respectively.
+ .SH OPTIONS
+ .TP
+ .B \-d
+ use terminal's default colors for the background.
+ .TP
+ .B \-n
+-redirects input to /dev/null, making it ignore the stop/pause commands.
++redirects input to /dev/null,
++making it ignore the stop/pause commands.
+ You can still stop it by pressing the interrupt key.
+ .TP
+ .B \-s
+ makes digits scroll as they change.
+-When running on a fast display, the program breaks up the scrolling into
+-subsecond repaints, making the operation appear smooth.
++When running on a fast display,
++the program breaks up the scrolling into subsecond repaints,
++making the operation appear smooth.
+ .TP
+ .B \-t \fIhh:mm:ss\fP
+-specify starting time (default is ``now'').
++specify starting time (default is \*(``now\*('').
+ .PP
+ With an optional numeric argument
+ .I num
+ it stops after
+ .I num
+ seconds.
+-Normally it runs "forever" (counting down from 2 billion seconds).
+-.SH AUTHOR
++Normally it runs \*(``forever\*('' (counting down from 2 billion seconds).
++.SH AUTHORS
+ Amos Shapir, modified for curses by John Lupien.
+ .br
+ Improvements for ncurses by Thomas Dickey.
+Index: test/modules
+Prereq:  1.79 
+--- ncurses-6.5-20240608+/test/modules	2023-11-10 11:48:20.000000000 +0000
++++ ncurses-6.5-20240615/test/modules	2024-06-15 19:00:13.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: modules,v 1.79 2023/11/10 11:48:20 tom Exp $
++# $Id: modules,v 1.80 2024/06/15 19:00:13 tom Exp $
+ ##############################################################################
+-# Copyright 2018-2022,2023 Thomas E. Dickey                                  #
++# Copyright 2018-2023,2024 Thomas E. Dickey                                  #
+ # Copyright 1998-2016,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -33,8 +33,8 @@
+ # Test-Program modules
+ 
+ @ base
+-back_ground	progs		$(srcdir)	$(HEADER_DEPS)
+-background	progs		$(srcdir)	$(HEADER_DEPS)
++back_ground	progs		$(srcdir)	$(HEADER_DEPS) $(srcdir)/color_name.h $(srcdir)/dump_window.h 
++background	progs		$(srcdir)	$(HEADER_DEPS) $(srcdir)/color_name.h $(srcdir)/dump_window.h 
+ blue		progs		$(srcdir)	$(HEADER_DEPS)
+ bs		progs		$(srcdir)	$(HEADER_DEPS)
+ cardfile	progs		$(srcdir)	$(HEADER_DEPS)	$(incdir)/panel.h $(incdir)/form.h
+@@ -42,7 +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)
++combine		progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/dump_window.h $(srcdir)/popup_msg.h
+ demo_altkeys	progs		$(srcdir)	$(HEADER_DEPS)
+ demo_defkey	progs		$(srcdir)	$(HEADER_DEPS)
+ demo_forms	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/edit_field.h
+@@ -51,8 +51,8 @@
+ demo_new_pair	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/popup_msg.h
+ demo_panels	progs		$(srcdir)	$(HEADER_DEPS)	$(incdir)/panel.h
+ demo_tabs	progs		$(srcdir)	$(HEADER_DEPS)
+-demo_termcap	progs		$(srcdir)	$(HEADER_DEPS)
+-demo_terminfo	progs		$(srcdir)	$(HEADER_DEPS)
++demo_termcap	progs		$(srcdir)	$(HEADER_DEPS)	$(incdir)/term_entry.h	$(incdir)/termcap.h
++demo_terminfo	progs		$(srcdir)	$(HEADER_DEPS)	$(incdir)/term_entry.h
+ ditto		progs		$(srcdir)	$(HEADER_DEPS)
+ dots		progs		$(srcdir)	$(HEADER_DEPS)
+ dots_curses	progs		$(srcdir)	$(HEADER_DEPS)
+@@ -60,7 +60,7 @@
+ dots_termcap	progs		$(srcdir)	$(HEADER_DEPS)
+ dots_xcurses	progs		$(srcdir)	$(HEADER_DEPS)
+ dump_window	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/dump_window.h
+-dup_field	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/edit_field.h
++dup_field	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/edit_field.h	$(srcdir)/popup_msg.h
+ echochar	progs		$(srcdir)	$(HEADER_DEPS)
+ edit_field	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/edit_field.h	$(srcdir)/popup_msg.h
+ extended_color	progs		$(srcdir)	$(HEADER_DEPS)
+@@ -68,7 +68,7 @@
+ firework	progs		$(srcdir)	$(HEADER_DEPS)
+ firstlast	progs		$(srcdir)	$(HEADER_DEPS)
+ foldkeys	progs		$(srcdir)	$(HEADER_DEPS)
+-form_driver_w	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/popup_msg.h
++form_driver_w	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/popup_msg.h	$(incdir)/form.h
+ gdc		progs		$(srcdir)	$(HEADER_DEPS)
+ hanoi		progs		$(srcdir)	$(HEADER_DEPS)
+ hashtest	progs		$(srcdir)	$(HEADER_DEPS)
+@@ -80,15 +80,15 @@
+ key_names	progs		$(srcdir)	$(HEADER_DEPS)
+ keynames	progs		$(srcdir)	$(HEADER_DEPS)
+ knight		progs		$(srcdir)	$(HEADER_DEPS)
+-list_keys	progs		$(srcdir)	$(HEADER_DEPS)
++list_keys	progs		$(srcdir)	$(HEADER_DEPS)	$(incdir)/term_entry.h
+ lrtest		progs		$(srcdir)	$(HEADER_DEPS)
+-move_field	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/edit_field.h
++move_field	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/edit_field.h	$(srcdir)/popup_msg.h
+ movewindow	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/popup_msg.h
+ ncurses		progs		$(srcdir)	$(HEADER_DEPS)	$(incdir)/panel.h $(incdir)/menu.h $(incdir)/form.h
+ newdemo		progs		$(srcdir)	$(HEADER_DEPS)
+ padview		progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/widechars.h	$(srcdir)/popup_msg.h
+ pair_content	progs		$(srcdir)	$(HEADER_DEPS)
+-picsmap		progs		$(srcdir)	$(HEADER_DEPS)
++picsmap		progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/picsmap.h
+ popup_msg	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/popup_msg.h
+ railroad	progs		$(srcdir)	$(HEADER_DEPS)
+ rain		progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/popup_msg.h
+@@ -103,8 +103,8 @@
+ test_arrays	progs		$(srcdir)	$(HEADER_DEPS)
+ test_delwin	progs		$(srcdir)	$(HEADER_DEPS)
+ test_endwin	progs		$(srcdir)	$(HEADER_DEPS)
+-test_get_wstr	progs		$(srcdir)	$(HEADER_DEPS)
+-test_getstr	progs		$(srcdir)	$(HEADER_DEPS)
++test_get_wstr	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/popup_msg.h
++test_getstr	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/popup_msg.h
+ test_instr	progs		$(srcdir)	$(HEADER_DEPS)
+ test_inwstr	progs		$(srcdir)	$(HEADER_DEPS)
+ test_mouse	progs		$(srcdir)	$(HEADER_DEPS)
+@@ -112,7 +112,7 @@
+ test_setupterm	progs		$(srcdir)	$(HEADER_DEPS)
+ test_sgr	progs		$(srcdir)	$(HEADER_DEPS)
+ test_termattrs	progs		$(srcdir)	$(HEADER_DEPS)
+-test_tparm	progs		$(srcdir)	$(HEADER_DEPS)
++test_tparm	progs		$(srcdir)	$(HEADER_DEPS)	$(incdir)/term_entry.h
+ test_unget_wch	progs		$(srcdir)	$(HEADER_DEPS)
+ test_vid_puts	progs		$(srcdir)	$(HEADER_DEPS)
+ test_vidputs	progs		$(srcdir)	$(HEADER_DEPS)
diff --git a/packages/ncurses/6.5/ncurses-6.5-20240622.patch b/packages/ncurses/6.5/ncurses-6.5-20240622.patch
new file mode 100644
index 0000000000..7afc9a7381
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20240622.patch
@@ -0,0 +1,3791 @@
+# ncurses 6.5 - patch 20240622 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20240622.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sat Jun 22 23:49:00 UTC 2024
+# ------------------------------------------------------------------------------
+# NEWS                                 |   12 
+# VERSION                              |    2 
+# aclocal.m4                           |    8 
+# announce.html.in                     |   10 
+# configure                            |    4 
+# dist.mk                              |    4 
+# doc/html/man/curs_add_wchstr.3x.html |   18 
+# doc/html/man/curs_addch.3x.html      |   99 ++---
+# doc/html/man/curs_addstr.3x.html     |   17 
+# doc/html/man/curs_beep.3x.html       |   10 
+# doc/html/man/curs_get_wstr.3x.html   |   26 -
+# doc/html/man/curs_getstr.3x.html     |  303 ++++++++--------
+# doc/html/man/curs_kernel.3x.html     |   67 +--
+# doc/html/man/curs_pad.3x.html        |   10 
+# doc/html/man/curs_slk.3x.html        |    8 
+# doc/html/man/curs_termcap.3x.html    |    8 
+# doc/html/man/curs_util.3x.html       |    8 
+# doc/html/man/curs_variables.3x.html  |    8 
+# doc/html/man/ncurses.3x.html         |  206 +++++------
+# doc/html/man/tabs.1.html             |   12 
+# doc/html/man/terminfo.5.html         |    2 
+# doc/html/man/tput.1.html             |   14 
+# man/curs_add_wchstr.3x               |   25 +
+# man/curs_addch.3x                    |   14 
+# man/curs_addstr.3x                   |   19 -
+# man/curs_beep.3x                     |    8 
+# man/curs_get_wstr.3x                 |   20 -
+# man/curs_getstr.3x                   |  608 +++++++++++++++++++++------------
+# man/curs_kernel.3x                   |   10 
+# man/curs_pad.3x                      |   56 ++-
+# man/curs_slk.3x                      |    8 
+# man/curs_termcap.3x                  |   14 
+# man/curs_util.3x                     |    8 
+# man/curs_variables.3x                |    6 
+# man/man_db.renames.in                |    4 
+# man/manhtml.aliases                  |    5 
+# man/manhtml.externs                  |    3 
+# man/ncurses.3x                       |   49 +-
+# man/tabs.1                           |    8 
+# man/terminfo.tail                    |    4 
+# man/tput.1                           |   13 
+# misc/gen-pkgconfig.in                |    6 
+# misc/ncurses-config.in               |  113 ++++--
+# package/debian-mingw/changelog       |    4 
+# package/debian-mingw/rules           |    1 
+# package/debian-mingw64/changelog     |    4 
+# package/debian-mingw64/rules         |    1 
+# package/debian/changelog             |    4 
+# package/mingw-ncurses.nsi            |    4 
+# package/mingw-ncurses.spec           |    2 
+# package/ncurses.spec                 |    2 
+# package/ncursest.spec                |    2 
+# test/gdc.6                           |   78 ++--
+# test/gdc.c                           |   37 +-
+# 54 files changed, 1209 insertions(+), 787 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4139 
+--- ncurses-6.5-20240615+/NEWS	2024-06-15 20:49:04.000000000 +0000
++++ ncurses-6.5-20240622/NEWS	2024-06-22 22:59:44.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4139 2024/06/15 20:49:04 tom Exp $
++-- $Id: NEWS,v 1.4143 2024/06/22 22:59:44 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.
+ 
++20240622
++	+ improve test/gdc.c (patch by Branden Robinson).
++	+ improve formatting/style of manpages (patches by Branden Robinson).
++	+ adjust naming of mingw *-config scripts to match the pkg-config names
++	+ widen pattern in pc/*-config scripts to disallow more linker options
++	+ add --cflags-only-I and --cflags-only-other options to
++	  misc/ncurses-config.in
++	+ revert change to CF_BUILD_CC macro (report by Vassili Courzakis,
++	  cf: 20240518).
++
+ 20240615
+ 	+ improve formatting/style of manpages (patches by Branden Robinson).
+ 	+ review/update modules files.
+Index: VERSION
+--- ncurses-6.5-20240615+/VERSION	2024-06-15 09:33:15.000000000 +0000
++++ ncurses-6.5-20240622/VERSION	2024-06-21 22:24:47.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20240615
++5:0:10	6.5	20240622
+Index: aclocal.m4
+Prereq:  1.1071 
+--- ncurses-6.5-20240615+/aclocal.m4	2024-05-18 19:49:14.000000000 +0000
++++ ncurses-6.5-20240622/aclocal.m4	2024-06-22 19:57:54.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1071 2024/05/18 19:49:14 tom Exp $
++dnl $Id: aclocal.m4,v 1.1073 2024/06/22 19:57:54 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -741,7 +741,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_BUILD_CC version: 12 updated: 2024/03/17 09:17:26
++dnl CF_BUILD_CC version: 13 updated: 2024/06/22 13:42:22
+ dnl -----------
+ dnl If we're cross-compiling, allow the user to override the tools and their
+ dnl options.  The configure script is oriented toward identifying the host
+@@ -841,9 +841,9 @@
+ 	: ${BUILD_CC:='${CC}'}
+ 	: ${BUILD_CPP:='${CPP}'}
+ 	: ${BUILD_CFLAGS:='${CFLAGS}'}
+-	: ${BUILD_CPPFLAGS:='ifelse([$1],,'${CPPFLAGS}',[$1])'}
++	: ${BUILD_CPPFLAGS:='${CPPFLAGS}'}
+ 	: ${BUILD_LDFLAGS:='${LDFLAGS}'}
+-	: ${BUILD_LIBS:='ifelse([$2],,'${LIBS}',[$2])'}
++	: ${BUILD_LIBS:='${LIBS}'}
+ 	: ${BUILD_EXEEXT:='$x'}
+ 	: ${BUILD_OBJEXT:='o'}
+ fi
+Index: announce.html.in
+Prereq:  1.107 
+--- ncurses-6.5-20240615+/announce.html.in	2024-04-27 16:45:27.000000000 +0000
++++ ncurses-6.5-20240622/announce.html.in	2024-06-22 22:17:40.000000000 +0000
+@@ -1,5 +1,5 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_add_wchstr 3x 2024-05-11 ncurses 6.5 Library calls
++curs_add_wchstr 3x 2024-06-22 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                  curs_add_wchstr 3x 2024-05-11 ncurses 6.5 Library calls
                                                                                                  
++
                                                                                                  curs_add_wchstr 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                  
+ 
                                                                                                  + curs_add_wchstr(3x)              Library calls             curs_add_wchstr(3x)
+ 
+@@ -113,6 +113,15 @@
+        X/Open Curses, Issue 4 describes these functions.
+ 
+ 
++
                                                                                                  HISTORY
                                                                                                  ++       These functions were initially specified by  X/Open  Curses,  Issue  4.
++       The   System V   Interface  Definition,  Version  4  (1995),  specified
++       functions named waddwchstr and waddwchnstr (and  the  usual  variants).
++       These  were  later additions to SVr4.x, not appearing in the first SVr4
++       (1989).  They differed from X/Open's wadd_wchstr  and  wadd_wchnstr  in
++       that they each took an argument of type wchar_t instead of cchar_t.
++
++
+ 
                                                                                                  SEE ALSO
                                                                                                  +        curs_addchstr(3x) describes comparable functions of the ncurses library
+        in its non-wide-character configuration.
+@@ -121,7 +130,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-11               curs_add_wchstr(3x)
++ncurses 6.5                       2024-06-22               curs_add_wchstr(3x)
+ 
                                                                                                  
+ 
                                                                                                  
+ 
+ 
                                                                                                  
+Index: doc/html/man/curs_addch.3x.html
+--- ncurses-6.5-20240615+/doc/html/man/curs_addch.3x.html	2024-06-08 23:12:48.000000000 +0000
++++ ncurses-6.5-20240622/doc/html/man/curs_addch.3x.html	2024-06-22 22:55:07.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addch.3x,v 1.92 2024/06/08 20:51:41 tom Exp @
++  * @Id: curs_addch.3x,v 1.94 2024/06/22 21:34:49 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addch 3x 2024-06-08 ncurses 6.5 Library calls
++curs_addch 3x 2024-06-22 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                  curs_addch 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                  
++
                                                                                                  curs_addch 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                  
+ 
                                                                                                  + curs_addch(3x)                   Library calls                  curs_addch(3x)
+ 
+@@ -206,90 +206,93 @@
+ 
+ 
+ 
                                                                                                  PORTABILITY
                                                                                                  +-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
++       Applications employing ncurses extensions should condition their use on
++       the visibility of the NCURSES_VERSION preprocessor macro.
++
++       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+        error conditions for them.
+ 
+-       SVr4 curses describes a successful return value  only  as  "an  integer
++       SVr4  curses  describes  a  successful return value only as "an integer
+        value other than ERR".
+ 
+-       The  defaults specified for forms-drawing characters apply in the POSIX
++       The defaults specified for forms-drawing characters apply in the  POSIX
+        locale.
+ 
+ 
+ 
                                                                                                  ACS Symbols
                                                                                                  +-       X/Open Curses states that the  ACS_  definitions  are  char  constants.
++       X/Open  Curses  states  that  the  ACS_ definitions are char constants.
+        Some implementations are problematic.
+ 
+-       o   Solaris  curses, for example, defines the ACS symbols as constants;
++       o   Solaris curses, for example, defines the ACS symbols as  constants;
+            others define them as elements of an array.
+ 
+-           This implementation uses an array, acs_map,  as  did  SVr4  curses.
++           This  implementation  uses  an  array, acs_map, as did SVr4 curses.
+            NetBSD also uses an array, actually named _acs_char, with a #define
+            for compatibility.
+ 
+-       o   HP-UX curses equates some of the  ACS_  symbols  to  the  analogous
+-           WACS_  symbols  as  if  the  ACS_ symbols were wide characters (see
+-           curs_add_wch(3x)).  The  misdefined  symbols  are  the  arrows  and
++       o   HP-UX  curses  equates  some  of  the ACS_ symbols to the analogous
++           WACS_ symbols as if the ACS_  symbols  were  wide  characters  (see
++           curs_add_wch(3x)).   The  misdefined  symbols  are  the  arrows and
+            others that are not used for line drawing.
+ 
+-       o   X/Open  Curses  (Issues  2 through 7) has a typographical error for
+-           the ACS_LANTERN symbol, equating  its  "VT100+  Character"  to  "I"
+-           (capital  I),  while  the  header  files  for SVr4 curses and other
++       o   X/Open Curses (Issues 2 through 7) has a  typographical  error  for
++           the  ACS_LANTERN  symbol,  equating  its  "VT100+ Character" to "I"
++           (capital I), while the header  files  for  SVr4  curses  and  other
+            implementations use "i" (small i).
+ 
+-           None of the terminal descriptions on Unix platforms  use  uppercase
+-           I,  except  for  Solaris  (in  its  terminfo  entry  for screen(1),
+-           apparently based on the X/Open documentation around 1995).  On  the
+-           other  hand,  its gs6300 (AT&T PC6300 with EMOTS Terminal Emulator)
++           None  of  the terminal descriptions on Unix platforms use uppercase
++           I, except  for  Solaris  (in  its  terminfo  entry  for  screen(1),
++           apparently  based on the X/Open documentation around 1995).  On the
++           other hand, its gs6300 (AT&T PC6300 with EMOTS  Terminal  Emulator)
+            description uses lowercase i.
+ 
+-       Some ACS  symbols  (ACS_S3,  ACS_S7,  ACS_LEQUAL,  ACS_GEQUAL,  ACS_PI,
+-       ACS_NEQUAL,  and  ACS_STERLING)  were  not  documented  in any publicly
+-       released System V.  However, many publicly available  terminfo  entries
+-       include  acsc  capabilities in which their key characters (pryz{|}) are
+-       embedded, and a second-hand list of their  character  descriptions  has
+-       come  to light.  The ncurses developers invented ACS-prefixed names for
++       Some  ACS  symbols  (ACS_S3,  ACS_S7,  ACS_LEQUAL,  ACS_GEQUAL, ACS_PI,
++       ACS_NEQUAL, and ACS_STERLING)  were  not  documented  in  any  publicly
++       released  System V.   However, many publicly available terminfo entries
++       include acsc capabilities in which their key characters  (pryz{|})  are
++       embedded,  and  a  second-hand list of their character descriptions has
++       come to light.  The ncurses developers invented ACS-prefixed names  for
+        them.
+ 
+        The displayed values of ACS_ constants depend on
+ 
+        o   the  ncurses  ABI--for  example,  wide-character  versus  non-wide-
+-           character  configurations  (the  former  is  capable  of displaying
++           character configurations  (the  former  is  capable  of  displaying
+            Unicode while the latter is not), and
+ 
+        o   whether the locale uses UTF-8 encoding.
+ 
+-       In certain cases, the  terminal  is  unable  to  display  forms-drawing
+-       characters   except   by   using  UTF-8;  see  the  discussion  of  the
++       In  certain  cases,  the  terminal  is  unable to display forms-drawing
++       characters  except  by  using  UTF-8;  see  the   discussion   of   the
+        NCURSES_NO_UTF8_ACS environment variable in ncurses(3x).
+ 
+ 
+ 
                                                                                                  Character Set
                                                                                                  +-       X/Open Curses assumes that the parameter passed to  waddch  contains  a
+-       single  character.   That  character may have been more than eight bits
+-       wide in an SVr3 or SVr4 implementation, but X/Open  Curses  leaves  the
+-       width  of  a non-wide character code unspecified.  The standard further
+-       does not specify the internal structure of a chtype, though the use  of
+-       bit  operations  to  combine  the  character code with attributes and a
++       X/Open  Curses  assumes  that the parameter passed to waddch contains a
++       single character.  That character may have been more  than  eight  bits
++       wide  in  an  SVr3 or SVr4 implementation, but X/Open Curses leaves the
++       width of a non-wide character code unspecified.  The  standard  further
++       does  not specify the internal structure of a chtype, though the use of
++       bit operations to combine the character  code  with  attributes  and  a
+        color pair identifier into a chtype for passage to waddch is common.  A
+        portable application uses only the macros discussed in curs_attr(3x) to
+        manipulate a chtype.
+ 
+        In ncurses, chtype holds an eight-bit character, but the library allows
+-       a  multibyte  character sequence to be passed via a succession of calls
+-       to waddch.  Other implementations  do  not;  a  waddch  call  transmits
+-       exactly  one  character,  which  may  be rendered in one or more screen
+-       locations depending  on  whether  it  is  printable  (see  unctrl(3x)).
+-       Depending  on  the  locale,  ncurses  inspects  the byte passed in each
+-       waddch call and checks whether the latest call  continues  a  multibyte
+-       character.    When  a  character  is  complete,  ncurses  displays  the
+-       character  and  advances  the  cursor.   If  the  calling   application
++       a multibyte character sequence to be passed via a succession  of  calls
++       to  waddch.   Other  implementations  do  not;  a waddch call transmits
++       exactly one character, which may be rendered  in  one  or  more  screen
++       locations  depending  on  whether  it  is  printable  (see unctrl(3x)).
++       Depending on the locale, ncurses  inspects  the  byte  passed  in  each
++       waddch  call  and  checks whether the latest call continues a multibyte
++       character.   When  a  character  is  complete,  ncurses  displays   the
++       character   and  advances  the  cursor.   If  the  calling  application
+        interrupts the succession of bytes in a multibyte character sequence by
+-       changing the current  location--for  example,  with  wmove(3x)--ncurses
++       changing  the  current  location--for  example, with wmove(3x)--ncurses
+        discards the incomplete character.
+ 
+        For  portability  to  other  implementations,  do  not  rely  upon  the
+-       foregoing behavior.  Check whether a character can be represented as  a
++       foregoing  behavior.  Check whether a character can be represented as a
+        single byte in the current locale.
+ 
+        o   If it can, call either waddch or wadd_wch(3x).
+@@ -298,22 +301,22 @@
+ 
+ 
+ 
                                                                                                  HISTORY
                                                                                                  +-       The original curses in 4BSD (1980) introduced waddch.
++       4BSD (1980) curses introduced waddch.
+ 
+        SVr3 (1987) added wechochar.
+ 
+ 
+ 
                                                                                                  SEE ALSO
                                                                                                  +-       curs_add_wch(3x)  describes comparable functions of the ncurses library
++       curs_add_wch(3x) describes comparable functions of the ncurses  library
+        in its wide-character configuration (ncursesw).
+ 
+        curses(3x),    curs_addchstr(3x),    curs_addstr(3x),    curs_attr(3x),
+-       curs_clear(3x),   curs_inch(3x),   curs_outopts(3x),  curs_refresh(3x),
++       curs_clear(3x),  curs_inch(3x),   curs_outopts(3x),   curs_refresh(3x),
+        curs_variables(3x), putchar(3)
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                    curs_addch(3x)
++ncurses 6.5                       2024-06-22                    curs_addch(3x)
+ 
                                                                                                  
+ 
                                                                                                  
+ 
                                                                                                    
+Index: doc/html/man/curs_addstr.3x.html
+--- ncurses-6.5-20240615+/doc/html/man/curs_addstr.3x.html	2024-06-01 23:07:15.000000000 +0000
++++ ncurses-6.5-20240622/doc/html/man/curs_addstr.3x.html	2024-06-22 22:55:07.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addstr.3x,v 1.49 2024/06/01 22:29:08 tom Exp @
++  * @Id: curs_addstr.3x,v 1.51 2024/06/22 21:26:53 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addstr 3x 2024-06-01 ncurses 6.5 Library calls
++curs_addstr 3x 2024-06-22 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                    curs_addstr 3x 2024-06-01 ncurses 6.5 Library calls
                                                                                                    
++
                                                                                                    curs_addstr 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                    
+ 
                                                                                                    + curs_addstr(3x)                  Library calls                 curs_addstr(3x)
+ 
+@@ -101,6 +101,14 @@
+        error conditions for them.
+ 
+ 
++
                                                                                                    HISTORY
                                                                                                    ++       4BSD (1980) curses introduced waddstr  along  with  its  variants,  the
++       latter defined as macros.
++
++       SVr3.1 (1987) added waddnstr (and its variants) redefining waddstr as a
++       macro wrapping it.
++
++
+ 
                                                                                                    SEE ALSO
                                                                                                    +        curs_addwstr(3x) describes comparable functions of the ncurses  library
+        in its wide-character configuration (ncursesw).
+@@ -109,7 +117,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-01                   curs_addstr(3x)
++ncurses 6.5                       2024-06-22                   curs_addstr(3x)
+ 
                                                                                                    
+ 
                                                                                                    
+ 
+ 
                                                                                                    
+Index: doc/html/man/curs_beep.3x.html
+--- ncurses-6.5-20240615+/doc/html/man/curs_beep.3x.html	2024-05-18 20:27:54.000000000 +0000
++++ ncurses-6.5-20240622/doc/html/man/curs_beep.3x.html	2024-06-22 22:55:07.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_beep.3x,v 1.31 2024/05/18 20:06:33 tom Exp @
++  * @Id: curs_beep.3x,v 1.33 2024/06/22 21:27:35 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_beep 3x 2024-05-18 ncurses 6.5 Library calls
++curs_beep 3x 2024-06-22 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                    curs_beep 3x 2024-05-18 ncurses 6.5 Library calls
                                                                                                    
++
                                                                                                    curs_beep 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                    
+ 
                                                                                                    + curs_beep(3x)                    Library calls                   curs_beep(3x)
+ 
+@@ -90,7 +90,7 @@
+ 
+ 
+ 
                                                                                                    HISTORY
                                                                                                    +-       beep and flash appeared in SVr2 (1984).
++       beep and flash appeared in SVr2 (1984).
+ 
+ 
+ 
                                                                                                    SEE ALSO
                                                                                                    +@@ -98,7 +98,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-18                     curs_beep(3x)
++ncurses 6.5                       2024-06-22                     curs_beep(3x)
+ 
                                                                                                    
+ 
                                                                                                    
+ 
                                                                                                      
+Index: doc/html/man/curs_get_wstr.3x.html
+--- ncurses-6.5-20240615+/doc/html/man/curs_get_wstr.3x.html	2024-06-08 23:12:48.000000000 +0000
++++ ncurses-6.5-20240622/doc/html/man/curs_get_wstr.3x.html	2024-06-22 22:55:07.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_get_wstr.3x,v 1.52 2024/06/08 21:01:53 tom Exp @
++  * @Id: curs_get_wstr.3x,v 1.54 2024/06/22 21:34:19 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_get_wstr 3x 2024-06-08 ncurses 6.5 Library calls
++curs_get_wstr 3x 2024-06-22 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                      curs_get_wstr 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                      
++
                                                                                                      curs_get_wstr 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                      
+ 
                                                                                                      + curs_get_wstr(3x)                Library calls               curs_get_wstr(3x)
+ 
+@@ -55,15 +55,15 @@
+ 
                                                                                                      SYNOPSIS
                                                                                                      +        #include <curses.h>
+ 
+-       int get_wstr(wint_t *wstr);
+-       int getn_wstr(wint_t *wstr, int n);
+-       int wget_wstr(WINDOW *win, wint_t *wstr);
+-       int wgetn_wstr(WINDOW *win, wint_t *wstr, int n);
+-
+-       int mvget_wstr(int y, int x, wint_t *wstr);
+-       int mvgetn_wstr(int y, int x, wint_t *wstr, int n);
+-       int mvwget_wstr(WINDOW *win, int y, int x, wint_t *wstr);
+-       int mvwgetn_wstr(WINDOW *win, int y, int x, wint_t *wstr, int n);
++       int get_wstr(wint_t * wstr);
++       int wget_wstr(WINDOW * win, wint_t * wstr);
++       int mvget_wstr(int y, int x, wint_t * wstr);
++       int mvwget_wstr(WINDOW * win, int y, int x, wint_t * wstr);
++
++       int getn_wstr(wint_t * wstr, int n);
++       int wgetn_wstr(WINDOW * win, wint_t * wstr, int n);
++       int mvgetn_wstr(int y, int x, wint_t * wstr, int n);
++       int mvwgetn_wstr(WINDOW * win, int y, int x, wint_t * wstr, int n);
+ 
+ 
+ 
                                                                                                      DESCRIPTION
                                                                                                      +@@ -189,7 +189,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                 curs_get_wstr(3x)
++ncurses 6.5                       2024-06-22                 curs_get_wstr(3x)
+ 
                                                                                                      
+ 
                                                                                                      
+ 
                                                                                                        
+Index: doc/html/man/curs_getstr.3x.html
+--- ncurses-6.5-20240615+/doc/html/man/curs_getstr.3x.html	2024-06-08 23:12:48.000000000 +0000
++++ ncurses-6.5-20240622/doc/html/man/curs_getstr.3x.html	2024-06-22 23:04:43.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_getstr.3x,v 1.65 2024/06/08 21:04:32 tom Exp @
++  * @Id: curs_getstr.3x,v 1.67 2024/06/22 22:20:56 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_getstr 3x 2024-06-08 ncurses 6.5 Library calls
++curs_getstr 3x 2024-06-22 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                        curs_getstr 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                        
++
                                                                                                        curs_getstr 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                        
+ 
                                                                                                        + curs_getstr(3x)                  Library calls                 curs_getstr(3x)
+ 
+@@ -54,192 +54,211 @@
+ 
                                                                                                        SYNOPSIS
                                                                                                        +        #include <curses.h>
+ 
+-       int getstr(char *str);
+-       int getnstr(char *str, int n);
+-       int wgetstr(WINDOW *win, char *str);
+-       int wgetnstr(WINDOW *win, char *str, int n);
+-
+-       int mvgetstr(int y, int x, char *str);
+-       int mvwgetstr(WINDOW *win, int y, int x, char *str);
+-       int mvgetnstr(int y, int x, char *str, int n);
+-       int mvwgetnstr(WINDOW *win, int y, int x, char *str, int n);
++       int getstr(char * str);
++       int wgetstr(WINDOW * win, char * str);
++       int mvgetstr(int y, int x, char * str);
++       int mvwgetstr(WINDOW * win, int y, int x, char * str);
++
++       int getnstr(char * str, int n);
++       int wgetnstr(WINDOW * win, char * str, int n);
++       int mvgetnstr(int y, int x, char * str, int n);
++       int mvwgetnstr(WINDOW * win, int y, int x, char * str, int n);
+ 
+ 
+ 
                                                                                                        DESCRIPTION
                                                                                                        +-       The function wgetnstr is equivalent to a series of calls to wgetch(3x),
+-       until a newline or carriage return terminates the series:
++       wgetstr populates a  user-supplied  string  buffer  str  by  repeatedly
++       calling  wgetch(3x) with the win argument until a line feed or carriage
++       return character is input.  The function
+ 
+-       o   The terminating character is not included in the returned string.
++       o   does not copy the terminating character to str;
+ 
+-       o   In all instances, the end of the string is terminated by a NUL.
++       o   always terminates str with a null character;
+ 
+-       o   The  function  stores  the result in the area pointed to by the str
+-           parameter.
++       o   interprets  the   screen's   erase   and   kill   characters   (see
++           erasechar(3x) and killchar(3x));
+ 
+-       o   The function reads at most n characters, thus preventing a possible
+-           overflow of the input buffer.
++       o   recognizes  function  keys  only  if  the screen's keypad option is
++           enabled (see keypad(3x));
+ 
+-           Any  attempt  to  enter more characters (other than the terminating
+-           newline or carriage return) causes a beep.
++       o   treats the function keys KEY_LEFT and KEY_BACKSPACE the same as the
++           erase character; and
+ 
+-           Function keys also cause a beep and are ignored.
++       o   discards  function key inputs other than those treated as the erase
++           character, calling beep(3x).
+ 
+-       The user's erase and kill characters are interpreted:
++       The erase character replaces the character at the  end  of  the  buffer
++       with  a  null character, while the kill character does the same for the
++       entire buffer.
+ 
+-       o   The erase character (e.g., ^H) erases the character at the  end  of
+-           the buffer, moving the cursor to the left.
++       If the screen's echo option is enabled (see echo(3x)), wgetstr  updates
++       win with wechochar(3x).  Further,
+ 
+-           If keypad mode is on for the window, KEY_LEFT and KEY_BACKSPACE are
+-           both considered equivalent to the user's erase character.
++       o   the  erase  character and its function key synonyms move the cursor
++           to the left, and
+ 
+-       o   The kill character (e.g., ^U) erases the entire buffer, leaving the
+-           cursor at the beginning of the buffer.
++       o   the kill character returns the cursor to where it was located  when
++           wgetstr was called.
+ 
+-       Characters  input  are  echoed  only  if echo is currently on.  In that
+-       case, backspace  is  echoed  as  deletion  of  the  previous  character
+-       (typically a left motion).
++       wgetnstr  is  similar,  but  reads  at  most  n  characters, aiding the
++       application to avoid overrunning the buffer to which  str  points.   An
++       attempt  to  input  more  than n characters (other than the terminating
++       line feed or carriage return) is ignored with a beep.
+ 
+-       The   getnstr,   mvgetnstr,  mvwgetnstr,  and  wgetnstr  functions  are
+-       identical to the getstr, mvgetstr, mvwgetstr,  and  wgetstr  functions,
+-       respectively,  except  that the *n* versions read at most n characters,
+-       letting the application prevent overflow of the input buffer.
++       ncurses(3x) describes the variants of these functions.
+ 
+ 
+ 
                                                                                                        RETURN VALUE
                                                                                                        +-       All  of  these  functions  return  the  integer  OK   upon   successful
+-       completion.  (SVr4 specifies only "an integer value other than ERR") If
+-       unsuccessful, they return ERR.
++       These functions return OK on success and ERR on failure.
+ 
+-       X/Open defines no error conditions.
++       In ncurses, they return ERR if
+ 
+-       In this implementation, these functions return ERR
++       o   win is NULL, or
+ 
+-       o   if the window pointer is null,
++       o   if an internal wgetch call fails.
+ 
+-       o   if its timeout expires without having any data, or
++       Further, in ncurses, these functions return KEY_RESIZE  if  a  SIGWINCH
++       event interrupts the function.
+ 
+-       o   if the associated call to wgetch failed.
+-
+-       This implementation provides an  extension  as  well.   If  a  SIGWINCH
+-       interrupts  the  function,  it will return KEY_RESIZE rather than OK or
+-       ERR.
+-
+-       Functions prefixed with "mv" first perform cursor movement and fail  if
++       Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                        NOTES
                                                                                                        +-       Any of these functions other than wgetnstr may be macros.
+-
+-       Using  getstr,  mvgetstr,  mvwgetstr,  or  wgetstr  to read a line that
+-       overflows the array pointed to by str causes  undefined  results.   The
+-       use  of  getnstr,  mvgetnstr, mvwgetnstr, or wgetnstr, respectively, is
+-       recommended.
+-
+-
+-
                                                                                                        PORTABILITY
                                                                                                        +-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+-       error conditions for them.
+-
+-       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,  etc.)  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).
+-
+-       The  functions  getnstr, mvgetnstr, and mvwgetnstr were present but not
+-       documented in SVr4.
+-
+-       X/Open Curses, Issue 5 (2007) stated that these functions "read at most
+-       n  bytes"  but did not state whether the terminating NUL counted toward
+-       that limit.  X/Open Curses, Issue 7 (2009) changed  that  to  say  they
+-       "read at most n-1 bytes" to allow for the terminating NUL.  As of 2018,
+-       some implementations count it, some do not:
++       All of these functions except wgetnstr may be implemented as macros.
+ 
+-       o   ncurses 6.1 and PDCurses do not count the NUL in the  given  limit,
+-           while
++       Use of getstr, mvgetstr, mvwgetstr,  or  wgetstr  to  read  input  that
++       overruns  the  buffer  pointed to by str causes undefined results.  Use
++       their n-infixed counterpart functions instead.
++
++       While wgetnstr is conceptually a series of calls  to  wgetch,  it  also
++       temporarily  changes  properties  of the curses screen to permit simple
++       editing of the input buffer.  It saves  the  screen's  state  and  then
++       calls  nl(3x)  and,  if  the  screen  was  in  normal  ("cooked") mode,
++       cbreak(3x).  Before returning, it  restores  the  saved  screen  state.
++       Other   implementations  differ  in  detail,  affecting  which  control
++       characters they can accept in the  buffer;  see  section  "PORTABILITY"
++       below.
+ 
+-       o   Solaris SVr4 and NetBSD curses count the NUL as part of the limit.
+ 
+-       o   Solaris   xcurses   provides  both:  its  wide-character  wget_nstr
+-           reserves  a  NUL,  but  its  wgetnstr  does  not  count   the   NUL
+-           consistently.
++
                                                                                                        EXTENSIONS
                                                                                                        ++       The return value KEY_RESIZE is an ncurses extension.
+ 
+-       In SVr4 curses, a negative value of n tells wgetnstr to assume that the
+-       caller's buffer is large enough to hold the result, i.e., to  act  like
+-       wgetstr.   X/Open  Curses does not mention this (or anything related to
+-       negative or zero values of n), however  most  implementations  use  the
+-       feature, with different limits:
+ 
+-       o   Solaris  SVr4  curses  and  PDCurses limit the result to 255 bytes.
+-           Other Unix systems than Solaris are likely to use the same limit.
+-
+-       o   Solaris xcurses limits the result to LINE_MAX bytes.
+-
+-       o   NetBSD 7 assumes no particular limit for the result  from  wgetstr.
+-           However,  it  limits  the wgetnstr parameter n to ensure that it is
+-           greater than zero.
+-
+-           A comment in NetBSD's source code states that this is specified  in
+-           SUSv2.
+-
+-       o   ncurses  (before  6.2)  assumes  no particular limit for the result
+-           from wgetstr, and treats the n  parameter  of  wgetnstr  like  SVr4
+-           curses.
+-
+-       o   ncurses  6.2  uses  LINE_MAX,  or a larger (system-dependent) value
+-           which the sysconf function may provide.   If  neither  LINE_MAX  or
+-           sysconf  is available, ncurses uses the POSIX value for LINE_MAX (a
+-           2048 byte limit).  In either case,  it  reserves  a  byte  for  the
+-           terminating NUL.
+-
+-       Although  getnstr  is equivalent to a series of calls to getch, it also
+-       makes changes to the curses modes to allow simple editing of the  input
+-       buffer:
+-
+-       o   getnstr  saves  the  current  value of the nl, echo, raw and cbreak
+-           modes, and sets nl, noecho, noraw, and cbreak.
+-
+-           getnstr handles the echoing of characters, rather than  relying  on
+-           the caller to set an appropriate mode.
++
                                                                                                        PORTABILITY
                                                                                                        ++       Applications employing ncurses extensions should condition their use on
++       the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       o   It  also  obtains  the erase and kill characters from erasechar and
+-           killchar, respectively.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions  for them, but indicates that wgetnstr and its variants read
++       "the entire multi-byte sequence associated with a character" and "fail"
++       if n and str together do not describe a buffer "large enough to contain
++       any complete characters".   In  ncurses,  however,  wgetch  reads  only
++       single-byte characters, so this scenario does not arise.
++
++       SVr4  curses  describes  a  successful return value only as "an integer
++       value other than ERR".
++
++       SVr3 and early SVr4 curses  implementations  did  not  reject  function
++       keys; the SVr4 documentation asserted that, like the screen's erase and
++       kill characters, they were
+ 
+-       o   On return, getnstr restores the modes to their previous values.
++              interpreted, as well as any special keys (such as function keys,
++              "home" key, "clear" key, etc.)
+ 
+-       Other implementations differ in their treatment of special characters:
++       without  further  detail.   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 code's
++       KEY_ constant value.  (The same language, unchanged except for styling,
++       survived into X/Open Curses Issue 4, but disappeared from Issue 7.)
++
++       X/Open  Curses Issue 5 (2007) stated that these functions "read at most
++       n bytes" but did not  state  whether  the  terminating  null  character
++       counted  toward  that limit.  X/Open Curses Issue 7 (2009) changed that
++       to say they "read at most n-1 bytes" to allow for the terminating  null
++       character.  As of 2018, some implementations count it, some do not.
++
++       o   ncurses 6.1 and PDCurses do not count the null character toward the
++           limit, while Solaris and NetBSD curses do.
++
++       o   Solaris  xcurses  offers   both   behaviors:   its   wide-character
++           wgetn_wstr  reserves  room  for a wide null character, but its non-
++           wide wgetnstr does not consistently count a null  character  toward
++           the limit.
++
++       In SVr4 curses, a negative n tells wgetnstr to assume that the caller's
++       buffer is large enough to hold the result; that is, the  function  then
++       acts  like  wgetstr.   X/Open Curses does not mention this behavior (or
++       anything  related  to  nonpositive  n  values),  however  most   curses
++       libraries  implement  it.  Most implementations nevertheless enforce an
++       upper limit on the count of bytes they write to the destination  buffer
++       str.
++
++       o   BSD   curses   lacked  wgetnstr,  and  its  wgetstr  wrote  to  str
++           unboundedly, as did that in SVr2.
++
++       o   PDCurses, and SVr3.1, SVr4, and Solaris curses limit both functions
++           to  writing  256  bytes.  Other System V-based platforms likely use
++           the same limit.
++
++       o   Solaris xcurses limits the write to LINE_MAX bytes.
++
++       o   NetBSD 7 curses imposes no particular limit on the  length  of  the
++           write,  but does validate n to ensure that it is greater than zero.
++           A comment in NetBSD's source  code  asserts  that  SUSv2  specifies
++           this.
++
++       o   ncurses  prior  to 6.2 (2020) imposes no limit on the length of the
++           write, and treats wgetnstr's n parameter as SVr4 curses does.
++
++       o   ncurses 6.2 uses LINE_MAX  or  a  larger  (system-dependent)  value
++           provided  by  sysconf(3).   If  neither  LINE_MAX  nor  sysconf  is
++           available, ncurses  uses  the  POSIX  minimum  value  for  LINE_MAX
++           (2048).   In  either  case,  it reserves a byte for the terminating
++           null character.
++
++       Implementations vary in their handling of input control characters.
++
++       o   While they may enable the screen's echo option, some do not take it
++           out  of  raw  mode,  and  may  take  cbreak  mode into account when
++           deciding whether to handle echoing within wgetnstr or to rely on it
++           as a side effect of calling wgetch.
++
++       o   Originally,  ncurses, like its progenitor pcurses, had its wgetnstr
++           call noraw and cbreak before accepting input.  That may  have  been
++           done  to  make  function keys work; it is not necessary with modern
++           ncurses.
++
++           Since 1995, ncurses has provided handlers for SIGINTR  and  SIGQUIT
++           events,  which  are typically generated at the keyboard with ^C and
++           ^\ respectively.  In cbreak mode, those handlers catch a signal and
++           stop   the  program,  whereas  other  implementations  write  those
++           characters into the buffer.
++
++       o   Starting with ncurses 6.3 (2021), wgetnstr preserves  raw  mode  if
++           the  screen  was  already  in that state, allowing one to enter the
++           characters the terminal interprets as  interrupt  and  quit  events
++           into the buffer, for better compatibility with SVr4 curses.
+ 
+-       o   While they may set the echo  mode,  other  implementations  do  not
+-           modify  the  raw  mode,  They  may  take the cbreak mode set by the
+-           caller 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
+-           accepting input for getnstr.  That  may  have  been  done  to  make
+-           function- and cursor-keys work; it is not necessary with ncurses.
++
                                                                                                        HISTORY
                                                                                                        ++       4BSD (1980) curses introduced wgetstr along with its variants.
+ 
+-           Since  1995, ncurses has provided signal handlers for INTR and QUIT
+-           (e.g., ^C or ^\).  With the noraw and cbreak  settings,  those  may
+-           catch  a  signal  and stop the program, where other implementations
+-           allow one to enter those characters in the buffer.
++       SVr3.1 (1987) added wgetnstr, but none of its variants.
+ 
+-       o   Starting in 2021 (ncurses 6.3), getnstr sets raw, rather than noraw
+-           and   cbreak  for  better  compatibility  with  SVr4-curses,  e.g.,
+-           allowing one to enter a ^C into the buffer.
++       X/Open  Curses  Issue  4  (1995)  specified  getnstr,  mvwgetnstr,  and
++       mvgetnstr.
+ 
+ 
+ 
                                                                                                        SEE ALSO
                                                                                                        +        curs_get_wstr(3x) describes comparable functions of the ncurses library
+        in its wide-character configuration (ncursesw).
+ 
+-       curses(3x), curs_getch(3x), curs_termattrs(3x), curs_variables(3x)
++       curses(3x),     curs_addch(3x),     curs_getch(3x),    curs_inopts(3x),
++       curs_termattrs(3x),
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                   curs_getstr(3x)
++ncurses 6.5                       2024-06-22                   curs_getstr(3x)
+ 
                                                                                                        
+ 
                                                                                                        
+ 
+ 
                                                                                                        
+Index: doc/html/man/curs_kernel.3x.html
+--- ncurses-6.5-20240615+/doc/html/man/curs_kernel.3x.html	2024-06-08 23:21:18.000000000 +0000
++++ ncurses-6.5-20240622/doc/html/man/curs_kernel.3x.html	2024-06-22 22:55:08.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_kernel.3x,v 1.65 2024/06/08 21:00:58 tom Exp @
++  * @Id: curs_kernel.3x,v 1.67 2024/06/22 21:24:26 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_kernel 3x 2024-06-08 ncurses 6.5 Library calls
++curs_kernel 3x 2024-06-22 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                        curs_kernel 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                        
++
                                                                                                        curs_kernel 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                        
+ 
                                                                                                        + curs_kernel(3x)                  Library calls                 curs_kernel(3x)
+ 
+@@ -141,45 +141,46 @@
+        program  to  write  to  the  terminal  screen.  For example, first call
+        refresh(3x) to ensure that the screen and the library's model of it  is
+        up  to  date;  then call reset_shell_mode; write to the screen with the
+-       external application; call reset_prog_mode; and finally call  mvcur  to
+-       set  the  cursor's  location  to  where  curses thinks it is, since the
+-       library has no knowledge of how the external application moved it.
++       external application; call reset_prog_mode; and finally call mvcur(...,
++       ...,  -1, -1) to move the terminal cursor to where curses thinks it is,
++       since the library has no knowledge  of  how  the  external  application
++       moved it.
+ 
+ 
+ 
                                                                                                        napms
                                                                                                        +-       napms sleeps  for  ms  milliseconds.   If  ms  exceeds  30,000  (thirty
++       napms  sleeps  for  ms  milliseconds.   If  ms  exceeds  30,000 (thirty
+        seconds), it is capped at that value.
+ 
+ 
+ 
                                                                                                        ripoffline
                                                                                                        +-       ripoffline  provides access to the same facility that slk_init(3x) uses
+-       to reduce the size of the screen.  ripoffline  must  be  called  before
++       ripoffline provides access to the same facility that slk_init(3x)  uses
++       to  reduce  the  size  of the screen.  ripoffline must be called before
+        initscr or newterm is called, to prepare these initial actions:
+ 
+        o   If line is positive, a line is removed from the top of stdscr.
+ 
+        o   if line is negative, a line is removed from the bottom.
+ 
+-       When  the  resulting initialization is done inside initscr, the routine
++       When the resulting initialization is done inside initscr,  the  routine
+        init (supplied by the user) is called with two arguments:
+ 
+        o   a window pointer to the one-line window that has been allocated and
+ 
+        o   an integer with the number of columns in the window.
+ 
+-       Inside this initialization routine, the  integer  variables  LINES  and
+-       COLS  (defined  in  <curses.h>)  are  not guaranteed to be accurate and
+-       wrefresh or doupdate must not be  called.   It  is  allowable  to  call
++       Inside  this  initialization  routine,  the integer variables LINES and
++       COLS (defined in <curses.h>) are not  guaranteed  to  be  accurate  and
++       wrefresh  or  doupdate  must  not  be  called.  It is allowable to call
+        wnoutrefresh during the initialization routine.
+ 
+-       ripoffline  can  be  called  up to five times before calling initscr or
++       ripoffline can be called up to five times  before  calling  initscr  or
+        newterm.
+ 
+ 
+ 
                                                                                                        RETURN VALUE
                                                                                                        +        Except for curs_set, these routines always return OK.
+ 
+-       curs_set returns the previous cursor state, or  ERR  if  the  requested
++       curs_set  returns  the  previous  cursor state, or ERR if the requested
+        visibility is not supported.
+ 
+        X/Open defines no error conditions.  In this implementation
+@@ -189,7 +190,7 @@
+             to obtain the terminal settings fails.
+ 
+        ripoffline
+-            returns ERR if the maximum number of ripped-off lines exceeds  the
++            returns  ERR if the maximum number of ripped-off lines exceeds the
+             maximum (5).
+ 
+ 
+@@ -197,21 +198,21 @@
+        Note that getsyx is a macro, so & is not necessary before the variables
+        y and x.
+ 
+-       Older SVr4 man pages  warn  that  the  return  value  of  curs_set  "is
++       Older  SVr4  man  pages  warn  that  the  return  value of curs_set "is
+        currently incorrect".  This implementation gets it right, but it may be
+        unwise to count on the correctness of the return value anywhere else.
+ 
+        Both ncurses and SVr4 will call curs_set in endwin if curs_set 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
++       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.
+ 
+ 
+ 
                                                                                                        EXTENSIONS
                                                                                                        +-       In  ncurses, mvcur accepts -1 for either or both old coordinates.  This
+-       value tells ncurses that the old location is unknown, and that it  must
+-       use  only absolute motion, as with the cursor_address (cup) capability,
+-       rather than the least  costly  combination  of  absolute  and  relative
++       In ncurses, mvcur accepts -1 for either or both old coordinates.   This
++       value  tells ncurses that the old location is unknown, and that it must
++       use only absolute motion, as with the cursor_address (cup)  capability,
++       rather  than  the  least  costly  combination  of absolute and relative
+        motion.
+ 
+ 
+@@ -219,24 +220,24 @@
+        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       The virtual screen functions setsyx and getsyx  are  not  described  in
++       The  virtual  screen  functions  setsyx and getsyx are not described in
+        X/Open Curses, Issue 4.  All other functions are as described in X/Open
+        Curses.
+ 
+-       The SVr4 documentation describes setsyx and  getsyx  as  having  return
+-       type  int.   This  is misleading, as they are macros with no documented
++       The  SVr4  documentation  describes  setsyx and getsyx as having return
++       type int.  This is misleading, as they are macros  with  no  documented
+        semantics for the return value.
+ 
+        X/Open Curses notes:
+ 
+-              "After use of mvcur(), the model Curses maintains of  the  state
+-              of  the  terminal  might  not  match  the  actual  state  of the
+-              terminal.  An application should touch and  refresh  the  window
++              "After  use  of mvcur(), the model Curses maintains of the state
++              of the  terminal  might  not  match  the  actual  state  of  the
++              terminal.   An  application  should touch and refresh the window
+               before resuming conventional use of Curses."
+ 
+-       Both  ncurses  and  SVr4  curses  implement mvcur using the SCREEN data
+-       allocated in either initscr(3x) or newterm(3x).  X/Open  Curses  states
+-       that  the old location must be given for mvcur to accommodate terminals
++       Both ncurses and SVr4 curses implement  mvcur  using  the  SCREEN  data
++       allocated  in  either initscr(3x) or newterm(3x).  X/Open Curses states
++       that the old location must be given for mvcur to accommodate  terminals
+        that lack absolute cursor positioning.
+ 
+        If interrupted, ncurses restarts napms.  That, and the limitation to 30
+@@ -249,7 +250,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                   curs_kernel(3x)
++ncurses 6.5                       2024-06-22                   curs_kernel(3x)
+ 
                                                                                                        
+ 
                                                                                                        
+ 
                                                                                                          
+Index: doc/html/man/curs_pad.3x.html
+--- ncurses-6.5-20240615+/doc/html/man/curs_pad.3x.html	2024-05-25 22:33:42.000000000 +0000
++++ ncurses-6.5-20240622/doc/html/man/curs_pad.3x.html	2024-06-22 22:55:08.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_pad.3x,v 1.63 2024/05/25 20:10:58 tom Exp @
++  * @Id: curs_pad.3x,v 1.65 2024/06/22 22:20:03 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_pad 3x 2024-05-25 ncurses 6.5 Library calls
++curs_pad 3x 2024-06-22 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                          curs_pad 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                          
++
                                                                                                          curs_pad 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                          
+ 
                                                                                                          + curs_pad(3x)                     Library calls                    curs_pad(3x)
+ 
+@@ -133,7 +133,7 @@
+        specifies only "an integer  value  other  than  ERR")  upon  successful
+        completion.
+ 
+-       Functions  that  return pointers return NULL on error, and set errno to
++       Functions  that  return pointers return NULL on error, and set errno to
+        ENOMEM.
+ 
+        X/Open  Curses  does  not  specify  any  error  conditions.   In   this
+@@ -229,7 +229,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                      curs_pad(3x)
++ncurses 6.5                       2024-06-22                      curs_pad(3x)
+ 
                                                                                                          
+ 
                                                                                                          
+ 
                                                                                                            
+Index: doc/html/man/curs_slk.3x.html
+--- ncurses-6.5-20240615+/doc/html/man/curs_slk.3x.html	2024-05-25 22:33:42.000000000 +0000
++++ ncurses-6.5-20240622/doc/html/man/curs_slk.3x.html	2024-06-22 22:55:08.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_slk.3x,v 1.73 2024/05/25 20:10:58 tom Exp @
++  * @Id: curs_slk.3x,v 1.75 2024/06/22 21:25:23 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_slk 3x 2024-05-25 ncurses 6.5 Library calls
++curs_slk 3x 2024-06-22 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                            curs_slk 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                            
++
                                                                                                            curs_slk 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                            
+ 
                                                                                                            + curs_slk(3x)                     Library calls                    curs_slk(3x)
+ 
+@@ -312,7 +312,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                      curs_slk(3x)
++ncurses 6.5                       2024-06-22                      curs_slk(3x)
+ 
                                                                                                            
+ 
                                                                                                            
+ 
                                                                                                              
+Index: doc/html/man/curs_termcap.3x.html
+--- ncurses-6.5-20240615+/doc/html/man/curs_termcap.3x.html	2024-04-27 18:38:47.000000000 +0000
++++ ncurses-6.5-20240622/doc/html/man/curs_termcap.3x.html	2024-06-22 22:55:08.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_termcap.3x,v 1.85 2024/04/20 19:13:12 tom Exp @
++  * @Id: curs_termcap.3x,v 1.87 2024/06/22 21:28:07 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_termcap 3x 2024-04-20 ncurses 6.5 Library calls
++curs_termcap 3x 2024-06-22 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                              curs_termcap 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                              
++
                                                                                                              curs_termcap 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                              
+ 
                                                                                                              + curs_termcap(3x)                 Library calls                curs_termcap(3x)
+ 
+@@ -369,7 +369,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                  curs_termcap(3x)
++ncurses 6.5                       2024-06-22                  curs_termcap(3x)
+ 
                                                                                                              
+ 
                                                                                                              
+ 
                                                                                                                
+Index: doc/html/man/curs_util.3x.html
+--- ncurses-6.5-20240615+/doc/html/man/curs_util.3x.html	2024-06-15 20:39:29.000000000 +0000
++++ ncurses-6.5-20240622/doc/html/man/curs_util.3x.html	2024-06-22 22:55:09.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_util.3x,v 1.110 2024/06/15 20:20:12 tom Exp @
++  * @Id: curs_util.3x,v 1.112 2024/06/22 21:25:23 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_util 3x 2024-06-15 ncurses 6.5 Library calls
++curs_util 3x 2024-06-22 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                curs_util 3x 2024-06-15 ncurses 6.5 Library calls
                                                                                                                
++
                                                                                                                curs_util 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                                
+ 
                                                                                                                + curs_util(3x)                    Library calls                   curs_util(3x)
+ 
+@@ -406,7 +406,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-15                     curs_util(3x)
++ncurses 6.5                       2024-06-22                     curs_util(3x)
+ 
                                                                                                                
+ 
                                                                                                                
+ 
                                                                                                                  
+Index: doc/html/man/curs_variables.3x.html
+--- ncurses-6.5-20240615+/doc/html/man/curs_variables.3x.html	2024-04-27 18:38:47.000000000 +0000
++++ ncurses-6.5-20240622/doc/html/man/curs_variables.3x.html	2024-06-22 22:55:09.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_variables.3x,v 1.47 2024/04/13 22:37:35 tom Exp @
++  * @Id: curs_variables.3x,v 1.49 2024/06/22 21:25:23 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_variables 3x 2024-04-13 ncurses 6.5 Library calls
++curs_variables 3x 2024-06-22 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                  curs_variables 3x 2024-04-13 ncurses 6.5 Library calls
                                                                                                                  
++
                                                                                                                  curs_variables 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                                  
+ 
                                                                                                                  + curs_variables(3x)               Library calls              curs_variables(3x)
+ 
+@@ -266,7 +266,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-13                curs_variables(3x)
++ncurses 6.5                       2024-06-22                curs_variables(3x)
+ 
                                                                                                                  
+ 
                                                                                                                  
+ 
                                                                                                                    
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.5-20240615+/doc/html/man/ncurses.3x.html	2024-06-15 20:39:31.000000000 +0000
++++ ncurses-6.5-20240622/doc/html/man/ncurses.3x.html	2024-06-22 23:04:46.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: ncurses.3x,v 1.223 2024/06/08 20:45:43 tom Exp @
++  * @Id: ncurses.3x,v 1.225 2024/06/22 22:14:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-ncurses 3x 2024-06-08 ncurses 6.5 Library calls
++ncurses 3x 2024-06-22 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                    ncurses 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                    
++
                                                                                                                    ncurses 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                                    
+ 
                                                                                                                    + ncurses(3x)                      Library calls                     ncurses(3x)
+ 
+@@ -61,7 +61,7 @@
+        terminals  with  output  optimized to minimize screen updates.  ncurses
+        replaces the curses libraries from System V Release 4 Unix ("SVr4") and
+        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
+-       document describes ncurses version 6.5 (patch 20240615).
++       document describes ncurses version 6.5 (patch 20240622).
+ 
+        ncurses permits control of the terminal screen's contents;  abstraction
+        and  subdivision thereof with windows and pads; acquisition of keyboard
+@@ -84,8 +84,8 @@
+            underlying integral type or  the  availability  of  a  preprocessor
+            macro  exclusive  of  a  function  definition  (which  prevents its
+            address  from  being   taken).    This   section   also   describes
+-           implementation  details  that will be significant to the programmer
+-           but which are not standardized.
++           implementation  details of significance to the programmer but which
++           are not standardized.
+ 
+        o   "EXTENSIONS" presents ncurses innovations beyond the X/Open  Curses
+            standard  and/or  the  SVr4 curses implementation.  They are termed
+@@ -107,26 +107,25 @@
+        may  be available; if so, link with it using -lncurses_g.  (Your system
+        integrator may have installed these libraries such that you can use the
+        options  -lcurses and -lcurses_g, respectively.)  The ncurses_g library
+-       generates trace logs (in a file called trace in the current  directory)
+-       that  describe ncurses actions.  See section "ALTERNATE CONFIGURATIONS"
+-       below.
++       logs events describing ncurses actions to a file called  trace  in  the
++       current directory.  See section "ALTERNATE CONFIGURATIONS" below.
+ 
+ 
+ 
                                                                                                                    Application Structure
                                                                                                                    +-       A  curses  application  uses  information  from  the   system   locale;
++       A   curses   application  uses  information  from  the  system  locale;
+        setlocale(3) prepares it for curses library calls.
+ 
+            setlocale(LC_ALL, "");
+ 
+-       If  the  locale  is  not  thus  initialized,  the  library assumes that
+-       characters are printable as in ISO 8859-1, to work with certain  legacy
+-       programs.   You  should initialize the locale; do not expect consistent
++       If the locale  is  not  thus  initialized,  the  library  assumes  that
++       characters  are printable as in ISO 8859-1, to work with certain legacy
++       programs.  You should initialize the locale; do not  expect  consistent
+        behavior from the library when the locale has not been set up.
+ 
+-       initscr(3x) or newterm(3x) must be called to initialize  curses  before
++       initscr(3x)  or  newterm(3x) must be called to initialize curses before
+        use of any functions that deal with windows and screens.
+ 
+-       To  get  character-at-a-time  input  without echoing--most interactive,
++       To get character-at-a-time  input  without  echoing--most  interactive,
+        screen-oriented programs want this--use the following sequence.
+ 
+            initscr(); cbreak(); noecho();
+@@ -136,17 +135,22 @@
+            noqiflush();
+            keypad(stdscr, TRUE);
+ 
+-       A curses program then often enters an event loop of  some  sort.   Call
++       A  curses  program  then often enters an event loop of some sort.  Call
+        endwin(3x) before exiting.
+ 
+ 
+ 
                                                                                                                    Overview
                                                                                                                    +-       A  curses  library abstracts the terminal screen by representing all or
+-       part of it as a WINDOW data structure.  A window is a rectangular  grid
+-       of  character  cells,  addressed by line and column coordinates (y, x),
+-       with the upper left corner as (0, 0).  A window called stdscr, the same
+-       size  as  the terminal screen, is always available.  Create others with
+-       newwin(3x).
++       A curses library abstracts the terminal with a SCREEN  data  structure,
++       and  represents  all  or  part  of  its display with WINDOW structures.
++       Distinct properties apply to each; for example, the line discipline  of
++       a  typical  Unix terminal driver is in one of three modes: raw, cbreak,
++       or normal ("cooked").  In curses, the line discipline is a property  of
++       the screen, applying identically to all windows associated with it.
++
++       A  window  is  a rectangular grid of character cells, addressed by line
++       and column coordinates (y, x), with the upper left corner as (0, 0).  A
++       window  called  stdscr, the same size as the terminal screen, is always
++       available.  Create others with newwin(3x).
+ 
+        A curses library does not manage overlapping windows (but  see  below).
+        You  can either use stdscr to manage one screen-filling window, or tile
+@@ -380,13 +384,13 @@
+                     def_shell_mode           curs_kernel(3x)
+                     define_key               define_key(3x)*
+                     del_curterm              curs_terminfo(3x)
+-
+                     delay_output             curs_util(3x)
+                     delch                    curs_delch(3x)
+                     deleteln                 curs_deleteln(3x)
+                     delscreen                curs_initscr(3x)
+                     delwin                   curs_window(3x)
+                     derwin                   curs_window(3x)
++
+                     doupdate                 curs_refresh(3x)
+                     dupwin                   curs_window(3x)
+                     echo                     curs_inopts(3x)
+@@ -446,7 +450,6 @@
+                     in_wch                   curs_in_wch(3x)
+                     in_wchnstr               curs_in_wchstr(3x)
+                     in_wchstr                curs_in_wchstr(3x)
+-
+                     inch                     curs_inch(3x)
+                     inchnstr                 curs_inchstr(3x)
+                     inchstr                  curs_inchstr(3x)
+@@ -455,6 +458,7 @@
+                     init_extended_pair       curs_color(3x)*
+                     init_pair                curs_color(3x)
+                     initscr                  curs_initscr(3x)
++
+                     innstr                   curs_instr(3x)
+                     innwstr                  curs_inwstr(3x)
+                     ins_nwstr                curs_ins_wstr(3x)
+@@ -512,7 +516,6 @@
+                     mvaddchstr               curs_addchstr(3x)
+                     mvaddnstr                curs_addstr(3x)
+                     mvaddnwstr               curs_addwstr(3x)
+-
+                     mvaddstr                 curs_addstr(3x)
+                     mvaddwstr                curs_addwstr(3x)
+                     mvchgat                  curs_attr(3x)
+@@ -523,6 +526,7 @@
+                     mvget_wstr               curs_get_wstr(3x)
+                     mvgetch                  curs_getch(3x)
+                     mvgetn_wstr              curs_get_wstr(3x)
++
+                     mvgetnstr                curs_getstr(3x)
+                     mvgetstr                 curs_getstr(3x)
+                     mvhline                  curs_border(3x)
+@@ -578,7 +582,6 @@
+                     mvwinnwstr               curs_inwstr(3x)
+                     mvwins_nwstr             curs_ins_wstr(3x)
+                     mvwins_wch               curs_ins_wch(3x)
+-
+                     mvwins_wstr              curs_ins_wstr(3x)
+                     mvwinsch                 curs_insch(3x)
+                     mvwinsnstr               curs_insstr(3x)
+@@ -591,6 +594,7 @@
+                     mvwvline_set             curs_border_set(3x)
+                     napms                    curs_kernel(3x)
+                     newpad                   curs_pad(3x)
++
+                     newterm                  curs_initscr(3x)
+                     newwin                   curs_window(3x)
+                     nl                       curs_inopts(3x)
+@@ -644,7 +648,6 @@
+                     slk_attr                 curs_slk(3x)*
+                     slk_attr_off             curs_slk(3x)
+                     slk_attr_on              curs_slk(3x)
+-
+                     slk_attr_set             curs_slk(3x)
+                     slk_attroff              curs_slk(3x)
+                     slk_attron               curs_slk(3x)
+@@ -659,6 +662,7 @@
+                     slk_set                  curs_slk(3x)
+                     slk_touch                curs_slk(3x)
+                     slk_wset                 curs_slk(3x)
++
+                     standend                 curs_attr(3x)
+                     standout                 curs_attr(3x)
+                     start_color              curs_color(3x)
+@@ -710,7 +714,6 @@
+                     vwprintw                 curs_printw(3x)
+                     vwscanw                  curs_scanw(3x)
+                     wadd_wch                 curs_add_wch(3x)
+-
+                     wadd_wchnstr             curs_add_wchstr(3x)
+                     wadd_wchstr              curs_add_wchstr(3x)
+                     waddch                   curs_addch(3x)
+@@ -727,6 +730,7 @@
+                     wattroff                 curs_attr(3x)
+                     wattron                  curs_attr(3x)
+                     wattrset                 curs_attr(3x)
++
+                     wbkgd                    curs_bkgd(3x)
+                     wbkgdset                 curs_bkgd(3x)
+                     wbkgrnd                  curs_bkgrnd(3x)
+@@ -776,7 +780,6 @@
+                     winstr                   curs_instr(3x)
+                     winwstr                  curs_inwstr(3x)
+                     wmouse_trafo             curs_mouse(3x)*
+-
+                     wmove                    curs_move(3x)
+                     wnoutrefresh             curs_refresh(3x)
+                     wprintw                  curs_printw(3x)
+@@ -1316,168 +1319,169 @@
+        to draw colored text on a background whose color is set  independently,
+        providing better control over color contrasts.  See default_colors(3x).
+ 
+-       An  ncurses  application  can  eschew  knowledge  of  WINDOW  structure
+-       internals, instead using accessor functions such as is_scrollok(3x).
++       An  ncurses  application  can  eschew  knowledge  of  SCREEN and WINDOW
++       structure  internals,  instead  using  accessor   functions   such   as
++       is_cbreak(3x) and is_scrollok(3x).
+ 
+-       ncurses enables an application  to  direct  its  output  to  a  printer
++       ncurses  enables  an  application  to  direct  its  output to a printer
+        attached to the terminal device; see curs_print(3x).
+ 
+-       ncurses  offers slk_attr(3x) as a counterpart of attr_get(3x) for soft-
+-       label key lines, and extended_slk_color(3x) as a form of  slk_color(3x)
+-       that  can  gather  color  information  from  them  when many colors are
++       ncurses offers slk_attr(3x) as a counterpart of attr_get(3x) for  soft-
++       label  key lines, and extended_slk_color(3x) as a form of slk_color(3x)
++       that can gather color  information  from  them  when  many  colors  are
+        supported.
+ 
+-       ncurses   permits   modification   of   unctrl(3x)'s   behavior;    see
++       ncurses    permits   modification   of   unctrl(3x)'s   behavior;   see
+        use_legacy_coding(3x).
+ 
+-       Rudimentary  support  for multi-threaded applications may be available;
++       Rudimentary support for multi-threaded applications may  be  available;
+        see curs_threads(3x).
+ 
+-       Functions that ease the management of multiple screens can be  exposed;
++       Functions  that ease the management of multiple screens can be exposed;
+        see curs_sp_funcs(3x).
+ 
+-       To  aid  applications  to  debug their memory usage, ncurses optionally
+-       offers functions  to  more  aggressively  free  memory  it  dynamically
++       To aid applications to debug their  memory  usage,  ncurses  optionally
++       offers  functions  to  more  aggressively  free  memory  it dynamically
+        allocates itself; see curs_memleaks(3x).
+ 
+-       The  library  facilitates auditing and troubleshooting of its behavior;
++       The library facilitates auditing and troubleshooting of  its  behavior;
+        see curs_trace(3x).
+ 
+-       Compiling ncurses with the option -DUSE_GETCAP causes it to  fall  back
+-       to  reading /etc/termcap if the terminal setup code cannot find a term-
++       Compiling  ncurses  with the option -DUSE_GETCAP causes it to fall back
++       to reading /etc/termcap if the terminal setup code cannot find a  term-
+        info  entry  corresponding  to  TERM.   Use  of  this  feature  is  not
+-       recommended,  as  it essentially includes an entire termcap compiler in
+-       the ncurses startup code, at a cost in  memory  usage  and  application
++       recommended, as it essentially includes an entire termcap  compiler  in
++       the  ncurses  startup  code,  at a cost in memory usage and application
+        launch latency.
+ 
+-       PDCurses   and  NetBSD  curses  incorporate  some  ncurses  extensions.
++       PDCurses  and  NetBSD  curses  incorporate  some  ncurses   extensions.
+        Individual man pages indicate where this is the case.
+ 
+ 
+ 
                                                                                                                    PORTABILITY
                                                                                                                    +        X/Open Curses defines two levels of conformance, "base" and "enhanced".
+        The latter includes several additional features, such as wide-character
+-       and color support.  ncurses intends base-level conformance with  X/Open
+-       Curses,  and  supports  all  features  of its enhanced level except the
+-       untic utility.
++       and  color support.  ncurses intends base-level conformance with X/Open
++       Curses, and supports all features of  its  enhanced  level  except  the
++       untic utility.
+ 
+-       Differences between X/Open Curses and ncurses  are  documented  in  the
++       Differences  between  X/Open  Curses  and ncurses are documented in the
+        "PORTABILITY" sections of applicable man pages.
+ 
+ 
+ 
                                                                                                                    Error Checking
                                                                                                                    +-       In  many cases, X/Open Curses is vague about error conditions, omitting
++       In many cases, X/Open Curses is vague about error conditions,  omitting
+        some of the SVr4 documentation.
+ 
+-       Unlike other implementations, ncurses checks pointer  parameters,  such
+-       as  those to WINDOW structures, to ensure that they are not null.  This
+-       is done primarily to guard  against  programmer  error.   The  standard
++       Unlike  other  implementations, ncurses checks pointer parameters, such
++       as those to WINDOW structures, to ensure that they are not null.   This
++       is  done  primarily  to  guard  against programmer error.  The standard
+        interface does not provide a way for the library to tell an application
+-       which of several possible errors occurred.  An application that  relies
+-       on  ncurses  to  check  its function parameters for validity limits its
++       which  of several possible errors occurred.  An application that relies
++       on ncurses to check its function parameters  for  validity  limits  its
+        portability and robustness.
+ 
+ 
+ 
                                                                                                                    Padding Differences
                                                                                                                    +-       In historical curses implementations, delays embedded in  the  terminfo
+-       capabilities  carriage_return  (cr),  scroll_forward (ind), cursor_left
++       In  historical  curses implementations, delays embedded in the terminfo
++       capabilities carriage_return (cr),  scroll_forward  (ind),  cursor_left
+        (cub1), form_feed (ff), and tab (ht) activated corresponding delay bits
+-       in  the  Unix terminal driver.  ncurses performs all padding by sending
+-       NUL bytes to the device.  This method is slightly more  expensive,  but
+-       narrows   the   interface   to   the   Unix  kernel  significantly  and
++       in the Unix terminal driver.  ncurses performs all padding  by  sending
++       NUL  bytes  to the device.  This method is slightly more expensive, but
++       narrows  the  interface  to   the   Unix   kernel   significantly   and
+        correspondingly increases the package's portability.
+ 
+ 
+ 
                                                                                                                    Header Files
                                                                                                                    +-       The header file curses.h itself includes the header files  stdio.h  and
++       The  header  file curses.h itself includes the header files stdio.h and
+        unctrl.h.
+ 
+        X/Open Curses has more to say,
+ 
+-           The  inclusion  of  curses.h  may make visible all symbols from the
++           The inclusion of curses.h may make visible  all  symbols  from  the
+            headers stdio.h, term.h, termios.h, and wchar.h.
+ 
+        but does not finish the story.  A more complete account follows.
+ 
+        o   The first curses, in 4BSD, provided a curses.h file.
+ 
+-           BSD curses code included curses.h and  unctrl.h  from  an  internal
++           BSD  curses  code  included  curses.h and unctrl.h from an internal
+            header file curses.ext, where "ext" abbreviated "externs".
+ 
+-           The  implementations of printw and scanw used undocumented internal
+-           functions of the standard I/O library (_doprnt  and  _doscan),  but
++           The implementations of printw and scanw used undocumented  internal
++           functions  of  the  standard I/O library (_doprnt and _doscan), but
+            nothing in curses.h itself relied upon stdio.h.
+ 
+-       o   SVr2  curses  added  newterm, which relies upon stdio.h because its
++       o   SVr2 curses added newterm, which relies upon  stdio.h  because  its
+            function prototype employs the FILE type.
+ 
+            SVr4 curses added putwin and getwin, which also use stdio.h.
+ 
+            X/Open Curses specifies all three of these functions.
+ 
+-           SVr4 curses and X/Open Curses  do  not  require  the  developer  to
+-           include  stdio.h  before  curses.h.  Both document use of curses as
++           SVr4  curses  and  X/Open  Curses  do  not require the developer to
++           include stdio.h before curses.h.  Both document use  of  curses  as
+            requiring only curses.h.
+ 
+            As a result, standard curses.h always includes stdio.h.
+ 
+-       o   X/Open Curses and SVr4 curses  are  inconsistent  with  respect  to
++       o   X/Open  Curses  and  SVr4  curses  are inconsistent with respect to
+            unctrl.h.
+ 
+-           As  noted in curs_util(3x), ncurses includes unctrl.h from curses.h
++           As noted in curs_util(3x), ncurses includes unctrl.h from  curses.h
+            (as SVr4 does).
+ 
+-       o   X/Open Curses's comments about term.h and termios.h  may  refer  to
++       o   X/Open  Curses's  comments  about term.h and termios.h may refer to
+            HP-UX and AIX.
+ 
+-           HP-UX  curses includes term.h from curses.h to declare setupterm in
++           HP-UX curses includes term.h from curses.h to declare setupterm  in
+            curses.h, but ncurses and Solaris curses do not.
+ 
+-           AIX curses includes  term.h  and  termios.h.   Again,  ncurses  and
++           AIX  curses  includes  term.h  and  termios.h.   Again, ncurses and
+            Solaris curses do not.
+ 
+-       o   X/Open  Curses  says that curses.h may include term.h, but does not
++       o   X/Open Curses says that curses.h may include term.h, but  does  not
+            require it to do so.
+ 
+-           Some programs use functions declared in both curses.h  and  term.h,
+-           and  must  include  both header files in the same module.  Very old
+-           versions of  AIX  curses  required  inclusion  of  curses.h  before
++           Some  programs  use functions declared in both curses.h and term.h,
++           and must include both header files in the same  module.   Very  old
++           versions  of  AIX  curses  required  inclusion  of  curses.h before
+            term.h.
+ 
+-           The  header  files supplied by ncurses include the standard library
+-           headers required for its  declarations,  so  ncurses's  own  header
+-           files  can  be  included  in  any  order.  But for portability, you
++           The header files supplied by ncurses include the  standard  library
++           headers  required  for  its  declarations,  so ncurses's own header
++           files can be included in  any  order.   But  for  portability,  you
+            should include curses.h before term.h.
+ 
+-       o   X/Open Curses says "may make visible" because  including  a  header
+-           file  does  not  necessarily  make visible all of the symbols in it
++       o   X/Open  Curses  says  "may make visible" because including a header
++           file does not necessarily make visible all of  the  symbols  in  it
+            (consider #ifdef and similar).
+ 
+-           For instance, ncurses's curses.h may include wchar.h if the  proper
+-           symbol  is defined, and if ncurses is configured for wide-character
+-           support.  If wchar.h is included, its symbols may be  made  visible
++           For  instance, ncurses's curses.h may include wchar.h if the proper
++           symbol is defined, and if ncurses is configured for  wide-character
++           support.   If  wchar.h is included, its symbols may be made visible
+            depending on the value of the _XOPEN_SOURCE feature test macro.
+ 
+        o   X/Open Curses mandates an application's inclusion of one standard C
+-           library header in a  special  case:  stdarg.h  before  curses.h  to
+-           prototype  the  functions  vw_printw  and  vw_scanw (as well as the
+-           obsolete vwprintw and vwscanw).  Each of  these  takes  a  variadic
++           library  header  in  a  special  case:  stdarg.h before curses.h to
++           prototype the functions vw_printw and  vw_scanw  (as  well  as  the
++           obsolete  vwprintw  and  vwscanw).   Each of these takes a variadic
+            argument list, a va_list parameter, like that of printf(3).
+ 
+-           SVr3  curses  introduced  the  two  obsolete  functions, and X/Open
+-           Curses the others.   In  between,  SVr4  curses  provided  for  the
+-           possibility  that  an application might include either varargs.h or
+-           stdarg.h.  These represented  contrasting  approaches  to  handling
+-           variadic  argument  lists.   The older interface, varargs.h, used a
+-           pointer to char for variadic functions' va_list parameter.   Later,
+-           the  list  acquired its own standard data type, va_list, defined in
+-           stdarg.h, empowering the compiler to check the types of a  function
+-           call's  actual  parameters  against the formal ones declared in its
++           SVr3 curses introduced  the  two  obsolete  functions,  and  X/Open
++           Curses  the  others.   In  between,  SVr4  curses  provided for the
++           possibility that an application might include either  varargs.h  or
++           stdarg.h.   These  represented  contrasting  approaches to handling
++           variadic argument lists.  The older interface,  varargs.h,  used  a
++           pointer  to char for variadic functions' va_list parameter.  Later,
++           the list acquired its own standard data type, va_list,  defined  in
++           stdarg.h,  empowering the compiler to check the types of a function
++           call's actual parameters against the formal ones  declared  in  its
+            prototype.
+ 
+-           No  conforming  implementations  of  X/Open   Curses   require   an
++           No   conforming   implementations   of  X/Open  Curses  require  an
+            application to include stdarg.h before curses.h because they either
+-           have allowed for a special type, or,  like  ncurses,  they  include
++           have  allowed  for  a  special type, or, like ncurses, they include
+            stdarg.h themselves to provide a portable interface.
+ 
+ 
+@@ -1491,7 +1495,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                       ncurses(3x)
++ncurses 6.5                       2024-06-22                       ncurses(3x)
+ 
                                                                                                                    
+ 
                                                                                                                    
+ 
                                                                                                                      
+Index: doc/html/man/tabs.1.html
+--- ncurses-6.5-20240615+/doc/html/man/tabs.1.html	2024-04-27 18:38:49.000000000 +0000
++++ ncurses-6.5-20240622/doc/html/man/tabs.1.html	2024-06-22 22:55:11.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tabs.1,v 1.59 2024/04/20 19:08:15 tom Exp @
++  * @Id: tabs.1,v 1.61 2024/06/22 22:15:32 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-tabs 1 2024-04-20 ncurses 6.5 User commands
++tabs 1 2024-06-22 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                      tabs 1 2024-04-20 ncurses 6.5 User commands
                                                                                                                      
++
                                                                                                                      tabs 1 2024-06-22 ncurses 6.5 User commands
                                                                                                                      
+ 
                                                                                                                      + tabs(1)                          User commands                         tabs(1)
+ 
+@@ -245,8 +245,8 @@
+        the  committee  considered  redesigning  the  tabs  and tput utilities,
+        without settling on an improved solution.  It claims that
+ 
+-           "no known historical version of tabs  supports  the  capability  of
+-           setting arbitrary tab stops."
++           no known historical version of  tabs  supports  the  capability  of
++           setting arbitrary tab stops.
+ 
+        The   feature  described  in  subsection  "Explicit  Lists"  above  was
+        implemented in PWB/Unix, and permitted  the  setting  of  abitrary  tab
+@@ -258,7 +258,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                           tabs(1)
++ncurses 6.5                       2024-06-22                           tabs(1)
+ 
                                                                                                                      
+ 
                                                                                                                      
+ 
                                                                                                                        
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.5-20240615+/doc/html/man/terminfo.5.html	2024-06-15 20:39:31.000000000 +0000
++++ ncurses-6.5-20240622/doc/html/man/terminfo.5.html	2024-06-22 22:55:11.000000000 +0000
+@@ -71,7 +71,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This document describes ncurses version 6.5 (patch 20240615).
++       This document describes ncurses version 6.5 (patch 20240622).
+ 
+ 
+

                                                                                                  terminfo Entry Syntax

                                                                                                  +Index: doc/html/man/tput.1.html
+--- ncurses-6.5-20240615+/doc/html/man/tput.1.html	2024-06-08 23:12:52.000000000 +0000
++++ ncurses-6.5-20240622/doc/html/man/tput.1.html	2024-06-22 22:55:11.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tput.1,v 1.116 2024/06/08 20:50:34 tom Exp @
++  * @Id: tput.1,v 1.118 2024/06/22 21:28:35 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-tput 1 2024-06-08 ncurses 6.5 User commands
++tput 1 2024-06-22 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                  tput 1 2024-06-08 ncurses 6.5 User commands
                                                                                                  
++
                                                                                                  tput 1 2024-06-22 ncurses 6.5 User commands
                                                                                                  
+ 
                                                                                                  + tput(1)                          User commands                         tput(1)
+ 
+@@ -477,8 +477,10 @@
+        As of ncurses 6.1,  the  "reset"  features  of  the  two  programs  are
+        (mostly) the same.  Two minor differences remain.
+ 
+-       o   The  tset  program  waits  one  second  when resetting, in case the
+-           terminal happens to be a hardware device.
++       o   When  issuing  a  reset, the tset program checks whether the device
++           appears to be a pseudoterminal (as might  be  used  by  a  terminal
++           emulator program), and, if it does not, waits one second in case it
++           is communicating with a hardware terminal.
+ 
+        o   The two programs  write  the  terminal  initialization  strings  to
+            different  streams;  that  is, standard error for tset and standard
+@@ -557,7 +559,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                           tput(1)
++ncurses 6.5                       2024-06-22                           tput(1)
+ 
                                                                                                  
+ 
                                                                                                  
+ 
                                                                                                    
+Index: man/curs_add_wchstr.3x
+Prereq:  1.40 
+--- ncurses-6.5-20240615+/man/curs_add_wchstr.3x	2024-05-11 20:39:53.000000000 +0000
++++ ncurses-6.5-20240622/man/curs_add_wchstr.3x	2024-06-22 21:26:27.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_add_wchstr.3x,v 1.40 2024/05/11 20:39:53 tom Exp $
+-.TH curs_add_wchstr 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_add_wchstr.3x,v 1.42 2024/06/22 21:26:27 tom Exp $
++.TH curs_add_wchstr 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -139,6 +139,27 @@
+ .SH PORTABILITY
+ X/Open Curses,
+ Issue 4 describes these functions.
++.SH HISTORY
++These functions were initially specified by X/Open Curses,
++Issue 4.
++The System\ V Interface Definition,
++Version 4 (1995),
++specified functions named
++.I \%waddwchstr
++and
++.I \%waddwchnstr
++(and the usual variants).
++These were later additions to
++.RI SVr4. x ,
++not appearing in the first SVr4 (1989).
++They differed from X/Open's
++.I \%wadd_wchstr
++and
++.I \%wadd_wchnstr
++in that they each took an argument of type
++.I \%wchar_t
++instead of
++.IR \%cchar_t "."
+ .SH SEE ALSO
+ \fB\%curs_addchstr\fP(3X) describes comparable functions of the
+ .I \%ncurses
+Index: man/curs_addch.3x
+Prereq:  1.92 
+--- ncurses-6.5-20240615+/man/curs_addch.3x	2024-06-08 20:51:41.000000000 +0000
++++ ncurses-6.5-20240622/man/curs_addch.3x	2024-06-22 21:34:49.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addch.3x,v 1.92 2024/06/08 20:51:41 tom Exp $
+-.TH curs_addch 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addch.3x,v 1.94 2024/06/22 21:34:49 tom Exp $
++.TH curs_addch 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -284,6 +284,12 @@
+ but X/Open Curses does not specify it;
+ see \fB\%curs_variables\fP(3X).
+ .SH PORTABILITY
++Applications employing
++.I \%ncurses
++extensions should condition their use on the visibility of the
++.B \%NCURSES_VERSION
++preprocessor macro.
++.PP
+ X/Open Curses,
+ Issue 4 describes these functions.
+ It specifies no error conditions for them.
+@@ -471,9 +477,9 @@
+ use only
+ \fB\%wadd_wch\fP(3X).
+ .SH HISTORY
+-The original
++4BSD (1980)
+ .I curses
+-in 4BSD (1980) introduced
++introduced
+ .IR \%waddch "."
+ .PP
+ SVr3 (1987)
+Index: man/curs_addstr.3x
+Prereq:  1.49 
+--- ncurses-6.5-20240615+/man/curs_addstr.3x	2024-06-01 22:29:08.000000000 +0000
++++ ncurses-6.5-20240622/man/curs_addstr.3x	2024-06-22 21:26:53.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addstr.3x,v 1.49 2024/06/01 22:29:08 tom Exp $
+-.TH curs_addstr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addstr.3x,v 1.51 2024/06/22 21:26:53 tom Exp $
++.TH curs_addstr 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -130,6 +130,21 @@
+ X/Open Curses,
+ Issue 4 describes these functions.
+ It specifies no error conditions for them.
++.SH HISTORY
++4BSD (1980)
++.I curses
++introduced
++.I \%waddstr
++along with its variants,
++the latter defined as macros.
++.PP
++SVr3.1 (1987)
++added
++.I \%waddnstr
++(and its variants)
++redefining
++.I \%waddstr
++as a macro wrapping it.
+ .SH SEE ALSO
+ \fB\%curs_addwstr\fP(3X) describes comparable functions of the
+ .I \%ncurses
+Index: man/curs_beep.3x
+Prereq:  1.31 
+--- ncurses-6.5-20240615+/man/curs_beep.3x	2024-05-18 20:06:33.000000000 +0000
++++ ncurses-6.5-20240622/man/curs_beep.3x	2024-06-22 21:27:35.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_beep.3x,v 1.31 2024/05/18 20:06:33 tom Exp $
+-.TH curs_beep 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_beep.3x,v 1.33 2024/06/22 21:27:35 tom Exp $
++.TH curs_beep 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%beep\fP,
+ \fB\%flash\fP \-
+@@ -101,9 +101,9 @@
+ .BR OK ","
+ and X/Open Curses specifies them as doing so.
+ .SH HISTORY
+-.B beep
++.I beep
+ and
+-.B flash
++.I flash
+ appeared in SVr2 (1984).
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+Index: man/curs_get_wstr.3x
+Prereq:  1.52 
+--- ncurses-6.5-20240615+/man/curs_get_wstr.3x	2024-06-08 21:01:53.000000000 +0000
++++ ncurses-6.5-20240622/man/curs_get_wstr.3x	2024-06-22 21:34:19.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_get_wstr.3x,v 1.52 2024/06/08 21:01:53 tom Exp $
+-.TH curs_get_wstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_get_wstr.3x,v 1.54 2024/06/22 21:34:19 tom Exp $
++.TH curs_get_wstr 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -58,15 +58,15 @@
+ .nf
+ \fB#include 
+ .PP
+-\fBint get_wstr(wint_t *\fIwstr\fP);
+-\fBint getn_wstr(wint_t *\fIwstr\fP, int \fIn\fP);
+-\fBint wget_wstr(WINDOW *\fIwin\fP, wint_t *\fIwstr\fP);
+-\fBint wgetn_wstr(WINDOW *\fIwin\fP, wint_t *\fIwstr\fP, int \fIn\fP);
++\fBint get_wstr(wint_t * \fIwstr\fP);
++\fBint wget_wstr(WINDOW * \fIwin\fP, wint_t * \fIwstr\fP);
++\fBint mvget_wstr(int \fIy\fP, int \fIx\fP, wint_t * \fIwstr\fP);
++\fBint mvwget_wstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t * \fIwstr\fP);
+ .PP
+-\fBint mvget_wstr(int \fIy\fP, int \fIx\fP, wint_t *\fIwstr\fP);
+-\fBint mvgetn_wstr(int \fIy\fP, int \fIx\fP, wint_t *\fIwstr\fP, int \fIn\fP);
+-\fBint mvwget_wstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t *\fIwstr\fP);
+-\fBint mvwgetn_wstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t *\fIwstr\fP, int \fIn\fP);
++\fBint getn_wstr(wint_t * \fIwstr\fP, int \fIn\fP);
++\fBint wgetn_wstr(WINDOW * \fIwin\fP, wint_t * \fIwstr\fP, int \fIn\fP);
++\fBint mvgetn_wstr(int \fIy\fP, int \fIx\fP, wint_t * \fIwstr\fP, int \fIn\fP);
++\fBint mvwgetn_wstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t * \fIwstr\fP, int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
+ The function
+Index: man/curs_getstr.3x
+Prereq:  1.65 
+--- ncurses-6.5-20240615+/man/curs_getstr.3x	2024-06-08 21:04:32.000000000 +0000
++++ ncurses-6.5-20240622/man/curs_getstr.3x	2024-06-22 22:20:56.000000000 +0000
+@@ -27,17 +27,19 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getstr.3x,v 1.65 2024/06/08 21:04:32 tom Exp $
+-.TH curs_getstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_getstr.3x,v 1.67 2024/06/22 22:20:56 tom Exp $
++.TH curs_getstr 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
++.ds ^  \(ha
+ .\}
+ .el \{\
+ .ie t .ds `` ``
+ .el   .ds `` ""
+ .ie t .ds '' ''
+ .el   .ds '' ""
++.ds       ^  ^
+ .\}
+ .
+ .de bP
+@@ -58,97 +60,119 @@
+ .nf
+ \fB#include 
+ .PP
+-\fBint getstr(char *\fIstr\fP);
+-\fBint getnstr(char *\fIstr\fP, int \fIn\fP);
+-\fBint wgetstr(WINDOW *\fIwin\fP, char *\fIstr\fP);
+-\fBint wgetnstr(WINDOW *\fIwin\fP, char *\fIstr\fP, int \fIn\fP);
+-.PP
+-\fBint mvgetstr(int \fIy\fP, int \fIx\fP, char *\fIstr\fP);
+-\fBint mvwgetstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, char *\fIstr\fP);
+-\fBint mvgetnstr(int \fIy\fP, int \fIx\fP, char *\fIstr\fP, int \fIn\fP);
+-\fBint mvwgetnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, char *\fIstr\fP, int \fIn\fP);
++\fBint getstr(char * \fIstr\fP);
++\fBint wgetstr(WINDOW * \fIwin\fP, char * \fIstr\fP);
++\fBint mvgetstr(int \fIy\fP, int \fIx\fP, char * \fIstr\fP);
++\fBint mvwgetstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, char * \fIstr\fP);
++.PP
++\fBint getnstr(char * \fIstr\fP, int \fIn\fP);
++\fBint wgetnstr(WINDOW * \fIwin\fP, char * \fIstr\fP, int \fIn\fP);
++\fBint mvgetnstr(int \fIy\fP, int \fIx\fP, char * \fIstr\fP, int \fIn\fP);
++\fBint mvwgetnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, char * \fIstr\fP, int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
++.B \%wgetstr
++populates a user-supplied string buffer
++.I str
++by repeatedly calling \fBwgetch\fP(3X)
++with the
++.I win
++argument
++until a line feed or carriage return character is input.
++.\" Of the two, because wgetnstr() calls nl(), only a line feed (\n)
++.\" will ever be returned by wgetch().
+ The function
+-\fBwgetnstr\fP
+-is equivalent to a series of calls to
+-\fBwgetch\fP(3X),
+-until a newline or carriage return terminates the series:
+ .bP
+-The terminating character is not included in the returned string.
++does not copy the terminating character to
++.IR str ";"
+ .bP
+-In all instances, the end of the string is terminated
+-by a NUL.
+-.bP
+-The function stores the result in the area pointed to
+-by the \fIstr\fP parameter.
+-.bP
+-The function reads at most \fIn\fP characters,
+-thus preventing a possible overflow of the input buffer.
+-.IP
+-Any attempt to enter more characters
+-(other than the terminating newline or carriage return)
+-causes a beep.
+-.IP
+-Function keys also cause a beep and are ignored.
++always terminates
++.I str
++with a null character;
++.bP
++interprets the screen's erase and kill characters
++(see \fB\%erasechar\fP(3X) and \fB\%killchar\fP(3X));
++.bP
++recognizes function keys only if the screen's keypad option is enabled
++(see \fB\%keypad\fP(3X));
++.bP
++treats the function keys
++.B \%KEY_LEFT
++and
++.B \%KEY_BACKSPACE
++the same as the erase character;
++and
++.bP
++discards function key inputs other than those treated as the erase
++character,
++calling \fBbeep\fP(3X).
++.PP
++The erase character replaces the character at the end of the buffer with
++a null character,
++while the kill character does the same for the entire buffer.
++.PP
++If the screen's echo option is enabled
++(see \fBecho\fP(3X)),
++.B \%wgetstr
++updates
++.I win
++with \fB\%wechochar\fP(3X).
++Further,
++.bP
++the erase character
++and its function key synonyms
++move the cursor to the left,
++and
++.bP
++the kill character returns the cursor to where it was located when
++.B \%wgetstr
++was called.
++.PP
++.B \%wgetnstr
++is similar,
++but reads at most
++.I n
++characters,
++aiding the application to avoid overrunning the buffer to which
++.I str
++points.
++An attempt to input more than
++.I n
++characters
++(other than the terminating line feed or carriage return)
++is ignored with a beep.
+ .PP
+-The user's \fIerase\fP and \fIkill\fP characters are interpreted:
+-.bP
+-The \fIerase\fP character (e.g., \fB^H\fP) erases the character
+-at the end of the buffer, moving the cursor to the left.
+-.IP
+-If \fIkeypad\fP mode is on for the window,
+-\fBKEY_LEFT\fP and \fBKEY_BACKSPACE\fP
+-are both considered equivalent to the user's \fIerase\fP 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\fP is currently on.
+-In that case,
+-backspace is echoed as deletion of the previous character
+-(typically a left motion).
+-.PP
+-The
+-\fBgetnstr\fP,
+-\fBmvgetnstr\fP,
+-\fBmvwgetnstr\fP, and
+-\fBwgetnstr\fP
+-functions are identical
+-to the
+-\fBgetstr\fP,
+-\fBmvgetstr\fP,
+-\fBmvwgetstr\fP, and
+-\fBwgetstr\fP
+-functions, respectively,
+-except that the
+-\fB*n*\fP
+-versions read at most
+-\fIn\fP
+-characters, letting the application prevent overflow of the
+-input buffer.
++\fB\%ncurses\fP(3X) describes the variants of these functions.
+ .SH RETURN VALUE
+-All of these functions return the integer \fBOK\fP upon successful completion.
+-(SVr4 specifies only \*(``an integer value other than \fBERR\fP\*('')
+-If unsuccessful, they return \fBERR\fP.
+-.PP
+-X/Open defines no error conditions.
++These functions return
++.B OK
++on success and
++.B ERR
++on failure.
+ .PP
+-In this implementation,
+-these functions return
++In
++.IR \%ncurses ","
++they return
+ .B ERR
++if
+ .bP
+-if the window pointer is null,
+-.bP
+-if its timeout expires without having any data, or
+-.bP
+-if the associated call to
+-\fBwgetch\fP
+-failed.
+-.PP
+-This implementation provides an extension as well.
+-If a \fBSIGWINCH\fP interrupts the function, it will return \fBKEY_RESIZE\fP
+-rather than \fBOK\fP or \fBERR\fP.
++.I win
++is
++.BR NULL ","
++or
++.bP
++if an internal
++.B \%wgetch
++call fails.
++.PP
++Further,
++in
++.IR \%ncurses ","
++these functions return
++.B \%KEY_RESIZE
++if a
++.B \%SIGWINCH
++event interrupts the function.
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+@@ -156,138 +180,307 @@
+ .IR x )
+ is outside the window boundaries.
+ .SH NOTES
+-Any of these functions other than
+-\fBwgetnstr\fP
+-may be macros.
+-.PP
+-Using
+-\fBgetstr\fP,
+-\fBmvgetstr\fP,
+-\fBmvwgetstr\fP, or
+-\fBwgetstr\fP
+-to read a line that
+-overflows the array pointed to by
+-\fBstr\fP
+-causes undefined
+-results.
+-The use of
+-\fBgetnstr\fP,
+-\fBmvgetnstr\fP,
+-\fBmvwgetnstr\fP, or
+-\fBwgetnstr\fP,
+-respectively, is recommended.
++All of these functions except
++.B \%wgetnstr
++may be implemented as macros.
++.PP
++Use of
++.BR \%getstr ","
++.BR \%mvgetstr ","
++.BR \%mvwgetstr ","
++or
++.B \%wgetstr
++to read input that
++overruns the buffer pointed to by
++.I str
++causes undefined results.
++Use their
++.BR n -infixed
++counterpart functions instead.
++.PP
++While
++.B \%wgetnstr
++is conceptually a series of calls to
++.BR \%wgetch ","
++it also temporarily changes properties of the
++.I curses
++screen to permit simple editing of the input buffer.
++It saves the screen's state and then calls \fBnl\fP(3X) and,
++if the screen was in normal (\*(``cooked\*('') mode,
++\fB\%cbreak\fP(3X).
++Before returning,
++it restores the saved screen state.
++Other implementations differ in detail,
++affecting which control characters they can accept in the buffer;
++see section \*(``PORTABILITY\*('' below.
++.SH EXTENSIONS
++The return value
++.B \%KEY_RESIZE
++is an
++.I \%ncurses
++extension.
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions.
+-It specifies no error conditions for them.
+-.PP
+-SVr3 and early SVr4 curses implementations did not reject function keys;
+-the SVr4.0 documentation claimed that \*(``special keys\*(''
++Applications employing
++.I \%ncurses
++extensions should condition their use on the visibility of the
++.B \%NCURSES_VERSION
++preprocessor macro.
++.PP
++X/Open Curses Issue 4 describes these functions.
++It specifies no error conditions for them,
++but indicates that
++.I \%wgetnstr
++and its variants read
++\*(``the entire multi-byte sequence associated with a character\*(''
++and \*(``fail\*('' if
++.I n
++and
++.I str
++together do not describe a buffer
++\*(``large enough to contain any complete characters\*(''.
++In
++.IR \%ncurses ","
++however,
++.I \%wgetch
++reads only single-byte characters,
++so this scenario does not arise.
++.\" You can pass ncurses wgetnstr n=0 and it will beep at you with each
++.\" key stroke.
++.PP
++SVr4
++.I curses
++describes a successful return value only as
++\*(``an integer value other than
++.BR ERR \*(''.
++.PP
++SVr3 and early SVr4
++.I curses
++implementations did not reject function keys;
++the SVr4 documentation asserted that,
++like the screen's erase and kill characters,
++they were
++.PP
++.RS
++interpreted,
++as well as any special keys
+ (such as function keys,
+ \*(``home\*('' key,
+ \*(``clear\*('' key,
+-\fIetc\fP.) are \*(``interpreted\*('',
+-without giving details.
++.IR etc. )
++.\" SVID 4, Volume 3, p. 495
++.RE
++.PP
++without further detail.
+ 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\fP, \fBmvgetnstr\fP, and \fBmvwgetnstr\fP were
+-present but not documented in SVr4.
+-.PP
+-X/Open Curses, Issue 5 (2007) stated that these functions
+-\*(``read at most \fIn\fP bytes\*(''
+-but did not state whether the terminating NUL counted toward that limit.
+-X/Open Curses, Issue 7 (2009) changed that to say they
+-\*(``read at most \fIn\fP\-1 bytes\*(''
+-to allow for the terminating NUL.
+-As of 2018, some implementations count it, some do not:
+-.bP
+-\fI\%ncurses\fP 6.1 and PDCurses do not count the NUL in the given limit, while
+-.bP
+-Solaris SVr4 and NetBSD curses count the NUL as part of the limit.
+-.bP
+-Solaris xcurses provides both:
+-its wide-character \fBwget_nstr\fP reserves a NUL,
+-but its \fBwgetnstr\fP does not count the NUL consistently.
+-.PP
+-In SVr4 curses,
+-a negative value of \fIn\fP tells \fBwgetnstr\fP to assume that the
+-caller's buffer is large enough to hold the result,
+-i.e., to act like \fBwgetstr\fP.
+-X/Open Curses does not mention this
+-(or anything related to negative or zero values of \fIn\fP),
+-however most implementations
+-use the feature, with different limits:
+-.bP
+-Solaris SVr4 curses and PDCurses limit the result to 255 bytes.
+-Other Unix systems than Solaris are likely to use the same limit.
+-.bP
+-Solaris xcurses limits the result to \fBLINE_MAX\fP bytes.
+-.bP
+-NetBSD 7 assumes no particular limit for the result from \fBwgetstr\fP.
+-However, it limits the \fBwgetnstr\fP parameter \fIn\fP to ensure
+-that it is greater than zero.
+-.IP
+-A comment in NetBSD's source code states that this is specified in SUSv2.
+-.bP
+-\fI\%ncurses\fP (before 6.2) assumes no particular limit for the result
+-from \fBwgetstr\fP, and treats the \fIn\fP parameter of \fBwgetnstr\fP
+-like SVr4 curses.
++In fact,
++the \*(``character\*('' value
++appended to the string
++by those implementations
++was predictable but not useful \(em
++being,
++in fact,
++the low-order eight bits of the key code's
++.B KEY_
++constant value.
++(The same language,
++unchanged except for styling,
++survived into X/Open Curses Issue 4, \" p. 94 (PDF 114)
++but disappeared from Issue 7.) \" p. 105 (PDF 119)
++.PP
++X/Open Curses Issue 5 (2007) stated that these functions
++\*(``read at most
++.I n
++bytes\*(''
++but did not state whether the terminating null character
++counted toward that limit.
++X/Open Curses Issue 7 (2009) changed that to say they
++\*(``read at most
++.IR n \-1
++bytes\*(''
++to allow for the terminating null character.
++As of 2018,
++some implementations count it,
++some do not.
+ .bP
+-\fI\%ncurses\fP 6.2 uses \fBLINE_MAX\fP,
+-or a larger (system-dependent) value
+-which the \fBsysconf\fP function may provide.
+-If neither \fBLINE_MAX\fP or \fBsysconf\fP is available,
+-\fI\%ncurses\fP uses the POSIX value for \fBLINE_MAX\fP (a 2048 byte limit).
+-In either case, it reserves a byte for the terminating NUL.
+-.PP
+-Although \fBgetnstr\fP is equivalent to a series of calls to \fBgetch\fP,
+-it also makes changes to the curses modes to allow simple editing of
+-the input buffer:
+-.bP
+-\fBgetnstr\fP saves the current value of the \fBnl\fP, \fBecho\fP,
+-\fBraw\fP and \fBcbreak\fP modes, and sets
+-\fBnl\fP,
+-\fBnoecho\fP,
+-\fBnoraw\fP, and
+-\fBcbreak\fP.
+-.IP
+-\fBgetnstr\fP handles the echoing of characters,
+-rather than relying on the caller to set an appropriate mode.
++.I \%ncurses
++6.1 and
++.I PDCurses
++do not count the null character toward the limit,
++while Solaris and NetBSD
++.I curses
++do.
++.bP
++Solaris
++.I xcurses
++offers both behaviors:
++its wide-character
++.I \%wgetn_wstr
++reserves room for a wide null character,
++but its non-wide
++.I \%wgetnstr
++does not consistently count a null character toward the limit.
++.PP
++In SVr4
++.IR curses ","
++a negative
++.I n
++tells
++.I \%wgetnstr
++to assume that the caller's buffer
++is large enough to hold the result;
++that is,
++the function then acts like
++.IR \%wgetstr "."
++X/Open Curses does not mention this behavior
++(or anything related to nonpositive
++.I n
++values),
++however most
++.I curses
++libraries implement it.
++Most implementations nevertheless enforce an upper limit
++on the count of bytes they write to the destination buffer
++.IR str "."
++.bP
++BSD
++.I curses
++lacked
++.IR \%wgetnstr ","
++and its
++.I \%wgetstr
++wrote to
++.I str
++unboundedly,
++.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/src/lib/\
++.\"   libcurses/getstr.c
++.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4.4BSD/usr/src/lib/\
++.\"   libcurses/getstr.c
++as did that in SVr2.
++.\" https://github.com/ryanwoodsmall/oldsysv/blob/master/sysvr2-vax/\
++.\"   src/lib/libcurses/screen/getstr.c
++.bP
++.IR PDCurses ","
++and
++SVr3.1,
++SVr4,
++and
++Solaris
++.I curses
++limit both functions to writing 256 bytes.
++Other System\ V-based platforms likely use the same limit.
++.\" https://github.com/ryanwoodsmall/oldsysv/blob/master/\
++.\"   sysvr3/31/usr/src/lib/libcurses/screen/wgetstr.c#L10
++.\"   sysvr4/svr4/lib/xlibcurses/screen/wgetstr.c#L12
++.bP
++Solaris
++.I xcurses
++limits the write to
++.B LINE_MAX
++bytes.
++.bP
++NetBSD 7
++.I curses
++imposes no particular limit on the length of the write,
++but does validate
++.I n
++to ensure that it is greater than zero.
++A comment in NetBSD's source code asserts that SUSv2 specifies this.
+ .bP
+-It also obtains the \fIerase\fP and \fIkill\fP characters
+-from \fBerasechar\fP and \fBkillchar\fP, respectively.
++.I \%ncurses
++prior to 6.2 (2020)
++imposes no limit on the length of the write,
++and treats
++.IR wgetnstr 's
++.I n
++parameter as SVr4
++.I curses
++does.
+ .bP
+-On return, \fBgetnstr\fP restores the modes to their previous values.
+-.PP
+-Other implementations differ in their treatment of special characters:
+-.bP
+-While they may set the \fIecho\fP mode,
+-other implementations do not modify the \fIraw\fP mode,
+-They may take the \fIcbreak\fP
+-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 \fI\%ncurses\fP
+-(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 \fI\%ncurses\fP.
++.I \%ncurses
++6.2 uses
++.B LINE_MAX
++or a larger (system-dependent) value
++provided by \fI\%sysconf\fP(3).
++If neither
++.B LINE_MAX
++nor
++.I \%sysconf
++is available,
++.I \%ncurses
++uses the POSIX minimum value for
++.B LINE_MAX
++(2048). \" _POSIX2_LINE_MAX
++In either case,
++it reserves a byte for the terminating null character.
++.PP
++Implementations vary in their handling of input control characters.
++.bP
++While they may enable the screen's echo option,
++some do not take it out of raw mode,
++and may take cbreak mode into account
++when deciding whether to handle echoing within
++.I \%wgetnstr
++or to rely on it as a side effect of calling
++.IR \%wgetch "."
++.bP
++Originally,
++.IR \%ncurses ","
++like its progenitor
++.IR \%pcurses ","
++had its
++.I \%wgetnstr
++call
++.I \%noraw
++and
++.I \%cbreak
++before accepting input.
++That may have been done to make function keys work;
++it is not necessary with modern
++.IR \%ncurses "."
+ .IP
+ Since 1995,
+-\fI\%ncurses\fP has provided signal handlers for INTR and QUIT
+-(e.g., \fB^C\fP or \fB^\e\fP).
+-With the \fBnoraw\fP and \fBcbreak\fP settings,
+-those may catch a signal and stop the program,
+-where other implementations allow one to enter those characters in the buffer.
+-.bP
+-Starting in 2021
+-(\fI\%ncurses\fP 6.3),
+-\fBgetnstr\fP sets \fBraw\fP,
+-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.
++.I \%ncurses
++has provided handlers for
++.B SIGINTR
++and
++.B SIGQUIT
++events,
++which are typically generated at the keyboard with
++.B \*^C
++and
++.B \*^\e
++respectively.
++In cbreak mode,
++those handlers catch a signal and stop the program,
++whereas other implementations write those characters into the buffer.
++.bP
++Starting with
++.I \%ncurses
++6.3 (2021),
++.I \%wgetnstr
++preserves raw mode if the screen was already in that state,
++allowing one to enter the characters the terminal interprets
++as interrupt and quit events
++into the buffer,
++for better compatibility with SVr4
++.IR curses "."
++.SH HISTORY
++4BSD (1980)
++.I curses
++introduced
++.I \%wgetstr
++along with its variants.
++.PP
++SVr3.1 (1987)
++added
++.IR \%wgetnstr ","
++but none of its variants.
++.PP
++X/Open Curses Issue 4 (1995) specified
++.IR \%getnstr ","
++.IR \%mvwgetnstr ","
++and
++.IR \%mvgetnstr "."
+ .SH SEE ALSO
+ \fB\%curs_get_wstr\fP(3X) describes comparable functions of the
+ .I \%ncurses
+@@ -295,6 +488,7 @@
+ .RI \%( ncursesw ).
+ .PP
+ \fB\%curses\fP(3X),
++\fB\%curs_addch\fP(3X),
+ \fB\%curs_getch\fP(3X),
+-\fB\%curs_termattrs\fP(3X),
+-\fB\%curs_variables\fP(3X)
++\fB\%curs_inopts\fP(3X), \" echo(), keypad()
++\fB\%curs_termattrs\fP(3X), \" erasechar(), killchar()
+Index: man/curs_kernel.3x
+Prereq:  1.65 
+--- ncurses-6.5-20240615+/man/curs_kernel.3x	2024-06-08 21:00:58.000000000 +0000
++++ ncurses-6.5-20240622/man/curs_kernel.3x	2024-06-22 21:24:26.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_kernel.3x,v 1.65 2024/06/08 21:00:58 tom Exp $
+-.TH curs_kernel 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_kernel.3x,v 1.67 2024/06/22 21:24:26 tom Exp $
++.TH curs_kernel 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -198,8 +198,10 @@
+ call
+ .BR \%reset_prog_mode ";"
+ and finally call
+-.B \%mvcur
+-to set the cursor's location to where
++.BR \%mvcur( ".\|.\|." ,
++.RB .\|.\|. ,
++.B \-1, \-1)
++to move the terminal cursor to where
+ .I \%curses
+ thinks it is,
+ since the library has no knowledge of how the external application
+Index: man/curs_pad.3x
+Prereq:  1.63 
+--- ncurses-6.5-20240615+/man/curs_pad.3x	2024-05-25 20:10:58.000000000 +0000
++++ ncurses-6.5-20240622/man/curs_pad.3x	2024-06-22 22:20:03.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_pad.3x,v 1.63 2024/05/25 20:10:58 tom Exp $
+-.TH curs_pad 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_pad.3x,v 1.65 2024/06/22 22:20:03 tom Exp $
++.TH curs_pad 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -87,7 +87,8 @@
+ .B \%pnoutrefresh
+ instead.
+ .SS newpad
+-\fB\%newpad\fP creates and returns a pointer to a new pad data structure
++.B \%newpad
++creates and returns a pointer to a new pad data structure
+ with the given number of lines,
+ .IR nlines ,
+ and columns,
+@@ -114,7 +115,7 @@
+ before calling
+ .BR \%prefresh .
+ .SS "prefresh, pnoutrefresh"
+-.B \%prefresh\fP
++.B \%prefresh
+ and
+ .B \%pnoutrefresh
+ are analogous to \fB\%wrefresh\fP(3X) and \fB\%wnoutrefresh\fP(3X)
+@@ -156,7 +157,7 @@
+ written to the pad is used to populate the arguments to
+ .BR \%prefresh .
+ .SS pecho_wchar
+-.B \%pecho_wchar\fP
++.B \%pecho_wchar
+ is functionally equivalent to calling \fB\%wadd_wch\fP(3X) followed by
+ .BR \%prefresh .
+ It suggests to the
+@@ -168,20 +169,28 @@
+ written to the pad is used to populate the arguments to
+ .BR \%prefresh .
+ .SH RETURN VALUE
+-Functions that return an integer return \fBERR\fP upon failure and
+-\fBOK\fP
++Functions that return an integer return
++.B ERR
++upon failure and
++.B OK
+ (SVr4 specifies only
+-\*(``an integer value other than \fBERR\fP\*('')
++\*(``an integer value other than
++.BR ERR \*('')
+ upon successful completion.
+ .PP
+-Functions that return pointers return \fBNULL\fP on error,
+-and set \fB\%errno\fP to \fB\%ENOMEM\fP.
++Functions that return pointers return
++.B NULL
++on error,
++and set
++.I \%errno
++to
++.BR \%ENOMEM "."
+ .PP
+ X/Open Curses does not specify any error conditions.
+ In this implementation
+ .RS 3
+ .TP 5
+-\fB\%prefresh\fP and \fB\%pnoutrefresh\fP
++.BR prefresh\  and\  pnoutrefresh
+ return
+ .B ERR
+ if the window pointer is null, or
+@@ -189,24 +198,33 @@
+ if the area to refresh extends off-screen or
+ if the minimum coordinates are greater than the maximum.
+ .TP 5
+-\fBpechochar\fP
++.B pechochar
+ returns
+ .B ERR
+-if the window is not really a pad, and the associated call
+-to \fB\%wechochar\fP returns
++if the window is not really a pad,
++and the associated call to
++.B \%wechochar
++returns
+ .BR ERR "."
+ .TP 5
+-\fBpecho_wchar\fP
++.B pecho_wchar
+ returns
+ .B ERR
+-if the window is not really a pad, and the associated call
+-to \fB\%wecho_wchar\fP returns
++if the window is not really a pad,
++and the associated call to
++.B \%wecho_wchar
++returns
+ .BR ERR "."
+ .RE
+ .SH NOTES
+-\fB\%pechochar\fP may be a macro.
++.B \%pechochar
++may be a macro.
+ .SH PORTABILITY
+-BSD \fIcurses\fP has no \fIpad\fP feature.
++BSD
++.I curses
++has no
++.I pad
++feature.
+ .PP
+ SVr2 \fIcurses\fP (1986) provided the \fB\%newpad\fP and related functions,
+ documenting them in a single line each.
+Index: man/curs_slk.3x
+Prereq:  1.73 
+--- ncurses-6.5-20240615+/man/curs_slk.3x	2024-05-25 20:10:58.000000000 +0000
++++ ncurses-6.5-20240622/man/curs_slk.3x	2024-06-22 21:25:23.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_slk.3x,v 1.73 2024/05/25 20:10:58 tom Exp $
+-.TH curs_slk 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_slk.3x,v 1.75 2024/06/22 21:25:23 tom Exp $
++.TH curs_slk 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -135,9 +135,9 @@
+ \fBLINES\fP and the vertical size of \fB\%stdscr\fP are further reduced.
+ .SS Labels
+ Populate the labels with normal strings
+-(\fB\%slk_set\fP)
++\%(\fBslk_set\fP)
+ or wide-character strings
+-(\fB\%slk_wset\fP).
++\%(\fBslk_wset\fP).
+ Each function takes three parameters.
+ .TP 8 \" "labnum" + 2n
+ .I labnum
+Index: man/curs_termcap.3x
+Prereq:  1.85 
+--- ncurses-6.5-20240615+/man/curs_termcap.3x	2024-04-20 19:13:12.000000000 +0000
++++ ncurses-6.5-20240622/man/curs_termcap.3x	2024-06-22 21:28:07.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_termcap.3x,v 1.85 2024/04/20 19:13:12 tom Exp $
+-.TH curs_termcap 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_termcap.3x,v 1.87 2024/06/22 21:28:07 tom Exp $
++.TH curs_termcap 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -275,7 +275,7 @@
+ Error conditions include:
+ .bP
+ uninitialized state
+-(\fB\%tgetent\fP was not called successfully),
++\%(\fBtgetent\fP was not called successfully),
+ .bP
+ .I cap
+ being a null pointer,
+@@ -421,7 +421,7 @@
+ the BSD sources included two different \fI\%termcap.h\fP header files
+ over time.
+ .bP
+-One was used internally by \fBjove\fP(1) from 4.3BSD onward.
++One was used internally by \fIjove\fP(1) from 4.3BSD onward.
+ .\" 2BSD became a branch retaining support for non-virtual memory
+ .\" systems (such as the PDP-11) whereas most BSD development focused on
+ .\" the VAX and other VM-enabled systems starting with 3BSD.
+@@ -466,11 +466,11 @@
+ \fI\%ncurses\fP 1.8.1
+ (November 1993)
+ provided a \fI\%termcap.h\fP file.
+-It reflected influence from GNU \fItermcap\fP and \fBemacs\fP(1)
+-(rather than \fBjove\fP(1)),
++It reflected influence from GNU \fItermcap\fP and \fI\%emacs\fP(1)
++(rather than \fIjove\fP(1)),
+ providing the following interface:
+ .bP
+-global symbols used by \fIemacs\fP,
++global symbols used by \fI\%emacs\fP,
+ .bP
+ \fIconst\fP-qualified function prototypes,
+ and
+Index: man/curs_util.3x
+Prereq:  1.110 
+--- ncurses-6.5-20240615+/man/curs_util.3x	2024-06-15 20:20:12.000000000 +0000
++++ ncurses-6.5-20240622/man/curs_util.3x	2024-06-22 21:25:23.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_util.3x,v 1.110 2024/06/15 20:20:12 tom Exp $
+-.TH curs_util 3X 2024-06-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_util.3x,v 1.112 2024/06/22 21:25:23 tom Exp $
++.TH curs_util 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -264,8 +264,8 @@
+ .bP
+ the data written is a copy of the \fI\%WINDOW\fP structure,
+ and its associated character cells.
+-The format differs between the wide-character (\fI\%ncursesw\fP) and
+-non-wide (\fI\%ncurses\fP) libraries.
++The format differs between the wide-character \%(\fIncursesw\fP) and
++non-wide \%(\fIncurses\fP) libraries.
+ You can transfer data between the two,
+ however.
+ .bP
+Index: man/curs_variables.3x
+Prereq:  1.47 
+--- ncurses-6.5-20240615+/man/curs_variables.3x	2024-04-13 22:37:35.000000000 +0000
++++ ncurses-6.5-20240622/man/curs_variables.3x	2024-06-22 21:25:23.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_variables.3x,v 1.47 2024/04/13 22:37:35 tom Exp $
+-.TH curs_variables 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_variables.3x,v 1.49 2024/06/22 21:25:23 tom Exp $
++.TH curs_variables 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -285,7 +285,7 @@
+ \fI\%ncurses\fP uses the value of \fB\%TABSIZE\fP only to update the
+ virtual screen.
+ It uses the terminal description's \*(``\fBit\fP\*(''
+-(\fB\%init_tabs\fP) capability for computing hardware tabs
++\%(\fBinit_tabs\fP) capability for computing hardware tabs
+ (that is,
+ tab stops on the physical screen).
+ .bP
+Index: man/man_db.renames.in
+Prereq:  1.76 
+--- ncurses-6.5-20240615+/man/man_db.renames.in	2024-06-08 20:52:35.000000000 +0000
++++ ncurses-6.5-20240622/man/man_db.renames.in	2024-06-22 22:20:56.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: man_db.renames.in,v 1.76 2024/06/08 20:52:35 Branden.Robinson Exp $
++# $Id: man_db.renames.in,v 1.77 2024/06/22 22:20:56 tom Exp $
+ # Manual-page renamings for the man_db program
+ #
+ # Files:
+@@ -178,6 +178,7 @@
+ attr_on.3x			attr_on.3ncurses
+ attron.3x			attron.3ncurses
+ baudrate.3x			baudrate.3ncurses
++beep.3x				beep.3ncurses
+ bkgd.3x				bkgd.3ncurses
+ bkgrnd.3x			bkgrnd.3ncurses
+ cbreak.3x			cbreak.3ncurses
+@@ -217,6 +218,7 @@
+ is_scrollok.3x			is_scrollok.3ncurses
+ keyname.3x			keyname.3ncurses
+ keypad.3x			keypad.3ncurses
++killchar.3x			killchar.3ncurses
+ leaveok.3x			leaveok.3ncurses
+ longname.3x			longname.3ncurses
+ meta.3x				meta.3ncurses
+Index: man/manhtml.aliases
+Prereq:  1.39 
+--- ncurses-6.5-20240615+/man/manhtml.aliases	2024-06-08 23:34:02.000000000 +0000
++++ ncurses-6.5-20240622/man/manhtml.aliases	2024-06-22 23:03:10.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: manhtml.aliases,v 1.39 2024/06/08 23:34:02 tom Exp $
++# $Id: manhtml.aliases,v 1.41 2024/06/22 23:03:10 tom Exp $
+ #***************************************************************************
+ # Copyright 2019-2023,2024 Thomas E. Dickey                                *
+ # Copyright 2013,2017 Free Software Foundation, Inc.                       *
+@@ -35,6 +35,7 @@
+ attr_on(3X)		curs_attr(3X)
+ attron(3X)		curs_attr(3X)
+ baudrate(3X)		curs_termattrs(3X)
++beep(3X)		curs_beep(3X)
+ bkgd(3X)		curs_bkgd(3X)
+ bkgrnd(3X)		curs_bkgrnd(3X)
+ cbreak(3X)		curs_inopts(3X)
+@@ -68,7 +69,9 @@
+ inch(3X)		curs_inch(3X)
+ infocmp(1)		infocmp(1M)
+ initscr(3X)		curs_initscr(3X)
++is_cbreak(3X)		curs_inopts(3X)
+ is_scrollok(3X)		curs_opaque(3X)
++killchar(3X)		curs_termattrs(3X)
+ keyname(3X)		curs_util(3X)
+ keypad(3X)		curs_inopts(3X)
+ longname(3X)		curs_termattrs(3X)
+Index: man/manhtml.externs
+Prereq:  1.27 
+--- ncurses-6.5-20240615+/man/manhtml.externs	2024-06-15 20:24:43.000000000 +0000
++++ ncurses-6.5-20240622/man/manhtml.externs	2024-06-22 22:20:56.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: manhtml.externs,v 1.27 2024/06/15 20:24:43 tom Exp $
++# $Id: manhtml.externs,v 1.28 2024/06/22 22:20:56 tom Exp $
+ # Items in this list will not be linked by man2html
+ #***************************************************************************
+ # Copyright 2019-2023,2024 Thomas E. Dickey                                *
+@@ -72,6 +72,7 @@
+ stdio(3)
+ stty(1)
+ swprintf(3)
++sysconf(3)
+ system(3)
+ termios(3)
+ tmux(1)
+Index: man/ncurses.3x
+Prereq:  1.223 
+--- ncurses-6.5-20240615+/man/ncurses.3x	2024-06-08 20:45:43.000000000 +0000
++++ ncurses-6.5-20240622/man/ncurses.3x	2024-06-22 22:14:58.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: ncurses.3x,v 1.223 2024/06/08 20:45:43 tom Exp $
+-.TH ncurses 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: ncurses.3x,v 1.225 2024/06/22 22:14:58 tom Exp $
++.TH ncurses 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -121,8 +121,8 @@
+ such as limitations on the size of an underlying integral type or the
+ availability of a preprocessor macro exclusive of a function definition
+ (which prevents its address from being taken).
+-This section also describes implementation details that will be
+-significant to the programmer but which are not standardized.
++This section also describes implementation details
++of significance to the programmer but which are not standardized.
+ .bP
+ \*(``EXTENSIONS\*('' presents
+ .I \%ncurses
+@@ -170,13 +170,12 @@
+ respectively.)
+ The
+ .I \%ncurses_g
+-library generates trace logs
+-(in a file called
+-.I \%trace
+-in the current directory)
+-that describe
++library logs events describing
+ .I \%ncurses
+-actions.
++actions
++to a file called
++.I \%trace
++in the current directory.
+ See section \*(``ALTERNATE CONFIGURATIONS\*('' below.
+ .SS "Application Structure"
+ A
+@@ -229,10 +228,27 @@
+ .SS Overview
+ A
+ .I curses
+-library abstracts the terminal screen by representing all or part of it
+-as a
++library abstracts the terminal with a
++.I \%SCREEN
++data structure,
++and represents all or part of its display
++with
+ .I \%WINDOW
+-data structure.
++structures.
++Distinct properties apply to each;
++for example,
++the
++.I "line discipline"
++of a typical Unix terminal driver
++is in one of three modes:
++raw,
++\%cbreak,
++or normal (\*(``cooked\*('').
++In
++.IR curses ","
++the line discipline is a property of the screen,
++applying identically to all windows associated with it.
++.PP
+ A
+ .I window
+ is a rectangular grid of character cells,
+@@ -1933,9 +1949,12 @@
+ An
+ .I \%ncurses
+ application can eschew knowledge of
++.I \%SCREEN
++and
+ .I \%WINDOW
+ structure internals,
+ instead using accessor functions such as
++\fB\%is_cbreak\fP(3X) and
+ \fB\%is_scrollok\fP(3X).
+ .PP
+ .I \%ncurses
+@@ -2002,7 +2021,9 @@
+ .I \%ncurses
+ intends base-level conformance with X/Open Curses,
+ and supports all features of its enhanced level
+-except the \fB\%untic\fP utility.
++except the
++.I \%untic
++utility.
+ .PP
+ Differences between X/Open Curses and
+ .I \%ncurses
+Index: man/tabs.1
+Prereq:  1.59 
+--- ncurses-6.5-20240615+/man/tabs.1	2024-04-20 19:08:15.000000000 +0000
++++ ncurses-6.5-20240622/man/tabs.1	2024-06-22 22:15:32.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tabs.1,v 1.59 2024/04/20 19:08:15 tom Exp $
+-.TH @TABS@ 1 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: tabs.1,v 1.61 2024/06/22 22:15:32 tom Exp $
++.TH @TABS@ 1 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -341,9 +341,9 @@
+ It claims that
+ .PP
+ .RS 4
+-\*(``no known historical version of
++no known historical version of
+ .I tabs
+-supports the capability of setting arbitrary tab stops.\*(''
++supports the capability of setting arbitrary tab stops.
+ .RE
+ .PP
+ The feature described in subsection \*(``Explicit Lists\*('' above was
+Index: man/terminfo.tail
+Prereq:  1.150 
+--- ncurses-6.5-20240615+/man/terminfo.tail	2024-06-08 20:42:50.000000000 +0000
++++ ncurses-6.5-20240622/man/terminfo.tail	2024-06-22 21:25:23.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: terminfo.tail,v 1.150 2024/06/08 20:42:50 Branden.Robinson Exp $
++.\" $Id: terminfo.tail,v 1.151 2024/06/22 21:25:23 tom Exp $
+ .ps +1
+ .SS "User-Defined Capabilities"
+ .
+@@ -2076,7 +2076,7 @@
+ and \fI\%ncurses\fP support all SVr4 capabilities.
+ .bP
+ IRIX supports the SVr4 set and adds one undocumented extended string
+-capability (\fB\%set_pglen\fP).
++capability \%(\fBset_pglen\fP).
+ .bP
+ SVr1 and Ultrix support a restricted subset of \fI\%terminfo\fP
+ capabilities.
+Index: man/tput.1
+Prereq:  1.116 
+--- ncurses-6.5-20240615+/man/tput.1	2024-06-08 20:50:34.000000000 +0000
++++ ncurses-6.5-20240622/man/tput.1	2024-06-22 21:28:35.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tput.1,v 1.116 2024/06/08 20:50:34 tom Exp $
+-.TH @TPUT@ 1 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: tput.1,v 1.118 2024/06/22 21:28:35 tom Exp $
++.TH @TPUT@ 1 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -885,8 +885,13 @@
+ the \*(``reset\*('' features of the two programs are (mostly) the same.
+ Two minor differences remain.
+ .bP
+-The \fB\%@TSET@\fP program waits one second when resetting,
+-in case the terminal happens to be a hardware device.
++When issuing a reset,
++the \fB\%@TSET@\fP program
++checks whether the device appears to be a pseudoterminal
++(as might be used by a terminal emulator program),
++and,
++if it does not,
++waits one second in case it is communicating with a hardware terminal.
+ .bP
+ The two programs write the terminal initialization strings
+ to different streams;
+Index: misc/gen-pkgconfig.in
+Prereq:  1.56 
+--- ncurses-6.5-20240615+/misc/gen-pkgconfig.in	2022-10-08 16:45:20.000000000 +0000
++++ ncurses-6.5-20240622/misc/gen-pkgconfig.in	2024-06-22 21:02:53.000000000 +0000
+@@ -1,7 +1,7 @@
+ #!@SHELL@
+-# $Id: gen-pkgconfig.in,v 1.56 2022/10/08 16:45:20 tom Exp $
++# $Id: gen-pkgconfig.in,v 1.57 2024/06/22 21:02:53 tom Exp $
+ ##############################################################################
+-# Copyright 2018-2021,2022 Thomas E. Dickey                                  #
++# Copyright 2018-2022,2024 Thomas E. Dickey                                  #
+ # Copyright 2009-2015,2018 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -92,7 +92,7 @@
+ 	-specs*) # ignore linker specs-files which were used to build library
+ 		continue
+ 		;;
+-	-Wl,-z,*) # ignore flags used to manipulate shared image
++	-Wl,-z*) # ignore flags used to manipulate shared image
+ 		continue
+ 		;;
+ 	-Wl,--dynamic-linker*) # ignore ELF interpreter
+Index: misc/ncurses-config.in
+Prereq:  1.52 
+--- ncurses-6.5-20240615+/misc/ncurses-config.in	2022-07-26 21:36:28.000000000 +0000
++++ ncurses-6.5-20240622/misc/ncurses-config.in	2024-06-22 20:52:02.000000000 +0000
+@@ -1,7 +1,7 @@
+ #!@SHELL@
+-# $Id: ncurses-config.in,v 1.52 2022/07/26 21:36:28 tom Exp $
++# $Id: ncurses-config.in,v 1.53 2024/06/22 20:52:02 tom Exp $
+ ##############################################################################
+-# Copyright 2018-2021,2022 Thomas E. Dickey                                  #
++# Copyright 2018-2022,2024 Thomas E. Dickey                                  #
+ # Copyright 2006-2015,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -107,7 +107,7 @@
+ 	-specs*) # ignore linker specs-files which were used to build library
+ 		continue
+ 		;;
+-	-Wl,-z,*) # ignore flags used to manipulate shared image
++	-Wl,-z*) # ignore flags used to manipulate shared image
+ 		continue
+ 		;;
+ 	-Wl,--dynamic-linker*) # ignore ELF interpreter
+@@ -186,16 +186,57 @@
+ 		;;
+ 	# compile/link
+ 	--cflags)
+-		INCS="@PKG_CFLAGS@"
+-		if [ "x@WITH_OVERWRITE@" = xno ]; then
+-			INCS="$INCS -I${includesubdir}"
+-		fi
+-		if [ "${includedir}" != /usr/include ]; then
+-			INCS="$INCS -I${includedir}"
+-		fi
+-		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
+-			$INCS
+-ENDECHO
++		OPTS=
++		for opt in @PKG_CFLAGS@
++		do
++			case "x$opt" in
++			x-[DIU]*)
++				OPTS="$OPTS $opt"
++				;;
++			x-Wl,*)
++				OPTS="$OPTS $opt"
++				;;
++			x-[OW]*)
++				;;
++			*)
++				OPTS="$OPTS $opt"
++				;;
++			esac
++		done
++		printf "%s\n" "$OPTS"
++		;;
++	--cflags-only-I)
++		OPTS=
++		for opt in @PKG_CFLAGS@
++		do
++			case "x$opt" in
++			x-[DIU]*)
++				OPTS="$OPTS $opt"
++				;;
++			*)
++				;;
++			esac
++		done
++		printf "%s\n" "$OPTS"
++		;;
++	--cflags-only-other)
++		OPTS=
++		for opt in @PKG_CFLAGS@
++		do
++			case "x$opt" in
++			x-[DIU]*)
++				;;
++			x-Wl,*)
++				OPTS="$OPTS $opt"
++				;;
++			x-[OW]*)
++				;;
++			*)
++				OPTS="$OPTS $opt"
++				;;
++			esac
++		done
++		printf "%s\n" "$OPTS"
+ 		;;
+ 	--libs)
+ 		OPTS=
+@@ -294,30 +335,32 @@
+ Usage: `basename "$0"` [options]
+ 
+ Options:
+-  --prefix           echos the package-prefix of ${THIS}
+-  --exec-prefix      echos the executable-prefix of ${THIS}
+-
+-  --cflags           echos the C compiler flags needed to compile with ${THIS}
+-  --libs             echos the libraries needed to link with ${THIS}
++  --prefix            echos the package-prefix of ${THIS}
++  --exec-prefix       echos the executable-prefix of ${THIS}
+ 
+-  --libs-only-L      echos -L linker options (search path) for ${THIS}
+-  --libs-only-l      echos -l linker options (libraries) for ${THIS}
+-  --libs-only-other  echos linker options other than -L/-l
+-
+-  --version          echos the release+patchdate version of ${THIS}
+-  --abi-version      echos the ABI version of ${THIS}
+-  --mouse-version    echos the mouse-interface version of ${THIS}
+-
+-  --bindir           echos the directory containing ${THIS} programs
+-  --datadir          echos the directory containing ${THIS} data
+-  --includedir       echos the directory containing ${THIS} header files
+-  --libdir           echos the directory containing ${THIS} libraries
+-  --mandir           echos the directory containing ${THIS} manpages
+-  --terminfo         echos the \$TERMINFO terminfo database path
+-  --terminfo-dirs    echos the \$TERMINFO_DIRS directory list
+-  --termpath         echos the \$TERMPATH termcap list
++  --cflags            echos the C compiler flags needed to compile for ${THIS}
++  --cflags-only-I     echos only -I C compiler flags needed with ${THIS}
++  --cflags-only-other echos only C compiler flags other than -I for ${THIS}
++  --libs              echos the libraries needed to link with ${THIS}
++
++  --libs-only-L       echos -L linker options (search path) for ${THIS}
++  --libs-only-l       echos -l linker options (libraries) for ${THIS}
++  --libs-only-other   echos linker options other than -L/-l
++
++  --version           echos the release+patchdate version of ${THIS}
++  --abi-version       echos the ABI version of ${THIS}
++  --mouse-version     echos the mouse-interface version of ${THIS}
++
++  --bindir            echos the directory containing ${THIS} programs
++  --datadir           echos the directory containing ${THIS} data
++  --includedir        echos the directory containing ${THIS} header files
++  --libdir            echos the directory containing ${THIS} libraries
++  --mandir            echos the directory containing ${THIS} manpages
++  --terminfo          echos the \$TERMINFO terminfo database path
++  --terminfo-dirs     echos the \$TERMINFO_DIRS directory list
++  --termpath          echos the \$TERMPATH termcap list
+ 
+-  --help             prints this message
++  --help              prints this message
+ ENDHELP
+ 		;;
+ 	--error|*)
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20240615+/package/debian-mingw/changelog	2024-06-15 09:33:15.000000000 +0000
++++ ncurses-6.5-20240622/package/debian-mingw/changelog	2024-06-21 22:24:47.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240615) unstable; urgency=low
++ncurses6td (6.5+20240622) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 15 Jun 2024 05:33:15 -0400
++ -- Thomas E. Dickey   Fri, 21 Jun 2024 18:24:47 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw/rules
+--- ncurses-6.5-20240615+/package/debian-mingw/rules	2024-06-08 18:54:55.000000000 +0000
++++ ncurses-6.5-20240622/package/debian-mingw/rules	2024-06-22 21:10:11.000000000 +0000
+@@ -83,6 +83,7 @@
+ 		--target=$(TARGET) \
+ 		--prefix=$(MINGW_TOP) \
+ 		--with-build-cc=$(BUILD_CC) \
++		--with-config-suffix=td \
+ 		--with-pc-suffix=$(MY_ABI)td \
+ 		--with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig \
+ 		$(CONFIG_OPTIONS)
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20240615+/package/debian-mingw64/changelog	2024-06-15 09:33:15.000000000 +0000
++++ ncurses-6.5-20240622/package/debian-mingw64/changelog	2024-06-21 22:24:47.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240615) unstable; urgency=low
++ncurses6td (6.5+20240622) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 15 Jun 2024 05:33:15 -0400
++ -- Thomas E. Dickey   Fri, 21 Jun 2024 18:24:47 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/rules
+--- ncurses-6.5-20240615+/package/debian-mingw64/rules	2024-06-08 18:52:55.000000000 +0000
++++ ncurses-6.5-20240622/package/debian-mingw64/rules	2024-06-22 21:07:54.000000000 +0000
+@@ -83,6 +83,7 @@
+ 		--target=$(TARGET) \
+ 		--prefix=$(MINGW_TOP) \
+ 		--with-build-cc=$(BUILD_CC) \
++		--with-config-suffix=td \
+ 		--with-pc-suffix=$(MY_ABI)td \
+ 		--with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig \
+ 		$(CONFIG_OPTIONS)
+Index: package/debian/changelog
+--- ncurses-6.5-20240615+/package/debian/changelog	2024-06-15 09:33:15.000000000 +0000
++++ ncurses-6.5-20240622/package/debian/changelog	2024-06-21 22:24:47.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240615) unstable; urgency=low
++ncurses6td (6.5+20240622) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 15 Jun 2024 05:33:15 -0400
++ -- Thomas E. Dickey   Fri, 21 Jun 2024 18:24:47 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.653 
+--- ncurses-6.5-20240615+/package/mingw-ncurses.nsi	2024-06-15 09:33:15.000000000 +0000
++++ ncurses-6.5-20240622/package/mingw-ncurses.nsi	2024-06-21 22:24:47.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.653 2024/06/15 09:33:15 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.654 2024/06/21 22:24:47 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "0615"
++!define VERSION_MMDD  "0622"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20240615+/package/mingw-ncurses.spec	2024-06-15 09:33:15.000000000 +0000
++++ ncurses-6.5-20240622/package/mingw-ncurses.spec	2024-06-21 22:24:47.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20240615
++Release: 20240622
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20240615+/package/ncurses.spec	2024-06-15 09:33:15.000000000 +0000
++++ ncurses-6.5-20240622/package/ncurses.spec	2024-06-21 22:24:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20240615
++Release: 20240622
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20240615+/package/ncursest.spec	2024-06-15 09:33:15.000000000 +0000
++++ ncurses-6.5-20240622/package/ncursest.spec	2024-06-21 22:24:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20240615
++Release: 20240622
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/gdc.6
+Prereq:  1.9 
+--- ncurses-6.5-20240615+/test/gdc.6	2024-06-15 15:16:34.000000000 +0000
++++ ncurses-6.5-20240622/test/gdc.6	2024-06-22 21:31:03.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: gdc.6,v 1.9 2024/06/15 15:16:34 tom Exp $
++.\" $Id: gdc.6,v 1.10 2024/06/22 21:31:03 tom Exp $
+ .TH GDC 6 2024-06-15 ncurses-examples Games
+ .ie \n(.g \{\
+ .ds `` \(lq
+@@ -41,42 +41,66 @@
+ .\}
+ .SH NAME
+ gdc \-
+-grand digital clock (curses)
++grand digital clock using
++.I curses
+ .SH SYNOPSIS
+-.B gdc \fP[\fIoptions\fP] [\fIn\fP]
++.B gdc
++.RB [ \-dns ]
++.RB [ \-t
++.IB hh : mm : ss\c
++]
++.RI [ count ]
+ .SH DESCRIPTION
+-.I Gdc
+-runs a digital clock made of reverse-video blanks on a terminal screen.
+-If the terminal supports color,
+-the clock is drawn in red.
+-You can make the clock stop, pause, or resume by pressing a \*(``q\*('',
+-\*(``s\*('' or space, respectively.
++.I gdc
++uses
++.I curses
++to display a clock on the terminal.
++It constructs the digits from reverse-video blank characters.
++If the terminal type supports color,
++the digits are drawn in red.
++Make the clock stop,
++pause,
++or resume by typing \*(``q\*('',
++\*(``s\*('',
++or space,
++respectively.
++.PP
++Given a numeric operand,
++the clock
++stops after
++.I count
++seconds.
++Normally,
++.I gdc
++runs \*(``forever\*(''
++(at least 2 billion seconds).
+ .SH OPTIONS
+ .TP
+ .B \-d
+-use terminal's default colors for the background.
++uses the terminal's default background color.
+ .TP
+ .B \-n
+-redirects input to /dev/null,
+-making it ignore the stop/pause commands.
+-You can still stop it by pressing the interrupt key.
++reads input from
++.IR \%/dev/null ,
++making
++.I gdc
++ignore the stop and pause commands.
++You can still stop it with a terminal interrupt.
+ .TP
+ .B \-s
+-makes digits scroll as they change.
++scrolls the digits up as they change.
+ When running on a fast display,
+-the program breaks up the scrolling into subsecond repaints,
++the program breaks up the scrolling into sub-second redraws,
+ making the operation appear smooth.
+ .TP
+-.B \-t \fIhh:mm:ss\fP
+-specify starting time (default is \*(``now\*('').
+-.PP
+-With an optional numeric argument
+-.I num
+-it stops after
+-.I num
+-seconds.
+-Normally it runs \*(``forever\*('' (counting down from 2 billion seconds).
++.BR \-t \ \c
++.IB hh : mm : ss
++uses the specified time instead of the current time.
+ .SH AUTHORS
+-Amos Shapir, modified for curses by John Lupien.
+-.br
+-Improvements for ncurses by Thomas Dickey.
++Amos Shapir,
++John Lupien
++(modifications for
++.IR curses ),
++Thomas Dickey
++(improvements for
++.IR \%ncurses )
+Index: test/gdc.c
+Prereq:  1.57 
+--- ncurses-6.5-20240615+/test/gdc.c	2022-12-04 00:40:11.000000000 +0000
++++ ncurses-6.5-20240622/test/gdc.c	2024-06-22 22:27:52.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
++ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -34,7 +34,7 @@
+  * modified 10-18-89 for curses (jrl)
+  * 10-18-89 added signal handling
+  *
+- * $Id: gdc.c,v 1.57 2022/12/04 00:40:11 tom Exp $
++ * $Id: gdc.c,v 1.58 2024/06/22 22:27:52 tom Exp $
+  */
+ 
+ #include 
+@@ -60,6 +60,7 @@
+ static int sigtermed = 0;
+ static bool redirected = FALSE;
+ static bool hascolor = FALSE;
++static bool hascustomtime = FALSE;
+ 
+ static void
+ sighndl(int signo)
+@@ -154,18 +155,19 @@
+ {
+     static const char *msg[] =
+     {
+-	"Usage: gdc [options] [count]"
++	"usage: gdc [-dns] -[t HH:MM:SS] [COUNT]"
++	,""
++	,"Display a digital clock, running indefinitely or for COUNT"
++	" seconds."
+ 	,""
+ 	,USAGE_COMMON
+ 	,"Options:"
+ #if HAVE_USE_DEFAULT_COLORS
+-	," -d       invoke use_default_colors"
++	," -d           uses the terminal's default background color"
+ #endif
+-	," -n       redirect input to /dev/null"
+-	," -s       scroll each number into place, rather than flipping"
+-	," -t TIME  specify starting time as hh:mm:ss (default is ``now'')"
+-	,""
+-	,"If you specify a count, gdc runs for that number of seconds"
++	," -n           reads input from /dev/null"
++	," -s           scrolls each digit into place"
++	," -t HH:MM:SS  starts clock at specified time"
+     };
+     unsigned j;
+     for (j = 0; j < SIZEOF(msg); j++)
+@@ -247,6 +249,7 @@
+ 	    smooth = TRUE;
+ 	    break;
+ 	case 't':
++	    hascustomtime = TRUE;
+ 	    starts = parse_time(optarg);
+ 	    break;
+ 	case OPTS_VERSION:
+@@ -399,14 +402,16 @@
+ 	    }
+ 	}
+ 
+-	/* this depends on the detailed format of ctime(3) */
+-	_nc_STRNCPY(buf, ctime(&now), (size_t) 30);
+-	{
+-	    char *d2 = buf + 10;
+-	    char *s2 = buf + 19;
+-	    while ((*d2++ = *s2++) != '\0') ;
++	if (!hascustomtime) {
++	    /* this depends on the detailed format of ctime(3) */
++	    _nc_STRNCPY(buf, ctime(&now), (size_t) 30);
++	    {
++		char *d2 = buf + 10;
++		char *s2 = buf + 19;
++		while ((*d2++ = *s2++) != '\0') ;
++	    }
++	    MvAddStr(16, 30, buf);
+ 	}
+-	MvAddStr(16, 30, buf);
+ 
+ 	move(6, 0);
+ 	drawbox(FALSE);
diff --git a/packages/ncurses/6.5/ncurses-6.5-20240629.patch b/packages/ncurses/6.5/ncurses-6.5-20240629.patch
new file mode 100644
index 0000000000..9f21f67aff
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20240629.patch
@@ -0,0 +1,727 @@
+# ncurses 6.5 - patch 20240629 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20240629.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Jun 30 00:08:16 UTC 2024
+# ------------------------------------------------------------------------------
+# NEWS                             |   12 ++++++++-
+# VERSION                          |    2 -
+# dist.mk                          |    4 +--
+# ncurses/base/lib_delwin.c        |   21 ++++++++--------
+# 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/chgat.c                     |    7 +++--
+# test/demo_new_pair.c             |   17 ++++++++++---
+# test/dup_field.c                 |    6 ++--
+# test/edit_field.c                |    6 ++--
+# test/gdc.c                       |   48 +++++++++++++++++++++++++++----------
+# test/move_field.c                |    6 ++--
+# test/popup_msg.c                 |    7 +++--
+# test/programs                    |    8 +++---
+# test/test_instr.c                |   38 ++++++++++++++++++++++++++---
+# test/test_inwstr.c               |   39 ++++++++++++++++++++++++++----
+# 21 files changed, 175 insertions(+), 68 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4143 
+--- ncurses-6.5-20240622+/NEWS	2024-06-22 22:59:44.000000000 +0000
++++ ncurses-6.5-20240629/NEWS	2024-06-29 19:31:28.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4143 2024/06/22 22:59:44 tom Exp $
++-- $Id: NEWS,v 1.4145 2024/06/29 19:31:28 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.
+ 
++20240629
++	+ build-fix for ncurses-examples with newer PDCurses, which no longer
++	  has stubs for unimplemented features.
++	+ add help-popup for test_instr.c, test_inwstr.c
++	+ modify checks in delwin to avoid checking if the window is a pad
++	  until first checking if it is still on the active window-list
++	  (cf: 20211115).
++	+ improve -t option of test/gdc.c, allowing hours only, or hours and
++	  minutes only.
++
+ 20240622
+ 	+ improve test/gdc.c (patch by Branden Robinson).
+ 	+ improve formatting/style of manpages (patches by Branden Robinson).
+Index: VERSION
+--- ncurses-6.5-20240622+/VERSION	2024-06-21 22:24:47.000000000 +0000
++++ ncurses-6.5-20240629/VERSION	2024-06-29 10:00:32.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20240622
++5:0:10	6.5	20240629
+Index: dist.mk
+Prereq:  1.1619 
+--- ncurses-6.5-20240622+/dist.mk	2024-06-22 09:24:38.000000000 +0000
++++ ncurses-6.5-20240629/dist.mk	2024-06-29 10:00:32.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1619 2024/06/22 09:24:38 tom Exp $
++# $Id: dist.mk,v 1.1620 2024/06/29 10:00:32 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 = 5
+-NCURSES_PATCH = 20240622
++NCURSES_PATCH = 20240629
+ 
+ # 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.25 
+--- ncurses-6.5-20240622+/ncurses/base/lib_delwin.c	2023-10-21 11:12:44.000000000 +0000
++++ ncurses-6.5-20240629/ncurses/base/lib_delwin.c	2024-06-29 16:51:40.000000000 +0000
+@@ -43,30 +43,31 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_delwin.c,v 1.25 2023/10/21 11:12:44 tom Exp $")
++MODULE_ID("$Id: lib_delwin.c,v 1.26 2024/06/29 16:51:40 tom Exp $")
+ 
+ static bool
+ cannot_delete(WINDOW *win)
+ {
+     bool result = TRUE;
++    bool found = FALSE;
++    SCREEN *scan;
++    WINDOWLIST *p;
+ 
+-    if (IS_PAD(win)) {
+-	result = FALSE;
+-    } else {
+-	WINDOWLIST *p;
+-#if NCURSES_SP_FUNCS && defined(USE_SP_WINDOWLIST)
+-	SCREEN *sp = _nc_screen_of(win);
+-#endif
+-
+-	for (each_window(SP_PARM, p)) {
++    for (each_screen(scan)) {
++	for (each_window(scan, p)) {
+ 	    if (&(p->win) == win) {
+ 		result = FALSE;
++		found = TRUE;
++		break;
+ 	    } else if (IS_SUBWIN(&(p->win))
+ 		       && p->win._parent == win) {
+ 		result = TRUE;
++		found = TRUE;
+ 		break;
+ 	    }
+ 	}
++	if (found)
++	    break;
+     }
+     return result;
+ }
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20240622+/package/debian-mingw/changelog	2024-06-21 22:24:47.000000000 +0000
++++ ncurses-6.5-20240629/package/debian-mingw/changelog	2024-06-29 10:00:32.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240622) unstable; urgency=low
++ncurses6td (6.5+20240629) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Fri, 21 Jun 2024 18:24:47 -0400
++ -- Thomas E. Dickey   Sat, 29 Jun 2024 06:00:32 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20240622+/package/debian-mingw64/changelog	2024-06-21 22:24:47.000000000 +0000
++++ ncurses-6.5-20240629/package/debian-mingw64/changelog	2024-06-29 10:00:32.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240622) unstable; urgency=low
++ncurses6td (6.5+20240629) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Fri, 21 Jun 2024 18:24:47 -0400
++ -- Thomas E. Dickey   Sat, 29 Jun 2024 06:00:32 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20240622+/package/debian/changelog	2024-06-21 22:24:47.000000000 +0000
++++ ncurses-6.5-20240629/package/debian/changelog	2024-06-29 10:00:32.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240622) unstable; urgency=low
++ncurses6td (6.5+20240629) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Fri, 21 Jun 2024 18:24:47 -0400
++ -- Thomas E. Dickey   Sat, 29 Jun 2024 06:00:32 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.654 
+--- ncurses-6.5-20240622+/package/mingw-ncurses.nsi	2024-06-21 22:24:47.000000000 +0000
++++ ncurses-6.5-20240629/package/mingw-ncurses.nsi	2024-06-29 10:00:32.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.654 2024/06/21 22:24:47 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.655 2024/06/29 10:00:32 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "0622"
++!define VERSION_MMDD  "0629"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20240622+/package/mingw-ncurses.spec	2024-06-21 22:24:47.000000000 +0000
++++ ncurses-6.5-20240629/package/mingw-ncurses.spec	2024-06-29 10:00:32.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20240622
++Release: 20240629
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20240622+/package/ncurses.spec	2024-06-21 22:24:47.000000000 +0000
++++ ncurses-6.5-20240629/package/ncurses.spec	2024-06-29 10:00:32.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20240622
++Release: 20240629
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20240622+/package/ncursest.spec	2024-06-21 22:24:47.000000000 +0000
++++ ncurses-6.5-20240629/package/ncursest.spec	2024-06-29 10:00:32.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20240622
++Release: 20240629
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/chgat.c
+Prereq:  1.20 
+--- ncurses-6.5-20240622+/test/chgat.c	2022-12-10 23:31:31.000000000 +0000
++++ ncurses-6.5-20240629/test/chgat.c	2024-06-29 17:45:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
++ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2006-2012,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,16 +27,17 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: chgat.c,v 1.20 2022/12/10 23:31:31 tom Exp $
++ * $Id: chgat.c,v 1.21 2024/06/29 17:45:32 tom Exp $
+  *
+  * test-driver for chgat/wchgat/mvchgat/mvwchgat
+  */
+ 
+ #include 
+-#include 
+ 
+ #if HAVE_CHGAT
+ 
++#include 
++
+ #define SHOW(n) ((n) == ERR ? "ERR" : "OK")
+ #define COLOR_DEFAULT (-1)
+ 
+Index: test/demo_new_pair.c
+Prereq:  1.27 
+--- ncurses-6.5-20240622+/test/demo_new_pair.c	2022-12-04 00:40:11.000000000 +0000
++++ ncurses-6.5-20240629/test/demo_new_pair.c	2024-06-29 19:30:26.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
++ * Copyright 2018-2022,2024 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: demo_new_pair.c,v 1.27 2022/12/04 00:40:11 tom Exp $
++ * $Id: demo_new_pair.c,v 1.28 2024/06/29 19:30:26 tom Exp $
+  *
+  * Demonstrate the alloc_pair() function.
+  */
+@@ -36,6 +36,7 @@
+ #include 
+ #include 
+ 
++#if HAVE_TIGETSTR
+ #if HAVE_ALLOC_PAIR && USE_WIDEC_SUPPORT
+ 
+ #include 
+@@ -391,11 +392,19 @@
+     ExitProgram(EXIT_SUCCESS);
+ }
+ 
+-#else
++#else /* !(HAVE_ALLOC_PAIR && USE_WIDEC_SUPPORT) */
+ int
+ main(void)
+ {
+     printf("This program requires the ncurses alloc_pair function\n");
+     ExitProgram(EXIT_FAILURE);
+ }
+-#endif
++#endif /* HAVE_ALLOC_PAIR && USE_WIDEC_SUPPORT */
++#else /* !HAVE_TIGETSTR */
++int
++main(void)
++{
++    printf("This program requires the terminfo functions such as tigetstr\n");
++    ExitProgram(EXIT_FAILURE);
++}
++#endif /* HAVE_TIGETSTR */
+Index: test/dup_field.c
+Prereq:  1.8 
+--- ncurses-6.5-20240622+/test/dup_field.c	2023-11-11 00:29:10.000000000 +0000
++++ ncurses-6.5-20240629/test/dup_field.c	2024-06-29 17:45:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: dup_field.c,v 1.8 2023/11/11 00:29:10 tom Exp $
++ * $Id: dup_field.c,v 1.9 2024/06/29 17:45:32 tom Exp $
+  *
+  * Demonstrate dup_field().
+  */
+@@ -62,7 +62,7 @@
+     { CTRL('W'),     REQ_NEXT_WORD,   "go to next word" },
+     { CTRL('X'),     REQ_CLR_FIELD,   "clear field" },
+     { CTRL('['),     MY_QUIT,         "exit form" },
+-    { KEY_F(1),      MY_HELP,         "show this screen", },
++    { HELP_KEY_2,    MY_HELP,         "show this screen", },
+     { KEY_BACKSPACE, REQ_DEL_PREV,    "delete previous character" },
+     { KEY_BTAB,      REQ_PREV_FIELD,  "go to previous field" },
+     { KEY_DOWN,      REQ_DOWN_CHAR,   "move down 1 character" },
+Index: test/edit_field.c
+Prereq:  1.31 
+--- ncurses-6.5-20240622+/test/edit_field.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20240629/test/edit_field.c	2024-06-29 17:49:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019,2020 Thomas E. Dickey                                     *
++ * Copyright 2019-2020,2024 Thomas E. Dickey                                *
+  * Copyright 2003-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: edit_field.c,v 1.31 2020/02/02 23:34:34 tom Exp $
++ * $Id: edit_field.c,v 1.32 2024/06/29 17:49:56 tom Exp $
+  *
+  * A wrapper for form_driver() which keeps track of the user's editing changes
+  * for each field, and makes the resulting length available as a
+@@ -131,7 +131,7 @@
+ 	CTRL(']'), MY_INS_MODE, "toggle REQ_INS_MODE/REQ_OVL_MODE",
+     },
+     {
+-	KEY_F(1), MY_HELP, "show this screen",
++	HELP_KEY_2, MY_HELP, "show this screen",
+     },
+     {
+ 	KEY_BACKSPACE, REQ_DEL_PREV, "delete previous character"
+Index: test/gdc.c
+Prereq:  1.58 
+--- ncurses-6.5-20240622+/test/gdc.c	2024-06-22 22:27:52.000000000 +0000
++++ ncurses-6.5-20240629/test/gdc.c	2024-06-29 19:59:06.000000000 +0000
+@@ -34,7 +34,7 @@
+  * modified 10-18-89 for curses (jrl)
+  * 10-18-89 added signal handling
+  *
+- * $Id: gdc.c,v 1.58 2024/06/22 22:27:52 tom Exp $
++ * $Id: gdc.c,v 1.60 2024/06/29 19:59:06 tom Exp $
+  */
+ 
+ #include 
+@@ -150,24 +150,23 @@
+ 	mask |= m;
+ }
+ 
+-static void
++static GCC_NORETURN void
+ usage(int ok)
+ {
+     static const char *msg[] =
+     {
+ 	"usage: gdc [-dns] -[t HH:MM:SS] [COUNT]"
+ 	,""
+-	,"Display a digital clock, running indefinitely or for COUNT"
+-	" seconds."
++	,"Display a digital clock, running indefinitely or for COUNT seconds."
+ 	,""
+ 	,USAGE_COMMON
+ 	,"Options:"
+ #if HAVE_USE_DEFAULT_COLORS
+-	," -d           uses the terminal's default background color"
++	," -d       uses the terminal's default background color"
+ #endif
+-	," -n           reads input from /dev/null"
+-	," -s           scrolls each digit into place"
+-	," -t HH:MM:SS  starts clock at specified time"
++	," -n       reads input from /dev/null"
++	," -s       scrolls each digit into place"
++	," -t TIME  specify starting time as hh:mm:ss (default is ``now'')"
+     };
+     unsigned j;
+     for (j = 0; j < SIZEOF(msg); j++)
+@@ -181,13 +180,38 @@
+     int hh, mm, ss;
+     int check;
+     time_t result;
+-    char c;
++    char c = 0;
+     struct tm *tm;
+ 
+-    if (sscanf(value, "%d:%d:%d%c", &hh, &mm, &ss, &c) != 3) {
+-	if (sscanf(value, "%02d%02d%02d%c", &hh, &mm, &ss, &c) != 3) {
+-	    usage(FALSE);
++    switch (sscanf(value, "%d:%d:%d%c", &hh, &mm, &ss, &c)) {
++    default:
++	usage(FALSE);
++	/* NOTREACHED */
++    case 1:
++	if (strspn(value, "0123456789") >= 2) {
++	    switch (sscanf(value, "%02d%02d%02d%c", &hh, &mm, &ss, &c)) {
++	    default:
++		usage(FALSE);
++		/* NOTREACHED */
++	    case 1:
++		mm = 0;
++		/* FALLTHRU */
++	    case 2:
++		ss = 0;
++		/* FALLTHRU */
++	    case 3:
++		break;
++	    }
++	    break;
++	} else {
++	    mm = 0;
+ 	}
++	/* FALLTHRU */
++    case 2:
++	ss = 0;
++	/* FALLTHRU */
++    case 3:
++	break;
+     }
+ 
+     if ((hh < 0) || (hh >= 24) ||
+Index: test/move_field.c
+Prereq:  1.15 
+--- ncurses-6.5-20240622+/test/move_field.c	2023-11-11 00:28:19.000000000 +0000
++++ ncurses-6.5-20240629/test/move_field.c	2024-06-29 17:45:02.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: move_field.c,v 1.15 2023/11/11 00:28:19 tom Exp $
++ * $Id: move_field.c,v 1.16 2024/06/29 17:45:02 tom Exp $
+  *
+  * Demonstrate move_field().
+  */
+@@ -62,7 +62,7 @@
+     { CTRL('W'),     REQ_NEXT_WORD,   "go to next word" },
+     { CTRL('X'),     REQ_CLR_FIELD,   "clear field" },
+     { CTRL('['),     MY_QUIT,         "exit form" },
+-    { KEY_F(1),      MY_HELP,         "show this screen", },
++    { HELP_KEY_2,    MY_HELP,         "show this screen", },
+     { KEY_BACKSPACE, REQ_DEL_PREV,    "delete previous character" },
+     { KEY_BTAB,      REQ_PREV_FIELD,  "go to previous field" },
+     { KEY_DOWN,      REQ_DOWN_CHAR,   "move down 1 character" },
+Index: test/popup_msg.c
+Prereq:  1.11 
+--- ncurses-6.5-20240622+/test/popup_msg.c	2021-12-18 21:19:19.000000000 +0000
++++ ncurses-6.5-20240629/test/popup_msg.c	2024-06-29 18:34:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2018-2021,2024 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.11 2021/12/18 21:19:19 tom Exp $
++ * $Id: popup_msg.c,v 1.12 2024/06/29 18:34:58 tom Exp $
+  *
+  * Show a multi-line message in a window which may extend beyond the screen.
+  *
+@@ -83,7 +83,7 @@
+ 	if (width < check)
+ 	    width = check;
+     }
+-    length = n;
++    length = n + 2;
+ 
+     if ((help = newwin(high, wide, y0, x0)) == 0)
+ 	return;
+@@ -96,6 +96,7 @@
+ 
+     keypad(data, TRUE);
+ 
++    waddstr(data, "Press ^[ or ^Q to exit this window.\n\n");
+     for (n = 0; n < length; ++n) {
+ 	waddstr(data, msg[n]);
+ 	if ((n + 1) < length) {
+Index: test/programs
+Prereq:  1.57 
+--- ncurses-6.5-20240622+/test/programs	2023-11-10 11:48:38.000000000 +0000
++++ ncurses-6.5-20240629/test/programs	2024-06-29 18:49:58.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: programs,v 1.57 2023/11/10 11:48:38 tom Exp $
++# $Id: programs,v 1.58 2024/06/29 18:49:58 tom Exp $
+ ##############################################################################
+-# Copyright 2018-2022,2023 Thomas E. Dickey                                  #
++# Copyright 2018-2023,2024 Thomas E. Dickey                                  #
+ # Copyright 2006-2016,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -100,8 +100,8 @@
+ test_endwin	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_endwin
+ test_get_wstr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_get_wstr popup_msg
+ test_getstr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_getstr popup_msg
+-test_instr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_instr
+-test_inwstr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_inwstr
++test_instr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_instr popup_msg
++test_inwstr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_inwstr popup_msg
+ test_mouse	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_mouse
+ test_opaque	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_opaque
+ test_setupterm	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_setupterm
+Index: test/test_instr.c
+Prereq:  1.12 
+--- ncurses-6.5-20240622+/test/test_instr.c	2022-12-10 23:58:01.000000000 +0000
++++ ncurses-6.5-20240629/test/test_instr.c	2024-06-29 18:42:53.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2022 Thomas E. Dickey                                     *
++ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2007-2010,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_instr.c,v 1.12 2022/12/10 23:58:01 tom Exp $
++ * $Id: test_instr.c,v 1.13 2024/06/29 18:42:53 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -44,6 +44,7 @@
+  */
+ 
+ #include 
++#include 
+ 
+ #define BASE_Y 6
+ #define MAX_COLS 1024
+@@ -68,6 +69,26 @@
+     show_1st(win, line, buffer);
+ }
+ 
++static void
++show_help(WINDOW *win)
++{
++    static const char *msgs[] =
++    {
++	"Show file contents and a viewport from the variants of winstr."
++	,"Use h/j/k/l or arrow keys to move the viewport."
++	,""
++	,"Other commands:"
++	,"+     increases the buffer-size used."
++	,"-     decreases the buffer-size used."
++	,"w     opens new window on the next filename."
++	,"q     quits the current file/window."
++	,"?     shows this help-window"
++	,0
++    };
++
++    popup_msg(win, msgs);
++}
++
+ static int
+ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
+ {
+@@ -169,8 +190,15 @@
+ 	    }
+ 	    break;
+ 	case '+':
+-	    ++limit;
++	    if (limit + 2 < MAX_COLS) {
++		++limit;
++	    } else {
++		beep();
++	    }
+ 	    break;
++	case HELP_KEY_1:
++	    show_help(txtwin);
++	    continue;
+ 	default:
+ 	    beep();
+ 	    break;
+@@ -273,8 +301,10 @@
+ 
+     setlocale(LC_ALL, "");
+ 
+-    if (optind + 1 > argc)
++    if (optind + 1 > argc) {
++	fprintf(stderr, "At least one text-file is needed\n");
+ 	usage(FALSE);
++    }
+ 
+     initscr();
+ 
+Index: test/test_inwstr.c
+Prereq:  1.8 
+--- ncurses-6.5-20240622+/test/test_inwstr.c	2022-12-10 23:56:39.000000000 +0000
++++ ncurses-6.5-20240629/test/test_inwstr.c	2024-06-29 18:40:02.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2022 Thomas E. Dickey                                     *
++ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2007-2010,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_inwstr.c,v 1.8 2022/12/10 23:56:39 tom Exp $
++ * $Id: test_inwstr.c,v 1.9 2024/06/29 18:40:02 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -47,6 +47,8 @@
+ 
+ #if USE_WIDEC_SUPPORT
+ 
++#include 
++
+ #define BASE_Y 6
+ #define MAX_COLS 1024
+ 
+@@ -70,6 +72,26 @@
+     show_1st(win, line, buffer);
+ }
+ 
++static void
++show_help(WINDOW *win)
++{
++    static const char *msgs[] =
++    {
++	"Show file contents and a viewport from the variants of winwstr."
++	,"Use h/j/k/l or arrow keys to move the viewport."
++	,""
++	,"Other commands:"
++	,"+     increases the buffer-size used."
++	,"-     decreases the buffer-size used."
++	,"w     opens new window on the next filename."
++	,"q     quits the current file/window."
++	,"?     shows this help-window"
++	,0
++    };
++
++    popup_msg(win, msgs);
++}
++
+ static int
+ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
+ {
+@@ -169,8 +191,15 @@
+ 	    }
+ 	    break;
+ 	case '+':
+-	    ++limit;
++	    if (limit + 2 < MAX_COLS) {
++		++limit;
++	    } else {
++		beep();
++	    }
+ 	    break;
++	case HELP_KEY_1:
++	    show_help(txtwin);
++	    continue;
+ 	default:
+ 	    beep();
+ 	    break;
+@@ -273,8 +302,10 @@
+ 
+     setlocale(LC_ALL, "");
+ 
+-    if (optind + 1 > argc)
++    if (optind + 1 > argc) {
++	fprintf(stderr, "At least one text-file is needed\n");
+ 	usage(FALSE);
++    }
+ 
+     initscr();
+ 
diff --git a/packages/ncurses/6.5/ncurses-6.5-20240706.patch b/packages/ncurses/6.5/ncurses-6.5-20240706.patch
new file mode 100644
index 0000000000..85bf88b6b7
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20240706.patch
@@ -0,0 +1,41069 @@
+# ncurses 6.5 - patch 20240706 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20240706.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sat Jul  6 23:21:31 UTC 2024
+# ------------------------------------------------------------------------------
+# Ada95/aclocal.m4                 |    8 
+# Ada95/configure                  | 2972 ++++++++++-----------
+# NEWS                             |    7 
+# VERSION                          |    2 
+# aclocal.m4                       |   22 
+# configure                        | 5133 ++++++++++++++++++-------------------
+# 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/aclocal.m4                  |   20 
+# test/configure                   | 3917 ++++++++++++++--------------
+# 16 files changed, 6071 insertions(+), 6036 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/aclocal.m4
+Prereq:  1.216 
+--- ncurses-6.5-20240629+/Ada95/aclocal.m4	2024-06-01 21:38:29.000000000 +0000
++++ ncurses-6.5-20240706/Ada95/aclocal.m4	2024-06-22 17:42:22.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: aclocal.m4,v 1.216 2024/06/01 21:38:29 tom Exp $
++dnl $Id: aclocal.m4,v 1.217 2024/06/22 17:42:22 tom Exp $
+ dnl Macros used in NCURSES Ada95 auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -477,7 +477,7 @@
+ AC_SUBST(ARFLAGS)
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_BUILD_CC version: 12 updated: 2024/03/17 09:17:26
++dnl CF_BUILD_CC version: 13 updated: 2024/06/22 13:42:22
+ dnl -----------
+ dnl If we're cross-compiling, allow the user to override the tools and their
+ dnl options.  The configure script is oriented toward identifying the host
+@@ -577,9 +577,9 @@
+ 	: ${BUILD_CC:='${CC}'}
+ 	: ${BUILD_CPP:='${CPP}'}
+ 	: ${BUILD_CFLAGS:='${CFLAGS}'}
+-	: ${BUILD_CPPFLAGS:='ifelse([$1],,'${CPPFLAGS}',[$1])'}
++	: ${BUILD_CPPFLAGS:='${CPPFLAGS}'}
+ 	: ${BUILD_LDFLAGS:='${LDFLAGS}'}
+-	: ${BUILD_LIBS:='ifelse([$2],,'${LIBS}',[$2])'}
++	: ${BUILD_LIBS:='${LIBS}'}
+ 	: ${BUILD_EXEEXT:='$x'}
+ 	: ${BUILD_OBJEXT:='o'}
+ fi
+Index: Ada95/configure
+--- ncurses-6.5-20240629+/Ada95/configure	2024-06-01 21:38:47.000000000 +0000
++++ ncurses-6.5-20240706/Ada95/configure	2024-07-06 18:15:37.000000000 +0000
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ # From configure.in Revision: 1.93 .
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by Autoconf 2.52.20231210.
++# Generated by Autoconf 2.52.20240618.
+ #
+ # Copyright 2003-2022,2023	Thomas E. Dickey
+ # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+@@ -481,6 +481,10 @@
+   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+     x_libraries=$ac_optarg ;;
+ 
++  -*dir | -dvi* | -doc* | -html* | -local* | -pdf* | -ps* )
++    echo "$as_me: WARNING: unsupported option: $ac_option" >&2
++    ;;
++
+   -*) { echo "$as_me: error: unrecognized option: $ac_option
+ Try \`$0 --help' for more information." >&2
+    { (exit 1); exit 1; }; }
+@@ -824,7 +828,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.52.20231210.  Invocation command line was
++generated by GNU Autoconf 2.52.20240618.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -948,7 +952,7 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+   if test -r "$ac_site_file"; then
+-    { echo "$as_me:951: loading site script $ac_site_file" >&5
++    { echo "$as_me:955: loading site script $ac_site_file" >&5
+ echo "$as_me: loading site script $ac_site_file" >&6;}
+     cat "$ac_site_file" >&5
+     . "$ac_site_file"
+@@ -959,7 +963,7 @@
+   # Some versions of bash will fail to source /dev/null (special
+   # files actually), so we avoid doing that.
+   if test -f "$cache_file"; then
+-    { echo "$as_me:962: loading cache $cache_file" >&5
++    { echo "$as_me:966: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+       [\\/]* | ?:[\\/]* ) . $cache_file;;
+@@ -967,7 +971,7 @@
+     esac
+   fi
+ else
+-  { echo "$as_me:970: creating cache $cache_file" >&5
++  { echo "$as_me:974: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+@@ -983,21 +987,21 @@
+   eval ac_new_val="\$ac_env_${ac_var}_value"
+   case "$ac_old_set,$ac_new_set" in
+     set,)
+-      { echo "$as_me:986: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++      { echo "$as_me:990: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,set)
+-      { echo "$as_me:990: error: \`$ac_var' was not set in the previous run" >&5
++      { echo "$as_me:994: error: \`$ac_var' was not set in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,);;
+     *)
+       if test "x$ac_old_val" != "x$ac_new_val"; then
+-        { echo "$as_me:996: error: \`$ac_var' has changed since the previous run:" >&5
++        { echo "$as_me:1000: error: \`$ac_var' has changed since the previous run:" >&5
+ echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+-        { echo "$as_me:998:   former value:  $ac_old_val" >&5
++        { echo "$as_me:1002:   former value:  $ac_old_val" >&5
+ echo "$as_me:   former value:  $ac_old_val" >&2;}
+-        { echo "$as_me:1000:   current value: $ac_new_val" >&5
++        { echo "$as_me:1004:   current value: $ac_new_val" >&5
+ echo "$as_me:   current value: $ac_new_val" >&2;}
+         ac_cache_corrupted=:
+       fi;;
+@@ -1016,9 +1020,9 @@
+   fi
+ done
+ if "$ac_cache_corrupted"; then
+-  { echo "$as_me:1019: error: changes in the environment can compromise the build" >&5
++  { echo "$as_me:1023: error: changes in the environment can compromise the build" >&5
+ echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  { { echo "$as_me:1021: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++  { { echo "$as_me:1025: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1047,10 +1051,10 @@
+ echo "#! $SHELL" >conftest.sh
+ echo  "exit 0"   >>conftest.sh
+ chmod +x conftest.sh
+-if { (echo "$as_me:1050: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:1054: PATH=\".;.\"; conftest.sh") >&5
+   (PATH=".;."; conftest.sh) 2>&5
+   ac_status=$?
+-  echo "$as_me:1053: \$? = $ac_status" >&5
++  echo "$as_me:1057: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+   ac_path_separator=';'
+ else
+@@ -1082,7 +1086,7 @@
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:1085: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++  { { echo "$as_me:1089: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+ echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1092,11 +1096,11 @@
+ 
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+-  { { echo "$as_me:1095: error: cannot run $ac_config_sub" >&5
++  { { echo "$as_me:1099: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:1099: checking build system type" >&5
++echo "$as_me:1103: checking build system type" >&5
+ echo $ECHO_N "checking build system type... $ECHO_C" >&6
+ if test "${ac_cv_build+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1105,23 +1109,23 @@
+ test -z "$ac_cv_build_alias" &&
+   ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+-  { { echo "$as_me:1108: error: cannot guess build type; you must specify one" >&5
++  { { echo "$as_me:1112: error: cannot guess build type; you must specify one" >&5
+ echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+    { (exit 1); exit 1; }; }
+ ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` ||
+-  { { echo "$as_me:1112: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++  { { echo "$as_me:1116: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1117: result: $ac_cv_build" >&5
++echo "$as_me:1121: result: $ac_cv_build" >&5
+ echo "${ECHO_T}$ac_cv_build" >&6
+ build=$ac_cv_build
+ build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+-echo "$as_me:1124: checking host system type" >&5
++echo "$as_me:1128: checking host system type" >&5
+ echo $ECHO_N "checking host system type... $ECHO_C" >&6
+ if test "${ac_cv_host+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1130,12 +1134,12 @@
+ test -z "$ac_cv_host_alias" &&
+   ac_cv_host_alias=$ac_cv_build_alias
+ ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` ||
+-  { { echo "$as_me:1133: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++  { { echo "$as_me:1137: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1138: result: $ac_cv_host" >&5
++echo "$as_me:1142: result: $ac_cv_host" >&5
+ echo "${ECHO_T}$ac_cv_host" >&6
+ host=$ac_cv_host
+ host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1143,7 +1147,7 @@
+ host_os=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+ if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
+-	echo "$as_me:1146: checking target system type" >&5
++	echo "$as_me:1150: checking target system type" >&5
+ echo $ECHO_N "checking target system type... $ECHO_C" >&6
+ if test "${ac_cv_target+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1152,12 +1156,12 @@
+ test "x$ac_cv_target_alias" = "x" &&
+   ac_cv_target_alias=$ac_cv_host_alias
+ ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` ||
+-  { { echo "$as_me:1155: error: $ac_config_sub $ac_cv_target_alias failed" >&5
++  { { echo "$as_me:1159: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1160: result: $ac_cv_target" >&5
++echo "$as_me:1164: result: $ac_cv_target" >&5
+ echo "${ECHO_T}$ac_cv_target" >&6
+ target=$ac_cv_target
+ target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1189,13 +1193,13 @@
+ fi
+ 
+ test -z "$system_name" && system_name="$cf_cv_system_name"
+-test -n "$cf_cv_system_name" && echo "$as_me:1192: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1196: result: Configuring for $cf_cv_system_name" >&5
+ echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
+ 
+ if test ".$system_name" != ".$cf_cv_system_name" ; then
+-	echo "$as_me:1196: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++	echo "$as_me:1200: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+ echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
+-	{ { echo "$as_me:1198: error: \"Please remove config.cache and try again.\"" >&5
++	{ { echo "$as_me:1202: error: \"Please remove config.cache and try again.\"" >&5
+ echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1203,7 +1207,7 @@
+ # Check whether --with-system-type or --without-system-type was given.
+ if test "${with_system_type+set}" = set; then
+   withval="$with_system_type"
+-  { echo "$as_me:1206: WARNING: overriding system type to $withval" >&5
++  { echo "$as_me:1210: WARNING: overriding system type to $withval" >&5
+ echo "$as_me: WARNING: overriding system type to $withval" >&2;}
+ 	cf_cv_system_name=$withval
+ 	host_os=$withval
+@@ -1218,7 +1222,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:1221: checking for $ac_word" >&5
++echo "$as_me:1225: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_GREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1233,7 +1237,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_GREP="$ac_prog"
+-echo "$as_me:1236: found $ac_dir/$ac_word" >&5
++echo "$as_me:1240: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1241,10 +1245,10 @@
+ fi
+ GREP=$ac_cv_prog_GREP
+ if test -n "$GREP"; then
+-  echo "$as_me:1244: result: $GREP" >&5
++  echo "$as_me:1248: result: $GREP" >&5
+ echo "${ECHO_T}$GREP" >&6
+ else
+-  echo "$as_me:1247: result: no" >&5
++  echo "$as_me:1251: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1252,7 +1256,7 @@
+ done
+ test -n "$GREP" || GREP=": "
+ 
+-echo "$as_me:1255: checking for fgrep" >&5
++echo "$as_me:1259: checking for fgrep" >&5
+ echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
+ if test "${ac_cv_path_FGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1264,7 +1268,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:1267: checking for $ac_word" >&5
++echo "$as_me:1271: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_FGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1281,7 +1285,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_FGREP="$ac_dir/$ac_word"
+-   echo "$as_me:1284: found $ac_dir/$ac_word" >&5
++   echo "$as_me:1288: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -1292,10 +1296,10 @@
+ FGREP=$ac_cv_path_FGREP
+ 
+ if test -n "$FGREP"; then
+-  echo "$as_me:1295: result: $FGREP" >&5
++  echo "$as_me:1299: result: $FGREP" >&5
+ echo "${ECHO_T}$FGREP" >&6
+ else
+-  echo "$as_me:1298: result: no" >&5
++  echo "$as_me:1302: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1303,16 +1307,16 @@
+ done
+ test -n "$FGREP" || FGREP=": "
+ 
+-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1306: error: cannot find workable fgrep" >&5
++     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1310: error: cannot find workable fgrep" >&5
+ echo "$as_me: error: cannot find workable fgrep" >&2;}
+    { (exit 1); exit 1; }; }
+    fi
+ fi
+-echo "$as_me:1311: result: $ac_cv_path_FGREP" >&5
++echo "$as_me:1315: result: $ac_cv_path_FGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_FGREP" >&6
+  FGREP="$ac_cv_path_FGREP"
+ 
+-echo "$as_me:1315: checking for prefix" >&5
++echo "$as_me:1319: checking for prefix" >&5
+ echo $ECHO_N "checking for prefix... $ECHO_C" >&6
+ if test "x$prefix" = "xNONE" ; then
+ 	case "$cf_cv_system_name" in
+@@ -1324,11 +1328,11 @@
+ 		;;
+ 	esac
+ fi
+-echo "$as_me:1327: result: $prefix" >&5
++echo "$as_me:1331: result: $prefix" >&5
+ echo "${ECHO_T}$prefix" >&6
+ 
+ if test "x$prefix" = "xNONE" ; then
+-echo "$as_me:1331: checking for default include-directory" >&5
++echo "$as_me:1335: checking for default include-directory" >&5
+ echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
+ test -n "$verbose" && echo 1>&6
+ for cf_symbol in \
+@@ -1351,7 +1355,7 @@
+ 	fi
+ 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
+ done
+-echo "$as_me:1354: result: $includedir" >&5
++echo "$as_me:1358: result: $includedir" >&5
+ echo "${ECHO_T}$includedir" >&6
+ fi
+ 
+@@ -1378,7 +1382,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:1381: checking for $ac_word" >&5
++echo "$as_me:1385: 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
+@@ -1395,7 +1399,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:1398: found $ac_dir/$ac_word" >&5
++   echo "$as_me:1402: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -1407,10 +1411,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+ 
+ if test -n "$cf_TEMP_gnat"; then
+-  echo "$as_me:1410: result: $cf_TEMP_gnat" >&5
++  echo "$as_me:1414: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+-  echo "$as_me:1413: result: no" >&5
++  echo "$as_me:1417: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1420,7 +1424,7 @@
+ 		unset cf_cv_gnat_version
+ 		unset cf_TEMP_gnat
+ 
+-echo "$as_me:1423: checking for $cf_prog_gnat version" >&5
++echo "$as_me:1427: 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
+@@ -1431,7 +1435,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:1434: result: $cf_cv_gnat_version" >&5
++echo "$as_me:1438: 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
+@@ -1460,7 +1464,7 @@
+ 			cd conftest.src
+ 			for cf_gprconfig in Ada C
+ 			do
+-				echo "$as_me:1463: checking for gprconfig name for $cf_gprconfig" >&5
++				echo "$as_me:1467: 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
+@@ -1479,10 +1483,10 @@
+ 				if test -n "$cf_gprconfig_value"
+ 				then
+ 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+-					echo "$as_me:1482: result: $cf_gprconfig_value" >&5
++					echo "$as_me:1486: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ 				else
+-					echo "$as_me:1485: result: missing" >&5
++					echo "$as_me:1489: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ 					cf_ada_config="#"
+ 					break
+@@ -1495,7 +1499,7 @@
+ 	if test "x$cf_ada_config" != "x#"
+ 	then
+ 
+-echo "$as_me:1498: checking for gnat version" >&5
++echo "$as_me:1502: 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
+@@ -1506,7 +1510,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:1509: result: $cf_cv_gnat_version" >&5
++echo "$as_me:1513: 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
+ 
+@@ -1515,7 +1519,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ echo "$as_me:1518: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:1522: 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
+ 	;;
+@@ -1523,7 +1527,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:1526: checking for $ac_word" >&5
++echo "$as_me:1530: 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
+@@ -1538,7 +1542,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:1541: found $ac_dir/$ac_word" >&5
++echo "$as_me:1545: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1547,20 +1551,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:1550: result: $M4_exists" >&5
++  echo "$as_me:1554: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:1553: result: no" >&5
++  echo "$as_me:1557: 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:1559: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++			{ echo "$as_me:1563: 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:1563: checking if GNAT works" >&5
++			echo "$as_me:1567: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf ./conftest* ./*~conftest*
+@@ -1588,7 +1592,7 @@
+ fi
+ rm -rf ./conftest* ./*~conftest*
+ 
+-			echo "$as_me:1591: result: $cf_cv_prog_gnat_correct" >&5
++			echo "$as_me:1595: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 		fi
+ 	else
+@@ -1604,7 +1608,7 @@
+ 		# Here is a workaround.
+ 		# Extract the first word of "gnatgcc", so it can be a program name with args.
+ set dummy gnatgcc; ac_word=$2
+-echo "$as_me:1607: checking for $ac_word" >&5
++echo "$as_me:1611: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_cf_cv_path_gnatgcc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1621,7 +1625,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_cf_cv_path_gnatgcc="$ac_dir/$ac_word"
+-   echo "$as_me:1624: found $ac_dir/$ac_word" >&5
++   echo "$as_me:1628: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -1633,16 +1637,16 @@
+ cf_cv_path_gnatgcc=$ac_cv_path_cf_cv_path_gnatgcc
+ 
+ if test -n "$cf_cv_path_gnatgcc"; then
+-  echo "$as_me:1636: result: $cf_cv_path_gnatgcc" >&5
++  echo "$as_me:1640: result: $cf_cv_path_gnatgcc" >&5
+ echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
+ else
+-  echo "$as_me:1639: result: no" >&5
++  echo "$as_me:1643: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 		if test "$cf_cv_path_gnatgcc" != no
+ 		then
+-			echo "$as_me:1645: checking for improvement" >&5
++			echo "$as_me:1649: checking for improvement" >&5
+ echo $ECHO_N "checking for improvement... $ECHO_C" >&6
+ 			cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null`
+ 			case "x$cf_file_gnatgcc" in
+@@ -1653,7 +1657,7 @@
+ 				cf_cv_path_gnatgcc=no
+ 				;;
+ 			esac
+-			echo "$as_me:1656: result: $cf_cv_path_gnatgcc" >&5
++			echo "$as_me:1660: result: $cf_cv_path_gnatgcc" >&5
+ echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
+ 			test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc
+ 			cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc"
+@@ -1678,7 +1682,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:1681: checking for $ac_word" >&5
++echo "$as_me:1685: 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
+@@ -1693,7 +1697,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:1696: found $ac_dir/$ac_word" >&5
++echo "$as_me:1700: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1701,10 +1705,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1704: result: $CC" >&5
++  echo "$as_me:1708: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1707: result: no" >&5
++  echo "$as_me:1711: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1717,7 +1721,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:1720: checking for $ac_word" >&5
++echo "$as_me:1724: 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
+@@ -1732,7 +1736,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:1735: found $ac_dir/$ac_word" >&5
++echo "$as_me:1739: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1740,10 +1744,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1743: result: $ac_ct_CC" >&5
++  echo "$as_me:1747: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1746: result: no" >&5
++  echo "$as_me:1750: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1753,32 +1757,32 @@
+   CC=$ac_ct_CC
+ fi
+ 
+-test -z "$CC" && { { echo "$as_me:1756: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1760: 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:1761:" \
++echo "$as_me:1765:" \
+      "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo "$2"`
+-{ (eval echo "$as_me:1764: \"$ac_compiler --version &5\"") >&5
++{ (eval echo "$as_me:1768: \"$ac_compiler --version &5\"") >&5
+   (eval $ac_compiler --version &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1767: \$? = $ac_status" >&5
++  echo "$as_me:1771: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:1769: \"$ac_compiler -v &5\"") >&5
++{ (eval echo "$as_me:1773: \"$ac_compiler -v &5\"") >&5
+   (eval $ac_compiler -v &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1772: \$? = $ac_status" >&5
++  echo "$as_me:1776: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:1774: \"$ac_compiler -V &5\"") >&5
++{ (eval echo "$as_me:1778: \"$ac_compiler -V &5\"") >&5
+   (eval $ac_compiler -V &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1777: \$? = $ac_status" >&5
++  echo "$as_me:1781: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1781 "configure"
++#line 1785 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1794,13 +1798,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:1797: checking for C compiler default output" >&5
++echo "$as_me:1801: 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:1800: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1804: \"$ac_link_default\"") >&5
+   (eval $ac_link_default) 2>&5
+   ac_status=$?
+-  echo "$as_me:1803: \$? = $ac_status" >&5
++  echo "$as_me:1807: \$? = $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
+@@ -1823,34 +1827,34 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:1826: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1830: 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:1832: result: $ac_file" >&5
++echo "$as_me:1836: 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:1837: checking whether the C compiler works" >&5
++echo "$as_me:1841: 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:1843: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1847: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1846: \$? = $ac_status" >&5
++  echo "$as_me:1850: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+-	{ { echo "$as_me:1853: error: cannot run C compiled programs.
++	{ { echo "$as_me:1857: 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;}
+@@ -1858,24 +1862,24 @@
+     fi
+   fi
+ fi
+-echo "$as_me:1861: result: yes" >&5
++echo "$as_me:1865: 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:1868: checking whether we are cross compiling" >&5
++echo "$as_me:1872: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:1870: result: $cross_compiling" >&5
++echo "$as_me:1874: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+ 
+-echo "$as_me:1873: checking for executable suffix" >&5
++echo "$as_me:1877: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:1875: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1879: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:1878: \$? = $ac_status" >&5
++  echo "$as_me:1882: \$? = $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
+@@ -1891,25 +1895,25 @@
+   esac
+ done
+ else
+-  { { echo "$as_me:1894: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:1898: 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:1900: result: $ac_cv_exeext" >&5
++echo "$as_me:1904: 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:1906: checking for object suffix" >&5
++echo "$as_me:1910: 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 1912 "configure"
++#line 1916 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1921,10 +1925,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:1924: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1928: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1927: \$? = $ac_status" >&5
++  echo "$as_me:1931: \$? = $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
+@@ -1936,24 +1940,24 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:1939: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:1943: 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:1946: result: $ac_cv_objext" >&5
++echo "$as_me:1950: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:1950: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:1954: 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 1956 "configure"
++#line 1960 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1968,16 +1972,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1971: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1975: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1974: \$? = $ac_status" >&5
++  echo "$as_me:1978: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:1977: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1981: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1980: \$? = $ac_status" >&5
++  echo "$as_me:1984: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -1989,19 +1993,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:1992: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:1996: 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:1998: checking whether $CC accepts -g" >&5
++echo "$as_me:2002: 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 2004 "configure"
++#line 2008 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2013,16 +2017,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2016: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2020: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2019: \$? = $ac_status" >&5
++  echo "$as_me:2023: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2022: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2026: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2025: \$? = $ac_status" >&5
++  echo "$as_me:2029: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cc_g=yes
+ else
+@@ -2032,7 +2036,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:2035: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:2039: 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
+@@ -2059,16 +2063,16 @@
+ #endif
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2062: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2066: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2065: \$? = $ac_status" >&5
++  echo "$as_me:2069: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2068: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2072: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2071: \$? = $ac_status" >&5
++  echo "$as_me:2075: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   for ac_declaration in \
+    ''\
+@@ -2080,7 +2084,7 @@
+    'void exit (int);'
+ do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2083 "configure"
++#line 2087 "configure"
+ #include "confdefs.h"
+ #include 
+ $ac_declaration
+@@ -2093,16 +2097,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2096: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2100: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2099: \$? = $ac_status" >&5
++  echo "$as_me:2103: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2102: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2106: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2105: \$? = $ac_status" >&5
++  echo "$as_me:2109: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -2112,7 +2116,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2115 "configure"
++#line 2119 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -2124,16 +2128,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2127: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2131: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2130: \$? = $ac_status" >&5
++  echo "$as_me:2134: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2133: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2137: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2136: \$? = $ac_status" >&5
++  echo "$as_me:2140: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -2163,11 +2167,11 @@
+ 
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+-	echo "$as_me:2166: checking version of $CC" >&5
++	echo "$as_me:2170: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+-	echo "$as_me:2170: result: $GCC_VERSION" >&5
++	echo "$as_me:2174: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+ 
+@@ -2176,12 +2180,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:2179: checking if this is really Intel C compiler" >&5
++		echo "$as_me:2183: 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 2184 "configure"
++#line 2188 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2198,16 +2202,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2201: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2205: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2204: \$? = $ac_status" >&5
++  echo "$as_me:2208: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2207: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2211: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2210: \$? = $ac_status" >&5
++  echo "$as_me:2214: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -2218,7 +2222,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:2221: result: $INTEL_COMPILER" >&5
++		echo "$as_me:2225: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ 		;;
+ 	esac
+@@ -2227,11 +2231,11 @@
+ CLANG_COMPILER=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:2230: checking if this is really Clang C compiler" >&5
++	echo "$as_me:2234: 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 2234 "configure"
++#line 2238 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2248,16 +2252,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2251: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2255: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2254: \$? = $ac_status" >&5
++  echo "$as_me:2258: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2257: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2261: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2260: \$? = $ac_status" >&5
++  echo "$as_me:2264: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_COMPILER=yes
+ 
+@@ -2267,7 +2271,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:2270: result: $CLANG_COMPILER" >&5
++	echo "$as_me:2274: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+ 
+@@ -2276,30 +2280,30 @@
+ if test "x$CLANG_COMPILER" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:2279: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:2283: 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:2286: checking version of $CC" >&5
++	echo "$as_me:2290: 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:2290: result: $CLANG_VERSION" >&5
++	echo "$as_me:2294: 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:2297: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:2301: 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 2302 "configure"
++#line 2306 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -2313,16 +2317,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:2316: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2320: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2319: \$? = $ac_status" >&5
++  echo "$as_me:2323: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:2322: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2326: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2325: \$? = $ac_status" >&5
++  echo "$as_me:2329: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -2333,13 +2337,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:2336: result: $cf_clang_optok" >&5
++		echo "$as_me:2340: 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}:2342: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:2346: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -2348,7 +2352,7 @@
+ 	done
+ fi
+ 
+-echo "$as_me:2351: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:2355: 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
+@@ -2356,7 +2360,7 @@
+   ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2359 "configure"
++#line 2363 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -2403,16 +2407,16 @@
+ do
+   CC="$ac_save_CC $ac_arg"
+   rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2406: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2410: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2409: \$? = $ac_status" >&5
++  echo "$as_me:2413: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2412: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2416: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2415: \$? = $ac_status" >&5
++  echo "$as_me:2419: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -2429,10 +2433,10 @@
+ 
+ case "x$ac_cv_prog_cc_stdc" in
+   x|xno)
+-    echo "$as_me:2432: result: none needed" >&5
++    echo "$as_me:2436: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+   *)
+-    echo "$as_me:2435: result: $ac_cv_prog_cc_stdc" >&5
++    echo "$as_me:2439: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+     CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+@@ -2440,13 +2444,13 @@
+ # This should have been defined by AC_PROG_CC
+ : "${CC:=cc}"
+ 
+-echo "$as_me:2443: checking \$CFLAGS variable" >&5
++echo "$as_me:2447: checking \$CFLAGS variable" >&5
+ echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
+ case "x$CFLAGS" in
+ (*-[IUD]*)
+-	echo "$as_me:2447: result: broken" >&5
++	echo "$as_me:2451: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2449: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
++	{ echo "$as_me:2453: 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=
+@@ -2554,18 +2558,18 @@
+ 	done
+ 	;;
+ (*)
+-	echo "$as_me:2557: result: ok" >&5
++	echo "$as_me:2561: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+ 
+-echo "$as_me:2562: checking \$CC variable" >&5
++echo "$as_me:2566: checking \$CC variable" >&5
+ echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+ case "$CC" in
+ (*[\ \	]-*)
+-	echo "$as_me:2566: result: broken" >&5
++	echo "$as_me:2570: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2568: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++	{ echo "$as_me:2572: 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/[ ]*[ ]-[^ ].*//'`
+@@ -2682,19 +2686,19 @@
+ 	done
+ 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
+ 
+-echo "${as_me:-configure}:2685: testing resulting CC: '$CC' ..." 1>&5
++echo "${as_me:-configure}:2689: testing resulting CC: '$CC' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:2689: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2693: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:2693: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2697: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+ 
+ 	;;
+ (*)
+-	echo "$as_me:2697: result: ok" >&5
++	echo "$as_me:2701: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+@@ -2702,7 +2706,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:2705: checking for egrep" >&5
++echo "$as_me:2709: checking for egrep" >&5
+ echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+ if test "${ac_cv_path_EGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2714,7 +2718,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:2717: checking for $ac_word" >&5
++echo "$as_me:2721: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_EGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2731,7 +2735,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_EGREP="$ac_dir/$ac_word"
+-   echo "$as_me:2734: found $ac_dir/$ac_word" >&5
++   echo "$as_me:2738: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -2742,10 +2746,10 @@
+ EGREP=$ac_cv_path_EGREP
+ 
+ if test -n "$EGREP"; then
+-  echo "$as_me:2745: result: $EGREP" >&5
++  echo "$as_me:2749: result: $EGREP" >&5
+ echo "${ECHO_T}$EGREP" >&6
+ else
+-  echo "$as_me:2748: result: no" >&5
++  echo "$as_me:2752: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2753,12 +2757,12 @@
+ done
+ test -n "$EGREP" || EGREP=": "
+ 
+-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2756: error: cannot find workable egrep" >&5
++     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2760: error: cannot find workable egrep" >&5
+ echo "$as_me: error: cannot find workable egrep" >&2;}
+    { (exit 1); exit 1; }; }
+    fi
+ fi
+-echo "$as_me:2761: result: $ac_cv_path_EGREP" >&5
++echo "$as_me:2765: result: $ac_cv_path_EGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_EGREP" >&6
+  EGREP="$ac_cv_path_EGREP"
+ 
+@@ -2768,7 +2772,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:2771: checking how to run the C preprocessor" >&5
++echo "$as_me:2775: 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
+@@ -2789,18 +2793,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 2792 "configure"
++#line 2796 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2797: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2801: \"$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:2803: \$? = $ac_status" >&5
++  echo "$as_me:2807: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2823,17 +2827,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2826 "configure"
++#line 2830 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:2830: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2834: \"$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:2836: \$? = $ac_status" >&5
++  echo "$as_me:2840: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2870,7 +2874,7 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:2873: result: $CPP" >&5
++echo "$as_me:2877: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -2880,18 +2884,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 2883 "configure"
++#line 2887 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2888: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2892: \"$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:2894: \$? = $ac_status" >&5
++  echo "$as_me:2898: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2914,17 +2918,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2917 "configure"
++#line 2921 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:2921: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2925: \"$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:2927: \$? = $ac_status" >&5
++  echo "$as_me:2931: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2952,7 +2956,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:2955: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:2959: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -2965,14 +2969,14 @@
+ ac_main_return="return"
+ 
+ if test $ac_cv_c_compiler_gnu = yes; then
+-    echo "$as_me:2968: checking whether $CC needs -traditional" >&5
++    echo "$as_me:2972: 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 2975 "configure"
++#line 2979 "configure"
+ #include "confdefs.h"
+ #include 
+ int Autoconf = TIOCGETP;
+@@ -2987,7 +2991,7 @@
+ 
+   if test $ac_cv_prog_gcc_traditional = no; then
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2990 "configure"
++#line 2994 "configure"
+ #include "confdefs.h"
+ #include 
+ int Autoconf = TCGETA;
+@@ -3000,14 +3004,14 @@
+ 
+   fi
+ fi
+-echo "$as_me:3003: result: $ac_cv_prog_gcc_traditional" >&5
++echo "$as_me:3007: 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:3010: checking whether $CC understands -c and -o together" >&5
++echo "$as_me:3014: 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
+@@ -3022,15 +3026,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:3025: \"$ac_try\"") >&5
++if { (eval echo "$as_me:3029: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3028: \$? = $ac_status" >&5
++  echo "$as_me:3032: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:3030: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:3034: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3033: \$? = $ac_status" >&5
++  echo "$as_me:3037: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CC_c_o=yes
+@@ -3041,10 +3045,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CC_c_o" = yes; then
+-  echo "$as_me:3044: result: yes" >&5
++  echo "$as_me:3048: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:3047: result: no" >&5
++  echo "$as_me:3051: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3065,7 +3069,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:3068: checking for $ac_word" >&5
++echo "$as_me:3072: 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
+@@ -3080,7 +3084,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+-echo "$as_me:3083: found $ac_dir/$ac_word" >&5
++echo "$as_me:3087: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3088,21 +3092,21 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "$as_me:3091: result: $AWK" >&5
++  echo "$as_me:3095: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+-  echo "$as_me:3094: result: no" >&5
++  echo "$as_me:3098: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   test -n "$AWK" && break
+ done
+ 
+-test -z "$AWK" && { { echo "$as_me:3101: error: No awk program found" >&5
++test -z "$AWK" && { { echo "$as_me:3105: error: No awk program found" >&5
+ echo "$as_me: error: No awk program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:3105: checking for egrep" >&5
++echo "$as_me:3109: checking for egrep" >&5
+ echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+ if test "${ac_cv_prog_egrep+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3112,11 +3116,11 @@
+ 		else ac_cv_prog_egrep='egrep'
+ 	fi
+ fi
+-echo "$as_me:3115: result: $ac_cv_prog_egrep" >&5
++echo "$as_me:3119: result: $ac_cv_prog_egrep" >&5
+ echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+ 	EGREP=$ac_cv_prog_egrep
+ 
+-	test -z "$EGREP" && { { echo "$as_me:3119: error: No egrep program found" >&5
++	test -z "$EGREP" && { { echo "$as_me:3123: error: No egrep program found" >&5
+ echo "$as_me: error: No egrep program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -3132,7 +3136,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:3135: checking for a BSD compatible install" >&5
++echo "$as_me:3139: 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
+@@ -3181,7 +3185,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:3184: result: $INSTALL" >&5
++echo "$as_me:3188: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -3192,18 +3196,18 @@
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+-echo "$as_me:3195: checking whether ln -s works" >&5
++echo "$as_me:3199: 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:3199: result: yes" >&5
++  echo "$as_me:3203: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:3202: result: no, using $LN_S" >&5
++  echo "$as_me:3206: result: no, using $LN_S" >&5
+ echo "${ECHO_T}no, using $LN_S" >&6
+ fi
+ 
+-echo "$as_me:3206: checking if $LN_S -f options work" >&5
++echo "$as_me:3210: 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
+@@ -3215,7 +3219,7 @@
+ 	cf_prog_ln_sf=no
+ fi
+ rm -f conf$$.dst conf$$src
+-echo "$as_me:3218: result: $cf_prog_ln_sf" >&5
++echo "$as_me:3222: 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"
+@@ -3232,7 +3236,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:3235: checking for a BSD compatible install" >&5
++echo "$as_me:3239: 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
+@@ -3281,7 +3285,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:3284: result: $INSTALL" >&5
++echo "$as_me:3288: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -3302,7 +3306,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:3305: checking if you want to install stripped executables" >&5
++echo "$as_me:3309: 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.
+@@ -3319,7 +3323,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:3322: result: $enable_stripping" >&5
++echo "$as_me:3326: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -3330,7 +3334,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:3333: checking if install accepts -p option" >&5
++echo "$as_me:3337: 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
+@@ -3361,10 +3365,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:3364: result: $cf_cv_install_p" >&5
++echo "$as_me:3368: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:3367: checking if install needs to be told about ownership" >&5
++echo "$as_me:3371: 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)
+@@ -3375,7 +3379,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:3378: result: $with_install_o" >&5
++echo "$as_me:3382: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -3386,7 +3390,7 @@
+ 
+ if test -n "$INSTALL_OPT_S"
+ then
+-	echo "$as_me:3389: checking if you want to specify strip-program" >&5
++	echo "$as_me:3393: checking if you want to specify strip-program" >&5
+ echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
+ 
+ # Check whether --with-strip-program or --without-strip-program was given.
+@@ -3396,11 +3400,11 @@
+ else
+   with_strip_program=no
+ fi;
+-	echo "$as_me:3399: result: $with_strip_program" >&5
++	echo "$as_me:3403: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ 	if test "$with_strip_program" != no
+ 	then
+-		echo "$as_me:3403: checking if strip-program is supported with this installer" >&5
++		echo "$as_me:3407: checking if strip-program is supported with this installer" >&5
+ echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
+ 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
+ 		check_install_strip=no
+@@ -3421,11 +3425,11 @@
+ 				done
+ 			fi
+ 		fi
+-		echo "$as_me:3424: result: $check_install_strip" >&5
++		echo "$as_me:3428: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ 		case "$check_install_strip" in
+ 		(no)
+-			{ echo "$as_me:3428: WARNING: $cf_install_program does not support strip program option" >&5
++			{ echo "$as_me:3432: WARNING: $cf_install_program does not support strip program option" >&5
+ echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
+ 			with_strip_program=no
+ 			;;
+@@ -3440,7 +3444,7 @@
+ 			chmod +x "$INSTALL"
+ 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
+ 
+-echo "${as_me:-configure}:3443: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:3447: testing created $INSTALL ..." 1>&5
+ 
+ 			;;
+ 		(option)
+@@ -3450,7 +3454,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:3453: checking for long file names" >&5
++echo "$as_me:3457: 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
+@@ -3489,7 +3493,7 @@
+   rm -rf "$ac_xdir" 2>/dev/null
+ done
+ fi
+-echo "$as_me:3492: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:3496: 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
+ 
+@@ -3501,7 +3505,7 @@
+ 
+ # if we find pkg-config, check if we should install the ".pc" files.
+ 
+-echo "$as_me:3504: checking if you want to use pkg-config" >&5
++echo "$as_me:3508: 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.
+@@ -3511,7 +3515,7 @@
+ else
+   cf_pkg_config=yes
+ fi;
+-echo "$as_me:3514: result: $cf_pkg_config" >&5
++echo "$as_me:3518: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+ 
+ case "$cf_pkg_config" in
+@@ -3523,7 +3527,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:3526: checking for $ac_word" >&5
++echo "$as_me:3530: 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
+@@ -3540,7 +3544,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:3543: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3547: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3551,10 +3555,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:3554: result: $PKG_CONFIG" >&5
++  echo "$as_me:3558: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+-  echo "$as_me:3557: result: no" >&5
++  echo "$as_me:3561: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3563,7 +3567,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:3566: 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_path_ac_pt_PKG_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3580,7 +3584,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:3583: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3587: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3592,10 +3596,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ 
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  echo "$as_me:3595: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:3599: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+-  echo "$as_me:3598: result: no" >&5
++  echo "$as_me:3602: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3638,24 +3642,24 @@
+ 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:3641: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++	{ { echo "$as_me:3645: 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:3648: WARNING: pkg-config is not installed" >&5
++	{ echo "$as_me:3652: 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:3654: checking for pkg-config library directory" >&5
++	echo "$as_me:3658: checking for pkg-config library directory" >&5
+ echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
+ 	;;
+ (*)
+-	echo "$as_me:3658: checking for $PKG_CONFIG library directory" >&5
++	echo "$as_me:3662: checking for $PKG_CONFIG library directory" >&5
+ echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
+ 	;;
+ esac
+@@ -3682,7 +3686,7 @@
+ case "x$cf_search_path" in
+ (xlibdir)
+ 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+-	echo "$as_me:3685: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:3689: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+@@ -3693,16 +3697,16 @@
+ 	;;
+ (x/*)
+ 	PKG_CONFIG_LIBDIR="$cf_search_path"
+-	echo "$as_me:3696: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:3700: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+ (xyes|xauto)
+-	echo "$as_me:3701: result: auto" >&5
++	echo "$as_me:3705: 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:3705: checking for search-list" >&5
++	echo "$as_me:3709: checking for search-list" >&5
+ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+ 	if test "x$PKG_CONFIG" != xnone
+ 	then
+@@ -3729,11 +3733,11 @@
+ "`
+ 	fi
+ 
+-	echo "$as_me:3732: result: $cf_search_path" >&5
++	echo "$as_me:3736: result: $cf_search_path" >&5
+ echo "${ECHO_T}$cf_search_path" >&6
+ 	;;
+ (*)
+-	{ { echo "$as_me:3736: error: Unexpected option value: $cf_search_path" >&5
++	{ { echo "$as_me:3740: error: Unexpected option value: $cf_search_path" >&5
+ echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -3741,7 +3745,7 @@
+ 
+ if test -n "$cf_search_path"
+ then
+-	echo "$as_me:3744: checking for first directory" >&5
++	echo "$as_me:3748: 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
+@@ -3752,7 +3756,7 @@
+ 			break
+ 		fi
+ 	done
+-	echo "$as_me:3755: result: $cf_pkg_config_path" >&5
++	echo "$as_me:3759: result: $cf_pkg_config_path" >&5
+ echo "${ECHO_T}$cf_pkg_config_path" >&6
+ 
+ 	if test "x$cf_pkg_config_path" != xnone ; then
+@@ -3762,7 +3766,7 @@
+ 
+ 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+ 	then
+-		echo "$as_me:3765: checking for workaround" >&5
++		echo "$as_me:3769: checking for workaround" >&5
+ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+ 		if test "$prefix" = "NONE" ; then
+ 			cf_prefix="$ac_default_prefix"
+@@ -3785,12 +3789,12 @@
+ 			esac
+ 		done
+ 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+-		echo "$as_me:3788: result: $PKG_CONFIG_LIBDIR" >&5
++		echo "$as_me:3792: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:3793: checking if you want to build test-programs" >&5
++echo "$as_me:3797: 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.
+@@ -3800,10 +3804,10 @@
+ else
+   cf_with_tests=yes
+ fi;
+-echo "$as_me:3803: result: $cf_with_tests" >&5
++echo "$as_me:3807: result: $cf_with_tests" >&5
+ echo "${ECHO_T}$cf_with_tests" >&6
+ 
+-echo "$as_me:3806: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:3810: 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.
+@@ -3813,11 +3817,11 @@
+ else
+   enable_mixedcase=auto
+ fi;
+-echo "$as_me:3816: result: $enable_mixedcase" >&5
++echo "$as_me:3820: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+ 
+-echo "$as_me:3820: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:3824: 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
+@@ -3844,7 +3848,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:3847: result: $cf_cv_mixedcase" >&5
++echo "$as_me:3851: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -3862,7 +3866,7 @@
+ fi
+ 
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:3865: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:3869: 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
+@@ -3882,16 +3886,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:3885: result: yes" >&5
++  echo "$as_me:3889: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:3889: result: no" >&5
++  echo "$as_me:3893: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+-echo "$as_me:3894: checking for \".PHONY\" make-support" >&5
++echo "$as_me:3898: 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
+@@ -3946,7 +3950,7 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:3949: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:3953: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+@@ -3957,7 +3961,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:3960: checking for $ac_word" >&5
++echo "$as_me:3964: 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
+@@ -3972,7 +3976,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:3975: found $ac_dir/$ac_word" >&5
++echo "$as_me:3979: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3980,10 +3984,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:3983: result: $CTAGS" >&5
++  echo "$as_me:3987: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:3986: result: no" >&5
++  echo "$as_me:3990: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3994,7 +3998,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:3997: checking for $ac_word" >&5
++echo "$as_me:4001: 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
+@@ -4009,7 +4013,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:4012: found $ac_dir/$ac_word" >&5
++echo "$as_me:4016: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4017,10 +4021,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:4020: result: $ETAGS" >&5
++  echo "$as_me:4024: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:4023: result: no" >&5
++  echo "$as_me:4027: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4029,7 +4033,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:4032: checking for $ac_word" >&5
++echo "$as_me:4036: 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
+@@ -4044,7 +4048,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:4047: found $ac_dir/$ac_word" >&5
++echo "$as_me:4051: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4053,17 +4057,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:4056: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:4060: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:4059: result: no" >&5
++  echo "$as_me:4063: 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:4066: checking for $ac_word" >&5
++echo "$as_me:4070: 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
+@@ -4078,7 +4082,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:4081: found $ac_dir/$ac_word" >&5
++echo "$as_me:4085: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4087,10 +4091,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:4090: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:4094: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:4093: result: no" >&5
++  echo "$as_me:4097: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4110,7 +4114,7 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:4113: checking for makeflags variable" >&5
++echo "$as_me:4117: 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
+@@ -4140,7 +4144,7 @@
+ 			;;
+ 		(*)
+ 
+-echo "${as_me:-configure}:4143: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:4147: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -4148,13 +4152,13 @@
+ 	rm -f cf_makeflags.tmp
+ 
+ fi
+-echo "$as_me:4151: result: $cf_cv_makeflags" >&5
++echo "$as_me:4155: 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:4157: checking for $ac_word" >&5
++echo "$as_me:4161: 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
+@@ -4169,7 +4173,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:4172: found $ac_dir/$ac_word" >&5
++echo "$as_me:4176: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4177,10 +4181,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:4180: result: $RANLIB" >&5
++  echo "$as_me:4184: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:4183: result: no" >&5
++  echo "$as_me:4187: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4189,7 +4193,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:4192: checking for $ac_word" >&5
++echo "$as_me:4196: 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
+@@ -4204,7 +4208,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:4207: found $ac_dir/$ac_word" >&5
++echo "$as_me:4211: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4213,10 +4217,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:4216: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:4220: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:4219: result: no" >&5
++  echo "$as_me:4223: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4228,7 +4232,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:4231: checking for $ac_word" >&5
++echo "$as_me:4235: 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
+@@ -4243,7 +4247,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:4246: found $ac_dir/$ac_word" >&5
++echo "$as_me:4250: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4251,10 +4255,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:4254: result: $LD" >&5
++  echo "$as_me:4258: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:4257: result: no" >&5
++  echo "$as_me:4261: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4263,7 +4267,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:4266: checking for $ac_word" >&5
++echo "$as_me:4270: 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
+@@ -4278,7 +4282,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:4281: found $ac_dir/$ac_word" >&5
++echo "$as_me:4285: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4287,10 +4291,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:4290: result: $ac_ct_LD" >&5
++  echo "$as_me:4294: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:4293: result: no" >&5
++  echo "$as_me:4297: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4302,7 +4306,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:4305: checking for $ac_word" >&5
++echo "$as_me:4309: 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
+@@ -4317,7 +4321,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:4320: found $ac_dir/$ac_word" >&5
++echo "$as_me:4324: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4325,10 +4329,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:4328: result: $AR" >&5
++  echo "$as_me:4332: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:4331: result: no" >&5
++  echo "$as_me:4335: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4337,7 +4341,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:4340: checking for $ac_word" >&5
++echo "$as_me:4344: 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
+@@ -4352,7 +4356,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:4355: found $ac_dir/$ac_word" >&5
++echo "$as_me:4359: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4361,10 +4365,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:4364: result: $ac_ct_AR" >&5
++  echo "$as_me:4368: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:4367: result: no" >&5
++  echo "$as_me:4371: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4376,7 +4380,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:4379: checking for $ac_word" >&5
++echo "$as_me:4383: 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
+@@ -4391,7 +4395,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:4394: found $ac_dir/$ac_word" >&5
++echo "$as_me:4398: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4399,10 +4403,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:4402: result: $AR" >&5
++  echo "$as_me:4406: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:4405: result: no" >&5
++  echo "$as_me:4409: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4411,7 +4415,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:4414: checking for $ac_word" >&5
++echo "$as_me:4418: 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
+@@ -4426,7 +4430,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:4429: found $ac_dir/$ac_word" >&5
++echo "$as_me:4433: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4435,10 +4439,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:4438: result: $ac_ct_AR" >&5
++  echo "$as_me:4442: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:4441: result: no" >&5
++  echo "$as_me:4445: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4447,7 +4451,7 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-echo "$as_me:4450: checking for options to update archives" >&5
++echo "$as_me:4454: 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
+@@ -4484,13 +4488,13 @@
+ 			rm -f conftest.a
+ 
+ 			cat >"conftest.$ac_ext" <&5
++			if { (eval echo "$as_me:4494: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4493: \$? = $ac_status" >&5
++  echo "$as_me:4497: \$? = $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
+@@ -4501,7 +4505,7 @@
+ 			else
+ 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-echo "${as_me:-configure}:4504: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:4508: testing cannot compile test-program ..." 1>&5
+ 
+ 				break
+ 			fi
+@@ -4511,7 +4515,7 @@
+ 	esac
+ 
+ fi
+-echo "$as_me:4514: result: $cf_cv_ar_flags" >&5
++echo "$as_me:4518: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+ if test -n "$ARFLAGS" ; then
+@@ -4522,17 +4526,17 @@
+ 	ARFLAGS=$cf_cv_ar_flags
+ fi
+ 
+-	echo "$as_me:4525: checking for PATH separator" >&5
++	echo "$as_me:4529: 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:4532: result: $PATH_SEPARATOR" >&5
++	echo "$as_me:4536: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+ 
+-echo "$as_me:4535: checking if you have specified an install-prefix" >&5
++echo "$as_me:4539: 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.
+@@ -4545,7 +4549,7 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:4548: result: $DESTDIR" >&5
++echo "$as_me:4552: result: $DESTDIR" >&5
+ echo "${ECHO_T}$DESTDIR" >&6
+ 
+ ###############################################################################
+@@ -4573,7 +4577,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:4576: checking for $ac_word" >&5
++echo "$as_me:4580: 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
+@@ -4588,7 +4592,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:4591: found $ac_dir/$ac_word" >&5
++echo "$as_me:4595: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4596,10 +4600,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:4599: result: $BUILD_CC" >&5
++  echo "$as_me:4603: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:4602: result: no" >&5
++  echo "$as_me:4606: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4608,12 +4612,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+ 
+ fi;
+-	echo "$as_me:4611: checking for native build C compiler" >&5
++	echo "$as_me:4615: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:4613: result: $BUILD_CC" >&5
++	echo "$as_me:4617: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:4616: checking for native build C preprocessor" >&5
++	echo "$as_me:4620: 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.
+@@ -4623,10 +4627,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:4626: result: $BUILD_CPP" >&5
++	echo "$as_me:4630: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:4629: checking for native build C flags" >&5
++	echo "$as_me:4633: 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.
+@@ -4634,10 +4638,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:4637: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:4641: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:4640: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:4644: 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.
+@@ -4645,10 +4649,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:4648: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:4652: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:4651: checking for native build linker-flags" >&5
++	echo "$as_me:4655: 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.
+@@ -4656,10 +4660,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:4659: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:4663: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:4662: checking for native build linker-libraries" >&5
++	echo "$as_me:4666: 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.
+@@ -4667,7 +4671,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:4670: result: $BUILD_LIBS" >&5
++	echo "$as_me:4674: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -4676,7 +4680,7 @@
+ 
+ 	: ${BUILD_CC:='${CC}'}
+ 
+-	echo "$as_me:4679: checking if the build-compiler \"$BUILD_CC\" works" >&5
++	echo "$as_me:4683: checking if the build-compiler \"$BUILD_CC\" works" >&5
+ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
+ 
+ 	cf_save_crossed=$cross_compiling
+@@ -4690,7 +4694,7 @@
+   cf_ok_build_cc=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4693 "configure"
++#line 4697 "configure"
+ #include "confdefs.h"
+ #include 
+ 		int main(int argc, char *argv[])
+@@ -4700,15 +4704,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:4703: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4707: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4706: \$? = $ac_status" >&5
++  echo "$as_me:4710: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:4708: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4712: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4711: \$? = $ac_status" >&5
++  echo "$as_me:4715: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_ok_build_cc=yes
+ else
+@@ -4723,12 +4727,12 @@
+ 	cross_compiling=$cf_save_crossed
+ 	ac_link=$cf_save_ac_link
+ 
+-	echo "$as_me:4726: result: $cf_ok_build_cc" >&5
++	echo "$as_me:4730: result: $cf_ok_build_cc" >&5
+ echo "${ECHO_T}$cf_ok_build_cc" >&6
+ 
+ 	if test "$cf_ok_build_cc" != yes
+ 	then
+-		{ { echo "$as_me:4731: error: Cross-build requires two compilers.
++		{ { echo "$as_me:4735: 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;}
+@@ -4739,9 +4743,9 @@
+ 	: ${BUILD_CC:='${CC}'}
+ 	: ${BUILD_CPP:='${CPP}'}
+ 	: ${BUILD_CFLAGS:='${CFLAGS}'}
+-	: ${BUILD_CPPFLAGS:=''${CPPFLAGS}''}
++	: ${BUILD_CPPFLAGS:='${CPPFLAGS}'}
+ 	: ${BUILD_LDFLAGS:='${LDFLAGS}'}
+-	: ${BUILD_LIBS:=''${LIBS}''}
++	: ${BUILD_LIBS:='${LIBS}'}
+ 	: ${BUILD_EXEEXT:='$x'}
+ 	: ${BUILD_OBJEXT:='o'}
+ fi
+@@ -4753,7 +4757,7 @@
+ ### shared, for example.
+ cf_list_models=""
+ 
+-echo "$as_me:4756: checking if you want to build shared C-objects" >&5
++echo "$as_me:4760: 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.
+@@ -4763,27 +4767,27 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:4766: result: $with_shared" >&5
++echo "$as_me:4770: result: $with_shared" >&5
+ echo "${ECHO_T}$with_shared" >&6
+ test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
+ 
+-echo "$as_me:4770: checking for specified models" >&5
++echo "$as_me:4774: 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:4773: result: $cf_list_models" >&5
++echo "$as_me:4777: 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:4778: checking for default model" >&5
++echo "$as_me:4782: 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:4781: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:4785: 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:4786: checking for specific curses-directory" >&5
++echo "$as_me:4790: 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.
+@@ -4793,7 +4797,7 @@
+ else
+   cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:4796: result: $cf_cv_curses_dir" >&5
++echo "$as_me:4800: 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"
+@@ -4824,7 +4828,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4827: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:4831: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -4860,7 +4864,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4863 "configure"
++#line 4867 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4872,16 +4876,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4875: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4879: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4878: \$? = $ac_status" >&5
++  echo "$as_me:4882: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4881: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4885: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4884: \$? = $ac_status" >&5
++  echo "$as_me:4888: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -4898,7 +4902,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}:4901: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4905: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -4934,7 +4938,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}:4937: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:4941: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -4949,13 +4953,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:4952: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:4956: 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:4955: result: yes" >&5
++		echo "$as_me:4959: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:4958: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:4962: 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
+ 
+@@ -5088,7 +5092,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5091 "configure"
++#line 5095 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5100,37 +5104,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:5103: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5107: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5106: \$? = $ac_status" >&5
++  echo "$as_me:5110: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:5109: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5113: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5112: \$? = $ac_status" >&5
++  echo "$as_me:5116: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5118 "configure"
++#line 5122 "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:5125: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5129: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5128: \$? = $ac_status" >&5
++  echo "$as_me:5132: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:5130: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5134: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5133: \$? = $ac_status" >&5
++  echo "$as_me:5137: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -5304,7 +5308,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5307 "configure"
++#line 5311 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5316,37 +5320,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:5319: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5323: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5322: \$? = $ac_status" >&5
++  echo "$as_me:5326: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:5325: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5329: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5328: \$? = $ac_status" >&5
++  echo "$as_me:5332: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5334 "configure"
++#line 5338 "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:5341: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5345: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5344: \$? = $ac_status" >&5
++  echo "$as_me:5348: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:5346: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5350: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5349: \$? = $ac_status" >&5
++  echo "$as_me:5353: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -5363,7 +5367,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:5366: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:5370: 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"
+@@ -5379,7 +5383,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:5382: checking for terminfo header" >&5
++echo "$as_me:5386: 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
+@@ -5397,7 +5401,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5400 "configure"
++#line 5404 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -5412,16 +5416,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5415: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5419: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5418: \$? = $ac_status" >&5
++  echo "$as_me:5422: \$? = $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:5425: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5424: \$? = $ac_status" >&5
++  echo "$as_me:5428: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -5437,7 +5441,7 @@
+ done
+ 
+ fi
+-echo "$as_me:5440: result: $cf_cv_term_header" >&5
++echo "$as_me:5444: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -5472,7 +5476,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:5475: result: no" >&5
++		echo "$as_me:5479: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -5488,7 +5492,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:5491: checking for $ac_word" >&5
++echo "$as_me:5495: 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
+@@ -5503,7 +5507,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:5506: found $ac_dir/$ac_word" >&5
++echo "$as_me:5510: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5511,10 +5515,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:5514: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:5518: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:5517: result: no" >&5
++  echo "$as_me:5521: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5527,7 +5531,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:5530: checking for $ac_word" >&5
++echo "$as_me:5534: 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
+@@ -5542,7 +5546,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:5545: found $ac_dir/$ac_word" >&5
++echo "$as_me:5549: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5550,10 +5554,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:5553: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:5557: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:5556: result: no" >&5
++  echo "$as_me:5560: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5710,7 +5714,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:5713: checking if we have identified curses headers" >&5
++echo "$as_me:5717: 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
+@@ -5722,7 +5726,7 @@
+ 	curses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5725 "configure"
++#line 5729 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -5734,16 +5738,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5737: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5741: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5740: \$? = $ac_status" >&5
++  echo "$as_me:5744: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5743: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5747: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5746: \$? = $ac_status" >&5
++  echo "$as_me:5750: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -5754,11 +5758,11 @@
+ done
+ 
+ fi
+-echo "$as_me:5757: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:5761: 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:5761: error: No curses header-files found" >&5
++	{ { echo "$as_me:5765: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -5768,23 +5772,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:5771: checking for $ac_header" >&5
++echo "$as_me:5775: 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 5777 "configure"
++#line 5781 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:5781: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:5785: \"$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:5787: \$? = $ac_status" >&5
++  echo "$as_me:5791: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -5803,7 +5807,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:5806: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:5810: 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 5862 "configure"
++#line 5866 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5871,16 +5875,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5874: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5878: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5877: \$? = $ac_status" >&5
++  echo "$as_me:5881: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5880: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5884: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5883: \$? = $ac_status" >&5
++  echo "$as_me:5887: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5897,7 +5901,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}:5900: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5904: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -5916,7 +5920,7 @@
+ 
+ }
+ 
+-echo "$as_me:5919: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:5923: 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
+@@ -5928,7 +5932,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5931 "configure"
++#line 5935 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -5952,16 +5956,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5955: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5959: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5958: \$? = $ac_status" >&5
++  echo "$as_me:5962: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5961: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5965: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5964: \$? = $ac_status" >&5
++  echo "$as_me:5968: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -5976,14 +5980,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:5979: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:5983: 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:5986: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:5990: 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
+@@ -6104,7 +6108,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6107 "configure"
++#line 6111 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6116,16 +6120,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6119: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6123: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6122: \$? = $ac_status" >&5
++  echo "$as_me:6126: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6125: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6129: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6128: \$? = $ac_status" >&5
++  echo "$as_me:6132: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6142,7 +6146,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}:6145: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6149: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -6165,7 +6169,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6168 "configure"
++#line 6172 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -6189,16 +6193,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6192: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6196: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6195: \$? = $ac_status" >&5
++  echo "$as_me:6199: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6198: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6202: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6201: \$? = $ac_status" >&5
++  echo "$as_me:6205: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -6219,12 +6223,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6222: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6226: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:6227: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:6231: 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%/[^/]*$%%'`
+@@ -6260,7 +6264,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6263 "configure"
++#line 6267 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6272,16 +6276,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6275: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6279: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6278: \$? = $ac_status" >&5
++  echo "$as_me:6282: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6281: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6285: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6284: \$? = $ac_status" >&5
++  echo "$as_me:6288: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6298,7 +6302,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}:6301: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6305: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -6346,7 +6350,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:6349: checking for terminfo header" >&5
++echo "$as_me:6353: 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
+@@ -6364,7 +6368,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6367 "configure"
++#line 6371 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -6379,16 +6383,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6382: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6386: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6385: \$? = $ac_status" >&5
++  echo "$as_me:6389: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6388: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6392: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6391: \$? = $ac_status" >&5
++  echo "$as_me:6395: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -6404,7 +6408,7 @@
+ done
+ 
+ fi
+-echo "$as_me:6407: result: $cf_cv_term_header" >&5
++echo "$as_me:6411: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -6442,7 +6446,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:6445: checking for ncurses version" >&5
++echo "$as_me:6449: 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
+@@ -6468,10 +6472,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:6471: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:6475: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6474: \$? = $ac_status" >&5
++  echo "$as_me:6478: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -6481,7 +6485,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6484 "configure"
++#line 6488 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -6508,15 +6512,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6511: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6515: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6514: \$? = $ac_status" >&5
++  echo "$as_me:6518: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:6516: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6520: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6519: \$? = $ac_status" >&5
++  echo "$as_me:6523: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -6530,7 +6534,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:6533: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:6537: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -6543,7 +6547,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:6546: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:6550: 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
+@@ -6551,7 +6555,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6554 "configure"
++#line 6558 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6570,16 +6574,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6573: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6577: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6576: \$? = $ac_status" >&5
++  echo "$as_me:6580: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6579: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6583: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6582: \$? = $ac_status" >&5
++  echo "$as_me:6586: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -6590,10 +6594,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6593: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:6597: 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:6596: checking for initscr in -lgpm" >&5
++  echo "$as_me:6600: 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
+@@ -6601,7 +6605,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6604 "configure"
++#line 6608 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6620,16 +6624,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6623: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6627: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6626: \$? = $ac_status" >&5
++  echo "$as_me:6630: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6629: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6633: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6632: \$? = $ac_status" >&5
++  echo "$as_me:6636: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -6640,7 +6644,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6643: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:6647: 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"
+@@ -6655,7 +6659,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:6658: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:6662: 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
+@@ -6663,7 +6667,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6666 "configure"
++#line 6670 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6682,16 +6686,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6685: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6689: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6688: \$? = $ac_status" >&5
++  echo "$as_me:6692: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6691: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6695: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6694: \$? = $ac_status" >&5
++  echo "$as_me:6698: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -6702,7 +6706,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6705: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:6709: 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"
+@@ -6751,13 +6755,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:6754: checking for initscr" >&5
++	echo "$as_me:6758: 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 6760 "configure"
++#line 6764 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -6788,16 +6792,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6791: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6795: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6794: \$? = $ac_status" >&5
++  echo "$as_me:6798: \$? = $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:6801: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6800: \$? = $ac_status" >&5
++  echo "$as_me:6804: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -6807,18 +6811,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6810: result: $ac_cv_func_initscr" >&5
++echo "$as_me:6814: 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:6817: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:6821: 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 6821 "configure"
++#line 6825 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6830,25 +6834,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6833: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6837: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6836: \$? = $ac_status" >&5
++  echo "$as_me:6840: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6839: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6843: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6842: \$? = $ac_status" >&5
++  echo "$as_me:6846: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:6844: result: yes" >&5
++  echo "$as_me:6848: 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:6851: result: no" >&5
++echo "$as_me:6855: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -6916,11 +6920,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:6919: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:6923: 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 6923 "configure"
++#line 6927 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6932,25 +6936,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6935: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6939: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6938: \$? = $ac_status" >&5
++  echo "$as_me:6942: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6941: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6945: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6944: \$? = $ac_status" >&5
++  echo "$as_me:6948: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:6946: result: yes" >&5
++  echo "$as_me:6950: 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:6953: result: no" >&5
++echo "$as_me:6957: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -6965,7 +6969,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:6968: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:6972: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6973,7 +6977,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:6976: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:6980: 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
+@@ -6983,7 +6987,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6986 "configure"
++#line 6990 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6995,23 +6999,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6998: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7002: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7001: \$? = $ac_status" >&5
++  echo "$as_me:7005: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7004: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7008: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7007: \$? = $ac_status" >&5
++  echo "$as_me:7011: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:7009: result: yes" >&5
++  echo "$as_me:7013: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:7014: result: no" >&5
++echo "$as_me:7018: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -7029,7 +7033,7 @@
+ 	NCURSES_CONFIG=none
+ fi
+ 
+-echo "$as_me:7032: checking for specified curses library type" >&5
++echo "$as_me:7036: checking for specified curses library type" >&5
+ echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
+ 
+ # Check whether --with-screen or --without-screen was given.
+@@ -7049,23 +7053,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7052: checking for $ac_header" >&5
++echo "$as_me:7056: 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 7058 "configure"
++#line 7062 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7062: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7066: \"$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:7068: \$? = $ac_status" >&5
++  echo "$as_me:7072: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7084,7 +7088,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7087: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7091: 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:7101: 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
+@@ -7102,7 +7106,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7105 "configure"
++#line 7109 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -7119,16 +7123,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7122: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7126: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7125: \$? = $ac_status" >&5
++  echo "$as_me:7129: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7128: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7132: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7131: \$? = $ac_status" >&5
++  echo "$as_me:7135: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -7140,12 +7144,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:7143: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7147: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7148 "configure"
++#line 7152 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7158,16 +7162,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7161: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7165: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7164: \$? = $ac_status" >&5
++  echo "$as_me:7168: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7167: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7171: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7170: \$? = $ac_status" >&5
++  echo "$as_me:7174: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -7181,7 +7185,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7184 "configure"
++#line 7188 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7194,16 +7198,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7197: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7201: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7200: \$? = $ac_status" >&5
++  echo "$as_me:7204: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7203: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7207: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7206: \$? = $ac_status" >&5
++  echo "$as_me:7210: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -7220,9 +7224,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:7223: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:7227: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:7225: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7229: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -7313,7 +7317,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}:7316: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7320: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -7321,7 +7325,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7324 "configure"
++#line 7328 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7334,21 +7338,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7337: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7341: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7340: \$? = $ac_status" >&5
++  echo "$as_me:7344: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7343: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7347: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7346: \$? = $ac_status" >&5
++  echo "$as_me:7350: \$? = $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}:7351: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7355: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -7366,7 +7370,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:7369: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7373: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -7441,13 +7445,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}:7444: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7448: 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 7450 "configure"
++#line 7454 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7460,21 +7464,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7463: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7467: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7466: \$? = $ac_status" >&5
++  echo "$as_me:7470: \$? = $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:7473: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7472: \$? = $ac_status" >&5
++  echo "$as_me:7476: \$? = $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}:7477: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7481: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -7516,7 +7520,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7519: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:7523: 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
+@@ -7554,7 +7558,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7557 "configure"
++#line 7561 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7566,16 +7570,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7569: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7573: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7572: \$? = $ac_status" >&5
++  echo "$as_me:7576: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7575: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7579: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7578: \$? = $ac_status" >&5
++  echo "$as_me:7582: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -7592,7 +7596,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}:7595: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:7599: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -7628,7 +7632,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}:7631: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7635: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7658,13 +7662,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:7661: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:7665: 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:7664: result: yes" >&5
++		echo "$as_me:7668: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:7667: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:7671: 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
+ 
+@@ -7797,7 +7801,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7800 "configure"
++#line 7804 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7809,37 +7813,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7812: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7816: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7815: \$? = $ac_status" >&5
++  echo "$as_me:7819: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7818: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7822: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7821: \$? = $ac_status" >&5
++  echo "$as_me:7825: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7827 "configure"
++#line 7831 "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:7834: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7838: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7837: \$? = $ac_status" >&5
++  echo "$as_me:7841: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:7839: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7843: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7842: \$? = $ac_status" >&5
++  echo "$as_me:7846: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -8013,7 +8017,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8016 "configure"
++#line 8020 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8025,37 +8029,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8028: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8032: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8031: \$? = $ac_status" >&5
++  echo "$as_me:8035: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8034: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8038: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8037: \$? = $ac_status" >&5
++  echo "$as_me:8041: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8043 "configure"
++#line 8047 "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:8050: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8054: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8053: \$? = $ac_status" >&5
++  echo "$as_me:8057: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:8055: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8059: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8058: \$? = $ac_status" >&5
++  echo "$as_me:8062: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -8072,7 +8076,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:8075: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:8079: 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"
+@@ -8088,7 +8092,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:8091: checking for terminfo header" >&5
++echo "$as_me:8095: 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
+@@ -8106,7 +8110,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8109 "configure"
++#line 8113 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8121,16 +8125,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8124: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8128: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8127: \$? = $ac_status" >&5
++  echo "$as_me:8131: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8130: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8134: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8133: \$? = $ac_status" >&5
++  echo "$as_me:8137: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -8146,7 +8150,7 @@
+ done
+ 
+ fi
+-echo "$as_me:8149: result: $cf_cv_term_header" >&5
++echo "$as_me:8153: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -8181,7 +8185,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:8184: result: no" >&5
++		echo "$as_me:8188: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -8197,7 +8201,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:8200: checking for $ac_word" >&5
++echo "$as_me:8204: 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
+@@ -8212,7 +8216,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:8215: found $ac_dir/$ac_word" >&5
++echo "$as_me:8219: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8220,10 +8224,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:8223: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:8227: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:8226: result: no" >&5
++  echo "$as_me:8230: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8236,7 +8240,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:8239: checking for $ac_word" >&5
++echo "$as_me:8243: 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
+@@ -8251,7 +8255,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:8254: found $ac_dir/$ac_word" >&5
++echo "$as_me:8258: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8259,10 +8263,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:8262: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:8266: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:8265: result: no" >&5
++  echo "$as_me:8269: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8419,7 +8423,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:8422: checking if we have identified curses headers" >&5
++echo "$as_me:8426: 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
+@@ -8431,7 +8435,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8434 "configure"
++#line 8438 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -8443,16 +8447,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8446: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8450: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8449: \$? = $ac_status" >&5
++  echo "$as_me:8453: \$? = $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:8456: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8455: \$? = $ac_status" >&5
++  echo "$as_me:8459: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -8463,11 +8467,11 @@
+ done
+ 
+ fi
+-echo "$as_me:8466: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:8470: 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:8470: error: No curses header-files found" >&5
++	{ { echo "$as_me:8474: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8477,23 +8481,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:8480: checking for $ac_header" >&5
++echo "$as_me:8484: 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 8486 "configure"
++#line 8490 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8490: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8494: \"$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:8496: \$? = $ac_status" >&5
++  echo "$as_me:8500: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8512,7 +8516,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8515: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8519: 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 8571 "configure"
++#line 8575 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8580,16 +8584,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8583: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8587: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8586: \$? = $ac_status" >&5
++  echo "$as_me:8590: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8589: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8593: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8592: \$? = $ac_status" >&5
++  echo "$as_me:8596: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -8606,7 +8610,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}:8609: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8613: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8625,7 +8629,7 @@
+ 
+ }
+ 
+-echo "$as_me:8628: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:8632: 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
+@@ -8637,7 +8641,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8640 "configure"
++#line 8644 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -8661,16 +8665,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8664: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8668: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8667: \$? = $ac_status" >&5
++  echo "$as_me:8671: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8670: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8674: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8673: \$? = $ac_status" >&5
++  echo "$as_me:8677: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -8685,14 +8689,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:8688: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:8692: 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:8695: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:8699: 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
+@@ -8813,7 +8817,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8816 "configure"
++#line 8820 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8825,16 +8829,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8828: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8832: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8831: \$? = $ac_status" >&5
++  echo "$as_me:8835: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8834: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8838: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8837: \$? = $ac_status" >&5
++  echo "$as_me:8841: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -8851,7 +8855,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}:8854: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8858: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8874,7 +8878,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8877 "configure"
++#line 8881 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -8898,16 +8902,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8901: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8905: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8904: \$? = $ac_status" >&5
++  echo "$as_me:8908: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8907: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8911: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8910: \$? = $ac_status" >&5
++  echo "$as_me:8914: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -8928,12 +8932,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8931: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8935: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:8936: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:8940: 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%/[^/]*$%%'`
+@@ -8969,7 +8973,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8972 "configure"
++#line 8976 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8981,16 +8985,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8984: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8988: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8987: \$? = $ac_status" >&5
++  echo "$as_me:8991: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8990: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8994: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8993: \$? = $ac_status" >&5
++  echo "$as_me:8997: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9007,7 +9011,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}:9010: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9014: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9055,7 +9059,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9058: checking for terminfo header" >&5
++echo "$as_me:9062: 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
+@@ -9073,7 +9077,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9076 "configure"
++#line 9080 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9088,16 +9092,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9091: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9095: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9094: \$? = $ac_status" >&5
++  echo "$as_me:9098: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9097: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9101: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9100: \$? = $ac_status" >&5
++  echo "$as_me:9104: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -9113,7 +9117,7 @@
+ done
+ 
+ fi
+-echo "$as_me:9116: result: $cf_cv_term_header" >&5
++echo "$as_me:9120: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9151,7 +9155,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:9154: checking for ncurses version" >&5
++echo "$as_me:9158: 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
+@@ -9177,10 +9181,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:9180: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:9184: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9183: \$? = $ac_status" >&5
++  echo "$as_me:9187: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -9190,7 +9194,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9193 "configure"
++#line 9197 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -9217,15 +9221,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9220: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9224: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9223: \$? = $ac_status" >&5
++  echo "$as_me:9227: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9225: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9229: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9228: \$? = $ac_status" >&5
++  echo "$as_me:9232: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -9239,7 +9243,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:9242: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:9246: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -9252,7 +9256,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:9255: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:9259: 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
+@@ -9260,7 +9264,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9263 "configure"
++#line 9267 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9279,16 +9283,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9282: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9286: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9285: \$? = $ac_status" >&5
++  echo "$as_me:9289: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9288: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9292: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9291: \$? = $ac_status" >&5
++  echo "$as_me:9295: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -9299,10 +9303,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9302: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:9306: 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:9305: checking for initscr in -lgpm" >&5
++  echo "$as_me:9309: 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
+@@ -9310,7 +9314,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9313 "configure"
++#line 9317 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9329,16 +9333,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9332: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9336: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9335: \$? = $ac_status" >&5
++  echo "$as_me:9339: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9338: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9342: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9341: \$? = $ac_status" >&5
++  echo "$as_me:9345: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -9349,7 +9353,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9352: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:9356: 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"
+@@ -9364,7 +9368,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:9367: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:9371: 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
+@@ -9372,7 +9376,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9375 "configure"
++#line 9379 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9391,16 +9395,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9394: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9398: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9397: \$? = $ac_status" >&5
++  echo "$as_me:9401: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9400: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9404: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9403: \$? = $ac_status" >&5
++  echo "$as_me:9407: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -9411,7 +9415,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9414: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:9418: 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"
+@@ -9460,13 +9464,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:9463: checking for initscr" >&5
++	echo "$as_me:9467: 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 9469 "configure"
++#line 9473 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9497,16 +9501,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9500: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9504: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9503: \$? = $ac_status" >&5
++  echo "$as_me:9507: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9506: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9510: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9509: \$? = $ac_status" >&5
++  echo "$as_me:9513: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -9516,18 +9520,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:9519: result: $ac_cv_func_initscr" >&5
++echo "$as_me:9523: 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:9526: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:9530: 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 9530 "configure"
++#line 9534 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9539,25 +9543,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9542: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9546: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9545: \$? = $ac_status" >&5
++  echo "$as_me:9549: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9548: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9552: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9551: \$? = $ac_status" >&5
++  echo "$as_me:9555: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:9553: result: yes" >&5
++  echo "$as_me:9557: 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:9560: result: no" >&5
++echo "$as_me:9564: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -9625,11 +9629,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:9628: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:9632: 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 9632 "configure"
++#line 9636 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9641,25 +9645,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9644: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9648: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9647: \$? = $ac_status" >&5
++  echo "$as_me:9651: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9650: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9654: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9653: \$? = $ac_status" >&5
++  echo "$as_me:9657: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:9655: result: yes" >&5
++  echo "$as_me:9659: 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:9662: result: no" >&5
++echo "$as_me:9666: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -9674,7 +9678,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:9677: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:9681: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -9682,7 +9686,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:9685: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:9689: 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
+@@ -9692,7 +9696,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9695 "configure"
++#line 9699 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9704,23 +9708,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9707: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9711: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9710: \$? = $ac_status" >&5
++  echo "$as_me:9714: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9713: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9717: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9716: \$? = $ac_status" >&5
++  echo "$as_me:9720: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:9718: result: yes" >&5
++  echo "$as_me:9722: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:9723: result: no" >&5
++echo "$as_me:9727: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -9745,13 +9749,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:9748: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:9752: 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:9751: result: yes" >&5
++		echo "$as_me:9755: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:9754: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:9758: 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
+ 
+@@ -9884,7 +9888,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9887 "configure"
++#line 9891 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9896,37 +9900,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9899: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9903: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9902: \$? = $ac_status" >&5
++  echo "$as_me:9906: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9905: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9909: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9908: \$? = $ac_status" >&5
++  echo "$as_me:9912: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9914 "configure"
++#line 9918 "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:9921: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9925: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9924: \$? = $ac_status" >&5
++  echo "$as_me:9928: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9926: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9930: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9929: \$? = $ac_status" >&5
++  echo "$as_me:9933: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -10100,7 +10104,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10103 "configure"
++#line 10107 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10112,37 +10116,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10115: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10119: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10118: \$? = $ac_status" >&5
++  echo "$as_me:10122: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10121: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10125: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10124: \$? = $ac_status" >&5
++  echo "$as_me:10128: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10130 "configure"
++#line 10134 "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:10137: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10141: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10140: \$? = $ac_status" >&5
++  echo "$as_me:10144: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10142: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10146: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10145: \$? = $ac_status" >&5
++  echo "$as_me:10149: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -10159,7 +10163,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:10162: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:10166: 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"
+@@ -10175,7 +10179,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:10178: checking for terminfo header" >&5
++echo "$as_me:10182: 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
+@@ -10193,7 +10197,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10196 "configure"
++#line 10200 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -10208,16 +10212,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10211: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10215: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10214: \$? = $ac_status" >&5
++  echo "$as_me:10218: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10217: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10221: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10220: \$? = $ac_status" >&5
++  echo "$as_me:10224: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -10233,7 +10237,7 @@
+ done
+ 
+ fi
+-echo "$as_me:10236: result: $cf_cv_term_header" >&5
++echo "$as_me:10240: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10268,7 +10272,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:10271: result: no" >&5
++		echo "$as_me:10275: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -10284,7 +10288,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:10287: checking for $ac_word" >&5
++echo "$as_me:10291: 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
+@@ -10299,7 +10303,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:10302: found $ac_dir/$ac_word" >&5
++echo "$as_me:10306: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -10307,10 +10311,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:10310: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:10314: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:10313: result: no" >&5
++  echo "$as_me:10317: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -10323,7 +10327,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:10326: checking for $ac_word" >&5
++echo "$as_me:10330: 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
+@@ -10338,7 +10342,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:10341: found $ac_dir/$ac_word" >&5
++echo "$as_me:10345: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -10346,10 +10350,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:10349: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:10353: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:10352: result: no" >&5
++  echo "$as_me:10356: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -10506,7 +10510,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:10509: checking if we have identified curses headers" >&5
++echo "$as_me:10513: 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
+@@ -10518,7 +10522,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10521 "configure"
++#line 10525 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -10530,16 +10534,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10533: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10537: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10536: \$? = $ac_status" >&5
++  echo "$as_me:10540: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10539: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10543: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10542: \$? = $ac_status" >&5
++  echo "$as_me:10546: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -10550,11 +10554,11 @@
+ done
+ 
+ fi
+-echo "$as_me:10553: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:10557: 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:10557: error: No curses header-files found" >&5
++	{ { echo "$as_me:10561: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -10564,23 +10568,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:10567: checking for $ac_header" >&5
++echo "$as_me:10571: 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 10573 "configure"
++#line 10577 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10577: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:10581: \"$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:10583: \$? = $ac_status" >&5
++  echo "$as_me:10587: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10599,7 +10603,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:10602: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:10606: 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 10658 "configure"
++#line 10662 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10667,16 +10671,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10670: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10674: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10673: \$? = $ac_status" >&5
++  echo "$as_me:10677: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10676: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10680: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10679: \$? = $ac_status" >&5
++  echo "$as_me:10683: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10693,7 +10697,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}:10696: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10700: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10712,7 +10716,7 @@
+ 
+ }
+ 
+-echo "$as_me:10715: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:10719: 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
+@@ -10724,7 +10728,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10727 "configure"
++#line 10731 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -10748,16 +10752,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10751: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10755: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10754: \$? = $ac_status" >&5
++  echo "$as_me:10758: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10757: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10761: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10760: \$? = $ac_status" >&5
++  echo "$as_me:10764: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -10772,14 +10776,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:10775: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:10779: 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:10782: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:10786: 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
+@@ -10900,7 +10904,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10903 "configure"
++#line 10907 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10912,16 +10916,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10915: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10919: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10918: \$? = $ac_status" >&5
++  echo "$as_me:10922: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10921: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10925: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10924: \$? = $ac_status" >&5
++  echo "$as_me:10928: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10938,7 +10942,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}:10941: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10945: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10961,7 +10965,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10964 "configure"
++#line 10968 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -10985,16 +10989,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10988: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10992: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10991: \$? = $ac_status" >&5
++  echo "$as_me:10995: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10994: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10998: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10997: \$? = $ac_status" >&5
++  echo "$as_me:11001: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -11015,12 +11019,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11018: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11022: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:11023: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:11027: 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%/[^/]*$%%'`
+@@ -11056,7 +11060,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11059 "configure"
++#line 11063 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11068,16 +11072,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11071: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11075: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11074: \$? = $ac_status" >&5
++  echo "$as_me:11078: \$? = $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:11081: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11080: \$? = $ac_status" >&5
++  echo "$as_me:11084: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11094,7 +11098,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}:11097: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11101: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -11142,7 +11146,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:11145: checking for terminfo header" >&5
++echo "$as_me:11149: 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
+@@ -11160,7 +11164,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11163 "configure"
++#line 11167 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -11175,16 +11179,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11178: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11182: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11181: \$? = $ac_status" >&5
++  echo "$as_me:11185: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11184: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11188: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11187: \$? = $ac_status" >&5
++  echo "$as_me:11191: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -11200,7 +11204,7 @@
+ done
+ 
+ fi
+-echo "$as_me:11203: result: $cf_cv_term_header" >&5
++echo "$as_me:11207: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -11238,7 +11242,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:11241: checking for ncurses version" >&5
++echo "$as_me:11245: 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
+@@ -11264,10 +11268,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:11267: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:11271: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11270: \$? = $ac_status" >&5
++  echo "$as_me:11274: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -11277,7 +11281,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11280 "configure"
++#line 11284 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11304,15 +11308,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:11307: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11311: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11310: \$? = $ac_status" >&5
++  echo "$as_me:11314: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:11312: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11316: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11315: \$? = $ac_status" >&5
++  echo "$as_me:11319: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -11326,7 +11330,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:11329: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:11333: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -11339,7 +11343,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:11342: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:11346: 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
+@@ -11347,7 +11351,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11350 "configure"
++#line 11354 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11366,16 +11370,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11369: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11373: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11372: \$? = $ac_status" >&5
++  echo "$as_me:11376: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11375: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11379: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11378: \$? = $ac_status" >&5
++  echo "$as_me:11382: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -11386,10 +11390,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11389: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:11393: 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:11392: checking for initscr in -lgpm" >&5
++  echo "$as_me:11396: 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
+@@ -11397,7 +11401,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11400 "configure"
++#line 11404 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11416,16 +11420,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11419: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11423: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11422: \$? = $ac_status" >&5
++  echo "$as_me:11426: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11425: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11429: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11428: \$? = $ac_status" >&5
++  echo "$as_me:11432: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -11436,7 +11440,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11439: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:11443: 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"
+@@ -11451,7 +11455,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:11454: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:11458: 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
+@@ -11459,7 +11463,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11462 "configure"
++#line 11466 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11478,16 +11482,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11481: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11485: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11484: \$? = $ac_status" >&5
++  echo "$as_me:11488: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11487: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11491: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11490: \$? = $ac_status" >&5
++  echo "$as_me:11494: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -11498,7 +11502,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11501: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:11505: 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"
+@@ -11547,13 +11551,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:11550: checking for initscr" >&5
++	echo "$as_me:11554: 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 11556 "configure"
++#line 11560 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -11584,16 +11588,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11587: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11591: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11590: \$? = $ac_status" >&5
++  echo "$as_me:11594: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11593: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11597: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11596: \$? = $ac_status" >&5
++  echo "$as_me:11600: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -11603,18 +11607,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:11606: result: $ac_cv_func_initscr" >&5
++echo "$as_me:11610: 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:11613: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:11617: 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 11617 "configure"
++#line 11621 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11626,25 +11630,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11629: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11633: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11632: \$? = $ac_status" >&5
++  echo "$as_me:11636: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11635: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11639: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11638: \$? = $ac_status" >&5
++  echo "$as_me:11642: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:11640: result: yes" >&5
++  echo "$as_me:11644: 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:11647: result: no" >&5
++echo "$as_me:11651: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -11712,11 +11716,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:11715: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:11719: 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 11719 "configure"
++#line 11723 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11728,25 +11732,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11731: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11735: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11734: \$? = $ac_status" >&5
++  echo "$as_me:11738: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11737: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11741: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11740: \$? = $ac_status" >&5
++  echo "$as_me:11744: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:11742: result: yes" >&5
++  echo "$as_me:11746: 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:11749: result: no" >&5
++echo "$as_me:11753: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -11761,7 +11765,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:11764: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:11768: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -11769,7 +11773,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:11772: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:11776: 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
+@@ -11779,7 +11783,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11782 "configure"
++#line 11786 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11791,23 +11795,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11794: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11798: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11797: \$? = $ac_status" >&5
++  echo "$as_me:11801: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11800: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11804: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11803: \$? = $ac_status" >&5
++  echo "$as_me:11807: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:11805: result: yes" >&5
++  echo "$as_me:11809: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:11810: result: no" >&5
++echo "$as_me:11814: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -11827,7 +11831,7 @@
+ 
+ 	;;
+ (*)
+-	{ { echo "$as_me:11830: error: unexpected screen-value: $cf_cv_screen" >&5
++	{ { echo "$as_me:11834: error: unexpected screen-value: $cf_cv_screen" >&5
+ echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -11866,10 +11870,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:11869: \"$cf_try\"") >&5
++		{ (eval echo "$as_me:11873: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11872: \$? = $ac_status" >&5
++  echo "$as_me:11876: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 		if test -f conftest.out ; then
+ 			cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ 	][ 	]*//" conftest.out`
+@@ -11887,17 +11891,17 @@
+ 
+ cf_cv_timestamp=`date`
+ 
+-echo "$as_me:11890: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
++echo "$as_me:11894: 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:11893: checking if KEY_RESIZE is supported" >&5
++echo "$as_me:11897: checking if KEY_RESIZE is supported" >&5
+ echo $ECHO_N "checking if KEY_RESIZE is supported... $ECHO_C" >&6
+ if test "${cf_cv_curses_resizes+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11900 "configure"
++#line 11904 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11909,16 +11913,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11912: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11916: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11915: \$? = $ac_status" >&5
++  echo "$as_me:11919: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11918: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11922: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11921: \$? = $ac_status" >&5
++  echo "$as_me:11925: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_resizes=yes
+ else
+@@ -11928,12 +11932,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:11931: result: $cf_cv_curses_resizes" >&5
++echo "$as_me:11935: result: $cf_cv_curses_resizes" >&5
+ echo "${ECHO_T}$cf_cv_curses_resizes" >&6
+ cf_cv_enable_sigwinch=0
+ test "$cf_cv_curses_resizes" = yes && cf_cv_enable_sigwinch=1
+ 
+-echo "$as_me:11936: checking if you want to have a library-prefix" >&5
++echo "$as_me:11940: 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.
+@@ -11943,7 +11947,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:11946: result: $with_lib_prefix" >&5
++echo "$as_me:11950: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test "$with_lib_prefix" = auto
+@@ -11981,7 +11985,7 @@
+ 	test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
+ fi
+ 
+-echo "$as_me:11984: checking for default loader flags" >&5
++echo "$as_me:11988: 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=''   ;;
+@@ -11989,13 +11993,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:11992: result: $LD_MODEL" >&5
++echo "$as_me:11996: 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:11998: checking for an rpath option" >&5
++	echo "$as_me:12002: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -12026,12 +12030,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:12029: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:12033: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:12034: checking if we need a space after rpath option" >&5
++		echo "$as_me:12038: 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"
+ 
+@@ -12052,7 +12056,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12055 "configure"
++#line 12059 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12064,16 +12068,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12067: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12071: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12070: \$? = $ac_status" >&5
++  echo "$as_me:12074: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12073: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12077: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12076: \$? = $ac_status" >&5
++  echo "$as_me:12080: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -12083,7 +12087,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:12086: result: $cf_rpath_space" >&5
++		echo "$as_me:12090: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -12105,7 +12109,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:12108: checking whether to use release or ABI version in shared library file names" >&5
++	echo "$as_me:12112: checking whether to use release or ABI version in shared library file names" >&5
+ echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
+ 
+ # Check whether --with-shlib-version or --without-shlib-version was given.
+@@ -12120,9 +12124,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:12123: result: $withval" >&5
++		echo "$as_me:12127: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:12125: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:12129: 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; }; }
+ 		;;
+@@ -12131,7 +12135,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:12134: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:12138: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -12154,14 +12158,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:12157: checking which $CC option to use" >&5
++		echo "$as_me:12161: 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 12164 "configure"
++#line 12168 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12173,16 +12177,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12176: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12180: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12179: \$? = $ac_status" >&5
++  echo "$as_me:12183: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12182: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12186: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12185: \$? = $ac_status" >&5
++  echo "$as_me:12189: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -12191,7 +12195,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		done
+-		echo "$as_me:12194: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:12198: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -12262,7 +12266,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:12265: checking if ld -search_paths_first works" >&5
++		echo "$as_me:12269: 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
+@@ -12271,7 +12275,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12274 "configure"
++#line 12278 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12283,16 +12287,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12286: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12290: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12289: \$? = $ac_status" >&5
++  echo "$as_me:12293: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12292: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12296: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12295: \$? = $ac_status" >&5
++  echo "$as_me:12299: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -12303,7 +12307,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:12306: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:12310: 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"
+@@ -12653,7 +12657,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12656 "configure"
++#line 12660 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12665,16 +12669,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12668: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12672: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12671: \$? = $ac_status" >&5
++  echo "$as_me:12675: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12674: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12678: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12677: \$? = $ac_status" >&5
++  echo "$as_me:12681: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -12711,7 +12715,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:12714: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:12718: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -12721,7 +12725,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <
+ int main(int argc, char *argv[])
+ {
+@@ -12733,18 +12737,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:12736: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:12740: 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:12738: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:12742: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12741: \$? = $ac_status" >&5
++  echo "$as_me:12745: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-				echo "$as_me:12743: result: yes" >&5
++				echo "$as_me:12747: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:12747: result: no" >&5
++				echo "$as_me:12751: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -12759,17 +12763,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:12762: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:12766: 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}:12766: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:12770: 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:12772: checking if you want to link sample programs with rpath option" >&5
++	echo "$as_me:12776: 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.
+@@ -12779,7 +12783,7 @@
+ else
+   with_rpath_link=yes
+ fi;
+-	echo "$as_me:12782: result: $with_rpath_link" >&5
++	echo "$as_me:12786: result: $with_rpath_link" >&5
+ echo "${ECHO_T}$with_rpath_link" >&6
+ 	if test "$with_rpath_link" = no
+ 	then
+@@ -12792,7 +12796,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:12795: checking if you want broken-linker support code" >&5
++echo "$as_me:12799: 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.
+@@ -12802,7 +12806,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:12805: result: $with_broken_linker" >&5
++echo "$as_me:12809: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : "${BROKEN_LINKER:=0}"
+@@ -12817,14 +12821,14 @@
+ 
+ # Check to define _XOPEN_SOURCE "automatically"
+ 
+-echo "$as_me:12820: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:12824: 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 12827 "configure"
++#line 12831 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12843,16 +12847,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12846: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12850: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12849: \$? = $ac_status" >&5
++  echo "$as_me:12853: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12852: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12856: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12855: \$? = $ac_status" >&5
++  echo "$as_me:12859: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -12863,7 +12867,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12866: result: $cf_cv_posix_visible" >&5
++echo "$as_me:12870: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -12905,14 +12909,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:12908: checking if this is the GNU C library" >&5
++echo "$as_me:12912: 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 12915 "configure"
++#line 12919 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12931,16 +12935,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12934: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12938: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12937: \$? = $ac_status" >&5
++  echo "$as_me:12941: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12940: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12944: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12943: \$? = $ac_status" >&5
++  echo "$as_me:12947: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -12951,7 +12955,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12954: result: $cf_cv_gnu_library" >&5
++echo "$as_me:12958: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -12959,7 +12963,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:12962: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:12966: 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
+@@ -12971,7 +12975,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12974 "configure"
++#line 12978 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12990,16 +12994,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12993: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12997: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12996: \$? = $ac_status" >&5
++  echo "$as_me:13000: \$? = $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:13003: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13002: \$? = $ac_status" >&5
++  echo "$as_me:13006: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -13011,12 +13015,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:13014: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:13018: 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:13019: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:13023: 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
+@@ -13121,7 +13125,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13124 "configure"
++#line 13128 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -13141,16 +13145,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13144: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13148: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13147: \$? = $ac_status" >&5
++  echo "$as_me:13151: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13150: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13154: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13153: \$? = $ac_status" >&5
++  echo "$as_me:13157: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -13161,7 +13165,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13164: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:13168: 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
+@@ -13170,14 +13174,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:13173: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:13177: 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 13180 "configure"
++#line 13184 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13192,16 +13196,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13195: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13199: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13198: \$? = $ac_status" >&5
++  echo "$as_me:13202: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13201: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13205: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13204: \$? = $ac_status" >&5
++  echo "$as_me:13208: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -13308,7 +13312,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13311 "configure"
++#line 13315 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13323,16 +13327,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13326: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13330: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13329: \$? = $ac_status" >&5
++  echo "$as_me:13333: \$? = $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:13336: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13335: \$? = $ac_status" >&5
++  echo "$as_me:13339: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -13347,12 +13351,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13350: result: $cf_cv_gnu_source" >&5
++echo "$as_me:13354: 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:13355: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:13359: 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
+@@ -13362,7 +13366,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13365 "configure"
++#line 13369 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13377,16 +13381,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13380: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13384: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13383: \$? = $ac_status" >&5
++  echo "$as_me:13387: \$? = $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:13390: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13389: \$? = $ac_status" >&5
++  echo "$as_me:13393: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -13397,7 +13401,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13400: result: $cf_cv_default_source" >&5
++echo "$as_me:13404: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -13434,16 +13438,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:13437: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:13441: 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}:13443: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:13447: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13446 "configure"
++#line 13450 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13458,16 +13462,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13461: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13465: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13464: \$? = $ac_status" >&5
++  echo "$as_me:13468: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13467: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13471: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13470: \$? = $ac_status" >&5
++  echo "$as_me:13474: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -13488,7 +13492,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13491 "configure"
++#line 13495 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13503,16 +13507,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13506: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13510: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13509: \$? = $ac_status" >&5
++  echo "$as_me:13513: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13512: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13516: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13515: \$? = $ac_status" >&5
++  echo "$as_me:13519: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13523,7 +13527,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:13526: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:13530: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -13531,10 +13535,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:13534: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:13538: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13537 "configure"
++#line 13541 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13549,16 +13553,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13552: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13556: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13555: \$? = $ac_status" >&5
++  echo "$as_me:13559: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13558: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13562: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13561: \$? = $ac_status" >&5
++  echo "$as_me:13565: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13574,7 +13578,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13577: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:13581: 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
+@@ -13691,7 +13695,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:13694: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:13698: 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
+@@ -13723,14 +13727,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:13726: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:13730: 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 13733 "configure"
++#line 13737 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13748,16 +13752,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13751: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13755: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13754: \$? = $ac_status" >&5
++  echo "$as_me:13758: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13757: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13761: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13760: \$? = $ac_status" >&5
++  echo "$as_me:13764: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -13769,7 +13773,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13772 "configure"
++#line 13776 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13787,16 +13791,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13790: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13794: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13793: \$? = $ac_status" >&5
++  echo "$as_me:13797: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13796: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13800: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13799: \$? = $ac_status" >&5
++  echo "$as_me:13803: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -13811,7 +13815,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13814: result: $cf_cv_xopen_source" >&5
++echo "$as_me:13818: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -13971,16 +13975,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:13974: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:13978: 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}:13980: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:13984: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13983 "configure"
++#line 13987 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13995,16 +13999,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13998: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14002: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14001: \$? = $ac_status" >&5
++  echo "$as_me:14005: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14004: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14008: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14007: \$? = $ac_status" >&5
++  echo "$as_me:14011: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -14025,7 +14029,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14028 "configure"
++#line 14032 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14040,16 +14044,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14043: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14047: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14046: \$? = $ac_status" >&5
++  echo "$as_me:14050: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14049: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14053: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14052: \$? = $ac_status" >&5
++  echo "$as_me:14056: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -14060,7 +14064,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:14063: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:14067: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -14068,10 +14072,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:14071: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:14075: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14074 "configure"
++#line 14078 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14086,16 +14090,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14089: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14093: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14092: \$? = $ac_status" >&5
++  echo "$as_me:14096: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14095: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14099: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14098: \$? = $ac_status" >&5
++  echo "$as_me:14102: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -14111,7 +14115,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14114: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:14118: 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
+@@ -14224,10 +14228,10 @@
+ 	if test "$cf_cv_xopen_source" = no ; then
+ 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+ 
+-echo "${as_me:-configure}:14227: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:14231: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14230 "configure"
++#line 14234 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14245,23 +14249,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14248: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14252: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14251: \$? = $ac_status" >&5
++  echo "$as_me:14255: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14254: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14258: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14257: \$? = $ac_status" >&5
++  echo "$as_me:14261: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-			{ echo "$as_me:14264: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++			{ echo "$as_me:14268: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ 			CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -14284,7 +14288,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}:14287: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:14291: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -14296,7 +14300,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}:14299: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:14303: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -14384,7 +14388,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:14387: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:14391: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -14394,7 +14398,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:14397: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:14401: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -14404,7 +14408,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}:14407: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:14411: 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"
+@@ -14416,10 +14420,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:14419: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:14423: 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 14422 "configure"
++#line 14426 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14434,16 +14438,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14437: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14441: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14440: \$? = $ac_status" >&5
++  echo "$as_me:14444: \$? = $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:14447: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14446: \$? = $ac_status" >&5
++  echo "$as_me:14450: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -14452,12 +14456,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:14455: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:14459: 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 14460 "configure"
++#line 14464 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14472,16 +14476,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14475: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14479: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14478: \$? = $ac_status" >&5
++  echo "$as_me:14482: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14481: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14485: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14484: \$? = $ac_status" >&5
++  echo "$as_me:14488: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -14492,19 +14496,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:14495: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:14499: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:14500: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:14504: 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 14507 "configure"
++#line 14511 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14522,16 +14526,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14525: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14529: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14528: \$? = $ac_status" >&5
++  echo "$as_me:14532: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14531: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14535: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14534: \$? = $ac_status" >&5
++  echo "$as_me:14538: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -14543,7 +14547,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14546 "configure"
++#line 14550 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14561,16 +14565,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14564: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14568: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14567: \$? = $ac_status" >&5
++  echo "$as_me:14571: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14570: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14574: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14573: \$? = $ac_status" >&5
++  echo "$as_me:14577: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -14585,7 +14589,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14588: result: $cf_cv_xopen_source" >&5
++echo "$as_me:14592: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -14732,13 +14736,13 @@
+ fi
+ fi # cf_cv_posix_visible
+ 
+-echo "$as_me:14735: checking for ANSI C header files" >&5
++echo "$as_me:14739: 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 14741 "configure"
++#line 14745 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -14746,13 +14750,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:14749: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:14753: \"$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:14755: \$? = $ac_status" >&5
++  echo "$as_me:14759: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14774,7 +14778,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 14777 "configure"
++#line 14781 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -14792,7 +14796,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 14795 "configure"
++#line 14799 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -14813,7 +14817,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14816 "configure"
++#line 14820 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -14839,15 +14843,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:14842: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14846: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14845: \$? = $ac_status" >&5
++  echo "$as_me:14849: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:14847: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14851: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14850: \$? = $ac_status" >&5
++  echo "$as_me:14854: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -14860,7 +14864,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:14863: result: $ac_cv_header_stdc" >&5
++echo "$as_me:14867: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -14876,28 +14880,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:14879: checking for $ac_header" >&5
++echo "$as_me:14883: 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 14885 "configure"
++#line 14889 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14891: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14895: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14894: \$? = $ac_status" >&5
++  echo "$as_me:14898: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14897: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14901: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14900: \$? = $ac_status" >&5
++  echo "$as_me:14904: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -14907,7 +14911,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14910: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:14914: 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:14924: checking whether exit is declared" >&5
+ echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
+ if test "${ac_cv_have_decl_exit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14926 "configure"
++#line 14930 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14938,16 +14942,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14941: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14945: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14944: \$? = $ac_status" >&5
++  echo "$as_me:14948: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14947: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14951: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14950: \$? = $ac_status" >&5
++  echo "$as_me:14954: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_have_decl_exit=yes
+ else
+@@ -14957,7 +14961,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14960: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:14964: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+ 
+ # Check whether --enable-largefile or --disable-largefile was given.
+@@ -14967,7 +14971,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:14970: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:14974: 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
+@@ -14979,7 +14983,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 14982 "configure"
++#line 14986 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14999,16 +15003,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15002: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15006: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15005: \$? = $ac_status" >&5
++  echo "$as_me:15009: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15008: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15012: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15011: \$? = $ac_status" >&5
++  echo "$as_me:15015: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -15018,16 +15022,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15021: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15025: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15024: \$? = $ac_status" >&5
++  echo "$as_me:15028: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15027: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15031: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15030: \$? = $ac_status" >&5
++  echo "$as_me:15034: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -15041,13 +15045,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:15044: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:15048: 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:15050: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:15054: 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
+@@ -15055,7 +15059,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15058 "configure"
++#line 15062 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15075,16 +15079,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15078: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15082: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15081: \$? = $ac_status" >&5
++  echo "$as_me:15085: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15084: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15088: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15087: \$? = $ac_status" >&5
++  echo "$as_me:15091: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -15093,7 +15097,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15096 "configure"
++#line 15100 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -15114,16 +15118,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15117: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15121: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15120: \$? = $ac_status" >&5
++  echo "$as_me:15124: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15123: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15127: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15126: \$? = $ac_status" >&5
++  echo "$as_me:15130: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -15134,7 +15138,7 @@
+   break
+ done
+ fi
+-echo "$as_me:15137: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:15141: 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
+ 
+@@ -15144,7 +15148,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:15147: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:15151: 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
+@@ -15152,7 +15156,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15155 "configure"
++#line 15159 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15172,16 +15176,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15175: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15179: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15178: \$? = $ac_status" >&5
++  echo "$as_me:15182: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15181: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15185: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15184: \$? = $ac_status" >&5
++  echo "$as_me:15188: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -15190,7 +15194,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15193 "configure"
++#line 15197 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -15211,16 +15215,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15214: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15218: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15217: \$? = $ac_status" >&5
++  echo "$as_me:15221: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15220: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15224: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15223: \$? = $ac_status" >&5
++  echo "$as_me:15227: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -15231,7 +15235,7 @@
+   break
+ done
+ fi
+-echo "$as_me:15234: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:15238: 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
+ 
+@@ -15244,7 +15248,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:15247: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:15251: 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
+@@ -15252,7 +15256,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15255 "configure"
++#line 15259 "configure"
+ #include "confdefs.h"
+ #include 
+     #include 
+@@ -15267,16 +15271,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15270: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15274: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15273: \$? = $ac_status" >&5
++  echo "$as_me:15277: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15276: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15280: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15279: \$? = $ac_status" >&5
++  echo "$as_me:15283: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -15285,7 +15289,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15288 "configure"
++#line 15292 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -15301,16 +15305,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15304: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15308: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15307: \$? = $ac_status" >&5
++  echo "$as_me:15311: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15310: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15314: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15313: \$? = $ac_status" >&5
++  echo "$as_me:15317: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -15321,7 +15325,7 @@
+   break
+ done
+ fi
+-echo "$as_me:15324: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:15328: 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
+ 
+@@ -15335,13 +15339,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:15338: checking for fseeko" >&5
++echo "$as_me:15342: 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 15344 "configure"
++#line 15348 "configure"
+ #include "confdefs.h"
+ #include 
+                              #include 
+@@ -15355,16 +15359,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15358: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15362: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15361: \$? = $ac_status" >&5
++  echo "$as_me:15365: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15364: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15368: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15367: \$? = $ac_status" >&5
++  echo "$as_me:15371: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -15374,7 +15378,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15377: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:15381: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -15413,14 +15417,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:15416: checking whether to use struct dirent64" >&5
++	echo "$as_me:15420: 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 15423 "configure"
++#line 15427 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -15447,16 +15451,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15450: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15454: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15453: \$? = $ac_status" >&5
++  echo "$as_me:15457: \$? = $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:15460: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15459: \$? = $ac_status" >&5
++  echo "$as_me:15463: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -15467,7 +15471,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15470: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:15474: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -15477,7 +15481,7 @@
+ 	fi
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:15480: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:15484: 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.
+@@ -15487,7 +15491,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:15490: result: $with_rcs_ids" >&5
++echo "$as_me:15494: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "$with_rcs_ids" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -15497,7 +15501,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15500: checking if you want to build with function extensions" >&5
++echo "$as_me:15504: 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.
+@@ -15507,7 +15511,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:15510: result: $with_ext_funcs" >&5
++echo "$as_me:15514: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "$with_ext_funcs" = yes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -15525,7 +15529,7 @@
+ fi
+ 
+ ###   use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:15528: checking for extended use of const keyword" >&5
++echo "$as_me:15532: 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.
+@@ -15535,7 +15539,7 @@
+ else
+   with_ext_const=no
+ fi;
+-echo "$as_me:15538: result: $with_ext_const" >&5
++echo "$as_me:15542: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "$with_ext_const" = yes ; then
+@@ -15545,7 +15549,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:15548: checking if you want all development code" >&5
++echo "$as_me:15552: 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.
+@@ -15555,7 +15559,7 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:15558: result: $with_develop" >&5
++echo "$as_me:15562: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###############################################################################
+@@ -15564,7 +15568,7 @@
+ # This is still experimental (20080329), but should ultimately be moved to
+ # the script-block --with-normal, etc.
+ 
+-echo "$as_me:15567: checking if you want to link with the pthread library" >&5
++echo "$as_me:15571: 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.
+@@ -15574,27 +15578,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:15577: result: $with_pthread" >&5
++echo "$as_me:15581: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:15581: checking for pthread.h" >&5
++	echo "$as_me:15585: 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 15587 "configure"
++#line 15591 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:15591: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:15595: \"$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:15597: \$? = $ac_status" >&5
++  echo "$as_me:15601: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15613,7 +15617,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:15616: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:15620: 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
+ 
+@@ -15623,7 +15627,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:15626: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:15630: 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"
+ 
+@@ -15644,7 +15648,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15647 "configure"
++#line 15651 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15661,16 +15665,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15664: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15668: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15667: \$? = $ac_status" >&5
++  echo "$as_me:15671: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15670: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15674: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15673: \$? = $ac_status" >&5
++  echo "$as_me:15677: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -15680,7 +15684,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:15683: result: $with_pthread" >&5
++	    echo "$as_me:15687: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -15708,7 +15712,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:15711: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:15715: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -15717,7 +15721,7 @@
+ 
+ fi
+ 
+-echo "$as_me:15720: checking if you want to use weak-symbols for pthreads" >&5
++echo "$as_me:15724: 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.
+@@ -15727,18 +15731,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-echo "$as_me:15730: result: $use_weak_symbols" >&5
++echo "$as_me:15734: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ if test "$use_weak_symbols" = yes ; then
+ 
+-echo "$as_me:15734: checking if $CC supports weak symbols" >&5
++echo "$as_me:15738: 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 15741 "configure"
++#line 15745 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15764,16 +15768,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15767: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15771: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15770: \$? = $ac_status" >&5
++  echo "$as_me:15774: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15773: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15777: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15776: \$? = $ac_status" >&5
++  echo "$as_me:15780: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -15784,7 +15788,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15787: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:15791: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ else
+@@ -15813,13 +15817,13 @@
+ fi
+ 
+ # OpenSUSE is installing ncurses6, using reentrant option.
+-echo "$as_me:15816: checking for _nc_TABSIZE" >&5
++echo "$as_me:15820: 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 15822 "configure"
++#line 15826 "configure"
+ #include "confdefs.h"
+ #define _nc_TABSIZE autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15850,16 +15854,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15853: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15857: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15856: \$? = $ac_status" >&5
++  echo "$as_me:15860: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15859: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15863: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15862: \$? = $ac_status" >&5
++  echo "$as_me:15866: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func__nc_TABSIZE=yes
+ else
+@@ -15869,7 +15873,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15872: result: $ac_cv_func__nc_TABSIZE" >&5
++echo "$as_me:15876: 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
+@@ -15881,7 +15885,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:15884: checking if you want experimental reentrant code" >&5
++echo "$as_me:15888: 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.
+@@ -15891,7 +15895,7 @@
+ else
+   with_reentrant=$assume_reentrant
+ fi;
+-echo "$as_me:15894: result: $with_reentrant" >&5
++echo "$as_me:15898: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "$with_reentrant" = yes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -15914,7 +15918,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:15917: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:15921: 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.
+@@ -15924,7 +15928,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:15927: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:15931: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -15938,7 +15942,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:15941: checking if you want to see long compiling messages" >&5
++echo "$as_me:15945: 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.
+@@ -15972,10 +15976,10 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:15975: result: $enableval" >&5
++echo "$as_me:15979: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+-echo "$as_me:15978: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:15982: 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.
+@@ -15992,17 +15996,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:15995: result: $enable_stdnoreturn" >&5
++echo "$as_me:15999: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:15999: checking for C11 _Noreturn feature" >&5
++echo "$as_me:16003: 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 16005 "configure"
++#line 16009 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -16018,16 +16022,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16021: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16025: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16024: \$? = $ac_status" >&5
++  echo "$as_me:16028: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16027: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16031: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16030: \$? = $ac_status" >&5
++  echo "$as_me:16034: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -16038,7 +16042,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16041: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:16045: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -16094,16 +16098,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16097: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16101: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16102: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16106: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16106: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16110: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -16142,16 +16146,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16145: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16149: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16150: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16154: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16154: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16158: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -16190,23 +16194,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16193: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16197: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16198: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16202: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16202: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16206: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:16209: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:16213: 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.
+@@ -16223,7 +16227,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:16226: result: $enable_warnings" >&5
++echo "$as_me:16230: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -16247,7 +16251,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16250 "configure"
++#line 16254 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16262,26 +16266,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16265: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16269: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16268: \$? = $ac_status" >&5
++  echo "$as_me:16272: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16271: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16275: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16274: \$? = $ac_status" >&5
++  echo "$as_me:16278: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:16277: checking for X11/Xt const-feature" >&5
++echo "$as_me:16281: 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 16284 "configure"
++#line 16288 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -16299,16 +16303,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16302: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16306: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16305: \$? = $ac_status" >&5
++  echo "$as_me:16309: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16308: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16312: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16311: \$? = $ac_status" >&5
++  echo "$as_me:16315: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -16323,7 +16327,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16326: result: $cf_cv_const_x_string" >&5
++echo "$as_me:16330: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -16352,7 +16356,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:16375: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -16384,12 +16388,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:16387: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:16391: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16390: \$? = $ac_status" >&5
++  echo "$as_me:16394: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:16392: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:16396: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -16397,7 +16401,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:16400: checking for $CC warning options..." >&5
++	{ echo "$as_me:16404: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -16420,12 +16424,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:16423: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:16427: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16426: \$? = $ac_status" >&5
++  echo "$as_me:16430: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:16428: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:16432: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -16433,7 +16437,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:16436: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:16440: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -16443,7 +16447,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:16446: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:16450: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -16476,10 +16480,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:16479: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:16483: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -16529,12 +16533,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:16532: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:16536: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16535: \$? = $ac_status" >&5
++  echo "$as_me:16539: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:16537: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:16541: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -16602,7 +16606,7 @@
+ fi
+ 
+ ###	use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:16605: checking if you want to enable runtime assertions" >&5
++echo "$as_me:16609: 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.
+@@ -16612,7 +16616,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:16615: result: $with_assertions" >&5
++echo "$as_me:16619: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -16665,7 +16669,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16668: checking whether to add trace feature to all models" >&5
++echo "$as_me:16672: 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.
+@@ -16675,7 +16679,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:16678: result: $cf_with_trace" >&5
++echo "$as_me:16682: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "$cf_with_trace" = yes ; then
+@@ -16689,7 +16693,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:16692: checking if we want to use GNAT projects" >&5
++echo "$as_me:16696: 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.
+@@ -16706,21 +16710,21 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:16709: result: $enable_gnat_projects" >&5
++echo "$as_me:16713: 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:16716: checking if ssp library is needed" >&5
++echo "$as_me:16720: 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 16723 "configure"
++#line 16727 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16737,16 +16741,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16740: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16744: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16743: \$? = $ac_status" >&5
++  echo "$as_me:16747: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16746: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16750: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16749: \$? = $ac_status" >&5
++  echo "$as_me:16753: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -16756,7 +16760,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16759 "configure"
++#line 16763 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16773,16 +16777,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16776: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16780: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16779: \$? = $ac_status" >&5
++  echo "$as_me:16783: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16782: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16786: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16785: \$? = $ac_status" >&5
++  echo "$as_me:16789: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -16796,7 +16800,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16799: result: $cf_cv_need_libssp" >&5
++echo "$as_me:16803: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -16824,13 +16828,13 @@
+ (*)
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:16827: checking for clock_gettime" >&5
++echo "$as_me:16831: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16833 "configure"
++#line 16837 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16861,16 +16865,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16864: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16868: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16867: \$? = $ac_status" >&5
++  echo "$as_me:16871: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16870: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16874: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16873: \$? = $ac_status" >&5
++  echo "$as_me:16877: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -16880,12 +16884,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16883: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:16887: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:16888: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:16892: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16893,7 +16897,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16896 "configure"
++#line 16900 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16912,16 +16916,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16915: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16919: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16918: \$? = $ac_status" >&5
++  echo "$as_me:16922: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16921: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16925: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16924: \$? = $ac_status" >&5
++  echo "$as_me:16928: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -16932,7 +16936,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16935: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:16939: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -16944,14 +16948,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:16947: checking if clock_gettime links" >&5
++echo "$as_me:16951: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16954 "configure"
++#line 16958 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -16969,16 +16973,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16972: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16976: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16975: \$? = $ac_status" >&5
++  echo "$as_me:16979: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16978: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16982: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16981: \$? = $ac_status" >&5
++  echo "$as_me:16985: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -16989,7 +16993,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16992: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:16996: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -17003,13 +17007,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:17006: checking for gettimeofday" >&5
++echo "$as_me:17010: 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 17012 "configure"
++#line 17016 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17040,16 +17044,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17043: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17047: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17046: \$? = $ac_status" >&5
++  echo "$as_me:17050: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17049: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17053: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17052: \$? = $ac_status" >&5
++  echo "$as_me:17056: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -17059,7 +17063,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17062: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:17066: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -17069,7 +17073,7 @@
+ 
+ else
+ 
+-echo "$as_me:17072: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:17076: 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
+@@ -17077,7 +17081,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17080 "configure"
++#line 17084 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17096,16 +17100,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17099: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17103: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17102: \$? = $ac_status" >&5
++  echo "$as_me:17106: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17105: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17109: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17108: \$? = $ac_status" >&5
++  echo "$as_me:17112: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -17116,7 +17120,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17119: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:17123: 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
+ 
+@@ -17149,13 +17153,13 @@
+ esac
+ 
+ ###	Checks for header files.
+-echo "$as_me:17152: checking for signed char" >&5
++echo "$as_me:17156: 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 17158 "configure"
++#line 17162 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17170,16 +17174,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17173: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17177: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17176: \$? = $ac_status" >&5
++  echo "$as_me:17180: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17179: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17183: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17182: \$? = $ac_status" >&5
++  echo "$as_me:17186: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -17189,10 +17193,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17192: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:17196: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:17195: checking size of signed char" >&5
++echo "$as_me:17199: 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
+@@ -17201,7 +17205,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17204 "configure"
++#line 17208 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17213,21 +17217,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17216: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17220: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17219: \$? = $ac_status" >&5
++  echo "$as_me:17223: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17222: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17226: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17225: \$? = $ac_status" >&5
++  echo "$as_me:17229: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17230 "configure"
++#line 17234 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17239,16 +17243,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17242: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17246: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17245: \$? = $ac_status" >&5
++  echo "$as_me:17249: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17248: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17252: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17251: \$? = $ac_status" >&5
++  echo "$as_me:17255: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -17264,7 +17268,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17267 "configure"
++#line 17271 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17276,16 +17280,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17279: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17283: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17282: \$? = $ac_status" >&5
++  echo "$as_me:17286: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17285: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17289: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17288: \$? = $ac_status" >&5
++  echo "$as_me:17292: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -17301,7 +17305,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 17304 "configure"
++#line 17308 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17313,16 +17317,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17316: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17320: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17319: \$? = $ac_status" >&5
++  echo "$as_me:17323: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17322: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17326: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17325: \$? = $ac_status" >&5
++  echo "$as_me:17329: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -17335,12 +17339,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:17338: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:17342: 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 17343 "configure"
++#line 17347 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17356,15 +17360,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17359: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17363: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17362: \$? = $ac_status" >&5
++  echo "$as_me:17366: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17364: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17368: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17367: \$? = $ac_status" >&5
++  echo "$as_me:17371: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -17380,7 +17384,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:17383: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:17387: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:17396: 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 17398 "configure"
++#line 17402 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -17410,16 +17414,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17413: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17417: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17416: \$? = $ac_status" >&5
++  echo "$as_me:17420: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17419: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17423: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17422: \$? = $ac_status" >&5
++  echo "$as_me:17426: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -17429,7 +17433,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17432: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17436: 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:17449: 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
+@@ -17450,7 +17454,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17453 "configure"
++#line 17457 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17469,16 +17473,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17472: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17476: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17475: \$? = $ac_status" >&5
++  echo "$as_me:17479: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17478: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17482: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17481: \$? = $ac_status" >&5
++  echo "$as_me:17485: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -17489,14 +17493,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17492: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:17496: 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:17499: checking for opendir in -lx" >&5
++  echo "$as_me:17503: 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
+@@ -17504,7 +17508,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17507 "configure"
++#line 17511 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17523,16 +17527,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17526: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17530: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17529: \$? = $ac_status" >&5
++  echo "$as_me:17533: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17532: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17536: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17535: \$? = $ac_status" >&5
++  echo "$as_me:17539: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -17543,7 +17547,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17546: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:17550: 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"
+@@ -17551,13 +17555,13 @@
+ 
+ fi
+ 
+-echo "$as_me:17554: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:17558: 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 17560 "configure"
++#line 17564 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -17573,16 +17577,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17576: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17580: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17579: \$? = $ac_status" >&5
++  echo "$as_me:17583: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17582: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17586: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17585: \$? = $ac_status" >&5
++  echo "$as_me:17589: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -17592,7 +17596,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17595: result: $ac_cv_header_time" >&5
++echo "$as_me:17599: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -17610,13 +17614,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:17613: checking for an ANSI C-conforming const" >&5
++echo "$as_me:17617: 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 17619 "configure"
++#line 17623 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17678,16 +17682,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17681: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17685: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17684: \$? = $ac_status" >&5
++  echo "$as_me:17688: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17687: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17691: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17690: \$? = $ac_status" >&5
++  echo "$as_me:17694: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -17697,7 +17701,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17700: result: $ac_cv_c_const" >&5
++echo "$as_me:17704: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -17709,7 +17713,7 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:17712: checking if data-only library module links" >&5
++echo "$as_me:17716: 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
+@@ -17717,20 +17721,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:17727: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17726: \$? = $ac_status" >&5
++  echo "$as_me:17730: \$? = $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:17754: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17753: \$? = $ac_status" >&5
++  echo "$as_me:17757: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -17763,7 +17767,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17766 "configure"
++#line 17770 "configure"
+ #include "confdefs.h"
+ 
+ 	extern int testfunc(void);
+@@ -17774,15 +17778,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17777: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17781: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17780: \$? = $ac_status" >&5
++  echo "$as_me:17784: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17782: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17786: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17785: \$? = $ac_status" >&5
++  echo "$as_me:17789: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -17797,7 +17801,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17800: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:17804: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -17816,23 +17820,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17819: checking for $ac_header" >&5
++echo "$as_me:17823: 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 17825 "configure"
++#line 17829 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17829: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:17833: \"$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:17835: \$? = $ac_status" >&5
++  echo "$as_me:17839: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17851,7 +17855,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17854: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17858: 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:17868: 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
+@@ -17872,7 +17876,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17875 "configure"
++#line 17879 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17907,15 +17911,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17910: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17914: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17913: \$? = $ac_status" >&5
++  echo "$as_me:17917: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17915: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17919: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17918: \$? = $ac_status" >&5
++  echo "$as_me:17922: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -17930,16 +17934,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:17933: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:17937: 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:17936: checking for mkstemp" >&5
++	echo "$as_me:17940: 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 17942 "configure"
++#line 17946 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17970,16 +17974,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17973: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17977: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17976: \$? = $ac_status" >&5
++  echo "$as_me:17980: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17979: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17983: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17982: \$? = $ac_status" >&5
++  echo "$as_me:17986: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -17989,7 +17993,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17992: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:17996: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -18010,7 +18014,7 @@
+ if test "$cf_with_ada" != "no" ; then
+ 	if test	"$cf_cv_prog_gnat_correct" = yes; then
+ 
+-	echo "$as_me:18013: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:18017: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -18027,10 +18031,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:18030: result: $ADAFLAGS" >&5
++	echo "$as_me:18034: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:18033: checking if GNATPREP supports -T option" >&5
++echo "$as_me:18037: 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
+@@ -18040,11 +18044,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:18043: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:18047: 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:18047: checking if GNAT supports generics" >&5
++echo "$as_me:18051: 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])
+@@ -18054,7 +18058,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:18057: result: $cf_gnat_generics" >&5
++echo "$as_me:18061: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -18066,7 +18070,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:18069: checking if GNAT supports SIGINT" >&5
++echo "$as_me:18073: 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
+@@ -18114,7 +18118,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:18117: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:18121: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -18127,7 +18131,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:18130: checking if GNAT supports project files" >&5
++echo "$as_me:18134: 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]*)
+@@ -18190,15 +18194,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:18193: result: $cf_gnat_projects" >&5
++echo "$as_me:18197: 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:18199: checking if GNAT supports libraries" >&5
++	echo "$as_me:18203: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:18201: result: $cf_gnat_libraries" >&5
++	echo "$as_me:18205: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -18218,7 +18222,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:18221: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:18225: 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
+@@ -18230,7 +18234,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:18233: checking for Ada95 compiler" >&5
++echo "$as_me:18237: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -18241,12 +18245,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:18244: result: $cf_ada_compiler" >&5
++echo "$as_me:18248: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 		cf_ada_package=terminal_interface
+ 
+-echo "$as_me:18249: checking for Ada95 include directory" >&5
++echo "$as_me:18253: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -18282,7 +18286,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:18285: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:18289: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -18291,10 +18295,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:18294: result: $ADA_INCLUDE" >&5
++echo "$as_me:18298: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:18297: checking for Ada95 object directory" >&5
++echo "$as_me:18301: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -18330,7 +18334,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:18333: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:18337: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -18339,10 +18343,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:18342: result: $ADA_OBJECTS" >&5
++echo "$as_me:18346: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:18345: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:18349: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -18363,11 +18367,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:18366: result: $with_ada_sharedlib" >&5
++echo "$as_me:18370: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+-	{ echo "$as_me:18370: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++	{ echo "$as_me:18374: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+ 
+@@ -18385,7 +18389,7 @@
+ 
+ 		# allow the Ada binding to be renamed
+ 
+-echo "$as_me:18388: checking for Ada95 curses library name" >&5
++echo "$as_me:18392: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -18401,16 +18405,16 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18404: result: $ADA_LIBNAME" >&5
++echo "$as_me:18408: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 	else
+-		{ { echo "$as_me:18408: error: No usable Ada compiler found" >&5
++		{ { echo "$as_me:18412: 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:18413: error: The Ada compiler is needed for this package" >&5
++	{ { echo "$as_me:18417: 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
+@@ -18450,7 +18454,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:18453: checking default library suffix" >&5
++echo "$as_me:18457: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -18461,10 +18465,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:18464: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:18468: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:18467: checking default library-dependency suffix" >&5
++echo "$as_me:18471: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -18547,10 +18551,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:18550: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:18554: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:18553: checking default object directory" >&5
++echo "$as_me:18557: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -18566,7 +18570,7 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:18569: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:18573: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ ### Set up low-level terminfo dependencies for makefiles.
+@@ -18708,7 +18712,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:18711: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:18715: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -18844,7 +18848,7 @@
+ cat >>"$CONFIG_STATUS" <&5
+ echo "$as_me: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -18908,7 +18912,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:18911: error: unrecognized option: $1
++  -*) { { echo "$as_me:18915: 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;}
+@@ -18927,7 +18931,7 @@
+ ## Running config.status.  ##
+ ## ----------------------- ##
+ 
+-This file was extended by $as_me 2.52.20231210, executed with
++This file was extended by $as_me 2.52.20240618, executed with
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+   CONFIG_LINKS    = $CONFIG_LINKS
+@@ -18983,7 +18987,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:18986: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:18990: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -19242,14 +19246,14 @@
+       # is no need to browse any of the substitutions).
+       # These are the two extra sed commands mentioned above.
+       (echo ':t
+-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed
++  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && sed -e 's/\\\\*$//g' -e 's/$/\\/' -e 's/;t t\\/;t t/' -e 't' -e '3,'$ac_max_sed_lines's/$/\\/' "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed
+       # It is possible to make a multiline substitution using escaped newlines.
+       # Ensure that we do not split the substitution between script fragments.
+       ac_BEG=$ac_end
+       ac_END=`expr "$ac_end" + "$ac_max_sed_lines"`
+       sed "1,${ac_BEG}d; ${ac_END}p; q" "$tmp"/subs.sed >"$tmp"/subs.next
+       if test -s "$tmp"/subs.next; then
+-        grep '^s,@[^@,][^@,]*@,.*\\$' "$tmp"/subs.next >"$tmp"/subs.edit
++        grep '^s,@[^@,][^@,]*@,.*$' "$tmp"/subs.next | grep -v '^s,@.*;t t$' >"$tmp"/subs.edit
+         if test ! -s "$tmp"/subs.edit; then
+           grep "^s,@[^@,][^@,]*@,.*,;t t$" "$tmp"/subs.next >"$tmp"/subs.edit
+           if test ! -s "$tmp"/subs.edit; then
+@@ -19347,7 +19351,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:19350: creating $ac_file" >&5
++    { echo "$as_me:19354: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -19365,7 +19369,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:19368: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:19372: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -19378,7 +19382,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:19381: error: cannot find input file: $f" >&5
++           { { echo "$as_me:19385: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -19394,7 +19398,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:19397: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:19401: 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;}
+@@ -19403,7 +19407,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:19406: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:19410: 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;}
+@@ -19448,7 +19452,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:19451: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:19455: 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;}
+@@ -19459,7 +19463,7 @@
+     $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:19462: WARNING: Some variables may not be substituted:
++      { echo "$as_me:19466: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -19508,7 +19512,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:19511: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:19515: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -19519,7 +19523,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:19522: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:19526: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -19532,7 +19536,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:19535: error: cannot find input file: $f" >&5
++           { { echo "$as_me:19539: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -19590,7 +19594,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:19593: $ac_file is unchanged" >&5
++      { echo "$as_me:19597: $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.4145 
+--- ncurses-6.5-20240629+/NEWS	2024-06-29 19:31:28.000000000 +0000
++++ ncurses-6.5-20240706/NEWS	2024-07-06 18:21:47.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4145 2024/06/29 19:31:28 tom Exp $
++-- $Id: NEWS,v 1.4147 2024/07/06 18:21:47 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.
+ 
++20240706
++	+ update configure script to use macro changes from dialog.
++	+ modify CF_NCURSES_PTHREADS to avoid equating package and library
++	  names.
++
+ 20240629
+ 	+ build-fix for ncurses-examples with newer PDCurses, which no longer
+ 	  has stubs for unimplemented features.
+Index: VERSION
+--- ncurses-6.5-20240629+/VERSION	2024-06-29 10:00:32.000000000 +0000
++++ ncurses-6.5-20240706/VERSION	2024-07-06 09:41:29.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20240629
++5:0:10	6.5	20240706
+Index: aclocal.m4
+Prereq:  1.1073 
+--- ncurses-6.5-20240629+/aclocal.m4	2024-06-22 19:57:54.000000000 +0000
++++ ncurses-6.5-20240706/aclocal.m4	2024-07-06 18:27:53.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1073 2024/06/22 19:57:54 tom Exp $
++dnl $Id: aclocal.m4,v 1.1074 2024/07/06 18:27:53 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -1411,7 +1411,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CHECK_LIBTOOL_VERSION version: 2 updated: 2021/05/01 16:24:34
++dnl CF_CHECK_LIBTOOL_VERSION version: 3 updated: 2024/06/12 04:19:01
+ dnl ------------------------
+ dnl Show the version of libtool
+ dnl
+@@ -1427,6 +1427,7 @@
+ 	AC_MSG_CHECKING(version of $LIBTOOL)
+ 	CF_LIBTOOL_VERSION
+ 	AC_MSG_RESULT($cf_cv_libtool_version)
++	ifdef([LT_PACKAGE_VERSION],,[
+ 	if test -n "$cf_cv_libtool_version"
+ 	then
+ 		cf_check_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' -e 's,[[()]],...,g' -e 's,[[ ]],-,g' -e '2,$d'`
+@@ -1440,6 +1441,7 @@
+ 	else
+ 		AC_MSG_ERROR(No version found for $LIBTOOL)
+ 	fi
++	])
+ else
+ 	AC_MSG_ERROR(GNU libtool has not been found)
+ fi
+@@ -4584,9 +4586,12 @@
+ $1="$cf_library_path_list [$]$1"
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LIBTOOL_VERSION version: 1 updated: 2013/04/06 18:03:09
++dnl CF_LIBTOOL_VERSION version: 2 updated: 2024/06/12 04:19:01
+ dnl ------------------
+ AC_DEFUN([CF_LIBTOOL_VERSION],[
++ifdef([LT_PACKAGE_VERSION],[
++	cf_cv_libtool_version=LT_PACKAGE_VERSION
++],[
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+ then
+ 	cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'`
+@@ -4595,6 +4600,7 @@
+ fi
+ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+ ])dnl
++])dnl
+ dnl ---------------------------------------------------------------------------
+ dnl CF_LIB_PREFIX version: 14 updated: 2021/01/01 13:31:04
+ dnl -------------
+@@ -8804,7 +8810,7 @@
+ CF_MSG_LOG([$1])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_VERSION_INFO version: 8 updated: 2021/01/01 13:31:04
++dnl CF_VERSION_INFO version: 9 updated: 2024/06/12 04:04:13
+ dnl ---------------
+ dnl Define several useful symbols derived from the VERSION file.  A separate
+ dnl file is preferred to embedding the version numbers in various scripts.
+@@ -8882,13 +8888,13 @@
+ dnl if a package name is given, define its corresponding version info.  We
+ dnl need the package name to ensure that the defined symbols are unique.
+ ifelse($1,,,[
+-	cf_PACKAGE=$1
+ 	PACKAGE=ifelse($2,,$1,$2)
+ 	AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE",[Define to the package-name])
+ 	AC_SUBST(PACKAGE)
+-	CF_UPPER(cf_PACKAGE,$cf_PACKAGE)
+-	AC_DEFINE_UNQUOTED(${cf_PACKAGE}_VERSION,"${VERSION_MAJOR}.${VERSION_MINOR}")
+-	AC_DEFINE_UNQUOTED(${cf_PACKAGE}_PATCHDATE,${VERSION_PATCH})
++	AH_TEMPLATE([AS_TR_CPP($1[_VERSION])],[version of package])
++	AC_DEFINE_UNQUOTED(AS_TR_CPP($1[_VERSION]),"${VERSION_MAJOR}.${VERSION_MINOR}")
++	AH_TEMPLATE([AS_TR_CPP($1[_PATCHDATE])],[patchdate of package])
++	AC_DEFINE_UNQUOTED(AS_TR_CPP($1[_PATCHDATE]),${VERSION_PATCH})
+ ])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+Index: configure
+--- ncurses-6.5-20240629+/configure	2024-06-22 16:31:27.000000000 +0000
++++ ncurses-6.5-20240706/configure	2024-07-06 18:28:05.000000000 +0000
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ # From configure.in Revision: 1.782 .
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by Autoconf 2.52.20231210.
++# Generated by Autoconf 2.52.20240618.
+ #
+ # Copyright 2003-2022,2023	Thomas E. Dickey
+ # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+@@ -481,6 +481,10 @@
+   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+     x_libraries=$ac_optarg ;;
+ 
++  -*dir | -dvi* | -doc* | -html* | -local* | -pdf* | -ps* )
++    echo "$as_me: WARNING: unsupported option: $ac_option" >&2
++    ;;
++
+   -*) { echo "$as_me: error: unrecognized option: $ac_option
+ Try \`$0 --help' for more information." >&2
+    { (exit 1); exit 1; }; }
+@@ -949,7 +953,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.52.20231210.  Invocation command line was
++generated by GNU Autoconf 2.52.20240618.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -1073,7 +1077,7 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+   if test -r "$ac_site_file"; then
+-    { echo "$as_me:1076: loading site script $ac_site_file" >&5
++    { echo "$as_me:1080: loading site script $ac_site_file" >&5
+ echo "$as_me: loading site script $ac_site_file" >&6;}
+     cat "$ac_site_file" >&5
+     . "$ac_site_file"
+@@ -1084,7 +1088,7 @@
+   # Some versions of bash will fail to source /dev/null (special
+   # files actually), so we avoid doing that.
+   if test -f "$cache_file"; then
+-    { echo "$as_me:1087: loading cache $cache_file" >&5
++    { echo "$as_me:1091: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+       [\\/]* | ?:[\\/]* ) . $cache_file;;
+@@ -1092,7 +1096,7 @@
+     esac
+   fi
+ else
+-  { echo "$as_me:1095: creating cache $cache_file" >&5
++  { echo "$as_me:1099: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+@@ -1108,21 +1112,21 @@
+   eval ac_new_val="\$ac_env_${ac_var}_value"
+   case "$ac_old_set,$ac_new_set" in
+     set,)
+-      { echo "$as_me:1111: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++      { echo "$as_me:1115: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,set)
+-      { echo "$as_me:1115: error: \`$ac_var' was not set in the previous run" >&5
++      { echo "$as_me:1119: error: \`$ac_var' was not set in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,);;
+     *)
+       if test "x$ac_old_val" != "x$ac_new_val"; then
+-        { echo "$as_me:1121: error: \`$ac_var' has changed since the previous run:" >&5
++        { echo "$as_me:1125: error: \`$ac_var' has changed since the previous run:" >&5
+ echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+-        { echo "$as_me:1123:   former value:  $ac_old_val" >&5
++        { echo "$as_me:1127:   former value:  $ac_old_val" >&5
+ echo "$as_me:   former value:  $ac_old_val" >&2;}
+-        { echo "$as_me:1125:   current value: $ac_new_val" >&5
++        { echo "$as_me:1129:   current value: $ac_new_val" >&5
+ echo "$as_me:   current value: $ac_new_val" >&2;}
+         ac_cache_corrupted=:
+       fi;;
+@@ -1141,9 +1145,9 @@
+   fi
+ done
+ if "$ac_cache_corrupted"; then
+-  { echo "$as_me:1144: error: changes in the environment can compromise the build" >&5
++  { echo "$as_me:1148: error: changes in the environment can compromise the build" >&5
+ echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  { { echo "$as_me:1146: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++  { { echo "$as_me:1150: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1172,10 +1176,10 @@
+ echo "#! $SHELL" >conftest.sh
+ echo  "exit 0"   >>conftest.sh
+ chmod +x conftest.sh
+-if { (echo "$as_me:1175: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:1179: PATH=\".;.\"; conftest.sh") >&5
+   (PATH=".;."; conftest.sh) 2>&5
+   ac_status=$?
+-  echo "$as_me:1178: \$? = $ac_status" >&5
++  echo "$as_me:1182: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+   ac_path_separator=';'
+ else
+@@ -1192,7 +1196,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:1195: checking for $ac_word" >&5
++echo "$as_me:1199: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_GREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1207,7 +1211,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_GREP="$ac_prog"
+-echo "$as_me:1210: found $ac_dir/$ac_word" >&5
++echo "$as_me:1214: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1215,10 +1219,10 @@
+ fi
+ GREP=$ac_cv_prog_GREP
+ if test -n "$GREP"; then
+-  echo "$as_me:1218: result: $GREP" >&5
++  echo "$as_me:1222: result: $GREP" >&5
+ echo "${ECHO_T}$GREP" >&6
+ else
+-  echo "$as_me:1221: result: no" >&5
++  echo "$as_me:1225: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1226,7 +1230,7 @@
+ done
+ test -n "$GREP" || GREP=": "
+ 
+-echo "$as_me:1229: checking for egrep" >&5
++echo "$as_me:1233: checking for egrep" >&5
+ echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+ if test "${ac_cv_path_EGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1238,7 +1242,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:1241: checking for $ac_word" >&5
++echo "$as_me:1245: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_EGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1255,7 +1259,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_EGREP="$ac_dir/$ac_word"
+-   echo "$as_me:1258: found $ac_dir/$ac_word" >&5
++   echo "$as_me:1262: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -1266,10 +1270,10 @@
+ EGREP=$ac_cv_path_EGREP
+ 
+ if test -n "$EGREP"; then
+-  echo "$as_me:1269: result: $EGREP" >&5
++  echo "$as_me:1273: result: $EGREP" >&5
+ echo "${ECHO_T}$EGREP" >&6
+ else
+-  echo "$as_me:1272: result: no" >&5
++  echo "$as_me:1276: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1277,12 +1281,12 @@
+ done
+ test -n "$EGREP" || EGREP=": "
+ 
+-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:1280: error: cannot find workable egrep" >&5
++     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:1284: error: cannot find workable egrep" >&5
+ echo "$as_me: error: cannot find workable egrep" >&2;}
+    { (exit 1); exit 1; }; }
+    fi
+ fi
+-echo "$as_me:1285: result: $ac_cv_path_EGREP" >&5
++echo "$as_me:1289: result: $ac_cv_path_EGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_EGREP" >&6
+  EGREP="$ac_cv_path_EGREP"
+ 
+@@ -1293,11 +1297,11 @@
+ cf_cv_abi_default=${NCURSES_MAJOR}
+ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
+ cf_cv_timestamp=`date`
+-echo "$as_me:1296: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&5
++echo "$as_me:1300: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&5
+ echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&6
+ 
+ if test -f "$srcdir/VERSION" ; then
+-	echo "$as_me:1300: checking for package version" >&5
++	echo "$as_me:1304: checking for package version" >&5
+ echo $ECHO_N "checking for package version... $ECHO_C" >&6
+ 
+ 	# if there are not enough fields, cut returns the last one...
+@@ -1309,39 +1313,39 @@
+ 	VERSION="$cf_field1"
+ 
+ 	VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'`
+-	test -z "$VERSION_MAJOR" && { { echo "$as_me:1312: error: missing major-version" >&5
++	test -z "$VERSION_MAJOR" && { { echo "$as_me:1316: error: missing major-version" >&5
+ echo "$as_me: error: missing major-version" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ 	VERSION_MINOR=`echo "$cf_field2" | sed -e 's/^[^.]*\.//' -e 's/-.*//'`
+-	test -z "$VERSION_MINOR" && { { echo "$as_me:1317: error: missing minor-version" >&5
++	test -z "$VERSION_MINOR" && { { echo "$as_me:1321: error: missing minor-version" >&5
+ echo "$as_me: error: missing minor-version" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-	echo "$as_me:1321: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
++	echo "$as_me:1325: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
+ echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6
+ 
+-	echo "$as_me:1324: checking for package patch date" >&5
++	echo "$as_me:1328: checking for package patch date" >&5
+ echo $ECHO_N "checking for package patch date... $ECHO_C" >&6
+ 	VERSION_PATCH=`echo "$cf_field3" | sed -e 's/^[^-]*-//'`
+ 	case .$VERSION_PATCH in
+ 	(.)
+-		{ { echo "$as_me:1329: error: missing patch-date $VERSION_PATCH" >&5
++		{ { echo "$as_me:1333: error: missing patch-date $VERSION_PATCH" >&5
+ echo "$as_me: error: missing patch-date $VERSION_PATCH" >&2;}
+    { (exit 1); exit 1; }; }
+ 		;;
+ 	(.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9])
+ 		;;
+ 	(*)
+-		{ { echo "$as_me:1336: error: illegal patch-date $VERSION_PATCH" >&5
++		{ { echo "$as_me:1340: error: illegal patch-date $VERSION_PATCH" >&5
+ echo "$as_me: error: illegal patch-date $VERSION_PATCH" >&2;}
+    { (exit 1); exit 1; }; }
+ 		;;
+ 	esac
+-	echo "$as_me:1341: result: $VERSION_PATCH" >&5
++	echo "$as_me:1345: result: $VERSION_PATCH" >&5
+ echo "${ECHO_T}$VERSION_PATCH" >&6
+ else
+-	{ { echo "$as_me:1344: error: did not find $srcdir/VERSION" >&5
++	{ { echo "$as_me:1348: error: did not find $srcdir/VERSION" >&5
+ echo "$as_me: error: did not find $srcdir/VERSION" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1349,35 +1353,32 @@
+ # show the actual data that we have for versions:
+ test -n "$verbose" && echo "	ABI VERSION $VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:1352: testing ABI VERSION $VERSION ..." 1>&5
++echo "${as_me:-configure}:1356: testing ABI VERSION $VERSION ..." 1>&5
+ 
+ test -n "$verbose" && echo "	VERSION_MAJOR $VERSION_MAJOR" 1>&6
+ 
+-echo "${as_me:-configure}:1356: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
++echo "${as_me:-configure}:1360: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
+ 
+ test -n "$verbose" && echo "	VERSION_MINOR $VERSION_MINOR" 1>&6
+ 
+-echo "${as_me:-configure}:1360: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
++echo "${as_me:-configure}:1364: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
+ 
+ test -n "$verbose" && echo "	VERSION_PATCH $VERSION_PATCH" 1>&6
+ 
+-echo "${as_me:-configure}:1364: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
++echo "${as_me:-configure}:1368: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
+ 
+-	cf_PACKAGE=NCURSES
+ 	PACKAGE=ncurses
+ 
+ cat >>confdefs.h <>confdefs.h <>confdefs.h <&5
++  { echo "$as_me:1389: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
+ echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;}
+  cf_cv_rel_version=$withval
+ fi;
+@@ -1399,13 +1400,13 @@
+   (0)
+  	;;
+   (*)
+-	{ { echo "$as_me:1402: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
++	{ { echo "$as_me:1403: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
+ echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;}
+    { (exit 1); exit 1; }; }
+  	;;
+   esac
+ else
+-  { { echo "$as_me:1408: error: Release major-version value is empty" >&5
++  { { echo "$as_me:1409: error: Release major-version value is empty" >&5
+ echo "$as_me: error: Release major-version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1415,13 +1416,13 @@
+   (0)
+  	;;
+   (*)
+-	{ { echo "$as_me:1418: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
++	{ { echo "$as_me:1419: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
+ echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;}
+    { (exit 1); exit 1; }; }
+  	;;
+   esac
+ else
+-  { { echo "$as_me:1424: error: Release minor-version value is empty" >&5
++  { { echo "$as_me:1425: error: Release minor-version value is empty" >&5
+ echo "$as_me: error: Release minor-version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1434,7 +1435,7 @@
+ 
+ 	if test "x$cf_cv_abi_version" != "x$withval"
+ 	then
+-		{ echo "$as_me:1437: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
++		{ echo "$as_me:1438: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
+ echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
+ 		case "$cf_cv_rel_version" in
+ 		(5.*)
+@@ -1453,13 +1454,13 @@
+   (0)
+  	;;
+   (*)
+-	{ { echo "$as_me:1456: error: ABI version is not a number: $cf_cv_abi_version" >&5
++	{ { echo "$as_me:1457: error: ABI version is not a number: $cf_cv_abi_version" >&5
+ echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;}
+    { (exit 1); exit 1; }; }
+  	;;
+   esac
+ else
+-  { { echo "$as_me:1462: error: ABI version value is empty" >&5
++  { { echo "$as_me:1463: error: ABI version value is empty" >&5
+ echo "$as_me: error: ABI version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1492,7 +1493,7 @@
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:1495: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++  { { echo "$as_me:1496: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+ echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1502,11 +1503,11 @@
+ 
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+-  { { echo "$as_me:1505: error: cannot run $ac_config_sub" >&5
++  { { echo "$as_me:1506: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:1509: checking build system type" >&5
++echo "$as_me:1510: checking build system type" >&5
+ echo $ECHO_N "checking build system type... $ECHO_C" >&6
+ if test "${ac_cv_build+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1515,23 +1516,23 @@
+ test -z "$ac_cv_build_alias" &&
+   ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+-  { { echo "$as_me:1518: error: cannot guess build type; you must specify one" >&5
++  { { echo "$as_me:1519: error: cannot guess build type; you must specify one" >&5
+ echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+    { (exit 1); exit 1; }; }
+ ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` ||
+-  { { echo "$as_me:1522: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++  { { echo "$as_me:1523: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1527: result: $ac_cv_build" >&5
++echo "$as_me:1528: result: $ac_cv_build" >&5
+ echo "${ECHO_T}$ac_cv_build" >&6
+ build=$ac_cv_build
+ build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+-echo "$as_me:1534: checking host system type" >&5
++echo "$as_me:1535: checking host system type" >&5
+ echo $ECHO_N "checking host system type... $ECHO_C" >&6
+ if test "${ac_cv_host+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1540,12 +1541,12 @@
+ test -z "$ac_cv_host_alias" &&
+   ac_cv_host_alias=$ac_cv_build_alias
+ ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` ||
+-  { { echo "$as_me:1543: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++  { { echo "$as_me:1544: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1548: result: $ac_cv_host" >&5
++echo "$as_me:1549: result: $ac_cv_host" >&5
+ echo "${ECHO_T}$ac_cv_host" >&6
+ host=$ac_cv_host
+ host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1553,7 +1554,7 @@
+ host_os=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+ if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
+-	echo "$as_me:1556: checking target system type" >&5
++	echo "$as_me:1557: checking target system type" >&5
+ echo $ECHO_N "checking target system type... $ECHO_C" >&6
+ if test "${ac_cv_target+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1562,12 +1563,12 @@
+ test "x$ac_cv_target_alias" = "x" &&
+   ac_cv_target_alias=$ac_cv_host_alias
+ ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` ||
+-  { { echo "$as_me:1565: error: $ac_config_sub $ac_cv_target_alias failed" >&5
++  { { echo "$as_me:1566: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1570: result: $ac_cv_target" >&5
++echo "$as_me:1571: result: $ac_cv_target" >&5
+ echo "${ECHO_T}$ac_cv_target" >&6
+ target=$ac_cv_target
+ target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1599,13 +1600,13 @@
+ fi
+ 
+ test -z "$system_name" && system_name="$cf_cv_system_name"
+-test -n "$cf_cv_system_name" && echo "$as_me:1602: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1603: result: Configuring for $cf_cv_system_name" >&5
+ echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
+ 
+ if test ".$system_name" != ".$cf_cv_system_name" ; then
+-	echo "$as_me:1606: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++	echo "$as_me:1607: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+ echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
+-	{ { echo "$as_me:1608: error: \"Please remove config.cache and try again.\"" >&5
++	{ { echo "$as_me:1609: error: \"Please remove config.cache and try again.\"" >&5
+ echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1613,7 +1614,7 @@
+ # Check whether --with-system-type or --without-system-type was given.
+ if test "${with_system_type+set}" = set; then
+   withval="$with_system_type"
+-  { echo "$as_me:1616: WARNING: overriding system type to $withval" >&5
++  { echo "$as_me:1617: WARNING: overriding system type to $withval" >&5
+ echo "$as_me: WARNING: overriding system type to $withval" >&2;}
+ 	cf_cv_system_name=$withval
+ 	host_os=$withval
+@@ -1624,7 +1625,7 @@
+ cf_user_CFLAGS="$CFLAGS"
+ 
+ ###	Default install-location
+-echo "$as_me:1627: checking for fgrep" >&5
++echo "$as_me:1628: checking for fgrep" >&5
+ echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
+ if test "${ac_cv_path_FGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1636,7 +1637,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:1639: checking for $ac_word" >&5
++echo "$as_me:1640: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_FGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1653,7 +1654,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_FGREP="$ac_dir/$ac_word"
+-   echo "$as_me:1656: found $ac_dir/$ac_word" >&5
++   echo "$as_me:1657: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -1664,10 +1665,10 @@
+ FGREP=$ac_cv_path_FGREP
+ 
+ if test -n "$FGREP"; then
+-  echo "$as_me:1667: result: $FGREP" >&5
++  echo "$as_me:1668: result: $FGREP" >&5
+ echo "${ECHO_T}$FGREP" >&6
+ else
+-  echo "$as_me:1670: result: no" >&5
++  echo "$as_me:1671: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1675,16 +1676,16 @@
+ done
+ test -n "$FGREP" || FGREP=": "
+ 
+-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1678: error: cannot find workable fgrep" >&5
++     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1679: error: cannot find workable fgrep" >&5
+ echo "$as_me: error: cannot find workable fgrep" >&2;}
+    { (exit 1); exit 1; }; }
+    fi
+ fi
+-echo "$as_me:1683: result: $ac_cv_path_FGREP" >&5
++echo "$as_me:1684: result: $ac_cv_path_FGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_FGREP" >&6
+  FGREP="$ac_cv_path_FGREP"
+ 
+-echo "$as_me:1687: checking for prefix" >&5
++echo "$as_me:1688: checking for prefix" >&5
+ echo $ECHO_N "checking for prefix... $ECHO_C" >&6
+ if test "x$prefix" = "xNONE" ; then
+ 	case "$cf_cv_system_name" in
+@@ -1696,11 +1697,11 @@
+ 		;;
+ 	esac
+ fi
+-echo "$as_me:1699: result: $prefix" >&5
++echo "$as_me:1700: result: $prefix" >&5
+ echo "${ECHO_T}$prefix" >&6
+ 
+ if test "x$prefix" = "xNONE" ; then
+-echo "$as_me:1703: checking for default include-directory" >&5
++echo "$as_me:1704: checking for default include-directory" >&5
+ echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
+ test -n "$verbose" && echo 1>&6
+ for cf_symbol in \
+@@ -1723,7 +1724,7 @@
+ 	fi
+ 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
+ done
+-echo "$as_me:1726: result: $includedir" >&5
++echo "$as_me:1727: result: $includedir" >&5
+ echo "${ECHO_T}$includedir" >&6
+ fi
+ 
+@@ -1788,20 +1789,20 @@
+   (0)
+  	;;
+   (*)
+-	{ { echo "$as_me:1791: error: ABI altered is not a number: $withval" >&5
++	{ { echo "$as_me:1792: error: ABI altered is not a number: $withval" >&5
+ echo "$as_me: error: ABI altered is not a number: $withval" >&2;}
+    { (exit 1); exit 1; }; }
+  	;;
+   esac
+ else
+-  { { echo "$as_me:1797: error: ABI altered value is empty" >&5
++  { { echo "$as_me:1798: error: ABI altered value is empty" >&5
+ echo "$as_me: error: ABI altered value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ 	if test "$cf_cv_abi_version" != "$withval"
+ 	then
+-		{ echo "$as_me:1804: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
++		{ echo "$as_me:1805: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
+ echo "$as_me: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&2;}
+ 		cf_cv_abi_version=$withval
+ 	fi
+@@ -1831,7 +1832,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:1834: checking for $ac_word" >&5
++echo "$as_me:1835: 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
+@@ -1848,7 +1849,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:1851: found $ac_dir/$ac_word" >&5
++   echo "$as_me:1852: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -1860,10 +1861,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+ 
+ if test -n "$cf_TEMP_gnat"; then
+-  echo "$as_me:1863: result: $cf_TEMP_gnat" >&5
++  echo "$as_me:1864: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+-  echo "$as_me:1866: result: no" >&5
++  echo "$as_me:1867: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1873,7 +1874,7 @@
+ 		unset cf_cv_gnat_version
+ 		unset cf_TEMP_gnat
+ 
+-echo "$as_me:1876: checking for $cf_prog_gnat version" >&5
++echo "$as_me:1877: 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
+@@ -1884,7 +1885,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:1887: result: $cf_cv_gnat_version" >&5
++echo "$as_me:1888: 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
+@@ -1913,7 +1914,7 @@
+ 			cd conftest.src
+ 			for cf_gprconfig in Ada C
+ 			do
+-				echo "$as_me:1916: checking for gprconfig name for $cf_gprconfig" >&5
++				echo "$as_me:1917: 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
+@@ -1932,10 +1933,10 @@
+ 				if test -n "$cf_gprconfig_value"
+ 				then
+ 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+-					echo "$as_me:1935: result: $cf_gprconfig_value" >&5
++					echo "$as_me:1936: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ 				else
+-					echo "$as_me:1938: result: missing" >&5
++					echo "$as_me:1939: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ 					cf_ada_config="#"
+ 					break
+@@ -1948,7 +1949,7 @@
+ 	if test "x$cf_ada_config" != "x#"
+ 	then
+ 
+-echo "$as_me:1951: checking for gnat version" >&5
++echo "$as_me:1952: 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
+@@ -1959,7 +1960,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:1962: result: $cf_cv_gnat_version" >&5
++echo "$as_me:1963: 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
+ 
+@@ -1968,7 +1969,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ echo "$as_me:1971: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:1972: 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
+ 	;;
+@@ -1976,7 +1977,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:1979: checking for $ac_word" >&5
++echo "$as_me:1980: 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
+@@ -1991,7 +1992,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:1994: found $ac_dir/$ac_word" >&5
++echo "$as_me:1995: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2000,20 +2001,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:2003: result: $M4_exists" >&5
++  echo "$as_me:2004: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:2006: result: no" >&5
++  echo "$as_me:2007: 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:2012: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++			{ echo "$as_me:2013: 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:2016: checking if GNAT works" >&5
++			echo "$as_me:2017: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf ./conftest* ./*~conftest*
+@@ -2041,7 +2042,7 @@
+ fi
+ rm -rf ./conftest* ./*~conftest*
+ 
+-			echo "$as_me:2044: result: $cf_cv_prog_gnat_correct" >&5
++			echo "$as_me:2045: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 		fi
+ 	else
+@@ -2057,7 +2058,7 @@
+ 		# Here is a workaround.
+ 		# Extract the first word of "gnatgcc", so it can be a program name with args.
+ set dummy gnatgcc; ac_word=$2
+-echo "$as_me:2060: checking for $ac_word" >&5
++echo "$as_me:2061: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_cf_cv_path_gnatgcc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2074,7 +2075,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_cf_cv_path_gnatgcc="$ac_dir/$ac_word"
+-   echo "$as_me:2077: found $ac_dir/$ac_word" >&5
++   echo "$as_me:2078: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -2086,16 +2087,16 @@
+ cf_cv_path_gnatgcc=$ac_cv_path_cf_cv_path_gnatgcc
+ 
+ if test -n "$cf_cv_path_gnatgcc"; then
+-  echo "$as_me:2089: result: $cf_cv_path_gnatgcc" >&5
++  echo "$as_me:2090: result: $cf_cv_path_gnatgcc" >&5
+ echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
+ else
+-  echo "$as_me:2092: result: no" >&5
++  echo "$as_me:2093: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 		if test "$cf_cv_path_gnatgcc" != no
+ 		then
+-			echo "$as_me:2098: checking for improvement" >&5
++			echo "$as_me:2099: checking for improvement" >&5
+ echo $ECHO_N "checking for improvement... $ECHO_C" >&6
+ 			cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null`
+ 			case "x$cf_file_gnatgcc" in
+@@ -2106,7 +2107,7 @@
+ 				cf_cv_path_gnatgcc=no
+ 				;;
+ 			esac
+-			echo "$as_me:2109: result: $cf_cv_path_gnatgcc" >&5
++			echo "$as_me:2110: result: $cf_cv_path_gnatgcc" >&5
+ echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
+ 			test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc
+ 			cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc"
+@@ -2131,7 +2132,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:2134: checking for $ac_word" >&5
++echo "$as_me:2135: 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
+@@ -2146,7 +2147,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:2149: found $ac_dir/$ac_word" >&5
++echo "$as_me:2150: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2154,10 +2155,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:2157: result: $CC" >&5
++  echo "$as_me:2158: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:2160: result: no" >&5
++  echo "$as_me:2161: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2170,7 +2171,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:2173: checking for $ac_word" >&5
++echo "$as_me:2174: 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
+@@ -2185,7 +2186,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:2188: found $ac_dir/$ac_word" >&5
++echo "$as_me:2189: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2193,10 +2194,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:2196: result: $ac_ct_CC" >&5
++  echo "$as_me:2197: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:2199: result: no" >&5
++  echo "$as_me:2200: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2206,32 +2207,32 @@
+   CC=$ac_ct_CC
+ fi
+ 
+-test -z "$CC" && { { echo "$as_me:2209: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:2210: 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:2214:" \
++echo "$as_me:2215:" \
+      "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo "$2"`
+-{ (eval echo "$as_me:2217: \"$ac_compiler --version &5\"") >&5
++{ (eval echo "$as_me:2218: \"$ac_compiler --version &5\"") >&5
+   (eval $ac_compiler --version &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2220: \$? = $ac_status" >&5
++  echo "$as_me:2221: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:2222: \"$ac_compiler -v &5\"") >&5
++{ (eval echo "$as_me:2223: \"$ac_compiler -v &5\"") >&5
+   (eval $ac_compiler -v &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2225: \$? = $ac_status" >&5
++  echo "$as_me:2226: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:2227: \"$ac_compiler -V &5\"") >&5
++{ (eval echo "$as_me:2228: \"$ac_compiler -V &5\"") >&5
+   (eval $ac_compiler -V &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2230: \$? = $ac_status" >&5
++  echo "$as_me:2231: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2234 "configure"
++#line 2235 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2247,13 +2248,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:2250: checking for C compiler default output" >&5
++echo "$as_me:2251: 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:2253: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:2254: \"$ac_link_default\"") >&5
+   (eval $ac_link_default) 2>&5
+   ac_status=$?
+-  echo "$as_me:2256: \$? = $ac_status" >&5
++  echo "$as_me:2257: \$? = $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
+@@ -2276,34 +2277,34 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:2279: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:2280: 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:2285: result: $ac_file" >&5
++echo "$as_me:2286: 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:2290: checking whether the C compiler works" >&5
++echo "$as_me:2291: 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:2296: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2297: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2299: \$? = $ac_status" >&5
++  echo "$as_me:2300: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+-	{ { echo "$as_me:2306: error: cannot run C compiled programs.
++	{ { echo "$as_me:2307: 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;}
+@@ -2311,24 +2312,24 @@
+     fi
+   fi
+ fi
+-echo "$as_me:2314: result: yes" >&5
++echo "$as_me:2315: 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:2321: checking whether we are cross compiling" >&5
++echo "$as_me:2322: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:2323: result: $cross_compiling" >&5
++echo "$as_me:2324: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+ 
+-echo "$as_me:2326: checking for executable suffix" >&5
++echo "$as_me:2327: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:2328: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2329: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2331: \$? = $ac_status" >&5
++  echo "$as_me:2332: \$? = $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
+@@ -2344,25 +2345,25 @@
+   esac
+ done
+ else
+-  { { echo "$as_me:2347: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:2348: 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:2353: result: $ac_cv_exeext" >&5
++echo "$as_me:2354: 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:2359: checking for object suffix" >&5
++echo "$as_me:2360: 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 2365 "configure"
++#line 2366 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2374,10 +2375,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:2377: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2378: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2380: \$? = $ac_status" >&5
++  echo "$as_me:2381: \$? = $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
+@@ -2389,24 +2390,24 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:2392: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:2393: 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:2399: result: $ac_cv_objext" >&5
++echo "$as_me:2400: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:2403: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:2404: 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 2409 "configure"
++#line 2410 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2421,16 +2422,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2424: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2425: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2427: \$? = $ac_status" >&5
++  echo "$as_me:2428: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2430: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2431: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2433: \$? = $ac_status" >&5
++  echo "$as_me:2434: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -2442,19 +2443,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:2445: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:2446: 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:2451: checking whether $CC accepts -g" >&5
++echo "$as_me:2452: 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 2457 "configure"
++#line 2458 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2466,16 +2467,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2469: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2470: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2472: \$? = $ac_status" >&5
++  echo "$as_me:2473: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2475: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2476: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2478: \$? = $ac_status" >&5
++  echo "$as_me:2479: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cc_g=yes
+ else
+@@ -2485,7 +2486,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:2488: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:2489: 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
+@@ -2512,16 +2513,16 @@
+ #endif
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2515: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2516: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2518: \$? = $ac_status" >&5
++  echo "$as_me:2519: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2521: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2522: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2524: \$? = $ac_status" >&5
++  echo "$as_me:2525: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   for ac_declaration in \
+    ''\
+@@ -2533,7 +2534,7 @@
+    'void exit (int);'
+ do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2536 "configure"
++#line 2537 "configure"
+ #include "confdefs.h"
+ #include 
+ $ac_declaration
+@@ -2546,16 +2547,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2549: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2550: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2552: \$? = $ac_status" >&5
++  echo "$as_me:2553: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2555: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2556: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2558: \$? = $ac_status" >&5
++  echo "$as_me:2559: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -2565,7 +2566,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2568 "configure"
++#line 2569 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -2577,16 +2578,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2580: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2581: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2583: \$? = $ac_status" >&5
++  echo "$as_me:2584: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2586: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2587: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2589: \$? = $ac_status" >&5
++  echo "$as_me:2590: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -2616,11 +2617,11 @@
+ 
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+-	echo "$as_me:2619: checking version of $CC" >&5
++	echo "$as_me:2620: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+-	echo "$as_me:2623: result: $GCC_VERSION" >&5
++	echo "$as_me:2624: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+ 
+@@ -2629,12 +2630,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:2632: checking if this is really Intel C compiler" >&5
++		echo "$as_me:2633: 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 2637 "configure"
++#line 2638 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2651,16 +2652,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2654: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2655: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2657: \$? = $ac_status" >&5
++  echo "$as_me:2658: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2660: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2661: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2663: \$? = $ac_status" >&5
++  echo "$as_me:2664: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -2671,7 +2672,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:2674: result: $INTEL_COMPILER" >&5
++		echo "$as_me:2675: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ 		;;
+ 	esac
+@@ -2680,11 +2681,11 @@
+ CLANG_COMPILER=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:2683: checking if this is really Clang C compiler" >&5
++	echo "$as_me:2684: 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 2687 "configure"
++#line 2688 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2701,16 +2702,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2704: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2705: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2707: \$? = $ac_status" >&5
++  echo "$as_me:2708: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2710: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2711: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2713: \$? = $ac_status" >&5
++  echo "$as_me:2714: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_COMPILER=yes
+ 
+@@ -2720,7 +2721,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:2723: result: $CLANG_COMPILER" >&5
++	echo "$as_me:2724: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+ 
+@@ -2729,30 +2730,30 @@
+ if test "x$CLANG_COMPILER" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:2732: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:2733: 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:2739: checking version of $CC" >&5
++	echo "$as_me:2740: 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:2743: result: $CLANG_VERSION" >&5
++	echo "$as_me:2744: 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:2750: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:2751: 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 2755 "configure"
++#line 2756 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -2766,16 +2767,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:2769: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2770: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2772: \$? = $ac_status" >&5
++  echo "$as_me:2773: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:2775: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2776: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2778: \$? = $ac_status" >&5
++  echo "$as_me:2779: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -2786,13 +2787,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:2789: result: $cf_clang_optok" >&5
++		echo "$as_me:2790: 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}:2795: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:2796: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -2801,7 +2802,7 @@
+ 	done
+ fi
+ 
+-echo "$as_me:2804: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:2805: 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
+@@ -2809,7 +2810,7 @@
+   ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2812 "configure"
++#line 2813 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -2856,16 +2857,16 @@
+ do
+   CC="$ac_save_CC $ac_arg"
+   rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2859: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2860: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2862: \$? = $ac_status" >&5
++  echo "$as_me:2863: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2865: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2866: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2868: \$? = $ac_status" >&5
++  echo "$as_me:2869: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -2882,10 +2883,10 @@
+ 
+ case "x$ac_cv_prog_cc_stdc" in
+   x|xno)
+-    echo "$as_me:2885: result: none needed" >&5
++    echo "$as_me:2886: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+   *)
+-    echo "$as_me:2888: result: $ac_cv_prog_cc_stdc" >&5
++    echo "$as_me:2889: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+     CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+@@ -2893,13 +2894,13 @@
+ # This should have been defined by AC_PROG_CC
+ : "${CC:=cc}"
+ 
+-echo "$as_me:2896: checking \$CFLAGS variable" >&5
++echo "$as_me:2897: checking \$CFLAGS variable" >&5
+ echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
+ case "x$CFLAGS" in
+ (*-[IUD]*)
+-	echo "$as_me:2900: result: broken" >&5
++	echo "$as_me:2901: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2902: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
++	{ echo "$as_me:2903: 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=
+@@ -3007,18 +3008,18 @@
+ 	done
+ 	;;
+ (*)
+-	echo "$as_me:3010: result: ok" >&5
++	echo "$as_me:3011: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+ 
+-echo "$as_me:3015: checking \$CC variable" >&5
++echo "$as_me:3016: checking \$CC variable" >&5
+ echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+ case "$CC" in
+ (*[\ \	]-*)
+-	echo "$as_me:3019: result: broken" >&5
++	echo "$as_me:3020: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:3021: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++	{ echo "$as_me:3022: 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/[ ]*[ ]-[^ ].*//'`
+@@ -3135,19 +3136,19 @@
+ 	done
+ 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
+ 
+-echo "${as_me:-configure}:3138: testing resulting CC: '$CC' ..." 1>&5
++echo "${as_me:-configure}:3139: testing resulting CC: '$CC' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:3142: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
++echo "${as_me:-configure}:3143: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:3146: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
++echo "${as_me:-configure}:3147: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+ 
+ 	;;
+ (*)
+-	echo "$as_me:3150: result: ok" >&5
++	echo "$as_me:3151: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+@@ -3161,7 +3162,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:3164: checking how to run the C preprocessor" >&5
++echo "$as_me:3165: 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
+@@ -3182,18 +3183,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 3185 "configure"
++#line 3186 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:3190: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3191: \"$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:3196: \$? = $ac_status" >&5
++  echo "$as_me:3197: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3216,17 +3217,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3219 "configure"
++#line 3220 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:3223: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3224: \"$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:3229: \$? = $ac_status" >&5
++  echo "$as_me:3230: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3263,7 +3264,7 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:3266: result: $CPP" >&5
++echo "$as_me:3267: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -3273,18 +3274,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 3276 "configure"
++#line 3277 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:3281: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3282: \"$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:3287: \$? = $ac_status" >&5
++  echo "$as_me:3288: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3307,17 +3308,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3310 "configure"
++#line 3311 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:3314: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3315: \"$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:3320: \$? = $ac_status" >&5
++  echo "$as_me:3321: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3345,7 +3346,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:3348: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:3349: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -3358,14 +3359,14 @@
+ ac_main_return="return"
+ 
+ if test $ac_cv_c_compiler_gnu = yes; then
+-    echo "$as_me:3361: checking whether $CC needs -traditional" >&5
++    echo "$as_me:3362: 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 3368 "configure"
++#line 3369 "configure"
+ #include "confdefs.h"
+ #include 
+ int Autoconf = TIOCGETP;
+@@ -3380,7 +3381,7 @@
+ 
+   if test $ac_cv_prog_gcc_traditional = no; then
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3383 "configure"
++#line 3384 "configure"
+ #include "confdefs.h"
+ #include 
+ int Autoconf = TCGETA;
+@@ -3393,14 +3394,14 @@
+ 
+   fi
+ fi
+-echo "$as_me:3396: result: $ac_cv_prog_gcc_traditional" >&5
++echo "$as_me:3397: 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:3403: checking whether $CC understands -c and -o together" >&5
++echo "$as_me:3404: 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
+@@ -3415,15 +3416,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:3418: \"$ac_try\"") >&5
++if { (eval echo "$as_me:3419: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3421: \$? = $ac_status" >&5
++  echo "$as_me:3422: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:3423: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:3424: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3426: \$? = $ac_status" >&5
++  echo "$as_me:3427: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CC_c_o=yes
+@@ -3434,10 +3435,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CC_c_o" = yes; then
+-  echo "$as_me:3437: result: yes" >&5
++  echo "$as_me:3438: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:3440: result: no" >&5
++  echo "$as_me:3441: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3451,7 +3452,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:3454: checking for $ac_word" >&5
++echo "$as_me:3455: 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
+@@ -3468,7 +3469,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:3471: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3472: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3479,10 +3480,10 @@
+ LDCONFIG=$ac_cv_path_LDCONFIG
+ 
+ if test -n "$LDCONFIG"; then
+-  echo "$as_me:3482: result: $LDCONFIG" >&5
++  echo "$as_me:3483: result: $LDCONFIG" >&5
+ echo "${ECHO_T}$LDCONFIG" >&6
+ else
+-  echo "$as_me:3485: result: no" >&5
++  echo "$as_me:3486: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3490,7 +3491,7 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:3493: checking if you want to ensure bool is consistent with C++" >&5
++echo "$as_me:3494: 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.
+@@ -3500,7 +3501,7 @@
+ else
+   cf_with_cxx=yes
+ fi;
+-echo "$as_me:3503: result: $cf_with_cxx" >&5
++echo "$as_me:3504: result: $cf_with_cxx" >&5
+ echo "${ECHO_T}$cf_with_cxx" >&6
+ if test "X$cf_with_cxx" = Xno ; then
+ 	CXX=""
+@@ -3518,7 +3519,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:3521: checking for $ac_word" >&5
++echo "$as_me:3522: 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
+@@ -3533,7 +3534,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:3536: found $ac_dir/$ac_word" >&5
++echo "$as_me:3537: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3541,10 +3542,10 @@
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+-  echo "$as_me:3544: result: $CXX" >&5
++  echo "$as_me:3545: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$as_me:3547: result: no" >&5
++  echo "$as_me:3548: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3557,7 +3558,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:3560: checking for $ac_word" >&5
++echo "$as_me:3561: 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
+@@ -3572,7 +3573,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:3575: found $ac_dir/$ac_word" >&5
++echo "$as_me:3576: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3580,10 +3581,10 @@
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+-  echo "$as_me:3583: result: $ac_ct_CXX" >&5
++  echo "$as_me:3584: result: $ac_ct_CXX" >&5
+ echo "${ECHO_T}$ac_ct_CXX" >&6
+ else
+-  echo "$as_me:3586: result: no" >&5
++  echo "$as_me:3587: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3595,32 +3596,32 @@
+ fi
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:3598:" \
++echo "$as_me:3599:" \
+      "checking for C++ compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:3601: \"$ac_compiler --version &5\"") >&5
++{ (eval echo "$as_me:3602: \"$ac_compiler --version &5\"") >&5
+   (eval $ac_compiler --version &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:3604: \$? = $ac_status" >&5
++  echo "$as_me:3605: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:3606: \"$ac_compiler -v &5\"") >&5
++{ (eval echo "$as_me:3607: \"$ac_compiler -v &5\"") >&5
+   (eval $ac_compiler -v &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:3609: \$? = $ac_status" >&5
++  echo "$as_me:3610: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:3611: \"$ac_compiler -V &5\"") >&5
++{ (eval echo "$as_me:3612: \"$ac_compiler -V &5\"") >&5
+   (eval $ac_compiler -V &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:3614: \$? = $ac_status" >&5
++  echo "$as_me:3615: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 
+-echo "$as_me:3617: checking whether we are using the GNU C++ compiler" >&5
++echo "$as_me:3618: 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 3623 "configure"
++#line 3624 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3635,16 +3636,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3638: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3639: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3641: \$? = $ac_status" >&5
++  echo "$as_me:3642: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3644: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3645: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3647: \$? = $ac_status" >&5
++  echo "$as_me:3648: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -3656,19 +3657,19 @@
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:3659: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "$as_me:3660: 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:3665: checking whether $CXX accepts -g" >&5
++echo "$as_me:3666: 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 3671 "configure"
++#line 3672 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3680,16 +3681,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3683: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3684: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3686: \$? = $ac_status" >&5
++  echo "$as_me:3687: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3689: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3690: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3692: \$? = $ac_status" >&5
++  echo "$as_me:3693: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cxx_g=yes
+ else
+@@ -3699,7 +3700,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3702: result: $ac_cv_prog_cxx_g" >&5
++echo "$as_me:3703: 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
+@@ -3726,7 +3727,7 @@
+    'void exit (int);'
+ do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3729 "configure"
++#line 3730 "configure"
+ #include "confdefs.h"
+ #include 
+ $ac_declaration
+@@ -3739,16 +3740,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3742: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3743: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3745: \$? = $ac_status" >&5
++  echo "$as_me:3746: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3748: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3749: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3751: \$? = $ac_status" >&5
++  echo "$as_me:3752: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -3758,7 +3759,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3761 "configure"
++#line 3762 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -3770,16 +3771,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3773: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3774: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3776: \$? = $ac_status" >&5
++  echo "$as_me:3777: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3779: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3780: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3782: \$? = $ac_status" >&5
++  echo "$as_me:3783: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -3813,7 +3814,7 @@
+ 	then
+ 		# Several of the C++ configurations do not work, particularly when
+ 		# cross-compiling (20140913 -TD)
+-		echo "$as_me:3816: checking if $CXX works" >&5
++		echo "$as_me:3817: checking if $CXX works" >&5
+ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
+ 
+ 		save_CPPFLAGS="$CPPFLAGS"
+@@ -3821,7 +3822,7 @@
+ 		CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3824 "configure"
++#line 3825 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -3838,16 +3839,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3841: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3842: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3844: \$? = $ac_status" >&5
++  echo "$as_me:3845: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3847: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3848: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3850: \$? = $ac_status" >&5
++  echo "$as_me:3851: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_works=yes
+ else
+@@ -3858,11 +3859,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CPPFLAGS="$save_CPPFLAGS"
+ 
+-		echo "$as_me:3861: result: $cf_cxx_works" >&5
++		echo "$as_me:3862: result: $cf_cxx_works" >&5
+ echo "${ECHO_T}$cf_cxx_works" >&6
+ 		if test "x$cf_cxx_works" = xno
+ 		then
+-			{ echo "$as_me:3865: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
++			{ echo "$as_me:3866: 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
+@@ -3878,7 +3879,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:3881: checking for $ac_word" >&5
++echo "$as_me:3882: 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
+@@ -3895,7 +3896,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:3898: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3899: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3906,17 +3907,17 @@
+ CXX=$ac_cv_path_CXX
+ 
+ if test -n "$CXX"; then
+-  echo "$as_me:3909: result: $CXX" >&5
++  echo "$as_me:3910: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$as_me:3912: result: no" >&5
++  echo "$as_me:3913: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 	fi
+ 	case "x$CXX" in
+ 	(x|xg++)
+-		{ echo "$as_me:3919: WARNING: You don't have any C++ compiler, too bad" >&5
++		{ echo "$as_me:3920: 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="";
+ 		;;
+@@ -3925,7 +3926,7 @@
+ 
+ GXX_VERSION=none
+ if test "$GXX" = yes; then
+-	echo "$as_me:3928: checking version of ${CXX:-g++}" >&5
++	echo "$as_me:3929: checking version of ${CXX:-g++}" >&5
+ echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
+ 	GXX_VERSION="`${CXX:-g++} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	if test -z "$GXX_VERSION"
+@@ -3933,7 +3934,7 @@
+ 		GXX_VERSION=unknown
+ 		GXX=no
+ 	fi
+-	echo "$as_me:3936: result: $GXX_VERSION" >&5
++	echo "$as_me:3937: result: $GXX_VERSION" >&5
+ echo "${ECHO_T}$GXX_VERSION" >&6
+ fi
+ 
+@@ -3941,12 +3942,12 @@
+ ([1-9][0-9].*)
+ 	;;
+ (1.*|2.[0-6]*)
+-	{ echo "$as_me:3944: WARNING: templates do not work" >&5
++	{ echo "$as_me:3945: WARNING: templates do not work" >&5
+ echo "$as_me: WARNING: templates do not work" >&2;}
+ 	;;
+ esac
+ 
+-echo "$as_me:3949: checking if you want to build C++ binding and demo" >&5
++echo "$as_me:3950: 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.
+@@ -3956,15 +3957,15 @@
+ else
+   cf_with_cxx_binding=$cf_with_cxx
+ fi;
+-echo "$as_me:3959: result: $cf_with_cxx_binding" >&5
++echo "$as_me:3960: result: $cf_with_cxx_binding" >&5
+ echo "${ECHO_T}$cf_with_cxx_binding" >&6
+ 
+-echo "$as_me:3962: checking if you want to build with Ada" >&5
++echo "$as_me:3963: 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:3964: result: $cf_with_ada" >&5
++echo "$as_me:3965: result: $cf_with_ada" >&5
+ echo "${ECHO_T}$cf_with_ada" >&6
+ 
+-echo "$as_me:3967: checking if you want to install terminal database" >&5
++echo "$as_me:3968: 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.
+@@ -3974,10 +3975,10 @@
+ else
+   cf_with_db_install=yes
+ fi;
+-echo "$as_me:3977: result: $cf_with_db_install" >&5
++echo "$as_me:3978: result: $cf_with_db_install" >&5
+ echo "${ECHO_T}$cf_with_db_install" >&6
+ 
+-echo "$as_me:3980: checking if you want to install manpages" >&5
++echo "$as_me:3981: 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.
+@@ -3987,10 +3988,10 @@
+ else
+   cf_with_manpages=yes
+ fi;
+-echo "$as_me:3990: result: $cf_with_manpages" >&5
++echo "$as_me:3991: result: $cf_with_manpages" >&5
+ echo "${ECHO_T}$cf_with_manpages" >&6
+ 
+-echo "$as_me:3993: checking if you want to build programs such as tic" >&5
++echo "$as_me:3994: 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.
+@@ -4000,10 +4001,10 @@
+ else
+   cf_with_progs=yes
+ fi;
+-echo "$as_me:4003: result: $cf_with_progs" >&5
++echo "$as_me:4004: result: $cf_with_progs" >&5
+ echo "${ECHO_T}$cf_with_progs" >&6
+ 
+-echo "$as_me:4006: checking if you want to build test-programs" >&5
++echo "$as_me:4007: 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.
+@@ -4013,10 +4014,10 @@
+ else
+   cf_with_tests=yes
+ fi;
+-echo "$as_me:4016: result: $cf_with_tests" >&5
++echo "$as_me:4017: result: $cf_with_tests" >&5
+ echo "${ECHO_T}$cf_with_tests" >&6
+ 
+-echo "$as_me:4019: checking if you wish to install curses.h" >&5
++echo "$as_me:4020: 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.
+@@ -4026,7 +4027,7 @@
+ else
+   with_curses_h=yes
+ fi;
+-echo "$as_me:4029: result: $with_curses_h" >&5
++echo "$as_me:4030: result: $with_curses_h" >&5
+ echo "${ECHO_T}$with_curses_h" >&6
+ 
+ modules_to_build="ncurses"
+@@ -4050,7 +4051,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:4053: checking for $ac_word" >&5
++echo "$as_me:4054: 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
+@@ -4065,7 +4066,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+-echo "$as_me:4068: found $ac_dir/$ac_word" >&5
++echo "$as_me:4069: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4073,17 +4074,17 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "$as_me:4076: result: $AWK" >&5
++  echo "$as_me:4077: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+-  echo "$as_me:4079: result: no" >&5
++  echo "$as_me:4080: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   test -n "$AWK" && break
+ done
+ 
+-test -z "$AWK" && { { echo "$as_me:4086: error: No awk program found" >&5
++test -z "$AWK" && { { echo "$as_me:4087: error: No awk program found" >&5
+ echo "$as_me: error: No awk program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -4099,7 +4100,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:4102: checking for a BSD compatible install" >&5
++echo "$as_me:4103: 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
+@@ -4148,7 +4149,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:4151: result: $INSTALL" >&5
++echo "$as_me:4152: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -4173,7 +4174,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:4176: checking for $ac_word" >&5
++echo "$as_me:4177: 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
+@@ -4188,7 +4189,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LINT="$ac_prog"
+-echo "$as_me:4191: found $ac_dir/$ac_word" >&5
++echo "$as_me:4192: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4196,10 +4197,10 @@
+ fi
+ LINT=$ac_cv_prog_LINT
+ if test -n "$LINT"; then
+-  echo "$as_me:4199: result: $LINT" >&5
++  echo "$as_me:4200: result: $LINT" >&5
+ echo "${ECHO_T}$LINT" >&6
+ else
+-  echo "$as_me:4202: result: no" >&5
++  echo "$as_me:4203: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4212,18 +4213,18 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:4215: checking whether ln -s works" >&5
++echo "$as_me:4216: 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:4219: result: yes" >&5
++  echo "$as_me:4220: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:4222: result: no, using $LN_S" >&5
++  echo "$as_me:4223: result: no, using $LN_S" >&5
+ echo "${ECHO_T}no, using $LN_S" >&6
+ fi
+ 
+-echo "$as_me:4226: checking if $LN_S -f options work" >&5
++echo "$as_me:4227: 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
+@@ -4235,12 +4236,12 @@
+ 	cf_prog_ln_sf=no
+ fi
+ rm -f conf$$.dst conf$$src
+-echo "$as_me:4238: result: $cf_prog_ln_sf" >&5
++echo "$as_me:4239: 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:4243: checking for long file names" >&5
++echo "$as_me:4244: 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
+@@ -4279,7 +4280,7 @@
+   rm -rf "$ac_xdir" 2>/dev/null
+ done
+ fi
+-echo "$as_me:4282: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:4283: 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
+ 
+@@ -4298,7 +4299,7 @@
+   withval="$with_config_suffix"
+   case "x$withval" in
+ 	(xyes|xno)
+-		{ echo "$as_me:4301: WARNING: expected a value for config-suffix option" >&5
++		{ echo "$as_me:4302: 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"
+@@ -4308,7 +4309,7 @@
+ 
+ # If we find pkg-config, check if we should install the ".pc" files.
+ 
+-echo "$as_me:4311: checking if you want to use pkg-config" >&5
++echo "$as_me:4312: 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.
+@@ -4318,7 +4319,7 @@
+ else
+   cf_pkg_config=yes
+ fi;
+-echo "$as_me:4321: result: $cf_pkg_config" >&5
++echo "$as_me:4322: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+ 
+ case "$cf_pkg_config" in
+@@ -4330,7 +4331,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:4333: checking for $ac_word" >&5
++echo "$as_me:4334: 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
+@@ -4347,7 +4348,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:4350: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4351: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -4358,10 +4359,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:4361: result: $PKG_CONFIG" >&5
++  echo "$as_me:4362: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+-  echo "$as_me:4364: result: no" >&5
++  echo "$as_me:4365: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4370,7 +4371,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:4373: checking for $ac_word" >&5
++echo "$as_me:4374: 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
+@@ -4387,7 +4388,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:4390: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4391: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -4399,10 +4400,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ 
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  echo "$as_me:4402: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:4403: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+-  echo "$as_me:4405: result: no" >&5
++  echo "$as_me:4406: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4445,24 +4446,24 @@
+ 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4448: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++	{ { echo "$as_me:4449: 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:4455: WARNING: pkg-config is not installed" >&5
++	{ echo "$as_me:4456: 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:4461: checking for pkg-config library directory" >&5
++	echo "$as_me:4462: checking for pkg-config library directory" >&5
+ echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
+ 	;;
+ (*)
+-	echo "$as_me:4465: checking for $PKG_CONFIG library directory" >&5
++	echo "$as_me:4466: checking for $PKG_CONFIG library directory" >&5
+ echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
+ 	;;
+ esac
+@@ -4489,7 +4490,7 @@
+ case "x$cf_search_path" in
+ (xlibdir)
+ 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+-	echo "$as_me:4492: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:4493: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+@@ -4500,16 +4501,16 @@
+ 	;;
+ (x/*)
+ 	PKG_CONFIG_LIBDIR="$cf_search_path"
+-	echo "$as_me:4503: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:4504: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+ (xyes|xauto)
+-	echo "$as_me:4508: result: auto" >&5
++	echo "$as_me:4509: 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:4512: checking for search-list" >&5
++	echo "$as_me:4513: checking for search-list" >&5
+ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+ 	if test "x$PKG_CONFIG" != xnone
+ 	then
+@@ -4536,11 +4537,11 @@
+ "`
+ 	fi
+ 
+-	echo "$as_me:4539: result: $cf_search_path" >&5
++	echo "$as_me:4540: result: $cf_search_path" >&5
+ echo "${ECHO_T}$cf_search_path" >&6
+ 	;;
+ (*)
+-	{ { echo "$as_me:4543: error: Unexpected option value: $cf_search_path" >&5
++	{ { echo "$as_me:4544: error: Unexpected option value: $cf_search_path" >&5
+ echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -4548,7 +4549,7 @@
+ 
+ if test -n "$cf_search_path"
+ then
+-	echo "$as_me:4551: checking for first directory" >&5
++	echo "$as_me:4552: 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
+@@ -4559,7 +4560,7 @@
+ 			break
+ 		fi
+ 	done
+-	echo "$as_me:4562: result: $cf_pkg_config_path" >&5
++	echo "$as_me:4563: result: $cf_pkg_config_path" >&5
+ echo "${ECHO_T}$cf_pkg_config_path" >&6
+ 
+ 	if test "x$cf_pkg_config_path" != xnone ; then
+@@ -4569,7 +4570,7 @@
+ 
+ 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+ 	then
+-		echo "$as_me:4572: checking for workaround" >&5
++		echo "$as_me:4573: checking for workaround" >&5
+ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+ 		if test "$prefix" = "NONE" ; then
+ 			cf_prefix="$ac_default_prefix"
+@@ -4592,17 +4593,17 @@
+ 			esac
+ 		done
+ 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+-		echo "$as_me:4595: result: $PKG_CONFIG_LIBDIR" >&5
++		echo "$as_me:4596: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	fi
+ fi
+ 
+ if test "x$PKG_CONFIG" != xnone
+ then
+-	echo "$as_me:4602: checking if we should install .pc files for $PKG_CONFIG" >&5
++	echo "$as_me:4603: 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:4605: checking if we should install .pc files" >&5
++	echo "$as_me:4606: checking if we should install .pc files" >&5
+ echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
+ fi
+ 
+@@ -4613,7 +4614,7 @@
+ else
+   enable_pc_files=no
+ fi;
+-echo "$as_me:4616: result: $enable_pc_files" >&5
++echo "$as_me:4617: result: $enable_pc_files" >&5
+ echo "${ECHO_T}$enable_pc_files" >&6
+ 
+ if test "x$enable_pc_files" != xno
+@@ -4621,7 +4622,7 @@
+ 	MAKE_PC_FILES=
+ 	case "x$PKG_CONFIG_LIBDIR" in
+ 	(xno|xnone|xyes|x)
+-		{ echo "$as_me:4624: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
++		{ echo "$as_me:4625: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+ echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
+ 		;;
+ 	(*)
+@@ -4652,7 +4653,7 @@
+ 	cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4655: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
++	{ { echo "$as_me:4656: 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; }; }
+ 	;;
+@@ -4666,7 +4667,7 @@
+ 
+ if test -z "$MAKE_PC_FILES"
+ then
+-	echo "$as_me:4669: checking for suffix to add to pkg-config files" >&5
++	echo "$as_me:4670: checking for suffix to add to pkg-config files" >&5
+ echo $ECHO_N "checking for suffix to add to pkg-config files... $ECHO_C" >&6
+ 
+ # Check whether --with-pc-suffix or --without-pc-suffix was given.
+@@ -4681,13 +4682,13 @@
+ 	esac
+ fi;
+ 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
+-	echo "$as_me:4684: result: $PC_MODULE_SUFFIX" >&5
++	echo "$as_me:4685: result: $PC_MODULE_SUFFIX" >&5
+ echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
+ 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
+ 
+ fi
+ 
+-echo "$as_me:4690: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:4691: 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.
+@@ -4697,11 +4698,11 @@
+ else
+   enable_mixedcase=auto
+ fi;
+-echo "$as_me:4700: result: $enable_mixedcase" >&5
++echo "$as_me:4701: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+ 
+-echo "$as_me:4704: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:4705: 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
+@@ -4728,7 +4729,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:4731: result: $cf_cv_mixedcase" >&5
++echo "$as_me:4732: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -4747,7 +4748,7 @@
+ fi
+ 
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:4750: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:4751: 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
+@@ -4767,16 +4768,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:4770: result: yes" >&5
++  echo "$as_me:4771: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:4774: result: no" >&5
++  echo "$as_me:4775: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+-echo "$as_me:4779: checking for \".PHONY\" make-support" >&5
++echo "$as_me:4780: 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
+@@ -4831,7 +4832,7 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:4834: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:4835: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+@@ -4842,7 +4843,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:4845: checking for $ac_word" >&5
++echo "$as_me:4846: 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
+@@ -4857,7 +4858,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:4860: found $ac_dir/$ac_word" >&5
++echo "$as_me:4861: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4865,10 +4866,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:4868: result: $CTAGS" >&5
++  echo "$as_me:4869: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:4871: result: no" >&5
++  echo "$as_me:4872: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4879,7 +4880,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:4882: checking for $ac_word" >&5
++echo "$as_me:4883: 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
+@@ -4894,7 +4895,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:4897: found $ac_dir/$ac_word" >&5
++echo "$as_me:4898: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4902,10 +4903,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:4905: result: $ETAGS" >&5
++  echo "$as_me:4906: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:4908: result: no" >&5
++  echo "$as_me:4909: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4914,7 +4915,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:4917: checking for $ac_word" >&5
++echo "$as_me:4918: 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
+@@ -4929,7 +4930,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:4932: found $ac_dir/$ac_word" >&5
++echo "$as_me:4933: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4938,17 +4939,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:4941: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:4942: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:4944: result: no" >&5
++  echo "$as_me:4945: 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:4951: checking for $ac_word" >&5
++echo "$as_me:4952: 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
+@@ -4963,7 +4964,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:4966: found $ac_dir/$ac_word" >&5
++echo "$as_me:4967: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4972,10 +4973,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:4975: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:4976: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:4978: result: no" >&5
++  echo "$as_me:4979: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4995,7 +4996,7 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:4998: checking for makeflags variable" >&5
++echo "$as_me:4999: 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
+@@ -5025,7 +5026,7 @@
+ 			;;
+ 		(*)
+ 
+-echo "${as_me:-configure}:5028: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:5029: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -5033,13 +5034,13 @@
+ 	rm -f cf_makeflags.tmp
+ 
+ fi
+-echo "$as_me:5036: result: $cf_cv_makeflags" >&5
++echo "$as_me:5037: 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:5042: checking for $ac_word" >&5
++echo "$as_me:5043: 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
+@@ -5054,7 +5055,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:5057: found $ac_dir/$ac_word" >&5
++echo "$as_me:5058: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5062,10 +5063,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:5065: result: $RANLIB" >&5
++  echo "$as_me:5066: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:5068: result: no" >&5
++  echo "$as_me:5069: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5074,7 +5075,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:5077: checking for $ac_word" >&5
++echo "$as_me:5078: 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
+@@ -5089,7 +5090,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:5092: found $ac_dir/$ac_word" >&5
++echo "$as_me:5093: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5098,10 +5099,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:5101: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:5102: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:5104: result: no" >&5
++  echo "$as_me:5105: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5113,7 +5114,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:5116: checking for $ac_word" >&5
++echo "$as_me:5117: 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
+@@ -5128,7 +5129,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:5131: found $ac_dir/$ac_word" >&5
++echo "$as_me:5132: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5136,10 +5137,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:5139: result: $LD" >&5
++  echo "$as_me:5140: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:5142: result: no" >&5
++  echo "$as_me:5143: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5148,7 +5149,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:5151: checking for $ac_word" >&5
++echo "$as_me:5152: 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
+@@ -5163,7 +5164,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:5166: found $ac_dir/$ac_word" >&5
++echo "$as_me:5167: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5172,10 +5173,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:5175: result: $ac_ct_LD" >&5
++  echo "$as_me:5176: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:5178: result: no" >&5
++  echo "$as_me:5179: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5187,7 +5188,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:5190: checking for $ac_word" >&5
++echo "$as_me:5191: 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
+@@ -5202,7 +5203,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:5205: found $ac_dir/$ac_word" >&5
++echo "$as_me:5206: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5210,10 +5211,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:5213: result: $AR" >&5
++  echo "$as_me:5214: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:5216: result: no" >&5
++  echo "$as_me:5217: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5222,7 +5223,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:5225: checking for $ac_word" >&5
++echo "$as_me:5226: 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
+@@ -5237,7 +5238,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:5240: found $ac_dir/$ac_word" >&5
++echo "$as_me:5241: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5246,10 +5247,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:5249: result: $ac_ct_AR" >&5
++  echo "$as_me:5250: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:5252: result: no" >&5
++  echo "$as_me:5253: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5261,7 +5262,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:5264: checking for $ac_word" >&5
++echo "$as_me:5265: 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
+@@ -5276,7 +5277,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:5279: found $ac_dir/$ac_word" >&5
++echo "$as_me:5280: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5284,10 +5285,10 @@
+ fi
+ NM=$ac_cv_prog_NM
+ if test -n "$NM"; then
+-  echo "$as_me:5287: result: $NM" >&5
++  echo "$as_me:5288: result: $NM" >&5
+ echo "${ECHO_T}$NM" >&6
+ else
+-  echo "$as_me:5290: result: no" >&5
++  echo "$as_me:5291: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5296,7 +5297,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:5299: checking for $ac_word" >&5
++echo "$as_me:5300: 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
+@@ -5311,7 +5312,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:5314: found $ac_dir/$ac_word" >&5
++echo "$as_me:5315: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5320,10 +5321,10 @@
+ fi
+ ac_ct_NM=$ac_cv_prog_ac_ct_NM
+ if test -n "$ac_ct_NM"; then
+-  echo "$as_me:5323: result: $ac_ct_NM" >&5
++  echo "$as_me:5324: result: $ac_ct_NM" >&5
+ echo "${ECHO_T}$ac_ct_NM" >&6
+ else
+-  echo "$as_me:5326: result: no" >&5
++  echo "$as_me:5327: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5335,7 +5336,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:5338: checking for $ac_word" >&5
++echo "$as_me:5339: 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
+@@ -5350,7 +5351,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:5353: found $ac_dir/$ac_word" >&5
++echo "$as_me:5354: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5358,10 +5359,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:5361: result: $AR" >&5
++  echo "$as_me:5362: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:5364: result: no" >&5
++  echo "$as_me:5365: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5370,7 +5371,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:5373: checking for $ac_word" >&5
++echo "$as_me:5374: 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
+@@ -5385,7 +5386,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:5388: found $ac_dir/$ac_word" >&5
++echo "$as_me:5389: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5394,10 +5395,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:5397: result: $ac_ct_AR" >&5
++  echo "$as_me:5398: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:5400: result: no" >&5
++  echo "$as_me:5401: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5406,7 +5407,7 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-echo "$as_me:5409: checking for options to update archives" >&5
++echo "$as_me:5410: 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
+@@ -5443,13 +5444,13 @@
+ 			rm -f conftest.a
+ 
+ 			cat >"conftest.$ac_ext" <&5
++			if { (eval echo "$as_me:5450: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5452: \$? = $ac_status" >&5
++  echo "$as_me:5453: \$? = $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
+@@ -5460,7 +5461,7 @@
+ 			else
+ 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-echo "${as_me:-configure}:5463: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:5464: testing cannot compile test-program ..." 1>&5
+ 
+ 				break
+ 			fi
+@@ -5470,7 +5471,7 @@
+ 	esac
+ 
+ fi
+-echo "$as_me:5473: result: $cf_cv_ar_flags" >&5
++echo "$as_me:5474: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+ if test -n "$ARFLAGS" ; then
+@@ -5481,7 +5482,7 @@
+ 	ARFLAGS=$cf_cv_ar_flags
+ fi
+ 
+-echo "$as_me:5484: checking for an installation directory prefix" >&5
++echo "$as_me:5485: checking for an installation directory prefix" >&5
+ echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-install-prefix or --without-install-prefix was given.
+@@ -5494,7 +5495,7 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:5497: result: ${DESTDIR:-(none)}" >&5
++echo "$as_me:5498: result: ${DESTDIR:-(none)}" >&5
+ echo "${ECHO_T}${DESTDIR:-(none)}" >&6
+ 
+ ###############################################################################
+@@ -5529,7 +5530,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:5532: checking for $ac_word" >&5
++echo "$as_me:5533: 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
+@@ -5544,7 +5545,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:5547: found $ac_dir/$ac_word" >&5
++echo "$as_me:5548: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5552,10 +5553,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:5555: result: $BUILD_CC" >&5
++  echo "$as_me:5556: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:5558: result: no" >&5
++  echo "$as_me:5559: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5564,12 +5565,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+ 
+ fi;
+-	echo "$as_me:5567: checking for native build C compiler" >&5
++	echo "$as_me:5568: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:5569: result: $BUILD_CC" >&5
++	echo "$as_me:5570: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:5572: checking for native build C preprocessor" >&5
++	echo "$as_me:5573: 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.
+@@ -5579,10 +5580,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:5582: result: $BUILD_CPP" >&5
++	echo "$as_me:5583: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:5585: checking for native build C flags" >&5
++	echo "$as_me:5586: 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.
+@@ -5590,10 +5591,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:5593: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:5594: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:5596: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:5597: 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.
+@@ -5601,10 +5602,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:5604: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:5605: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:5607: checking for native build linker-flags" >&5
++	echo "$as_me:5608: 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.
+@@ -5612,10 +5613,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:5615: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:5616: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:5618: checking for native build linker-libraries" >&5
++	echo "$as_me:5619: 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.
+@@ -5623,7 +5624,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:5626: result: $BUILD_LIBS" >&5
++	echo "$as_me:5627: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -5632,7 +5633,7 @@
+ 
+ 	: ${BUILD_CC:='${CC}'}
+ 
+-	echo "$as_me:5635: checking if the build-compiler \"$BUILD_CC\" works" >&5
++	echo "$as_me:5636: checking if the build-compiler \"$BUILD_CC\" works" >&5
+ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
+ 
+ 	cf_save_crossed=$cross_compiling
+@@ -5646,7 +5647,7 @@
+   cf_ok_build_cc=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5649 "configure"
++#line 5650 "configure"
+ #include "confdefs.h"
+ #include 
+ 		int main(int argc, char *argv[])
+@@ -5656,15 +5657,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:5659: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5660: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5662: \$? = $ac_status" >&5
++  echo "$as_me:5663: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:5664: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5665: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5667: \$? = $ac_status" >&5
++  echo "$as_me:5668: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_ok_build_cc=yes
+ else
+@@ -5679,12 +5680,12 @@
+ 	cross_compiling=$cf_save_crossed
+ 	ac_link=$cf_save_ac_link
+ 
+-	echo "$as_me:5682: result: $cf_ok_build_cc" >&5
++	echo "$as_me:5683: result: $cf_ok_build_cc" >&5
+ echo "${ECHO_T}$cf_ok_build_cc" >&6
+ 
+ 	if test "$cf_ok_build_cc" != yes
+ 	then
+-		{ { echo "$as_me:5687: error: Cross-build requires two compilers.
++		{ { echo "$as_me:5688: 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;}
+@@ -5709,7 +5710,7 @@
+ ### shared, for example.
+ cf_list_models=""
+ 
+-echo "$as_me:5712: checking if libtool -version-number should be used" >&5
++echo "$as_me:5713: 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.
+@@ -5726,7 +5727,7 @@
+ 	cf_libtool_version=yes
+ 
+ fi;
+-echo "$as_me:5729: result: $cf_libtool_version" >&5
++echo "$as_me:5730: result: $cf_libtool_version" >&5
+ echo "${ECHO_T}$cf_libtool_version" >&6
+ 
+ if test "$cf_libtool_version" = yes ; then
+@@ -5735,25 +5736,25 @@
+ 	LIBTOOL_VERSION="-version-info"
+ 	case "x$VERSION" in
+ 	(x)
+-		{ echo "$as_me:5738: WARNING: VERSION was not set" >&5
++		{ echo "$as_me:5739: 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}:5745: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5746: 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}:5752: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5753: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:5756: WARNING: unexpected VERSION value: $VERSION" >&5
++		{ echo "$as_me:5757: WARNING: unexpected VERSION value: $VERSION" >&5
+ echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
+ 		;;
+ 	esac
+@@ -5775,7 +5776,7 @@
+ LIB_INSTALL=
+ LIB_UNINSTALL=
+ 
+-echo "$as_me:5778: checking if you want to build libraries with libtool" >&5
++echo "$as_me:5779: 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.
+@@ -5785,7 +5786,7 @@
+ else
+   with_libtool=no
+ fi;
+-echo "$as_me:5788: result: $with_libtool" >&5
++echo "$as_me:5789: result: $with_libtool" >&5
+ echo "${ECHO_T}$with_libtool" >&6
+ if test "$with_libtool" != "no"; then
+ 
+@@ -5816,7 +5817,7 @@
+ 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:5819: error: expected a pathname, not \"$with_libtool\"" >&5
++	{ { echo "$as_me:5820: error: expected a pathname, not \"$with_libtool\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -5829,7 +5830,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:5832: checking for $ac_word" >&5
++echo "$as_me:5833: 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
+@@ -5844,7 +5845,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:5847: found $ac_dir/$ac_word" >&5
++echo "$as_me:5848: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5852,10 +5853,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5855: result: $LIBTOOL" >&5
++  echo "$as_me:5856: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5858: result: no" >&5
++  echo "$as_me:5859: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5868,7 +5869,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:5871: checking for $ac_word" >&5
++echo "$as_me:5872: 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
+@@ -5883,7 +5884,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:5886: found $ac_dir/$ac_word" >&5
++echo "$as_me:5887: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5891,10 +5892,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:5894: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:5895: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:5897: result: no" >&5
++  echo "$as_me:5898: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5925,7 +5926,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:5928: checking for $ac_word" >&5
++echo "$as_me:5929: 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
+@@ -5940,7 +5941,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:5943: found $ac_dir/$ac_word" >&5
++echo "$as_me:5944: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5948,10 +5949,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5951: result: $LIBTOOL" >&5
++  echo "$as_me:5952: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5954: result: no" >&5
++  echo "$as_me:5955: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5964,7 +5965,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:5967: checking for $ac_word" >&5
++echo "$as_me:5968: 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
+@@ -5979,7 +5980,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:5982: found $ac_dir/$ac_word" >&5
++echo "$as_me:5983: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5987,10 +5988,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:5990: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:5991: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:5993: result: no" >&5
++  echo "$as_me:5994: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6012,7 +6013,7 @@
+ 		fi
+ 	fi
+ 	if test -z "$LIBTOOL" ; then
+-		{ { echo "$as_me:6015: error: Cannot find libtool" >&5
++		{ { echo "$as_me:6016: error: Cannot find libtool" >&5
+ echo "$as_me: error: Cannot find libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -6028,7 +6029,7 @@
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+ then
+-	echo "$as_me:6031: checking version of $LIBTOOL" >&5
++	echo "$as_me:6032: checking version of $LIBTOOL" >&5
+ echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+@@ -6039,8 +6040,9 @@
+ fi
+ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+ 
+-	echo "$as_me:6042: result: $cf_cv_libtool_version" >&5
++	echo "$as_me:6043: result: $cf_cv_libtool_version" >&5
+ echo "${ECHO_T}$cf_cv_libtool_version" >&6
++
+ 	if test -n "$cf_cv_libtool_version"
+ 	then
+ 		cf_check_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' -e 's,[()],...,g' -e 's,[ ],-,g' -e '2,$d'`
+@@ -6048,18 +6050,19 @@
+ 		(*...GNU-libtool...*)
+ 			;;
+ 		(*)
+-			{ { echo "$as_me:6051: error: This is not GNU libtool" >&5
++			{ { echo "$as_me:6053: 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:6057: error: No version found for $LIBTOOL" >&5
++		{ { echo "$as_me:6059: 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:6062: error: GNU libtool has not been found" >&5
++	{ { echo "$as_me:6065: error: GNU libtool has not been found" >&5
+ echo "$as_me: error: GNU libtool has not been found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6095,7 +6098,7 @@
+ 
+ else
+ 
+-echo "$as_me:6098: checking if you want to build shared libraries" >&5
++echo "$as_me:6101: 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.
+@@ -6105,11 +6108,11 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:6108: result: $with_shared" >&5
++echo "$as_me:6111: 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:6112: checking if you want to build static libraries" >&5
++echo "$as_me:6115: 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.
+@@ -6119,11 +6122,11 @@
+ else
+   with_normal=yes
+ fi;
+-echo "$as_me:6122: result: $with_normal" >&5
++echo "$as_me:6125: 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:6126: checking if you want to build debug libraries" >&5
++echo "$as_me:6129: 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.
+@@ -6133,11 +6136,11 @@
+ else
+   with_debug=yes
+ fi;
+-echo "$as_me:6136: result: $with_debug" >&5
++echo "$as_me:6139: 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:6140: checking if you want to build profiling libraries" >&5
++echo "$as_me:6143: 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.
+@@ -6147,7 +6150,7 @@
+ else
+   with_profile=no
+ fi;
+-echo "$as_me:6150: result: $with_profile" >&5
++echo "$as_me:6153: result: $with_profile" >&5
+ echo "${ECHO_T}$with_profile" >&6
+ test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
+ 
+@@ -6155,7 +6158,7 @@
+ 
+ if test "X$cf_with_cxx_binding" != Xno; then
+ if test "x$with_shared" = "xyes"; then
+-echo "$as_me:6158: checking if you want to build C++ shared libraries" >&5
++echo "$as_me:6161: 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.
+@@ -6165,26 +6168,26 @@
+ else
+   with_shared_cxx=no
+ fi;
+-echo "$as_me:6168: result: $with_shared_cxx" >&5
++echo "$as_me:6171: result: $with_shared_cxx" >&5
+ echo "${ECHO_T}$with_shared_cxx" >&6
+ fi
+ fi
+ 
+ ###############################################################################
+ 
+-echo "$as_me:6175: checking for specified models" >&5
++echo "$as_me:6178: 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:6179: result: $cf_list_models" >&5
++echo "$as_me:6182: 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:6184: checking for default model" >&5
++echo "$as_me:6187: 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:6187: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:6190: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+ 
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+@@ -6198,7 +6201,7 @@
+ LIB_DIR=../lib
+ LIB_2ND=../../lib
+ 
+-echo "$as_me:6201: checking if you want to have a library-prefix" >&5
++echo "$as_me:6204: 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.
+@@ -6208,7 +6211,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:6211: result: $with_lib_prefix" >&5
++echo "$as_me:6214: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test "$with_lib_prefix" = auto
+@@ -6239,24 +6242,24 @@
+ 
+ LIB_SUFFIX=
+ 
+-	echo "$as_me:6242: checking for PATH separator" >&5
++	echo "$as_me:6245: 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:6249: result: $PATH_SEPARATOR" >&5
++	echo "$as_me:6252: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+ 
+ # headers needed for checks...
+-echo "$as_me:6253: checking for ANSI C header files" >&5
++echo "$as_me:6256: 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 6259 "configure"
++#line 6262 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -6264,13 +6267,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:6267: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:6270: \"$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:6273: \$? = $ac_status" >&5
++  echo "$as_me:6276: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6292,7 +6295,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 6295 "configure"
++#line 6298 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6310,7 +6313,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 6313 "configure"
++#line 6316 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6331,7 +6334,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6334 "configure"
++#line 6337 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -6357,15 +6360,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6360: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6363: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6363: \$? = $ac_status" >&5
++  echo "$as_me:6366: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:6365: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6368: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6368: \$? = $ac_status" >&5
++  echo "$as_me:6371: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6378,7 +6381,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:6381: result: $ac_cv_header_stdc" >&5
++echo "$as_me:6384: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -6394,28 +6397,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6397: checking for $ac_header" >&5
++echo "$as_me:6400: 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 6403 "configure"
++#line 6406 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6409: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6412: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6412: \$? = $ac_status" >&5
++  echo "$as_me:6415: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6415: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6418: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6418: \$? = $ac_status" >&5
++  echo "$as_me:6421: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -6425,7 +6428,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6428: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6431: 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:6441: checking whether exit is declared" >&5
+ echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
+ if test "${ac_cv_have_decl_exit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6444 "configure"
++#line 6447 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -6456,16 +6459,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6459: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6462: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6462: \$? = $ac_status" >&5
++  echo "$as_me:6465: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6465: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6468: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6468: \$? = $ac_status" >&5
++  echo "$as_me:6471: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_have_decl_exit=yes
+ else
+@@ -6475,19 +6478,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6478: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:6481: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+ 
+ 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:6484: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:6487: 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 6490 "configure"
++#line 6493 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -6502,16 +6505,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6505: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6508: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6508: \$? = $ac_status" >&5
++  echo "$as_me:6511: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6511: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6514: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6514: \$? = $ac_status" >&5
++  echo "$as_me:6517: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -6521,7 +6524,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6524: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6527: 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:6540: 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
+@@ -6542,7 +6545,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6545 "configure"
++#line 6548 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6561,16 +6564,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6564: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6567: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6567: \$? = $ac_status" >&5
++  echo "$as_me:6570: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6570: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6573: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6573: \$? = $ac_status" >&5
++  echo "$as_me:6576: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -6581,14 +6584,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6584: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:6587: 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:6591: checking for opendir in -lx" >&5
++  echo "$as_me:6594: 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
+@@ -6596,7 +6599,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6599 "configure"
++#line 6602 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6615,16 +6618,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6618: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6621: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6621: \$? = $ac_status" >&5
++  echo "$as_me:6624: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6624: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6627: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6627: \$? = $ac_status" >&5
++  echo "$as_me:6630: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -6635,7 +6638,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6638: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:6641: 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"
+@@ -6645,7 +6648,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:6648: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:6651: 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.
+@@ -6655,10 +6658,10 @@
+ else
+   with_termlib=no
+ fi;
+-echo "$as_me:6658: result: $with_termlib" >&5
++echo "$as_me:6661: result: $with_termlib" >&5
+ echo "${ECHO_T}$with_termlib" >&6
+ 
+-echo "$as_me:6661: checking if you want to build a separate tic library" >&5
++echo "$as_me:6664: 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.
+@@ -6668,7 +6671,7 @@
+ else
+   with_ticlib=no
+ fi;
+-echo "$as_me:6671: result: $with_ticlib" >&5
++echo "$as_me:6674: result: $with_ticlib" >&5
+ echo "${ECHO_T}$with_ticlib" >&6
+ 
+ if test X"$CC_G_OPT" = X"" ; then
+@@ -6681,7 +6684,7 @@
+ 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
+ fi
+ 
+-echo "$as_me:6684: checking for default loader flags" >&5
++echo "$as_me:6687: 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=''   ;;
+@@ -6690,13 +6693,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:6693: result: ${LD_MODEL:-(none)}" >&5
++echo "$as_me:6696: result: ${LD_MODEL:-(none)}" >&5
+ echo "${ECHO_T}${LD_MODEL:-(none)}" >&6
+ 
+ case "$DFT_LWR_MODEL" in
+ (shared)
+ 
+-echo "$as_me:6699: checking if rpath option should be used" >&5
++echo "$as_me:6702: 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.
+@@ -6706,10 +6709,10 @@
+ else
+   cf_cv_enable_rpath=no
+ fi;
+-echo "$as_me:6709: result: $cf_cv_enable_rpath" >&5
++echo "$as_me:6712: result: $cf_cv_enable_rpath" >&5
+ echo "${ECHO_T}$cf_cv_enable_rpath" >&6
+ 
+-echo "$as_me:6712: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:6715: 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.
+@@ -6719,7 +6722,7 @@
+ else
+   cf_cv_do_relink=yes
+ fi;
+-echo "$as_me:6722: result: $cf_cv_do_relink" >&5
++echo "$as_me:6725: result: $cf_cv_do_relink" >&5
+ echo "${ECHO_T}$cf_cv_do_relink" >&6
+ 	;;
+ esac
+@@ -6730,7 +6733,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:6733: checking for an rpath option" >&5
++	echo "$as_me:6736: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -6761,12 +6764,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:6764: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:6767: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:6769: checking if we need a space after rpath option" >&5
++		echo "$as_me:6772: 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"
+ 
+@@ -6787,7 +6790,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6790 "configure"
++#line 6793 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -6799,16 +6802,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6802: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6805: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6805: \$? = $ac_status" >&5
++  echo "$as_me:6808: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6808: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6811: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6811: \$? = $ac_status" >&5
++  echo "$as_me:6814: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -6818,7 +6821,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:6821: result: $cf_rpath_space" >&5
++		echo "$as_me:6824: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -6840,7 +6843,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:6843: checking whether to use release or ABI version in shared library file names" >&5
++	echo "$as_me:6846: checking whether to use release or ABI version in shared library file names" >&5
+ echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
+ 
+ # Check whether --with-shlib-version or --without-shlib-version was given.
+@@ -6855,9 +6858,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:6858: result: $withval" >&5
++		echo "$as_me:6861: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:6860: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:6863: 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; }; }
+ 		;;
+@@ -6866,7 +6869,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:6869: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:6872: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -6889,14 +6892,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:6892: checking which $CC option to use" >&5
++		echo "$as_me:6895: 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 6899 "configure"
++#line 6902 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6908,16 +6911,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6911: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6914: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6914: \$? = $ac_status" >&5
++  echo "$as_me:6917: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6917: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6920: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6920: \$? = $ac_status" >&5
++  echo "$as_me:6923: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -6926,7 +6929,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		done
+-		echo "$as_me:6929: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:6932: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -6997,7 +7000,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:7000: checking if ld -search_paths_first works" >&5
++		echo "$as_me:7003: 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
+@@ -7006,7 +7009,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7009 "configure"
++#line 7012 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -7018,16 +7021,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7021: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7024: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7024: \$? = $ac_status" >&5
++  echo "$as_me:7027: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7027: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7030: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7030: \$? = $ac_status" >&5
++  echo "$as_me:7033: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -7038,7 +7041,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:7041: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:7044: 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"
+@@ -7388,7 +7391,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7391 "configure"
++#line 7394 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7400,16 +7403,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7403: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7406: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7406: \$? = $ac_status" >&5
++  echo "$as_me:7409: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7409: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7412: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7412: \$? = $ac_status" >&5
++  echo "$as_me:7415: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -7446,7 +7449,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:7449: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:7452: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -7456,7 +7459,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <
+ int main(int argc, char *argv[])
+ {
+@@ -7468,18 +7471,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:7471: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:7474: 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:7473: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:7476: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7476: \$? = $ac_status" >&5
++  echo "$as_me:7479: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-				echo "$as_me:7478: result: yes" >&5
++				echo "$as_me:7481: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:7482: result: no" >&5
++				echo "$as_me:7485: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -7494,17 +7497,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:7497: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:7500: 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}:7501: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7504: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ for model in $cf_list_models ; do
+ 	case "$model" in
+ 	(libtool)
+ 
+-echo "$as_me:7507: checking for additional libtool options" >&5
++echo "$as_me:7510: 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.
+@@ -7514,7 +7517,7 @@
+ else
+   with_libtool_opts=no
+ fi;
+-echo "$as_me:7517: result: $with_libtool_opts" >&5
++echo "$as_me:7520: result: $with_libtool_opts" >&5
+ echo "${ECHO_T}$with_libtool_opts" >&6
+ 
+ case .$with_libtool_opts in
+@@ -7525,7 +7528,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:7528: checking if exported-symbols file should be used" >&5
++echo "$as_me:7531: 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.
+@@ -7540,7 +7543,7 @@
+ 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
+ 
+ fi
+-echo "$as_me:7543: result: $with_export_syms" >&5
++echo "$as_me:7546: result: $with_export_syms" >&5
+ echo "${ECHO_T}$with_export_syms" >&6
+ if test "x$with_export_syms" != xno
+ then
+@@ -7551,15 +7554,15 @@
+ 		;;
+ 	(shared)
+ 		if test "$CC_SHARED_OPTS" = "unknown"; then
+-			{ { echo "$as_me:7554: error: Shared libraries are not supported in this version" >&5
++			{ { echo "$as_me:7557: 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:7559: checking if current CFLAGS link properly" >&5
++		echo "$as_me:7562: 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 7562 "configure"
++#line 7565 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7571,16 +7574,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7574: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7577: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7577: \$? = $ac_status" >&5
++  echo "$as_me:7580: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7580: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7583: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7583: \$? = $ac_status" >&5
++  echo "$as_me:7586: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cflags_work=yes
+ else
+@@ -7589,18 +7592,18 @@
+ cf_cflags_work=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:7592: result: $cf_cflags_work" >&5
++		echo "$as_me:7595: 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}:7598: testing try to work around by appending shared-options ..." 1>&5
++echo "${as_me:-configure}:7601: testing try to work around by appending shared-options ..." 1>&5
+ 
+ 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
+ 		fi
+ 
+-echo "$as_me:7603: checking if versioned-symbols file should be used" >&5
++echo "$as_me:7606: 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.
+@@ -7618,18 +7621,18 @@
+ (xno)
+ 	;;
+ (x/*)
+-	test -f "$with_versioned_syms" || { { echo "$as_me:7621: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:7624: 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:7626: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:7629: 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:7632: result: $with_versioned_syms" >&5
++echo "$as_me:7635: result: $with_versioned_syms" >&5
+ echo "${ECHO_T}$with_versioned_syms" >&6
+ 
+ RESULTING_SYMS=
+@@ -7645,7 +7648,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}:7648: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7651: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*-dy\ *)
+@@ -7653,11 +7656,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}:7656: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7659: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:7660: WARNING: this system does not support versioned-symbols" >&5
++		{ echo "$as_me:7663: WARNING: this system does not support versioned-symbols" >&5
+ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
+ 		;;
+ 	esac
+@@ -7669,7 +7672,7 @@
+ 	# symbols.
+ 	if test "x$VERSIONED_SYMS" != "x"
+ 	then
+-		echo "$as_me:7672: checking if wildcards can be used to selectively omit symbols" >&5
++		echo "$as_me:7675: 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
+ 
+@@ -7706,7 +7709,7 @@
+ } submodule_1.0;
+ EOF
+ 		cat >conftest.$ac_ext <&5
++		echo "$as_me:7743: result: $WILDCARD_SYMS" >&5
+ echo "${ECHO_T}$WILDCARD_SYMS" >&6
+ 		rm -f conftest.*
+ 	fi
+@@ -7750,7 +7753,7 @@
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+ 
+-echo "$as_me:7753: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:7756: 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.
+@@ -7760,27 +7763,27 @@
+ else
+   with_gpm=maybe
+ fi;
+-echo "$as_me:7763: result: $with_gpm" >&5
++echo "$as_me:7766: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7767: checking for gpm.h" >&5
++	echo "$as_me:7770: 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 7773 "configure"
++#line 7776 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:7777: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7780: \"$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:7783: \$? = $ac_status" >&5
++  echo "$as_me:7786: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7799,7 +7802,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7802: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:7805: 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
+ 
+@@ -7810,7 +7813,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}:7813: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:7816: testing assuming we really have GPM library ..." 1>&5
+ 
+ cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+@@ -7818,7 +7821,7 @@
+ 
+ 			with_gpm=yes
+ 		else
+-			echo "$as_me:7821: checking for Gpm_Open in -lgpm" >&5
++			echo "$as_me:7824: 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
+@@ -7826,7 +7829,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7829 "configure"
++#line 7832 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7845,16 +7848,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7848: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7851: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7851: \$? = $ac_status" >&5
++  echo "$as_me:7854: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7854: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7857: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7857: \$? = $ac_status" >&5
++  echo "$as_me:7860: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -7865,18 +7868,18 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7868: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:7871: 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:7875: WARNING: Cannot link with GPM library" >&5
++					{ echo "$as_me:7878: WARNING: Cannot link with GPM library" >&5
+ echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
+ 					with_gpm=no
+ 				else
+-					{ { echo "$as_me:7879: error: Cannot link with GPM library" >&5
++					{ { echo "$as_me:7882: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+    { (exit 1); exit 1; }; }
+ 				fi
+@@ -7887,7 +7890,7 @@
+ 
+ else
+ 
+-		test "$with_gpm" != maybe && { echo "$as_me:7890: WARNING: Cannot find GPM header" >&5
++		test "$with_gpm" != maybe && { echo "$as_me:7893: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ 		with_gpm=no
+ 
+@@ -7896,7 +7899,7 @@
+ fi
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7899: checking if you want to load GPM dynamically" >&5
++	echo "$as_me:7902: 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.
+@@ -7906,18 +7909,18 @@
+ else
+   with_dlsym=yes
+ fi;
+-	echo "$as_me:7909: result: $with_dlsym" >&5
++	echo "$as_me:7912: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ 	if test "x$with_dlsym" = xyes ; then
+ 
+ cf_have_dlsym=no
+-echo "$as_me:7914: checking for dlsym" >&5
++echo "$as_me:7917: 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 7920 "configure"
++#line 7923 "configure"
+ #include "confdefs.h"
+ #define dlsym autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7948,16 +7951,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7951: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7954: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7954: \$? = $ac_status" >&5
++  echo "$as_me:7957: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7957: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7960: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7960: \$? = $ac_status" >&5
++  echo "$as_me:7963: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_dlsym=yes
+ else
+@@ -7967,14 +7970,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7970: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:7973: 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:7977: checking for dlsym in -ldl" >&5
++echo "$as_me:7980: 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
+@@ -7982,7 +7985,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7985 "configure"
++#line 7988 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8001,16 +8004,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8004: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8007: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8007: \$? = $ac_status" >&5
++  echo "$as_me:8010: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8010: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8013: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8013: \$? = $ac_status" >&5
++  echo "$as_me:8016: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dl_dlsym=yes
+ else
+@@ -8021,7 +8024,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8024: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:8027: 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
+ 
+@@ -8050,10 +8053,10 @@
+ LIBS="$cf_add_libs"
+  }
+ 
+-	echo "$as_me:8053: checking whether able to link to dl*() functions" >&5
++	echo "$as_me:8056: 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 8056 "configure"
++#line 8059 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8071,16 +8074,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8074: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8077: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8077: \$? = $ac_status" >&5
++  echo "$as_me:8080: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8080: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8083: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8083: \$? = $ac_status" >&5
++  echo "$as_me:8086: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ cat >>confdefs.h <<\EOF
+@@ -8091,15 +8094,15 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-		{ { echo "$as_me:8094: error: Cannot link test program for libdl" >&5
++		{ { echo "$as_me:8097: 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:8099: result: ok" >&5
++	echo "$as_me:8102: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+-	{ { echo "$as_me:8102: error: Cannot find dlsym function" >&5
++	{ { echo "$as_me:8105: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8107,12 +8110,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}:8110: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:8113: testing assuming soname for gpm is $with_gpm ..." 1>&5
+ 
+ 			cf_cv_gpm_soname="$with_gpm"
+ 		else
+ 
+-echo "$as_me:8115: checking for soname of gpm library" >&5
++echo "$as_me:8118: 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
+@@ -8146,15 +8149,15 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-	if { (eval echo "$as_me:8149: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:8152: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8152: \$? = $ac_status" >&5
++  echo "$as_me:8155: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:8154: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:8157: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8157: \$? = $ac_status" >&5
++  echo "$as_me:8160: \$? = $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
+@@ -8165,7 +8168,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:8168: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:8171: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+ 
+ 		fi
+@@ -8233,7 +8236,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+ 
+-echo "$as_me:8236: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:8239: 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
+@@ -8241,7 +8244,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8244 "configure"
++#line 8247 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8260,16 +8263,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8263: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8266: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8266: \$? = $ac_status" >&5
++  echo "$as_me:8269: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8269: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8272: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8272: \$? = $ac_status" >&5
++  echo "$as_me:8275: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -8280,11 +8283,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8283: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:8286: 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:8287: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:8290: 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
+@@ -8308,15 +8311,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:8311: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:8314: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8314: \$? = $ac_status" >&5
++  echo "$as_me:8317: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:8316: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:8319: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8319: \$? = $ac_status" >&5
++  echo "$as_me:8322: \$? = $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
+@@ -8328,11 +8331,11 @@
+ fi
+ 
+ fi
+-echo "$as_me:8331: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:8334: 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:8335: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++	{ echo "$as_me:8338: 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
+ 
+@@ -8340,7 +8343,7 @@
+ 
+ fi
+ 
+-echo "$as_me:8343: checking if you want to use PCRE2 for regular-expressions" >&5
++echo "$as_me:8346: 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.
+@@ -8349,7 +8352,7 @@
+ 
+ fi;
+ test -z "$with_pcre2" && with_pcre2=no
+-echo "$as_me:8352: result: $with_pcre2" >&5
++echo "$as_me:8355: result: $with_pcre2" >&5
+ echo "${ECHO_T}$with_pcre2" >&6
+ 
+ if test "x$with_pcre2" != xno ; then
+@@ -8360,17 +8363,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}:8363: testing found package $cf_with_pcre2 ..." 1>&5
++echo "${as_me:-configure}:8366: 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}:8369: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:8372: 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}:8373: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:8376: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -8494,7 +8497,7 @@
+ fi
+ 
+ 	done
+-	cf_with_pcre2_ok=yes || { { echo "$as_me:8497: error: Cannot find PCRE2 library" >&5
++	cf_with_pcre2_ok=yes || { { echo "$as_me:8500: error: Cannot find PCRE2 library" >&5
+ echo "$as_me: error: Cannot find PCRE2 library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -8507,7 +8510,7 @@
+ 	(*pcre2-posix*|*pcreposix*)
+ 		;;
+ 	(*)
+-		echo "$as_me:8510: checking for regcomp in -lpcre2-posix" >&5
++		echo "$as_me:8513: 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
+@@ -8515,7 +8518,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcre2-posix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8518 "configure"
++#line 8521 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8534,16 +8537,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8537: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8540: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8540: \$? = $ac_status" >&5
++  echo "$as_me:8543: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8543: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8546: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8546: \$? = $ac_status" >&5
++  echo "$as_me:8549: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcre2_posix_regcomp=yes
+ else
+@@ -8554,7 +8557,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8557: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
++echo "$as_me:8560: 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
+ 
+@@ -8575,7 +8578,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  echo "$as_me:8578: checking for regcomp in -lpcreposix" >&5
++  echo "$as_me:8581: 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
+@@ -8583,7 +8586,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcreposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8586 "configure"
++#line 8589 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8602,16 +8605,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8605: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8608: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8608: \$? = $ac_status" >&5
++  echo "$as_me:8611: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8611: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8614: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8614: \$? = $ac_status" >&5
++  echo "$as_me:8617: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcreposix_regcomp=yes
+ else
+@@ -8622,7 +8625,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8625: result: $ac_cv_lib_pcreposix_regcomp" >&5
++echo "$as_me:8628: 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
+ 
+@@ -8643,7 +8646,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  { { echo "$as_me:8646: error: Cannot find PCRE2 POSIX library" >&5
++  { { echo "$as_me:8649: error: Cannot find PCRE2 POSIX library" >&5
+ echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8658,23 +8661,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:8661: checking for $ac_header" >&5
++echo "$as_me:8664: 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 8667 "configure"
++#line 8670 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8671: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8674: \"$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:8677: \$? = $ac_status" >&5
++  echo "$as_me:8680: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8693,7 +8696,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8696: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8699: 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:8712: 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 8715 "configure"
++#line 8718 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -8743,16 +8746,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8746: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8749: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8749: \$? = $ac_status" >&5
++  echo "$as_me:8752: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8752: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8755: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8755: \$? = $ac_status" >&5
++  echo "$as_me:8758: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -8762,7 +8765,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8765: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:8768: 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:8779: checking if you want to use sysmouse" >&5
++echo "$as_me:8782: 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.
+@@ -8788,7 +8791,7 @@
+ fi;
+ 	if test "$cf_with_sysmouse" != no ; then
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8791 "configure"
++#line 8794 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8811,16 +8814,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8814: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8817: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8817: \$? = $ac_status" >&5
++  echo "$as_me:8820: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8820: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8823: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8823: \$? = $ac_status" >&5
++  echo "$as_me:8826: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_with_sysmouse=yes
+ else
+@@ -8830,7 +8833,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	fi
+-echo "$as_me:8833: result: $cf_with_sysmouse" >&5
++echo "$as_me:8836: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -8840,7 +8843,7 @@
+ fi
+ 
+ # pretend that ncurses==ncursesw==ncursest
+-echo "$as_me:8843: checking if you want to disable library suffixes" >&5
++echo "$as_me:8846: 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.
+@@ -8857,13 +8860,13 @@
+ 	disable_lib_suffixes=no
+ 
+ fi;
+-echo "$as_me:8860: result: $disable_lib_suffixes" >&5
++echo "$as_me:8863: 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:8866: checking if rpath-hack should be disabled" >&5
++echo "$as_me:8869: 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.
+@@ -8881,22 +8884,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:8884: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:8887: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:8889: checking for updated LDFLAGS" >&5
++echo "$as_me:8892: 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:8892: result: maybe" >&5
++	echo "$as_me:8895: 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:8899: checking for $ac_word" >&5
++echo "$as_me:8902: 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
+@@ -8911,7 +8914,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:8914: found $ac_dir/$ac_word" >&5
++echo "$as_me:8917: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8919,10 +8922,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:8922: result: $cf_ldd_prog" >&5
++  echo "$as_me:8925: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:8925: result: no" >&5
++  echo "$as_me:8928: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8936,7 +8939,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8939 "configure"
++#line 8942 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8948,16 +8951,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8951: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8954: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8954: \$? = $ac_status" >&5
++  echo "$as_me:8957: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8957: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8960: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8960: \$? = $ac_status" >&5
++  echo "$as_me:8963: \$? = $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`
+@@ -8985,7 +8988,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:8988: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:8991: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -8997,11 +9000,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9000: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9003: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9004: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9007: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -9038,7 +9041,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:9041: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9044: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -9051,11 +9054,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9054: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9057: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:9058: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9061: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -9092,7 +9095,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:9095: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9098: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -9105,14 +9108,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:9108: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9111: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9112: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9115: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:9115: result: no" >&5
++	echo "$as_me:9118: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9126,7 +9129,7 @@
+ EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
+ if test -n "$EXTRA_PKG_LDFLAGS"
+ then
+-	echo "$as_me:9129: checking if you want to disable extra LDFLAGS for package-scripts" >&5
++	echo "$as_me:9132: 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.
+@@ -9143,7 +9146,7 @@
+ 	disable_pkg_ldflags=no
+ 
+ fi;
+-	echo "$as_me:9146: result: $disable_pkg_ldflags" >&5
++	echo "$as_me:9149: result: $disable_pkg_ldflags" >&5
+ echo "${ECHO_T}$disable_pkg_ldflags" >&6
+ 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
+ fi
+@@ -9151,7 +9154,7 @@
+ ###############################################################################
+ 
+ ###	use option --with-extra-suffix to append suffix to headers and libraries
+-echo "$as_me:9154: checking for extra suffix to append to header/library paths" >&5
++echo "$as_me:9157: checking for extra suffix to append to header/library paths" >&5
+ echo $ECHO_N "checking for extra suffix to append to header/library paths... $ECHO_C" >&6
+ EXTRA_SUFFIX=
+ 
+@@ -9170,11 +9173,11 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:9173: result: ${EXTRA_SUFFIX:-(none)}" >&5
++echo "$as_me:9176: result: ${EXTRA_SUFFIX:-(none)}" >&5
+ echo "${ECHO_T}${EXTRA_SUFFIX:-(none)}" >&6
+ 
+ ###	use option --disable-overwrite to leave out the link to -lcurses
+-echo "$as_me:9177: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:9180: 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.
+@@ -9184,10 +9187,10 @@
+ else
+   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:9187: result: $with_overwrite" >&5
++echo "$as_me:9190: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+ 
+-echo "$as_me:9190: checking if external terminfo-database is used" >&5
++echo "$as_me:9193: 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.
+@@ -9197,7 +9200,7 @@
+ else
+   use_database=yes
+ fi;
+-echo "$as_me:9200: result: $use_database" >&5
++echo "$as_me:9203: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+ 
+ case "$host_os" in
+@@ -9213,7 +9216,7 @@
+ if test "$use_database" != no ; then
+ 	NCURSES_USE_DATABASE=1
+ 
+-	echo "$as_me:9216: checking which terminfo source-file will be installed" >&5
++	echo "$as_me:9219: 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.
+@@ -9221,10 +9224,10 @@
+   withval="$with_database"
+   TERMINFO_SRC=$withval
+ fi;
+-	echo "$as_me:9224: result: $TERMINFO_SRC" >&5
++	echo "$as_me:9227: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+ 
+-	echo "$as_me:9227: checking whether to use hashed database instead of directory/tree" >&5
++	echo "$as_me:9230: 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.
+@@ -9234,13 +9237,13 @@
+ else
+   with_hashed_db=no
+ fi;
+-	echo "$as_me:9237: result: $with_hashed_db" >&5
++	echo "$as_me:9240: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ 	with_hashed_db=no
+ fi
+ 
+-echo "$as_me:9243: checking for list of fallback terminal descriptions" >&5
++echo "$as_me:9246: checking for list of fallback terminal descriptions" >&5
+ echo $ECHO_N "checking for list of fallback terminal descriptions... $ECHO_C" >&6
+ 
+ # Check whether --with-fallbacks or --without-fallbacks was given.
+@@ -9250,7 +9253,7 @@
+ else
+   with_fallback=
+ fi;
+-echo "$as_me:9253: result: ${with_fallback:-(none)}" >&5
++echo "$as_me:9256: result: ${with_fallback:-(none)}" >&5
+ echo "${ECHO_T}${with_fallback:-(none)}" >&6
+ 
+ case ".$with_fallback" in
+@@ -9258,7 +9261,7 @@
+ 	FALLBACK_LIST=
+ 	;;
+ (.yes)
+-	{ echo "$as_me:9261: WARNING: expected a list of terminal descriptions" >&5
++	{ echo "$as_me:9264: WARNING: expected a list of terminal descriptions" >&5
+ echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
+ 	;;
+ (*)
+@@ -9274,7 +9277,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:9277: checking for $ac_word" >&5
++echo "$as_me:9280: 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
+@@ -9289,7 +9292,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:9292: found $ac_dir/$ac_word" >&5
++echo "$as_me:9295: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9297,10 +9300,10 @@
+ fi
+ TIC=$ac_cv_prog_TIC
+ if test -n "$TIC"; then
+-  echo "$as_me:9300: result: $TIC" >&5
++  echo "$as_me:9303: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:9303: result: no" >&5
++  echo "$as_me:9306: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9309,7 +9312,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:9312: checking for $ac_word" >&5
++echo "$as_me:9315: 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
+@@ -9324,7 +9327,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:9327: found $ac_dir/$ac_word" >&5
++echo "$as_me:9330: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9332,10 +9335,10 @@
+ fi
+ ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
+ if test -n "$ac_ct_TIC"; then
+-  echo "$as_me:9335: result: $ac_ct_TIC" >&5
++  echo "$as_me:9338: result: $ac_ct_TIC" >&5
+ echo "${ECHO_T}$ac_ct_TIC" >&6
+ else
+-  echo "$as_me:9338: result: no" >&5
++  echo "$as_me:9341: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9347,7 +9350,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:9350: checking for $ac_word" >&5
++echo "$as_me:9353: 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
+@@ -9362,7 +9365,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:9365: found $ac_dir/$ac_word" >&5
++echo "$as_me:9368: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9370,10 +9373,10 @@
+ fi
+ INFOCMP=$ac_cv_prog_INFOCMP
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:9373: result: $INFOCMP" >&5
++  echo "$as_me:9376: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:9376: result: no" >&5
++  echo "$as_me:9379: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9382,7 +9385,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:9385: checking for $ac_word" >&5
++echo "$as_me:9388: 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
+@@ -9397,7 +9400,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:9400: found $ac_dir/$ac_word" >&5
++echo "$as_me:9403: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9405,10 +9408,10 @@
+ fi
+ ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
+ if test -n "$ac_ct_INFOCMP"; then
+-  echo "$as_me:9408: result: $ac_ct_INFOCMP" >&5
++  echo "$as_me:9411: result: $ac_ct_INFOCMP" >&5
+ echo "${ECHO_T}$ac_ct_INFOCMP" >&6
+ else
+-  echo "$as_me:9411: result: no" >&5
++  echo "$as_me:9414: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9423,10 +9426,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:9426: checking for tic program for fallbacks" >&5
++  echo "$as_me:9429: checking for tic program for fallbacks" >&5
+ echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
+ 		TIC=$withval
+-		echo "$as_me:9429: result: $TIC" >&5
++		echo "$as_me:9432: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -9454,7 +9457,7 @@
+ 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9457: error: expected a pathname, not \"$TIC\"" >&5
++	{ { echo "$as_me:9460: error: expected a pathname, not \"$TIC\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9467,7 +9470,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:9470: checking for $ac_word" >&5
++echo "$as_me:9473: 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
+@@ -9484,7 +9487,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:9487: found $ac_dir/$ac_word" >&5
++   echo "$as_me:9490: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -9495,10 +9498,10 @@
+ TIC=$ac_cv_path_TIC
+ 
+ if test -n "$TIC"; then
+-  echo "$as_me:9498: result: $TIC" >&5
++  echo "$as_me:9501: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:9501: result: no" >&5
++  echo "$as_me:9504: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9557,7 +9560,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:9560: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9563: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:9578: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -9581,10 +9584,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:9584: checking for infocmp program for fallbacks" >&5
++  echo "$as_me:9587: checking for infocmp program for fallbacks" >&5
+ echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
+ 		INFOCMP=$withval
+-		echo "$as_me:9587: result: $INFOCMP" >&5
++		echo "$as_me:9590: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -9612,7 +9615,7 @@
+ 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9615: error: expected a pathname, not \"$INFOCMP\"" >&5
++	{ { echo "$as_me:9618: error: expected a pathname, not \"$INFOCMP\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9625,7 +9628,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:9628: checking for $ac_word" >&5
++echo "$as_me:9631: 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
+@@ -9642,7 +9645,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:9645: found $ac_dir/$ac_word" >&5
++   echo "$as_me:9648: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -9653,10 +9656,10 @@
+ INFOCMP=$ac_cv_path_INFOCMP
+ 
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:9656: result: $INFOCMP" >&5
++  echo "$as_me:9659: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:9659: result: no" >&5
++  echo "$as_me:9662: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9715,7 +9718,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:9718: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9721: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:9736: WARNING: no infocmp program found for fallbacks" >&5
+ echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -9740,7 +9743,7 @@
+ 	test -z "$INFOCMP" && FALLBACK_LIST=
+ 	if test -z "$FALLBACK_LIST"
+ 	then
+-		{ echo "$as_me:9743: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
++		{ echo "$as_me:9746: 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
+@@ -9748,7 +9751,7 @@
+ USE_FALLBACKS=
+ test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
+ 
+-echo "$as_me:9751: checking if you want modern xterm or antique" >&5
++echo "$as_me:9754: 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.
+@@ -9762,7 +9765,7 @@
+ (no) with_xterm_new=xterm-old;;
+ (*)	 with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:9765: result: $with_xterm_new" >&5
++echo "$as_me:9768: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+ 
+@@ -9775,7 +9778,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9778: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:9781: 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.
+@@ -9799,13 +9802,13 @@
+ 	with_xterm_kbs=$withval
+ 	;;
+ esac
+-echo "$as_me:9802: result: $with_xterm_kbs" >&5
++echo "$as_me:9805: result: $with_xterm_kbs" >&5
+ echo "${ECHO_T}$with_xterm_kbs" >&6
+ XTERM_KBS=$with_xterm_kbs
+ 
+ if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
+ then
+-	{ echo "$as_me:9808: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
++	{ echo "$as_me:9811: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
+ echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;}
+ fi
+ 
+@@ -9815,7 +9818,7 @@
+ 	MAKE_TERMINFO="#"
+ else
+ 
+-echo "$as_me:9818: checking for list of terminfo directories" >&5
++echo "$as_me:9821: 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.
+@@ -9855,7 +9858,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9858: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:9861: 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; }; }
+ 	;;
+@@ -9878,7 +9881,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9881: result: $TERMINFO_DIRS" >&5
++echo "$as_me:9884: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <&5
++	{ echo "$as_me:9893: 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:9896: checking for default terminfo directory" >&5
++echo "$as_me:9899: 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.
+@@ -9929,7 +9932,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9932: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:9935: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9938,7 +9941,7 @@
+ fi
+ eval TERMINFO="$withval"
+ 
+-echo "$as_me:9941: result: $TERMINFO" >&5
++echo "$as_me:9944: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:9955: 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.
+@@ -9961,7 +9964,7 @@
+   with_big_core=no
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9964 "configure"
++#line 9967 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -9975,15 +9978,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9978: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9981: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9981: \$? = $ac_status" >&5
++  echo "$as_me:9984: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9983: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9986: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9986: \$? = $ac_status" >&5
++  echo "$as_me:9989: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_big_core=yes
+ else
+@@ -9995,7 +9998,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi;
+-echo "$as_me:9998: result: $with_big_core" >&5
++echo "$as_me:10001: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10005,7 +10008,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:10008: checking if big-strings option selected" >&5
++echo "$as_me:10011: 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.
+@@ -10029,14 +10032,14 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:10032: result: $with_big_strings" >&5
++echo "$as_me:10035: 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:10039: checking if you want termcap-fallback support" >&5
++echo "$as_me:10042: 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.
+@@ -10046,14 +10049,14 @@
+ else
+   with_termcap=no
+ fi;
+-echo "$as_me:10049: result: $with_termcap" >&5
++echo "$as_me:10052: 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:10056: error: You have disabled the database w/o specifying fallbacks" >&5
++			{ { echo "$as_me:10059: 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
+@@ -10066,13 +10069,13 @@
+ else
+ 
+ 	if test "$with_ticlib" != no ; then
+-		{ { echo "$as_me:10069: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++		{ { echo "$as_me:10072: 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:10075: checking for list of termcap files" >&5
++	echo "$as_me:10078: 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.
+@@ -10112,7 +10115,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:10115: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:10118: 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; }; }
+ 	;;
+@@ -10135,7 +10138,7 @@
+ 	;;
+ esac
+ 
+-	echo "$as_me:10138: result: $TERMPATH" >&5
++	echo "$as_me:10141: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ 	test -n "$TERMPATH" &&
+ cat >>confdefs.h <&5
++	echo "$as_me:10149: 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.
+@@ -10153,14 +10156,14 @@
+ else
+   with_getcap=no
+ fi;
+-	echo "$as_me:10156: result: $with_getcap" >&5
++	echo "$as_me:10159: 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:10163: checking if translated termcaps will be cached in ~/.terminfo" >&5
++	echo "$as_me:10166: 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.
+@@ -10170,7 +10173,7 @@
+ else
+   with_getcap_cache=no
+ fi;
+-	echo "$as_me:10173: result: $with_getcap_cache" >&5
++	echo "$as_me:10176: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ 	test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10180,7 +10183,7 @@
+ fi
+ 
+ ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:10183: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:10186: 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.
+@@ -10190,14 +10193,14 @@
+ else
+   with_home_terminfo=yes
+ fi;
+-echo "$as_me:10193: result: $with_home_terminfo" >&5
++echo "$as_me:10196: 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:10200: checking if you want to permit root to use ncurses environment variables" >&5
++echo "$as_me:10203: 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.
+@@ -10207,14 +10210,14 @@
+ else
+   with_root_environ=yes
+ fi;
+-echo "$as_me:10210: result: $with_root_environ" >&5
++echo "$as_me:10213: 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:10217: checking if you want to permit setuid programs to access all files" >&5
++echo "$as_me:10220: 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-access or --disable-root-access was given.
+@@ -10224,14 +10227,14 @@
+ else
+   with_root_access=yes
+ fi;
+-echo "$as_me:10227: result: $with_root_access" >&5
++echo "$as_me:10230: result: $with_root_access" >&5
+ echo "${ECHO_T}$with_root_access" >&6
+ test "x$with_root_access" = xyes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_ROOT_ACCESS 1
+ EOF
+ 
+-echo "$as_me:10234: checking if you want to permit setuid use of ncurses environment variables" >&5
++echo "$as_me:10237: checking if you want to permit setuid use of ncurses environment variables" >&5
+ echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
+ 
+ # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
+@@ -10241,7 +10244,7 @@
+ else
+   with_setuid_environ=$with_root_environ
+ fi;
+-echo "$as_me:10244: result: $with_setuid_environ" >&5
++echo "$as_me:10247: result: $with_setuid_environ" >&5
+ echo "${ECHO_T}$with_setuid_environ" >&6
+ test "x$with_setuid_environ" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10256,23 +10259,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:10259: checking for $ac_header" >&5
++echo "$as_me:10262: 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 10265 "configure"
++#line 10268 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10269: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:10272: \"$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:10275: \$? = $ac_status" >&5
++  echo "$as_me:10278: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10291,7 +10294,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:10294: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:10297: 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:10312: 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 10315 "configure"
++#line 10318 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10343,16 +10346,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10346: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10349: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10349: \$? = $ac_status" >&5
++  echo "$as_me:10352: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10352: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10355: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10355: \$? = $ac_status" >&5
++  echo "$as_me:10358: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -10362,7 +10365,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10365: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10368: 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:10385: 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 10388 "configure"
++#line 10391 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10416,16 +10419,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10419: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10422: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10422: \$? = $ac_status" >&5
++  echo "$as_me:10425: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10425: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10428: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10428: \$? = $ac_status" >&5
++  echo "$as_me:10431: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -10435,7 +10438,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10438: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10441: 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:10452: 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
+@@ -10459,7 +10462,7 @@
+ 			eval 'ac_cv_func_'$cf_func'=error'
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10462 "configure"
++#line 10465 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -10493,15 +10496,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10496: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10499: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10499: \$? = $ac_status" >&5
++  echo "$as_me:10502: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10501: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10504: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10504: \$? = $ac_status" >&5
++  echo "$as_me:10507: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -10519,7 +10522,7 @@
+ 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+ 
+ fi
+-echo "$as_me:10522: result: $cf_cv_link_funcs" >&5
++echo "$as_me:10525: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ 	test "$ac_cv_func_link"    = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -10539,7 +10542,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:10542: checking if tic should use symbolic links" >&5
++	echo "$as_me:10545: 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.
+@@ -10549,21 +10552,21 @@
+ else
+   with_symlinks=no
+ fi;
+-	echo "$as_me:10552: result: $with_symlinks" >&5
++	echo "$as_me:10555: 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:10559: checking if tic should use hard links" >&5
++	echo "$as_me:10562: 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:10566: result: $with_links" >&5
++	echo "$as_me:10569: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+ 
+@@ -10579,7 +10582,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:10582: checking if you want broken-linker support code" >&5
++echo "$as_me:10585: 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.
+@@ -10589,7 +10592,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:10592: result: $with_broken_linker" >&5
++echo "$as_me:10595: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : "${BROKEN_LINKER:=0}"
+@@ -10603,7 +10606,7 @@
+ fi
+ 
+ ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:10606: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:10609: 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.
+@@ -10613,7 +10616,7 @@
+ else
+   with_bsdpad=no
+ fi;
+-echo "$as_me:10616: result: $with_bsdpad" >&5
++echo "$as_me:10619: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10632,14 +10635,14 @@
+ # Check to define _XOPEN_SOURCE "automatically"
+ CPPFLAGS_before_XOPEN="$CPPFLAGS"
+ 
+-echo "$as_me:10635: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:10638: 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 10642 "configure"
++#line 10645 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10658,16 +10661,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10661: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10664: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10664: \$? = $ac_status" >&5
++  echo "$as_me:10667: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10667: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10670: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10670: \$? = $ac_status" >&5
++  echo "$as_me:10673: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -10678,7 +10681,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10681: result: $cf_cv_posix_visible" >&5
++echo "$as_me:10684: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -10720,14 +10723,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:10723: checking if this is the GNU C library" >&5
++echo "$as_me:10726: 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 10730 "configure"
++#line 10733 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10746,16 +10749,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10749: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10752: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10752: \$? = $ac_status" >&5
++  echo "$as_me:10755: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10755: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10758: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10758: \$? = $ac_status" >&5
++  echo "$as_me:10761: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -10766,7 +10769,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10769: result: $cf_cv_gnu_library" >&5
++echo "$as_me:10772: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -10774,7 +10777,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:10777: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:10780: 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
+@@ -10786,7 +10789,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10789 "configure"
++#line 10792 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10805,16 +10808,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10808: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10811: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10811: \$? = $ac_status" >&5
++  echo "$as_me:10814: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10814: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10817: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10817: \$? = $ac_status" >&5
++  echo "$as_me:10820: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -10826,12 +10829,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:10829: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:10832: 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:10834: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:10837: 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
+@@ -10936,7 +10939,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10939 "configure"
++#line 10942 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -10956,16 +10959,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10959: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10962: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10962: \$? = $ac_status" >&5
++  echo "$as_me:10965: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10965: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10968: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10968: \$? = $ac_status" >&5
++  echo "$as_me:10971: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -10976,7 +10979,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10979: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:10982: 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
+@@ -10985,14 +10988,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:10988: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:10991: 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 10995 "configure"
++#line 10998 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11007,16 +11010,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11010: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11013: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11013: \$? = $ac_status" >&5
++  echo "$as_me:11016: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11016: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11019: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11019: \$? = $ac_status" >&5
++  echo "$as_me:11022: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -11123,7 +11126,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11126 "configure"
++#line 11129 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11138,16 +11141,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11141: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11144: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11144: \$? = $ac_status" >&5
++  echo "$as_me:11147: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11147: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11150: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11150: \$? = $ac_status" >&5
++  echo "$as_me:11153: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -11162,12 +11165,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11165: result: $cf_cv_gnu_source" >&5
++echo "$as_me:11168: 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:11170: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:11173: 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
+@@ -11177,7 +11180,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11180 "configure"
++#line 11183 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11192,16 +11195,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11195: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11198: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11198: \$? = $ac_status" >&5
++  echo "$as_me:11201: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11201: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11204: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11204: \$? = $ac_status" >&5
++  echo "$as_me:11207: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -11212,7 +11215,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11215: result: $cf_cv_default_source" >&5
++echo "$as_me:11218: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -11249,16 +11252,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:11252: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11255: 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}:11258: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11261: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11261 "configure"
++#line 11264 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11273,16 +11276,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11276: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11279: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11279: \$? = $ac_status" >&5
++  echo "$as_me:11282: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11282: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11285: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11285: \$? = $ac_status" >&5
++  echo "$as_me:11288: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11303,7 +11306,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11306 "configure"
++#line 11309 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11318,16 +11321,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11321: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11324: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11324: \$? = $ac_status" >&5
++  echo "$as_me:11327: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11327: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11330: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11330: \$? = $ac_status" >&5
++  echo "$as_me:11333: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11338,7 +11341,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11341: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11344: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11346,10 +11349,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11349: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11352: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11352 "configure"
++#line 11355 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11364,16 +11367,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11367: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11370: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11370: \$? = $ac_status" >&5
++  echo "$as_me:11373: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11373: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11376: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11376: \$? = $ac_status" >&5
++  echo "$as_me:11379: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11389,7 +11392,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11392: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11395: 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
+@@ -11506,7 +11509,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:11509: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:11512: 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
+@@ -11538,14 +11541,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:11541: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:11544: 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 11548 "configure"
++#line 11551 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11563,16 +11566,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11566: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11569: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11569: \$? = $ac_status" >&5
++  echo "$as_me:11572: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11572: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11575: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11575: \$? = $ac_status" >&5
++  echo "$as_me:11578: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11584,7 +11587,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11587 "configure"
++#line 11590 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11602,16 +11605,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11605: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11608: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11608: \$? = $ac_status" >&5
++  echo "$as_me:11611: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11611: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11614: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11614: \$? = $ac_status" >&5
++  echo "$as_me:11617: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11626,7 +11629,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11629: result: $cf_cv_xopen_source" >&5
++echo "$as_me:11632: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -11786,16 +11789,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:11789: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11792: 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}:11795: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11798: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11798 "configure"
++#line 11801 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11810,16 +11813,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11813: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11816: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11816: \$? = $ac_status" >&5
++  echo "$as_me:11819: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11819: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11822: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11822: \$? = $ac_status" >&5
++  echo "$as_me:11825: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11840,7 +11843,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11843 "configure"
++#line 11846 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11855,16 +11858,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11858: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11861: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11861: \$? = $ac_status" >&5
++  echo "$as_me:11864: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11864: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11867: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11867: \$? = $ac_status" >&5
++  echo "$as_me:11870: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11875,7 +11878,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11878: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11881: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11883,10 +11886,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11886: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11889: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11889 "configure"
++#line 11892 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11901,16 +11904,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11904: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11907: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11907: \$? = $ac_status" >&5
++  echo "$as_me:11910: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11910: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11913: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11913: \$? = $ac_status" >&5
++  echo "$as_me:11916: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11926,7 +11929,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11929: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11932: 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
+@@ -12039,10 +12042,10 @@
+ 	if test "$cf_cv_xopen_source" = no ; then
+ 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+ 
+-echo "${as_me:-configure}:12042: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:12045: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12045 "configure"
++#line 12048 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12060,23 +12063,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12063: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12066: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12066: \$? = $ac_status" >&5
++  echo "$as_me:12069: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12069: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12072: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12072: \$? = $ac_status" >&5
++  echo "$as_me:12075: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-			{ echo "$as_me:12079: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++			{ echo "$as_me:12082: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ 			CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -12099,7 +12102,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}:12102: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12105: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -12111,7 +12114,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}:12114: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:12117: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -12199,7 +12202,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:12202: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:12205: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -12209,7 +12212,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:12212: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:12215: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -12219,7 +12222,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}:12222: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:12225: 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"
+@@ -12231,10 +12234,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:12234: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:12237: 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 12237 "configure"
++#line 12240 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12249,16 +12252,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12252: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12255: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12255: \$? = $ac_status" >&5
++  echo "$as_me:12258: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12258: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12261: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12261: \$? = $ac_status" >&5
++  echo "$as_me:12264: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -12267,12 +12270,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:12270: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:12273: 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 12275 "configure"
++#line 12278 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12287,16 +12290,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12290: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12293: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12293: \$? = $ac_status" >&5
++  echo "$as_me:12296: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12296: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12299: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12299: \$? = $ac_status" >&5
++  echo "$as_me:12302: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -12307,19 +12310,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:12310: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:12313: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:12315: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:12318: 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 12322 "configure"
++#line 12325 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12337,16 +12340,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12340: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12343: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12343: \$? = $ac_status" >&5
++  echo "$as_me:12346: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12346: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12349: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12349: \$? = $ac_status" >&5
++  echo "$as_me:12352: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12358,7 +12361,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12361 "configure"
++#line 12364 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12376,16 +12379,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12379: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12382: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12382: \$? = $ac_status" >&5
++  echo "$as_me:12385: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12385: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12388: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12388: \$? = $ac_status" >&5
++  echo "$as_me:12391: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12400,7 +12403,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12403: result: $cf_cv_xopen_source" >&5
++echo "$as_me:12406: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -12551,14 +12554,14 @@
+ 
+ # Work around breakage on OS X
+ 
+-echo "$as_me:12554: checking if SIGWINCH is defined" >&5
++echo "$as_me:12557: 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 12561 "configure"
++#line 12564 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12573,23 +12576,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12576: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12579: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12579: \$? = $ac_status" >&5
++  echo "$as_me:12582: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12582: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12585: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12585: \$? = $ac_status" >&5
++  echo "$as_me:12588: \$? = $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 12592 "configure"
++#line 12595 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -12607,16 +12610,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12610: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12613: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12613: \$? = $ac_status" >&5
++  echo "$as_me:12616: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12616: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12619: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12619: \$? = $ac_status" >&5
++  echo "$as_me:12622: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -12630,11 +12633,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12633: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:12636: 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:12637: checking for actual SIGWINCH definition" >&5
++echo "$as_me:12640: 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
+@@ -12645,7 +12648,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12648 "configure"
++#line 12651 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -12667,16 +12670,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12670: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12673: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12673: \$? = $ac_status" >&5
++  echo "$as_me:12676: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12676: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12679: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12679: \$? = $ac_status" >&5
++  echo "$as_me:12682: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -12690,7 +12693,7 @@
+ done
+ 
+ fi
+-echo "$as_me:12693: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:12696: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -12700,13 +12703,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:12703: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:12706: 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 12709 "configure"
++#line 12712 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12720,16 +12723,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12723: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12726: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12726: \$? = $ac_status" >&5
++  echo "$as_me:12729: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12729: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12732: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12732: \$? = $ac_status" >&5
++  echo "$as_me:12735: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -12740,7 +12743,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12743: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:12746: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test "$am_cv_langinfo_codeset" = yes; then
+ 
+@@ -12754,7 +12757,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+ 
+-echo "$as_me:12757: checking if you want wide-character code" >&5
++echo "$as_me:12760: 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.
+@@ -12764,7 +12767,7 @@
+ else
+   with_widec=$cf_dft_widec
+ fi;
+-echo "$as_me:12767: result: $with_widec" >&5
++echo "$as_me:12770: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ 
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -12786,7 +12789,7 @@
+ 	(*_XOPEN_SOURCE=*)
+ 		;;
+ 	(*)
+-		{ echo "$as_me:12789: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
++		{ echo "$as_me:12792: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
+ 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
+ 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
+@@ -12799,23 +12802,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:12802: checking for $ac_header" >&5
++echo "$as_me:12805: 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 12808 "configure"
++#line 12811 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:12812: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12815: \"$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:12818: \$? = $ac_status" >&5
++  echo "$as_me:12821: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12834,7 +12837,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:12837: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:12840: 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:12850: 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 12854 "configure"
++#line 12857 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12873,16 +12876,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12876: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12879: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12879: \$? = $ac_status" >&5
++  echo "$as_me:12882: \$? = $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:12885: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12885: \$? = $ac_status" >&5
++  echo "$as_me:12888: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_h_okay=yes
+ else
+@@ -12892,16 +12895,16 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12895: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:12898: 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:12901: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:12904: 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 12904 "configure"
++#line 12907 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12917,16 +12920,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12920: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12923: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12923: \$? = $ac_status" >&5
++  echo "$as_me:12926: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12926: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12929: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12929: \$? = $ac_status" >&5
++  echo "$as_me:12932: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=no
+ else
+@@ -12935,16 +12938,16 @@
+ cf_result=yes
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:12938: result: $cf_result" >&5
++echo "$as_me:12941: 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:12944: checking checking for compatible value versus " >&5
++	echo "$as_me:12947: 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 12947 "configure"
++#line 12950 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12960,16 +12963,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12963: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12966: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12966: \$? = $ac_status" >&5
++  echo "$as_me:12969: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12969: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12972: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12972: \$? = $ac_status" >&5
++  echo "$as_me:12975: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -12978,7 +12981,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:12981: result: $cf_result" >&5
++	echo "$as_me:12984: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = no ; then
+ 		# perhaps we can override it - try...
+@@ -12988,7 +12991,7 @@
+ 
+ fi
+ 
+-echo "$as_me:12991: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:12994: 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
+@@ -13059,7 +13062,7 @@
+   cf_cv_wcwidth_graphics=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13062 "configure"
++#line 13065 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13104,15 +13107,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:13107: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13110: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13110: \$? = $ac_status" >&5
++  echo "$as_me:13113: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:13112: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13115: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13115: \$? = $ac_status" >&5
++  echo "$as_me:13118: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wcwidth_graphics=yes
+ else
+@@ -13125,7 +13128,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:13128: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:13131: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+ 
+ 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -13136,13 +13139,13 @@
+ for ac_func in putwc btowc wctob wmemchr 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:13139: checking for $ac_func" >&5
++echo "$as_me:13142: 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 13145 "configure"
++#line 13148 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13173,16 +13176,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13176: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13179: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13179: \$? = $ac_status" >&5
++  echo "$as_me:13182: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13182: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13185: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13185: \$? = $ac_status" >&5
++  echo "$as_me:13188: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -13192,7 +13195,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13195: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:13198: 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:13213: 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 13216 "configure"
++#line 13219 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13220: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:13223: \"$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:13226: \$? = $ac_status" >&5
++  echo "$as_me:13229: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13242,7 +13245,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:13245: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:13248: 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:13258: 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
+@@ -13260,7 +13263,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13263 "configure"
++#line 13266 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13277,16 +13280,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13280: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13283: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13283: \$? = $ac_status" >&5
++  echo "$as_me:13286: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13286: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13289: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13289: \$? = $ac_status" >&5
++  echo "$as_me:13292: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -13298,12 +13301,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:13301: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13304: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13306 "configure"
++#line 13309 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13316,16 +13319,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13319: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13322: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13322: \$? = $ac_status" >&5
++  echo "$as_me:13325: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13325: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13328: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13328: \$? = $ac_status" >&5
++  echo "$as_me:13331: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -13339,7 +13342,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13342 "configure"
++#line 13345 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13352,16 +13355,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13355: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13358: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13358: \$? = $ac_status" >&5
++  echo "$as_me:13361: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13361: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13364: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13364: \$? = $ac_status" >&5
++  echo "$as_me:13367: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -13378,9 +13381,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:13381: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:13384: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:13383: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13386: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13471,7 +13474,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}:13474: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13477: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -13479,7 +13482,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13482 "configure"
++#line 13485 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13492,21 +13495,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13495: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13498: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13498: \$? = $ac_status" >&5
++  echo "$as_me:13501: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13501: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13504: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13504: \$? = $ac_status" >&5
++  echo "$as_me:13507: \$? = $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}:13509: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13512: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13524,7 +13527,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:13527: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13530: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -13599,13 +13602,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}:13602: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13605: 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 13608 "configure"
++#line 13611 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13618,21 +13621,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13621: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13624: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13624: \$? = $ac_status" >&5
++  echo "$as_me:13627: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13627: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13630: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13630: \$? = $ac_status" >&5
++  echo "$as_me:13633: \$? = $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}:13635: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13638: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -13674,7 +13677,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13677: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:13680: 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
+@@ -13712,7 +13715,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13715 "configure"
++#line 13718 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13724,16 +13727,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13727: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13730: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13730: \$? = $ac_status" >&5
++  echo "$as_me:13733: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13733: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13736: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13736: \$? = $ac_status" >&5
++  echo "$as_me:13739: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13750,7 +13753,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}:13753: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:13756: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -13786,7 +13789,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}:13789: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:13792: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -13818,14 +13821,14 @@
+ 	fi
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:13821: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:13824: 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 13828 "configure"
++#line 13831 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13843,23 +13846,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13846: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13849: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13849: \$? = $ac_status" >&5
++  echo "$as_me:13852: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13852: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13855: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13855: \$? = $ac_status" >&5
++  echo "$as_me:13858: \$? = $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 13862 "configure"
++#line 13865 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -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_cv_mbstate_t=yes
+ else
+@@ -13899,7 +13902,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13902: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:13905: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -13917,14 +13920,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:13920: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:13923: 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 13927 "configure"
++#line 13930 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13942,23 +13945,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13945: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13948: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13948: \$? = $ac_status" >&5
++  echo "$as_me:13951: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13951: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13954: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13954: \$? = $ac_status" >&5
++  echo "$as_me:13957: \$? = $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 13961 "configure"
++#line 13964 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13977,16 +13980,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13980: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13983: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13983: \$? = $ac_status" >&5
++  echo "$as_me:13986: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13986: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13989: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13989: \$? = $ac_status" >&5
++  echo "$as_me:13992: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -13998,7 +14001,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14001: result: $cf_cv_wchar_t" >&5
++echo "$as_me:14004: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -14021,14 +14024,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:14024: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:14027: 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 14031 "configure"
++#line 14034 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14046,23 +14049,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14049: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14052: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14052: \$? = $ac_status" >&5
++  echo "$as_me:14055: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14055: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14058: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14058: \$? = $ac_status" >&5
++  echo "$as_me:14061: \$? = $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 14065 "configure"
++#line 14068 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14081,16 +14084,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14084: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14087: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14087: \$? = $ac_status" >&5
++  echo "$as_me:14090: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14090: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14093: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14093: \$? = $ac_status" >&5
++  echo "$as_me:14096: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -14102,7 +14105,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14105: result: $cf_cv_wint_t" >&5
++echo "$as_me:14108: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -14134,7 +14137,7 @@
+ fi
+ 
+ ###   use option --disable-lp64 to allow long chtype
+-echo "$as_me:14137: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:14140: 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.
+@@ -14144,7 +14147,7 @@
+ else
+   with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:14147: result: $with_lp64" >&5
++echo "$as_me:14150: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+ 
+ if test "x$with_lp64" = xyes ; then
+@@ -14160,7 +14163,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:14163: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:14166: 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
+@@ -14172,7 +14175,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 14175 "configure"
++#line 14178 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14192,16 +14195,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14195: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14198: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14198: \$? = $ac_status" >&5
++  echo "$as_me:14201: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14201: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14204: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14204: \$? = $ac_status" >&5
++  echo "$as_me:14207: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14211,16 +14214,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14214: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14217: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14217: \$? = $ac_status" >&5
++  echo "$as_me:14220: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14220: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14223: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14223: \$? = $ac_status" >&5
++  echo "$as_me:14226: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -14234,13 +14237,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:14237: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:14240: 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:14243: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:14246: 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
+@@ -14248,7 +14251,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14251 "configure"
++#line 14254 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14268,16 +14271,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14271: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14274: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14274: \$? = $ac_status" >&5
++  echo "$as_me:14277: \$? = $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:14280: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14280: \$? = $ac_status" >&5
++  echo "$as_me:14283: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14286,7 +14289,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14289 "configure"
++#line 14292 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -14307,16 +14310,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14310: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14313: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14313: \$? = $ac_status" >&5
++  echo "$as_me:14316: \$? = $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:14319: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14319: \$? = $ac_status" >&5
++  echo "$as_me:14322: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -14327,7 +14330,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14330: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:14333: 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
+ 
+@@ -14337,7 +14340,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:14340: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:14343: 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
+@@ -14345,7 +14348,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14348 "configure"
++#line 14351 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14365,16 +14368,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14368: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14371: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14371: \$? = $ac_status" >&5
++  echo "$as_me:14374: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14374: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14377: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14377: \$? = $ac_status" >&5
++  echo "$as_me:14380: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14383,7 +14386,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14386 "configure"
++#line 14389 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -14404,16 +14407,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14407: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14410: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14410: \$? = $ac_status" >&5
++  echo "$as_me:14413: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14413: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14416: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14416: \$? = $ac_status" >&5
++  echo "$as_me:14419: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -14424,7 +14427,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14427: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:14430: 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
+ 
+@@ -14437,7 +14440,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:14440: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:14443: 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
+@@ -14445,7 +14448,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14448 "configure"
++#line 14451 "configure"
+ #include "confdefs.h"
+ #include 
+     #include 
+@@ -14460,16 +14463,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14463: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14466: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14466: \$? = $ac_status" >&5
++  echo "$as_me:14469: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14469: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14472: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14472: \$? = $ac_status" >&5
++  echo "$as_me:14475: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14478,7 +14481,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14481 "configure"
++#line 14484 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -14494,16 +14497,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14497: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14500: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14500: \$? = $ac_status" >&5
++  echo "$as_me:14503: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14503: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14506: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14506: \$? = $ac_status" >&5
++  echo "$as_me:14509: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -14514,7 +14517,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14517: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:14520: 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
+ 
+@@ -14528,13 +14531,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:14531: checking for fseeko" >&5
++echo "$as_me:14534: 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 14537 "configure"
++#line 14540 "configure"
+ #include "confdefs.h"
+ #include 
+                              #include 
+@@ -14548,16 +14551,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14551: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14554: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14554: \$? = $ac_status" >&5
++  echo "$as_me:14557: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14557: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14560: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14560: \$? = $ac_status" >&5
++  echo "$as_me:14563: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -14567,7 +14570,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14570: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:14573: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -14606,14 +14609,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:14609: checking whether to use struct dirent64" >&5
++	echo "$as_me:14612: 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 14616 "configure"
++#line 14619 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -14640,16 +14643,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14643: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14646: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14646: \$? = $ac_status" >&5
++  echo "$as_me:14649: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14649: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14652: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14652: \$? = $ac_status" >&5
++  echo "$as_me:14655: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -14660,7 +14663,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14663: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:14666: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -14670,7 +14673,7 @@
+ 	fi
+ 
+ ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:14673: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:14676: 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.
+@@ -14680,14 +14683,14 @@
+ else
+   with_tparm_varargs=yes
+ fi;
+-echo "$as_me:14683: result: $with_tparm_varargs" >&5
++echo "$as_me:14686: 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:14690: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:14693: 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.
+@@ -14697,14 +14700,14 @@
+ else
+   with_tic_depends=yes
+ fi;
+-echo "$as_me:14700: result: $with_tic_depends" >&5
++echo "$as_me:14703: 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:14707: checking if you want to enable wattr* macros" >&5
++echo "$as_me:14710: 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.
+@@ -14716,15 +14719,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ 	NCURSES_WATTR_MACROS=0
+-	echo "$as_me:14719: result: no" >&5
++	echo "$as_me:14722: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ else
+ 	NCURSES_WATTR_MACROS=1
+-	echo "$as_me:14723: result: yes" >&5
++	echo "$as_me:14726: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ fi
+ 
+-echo "$as_me:14727: checking for X11 rgb file" >&5
++echo "$as_me:14730: 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.
+@@ -14788,7 +14791,7 @@
+ 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:14791: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:14794: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14796,7 +14799,7 @@
+ 
+ fi
+ 
+-echo "$as_me:14799: result: $RGB_PATH" >&5
++echo "$as_me:14802: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:14817: 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.
+@@ -14821,17 +14824,17 @@
+ else
+   NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:14824: result: $NCURSES_BOOL" >&5
++echo "$as_me:14827: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ case x$NCURSES_BOOL in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14828: error: expected a type name for bool" >&5
++	{ { echo "$as_me:14831: error: expected a type name for bool" >&5
+ echo "$as_me: error: expected a type name for bool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+-echo "$as_me:14834: checking for alternate terminal capabilities file" >&5
++echo "$as_me:14837: 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.
+@@ -14843,16 +14846,16 @@
+ fi;
+ if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
+ then
+-	{ echo "$as_me:14846: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
++	{ echo "$as_me:14849: 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:14850: result: $TERMINFO_CAPS" >&5
++echo "$as_me:14853: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+ 
+ ###   use option --with-chtype to override chtype's type
+ 
+-echo "$as_me:14855: checking for type of chtype" >&5
++echo "$as_me:14858: 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.
+@@ -14862,11 +14865,11 @@
+ else
+   NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:14865: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:14868: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ case x$NCURSES_CHTYPE in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14869: error: expected a type name for chtype" >&5
++	{ { echo "$as_me:14872: error: expected a type name for chtype" >&5
+ echo "$as_me: error: expected a type name for chtype" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14874,7 +14877,7 @@
+ 
+ ###   use option --with-ospeed to override ospeed's type
+ 
+-echo "$as_me:14877: checking for type of ospeed" >&5
++echo "$as_me:14880: 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.
+@@ -14884,11 +14887,11 @@
+ else
+   NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:14887: result: $NCURSES_OSPEED" >&5
++echo "$as_me:14890: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ case x$NCURSES_OSPEED in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14891: error: expected a type name for ospeed" >&5
++	{ { echo "$as_me:14894: error: expected a type name for ospeed" >&5
+ echo "$as_me: error: expected a type name for ospeed" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14896,7 +14899,7 @@
+ 
+ ###   use option --with-mmask-t to override mmask_t's type
+ 
+-echo "$as_me:14899: checking for type of mmask-t" >&5
++echo "$as_me:14902: 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.
+@@ -14906,18 +14909,18 @@
+ else
+   NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:14909: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:14912: result: $NCURSES_MMASK_T" >&5
+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+ case x$NCURSES_MMASK_T in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14913: error: expected a type name for mmask-t" >&5
++	{ { echo "$as_me:14916: error: expected a type name for mmask-t" >&5
+ echo "$as_me: error: expected a type name for mmask-t" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ ###   use option --with-ccharw-max to override CCHARW_MAX size
+-echo "$as_me:14920: checking for size CCHARW_MAX" >&5
++echo "$as_me:14923: 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.
+@@ -14927,16 +14930,16 @@
+ else
+   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
+ fi;
+-echo "$as_me:14930: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:14933: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+ 
+-echo "$as_me:14933: checking for signed char" >&5
++echo "$as_me:14936: 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 14939 "configure"
++#line 14942 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14951,16 +14954,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14954: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14957: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14957: \$? = $ac_status" >&5
++  echo "$as_me:14960: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14960: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14963: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14963: \$? = $ac_status" >&5
++  echo "$as_me:14966: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -14970,10 +14973,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14973: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:14976: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:14976: checking size of signed char" >&5
++echo "$as_me:14979: 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
+@@ -14982,7 +14985,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14985 "configure"
++#line 14988 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14994,21 +14997,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14997: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15000: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15000: \$? = $ac_status" >&5
++  echo "$as_me:15003: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15003: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15006: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15006: \$? = $ac_status" >&5
++  echo "$as_me:15009: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15011 "configure"
++#line 15014 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15020,16 +15023,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15023: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15026: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15026: \$? = $ac_status" >&5
++  echo "$as_me:15029: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15029: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15032: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15032: \$? = $ac_status" >&5
++  echo "$as_me:15035: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -15045,7 +15048,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15048 "configure"
++#line 15051 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15057,16 +15060,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15060: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15063: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15063: \$? = $ac_status" >&5
++  echo "$as_me:15066: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15066: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15069: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15069: \$? = $ac_status" >&5
++  echo "$as_me:15072: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -15082,7 +15085,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 15085 "configure"
++#line 15088 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15094,16 +15097,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15097: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15100: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15100: \$? = $ac_status" >&5
++  echo "$as_me:15103: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15103: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15106: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15106: \$? = $ac_status" >&5
++  echo "$as_me:15109: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -15116,12 +15119,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:15119: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:15122: 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 15124 "configure"
++#line 15127 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15137,15 +15140,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:15140: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15143: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15143: \$? = $ac_status" >&5
++  echo "$as_me:15146: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:15145: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15148: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15148: \$? = $ac_status" >&5
++  echo "$as_me:15151: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -15161,7 +15164,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:15164: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:15167: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:15178: checking whether to use signed chars for Boolean array in term.h" >&5
+ echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
+ 
+ # Check whether --enable-signed-char or --disable-signed-char was given.
+@@ -15182,13 +15185,13 @@
+ else
+   with_signed_char=$cf_dft_signed_char
+ fi;
+-echo "$as_me:15185: result: $with_signed_char" >&5
++echo "$as_me:15188: 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:15191: checking for type of tparm-arg" >&5
++echo "$as_me:15194: checking for type of tparm-arg" >&5
+ echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6
+ 
+ # Check whether --with-tparm-arg or --without-tparm-arg was given.
+@@ -15198,18 +15201,18 @@
+ else
+   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:15201: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:15204: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+ case x$NCURSES_TPARM_ARG in
+ (x|xyes|xno)
+-	{ { echo "$as_me:15205: error: expected a type name for tparm-arg" >&5
++	{ { echo "$as_me:15208: error: expected a type name for tparm-arg" >&5
+ echo "$as_me: error: expected a type name for tparm-arg" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:15212: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:15215: 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.
+@@ -15219,7 +15222,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:15222: result: $with_rcs_ids" >&5
++echo "$as_me:15225: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15228,7 +15231,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:15231: checking format of man-pages" >&5
++echo "$as_me:15234: 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.
+@@ -15319,10 +15322,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:15322: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:15325: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+-	{ echo "$as_me:15325: WARNING: Unexpected manpage-format $cf_unknown" >&5
++	{ echo "$as_me:15328: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+ 
+@@ -15363,7 +15366,7 @@
+ esac
+ done
+ 
+-echo "$as_me:15366: checking for manpage renaming" >&5
++echo "$as_me:15369: 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.
+@@ -15392,15 +15395,15 @@
+ elif test "$MANPAGE_RENAMES" = no ; then
+ 	:
+ elif test ! -f "$MANPAGE_RENAMES" ; then
+-	{ { echo "$as_me:15395: error: not a filename: $MANPAGE_RENAMES" >&5
++	{ { echo "$as_me:15398: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-echo "$as_me:15400: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:15403: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+ 
+-echo "$as_me:15403: checking if manpage aliases will be installed" >&5
++echo "$as_me:15406: 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.
+@@ -15411,7 +15414,7 @@
+   MANPAGE_ALIASES=yes
+ fi;
+ 
+-echo "$as_me:15414: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:15417: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+ 
+ case "x$LN_S" in
+@@ -15425,7 +15428,7 @@
+ 
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:15428: checking if manpage symlinks should be used" >&5
++echo "$as_me:15431: 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.
+@@ -15438,17 +15441,17 @@
+ 
+ if test "$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+-	{ echo "$as_me:15441: WARNING: cannot make symlinks" >&5
++	{ echo "$as_me:15444: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ 	MANPAGE_SYMLINKS=no
+ fi
+ fi
+ 
+-echo "$as_me:15447: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:15450: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+ 
+-echo "$as_me:15451: checking for manpage tbl" >&5
++echo "$as_me:15454: 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.
+@@ -15459,7 +15462,7 @@
+   MANPAGE_TBL=no
+ fi;
+ 
+-echo "$as_me:15462: result: $MANPAGE_TBL" >&5
++echo "$as_me:15465: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+ 
+ if test "$prefix" = "NONE" ; then
+@@ -15777,7 +15780,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15780: checking if you want to build with function extensions" >&5
++echo "$as_me:15783: 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.
+@@ -15787,7 +15790,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:15790: result: $with_ext_funcs" >&5
++echo "$as_me:15793: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -15844,7 +15847,7 @@
+ 	GENERATED_EXT_FUNCS=
+ fi
+ 
+-echo "$as_me:15847: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:15850: 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.
+@@ -15854,7 +15857,7 @@
+ else
+   with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:15857: result: $with_sp_funcs" >&5
++echo "$as_me:15860: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ 	NCURSES_SP_FUNCS=1
+@@ -15873,7 +15876,7 @@
+ 	GENERATED_SP_FUNCS=
+ fi
+ 
+-echo "$as_me:15876: checking if you want to build with terminal-driver" >&5
++echo "$as_me:15879: 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.
+@@ -15883,7 +15886,7 @@
+ else
+   with_term_driver=no
+ fi;
+-echo "$as_me:15886: result: $with_term_driver" >&5
++echo "$as_me:15889: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+ 
+@@ -15892,19 +15895,19 @@
+ EOF
+ 
+ 	if test "x$with_termlib" != xno ; then
+-		{ { echo "$as_me:15895: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:15898: 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:15900: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:15903: 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:15907: checking for extended use of const keyword" >&5
++echo "$as_me:15910: 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.
+@@ -15914,7 +15917,7 @@
+ else
+   with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:15917: result: $with_ext_const" >&5
++echo "$as_me:15920: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -15922,7 +15925,7 @@
+ fi
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:15925: checking if you want to use extended colors" >&5
++echo "$as_me:15928: 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.
+@@ -15932,12 +15935,12 @@
+ else
+   with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:15935: result: $with_ext_colors" >&5
++echo "$as_me:15938: 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:15940: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:15943: 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)
+@@ -15948,7 +15951,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:15951: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:15954: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -15976,7 +15979,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:15979: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:15982: 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.
+@@ -15986,7 +15989,7 @@
+ else
+   with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:15989: result: $with_ext_mouse" >&5
++echo "$as_me:15992: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ if test "x$with_ext_mouse" = xyes ; then
+ 
+@@ -15996,7 +15999,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:15999: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16002: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16013,7 +16016,7 @@
+ fi
+ 
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:16016: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:16019: 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.
+@@ -16023,7 +16026,7 @@
+ else
+   with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:16026: result: $with_ext_putwin" >&5
++echo "$as_me:16029: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+ 
+@@ -16033,7 +16036,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16036: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:16039: 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.
+@@ -16043,7 +16046,7 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:16046: result: $with_no_padding" >&5
++echo "$as_me:16049: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16051,7 +16054,7 @@
+ EOF
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:16054: checking if you want SIGWINCH handler" >&5
++echo "$as_me:16057: 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.
+@@ -16061,7 +16064,7 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:16064: result: $with_sigwinch" >&5
++echo "$as_me:16067: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ if test "x$with_sigwinch" = xyes
+ then
+@@ -16076,7 +16079,7 @@
+ fi
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:16079: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:16082: 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.
+@@ -16086,7 +16089,7 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:16089: result: $with_tcap_names" >&5
++echo "$as_me:16092: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ if test "x$with_tcap_names" = xyes; then
+@@ -16100,7 +16103,7 @@
+ 
+ ##############################################################################
+ 
+-echo "$as_me:16103: checking if you want to link with the pthread library" >&5
++echo "$as_me:16106: 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.
+@@ -16110,27 +16113,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:16113: result: $with_pthread" >&5
++echo "$as_me:16116: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:16117: checking for pthread.h" >&5
++	echo "$as_me:16120: 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 16123 "configure"
++#line 16126 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16127: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16130: \"$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:16133: \$? = $ac_status" >&5
++  echo "$as_me:16136: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16149,7 +16152,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16152: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:16155: 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
+ 
+@@ -16159,7 +16162,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:16162: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:16165: 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"
+ 
+@@ -16180,7 +16183,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16183 "configure"
++#line 16186 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16197,16 +16200,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16200: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16203: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16203: \$? = $ac_status" >&5
++  echo "$as_me:16206: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16206: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16209: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16209: \$? = $ac_status" >&5
++  echo "$as_me:16212: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -16216,7 +16219,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:16219: result: $with_pthread" >&5
++	    echo "$as_me:16222: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -16244,7 +16247,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:16247: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:16250: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -16254,13 +16257,13 @@
+ fi
+ 
+ if test "x$with_pthread" != xno; then
+-	echo "$as_me:16257: checking for pthread_kill" >&5
++	echo "$as_me:16260: 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 16263 "configure"
++#line 16266 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16291,16 +16294,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16294: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16297: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16297: \$? = $ac_status" >&5
++  echo "$as_me:16300: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16300: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16303: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16303: \$? = $ac_status" >&5
++  echo "$as_me:16306: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_pthread_kill=yes
+ else
+@@ -16310,11 +16313,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16313: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:16316: 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:16317: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:16320: 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.
+@@ -16324,7 +16327,7 @@
+ else
+   use_pthreads_eintr=no
+ fi;
+-		echo "$as_me:16327: result: $use_pthreads_eintr" >&5
++		echo "$as_me:16330: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ 		if test "x$use_pthreads_eintr" = xyes ; then
+ 
+@@ -16335,7 +16338,7 @@
+ 		fi
+ fi
+ 
+-	echo "$as_me:16338: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:16341: 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.
+@@ -16345,18 +16348,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-	echo "$as_me:16348: result: $use_weak_symbols" >&5
++	echo "$as_me:16351: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ 	if test "x$use_weak_symbols" = xyes ; then
+ 
+-echo "$as_me:16352: checking if $CC supports weak symbols" >&5
++echo "$as_me:16355: 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 16359 "configure"
++#line 16362 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16382,16 +16385,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16385: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16388: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16388: \$? = $ac_status" >&5
++  echo "$as_me:16391: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16391: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16394: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16394: \$? = $ac_status" >&5
++  echo "$as_me:16397: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -16402,7 +16405,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16405: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:16408: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ 	else
+@@ -16452,7 +16455,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:16455: checking if you want reentrant code" >&5
++echo "$as_me:16458: 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.
+@@ -16462,7 +16465,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:16465: result: $with_reentrant" >&5
++echo "$as_me:16468: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -16551,7 +16554,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16554: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16557: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16563,7 +16566,7 @@
+ 	NCURSES_SIZE_T=$cf_dft_ordinate_type
+ fi
+ 
+-echo "$as_me:16566: checking whether curses library structures should be opaque" >&5
++echo "$as_me:16569: checking whether curses library structures should be opaque" >&5
+ echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
+@@ -16585,16 +16588,16 @@
+ 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16588: result: $enable_opaque_curses" >&5
++echo "$as_me:16591: 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:16593: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:16596: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:16597: checking whether form library structures should be opaque" >&5
++echo "$as_me:16600: checking whether form library structures should be opaque" >&5
+ echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-form or --disable-opaque-form was given.
+@@ -16611,10 +16614,10 @@
+ 	enable_opaque_form=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16614: result: $enable_opaque_form" >&5
++echo "$as_me:16617: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+ 
+-echo "$as_me:16617: checking whether menu library structures should be opaque" >&5
++echo "$as_me:16620: checking whether menu library structures should be opaque" >&5
+ echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
+@@ -16631,10 +16634,10 @@
+ 	enable_opaque_menu=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16634: result: $enable_opaque_menu" >&5
++echo "$as_me:16637: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+ 
+-echo "$as_me:16637: checking whether panel library structures should be opaque" >&5
++echo "$as_me:16640: checking whether panel library structures should be opaque" >&5
+ echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
+@@ -16651,7 +16654,7 @@
+ 	enable_opaque_panel=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16654: result: $enable_opaque_panel" >&5
++echo "$as_me:16657: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+ 
+ NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -16661,7 +16664,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:16664: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:16667: 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.
+@@ -16671,7 +16674,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:16674: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:16677: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -16684,7 +16687,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:16687: checking if you want all development code" >&5
++echo "$as_me:16690: 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.
+@@ -16694,11 +16697,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:16697: result: $with_develop" >&5
++echo "$as_me:16700: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###   use option --enable-check-size to detect screensize with CPR
+-echo "$as_me:16701: checking if you want to check screensize of serial terminals" >&5
++echo "$as_me:16704: checking if you want to check screensize of serial terminals" >&5
+ echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
+ 
+ # Check whether --enable-check-size or --disable-check-size was given.
+@@ -16708,7 +16711,7 @@
+ else
+   enable_check_size=$with_develop
+ fi;
+-echo "$as_me:16711: result: $enable_check_size" >&5
++echo "$as_me:16714: result: $enable_check_size" >&5
+ echo "${ECHO_T}$enable_check_size" >&6
+ test "x$enable_check_size" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16716,7 +16719,7 @@
+ EOF
+ 
+ ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
+-echo "$as_me:16719: checking if you want hard-tabs code" >&5
++echo "$as_me:16722: 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.
+@@ -16726,7 +16729,7 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:16729: result: $enable_hard_tabs" >&5
++echo "$as_me:16732: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16734,7 +16737,7 @@
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:16737: checking if you want limited support for xmc" >&5
++echo "$as_me:16740: 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.
+@@ -16744,7 +16747,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:16747: result: $enable_xmc_glitch" >&5
++echo "$as_me:16750: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16754,7 +16757,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:16757: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:16760: 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.
+@@ -16764,7 +16767,7 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:16767: result: $with_assumed_color" >&5
++echo "$as_me:16770: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16772,7 +16775,7 @@
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:16775: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:16778: 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.
+@@ -16782,7 +16785,7 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:16785: result: $with_hashmap" >&5
++echo "$as_me:16788: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16790,7 +16793,7 @@
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:16793: checking if you want colorfgbg code" >&5
++echo "$as_me:16796: 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.
+@@ -16800,7 +16803,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:16803: result: $with_colorfgbg" >&5
++echo "$as_me:16806: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16808,7 +16811,7 @@
+ EOF
+ 
+ ###   use option --enable-fvisibility to turn on use of gcc-specific feature
+-echo "$as_me:16811: checking if you want to use gcc -fvisibility option" >&5
++echo "$as_me:16814: 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.
+@@ -16818,14 +16821,14 @@
+ else
+   cf_with_fvisibility=no
+ fi;
+-echo "$as_me:16821: result: $cf_with_fvisibility" >&5
++echo "$as_me:16824: 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:16828: checking if $CC -fvisibility=hidden option works" >&5
++echo "$as_me:16831: 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
+@@ -16834,7 +16837,7 @@
+     cf_save_cflags="$CFLAGS"
+     CFLAGS="$CFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16837 "configure"
++#line 16840 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16850,16 +16853,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16853: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16856: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16856: \$? = $ac_status" >&5
++  echo "$as_me:16859: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16859: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16862: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16862: \$? = $ac_status" >&5
++  echo "$as_me:16865: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden=yes
+ else
+@@ -16871,7 +16874,7 @@
+     CFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16874: result: $cf_cv_fvisibility_hidden" >&5
++echo "$as_me:16877: result: $cf_cv_fvisibility_hidden" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
+ 
+ 	if test "x$cf_cv_fvisibility_hidden" = xyes
+@@ -16986,7 +16989,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:16989: checking if $CXX -fvisibility=hidden option works" >&5
++echo "$as_me:16992: 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
+@@ -16995,7 +16998,7 @@
+     cf_save_cflags="$CXXFLAGS"
+     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16998 "configure"
++#line 17001 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -17011,16 +17014,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17014: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17017: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17017: \$? = $ac_status" >&5
++  echo "$as_me:17020: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17023: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17023: \$? = $ac_status" >&5
++  echo "$as_me:17026: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden2=yes
+ else
+@@ -17032,7 +17035,7 @@
+     CXXFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:17035: result: $cf_cv_fvisibility_hidden2" >&5
++echo "$as_me:17038: result: $cf_cv_fvisibility_hidden2" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
+ 
+ 		if test "x$cf_cv_fvisibility_hidden2" = xyes
+@@ -17155,7 +17158,7 @@
+ fi
+ 
+ ###   use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:17158: checking if you want interop bindings" >&5
++echo "$as_me:17161: 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.
+@@ -17165,13 +17168,13 @@
+ else
+   with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:17168: result: $with_exp_interop" >&5
++echo "$as_me:17171: 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:17174: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:17177: 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.
+@@ -17181,13 +17184,13 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:17184: result: $with_safe_sprintf" >&5
++echo "$as_me:17187: 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:17190: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:17193: 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.
+@@ -17197,7 +17200,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:17200: result: $with_scroll_hints" >&5
++echo "$as_me:17203: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -17206,7 +17209,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17209: checking if you want wgetch-events code" >&5
++echo "$as_me:17212: 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.
+@@ -17216,7 +17219,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:17219: result: $with_wgetch_events" >&5
++echo "$as_me:17222: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ if test "x$with_wgetch_events" = xyes ; then
+ 
+@@ -17231,7 +17234,7 @@
+ 
+ case "$cf_cv_system_name" in
+ (*mingw32*|*mingw64*|*-msvc*)
+-	echo "$as_me:17234: checking if you want experimental-Windows driver" >&5
++	echo "$as_me:17237: 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.
+@@ -17241,7 +17244,7 @@
+ else
+   with_exp_win32=no
+ fi;
+-	echo "$as_me:17244: result: $with_exp_win32" >&5
++	echo "$as_me:17247: result: $with_exp_win32" >&5
+ echo "${ECHO_T}$with_exp_win32" >&6
+ 	if test "x$with_exp_win32" = xyes
+ 	then
+@@ -17267,7 +17270,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:17270: checking if you want to see long compiling messages" >&5
++echo "$as_me:17273: 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.
+@@ -17301,7 +17304,7 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:17304: result: $enableval" >&5
++echo "$as_me:17307: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ if test "x$enable_echo" = xyes; then
+@@ -17314,7 +17317,7 @@
+ 
+ # --disable-stripping is used for debugging
+ 
+-echo "$as_me:17317: checking if you want to install stripped executables" >&5
++echo "$as_me:17320: 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.
+@@ -17331,7 +17334,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:17334: result: $enable_stripping" >&5
++echo "$as_me:17337: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -17342,7 +17345,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:17345: checking if install accepts -p option" >&5
++echo "$as_me:17348: 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
+@@ -17373,10 +17376,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:17376: result: $cf_cv_install_p" >&5
++echo "$as_me:17379: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:17379: checking if install needs to be told about ownership" >&5
++echo "$as_me:17382: 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)
+@@ -17387,7 +17390,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17390: result: $with_install_o" >&5
++echo "$as_me:17393: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -17398,7 +17401,7 @@
+ 
+ if test -n "$INSTALL_OPT_S"
+ then
+-	echo "$as_me:17401: checking if you want to specify strip-program" >&5
++	echo "$as_me:17404: checking if you want to specify strip-program" >&5
+ echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
+ 
+ # Check whether --with-strip-program or --without-strip-program was given.
+@@ -17408,11 +17411,11 @@
+ else
+   with_strip_program=no
+ fi;
+-	echo "$as_me:17411: result: $with_strip_program" >&5
++	echo "$as_me:17414: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ 	if test "$with_strip_program" != no
+ 	then
+-		echo "$as_me:17415: checking if strip-program is supported with this installer" >&5
++		echo "$as_me:17418: checking if strip-program is supported with this installer" >&5
+ echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
+ 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
+ 		check_install_strip=no
+@@ -17433,11 +17436,11 @@
+ 				done
+ 			fi
+ 		fi
+-		echo "$as_me:17436: result: $check_install_strip" >&5
++		echo "$as_me:17439: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ 		case "$check_install_strip" in
+ 		(no)
+-			{ echo "$as_me:17440: WARNING: $cf_install_program does not support strip program option" >&5
++			{ echo "$as_me:17443: WARNING: $cf_install_program does not support strip program option" >&5
+ echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
+ 			with_strip_program=no
+ 			;;
+@@ -17452,7 +17455,7 @@
+ 			chmod +x "$INSTALL"
+ 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
+ 
+-echo "${as_me:-configure}:17455: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:17458: testing created $INSTALL ..." 1>&5
+ 
+ 			;;
+ 		(option)
+@@ -17478,7 +17481,7 @@
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+ 
+-echo "$as_me:17481: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:17484: 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.
+@@ -17495,17 +17498,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:17498: result: $enable_stdnoreturn" >&5
++echo "$as_me:17501: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:17502: checking for C11 _Noreturn feature" >&5
++echo "$as_me:17505: 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 17508 "configure"
++#line 17511 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17521,16 +17524,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17524: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17527: \"$ac_compile\"") >&5
+   (eval $ac_compile) 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_objext"'
+-  { (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
+   cf_cv_c11_noreturn=yes
+ else
+@@ -17541,7 +17544,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17544: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:17547: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -17597,16 +17600,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17600: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17603: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17605: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17608: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17609: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17612: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17645,16 +17648,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17648: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17651: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17653: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17656: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17657: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17660: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17693,23 +17696,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17696: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17699: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17701: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17704: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17705: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17708: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:17712: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:17715: 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.
+@@ -17726,7 +17729,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:17729: result: $enable_warnings" >&5
++echo "$as_me:17732: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -17750,7 +17753,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17753 "configure"
++#line 17756 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17765,26 +17768,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17768: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17771: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17771: \$? = $ac_status" >&5
++  echo "$as_me:17774: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17774: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17777: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17777: \$? = $ac_status" >&5
++  echo "$as_me:17780: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:17780: checking for X11/Xt const-feature" >&5
++echo "$as_me:17783: 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 17787 "configure"
++#line 17790 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -17802,16 +17805,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17805: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17808: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17808: \$? = $ac_status" >&5
++  echo "$as_me:17811: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17811: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17814: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17814: \$? = $ac_status" >&5
++  echo "$as_me:17817: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -17826,7 +17829,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17829: result: $cf_cv_const_x_string" >&5
++echo "$as_me:17832: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -17855,7 +17858,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:17877: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -17887,12 +17890,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17890: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17893: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17893: \$? = $ac_status" >&5
++  echo "$as_me:17896: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17895: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17898: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -17900,7 +17903,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:17903: checking for $CC warning options..." >&5
++	{ echo "$as_me:17906: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -17923,12 +17926,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:17926: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17929: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17929: \$? = $ac_status" >&5
++  echo "$as_me:17932: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17931: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17934: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -17936,7 +17939,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17939: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17942: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17946,7 +17949,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17949: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17952: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17979,10 +17982,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:17982: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:17985: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -18032,12 +18035,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:18035: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18038: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18038: \$? = $ac_status" >&5
++  echo "$as_me:18041: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18040: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:18043: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -18109,12 +18112,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:18112: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:18115: 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 18117 "configure"
++#line 18120 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18131,16 +18134,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18134: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18137: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18137: \$? = $ac_status" >&5
++  echo "$as_me:18140: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18140: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18143: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18143: \$? = $ac_status" >&5
++  echo "$as_me:18146: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -18151,7 +18154,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:18154: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:18157: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -18160,11 +18163,11 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:18163: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:18166: 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 18167 "configure"
++#line 18170 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18181,16 +18184,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18184: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18187: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18187: \$? = $ac_status" >&5
++  echo "$as_me:18190: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18190: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18193: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18193: \$? = $ac_status" >&5
++  echo "$as_me:18196: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_CPLUSPLUS=yes
+ 
+@@ -18200,7 +18203,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:18203: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:18206: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -18209,30 +18212,30 @@
+ if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:18212: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:18215: 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:18219: checking version of $CC" >&5
++	echo "$as_me:18222: 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:18223: result: $CLANG_VERSION" >&5
++	echo "$as_me:18226: 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:18230: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:18233: 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 18235 "configure"
++#line 18238 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -18246,16 +18249,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18249: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18252: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18252: \$? = $ac_status" >&5
++  echo "$as_me:18255: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18255: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18258: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18258: \$? = $ac_status" >&5
++  echo "$as_me:18261: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -18266,13 +18269,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:18269: result: $cf_clang_optok" >&5
++		echo "$as_me:18272: 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}:18275: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:18278: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -18289,7 +18292,7 @@
+ ac_main_return="return"
+ 
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:18313: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -18324,12 +18327,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:18327: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18330: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18330: \$? = $ac_status" >&5
++  echo "$as_me:18333: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18332: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18335: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -18338,7 +18341,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:18341: checking for $CXX warning options..." >&5
++	{ echo "$as_me:18344: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -18368,16 +18371,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:18371: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18374: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18374: \$? = $ac_status" >&5
++  echo "$as_me:18377: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18376: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18379: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:18380: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18383: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -18395,7 +18398,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:18398: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:18401: 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.
+@@ -18405,7 +18408,7 @@
+ else
+   enable_string_hacks=no
+ fi;
+-echo "$as_me:18408: result: $enable_string_hacks" >&5
++echo "$as_me:18411: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+ 
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -18414,15 +18417,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:18417: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:18420: 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:18419: checking for strlcat" >&5
++	echo "$as_me:18422: 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 18425 "configure"
++#line 18428 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18453,16 +18456,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18456: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18459: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18459: \$? = $ac_status" >&5
++  echo "$as_me:18462: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18462: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18465: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18465: \$? = $ac_status" >&5
++  echo "$as_me:18468: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -18472,7 +18475,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18475: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:18478: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+ 
+@@ -18482,7 +18485,7 @@
+ 
+ else
+ 
+-		echo "$as_me:18485: checking for strlcat in -lbsd" >&5
++		echo "$as_me:18488: 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
+@@ -18490,7 +18493,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18493 "configure"
++#line 18496 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18509,16 +18512,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18512: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18515: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18515: \$? = $ac_status" >&5
++  echo "$as_me:18518: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18518: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18521: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18521: \$? = $ac_status" >&5
++  echo "$as_me:18524: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -18529,7 +18532,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18532: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:18535: 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
+ 
+@@ -18552,23 +18555,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18555: checking for $ac_header" >&5
++echo "$as_me:18558: 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 18561 "configure"
++#line 18564 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18565: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18568: \"$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:18571: \$? = $ac_status" >&5
++  echo "$as_me:18574: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18587,7 +18590,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18590: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18593: 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:18614: 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 18617 "configure"
++#line 18620 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18645,16 +18648,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18648: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18651: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18651: \$? = $ac_status" >&5
++  echo "$as_me:18654: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18654: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18657: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18657: \$? = $ac_status" >&5
++  echo "$as_me:18660: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -18664,7 +18667,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18667: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:18670: 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:18683: 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.
+@@ -18687,7 +18690,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:18690: result: $with_assertions" >&5
++echo "$as_me:18693: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -18703,7 +18706,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:18706: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:18709: 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.
+@@ -18725,7 +18728,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:18728: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:18731: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18839,23 +18842,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:18842: checking for dmalloc.h" >&5
++	echo "$as_me:18845: 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 18848 "configure"
++#line 18851 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:18852: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18855: \"$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:18858: \$? = $ac_status" >&5
++  echo "$as_me:18861: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18874,11 +18877,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18877: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:18880: 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:18881: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:18884: 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
+@@ -18886,7 +18889,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18889 "configure"
++#line 18892 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18905,16 +18908,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18908: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18911: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18911: \$? = $ac_status" >&5
++  echo "$as_me:18914: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18914: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18917: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18917: \$? = $ac_status" >&5
++  echo "$as_me:18920: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -18925,7 +18928,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18928: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:18931: 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:18946: 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.
+@@ -18962,7 +18965,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:18965: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:18968: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19076,23 +19079,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:19079: checking for dbmalloc.h" >&5
++	echo "$as_me:19082: 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 19085 "configure"
++#line 19088 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:19089: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:19092: \"$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:19095: \$? = $ac_status" >&5
++  echo "$as_me:19098: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19111,11 +19114,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:19114: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:19117: 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:19118: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:19121: 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
+@@ -19123,7 +19126,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19126 "configure"
++#line 19129 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19142,16 +19145,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19145: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19148: \"$ac_link\"") >&5
+   (eval $ac_link) 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_exeext"'
+-  { (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
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -19162,7 +19165,7 @@
+ 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_dbmalloc_debug_malloc" >&5
++echo "$as_me:19168: 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:19183: 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.
+@@ -19199,7 +19202,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:19202: result: ${with_valgrind:-no}" >&5
++echo "$as_me:19205: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19312,7 +19315,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19315: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:19318: 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.
+@@ -19323,7 +19326,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:19326: result: $with_no_leaks" >&5
++echo "$as_me:19329: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -19375,7 +19378,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19378: checking whether to add trace feature to all models" >&5
++echo "$as_me:19381: 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.
+@@ -19385,7 +19388,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:19388: result: $cf_with_trace" >&5
++echo "$as_me:19391: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -19405,7 +19408,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:19408: checking if we want to use GNAT projects" >&5
++echo "$as_me:19411: 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.
+@@ -19422,7 +19425,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:19425: result: $enable_gnat_projects" >&5
++echo "$as_me:19428: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -19435,14 +19438,14 @@
+ 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+ 	fi
+ 
+-echo "$as_me:19438: checking if ssp library is needed" >&5
++echo "$as_me:19441: 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 19445 "configure"
++#line 19448 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19459,16 +19462,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19462: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19465: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19465: \$? = $ac_status" >&5
++  echo "$as_me:19468: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19468: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19471: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19471: \$? = $ac_status" >&5
++  echo "$as_me:19474: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -19478,7 +19481,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19481 "configure"
++#line 19484 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19495,16 +19498,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19498: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19501: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19501: \$? = $ac_status" >&5
++  echo "$as_me:19504: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19504: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19507: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19507: \$? = $ac_status" >&5
++  echo "$as_me:19510: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -19518,7 +19521,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19521: result: $cf_cv_need_libssp" >&5
++echo "$as_me:19524: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -19547,14 +19550,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19550: checking if -lm needed for math functions" >&5
++echo "$as_me:19553: 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 19557 "configure"
++#line 19560 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19570,16 +19573,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19573: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19576: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19576: \$? = $ac_status" >&5
++  echo "$as_me:19579: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19579: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19582: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19582: \$? = $ac_status" >&5
++  echo "$as_me:19585: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -19589,7 +19592,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19592: result: $cf_cv_need_libm" >&5
++echo "$as_me:19595: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ 
+ if test "$cf_cv_need_libm" = yes
+@@ -19597,14 +19600,14 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lm"
+-	echo "$as_me:19600: checking if -lm is available for math functions" >&5
++	echo "$as_me:19603: checking if -lm is available for math functions" >&5
+ echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
+ if test "${cf_cv_have_libm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19607 "configure"
++#line 19610 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19620,16 +19623,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19623: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19626: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19626: \$? = $ac_status" >&5
++  echo "$as_me:19629: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19629: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19632: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19632: \$? = $ac_status" >&5
++  echo "$as_me:19635: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_libm=yes
+ else
+@@ -19639,7 +19642,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19642: result: $cf_cv_have_libm" >&5
++echo "$as_me:19645: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ 	LIBS="$cf_save_LIBS"
+ 
+@@ -19661,13 +19664,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:19664: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:19667: 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 19670 "configure"
++#line 19673 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -19683,16 +19686,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19686: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19689: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19689: \$? = $ac_status" >&5
++  echo "$as_me:19692: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19692: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19695: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19695: \$? = $ac_status" >&5
++  echo "$as_me:19698: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -19702,7 +19705,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19705: result: $ac_cv_header_time" >&5
++echo "$as_me:19708: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -19717,7 +19720,7 @@
+ case "$host_os" in
+ (mingw*)
+ 	# -lsystre -ltre -lintl -liconv
+-	echo "$as_me:19720: checking for regcomp in -lsystre" >&5
++	echo "$as_me:19723: 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
+@@ -19725,7 +19728,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsystre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19728 "configure"
++#line 19731 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19744,16 +19747,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19747: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19750: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19750: \$? = $ac_status" >&5
++  echo "$as_me:19753: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19753: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19756: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19756: \$? = $ac_status" >&5
++  echo "$as_me:19759: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_systre_regcomp=yes
+ else
+@@ -19764,11 +19767,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19767: result: $ac_cv_lib_systre_regcomp" >&5
++echo "$as_me:19770: 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:19771: checking for libiconv_open in -liconv" >&5
++		echo "$as_me:19774: 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
+@@ -19776,7 +19779,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19779 "configure"
++#line 19782 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19795,16 +19798,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19798: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19801: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19801: \$? = $ac_status" >&5
++  echo "$as_me:19804: \$? = $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:19807: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19807: \$? = $ac_status" >&5
++  echo "$as_me:19810: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_iconv_libiconv_open=yes
+ else
+@@ -19815,7 +19818,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19818: result: $ac_cv_lib_iconv_libiconv_open" >&5
++echo "$as_me:19821: 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
+ 
+@@ -19837,7 +19840,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19840: checking for libintl_gettext in -lintl" >&5
++		echo "$as_me:19843: 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
+@@ -19845,7 +19848,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19848 "configure"
++#line 19851 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19864,16 +19867,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19867: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19870: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19870: \$? = $ac_status" >&5
++  echo "$as_me:19873: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19873: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19876: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19876: \$? = $ac_status" >&5
++  echo "$as_me:19879: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_intl_libintl_gettext=yes
+ else
+@@ -19884,7 +19887,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19887: result: $ac_cv_lib_intl_libintl_gettext" >&5
++echo "$as_me:19890: 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
+ 
+@@ -19906,7 +19909,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19909: checking for tre_regcomp in -ltre" >&5
++		echo "$as_me:19912: 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
+@@ -19914,7 +19917,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19917 "configure"
++#line 19920 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19933,16 +19936,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19936: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19939: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19939: \$? = $ac_status" >&5
++  echo "$as_me:19942: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19942: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19945: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19945: \$? = $ac_status" >&5
++  echo "$as_me:19948: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_tre_tre_regcomp=yes
+ else
+@@ -19953,7 +19956,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19956: result: $ac_cv_lib_tre_tre_regcomp" >&5
++echo "$as_me:19959: 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
+ 
+@@ -19995,7 +19998,7 @@
+ 
+ else
+ 
+-		echo "$as_me:19998: checking for regcomp in -lgnurx" >&5
++		echo "$as_me:20001: 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
+@@ -20003,7 +20006,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgnurx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20006 "configure"
++#line 20009 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20022,16 +20025,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20025: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20028: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20028: \$? = $ac_status" >&5
++  echo "$as_me:20031: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20031: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20034: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20034: \$? = $ac_status" >&5
++  echo "$as_me:20037: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gnurx_regcomp=yes
+ else
+@@ -20042,7 +20045,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20045: result: $ac_cv_lib_gnurx_regcomp" >&5
++echo "$as_me:20048: 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
+ 
+@@ -20070,13 +20073,13 @@
+ 	;;
+ (*)
+ 	cf_regex_libs="regex re"
+-	echo "$as_me:20073: checking for regcomp" >&5
++	echo "$as_me:20076: 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 20079 "configure"
++#line 20082 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20107,16 +20110,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20110: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20113: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20113: \$? = $ac_status" >&5
++  echo "$as_me:20116: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20116: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20119: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20119: \$? = $ac_status" >&5
++  echo "$as_me:20122: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -20126,7 +20129,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20129: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:20132: 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
+@@ -20135,7 +20138,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:20138: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:20141: 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
+@@ -20143,7 +20146,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20146 "configure"
++#line 20149 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20162,16 +20165,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20165: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20168: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20168: \$? = $ac_status" >&5
++  echo "$as_me:20171: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20171: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20174: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20174: \$? = $ac_status" >&5
++  echo "$as_me:20177: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -20182,7 +20185,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20185: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:20188: 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
+ 
+@@ -20214,13 +20217,13 @@
+ esac
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:20217: checking for compile" >&5
++	echo "$as_me:20220: 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 20223 "configure"
++#line 20226 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20251,16 +20254,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20254: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20257: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20257: \$? = $ac_status" >&5
++  echo "$as_me:20260: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20260: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20263: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20263: \$? = $ac_status" >&5
++  echo "$as_me:20266: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -20270,13 +20273,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20273: result: $ac_cv_func_compile" >&5
++echo "$as_me:20276: 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:20279: checking for compile in -lgen" >&5
++		echo "$as_me:20282: 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
+@@ -20284,7 +20287,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20287 "configure"
++#line 20290 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20303,16 +20306,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20306: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20309: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20309: \$? = $ac_status" >&5
++  echo "$as_me:20312: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20312: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20315: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20315: \$? = $ac_status" >&5
++  echo "$as_me:20318: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -20323,7 +20326,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20326: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:20329: 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
+ 
+@@ -20351,11 +20354,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:20354: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:20357: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:20358: checking for regular-expression headers" >&5
++echo "$as_me:20361: 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
+@@ -20367,7 +20370,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20370 "configure"
++#line 20373 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -20384,16 +20387,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20387: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20390: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20390: \$? = $ac_status" >&5
++  echo "$as_me:20393: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20393: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20396: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20396: \$? = $ac_status" >&5
++  echo "$as_me:20399: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20410,7 +20413,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20413 "configure"
++#line 20416 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$cf_regex_hdr>
+@@ -20430,16 +20433,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20433: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20436: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20436: \$? = $ac_status" >&5
++  echo "$as_me:20439: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20439: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20442: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20442: \$? = $ac_status" >&5
++  echo "$as_me:20445: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20455,11 +20458,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:20458: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:20461: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case "$cf_cv_regex_hdrs" in
+-	(no)		{ echo "$as_me:20462: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:20465: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -20497,23 +20500,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20500: checking for $ac_header" >&5
++echo "$as_me:20503: 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 20506 "configure"
++#line 20509 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20510: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20513: \"$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:20516: \$? = $ac_status" >&5
++  echo "$as_me:20519: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20532,7 +20535,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20535: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20538: 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:20551: 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 20554 "configure"
++#line 20557 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20558: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20561: \"$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:20564: \$? = $ac_status" >&5
++  echo "$as_me:20567: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20580,7 +20583,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20583: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20586: 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:20596: 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
+@@ -20600,7 +20603,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20603 "configure"
++#line 20606 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20613,16 +20616,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20616: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20619: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20619: \$? = $ac_status" >&5
++  echo "$as_me:20622: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20622: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20625: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20625: \$? = $ac_status" >&5
++  echo "$as_me:20628: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -20634,7 +20637,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20637: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20640: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -20651,14 +20654,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20654: checking if external environ is declared" >&5
++echo "$as_me:20657: 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 20661 "configure"
++#line 20664 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -20671,16 +20674,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20674: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20677: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20677: \$? = $ac_status" >&5
++  echo "$as_me:20680: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20680: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20683: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20683: \$? = $ac_status" >&5
++  echo "$as_me:20686: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_environ=yes
+ else
+@@ -20691,7 +20694,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20694: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20697: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+ 
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20706,14 +20709,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:20709: checking if external environ exists" >&5
++echo "$as_me:20712: 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 20716 "configure"
++#line 20719 "configure"
+ #include "confdefs.h"
+ 
+ #undef environ
+@@ -20728,16 +20731,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20731: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20734: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20734: \$? = $ac_status" >&5
++  echo "$as_me:20737: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20737: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20740: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20740: \$? = $ac_status" >&5
++  echo "$as_me:20743: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_environ=yes
+ else
+@@ -20748,7 +20751,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20751: result: $cf_cv_have_environ" >&5
++echo "$as_me:20754: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+ 
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20761,13 +20764,13 @@
+ 
+ fi
+ 
+-echo "$as_me:20764: checking for getenv" >&5
++echo "$as_me:20767: 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 20770 "configure"
++#line 20773 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20798,16 +20801,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20801: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20804: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20804: \$? = $ac_status" >&5
++  echo "$as_me:20807: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20807: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20810: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20810: \$? = $ac_status" >&5
++  echo "$as_me:20813: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_getenv=yes
+ else
+@@ -20817,19 +20820,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20820: result: $ac_cv_func_getenv" >&5
++echo "$as_me:20823: 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:20826: checking for $ac_func" >&5
++echo "$as_me:20829: 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 20832 "configure"
++#line 20835 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20860,16 +20863,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20863: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20866: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20866: \$? = $ac_status" >&5
++  echo "$as_me:20869: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20869: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20872: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20872: \$? = $ac_status" >&5
++  echo "$as_me:20875: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -20879,7 +20882,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20882: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:20885: 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:20895: 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
+@@ -20899,7 +20902,7 @@
+   cf_cv_consistent_getenv=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20902 "configure"
++#line 20905 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21004,15 +21007,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21007: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21010: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21010: \$? = $ac_status" >&5
++  echo "$as_me:21013: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21012: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21015: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21015: \$? = $ac_status" >&5
++  echo "$as_me:21018: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_consistent_getenv=yes
+ else
+@@ -21025,7 +21028,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:21028: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:21031: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+ 
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -21040,18 +21043,18 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ 	test "x$cf_with_trace" = xyes
+ then
+-	{ echo "$as_me:21043: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++	{ echo "$as_me:21046: 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:21047: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:21050: 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 21054 "configure"
++#line 21057 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21071,16 +21074,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21074: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21077: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21077: \$? = $ac_status" >&5
++  echo "$as_me:21080: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (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_sys_time_select=yes
+ else
+@@ -21092,7 +21095,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21095: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:21098: 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
+@@ -21107,13 +21110,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:21110: checking for an ANSI C-conforming const" >&5
++echo "$as_me:21113: 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 21116 "configure"
++#line 21119 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21175,16 +21178,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21178: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21181: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21181: \$? = $ac_status" >&5
++  echo "$as_me:21184: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21184: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21187: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21187: \$? = $ac_status" >&5
++  echo "$as_me:21190: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -21194,7 +21197,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21197: result: $ac_cv_c_const" >&5
++echo "$as_me:21200: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -21204,7 +21207,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21207: checking for inline" >&5
++echo "$as_me:21210: 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
+@@ -21212,7 +21215,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21215 "configure"
++#line 21218 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo (void) {return 0; }
+@@ -21221,16 +21224,16 @@
+ 
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21224: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21227: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21227: \$? = $ac_status" >&5
++  echo "$as_me:21230: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21230: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21233: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21233: \$? = $ac_status" >&5
++  echo "$as_me:21236: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -21241,7 +21244,7 @@
+ done
+ 
+ fi
+-echo "$as_me:21244: result: $ac_cv_c_inline" >&5
++echo "$as_me:21247: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -21267,7 +21270,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:21270: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:21273: 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
+@@ -21276,7 +21279,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21279 "configure"
++#line 21282 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -21288,16 +21291,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21291: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21294: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21294: \$? = $ac_status" >&5
++  echo "$as_me:21297: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21297: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21300: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21300: \$? = $ac_status" >&5
++  echo "$as_me:21303: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -21309,7 +21312,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:21312: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:21315: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -21415,7 +21418,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:21418: checking for signal global datatype" >&5
++echo "$as_me:21421: 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
+@@ -21427,7 +21430,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21430 "configure"
++#line 21433 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21451,16 +21454,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21454: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21457: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21457: \$? = $ac_status" >&5
++  echo "$as_me:21460: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21460: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21463: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21463: \$? = $ac_status" >&5
++  echo "$as_me:21466: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21474,7 +21477,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21477: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21480: 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:21489: 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
+@@ -21493,7 +21496,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21496 "configure"
++#line 21499 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21528,15 +21531,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21531: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21534: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21534: \$? = $ac_status" >&5
++  echo "$as_me:21537: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21536: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21539: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21539: \$? = $ac_status" >&5
++  echo "$as_me:21542: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21551,7 +21554,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21554: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21557: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:21569: 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 21573 "configure"
++#line 21576 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21582,16 +21585,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21585: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21588: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21588: \$? = $ac_status" >&5
++  echo "$as_me:21591: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21591: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21594: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21594: \$? = $ac_status" >&5
++  echo "$as_me:21597: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -21603,7 +21606,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21606: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21609: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -21619,14 +21622,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:21622: checking if external errno is declared" >&5
++echo "$as_me:21625: 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 21629 "configure"
++#line 21632 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21640,16 +21643,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21643: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21646: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21646: \$? = $ac_status" >&5
++  echo "$as_me:21649: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21649: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21652: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21652: \$? = $ac_status" >&5
++  echo "$as_me:21655: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -21660,7 +21663,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21663: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21666: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21675,14 +21678,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:21678: checking if external errno exists" >&5
++echo "$as_me:21681: 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 21685 "configure"
++#line 21688 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -21697,16 +21700,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21700: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21703: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21703: \$? = $ac_status" >&5
++  echo "$as_me:21706: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21706: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21709: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21709: \$? = $ac_status" >&5
++  echo "$as_me:21712: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -21717,7 +21720,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21720: result: $cf_cv_have_errno" >&5
++echo "$as_me:21723: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21730,7 +21733,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21733: checking if data-only library module links" >&5
++echo "$as_me:21736: 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
+@@ -21738,20 +21741,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:21747: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21747: \$? = $ac_status" >&5
++  echo "$as_me:21750: \$? = $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:21774: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21774: \$? = $ac_status" >&5
++  echo "$as_me:21777: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -21784,7 +21787,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21787 "configure"
++#line 21790 "configure"
+ #include "confdefs.h"
+ 
+ 	extern int testfunc(void);
+@@ -21795,15 +21798,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21798: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21801: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21801: \$? = $ac_status" >&5
++  echo "$as_me:21804: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21803: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21806: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21806: \$? = $ac_status" >&5
++  echo "$as_me:21809: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -21818,7 +21821,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21821: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21824: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21833,13 +21836,13 @@
+ ###	Checks for library functions.
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:21836: checking for clock_gettime" >&5
++echo "$as_me:21839: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21842 "configure"
++#line 21845 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21870,16 +21873,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21873: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21876: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21876: \$? = $ac_status" >&5
++  echo "$as_me:21879: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21879: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21882: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21882: \$? = $ac_status" >&5
++  echo "$as_me:21885: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -21889,12 +21892,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21892: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:21895: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:21897: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:21900: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21902,7 +21905,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21905 "configure"
++#line 21908 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21921,16 +21924,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21924: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21927: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21927: \$? = $ac_status" >&5
++  echo "$as_me:21930: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21930: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21933: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21933: \$? = $ac_status" >&5
++  echo "$as_me:21936: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -21941,7 +21944,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21944: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:21947: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -21953,14 +21956,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:21956: checking if clock_gettime links" >&5
++echo "$as_me:21959: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21963 "configure"
++#line 21966 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21978,16 +21981,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21981: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21984: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21984: \$? = $ac_status" >&5
++  echo "$as_me:21987: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21987: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21990: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21990: \$? = $ac_status" >&5
++  echo "$as_me:21993: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -21998,7 +22001,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22001: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:22004: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -22012,13 +22015,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:22015: checking for gettimeofday" >&5
++echo "$as_me:22018: 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 22021 "configure"
++#line 22024 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22049,16 +22052,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22052: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22055: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22055: \$? = $ac_status" >&5
++  echo "$as_me:22058: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22058: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22061: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22061: \$? = $ac_status" >&5
++  echo "$as_me:22064: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -22068,7 +22071,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22071: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:22074: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -22078,7 +22081,7 @@
+ 
+ else
+ 
+-echo "$as_me:22081: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:22084: 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
+@@ -22086,7 +22089,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22089 "configure"
++#line 22092 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22105,16 +22108,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22108: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22111: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22111: \$? = $ac_status" >&5
++  echo "$as_me:22114: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22114: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22117: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22117: \$? = $ac_status" >&5
++  echo "$as_me:22120: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -22125,7 +22128,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22128: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:22131: 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
+ 
+@@ -22184,13 +22187,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:22187: checking for $ac_func" >&5
++echo "$as_me:22190: 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 22193 "configure"
++#line 22196 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22221,16 +22224,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22224: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22227: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22227: \$? = $ac_status" >&5
++  echo "$as_me:22230: \$? = $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:22233: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22233: \$? = $ac_status" >&5
++  echo "$as_me:22236: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -22240,7 +22243,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22243: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:22246: 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:22256: 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 22260 "configure"
++#line 22263 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22272,16 +22275,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22275: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22278: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22278: \$? = $ac_status" >&5
++  echo "$as_me:22281: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22281: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22284: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22284: \$? = $ac_status" >&5
++  echo "$as_me:22287: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_PATH_TTYS=yes
+ else
+@@ -22291,7 +22294,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22294: result: $cf_cv_PATH_TTYS" >&5
++echo "$as_me:22297: result: $cf_cv_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
+ 
+ if test $cf_cv_PATH_TTYS = no
+@@ -22313,7 +22316,7 @@
+ 
+ if test $cf_cv_PATH_TTYS != no
+ then
+-	echo "$as_me:22316: checking if _PATH_TTYS file exists" >&5
++	echo "$as_me:22319: 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
+@@ -22323,7 +22326,7 @@
+   cf_cv_have_PATH_TTYS=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22326 "configure"
++#line 22329 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22336,15 +22339,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22339: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22342: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22342: \$? = $ac_status" >&5
++  echo "$as_me:22345: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22344: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22347: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22347: \$? = $ac_status" >&5
++  echo "$as_me:22350: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_PATH_TTYS=yes
+ else
+@@ -22356,7 +22359,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22359: result: $cf_cv_have_PATH_TTYS" >&5
++echo "$as_me:22362: 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
+@@ -22368,14 +22371,14 @@
+ #define HAVE_PATH_TTYS 1
+ EOF
+ 
+-	echo "$as_me:22371: checking for getttynam" >&5
++	echo "$as_me:22374: 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 22378 "configure"
++#line 22381 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22387,16 +22390,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22390: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22393: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22393: \$? = $ac_status" >&5
++  echo "$as_me:22396: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22396: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22399: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22399: \$? = $ac_status" >&5
++  echo "$as_me:22402: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_getttynam=yes
+ else
+@@ -22406,7 +22409,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22409: result: $cf_cv_func_getttynam" >&5
++echo "$as_me:22412: 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
+@@ -22416,7 +22419,7 @@
+ 
+ if test "x$ac_cv_func_getopt" = xno && \
+    test "x$cf_with_progs$cf_with_tests" != xnono; then
+-	{ { echo "$as_me:22419: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:22422: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -22425,7 +22428,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:22428: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:22431: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -22438,14 +22441,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:22441: checking for terminal-capability database functions" >&5
++echo "$as_me:22444: 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 22448 "configure"
++#line 22451 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22465,16 +22468,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22468: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22471: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22471: \$? = $ac_status" >&5
++  echo "$as_me:22474: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22474: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22477: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22477: \$? = $ac_status" >&5
++  echo "$as_me:22480: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -22485,7 +22488,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22488: result: $cf_cv_cgetent" >&5
++echo "$as_me:22491: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -22495,14 +22498,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:22498: checking if cgetent uses const parameter" >&5
++echo "$as_me:22501: 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 22505 "configure"
++#line 22508 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -22525,16 +22528,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22528: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22531: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22531: \$? = $ac_status" >&5
++  echo "$as_me:22534: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22534: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22537: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22537: \$? = $ac_status" >&5
++  echo "$as_me:22540: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -22545,7 +22548,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22548: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:22551: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -22559,14 +22562,14 @@
+ 
+ fi
+ 
+-echo "$as_me:22562: checking for isascii" >&5
++echo "$as_me:22565: 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 22569 "configure"
++#line 22572 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22578,16 +22581,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22581: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22584: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22584: \$? = $ac_status" >&5
++  echo "$as_me:22587: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22587: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22590: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22590: \$? = $ac_status" >&5
++  echo "$as_me:22593: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -22598,7 +22601,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22601: result: $cf_cv_have_isascii" >&5
++echo "$as_me:22604: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -22606,10 +22609,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:22609: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:22612: 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 22612 "configure"
++#line 22615 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22623,16 +22626,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22626: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22629: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22629: \$? = $ac_status" >&5
++  echo "$as_me:22632: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22632: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22635: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22635: \$? = $ac_status" >&5
++  echo "$as_me:22638: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=no
+ else
+@@ -22640,7 +22643,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22643 "configure"
++#line 22646 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22655,16 +22658,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22658: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22661: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22661: \$? = $ac_status" >&5
++  echo "$as_me:22664: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22664: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22667: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22667: \$? = $ac_status" >&5
++  echo "$as_me:22670: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=yes
+ 
+@@ -22680,11 +22683,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:22683: result: $sigact_bad" >&5
++echo "$as_me:22686: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:22687: checking if nanosleep really works" >&5
++echo "$as_me:22690: 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
+@@ -22694,7 +22697,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22697 "configure"
++#line 22700 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22720,15 +22723,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22723: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22726: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22726: \$? = $ac_status" >&5
++  echo "$as_me:22729: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22728: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22731: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22731: \$? = $ac_status" >&5
++  echo "$as_me:22734: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -22740,7 +22743,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22743: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:22746: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -22757,23 +22760,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22760: checking for $ac_header" >&5
++echo "$as_me:22763: 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 22766 "configure"
++#line 22769 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22770: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22773: \"$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:22776: \$? = $ac_status" >&5
++  echo "$as_me:22779: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22792,7 +22795,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22795: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22798: 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:22815: 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 22815 "configure"
++#line 22818 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22824,16 +22827,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22827: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22830: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22830: \$? = $ac_status" >&5
++  echo "$as_me:22833: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22833: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22836: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22836: \$? = $ac_status" >&5
++  echo "$as_me:22839: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=no
+ else
+@@ -22841,7 +22844,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22844 "configure"
++#line 22847 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22855,16 +22858,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22858: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22861: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22861: \$? = $ac_status" >&5
++  echo "$as_me:22864: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22864: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22867: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22867: \$? = $ac_status" >&5
++  echo "$as_me:22870: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=unknown
+ else
+@@ -22880,19 +22883,19 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:22883: result: $termios_bad" >&5
++	echo "$as_me:22886: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:22888: checking for tcgetattr" >&5
++echo "$as_me:22891: 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 22895 "configure"
++#line 22898 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22920,16 +22923,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22923: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22926: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22926: \$? = $ac_status" >&5
++  echo "$as_me:22929: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22929: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22932: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22932: \$? = $ac_status" >&5
++  echo "$as_me:22935: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -22939,21 +22942,21 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22942: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:22945: 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:22949: checking for vsscanf function or workaround" >&5
++echo "$as_me:22952: 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 22956 "configure"
++#line 22959 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22979,16 +22982,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22982: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22985: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22985: \$? = $ac_status" >&5
++  echo "$as_me:22988: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22988: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22991: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22991: \$? = $ac_status" >&5
++  echo "$as_me:22994: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -22996,7 +22999,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22999 "configure"
++#line 23002 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23018,16 +23021,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23021: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23024: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23024: \$? = $ac_status" >&5
++  echo "$as_me:23027: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23027: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23030: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23030: \$? = $ac_status" >&5
++  echo "$as_me:23033: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -23035,7 +23038,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23038 "configure"
++#line 23041 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23057,16 +23060,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23060: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23063: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23063: \$? = $ac_status" >&5
++  echo "$as_me:23066: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23066: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23069: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23069: \$? = $ac_status" >&5
++  echo "$as_me:23072: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -23081,7 +23084,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23084: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:23087: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case "$cf_cv_func_vsscanf" in
+@@ -23107,23 +23110,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:23110: checking for $ac_header" >&5
++echo "$as_me:23113: 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 23116 "configure"
++#line 23119 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23120: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23123: \"$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:23126: \$? = $ac_status" >&5
++  echo "$as_me:23129: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23142,7 +23145,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23145: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23148: 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:23158: 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
+@@ -23163,7 +23166,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23166 "configure"
++#line 23169 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23198,15 +23201,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23201: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23204: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23204: \$? = $ac_status" >&5
++  echo "$as_me:23207: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23206: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23209: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23209: \$? = $ac_status" >&5
++  echo "$as_me:23212: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -23221,16 +23224,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:23224: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:23227: 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:23227: checking for mkstemp" >&5
++	echo "$as_me:23230: 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 23233 "configure"
++#line 23236 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23261,16 +23264,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23264: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23267: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23267: \$? = $ac_status" >&5
++  echo "$as_me:23270: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23270: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23273: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23273: \$? = $ac_status" >&5
++  echo "$as_me:23276: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -23280,7 +23283,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23283: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:23286: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -23301,21 +23304,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:23304: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:23307: 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:23307: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:23310: 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:23313: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:23316: 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 23318 "configure"
++#line 23321 "configure"
+ #include "confdefs.h"
+ #include 
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -23332,15 +23335,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23335: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23338: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23338: \$? = $ac_status" >&5
++  echo "$as_me:23341: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23340: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23343: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23343: \$? = $ac_status" >&5
++  echo "$as_me:23346: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -23353,7 +23356,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:23356: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:23359: 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
+ 
+@@ -23364,13 +23367,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:23367: checking for intptr_t" >&5
++echo "$as_me:23370: 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 23373 "configure"
++#line 23376 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23385,16 +23388,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23388: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23391: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23391: \$? = $ac_status" >&5
++  echo "$as_me:23394: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23394: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23397: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23397: \$? = $ac_status" >&5
++  echo "$as_me:23400: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -23404,7 +23407,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23407: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:23410: 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
+   :
+@@ -23416,13 +23419,13 @@
+ 
+ fi
+ 
+-echo "$as_me:23419: checking for ssize_t" >&5
++echo "$as_me:23422: 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 23425 "configure"
++#line 23428 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23437,16 +23440,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23440: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23443: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23443: \$? = $ac_status" >&5
++  echo "$as_me:23446: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23446: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23449: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23449: \$? = $ac_status" >&5
++  echo "$as_me:23452: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -23456,7 +23459,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23459: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:23462: 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
+   :
+@@ -23468,14 +23471,14 @@
+ 
+ fi
+ 
+-echo "$as_me:23471: checking for type sigaction_t" >&5
++echo "$as_me:23474: 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 23478 "configure"
++#line 23481 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23488,16 +23491,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23491: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23494: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23494: \$? = $ac_status" >&5
++  echo "$as_me:23497: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23497: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23500: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23500: \$? = $ac_status" >&5
++  echo "$as_me:23503: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -23508,14 +23511,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:23511: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:23514: 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:23518: checking declaration of size-change" >&5
++echo "$as_me:23521: 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
+@@ -23536,7 +23539,7 @@
+ 
+ 	fi
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23539 "configure"
++#line 23542 "configure"
+ #include "confdefs.h"
+ #include 
+ #ifdef HAVE_TERMIOS_H
+@@ -23586,16 +23589,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23589: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23592: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23592: \$? = $ac_status" >&5
++  echo "$as_me:23595: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23595: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23598: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23598: \$? = $ac_status" >&5
++  echo "$as_me:23601: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -23614,7 +23617,7 @@
+ done
+ 
+ fi
+-echo "$as_me:23617: result: $cf_cv_sizechange" >&5
++echo "$as_me:23620: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -23632,13 +23635,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:23635: checking for memmove" >&5
++echo "$as_me:23638: 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 23641 "configure"
++#line 23644 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23669,16 +23672,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23672: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23675: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23675: \$? = $ac_status" >&5
++  echo "$as_me:23678: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23678: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23681: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23681: \$? = $ac_status" >&5
++  echo "$as_me:23684: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -23688,19 +23691,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23691: result: $ac_cv_func_memmove" >&5
++echo "$as_me:23694: 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:23697: checking for bcopy" >&5
++echo "$as_me:23700: 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 23703 "configure"
++#line 23706 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23731,16 +23734,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23734: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23737: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23737: \$? = $ac_status" >&5
++  echo "$as_me:23740: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23740: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23743: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23743: \$? = $ac_status" >&5
++  echo "$as_me:23746: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -23750,11 +23753,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23753: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:23756: 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:23757: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:23760: 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
+@@ -23764,7 +23767,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23767 "configure"
++#line 23770 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23780,15 +23783,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23783: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23786: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23786: \$? = $ac_status" >&5
++  echo "$as_me:23789: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23788: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23791: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23791: \$? = $ac_status" >&5
++  echo "$as_me:23794: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -23801,7 +23804,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:23804: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:23807: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -23828,13 +23831,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23831: checking for $ac_func" >&5
++echo "$as_me:23834: 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 23837 "configure"
++#line 23840 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23865,16 +23868,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23868: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23871: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23871: \$? = $ac_status" >&5
++  echo "$as_me:23874: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23874: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23877: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23877: \$? = $ac_status" >&5
++  echo "$as_me:23880: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23884,7 +23887,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23887: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23890: 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:23900: 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
+@@ -23904,7 +23907,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23907 "configure"
++#line 23910 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23957,15 +23960,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23960: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23963: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23963: \$? = $ac_status" >&5
++  echo "$as_me:23966: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23965: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23968: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23968: \$? = $ac_status" >&5
++  echo "$as_me:23971: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -23977,21 +23980,21 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23980: result: $cf_cv_working_poll" >&5
++echo "$as_me:23983: 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:23987: checking if MB_LEN_MAX is usable" >&5
++echo "$as_me:23990: checking if MB_LEN_MAX is usable" >&5
+ echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
+ if test "${cf_cv_mb_len_max+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23994 "configure"
++#line 23997 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24011,16 +24014,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24014: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24017: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24017: \$? = $ac_status" >&5
++  echo "$as_me:24020: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24023: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24023: \$? = $ac_status" >&5
++  echo "$as_me:24026: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mb_len_max=yes
+ else
+@@ -24030,7 +24033,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24033: result: $cf_cv_mb_len_max" >&5
++echo "$as_me:24036: result: $cf_cv_mb_len_max" >&5
+ echo "${ECHO_T}$cf_cv_mb_len_max" >&6
+ if test "$cf_cv_mb_len_max" = yes
+ then
+@@ -24040,18 +24043,18 @@
+ EOF
+ 
+ else
+-	{ echo "$as_me:24043: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
++	{ echo "$as_me:24046: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+ echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
+ fi
+ 
+-echo "$as_me:24047: checking for va_copy" >&5
++echo "$as_me:24050: 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 24054 "configure"
++#line 24057 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24068,16 +24071,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24071: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24074: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24074: \$? = $ac_status" >&5
++  echo "$as_me:24077: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24077: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24080: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24080: \$? = $ac_status" >&5
++  echo "$as_me:24083: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -24087,7 +24090,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24090: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:24093: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -24099,14 +24102,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:24102: checking for __va_copy" >&5
++echo "$as_me:24105: 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 24109 "configure"
++#line 24112 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24123,16 +24126,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24126: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24129: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24129: \$? = $ac_status" >&5
++  echo "$as_me:24132: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24132: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24135: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24135: \$? = $ac_status" >&5
++  echo "$as_me:24138: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -24142,7 +24145,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24145: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:24148: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -24154,14 +24157,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:24157: checking for __builtin_va_copy" >&5
++echo "$as_me:24160: 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 24164 "configure"
++#line 24167 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24178,16 +24181,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24181: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24184: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24184: \$? = $ac_status" >&5
++  echo "$as_me:24187: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24187: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24190: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24190: \$? = $ac_status" >&5
++  echo "$as_me:24193: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -24197,7 +24200,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24200: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:24203: 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 &&
+@@ -24215,14 +24218,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:24218: checking if we can simply copy va_list" >&5
++	echo "$as_me:24221: 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 24225 "configure"
++#line 24228 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24239,16 +24242,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24242: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24245: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24245: \$? = $ac_status" >&5
++  echo "$as_me:24248: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24248: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24251: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24251: \$? = $ac_status" >&5
++  echo "$as_me:24254: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -24258,19 +24261,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24261: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:24264: 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:24266: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:24269: 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 24273 "configure"
++#line 24276 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24287,16 +24290,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24290: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24293: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24293: \$? = $ac_status" >&5
++  echo "$as_me:24296: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24296: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24299: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24299: \$? = $ac_status" >&5
++  echo "$as_me:24302: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -24306,7 +24309,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24309: result: $cf_cv_array_va_list" >&5
++echo "$as_me:24312: 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
+@@ -24317,13 +24320,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:24320: checking for pid_t" >&5
++echo "$as_me:24323: 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 24326 "configure"
++#line 24329 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24338,16 +24341,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24341: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24344: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24344: \$? = $ac_status" >&5
++  echo "$as_me:24347: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24347: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24350: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24350: \$? = $ac_status" >&5
++  echo "$as_me:24353: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -24357,7 +24360,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24360: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:24363: 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
+   :
+@@ -24372,23 +24375,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:24375: checking for $ac_header" >&5
++echo "$as_me:24378: 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 24381 "configure"
++#line 24384 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:24385: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:24388: \"$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:24391: \$? = $ac_status" >&5
++  echo "$as_me:24394: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -24407,7 +24410,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24410: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:24413: 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:24426: 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 24429 "configure"
++#line 24432 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -24457,16 +24460,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24460: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24463: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24463: \$? = $ac_status" >&5
++  echo "$as_me:24466: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24466: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24469: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24469: \$? = $ac_status" >&5
++  echo "$as_me:24472: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -24476,7 +24479,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24479: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:24482: 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:24494: 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
+@@ -24511,15 +24514,15 @@
+       }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24514: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24517: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24517: \$? = $ac_status" >&5
++  echo "$as_me:24520: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24519: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24522: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24522: \$? = $ac_status" >&5
++  echo "$as_me:24525: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -24531,7 +24534,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24534: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:24537: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -24545,12 +24548,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:24548: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24551: 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:24553: checking for working vfork" >&5
++  echo "$as_me:24556: 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
+@@ -24559,7 +24562,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24562 "configure"
++#line 24565 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include 
+@@ -24652,15 +24655,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24655: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24658: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24658: \$? = $ac_status" >&5
++  echo "$as_me:24661: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24660: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24663: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24663: \$? = $ac_status" >&5
++  echo "$as_me:24666: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -24672,13 +24675,13 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24675: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:24678: 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:24681: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24684: 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
+ 
+@@ -24703,7 +24706,7 @@
+ 
+ fi
+ 
+-echo "$as_me:24706: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:24709: 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
+@@ -24713,7 +24716,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24716 "configure"
++#line 24719 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24748,15 +24751,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24751: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24754: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24754: \$? = $ac_status" >&5
++  echo "$as_me:24757: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24756: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24759: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24759: \$? = $ac_status" >&5
++  echo "$as_me:24762: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fopen_bin_r=yes
+ else
+@@ -24769,7 +24772,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:24772: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:24775: 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
+@@ -24778,7 +24781,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:24781: checking for openpty in -lutil" >&5
++echo "$as_me:24784: 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
+@@ -24786,7 +24789,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24789 "configure"
++#line 24792 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -24805,16 +24808,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24808: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24811: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24811: \$? = $ac_status" >&5
++  echo "$as_me:24814: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24814: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24817: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24817: \$? = $ac_status" >&5
++  echo "$as_me:24820: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -24825,7 +24828,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:24828: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:24831: 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
+@@ -24833,7 +24836,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:24836: checking for openpty header" >&5
++echo "$as_me:24839: 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
+@@ -24860,7 +24863,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24863 "configure"
++#line 24866 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -24878,16 +24881,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24881: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24884: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24884: \$? = $ac_status" >&5
++  echo "$as_me:24887: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24887: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24890: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24890: \$? = $ac_status" >&5
++  echo "$as_me:24893: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -24905,7 +24908,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:24908: result: $cf_cv_func_openpty" >&5
++echo "$as_me:24911: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -24978,7 +24981,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24981 "configure"
++#line 24984 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -24990,16 +24993,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24993: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24996: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24996: \$? = $ac_status" >&5
++  echo "$as_me:24999: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24999: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25002: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25002: \$? = $ac_status" >&5
++  echo "$as_me:25005: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25016,7 +25019,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}:25019: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25022: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25052,7 +25055,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}:25055: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25058: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25063,7 +25066,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:25066: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:25069: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -25135,7 +25138,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25138 "configure"
++#line 25141 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -25147,16 +25150,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25150: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25153: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25153: \$? = $ac_status" >&5
++  echo "$as_me:25156: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25156: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25159: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25159: \$? = $ac_status" >&5
++  echo "$as_me:25162: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25173,7 +25176,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}:25176: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25179: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25253,7 +25256,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}:25256: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25259: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25270,23 +25273,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:25273: checking for db.h" >&5
++echo "$as_me:25276: 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 25279 "configure"
++#line 25282 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:25283: \"$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:25289: \$? = $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_c_preproc_warn_flag
+@@ -25305,11 +25308,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25308: result: $ac_cv_header_db_h" >&5
++echo "$as_me:25311: 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:25312: checking for version of db" >&5
++echo "$as_me:25315: 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
+@@ -25320,10 +25323,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:25323: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:25326: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25326 "configure"
++#line 25329 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25353,16 +25356,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25356: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25359: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25359: \$? = $ac_status" >&5
++  echo "$as_me:25362: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25362: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25365: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25365: \$? = $ac_status" >&5
++  echo "$as_me:25368: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -25376,16 +25379,16 @@
+ done
+ 
+ fi
+-echo "$as_me:25379: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:25382: 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:25383: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:25386: 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:25388: checking for db libraries" >&5
++echo "$as_me:25391: 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
+@@ -25415,10 +25418,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:25418: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:25421: testing checking for library $cf_db_libs ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25421 "configure"
++#line 25424 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25473,16 +25476,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25476: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25479: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25479: \$? = $ac_status" >&5
++  echo "$as_me:25482: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25482: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25485: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25485: \$? = $ac_status" >&5
++  echo "$as_me:25488: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -25502,11 +25505,11 @@
+ done
+ 
+ fi
+-echo "$as_me:25505: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:25508: 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:25509: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:25512: 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
+@@ -25532,7 +25535,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:25535: error: Cannot find db.h" >&5
++	{ { echo "$as_me:25538: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -25547,7 +25550,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:25550: 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
+@@ -25555,7 +25558,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25558 "configure"
++#line 25561 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -25567,23 +25570,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25570: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25573: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25573: \$? = $ac_status" >&5
++  echo "$as_me:25576: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25576: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25579: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25579: \$? = $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 25586 "configure"
++#line 25589 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -25599,16 +25602,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25602: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25605: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25605: \$? = $ac_status" >&5
++  echo "$as_me:25608: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25608: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25611: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25611: \$? = $ac_status" >&5
++  echo "$as_me:25614: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -25622,13 +25625,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:25625: result: yes" >&5
++then	echo "$as_me:25628: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25627: result: no" >&5
++else	echo "$as_me:25630: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:25631: 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_cc_bool_type+set}" = set; then
+@@ -25636,7 +25639,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25639 "configure"
++#line 25642 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25651,16 +25654,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25654: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25657: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25657: \$? = $ac_status" >&5
++  echo "$as_me:25660: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25660: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25663: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25663: \$? = $ac_status" >&5
++  echo "$as_me:25666: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -25673,9 +25676,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:25676: result: yes" >&5
++then	echo "$as_me:25679: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25678: result: no" >&5
++else	echo "$as_me:25681: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -25692,10 +25695,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:25695: checking if we already have C++ library" >&5
++	echo "$as_me:25698: 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 25698 "configure"
++#line 25701 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -25709,16 +25712,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25712: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25715: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25715: \$? = $ac_status" >&5
++  echo "$as_me:25718: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25718: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25721: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25721: \$? = $ac_status" >&5
++  echo "$as_me:25724: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -25727,7 +25730,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-	echo "$as_me:25730: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:25733: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -25746,7 +25749,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:25749: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:25752: 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
+@@ -25772,7 +25775,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25775 "configure"
++#line 25778 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -25786,16 +25789,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25789: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25792: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25792: \$? = $ac_status" >&5
++  echo "$as_me:25795: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25795: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25798: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25798: \$? = $ac_status" >&5
++  echo "$as_me:25801: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -25807,7 +25810,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:25810: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:25813: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -25829,7 +25832,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:25832: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:25835: 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
+@@ -25844,15 +25847,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:25847: \"$ac_try\"") >&5
++if { (eval echo "$as_me:25850: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25850: \$? = $ac_status" >&5
++  echo "$as_me:25853: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25852: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:25855: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25855: \$? = $ac_status" >&5
++  echo "$as_me:25858: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -25863,10 +25866,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+-  echo "$as_me:25866: result: yes" >&5
++  echo "$as_me:25869: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:25869: result: no" >&5
++  echo "$as_me:25872: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -25886,7 +25889,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:25889: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:25892: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -25907,7 +25910,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25910 "configure"
++#line 25913 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -25921,16 +25924,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25924: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25927: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25927: \$? = $ac_status" >&5
++  echo "$as_me:25930: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25930: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25933: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25933: \$? = $ac_status" >&5
++  echo "$as_me:25936: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -25967,7 +25970,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25970 "configure"
++#line 25973 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25981,16 +25984,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25984: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25987: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25987: \$? = $ac_status" >&5
++  echo "$as_me:25990: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25990: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25993: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25993: \$? = $ac_status" >&5
++  echo "$as_me:25996: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -26023,7 +26026,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	LIBS="$cf_save"
+-	echo "$as_me:26026: result: $cf_cxx_library" >&5
++	echo "$as_me:26029: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -26039,7 +26042,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:26042: checking how to run the C++ preprocessor" >&5
++echo "$as_me:26045: 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
+@@ -26056,18 +26059,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 26059 "configure"
++#line 26062 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26064: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26067: \"$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:26070: \$? = $ac_status" >&5
++  echo "$as_me:26073: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26090,17 +26093,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26093 "configure"
++#line 26096 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26097: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26100: \"$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:26103: \$? = $ac_status" >&5
++  echo "$as_me:26106: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26137,7 +26140,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:26140: result: $CXXCPP" >&5
++echo "$as_me:26143: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -26147,18 +26150,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 26150 "configure"
++#line 26153 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26155: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26158: \"$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:26161: \$? = $ac_status" >&5
++  echo "$as_me:26164: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26181,17 +26184,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26184 "configure"
++#line 26187 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26188: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26191: \"$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:26194: \$? = $ac_status" >&5
++  echo "$as_me:26197: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26219,7 +26222,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:26222: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:26225: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -26234,23 +26237,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:26237: checking for $ac_header" >&5
++echo "$as_me:26240: 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 26243 "configure"
++#line 26246 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26247: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26250: \"$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:26253: \$? = $ac_status" >&5
++  echo "$as_me:26256: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26269,7 +26272,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26272: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26275: 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:26288: 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 26291 "configure"
++#line 26294 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26295: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26298: \"$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:26301: \$? = $ac_status" >&5
++  echo "$as_me:26304: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26317,7 +26320,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26320: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26323: 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:26334: 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 26334 "configure"
++#line 26337 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26348,16 +26351,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26351: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26354: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26354: \$? = $ac_status" >&5
++  echo "$as_me:26357: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26357: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26360: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26360: \$? = $ac_status" >&5
++  echo "$as_me:26363: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -26366,7 +26369,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:26369: result: $cf_iostream_namespace" >&5
++	echo "$as_me:26372: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -26377,7 +26380,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:26380: checking if we should include stdbool.h" >&5
++echo "$as_me:26383: 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
+@@ -26385,7 +26388,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26388 "configure"
++#line 26391 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -26397,23 +26400,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26400: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26403: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26403: \$? = $ac_status" >&5
++  echo "$as_me:26406: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26406: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26409: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26409: \$? = $ac_status" >&5
++  echo "$as_me:26412: \$? = $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 26416 "configure"
++#line 26419 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -26429,16 +26432,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26432: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26435: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26435: \$? = $ac_status" >&5
++  echo "$as_me:26438: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26438: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26441: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26441: \$? = $ac_status" >&5
++  echo "$as_me:26444: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -26452,13 +26455,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:26455: result: yes" >&5
++then	echo "$as_me:26458: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:26457: result: no" >&5
++else	echo "$as_me:26460: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:26461: checking for builtin bool type" >&5
++echo "$as_me:26464: 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
+@@ -26466,7 +26469,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26469 "configure"
++#line 26472 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26481,16 +26484,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26484: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26487: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26487: \$? = $ac_status" >&5
++  echo "$as_me:26490: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26490: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26493: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26493: \$? = $ac_status" >&5
++  echo "$as_me:26496: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -26503,19 +26506,19 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:26506: result: yes" >&5
++then	echo "$as_me:26509: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:26508: result: no" >&5
++else	echo "$as_me:26511: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:26512: checking for bool" >&5
++echo "$as_me:26515: 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 26518 "configure"
++#line 26521 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26550,16 +26553,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26553: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26556: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26556: \$? = $ac_status" >&5
++  echo "$as_me:26559: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26559: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26562: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26562: \$? = $ac_status" >&5
++  echo "$as_me:26565: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -26569,10 +26572,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26572: result: $ac_cv_type_bool" >&5
++echo "$as_me:26575: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:26575: checking size of bool" >&5
++echo "$as_me:26578: 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
+@@ -26581,7 +26584,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26584 "configure"
++#line 26587 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26613,21 +26616,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26616: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26619: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26619: \$? = $ac_status" >&5
++  echo "$as_me:26622: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26622: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26625: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26625: \$? = $ac_status" >&5
++  echo "$as_me:26628: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26630 "configure"
++#line 26633 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26659,16 +26662,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26662: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26665: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26665: \$? = $ac_status" >&5
++  echo "$as_me:26668: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26668: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26671: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26671: \$? = $ac_status" >&5
++  echo "$as_me:26674: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -26684,7 +26687,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26687 "configure"
++#line 26690 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26716,16 +26719,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26719: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26722: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26722: \$? = $ac_status" >&5
++  echo "$as_me:26725: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26725: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26728: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26728: \$? = $ac_status" >&5
++  echo "$as_me:26731: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -26741,7 +26744,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 26744 "configure"
++#line 26747 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26773,16 +26776,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26776: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26779: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26779: \$? = $ac_status" >&5
++  echo "$as_me:26782: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26782: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26785: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26785: \$? = $ac_status" >&5
++  echo "$as_me:26788: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -26795,12 +26798,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:26798: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:26801: 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 26803 "configure"
++#line 26806 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26836,15 +26839,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26839: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26842: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26842: \$? = $ac_status" >&5
++  echo "$as_me:26845: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26844: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26847: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26847: \$? = $ac_status" >&5
++  echo "$as_me:26850: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -26860,13 +26863,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:26863: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:26866: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:26872: 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
+@@ -26885,7 +26888,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26888 "configure"
++#line 26891 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26926,15 +26929,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26929: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26932: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26932: \$? = $ac_status" >&5
++  echo "$as_me:26935: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26934: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26937: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26937: \$? = $ac_status" >&5
++  echo "$as_me:26940: \$? = $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
+@@ -26951,19 +26954,19 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:26954: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:26957: 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:26961: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:26964: 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:26966: checking for special defines needed for etip.h" >&5
++echo "$as_me:26969: 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"
+@@ -26981,7 +26984,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 26984 "configure"
++#line 26987 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26995,16 +26998,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26998: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27001: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27001: \$? = $ac_status" >&5
++  echo "$as_me:27004: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27004: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27007: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27007: \$? = $ac_status" >&5
++  echo "$as_me:27010: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:27031: result: ${cf_result:-(none)}" >&5
+ echo "${ECHO_T}${cf_result:-(none)}" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27033: checking if $CXX accepts override keyword" >&5
++echo "$as_me:27036: checking if $CXX accepts override keyword" >&5
+ echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
+ if test "${cf_cv_cpp_override+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27047,7 +27050,7 @@
+   cf_cv_cpp_override=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27050 "configure"
++#line 27053 "configure"
+ #include "confdefs.h"
+ 
+ class base
+@@ -27066,15 +27069,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27069: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27072: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27072: \$? = $ac_status" >&5
++  echo "$as_me:27075: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27074: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27077: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27077: \$? = $ac_status" >&5
++  echo "$as_me:27080: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_override=yes
+ else
+@@ -27093,7 +27096,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27096: result: $cf_cv_cpp_override" >&5
++echo "$as_me:27099: result: $cf_cv_cpp_override" >&5
+ echo "${ECHO_T}$cf_cv_cpp_override" >&6
+ fi
+ test "$cf_cv_cpp_override" = yes &&
+@@ -27102,7 +27105,7 @@
+ EOF
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27105: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:27108: 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
+@@ -27119,7 +27122,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27122 "configure"
++#line 27125 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -27138,15 +27141,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27141: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27144: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27144: \$? = $ac_status" >&5
++  echo "$as_me:27147: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27146: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27149: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27149: \$? = $ac_status" >&5
++  echo "$as_me:27152: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -27165,7 +27168,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27168: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:27171: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -27175,7 +27178,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:27178: checking if $CXX accepts static_cast" >&5
++echo "$as_me:27181: 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
+@@ -27189,7 +27192,7 @@
+ ac_main_return="return"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27192 "configure"
++#line 27195 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -27233,16 +27236,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27236: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27239: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27239: \$? = $ac_status" >&5
++  echo "$as_me:27242: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27242: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27245: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27245: \$? = $ac_status" >&5
++  echo "$as_me:27248: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -27260,7 +27263,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27263: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:27266: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -27309,13 +27312,13 @@
+ 	else
+ 		if test "$cf_cv_header_stdbool_h" = 1 ; then
+ 
+-echo "$as_me:27312: checking for bool" >&5
++echo "$as_me:27315: 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 27318 "configure"
++#line 27321 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27350,16 +27353,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27353: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27356: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27356: \$? = $ac_status" >&5
++  echo "$as_me:27359: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27359: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27362: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27362: \$? = $ac_status" >&5
++  echo "$as_me:27365: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -27369,10 +27372,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27372: result: $ac_cv_type_bool" >&5
++echo "$as_me:27375: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:27375: checking size of bool" >&5
++echo "$as_me:27378: 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
+@@ -27381,7 +27384,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27384 "configure"
++#line 27387 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27413,21 +27416,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27416: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27419: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27419: \$? = $ac_status" >&5
++  echo "$as_me:27422: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27422: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27425: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27425: \$? = $ac_status" >&5
++  echo "$as_me:27428: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27430 "configure"
++#line 27433 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27459,16 +27462,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27462: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27465: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27465: \$? = $ac_status" >&5
++  echo "$as_me:27468: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27468: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27471: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27471: \$? = $ac_status" >&5
++  echo "$as_me:27474: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -27484,7 +27487,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27487 "configure"
++#line 27490 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27516,16 +27519,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27519: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27522: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27522: \$? = $ac_status" >&5
++  echo "$as_me:27525: \$? = $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:27528: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27528: \$? = $ac_status" >&5
++  echo "$as_me:27531: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27541,7 +27544,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 27547 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27573,16 +27576,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27576: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27579: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27579: \$? = $ac_status" >&5
++  echo "$as_me:27582: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (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_hi=$ac_mid
+ else
+@@ -27595,12 +27598,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27598: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27601: 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 27603 "configure"
++#line 27606 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27636,15 +27639,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27639: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27642: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27642: \$? = $ac_status" >&5
++  echo "$as_me:27645: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27644: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27647: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27647: \$? = $ac_status" >&5
++  echo "$as_me:27650: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27660,13 +27663,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27663: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27666: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27672: 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
+@@ -27685,7 +27688,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27688 "configure"
++#line 27691 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27726,15 +27729,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27729: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27732: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27732: \$? = $ac_status" >&5
++  echo "$as_me:27735: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27734: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27737: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27737: \$? = $ac_status" >&5
++  echo "$as_me:27740: \$? = $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
+@@ -27751,26 +27754,26 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:27754: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:27757: 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:27761: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:27764: 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:27767: checking for fallback type of bool" >&5
++			echo "$as_me:27770: 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:27773: result: $cf_cv_type_of_bool" >&5
++			echo "$as_me:27776: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 		fi
+ 	fi
+@@ -27799,7 +27802,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:27802: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:27805: 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
+@@ -27810,7 +27813,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:27813: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:27816: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -27827,10 +27830,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:27830: result: $ADAFLAGS" >&5
++	echo "$as_me:27833: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:27833: checking if GNATPREP supports -T option" >&5
++echo "$as_me:27836: 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
+@@ -27840,11 +27843,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:27843: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:27846: 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:27847: checking if GNAT supports generics" >&5
++echo "$as_me:27850: 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])
+@@ -27854,7 +27857,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:27857: result: $cf_gnat_generics" >&5
++echo "$as_me:27860: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -27866,7 +27869,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:27869: checking if GNAT supports SIGINT" >&5
++echo "$as_me:27872: 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
+@@ -27914,7 +27917,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:27917: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:27920: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -27927,7 +27930,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:27930: checking if GNAT supports project files" >&5
++echo "$as_me:27933: 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]*)
+@@ -27990,15 +27993,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:27993: result: $cf_gnat_projects" >&5
++echo "$as_me:27996: 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:27999: checking if GNAT supports libraries" >&5
++	echo "$as_me:28002: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:28001: result: $cf_gnat_libraries" >&5
++	echo "$as_me:28004: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -28018,7 +28021,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:28021: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:28024: 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
+@@ -28030,7 +28033,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:28033: checking for Ada95 compiler" >&5
++echo "$as_me:28036: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -28041,12 +28044,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:28044: result: $cf_ada_compiler" >&5
++echo "$as_me:28047: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:28049: checking for Ada95 include directory" >&5
++echo "$as_me:28052: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -28082,7 +28085,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28085: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28088: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28091,10 +28094,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:28094: result: $ADA_INCLUDE" >&5
++echo "$as_me:28097: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:28097: checking for Ada95 object directory" >&5
++echo "$as_me:28100: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -28130,7 +28133,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28133: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28136: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28139,10 +28142,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:28142: result: $ADA_OBJECTS" >&5
++echo "$as_me:28145: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:28145: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:28148: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -28163,11 +28166,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:28166: result: $with_ada_sharedlib" >&5
++echo "$as_me:28169: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+-	{ echo "$as_me:28170: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++	{ echo "$as_me:28173: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+ 
+@@ -28185,7 +28188,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:28188: checking for Ada95 curses library name" >&5
++echo "$as_me:28191: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -28201,7 +28204,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28204: result: $ADA_LIBNAME" >&5
++echo "$as_me:28207: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -28212,13 +28215,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:28215: checking for wchar_t" >&5
++	echo "$as_me:28218: 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 28221 "configure"
++#line 28224 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28233,16 +28236,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28236: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28239: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28239: \$? = $ac_status" >&5
++  echo "$as_me:28242: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28242: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28245: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28245: \$? = $ac_status" >&5
++  echo "$as_me:28248: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -28252,10 +28255,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:28255: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:28258: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:28258: checking size of wchar_t" >&5
++echo "$as_me:28261: 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
+@@ -28264,7 +28267,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28267 "configure"
++#line 28270 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28276,21 +28279,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28279: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28282: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28282: \$? = $ac_status" >&5
++  echo "$as_me:28285: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28285: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28288: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28288: \$? = $ac_status" >&5
++  echo "$as_me:28291: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28293 "configure"
++#line 28296 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28302,16 +28305,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28305: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28308: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28308: \$? = $ac_status" >&5
++  echo "$as_me:28311: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28311: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28314: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28314: \$? = $ac_status" >&5
++  echo "$as_me:28317: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -28327,7 +28330,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28330 "configure"
++#line 28333 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28339,16 +28342,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28342: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28345: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28345: \$? = $ac_status" >&5
++  echo "$as_me:28348: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28348: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28351: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28351: \$? = $ac_status" >&5
++  echo "$as_me:28354: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -28364,7 +28367,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 28367 "configure"
++#line 28370 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28376,16 +28379,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28379: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28382: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28382: \$? = $ac_status" >&5
++  echo "$as_me:28385: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28385: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28388: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28388: \$? = $ac_status" >&5
++  echo "$as_me:28391: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -28398,12 +28401,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:28401: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:28404: 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 28406 "configure"
++#line 28409 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28419,15 +28422,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:28422: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28425: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28425: \$? = $ac_status" >&5
++  echo "$as_me:28428: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:28427: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28430: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28430: \$? = $ac_status" >&5
++  echo "$as_me:28433: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -28443,7 +28446,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:28446: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:28449: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&6
+ 
+-echo "${as_me:-configure}:28459: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:28462: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -28474,7 +28477,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:28477: checking for library subsets" >&5
++echo "$as_me:28480: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -28528,7 +28531,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:28531: result: $LIB_SUBSETS" >&5
++echo "$as_me:28534: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -28559,7 +28562,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:28562: checking default library suffix" >&5
++echo "$as_me:28565: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28570,10 +28573,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:28573: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:28576: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:28576: checking default library-dependency suffix" >&5
++echo "$as_me:28579: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -28656,10 +28659,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:28659: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28662: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:28662: checking default object directory" >&5
++echo "$as_me:28665: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28675,11 +28678,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:28678: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28681: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28682: checking c++ library-dependency suffix" >&5
++echo "$as_me:28685: 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++)
+@@ -28772,7 +28775,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:28775: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:28778: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -28948,19 +28951,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:28951: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:28954: 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:28960: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:28963: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28963: \$? = $ac_status" >&5
++  echo "$as_me:28966: \$? = $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
+@@ -28971,10 +28974,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28974 "configure"
++#line 28977 "configure"
+ #include "confdefs.h"
+ 
+-#line 28977 "configure"
++#line 28980 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -28989,16 +28992,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:28992: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28995: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28995: \$? = $ac_status" >&5
++  echo "$as_me:28998: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:28998: \"$ac_try\"") >&5
++  { (eval echo "$as_me:29001: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:29001: \$? = $ac_status" >&5
++  echo "$as_me:29004: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -29021,7 +29024,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:29024: result: $cf_ldflags_static" >&5
++	echo "$as_me:29027: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test "$cf_ldflags_static" != yes
+@@ -29037,7 +29040,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29040: checking where we will install curses.h" >&5
++echo "$as_me:29043: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -29047,7 +29050,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:29050: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:29053: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -29055,7 +29058,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:29058: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:29061: 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
+@@ -29080,7 +29083,7 @@
+ 
+ # pkgsrc uses these
+ 
+-echo "$as_me:29083: checking for desired basename for form library" >&5
++echo "$as_me:29086: 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.
+@@ -29100,10 +29103,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29103: result: $FORM_NAME" >&5
++echo "$as_me:29106: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:29106: checking for desired basename for menu library" >&5
++echo "$as_me:29109: 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.
+@@ -29123,10 +29126,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29126: result: $MENU_NAME" >&5
++echo "$as_me:29129: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:29129: checking for desired basename for panel library" >&5
++echo "$as_me:29132: 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.
+@@ -29146,10 +29149,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29149: result: $PANEL_NAME" >&5
++echo "$as_me:29152: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:29152: checking for desired basename for cxx library" >&5
++echo "$as_me:29155: 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.
+@@ -29169,13 +29172,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29172: result: $CXX_NAME" >&5
++echo "$as_me:29175: 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:29178: checking for src modules" >&5
++echo "$as_me:29181: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -29234,7 +29237,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:29237: result: $cf_cv_src_modules" >&5
++echo "$as_me:29240: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -29395,7 +29398,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:29398: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:29401: 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//'`
+@@ -29406,7 +29409,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:29409: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
++echo "$as_me:29412: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -29422,7 +29425,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:29425: result: $PKG_CFLAGS" >&5
++echo "$as_me:29428: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
+@@ -29483,7 +29486,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
+ 
+-echo "${as_me:-configure}:29486: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
++echo "${as_me:-configure}:29489: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+ 
+ fi
+ 
+@@ -29510,7 +29513,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:29513: checking for linker search path" >&5
++echo "$as_me:29516: 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
+@@ -29558,7 +29561,7 @@
+ 			cf_pathlist="$cf_pathlist /lib /usr/lib"
+ 			;;
+ 		(*)
+-			{ echo "$as_me:29561: WARNING: problem with Solaris architecture" >&5
++			{ echo "$as_me:29564: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ 			;;
+ 		esac
+@@ -29599,7 +29602,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:29602: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29605: 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'`
+@@ -29685,7 +29688,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29688: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29691: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -29821,7 +29824,7 @@
+ cat >>"$CONFIG_STATUS" <&5
+ echo "$as_me: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -29885,7 +29888,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:29888: error: unrecognized option: $1
++  -*) { { echo "$as_me:29891: 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;}
+@@ -29904,7 +29907,7 @@
+ ## Running config.status.  ##
+ ## ----------------------- ##
+ 
+-This file was extended by $as_me 2.52.20231210, executed with
++This file was extended by $as_me 2.52.20240618, executed with
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+   CONFIG_LINKS    = $CONFIG_LINKS
+@@ -30015,7 +30018,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:30018: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:30021: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -30432,14 +30435,14 @@
+       # is no need to browse any of the substitutions).
+       # These are the two extra sed commands mentioned above.
+       (echo ':t
+-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed
++  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && sed -e 's/\\\\*$//g' -e 's/$/\\/' -e 's/;t t\\/;t t/' -e 't' -e '3,'$ac_max_sed_lines's/$/\\/' "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed
+       # It is possible to make a multiline substitution using escaped newlines.
+       # Ensure that we do not split the substitution between script fragments.
+       ac_BEG=$ac_end
+       ac_END=`expr "$ac_end" + "$ac_max_sed_lines"`
+       sed "1,${ac_BEG}d; ${ac_END}p; q" "$tmp"/subs.sed >"$tmp"/subs.next
+       if test -s "$tmp"/subs.next; then
+-        grep '^s,@[^@,][^@,]*@,.*\\$' "$tmp"/subs.next >"$tmp"/subs.edit
++        grep '^s,@[^@,][^@,]*@,.*$' "$tmp"/subs.next | grep -v '^s,@.*;t t$' >"$tmp"/subs.edit
+         if test ! -s "$tmp"/subs.edit; then
+           grep "^s,@[^@,][^@,]*@,.*,;t t$" "$tmp"/subs.next >"$tmp"/subs.edit
+           if test ! -s "$tmp"/subs.edit; then
+@@ -30537,7 +30540,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:30540: creating $ac_file" >&5
++    { echo "$as_me:30543: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -30555,7 +30558,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30558: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30561: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -30568,7 +30571,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30571: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30574: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30584,7 +30587,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:30587: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:30590: 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;}
+@@ -30593,7 +30596,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:30596: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:30599: 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;}
+@@ -30638,7 +30641,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:30641: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:30644: 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;}
+@@ -30649,7 +30652,7 @@
+     $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:30652: WARNING: Some variables may not be substituted:
++      { echo "$as_me:30655: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30698,7 +30701,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:30701: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:30704: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -30709,7 +30712,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30712: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30715: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -30722,7 +30725,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30725: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30728: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30780,7 +30783,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:30783: $ac_file is unchanged" >&5
++      { echo "$as_me:30786: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -31167,7 +31170,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}:31170: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:31173: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: dist.mk
+Prereq:  1.1620 
+--- ncurses-6.5-20240629+/dist.mk	2024-06-29 10:00:32.000000000 +0000
++++ ncurses-6.5-20240706/dist.mk	2024-07-06 09:41:29.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1620 2024/06/29 10:00:32 tom Exp $
++# $Id: dist.mk,v 1.1621 2024/07/06 09:41:29 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 = 5
+-NCURSES_PATCH = 20240629
++NCURSES_PATCH = 20240706
+ 
+ # 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.5-20240629+/package/debian-mingw/changelog	2024-06-29 10:00:32.000000000 +0000
++++ ncurses-6.5-20240706/package/debian-mingw/changelog	2024-07-06 09:41:29.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240629) unstable; urgency=low
++ncurses6td (6.5+20240706) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 29 Jun 2024 06:00:32 -0400
++ -- Thomas E. Dickey   Sat, 06 Jul 2024 05:41:29 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20240629+/package/debian-mingw64/changelog	2024-06-29 10:00:32.000000000 +0000
++++ ncurses-6.5-20240706/package/debian-mingw64/changelog	2024-07-06 09:41:29.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240629) unstable; urgency=low
++ncurses6td (6.5+20240706) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 29 Jun 2024 06:00:32 -0400
++ -- Thomas E. Dickey   Sat, 06 Jul 2024 05:41:29 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20240629+/package/debian/changelog	2024-06-29 10:00:32.000000000 +0000
++++ ncurses-6.5-20240706/package/debian/changelog	2024-07-06 09:41:29.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240629) unstable; urgency=low
++ncurses6td (6.5+20240706) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 29 Jun 2024 06:00:32 -0400
++ -- Thomas E. Dickey   Sat, 06 Jul 2024 05:41:29 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.655 
+--- ncurses-6.5-20240629+/package/mingw-ncurses.nsi	2024-06-29 10:00:32.000000000 +0000
++++ ncurses-6.5-20240706/package/mingw-ncurses.nsi	2024-07-06 09:41:29.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.655 2024/06/29 10:00:32 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.656 2024/07/06 09:41:29 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "0629"
++!define VERSION_MMDD  "0706"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20240629+/package/mingw-ncurses.spec	2024-06-29 10:00:32.000000000 +0000
++++ ncurses-6.5-20240706/package/mingw-ncurses.spec	2024-07-06 09:41:29.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20240629
++Release: 20240706
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20240629+/package/ncurses.spec	2024-06-29 10:00:32.000000000 +0000
++++ ncurses-6.5-20240706/package/ncurses.spec	2024-07-06 09:41:29.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20240629
++Release: 20240706
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20240629+/package/ncursest.spec	2024-06-29 10:00:32.000000000 +0000
++++ ncurses-6.5-20240706/package/ncursest.spec	2024-07-06 09:41:29.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20240629
++Release: 20240706
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/aclocal.m4
+Prereq:  1.222 
+--- ncurses-6.5-20240629+/test/aclocal.m4	2024-05-18 18:08:04.000000000 +0000
++++ ncurses-6.5-20240706/test/aclocal.m4	2024-07-06 18:05:00.000000000 +0000
+@@ -27,7 +27,7 @@
+ dnl authorization.                                                           *
+ dnl***************************************************************************
+ dnl
+-dnl $Id: aclocal.m4,v 1.222 2024/05/18 18:08:04 tom Exp $
++dnl $Id: aclocal.m4,v 1.223 2024/07/06 18:05:00 tom Exp $
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+@@ -901,15 +901,22 @@
+ CF_TERM_HEADER
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CURSES_FUNCS version: 20 updated: 2020/12/31 20:19:42
++dnl CF_CURSES_FUNCS version: 21 updated: 2024/06/11 20:24:35
+ dnl ---------------
+ dnl Curses-functions are a little complicated, since a lot of them are macros.
++dnl
++dnl $1 is a list of functions to test
+ AC_DEFUN([CF_CURSES_FUNCS],
+ [
+ AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
+ AC_REQUIRE([CF_XOPEN_CURSES])
+ AC_REQUIRE([CF_CURSES_TERM_H])
+ AC_REQUIRE([CF_CURSES_UNCTRL_H])
++
++AC_FOREACH([AC_Func], [$1],
++  [AH_TEMPLATE(AS_TR_CPP(HAVE_[]AC_Func),
++               [Define if you have the `]AC_Func[' function.])])dnl
++
+ for cf_func in $1
+ do
+ 	CF_UPPER(cf_tr_func,$cf_func)
+@@ -3076,13 +3083,12 @@
+ AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_NCURSES_PTHREADS version: 2 updated: 2016/04/22 05:07:41
++dnl CF_NCURSES_PTHREADS version: 3 updated: 2024/07/06 13:57:42
+ dnl -------------------
+-dnl Use this followup check to ensure that we link with pthreads if ncurses
+-dnl uses it.
++dnl Use this followup check, e.g., in CF_WITH_NCURSES_ETC, to ensure that we
++dnl link with pthreads if ncurses uses it.
+ AC_DEFUN([CF_NCURSES_PTHREADS],[
+-: ${cf_nculib_root:=ifelse($1,,ncurses,$1)}
+-AC_CHECK_LIB($cf_nculib_root,_nc_init_pthreads,
++AC_CHECK_FUNC(_nc_init_pthreads,
+ 	cf_cv_ncurses_pthreads=yes,
+ 	cf_cv_ncurses_pthreads=no)
+ if test "$cf_cv_ncurses_pthreads" = yes
+Index: test/configure
+--- ncurses-6.5-20240629+/test/configure	2024-05-18 18:08:31.000000000 +0000
++++ ncurses-6.5-20240706/test/configure	2024-07-06 18:05:23.000000000 +0000
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by Autoconf 2.52.20231210.
++# Generated by Autoconf 2.52.20240618.
+ #
+ # Copyright 2003-2022,2023	Thomas E. Dickey
+ # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+@@ -480,6 +480,10 @@
+   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+     x_libraries=$ac_optarg ;;
+ 
++  -*dir | -dvi* | -doc* | -html* | -local* | -pdf* | -ps* )
++    echo "$as_me: WARNING: unsupported option: $ac_option" >&2
++    ;;
++
+   -*) { echo "$as_me: error: unrecognized option: $ac_option
+ Try \`$0 --help' for more information." >&2
+    { (exit 1); exit 1; }; }
+@@ -809,7 +813,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.52.20231210.  Invocation command line was
++generated by GNU Autoconf 2.52.20240618.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -933,7 +937,7 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+   if test -r "$ac_site_file"; then
+-    { echo "$as_me:936: loading site script $ac_site_file" >&5
++    { echo "$as_me:940: loading site script $ac_site_file" >&5
+ echo "$as_me: loading site script $ac_site_file" >&6;}
+     cat "$ac_site_file" >&5
+     . "$ac_site_file"
+@@ -944,7 +948,7 @@
+   # Some versions of bash will fail to source /dev/null (special
+   # files actually), so we avoid doing that.
+   if test -f "$cache_file"; then
+-    { echo "$as_me:947: loading cache $cache_file" >&5
++    { echo "$as_me:951: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+       [\\/]* | ?:[\\/]* ) . $cache_file;;
+@@ -952,7 +956,7 @@
+     esac
+   fi
+ else
+-  { echo "$as_me:955: creating cache $cache_file" >&5
++  { echo "$as_me:959: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+@@ -968,21 +972,21 @@
+   eval ac_new_val="\$ac_env_${ac_var}_value"
+   case "$ac_old_set,$ac_new_set" in
+     set,)
+-      { echo "$as_me:971: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++      { echo "$as_me:975: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,set)
+-      { echo "$as_me:975: error: \`$ac_var' was not set in the previous run" >&5
++      { echo "$as_me:979: error: \`$ac_var' was not set in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,);;
+     *)
+       if test "x$ac_old_val" != "x$ac_new_val"; then
+-        { echo "$as_me:981: error: \`$ac_var' has changed since the previous run:" >&5
++        { echo "$as_me:985: error: \`$ac_var' has changed since the previous run:" >&5
+ echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+-        { echo "$as_me:983:   former value:  $ac_old_val" >&5
++        { echo "$as_me:987:   former value:  $ac_old_val" >&5
+ echo "$as_me:   former value:  $ac_old_val" >&2;}
+-        { echo "$as_me:985:   current value: $ac_new_val" >&5
++        { echo "$as_me:989:   current value: $ac_new_val" >&5
+ echo "$as_me:   current value: $ac_new_val" >&2;}
+         ac_cache_corrupted=:
+       fi;;
+@@ -1001,9 +1005,9 @@
+   fi
+ done
+ if "$ac_cache_corrupted"; then
+-  { echo "$as_me:1004: error: changes in the environment can compromise the build" >&5
++  { echo "$as_me:1008: error: changes in the environment can compromise the build" >&5
+ echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  { { echo "$as_me:1006: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++  { { echo "$as_me:1010: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1032,10 +1036,10 @@
+ echo "#! $SHELL" >conftest.sh
+ echo  "exit 0"   >>conftest.sh
+ chmod +x conftest.sh
+-if { (echo "$as_me:1035: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:1039: PATH=\".;.\"; conftest.sh") >&5
+   (PATH=".;."; conftest.sh) 2>&5
+   ac_status=$?
+-  echo "$as_me:1038: \$? = $ac_status" >&5
++  echo "$as_me:1042: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+   ac_path_separator=';'
+ else
+@@ -1067,7 +1071,7 @@
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:1070: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++  { { echo "$as_me:1074: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+ echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1077,11 +1081,11 @@
+ 
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+-  { { echo "$as_me:1080: error: cannot run $ac_config_sub" >&5
++  { { echo "$as_me:1084: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:1084: checking build system type" >&5
++echo "$as_me:1088: checking build system type" >&5
+ echo $ECHO_N "checking build system type... $ECHO_C" >&6
+ if test "${ac_cv_build+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1090,16 +1094,16 @@
+ test -z "$ac_cv_build_alias" &&
+   ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+-  { { echo "$as_me:1093: error: cannot guess build type; you must specify one" >&5
++  { { echo "$as_me:1097: error: cannot guess build type; you must specify one" >&5
+ echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+    { (exit 1); exit 1; }; }
+ ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` ||
+-  { { echo "$as_me:1097: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++  { { echo "$as_me:1101: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1102: result: $ac_cv_build" >&5
++echo "$as_me:1106: result: $ac_cv_build" >&5
+ echo "${ECHO_T}$ac_cv_build" >&6
+ build=$ac_cv_build
+ build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1107,7 +1111,7 @@
+ build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+ if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
+-	echo "$as_me:1110: checking host system type" >&5
++	echo "$as_me:1114: checking host system type" >&5
+ echo $ECHO_N "checking host system type... $ECHO_C" >&6
+ if test "${ac_cv_host+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1116,12 +1120,12 @@
+ test -z "$ac_cv_host_alias" &&
+   ac_cv_host_alias=$ac_cv_build_alias
+ ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` ||
+-  { { echo "$as_me:1119: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++  { { echo "$as_me:1123: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1124: result: $ac_cv_host" >&5
++echo "$as_me:1128: result: $ac_cv_host" >&5
+ echo "${ECHO_T}$ac_cv_host" >&6
+ host=$ac_cv_host
+ host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1147,13 +1151,13 @@
+ fi
+ 
+ test -z "$system_name" && system_name="$cf_cv_system_name"
+-test -n "$cf_cv_system_name" && echo "$as_me:1150: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1154: result: Configuring for $cf_cv_system_name" >&5
+ echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
+ 
+ if test ".$system_name" != ".$cf_cv_system_name" ; then
+-	echo "$as_me:1154: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++	echo "$as_me:1158: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+ echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
+-	{ { echo "$as_me:1156: error: \"Please remove config.cache and try again.\"" >&5
++	{ { echo "$as_me:1160: error: \"Please remove config.cache and try again.\"" >&5
+ echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1171,7 +1175,7 @@
+ program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+ rm conftest.sed
+ 
+-echo "$as_me:1174: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:1178: 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
+@@ -1191,11 +1195,11 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:1194: result: yes" >&5
++  echo "$as_me:1198: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:1198: result: no" >&5
++  echo "$as_me:1202: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+@@ -1209,7 +1213,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-echo "$as_me:1212: checking for $ac_word" >&5
++echo "$as_me:1216: 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
+@@ -1224,7 +1228,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-echo "$as_me:1227: found $ac_dir/$ac_word" >&5
++echo "$as_me:1231: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1232,10 +1236,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1235: result: $CC" >&5
++  echo "$as_me:1239: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1238: result: no" >&5
++  echo "$as_me:1242: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1244,7 +1248,7 @@
+   ac_ct_CC=$CC
+   # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-echo "$as_me:1247: checking for $ac_word" >&5
++echo "$as_me:1251: 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
+@@ -1259,7 +1263,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="gcc"
+-echo "$as_me:1262: found $ac_dir/$ac_word" >&5
++echo "$as_me:1266: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1267,10 +1271,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1270: result: $ac_ct_CC" >&5
++  echo "$as_me:1274: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1273: result: no" >&5
++  echo "$as_me:1277: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1283,7 +1287,7 @@
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-echo "$as_me:1286: checking for $ac_word" >&5
++echo "$as_me:1290: 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
+@@ -1298,7 +1302,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+-echo "$as_me:1301: found $ac_dir/$ac_word" >&5
++echo "$as_me:1305: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1306,10 +1310,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1309: result: $CC" >&5
++  echo "$as_me:1313: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1312: result: no" >&5
++  echo "$as_me:1316: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1318,7 +1322,7 @@
+   ac_ct_CC=$CC
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:1321: checking for $ac_word" >&5
++echo "$as_me:1325: 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
+@@ -1333,7 +1337,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="cc"
+-echo "$as_me:1336: found $ac_dir/$ac_word" >&5
++echo "$as_me:1340: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1341,10 +1345,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1344: result: $ac_ct_CC" >&5
++  echo "$as_me:1348: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1347: result: no" >&5
++  echo "$as_me:1351: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1357,7 +1361,7 @@
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:1360: checking for $ac_word" >&5
++echo "$as_me:1364: 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
+@@ -1377,7 +1381,7 @@
+   continue
+ fi
+ ac_cv_prog_CC="cc"
+-echo "$as_me:1380: found $ac_dir/$ac_word" >&5
++echo "$as_me:1384: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1399,10 +1403,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1402: result: $CC" >&5
++  echo "$as_me:1406: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1405: result: no" >&5
++  echo "$as_me:1409: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1413,7 +1417,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:1416: checking for $ac_word" >&5
++echo "$as_me:1420: 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
+@@ -1428,7 +1432,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:1431: found $ac_dir/$ac_word" >&5
++echo "$as_me:1435: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1436,10 +1440,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1439: result: $CC" >&5
++  echo "$as_me:1443: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1442: result: no" >&5
++  echo "$as_me:1446: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1452,7 +1456,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:1455: checking for $ac_word" >&5
++echo "$as_me:1459: 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
+@@ -1467,7 +1471,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:1470: found $ac_dir/$ac_word" >&5
++echo "$as_me:1474: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1475,10 +1479,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1478: result: $ac_ct_CC" >&5
++  echo "$as_me:1482: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1481: result: no" >&5
++  echo "$as_me:1485: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1490,32 +1494,32 @@
+ 
+ fi
+ 
+-test -z "$CC" && { { echo "$as_me:1493: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1497: 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:1498:" \
++echo "$as_me:1502:" \
+      "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo "$2"`
+-{ (eval echo "$as_me:1501: \"$ac_compiler --version &5\"") >&5
++{ (eval echo "$as_me:1505: \"$ac_compiler --version &5\"") >&5
+   (eval $ac_compiler --version &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1504: \$? = $ac_status" >&5
++  echo "$as_me:1508: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:1506: \"$ac_compiler -v &5\"") >&5
++{ (eval echo "$as_me:1510: \"$ac_compiler -v &5\"") >&5
+   (eval $ac_compiler -v &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1509: \$? = $ac_status" >&5
++  echo "$as_me:1513: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:1511: \"$ac_compiler -V &5\"") >&5
++{ (eval echo "$as_me:1515: \"$ac_compiler -V &5\"") >&5
+   (eval $ac_compiler -V &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1514: \$? = $ac_status" >&5
++  echo "$as_me:1518: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1518 "configure"
++#line 1522 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1531,13 +1535,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:1534: checking for C compiler default output" >&5
++echo "$as_me:1538: 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:1537: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1541: \"$ac_link_default\"") >&5
+   (eval $ac_link_default) 2>&5
+   ac_status=$?
+-  echo "$as_me:1540: \$? = $ac_status" >&5
++  echo "$as_me:1544: \$? = $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
+@@ -1560,34 +1564,34 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:1563: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1567: 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:1569: result: $ac_file" >&5
++echo "$as_me:1573: 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:1574: checking whether the C compiler works" >&5
++echo "$as_me:1578: 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:1580: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1584: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1583: \$? = $ac_status" >&5
++  echo "$as_me:1587: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+-	{ { echo "$as_me:1590: error: cannot run C compiled programs.
++	{ { echo "$as_me:1594: 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;}
+@@ -1595,24 +1599,24 @@
+     fi
+   fi
+ fi
+-echo "$as_me:1598: result: yes" >&5
++echo "$as_me:1602: 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:1605: checking whether we are cross compiling" >&5
++echo "$as_me:1609: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:1607: result: $cross_compiling" >&5
++echo "$as_me:1611: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+ 
+-echo "$as_me:1610: checking for executable suffix" >&5
++echo "$as_me:1614: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:1612: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1616: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:1615: \$? = $ac_status" >&5
++  echo "$as_me:1619: \$? = $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
+@@ -1628,25 +1632,25 @@
+   esac
+ done
+ else
+-  { { echo "$as_me:1631: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:1635: 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:1637: result: $ac_cv_exeext" >&5
++echo "$as_me:1641: 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:1643: checking for object suffix" >&5
++echo "$as_me:1647: 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 1649 "configure"
++#line 1653 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1658,10 +1662,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:1661: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1665: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1664: \$? = $ac_status" >&5
++  echo "$as_me:1668: \$? = $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
+@@ -1673,24 +1677,24 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:1676: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:1680: 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:1683: result: $ac_cv_objext" >&5
++echo "$as_me:1687: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:1687: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:1691: 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 1693 "configure"
++#line 1697 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1705,16 +1709,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1708: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1712: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1711: \$? = $ac_status" >&5
++  echo "$as_me:1715: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:1714: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1718: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1717: \$? = $ac_status" >&5
++  echo "$as_me:1721: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -1726,19 +1730,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:1729: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:1733: 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:1735: checking whether $CC accepts -g" >&5
++echo "$as_me:1739: 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 1741 "configure"
++#line 1745 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1750,16 +1754,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1753: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1757: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1756: \$? = $ac_status" >&5
++  echo "$as_me:1760: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:1759: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1763: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1762: \$? = $ac_status" >&5
++  echo "$as_me:1766: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cc_g=yes
+ else
+@@ -1769,7 +1773,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:1772: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:1776: 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
+@@ -1796,16 +1800,16 @@
+ #endif
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1799: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1803: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1802: \$? = $ac_status" >&5
++  echo "$as_me:1806: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:1805: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1809: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1808: \$? = $ac_status" >&5
++  echo "$as_me:1812: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   for ac_declaration in \
+    ''\
+@@ -1817,7 +1821,7 @@
+    'void exit (int);'
+ do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1820 "configure"
++#line 1824 "configure"
+ #include "confdefs.h"
+ #include 
+ $ac_declaration
+@@ -1830,16 +1834,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1833: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1837: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1836: \$? = $ac_status" >&5
++  echo "$as_me:1840: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:1839: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1843: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1842: \$? = $ac_status" >&5
++  echo "$as_me:1846: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -1849,7 +1853,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1852 "configure"
++#line 1856 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -1861,16 +1865,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1864: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1868: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1867: \$? = $ac_status" >&5
++  echo "$as_me:1871: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:1870: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1874: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1873: \$? = $ac_status" >&5
++  echo "$as_me:1877: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -1900,11 +1904,11 @@
+ 
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+-	echo "$as_me:1903: checking version of $CC" >&5
++	echo "$as_me:1907: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+-	echo "$as_me:1907: result: $GCC_VERSION" >&5
++	echo "$as_me:1911: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+ 
+@@ -1913,12 +1917,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:1916: checking if this is really Intel C compiler" >&5
++		echo "$as_me:1920: 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 1921 "configure"
++#line 1925 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1935,16 +1939,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1938: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1942: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1941: \$? = $ac_status" >&5
++  echo "$as_me:1945: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:1944: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1948: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1947: \$? = $ac_status" >&5
++  echo "$as_me:1951: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -1955,7 +1959,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:1958: result: $INTEL_COMPILER" >&5
++		echo "$as_me:1962: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ 		;;
+ 	esac
+@@ -1964,11 +1968,11 @@
+ CLANG_COMPILER=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:1967: checking if this is really Clang C compiler" >&5
++	echo "$as_me:1971: 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 1971 "configure"
++#line 1975 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1985,16 +1989,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1988: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1992: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1991: \$? = $ac_status" >&5
++  echo "$as_me:1995: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:1994: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1998: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1997: \$? = $ac_status" >&5
++  echo "$as_me:2001: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_COMPILER=yes
+ 
+@@ -2004,7 +2008,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:2007: result: $CLANG_COMPILER" >&5
++	echo "$as_me:2011: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+ 
+@@ -2013,30 +2017,30 @@
+ if test "x$CLANG_COMPILER" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:2016: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:2020: 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:2023: checking version of $CC" >&5
++	echo "$as_me:2027: 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:2027: result: $CLANG_VERSION" >&5
++	echo "$as_me:2031: 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:2034: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:2038: 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 2039 "configure"
++#line 2043 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -2050,16 +2054,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:2053: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2057: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2056: \$? = $ac_status" >&5
++  echo "$as_me:2060: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:2059: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2063: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2062: \$? = $ac_status" >&5
++  echo "$as_me:2066: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -2070,13 +2074,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:2073: result: $cf_clang_optok" >&5
++		echo "$as_me:2077: 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}:2079: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:2083: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -2085,7 +2089,7 @@
+ 	done
+ fi
+ 
+-echo "$as_me:2088: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:2092: 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
+@@ -2093,7 +2097,7 @@
+   ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2096 "configure"
++#line 2100 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -2140,16 +2144,16 @@
+ do
+   CC="$ac_save_CC $ac_arg"
+   rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2143: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2147: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2146: \$? = $ac_status" >&5
++  echo "$as_me:2150: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2149: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2153: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2152: \$? = $ac_status" >&5
++  echo "$as_me:2156: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -2166,10 +2170,10 @@
+ 
+ case "x$ac_cv_prog_cc_stdc" in
+   x|xno)
+-    echo "$as_me:2169: result: none needed" >&5
++    echo "$as_me:2173: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+   *)
+-    echo "$as_me:2172: result: $ac_cv_prog_cc_stdc" >&5
++    echo "$as_me:2176: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+     CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+@@ -2177,13 +2181,13 @@
+ # This should have been defined by AC_PROG_CC
+ : "${CC:=cc}"
+ 
+-echo "$as_me:2180: checking \$CFLAGS variable" >&5
++echo "$as_me:2184: checking \$CFLAGS variable" >&5
+ echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
+ case "x$CFLAGS" in
+ (*-[IUD]*)
+-	echo "$as_me:2184: result: broken" >&5
++	echo "$as_me:2188: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2186: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
++	{ echo "$as_me:2190: 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=
+@@ -2291,18 +2295,18 @@
+ 	done
+ 	;;
+ (*)
+-	echo "$as_me:2294: result: ok" >&5
++	echo "$as_me:2298: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+ 
+-echo "$as_me:2299: checking \$CC variable" >&5
++echo "$as_me:2303: checking \$CC variable" >&5
+ echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+ case "$CC" in
+ (*[\ \	]-*)
+-	echo "$as_me:2303: result: broken" >&5
++	echo "$as_me:2307: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2305: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++	{ echo "$as_me:2309: 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/[ ]*[ ]-[^ ].*//'`
+@@ -2419,24 +2423,24 @@
+ 	done
+ 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
+ 
+-echo "${as_me:-configure}:2422: testing resulting CC: '$CC' ..." 1>&5
++echo "${as_me:-configure}:2426: testing resulting CC: '$CC' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:2426: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2430: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:2430: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2434: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+ 
+ 	;;
+ (*)
+-	echo "$as_me:2434: result: ok" >&5
++	echo "$as_me:2438: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+ 
+-echo "$as_me:2439: checking for inline" >&5
++echo "$as_me:2443: 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
+@@ -2444,7 +2448,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2447 "configure"
++#line 2451 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo (void) {return 0; }
+@@ -2453,16 +2457,16 @@
+ 
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2456: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2460: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2459: \$? = $ac_status" >&5
++  echo "$as_me:2463: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2462: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2466: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2465: \$? = $ac_status" >&5
++  echo "$as_me:2469: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -2473,7 +2477,7 @@
+ done
+ 
+ fi
+-echo "$as_me:2476: result: $ac_cv_c_inline" >&5
++echo "$as_me:2480: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -2492,7 +2496,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:2495: checking for $ac_word" >&5
++echo "$as_me:2499: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_GREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2507,7 +2511,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_GREP="$ac_prog"
+-echo "$as_me:2510: found $ac_dir/$ac_word" >&5
++echo "$as_me:2514: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2515,10 +2519,10 @@
+ fi
+ GREP=$ac_cv_prog_GREP
+ if test -n "$GREP"; then
+-  echo "$as_me:2518: result: $GREP" >&5
++  echo "$as_me:2522: result: $GREP" >&5
+ echo "${ECHO_T}$GREP" >&6
+ else
+-  echo "$as_me:2521: result: no" >&5
++  echo "$as_me:2525: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2526,7 +2530,7 @@
+ done
+ test -n "$GREP" || GREP=": "
+ 
+-echo "$as_me:2529: checking for egrep" >&5
++echo "$as_me:2533: checking for egrep" >&5
+ echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+ if test "${ac_cv_path_EGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2538,7 +2542,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:2541: checking for $ac_word" >&5
++echo "$as_me:2545: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_EGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2555,7 +2559,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_EGREP="$ac_dir/$ac_word"
+-   echo "$as_me:2558: found $ac_dir/$ac_word" >&5
++   echo "$as_me:2562: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -2566,10 +2570,10 @@
+ EGREP=$ac_cv_path_EGREP
+ 
+ if test -n "$EGREP"; then
+-  echo "$as_me:2569: result: $EGREP" >&5
++  echo "$as_me:2573: result: $EGREP" >&5
+ echo "${ECHO_T}$EGREP" >&6
+ else
+-  echo "$as_me:2572: result: no" >&5
++  echo "$as_me:2576: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2577,12 +2581,12 @@
+ done
+ test -n "$EGREP" || EGREP=": "
+ 
+-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2580: error: cannot find workable egrep" >&5
++     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2584: error: cannot find workable egrep" >&5
+ echo "$as_me: error: cannot find workable egrep" >&2;}
+    { (exit 1); exit 1; }; }
+    fi
+ fi
+-echo "$as_me:2585: result: $ac_cv_path_EGREP" >&5
++echo "$as_me:2589: result: $ac_cv_path_EGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_EGREP" >&6
+  EGREP="$ac_cv_path_EGREP"
+ 
+@@ -2592,7 +2596,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:2595: checking how to run the C preprocessor" >&5
++echo "$as_me:2599: 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
+@@ -2613,18 +2617,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 2616 "configure"
++#line 2620 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2621: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2625: \"$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:2627: \$? = $ac_status" >&5
++  echo "$as_me:2631: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2647,17 +2651,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2650 "configure"
++#line 2654 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:2654: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2658: \"$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:2660: \$? = $ac_status" >&5
++  echo "$as_me:2664: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2694,7 +2698,7 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:2697: result: $CPP" >&5
++echo "$as_me:2701: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -2704,18 +2708,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 2707 "configure"
++#line 2711 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2712: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2716: \"$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:2718: \$? = $ac_status" >&5
++  echo "$as_me:2722: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2738,17 +2742,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2741 "configure"
++#line 2745 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:2745: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2749: \"$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:2751: \$? = $ac_status" >&5
++  echo "$as_me:2755: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2776,7 +2780,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:2779: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:2783: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -2792,7 +2796,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:2795: checking for $ac_word" >&5
++echo "$as_me:2799: 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
+@@ -2807,7 +2811,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+-echo "$as_me:2810: found $ac_dir/$ac_word" >&5
++echo "$as_me:2814: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2815,10 +2819,10 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "$as_me:2818: result: $AWK" >&5
++  echo "$as_me:2822: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+-  echo "$as_me:2821: result: no" >&5
++  echo "$as_me:2825: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2837,7 +2841,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:2840: checking for a BSD compatible install" >&5
++echo "$as_me:2844: 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
+@@ -2886,7 +2890,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:2889: result: $INSTALL" >&5
++echo "$as_me:2893: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -2907,7 +2911,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:2910: checking if you want to install stripped executables" >&5
++echo "$as_me:2914: 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.
+@@ -2924,7 +2928,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:2927: result: $enable_stripping" >&5
++echo "$as_me:2931: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -2935,7 +2939,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:2938: checking if install accepts -p option" >&5
++echo "$as_me:2942: 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
+@@ -2966,10 +2970,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:2969: result: $cf_cv_install_p" >&5
++echo "$as_me:2973: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:2972: checking if install needs to be told about ownership" >&5
++echo "$as_me:2976: 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)
+@@ -2980,7 +2984,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:2983: result: $with_install_o" >&5
++echo "$as_me:2987: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -2991,7 +2995,7 @@
+ 
+ if test -n "$INSTALL_OPT_S"
+ then
+-	echo "$as_me:2994: checking if you want to specify strip-program" >&5
++	echo "$as_me:2998: checking if you want to specify strip-program" >&5
+ echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
+ 
+ # Check whether --with-strip-program or --without-strip-program was given.
+@@ -3001,11 +3005,11 @@
+ else
+   with_strip_program=no
+ fi;
+-	echo "$as_me:3004: result: $with_strip_program" >&5
++	echo "$as_me:3008: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ 	if test "$with_strip_program" != no
+ 	then
+-		echo "$as_me:3008: checking if strip-program is supported with this installer" >&5
++		echo "$as_me:3012: checking if strip-program is supported with this installer" >&5
+ echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
+ 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
+ 		check_install_strip=no
+@@ -3026,11 +3030,11 @@
+ 				done
+ 			fi
+ 		fi
+-		echo "$as_me:3029: result: $check_install_strip" >&5
++		echo "$as_me:3033: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ 		case "$check_install_strip" in
+ 		(no)
+-			{ echo "$as_me:3033: WARNING: $cf_install_program does not support strip program option" >&5
++			{ echo "$as_me:3037: WARNING: $cf_install_program does not support strip program option" >&5
+ echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
+ 			with_strip_program=no
+ 			;;
+@@ -3045,7 +3049,7 @@
+ 			chmod +x "$INSTALL"
+ 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
+ 
+-echo "${as_me:-configure}:3048: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:3052: testing created $INSTALL ..." 1>&5
+ 
+ 			;;
+ 		(option)
+@@ -3059,7 +3063,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:3062: checking for $ac_word" >&5
++echo "$as_me:3066: 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
+@@ -3074,7 +3078,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LINT="$ac_prog"
+-echo "$as_me:3077: found $ac_dir/$ac_word" >&5
++echo "$as_me:3081: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3082,10 +3086,10 @@
+ fi
+ LINT=$ac_cv_prog_LINT
+ if test -n "$LINT"; then
+-  echo "$as_me:3085: result: $LINT" >&5
++  echo "$as_me:3089: result: $LINT" >&5
+ echo "${ECHO_T}$LINT" >&6
+ else
+-  echo "$as_me:3088: result: no" >&5
++  echo "$as_me:3092: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3098,7 +3102,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:3101: checking for \".PHONY\" make-support" >&5
++echo "$as_me:3105: 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
+@@ -3153,14 +3157,14 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:3156: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:3160: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+ test "x$cf_cv_make_PHONY" = xyes && MAKE_PHONY=
+ test "x$cf_cv_make_PHONY" != xyes && MAKE_NO_PHONY=
+ 
+-echo "$as_me:3163: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:3167: 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
+@@ -3187,7 +3191,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:3190: result: $cf_cv_mixedcase" >&5
++echo "$as_me:3194: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -3198,7 +3202,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:3201: checking for $ac_word" >&5
++echo "$as_me:3205: 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
+@@ -3213,7 +3217,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:3216: found $ac_dir/$ac_word" >&5
++echo "$as_me:3220: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3221,10 +3225,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:3224: result: $CTAGS" >&5
++  echo "$as_me:3228: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:3227: result: no" >&5
++  echo "$as_me:3231: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3235,7 +3239,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:3238: checking for $ac_word" >&5
++echo "$as_me:3242: 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
+@@ -3250,7 +3254,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:3253: found $ac_dir/$ac_word" >&5
++echo "$as_me:3257: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3258,10 +3262,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:3261: result: $ETAGS" >&5
++  echo "$as_me:3265: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:3264: result: no" >&5
++  echo "$as_me:3268: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3270,7 +3274,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:3273: checking for $ac_word" >&5
++echo "$as_me:3277: 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
+@@ -3285,7 +3289,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:3288: found $ac_dir/$ac_word" >&5
++echo "$as_me:3292: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3294,17 +3298,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:3297: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:3301: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:3300: result: no" >&5
++  echo "$as_me:3304: 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:3307: checking for $ac_word" >&5
++echo "$as_me:3311: 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
+@@ -3319,7 +3323,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:3322: found $ac_dir/$ac_word" >&5
++echo "$as_me:3326: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3328,10 +3332,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:3331: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:3335: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:3334: result: no" >&5
++  echo "$as_me:3338: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3351,14 +3355,14 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:3354: checking if -lm needed for math functions" >&5
++echo "$as_me:3358: 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 3361 "configure"
++#line 3365 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -3374,16 +3378,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3377: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3381: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3380: \$? = $ac_status" >&5
++  echo "$as_me:3384: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:3383: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3387: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3386: \$? = $ac_status" >&5
++  echo "$as_me:3390: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -3393,7 +3397,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3396: result: $cf_cv_need_libm" >&5
++echo "$as_me:3400: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ 
+ if test "$cf_cv_need_libm" = yes
+@@ -3401,14 +3405,14 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lm"
+-	echo "$as_me:3404: checking if -lm is available for math functions" >&5
++	echo "$as_me:3408: checking if -lm is available for math functions" >&5
+ echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
+ if test "${cf_cv_have_libm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3411 "configure"
++#line 3415 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -3424,16 +3428,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3427: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3431: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3430: \$? = $ac_status" >&5
++  echo "$as_me:3434: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:3433: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3437: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3436: \$? = $ac_status" >&5
++  echo "$as_me:3440: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_libm=yes
+ else
+@@ -3443,7 +3447,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3446: result: $cf_cv_have_libm" >&5
++echo "$as_me:3450: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ 	LIBS="$cf_save_LIBS"
+ 
+@@ -3498,7 +3502,7 @@
+ cf_cv_screen=curses
+ cf_cv_libtype=
+ 
+-echo "$as_me:3501: checking for fgrep" >&5
++echo "$as_me:3505: checking for fgrep" >&5
+ echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
+ if test "${ac_cv_path_FGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3510,7 +3514,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:3513: checking for $ac_word" >&5
++echo "$as_me:3517: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_FGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3527,7 +3531,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_FGREP="$ac_dir/$ac_word"
+-   echo "$as_me:3530: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3534: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3538,10 +3542,10 @@
+ FGREP=$ac_cv_path_FGREP
+ 
+ if test -n "$FGREP"; then
+-  echo "$as_me:3541: result: $FGREP" >&5
++  echo "$as_me:3545: result: $FGREP" >&5
+ echo "${ECHO_T}$FGREP" >&6
+ else
+-  echo "$as_me:3544: result: no" >&5
++  echo "$as_me:3548: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3549,16 +3553,16 @@
+ done
+ test -n "$FGREP" || FGREP=": "
+ 
+-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3552: error: cannot find workable fgrep" >&5
++     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3556: error: cannot find workable fgrep" >&5
+ echo "$as_me: error: cannot find workable fgrep" >&2;}
+    { (exit 1); exit 1; }; }
+    fi
+ fi
+-echo "$as_me:3557: result: $ac_cv_path_FGREP" >&5
++echo "$as_me:3561: result: $ac_cv_path_FGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_FGREP" >&6
+  FGREP="$ac_cv_path_FGREP"
+ 
+-echo "$as_me:3561: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:3565: 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.
+@@ -3575,17 +3579,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:3578: result: $enable_stdnoreturn" >&5
++echo "$as_me:3582: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:3582: checking for C11 _Noreturn feature" >&5
++echo "$as_me:3586: 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 3588 "configure"
++#line 3592 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -3601,16 +3605,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3604: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3608: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3607: \$? = $ac_status" >&5
++  echo "$as_me:3611: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3610: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3614: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3613: \$? = $ac_status" >&5
++  echo "$as_me:3617: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -3621,7 +3625,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:3624: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:3628: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -3660,10 +3664,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:3663: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:3667: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -3713,12 +3717,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:3716: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:3720: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3719: \$? = $ac_status" >&5
++  echo "$as_me:3723: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:3721: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:3725: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -3777,7 +3781,7 @@
+ rm -rf ./conftest*
+ fi
+ 
+-echo "$as_me:3780: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:3784: 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.
+@@ -3787,7 +3791,7 @@
+ else
+   enable_string_hacks=no
+ fi;
+-echo "$as_me:3790: result: $enable_string_hacks" >&5
++echo "$as_me:3794: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+ 
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -3796,15 +3800,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:3799: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:3803: 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:3801: checking for strlcat" >&5
++	echo "$as_me:3805: 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 3807 "configure"
++#line 3811 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -3835,16 +3839,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3838: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3842: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3841: \$? = $ac_status" >&5
++  echo "$as_me:3845: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:3844: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3848: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3847: \$? = $ac_status" >&5
++  echo "$as_me:3851: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -3854,7 +3858,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3857: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:3861: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+ 
+@@ -3864,7 +3868,7 @@
+ 
+ else
+ 
+-		echo "$as_me:3867: checking for strlcat in -lbsd" >&5
++		echo "$as_me:3871: 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
+@@ -3872,7 +3876,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3875 "configure"
++#line 3879 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -3891,16 +3895,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3894: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3898: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3897: \$? = $ac_status" >&5
++  echo "$as_me:3901: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:3900: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3904: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3903: \$? = $ac_status" >&5
++  echo "$as_me:3907: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -3911,7 +3915,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:3914: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:3918: 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
+ 
+@@ -3934,23 +3938,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:3937: checking for $ac_header" >&5
++echo "$as_me:3941: 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 3943 "configure"
++#line 3947 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:3947: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3951: \"$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:3953: \$? = $ac_status" >&5
++  echo "$as_me:3957: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3969,7 +3973,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:3972: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:3976: 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:3997: 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 3999 "configure"
++#line 4003 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -4027,16 +4031,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:4030: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4034: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4033: \$? = $ac_status" >&5
++  echo "$as_me:4037: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:4036: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4040: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4039: \$? = $ac_status" >&5
++  echo "$as_me:4043: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -4046,7 +4050,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:4049: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:4053: 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:4065: 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 4068 "configure"
++#line 4072 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4084,16 +4088,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4087: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4091: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4090: \$? = $ac_status" >&5
++  echo "$as_me:4094: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4093: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4097: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4096: \$? = $ac_status" >&5
++  echo "$as_me:4100: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -4104,7 +4108,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4107: result: $cf_cv_posix_visible" >&5
++echo "$as_me:4111: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -4146,14 +4150,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:4149: checking if this is the GNU C library" >&5
++echo "$as_me:4153: 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 4156 "configure"
++#line 4160 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4172,16 +4176,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4175: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4179: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4178: \$? = $ac_status" >&5
++  echo "$as_me:4182: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4181: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4185: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4184: \$? = $ac_status" >&5
++  echo "$as_me:4188: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -4192,7 +4196,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4195: result: $cf_cv_gnu_library" >&5
++echo "$as_me:4199: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -4200,7 +4204,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:4203: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:4207: 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
+@@ -4212,7 +4216,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4215 "configure"
++#line 4219 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4231,16 +4235,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4234: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4238: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4237: \$? = $ac_status" >&5
++  echo "$as_me:4241: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4240: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4244: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4243: \$? = $ac_status" >&5
++  echo "$as_me:4247: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -4252,12 +4256,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:4255: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:4259: 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:4260: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:4264: 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
+@@ -4362,7 +4366,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4365 "configure"
++#line 4369 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -4382,16 +4386,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4385: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4389: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4388: \$? = $ac_status" >&5
++  echo "$as_me:4392: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4391: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4395: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4394: \$? = $ac_status" >&5
++  echo "$as_me:4398: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -4402,7 +4406,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4405: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:4409: 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
+@@ -4411,14 +4415,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:4414: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:4418: 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 4421 "configure"
++#line 4425 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4433,16 +4437,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4436: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4440: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4439: \$? = $ac_status" >&5
++  echo "$as_me:4443: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4442: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4446: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4445: \$? = $ac_status" >&5
++  echo "$as_me:4449: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -4549,7 +4553,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4552 "configure"
++#line 4556 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4564,16 +4568,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4567: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4571: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4570: \$? = $ac_status" >&5
++  echo "$as_me:4574: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4573: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4577: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4576: \$? = $ac_status" >&5
++  echo "$as_me:4580: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -4588,12 +4592,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4591: result: $cf_cv_gnu_source" >&5
++echo "$as_me:4595: 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:4596: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:4600: 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
+@@ -4603,7 +4607,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4606 "configure"
++#line 4610 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4618,16 +4622,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4621: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4625: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4624: \$? = $ac_status" >&5
++  echo "$as_me:4628: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4627: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4631: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4630: \$? = $ac_status" >&5
++  echo "$as_me:4634: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -4638,7 +4642,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4641: result: $cf_cv_default_source" >&5
++echo "$as_me:4645: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -4675,16 +4679,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:4678: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:4682: 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}:4684: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:4688: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4687 "configure"
++#line 4691 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4699,16 +4703,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4702: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4706: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4705: \$? = $ac_status" >&5
++  echo "$as_me:4709: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4708: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4712: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4711: \$? = $ac_status" >&5
++  echo "$as_me:4715: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -4729,7 +4733,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4732 "configure"
++#line 4736 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4744,16 +4748,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4747: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4751: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4750: \$? = $ac_status" >&5
++  echo "$as_me:4754: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4753: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4757: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4756: \$? = $ac_status" >&5
++  echo "$as_me:4760: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -4764,7 +4768,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:4767: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:4771: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -4772,10 +4776,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:4775: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:4779: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4778 "configure"
++#line 4782 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4790,16 +4794,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4793: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4797: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4796: \$? = $ac_status" >&5
++  echo "$as_me:4800: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4799: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4803: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4802: \$? = $ac_status" >&5
++  echo "$as_me:4806: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -4815,7 +4819,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4818: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:4822: 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
+@@ -4932,7 +4936,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:4935: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:4939: 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
+@@ -4964,14 +4968,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:4967: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:4971: 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 4974 "configure"
++#line 4978 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -4989,16 +4993,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4992: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4996: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4995: \$? = $ac_status" >&5
++  echo "$as_me:4999: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4998: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5002: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5001: \$? = $ac_status" >&5
++  echo "$as_me:5005: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -5010,7 +5014,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5013 "configure"
++#line 5017 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -5028,16 +5032,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5031: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5035: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5034: \$? = $ac_status" >&5
++  echo "$as_me:5038: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5037: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5041: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5040: \$? = $ac_status" >&5
++  echo "$as_me:5044: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -5052,7 +5056,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:5055: result: $cf_cv_xopen_source" >&5
++echo "$as_me:5059: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -5212,16 +5216,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:5215: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:5219: 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}:5221: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:5225: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5224 "configure"
++#line 5228 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5236,16 +5240,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5239: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5243: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5242: \$? = $ac_status" >&5
++  echo "$as_me:5246: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5245: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5249: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5248: \$? = $ac_status" >&5
++  echo "$as_me:5252: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -5266,7 +5270,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5269 "configure"
++#line 5273 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5281,16 +5285,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5284: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5288: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5287: \$? = $ac_status" >&5
++  echo "$as_me:5291: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5290: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5294: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5293: \$? = $ac_status" >&5
++  echo "$as_me:5297: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5301,7 +5305,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:5304: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:5308: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -5309,10 +5313,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:5312: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:5316: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5315 "configure"
++#line 5319 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5327,16 +5331,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5330: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5334: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5333: \$? = $ac_status" >&5
++  echo "$as_me:5337: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5336: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5340: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5339: \$? = $ac_status" >&5
++  echo "$as_me:5343: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5352,7 +5356,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:5355: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:5359: 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
+@@ -5465,10 +5469,10 @@
+ 	if test "$cf_cv_xopen_source" = no ; then
+ 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+ 
+-echo "${as_me:-configure}:5468: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:5472: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5471 "configure"
++#line 5475 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -5486,23 +5490,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5489: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5493: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5492: \$? = $ac_status" >&5
++  echo "$as_me:5496: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5495: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5499: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5498: \$? = $ac_status" >&5
++  echo "$as_me:5502: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-			{ echo "$as_me:5505: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++			{ echo "$as_me:5509: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ 			CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -5525,7 +5529,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}:5528: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:5532: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -5537,7 +5541,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}:5540: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:5544: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -5625,7 +5629,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:5628: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:5632: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -5635,7 +5639,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:5638: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:5642: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -5645,7 +5649,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}:5648: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:5652: 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"
+@@ -5657,10 +5661,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:5660: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:5664: 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 5663 "configure"
++#line 5667 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5675,16 +5679,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5678: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5682: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5681: \$? = $ac_status" >&5
++  echo "$as_me:5685: \$? = $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:5688: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5687: \$? = $ac_status" >&5
++  echo "$as_me:5691: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -5693,12 +5697,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:5696: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:5700: 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 5701 "configure"
++#line 5705 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5713,16 +5717,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5716: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5720: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5719: \$? = $ac_status" >&5
++  echo "$as_me:5723: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5722: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5726: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5725: \$? = $ac_status" >&5
++  echo "$as_me:5729: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -5733,19 +5737,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:5736: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:5740: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:5741: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:5745: 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 5748 "configure"
++#line 5752 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -5763,16 +5767,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5766: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5770: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5769: \$? = $ac_status" >&5
++  echo "$as_me:5773: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5772: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5776: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5775: \$? = $ac_status" >&5
++  echo "$as_me:5779: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -5784,7 +5788,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5787 "configure"
++#line 5791 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -5802,16 +5806,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5805: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5809: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5808: \$? = $ac_status" >&5
++  echo "$as_me:5812: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5811: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5815: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5814: \$? = $ac_status" >&5
++  echo "$as_me:5818: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -5826,7 +5830,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:5829: result: $cf_cv_xopen_source" >&5
++echo "$as_me:5833: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -5973,13 +5977,13 @@
+ fi
+ fi # cf_cv_posix_visible
+ 
+-echo "$as_me:5976: checking for ANSI C header files" >&5
++echo "$as_me:5980: 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 5982 "configure"
++#line 5986 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -5987,13 +5991,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:5990: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:5994: \"$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:5996: \$? = $ac_status" >&5
++  echo "$as_me:6000: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6015,7 +6019,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 6018 "configure"
++#line 6022 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6033,7 +6037,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 6036 "configure"
++#line 6040 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6054,7 +6058,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6057 "configure"
++#line 6061 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -6080,15 +6084,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6083: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6087: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6086: \$? = $ac_status" >&5
++  echo "$as_me:6090: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:6088: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6092: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6091: \$? = $ac_status" >&5
++  echo "$as_me:6095: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6101,7 +6105,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:6104: result: $ac_cv_header_stdc" >&5
++echo "$as_me:6108: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -6117,28 +6121,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6120: checking for $ac_header" >&5
++echo "$as_me:6124: 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 6126 "configure"
++#line 6130 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6132: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6136: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6135: \$? = $ac_status" >&5
++  echo "$as_me:6139: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6138: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6142: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6141: \$? = $ac_status" >&5
++  echo "$as_me:6145: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -6148,7 +6152,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6151: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6155: 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:6165: checking whether exit is declared" >&5
+ echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
+ if test "${ac_cv_have_decl_exit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6167 "configure"
++#line 6171 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -6179,16 +6183,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6182: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6186: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6185: \$? = $ac_status" >&5
++  echo "$as_me:6189: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6188: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6192: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6191: \$? = $ac_status" >&5
++  echo "$as_me:6195: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_have_decl_exit=yes
+ else
+@@ -6198,10 +6202,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6201: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:6205: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+ 
+-echo "$as_me:6204: checking for signal global datatype" >&5
++echo "$as_me:6208: 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
+@@ -6213,7 +6217,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6216 "configure"
++#line 6220 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -6237,16 +6241,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6240: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6244: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6243: \$? = $ac_status" >&5
++  echo "$as_me:6247: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6246: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6250: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6249: \$? = $ac_status" >&5
++  echo "$as_me:6253: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -6260,7 +6264,7 @@
+ 
+ fi
+ 
+-echo "$as_me:6263: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:6267: 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:6276: 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 6279 "configure"
++#line 6283 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -6291,23 +6295,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6294: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6298: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6297: \$? = $ac_status" >&5
++  echo "$as_me:6301: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6300: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6304: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6303: \$? = $ac_status" >&5
++  echo "$as_me:6307: \$? = $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 6310 "configure"
++#line 6314 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -6325,16 +6329,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6328: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6332: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6331: \$? = $ac_status" >&5
++  echo "$as_me:6335: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6334: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6338: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6337: \$? = $ac_status" >&5
++  echo "$as_me:6341: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -6348,11 +6352,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:6351: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:6355: 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:6355: checking for actual SIGWINCH definition" >&5
++echo "$as_me:6359: 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
+@@ -6363,7 +6367,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6366 "configure"
++#line 6370 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -6385,16 +6389,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6388: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6392: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6391: \$? = $ac_status" >&5
++  echo "$as_me:6395: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6394: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6398: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6397: \$? = $ac_status" >&5
++  echo "$as_me:6401: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -6408,7 +6412,7 @@
+ done
+ 
+ fi
+-echo "$as_me:6411: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:6415: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -6418,13 +6422,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:6421: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:6425: 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 6427 "configure"
++#line 6431 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -6438,16 +6442,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6441: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6445: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6444: \$? = $ac_status" >&5
++  echo "$as_me:6448: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6447: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6451: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6450: \$? = $ac_status" >&5
++  echo "$as_me:6454: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -6458,7 +6462,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:6461: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:6465: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test "$am_cv_langinfo_codeset" = yes; then
+ 
+@@ -6468,7 +6472,7 @@
+ 
+ 	fi
+ 
+-echo "$as_me:6471: checking if you want to use pkg-config" >&5
++echo "$as_me:6475: 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.
+@@ -6478,7 +6482,7 @@
+ else
+   cf_pkg_config=yes
+ fi;
+-echo "$as_me:6481: result: $cf_pkg_config" >&5
++echo "$as_me:6485: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+ 
+ case "$cf_pkg_config" in
+@@ -6490,7 +6494,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:6493: checking for $ac_word" >&5
++echo "$as_me:6497: 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
+@@ -6507,7 +6511,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:6510: found $ac_dir/$ac_word" >&5
++   echo "$as_me:6514: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -6518,10 +6522,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:6521: result: $PKG_CONFIG" >&5
++  echo "$as_me:6525: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+-  echo "$as_me:6524: result: no" >&5
++  echo "$as_me:6528: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6530,7 +6534,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:6533: checking for $ac_word" >&5
++echo "$as_me:6537: 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
+@@ -6547,7 +6551,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:6550: found $ac_dir/$ac_word" >&5
++   echo "$as_me:6554: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -6559,10 +6563,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ 
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  echo "$as_me:6562: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:6566: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+-  echo "$as_me:6565: result: no" >&5
++  echo "$as_me:6569: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6605,18 +6609,18 @@
+ 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:6608: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++	{ { echo "$as_me:6612: 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:6615: WARNING: pkg-config is not installed" >&5
++	{ echo "$as_me:6619: WARNING: pkg-config is not installed" >&5
+ echo "$as_me: WARNING: pkg-config is not installed" >&2;}
+ fi
+ 
+-echo "$as_me:6619: checking if you want to see long compiling messages" >&5
++echo "$as_me:6623: 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.
+@@ -6650,10 +6654,10 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:6653: result: $enableval" >&5
++echo "$as_me:6657: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+-echo "$as_me:6656: checking for ncurses wrap-prefix" >&5
++echo "$as_me:6660: checking for ncurses wrap-prefix" >&5
+ echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given.
+@@ -6663,10 +6667,10 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-echo "$as_me:6666: result: $NCURSES_WRAP_PREFIX" >&5
++echo "$as_me:6670: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ 
+-echo "$as_me:6669: checking if you want to check for wide-character functions" >&5
++echo "$as_me:6673: checking if you want to check for wide-character functions" >&5
+ echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-widec or --disable-widec was given.
+@@ -6683,10 +6687,10 @@
+ 	cf_enable_widec=yes
+ 
+ fi;
+-echo "$as_me:6686: result: $cf_enable_widec" >&5
++echo "$as_me:6690: result: $cf_enable_widec" >&5
+ echo "${ECHO_T}$cf_enable_widec" >&6
+ 
+-echo "$as_me:6689: checking for specific curses-directory" >&5
++echo "$as_me:6693: 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.
+@@ -6696,7 +6700,7 @@
+ else
+   cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:6699: result: $cf_cv_curses_dir" >&5
++echo "$as_me:6703: 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"
+@@ -6727,7 +6731,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:6730: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:6734: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -6763,7 +6767,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6766 "configure"
++#line 6770 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6775,16 +6779,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6778: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6782: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6781: \$? = $ac_status" >&5
++  echo "$as_me:6785: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6784: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6788: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6787: \$? = $ac_status" >&5
++  echo "$as_me:6791: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6801,7 +6805,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}:6804: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6808: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -6837,7 +6841,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}:6840: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6844: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -6850,7 +6854,7 @@
+ 
+ cf_cv_screen=curses
+ 
+-echo "$as_me:6853: checking for specified curses library type" >&5
++echo "$as_me:6857: checking for specified curses library type" >&5
+ echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
+ 
+ # Check whether --with-screen or --without-screen was given.
+@@ -6894,13 +6898,13 @@
+ fi;
+ fi;
+ 
+-echo "$as_me:6897: result: $cf_cv_screen" >&5
++echo "$as_me:6901: result: $cf_cv_screen" >&5
+ echo "${ECHO_T}$cf_cv_screen" >&6
+ 
+ case $cf_cv_screen in
+ (curses|curses_*)
+ 
+-echo "$as_me:6903: checking for extra include directories" >&5
++echo "$as_me:6907: checking for extra include directories" >&5
+ echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
+ if test "${cf_cv_curses_incdir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6926,7 +6930,7 @@
+ esac
+ 
+ fi
+-echo "$as_me:6929: result: $cf_cv_curses_incdir" >&5
++echo "$as_me:6933: result: $cf_cv_curses_incdir" >&5
+ echo "${ECHO_T}$cf_cv_curses_incdir" >&6
+ if test "$cf_cv_curses_incdir" != no
+ then
+@@ -6936,7 +6940,7 @@
+ 
+ fi
+ 
+-echo "$as_me:6939: checking if we have identified curses headers" >&5
++echo "$as_me:6943: 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
+@@ -6948,7 +6952,7 @@
+ 	curses.h  ncurses/ncurses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6951 "configure"
++#line 6955 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -6960,16 +6964,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6963: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6967: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6966: \$? = $ac_status" >&5
++  echo "$as_me:6970: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6969: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6973: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6972: \$? = $ac_status" >&5
++  echo "$as_me:6976: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -6980,11 +6984,11 @@
+ done
+ 
+ fi
+-echo "$as_me:6983: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:6987: 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:6987: error: No curses header-files found" >&5
++	{ { echo "$as_me:6991: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6994,23 +6998,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:6997: checking for $ac_header" >&5
++echo "$as_me:7001: 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 7003 "configure"
++#line 7007 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7007: \"$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:7013: \$? = $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
+@@ -7029,7 +7033,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7032: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7036: 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:7046: 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
+@@ -7057,7 +7061,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7060 "configure"
++#line 7064 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -7072,16 +7076,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7075: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7079: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7078: \$? = $ac_status" >&5
++  echo "$as_me:7082: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7081: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7085: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7084: \$? = $ac_status" >&5
++  echo "$as_me:7088: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -7097,7 +7101,7 @@
+ done
+ 
+ fi
+-echo "$as_me:7100: result: $cf_cv_term_header" >&5
++echo "$as_me:7104: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -7129,7 +7133,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:7132: checking for ncurses version" >&5
++echo "$as_me:7136: 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
+@@ -7155,10 +7159,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:7158: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:7162: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7161: \$? = $ac_status" >&5
++  echo "$as_me:7165: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -7168,7 +7172,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7171 "configure"
++#line 7175 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -7195,15 +7199,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:7198: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7202: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7201: \$? = $ac_status" >&5
++  echo "$as_me:7205: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:7203: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7207: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7206: \$? = $ac_status" >&5
++  echo "$as_me:7210: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -7217,17 +7221,17 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:7220: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:7224: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:7227: checking if we have identified curses libraries" >&5
++echo "$as_me:7231: checking if we have identified curses libraries" >&5
+ echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7230 "configure"
++#line 7234 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7239,16 +7243,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7242: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7246: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7245: \$? = $ac_status" >&5
++  echo "$as_me:7249: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7248: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7252: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7251: \$? = $ac_status" >&5
++  echo "$as_me:7255: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -7257,13 +7261,13 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-echo "$as_me:7260: result: $cf_result" >&5
++echo "$as_me:7264: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test "$cf_result" = no ; then
+ case "$host_os" in
+ (freebsd*)
+-	echo "$as_me:7266: checking for tgoto in -lmytinfo" >&5
++	echo "$as_me:7270: 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
+@@ -7271,7 +7275,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7274 "configure"
++#line 7278 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7290,16 +7294,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7293: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7297: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7296: \$? = $ac_status" >&5
++  echo "$as_me:7300: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7299: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7303: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7302: \$? = $ac_status" >&5
++  echo "$as_me:7306: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -7310,7 +7314,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7313: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:7317: 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
+ 
+@@ -7340,7 +7344,7 @@
+ 	# term.h) for cur_colr
+ 	if test "x$cf_cv_screen" = "xcurses_colr"
+ 	then
+-		echo "$as_me:7343: checking for initscr in -lcur_colr" >&5
++		echo "$as_me:7347: checking for initscr in -lcur_colr" >&5
+ echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
+ if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7348,7 +7352,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcur_colr  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7351 "configure"
++#line 7355 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7367,16 +7371,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7370: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7374: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7373: \$? = $ac_status" >&5
++  echo "$as_me:7377: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7376: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7380: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7379: \$? = $ac_status" >&5
++  echo "$as_me:7383: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_cur_colr_initscr=yes
+ else
+@@ -7387,7 +7391,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7390: result: $ac_cv_lib_cur_colr_initscr" >&5
++echo "$as_me:7394: result: $ac_cv_lib_cur_colr_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
+ if test "$ac_cv_lib_cur_colr_initscr" = yes; then
+ 
+@@ -7411,7 +7415,7 @@
+ 
+ else
+ 
+-		echo "$as_me:7414: checking for initscr in -lHcurses" >&5
++		echo "$as_me:7418: checking for initscr in -lHcurses" >&5
+ echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
+ if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7419,7 +7423,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lHcurses  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7422 "configure"
++#line 7426 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7438,16 +7442,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7441: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7445: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7444: \$? = $ac_status" >&5
++  echo "$as_me:7448: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7447: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7451: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7450: \$? = $ac_status" >&5
++  echo "$as_me:7454: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_Hcurses_initscr=yes
+ else
+@@ -7458,7 +7462,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7461: result: $ac_cv_lib_Hcurses_initscr" >&5
++echo "$as_me:7465: result: $ac_cv_lib_Hcurses_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
+ if test "$ac_cv_lib_Hcurses_initscr" = yes; then
+ 
+@@ -7516,7 +7520,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}:7519: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7523: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7545,7 +7549,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}:7548: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7552: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7576,7 +7580,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}:7579: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7583: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7611,7 +7615,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}:7614: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7618: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7655,13 +7659,13 @@
+ 	# because it may be needed to link the test-case for initscr.
+ 	if test "x$cf_term_lib" = x
+ 	then
+-		echo "$as_me:7658: checking for tgoto" >&5
++		echo "$as_me:7662: checking for tgoto" >&5
+ echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
+ if test "${ac_cv_func_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7664 "configure"
++#line 7668 "configure"
+ #include "confdefs.h"
+ #define tgoto autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7692,16 +7696,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7695: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7699: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7698: \$? = $ac_status" >&5
++  echo "$as_me:7702: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7701: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7705: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7704: \$? = $ac_status" >&5
++  echo "$as_me:7708: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_tgoto=yes
+ else
+@@ -7711,7 +7715,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7714: result: $ac_cv_func_tgoto" >&5
++echo "$as_me:7718: result: $ac_cv_func_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_func_tgoto" >&6
+ if test "$ac_cv_func_tgoto" = yes; then
+   cf_term_lib=predefined
+@@ -7720,7 +7724,7 @@
+ 			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
+ 			do
+ 				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
+-echo "$as_me:7723: checking for tgoto in -l$cf_term_lib" >&5
++echo "$as_me:7727: checking for tgoto in -l$cf_term_lib" >&5
+ echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7728,7 +7732,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_term_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7731 "configure"
++#line 7735 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7747,16 +7751,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7750: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7754: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7753: \$? = $ac_status" >&5
++  echo "$as_me:7757: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7756: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7760: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7759: \$? = $ac_status" >&5
++  echo "$as_me:7763: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -7767,7 +7771,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7770: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:7774: 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
+ 
+@@ -7790,10 +7794,10 @@
+ 		do
+ 			LIBS="-l$cf_curs_lib $cf_save_LIBS"
+ 			if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
+-				echo "$as_me:7793: checking if we can link with $cf_curs_lib library" >&5
++				echo "$as_me:7797: checking if we can link with $cf_curs_lib library" >&5
+ echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7796 "configure"
++#line 7800 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7805,16 +7809,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7808: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7812: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7811: \$? = $ac_status" >&5
++  echo "$as_me:7815: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7814: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7818: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7817: \$? = $ac_status" >&5
++  echo "$as_me:7821: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -7823,16 +7827,16 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-				echo "$as_me:7826: result: $cf_result" >&5
++				echo "$as_me:7830: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 				test "$cf_result" = yes && break
+ 			elif test "$cf_curs_lib" = "$cf_term_lib" ; then
+ 				cf_result=no
+ 			elif test "$cf_term_lib" != predefined ; then
+-				echo "$as_me:7832: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
++				echo "$as_me:7836: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+ echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7835 "configure"
++#line 7839 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7844,16 +7848,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7847: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7851: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7850: \$? = $ac_status" >&5
++  echo "$as_me:7854: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7853: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7857: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7856: \$? = $ac_status" >&5
++  echo "$as_me:7860: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=no
+ else
+@@ -7862,7 +7866,7 @@
+ 
+ 					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
+ 					cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7865 "configure"
++#line 7869 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7874,16 +7878,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7877: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7881: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7880: \$? = $ac_status" >&5
++  echo "$as_me:7884: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7883: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7887: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7886: \$? = $ac_status" >&5
++  echo "$as_me:7890: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -7895,13 +7899,13 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-				echo "$as_me:7898: result: $cf_result" >&5
++				echo "$as_me:7902: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 				test "$cf_result" != error && break
+ 			fi
+ 		done
+ 	fi
+-	test "$cf_curs_lib" = unknown && { { echo "$as_me:7904: error: no curses library found" >&5
++	test "$cf_curs_lib" = unknown && { { echo "$as_me:7908: error: no curses library found" >&5
+ echo "$as_me: error: no curses library found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7913,23 +7917,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7916: checking for $ac_header" >&5
++echo "$as_me:7920: 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 7922 "configure"
++#line 7926 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7926: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7930: \"$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:7932: \$? = $ac_status" >&5
++  echo "$as_me:7936: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7948,7 +7952,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7951: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7955: 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:7965: 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
+@@ -7966,7 +7970,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7969 "configure"
++#line 7973 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -7983,16 +7987,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7986: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7990: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7989: \$? = $ac_status" >&5
++  echo "$as_me:7993: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7992: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7996: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7995: \$? = $ac_status" >&5
++  echo "$as_me:7999: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -8004,12 +8008,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:8007: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8011: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8012 "configure"
++#line 8016 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8022,16 +8026,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8025: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8029: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8028: \$? = $ac_status" >&5
++  echo "$as_me:8032: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8031: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8035: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8034: \$? = $ac_status" >&5
++  echo "$as_me:8038: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -8045,7 +8049,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8048 "configure"
++#line 8052 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8058,16 +8062,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8061: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8065: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8064: \$? = $ac_status" >&5
++  echo "$as_me:8068: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8067: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8071: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8070: \$? = $ac_status" >&5
++  echo "$as_me:8074: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -8084,9 +8088,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:8087: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:8091: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:8089: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8093: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -8177,7 +8181,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}:8180: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8184: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -8185,7 +8189,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8188 "configure"
++#line 8192 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8198,21 +8202,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8201: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8205: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8204: \$? = $ac_status" >&5
++  echo "$as_me:8208: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8207: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8211: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8210: \$? = $ac_status" >&5
++  echo "$as_me:8214: \$? = $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}:8215: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8219: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -8230,7 +8234,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:8233: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8237: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -8305,13 +8309,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}:8308: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8312: 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 8314 "configure"
++#line 8318 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8324,21 +8328,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8327: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8331: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8330: \$? = $ac_status" >&5
++  echo "$as_me:8334: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8333: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8337: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8336: \$? = $ac_status" >&5
++  echo "$as_me:8340: \$? = $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}:8341: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8345: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -8380,7 +8384,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8383: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:8387: 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
+@@ -8418,7 +8422,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8421 "configure"
++#line 8425 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8430,16 +8434,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8433: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8437: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8436: \$? = $ac_status" >&5
++  echo "$as_me:8440: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8439: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8443: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8442: \$? = $ac_status" >&5
++  echo "$as_me:8446: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -8456,7 +8460,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}:8459: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8463: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8492,7 +8496,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}:8495: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:8499: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -8522,13 +8526,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:8525: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:8529: 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:8528: result: yes" >&5
++		echo "$as_me:8532: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:8531: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:8535: 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
+ 
+@@ -8661,7 +8665,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8664 "configure"
++#line 8668 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8673,37 +8677,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8676: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8680: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8679: \$? = $ac_status" >&5
++  echo "$as_me:8683: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8682: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8686: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8685: \$? = $ac_status" >&5
++  echo "$as_me:8689: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8691 "configure"
++#line 8695 "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:8698: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8702: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8701: \$? = $ac_status" >&5
++  echo "$as_me:8705: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:8703: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8707: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8706: \$? = $ac_status" >&5
++  echo "$as_me:8710: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -8877,7 +8881,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8880 "configure"
++#line 8884 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8889,37 +8893,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8892: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8896: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8895: \$? = $ac_status" >&5
++  echo "$as_me:8899: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8898: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8902: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8901: \$? = $ac_status" >&5
++  echo "$as_me:8905: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8907 "configure"
++#line 8911 "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:8914: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8918: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8917: \$? = $ac_status" >&5
++  echo "$as_me:8921: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:8919: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8923: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8922: \$? = $ac_status" >&5
++  echo "$as_me:8926: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -8936,7 +8940,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:8939: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:8943: 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"
+@@ -8952,7 +8956,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:8955: checking for terminfo header" >&5
++echo "$as_me:8959: 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
+@@ -8970,7 +8974,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8973 "configure"
++#line 8977 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8985,16 +8989,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8988: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8992: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8991: \$? = $ac_status" >&5
++  echo "$as_me:8995: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8994: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8998: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8997: \$? = $ac_status" >&5
++  echo "$as_me:9001: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -9010,7 +9014,7 @@
+ done
+ 
+ fi
+-echo "$as_me:9013: result: $cf_cv_term_header" >&5
++echo "$as_me:9017: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9045,7 +9049,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:9048: result: no" >&5
++		echo "$as_me:9052: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -9061,7 +9065,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:9064: checking for $ac_word" >&5
++echo "$as_me:9068: 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
+@@ -9076,7 +9080,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:9079: found $ac_dir/$ac_word" >&5
++echo "$as_me:9083: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9084,10 +9088,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:9087: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:9091: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:9090: result: no" >&5
++  echo "$as_me:9094: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9100,7 +9104,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:9103: checking for $ac_word" >&5
++echo "$as_me:9107: 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
+@@ -9115,7 +9119,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:9118: found $ac_dir/$ac_word" >&5
++echo "$as_me:9122: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9123,10 +9127,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:9126: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:9130: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:9129: result: no" >&5
++  echo "$as_me:9133: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9283,7 +9287,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:9286: checking if we have identified curses headers" >&5
++echo "$as_me:9290: 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
+@@ -9295,7 +9299,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9298 "configure"
++#line 9302 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -9307,16 +9311,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9310: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9314: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9313: \$? = $ac_status" >&5
++  echo "$as_me:9317: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9316: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9320: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9319: \$? = $ac_status" >&5
++  echo "$as_me:9323: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -9327,11 +9331,11 @@
+ done
+ 
+ fi
+-echo "$as_me:9330: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:9334: 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:9334: error: No curses header-files found" >&5
++	{ { echo "$as_me:9338: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -9341,23 +9345,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:9344: checking for $ac_header" >&5
++echo "$as_me:9348: 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 9350 "configure"
++#line 9354 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:9354: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:9358: \"$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:9360: \$? = $ac_status" >&5
++  echo "$as_me:9364: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9376,7 +9380,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:9379: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:9383: 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 9435 "configure"
++#line 9439 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9444,16 +9448,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9447: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9451: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9450: \$? = $ac_status" >&5
++  echo "$as_me:9454: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9453: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9457: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9456: \$? = $ac_status" >&5
++  echo "$as_me:9460: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9470,7 +9474,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}:9473: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9477: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9489,7 +9493,7 @@
+ 
+ }
+ 
+-echo "$as_me:9492: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:9496: 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
+@@ -9501,7 +9505,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9504 "configure"
++#line 9508 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -9525,16 +9529,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9528: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9532: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9531: \$? = $ac_status" >&5
++  echo "$as_me:9535: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9534: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9538: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9537: \$? = $ac_status" >&5
++  echo "$as_me:9541: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -9549,14 +9553,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:9552: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:9556: 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:9559: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:9563: 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
+@@ -9677,7 +9681,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9680 "configure"
++#line 9684 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9689,16 +9693,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9692: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9696: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9695: \$? = $ac_status" >&5
++  echo "$as_me:9699: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9698: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9702: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9701: \$? = $ac_status" >&5
++  echo "$as_me:9705: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9715,7 +9719,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}:9718: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9722: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9738,7 +9742,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9741 "configure"
++#line 9745 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -9762,16 +9766,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9765: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9769: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9768: \$? = $ac_status" >&5
++  echo "$as_me:9772: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9771: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9775: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9774: \$? = $ac_status" >&5
++  echo "$as_me:9778: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -9792,12 +9796,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9795: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9799: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:9800: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:9804: 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%/[^/]*$%%'`
+@@ -9833,7 +9837,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9836 "configure"
++#line 9840 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9845,16 +9849,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9848: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9852: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9851: \$? = $ac_status" >&5
++  echo "$as_me:9855: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9854: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9858: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9857: \$? = $ac_status" >&5
++  echo "$as_me:9861: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9871,7 +9875,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}:9874: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9878: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9919,7 +9923,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9922: checking for terminfo header" >&5
++echo "$as_me:9926: 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
+@@ -9937,7 +9941,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9940 "configure"
++#line 9944 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9952,16 +9956,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9955: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9959: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9958: \$? = $ac_status" >&5
++  echo "$as_me:9962: \$? = $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:9965: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9964: \$? = $ac_status" >&5
++  echo "$as_me:9968: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -9977,7 +9981,7 @@
+ done
+ 
+ fi
+-echo "$as_me:9980: result: $cf_cv_term_header" >&5
++echo "$as_me:9984: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10015,7 +10019,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:10018: checking for ncurses version" >&5
++echo "$as_me:10022: 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
+@@ -10041,10 +10045,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:10044: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:10048: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10047: \$? = $ac_status" >&5
++  echo "$as_me:10051: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -10054,7 +10058,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10057 "configure"
++#line 10061 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -10081,15 +10085,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10084: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10088: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10087: \$? = $ac_status" >&5
++  echo "$as_me:10091: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10089: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10093: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10092: \$? = $ac_status" >&5
++  echo "$as_me:10096: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -10103,7 +10107,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:10106: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:10110: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -10116,7 +10120,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:10119: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:10123: 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
+@@ -10124,7 +10128,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10127 "configure"
++#line 10131 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10143,16 +10147,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10146: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10150: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10149: \$? = $ac_status" >&5
++  echo "$as_me:10153: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10152: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10156: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10155: \$? = $ac_status" >&5
++  echo "$as_me:10159: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -10163,10 +10167,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10166: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:10170: 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:10169: checking for initscr in -lgpm" >&5
++  echo "$as_me:10173: 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
+@@ -10174,7 +10178,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10177 "configure"
++#line 10181 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10193,16 +10197,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10196: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10200: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10199: \$? = $ac_status" >&5
++  echo "$as_me:10203: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10202: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10206: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10205: \$? = $ac_status" >&5
++  echo "$as_me:10209: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -10213,7 +10217,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10216: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:10220: 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"
+@@ -10228,7 +10232,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:10231: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:10235: 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
+@@ -10236,7 +10240,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10239 "configure"
++#line 10243 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10255,16 +10259,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10258: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10262: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10261: \$? = $ac_status" >&5
++  echo "$as_me:10265: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10264: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10268: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10267: \$? = $ac_status" >&5
++  echo "$as_me:10271: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -10275,7 +10279,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10278: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:10282: 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"
+@@ -10324,13 +10328,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:10327: checking for initscr" >&5
++	echo "$as_me:10331: 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 10333 "configure"
++#line 10337 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10361,16 +10365,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10364: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10368: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10367: \$? = $ac_status" >&5
++  echo "$as_me:10371: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10370: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10374: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10373: \$? = $ac_status" >&5
++  echo "$as_me:10377: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -10380,18 +10384,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10383: result: $ac_cv_func_initscr" >&5
++echo "$as_me:10387: 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:10390: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:10394: 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 10394 "configure"
++#line 10398 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10403,25 +10407,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10406: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10410: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10409: \$? = $ac_status" >&5
++  echo "$as_me:10413: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10412: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10416: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10415: \$? = $ac_status" >&5
++  echo "$as_me:10419: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:10417: result: yes" >&5
++  echo "$as_me:10421: 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:10424: result: no" >&5
++echo "$as_me:10428: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -10489,11 +10493,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:10492: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:10496: 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 10496 "configure"
++#line 10500 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10505,25 +10509,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10508: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10512: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10511: \$? = $ac_status" >&5
++  echo "$as_me:10515: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10514: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10518: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10517: \$? = $ac_status" >&5
++  echo "$as_me:10521: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:10519: result: yes" >&5
++  echo "$as_me:10523: 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:10526: result: no" >&5
++echo "$as_me:10530: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -10538,7 +10542,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:10541: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:10545: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -10546,7 +10550,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:10549: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:10553: 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
+@@ -10556,7 +10560,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10559 "configure"
++#line 10563 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10568,23 +10572,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10571: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10575: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10574: \$? = $ac_status" >&5
++  echo "$as_me:10578: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10577: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10581: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10580: \$? = $ac_status" >&5
++  echo "$as_me:10584: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:10582: result: yes" >&5
++  echo "$as_me:10586: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:10587: result: no" >&5
++echo "$as_me:10591: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -10609,13 +10613,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:10612: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:10616: 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:10615: result: yes" >&5
++		echo "$as_me:10619: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:10618: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:10622: 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
+ 
+@@ -10748,7 +10752,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10751 "configure"
++#line 10755 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10760,37 +10764,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10763: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10767: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10766: \$? = $ac_status" >&5
++  echo "$as_me:10770: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10769: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10773: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10772: \$? = $ac_status" >&5
++  echo "$as_me:10776: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10778 "configure"
++#line 10782 "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:10785: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10789: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10788: \$? = $ac_status" >&5
++  echo "$as_me:10792: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10790: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10794: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10793: \$? = $ac_status" >&5
++  echo "$as_me:10797: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -10964,7 +10968,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10967 "configure"
++#line 10971 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10976,37 +10980,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10979: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10983: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10982: \$? = $ac_status" >&5
++  echo "$as_me:10986: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10985: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10989: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10988: \$? = $ac_status" >&5
++  echo "$as_me:10992: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10994 "configure"
++#line 10998 "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:11001: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11005: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11004: \$? = $ac_status" >&5
++  echo "$as_me:11008: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:11006: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11010: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11009: \$? = $ac_status" >&5
++  echo "$as_me:11013: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -11023,7 +11027,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:11026: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:11030: 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"
+@@ -11039,7 +11043,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:11042: checking for terminfo header" >&5
++echo "$as_me:11046: 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
+@@ -11057,7 +11061,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11060 "configure"
++#line 11064 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -11072,16 +11076,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11075: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11079: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11078: \$? = $ac_status" >&5
++  echo "$as_me:11082: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11081: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11085: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11084: \$? = $ac_status" >&5
++  echo "$as_me:11088: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -11097,7 +11101,7 @@
+ done
+ 
+ fi
+-echo "$as_me:11100: result: $cf_cv_term_header" >&5
++echo "$as_me:11104: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -11132,7 +11136,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:11135: result: no" >&5
++		echo "$as_me:11139: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -11148,7 +11152,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:11151: checking for $ac_word" >&5
++echo "$as_me:11155: 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
+@@ -11163,7 +11167,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:11166: found $ac_dir/$ac_word" >&5
++echo "$as_me:11170: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -11171,10 +11175,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:11174: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:11178: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:11177: result: no" >&5
++  echo "$as_me:11181: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -11187,7 +11191,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:11190: checking for $ac_word" >&5
++echo "$as_me:11194: 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
+@@ -11202,7 +11206,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:11205: found $ac_dir/$ac_word" >&5
++echo "$as_me:11209: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -11210,10 +11214,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:11213: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:11217: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:11216: result: no" >&5
++  echo "$as_me:11220: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -11370,7 +11374,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:11373: checking if we have identified curses headers" >&5
++echo "$as_me:11377: 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
+@@ -11382,7 +11386,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11385 "configure"
++#line 11389 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -11394,16 +11398,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11397: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11401: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11400: \$? = $ac_status" >&5
++  echo "$as_me:11404: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11403: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11407: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11406: \$? = $ac_status" >&5
++  echo "$as_me:11410: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -11414,11 +11418,11 @@
+ done
+ 
+ fi
+-echo "$as_me:11417: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:11421: 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:11421: error: No curses header-files found" >&5
++	{ { echo "$as_me:11425: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -11428,23 +11432,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:11431: checking for $ac_header" >&5
++echo "$as_me:11435: 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 11437 "configure"
++#line 11441 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:11441: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:11445: \"$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:11447: \$? = $ac_status" >&5
++  echo "$as_me:11451: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11463,7 +11467,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:11466: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:11470: 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 11522 "configure"
++#line 11526 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11531,16 +11535,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11534: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11538: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11537: \$? = $ac_status" >&5
++  echo "$as_me:11541: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11540: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11544: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11543: \$? = $ac_status" >&5
++  echo "$as_me:11547: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11557,7 +11561,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}:11560: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11564: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -11576,7 +11580,7 @@
+ 
+ }
+ 
+-echo "$as_me:11579: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:11583: 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
+@@ -11588,7 +11592,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11591 "configure"
++#line 11595 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -11612,16 +11616,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11615: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11619: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11618: \$? = $ac_status" >&5
++  echo "$as_me:11622: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11621: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11625: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11624: \$? = $ac_status" >&5
++  echo "$as_me:11628: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -11636,14 +11640,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:11639: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:11643: 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:11646: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:11650: 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
+@@ -11764,7 +11768,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11767 "configure"
++#line 11771 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11776,16 +11780,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11779: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11783: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11782: \$? = $ac_status" >&5
++  echo "$as_me:11786: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11785: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11789: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11788: \$? = $ac_status" >&5
++  echo "$as_me:11792: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11802,7 +11806,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}:11805: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11809: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -11825,7 +11829,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11828 "configure"
++#line 11832 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -11849,16 +11853,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11852: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11856: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11855: \$? = $ac_status" >&5
++  echo "$as_me:11859: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11858: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11862: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11861: \$? = $ac_status" >&5
++  echo "$as_me:11865: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -11879,12 +11883,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11882: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11886: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:11887: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:11891: 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%/[^/]*$%%'`
+@@ -11920,7 +11924,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11923 "configure"
++#line 11927 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11932,16 +11936,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11935: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11939: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11938: \$? = $ac_status" >&5
++  echo "$as_me:11942: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11941: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11945: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11944: \$? = $ac_status" >&5
++  echo "$as_me:11948: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11958,7 +11962,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}:11961: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11965: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -12006,7 +12010,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:12009: checking for terminfo header" >&5
++echo "$as_me:12013: 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
+@@ -12024,7 +12028,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12027 "configure"
++#line 12031 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -12039,16 +12043,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12042: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12046: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12045: \$? = $ac_status" >&5
++  echo "$as_me:12049: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12048: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12052: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12051: \$? = $ac_status" >&5
++  echo "$as_me:12055: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -12064,7 +12068,7 @@
+ done
+ 
+ fi
+-echo "$as_me:12067: result: $cf_cv_term_header" >&5
++echo "$as_me:12071: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -12102,7 +12106,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:12105: checking for ncurses version" >&5
++echo "$as_me:12109: 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
+@@ -12128,10 +12132,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:12131: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:12135: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12134: \$? = $ac_status" >&5
++  echo "$as_me:12138: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -12141,7 +12145,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12144 "configure"
++#line 12148 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12168,15 +12172,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:12171: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12175: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12174: \$? = $ac_status" >&5
++  echo "$as_me:12178: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:12176: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12180: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12179: \$? = $ac_status" >&5
++  echo "$as_me:12183: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -12190,7 +12194,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:12193: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:12197: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -12203,7 +12207,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:12206: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:12210: 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
+@@ -12211,7 +12215,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12214 "configure"
++#line 12218 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12230,16 +12234,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12233: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12237: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12236: \$? = $ac_status" >&5
++  echo "$as_me:12240: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12239: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12243: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12242: \$? = $ac_status" >&5
++  echo "$as_me:12246: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -12250,10 +12254,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12253: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:12257: 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:12256: checking for initscr in -lgpm" >&5
++  echo "$as_me:12260: 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
+@@ -12261,7 +12265,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12264 "configure"
++#line 12268 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12280,16 +12284,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12283: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12287: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12286: \$? = $ac_status" >&5
++  echo "$as_me:12290: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12289: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12293: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12292: \$? = $ac_status" >&5
++  echo "$as_me:12296: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -12300,7 +12304,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12303: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:12307: 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"
+@@ -12315,7 +12319,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:12318: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:12322: 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
+@@ -12323,7 +12327,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12326 "configure"
++#line 12330 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12342,16 +12346,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12345: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12349: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12348: \$? = $ac_status" >&5
++  echo "$as_me:12352: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12351: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12355: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12354: \$? = $ac_status" >&5
++  echo "$as_me:12358: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -12362,7 +12366,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12365: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:12369: 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"
+@@ -12411,13 +12415,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:12414: checking for initscr" >&5
++	echo "$as_me:12418: 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 12420 "configure"
++#line 12424 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12448,16 +12452,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12451: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12455: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12454: \$? = $ac_status" >&5
++  echo "$as_me:12458: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12457: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12461: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12460: \$? = $ac_status" >&5
++  echo "$as_me:12464: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -12467,18 +12471,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12470: result: $ac_cv_func_initscr" >&5
++echo "$as_me:12474: 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:12477: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:12481: 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 12481 "configure"
++#line 12485 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12490,25 +12494,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12493: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12497: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12496: \$? = $ac_status" >&5
++  echo "$as_me:12500: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12499: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12503: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12502: \$? = $ac_status" >&5
++  echo "$as_me:12506: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:12504: result: yes" >&5
++  echo "$as_me:12508: 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:12511: result: no" >&5
++echo "$as_me:12515: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -12576,11 +12580,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:12579: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:12583: 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 12583 "configure"
++#line 12587 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12592,25 +12596,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12595: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12599: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12598: \$? = $ac_status" >&5
++  echo "$as_me:12602: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12601: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12605: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12604: \$? = $ac_status" >&5
++  echo "$as_me:12608: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:12606: result: yes" >&5
++  echo "$as_me:12610: 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:12613: result: no" >&5
++echo "$as_me:12617: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -12625,7 +12629,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:12628: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:12632: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -12633,7 +12637,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:12636: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:12640: 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
+@@ -12643,7 +12647,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12646 "configure"
++#line 12650 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12655,23 +12659,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12658: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12662: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12661: \$? = $ac_status" >&5
++  echo "$as_me:12665: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12664: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12668: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12667: \$? = $ac_status" >&5
++  echo "$as_me:12671: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:12669: result: yes" >&5
++  echo "$as_me:12673: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:12674: result: no" >&5
++echo "$as_me:12678: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -12691,7 +12695,7 @@
+ 
+ 	;;
+ (pdcurses)
+-	echo "$as_me:12694: checking for X" >&5
++	echo "$as_me:12698: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
+ # Check whether --with-x or --without-x was given.
+@@ -12795,17 +12799,17 @@
+   # Guess where to find include files, by looking for Intrinsic.h.
+   # First, try using that file with no special directory specified.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12798 "configure"
++#line 12802 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:12802: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12806: \"$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:12808: \$? = $ac_status" >&5
++  echo "$as_me:12812: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12838,7 +12842,7 @@
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12841 "configure"
++#line 12845 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12850,16 +12854,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12853: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12857: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12856: \$? = $ac_status" >&5
++  echo "$as_me:12860: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12859: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12863: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12862: \$? = $ac_status" >&5
++  echo "$as_me:12866: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -12897,7 +12901,7 @@
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:12900: result: $have_x" >&5
++  echo "$as_me:12904: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+   no_x=yes
+ else
+@@ -12907,7 +12911,7 @@
+   # Update the cache value to reflect the command line values.
+   ac_cv_have_x="have_x=yes \
+ 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  echo "$as_me:12910: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "$as_me:12914: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+@@ -12934,11 +12938,11 @@
+     # others require no space.  Words are not sufficient . . . .
+     case `(uname -sr) 2>/dev/null` in
+     "SunOS 5"*)
+-      echo "$as_me:12937: checking whether -R must be followed by a space" >&5
++      echo "$as_me:12941: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+       cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12941 "configure"
++#line 12945 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12950,16 +12954,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12953: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12957: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12956: \$? = $ac_status" >&5
++  echo "$as_me:12960: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12959: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12963: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12962: \$? = $ac_status" >&5
++  echo "$as_me:12966: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_nospace=yes
+ else
+@@ -12969,13 +12973,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+       if test $ac_R_nospace = yes; then
+-	echo "$as_me:12972: result: no" >&5
++	echo "$as_me:12976: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	X_LIBS="$X_LIBS -R$x_libraries"
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12978 "configure"
++#line 12982 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12987,16 +12991,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12990: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12994: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12993: \$? = $ac_status" >&5
++  echo "$as_me:12997: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12996: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13000: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12999: \$? = $ac_status" >&5
++  echo "$as_me:13003: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_space=yes
+ else
+@@ -13006,11 +13010,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	if test $ac_R_space = yes; then
+-	  echo "$as_me:13009: result: yes" >&5
++	  echo "$as_me:13013: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ 	else
+-	  echo "$as_me:13013: result: neither works" >&5
++	  echo "$as_me:13017: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ 	fi
+       fi
+@@ -13030,7 +13034,7 @@
+     # the Alpha needs dnet_stub (dnet does not exist).
+     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13033 "configure"
++#line 13037 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13049,22 +13053,22 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13052: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13056: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13055: \$? = $ac_status" >&5
++  echo "$as_me:13059: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13058: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13062: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13061: \$? = $ac_status" >&5
++  echo "$as_me:13065: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:13067: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:13071: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13072,7 +13076,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13075 "configure"
++#line 13079 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13091,16 +13095,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13094: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13098: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13097: \$? = $ac_status" >&5
++  echo "$as_me:13101: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13100: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13104: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13103: \$? = $ac_status" >&5
++  echo "$as_me:13107: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -13111,14 +13115,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13114: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:13118: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      echo "$as_me:13121: checking for dnet_ntoa in -ldnet_stub" >&5
++      echo "$as_me:13125: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13126,7 +13130,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13129 "configure"
++#line 13133 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13145,16 +13149,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13148: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13152: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13151: \$? = $ac_status" >&5
++  echo "$as_me:13155: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13154: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13158: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13157: \$? = $ac_status" >&5
++  echo "$as_me:13161: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -13165,7 +13169,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13168: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:13172: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -13184,13 +13188,13 @@
+     # on Irix 5.2, according to T.E. Dickey.
+     # The functions gethostbyname, getservbyname, and inet_addr are
+     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+-    echo "$as_me:13187: checking for gethostbyname" >&5
++    echo "$as_me:13191: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13193 "configure"
++#line 13197 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13221,16 +13225,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13224: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13228: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13227: \$? = $ac_status" >&5
++  echo "$as_me:13231: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13230: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13234: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13233: \$? = $ac_status" >&5
++  echo "$as_me:13237: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gethostbyname=yes
+ else
+@@ -13240,11 +13244,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13243: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:13247: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+-      echo "$as_me:13247: checking for gethostbyname in -lnsl" >&5
++      echo "$as_me:13251: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13252,7 +13256,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13255 "configure"
++#line 13259 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13271,16 +13275,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13274: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13278: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13277: \$? = $ac_status" >&5
++  echo "$as_me:13281: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13280: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13284: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13283: \$? = $ac_status" >&5
++  echo "$as_me:13287: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -13291,14 +13295,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13294: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:13298: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test "$ac_cv_lib_nsl_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+-        echo "$as_me:13301: checking for gethostbyname in -lbsd" >&5
++        echo "$as_me:13305: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13306,7 +13310,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13309 "configure"
++#line 13313 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13325,16 +13329,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13328: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13332: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13331: \$? = $ac_status" >&5
++  echo "$as_me:13335: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13334: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13338: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13337: \$? = $ac_status" >&5
++  echo "$as_me:13341: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -13345,7 +13349,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13348: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:13352: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test "$ac_cv_lib_bsd_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -13361,13 +13365,13 @@
+     # variants that don't use the nameserver (or something).  -lsocket
+     # must be given before -lnsl if both are needed.  We assume that
+     # if connect needs -lnsl, so does gethostbyname.
+-    echo "$as_me:13364: checking for connect" >&5
++    echo "$as_me:13368: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13370 "configure"
++#line 13374 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13398,16 +13402,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13401: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13405: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13404: \$? = $ac_status" >&5
++  echo "$as_me:13408: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13407: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13411: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13410: \$? = $ac_status" >&5
++  echo "$as_me:13414: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_connect=yes
+ else
+@@ -13417,11 +13421,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13420: result: $ac_cv_func_connect" >&5
++echo "$as_me:13424: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+ 
+     if test $ac_cv_func_connect = no; then
+-      echo "$as_me:13424: checking for connect in -lsocket" >&5
++      echo "$as_me:13428: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13429,7 +13433,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13432 "configure"
++#line 13436 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13448,16 +13452,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13451: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13455: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13454: \$? = $ac_status" >&5
++  echo "$as_me:13458: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13457: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13461: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13460: \$? = $ac_status" >&5
++  echo "$as_me:13464: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_socket_connect=yes
+ else
+@@ -13468,7 +13472,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13471: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:13475: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test "$ac_cv_lib_socket_connect" = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -13477,13 +13481,13 @@
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    echo "$as_me:13480: checking for remove" >&5
++    echo "$as_me:13484: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13486 "configure"
++#line 13490 "configure"
+ #include "confdefs.h"
+ #define remove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13514,16 +13518,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13517: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13521: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13520: \$? = $ac_status" >&5
++  echo "$as_me:13524: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13523: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13527: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13526: \$? = $ac_status" >&5
++  echo "$as_me:13530: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_remove=yes
+ else
+@@ -13533,11 +13537,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13536: result: $ac_cv_func_remove" >&5
++echo "$as_me:13540: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+ 
+     if test $ac_cv_func_remove = no; then
+-      echo "$as_me:13540: checking for remove in -lposix" >&5
++      echo "$as_me:13544: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13545,7 +13549,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13548 "configure"
++#line 13552 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13564,16 +13568,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13567: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13571: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13570: \$? = $ac_status" >&5
++  echo "$as_me:13574: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13573: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13577: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13576: \$? = $ac_status" >&5
++  echo "$as_me:13580: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_posix_remove=yes
+ else
+@@ -13584,7 +13588,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13587: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:13591: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test "$ac_cv_lib_posix_remove" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -13593,13 +13597,13 @@
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    echo "$as_me:13596: checking for shmat" >&5
++    echo "$as_me:13600: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13602 "configure"
++#line 13606 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13630,16 +13634,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13633: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13637: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13636: \$? = $ac_status" >&5
++  echo "$as_me:13640: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13639: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13643: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13642: \$? = $ac_status" >&5
++  echo "$as_me:13646: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_shmat=yes
+ else
+@@ -13649,11 +13653,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13652: result: $ac_cv_func_shmat" >&5
++echo "$as_me:13656: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+ 
+     if test $ac_cv_func_shmat = no; then
+-      echo "$as_me:13656: checking for shmat in -lipc" >&5
++      echo "$as_me:13660: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13661,7 +13665,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13664 "configure"
++#line 13668 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13680,16 +13684,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13683: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13687: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13686: \$? = $ac_status" >&5
++  echo "$as_me:13690: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13689: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13693: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13692: \$? = $ac_status" >&5
++  echo "$as_me:13696: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+@@ -13700,7 +13704,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13703: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:13707: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test "$ac_cv_lib_ipc_shmat" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -13718,7 +13722,7 @@
+   # These have to be linked with before -lX11, unlike the other
+   # libraries we check for below, so use a different variable.
+   # John Interrante, Karl Berry
+-  echo "$as_me:13721: checking for IceConnectionNumber in -lICE" >&5
++  echo "$as_me:13725: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13726,7 +13730,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13729 "configure"
++#line 13733 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13745,16 +13749,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13748: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13752: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13751: \$? = $ac_status" >&5
++  echo "$as_me:13755: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13754: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13758: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13757: \$? = $ac_status" >&5
++  echo "$as_me:13761: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -13765,7 +13769,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13768: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:13772: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -13777,7 +13781,7 @@
+ 
+ cf_x_athena=${cf_x_athena:-Xaw}
+ 
+-echo "$as_me:13780: checking if you want to link with Xaw 3d library" >&5
++echo "$as_me:13784: checking if you want to link with Xaw 3d library" >&5
+ echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
+ withval=
+ 
+@@ -13788,14 +13792,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=Xaw3d
+-	echo "$as_me:13791: result: yes" >&5
++	echo "$as_me:13795: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:13794: result: no" >&5
++	echo "$as_me:13798: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:13798: checking if you want to link with Xaw 3d xft library" >&5
++echo "$as_me:13802: checking if you want to link with Xaw 3d xft library" >&5
+ echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
+ withval=
+ 
+@@ -13806,14 +13810,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=Xaw3dxft
+-	echo "$as_me:13809: result: yes" >&5
++	echo "$as_me:13813: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:13812: result: no" >&5
++	echo "$as_me:13816: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:13816: checking if you want to link with neXT Athena library" >&5
++echo "$as_me:13820: checking if you want to link with neXT Athena library" >&5
+ echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
+ withval=
+ 
+@@ -13824,14 +13828,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=neXtaw
+-	echo "$as_me:13827: result: yes" >&5
++	echo "$as_me:13831: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:13830: result: no" >&5
++	echo "$as_me:13834: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:13834: checking if you want to link with Athena-Plus library" >&5
++echo "$as_me:13838: checking if you want to link with Athena-Plus library" >&5
+ echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
+ withval=
+ 
+@@ -13842,10 +13846,10 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=XawPlus
+-	echo "$as_me:13845: result: yes" >&5
++	echo "$as_me:13849: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:13848: result: no" >&5
++	echo "$as_me:13852: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -13865,17 +13869,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_athena_pkg"; then
+ 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
+ 
+-echo "${as_me:-configure}:13868: testing found package $cf_athena_pkg ..." 1>&5
++echo "${as_me:-configure}:13872: testing found package $cf_athena_pkg ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_athena_pkg" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_athena_pkg" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:13874: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13878: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:13878: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13882: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14006,20 +14010,20 @@
+ 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
+ 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14009: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:14013: testing ..trimmed $LIBS ..." 1>&5
+ 
+ 			;;
+ 		esac
+ 	done
+ 
+-echo "$as_me:14015: checking for usable $cf_x_athena/Xmu package" >&5
++echo "$as_me:14019: checking for usable $cf_x_athena/Xmu package" >&5
+ echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
+ if test "${cf_cv_xaw_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14022 "configure"
++#line 14026 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14037,16 +14041,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14040: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14044: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14043: \$? = $ac_status" >&5
++  echo "$as_me:14047: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14046: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14050: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14049: \$? = $ac_status" >&5
++  echo "$as_me:14053: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xaw_compat=yes
+ else
+@@ -14056,7 +14060,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14059: result: $cf_cv_xaw_compat" >&5
++echo "$as_me:14063: result: $cf_cv_xaw_compat" >&5
+ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
+ 
+ 			if test "$cf_cv_xaw_compat" = no
+@@ -14068,7 +14072,7 @@
+ 				(*)
+ 					test -n "$verbose" && echo "	work around broken package" 1>&6
+ 
+-echo "${as_me:-configure}:14071: testing work around broken package ..." 1>&5
++echo "${as_me:-configure}:14075: testing work around broken package ..." 1>&5
+ 
+ 					cf_save_xmu="$LIBS"
+ 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
+@@ -14076,17 +14080,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
+ 	test -n "$verbose" && echo "	found package xmu" 1>&6
+ 
+-echo "${as_me:-configure}:14079: testing found package xmu ..." 1>&5
++echo "${as_me:-configure}:14083: testing found package xmu ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xmu" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xmu" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14085: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14089: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xmu LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14089: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14093: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14206,12 +14210,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14209: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14213: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14214: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:14218: testing ...after  $LIBS ..." 1>&5
+ 
+ else
+ 	cf_pkgconfig_incs=
+@@ -14219,12 +14223,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14222: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14226: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14227: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:14231: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -14235,7 +14239,7 @@
+ 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
+ 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14238: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:14242: testing ..trimmed $LIBS ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -14260,17 +14264,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
+ 	test -n "$verbose" && echo "	found package Xext" 1>&6
+ 
+-echo "${as_me:-configure}:14263: testing found package Xext ..." 1>&5
++echo "${as_me:-configure}:14267: testing found package Xext ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "Xext" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "Xext" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14269: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14273: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package Xext LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14273: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14277: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14391,7 +14395,7 @@
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+ 
+-	echo "$as_me:14394: checking for XextCreateExtension in -lXext" >&5
++	echo "$as_me:14398: checking for XextCreateExtension in -lXext" >&5
+ echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14399,7 +14403,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXext  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14402 "configure"
++#line 14406 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14418,16 +14422,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14421: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14425: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14424: \$? = $ac_status" >&5
++  echo "$as_me:14428: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14427: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14431: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14430: \$? = $ac_status" >&5
++  echo "$as_me:14434: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_Xext_XextCreateExtension=yes
+ else
+@@ -14438,7 +14442,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14441: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
++echo "$as_me:14445: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
+ if test "$ac_cv_lib_Xext_XextCreateExtension" = yes; then
+ 
+@@ -14474,17 +14478,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
+ 	test -n "$verbose" && echo "	found package x11" 1>&6
+ 
+-echo "${as_me:-configure}:14477: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:14481: testing found package x11 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "x11" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14483: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14487: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14487: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14491: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14604,24 +14608,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:14607: WARNING: unable to find X11 library" >&5
++	{ echo "$as_me:14611: WARNING: unable to find X11 library" >&5
+ echo "$as_me: WARNING: unable to find X11 library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then
+ 	test -n "$verbose" && echo "	found package ice" 1>&6
+ 
+-echo "${as_me:-configure}:14614: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:14618: testing found package ice ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "ice" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14620: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14624: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14624: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14628: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14741,24 +14745,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:14744: WARNING: unable to find ICE library" >&5
++	{ echo "$as_me:14748: WARNING: unable to find ICE library" >&5
+ echo "$as_me: WARNING: unable to find ICE library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
+ 	test -n "$verbose" && echo "	found package sm" 1>&6
+ 
+-echo "${as_me:-configure}:14751: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:14755: testing found package sm ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "sm" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14757: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14761: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14761: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14765: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14878,24 +14882,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:14881: WARNING: unable to find SM library" >&5
++	{ echo "$as_me:14885: WARNING: unable to find SM library" >&5
+ echo "$as_me: WARNING: unable to find SM library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
+ 	test -n "$verbose" && echo "	found package xt" 1>&6
+ 
+-echo "${as_me:-configure}:14888: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:14892: testing found package xt ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xt" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14894: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14898: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14898: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14902: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15015,7 +15019,7 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:15018: WARNING: unable to find Xt library" >&5
++	{ echo "$as_me:15022: WARNING: unable to find Xt library" >&5
+ echo "$as_me: WARNING: unable to find Xt library" >&2;}
+ fi
+ 
+@@ -15028,17 +15032,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
+ 	test -n "$verbose" && echo "	found package xt" 1>&6
+ 
+-echo "${as_me:-configure}:15031: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:15035: testing found package xt ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xt" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15037: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15041: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15041: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15045: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15159,14 +15163,14 @@
+ 		;;
+ 	(*)
+ # we have an "xt" package, but it may omit Xt's dependency on X11
+-echo "$as_me:15162: checking for usable X dependency" >&5
++echo "$as_me:15166: checking for usable X dependency" >&5
+ echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
+ if test "${cf_cv_xt_x11_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15169 "configure"
++#line 15173 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -15186,16 +15190,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15189: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15193: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15192: \$? = $ac_status" >&5
++  echo "$as_me:15196: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15195: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15199: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15198: \$? = $ac_status" >&5
++  echo "$as_me:15202: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xt_x11_compat=yes
+ else
+@@ -15205,30 +15209,30 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15208: result: $cf_cv_xt_x11_compat" >&5
++echo "$as_me:15212: result: $cf_cv_xt_x11_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
+ 		if test "$cf_cv_xt_x11_compat" = no
+ 		then
+ 			test -n "$verbose" && echo "	work around broken X11 dependency" 1>&6
+ 
+-echo "${as_me:-configure}:15214: testing work around broken X11 dependency ..." 1>&5
++echo "${as_me:-configure}:15218: testing work around broken X11 dependency ..." 1>&5
+ 
+ 			# 2010/11/19 - good enough until a working Xt on Xcb is delivered.
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
+ 	test -n "$verbose" && echo "	found package x11" 1>&6
+ 
+-echo "${as_me:-configure}:15221: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:15225: testing found package x11 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "x11" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15227: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15231: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15231: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15235: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15351,12 +15355,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:15354: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:15358: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:15359: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:15363: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -15364,14 +15368,14 @@
+ 		;;
+ 	esac
+ 
+-echo "$as_me:15367: checking for usable X Toolkit package" >&5
++echo "$as_me:15371: checking for usable X Toolkit package" >&5
+ echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
+ if test "${cf_cv_xt_ice_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15374 "configure"
++#line 15378 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -15387,16 +15391,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15390: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15394: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15393: \$? = $ac_status" >&5
++  echo "$as_me:15397: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15396: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15400: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15399: \$? = $ac_status" >&5
++  echo "$as_me:15403: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xt_ice_compat=yes
+ else
+@@ -15406,7 +15410,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15409: result: $cf_cv_xt_ice_compat" >&5
++echo "$as_me:15413: result: $cf_cv_xt_ice_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
+ 
+ 	if test "$cf_cv_xt_ice_compat" = no
+@@ -15420,22 +15424,22 @@
+ 			(*)
+ 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
+ 
+-echo "${as_me:-configure}:15423: testing work around broken ICE dependency ..." 1>&5
++echo "${as_me:-configure}:15427: testing work around broken ICE dependency ..." 1>&5
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then
+ 	test -n "$verbose" && echo "	found package ice" 1>&6
+ 
+-echo "${as_me:-configure}:15428: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:15432: testing found package ice ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "ice" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15434: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15438: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15438: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15442: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15554,17 +15558,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
+ 	test -n "$verbose" && echo "	found package sm" 1>&6
+ 
+-echo "${as_me:-configure}:15557: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:15561: testing found package sm ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "sm" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15563: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15567: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15567: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15571: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15693,12 +15697,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:15696: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:15700: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:15701: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:15705: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -15718,7 +15722,7 @@
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15721: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15725: testing checking additions to CFLAGS ..." 1>&5
+ 
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -15803,7 +15807,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:15806: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:15810: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -15813,7 +15817,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:15816: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:15820: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -15823,7 +15827,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}:15826: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:15830: 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"
+@@ -15832,7 +15836,7 @@
+ 
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15835 "configure"
++#line 15839 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -15844,16 +15848,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15847: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15851: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15850: \$? = $ac_status" >&5
++  echo "$as_me:15854: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15853: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15857: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15856: \$? = $ac_status" >&5
++  echo "$as_me:15860: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -15861,12 +15865,12 @@
+ cat "conftest.$ac_ext" >&5
+ test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15864: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15868: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+ 
+ 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
+ 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15869: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:15873: testing but keeping change to \$CPPFLAGS ..." 1>&5
+ 
+ 	 fi
+ 	 CFLAGS="$cf_check_cflags"
+@@ -15874,13 +15878,13 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+ 
+-	echo "$as_me:15877: checking for XOpenDisplay" >&5
++	echo "$as_me:15881: checking for XOpenDisplay" >&5
+ echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
+ if test "${ac_cv_func_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15883 "configure"
++#line 15887 "configure"
+ #include "confdefs.h"
+ #define XOpenDisplay autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15911,16 +15915,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15914: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15918: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15917: \$? = $ac_status" >&5
++  echo "$as_me:15921: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15920: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15924: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15923: \$? = $ac_status" >&5
++  echo "$as_me:15927: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_XOpenDisplay=yes
+ else
+@@ -15930,13 +15934,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15933: result: $ac_cv_func_XOpenDisplay" >&5
++echo "$as_me:15937: result: $ac_cv_func_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
+ if test "$ac_cv_func_XOpenDisplay" = yes; then
+   :
+ else
+ 
+-	echo "$as_me:15939: checking for XOpenDisplay in -lX11" >&5
++	echo "$as_me:15943: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15944,7 +15948,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15947 "configure"
++#line 15951 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15963,16 +15967,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15966: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15970: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15969: \$? = $ac_status" >&5
++  echo "$as_me:15973: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15972: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15976: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15975: \$? = $ac_status" >&5
++  echo "$as_me:15979: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -15983,7 +15987,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15986: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:15990: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then
+ 
+@@ -16007,13 +16011,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:16010: checking for XtAppInitialize" >&5
++	echo "$as_me:16014: checking for XtAppInitialize" >&5
+ echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
+ if test "${ac_cv_func_XtAppInitialize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16016 "configure"
++#line 16020 "configure"
+ #include "confdefs.h"
+ #define XtAppInitialize autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16044,16 +16048,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16047: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16051: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16050: \$? = $ac_status" >&5
++  echo "$as_me:16054: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16053: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16057: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16056: \$? = $ac_status" >&5
++  echo "$as_me:16060: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_XtAppInitialize=yes
+ else
+@@ -16063,13 +16067,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16066: result: $ac_cv_func_XtAppInitialize" >&5
++echo "$as_me:16070: result: $ac_cv_func_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
+ if test "$ac_cv_func_XtAppInitialize" = yes; then
+   :
+ else
+ 
+-	echo "$as_me:16072: checking for XtAppInitialize in -lXt" >&5
++	echo "$as_me:16076: checking for XtAppInitialize in -lXt" >&5
+ echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16077,7 +16081,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16080 "configure"
++#line 16084 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16096,16 +16100,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16099: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16103: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16102: \$? = $ac_status" >&5
++  echo "$as_me:16106: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16105: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16109: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16108: \$? = $ac_status" >&5
++  echo "$as_me:16112: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_Xt_XtAppInitialize=yes
+ else
+@@ -16116,7 +16120,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16119: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
++echo "$as_me:16123: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
+ if test "$ac_cv_lib_Xt_XtAppInitialize" = yes; then
+ 
+@@ -16133,7 +16137,7 @@
+ fi
+ 
+ if test "$cf_have_X_LIBS" = no ; then
+-	{ echo "$as_me:16136: WARNING: Unable to successfully link X Toolkit library (-lXt) with
++	{ echo "$as_me:16140: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+ test program.  You will have to check and add the proper libraries by hand
+ to makefile." >&5
+ echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+@@ -16174,14 +16178,14 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
+ 
+-			echo "$as_me:16177: checking for $cf_test in $cf_path" >&5
++			echo "$as_me:16181: checking for $cf_test in $cf_path" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
+ 		else
+-			echo "$as_me:16180: checking for $cf_test" >&5
++			echo "$as_me:16184: checking for $cf_test" >&5
+ echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
+ 		fi
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16184 "configure"
++#line 16188 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16195,16 +16199,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16198: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16202: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16201: \$? = $ac_status" >&5
++  echo "$as_me:16205: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16204: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16208: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16207: \$? = $ac_status" >&5
++  echo "$as_me:16211: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -16213,7 +16217,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-		echo "$as_me:16216: result: $cf_result" >&5
++		echo "$as_me:16220: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
+@@ -16229,7 +16233,7 @@
+ done
+ 
+ if test -z "$cf_x_athena_inc" ; then
+-	{ echo "$as_me:16232: WARNING: Unable to find Athena header files" >&5
++	{ echo "$as_me:16236: WARNING: Unable to find Athena header files" >&5
+ echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
+ elif test "$cf_x_athena_inc" != default ; then
+ 
+@@ -16294,10 +16298,10 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-		echo "$as_me:16297: checking for $cf_test in $cf_libs" >&5
++		echo "$as_me:16301: checking for $cf_test in $cf_libs" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16300 "configure"
++#line 16304 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -16314,16 +16318,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16317: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16321: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16320: \$? = $ac_status" >&5
++  echo "$as_me:16324: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16323: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16327: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16326: \$? = $ac_status" >&5
++  echo "$as_me:16330: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -16332,7 +16336,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:16335: result: $cf_result" >&5
++		echo "$as_me:16339: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
+@@ -16349,7 +16353,7 @@
+ done
+ 
+ if test -z "$cf_x_athena_lib" ; then
+-	{ { echo "$as_me:16352: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
++	{ { echo "$as_me:16356: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+ echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -16383,7 +16387,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:16386: checking for $ac_word" >&5
++echo "$as_me:16390: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16398,7 +16402,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:16401: found $ac_dir/$ac_word" >&5
++echo "$as_me:16405: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -16406,10 +16410,10 @@
+ fi
+ XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
+ if test -n "$XCURSES_CONFIG"; then
+-  echo "$as_me:16409: result: $XCURSES_CONFIG" >&5
++  echo "$as_me:16413: result: $XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$XCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:16412: result: no" >&5
++  echo "$as_me:16416: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -16422,7 +16426,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:16425: checking for $ac_word" >&5
++echo "$as_me:16429: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16437,7 +16441,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
+-echo "$as_me:16440: found $ac_dir/$ac_word" >&5
++echo "$as_me:16444: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -16445,10 +16449,10 @@
+ fi
+ ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
+ if test -n "$ac_ct_XCURSES_CONFIG"; then
+-  echo "$as_me:16448: result: $ac_ct_XCURSES_CONFIG" >&5
++  echo "$as_me:16452: result: $ac_ct_XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:16451: result: no" >&5
++  echo "$as_me:16455: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -16583,7 +16587,7 @@
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16586: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16590: testing checking additions to CFLAGS ..." 1>&5
+ 
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -16668,7 +16672,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:16671: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:16675: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -16678,7 +16682,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:16681: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:16685: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -16688,7 +16692,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}:16691: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:16695: 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"
+@@ -16697,7 +16701,7 @@
+ 
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16700 "configure"
++#line 16704 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -16709,16 +16713,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16712: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16716: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16715: \$? = $ac_status" >&5
++  echo "$as_me:16719: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16718: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16722: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16721: \$? = $ac_status" >&5
++  echo "$as_me:16725: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -16726,12 +16730,12 @@
+ cat "conftest.$ac_ext" >&5
+ test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16729: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16733: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+ 
+ 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
+ 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16734: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16738: testing but keeping change to \$CPPFLAGS ..." 1>&5
+ 
+ 	 fi
+ 	 CFLAGS="$cf_check_cflags"
+@@ -16739,7 +16743,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:16742: checking for XOpenDisplay in -lX11" >&5
++echo "$as_me:16746: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16747,7 +16751,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16750 "configure"
++#line 16754 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16766,16 +16770,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16769: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16773: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16772: \$? = $ac_status" >&5
++  echo "$as_me:16776: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16775: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16779: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16778: \$? = $ac_status" >&5
++  echo "$as_me:16782: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -16786,7 +16790,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16789: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:16793: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then
+ 
+@@ -16808,7 +16812,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16811: checking for XCurses library" >&5
++echo "$as_me:16815: checking for XCurses library" >&5
+ echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
+ if test "${cf_cv_lib_XCurses+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16831,7 +16835,7 @@
+ LIBS="$cf_add_libs"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16834 "configure"
++#line 16838 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16846,16 +16850,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16849: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16853: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16852: \$? = $ac_status" >&5
++  echo "$as_me:16856: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16855: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16859: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16858: \$? = $ac_status" >&5
++  echo "$as_me:16862: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_lib_XCurses=yes
+ else
+@@ -16866,7 +16870,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16869: result: $cf_cv_lib_XCurses" >&5
++echo "$as_me:16873: result: $cf_cv_lib_XCurses" >&5
+ echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
+ 
+ fi
+@@ -16881,23 +16885,23 @@
+ #define XCURSES 1
+ EOF
+ 
+-	echo "$as_me:16884: checking for xcurses.h" >&5
++	echo "$as_me:16888: checking for xcurses.h" >&5
+ echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
+ if test "${ac_cv_header_xcurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16890 "configure"
++#line 16894 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16894: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16898: \"$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:16900: \$? = $ac_status" >&5
++  echo "$as_me:16904: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16916,7 +16920,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16919: result: $ac_cv_header_xcurses_h" >&5
++echo "$as_me:16923: result: $ac_cv_header_xcurses_h" >&5
+ echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
+ if test "$ac_cv_header_xcurses_h" = yes; then
+ 
+@@ -16927,71 +16931,78 @@
+ fi
+ 
+ else
+-	{ { echo "$as_me:16930: error: Cannot link with XCurses" >&5
++	{ { echo "$as_me:16934: error: Cannot link with XCurses" >&5
+ echo "$as_me: error: Cannot link with XCurses" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ 	;;
+ (*)
+-	{ { echo "$as_me:16937: error: unexpected screen-value: $cf_cv_screen" >&5
++	{ { echo "$as_me:16941: error: unexpected screen-value: $cf_cv_screen" >&5
+ echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+-: ${cf_nculib_root:=$cf_cv_screen}
+-as_ac_Lib=`echo "ac_cv_lib_$cf_nculib_root''__nc_init_pthreads" | $as_tr_sh`
+-echo "$as_me:16945: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
+-echo $ECHO_N "checking for _nc_init_pthreads in -l$cf_nculib_root... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
++echo "$as_me:16947: checking for _nc_init_pthreads" >&5
++echo $ECHO_N "checking for _nc_init_pthreads... $ECHO_C" >&6
++if test "${ac_cv_func__nc_init_pthreads+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-l$cf_nculib_root  $LIBS"
+-cat >"conftest.$ac_ext" <<_ACEOF
++  cat >"conftest.$ac_ext" <<_ACEOF
+ #line 16953 "configure"
+ #include "confdefs.h"
++#define _nc_init_pthreads autoconf_temporary
++#include 	/* least-intrusive standard header which defines gcc2 __stub macros */
++#undef _nc_init_pthreads
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
++
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+ char _nc_init_pthreads (void);
++
+ int
+ main (void)
+ {
+-_nc_init_pthreads ();
++
++/* The GNU C library defines stubs for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub__nc_init_pthreads) || defined (__stub____nc_init_pthreads)
++#error found stub for _nc_init_pthreads
++#endif
++
++	return _nc_init_pthreads ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16972: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16984: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16975: \$? = $ac_status" >&5
++  echo "$as_me:16987: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16978: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16990: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16981: \$? = $ac_status" >&5
++  echo "$as_me:16993: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  eval "$as_ac_Lib=yes"
++  ac_cv_func__nc_init_pthreads=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-eval "$as_ac_Lib=no"
++ac_cv_func__nc_init_pthreads=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16992: 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
++echo "$as_me:17003: result: $ac_cv_func__nc_init_pthreads" >&5
++echo "${ECHO_T}$ac_cv_func__nc_init_pthreads" >&6
++if test "$ac_cv_func__nc_init_pthreads" = yes; then
+   cf_cv_ncurses_pthreads=yes
+ else
+   cf_cv_ncurses_pthreads=no
+@@ -17024,7 +17035,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17027: checking for X11 rgb file" >&5
++echo "$as_me:17038: 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.
+@@ -17088,7 +17099,7 @@
+ 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:17091: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:17102: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -17096,7 +17107,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17099: result: $RGB_PATH" >&5
++echo "$as_me:17110: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:17151: 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.
+@@ -17157,10 +17168,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17160: result: $FORM_NAME" >&5
++echo "$as_me:17171: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:17163: checking for desired basename for menu library" >&5
++echo "$as_me:17174: 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.
+@@ -17180,10 +17191,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17183: result: $MENU_NAME" >&5
++echo "$as_me:17194: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:17186: checking for desired basename for panel library" >&5
++echo "$as_me:17197: 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.
+@@ -17203,10 +17214,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17206: result: $PANEL_NAME" >&5
++echo "$as_me:17217: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:17209: checking if you want to check for panel functions" >&5
++echo "$as_me:17220: checking if you want to check for panel functions" >&5
+ echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-panel or --disable-panel was given.
+@@ -17223,7 +17234,7 @@
+ 	cf_enable_panel=$cf_default_panel
+ 
+ fi;
+-echo "$as_me:17226: result: $cf_enable_panel" >&5
++echo "$as_me:17237: result: $cf_enable_panel" >&5
+ echo "${ECHO_T}$cf_enable_panel" >&6
+ if test $cf_enable_panel = yes
+ then
+@@ -17234,13 +17245,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:17237: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
++	echo "$as_me:17248: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists "$PANEL_NAME$cf_cv_libtype" ; then
+-		echo "$as_me:17240: result: yes" >&5
++		echo "$as_me:17251: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:17243: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
++		echo "$as_me:17254: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CFLAGS="$CFLAGS"
+@@ -17390,7 +17401,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17393 "configure"
++#line 17404 "configure"
+ #include "confdefs.h"
+ #include <$PANEL_NAME.h>
+ int
+@@ -17402,37 +17413,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17405: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17416: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17408: \$? = $ac_status" >&5
++  echo "$as_me:17419: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17411: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17422: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17414: \$? = $ac_status" >&5
++  echo "$as_me:17425: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17420 "configure"
++#line 17431 "configure"
+ #include "confdefs.h"
+ #include <$PANEL_NAME.h>
+ 				int main(void)
+ 				{ (void) new_panel ( 0 ); return 0; }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17427: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17438: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17430: \$? = $ac_status" >&5
++  echo "$as_me:17441: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17432: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17443: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17435: \$? = $ac_status" >&5
++  echo "$as_me:17446: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -17449,7 +17460,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:17452: result: $cf_have_curses_lib" >&5
++		echo "$as_me:17463: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" = "yes"
+@@ -17470,7 +17481,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh`
+-echo "$as_me:17473: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
++echo "$as_me:17484: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17478,7 +17489,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$PANEL_NAME$cf_cv_libtype  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17481 "configure"
++#line 17492 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17497,16 +17508,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17500: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17511: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17503: \$? = $ac_status" >&5
++  echo "$as_me:17514: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17506: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17517: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17509: \$? = $ac_status" >&5
++  echo "$as_me:17520: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -17517,7 +17528,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17520: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:17531: 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
+ 
+@@ -17550,7 +17561,7 @@
+ 	cf_curses_headers="$cf_curses_headers panel.h"
+ fi
+ 
+-echo "$as_me:17553: checking if you want to check for menu functions" >&5
++echo "$as_me:17564: checking if you want to check for menu functions" >&5
+ echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-menu or --disable-menu was given.
+@@ -17567,7 +17578,7 @@
+ 	cf_enable_menu=$cf_default_menu
+ 
+ fi;
+-echo "$as_me:17570: result: $cf_enable_menu" >&5
++echo "$as_me:17581: result: $cf_enable_menu" >&5
+ echo "${ECHO_T}$cf_enable_menu" >&6
+ if test $cf_enable_menu = yes
+ then
+@@ -17576,14 +17587,14 @@
+ 		;;
+ 	(curses*)
+ 
+-echo "$as_me:17579: checking for NetBSD menu.h" >&5
++echo "$as_me:17590: checking for NetBSD menu.h" >&5
+ echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_menu_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17586 "configure"
++#line 17597 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -17601,16 +17612,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17604: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17615: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17607: \$? = $ac_status" >&5
++  echo "$as_me:17618: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17610: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17621: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17613: \$? = $ac_status" >&5
++  echo "$as_me:17624: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_netbsd_menu_h=yes
+ 
+@@ -17622,7 +17633,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17625: result: $cf_cv_netbsd_menu_h" >&5
++echo "$as_me:17636: result: $cf_cv_netbsd_menu_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
+ 
+ test "$cf_cv_netbsd_menu_h" = yes &&
+@@ -17639,13 +17650,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:17642: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
++	echo "$as_me:17653: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists "$MENU_NAME$cf_cv_libtype" ; then
+-		echo "$as_me:17645: result: yes" >&5
++		echo "$as_me:17656: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:17648: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
++		echo "$as_me:17659: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CFLAGS="$CFLAGS"
+@@ -17795,7 +17806,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17798 "configure"
++#line 17809 "configure"
+ #include "confdefs.h"
+ #include <$MENU_NAME.h>
+ int
+@@ -17807,37 +17818,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17810: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17821: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17813: \$? = $ac_status" >&5
++  echo "$as_me:17824: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17816: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17827: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17819: \$? = $ac_status" >&5
++  echo "$as_me:17830: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17825 "configure"
++#line 17836 "configure"
+ #include "confdefs.h"
+ #include <$MENU_NAME.h>
+ 				int main(void)
+ 				{ (void) menu_driver ( 0,0 ); return 0; }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17832: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17843: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17835: \$? = $ac_status" >&5
++  echo "$as_me:17846: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17837: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17848: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17840: \$? = $ac_status" >&5
++  echo "$as_me:17851: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -17854,7 +17865,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:17857: result: $cf_have_curses_lib" >&5
++		echo "$as_me:17868: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" = "yes"
+@@ -17875,7 +17886,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh`
+-echo "$as_me:17878: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
++echo "$as_me:17889: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17883,7 +17894,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$MENU_NAME$cf_cv_libtype  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17886 "configure"
++#line 17897 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17902,16 +17913,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17905: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17916: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17908: \$? = $ac_status" >&5
++  echo "$as_me:17919: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17911: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17922: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17914: \$? = $ac_status" >&5
++  echo "$as_me:17925: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -17922,7 +17933,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17925: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:17936: 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
+ 
+@@ -17955,7 +17966,7 @@
+ 	cf_curses_headers="$cf_curses_headers menu.h"
+ fi
+ 
+-echo "$as_me:17958: checking if you want to check for form functions" >&5
++echo "$as_me:17969: checking if you want to check for form functions" >&5
+ echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-form or --disable-form was given.
+@@ -17972,7 +17983,7 @@
+ 	cf_enable_form=$cf_default_form
+ 
+ fi;
+-echo "$as_me:17975: result: $cf_enable_form" >&5
++echo "$as_me:17986: result: $cf_enable_form" >&5
+ echo "${ECHO_T}$cf_enable_form" >&6
+ if test $cf_enable_form = yes
+ then
+@@ -17981,14 +17992,14 @@
+ 		;;
+ 	(curses*)
+ 
+-echo "$as_me:17984: checking for NetBSD form.h" >&5
++echo "$as_me:17995: checking for NetBSD form.h" >&5
+ echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_form_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17991 "configure"
++#line 18002 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18007,16 +18018,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18010: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18021: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18013: \$? = $ac_status" >&5
++  echo "$as_me:18024: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18016: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18027: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18019: \$? = $ac_status" >&5
++  echo "$as_me:18030: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_netbsd_form_h=yes
+ 
+@@ -18028,7 +18039,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:18031: result: $cf_cv_netbsd_form_h" >&5
++echo "$as_me:18042: result: $cf_cv_netbsd_form_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
+ 
+ test "$cf_cv_netbsd_form_h" = yes &&
+@@ -18045,13 +18056,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:18048: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
++	echo "$as_me:18059: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists "$FORM_NAME$cf_cv_libtype" ; then
+-		echo "$as_me:18051: result: yes" >&5
++		echo "$as_me:18062: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:18054: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
++		echo "$as_me:18065: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CFLAGS="$CFLAGS"
+@@ -18201,7 +18212,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18204 "configure"
++#line 18215 "configure"
+ #include "confdefs.h"
+ #include <$FORM_NAME.h>
+ int
+@@ -18213,37 +18224,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18216: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18227: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18219: \$? = $ac_status" >&5
++  echo "$as_me:18230: \$? = $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:18233: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18225: \$? = $ac_status" >&5
++  echo "$as_me:18236: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18231 "configure"
++#line 18242 "configure"
+ #include "confdefs.h"
+ #include <$FORM_NAME.h>
+ 				int main(void)
+ 				{ (void) form_driver ( 0,0 ); return 0; }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:18238: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18249: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18241: \$? = $ac_status" >&5
++  echo "$as_me:18252: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:18243: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18254: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18246: \$? = $ac_status" >&5
++  echo "$as_me:18257: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -18260,7 +18271,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:18263: result: $cf_have_curses_lib" >&5
++		echo "$as_me:18274: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" = "yes"
+@@ -18281,7 +18292,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh`
+-echo "$as_me:18284: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
++echo "$as_me:18295: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18289,7 +18300,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$FORM_NAME$cf_cv_libtype  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18292 "configure"
++#line 18303 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18308,16 +18319,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18311: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18322: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18314: \$? = $ac_status" >&5
++  echo "$as_me:18325: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18317: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18328: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18320: \$? = $ac_status" >&5
++  echo "$as_me:18331: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -18328,7 +18339,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18331: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:18342: 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
+ 
+@@ -18366,23 +18377,23 @@
+ for ac_header in $cf_curses_headers
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18369: checking for $ac_header" >&5
++echo "$as_me:18380: 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 18375 "configure"
++#line 18386 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18379: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18390: \"$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:18385: \$? = $ac_status" >&5
++  echo "$as_me:18396: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18401,7 +18412,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18404: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18415: 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:18425: 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 18420 "configure"
++#line 18431 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -18433,16 +18444,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18436: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18447: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18439: \$? = $ac_status" >&5
++  echo "$as_me:18450: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18442: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18453: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18445: \$? = $ac_status" >&5
++  echo "$as_me:18456: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -18452,7 +18463,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18455: result: $ac_cv_header_time" >&5
++echo "$as_me:18466: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -18475,23 +18486,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18478: checking for $ac_header" >&5
++echo "$as_me:18489: 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 18484 "configure"
++#line 18495 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18488: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18499: \"$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:18494: \$? = $ac_status" >&5
++  echo "$as_me:18505: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18510,7 +18521,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18513: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18524: 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:18537: 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 18532 "configure"
++#line 18543 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18536: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18547: \"$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:18542: \$? = $ac_status" >&5
++  echo "$as_me:18553: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18558,7 +18569,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18561: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18572: 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:18582: 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
+@@ -18578,7 +18589,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18581 "configure"
++#line 18592 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -18591,16 +18602,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18594: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18605: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18597: \$? = $ac_status" >&5
++  echo "$as_me:18608: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18600: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18611: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18603: \$? = $ac_status" >&5
++  echo "$as_me:18614: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -18612,7 +18623,7 @@
+ done
+ 
+ fi
+-echo "$as_me:18615: result: $cf_cv_getopt_header" >&5
++echo "$as_me:18626: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -18630,13 +18641,13 @@
+ fi
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:18633: checking for clock_gettime" >&5
++echo "$as_me:18644: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18639 "configure"
++#line 18650 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18667,16 +18678,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18670: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18681: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18673: \$? = $ac_status" >&5
++  echo "$as_me:18684: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18676: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18687: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18679: \$? = $ac_status" >&5
++  echo "$as_me:18690: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -18686,12 +18697,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18689: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:18700: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:18694: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:18705: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18699,7 +18710,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18702 "configure"
++#line 18713 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18718,16 +18729,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18721: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18732: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18724: \$? = $ac_status" >&5
++  echo "$as_me:18735: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18727: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18738: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18730: \$? = $ac_status" >&5
++  echo "$as_me:18741: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -18738,7 +18749,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18741: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:18752: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -18750,14 +18761,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:18753: checking if clock_gettime links" >&5
++echo "$as_me:18764: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18760 "configure"
++#line 18771 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -18775,16 +18786,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18778: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18789: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18781: \$? = $ac_status" >&5
++  echo "$as_me:18792: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18784: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18795: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18787: \$? = $ac_status" >&5
++  echo "$as_me:18798: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -18795,7 +18806,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:18798: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:18809: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -18809,13 +18820,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:18812: checking for gettimeofday" >&5
++echo "$as_me:18823: 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 18818 "configure"
++#line 18829 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18846,16 +18857,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18849: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18860: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18852: \$? = $ac_status" >&5
++  echo "$as_me:18863: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18855: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18866: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18858: \$? = $ac_status" >&5
++  echo "$as_me:18869: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -18865,7 +18876,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18868: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:18879: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -18875,7 +18886,7 @@
+ 
+ else
+ 
+-echo "$as_me:18878: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:18889: 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
+@@ -18883,7 +18894,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18886 "configure"
++#line 18897 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18902,16 +18913,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18905: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18916: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18908: \$? = $ac_status" >&5
++  echo "$as_me:18919: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18911: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18922: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18914: \$? = $ac_status" >&5
++  echo "$as_me:18925: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -18922,7 +18933,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18925: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:18936: 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
+ 
+@@ -18960,13 +18971,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:18963: checking for $ac_func" >&5
++echo "$as_me:18974: 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 18969 "configure"
++#line 18980 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18997,16 +19008,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19000: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19011: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19003: \$? = $ac_status" >&5
++  echo "$as_me:19014: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19006: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19017: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19009: \$? = $ac_status" >&5
++  echo "$as_me:19020: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -19016,7 +19027,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19019: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:19030: 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:19041: checking if we can use termcap.h" >&5
+ echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
+ if test "${cf_cv_have_termcap_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19037 "configure"
++#line 19048 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19055,16 +19066,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19058: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19069: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19061: \$? = $ac_status" >&5
++  echo "$as_me:19072: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19064: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19075: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19067: \$? = $ac_status" >&5
++  echo "$as_me:19078: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_termcap_h=yes
+ else
+@@ -19074,7 +19085,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19077: result: $cf_cv_have_termcap_h" >&5
++echo "$as_me:19088: result: $cf_cv_have_termcap_h" >&5
+ echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
+ if test "x$cf_cv_have_termcap_h" = xyes
+ then
+@@ -19084,14 +19095,14 @@
+ EOF
+ 
+ else
+-echo "$as_me:19087: checking if we can use ncurses/termcap.h" >&5
++echo "$as_me:19098: checking if we can use ncurses/termcap.h" >&5
+ echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
+ if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19094 "configure"
++#line 19105 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19112,16 +19123,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19115: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19126: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19118: \$? = $ac_status" >&5
++  echo "$as_me:19129: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19121: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19132: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19124: \$? = $ac_status" >&5
++  echo "$as_me:19135: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_ncurses_termcap_h=yes
+ else
+@@ -19131,7 +19142,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19134: result: $cf_cv_have_ncurses_termcap_h" >&5
++echo "$as_me:19145: result: $cf_cv_have_ncurses_termcap_h" >&5
+ echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
+ test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -19141,7 +19152,7 @@
+ fi
+ 
+ if test "x$ac_cv_func_getopt" = xno; then
+-	{ { echo "$as_me:19144: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:19155: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -19160,13 +19171,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:19163: checking for $ac_func" >&5
++echo "$as_me:19174: 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 19169 "configure"
++#line 19180 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19197,16 +19208,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19200: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19211: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19203: \$? = $ac_status" >&5
++  echo "$as_me:19214: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19206: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19217: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19209: \$? = $ac_status" >&5
++  echo "$as_me:19220: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -19216,7 +19227,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19219: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:19230: 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:19242: checking definition to turn on extended curses functions" >&5
+ echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
+ if test "${cf_cv_need_xopen_extension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19236,7 +19247,7 @@
+ 
+ cf_cv_need_xopen_extension=unknown
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19239 "configure"
++#line 19250 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -19269,16 +19280,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19272: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19283: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19275: \$? = $ac_status" >&5
++  echo "$as_me:19286: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19278: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19289: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19281: \$? = $ac_status" >&5
++  echo "$as_me:19292: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_xopen_extension=none
+ else
+@@ -19288,7 +19299,7 @@
+ 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19291 "configure"
++#line 19302 "configure"
+ #include "confdefs.h"
+ 
+ #define $cf_try_xopen_extension 1
+@@ -19314,16 +19325,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19317: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19328: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19320: \$? = $ac_status" >&5
++  echo "$as_me:19331: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19323: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19334: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19326: \$? = $ac_status" >&5
++  echo "$as_me:19337: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
+ else
+@@ -19337,7 +19348,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:19340: result: $cf_cv_need_xopen_extension" >&5
++echo "$as_me:19351: result: $cf_cv_need_xopen_extension" >&5
+ echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
+ 
+ case "$cf_cv_need_xopen_extension" in
+@@ -19349,7 +19360,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19352: checking for term.h" >&5
++echo "$as_me:19363: checking for term.h" >&5
+ echo $ECHO_N "checking for term.h... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19370,7 +19381,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19373 "configure"
++#line 19384 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19384,16 +19395,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19387: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19398: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19390: \$? = $ac_status" >&5
++  echo "$as_me:19401: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19393: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19404: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19396: \$? = $ac_status" >&5
++  echo "$as_me:19407: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_term_header=$cf_header
+ 	 break
+@@ -19412,7 +19423,7 @@
+ 	for cf_header in ncurses/term.h ncursesw/term.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19415 "configure"
++#line 19426 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19430,16 +19441,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19433: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19444: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19436: \$? = $ac_status" >&5
++  echo "$as_me:19447: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19439: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19450: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19442: \$? = $ac_status" >&5
++  echo "$as_me:19453: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_term_header=$cf_header
+ 			 break
+@@ -19454,7 +19465,7 @@
+ esac
+ 
+ fi
+-echo "$as_me:19457: result: $cf_cv_term_header" >&5
++echo "$as_me:19468: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ case "$cf_cv_term_header" in
+@@ -19481,7 +19492,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19484: checking for unctrl.h" >&5
++echo "$as_me:19495: checking for unctrl.h" >&5
+ echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
+ if test "${cf_cv_unctrl_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19502,7 +19513,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19505 "configure"
++#line 19516 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19516,16 +19527,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19519: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19530: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19522: \$? = $ac_status" >&5
++  echo "$as_me:19533: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19525: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19536: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19528: \$? = $ac_status" >&5
++  echo "$as_me:19539: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unctrl_header=$cf_header
+ 	 break
+@@ -19538,12 +19549,12 @@
+ done
+ 
+ fi
+-echo "$as_me:19541: result: $cf_cv_unctrl_header" >&5
++echo "$as_me:19552: result: $cf_cv_unctrl_header" >&5
+ echo "${ECHO_T}$cf_cv_unctrl_header" >&6
+ 
+ case "$cf_cv_unctrl_header" in
+ (no)
+-	{ echo "$as_me:19546: WARNING: unctrl.h header not found" >&5
++	{ echo "$as_me:19557: WARNING: unctrl.h header not found" >&5
+ echo "$as_me: WARNING: unctrl.h header not found" >&2;}
+ 	;;
+ esac
+@@ -19641,10 +19652,10 @@
+ 
+ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 
+-	echo "$as_me:19644: checking for ${cf_func}" >&5
++	echo "$as_me:19655: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:19647: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:19658: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19653,7 +19664,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19656 "configure"
++#line 19667 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -19686,16 +19697,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19689: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19700: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19692: \$? = $ac_status" >&5
++  echo "$as_me:19703: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19695: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19706: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19698: \$? = $ac_status" >&5
++  echo "$as_me:19709: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -19711,7 +19722,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:19714: result: $cf_result" >&5
++	echo "$as_me:19725: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" != no; then
+ 		cat >>confdefs.h <&5
++	echo "$as_me:19740: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:19732: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:19743: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19738,7 +19749,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19741 "configure"
++#line 19752 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -19771,16 +19782,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19774: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19785: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19777: \$? = $ac_status" >&5
++  echo "$as_me:19788: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19780: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19791: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19783: \$? = $ac_status" >&5
++  echo "$as_me:19794: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -19796,7 +19807,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:19799: result: $cf_result" >&5
++	echo "$as_me:19810: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" != no; then
+ 		cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF
+-#line 19823 "configure"
++#line 19834 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19840,21 +19851,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19843: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19854: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19846: \$? = $ac_status" >&5
++  echo "$as_me:19857: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19849: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19860: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19852: \$? = $ac_status" >&5
++  echo "$as_me:19863: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
+ 
+-echo "${as_me:-configure}:19857: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
++echo "${as_me:-configure}:19868: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+ 
+ 		cat >>confdefs.h <&5
++echo "$as_me:19888: checking for ncurses extended functions" >&5
+ echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19884 "configure"
++#line 19895 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19896,16 +19907,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19899: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19910: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19902: \$? = $ac_status" >&5
++  echo "$as_me:19913: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19905: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19916: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19908: \$? = $ac_status" >&5
++  echo "$as_me:19919: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_ext_funcs=defined
+ else
+@@ -19913,7 +19924,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19916 "configure"
++#line 19927 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19938,16 +19949,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19941: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19952: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19944: \$? = $ac_status" >&5
++  echo "$as_me:19955: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19947: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19958: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19950: \$? = $ac_status" >&5
++  echo "$as_me:19961: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_ext_funcs=yes
+ else
+@@ -19961,7 +19972,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:19964: result: $cf_cv_ncurses_ext_funcs" >&5
++echo "$as_me:19975: result: $cf_cv_ncurses_ext_funcs" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
+ test "$cf_cv_ncurses_ext_funcs" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -19975,11 +19986,11 @@
+ 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
+ 	then
+ 		cf_define_xpg5=no
+-		echo "$as_me:19978: checking if _XPG5 should be defined to enable wide-characters" >&5
++		echo "$as_me:19989: checking if _XPG5 should be defined to enable wide-characters" >&5
+ echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19982 "configure"
++#line 19993 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19992,16 +20003,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19995: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20006: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19998: \$? = $ac_status" >&5
++  echo "$as_me:20009: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20001: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20012: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20004: \$? = $ac_status" >&5
++  echo "$as_me:20015: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -20010,7 +20021,7 @@
+ cf_save_cppflags="$CPPFLAGS"
+ 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20013 "configure"
++#line 20024 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20023,16 +20034,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20026: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20037: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20029: \$? = $ac_status" >&5
++  echo "$as_me:20040: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20032: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20043: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20035: \$? = $ac_status" >&5
++  echo "$as_me:20046: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_define_xpg5=yes
+ else
+@@ -20043,7 +20054,7 @@
+ 			 CPPFLAGS="$cf_save_cppflags"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-		echo "$as_me:20046: result: $cf_define_xpg5" >&5
++		echo "$as_me:20057: result: $cf_define_xpg5" >&5
+ echo "${ECHO_T}$cf_define_xpg5" >&6
+ 
+ 		if test "$cf_define_xpg5" = yes
+@@ -20052,14 +20063,14 @@
+ 		fi
+ 	fi
+ 
+-	echo "$as_me:20055: checking for wide-character functions" >&5
++	echo "$as_me:20066: checking for wide-character functions" >&5
+ echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
+ if test "${cf_cv_widechar_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20062 "configure"
++#line 20073 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20076,16 +20087,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20079: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20090: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20082: \$? = $ac_status" >&5
++  echo "$as_me:20093: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20085: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20096: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20088: \$? = $ac_status" >&5
++  echo "$as_me:20099: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_widechar_funcs=yes
+ else
+@@ -20096,7 +20107,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20099: result: $cf_cv_widechar_funcs" >&5
++echo "$as_me:20110: result: $cf_cv_widechar_funcs" >&5
+ echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
+ 	if test "$cf_cv_widechar_funcs" != no ; then
+ 
+@@ -20117,14 +20128,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20120: checking if $cf_cv_screen library uses pthreads" >&5
++echo "$as_me:20131: checking if $cf_cv_screen library uses pthreads" >&5
+ echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
+ if test "${cf_cv_use_pthreads+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20127 "configure"
++#line 20138 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20142,16 +20153,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20145: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20156: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20148: \$? = $ac_status" >&5
++  echo "$as_me:20159: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20151: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20162: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20154: \$? = $ac_status" >&5
++  echo "$as_me:20165: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_use_pthreads=yes
+ else
+@@ -20162,21 +20173,21 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20165: result: $cf_cv_use_pthreads" >&5
++echo "$as_me:20176: result: $cf_cv_use_pthreads" >&5
+ echo "${ECHO_T}$cf_cv_use_pthreads" >&6
+ test $cf_cv_use_pthreads = yes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_PTHREADS 1
+ EOF
+ 
+-echo "$as_me:20172: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:20183: 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 20179 "configure"
++#line 20190 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20196,16 +20207,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20199: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20210: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20202: \$? = $ac_status" >&5
++  echo "$as_me:20213: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20205: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20216: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20208: \$? = $ac_status" >&5
++  echo "$as_me:20219: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -20217,7 +20228,7 @@
+ 
+ fi
+ 
+-echo "$as_me:20220: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:20231: 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
+@@ -20226,7 +20237,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:20229: checking for openpty in -lutil" >&5
++echo "$as_me:20240: 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
+@@ -20234,7 +20245,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20237 "configure"
++#line 20248 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20253,16 +20264,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20256: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20267: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20259: \$? = $ac_status" >&5
++  echo "$as_me:20270: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20262: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20273: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20265: \$? = $ac_status" >&5
++  echo "$as_me:20276: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -20273,7 +20284,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20276: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:20287: 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
+@@ -20281,7 +20292,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:20284: checking for openpty header" >&5
++echo "$as_me:20295: 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
+@@ -20308,7 +20319,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20311 "configure"
++#line 20322 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20326,16 +20337,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20329: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20340: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20332: \$? = $ac_status" >&5
++  echo "$as_me:20343: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20335: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20346: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20338: \$? = $ac_status" >&5
++  echo "$as_me:20349: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -20353,7 +20364,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:20356: result: $cf_cv_func_openpty" >&5
++echo "$as_me:20367: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -20387,7 +20398,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:20390: checking for function curses_version" >&5
++echo "$as_me:20401: checking for function curses_version" >&5
+ echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
+ if test "${cf_cv_func_curses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20397,7 +20408,7 @@
+   cf_cv_func_curses_version=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20400 "configure"
++#line 20411 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -20413,15 +20424,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:20416: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20427: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20419: \$? = $ac_status" >&5
++  echo "$as_me:20430: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:20421: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20432: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20424: \$? = $ac_status" >&5
++  echo "$as_me:20435: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_curses_version=yes
+ 
+@@ -20436,14 +20447,14 @@
+ fi
+ rm -f core
+ fi
+-echo "$as_me:20439: result: $cf_cv_func_curses_version" >&5
++echo "$as_me:20450: result: $cf_cv_func_curses_version" >&5
+ echo "${ECHO_T}$cf_cv_func_curses_version" >&6
+ test "$cf_cv_func_curses_version" = yes &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_CURSES_VERSION 1
+ EOF
+ 
+-echo "$as_me:20446: checking for alternate character set array" >&5
++echo "$as_me:20457: checking for alternate character set array" >&5
+ echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_acs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20453,7 +20464,7 @@
+ for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20456 "configure"
++#line 20467 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20469,16 +20480,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20472: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20483: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20475: \$? = $ac_status" >&5
++  echo "$as_me:20486: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20478: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20489: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20481: \$? = $ac_status" >&5
++  echo "$as_me:20492: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_acs_map=$name; break
+ else
+@@ -20489,7 +20500,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20492: result: $cf_cv_curses_acs_map" >&5
++echo "$as_me:20503: result: $cf_cv_curses_acs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
+ 
+ test "$cf_cv_curses_acs_map" != unknown &&
+@@ -20499,7 +20510,7 @@
+ 
+ if test "$cf_enable_widec" = yes; then
+ 
+-echo "$as_me:20502: checking for wide alternate character set array" >&5
++echo "$as_me:20513: checking for wide alternate character set array" >&5
+ echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20509,7 +20520,7 @@
+ 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20512 "configure"
++#line 20523 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20525,16 +20536,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20528: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20539: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20531: \$? = $ac_status" >&5
++  echo "$as_me:20542: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20534: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20545: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20537: \$? = $ac_status" >&5
++  echo "$as_me:20548: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_wacs_map=$name
+ 	 break
+@@ -20545,7 +20556,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	done
+ fi
+-echo "$as_me:20548: result: $cf_cv_curses_wacs_map" >&5
++echo "$as_me:20559: result: $cf_cv_curses_wacs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
+ 
+ test "$cf_cv_curses_wacs_map" != unknown &&
+@@ -20553,7 +20564,7 @@
+ #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
+ EOF
+ 
+-echo "$as_me:20556: checking for wide alternate character constants" >&5
++echo "$as_me:20567: checking for wide alternate character constants" >&5
+ echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_symbols+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20563,7 +20574,7 @@
+ if test "$cf_cv_curses_wacs_map" != unknown
+ then
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20566 "configure"
++#line 20577 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20580,16 +20591,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20583: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20594: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20586: \$? = $ac_status" >&5
++  echo "$as_me:20597: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20589: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20600: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20592: \$? = $ac_status" >&5
++  echo "$as_me:20603: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -20599,7 +20610,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ else
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20602 "configure"
++#line 20613 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20615,16 +20626,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20618: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20629: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20621: \$? = $ac_status" >&5
++  echo "$as_me:20632: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20624: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20635: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20627: \$? = $ac_status" >&5
++  echo "$as_me:20638: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -20635,7 +20646,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:20638: result: $cf_cv_curses_wacs_symbols" >&5
++echo "$as_me:20649: result: $cf_cv_curses_wacs_symbols" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
+ 
+ test "$cf_cv_curses_wacs_symbols" != no &&
+@@ -20645,10 +20656,10 @@
+ 
+ fi
+ 
+-echo "$as_me:20648: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:20659: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20651 "configure"
++#line 20662 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20666,16 +20677,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20669: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20680: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20672: \$? = $ac_status" >&5
++  echo "$as_me:20683: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20675: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20686: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20678: \$? = $ac_status" >&5
++  echo "$as_me:20689: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -20684,7 +20695,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:20687: result: $cf_result" >&5
++echo "$as_me:20698: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -20705,14 +20716,14 @@
+ if test "$cf_enable_widec" = yes; then
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:20708: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:20719: 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 20715 "configure"
++#line 20726 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20730,23 +20741,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20733: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20744: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20736: \$? = $ac_status" >&5
++  echo "$as_me:20747: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20739: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20750: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20742: \$? = $ac_status" >&5
++  echo "$as_me:20753: \$? = $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 20749 "configure"
++#line 20760 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20765,16 +20776,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20768: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20779: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20771: \$? = $ac_status" >&5
++  echo "$as_me:20782: \$? = $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:20785: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20777: \$? = $ac_status" >&5
++  echo "$as_me:20788: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -20786,7 +20797,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20789: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:20800: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -20809,14 +20820,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:20812: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:20823: 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 20819 "configure"
++#line 20830 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20834,23 +20845,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20837: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20848: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20840: \$? = $ac_status" >&5
++  echo "$as_me:20851: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20843: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20854: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20846: \$? = $ac_status" >&5
++  echo "$as_me:20857: \$? = $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 20853 "configure"
++#line 20864 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20869,16 +20880,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20872: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20883: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20875: \$? = $ac_status" >&5
++  echo "$as_me:20886: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20878: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20889: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20881: \$? = $ac_status" >&5
++  echo "$as_me:20892: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -20890,7 +20901,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20893: result: $cf_cv_wchar_t" >&5
++echo "$as_me:20904: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -20913,14 +20924,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:20916: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:20927: 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 20923 "configure"
++#line 20934 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20938,23 +20949,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20941: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20952: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20944: \$? = $ac_status" >&5
++  echo "$as_me:20955: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20947: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20958: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20950: \$? = $ac_status" >&5
++  echo "$as_me:20961: \$? = $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 20957 "configure"
++#line 20968 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20973,16 +20984,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20976: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20987: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20979: \$? = $ac_status" >&5
++  echo "$as_me:20990: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20982: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20993: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20985: \$? = $ac_status" >&5
++  echo "$as_me:20996: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -20994,7 +21005,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20997: result: $cf_cv_wint_t" >&5
++echo "$as_me:21008: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -21018,10 +21029,10 @@
+ 
+ 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
+ 
+-echo "$as_me:21021: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21032: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21024 "configure"
++#line 21035 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21039,16 +21050,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21042: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21053: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21045: \$? = $ac_status" >&5
++  echo "$as_me:21056: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21048: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21059: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21051: \$? = $ac_status" >&5
++  echo "$as_me:21062: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21057,7 +21068,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21060: result: $cf_result" >&5
++echo "$as_me:21071: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -21079,10 +21090,10 @@
+ 
+ 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
+ 
+-echo "$as_me:21082: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21093: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21085 "configure"
++#line 21096 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21100,16 +21111,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21103: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21114: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21106: \$? = $ac_status" >&5
++  echo "$as_me:21117: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21109: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21120: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21112: \$? = $ac_status" >&5
++  echo "$as_me:21123: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21118,7 +21129,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21121: result: $cf_result" >&5
++echo "$as_me:21132: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -21140,10 +21151,10 @@
+ 
+ 	if test "$NCURSES_OK_WINT_T" = 0 ; then
+ 
+-echo "$as_me:21143: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21154: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21146 "configure"
++#line 21157 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21161,16 +21172,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21164: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21175: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21167: \$? = $ac_status" >&5
++  echo "$as_me:21178: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21170: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21181: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21173: \$? = $ac_status" >&5
++  echo "$as_me:21184: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21179,7 +21190,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21182: result: $cf_result" >&5
++echo "$as_me:21193: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -21208,11 +21219,11 @@
+ boolfnames \
+ ttytype
+ do
+-echo "$as_me:21211: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21222: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21215 "configure"
++#line 21226 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -21245,16 +21256,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21248: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21259: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21251: \$? = $ac_status" >&5
++  echo "$as_me:21262: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21254: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21265: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21257: \$? = $ac_status" >&5
++  echo "$as_me:21268: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ 
+@@ -21264,7 +21275,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21267: result: $cf_result" >&5
++echo "$as_me:21278: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test "$cf_result" = yes ; then
+@@ -21276,14 +21287,14 @@
+ EOF
+ 
+ else
+-	echo "$as_me:21279: checking for data $cf_data in library" >&5
++	echo "$as_me:21290: checking for data $cf_data in library" >&5
+ echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6
+ 	# BSD linkers insist on making weak linkage, but resolve at runtime.
+ 	if test "$cross_compiling" = yes; then
+ 
+ 	# cross-compiling
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21286 "configure"
++#line 21297 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -21322,16 +21333,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21325: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21336: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21328: \$? = $ac_status" >&5
++  echo "$as_me:21339: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21331: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21342: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21334: \$? = $ac_status" >&5
++  echo "$as_me:21345: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21343,7 +21354,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21346 "configure"
++#line 21357 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -21375,15 +21386,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21378: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21389: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21381: \$? = $ac_status" >&5
++  echo "$as_me:21392: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21383: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21394: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21386: \$? = $ac_status" >&5
++  echo "$as_me:21397: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ 
+@@ -21395,7 +21406,7 @@
+ fi
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-	echo "$as_me:21398: result: $cf_result" >&5
++	echo "$as_me:21409: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = yes ; then
+ 
+@@ -21412,7 +21423,7 @@
+ 
+ if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
+ then
+-	echo "$as_me:21415: checking for X" >&5
++	echo "$as_me:21426: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
+ # Check whether --with-x or --without-x was given.
+@@ -21516,17 +21527,17 @@
+   # Guess where to find include files, by looking for Intrinsic.h.
+   # First, try using that file with no special directory specified.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21519 "configure"
++#line 21530 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:21523: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:21534: \"$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:21529: \$? = $ac_status" >&5
++  echo "$as_me:21540: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -21559,7 +21570,7 @@
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21562 "configure"
++#line 21573 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -21571,16 +21582,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21574: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21585: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21577: \$? = $ac_status" >&5
++  echo "$as_me:21588: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21580: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21591: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21583: \$? = $ac_status" >&5
++  echo "$as_me:21594: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -21618,7 +21629,7 @@
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:21621: result: $have_x" >&5
++  echo "$as_me:21632: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+   no_x=yes
+ else
+@@ -21628,7 +21639,7 @@
+   # Update the cache value to reflect the command line values.
+   ac_cv_have_x="have_x=yes \
+ 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  echo "$as_me:21631: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "$as_me:21642: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+@@ -21655,11 +21666,11 @@
+     # others require no space.  Words are not sufficient . . . .
+     case `(uname -sr) 2>/dev/null` in
+     "SunOS 5"*)
+-      echo "$as_me:21658: checking whether -R must be followed by a space" >&5
++      echo "$as_me:21669: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+       cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21662 "configure"
++#line 21673 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21671,16 +21682,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21674: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21685: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21677: \$? = $ac_status" >&5
++  echo "$as_me:21688: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21680: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21691: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21683: \$? = $ac_status" >&5
++  echo "$as_me:21694: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_nospace=yes
+ else
+@@ -21690,13 +21701,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+       if test $ac_R_nospace = yes; then
+-	echo "$as_me:21693: result: no" >&5
++	echo "$as_me:21704: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	X_LIBS="$X_LIBS -R$x_libraries"
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21699 "configure"
++#line 21710 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21708,16 +21719,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21711: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21722: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21714: \$? = $ac_status" >&5
++  echo "$as_me:21725: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21717: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21728: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21720: \$? = $ac_status" >&5
++  echo "$as_me:21731: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_space=yes
+ else
+@@ -21727,11 +21738,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	if test $ac_R_space = yes; then
+-	  echo "$as_me:21730: result: yes" >&5
++	  echo "$as_me:21741: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ 	else
+-	  echo "$as_me:21734: result: neither works" >&5
++	  echo "$as_me:21745: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ 	fi
+       fi
+@@ -21751,7 +21762,7 @@
+     # the Alpha needs dnet_stub (dnet does not exist).
+     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21754 "configure"
++#line 21765 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21770,22 +21781,22 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21773: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21784: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21776: \$? = $ac_status" >&5
++  echo "$as_me:21787: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21779: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21790: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21782: \$? = $ac_status" >&5
++  echo "$as_me:21793: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:21788: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:21799: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21793,7 +21804,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21796 "configure"
++#line 21807 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21812,16 +21823,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21815: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21826: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21818: \$? = $ac_status" >&5
++  echo "$as_me:21829: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21821: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21832: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21824: \$? = $ac_status" >&5
++  echo "$as_me:21835: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -21832,14 +21843,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21835: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:21846: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      echo "$as_me:21842: checking for dnet_ntoa in -ldnet_stub" >&5
++      echo "$as_me:21853: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21847,7 +21858,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21850 "configure"
++#line 21861 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21866,16 +21877,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21869: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21880: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21872: \$? = $ac_status" >&5
++  echo "$as_me:21883: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21875: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21886: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21878: \$? = $ac_status" >&5
++  echo "$as_me:21889: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -21886,7 +21897,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21889: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:21900: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -21905,13 +21916,13 @@
+     # on Irix 5.2, according to T.E. Dickey.
+     # The functions gethostbyname, getservbyname, and inet_addr are
+     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+-    echo "$as_me:21908: checking for gethostbyname" >&5
++    echo "$as_me:21919: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21914 "configure"
++#line 21925 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21942,16 +21953,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21945: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21956: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21948: \$? = $ac_status" >&5
++  echo "$as_me:21959: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21951: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21962: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21954: \$? = $ac_status" >&5
++  echo "$as_me:21965: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gethostbyname=yes
+ else
+@@ -21961,11 +21972,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21964: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:21975: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+-      echo "$as_me:21968: checking for gethostbyname in -lnsl" >&5
++      echo "$as_me:21979: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21973,7 +21984,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21976 "configure"
++#line 21987 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21992,16 +22003,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21995: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22006: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21998: \$? = $ac_status" >&5
++  echo "$as_me:22009: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22001: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22012: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22004: \$? = $ac_status" >&5
++  echo "$as_me:22015: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -22012,14 +22023,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22015: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:22026: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test "$ac_cv_lib_nsl_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+-        echo "$as_me:22022: checking for gethostbyname in -lbsd" >&5
++        echo "$as_me:22033: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22027,7 +22038,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22030 "configure"
++#line 22041 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22046,16 +22057,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22049: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22060: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22052: \$? = $ac_status" >&5
++  echo "$as_me:22063: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22055: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22066: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22058: \$? = $ac_status" >&5
++  echo "$as_me:22069: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -22066,7 +22077,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22069: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:22080: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test "$ac_cv_lib_bsd_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -22082,13 +22093,13 @@
+     # variants that don't use the nameserver (or something).  -lsocket
+     # must be given before -lnsl if both are needed.  We assume that
+     # if connect needs -lnsl, so does gethostbyname.
+-    echo "$as_me:22085: checking for connect" >&5
++    echo "$as_me:22096: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22091 "configure"
++#line 22102 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22119,16 +22130,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22122: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22133: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22125: \$? = $ac_status" >&5
++  echo "$as_me:22136: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22128: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22139: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22131: \$? = $ac_status" >&5
++  echo "$as_me:22142: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_connect=yes
+ else
+@@ -22138,11 +22149,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22141: result: $ac_cv_func_connect" >&5
++echo "$as_me:22152: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+ 
+     if test $ac_cv_func_connect = no; then
+-      echo "$as_me:22145: checking for connect in -lsocket" >&5
++      echo "$as_me:22156: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22150,7 +22161,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22153 "configure"
++#line 22164 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22169,16 +22180,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22172: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22183: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22175: \$? = $ac_status" >&5
++  echo "$as_me:22186: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22178: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22189: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22181: \$? = $ac_status" >&5
++  echo "$as_me:22192: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_socket_connect=yes
+ else
+@@ -22189,7 +22200,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22192: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:22203: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test "$ac_cv_lib_socket_connect" = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -22198,13 +22209,13 @@
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    echo "$as_me:22201: checking for remove" >&5
++    echo "$as_me:22212: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22207 "configure"
++#line 22218 "configure"
+ #include "confdefs.h"
+ #define remove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22235,16 +22246,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22238: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22249: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22241: \$? = $ac_status" >&5
++  echo "$as_me:22252: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22244: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22255: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22247: \$? = $ac_status" >&5
++  echo "$as_me:22258: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_remove=yes
+ else
+@@ -22254,11 +22265,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22257: result: $ac_cv_func_remove" >&5
++echo "$as_me:22268: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+ 
+     if test $ac_cv_func_remove = no; then
+-      echo "$as_me:22261: checking for remove in -lposix" >&5
++      echo "$as_me:22272: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22266,7 +22277,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22269 "configure"
++#line 22280 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22285,16 +22296,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22288: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22299: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22291: \$? = $ac_status" >&5
++  echo "$as_me:22302: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22294: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22305: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22297: \$? = $ac_status" >&5
++  echo "$as_me:22308: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_posix_remove=yes
+ else
+@@ -22305,7 +22316,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22308: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:22319: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test "$ac_cv_lib_posix_remove" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -22314,13 +22325,13 @@
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    echo "$as_me:22317: checking for shmat" >&5
++    echo "$as_me:22328: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22323 "configure"
++#line 22334 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22351,16 +22362,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22354: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22365: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22357: \$? = $ac_status" >&5
++  echo "$as_me:22368: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22360: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22371: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22363: \$? = $ac_status" >&5
++  echo "$as_me:22374: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_shmat=yes
+ else
+@@ -22370,11 +22381,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22373: result: $ac_cv_func_shmat" >&5
++echo "$as_me:22384: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+ 
+     if test $ac_cv_func_shmat = no; then
+-      echo "$as_me:22377: checking for shmat in -lipc" >&5
++      echo "$as_me:22388: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22382,7 +22393,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22385 "configure"
++#line 22396 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22401,16 +22412,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22404: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22415: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22407: \$? = $ac_status" >&5
++  echo "$as_me:22418: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22410: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22421: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22413: \$? = $ac_status" >&5
++  echo "$as_me:22424: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+@@ -22421,7 +22432,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22424: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:22435: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test "$ac_cv_lib_ipc_shmat" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -22439,7 +22450,7 @@
+   # These have to be linked with before -lX11, unlike the other
+   # libraries we check for below, so use a different variable.
+   # John Interrante, Karl Berry
+-  echo "$as_me:22442: checking for IceConnectionNumber in -lICE" >&5
++  echo "$as_me:22453: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22447,7 +22458,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22450 "configure"
++#line 22461 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22466,16 +22477,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22469: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22480: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22472: \$? = $ac_status" >&5
++  echo "$as_me:22483: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22475: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22486: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22478: \$? = $ac_status" >&5
++  echo "$as_me:22489: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -22486,7 +22497,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22489: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:22500: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -22533,16 +22544,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22536: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22547: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22541: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22552: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22545: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22556: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -22581,16 +22592,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22584: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:22595: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22589: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:22600: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22593: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22604: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -22629,23 +22640,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22632: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:22643: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22637: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:22648: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22641: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22652: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:22648: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:22659: 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.
+@@ -22662,7 +22673,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:22665: result: $enable_warnings" >&5
++echo "$as_me:22676: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -22685,10 +22696,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:22688: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:22699: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -22738,12 +22749,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:22741: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:22752: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22744: \$? = $ac_status" >&5
++  echo "$as_me:22755: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:22746: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:22757: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -22821,7 +22832,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22824 "configure"
++#line 22835 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22836,26 +22847,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22839: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22850: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22842: \$? = $ac_status" >&5
++  echo "$as_me:22853: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22845: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22856: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22848: \$? = $ac_status" >&5
++  echo "$as_me:22859: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:22851: checking for X11/Xt const-feature" >&5
++echo "$as_me:22862: 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 22858 "configure"
++#line 22869 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -22873,16 +22884,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22876: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22887: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22879: \$? = $ac_status" >&5
++  echo "$as_me:22890: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22882: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22893: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22885: \$? = $ac_status" >&5
++  echo "$as_me:22896: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -22897,7 +22908,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22900: result: $cf_cv_const_x_string" >&5
++echo "$as_me:22911: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -22926,7 +22937,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:22956: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -22958,12 +22969,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:22961: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:22972: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22964: \$? = $ac_status" >&5
++  echo "$as_me:22975: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:22966: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:22977: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -22971,7 +22982,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:22974: checking for $CC warning options..." >&5
++	{ echo "$as_me:22985: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -22994,12 +23005,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:22997: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:23008: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23000: \$? = $ac_status" >&5
++  echo "$as_me:23011: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:23002: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:23013: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -23007,7 +23018,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:23010: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:23021: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -23017,7 +23028,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:23020: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:23031: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -23034,7 +23045,7 @@
+ 
+ fi
+ 
+-echo "$as_me:23037: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:23048: 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.
+@@ -23056,7 +23067,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:23059: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:23070: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -23170,23 +23181,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:23173: checking for dmalloc.h" >&5
++	echo "$as_me:23184: 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 23179 "configure"
++#line 23190 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:23183: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23194: \"$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:23189: \$? = $ac_status" >&5
++  echo "$as_me:23200: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23205,11 +23216,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23208: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:23219: 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:23212: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:23223: 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
+@@ -23217,7 +23228,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23220 "configure"
++#line 23231 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -23236,16 +23247,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23239: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23250: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23242: \$? = $ac_status" >&5
++  echo "$as_me:23253: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23245: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23256: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23248: \$? = $ac_status" >&5
++  echo "$as_me:23259: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -23256,7 +23267,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23259: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:23270: 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:23285: 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.
+@@ -23293,7 +23304,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:23296: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:23307: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -23407,23 +23418,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:23410: checking for dbmalloc.h" >&5
++	echo "$as_me:23421: 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 23416 "configure"
++#line 23427 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:23420: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23431: \"$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:23426: \$? = $ac_status" >&5
++  echo "$as_me:23437: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23442,11 +23453,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23445: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:23456: 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:23449: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:23460: 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
+@@ -23454,7 +23465,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23457 "configure"
++#line 23468 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -23473,16 +23484,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23476: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23487: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23479: \$? = $ac_status" >&5
++  echo "$as_me:23490: \$? = $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:23493: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23485: \$? = $ac_status" >&5
++  echo "$as_me:23496: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -23493,7 +23504,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23496: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:23507: 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:23522: 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.
+@@ -23530,7 +23541,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:23533: result: ${with_valgrind:-no}" >&5
++echo "$as_me:23544: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -23643,7 +23654,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:23646: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:23657: 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.
+@@ -23654,7 +23665,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:23657: result: $with_no_leaks" >&5
++echo "$as_me:23668: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -23672,7 +23683,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:23675: checking for an rpath option" >&5
++	echo "$as_me:23686: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -23703,12 +23714,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:23706: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:23717: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:23711: checking if we need a space after rpath option" >&5
++		echo "$as_me:23722: 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"
+ 
+@@ -23729,7 +23740,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23732 "configure"
++#line 23743 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -23741,16 +23752,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23744: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23755: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23747: \$? = $ac_status" >&5
++  echo "$as_me:23758: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23750: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23761: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23753: \$? = $ac_status" >&5
++  echo "$as_me:23764: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -23760,14 +23771,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:23763: result: $cf_rpath_space" >&5
++		echo "$as_me:23774: 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:23770: checking if rpath-hack should be disabled" >&5
++echo "$as_me:23781: 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.
+@@ -23785,22 +23796,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:23788: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:23799: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:23793: checking for updated LDFLAGS" >&5
++echo "$as_me:23804: 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:23796: result: maybe" >&5
++	echo "$as_me:23807: 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:23803: checking for $ac_word" >&5
++echo "$as_me:23814: 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
+@@ -23815,7 +23826,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:23818: found $ac_dir/$ac_word" >&5
++echo "$as_me:23829: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -23823,10 +23834,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:23826: result: $cf_ldd_prog" >&5
++  echo "$as_me:23837: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:23829: result: no" >&5
++  echo "$as_me:23840: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -23840,7 +23851,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23843 "configure"
++#line 23854 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -23852,16 +23863,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23855: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23866: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23858: \$? = $ac_status" >&5
++  echo "$as_me:23869: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23861: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23872: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23864: \$? = $ac_status" >&5
++  echo "$as_me:23875: \$? = $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`
+@@ -23889,7 +23900,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:23892: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:23903: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -23901,11 +23912,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23904: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23915: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23908: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23919: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -23942,7 +23953,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:23945: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:23956: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -23955,11 +23966,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23958: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23969: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:23962: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:23973: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -23996,7 +24007,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:23999: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:24010: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -24009,14 +24020,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:24012: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:24023: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:24016: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:24027: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:24019: result: no" >&5
++	echo "$as_me:24030: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -24106,7 +24117,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:24109: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:24120: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -24242,7 +24253,7 @@
+ cat >>"$CONFIG_STATUS" <&5
+ echo "$as_me: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -24306,7 +24317,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:24309: error: unrecognized option: $1
++  -*) { { echo "$as_me:24320: 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;}
+@@ -24325,7 +24336,7 @@
+ ## Running config.status.  ##
+ ## ----------------------- ##
+ 
+-This file was extended by $as_me 2.52.20231210, executed with
++This file was extended by $as_me 2.52.20240618, executed with
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+   CONFIG_LINKS    = $CONFIG_LINKS
+@@ -24356,7 +24367,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:24359: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:24370: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -24559,14 +24570,14 @@
+       # is no need to browse any of the substitutions).
+       # These are the two extra sed commands mentioned above.
+       (echo ':t
+-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed
++  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && sed -e 's/\\\\*$//g' -e 's/$/\\/' -e 's/;t t\\/;t t/' -e 't' -e '3,'$ac_max_sed_lines's/$/\\/' "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed
+       # It is possible to make a multiline substitution using escaped newlines.
+       # Ensure that we do not split the substitution between script fragments.
+       ac_BEG=$ac_end
+       ac_END=`expr "$ac_end" + "$ac_max_sed_lines"`
+       sed "1,${ac_BEG}d; ${ac_END}p; q" "$tmp"/subs.sed >"$tmp"/subs.next
+       if test -s "$tmp"/subs.next; then
+-        grep '^s,@[^@,][^@,]*@,.*\\$' "$tmp"/subs.next >"$tmp"/subs.edit
++        grep '^s,@[^@,][^@,]*@,.*$' "$tmp"/subs.next | grep -v '^s,@.*;t t$' >"$tmp"/subs.edit
+         if test ! -s "$tmp"/subs.edit; then
+           grep "^s,@[^@,][^@,]*@,.*,;t t$" "$tmp"/subs.next >"$tmp"/subs.edit
+           if test ! -s "$tmp"/subs.edit; then
+@@ -24664,7 +24675,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:24667: creating $ac_file" >&5
++    { echo "$as_me:24678: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -24682,7 +24693,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:24685: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:24696: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -24695,7 +24706,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:24698: error: cannot find input file: $f" >&5
++           { { echo "$as_me:24709: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -24711,7 +24722,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:24714: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:24725: 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;}
+@@ -24720,7 +24731,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:24723: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:24734: 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;}
+@@ -24765,7 +24776,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:24768: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:24779: 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;}
+@@ -24776,7 +24787,7 @@
+     $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:24779: WARNING: Some variables may not be substituted:
++      { echo "$as_me:24790: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -24825,7 +24836,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:24828: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:24839: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -24836,7 +24847,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:24839: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:24850: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -24849,7 +24860,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:24852: error: cannot find input file: $f" >&5
++           { { echo "$as_me:24863: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -24907,7 +24918,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:24910: $ac_file is unchanged" >&5
++      { echo "$as_me:24921: $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/packages/ncurses/6.5/ncurses-6.5-20240713.patch b/packages/ncurses/6.5/ncurses-6.5-20240713.patch
new file mode 100644
index 0000000000..27df6a22f0
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20240713.patch
@@ -0,0 +1,293 @@
+# ncurses 6.5 - patch 20240713 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20240713.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sat Jul 13 23:06:05 UTC 2024
+# ------------------------------------------------------------------------------
+# NEWS                             |    5 ++
+# VERSION                          |    2 -
+# dist.mk                          |    4 +-
+# misc/ncurses-config.in           |   66 +++++++++++++++++++++++--------------
+# 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 -
+# 11 files changed, 60 insertions(+), 39 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4147 
+--- ncurses-6.5-20240706+/NEWS	2024-07-06 18:21:47.000000000 +0000
++++ ncurses-6.5-20240713/NEWS	2024-07-13 20:44:30.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4147 2024/07/06 18:21:47 tom Exp $
++-- $Id: NEWS,v 1.4149 2024/07/13 20:44:30 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.
+ 
++20240713
++	+ modify misc/ncurses-config.in, improved match with pkg-config output.
++
+ 20240706
+ 	+ update configure script to use macro changes from dialog.
+ 	+ modify CF_NCURSES_PTHREADS to avoid equating package and library
+Index: VERSION
+--- ncurses-6.5-20240706+/VERSION	2024-07-06 09:41:29.000000000 +0000
++++ ncurses-6.5-20240713/VERSION	2024-07-13 10:06:25.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20240706
++5:0:10	6.5	20240713
+Index: dist.mk
+Prereq:  1.1621 
+--- ncurses-6.5-20240706+/dist.mk	2024-07-06 09:41:29.000000000 +0000
++++ ncurses-6.5-20240713/dist.mk	2024-07-13 10:06:25.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1621 2024/07/06 09:41:29 tom Exp $
++# $Id: dist.mk,v 1.1622 2024/07/13 10:06:25 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 = 5
+-NCURSES_PATCH = 20240706
++NCURSES_PATCH = 20240713
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: misc/ncurses-config.in
+Prereq:  1.53 
+--- ncurses-6.5-20240706+/misc/ncurses-config.in	2024-06-22 20:52:02.000000000 +0000
++++ ncurses-6.5-20240713/misc/ncurses-config.in	2024-07-13 20:00:52.000000000 +0000
+@@ -1,5 +1,5 @@
+ #!@SHELL@
+-# $Id: ncurses-config.in,v 1.53 2024/06/22 20:52:02 tom Exp $
++# $Id: ncurses-config.in,v 1.54 2024/07/13 20:00:52 tom Exp $
+ ##############################################################################
+ # Copyright 2018-2022,2024 Thomas E. Dickey                                  #
+ # Copyright 2006-2015,2017 Free Software Foundation, Inc.                    #
+@@ -94,6 +94,24 @@
+ 	LIBS="-l${THIS} -l${TINFO_LIB} $LIBS"
+ fi
+ 
++CFLAGS="@PKG_CFLAGS@"
++if [ "$includedir" != "/usr/include" ]; then
++	if [ "x@WITH_OVERWRITE@" = xno ]
++	then
++		[ -n "$CFLAGS" ] && CFLAGS="$CFLAGS "
++		CFLAGS="$CFLAGS -I${includesubdir}"
++	fi
++	[ -n "$CFLAGS" ] && CFLAGS="$CFLAGS "
++	CFLAGS="$CFLAGS-I${includedir}"
++	includetop=`echo "$includedir" | sed -e 's,/include/[^/]*$,/include,'`
++	[ "$includetop" = "/usr/include" ] && includetop="$includedir"
++	if [ "x$includetop" != "x$includedir" ]
++	then
++		[ -n "$CFLAGS" ] && CFLAGS="$CFLAGS "
++		CFLAGS="$CFLAGS-I$includetop"
++	fi
++fi
++
+ # Ignore -L options which do not correspond to an actual directory, or which
+ # are standard library directories (i.e., the linker is supposed to search
+ # those directories).
+@@ -187,54 +205,54 @@
+ 	# compile/link
+ 	--cflags)
+ 		OPTS=
+-		for opt in @PKG_CFLAGS@
++		for opt in $CFLAGS
+ 		do
+ 			case "x$opt" in
+-			x-[DIU]*)
+-				OPTS="$OPTS $opt"
+-				;;
+-			x-Wl,*)
+-				OPTS="$OPTS $opt"
+-				;;
+ 			x-[OW]*)
+-				;;
+-			*)
+-				OPTS="$OPTS $opt"
++				opt=
+ 				;;
+ 			esac
++			if [ -n "$opt" ]
++			then
++				[ -n "$OPTS" ] && OPTS="$OPTS "
++				OPTS="$OPTS$opt"
++			fi
+ 		done
+ 		printf "%s\n" "$OPTS"
+ 		;;
+ 	--cflags-only-I)
+ 		OPTS=
+-		for opt in @PKG_CFLAGS@
++		for opt in $CFLAGS
+ 		do
+ 			case "x$opt" in
+-			x-[DIU]*)
+-				OPTS="$OPTS $opt"
++			x-[I]*)
+ 				;;
+ 			*)
++				opt=
+ 				;;
+ 			esac
++			if [ -n "$opt" ]
++			then
++				[ -n "$OPTS" ] && OPTS="$OPTS "
++				OPTS="$OPTS$opt"
++			fi
+ 		done
+ 		printf "%s\n" "$OPTS"
+ 		;;
+ 	--cflags-only-other)
+ 		OPTS=
+-		for opt in @PKG_CFLAGS@
++		for opt in $CFLAGS
+ 		do
+ 			case "x$opt" in
+-			x-[DIU]*)
+-				;;
+-			x-Wl,*)
+-				OPTS="$OPTS $opt"
+-				;;
+-			x-[OW]*)
+-				;;
+-			*)
+-				OPTS="$OPTS $opt"
++			x-[I]*|x-[OW]*)
++				opt=
+ 				;;
+ 			esac
++			if [ -n "$opt" ]
++			then
++				[ -n "$OPTS" ] && OPTS="$OPTS "
++				OPTS="$OPTS$opt"
++			fi
+ 		done
+ 		printf "%s\n" "$OPTS"
+ 		;;
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20240706+/package/debian-mingw/changelog	2024-07-06 09:41:29.000000000 +0000
++++ ncurses-6.5-20240713/package/debian-mingw/changelog	2024-07-13 10:06:25.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240706) unstable; urgency=low
++ncurses6td (6.5+20240713) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 06 Jul 2024 05:41:29 -0400
++ -- Thomas E. Dickey   Sat, 13 Jul 2024 06:06:25 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20240706+/package/debian-mingw64/changelog	2024-07-06 09:41:29.000000000 +0000
++++ ncurses-6.5-20240713/package/debian-mingw64/changelog	2024-07-13 10:06:25.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240706) unstable; urgency=low
++ncurses6td (6.5+20240713) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 06 Jul 2024 05:41:29 -0400
++ -- Thomas E. Dickey   Sat, 13 Jul 2024 06:06:25 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20240706+/package/debian/changelog	2024-07-06 09:41:29.000000000 +0000
++++ ncurses-6.5-20240713/package/debian/changelog	2024-07-13 10:06:25.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240706) unstable; urgency=low
++ncurses6td (6.5+20240713) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 06 Jul 2024 05:41:29 -0400
++ -- Thomas E. Dickey   Sat, 13 Jul 2024 06:06:25 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.656 
+--- ncurses-6.5-20240706+/package/mingw-ncurses.nsi	2024-07-06 09:41:29.000000000 +0000
++++ ncurses-6.5-20240713/package/mingw-ncurses.nsi	2024-07-13 10:06:25.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.656 2024/07/06 09:41:29 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.657 2024/07/13 10:06:25 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "0706"
++!define VERSION_MMDD  "0713"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20240706+/package/mingw-ncurses.spec	2024-07-06 09:41:29.000000000 +0000
++++ ncurses-6.5-20240713/package/mingw-ncurses.spec	2024-07-13 10:06:25.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20240706
++Release: 20240713
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20240706+/package/ncurses.spec	2024-07-06 09:41:29.000000000 +0000
++++ ncurses-6.5-20240713/package/ncurses.spec	2024-07-13 10:06:25.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20240706
++Release: 20240713
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20240706+/package/ncursest.spec	2024-07-06 09:41:29.000000000 +0000
++++ ncurses-6.5-20240713/package/ncursest.spec	2024-07-13 10:06:25.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20240706
++Release: 20240713
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/packages/ncurses/6.5/ncurses-6.5-20240720.patch b/packages/ncurses/6.5/ncurses-6.5-20240720.patch
new file mode 100644
index 0000000000..c53f680f13
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20240720.patch
@@ -0,0 +1,3161 @@
+# ncurses 6.5 - patch 20240720 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20240720.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Jul 21 00:16:51 UTC 2024
+# ------------------------------------------------------------------------------
+# NEWS                              |    9 
+# VERSION                           |    2 
+# aclocal.m4                        |   22 +
+# configure                         |   55 +-
+# configure.in                      |    5 
+# dist.mk                           |    4 
+# doc/html/man/curs_add_wch.3x.html |   10 
+# doc/html/man/curs_addch.3x.html   |   10 
+# doc/html/man/curs_addstr.3x.html  |   34 -
+# doc/html/man/curs_addwstr.3x.html |   54 +-
+# doc/html/man/curs_beep.3x.html    |   10 
+# doc/html/man/curs_get_wch.3x.html |   16 
+# doc/html/man/curs_getch.3x.html   |   28 -
+# doc/html/man/curs_move.3x.html    |   13 
+# doc/html/man/ncurses.3x.html      |  752 ++++++++++++++++++------------------
+# doc/html/man/terminfo.5.html      |    2 
+# doc/html/man/wresize.3x.html      |   57 +-
+# man/curs_add_wch.3x               |    8 
+# man/curs_addch.3x                 |    8 
+# man/curs_addstr.3x                |   32 -
+# man/curs_addwstr.3x               |   50 +-
+# man/curs_beep.3x                  |    6 
+# man/curs_get_wch.3x               |   25 -
+# man/curs_getch.3x                 |   48 +-
+# man/curs_move.3x                  |   10 
+# man/man_db.renames.in             |    3 
+# man/ncurses.3x                    |   12 
+# man/wresize.3x                    |  102 +++-
+# misc/Makefile.in                  |    8 
+# ncurses/win32con/win_driver.c     |   15 
+# 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 
+# 37 files changed, 782 insertions(+), 650 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4149 
+--- ncurses-6.5-20240713+/NEWS	2024-07-13 20:44:30.000000000 +0000
++++ ncurses-6.5-20240720/NEWS	2024-07-20 21:54:20.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4149 2024/07/13 20:44:30 tom Exp $
++-- $Id: NEWS,v 1.4151 2024/07/20 21:54:20 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.
+ 
++20240720
++	+ improve formatting/style of manpages (patches by Branden Robinson).
++	+ modify configure script and misc/Makefile to accept glob expressions
++	  that include Windows/DOS drive-letters (report by Eli Zaretskii).
++	+ fix misspelled ifdef and correct return-value of _nc_mingw_tcflush in
++	  win_driver.c (report/patch by Eli Zaretskii).
++
+ 20240713
+ 	+ modify misc/ncurses-config.in, improved match with pkg-config output.
+ 
+Index: VERSION
+--- ncurses-6.5-20240713+/VERSION	2024-07-13 10:06:25.000000000 +0000
++++ ncurses-6.5-20240720/VERSION	2024-07-20 10:19:56.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20240713
++5:0:10	6.5	20240720
+Index: aclocal.m4
+Prereq:  1.1074 
+--- ncurses-6.5-20240713+/aclocal.m4	2024-07-06 18:27:53.000000000 +0000
++++ ncurses-6.5-20240720/aclocal.m4	2024-07-20 23:47:05.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1074 2024/07/06 18:27:53 tom Exp $
++dnl $Id: aclocal.m4,v 1.1078 2024/07/20 23:47:05 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -3239,6 +3239,26 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_GLOB_FULLPATH version: 1 updated: 2024/07/20 19:45:17
++dnl ----------------
++dnl Use this in case-statements to check for pathname syntax, i.e., absolute
++dnl pathnames.  The "x" is assumed since we provide an alternate form for DOS.
++AC_DEFUN([CF_GLOB_FULLPATH],[
++AC_REQUIRE([CF_WITH_SYSTYPE])dnl
++case "$cf_cv_system_name" in
++(cygwin*|msys*|mingw32*|mingw64|os2*)
++	GLOB_FULLPATH_ONLY='x/*|x[[a-zA-Z]]:[[\\/]]*'
++	GLOB_FULLPATH_ARGS='x/*\ |x[[a-zA-Z]]:[[\\/]]*\ '
++	;;
++(*)
++	GLOB_FULLPATH_ONLY='x/*'
++	GLOB_FULLPATH_ARGS='x/*\ '
++	;;
++esac
++AC_SUBST(GLOB_FULLPATH_ONLY)
++AC_SUBST(GLOB_FULLPATH_ARGS)
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_GNATPREP_OPT_T version: 1 updated: 2014/08/02 18:37:25
+ dnl -----------------
+ AC_DEFUN([CF_GNATPREP_OPT_T],[
+Index: configure
+--- ncurses-6.5-20240713+/configure	2024-07-06 18:28:05.000000000 +0000
++++ ncurses-6.5-20240720/configure	2024-07-20 23:48:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.782 .
++# From configure.in Revision: 1.783 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20240618.
+ #
+@@ -29428,6 +29428,17 @@
+ echo "$as_me:29428: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
++case "$cf_cv_system_name" in
++(cygwin*|msys*|mingw32*|mingw64|os2*)
++	GLOB_FULLPATH_ONLY='x/*|x[a-zA-Z]:[\\/]*'
++	GLOB_FULLPATH_ARGS='x/*\ |x[a-zA-Z]:[\\/]*\ '
++	;;
++(*)
++	GLOB_FULLPATH_ONLY='x/*'
++	GLOB_FULLPATH_ARGS='x/*\ '
++	;;
++esac
++
+ # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
+ case "x$NCURSES_OSPEED" in
+ (*short*)
+@@ -29486,7 +29497,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
+ 
+-echo "${as_me:-configure}:29489: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
++echo "${as_me:-configure}:29500: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+ 
+ fi
+ 
+@@ -29513,7 +29524,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:29516: checking for linker search path" >&5
++echo "$as_me:29527: 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
+@@ -29561,7 +29572,7 @@
+ 			cf_pathlist="$cf_pathlist /lib /usr/lib"
+ 			;;
+ 		(*)
+-			{ echo "$as_me:29564: WARNING: problem with Solaris architecture" >&5
++			{ echo "$as_me:29575: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ 			;;
+ 		esac
+@@ -29602,7 +29613,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:29605: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29616: 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'`
+@@ -29688,7 +29699,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29691: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29702: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -29869,7 +29880,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:29872: error: ambiguous option: $1
++    { { echo "$as_me:29883: 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;}
+@@ -29888,7 +29899,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:29891: error: unrecognized option: $1
++  -*) { { echo "$as_me:29902: 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;}
+@@ -30018,7 +30029,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:30021: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:30032: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -30400,6 +30411,8 @@
+ s,@ADAHTML_DIR@,$ADAHTML_DIR,;t t
+ s,@LIBTOOL_OPTS_CXX@,$LIBTOOL_OPTS_CXX,;t t
+ s,@PKG_CFLAGS@,$PKG_CFLAGS,;t t
++s,@GLOB_FULLPATH_ONLY@,$GLOB_FULLPATH_ONLY,;t t
++s,@GLOB_FULLPATH_ARGS@,$GLOB_FULLPATH_ARGS,;t t
+ s,@MISC_INSTALL_DATA@,$MISC_INSTALL_DATA,;t t
+ s,@MISC_UNINSTALL_DATA@,$MISC_UNINSTALL_DATA,;t t
+ s,@MAKE_DATABASE@,$MAKE_DATABASE,;t t
+@@ -30540,7 +30553,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:30543: creating $ac_file" >&5
++    { echo "$as_me:30556: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -30558,7 +30571,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30561: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30574: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -30571,7 +30584,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30574: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30587: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30587,7 +30600,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:30590: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:30603: 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;}
+@@ -30596,7 +30609,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:30599: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:30612: 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;}
+@@ -30641,7 +30654,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:30644: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:30657: 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;}
+@@ -30652,7 +30665,7 @@
+     $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:30655: WARNING: Some variables may not be substituted:
++      { echo "$as_me:30668: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30701,7 +30714,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:30704: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:30717: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -30712,7 +30725,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30715: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30728: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -30725,7 +30738,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30728: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30741: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30783,7 +30796,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:30786: $ac_file is unchanged" >&5
++      { echo "$as_me:30799: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -31170,7 +31183,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}:31173: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:31186: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: configure.in
+Prereq:  1.782 
+--- ncurses-6.5-20240713+/configure.in	2024-05-25 23:05:44.000000000 +0000
++++ ncurses-6.5-20240720/configure.in	2024-07-20 23:46:58.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.782 2024/05/25 23:05:44 tom Exp $
++dnl $Id: configure.in,v 1.783 2024/07/20 23:46:58 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.782 $)
++AC_REVISION($Revision: 1.783 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -2431,6 +2431,7 @@
+ done
+ AC_MSG_RESULT($PKG_CFLAGS)
+ AC_SUBST(PKG_CFLAGS)
++CF_GLOB_FULLPATH
+ 
+ # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
+ case "x$NCURSES_OSPEED" in
+Index: dist.mk
+Prereq:  1.1622 
+--- ncurses-6.5-20240713+/dist.mk	2024-07-13 10:06:25.000000000 +0000
++++ ncurses-6.5-20240720/dist.mk	2024-07-20 10:19:56.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1622 2024/07/13 10:06:25 tom Exp $
++# $Id: dist.mk,v 1.1623 2024/07/20 10:19:56 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 = 5
+-NCURSES_PATCH = 20240713
++NCURSES_PATCH = 20240720
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/curs_add_wch.3x.html
+--- ncurses-6.5-20240713+/doc/html/man/curs_add_wch.3x.html	2024-06-01 23:07:15.000000000 +0000
++++ ncurses-6.5-20240720/doc/html/man/curs_add_wch.3x.html	2024-07-20 22:19:03.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_add_wch.3x,v 1.67 2024/06/01 22:29:08 tom Exp @
++  * @Id: curs_add_wch.3x,v 1.69 2024/07/20 21:42:38 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_add_wch 3x 2024-06-01 ncurses 6.5 Library calls
++curs_add_wch 3x 2024-07-20 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                    curs_add_wch 3x 2024-06-01 ncurses 6.5 Library calls
                                                                                                    
++
                                                                                                    curs_add_wch 3x 2024-07-20 ncurses 6.5 Library calls
                                                                                                    
+ 
                                                                                                    + curs_add_wch(3x)                 Library calls                curs_add_wch(3x)
+ 
+@@ -103,7 +103,7 @@
+        o   Backspace  moves  the cursor one character left; at the left margin
+            of a window, it does nothing.
+ 
+-       o   Carriage return moves the cursor to the left margin on the  current
++       o   Carriage return moves the cursor to the left  margin  on  the  same
+            line of the window.
+ 
+        o   Line  feed  does a clrtoeol(3x), then advances as if from the right
+@@ -364,7 +364,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-01                  curs_add_wch(3x)
++ncurses 6.5                       2024-07-20                  curs_add_wch(3x)
+ 
                                                                                                    
+ 
                                                                                                    
+ 
                                                                                                      
+Index: doc/html/man/curs_addch.3x.html
+--- ncurses-6.5-20240713+/doc/html/man/curs_addch.3x.html	2024-06-22 22:55:07.000000000 +0000
++++ ncurses-6.5-20240720/doc/html/man/curs_addch.3x.html	2024-07-20 22:19:03.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addch.3x,v 1.94 2024/06/22 21:34:49 tom Exp @
++  * @Id: curs_addch.3x,v 1.96 2024/07/20 21:42:38 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addch 3x 2024-06-22 ncurses 6.5 Library calls
++curs_addch 3x 2024-07-20 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                      curs_addch 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                      
++
                                                                                                      curs_addch 3x 2024-07-20 ncurses 6.5 Library calls
                                                                                                      
+ 
                                                                                                      + curs_addch(3x)                   Library calls                  curs_addch(3x)
+ 
+@@ -86,7 +86,7 @@
+        o   Backspace moves the cursor one character left; at the  left  margin
+            of a window, it does nothing.
+ 
+-       o   Carriage  return moves the cursor to the left margin on the current
++       o   Carriage  return  moves  the  cursor to the left margin on the same
+            line of the window.
+ 
+        o   Line feed does a clrtoeol(3x), then advances as if from  the  right
+@@ -316,7 +316,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-22                    curs_addch(3x)
++ncurses 6.5                       2024-07-20                    curs_addch(3x)
+ 
                                                                                                      
+ 
                                                                                                      
+ 
                                                                                                        
+Index: doc/html/man/curs_addstr.3x.html
+--- ncurses-6.5-20240713+/doc/html/man/curs_addstr.3x.html	2024-06-22 22:55:07.000000000 +0000
++++ ncurses-6.5-20240720/doc/html/man/curs_addstr.3x.html	2024-07-20 22:19:03.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addstr.3x,v 1.51 2024/06/22 21:26:53 tom Exp @
++  * @Id: curs_addstr.3x,v 1.53 2024/07/20 20:49:44 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addstr 3x 2024-06-22 ncurses 6.5 Library calls
++curs_addstr 3x 2024-07-20 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                        curs_addstr 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                        
++
                                                                                                        curs_addstr 3x 2024-07-20 ncurses 6.5 Library calls
                                                                                                        
+ 
                                                                                                        + curs_addstr(3x)                  Library calls                 curs_addstr(3x)
+ 
+@@ -54,25 +54,23 @@
+ 
                                                                                                        SYNOPSIS
                                                                                                        +        #include <curses.h>
+ 
+-       int addstr(const char *str);
+-       int mvaddstr(int y, int x, const char *str);
+-       int mvwaddstr(WINDOW *win, int y, int x, const char *str);
+-       int waddstr(WINDOW *win, const char *str);
+-
+-       int addnstr(const char *str, int n);
+-       int mvaddnstr(int y, int x, const char *str, int n);
+-       int mvwaddnstr(WINDOW *win, int y, int x, const char *str, int n);
+-       int waddnstr(WINDOW *win, const char *str, int n);
++       int addstr(const char * str);
++       int mvaddstr(int y, int x, const char * str);
++       int mvwaddstr(WINDOW * win, int y, int x, const char * str);
++       int waddstr(WINDOW * win, const char * str);
++
++       int addnstr(const char * str, int n);
++       int mvaddnstr(int y, int x, const char * str, int n);
++       int mvwaddnstr(WINDOW * win, int y, int x, const char * str, int n);
++       int waddnstr(WINDOW * win, const char * str, int n);
+ 
+ 
+ 
                                                                                                        DESCRIPTION
                                                                                                        +        waddstr writes the characters of the (null-terminated)  string  str  to
+-       the  window win.  Its process is similar to calling waddch(3x) for each
+-       char in str.  Control characters are processed as in waddch(3x).
++       the window win, as if by calling waddch(3x) for each char in str.
+ 
+-       waddnstr writes at most n  characters,  or  until  a  terminating  null
+-       character  occurs  in  str.   If  n  is  -1, waddnstr writes the entire
+-       string.
++       waddnstr  is  similar,  but  writes  at most n characters.  If n is -1,
++       waddnstr writes the entire string.
+ 
+        ncurses(3x) describes the variants of these functions.
+ 
+@@ -117,7 +115,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-22                   curs_addstr(3x)
++ncurses 6.5                       2024-07-20                   curs_addstr(3x)
+ 
                                                                                                        
+ 
                                                                                                        
+ 
                                                                                                          
+Index: doc/html/man/curs_addwstr.3x.html
+--- ncurses-6.5-20240713+/doc/html/man/curs_addwstr.3x.html	2024-06-01 23:07:15.000000000 +0000
++++ ncurses-6.5-20240720/doc/html/man/curs_addwstr.3x.html	2024-07-20 22:19:03.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addwstr.3x,v 1.41 2024/06/01 22:30:17 tom Exp @
++  * @Id: curs_addwstr.3x,v 1.43 2024/07/20 20:53:20 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addwstr 3x 2024-06-01 ncurses 6.5 Library calls
++curs_addwstr 3x 2024-07-20 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                          curs_addwstr 3x 2024-06-01 ncurses 6.5 Library calls
                                                                                                          
++
                                                                                                          curs_addwstr 3x 2024-07-20 ncurses 6.5 Library calls
                                                                                                          
+ 
                                                                                                          + curs_addwstr(3x)                 Library calls                curs_addwstr(3x)
+ 
+@@ -55,31 +55,26 @@
+ 
                                                                                                          SYNOPSIS
                                                                                                          +        #include <curses.h>
+ 
+-       int addwstr(const wchar_t *wstr);
+-       int mvaddwstr(int y, int x, const wchar_t *wstr);
+-       int mvwaddwstr(WINDOW *win, int y, int x, const wchar_t *wstr);
+-       int waddwstr(WINDOW *win, const wchar_t *wstr);
+-
+-       int addnwstr(const wchar_t *wstr, int n);
+-       int mvaddnwstr(int y, int x, const wchar_t *wstr, int n);
+-       int mvwaddnwstr(WINDOW *win, int y, int x, const wchar_t *wstr, int n);
+-       int waddnwstr(WINDOW *win, const wchar_t *wstr, int n);
++       int addwstr(const wchar_t * wstr);
++       int mvaddwstr(int y, int x, const wchar_t * wstr);
++       int mvwaddwstr(WINDOW * win, int y, int x, const wchar_t * wstr);
++       int waddwstr(WINDOW * win, const wchar_t * wstr);
++
++       int addnwstr(const wchar_t * wstr, int n);
++       int mvaddnwstr(int y, int x, const wchar_t * wstr, int n);
++       int mvwaddnwstr(WINDOW * win, int y, int x, const wchar_t * wstr, int n);
++       int waddnwstr(WINDOW * win, const wchar_t * wstr, int n);
+ 
+ 
+ 
                                                                                                          DESCRIPTION
                                                                                                          +        waddwstr  writes  the  characters  of  the (wide-null-terminated) wide-
+-       character string wstr to the window win.  Its  process  is  similar  to
+-       constructing   a  cchar_t  for  each  wchar_t  in  wstr,  then  calling
+-       wadd_wch(3x) with the resulting cchar_t.
+-
+-       o   Spacing and non-spacing characters in the string are processed  one
+-           at a time, and
+-
+-       o   control characters are processed as in wadd_wch(3x).
+-
+-       waddnwstr writes at most n wide characters, or until a terminating wide
+-       null character occurs in wstr.  If n is -1, waddnwstr writes the entire
+-       wide string.
++       character string wstr to the  window  win,  as  if  by  constructing  a
++       cchar_t  for  each  wchar_t in wstr, then calling wadd_wch(3x) with the
++       resulting cchar_t.  curses processes spacing and non-spacing characters
++       in wstr one at a time.
++
++       waddnwstr  is  similar,  but writes at most n wide characters.  If n is
++       -1, waddnwstr writes the entire wide string.
+ 
+        ncurses(3x) describes the variants of these functions.
+ 
+@@ -95,7 +90,7 @@
+ 
+        o   an internal wadd_wch(3x) call returns ERR.
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
++       Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+@@ -107,15 +102,19 @@
+        X/Open Curses, Issue 4 describes these functions.
+ 
+ 
++
                                                                                                          HISTORY
                                                                                                          ++       waddstr and waddnstr appeared late in SVr4 development (1995).
++
++
+ 
                                                                                                          SEE ALSO
                                                                                                          +-       curs_addstr(3x) describes comparable functions of the  ncurses  library
++       curs_addstr(3x)  describes  comparable functions of the ncurses library
+        in its non-wide-character configuration.
+ 
+        curses(3x), curs_add_wch(3x), curs_add_wchstr(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-01                  curs_addwstr(3x)
++ncurses 6.5                       2024-07-20                  curs_addwstr(3x)
+ 
                                                                                                          
+ 
                                                                                                          
+ 
+ 
                                                                                                          
+Index: doc/html/man/curs_beep.3x.html
+--- ncurses-6.5-20240713+/doc/html/man/curs_beep.3x.html	2024-06-22 22:55:07.000000000 +0000
++++ ncurses-6.5-20240720/doc/html/man/curs_beep.3x.html	2024-07-20 22:19:03.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_beep.3x,v 1.33 2024/06/22 21:27:35 tom Exp @
++  * @Id: curs_beep.3x,v 1.35 2024/07/20 20:54:51 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_beep 3x 2024-06-22 ncurses 6.5 Library calls
++curs_beep 3x 2024-07-20 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                          curs_beep 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                          
++
                                                                                                          curs_beep 3x 2024-07-20 ncurses 6.5 Library calls
                                                                                                          
+ 
                                                                                                          + curs_beep(3x)                    Library calls                   curs_beep(3x)
+ 
+@@ -59,7 +59,7 @@
+ 
+ 
                                                                                                          DESCRIPTION
                                                                                                          +        beep  and  flash  alert  the  terminal user: the former by sounding the
+-       terminal's audible alarm, and the latter  by  visibly  attracting  user
++       terminal's  audible  alarm,  and  the  latter  by  visibly   attracting
+        attention.    Commonly,   a   terminal  implements  a  visual  bell  by
+        momentarily reversing the character foreground and background colors on
+        the  entire  display;  even  a  monochrome  device  can do this.  These
+@@ -98,7 +98,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-22                     curs_beep(3x)
++ncurses 6.5                       2024-07-20                     curs_beep(3x)
+ 
                                                                                                          
+ 
                                                                                                          
+ 
                                                                                                            
+Index: doc/html/man/curs_get_wch.3x.html
+--- ncurses-6.5-20240713+/doc/html/man/curs_get_wch.3x.html	2024-06-08 23:21:18.000000000 +0000
++++ ncurses-6.5-20240720/doc/html/man/curs_get_wch.3x.html	2024-07-20 22:19:03.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_get_wch.3x,v 1.43 2024/06/08 20:25:25 tom Exp @
++  * @Id: curs_get_wch.3x,v 1.45 2024/07/20 21:43:33 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_get_wch 3x 2024-06-08 ncurses 6.5 Library calls
++curs_get_wch 3x 2024-07-20 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                            curs_get_wch 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                            
++
                                                                                                            curs_get_wch 3x 2024-07-20 ncurses 6.5 Library calls
                                                                                                            
+ 
                                                                                                            + curs_get_wch(3x)                 Library calls                curs_get_wch(3x)
+ 
+@@ -115,16 +115,16 @@
+ 
+ 
+ 
                                                                                                            RETURN VALUE
                                                                                                            +-       wget_wch returns OK when it reads a  wide  character  and  KEY_CODE_YES
+-       when it reads a function key code.  It returns ERR if
+-
+-       o   the WINDOW pointer is NULL, or
++       wget_wch returns OK when it reads a wide character,  KEY_CODE_YES  when
++       it reads a function key code, and ERR on failure.  wget_wch fails if
+ 
+        o   its timeout expires without any data arriving, or
+ 
+        o   execution  was  interrupted by a signal, in which case errno is set
+            to EINTR.
+ 
++       Functions taking a WINDOW pointer argument fail if the pointer is NULL.
++
+        Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+@@ -172,7 +172,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                  curs_get_wch(3x)
++ncurses 6.5                       2024-07-20                  curs_get_wch(3x)
+ 
                                                                                                            
+ 
                                                                                                            
+ 
                                                                                                              
+Index: doc/html/man/curs_getch.3x.html
+--- ncurses-6.5-20240713+/doc/html/man/curs_getch.3x.html	2024-06-08 23:21:18.000000000 +0000
++++ ncurses-6.5-20240720/doc/html/man/curs_getch.3x.html	2024-07-20 22:19:03.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_getch.3x,v 1.97 2024/06/08 20:26:46 tom Exp @
++  * @Id: curs_getch.3x,v 1.99 2024/07/20 21:43:33 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_getch 3x 2024-06-08 ncurses 6.5 Library calls
++curs_getch 3x 2024-07-20 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                              curs_getch 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                              
++
                                                                                                              curs_getch 3x 2024-07-20 ncurses 6.5 Library calls
                                                                                                              
+ 
                                                                                                              + curs_getch(3x)                   Library calls                  curs_getch(3x)
+ 
+@@ -301,25 +301,25 @@
+ 
+ 
+ 
                                                                                                              RETURN VALUE
                                                                                                              +-       Except  for  has_key,  these  functions return OK on success and ERR on
+-       failure.
+-
+-       Functions taking a WINDOW pointer argument fail if the pointer is NULL.
+-
+-       Functions prefixed with "mv" first perform cursor movement and fail  if
+-       the position (y, x) is outside the window boundaries.
+-
+-       wgetch also fails if
++       wgetch returns a key code identifying the key event as described above,
++       which may include KEY_RESIZE or KEY_MOUSE indicating non-key events, or
++       ERR on failure.  wgetch fails if
+ 
+        o   its timeout expires without any data arriving, or
+ 
+        o   execution  was  interrupted by a signal, in which case errno is set
+            to EINTR.
+ 
+-       ungetch fails if there is no more room in the input queue.
++       ungetch returns OK on success and ERR on  failure.   ungetch  fails  if
++       there is no more room in the input queue.
+ 
+        has_key returns TRUE or FALSE.
+ 
++       Functions taking a WINDOW pointer argument fail if the pointer is NULL.
++
++       Functions  prefixed with "mv" first perform cursor movement and fail if
++       the position (y, x) is outside the window boundaries.
++
+ 
+ 
                                                                                                              NOTES
                                                                                                              +        getch, mvgetch, and mvwgetch may be implemented as macros.
+@@ -427,7 +427,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                    curs_getch(3x)
++ncurses 6.5                       2024-07-20                    curs_getch(3x)
+ 
                                                                                                              
+ 
                                                                                                              
+ 
                                                                                                                
+Index: doc/html/man/curs_move.3x.html
+--- ncurses-6.5-20240713+/doc/html/man/curs_move.3x.html	2024-04-27 18:38:46.000000000 +0000
++++ ncurses-6.5-20240720/doc/html/man/curs_move.3x.html	2024-07-20 22:19:04.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_move.3x,v 1.40 2024/04/27 17:56:05 tom Exp @
++  * @Id: curs_move.3x,v 1.42 2024/07/20 20:54:08 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_move 3x 2024-04-27 ncurses 6.5 Library calls
++curs_move 3x 2024-07-20 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                curs_move 3x 2024-04-27 ncurses 6.5 Library calls
                                                                                                                
++
                                                                                                                curs_move 3x 2024-07-20 ncurses 6.5 Library calls
                                                                                                                
+ 
                                                                                                                + curs_move(3x)                    Library calls                   curs_move(3x)
+ 
+@@ -54,7 +54,7 @@
+        #include <curses.h>
+ 
+        int move(int y, int x);
+-       int wmove(WINDOW *win, int y, int x);
++       int wmove(WINDOW * win, int y, int x);
+ 
+ 
+ 
                                                                                                                DESCRIPTION
                                                                                                                +@@ -78,7 +78,8 @@
+ 
+ 
+ 
                                                                                                                PORTABILITY
                                                                                                                +-       X/Open Curses, Issue 4 describes these functions.
++       X/Open  Curses,  Issue 4 describes these functions.  4BSD (1980) curses
++       introduced wmove.
+ 
+ 
+ 
                                                                                                                SEE ALSO
                                                                                                                +@@ -86,7 +87,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-27                     curs_move(3x)
++ncurses 6.5                       2024-07-20                     curs_move(3x)
+ 
                                                                                                                
+ 
                                                                                                                
+ 
                                                                                                                  
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.5-20240713+/doc/html/man/ncurses.3x.html	2024-06-22 23:04:46.000000000 +0000
++++ ncurses-6.5-20240720/doc/html/man/ncurses.3x.html	2024-07-20 22:19:06.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: ncurses.3x,v 1.225 2024/06/22 22:14:58 tom Exp @
++  * @Id: ncurses.3x,v 1.227 2024/07/20 20:48:52 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-ncurses 3x 2024-06-22 ncurses 6.5 Library calls
++ncurses 3x 2024-07-20 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                  ncurses 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                                  
++
                                                                                                                  ncurses 3x 2024-07-20 ncurses 6.5 Library calls
                                                                                                                  
+ 
                                                                                                                  + ncurses(3x)                      Library calls                     ncurses(3x)
+ 
+@@ -61,35 +61,34 @@
+        terminals  with  output  optimized to minimize screen updates.  ncurses
+        replaces the curses libraries from System V Release 4 Unix ("SVr4") and
+        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
+-       document describes ncurses version 6.5 (patch 20240622).
++       document describes ncurses version 6.5 (patch 20240720).
+ 
+        ncurses permits control of the terminal screen's contents;  abstraction
+        and  subdivision thereof with windows and pads; acquisition of keyboard
+-       and mouse  events;  control  of  terminal  input  and  output  options;
+-       selection   of   color  and  rendering  attributes  (such  as  bold  or
+-       underline); the definition and use of soft label keys;  access  to  the
+-       terminfo   terminal   capability   database;  a  termcap  compatibility
+-       interface; and an abstraction of the system's API for manipulating  the
++       and mouse events; selection of color and rendering attributes (such  as
++       bold  or  underline); the definition and use of soft label keys; access
++       to the terminfo terminal capability database; a  termcap  compatibility
++       interface;  and an abstraction of the system's API for manipulating the
+        terminal (such as termios(3)).
+ 
+-       ncurses  implements  the  interface described by X/Open Curses Issue 7.
++       ncurses implements the interface described by  X/Open  Curses  Issue 7.
+        In many behavioral details not standardized by X/Open, ncurses emulates
+        the curses library of SVr4 and provides numerous useful extensions.
+ 
+-       ncurses  man  pages employ several sections to clarify matters of usage
++       ncurses man pages employ several sections to clarify matters  of  usage
+        and interoperability with other curses implementations.
+ 
+-       o   "NOTES" describes issues and caveats  of  which  any  user  of  the
+-           ncurses  API should be aware, such as limitations on the size of an
+-           underlying integral type or  the  availability  of  a  preprocessor
+-           macro  exclusive  of  a  function  definition  (which  prevents its
+-           address  from  being   taken).    This   section   also   describes
+-           implementation  details of significance to the programmer but which
++       o   "NOTES"  describes  issues  and  caveats  of  which any user of the
++           ncurses API should be aware, such as limitations on the size of  an
++           underlying  integral  type  or  the  availability of a preprocessor
++           macro exclusive  of  a  function  definition  (which  prevents  its
++           address   from   being   taken).    This   section  also  describes
++           implementation details of significance to the programmer but  which
+            are not standardized.
+ 
+-       o   "EXTENSIONS" presents ncurses innovations beyond the X/Open  Curses
+-           standard  and/or  the  SVr4 curses implementation.  They are termed
+-           extensions to indicate that they cannot be  implemented  solely  by
++       o   "EXTENSIONS"  presents ncurses innovations beyond the X/Open Curses
++           standard and/or the SVr4 curses implementation.   They  are  termed
++           extensions  to  indicate  that they cannot be implemented solely by
+            using the library API, but require access to the library's internal
+            state.
+ 
+@@ -97,35 +96,35 @@
+            that should be considered when writing to a curses standard, or for
+            multiple implementations.
+ 
+-       o   "HISTORY" examines points of detail in  ncurses  and  other  curses
++       o   "HISTORY"  examines  points  of  detail in ncurses and other curses
+            implementations over the decades of their development, particularly
+            where precedent or inertia have frustrated better design (and, in a
+            few cases, where such inertia has been overcome).
+ 
+        A curses application must be linked with the library; use the -lncurses
+-       option to your compiler or linker.  A debugging version of the  library
+-       may  be available; if so, link with it using -lncurses_g.  (Your system
++       option  to your compiler or linker.  A debugging version of the library
++       may be available; if so, link with it using -lncurses_g.  (Your  system
+        integrator may have installed these libraries such that you can use the
+-       options  -lcurses and -lcurses_g, respectively.)  The ncurses_g library
+-       logs events describing ncurses actions to a file called  trace  in  the
++       options -lcurses and -lcurses_g, respectively.)  The ncurses_g  library
++       logs  events  describing  ncurses actions to a file called trace in the
+        current directory.  See section "ALTERNATE CONFIGURATIONS" below.
+ 
+ 
+ 
                                                                                                                  Application Structure
                                                                                                                  +-       A   curses   application  uses  information  from  the  system  locale;
++       A  curses  application  uses  information  from  the   system   locale;
+        setlocale(3) prepares it for curses library calls.
+ 
+            setlocale(LC_ALL, "");
+ 
+-       If the locale  is  not  thus  initialized,  the  library  assumes  that
+-       characters  are printable as in ISO 8859-1, to work with certain legacy
+-       programs.  You should initialize the locale; do not  expect  consistent
++       If  the  locale  is  not  thus  initialized,  the  library assumes that
++       characters are printable as in ISO 8859-1, to work with certain  legacy
++       programs.   You  should initialize the locale; do not expect consistent
+        behavior from the library when the locale has not been set up.
+ 
+-       initscr(3x)  or  newterm(3x) must be called to initialize curses before
++       initscr(3x) or newterm(3x) must be called to initialize  curses  before
+        use of any functions that deal with windows and screens.
+ 
+-       To get character-at-a-time  input  without  echoing--most  interactive,
++       To  get  character-at-a-time  input  without echoing--most interactive,
+        screen-oriented programs want this--use the following sequence.
+ 
+            initscr(); cbreak(); noecho();
+@@ -135,107 +134,107 @@
+            noqiflush();
+            keypad(stdscr, TRUE);
+ 
+-       A  curses  program  then often enters an event loop of some sort.  Call
++       A curses program then often enters an event loop of  some  sort.   Call
+        endwin(3x) before exiting.
+ 
+ 
+ 
                                                                                                                  Overview
                                                                                                                  +-       A curses library abstracts the terminal with a SCREEN  data  structure,
+-       and  represents  all  or  part  of  its display with WINDOW structures.
+-       Distinct properties apply to each; for example, the line discipline  of
+-       a  typical  Unix terminal driver is in one of three modes: raw, cbreak,
+-       or normal ("cooked").  In curses, the line discipline is a property  of
++       A  curses  library abstracts the terminal with a SCREEN data structure,
++       and represents all or part  of  its  display  with  WINDOW  structures.
++       Distinct  properties apply to each; for example, the line discipline of
++       a typical Unix terminal driver is in one of three modes:  raw,  cbreak,
++       or  normal ("cooked").  In curses, the line discipline is a property of
+        the screen, applying identically to all windows associated with it.
+ 
+-       A  window  is  a rectangular grid of character cells, addressed by line
++       A window is a rectangular grid of character cells,  addressed  by  line
+        and column coordinates (y, x), with the upper left corner as (0, 0).  A
+-       window  called  stdscr, the same size as the terminal screen, is always
++       window called stdscr, the same size as the terminal screen,  is  always
+        available.  Create others with newwin(3x).
+ 
+-       A curses library does not manage overlapping windows (but  see  below).
+-       You  can either use stdscr to manage one screen-filling window, or tile
+-       the screen into non-overlapping windows and  not  use  stdscr  at  all.
+-       Mixing  the  two  approaches will result in unpredictable and undesired
++       A  curses  library does not manage overlapping windows (but see below).
++       You can either use stdscr to manage one screen-filling window, or  tile
++       the  screen  into  non-overlapping  windows  and not use stdscr at all.
++       Mixing the two approaches will result in  unpredictable  and  undesired
+        effects.
+ 
+-       Functions permit manipulation of a window and  the  cursor  identifying
+-       the  cell  within  it  at  which  the next operation will occur.  Among
+-       those, the most basic are  move(3x)  and  addch(3x):  these  place  the
++       Functions  permit  manipulation  of a window and the cursor identifying
++       the cell within it at which  the  next  operation  will  occur.   Among
++       those,  the  most  basic  are  move(3x)  and addch(3x): these place the
+        cursor within and write a character to stdscr, respectively.
+ 
+        Frequent changes to the terminal screen can cause unpleasant flicker or
+-       inefficient use of the communication channel to the  device,  so  as  a
+-       rule  the  library  does not update it automatically.  Therefore, after
++       inefficient  use  of  the  communication channel to the device, so as a
++       rule the library does not update it  automatically.   Therefore,  after
+        using curses functions to accumulate a set of desired updates that make
+        sense to present together, call refresh(3x) to tell the library to make
+-       the user's screen look like stdscr.  The library optimizes  its  output
+-       by  computing  a minimal volume of operations to mutate the screen from
+-       its  state  at  the  previous  refresh  to  the  new  one.    Effective
+-       optimization  demands  accurate  information about the terminal device:
+-       the management of such information is the province of the  terminfo(3x)
++       the  user's  screen look like stdscr.  The library optimizes its output
++       by computing a minimal volume of operations to mutate the  screen  from
++       its   state  at  the  previous  refresh  to  the  new  one.   Effective
++       optimization demands accurate information about  the  terminal  device:
++       the  management of such information is the province of the terminfo(3x)
+        API, a feature of every standard curses implementation.
+ 
+-       Special  windows  called  pads  may also be manipulated.  These are not
+-       constrained to the size of the terminal screen and their contents  need
++       Special windows called pads may also be  manipulated.   These  are  not
++       constrained  to the size of the terminal screen and their contents need
+        not be completely displayed.  See curs_pad(3x).
+ 
+-       Many  terminals  support configuration of character cell foreground and
+-       background colors as well as  attributes,  which  cause  characters  to
+-       render  in  such  modes  as boldfaced, underlined, or in reverse video.
++       Many terminals support configuration of character cell  foreground  and
++       background  colors  as  well  as  attributes, which cause characters to
++       render in such modes as boldfaced, underlined,  or  in  reverse  video.
+        See curs_attr(3x).
+ 
+-       curses predefines constants for a small set of  forms-drawing  graphics
+-       corresponding  to  the  DEC Alternate Character Set (ACS), a feature of
++       curses  predefines  constants for a small set of forms-drawing graphics
++       corresponding to the DEC Alternate Character Set (ACS),  a  feature  of
+        VT100 and other terminals.  See addch(3x).
+ 
+        curses is implemented using the operating system's terminal driver; key
+        events are received not as scan codes but as byte sequences.  Graphical
+-       keycaps (alphanumeric and punctuation keys, and the space)  appear  as-
+-       is.   Everything  else, including the tab, enter/return, keypad, arrow,
++       keycaps  (alphanumeric  and punctuation keys, and the space) appear as-
++       is.  Everything else, including the tab, enter/return,  keypad,  arrow,
+        and function keys, appears as a control character or a multibyte escape
+-       sequence.   curses can translate the latter into unique key codes.  See
++       sequence.  curses can translate the latter into unique key codes.   See
+        keypad(3x) and getch(3x).
+ 
+        ncurses provides reimplementations of the SVr4 panel(3x), form(3x), and
+-       menu(3x)   libraries;   they   permit   overlapping  windows  and  ease
++       menu(3x)  libraries;  they  permit   overlapping   windows   and   ease
+        construction of user interfaces with curses.
+ 
+ 
+ 
                                                                                                                  Initialization
                                                                                                                  +-       The  selection  of  an  appropriate  value  of  TERM  in  the   process
++       The   selection  of  an  appropriate  value  of  TERM  in  the  process
+        environment  is  essential  to  correct  curses  and  terminfo  library
+-       operation.  A well-configured  system  selects  a  correct  TERM  value
+-       automatically;   tset(1)   may   assist   with  troubleshooting  exotic
++       operation.   A  well-configured  system  selects  a  correct TERM value
++       automatically;  tset(1)  may   assist   with   troubleshooting   exotic
+        situations.
+ 
+        If you change the terminal type, export the shell's TERM variable, then
+-       run  tset(1)  or  the  "tput  init"  command.  See subsection "Tabs and
++       run tset(1) or the "tput  init"  command.   See  subsection  "Tabs  and
+        Initialization" of terminfo(5).
+ 
+-       If the environment variables LINES and  COLUMNS  are  set,  or  if  the
+-       curses  program  is executing in a graphical windowing environment, the
+-       information obtained thence overrides that obtained  by  terminfo.   An
++       If  the  environment  variables  LINES  and  COLUMNS are set, or if the
++       curses program is executing in a graphical windowing  environment,  the
++       information  obtained  thence  overrides that obtained by terminfo.  An
+        ncurses extension supports resizable terminals; see wresize(3x).
+ 
+-       If  the  environment  variable  TERMINFO  is  defined, a curses program
+-       checks first for  a  terminal  type  description  in  the  location  it
+-       identifies.   TERMINFO  is  useful  for developing type descriptions or
++       If the environment variable  TERMINFO  is  defined,  a  curses  program
++       checks  first  for  a  terminal  type  description  in  the location it
++       identifies.  TERMINFO is useful for  developing  type  descriptions  or
+        when write permission to /usr/share/terminfo is not available.
+ 
+        See section "ENVIRONMENT" below.
+ 
+ 
+ 
                                                                                                                  Naming Conventions
                                                                                                                  +-       curses offers many functions in variant forms using a  regular  set  of
+-       alternatives  to the name of an elemental one.  Those prefixed with "w"
+-       require a WINDOW pointer argument;  those  with  a  "mv"  prefix  first
++       curses  offers  many  functions in variant forms using a regular set of
++       alternatives to the name of an elemental one.  Those prefixed with  "w"
++       require  a  WINDOW  pointer  argument;  those  with a "mv" prefix first
+        perform cursor movement using wmove(3x); a "mvw" prefix indicates both.
+-       The "w" function is typically the elemental one; the  removal  of  this
++       The  "w"  function  is typically the elemental one; the removal of this
+        prefix usually indicates operation on stdscr.
+ 
+        Four functions prefixed with "p" require a pad argument.
+ 
+-       In  function  synopses,  ncurses man pages apply the following names to
++       In function synopses, ncurses man pages apply the  following  names  to
+        parameters.  We introduce the character types in the next subsection.
+ 
+                        bf    a bool (TRUE or FALSE)
+@@ -248,64 +247,65 @@
+ 
+ 
+ 
                                                                                                                  Wide and Non-wide Character Configurations
                                                                                                                  +-       This  man  page  primarily  surveys  functions  that  appear   in   any
++       This   man   page  primarily  surveys  functions  that  appear  in  any
+        configuration of the library.  There are two common configurations; see
+        section "ALTERNATE CONFIGURATIONS" below.
+ 
+        ncurses   is the library in its "non-wide" configuration, handling only
+-                 eight-bit  characters.   It  stores a character combined with
++                 eight-bit characters.  It stores a  character  combined  with
+                  attributes and a color pair in a chtype datum, which is often
+                  an alias of int.  A string of curses characters is similar to
+                  a C char string; a chtype string ends with an integral 0, the
+                  null curses character.
+ 
+-                 Attributes  and a color pair selection (with no corresponding
+-                 character) can be stored in variables  of  chtype  or  attr_t
+-                 type.   In either case, they are accessed via an integral bit
++                 Attributes and a color pair selection (with no  corresponding
++                 character)  can  be  stored  in variables of chtype or attr_t
++                 type.  In either case, they are accessed via an integral  bit
+                  mask.
+ 
+-                 Each cell of a WINDOW is stored as a chtype.   X/Open  Curses
+-                 does  not  specify  the  sizes of the character code or color
+-                 pair identifier, nor  the  quantity  of  attribute  bits,  in
+-                 chtype;  these  are  implementation-dependent.   ncurses uses
+-                 eight bits for the character code.  An application  requiring
+-                 a  wider  character  type, for instance to represent Unicode,
++                 Each  cell  of a WINDOW is stored as a chtype.  X/Open Curses
++                 does not specify the sizes of the  character  code  or  color
++                 pair  identifier,  nor  the  quantity  of  attribute bits, in
++                 chtype; these  are  implementation-dependent.   ncurses  uses
++                 eight  bits for the character code.  An application requiring
++                 a wider character type, for instance  to  represent  Unicode,
+                  should use the wide-character API.
+ 
+-       ncursesw  is the library in its  "wide"  configuration,  which  handles
++       ncursesw  is  the  library  in  its "wide" configuration, which handles
+                  character encodings requiring a larger data type than char (a
+                  byte-sized  type)  can  represent.   It  provides  additional
+                  functions that complement those in the non-wide library where
+-                 the size of the underlying character type is significant.   A
+-                 somewhat  regular  naming convention relates many of the wide
+-                 variants to their non-wide  counterparts;  where  a  non-wide
+-                 function  name contains "ch" or "str", prefix it with "_w" to
+-                 obtain the wide counterpart.   For  example,  waddch  becomes
+-                 wadd_wch.   (Exceptions  that  add only "w" comprise addwstr,
++                 the  size of the underlying character type is significant.  A
++                 somewhat regular naming convention relates many of  the  wide
++                 variants  to  their  non-wide  counterparts; where a non-wide
++                 function name contains "ch" or "str", prefix it with "_w"  to
++                 obtain  the  wide  counterpart.   For example, waddch becomes
++                 wadd_wch.  (Exceptions that add only  "w"  comprise  addwstr,
+                  inwstr, and their variants.)
+ 
+-                 This convention is inapplicable  to  some  non-wide  function
++                 This  convention  is  inapplicable  to some non-wide function
+                  names,  so  other  transformations  are  used  for  the  wide
+                  configuration:  the  window  background  management  function
+-                 "bkgd"   becomes  "bkgrnd";  the  window  border-drawing  and
+-                 -clearing functions are suffixed with "_set";  and  character
+-                 attribute   manipulation   functions   like  "attron"  become
++                 "bkgd"  becomes  "bkgrnd";  the  window  border-drawing   and
++                 -clearing  functions  are suffixed with "_set"; and character
++                 attribute  manipulation  functions   like   "attron"   become
+                  "attr_on".
+ 
+-                 cchar_t  corresponds to the non-wide configuration's  chtype.
+-                          It  is  a  structure  type  because it requires more
+-                          storage than  a  standard  scalar  type  offers.   A
+-                          character  code  may not be representable as a char,
+-                          and moreover more than one character  may  occupy  a
+-                          cell  (as  with  accent marks and other diacritics).
+-                          Each  character  is  of  type  wchar_t;  a   complex
+-                          character contains one spacing character and zero or
+-                          more non-spacing characters (see below).   A  string
+-                          of  complex  characters  ends  with  a cchar_t whose
+-                          wchar_t  member  is   the   null   wide   character.
+-                          Attributes  and a color pair selection are stored in
+-                          separate fields of the structure, not combined  into
+-                          an integer as in chtype.
++                 cchar_t  is a curses complex character and corresponds to the
++                          non-wide configuration's chtype.  It is a  structure
++                          type   because  it  requires  more  storage  than  a
++                          standard scalar type offers.  A character  code  may
++                          not  be  representable  as a char, and moreover more
++                          than one character may occupy a cell (as with accent
++                          marks  and  other diacritics).  Each character is of
++                          type  wchar_t;  a  complex  character  contains  one
++                          spacing  character  and  zero  or  more  non-spacing
++                          characters  (see  below).   A  string   of   complex
++                          characters  ends with a cchar_t whose wchar_t member
++                          is the null wide character.  Attributes and a  color
++                          pair  selection are stored in separate fields of the
++                          structure,  not  combined  into  an  integer  as  in
++                          chtype.
+ 
+                  Each cell of a WINDOW is stored as a cchar_t.
+ 
+@@ -385,12 +385,12 @@
+                     define_key               define_key(3x)*
+                     del_curterm              curs_terminfo(3x)
+                     delay_output             curs_util(3x)
++
+                     delch                    curs_delch(3x)
+                     deleteln                 curs_deleteln(3x)
+                     delscreen                curs_initscr(3x)
+                     delwin                   curs_window(3x)
+                     derwin                   curs_window(3x)
+-
+                     doupdate                 curs_refresh(3x)
+                     dupwin                   curs_window(3x)
+                     echo                     curs_inopts(3x)
+@@ -452,13 +452,13 @@
+                     in_wchstr                curs_in_wchstr(3x)
+                     inch                     curs_inch(3x)
+                     inchnstr                 curs_inchstr(3x)
++
+                     inchstr                  curs_inchstr(3x)
+                     init_color               curs_color(3x)
+                     init_extended_color      curs_color(3x)*
+                     init_extended_pair       curs_color(3x)*
+                     init_pair                curs_color(3x)
+                     initscr                  curs_initscr(3x)
+-
+                     innstr                   curs_instr(3x)
+                     innwstr                  curs_inwstr(3x)
+                     ins_nwstr                curs_ins_wstr(3x)
+@@ -519,6 +519,7 @@
+                     mvaddstr                 curs_addstr(3x)
+                     mvaddwstr                curs_addwstr(3x)
+                     mvchgat                  curs_attr(3x)
++
+                     mvcur                    curs_kernel(3x)
+                     mvdelch                  curs_delch(3x)
+                     mvderwin                 curs_window(3x)
+@@ -526,7 +527,6 @@
+                     mvget_wstr               curs_get_wstr(3x)
+                     mvgetch                  curs_getch(3x)
+                     mvgetn_wstr              curs_get_wstr(3x)
+-
+                     mvgetnstr                curs_getstr(3x)
+                     mvgetstr                 curs_getstr(3x)
+                     mvhline                  curs_border(3x)
+@@ -586,6 +586,7 @@
+                     mvwinsch                 curs_insch(3x)
+                     mvwinsnstr               curs_insstr(3x)
+                     mvwinsstr                curs_insstr(3x)
++
+                     mvwinstr                 curs_instr(3x)
+                     mvwinwstr                curs_inwstr(3x)
+                     mvwprintw                curs_printw(3x)
+@@ -594,7 +595,6 @@
+                     mvwvline_set             curs_border_set(3x)
+                     napms                    curs_kernel(3x)
+                     newpad                   curs_pad(3x)
+-
+                     newterm                  curs_initscr(3x)
+                     newwin                   curs_window(3x)
+                     nl                       curs_inopts(3x)
+@@ -653,6 +653,7 @@
+                     slk_attron               curs_slk(3x)
+                     slk_attrset              curs_slk(3x)
+                     slk_clear                curs_slk(3x)
++
+                     slk_color                curs_slk(3x)
+                     slk_init                 curs_slk(3x)
+                     slk_label                curs_slk(3x)
+@@ -662,7 +663,6 @@
+                     slk_set                  curs_slk(3x)
+                     slk_touch                curs_slk(3x)
+                     slk_wset                 curs_slk(3x)
+-
+                     standend                 curs_attr(3x)
+                     standout                 curs_attr(3x)
+                     start_color              curs_color(3x)
+@@ -720,6 +720,7 @@
+                     waddchnstr               curs_addchstr(3x)
+                     waddchstr                curs_addchstr(3x)
+                     waddnstr                 curs_addstr(3x)
++
+                     waddnwstr                curs_addwstr(3x)
+                     waddstr                  curs_addstr(3x)
+                     waddwstr                 curs_addwstr(3x)
+@@ -730,7 +731,6 @@
+                     wattroff                 curs_attr(3x)
+                     wattron                  curs_attr(3x)
+                     wattrset                 curs_attr(3x)
+-
+                     wbkgd                    curs_bkgd(3x)
+                     wbkgdset                 curs_bkgd(3x)
+                     wbkgrnd                  curs_bkgrnd(3x)
+@@ -787,6 +787,7 @@
+                     wrefresh                 curs_refresh(3x)
+                     wresize                  wresize(3x)*
+                     wscanw                   curs_scanw(3x)
++
+                     wscrl                    curs_scroll(3x)
+                     wsetscrreg               curs_outopts(3x)
+                     wstandend                curs_attr(3x)
+@@ -830,11 +831,12 @@
+        redirected output to a file.  Its integral value is used for  the  baud
+        rate.   If  that  value  is absent or invalid, ncurses uses 9600.  This
+        feature allows developers to construct repeatable test cases that  take
+-       into account optimization decisions that depend on baud rate.
++       into  account optimization decisions that depend on the terminal's line
++       speed.
+ 
+ 
+ 
                                                                                                                  CC (command character)
                                                                                                                  +-       When  set,  the  command_character  (cmdch)  capability value of loaded
++       When set, the command_character  (cmdch)  capability  value  of  loaded
+        terminfo entries changes to the value of this variable.  Very few term-
+        info entries provide this feature.
+ 
+@@ -845,192 +847,192 @@
+ 
+ 
                                                                                                                  COLUMNS
                                                                                                                  +        This  variable  specifies  the  width  of  the  screen  in  characters.
+-       Applications running in a windowing environment  usually  are  able  to
++       Applications  running  in  a  windowing environment usually are able to
+        obtain the width of the window in which they are executing.  If COLUMNS
+        is not defined and the terminal's screen size is not available from the
+-       terminal  driver, ncurses uses the size specified by the columns (cols)
+-       capability of the terminal type's entry in the  terminfo  database,  if
++       terminal driver, ncurses uses the size specified by the columns  (cols)
++       capability  of  the  terminal type's entry in the terminfo database, if
+        any.
+ 
+-       It  is  important  that  your  application use the correct screen size.
+-       Automatic  detection  thereof  is  not  always  possible   because   an
+-       application  may  be  running  on  a  host  that  does  not  honor NAWS
+-       (Negotiations About Window Size) or as a different  user  ID  than  the
+-       owner  of  the  terminal  device  file.   Setting  COLUMNS and/or LINES
+-       overrides the library's use  of  the  screen  size  obtained  from  the
++       It is important that your application  use  the  correct  screen  size.
++       Automatic   detection   thereof  is  not  always  possible  because  an
++       application may  be  running  on  a  host  that  does  not  honor  NAWS
++       (Negotiations  About  Window  Size)  or as a different user ID than the
++       owner of the  terminal  device  file.   Setting  COLUMNS  and/or  LINES
++       overrides  the  library's  use  of  the  screen  size obtained from the
+        operating system.
+ 
+        The  COLUMNS  and  LINES  variables  may  be  specified  independently.
+-       ncurses enforces an upper limit of 512 on each when reading the  value.
+-       This  property  is  useful to circumvent misfeatures of legacy terminal
+-       type descriptions; xterm(1) descriptions specifying 65 lines were  once
+-       notorious.    For   best  results,  avoid  specifying  cols  and  lines
++       ncurses  enforces an upper limit of 512 on each when reading the value.
++       This property is useful to circumvent misfeatures  of  legacy  terminal
++       type  descriptions; xterm(1) descriptions specifying 65 lines were once
++       notorious.   For  best  results,  avoid  specifying  cols   and   lines
+        capability codes in terminfo descriptions of terminal emulators.
+ 
+-       use_env(3x) can disable use of the process environment  in  determining
+-       the  screen size.  use_tioctl(3x) can update COLUMNS and LINES to match
++       use_env(3x)  can  disable use of the process environment in determining
++       the screen size.  use_tioctl(3x) can update COLUMNS and LINES to  match
+        the screen size obtained from system calls or the terminal database.
+ 
+ 
+ 
                                                                                                                  ESCDELAY
                                                                                                                  +-       For curses to distinguish the ESC character  resulting  from  a  user's
+-       press  of  the  "Escape"  key on the input device from one beginning an
++       For  curses  to  distinguish  the ESC character resulting from a user's
++       press of the "Escape" key on the input device  from  one  beginning  an
+        escape sequence (as commonly produced by function keys), it waits after
+-       receiving  the  escape  character  to  see  if  further  characters are
+-       available on the input  stream  within  a  short  interval.   A  global
+-       variable  ESCDELAY  stores  this interval in milliseconds.  The default
++       receiving the  escape  character  to  see  if  further  characters  are
++       available  on  the  input  stream  within  a  short interval.  A global
++       variable ESCDELAY stores this interval in  milliseconds.   The  default
+        value of 1000 (one second) is adequate for most uses.  This environment
+-       variable  overrides  it;  ncurses enforces an upper limit of 30,000 (30
++       variable overrides it; ncurses enforces an upper limit  of  30,000  (30
+        seconds) when reading the value.
+ 
+-       The most common instance where you may wish to change this value is  to
++       The  most common instance where you may wish to change this value is to
+        work with a remote host over a slow communication channel.  If the host
+-       running a curses application does not  receive  the  characters  of  an
+-       escape  sequence  in a timely manner, the library can interpret them as
++       running  a  curses  application  does  not receive the characters of an
++       escape sequence in a timely manner, the library can interpret  them  as
+        multiple key stroke events.
+ 
+        xterm(1) mouse events are a form of escape sequence; therefore, if your
+-       application  makes  heavy  use  of  multiple-clicking,  you may wish to
+-       lengthen the default value because the delay applies to  the  composite
++       application makes heavy use  of  multiple-clicking,  you  may  wish  to
++       lengthen  the  default value because the delay applies to the composite
+        multi-click event as well as the individual clicks.
+ 
+-       Portable  applications should not rely upon the presence of ESCDELAY in
+-       either form, but setting  the  environment  variable  rather  than  the
++       Portable applications should not rely upon the presence of ESCDELAY  in
++       either  form,  but  setting  the  environment  variable rather than the
+        global variable does not create problems when compiling an application.
+ 
+-       If  keypad(3x)  is  disabled  for  the curses window receiving input, a
++       If keypad(3x) is disabled for the  curses  window  receiving  input,  a
+        program must disambiguate escape sequences itself.
+ 
+ 
+ 
                                                                                                                  HOME
                                                                                                                  +-       ncurses may read and write auxiliary terminal descriptions in  .termcap
++       ncurses  may read and write auxiliary terminal descriptions in .termcap
+        and .terminfo files in the user's home directory.
+ 
+ 
+ 
                                                                                                                  LINES
                                                                                                                  +-       This  counterpart  to  COLUMNS  specifies  the  height of the screen in
+-       characters.  The corresponding terminfo capability and code  is  lines.
++       This counterpart to COLUMNS specifies  the  height  of  the  screen  in
++       characters.   The  corresponding terminfo capability and code is lines.
+        See the description of the COLUMNS variable above.
+ 
+ 
+ 
                                                                                                                  MOUSE_BUTTONS_123
                                                                                                                  +-       (OS/2  EMX  port only) OS/2 numbers a three-button mouse inconsistently
+-       with other platforms, such that 1 is the left button, 2 the right,  and
+-       3  the  middle.   This  variable customizes the mouse button numbering.
+-       Its value must be three digits 1-3 in any order.  By  default,  ncurses
++       (OS/2 EMX port only) OS/2 numbers a three-button  mouse  inconsistently
++       with  other platforms, such that 1 is the left button, 2 the right, and
++       3 the middle.  This variable customizes  the  mouse  button  numbering.
++       Its  value  must be three digits 1-3 in any order.  By default, ncurses
+        assumes a numbering of "132".
+ 
+ 
+ 
                                                                                                                  NCURSES_ASSUMED_COLORS
                                                                                                                  +-       If  set,  this  variable  overrides  the  ncurses library's compiled-in
+-       assumption that the terminal's default colors are white on  black;  see
+-       default_colors(3x).   Set  the  foreground  and background color values
+-       with this environment variable  by  assigning  it  two  integer  values
++       If set, this  variable  overrides  the  ncurses  library's  compiled-in
++       assumption  that  the terminal's default colors are white on black; see
++       default_colors(3x).  Set the foreground  and  background  color  values
++       with  this  environment  variable  by  assigning  it two integer values
+        separated  by  a  comma,  indicating  foregound  and  background  color
+        numbers, respectively.
+ 
+-       For example, to tell ncurses not to assume anything about  the  colors,
+-       use  a  value  of  "-1,-1".   To make the default color scheme green on
+-       black, use "2,0".  ncurses accepts integral values from -1  up  to  the
++       For  example,  to tell ncurses not to assume anything about the colors,
++       use a value of "-1,-1".  To make the  default  color  scheme  green  on
++       black,  use  "2,0".   ncurses accepts integral values from -1 up to the
+        value of the terminfo max_colors (colors) capability.
+ 
+ 
+ 
                                                                                                                  NCURSES_CONSOLE2
                                                                                                                  +-       (MinGW   port  only)  The  Console2  program  defectively  handles  the
+-       Microsoft Console  API  call  CreateConsoleScreenBuffer.   Applications
+-       that  use it will hang.  However, it is possible to simulate the action
+-       of this call by mapping coordinates, explicitly  saving  and  restoring
+-       the  original  screen contents.  Setting the environment variable NCGDB
++       (MinGW  port  only)  The  Console2  program  defectively  handles   the
++       Microsoft  Console  API  call  CreateConsoleScreenBuffer.  Applications
++       that use it will hang.  However, it is possible to simulate the  action
++       of  this  call  by mapping coordinates, explicitly saving and restoring
++       the original screen contents.  Setting the environment  variable  NCGDB
+        has the same effect.
+ 
+ 
+ 
                                                                                                                  NCURSES_GPM_TERMS
                                                                                                                  +-       (Linux only) When ncurses is configured to use the GPM interface,  this
+-       variable  may  list  one  or  more  terminal  type  names, delimited by
+-       vertical bars (|) or colons (:), against which the TERM  variable  (see
+-       below)  is  matched.   An empty value disables the GPM interface, using
+-       ncurses's built-in support for xterm(1) mouse  protocols  instead.   If
+-       the  variable  is absent, ncurses attempts to open GPM if TERM contains
++       (Linux  only) When ncurses is configured to use the GPM interface, this
++       variable may list  one  or  more  terminal  type  names,  delimited  by
++       vertical  bars  (|) or colons (:), against which the TERM variable (see
++       below) is matched.  An empty value disables the  GPM  interface,  using
++       ncurses's  built-in  support  for xterm(1) mouse protocols instead.  If
++       the variable is absent, ncurses attempts to open GPM if  TERM  contains
+        "linux".
+ 
+ 
+ 
                                                                                                                  NCURSES_NO_HARD_TABS
                                                                                                                  +-       ncurses may use tab characters in  cursor  movement  optimization.   In
+-       some  cases,  your  terminal  driver may not handle them properly.  Set
++       ncurses  may  use  tab  characters in cursor movement optimization.  In
++       some cases, your terminal driver may not  handle  them  properly.   Set
+        this environment variable to any value to disable the feature.  You can
+        also adjust your stty(1) settings to avoid the problem.
+ 
+ 
+ 
                                                                                                                  NCURSES_NO_MAGIC_COOKIE
                                                                                                                  +-       Many  terminals  store  video  attributes  as a property of a character
+-       cell, as curses does.  Historically, some  recorded  changes  in  video
+-       attributes  as  data  that  logically  occupies  character cells on the
+-       display, switching attributes on or off, similarly to tags in a  markup
+-       language;  these  are  termed "magic cookies", and must be subsequently
+-       overprinted.  If the terminfo entry for your  terminal  type  does  not
++       Many terminals store video attributes as  a  property  of  a  character
++       cell,  as  curses  does.   Historically, some recorded changes in video
++       attributes as data that  logically  occupies  character  cells  on  the
++       display,  switching attributes on or off, similarly to tags in a markup
++       language; these are termed "magic cookies", and  must  be  subsequently
++       overprinted.   If  the  terminfo  entry for your terminal type does not
+        adequately describe its handling of magic cookies, set this variable to
+        any value to instruct ncurses to disable attributes entirely.
+ 
+ 
+ 
                                                                                                                  NCURSES_NO_PADDING
                                                                                                                  +        Most  terminal  type  descriptions  in  the  terminfo  database  detail
+-       hardware   devices.   Many  people  use  curses-based  applications  in
+-       terminal emulator programs that run in a windowing environment.   These
+-       programs  can  duplicate  all  of  the important features of a hardware
+-       terminal, but often lack their limitations.  Chief among  these  absent
++       hardware  devices.   Many  people  use  curses-based  applications   in
++       terminal  emulator programs that run in a windowing environment.  These
++       programs can duplicate all of the  important  features  of  a  hardware
++       terminal,  but  often lack their limitations.  Chief among these absent
+        drawbacks is the problem of data flow management; that is, limiting the
+-       speed of communication to what the hardware  could  handle.   Unless  a
+-       hardware  terminal  is  interfaced  into a terminal concentrator (which
+-       does flow control), an application must manage flow itself  to  prevent
++       speed  of  communication  to  what the hardware could handle.  Unless a
++       hardware terminal is interfaced into  a  terminal  concentrator  (which
++       does  flow  control), an application must manage flow itself to prevent
+        overruns and data loss.
+ 
+-       A  solution  that  comes  at  no hardware cost is for an application to
+-       pause after directing a  terminal  to  execute  an  operation  that  it
+-       performs  slowly,  such  as  clearing  the display.  Many terminal type
+-       descriptions, including that for the VT100, embed delay  specifications
+-       in  capabilities.   You  may  wish  to  use these terminal descriptions
+-       without paying the performance penalty.  Set NCURSES_NO_PADDING to  any
+-       value  to disable all but mandatory padding.  Mandatory padding is used
++       A solution that comes at no hardware cost  is  for  an  application  to
++       pause  after  directing  a  terminal  to  execute  an operation that it
++       performs slowly, such as clearing  the  display.   Many  terminal  type
++       descriptions,  including that for the VT100, embed delay specifications
++       in capabilities.  You may  wish  to  use  these  terminal  descriptions
++       without  paying the performance penalty.  Set NCURSES_NO_PADDING to any
++       value to disable all but mandatory padding.  Mandatory padding is  used
+        by such terminal capabilities as flash_screen (flash).
+ 
+ 
+ 
                                                                                                                  NCURSES_NO_SETBUF
                                                                                                                  +-       (Obsolete) Prior to internal changes developed in ncurses 5.9  (patches
+-       20120825  through 20130126), the library used setbuf(3) to enable fully
+-       buffered output when initializing the terminal.  This was done,  as  in
+-       SVr4  curses,  to  increase performance.  For testing purposes, both of
+-       ncurses and of certain applications, this feature  was  made  optional.
+-       Setting  this  variable  disabled  output buffering, leaving the output
++       (Obsolete)  Prior to internal changes developed in ncurses 5.9 (patches
++       20120825 through 20130126), the library used setbuf(3) to enable  fully
++       buffered  output  when initializing the terminal.  This was done, as in
++       SVr4 curses, to increase performance.  For testing  purposes,  both  of
++       ncurses  and  of  certain applications, this feature was made optional.
++       Setting this variable disabled output  buffering,  leaving  the  output
+        stream in the original (usually line-buffered) mode.
+ 
+-       Nowadays, ncurses performs its own buffering and does not require  this
+-       workaround;  it  does  not  modify the buffering of the standard output
+-       stream.  This approach makes signal handling, as for  interrupts,  more
+-       robust.   A  drawback  is  that  certain  unconventional programs mixed
+-       stdio(3) calls with ncurses calls and (usually) got the  behavior  they
+-       expected.   This  is  no longer the case; ncurses does not write to the
++       Nowadays,  ncurses performs its own buffering and does not require this
++       workaround; it does not modify the buffering  of  the  standard  output
++       stream.   This  approach makes signal handling, as for interrupts, more
++       robust.  A drawback  is  that  certain  unconventional  programs  mixed
++       stdio(3)  calls  with ncurses calls and (usually) got the behavior they
++       expected.  This is no longer the case; ncurses does not  write  to  the
+        standard output file descriptor through a stdio-buffered stream.
+ 
+-       As a special case, low-level API calls such as putp(3x) still  use  the
+-       standard  output stream.  High-level curses calls such as printw(3x) do
++       As  a  special case, low-level API calls such as putp(3x) still use the
++       standard output stream.  High-level curses calls such as printw(3x)  do
+        not.
+ 
+ 
+ 
                                                                                                                  NCURSES_NO_UTF8_ACS
                                                                                                                  +-       At initialization, ncurses inspects the TERM environment  variable  for
+-       special   cases   where   VT100   forms-drawing   characters  (and  the
+-       corresponding alternate character set terminfo capabilities) are  known
++       At  initialization,  ncurses inspects the TERM environment variable for
++       special  cases  where   VT100   forms-drawing   characters   (and   the
++       corresponding  alternate character set terminfo capabilities) are known
+        to  be  unsupported  by  terminal  types  that  otherwise  claim  VT100
+        compatibility.  Specifically, when running in a UTF-8 locale, the Linux
+-       virtual  console device and the GNU screen(1) program ignore them.  Set
++       virtual console device and the GNU screen(1) program ignore them.   Set
+        this  variable  to  a  nonzero  value  to  instruct  ncurses  that  the
+        terminal's ACS support is broken; the library then outputs Unicode code
+        points that correspond to the forms-drawing characters.  Set it to zero
+        (or a non-integer) to disable the special check for terminal type names
+-       matching "linux" or "screen", directing ncurses to assume that the  ACS
++       matching  "linux" or "screen", directing ncurses to assume that the ACS
+        feature works if the terminal type description advertises it.
+ 
+-       As  an  alternative  to  use  of  this  variable, ncurses checks for an
++       As an alternative to use  of  this  variable,  ncurses  checks  for  an
+        extended terminfo numeric capability U8 that can be compiled using "tic
+        -x".  Examples follow.
+ 
+@@ -1043,62 +1045,62 @@
+           xterm-utf8|xterm relying on UTF-8 line-graphics,
+                   U8#1, use=xterm,
+ 
+-       The  two-character name "U8" was chosen to permit its use via ncurses's
++       The two-character name "U8" was chosen to permit its use via  ncurses's
+        termcap interface.
+ 
+ 
+ 
                                                                                                                  NCURSES_TRACE
                                                                                                                  +-       At initialization, ncurses (in its debugging configuration) checks  for
+-       this  variable's  presence.   If  defined  with  an integral value, the
++       At  initialization, ncurses (in its debugging configuration) checks for
++       this variable's presence.  If  defined  with  an  integral  value,  the
+        library calls curses_trace(3x) with that value as the argument.
+ 
+ 
+ 
                                                                                                                  TERM
                                                                                                                  +-       The TERM variable denotes the terminal type.  Each is distinct,  though
+-       many  are  similar.   It  is commonly set by terminal emulators to help
+-       applications find a  workable  terminal  description.   Some  choose  a
+-       popular  approximation  such as "ansi", "vt100", or "xterm" rather than
+-       an exact fit to their capabilities.  Not infrequently,  an  application
+-       will  have  problems  with that approach; for example, a key stroke may
+-       not operate  correctly,  or  produce  no  effect  but  seeming  garbage
++       The  TERM variable denotes the terminal type.  Each is distinct, though
++       many are similar.  It is commonly set by  terminal  emulators  to  help
++       applications  find  a  workable  terminal  description.   Some choose a
++       popular approximation such as "ansi", "vt100", or "xterm"  rather  than
++       an  exact  fit to their capabilities.  Not infrequently, an application
++       will have problems with that approach; for example, a  key  stroke  may
++       not  operate  correctly,  or  produce  no  effect  but  seeming garbage
+        characters on the screen.
+ 
+-       Setting  TERM  has  no effect on hardware operation; it affects the way
+-       applications communicate with the terminal.   Likewise,  as  a  general
+-       rule  (xterm(1)  being a rare exception), terminal emulators that allow
++       Setting TERM has no effect on hardware operation; it  affects  the  way
++       applications  communicate  with  the  terminal.  Likewise, as a general
++       rule (xterm(1) being a rare exception), terminal emulators  that  allow
+        you to specify TERM as a parameter or configuration value do not change
+        their behavior to match that setting.
+ 
+ 
+ 
                                                                                                                  TERMCAP
                                                                                                                  +        If ncurses is configured with termcap support, it checks for a terminal
+-       type description in termcap format if one in  terminfo  format  is  not
+-       available.   Setting  this variable directs ncurses to ignore the usual
+-       termcap database location, /etc/termcap; see TERMPATH  below.   TERMCAP
+-       should  contain  either  a terminal description (with newlines stripped
+-       out), or a file name indicating where the information required  by  the
++       type  description  in  termcap  format if one in terminfo format is not
++       available.  Setting this variable directs ncurses to ignore  the  usual
++       termcap  database  location, /etc/termcap; see TERMPATH below.  TERMCAP
++       should contain either a terminal description  (with  newlines  stripped
++       out),  or  a file name indicating where the information required by the
+        TERM environment variable is stored.
+ 
+ 
+ 
                                                                                                                  TERMINFO
                                                                                                                  +-       ncurses  can  be configured to read terminal type description databases
+-       in various locations using different formats.  This variable  overrides
++       ncurses can be configured to read terminal type  description  databases
++       in  various locations using different formats.  This variable overrides
+        the default location.
+ 
+-       o   Descriptions  in terminfo format are normally stored in a directory
+-           tree using subdirectories named by the common first letters of  the
++       o   Descriptions in terminfo format are normally stored in a  directory
++           tree  using subdirectories named by the common first letters of the
+            terminal types named therein.  This is the scheme used in System V.
+ 
+        o   If ncurses is configured to use hashed databases, then TERMINFO may
+-           name its location,  such  as  /usr/share/terminfo.db,  rather  than
++           name  its  location,  such  as  /usr/share/terminfo.db, rather than
+            /usr/share/terminfo/.
+ 
+-       The  hashed  database  uses less disk space and is a little faster than
++       The hashed database uses less disk space and is a  little  faster  than
+        the directory tree.  However, some applications assume the existence of
+        the directory tree, and read it directly rather than using the terminfo
+        API.
+ 
+-       o   If ncurses is configured with termcap support,  this  variable  may
++       o   If  ncurses  is  configured with termcap support, this variable may
+            contain the location of a termcap file.
+ 
+        o   If the value of TERMINFO begins with "hex:" or "b64:", ncurses uses
+@@ -1108,10 +1110,10 @@
+                   TERMINFO=$(infocmp -0 -Q2 -q)
+                   export TERMINFO
+ 
+-           The  compiled  description  is  used  only if it corresponds to the
++           The compiled description is used only  if  it  corresponds  to  the
+            terminal type identified by TERM.
+ 
+-       Setting TERMINFO is the simplest, but  not  the  only,  way  to  direct
++       Setting  TERMINFO  is  the  simplest,  but  not the only, way to direct
+        ncurses to a terminal database.  The search path is as follows.
+ 
+        o   the last terminal database to which the running ncurses application
+@@ -1129,16 +1131,16 @@
+ 
+ 
+ 
                                                                                                                  TERMINFO_DIRS
                                                                                                                  +-       This variable specifies a list of locations, akin  to  PATH,  in  which
+-       ncurses  searches  for  the  terminal  type  descriptions  described by
+-       TERMINFO above.  The list items are separated by  colons  on  Unix  and
+-       semicolons  on  OS/2  EMX.   System V  terminfo  lacks  a corresponding
++       This  variable  specifies  a  list of locations, akin to PATH, in which
++       ncurses searches  for  the  terminal  type  descriptions  described  by
++       TERMINFO  above.   The  list  items are separated by colons on Unix and
++       semicolons on  OS/2  EMX.   System V  terminfo  lacks  a  corresponding
+        feature; TERMINFO_DIRS is an ncurses extension.
+ 
+ 
+ 
                                                                                                                  TERMPATH
                                                                                                                  +        If TERMCAP does not hold a terminal type description or file name, then
+-       ncurses  checks  the contents of TERMPATH, a list of locations, akin to
++       ncurses checks the contents of TERMPATH, a list of locations,  akin  to
+        PATH, in which it searches for termcap terminal type descriptions.  The
+        list items are separated by colons on Unix and semicolons on OS/2 EMX.
+ 
+@@ -1148,9 +1150,9 @@
+ 
+ 
+ 
                                                                                                                  ALTERNATE CONFIGURATIONS
                                                                                                                  +-       Many  different  ncurses configurations are possible, determined by the
+-       options given to the configure script when building the  library.   Run
+-       the  script  with  the  --help option to peruse them all.  A few are of
++       Many different ncurses configurations are possible, determined  by  the
++       options  given  to the configure script when building the library.  Run
++       the script with the --help option to peruse them all.   A  few  are  of
+        particular significance to the application developer employing ncurses.
+ 
+        --disable-overwrite
+@@ -1159,24 +1161,24 @@
+ 
+                 #include <curses.h>
+ 
+-            This  option  is used to avoid file name conflicts between ncurses
+-            and an existing curses installation on the system.  If ncurses  is
+-            installed  disabling  overwrite,  it  puts  its  header files in a
++            This option is used to avoid file name conflicts  between  ncurses
++            and  an existing curses installation on the system.  If ncurses is
++            installed disabling overwrite, it  puts  its  header  files  in  a
+             subdirectory.  Here is an example.
+ 
+                 #include <ncurses/curses.h>
+ 
+-            Installation also omits a  symbolic  link  that  would  cause  the
+-            compiler's  -lcurses  option  to  link  object  files with ncurses
++            Installation  also  omits  a  symbolic  link  that would cause the
++            compiler's -lcurses option  to  link  object  files  with  ncurses
+             instead of the system curses library.
+ 
+-            The directory used by this configuration of ncurses  is  shown  in
++            The  directory  used  by this configuration of ncurses is shown in
+             section "SYNOPSIS" above.
+ 
+        --enable-widec
+-            The   configure   script   renames   the   library   and  (if  the
+-            --disable-overwrite option is used) puts the  header  files  in  a
+-            different  subdirectory.   All  of  the  library  names have a "w"
++            The  configure  script   renames   the   library   and   (if   the
++            --disable-overwrite  option  is  used)  puts the header files in a
++            different subdirectory.  All of  the  library  names  have  a  "w"
+             appended to them, i.e., instead of
+ 
+                 -lncurses
+@@ -1185,62 +1187,62 @@
+ 
+                 -lncursesw
+ 
+-            You must also enable the wide-character  features  in  the  header
+-            file  when  compiling  for  the  wide-character library to use the
+-            extended (wide-character) functions.   The  symbol  which  enables
++            You  must  also  enable  the wide-character features in the header
++            file when compiling for the  wide-character  library  to  use  the
++            extended  (wide-character)  functions.   The  symbol which enables
+             these features has changed since X/Open Curses, Issue 4:
+ 
+-            o   Originally,  the  wide-character  feature  required the symbol
++            o   Originally, the wide-character  feature  required  the  symbol
+                 _XOPEN_SOURCE_EXTENDED  but  that  was  only  valid  for  XPG4
+                 (1996).
+ 
+-            o   Later,  that was deemed conflicting with _XOPEN_SOURCE defined
++            o   Later, that was deemed conflicting with _XOPEN_SOURCE  defined
+                 to 500.
+ 
+-            o   As of mid-2018, none of the features  in  this  implementation
+-                require  a  _XOPEN_SOURCE  feature greater than 600.  However,
++            o   As  of  mid-2018,  none of the features in this implementation
++                require a _XOPEN_SOURCE feature greater  than  600.   However,
+                 X/Open Curses, Issue 7 (2009) recommends defining it to 700.
+ 
+-            o   Alternatively,  you  can  enable  the  feature   by   defining
+-                NCURSES_WIDECHAR  with  the caveat that some other header file
+-                than curses.h may require a specific value  for  _XOPEN_SOURCE
++            o   Alternatively,   you   can  enable  the  feature  by  defining
++                NCURSES_WIDECHAR with the caveat that some other  header  file
++                than  curses.h  may require a specific value for _XOPEN_SOURCE
+                 (or a system-specific symbol).
+ 
+-            The  curses.h header file installed for the wide-character library
+-            is designed to be compatible with the non-wide  library's  header.
+-            Only  the  size  of the WINDOW structure differs; few applications
++            The curses.h header file installed for the wide-character  library
++            is  designed  to be compatible with the non-wide library's header.
++            Only the size of the WINDOW structure  differs;  few  applications
+             require more than pointers to WINDOWs.
+ 
+             If  the  headers  are  installed  allowing  overwrite,  the  wide-
+-            character  library's  headers  should  be installed last, to allow
++            character library's headers should be  installed  last,  to  allow
+             applications to be built using either library from the same set of
+             headers.
+ 
+        --with-pthread
+-            The  configure  script  renames  the  library.  All of the library
+-            names have a "t"  appended  to  them  (before  any  "w"  added  by
++            The configure script renames the  library.   All  of  the  library
++            names  have  a  "t"  appended  to  them  (before  any "w" added by
+             --enable-widec).
+ 
+             The global variables such as LINES are replaced by macros to allow
+             read-only access.  At the same time, setter-functions are provided
+-            to  set  these  values.   Some applications (very few) may require
++            to set these values.  Some applications  (very  few)  may  require
+             changes to work with this convention.
+ 
+        --with-shared
+        --with-normal
+        --with-debug
+        --with-profile
+-            The shared and normal  (static)  library  names  differ  by  their
+-            suffixes,  e.g.,  libncurses.so  and  libncurses.a.  The debug and
+-            profiling libraries add a "_g"  and  a  "_p"  to  the  root  names
++            The  shared  and  normal  (static)  library  names differ by their
++            suffixes, e.g., libncurses.so and  libncurses.a.   The  debug  and
++            profiling  libraries  add  a  "_g"  and  a  "_p" to the root names
+             respectively, e.g., libncurses_g.a and libncurses_p.a.
+ 
+        --with-termlib
+-            Low-level  functions  which do not depend upon whether the library
++            Low-level functions which do not depend upon whether  the  library
+             supports wide-characters, are provided in the tinfo library.
+ 
+-            By doing this, it is possible to share the tinfo  library  between
+-            wide/normal  configurations  as  well  as  reduce  the size of the
++            By  doing  this, it is possible to share the tinfo library between
++            wide/normal configurations as well  as  reduce  the  size  of  the
+             library when only low-level functions are needed.
+ 
+             Those functions are described in these pages:
+@@ -1260,8 +1262,8 @@
+             o   curs_util(3x) - miscellaneous curses utility routines
+ 
+        --with-trace
+-            The trace function normally resides in the debug library,  but  it
+-            is  sometimes  useful  to  configure  this  in the shared library.
++            The  trace  function normally resides in the debug library, but it
++            is sometimes useful to  configure  this  in  the  shared  library.
+             Configure scripts should check for the function's existence rather
+             than assuming it is always in the debug library.
+ 
+@@ -1275,213 +1277,213 @@
+ 
+ 
+ 
                                                                                                                  NOTES
                                                                                                                  +-       X/Open  Curses permits most functions it specifies to be made available
++       X/Open Curses permits most functions it specifies to be made  available
+        as macros as well.  ncurses does so
+ 
+        o   for functions that return values via their parameters,
+ 
+        o   to support obsolete features,
+ 
+-       o   to reuse functions (for example, those that move the cursor  before
++       o   to  reuse functions (for example, those that move the cursor before
+            another operation), and
+ 
+        o   in a few special cases.
+ 
+-       If  the  standard  output  file  descriptor  of  an  ncurses program is
+-       redirected to something that is not  a  terminal  device,  the  library
+-       writes  screen updates to the standard error file descriptor.  This was
++       If the standard  output  file  descriptor  of  an  ncurses  program  is
++       redirected  to  something  that  is  not a terminal device, the library
++       writes screen updates to the standard error file descriptor.  This  was
+        an undocumented feature of SVr3 curses.
+ 
+-       See subsection  "Header  Files"  below  regarding  symbols  exposed  by
++       See  subsection  "Header  Files"  below  regarding  symbols  exposed by
+        inclusion of curses.h.
+ 
+ 
+ 
                                                                                                                  EXTENSIONS
                                                                                                                  +-       ncurses  enables  an  application  to  capture  mouse events on certain
++       ncurses enables an application  to  capture  mouse  events  on  certain
+        terminals, including xterm(1); see curs_mouse(3x).
+ 
+-       ncurses provides a means of responding to window  resizing  events,  as
+-       when  running in a GUI terminal emulator application such as xterm; see
++       ncurses  provides  a  means of responding to window resizing events, as
++       when running in a GUI terminal emulator application such as xterm;  see
+        resizeterm(3x) and wresize(3x).
+ 
+        ncurses allows an application to query the terminal for the presence of
+        a wide variety of special keys; see has_key(3x).
+ 
+        ncurses extends the fixed set of function key capabilities specified by
+-       X/Open  Curses  by  allowing  the  application  programmer  to   define
+-       additional  key events at runtime; see define_key(3x), key_defined(3x),
++       X/Open   Curses  by  allowing  the  application  programmer  to  define
++       additional key events at runtime; see define_key(3x),  key_defined(3x),
+        keybound(3x), and keyok(3x).
+ 
+-       ncurses  can  exploit  the  capabilities  of   terminals   implementing
+-       ISO 6429/ECMA-48   SGR 39   and   SGR 49   sequences,  which  allow  an
+-       application to reset  the  terminal  to  its  original  foreground  and
+-       background  colors.  From a user's perspective, the application is able
+-       to draw colored text on a background whose color is set  independently,
++       ncurses   can   exploit  the  capabilities  of  terminals  implementing
++       ISO 6429/ECMA-48  SGR 39  and  SGR 49   sequences,   which   allow   an
++       application  to  reset  the  terminal  to  its  original foreground and
++       background colors.  From a user's perspective, the application is  able
++       to  draw colored text on a background whose color is set independently,
+        providing better control over color contrasts.  See default_colors(3x).
+ 
+-       An  ncurses  application  can  eschew  knowledge  of  SCREEN and WINDOW
+-       structure  internals,  instead  using  accessor   functions   such   as
++       An ncurses application  can  eschew  knowledge  of  SCREEN  and  WINDOW
++       structure   internals,   instead   using  accessor  functions  such  as
+        is_cbreak(3x) and is_scrollok(3x).
+ 
+-       ncurses  enables  an  application  to  direct  its  output to a printer
++       ncurses enables an application  to  direct  its  output  to  a  printer
+        attached to the terminal device; see curs_print(3x).
+ 
+-       ncurses offers slk_attr(3x) as a counterpart of attr_get(3x) for  soft-
+-       label  key lines, and extended_slk_color(3x) as a form of slk_color(3x)
+-       that can gather color  information  from  them  when  many  colors  are
++       ncurses  offers slk_attr(3x) as a counterpart of attr_get(3x) for soft-
++       label key lines, and extended_slk_color(3x) as a form of  slk_color(3x)
++       that  can  gather  color  information  from  them  when many colors are
+        supported.
+ 
+-       ncurses    permits   modification   of   unctrl(3x)'s   behavior;   see
++       ncurses   permits   modification   of   unctrl(3x)'s   behavior;    see
+        use_legacy_coding(3x).
+ 
+-       Rudimentary support for multi-threaded applications may  be  available;
++       Rudimentary  support  for multi-threaded applications may be available;
+        see curs_threads(3x).
+ 
+-       Functions  that ease the management of multiple screens can be exposed;
++       Functions that ease the management of multiple screens can be  exposed;
+        see curs_sp_funcs(3x).
+ 
+-       To aid applications to debug their  memory  usage,  ncurses  optionally
+-       offers  functions  to  more  aggressively  free  memory  it dynamically
++       To  aid  applications  to  debug their memory usage, ncurses optionally
++       offers functions  to  more  aggressively  free  memory  it  dynamically
+        allocates itself; see curs_memleaks(3x).
+ 
+-       The library facilitates auditing and troubleshooting of  its  behavior;
++       The  library  facilitates auditing and troubleshooting of its behavior;
+        see curs_trace(3x).
+ 
+-       Compiling  ncurses  with the option -DUSE_GETCAP causes it to fall back
+-       to reading /etc/termcap if the terminal setup code cannot find a  term-
++       Compiling ncurses with the option -DUSE_GETCAP causes it to  fall  back
++       to  reading /etc/termcap if the terminal setup code cannot find a term-
+        info  entry  corresponding  to  TERM.   Use  of  this  feature  is  not
+-       recommended, as it essentially includes an entire termcap  compiler  in
+-       the  ncurses  startup  code,  at a cost in memory usage and application
++       recommended,  as  it essentially includes an entire termcap compiler in
++       the ncurses startup code, at a cost in  memory  usage  and  application
+        launch latency.
+ 
+-       PDCurses  and  NetBSD  curses  incorporate  some  ncurses   extensions.
++       PDCurses   and  NetBSD  curses  incorporate  some  ncurses  extensions.
+        Individual man pages indicate where this is the case.
+ 
+ 
+ 
                                                                                                                  PORTABILITY
                                                                                                                  +        X/Open Curses defines two levels of conformance, "base" and "enhanced".
+        The latter includes several additional features, such as wide-character
+-       and  color support.  ncurses intends base-level conformance with X/Open
+-       Curses, and supports all features of  its  enhanced  level  except  the
++       and color support.  ncurses intends base-level conformance with  X/Open
++       Curses,  and  supports  all  features  of its enhanced level except the
+        untic utility.
+ 
+-       Differences  between  X/Open  Curses  and ncurses are documented in the
++       Differences between X/Open Curses and ncurses  are  documented  in  the
+        "PORTABILITY" sections of applicable man pages.
+ 
+ 
+ 
                                                                                                                  Error Checking
                                                                                                                  +-       In many cases, X/Open Curses is vague about error conditions,  omitting
++       In  many cases, X/Open Curses is vague about error conditions, omitting
+        some of the SVr4 documentation.
+ 
+-       Unlike  other  implementations, ncurses checks pointer parameters, such
+-       as those to WINDOW structures, to ensure that they are not null.   This
+-       is  done  primarily  to  guard  against programmer error.  The standard
++       Unlike other implementations, ncurses checks pointer  parameters,  such
++       as  those to WINDOW structures, to ensure that they are not null.  This
++       is done primarily to guard  against  programmer  error.   The  standard
+        interface does not provide a way for the library to tell an application
+-       which  of several possible errors occurred.  An application that relies
+-       on ncurses to check its function parameters  for  validity  limits  its
++       which of several possible errors occurred.  An application that  relies
++       on  ncurses  to  check  its function parameters for validity limits its
+        portability and robustness.
+ 
+ 
+ 
                                                                                                                  Padding Differences
                                                                                                                  +-       In  historical  curses implementations, delays embedded in the terminfo
+-       capabilities carriage_return (cr),  scroll_forward  (ind),  cursor_left
++       In historical curses implementations, delays embedded in  the  terminfo
++       capabilities  carriage_return  (cr),  scroll_forward (ind), cursor_left
+        (cub1), form_feed (ff), and tab (ht) activated corresponding delay bits
+-       in the Unix terminal driver.  ncurses performs all padding  by  sending
+-       NUL  bytes  to the device.  This method is slightly more expensive, but
+-       narrows  the  interface  to   the   Unix   kernel   significantly   and
++       in  the  Unix terminal driver.  ncurses performs all padding by sending
++       NUL bytes to the device.  This method is slightly more  expensive,  but
++       narrows   the   interface   to   the   Unix  kernel  significantly  and
+        correspondingly increases the package's portability.
+ 
+ 
+ 
                                                                                                                  Header Files
                                                                                                                  +-       The  header  file curses.h itself includes the header files stdio.h and
++       The header file curses.h itself includes the header files  stdio.h  and
+        unctrl.h.
+ 
+        X/Open Curses has more to say,
+ 
+-           The inclusion of curses.h may make visible  all  symbols  from  the
++           The  inclusion  of  curses.h  may make visible all symbols from the
+            headers stdio.h, term.h, termios.h, and wchar.h.
+ 
+        but does not finish the story.  A more complete account follows.
+ 
+        o   The first curses, in 4BSD, provided a curses.h file.
+ 
+-           BSD  curses  code  included  curses.h and unctrl.h from an internal
++           BSD curses code included curses.h and  unctrl.h  from  an  internal
+            header file curses.ext, where "ext" abbreviated "externs".
+ 
+-           The implementations of printw and scanw used undocumented  internal
+-           functions  of  the  standard I/O library (_doprnt and _doscan), but
++           The  implementations of printw and scanw used undocumented internal
++           functions of the standard I/O library (_doprnt  and  _doscan),  but
+            nothing in curses.h itself relied upon stdio.h.
+ 
+-       o   SVr2 curses added newterm, which relies upon  stdio.h  because  its
++       o   SVr2  curses  added  newterm, which relies upon stdio.h because its
+            function prototype employs the FILE type.
+ 
+            SVr4 curses added putwin and getwin, which also use stdio.h.
+ 
+            X/Open Curses specifies all three of these functions.
+ 
+-           SVr4  curses  and  X/Open  Curses  do  not require the developer to
+-           include stdio.h before curses.h.  Both document use  of  curses  as
++           SVr4 curses and X/Open Curses  do  not  require  the  developer  to
++           include  stdio.h  before  curses.h.  Both document use of curses as
+            requiring only curses.h.
+ 
+            As a result, standard curses.h always includes stdio.h.
+ 
+-       o   X/Open  Curses  and  SVr4  curses  are inconsistent with respect to
++       o   X/Open Curses and SVr4 curses  are  inconsistent  with  respect  to
+            unctrl.h.
+ 
+-           As noted in curs_util(3x), ncurses includes unctrl.h from  curses.h
++           As  noted in curs_util(3x), ncurses includes unctrl.h from curses.h
+            (as SVr4 does).
+ 
+-       o   X/Open  Curses's  comments  about term.h and termios.h may refer to
++       o   X/Open Curses's comments about term.h and termios.h  may  refer  to
+            HP-UX and AIX.
+ 
+-           HP-UX curses includes term.h from curses.h to declare setupterm  in
++           HP-UX  curses includes term.h from curses.h to declare setupterm in
+            curses.h, but ncurses and Solaris curses do not.
+ 
+-           AIX  curses  includes  term.h  and  termios.h.   Again, ncurses and
++           AIX curses includes  term.h  and  termios.h.   Again,  ncurses  and
+            Solaris curses do not.
+ 
+-       o   X/Open Curses says that curses.h may include term.h, but  does  not
++       o   X/Open  Curses  says that curses.h may include term.h, but does not
+            require it to do so.
+ 
+-           Some  programs  use functions declared in both curses.h and term.h,
+-           and must include both header files in the same  module.   Very  old
+-           versions  of  AIX  curses  required  inclusion  of  curses.h before
++           Some programs use functions declared in both curses.h  and  term.h,
++           and  must  include  both header files in the same module.  Very old
++           versions of  AIX  curses  required  inclusion  of  curses.h  before
+            term.h.
+ 
+-           The header files supplied by ncurses include the  standard  library
+-           headers  required  for  its  declarations,  so ncurses's own header
+-           files can be included in  any  order.   But  for  portability,  you
++           The  header  files supplied by ncurses include the standard library
++           headers required for its  declarations,  so  ncurses's  own  header
++           files  can  be  included  in  any  order.  But for portability, you
+            should include curses.h before term.h.
+ 
+-       o   X/Open  Curses  says  "may make visible" because including a header
+-           file does not necessarily make visible all of  the  symbols  in  it
++       o   X/Open Curses says "may make visible" because  including  a  header
++           file  does  not  necessarily  make visible all of the symbols in it
+            (consider #ifdef and similar).
+ 
+-           For  instance, ncurses's curses.h may include wchar.h if the proper
+-           symbol is defined, and if ncurses is configured for  wide-character
+-           support.   If  wchar.h is included, its symbols may be made visible
++           For instance, ncurses's curses.h may include wchar.h if the  proper
++           symbol  is defined, and if ncurses is configured for wide-character
++           support.  If wchar.h is included, its symbols may be  made  visible
+            depending on the value of the _XOPEN_SOURCE feature test macro.
+ 
+        o   X/Open Curses mandates an application's inclusion of one standard C
+-           library  header  in  a  special  case:  stdarg.h before curses.h to
+-           prototype the functions vw_printw and  vw_scanw  (as  well  as  the
+-           obsolete  vwprintw  and  vwscanw).   Each of these takes a variadic
++           library header in a  special  case:  stdarg.h  before  curses.h  to
++           prototype  the  functions  vw_printw  and  vw_scanw (as well as the
++           obsolete vwprintw and vwscanw).  Each of  these  takes  a  variadic
+            argument list, a va_list parameter, like that of printf(3).
+ 
+-           SVr3 curses introduced  the  two  obsolete  functions,  and  X/Open
+-           Curses  the  others.   In  between,  SVr4  curses  provided for the
+-           possibility that an application might include either  varargs.h  or
+-           stdarg.h.   These  represented  contrasting  approaches to handling
+-           variadic argument lists.  The older interface,  varargs.h,  used  a
+-           pointer  to char for variadic functions' va_list parameter.  Later,
+-           the list acquired its own standard data type, va_list,  defined  in
+-           stdarg.h,  empowering the compiler to check the types of a function
+-           call's actual parameters against the formal ones  declared  in  its
++           SVr3  curses  introduced  the  two  obsolete  functions, and X/Open
++           Curses the others.   In  between,  SVr4  curses  provided  for  the
++           possibility  that  an application might include either varargs.h or
++           stdarg.h.  These represented  contrasting  approaches  to  handling
++           variadic  argument  lists.   The older interface, varargs.h, used a
++           pointer to char for variadic functions' va_list parameter.   Later,
++           the  list  acquired its own standard data type, va_list, defined in
++           stdarg.h, empowering the compiler to check the types of a  function
++           call's  actual  parameters  against the formal ones declared in its
+            prototype.
+ 
+-           No   conforming   implementations   of  X/Open  Curses  require  an
++           No  conforming  implementations  of  X/Open   Curses   require   an
+            application to include stdarg.h before curses.h because they either
+-           have  allowed  for  a  special type, or, like ncurses, they include
++           have allowed for a special type, or,  like  ncurses,  they  include
+            stdarg.h themselves to provide a portable interface.
+ 
+ 
+@@ -1495,7 +1497,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-22                       ncurses(3x)
++ncurses 6.5                       2024-07-20                       ncurses(3x)
+ 
                                                                                                                  
+ 
                                                                                                                  
+ 
                                                                                                                    
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.5-20240713+/doc/html/man/terminfo.5.html	2024-06-22 22:55:11.000000000 +0000
++++ ncurses-6.5-20240720/doc/html/man/terminfo.5.html	2024-07-20 22:19:06.000000000 +0000
+@@ -71,7 +71,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This document describes ncurses version 6.5 (patch 20240622).
++       This document describes ncurses version 6.5 (patch 20240720).
+ 
+ 
+

                                                                                                  terminfo Entry Syntax

                                                                                                  +Index: doc/html/man/wresize.3x.html
+--- ncurses-6.5-20240713+/doc/html/man/wresize.3x.html	2024-04-27 18:38:49.000000000 +0000
++++ ncurses-6.5-20240720/doc/html/man/wresize.3x.html	2024-07-20 22:19:07.000000000 +0000
+@@ -28,19 +28,19 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey 1996
+-  * @Id: wresize.3x,v 1.36 2024/03/16 15:35:01 tom Exp @
++  * @Id: wresize.3x,v 1.38 2024/07/20 22:13:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-wresize 3x 2024-03-16 ncurses 6.5 Library calls
++wresize 3x 2024-07-20 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                  wresize 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                  
++
                                                                                                  wresize 3x 2024-07-20 ncurses 6.5 Library calls
                                                                                                  
+ 
                                                                                                  + wresize(3x)                      Library calls                     wresize(3x)
+ 
+@@ -54,40 +54,53 @@
+ 
                                                                                                  SYNOPSIS
                                                                                                  +        #include <curses.h>
+ 
+-       int wresize(WINDOW *win, int lines, int columns);
++       int wresize(WINDOW * win, int lines, int columns);
+ 
+ 
+ 
                                                                                                  DESCRIPTION
                                                                                                  +-       This  ncurses  extension  to  standard curses reallocates storage for a
+-       curses window to adjust its dimensions to  the  specified  values.   If
+-       either dimension is larger than its current value, the expanded part of
+-       the window  is  filled  with  blanks  merged  with  current  background
+-       rendition (as set by wbkgdset(3x)).
++       wresize,  an  ncurses  extension  to  the  curses  library, reallocates
++       storage for win, adjusting its dimensions to  lines  and  columns.   If
++       either  dimension  is  larger than its current value, ncurses fills the
++       expanded part of the window with  the  blank  character  configured  by
++       wbkgdset(3x) (wide-character API users: wbkgrndset(3x)).
+ 
+ 
+ 
                                                                                                  RETURN VALUE
                                                                                                  +-       wresize  returns  ERR  upon failure and OK on success.  It will fail if
+-       either of the dimensions is less than or equal to zero, or if an  error
+-       occurs while (re)allocating memory for the window.
++       wresize  returns  OK on success and ERR on failure.  It fails if either
++       lines or columns is less than or equal to zero, or if an  error  occurs
++       while (re)allocating memory for win.
+ 
+ 
+ 
                                                                                                  NOTES
                                                                                                  +-       The  only  restriction placed on the dimensions is that they be greater
+-       than zero.  They are not compared to the curses screen dimensions; this
+-       keeps  the logic of resizeterm(3x) simple.  The caller must ensure that
+-       the window's dimensions fit within the actual screen dimensions.
++       The  only restriction placed on the values of lines and columns is that
++       they be greater than zero.  They are not compared to the dimensions  of
++       the  curses screen; this keeps the logic of resizeterm(3x) simple.  The
++       caller must ensure that  win's  dimensions  fit  within  those  of  the
++       screen.
++
++
++
                                                                                                  EXTENSIONS
                                                                                                  ++       wresize  is  an ncurses(3x) extension, and is not found in SVr4 curses,
++       4.4BSD curses, or any other previous curses implementation.
+ 
+ 
+ 
                                                                                                  PORTABILITY
                                                                                                  ++       Applications employing ncurses extensions should condition their use on
++       the visibility of the NCURSES_VERSION preprocessor macro.
++
++       NetBSD  curses adopted wresize in 2001 (release 1.5.3), and PDCurses in
++       2004 (version 2.7).
++
+        It is not possible to resize windows with SVr4 curses.
+ 
+-       ncurses introduced this extension in mid-1995.  NetBSD  curses  adopted
+-       it in 2001, and PDCurses in 2003.
++
++
                                                                                                  HISTORY
                                                                                                  ++       Thomas Dickey developed wresize as an extension to BSD curses in  1988,
++       and brought it to ncurses in mid-1995.
+ 
+ 
+ 
                                                                                                  AUTHORS
                                                                                                  +-       Thomas  Dickey  (from  an  equivalent  function written in 1988 for BSD
+-       curses).
++       Thomas Dickey
+ 
+ 
+ 
                                                                                                  SEE ALSO
                                                                                                  +@@ -95,7 +108,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                       wresize(3x)
++ncurses 6.5                       2024-07-20                       wresize(3x)
+ 
                                                                                                  
+ 
                                                                                                  
+ 
+Index: man/curs_add_wch.3x
+Prereq:  1.67 
+--- ncurses-6.5-20240713+/man/curs_add_wch.3x	2024-06-01 22:29:08.000000000 +0000
++++ ncurses-6.5-20240720/man/curs_add_wch.3x	2024-07-20 21:42:38.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_add_wch.3x,v 1.67 2024/06/01 22:29:08 tom Exp $
+-.TH curs_add_wch 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_add_wch.3x,v 1.69 2024/07/20 21:42:38 tom Exp $
++.TH curs_add_wch 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -132,8 +132,8 @@
+ at the left margin of a window,
+ it does nothing.
+ .bP
+-Carriage return moves the cursor to the left margin on the current line
+-of the window.
++Carriage return moves the cursor to the left margin on the same line of
++the window.
+ .bP
+ Line feed does a \fB\%clrtoeol\fP(3X),
+ then advances as if from the right margin.
+Index: man/curs_addch.3x
+Prereq:  1.94 
+--- ncurses-6.5-20240713+/man/curs_addch.3x	2024-06-22 21:34:49.000000000 +0000
++++ ncurses-6.5-20240720/man/curs_addch.3x	2024-07-20 21:42:38.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addch.3x,v 1.94 2024/06/22 21:34:49 tom Exp $
+-.TH curs_addch 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addch.3x,v 1.96 2024/07/20 21:42:38 tom Exp $
++.TH curs_addch 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -108,8 +108,8 @@
+ at the left margin of a window,
+ it does nothing.
+ .bP
+-Carriage return moves the cursor to the left margin on the current line
+-of the window.
++Carriage return moves the cursor to the left margin on the same line of
++the window.
+ .bP
+ Line feed does a \fB\%clrtoeol\fP(3X),
+ then advances as if from the right margin.
+Index: man/curs_addstr.3x
+Prereq:  1.51 
+--- ncurses-6.5-20240713+/man/curs_addstr.3x	2024-06-22 21:26:53.000000000 +0000
++++ ncurses-6.5-20240720/man/curs_addstr.3x	2024-07-20 20:49:44.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addstr.3x,v 1.51 2024/06/22 21:26:53 tom Exp $
+-.TH curs_addstr 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addstr.3x,v 1.53 2024/07/20 20:49:44 tom Exp $
++.TH curs_addstr 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -58,34 +58,32 @@
+ .nf
+ \fB#include 
+ .PP
+-\fBint addstr(const char *\fIstr\fP);
+-\fBint mvaddstr(int \fIy\fP, int \fIx\fP, const char *\fIstr\fP);
+-\fBint mvwaddstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const char *\fIstr\fP);
+-\fBint waddstr(WINDOW *\fIwin\fP, const char *\fIstr\fP);
++\fBint addstr(const char * \fIstr\fP);
++\fBint mvaddstr(int \fIy\fP, int \fIx\fP, const char * \fIstr\fP);
++\fBint mvwaddstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const char * \fIstr\fP);
++\fBint waddstr(WINDOW * \fIwin\fP, const char * \fIstr\fP);
+ .PP
+-\fBint addnstr(const char *\fIstr\fP, int \fIn\fP);
+-\fBint mvaddnstr(int \fIy\fP, int \fIx\fP, const char *\fIstr\fP, int \fIn\fP);
+-\fBint mvwaddnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const char *\fIstr\fP, int \fIn\fP);
+-\fBint waddnstr(WINDOW *\fIwin\fP, const char *\fIstr\fP, int \fIn\fP);
++\fBint addnstr(const char * \fIstr\fP, int \fIn\fP);
++\fBint mvaddnstr(int \fIy\fP, int \fIx\fP, const char * \fIstr\fP, int \fIn\fP);
++\fBint mvwaddnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const char * \fIstr\fP, int \fIn\fP);
++\fBint waddnstr(WINDOW * \fIwin\fP, const char * \fIstr\fP, int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
+ .B waddstr
+ writes the characters of the (null-terminated) string
+ .I str
+ to the window
+-.IR win .
+-Its process is similar to calling \fB\%waddch\fP(3X) for each
++.IR win ,
++as if by calling \fB\%waddch\fP(3X) for each
+ .I char
+ in
+ .IR str .
+-Control characters are processed as in \fB\%waddch\fP(3X).
+ .PP
+ .B waddnstr
+-writes at most
++is similar,
++but writes at most
+ .I n
+-characters,
+-or until a terminating null character occurs in
+-.IR str .
++characters.
+ If
+ .I n
+ is \-1,
+Index: man/curs_addwstr.3x
+Prereq:  1.41 
+--- ncurses-6.5-20240713+/man/curs_addwstr.3x	2024-06-01 22:30:17.000000000 +0000
++++ ncurses-6.5-20240720/man/curs_addwstr.3x	2024-07-20 20:53:20.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addwstr.3x,v 1.41 2024/06/01 22:30:17 tom Exp $
+-.TH curs_addwstr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addwstr.3x,v 1.43 2024/07/20 20:53:20 tom Exp $
++.TH curs_addwstr 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -58,15 +58,15 @@
+ .nf
+ \fB#include 
+ .PP
+-\fBint addwstr(const wchar_t *\fIwstr\fP);
+-\fBint mvaddwstr(int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP);
+-\fBint mvwaddwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP);
+-\fBint waddwstr(WINDOW *\fIwin\fP, const wchar_t *\fIwstr\fP);
+-.PP
+-\fBint addnwstr(const wchar_t *\fIwstr\fP, int \fIn\fP);
+-\fBint mvaddnwstr(int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP, int \fIn\fP);
+-\fBint mvwaddnwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP, int \fIn\fP);
+-\fBint waddnwstr(WINDOW *\fIwin\fP, const wchar_t *\fIwstr\fP, int \fIn\fP);
++\fBint addwstr(const wchar_t * \fIwstr\fP);
++\fBint mvaddwstr(int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP);
++\fBint mvwaddwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP);
++\fBint waddwstr(WINDOW * \fIwin\fP, const wchar_t * \fIwstr\fP);
++.PP
++\fBint addnwstr(const wchar_t * \fIwstr\fP, int \fIn\fP);
++\fBint mvaddnwstr(int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
++\fBint mvwaddnwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
++\fBint waddnwstr(WINDOW * \fIwin\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
+ .B waddwstr
+@@ -74,8 +74,9 @@
+ string
+ .I wstr
+ to the window
+-.IR win .
+-Its process is similar to constructing a
++.IR win ,
++as if by
++constructing a
+ .I cchar_t
+ for each
+ .I wchar_t
+@@ -83,19 +84,16 @@
+ .IR wstr ,
+ then calling \fB\%wadd_wch\fP(3X) with the resulting
+ .IR cchar_t .
+-.bP
+-Spacing and non-spacing characters in the string
+-are processed one at a time,
+-and
+-.bP
+-control characters are processed as in \fB\%wadd_wch\fP(3X).
++.I curses
++processes spacing and non-spacing characters in
++.I wstr
++one at a time.
+ .PP
+ .B waddnwstr
+-writes at most
++is similar,
++but writes at most
+ .I n
+-wide characters,
+-or until a terminating wide null character occurs in
+-.IR wstr .
++wide characters.
+ If
+ .I n
+ is \-1,
+@@ -141,6 +139,12 @@
+ .SH PORTABILITY
+ X/Open Curses,
+ Issue 4 describes these functions.
++.SH HISTORY
++.I \%waddstr
++and
++.I \%waddnstr
++appeared late in SVr4 development (1995).
++.\" SVID 4, vol 3., p. 478
+ .SH SEE ALSO
+ \fB\%curs_addstr\fP(3X) describes comparable functions of the
+ .I \%ncurses
+Index: man/curs_beep.3x
+Prereq:  1.33 
+--- ncurses-6.5-20240713+/man/curs_beep.3x	2024-06-22 21:27:35.000000000 +0000
++++ ncurses-6.5-20240720/man/curs_beep.3x	2024-07-20 20:54:51.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_beep.3x,v 1.33 2024/06/22 21:27:35 tom Exp $
+-.TH curs_beep 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_beep.3x,v 1.35 2024/07/20 20:54:51 tom Exp $
++.TH curs_beep 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%beep\fP,
+ \fB\%flash\fP \-
+@@ -46,7 +46,7 @@
+ .B flash
+ alert the terminal user:
+ the former by sounding the terminal's audible alarm,
+-and the latter by visibly attracting user attention.
++and the latter by visibly attracting attention.
+ Commonly,
+ a terminal implements a visual bell by momentarily reversing the
+ character foreground and background colors on the entire display;
+Index: man/curs_get_wch.3x
+Prereq:  1.43 
+--- ncurses-6.5-20240713+/man/curs_get_wch.3x	2024-06-08 20:25:25.000000000 +0000
++++ ncurses-6.5-20240720/man/curs_get_wch.3x	2024-07-20 21:43:33.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_get_wch.3x,v 1.43 2024/06/08 20:25:25 tom Exp $
+-.TH curs_get_wch 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_get_wch.3x,v 1.45 2024/07/20 21:43:33 tom Exp $
++.TH curs_get_wch 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -173,18 +173,14 @@
+ .B \%wget_wch
+ returns
+ .B OK
+-when it reads a wide character and
++when it reads a wide character,
+ .B \%KEY_CODE_YES
+-when it reads a function key code.
+-It returns
++when it reads a function key code,
++and
+ .B ERR
+-if
+-.bP
+-the
+-.I \%WINDOW
+-pointer is
+-.BR NULL ","
+-or
++on failure.
++.B \%wget_wch
++fails if
+ .bP
+ its timeout expires without any data arriving,
+ or
+@@ -195,6 +191,11 @@
+ is set to
+ .BR \%EINTR "."
+ .PP
++Functions taking a
++.I \%WINDOW
++pointer argument fail if the pointer is
++.BR NULL "."
++.PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+ .RI ( y ,
+Index: man/curs_getch.3x
+Prereq:  1.97 
+--- ncurses-6.5-20240713+/man/curs_getch.3x	2024-06-08 20:26:46.000000000 +0000
++++ ncurses-6.5-20240720/man/curs_getch.3x	2024-07-20 21:43:33.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getch.3x,v 1.97 2024/06/08 20:26:46 tom Exp $
+-.TH curs_getch 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_getch.3x,v 1.99 2024/07/20 21:43:33 tom Exp $
++.TH curs_getch 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -438,27 +438,18 @@
+ See also
+ \fB\%define_key\fP(3X) and \fB\%key_defined\fP(3X).
+ .SH RETURN VALUE
+-Except for
+-.BR \%has_key ","
+-these functions return
+-.B OK
+-on success and
++.B \%wgetch
++returns a key code identifying the key event as described above,
++which may include
++.B \%KEY_RESIZE
++or
++.B \%KEY_MOUSE
++indicating non-key events,
++or
+ .B ERR
+ on failure.
+-.PP
+-Functions taking a
+-.I \%WINDOW
+-pointer argument fail if the pointer is
+-.BR NULL "."
+-.PP
+-Functions prefixed with \*(``mv\*('' first perform cursor movement and
+-fail if the position
+-.RI ( y ,
+-.IR x ")"
+-is outside the window boundaries.
+-.PP
+ .B \%wgetch
+-also fails if
++fails if
+ .bP
+ its timeout expires without any data arriving,
+ or
+@@ -470,6 +461,12 @@
+ .BR \%EINTR "."
+ .PP
+ .B \%ungetch
++returns
++.B OK
++on success and
++.B ERR
++on failure.
++.B \%ungetch
+ fails if there is no more room in the input queue.
+ .PP
+ .B \%has_key
+@@ -477,6 +474,17 @@
+ .B TRUE
+ or
+ .BR FALSE "."
++.PP
++Functions taking a
++.I \%WINDOW
++pointer argument fail if the pointer is
++.BR NULL "."
++.PP
++Functions prefixed with \*(``mv\*('' first perform cursor movement and
++fail if the position
++.RI ( y ,
++.IR x ")"
++is outside the window boundaries.
+ .SH NOTES
+ .BR \%getch ","
+ .BR \%mvgetch ","
+Index: man/curs_move.3x
+Prereq:  1.40 
+--- ncurses-6.5-20240713+/man/curs_move.3x	2024-04-27 17:56:05.000000000 +0000
++++ ncurses-6.5-20240720/man/curs_move.3x	2024-07-20 20:54:08.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_move.3x,v 1.40 2024/04/27 17:56:05 tom Exp $
+-.TH curs_move 3X 2024-04-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_move.3x,v 1.42 2024/07/20 20:54:08 tom Exp $
++.TH curs_move 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%move\fP,
+ \fB\%wmove\fP \-
+@@ -38,7 +38,7 @@
+ \fB#include 
+ .PP
+ \fBint move(int \fIy\fP, int \fIx\fP);
+-\fBint wmove(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
++\fBint wmove(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP);
+ .fi
+ .SH DESCRIPTION
+ .B \%wmove
+@@ -83,6 +83,10 @@
+ .SH PORTABILITY
+ X/Open Curses,
+ Issue 4 describes these functions.
++4BSD (1980)
++.I curses
++introduced
++.IR \%wmove "."
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_refresh\fP(3X)
+Index: man/man_db.renames.in
+Prereq:  1.77 
+--- ncurses-6.5-20240713+/man/man_db.renames.in	2024-06-22 22:20:56.000000000 +0000
++++ ncurses-6.5-20240720/man/man_db.renames.in	2024-07-20 20:55:37.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: man_db.renames.in,v 1.77 2024/06/22 22:20:56 tom Exp $
++# $Id: man_db.renames.in,v 1.78 2024/07/20 20:55:37 tom Exp $
+ # Manual-page renamings for the man_db program
+ #
+ # Files:
+@@ -215,6 +215,7 @@
+ in_wch.3x			in_wch.3ncurses
+ inch.3x				inch.3ncurses
+ initscr.3x			initscr.3ncurses
++is_cbreak.3x			is_cbreak.3ncurses
+ is_scrollok.3x			is_scrollok.3ncurses
+ keyname.3x			keyname.3ncurses
+ keypad.3x			keypad.3ncurses
+Index: man/ncurses.3x
+Prereq:  1.225 
+--- ncurses-6.5-20240713+/man/ncurses.3x	2024-06-22 22:14:58.000000000 +0000
++++ ncurses-6.5-20240720/man/ncurses.3x	2024-07-20 20:48:52.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: ncurses.3x,v 1.225 2024/06/22 22:14:58 tom Exp $
+-.TH ncurses 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: ncurses.3x,v 1.227 2024/07/20 20:48:52 tom Exp $
++.TH ncurses 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -86,7 +86,6 @@
+ and
+ .IR pads ;
+ acquisition of keyboard and mouse events;
+-control of terminal input and output options;
+ selection of color and rendering attributes
+ (such as bold or underline);
+ the definition and use of
+@@ -528,7 +527,9 @@
+ .RS 10 \" same as foregoing tag width
+ .TP 9 \" "cchar_t" + 2n
+ .I \%cchar_t
+-corresponds to the non-wide configuration's
++is a
++.I "curses complex character"
++and corresponds to the non-wide configuration's
+ .IR \%chtype .
+ It is a structure type
+ because it requires more storage than a standard scalar type offers.
+@@ -1117,7 +1118,8 @@
+ .I \%ncurses
+ uses 9600.
+ This feature allows developers to construct repeatable test cases
+-that take into account optimization decisions that depend on baud rate.
++that take into account optimization decisions that depend
++on the terminal's line speed.
+ .SS "\fICC\fP (command character)"
+ When set,
+ the
+Index: man/wresize.3x
+Prereq:  1.36 
+--- ncurses-6.5-20240713+/man/wresize.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20240720/man/wresize.3x	2024-07-20 22:13:21.000000000 +0000
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1996
+ .\"
+-.\" $Id: wresize.3x,v 1.36 2024/03/16 15:35:01 tom Exp $
+-.TH wresize 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: wresize.3x,v 1.38 2024/07/20 22:13:21 tom Exp $
++.TH wresize 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%wresize\fP \-
+ resize a \fIcurses\fR window
+@@ -38,35 +38,93 @@
+ .nf
+ \fB#include 
+ .PP
+-\fBint wresize(WINDOW *\fIwin\fP, int \fIlines\fP, int \fIcolumns\fP);
++\fBint wresize(WINDOW * \fIwin\fP, int \fIlines\fP, int \fIcolumns\fP);
+ .fi
+ .SH DESCRIPTION
+-This \fI\%ncurses\fP extension to standard \fIcurses\fP reallocates
+-storage for a \fIcurses\fP window to adjust its dimensions to the
+-specified values.
++.BR \%wresize ","
++an
++.I \%ncurses
++extension to the
++.I curses
++library,
++reallocates storage for
++.IR win ,
++adjusting its dimensions to
++.I lines
++and
++.IR columns "."
+ If either dimension is larger than its current value,
+-the expanded part of the window is filled with blanks merged with
+-current background rendition
+-(as set by \fB\%wbkgdset\fP(3X)).
++.I \%ncurses
++fills the expanded part of the window with the blank character
++configured by \fB\%wbkgdset\fP(3X)
++(wide-character API users: \fB\%wbkgrndset\fP(3X)).
+ .SH RETURN VALUE
+-\fB\%wresize\fP returns \fBERR\fP upon failure and \fBOK\fP on success.
+-It will fail if either of the dimensions is less than or equal to zero,
+-or if an error occurs while (re)allocating memory for the window.
++.B \%wresize
++returns
++.B OK
++on success and
++.B ERR
++on failure.
++It fails if either
++.I lines
++or
++.I columns
++is less than or equal to zero,
++or if an error occurs while (re)allocating memory for
++.IR win "."
+ .SH NOTES
+-The only restriction placed on the dimensions is that they be greater
+-than zero.
+-They are \fInot\fP compared to the \fIcurses\fP screen dimensions;
++The only restriction placed on the values of
++.I lines
++and
++.I columns
++is that they be greater than zero.
++They are
++.I not
++compared to the dimensions of the
++.I curses
++screen;
+ this keeps the logic of \fB\%resizeterm\fP(3X) simple.
+-The caller must ensure that the window's dimensions fit within the
+-actual screen dimensions.
++The caller must ensure that
++.IR win 's
++dimensions fit within those of the screen.
++.SH EXTENSIONS
++.B \%wresize
++is an \fB\%ncurses\fP(3X) extension,
++and is not found in SVr4
++.IR curses ","
++4.4BSD
++.IR curses ","
++or any other previous
++.I curses
++implementation.
+ .SH PORTABILITY
+-It is not possible to resize windows with SVr4 \fIcurses\fP.
++Applications employing
++.I \%ncurses
++extensions should condition their use on the visibility of the
++.B \%NCURSES_VERSION
++preprocessor macro.
+ .PP
+-\fI\%ncurses\fP introduced this extension in mid-1995.
+-NetBSD \fIcurses\fP adopted it in 2001,
+-and \fI\%PDCurses\fP in 2003.
++NetBSD
++.I curses
++adopted
++.B \%wresize
++in 2001 (release 1.5.3),
++and
++.I \%PDCurses
++in 2004 (version 2.7).
++.PP
++It is not possible to resize windows with SVr4
++.IR curses "."
++.SH HISTORY
++Thomas Dickey developed
++.B \%wresize
++as an extension to BSD
++.I curses
++in 1988,
++and brought it to
++.I \%ncurses
++in mid-1995.
+ .SH AUTHORS
+ Thomas Dickey
+-(from an equivalent function written in 1988 for BSD \fIcurses\fP).
+ .SH SEE ALSO
+ \fB\%resizeterm\fP(3X)
+Index: misc/Makefile.in
+Prereq:  1.79 
+--- ncurses-6.5-20240713+/misc/Makefile.in	2021-11-06 23:36:12.000000000 +0000
++++ ncurses-6.5-20240720/misc/Makefile.in	2024-07-20 17:47:13.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.79 2021/11/06 23:36:12 tom Exp $
++# $Id: Makefile.in,v 1.80 2024/07/20 17:47:13 tom Exp $
+ ##############################################################################
+-# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
++# Copyright 2018-2021,2024 Thomas E. Dickey                                  #
+ # Copyright 1998-2016,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -148,7 +148,7 @@
+ @MAKE_PC_FILES@install \
+ @MAKE_PC_FILES@install.libs :: pc-files
+ @MAKE_PC_FILES@	@$(SHELL) -c 'case "x$(PKG_CONFIG_LIBDIR)" in \
+-@MAKE_PC_FILES@		x/*) \
++@MAKE_PC_FILES@		@GLOB_FULLPATH_ONLY@) \
+ @MAKE_PC_FILES@			mkdir -p $(DESTDIR)$(PKG_CONFIG_LIBDIR); \
+ @MAKE_PC_FILES@			for name in $(PC_FILES); do \
+ @MAKE_PC_FILES@				test -f $$name || continue; \
+@@ -193,7 +193,7 @@
+ uninstall.libs :
+ 	-rm -f $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
+ @MAKE_PC_FILES@	@$(SHELL) -c 'case x$(DESTDIR)$(PKG_CONFIG_LIBDIR) in \
+-@MAKE_PC_FILES@	x/*) \
++@MAKE_PC_FILES@	@GLOB_FULLPATH_ONLY@) \
+ @MAKE_PC_FILES@		for name in $(PC_FILES); do \
+ @MAKE_PC_FILES@			test -f $$name || continue; \
+ @MAKE_PC_FILES@			echo uninstalling $$name; \
+Index: ncurses/win32con/win_driver.c
+Prereq:  1.74 
+--- ncurses-6.5-20240713+/ncurses/win32con/win_driver.c	2023-09-16 16:27:44.000000000 +0000
++++ ncurses-6.5-20240720/ncurses/win32con/win_driver.c	2024-07-20 17:04:48.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2021,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -57,7 +57,7 @@
+ 
+ #define CONTROL_PRESSED (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)
+ 
+-MODULE_ID("$Id: win_driver.c,v 1.74 2023/09/16 16:27:44 tom Exp $")
++MODULE_ID("$Id: win_driver.c,v 1.75 2024/07/20 17:04:48 tom Exp $")
+ 
+ #define TypeAlloca(type,count) (type*) _alloca(sizeof(type) * (size_t) (count))
+ 
+@@ -612,7 +612,7 @@
+     returnCode(result);
+ }
+ 
+-#ifdef __MING32__
++#ifdef __MINGW32__
+ #define SysISATTY(fd) _isatty(fd)
+ #else
+ #define SysISATTY(fd) isatty(fd)
+@@ -2064,14 +2064,13 @@
+ int
+ _nc_mingw_tcflush(int fd, int queue)
+ {
+-    TC_PROLOGUE(fd);
+-    (void) term;
++    int code = ERR;
+ 
+     if (_nc_mingw_isconsole(fd)) {
+ 	if (queue == TCIFLUSH) {
+-	    BOOL b = FlushConsoleInputBuffer(GetStdHandle(STD_INPUT_HANDLE));
+-	    if (!b)
+-		return (int) GetLastError();
++	    code = (FlushConsoleInputBuffer(GetStdHandle(STD_INPUT_HANDLE))
++		    ? OK
++		    : (int) GetLastError());
+ 	}
+     }
+     return code;
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20240713+/package/debian-mingw/changelog	2024-07-13 10:06:25.000000000 +0000
++++ ncurses-6.5-20240720/package/debian-mingw/changelog	2024-07-20 10:19:56.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240713) unstable; urgency=low
++ncurses6td (6.5+20240720) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 13 Jul 2024 06:06:25 -0400
++ -- Thomas E. Dickey   Sat, 20 Jul 2024 06:19:56 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20240713+/package/debian-mingw64/changelog	2024-07-13 10:06:25.000000000 +0000
++++ ncurses-6.5-20240720/package/debian-mingw64/changelog	2024-07-20 10:19:56.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240713) unstable; urgency=low
++ncurses6td (6.5+20240720) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 13 Jul 2024 06:06:25 -0400
++ -- Thomas E. Dickey   Sat, 20 Jul 2024 06:19:56 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20240713+/package/debian/changelog	2024-07-13 10:06:25.000000000 +0000
++++ ncurses-6.5-20240720/package/debian/changelog	2024-07-20 10:19:56.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240713) unstable; urgency=low
++ncurses6td (6.5+20240720) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 13 Jul 2024 06:06:25 -0400
++ -- Thomas E. Dickey   Sat, 20 Jul 2024 06:19:56 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.657 
+--- ncurses-6.5-20240713+/package/mingw-ncurses.nsi	2024-07-13 10:06:25.000000000 +0000
++++ ncurses-6.5-20240720/package/mingw-ncurses.nsi	2024-07-20 10:19:56.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.657 2024/07/13 10:06:25 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.658 2024/07/20 10:19:56 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "0713"
++!define VERSION_MMDD  "0720"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20240713+/package/mingw-ncurses.spec	2024-07-13 10:06:25.000000000 +0000
++++ ncurses-6.5-20240720/package/mingw-ncurses.spec	2024-07-20 10:19:56.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20240713
++Release: 20240720
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20240713+/package/ncurses.spec	2024-07-13 10:06:25.000000000 +0000
++++ ncurses-6.5-20240720/package/ncurses.spec	2024-07-20 10:19:56.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20240713
++Release: 20240720
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20240713+/package/ncursest.spec	2024-07-13 10:06:25.000000000 +0000
++++ ncurses-6.5-20240720/package/ncursest.spec	2024-07-20 10:19:56.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20240713
++Release: 20240720
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/packages/ncurses/6.5/ncurses-6.5-20240727.patch b/packages/ncurses/6.5/ncurses-6.5-20240727.patch
new file mode 100644
index 0000000000..bafe608fe5
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20240727.patch
@@ -0,0 +1,7988 @@
+# ncurses 6.5 - patch 20240727 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20240727.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Jul 28 00:35:55 UTC 2024
+# ------------------------------------------------------------------------------
+# NEWS                                 |   15 +-
+# VERSION                              |    2 
+# dist.mk                              |    4 
+# doc/html/man/curs_add_wch.3x.html    |   12 -
+# doc/html/man/curs_add_wchstr.3x.html |   54 +++----
+# doc/html/man/curs_addch.3x.html      |   12 -
+# doc/html/man/curs_addchstr.3x.html   |   43 +++--
+# doc/html/man/curs_addstr.3x.html     |   14 -
+# doc/html/man/curs_addwstr.3x.html    |   20 +-
+# doc/html/man/curs_attr.3x.html       |  121 ++++++++--------
+# doc/html/man/curs_border.3x.html     |   18 +-
+# doc/html/man/curs_delch.3x.html      |   19 +-
+# doc/html/man/curs_deleteln.3x.html   |   76 +++++-----
+# doc/html/man/curs_extend.3x.html     |   58 ++++---
+# doc/html/man/curs_in_wch.3x.html     |   24 ++-
+# doc/html/man/curs_inch.3x.html       |   10 -
+# doc/html/man/curs_ins_wch.3x.html    |   26 ++-
+# doc/html/man/curs_ins_wstr.3x.html   |   87 ++++++-----
+# doc/html/man/curs_insch.3x.html      |   17 +-
+# doc/html/man/curs_insstr.3x.html     |   90 ++++++------
+# doc/html/man/curs_move.3x.html       |   21 +-
+# doc/html/man/curs_outopts.3x.html    |   29 +--
+# doc/html/man/curs_pad.3x.html        |   69 ++++-----
+# doc/html/man/curs_print.3x.html      |   63 ++++----
+# doc/html/man/curs_refresh.3x.html    |   16 +-
+# doc/html/man/curs_touch.3x.html      |   29 +--
+# doc/html/man/curs_util.3x.html       |  117 +++++++---------
+# doc/html/man/define_key.3x.html      |   10 -
+# doc/html/man/infotocap.1m.html       |   10 -
+# doc/html/man/keyok.3x.html           |   14 -
+# doc/html/man/legacy_coding.3x.html   |   33 ++--
+# doc/html/man/ncurses.3x.html         |   40 ++---
+# doc/html/man/terminfo.5.html         |    2 
+# doc/html/man/wresize.3x.html         |   12 -
+# form/frm_data.c                      |    8 -
+# form/frm_driver.c                    |   65 ++++----
+# form/frm_post.c                      |    6 
+# form/frm_sub.c                       |   15 --
+# form/frm_win.c                       |   16 --
+# form/fty_enum.c                      |   48 +++---
+# form/fty_generic.c                   |    6 
+# form/fty_int.c                       |    8 -
+# form/fty_num.c                       |   10 -
+# include/capdefaults.c                |    6 
+# man/curs_add_wch.3x                  |    7 
+# man/curs_add_wchstr.3x               |   38 ++---
+# man/curs_addch.3x                    |   11 -
+# man/curs_addchstr.3x                 |   39 +++--
+# man/curs_addstr.3x                   |   14 -
+# man/curs_addwstr.3x                  |   26 ++-
+# man/curs_attr.3x                     |  240 +++++++++++++++++++++++----------
+# man/curs_border.3x                   |    6 
+# man/curs_delch.3x                    |   23 ++-
+# man/curs_deleteln.3x                 |  125 +++++++++++------
+# man/curs_extend.3x                   |   72 ++++++---
+# man/curs_in_wch.3x                   |   29 +++
+# man/curs_inch.3x                     |    8 -
+# man/curs_ins_wch.3x                  |   39 +++--
+# man/curs_ins_wstr.3x                 |  123 +++++++++++-----
+# man/curs_insch.3x                    |   11 -
+# man/curs_insstr.3x                   |  117 ++++++++++------
+# man/curs_move.3x                     |   23 ++-
+# man/curs_outopts.3x                  |    7 
+# man/curs_pad.3x                      |    7 
+# man/curs_print.3x                    |  113 +++++++++++----
+# man/curs_refresh.3x                  |    6 
+# man/curs_touch.3x                    |    9 -
+# man/curs_util.3x                     |    9 -
+# man/define_key.3x                    |    6 
+# man/infotocap.1m                     |    6 
+# man/keyok.3x                         |    8 -
+# man/legacy_coding.3x                 |   29 ++-
+# man/manhtml.externs                  |    3 
+# man/ncurses.3x                       |   16 +-
+# man/wresize.3x                       |    8 -
+# menu/m_driver.c                      |    8 -
+# menu/m_item_vis.c                    |    6 
+# menu/m_post.c                        |   42 ++---
+# misc/terminfo.src                    |   45 +++++-
+# ncurses/base/lib_addch.c             |    6 
+# ncurses/base/lib_delch.c             |    4 
+# ncurses/base/lib_delwin.c            |    6 
+# ncurses/base/lib_freeall.c           |    6 
+# ncurses/base/lib_getstr.c            |    8 -
+# ncurses/base/lib_insch.c             |    6 
+# ncurses/base/lib_instr.c             |    6 
+# ncurses/base/lib_mvwin.c             |    6 
+# ncurses/base/lib_printw.c            |    8 -
+# ncurses/base/lib_screen.c            |   13 -
+# ncurses/base/lib_slkrefr.c           |    6 
+# ncurses/base/new_pair.c              |    8 -
+# ncurses/base/resizeterm.c            |    4 
+# ncurses/base/safe_sprintf.c          |    9 -
+# ncurses/tinfo/alloc_ttype.c          |   14 -
+# ncurses/tinfo/captoinfo.c            |    4 
+# ncurses/tinfo/comp_parse.c           |    6 
+# ncurses/tinfo/comp_scan.c            |    6 
+# ncurses/tinfo/db_iterator.c          |    6 
+# ncurses/tinfo/entries.c              |    4 
+# ncurses/tinfo/getenv_num.c           |    6 
+# ncurses/tinfo/home_terminfo.c        |    6 
+# ncurses/tinfo/init_keytry.c          |    6 
+# ncurses/tinfo/lib_print.c            |    7 
+# ncurses/tinfo/lib_setup.c            |    6 
+# ncurses/tinfo/lib_termcap.c          |    6 
+# ncurses/tinfo/lib_tparm.c            |   10 -
+# ncurses/tinfo/parse_entry.c          |    6 
+# ncurses/tinfo/read_entry.c           |   18 +-
+# ncurses/tinfo/trim_sgr0.c            |    8 -
+# ncurses/tinfo/write_entry.c          |   14 -
+# ncurses/trace/lib_traceatr.c         |    4 
+# ncurses/trace/varargs.c              |    6 
+# ncurses/tty/hashmap.c                |    9 -
+# ncurses/widechar/lib_add_wch.c       |    8 -
+# ncurses/widechar/lib_cchar.c         |    6 
+# ncurses/widechar/lib_get_wstr.c      |    8 -
+# ncurses/widechar/lib_in_wchnstr.c    |    6 
+# ncurses/widechar/lib_ins_wch.c       |    6 
+# ncurses/widechar/lib_inwstr.c        |    4 
+# ncurses/widechar/lib_key_name.c      |    6 
+# ncurses/widechar/lib_wunctrl.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 
+# 128 files changed, 1736 insertions(+), 1239 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4151 
+--- ncurses-6.5-20240720+/NEWS	2024-07-20 21:54:20.000000000 +0000
++++ ncurses-6.5-20240727/NEWS	2024-07-27 20:13:00.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4151 2024/07/20 21:54:20 tom Exp $
++-- $Id: NEWS,v 1.4155 2024/07/27 20:13:00 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.
+ 
++20240727
++	+ improve formatting/style of manpages (patches by Branden Robinson).
++	+ fixes for compiler warnings/cppcheck.
++	+ modify wattron/wattroff calls in form/m_post.c to call wattr_on and
++	  wattr_off to omit cast used in the former for X/Open compatibility
++	  (patch by Bill Gray).
++	+ modify wezterm, omitting its broken left/right margin feature (report
++	  by Thayne McCombs) -TD
++
+ 20240720
+ 	+ improve formatting/style of manpages (patches by Branden Robinson).
+ 	+ modify configure script and misc/Makefile to accept glob expressions
+@@ -401,7 +410,7 @@
+ 	+ minor grammatical fix for manpages (Branden Robinson).
+ 
+ 20230729
+-	+ improve manpages for wgetnstr() and wget_wnstr().
++	+ improve manpages for wgetnstr() and wget_nwstr().
+ 	+ modify MinGW configuration to provide for running in MSYS/MSYS2
+ 	  shells, assuming ConPTY support (patch by Pavel Fedin).
+ 	+ add assignment in CF_MAN_PAGES to fill in value for TERMINFO_DIRS in
+@@ -10712,7 +10721,7 @@
+ 	  wide-character structures (report by ).
+ 	+ ensure that _XOPEN_SOURCE_EXTENDED is defined in curses.priv.h if
+ 	  compiling for wide-character configuration.
+-	+ make addwnstr() handle non-spacing characters (patch by Sven
++	+ make addnwstr() handle non-spacing characters (patch by Sven
+ 	  Verdoolaege).
+ 
+ 20010630
+Index: VERSION
+--- ncurses-6.5-20240720+/VERSION	2024-07-20 10:19:56.000000000 +0000
++++ ncurses-6.5-20240727/VERSION	2024-07-27 13:25:06.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20240720
++5:0:10	6.5	20240727
+Index: dist.mk
+Prereq:  1.1623 
+--- ncurses-6.5-20240720+/dist.mk	2024-07-20 10:19:56.000000000 +0000
++++ ncurses-6.5-20240727/dist.mk	2024-07-27 13:25:06.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1623 2024/07/20 10:19:56 tom Exp $
++# $Id: dist.mk,v 1.1624 2024/07/27 13:25:06 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 = 5
+-NCURSES_PATCH = 20240720
++NCURSES_PATCH = 20240727
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/curs_add_wch.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/curs_add_wch.3x.html	2024-07-20 22:19:03.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/curs_add_wch.3x.html	2024-07-27 23:11:30.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_add_wch.3x,v 1.69 2024/07/20 21:42:38 tom Exp @
++  * @Id: curs_add_wch.3x,v 1.71 2024/07/27 20:05:18 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_add_wch 3x 2024-07-20 ncurses 6.5 Library calls
++curs_add_wch 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                  curs_add_wch 3x 2024-07-20 ncurses 6.5 Library calls
                                                                                                  
++
                                                                                                  curs_add_wch 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                  
+ 
                                                                                                  + curs_add_wch(3x)                 Library calls                curs_add_wch(3x)
+ 
+@@ -350,8 +350,8 @@
+        The   System V   Interface  Definition,  Version  4  (1995),  specified
+        functions named waddwch and wechowchar (and the usual variants).  These
+        were later additions to SVr4.x, not appearing in the first SVr4 (1989).
+-       They differed from X/Open's wadd_wch and wecho_wchar in that they  each
+-       took an argument of type wchar_t instead of cchar_t.
++       They differed from X/Open's later wadd_wch and wecho_wchar in that they
++       each took an argument of type wchar_t instead of cchar_t.
+ 
+ 
+ 
                                                                                                  SEE ALSO
                                                                                                  +@@ -364,7 +364,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-20                  curs_add_wch(3x)
++ncurses 6.5                       2024-07-27                  curs_add_wch(3x)
+ 
                                                                                                  
+ 
                                                                                                  
+ 
                                                                                                    
+Index: doc/html/man/curs_add_wchstr.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/curs_add_wchstr.3x.html	2024-06-22 22:55:07.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/curs_add_wchstr.3x.html	2024-07-27 23:11:31.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_add_wchstr.3x,v 1.42 2024/06/22 21:26:27 tom Exp @
++  * @Id: curs_add_wchstr.3x,v 1.44 2024/07/27 20:05:18 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_add_wchstr 3x 2024-06-22 ncurses 6.5 Library calls
++curs_add_wchstr 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                    curs_add_wchstr 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                    
++
                                                                                                    curs_add_wchstr 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                    
+ 
                                                                                                    + curs_add_wchstr(3x)              Library calls             curs_add_wchstr(3x)
+ 
+@@ -47,33 +47,33 @@
+ 
+ 
+ 
                                                                                                    NAME
                                                                                                    +-       add_wchstr,   add_wchnstr,   wadd_wchstr,  wadd_wchnstr,  mvadd_wchstr,
+-       mvadd_wchnstr, mvwadd_wchstr, mvwadd_wchnstr -  add  a  curses  complex
++       add_wchstr,   wadd_wchstr,  mvadd_wchstr,  mvwadd_wchstr,  add_wchnstr,
++       wadd_wchnstr, mvadd_wchnstr, mvwadd_wchnstr  -  add  a  curses  complex
+        character string to a window
+ 
+ 
+ 
                                                                                                    SYNOPSIS
                                                                                                    +        #include <curses.h>
+ 
+-       int add_wchstr(const cchar_t *wchstr);
+-       int wadd_wchstr(WINDOW * win, const cchar_t *wchstr);
+-       int mvadd_wchstr(int y, int x, const cchar_t *wchstr);
+-       int mvwadd_wchstr(WINDOW *win, int y, int x, const cchar_t *wchstr);
+-
+-       int add_wchnstr(const cchar_t *wchstr, int n);
+-       int wadd_wchnstr(WINDOW * win, const cchar_t *wchstr, int n);
+-       int mvadd_wchnstr(int y, int x, const cchar_t *wchstr, int n);
+-       int mvwadd_wchnstr(WINDOW *win, int y, int x, const cchar_t *wchstr, int n);
++       int add_wchstr(const cchar_t * wchstr);
++       int wadd_wchstr(WINDOW *  win, const cchar_t * wchstr);
++       int mvadd_wchstr(int y, int x, const cchar_t * wchstr);
++       int mvwadd_wchstr(WINDOW * win, int y, int x, const cchar_t * wchstr);
++
++       int add_wchnstr(const cchar_t * wchstr, int n);
++       int wadd_wchnstr(WINDOW *  win, const cchar_t * wchstr, int n);
++       int mvadd_wchnstr(int y, int x, const cchar_t * wchstr, int n);
++       int mvwadd_wchnstr(WINDOW * win, int y, int x, const cchar_t * wchstr, int n);
+ 
+ 
+ 
                                                                                                    DESCRIPTION
                                                                                                    +        wadd_wchstr  copies  the  string  of  complex  characters wchstr to the
+        window win.  A null complex character  terminates  the  string.   If  a
+-       complex  character  does  completely fit at the end of the line, curses
+-       fills the remaining columns with the window background; see bkgrnd(3x).
+-       wadd_wchnstr does the same, but copies at most n characters, or as many
+-       as possible if n is -1.  ncurses(3x) describes the  variants  of  these
+-       functions.
++       complex  character  does  not  completely  fit  at the end of the line,
++       curses fills the remaining columns  with  the  window  background;  see
++       bkgrnd(3x).    wadd_wchnstr  does  the  same,  but  copies  at  most  n
++       characters, or as many as possible if n is -1.   ncurses(3x)  describes
++       the variants of these functions.
+ 
+        Because  these  functions do not call wadd_wch(3x) internally, they are
+        faster than waddwstr(3x) and waddnwstr(3x).  On the other hand, they
+@@ -93,24 +93,24 @@
+ 
                                                                                                    RETURN VALUE
                                                                                                    +        These functions return OK on success and ERR on failure.
+ 
+-       X/Open  Curses  does not specify any error conditions.  ncurses returns
+-       ERR if
++       In ncurses, they return ERR if
+ 
+        o   win is NULL or
+ 
+        o   wchstr is NULL.
+ 
+-       Functions prefixed with "mv" first perform cursor movement and fail  if
++       Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                    NOTES
                                                                                                    +-       All  of  these  functions  except  wadd_wchnstr  may  be implemented as
++       All of these  functions  except  wadd_wchnstr  may  be  implemented  as
+        macros.
+ 
+ 
+ 
                                                                                                    PORTABILITY
                                                                                                    +-       X/Open Curses, Issue 4 describes these functions.
++       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
++       error conditions for them.
+ 
+ 
+ 
                                                                                                    HISTORY
                                                                                                    +@@ -118,8 +118,8 @@
+        The   System V   Interface  Definition,  Version  4  (1995),  specified
+        functions named waddwchstr and waddwchnstr (and  the  usual  variants).
+        These  were  later additions to SVr4.x, not appearing in the first SVr4
+-       (1989).  They differed from X/Open's wadd_wchstr  and  wadd_wchnstr  in
+-       that they each took an argument of type wchar_t instead of cchar_t.
++       (1989).  They differed from X/Open's later wadd_wchstr and wadd_wchnstr
++       in that they each took an argument of type wchar_t instead of cchar_t.
+ 
+ 
+ 
                                                                                                    SEE ALSO
                                                                                                    +@@ -130,7 +130,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-22               curs_add_wchstr(3x)
++ncurses 6.5                       2024-07-27               curs_add_wchstr(3x)
+ 
                                                                                                    
+ 
                                                                                                    
+ 
                                                                                                      
+Index: doc/html/man/curs_addch.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/curs_addch.3x.html	2024-07-20 22:19:03.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/curs_addch.3x.html	2024-07-27 23:11:31.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addch.3x,v 1.96 2024/07/20 21:42:38 tom Exp @
++  * @Id: curs_addch.3x,v 1.98 2024/07/27 20:08:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addch 3x 2024-07-20 ncurses 6.5 Library calls
++curs_addch 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                      curs_addch 3x 2024-07-20 ncurses 6.5 Library calls
                                                                                                      
++
                                                                                                      curs_addch 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                      
+ 
                                                                                                      + curs_addch(3x)                   Library calls                  curs_addch(3x)
+ 
+@@ -295,9 +295,9 @@
+        foregoing  behavior.  Check whether a character can be represented as a
+        single byte in the current locale.
+ 
+-       o   If it can, call either waddch or wadd_wch(3x).
++       o   If it can, call either waddch or wadd_wch.
+ 
+-       o   If it cannot, use only wadd_wch(3x).
++       o   If it cannot, use only wadd_wch.
+ 
+ 
+ 
                                                                                                      HISTORY
                                                                                                      +@@ -316,7 +316,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-20                    curs_addch(3x)
++ncurses 6.5                       2024-07-27                    curs_addch(3x)
+ 
                                                                                                      
+ 
                                                                                                      
+ 
                                                                                                        
+Index: doc/html/man/curs_addchstr.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/curs_addchstr.3x.html	2024-06-01 23:07:15.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/curs_addchstr.3x.html	2024-07-27 23:11:31.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addchstr.3x,v 1.48 2024/06/01 22:29:08 tom Exp @
++  * @Id: curs_addchstr.3x,v 1.50 2024/07/27 20:05:41 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addchstr 3x 2024-06-01 ncurses 6.5 Library calls
++curs_addchstr 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                        curs_addchstr 3x 2024-06-01 ncurses 6.5 Library calls
                                                                                                        
++
                                                                                                        curs_addchstr 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                        
+ 
                                                                                                        + curs_addchstr(3x)                Library calls               curs_addchstr(3x)
+ 
+@@ -47,22 +47,22 @@
+ 
+ 
+ 
                                                                                                        NAME
                                                                                                        +-       addchstr,  addchnstr,  waddchstr,  waddchnstr, mvaddchstr, mvaddchnstr,
+-       mvwaddchstr, mvwaddchnstr - add a curses character string to a window
++       addchstr,  waddchstr,  mvaddchstr,  mvwaddchstr, addchnstr, waddchnstr,
++       mvaddchnstr, mvwaddchnstr - add a curses character string to a window
+ 
+ 
+ 
                                                                                                        SYNOPSIS
                                                                                                        +        #include <curses.h>
+ 
+-       int addchstr(const chtype *chstr);
+-       int waddchstr(WINDOW *win, const chtype *chstr);
+-       int mvaddchstr(int y, int x, const chtype *chstr);
+-       int mvwaddchstr(WINDOW *win, int y, int x, const chtype *chstr);
+-
+-       int addchnstr(const chtype *chstr, int n);
+-       int waddchnstr(WINDOW *win, const chtype *chstr, int n);
+-       int mvaddchnstr(int y, int x, const chtype *chstr, int n);
+-       int mvwaddchnstr(WINDOW *win, int y, int x, const chtype *chstr, int n);
++       int addchstr(const chtype * chstr);
++       int waddchstr(WINDOW * win, const chtype * chstr);
++       int mvaddchstr(int y, int x, const chtype * chstr);
++       int mvwaddchstr(WINDOW * win, int y, int x, const chtype * chstr);
++
++       int addchnstr(const chtype * chstr, int n);
++       int waddchnstr(WINDOW * win, const chtype * chstr, int n);
++       int mvaddchnstr(int y, int x, const chtype * chstr, int n);
++       int mvwaddchnstr(WINDOW * win, int y, int x, const chtype * chstr, int n);
+ 
+ 
+ 
                                                                                                        DESCRIPTION
                                                                                                        +@@ -89,14 +89,13 @@
+ 
                                                                                                        RETURN VALUE
                                                                                                        +        These functions return OK on success and ERR on failure.
+ 
+-       X/Open  Curses  does not specify any error conditions.  ncurses returns
+-       ERR if
++       In ncurses, they return ERR if
+ 
+        o   win is NULL or
+ 
+        o   chstr is NULL.
+ 
+-       Functions prefixed with "mv" first perform cursor movement and fail  if
++       Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+@@ -105,7 +104,12 @@
+ 
+ 
+ 
                                                                                                        PORTABILITY
                                                                                                        +-       X/Open Curses, Issue 4 describes these functions.
++       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
++       error conditions for them.
++
++
++
                                                                                                        HISTORY
                                                                                                        ++       SVr3.1 (1987) introduced waddchstr and waddchnstr.
+ 
+ 
+ 
                                                                                                        SEE ALSO
                                                                                                        +@@ -116,7 +120,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-01                 curs_addchstr(3x)
++ncurses 6.5                       2024-07-27                 curs_addchstr(3x)
+ 
                                                                                                        
+ 
                                                                                                        
+ 
+ 
                                                                                                        
+Index: doc/html/man/curs_addstr.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/curs_addstr.3x.html	2024-07-20 22:19:03.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/curs_addstr.3x.html	2024-07-27 23:11:31.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addstr.3x,v 1.53 2024/07/20 20:49:44 tom Exp @
++  * @Id: curs_addstr.3x,v 1.55 2024/07/27 19:48:04 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addstr 3x 2024-07-20 ncurses 6.5 Library calls
++curs_addstr 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                        curs_addstr 3x 2024-07-20 ncurses 6.5 Library calls
                                                                                                        
++
                                                                                                        curs_addstr 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                        
+ 
                                                                                                        + curs_addstr(3x)                  Library calls                 curs_addstr(3x)
+ 
+@@ -47,7 +47,7 @@
+ 
+ 
+ 
                                                                                                        NAME
                                                                                                        +-       addstr,  addnstr,  waddstr,  waddnstr,  mvaddstr, mvaddnstr, mvwaddstr,
++       addstr,  waddstr,  mvaddstr,  mvwaddstr,  addnstr, waddnstr, mvaddnstr,
+        mvwaddnstr - add a string to a curses window and advance the cursor
+ 
+ 
+@@ -55,14 +55,14 @@
+        #include <curses.h>
+ 
+        int addstr(const char * str);
++       int waddstr(WINDOW * win, const char * str);
+        int mvaddstr(int y, int x, const char * str);
+        int mvwaddstr(WINDOW * win, int y, int x, const char * str);
+-       int waddstr(WINDOW * win, const char * str);
+ 
+        int addnstr(const char * str, int n);
++       int waddnstr(WINDOW * win, const char * str, int n);
+        int mvaddnstr(int y, int x, const char * str, int n);
+        int mvwaddnstr(WINDOW * win, int y, int x, const char * str, int n);
+-       int waddnstr(WINDOW * win, const char * str, int n);
+ 
+ 
+ 
                                                                                                        DESCRIPTION
                                                                                                        +@@ -115,7 +115,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-20                   curs_addstr(3x)
++ncurses 6.5                       2024-07-27                   curs_addstr(3x)
+ 
                                                                                                        
+ 
                                                                                                        
+ 
                                                                                                          
+Index: doc/html/man/curs_addwstr.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/curs_addwstr.3x.html	2024-07-20 22:19:03.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/curs_addwstr.3x.html	2024-07-27 23:11:31.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addwstr.3x,v 1.43 2024/07/20 20:53:20 tom Exp @
++  * @Id: curs_addwstr.3x,v 1.45 2024/07/27 20:05:18 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addwstr 3x 2024-07-20 ncurses 6.5 Library calls
++curs_addwstr 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                          curs_addwstr 3x 2024-07-20 ncurses 6.5 Library calls
                                                                                                          
++
                                                                                                          curs_addwstr 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                          
+ 
                                                                                                          + curs_addwstr(3x)                 Library calls                curs_addwstr(3x)
+ 
+@@ -47,8 +47,8 @@
+ 
+ 
+ 
                                                                                                          NAME
                                                                                                          +-       addwstr,   addnwstr,   waddwstr,   waddnwstr,   mvaddwstr,  mvaddnwstr,
+-       mvwaddwstr, mvwaddnwstr - add  a  wide-character  string  to  a  curses
++       addwstr,   waddwstr,   mvaddwstr,   mvwaddwstr,   addnwstr,  waddnwstr,
++       mvaddnwstr, mvwaddnwstr - add  a  wide-character  string  to  a  curses
+        window and advance the cursor
+ 
+ 
+@@ -56,14 +56,14 @@
+        #include <curses.h>
+ 
+        int addwstr(const wchar_t * wstr);
++       int waddwstr(WINDOW * win, const wchar_t * wstr);
+        int mvaddwstr(int y, int x, const wchar_t * wstr);
+        int mvwaddwstr(WINDOW * win, int y, int x, const wchar_t * wstr);
+-       int waddwstr(WINDOW * win, const wchar_t * wstr);
+ 
+        int addnwstr(const wchar_t * wstr, int n);
++       int waddnwstr(WINDOW * win, const wchar_t * wstr, int n);
+        int mvaddnwstr(int y, int x, const wchar_t * wstr, int n);
+        int mvwaddnwstr(WINDOW * win, int y, int x, const wchar_t * wstr, int n);
+-       int waddnwstr(WINDOW * win, const wchar_t * wstr, int n);
+ 
+ 
+ 
                                                                                                          DESCRIPTION
                                                                                                          +@@ -103,7 +103,9 @@
+ 
+ 
+ 
                                                                                                          HISTORY
                                                                                                          +-       waddstr and waddnstr appeared late in SVr4 development (1995).
++       The System V Interface Definition, Version 4 (1995), specified waddwstr
++       and waddnwstr (and the usual variants).  These were later additions  to
++       SVr4.x, not appearing in the first SVr4 (1989).
+ 
+ 
+ 
                                                                                                          SEE ALSO
                                                                                                          +@@ -114,7 +116,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-20                  curs_addwstr(3x)
++ncurses 6.5                       2024-07-27                  curs_addwstr(3x)
+ 
                                                                                                          
+ 
                                                                                                          
+ 
                                                                                                            
+Index: doc/html/man/curs_attr.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/curs_attr.3x.html	2024-05-25 22:33:41.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/curs_attr.3x.html	2024-07-27 23:11:31.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_attr.3x,v 1.108 2024/05/25 20:10:58 tom Exp @
++  * @Id: curs_attr.3x,v 1.110 2024/07/27 19:57:55 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_attr 3x 2024-05-25 ncurses 6.5 Library calls
++curs_attr 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                            curs_attr 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                            
++
                                                                                                            curs_attr 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                            
+ 
                                                                                                            + curs_attr(3x)                    Library calls                   curs_attr(3x)
+ 
+@@ -132,8 +132,8 @@
+        into  the attribute parameter.  These newer routines use similar names,
+        because X/Open simply added an underscore (_) for the newer names.
+ 
+-       The int datatype used in the legacy routines is treated as if it is the
+-       same  size  as  chtype  (used by addch(3x)).  It holds the common video
++       The int datatype used in the legacy routines is treated as if it is the
++       same  size  as  chtype  (used by addch(3x)).  It holds the common video
+        attributes (such as bold, reverse), as well as a few  bits  for  color.
+        Those  bits  correspond  to  the  A_COLOR symbol.  The COLOR_PAIR macro
+        provides a value which can be OR'd into the attribute  parameter.   For
+@@ -148,20 +148,20 @@
+        (8) bits, then COLOR_PAIR(259) is 4 (i.e., 259 is 4 more than the limit
+        255).
+ 
+-       The  PAIR_NUMBER  macro extracts a pair number from an int (or chtype).
++       The  PAIR_NUMBER  macro extracts a pair number from an int (or chtype).
+        For example, the input and output values in these statements  would  be
+        the same:
+ 
+            int value = A_BOLD | COLOR_PAIR(input);
+            int output = PAIR_NUMBER(value);
+ 
+-       The  attrset routine is a legacy feature predating SVr4 curses but kept
+-       in X/Open Curses  for  the  same  reason  that  SVr4  curses  kept  it:
++       The  attrset routine is a legacy feature predating SVr4 curses but kept
++       in X/Open Curses  for  the  same  reason  that  SVr4  curses  kept  it:
+        compatibility.
+ 
+        The  remaining  attr*  functions operate exactly like the corresponding
+-       attr_* functions, except that they take arguments of  type  int  rather
+-       than attr_t.
++       attr_* functions, except that they take arguments of  type  int  rather
++       than attr_t.
+ 
+        There  is  no  corresponding attrget function as such in X/Open Curses,
+        although ncurses provides getattrs (see curs_legacy(3x)).
+@@ -243,19 +243,13 @@
+ 
+ 
+ 
                                                                                                            RETURN VALUE
                                                                                                            +-       All routines return the integer OK on success, or ERR on failure.
++       These functions return OK on success and ERR on failure.
+ 
+-       X/Open Curses does not specify any error conditions.
++       In ncurses, they return ERR if win is NULL.
+ 
+-       This implementation
++       wcolor_set returns ERR if pair is outside the range 0..COLOR_PAIRS-1.
+ 
+-       o   returns ERR if the window pointer is null.
+-
+-       o   returns ERR if the color pair parameter for wcolor_set  is  outside
+-           the range 0..COLOR_PAIRS-1.
+-
+-       o   does  not  fail  if  either of the parameters of wattr_get used for
+-           retrieving attribute or color pair values is NULL.
++       wattr_get does not fail if its attrs or pair parameter is NULL.
+ 
+        Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+@@ -289,23 +283,25 @@
+        have a color pair parameter to support extended color pairs:
+ 
+        o   For functions which modify the color, e.g., wattr_set and wattr_on,
+-           if opts is set it is treated as a pointer to int, and used  to  set
+-           the color pair instead of the short pair parameter.
++           if opts is set it is treated as a pointer to int, and used  to  set
++           the color pair instead of the short pair parameter.
+ 
+        o   For functions which retrieve the color, e.g., wattr_get, if opts is
+-           set it is treated as a pointer to int, and  used  to  retrieve  the
+-           color  pair  as  an int value, in addition to retrieving it via the
+-           standard pointer to short parameter.
++           set it is treated as a pointer to int, and  used  to  retrieve  the
++           color  pair  as  an int value, in addition to retrieving it via the
++           standard pointer to short parameter.
+ 
+        o   For functions which turn attributes off, e.g., wattr_off, the  opts
+            parameter is ignored except except to check that it is NULL.
+ 
+ 
+ 
                                                                                                            PORTABILITY
                                                                                                            +-       These  functions are described in X/Open Curses, Issue 4.  The standard
+-       defined the dedicated  type  for  highlights,  attr_t,  which  was  not
+-       defined in SVr4 curses.  The functions taking attr_t arguments were not
+-       supported under SVr4.
++       These  functions are described in X/Open Curses, Issue 4.  It specifies
++       no error conditions for them.
++
++       The standard defined the dedicated type for highlights,  attr_t,  which
++       was  not defined in SVr4 curses.  The functions taking attr_t arguments
++       were not supported under SVr4.
+ 
+        Very old versions of this library did not force an update of the screen
+        when  changing  the  attributes.   Use  touchwin to force the screen to
+@@ -314,7 +310,7 @@
+        X/Open  Curses  states   that   whether   the   traditional   functions
+        attron/attroff/attrset  can  manipulate  attributes other than A_BLINK,
+        A_BOLD, A_DIM, A_REVERSE, A_STANDOUT, or A_UNDERLINE is  "unspecified".
+-       Under  this  implementation  as  well  as  SVr4 curses, these functions
++       Under  this  implementation  as  well  as  SVr4 curses, these functions
+        correctly manipulate all other highlights (specifically,  A_ALTCHARSET,
+        A_PROTECT, and A_INVIS).
+ 
+@@ -336,6 +332,7 @@
+               WA_BLINK        Blinking
+               WA_DIM          Half bright
+               WA_BOLD         Extra bright or bold
++
+               WA_ALTCHARSET   Alternate character set
+ 
+        X/Open Curses does not assign values to  these  symbols,  nor  does  it
+@@ -349,22 +346,22 @@
+        o   However, in some  implementations,  those  symbols  have  unrelated
+            values.
+ 
+-           For example, the Solaris xpg4 (X/Open) curses declares attr_t to be
+-           an unsigned short integer (16-bits), while  chtype  is  a  unsigned
++           For example, the Solaris xpg4 (X/Open) curses declares attr_t to be
++           an unsigned short integer (16-bits), while  chtype  is  a  unsigned
+            integer (32-bits).  The WA_ symbols in this case are different from
+            the A_ symbols because they are used for a smaller  datatype  which
+            does not represent A_CHARTEXT or A_COLOR.
+ 
+            In this implementation (as in many others), the values happen to be
+-           the same because it simplifies copying information  between  chtype
+-           and cchar_t variables.
++           the same because it simplifies copying information  between  chtype
++           and cchar_t variables.
+ 
+-       o   Because  ncurses's  attr_t  can  hold  a color pair (in the A_COLOR
++       o   Because  ncurses's  attr_t  can  hold  a color pair (in the A_COLOR
+            field), a call to wattr_on, wattr_off, or wattr_set may  alter  the
+            window's  color.   If  the  color pair information in the attribute
+            parameter is zero, no change is made to the window's color.
+ 
+-           This is consistent with SVr4 curses; X/Open Curses does not specify
++           This is consistent with SVr4 curses; X/Open Curses does not specify
+            this.
+ 
+        The  X/Open  Curses  extended  conformance  level  adds  new highlights
+@@ -374,23 +371,23 @@
+ 
+ 
+ 
                                                                                                            HISTORY
                                                                                                            +-       X/Open Curses is largely based  on  SVr4  curses,  adding  support  for
++       X/Open Curses is largely based  on  SVr4  curses,  adding  support  for
+        "wide-characters"  (not  specific  to  Unicode).   Some  of  the X/Open
+-       differences from SVr4 curses address the way video  attributes  can  be
++       differences from SVr4 curses address the way video  attributes  can  be
+        applied  to wide-characters.  But aside from that, attrset and attr_set
+-       are similar.  SVr4 curses provided the basic features for  manipulating
+-       video  attributes.  However, earlier versions of curses provided a part
++       are similar.  SVr4 curses provided the basic features for  manipulating
++       video  attributes.  However, earlier versions of curses provided a part
+        of these features.
+ 
+-       As seen in 2.8BSD, curses assumed 7-bit characters,  using  the  eighth
++       As seen in 2.8BSD, curses assumed 7-bit characters,  using  the  eighth
+        bit  of  a byte to represent the standout feature (often implemented as
+-       bold and/or reverse video).  The BSD curses library provided  functions
++       bold and/or reverse video).  The BSD curses library provided  functions
+        standout  and  standend which were carried along into X/Open Curses due
+        to their pervasive use in legacy applications.
+ 
+        Some  terminals  in  the  1980s  could  support  a  variety  of   video
+-       attributes,  although  the  BSD  curses  library  could do nothing with
+-       those.  System V  (1983)  provided  an  improved  curses  library.   It
++       attributes,  although  the  BSD  curses  library  could do nothing with
++       those.  System V  (1983)  provided  an  improved  curses  library.   It
+        defined  the A_ symbols for use by applications to manipulate the other
+        attributes.  There are few useful references for the chronology.
+ 
+@@ -398,7 +395,7 @@
+        commenting on several functions:
+ 
+        o   the  attron,  attroff, attrset functions (and most of the functions
+-           found in SVr4 but not in BSD curses) were introduced by System V,
++           found in SVr4 but not in BSD curses) were introduced by System V,
+ 
+        o   the alternate character set feature with A_ALTCHARSET was added  in
+            SVr2 and improved in SVr3 (by adding acs_map[]),
+@@ -408,17 +405,17 @@
+ 
+        o   pads, soft-keys were added in SVr3, and
+ 
+-       Goodheart did not mention the background character or the cchar_t type.
++       Goodheart did not mention the background character or the cchar_t type.
+        Those are respectively SVr4 and X/Open features.  He did mention the A_
+        constants, but did not indicate their values.  Those were not the  same
+        in different systems, even for those marked as System V.
+ 
+        Different  Unix  systems  used  different  sizes  for the bit-fields in
+-       chtype for characters and colors, and took into account  the  different
++       chtype for characters and colors, and took into account  the  different
+        integer sizes (32-bit versus 64-bit).
+ 
+        This  table  showing  the number of bits for A_COLOR and A_CHARTEXT was
+-       gleaned from the curses header files for various operating systems  and
++       gleaned from the curses header files for various operating systems  and
+        architectures.   The inferred architecture and notes reflect the format
+        and size of the  defined  constants  as  well  as  clues  such  as  the
+        alternate  character  set implementation.  A 32-bit library can be used
+@@ -447,48 +444,48 @@
+               in 1996.
+ 
+           o   HP-UX  10.30 (1997) marked "curses_colr" obsolete.  That version
+-              of curses was dropped with HP-UX 11.30 in 2006.
++              of curses was dropped with HP-UX 11.30 in 2006.
+ 
+           Regarding OSF/1 (and Tru64),
+ 
+-          o   These used 64-bit hardware.   Like  ncurses,  the  OSF/1  curses
++          o   These used 64-bit hardware.   Like  ncurses,  the  OSF/1  curses
+               interface is not customized for 32-bit and 64-bit versions.
+ 
+           o   Unlike  other  systems  which  evolved  from  AT&T  code,  OSF/1
+-              provided a new implementation for X/Open curses.
++              provided a new implementation for X/Open Curses.
+ 
+           Regarding Solaris,
+ 
+           o   The initial release of Solaris was in 1992.
+ 
+-          o   The xpg4 (X/Open) curses was developed by MKS from 1990 to 1995.
++          o   The xpg4 (X/Open) Curses was developed by MKS from 1990 to 1995.
+               Sun's copyright began in 1996.
+ 
+-          o   Sun updated the X/Open curses interface after 64-bit support was
+-              introduced  in  1997,  but  did  not  modify  the  SVr4   curses
++          o   Sun updated the X/Open Curses interface after 64-bit support was
++              introduced  in  1997,  but  did  not  modify  the  SVr4   curses
+               interface.
+ 
+           Regarding U/Win,
+ 
+-          o   Development  of  the  curses  library  began in 1991, stopped in
++          o   Development  of  the  curses  library  began in 1991, stopped in
+               2000.
+ 
+           o   Color support was added in 1998.
+ 
+-          o   The library uses only chtype (no cchar_t).
++          o   The library uses only chtype (no cchar_t).
+ 
+-       Once X/Open curses was adopted in the mid-1990s, the  constraint  of  a
+-       32-bit interface with many colors and wide-characters for chtype became
+-       a moot point.  The cchar_t structure (whose size and  members  are  not
++       Once X/Open Curses was adopted in the mid-1990s, the  constraint  of  a
++       32-bit interface with many colors and wide-characters for chtype became
++       a moot point.  The cchar_t structure (whose size and  members  are  not
+        specified in X/Open Curses) could be extended as needed.
+ 
+        Other interfaces are rarely used now:
+ 
+-       o   BSD  curses was improved slightly in 1993/1994 using Keith Bostic's
++       o   BSD  curses was improved slightly in 1993/1994 using Keith Bostic's
+            modification to make the library 8-bit clean for nvi(1).  He  moved
+            standout attribute to a structure member.
+ 
+-           The  resulting  4.4BSD curses was replaced by ncurses over the next
++           The  resulting  4.4BSD curses was replaced by ncurses over the next
+            ten years.
+ 
+        o   U/Win is rarely used now.
+@@ -500,7 +497,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                     curs_attr(3x)
++ncurses 6.5                       2024-07-27                     curs_attr(3x)
+ 
                                                                                                            
+ 
                                                                                                            
+ 
                                                                                                              
+Index: doc/html/man/curs_border.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/curs_border.3x.html	2024-05-25 22:33:41.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/curs_border.3x.html	2024-07-27 23:11:31.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_border.3x,v 1.51 2024/05/25 20:10:58 tom Exp @
++  * @Id: curs_border.3x,v 1.53 2024/07/27 19:55:45 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_border 3x 2024-05-25 ncurses 6.5 Library calls
++curs_border 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                              curs_border 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                              
++
                                                                                                              curs_border 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                              
+ 
                                                                                                              + curs_border(3x)                  Library calls                 curs_border(3x)
+ 
+@@ -118,22 +118,22 @@
+        All  routines return the integer OK.  The SVr4.0 manual says "or a non-
+        negative integer if immedok is set", but this appears to be an error.
+ 
+-       X/Open  Curses  does  not   specify   any   error   conditions.    This
+-       implementation returns ERR if the window pointer is null.
++       This implementation returns ERR if the window pointer is null.
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
++       Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                              NOTES
                                                                                                              +-       The borders generated by these functions are inside  borders  (this  is
++       The  borders  generated  by these functions are inside borders (this is
+        also true of SVr4 curses, though the fact is not documented).
+ 
+        Note that border and box may be macros.
+ 
+ 
+ 
                                                                                                              PORTABILITY
                                                                                                              +-       These functions are described in X/Open Curses, Issue 4.
++       These functions are described in X/Open Curses, Issue 4.  It  specifies
++       no error conditions for them.
+ 
+ 
+ 
                                                                                                              SEE ALSO
                                                                                                              +@@ -141,7 +141,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                   curs_border(3x)
++ncurses 6.5                       2024-07-27                   curs_border(3x)
+ 
                                                                                                              
+ 
                                                                                                              
+ 
                                                                                                                
+Index: doc/html/man/curs_delch.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/curs_delch.3x.html	2024-05-11 21:39:56.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/curs_delch.3x.html	2024-07-27 23:11:31.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_delch.3x,v 1.35 2024/05/11 20:39:53 tom Exp @
++  * @Id: curs_delch.3x,v 1.37 2024/07/27 20:14:16 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_delch 3x 2024-05-11 ncurses 6.5 Library calls
++curs_delch 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                curs_delch 3x 2024-05-11 ncurses 6.5 Library calls
                                                                                                                
++
                                                                                                                curs_delch 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                
+ 
                                                                                                                + curs_delch(3x)                   Library calls                  curs_delch(3x)
+ 
+@@ -55,9 +55,9 @@
+        #include <curses.h>
+ 
+        int delch(void);
+-       int wdelch(WINDOW *win);
++       int wdelch(WINDOW * win);
+        int mvdelch(int y, int x);
+-       int mvwdelch(WINDOW *win, int y, int x);
++       int mvwdelch(WINDOW * win, int y, int x);
+ 
+ 
+ 
                                                                                                                DESCRIPTION
                                                                                                                +@@ -73,7 +73,7 @@
+ 
                                                                                                                RETURN VALUE
                                                                                                                +        These functions return OK on success and ERR on failure.
+ 
+-       Functions taking a WINDOW pointer argument fail if the pointer is NULL.
++       In ncurses, they return ERR if win is NULL.
+ 
+        Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+@@ -94,12 +94,16 @@
+        value other than ERR".
+ 
+ 
++
                                                                                                                HISTORY
                                                                                                                ++       SVr2 (1984) introduced delch.
++
++
+ 
                                                                                                                SEE ALSO
                                                                                                                +        curses(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-11                    curs_delch(3x)
++ncurses 6.5                       2024-07-27                    curs_delch(3x)
+ 
                                                                                                                
+ 
                                                                                                                
+ 
+ 
                                                                                                                
+Index: doc/html/man/curs_deleteln.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/curs_deleteln.3x.html	2024-04-27 18:38:46.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/curs_deleteln.3x.html	2024-07-27 23:11:31.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_deleteln.3x,v 1.38 2024/04/20 21:20:07 tom Exp @
++  * @Id: curs_deleteln.3x,v 1.40 2024/07/27 20:12:02 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_deleteln 3x 2024-04-20 ncurses 6.5 Library calls
++curs_deleteln 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                curs_deleteln 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                                
++
                                                                                                                curs_deleteln 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                
+ 
                                                                                                                + curs_deleteln(3x)                Library calls               curs_deleteln(3x)
+ 
+@@ -47,7 +47,7 @@
+ 
+ 
+ 
                                                                                                                NAME
                                                                                                                +-       deleteln,  wdeleteln, insdelln, winsdelln, insertln, winsertln - delete
++       deleteln,  wdeleteln, insertln, winsertln, insdelln, winsdelln - delete
+        or insert lines in a curses window
+ 
+ 
+@@ -55,53 +55,58 @@
+        #include <curses.h>
+ 
+        int deleteln(void);
+-       int wdeleteln(WINDOW *win);
+-
+-       int insdelln(int n);
+-       int winsdelln(WINDOW *win, int n);
++       int wdeleteln(WINDOW * win);
+ 
+        int insertln(void);
+-       int winsertln(WINDOW *win);
++       int winsertln(WINDOW * win);
++
++       int insdelln(int n);
++       int winsdelln(WINDOW * win, int n);
+ 
+ 
+ 
                                                                                                                DESCRIPTION
                                                                                                                +-       The deleteln and wdeleteln 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.
+-
+-       The  insdelln  and  winsdelln  routines, for positive n, insert n lines
+-       into the specified window above the current line.  The n  bottom  lines
+-       are  lost.  For negative n, delete n lines (starting with the one under
+-       the cursor), and move the remaining lines up.  The bottom n  lines  are
+-       cleared.  The current cursor position remains the same.
++       wdeleteln deletes the line at the cursor in win;  all  lines  below  it
++       move  up  one  line.  curses then fills the bottom line of win with the
++       blank character configured by wbkgdset(3x) (wide-character  API  users:
++       wbkgrndset(3x)).  The cursor position does not change.
++
++       winsertln  inserts  a  line  of  blank characters above the line at the
++       cursor in win; the content of the window's bottom line  is  lost.   The
++       cursor position does not change.
++
++       winsdelln  inserts  or  deletes  n lines  in  win  as  n is positive or
++       negative, respectively,  as  if  by  repeatedly  calling  winsertln  or
++       wdeleteln.
+ 
+-       The  insertln  and  winsertln  routines  insert  a blank line above the
+-       current line and the bottom line is lost.
++       ncurses(3x) describes the variants of these functions.
+ 
+ 
+ 
                                                                                                                RETURN VALUE
                                                                                                                +-       These routines return the integer ERR upon  failure  and  an  OK  (SVr4
+-       specifies  only  "an  integer  value  other  than ERR") upon successful
+-       completion.
++       These functions return OK on success and ERR on failure.
+ 
+-       X/Open defines no error conditions.  In  this  implementation,  if  the
+-       window parameter is null, an error is returned.
++       In ncurses, they fail if win is NULL.
+ 
+ 
+ 
                                                                                                                NOTES
                                                                                                                +-       Note that all but winsdelln may be macros.
++       All of these functions except winsdelln may be implemented as macros.
+ 
+-       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  idlok(...,  TRUE)  has  been  set on the current
+-       window.
++       These  functions  do  not require the terminal to possess hardware line
++       deletion or insertion capabilities.   Even  if  available,  by  default
++       curses does not use them; see idlok(3x).
+ 
+ 
+ 
                                                                                                                PORTABILITY
                                                                                                                +-       These functions are described in X/Open Curses, Issue 4.  The  standard
+-       specifies  that  they  return  ERR  on  failure, but specifies no error
+-       conditions.
++       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
++       error conditions for them.
++
++       SVr4 curses describes a successful return value  only  as  "an  integer
++       value other than ERR".
++
++
++
                                                                                                                HISTORY
                                                                                                                ++       4BSD (1980) curses introduced wdeleteln and winsertln.
++
++       SVr3.1 (1987) added winsdelln.
+ 
+ 
+ 
                                                                                                                SEE ALSO
                                                                                                                +@@ -109,7 +114,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                 curs_deleteln(3x)
++ncurses 6.5                       2024-07-27                 curs_deleteln(3x)
+ 
                                                                                                                
+ 
                                                                                                                
+ 
+ 
                                                                                                                
+Index: doc/html/man/curs_extend.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/curs_extend.3x.html	2024-04-27 18:38:46.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/curs_extend.3x.html	2024-07-27 23:23:56.000000000 +0000
+@@ -28,19 +28,19 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey 1999-on
+-  * @Id: curs_extend.3x,v 1.46 2024/03/16 15:35:01 tom Exp @
++  * @Id: curs_extend.3x,v 1.49 2024/07/27 23:21:36 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_extend 3x 2024-03-16 ncurses 6.5 Library calls
++curs_extend 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                curs_extend 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                
++
                                                                                                                curs_extend 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                
+ 
                                                                                                                + curs_extend(3x)                  Library calls                 curs_extend(3x)
+ 
+@@ -55,41 +55,46 @@
+        #include <curses.h>
+ 
+        const char * curses_version(void);
+-       int use_extended_names(bool enable);
++       int use_extended_names(bool bf);
+ 
+ 
+ 
                                                                                                                DESCRIPTION
                                                                                                                +-       These  functions  are extensions to the curses library which do not fit
+-       easily into other categories.
++       These  ncurses  extensions to the curses library do not fit easily into
++       other functional categories.
+ 
+ 
+ 
                                                                                                                curses_version
                                                                                                                +-       Use curses_version to get the version number, including patch level  of
+-       the library, prefixed by "ncurses", e.g.,
+-
+-              ncurses 5.0.19991023
++       curses_version returns a pointer to a string containing  the  library's
++       name  and  version  number,  including  its  patch  level,  for example
++       "ncurses 6.5.20240720".
+ 
+ 
+ 
                                                                                                                use_extended_names
                                                                                                                +-       The   use_extended_names   function   controls   whether   the  calling
+-       application is able to use user-defined or nonstandard names which  may
+-       be  compiled  into  the terminfo description, i.e., via the terminfo or
+-       termcap interfaces.  Normally these names are available for use,  since
+-       the essential decision is made by using the -x option of tic to compile
+-       extended terminal definitions.  However you can disable this feature to
+-       ensure compatibility with other implementations of curses.
++       use_extended_names configures  whether  the  library  recognizes  user-
++       defined  or  nonstandard terminfo capability names that may be compiled
++       into  terminal  type  descriptions   via   the   curs_terminfo(3x)   or
++       curs_termcap(3x)  interfaces.   Normally  these names are available for
++       use, since the essential decision is made through use  of  tic(1)'s  -x
++       option  to  include  such  extensions  in  terminal  type descriptions.
++       use_extended_names  can  prevent   ncurses   from   recognizing   these
++       capabilities  to  ensure  compatibility  with  other implementations of
++       curses.
+ 
+ 
+ 
                                                                                                                RETURN VALUE
                                                                                                                +-       curses_version  returns a pointer to static memory; you should not free
+-       this in your application.
++       curses_version returns a constant string.
++
++       use_extended_names returns the previous state  of  extended  capability
++       name recognition, allowing you to save this property and restore it.
+ 
+-       use_extended_names returns the previous state,  allowing  you  to  save
+-       this and restore it.
++
++
                                                                                                                NOTES
                                                                                                                ++       The  pointer  returned  by  curses_version  corresponds  to  statically
++       allocated memory; do not attempt to free(3) it.
+ 
+ 
+ 
                                                                                                                EXTENSIONS
                                                                                                                +-       These  functions  are ncurses(3x) extensions, and are not found in SVr4
++       These functions are ncurses(3x) extensions, and are not found  in  SVr4
+        curses, 4.4BSD curses, or any other previous curses implementation.
+ 
+ 
+@@ -99,17 +104,19 @@
+ 
+ 
+ 
                                                                                                                AUTHORS
                                                                                                                +-       Thomas Dickey.
++       Thomas Dickey
+ 
+ 
+ 
                                                                                                                SEE ALSO
                                                                                                                ++       ncurses offers several other extensions to the X/Open Curses API.
++
+        curs_getch(3x),    curs_mouse(3x),    curs_print(3x),    curs_util(3x),
+-       default_colors(3x),    define_key(3x),     keybound(3x),     keyok(3x),
++       default_colors(3x),     define_key(3x),     keybound(3x),    keyok(3x),
+        resizeterm(3x), wresize(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                   curs_extend(3x)
++ncurses 6.5                       2024-07-27                   curs_extend(3x)
+ 
                                                                                                                
+ 
                                                                                                                
+ 
                                                                                                                  
+@@ -122,6 +129,7 @@
+ 
                                                                                                                
+ 
+ 
                                                                                                              • RETURN VALUE
                                                                                                                • 
++
                                                                                                              • NOTES
                                                                                                                • 
+ 
                                                                                                              • EXTENSIONS
                                                                                                                • 
+ 
                                                                                                              • PORTABILITY
                                                                                                                • 
+ 
                                                                                                              • AUTHORS
                                                                                                                • 
+Index: doc/html/man/curs_in_wch.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/curs_in_wch.3x.html	2024-05-18 20:27:54.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/curs_in_wch.3x.html	2024-07-27 23:11:31.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_in_wch.3x,v 1.33 2024/05/18 20:19:38 tom Exp @
++  * @Id: curs_in_wch.3x,v 1.35 2024/07/27 20:06:49 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_in_wch 3x 2024-05-18 ncurses 6.5 Library calls
++curs_in_wch 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                curs_in_wch 3x 2024-05-18 ncurses 6.5 Library calls
                                                                                                                
++
                                                                                                                curs_in_wch 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                
+ 
                                                                                                                + curs_in_wch(3x)                  Library calls                 curs_in_wch(3x)
+ 
+@@ -47,7 +47,7 @@
+ 
+ 
+ 
                                                                                                                NAME
                                                                                                                +-       in_wch,  mvin_wch,  mvwin_wch, win_wch - get a curses complex character
++       in_wch,  win_wch,  mvin_wch, mvwin_wch - get a curses complex character
+        from a window
+ 
+ 
+@@ -70,7 +70,7 @@
+ 
                                                                                                                RETURN VALUE
                                                                                                                +        These functions return OK on success and ERR on failure.
+ 
+-       In ncurses, win_wch returns ERR if win is NULL.
++       In ncurses, they return ERR if win is NULL.
+ 
+        Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+@@ -89,15 +89,24 @@
+        error conditions for them.
+ 
+ 
++
                                                                                                                HISTORY
                                                                                                                ++       These  functions  were  initially  specified by X/Open Curses, Issue 4.
++       The System V  Interface  Definition,  Version  4  (1995),  specified  a
++       function  named  winwch  (and  the  usual  variants).  This was a later
++       addition to SVr4.x,  not  appearing  in  the  first  SVr4  (1989).   It
++       differed  from  X/Open's  later  win_wch in that it returned a value of
++       type chtype instead of cchar_t.
++
++
+ 
                                                                                                                SEE ALSO
                                                                                                                +-       curs_inch(3x)  describes comparable functions of the ncurses library in
++       curs_inch(3x) describes comparable functions of the ncurses library  in
+        its non-wide-character configuration.
+ 
+        curses(3x), curs_inwstr(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-18                   curs_in_wch(3x)
++ncurses 6.5                       2024-07-27                   curs_in_wch(3x)
+ 
                                                                                                                
+ 
                                                                                                                
+ 
+ 
                                                                                                                
+Index: doc/html/man/curs_inch.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/curs_inch.3x.html	2024-06-08 23:12:49.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/curs_inch.3x.html	2024-07-27 23:11:31.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inch.3x,v 1.60 2024/06/08 20:45:43 tom Exp @
++  * @Id: curs_inch.3x,v 1.62 2024/07/27 19:58:17 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inch 3x 2024-06-08 ncurses 6.5 Library calls
++curs_inch 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                curs_inch 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                
++
                                                                                                                curs_inch 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                
+ 
                                                                                                                + curs_inch(3x)                    Library calls                   curs_inch(3x)
+ 
+@@ -70,7 +70,7 @@
+ 
                                                                                                                RETURN VALUE
                                                                                                                +        These functions return OK on success and ERR on failure.
+ 
+-       In ncurses, winch returns ERR if win is NULL.
++       In ncurses, they return return ERR if win is NULL.
+ 
+        Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+@@ -118,7 +118,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                     curs_inch(3x)
++ncurses 6.5                       2024-07-27                     curs_inch(3x)
+ 
                                                                                                                
+ 
                                                                                                                
+ 
                                                                                                                  
+Index: doc/html/man/curs_ins_wch.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/curs_ins_wch.3x.html	2024-05-25 22:33:42.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/curs_ins_wch.3x.html	2024-07-27 23:11:31.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_ins_wch.3x,v 1.32 2024/05/25 20:16:27 tom Exp @
++  * @Id: curs_ins_wch.3x,v 1.34 2024/07/27 20:05:18 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_ins_wch 3x 2024-05-25 ncurses 6.5 Library calls
++curs_ins_wch 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                  curs_ins_wch 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                  
++
                                                                                                                  curs_ins_wch 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                  
+ 
                                                                                                                  + curs_ins_wch(3x)                 Library calls                curs_ins_wch(3x)
+ 
+@@ -47,17 +47,17 @@
+ 
+ 
+ 
                                                                                                                  NAME
                                                                                                                  +-       ins_wch,  mvins_wch,  mvwins_wch,  wins_wch  -  insert a curses complex
++       ins_wch,  wins_wch,  mvins_wch,  mvwins_wch  -  insert a curses complex
+        character in a window
+ 
+ 
+ 
                                                                                                                  SYNOPSIS
                                                                                                                  +        #include <curses.h>
+ 
+-       int ins_wch(const cchar_t *wch);
+-       int wins_wch(WINDOW *win, const cchar_t *wch);
+-       int mvins_wch(int y, int x, const cchar_t *wch);
+-       int mvwins_wch(WINDOW *win, int y, int x, const cchar_t *wch);
++       int ins_wch(const cchar_t * wch);
++       int wins_wch(WINDOW * win, const cchar_t * wch);
++       int mvins_wch(int y, int x, const cchar_t * wch);
++       int mvwins_wch(WINDOW * win, int y, int x, const cchar_t * wch);
+ 
+ 
+ 
                                                                                                                  DESCRIPTION
                                                                                                                  +@@ -92,8 +92,12 @@
+ 
+ 
+ 
                                                                                                                  HISTORY
                                                                                                                  +-       SVr4  (1989)  implemented  these  functions  under  the  names  inswch,
+-       winswch, mvinswch, and mvwinswch.
++       These  functions  were  initially  specified by X/Open Curses, Issue 4.
++       The System V  Interface  Definition,  Version  4  (1995),  specified  a
++       function  named  winswch  (and  the  usual variants).  This was a later
++       addition to SVr4.x,  not  appearing  in  the  first  SVr4  (1989).   It
++       differed  from  X/Open's  later wins_wch in that it took an argument of
++       type chtype instead of cchar_t.
+ 
+ 
+ 
                                                                                                                  SEE ALSO
                                                                                                                  +@@ -104,7 +108,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                  curs_ins_wch(3x)
++ncurses 6.5                       2024-07-27                  curs_ins_wch(3x)
+ 
                                                                                                                  
+ 
                                                                                                                  
+ 
                                                                                                                    
+Index: doc/html/man/curs_ins_wstr.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/curs_ins_wstr.3x.html	2024-06-08 23:12:49.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/curs_ins_wstr.3x.html	2024-07-27 23:11:31.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_ins_wstr.3x,v 1.42 2024/06/08 21:04:04 tom Exp @
++  * @Id: curs_ins_wstr.3x,v 1.44 2024/07/27 20:15:31 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_ins_wstr 3x 2024-06-08 ncurses 6.5 Library calls
++curs_ins_wstr 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                    curs_ins_wstr 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                    
++
                                                                                                                    curs_ins_wstr 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                    
+ 
                                                                                                                    + curs_ins_wstr(3x)                Library calls               curs_ins_wstr(3x)
+ 
+@@ -47,74 +47,80 @@
+ 
+ 
+ 
                                                                                                                    NAME
                                                                                                                    +-       ins_wstr,  ins_nwstr,  wins_wstr,  wins_nwstr, mvins_wstr, mvins_nwstr,
+-       mvwins_wstr, mvwins_nwstr - insert a wide-character string in a  curses
++       ins_wstr,  wins_wstr,  mvins_wstr,  mvwins_wstr, ins_nwstr, wins_nwstr,
++       mvins_nwstr, mvwins_nwstr - insert a wide-character string in a  curses
+        window
+ 
+ 
+ 
                                                                                                                    SYNOPSIS
                                                                                                                    +        #include <curses.h>
+ 
+-       int ins_wstr(const wchar_t *wstr);
+-       int ins_nwstr(const wchar_t *wstr, int n);
+-       int wins_wstr(WINDOW *win, const wchar_t *wstr);
+-       int wins_nwstr(WINDOW *win, const wchar_t *wstr, int n);
+-
+-       int mvins_wstr(int y, int x, const wchar_t *wstr);
+-       int mvins_nwstr(int y, int x, const wchar_t *wstr, int n);
+-       int mvwins_wstr(WINDOW *win, int y, int x, const wchar_t *wstr);
+-       int mvwins_nwstr(WINDOW *win, int y, int x, const wchar_t *wstr, int n);
++       int ins_wstr(const wchar_t * wstr);
++       int wins_wstr(WINDOW * win, const wchar_t * wstr);
++       int mvins_wstr(int y, int x, const wchar_t * wstr);
++       int mvwins_wstr(WINDOW * win, int y, int x, const wchar_t * wstr);
++
++       int ins_nwstr(const wchar_t * wstr, int n);
++       int wins_nwstr(WINDOW * win, const wchar_t * wstr, int n);
++       int mvins_nwstr(int y, int x, const wchar_t * wstr, int n);
++       int mvwins_nwstr(WINDOW * win, int y, int x, const wchar_t * wstr, int n);
+ 
+ 
+ 
                                                                                                                    DESCRIPTION
                                                                                                                    +-       These routines insert a wchar_t character string (as many characters as
+-       will fit on the line) before the character  under  the  cursor,  as  if
+-       calling  wins_wch(3x).   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  y,  x, if
+-       specified).
+-
+-       The functions with n as the last argument insert a leading substring of
+-       at  most  n  wchar_t  characters.   If  n is less than zero, the entire
+-       string is inserted (stopping on a L'\0' character).
+-
+-       Special characters are handled as in wadd_wch(3x).
++       wins_wstr  inserts a wide-character string wstr before the character at
++       the cursor in window win as if by calling wins_wch(3x) for each wchar_t
++       in  wstr.   No  line wrapping is performed.  Characters to the right of
++       the cursor are shifted right; those at the right edge of the window may
++       be  lost.   wins_wstr  stops  inserting if it would have to wrap to the
++       next line to write the next wchar_t in wstr.  The cursor position  does
++       not change (after moving to (y, x), if specified).  wins_nwstr does the
++       same, but inserts at most n characters, or as many as possible  (up  to
++       the end of the line) if n is -1.  ncurses(3x) describes the variants of
++       these functions.
+ 
+ 
+ 
                                                                                                                    RETURN VALUE
                                                                                                                    +        These functions return OK on success and ERR on failure.
+ 
+-       X/Open Curses does not specify any error conditions.  In ncurses,  they
+-       return ERR if
++       In ncurses, they return ERR if
+ 
+        o   win is NULL,
+ 
+-       o   wstr is NULL, or
++       o   wstr is NULL,
++
++       o   the first wide character in wstr is a non-spacing character, or
+ 
+        o   an internal wins_wch(3x) call returns ERR.
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
++       Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                    NOTES
                                                                                                                    +        All of these functions except wins_nwstr may be implemented as macros.
+ 
+-       If the first character in the string is a non-spacing character,  these
+-       functions return ERR.  X/Open Curses does not specify what happens if a
+-       non-spacing character follows a control character.
+-
+ 
+ 
                                                                                                                    PORTABILITY
                                                                                                                    +-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
++       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+        error conditions for them.
+ 
++       X/Open Curses does not specify what happens if a non-spacing  character
++       follows a control character.
++
+        Issue  4 states that the entire string is inserted if n is less than 1.
+        This is probably an  error,  because  it  is  inconsistent  with  other
+-       functions,  and  differs  from  the  SVr4  curses  and  Solaris xcurses
+-       implementations.  Nevertheless, Issue 7 retains it.
++       functions  such  as  waddwstr(3x), and differs from the SVr4 curses and
++       Solaris xcurses implementations.  Nevertheless,  Issue  7  retains  the
++       language.
++
++
++
                                                                                                                    HISTORY
                                                                                                                    ++       These  functions  were  initially  specified by X/Open Curses, Issue 4.
++       The  System V  Interface  Definition,  Version  4   (1995),   specified
++       functions named winswstr and winsnwstr (and the usual variants).  These
++       were later additions to SVr4.x, not appearing in the first SVr4 (1989).
++       They  differ from X/Open's later wins_wstr and wins_nwstr in that their
++       wstr parameters are not const-qualified.
+ 
+ 
+ 
                                                                                                                    SEE ALSO
                                                                                                                    +@@ -125,7 +131,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                 curs_ins_wstr(3x)
++ncurses 6.5                       2024-07-27                 curs_ins_wstr(3x)
+ 
                                                                                                                    
+ 
                                                                                                                    
+ 
+ 
                                                                                                                    
+Index: doc/html/man/curs_insch.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/curs_insch.3x.html	2024-04-27 18:38:46.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/curs_insch.3x.html	2024-07-27 23:11:31.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_insch.3x,v 1.40 2024/04/20 19:03:47 tom Exp @
++  * @Id: curs_insch.3x,v 1.42 2024/07/27 20:08:25 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_insch 3x 2024-04-20 ncurses 6.5 Library calls
++curs_insch 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                    curs_insch 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                                    
++
                                                                                                                    curs_insch 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                    
+ 
                                                                                                                    + curs_insch(3x)                   Library calls                  curs_insch(3x)
+ 
+@@ -55,9 +55,9 @@
+        #include <curses.h>
+ 
+        int insch(chtype ch);
+-       int winsch(WINDOW *win, chtype ch);
++       int winsch(WINDOW * win, chtype ch);
+        int mvinsch(int y, int x, chtype ch);
+-       int mvwinsch(WINDOW *win, int y, int x, chtype ch);
++       int mvwinsch(WINDOW * win, int y, int x, chtype ch);
+ 
+ 
+ 
                                                                                                                    DESCRIPTION
                                                                                                                    +@@ -90,6 +90,10 @@
+        value other than ERR".
+ 
+ 
++
                                                                                                                    HISTORY
                                                                                                                    ++       SVr2 (1984) introduced winsch.
++
++
+ 
                                                                                                                    SEE ALSO
                                                                                                                    +        curs_ins_wch(3x) describes comparable functions in  the  wide-character
+        curses configuration.
+@@ -98,7 +102,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                    curs_insch(3x)
++ncurses 6.5                       2024-07-27                    curs_insch(3x)
+ 
                                                                                                                    
+ 
                                                                                                                    
+ 
+ 
                                                                                                                    
+Index: doc/html/man/curs_insstr.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/curs_insstr.3x.html	2024-06-08 23:12:49.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/curs_insstr.3x.html	2024-07-27 23:11:31.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_insstr.3x,v 1.55 2024/06/08 21:03:03 tom Exp @
++  * @Id: curs_insstr.3x,v 1.57 2024/07/27 20:07:59 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_insstr 3x 2024-06-08 ncurses 6.5 Library calls
++curs_insstr 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                    curs_insstr 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                    
++
                                                                                                                    curs_insstr 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                    
+ 
                                                                                                                    + curs_insstr(3x)                  Library calls                 curs_insstr(3x)
+ 
+@@ -47,73 +47,74 @@
+ 
+ 
+ 
                                                                                                                    NAME
                                                                                                                    +-       insstr,  insnstr,  winsstr,  winsnstr,  mvinsstr, mvinsnstr, mvwinsstr,
++       insstr,  winsstr,  mvinsstr,  mvinsnstr,  insnstr, winsnstr, mvwinsstr,
+        mvwinsnstr - insert a string in a curses window
+ 
+ 
+ 
                                                                                                                    SYNOPSIS
                                                                                                                    +        #include <curses.h>
+-       int insstr(const char *str);
+-       int insnstr(const char *str, int n);
+-       int winsstr(WINDOW *win, const char *str);
+-       int winsnstr(WINDOW *win, const char *str, int n);
+-
+-       int mvinsstr(int y, int x, const char *str);
+-       int mvinsnstr(int y, int x, const char *str, int n);
+-       int mvwinsstr(WINDOW *win, int y, int x, const char *str);
+-       int mvwinsnstr(WINDOW *win, int y, int x, const char *str, int n);
+ 
++       int insstr(const char * str);
++       int winsstr(WINDOW * win, const char * str);
++       int mvinsstr(int y, int x, const char * str);
++       int mvwinsstr(WINDOW * win, int y, int x, const char * str);
++
++       int insnstr(const char * str, int n);
++       int winsnstr(WINDOW * win, const char * str, int n);
++       int mvinsnstr(int y, int x, const char * str, int n);
++       int mvwinsnstr(WINDOW * win, int y, int x, const char * str, int n);
+ 
+-
                                                                                                                    DESCRIPTION
                                                                                                                    +-       These routines insert a character string (as many  characters  as  will
+-       fit  on  the line) before the character under the cursor, as if calling
+-       winsch(3x).  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  y,  x,  if
+-       specified).
+-
+-       The functions with n as the last argument insert a leading substring of
+-       at most n characters.  If n is less than zero,  the  entire  string  is
+-       inserted (stopping on a NUL character).
+ 
+-       Special characters are handled as in waddch(3x).
++
                                                                                                                    DESCRIPTION
                                                                                                                    ++       winsstr inserts a string str before the  character  at  the  cursor  in
++       window  win  as if by calling winsch(3x) for each char in str.  No line
++       wrapping is performed.  Characters to  the  right  of  the  cursor  are
++       shifted  right;  those  at  the  right  edge of the window may be lost.
++       winsstr stops inserting if it would have to wrap to the  next  line  to
++       write the next char in str.  The cursor position does not change (after
++       moving to (y, x), if specified).  insnstr does the same, but inserts at
++       most  n  characters, or as many as possible (up to the end of the line)
++       if n is -1.  ncurses(3x) describes the variants of these functions.
+ 
+ 
+ 
                                                                                                                    RETURN VALUE
                                                                                                                    +-       All functions return the integer ERR upon failure and OK on success.
++       These functions return OK on success and ERR on failure.
+ 
+-       X/Open   Curses   does   not   specify   any  error  conditions.   This
+-       implementation returns ERR
++       In ncurses, they return ERR if
+ 
+-       o   if the win parameter is null or
++       o   win is NULL,
+ 
+-       o   if the str parameter is null or
++       o   str is NULL, or
+ 
+-       o   the winsch(3x) function returns ERR.
++       o   an internal winsch(3x) call returns ERR.
+ 
+        Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                    NOTES
                                                                                                                    +-       All but winsnstr may be macros.
++       All of these functions except winsnstr may be implemented as macros.
+ 
+ 
+ 
                                                                                                                    PORTABILITY
                                                                                                                    +        X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+        error conditions for them.
+ 
+-       Issue 4 distinguished insnstr and winsnstr  by  stating  they  "do  not
+-       perform  wrapping".   This  was  probably an error, since it makes this
+-       group of functions inconsistent.  No implementation of curses documents
+-       this inconsistency, and Issue 7 removed it.
+-
+-       Issue  4 states that the entire string is inserted if n is less than 1.
+-       This is probably an  error,  because  it  is  inconsistent  with  other
+-       functions,  and  differs  from  the  SVr4  curses  and  Solaris xcurses
+-       implementations.  Nevertheless, Issue 7 retains it.
++       Issue 4 distinguished insnstr and winsnstr  from  the  other  functions
++       documented  above  by stating they "do not perform wrapping".  This was
++       probably an error, since it makes this group of functions inconsistent.
++       No  implementation  of curses documents this inconsistency, and Issue 7
++       removed it.
++
++       Issue 4 states that the entire string is inserted if n is less than  1.
++       This  is  probably  an  error,  because  it  is inconsistent with other
++       functions such as waddstr(3x), and differs from  the  SVr4  curses  and
++       Solaris  xcurses  implementations.   Nevertheless,  Issue 7 retains the
++       language.
++
++
++
                                                                                                                    HISTORY
                                                                                                                    ++       SVr3.1 (1987) introduced winsstr and winsnstr.
+ 
+ 
+ 
                                                                                                                    SEE ALSO
                                                                                                                    +@@ -124,7 +125,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                   curs_insstr(3x)
++ncurses 6.5                       2024-07-27                   curs_insstr(3x)
+ 
                                                                                                                    
+ 
                                                                                                                    
+ 
+ 
                                                                                                                    
+Index: doc/html/man/curs_move.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/curs_move.3x.html	2024-07-20 22:19:04.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/curs_move.3x.html	2024-07-27 23:11:32.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_move.3x,v 1.42 2024/07/20 20:54:08 tom Exp @
++  * @Id: curs_move.3x,v 1.44 2024/07/27 20:11:42 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_move 3x 2024-07-20 ncurses 6.5 Library calls
++curs_move 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                    curs_move 3x 2024-07-20 ncurses 6.5 Library calls
                                                                                                                    
++
                                                                                                                    curs_move 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                    
+ 
                                                                                                                    + curs_move(3x)                    Library calls                   curs_move(3x)
+ 
+@@ -70,7 +70,7 @@
+ 
+        They fail if the position (y, x) is outside the window boundaries.
+ 
+-       wmove fails if its WINDOW pointer argument is NULL.
++       In ncurses, wmove fails if its WINDOW pointer argument is NULL.
+ 
+ 
+ 
                                                                                                                    NOTES
                                                                                                                    +@@ -78,8 +78,14 @@
+ 
+ 
+ 
                                                                                                                    PORTABILITY
                                                                                                                    +-       X/Open  Curses,  Issue 4 describes these functions.  4BSD (1980) curses
+-       introduced wmove.
++       X/Open Curses, Issue 4 describes these functions.
++
++       SVr4  curses  describes  a  successful return value only as "an integer
++       value other than ERR".
++
++
++
                                                                                                                    HISTORY
                                                                                                                    ++       4BSD (1980) curses introduced wmove.
+ 
+ 
+ 
                                                                                                                    SEE ALSO
                                                                                                                    +@@ -87,7 +93,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-20                     curs_move(3x)
++ncurses 6.5                       2024-07-27                     curs_move(3x)
+ 
                                                                                                                    
+ 
                                                                                                                    
+ 
+ 
                                                                                                                    
+Index: doc/html/man/curs_outopts.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/curs_outopts.3x.html	2024-05-25 22:33:42.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/curs_outopts.3x.html	2024-07-27 23:11:32.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_outopts.3x,v 1.67 2024/05/25 20:10:58 tom Exp @
++  * @Id: curs_outopts.3x,v 1.69 2024/07/27 19:55:45 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_outopts 3x 2024-05-25 ncurses 6.5 Library calls
++curs_outopts 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                    curs_outopts 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                    
++
                                                                                                                    curs_outopts 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                    
+ 
                                                                                                                    + curs_outopts(3x)                 Library calls                curs_outopts(3x)
+ 
+@@ -148,8 +148,6 @@
+        upon  failure.  All other routines that return an integer always return
+        OK.
+ 
+-       X/Open Curses does not specify any error conditions.
+-
+        In this implementation,
+ 
+        o   those functions that have a window pointer will return ERR  if  the
+@@ -168,35 +166,36 @@
+ 
+ 
+ 
                                                                                                                    PORTABILITY
                                                                                                                    +-       These functions are described in X/Open Curses, Issue 4.
++       These functions are described in X/Open Curses, Issue 4.  It  specifies
++       no error conditions for them.
+ 
+-       Some historic curses implementations had, as an  undocumented  feature,
++       Some  historic  curses implementations had, as an undocumented feature,
+        the  ability  to  do  the  equivalent  of  clearok(...,  1)  by  saying
+        touchwin(stdscr) or clear(stdscr).  This will not work under ncurses.
+ 
+-       Earlier System V curses implementations specified  that  with  scrollok
+-       enabled,  any  window  modification  triggering  a scroll also forced a
+-       physical refresh.  X/Open Curses does not  require  this,  and  ncurses
+-       avoids  doing  it  to  perform  better  vertical-motion optimization at
++       Earlier  System  V  curses implementations specified that with scrollok
++       enabled, any window modification triggering  a  scroll  also  forced  a
++       physical  refresh.   X/Open  Curses  does not require this, and ncurses
++       avoids doing it  to  perform  better  vertical-motion  optimization  at
+        wrefresh time.
+ 
+        X/Open Curses does not mention that the cursor should be made invisible
+-       as  a side-effect of leaveok.  SVr4 curses documentation does this, but
++       as a side-effect of leaveok.  SVr4 curses documentation does this,  but
+        the code does not.  Use curs_set to make the cursor invisible.
+ 
+ 
+ 
                                                                                                                    HISTORY
                                                                                                                    +-       ncurses formerly treated nl(3x) and nonl(3x) as both input  and  output
++       ncurses  formerly  treated nl(3x) and nonl(3x) as both input and output
+        options, but no longer; see curs_inopts(3x).
+ 
+ 
+ 
                                                                                                                    SEE ALSO
                                                                                                                    +-       curses(3x),     curs_addch(3x),    curs_clear(3x),    curs_initscr(3x),
++       curses(3x),    curs_addch(3x),    curs_clear(3x),     curs_initscr(3x),
+        curs_refresh(3x), curs_scroll(3x), curs_variables(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                  curs_outopts(3x)
++ncurses 6.5                       2024-07-27                  curs_outopts(3x)
+ 
                                                                                                                    
+ 
                                                                                                                    
+ 
                                                                                                                      
+Index: doc/html/man/curs_pad.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/curs_pad.3x.html	2024-06-22 22:55:08.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/curs_pad.3x.html	2024-07-27 23:11:32.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_pad.3x,v 1.65 2024/06/22 22:20:03 tom Exp @
++  * @Id: curs_pad.3x,v 1.67 2024/07/27 19:55:45 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_pad 3x 2024-06-22 ncurses 6.5 Library calls
++curs_pad 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                      curs_pad 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                                      
++
                                                                                                                      curs_pad 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                      
+ 
                                                                                                                      + curs_pad(3x)                     Library calls                    curs_pad(3x)
+ 
+@@ -136,20 +136,19 @@
+        Functions  that  return pointers return NULL on error, and set errno to
+        ENOMEM.
+ 
+-       X/Open  Curses  does  not  specify  any  error  conditions.   In   this
+-       implementation
++       In this implementation
+ 
+           prefresh and pnoutrefresh
+-               return  ERR  if the window pointer is null, or if the window is
+-               not really a pad or if the area to refresh  extends  off-screen
++               return ERR if the window pointer is null, or if the  window  is
++               not  really  a pad or if the area to refresh extends off-screen
+                or if the minimum coordinates are greater than the maximum.
+ 
+           pechochar
+-               returns  ERR  if  the  window  is  not  really  a  pad, and the
++               returns ERR if  the  window  is  not  really  a  pad,  and  the
+                associated call to wechochar returns ERR.
+ 
+           pecho_wchar
+-               returns ERR if  the  window  is  not  really  a  pad,  and  the
++               returns  ERR  if  the  window  is  not  really  a  pad, and the
+                associated call to wecho_wchar returns ERR.
+ 
+ 
+@@ -160,67 +159,67 @@
+ 
                                                                                                                      PORTABILITY
                                                                                                                      +        BSD curses has no pad feature.
+ 
+-       SVr2   curses   (1986)  provided  the  newpad  and  related  functions,
+-       documenting them in a single line  each.   SVr3  (1987)  provided  more
++       SVr2  curses  (1986)  provided  the  newpad  and   related   functions,
++       documenting  them  in  a  single  line each.  SVr3 (1987) provided more
+        extensive documentation.
+ 
+-       The  documentation  does not explain the term pad.  However, the Apollo
++       The documentation does not explain the term pad.  However,  the  Apollo
+        Aegis workstation operating system supported a graphical pad feature:
+ 
+-       o   These graphical pads could  be  much  larger  than  the  computer's
++       o   These  graphical  pads  could  be  much  larger than the computer's
+            display.
+ 
+-       o   The  read-only  output  from  a  command  could be scrolled back to
++       o   The read-only output from a  command  could  be  scrolled  back  to
+            inspect, and select text from the pad.
+ 
+        The two uses may be related.
+ 
+-       X/Open Curses, Issue 4 describes these functions,  without  significant
+-       change  from the SVr3 documentation.  It describes no error conditions.
+-       The  behavior  of  subpad  if  the  parent  window  is  not  a  pad  is
++       X/Open  Curses,  Issue 4 describes these functions, without significant
++       change from the SVr3 documentation.  It specifies no  error  conditions
++       for  them.  The behavior of subpad if the parent window is not a pad is
+        undocumented, and is not checked by the vendor Unix implementations:
+ 
+-       o   SVr4  curses  sets  a  flag in the WINDOW structure in newpad which
++       o   SVr4 curses sets a flag in the WINDOW  structure  in  newpad  which
+            tells if the window is a pad.
+ 
+-           However, it uses this information only in waddch (to decide  if  it
+-           should  call  wrefresh)  and  wscrl (to avoid scrolling a pad), and
+-           does not check in wrefresh to ensure  that  the  pad  is  refreshed
++           However,  it  uses this information only in waddch (to decide if it
++           should call wrefresh) and wscrl (to avoid  scrolling  a  pad),  and
++           does  not  check  in  wrefresh  to ensure that the pad is refreshed
+            properly.
+ 
+-       o   Solaris  xcurses  checks whether a window is a pad in wnoutrefresh,
++       o   Solaris xcurses checks whether a window is a pad  in  wnoutrefresh,
+            returning ERR in that case.
+ 
+-           However, it only sets the flag for subwindows if the parent  window
+-           is  a  pad.   Its  newpad  function  does not set this information.
++           However,  it only sets the flag for subwindows if the parent window
++           is a pad.  Its newpad  function  does  not  set  this  information.
+            Consequently, the check will never fail.
+ 
+-           It makes no comparable check in pnoutrefresh, though  interestingly
+-           enough,  a  comment  in  the  source code states that the lack of a
++           It  makes no comparable check in pnoutrefresh, though interestingly
++           enough, a comment in the source code states  that  the  lack  of  a
+            check was an MKS extension.
+ 
+-       o   NetBSD 7 curses sets a flag in the WINDOW structure for newpad  and
+-           subpad,   using   this   to   help  with  the  distinction  between
++       o   NetBSD  7 curses sets a flag in the WINDOW structure for newpad and
++           subpad,  using  this  to  help   with   the   distinction   between
+            wnoutrefresh and pnoutrefresh.
+ 
+-           It does not check for the case where a subwindow is  created  in  a
++           It  does  not  check for the case where a subwindow is created in a
+            pad using subwin or derwin.
+ 
+-           The  dupwin  function  returns  a regular window when duplicating a
+-           pad.  Likewise, getwin always returns a window, even if  the  saved
++           The dupwin function returns a regular  window  when  duplicating  a
++           pad.   Likewise,  getwin always returns a window, even if the saved
+            data was from a pad.
+ 
+        This implementation
+ 
+        o   sets a flag in the WINDOW structure for newpad and subpad,
+ 
+-       o   allows  a  subwin  or derwin call to succeed having a pad parent by
++       o   allows a subwin or derwin call to succeed having a  pad  parent  by
+            forcing the subwindow to be a pad,
+ 
+-       o   checks in both wnoutrefresh and pnoutrefresh to  ensure  that  pads
++       o   checks  in  both  wnoutrefresh and pnoutrefresh to ensure that pads
+            and windows are handled distinctly, and
+ 
+-       o   ensures   that   dupwin   and  getwin  treat  pads  versus  windows
++       o   ensures  that  dupwin  and  getwin  treat   pads   versus   windows
+            consistently.
+ 
+ 
+@@ -229,7 +228,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-22                      curs_pad(3x)
++ncurses 6.5                       2024-07-27                      curs_pad(3x)
+ 
                                                                                                                      
+ 
                                                                                                                      
+ 
                                                                                                                        
+Index: doc/html/man/curs_print.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/curs_print.3x.html	2024-04-27 18:38:47.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/curs_print.3x.html	2024-07-27 23:11:32.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_print.3x,v 1.38 2024/03/16 15:35:01 tom Exp @
++  * @Id: curs_print.3x,v 1.40 2024/07/27 20:03:57 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_print 3x 2024-03-16 ncurses 6.5 Library calls
++curs_print 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                        curs_print 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                        
++
                                                                                                                        curs_print 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                        
+ 
                                                                                                                        + curs_print(3x)                   Library calls                  curs_print(3x)
+ 
+@@ -53,49 +53,57 @@
+ 
                                                                                                                        SYNOPSIS
                                                                                                                        +        #include <curses.h>
+ 
+-       int mcprint(char *data, int len);
++       int mcprint(char * data, int len);
+ 
+ 
+ 
                                                                                                                        DESCRIPTION
                                                                                                                        +-       This  function  uses  the mc5p or mc4 and mc5 capabilities, if they are
+-       present, to ship given data to a printer attached to the terminal.
+-
+-       Note that the mcprint 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  (typically  about half of its nominal cps
+-       rating).   Dot-matrix  printers  and   6-page-per-minute   lasers   can
+-       typically  handle  80cps,  so  a  good conservative rule of thumb is to
+-       sleep for a second after shipping each 80-character line.
++       mcprint,   an  ncurses  extension  to  the  curses  library,  uses  the
++       terminal's prtr_non (mc5p) or prtr_on (mc5) and  prtr_off  (mc4)  media
++       copy  capabilities,  if  defined, to send len bytes of the given string
++       data to a printer attached to the terminal.
++
++       mcprint has no means of flow control to the printer nor of knowing  how
++       much buffering it has.  Your application is responsible for keeping the
++       rate of writes to the printer below  its  continuous  throughput  rate,
++       typically about half of its nominal characters-per-second (cps) rating.
++       Dot-matrix printers and 6-page-per-minute laser printers can  typically
++       handle  80  cps,  so  a  conservative rule of thumb is to sleep for one
++       second after sending an 80-character line.
+ 
+ 
+ 
                                                                                                                        RETURN VALUE
                                                                                                                        +-       The mcprint function returns ERR if the  write  operation  aborted  for
+-       some  reason.   In  this  case,  errno  will  contain  either  an error
+-       associated with write(2) or one of the following:
++       On success, mcprint returns  the  number  of  characters  sent  to  the
++       printer.
++
++       mcprint  returns  ERR  if the write operation fails for any reason.  In
++       that event, errno contains either a value set by write(2),  or  one  of
++       the following.
+ 
+        ENODEV
+-            Capabilities for printer redirection do not exist.
++            The terminal lacks relevant media copy capabilities.
+ 
+        ENOMEM
+-            Couldn't allocate sufficient memory to buffer the printer write.
+-
+-       When mcprint succeeds, it returns the  number  of  characters  actually
+-       sent to the printer.
++            ncurses  could  not allocate sufficient memory to buffer the write
++            operation.
+ 
+ 
+ 
                                                                                                                        EXTENSIONS
                                                                                                                        +-       mcprint was designed for ncurses(3x), and was not found in SVr4 curses,
+-       4.4BSD curses, or any other previous curses implementation.
++       mcprint is an ncurses(3x) extension, and is not found in  SVr4  curses,
++       4.4BSD curses, or any other previous curses implementation.
+ 
+ 
+ 
                                                                                                                        PORTABILITY
                                                                                                                        +-       Applications employing this ncurses extension should condition its  use
++       Applications  employing this ncurses extension should condition its use
+        on the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+ 
++
                                                                                                                        HISTORY
                                                                                                                        ++       ncurses introduced mcprint prior to version 1.9.9g (1996).
++
++
+ 
                                                                                                                        BUGS
                                                                                                                        +-       Padding in the mc5p, mc4, and mc5 capabilities is not interpreted.
++       Padding in the prtr_non  (mc5p),  prtr_on  (mc5),  and  prtr_off  (mc4)
++       capabilities is not interpreted.
+ 
+ 
+ 
                                                                                                                        SEE ALSO
                                                                                                                        +@@ -103,7 +111,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                    curs_print(3x)
++ncurses 6.5                       2024-07-27                    curs_print(3x)
+ 
                                                                                                                        
+ 
                                                                                                                        
+ 
+Index: doc/html/man/curs_refresh.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/curs_refresh.3x.html	2024-05-25 22:33:42.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/curs_refresh.3x.html	2024-07-27 23:11:32.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_refresh.3x,v 1.48 2024/05/25 20:10:58 tom Exp @
++  * @Id: curs_refresh.3x,v 1.50 2024/07/27 19:55:45 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_refresh 3x 2024-05-25 ncurses 6.5 Library calls
++curs_refresh 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                        curs_refresh 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                        
++
                                                                                                                        curs_refresh 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                        
+ 
                                                                                                                        + curs_refresh(3x)                 Library calls                curs_refresh(3x)
+ 
+@@ -127,11 +127,10 @@
+        specifies only "an integer  value  other  than  ERR")  upon  successful
+        completion.
+ 
+-       X/Open   Curses  does  not  specify  any  error  conditions.   In  this
+-       implementation
++       In this implementation
+ 
+           wnoutrefresh
+-               returns ERR if the window pointer is null, or if the window  is
++               returns  ERR if the window pointer is null, or if the window is
+                really a pad.
+ 
+           wredrawln
+@@ -143,7 +142,8 @@
+ 
+ 
+ 
                                                                                                                        PORTABILITY
                                                                                                                        +-       X/Open Curses, Issue 4 describes these functions.
++       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
++       error conditions for them.
+ 
+        Whether  wnoutrefresh  copies to the virtual screen the entire contents
+        of a window or just its changed portions has never been well-documented
+@@ -159,7 +159,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                  curs_refresh(3x)
++ncurses 6.5                       2024-07-27                  curs_refresh(3x)
+ 
                                                                                                                        
+ 
                                                                                                                        
+ 
                                                                                                                          
+Index: doc/html/man/curs_touch.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/curs_touch.3x.html	2024-05-25 22:33:43.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/curs_touch.3x.html	2024-07-27 23:11:32.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_touch.3x,v 1.49 2024/05/25 20:10:58 tom Exp @
++  * @Id: curs_touch.3x,v 1.51 2024/07/27 19:55:45 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_touch 3x 2024-05-25 ncurses 6.5 Library calls
++curs_touch 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                          curs_touch 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                          
++
                                                                                                                          curs_touch 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                          
+ 
                                                                                                                          + curs_touch(3x)                   Library calls                  curs_touch(3x)
+ 
+@@ -93,24 +93,23 @@
+        other than ERR upon successful completion, unless  otherwise  noted  in
+        the preceding routine descriptions.
+ 
+-       X/Open   Curses  does  not  specify  any  error  conditions.   In  this
+-       implementation
++       In this implementation
+ 
+           is_linetouched
+-               returns ERR if the window pointer  is  null,  or  if  the  line
++               returns  ERR  if  the  window  pointer  is null, or if the line
+                number is outside the window boundaries.
+ 
+                The constant ERR is distinct from TRUE and FALSE, which are the
+-               normal return values of this function.   Because  the  function
++               normal  return  values  of this function.  Because the function
+                returns a bool, returning ERR (which is neither TRUE nor FALSE)
+                may not be supported by the compiler.
+ 
+-               To provide error-checking and also match  the  X/Open  function
++               To  provide  error-checking  and also match the X/Open function
+                prototype, the ERR is provided by a macro named is_linetouched.
+                The actual function returns FALSE when it detects an error.
+ 
+           wtouchln
+-               returns ERR if the window pointer  is  null,  or  if  the  line
++               returns  ERR  if  the  window  pointer  is null, or if the line
+                number is outside the window boundaries.
+ 
+ 
+@@ -119,14 +118,14 @@
+ 
+ 
+ 
                                                                                                                          PORTABILITY
                                                                                                                          +-       These  functions  were  introduced  by SVr4.  The Solaris curses header
++       These functions were introduced by SVr4.   The  Solaris  curses  header
+        file, for instance, defines both an actual function and macro for each.
+-       The  macros  give the same result as the actual functions.  SVr4 curses
+-       does not check the window parameter win to ensure that it is not  NULL;
++       The macros give the same result as the actual functions.   SVr4  curses
++       does  not check the window parameter win to ensure that it is not NULL;
+        otherwise this implementation behaves the same as SVr4.
+ 
+-       X/Open  Curses, Issue 4 describes these functions, but defines no error
+-       conditions.
++       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
++       error conditions for them.
+ 
+ 
+ 
                                                                                                                          SEE ALSO
                                                                                                                          +@@ -134,7 +133,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                    curs_touch(3x)
++ncurses 6.5                       2024-07-27                    curs_touch(3x)
+ 
                                                                                                                          
+ 
                                                                                                                          
+ 
                                                                                                                            
+Index: doc/html/man/curs_util.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/curs_util.3x.html	2024-06-22 22:55:09.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/curs_util.3x.html	2024-07-27 23:11:32.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_util.3x,v 1.112 2024/06/22 21:25:23 tom Exp @
++  * @Id: curs_util.3x,v 1.114 2024/07/27 19:55:45 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_util 3x 2024-06-22 ncurses 6.5 Library calls
++curs_util 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                            curs_util 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                                            
++
                                                                                                                            curs_util 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                            
+ 
                                                                                                                            + curs_util(3x)                    Library calls                   curs_util(3x)
+ 
+@@ -253,8 +253,7 @@
+ 
+        Routines that return pointers return NULL on error.
+ 
+-       X/Open  Curses  does  not  specify  any  error  conditions.   In   this
+-       implementation
++       In this implementation
+ 
+           flushinp
+                returns ERR if the terminal was not initialized.
+@@ -266,83 +265,83 @@
+ 
                                                                                                                            PORTABILITY
                                                                                                                            + 
+ 
                                                                                                                            filter
                                                                                                                            +-       The  SVr4  documentation  describes  the  action  of filter only in the
+-       vaguest terms.  The description here  is  adapted  from  X/Open  Curses
++       The SVr4 documentation describes the  action  of  filter  only  in  the
++       vaguest  terms.   The  description  here  is adapted from X/Open Curses
+        (which erroneously fails to describe the disabling of cuu).
+ 
+ 
+ 
                                                                                                                            delay_output padding
                                                                                                                            +-       The  limitation  to  30  seconds and the use of napms differ from other
++       The limitation to 30 seconds and the use of  napms  differ  from  other
+        implementations.
+ 
+        o   SVr4 curses does not delay if no padding character is available.
+ 
+-       o   NetBSD curses uses napms when no padding  character  is  available,
+-           but  does  not  take  timing  into  account  when using the padding
++       o   NetBSD  curses  uses  napms when no padding character is available,
++           but does not take  timing  into  account  when  using  the  padding
+            character.
+ 
+        Neither limits the delay.
+ 
+ 
+ 
                                                                                                                            keyname
                                                                                                                            +-       The keyname function  may  return  the  names  of  user-defined  string
+-       capabilities  that  are defined in the terminfo entry via the -x option
+-       of tic.  This implementation  automatically  assigns  at  run-time  key
++       The  keyname  function  may  return  the  names  of user-defined string
++       capabilities that are defined in the terminfo entry via the  -x  option
++       of  tic.   This  implementation  automatically  assigns at run-time key
+        codes to user-defined strings that begin with "k".  The key codes start
+-       at KEY_MAX, but are not guaranteed to be the same value  for  different
+-       runs   because   user-defined   codes  are  merged  from  all  terminal
+-       descriptions  that  have  been  loaded.    The   use_extended_names(3x)
+-       function  controls  whether  this  data  is  loaded  when  the terminal
++       at  KEY_MAX,  but are not guaranteed to be the same value for different
++       runs  because  user-defined  codes  are  merged   from   all   terminal
++       descriptions   that   have  been  loaded.   The  use_extended_names(3x)
++       function controls  whether  this  data  is  loaded  when  the  terminal
+        description is read by the library.
+ 
+ 
+ 
                                                                                                                            nofilter, use_tioctl
                                                                                                                            +-       The nofilter and use_tioctl routines are  specific  to  ncurses.   They
+-       were  not  supported on Version 7, BSD or System V implementations.  It
+-       is recommended  that  any  code  depending  on  ncurses  extensions  be
++       The  nofilter  and  use_tioctl  routines are specific to ncurses.  They
++       were not supported on Version 7, BSD or System V  implementations.   It
++       is  recommended  that  any  code  depending  on  ncurses  extensions be
+        conditioned using NCURSES_VERSION.
+ 
+ 
+ 
                                                                                                                            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
+-           implementation-specific format.  Although the format is an  obvious
++       o   The  files  written  and   read   by   these   functions   use   an
++           implementation-specific  format.  Although the format is an obvious
+            target for standardization, it has been overlooked.
+ 
+-           Interestingly  enough,  according to the copyright dates in Solaris
+-           source, the functions (along with scr_init, etc.)  originated  with
++           Interestingly enough, according to the copyright dates  in  Solaris
++           source,  the  functions (along with scr_init, etc.) originated with
+            the University of California, Berkeley (in 1982) and were later (in
+-           1988) incorporated into SVr4.  Oddly, there are no  such  functions
++           1988)  incorporated  into SVr4.  Oddly, there are no such functions
+            in the 4.3BSD curses sources.
+ 
+        o   Most implementations simply dump the binary WINDOW structure to the
+-           file.  These include SVr4 curses, NetBSD and PDCurses, as  well  as
++           file.   These  include SVr4 curses, NetBSD and PDCurses, as well as
+            older ncurses versions.  This implementation (as well as the X/Open
+            variant of Solaris curses, dated 1995) uses textual dumps.
+ 
+-           The implementations that use binary dumps use  block-I/O  (write(2)
++           The  implementations  that use binary dumps use block-I/O (write(2)
+            and read(2) functions).  Those that use textual dumps use buffered-
+            I/O.  A few applications may happen to write extra data in the file
+-           using  these  functions.   Doing  that can run into problems mixing
+-           block- and buffered-I/O.  This implementation reduces  the  problem
+-           on  writes  by  flushing  the output.  However, reading from a file
++           using these functions.  Doing that can  run  into  problems  mixing
++           block-  and  buffered-I/O.  This implementation reduces the problem
++           on writes by flushing the output.  However,  reading  from  a  file
+            written using mixed schemes may not be successful.
+ 
+ 
+ 
                                                                                                                            unctrl, wunctrl
                                                                                                                            +-       X/Open Curses, Issue 4  describes  these  functions.   It  states  that
+-       unctrl and wunctrl will return a null pointer if unsuccessful, but does
+-       not define any error conditions.  This implementation checks for  three
+-       cases:
++       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
++       error conditions for them.  It states  that  unctrl  and  wunctrl  will
++       return  a null pointer if unsuccessful.  This implementation checks for
++       three cases:
+ 
+-       o   the  parameter  is  a  7-bit  US-ASCII code.  This is the case that
++       o   the parameter is a 7-bit US-ASCII code.   This  is  the  case  that
+            X/Open Curses documented.
+ 
+        o   the parameter is in the range 128-159, i.e., a C1 control code.  If
+-           use_legacy_coding(3x)  has  been  called with a 2 parameter, unctrl
+-           returns the  parameter,  i.e.,  a  one-character  string  with  the
+-           parameter  as  the  first  character.   Otherwise, it returns "~@",
++           use_legacy_coding(3x) has been called with a  2  parameter,  unctrl
++           returns  the  parameter,  i.e.,  a  one-character  string  with the
++           parameter as the first  character.   Otherwise,  it  returns  "~@",
+            "~A", etc., analogous to "^@", "^A", C0 controls.
+ 
+            X/Open Curses does not document whether unctrl can be called before
+@@ -353,33 +352,33 @@
+            pointer.
+ 
+        The strings returned by unctrl in this implementation are determined at
+-       compile time, showing C1 controls from the upper-128 codes with  a  "~"
+-       prefix   rather   than   "^".   Other  implementations  have  different
+-       conventions.   For  example,  they  may  show  both  sets  of   control
+-       characters  with  "^",  and strip the parameter to 7 bits.  Or they may
+-       ignore C1 controls and treat all of the upper-128 codes  as  printable.
+-       This  implementation  uses  8  bits  but  does not modify the string to
+-       reflect locale.  The use_legacy_coding(3x) function allows  the  caller
++       compile  time,  showing C1 controls from the upper-128 codes with a "~"
++       prefix  rather  than  "^".   Other   implementations   have   different
++       conventions.    For  example,  they  may  show  both  sets  of  control
++       characters with "^", and strip the parameter to 7 bits.   Or  they  may
++       ignore  C1  controls and treat all of the upper-128 codes as printable.
++       This implementation uses 8 bits but  does  not  modify  the  string  to
++       reflect  locale.   The use_legacy_coding(3x) function allows the caller
+        to change the output of unctrl.
+ 
+-       Likewise,  the meta(3x) function allows the caller to change the output
+-       of keyname, i.e., it determines whether to  use  the  "M-"  prefix  for
+-       "meta"    keys    (codes    in   the   range   128   to   255).    Both
+-       use_legacy_coding(3x)  and  meta(3x)  succeed  only  after  curses   is
+-       initialized.   X/Open  Curses  does not document the treatment of codes
++       Likewise, the meta(3x) function allows the caller to change the  output
++       of  keyname,  i.e.,  it  determines  whether to use the "M-" prefix for
++       "meta"   keys   (codes   in   the   range   128    to    255).     Both
++       use_legacy_coding(3x)   and  meta(3x)  succeed  only  after  curses  is
++       initialized.  X/Open Curses does not document the  treatment  of  codes
+        128 to 159.  When treating them as "meta" keys (or if keyname is called
+-       before   initializing  curses),  this  implementation  returns  strings
++       before  initializing  curses),  this  implementation  returns   strings
+        "M-^@", "M-^A", etc.
+ 
+        X/Open Curses documents unctrl as declared in <unctrl.h>, which ncurses
+-       does.   However,  ncurses' <curses.h> includes <unctrl.h>, matching the
++       does.  However, ncurses' <curses.h> includes <unctrl.h>,  matching  the
+        behavior of SVr4 curses.  Other implementations may not do that.
+ 
+ 
+ 
                                                                                                                            use_env, use_tioctl
                                                                                                                            +-       If ncurses is configured to provide  the  sp-functions  extension,  the
+-       state  of  use_env  and  use_tioctl may be updated before creating each
+-       screen rather than once  only  (curs_sp_funcs(3x)).   This  feature  of
++       If  ncurses  is  configured  to provide the sp-functions extension, the
++       state of use_env and use_tioctl may be  updated  before  creating  each
++       screen  rather  than  once  only  (curs_sp_funcs(3x)).  This feature of
+        use_env is not provided by other implementations of curses.
+ 
+ 
+@@ -388,8 +387,8 @@
+ 
+        SVr2 (1984) introduced delay_output, flushinp, and keyname.
+ 
+-       SVr3  (1987)  added filter.  Later that year, SVr3.1 brought getwin and
+-       putwin, reading and writing window dumps with fread(3)  and  fwrite(3),
++       SVr3 (1987) added filter.  Later that year, SVr3.1 brought  getwin  and
++       putwin,  reading  and writing window dumps with fread(3) and fwrite(3),
+        respectively.
+ 
+        SVr4 (1989) supplied use_env.
+@@ -400,13 +399,13 @@
+ 
+ 
+ 
                                                                                                                            SEE ALSO
                                                                                                                            +-       curses(3x),    curs_initscr(3x),    curs_inopts(3x),   curs_kernel(3x),
++       curses(3x),   curs_initscr(3x),    curs_inopts(3x),    curs_kernel(3x),
+        curs_scr_dump(3x),        curs_sp_funcs(3x),        curs_variables(3x),
+        legacy_coding(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-22                     curs_util(3x)
++ncurses 6.5                       2024-07-27                     curs_util(3x)
+ 
                                                                                                                            
+ 
                                                                                                                            
+ 
                                                                                                                              
+Index: doc/html/man/define_key.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/define_key.3x.html	2024-06-08 23:29:40.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/define_key.3x.html	2024-07-27 23:11:32.000000000 +0000
+@@ -28,19 +28,19 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey 1997
+-  * @Id: define_key.3x,v 1.48 2024/06/08 23:25:11 tom Exp @
++  * @Id: define_key.3x,v 1.50 2024/07/27 19:43:41 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-define_key 3x 2024-06-08 ncurses 6.5 Library calls
++define_key 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                              define_key 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                              
++
                                                                                                                              define_key 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                              
+ 
                                                                                                                              + define_key(3x)                   Library calls                  define_key(3x)
+ 
+@@ -88,7 +88,7 @@
+        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       NetBSD curses since 2.0 (2004) supports define_key.
++       NetBSD curses since 2.0 (2004) supports define_key.
+ 
+ 
+ 
                                                                                                                              AUTHORS
                                                                                                                              +@@ -100,7 +100,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                    define_key(3x)
++ncurses 6.5                       2024-07-27                    define_key(3x)
+ 
                                                                                                                              
+ 
                                                                                                                              
+ 
                                                                                                                                
+Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.5-20240720+/doc/html/man/infotocap.1m.html	2024-05-11 21:39:58.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/infotocap.1m.html	2024-07-27 23:11:33.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: infotocap.1m,v 1.42 2024/05/11 20:39:53 tom Exp @
++  * @Id: infotocap.1m,v 1.44 2024/07/27 19:43:16 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-infotocap 1m 2024-05-11 ncurses 6.5 User commands
++infotocap 1m 2024-07-27 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                infotocap 1m 2024-05-11 ncurses 6.5 User commands
                                                                                                                                
++
                                                                                                                                infotocap 1m 2024-07-27 ncurses 6.5 User commands
                                                                                                                                
+ 
                                                                                                                                + infotocap(1m)                    User commands                   infotocap(1m)
+ 
+@@ -58,7 +58,7 @@
+ 
+ 
                                                                                                                                DESCRIPTION
                                                                                                                                +        infotocap  translates  terminal  descriptions.   It looks in each given
+-       text file for terminfo entries and, For each one found,  it  writes  an
++       text file for terminfo entries and, for each one found,  it  writes  an
+        analogous  termcap description to the standard output stream.  terminfo
+        "use" capabilities  translate  to  termcap  tc  capabilities.   Because
+        termcap  is  a  less expressive format than terminfo, some capabilities
+@@ -90,7 +90,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-11                     infotocap(1m)
++ncurses 6.5                       2024-07-27                     infotocap(1m)
+ 
                                                                                                                                
+ 
                                                                                                                                
+ 
                                                                                                                                  
+Index: doc/html/man/keyok.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/keyok.3x.html	2024-06-15 20:39:30.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/keyok.3x.html	2024-07-27 23:11:33.000000000 +0000
+@@ -28,19 +28,19 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey 1997
+-  * @Id: keyok.3x,v 1.46 2024/06/15 19:49:39 tom Exp @
++  * @Id: keyok.3x,v 1.48 2024/07/27 19:42:31 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-keyok 3x 2024-06-15 ncurses 6.5 Library calls
++keyok 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                  keyok 3x 2024-06-15 ncurses 6.5 Library calls
                                                                                                                                  
++
                                                                                                                                  keyok 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                  
+ 
                                                                                                                                  + keyok(3x)                        Library calls                       keyok(3x)
+ 
+@@ -61,8 +61,8 @@
+        The  keyok  ncurses extension permits a curses application to disable a
+        function key key-code returned by wgetch(3x) (wide-character API users:
+        wget_wch(3x)).   Key  codes  that have been disabled can be re-enabled.
+-       bf indicates the desired enablement status.   This  operation  is  more
+-       fine-grained than calling keypad(3x), which affects all function keys.
++       bf selects the desired enablement status.  This operation is more fine-
++       grained than calling keypad(3x), which affects all function keys.
+ 
+ 
+ 
                                                                                                                                  RETURN VALUE
                                                                                                                                  +@@ -85,7 +85,7 @@
+        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       NetBSD curses since 2.0 (2004) supports keyok.
++       NetBSD curses since 2.0 (2004) supports keyok.
+ 
+ 
+ 
                                                                                                                                  AUTHORS
                                                                                                                                  +@@ -97,7 +97,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-15                         keyok(3x)
++ncurses 6.5                       2024-07-27                         keyok(3x)
+ 
                                                                                                                                  
+ 
                                                                                                                                  
+ 
                                                                                                                                    
+Index: doc/html/man/legacy_coding.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/legacy_coding.3x.html	2024-04-27 18:38:48.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/legacy_coding.3x.html	2024-07-27 23:11:33.000000000 +0000
+@@ -28,19 +28,19 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey
+-  * @Id: legacy_coding.3x,v 1.28 2024/04/20 19:13:50 tom Exp @
++  * @Id: legacy_coding.3x,v 1.30 2024/07/27 19:44:30 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-legacy_coding 3x 2024-04-20 ncurses 6.5 Library calls
++legacy_coding 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                    legacy_coding 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                                                    
++
                                                                                                                                    legacy_coding 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                    
+ 
                                                                                                                                    + legacy_coding(3x)                Library calls               legacy_coding(3x)
+ 
+@@ -77,20 +77,27 @@
+ 
+ 
+ 
                                                                                                                                    RETURN VALUE
                                                                                                                                    +-       If the screen has not been initialized, or the level parameter  is  out
+-       of  range,  use_legacy_coding  returns  ERR.  Otherwise, it returns the
+-       previous level: 0, 1, or 2.
++       If the curses screen has not been initialized, or the  level  parameter
++       is  out of range, use_legacy_coding returns ERR.  Otherwise, it returns
++       the previous level.
++
++
++
                                                                                                                                    EXTENSIONS
                                                                                                                                    ++       use_legacy_coding is an ncurses extension.
+ 
+ 
+ 
                                                                                                                                    PORTABILITY
                                                                                                                                    +-       use_legacy_coding is specific to ncurses.   It  was  not  supported  on
+-       Version  7,  BSD  or  System V implementations.  Applications employing
+-       ncurses extensions should condition their use on the visibility of  the
+-       NCURSES_VERSION preprocessor macro.
++       Applications employing ncurses extensions should condition their use on
++       the visibility of the NCURSES_VERSION preprocessor macro.
++
++
++
                                                                                                                                    HISTORY
                                                                                                                                    ++       ncurses  5.6  (2006)  introduced use_legacy_coding to support lynx(1)'s
++       font-switching feature.
+ 
+ 
+ 
                                                                                                                                    AUTHORS
                                                                                                                                    +-       Thomas Dickey (to support lynx(1)'s font-switching feature).
++       Thomas Dickey
+ 
+ 
+ 
                                                                                                                                    SEE ALSO
                                                                                                                                    +@@ -98,7 +105,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                 legacy_coding(3x)
++ncurses 6.5                       2024-07-27                 legacy_coding(3x)
+ 
                                                                                                                                    
+ 
                                                                                                                                    
+ 
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/ncurses.3x.html	2024-07-20 22:19:06.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/ncurses.3x.html	2024-07-27 23:11:34.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: ncurses.3x,v 1.227 2024/07/20 20:48:52 tom Exp @
++  * @Id: ncurses.3x,v 1.229 2024/07/27 20:10:07 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-ncurses 3x 2024-07-20 ncurses 6.5 Library calls
++ncurses 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                    ncurses 3x 2024-07-20 ncurses 6.5 Library calls
                                                                                                                                    
++
                                                                                                                                    ncurses 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                    
+ 
                                                                                                                                    + ncurses(3x)                      Library calls                     ncurses(3x)
+ 
+@@ -61,7 +61,7 @@
+        terminals  with  output  optimized to minimize screen updates.  ncurses
+        replaces the curses libraries from System V Release 4 Unix ("SVr4") and
+        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
+-       document describes ncurses version 6.5 (patch 20240720).
++       document describes ncurses version 6.5 (patch 20240727).
+ 
+        ncurses permits control of the terminal screen's contents;  abstraction
+        and  subdivision thereof with windows and pads; acquisition of keyboard
+@@ -253,12 +253,12 @@
+ 
+        ncurses   is the library in its "non-wide" configuration, handling only
+                  eight-bit characters.  It stores a  character  combined  with
+-                 attributes and a color pair in a chtype datum, which is often
+-                 an alias of int.  A string of curses characters is similar to
+-                 a C char string; a chtype string ends with an integral 0, the
+-                 null curses character.
++                 attributes  and  a  color  pair identifier in a chtype datum,
++                 which  is  often  an  alias  of  int.   A  string  of  curses
++                 characters  is  similar  to  a C char string; a chtype string
++                 ends with an integral 0, the null curses character.
+ 
+-                 Attributes and a color pair selection (with no  corresponding
++                 Attributes and a color pair identifier (with no corresponding
+                  character)  can  be  stored  in variables of chtype or attr_t
+                  type.  In either case, they are accessed via an integral  bit
+                  mask.
+@@ -281,7 +281,9 @@
+                  function name contains "ch" or "str", prefix it with "_w"  to
+                  obtain  the  wide  counterpart.   For example, waddch becomes
+                  wadd_wch.  (Exceptions that add only  "w"  comprise  addwstr,
+-                 inwstr, and their variants.)
++                 inwstr,  and their variants.)  Another exception is ins_nwstr
++                 and  its  variants,  which  is  spelled   thus   instead   of
++                 "insn_wstr".
+ 
+                  This  convention  is  inapplicable  to some non-wide function
+                  names,  so  other  transformations  are  used  for  the  wide
+@@ -303,7 +305,7 @@
+                           characters  (see  below).   A  string   of   complex
+                           characters  ends with a cchar_t whose wchar_t member
+                           is the null wide character.  Attributes and a  color
+-                          pair  selection are stored in separate fields of the
++                          pair identifier are stored in separate fields of the
+                           structure,  not  combined  into  an  integer  as  in
+                           chtype.
+ 
+@@ -383,9 +385,9 @@
+                     def_prog_mode            curs_kernel(3x)
+                     def_shell_mode           curs_kernel(3x)
+                     define_key               define_key(3x)*
++
+                     del_curterm              curs_terminfo(3x)
+                     delay_output             curs_util(3x)
+-
+                     delch                    curs_delch(3x)
+                     deleteln                 curs_deleteln(3x)
+                     delscreen                curs_initscr(3x)
+@@ -450,9 +452,9 @@
+                     in_wch                   curs_in_wch(3x)
+                     in_wchnstr               curs_in_wchstr(3x)
+                     in_wchstr                curs_in_wchstr(3x)
++
+                     inch                     curs_inch(3x)
+                     inchnstr                 curs_inchstr(3x)
+-
+                     inchstr                  curs_inchstr(3x)
+                     init_color               curs_color(3x)
+                     init_extended_color      curs_color(3x)*
+@@ -517,9 +519,9 @@
+                     mvaddnstr                curs_addstr(3x)
+                     mvaddnwstr               curs_addwstr(3x)
+                     mvaddstr                 curs_addstr(3x)
++
+                     mvaddwstr                curs_addwstr(3x)
+                     mvchgat                  curs_attr(3x)
+-
+                     mvcur                    curs_kernel(3x)
+                     mvdelch                  curs_delch(3x)
+                     mvderwin                 curs_window(3x)
+@@ -584,9 +586,9 @@
+                     mvwins_wch               curs_ins_wch(3x)
+                     mvwins_wstr              curs_ins_wstr(3x)
+                     mvwinsch                 curs_insch(3x)
++
+                     mvwinsnstr               curs_insstr(3x)
+                     mvwinsstr                curs_insstr(3x)
+-
+                     mvwinstr                 curs_instr(3x)
+                     mvwinwstr                curs_inwstr(3x)
+                     mvwprintw                curs_printw(3x)
+@@ -651,9 +653,9 @@
+                     slk_attr_set             curs_slk(3x)
+                     slk_attroff              curs_slk(3x)
+                     slk_attron               curs_slk(3x)
++
+                     slk_attrset              curs_slk(3x)
+                     slk_clear                curs_slk(3x)
+-
+                     slk_color                curs_slk(3x)
+                     slk_init                 curs_slk(3x)
+                     slk_label                curs_slk(3x)
+@@ -718,9 +720,9 @@
+                     wadd_wchstr              curs_add_wchstr(3x)
+                     waddch                   curs_addch(3x)
+                     waddchnstr               curs_addchstr(3x)
++
+                     waddchstr                curs_addchstr(3x)
+                     waddnstr                 curs_addstr(3x)
+-
+                     waddnwstr                curs_addwstr(3x)
+                     waddstr                  curs_addstr(3x)
+                     waddwstr                 curs_addwstr(3x)
+@@ -785,9 +787,9 @@
+                     wprintw                  curs_printw(3x)
+                     wredrawln                curs_refresh(3x)
+                     wrefresh                 curs_refresh(3x)
++
+                     wresize                  wresize(3x)*
+                     wscanw                   curs_scanw(3x)
+-
+                     wscrl                    curs_scroll(3x)
+                     wsetscrreg               curs_outopts(3x)
+                     wstandend                curs_attr(3x)
+@@ -1497,7 +1499,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-20                       ncurses(3x)
++ncurses 6.5                       2024-07-27                       ncurses(3x)
+ 
                                                                                                                                    
+ 
                                                                                                                                    
+ 
                                                                                                                                      
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.5-20240720+/doc/html/man/terminfo.5.html	2024-07-20 22:19:06.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/terminfo.5.html	2024-07-27 23:11:34.000000000 +0000
+@@ -71,7 +71,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This document describes ncurses version 6.5 (patch 20240720).
++       This document describes ncurses version 6.5 (patch 20240727).
+ 
+ 
+

                                                                                                  terminfo Entry Syntax

                                                                                                  +Index: doc/html/man/wresize.3x.html
+--- ncurses-6.5-20240720+/doc/html/man/wresize.3x.html	2024-07-20 22:19:07.000000000 +0000
++++ ncurses-6.5-20240727/doc/html/man/wresize.3x.html	2024-07-27 23:11:34.000000000 +0000
+@@ -28,19 +28,19 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey 1996
+-  * @Id: wresize.3x,v 1.38 2024/07/20 22:13:21 tom Exp @
++  * @Id: wresize.3x,v 1.40 2024/07/27 20:08:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-wresize 3x 2024-07-20 ncurses 6.5 Library calls
++wresize 3x 2024-07-27 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                  wresize 3x 2024-07-20 ncurses 6.5 Library calls
                                                                                                  
++
                                                                                                  wresize 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                  
+ 
                                                                                                  + wresize(3x)                      Library calls                     wresize(3x)
+ 
+@@ -88,14 +88,14 @@
+        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       NetBSD  curses adopted wresize in 2001 (release 1.5.3), and PDCurses in
++       NetBSD  curses adopted wresize in 2001 (release 1.5.3), and PDCurses in
+        2004 (version 2.7).
+ 
+        It is not possible to resize windows with SVr4 curses.
+ 
+ 
+ 
                                                                                                  HISTORY
                                                                                                  +-       Thomas Dickey developed wresize as an extension to BSD curses in  1988,
++       Thomas Dickey developed wresize as an extension to BSD curses in  1988,
+        and brought it to ncurses in mid-1995.
+ 
+ 
+@@ -108,7 +108,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-20                       wresize(3x)
++ncurses 6.5                       2024-07-27                       wresize(3x)
+ 
                                                                                                  
+ 
                                                                                                  
+ 
                                                                                                    
+Index: form/frm_data.c
+Prereq:  1.21 
+--- ncurses-6.5-20240720+/form/frm_data.c	2021-06-17 21:11:08.000000000 +0000
++++ ncurses-6.5-20240727/form/frm_data.c	2024-07-27 18:35:02.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2010,2013 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -33,7 +33,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: frm_data.c,v 1.21 2021/06/17 21:11:08 tom Exp $")
++MODULE_ID("$Id: frm_data.c,v 1.22 2024/07/27 18:35:02 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnform
+@@ -54,7 +54,7 @@
+ 
+   if (form && (form->status & _POSTED) && form->current)
+     {
+-      FIELD *field;
++      const FIELD *field;
+ 
+       field = form->current;
+       if (!Single_Line_Field(field))
+@@ -141,7 +141,7 @@
+ 
+   if (form && (form->status & _POSTED) && form->current)
+     {
+-      FIELD *field;
++      const FIELD *field;
+       bool cursor_moved = FALSE;
+       int pos;
+ 
+Index: form/frm_driver.c
+Prereq:  1.135 
+--- ncurses-6.5-20240720+/form/frm_driver.c	2021-09-01 23:34:01.000000000 +0000
++++ ncurses-6.5-20240727/form/frm_driver.c	2024-07-27 18:49:18.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2018-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -33,7 +33,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: frm_driver.c,v 1.135 2021/09/01 23:34:01 tom Exp $")
++MODULE_ID("$Id: frm_driver.c,v 1.136 2024/07/27 18:49:18 tom Exp $")
+ 
+ /*----------------------------------------------------------------------------
+   This is the core module of the form library. It contains the majority
+@@ -313,7 +313,7 @@
+ 
+   while (LEGALYX(win, y, x))
+     {
+-      cchar_t *data = &(win->_line[y].text[x]);
++      const cchar_t *data = &(win->_line[y].text[x]);
+ 
+       if (isWidecBase(CHDEREF(data)) || !isWidecExt(CHDEREF(data)))
+ 	{
+@@ -387,7 +387,7 @@
+ Get_Start_Of_Data(FIELD_CELL *buf, int blen)
+ {
+   FIELD_CELL *p = buf;
+-  FIELD_CELL *end = &buf[blen];
++  const FIELD_CELL *end = &buf[blen];
+ 
+   assert(buf && blen >= 0);
+   while ((p < end) && ISBLANK(*p))
+@@ -429,7 +429,7 @@
+ Get_First_Whitespace_Character(FIELD_CELL *buf, int blen)
+ {
+   FIELD_CELL *p = buf;
+-  FIELD_CELL *end = &p[blen];
++  const FIELD_CELL *end = &p[blen];
+ 
+   assert(buf && blen >= 0);
+   while ((p < end) && !ISBLANK(*p))
+@@ -479,7 +479,7 @@
+ NCURSES_INLINE static void
+ Adjust_Cursor_Position(FORM *form, const FIELD_CELL *pos)
+ {
+-  FIELD *field;
++  const FIELD *field;
+   int idx;
+ 
+   field = form->current;
+@@ -716,7 +716,7 @@
+ 	  for (i = 0; i <= field->nbuf; i++)
+ 	    {
+ 	      FIELD_CELL *new_bp = Address_Of_Nth_Buffer(field, i);
+-	      FIELD_CELL *old_bp = oldbuf + i * (1 + old_buflen);
++	      const FIELD_CELL *old_bp = oldbuf + i * (1 + old_buflen);
+ 
+ 	      for (j = 0; j < old_buflen; ++j)
+ 		new_bp[j] = old_bp[j];
+@@ -830,7 +830,7 @@
+ FORM_EXPORT(int)
+ _nc_Position_Form_Cursor(FORM *form)
+ {
+-  FIELD *field;
++  const FIELD *field;
+   WINDOW *formwin;
+ 
+   if (!form)
+@@ -1005,7 +1005,7 @@
+ static void
+ Perform_Justification(FIELD *field, WINDOW *win)
+ {
+-  FIELD_CELL *bp;
++  const FIELD_CELL *bp;
+   int len;
+ 
+   bp = (Field_Has_Option(field, O_NO_LEFT_STRIP)
+@@ -1053,7 +1053,7 @@
+ static void
+ Undo_Justification(FIELD *field, WINDOW *win)
+ {
+-  FIELD_CELL *bp;
++  const FIELD_CELL *bp;
+   int y, x;
+   int len;
+ 
+@@ -1702,10 +1702,10 @@
+ static int
+ IFN_Next_Word(FORM *form)
+ {
+-  FIELD *field = form->current;
++  const FIELD *field = form->current;
+   FIELD_CELL *bp = Address_Of_Current_Position_In_Buffer(form);
+   FIELD_CELL *s;
+-  FIELD_CELL *t;
++  const FIELD_CELL *t;
+ 
+   T((T_CALLED("IFN_Next_Word(%p)"), (void *)form));
+ 
+@@ -1745,9 +1745,9 @@
+ IFN_Previous_Word(FORM *form)
+ {
+   FIELD *field = form->current;
+-  FIELD_CELL *bp = Address_Of_Current_Position_In_Buffer(form);
+-  FIELD_CELL *s;
+-  FIELD_CELL *t;
++  const FIELD_CELL *bp = Address_Of_Current_Position_In_Buffer(form);
++  const FIELD_CELL *s;
++  const FIELD_CELL *t;
+   bool again = FALSE;
+ 
+   T((T_CALLED("IFN_Previous_Word(%p)"), (void *)form));
+@@ -1845,7 +1845,7 @@
+ static int
+ IFN_Beginning_Of_Line(FORM *form)
+ {
+-  FIELD *field = form->current;
++  const FIELD *field = form->current;
+ 
+   T((T_CALLED("IFN_Beginning_Of_Line(%p)"), (void *)form));
+   Synchronize_Buffer(form);
+@@ -1869,7 +1869,7 @@
+ static int
+ IFN_End_Of_Line(FORM *form)
+ {
+-  FIELD *field = form->current;
++  const FIELD *field = form->current;
+   FIELD_CELL *pos;
+   FIELD_CELL *bp;
+ 
+@@ -2009,7 +2009,7 @@
+ static int
+ VSC_Generic(FORM *form, int nlines)
+ {
+-  FIELD *field = form->current;
++  const FIELD *field = form->current;
+   int res = E_REQUEST_DENIED;
+   int rows_to_go = (nlines > 0 ? nlines : -nlines);
+ 
+@@ -2189,7 +2189,7 @@
+ static int
+ HSC_Generic(FORM *form, int ncolumns)
+ {
+-  FIELD *field = form->current;
++  const FIELD *field = form->current;
+   int res = E_REQUEST_DENIED;
+   int cols_to_go = (ncolumns > 0 ? ncolumns : -ncolumns);
+ 
+@@ -2365,7 +2365,8 @@
+ Is_There_Room_For_A_Line(FORM *form)
+ {
+   FIELD *field = form->current;
+-  FIELD_CELL *begin_of_last_line, *s;
++  FIELD_CELL *begin_of_last_line;
++  const FIELD_CELL *s;
+ 
+   Synchronize_Buffer(form);
+   begin_of_last_line = Address_Of_Row_In_Buffer(field, (field->drows - 1));
+@@ -2419,7 +2420,7 @@
+ |                    E_SYSTEM_ERROR    - system error
+ +--------------------------------------------------------------------------*/
+ static int
+-Insert_String(FORM *form, int row, FIELD_CELL *txt, int len)
++Insert_String(FORM *form, int row, const FIELD_CELL *txt, int len)
+ {
+   FIELD *field = form->current;
+   FIELD_CELL *bp = Address_Of_Row_In_Buffer(field, row);
+@@ -2450,7 +2451,7 @@
+ 
+       if (row < (field->drows - 1))
+ 	{
+-	  FIELD_CELL *split;
++	  const FIELD_CELL *split;
+ 
+ 	  split =
+ 	    After_Last_Whitespace_Character(bp,
+@@ -2507,7 +2508,7 @@
+       (!Last_Row || Growable(field)))	/* there are more lines */
+     {
+       FIELD_CELL *bp;
+-      FIELD_CELL *split;
++      const FIELD_CELL *split;
+       int chars_to_be_wrapped;
+       int chars_to_remain_on_line;
+ 
+@@ -2633,7 +2634,7 @@
+ FE_New_Line(FORM *form)
+ {
+   FIELD *field = form->current;
+-  FIELD_CELL *bp, *t;
++  FIELD_CELL *bp;
+   bool Last_Row = ((field->drows - 1) == form->currow);
+ 
+   T((T_CALLED("FE_New_Line(%p)"), (void *)form));
+@@ -2682,6 +2683,7 @@
+ 	}
+       else
+ 	{
++	  const FIELD_CELL *t;
+ 	  bool May_Do_It = !Last_Row && Is_There_Room_For_A_Line(form);
+ 
+ 	  if (!(May_Do_It || Growable(field)))
+@@ -2810,7 +2812,7 @@
+ static int
+ FE_Delete_Previous(FORM *form)
+ {
+-  FIELD *field = form->current;
++  const FIELD *field = form->current;
+ 
+   T((T_CALLED("FE_Delete_Previous(%p)"), (void *)form));
+   if (First_Position_In_Current_Field(form))
+@@ -2818,7 +2820,8 @@
+ 
+   if ((--(form->curcol)) < 0)
+     {
+-      FIELD_CELL *this_line, *prev_line, *prev_end, *this_end;
++      FIELD_CELL *this_line, *prev_line;
++      const FIELD_CELL *prev_end, *this_end;
+       int this_row = form->currow;
+ 
+       form->curcol++;
+@@ -2898,9 +2901,9 @@
+ static int
+ FE_Delete_Word(FORM *form)
+ {
+-  FIELD *field = form->current;
++  const FIELD *field = form->current;
+   FIELD_CELL *bp = Address_Of_Current_Row_In_Buffer(form);
+-  FIELD_CELL *ep = bp + field->dcols;
++  const FIELD_CELL *ep = bp + field->dcols;
+   FIELD_CELL *cp = bp + form->curcol;
+   FIELD_CELL *s;
+ 
+@@ -4440,7 +4443,7 @@
+     {
+       MEVENT event;
+       WINDOW *win = form->win ? form->win : StdScreen(Get_Form_Screen(form));
+-      WINDOW *sub = form->sub ? form->sub : win;
++      const WINDOW *sub = form->sub ? form->sub : win;
+ 
+       getmouse(&event);
+       if ((event.bstate & (BUTTON1_CLICKED |
+@@ -4641,7 +4644,7 @@
+     {
+       MEVENT event;
+       WINDOW *win = form->win ? form->win : StdScreen(Get_Form_Screen(form));
+-      WINDOW *sub = form->sub ? form->sub : win;
++      const WINDOW *sub = form->sub ? form->sub : win;
+ 
+       getmouse(&event);
+       if ((event.bstate & (BUTTON1_CLICKED |
+@@ -4935,7 +4938,7 @@
+ _nc_Widen_String(char *source, int *lengthp)
+ {
+   wchar_t *result = 0;
+-  wchar_t wch;
++  wchar_t wch = 0;
+   size_t given = strlen(source);
+   size_t tries;
+   int pass;
+Index: form/frm_post.c
+Prereq:  1.14 
+--- ncurses-6.5-20240720+/form/frm_post.c	2020-05-24 01:40:20.000000000 +0000
++++ ncurses-6.5-20240727/form/frm_post.c	2024-07-27 18:35:02.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2010,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -33,7 +33,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: frm_post.c,v 1.14 2020/05/24 01:40:20 anonymous.maarten Exp $")
++MODULE_ID("$Id: frm_post.c,v 1.15 2024/07/27 18:35:02 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnform
+@@ -51,7 +51,7 @@
+ FORM_EXPORT(int)
+ post_form(FORM *form)
+ {
+-  WINDOW *formwin;
++  const WINDOW *formwin;
+   int err;
+   int page;
+ 
+Index: form/frm_sub.c
+Prereq:  1.15 
+--- ncurses-6.5-20240720+/form/frm_sub.c	2021-06-17 21:20:30.000000000 +0000
++++ ncurses-6.5-20240727/form/frm_sub.c	2024-07-27 18:35:02.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -33,7 +33,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: frm_sub.c,v 1.15 2021/06/17 21:20:30 tom Exp $")
++MODULE_ID("$Id: frm_sub.c,v 1.16 2024/07/27 18:35:02 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnform
+@@ -54,9 +54,8 @@
+   else
+     {
+ #if NCURSES_SP_FUNCS
+-      FORM *f = Normalize_Form(form);
+-
+-      f->sub = win ? win : StdScreen(Get_Form_Screen(f));
++      (void) Normalize_Form(form);
++      form->sub = win ? win : StdScreen(Get_Form_Screen(form));
+       RETURN(E_OK);
+ #else
+       Normalize_Form(form)->sub = win;
+@@ -76,12 +75,10 @@
+ FORM_EXPORT(WINDOW *)
+ form_sub(const FORM *form)
+ {
+-  const FORM *f;
+-
+   T((T_CALLED("form_sub(%p)"), (const void *)form));
+ 
+-  f = Normalize_Form(form);
+-  returnWin(Get_Form_Window(f));
++  (void) Normalize_Form(form);
++  returnWin(Get_Form_Window(form));
+ }
+ 
+ /* frm_sub.c ends here */
+Index: form/frm_win.c
+Prereq:  1.19 
+--- ncurses-6.5-20240720+/form/frm_win.c	2021-06-17 21:20:30.000000000 +0000
++++ ncurses-6.5-20240727/form/frm_win.c	2024-07-27 18:35:02.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -33,7 +33,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: frm_win.c,v 1.19 2021/06/17 21:20:30 tom Exp $")
++MODULE_ID("$Id: frm_win.c,v 1.20 2024/07/27 18:35:02 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnform
+@@ -54,9 +54,8 @@
+   else
+     {
+ #if NCURSES_SP_FUNCS
+-      FORM *f = Normalize_Form(form);
+-
+-      f->win = win ? win : StdScreen(Get_Form_Screen(f));
++      (void) Normalize_Form(form);
++      form->win = win ? win : StdScreen(Get_Form_Screen(form));
+       RETURN(E_OK);
+ #else
+       Normalize_Form(form)->win = win;
+@@ -77,15 +76,14 @@
+ form_win(const FORM *form)
+ {
+   WINDOW *result;
+-  const FORM *f;
+ 
+   T((T_CALLED("form_win(%p)"), (const void *)form));
+ 
+-  f = Normalize_Form(form);
++  (void) Normalize_Form(form);
+ #if NCURSES_SP_FUNCS
+-  result = (f->win ? f->win : StdScreen(Get_Form_Screen(f)));
++  result = (form->win ? form->win : StdScreen(Get_Form_Screen(form)));
+ #else
+-  result = (f->win ? f->win : stdscr);
++  result = (form->win ? form->win : stdscr);
+ #endif
+   returnWin(result);
+ }
+Index: form/fty_enum.c
+Prereq:  1.33 
+--- ncurses-6.5-20240720+/form/fty_enum.c	2021-06-17 21:11:08.000000000 +0000
++++ ncurses-6.5-20240727/form/fty_enum.c	2024-07-27 18:50:22.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020,2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -35,7 +35,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fty_enum.c,v 1.33 2021/06/17 21:11:08 tom Exp $")
++MODULE_ID("$Id: fty_enum.c,v 1.34 2024/07/27 18:50:22 tom Exp $")
+ 
+ typedef struct
+   {
+@@ -291,21 +291,21 @@
+   char **kwds = ((const enumARG *)argp)->kwds;
+   bool ccase = ((const enumARG *)argp)->checkcase;
+   bool unique = ((const enumARG *)argp)->checkunique;
+-  unsigned char *bp = (unsigned char *)field_buffer(field, 0);
+-  char *s, *t, *p;
++  const unsigned char *bp = (unsigned char *)field_buffer(field, 0);
++  const char *s, *t, *p;
+ 
+   while (kwds && (s = (*kwds++)))
+     {
+       int res;
+ 
+-      if ((res = Compare((unsigned char *)s, bp, ccase)) != NOMATCH)
++      if ((res = Compare((const unsigned char *)s, bp, ccase)) != NOMATCH)
+ 	{
+ 	  p = t = s;		/* t is at least a partial match */
+ 	  if ((unique && res != EXACT))
+ 	    {
+ 	      while (kwds && (p = *kwds++))
+ 		{
+-		  if ((res = Compare((unsigned char *)p, bp, ccase)) != NOMATCH)
++		  if ((res = Compare((const unsigned char *)p, bp, ccase)) != NOMATCH)
+ 		    {
+ 		      if (res == EXACT)
+ 			{
+@@ -313,7 +313,7 @@
+ 			  break;
+ 			}
+ 		      else
+-			t = (char *)0;
++			t = NULL;
+ 		    }
+ 		}
+ 	    }
+@@ -347,12 +347,13 @@
+ {
+   const enumARG *args = (const enumARG *)argp;
+   char **kwds = args->kwds;
+-  bool ccase = args->checkcase;
+-  int cnt = args->count;
+-  unsigned char *bp = (unsigned char *)field_buffer(field, 0);
++  const unsigned char *bp = (const unsigned char *)field_buffer(field, 0);
+ 
+   if (kwds)
+     {
++      int cnt = args->count;
++      bool ccase = args->checkcase;
++
+       while (cnt--)
+ 	{
+ 	  if (Compare((unsigned char *)(*kwds++), bp, ccase) == EXACT)
+@@ -386,26 +387,25 @@
+   const enumARG *args = (const enumARG *)argp;
+   int cnt = args->count;
+   char **kwds = &args->kwds[cnt - 1];
++  const unsigned char *bp = (const unsigned char *)field_buffer(field, 0);
++
+   bool ccase = args->checkcase;
+-  unsigned char *bp = (unsigned char *)field_buffer(field, 0);
+ 
+-  if (kwds)
++  while (cnt--)
+     {
+-      while (cnt--)
+-	{
+-	  if (Compare((unsigned char *)(*kwds--), bp, ccase) == EXACT)
+-	    break;
+-	}
++      if (Compare((unsigned char *)(*kwds--), bp, ccase) == EXACT)
++	break;
++    }
+ 
+-      if (cnt <= 0)
+-	kwds = &args->kwds[args->count - 1];
++  if (cnt <= 0)
++    kwds = &args->kwds[args->count - 1];
+ 
+-      if ((cnt >= 0) || (Compare((const unsigned char *)dummy, bp, ccase) == EXACT))
+-	{
+-	  set_field_buffer(field, 0, *kwds);
+-	  return TRUE;
+-	}
++  if ((cnt >= 0) || (Compare((const unsigned char *)dummy, bp, ccase) == EXACT))
++    {
++      set_field_buffer(field, 0, *kwds);
++      return TRUE;
+     }
++
+   return FALSE;
+ }
+ 
+Index: form/fty_generic.c
+Prereq:  1.15 
+--- ncurses-6.5-20240720+/form/fty_generic.c	2021-03-27 23:49:53.000000000 +0000
++++ ncurses-6.5-20240727/form/fty_generic.c	2024-07-27 18:51:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2018-2021,2024 Thomas E. Dickey                                *
+  * Copyright 2008-2012,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -35,7 +35,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fty_generic.c,v 1.15 2021/03/27 23:49:53 tom Exp $")
++MODULE_ID("$Id: fty_generic.c,v 1.16 2024/07/27 18:51:24 tom Exp $")
+ 
+ /*
+  * This is not a full implementation of a field type, but adds some
+@@ -231,7 +231,7 @@
+ 
+   if (field)
+     {
+-      if (field && field->type)
++      if (field->type)
+ 	_nc_Free_Type(field);
+ 
+       field->type = ftyp;
+Index: form/fty_int.c
+Prereq:  1.33 
+--- ncurses-6.5-20240720+/form/fty_int.c	2021-06-17 21:11:08.000000000 +0000
++++ ncurses-6.5-20240727/form/fty_int.c	2024-07-27 18:35:02.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020,2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2010,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -35,7 +35,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fty_int.c,v 1.33 2021/06/17 21:11:08 tom Exp $")
++MODULE_ID("$Id: fty_int.c,v 1.34 2024/07/27 18:35:02 tom Exp $")
+ 
+ #if USE_WIDEC_SUPPORT
+ #define isDigit(c) (iswdigit((wint_t)(c)) || isdigit(UChar(c)))
+@@ -73,7 +73,7 @@
+ Generic_This_Type(void *arg)
+ {
+   thisARG *argp = (thisARG *)0;
+-  thisARG *param = (thisARG *)arg;
++  const thisARG *param = (thisARG *)arg;
+ 
+   if (param)
+     {
+@@ -169,7 +169,7 @@
+   long high = argi->high;
+   int prec = argi->precision;
+   unsigned char *bp = (unsigned char *)field_buffer(field, 0);
+-  char *s = (char *)bp;
++  const char *s = (char *)bp;
+   bool result = FALSE;
+ 
+   while (*bp == ' ')
+Index: form/fty_num.c
+Prereq:  1.37 
+--- ncurses-6.5-20240720+/form/fty_num.c	2021-03-27 23:49:58.000000000 +0000
++++ ncurses-6.5-20240727/form/fty_num.c	2024-07-27 18:33:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2019-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2010,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -35,7 +35,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fty_num.c,v 1.37 2021/03/27 23:49:58 tom Exp $")
++MODULE_ID("$Id: fty_num.c,v 1.38 2024/07/27 18:33:58 tom Exp $")
+ 
+ #if HAVE_LOCALE_H
+ #include 
+@@ -84,7 +84,7 @@
+ Generic_This_Type(void *arg)
+ {
+   thisARG *argn = (thisARG *)0;
+-  thisPARM *args = (thisPARM *)arg;
++  const thisPARM *args = (thisPARM *)arg;
+ 
+   if (args)
+     {
+@@ -187,8 +187,8 @@
+   double high = argn->high;
+   int prec = argn->precision;
+   unsigned char *bp = (unsigned char *)field_buffer(field, 0);
+-  char *s = (char *)bp;
+-  struct lconv *L = argn->L;
++  const char *s = (char *)bp;
++  const struct lconv *L = argn->L;
+   bool result = FALSE;
+ 
+   while (*bp == ' ')
+Index: include/capdefaults.c
+Prereq:  1.16 
+--- ncurses-6.5-20240720+/include/capdefaults.c	2021-09-04 10:52:55.000000000 +0000
++++ ncurses-6.5-20240727/include/capdefaults.c	2024-07-27 19:19:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2000,2008 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -33,7 +33,7 @@
+  *     and: Thomas E. Dickey                        1996-on                 *
+  ****************************************************************************/
+ 
+-/* $Id: capdefaults.c,v 1.16 2021/09/04 10:52:55 tom Exp $ */
++/* $Id: capdefaults.c,v 1.17 2024/07/27 19:19:23 tom Exp $ */
+ 
+     /*
+      * Compute obsolete capabilities.  The reason this is an include file is
+@@ -45,7 +45,7 @@
+      * postprocess_termcap().
+      */
+ {
+-    char *strp;
++    const char *strp;
+     short capval;
+ 
+ #define EXTRACT_DELAY(str) \
+Index: man/curs_add_wch.3x
+Prereq:  1.69 
+--- ncurses-6.5-20240720+/man/curs_add_wch.3x	2024-07-20 21:42:38.000000000 +0000
++++ ncurses-6.5-20240727/man/curs_add_wch.3x	2024-07-27 20:05:18.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_add_wch.3x,v 1.69 2024/07/20 21:42:38 tom Exp $
+-.TH curs_add_wch 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_add_wch.3x,v 1.71 2024/07/27 20:05:18 tom Exp $
++.TH curs_add_wch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -534,10 +534,11 @@
+ and
+ .I \%wechowchar
+ (and the usual variants).
++.\" SVID 4, vol 3., p. 475
+ These were later additions to
+ .RI SVr4. x ,
+ not appearing in the first SVr4 (1989).
+-They differed from X/Open's
++They differed from X/Open's later
+ .I \%wadd_wch
+ and
+ .I \%wecho_wchar
+Index: man/curs_add_wchstr.3x
+Prereq:  1.42 
+--- ncurses-6.5-20240720+/man/curs_add_wchstr.3x	2024-06-22 21:26:27.000000000 +0000
++++ ncurses-6.5-20240727/man/curs_add_wchstr.3x	2024-07-27 20:05:18.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_add_wchstr.3x,v 1.42 2024/06/22 21:26:27 tom Exp $
+-.TH curs_add_wchstr 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_add_wchstr.3x,v 1.44 2024/07/27 20:05:18 tom Exp $
++.TH curs_add_wchstr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -46,27 +46,27 @@
+ ..
+ .SH NAME
+ \fB\%add_wchstr\fP,
+-\fB\%add_wchnstr\fP,
+ \fB\%wadd_wchstr\fP,
+-\fB\%wadd_wchnstr\fP,
+ \fB\%mvadd_wchstr\fP,
+-\fB\%mvadd_wchnstr\fP,
+ \fB\%mvwadd_wchstr\fP,
++\fB\%add_wchnstr\fP,
++\fB\%wadd_wchnstr\fP,
++\fB\%mvadd_wchnstr\fP,
+ \fB\%mvwadd_wchnstr\fP \-
+ add a \fIcurses\fR complex character string to a window
+ .SH SYNOPSIS
+ .nf
+ \fB#include 
+ .PP
+-\fBint add_wchstr(const cchar_t *\fIwchstr\fP);
+-\fBint wadd_wchstr(WINDOW * \fIwin\fP, const cchar_t *\fIwchstr\fP);
+-\fBint mvadd_wchstr(int \fIy\fP, int \fIx\fP, const cchar_t *\fIwchstr\fP);
+-\fBint mvwadd_wchstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t *\fIwchstr\fP);
++\fBint add_wchstr(const cchar_t * \fIwchstr\fP);
++\fBint wadd_wchstr(WINDOW *  \fIwin\fP, const cchar_t * \fIwchstr\fP);
++\fBint mvadd_wchstr(int \fIy\fP, int \fIx\fP, const cchar_t * \fIwchstr\fP);
++\fBint mvwadd_wchstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t * \fIwchstr\fP);
+ .PP
+-\fBint add_wchnstr(const cchar_t *\fIwchstr\fP, int \fIn\fP);
+-\fBint wadd_wchnstr(WINDOW * \fIwin\fP, const cchar_t *\fIwchstr\fP, int \fIn\fP);
+-\fBint mvadd_wchnstr(int \fIy\fP, int \fIx\fP, const cchar_t *\fIwchstr\fP, int \fIn\fP);
+-\fBint mvwadd_wchnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t *\fIwchstr\fP, int \fIn\fP);
++\fBint add_wchnstr(const cchar_t * \fIwchstr\fP, int \fIn\fP);
++\fBint wadd_wchnstr(WINDOW *  \fIwin\fP, const cchar_t * \fIwchstr\fP, int \fIn\fP);
++\fBint mvadd_wchnstr(int \fIy\fP, int \fIx\fP, const cchar_t * \fIwchstr\fP, int \fIn\fP);
++\fBint mvwadd_wchnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t * \fIwchstr\fP, int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
+ .B \%wadd_wchstr
+@@ -75,7 +75,7 @@
+ to the window
+ .IR win "."
+ A null complex character terminates the string.
+-If a complex character does completely fit at the end of the line,
++If a complex character does not completely fit at the end of the line,
+ .I curses
+ fills the remaining columns with the window background;
+ see \fB\%bkgrnd\fP(3X).
+@@ -112,9 +112,9 @@
+ .B ERR
+ on failure.
+ .PP
+-X/Open Curses does not specify any error conditions.
+-.I \%ncurses
+-returns
++In
++.IR \%ncurses ","
++they return
+ .B ERR
+ if
+ .bP
+@@ -139,6 +139,7 @@
+ .SH PORTABILITY
+ X/Open Curses,
+ Issue 4 describes these functions.
++It specifies no error conditions for them.
+ .SH HISTORY
+ These functions were initially specified by X/Open Curses,
+ Issue 4.
+@@ -149,10 +150,11 @@
+ and
+ .I \%waddwchnstr
+ (and the usual variants).
++.\" SVID 4, vol 3., p. 477
+ These were later additions to
+ .RI SVr4. x ,
+ not appearing in the first SVr4 (1989).
+-They differed from X/Open's
++They differed from X/Open's later
+ .I \%wadd_wchstr
+ and
+ .I \%wadd_wchnstr
+Index: man/curs_addch.3x
+Prereq:  1.96 
+--- ncurses-6.5-20240720+/man/curs_addch.3x	2024-07-20 21:42:38.000000000 +0000
++++ ncurses-6.5-20240727/man/curs_addch.3x	2024-07-27 20:08:58.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addch.3x,v 1.96 2024/07/20 21:42:38 tom Exp $
+-.TH curs_addch 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addch.3x,v 1.98 2024/07/27 20:08:58 tom Exp $
++.TH curs_addch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -470,12 +470,13 @@
+ .bP
+ If it can,
+ call either
+-.B \%waddch
+-or \fB\%wadd_wch\fP(3X).
++.I \%waddch
++or
++.IR \%wadd_wch "."
+ .bP
+ If it cannot,
+ use only
+-\fB\%wadd_wch\fP(3X).
++.IR \%wadd_wch "."
+ .SH HISTORY
+ 4BSD (1980)
+ .I curses
+Index: man/curs_addchstr.3x
+Prereq:  1.48 
+--- ncurses-6.5-20240720+/man/curs_addchstr.3x	2024-06-01 22:29:08.000000000 +0000
++++ ncurses-6.5-20240727/man/curs_addchstr.3x	2024-07-27 20:05:41.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addchstr.3x,v 1.48 2024/06/01 22:29:08 tom Exp $
+-.TH curs_addchstr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addchstr.3x,v 1.50 2024/07/27 20:05:41 tom Exp $
++.TH curs_addchstr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -46,27 +46,27 @@
+ ..
+ .SH NAME
+ \fB\%addchstr\fP,
+-\fB\%addchnstr\fP,
+ \fB\%waddchstr\fP,
+-\fB\%waddchnstr\fP,
+ \fB\%mvaddchstr\fP,
+-\fB\%mvaddchnstr\fP,
+ \fB\%mvwaddchstr\fP,
++\fB\%addchnstr\fP,
++\fB\%waddchnstr\fP,
++\fB\%mvaddchnstr\fP,
+ \fB\%mvwaddchnstr\fP \-
+ add a \fIcurses\fR character string to a window
+ .SH SYNOPSIS
+ .nf
+ \fB#include 
+ .PP
+-\fBint addchstr(const chtype *\fIchstr\fP);
+-\fBint waddchstr(WINDOW *\fIwin\fP, const chtype *\fIchstr\fP);
+-\fBint mvaddchstr(int \fIy\fP, int \fIx\fP, const chtype *\fIchstr\fP);
+-\fBint mvwaddchstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype *\fIchstr\fP);
++\fBint addchstr(const chtype * \fIchstr\fP);
++\fBint waddchstr(WINDOW * \fIwin\fP, const chtype * \fIchstr\fP);
++\fBint mvaddchstr(int \fIy\fP, int \fIx\fP, const chtype * \fIchstr\fP);
++\fBint mvwaddchstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype * \fIchstr\fP);
+ .PP
+-\fBint addchnstr(const chtype *\fIchstr\fP, int \fIn\fP);
+-\fBint waddchnstr(WINDOW *\fIwin\fP, const chtype *\fIchstr\fP, int \fIn\fP);
+-\fBint mvaddchnstr(int \fIy\fP, int \fIx\fP, const chtype *\fIchstr\fP, int \fIn\fP);
+-\fBint mvwaddchnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype *\fIchstr\fP, int \fIn\fP);
++\fBint addchnstr(const chtype * \fIchstr\fP, int \fIn\fP);
++\fBint waddchnstr(WINDOW * \fIwin\fP, const chtype * \fIchstr\fP, int \fIn\fP);
++\fBint mvaddchnstr(int \fIy\fP, int \fIx\fP, const chtype * \fIchstr\fP, int \fIn\fP);
++\fBint mvwaddchnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype * \fIchstr\fP, int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
+ .B \%waddchstr
+@@ -112,9 +112,9 @@
+ .B ERR
+ on failure.
+ .PP
+-X/Open Curses does not specify any error conditions.
+-.I \%ncurses
+-returns
++In
++.IR \%ncurses ","
++they return
+ .B ERR
+ if
+ .bP
+@@ -139,6 +139,13 @@
+ .SH PORTABILITY
+ X/Open Curses,
+ Issue 4 describes these functions.
++It specifies no error conditions for them.
++.SH HISTORY
++SVr3.1 (1987)
++introduced
++.I \%waddchstr
++and
++.IR \%waddchnstr "."
+ .SH SEE ALSO
+ \fB\%curs_add_wchstr\fP(3X) describes comparable functions of the
+ .I \%ncurses
+Index: man/curs_addstr.3x
+Prereq:  1.53 
+--- ncurses-6.5-20240720+/man/curs_addstr.3x	2024-07-20 20:49:44.000000000 +0000
++++ ncurses-6.5-20240727/man/curs_addstr.3x	2024-07-27 19:48:04.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addstr.3x,v 1.53 2024/07/20 20:49:44 tom Exp $
+-.TH curs_addstr 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addstr.3x,v 1.55 2024/07/27 19:48:04 tom Exp $
++.TH curs_addstr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -46,12 +46,12 @@
+ ..
+ .SH NAME
+ \fB\%addstr\fP,
+-\fB\%addnstr\fP,
+ \fB\%waddstr\fP,
+-\fB\%waddnstr\fP,
+ \fB\%mvaddstr\fP,
+-\fB\%mvaddnstr\fP,
+ \fB\%mvwaddstr\fP,
++\fB\%addnstr\fP,
++\fB\%waddnstr\fP,
++\fB\%mvaddnstr\fP,
+ \fB\%mvwaddnstr\fP \-
+ add a string to a \fIcurses\fR window and advance the cursor
+ .SH SYNOPSIS
+@@ -59,14 +59,14 @@
+ \fB#include 
+ .PP
+ \fBint addstr(const char * \fIstr\fP);
++\fBint waddstr(WINDOW * \fIwin\fP, const char * \fIstr\fP);
+ \fBint mvaddstr(int \fIy\fP, int \fIx\fP, const char * \fIstr\fP);
+ \fBint mvwaddstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const char * \fIstr\fP);
+-\fBint waddstr(WINDOW * \fIwin\fP, const char * \fIstr\fP);
+ .PP
+ \fBint addnstr(const char * \fIstr\fP, int \fIn\fP);
++\fBint waddnstr(WINDOW * \fIwin\fP, const char * \fIstr\fP, int \fIn\fP);
+ \fBint mvaddnstr(int \fIy\fP, int \fIx\fP, const char * \fIstr\fP, int \fIn\fP);
+ \fBint mvwaddnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const char * \fIstr\fP, int \fIn\fP);
+-\fBint waddnstr(WINDOW * \fIwin\fP, const char * \fIstr\fP, int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
+ .B waddstr
+Index: man/curs_addwstr.3x
+Prereq:  1.43 
+--- ncurses-6.5-20240720+/man/curs_addwstr.3x	2024-07-20 20:53:20.000000000 +0000
++++ ncurses-6.5-20240727/man/curs_addwstr.3x	2024-07-27 20:05:18.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addwstr.3x,v 1.43 2024/07/20 20:53:20 tom Exp $
+-.TH curs_addwstr 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addwstr.3x,v 1.45 2024/07/27 20:05:18 tom Exp $
++.TH curs_addwstr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -46,12 +46,12 @@
+ ..
+ .SH NAME
+ \fB\%addwstr\fP,
+-\fB\%addnwstr\fP,
+ \fB\%waddwstr\fP,
+-\fB\%waddnwstr\fP,
+ \fB\%mvaddwstr\fP,
+-\fB\%mvaddnwstr\fP,
+ \fB\%mvwaddwstr\fP,
++\fB\%addnwstr\fP,
++\fB\%waddnwstr\fP,
++\fB\%mvaddnwstr\fP,
+ \fB\%mvwaddnwstr\fP \-
+ add a wide-character string to a \fIcurses\fR window and advance the cursor
+ .SH SYNOPSIS
+@@ -59,14 +59,14 @@
+ \fB#include 
+ .PP
+ \fBint addwstr(const wchar_t * \fIwstr\fP);
++\fBint waddwstr(WINDOW * \fIwin\fP, const wchar_t * \fIwstr\fP);
+ \fBint mvaddwstr(int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP);
+ \fBint mvwaddwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP);
+-\fBint waddwstr(WINDOW * \fIwin\fP, const wchar_t * \fIwstr\fP);
+ .PP
+ \fBint addnwstr(const wchar_t * \fIwstr\fP, int \fIn\fP);
++\fBint waddnwstr(WINDOW * \fIwin\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
+ \fBint mvaddnwstr(int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
+ \fBint mvwaddnwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
+-\fBint waddnwstr(WINDOW * \fIwin\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
+ .B waddwstr
+@@ -140,11 +140,17 @@
+ X/Open Curses,
+ Issue 4 describes these functions.
+ .SH HISTORY
+-.I \%waddstr
++The System\ V Interface Definition,
++Version 4 (1995),
++specified
++.I \%waddwstr
+ and
+-.I \%waddnstr
+-appeared late in SVr4 development (1995).
++.I \%waddnwstr
++(and the usual variants).
+ .\" SVID 4, vol 3., p. 478
++These were later additions to
++.RI SVr4. x ,
++not appearing in the first SVr4 (1989).
+ .SH SEE ALSO
+ \fB\%curs_addstr\fP(3X) describes comparable functions of the
+ .I \%ncurses
+Index: man/curs_attr.3x
+Prereq:  1.108 
+--- ncurses-6.5-20240720+/man/curs_attr.3x	2024-05-25 20:10:58.000000000 +0000
++++ ncurses-6.5-20240727/man/curs_attr.3x	2024-07-27 19:57:55.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_attr.3x,v 1.108 2024/05/25 20:10:58 tom Exp $
+-.TH curs_attr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_attr.3x,v 1.110 2024/07/27 19:57:55 tom Exp $
++.TH curs_attr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -156,8 +156,12 @@
+ These newer routines use similar names, because
+ X/Open simply added an underscore (\fB_\fP) for the newer names.
+ .PP
+-The \fBint\fP datatype used in the legacy routines is treated as if
+-it is the same size as \fBchtype\fP (used by \fBaddch\fP(3X)).
++The
++.I int
++datatype used in the legacy routines is treated as if
++it is the same size as
++.I \%chtype
++(used by \fBaddch\fP(3X)).
+ It holds the common video attributes (such as bold, reverse),
+ as well as a few bits for color.
+ Those bits correspond to the \fBA_COLOR\fP symbol.
+@@ -177,12 +181,16 @@
+ However, if the value does not fit, then the \fBCOLOR_PAIR\fP macro
+ uses only the bits that fit.
+ For example,
+-because in \fI\%ncurses\fP \fBA_COLOR\fP has eight (8) bits,
++because in
++.I \%ncurses
++\fBA_COLOR\fP has eight (8) bits,
+ 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
+-(or \fBchtype\fP).
++The \fBPAIR_NUMBER\fP macro extracts a pair number from an
++.I int
++(or
++.IR \%chtype ")."
+ For example, the \fIinput\fP and \fIoutput\fP values in these statements
+ would be the same:
+ .PP
+@@ -193,17 +201,24 @@
+ .EE
+ .RE
+ .PP
+-The \fBattrset\fP routine is a legacy feature predating SVr4 curses
+-but kept in X/Open Curses for the same reason that SVr4 curses kept it:
++The \fBattrset\fP routine is a legacy feature predating SVr4
++.I curses
++but kept in X/Open Curses for the same reason that SVr4
++.I curses
++kept it:
+ compatibility.
+ .PP
+ 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.
++\fBattr_\fP* functions, except that they take arguments of type
++.I int
++rather than
++.IR \%attr_t "."
+ .PP
+ There is no corresponding \fB\%attrget\fP function as such
+ in X/Open Curses,
+-although \fI\%ncurses\fP provides \fB\%getattrs\fP
++although
++.I \%ncurses
++provides \fB\%getattrs\fP
+ (see \fB\%curs_legacy\fP(3X)).
+ .\" ---------------------------------------------------------------------------
+ .SS "Change Character Rendition"
+@@ -304,23 +319,38 @@
+ The SVr4 manual page claims (falsely) that these routines always return \fB1\fP.
+ .\" ---------------------------------------------------------------------------
+ .SH RETURN VALUE
+-All routines return the integer \fBOK\fP on success, or \fBERR\fP on failure.
+-.PP
+-X/Open Curses does not specify any error conditions.
++These functions return
++.B OK
++on success and
++.B ERR
++on failure.
+ .PP
+-This implementation
+-.bP
+-returns
++In
++.IR \%ncurses ","
++they return
+ .B ERR
+-if the window pointer is null.
+-.bP
++if
++.I win
++is
++.BR NULL "."
++.PP
++.B \%wcolor_set
+ returns
+ .B ERR
+-if the color pair parameter
+-for \fBwcolor_set\fP is outside the range 0..COLOR_PAIRS\-1.
+-.bP
+-does not fail if either of the parameters of \fBwattr_get\fP
+-used for retrieving attribute or color pair values is \fBNULL\fP.
++if
++.I pair
++is outside the range
++.BR 0 .\|. COLOR_PAIRS\-1 .
++.PP
++.B \%wattr_get
++does
++.I not
++fail if its
++.I \%attrs
++or
++.I \%pair
++parameter is
++.BR NULL "."
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+@@ -340,9 +370,13 @@
+ number is less than 256.
+ The alternate functions such as \fBcolor_set\fP can pass a color pair
+ value directly.
+-However, \fI\%ncurses\fP ABI 4 and 5 simply OR this value
++However,
++.I \%ncurses
++ABI 4 and 5 simply OR this value
+ within the alternate functions.
+-You must use \fI\%ncurses\fP ABI 6 to support more than 256 color pairs.
++You must use
++.I \%ncurses
++ABI 6 to support more than 256 color pairs.
+ .\" ---------------------------------------------------------------------------
+ .SH EXTENSIONS
+ This implementation provides the \fBA_ITALIC\fP attribute for terminals
+@@ -362,15 +396,24 @@
+ .bP
+ For functions which modify the color, e.g.,
+ \fBwattr_set\fP and \fBwattr_on\fP,
+-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 \fIpair\fP parameter.
++if \fIopts\fP is set it is treated as a pointer to
++.IR int ","
++and used to set the color pair instead of the
++.I short
++.I pair
++parameter.
+ .bP
+ For functions which retrieve the color, e.g.,
+ \fBwattr_get\fP,
+-if \fIopts\fP is set it is treated as a pointer to \fBint\fP,
+-and used to retrieve the color pair as an \fBint\fP value,
++if \fIopts\fP is set it is treated as a pointer to
++.IR int ","
++and used to retrieve the color pair as an
++.I int
++value,
+ in addition to
+-retrieving it via the standard pointer to \fBshort\fP parameter.
++retrieving it via the standard pointer to
++.I short
++parameter.
+ .bP
+ For functions which turn attributes off, e.g.,
+ \fBwattr_off\fP,
+@@ -379,9 +422,15 @@
+ .\" ---------------------------------------------------------------------------
+ .SH PORTABILITY
+ These functions are described in X/Open Curses, Issue 4.
++It specifies no error conditions for them.
++.PP
+ The standard defined the dedicated type for highlights,
+-\fBattr_t\fP, which was not defined in SVr4 curses.
+-The functions taking \fBattr_t\fP arguments were not supported under SVr4.
++.IR \%attr_t ","
++which was not defined in SVr4
++.IR curses "."
++The functions taking
++.I \%attr_t
++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.
+@@ -392,7 +441,9 @@
+ \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
++SVr4
++.IR curses ","
++these functions correctly manipulate all other highlights
+ (specifically, \fBA_ALTCHARSET\fP, \fBA_PROTECT\fP, and \fBA_INVIS\fP).
+ .PP
+ X/Open Curses added these entry points:
+@@ -437,18 +488,29 @@
+ .bP
+ However, in some implementations, those symbols have unrelated values.
+ .IP
+-For example, the Solaris \fIxpg4\fP (X/Open) curses declares
+-\fBattr_t\fP to be an unsigned short integer (16-bits),
+-while \fBchtype\fP is a unsigned integer (32-bits).
++For example, the Solaris \fIxpg4\fP (X/Open)
++.I curses
++declares
++.I \%attr_t
++to be an unsigned short integer (16-bits),
++while
++.I \%chtype
++is a unsigned integer (32-bits).
+ The \fBWA_\fP symbols in this case are different from the \fBA_\fP symbols
+ because they are used for a smaller datatype which does not
+ represent \fBA_CHARTEXT\fP or \fBA_COLOR\fP.
+ .IP
+ In this implementation (as in many others), the values happen to be
+ the same because it simplifies copying information between
+-\fBchtype\fP and \fBcchar_t\fP variables.
++.I \%chtype
++and
++.I \%cchar_t
++variables.
+ .bP
+-Because \fI\%ncurses\fP's \fBattr_t\fP can hold a color pair
++Because
++.IR \%ncurses 's
++.I \%attr_t
++can hold a color pair
+ (in the \fBA_COLOR\fP field),
+ a call to
+ \fBwattr_on\fP,
+@@ -458,7 +520,8 @@
+ If the color pair information in the attribute parameter is zero,
+ no change is made to the window's color.
+ .IP
+-This is consistent with SVr4 curses;
++This is consistent with SVr4
++.IR curses ";"
+ X/Open Curses does not specify this.
+ .PP
+ The X/Open Curses extended conformance level adds new highlights
+@@ -469,24 +532,39 @@
+ (i.e., via the \fBsgr1\fP capability).
+ .\" ---------------------------------------------------------------------------
+ .SH HISTORY
+-X/Open Curses is largely based on SVr4 curses,
++X/Open Curses is largely based on SVr4
++.IR curses ","
+ adding support for \*(``wide-characters\*('' (not specific to Unicode).
+-Some of the X/Open differences from SVr4 curses address the way
++Some of the X/Open differences from SVr4
++.I curses
++address the way
+ video attributes can be applied to wide-characters.
+ But aside from that, \fBattrset\fP and \fBattr_set\fP are similar.
+-SVr4 curses provided the basic features for manipulating video attributes.
+-However, earlier versions of curses provided a part of these features.
+-.PP
+-As seen in 2.8BSD, curses assumed 7-bit characters,
++SVr4
++.I curses
++provided the basic features for manipulating video attributes.
++However, earlier versions of
++.I curses
++provided a part of these features.
++.PP
++As seen in 2.8BSD,
++.I curses
++assumed 7-bit characters,
+ using the eighth bit of a byte to represent the \fIstandout\fP
+ feature (often implemented as bold and/or reverse video).
+-The BSD curses library provided functions \fBstandout\fP and \fBstandend\fP
++The BSD
++.I curses
++library provided functions \fBstandout\fP and \fBstandend\fP
+ which were carried along into X/Open Curses due to their pervasive use
+ in legacy applications.
+ .PP
+ Some terminals in the 1980s could support a variety of video attributes,
+-although the BSD curses library could do nothing with those.
+-System V (1983) provided an improved curses library.
++although the BSD
++.I curses
++library could do nothing with those.
++System V (1983) provided an improved
++.I curses
++library.
+ It defined the \fBA_\fP symbols for use by applications to manipulate the
+ other attributes.
+ There are few useful references for the chronology.
+@@ -496,7 +574,9 @@
+ commenting on several functions:
+ .bP
+ the \fBattron\fP, \fBattroff\fP, \fBattrset\fP functions
+-(and most of the functions found in SVr4 but not in BSD curses) were
++(and most of the functions found in SVr4 but not in BSD
++.IR curses ")"
++were
+ introduced by System V,
+ .bP
+ the alternate character set feature with \fBA_ALTCHARSET\fP was
+@@ -506,19 +586,24 @@
+ .bP
+ pads, soft-keys were added in SVr3, and
+ .PP
+-Goodheart did not mention the background character or the \fBcchar_t\fP type.
++Goodheart did not mention the background character or the
++.I \%cchar_t
++type.
+ Those are respectively SVr4 and X/Open features.
+ He did mention the \fBA_\fP constants, but did not indicate their values.
+ Those were not the same in different systems,
+ even for those marked as System V.
+ .PP
+-Different Unix systems used different sizes for the bit-fields in \fBchtype\fP
++Different Unix systems used different sizes for the bit-fields in
++.I \%chtype
+ for \fIcharacters\fP and \fIcolors\fP, and took into account the different
+ integer sizes (32-bit versus 64-bit).
+ .PP
+ This table showing the number of bits for \fBA_COLOR\fP
+ and \fBA_CHARTEXT\fP
+-was gleaned from the curses header files for
++was gleaned from the
++.I curses
++header files for
+ various operating systems and architectures.
+ The inferred architecture and notes reflect
+ the format and size of the defined constants
+@@ -554,51 +639,70 @@
+ HP-UX 10.20 (1996) added support for 64-bit PA-RISC processors in 1996.
+ .bP
+ HP-UX 10.30 (1997) marked \*(``curses_colr\*('' obsolete.
+-That version of curses was dropped with HP-UX 11.30 in 2006.
++That version of
++.I curses
++was dropped with HP-UX 11.30 in 2006.
+ .PP
+ Regarding OSF/1 (and Tru64),
+ .bP
+ These used 64-bit hardware.
+-Like \fI\%ncurses\fP,
+-the OSF/1 curses interface is not customized for 32-bit and 64-bit
++Like
++.IR \%ncurses ","
++the OSF/1
++.I curses
++interface is not customized for 32-bit and 64-bit
+ versions.
+ .bP
+ Unlike other systems which evolved from AT&T code,
+-OSF/1 provided a new implementation for X/Open curses.
++OSF/1 provided a new implementation for X/Open Curses.
+ .PP
+ Regarding Solaris,
+ .bP
+ The initial release of Solaris was in 1992.
+ .bP
+-The \fIxpg4\fP (X/Open) curses was developed by MKS from 1990 to 1995.
++The \fIxpg4\fP (X/Open) Curses was developed by MKS from 1990 to 1995.
+ Sun's copyright began in 1996.
+ .bP
+-Sun updated the X/Open curses interface
++Sun updated the X/Open Curses interface
+ after 64-bit support was introduced in 1997,
+-but did not modify the SVr4 curses interface.
++but did not modify the SVr4
++.I curses
++interface.
+ .PP
+ Regarding U/Win,
+ .bP
+-Development of the curses library began in 1991, stopped in 2000.
++Development of the
++.I curses
++library began in 1991, stopped in 2000.
+ .bP
+ Color support was added in 1998.
+ .bP
+-The library uses only \fBchtype\fP (no \fBcchar_t\fP).
++The library uses only
++.I \%chtype
++(no
++.IR \%cchar_t ")."
+ .RE
+ .PP
+-Once X/Open curses was adopted in the mid-1990s, the constraint of
+-a 32-bit interface with many colors and wide-characters for \fBchtype\fP
++Once X/Open Curses was adopted in the mid-1990s, the constraint of
++a 32-bit interface with many colors and wide-characters for
++.I \%chtype
+ became a moot point.
+-The \fBcchar_t\fP structure (whose size and
++The
++.I \%cchar_t
++structure (whose size and
+ members are not specified in X/Open Curses) could be extended as needed.
+ .PP
+ Other interfaces are rarely used now:
+ .bP
+-BSD curses was improved slightly in 1993/1994 using Keith Bostic's
++BSD
++.I curses
++was improved slightly in 1993/1994 using Keith Bostic's
+ 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 \fI\%ncurses\fP over the
++The resulting 4.4BSD
++.I curses
++was replaced by \fI\%ncurses\fP over the
+ next ten years.
+ .bP
+ U/Win is rarely used now.
+Index: man/curs_border.3x
+Prereq:  1.51 
+--- ncurses-6.5-20240720+/man/curs_border.3x	2024-05-25 20:10:58.000000000 +0000
++++ ncurses-6.5-20240727/man/curs_border.3x	2024-07-27 19:55:45.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_border.3x,v 1.51 2024/05/25 20:10:58 tom Exp $
+-.TH curs_border 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_border.3x,v 1.53 2024/07/27 19:55:45 tom Exp $
++.TH curs_border 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -141,7 +141,6 @@
+ \*(``or a non-negative integer if \fB\%immedok\fP is set\*('',
+ but this appears to be an error.
+ .PP
+-X/Open Curses does not specify any error conditions.
+ This implementation returns
+ .B ERR
+ if the window pointer is null.
+@@ -158,6 +157,7 @@
+ Note that \fBborder\fP and \fBbox\fP may be macros.
+ .SH PORTABILITY
+ These functions are described in X/Open Curses, Issue 4.
++It specifies no error conditions for them.
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_outopts\fP(3X)
+Index: man/curs_delch.3x
+Prereq:  1.35 
+--- ncurses-6.5-20240720+/man/curs_delch.3x	2024-05-11 20:39:53.000000000 +0000
++++ ncurses-6.5-20240727/man/curs_delch.3x	2024-07-27 20:14:16.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_delch.3x,v 1.35 2024/05/11 20:39:53 tom Exp $
+-.TH curs_delch 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_delch.3x,v 1.37 2024/07/27 20:14:16 tom Exp $
++.TH curs_delch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -50,9 +50,9 @@
+ \fB#include 
+ .PP
+ \fBint delch(void);
+-\fBint wdelch(WINDOW *\fIwin\fP);
++\fBint wdelch(WINDOW * \fIwin\fP);
+ \fBint mvdelch(int \fIy\fP, int \fIx\fP);
+-\fBint mvwdelch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
++\fBint mvwdelch(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP);
+ .fi
+ .SH DESCRIPTION
+ .B \%wdelch
+@@ -76,10 +76,14 @@
+ .B ERR
+ on failure.
+ .PP
+-Functions taking a
+-.I \%WINDOW
+-pointer argument fail if the pointer is
+-.BR NULL .
++In
++.IR \%ncurses ,
++they return
++.B ERR
++if
++.I win
++is
++.BR NULL "."
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+@@ -108,5 +112,8 @@
+ describes a successful return value only as
+ \*(``an integer value other than
+ .BR ERR \*(''.
++.SH HISTORY
++SVr2 (1984) introduced
++.IR \%delch "."
+ .SH SEE ALSO
+ \fB\%curses\fP(3X)
+Index: man/curs_deleteln.3x
+Prereq:  1.38 
+--- ncurses-6.5-20240720+/man/curs_deleteln.3x	2024-04-20 21:20:07.000000000 +0000
++++ ncurses-6.5-20240727/man/curs_deleteln.3x	2024-07-27 20:12:02.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_deleteln.3x,v 1.38 2024/04/20 21:20:07 tom Exp $
+-.TH curs_deleteln 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_deleteln.3x,v 1.40 2024/07/27 20:12:02 tom Exp $
++.TH curs_deleteln 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -43,62 +43,103 @@
+ .SH NAME
+ \fB\%deleteln\fP,
+ \fB\%wdeleteln\fP,
+-\fB\%insdelln\fP,
+-\fB\%winsdelln\fP,
+ \fB\%insertln\fP,
+-\fB\%winsertln\fP \-
++\fB\%winsertln\fP,
++\fB\%insdelln\fP,
++\fB\%winsdelln\fP \-
+ delete or insert lines in a \fIcurses\fR window
+ .SH SYNOPSIS
+ .nf
+ \fB#include 
+ .PP
+ \fBint deleteln(void);
+-\fBint wdeleteln(WINDOW *\fIwin\fP);
+-.PP
+-\fBint insdelln(int \fIn\fP);
+-\fBint winsdelln(WINDOW *\fIwin\fP, int \fIn\fP);
++\fBint wdeleteln(WINDOW * \fIwin\fP);
+ .PP
+ \fBint insertln(void);
+-\fBint winsertln(WINDOW *\fIwin\fP);
++\fBint winsertln(WINDOW * \fIwin\fP);
++.PP
++\fBint insdelln(int \fIn\fP);
++\fBint winsdelln(WINDOW * \fIwin\fP, int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
+-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.
++.B \%wdeleteln
++deletes the line at the cursor in
++.IR win ;
++all lines below it move up one line.
++.I curses
++then fills the bottom line of
++.I win
++with the blank character
++configured by \fB\%wbkgdset\fP(3X)
++(wide-character API users: \fB\%wbkgrndset\fP(3X)).
++The cursor position does not change.
++.PP
++.B \%winsertln
++inserts a line of blank characters above the line at the cursor in
++.IR win ;
++the content of the window's bottom line is lost.
+ The cursor position does not change.
+ .PP
+-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\fP, delete \fIn\fP lines (starting
+-with the one under the cursor), and move the remaining lines up.
+-The bottom
+-\fIn\fP lines are cleared.
+-The current cursor position remains the same.
++.B \%winsdelln
++inserts or deletes
++.IR n\  lines
++in
++.I win
++as
++.I n
++is positive or negative,
++respectively,
++as if by repeatedly calling
++.B \%winsertln
++or
++.BR \%wdeleteln "."
+ .PP
+-The \fBinsertln\fP and \fBwinsertln\fP routines insert a blank line above the
+-current line and the bottom line is lost.
++\fB\%ncurses\fP(3X) describes the variants of these functions.
+ .SH RETURN VALUE
+-These 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.
+-In this implementation,
+-if the window parameter is null, an error is returned.
++These functions return
++.B OK
++on success and
++.B ERR
++on failure.
++.PP
++In
++.IR \%ncurses ","
++they fail if
++.I win
++is
++.BR NULL "."
+ .SH NOTES
+-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)\fP has been set on the current window.
++All of these functions except
++.B \%winsdelln
++may be implemented as macros.
++.PP
++These functions do not require the terminal
++to possess hardware line deletion or insertion capabilities.
++Even if available,
++by default
++.I curses
++does not use them;
++see \fB\%idlok\fP(3X).
+ .SH PORTABILITY
+-These functions are described in X/Open Curses, Issue 4.
+-The
+-standard specifies that they return \fBERR\fP on failure, but specifies no
+-error conditions.
++X/Open Curses,
++Issue 4 describes these functions.
++It specifies no error conditions for them.
++.PP
++SVr4
++.I curses
++describes a successful return value only as
++\*(``an integer value other than
++.BR ERR \*(''.
++.SH HISTORY
++4BSD (1980)
++.I curses
++introduced
++.I \%wdeleteln
++and
++.IR \%winsertln "."
++.PP
++SVr3.1 (1987)
++added
++.IR \%winsdelln "."
+ .SH SEE ALSO
+ \fB\%curses\fP(3X)
+Index: man/curs_extend.3x
+Prereq:  1.46 
+--- ncurses-6.5-20240720+/man/curs_extend.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20240727/man/curs_extend.3x	2024-07-27 23:21:36.000000000 +0000
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1999-on
+ .\"
+-.\" $Id: curs_extend.3x,v 1.46 2024/03/16 15:35:01 tom Exp $
+-.TH curs_extend 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_extend.3x,v 1.49 2024/07/27 23:21:36 tom Exp $
++.TH curs_extend 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -50,36 +50,51 @@
+ \fB#include 
+ .PP
+ \fBconst char * curses_version(void);
+-\fBint use_extended_names(bool \fIenable\fP);
++\fBint use_extended_names(bool \fIbf\fP);
+ .fi
+ .SH DESCRIPTION
+-These functions are extensions to the curses library
+-which do not fit easily into other categories.
++These
++.I \%ncurses
++extensions to the
++.I curses
++library do not fit easily into other functional categories.
+ .SS curses_version
+-Use \fBcurses_version\fP
+-to get the version number, including patch level of the library,
+-prefixed by \*(``ncurses\*('', e.g.,
+-.RS
+-.sp
+-.B ncurses 5.0.19991023
+-.RE
++.B \%curses_version
++returns a pointer to a string containing the library's name
++and version number,
++including its patch level,
++for example
++\*(``ncurses 6.5.20240720\*(''.
+ .SS use_extended_names
+-The \fBuse_extended_names\fP
+-function controls whether the calling application
+-is able to use user-defined or nonstandard names
+-which may be compiled into the terminfo
+-description, i.e., via the terminfo or termcap interfaces.
+-Normally these names are available for use, since the essential decision
+-is made by using the \fB\-x\fP option of \fB@TIC@\fP to compile
+-extended terminal definitions.
+-However you can disable this feature
+-to ensure compatibility with other implementations of curses.
++.B \%use_extended_names
++configures whether the library recognizes
++user-defined or nonstandard
++.I \%term\%info
++capability names that may be compiled into terminal type descriptions
++via the \fB\%curs_terminfo\fP(3X) or \fB\%curs_termcap\fP(3X) interfaces.
++Normally these names are available for use,
++since the essential decision
++is made through use of \fB\%@TIC@\fP(1)'s
++.B \-x
++option to include such extensions in terminal type descriptions.
++.B \%use_extended_names
++can prevent
++.I \%ncurses
++from recognizing these capabilities
++to ensure compatibility with other implementations of
++.IR curses .
+ .SH RETURN VALUE
+-\fBcurses_version\fP returns a pointer to static memory; you should not free
+-this in your application.
++.B \%curses_version
++returns a constant string.
+ .PP
+-\fBuse_extended_names\fP returns the previous state, allowing you to
+-save this and restore it.
++.B \%use_extended_names
++returns the previous state of extended capability name recognition,
++allowing you to save this property and restore it.
++.SH NOTES
++The pointer returned by
++.B \%curses_version
++corresponds to statically allocated memory;
++do not attempt to \fIfree\fP(3) it.
+ .SH EXTENSIONS
+ These functions are \fB\%ncurses\fP(3X) extensions,
+ and are not found in SVr4
+@@ -94,8 +109,11 @@
+ .B \%NCURSES_VERSION
+ preprocessor macro.
+ .SH AUTHORS
+-Thomas Dickey.
++Thomas Dickey
+ .SH SEE ALSO
++.I \%ncurses
++offers several other extensions to the X/Open Curses API.
++.PP
+ \fB\%curs_getch\fP(3X),
+ \fB\%curs_mouse\fP(3X),
+ \fB\%curs_print\fP(3X),
+Index: man/curs_in_wch.3x
+Prereq:  1.33 
+--- ncurses-6.5-20240720+/man/curs_in_wch.3x	2024-05-18 20:19:38.000000000 +0000
++++ ncurses-6.5-20240727/man/curs_in_wch.3x	2024-07-27 20:06:49.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_in_wch.3x,v 1.33 2024/05/18 20:19:38 tom Exp $
+-.TH curs_in_wch 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_in_wch.3x,v 1.35 2024/07/27 20:06:49 tom Exp $
++.TH curs_in_wch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -41,9 +41,9 @@
+ .\}
+ .SH NAME
+ \fB\%in_wch\fP,
++\fB\%win_wch\fP,
+ \fB\%mvin_wch\fP,
+-\fB\%mvwin_wch\fP,
+-\fB\%win_wch\fP \-
++\fB\%mvwin_wch\fP \-
+ get a \fIcurses\fR complex character from a window
+ .SH SYNOPSIS
+ .nf
+@@ -75,8 +75,7 @@
+ .PP
+ In
+ .IR \%ncurses ","
+-.B \%win_wch
+-returns
++they return
+ .B ERR
+ if
+ .I win
+@@ -105,6 +104,24 @@
+ X/Open Curses,
+ Issue 4 describes these functions.
+ It specifies no error conditions for them.
++.SH HISTORY
++These functions were initially specified by X/Open Curses,
++Issue 4.
++The System\ V Interface Definition,
++Version 4 (1995),
++specified a function named
++.I \%winwch
++(and the usual variants).
++.\" SVID 4, vol 3., p. 514
++This was a later addition to
++.RI SVr4. x ,
++not appearing in the first SVr4 (1989).
++It differed from X/Open's later
++.I \%win_wch
++in that it returned a value of type
++.I \%chtype
++instead of
++.IR \%cchar_t "."
+ .SH SEE ALSO
+ \fB\%curs_inch\fP(3X) describes comparable functions of the
+ .I \%ncurses
+Index: man/curs_inch.3x
+Prereq:  1.60 
+--- ncurses-6.5-20240720+/man/curs_inch.3x	2024-06-08 20:45:43.000000000 +0000
++++ ncurses-6.5-20240727/man/curs_inch.3x	2024-07-27 19:58:17.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inch.3x,v 1.60 2024/06/08 20:45:43 tom Exp $
+-.TH curs_inch 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inch.3x,v 1.62 2024/07/27 19:58:17 tom Exp $
++.TH curs_inch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -81,8 +81,8 @@
+ .PP
+ In
+ .IR \%ncurses ","
+-.B \%winch
+-returns
++they return
++return
+ .B ERR
+ if
+ .I win
+Index: man/curs_ins_wch.3x
+Prereq:  1.32 
+--- ncurses-6.5-20240720+/man/curs_ins_wch.3x	2024-05-25 20:16:27.000000000 +0000
++++ ncurses-6.5-20240727/man/curs_ins_wch.3x	2024-07-27 20:05:18.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_ins_wch.3x,v 1.32 2024/05/25 20:16:27 tom Exp $
+-.TH curs_ins_wch 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_ins_wch.3x,v 1.34 2024/07/27 20:05:18 tom Exp $
++.TH curs_ins_wch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -41,18 +41,18 @@
+ .\}
+ .SH NAME
+ \fB\%ins_wch\fP,
++\fB\%wins_wch\fP,
+ \fB\%mvins_wch\fP,
+-\fB\%mvwins_wch\fP,
+-\fB\%wins_wch\fP \-
++\fB\%mvwins_wch\fP \-
+ insert a \fIcurses\fR complex character in a window
+ .SH SYNOPSIS
+ .nf
+ \fB#include \fP
+ .PP
+-\fBint ins_wch(const cchar_t *\fIwch\fP);
+-\fBint wins_wch(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fP);
+-\fBint mvins_wch(int \fIy\fP, int \fIx\fP, const cchar_t *\fIwch\fP);
+-\fBint mvwins_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t *\fIwch\fP);
++\fBint ins_wch(const cchar_t * \fIwch\fP);
++\fBint wins_wch(WINDOW * \fIwin\fP, const cchar_t * \fIwch\fP);
++\fBint mvins_wch(int \fIy\fP, int \fIx\fP, const cchar_t * \fIwch\fP);
++\fBint mvwins_wch(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t * \fIwch\fP);
+ .fi
+ .SH DESCRIPTION
+ These functions insert the
+@@ -99,12 +99,23 @@
+ SVr4 describes successful return values only as
+ \*(``an integer value other than \fBERR\fP\*(''.
+ .SH HISTORY
+-SVr4 (1989) implemented these functions under the names
+-.BR inswch ,
+-.BR winswch ,
+-.BR mvinswch ,
+-and
+-.BR mvwinswch .
++These functions were initially specified by X/Open Curses,
++Issue 4.
++The System\ V Interface Definition,
++Version 4 (1995),
++specified a function named
++.I \%winswch
++(and the usual variants).
++.\" SVID 4, vol 3., p. 512
++This was a later addition to
++.RI SVr4. x ,
++not appearing in the first SVr4 (1989).
++It differed from X/Open's later
++.I \%wins_wch
++in that it took an argument of type
++.I \%chtype
++instead of
++.IR \%cchar_t "."
+ .SH "SEE ALSO"
+ \fB\%curs_insch\fP(3X) describes comparable functions in the
+ non-wide-character
+Index: man/curs_ins_wstr.3x
+Prereq:  1.42 
+--- ncurses-6.5-20240720+/man/curs_ins_wstr.3x	2024-06-08 21:04:04.000000000 +0000
++++ ncurses-6.5-20240727/man/curs_ins_wstr.3x	2024-07-27 20:15:31.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_ins_wstr.3x,v 1.42 2024/06/08 21:04:04 tom Exp $
+-.TH curs_ins_wstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_ins_wstr.3x,v 1.44 2024/07/27 20:15:31 tom Exp $
++.TH curs_ins_wstr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -46,46 +46,64 @@
+ ..
+ .SH NAME
+ \fB\%ins_wstr\fP,
+-\fB\%ins_nwstr\fP,
+ \fB\%wins_wstr\fP,
+-\fB\%wins_nwstr\fP,
+ \fB\%mvins_wstr\fP,
+-\fB\%mvins_nwstr\fP,
+ \fB\%mvwins_wstr\fP,
++\fB\%ins_nwstr\fP,
++\fB\%wins_nwstr\fP,
++\fB\%mvins_nwstr\fP,
+ \fB\%mvwins_nwstr\fP \-
+ insert a wide-character string in a \fIcurses\fR window
+ .SH SYNOPSIS
+ .nf
+ \fB#include 
+ .PP
+-\fBint ins_wstr(const wchar_t *\fIwstr\fP);
+-\fBint ins_nwstr(const wchar_t *\fIwstr\fP, int \fIn\fP);
+-\fBint wins_wstr(WINDOW *\fIwin\fP, const wchar_t *\fIwstr\fP);
+-\fBint wins_nwstr(WINDOW *\fIwin\fP, const wchar_t *\fIwstr\fP, int \fIn\fP);
+-.PP
+-\fBint mvins_wstr(int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP);
+-\fBint mvins_nwstr(int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP, int \fIn\fP);
+-\fBint mvwins_wstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP);
+-\fBint mvwins_nwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t *\fIwstr\fP, int \fIn\fP);
++\fBint ins_wstr(const wchar_t * \fIwstr\fP);
++\fBint wins_wstr(WINDOW * \fIwin\fP, const wchar_t * \fIwstr\fP);
++\fBint mvins_wstr(int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP);
++\fBint mvwins_wstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP);
++.PP
++\fBint ins_nwstr(const wchar_t * \fIwstr\fP, int \fIn\fP);
++\fBint wins_nwstr(WINDOW * \fIwin\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
++\fBint mvins_nwstr(int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
++\fBint mvwins_nwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
+-These routines insert a \fBwchar_t\fP character string
+-(as many characters as will fit on the line)
+-before the character under the cursor,
+-as if calling \fBwins_wch\fP(3X).
+-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.
+-.PP
++.B \%wins_wstr
++inserts a wide-character string
++.I wstr
++before the character at the cursor in window
++.I win
++as if by calling \fBwins_wch\fP(3X) for each
++.I \%wchar_t
++in
++.IR wstr "."
++No line wrapping is performed.
++Characters to the right of the cursor are shifted right;
++those at the right edge of the window may be lost.
++.B \%wins_wstr
++stops inserting if it would have to wrap to the next line to write the
++next
++.I \%wchar_t
++in
++.IR wstr "."
+ The cursor position does not change
+-(after moving to \fIy\fP, \fIx\fP, if specified).
+-.PP
+-The functions 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 zero, the entire string is inserted
+-(stopping on a L'\e0' character).
+-.PP
+-Special characters are handled as in \fBwadd_wch\fP(3X).
++(after moving to
++.RI ( y ","
++.IR x "),"
++if specified).
++.B \%wins_nwstr
++does the same,
++but inserts at most
++.I n
++characters,
++or as many as possible
++(up to the end of the line)
++if
++.I n
++is
++.BR \-1 "."
++\fB\%ncurses\fP(3X) describes the variants of these functions.
+ .SH RETURN VALUE
+ These functions return
+ .B OK
+@@ -93,7 +111,6 @@
+ .B ERR
+ on failure.
+ .PP
+-X/Open Curses does not specify any error conditions.
+ In
+ .IR \%ncurses ","
+ they return
+@@ -107,6 +124,10 @@
+ .I wstr
+ is
+ .BR NULL ","
++.bP
++the first wide character in
++.I wstr
++is a non-spacing character,
+ or
+ .bP
+ an internal \fB\%wins_wch\fP(3X) call returns
+@@ -121,29 +142,53 @@
+ All of these functions except
+ .B \%wins_nwstr
+ may be implemented as macros.
+-.PP
+-If the first character in the string is a non-spacing character,
+-these functions return
+-.BR ERR "."
+-X/Open Curses does not specify what happens
+-if a non-spacing character follows a control character.
+ .SH PORTABILITY
+ X/Open Curses,
+ Issue 4 describes these functions.
+ It specifies no error conditions for them.
+ .PP
++X/Open Curses does not specify what happens
++if a non-spacing character follows a control character.
++.PP
+ Issue 4 states that the entire string is inserted if
+ .I n
+ is less than 1.
+ This is probably an error,
+-because it is inconsistent with other functions,
++.\" ...copied from SVID 4, which made the same error; see p. 513.
++because it is inconsistent with other functions
++such as \fB\%waddwstr\fP(3X),
+ and differs from the SVr4
+ .I curses
+ and Solaris
+ .I xcurses
+ implementations.
+ Nevertheless,
+-Issue 7 retains it.
++Issue 7 retains the language.
++.SH HISTORY
++These functions were initially specified by X/Open Curses,
++Issue 4.
++The System\ V Interface Definition,
++Version 4 (1995),
++specified functions named
++.I \%winswstr
++and
++.I \%winsnwstr
++(and the usual variants).
++.\" SVID 4, vol 3., p. 513
++.\" The prototypes also identify the data type as `wchar`, not
++.\" `wchar_t`, but this may be an error since the "DESCRIPTION" section
++.\" consistently uses the latter. --GBR
++These were later additions to
++.RI SVr4. x ,
++not appearing in the first SVr4 (1989).
++They differ from X/Open's later
++.I \%wins_wstr
++and
++.I \%wins_nwstr
++in that their
++.I wstr
++parameters are not
++.IR const -qualified .
+ .SH SEE ALSO
+ \fB\%curs_insstr\fP(3X) describes comparable functions of the
+ .I \%ncurses
+Index: man/curs_insch.3x
+Prereq:  1.40 
+--- ncurses-6.5-20240720+/man/curs_insch.3x	2024-04-20 19:03:47.000000000 +0000
++++ ncurses-6.5-20240727/man/curs_insch.3x	2024-07-27 20:08:25.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_insch.3x,v 1.40 2024/04/20 19:03:47 tom Exp $
+-.TH curs_insch 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_insch.3x,v 1.42 2024/07/27 20:08:25 tom Exp $
++.TH curs_insch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -50,9 +50,9 @@
+ \fB#include \fP
+ .PP
+ \fBint insch(chtype \fIch\fP);
+-\fBint winsch(WINDOW *\fIwin\fP, chtype \fIch\fP);
++\fBint winsch(WINDOW * \fIwin\fP, chtype \fIch\fP);
+ \fBint mvinsch(int \fIy\fP, int \fIx\fP, chtype \fIch\fP);
+-\fBint mvwinsch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, chtype \fIch\fP);
++\fBint mvwinsch(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, chtype \fIch\fP);
+ .fi
+ .SH DESCRIPTION
+ These functions insert the
+@@ -105,6 +105,9 @@
+ describes a successful return value only as
+ \*(``an integer value other than
+ .BR ERR \*(''.
++.SH HISTORY
++SVr2 (1984) introduced
++.IR \%winsch "."
+ .SH "SEE ALSO"
+ \fB\%curs_ins_wch\fP(3X) describes comparable functions in the
+ wide-character
+Index: man/curs_insstr.3x
+Prereq:  1.55 
+--- ncurses-6.5-20240720+/man/curs_insstr.3x	2024-06-08 21:03:03.000000000 +0000
++++ ncurses-6.5-20240727/man/curs_insstr.3x	2024-07-27 20:07:59.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_insstr.3x,v 1.55 2024/06/08 21:03:03 tom Exp $
+-.TH curs_insstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_insstr.3x,v 1.57 2024/07/27 20:07:59 tom Exp $
++.TH curs_insstr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -46,57 +46,87 @@
+ ..
+ .SH NAME
+ \fB\%insstr\fP,
+-\fB\%insnstr\fP,
+ \fB\%winsstr\fP,
+-\fB\%winsnstr\fP,
+ \fB\%mvinsstr\fP,
+ \fB\%mvinsnstr\fP,
++\fB\%insnstr\fP,
++\fB\%winsnstr\fP,
+ \fB\%mvwinsstr\fP,
+ \fB\%mvwinsnstr\fP \-
+ insert a string in a \fIcurses\fR window
+ .SH SYNOPSIS
+ .nf
+ \fB#include 
+-\fBint insstr(const char *\fIstr\fP);
+-\fBint insnstr(const char *\fIstr\fP, int \fIn\fP);
+-\fBint winsstr(WINDOW *\fIwin\fP, const char *\fIstr\fP);
+-\fBint winsnstr(WINDOW *\fIwin\fP, const char *\fIstr\fP, int \fIn\fP);
+-.PP
+-\fBint mvinsstr(int \fIy\fP, int \fIx\fP, const char *\fIstr\fP);
+-\fBint mvinsnstr(int \fIy\fP, int \fIx\fP, const char *\fIstr\fP, int \fIn\fP);
+-\fBint mvwinsstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const char *\fIstr\fP);
+-\fBint mvwinsnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const char *\fIstr\fP, int \fIn\fP);
++.PP
++\fBint insstr(const char * \fIstr\fP);
++\fBint winsstr(WINDOW * \fIwin\fP, const char * \fIstr\fP);
++\fBint mvinsstr(int \fIy\fP, int \fIx\fP, const char * \fIstr\fP);
++\fBint mvwinsstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const char * \fIstr\fP);
++.PP
++\fBint insnstr(const char * \fIstr\fP, int \fIn\fP);
++\fBint winsnstr(WINDOW * \fIwin\fP, const char * \fIstr\fP, int \fIn\fP);
++\fBint mvinsnstr(int \fIy\fP, int \fIx\fP, const char * \fIstr\fP, int \fIn\fP);
++\fBint mvwinsnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const char * \fIstr\fP, int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
+-These routines insert a character string
+-(as many characters as will fit on the line)
+-before the character under the cursor,
+-as if calling \fBwinsch\fP(3X).
+-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.
+-.PP
++.B \%winsstr
++inserts a string
++.I str
++before the character at the cursor in window
++.I win
++as if by calling \fBwinsch\fP(3X) for each
++.I char
++in
++.IR str "."
++No line wrapping is performed.
++Characters to the right of the cursor are shifted right;
++those at the right edge of the window may be lost.
++.B \%winsstr
++stops inserting if it would have to wrap to the next line to write the
++next
++.I \%char
++in
++.IR str "."
+ The cursor position does not change
+-(after moving to \fIy\fP, \fIx\fP, if specified).
+-.PP
+-The functions with \fIn\fP as the last argument
+-insert a leading substring of at most \fIn\fP characters.
+-If \fIn\fP is less than zero, the entire string is inserted
+-(stopping on a NUL character).
+-.PP
+-Special characters are handled as in \fBwaddch\fP(3X).
++(after moving to
++.RI ( y ","
++.IR x "),"
++if specified).
++.B \%insnstr
++does the same,
++but inserts at most
++.I n
++characters,
++or as many as possible
++(up to the end of the line)
++if
++.I n
++is
++.BR \-1 "."
++\fB\%ncurses\fP(3X) describes the variants of these functions.
+ .SH RETURN VALUE
+-All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
++These functions return
++.B OK
++on success and
++.B ERR
++on failure.
+ .PP
+-X/Open Curses does not specify any error conditions.
+-This implementation returns
++In
++.IR \%ncurses ","
++they return
+ .B ERR
++if
+ .bP
+-if the \fIwin\fP parameter is null or
++.I win
++is
++.BR NULL ","
+ .bP
+-if the \fIstr\fP parameter is null or
++.I str
++is
++.BR NULL ","
++or
+ .bP
+-the \fBwinsch\fP(3X) function returns
++an internal \fBwinsch\fP(3X) call returns
+ .BR ERR "."
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+@@ -105,7 +135,9 @@
+ .IR x )
+ is outside the window boundaries.
+ .SH NOTES
+-All but \fBwinsnstr\fP may be macros.
++All of these functions except
++.B \%winsnstr
++may be implemented as macros.
+ .SH PORTABILITY
+ X/Open Curses,
+ Issue 4 describes these functions.
+@@ -115,6 +147,7 @@
+ .B \%insnstr
+ and
+ .B \%winsnstr
++from the other functions documented above
+ by stating they \*(``do not perform wrapping\*(''.
+ This was probably an error,
+ since it makes this group of functions inconsistent.
+@@ -127,14 +160,22 @@
+ .I n
+ is less than 1.
+ This is probably an error,
+-because it is inconsistent with other functions,
++.\" ...copied from SVID 4, which made the same error; see p. 510.
++because it is inconsistent with other functions
++such as \fB\%waddstr\fP(3X),
+ and differs from the SVr4
+ .I curses
+ and Solaris
+ .I xcurses
+ implementations.
+ Nevertheless,
+-Issue 7 retains it.
++Issue 7 retains the language.
++.SH HISTORY
++SVr3.1 (1987)
++introduced
++.I \%winsstr
++and
++.IR \%winsnstr "."
+ .SH SEE ALSO
+ \fB\%curs_ins_wstr\fP(3X) describes comparable functions of the
+ .I \%ncurses
+Index: man/curs_move.3x
+Prereq:  1.42 
+--- ncurses-6.5-20240720+/man/curs_move.3x	2024-07-20 20:54:08.000000000 +0000
++++ ncurses-6.5-20240727/man/curs_move.3x	2024-07-27 20:11:42.000000000 +0000
+@@ -27,8 +27,18 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_move.3x,v 1.42 2024/07/20 20:54:08 tom Exp $
+-.TH curs_move 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_move.3x,v 1.44 2024/07/27 20:11:42 tom Exp $
++.TH curs_move 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.ie \n(.g \{\
++.ds `` \(lq
++.ds '' \(rq
++.\}
++.el \{\
++.ie t .ds `` ``
++.el   .ds `` ""
++.ie t .ds '' ''
++.el   .ds '' ""
++.\}
+ .SH NAME
+ \fB\%move\fP,
+ \fB\%wmove\fP \-
+@@ -72,6 +82,8 @@
+ .IR x )
+ is outside the window boundaries.
+ .PP
++In
++.IR \%ncurses ,
+ .B \%wmove
+ fails if its
+ .I \%WINDOW
+@@ -83,6 +95,13 @@
+ .SH PORTABILITY
+ X/Open Curses,
+ Issue 4 describes these functions.
++.PP
++SVr4
++.I curses
++describes a successful return value only as
++\*(``an integer value other than
++.BR ERR \*(''.
++.SH HISTORY
+ 4BSD (1980)
+ .I curses
+ introduced
+Index: man/curs_outopts.3x
+Prereq:  1.67 
+--- ncurses-6.5-20240720+/man/curs_outopts.3x	2024-05-25 20:10:58.000000000 +0000
++++ ncurses-6.5-20240727/man/curs_outopts.3x	2024-07-27 19:55:45.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_outopts.3x,v 1.67 2024/05/25 20:10:58 tom Exp $
+-.TH curs_outopts 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_outopts.3x,v 1.69 2024/07/27 19:55:45 tom Exp $
++.TH curs_outopts 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .de bP
+ .ie n  .IP \(bu 4
+ .el    .IP \(bu 2
+@@ -143,8 +143,6 @@
+ All other routines that return an integer always
+ return \fBOK\fP.
+ .PP
+-X/Open Curses does not specify any error conditions.
+-.PP
+ In this implementation,
+ .bP
+ those functions that have a window pointer
+@@ -169,6 +167,7 @@
+ emulators.
+ .SH PORTABILITY
+ These functions are described in X/Open Curses, Issue 4.
++It specifies no error conditions for them.
+ .PP
+ Some historic curses implementations had, as an undocumented feature, the
+ ability to do the equivalent of \fBclearok(..., 1)\fP by saying
+Index: man/curs_pad.3x
+Prereq:  1.65 
+--- ncurses-6.5-20240720+/man/curs_pad.3x	2024-06-22 22:20:03.000000000 +0000
++++ ncurses-6.5-20240727/man/curs_pad.3x	2024-07-27 19:55:45.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_pad.3x,v 1.65 2024/06/22 22:20:03 tom Exp $
+-.TH curs_pad 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_pad.3x,v 1.67 2024/07/27 19:55:45 tom Exp $
++.TH curs_pad 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -186,7 +186,6 @@
+ to
+ .BR \%ENOMEM "."
+ .PP
+-X/Open Curses does not specify any error conditions.
+ In this implementation
+ .RS 3
+ .TP 5
+@@ -243,7 +242,7 @@
+ .PP
+ X/Open Curses, Issue 4 describes these functions,
+ without significant change from the SVr3 documentation.
+-It describes no error conditions.
++It specifies no error conditions for them.
+ The behavior of \fB\%subpad\fP if the parent window is not
+ a pad is undocumented,
+ and is not checked by the vendor Unix implementations:
+Index: man/curs_print.3x
+Prereq:  1.38 
+--- ncurses-6.5-20240720+/man/curs_print.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20240727/man/curs_print.3x	2024-07-27 20:03:57.000000000 +0000
+@@ -27,8 +27,18 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_print.3x,v 1.38 2024/03/16 15:35:01 tom Exp $
+-.TH curs_print 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_print.3x,v 1.40 2024/07/27 20:03:57 tom Exp $
++.TH curs_print 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.ie \n(.g \{\
++.ds `` \(lq
++.ds '' \(rq
++.\}
++.el \{\
++.ie t .ds `` ``
++.el   .ds `` ""
++.ie t .ds '' ''
++.el   .ds '' ""
++.\}
+ .SH NAME
+ \fB\%mcprint\fP \-
+ write binary data to printer using \fIterminfo\fR capabilities
+@@ -36,54 +46,93 @@
+ .nf
+ \fB#include 
+ .PP
+-\fBint mcprint(char *\fIdata\fP, int \fIlen\fP);
++\fBint mcprint(char * \fIdata\fP, int \fIlen\fP);
+ .fi
+ .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.
++.BR \%mcprint ","
++an
++.I \%ncurses
++extension to the
++.I curses
++library,
++uses the terminal's
++.B \%prtr_non
++.RB ( mc5p )
++or
++.B \%prtr_on
++.RB ( mc5 )
++and
++.B \%prtr_off
++.RB ( mc4 )
++media copy capabilities,
++if defined,
++to send
++.I len
++bytes of the given string
++.I data
++to a printer attached to the terminal.
+ .PP
+-Note that the \fB\%mcprint\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
+-(typically about half of its nominal cps rating).
++.B \%mcprint
++has no means of flow control to the printer
++nor of knowing how much buffering it has.
++Your application is responsible
++for keeping the rate of writes to the printer
++below its continuous throughput rate,
++typically about half of its nominal characters-per-second (cps) rating.
+ Dot-matrix printers and
+-6-page-per-minute lasers can typically handle 80cps, so a good conservative
+-rule of thumb is to sleep for a second after shipping each 80-character line.
+-.
++6-page-per-minute laser printers can typically handle 80 cps,
++so a conservative rule of thumb
++is to sleep for one second after sending an 80-character line.
+ .SH RETURN VALUE
+-The \fB\%mcprint\fP function returns \fBERR\fP if the write operation aborted
+-for some reason.
+-In this case, \fB\%errno\fP will contain either an error associated
+-with \fBwrite\fP(2) or one of the following:
++On success,
++.B \%mcprint
++returns the number of characters sent to the printer.
++.PP
++.B \%mcprint
++returns
++.B ERR
++if the write operation fails for any reason.
++In that event,
++.B errno
++contains either a value set by \fIwrite\fP(2),
++or one of the following.
+ .TP 5
+ \fBENODEV\fP
+-Capabilities for printer redirection do not exist.
++The terminal lacks relevant media copy capabilities.
+ .TP 5
+ \fBENOMEM\fP
+-Couldn't allocate sufficient memory to buffer the printer write.
+-.PP
+-When \fB\%mcprint\fP succeeds, it returns the number of characters actually
+-sent to the printer.
++.I \%ncurses
++could not allocate sufficient memory to buffer the write operation.
+ .SH EXTENSIONS
+-\fB\%mcprint\fP was designed for
+-\fB\%ncurses\fP(3X),
+-and was not found in SVr4
+-.IR curses ,
++.B \%mcprint
++is an \fB\%ncurses\fP(3X) extension,
++and is not found in SVr4
++.IR curses ","
+ 4.4BSD
+-.IR curses ,
+-or any other previous curses implementation.
++.IR curses ","
++or any other previous
++.I curses
++implementation.
+ .SH PORTABILITY
+ Applications employing this
+ .I \%ncurses
+ extension should condition its use on the visibility of the
+ .B \%NCURSES_VERSION
+ preprocessor macro.
++.SH HISTORY
++.I \%ncurses
++introduced
++.I \%mcprint
++prior to version 1.9.9g (1996).
+ .SH BUGS
+ Padding in the
+-\fBmc5p\fP,
+-\fBmc4\fP, and
+-\fBmc5\fP capabilities is not interpreted.
++.B \%prtr_non
++.RB ( mc5p ),
++.B \%prtr_on
++.RB ( mc5 ),
++and
++.B \%prtr_off
++.RB ( mc4 )
++capabilities is not interpreted.
+ .SH SEE ALSO
+ \fB\%curses\fP(3X)
+Index: man/curs_refresh.3x
+Prereq:  1.48 
+--- ncurses-6.5-20240720+/man/curs_refresh.3x	2024-05-25 20:10:58.000000000 +0000
++++ ncurses-6.5-20240727/man/curs_refresh.3x	2024-07-27 19:55:45.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_refresh.3x,v 1.48 2024/05/25 20:10:58 tom Exp $
+-.TH curs_refresh 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_refresh.3x,v 1.50 2024/07/27 19:55:45 tom Exp $
++.TH curs_refresh 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -133,7 +133,6 @@
+ \*(``an integer value other than \fBERR\fP\*('')
+ upon successful completion.
+ .PP
+-X/Open Curses does not specify any error conditions.
+ In this implementation
+ .RS 3
+ .TP 5
+@@ -153,6 +152,7 @@
+ Note that \fBrefresh\fP and \fBredrawwin\fP may be macros.
+ .SH PORTABILITY
+ X/Open Curses, Issue 4 describes these functions.
++It specifies no error conditions for them.
+ .PP
+ 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
+Index: man/curs_touch.3x
+Prereq:  1.49 
+--- ncurses-6.5-20240720+/man/curs_touch.3x	2024-05-25 20:10:58.000000000 +0000
++++ ncurses-6.5-20240727/man/curs_touch.3x	2024-07-27 19:55:45.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_touch.3x,v 1.49 2024/05/25 20:10:58 tom Exp $
+-.TH curs_touch 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_touch.3x,v 1.51 2024/07/27 19:55:45 tom Exp $
++.TH curs_touch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%touchwin\fP,
+ \fB\%touchline\fP,
+@@ -81,7 +81,6 @@
+ other than \fBERR\fP upon successful completion, unless otherwise noted in the
+ preceding routine descriptions.
+ .PP
+-X/Open Curses does not specify any error conditions.
+ In this implementation
+ .RS 3
+ .TP 5
+@@ -118,8 +117,8 @@
+ that it is not \fBNULL\fP;
+ otherwise this implementation behaves the same as SVr4.
+ .PP
+-X/Open Curses, Issue 4 describes these functions,
+-but defines no error conditions.
++X/Open Curses, Issue 4 describes these functions.
++It specifies no error conditions for them.
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_refresh\fP(3X),
+Index: man/curs_util.3x
+Prereq:  1.112 
+--- ncurses-6.5-20240720+/man/curs_util.3x	2024-06-22 21:25:23.000000000 +0000
++++ ncurses-6.5-20240727/man/curs_util.3x	2024-07-27 19:55:45.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_util.3x,v 1.112 2024/06/22 21:25:23 tom Exp $
+-.TH curs_util 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_util.3x,v 1.114 2024/07/27 19:55:45 tom Exp $
++.TH curs_util 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -310,7 +310,6 @@
+ .PP
+ Routines that return pointers return \fBNULL\fP on error.
+ .PP
+-X/Open Curses does not specify any error conditions.
+ In this implementation
+ .RS 3
+ .TP 5
+@@ -408,9 +407,9 @@
+ .SS "unctrl, wunctrl"
+ X/Open Curses,
+ Issue 4 describes these functions.
++It specifies no error conditions for them.
+ It states that \fBunctrl\fP and \fBwunctrl\fP will return a null pointer
+-if unsuccessful,
+-but does not define any error conditions.
++if unsuccessful.
+ This implementation checks for three cases:
+ .bP
+ the parameter is a 7-bit US\-ASCII code.
+Index: man/define_key.3x
+Prereq:  1.48 
+--- ncurses-6.5-20240720+/man/define_key.3x	2024-06-08 23:25:11.000000000 +0000
++++ ncurses-6.5-20240727/man/define_key.3x	2024-07-27 19:43:41.000000000 +0000
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1997
+ .\"
+-.\" $Id: define_key.3x,v 1.48 2024/06/08 23:25:11 tom Exp $
+-.TH define_key 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: define_key.3x,v 1.50 2024/07/27 19:43:41 tom Exp $
++.TH define_key 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .
+ .de bP
+ .ie n  .IP \(bu 4
+@@ -118,7 +118,7 @@
+ NetBSD
+ .I curses
+ since 2.0 (2004) supports
+-.BR \%define_key "."
++.IR \%define_key "."
+ .SH AUTHORS
+ Thomas Dickey
+ .SH SEE ALSO
+Index: man/infotocap.1m
+Prereq:  1.42 
+--- ncurses-6.5-20240720+/man/infotocap.1m	2024-05-11 20:39:53.000000000 +0000
++++ ncurses-6.5-20240727/man/infotocap.1m	2024-07-27 19:43:16.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: infotocap.1m,v 1.42 2024/05/11 20:39:53 tom Exp $
+-.TH @INFOTOCAP@ 1M 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: infotocap.1m,v 1.44 2024/07/27 19:43:16 tom Exp $
++.TH @INFOTOCAP@ 1M 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -53,7 +53,7 @@
+ .SH DESCRIPTION
+ \fB\%@INFOTOCAP@\fP translates terminal descriptions.
+ It looks in each given text \fIfile\fP for \fI\%terminfo\fP entries and,
+-For each one found,
++for each one found,
+ it writes an analogous \fI\%termcap\fP description to the standard
+ output stream.
+ \fI\%terminfo\fP \*(``\fBuse\fP\*('' capabilities translate to
+Index: man/keyok.3x
+Prereq:  1.46 
+--- ncurses-6.5-20240720+/man/keyok.3x	2024-06-15 19:49:39.000000000 +0000
++++ ncurses-6.5-20240727/man/keyok.3x	2024-07-27 19:42:31.000000000 +0000
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1997
+ .\"
+-.\" $Id: keyok.3x,v 1.46 2024/06/15 19:49:39 tom Exp $
+-.TH keyok 3X 2024-06-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: keyok.3x,v 1.48 2024/07/27 19:42:31 tom Exp $
++.TH keyok 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .
+ .de bP
+ .ie n  .IP \(bu 4
+@@ -59,7 +59,7 @@
+ \fB\%wget_wch\fP(3X)).
+ Key codes that have been disabled can be re-enabled.
+ .I bf
+-indicates the desired enablement status.
++selects the desired enablement status.
+ This operation is more fine-grained than calling \fB\%keypad\fP(3X),
+ which affects
+ .I all
+@@ -100,7 +100,7 @@
+ NetBSD
+ .I curses
+ since 2.0 (2004) supports
+-.BR \%keyok "."
++.IR \%keyok "."
+ .SH AUTHORS
+ Thomas Dickey
+ .SH SEE ALSO
+Index: man/legacy_coding.3x
+Prereq:  1.28 
+--- ncurses-6.5-20240720+/man/legacy_coding.3x	2024-04-20 19:13:50.000000000 +0000
++++ ncurses-6.5-20240727/man/legacy_coding.3x	2024-07-27 19:44:30.000000000 +0000
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey
+ .\"
+-.\" $Id: legacy_coding.3x,v 1.28 2024/04/20 19:13:50 tom Exp $
+-.TH legacy_coding 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: legacy_coding.3x,v 1.30 2024/07/27 19:44:30 tom Exp $
++.TH legacy_coding 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%use_legacy_coding\fP \-
+ override \fIcurses\fR locale encoding checks
+@@ -73,7 +73,9 @@
+ showing codes in the range 128-159 as is.
+ .RE
+ .SH RETURN VALUE
+-If the screen has not been initialized,
++If the
++.I curses
++screen has not been initialized,
+ or the
+ .I level
+ parameter is out of range,
+@@ -81,23 +83,24 @@
+ returns
+ .BR ERR .
+ Otherwise,
+-it returns the previous level:
+-.BR 0 ,
+-.BR 1 ,
+-or
+-.BR 2 .
+-.SH PORTABILITY
++it returns the previous level.
++.SH EXTENSIONS
+ .B \%use_legacy_coding
+-is specific to
+-.IR \%ncurses .
+-It was not supported on Version 7, BSD or System V implementations.
++is an
++.I \%ncurses
++extension.
++.SH PORTABILITY
+ Applications employing
+ .I \%ncurses
+ extensions should condition their use on the visibility of the
+ .B \%NCURSES_VERSION
+ preprocessor macro.
++.SH HISTORY
++.I \%ncurses
++5.6 (2006) introduced
++.I \%use_legacy_coding
++to support \fI\%lynx\fP(1)'s font-switching feature.
+ .SH AUTHORS
+ Thomas Dickey
+-(to support \fI\%lynx\fP(1)'s font-switching feature).
+ .SH SEE ALSO
+ \fB\%unctrl\fP(3X)
+Index: man/manhtml.externs
+Prereq:  1.28 
+--- ncurses-6.5-20240720+/man/manhtml.externs	2024-06-22 22:20:56.000000000 +0000
++++ ncurses-6.5-20240727/man/manhtml.externs	2024-07-27 20:15:00.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: manhtml.externs,v 1.28 2024/06/22 22:20:56 tom Exp $
++# $Id: manhtml.externs,v 1.29 2024/07/27 20:15:00 tom Exp $
+ # Items in this list will not be linked by man2html
+ #***************************************************************************
+ # Copyright 2019-2023,2024 Thomas E. Dickey                                *
+@@ -42,6 +42,7 @@
+ errno(3)
+ file(1)
+ fread(3)
++free(3)
+ fwrite(3)
+ getty(8)
+ ioctl(2)
+Index: man/ncurses.3x
+Prereq:  1.227 
+--- ncurses-6.5-20240720+/man/ncurses.3x	2024-07-20 20:48:52.000000000 +0000
++++ ncurses-6.5-20240727/man/ncurses.3x	2024-07-27 20:10:07.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: ncurses.3x,v 1.227 2024/07/20 20:48:52 tom Exp $
+-.TH ncurses 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: ncurses.3x,v 1.229 2024/07/27 20:10:07 tom Exp $
++.TH ncurses 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -446,7 +446,9 @@
+ .I \%ncurses
+ is the library in its \*(``non-wide\*('' configuration,
+ handling only eight-bit characters.
+-It stores a character combined with attributes and a color pair in a
++It stores a character combined with attributes
++and a color pair identifier
++in a
+ .I \%chtype
+ datum,
+ which is often an alias of
+@@ -464,7 +466,7 @@
+ .I curses
+ character.
+ .IP
+-Attributes and a color pair selection
++Attributes and a color pair identifier
+ (with no corresponding character)
+ can be stored in variables of
+ .I \%chtype
+@@ -515,6 +517,10 @@
+ .\" operated on `chtype`s assuming that they were wide enough for a
+ .\" `wchar_t` plus attribute and color pair bits; X/Open Curses did not
+ .\" standardize these.
++Another exception is
++.B \%ins_nwstr
++and its variants,
++which is spelled thus instead of \*(``insn_wstr\*(''.
+ .IP
+ This convention is inapplicable to some non-wide function names,
+ so other transformations are used for the wide configuration:
+@@ -547,7 +553,7 @@
+ whose
+ .I \%wchar_t
+ member is the null wide character.
+-Attributes and a color pair selection are stored in separate fields of
++Attributes and a color pair identifier are stored in separate fields of
+ the structure,
+ not combined into an integer as in
+ .IR \%chtype .
+Index: man/wresize.3x
+Prereq:  1.38 
+--- ncurses-6.5-20240720+/man/wresize.3x	2024-07-20 22:13:21.000000000 +0000
++++ ncurses-6.5-20240727/man/wresize.3x	2024-07-27 20:08:58.000000000 +0000
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1996
+ .\"
+-.\" $Id: wresize.3x,v 1.38 2024/07/20 22:13:21 tom Exp $
+-.TH wresize 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: wresize.3x,v 1.40 2024/07/27 20:08:58 tom Exp $
++.TH wresize 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%wresize\fP \-
+ resize a \fIcurses\fR window
+@@ -107,7 +107,7 @@
+ NetBSD
+ .I curses
+ adopted
+-.B \%wresize
++.I \%wresize
+ in 2001 (release 1.5.3),
+ and
+ .I \%PDCurses
+@@ -117,7 +117,7 @@
+ .IR curses "."
+ .SH HISTORY
+ Thomas Dickey developed
+-.B \%wresize
++.I \%wresize
+ as an extension to BSD
+ .I curses
+ in 1988,
+Index: menu/m_driver.c
+Prereq:  1.37 
+--- ncurses-6.5-20240720+/menu/m_driver.c	2021-03-27 23:46:29.000000000 +0000
++++ ncurses-6.5-20240727/menu/m_driver.c	2024-07-27 18:14:20.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -38,7 +38,7 @@
+ 
+ #include "menu.priv.h"
+ 
+-MODULE_ID("$Id: m_driver.c,v 1.37 2021/03/27 23:46:29 tom Exp $")
++MODULE_ID("$Id: m_driver.c,v 1.38 2024/07/27 18:14:20 tom Exp $")
+ 
+ /* Macros */
+ 
+@@ -449,7 +449,7 @@
+       else if (KEY_MOUSE == c)
+ 	{
+ 	  MEVENT event;
+-	  WINDOW *uwin = Get_Menu_UserWin(menu);
++	  const WINDOW *uwin = Get_Menu_UserWin(menu);
+ 
+ 	  getmouse(&event);
+ 	  if ((event.bstate & (BUTTON1_CLICKED |
+@@ -459,7 +459,7 @@
+ 	    {			/* we react only if the click was in the userwin, that means
+ 				 * inside the menu display area or at the decoration window.
+ 				 */
+-	      WINDOW *sub = Get_Menu_Window(menu);
++	      const WINDOW *sub = Get_Menu_Window(menu);
+ 	      int ry = event.y, rx = event.x;	/* screen coordinates */
+ 
+ 	      result = E_REQUEST_DENIED;
+Index: menu/m_item_vis.c
+Prereq:  1.20 
+--- ncurses-6.5-20240720+/menu/m_item_vis.c	2021-06-17 21:20:30.000000000 +0000
++++ ncurses-6.5-20240727/menu/m_item_vis.c	2024-07-27 18:14:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2004,2010 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -38,7 +38,7 @@
+ 
+ #include "menu.priv.h"
+ 
+-MODULE_ID("$Id: m_item_vis.c,v 1.20 2021/06/17 21:20:30 tom Exp $")
++MODULE_ID("$Id: m_item_vis.c,v 1.21 2024/07/27 18:14:09 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnmenu
+@@ -53,7 +53,7 @@
+ MENU_EXPORT(bool)
+ item_visible(const ITEM *item)
+ {
+-  MENU *menu;
++  const MENU *menu;
+ 
+   T((T_CALLED("item_visible(%p)"), (const void *)item));
+   if (item &&
+Index: menu/m_post.c
+Prereq:  1.38 
+--- ncurses-6.5-20240720+/menu/m_post.c	2022-09-24 09:38:44.000000000 +0000
++++ ncurses-6.5-20240727/menu/m_post.c	2024-07-27 18:08:59.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2021,2022 Thomas E. Dickey                                *
++ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2010,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -38,7 +38,7 @@
+ 
+ #include "menu.priv.h"
+ 
+-MODULE_ID("$Id: m_post.c,v 1.38 2022/09/24 09:38:44 tom Exp $")
++MODULE_ID("$Id: m_post.c,v 1.41 2024/07/27 18:08:59 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnmenu
+@@ -67,7 +67,7 @@
+      - it is a onevalued menu and it is the current item
+      - or it has a selection value
+    */
+-  wattron(menu->win, (int)menu->back);
++  wattr_on(menu->win, menu->back, NULL);
+   if (item->value || (item == menu->curitem))
+     {
+       if (menu->marklen)
+@@ -79,13 +79,13 @@
+ 	     item. */
+ 	  if (!(menu->opt & O_ONEVALUE) && item->value && item != menu->curitem)
+ 	    {
+-	      wattron(menu->win, (int)menu->fore);
++	      wattr_on(menu->win, menu->fore, NULL);
+ 	      isfore = TRUE;
+ 	    }
+ 	  waddstr(menu->win, menu->mark);
+ 	  if (isfore)
+ 	    {
+-	      wattron(menu->win, (int)menu->fore);
++	      wattr_on(menu->win, menu->fore, NULL);
+ 	      isfore = FALSE;
+ 	    }
+ 	}
+@@ -93,7 +93,7 @@
+   else				/* otherwise we have to wipe out the marker area */
+     for (ch = ' ', i = menu->marklen; i > 0; i--)
+       waddch(menu->win, ch);
+-  wattroff(menu->win, (int)menu->back);
++  wattr_off(menu->win, menu->back, NULL);
+   count += menu->marklen;
+ 
+   /* First we have to calculate the attribute depending on selectability
+@@ -101,19 +101,19 @@
+    */
+   if (!(item->opt & O_SELECTABLE))
+     {
+-      wattron(menu->win, (int)menu->grey);
++      wattr_on(menu->win, menu->grey, NULL);
+       isgrey = TRUE;
+     }
+   else
+     {
+       if (item->value || item == menu->curitem)
+ 	{
+-	  wattron(menu->win, (int)menu->fore);
++	  wattr_on(menu->win, menu->fore, NULL);
+ 	  isfore = TRUE;
+ 	}
+       else
+ 	{
+-	  wattron(menu->win, (int)menu->back);
++	  wattr_on(menu->win, menu->back, NULL);
+ 	  isback = TRUE;
+ 	}
+     }
+@@ -159,10 +159,10 @@
+ 	  assert(cx >= 0 && cy >= 0);
+ 	  getyx(menu->win, ncy, ncx);
+ 	  if (isgrey)
+-	    wattroff(menu->win, (int)menu->grey);
++	    wattr_off(menu->win, menu->grey, NULL);
+ 	  else if (isfore)
+-	    wattroff(menu->win, (int)menu->fore);
+-	  wattron(menu->win, (int)menu->back);
++	    wattr_off(menu->win, menu->fore, NULL);
++	  wattr_on(menu->win, menu->back, NULL);
+ 	  for (j = 1; j < menu->spc_rows; j++)
+ 	    {
+ 	      if ((item_y + j) < getmaxy(menu->win))
+@@ -176,17 +176,17 @@
+ 	    }
+ 	  wmove(menu->win, ncy, ncx);
+ 	  if (!isback)
+-	    wattroff(menu->win, (int)menu->back);
++	    wattr_off(menu->win, menu->back, NULL);
+ 	}
+     }
+ 
+   /* Remove attributes */
+   if (isfore)
+-    wattroff(menu->win, (int)menu->fore);
++    wattr_off(menu->win, menu->fore, NULL);
+   if (isback)
+-    wattroff(menu->win, (int)menu->back);
++    wattr_off(menu->win, menu->back, NULL);
+   if (isgrey)
+-    wattroff(menu->win, (int)menu->grey);
++    wattr_off(menu->win, menu->grey, NULL);
+ }
+ 
+ /*---------------------------------------------------------------------------
+@@ -201,7 +201,7 @@
+ _nc_Draw_Menu(const MENU *menu)
+ {
+   ITEM *item = menu->items[0];
+-  ITEM *lastvert;
++  const ITEM *lastvert;
+   ITEM *hitem;
+   chtype s_bkgd;
+ 
+@@ -220,7 +220,7 @@
+ 
+       do
+ 	{
+-	  ITEM *lasthor;
++	  const ITEM *lasthor;
+ 
+ 	  wmove(menu->win, y, 0);
+ 
+@@ -231,7 +231,7 @@
+ 	    {
+ 	      _nc_Post_Item(menu, hitem);
+ 
+-	      wattron(menu->win, (int)menu->back);
++	      wattr_on(menu->win, menu->back, NULL);
+ 	      if (((hitem = hitem->right) != lasthor) && hitem)
+ 		{
+ 		  int i, j, cy, cx;
+@@ -250,7 +250,7 @@
+ 		}
+ 	    }
+ 	  while (hitem && (hitem != lasthor));
+-	  wattroff(menu->win, (int)menu->back);
++	  wattr_off(menu->win, menu->back, NULL);
+ 
+ 	  item = item->down;
+ 	  y += menu->spc_rows;
+@@ -291,7 +291,7 @@
+     {
+       int h = 1 + menu->spc_rows * (menu->rows - 1);
+ 
+-      WINDOW *win = Get_Menu_Window(menu);
++      const WINDOW *win = Get_Menu_Window(menu);
+       int maxy = getmaxy(win);
+ 
+       if ((menu->win = newpad(h, menu->width)))
+Index: misc/terminfo.src
+--- ncurses-6.5-20240720+/misc/terminfo.src	2024-05-25 19:34:27.000000000 +0000
++++ ncurses-6.5-20240727/misc/terminfo.src	2024-07-27 16:58:08.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.1144 $
+-#	$Date: 2024/05/25 19:34:27 $
++#	$Revision: 1.1146 $
++#	$Date: 2024/07/27 16:58:08 $
+ #
+ # 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
+@@ -8022,6 +8022,16 @@
+ # "wezterm is a terminal emulator with support for modern features
+ #  such as fonts with ligatures, hyperlinks, tabs and multiple windows."
+ #
++# wezterm-20240203-110809-5046fc22 tested with MacOS
++# General:
++# + initial screensize is now 80x24
++# tack:
++# + no change
++# wraptest:
++# + erasures (EL, ED, DCH, ICH, ESC) do not cancel wrap
++# vttest:
++# + some of the problems with debris have been fixed
++#
+ # wezterm-20230712_072601_f4abf8fd-1.fedora38.x86_64
+ # tested with MacOS and Fedora 38/39.
+ #
+@@ -8068,9 +8078,30 @@
+ # + implements xterm normal, any-event and button-event mouse, none of the rest
+ # + reports window size, none of the other window reports
+ wezterm|Wez's Terminal Emulator,
+-	km@, xenl@,
+-	cvvis@, rmkx=\E[?1l, rmm@, smkx=\E[?1h, smm@,
+-	use=xterm-256color,
++	am, bce, km, mir, msgr, npc, xenl,
++	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
++	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n, ech=\E[%p1%dX,
++	el1=\E[1K, flash=\E[?5h$<100/>\E[?5l, ind=\n,
++	is2=\E[!p\E[?3;4l\E[4l\E>, kbs=^?, kcbt=\E[Z, kend=\EOF,
++	op=\E[39;49m, ri=\EM, rmacs=\E(B, rmam=\E[?7l,
++	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
++	rs1=\Ec\E]104\007, rs2=\E[!p\E[?3;4l\E[4l\E>,
++	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
++	    %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
++	sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=,
++	u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?%[;0123456789]c,
++	u9=\E[c, Smol=\E[53m, Smulx=\E[4:%p1%dm,
++	xr=\EP>\\|WezTerm\\([1-9][0-9-]+\\)\E\\\\,
++	use=ansi+apparrows, use=ansi+csr, use=ansi+cup,
++	use=ansi+erase, use=ansi+idc, use=ansi+idl,
++	use=ansi+inittabs, use=ansi+local, use=ansi+rca2,
++	use=ansi+rep, use=ansi+sgrdim, use=bracketed+paste,
++	use=ecma+index, use=ecma+italics, use=ecma+strikeout,
++	use=report+version, use=vt220+cvis,
++	use=xterm+256color2, use=xterm+alt1049,
++	use=xterm+focus, use=xterm+pcc2, use=xterm+pce2,
++	use=xterm+pcf2, use=xterm+sl-alt, use=xterm+sm+1006,
++	use=xterm+tmux,
+ 
+ #### Contour
+ # https://github.com/contour-terminal/contour
+@@ -27564,4 +27595,8 @@
+ # 2024-05-25
+ #	+ review/update iTerm2 for 3.5.0 -TD
+ #
++# 2024-07-27
++#	+ modify wezterm, omitting its broken left/right margin feature (report
++#	  by Thayne McCombs) -TD
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: ncurses/base/lib_addch.c
+Prereq:  1.141 
+--- ncurses-6.5-20240720+/ncurses/base/lib_addch.c	2022-06-12 15:16:41.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/base/lib_addch.c	2024-07-27 19:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
++ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -37,7 +37,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: lib_addch.c,v 1.141 2022/06/12 15:16:41 tom Exp $")
++MODULE_ID("$Id: lib_addch.c,v 1.142 2024/07/27 19:22:23 tom Exp $")
+ 
+ static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
+ 
+@@ -118,7 +118,7 @@
+ #endif
+ 
+ static bool
+-newline_forces_scroll(WINDOW *win, NCURSES_SIZE_T *ypos)
++newline_forces_scroll(const WINDOW *win, NCURSES_SIZE_T *ypos)
+ {
+     bool result = FALSE;
+ 
+Index: ncurses/base/lib_delch.c
+Prereq:  1.14 
+--- ncurses-6.5-20240720+/ncurses/base/lib_delch.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/base/lib_delch.c	2024-07-27 19:23:21.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 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_delch.c,v 1.14 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_delch.c,v 1.15 2024/07/27 19:23:21 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ wdelch(WINDOW *win)
+Index: ncurses/base/lib_delwin.c
+Prereq:  1.26 
+--- ncurses-6.5-20240720+/ncurses/base/lib_delwin.c	2024-06-29 16:51:40.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/base/lib_delwin.c	2024-07-27 18:57:35.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2021,2023 Thomas E. Dickey                                *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2008,2009 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -43,10 +43,10 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_delwin.c,v 1.26 2024/06/29 16:51:40 tom Exp $")
++MODULE_ID("$Id: lib_delwin.c,v 1.28 2024/07/27 18:57:35 tom Exp $")
+ 
+ static bool
+-cannot_delete(WINDOW *win)
++cannot_delete(const WINDOW *win)
+ {
+     bool result = TRUE;
+     bool found = FALSE;
+Index: ncurses/base/lib_freeall.c
+Prereq:  1.76 
+--- ncurses-6.5-20240720+/ncurses/base/lib_freeall.c	2021-11-06 21:52:49.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/base/lib_freeall.c	2024-07-27 19:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2018-2021,2024 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 @@
+ extern int malloc_errfd;	/* FIXME */
+ #endif
+ 
+-MODULE_ID("$Id: lib_freeall.c,v 1.76 2021/11/06 21:52:49 tom Exp $")
++MODULE_ID("$Id: lib_freeall.c,v 1.77 2024/07/27 19:22:23 tom Exp $")
+ 
+ /*
+  * Free all ncurses data.  This is used for testing only (there's no practical
+@@ -87,7 +87,7 @@
+ #endif
+ 
+ 		for (each_window(SP_PARM, q)) {
+-		    WINDOW *q_win = &(q->win);
++		    const WINDOW *q_win = &(q->win);
+ 
+ #ifndef USE_SP_WINDOWLIST
+ 		    if (q->screen != SP_PARM)
+Index: ncurses/base/lib_getstr.c
+Prereq:  1.39 
+--- ncurses-6.5-20240720+/ncurses/base/lib_getstr.c	2023-04-29 19:00:17.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/base/lib_getstr.c	2024-07-27 19:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2021,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2011,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -42,14 +42,14 @@
+ #define NEED_KEY_EVENT
+ #include 
+ 
+-MODULE_ID("$Id: lib_getstr.c,v 1.39 2023/04/29 19:00:17 tom Exp $")
++MODULE_ID("$Id: lib_getstr.c,v 1.40 2024/07/27 19:22:23 tom Exp $")
+ 
+ /*
+  * This wipes out the last character, no matter whether it was a tab, control
+  * or other character, and handles reverse wraparound.
+  */
+ static char *
+-WipeOut(WINDOW *win, int y, int x, char *first, char *last, int echoed)
++WipeOut(WINDOW *win, int y, int x, const char *first, char *last, int echoed)
+ {
+     if (last > first) {
+ 	*--last = '\0';
+@@ -81,7 +81,7 @@
+     TTY_FLAGS save_flags;
+     char erasec;
+     char killc;
+-    char *oldstr;
++    const char *oldstr;
+     int ch;
+     int y, x;
+ 
+Index: ncurses/base/lib_insch.c
+Prereq:  1.37 
+--- ncurses-6.5-20240720+/ncurses/base/lib_insch.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/base/lib_insch.c	2024-07-27 19:23:21.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2013,2016 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_insch.c,v 1.37 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_insch.c,v 1.38 2024/07/27 19:23:21 tom Exp $")
+ 
+ /*
+  * Insert the given character, updating the current location to simplify
+@@ -90,7 +90,7 @@
+ 		struct ldat *line = &(win->_line[win->_cury]);
+ 		NCURSES_CH_T *end = &(line->text[win->_curx]);
+ 		NCURSES_CH_T *temp1 = &(line->text[win->_maxx]);
+-		NCURSES_CH_T *temp2 = temp1 - 1;
++		const NCURSES_CH_T *temp2 = temp1 - 1;
+ 
+ 		SetChar2(wch, ch);
+ 
+Index: ncurses/base/lib_instr.c
+Prereq:  1.26 
+--- ncurses-6.5-20240720+/ncurses/base/lib_instr.c	2023-06-03 12:37:04.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/base/lib_instr.c	2024-07-27 19:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2021,2023 Thomas E. Dickey                                *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -42,7 +42,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_instr.c,v 1.26 2023/06/03 12:37:04 tom Exp $")
++MODULE_ID("$Id: lib_instr.c,v 1.27 2024/07/27 19:22:23 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ winnstr(WINDOW *win, char *str, int n)
+@@ -63,7 +63,7 @@
+ 
+ 	for (; i < n;) {
+ #if USE_WIDEC_SUPPORT
+-	    cchar_t *cell = &(text[col]);
++	    const cchar_t *cell = &(text[col]);
+ 	    attr_t attrs;
+ 	    NCURSES_PAIRS_T pair;
+ 	    char *tmp;
+Index: ncurses/base/lib_mvwin.c
+Prereq:  1.20 
+--- ncurses-6.5-20240720+/ncurses/base/lib_mvwin.c	2021-10-23 18:57:41.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/base/lib_mvwin.c	2024-07-27 19:23:59.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -43,13 +43,13 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_mvwin.c,v 1.20 2021/10/23 18:57:41 tom Exp $")
++MODULE_ID("$Id: lib_mvwin.c,v 1.21 2024/07/27 19:23:59 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ mvwin(WINDOW *win, int by, int bx)
+ {
+ #if NCURSES_SP_FUNCS
+-    SCREEN *sp = _nc_screen_of(win);
++    const SCREEN *sp = _nc_screen_of(win);
+ #endif
+ 
+     T((T_CALLED("mvwin(%p,%d,%d)"), (void *) win, by, bx));
+Index: ncurses/base/lib_printw.c
+Prereq:  1.28 
+--- ncurses-6.5-20240720+/ncurses/base/lib_printw.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/base/lib_printw.c	2024-07-27 19:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2019,2020 Thomas E. Dickey                                *
++ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2012,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_printw.c,v 1.28 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_printw.c,v 1.29 2024/07/27 19:22:23 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ printw(const char *fmt, ...)
+@@ -133,7 +133,7 @@
+ NCURSES_EXPORT(int)
+ vwprintw(WINDOW *win, const char *fmt, va_list argp)
+ {
+-    char *buf;
++    const char *buf;
+     int code = ERR;
+ #if NCURSES_SP_FUNCS
+     SCREEN *sp = _nc_screen_of(win);
+@@ -151,7 +151,7 @@
+ NCURSES_EXPORT(int)
+ vw_printw(WINDOW *win, const char *fmt, va_list argp)
+ {
+-    char *buf;
++    const char *buf;
+     int code = ERR;
+ #if NCURSES_SP_FUNCS
+     SCREEN *sp = _nc_screen_of(win);
+Index: ncurses/base/lib_screen.c
+Prereq:  1.105 
+--- ncurses-6.5-20240720+/ncurses/base/lib_screen.c	2023-04-28 20:58:54.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/base/lib_screen.c	2024-07-27 19:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2021,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -42,7 +42,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_screen.c,v 1.105 2023/04/28 20:58:54 tom Exp $")
++MODULE_ID("$Id: lib_screen.c,v 1.106 2024/07/27 19:22:23 tom Exp $")
+ 
+ #define MAX_SIZE 0x3fff		/* 16k is big enough for a window or pad */
+ 
+@@ -222,7 +222,6 @@
+ 	    source++;
+ 	    found = FALSE;
+ 	} else if (found) {
+-	    size_t n;
+ 	    char *next = source;
+ 
+ 	    if (source[0] == GUTTER) {
+@@ -241,6 +240,8 @@
+ 		*target |= pair;
+ 		*color = value;
+ 	    } else {
++		size_t n;
++
+ 		while (isalnum(UChar(*next))) {
+ 		    ++next;
+ 		}
+@@ -304,7 +305,7 @@
+ 	if (limit) {
+ 	    *target = 0;
+ 	    while (limit-- > 0) {
+-		char *find = strchr(digits, *source++);
++		const char *find = strchr(digits, *source++);
+ 		int ch = (find != 0) ? (int) (find - digits) : -1;
+ 		*target *= base;
+ 		if (ch >= 0 && ch < base) {
+@@ -337,7 +338,7 @@
+ 
+ #if NCURSES_WIDECHAR
+ static char *
+-decode_cchar(char *source, cchar_t *fillin, cchar_t *target)
++decode_cchar(char *source, const cchar_t *fillin, cchar_t *target)
+ {
+     int color;
+     attr_t attr = fillin->attr;
+@@ -382,7 +383,7 @@
+ 
+     memset(win, 0, sizeof(WINDOW));
+     for (;;) {
+-	char *name;
++	const char *name;
+ 	char *value;
+ 	char *txt = read_txt(fp);
+ 
+Index: ncurses/base/lib_slkrefr.c
+Prereq:  1.32 
+--- ncurses-6.5-20240720+/ncurses/base/lib_slkrefr.c	2021-09-04 10:54:35.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/base/lib_slkrefr.c	2024-07-27 19:23:59.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2013,2014 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -44,7 +44,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_slkrefr.c,v 1.32 2021/09/04 10:54:35 tom Exp $")
++MODULE_ID("$Id: lib_slkrefr.c,v 1.33 2024/07/27 19:23:59 tom Exp $")
+ 
+ #ifdef USE_TERM_DRIVER
+ #define NumLabels    InfoOf(SP_PARM).numlabels
+@@ -58,7 +58,7 @@
+ static void
+ slk_paint_info(WINDOW *win)
+ {
+-    SCREEN *sp = _nc_screen_of(win);
++    const SCREEN *sp = _nc_screen_of(win);
+ 
+     if (win && sp && (sp->slk_format == 4)) {
+ 	int i;
+Index: ncurses/base/new_pair.c
+Prereq:  1.23 
+--- ncurses-6.5-20240720+/ncurses/base/new_pair.c	2021-08-16 22:11:26.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/base/new_pair.c	2024-07-27 19:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2018-2021,2024 Thomas E. Dickey                                *
+  * Copyright 2017 Free Software Foundation, Inc.                            *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -61,7 +61,7 @@
+ 
+ #endif
+ 
+-MODULE_ID("$Id: new_pair.c,v 1.23 2021/08/16 22:11:26 tom Exp $")
++MODULE_ID("$Id: new_pair.c,v 1.24 2024/07/27 19:22:23 tom Exp $")
+ 
+ #if NCURSES_EXT_COLORS
+ 
+@@ -151,7 +151,7 @@
+     if (sp != 0) {
+ 	void *pp;
+ 	if ((pp = tfind(&find, &sp->_ordered_pairs, compare_data)) != 0) {
+-	    colorpair_t *temp = *(colorpair_t **) pp;
++	    const colorpair_t *temp = *(colorpair_t **) pp;
+ 	    result = (int) (temp - sp->_color_pairs);
+ 	}
+     }
+@@ -252,7 +252,7 @@
+ {
+     int n;
+     for (n = 0; n < length; ++n) {
+-	void *find = tfind(source + n, &sp->_ordered_pairs, compare_data);
++	const void *find = tfind(source + n, &sp->_ordered_pairs, compare_data);
+ 	if (find != 0) {
+ 	    tdelete(source + n, &sp->_ordered_pairs, compare_data);
+ 	    tsearch(target + n, &sp->_ordered_pairs, compare_data);
+Index: ncurses/base/resizeterm.c
+Prereq:  1.53 
+--- ncurses-6.5-20240720+/ncurses/base/resizeterm.c	2024-04-20 21:54:14.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/base/resizeterm.c	2024-07-27 23:04:55.000000000 +0000
+@@ -46,7 +46,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: resizeterm.c,v 1.53 2024/04/20 21:54:14 tom Exp $")
++MODULE_ID("$Id: resizeterm.c,v 1.55 2024/07/27 23:04:55 tom Exp $")
+ 
+ /*
+  * If we're trying to be reentrant, do not want any local statics.
+@@ -219,7 +219,7 @@
+     int bottom = CurLines + _nc_screen_of(win)->_topstolen - stolen;
+     int myLines = win->_maxy + 1;
+     int myCols = win->_maxx + 1;
+-    ripoff_t *rop = ripped_window(win);
++    const ripoff_t *rop = ripped_window(win);
+ 
+     T((T_CALLED("adjust_window(%p,%d,%d)%s depth %d/%d currently %ldx%ld at %ld,%ld"),
+        (void *) win, ToLines, ToCols,
+Index: ncurses/base/safe_sprintf.c
+Prereq:  1.37 
+--- ncurses-6.5-20240720+/ncurses/base/safe_sprintf.c	2023-09-30 10:42:42.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/base/safe_sprintf.c	2024-07-27 19:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2021,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2013 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -34,7 +34,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: safe_sprintf.c,v 1.37 2023/09/30 10:42:42 tom Exp $")
++MODULE_ID("$Id: safe_sprintf.c,v 1.38 2024/07/27 19:22:23 tom Exp $")
+ 
+ #if USE_SAFE_SPRINTF
+ 
+@@ -262,10 +262,9 @@
+ 
+ 	if (my_buffer != NULL) {
+ # if HAVE_VSNPRINTF
+-	    /* SUSv2, 1997 */
+-	    int used;
+-
+ 	    do {
++		/* SUSv2, 1997 */
++		int used;
+ 		va_list ap2;
+ 
+ 		begin_va_copy(ap2, ap);
+Index: ncurses/tinfo/alloc_ttype.c
+Prereq:  1.51 
+--- ncurses-6.5-20240720+/ncurses/tinfo/alloc_ttype.c	2023-09-09 23:15:53.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/tinfo/alloc_ttype.c	2024-07-27 19:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1999-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: alloc_ttype.c,v 1.51 2023/09/09 23:15:53 tom Exp $")
++MODULE_ID("$Id: alloc_ttype.c,v 1.52 2024/07/27 19:22:23 tom Exp $")
+ 
+ #if NCURSES_XNAMES
+ /*
+@@ -181,7 +181,7 @@
+  * Returns the first index in ext_Names[] for the given token-type
+  */
+ static unsigned
+-_nc_first_ext_name(TERMTYPE2 *tp, int token_type)
++_nc_first_ext_name(const TERMTYPE2 *tp, int token_type)
+ {
+     unsigned first;
+ 
+@@ -206,7 +206,7 @@
+  * Returns the last index in ext_Names[] for the given token-type
+  */
+ static unsigned
+-_nc_last_ext_name(TERMTYPE2 *tp, int token_type)
++_nc_last_ext_name(const TERMTYPE2 *tp, int token_type)
+ {
+     unsigned last;
+ 
+@@ -229,7 +229,7 @@
+  * Lookup an entry from extended-names, returning -1 if not found
+  */
+ static int
+-_nc_find_ext_name(TERMTYPE2 *tp, char *name, int token_type)
++_nc_find_ext_name(const TERMTYPE2 *tp, const char *name, int token_type)
+ {
+     unsigned j;
+     unsigned first = _nc_first_ext_name(tp, token_type);
+@@ -248,7 +248,7 @@
+  * (e.g., Booleans[]).
+  */
+ static int
+-_nc_ext_data_index(TERMTYPE2 *tp, int n, int token_type)
++_nc_ext_data_index(const TERMTYPE2 *tp, int n, int token_type)
+ {
+     switch (token_type) {
+     case BOOLEAN:
+@@ -271,7 +271,7 @@
+  * data.
+  */
+ static bool
+-_nc_del_ext_name(TERMTYPE2 *tp, char *name, int token_type)
++_nc_del_ext_name(TERMTYPE2 *tp, const char *name, int token_type)
+ {
+     int first;
+ 
+Index: ncurses/tinfo/captoinfo.c
+Prereq:  1.102 
+--- ncurses-6.5-20240720+/ncurses/tinfo/captoinfo.c	2021-09-04 10:29:15.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/tinfo/captoinfo.c	2024-07-27 19:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2018-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -98,7 +98,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: captoinfo.c,v 1.102 2021/09/04 10:29:15 tom Exp $")
++MODULE_ID("$Id: captoinfo.c,v 1.103 2024/07/27 19:22:23 tom Exp $")
+ 
+ #if 0
+ #define DEBUG_THIS(p) DEBUG(9, p)
+Index: ncurses/tinfo/comp_parse.c
+Prereq:  1.134 
+--- ncurses-6.5-20240720+/ncurses/tinfo/comp_parse.c	2024-02-10 15:52:11.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/tinfo/comp_parse.c	2024-07-27 19:15:16.000000000 +0000
+@@ -48,7 +48,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: comp_parse.c,v 1.134 2024/02/10 15:52:11 tom Exp $")
++MODULE_ID("$Id: comp_parse.c,v 1.135 2024/07/27 19:15:16 tom Exp $")
+ 
+ static void sanity_check2(TERMTYPE2 *, bool);
+ NCURSES_IMPEXP void (NCURSES_API *_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2;
+@@ -109,7 +109,9 @@
+ static bool
+ check_collisions(char *n1, char *n2, int counter)
+ {
+-    char *pstart, *qstart, *pend, *qend;
++    const char *pstart;
++    const char *qstart;
++    char *pend, *qend;
+     char nc1[NAMEBUFFER_SIZE];
+     char nc2[NAMEBUFFER_SIZE];
+ 
+Index: ncurses/tinfo/comp_scan.c
+Prereq:  1.122 
+--- ncurses-6.5-20240720+/ncurses/tinfo/comp_scan.c	2023-05-27 20:13:10.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/tinfo/comp_scan.c	2024-07-27 19:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+-,* Copyright 2020-2022,2023 Thomas E. Dickey                                *
++,* Copyright 2020-2023,2024 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 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: comp_scan.c,v 1.122 2023/05/27 20:13:10 tom Exp $")
++MODULE_ID("$Id: comp_scan.c,v 1.123 2024/07/27 19:22:23 tom Exp $")
+ 
+ /*
+  * Maximum length of string capability we'll accept before raising an error.
+@@ -551,7 +551,7 @@
+ 			    ;
+ 			}
+ 			if (islower(UChar(*s))) {
+-			    char *name = s;
++			    const char *name = s;
+ 			    while (isalnum(UChar(*s))) {
+ 				++s;
+ 			    }
+Index: ncurses/tinfo/db_iterator.c
+Prereq:  1.50 
+--- ncurses-6.5-20240720+/ncurses/tinfo/db_iterator.c	2023-06-24 21:52:32.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/tinfo/db_iterator.c	2024-07-27 19:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2006-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -44,7 +44,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: db_iterator.c,v 1.50 2023/06/24 21:52:32 tom Exp $")
++MODULE_ID("$Id: db_iterator.c,v 1.51 2024/07/27 19:22:23 tom Exp $")
+ 
+ #define HaveTicDirectory _nc_globals.have_tic_directory
+ #define KeepTicDirectory _nc_globals.keep_tic_directory
+@@ -124,7 +124,7 @@
+ 
+     if (which < dbdLAST) {
+ 	char *value;
+-	char *cached_value = my_vars[which].value;
++	const char *cached_value = my_vars[which].value;
+ 	bool same_value;
+ 
+ 	if ((value = getenv(name)) != 0) {
+Index: ncurses/tinfo/entries.c
+Prereq:  1.35 
+--- ncurses-6.5-20240720+/ncurses/tinfo/entries.c	2023-05-27 20:13:10.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/tinfo/entries.c	2024-07-27 19:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 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.35 2023/05/27 20:13:10 tom Exp $")
++MODULE_ID("$Id: entries.c,v 1.36 2024/07/27 19:22:23 tom Exp $")
+ 
+ /****************************************************************************
+  *
+Index: ncurses/tinfo/getenv_num.c
+Prereq:  1.8 
+--- ncurses-6.5-20240720+/ncurses/tinfo/getenv_num.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/tinfo/getenv_num.c	2024-07-27 19:23:59.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018,2020 Thomas E. Dickey                                     *
++ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2013 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -37,13 +37,13 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: getenv_num.c,v 1.8 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: getenv_num.c,v 1.9 2024/07/27 19:23:59 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ _nc_getenv_num(const char *name)
+ {
+     char *dst = 0;
+-    char *src = getenv(name);
++    const char *src = getenv(name);
+     long value;
+ 
+     if ((src == 0)
+Index: ncurses/tinfo/home_terminfo.c
+Prereq:  1.17 
+--- ncurses-6.5-20240720+/ncurses/tinfo/home_terminfo.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/tinfo/home_terminfo.c	2024-07-27 19:23:21.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2012,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -38,7 +38,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: home_terminfo.c,v 1.17 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: home_terminfo.c,v 1.18 2024/07/27 19:23:21 tom Exp $")
+ 
+ /* ncurses extension...fall back on user's private directory */
+ 
+@@ -52,7 +52,7 @@
+     if (use_terminfo_vars()) {
+ 
+ 	if (MyBuffer == 0) {
+-	    char *home;
++	    const char *home;
+ 
+ 	    if ((home = getenv("HOME")) != 0) {
+ 		size_t want = (strlen(home) + sizeof(PRIVATE_INFO));
+Index: ncurses/tinfo/init_keytry.c
+Prereq:  1.20 
+--- ncurses-6.5-20240720+/ncurses/tinfo/init_keytry.c	2023-09-16 12:55:01.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/tinfo/init_keytry.c	2024-07-27 19:23:59.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2023 Thomas E. Dickey                                     *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1999-2010,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ #include 
+ #include 		/* struct tinfo_fkeys */
+ 
+-MODULE_ID("$Id: init_keytry.c,v 1.20 2023/09/16 12:55:01 tom Exp $")
++MODULE_ID("$Id: init_keytry.c,v 1.21 2024/07/27 19:23:59 tom Exp $")
+ 
+ /*
+ **      _nc_init_keytry()
+@@ -94,7 +94,7 @@
+ 	    TERMTYPE *tp = &(sp->_term->type);
+ 	    for (n = STRCOUNT; n < NUM_STRINGS(tp); ++n) {
+ 		const char *name = ExtStrname(tp, (int) n, strnames);
+-		char *value = tp->Strings[n];
++		const char *value = tp->Strings[n];
+ 		if (name != 0
+ 		    && *name == 'k'
+ 		    && VALID_STRING(value)
+Index: ncurses/tinfo/lib_print.c
+Prereq:  1.31 
+--- ncurses-6.5-20240720+/ncurses/tinfo/lib_print.c	2023-06-10 12:44:41.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/tinfo/lib_print.c	2024-07-27 19:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2021,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2011,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -40,14 +40,15 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_print.c,v 1.31 2023/06/10 12:44:41 tom Exp $")
++MODULE_ID("$Id: lib_print.c,v 1.32 2024/07/27 19:22:23 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ NCURSES_SP_NAME(mcprint) (NCURSES_SP_DCLx char *data, int len)
+ /* ship binary character data to the printer via mc4/mc5/mc5p */
+ {
+     int result;
+-    char *mybuf = NULL, *switchon;
++    char *mybuf = NULL;
++    const char *switchon;
+     size_t onsize, offsize;
+     size_t need;
+ 
+Index: ncurses/tinfo/lib_setup.c
+Prereq:  1.241 
+--- ncurses-6.5-20240720+/ncurses/tinfo/lib_setup.c	2024-05-11 19:07:34.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/tinfo/lib_setup.c	2024-07-27 19:14:45.000000000 +0000
+@@ -49,7 +49,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: lib_setup.c,v 1.241 2024/05/11 19:07:34 tom Exp $")
++MODULE_ID("$Id: lib_setup.c,v 1.242 2024/07/27 19:14:45 tom Exp $")
+ 
+ /****************************************************************************
+  *
+@@ -362,10 +362,10 @@
+ }
+ 
+ static bool
+-set_position(NCURSES_SP_DCLx TERMINAL *termp, int row, int col)
++set_position(NCURSES_SP_DCLx const TERMINAL *termp, int row, int col)
+ {
+     bool result;
+-    char *actual = TIPARM_2(cursor_address, row, col);
++    const char *actual = TIPARM_2(cursor_address, row, col);
+     T((T_CALLED("set_position %d,%d)"), row, col));
+ #if NCURSES_SP_FUNCS
+     result = (NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx "set_position",
+Index: ncurses/tinfo/lib_termcap.c
+Prereq:  1.89 
+--- ncurses-6.5-20240720+/ncurses/tinfo/lib_termcap.c	2023-05-27 20:13:10.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/tinfo/lib_termcap.c	2024-07-27 19:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -49,7 +49,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_termcap.c,v 1.89 2023/05/27 20:13:10 tom Exp $")
++MODULE_ID("$Id: lib_termcap.c,v 1.90 2024/07/27 19:22:23 tom Exp $")
+ 
+ NCURSES_EXPORT_VAR(char *) UP = 0;
+ NCURSES_EXPORT_VAR(char *) BC = 0;
+@@ -132,7 +132,7 @@
+ 	     * Also free the terminfo data that we loaded (much bigger leak).
+ 	     */
+ 	    if (LAST_TRM != 0 && LAST_TRM != TerminalOf(SP_PARM)) {
+-		TERMINAL *trm = LAST_TRM;
++		const TERMINAL *trm = LAST_TRM;
+ 		NCURSES_SP_NAME(del_curterm) (NCURSES_SP_ARGx LAST_TRM);
+ 		for (CacheInx = 0; CacheInx < TGETENT_MAX; ++CacheInx)
+ 		    if (LAST_TRM == trm)
+Index: ncurses/tinfo/lib_tparm.c
+Prereq:  1.153 
+--- ncurses-6.5-20240720+/ncurses/tinfo/lib_tparm.c	2023-11-04 19:28:41.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/tinfo/lib_tparm.c	2024-07-27 19:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2021,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -53,7 +53,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: lib_tparm.c,v 1.153 2023/11/04 19:28:41 tom Exp $")
++MODULE_ID("$Id: lib_tparm.c,v 1.154 2024/07/27 19:22:23 tom Exp $")
+ 
+ /*
+  *	char *
+@@ -1099,7 +1099,7 @@
+  * are parameterized accept only numeric parameters.
+  */
+ static bool
+-check_string_caps(TPARM_DATA *data, const char *string)
++check_string_caps(const TPARM_DATA *data, const char *string)
+ {
+     bool result = FALSE;
+ 
+@@ -1126,7 +1126,7 @@
+ #endif
+ #if NCURSES_XNAMES
+ 	else {
+-	    char *check;
++	    const char *check;
+ 
+ 	    check = tigetstr("Cs");
+ 	    if (CHECK_CAP(check))
+@@ -1354,7 +1354,7 @@
+ 	    }
+ #if NCURSES_XNAMES
+ 	    else {
+-		char *check;
++		const char *check;
+ 
+ 		check = tigetstr("xm");
+ 		if (CHECK_CAP(check)) {
+Index: ncurses/tinfo/parse_entry.c
+Prereq:  1.108 
+--- ncurses-6.5-20240720+/ncurses/tinfo/parse_entry.c	2023-04-24 22:32:33.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/tinfo/parse_entry.c	2024-07-27 19:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -48,7 +48,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: parse_entry.c,v 1.108 2023/04/24 22:32:33 tom Exp $")
++MODULE_ID("$Id: parse_entry.c,v 1.109 2024/07/27 19:22:23 tom Exp $")
+ 
+ #ifdef LINT
+ static short const parametrized[] =
+@@ -695,7 +695,7 @@
+ }
+ 
+ static void
+-append_acs0(string_desc * dst, int code, char *src, size_t off)
++append_acs0(string_desc * dst, int code, const char *src, size_t off)
+ {
+     if (src != 0 && off < strlen(src)) {
+ 	char temp[3];
+Index: ncurses/tinfo/read_entry.c
+Prereq:  1.171 
+--- ncurses-6.5-20240720+/ncurses/tinfo/read_entry.c	2023-09-16 16:30:34.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/tinfo/read_entry.c	2024-07-27 23:07:02.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -42,7 +42,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: read_entry.c,v 1.171 2023/09/16 16:30:34 tom Exp $")
++MODULE_ID("$Id: read_entry.c,v 1.173 2024/07/27 23:07:02 tom Exp $")
+ 
+ #define MyNumber(n) (short) LOW_MSB(n)
+ 
+@@ -51,7 +51,7 @@
+ #if NCURSES_USE_DATABASE
+ #if NCURSES_EXT_NUMBERS
+ static size_t
+-convert_16bits(char *buf, NCURSES_INT2 *Numbers, int count)
++convert_16bits(const char *buf, NCURSES_INT2 *Numbers, int count)
+ {
+     int i;
+     size_t j;
+@@ -77,7 +77,7 @@
+ }
+ 
+ static size_t
+-convert_32bits(char *buf, NCURSES_INT2 *Numbers, int count)
++convert_32bits(const char *buf, NCURSES_INT2 *Numbers, int count)
+ {
+     int i;
+     size_t j;
+@@ -98,7 +98,7 @@
+ }
+ #else
+ static size_t
+-convert_32bits(char *buf, NCURSES_INT2 *Numbers, int count)
++convert_32bits(const char *buf, NCURSES_INT2 *Numbers, int count)
+ {
+     int i, j;
+     unsigned char ch;
+@@ -122,7 +122,7 @@
+ }
+ 
+ static size_t
+-convert_16bits(char *buf, NCURSES_INT2 *Numbers, int count)
++convert_16bits(const char *buf, NCURSES_INT2 *Numbers, int count)
+ {
+     int i;
+     for (i = 0; i < count; i++) {
+@@ -195,7 +195,7 @@
+ }
+ 
+ static int
+-fake_read(char *src, int *offset, int limit, char *dst, unsigned want)
++fake_read(const char *src, int *offset, int limit, char *dst, unsigned want)
+ {
+     int have = (limit - *offset);
+ 
+@@ -285,7 +285,7 @@
+     char buf[MAX_ENTRY_SIZE + 2];
+     char *string_table;
+     unsigned want, have;
+-    size_t (*convert_numbers) (char *, NCURSES_INT2 *, int);
++    size_t (*convert_numbers) (const char *, NCURSES_INT2 *, int);
+     int size_of_numbers;
+     int max_entry_size = MAX_ENTRY_SIZE;
+ 
+@@ -728,7 +728,7 @@
+ static int
+ decode_quickdump(char *target, const char *source)
+ {
+-    char *base = target;
++    const char *base = target;
+     int result = 0;
+ 
+     if (!strncmp(source, "b64:", (size_t) 4)) {
+Index: ncurses/tinfo/trim_sgr0.c
+Prereq:  1.22 
+--- ncurses-6.5-20240720+/ncurses/tinfo/trim_sgr0.c	2023-09-23 18:47:56.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/tinfo/trim_sgr0.c	2024-07-27 19:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2021,2023 Thomas E. Dickey                                *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2005-2012,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -37,13 +37,13 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: trim_sgr0.c,v 1.22 2023/09/23 18:47:56 tom Exp $")
++MODULE_ID("$Id: trim_sgr0.c,v 1.23 2024/07/27 19:22:23 tom Exp $")
+ 
+ #undef CUR
+ #define CUR tp->
+ 
+ static char *
+-set_attribute_9(TERMTYPE2 *tp, int flag)
++set_attribute_9(const TERMTYPE2 *tp, int flag)
+ {
+     const char *value;
+     char *result;
+@@ -99,7 +99,7 @@
+  * to the end of the s-string.
+  */
+ static bool
+-rewrite_sgr(char *s, char *attr)
++rewrite_sgr(char *s, const char *attr)
+ {
+     if (s != 0) {
+ 	if (PRESENT(attr)) {
+Index: ncurses/tinfo/write_entry.c
+Prereq:  1.132 
+--- ncurses-6.5-20240720+/ncurses/tinfo/write_entry.c	2024-04-20 17:58:51.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/tinfo/write_entry.c	2024-07-27 19:15:16.000000000 +0000
+@@ -42,7 +42,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: write_entry.c,v 1.132 2024/04/20 17:58:51 tom Exp $")
++MODULE_ID("$Id: write_entry.c,v 1.133 2024/07/27 19:15:16 tom Exp $")
+ 
+ #if 1
+ #define TRACE_OUT(p) DEBUG(2, p)
+@@ -126,7 +126,7 @@
+     static bool verified[sizeof(dirnames)];
+ 
+     char dir[sizeof(LEAF_FMT)];
+-    char *s = 0;
++    const char *s = 0;
+ 
+     if (code == 0 || (s = (strchr) (dirnames, code)) == 0) {
+ 	_nc_err_abort("Illegal terminfo subdirectory \"" LEAF_FMT "\"", code);
+@@ -552,7 +552,7 @@
+ fake_write(char *dst,
+ 	   unsigned *offset,
+ 	   size_t limit,
+-	   char *src,
++	   const char *src,
+ 	   size_t want,
+ 	   size_t size)
+ {
+@@ -658,7 +658,7 @@
+ 
+ #if NCURSES_XNAMES
+ static unsigned
+-extended_Booleans(TERMTYPE2 *tp)
++extended_Booleans(const TERMTYPE2 *tp)
+ {
+     unsigned result = 0;
+     unsigned i;
+@@ -671,7 +671,7 @@
+ }
+ 
+ static unsigned
+-extended_Numbers(TERMTYPE2 *tp)
++extended_Numbers(const TERMTYPE2 *tp)
+ {
+     unsigned result = 0;
+     unsigned i;
+@@ -684,7 +684,7 @@
+ }
+ 
+ static unsigned
+-extended_Strings(TERMTYPE2 *tp)
++extended_Strings(const TERMTYPE2 *tp)
+ {
+     unsigned short result = 0;
+     unsigned short i;
+@@ -701,7 +701,7 @@
+  * clause - discard the unneeded data.
+  */
+ static bool
+-extended_object(TERMTYPE2 *tp)
++extended_object(const TERMTYPE2 *tp)
+ {
+     bool result = FALSE;
+ 
+Index: ncurses/trace/lib_traceatr.c
+Prereq:  1.96 
+--- ncurses-6.5-20240720+/ncurses/trace/lib_traceatr.c	2024-02-04 00:11:35.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/trace/lib_traceatr.c	2024-07-27 19:08:04.000000000 +0000
+@@ -44,7 +44,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_traceatr.c,v 1.96 2024/02/04 00:11:35 tom Exp $")
++MODULE_ID("$Id: lib_traceatr.c,v 1.97 2024/07/27 19:08:04 tom Exp $")
+ 
+ #define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name))
+ 
+@@ -255,7 +255,7 @@
+ #endif
+     if (SP_PARM != 0 && (attr & A_ALTCHARSET) && (acs_chars != 0)) {
+ 	char *cp;
+-	char *found = 0;
++	const char *found = 0;
+ 
+ 	for (cp = acs_chars; cp[0] && cp[1]; cp += 2) {
+ 	    if (ChCharOf(UChar(cp[1])) == ChCharOf(ch)) {
+Index: ncurses/trace/varargs.c
+Prereq:  1.13 
+--- ncurses-6.5-20240720+/ncurses/trace/varargs.c	2023-06-24 13:41:46.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/trace/varargs.c	2024-07-27 19:23:59.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2023 Thomas E. Dickey                                     *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2001-2008,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -35,7 +35,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: varargs.c,v 1.13 2023/06/24 13:41:46 tom Exp $")
++MODULE_ID("$Id: varargs.c,v 1.14 2024/07/27 19:23:59 tom Exp $")
+ 
+ #ifdef TRACE
+ 
+@@ -73,7 +73,7 @@
+ 
+     while (*fmt != '\0') {
+ 	if (*fmt == '%') {
+-	    char *pval = 0;	/* avoid const-cast */
++	    const char *pval = 0;	/* avoid const-cast */
+ 	    const char *sval = "";
+ 	    double fval = 0.0;
+ 	    int done = FALSE;
+Index: ncurses/tty/hashmap.c
+Prereq:  1.71 
+--- ncurses-6.5-20240720+/ncurses/tty/hashmap.c	2023-09-16 16:28:53.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/tty/hashmap.c	2024-07-27 19:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -74,7 +74,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: hashmap.c,v 1.71 2023/09/16 16:28:53 tom Exp $")
++MODULE_ID("$Id: hashmap.c,v 1.72 2024/07/27 19:22:23 tom Exp $")
+ 
+ #ifdef HASHDEBUG
+ 
+@@ -120,15 +120,14 @@
+ static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
+ 
+ static NCURSES_INLINE unsigned long
+-hash(SCREEN *sp, NCURSES_CH_T *text)
++hash(SCREEN *sp, const NCURSES_CH_T *text)
+ {
+     int i;
+-    NCURSES_CH_T ch;
+     unsigned long result = 0;
+     (void) sp;
+ 
+     for (i = TEXTWIDTH(sp); i > 0; i--) {
+-	ch = *text++;
++	NCURSES_CH_T ch = *text++;
+ 	result += (result << 5) + (unsigned long) HASH_VAL(ch);
+     }
+     return result;
+Index: ncurses/widechar/lib_add_wch.c
+Prereq:  1.18 
+--- ncurses-6.5-20240720+/ncurses/widechar/lib_add_wch.c	2023-07-15 17:34:12.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/widechar/lib_add_wch.c	2024-07-27 19:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2021,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2004-2011,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -40,7 +40,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: lib_add_wch.c,v 1.18 2023/07/15 17:34:12 tom Exp $")
++MODULE_ID("$Id: lib_add_wch.c,v 1.19 2024/07/27 19:22:23 tom Exp $")
+ 
+ /* clone/adapt lib_addch.c */
+ static const cchar_t blankchar = NewChar(BLANK_TEXT);
+@@ -115,7 +115,7 @@
+ #endif
+ 
+ static bool
+-newline_forces_scroll(WINDOW *win, NCURSES_SIZE_T *ypos)
++newline_forces_scroll(const WINDOW *win, NCURSES_SIZE_T *ypos)
+ {
+     bool result = FALSE;
+ 
+@@ -307,7 +307,7 @@
+ /* the workhorse function -- add a character to the given window */
+ {
+     NCURSES_SIZE_T x, y;
+-    wchar_t *s;
++    const wchar_t *s;
+     int tabsize = 8;
+ #if USE_REENTRANT
+     SCREEN *sp = _nc_screen_of(win);
+Index: ncurses/widechar/lib_cchar.c
+Prereq:  1.38 
+--- ncurses-6.5-20240720+/ncurses/widechar/lib_cchar.c	2022-07-27 08:03:16.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/widechar/lib_cchar.c	2024-07-27 19:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
++ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2001-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -37,7 +37,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: lib_cchar.c,v 1.38 2022/07/27 08:03:16 tom Exp $")
++MODULE_ID("$Id: lib_cchar.c,v 1.39 2024/07/27 19:22:23 tom Exp $")
+ 
+ /*
+  * The SuSv2 description leaves some room for interpretation.  We'll assume wch
+@@ -119,7 +119,7 @@
+     } else
+ #endif
+     if (wcval != NULL) {
+-	wchar_t *wp;
++	const wchar_t *wp;
+ 	int len;
+ 
+ #if HAVE_WMEMCHR
+Index: ncurses/widechar/lib_get_wstr.c
+Prereq:  1.21 
+--- ncurses-6.5-20240720+/ncurses/widechar/lib_get_wstr.c	2023-04-29 19:02:03.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/widechar/lib_get_wstr.c	2024-07-27 19:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2021,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2002-2009,2011 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -40,10 +40,10 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_get_wstr.c,v 1.21 2023/04/29 19:02:03 tom Exp $")
++MODULE_ID("$Id: lib_get_wstr.c,v 1.22 2024/07/27 19:22:23 tom Exp $")
+ 
+ static int
+-wadd_wint(WINDOW *win, wint_t *src)
++wadd_wint(WINDOW *win, const wint_t *src)
+ {
+     cchar_t tmp;
+     wchar_t wch[2];
+@@ -59,7 +59,7 @@
+  * or other character, and handles reverse wraparound.
+  */
+ static wint_t *
+-WipeOut(WINDOW *win, int y, int x, wint_t *first, wint_t *last, int echoed)
++WipeOut(WINDOW *win, int y, int x, const wint_t *first, wint_t *last, int echoed)
+ {
+     if (last > first) {
+ 	*--last = '\0';
+Index: ncurses/widechar/lib_in_wchnstr.c
+Prereq:  1.9 
+--- ncurses-6.5-20240720+/ncurses/widechar/lib_in_wchnstr.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/widechar/lib_in_wchnstr.c	2024-07-27 19:23:21.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 2002-2007,2009 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_in_wchnstr.c,v 1.9 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_in_wchnstr.c,v 1.10 2024/07/27 19:23:21 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ win_wchnstr(WINDOW *win, cchar_t *wchstr, int n)
+@@ -50,7 +50,7 @@
+     T((T_CALLED("win_wchnstr(%p,%p,%d)"), (void *) win, (void *) wchstr, n));
+     if (win != 0
+ 	&& wchstr != 0) {
+-	NCURSES_CH_T *src;
++	const NCURSES_CH_T *src;
+ 	int row, col;
+ 	int j, k, limit;
+ 
+Index: ncurses/widechar/lib_ins_wch.c
+Prereq:  1.29 
+--- ncurses-6.5-20240720+/ncurses/widechar/lib_ins_wch.c	2023-11-21 21:53:28.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/widechar/lib_ins_wch.c	2024-07-27 19:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2002-2016,2017 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_ins_wch.c,v 1.29 2023/11/21 21:53:28 tom Exp $")
++MODULE_ID("$Id: lib_ins_wch.c,v 1.30 2024/07/27 19:22:23 tom Exp $")
+ 
+ /*
+  * Insert the given character, updating the current location to simplify
+@@ -63,7 +63,7 @@
+ 	    struct ldat *line = &(win->_line[win->_cury]);
+ 	    NCURSES_CH_T *end = &(line->text[win->_curx]);
+ 	    NCURSES_CH_T *temp1 = &(line->text[win->_maxx]);
+-	    NCURSES_CH_T *temp2 = temp1 - cells;
++	    const NCURSES_CH_T *temp2 = temp1 - cells;
+ 
+ 	    CHANGED_TO_EOL(line, win->_curx, win->_maxx);
+ 	    while (temp1 > end)
+Index: ncurses/widechar/lib_inwstr.c
+Prereq:  1.10 
+--- ncurses-6.5-20240720+/ncurses/widechar/lib_inwstr.c	2024-06-08 21:22:24.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/widechar/lib_inwstr.c	2024-07-27 19:02:27.000000000 +0000
+@@ -40,13 +40,13 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_inwstr.c,v 1.10 2024/06/08 21:22:24 tom Exp $")
++MODULE_ID("$Id: lib_inwstr.c,v 1.11 2024/07/27 19:02:27 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ winnwstr(WINDOW *win, wchar_t *wstr, int n)
+ {
+     int count = 0;
+-    cchar_t *text;
++    const cchar_t *text;
+ 
+     T((T_CALLED("winnwstr(%p,%p,%d)"), (void *) win, (void *) wstr, n));
+     if (wstr != 0) {
+Index: ncurses/widechar/lib_key_name.c
+Prereq:  1.6 
+--- ncurses-6.5-20240720+/ncurses/widechar/lib_key_name.c	2023-06-03 12:15:34.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/widechar/lib_key_name.c	2024-07-27 19:23:59.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2023 Thomas E. Dickey                                     *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2007-2008,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -36,7 +36,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_key_name.c,v 1.6 2023/06/03 12:15:34 tom Exp $")
++MODULE_ID("$Id: lib_key_name.c,v 1.7 2024/07/27 19:23:59 tom Exp $")
+ 
+ #define MyData _nc_globals.key_name
+ 
+@@ -44,7 +44,7 @@
+ key_name(wchar_t c)
+ {
+     cchar_t my_cchar;
+-    wchar_t *my_wchars;
++    const wchar_t *my_wchars;
+     size_t len;
+     NCURSES_CONST char *result = NULL;
+ 
+Index: ncurses/widechar/lib_wunctrl.c
+Prereq:  1.17 
+--- ncurses-6.5-20240720+/ncurses/widechar/lib_wunctrl.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20240727/ncurses/widechar/lib_wunctrl.c	2024-07-27 19:23:21.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 2001-2011,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -36,17 +36,18 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_wunctrl.c,v 1.17 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_wunctrl.c,v 1.18 2024/07/27 19:23:21 tom Exp $")
+ 
+ NCURSES_EXPORT(wchar_t *)
+ NCURSES_SP_NAME(wunctrl) (NCURSES_SP_DCLx cchar_t *wc)
+ {
+-    static wchar_t str[CCHARW_MAX + 1], *wsp;
++    static wchar_t str[CCHARW_MAX + 1];
+     wchar_t *result;
+ 
+     if (wc == 0) {
+ 	result = 0;
+     } else if (SP_PARM != 0 && Charable(*wc)) {
++	wchar_t *wsp;
+ 	const char *p =
+ 	NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx
+ 				 (unsigned) _nc_to_char((wint_t)CharOf(*wc)));
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20240720+/package/debian-mingw/changelog	2024-07-20 10:19:56.000000000 +0000
++++ ncurses-6.5-20240727/package/debian-mingw/changelog	2024-07-27 13:25:06.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240720) unstable; urgency=low
++ncurses6td (6.5+20240727) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 20 Jul 2024 06:19:56 -0400
++ -- Thomas E. Dickey   Sat, 27 Jul 2024 09:25:06 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20240720+/package/debian-mingw64/changelog	2024-07-20 10:19:56.000000000 +0000
++++ ncurses-6.5-20240727/package/debian-mingw64/changelog	2024-07-27 13:25:06.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240720) unstable; urgency=low
++ncurses6td (6.5+20240727) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 20 Jul 2024 06:19:56 -0400
++ -- Thomas E. Dickey   Sat, 27 Jul 2024 09:25:06 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20240720+/package/debian/changelog	2024-07-20 10:19:56.000000000 +0000
++++ ncurses-6.5-20240727/package/debian/changelog	2024-07-27 13:25:06.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240720) unstable; urgency=low
++ncurses6td (6.5+20240727) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 20 Jul 2024 06:19:56 -0400
++ -- Thomas E. Dickey   Sat, 27 Jul 2024 09:25:06 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.658 
+--- ncurses-6.5-20240720+/package/mingw-ncurses.nsi	2024-07-20 10:19:56.000000000 +0000
++++ ncurses-6.5-20240727/package/mingw-ncurses.nsi	2024-07-27 13:25:06.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.658 2024/07/20 10:19:56 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.659 2024/07/27 13:25:06 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "0720"
++!define VERSION_MMDD  "0727"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20240720+/package/mingw-ncurses.spec	2024-07-20 10:19:56.000000000 +0000
++++ ncurses-6.5-20240727/package/mingw-ncurses.spec	2024-07-27 13:25:06.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20240720
++Release: 20240727
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20240720+/package/ncurses.spec	2024-07-20 10:19:56.000000000 +0000
++++ ncurses-6.5-20240727/package/ncurses.spec	2024-07-27 13:25:06.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20240720
++Release: 20240727
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20240720+/package/ncursest.spec	2024-07-20 10:19:56.000000000 +0000
++++ ncurses-6.5-20240727/package/ncursest.spec	2024-07-27 13:25:06.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20240720
++Release: 20240727
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/packages/ncurses/6.5/ncurses-6.5-20240810.patch b/packages/ncurses/6.5/ncurses-6.5-20240810.patch
new file mode 100644
index 0000000000..fb609a6c42
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20240810.patch
@@ -0,0 +1,39746 @@
+# ncurses 6.5 - patch 20240810 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20240810.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sat Aug 10 19:08:00 UTC 2024
+# ------------------------------------------------------------------------------
+# Ada95/aclocal.m4                 |   70 
+# Ada95/configure                  | 2587 ++++++++++----------
+# NEWS                             |   11 
+# VERSION                          |    2 
+# aclocal.m4                       |   83 
+# config.guess                     |   15 
+# config.sub                       |  733 ++++-
+# configure                        | 4725 ++++++++++++++++++-------------------
+# dist.mk                          |    4 
+# menu/menu.priv.h                 |    7 
+# misc/Makefile.in                 |   59 
+# misc/run_tic.in                  |   49 
+# 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/aclocal.m4                  |   80 
+# test/configure                   | 4006 +++++++++++++++----------------
+# test/configure.in                |    8 
+# 22 files changed, 6489 insertions(+), 5972 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/aclocal.m4
+Prereq:  1.217 
+--- ncurses-6.5-20240727+/Ada95/aclocal.m4	2024-06-22 17:42:22.000000000 +0000
++++ ncurses-6.5-20240810/Ada95/aclocal.m4	2024-08-10 15:52:30.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: aclocal.m4,v 1.217 2024/06/22 17:42:22 tom Exp $
++dnl $Id: aclocal.m4,v 1.220 2024/08/10 15:52:30 tom Exp $
+ dnl Macros used in NCURSES Ada95 auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -1622,6 +1622,26 @@
+ AC_SUBST(EXTRA_CFLAGS)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_GLOB_FULLPATH version: 2 updated: 2024/08/03 12:34:02
++dnl ----------------
++dnl Use this in case-statements to check for pathname syntax, i.e., absolute
++dnl pathnames.  The "x" is assumed since we provide an alternate form for DOS.
++AC_DEFUN([CF_GLOB_FULLPATH],[
++AC_REQUIRE([CF_WITH_SYSTYPE])dnl
++case "$cf_cv_system_name" in
++(cygwin*|msys*|mingw32*|mingw64|os2*)
++	GLOB_FULLPATH_POSIX='/*'
++	GLOB_FULLPATH_OTHER='[[a-zA-Z]]:[[\\/]]*'
++	;;
++(*)
++	GLOB_FULLPATH_POSIX='/*'
++	GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX
++	;;
++esac
++AC_SUBST(GLOB_FULLPATH_POSIX)
++AC_SUBST(GLOB_FULLPATH_OTHER)
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_GNATPREP_OPT_T version: 1 updated: 2014/08/02 18:37:25
+ dnl -----------------
+ AC_DEFUN([CF_GNATPREP_OPT_T],[
+@@ -3434,35 +3454,35 @@
+ 	AC_MSG_RESULT($PATH_SEPARATOR)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_PATH_SYNTAX version: 18 updated: 2020/12/31 18:40:20
++dnl CF_PATH_SYNTAX version: 19 updated: 2024/08/03 13:08:58
+ dnl --------------
+ dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
+ dnl begins with one of the prefix/exec_prefix variables, and then again if the
+ dnl result begins with 'NONE'.  This is necessary to work around autoconf's
+ dnl delayed evaluation of those symbols.
+ AC_DEFUN([CF_PATH_SYNTAX],[
++AC_REQUIRE([CF_GLOB_FULLPATH])dnl
++
+ if test "x$prefix" != xNONE; then
+ 	cf_path_syntax="$prefix"
+ else
+ 	cf_path_syntax="$ac_default_prefix"
+ fi
+ 
+-case ".[$]$1" in
+-(.\[$]\(*\)*|.\'*\'*)
+-	;;
+-(..|./*|.\\*)
++case "x[$]$1" in
++(x\[$]\(*\)*|x\'*\'*)
+ 	;;
+-(.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+-(.\[$]\{*prefix\}*|.\[$]\{*dir\}*)
++(x\[$]\{*prefix\}*|x\[$]\{*dir\}*)
+ 	eval $1="[$]$1"
+-	case ".[$]$1" in
+-	(.NONE/*)
++	case "x[$]$1" in
++	(xNONE/*)
+ 		$1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`
+ 		;;
+ 	esac
+ 	;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ 	$1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+@@ -3834,15 +3854,16 @@
+ AC_SUBST(cf_ada_config_C)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_PROG_INSTALL version: 10 updated: 2021/01/04 19:33:05
++dnl CF_PROG_INSTALL version: 11 updated: 2024/08/03 13:08:58
+ dnl ---------------
+ dnl Force $INSTALL to be an absolute-path.  Otherwise, edit_man.sh and the
+ dnl misc/tabset install won't work properly.  Usually this happens only when
+ dnl using the fallback mkinstalldirs script
+ AC_DEFUN([CF_PROG_INSTALL],
+ [AC_PROG_INSTALL
+-case $INSTALL in
+-(/*)
++AC_REQUIRE([CF_GLOB_FULLPATH])dnl
++case x$INSTALL in
++(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+ (*)
+ 	CF_DIRNAME(cf_dir,$INSTALL)
+@@ -4657,12 +4678,12 @@
+ $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_UTF8_LIB version: 10 updated: 2023/01/11 04:05:23
++dnl CF_UTF8_LIB version: 11 updated: 2024/08/10 10:23:45
+ dnl -----------
+ dnl Check for multibyte support, and if not found, utf8 compatibility library
+ AC_DEFUN([CF_UTF8_LIB],
+ [
+-AC_HAVE_HEADERS(wchar.h)
++AC_CHECK_HEADERS(wchar.h)
+ AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[
+ 	cf_save_LIBS="$LIBS"
+ 	AC_TRY_LINK([
+@@ -4949,7 +4970,7 @@
+ AC_SUBST($3)dnl
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 23 updated: 2023/11/22 20:48:30
++dnl CF_WITH_PKG_CONFIG_LIBDIR version: 25 updated: 2024/08/03 13:34:29
+ dnl -------------------------
+ dnl Allow the choice of the pkg-config library directory to be overridden.
+ dnl
+@@ -4963,6 +4984,7 @@
+ dnl optionally ignores $PKG_CONFIG_LIBDIR.  Very old versions of pkg-config,
+ dnl e.g., Solaris 10 also do not recognize $PKG_CONFIG_LIBDIR.
+ AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[
++AC_REQUIRE([CF_GLOB_FULLPATH])dnl
+ 
+ case "$PKG_CONFIG" in
+ (no|none|yes)
+@@ -4996,10 +5018,10 @@
+ 	;;
+ (x)
+ 	;;
+-(x/*\ *)
++(x$GLOB_FULLPATH_POSIX\ *|x$GLOB_FULLPATH_OTHER\ *)
+ 	PKG_CONFIG_LIBDIR=
+ 	;;
+-(x/*)
++(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	PKG_CONFIG_LIBDIR="$cf_search_path"
+ 	AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
+ 	cf_search_path=
+@@ -5018,7 +5040,15 @@
+ 			pkg-config \
+ 			pkgconf
+ 		do
+-			cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '`
++			cf_raw_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null`
++			case "$cf_raw_search_path" in
++			(*\\*)
++				cf_search_path=`echo "$cf_raw_search_path" | tr ';' ' ' | tr '\' '/'`
++				;;
++			(*/*)
++				cf_search_path=`echo "$cf_raw_search_path" | tr : ' '`
++				;;
++			esac
+ 			test -n "$cf_search_path" && break
+ 		done
+ 
+Index: Ada95/configure
+--- ncurses-6.5-20240727+/Ada95/configure	2024-07-06 18:15:37.000000000 +0000
++++ ncurses-6.5-20240810/Ada95/configure	2024-08-03 17:38:14.000000000 +0000
+@@ -3224,6 +3224,17 @@
+ 
+ test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
+ 
++case "$cf_cv_system_name" in
++(cygwin*|msys*|mingw32*|mingw64|os2*)
++	GLOB_FULLPATH_POSIX='/*'
++	GLOB_FULLPATH_OTHER='[a-zA-Z]:[\\/]*'
++	;;
++(*)
++	GLOB_FULLPATH_POSIX='/*'
++	GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX
++	;;
++esac
++
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+ # incompatible versions:
+@@ -3236,7 +3247,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:3239: checking for a BSD compatible install" >&5
++echo "$as_me:3250: 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
+@@ -3285,7 +3296,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:3288: result: $INSTALL" >&5
++echo "$as_me:3299: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -3296,8 +3307,8 @@
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+-case $INSTALL in
+-(/*)
++case x$INSTALL in
++(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+ (*)
+ 	cf_dir=`echo "$INSTALL" | sed -e 's%/[^/]*$%%'`
+@@ -3306,7 +3317,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:3309: checking if you want to install stripped executables" >&5
++echo "$as_me:3320: 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.
+@@ -3323,7 +3334,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:3326: result: $enable_stripping" >&5
++echo "$as_me:3337: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -3334,7 +3345,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:3337: checking if install accepts -p option" >&5
++echo "$as_me:3348: 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
+@@ -3365,10 +3376,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:3368: result: $cf_cv_install_p" >&5
++echo "$as_me:3379: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:3371: checking if install needs to be told about ownership" >&5
++echo "$as_me:3382: 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)
+@@ -3379,7 +3390,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:3382: result: $with_install_o" >&5
++echo "$as_me:3393: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -3390,7 +3401,7 @@
+ 
+ if test -n "$INSTALL_OPT_S"
+ then
+-	echo "$as_me:3393: checking if you want to specify strip-program" >&5
++	echo "$as_me:3404: checking if you want to specify strip-program" >&5
+ echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
+ 
+ # Check whether --with-strip-program or --without-strip-program was given.
+@@ -3400,11 +3411,11 @@
+ else
+   with_strip_program=no
+ fi;
+-	echo "$as_me:3403: result: $with_strip_program" >&5
++	echo "$as_me:3414: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ 	if test "$with_strip_program" != no
+ 	then
+-		echo "$as_me:3407: checking if strip-program is supported with this installer" >&5
++		echo "$as_me:3418: checking if strip-program is supported with this installer" >&5
+ echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
+ 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
+ 		check_install_strip=no
+@@ -3425,11 +3436,11 @@
+ 				done
+ 			fi
+ 		fi
+-		echo "$as_me:3428: result: $check_install_strip" >&5
++		echo "$as_me:3439: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ 		case "$check_install_strip" in
+ 		(no)
+-			{ echo "$as_me:3432: WARNING: $cf_install_program does not support strip program option" >&5
++			{ echo "$as_me:3443: WARNING: $cf_install_program does not support strip program option" >&5
+ echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
+ 			with_strip_program=no
+ 			;;
+@@ -3444,7 +3455,7 @@
+ 			chmod +x "$INSTALL"
+ 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
+ 
+-echo "${as_me:-configure}:3447: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:3458: testing created $INSTALL ..." 1>&5
+ 
+ 			;;
+ 		(option)
+@@ -3454,7 +3465,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:3457: checking for long file names" >&5
++echo "$as_me:3468: 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
+@@ -3493,7 +3504,7 @@
+   rm -rf "$ac_xdir" 2>/dev/null
+ done
+ fi
+-echo "$as_me:3496: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:3507: 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
+ 
+@@ -3505,7 +3516,7 @@
+ 
+ # if we find pkg-config, check if we should install the ".pc" files.
+ 
+-echo "$as_me:3508: checking if you want to use pkg-config" >&5
++echo "$as_me:3519: 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.
+@@ -3515,7 +3526,7 @@
+ else
+   cf_pkg_config=yes
+ fi;
+-echo "$as_me:3518: result: $cf_pkg_config" >&5
++echo "$as_me:3529: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+ 
+ case "$cf_pkg_config" in
+@@ -3527,7 +3538,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:3530: checking for $ac_word" >&5
++echo "$as_me:3541: 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
+@@ -3544,7 +3555,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:3547: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3558: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3555,10 +3566,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:3558: result: $PKG_CONFIG" >&5
++  echo "$as_me:3569: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+-  echo "$as_me:3561: result: no" >&5
++  echo "$as_me:3572: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3567,7 +3578,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:3570: checking for $ac_word" >&5
++echo "$as_me:3581: 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
+@@ -3584,7 +3595,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:3587: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3598: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3596,10 +3607,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ 
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  echo "$as_me:3599: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:3610: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+-  echo "$as_me:3602: result: no" >&5
++  echo "$as_me:3613: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3623,43 +3634,41 @@
+ 	cf_path_syntax="$ac_default_prefix"
+ fi
+ 
+-case ".$PKG_CONFIG" in
+-(.\$\(*\)*|.\'*\'*)
+-	;;
+-(..|./*|.\\*)
++case "x$PKG_CONFIG" in
++(x\$\(*\)*|x\'*\'*)
+ 	;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ 	eval PKG_CONFIG="$PKG_CONFIG"
+-	case ".$PKG_CONFIG" in
+-	(.NONE/*)
++	case "x$PKG_CONFIG" in
++	(xNONE/*)
+ 		PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ 		;;
+ 	esac
+ 	;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:3645: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++	{ { echo "$as_me:3654: 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:3652: WARNING: pkg-config is not installed" >&5
++	{ echo "$as_me:3661: 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:3658: checking for pkg-config library directory" >&5
++	echo "$as_me:3667: checking for pkg-config library directory" >&5
+ echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
+ 	;;
+ (*)
+-	echo "$as_me:3662: checking for $PKG_CONFIG library directory" >&5
++	echo "$as_me:3671: checking for $PKG_CONFIG library directory" >&5
+ echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
+ 	;;
+ esac
+@@ -3686,27 +3695,27 @@
+ case "x$cf_search_path" in
+ (xlibdir)
+ 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+-	echo "$as_me:3689: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:3698: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+ (x)
+ 	;;
+-(x/*\ *)
++(x$GLOB_FULLPATH_POSIX\ *|x$GLOB_FULLPATH_OTHER\ *)
+ 	PKG_CONFIG_LIBDIR=
+ 	;;
+-(x/*)
++(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	PKG_CONFIG_LIBDIR="$cf_search_path"
+-	echo "$as_me:3700: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:3709: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+ (xyes|xauto)
+-	echo "$as_me:3705: result: auto" >&5
++	echo "$as_me:3714: 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:3709: checking for search-list" >&5
++	echo "$as_me:3718: checking for search-list" >&5
+ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+ 	if test "x$PKG_CONFIG" != xnone
+ 	then
+@@ -3717,7 +3726,15 @@
+ 			pkg-config \
+ 			pkgconf
+ 		do
+-			cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '`
++			cf_raw_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null`
++			case "$cf_raw_search_path" in
++			(*\\*)
++				cf_search_path=`echo "$cf_raw_search_path" | tr ';' ' ' | tr '\' '/'`
++				;;
++			(*/*)
++				cf_search_path=`echo "$cf_raw_search_path" | tr : ' '`
++				;;
++			esac
+ 			test -n "$cf_search_path" && break
+ 		done
+ 
+@@ -3733,11 +3750,11 @@
+ "`
+ 	fi
+ 
+-	echo "$as_me:3736: result: $cf_search_path" >&5
++	echo "$as_me:3753: result: $cf_search_path" >&5
+ echo "${ECHO_T}$cf_search_path" >&6
+ 	;;
+ (*)
+-	{ { echo "$as_me:3740: error: Unexpected option value: $cf_search_path" >&5
++	{ { echo "$as_me:3757: error: Unexpected option value: $cf_search_path" >&5
+ echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -3745,7 +3762,7 @@
+ 
+ if test -n "$cf_search_path"
+ then
+-	echo "$as_me:3748: checking for first directory" >&5
++	echo "$as_me:3765: 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
+@@ -3756,7 +3773,7 @@
+ 			break
+ 		fi
+ 	done
+-	echo "$as_me:3759: result: $cf_pkg_config_path" >&5
++	echo "$as_me:3776: result: $cf_pkg_config_path" >&5
+ echo "${ECHO_T}$cf_pkg_config_path" >&6
+ 
+ 	if test "x$cf_pkg_config_path" != xnone ; then
+@@ -3766,7 +3783,7 @@
+ 
+ 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+ 	then
+-		echo "$as_me:3769: checking for workaround" >&5
++		echo "$as_me:3786: checking for workaround" >&5
+ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+ 		if test "$prefix" = "NONE" ; then
+ 			cf_prefix="$ac_default_prefix"
+@@ -3789,12 +3806,12 @@
+ 			esac
+ 		done
+ 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+-		echo "$as_me:3792: result: $PKG_CONFIG_LIBDIR" >&5
++		echo "$as_me:3809: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:3797: checking if you want to build test-programs" >&5
++echo "$as_me:3814: 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.
+@@ -3804,10 +3821,10 @@
+ else
+   cf_with_tests=yes
+ fi;
+-echo "$as_me:3807: result: $cf_with_tests" >&5
++echo "$as_me:3824: result: $cf_with_tests" >&5
+ echo "${ECHO_T}$cf_with_tests" >&6
+ 
+-echo "$as_me:3810: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:3827: 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.
+@@ -3817,11 +3834,11 @@
+ else
+   enable_mixedcase=auto
+ fi;
+-echo "$as_me:3820: result: $enable_mixedcase" >&5
++echo "$as_me:3837: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+ 
+-echo "$as_me:3824: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:3841: 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
+@@ -3848,7 +3865,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:3851: result: $cf_cv_mixedcase" >&5
++echo "$as_me:3868: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -3866,7 +3883,7 @@
+ fi
+ 
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:3869: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:3886: 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
+@@ -3886,16 +3903,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:3889: result: yes" >&5
++  echo "$as_me:3906: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:3893: result: no" >&5
++  echo "$as_me:3910: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+-echo "$as_me:3898: checking for \".PHONY\" make-support" >&5
++echo "$as_me:3915: 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
+@@ -3950,7 +3967,7 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:3953: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:3970: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+@@ -3961,7 +3978,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:3964: checking for $ac_word" >&5
++echo "$as_me:3981: 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
+@@ -3976,7 +3993,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:3979: found $ac_dir/$ac_word" >&5
++echo "$as_me:3996: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3984,10 +4001,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:3987: result: $CTAGS" >&5
++  echo "$as_me:4004: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:3990: result: no" >&5
++  echo "$as_me:4007: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3998,7 +4015,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:4001: checking for $ac_word" >&5
++echo "$as_me:4018: 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
+@@ -4013,7 +4030,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:4016: found $ac_dir/$ac_word" >&5
++echo "$as_me:4033: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4021,10 +4038,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:4024: result: $ETAGS" >&5
++  echo "$as_me:4041: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:4027: result: no" >&5
++  echo "$as_me:4044: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4033,7 +4050,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:4036: checking for $ac_word" >&5
++echo "$as_me:4053: 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
+@@ -4048,7 +4065,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:4051: found $ac_dir/$ac_word" >&5
++echo "$as_me:4068: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4057,17 +4074,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:4060: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:4077: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:4063: result: no" >&5
++  echo "$as_me:4080: 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:4070: checking for $ac_word" >&5
++echo "$as_me:4087: 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
+@@ -4082,7 +4099,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:4085: found $ac_dir/$ac_word" >&5
++echo "$as_me:4102: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4091,10 +4108,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:4094: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:4111: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:4097: result: no" >&5
++  echo "$as_me:4114: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4114,7 +4131,7 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:4117: checking for makeflags variable" >&5
++echo "$as_me:4134: 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
+@@ -4144,7 +4161,7 @@
+ 			;;
+ 		(*)
+ 
+-echo "${as_me:-configure}:4147: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:4164: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -4152,13 +4169,13 @@
+ 	rm -f cf_makeflags.tmp
+ 
+ fi
+-echo "$as_me:4155: result: $cf_cv_makeflags" >&5
++echo "$as_me:4172: 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:4161: checking for $ac_word" >&5
++echo "$as_me:4178: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_RANLIB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4173,7 +4190,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:4176: found $ac_dir/$ac_word" >&5
++echo "$as_me:4193: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4181,10 +4198,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:4184: result: $RANLIB" >&5
++  echo "$as_me:4201: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:4187: result: no" >&5
++  echo "$as_me:4204: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4193,7 +4210,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:4196: checking for $ac_word" >&5
++echo "$as_me:4213: 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
+@@ -4208,7 +4225,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:4211: found $ac_dir/$ac_word" >&5
++echo "$as_me:4228: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4217,10 +4234,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:4220: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:4237: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:4223: result: no" >&5
++  echo "$as_me:4240: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4232,7 +4249,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:4235: checking for $ac_word" >&5
++echo "$as_me:4252: 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
+@@ -4247,7 +4264,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:4250: found $ac_dir/$ac_word" >&5
++echo "$as_me:4267: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4255,10 +4272,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:4258: result: $LD" >&5
++  echo "$as_me:4275: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:4261: result: no" >&5
++  echo "$as_me:4278: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4267,7 +4284,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:4270: checking for $ac_word" >&5
++echo "$as_me:4287: 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
+@@ -4282,7 +4299,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:4285: found $ac_dir/$ac_word" >&5
++echo "$as_me:4302: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4291,10 +4308,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:4294: result: $ac_ct_LD" >&5
++  echo "$as_me:4311: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:4297: result: no" >&5
++  echo "$as_me:4314: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4306,7 +4323,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:4309: checking for $ac_word" >&5
++echo "$as_me:4326: 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
+@@ -4321,7 +4338,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:4324: found $ac_dir/$ac_word" >&5
++echo "$as_me:4341: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4329,10 +4346,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:4332: result: $AR" >&5
++  echo "$as_me:4349: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:4335: result: no" >&5
++  echo "$as_me:4352: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4341,7 +4358,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:4344: checking for $ac_word" >&5
++echo "$as_me:4361: 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
+@@ -4356,7 +4373,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:4359: found $ac_dir/$ac_word" >&5
++echo "$as_me:4376: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4365,10 +4382,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:4368: result: $ac_ct_AR" >&5
++  echo "$as_me:4385: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:4371: result: no" >&5
++  echo "$as_me:4388: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4380,7 +4397,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:4383: checking for $ac_word" >&5
++echo "$as_me:4400: 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
+@@ -4395,7 +4412,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:4398: found $ac_dir/$ac_word" >&5
++echo "$as_me:4415: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4403,10 +4420,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:4406: result: $AR" >&5
++  echo "$as_me:4423: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:4409: result: no" >&5
++  echo "$as_me:4426: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4415,7 +4432,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:4418: checking for $ac_word" >&5
++echo "$as_me:4435: 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
+@@ -4430,7 +4447,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:4433: found $ac_dir/$ac_word" >&5
++echo "$as_me:4450: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4439,10 +4456,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:4442: result: $ac_ct_AR" >&5
++  echo "$as_me:4459: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:4445: result: no" >&5
++  echo "$as_me:4462: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4451,7 +4468,7 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-echo "$as_me:4454: checking for options to update archives" >&5
++echo "$as_me:4471: 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
+@@ -4488,13 +4505,13 @@
+ 			rm -f conftest.a
+ 
+ 			cat >"conftest.$ac_ext" <&5
++			if { (eval echo "$as_me:4511: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4497: \$? = $ac_status" >&5
++  echo "$as_me:4514: \$? = $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
+@@ -4505,7 +4522,7 @@
+ 			else
+ 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-echo "${as_me:-configure}:4508: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:4525: testing cannot compile test-program ..." 1>&5
+ 
+ 				break
+ 			fi
+@@ -4515,7 +4532,7 @@
+ 	esac
+ 
+ fi
+-echo "$as_me:4518: result: $cf_cv_ar_flags" >&5
++echo "$as_me:4535: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+ if test -n "$ARFLAGS" ; then
+@@ -4526,17 +4543,17 @@
+ 	ARFLAGS=$cf_cv_ar_flags
+ fi
+ 
+-	echo "$as_me:4529: checking for PATH separator" >&5
++	echo "$as_me:4546: 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:4536: result: $PATH_SEPARATOR" >&5
++	echo "$as_me:4553: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+ 
+-echo "$as_me:4539: checking if you have specified an install-prefix" >&5
++echo "$as_me:4556: 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.
+@@ -4549,7 +4566,7 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:4552: result: $DESTDIR" >&5
++echo "$as_me:4569: result: $DESTDIR" >&5
+ echo "${ECHO_T}$DESTDIR" >&6
+ 
+ ###############################################################################
+@@ -4577,7 +4594,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:4580: checking for $ac_word" >&5
++echo "$as_me:4597: 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
+@@ -4592,7 +4609,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:4595: found $ac_dir/$ac_word" >&5
++echo "$as_me:4612: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4600,10 +4617,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:4603: result: $BUILD_CC" >&5
++  echo "$as_me:4620: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:4606: result: no" >&5
++  echo "$as_me:4623: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4612,12 +4629,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+ 
+ fi;
+-	echo "$as_me:4615: checking for native build C compiler" >&5
++	echo "$as_me:4632: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:4617: result: $BUILD_CC" >&5
++	echo "$as_me:4634: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:4620: checking for native build C preprocessor" >&5
++	echo "$as_me:4637: 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.
+@@ -4627,10 +4644,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:4630: result: $BUILD_CPP" >&5
++	echo "$as_me:4647: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:4633: checking for native build C flags" >&5
++	echo "$as_me:4650: 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.
+@@ -4638,10 +4655,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:4641: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:4658: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:4644: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:4661: 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.
+@@ -4649,10 +4666,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:4652: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:4669: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:4655: checking for native build linker-flags" >&5
++	echo "$as_me:4672: 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.
+@@ -4660,10 +4677,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:4663: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:4680: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:4666: checking for native build linker-libraries" >&5
++	echo "$as_me:4683: 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.
+@@ -4671,7 +4688,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:4674: result: $BUILD_LIBS" >&5
++	echo "$as_me:4691: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -4680,7 +4697,7 @@
+ 
+ 	: ${BUILD_CC:='${CC}'}
+ 
+-	echo "$as_me:4683: checking if the build-compiler \"$BUILD_CC\" works" >&5
++	echo "$as_me:4700: checking if the build-compiler \"$BUILD_CC\" works" >&5
+ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
+ 
+ 	cf_save_crossed=$cross_compiling
+@@ -4694,7 +4711,7 @@
+   cf_ok_build_cc=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4697 "configure"
++#line 4714 "configure"
+ #include "confdefs.h"
+ #include 
+ 		int main(int argc, char *argv[])
+@@ -4704,15 +4721,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:4707: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4724: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4710: \$? = $ac_status" >&5
++  echo "$as_me:4727: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:4712: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4729: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4715: \$? = $ac_status" >&5
++  echo "$as_me:4732: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_ok_build_cc=yes
+ else
+@@ -4727,12 +4744,12 @@
+ 	cross_compiling=$cf_save_crossed
+ 	ac_link=$cf_save_ac_link
+ 
+-	echo "$as_me:4730: result: $cf_ok_build_cc" >&5
++	echo "$as_me:4747: result: $cf_ok_build_cc" >&5
+ echo "${ECHO_T}$cf_ok_build_cc" >&6
+ 
+ 	if test "$cf_ok_build_cc" != yes
+ 	then
+-		{ { echo "$as_me:4735: error: Cross-build requires two compilers.
++		{ { echo "$as_me:4752: 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;}
+@@ -4757,7 +4774,7 @@
+ ### shared, for example.
+ cf_list_models=""
+ 
+-echo "$as_me:4760: checking if you want to build shared C-objects" >&5
++echo "$as_me:4777: 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.
+@@ -4767,27 +4784,27 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:4770: result: $with_shared" >&5
++echo "$as_me:4787: result: $with_shared" >&5
+ echo "${ECHO_T}$with_shared" >&6
+ test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
+ 
+-echo "$as_me:4774: checking for specified models" >&5
++echo "$as_me:4791: 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:4777: result: $cf_list_models" >&5
++echo "$as_me:4794: 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:4782: checking for default model" >&5
++echo "$as_me:4799: 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:4785: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:4802: 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:4790: checking for specific curses-directory" >&5
++echo "$as_me:4807: 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.
+@@ -4797,7 +4814,7 @@
+ else
+   cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:4800: result: $cf_cv_curses_dir" >&5
++echo "$as_me:4817: 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"
+@@ -4809,26 +4826,24 @@
+ 	cf_path_syntax="$ac_default_prefix"
+ fi
+ 
+-case ".$withval" in
+-(.\$\(*\)*|.\'*\'*)
++case "x$withval" in
++(x\$\(*\)*|x\'*\'*)
+ 	;;
+-(..|./*|.\\*)
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+-	;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ 	eval withval="$withval"
+-	case ".$withval" in
+-	(.NONE/*)
++	case "x$withval" in
++	(xNONE/*)
+ 		withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 		;;
+ 	esac
+ 	;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4831: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:4846: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -4864,7 +4879,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4867 "configure"
++#line 4882 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4876,16 +4891,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4879: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4894: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4882: \$? = $ac_status" >&5
++  echo "$as_me:4897: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4885: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4900: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4888: \$? = $ac_status" >&5
++  echo "$as_me:4903: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -4902,7 +4917,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}:4905: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4920: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -4938,7 +4953,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}:4941: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:4956: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -4953,13 +4968,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:4956: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:4971: 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:4959: result: yes" >&5
++		echo "$as_me:4974: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:4962: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:4977: 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
+ 
+@@ -5092,7 +5107,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5095 "configure"
++#line 5110 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5104,37 +5119,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:5107: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5122: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5110: \$? = $ac_status" >&5
++  echo "$as_me:5125: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:5113: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5128: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5116: \$? = $ac_status" >&5
++  echo "$as_me:5131: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5122 "configure"
++#line 5137 "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:5129: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5144: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5132: \$? = $ac_status" >&5
++  echo "$as_me:5147: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:5134: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5149: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5137: \$? = $ac_status" >&5
++  echo "$as_me:5152: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -5308,7 +5323,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5311 "configure"
++#line 5326 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5320,37 +5335,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:5323: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5338: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5326: \$? = $ac_status" >&5
++  echo "$as_me:5341: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:5329: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5344: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5332: \$? = $ac_status" >&5
++  echo "$as_me:5347: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5338 "configure"
++#line 5353 "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:5345: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5360: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5348: \$? = $ac_status" >&5
++  echo "$as_me:5363: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:5350: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5365: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5353: \$? = $ac_status" >&5
++  echo "$as_me:5368: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -5367,7 +5382,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:5370: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:5385: 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"
+@@ -5383,7 +5398,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:5386: checking for terminfo header" >&5
++echo "$as_me:5401: 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
+@@ -5401,7 +5416,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5404 "configure"
++#line 5419 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -5416,16 +5431,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5419: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5434: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5422: \$? = $ac_status" >&5
++  echo "$as_me:5437: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5425: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5440: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5428: \$? = $ac_status" >&5
++  echo "$as_me:5443: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -5441,7 +5456,7 @@
+ done
+ 
+ fi
+-echo "$as_me:5444: result: $cf_cv_term_header" >&5
++echo "$as_me:5459: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -5476,7 +5491,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:5479: result: no" >&5
++		echo "$as_me:5494: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -5492,7 +5507,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:5495: checking for $ac_word" >&5
++echo "$as_me:5510: 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
+@@ -5507,7 +5522,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:5510: found $ac_dir/$ac_word" >&5
++echo "$as_me:5525: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5515,10 +5530,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:5518: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:5533: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:5521: result: no" >&5
++  echo "$as_me:5536: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5531,7 +5546,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:5534: checking for $ac_word" >&5
++echo "$as_me:5549: 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
+@@ -5546,7 +5561,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:5549: found $ac_dir/$ac_word" >&5
++echo "$as_me:5564: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5554,10 +5569,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:5557: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:5572: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:5560: result: no" >&5
++  echo "$as_me:5575: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5714,7 +5729,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:5717: checking if we have identified curses headers" >&5
++echo "$as_me:5732: 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
+@@ -5726,7 +5741,7 @@
+ 	curses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5729 "configure"
++#line 5744 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -5738,16 +5753,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5741: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5756: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5744: \$? = $ac_status" >&5
++  echo "$as_me:5759: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5747: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5762: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5750: \$? = $ac_status" >&5
++  echo "$as_me:5765: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -5758,11 +5773,11 @@
+ done
+ 
+ fi
+-echo "$as_me:5761: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:5776: 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:5765: error: No curses header-files found" >&5
++	{ { echo "$as_me:5780: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -5772,23 +5787,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:5775: checking for $ac_header" >&5
++echo "$as_me:5790: 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 5781 "configure"
++#line 5796 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:5785: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:5800: \"$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:5791: \$? = $ac_status" >&5
++  echo "$as_me:5806: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -5807,7 +5822,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:5810: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:5825: 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 5866 "configure"
++#line 5881 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5875,16 +5890,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5878: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5893: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5881: \$? = $ac_status" >&5
++  echo "$as_me:5896: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5884: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5899: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5887: \$? = $ac_status" >&5
++  echo "$as_me:5902: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5901,7 +5916,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}:5904: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5919: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -5920,7 +5935,7 @@
+ 
+ }
+ 
+-echo "$as_me:5923: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:5938: 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
+@@ -5932,7 +5947,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5935 "configure"
++#line 5950 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -5956,16 +5971,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5959: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5974: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5962: \$? = $ac_status" >&5
++  echo "$as_me:5977: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5965: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5980: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5968: \$? = $ac_status" >&5
++  echo "$as_me:5983: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -5980,14 +5995,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:5983: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:5998: 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:5990: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:6005: 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
+@@ -6108,7 +6123,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6111 "configure"
++#line 6126 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6120,16 +6135,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6123: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6138: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6126: \$? = $ac_status" >&5
++  echo "$as_me:6141: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6129: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6144: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6132: \$? = $ac_status" >&5
++  echo "$as_me:6147: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6146,7 +6161,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}:6149: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6164: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -6169,7 +6184,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6172 "configure"
++#line 6187 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -6193,16 +6208,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6196: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6211: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6199: \$? = $ac_status" >&5
++  echo "$as_me:6214: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6202: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6217: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6205: \$? = $ac_status" >&5
++  echo "$as_me:6220: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -6223,12 +6238,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6226: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6241: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:6231: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:6246: 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%/[^/]*$%%'`
+@@ -6264,7 +6279,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6267 "configure"
++#line 6282 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6276,16 +6291,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6279: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6294: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6282: \$? = $ac_status" >&5
++  echo "$as_me:6297: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6285: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6300: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6288: \$? = $ac_status" >&5
++  echo "$as_me:6303: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6302,7 +6317,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}:6305: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6320: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -6350,7 +6365,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:6353: checking for terminfo header" >&5
++echo "$as_me:6368: 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
+@@ -6368,7 +6383,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6371 "configure"
++#line 6386 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -6383,16 +6398,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6386: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6401: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6389: \$? = $ac_status" >&5
++  echo "$as_me:6404: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6392: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6407: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6395: \$? = $ac_status" >&5
++  echo "$as_me:6410: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -6408,7 +6423,7 @@
+ done
+ 
+ fi
+-echo "$as_me:6411: result: $cf_cv_term_header" >&5
++echo "$as_me:6426: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -6446,7 +6461,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:6449: checking for ncurses version" >&5
++echo "$as_me:6464: 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
+@@ -6472,10 +6487,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:6475: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:6490: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6478: \$? = $ac_status" >&5
++  echo "$as_me:6493: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -6485,7 +6500,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6488 "configure"
++#line 6503 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -6512,15 +6527,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6515: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6530: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6518: \$? = $ac_status" >&5
++  echo "$as_me:6533: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:6520: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6535: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6523: \$? = $ac_status" >&5
++  echo "$as_me:6538: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -6534,7 +6549,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:6537: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:6552: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -6547,7 +6562,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:6550: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:6565: 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
+@@ -6555,7 +6570,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6558 "configure"
++#line 6573 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6574,16 +6589,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6577: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6592: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6580: \$? = $ac_status" >&5
++  echo "$as_me:6595: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6583: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6598: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6586: \$? = $ac_status" >&5
++  echo "$as_me:6601: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -6594,10 +6609,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6597: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:6612: 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:6600: checking for initscr in -lgpm" >&5
++  echo "$as_me:6615: 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
+@@ -6605,7 +6620,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6608 "configure"
++#line 6623 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6624,16 +6639,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6627: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6642: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6630: \$? = $ac_status" >&5
++  echo "$as_me:6645: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6633: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6648: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6636: \$? = $ac_status" >&5
++  echo "$as_me:6651: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -6644,7 +6659,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6647: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:6662: 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"
+@@ -6659,7 +6674,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:6662: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:6677: 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
+@@ -6667,7 +6682,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6670 "configure"
++#line 6685 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6686,16 +6701,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6689: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6704: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6692: \$? = $ac_status" >&5
++  echo "$as_me:6707: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6695: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6710: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6698: \$? = $ac_status" >&5
++  echo "$as_me:6713: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -6706,7 +6721,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6709: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:6724: 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"
+@@ -6755,13 +6770,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:6758: checking for initscr" >&5
++	echo "$as_me:6773: 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 6764 "configure"
++#line 6779 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -6792,16 +6807,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6795: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6810: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6798: \$? = $ac_status" >&5
++  echo "$as_me:6813: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6801: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6816: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6804: \$? = $ac_status" >&5
++  echo "$as_me:6819: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -6811,18 +6826,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6814: result: $ac_cv_func_initscr" >&5
++echo "$as_me:6829: 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:6821: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:6836: 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 6825 "configure"
++#line 6840 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6834,25 +6849,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6837: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6852: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6840: \$? = $ac_status" >&5
++  echo "$as_me:6855: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6843: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6858: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6846: \$? = $ac_status" >&5
++  echo "$as_me:6861: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:6848: result: yes" >&5
++  echo "$as_me:6863: 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:6855: result: no" >&5
++echo "$as_me:6870: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -6920,11 +6935,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:6923: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:6938: 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 6927 "configure"
++#line 6942 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6936,25 +6951,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6939: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6954: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6942: \$? = $ac_status" >&5
++  echo "$as_me:6957: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6945: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6960: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6948: \$? = $ac_status" >&5
++  echo "$as_me:6963: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:6950: result: yes" >&5
++  echo "$as_me:6965: 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:6957: result: no" >&5
++echo "$as_me:6972: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -6969,7 +6984,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:6972: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:6987: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6977,7 +6992,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:6980: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:6995: 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
+@@ -6987,7 +7002,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6990 "configure"
++#line 7005 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6999,23 +7014,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7002: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7017: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7005: \$? = $ac_status" >&5
++  echo "$as_me:7020: \$? = $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:7023: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7011: \$? = $ac_status" >&5
++  echo "$as_me:7026: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:7013: result: yes" >&5
++  echo "$as_me:7028: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:7018: result: no" >&5
++echo "$as_me:7033: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -7033,7 +7048,7 @@
+ 	NCURSES_CONFIG=none
+ fi
+ 
+-echo "$as_me:7036: checking for specified curses library type" >&5
++echo "$as_me:7051: checking for specified curses library type" >&5
+ echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
+ 
+ # Check whether --with-screen or --without-screen was given.
+@@ -7053,23 +7068,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7056: checking for $ac_header" >&5
++echo "$as_me:7071: 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 7062 "configure"
++#line 7077 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7066: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7081: \"$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:7072: \$? = $ac_status" >&5
++  echo "$as_me:7087: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7088,7 +7103,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7091: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7106: 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:7116: 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
+@@ -7106,7 +7121,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7109 "configure"
++#line 7124 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -7123,16 +7138,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7126: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7141: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7129: \$? = $ac_status" >&5
++  echo "$as_me:7144: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7132: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7147: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7135: \$? = $ac_status" >&5
++  echo "$as_me:7150: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -7144,12 +7159,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:7147: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7162: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7152 "configure"
++#line 7167 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7162,16 +7177,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7165: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7180: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7168: \$? = $ac_status" >&5
++  echo "$as_me:7183: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7171: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7186: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7174: \$? = $ac_status" >&5
++  echo "$as_me:7189: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -7185,7 +7200,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7188 "configure"
++#line 7203 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7198,16 +7213,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7201: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7216: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7204: \$? = $ac_status" >&5
++  echo "$as_me:7219: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7207: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7222: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7210: \$? = $ac_status" >&5
++  echo "$as_me:7225: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -7224,9 +7239,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:7227: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:7242: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:7229: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7244: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -7317,7 +7332,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}:7320: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7335: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -7325,7 +7340,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7328 "configure"
++#line 7343 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7338,21 +7353,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7341: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7356: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7344: \$? = $ac_status" >&5
++  echo "$as_me:7359: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7347: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7362: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7350: \$? = $ac_status" >&5
++  echo "$as_me:7365: \$? = $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}:7355: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7370: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -7370,7 +7385,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:7373: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7388: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -7445,13 +7460,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}:7448: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7463: 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 7454 "configure"
++#line 7469 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7464,21 +7479,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7467: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7482: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7470: \$? = $ac_status" >&5
++  echo "$as_me:7485: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7473: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7488: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7476: \$? = $ac_status" >&5
++  echo "$as_me:7491: \$? = $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}:7481: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7496: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -7520,7 +7535,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7523: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:7538: 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
+@@ -7558,7 +7573,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7561 "configure"
++#line 7576 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7570,16 +7585,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7573: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7588: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7576: \$? = $ac_status" >&5
++  echo "$as_me:7591: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7579: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7594: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7582: \$? = $ac_status" >&5
++  echo "$as_me:7597: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -7596,7 +7611,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}:7599: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:7614: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -7632,7 +7647,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}:7635: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7650: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7662,13 +7677,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:7665: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:7680: 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:7668: result: yes" >&5
++		echo "$as_me:7683: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:7671: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:7686: 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
+ 
+@@ -7801,7 +7816,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7804 "configure"
++#line 7819 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7813,37 +7828,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7816: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7831: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7819: \$? = $ac_status" >&5
++  echo "$as_me:7834: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7822: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7837: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7825: \$? = $ac_status" >&5
++  echo "$as_me:7840: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7831 "configure"
++#line 7846 "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:7838: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7853: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7841: \$? = $ac_status" >&5
++  echo "$as_me:7856: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:7843: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7858: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7846: \$? = $ac_status" >&5
++  echo "$as_me:7861: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -8017,7 +8032,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8020 "configure"
++#line 8035 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8029,37 +8044,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8032: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8047: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8035: \$? = $ac_status" >&5
++  echo "$as_me:8050: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8038: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8053: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8041: \$? = $ac_status" >&5
++  echo "$as_me:8056: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8047 "configure"
++#line 8062 "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:8054: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8069: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8057: \$? = $ac_status" >&5
++  echo "$as_me:8072: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:8059: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8074: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8062: \$? = $ac_status" >&5
++  echo "$as_me:8077: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -8076,7 +8091,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:8079: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:8094: 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"
+@@ -8092,7 +8107,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:8095: checking for terminfo header" >&5
++echo "$as_me:8110: 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
+@@ -8110,7 +8125,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8113 "configure"
++#line 8128 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8125,16 +8140,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8128: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8143: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8131: \$? = $ac_status" >&5
++  echo "$as_me:8146: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8134: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8149: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8137: \$? = $ac_status" >&5
++  echo "$as_me:8152: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -8150,7 +8165,7 @@
+ done
+ 
+ fi
+-echo "$as_me:8153: result: $cf_cv_term_header" >&5
++echo "$as_me:8168: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -8185,7 +8200,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:8188: result: no" >&5
++		echo "$as_me:8203: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -8201,7 +8216,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:8204: checking for $ac_word" >&5
++echo "$as_me:8219: 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
+@@ -8216,7 +8231,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:8219: found $ac_dir/$ac_word" >&5
++echo "$as_me:8234: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8224,10 +8239,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:8227: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:8242: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:8230: result: no" >&5
++  echo "$as_me:8245: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8240,7 +8255,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:8243: checking for $ac_word" >&5
++echo "$as_me:8258: 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
+@@ -8255,7 +8270,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:8258: found $ac_dir/$ac_word" >&5
++echo "$as_me:8273: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8263,10 +8278,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:8266: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:8281: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:8269: result: no" >&5
++  echo "$as_me:8284: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8423,7 +8438,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:8426: checking if we have identified curses headers" >&5
++echo "$as_me:8441: 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
+@@ -8435,7 +8450,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8438 "configure"
++#line 8453 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -8447,16 +8462,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8450: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8465: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8453: \$? = $ac_status" >&5
++  echo "$as_me:8468: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8456: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8471: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8459: \$? = $ac_status" >&5
++  echo "$as_me:8474: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -8467,11 +8482,11 @@
+ done
+ 
+ fi
+-echo "$as_me:8470: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:8485: 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:8474: error: No curses header-files found" >&5
++	{ { echo "$as_me:8489: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8481,23 +8496,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:8484: checking for $ac_header" >&5
++echo "$as_me:8499: 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 8490 "configure"
++#line 8505 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8494: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8509: \"$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:8500: \$? = $ac_status" >&5
++  echo "$as_me:8515: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8516,7 +8531,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8519: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8534: 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 8575 "configure"
++#line 8590 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8584,16 +8599,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8587: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8602: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8590: \$? = $ac_status" >&5
++  echo "$as_me:8605: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8593: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8608: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8596: \$? = $ac_status" >&5
++  echo "$as_me:8611: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -8610,7 +8625,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}:8613: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8628: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8629,7 +8644,7 @@
+ 
+ }
+ 
+-echo "$as_me:8632: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:8647: 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
+@@ -8641,7 +8656,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8644 "configure"
++#line 8659 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -8665,16 +8680,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8668: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8683: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8671: \$? = $ac_status" >&5
++  echo "$as_me:8686: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8674: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8689: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8677: \$? = $ac_status" >&5
++  echo "$as_me:8692: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -8689,14 +8704,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:8692: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:8707: 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:8699: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:8714: 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
+@@ -8817,7 +8832,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8820 "configure"
++#line 8835 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8829,16 +8844,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8832: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8847: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8835: \$? = $ac_status" >&5
++  echo "$as_me:8850: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8838: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8853: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8841: \$? = $ac_status" >&5
++  echo "$as_me:8856: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -8855,7 +8870,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}:8858: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8873: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8878,7 +8893,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8881 "configure"
++#line 8896 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -8902,16 +8917,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8905: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8920: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8908: \$? = $ac_status" >&5
++  echo "$as_me:8923: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8911: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8926: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8914: \$? = $ac_status" >&5
++  echo "$as_me:8929: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -8932,12 +8947,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8935: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8950: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:8940: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:8955: 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%/[^/]*$%%'`
+@@ -8973,7 +8988,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8976 "configure"
++#line 8991 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8985,16 +9000,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8988: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9003: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8991: \$? = $ac_status" >&5
++  echo "$as_me:9006: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8994: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9009: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8997: \$? = $ac_status" >&5
++  echo "$as_me:9012: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9011,7 +9026,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}:9014: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9029: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9059,7 +9074,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9062: checking for terminfo header" >&5
++echo "$as_me:9077: 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
+@@ -9077,7 +9092,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9080 "configure"
++#line 9095 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9092,16 +9107,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9095: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9110: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9098: \$? = $ac_status" >&5
++  echo "$as_me:9113: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9101: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9116: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9104: \$? = $ac_status" >&5
++  echo "$as_me:9119: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -9117,7 +9132,7 @@
+ done
+ 
+ fi
+-echo "$as_me:9120: result: $cf_cv_term_header" >&5
++echo "$as_me:9135: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9155,7 +9170,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:9158: checking for ncurses version" >&5
++echo "$as_me:9173: 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
+@@ -9181,10 +9196,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:9184: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:9199: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9187: \$? = $ac_status" >&5
++  echo "$as_me:9202: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -9194,7 +9209,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9197 "configure"
++#line 9212 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -9221,15 +9236,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9224: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9239: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9227: \$? = $ac_status" >&5
++  echo "$as_me:9242: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9229: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9244: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9232: \$? = $ac_status" >&5
++  echo "$as_me:9247: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -9243,7 +9258,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:9246: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:9261: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -9256,7 +9271,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:9259: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:9274: 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
+@@ -9264,7 +9279,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9267 "configure"
++#line 9282 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9283,16 +9298,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9286: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9301: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9289: \$? = $ac_status" >&5
++  echo "$as_me:9304: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9292: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9307: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9295: \$? = $ac_status" >&5
++  echo "$as_me:9310: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -9303,10 +9318,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9306: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:9321: 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:9309: checking for initscr in -lgpm" >&5
++  echo "$as_me:9324: 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
+@@ -9314,7 +9329,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9317 "configure"
++#line 9332 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9333,16 +9348,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9336: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9351: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9339: \$? = $ac_status" >&5
++  echo "$as_me:9354: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9342: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9357: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9345: \$? = $ac_status" >&5
++  echo "$as_me:9360: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -9353,7 +9368,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9356: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:9371: 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"
+@@ -9368,7 +9383,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:9371: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:9386: 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
+@@ -9376,7 +9391,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9379 "configure"
++#line 9394 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9395,16 +9410,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9398: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9413: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9401: \$? = $ac_status" >&5
++  echo "$as_me:9416: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9404: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9419: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9407: \$? = $ac_status" >&5
++  echo "$as_me:9422: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -9415,7 +9430,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9418: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:9433: 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"
+@@ -9464,13 +9479,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:9467: checking for initscr" >&5
++	echo "$as_me:9482: 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 9473 "configure"
++#line 9488 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9501,16 +9516,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9504: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9519: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9507: \$? = $ac_status" >&5
++  echo "$as_me:9522: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9510: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9525: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9513: \$? = $ac_status" >&5
++  echo "$as_me:9528: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -9520,18 +9535,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:9523: result: $ac_cv_func_initscr" >&5
++echo "$as_me:9538: 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:9530: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:9545: 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 9534 "configure"
++#line 9549 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9543,25 +9558,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9546: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9561: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9549: \$? = $ac_status" >&5
++  echo "$as_me:9564: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9552: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9567: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9555: \$? = $ac_status" >&5
++  echo "$as_me:9570: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:9557: result: yes" >&5
++  echo "$as_me:9572: 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:9564: result: no" >&5
++echo "$as_me:9579: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -9629,11 +9644,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:9632: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:9647: 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 9636 "configure"
++#line 9651 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9645,25 +9660,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9648: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9663: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9651: \$? = $ac_status" >&5
++  echo "$as_me:9666: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9654: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9669: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9657: \$? = $ac_status" >&5
++  echo "$as_me:9672: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:9659: result: yes" >&5
++  echo "$as_me:9674: 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:9666: result: no" >&5
++echo "$as_me:9681: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -9678,7 +9693,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:9681: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:9696: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -9686,7 +9701,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:9689: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:9704: 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
+@@ -9696,7 +9711,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9699 "configure"
++#line 9714 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9708,23 +9723,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9711: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9726: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9714: \$? = $ac_status" >&5
++  echo "$as_me:9729: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9717: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9732: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9720: \$? = $ac_status" >&5
++  echo "$as_me:9735: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:9722: result: yes" >&5
++  echo "$as_me:9737: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:9727: result: no" >&5
++echo "$as_me:9742: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -9749,13 +9764,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:9752: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:9767: 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:9755: result: yes" >&5
++		echo "$as_me:9770: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:9758: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:9773: 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
+ 
+@@ -9888,7 +9903,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9891 "configure"
++#line 9906 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9900,37 +9915,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9903: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9918: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9906: \$? = $ac_status" >&5
++  echo "$as_me:9921: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9909: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9924: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9912: \$? = $ac_status" >&5
++  echo "$as_me:9927: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9918 "configure"
++#line 9933 "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:9925: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9940: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9928: \$? = $ac_status" >&5
++  echo "$as_me:9943: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9930: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9945: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9933: \$? = $ac_status" >&5
++  echo "$as_me:9948: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -10104,7 +10119,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10107 "configure"
++#line 10122 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10116,37 +10131,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10119: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10134: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10122: \$? = $ac_status" >&5
++  echo "$as_me:10137: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10125: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10140: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10128: \$? = $ac_status" >&5
++  echo "$as_me:10143: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10134 "configure"
++#line 10149 "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:10141: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10156: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10144: \$? = $ac_status" >&5
++  echo "$as_me:10159: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10146: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10161: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10149: \$? = $ac_status" >&5
++  echo "$as_me:10164: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -10163,7 +10178,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:10166: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:10181: 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"
+@@ -10179,7 +10194,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:10182: checking for terminfo header" >&5
++echo "$as_me:10197: 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
+@@ -10197,7 +10212,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10200 "configure"
++#line 10215 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -10212,16 +10227,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10215: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10230: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10218: \$? = $ac_status" >&5
++  echo "$as_me:10233: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10221: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10236: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10224: \$? = $ac_status" >&5
++  echo "$as_me:10239: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -10237,7 +10252,7 @@
+ done
+ 
+ fi
+-echo "$as_me:10240: result: $cf_cv_term_header" >&5
++echo "$as_me:10255: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10272,7 +10287,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:10275: result: no" >&5
++		echo "$as_me:10290: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -10288,7 +10303,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:10291: checking for $ac_word" >&5
++echo "$as_me:10306: 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
+@@ -10303,7 +10318,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:10306: found $ac_dir/$ac_word" >&5
++echo "$as_me:10321: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -10311,10 +10326,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:10314: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:10329: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:10317: result: no" >&5
++  echo "$as_me:10332: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -10327,7 +10342,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:10330: checking for $ac_word" >&5
++echo "$as_me:10345: 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
+@@ -10342,7 +10357,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:10345: found $ac_dir/$ac_word" >&5
++echo "$as_me:10360: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -10350,10 +10365,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:10353: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:10368: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:10356: result: no" >&5
++  echo "$as_me:10371: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -10510,7 +10525,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:10513: checking if we have identified curses headers" >&5
++echo "$as_me:10528: 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
+@@ -10522,7 +10537,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10525 "configure"
++#line 10540 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -10534,16 +10549,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10537: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10552: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10540: \$? = $ac_status" >&5
++  echo "$as_me:10555: \$? = $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:10558: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10546: \$? = $ac_status" >&5
++  echo "$as_me:10561: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -10554,11 +10569,11 @@
+ done
+ 
+ fi
+-echo "$as_me:10557: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:10572: 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:10561: error: No curses header-files found" >&5
++	{ { echo "$as_me:10576: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -10568,23 +10583,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:10571: checking for $ac_header" >&5
++echo "$as_me:10586: 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 10577 "configure"
++#line 10592 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10581: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:10596: \"$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:10587: \$? = $ac_status" >&5
++  echo "$as_me:10602: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10603,7 +10618,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:10606: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:10621: 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 10662 "configure"
++#line 10677 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10671,16 +10686,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10674: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10689: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10677: \$? = $ac_status" >&5
++  echo "$as_me:10692: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10680: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10695: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10683: \$? = $ac_status" >&5
++  echo "$as_me:10698: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10697,7 +10712,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}:10700: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10715: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10716,7 +10731,7 @@
+ 
+ }
+ 
+-echo "$as_me:10719: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:10734: 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
+@@ -10728,7 +10743,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10731 "configure"
++#line 10746 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -10752,16 +10767,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10755: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10770: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10758: \$? = $ac_status" >&5
++  echo "$as_me:10773: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10761: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10776: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10764: \$? = $ac_status" >&5
++  echo "$as_me:10779: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -10776,14 +10791,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:10779: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:10794: 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:10786: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:10801: 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
+@@ -10904,7 +10919,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10907 "configure"
++#line 10922 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10916,16 +10931,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10919: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10934: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10922: \$? = $ac_status" >&5
++  echo "$as_me:10937: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10925: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10940: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10928: \$? = $ac_status" >&5
++  echo "$as_me:10943: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10942,7 +10957,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}:10945: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10960: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10965,7 +10980,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10968 "configure"
++#line 10983 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -10989,16 +11004,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10992: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11007: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10995: \$? = $ac_status" >&5
++  echo "$as_me:11010: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10998: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11013: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11001: \$? = $ac_status" >&5
++  echo "$as_me:11016: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -11019,12 +11034,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11022: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11037: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:11027: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:11042: 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%/[^/]*$%%'`
+@@ -11060,7 +11075,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11063 "configure"
++#line 11078 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11072,16 +11087,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11075: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11090: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11078: \$? = $ac_status" >&5
++  echo "$as_me:11093: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11081: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11096: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11084: \$? = $ac_status" >&5
++  echo "$as_me:11099: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11098,7 +11113,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}:11101: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11116: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -11146,7 +11161,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:11149: checking for terminfo header" >&5
++echo "$as_me:11164: 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
+@@ -11164,7 +11179,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11167 "configure"
++#line 11182 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -11179,16 +11194,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11182: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11197: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11185: \$? = $ac_status" >&5
++  echo "$as_me:11200: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11188: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11203: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11191: \$? = $ac_status" >&5
++  echo "$as_me:11206: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -11204,7 +11219,7 @@
+ done
+ 
+ fi
+-echo "$as_me:11207: result: $cf_cv_term_header" >&5
++echo "$as_me:11222: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -11242,7 +11257,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:11245: checking for ncurses version" >&5
++echo "$as_me:11260: 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
+@@ -11268,10 +11283,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:11271: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:11286: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11274: \$? = $ac_status" >&5
++  echo "$as_me:11289: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -11281,7 +11296,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11284 "configure"
++#line 11299 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11308,15 +11323,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:11311: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11326: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11314: \$? = $ac_status" >&5
++  echo "$as_me:11329: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:11316: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11331: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11319: \$? = $ac_status" >&5
++  echo "$as_me:11334: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -11330,7 +11345,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:11333: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:11348: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -11343,7 +11358,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:11346: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:11361: 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
+@@ -11351,7 +11366,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11354 "configure"
++#line 11369 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11370,16 +11385,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11373: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11388: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11376: \$? = $ac_status" >&5
++  echo "$as_me:11391: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11379: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11394: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11382: \$? = $ac_status" >&5
++  echo "$as_me:11397: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -11390,10 +11405,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11393: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:11408: 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:11396: checking for initscr in -lgpm" >&5
++  echo "$as_me:11411: 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
+@@ -11401,7 +11416,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11404 "configure"
++#line 11419 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11420,16 +11435,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11423: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11438: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11426: \$? = $ac_status" >&5
++  echo "$as_me:11441: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11429: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11444: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11432: \$? = $ac_status" >&5
++  echo "$as_me:11447: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -11440,7 +11455,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11443: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:11458: 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"
+@@ -11455,7 +11470,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:11458: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:11473: 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
+@@ -11463,7 +11478,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11466 "configure"
++#line 11481 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11482,16 +11497,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11485: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11500: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11488: \$? = $ac_status" >&5
++  echo "$as_me:11503: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11491: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11506: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11494: \$? = $ac_status" >&5
++  echo "$as_me:11509: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -11502,7 +11517,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11505: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:11520: 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"
+@@ -11551,13 +11566,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:11554: checking for initscr" >&5
++	echo "$as_me:11569: 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 11560 "configure"
++#line 11575 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -11588,16 +11603,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11591: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11606: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11594: \$? = $ac_status" >&5
++  echo "$as_me:11609: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11597: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11612: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11600: \$? = $ac_status" >&5
++  echo "$as_me:11615: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -11607,18 +11622,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:11610: result: $ac_cv_func_initscr" >&5
++echo "$as_me:11625: 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:11617: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:11632: 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 11621 "configure"
++#line 11636 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11630,25 +11645,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11633: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11648: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11636: \$? = $ac_status" >&5
++  echo "$as_me:11651: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11639: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11654: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11642: \$? = $ac_status" >&5
++  echo "$as_me:11657: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:11644: result: yes" >&5
++  echo "$as_me:11659: 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:11651: result: no" >&5
++echo "$as_me:11666: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -11716,11 +11731,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:11719: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:11734: 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 11723 "configure"
++#line 11738 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11732,25 +11747,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11735: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11750: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11738: \$? = $ac_status" >&5
++  echo "$as_me:11753: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11741: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11756: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11744: \$? = $ac_status" >&5
++  echo "$as_me:11759: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:11746: result: yes" >&5
++  echo "$as_me:11761: 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:11753: result: no" >&5
++echo "$as_me:11768: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -11765,7 +11780,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:11768: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:11783: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -11773,7 +11788,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:11776: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:11791: 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
+@@ -11783,7 +11798,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11786 "configure"
++#line 11801 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11795,23 +11810,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11798: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11813: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11801: \$? = $ac_status" >&5
++  echo "$as_me:11816: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11804: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11819: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11807: \$? = $ac_status" >&5
++  echo "$as_me:11822: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:11809: result: yes" >&5
++  echo "$as_me:11824: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:11814: result: no" >&5
++echo "$as_me:11829: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -11831,7 +11846,7 @@
+ 
+ 	;;
+ (*)
+-	{ { echo "$as_me:11834: error: unexpected screen-value: $cf_cv_screen" >&5
++	{ { echo "$as_me:11849: error: unexpected screen-value: $cf_cv_screen" >&5
+ echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -11870,10 +11885,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:11873: \"$cf_try\"") >&5
++		{ (eval echo "$as_me:11888: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11876: \$? = $ac_status" >&5
++  echo "$as_me:11891: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 		if test -f conftest.out ; then
+ 			cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ 	][ 	]*//" conftest.out`
+@@ -11891,17 +11906,17 @@
+ 
+ cf_cv_timestamp=`date`
+ 
+-echo "$as_me:11894: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
++echo "$as_me:11909: 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:11897: checking if KEY_RESIZE is supported" >&5
++echo "$as_me:11912: checking if KEY_RESIZE is supported" >&5
+ echo $ECHO_N "checking if KEY_RESIZE is supported... $ECHO_C" >&6
+ if test "${cf_cv_curses_resizes+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11904 "configure"
++#line 11919 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11913,16 +11928,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11916: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11931: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11919: \$? = $ac_status" >&5
++  echo "$as_me:11934: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11922: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11937: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11925: \$? = $ac_status" >&5
++  echo "$as_me:11940: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_resizes=yes
+ else
+@@ -11932,12 +11947,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:11935: result: $cf_cv_curses_resizes" >&5
++echo "$as_me:11950: result: $cf_cv_curses_resizes" >&5
+ echo "${ECHO_T}$cf_cv_curses_resizes" >&6
+ cf_cv_enable_sigwinch=0
+ test "$cf_cv_curses_resizes" = yes && cf_cv_enable_sigwinch=1
+ 
+-echo "$as_me:11940: checking if you want to have a library-prefix" >&5
++echo "$as_me:11955: 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.
+@@ -11947,7 +11962,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:11950: result: $with_lib_prefix" >&5
++echo "$as_me:11965: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test "$with_lib_prefix" = auto
+@@ -11985,7 +12000,7 @@
+ 	test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
+ fi
+ 
+-echo "$as_me:11988: checking for default loader flags" >&5
++echo "$as_me:12003: 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=''   ;;
+@@ -11993,13 +12008,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:11996: result: $LD_MODEL" >&5
++echo "$as_me:12011: 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:12002: checking for an rpath option" >&5
++	echo "$as_me:12017: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -12030,12 +12045,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:12033: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:12048: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:12038: checking if we need a space after rpath option" >&5
++		echo "$as_me:12053: 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"
+ 
+@@ -12056,7 +12071,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12059 "configure"
++#line 12074 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12068,16 +12083,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12071: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12086: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12074: \$? = $ac_status" >&5
++  echo "$as_me:12089: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12077: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12092: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12080: \$? = $ac_status" >&5
++  echo "$as_me:12095: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -12087,7 +12102,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:12090: result: $cf_rpath_space" >&5
++		echo "$as_me:12105: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -12109,7 +12124,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:12112: checking whether to use release or ABI version in shared library file names" >&5
++	echo "$as_me:12127: checking whether to use release or ABI version in shared library file names" >&5
+ echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
+ 
+ # Check whether --with-shlib-version or --without-shlib-version was given.
+@@ -12124,9 +12139,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:12127: result: $withval" >&5
++		echo "$as_me:12142: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:12129: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:12144: 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; }; }
+ 		;;
+@@ -12135,7 +12150,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:12138: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:12153: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -12158,14 +12173,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:12161: checking which $CC option to use" >&5
++		echo "$as_me:12176: 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 12168 "configure"
++#line 12183 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12177,16 +12192,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12180: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12195: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12183: \$? = $ac_status" >&5
++  echo "$as_me:12198: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12186: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12201: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12189: \$? = $ac_status" >&5
++  echo "$as_me:12204: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -12195,7 +12210,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		done
+-		echo "$as_me:12198: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:12213: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -12266,7 +12281,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:12269: checking if ld -search_paths_first works" >&5
++		echo "$as_me:12284: 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
+@@ -12275,7 +12290,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12278 "configure"
++#line 12293 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12287,16 +12302,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12290: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12305: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12293: \$? = $ac_status" >&5
++  echo "$as_me:12308: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12296: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12311: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12299: \$? = $ac_status" >&5
++  echo "$as_me:12314: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -12307,7 +12322,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:12310: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:12325: 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"
+@@ -12657,7 +12672,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12660 "configure"
++#line 12675 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12669,16 +12684,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12672: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12687: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12675: \$? = $ac_status" >&5
++  echo "$as_me:12690: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12678: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12693: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12681: \$? = $ac_status" >&5
++  echo "$as_me:12696: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -12715,7 +12730,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:12718: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:12733: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -12725,7 +12740,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <
+ int main(int argc, char *argv[])
+ {
+@@ -12737,18 +12752,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:12740: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:12755: 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:12742: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:12757: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12745: \$? = $ac_status" >&5
++  echo "$as_me:12760: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-				echo "$as_me:12747: result: yes" >&5
++				echo "$as_me:12762: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:12751: result: no" >&5
++				echo "$as_me:12766: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -12763,17 +12778,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:12766: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:12781: 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}:12770: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:12785: 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:12776: checking if you want to link sample programs with rpath option" >&5
++	echo "$as_me:12791: 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.
+@@ -12783,7 +12798,7 @@
+ else
+   with_rpath_link=yes
+ fi;
+-	echo "$as_me:12786: result: $with_rpath_link" >&5
++	echo "$as_me:12801: result: $with_rpath_link" >&5
+ echo "${ECHO_T}$with_rpath_link" >&6
+ 	if test "$with_rpath_link" = no
+ 	then
+@@ -12796,7 +12811,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:12799: checking if you want broken-linker support code" >&5
++echo "$as_me:12814: 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.
+@@ -12806,7 +12821,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:12809: result: $with_broken_linker" >&5
++echo "$as_me:12824: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : "${BROKEN_LINKER:=0}"
+@@ -12821,14 +12836,14 @@
+ 
+ # Check to define _XOPEN_SOURCE "automatically"
+ 
+-echo "$as_me:12824: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:12839: 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 12831 "configure"
++#line 12846 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12847,16 +12862,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12850: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12865: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12853: \$? = $ac_status" >&5
++  echo "$as_me:12868: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12856: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12871: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12859: \$? = $ac_status" >&5
++  echo "$as_me:12874: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -12867,7 +12882,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12870: result: $cf_cv_posix_visible" >&5
++echo "$as_me:12885: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -12909,14 +12924,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:12912: checking if this is the GNU C library" >&5
++echo "$as_me:12927: 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 12919 "configure"
++#line 12934 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12935,16 +12950,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12938: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12953: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12941: \$? = $ac_status" >&5
++  echo "$as_me:12956: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12944: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12959: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12947: \$? = $ac_status" >&5
++  echo "$as_me:12962: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -12955,7 +12970,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12958: result: $cf_cv_gnu_library" >&5
++echo "$as_me:12973: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -12963,7 +12978,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:12966: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:12981: 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
+@@ -12975,7 +12990,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12978 "configure"
++#line 12993 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12994,16 +13009,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12997: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13012: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13000: \$? = $ac_status" >&5
++  echo "$as_me:13015: \$? = $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:13018: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13006: \$? = $ac_status" >&5
++  echo "$as_me:13021: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -13015,12 +13030,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:13018: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:13033: 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:13023: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:13038: 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
+@@ -13125,7 +13140,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13128 "configure"
++#line 13143 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -13145,16 +13160,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13148: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13163: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13151: \$? = $ac_status" >&5
++  echo "$as_me:13166: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13154: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13169: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13157: \$? = $ac_status" >&5
++  echo "$as_me:13172: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -13165,7 +13180,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13168: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:13183: 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
+@@ -13174,14 +13189,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:13177: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:13192: 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 13184 "configure"
++#line 13199 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13196,16 +13211,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13199: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13214: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13202: \$? = $ac_status" >&5
++  echo "$as_me:13217: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13205: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13220: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13208: \$? = $ac_status" >&5
++  echo "$as_me:13223: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -13312,7 +13327,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13315 "configure"
++#line 13330 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13327,16 +13342,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13330: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13345: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13333: \$? = $ac_status" >&5
++  echo "$as_me:13348: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13336: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13351: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13339: \$? = $ac_status" >&5
++  echo "$as_me:13354: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -13351,12 +13366,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13354: result: $cf_cv_gnu_source" >&5
++echo "$as_me:13369: 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:13359: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:13374: 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
+@@ -13366,7 +13381,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13369 "configure"
++#line 13384 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13381,16 +13396,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13384: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13399: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13387: \$? = $ac_status" >&5
++  echo "$as_me:13402: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13390: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13405: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13393: \$? = $ac_status" >&5
++  echo "$as_me:13408: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -13401,7 +13416,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13404: result: $cf_cv_default_source" >&5
++echo "$as_me:13419: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -13438,16 +13453,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:13441: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:13456: 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}:13447: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:13462: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13450 "configure"
++#line 13465 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13462,16 +13477,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13465: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13480: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13468: \$? = $ac_status" >&5
++  echo "$as_me:13483: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13471: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13486: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13474: \$? = $ac_status" >&5
++  echo "$as_me:13489: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -13492,7 +13507,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13495 "configure"
++#line 13510 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13507,16 +13522,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13510: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13525: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13513: \$? = $ac_status" >&5
++  echo "$as_me:13528: \$? = $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:13531: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13519: \$? = $ac_status" >&5
++  echo "$as_me:13534: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13527,7 +13542,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:13530: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:13545: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -13535,10 +13550,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:13538: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:13553: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13541 "configure"
++#line 13556 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13553,16 +13568,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13556: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13571: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13559: \$? = $ac_status" >&5
++  echo "$as_me:13574: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13562: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13577: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13565: \$? = $ac_status" >&5
++  echo "$as_me:13580: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13578,7 +13593,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13581: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:13596: 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
+@@ -13695,7 +13710,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:13698: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:13713: 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
+@@ -13727,14 +13742,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:13730: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:13745: 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 13737 "configure"
++#line 13752 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13752,16 +13767,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13755: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13770: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13758: \$? = $ac_status" >&5
++  echo "$as_me:13773: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13761: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13776: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13764: \$? = $ac_status" >&5
++  echo "$as_me:13779: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -13773,7 +13788,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13776 "configure"
++#line 13791 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13791,16 +13806,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13794: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13809: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13797: \$? = $ac_status" >&5
++  echo "$as_me:13812: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13800: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13815: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13803: \$? = $ac_status" >&5
++  echo "$as_me:13818: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -13815,7 +13830,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13818: result: $cf_cv_xopen_source" >&5
++echo "$as_me:13833: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -13975,16 +13990,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:13978: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:13993: 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}:13984: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:13999: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13987 "configure"
++#line 14002 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13999,16 +14014,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14002: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14017: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14005: \$? = $ac_status" >&5
++  echo "$as_me:14020: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14008: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14023: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14011: \$? = $ac_status" >&5
++  echo "$as_me:14026: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -14029,7 +14044,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14032 "configure"
++#line 14047 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14044,16 +14059,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14047: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14062: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14050: \$? = $ac_status" >&5
++  echo "$as_me:14065: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14053: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14068: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14056: \$? = $ac_status" >&5
++  echo "$as_me:14071: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -14064,7 +14079,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:14067: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:14082: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -14072,10 +14087,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:14075: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:14090: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14078 "configure"
++#line 14093 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14090,16 +14105,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14093: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14108: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14096: \$? = $ac_status" >&5
++  echo "$as_me:14111: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14099: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14114: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14102: \$? = $ac_status" >&5
++  echo "$as_me:14117: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -14115,7 +14130,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14118: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:14133: 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
+@@ -14228,10 +14243,10 @@
+ 	if test "$cf_cv_xopen_source" = no ; then
+ 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+ 
+-echo "${as_me:-configure}:14231: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:14246: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14234 "configure"
++#line 14249 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14249,23 +14264,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14252: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14267: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14255: \$? = $ac_status" >&5
++  echo "$as_me:14270: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14258: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14273: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14261: \$? = $ac_status" >&5
++  echo "$as_me:14276: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-			{ echo "$as_me:14268: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++			{ echo "$as_me:14283: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ 			CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -14288,7 +14303,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}:14291: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:14306: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -14300,7 +14315,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}:14303: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:14318: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -14388,7 +14403,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:14391: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:14406: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -14398,7 +14413,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:14401: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:14416: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -14408,7 +14423,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}:14411: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:14426: 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"
+@@ -14420,10 +14435,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:14423: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:14438: 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 14426 "configure"
++#line 14441 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14438,16 +14453,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14441: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14456: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14444: \$? = $ac_status" >&5
++  echo "$as_me:14459: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14447: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14462: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14450: \$? = $ac_status" >&5
++  echo "$as_me:14465: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -14456,12 +14471,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:14459: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:14474: 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 14464 "configure"
++#line 14479 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14476,16 +14491,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14479: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14494: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14482: \$? = $ac_status" >&5
++  echo "$as_me:14497: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14485: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14500: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14488: \$? = $ac_status" >&5
++  echo "$as_me:14503: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -14496,19 +14511,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:14499: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:14514: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:14504: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:14519: 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 14511 "configure"
++#line 14526 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14526,16 +14541,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14529: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14544: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14532: \$? = $ac_status" >&5
++  echo "$as_me:14547: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14535: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14550: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14538: \$? = $ac_status" >&5
++  echo "$as_me:14553: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -14547,7 +14562,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14550 "configure"
++#line 14565 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14565,16 +14580,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14568: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14583: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14571: \$? = $ac_status" >&5
++  echo "$as_me:14586: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14574: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14589: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14577: \$? = $ac_status" >&5
++  echo "$as_me:14592: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -14589,7 +14604,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14592: result: $cf_cv_xopen_source" >&5
++echo "$as_me:14607: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -14736,13 +14751,13 @@
+ fi
+ fi # cf_cv_posix_visible
+ 
+-echo "$as_me:14739: checking for ANSI C header files" >&5
++echo "$as_me:14754: 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 14745 "configure"
++#line 14760 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -14750,13 +14765,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:14753: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:14768: \"$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:14759: \$? = $ac_status" >&5
++  echo "$as_me:14774: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14778,7 +14793,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 14781 "configure"
++#line 14796 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -14796,7 +14811,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 14799 "configure"
++#line 14814 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -14817,7 +14832,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14820 "configure"
++#line 14835 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -14843,15 +14858,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:14846: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14861: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14849: \$? = $ac_status" >&5
++  echo "$as_me:14864: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:14851: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14866: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14854: \$? = $ac_status" >&5
++  echo "$as_me:14869: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -14864,7 +14879,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:14867: result: $ac_cv_header_stdc" >&5
++echo "$as_me:14882: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -14880,28 +14895,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:14883: checking for $ac_header" >&5
++echo "$as_me:14898: 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 14889 "configure"
++#line 14904 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14895: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14910: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14898: \$? = $ac_status" >&5
++  echo "$as_me:14913: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14901: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14916: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14904: \$? = $ac_status" >&5
++  echo "$as_me:14919: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -14911,7 +14926,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14914: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:14929: 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:14939: checking whether exit is declared" >&5
+ echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
+ if test "${ac_cv_have_decl_exit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14930 "configure"
++#line 14945 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14942,16 +14957,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14945: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14960: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14948: \$? = $ac_status" >&5
++  echo "$as_me:14963: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14951: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14966: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14954: \$? = $ac_status" >&5
++  echo "$as_me:14969: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_have_decl_exit=yes
+ else
+@@ -14961,7 +14976,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14964: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:14979: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+ 
+ # Check whether --enable-largefile or --disable-largefile was given.
+@@ -14971,7 +14986,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:14974: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:14989: 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
+@@ -14983,7 +14998,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 14986 "configure"
++#line 15001 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15003,16 +15018,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15006: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15021: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15009: \$? = $ac_status" >&5
++  echo "$as_me:15024: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15012: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15027: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15015: \$? = $ac_status" >&5
++  echo "$as_me:15030: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -15022,16 +15037,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15025: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15040: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15028: \$? = $ac_status" >&5
++  echo "$as_me:15043: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15031: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15046: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15034: \$? = $ac_status" >&5
++  echo "$as_me:15049: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -15045,13 +15060,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:15048: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:15063: 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:15054: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:15069: 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
+@@ -15059,7 +15074,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15062 "configure"
++#line 15077 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15079,16 +15094,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15082: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15097: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15085: \$? = $ac_status" >&5
++  echo "$as_me:15100: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15088: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15103: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15091: \$? = $ac_status" >&5
++  echo "$as_me:15106: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -15097,7 +15112,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15100 "configure"
++#line 15115 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -15118,16 +15133,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15121: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15136: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15124: \$? = $ac_status" >&5
++  echo "$as_me:15139: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15127: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15142: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15130: \$? = $ac_status" >&5
++  echo "$as_me:15145: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -15138,7 +15153,7 @@
+   break
+ done
+ fi
+-echo "$as_me:15141: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:15156: 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
+ 
+@@ -15148,7 +15163,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:15151: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:15166: 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
+@@ -15156,7 +15171,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15159 "configure"
++#line 15174 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15176,16 +15191,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15179: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15194: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15182: \$? = $ac_status" >&5
++  echo "$as_me:15197: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15185: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15200: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15188: \$? = $ac_status" >&5
++  echo "$as_me:15203: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -15194,7 +15209,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15197 "configure"
++#line 15212 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -15215,16 +15230,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15218: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15233: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15221: \$? = $ac_status" >&5
++  echo "$as_me:15236: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15224: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15239: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15227: \$? = $ac_status" >&5
++  echo "$as_me:15242: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -15235,7 +15250,7 @@
+   break
+ done
+ fi
+-echo "$as_me:15238: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:15253: 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
+ 
+@@ -15248,7 +15263,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:15251: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:15266: 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
+@@ -15256,7 +15271,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15259 "configure"
++#line 15274 "configure"
+ #include "confdefs.h"
+ #include 
+     #include 
+@@ -15271,16 +15286,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15274: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15289: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15277: \$? = $ac_status" >&5
++  echo "$as_me:15292: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15280: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15295: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15283: \$? = $ac_status" >&5
++  echo "$as_me:15298: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -15289,7 +15304,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15292 "configure"
++#line 15307 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -15305,16 +15320,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15308: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15323: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15311: \$? = $ac_status" >&5
++  echo "$as_me:15326: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15314: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15329: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15317: \$? = $ac_status" >&5
++  echo "$as_me:15332: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -15325,7 +15340,7 @@
+   break
+ done
+ fi
+-echo "$as_me:15328: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:15343: 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
+ 
+@@ -15339,13 +15354,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:15342: checking for fseeko" >&5
++echo "$as_me:15357: 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 15348 "configure"
++#line 15363 "configure"
+ #include "confdefs.h"
+ #include 
+                              #include 
+@@ -15359,16 +15374,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15362: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15377: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15365: \$? = $ac_status" >&5
++  echo "$as_me:15380: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15368: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15383: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15371: \$? = $ac_status" >&5
++  echo "$as_me:15386: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -15378,7 +15393,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15381: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:15396: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -15417,14 +15432,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:15420: checking whether to use struct dirent64" >&5
++	echo "$as_me:15435: 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 15427 "configure"
++#line 15442 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -15451,16 +15466,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15454: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15469: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15457: \$? = $ac_status" >&5
++  echo "$as_me:15472: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15460: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15475: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15463: \$? = $ac_status" >&5
++  echo "$as_me:15478: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -15471,7 +15486,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15474: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:15489: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -15481,7 +15496,7 @@
+ 	fi
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:15484: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:15499: 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.
+@@ -15491,7 +15506,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:15494: result: $with_rcs_ids" >&5
++echo "$as_me:15509: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "$with_rcs_ids" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -15501,7 +15516,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15504: checking if you want to build with function extensions" >&5
++echo "$as_me:15519: 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.
+@@ -15511,7 +15526,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:15514: result: $with_ext_funcs" >&5
++echo "$as_me:15529: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "$with_ext_funcs" = yes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -15529,7 +15544,7 @@
+ fi
+ 
+ ###   use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:15532: checking for extended use of const keyword" >&5
++echo "$as_me:15547: 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.
+@@ -15539,7 +15554,7 @@
+ else
+   with_ext_const=no
+ fi;
+-echo "$as_me:15542: result: $with_ext_const" >&5
++echo "$as_me:15557: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "$with_ext_const" = yes ; then
+@@ -15549,7 +15564,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:15552: checking if you want all development code" >&5
++echo "$as_me:15567: 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.
+@@ -15559,7 +15574,7 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:15562: result: $with_develop" >&5
++echo "$as_me:15577: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###############################################################################
+@@ -15568,7 +15583,7 @@
+ # This is still experimental (20080329), but should ultimately be moved to
+ # the script-block --with-normal, etc.
+ 
+-echo "$as_me:15571: checking if you want to link with the pthread library" >&5
++echo "$as_me:15586: 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.
+@@ -15578,27 +15593,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:15581: result: $with_pthread" >&5
++echo "$as_me:15596: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:15585: checking for pthread.h" >&5
++	echo "$as_me:15600: 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 15591 "configure"
++#line 15606 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:15595: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:15610: \"$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:15601: \$? = $ac_status" >&5
++  echo "$as_me:15616: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15617,7 +15632,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:15620: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:15635: 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
+ 
+@@ -15627,7 +15642,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:15630: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:15645: 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"
+ 
+@@ -15648,7 +15663,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15651 "configure"
++#line 15666 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15665,16 +15680,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15668: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15683: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15671: \$? = $ac_status" >&5
++  echo "$as_me:15686: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15674: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15689: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15677: \$? = $ac_status" >&5
++  echo "$as_me:15692: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -15684,7 +15699,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:15687: result: $with_pthread" >&5
++	    echo "$as_me:15702: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -15712,7 +15727,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:15715: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:15730: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -15721,7 +15736,7 @@
+ 
+ fi
+ 
+-echo "$as_me:15724: checking if you want to use weak-symbols for pthreads" >&5
++echo "$as_me:15739: 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.
+@@ -15731,18 +15746,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-echo "$as_me:15734: result: $use_weak_symbols" >&5
++echo "$as_me:15749: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ if test "$use_weak_symbols" = yes ; then
+ 
+-echo "$as_me:15738: checking if $CC supports weak symbols" >&5
++echo "$as_me:15753: 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 15745 "configure"
++#line 15760 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15768,16 +15783,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15771: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15786: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15774: \$? = $ac_status" >&5
++  echo "$as_me:15789: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15777: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15792: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15780: \$? = $ac_status" >&5
++  echo "$as_me:15795: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -15788,7 +15803,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15791: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:15806: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ else
+@@ -15817,13 +15832,13 @@
+ fi
+ 
+ # OpenSUSE is installing ncurses6, using reentrant option.
+-echo "$as_me:15820: checking for _nc_TABSIZE" >&5
++echo "$as_me:15835: 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 15826 "configure"
++#line 15841 "configure"
+ #include "confdefs.h"
+ #define _nc_TABSIZE autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15854,16 +15869,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15857: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15872: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15860: \$? = $ac_status" >&5
++  echo "$as_me:15875: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15863: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15878: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15866: \$? = $ac_status" >&5
++  echo "$as_me:15881: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func__nc_TABSIZE=yes
+ else
+@@ -15873,7 +15888,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15876: result: $ac_cv_func__nc_TABSIZE" >&5
++echo "$as_me:15891: 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
+@@ -15885,7 +15900,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:15888: checking if you want experimental reentrant code" >&5
++echo "$as_me:15903: 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.
+@@ -15895,7 +15910,7 @@
+ else
+   with_reentrant=$assume_reentrant
+ fi;
+-echo "$as_me:15898: result: $with_reentrant" >&5
++echo "$as_me:15913: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "$with_reentrant" = yes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -15918,7 +15933,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:15921: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:15936: 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.
+@@ -15928,7 +15943,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:15931: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:15946: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -15942,7 +15957,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:15945: checking if you want to see long compiling messages" >&5
++echo "$as_me:15960: 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.
+@@ -15976,10 +15991,10 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:15979: result: $enableval" >&5
++echo "$as_me:15994: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+-echo "$as_me:15982: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:15997: 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.
+@@ -15996,17 +16011,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:15999: result: $enable_stdnoreturn" >&5
++echo "$as_me:16014: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:16003: checking for C11 _Noreturn feature" >&5
++echo "$as_me:16018: 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 16009 "configure"
++#line 16024 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -16022,16 +16037,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16025: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16040: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16028: \$? = $ac_status" >&5
++  echo "$as_me:16043: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16031: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16046: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16034: \$? = $ac_status" >&5
++  echo "$as_me:16049: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -16042,7 +16057,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16045: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:16060: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -16098,16 +16113,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16101: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16116: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16106: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16121: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16110: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16125: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -16146,16 +16161,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16149: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16164: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16154: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16169: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16158: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16173: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -16194,23 +16209,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16197: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16212: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16202: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16217: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16206: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16221: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:16213: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:16228: 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.
+@@ -16227,7 +16242,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:16230: result: $enable_warnings" >&5
++echo "$as_me:16245: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -16251,7 +16266,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16254 "configure"
++#line 16269 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16266,26 +16281,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16269: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16284: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16272: \$? = $ac_status" >&5
++  echo "$as_me:16287: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16275: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16290: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16278: \$? = $ac_status" >&5
++  echo "$as_me:16293: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:16281: checking for X11/Xt const-feature" >&5
++echo "$as_me:16296: 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 16288 "configure"
++#line 16303 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -16303,16 +16318,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16306: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16321: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16309: \$? = $ac_status" >&5
++  echo "$as_me:16324: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16312: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16327: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16315: \$? = $ac_status" >&5
++  echo "$as_me:16330: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -16327,7 +16342,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16330: result: $cf_cv_const_x_string" >&5
++echo "$as_me:16345: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -16356,7 +16371,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:16390: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -16388,12 +16403,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:16391: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:16406: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16394: \$? = $ac_status" >&5
++  echo "$as_me:16409: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:16396: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:16411: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -16401,7 +16416,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:16404: checking for $CC warning options..." >&5
++	{ echo "$as_me:16419: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -16424,12 +16439,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:16427: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:16442: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16430: \$? = $ac_status" >&5
++  echo "$as_me:16445: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:16432: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:16447: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -16437,7 +16452,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:16440: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:16455: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -16447,7 +16462,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:16450: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:16465: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -16480,10 +16495,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:16483: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:16498: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -16533,12 +16548,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:16536: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:16551: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16539: \$? = $ac_status" >&5
++  echo "$as_me:16554: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:16541: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:16556: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -16606,7 +16621,7 @@
+ fi
+ 
+ ###	use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:16609: checking if you want to enable runtime assertions" >&5
++echo "$as_me:16624: 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.
+@@ -16616,7 +16631,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:16619: result: $with_assertions" >&5
++echo "$as_me:16634: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -16669,7 +16684,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16672: checking whether to add trace feature to all models" >&5
++echo "$as_me:16687: 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.
+@@ -16679,7 +16694,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:16682: result: $cf_with_trace" >&5
++echo "$as_me:16697: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "$cf_with_trace" = yes ; then
+@@ -16693,7 +16708,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:16696: checking if we want to use GNAT projects" >&5
++echo "$as_me:16711: 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.
+@@ -16710,21 +16725,21 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:16713: result: $enable_gnat_projects" >&5
++echo "$as_me:16728: 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:16720: checking if ssp library is needed" >&5
++echo "$as_me:16735: 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 16727 "configure"
++#line 16742 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16741,16 +16756,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16744: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16759: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16747: \$? = $ac_status" >&5
++  echo "$as_me:16762: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16750: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16765: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16753: \$? = $ac_status" >&5
++  echo "$as_me:16768: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -16760,7 +16775,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16763 "configure"
++#line 16778 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16777,16 +16792,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16780: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16795: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16783: \$? = $ac_status" >&5
++  echo "$as_me:16798: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16786: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16801: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16789: \$? = $ac_status" >&5
++  echo "$as_me:16804: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -16800,7 +16815,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16803: result: $cf_cv_need_libssp" >&5
++echo "$as_me:16818: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -16828,13 +16843,13 @@
+ (*)
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:16831: checking for clock_gettime" >&5
++echo "$as_me:16846: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16837 "configure"
++#line 16852 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16865,16 +16880,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16868: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16883: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16871: \$? = $ac_status" >&5
++  echo "$as_me:16886: \$? = $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:16889: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16877: \$? = $ac_status" >&5
++  echo "$as_me:16892: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -16884,12 +16899,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16887: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:16902: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:16892: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:16907: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16897,7 +16912,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16900 "configure"
++#line 16915 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16916,16 +16931,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16919: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16934: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16922: \$? = $ac_status" >&5
++  echo "$as_me:16937: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16925: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16940: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16928: \$? = $ac_status" >&5
++  echo "$as_me:16943: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -16936,7 +16951,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16939: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:16954: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -16948,14 +16963,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:16951: checking if clock_gettime links" >&5
++echo "$as_me:16966: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16958 "configure"
++#line 16973 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -16973,16 +16988,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16976: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16991: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16979: \$? = $ac_status" >&5
++  echo "$as_me:16994: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16982: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16997: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16985: \$? = $ac_status" >&5
++  echo "$as_me:17000: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -16993,7 +17008,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16996: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:17011: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -17007,13 +17022,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:17010: checking for gettimeofday" >&5
++echo "$as_me:17025: 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 17016 "configure"
++#line 17031 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17044,16 +17059,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17047: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17062: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17050: \$? = $ac_status" >&5
++  echo "$as_me:17065: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17053: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17068: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17056: \$? = $ac_status" >&5
++  echo "$as_me:17071: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -17063,7 +17078,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17066: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:17081: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -17073,7 +17088,7 @@
+ 
+ else
+ 
+-echo "$as_me:17076: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:17091: 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
+@@ -17081,7 +17096,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17084 "configure"
++#line 17099 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17100,16 +17115,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17103: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17118: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17106: \$? = $ac_status" >&5
++  echo "$as_me:17121: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17109: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17124: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17112: \$? = $ac_status" >&5
++  echo "$as_me:17127: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -17120,7 +17135,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17123: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:17138: 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
+ 
+@@ -17153,13 +17168,13 @@
+ esac
+ 
+ ###	Checks for header files.
+-echo "$as_me:17156: checking for signed char" >&5
++echo "$as_me:17171: 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 17162 "configure"
++#line 17177 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17174,16 +17189,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17177: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17192: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17180: \$? = $ac_status" >&5
++  echo "$as_me:17195: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17183: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17198: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17186: \$? = $ac_status" >&5
++  echo "$as_me:17201: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -17193,10 +17208,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17196: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:17211: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:17199: checking size of signed char" >&5
++echo "$as_me:17214: 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
+@@ -17205,7 +17220,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17208 "configure"
++#line 17223 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17217,21 +17232,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17220: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17235: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17223: \$? = $ac_status" >&5
++  echo "$as_me:17238: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17226: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17241: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17229: \$? = $ac_status" >&5
++  echo "$as_me:17244: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17234 "configure"
++#line 17249 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17243,16 +17258,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17246: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17261: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17249: \$? = $ac_status" >&5
++  echo "$as_me:17264: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17252: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17267: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17255: \$? = $ac_status" >&5
++  echo "$as_me:17270: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -17268,7 +17283,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17271 "configure"
++#line 17286 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17280,16 +17295,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17283: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17298: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17286: \$? = $ac_status" >&5
++  echo "$as_me:17301: \$? = $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:17304: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17292: \$? = $ac_status" >&5
++  echo "$as_me:17307: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -17305,7 +17320,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 17308 "configure"
++#line 17323 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17317,16 +17332,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17320: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17335: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17323: \$? = $ac_status" >&5
++  echo "$as_me:17338: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17326: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17341: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17329: \$? = $ac_status" >&5
++  echo "$as_me:17344: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -17339,12 +17354,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:17342: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:17357: 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 17347 "configure"
++#line 17362 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17360,15 +17375,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17363: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17378: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17366: \$? = $ac_status" >&5
++  echo "$as_me:17381: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17368: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17383: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17371: \$? = $ac_status" >&5
++  echo "$as_me:17386: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -17384,7 +17399,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:17387: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:17402: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:17411: 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 17402 "configure"
++#line 17417 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -17414,16 +17429,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17417: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17432: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17420: \$? = $ac_status" >&5
++  echo "$as_me:17435: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17423: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17438: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17426: \$? = $ac_status" >&5
++  echo "$as_me:17441: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -17433,7 +17448,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17436: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17451: 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:17464: 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
+@@ -17454,7 +17469,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17457 "configure"
++#line 17472 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17473,16 +17488,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17476: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17491: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17479: \$? = $ac_status" >&5
++  echo "$as_me:17494: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17482: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17497: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17485: \$? = $ac_status" >&5
++  echo "$as_me:17500: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -17493,14 +17508,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17496: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:17511: 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:17503: checking for opendir in -lx" >&5
++  echo "$as_me:17518: 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
+@@ -17508,7 +17523,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17511 "configure"
++#line 17526 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17527,16 +17542,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17530: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17545: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17533: \$? = $ac_status" >&5
++  echo "$as_me:17548: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17536: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17551: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17539: \$? = $ac_status" >&5
++  echo "$as_me:17554: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -17547,7 +17562,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17550: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:17565: 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"
+@@ -17555,13 +17570,13 @@
+ 
+ fi
+ 
+-echo "$as_me:17558: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:17573: 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 17564 "configure"
++#line 17579 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -17577,16 +17592,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17580: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17595: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17583: \$? = $ac_status" >&5
++  echo "$as_me:17598: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17586: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17601: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17589: \$? = $ac_status" >&5
++  echo "$as_me:17604: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -17596,7 +17611,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17599: result: $ac_cv_header_time" >&5
++echo "$as_me:17614: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -17614,13 +17629,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:17617: checking for an ANSI C-conforming const" >&5
++echo "$as_me:17632: 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 17623 "configure"
++#line 17638 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17682,16 +17697,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17685: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17700: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17688: \$? = $ac_status" >&5
++  echo "$as_me:17703: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17691: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17706: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17694: \$? = $ac_status" >&5
++  echo "$as_me:17709: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -17701,7 +17716,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17704: result: $ac_cv_c_const" >&5
++echo "$as_me:17719: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -17713,7 +17728,7 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:17716: checking if data-only library module links" >&5
++echo "$as_me:17731: 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
+@@ -17721,20 +17736,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:17742: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17730: \$? = $ac_status" >&5
++  echo "$as_me:17745: \$? = $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:17769: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17757: \$? = $ac_status" >&5
++  echo "$as_me:17772: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -17767,7 +17782,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17770 "configure"
++#line 17785 "configure"
+ #include "confdefs.h"
+ 
+ 	extern int testfunc(void);
+@@ -17778,15 +17793,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17781: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17796: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17784: \$? = $ac_status" >&5
++  echo "$as_me:17799: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17786: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17801: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17789: \$? = $ac_status" >&5
++  echo "$as_me:17804: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -17801,7 +17816,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17804: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:17819: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -17820,23 +17835,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17823: checking for $ac_header" >&5
++echo "$as_me:17838: 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 17829 "configure"
++#line 17844 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17833: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:17848: \"$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:17839: \$? = $ac_status" >&5
++  echo "$as_me:17854: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17855,7 +17870,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17858: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17873: 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:17883: 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
+@@ -17876,7 +17891,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17879 "configure"
++#line 17894 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17911,15 +17926,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17914: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17929: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17917: \$? = $ac_status" >&5
++  echo "$as_me:17932: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17919: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17934: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17922: \$? = $ac_status" >&5
++  echo "$as_me:17937: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -17934,16 +17949,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:17937: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:17952: 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:17940: checking for mkstemp" >&5
++	echo "$as_me:17955: 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 17946 "configure"
++#line 17961 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17974,16 +17989,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17977: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17992: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17980: \$? = $ac_status" >&5
++  echo "$as_me:17995: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17983: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17998: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17986: \$? = $ac_status" >&5
++  echo "$as_me:18001: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -17993,7 +18008,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17996: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:18011: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -18014,7 +18029,7 @@
+ if test "$cf_with_ada" != "no" ; then
+ 	if test	"$cf_cv_prog_gnat_correct" = yes; then
+ 
+-	echo "$as_me:18017: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:18032: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -18031,10 +18046,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:18034: result: $ADAFLAGS" >&5
++	echo "$as_me:18049: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:18037: checking if GNATPREP supports -T option" >&5
++echo "$as_me:18052: 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
+@@ -18044,11 +18059,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:18047: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:18062: 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:18051: checking if GNAT supports generics" >&5
++echo "$as_me:18066: 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])
+@@ -18058,7 +18073,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:18061: result: $cf_gnat_generics" >&5
++echo "$as_me:18076: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -18070,7 +18085,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:18073: checking if GNAT supports SIGINT" >&5
++echo "$as_me:18088: 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
+@@ -18118,7 +18133,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:18121: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:18136: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -18131,7 +18146,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:18134: checking if GNAT supports project files" >&5
++echo "$as_me:18149: 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]*)
+@@ -18194,15 +18209,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:18197: result: $cf_gnat_projects" >&5
++echo "$as_me:18212: 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:18203: checking if GNAT supports libraries" >&5
++	echo "$as_me:18218: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:18205: result: $cf_gnat_libraries" >&5
++	echo "$as_me:18220: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -18222,7 +18237,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:18225: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:18240: 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
+@@ -18234,7 +18249,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:18237: checking for Ada95 compiler" >&5
++echo "$as_me:18252: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -18245,12 +18260,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:18248: result: $cf_ada_compiler" >&5
++echo "$as_me:18263: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 		cf_ada_package=terminal_interface
+ 
+-echo "$as_me:18253: checking for Ada95 include directory" >&5
++echo "$as_me:18268: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -18267,26 +18282,24 @@
+ 	cf_path_syntax="$ac_default_prefix"
+ fi
+ 
+-case ".$withval" in
+-(.\$\(*\)*|.\'*\'*)
+-	;;
+-(..|./*|.\\*)
++case "x$withval" in
++(x\$\(*\)*|x\'*\'*)
+ 	;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ 	eval withval="$withval"
+-	case ".$withval" in
+-	(.NONE/*)
++	case "x$withval" in
++	(xNONE/*)
+ 		withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 		;;
+ 	esac
+ 	;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:18289: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:18302: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -18295,10 +18308,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:18298: result: $ADA_INCLUDE" >&5
++echo "$as_me:18311: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:18301: checking for Ada95 object directory" >&5
++echo "$as_me:18314: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -18315,26 +18328,24 @@
+ 	cf_path_syntax="$ac_default_prefix"
+ fi
+ 
+-case ".$withval" in
+-(.\$\(*\)*|.\'*\'*)
+-	;;
+-(..|./*|.\\*)
++case "x$withval" in
++(x\$\(*\)*|x\'*\'*)
+ 	;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ 	eval withval="$withval"
+-	case ".$withval" in
+-	(.NONE/*)
++	case "x$withval" in
++	(xNONE/*)
+ 		withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 		;;
+ 	esac
+ 	;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:18337: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:18348: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -18343,10 +18354,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:18346: result: $ADA_OBJECTS" >&5
++echo "$as_me:18357: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:18349: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:18360: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -18367,11 +18378,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:18370: result: $with_ada_sharedlib" >&5
++echo "$as_me:18381: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+-	{ echo "$as_me:18374: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++	{ echo "$as_me:18385: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+ 
+@@ -18389,7 +18400,7 @@
+ 
+ 		# allow the Ada binding to be renamed
+ 
+-echo "$as_me:18392: checking for Ada95 curses library name" >&5
++echo "$as_me:18403: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -18405,16 +18416,16 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18408: result: $ADA_LIBNAME" >&5
++echo "$as_me:18419: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 	else
+-		{ { echo "$as_me:18412: error: No usable Ada compiler found" >&5
++		{ { echo "$as_me:18423: 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:18417: error: The Ada compiler is needed for this package" >&5
++	{ { echo "$as_me:18428: 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
+@@ -18454,7 +18465,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:18457: checking default library suffix" >&5
++echo "$as_me:18468: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -18465,10 +18476,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:18468: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:18479: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:18471: checking default library-dependency suffix" >&5
++echo "$as_me:18482: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -18551,10 +18562,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:18554: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:18565: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:18557: checking default object directory" >&5
++echo "$as_me:18568: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -18570,7 +18581,7 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:18573: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:18584: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ ### Set up low-level terminfo dependencies for makefiles.
+@@ -18712,7 +18723,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:18715: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:18726: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -18893,7 +18904,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:18896: error: ambiguous option: $1
++    { { echo "$as_me:18907: 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;}
+@@ -18912,7 +18923,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:18915: error: unrecognized option: $1
++  -*) { { echo "$as_me:18926: 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;}
+@@ -18987,7 +18998,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:18990: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:19001: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -19109,6 +19120,8 @@
+ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+ s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+ s,@LN_S@,$LN_S,;t t
++s,@GLOB_FULLPATH_POSIX@,$GLOB_FULLPATH_POSIX,;t t
++s,@GLOB_FULLPATH_OTHER@,$GLOB_FULLPATH_OTHER,;t t
+ s,@INSTALL_OPT_S@,$INSTALL_OPT_S,;t t
+ s,@INSTALL_OPT_O@,$INSTALL_OPT_O,;t t
+ s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+@@ -19351,7 +19364,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:19354: creating $ac_file" >&5
++    { echo "$as_me:19367: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -19369,7 +19382,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:19372: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:19385: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -19382,7 +19395,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:19385: error: cannot find input file: $f" >&5
++           { { echo "$as_me:19398: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -19398,7 +19411,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:19401: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:19414: 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;}
+@@ -19407,7 +19420,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:19410: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:19423: 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;}
+@@ -19452,7 +19465,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:19455: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:19468: 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;}
+@@ -19463,7 +19476,7 @@
+     $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:19466: WARNING: Some variables may not be substituted:
++      { echo "$as_me:19479: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -19512,7 +19525,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:19515: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:19528: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -19523,7 +19536,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:19526: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:19539: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -19536,7 +19549,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:19539: error: cannot find input file: $f" >&5
++           { { echo "$as_me:19552: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -19594,7 +19607,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:19597: $ac_file is unchanged" >&5
++      { echo "$as_me:19610: $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.4155 
+--- ncurses-6.5-20240727+/NEWS	2024-07-27 20:13:00.000000000 +0000
++++ ncurses-6.5-20240810/NEWS	2024-08-10 09:45:21.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4155 2024/07/27 20:13:00 tom Exp $
++-- $Id: NEWS,v 1.4160 2024/08/10 09:45:21 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.
+ 
++20240810
++	+ modify misc/Makefile.in and misc/run_tic.in so that $DESTDIR is set
++	  and used only in the makefile.
++	+ modify CF_WITH_PKG_CONFIG_LIBDIR to allow for pkg-config using
++	  DOS/Windows pathname syntax (report by Eli Zaretskii).
++	+ improve glob-expressions in configure script
++	+ remove unused Get_Menu_Screen() macro from menu.priv.h
++	+ update config.guess, config.sub
++
+ 20240727
+ 	+ improve formatting/style of manpages (patches by Branden Robinson).
+ 	+ fixes for compiler warnings/cppcheck.
+Index: VERSION
+--- ncurses-6.5-20240727+/VERSION	2024-07-27 13:25:06.000000000 +0000
++++ ncurses-6.5-20240810/VERSION	2024-08-10 09:45:21.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20240727
++5:0:10	6.5	20240810
+Index: aclocal.m4
+Prereq:  1.1078 
+--- ncurses-6.5-20240727+/aclocal.m4	2024-07-20 23:47:05.000000000 +0000
++++ ncurses-6.5-20240810/aclocal.m4	2024-08-10 15:51:16.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1078 2024/07/20 23:47:05 tom Exp $
++dnl $Id: aclocal.m4,v 1.1087 2024/08/10 15:51:16 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -3213,13 +3213,14 @@
+ AC_SUBST(EXTRA_CFLAGS)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_GETOPT_HEADER version: 8 updated: 2021/06/19 19:16:16
++dnl CF_GETOPT_HEADER version: 9 updated: 2024/08/10 10:30:39
+ dnl ----------------
+ dnl Check for getopt's variables which are commonly defined in stdlib.h,
+ dnl unistd.h or (nonstandard) in getopt.h
+ AC_DEFUN([CF_GETOPT_HEADER],
+-[
+-AC_HAVE_HEADERS(unistd.h getopt.h)
++[AC_REQUIRE([AC_HEADER_STDC])
++
++AC_CHECK_HEADERS(getopt.h)
+ AC_CACHE_CHECK(for header declaring getopt variables,cf_cv_getopt_header,[
+ cf_cv_getopt_header=none
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+@@ -3239,7 +3240,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_GLOB_FULLPATH version: 1 updated: 2024/07/20 19:45:17
++dnl CF_GLOB_FULLPATH version: 2 updated: 2024/08/03 12:34:02
+ dnl ----------------
+ dnl Use this in case-statements to check for pathname syntax, i.e., absolute
+ dnl pathnames.  The "x" is assumed since we provide an alternate form for DOS.
+@@ -3247,16 +3248,16 @@
+ AC_REQUIRE([CF_WITH_SYSTYPE])dnl
+ case "$cf_cv_system_name" in
+ (cygwin*|msys*|mingw32*|mingw64|os2*)
+-	GLOB_FULLPATH_ONLY='x/*|x[[a-zA-Z]]:[[\\/]]*'
+-	GLOB_FULLPATH_ARGS='x/*\ |x[[a-zA-Z]]:[[\\/]]*\ '
++	GLOB_FULLPATH_POSIX='/*'
++	GLOB_FULLPATH_OTHER='[[a-zA-Z]]:[[\\/]]*'
+ 	;;
+ (*)
+-	GLOB_FULLPATH_ONLY='x/*'
+-	GLOB_FULLPATH_ARGS='x/*\ '
++	GLOB_FULLPATH_POSIX='/*'
++	GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX
+ 	;;
+ esac
+-AC_SUBST(GLOB_FULLPATH_ONLY)
+-AC_SUBST(GLOB_FULLPATH_ARGS)
++AC_SUBST(GLOB_FULLPATH_POSIX)
++AC_SUBST(GLOB_FULLPATH_OTHER)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+ dnl CF_GNATPREP_OPT_T version: 1 updated: 2014/08/02 18:37:25
+@@ -4646,7 +4647,7 @@
+ 	AC_SUBST(LIB_PREFIX)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LIB_RULES version: 100 updated: 2023/06/03 15:17:30
++dnl CF_LIB_RULES version: 101 updated: 2024/08/03 13:08:58
+ dnl ------------
+ dnl Append definitions and rules for the given models to the subdirectory
+ dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
+@@ -4664,6 +4665,7 @@
+ AC_DEFUN([CF_LIB_RULES],
+ [AC_REQUIRE([AC_PROG_FGREP])dnl
+ AC_REQUIRE([CF_MAKE_PHONY])dnl
++AC_REQUIRE([CF_GLOB_FULLPATH])dnl
+ 
+ cf_prefix=$LIB_PREFIX
+ AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
+@@ -5189,7 +5191,7 @@
+ if test "$WITH_CURSES_H" = yes; then
+ 	cat >>headers.sh <>headers.sh </dev/null | tr : ' '`
++			cf_raw_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null`
++			case "$cf_raw_search_path" in
++			(*\\*)
++				cf_search_path=`echo "$cf_raw_search_path" | tr ';' ' ' | tr '\' '/'`
++				;;
++			(*/*)
++				cf_search_path=`echo "$cf_raw_search_path" | tr : ' '`
++				;;
++			esac
+ 			test -n "$cf_search_path" && break
+ 		done
+ 
+@@ -9947,7 +9959,7 @@
+ 	[USE_VALGRIND])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_WITH_VERSIONED_SYMS version: 13 updated: 2023/12/03 09:24:04
++dnl CF_WITH_VERSIONED_SYMS version: 14 updated: 2024/08/03 12:34:02
+ dnl ----------------------
+ dnl Use this when building shared library with ELF, to markup symbols with the
+ dnl version identifier from the given input file.  Generally that identifier is
+@@ -9957,6 +9969,7 @@
+ AC_DEFUN([CF_WITH_VERSIONED_SYMS],
+ [AC_REQUIRE([AC_PROG_FGREP])dnl
+ AC_REQUIRE([AC_PROG_EGREP])dnl
++AC_REQUIRE([CF_GLOB_FULLPATH])dnl
+ 
+ AC_MSG_CHECKING(if versioned-symbols file should be used)
+ AC_ARG_WITH(versioned-syms,
+@@ -9970,7 +9983,7 @@
+ 	;;
+ (xno)
+ 	;;
+-(x/*)
++(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	test -f "$with_versioned_syms" || AC_MSG_ERROR(expected a filename: $with_versioned_syms)
+ 	;;
+ (*)
+Index: config.guess
+--- ncurses-6.5-20240727+/config.guess	2023-12-02 20:31:23.000000000 +0000
++++ ncurses-6.5-20240810/config.guess	2024-07-28 05:41:28.000000000 +0000
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-#   Copyright 1992-2023 Free Software Foundation, Inc.
++#   Copyright 1992-2024 Free Software Foundation, Inc.
+ 
+ # shellcheck disable=SC2006,SC2268 # see below for rationale
+ 
+-timestamp='2023-10-19'
++timestamp='2024-07-27'
+ 
+ # 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
+@@ -60,7 +60,7 @@
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright 1992-2023 Free Software Foundation, Inc.
++Copyright 1992-2024 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."
+@@ -123,7 +123,7 @@
+     dummy=$tmp/dummy
+     case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+ 	,,)    echo "int x;" > "$dummy.c"
+-	       for driver in cc gcc c89 c99 ; do
++	       for driver in cc gcc c17 c99 c89 ; do
+ 		   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+ 		       CC_FOR_BUILD=$driver
+ 		       break
+@@ -634,7 +634,8 @@
+ 		sed 's/^		//' << EOF > "$dummy.c"
+ 		#include 
+ 
+-		main()
++		int
++		main ()
+ 			{
+ 			if (!__power_pc())
+ 				exit(1);
+@@ -718,7 +719,8 @@
+ 		#include 
+ 		#include 
+ 
+-		int main ()
++		int
++		main ()
+ 		{
+ 		#if defined(_SC_KERNEL_BITS)
+ 		    long bits = sysconf(_SC_KERNEL_BITS);
+@@ -1621,6 +1623,7 @@
+ #endif
+ #endif
+ #endif
++int
+ main ()
+ {
+ #if defined (sony)
+Index: config.sub
+--- ncurses-6.5-20240727+/config.sub	2023-12-27 14:41:27.000000000 +0000
++++ ncurses-6.5-20240810/config.sub	2024-06-03 19:28:43.000000000 +0000
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+-#   Copyright 1992-2023 Free Software Foundation, Inc.
++#   Copyright 1992-2024 Free Software Foundation, Inc.
+ 
+-# shellcheck disable=SC2006,SC2268 # see below for rationale
++# shellcheck disable=SC2006,SC2268,SC2162 # see below for rationale
+ 
+-timestamp='2023-12-02'
++timestamp='2024-05-27'
+ 
+ # 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
+@@ -76,7 +76,7 @@
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright 1992-2023 Free Software Foundation, Inc.
++Copyright 1992-2024 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."
+@@ -120,7 +120,6 @@
+ esac
+ 
+ # Split fields of configuration type
+-# shellcheck disable=SC2162
+ saved_IFS=$IFS
+ IFS="-" read field1 field2 field3 field4 <&2
+ 		exit 1
+ 		;;
+-	kfreebsd*-gnu*- | kopensolaris*-gnu*-)
++	kfreebsd*-gnu*- | knetbsd*-gnu*- | netbsd*-gnu*- | kopensolaris*-gnu*-)
+ 		;;
+ 	vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-)
+ 		;;
+@@ -1864,6 +2245,8 @@
+ 		;;
+ 	os2-emx-)
+ 		;;
++	rtmk-nova-)
++		;;
+ 	*-eabi*- | *-gnueabi*-)
+ 		;;
+ 	none--*)
+@@ -1890,7 +2273,7 @@
+ 			*-riscix*)
+ 				vendor=acorn
+ 				;;
+-			*-sunos*)
++			*-sunos* | *-solaris*)
+ 				vendor=sun
+ 				;;
+ 			*-cnk* | *-aix*)
+Index: configure
+--- ncurses-6.5-20240727+/configure	2024-07-20 23:48:24.000000000 +0000
++++ ncurses-6.5-20240810/configure	2024-08-10 15:51:41.000000000 +0000
+@@ -4088,6 +4088,17 @@
+ echo "$as_me: error: No awk program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
++case "$cf_cv_system_name" in
++(cygwin*|msys*|mingw32*|mingw64|os2*)
++	GLOB_FULLPATH_POSIX='/*'
++	GLOB_FULLPATH_OTHER='[a-zA-Z]:[\\/]*'
++	;;
++(*)
++	GLOB_FULLPATH_POSIX='/*'
++	GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX
++	;;
++esac
++
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+ # incompatible versions:
+@@ -4100,7 +4111,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:4103: checking for a BSD compatible install" >&5
++echo "$as_me:4114: 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
+@@ -4149,7 +4160,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:4152: result: $INSTALL" >&5
++echo "$as_me:4163: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -4160,8 +4171,8 @@
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+-case $INSTALL in
+-(/*)
++case x$INSTALL in
++(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+ (*)
+ 	cf_dir=`echo "$INSTALL" | sed -e 's%/[^/]*$%%'`
+@@ -4174,7 +4185,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:4177: checking for $ac_word" >&5
++echo "$as_me:4188: 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
+@@ -4189,7 +4200,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LINT="$ac_prog"
+-echo "$as_me:4192: found $ac_dir/$ac_word" >&5
++echo "$as_me:4203: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4197,10 +4208,10 @@
+ fi
+ LINT=$ac_cv_prog_LINT
+ if test -n "$LINT"; then
+-  echo "$as_me:4200: result: $LINT" >&5
++  echo "$as_me:4211: result: $LINT" >&5
+ echo "${ECHO_T}$LINT" >&6
+ else
+-  echo "$as_me:4203: result: no" >&5
++  echo "$as_me:4214: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4213,18 +4224,18 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:4216: checking whether ln -s works" >&5
++echo "$as_me:4227: 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:4220: result: yes" >&5
++  echo "$as_me:4231: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:4223: result: no, using $LN_S" >&5
++  echo "$as_me:4234: result: no, using $LN_S" >&5
+ echo "${ECHO_T}no, using $LN_S" >&6
+ fi
+ 
+-echo "$as_me:4227: checking if $LN_S -f options work" >&5
++echo "$as_me:4238: 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
+@@ -4236,12 +4247,12 @@
+ 	cf_prog_ln_sf=no
+ fi
+ rm -f conf$$.dst conf$$src
+-echo "$as_me:4239: result: $cf_prog_ln_sf" >&5
++echo "$as_me:4250: 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:4244: checking for long file names" >&5
++echo "$as_me:4255: 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
+@@ -4280,7 +4291,7 @@
+   rm -rf "$ac_xdir" 2>/dev/null
+ done
+ fi
+-echo "$as_me:4283: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:4294: 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
+ 
+@@ -4299,7 +4310,7 @@
+   withval="$with_config_suffix"
+   case "x$withval" in
+ 	(xyes|xno)
+-		{ echo "$as_me:4302: WARNING: expected a value for config-suffix option" >&5
++		{ echo "$as_me:4313: 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"
+@@ -4309,7 +4320,7 @@
+ 
+ # If we find pkg-config, check if we should install the ".pc" files.
+ 
+-echo "$as_me:4312: checking if you want to use pkg-config" >&5
++echo "$as_me:4323: 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.
+@@ -4319,7 +4330,7 @@
+ else
+   cf_pkg_config=yes
+ fi;
+-echo "$as_me:4322: result: $cf_pkg_config" >&5
++echo "$as_me:4333: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+ 
+ case "$cf_pkg_config" in
+@@ -4331,7 +4342,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:4334: checking for $ac_word" >&5
++echo "$as_me:4345: 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
+@@ -4348,7 +4359,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:4351: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4362: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -4359,10 +4370,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:4362: result: $PKG_CONFIG" >&5
++  echo "$as_me:4373: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+-  echo "$as_me:4365: result: no" >&5
++  echo "$as_me:4376: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4371,7 +4382,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:4374: checking for $ac_word" >&5
++echo "$as_me:4385: 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
+@@ -4388,7 +4399,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:4391: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4402: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -4400,10 +4411,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ 
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  echo "$as_me:4403: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:4414: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+-  echo "$as_me:4406: result: no" >&5
++  echo "$as_me:4417: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4427,43 +4438,41 @@
+ 	cf_path_syntax="$ac_default_prefix"
+ fi
+ 
+-case ".$PKG_CONFIG" in
+-(.\$\(*\)*|.\'*\'*)
+-	;;
+-(..|./*|.\\*)
++case "x$PKG_CONFIG" in
++(x\$\(*\)*|x\'*\'*)
+ 	;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ 	eval PKG_CONFIG="$PKG_CONFIG"
+-	case ".$PKG_CONFIG" in
+-	(.NONE/*)
++	case "x$PKG_CONFIG" in
++	(xNONE/*)
+ 		PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ 		;;
+ 	esac
+ 	;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4449: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++	{ { echo "$as_me:4458: 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:4456: WARNING: pkg-config is not installed" >&5
++	{ echo "$as_me:4465: 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:4462: checking for pkg-config library directory" >&5
++	echo "$as_me:4471: checking for pkg-config library directory" >&5
+ echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
+ 	;;
+ (*)
+-	echo "$as_me:4466: checking for $PKG_CONFIG library directory" >&5
++	echo "$as_me:4475: checking for $PKG_CONFIG library directory" >&5
+ echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
+ 	;;
+ esac
+@@ -4490,27 +4499,27 @@
+ case "x$cf_search_path" in
+ (xlibdir)
+ 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+-	echo "$as_me:4493: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:4502: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+ (x)
+ 	;;
+-(x/*\ *)
++(x$GLOB_FULLPATH_POSIX\ *|x$GLOB_FULLPATH_OTHER\ *)
+ 	PKG_CONFIG_LIBDIR=
+ 	;;
+-(x/*)
++(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	PKG_CONFIG_LIBDIR="$cf_search_path"
+-	echo "$as_me:4504: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:4513: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+ (xyes|xauto)
+-	echo "$as_me:4509: result: auto" >&5
++	echo "$as_me:4518: 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:4513: checking for search-list" >&5
++	echo "$as_me:4522: checking for search-list" >&5
+ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+ 	if test "x$PKG_CONFIG" != xnone
+ 	then
+@@ -4521,7 +4530,15 @@
+ 			pkg-config \
+ 			pkgconf
+ 		do
+-			cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '`
++			cf_raw_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null`
++			case "$cf_raw_search_path" in
++			(*\\*)
++				cf_search_path=`echo "$cf_raw_search_path" | tr ';' ' ' | tr '\' '/'`
++				;;
++			(*/*)
++				cf_search_path=`echo "$cf_raw_search_path" | tr : ' '`
++				;;
++			esac
+ 			test -n "$cf_search_path" && break
+ 		done
+ 
+@@ -4537,11 +4554,11 @@
+ "`
+ 	fi
+ 
+-	echo "$as_me:4540: result: $cf_search_path" >&5
++	echo "$as_me:4557: result: $cf_search_path" >&5
+ echo "${ECHO_T}$cf_search_path" >&6
+ 	;;
+ (*)
+-	{ { echo "$as_me:4544: error: Unexpected option value: $cf_search_path" >&5
++	{ { echo "$as_me:4561: error: Unexpected option value: $cf_search_path" >&5
+ echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -4549,7 +4566,7 @@
+ 
+ if test -n "$cf_search_path"
+ then
+-	echo "$as_me:4552: checking for first directory" >&5
++	echo "$as_me:4569: 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
+@@ -4560,7 +4577,7 @@
+ 			break
+ 		fi
+ 	done
+-	echo "$as_me:4563: result: $cf_pkg_config_path" >&5
++	echo "$as_me:4580: result: $cf_pkg_config_path" >&5
+ echo "${ECHO_T}$cf_pkg_config_path" >&6
+ 
+ 	if test "x$cf_pkg_config_path" != xnone ; then
+@@ -4570,7 +4587,7 @@
+ 
+ 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+ 	then
+-		echo "$as_me:4573: checking for workaround" >&5
++		echo "$as_me:4590: checking for workaround" >&5
+ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+ 		if test "$prefix" = "NONE" ; then
+ 			cf_prefix="$ac_default_prefix"
+@@ -4593,17 +4610,17 @@
+ 			esac
+ 		done
+ 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+-		echo "$as_me:4596: result: $PKG_CONFIG_LIBDIR" >&5
++		echo "$as_me:4613: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	fi
+ fi
+ 
+ if test "x$PKG_CONFIG" != xnone
+ then
+-	echo "$as_me:4603: checking if we should install .pc files for $PKG_CONFIG" >&5
++	echo "$as_me:4620: 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:4606: checking if we should install .pc files" >&5
++	echo "$as_me:4623: checking if we should install .pc files" >&5
+ echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
+ fi
+ 
+@@ -4614,7 +4631,7 @@
+ else
+   enable_pc_files=no
+ fi;
+-echo "$as_me:4617: result: $enable_pc_files" >&5
++echo "$as_me:4634: result: $enable_pc_files" >&5
+ echo "${ECHO_T}$enable_pc_files" >&6
+ 
+ if test "x$enable_pc_files" != xno
+@@ -4622,7 +4639,7 @@
+ 	MAKE_PC_FILES=
+ 	case "x$PKG_CONFIG_LIBDIR" in
+ 	(xno|xnone|xyes|x)
+-		{ echo "$as_me:4625: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
++		{ echo "$as_me:4642: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+ echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
+ 		;;
+ 	(*)
+@@ -4634,26 +4651,24 @@
+ 	cf_path_syntax="$ac_default_prefix"
+ fi
+ 
+-case ".$cf_pkg_config_libdir" in
+-(.\$\(*\)*|.\'*\'*)
+-	;;
+-(..|./*|.\\*)
++case "x$cf_pkg_config_libdir" in
++(x\$\(*\)*|x\'*\'*)
+ 	;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ 	eval cf_pkg_config_libdir="$cf_pkg_config_libdir"
+-	case ".$cf_pkg_config_libdir" in
+-	(.NONE/*)
++	case "x$cf_pkg_config_libdir" in
++	(xNONE/*)
+ 		cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
+ 		;;
+ 	esac
+ 	;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ 	cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4656: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
++	{ { echo "$as_me:4671: 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; }; }
+ 	;;
+@@ -4667,7 +4682,7 @@
+ 
+ if test -z "$MAKE_PC_FILES"
+ then
+-	echo "$as_me:4670: checking for suffix to add to pkg-config files" >&5
++	echo "$as_me:4685: checking for suffix to add to pkg-config files" >&5
+ echo $ECHO_N "checking for suffix to add to pkg-config files... $ECHO_C" >&6
+ 
+ # Check whether --with-pc-suffix or --without-pc-suffix was given.
+@@ -4682,13 +4697,13 @@
+ 	esac
+ fi;
+ 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
+-	echo "$as_me:4685: result: $PC_MODULE_SUFFIX" >&5
++	echo "$as_me:4700: result: $PC_MODULE_SUFFIX" >&5
+ echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
+ 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
+ 
+ fi
+ 
+-echo "$as_me:4691: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:4706: 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.
+@@ -4698,11 +4713,11 @@
+ else
+   enable_mixedcase=auto
+ fi;
+-echo "$as_me:4701: result: $enable_mixedcase" >&5
++echo "$as_me:4716: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+ 
+-echo "$as_me:4705: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:4720: 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
+@@ -4729,7 +4744,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:4732: result: $cf_cv_mixedcase" >&5
++echo "$as_me:4747: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -4748,7 +4763,7 @@
+ fi
+ 
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:4751: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:4766: 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
+@@ -4768,16 +4783,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:4771: result: yes" >&5
++  echo "$as_me:4786: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:4775: result: no" >&5
++  echo "$as_me:4790: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+-echo "$as_me:4780: checking for \".PHONY\" make-support" >&5
++echo "$as_me:4795: 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
+@@ -4832,7 +4847,7 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:4835: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:4850: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+@@ -4843,7 +4858,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:4846: checking for $ac_word" >&5
++echo "$as_me:4861: 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
+@@ -4858,7 +4873,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:4861: found $ac_dir/$ac_word" >&5
++echo "$as_me:4876: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4866,10 +4881,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:4869: result: $CTAGS" >&5
++  echo "$as_me:4884: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:4872: result: no" >&5
++  echo "$as_me:4887: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4880,7 +4895,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:4883: checking for $ac_word" >&5
++echo "$as_me:4898: 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
+@@ -4895,7 +4910,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:4898: found $ac_dir/$ac_word" >&5
++echo "$as_me:4913: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4903,10 +4918,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:4906: result: $ETAGS" >&5
++  echo "$as_me:4921: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:4909: result: no" >&5
++  echo "$as_me:4924: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4915,7 +4930,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:4918: checking for $ac_word" >&5
++echo "$as_me:4933: 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
+@@ -4930,7 +4945,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:4933: found $ac_dir/$ac_word" >&5
++echo "$as_me:4948: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4939,17 +4954,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:4942: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:4957: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:4945: result: no" >&5
++  echo "$as_me:4960: 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:4952: checking for $ac_word" >&5
++echo "$as_me:4967: 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
+@@ -4964,7 +4979,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:4967: found $ac_dir/$ac_word" >&5
++echo "$as_me:4982: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4973,10 +4988,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:4976: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:4991: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:4979: result: no" >&5
++  echo "$as_me:4994: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4996,7 +5011,7 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:4999: checking for makeflags variable" >&5
++echo "$as_me:5014: 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
+@@ -5026,7 +5041,7 @@
+ 			;;
+ 		(*)
+ 
+-echo "${as_me:-configure}:5029: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:5044: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -5034,13 +5049,13 @@
+ 	rm -f cf_makeflags.tmp
+ 
+ fi
+-echo "$as_me:5037: result: $cf_cv_makeflags" >&5
++echo "$as_me:5052: 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:5043: checking for $ac_word" >&5
++echo "$as_me:5058: 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
+@@ -5055,7 +5070,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:5058: found $ac_dir/$ac_word" >&5
++echo "$as_me:5073: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5063,10 +5078,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:5066: result: $RANLIB" >&5
++  echo "$as_me:5081: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:5069: result: no" >&5
++  echo "$as_me:5084: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5075,7 +5090,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:5078: checking for $ac_word" >&5
++echo "$as_me:5093: 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
+@@ -5090,7 +5105,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:5093: found $ac_dir/$ac_word" >&5
++echo "$as_me:5108: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5099,10 +5114,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:5102: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:5117: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:5105: result: no" >&5
++  echo "$as_me:5120: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5114,7 +5129,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:5117: checking for $ac_word" >&5
++echo "$as_me:5132: 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
+@@ -5129,7 +5144,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:5132: found $ac_dir/$ac_word" >&5
++echo "$as_me:5147: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5137,10 +5152,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:5140: result: $LD" >&5
++  echo "$as_me:5155: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:5143: result: no" >&5
++  echo "$as_me:5158: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5149,7 +5164,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:5152: checking for $ac_word" >&5
++echo "$as_me:5167: 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
+@@ -5164,7 +5179,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:5167: found $ac_dir/$ac_word" >&5
++echo "$as_me:5182: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5173,10 +5188,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:5176: result: $ac_ct_LD" >&5
++  echo "$as_me:5191: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:5179: result: no" >&5
++  echo "$as_me:5194: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5188,7 +5203,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:5191: checking for $ac_word" >&5
++echo "$as_me:5206: 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
+@@ -5203,7 +5218,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:5206: found $ac_dir/$ac_word" >&5
++echo "$as_me:5221: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5211,10 +5226,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:5214: result: $AR" >&5
++  echo "$as_me:5229: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:5217: result: no" >&5
++  echo "$as_me:5232: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5223,7 +5238,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:5226: checking for $ac_word" >&5
++echo "$as_me:5241: 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
+@@ -5238,7 +5253,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:5241: found $ac_dir/$ac_word" >&5
++echo "$as_me:5256: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5247,10 +5262,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:5250: result: $ac_ct_AR" >&5
++  echo "$as_me:5265: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:5253: result: no" >&5
++  echo "$as_me:5268: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5262,7 +5277,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:5265: checking for $ac_word" >&5
++echo "$as_me:5280: 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
+@@ -5277,7 +5292,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:5280: found $ac_dir/$ac_word" >&5
++echo "$as_me:5295: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5285,10 +5300,10 @@
+ fi
+ NM=$ac_cv_prog_NM
+ if test -n "$NM"; then
+-  echo "$as_me:5288: result: $NM" >&5
++  echo "$as_me:5303: result: $NM" >&5
+ echo "${ECHO_T}$NM" >&6
+ else
+-  echo "$as_me:5291: result: no" >&5
++  echo "$as_me:5306: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5297,7 +5312,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:5300: checking for $ac_word" >&5
++echo "$as_me:5315: 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
+@@ -5312,7 +5327,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:5315: found $ac_dir/$ac_word" >&5
++echo "$as_me:5330: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5321,10 +5336,10 @@
+ fi
+ ac_ct_NM=$ac_cv_prog_ac_ct_NM
+ if test -n "$ac_ct_NM"; then
+-  echo "$as_me:5324: result: $ac_ct_NM" >&5
++  echo "$as_me:5339: result: $ac_ct_NM" >&5
+ echo "${ECHO_T}$ac_ct_NM" >&6
+ else
+-  echo "$as_me:5327: result: no" >&5
++  echo "$as_me:5342: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5336,7 +5351,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:5339: checking for $ac_word" >&5
++echo "$as_me:5354: 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
+@@ -5351,7 +5366,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:5354: found $ac_dir/$ac_word" >&5
++echo "$as_me:5369: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5359,10 +5374,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:5362: result: $AR" >&5
++  echo "$as_me:5377: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:5365: result: no" >&5
++  echo "$as_me:5380: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5371,7 +5386,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:5374: checking for $ac_word" >&5
++echo "$as_me:5389: 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
+@@ -5386,7 +5401,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:5389: found $ac_dir/$ac_word" >&5
++echo "$as_me:5404: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5395,10 +5410,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:5398: result: $ac_ct_AR" >&5
++  echo "$as_me:5413: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:5401: result: no" >&5
++  echo "$as_me:5416: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5407,7 +5422,7 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-echo "$as_me:5410: checking for options to update archives" >&5
++echo "$as_me:5425: 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
+@@ -5444,13 +5459,13 @@
+ 			rm -f conftest.a
+ 
+ 			cat >"conftest.$ac_ext" <&5
++			if { (eval echo "$as_me:5465: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5453: \$? = $ac_status" >&5
++  echo "$as_me:5468: \$? = $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
+@@ -5461,7 +5476,7 @@
+ 			else
+ 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-echo "${as_me:-configure}:5464: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:5479: testing cannot compile test-program ..." 1>&5
+ 
+ 				break
+ 			fi
+@@ -5471,7 +5486,7 @@
+ 	esac
+ 
+ fi
+-echo "$as_me:5474: result: $cf_cv_ar_flags" >&5
++echo "$as_me:5489: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+ if test -n "$ARFLAGS" ; then
+@@ -5482,7 +5497,7 @@
+ 	ARFLAGS=$cf_cv_ar_flags
+ fi
+ 
+-echo "$as_me:5485: checking for an installation directory prefix" >&5
++echo "$as_me:5500: checking for an installation directory prefix" >&5
+ echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-install-prefix or --without-install-prefix was given.
+@@ -5495,7 +5510,7 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:5498: result: ${DESTDIR:-(none)}" >&5
++echo "$as_me:5513: result: ${DESTDIR:-(none)}" >&5
+ echo "${ECHO_T}${DESTDIR:-(none)}" >&6
+ 
+ ###############################################################################
+@@ -5530,7 +5545,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:5533: checking for $ac_word" >&5
++echo "$as_me:5548: 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
+@@ -5545,7 +5560,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:5548: found $ac_dir/$ac_word" >&5
++echo "$as_me:5563: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5553,10 +5568,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:5556: result: $BUILD_CC" >&5
++  echo "$as_me:5571: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:5559: result: no" >&5
++  echo "$as_me:5574: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5565,12 +5580,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+ 
+ fi;
+-	echo "$as_me:5568: checking for native build C compiler" >&5
++	echo "$as_me:5583: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:5570: result: $BUILD_CC" >&5
++	echo "$as_me:5585: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:5573: checking for native build C preprocessor" >&5
++	echo "$as_me:5588: 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.
+@@ -5580,10 +5595,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:5583: result: $BUILD_CPP" >&5
++	echo "$as_me:5598: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:5586: checking for native build C flags" >&5
++	echo "$as_me:5601: 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.
+@@ -5591,10 +5606,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:5594: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:5609: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:5597: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:5612: 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.
+@@ -5602,10 +5617,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:5605: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:5620: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:5608: checking for native build linker-flags" >&5
++	echo "$as_me:5623: 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.
+@@ -5613,10 +5628,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:5616: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:5631: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:5619: checking for native build linker-libraries" >&5
++	echo "$as_me:5634: 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.
+@@ -5624,7 +5639,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:5627: result: $BUILD_LIBS" >&5
++	echo "$as_me:5642: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -5633,7 +5648,7 @@
+ 
+ 	: ${BUILD_CC:='${CC}'}
+ 
+-	echo "$as_me:5636: checking if the build-compiler \"$BUILD_CC\" works" >&5
++	echo "$as_me:5651: checking if the build-compiler \"$BUILD_CC\" works" >&5
+ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
+ 
+ 	cf_save_crossed=$cross_compiling
+@@ -5647,7 +5662,7 @@
+   cf_ok_build_cc=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5650 "configure"
++#line 5665 "configure"
+ #include "confdefs.h"
+ #include 
+ 		int main(int argc, char *argv[])
+@@ -5657,15 +5672,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:5660: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5675: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5663: \$? = $ac_status" >&5
++  echo "$as_me:5678: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:5665: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5680: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5668: \$? = $ac_status" >&5
++  echo "$as_me:5683: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_ok_build_cc=yes
+ else
+@@ -5680,12 +5695,12 @@
+ 	cross_compiling=$cf_save_crossed
+ 	ac_link=$cf_save_ac_link
+ 
+-	echo "$as_me:5683: result: $cf_ok_build_cc" >&5
++	echo "$as_me:5698: result: $cf_ok_build_cc" >&5
+ echo "${ECHO_T}$cf_ok_build_cc" >&6
+ 
+ 	if test "$cf_ok_build_cc" != yes
+ 	then
+-		{ { echo "$as_me:5688: error: Cross-build requires two compilers.
++		{ { echo "$as_me:5703: 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;}
+@@ -5710,7 +5725,7 @@
+ ### shared, for example.
+ cf_list_models=""
+ 
+-echo "$as_me:5713: checking if libtool -version-number should be used" >&5
++echo "$as_me:5728: 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.
+@@ -5727,7 +5742,7 @@
+ 	cf_libtool_version=yes
+ 
+ fi;
+-echo "$as_me:5730: result: $cf_libtool_version" >&5
++echo "$as_me:5745: result: $cf_libtool_version" >&5
+ echo "${ECHO_T}$cf_libtool_version" >&6
+ 
+ if test "$cf_libtool_version" = yes ; then
+@@ -5736,25 +5751,25 @@
+ 	LIBTOOL_VERSION="-version-info"
+ 	case "x$VERSION" in
+ 	(x)
+-		{ echo "$as_me:5739: WARNING: VERSION was not set" >&5
++		{ echo "$as_me:5754: 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}:5746: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5761: 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}:5753: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5768: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:5757: WARNING: unexpected VERSION value: $VERSION" >&5
++		{ echo "$as_me:5772: WARNING: unexpected VERSION value: $VERSION" >&5
+ echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
+ 		;;
+ 	esac
+@@ -5776,7 +5791,7 @@
+ LIB_INSTALL=
+ LIB_UNINSTALL=
+ 
+-echo "$as_me:5779: checking if you want to build libraries with libtool" >&5
++echo "$as_me:5794: 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.
+@@ -5786,7 +5801,7 @@
+ else
+   with_libtool=no
+ fi;
+-echo "$as_me:5789: result: $with_libtool" >&5
++echo "$as_me:5804: result: $with_libtool" >&5
+ echo "${ECHO_T}$with_libtool" >&6
+ if test "$with_libtool" != "no"; then
+ 
+@@ -5798,26 +5813,24 @@
+ 	cf_path_syntax="$ac_default_prefix"
+ fi
+ 
+-case ".$with_libtool" in
+-(.\$\(*\)*|.\'*\'*)
++case "x$with_libtool" in
++(x\$\(*\)*|x\'*\'*)
+ 	;;
+-(..|./*|.\\*)
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+-	;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ 	eval with_libtool="$with_libtool"
+-	case ".$with_libtool" in
+-	(.NONE/*)
++	case "x$with_libtool" in
++	(xNONE/*)
+ 		with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
+ 		;;
+ 	esac
+ 	;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:5820: error: expected a pathname, not \"$with_libtool\"" >&5
++	{ { echo "$as_me:5833: error: expected a pathname, not \"$with_libtool\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -5830,7 +5843,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:5833: checking for $ac_word" >&5
++echo "$as_me:5846: 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
+@@ -5845,7 +5858,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:5848: found $ac_dir/$ac_word" >&5
++echo "$as_me:5861: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5853,10 +5866,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5856: result: $LIBTOOL" >&5
++  echo "$as_me:5869: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5859: result: no" >&5
++  echo "$as_me:5872: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5869,7 +5882,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:5872: checking for $ac_word" >&5
++echo "$as_me:5885: 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
+@@ -5884,7 +5897,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:5887: found $ac_dir/$ac_word" >&5
++echo "$as_me:5900: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5892,10 +5905,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:5895: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:5908: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:5898: result: no" >&5
++  echo "$as_me:5911: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5926,7 +5939,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:5929: checking for $ac_word" >&5
++echo "$as_me:5942: 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
+@@ -5941,7 +5954,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:5944: found $ac_dir/$ac_word" >&5
++echo "$as_me:5957: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5949,10 +5962,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5952: result: $LIBTOOL" >&5
++  echo "$as_me:5965: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5955: result: no" >&5
++  echo "$as_me:5968: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5965,7 +5978,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:5968: checking for $ac_word" >&5
++echo "$as_me:5981: 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
+@@ -5980,7 +5993,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:5983: found $ac_dir/$ac_word" >&5
++echo "$as_me:5996: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5988,10 +6001,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:5991: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:6004: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:5994: result: no" >&5
++  echo "$as_me:6007: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6013,7 +6026,7 @@
+ 		fi
+ 	fi
+ 	if test -z "$LIBTOOL" ; then
+-		{ { echo "$as_me:6016: error: Cannot find libtool" >&5
++		{ { echo "$as_me:6029: error: Cannot find libtool" >&5
+ echo "$as_me: error: Cannot find libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -6029,7 +6042,7 @@
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+ then
+-	echo "$as_me:6032: checking version of $LIBTOOL" >&5
++	echo "$as_me:6045: checking version of $LIBTOOL" >&5
+ echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+@@ -6040,7 +6053,7 @@
+ fi
+ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+ 
+-	echo "$as_me:6043: result: $cf_cv_libtool_version" >&5
++	echo "$as_me:6056: result: $cf_cv_libtool_version" >&5
+ echo "${ECHO_T}$cf_cv_libtool_version" >&6
+ 
+ 	if test -n "$cf_cv_libtool_version"
+@@ -6050,19 +6063,19 @@
+ 		(*...GNU-libtool...*)
+ 			;;
+ 		(*)
+-			{ { echo "$as_me:6053: error: This is not GNU libtool" >&5
++			{ { echo "$as_me:6066: 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:6059: error: No version found for $LIBTOOL" >&5
++		{ { echo "$as_me:6072: 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:6065: error: GNU libtool has not been found" >&5
++	{ { echo "$as_me:6078: error: GNU libtool has not been found" >&5
+ echo "$as_me: error: GNU libtool has not been found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6098,7 +6111,7 @@
+ 
+ else
+ 
+-echo "$as_me:6101: checking if you want to build shared libraries" >&5
++echo "$as_me:6114: 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.
+@@ -6108,11 +6121,11 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:6111: result: $with_shared" >&5
++echo "$as_me:6124: 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:6115: checking if you want to build static libraries" >&5
++echo "$as_me:6128: 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.
+@@ -6122,11 +6135,11 @@
+ else
+   with_normal=yes
+ fi;
+-echo "$as_me:6125: result: $with_normal" >&5
++echo "$as_me:6138: 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:6129: checking if you want to build debug libraries" >&5
++echo "$as_me:6142: 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.
+@@ -6136,11 +6149,11 @@
+ else
+   with_debug=yes
+ fi;
+-echo "$as_me:6139: result: $with_debug" >&5
++echo "$as_me:6152: 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:6143: checking if you want to build profiling libraries" >&5
++echo "$as_me:6156: 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.
+@@ -6150,7 +6163,7 @@
+ else
+   with_profile=no
+ fi;
+-echo "$as_me:6153: result: $with_profile" >&5
++echo "$as_me:6166: result: $with_profile" >&5
+ echo "${ECHO_T}$with_profile" >&6
+ test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
+ 
+@@ -6158,7 +6171,7 @@
+ 
+ if test "X$cf_with_cxx_binding" != Xno; then
+ if test "x$with_shared" = "xyes"; then
+-echo "$as_me:6161: checking if you want to build C++ shared libraries" >&5
++echo "$as_me:6174: 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.
+@@ -6168,26 +6181,26 @@
+ else
+   with_shared_cxx=no
+ fi;
+-echo "$as_me:6171: result: $with_shared_cxx" >&5
++echo "$as_me:6184: result: $with_shared_cxx" >&5
+ echo "${ECHO_T}$with_shared_cxx" >&6
+ fi
+ fi
+ 
+ ###############################################################################
+ 
+-echo "$as_me:6178: checking for specified models" >&5
++echo "$as_me:6191: 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:6182: result: $cf_list_models" >&5
++echo "$as_me:6195: 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:6187: checking for default model" >&5
++echo "$as_me:6200: 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:6190: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:6203: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+ 
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+@@ -6201,7 +6214,7 @@
+ LIB_DIR=../lib
+ LIB_2ND=../../lib
+ 
+-echo "$as_me:6204: checking if you want to have a library-prefix" >&5
++echo "$as_me:6217: 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.
+@@ -6211,7 +6224,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:6214: result: $with_lib_prefix" >&5
++echo "$as_me:6227: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test "$with_lib_prefix" = auto
+@@ -6242,24 +6255,24 @@
+ 
+ LIB_SUFFIX=
+ 
+-	echo "$as_me:6245: checking for PATH separator" >&5
++	echo "$as_me:6258: 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:6252: result: $PATH_SEPARATOR" >&5
++	echo "$as_me:6265: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+ 
+ # headers needed for checks...
+-echo "$as_me:6256: checking for ANSI C header files" >&5
++echo "$as_me:6269: 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 6262 "configure"
++#line 6275 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -6267,13 +6280,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:6270: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:6283: \"$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:6276: \$? = $ac_status" >&5
++  echo "$as_me:6289: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6295,7 +6308,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 6298 "configure"
++#line 6311 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6313,7 +6326,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 6316 "configure"
++#line 6329 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6334,7 +6347,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6337 "configure"
++#line 6350 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -6360,15 +6373,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6363: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6376: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6366: \$? = $ac_status" >&5
++  echo "$as_me:6379: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:6368: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6381: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6371: \$? = $ac_status" >&5
++  echo "$as_me:6384: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6381,7 +6394,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:6384: result: $ac_cv_header_stdc" >&5
++echo "$as_me:6397: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -6397,28 +6410,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6400: checking for $ac_header" >&5
++echo "$as_me:6413: 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 6406 "configure"
++#line 6419 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6412: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6425: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6415: \$? = $ac_status" >&5
++  echo "$as_me:6428: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6418: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6431: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6421: \$? = $ac_status" >&5
++  echo "$as_me:6434: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -6428,7 +6441,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6431: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6444: 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:6454: checking whether exit is declared" >&5
+ echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
+ if test "${ac_cv_have_decl_exit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6447 "configure"
++#line 6460 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -6459,16 +6472,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6462: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6475: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6465: \$? = $ac_status" >&5
++  echo "$as_me:6478: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6468: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6481: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6471: \$? = $ac_status" >&5
++  echo "$as_me:6484: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_have_decl_exit=yes
+ else
+@@ -6478,19 +6491,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6481: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:6494: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+ 
+ 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:6487: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:6500: 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 6493 "configure"
++#line 6506 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -6505,16 +6518,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6508: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6521: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6511: \$? = $ac_status" >&5
++  echo "$as_me:6524: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6514: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6527: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6517: \$? = $ac_status" >&5
++  echo "$as_me:6530: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -6524,7 +6537,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6527: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6540: 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:6553: 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
+@@ -6545,7 +6558,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6548 "configure"
++#line 6561 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6564,16 +6577,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6567: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6580: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6570: \$? = $ac_status" >&5
++  echo "$as_me:6583: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6573: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6586: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6576: \$? = $ac_status" >&5
++  echo "$as_me:6589: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -6584,14 +6597,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6587: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:6600: 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:6594: checking for opendir in -lx" >&5
++  echo "$as_me:6607: 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
+@@ -6599,7 +6612,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6602 "configure"
++#line 6615 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6618,16 +6631,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6621: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6634: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6624: \$? = $ac_status" >&5
++  echo "$as_me:6637: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6627: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6640: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6630: \$? = $ac_status" >&5
++  echo "$as_me:6643: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -6638,7 +6651,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6641: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:6654: 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"
+@@ -6648,7 +6661,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:6651: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:6664: 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.
+@@ -6658,10 +6671,10 @@
+ else
+   with_termlib=no
+ fi;
+-echo "$as_me:6661: result: $with_termlib" >&5
++echo "$as_me:6674: result: $with_termlib" >&5
+ echo "${ECHO_T}$with_termlib" >&6
+ 
+-echo "$as_me:6664: checking if you want to build a separate tic library" >&5
++echo "$as_me:6677: 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.
+@@ -6671,7 +6684,7 @@
+ else
+   with_ticlib=no
+ fi;
+-echo "$as_me:6674: result: $with_ticlib" >&5
++echo "$as_me:6687: result: $with_ticlib" >&5
+ echo "${ECHO_T}$with_ticlib" >&6
+ 
+ if test X"$CC_G_OPT" = X"" ; then
+@@ -6684,7 +6697,7 @@
+ 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
+ fi
+ 
+-echo "$as_me:6687: checking for default loader flags" >&5
++echo "$as_me:6700: 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=''   ;;
+@@ -6693,13 +6706,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:6696: result: ${LD_MODEL:-(none)}" >&5
++echo "$as_me:6709: result: ${LD_MODEL:-(none)}" >&5
+ echo "${ECHO_T}${LD_MODEL:-(none)}" >&6
+ 
+ case "$DFT_LWR_MODEL" in
+ (shared)
+ 
+-echo "$as_me:6702: checking if rpath option should be used" >&5
++echo "$as_me:6715: 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.
+@@ -6709,10 +6722,10 @@
+ else
+   cf_cv_enable_rpath=no
+ fi;
+-echo "$as_me:6712: result: $cf_cv_enable_rpath" >&5
++echo "$as_me:6725: result: $cf_cv_enable_rpath" >&5
+ echo "${ECHO_T}$cf_cv_enable_rpath" >&6
+ 
+-echo "$as_me:6715: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:6728: 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.
+@@ -6722,7 +6735,7 @@
+ else
+   cf_cv_do_relink=yes
+ fi;
+-echo "$as_me:6725: result: $cf_cv_do_relink" >&5
++echo "$as_me:6738: result: $cf_cv_do_relink" >&5
+ echo "${ECHO_T}$cf_cv_do_relink" >&6
+ 	;;
+ esac
+@@ -6733,7 +6746,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:6736: checking for an rpath option" >&5
++	echo "$as_me:6749: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -6764,12 +6777,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:6767: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:6780: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:6772: checking if we need a space after rpath option" >&5
++		echo "$as_me:6785: 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"
+ 
+@@ -6790,7 +6803,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6793 "configure"
++#line 6806 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -6802,16 +6815,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6805: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6818: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6808: \$? = $ac_status" >&5
++  echo "$as_me:6821: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6811: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6824: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6814: \$? = $ac_status" >&5
++  echo "$as_me:6827: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -6821,7 +6834,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:6824: result: $cf_rpath_space" >&5
++		echo "$as_me:6837: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -6843,7 +6856,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:6846: checking whether to use release or ABI version in shared library file names" >&5
++	echo "$as_me:6859: checking whether to use release or ABI version in shared library file names" >&5
+ echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
+ 
+ # Check whether --with-shlib-version or --without-shlib-version was given.
+@@ -6858,9 +6871,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:6861: result: $withval" >&5
++		echo "$as_me:6874: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:6863: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:6876: 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; }; }
+ 		;;
+@@ -6869,7 +6882,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:6872: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:6885: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -6892,14 +6905,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:6895: checking which $CC option to use" >&5
++		echo "$as_me:6908: 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 6902 "configure"
++#line 6915 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6911,16 +6924,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6914: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6927: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6917: \$? = $ac_status" >&5
++  echo "$as_me:6930: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6920: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6933: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6923: \$? = $ac_status" >&5
++  echo "$as_me:6936: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -6929,7 +6942,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		done
+-		echo "$as_me:6932: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:6945: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -7000,7 +7013,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:7003: checking if ld -search_paths_first works" >&5
++		echo "$as_me:7016: 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
+@@ -7009,7 +7022,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7012 "configure"
++#line 7025 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -7021,16 +7034,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7024: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7037: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7027: \$? = $ac_status" >&5
++  echo "$as_me:7040: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7030: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7043: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7033: \$? = $ac_status" >&5
++  echo "$as_me:7046: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -7041,7 +7054,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:7044: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:7057: 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"
+@@ -7391,7 +7404,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7394 "configure"
++#line 7407 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7403,16 +7416,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7406: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7419: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7409: \$? = $ac_status" >&5
++  echo "$as_me:7422: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7412: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7425: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7415: \$? = $ac_status" >&5
++  echo "$as_me:7428: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -7449,7 +7462,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:7452: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:7465: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -7459,7 +7472,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <
+ int main(int argc, char *argv[])
+ {
+@@ -7471,18 +7484,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:7474: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:7487: 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:7476: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:7489: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7479: \$? = $ac_status" >&5
++  echo "$as_me:7492: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-				echo "$as_me:7481: result: yes" >&5
++				echo "$as_me:7494: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:7485: result: no" >&5
++				echo "$as_me:7498: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -7497,17 +7510,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:7500: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:7513: 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}:7504: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7517: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ for model in $cf_list_models ; do
+ 	case "$model" in
+ 	(libtool)
+ 
+-echo "$as_me:7510: checking for additional libtool options" >&5
++echo "$as_me:7523: 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.
+@@ -7517,7 +7530,7 @@
+ else
+   with_libtool_opts=no
+ fi;
+-echo "$as_me:7520: result: $with_libtool_opts" >&5
++echo "$as_me:7533: result: $with_libtool_opts" >&5
+ echo "${ECHO_T}$with_libtool_opts" >&6
+ 
+ case .$with_libtool_opts in
+@@ -7528,7 +7541,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:7531: checking if exported-symbols file should be used" >&5
++echo "$as_me:7544: 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.
+@@ -7543,7 +7556,7 @@
+ 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
+ 
+ fi
+-echo "$as_me:7546: result: $with_export_syms" >&5
++echo "$as_me:7559: result: $with_export_syms" >&5
+ echo "${ECHO_T}$with_export_syms" >&6
+ if test "x$with_export_syms" != xno
+ then
+@@ -7554,15 +7567,15 @@
+ 		;;
+ 	(shared)
+ 		if test "$CC_SHARED_OPTS" = "unknown"; then
+-			{ { echo "$as_me:7557: error: Shared libraries are not supported in this version" >&5
++			{ { echo "$as_me:7570: 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:7562: checking if current CFLAGS link properly" >&5
++		echo "$as_me:7575: 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 7565 "configure"
++#line 7578 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7574,16 +7587,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7577: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7590: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7580: \$? = $ac_status" >&5
++  echo "$as_me:7593: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7583: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7596: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7586: \$? = $ac_status" >&5
++  echo "$as_me:7599: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cflags_work=yes
+ else
+@@ -7592,18 +7605,18 @@
+ cf_cflags_work=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:7595: result: $cf_cflags_work" >&5
++		echo "$as_me:7608: 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}:7601: testing try to work around by appending shared-options ..." 1>&5
++echo "${as_me:-configure}:7614: testing try to work around by appending shared-options ..." 1>&5
+ 
+ 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
+ 		fi
+ 
+-echo "$as_me:7606: checking if versioned-symbols file should be used" >&5
++echo "$as_me:7619: 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.
+@@ -7620,19 +7633,19 @@
+ 	;;
+ (xno)
+ 	;;
+-(x/*)
+-	test -f "$with_versioned_syms" || { { echo "$as_me:7624: error: expected a filename: $with_versioned_syms" >&5
++(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
++	test -f "$with_versioned_syms" || { { echo "$as_me:7637: 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:7629: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:7642: 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:7635: result: $with_versioned_syms" >&5
++echo "$as_me:7648: result: $with_versioned_syms" >&5
+ echo "${ECHO_T}$with_versioned_syms" >&6
+ 
+ RESULTING_SYMS=
+@@ -7648,7 +7661,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}:7651: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7664: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*-dy\ *)
+@@ -7656,11 +7669,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}:7659: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7672: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:7663: WARNING: this system does not support versioned-symbols" >&5
++		{ echo "$as_me:7676: WARNING: this system does not support versioned-symbols" >&5
+ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
+ 		;;
+ 	esac
+@@ -7672,7 +7685,7 @@
+ 	# symbols.
+ 	if test "x$VERSIONED_SYMS" != "x"
+ 	then
+-		echo "$as_me:7675: checking if wildcards can be used to selectively omit symbols" >&5
++		echo "$as_me:7688: 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
+ 
+@@ -7709,7 +7722,7 @@
+ } submodule_1.0;
+ EOF
+ 		cat >conftest.$ac_ext <&5
++		echo "$as_me:7756: result: $WILDCARD_SYMS" >&5
+ echo "${ECHO_T}$WILDCARD_SYMS" >&6
+ 		rm -f conftest.*
+ 	fi
+@@ -7753,7 +7766,7 @@
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+ 
+-echo "$as_me:7756: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:7769: 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.
+@@ -7763,27 +7776,27 @@
+ else
+   with_gpm=maybe
+ fi;
+-echo "$as_me:7766: result: $with_gpm" >&5
++echo "$as_me:7779: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7770: checking for gpm.h" >&5
++	echo "$as_me:7783: 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 7776 "configure"
++#line 7789 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:7780: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7793: \"$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:7786: \$? = $ac_status" >&5
++  echo "$as_me:7799: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7802,7 +7815,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7805: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:7818: 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
+ 
+@@ -7813,7 +7826,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}:7816: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:7829: testing assuming we really have GPM library ..." 1>&5
+ 
+ cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+@@ -7821,7 +7834,7 @@
+ 
+ 			with_gpm=yes
+ 		else
+-			echo "$as_me:7824: checking for Gpm_Open in -lgpm" >&5
++			echo "$as_me:7837: 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
+@@ -7829,7 +7842,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7832 "configure"
++#line 7845 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7848,16 +7861,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7851: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7864: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7854: \$? = $ac_status" >&5
++  echo "$as_me:7867: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7857: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7870: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7860: \$? = $ac_status" >&5
++  echo "$as_me:7873: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -7868,18 +7881,18 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7871: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:7884: 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:7878: WARNING: Cannot link with GPM library" >&5
++					{ echo "$as_me:7891: WARNING: Cannot link with GPM library" >&5
+ echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
+ 					with_gpm=no
+ 				else
+-					{ { echo "$as_me:7882: error: Cannot link with GPM library" >&5
++					{ { echo "$as_me:7895: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+    { (exit 1); exit 1; }; }
+ 				fi
+@@ -7890,7 +7903,7 @@
+ 
+ else
+ 
+-		test "$with_gpm" != maybe && { echo "$as_me:7893: WARNING: Cannot find GPM header" >&5
++		test "$with_gpm" != maybe && { echo "$as_me:7906: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ 		with_gpm=no
+ 
+@@ -7899,7 +7912,7 @@
+ fi
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7902: checking if you want to load GPM dynamically" >&5
++	echo "$as_me:7915: 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.
+@@ -7909,18 +7922,18 @@
+ else
+   with_dlsym=yes
+ fi;
+-	echo "$as_me:7912: result: $with_dlsym" >&5
++	echo "$as_me:7925: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ 	if test "x$with_dlsym" = xyes ; then
+ 
+ cf_have_dlsym=no
+-echo "$as_me:7917: checking for dlsym" >&5
++echo "$as_me:7930: 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 7923 "configure"
++#line 7936 "configure"
+ #include "confdefs.h"
+ #define dlsym autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7951,16 +7964,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7954: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7967: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7957: \$? = $ac_status" >&5
++  echo "$as_me:7970: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7960: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7973: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7963: \$? = $ac_status" >&5
++  echo "$as_me:7976: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_dlsym=yes
+ else
+@@ -7970,14 +7983,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7973: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:7986: 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:7980: checking for dlsym in -ldl" >&5
++echo "$as_me:7993: 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
+@@ -7985,7 +7998,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7988 "configure"
++#line 8001 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8004,16 +8017,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8007: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8020: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8010: \$? = $ac_status" >&5
++  echo "$as_me:8023: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8013: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8026: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8016: \$? = $ac_status" >&5
++  echo "$as_me:8029: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dl_dlsym=yes
+ else
+@@ -8024,7 +8037,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8027: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:8040: 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
+ 
+@@ -8053,10 +8066,10 @@
+ LIBS="$cf_add_libs"
+  }
+ 
+-	echo "$as_me:8056: checking whether able to link to dl*() functions" >&5
++	echo "$as_me:8069: 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 8059 "configure"
++#line 8072 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8074,16 +8087,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8077: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8090: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8080: \$? = $ac_status" >&5
++  echo "$as_me:8093: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8083: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8096: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8086: \$? = $ac_status" >&5
++  echo "$as_me:8099: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ cat >>confdefs.h <<\EOF
+@@ -8094,15 +8107,15 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-		{ { echo "$as_me:8097: error: Cannot link test program for libdl" >&5
++		{ { echo "$as_me:8110: 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:8102: result: ok" >&5
++	echo "$as_me:8115: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+-	{ { echo "$as_me:8105: error: Cannot find dlsym function" >&5
++	{ { echo "$as_me:8118: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8110,12 +8123,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}:8113: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:8126: testing assuming soname for gpm is $with_gpm ..." 1>&5
+ 
+ 			cf_cv_gpm_soname="$with_gpm"
+ 		else
+ 
+-echo "$as_me:8118: checking for soname of gpm library" >&5
++echo "$as_me:8131: 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
+@@ -8149,15 +8162,15 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-	if { (eval echo "$as_me:8152: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:8165: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8155: \$? = $ac_status" >&5
++  echo "$as_me:8168: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:8157: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:8170: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8160: \$? = $ac_status" >&5
++  echo "$as_me:8173: \$? = $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
+@@ -8168,7 +8181,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:8171: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:8184: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+ 
+ 		fi
+@@ -8236,7 +8249,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+ 
+-echo "$as_me:8239: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:8252: 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
+@@ -8244,7 +8257,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8247 "configure"
++#line 8260 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8263,16 +8276,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8266: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8279: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8269: \$? = $ac_status" >&5
++  echo "$as_me:8282: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8272: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8285: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8275: \$? = $ac_status" >&5
++  echo "$as_me:8288: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -8283,11 +8296,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8286: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:8299: 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:8290: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:8303: 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
+@@ -8311,15 +8324,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:8314: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:8327: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8317: \$? = $ac_status" >&5
++  echo "$as_me:8330: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:8319: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:8332: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8322: \$? = $ac_status" >&5
++  echo "$as_me:8335: \$? = $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
+@@ -8331,11 +8344,11 @@
+ fi
+ 
+ fi
+-echo "$as_me:8334: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:8347: 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:8338: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++	{ echo "$as_me:8351: 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
+ 
+@@ -8343,7 +8356,7 @@
+ 
+ fi
+ 
+-echo "$as_me:8346: checking if you want to use PCRE2 for regular-expressions" >&5
++echo "$as_me:8359: 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.
+@@ -8352,7 +8365,7 @@
+ 
+ fi;
+ test -z "$with_pcre2" && with_pcre2=no
+-echo "$as_me:8355: result: $with_pcre2" >&5
++echo "$as_me:8368: result: $with_pcre2" >&5
+ echo "${ECHO_T}$with_pcre2" >&6
+ 
+ if test "x$with_pcre2" != xno ; then
+@@ -8363,17 +8376,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}:8366: testing found package $cf_with_pcre2 ..." 1>&5
++echo "${as_me:-configure}:8379: 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}:8372: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:8385: 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}:8376: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:8389: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -8497,7 +8510,7 @@
+ fi
+ 
+ 	done
+-	cf_with_pcre2_ok=yes || { { echo "$as_me:8500: error: Cannot find PCRE2 library" >&5
++	cf_with_pcre2_ok=yes || { { echo "$as_me:8513: error: Cannot find PCRE2 library" >&5
+ echo "$as_me: error: Cannot find PCRE2 library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -8510,7 +8523,7 @@
+ 	(*pcre2-posix*|*pcreposix*)
+ 		;;
+ 	(*)
+-		echo "$as_me:8513: checking for regcomp in -lpcre2-posix" >&5
++		echo "$as_me:8526: 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
+@@ -8518,7 +8531,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcre2-posix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8521 "configure"
++#line 8534 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8537,16 +8550,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8540: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8553: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8543: \$? = $ac_status" >&5
++  echo "$as_me:8556: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8546: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8559: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8549: \$? = $ac_status" >&5
++  echo "$as_me:8562: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcre2_posix_regcomp=yes
+ else
+@@ -8557,7 +8570,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8560: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
++echo "$as_me:8573: 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
+ 
+@@ -8578,7 +8591,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  echo "$as_me:8581: checking for regcomp in -lpcreposix" >&5
++  echo "$as_me:8594: 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
+@@ -8586,7 +8599,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcreposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8589 "configure"
++#line 8602 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8605,16 +8618,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8608: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8621: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8611: \$? = $ac_status" >&5
++  echo "$as_me:8624: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8614: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8627: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8617: \$? = $ac_status" >&5
++  echo "$as_me:8630: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcreposix_regcomp=yes
+ else
+@@ -8625,7 +8638,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8628: result: $ac_cv_lib_pcreposix_regcomp" >&5
++echo "$as_me:8641: 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
+ 
+@@ -8646,7 +8659,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  { { echo "$as_me:8649: error: Cannot find PCRE2 POSIX library" >&5
++  { { echo "$as_me:8662: error: Cannot find PCRE2 POSIX library" >&5
+ echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8661,23 +8674,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:8664: checking for $ac_header" >&5
++echo "$as_me:8677: 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 8670 "configure"
++#line 8683 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8674: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8687: \"$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:8680: \$? = $ac_status" >&5
++  echo "$as_me:8693: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8696,7 +8709,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8699: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8712: 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:8725: 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 8718 "configure"
++#line 8731 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -8746,16 +8759,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8749: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8762: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8752: \$? = $ac_status" >&5
++  echo "$as_me:8765: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8755: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8768: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8758: \$? = $ac_status" >&5
++  echo "$as_me:8771: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -8765,7 +8778,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8768: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:8781: 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:8782: checking if you want to use sysmouse" >&5
++echo "$as_me:8795: 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.
+@@ -8791,7 +8804,7 @@
+ fi;
+ 	if test "$cf_with_sysmouse" != no ; then
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8794 "configure"
++#line 8807 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8814,16 +8827,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8817: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8830: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8820: \$? = $ac_status" >&5
++  echo "$as_me:8833: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8823: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8836: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8826: \$? = $ac_status" >&5
++  echo "$as_me:8839: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_with_sysmouse=yes
+ else
+@@ -8833,7 +8846,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	fi
+-echo "$as_me:8836: result: $cf_with_sysmouse" >&5
++echo "$as_me:8849: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -8843,7 +8856,7 @@
+ fi
+ 
+ # pretend that ncurses==ncursesw==ncursest
+-echo "$as_me:8846: checking if you want to disable library suffixes" >&5
++echo "$as_me:8859: 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.
+@@ -8860,13 +8873,13 @@
+ 	disable_lib_suffixes=no
+ 
+ fi;
+-echo "$as_me:8863: result: $disable_lib_suffixes" >&5
++echo "$as_me:8876: 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:8869: checking if rpath-hack should be disabled" >&5
++echo "$as_me:8882: 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.
+@@ -8884,22 +8897,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:8887: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:8900: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:8892: checking for updated LDFLAGS" >&5
++echo "$as_me:8905: 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:8895: result: maybe" >&5
++	echo "$as_me:8908: 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:8902: checking for $ac_word" >&5
++echo "$as_me:8915: 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
+@@ -8914,7 +8927,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:8917: found $ac_dir/$ac_word" >&5
++echo "$as_me:8930: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8922,10 +8935,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:8925: result: $cf_ldd_prog" >&5
++  echo "$as_me:8938: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:8928: result: no" >&5
++  echo "$as_me:8941: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8939,7 +8952,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8942 "configure"
++#line 8955 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8951,16 +8964,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8954: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8967: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8957: \$? = $ac_status" >&5
++  echo "$as_me:8970: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8960: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8973: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8963: \$? = $ac_status" >&5
++  echo "$as_me:8976: \$? = $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`
+@@ -8988,7 +9001,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:8991: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:9004: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -9000,11 +9013,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9003: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9016: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9007: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9020: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -9041,7 +9054,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:9044: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9057: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -9054,11 +9067,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9057: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9070: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:9061: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9074: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -9095,7 +9108,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:9098: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9111: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -9108,14 +9121,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:9111: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9124: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9115: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9128: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:9118: result: no" >&5
++	echo "$as_me:9131: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9129,7 +9142,7 @@
+ EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
+ if test -n "$EXTRA_PKG_LDFLAGS"
+ then
+-	echo "$as_me:9132: checking if you want to disable extra LDFLAGS for package-scripts" >&5
++	echo "$as_me:9145: 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.
+@@ -9146,7 +9159,7 @@
+ 	disable_pkg_ldflags=no
+ 
+ fi;
+-	echo "$as_me:9149: result: $disable_pkg_ldflags" >&5
++	echo "$as_me:9162: result: $disable_pkg_ldflags" >&5
+ echo "${ECHO_T}$disable_pkg_ldflags" >&6
+ 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
+ fi
+@@ -9154,7 +9167,7 @@
+ ###############################################################################
+ 
+ ###	use option --with-extra-suffix to append suffix to headers and libraries
+-echo "$as_me:9157: checking for extra suffix to append to header/library paths" >&5
++echo "$as_me:9170: checking for extra suffix to append to header/library paths" >&5
+ echo $ECHO_N "checking for extra suffix to append to header/library paths... $ECHO_C" >&6
+ EXTRA_SUFFIX=
+ 
+@@ -9173,11 +9186,11 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:9176: result: ${EXTRA_SUFFIX:-(none)}" >&5
++echo "$as_me:9189: result: ${EXTRA_SUFFIX:-(none)}" >&5
+ echo "${ECHO_T}${EXTRA_SUFFIX:-(none)}" >&6
+ 
+ ###	use option --disable-overwrite to leave out the link to -lcurses
+-echo "$as_me:9180: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:9193: 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.
+@@ -9187,10 +9200,10 @@
+ else
+   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:9190: result: $with_overwrite" >&5
++echo "$as_me:9203: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+ 
+-echo "$as_me:9193: checking if external terminfo-database is used" >&5
++echo "$as_me:9206: 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.
+@@ -9200,7 +9213,7 @@
+ else
+   use_database=yes
+ fi;
+-echo "$as_me:9203: result: $use_database" >&5
++echo "$as_me:9216: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+ 
+ case "$host_os" in
+@@ -9216,7 +9229,7 @@
+ if test "$use_database" != no ; then
+ 	NCURSES_USE_DATABASE=1
+ 
+-	echo "$as_me:9219: checking which terminfo source-file will be installed" >&5
++	echo "$as_me:9232: 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.
+@@ -9224,10 +9237,10 @@
+   withval="$with_database"
+   TERMINFO_SRC=$withval
+ fi;
+-	echo "$as_me:9227: result: $TERMINFO_SRC" >&5
++	echo "$as_me:9240: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+ 
+-	echo "$as_me:9230: checking whether to use hashed database instead of directory/tree" >&5
++	echo "$as_me:9243: 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.
+@@ -9237,13 +9250,13 @@
+ else
+   with_hashed_db=no
+ fi;
+-	echo "$as_me:9240: result: $with_hashed_db" >&5
++	echo "$as_me:9253: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ 	with_hashed_db=no
+ fi
+ 
+-echo "$as_me:9246: checking for list of fallback terminal descriptions" >&5
++echo "$as_me:9259: checking for list of fallback terminal descriptions" >&5
+ echo $ECHO_N "checking for list of fallback terminal descriptions... $ECHO_C" >&6
+ 
+ # Check whether --with-fallbacks or --without-fallbacks was given.
+@@ -9253,7 +9266,7 @@
+ else
+   with_fallback=
+ fi;
+-echo "$as_me:9256: result: ${with_fallback:-(none)}" >&5
++echo "$as_me:9269: result: ${with_fallback:-(none)}" >&5
+ echo "${ECHO_T}${with_fallback:-(none)}" >&6
+ 
+ case ".$with_fallback" in
+@@ -9261,7 +9274,7 @@
+ 	FALLBACK_LIST=
+ 	;;
+ (.yes)
+-	{ echo "$as_me:9264: WARNING: expected a list of terminal descriptions" >&5
++	{ echo "$as_me:9277: WARNING: expected a list of terminal descriptions" >&5
+ echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
+ 	;;
+ (*)
+@@ -9277,7 +9290,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:9280: checking for $ac_word" >&5
++echo "$as_me:9293: 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
+@@ -9292,7 +9305,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:9295: found $ac_dir/$ac_word" >&5
++echo "$as_me:9308: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9300,10 +9313,10 @@
+ fi
+ TIC=$ac_cv_prog_TIC
+ if test -n "$TIC"; then
+-  echo "$as_me:9303: result: $TIC" >&5
++  echo "$as_me:9316: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:9306: result: no" >&5
++  echo "$as_me:9319: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9312,7 +9325,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:9315: checking for $ac_word" >&5
++echo "$as_me:9328: 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
+@@ -9327,7 +9340,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:9330: found $ac_dir/$ac_word" >&5
++echo "$as_me:9343: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9335,10 +9348,10 @@
+ fi
+ ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
+ if test -n "$ac_ct_TIC"; then
+-  echo "$as_me:9338: result: $ac_ct_TIC" >&5
++  echo "$as_me:9351: result: $ac_ct_TIC" >&5
+ echo "${ECHO_T}$ac_ct_TIC" >&6
+ else
+-  echo "$as_me:9341: result: no" >&5
++  echo "$as_me:9354: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9350,7 +9363,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:9353: checking for $ac_word" >&5
++echo "$as_me:9366: 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
+@@ -9365,7 +9378,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:9368: found $ac_dir/$ac_word" >&5
++echo "$as_me:9381: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9373,10 +9386,10 @@
+ fi
+ INFOCMP=$ac_cv_prog_INFOCMP
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:9376: result: $INFOCMP" >&5
++  echo "$as_me:9389: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:9379: result: no" >&5
++  echo "$as_me:9392: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9385,7 +9398,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:9388: checking for $ac_word" >&5
++echo "$as_me:9401: 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
+@@ -9400,7 +9413,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:9403: found $ac_dir/$ac_word" >&5
++echo "$as_me:9416: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9408,10 +9421,10 @@
+ fi
+ ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
+ if test -n "$ac_ct_INFOCMP"; then
+-  echo "$as_me:9411: result: $ac_ct_INFOCMP" >&5
++  echo "$as_me:9424: result: $ac_ct_INFOCMP" >&5
+ echo "${ECHO_T}$ac_ct_INFOCMP" >&6
+ else
+-  echo "$as_me:9414: result: no" >&5
++  echo "$as_me:9427: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9426,10 +9439,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:9429: checking for tic program for fallbacks" >&5
++  echo "$as_me:9442: checking for tic program for fallbacks" >&5
+ echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
+ 		TIC=$withval
+-		echo "$as_me:9432: result: $TIC" >&5
++		echo "$as_me:9445: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -9438,26 +9451,24 @@
+ 	cf_path_syntax="$ac_default_prefix"
+ fi
+ 
+-case ".$TIC" in
+-(.\$\(*\)*|.\'*\'*)
+-	;;
+-(..|./*|.\\*)
++case "x$TIC" in
++(x\$\(*\)*|x\'*\'*)
+ 	;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ 	eval TIC="$TIC"
+-	case ".$TIC" in
+-	(.NONE/*)
++	case "x$TIC" in
++	(xNONE/*)
+ 		TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
+ 		;;
+ 	esac
+ 	;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9460: error: expected a pathname, not \"$TIC\"" >&5
++	{ { echo "$as_me:9471: error: expected a pathname, not \"$TIC\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9470,7 +9481,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:9473: checking for $ac_word" >&5
++echo "$as_me:9484: 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
+@@ -9487,7 +9498,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:9490: found $ac_dir/$ac_word" >&5
++   echo "$as_me:9501: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -9498,10 +9509,10 @@
+ TIC=$ac_cv_path_TIC
+ 
+ if test -n "$TIC"; then
+-  echo "$as_me:9501: result: $TIC" >&5
++  echo "$as_me:9512: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:9504: result: no" >&5
++  echo "$as_me:9515: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9523,22 +9534,20 @@
+ 	cf_path_syntax="$ac_default_prefix"
+ fi
+ 
+-case ".$cf_temp" in
+-(.\$\(*\)*|.\'*\'*)
+-	;;
+-(..|./*|.\\*)
++case "x$cf_temp" in
++(x\$\(*\)*|x\'*\'*)
+ 	;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ 	eval cf_temp="$cf_temp"
+-	case ".$cf_temp" in
+-	(.NONE/*)
++	case "x$cf_temp" in
++	(xNONE/*)
+ 		cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%`
+ 		;;
+ 	esac
+ 	;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ 	cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+@@ -9560,7 +9569,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:9563: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9572: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:9587: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -9584,10 +9593,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:9587: checking for infocmp program for fallbacks" >&5
++  echo "$as_me:9596: checking for infocmp program for fallbacks" >&5
+ echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
+ 		INFOCMP=$withval
+-		echo "$as_me:9590: result: $INFOCMP" >&5
++		echo "$as_me:9599: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -9596,26 +9605,24 @@
+ 	cf_path_syntax="$ac_default_prefix"
+ fi
+ 
+-case ".$INFOCMP" in
+-(.\$\(*\)*|.\'*\'*)
++case "x$INFOCMP" in
++(x\$\(*\)*|x\'*\'*)
+ 	;;
+-(..|./*|.\\*)
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+-	;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ 	eval INFOCMP="$INFOCMP"
+-	case ".$INFOCMP" in
+-	(.NONE/*)
++	case "x$INFOCMP" in
++	(xNONE/*)
+ 		INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
+ 		;;
+ 	esac
+ 	;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9618: error: expected a pathname, not \"$INFOCMP\"" >&5
++	{ { echo "$as_me:9625: error: expected a pathname, not \"$INFOCMP\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9628,7 +9635,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:9631: checking for $ac_word" >&5
++echo "$as_me:9638: 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
+@@ -9645,7 +9652,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:9648: found $ac_dir/$ac_word" >&5
++   echo "$as_me:9655: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -9656,10 +9663,10 @@
+ INFOCMP=$ac_cv_path_INFOCMP
+ 
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:9659: result: $INFOCMP" >&5
++  echo "$as_me:9666: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:9662: result: no" >&5
++  echo "$as_me:9669: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9681,22 +9688,20 @@
+ 	cf_path_syntax="$ac_default_prefix"
+ fi
+ 
+-case ".$cf_temp" in
+-(.\$\(*\)*|.\'*\'*)
+-	;;
+-(..|./*|.\\*)
++case "x$cf_temp" in
++(x\$\(*\)*|x\'*\'*)
+ 	;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ 	eval cf_temp="$cf_temp"
+-	case ".$cf_temp" in
+-	(.NONE/*)
++	case "x$cf_temp" in
++	(xNONE/*)
+ 		cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%`
+ 		;;
+ 	esac
+ 	;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ 	cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+@@ -9718,7 +9723,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:9721: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9726: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:9741: WARNING: no infocmp program found for fallbacks" >&5
+ echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -9743,7 +9748,7 @@
+ 	test -z "$INFOCMP" && FALLBACK_LIST=
+ 	if test -z "$FALLBACK_LIST"
+ 	then
+-		{ echo "$as_me:9746: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
++		{ echo "$as_me:9751: 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
+@@ -9751,7 +9756,7 @@
+ USE_FALLBACKS=
+ test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
+ 
+-echo "$as_me:9754: checking if you want modern xterm or antique" >&5
++echo "$as_me:9759: 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.
+@@ -9765,7 +9770,7 @@
+ (no) with_xterm_new=xterm-old;;
+ (*)	 with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:9768: result: $with_xterm_new" >&5
++echo "$as_me:9773: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+ 
+@@ -9778,7 +9783,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9781: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:9786: 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.
+@@ -9802,13 +9807,13 @@
+ 	with_xterm_kbs=$withval
+ 	;;
+ esac
+-echo "$as_me:9805: result: $with_xterm_kbs" >&5
++echo "$as_me:9810: result: $with_xterm_kbs" >&5
+ echo "${ECHO_T}$with_xterm_kbs" >&6
+ XTERM_KBS=$with_xterm_kbs
+ 
+ if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
+ then
+-	{ echo "$as_me:9811: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
++	{ echo "$as_me:9816: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
+ echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;}
+ fi
+ 
+@@ -9818,7 +9823,7 @@
+ 	MAKE_TERMINFO="#"
+ else
+ 
+-echo "$as_me:9821: checking for list of terminfo directories" >&5
++echo "$as_me:9826: 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.
+@@ -9839,26 +9844,24 @@
+ 	cf_path_syntax="$ac_default_prefix"
+ fi
+ 
+-case ".$cf_src_path" in
+-(.\$\(*\)*|.\'*\'*)
+-	;;
+-(..|./*|.\\*)
++case "x$cf_src_path" in
++(x\$\(*\)*|x\'*\'*)
+ 	;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ 	eval cf_src_path="$cf_src_path"
+-	case ".$cf_src_path" in
+-	(.NONE/*)
++	case "x$cf_src_path" in
++	(xNONE/*)
+ 		cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 		;;
+ 	esac
+ 	;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9861: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:9864: 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; }; }
+ 	;;
+@@ -9881,7 +9884,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9884: result: $TERMINFO_DIRS" >&5
++echo "$as_me:9887: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <&5
++	{ echo "$as_me:9896: 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:9899: checking for default terminfo directory" >&5
++echo "$as_me:9902: 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.
+@@ -9913,26 +9916,24 @@
+ 	cf_path_syntax="$ac_default_prefix"
+ fi
+ 
+-case ".$withval" in
+-(.\$\(*\)*|.\'*\'*)
++case "x$withval" in
++(x\$\(*\)*|x\'*\'*)
+ 	;;
+-(..|./*|.\\*)
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+-	;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ 	eval withval="$withval"
+-	case ".$withval" in
+-	(.NONE/*)
++	case "x$withval" in
++	(xNONE/*)
+ 		withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 		;;
+ 	esac
+ 	;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9935: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:9936: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9941,7 +9942,7 @@
+ fi
+ eval TERMINFO="$withval"
+ 
+-echo "$as_me:9944: result: $TERMINFO" >&5
++echo "$as_me:9945: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:9956: 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.
+@@ -9964,7 +9965,7 @@
+   with_big_core=no
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9967 "configure"
++#line 9968 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -9978,15 +9979,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9981: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9982: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9984: \$? = $ac_status" >&5
++  echo "$as_me:9985: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9986: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9987: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9989: \$? = $ac_status" >&5
++  echo "$as_me:9990: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_big_core=yes
+ else
+@@ -9998,7 +9999,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi;
+-echo "$as_me:10001: result: $with_big_core" >&5
++echo "$as_me:10002: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10008,7 +10009,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:10011: checking if big-strings option selected" >&5
++echo "$as_me:10012: 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.
+@@ -10032,14 +10033,14 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:10035: result: $with_big_strings" >&5
++echo "$as_me:10036: 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:10042: checking if you want termcap-fallback support" >&5
++echo "$as_me:10043: 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.
+@@ -10049,14 +10050,14 @@
+ else
+   with_termcap=no
+ fi;
+-echo "$as_me:10052: result: $with_termcap" >&5
++echo "$as_me:10053: 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:10059: error: You have disabled the database w/o specifying fallbacks" >&5
++			{ { echo "$as_me:10060: 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
+@@ -10069,13 +10070,13 @@
+ else
+ 
+ 	if test "$with_ticlib" != no ; then
+-		{ { echo "$as_me:10072: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++		{ { echo "$as_me:10073: 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:10078: checking for list of termcap files" >&5
++	echo "$as_me:10079: 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.
+@@ -10096,26 +10097,24 @@
+ 	cf_path_syntax="$ac_default_prefix"
+ fi
+ 
+-case ".$cf_src_path" in
+-(.\$\(*\)*|.\'*\'*)
+-	;;
+-(..|./*|.\\*)
++case "x$cf_src_path" in
++(x\$\(*\)*|x\'*\'*)
+ 	;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ 	eval cf_src_path="$cf_src_path"
+-	case ".$cf_src_path" in
+-	(.NONE/*)
++	case "x$cf_src_path" in
++	(xNONE/*)
+ 		cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 		;;
+ 	esac
+ 	;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:10118: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:10117: 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; }; }
+ 	;;
+@@ -10138,7 +10137,7 @@
+ 	;;
+ esac
+ 
+-	echo "$as_me:10141: result: $TERMPATH" >&5
++	echo "$as_me:10140: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ 	test -n "$TERMPATH" &&
+ cat >>confdefs.h <&5
++	echo "$as_me:10148: 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.
+@@ -10156,14 +10155,14 @@
+ else
+   with_getcap=no
+ fi;
+-	echo "$as_me:10159: result: $with_getcap" >&5
++	echo "$as_me:10158: 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:10166: checking if translated termcaps will be cached in ~/.terminfo" >&5
++	echo "$as_me:10165: 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.
+@@ -10173,7 +10172,7 @@
+ else
+   with_getcap_cache=no
+ fi;
+-	echo "$as_me:10176: result: $with_getcap_cache" >&5
++	echo "$as_me:10175: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ 	test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10183,7 +10182,7 @@
+ fi
+ 
+ ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:10186: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:10185: 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.
+@@ -10193,14 +10192,14 @@
+ else
+   with_home_terminfo=yes
+ fi;
+-echo "$as_me:10196: result: $with_home_terminfo" >&5
++echo "$as_me:10195: 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:10203: checking if you want to permit root to use ncurses environment variables" >&5
++echo "$as_me:10202: 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.
+@@ -10210,14 +10209,14 @@
+ else
+   with_root_environ=yes
+ fi;
+-echo "$as_me:10213: result: $with_root_environ" >&5
++echo "$as_me:10212: 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:10220: checking if you want to permit setuid programs to access all files" >&5
++echo "$as_me:10219: 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-access or --disable-root-access was given.
+@@ -10227,14 +10226,14 @@
+ else
+   with_root_access=yes
+ fi;
+-echo "$as_me:10230: result: $with_root_access" >&5
++echo "$as_me:10229: result: $with_root_access" >&5
+ echo "${ECHO_T}$with_root_access" >&6
+ test "x$with_root_access" = xyes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_ROOT_ACCESS 1
+ EOF
+ 
+-echo "$as_me:10237: checking if you want to permit setuid use of ncurses environment variables" >&5
++echo "$as_me:10236: checking if you want to permit setuid use of ncurses environment variables" >&5
+ echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
+ 
+ # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
+@@ -10244,7 +10243,7 @@
+ else
+   with_setuid_environ=$with_root_environ
+ fi;
+-echo "$as_me:10247: result: $with_setuid_environ" >&5
++echo "$as_me:10246: result: $with_setuid_environ" >&5
+ echo "${ECHO_T}$with_setuid_environ" >&6
+ test "x$with_setuid_environ" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10259,23 +10258,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:10262: checking for $ac_header" >&5
++echo "$as_me:10261: 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 10268 "configure"
++#line 10267 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10272: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:10271: \"$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:10278: \$? = $ac_status" >&5
++  echo "$as_me:10277: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10294,7 +10293,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:10297: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:10296: 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:10311: 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 10318 "configure"
++#line 10317 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10346,16 +10345,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10349: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10348: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10352: \$? = $ac_status" >&5
++  echo "$as_me:10351: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10355: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10354: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10358: \$? = $ac_status" >&5
++  echo "$as_me:10357: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -10365,7 +10364,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10368: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10367: 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:10384: 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 10391 "configure"
++#line 10390 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10419,16 +10418,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10422: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10421: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10425: \$? = $ac_status" >&5
++  echo "$as_me:10424: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10428: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10427: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10431: \$? = $ac_status" >&5
++  echo "$as_me:10430: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -10438,7 +10437,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10441: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10440: 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:10451: 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
+@@ -10462,7 +10461,7 @@
+ 			eval 'ac_cv_func_'$cf_func'=error'
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10465 "configure"
++#line 10464 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -10496,15 +10495,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10499: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10498: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10502: \$? = $ac_status" >&5
++  echo "$as_me:10501: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10504: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10503: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10507: \$? = $ac_status" >&5
++  echo "$as_me:10506: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -10522,7 +10521,7 @@
+ 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+ 
+ fi
+-echo "$as_me:10525: result: $cf_cv_link_funcs" >&5
++echo "$as_me:10524: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ 	test "$ac_cv_func_link"    = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -10542,7 +10541,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:10545: checking if tic should use symbolic links" >&5
++	echo "$as_me:10544: 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.
+@@ -10552,21 +10551,21 @@
+ else
+   with_symlinks=no
+ fi;
+-	echo "$as_me:10555: result: $with_symlinks" >&5
++	echo "$as_me:10554: 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:10562: checking if tic should use hard links" >&5
++	echo "$as_me:10561: 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:10569: result: $with_links" >&5
++	echo "$as_me:10568: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+ 
+@@ -10582,7 +10581,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:10585: checking if you want broken-linker support code" >&5
++echo "$as_me:10584: 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.
+@@ -10592,7 +10591,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:10595: result: $with_broken_linker" >&5
++echo "$as_me:10594: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : "${BROKEN_LINKER:=0}"
+@@ -10606,7 +10605,7 @@
+ fi
+ 
+ ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:10609: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:10608: 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.
+@@ -10616,7 +10615,7 @@
+ else
+   with_bsdpad=no
+ fi;
+-echo "$as_me:10619: result: $with_bsdpad" >&5
++echo "$as_me:10618: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10635,14 +10634,14 @@
+ # Check to define _XOPEN_SOURCE "automatically"
+ CPPFLAGS_before_XOPEN="$CPPFLAGS"
+ 
+-echo "$as_me:10638: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:10637: 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 10645 "configure"
++#line 10644 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10661,16 +10660,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10664: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10663: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10667: \$? = $ac_status" >&5
++  echo "$as_me:10666: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10670: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10669: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10673: \$? = $ac_status" >&5
++  echo "$as_me:10672: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -10681,7 +10680,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10684: result: $cf_cv_posix_visible" >&5
++echo "$as_me:10683: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -10723,14 +10722,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:10726: checking if this is the GNU C library" >&5
++echo "$as_me:10725: 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 10733 "configure"
++#line 10732 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10749,16 +10748,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10752: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10751: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10755: \$? = $ac_status" >&5
++  echo "$as_me:10754: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10758: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10757: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10761: \$? = $ac_status" >&5
++  echo "$as_me:10760: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -10769,7 +10768,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10772: result: $cf_cv_gnu_library" >&5
++echo "$as_me:10771: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -10777,7 +10776,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:10780: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:10779: 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
+@@ -10789,7 +10788,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10792 "configure"
++#line 10791 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10808,16 +10807,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10811: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10810: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10814: \$? = $ac_status" >&5
++  echo "$as_me:10813: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10817: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10816: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10820: \$? = $ac_status" >&5
++  echo "$as_me:10819: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -10829,12 +10828,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:10832: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:10831: 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:10837: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:10836: 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
+@@ -10939,7 +10938,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10942 "configure"
++#line 10941 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -10959,16 +10958,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10962: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10961: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10965: \$? = $ac_status" >&5
++  echo "$as_me:10964: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10968: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10967: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10971: \$? = $ac_status" >&5
++  echo "$as_me:10970: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -10979,7 +10978,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10982: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:10981: 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
+@@ -10988,14 +10987,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:10991: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:10990: 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 10998 "configure"
++#line 10997 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11010,16 +11009,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11013: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11012: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11016: \$? = $ac_status" >&5
++  echo "$as_me:11015: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11019: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11018: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11022: \$? = $ac_status" >&5
++  echo "$as_me:11021: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -11126,7 +11125,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11129 "configure"
++#line 11128 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11141,16 +11140,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11144: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11143: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11147: \$? = $ac_status" >&5
++  echo "$as_me:11146: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11150: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11149: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11153: \$? = $ac_status" >&5
++  echo "$as_me:11152: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -11165,12 +11164,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11168: result: $cf_cv_gnu_source" >&5
++echo "$as_me:11167: 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:11173: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:11172: 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
+@@ -11180,7 +11179,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11183 "configure"
++#line 11182 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11195,16 +11194,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11198: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11197: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11201: \$? = $ac_status" >&5
++  echo "$as_me:11200: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11204: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11203: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11207: \$? = $ac_status" >&5
++  echo "$as_me:11206: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -11215,7 +11214,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11218: result: $cf_cv_default_source" >&5
++echo "$as_me:11217: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -11252,16 +11251,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:11255: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11254: 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}:11261: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11260: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11264 "configure"
++#line 11263 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11276,16 +11275,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11279: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11278: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11282: \$? = $ac_status" >&5
++  echo "$as_me:11281: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11285: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11284: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11288: \$? = $ac_status" >&5
++  echo "$as_me:11287: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11306,7 +11305,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11309 "configure"
++#line 11308 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11321,16 +11320,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11324: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11323: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11327: \$? = $ac_status" >&5
++  echo "$as_me:11326: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11330: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11329: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11333: \$? = $ac_status" >&5
++  echo "$as_me:11332: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11341,7 +11340,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11344: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11343: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11349,10 +11348,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11352: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11351: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11355 "configure"
++#line 11354 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11367,16 +11366,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11370: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11369: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11373: \$? = $ac_status" >&5
++  echo "$as_me:11372: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11376: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11375: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11379: \$? = $ac_status" >&5
++  echo "$as_me:11378: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11392,7 +11391,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11395: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11394: 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
+@@ -11509,7 +11508,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:11512: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:11511: 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
+@@ -11541,14 +11540,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:11544: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:11543: 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 11551 "configure"
++#line 11550 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11566,16 +11565,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11569: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11568: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11572: \$? = $ac_status" >&5
++  echo "$as_me:11571: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11575: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11574: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11578: \$? = $ac_status" >&5
++  echo "$as_me:11577: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11587,7 +11586,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11590 "configure"
++#line 11589 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11605,16 +11604,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11608: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11607: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11611: \$? = $ac_status" >&5
++  echo "$as_me:11610: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11614: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11613: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11617: \$? = $ac_status" >&5
++  echo "$as_me:11616: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11629,7 +11628,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11632: result: $cf_cv_xopen_source" >&5
++echo "$as_me:11631: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -11789,16 +11788,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:11792: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11791: 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}:11798: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11797: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11801 "configure"
++#line 11800 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11813,16 +11812,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11816: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11815: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11819: \$? = $ac_status" >&5
++  echo "$as_me:11818: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11822: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11821: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11825: \$? = $ac_status" >&5
++  echo "$as_me:11824: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11843,7 +11842,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11846 "configure"
++#line 11845 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11858,16 +11857,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11861: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11860: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11864: \$? = $ac_status" >&5
++  echo "$as_me:11863: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11867: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11866: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11870: \$? = $ac_status" >&5
++  echo "$as_me:11869: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11878,7 +11877,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11881: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11880: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11886,10 +11885,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11889: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11888: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11892 "configure"
++#line 11891 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11904,16 +11903,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11907: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11906: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11910: \$? = $ac_status" >&5
++  echo "$as_me:11909: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11913: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11912: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11916: \$? = $ac_status" >&5
++  echo "$as_me:11915: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11929,7 +11928,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11932: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11931: 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
+@@ -12042,10 +12041,10 @@
+ 	if test "$cf_cv_xopen_source" = no ; then
+ 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+ 
+-echo "${as_me:-configure}:12045: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:12044: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12048 "configure"
++#line 12047 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12063,23 +12062,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12066: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12065: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12069: \$? = $ac_status" >&5
++  echo "$as_me:12068: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12072: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12071: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12075: \$? = $ac_status" >&5
++  echo "$as_me:12074: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-			{ echo "$as_me:12082: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++			{ echo "$as_me:12081: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ 			CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -12102,7 +12101,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}:12105: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12104: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -12114,7 +12113,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}:12117: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:12116: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -12202,7 +12201,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:12205: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:12204: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -12212,7 +12211,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:12215: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:12214: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -12222,7 +12221,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}:12225: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:12224: 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"
+@@ -12234,10 +12233,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:12237: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:12236: 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 12240 "configure"
++#line 12239 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12252,16 +12251,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12255: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12254: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12258: \$? = $ac_status" >&5
++  echo "$as_me:12257: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12261: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12260: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12264: \$? = $ac_status" >&5
++  echo "$as_me:12263: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -12270,12 +12269,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:12273: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:12272: 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 12278 "configure"
++#line 12277 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12290,16 +12289,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12293: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12292: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12296: \$? = $ac_status" >&5
++  echo "$as_me:12295: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12299: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12298: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12302: \$? = $ac_status" >&5
++  echo "$as_me:12301: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -12310,19 +12309,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:12313: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:12312: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:12318: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:12317: 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 12325 "configure"
++#line 12324 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12340,16 +12339,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12343: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12342: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12346: \$? = $ac_status" >&5
++  echo "$as_me:12345: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12349: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12348: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12352: \$? = $ac_status" >&5
++  echo "$as_me:12351: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12361,7 +12360,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12364 "configure"
++#line 12363 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12379,16 +12378,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12382: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12381: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12385: \$? = $ac_status" >&5
++  echo "$as_me:12384: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12388: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12387: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12391: \$? = $ac_status" >&5
++  echo "$as_me:12390: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12403,7 +12402,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12406: result: $cf_cv_xopen_source" >&5
++echo "$as_me:12405: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -12554,14 +12553,14 @@
+ 
+ # Work around breakage on OS X
+ 
+-echo "$as_me:12557: checking if SIGWINCH is defined" >&5
++echo "$as_me:12556: 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 12564 "configure"
++#line 12563 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12576,23 +12575,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12579: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12578: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12582: \$? = $ac_status" >&5
++  echo "$as_me:12581: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12585: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12584: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12588: \$? = $ac_status" >&5
++  echo "$as_me:12587: \$? = $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 12595 "configure"
++#line 12594 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -12610,16 +12609,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12613: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12612: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12616: \$? = $ac_status" >&5
++  echo "$as_me:12615: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12619: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12618: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12622: \$? = $ac_status" >&5
++  echo "$as_me:12621: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -12633,11 +12632,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12636: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:12635: 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:12640: checking for actual SIGWINCH definition" >&5
++echo "$as_me:12639: 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
+@@ -12648,7 +12647,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12651 "configure"
++#line 12650 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -12670,16 +12669,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12673: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12672: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12676: \$? = $ac_status" >&5
++  echo "$as_me:12675: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12679: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12678: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12682: \$? = $ac_status" >&5
++  echo "$as_me:12681: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -12693,7 +12692,7 @@
+ done
+ 
+ fi
+-echo "$as_me:12696: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:12695: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -12703,13 +12702,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:12706: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:12705: 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 12712 "configure"
++#line 12711 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12723,16 +12722,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12726: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12725: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12729: \$? = $ac_status" >&5
++  echo "$as_me:12728: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12732: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12731: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12735: \$? = $ac_status" >&5
++  echo "$as_me:12734: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -12743,7 +12742,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12746: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:12745: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test "$am_cv_langinfo_codeset" = yes; then
+ 
+@@ -12757,7 +12756,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+ 
+-echo "$as_me:12760: checking if you want wide-character code" >&5
++echo "$as_me:12759: 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.
+@@ -12767,7 +12766,7 @@
+ else
+   with_widec=$cf_dft_widec
+ fi;
+-echo "$as_me:12770: result: $with_widec" >&5
++echo "$as_me:12769: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ 
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -12789,7 +12788,7 @@
+ 	(*_XOPEN_SOURCE=*)
+ 		;;
+ 	(*)
+-		{ echo "$as_me:12792: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
++		{ echo "$as_me:12791: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
+ 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
+ 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
+@@ -12802,23 +12801,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:12805: checking for $ac_header" >&5
++echo "$as_me:12804: 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 12811 "configure"
++#line 12810 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:12815: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12814: \"$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:12821: \$? = $ac_status" >&5
++  echo "$as_me:12820: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12837,7 +12836,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:12840: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:12839: 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:12849: 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 12857 "configure"
++#line 12856 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12876,16 +12875,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12879: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12878: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12882: \$? = $ac_status" >&5
++  echo "$as_me:12881: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12885: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12884: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12888: \$? = $ac_status" >&5
++  echo "$as_me:12887: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_h_okay=yes
+ else
+@@ -12895,16 +12894,16 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12898: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:12897: 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:12904: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:12903: 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 12907 "configure"
++#line 12906 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12920,16 +12919,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12923: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12922: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12926: \$? = $ac_status" >&5
++  echo "$as_me:12925: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12929: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12928: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12932: \$? = $ac_status" >&5
++  echo "$as_me:12931: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=no
+ else
+@@ -12938,16 +12937,16 @@
+ cf_result=yes
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:12941: result: $cf_result" >&5
++echo "$as_me:12940: 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:12947: checking checking for compatible value versus " >&5
++	echo "$as_me:12946: 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 12950 "configure"
++#line 12949 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12963,16 +12962,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12966: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12965: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12969: \$? = $ac_status" >&5
++  echo "$as_me:12968: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12972: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12971: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12975: \$? = $ac_status" >&5
++  echo "$as_me:12974: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -12981,7 +12980,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:12984: result: $cf_result" >&5
++	echo "$as_me:12983: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = no ; then
+ 		# perhaps we can override it - try...
+@@ -12991,7 +12990,7 @@
+ 
+ fi
+ 
+-echo "$as_me:12994: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:12993: 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
+@@ -13062,7 +13061,7 @@
+   cf_cv_wcwidth_graphics=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13065 "configure"
++#line 13064 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13107,15 +13106,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:13110: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13109: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13113: \$? = $ac_status" >&5
++  echo "$as_me:13112: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:13115: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13114: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13118: \$? = $ac_status" >&5
++  echo "$as_me:13117: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wcwidth_graphics=yes
+ else
+@@ -13128,7 +13127,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:13131: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:13130: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+ 
+ 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -13139,13 +13138,13 @@
+ for ac_func in putwc btowc wctob wmemchr 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:13142: checking for $ac_func" >&5
++echo "$as_me:13141: 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 13148 "configure"
++#line 13147 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13176,16 +13175,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13179: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13178: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13182: \$? = $ac_status" >&5
++  echo "$as_me:13181: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13185: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13184: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13188: \$? = $ac_status" >&5
++  echo "$as_me:13187: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -13195,7 +13194,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13198: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:13197: 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:13212: 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 13219 "configure"
++#line 13218 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13223: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:13222: \"$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:13229: \$? = $ac_status" >&5
++  echo "$as_me:13228: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13245,7 +13244,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:13248: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:13247: 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:13257: 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
+@@ -13263,7 +13262,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13266 "configure"
++#line 13265 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13280,16 +13279,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13283: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13282: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13286: \$? = $ac_status" >&5
++  echo "$as_me:13285: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13289: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13288: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13292: \$? = $ac_status" >&5
++  echo "$as_me:13291: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -13301,12 +13300,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:13304: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13303: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13309 "configure"
++#line 13308 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13319,16 +13318,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13322: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13321: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13325: \$? = $ac_status" >&5
++  echo "$as_me:13324: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13328: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13327: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13331: \$? = $ac_status" >&5
++  echo "$as_me:13330: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -13342,7 +13341,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13345 "configure"
++#line 13344 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13355,16 +13354,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13358: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13357: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13361: \$? = $ac_status" >&5
++  echo "$as_me:13360: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13364: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13363: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13367: \$? = $ac_status" >&5
++  echo "$as_me:13366: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -13381,9 +13380,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:13384: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:13383: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:13386: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13385: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13474,7 +13473,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}:13477: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13476: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -13482,7 +13481,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13485 "configure"
++#line 13484 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13495,21 +13494,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13498: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13497: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13501: \$? = $ac_status" >&5
++  echo "$as_me:13500: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13504: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13503: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13507: \$? = $ac_status" >&5
++  echo "$as_me:13506: \$? = $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}:13512: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13511: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13527,7 +13526,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:13530: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13529: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -13602,13 +13601,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}:13605: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13604: 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 13611 "configure"
++#line 13610 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13621,21 +13620,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13624: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13623: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13627: \$? = $ac_status" >&5
++  echo "$as_me:13626: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13630: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13629: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13633: \$? = $ac_status" >&5
++  echo "$as_me:13632: \$? = $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}:13638: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13637: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -13677,7 +13676,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13680: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:13679: 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
+@@ -13715,7 +13714,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13718 "configure"
++#line 13717 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13727,16 +13726,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13730: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13729: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13733: \$? = $ac_status" >&5
++  echo "$as_me:13732: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13736: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13735: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13739: \$? = $ac_status" >&5
++  echo "$as_me:13738: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13753,7 +13752,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}:13756: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:13755: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -13789,7 +13788,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}:13792: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:13791: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -13821,14 +13820,14 @@
+ 	fi
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:13824: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:13823: 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 13831 "configure"
++#line 13830 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13846,23 +13845,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13849: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13848: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13852: \$? = $ac_status" >&5
++  echo "$as_me:13851: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13855: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13854: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13858: \$? = $ac_status" >&5
++  echo "$as_me:13857: \$? = $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 13865 "configure"
++#line 13864 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13881,16 +13880,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13884: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13883: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13887: \$? = $ac_status" >&5
++  echo "$as_me:13886: \$? = $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:13889: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13893: \$? = $ac_status" >&5
++  echo "$as_me:13892: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -13902,7 +13901,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13905: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:13904: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -13920,14 +13919,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:13923: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:13922: 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 13930 "configure"
++#line 13929 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13945,23 +13944,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13948: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13947: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13951: \$? = $ac_status" >&5
++  echo "$as_me:13950: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13954: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13953: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13957: \$? = $ac_status" >&5
++  echo "$as_me:13956: \$? = $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 13964 "configure"
++#line 13963 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13980,16 +13979,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13983: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13982: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13986: \$? = $ac_status" >&5
++  echo "$as_me:13985: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13989: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13988: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13992: \$? = $ac_status" >&5
++  echo "$as_me:13991: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -14001,7 +14000,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14004: result: $cf_cv_wchar_t" >&5
++echo "$as_me:14003: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -14024,14 +14023,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:14027: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:14026: 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 14034 "configure"
++#line 14033 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14049,23 +14048,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14052: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14051: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14055: \$? = $ac_status" >&5
++  echo "$as_me:14054: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14058: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14057: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14061: \$? = $ac_status" >&5
++  echo "$as_me:14060: \$? = $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 14068 "configure"
++#line 14067 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14084,16 +14083,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14087: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14086: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14090: \$? = $ac_status" >&5
++  echo "$as_me:14089: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14093: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14092: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14096: \$? = $ac_status" >&5
++  echo "$as_me:14095: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -14105,7 +14104,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14108: result: $cf_cv_wint_t" >&5
++echo "$as_me:14107: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -14137,7 +14136,7 @@
+ fi
+ 
+ ###   use option --disable-lp64 to allow long chtype
+-echo "$as_me:14140: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:14139: 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.
+@@ -14147,7 +14146,7 @@
+ else
+   with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:14150: result: $with_lp64" >&5
++echo "$as_me:14149: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+ 
+ if test "x$with_lp64" = xyes ; then
+@@ -14163,7 +14162,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:14166: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:14165: 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
+@@ -14175,7 +14174,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 14178 "configure"
++#line 14177 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14195,16 +14194,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14198: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14197: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14201: \$? = $ac_status" >&5
++  echo "$as_me:14200: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14204: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14203: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14207: \$? = $ac_status" >&5
++  echo "$as_me:14206: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14214,16 +14213,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14217: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14216: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14220: \$? = $ac_status" >&5
++  echo "$as_me:14219: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14223: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14222: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14226: \$? = $ac_status" >&5
++  echo "$as_me:14225: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -14237,13 +14236,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:14240: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:14239: 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:14246: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:14245: 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
+@@ -14251,7 +14250,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14254 "configure"
++#line 14253 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14271,16 +14270,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14274: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14273: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14277: \$? = $ac_status" >&5
++  echo "$as_me:14276: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14280: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14279: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14283: \$? = $ac_status" >&5
++  echo "$as_me:14282: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14289,7 +14288,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14292 "configure"
++#line 14291 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -14310,16 +14309,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14313: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14312: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14316: \$? = $ac_status" >&5
++  echo "$as_me:14315: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14319: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14318: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14322: \$? = $ac_status" >&5
++  echo "$as_me:14321: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -14330,7 +14329,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14333: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:14332: 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
+ 
+@@ -14340,7 +14339,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:14343: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:14342: 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
+@@ -14348,7 +14347,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14351 "configure"
++#line 14350 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14368,16 +14367,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14371: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14370: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14374: \$? = $ac_status" >&5
++  echo "$as_me:14373: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14377: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14376: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14380: \$? = $ac_status" >&5
++  echo "$as_me:14379: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14386,7 +14385,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14389 "configure"
++#line 14388 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -14407,16 +14406,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14410: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14409: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14413: \$? = $ac_status" >&5
++  echo "$as_me:14412: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14416: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14415: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14419: \$? = $ac_status" >&5
++  echo "$as_me:14418: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -14427,7 +14426,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14430: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:14429: 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
+ 
+@@ -14440,7 +14439,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:14443: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:14442: 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
+@@ -14448,7 +14447,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14451 "configure"
++#line 14450 "configure"
+ #include "confdefs.h"
+ #include 
+     #include 
+@@ -14463,16 +14462,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14466: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14465: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14469: \$? = $ac_status" >&5
++  echo "$as_me:14468: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14472: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14471: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14475: \$? = $ac_status" >&5
++  echo "$as_me:14474: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14481,7 +14480,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14484 "configure"
++#line 14483 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -14497,16 +14496,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14500: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14499: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14503: \$? = $ac_status" >&5
++  echo "$as_me:14502: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14506: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14505: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14509: \$? = $ac_status" >&5
++  echo "$as_me:14508: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -14517,7 +14516,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14520: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:14519: 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
+ 
+@@ -14531,13 +14530,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:14534: checking for fseeko" >&5
++echo "$as_me:14533: 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 14540 "configure"
++#line 14539 "configure"
+ #include "confdefs.h"
+ #include 
+                              #include 
+@@ -14551,16 +14550,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14554: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14553: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14557: \$? = $ac_status" >&5
++  echo "$as_me:14556: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14560: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14559: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14563: \$? = $ac_status" >&5
++  echo "$as_me:14562: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -14570,7 +14569,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14573: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:14572: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -14609,14 +14608,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:14612: checking whether to use struct dirent64" >&5
++	echo "$as_me:14611: 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 14619 "configure"
++#line 14618 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -14643,16 +14642,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14646: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14645: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14649: \$? = $ac_status" >&5
++  echo "$as_me:14648: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14652: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14651: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14655: \$? = $ac_status" >&5
++  echo "$as_me:14654: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -14663,7 +14662,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14666: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:14665: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -14673,7 +14672,7 @@
+ 	fi
+ 
+ ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:14676: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:14675: 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.
+@@ -14683,14 +14682,14 @@
+ else
+   with_tparm_varargs=yes
+ fi;
+-echo "$as_me:14686: result: $with_tparm_varargs" >&5
++echo "$as_me:14685: 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:14693: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:14692: 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.
+@@ -14700,14 +14699,14 @@
+ else
+   with_tic_depends=yes
+ fi;
+-echo "$as_me:14703: result: $with_tic_depends" >&5
++echo "$as_me:14702: 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:14710: checking if you want to enable wattr* macros" >&5
++echo "$as_me:14709: 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.
+@@ -14719,15 +14718,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ 	NCURSES_WATTR_MACROS=0
+-	echo "$as_me:14722: result: no" >&5
++	echo "$as_me:14721: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ else
+ 	NCURSES_WATTR_MACROS=1
+-	echo "$as_me:14726: result: yes" >&5
++	echo "$as_me:14725: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ fi
+ 
+-echo "$as_me:14730: checking for X11 rgb file" >&5
++echo "$as_me:14729: 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.
+@@ -14772,26 +14771,24 @@
+ 	cf_path_syntax="$ac_default_prefix"
+ fi
+ 
+-case ".$cf_path" in
+-(.\$\(*\)*|.\'*\'*)
+-	;;
+-(..|./*|.\\*)
++case "x$cf_path" in
++(x\$\(*\)*|x\'*\'*)
+ 	;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ 	eval cf_path="$cf_path"
+-	case ".$cf_path" in
+-	(.NONE/*)
++	case "x$cf_path" in
++	(xNONE/*)
+ 		cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 		;;
+ 	esac
+ 	;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:14794: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:14791: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14799,7 +14796,7 @@
+ 
+ fi
+ 
+-echo "$as_me:14802: result: $RGB_PATH" >&5
++echo "$as_me:14799: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:14814: 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.
+@@ -14824,17 +14821,17 @@
+ else
+   NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:14827: result: $NCURSES_BOOL" >&5
++echo "$as_me:14824: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ case x$NCURSES_BOOL in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14831: error: expected a type name for bool" >&5
++	{ { echo "$as_me:14828: error: expected a type name for bool" >&5
+ echo "$as_me: error: expected a type name for bool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+-echo "$as_me:14837: checking for alternate terminal capabilities file" >&5
++echo "$as_me:14834: 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.
+@@ -14846,16 +14843,16 @@
+ fi;
+ if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
+ then
+-	{ echo "$as_me:14849: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
++	{ echo "$as_me:14846: 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:14853: result: $TERMINFO_CAPS" >&5
++echo "$as_me:14850: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+ 
+ ###   use option --with-chtype to override chtype's type
+ 
+-echo "$as_me:14858: checking for type of chtype" >&5
++echo "$as_me:14855: 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.
+@@ -14865,11 +14862,11 @@
+ else
+   NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:14868: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:14865: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ case x$NCURSES_CHTYPE in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14872: error: expected a type name for chtype" >&5
++	{ { echo "$as_me:14869: error: expected a type name for chtype" >&5
+ echo "$as_me: error: expected a type name for chtype" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14877,7 +14874,7 @@
+ 
+ ###   use option --with-ospeed to override ospeed's type
+ 
+-echo "$as_me:14880: checking for type of ospeed" >&5
++echo "$as_me:14877: 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.
+@@ -14887,11 +14884,11 @@
+ else
+   NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:14890: result: $NCURSES_OSPEED" >&5
++echo "$as_me:14887: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ case x$NCURSES_OSPEED in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14894: error: expected a type name for ospeed" >&5
++	{ { echo "$as_me:14891: error: expected a type name for ospeed" >&5
+ echo "$as_me: error: expected a type name for ospeed" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14899,7 +14896,7 @@
+ 
+ ###   use option --with-mmask-t to override mmask_t's type
+ 
+-echo "$as_me:14902: checking for type of mmask-t" >&5
++echo "$as_me:14899: 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.
+@@ -14909,18 +14906,18 @@
+ else
+   NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:14912: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:14909: result: $NCURSES_MMASK_T" >&5
+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+ case x$NCURSES_MMASK_T in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14916: error: expected a type name for mmask-t" >&5
++	{ { echo "$as_me:14913: error: expected a type name for mmask-t" >&5
+ echo "$as_me: error: expected a type name for mmask-t" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ ###   use option --with-ccharw-max to override CCHARW_MAX size
+-echo "$as_me:14923: checking for size CCHARW_MAX" >&5
++echo "$as_me:14920: 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.
+@@ -14930,16 +14927,16 @@
+ else
+   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
+ fi;
+-echo "$as_me:14933: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:14930: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+ 
+-echo "$as_me:14936: checking for signed char" >&5
++echo "$as_me:14933: 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 14942 "configure"
++#line 14939 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14954,16 +14951,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14957: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14954: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14960: \$? = $ac_status" >&5
++  echo "$as_me:14957: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14963: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14960: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14966: \$? = $ac_status" >&5
++  echo "$as_me:14963: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -14973,10 +14970,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14976: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:14973: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:14979: checking size of signed char" >&5
++echo "$as_me:14976: 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
+@@ -14985,7 +14982,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14988 "configure"
++#line 14985 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14997,21 +14994,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15000: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14997: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15003: \$? = $ac_status" >&5
++  echo "$as_me:15000: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15006: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15003: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15009: \$? = $ac_status" >&5
++  echo "$as_me:15006: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15014 "configure"
++#line 15011 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15023,16 +15020,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15026: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15023: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15029: \$? = $ac_status" >&5
++  echo "$as_me:15026: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15032: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15029: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15035: \$? = $ac_status" >&5
++  echo "$as_me:15032: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -15048,7 +15045,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15051 "configure"
++#line 15048 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15060,16 +15057,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15063: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15060: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15066: \$? = $ac_status" >&5
++  echo "$as_me:15063: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15069: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15066: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15072: \$? = $ac_status" >&5
++  echo "$as_me:15069: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -15085,7 +15082,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 15088 "configure"
++#line 15085 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15097,16 +15094,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15100: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15097: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15103: \$? = $ac_status" >&5
++  echo "$as_me:15100: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15106: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15103: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15109: \$? = $ac_status" >&5
++  echo "$as_me:15106: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -15119,12 +15116,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:15122: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:15119: 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 15127 "configure"
++#line 15124 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15140,15 +15137,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:15143: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15140: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15146: \$? = $ac_status" >&5
++  echo "$as_me:15143: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:15148: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15145: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15151: \$? = $ac_status" >&5
++  echo "$as_me:15148: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -15164,7 +15161,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:15167: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:15164: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:15175: checking whether to use signed chars for Boolean array in term.h" >&5
+ echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
+ 
+ # Check whether --enable-signed-char or --disable-signed-char was given.
+@@ -15185,13 +15182,13 @@
+ else
+   with_signed_char=$cf_dft_signed_char
+ fi;
+-echo "$as_me:15188: result: $with_signed_char" >&5
++echo "$as_me:15185: 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:15194: checking for type of tparm-arg" >&5
++echo "$as_me:15191: checking for type of tparm-arg" >&5
+ echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6
+ 
+ # Check whether --with-tparm-arg or --without-tparm-arg was given.
+@@ -15201,18 +15198,18 @@
+ else
+   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:15204: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:15201: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+ case x$NCURSES_TPARM_ARG in
+ (x|xyes|xno)
+-	{ { echo "$as_me:15208: error: expected a type name for tparm-arg" >&5
++	{ { echo "$as_me:15205: error: expected a type name for tparm-arg" >&5
+ echo "$as_me: error: expected a type name for tparm-arg" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:15215: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:15212: 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.
+@@ -15222,7 +15219,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:15225: result: $with_rcs_ids" >&5
++echo "$as_me:15222: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15231,7 +15228,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:15234: checking format of man-pages" >&5
++echo "$as_me:15231: 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.
+@@ -15322,10 +15319,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:15325: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:15322: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+-	{ echo "$as_me:15328: WARNING: Unexpected manpage-format $cf_unknown" >&5
++	{ echo "$as_me:15325: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+ 
+@@ -15366,7 +15363,7 @@
+ esac
+ done
+ 
+-echo "$as_me:15369: checking for manpage renaming" >&5
++echo "$as_me:15366: 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.
+@@ -15395,15 +15392,15 @@
+ elif test "$MANPAGE_RENAMES" = no ; then
+ 	:
+ elif test ! -f "$MANPAGE_RENAMES" ; then
+-	{ { echo "$as_me:15398: error: not a filename: $MANPAGE_RENAMES" >&5
++	{ { echo "$as_me:15395: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-echo "$as_me:15403: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:15400: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+ 
+-echo "$as_me:15406: checking if manpage aliases will be installed" >&5
++echo "$as_me:15403: 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.
+@@ -15414,7 +15411,7 @@
+   MANPAGE_ALIASES=yes
+ fi;
+ 
+-echo "$as_me:15417: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:15414: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+ 
+ case "x$LN_S" in
+@@ -15428,7 +15425,7 @@
+ 
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:15431: checking if manpage symlinks should be used" >&5
++echo "$as_me:15428: 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.
+@@ -15441,17 +15438,17 @@
+ 
+ if test "$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+-	{ echo "$as_me:15444: WARNING: cannot make symlinks" >&5
++	{ echo "$as_me:15441: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ 	MANPAGE_SYMLINKS=no
+ fi
+ fi
+ 
+-echo "$as_me:15450: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:15447: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+ 
+-echo "$as_me:15454: checking for manpage tbl" >&5
++echo "$as_me:15451: 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.
+@@ -15462,7 +15459,7 @@
+   MANPAGE_TBL=no
+ fi;
+ 
+-echo "$as_me:15465: result: $MANPAGE_TBL" >&5
++echo "$as_me:15462: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+ 
+ if test "$prefix" = "NONE" ; then
+@@ -15780,7 +15777,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15783: checking if you want to build with function extensions" >&5
++echo "$as_me:15780: 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.
+@@ -15790,7 +15787,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:15793: result: $with_ext_funcs" >&5
++echo "$as_me:15790: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -15847,7 +15844,7 @@
+ 	GENERATED_EXT_FUNCS=
+ fi
+ 
+-echo "$as_me:15850: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:15847: 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.
+@@ -15857,7 +15854,7 @@
+ else
+   with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:15860: result: $with_sp_funcs" >&5
++echo "$as_me:15857: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ 	NCURSES_SP_FUNCS=1
+@@ -15876,7 +15873,7 @@
+ 	GENERATED_SP_FUNCS=
+ fi
+ 
+-echo "$as_me:15879: checking if you want to build with terminal-driver" >&5
++echo "$as_me:15876: 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.
+@@ -15886,7 +15883,7 @@
+ else
+   with_term_driver=no
+ fi;
+-echo "$as_me:15889: result: $with_term_driver" >&5
++echo "$as_me:15886: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+ 
+@@ -15895,19 +15892,19 @@
+ EOF
+ 
+ 	if test "x$with_termlib" != xno ; then
+-		{ { echo "$as_me:15898: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:15895: 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:15903: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:15900: 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:15910: checking for extended use of const keyword" >&5
++echo "$as_me:15907: 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.
+@@ -15917,7 +15914,7 @@
+ else
+   with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:15920: result: $with_ext_const" >&5
++echo "$as_me:15917: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -15925,7 +15922,7 @@
+ fi
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:15928: checking if you want to use extended colors" >&5
++echo "$as_me:15925: 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.
+@@ -15935,12 +15932,12 @@
+ else
+   with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:15938: result: $with_ext_colors" >&5
++echo "$as_me:15935: 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:15943: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:15940: 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)
+@@ -15951,7 +15948,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:15954: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:15951: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -15979,7 +15976,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:15982: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:15979: 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.
+@@ -15989,7 +15986,7 @@
+ else
+   with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:15992: result: $with_ext_mouse" >&5
++echo "$as_me:15989: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ if test "x$with_ext_mouse" = xyes ; then
+ 
+@@ -15999,7 +15996,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16002: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:15999: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16016,7 +16013,7 @@
+ fi
+ 
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:16019: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:16016: 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.
+@@ -16026,7 +16023,7 @@
+ else
+   with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:16029: result: $with_ext_putwin" >&5
++echo "$as_me:16026: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+ 
+@@ -16036,7 +16033,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16039: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:16036: 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.
+@@ -16046,7 +16043,7 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:16049: result: $with_no_padding" >&5
++echo "$as_me:16046: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16054,7 +16051,7 @@
+ EOF
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:16057: checking if you want SIGWINCH handler" >&5
++echo "$as_me:16054: 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.
+@@ -16064,7 +16061,7 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:16067: result: $with_sigwinch" >&5
++echo "$as_me:16064: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ if test "x$with_sigwinch" = xyes
+ then
+@@ -16079,7 +16076,7 @@
+ fi
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:16082: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:16079: 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.
+@@ -16089,7 +16086,7 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:16092: result: $with_tcap_names" >&5
++echo "$as_me:16089: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ if test "x$with_tcap_names" = xyes; then
+@@ -16103,7 +16100,7 @@
+ 
+ ##############################################################################
+ 
+-echo "$as_me:16106: checking if you want to link with the pthread library" >&5
++echo "$as_me:16103: 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.
+@@ -16113,27 +16110,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:16116: result: $with_pthread" >&5
++echo "$as_me:16113: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:16120: checking for pthread.h" >&5
++	echo "$as_me:16117: 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 16126 "configure"
++#line 16123 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16130: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16127: \"$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:16136: \$? = $ac_status" >&5
++  echo "$as_me:16133: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16152,7 +16149,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16155: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:16152: 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
+ 
+@@ -16162,7 +16159,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:16165: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:16162: 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"
+ 
+@@ -16183,7 +16180,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16186 "configure"
++#line 16183 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16200,16 +16197,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16203: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16200: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16206: \$? = $ac_status" >&5
++  echo "$as_me:16203: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16209: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16206: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16212: \$? = $ac_status" >&5
++  echo "$as_me:16209: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -16219,7 +16216,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:16222: result: $with_pthread" >&5
++	    echo "$as_me:16219: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -16247,7 +16244,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:16250: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:16247: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -16257,13 +16254,13 @@
+ fi
+ 
+ if test "x$with_pthread" != xno; then
+-	echo "$as_me:16260: checking for pthread_kill" >&5
++	echo "$as_me:16257: 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 16266 "configure"
++#line 16263 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16294,16 +16291,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16297: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16294: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16300: \$? = $ac_status" >&5
++  echo "$as_me:16297: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16303: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16300: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16306: \$? = $ac_status" >&5
++  echo "$as_me:16303: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_pthread_kill=yes
+ else
+@@ -16313,11 +16310,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16316: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:16313: 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:16320: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:16317: 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.
+@@ -16327,7 +16324,7 @@
+ else
+   use_pthreads_eintr=no
+ fi;
+-		echo "$as_me:16330: result: $use_pthreads_eintr" >&5
++		echo "$as_me:16327: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ 		if test "x$use_pthreads_eintr" = xyes ; then
+ 
+@@ -16338,7 +16335,7 @@
+ 		fi
+ fi
+ 
+-	echo "$as_me:16341: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:16338: 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.
+@@ -16348,18 +16345,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-	echo "$as_me:16351: result: $use_weak_symbols" >&5
++	echo "$as_me:16348: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ 	if test "x$use_weak_symbols" = xyes ; then
+ 
+-echo "$as_me:16355: checking if $CC supports weak symbols" >&5
++echo "$as_me:16352: 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 16362 "configure"
++#line 16359 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16385,16 +16382,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16388: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16385: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16391: \$? = $ac_status" >&5
++  echo "$as_me:16388: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16394: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16391: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16397: \$? = $ac_status" >&5
++  echo "$as_me:16394: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -16405,7 +16402,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16408: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:16405: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ 	else
+@@ -16455,7 +16452,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:16458: checking if you want reentrant code" >&5
++echo "$as_me:16455: 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.
+@@ -16465,7 +16462,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:16468: result: $with_reentrant" >&5
++echo "$as_me:16465: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -16554,7 +16551,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16557: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16554: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16566,7 +16563,7 @@
+ 	NCURSES_SIZE_T=$cf_dft_ordinate_type
+ fi
+ 
+-echo "$as_me:16569: checking whether curses library structures should be opaque" >&5
++echo "$as_me:16566: checking whether curses library structures should be opaque" >&5
+ echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
+@@ -16588,16 +16585,16 @@
+ 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16591: result: $enable_opaque_curses" >&5
++echo "$as_me:16588: 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:16596: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:16593: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:16600: checking whether form library structures should be opaque" >&5
++echo "$as_me:16597: checking whether form library structures should be opaque" >&5
+ echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-form or --disable-opaque-form was given.
+@@ -16614,10 +16611,10 @@
+ 	enable_opaque_form=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16617: result: $enable_opaque_form" >&5
++echo "$as_me:16614: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+ 
+-echo "$as_me:16620: checking whether menu library structures should be opaque" >&5
++echo "$as_me:16617: checking whether menu library structures should be opaque" >&5
+ echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
+@@ -16634,10 +16631,10 @@
+ 	enable_opaque_menu=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16637: result: $enable_opaque_menu" >&5
++echo "$as_me:16634: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+ 
+-echo "$as_me:16640: checking whether panel library structures should be opaque" >&5
++echo "$as_me:16637: checking whether panel library structures should be opaque" >&5
+ echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
+@@ -16654,7 +16651,7 @@
+ 	enable_opaque_panel=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16657: result: $enable_opaque_panel" >&5
++echo "$as_me:16654: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+ 
+ NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -16664,7 +16661,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:16667: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:16664: 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.
+@@ -16674,7 +16671,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:16677: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:16674: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -16687,7 +16684,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:16690: checking if you want all development code" >&5
++echo "$as_me:16687: 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.
+@@ -16697,11 +16694,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:16700: result: $with_develop" >&5
++echo "$as_me:16697: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###   use option --enable-check-size to detect screensize with CPR
+-echo "$as_me:16704: checking if you want to check screensize of serial terminals" >&5
++echo "$as_me:16701: checking if you want to check screensize of serial terminals" >&5
+ echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
+ 
+ # Check whether --enable-check-size or --disable-check-size was given.
+@@ -16711,7 +16708,7 @@
+ else
+   enable_check_size=$with_develop
+ fi;
+-echo "$as_me:16714: result: $enable_check_size" >&5
++echo "$as_me:16711: result: $enable_check_size" >&5
+ echo "${ECHO_T}$enable_check_size" >&6
+ test "x$enable_check_size" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16719,7 +16716,7 @@
+ EOF
+ 
+ ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
+-echo "$as_me:16722: checking if you want hard-tabs code" >&5
++echo "$as_me:16719: 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.
+@@ -16729,7 +16726,7 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:16732: result: $enable_hard_tabs" >&5
++echo "$as_me:16729: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16737,7 +16734,7 @@
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:16740: checking if you want limited support for xmc" >&5
++echo "$as_me:16737: 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.
+@@ -16747,7 +16744,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:16750: result: $enable_xmc_glitch" >&5
++echo "$as_me:16747: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16757,7 +16754,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:16760: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:16757: 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.
+@@ -16767,7 +16764,7 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:16770: result: $with_assumed_color" >&5
++echo "$as_me:16767: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16775,7 +16772,7 @@
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:16778: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:16775: 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.
+@@ -16785,7 +16782,7 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:16788: result: $with_hashmap" >&5
++echo "$as_me:16785: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16793,7 +16790,7 @@
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:16796: checking if you want colorfgbg code" >&5
++echo "$as_me:16793: 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.
+@@ -16803,7 +16800,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:16806: result: $with_colorfgbg" >&5
++echo "$as_me:16803: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16811,7 +16808,7 @@
+ EOF
+ 
+ ###   use option --enable-fvisibility to turn on use of gcc-specific feature
+-echo "$as_me:16814: checking if you want to use gcc -fvisibility option" >&5
++echo "$as_me:16811: 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.
+@@ -16821,14 +16818,14 @@
+ else
+   cf_with_fvisibility=no
+ fi;
+-echo "$as_me:16824: result: $cf_with_fvisibility" >&5
++echo "$as_me:16821: 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:16831: checking if $CC -fvisibility=hidden option works" >&5
++echo "$as_me:16828: 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
+@@ -16837,7 +16834,7 @@
+     cf_save_cflags="$CFLAGS"
+     CFLAGS="$CFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16840 "configure"
++#line 16837 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16853,16 +16850,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16856: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16853: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16859: \$? = $ac_status" >&5
++  echo "$as_me:16856: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16862: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16859: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16865: \$? = $ac_status" >&5
++  echo "$as_me:16862: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden=yes
+ else
+@@ -16874,7 +16871,7 @@
+     CFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16877: result: $cf_cv_fvisibility_hidden" >&5
++echo "$as_me:16874: result: $cf_cv_fvisibility_hidden" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
+ 
+ 	if test "x$cf_cv_fvisibility_hidden" = xyes
+@@ -16989,7 +16986,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:16992: checking if $CXX -fvisibility=hidden option works" >&5
++echo "$as_me:16989: 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
+@@ -16998,7 +16995,7 @@
+     cf_save_cflags="$CXXFLAGS"
+     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17001 "configure"
++#line 16998 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -17014,16 +17011,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17017: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17014: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17020: \$? = $ac_status" >&5
++  echo "$as_me:17017: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17023: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17020: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17026: \$? = $ac_status" >&5
++  echo "$as_me:17023: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden2=yes
+ else
+@@ -17035,7 +17032,7 @@
+     CXXFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:17038: result: $cf_cv_fvisibility_hidden2" >&5
++echo "$as_me:17035: result: $cf_cv_fvisibility_hidden2" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
+ 
+ 		if test "x$cf_cv_fvisibility_hidden2" = xyes
+@@ -17158,7 +17155,7 @@
+ fi
+ 
+ ###   use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:17161: checking if you want interop bindings" >&5
++echo "$as_me:17158: 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.
+@@ -17168,13 +17165,13 @@
+ else
+   with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:17171: result: $with_exp_interop" >&5
++echo "$as_me:17168: 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:17177: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:17174: 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.
+@@ -17184,13 +17181,13 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:17187: result: $with_safe_sprintf" >&5
++echo "$as_me:17184: 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:17193: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:17190: 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.
+@@ -17200,7 +17197,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:17203: result: $with_scroll_hints" >&5
++echo "$as_me:17200: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -17209,7 +17206,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17212: checking if you want wgetch-events code" >&5
++echo "$as_me:17209: 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.
+@@ -17219,7 +17216,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:17222: result: $with_wgetch_events" >&5
++echo "$as_me:17219: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ if test "x$with_wgetch_events" = xyes ; then
+ 
+@@ -17234,7 +17231,7 @@
+ 
+ case "$cf_cv_system_name" in
+ (*mingw32*|*mingw64*|*-msvc*)
+-	echo "$as_me:17237: checking if you want experimental-Windows driver" >&5
++	echo "$as_me:17234: 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.
+@@ -17244,7 +17241,7 @@
+ else
+   with_exp_win32=no
+ fi;
+-	echo "$as_me:17247: result: $with_exp_win32" >&5
++	echo "$as_me:17244: result: $with_exp_win32" >&5
+ echo "${ECHO_T}$with_exp_win32" >&6
+ 	if test "x$with_exp_win32" = xyes
+ 	then
+@@ -17270,7 +17267,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:17273: checking if you want to see long compiling messages" >&5
++echo "$as_me:17270: 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.
+@@ -17304,7 +17301,7 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:17307: result: $enableval" >&5
++echo "$as_me:17304: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ if test "x$enable_echo" = xyes; then
+@@ -17317,7 +17314,7 @@
+ 
+ # --disable-stripping is used for debugging
+ 
+-echo "$as_me:17320: checking if you want to install stripped executables" >&5
++echo "$as_me:17317: 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.
+@@ -17334,7 +17331,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:17337: result: $enable_stripping" >&5
++echo "$as_me:17334: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -17345,7 +17342,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:17348: checking if install accepts -p option" >&5
++echo "$as_me:17345: 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
+@@ -17376,10 +17373,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:17379: result: $cf_cv_install_p" >&5
++echo "$as_me:17376: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:17382: checking if install needs to be told about ownership" >&5
++echo "$as_me:17379: 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)
+@@ -17390,7 +17387,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17393: result: $with_install_o" >&5
++echo "$as_me:17390: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -17401,7 +17398,7 @@
+ 
+ if test -n "$INSTALL_OPT_S"
+ then
+-	echo "$as_me:17404: checking if you want to specify strip-program" >&5
++	echo "$as_me:17401: checking if you want to specify strip-program" >&5
+ echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
+ 
+ # Check whether --with-strip-program or --without-strip-program was given.
+@@ -17411,11 +17408,11 @@
+ else
+   with_strip_program=no
+ fi;
+-	echo "$as_me:17414: result: $with_strip_program" >&5
++	echo "$as_me:17411: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ 	if test "$with_strip_program" != no
+ 	then
+-		echo "$as_me:17418: checking if strip-program is supported with this installer" >&5
++		echo "$as_me:17415: checking if strip-program is supported with this installer" >&5
+ echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
+ 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
+ 		check_install_strip=no
+@@ -17436,11 +17433,11 @@
+ 				done
+ 			fi
+ 		fi
+-		echo "$as_me:17439: result: $check_install_strip" >&5
++		echo "$as_me:17436: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ 		case "$check_install_strip" in
+ 		(no)
+-			{ echo "$as_me:17443: WARNING: $cf_install_program does not support strip program option" >&5
++			{ echo "$as_me:17440: WARNING: $cf_install_program does not support strip program option" >&5
+ echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
+ 			with_strip_program=no
+ 			;;
+@@ -17455,7 +17452,7 @@
+ 			chmod +x "$INSTALL"
+ 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
+ 
+-echo "${as_me:-configure}:17458: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:17455: testing created $INSTALL ..." 1>&5
+ 
+ 			;;
+ 		(option)
+@@ -17481,7 +17478,7 @@
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+ 
+-echo "$as_me:17484: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:17481: 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.
+@@ -17498,17 +17495,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:17501: result: $enable_stdnoreturn" >&5
++echo "$as_me:17498: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:17505: checking for C11 _Noreturn feature" >&5
++echo "$as_me:17502: 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 17511 "configure"
++#line 17508 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17524,16 +17521,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17527: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17524: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17530: \$? = $ac_status" >&5
++  echo "$as_me:17527: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17533: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17530: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17536: \$? = $ac_status" >&5
++  echo "$as_me:17533: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -17544,7 +17541,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17547: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:17544: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -17600,16 +17597,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17603: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17600: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17608: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17605: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17612: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17609: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17648,16 +17645,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17651: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17648: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17656: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17653: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17660: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17657: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17696,23 +17693,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17699: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17696: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17704: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17701: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17708: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17705: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:17715: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:17712: 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.
+@@ -17729,7 +17726,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:17732: result: $enable_warnings" >&5
++echo "$as_me:17729: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -17753,7 +17750,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17756 "configure"
++#line 17753 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17768,26 +17765,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17771: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17768: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17774: \$? = $ac_status" >&5
++  echo "$as_me:17771: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17777: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17774: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17780: \$? = $ac_status" >&5
++  echo "$as_me:17777: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:17783: checking for X11/Xt const-feature" >&5
++echo "$as_me:17780: 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 17790 "configure"
++#line 17787 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -17805,16 +17802,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17808: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17805: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17811: \$? = $ac_status" >&5
++  echo "$as_me:17808: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17814: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17811: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17817: \$? = $ac_status" >&5
++  echo "$as_me:17814: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -17829,7 +17826,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17832: result: $cf_cv_const_x_string" >&5
++echo "$as_me:17829: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -17858,7 +17855,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:17874: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -17890,12 +17887,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17893: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17890: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17896: \$? = $ac_status" >&5
++  echo "$as_me:17893: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17898: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17895: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -17903,7 +17900,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:17906: checking for $CC warning options..." >&5
++	{ echo "$as_me:17903: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -17926,12 +17923,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:17929: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17926: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17932: \$? = $ac_status" >&5
++  echo "$as_me:17929: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17934: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17931: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -17939,7 +17936,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17942: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17939: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17949,7 +17946,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17952: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17949: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17982,10 +17979,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:17985: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:17982: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -18035,12 +18032,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:18038: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18035: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18041: \$? = $ac_status" >&5
++  echo "$as_me:18038: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18043: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:18040: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -18112,12 +18109,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:18115: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:18112: 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 18120 "configure"
++#line 18117 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18134,16 +18131,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18137: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18134: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18140: \$? = $ac_status" >&5
++  echo "$as_me:18137: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18143: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18140: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18146: \$? = $ac_status" >&5
++  echo "$as_me:18143: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -18154,7 +18151,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:18157: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:18154: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -18163,11 +18160,11 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:18166: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:18163: 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 18170 "configure"
++#line 18167 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18184,16 +18181,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18187: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18184: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18190: \$? = $ac_status" >&5
++  echo "$as_me:18187: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18193: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18190: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18196: \$? = $ac_status" >&5
++  echo "$as_me:18193: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_CPLUSPLUS=yes
+ 
+@@ -18203,7 +18200,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:18206: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:18203: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -18212,30 +18209,30 @@
+ if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:18215: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:18212: 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:18222: checking version of $CC" >&5
++	echo "$as_me:18219: 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:18226: result: $CLANG_VERSION" >&5
++	echo "$as_me:18223: 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:18233: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:18230: 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 18238 "configure"
++#line 18235 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -18249,16 +18246,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18252: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18249: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18255: \$? = $ac_status" >&5
++  echo "$as_me:18252: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18258: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18255: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18261: \$? = $ac_status" >&5
++  echo "$as_me:18258: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -18269,13 +18266,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:18272: result: $cf_clang_optok" >&5
++		echo "$as_me:18269: 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}:18278: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:18275: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -18292,7 +18289,7 @@
+ ac_main_return="return"
+ 
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:18310: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -18327,12 +18324,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:18330: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18327: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18333: \$? = $ac_status" >&5
++  echo "$as_me:18330: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18335: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18332: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -18341,7 +18338,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:18344: checking for $CXX warning options..." >&5
++	{ echo "$as_me:18341: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -18371,16 +18368,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:18374: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18371: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18377: \$? = $ac_status" >&5
++  echo "$as_me:18374: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18379: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18376: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:18383: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18380: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -18398,7 +18395,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:18401: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:18398: 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.
+@@ -18408,7 +18405,7 @@
+ else
+   enable_string_hacks=no
+ fi;
+-echo "$as_me:18411: result: $enable_string_hacks" >&5
++echo "$as_me:18408: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+ 
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -18417,15 +18414,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:18420: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:18417: 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:18422: checking for strlcat" >&5
++	echo "$as_me:18419: 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 18428 "configure"
++#line 18425 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18456,16 +18453,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18459: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18456: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18462: \$? = $ac_status" >&5
++  echo "$as_me:18459: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18465: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18462: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18468: \$? = $ac_status" >&5
++  echo "$as_me:18465: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -18475,7 +18472,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18478: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:18475: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+ 
+@@ -18485,7 +18482,7 @@
+ 
+ else
+ 
+-		echo "$as_me:18488: checking for strlcat in -lbsd" >&5
++		echo "$as_me:18485: 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
+@@ -18493,7 +18490,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18496 "configure"
++#line 18493 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18512,16 +18509,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18515: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18512: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18518: \$? = $ac_status" >&5
++  echo "$as_me:18515: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18521: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18518: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18524: \$? = $ac_status" >&5
++  echo "$as_me:18521: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -18532,7 +18529,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18535: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:18532: 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
+ 
+@@ -18555,23 +18552,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18558: checking for $ac_header" >&5
++echo "$as_me:18555: 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 18564 "configure"
++#line 18561 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18568: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18565: \"$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:18574: \$? = $ac_status" >&5
++  echo "$as_me:18571: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18590,7 +18587,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18593: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18590: 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:18611: 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 18620 "configure"
++#line 18617 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18648,16 +18645,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18651: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18648: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18654: \$? = $ac_status" >&5
++  echo "$as_me:18651: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18657: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18654: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18660: \$? = $ac_status" >&5
++  echo "$as_me:18657: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -18667,7 +18664,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18670: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:18667: 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:18680: 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.
+@@ -18690,7 +18687,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:18693: result: $with_assertions" >&5
++echo "$as_me:18690: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -18706,7 +18703,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:18709: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:18706: 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.
+@@ -18728,7 +18725,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:18731: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:18728: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18842,23 +18839,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:18845: checking for dmalloc.h" >&5
++	echo "$as_me:18842: 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 18851 "configure"
++#line 18848 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:18855: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18852: \"$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:18861: \$? = $ac_status" >&5
++  echo "$as_me:18858: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18877,11 +18874,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18880: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:18877: 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:18884: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:18881: 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
+@@ -18889,7 +18886,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18892 "configure"
++#line 18889 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18908,16 +18905,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18911: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18908: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18914: \$? = $ac_status" >&5
++  echo "$as_me:18911: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18917: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18914: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18920: \$? = $ac_status" >&5
++  echo "$as_me:18917: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -18928,7 +18925,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18931: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:18928: 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:18943: 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.
+@@ -18965,7 +18962,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:18968: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:18965: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19079,23 +19076,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:19082: checking for dbmalloc.h" >&5
++	echo "$as_me:19079: 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 19088 "configure"
++#line 19085 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:19092: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:19089: \"$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:19098: \$? = $ac_status" >&5
++  echo "$as_me:19095: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19114,11 +19111,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:19117: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:19114: 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:19121: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:19118: 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
+@@ -19126,7 +19123,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19129 "configure"
++#line 19126 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19145,16 +19142,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19148: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19145: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19151: \$? = $ac_status" >&5
++  echo "$as_me:19148: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19154: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19151: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19157: \$? = $ac_status" >&5
++  echo "$as_me:19154: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -19165,7 +19162,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19168: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:19165: 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:19180: 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.
+@@ -19202,7 +19199,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:19205: result: ${with_valgrind:-no}" >&5
++echo "$as_me:19202: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19315,7 +19312,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19318: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:19315: 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.
+@@ -19326,7 +19323,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:19329: result: $with_no_leaks" >&5
++echo "$as_me:19326: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -19378,7 +19375,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19381: checking whether to add trace feature to all models" >&5
++echo "$as_me:19378: 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.
+@@ -19388,7 +19385,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:19391: result: $cf_with_trace" >&5
++echo "$as_me:19388: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -19408,7 +19405,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:19411: checking if we want to use GNAT projects" >&5
++echo "$as_me:19408: 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.
+@@ -19425,7 +19422,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:19428: result: $enable_gnat_projects" >&5
++echo "$as_me:19425: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -19438,14 +19435,14 @@
+ 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+ 	fi
+ 
+-echo "$as_me:19441: checking if ssp library is needed" >&5
++echo "$as_me:19438: 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 19448 "configure"
++#line 19445 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19462,16 +19459,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19465: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19462: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19468: \$? = $ac_status" >&5
++  echo "$as_me:19465: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19471: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19468: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19474: \$? = $ac_status" >&5
++  echo "$as_me:19471: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -19481,7 +19478,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19484 "configure"
++#line 19481 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19498,16 +19495,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19501: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19498: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19504: \$? = $ac_status" >&5
++  echo "$as_me:19501: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19507: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19504: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19510: \$? = $ac_status" >&5
++  echo "$as_me:19507: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -19521,7 +19518,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19524: result: $cf_cv_need_libssp" >&5
++echo "$as_me:19521: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -19550,14 +19547,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19553: checking if -lm needed for math functions" >&5
++echo "$as_me:19550: 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 19560 "configure"
++#line 19557 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19573,16 +19570,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19576: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19573: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19579: \$? = $ac_status" >&5
++  echo "$as_me:19576: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19582: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19579: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19585: \$? = $ac_status" >&5
++  echo "$as_me:19582: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -19592,7 +19589,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19595: result: $cf_cv_need_libm" >&5
++echo "$as_me:19592: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ 
+ if test "$cf_cv_need_libm" = yes
+@@ -19600,14 +19597,14 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lm"
+-	echo "$as_me:19603: checking if -lm is available for math functions" >&5
++	echo "$as_me:19600: checking if -lm is available for math functions" >&5
+ echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
+ if test "${cf_cv_have_libm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19610 "configure"
++#line 19607 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19623,16 +19620,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19626: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19623: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19629: \$? = $ac_status" >&5
++  echo "$as_me:19626: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19632: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19629: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19635: \$? = $ac_status" >&5
++  echo "$as_me:19632: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_libm=yes
+ else
+@@ -19642,7 +19639,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19645: result: $cf_cv_have_libm" >&5
++echo "$as_me:19642: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ 	LIBS="$cf_save_LIBS"
+ 
+@@ -19664,13 +19661,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:19667: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:19664: 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 19673 "configure"
++#line 19670 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -19686,16 +19683,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19689: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19686: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19692: \$? = $ac_status" >&5
++  echo "$as_me:19689: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19695: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19692: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19698: \$? = $ac_status" >&5
++  echo "$as_me:19695: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -19705,7 +19702,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19708: result: $ac_cv_header_time" >&5
++echo "$as_me:19705: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -19720,7 +19717,7 @@
+ case "$host_os" in
+ (mingw*)
+ 	# -lsystre -ltre -lintl -liconv
+-	echo "$as_me:19723: checking for regcomp in -lsystre" >&5
++	echo "$as_me:19720: 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
+@@ -19728,7 +19725,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsystre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19731 "configure"
++#line 19728 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19747,16 +19744,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19750: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19747: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19753: \$? = $ac_status" >&5
++  echo "$as_me:19750: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19756: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19753: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19759: \$? = $ac_status" >&5
++  echo "$as_me:19756: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_systre_regcomp=yes
+ else
+@@ -19767,11 +19764,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19770: result: $ac_cv_lib_systre_regcomp" >&5
++echo "$as_me:19767: 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:19774: checking for libiconv_open in -liconv" >&5
++		echo "$as_me:19771: 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
+@@ -19779,7 +19776,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19782 "configure"
++#line 19779 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19798,16 +19795,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19801: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19798: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19804: \$? = $ac_status" >&5
++  echo "$as_me:19801: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19807: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19804: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19810: \$? = $ac_status" >&5
++  echo "$as_me:19807: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_iconv_libiconv_open=yes
+ else
+@@ -19818,7 +19815,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19821: result: $ac_cv_lib_iconv_libiconv_open" >&5
++echo "$as_me:19818: 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
+ 
+@@ -19840,7 +19837,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19843: checking for libintl_gettext in -lintl" >&5
++		echo "$as_me:19840: 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
+@@ -19848,7 +19845,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19851 "configure"
++#line 19848 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19867,16 +19864,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19870: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19867: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19873: \$? = $ac_status" >&5
++  echo "$as_me:19870: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19876: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19873: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19879: \$? = $ac_status" >&5
++  echo "$as_me:19876: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_intl_libintl_gettext=yes
+ else
+@@ -19887,7 +19884,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19890: result: $ac_cv_lib_intl_libintl_gettext" >&5
++echo "$as_me:19887: 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
+ 
+@@ -19909,7 +19906,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19912: checking for tre_regcomp in -ltre" >&5
++		echo "$as_me:19909: 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
+@@ -19917,7 +19914,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19920 "configure"
++#line 19917 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19936,16 +19933,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19939: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19936: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19942: \$? = $ac_status" >&5
++  echo "$as_me:19939: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19945: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19942: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19948: \$? = $ac_status" >&5
++  echo "$as_me:19945: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_tre_tre_regcomp=yes
+ else
+@@ -19956,7 +19953,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19959: result: $ac_cv_lib_tre_tre_regcomp" >&5
++echo "$as_me:19956: 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
+ 
+@@ -19998,7 +19995,7 @@
+ 
+ else
+ 
+-		echo "$as_me:20001: checking for regcomp in -lgnurx" >&5
++		echo "$as_me:19998: 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
+@@ -20006,7 +20003,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgnurx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20009 "configure"
++#line 20006 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20025,16 +20022,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20028: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20025: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20031: \$? = $ac_status" >&5
++  echo "$as_me:20028: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20034: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20031: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20037: \$? = $ac_status" >&5
++  echo "$as_me:20034: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gnurx_regcomp=yes
+ else
+@@ -20045,7 +20042,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20048: result: $ac_cv_lib_gnurx_regcomp" >&5
++echo "$as_me:20045: 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
+ 
+@@ -20073,13 +20070,13 @@
+ 	;;
+ (*)
+ 	cf_regex_libs="regex re"
+-	echo "$as_me:20076: checking for regcomp" >&5
++	echo "$as_me:20073: 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 20082 "configure"
++#line 20079 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20110,16 +20107,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20113: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20110: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20116: \$? = $ac_status" >&5
++  echo "$as_me:20113: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20119: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20116: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20122: \$? = $ac_status" >&5
++  echo "$as_me:20119: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -20129,7 +20126,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20132: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:20129: 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
+@@ -20138,7 +20135,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:20141: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:20138: 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
+@@ -20146,7 +20143,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20149 "configure"
++#line 20146 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20165,16 +20162,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20168: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20165: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20171: \$? = $ac_status" >&5
++  echo "$as_me:20168: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20174: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20171: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20177: \$? = $ac_status" >&5
++  echo "$as_me:20174: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -20185,7 +20182,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20188: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:20185: 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
+ 
+@@ -20217,13 +20214,13 @@
+ esac
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:20220: checking for compile" >&5
++	echo "$as_me:20217: 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 20226 "configure"
++#line 20223 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20254,16 +20251,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20257: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20254: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20260: \$? = $ac_status" >&5
++  echo "$as_me:20257: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20263: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20260: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20266: \$? = $ac_status" >&5
++  echo "$as_me:20263: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -20273,13 +20270,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20276: result: $ac_cv_func_compile" >&5
++echo "$as_me:20273: 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:20282: checking for compile in -lgen" >&5
++		echo "$as_me:20279: 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
+@@ -20287,7 +20284,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20290 "configure"
++#line 20287 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20306,16 +20303,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20309: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20306: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20312: \$? = $ac_status" >&5
++  echo "$as_me:20309: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20315: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20312: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20318: \$? = $ac_status" >&5
++  echo "$as_me:20315: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -20326,7 +20323,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20329: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:20326: 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
+ 
+@@ -20354,11 +20351,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:20357: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:20354: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:20361: checking for regular-expression headers" >&5
++echo "$as_me:20358: 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
+@@ -20370,7 +20367,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20373 "configure"
++#line 20370 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -20387,16 +20384,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20390: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20387: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20393: \$? = $ac_status" >&5
++  echo "$as_me:20390: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20396: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20393: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20399: \$? = $ac_status" >&5
++  echo "$as_me:20396: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20413,7 +20410,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20416 "configure"
++#line 20413 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$cf_regex_hdr>
+@@ -20433,16 +20430,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20436: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20433: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20439: \$? = $ac_status" >&5
++  echo "$as_me:20436: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20442: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20439: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20445: \$? = $ac_status" >&5
++  echo "$as_me:20442: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20458,11 +20455,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:20461: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:20458: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case "$cf_cv_regex_hdrs" in
+-	(no)		{ echo "$as_me:20465: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:20462: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -20500,23 +20497,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20503: checking for $ac_header" >&5
++echo "$as_me:20500: 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 20509 "configure"
++#line 20506 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20513: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20510: \"$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:20519: \$? = $ac_status" >&5
++  echo "$as_me:20516: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20535,7 +20532,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20538: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20535: 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:20548: 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 20557 "configure"
++#line 20554 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20561: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20558: \"$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:20567: \$? = $ac_status" >&5
++  echo "$as_me:20564: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20583,7 +20580,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20586: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20583: 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:20593: 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
+@@ -20603,7 +20600,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20606 "configure"
++#line 20603 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20616,16 +20613,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20619: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20616: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20622: \$? = $ac_status" >&5
++  echo "$as_me:20619: \$? = $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:20622: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20628: \$? = $ac_status" >&5
++  echo "$as_me:20625: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -20637,7 +20634,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20640: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20637: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -20654,14 +20651,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20657: checking if external environ is declared" >&5
++echo "$as_me:20654: 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 20664 "configure"
++#line 20661 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -20674,16 +20671,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20677: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20674: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20680: \$? = $ac_status" >&5
++  echo "$as_me:20677: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20683: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20680: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20686: \$? = $ac_status" >&5
++  echo "$as_me:20683: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_environ=yes
+ else
+@@ -20694,7 +20691,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20697: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20694: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+ 
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20709,14 +20706,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:20712: checking if external environ exists" >&5
++echo "$as_me:20709: 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 20719 "configure"
++#line 20716 "configure"
+ #include "confdefs.h"
+ 
+ #undef environ
+@@ -20731,16 +20728,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20734: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20731: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20737: \$? = $ac_status" >&5
++  echo "$as_me:20734: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20740: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20737: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20743: \$? = $ac_status" >&5
++  echo "$as_me:20740: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_environ=yes
+ else
+@@ -20751,7 +20748,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20754: result: $cf_cv_have_environ" >&5
++echo "$as_me:20751: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+ 
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20764,13 +20761,13 @@
+ 
+ fi
+ 
+-echo "$as_me:20767: checking for getenv" >&5
++echo "$as_me:20764: 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 20773 "configure"
++#line 20770 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20801,16 +20798,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20804: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20801: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20807: \$? = $ac_status" >&5
++  echo "$as_me:20804: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20810: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20807: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20813: \$? = $ac_status" >&5
++  echo "$as_me:20810: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_getenv=yes
+ else
+@@ -20820,19 +20817,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20823: result: $ac_cv_func_getenv" >&5
++echo "$as_me:20820: 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:20829: checking for $ac_func" >&5
++echo "$as_me:20826: 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 20835 "configure"
++#line 20832 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20863,16 +20860,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20866: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20863: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20869: \$? = $ac_status" >&5
++  echo "$as_me:20866: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20872: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20869: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20875: \$? = $ac_status" >&5
++  echo "$as_me:20872: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -20882,7 +20879,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20885: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:20882: 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:20892: 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
+@@ -20902,7 +20899,7 @@
+   cf_cv_consistent_getenv=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20905 "configure"
++#line 20902 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21007,15 +21004,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21010: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21007: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21013: \$? = $ac_status" >&5
++  echo "$as_me:21010: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21015: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21012: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21018: \$? = $ac_status" >&5
++  echo "$as_me:21015: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_consistent_getenv=yes
+ else
+@@ -21028,7 +21025,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:21031: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:21028: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+ 
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -21043,18 +21040,18 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ 	test "x$cf_with_trace" = xyes
+ then
+-	{ echo "$as_me:21046: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++	{ echo "$as_me:21043: 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:21050: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:21047: 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 21057 "configure"
++#line 21054 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21074,16 +21071,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21077: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21074: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21080: \$? = $ac_status" >&5
++  echo "$as_me:21077: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21083: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21080: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21086: \$? = $ac_status" >&5
++  echo "$as_me:21083: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -21095,7 +21092,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21098: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:21095: 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
+@@ -21110,13 +21107,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:21113: checking for an ANSI C-conforming const" >&5
++echo "$as_me:21110: 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 21119 "configure"
++#line 21116 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21178,16 +21175,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21181: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21178: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21184: \$? = $ac_status" >&5
++  echo "$as_me:21181: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21187: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21184: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21190: \$? = $ac_status" >&5
++  echo "$as_me:21187: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -21197,7 +21194,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21200: result: $ac_cv_c_const" >&5
++echo "$as_me:21197: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -21207,7 +21204,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21210: checking for inline" >&5
++echo "$as_me:21207: 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
+@@ -21215,7 +21212,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21218 "configure"
++#line 21215 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo (void) {return 0; }
+@@ -21224,16 +21221,16 @@
+ 
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21227: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21224: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21230: \$? = $ac_status" >&5
++  echo "$as_me:21227: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21233: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21230: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21236: \$? = $ac_status" >&5
++  echo "$as_me:21233: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -21244,7 +21241,7 @@
+ done
+ 
+ fi
+-echo "$as_me:21247: result: $ac_cv_c_inline" >&5
++echo "$as_me:21244: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -21270,7 +21267,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:21273: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:21270: 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
+@@ -21279,7 +21276,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21282 "configure"
++#line 21279 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -21291,16 +21288,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21294: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21291: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21297: \$? = $ac_status" >&5
++  echo "$as_me:21294: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21300: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21297: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21303: \$? = $ac_status" >&5
++  echo "$as_me:21300: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -21312,7 +21309,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:21315: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:21312: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -21418,7 +21415,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:21421: checking for signal global datatype" >&5
++echo "$as_me:21418: 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
+@@ -21430,7 +21427,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21433 "configure"
++#line 21430 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21454,16 +21451,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21457: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21454: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21460: \$? = $ac_status" >&5
++  echo "$as_me:21457: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21463: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21460: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21466: \$? = $ac_status" >&5
++  echo "$as_me:21463: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21477,7 +21474,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21480: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21477: 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:21486: 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
+@@ -21496,7 +21493,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21499 "configure"
++#line 21496 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21531,15 +21528,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21534: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21531: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21537: \$? = $ac_status" >&5
++  echo "$as_me:21534: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21539: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21536: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21542: \$? = $ac_status" >&5
++  echo "$as_me:21539: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21554,7 +21551,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21557: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21554: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:21566: 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 21576 "configure"
++#line 21573 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21585,16 +21582,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21588: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21585: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21591: \$? = $ac_status" >&5
++  echo "$as_me:21588: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21594: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21591: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21597: \$? = $ac_status" >&5
++  echo "$as_me:21594: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -21606,7 +21603,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21609: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21606: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -21622,14 +21619,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:21625: checking if external errno is declared" >&5
++echo "$as_me:21622: 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 21632 "configure"
++#line 21629 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21643,16 +21640,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21646: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21643: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21649: \$? = $ac_status" >&5
++  echo "$as_me:21646: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21652: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21649: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21655: \$? = $ac_status" >&5
++  echo "$as_me:21652: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -21663,7 +21660,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21666: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21663: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21678,14 +21675,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:21681: checking if external errno exists" >&5
++echo "$as_me:21678: 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 21688 "configure"
++#line 21685 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -21700,16 +21697,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21703: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21700: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21706: \$? = $ac_status" >&5
++  echo "$as_me:21703: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21709: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21706: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21712: \$? = $ac_status" >&5
++  echo "$as_me:21709: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -21720,7 +21717,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21723: result: $cf_cv_have_errno" >&5
++echo "$as_me:21720: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21733,7 +21730,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21736: checking if data-only library module links" >&5
++echo "$as_me:21733: 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
+@@ -21741,20 +21738,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:21744: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21750: \$? = $ac_status" >&5
++  echo "$as_me:21747: \$? = $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:21771: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21777: \$? = $ac_status" >&5
++  echo "$as_me:21774: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -21787,7 +21784,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21790 "configure"
++#line 21787 "configure"
+ #include "confdefs.h"
+ 
+ 	extern int testfunc(void);
+@@ -21798,15 +21795,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21801: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21798: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21804: \$? = $ac_status" >&5
++  echo "$as_me:21801: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21806: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21803: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21809: \$? = $ac_status" >&5
++  echo "$as_me:21806: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -21821,7 +21818,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21824: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21821: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21836,13 +21833,13 @@
+ ###	Checks for library functions.
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:21839: checking for clock_gettime" >&5
++echo "$as_me:21836: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21845 "configure"
++#line 21842 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21873,16 +21870,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21876: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21873: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21879: \$? = $ac_status" >&5
++  echo "$as_me:21876: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21882: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21879: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21885: \$? = $ac_status" >&5
++  echo "$as_me:21882: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -21892,12 +21889,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21895: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:21892: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:21900: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:21897: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21905,7 +21902,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21908 "configure"
++#line 21905 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21924,16 +21921,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21927: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21924: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21930: \$? = $ac_status" >&5
++  echo "$as_me:21927: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21933: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21930: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21936: \$? = $ac_status" >&5
++  echo "$as_me:21933: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -21944,7 +21941,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21947: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:21944: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -21956,14 +21953,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:21959: checking if clock_gettime links" >&5
++echo "$as_me:21956: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21966 "configure"
++#line 21963 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21981,16 +21978,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21984: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21981: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21987: \$? = $ac_status" >&5
++  echo "$as_me:21984: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21990: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21987: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21993: \$? = $ac_status" >&5
++  echo "$as_me:21990: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -22001,7 +21998,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22004: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:22001: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -22015,13 +22012,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:22018: checking for gettimeofday" >&5
++echo "$as_me:22015: 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 22024 "configure"
++#line 22021 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22052,16 +22049,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22055: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22052: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22058: \$? = $ac_status" >&5
++  echo "$as_me:22055: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22061: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22058: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22064: \$? = $ac_status" >&5
++  echo "$as_me:22061: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -22071,7 +22068,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22074: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:22071: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -22081,7 +22078,7 @@
+ 
+ else
+ 
+-echo "$as_me:22084: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:22081: 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
+@@ -22089,7 +22086,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22092 "configure"
++#line 22089 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22108,16 +22105,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22111: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22108: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22114: \$? = $ac_status" >&5
++  echo "$as_me:22111: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22117: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22114: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22120: \$? = $ac_status" >&5
++  echo "$as_me:22117: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -22128,7 +22125,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22131: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:22128: 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
+ 
+@@ -22187,13 +22184,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:22190: checking for $ac_func" >&5
++echo "$as_me:22187: 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 22196 "configure"
++#line 22193 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22224,16 +22221,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22227: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22224: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22230: \$? = $ac_status" >&5
++  echo "$as_me:22227: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22233: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22230: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22236: \$? = $ac_status" >&5
++  echo "$as_me:22233: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -22243,7 +22240,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22246: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:22243: 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:22253: 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 22263 "configure"
++#line 22260 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22275,16 +22272,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22278: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22275: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22281: \$? = $ac_status" >&5
++  echo "$as_me:22278: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22284: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22281: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22287: \$? = $ac_status" >&5
++  echo "$as_me:22284: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_PATH_TTYS=yes
+ else
+@@ -22294,7 +22291,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22297: result: $cf_cv_PATH_TTYS" >&5
++echo "$as_me:22294: result: $cf_cv_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
+ 
+ if test $cf_cv_PATH_TTYS = no
+@@ -22316,7 +22313,7 @@
+ 
+ if test $cf_cv_PATH_TTYS != no
+ then
+-	echo "$as_me:22319: checking if _PATH_TTYS file exists" >&5
++	echo "$as_me:22316: 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
+@@ -22326,7 +22323,7 @@
+   cf_cv_have_PATH_TTYS=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22329 "configure"
++#line 22326 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22339,15 +22336,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22342: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22339: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22345: \$? = $ac_status" >&5
++  echo "$as_me:22342: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22347: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22344: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22350: \$? = $ac_status" >&5
++  echo "$as_me:22347: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_PATH_TTYS=yes
+ else
+@@ -22359,7 +22356,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22362: result: $cf_cv_have_PATH_TTYS" >&5
++echo "$as_me:22359: 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
+@@ -22371,14 +22368,14 @@
+ #define HAVE_PATH_TTYS 1
+ EOF
+ 
+-	echo "$as_me:22374: checking for getttynam" >&5
++	echo "$as_me:22371: 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 22381 "configure"
++#line 22378 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22390,16 +22387,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22393: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22390: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22396: \$? = $ac_status" >&5
++  echo "$as_me:22393: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22399: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22396: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22402: \$? = $ac_status" >&5
++  echo "$as_me:22399: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_getttynam=yes
+ else
+@@ -22409,7 +22406,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22412: result: $cf_cv_func_getttynam" >&5
++echo "$as_me:22409: 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
+@@ -22419,7 +22416,7 @@
+ 
+ if test "x$ac_cv_func_getopt" = xno && \
+    test "x$cf_with_progs$cf_with_tests" != xnono; then
+-	{ { echo "$as_me:22422: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:22419: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -22428,7 +22425,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:22431: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:22428: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -22441,14 +22438,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:22444: checking for terminal-capability database functions" >&5
++echo "$as_me:22441: 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 22451 "configure"
++#line 22448 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22468,16 +22465,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22471: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22468: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22474: \$? = $ac_status" >&5
++  echo "$as_me:22471: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22477: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22474: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22480: \$? = $ac_status" >&5
++  echo "$as_me:22477: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -22488,7 +22485,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22491: result: $cf_cv_cgetent" >&5
++echo "$as_me:22488: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -22498,14 +22495,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:22501: checking if cgetent uses const parameter" >&5
++echo "$as_me:22498: 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 22508 "configure"
++#line 22505 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -22528,16 +22525,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22531: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22528: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22534: \$? = $ac_status" >&5
++  echo "$as_me:22531: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22537: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22534: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22540: \$? = $ac_status" >&5
++  echo "$as_me:22537: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -22548,7 +22545,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22551: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:22548: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -22562,14 +22559,14 @@
+ 
+ fi
+ 
+-echo "$as_me:22565: checking for isascii" >&5
++echo "$as_me:22562: 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 22572 "configure"
++#line 22569 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22581,16 +22578,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22584: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22581: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22587: \$? = $ac_status" >&5
++  echo "$as_me:22584: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22590: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22587: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22593: \$? = $ac_status" >&5
++  echo "$as_me:22590: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -22601,7 +22598,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22604: result: $cf_cv_have_isascii" >&5
++echo "$as_me:22601: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -22609,10 +22606,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:22612: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:22609: 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 22615 "configure"
++#line 22612 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22626,16 +22623,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22629: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22626: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22632: \$? = $ac_status" >&5
++  echo "$as_me:22629: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22635: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22632: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22638: \$? = $ac_status" >&5
++  echo "$as_me:22635: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=no
+ else
+@@ -22643,7 +22640,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22646 "configure"
++#line 22643 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22658,16 +22655,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22661: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22658: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22664: \$? = $ac_status" >&5
++  echo "$as_me:22661: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22667: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22664: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22670: \$? = $ac_status" >&5
++  echo "$as_me:22667: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=yes
+ 
+@@ -22683,11 +22680,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:22686: result: $sigact_bad" >&5
++echo "$as_me:22683: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:22690: checking if nanosleep really works" >&5
++echo "$as_me:22687: 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
+@@ -22697,7 +22694,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22700 "configure"
++#line 22697 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22723,15 +22720,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22726: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22723: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22729: \$? = $ac_status" >&5
++  echo "$as_me:22726: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22731: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22728: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22734: \$? = $ac_status" >&5
++  echo "$as_me:22731: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -22743,7 +22740,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22746: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:22743: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -22760,23 +22757,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22763: checking for $ac_header" >&5
++echo "$as_me:22760: 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 22769 "configure"
++#line 22766 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22773: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22770: \"$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:22779: \$? = $ac_status" >&5
++  echo "$as_me:22776: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22795,7 +22792,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22798: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22795: 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:22812: 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 22818 "configure"
++#line 22815 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22827,16 +22824,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22830: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22827: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22833: \$? = $ac_status" >&5
++  echo "$as_me:22830: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22836: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22833: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22839: \$? = $ac_status" >&5
++  echo "$as_me:22836: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=no
+ else
+@@ -22844,7 +22841,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22847 "configure"
++#line 22844 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22858,16 +22855,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22861: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22858: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22864: \$? = $ac_status" >&5
++  echo "$as_me:22861: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22867: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22864: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22870: \$? = $ac_status" >&5
++  echo "$as_me:22867: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=unknown
+ else
+@@ -22883,19 +22880,19 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:22886: result: $termios_bad" >&5
++	echo "$as_me:22883: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:22891: checking for tcgetattr" >&5
++echo "$as_me:22888: 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 22898 "configure"
++#line 22895 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22923,16 +22920,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22926: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22923: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22929: \$? = $ac_status" >&5
++  echo "$as_me:22926: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22932: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22929: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22935: \$? = $ac_status" >&5
++  echo "$as_me:22932: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -22942,21 +22939,21 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22945: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:22942: 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:22952: checking for vsscanf function or workaround" >&5
++echo "$as_me:22949: 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 22959 "configure"
++#line 22956 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22982,16 +22979,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22985: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22982: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22988: \$? = $ac_status" >&5
++  echo "$as_me:22985: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22991: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22988: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22994: \$? = $ac_status" >&5
++  echo "$as_me:22991: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -22999,7 +22996,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23002 "configure"
++#line 22999 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23021,16 +23018,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23024: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23021: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23027: \$? = $ac_status" >&5
++  echo "$as_me:23024: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23030: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23027: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23033: \$? = $ac_status" >&5
++  echo "$as_me:23030: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -23038,7 +23035,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23041 "configure"
++#line 23038 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23060,16 +23057,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23063: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23060: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23066: \$? = $ac_status" >&5
++  echo "$as_me:23063: \$? = $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:23066: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23072: \$? = $ac_status" >&5
++  echo "$as_me:23069: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -23084,7 +23081,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23087: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:23084: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case "$cf_cv_func_vsscanf" in
+@@ -23110,23 +23107,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:23113: checking for $ac_header" >&5
++echo "$as_me:23110: 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 23119 "configure"
++#line 23116 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23123: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23120: \"$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:23129: \$? = $ac_status" >&5
++  echo "$as_me:23126: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23145,7 +23142,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23148: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23145: 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:23155: 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
+@@ -23166,7 +23163,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23169 "configure"
++#line 23166 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23201,15 +23198,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23204: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23201: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23207: \$? = $ac_status" >&5
++  echo "$as_me:23204: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23209: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23206: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23212: \$? = $ac_status" >&5
++  echo "$as_me:23209: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -23224,16 +23221,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:23227: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:23224: 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:23230: checking for mkstemp" >&5
++	echo "$as_me:23227: 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 23236 "configure"
++#line 23233 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23264,16 +23261,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23267: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23264: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23270: \$? = $ac_status" >&5
++  echo "$as_me:23267: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23273: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23270: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23276: \$? = $ac_status" >&5
++  echo "$as_me:23273: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -23283,7 +23280,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23286: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:23283: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -23304,21 +23301,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:23307: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:23304: 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:23310: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:23307: 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:23316: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:23313: 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 23321 "configure"
++#line 23318 "configure"
+ #include "confdefs.h"
+ #include 
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -23335,15 +23332,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23338: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23335: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23341: \$? = $ac_status" >&5
++  echo "$as_me:23338: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23343: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23340: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23346: \$? = $ac_status" >&5
++  echo "$as_me:23343: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -23356,7 +23353,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:23359: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:23356: 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
+ 
+@@ -23367,13 +23364,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:23370: checking for intptr_t" >&5
++echo "$as_me:23367: 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 23376 "configure"
++#line 23373 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23388,16 +23385,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23391: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23388: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23394: \$? = $ac_status" >&5
++  echo "$as_me:23391: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23397: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23394: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23400: \$? = $ac_status" >&5
++  echo "$as_me:23397: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -23407,7 +23404,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23410: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:23407: 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
+   :
+@@ -23419,13 +23416,13 @@
+ 
+ fi
+ 
+-echo "$as_me:23422: checking for ssize_t" >&5
++echo "$as_me:23419: 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 23428 "configure"
++#line 23425 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23440,16 +23437,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23443: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23440: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23446: \$? = $ac_status" >&5
++  echo "$as_me:23443: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23449: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23446: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23452: \$? = $ac_status" >&5
++  echo "$as_me:23449: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -23459,7 +23456,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23462: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:23459: 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
+   :
+@@ -23471,14 +23468,14 @@
+ 
+ fi
+ 
+-echo "$as_me:23474: checking for type sigaction_t" >&5
++echo "$as_me:23471: 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 23481 "configure"
++#line 23478 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23491,16 +23488,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23494: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23491: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23497: \$? = $ac_status" >&5
++  echo "$as_me:23494: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23500: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23497: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23503: \$? = $ac_status" >&5
++  echo "$as_me:23500: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -23511,14 +23508,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:23514: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:23511: 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:23521: checking declaration of size-change" >&5
++echo "$as_me:23518: 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
+@@ -23539,7 +23536,7 @@
+ 
+ 	fi
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23542 "configure"
++#line 23539 "configure"
+ #include "confdefs.h"
+ #include 
+ #ifdef HAVE_TERMIOS_H
+@@ -23589,16 +23586,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23592: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23589: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23595: \$? = $ac_status" >&5
++  echo "$as_me:23592: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23598: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23595: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23601: \$? = $ac_status" >&5
++  echo "$as_me:23598: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -23617,7 +23614,7 @@
+ done
+ 
+ fi
+-echo "$as_me:23620: result: $cf_cv_sizechange" >&5
++echo "$as_me:23617: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -23635,13 +23632,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:23638: checking for memmove" >&5
++echo "$as_me:23635: 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 23644 "configure"
++#line 23641 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23672,16 +23669,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23675: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23672: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23678: \$? = $ac_status" >&5
++  echo "$as_me:23675: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23681: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23678: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23684: \$? = $ac_status" >&5
++  echo "$as_me:23681: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -23691,19 +23688,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23694: result: $ac_cv_func_memmove" >&5
++echo "$as_me:23691: 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:23700: checking for bcopy" >&5
++echo "$as_me:23697: 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 23706 "configure"
++#line 23703 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23734,16 +23731,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23737: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23734: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23740: \$? = $ac_status" >&5
++  echo "$as_me:23737: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23743: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23740: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23746: \$? = $ac_status" >&5
++  echo "$as_me:23743: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -23753,11 +23750,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23756: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:23753: 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:23760: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:23757: 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
+@@ -23767,7 +23764,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23770 "configure"
++#line 23767 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23783,15 +23780,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23786: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23783: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23789: \$? = $ac_status" >&5
++  echo "$as_me:23786: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23791: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23788: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23794: \$? = $ac_status" >&5
++  echo "$as_me:23791: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -23804,7 +23801,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:23807: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:23804: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -23831,13 +23828,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23834: checking for $ac_func" >&5
++echo "$as_me:23831: 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 23840 "configure"
++#line 23837 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23868,16 +23865,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23871: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23868: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23874: \$? = $ac_status" >&5
++  echo "$as_me:23871: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23877: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23874: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23880: \$? = $ac_status" >&5
++  echo "$as_me:23877: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23887,7 +23884,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23890: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23887: 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:23897: 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
+@@ -23907,7 +23904,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23910 "configure"
++#line 23907 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23960,15 +23957,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23963: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23960: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23966: \$? = $ac_status" >&5
++  echo "$as_me:23963: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23968: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23965: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23971: \$? = $ac_status" >&5
++  echo "$as_me:23968: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -23980,21 +23977,21 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23983: result: $cf_cv_working_poll" >&5
++echo "$as_me:23980: 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:23990: checking if MB_LEN_MAX is usable" >&5
++echo "$as_me:23987: checking if MB_LEN_MAX is usable" >&5
+ echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
+ if test "${cf_cv_mb_len_max+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23997 "configure"
++#line 23994 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24014,16 +24011,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24017: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24014: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24020: \$? = $ac_status" >&5
++  echo "$as_me:24017: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24023: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24020: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24026: \$? = $ac_status" >&5
++  echo "$as_me:24023: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mb_len_max=yes
+ else
+@@ -24033,7 +24030,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24036: result: $cf_cv_mb_len_max" >&5
++echo "$as_me:24033: result: $cf_cv_mb_len_max" >&5
+ echo "${ECHO_T}$cf_cv_mb_len_max" >&6
+ if test "$cf_cv_mb_len_max" = yes
+ then
+@@ -24043,18 +24040,18 @@
+ EOF
+ 
+ else
+-	{ echo "$as_me:24046: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
++	{ echo "$as_me:24043: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+ echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
+ fi
+ 
+-echo "$as_me:24050: checking for va_copy" >&5
++echo "$as_me:24047: 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 24057 "configure"
++#line 24054 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24071,16 +24068,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24074: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24071: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24077: \$? = $ac_status" >&5
++  echo "$as_me:24074: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24080: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24077: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24083: \$? = $ac_status" >&5
++  echo "$as_me:24080: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -24090,7 +24087,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24093: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:24090: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -24102,14 +24099,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:24105: checking for __va_copy" >&5
++echo "$as_me:24102: 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 24112 "configure"
++#line 24109 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24126,16 +24123,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24129: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24126: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24132: \$? = $ac_status" >&5
++  echo "$as_me:24129: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24135: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24132: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24138: \$? = $ac_status" >&5
++  echo "$as_me:24135: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -24145,7 +24142,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24148: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:24145: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -24157,14 +24154,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:24160: checking for __builtin_va_copy" >&5
++echo "$as_me:24157: 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 24167 "configure"
++#line 24164 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24181,16 +24178,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24184: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24181: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24187: \$? = $ac_status" >&5
++  echo "$as_me:24184: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24190: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24187: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24193: \$? = $ac_status" >&5
++  echo "$as_me:24190: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -24200,7 +24197,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24203: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:24200: 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 &&
+@@ -24218,14 +24215,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:24221: checking if we can simply copy va_list" >&5
++	echo "$as_me:24218: 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 24228 "configure"
++#line 24225 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24242,16 +24239,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24245: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24242: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24248: \$? = $ac_status" >&5
++  echo "$as_me:24245: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24251: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24248: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24254: \$? = $ac_status" >&5
++  echo "$as_me:24251: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -24261,19 +24258,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24264: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:24261: 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:24269: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:24266: 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 24276 "configure"
++#line 24273 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24290,16 +24287,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24293: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24290: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24296: \$? = $ac_status" >&5
++  echo "$as_me:24293: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24299: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24296: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24302: \$? = $ac_status" >&5
++  echo "$as_me:24299: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -24309,7 +24306,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24312: result: $cf_cv_array_va_list" >&5
++echo "$as_me:24309: 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
+@@ -24320,13 +24317,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:24323: checking for pid_t" >&5
++echo "$as_me:24320: 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 24329 "configure"
++#line 24326 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24341,16 +24338,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24344: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24341: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24347: \$? = $ac_status" >&5
++  echo "$as_me:24344: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24350: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24347: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24353: \$? = $ac_status" >&5
++  echo "$as_me:24350: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -24360,7 +24357,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24363: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:24360: 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
+   :
+@@ -24375,23 +24372,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:24378: checking for $ac_header" >&5
++echo "$as_me:24375: 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 24384 "configure"
++#line 24381 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:24388: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:24385: \"$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:24394: \$? = $ac_status" >&5
++  echo "$as_me:24391: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -24410,7 +24407,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24413: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:24410: 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:24423: 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 24432 "configure"
++#line 24429 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -24460,16 +24457,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24463: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24460: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24466: \$? = $ac_status" >&5
++  echo "$as_me:24463: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24469: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24466: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24472: \$? = $ac_status" >&5
++  echo "$as_me:24469: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -24479,7 +24476,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24482: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:24479: 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:24491: 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
+@@ -24514,15 +24511,15 @@
+       }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24517: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24514: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24520: \$? = $ac_status" >&5
++  echo "$as_me:24517: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24522: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24519: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24525: \$? = $ac_status" >&5
++  echo "$as_me:24522: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -24534,7 +24531,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24537: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:24534: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -24548,12 +24545,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:24551: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24548: 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:24556: checking for working vfork" >&5
++  echo "$as_me:24553: 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
+@@ -24562,7 +24559,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24565 "configure"
++#line 24562 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include 
+@@ -24655,15 +24652,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24658: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24655: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24661: \$? = $ac_status" >&5
++  echo "$as_me:24658: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24663: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24660: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24666: \$? = $ac_status" >&5
++  echo "$as_me:24663: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -24675,13 +24672,13 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24678: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:24675: 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:24684: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24681: 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
+ 
+@@ -24706,7 +24703,7 @@
+ 
+ fi
+ 
+-echo "$as_me:24709: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:24706: 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
+@@ -24716,7 +24713,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24719 "configure"
++#line 24716 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24751,15 +24748,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24754: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24751: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24757: \$? = $ac_status" >&5
++  echo "$as_me:24754: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24759: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24756: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24762: \$? = $ac_status" >&5
++  echo "$as_me:24759: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fopen_bin_r=yes
+ else
+@@ -24772,7 +24769,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:24775: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:24772: 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
+@@ -24781,7 +24778,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:24784: checking for openpty in -lutil" >&5
++echo "$as_me:24781: 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
+@@ -24789,7 +24786,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24792 "configure"
++#line 24789 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -24808,16 +24805,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24811: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24808: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24814: \$? = $ac_status" >&5
++  echo "$as_me:24811: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24817: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24814: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24820: \$? = $ac_status" >&5
++  echo "$as_me:24817: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -24828,7 +24825,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:24831: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:24828: 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
+@@ -24836,7 +24833,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:24839: checking for openpty header" >&5
++echo "$as_me:24836: 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
+@@ -24863,7 +24860,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24866 "configure"
++#line 24863 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -24881,16 +24878,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24884: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24881: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24887: \$? = $ac_status" >&5
++  echo "$as_me:24884: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24890: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24887: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24893: \$? = $ac_status" >&5
++  echo "$as_me:24890: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -24908,7 +24905,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:24911: result: $cf_cv_func_openpty" >&5
++echo "$as_me:24908: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -24981,7 +24978,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24984 "configure"
++#line 24981 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -24993,16 +24990,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24996: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24993: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24999: \$? = $ac_status" >&5
++  echo "$as_me:24996: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25002: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24999: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25005: \$? = $ac_status" >&5
++  echo "$as_me:25002: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25019,7 +25016,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}:25022: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25019: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25055,7 +25052,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}:25058: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25055: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25066,7 +25063,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:25069: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:25066: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -25138,7 +25135,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25141 "configure"
++#line 25138 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -25150,16 +25147,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25153: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25150: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25156: \$? = $ac_status" >&5
++  echo "$as_me:25153: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25159: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25156: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25162: \$? = $ac_status" >&5
++  echo "$as_me:25159: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25176,7 +25173,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}:25179: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25176: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25256,7 +25253,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}:25259: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25256: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25273,23 +25270,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:25276: checking for db.h" >&5
++echo "$as_me:25273: 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 25282 "configure"
++#line 25279 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:25286: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25283: \"$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:25289: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -25308,11 +25305,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25311: result: $ac_cv_header_db_h" >&5
++echo "$as_me:25308: 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:25315: checking for version of db" >&5
++echo "$as_me:25312: 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
+@@ -25323,10 +25320,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:25326: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:25323: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25329 "configure"
++#line 25326 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25356,16 +25353,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25359: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25356: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25362: \$? = $ac_status" >&5
++  echo "$as_me:25359: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25365: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25362: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25368: \$? = $ac_status" >&5
++  echo "$as_me:25365: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -25379,16 +25376,16 @@
+ done
+ 
+ fi
+-echo "$as_me:25382: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:25379: 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:25386: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:25383: 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:25391: checking for db libraries" >&5
++echo "$as_me:25388: 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
+@@ -25418,10 +25415,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:25421: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:25418: testing checking for library $cf_db_libs ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25424 "configure"
++#line 25421 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25476,16 +25473,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25479: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25476: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25482: \$? = $ac_status" >&5
++  echo "$as_me:25479: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25485: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25482: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25488: \$? = $ac_status" >&5
++  echo "$as_me:25485: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -25505,11 +25502,11 @@
+ done
+ 
+ fi
+-echo "$as_me:25508: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:25505: 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:25512: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:25509: 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
+@@ -25535,7 +25532,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:25538: error: Cannot find db.h" >&5
++	{ { echo "$as_me:25535: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -25550,7 +25547,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:25553: checking if we should include stdbool.h" >&5
++echo "$as_me:25550: 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 +25555,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25561 "configure"
++#line 25558 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -25570,23 +25567,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25573: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25570: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25576: \$? = $ac_status" >&5
++  echo "$as_me:25573: \$? = $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:25576: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25582: \$? = $ac_status" >&5
++  echo "$as_me:25579: \$? = $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 25586 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -25602,16 +25599,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25605: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25602: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25608: \$? = $ac_status" >&5
++  echo "$as_me:25605: \$? = $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:25608: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25614: \$? = $ac_status" >&5
++  echo "$as_me:25611: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -25625,13 +25622,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:25628: result: yes" >&5
++then	echo "$as_me:25625: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25630: result: no" >&5
++else	echo "$as_me:25627: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:25634: checking for builtin bool type" >&5
++echo "$as_me:25631: 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
+@@ -25639,7 +25636,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25642 "configure"
++#line 25639 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25654,16 +25651,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25657: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25654: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25660: \$? = $ac_status" >&5
++  echo "$as_me:25657: \$? = $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:25660: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25666: \$? = $ac_status" >&5
++  echo "$as_me:25663: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -25676,9 +25673,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:25679: result: yes" >&5
++then	echo "$as_me:25676: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25681: result: no" >&5
++else	echo "$as_me:25678: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -25695,10 +25692,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:25698: checking if we already have C++ library" >&5
++	echo "$as_me:25695: 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 25701 "configure"
++#line 25698 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -25712,16 +25709,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25715: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25712: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25718: \$? = $ac_status" >&5
++  echo "$as_me:25715: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25721: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25718: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25724: \$? = $ac_status" >&5
++  echo "$as_me:25721: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -25730,7 +25727,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-	echo "$as_me:25733: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:25730: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -25749,7 +25746,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:25752: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:25749: 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
+@@ -25775,7 +25772,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25778 "configure"
++#line 25775 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -25789,16 +25786,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25792: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25789: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25795: \$? = $ac_status" >&5
++  echo "$as_me:25792: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25798: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25795: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25801: \$? = $ac_status" >&5
++  echo "$as_me:25798: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -25810,7 +25807,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:25813: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:25810: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -25832,7 +25829,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:25835: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:25832: 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
+@@ -25847,15 +25844,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:25850: \"$ac_try\"") >&5
++if { (eval echo "$as_me:25847: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25853: \$? = $ac_status" >&5
++  echo "$as_me:25850: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25855: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:25852: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25858: \$? = $ac_status" >&5
++  echo "$as_me:25855: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -25866,10 +25863,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+-  echo "$as_me:25869: result: yes" >&5
++  echo "$as_me:25866: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:25872: result: no" >&5
++  echo "$as_me:25869: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -25889,7 +25886,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:25892: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:25889: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -25910,7 +25907,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25913 "configure"
++#line 25910 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -25924,16 +25921,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25927: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25924: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25930: \$? = $ac_status" >&5
++  echo "$as_me:25927: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25933: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25930: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25936: \$? = $ac_status" >&5
++  echo "$as_me:25933: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -25970,7 +25967,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25973 "configure"
++#line 25970 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25984,16 +25981,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25987: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25984: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25990: \$? = $ac_status" >&5
++  echo "$as_me:25987: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25993: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25990: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25996: \$? = $ac_status" >&5
++  echo "$as_me:25993: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -26026,7 +26023,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	LIBS="$cf_save"
+-	echo "$as_me:26029: result: $cf_cxx_library" >&5
++	echo "$as_me:26026: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -26042,7 +26039,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:26045: checking how to run the C++ preprocessor" >&5
++echo "$as_me:26042: 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
+@@ -26059,18 +26056,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 26062 "configure"
++#line 26059 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26067: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26064: \"$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:26073: \$? = $ac_status" >&5
++  echo "$as_me:26070: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26093,17 +26090,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26096 "configure"
++#line 26093 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26100: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26097: \"$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:26106: \$? = $ac_status" >&5
++  echo "$as_me:26103: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26140,7 +26137,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:26143: result: $CXXCPP" >&5
++echo "$as_me:26140: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -26150,18 +26147,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 26153 "configure"
++#line 26150 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26158: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26155: \"$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:26164: \$? = $ac_status" >&5
++  echo "$as_me:26161: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26184,17 +26181,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26187 "configure"
++#line 26184 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26191: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26188: \"$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:26197: \$? = $ac_status" >&5
++  echo "$as_me:26194: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26222,7 +26219,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:26225: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:26222: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -26237,23 +26234,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:26240: checking for $ac_header" >&5
++echo "$as_me:26237: 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 26246 "configure"
++#line 26243 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26250: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26247: \"$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:26256: \$? = $ac_status" >&5
++  echo "$as_me:26253: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26272,7 +26269,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26275: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26272: 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:26285: 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 26294 "configure"
++#line 26291 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26298: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26295: \"$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:26304: \$? = $ac_status" >&5
++  echo "$as_me:26301: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26320,7 +26317,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26323: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26320: 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:26331: 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 26337 "configure"
++#line 26334 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26351,16 +26348,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26354: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26351: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26357: \$? = $ac_status" >&5
++  echo "$as_me:26354: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26360: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26357: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26363: \$? = $ac_status" >&5
++  echo "$as_me:26360: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -26369,7 +26366,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:26372: result: $cf_iostream_namespace" >&5
++	echo "$as_me:26369: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -26380,7 +26377,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:26383: checking if we should include stdbool.h" >&5
++echo "$as_me:26380: 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
+@@ -26388,7 +26385,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26391 "configure"
++#line 26388 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -26400,23 +26397,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26403: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26400: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26406: \$? = $ac_status" >&5
++  echo "$as_me:26403: \$? = $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:26406: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26412: \$? = $ac_status" >&5
++  echo "$as_me:26409: \$? = $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 26419 "configure"
++#line 26416 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -26432,16 +26429,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26435: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26432: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26438: \$? = $ac_status" >&5
++  echo "$as_me:26435: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26441: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26438: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26444: \$? = $ac_status" >&5
++  echo "$as_me:26441: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -26455,13 +26452,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:26458: result: yes" >&5
++then	echo "$as_me:26455: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:26460: result: no" >&5
++else	echo "$as_me:26457: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:26464: checking for builtin bool type" >&5
++echo "$as_me:26461: 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
+@@ -26469,7 +26466,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26472 "configure"
++#line 26469 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26484,16 +26481,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26487: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26484: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26490: \$? = $ac_status" >&5
++  echo "$as_me:26487: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26493: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26490: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26496: \$? = $ac_status" >&5
++  echo "$as_me:26493: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -26506,19 +26503,19 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:26509: result: yes" >&5
++then	echo "$as_me:26506: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:26511: result: no" >&5
++else	echo "$as_me:26508: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:26515: checking for bool" >&5
++echo "$as_me:26512: 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 26521 "configure"
++#line 26518 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26553,16 +26550,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26556: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26553: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26559: \$? = $ac_status" >&5
++  echo "$as_me:26556: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26562: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26559: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26565: \$? = $ac_status" >&5
++  echo "$as_me:26562: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -26572,10 +26569,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26575: result: $ac_cv_type_bool" >&5
++echo "$as_me:26572: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:26578: checking size of bool" >&5
++echo "$as_me:26575: 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
+@@ -26584,7 +26581,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26587 "configure"
++#line 26584 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26616,21 +26613,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26619: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26616: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26622: \$? = $ac_status" >&5
++  echo "$as_me:26619: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26625: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26622: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26628: \$? = $ac_status" >&5
++  echo "$as_me:26625: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26633 "configure"
++#line 26630 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26662,16 +26659,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26665: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26662: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26668: \$? = $ac_status" >&5
++  echo "$as_me:26665: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26671: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26668: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26674: \$? = $ac_status" >&5
++  echo "$as_me:26671: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -26687,7 +26684,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26690 "configure"
++#line 26687 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26719,16 +26716,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26722: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26719: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26725: \$? = $ac_status" >&5
++  echo "$as_me:26722: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26728: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26725: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26731: \$? = $ac_status" >&5
++  echo "$as_me:26728: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -26744,7 +26741,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 26747 "configure"
++#line 26744 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26776,16 +26773,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26779: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26776: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26782: \$? = $ac_status" >&5
++  echo "$as_me:26779: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26785: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26782: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26788: \$? = $ac_status" >&5
++  echo "$as_me:26785: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -26798,12 +26795,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:26801: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:26798: 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 26806 "configure"
++#line 26803 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26839,15 +26836,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26842: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26839: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26845: \$? = $ac_status" >&5
++  echo "$as_me:26842: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26847: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26844: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26850: \$? = $ac_status" >&5
++  echo "$as_me:26847: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -26863,13 +26860,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:26866: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:26863: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:26869: 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
+@@ -26888,7 +26885,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26891 "configure"
++#line 26888 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26929,15 +26926,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26932: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26929: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26935: \$? = $ac_status" >&5
++  echo "$as_me:26932: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26937: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26934: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26940: \$? = $ac_status" >&5
++  echo "$as_me:26937: \$? = $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
+@@ -26954,19 +26951,19 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:26957: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:26954: 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:26964: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:26961: 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:26969: checking for special defines needed for etip.h" >&5
++echo "$as_me:26966: 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"
+@@ -26984,7 +26981,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 26987 "configure"
++#line 26984 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26998,16 +26995,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27001: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26998: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27004: \$? = $ac_status" >&5
++  echo "$as_me:27001: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27007: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27004: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27010: \$? = $ac_status" >&5
++  echo "$as_me:27007: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:27028: result: ${cf_result:-(none)}" >&5
+ echo "${ECHO_T}${cf_result:-(none)}" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27036: checking if $CXX accepts override keyword" >&5
++echo "$as_me:27033: checking if $CXX accepts override keyword" >&5
+ echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
+ if test "${cf_cv_cpp_override+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27050,7 +27047,7 @@
+   cf_cv_cpp_override=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27053 "configure"
++#line 27050 "configure"
+ #include "confdefs.h"
+ 
+ class base
+@@ -27069,15 +27066,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27072: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27069: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27075: \$? = $ac_status" >&5
++  echo "$as_me:27072: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27077: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27074: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27080: \$? = $ac_status" >&5
++  echo "$as_me:27077: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_override=yes
+ else
+@@ -27096,7 +27093,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27099: result: $cf_cv_cpp_override" >&5
++echo "$as_me:27096: result: $cf_cv_cpp_override" >&5
+ echo "${ECHO_T}$cf_cv_cpp_override" >&6
+ fi
+ test "$cf_cv_cpp_override" = yes &&
+@@ -27105,7 +27102,7 @@
+ EOF
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27108: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:27105: 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
+@@ -27122,7 +27119,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27125 "configure"
++#line 27122 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -27141,15 +27138,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27144: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27141: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27147: \$? = $ac_status" >&5
++  echo "$as_me:27144: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27149: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27146: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27152: \$? = $ac_status" >&5
++  echo "$as_me:27149: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -27168,7 +27165,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27171: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:27168: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -27178,7 +27175,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:27181: checking if $CXX accepts static_cast" >&5
++echo "$as_me:27178: 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
+@@ -27192,7 +27189,7 @@
+ ac_main_return="return"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27195 "configure"
++#line 27192 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -27236,16 +27233,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27239: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27236: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27242: \$? = $ac_status" >&5
++  echo "$as_me:27239: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27245: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27242: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27248: \$? = $ac_status" >&5
++  echo "$as_me:27245: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -27263,7 +27260,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27266: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:27263: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -27312,13 +27309,13 @@
+ 	else
+ 		if test "$cf_cv_header_stdbool_h" = 1 ; then
+ 
+-echo "$as_me:27315: checking for bool" >&5
++echo "$as_me:27312: 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 27321 "configure"
++#line 27318 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27353,16 +27350,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27356: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27353: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27359: \$? = $ac_status" >&5
++  echo "$as_me:27356: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27362: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27359: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27365: \$? = $ac_status" >&5
++  echo "$as_me:27362: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -27372,10 +27369,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27375: result: $ac_cv_type_bool" >&5
++echo "$as_me:27372: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:27378: checking size of bool" >&5
++echo "$as_me:27375: 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
+@@ -27384,7 +27381,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27387 "configure"
++#line 27384 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27416,21 +27413,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27419: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27416: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27422: \$? = $ac_status" >&5
++  echo "$as_me:27419: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27425: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27422: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27428: \$? = $ac_status" >&5
++  echo "$as_me:27425: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27433 "configure"
++#line 27430 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27462,16 +27459,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27465: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27462: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27468: \$? = $ac_status" >&5
++  echo "$as_me:27465: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27471: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27468: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27474: \$? = $ac_status" >&5
++  echo "$as_me:27471: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -27487,7 +27484,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27490 "configure"
++#line 27487 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27519,16 +27516,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27522: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27519: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27525: \$? = $ac_status" >&5
++  echo "$as_me:27522: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27528: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27525: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27531: \$? = $ac_status" >&5
++  echo "$as_me:27528: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27544,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 27547 "configure"
++#line 27544 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27576,16 +27573,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27579: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27576: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27582: \$? = $ac_status" >&5
++  echo "$as_me:27579: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27585: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27582: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27588: \$? = $ac_status" >&5
++  echo "$as_me:27585: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27598,12 +27595,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27601: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27598: 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 27606 "configure"
++#line 27603 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27639,15 +27636,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27642: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27639: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27645: \$? = $ac_status" >&5
++  echo "$as_me:27642: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27647: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27644: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27650: \$? = $ac_status" >&5
++  echo "$as_me:27647: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27663,13 +27660,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27666: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27663: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27669: 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
+@@ -27688,7 +27685,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27691 "configure"
++#line 27688 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27729,15 +27726,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27732: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27729: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27735: \$? = $ac_status" >&5
++  echo "$as_me:27732: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27737: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27734: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27740: \$? = $ac_status" >&5
++  echo "$as_me:27737: \$? = $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
+@@ -27754,26 +27751,26 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:27757: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:27754: 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:27764: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:27761: 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:27770: checking for fallback type of bool" >&5
++			echo "$as_me:27767: 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:27776: result: $cf_cv_type_of_bool" >&5
++			echo "$as_me:27773: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 		fi
+ 	fi
+@@ -27802,7 +27799,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:27805: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:27802: 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
+@@ -27813,7 +27810,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:27816: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:27813: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -27830,10 +27827,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:27833: result: $ADAFLAGS" >&5
++	echo "$as_me:27830: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:27836: checking if GNATPREP supports -T option" >&5
++echo "$as_me:27833: 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
+@@ -27843,11 +27840,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:27846: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:27843: 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:27850: checking if GNAT supports generics" >&5
++echo "$as_me:27847: 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])
+@@ -27857,7 +27854,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:27860: result: $cf_gnat_generics" >&5
++echo "$as_me:27857: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -27869,7 +27866,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:27872: checking if GNAT supports SIGINT" >&5
++echo "$as_me:27869: 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
+@@ -27917,7 +27914,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:27920: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:27917: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -27930,7 +27927,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:27933: checking if GNAT supports project files" >&5
++echo "$as_me:27930: 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]*)
+@@ -27993,15 +27990,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:27996: result: $cf_gnat_projects" >&5
++echo "$as_me:27993: 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:28002: checking if GNAT supports libraries" >&5
++	echo "$as_me:27999: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:28004: result: $cf_gnat_libraries" >&5
++	echo "$as_me:28001: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -28021,7 +28018,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:28024: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:28021: 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
+@@ -28033,7 +28030,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:28036: checking for Ada95 compiler" >&5
++echo "$as_me:28033: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -28044,12 +28041,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:28047: result: $cf_ada_compiler" >&5
++echo "$as_me:28044: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:28052: checking for Ada95 include directory" >&5
++echo "$as_me:28049: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -28066,26 +28063,24 @@
+ 	cf_path_syntax="$ac_default_prefix"
+ fi
+ 
+-case ".$withval" in
+-(.\$\(*\)*|.\'*\'*)
++case "x$withval" in
++(x\$\(*\)*|x\'*\'*)
+ 	;;
+-(..|./*|.\\*)
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+-	;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ 	eval withval="$withval"
+-	case ".$withval" in
+-	(.NONE/*)
++	case "x$withval" in
++	(xNONE/*)
+ 		withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 		;;
+ 	esac
+ 	;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28088: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28083: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28094,10 +28089,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:28097: result: $ADA_INCLUDE" >&5
++echo "$as_me:28092: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:28100: checking for Ada95 object directory" >&5
++echo "$as_me:28095: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -28114,26 +28109,24 @@
+ 	cf_path_syntax="$ac_default_prefix"
+ fi
+ 
+-case ".$withval" in
+-(.\$\(*\)*|.\'*\'*)
+-	;;
+-(..|./*|.\\*)
++case "x$withval" in
++(x\$\(*\)*|x\'*\'*)
+ 	;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ 	eval withval="$withval"
+-	case ".$withval" in
+-	(.NONE/*)
++	case "x$withval" in
++	(xNONE/*)
+ 		withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 		;;
+ 	esac
+ 	;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28136: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28129: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28142,10 +28135,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:28145: result: $ADA_OBJECTS" >&5
++echo "$as_me:28138: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:28148: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:28141: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -28166,11 +28159,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:28169: result: $with_ada_sharedlib" >&5
++echo "$as_me:28162: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+-	{ echo "$as_me:28173: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++	{ echo "$as_me:28166: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+ 
+@@ -28188,7 +28181,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:28191: checking for Ada95 curses library name" >&5
++echo "$as_me:28184: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -28204,7 +28197,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28207: result: $ADA_LIBNAME" >&5
++echo "$as_me:28200: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -28215,13 +28208,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:28218: checking for wchar_t" >&5
++	echo "$as_me:28211: 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 28224 "configure"
++#line 28217 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28236,16 +28229,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28239: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28232: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28242: \$? = $ac_status" >&5
++  echo "$as_me:28235: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28245: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28238: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28248: \$? = $ac_status" >&5
++  echo "$as_me:28241: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -28255,10 +28248,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:28258: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:28251: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:28261: checking size of wchar_t" >&5
++echo "$as_me:28254: 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
+@@ -28267,7 +28260,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28270 "configure"
++#line 28263 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28279,21 +28272,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28282: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28275: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28285: \$? = $ac_status" >&5
++  echo "$as_me:28278: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28288: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28281: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28291: \$? = $ac_status" >&5
++  echo "$as_me:28284: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28296 "configure"
++#line 28289 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28305,16 +28298,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28308: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28301: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28311: \$? = $ac_status" >&5
++  echo "$as_me:28304: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28314: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28307: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28317: \$? = $ac_status" >&5
++  echo "$as_me:28310: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -28330,7 +28323,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28333 "configure"
++#line 28326 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28342,16 +28335,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28345: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28338: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28348: \$? = $ac_status" >&5
++  echo "$as_me:28341: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28351: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28344: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28354: \$? = $ac_status" >&5
++  echo "$as_me:28347: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -28367,7 +28360,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 28370 "configure"
++#line 28363 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28379,16 +28372,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28382: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28375: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28385: \$? = $ac_status" >&5
++  echo "$as_me:28378: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28388: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28381: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28391: \$? = $ac_status" >&5
++  echo "$as_me:28384: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -28401,12 +28394,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:28404: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:28397: 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 28409 "configure"
++#line 28402 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28422,15 +28415,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:28425: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28418: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28428: \$? = $ac_status" >&5
++  echo "$as_me:28421: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:28430: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28423: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28433: \$? = $ac_status" >&5
++  echo "$as_me:28426: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -28446,7 +28439,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:28449: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:28442: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&6
+ 
+-echo "${as_me:-configure}:28462: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:28455: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -28477,7 +28470,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:28480: checking for library subsets" >&5
++echo "$as_me:28473: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -28531,7 +28524,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:28534: result: $LIB_SUBSETS" >&5
++echo "$as_me:28527: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -28562,7 +28555,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:28565: checking default library suffix" >&5
++echo "$as_me:28558: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28573,10 +28566,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:28576: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:28569: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:28579: checking default library-dependency suffix" >&5
++echo "$as_me:28572: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -28659,10 +28652,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:28662: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28655: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:28665: checking default object directory" >&5
++echo "$as_me:28658: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28678,11 +28671,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:28681: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28674: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28685: checking c++ library-dependency suffix" >&5
++echo "$as_me:28678: 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++)
+@@ -28775,7 +28768,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:28778: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:28771: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -28951,19 +28944,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:28954: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:28947: 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:28963: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:28956: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28966: \$? = $ac_status" >&5
++  echo "$as_me:28959: \$? = $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
+@@ -28974,10 +28967,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28977 "configure"
++#line 28970 "configure"
+ #include "confdefs.h"
+ 
+-#line 28980 "configure"
++#line 28973 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -28992,16 +28985,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:28995: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28988: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28998: \$? = $ac_status" >&5
++  echo "$as_me:28991: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:29001: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28994: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:29004: \$? = $ac_status" >&5
++  echo "$as_me:28997: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -29024,7 +29017,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:29027: result: $cf_ldflags_static" >&5
++	echo "$as_me:29020: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test "$cf_ldflags_static" != yes
+@@ -29040,7 +29033,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29043: checking where we will install curses.h" >&5
++echo "$as_me:29036: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -29050,7 +29043,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:29053: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:29046: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -29058,7 +29051,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:29061: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:29054: 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
+@@ -29083,7 +29076,7 @@
+ 
+ # pkgsrc uses these
+ 
+-echo "$as_me:29086: checking for desired basename for form library" >&5
++echo "$as_me:29079: 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.
+@@ -29103,10 +29096,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29106: result: $FORM_NAME" >&5
++echo "$as_me:29099: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:29109: checking for desired basename for menu library" >&5
++echo "$as_me:29102: 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.
+@@ -29126,10 +29119,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29129: result: $MENU_NAME" >&5
++echo "$as_me:29122: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:29132: checking for desired basename for panel library" >&5
++echo "$as_me:29125: 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.
+@@ -29149,10 +29142,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29152: result: $PANEL_NAME" >&5
++echo "$as_me:29145: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:29155: checking for desired basename for cxx library" >&5
++echo "$as_me:29148: 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.
+@@ -29172,13 +29165,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29175: result: $CXX_NAME" >&5
++echo "$as_me:29168: 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:29181: checking for src modules" >&5
++echo "$as_me:29174: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -29237,7 +29230,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:29240: result: $cf_cv_src_modules" >&5
++echo "$as_me:29233: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -29398,7 +29391,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:29401: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:29394: 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//'`
+@@ -29409,7 +29402,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:29412: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
++echo "$as_me:29405: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -29425,17 +29418,17 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:29428: result: $PKG_CFLAGS" >&5
++echo "$as_me:29421: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ case "$cf_cv_system_name" in
+ (cygwin*|msys*|mingw32*|mingw64|os2*)
+-	GLOB_FULLPATH_ONLY='x/*|x[a-zA-Z]:[\\/]*'
+-	GLOB_FULLPATH_ARGS='x/*\ |x[a-zA-Z]:[\\/]*\ '
++	GLOB_FULLPATH_POSIX='/*'
++	GLOB_FULLPATH_OTHER='[a-zA-Z]:[\\/]*'
+ 	;;
+ (*)
+-	GLOB_FULLPATH_ONLY='x/*'
+-	GLOB_FULLPATH_ARGS='x/*\ '
++	GLOB_FULLPATH_POSIX='/*'
++	GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX
+ 	;;
+ esac
+ 
+@@ -29497,7 +29490,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
+ 
+-echo "${as_me:-configure}:29500: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
++echo "${as_me:-configure}:29493: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+ 
+ fi
+ 
+@@ -29524,7 +29517,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:29527: checking for linker search path" >&5
++echo "$as_me:29520: 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
+@@ -29572,7 +29565,7 @@
+ 			cf_pathlist="$cf_pathlist /lib /usr/lib"
+ 			;;
+ 		(*)
+-			{ echo "$as_me:29575: WARNING: problem with Solaris architecture" >&5
++			{ echo "$as_me:29568: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ 			;;
+ 		esac
+@@ -29613,7 +29606,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:29616: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29609: 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'`
+@@ -29699,7 +29692,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29702: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29695: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -29880,7 +29873,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:29883: error: ambiguous option: $1
++    { { echo "$as_me:29876: 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;}
+@@ -29899,7 +29892,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:29902: error: unrecognized option: $1
++  -*) { { echo "$as_me:29895: 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;}
+@@ -30029,7 +30022,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:30032: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:30025: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -30167,6 +30160,8 @@
+ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+ s,@INSTALL_DATA@,$INSTALL_DATA,;t t
++s,@GLOB_FULLPATH_POSIX@,$GLOB_FULLPATH_POSIX,;t t
++s,@GLOB_FULLPATH_OTHER@,$GLOB_FULLPATH_OTHER,;t t
+ s,@LINT@,$LINT,;t t
+ s,@LINT_OPTS@,$LINT_OPTS,;t t
+ s,@LINT_LIBS@,$LINT_LIBS,;t t
+@@ -30411,8 +30406,6 @@
+ s,@ADAHTML_DIR@,$ADAHTML_DIR,;t t
+ s,@LIBTOOL_OPTS_CXX@,$LIBTOOL_OPTS_CXX,;t t
+ s,@PKG_CFLAGS@,$PKG_CFLAGS,;t t
+-s,@GLOB_FULLPATH_ONLY@,$GLOB_FULLPATH_ONLY,;t t
+-s,@GLOB_FULLPATH_ARGS@,$GLOB_FULLPATH_ARGS,;t t
+ s,@MISC_INSTALL_DATA@,$MISC_INSTALL_DATA,;t t
+ s,@MISC_UNINSTALL_DATA@,$MISC_UNINSTALL_DATA,;t t
+ s,@MAKE_DATABASE@,$MAKE_DATABASE,;t t
+@@ -30553,7 +30546,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:30556: creating $ac_file" >&5
++    { echo "$as_me:30549: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -30571,7 +30564,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30574: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30567: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -30584,7 +30577,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30587: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30580: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30600,7 +30593,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:30603: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:30596: 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;}
+@@ -30609,7 +30602,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:30612: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:30605: 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;}
+@@ -30654,7 +30647,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:30657: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:30650: 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;}
+@@ -30665,7 +30658,7 @@
+     $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:30668: WARNING: Some variables may not be substituted:
++      { echo "$as_me:30661: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30714,7 +30707,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:30717: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:30710: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -30725,7 +30718,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30728: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30721: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -30738,7 +30731,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30741: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30734: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30796,7 +30789,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:30799: $ac_file is unchanged" >&5
++      { echo "$as_me:30792: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -31183,7 +31176,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}:31186: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:31179: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+@@ -31569,7 +31562,7 @@
+ if test "$WITH_CURSES_H" = yes; then
+ 	cat >>headers.sh <>headers.sh <userwin ? \
+-				 _nc_screen_of(menu->userwin) : CURRENT_SCREEN)
+-
+ /* Get the user defined (framing) window of the menu */
+ #define Get_Menu_UserWin(menu) ((menu)->userwin ? \
+     (menu)->userwin : CURRENT_SCREEN->_stdscr)
+Index: misc/Makefile.in
+Prereq:  1.80 
+--- ncurses-6.5-20240727+/misc/Makefile.in	2024-07-20 17:47:13.000000000 +0000
++++ ncurses-6.5-20240810/misc/Makefile.in	2024-08-04 14:49:08.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.80 2024/07/20 17:47:13 tom Exp $
++# $Id: Makefile.in,v 1.82 2024/08/04 14:49:08 tom Exp $
+ ##############################################################################
+ # Copyright 2018-2021,2024 Thomas E. Dickey                                  #
+ # Copyright 1998-2016,2017 Free Software Foundation, Inc.                    #
+@@ -75,6 +75,15 @@
+ 
+ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 
++BINDIR		= $(DESTDIR)$(bindir)
++DATADIR		= $(DESTDIR)$(datadir)
++
++@MAKE_DATABASE@INSTALL_PREFIX	= $(DESTDIR)$(prefix)
++@MAKE_DATABASE@LIBDIR		= $(DESTDIR)$(libdir)
++@MAKE_DATABASE@TICDIR		= $(DESTDIR)$(ticdir)
++@MAKE_DATABASE@TICFILE		= $(DESTDIR)$(ticfile)
++@MAKE_DATABASE@TABSETDIR	= $(DESTDIR)$(tabsetdir)
++
+ ################################################################################
+ 
+ @MAKE_PHONY@.PHONY :	all
+@@ -103,25 +112,19 @@
+ @MAKE_DATABASE@install :: @MISC_INSTALL_DATA@
+ 
+ @MAKE_DATABASE@install.data ::	terminfo.tmp \
+-@MAKE_DATABASE@		$(DESTDIR)$(libdir) \
+-@MAKE_DATABASE@		$(DESTDIR)$(datadir) \
+-@MAKE_DATABASE@		$(DESTDIR)$(tabsetdir)
+-@MAKE_DATABASE@	DESTDIR=${DESTDIR} \
+-@MAKE_DATABASE@	prefix=${prefix} \
+-@MAKE_DATABASE@	exec_prefix=${exec_prefix} \
+-@MAKE_DATABASE@	bindir=${bindir} \
+-@MAKE_DATABASE@	top_srcdir=${top_srcdir} \
+-@MAKE_DATABASE@	srcdir=${srcdir} \
+-@MAKE_DATABASE@	datadir=${datadir} \
+-@MAKE_DATABASE@	ticdir=${ticdir} \
+-@MAKE_DATABASE@	source=terminfo.tmp \
+-@MAKE_DATABASE@	cross_compiling=@cross_compiling@ \
++@MAKE_DATABASE@		$(LIBDIR) \
++@MAKE_DATABASE@		$(DATADIR) \
++@MAKE_DATABASE@		$(TABSETDIR)
++@MAKE_DATABASE@	INSTALL_PREFIX=${INSTALL_PREFIX} \
++@MAKE_DATABASE@	TICDIR=${TICDIR} \
++@MAKE_DATABASE@	BINDIR=${BINDIR} \
++@MAKE_DATABASE@	tic_source=terminfo.tmp \
+ @MAKE_DATABASE@	$(SHELL) ./run_tic.sh
+ @MAKE_DATABASE@	@( cd $(srcdir)/tabset && \
+ @MAKE_DATABASE@		$(SHELL) -c 'for i in * ; do \
+ @MAKE_DATABASE@			if test -f $$i ; then \
+ @MAKE_DATABASE@			echo installing $$i; \
+-@MAKE_DATABASE@			$(INSTALL_DATA) $$i $(DESTDIR)$(tabsetdir)/$$i; \
++@MAKE_DATABASE@			$(INSTALL_DATA) $$i $(TABSETDIR)/$$i; \
+ @MAKE_DATABASE@			fi; done' )
+ install.data ::
+ 	@echo "finished $@"
+@@ -129,8 +132,8 @@
+ NCURSES_CONFIG	= ncurses@DFT_ARG_SUFFIX@@cf_cv_abi_version@@cf_config_suffix@-config
+ 
+ install \
+-install.libs :: $(DESTDIR)$(bindir) ncurses-config
+-	$(INSTALL_SCRIPT) ncurses-config $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
++install.libs :: $(BINDIR) ncurses-config
++	$(INSTALL_SCRIPT) ncurses-config $(BINDIR)/$(NCURSES_CONFIG)
+ 
+ # Make a list of the files that gen-pkgconfig might create:
+ @MAKE_PC_FILES@PC_FILES = \
+@@ -148,7 +151,7 @@
+ @MAKE_PC_FILES@install \
+ @MAKE_PC_FILES@install.libs :: pc-files
+ @MAKE_PC_FILES@	@$(SHELL) -c 'case "x$(PKG_CONFIG_LIBDIR)" in \
+-@MAKE_PC_FILES@		@GLOB_FULLPATH_ONLY@) \
++@MAKE_PC_FILES@		x@GLOB_FULLPATH_POSIX@|x@GLOB_FULLPATH_OTHER@) \
+ @MAKE_PC_FILES@			mkdir -p $(DESTDIR)$(PKG_CONFIG_LIBDIR); \
+ @MAKE_PC_FILES@			for name in $(PC_FILES); do \
+ @MAKE_PC_FILES@				test -f $$name || continue; \
+@@ -177,23 +180,25 @@
+ 	datadir=${datadir} \
+ 	$(SHELL) $(srcdir)/gen_edit.sh >$@
+ 
+-$(DESTDIR)$(bindir) \
+-$(DESTDIR)$(libdir) \
+-$(DESTDIR)$(datadir) \
+-$(DESTDIR)$(tabsetdir) :
++$(BINDIR) \
++$(DATADIR) :
+ 	mkdir -p $@
+ 
++@MAKE_DATABASE@$(LIBDIR) \
++@MAKE_DATABASE@$(TABSETDIR) :
++@MAKE_DATABASE@	mkdir -p $@
++
+ uninstall : @MISC_UNINSTALL_DATA@ uninstall.libs
+ 
+ uninstall.data :
+-	-test -d $(DESTDIR)$(tabsetdir) && rm -rf $(DESTDIR)$(tabsetdir)
+-	-test -d $(DESTDIR)$(ticdir) && rm -rf $(DESTDIR)$(ticdir)
+-	-test -f $(DESTDIR)$(ticfile) && rm -f $(DESTDIR)$(ticfile)
++@MAKE_DATABASE@	-test -d $(TABSETDIR) && rm -rf $(TABSETDIR)
++@MAKE_DATABASE@	-test -d $(TICDIR) && rm -rf $(TICDIR)
++@MAKE_DATABASE@	-test -f $(TICFILE) && rm -f $(TICFILE)
+ 
+ uninstall.libs :
+-	-rm -f $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
++	-rm -f $(BINDIR)/$(NCURSES_CONFIG)
+ @MAKE_PC_FILES@	@$(SHELL) -c 'case x$(DESTDIR)$(PKG_CONFIG_LIBDIR) in \
+-@MAKE_PC_FILES@	@GLOB_FULLPATH_ONLY@) \
++@MAKE_PC_FILES@	x@GLOB_FULLPATH_POSIX@|x@GLOB_FULLPATH_OTHER@) \
+ @MAKE_PC_FILES@		for name in $(PC_FILES); do \
+ @MAKE_PC_FILES@			test -f $$name || continue; \
+ @MAKE_PC_FILES@			echo uninstalling $$name; \
+Index: misc/run_tic.in
+Prereq:  1.40 
+--- ncurses-6.5-20240727+/misc/run_tic.in	2022-07-16 19:37:03.000000000 +0000
++++ ncurses-6.5-20240810/misc/run_tic.in	2024-08-04 14:50:26.000000000 +0000
+@@ -1,7 +1,7 @@
+ #!@SHELL@
+-# $Id: run_tic.in,v 1.40 2022/07/16 19:37:03 tom Exp $
++# $Id: run_tic.in,v 1.41 2024/08/04 14:50:26 tom Exp $
+ ##############################################################################
+-# Copyright 2019-2020,2022 Thomas E. Dickey                                  #
++# Copyright 2019-2022,2024 Thomas E. Dickey                                  #
+ # Copyright 2000-2012,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -42,22 +42,25 @@
+ # The script is designed to be run from the misc/Makefile as
+ #	make install.data
+ 
+-: "${suffix:=@EXEEXT@}"
+-: "${DESTDIR:=@DESTDIR@}"
++# Symbols which are not overridden by misc/Makefile:
+ : "${prefix:=@prefix@}"
+ : "${exec_prefix:=@exec_prefix@}"
+-: "${bindir:=@bindir@}"
+ : "${top_srcdir:=@top_srcdir@}"
+ : "${srcdir:=@srcdir@}"
+ : "${datarootdir:=@datarootdir@}"
+ : "${datadir:=@datadir@}"
+-: "${TIC_PATH:=@TIC@}"
+-: "${ticdir:=@TERMINFO@}"
+-: "${source:=@TERMINFO_SRC@}"
+-: "${cross_compiling:=no}"
++: "${cross_compiling:=@cross_compiling@}"
++: "${suffix:=@EXEEXT@}"
++
+ : "${ext_funcs:=@NCURSES_EXT_FUNCS@}"
++: "${tic_path:=@TIC@}"
++: "${ticdir:=@TERMINFO@}"
++: "${tic_source:=@TERMINFO_SRC@}"
+ 
+-test -z "${DESTDIR}" && DESTDIR=
++# Symbols which $DESTDIR and/or install-prefix may affect:
++: "${INSTALL_PREFIX:=$prefix}"
++: "${BINDIR:=@bindir@}"
++: "${TICDIR:=$ticdir}"
+ 
+ # Allow tic to run either from the install-path, or from the build-directory.
+ # Do not do this if we appear to be cross-compiling.  In that case, we rely
+@@ -68,21 +71,21 @@
+ 	then
+ 		case "$PATH" in
+ 		\@PATH_SEPARATOR@*)
+-			PATH="../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${DESTDIR}$bindir$PATH"
++			PATH="../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${BINDIR}$PATH"
+ 			;;
+ 		*)
+-			PATH="../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${DESTDIR}$bindir@PATH_SEPARATOR@$PATH"
++			PATH="../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${BINDIR}@PATH_SEPARATOR@$PATH"
+ 			;;
+ 		esac
+ 		export PATH
+ 		if test @DFT_LWR_MODEL@ = shared
+ 		then
+ 			SHLIB="sh $srcdir/shlib"
+-			TIC_PATH="$SHLIB tic"
++			tic_path="$SHLIB tic"
+ 		else
+-			TIC_PATH="tic"
++			tic_path="tic"
+ 		fi
+-	elif test "$TIC_PATH" = unknown
++	elif test "$tic_path" = unknown
+ 	then
+ 		echo "? no tic program found"
+ 		exit 1
+@@ -106,7 +109,7 @@
+ 
+ # don't use user's TERMINFO variable
+ unset TERMINFO_DIRS
+-TERMINFO="${DESTDIR}$ticdir" ; export TERMINFO
++TERMINFO="$TICDIR" ; export TERMINFO
+ umask 022
+ 
+ # Construct the name of the old (obsolete) pathname, e.g., /usr/lib/terminfo.
+@@ -134,7 +137,7 @@
+ 
+ if test "$ext_funcs" = 1 ; then
+ cat <  Sat, 27 Jul 2024 09:25:06 -0400
++ -- Thomas E. Dickey   Sat, 10 Aug 2024 05:45:21 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20240727+/package/debian-mingw64/changelog	2024-07-27 13:25:06.000000000 +0000
++++ ncurses-6.5-20240810/package/debian-mingw64/changelog	2024-08-10 09:45:21.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240727) unstable; urgency=low
++ncurses6td (6.5+20240810) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 27 Jul 2024 09:25:06 -0400
++ -- Thomas E. Dickey   Sat, 10 Aug 2024 05:45:21 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20240727+/package/debian/changelog	2024-07-27 13:25:06.000000000 +0000
++++ ncurses-6.5-20240810/package/debian/changelog	2024-08-10 09:45:21.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240727) unstable; urgency=low
++ncurses6td (6.5+20240810) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 27 Jul 2024 09:25:06 -0400
++ -- Thomas E. Dickey   Sat, 10 Aug 2024 05:45:21 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.659 
+--- ncurses-6.5-20240727+/package/mingw-ncurses.nsi	2024-07-27 13:25:06.000000000 +0000
++++ ncurses-6.5-20240810/package/mingw-ncurses.nsi	2024-08-10 09:45:21.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.659 2024/07/27 13:25:06 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.661 2024/08/10 09:45:21 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "0727"
++!define VERSION_MMDD  "0810"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20240727+/package/mingw-ncurses.spec	2024-07-27 13:25:06.000000000 +0000
++++ ncurses-6.5-20240810/package/mingw-ncurses.spec	2024-08-10 09:45:21.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20240727
++Release: 20240810
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20240727+/package/ncurses.spec	2024-07-27 13:25:06.000000000 +0000
++++ ncurses-6.5-20240810/package/ncurses.spec	2024-08-10 09:45:21.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20240727
++Release: 20240810
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20240727+/package/ncursest.spec	2024-07-27 13:25:06.000000000 +0000
++++ ncurses-6.5-20240810/package/ncursest.spec	2024-08-10 09:45:21.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20240727
++Release: 20240810
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/aclocal.m4
+Prereq:  1.223 
+--- ncurses-6.5-20240727+/test/aclocal.m4	2024-07-06 18:05:00.000000000 +0000
++++ ncurses-6.5-20240810/test/aclocal.m4	2024-08-10 14:31:42.000000000 +0000
+@@ -27,7 +27,7 @@
+ dnl authorization.                                                           *
+ dnl***************************************************************************
+ dnl
+-dnl $Id: aclocal.m4,v 1.223 2024/07/06 18:05:00 tom Exp $
++dnl $Id: aclocal.m4,v 1.227 2024/08/10 14:31:42 tom Exp $
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+@@ -2009,13 +2009,14 @@
+ AC_SUBST(EXTRA_CFLAGS)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_GETOPT_HEADER version: 8 updated: 2021/06/19 19:16:16
++dnl CF_GETOPT_HEADER version: 9 updated: 2024/08/10 10:30:39
+ dnl ----------------
+ dnl Check for getopt's variables which are commonly defined in stdlib.h,
+ dnl unistd.h or (nonstandard) in getopt.h
+ AC_DEFUN([CF_GETOPT_HEADER],
+-[
+-AC_HAVE_HEADERS(unistd.h getopt.h)
++[AC_REQUIRE([AC_HEADER_STDC])
++
++AC_CHECK_HEADERS(getopt.h)
+ AC_CACHE_CHECK(for header declaring getopt variables,cf_cv_getopt_header,[
+ cf_cv_getopt_header=none
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+@@ -2035,6 +2036,26 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_GLOB_FULLPATH version: 2 updated: 2024/08/03 12:34:02
++dnl ----------------
++dnl Use this in case-statements to check for pathname syntax, i.e., absolute
++dnl pathnames.  The "x" is assumed since we provide an alternate form for DOS.
++AC_DEFUN([CF_GLOB_FULLPATH],[
++AC_REQUIRE([CF_WITH_SYSTYPE])dnl
++case "$cf_cv_system_name" in
++(cygwin*|msys*|mingw32*|mingw64|os2*)
++	GLOB_FULLPATH_POSIX='/*'
++	GLOB_FULLPATH_OTHER='[[a-zA-Z]]:[[\\/]]*'
++	;;
++(*)
++	GLOB_FULLPATH_POSIX='/*'
++	GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX
++	;;
++esac
++AC_SUBST(GLOB_FULLPATH_POSIX)
++AC_SUBST(GLOB_FULLPATH_OTHER)
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_GNU_SOURCE version: 10 updated: 2018/12/10 20:09:41
+ dnl -------------
+ dnl Check if we must define _GNU_SOURCE to get a reasonable value for
+@@ -3255,35 +3276,35 @@
+ esac
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_PATH_SYNTAX version: 18 updated: 2020/12/31 18:40:20
++dnl CF_PATH_SYNTAX version: 19 updated: 2024/08/03 13:08:58
+ dnl --------------
+ dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
+ dnl begins with one of the prefix/exec_prefix variables, and then again if the
+ dnl result begins with 'NONE'.  This is necessary to work around autoconf's
+ dnl delayed evaluation of those symbols.
+ AC_DEFUN([CF_PATH_SYNTAX],[
++AC_REQUIRE([CF_GLOB_FULLPATH])dnl
++
+ if test "x$prefix" != xNONE; then
+ 	cf_path_syntax="$prefix"
+ else
+ 	cf_path_syntax="$ac_default_prefix"
+ fi
+ 
+-case ".[$]$1" in
+-(.\[$]\(*\)*|.\'*\'*)
+-	;;
+-(..|./*|.\\*)
++case "x[$]$1" in
++(x\[$]\(*\)*|x\'*\'*)
+ 	;;
+-(.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+-(.\[$]\{*prefix\}*|.\[$]\{*dir\}*)
++(x\[$]\{*prefix\}*|x\[$]\{*dir\}*)
+ 	eval $1="[$]$1"
+-	case ".[$]$1" in
+-	(.NONE/*)
++	case "x[$]$1" in
++	(xNONE/*)
+ 		$1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`
+ 		;;
+ 	esac
+ 	;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ 	$1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+@@ -3522,15 +3543,16 @@
+ CF_CC_ENV_FLAGS
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_PROG_INSTALL version: 10 updated: 2021/01/04 19:33:05
++dnl CF_PROG_INSTALL version: 11 updated: 2024/08/03 13:08:58
+ dnl ---------------
+ dnl Force $INSTALL to be an absolute-path.  Otherwise, edit_man.sh and the
+ dnl misc/tabset install won't work properly.  Usually this happens only when
+ dnl using the fallback mkinstalldirs script
+ AC_DEFUN([CF_PROG_INSTALL],
+ [AC_PROG_INSTALL
+-case $INSTALL in
+-(/*)
++AC_REQUIRE([CF_GLOB_FULLPATH])dnl
++case x$INSTALL in
++(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+ (*)
+ 	CF_DIRNAME(cf_dir,$INSTALL)
+@@ -4062,12 +4084,12 @@
+ $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_UTF8_LIB version: 10 updated: 2023/01/11 04:05:23
++dnl CF_UTF8_LIB version: 11 updated: 2024/08/10 10:23:45
+ dnl -----------
+ dnl Check for multibyte support, and if not found, utf8 compatibility library
+ AC_DEFUN([CF_UTF8_LIB],
+ [
+-AC_HAVE_HEADERS(wchar.h)
++AC_CHECK_HEADERS(wchar.h)
+ AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[
+ 	cf_save_LIBS="$LIBS"
+ 	AC_TRY_LINK([
+@@ -4315,6 +4337,26 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_WITH_SYSTYPE version: 1 updated: 2013/01/26 16:26:12
++dnl ---------------
++dnl For testing, override the derived host system-type which is used to decide
++dnl things such as the linker commands used to build shared libraries.  This is
++dnl normally chosen automatically based on the type of system which you are
++dnl building on.  We use it for testing the configure script.
++dnl
++dnl This is different from the --host option: it is used only for testing parts
++dnl of the configure script which would not be reachable with --host since that
++dnl relies on the build environment being real, rather than mocked up.
++AC_DEFUN([CF_WITH_SYSTYPE],[
++CF_CHECK_CACHE([AC_CANONICAL_SYSTEM])
++AC_ARG_WITH(system-type,
++	[  --with-system-type=XXX  test: override derived host system-type],
++[AC_MSG_WARN(overriding system type to $withval)
++	cf_cv_system_name=$withval
++	host_os=$withval
++])
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_WITH_VALGRIND version: 1 updated: 2006/12/14 18:00:21
+ dnl ----------------
+ AC_DEFUN([CF_WITH_VALGRIND],[
+Index: test/configure
+--- ncurses-6.5-20240727+/test/configure	2024-07-06 18:05:23.000000000 +0000
++++ ncurses-6.5-20240810/test/configure	2024-08-10 15:48:47.000000000 +0000
+@@ -680,11 +680,6 @@
+ 
+   cat <<\EOF
+ 
+-Program names:
+-  --program-prefix=PREFIX            prepend PREFIX to installed program names
+-  --program-suffix=SUFFIX            append SUFFIX to installed program names
+-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+-
+ X features:
+   --x-includes=DIR    X include files are in DIR
+   --x-libraries=DIR   X library files are in DIR
+@@ -692,6 +687,7 @@
+ System types:
+   --build=BUILD           configure for building on BUILD [guessed]
+   --host=HOST       build programs to run on HOST [BUILD]
++  --target=TARGET   configure for building compilers for TARGET [HOST]
+ EOF
+ fi
+ 
+@@ -699,15 +695,16 @@
+ 
+   cat <<\EOF
+ 
+-Optional Features:
+-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+-
+ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+ 
++Optional Features:
++  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
++  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
++
+ General Options:
++  --with-system-type=XXX  test: override derived host system-type
+   --disable-stripping     do not strip (debug info) installed executables
+   --with-strip-program=XX specify program to use when stripping in install
+   --enable-stdnoreturn    enable C11 _Noreturn feature for diagnostics
+@@ -937,7 +934,7 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+   if test -r "$ac_site_file"; then
+-    { echo "$as_me:940: loading site script $ac_site_file" >&5
++    { echo "$as_me:937: loading site script $ac_site_file" >&5
+ echo "$as_me: loading site script $ac_site_file" >&6;}
+     cat "$ac_site_file" >&5
+     . "$ac_site_file"
+@@ -948,7 +945,7 @@
+   # Some versions of bash will fail to source /dev/null (special
+   # files actually), so we avoid doing that.
+   if test -f "$cache_file"; then
+-    { echo "$as_me:951: loading cache $cache_file" >&5
++    { echo "$as_me:948: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+       [\\/]* | ?:[\\/]* ) . $cache_file;;
+@@ -956,7 +953,7 @@
+     esac
+   fi
+ else
+-  { echo "$as_me:959: creating cache $cache_file" >&5
++  { echo "$as_me:956: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+@@ -972,21 +969,21 @@
+   eval ac_new_val="\$ac_env_${ac_var}_value"
+   case "$ac_old_set,$ac_new_set" in
+     set,)
+-      { echo "$as_me:975: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++      { echo "$as_me:972: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,set)
+-      { echo "$as_me:979: error: \`$ac_var' was not set in the previous run" >&5
++      { echo "$as_me:976: error: \`$ac_var' was not set in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,);;
+     *)
+       if test "x$ac_old_val" != "x$ac_new_val"; then
+-        { echo "$as_me:985: error: \`$ac_var' has changed since the previous run:" >&5
++        { echo "$as_me:982: error: \`$ac_var' has changed since the previous run:" >&5
+ echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+-        { echo "$as_me:987:   former value:  $ac_old_val" >&5
++        { echo "$as_me:984:   former value:  $ac_old_val" >&5
+ echo "$as_me:   former value:  $ac_old_val" >&2;}
+-        { echo "$as_me:989:   current value: $ac_new_val" >&5
++        { echo "$as_me:986:   current value: $ac_new_val" >&5
+ echo "$as_me:   current value: $ac_new_val" >&2;}
+         ac_cache_corrupted=:
+       fi;;
+@@ -1005,9 +1002,9 @@
+   fi
+ done
+ if "$ac_cache_corrupted"; then
+-  { echo "$as_me:1008: error: changes in the environment can compromise the build" >&5
++  { echo "$as_me:1005: error: changes in the environment can compromise the build" >&5
+ echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  { { echo "$as_me:1010: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++  { { echo "$as_me:1007: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1036,10 +1033,10 @@
+ echo "#! $SHELL" >conftest.sh
+ echo  "exit 0"   >>conftest.sh
+ chmod +x conftest.sh
+-if { (echo "$as_me:1039: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:1036: PATH=\".;.\"; conftest.sh") >&5
+   (PATH=".;."; conftest.sh) 2>&5
+   ac_status=$?
+-  echo "$as_me:1042: \$? = $ac_status" >&5
++  echo "$as_me:1039: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+   ac_path_separator=';'
+ else
+@@ -1071,7 +1068,7 @@
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:1074: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++  { { echo "$as_me:1071: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+ echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1081,11 +1078,11 @@
+ 
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+-  { { echo "$as_me:1084: error: cannot run $ac_config_sub" >&5
++  { { echo "$as_me:1081: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:1088: checking build system type" >&5
++echo "$as_me:1085: checking build system type" >&5
+ echo $ECHO_N "checking build system type... $ECHO_C" >&6
+ if test "${ac_cv_build+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1094,24 +1091,23 @@
+ test -z "$ac_cv_build_alias" &&
+   ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+-  { { echo "$as_me:1097: error: cannot guess build type; you must specify one" >&5
++  { { echo "$as_me:1094: error: cannot guess build type; you must specify one" >&5
+ echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+    { (exit 1); exit 1; }; }
+ ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` ||
+-  { { echo "$as_me:1101: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++  { { echo "$as_me:1098: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1106: result: $ac_cv_build" >&5
++echo "$as_me:1103: result: $ac_cv_build" >&5
+ echo "${ECHO_T}$ac_cv_build" >&6
+ build=$ac_cv_build
+ build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+-if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
+-	echo "$as_me:1114: checking host system type" >&5
++echo "$as_me:1110: checking host system type" >&5
+ echo $ECHO_N "checking host system type... $ECHO_C" >&6
+ if test "${ac_cv_host+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1120,18 +1116,46 @@
+ test -z "$ac_cv_host_alias" &&
+   ac_cv_host_alias=$ac_cv_build_alias
+ ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` ||
+-  { { echo "$as_me:1123: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++  { { echo "$as_me:1119: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1128: result: $ac_cv_host" >&5
++echo "$as_me:1124: result: $ac_cv_host" >&5
+ echo "${ECHO_T}$ac_cv_host" >&6
+ host=$ac_cv_host
+ host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ host_os=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
++if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
++	echo "$as_me:1132: checking target system type" >&5
++echo $ECHO_N "checking target system type... $ECHO_C" >&6
++if test "${ac_cv_target+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_target_alias=$target_alias
++test "x$ac_cv_target_alias" = "x" &&
++  ac_cv_target_alias=$ac_cv_host_alias
++ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` ||
++  { { echo "$as_me:1141: error: $ac_config_sub $ac_cv_target_alias failed" >&5
++echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
++   { (exit 1); exit 1; }; }
++
++fi
++echo "$as_me:1146: result: $ac_cv_target" >&5
++echo "${ECHO_T}$ac_cv_target" >&6
++target=$ac_cv_target
++target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++target_vendor=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++target_os=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++
++# The aliases save the names the user supplied, while $host etc.
++# will get canonicalized.
++test -n "$target_alias" &&
++  test "$program_prefix$program_suffix$program_transform_name" = \
++    NONENONEs,x,x, &&
++  program_prefix=${target_alias}-
+ 	system_name="$host_os"
+ else
+ 	system_name="`(uname -s -r) 2>/dev/null`"
+@@ -1151,31 +1175,28 @@
+ fi
+ 
+ test -z "$system_name" && system_name="$cf_cv_system_name"
+-test -n "$cf_cv_system_name" && echo "$as_me:1154: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1178: result: Configuring for $cf_cv_system_name" >&5
+ echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
+ 
+ if test ".$system_name" != ".$cf_cv_system_name" ; then
+-	echo "$as_me:1158: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++	echo "$as_me:1182: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+ echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
+-	{ { echo "$as_me:1160: error: \"Please remove config.cache and try again.\"" >&5
++	{ { echo "$as_me:1184: error: \"Please remove config.cache and try again.\"" >&5
+ echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-test "$program_prefix" != NONE &&
+-  program_transform_name="s,^,$program_prefix,;$program_transform_name"
+-# Use a double $ so make ignores it.
+-test "$program_suffix" != NONE &&
+-  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
+-# Double any \ or $.  echo might interpret backslashes.
+-# By default was `s,x,x', remove it if useless.
+-cat <<\_ACEOF >conftest.sed
+-s/[\\$]/&&/g;s/;s,x,x,$//
+-_ACEOF
+-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+-rm conftest.sed
++# Check whether --with-system-type or --without-system-type was given.
++if test "${with_system_type+set}" = set; then
++  withval="$with_system_type"
++  { echo "$as_me:1192: WARNING: overriding system type to $withval" >&5
++echo "$as_me: WARNING: overriding system type to $withval" >&2;}
++	cf_cv_system_name=$withval
++	host_os=$withval
++
++fi;
+ 
+-echo "$as_me:1178: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:1199: 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
+@@ -1195,11 +1216,11 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:1198: result: yes" >&5
++  echo "$as_me:1219: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:1202: result: no" >&5
++  echo "$as_me:1223: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+@@ -1213,7 +1234,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-echo "$as_me:1216: checking for $ac_word" >&5
++echo "$as_me:1237: 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
+@@ -1228,7 +1249,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-echo "$as_me:1231: found $ac_dir/$ac_word" >&5
++echo "$as_me:1252: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1236,10 +1257,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1239: result: $CC" >&5
++  echo "$as_me:1260: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1242: result: no" >&5
++  echo "$as_me:1263: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1248,7 +1269,7 @@
+   ac_ct_CC=$CC
+   # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-echo "$as_me:1251: checking for $ac_word" >&5
++echo "$as_me:1272: 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
+@@ -1263,7 +1284,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="gcc"
+-echo "$as_me:1266: found $ac_dir/$ac_word" >&5
++echo "$as_me:1287: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1271,10 +1292,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1274: result: $ac_ct_CC" >&5
++  echo "$as_me:1295: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1277: result: no" >&5
++  echo "$as_me:1298: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1287,7 +1308,7 @@
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-echo "$as_me:1290: checking for $ac_word" >&5
++echo "$as_me:1311: 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
+@@ -1302,7 +1323,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+-echo "$as_me:1305: found $ac_dir/$ac_word" >&5
++echo "$as_me:1326: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1310,10 +1331,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1313: result: $CC" >&5
++  echo "$as_me:1334: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1316: result: no" >&5
++  echo "$as_me:1337: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1322,7 +1343,7 @@
+   ac_ct_CC=$CC
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:1325: checking for $ac_word" >&5
++echo "$as_me:1346: 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
+@@ -1337,7 +1358,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="cc"
+-echo "$as_me:1340: found $ac_dir/$ac_word" >&5
++echo "$as_me:1361: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1345,10 +1366,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1348: result: $ac_ct_CC" >&5
++  echo "$as_me:1369: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1351: result: no" >&5
++  echo "$as_me:1372: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1361,7 +1382,7 @@
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:1364: checking for $ac_word" >&5
++echo "$as_me:1385: 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
+@@ -1381,7 +1402,7 @@
+   continue
+ fi
+ ac_cv_prog_CC="cc"
+-echo "$as_me:1384: found $ac_dir/$ac_word" >&5
++echo "$as_me:1405: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1403,10 +1424,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1406: result: $CC" >&5
++  echo "$as_me:1427: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1409: result: no" >&5
++  echo "$as_me:1430: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1417,7 +1438,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:1420: checking for $ac_word" >&5
++echo "$as_me:1441: 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
+@@ -1432,7 +1453,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:1435: found $ac_dir/$ac_word" >&5
++echo "$as_me:1456: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1440,10 +1461,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1443: result: $CC" >&5
++  echo "$as_me:1464: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1446: result: no" >&5
++  echo "$as_me:1467: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1456,7 +1477,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:1459: checking for $ac_word" >&5
++echo "$as_me:1480: 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
+@@ -1471,7 +1492,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:1474: found $ac_dir/$ac_word" >&5
++echo "$as_me:1495: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1479,10 +1500,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1482: result: $ac_ct_CC" >&5
++  echo "$as_me:1503: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1485: result: no" >&5
++  echo "$as_me:1506: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1494,32 +1515,32 @@
+ 
+ fi
+ 
+-test -z "$CC" && { { echo "$as_me:1497: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1518: 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:1502:" \
++echo "$as_me:1523:" \
+      "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo "$2"`
+-{ (eval echo "$as_me:1505: \"$ac_compiler --version &5\"") >&5
++{ (eval echo "$as_me:1526: \"$ac_compiler --version &5\"") >&5
+   (eval $ac_compiler --version &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1508: \$? = $ac_status" >&5
++  echo "$as_me:1529: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:1510: \"$ac_compiler -v &5\"") >&5
++{ (eval echo "$as_me:1531: \"$ac_compiler -v &5\"") >&5
+   (eval $ac_compiler -v &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1513: \$? = $ac_status" >&5
++  echo "$as_me:1534: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:1515: \"$ac_compiler -V &5\"") >&5
++{ (eval echo "$as_me:1536: \"$ac_compiler -V &5\"") >&5
+   (eval $ac_compiler -V &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1518: \$? = $ac_status" >&5
++  echo "$as_me:1539: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1522 "configure"
++#line 1543 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1535,13 +1556,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:1538: checking for C compiler default output" >&5
++echo "$as_me:1559: 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:1541: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1562: \"$ac_link_default\"") >&5
+   (eval $ac_link_default) 2>&5
+   ac_status=$?
+-  echo "$as_me:1544: \$? = $ac_status" >&5
++  echo "$as_me:1565: \$? = $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
+@@ -1564,34 +1585,34 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:1567: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1588: 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:1573: result: $ac_file" >&5
++echo "$as_me:1594: 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:1578: checking whether the C compiler works" >&5
++echo "$as_me:1599: 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:1584: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1605: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1587: \$? = $ac_status" >&5
++  echo "$as_me:1608: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+-	{ { echo "$as_me:1594: error: cannot run C compiled programs.
++	{ { echo "$as_me:1615: 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;}
+@@ -1599,24 +1620,24 @@
+     fi
+   fi
+ fi
+-echo "$as_me:1602: result: yes" >&5
++echo "$as_me:1623: 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:1609: checking whether we are cross compiling" >&5
++echo "$as_me:1630: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:1611: result: $cross_compiling" >&5
++echo "$as_me:1632: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+ 
+-echo "$as_me:1614: checking for executable suffix" >&5
++echo "$as_me:1635: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:1616: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1637: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:1619: \$? = $ac_status" >&5
++  echo "$as_me:1640: \$? = $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
+@@ -1632,25 +1653,25 @@
+   esac
+ done
+ else
+-  { { echo "$as_me:1635: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:1656: 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:1641: result: $ac_cv_exeext" >&5
++echo "$as_me:1662: 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:1647: checking for object suffix" >&5
++echo "$as_me:1668: 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 1653 "configure"
++#line 1674 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1662,10 +1683,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:1665: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1686: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1668: \$? = $ac_status" >&5
++  echo "$as_me:1689: \$? = $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
+@@ -1677,24 +1698,24 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:1680: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:1701: 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:1687: result: $ac_cv_objext" >&5
++echo "$as_me:1708: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:1691: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:1712: 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 1697 "configure"
++#line 1718 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1709,16 +1730,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1712: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1733: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1715: \$? = $ac_status" >&5
++  echo "$as_me:1736: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:1718: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1739: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1721: \$? = $ac_status" >&5
++  echo "$as_me:1742: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -1730,19 +1751,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:1733: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:1754: 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:1739: checking whether $CC accepts -g" >&5
++echo "$as_me:1760: 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 1745 "configure"
++#line 1766 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1754,16 +1775,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1757: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1778: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1760: \$? = $ac_status" >&5
++  echo "$as_me:1781: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:1763: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1784: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1766: \$? = $ac_status" >&5
++  echo "$as_me:1787: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cc_g=yes
+ else
+@@ -1773,7 +1794,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:1776: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:1797: 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
+@@ -1800,16 +1821,16 @@
+ #endif
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1803: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1824: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1806: \$? = $ac_status" >&5
++  echo "$as_me:1827: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:1809: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1830: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1812: \$? = $ac_status" >&5
++  echo "$as_me:1833: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   for ac_declaration in \
+    ''\
+@@ -1821,7 +1842,7 @@
+    'void exit (int);'
+ do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1824 "configure"
++#line 1845 "configure"
+ #include "confdefs.h"
+ #include 
+ $ac_declaration
+@@ -1834,16 +1855,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1837: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1858: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1840: \$? = $ac_status" >&5
++  echo "$as_me:1861: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:1843: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1864: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1846: \$? = $ac_status" >&5
++  echo "$as_me:1867: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -1853,7 +1874,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1856 "configure"
++#line 1877 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -1865,16 +1886,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1868: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1889: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1871: \$? = $ac_status" >&5
++  echo "$as_me:1892: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:1874: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1895: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1877: \$? = $ac_status" >&5
++  echo "$as_me:1898: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -1904,11 +1925,11 @@
+ 
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+-	echo "$as_me:1907: checking version of $CC" >&5
++	echo "$as_me:1928: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+-	echo "$as_me:1911: result: $GCC_VERSION" >&5
++	echo "$as_me:1932: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+ 
+@@ -1917,12 +1938,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:1920: checking if this is really Intel C compiler" >&5
++		echo "$as_me:1941: 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 1925 "configure"
++#line 1946 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1939,16 +1960,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1942: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1963: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1945: \$? = $ac_status" >&5
++  echo "$as_me:1966: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:1948: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1969: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1951: \$? = $ac_status" >&5
++  echo "$as_me:1972: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -1959,7 +1980,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:1962: result: $INTEL_COMPILER" >&5
++		echo "$as_me:1983: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ 		;;
+ 	esac
+@@ -1968,11 +1989,11 @@
+ CLANG_COMPILER=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:1971: checking if this is really Clang C compiler" >&5
++	echo "$as_me:1992: 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 1975 "configure"
++#line 1996 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1989,16 +2010,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1992: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2013: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1995: \$? = $ac_status" >&5
++  echo "$as_me:2016: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:1998: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2019: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2001: \$? = $ac_status" >&5
++  echo "$as_me:2022: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_COMPILER=yes
+ 
+@@ -2008,7 +2029,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:2011: result: $CLANG_COMPILER" >&5
++	echo "$as_me:2032: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+ 
+@@ -2017,30 +2038,30 @@
+ if test "x$CLANG_COMPILER" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:2020: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:2041: 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:2027: checking version of $CC" >&5
++	echo "$as_me:2048: 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:2031: result: $CLANG_VERSION" >&5
++	echo "$as_me:2052: 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:2038: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:2059: 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 2043 "configure"
++#line 2064 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -2054,16 +2075,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:2057: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2078: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2060: \$? = $ac_status" >&5
++  echo "$as_me:2081: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:2063: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2084: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2066: \$? = $ac_status" >&5
++  echo "$as_me:2087: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -2074,13 +2095,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:2077: result: $cf_clang_optok" >&5
++		echo "$as_me:2098: 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}:2083: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:2104: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -2089,7 +2110,7 @@
+ 	done
+ fi
+ 
+-echo "$as_me:2092: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:2113: 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
+@@ -2097,7 +2118,7 @@
+   ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2100 "configure"
++#line 2121 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -2144,16 +2165,16 @@
+ do
+   CC="$ac_save_CC $ac_arg"
+   rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2147: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2168: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2150: \$? = $ac_status" >&5
++  echo "$as_me:2171: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2153: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2174: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2156: \$? = $ac_status" >&5
++  echo "$as_me:2177: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -2170,10 +2191,10 @@
+ 
+ case "x$ac_cv_prog_cc_stdc" in
+   x|xno)
+-    echo "$as_me:2173: result: none needed" >&5
++    echo "$as_me:2194: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+   *)
+-    echo "$as_me:2176: result: $ac_cv_prog_cc_stdc" >&5
++    echo "$as_me:2197: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+     CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+@@ -2181,13 +2202,13 @@
+ # This should have been defined by AC_PROG_CC
+ : "${CC:=cc}"
+ 
+-echo "$as_me:2184: checking \$CFLAGS variable" >&5
++echo "$as_me:2205: checking \$CFLAGS variable" >&5
+ echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
+ case "x$CFLAGS" in
+ (*-[IUD]*)
+-	echo "$as_me:2188: result: broken" >&5
++	echo "$as_me:2209: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2190: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
++	{ echo "$as_me:2211: 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=
+@@ -2295,18 +2316,18 @@
+ 	done
+ 	;;
+ (*)
+-	echo "$as_me:2298: result: ok" >&5
++	echo "$as_me:2319: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+ 
+-echo "$as_me:2303: checking \$CC variable" >&5
++echo "$as_me:2324: checking \$CC variable" >&5
+ echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+ case "$CC" in
+ (*[\ \	]-*)
+-	echo "$as_me:2307: result: broken" >&5
++	echo "$as_me:2328: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2309: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++	{ echo "$as_me:2330: 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/[ ]*[ ]-[^ ].*//'`
+@@ -2423,24 +2444,24 @@
+ 	done
+ 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
+ 
+-echo "${as_me:-configure}:2426: testing resulting CC: '$CC' ..." 1>&5
++echo "${as_me:-configure}:2447: testing resulting CC: '$CC' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:2430: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2451: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:2434: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2455: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+ 
+ 	;;
+ (*)
+-	echo "$as_me:2438: result: ok" >&5
++	echo "$as_me:2459: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+ 
+-echo "$as_me:2443: checking for inline" >&5
++echo "$as_me:2464: 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
+@@ -2448,7 +2469,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2451 "configure"
++#line 2472 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo (void) {return 0; }
+@@ -2457,16 +2478,16 @@
+ 
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2460: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2481: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2463: \$? = $ac_status" >&5
++  echo "$as_me:2484: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2466: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2487: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2469: \$? = $ac_status" >&5
++  echo "$as_me:2490: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -2477,7 +2498,7 @@
+ done
+ 
+ fi
+-echo "$as_me:2480: result: $ac_cv_c_inline" >&5
++echo "$as_me:2501: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -2496,7 +2517,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:2499: checking for $ac_word" >&5
++echo "$as_me:2520: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_GREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2511,7 +2532,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_GREP="$ac_prog"
+-echo "$as_me:2514: found $ac_dir/$ac_word" >&5
++echo "$as_me:2535: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2519,10 +2540,10 @@
+ fi
+ GREP=$ac_cv_prog_GREP
+ if test -n "$GREP"; then
+-  echo "$as_me:2522: result: $GREP" >&5
++  echo "$as_me:2543: result: $GREP" >&5
+ echo "${ECHO_T}$GREP" >&6
+ else
+-  echo "$as_me:2525: result: no" >&5
++  echo "$as_me:2546: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2530,7 +2551,7 @@
+ done
+ test -n "$GREP" || GREP=": "
+ 
+-echo "$as_me:2533: checking for egrep" >&5
++echo "$as_me:2554: checking for egrep" >&5
+ echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+ if test "${ac_cv_path_EGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2542,7 +2563,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:2545: checking for $ac_word" >&5
++echo "$as_me:2566: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_EGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2559,7 +2580,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_EGREP="$ac_dir/$ac_word"
+-   echo "$as_me:2562: found $ac_dir/$ac_word" >&5
++   echo "$as_me:2583: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -2570,10 +2591,10 @@
+ EGREP=$ac_cv_path_EGREP
+ 
+ if test -n "$EGREP"; then
+-  echo "$as_me:2573: result: $EGREP" >&5
++  echo "$as_me:2594: result: $EGREP" >&5
+ echo "${ECHO_T}$EGREP" >&6
+ else
+-  echo "$as_me:2576: result: no" >&5
++  echo "$as_me:2597: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2581,12 +2602,12 @@
+ done
+ test -n "$EGREP" || EGREP=": "
+ 
+-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2584: error: cannot find workable egrep" >&5
++     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2605: error: cannot find workable egrep" >&5
+ echo "$as_me: error: cannot find workable egrep" >&2;}
+    { (exit 1); exit 1; }; }
+    fi
+ fi
+-echo "$as_me:2589: result: $ac_cv_path_EGREP" >&5
++echo "$as_me:2610: result: $ac_cv_path_EGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_EGREP" >&6
+  EGREP="$ac_cv_path_EGREP"
+ 
+@@ -2596,7 +2617,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:2599: checking how to run the C preprocessor" >&5
++echo "$as_me:2620: 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
+@@ -2617,18 +2638,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 2620 "configure"
++#line 2641 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2625: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2646: \"$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:2631: \$? = $ac_status" >&5
++  echo "$as_me:2652: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2651,17 +2672,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2654 "configure"
++#line 2675 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:2658: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2679: \"$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:2664: \$? = $ac_status" >&5
++  echo "$as_me:2685: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2698,7 +2719,7 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:2701: result: $CPP" >&5
++echo "$as_me:2722: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -2708,18 +2729,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 2711 "configure"
++#line 2732 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2716: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2737: \"$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:2722: \$? = $ac_status" >&5
++  echo "$as_me:2743: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2742,17 +2763,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2745 "configure"
++#line 2766 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:2749: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2770: \"$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:2755: \$? = $ac_status" >&5
++  echo "$as_me:2776: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2780,7 +2801,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:2783: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:2804: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -2796,7 +2817,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:2799: checking for $ac_word" >&5
++echo "$as_me:2820: 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
+@@ -2811,7 +2832,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+-echo "$as_me:2814: found $ac_dir/$ac_word" >&5
++echo "$as_me:2835: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2819,16 +2840,27 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "$as_me:2822: result: $AWK" >&5
++  echo "$as_me:2843: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+-  echo "$as_me:2825: result: no" >&5
++  echo "$as_me:2846: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   test -n "$AWK" && break
+ done
+ 
++case "$cf_cv_system_name" in
++(cygwin*|msys*|mingw32*|mingw64|os2*)
++	GLOB_FULLPATH_POSIX='/*'
++	GLOB_FULLPATH_OTHER='[a-zA-Z]:[\\/]*'
++	;;
++(*)
++	GLOB_FULLPATH_POSIX='/*'
++	GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX
++	;;
++esac
++
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+ # incompatible versions:
+@@ -2841,7 +2873,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:2844: checking for a BSD compatible install" >&5
++echo "$as_me:2876: 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
+@@ -2890,7 +2922,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:2893: result: $INSTALL" >&5
++echo "$as_me:2925: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -2901,8 +2933,8 @@
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+-case $INSTALL in
+-(/*)
++case x$INSTALL in
++(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+ (*)
+ 	cf_dir=`echo "$INSTALL" | sed -e 's%/[^/]*$%%'`
+@@ -2911,7 +2943,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:2914: checking if you want to install stripped executables" >&5
++echo "$as_me:2946: 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.
+@@ -2928,7 +2960,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:2931: result: $enable_stripping" >&5
++echo "$as_me:2963: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -2939,7 +2971,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:2942: checking if install accepts -p option" >&5
++echo "$as_me:2974: 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
+@@ -2970,10 +3002,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:2973: result: $cf_cv_install_p" >&5
++echo "$as_me:3005: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:2976: checking if install needs to be told about ownership" >&5
++echo "$as_me:3008: 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)
+@@ -2984,7 +3016,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:2987: result: $with_install_o" >&5
++echo "$as_me:3019: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -2995,7 +3027,7 @@
+ 
+ if test -n "$INSTALL_OPT_S"
+ then
+-	echo "$as_me:2998: checking if you want to specify strip-program" >&5
++	echo "$as_me:3030: checking if you want to specify strip-program" >&5
+ echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
+ 
+ # Check whether --with-strip-program or --without-strip-program was given.
+@@ -3005,11 +3037,11 @@
+ else
+   with_strip_program=no
+ fi;
+-	echo "$as_me:3008: result: $with_strip_program" >&5
++	echo "$as_me:3040: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ 	if test "$with_strip_program" != no
+ 	then
+-		echo "$as_me:3012: checking if strip-program is supported with this installer" >&5
++		echo "$as_me:3044: checking if strip-program is supported with this installer" >&5
+ echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
+ 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
+ 		check_install_strip=no
+@@ -3030,11 +3062,11 @@
+ 				done
+ 			fi
+ 		fi
+-		echo "$as_me:3033: result: $check_install_strip" >&5
++		echo "$as_me:3065: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ 		case "$check_install_strip" in
+ 		(no)
+-			{ echo "$as_me:3037: WARNING: $cf_install_program does not support strip program option" >&5
++			{ echo "$as_me:3069: WARNING: $cf_install_program does not support strip program option" >&5
+ echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
+ 			with_strip_program=no
+ 			;;
+@@ -3049,7 +3081,7 @@
+ 			chmod +x "$INSTALL"
+ 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
+ 
+-echo "${as_me:-configure}:3052: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:3084: testing created $INSTALL ..." 1>&5
+ 
+ 			;;
+ 		(option)
+@@ -3063,7 +3095,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:3066: checking for $ac_word" >&5
++echo "$as_me:3098: 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
+@@ -3078,7 +3110,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LINT="$ac_prog"
+-echo "$as_me:3081: found $ac_dir/$ac_word" >&5
++echo "$as_me:3113: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3086,10 +3118,10 @@
+ fi
+ LINT=$ac_cv_prog_LINT
+ if test -n "$LINT"; then
+-  echo "$as_me:3089: result: $LINT" >&5
++  echo "$as_me:3121: result: $LINT" >&5
+ echo "${ECHO_T}$LINT" >&6
+ else
+-  echo "$as_me:3092: result: no" >&5
++  echo "$as_me:3124: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3102,7 +3134,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:3105: checking for \".PHONY\" make-support" >&5
++echo "$as_me:3137: 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
+@@ -3157,14 +3189,14 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:3160: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:3192: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+ test "x$cf_cv_make_PHONY" = xyes && MAKE_PHONY=
+ test "x$cf_cv_make_PHONY" != xyes && MAKE_NO_PHONY=
+ 
+-echo "$as_me:3167: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:3199: 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
+@@ -3191,7 +3223,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:3194: result: $cf_cv_mixedcase" >&5
++echo "$as_me:3226: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -3202,7 +3234,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:3237: 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
+@@ -3217,7 +3249,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:3220: found $ac_dir/$ac_word" >&5
++echo "$as_me:3252: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3225,10 +3257,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:3228: result: $CTAGS" >&5
++  echo "$as_me:3260: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:3231: result: no" >&5
++  echo "$as_me:3263: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3239,7 +3271,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:3242: checking for $ac_word" >&5
++echo "$as_me:3274: 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
+@@ -3254,7 +3286,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:3257: found $ac_dir/$ac_word" >&5
++echo "$as_me:3289: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3262,10 +3294,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:3265: result: $ETAGS" >&5
++  echo "$as_me:3297: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:3268: result: no" >&5
++  echo "$as_me:3300: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3274,7 +3306,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:3277: checking for $ac_word" >&5
++echo "$as_me:3309: 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
+@@ -3289,7 +3321,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:3292: found $ac_dir/$ac_word" >&5
++echo "$as_me:3324: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3298,17 +3330,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:3301: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:3333: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:3304: result: no" >&5
++  echo "$as_me:3336: 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:3311: checking for $ac_word" >&5
++echo "$as_me:3343: 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
+@@ -3323,7 +3355,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:3326: found $ac_dir/$ac_word" >&5
++echo "$as_me:3358: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3332,10 +3364,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:3335: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:3367: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:3338: result: no" >&5
++  echo "$as_me:3370: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3355,14 +3387,14 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:3358: checking if -lm needed for math functions" >&5
++echo "$as_me:3390: 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 3365 "configure"
++#line 3397 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -3378,16 +3410,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3381: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3413: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3384: \$? = $ac_status" >&5
++  echo "$as_me:3416: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:3387: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3419: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3390: \$? = $ac_status" >&5
++  echo "$as_me:3422: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -3397,7 +3429,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3400: result: $cf_cv_need_libm" >&5
++echo "$as_me:3432: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ 
+ if test "$cf_cv_need_libm" = yes
+@@ -3405,14 +3437,14 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lm"
+-	echo "$as_me:3408: checking if -lm is available for math functions" >&5
++	echo "$as_me:3440: checking if -lm is available for math functions" >&5
+ echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
+ if test "${cf_cv_have_libm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3415 "configure"
++#line 3447 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -3428,16 +3460,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3431: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3463: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3434: \$? = $ac_status" >&5
++  echo "$as_me:3466: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:3437: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3469: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3440: \$? = $ac_status" >&5
++  echo "$as_me:3472: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_libm=yes
+ else
+@@ -3447,7 +3479,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3450: result: $cf_cv_have_libm" >&5
++echo "$as_me:3482: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ 	LIBS="$cf_save_LIBS"
+ 
+@@ -3502,7 +3534,7 @@
+ cf_cv_screen=curses
+ cf_cv_libtype=
+ 
+-echo "$as_me:3505: checking for fgrep" >&5
++echo "$as_me:3537: checking for fgrep" >&5
+ echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
+ if test "${ac_cv_path_FGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3514,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:3517: 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_path_FGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3531,7 +3563,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_FGREP="$ac_dir/$ac_word"
+-   echo "$as_me:3534: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3566: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3542,10 +3574,10 @@
+ FGREP=$ac_cv_path_FGREP
+ 
+ if test -n "$FGREP"; then
+-  echo "$as_me:3545: result: $FGREP" >&5
++  echo "$as_me:3577: result: $FGREP" >&5
+ echo "${ECHO_T}$FGREP" >&6
+ else
+-  echo "$as_me:3548: result: no" >&5
++  echo "$as_me:3580: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3553,16 +3585,16 @@
+ done
+ test -n "$FGREP" || FGREP=": "
+ 
+-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3556: error: cannot find workable fgrep" >&5
++     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3588: error: cannot find workable fgrep" >&5
+ echo "$as_me: error: cannot find workable fgrep" >&2;}
+    { (exit 1); exit 1; }; }
+    fi
+ fi
+-echo "$as_me:3561: result: $ac_cv_path_FGREP" >&5
++echo "$as_me:3593: result: $ac_cv_path_FGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_FGREP" >&6
+  FGREP="$ac_cv_path_FGREP"
+ 
+-echo "$as_me:3565: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:3597: 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.
+@@ -3579,17 +3611,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:3582: result: $enable_stdnoreturn" >&5
++echo "$as_me:3614: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:3586: checking for C11 _Noreturn feature" >&5
++echo "$as_me:3618: 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 3592 "configure"
++#line 3624 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -3605,16 +3637,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3608: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3640: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3611: \$? = $ac_status" >&5
++  echo "$as_me:3643: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3614: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3646: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3617: \$? = $ac_status" >&5
++  echo "$as_me:3649: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -3625,7 +3657,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:3628: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:3660: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -3664,10 +3696,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:3667: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:3699: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -3717,12 +3749,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:3720: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:3752: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3723: \$? = $ac_status" >&5
++  echo "$as_me:3755: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:3725: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:3757: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -3781,7 +3813,7 @@
+ rm -rf ./conftest*
+ fi
+ 
+-echo "$as_me:3784: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:3816: 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.
+@@ -3791,7 +3823,7 @@
+ else
+   enable_string_hacks=no
+ fi;
+-echo "$as_me:3794: result: $enable_string_hacks" >&5
++echo "$as_me:3826: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+ 
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -3800,15 +3832,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:3803: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:3835: 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:3805: checking for strlcat" >&5
++	echo "$as_me:3837: 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 3811 "configure"
++#line 3843 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -3839,16 +3871,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3842: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3874: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3845: \$? = $ac_status" >&5
++  echo "$as_me:3877: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:3848: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3880: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3851: \$? = $ac_status" >&5
++  echo "$as_me:3883: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -3858,7 +3890,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3861: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:3893: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+ 
+@@ -3868,7 +3900,7 @@
+ 
+ else
+ 
+-		echo "$as_me:3871: checking for strlcat in -lbsd" >&5
++		echo "$as_me:3903: 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
+@@ -3876,7 +3908,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3879 "configure"
++#line 3911 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -3895,16 +3927,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3898: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3930: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3901: \$? = $ac_status" >&5
++  echo "$as_me:3933: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:3904: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3936: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3907: \$? = $ac_status" >&5
++  echo "$as_me:3939: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -3915,7 +3947,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:3918: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:3950: 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
+ 
+@@ -3938,23 +3970,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:3941: checking for $ac_header" >&5
++echo "$as_me:3973: 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 3947 "configure"
++#line 3979 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:3951: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3983: \"$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:3957: \$? = $ac_status" >&5
++  echo "$as_me:3989: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3973,7 +4005,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:3976: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:4008: 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:4029: 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 4003 "configure"
++#line 4035 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -4031,16 +4063,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:4034: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4066: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4037: \$? = $ac_status" >&5
++  echo "$as_me:4069: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:4040: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4072: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4043: \$? = $ac_status" >&5
++  echo "$as_me:4075: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -4050,7 +4082,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:4053: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:4085: 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:4097: 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 4072 "configure"
++#line 4104 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4088,16 +4120,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4091: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4123: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4094: \$? = $ac_status" >&5
++  echo "$as_me:4126: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4097: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4129: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4100: \$? = $ac_status" >&5
++  echo "$as_me:4132: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -4108,7 +4140,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4111: result: $cf_cv_posix_visible" >&5
++echo "$as_me:4143: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -4150,14 +4182,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:4153: checking if this is the GNU C library" >&5
++echo "$as_me:4185: 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 4160 "configure"
++#line 4192 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4176,16 +4208,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4179: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4211: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4182: \$? = $ac_status" >&5
++  echo "$as_me:4214: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4185: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4217: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4188: \$? = $ac_status" >&5
++  echo "$as_me:4220: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -4196,7 +4228,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4199: result: $cf_cv_gnu_library" >&5
++echo "$as_me:4231: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -4204,7 +4236,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:4207: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:4239: 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
+@@ -4216,7 +4248,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4219 "configure"
++#line 4251 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4235,16 +4267,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4238: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4270: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4241: \$? = $ac_status" >&5
++  echo "$as_me:4273: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4244: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4276: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4247: \$? = $ac_status" >&5
++  echo "$as_me:4279: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -4256,12 +4288,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:4259: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:4291: 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:4264: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:4296: 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
+@@ -4366,7 +4398,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4369 "configure"
++#line 4401 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -4386,16 +4418,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4389: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4421: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4392: \$? = $ac_status" >&5
++  echo "$as_me:4424: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4395: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4427: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4398: \$? = $ac_status" >&5
++  echo "$as_me:4430: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -4406,7 +4438,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4409: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:4441: 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
+@@ -4415,14 +4447,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:4418: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:4450: 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 4425 "configure"
++#line 4457 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4437,16 +4469,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4440: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4472: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4443: \$? = $ac_status" >&5
++  echo "$as_me:4475: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4446: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4478: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4449: \$? = $ac_status" >&5
++  echo "$as_me:4481: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -4553,7 +4585,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4556 "configure"
++#line 4588 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4568,16 +4600,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4571: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4603: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4574: \$? = $ac_status" >&5
++  echo "$as_me:4606: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4577: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4609: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4580: \$? = $ac_status" >&5
++  echo "$as_me:4612: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -4592,12 +4624,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4595: result: $cf_cv_gnu_source" >&5
++echo "$as_me:4627: 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:4600: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:4632: 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
+@@ -4607,7 +4639,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4610 "configure"
++#line 4642 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4622,16 +4654,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4625: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4657: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4628: \$? = $ac_status" >&5
++  echo "$as_me:4660: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4631: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4663: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4634: \$? = $ac_status" >&5
++  echo "$as_me:4666: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -4642,7 +4674,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4645: result: $cf_cv_default_source" >&5
++echo "$as_me:4677: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -4679,16 +4711,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:4682: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:4714: 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}:4688: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:4720: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4691 "configure"
++#line 4723 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4703,16 +4735,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4706: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4738: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4709: \$? = $ac_status" >&5
++  echo "$as_me:4741: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4712: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4744: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4715: \$? = $ac_status" >&5
++  echo "$as_me:4747: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -4733,7 +4765,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4736 "configure"
++#line 4768 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4748,16 +4780,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4751: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4783: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4754: \$? = $ac_status" >&5
++  echo "$as_me:4786: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4757: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4789: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4760: \$? = $ac_status" >&5
++  echo "$as_me:4792: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -4768,7 +4800,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:4771: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:4803: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -4776,10 +4808,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:4779: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:4811: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4782 "configure"
++#line 4814 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4794,16 +4826,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4797: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4829: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4800: \$? = $ac_status" >&5
++  echo "$as_me:4832: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4803: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4835: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4806: \$? = $ac_status" >&5
++  echo "$as_me:4838: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -4819,7 +4851,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4822: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:4854: 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
+@@ -4936,7 +4968,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:4939: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:4971: 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
+@@ -4968,14 +5000,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:4971: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:5003: 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 4978 "configure"
++#line 5010 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -4993,16 +5025,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4996: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5028: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4999: \$? = $ac_status" >&5
++  echo "$as_me:5031: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5002: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5034: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5005: \$? = $ac_status" >&5
++  echo "$as_me:5037: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -5014,7 +5046,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5017 "configure"
++#line 5049 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -5032,16 +5064,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5035: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5067: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5038: \$? = $ac_status" >&5
++  echo "$as_me:5070: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5041: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5073: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5044: \$? = $ac_status" >&5
++  echo "$as_me:5076: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -5056,7 +5088,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:5059: result: $cf_cv_xopen_source" >&5
++echo "$as_me:5091: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -5216,16 +5248,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:5219: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:5251: 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}:5225: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:5257: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5228 "configure"
++#line 5260 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5240,16 +5272,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5243: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5275: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5246: \$? = $ac_status" >&5
++  echo "$as_me:5278: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5249: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5281: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5252: \$? = $ac_status" >&5
++  echo "$as_me:5284: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -5270,7 +5302,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5273 "configure"
++#line 5305 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5285,16 +5317,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5288: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5320: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5291: \$? = $ac_status" >&5
++  echo "$as_me:5323: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5294: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5326: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5297: \$? = $ac_status" >&5
++  echo "$as_me:5329: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5305,7 +5337,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:5308: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:5340: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -5313,10 +5345,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:5316: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:5348: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5319 "configure"
++#line 5351 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5331,16 +5363,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5334: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5366: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5337: \$? = $ac_status" >&5
++  echo "$as_me:5369: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5340: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5372: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5343: \$? = $ac_status" >&5
++  echo "$as_me:5375: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5356,7 +5388,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:5359: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:5391: 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
+@@ -5469,10 +5501,10 @@
+ 	if test "$cf_cv_xopen_source" = no ; then
+ 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+ 
+-echo "${as_me:-configure}:5472: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:5504: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5475 "configure"
++#line 5507 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -5490,23 +5522,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5493: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5525: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5496: \$? = $ac_status" >&5
++  echo "$as_me:5528: \$? = $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:5531: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5502: \$? = $ac_status" >&5
++  echo "$as_me:5534: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-			{ echo "$as_me:5509: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++			{ echo "$as_me:5541: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ 			CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -5529,7 +5561,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}:5532: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:5564: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -5541,7 +5573,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}:5544: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:5576: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -5629,7 +5661,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:5632: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:5664: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -5639,7 +5671,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:5642: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:5674: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -5649,7 +5681,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}:5652: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:5684: 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"
+@@ -5661,10 +5693,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:5664: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:5696: 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 5667 "configure"
++#line 5699 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5679,16 +5711,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5682: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5714: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5685: \$? = $ac_status" >&5
++  echo "$as_me:5717: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5688: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5720: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5691: \$? = $ac_status" >&5
++  echo "$as_me:5723: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -5697,12 +5729,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:5700: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:5732: 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 5705 "configure"
++#line 5737 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5717,16 +5749,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5720: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5752: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5723: \$? = $ac_status" >&5
++  echo "$as_me:5755: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5726: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5758: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5729: \$? = $ac_status" >&5
++  echo "$as_me:5761: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -5737,19 +5769,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:5740: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:5772: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:5745: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:5777: 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 5752 "configure"
++#line 5784 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -5767,16 +5799,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5770: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5802: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5773: \$? = $ac_status" >&5
++  echo "$as_me:5805: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5776: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5808: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5779: \$? = $ac_status" >&5
++  echo "$as_me:5811: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -5788,7 +5820,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5791 "configure"
++#line 5823 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -5806,16 +5838,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5809: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5841: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5812: \$? = $ac_status" >&5
++  echo "$as_me:5844: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5815: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5847: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5818: \$? = $ac_status" >&5
++  echo "$as_me:5850: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -5830,7 +5862,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:5833: result: $cf_cv_xopen_source" >&5
++echo "$as_me:5865: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -5977,13 +6009,13 @@
+ fi
+ fi # cf_cv_posix_visible
+ 
+-echo "$as_me:5980: checking for ANSI C header files" >&5
++echo "$as_me:6012: 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 5986 "configure"
++#line 6018 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -5991,13 +6023,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:5994: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:6026: \"$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:6000: \$? = $ac_status" >&5
++  echo "$as_me:6032: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6019,7 +6051,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 6022 "configure"
++#line 6054 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6037,7 +6069,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 6040 "configure"
++#line 6072 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6058,7 +6090,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6061 "configure"
++#line 6093 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -6084,15 +6116,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6087: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6119: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6090: \$? = $ac_status" >&5
++  echo "$as_me:6122: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:6092: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6124: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6095: \$? = $ac_status" >&5
++  echo "$as_me:6127: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6105,7 +6137,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:6108: result: $ac_cv_header_stdc" >&5
++echo "$as_me:6140: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -6121,28 +6153,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6124: checking for $ac_header" >&5
++echo "$as_me:6156: 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 6130 "configure"
++#line 6162 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6136: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6168: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6139: \$? = $ac_status" >&5
++  echo "$as_me:6171: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6142: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6174: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6145: \$? = $ac_status" >&5
++  echo "$as_me:6177: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -6152,7 +6184,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6155: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6187: 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:6197: checking whether exit is declared" >&5
+ echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
+ if test "${ac_cv_have_decl_exit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6171 "configure"
++#line 6203 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -6183,16 +6215,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6186: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6218: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6189: \$? = $ac_status" >&5
++  echo "$as_me:6221: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6192: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6224: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6195: \$? = $ac_status" >&5
++  echo "$as_me:6227: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_have_decl_exit=yes
+ else
+@@ -6202,10 +6234,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6205: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:6237: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+ 
+-echo "$as_me:6208: checking for signal global datatype" >&5
++echo "$as_me:6240: 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
+@@ -6217,7 +6249,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6220 "configure"
++#line 6252 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -6241,16 +6273,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6244: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6276: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6247: \$? = $ac_status" >&5
++  echo "$as_me:6279: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6250: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6282: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6253: \$? = $ac_status" >&5
++  echo "$as_me:6285: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -6264,7 +6296,7 @@
+ 
+ fi
+ 
+-echo "$as_me:6267: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:6299: 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:6308: 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 6283 "configure"
++#line 6315 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -6295,23 +6327,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6298: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6330: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6301: \$? = $ac_status" >&5
++  echo "$as_me:6333: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6304: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6336: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6307: \$? = $ac_status" >&5
++  echo "$as_me:6339: \$? = $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 6314 "configure"
++#line 6346 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -6329,16 +6361,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6332: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6364: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6335: \$? = $ac_status" >&5
++  echo "$as_me:6367: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6338: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6370: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6341: \$? = $ac_status" >&5
++  echo "$as_me:6373: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -6352,11 +6384,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:6355: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:6387: 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:6359: checking for actual SIGWINCH definition" >&5
++echo "$as_me:6391: 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
+@@ -6367,7 +6399,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6370 "configure"
++#line 6402 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -6389,16 +6421,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6392: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6424: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6395: \$? = $ac_status" >&5
++  echo "$as_me:6427: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6398: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6430: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6401: \$? = $ac_status" >&5
++  echo "$as_me:6433: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -6412,7 +6444,7 @@
+ done
+ 
+ fi
+-echo "$as_me:6415: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:6447: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -6422,13 +6454,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:6425: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:6457: 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 6431 "configure"
++#line 6463 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -6442,16 +6474,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6445: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6477: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6448: \$? = $ac_status" >&5
++  echo "$as_me:6480: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6451: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6483: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6454: \$? = $ac_status" >&5
++  echo "$as_me:6486: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -6462,7 +6494,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:6465: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:6497: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test "$am_cv_langinfo_codeset" = yes; then
+ 
+@@ -6472,7 +6504,7 @@
+ 
+ 	fi
+ 
+-echo "$as_me:6475: checking if you want to use pkg-config" >&5
++echo "$as_me:6507: 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.
+@@ -6482,7 +6514,7 @@
+ else
+   cf_pkg_config=yes
+ fi;
+-echo "$as_me:6485: result: $cf_pkg_config" >&5
++echo "$as_me:6517: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+ 
+ case "$cf_pkg_config" in
+@@ -6494,7 +6526,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:6497: checking for $ac_word" >&5
++echo "$as_me:6529: 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
+@@ -6511,7 +6543,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:6514: found $ac_dir/$ac_word" >&5
++   echo "$as_me:6546: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -6522,10 +6554,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:6525: result: $PKG_CONFIG" >&5
++  echo "$as_me:6557: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+-  echo "$as_me:6528: result: no" >&5
++  echo "$as_me:6560: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6534,7 +6566,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:6537: checking for $ac_word" >&5
++echo "$as_me:6569: 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
+@@ -6551,7 +6583,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:6554: found $ac_dir/$ac_word" >&5
++   echo "$as_me:6586: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -6563,10 +6595,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ 
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  echo "$as_me:6566: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:6598: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+-  echo "$as_me:6569: result: no" >&5
++  echo "$as_me:6601: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6590,37 +6622,35 @@
+ 	cf_path_syntax="$ac_default_prefix"
+ fi
+ 
+-case ".$PKG_CONFIG" in
+-(.\$\(*\)*|.\'*\'*)
++case "x$PKG_CONFIG" in
++(x\$\(*\)*|x\'*\'*)
+ 	;;
+-(..|./*|.\\*)
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+-	;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ 	eval PKG_CONFIG="$PKG_CONFIG"
+-	case ".$PKG_CONFIG" in
+-	(.NONE/*)
++	case "x$PKG_CONFIG" in
++	(xNONE/*)
+ 		PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ 		;;
+ 	esac
+ 	;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:6612: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++	{ { echo "$as_me:6642: 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:6619: WARNING: pkg-config is not installed" >&5
++	{ echo "$as_me:6649: WARNING: pkg-config is not installed" >&5
+ echo "$as_me: WARNING: pkg-config is not installed" >&2;}
+ fi
+ 
+-echo "$as_me:6623: checking if you want to see long compiling messages" >&5
++echo "$as_me:6653: 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.
+@@ -6654,10 +6684,10 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:6657: result: $enableval" >&5
++echo "$as_me:6687: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+-echo "$as_me:6660: checking for ncurses wrap-prefix" >&5
++echo "$as_me:6690: checking for ncurses wrap-prefix" >&5
+ echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given.
+@@ -6667,10 +6697,10 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-echo "$as_me:6670: result: $NCURSES_WRAP_PREFIX" >&5
++echo "$as_me:6700: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ 
+-echo "$as_me:6673: checking if you want to check for wide-character functions" >&5
++echo "$as_me:6703: checking if you want to check for wide-character functions" >&5
+ echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-widec or --disable-widec was given.
+@@ -6687,10 +6717,10 @@
+ 	cf_enable_widec=yes
+ 
+ fi;
+-echo "$as_me:6690: result: $cf_enable_widec" >&5
++echo "$as_me:6720: result: $cf_enable_widec" >&5
+ echo "${ECHO_T}$cf_enable_widec" >&6
+ 
+-echo "$as_me:6693: checking for specific curses-directory" >&5
++echo "$as_me:6723: 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.
+@@ -6700,7 +6730,7 @@
+ else
+   cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:6703: result: $cf_cv_curses_dir" >&5
++echo "$as_me:6733: 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"
+@@ -6712,26 +6742,24 @@
+ 	cf_path_syntax="$ac_default_prefix"
+ fi
+ 
+-case ".$withval" in
+-(.\$\(*\)*|.\'*\'*)
+-	;;
+-(..|./*|.\\*)
++case "x$withval" in
++(x\$\(*\)*|x\'*\'*)
+ 	;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ 	eval withval="$withval"
+-	case ".$withval" in
+-	(.NONE/*)
++	case "x$withval" in
++	(xNONE/*)
+ 		withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 		;;
+ 	esac
+ 	;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:6734: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:6762: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -6767,7 +6795,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6770 "configure"
++#line 6798 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6779,16 +6807,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6782: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6810: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6785: \$? = $ac_status" >&5
++  echo "$as_me:6813: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6788: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6816: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6791: \$? = $ac_status" >&5
++  echo "$as_me:6819: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6805,7 +6833,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}:6808: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6836: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -6841,7 +6869,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}:6844: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6872: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -6854,7 +6882,7 @@
+ 
+ cf_cv_screen=curses
+ 
+-echo "$as_me:6857: checking for specified curses library type" >&5
++echo "$as_me:6885: checking for specified curses library type" >&5
+ echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
+ 
+ # Check whether --with-screen or --without-screen was given.
+@@ -6898,13 +6926,13 @@
+ fi;
+ fi;
+ 
+-echo "$as_me:6901: result: $cf_cv_screen" >&5
++echo "$as_me:6929: result: $cf_cv_screen" >&5
+ echo "${ECHO_T}$cf_cv_screen" >&6
+ 
+ case $cf_cv_screen in
+ (curses|curses_*)
+ 
+-echo "$as_me:6907: checking for extra include directories" >&5
++echo "$as_me:6935: checking for extra include directories" >&5
+ echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
+ if test "${cf_cv_curses_incdir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6930,7 +6958,7 @@
+ esac
+ 
+ fi
+-echo "$as_me:6933: result: $cf_cv_curses_incdir" >&5
++echo "$as_me:6961: result: $cf_cv_curses_incdir" >&5
+ echo "${ECHO_T}$cf_cv_curses_incdir" >&6
+ if test "$cf_cv_curses_incdir" != no
+ then
+@@ -6940,7 +6968,7 @@
+ 
+ fi
+ 
+-echo "$as_me:6943: checking if we have identified curses headers" >&5
++echo "$as_me:6971: 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
+@@ -6952,7 +6980,7 @@
+ 	curses.h  ncurses/ncurses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6955 "configure"
++#line 6983 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -6964,16 +6992,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6967: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6995: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6970: \$? = $ac_status" >&5
++  echo "$as_me:6998: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6973: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7001: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6976: \$? = $ac_status" >&5
++  echo "$as_me:7004: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -6984,11 +7012,11 @@
+ done
+ 
+ fi
+-echo "$as_me:6987: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:7015: 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:6991: error: No curses header-files found" >&5
++	{ { echo "$as_me:7019: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6998,23 +7026,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:7001: checking for $ac_header" >&5
++echo "$as_me:7029: 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 7007 "configure"
++#line 7035 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7011: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7039: \"$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:7045: \$? = $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 +7061,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7036: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7064: 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:7074: 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
+@@ -7061,7 +7089,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7064 "configure"
++#line 7092 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -7076,16 +7104,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7079: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7107: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7082: \$? = $ac_status" >&5
++  echo "$as_me:7110: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7085: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7113: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7088: \$? = $ac_status" >&5
++  echo "$as_me:7116: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -7101,7 +7129,7 @@
+ done
+ 
+ fi
+-echo "$as_me:7104: result: $cf_cv_term_header" >&5
++echo "$as_me:7132: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -7133,7 +7161,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:7136: checking for ncurses version" >&5
++echo "$as_me:7164: 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
+@@ -7159,10 +7187,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:7162: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:7190: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7165: \$? = $ac_status" >&5
++  echo "$as_me:7193: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -7172,7 +7200,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7175 "configure"
++#line 7203 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -7199,15 +7227,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:7202: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7230: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7205: \$? = $ac_status" >&5
++  echo "$as_me:7233: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:7207: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7235: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7210: \$? = $ac_status" >&5
++  echo "$as_me:7238: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -7221,17 +7249,17 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:7224: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:7252: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:7231: checking if we have identified curses libraries" >&5
++echo "$as_me:7259: checking if we have identified curses libraries" >&5
+ echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7234 "configure"
++#line 7262 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7243,16 +7271,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7246: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7274: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7249: \$? = $ac_status" >&5
++  echo "$as_me:7277: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7252: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7280: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7255: \$? = $ac_status" >&5
++  echo "$as_me:7283: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -7261,13 +7289,13 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-echo "$as_me:7264: result: $cf_result" >&5
++echo "$as_me:7292: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test "$cf_result" = no ; then
+ case "$host_os" in
+ (freebsd*)
+-	echo "$as_me:7270: checking for tgoto in -lmytinfo" >&5
++	echo "$as_me:7298: 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
+@@ -7275,7 +7303,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7278 "configure"
++#line 7306 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7294,16 +7322,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7297: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7325: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7300: \$? = $ac_status" >&5
++  echo "$as_me:7328: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7303: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7331: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7306: \$? = $ac_status" >&5
++  echo "$as_me:7334: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -7314,7 +7342,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7317: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:7345: 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
+ 
+@@ -7344,7 +7372,7 @@
+ 	# term.h) for cur_colr
+ 	if test "x$cf_cv_screen" = "xcurses_colr"
+ 	then
+-		echo "$as_me:7347: checking for initscr in -lcur_colr" >&5
++		echo "$as_me:7375: checking for initscr in -lcur_colr" >&5
+ echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
+ if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7352,7 +7380,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcur_colr  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7355 "configure"
++#line 7383 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7371,16 +7399,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7374: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7402: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7377: \$? = $ac_status" >&5
++  echo "$as_me:7405: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7380: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7408: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7383: \$? = $ac_status" >&5
++  echo "$as_me:7411: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_cur_colr_initscr=yes
+ else
+@@ -7391,7 +7419,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7394: result: $ac_cv_lib_cur_colr_initscr" >&5
++echo "$as_me:7422: result: $ac_cv_lib_cur_colr_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
+ if test "$ac_cv_lib_cur_colr_initscr" = yes; then
+ 
+@@ -7415,7 +7443,7 @@
+ 
+ else
+ 
+-		echo "$as_me:7418: checking for initscr in -lHcurses" >&5
++		echo "$as_me:7446: checking for initscr in -lHcurses" >&5
+ echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
+ if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7423,7 +7451,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lHcurses  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7426 "configure"
++#line 7454 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7442,16 +7470,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7445: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7473: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7448: \$? = $ac_status" >&5
++  echo "$as_me:7476: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7451: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7479: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7454: \$? = $ac_status" >&5
++  echo "$as_me:7482: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_Hcurses_initscr=yes
+ else
+@@ -7462,7 +7490,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7465: result: $ac_cv_lib_Hcurses_initscr" >&5
++echo "$as_me:7493: result: $ac_cv_lib_Hcurses_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
+ if test "$ac_cv_lib_Hcurses_initscr" = yes; then
+ 
+@@ -7520,7 +7548,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}:7523: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7551: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7549,7 +7577,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}:7552: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7580: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7580,7 +7608,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}:7583: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7611: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7615,7 +7643,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}:7618: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7646: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7659,13 +7687,13 @@
+ 	# because it may be needed to link the test-case for initscr.
+ 	if test "x$cf_term_lib" = x
+ 	then
+-		echo "$as_me:7662: checking for tgoto" >&5
++		echo "$as_me:7690: checking for tgoto" >&5
+ echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
+ if test "${ac_cv_func_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7668 "configure"
++#line 7696 "configure"
+ #include "confdefs.h"
+ #define tgoto autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7696,16 +7724,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7699: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7727: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7702: \$? = $ac_status" >&5
++  echo "$as_me:7730: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7705: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7733: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7708: \$? = $ac_status" >&5
++  echo "$as_me:7736: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_tgoto=yes
+ else
+@@ -7715,7 +7743,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7718: result: $ac_cv_func_tgoto" >&5
++echo "$as_me:7746: result: $ac_cv_func_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_func_tgoto" >&6
+ if test "$ac_cv_func_tgoto" = yes; then
+   cf_term_lib=predefined
+@@ -7724,7 +7752,7 @@
+ 			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
+ 			do
+ 				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
+-echo "$as_me:7727: checking for tgoto in -l$cf_term_lib" >&5
++echo "$as_me:7755: checking for tgoto in -l$cf_term_lib" >&5
+ echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7732,7 +7760,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_term_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7735 "configure"
++#line 7763 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7751,16 +7779,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7754: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7782: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7757: \$? = $ac_status" >&5
++  echo "$as_me:7785: \$? = $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:7788: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7763: \$? = $ac_status" >&5
++  echo "$as_me:7791: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -7771,7 +7799,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7774: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:7802: 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
+ 
+@@ -7794,10 +7822,10 @@
+ 		do
+ 			LIBS="-l$cf_curs_lib $cf_save_LIBS"
+ 			if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
+-				echo "$as_me:7797: checking if we can link with $cf_curs_lib library" >&5
++				echo "$as_me:7825: checking if we can link with $cf_curs_lib library" >&5
+ echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7800 "configure"
++#line 7828 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7809,16 +7837,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7812: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7840: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7815: \$? = $ac_status" >&5
++  echo "$as_me:7843: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7818: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7846: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7821: \$? = $ac_status" >&5
++  echo "$as_me:7849: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -7827,16 +7855,16 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-				echo "$as_me:7830: result: $cf_result" >&5
++				echo "$as_me:7858: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 				test "$cf_result" = yes && break
+ 			elif test "$cf_curs_lib" = "$cf_term_lib" ; then
+ 				cf_result=no
+ 			elif test "$cf_term_lib" != predefined ; then
+-				echo "$as_me:7836: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
++				echo "$as_me:7864: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+ echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7839 "configure"
++#line 7867 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7848,16 +7876,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7851: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7879: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7854: \$? = $ac_status" >&5
++  echo "$as_me:7882: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7857: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7885: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7860: \$? = $ac_status" >&5
++  echo "$as_me:7888: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=no
+ else
+@@ -7866,7 +7894,7 @@
+ 
+ 					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
+ 					cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7869 "configure"
++#line 7897 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7878,16 +7906,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7881: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7909: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7884: \$? = $ac_status" >&5
++  echo "$as_me:7912: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7887: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7915: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7890: \$? = $ac_status" >&5
++  echo "$as_me:7918: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -7899,13 +7927,13 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-				echo "$as_me:7902: result: $cf_result" >&5
++				echo "$as_me:7930: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 				test "$cf_result" != error && break
+ 			fi
+ 		done
+ 	fi
+-	test "$cf_curs_lib" = unknown && { { echo "$as_me:7908: error: no curses library found" >&5
++	test "$cf_curs_lib" = unknown && { { echo "$as_me:7936: error: no curses library found" >&5
+ echo "$as_me: error: no curses library found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7917,23 +7945,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7920: checking for $ac_header" >&5
++echo "$as_me:7948: 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 7926 "configure"
++#line 7954 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7930: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7958: \"$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:7936: \$? = $ac_status" >&5
++  echo "$as_me:7964: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7952,7 +7980,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7955: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7983: 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:7993: 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
+@@ -7970,7 +7998,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7973 "configure"
++#line 8001 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -7987,16 +8015,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7990: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8018: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7993: \$? = $ac_status" >&5
++  echo "$as_me:8021: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7996: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8024: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7999: \$? = $ac_status" >&5
++  echo "$as_me:8027: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -8008,12 +8036,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:8011: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8039: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8016 "configure"
++#line 8044 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8026,16 +8054,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8029: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8057: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8032: \$? = $ac_status" >&5
++  echo "$as_me:8060: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8035: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8063: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8038: \$? = $ac_status" >&5
++  echo "$as_me:8066: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -8049,7 +8077,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8052 "configure"
++#line 8080 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8062,16 +8090,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8065: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8093: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8068: \$? = $ac_status" >&5
++  echo "$as_me:8096: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8071: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8099: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8074: \$? = $ac_status" >&5
++  echo "$as_me:8102: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -8088,9 +8116,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:8091: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:8119: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:8093: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8121: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -8181,7 +8209,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}:8184: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8212: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -8189,7 +8217,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8192 "configure"
++#line 8220 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8202,21 +8230,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8205: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8233: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8208: \$? = $ac_status" >&5
++  echo "$as_me:8236: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8211: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8239: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8214: \$? = $ac_status" >&5
++  echo "$as_me:8242: \$? = $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}:8219: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8247: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -8234,7 +8262,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:8237: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8265: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -8309,13 +8337,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}:8312: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8340: 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 8318 "configure"
++#line 8346 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8328,21 +8356,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8331: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8359: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8334: \$? = $ac_status" >&5
++  echo "$as_me:8362: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8337: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8365: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8340: \$? = $ac_status" >&5
++  echo "$as_me:8368: \$? = $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}:8345: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8373: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -8384,7 +8412,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8387: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:8415: 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
+@@ -8422,7 +8450,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8425 "configure"
++#line 8453 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8434,16 +8462,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8437: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8465: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8440: \$? = $ac_status" >&5
++  echo "$as_me:8468: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8443: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8471: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8446: \$? = $ac_status" >&5
++  echo "$as_me:8474: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -8460,7 +8488,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}:8463: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8491: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8496,7 +8524,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}:8499: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:8527: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -8526,13 +8554,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:8529: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:8557: 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:8532: result: yes" >&5
++		echo "$as_me:8560: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:8535: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:8563: 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
+ 
+@@ -8665,7 +8693,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8668 "configure"
++#line 8696 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8677,37 +8705,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8680: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8708: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8683: \$? = $ac_status" >&5
++  echo "$as_me:8711: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8686: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8714: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8689: \$? = $ac_status" >&5
++  echo "$as_me:8717: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8695 "configure"
++#line 8723 "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:8702: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8730: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8705: \$? = $ac_status" >&5
++  echo "$as_me:8733: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:8707: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8735: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8710: \$? = $ac_status" >&5
++  echo "$as_me:8738: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -8881,7 +8909,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8884 "configure"
++#line 8912 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8893,37 +8921,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8896: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8924: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8899: \$? = $ac_status" >&5
++  echo "$as_me:8927: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8902: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8930: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8905: \$? = $ac_status" >&5
++  echo "$as_me:8933: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8911 "configure"
++#line 8939 "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:8918: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8946: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8921: \$? = $ac_status" >&5
++  echo "$as_me:8949: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:8923: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8951: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8926: \$? = $ac_status" >&5
++  echo "$as_me:8954: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -8940,7 +8968,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:8943: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:8971: 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"
+@@ -8956,7 +8984,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:8959: checking for terminfo header" >&5
++echo "$as_me:8987: 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
+@@ -8974,7 +9002,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8977 "configure"
++#line 9005 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8989,16 +9017,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8992: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9020: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8995: \$? = $ac_status" >&5
++  echo "$as_me:9023: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8998: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9026: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9001: \$? = $ac_status" >&5
++  echo "$as_me:9029: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -9014,7 +9042,7 @@
+ done
+ 
+ fi
+-echo "$as_me:9017: result: $cf_cv_term_header" >&5
++echo "$as_me:9045: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9049,7 +9077,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:9052: result: no" >&5
++		echo "$as_me:9080: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -9065,7 +9093,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:9068: checking for $ac_word" >&5
++echo "$as_me:9096: 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
+@@ -9080,7 +9108,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:9083: found $ac_dir/$ac_word" >&5
++echo "$as_me:9111: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9088,10 +9116,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:9091: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:9119: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:9094: result: no" >&5
++  echo "$as_me:9122: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9104,7 +9132,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:9107: checking for $ac_word" >&5
++echo "$as_me:9135: 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
+@@ -9119,7 +9147,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:9122: found $ac_dir/$ac_word" >&5
++echo "$as_me:9150: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9127,10 +9155,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:9130: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:9158: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:9133: result: no" >&5
++  echo "$as_me:9161: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9287,7 +9315,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:9290: checking if we have identified curses headers" >&5
++echo "$as_me:9318: 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
+@@ -9299,7 +9327,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9302 "configure"
++#line 9330 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -9311,16 +9339,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9314: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9342: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9317: \$? = $ac_status" >&5
++  echo "$as_me:9345: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9320: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9348: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9323: \$? = $ac_status" >&5
++  echo "$as_me:9351: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -9331,11 +9359,11 @@
+ done
+ 
+ fi
+-echo "$as_me:9334: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:9362: 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:9338: error: No curses header-files found" >&5
++	{ { echo "$as_me:9366: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -9345,23 +9373,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:9348: checking for $ac_header" >&5
++echo "$as_me:9376: 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 9354 "configure"
++#line 9382 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:9358: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:9386: \"$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:9364: \$? = $ac_status" >&5
++  echo "$as_me:9392: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9380,7 +9408,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:9383: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:9411: 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 9439 "configure"
++#line 9467 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9448,16 +9476,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9451: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9479: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9454: \$? = $ac_status" >&5
++  echo "$as_me:9482: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9457: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9485: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9460: \$? = $ac_status" >&5
++  echo "$as_me:9488: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9474,7 +9502,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}:9477: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9505: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9493,7 +9521,7 @@
+ 
+ }
+ 
+-echo "$as_me:9496: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:9524: 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
+@@ -9505,7 +9533,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9508 "configure"
++#line 9536 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -9529,16 +9557,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9532: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9560: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9535: \$? = $ac_status" >&5
++  echo "$as_me:9563: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9538: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9566: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9541: \$? = $ac_status" >&5
++  echo "$as_me:9569: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -9553,14 +9581,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:9556: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:9584: 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:9563: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:9591: 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
+@@ -9681,7 +9709,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9684 "configure"
++#line 9712 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9693,16 +9721,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9696: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9724: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9699: \$? = $ac_status" >&5
++  echo "$as_me:9727: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9702: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9730: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9705: \$? = $ac_status" >&5
++  echo "$as_me:9733: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9719,7 +9747,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}:9722: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9750: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9742,7 +9770,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9745 "configure"
++#line 9773 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -9766,16 +9794,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9769: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9797: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9772: \$? = $ac_status" >&5
++  echo "$as_me:9800: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9775: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9803: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9778: \$? = $ac_status" >&5
++  echo "$as_me:9806: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -9796,12 +9824,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9799: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9827: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:9804: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:9832: 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%/[^/]*$%%'`
+@@ -9837,7 +9865,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9840 "configure"
++#line 9868 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9849,16 +9877,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9852: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9880: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9855: \$? = $ac_status" >&5
++  echo "$as_me:9883: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9858: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9886: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9861: \$? = $ac_status" >&5
++  echo "$as_me:9889: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9875,7 +9903,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}:9878: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9906: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9923,7 +9951,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9926: checking for terminfo header" >&5
++echo "$as_me:9954: 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
+@@ -9941,7 +9969,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9944 "configure"
++#line 9972 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9956,16 +9984,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9959: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9987: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9962: \$? = $ac_status" >&5
++  echo "$as_me:9990: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9965: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9993: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9968: \$? = $ac_status" >&5
++  echo "$as_me:9996: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -9981,7 +10009,7 @@
+ done
+ 
+ fi
+-echo "$as_me:9984: result: $cf_cv_term_header" >&5
++echo "$as_me:10012: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10019,7 +10047,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:10022: checking for ncurses version" >&5
++echo "$as_me:10050: 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
+@@ -10045,10 +10073,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:10048: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:10076: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10051: \$? = $ac_status" >&5
++  echo "$as_me:10079: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -10058,7 +10086,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10061 "configure"
++#line 10089 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -10085,15 +10113,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10088: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10116: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10091: \$? = $ac_status" >&5
++  echo "$as_me:10119: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10093: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10121: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10096: \$? = $ac_status" >&5
++  echo "$as_me:10124: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -10107,7 +10135,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:10110: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:10138: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -10120,7 +10148,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:10123: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:10151: 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
+@@ -10128,7 +10156,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10131 "configure"
++#line 10159 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10147,16 +10175,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10150: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10178: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10153: \$? = $ac_status" >&5
++  echo "$as_me:10181: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10156: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10184: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10159: \$? = $ac_status" >&5
++  echo "$as_me:10187: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -10167,10 +10195,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10170: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:10198: 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:10173: checking for initscr in -lgpm" >&5
++  echo "$as_me:10201: 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
+@@ -10178,7 +10206,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10181 "configure"
++#line 10209 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10197,16 +10225,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10200: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10228: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10203: \$? = $ac_status" >&5
++  echo "$as_me:10231: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10206: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10234: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10209: \$? = $ac_status" >&5
++  echo "$as_me:10237: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -10217,7 +10245,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10220: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:10248: 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"
+@@ -10232,7 +10260,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:10235: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:10263: 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
+@@ -10240,7 +10268,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10243 "configure"
++#line 10271 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10259,16 +10287,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10262: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10290: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10265: \$? = $ac_status" >&5
++  echo "$as_me:10293: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10268: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10296: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10271: \$? = $ac_status" >&5
++  echo "$as_me:10299: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -10279,7 +10307,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10282: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:10310: 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"
+@@ -10328,13 +10356,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:10331: checking for initscr" >&5
++	echo "$as_me:10359: 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 10337 "configure"
++#line 10365 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10365,16 +10393,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10368: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10396: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10371: \$? = $ac_status" >&5
++  echo "$as_me:10399: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10374: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10402: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10377: \$? = $ac_status" >&5
++  echo "$as_me:10405: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -10384,18 +10412,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10387: result: $ac_cv_func_initscr" >&5
++echo "$as_me:10415: 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:10394: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:10422: 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 10398 "configure"
++#line 10426 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10407,25 +10435,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10410: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10438: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10413: \$? = $ac_status" >&5
++  echo "$as_me:10441: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10416: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10444: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10419: \$? = $ac_status" >&5
++  echo "$as_me:10447: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:10421: result: yes" >&5
++  echo "$as_me:10449: 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:10428: result: no" >&5
++echo "$as_me:10456: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -10493,11 +10521,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:10496: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:10524: 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 10500 "configure"
++#line 10528 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10509,25 +10537,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10512: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10540: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10515: \$? = $ac_status" >&5
++  echo "$as_me:10543: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10518: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10546: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10521: \$? = $ac_status" >&5
++  echo "$as_me:10549: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:10523: result: yes" >&5
++  echo "$as_me:10551: 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:10530: result: no" >&5
++echo "$as_me:10558: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -10542,7 +10570,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:10545: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:10573: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -10550,7 +10578,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:10553: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:10581: 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
+@@ -10560,7 +10588,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10563 "configure"
++#line 10591 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10572,23 +10600,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10575: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10603: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10578: \$? = $ac_status" >&5
++  echo "$as_me:10606: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10581: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10609: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10584: \$? = $ac_status" >&5
++  echo "$as_me:10612: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:10586: result: yes" >&5
++  echo "$as_me:10614: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:10591: result: no" >&5
++echo "$as_me:10619: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -10613,13 +10641,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:10616: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:10644: 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:10619: result: yes" >&5
++		echo "$as_me:10647: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:10622: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:10650: 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
+ 
+@@ -10752,7 +10780,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10755 "configure"
++#line 10783 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10764,37 +10792,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10767: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10795: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10770: \$? = $ac_status" >&5
++  echo "$as_me:10798: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10773: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10801: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10776: \$? = $ac_status" >&5
++  echo "$as_me:10804: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10782 "configure"
++#line 10810 "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:10789: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10817: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10792: \$? = $ac_status" >&5
++  echo "$as_me:10820: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10794: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10822: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10797: \$? = $ac_status" >&5
++  echo "$as_me:10825: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -10968,7 +10996,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10971 "configure"
++#line 10999 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10980,37 +11008,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10983: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11011: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10986: \$? = $ac_status" >&5
++  echo "$as_me:11014: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10989: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11017: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10992: \$? = $ac_status" >&5
++  echo "$as_me:11020: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10998 "configure"
++#line 11026 "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:11005: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11033: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11008: \$? = $ac_status" >&5
++  echo "$as_me:11036: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:11010: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11038: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11013: \$? = $ac_status" >&5
++  echo "$as_me:11041: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -11027,7 +11055,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:11030: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:11058: 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"
+@@ -11043,7 +11071,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:11046: checking for terminfo header" >&5
++echo "$as_me:11074: 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
+@@ -11061,7 +11089,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11064 "configure"
++#line 11092 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -11076,16 +11104,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11079: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11107: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11082: \$? = $ac_status" >&5
++  echo "$as_me:11110: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11085: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11113: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11088: \$? = $ac_status" >&5
++  echo "$as_me:11116: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -11101,7 +11129,7 @@
+ done
+ 
+ fi
+-echo "$as_me:11104: result: $cf_cv_term_header" >&5
++echo "$as_me:11132: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -11136,7 +11164,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:11139: result: no" >&5
++		echo "$as_me:11167: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -11152,7 +11180,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:11155: checking for $ac_word" >&5
++echo "$as_me:11183: 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
+@@ -11167,7 +11195,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:11170: found $ac_dir/$ac_word" >&5
++echo "$as_me:11198: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -11175,10 +11203,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:11178: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:11206: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:11181: result: no" >&5
++  echo "$as_me:11209: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -11191,7 +11219,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:11194: checking for $ac_word" >&5
++echo "$as_me:11222: 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
+@@ -11206,7 +11234,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:11209: found $ac_dir/$ac_word" >&5
++echo "$as_me:11237: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -11214,10 +11242,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:11217: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:11245: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:11220: result: no" >&5
++  echo "$as_me:11248: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -11374,7 +11402,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:11377: checking if we have identified curses headers" >&5
++echo "$as_me:11405: 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
+@@ -11386,7 +11414,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11389 "configure"
++#line 11417 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -11398,16 +11426,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11401: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11429: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11404: \$? = $ac_status" >&5
++  echo "$as_me:11432: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11407: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11435: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11410: \$? = $ac_status" >&5
++  echo "$as_me:11438: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -11418,11 +11446,11 @@
+ done
+ 
+ fi
+-echo "$as_me:11421: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:11449: 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:11425: error: No curses header-files found" >&5
++	{ { echo "$as_me:11453: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -11432,23 +11460,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:11435: checking for $ac_header" >&5
++echo "$as_me:11463: 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 11441 "configure"
++#line 11469 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:11445: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:11473: \"$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:11451: \$? = $ac_status" >&5
++  echo "$as_me:11479: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11467,7 +11495,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:11470: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:11498: 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 11526 "configure"
++#line 11554 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11535,16 +11563,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11538: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11566: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11541: \$? = $ac_status" >&5
++  echo "$as_me:11569: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11544: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11572: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11547: \$? = $ac_status" >&5
++  echo "$as_me:11575: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11561,7 +11589,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}:11564: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11592: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -11580,7 +11608,7 @@
+ 
+ }
+ 
+-echo "$as_me:11583: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:11611: 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
+@@ -11592,7 +11620,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11595 "configure"
++#line 11623 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -11616,16 +11644,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11619: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11647: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11622: \$? = $ac_status" >&5
++  echo "$as_me:11650: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11625: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11653: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11628: \$? = $ac_status" >&5
++  echo "$as_me:11656: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -11640,14 +11668,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:11643: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:11671: 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:11650: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:11678: 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
+@@ -11768,7 +11796,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11771 "configure"
++#line 11799 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11780,16 +11808,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11783: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11811: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11786: \$? = $ac_status" >&5
++  echo "$as_me:11814: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11789: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11817: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11792: \$? = $ac_status" >&5
++  echo "$as_me:11820: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11806,7 +11834,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}:11809: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11837: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -11829,7 +11857,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11832 "configure"
++#line 11860 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -11853,16 +11881,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11856: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11884: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11859: \$? = $ac_status" >&5
++  echo "$as_me:11887: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11862: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11890: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11865: \$? = $ac_status" >&5
++  echo "$as_me:11893: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -11883,12 +11911,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11886: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11914: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:11891: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:11919: 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%/[^/]*$%%'`
+@@ -11924,7 +11952,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11927 "configure"
++#line 11955 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11936,16 +11964,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11939: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11967: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11942: \$? = $ac_status" >&5
++  echo "$as_me:11970: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11945: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11973: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11948: \$? = $ac_status" >&5
++  echo "$as_me:11976: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11962,7 +11990,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}:11965: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11993: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -12010,7 +12038,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:12013: checking for terminfo header" >&5
++echo "$as_me:12041: 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
+@@ -12028,7 +12056,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12031 "configure"
++#line 12059 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -12043,16 +12071,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12046: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12074: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12049: \$? = $ac_status" >&5
++  echo "$as_me:12077: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12052: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12080: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12055: \$? = $ac_status" >&5
++  echo "$as_me:12083: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -12068,7 +12096,7 @@
+ done
+ 
+ fi
+-echo "$as_me:12071: result: $cf_cv_term_header" >&5
++echo "$as_me:12099: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -12106,7 +12134,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:12109: checking for ncurses version" >&5
++echo "$as_me:12137: 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
+@@ -12132,10 +12160,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:12135: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:12163: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12138: \$? = $ac_status" >&5
++  echo "$as_me:12166: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -12145,7 +12173,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12148 "configure"
++#line 12176 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12172,15 +12200,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:12175: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12203: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12178: \$? = $ac_status" >&5
++  echo "$as_me:12206: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:12180: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12208: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12183: \$? = $ac_status" >&5
++  echo "$as_me:12211: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -12194,7 +12222,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:12197: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:12225: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -12207,7 +12235,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:12210: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:12238: 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
+@@ -12215,7 +12243,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12218 "configure"
++#line 12246 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12234,16 +12262,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12237: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12265: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12240: \$? = $ac_status" >&5
++  echo "$as_me:12268: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12243: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12271: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12246: \$? = $ac_status" >&5
++  echo "$as_me:12274: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -12254,10 +12282,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12257: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:12285: 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:12260: checking for initscr in -lgpm" >&5
++  echo "$as_me:12288: 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
+@@ -12265,7 +12293,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12268 "configure"
++#line 12296 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12284,16 +12312,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12287: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12315: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12290: \$? = $ac_status" >&5
++  echo "$as_me:12318: \$? = $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:12321: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12296: \$? = $ac_status" >&5
++  echo "$as_me:12324: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -12304,7 +12332,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12307: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:12335: 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"
+@@ -12319,7 +12347,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:12322: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:12350: 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
+@@ -12327,7 +12355,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12330 "configure"
++#line 12358 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12346,16 +12374,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12349: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12377: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12352: \$? = $ac_status" >&5
++  echo "$as_me:12380: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12355: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12383: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12358: \$? = $ac_status" >&5
++  echo "$as_me:12386: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -12366,7 +12394,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12369: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:12397: 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"
+@@ -12415,13 +12443,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:12418: checking for initscr" >&5
++	echo "$as_me:12446: 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 12424 "configure"
++#line 12452 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12452,16 +12480,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12455: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12483: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12458: \$? = $ac_status" >&5
++  echo "$as_me:12486: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12461: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12489: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12464: \$? = $ac_status" >&5
++  echo "$as_me:12492: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -12471,18 +12499,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12474: result: $ac_cv_func_initscr" >&5
++echo "$as_me:12502: 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:12481: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:12509: 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 12485 "configure"
++#line 12513 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12494,25 +12522,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12497: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12525: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12500: \$? = $ac_status" >&5
++  echo "$as_me:12528: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12503: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12531: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12506: \$? = $ac_status" >&5
++  echo "$as_me:12534: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:12508: result: yes" >&5
++  echo "$as_me:12536: 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:12515: result: no" >&5
++echo "$as_me:12543: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -12580,11 +12608,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:12583: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:12611: 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 12587 "configure"
++#line 12615 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12596,25 +12624,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12599: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12627: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12602: \$? = $ac_status" >&5
++  echo "$as_me:12630: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12605: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12633: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12608: \$? = $ac_status" >&5
++  echo "$as_me:12636: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:12610: result: yes" >&5
++  echo "$as_me:12638: 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:12617: result: no" >&5
++echo "$as_me:12645: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -12629,7 +12657,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:12632: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:12660: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -12637,7 +12665,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:12640: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:12668: 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
+@@ -12647,7 +12675,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12650 "configure"
++#line 12678 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12659,23 +12687,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12662: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12690: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12665: \$? = $ac_status" >&5
++  echo "$as_me:12693: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12668: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12696: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12671: \$? = $ac_status" >&5
++  echo "$as_me:12699: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:12673: result: yes" >&5
++  echo "$as_me:12701: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:12678: result: no" >&5
++echo "$as_me:12706: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -12695,7 +12723,7 @@
+ 
+ 	;;
+ (pdcurses)
+-	echo "$as_me:12698: checking for X" >&5
++	echo "$as_me:12726: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
+ # Check whether --with-x or --without-x was given.
+@@ -12799,17 +12827,17 @@
+   # Guess where to find include files, by looking for Intrinsic.h.
+   # First, try using that file with no special directory specified.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12802 "configure"
++#line 12830 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:12806: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12834: \"$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:12812: \$? = $ac_status" >&5
++  echo "$as_me:12840: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12842,7 +12870,7 @@
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12845 "configure"
++#line 12873 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12854,16 +12882,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12857: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12885: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12860: \$? = $ac_status" >&5
++  echo "$as_me:12888: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12863: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12891: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12866: \$? = $ac_status" >&5
++  echo "$as_me:12894: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -12901,7 +12929,7 @@
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:12904: result: $have_x" >&5
++  echo "$as_me:12932: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+   no_x=yes
+ else
+@@ -12911,7 +12939,7 @@
+   # Update the cache value to reflect the command line values.
+   ac_cv_have_x="have_x=yes \
+ 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  echo "$as_me:12914: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "$as_me:12942: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+@@ -12938,11 +12966,11 @@
+     # others require no space.  Words are not sufficient . . . .
+     case `(uname -sr) 2>/dev/null` in
+     "SunOS 5"*)
+-      echo "$as_me:12941: checking whether -R must be followed by a space" >&5
++      echo "$as_me:12969: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+       cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12945 "configure"
++#line 12973 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12954,16 +12982,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12957: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12985: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12960: \$? = $ac_status" >&5
++  echo "$as_me:12988: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12963: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12991: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12966: \$? = $ac_status" >&5
++  echo "$as_me:12994: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_nospace=yes
+ else
+@@ -12973,13 +13001,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+       if test $ac_R_nospace = yes; then
+-	echo "$as_me:12976: result: no" >&5
++	echo "$as_me:13004: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	X_LIBS="$X_LIBS -R$x_libraries"
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12982 "configure"
++#line 13010 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12991,16 +13019,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12994: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13022: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12997: \$? = $ac_status" >&5
++  echo "$as_me:13025: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13000: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13028: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13003: \$? = $ac_status" >&5
++  echo "$as_me:13031: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_space=yes
+ else
+@@ -13010,11 +13038,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	if test $ac_R_space = yes; then
+-	  echo "$as_me:13013: result: yes" >&5
++	  echo "$as_me:13041: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ 	else
+-	  echo "$as_me:13017: result: neither works" >&5
++	  echo "$as_me:13045: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ 	fi
+       fi
+@@ -13034,7 +13062,7 @@
+     # the Alpha needs dnet_stub (dnet does not exist).
+     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13037 "configure"
++#line 13065 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13053,22 +13081,22 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13056: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13084: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13059: \$? = $ac_status" >&5
++  echo "$as_me:13087: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13062: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13090: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13065: \$? = $ac_status" >&5
++  echo "$as_me:13093: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:13071: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:13099: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13076,7 +13104,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13079 "configure"
++#line 13107 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13095,16 +13123,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13098: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13126: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13101: \$? = $ac_status" >&5
++  echo "$as_me:13129: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13104: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13132: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13107: \$? = $ac_status" >&5
++  echo "$as_me:13135: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -13115,14 +13143,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13118: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:13146: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      echo "$as_me:13125: checking for dnet_ntoa in -ldnet_stub" >&5
++      echo "$as_me:13153: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13130,7 +13158,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13133 "configure"
++#line 13161 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13149,16 +13177,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13152: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13180: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13155: \$? = $ac_status" >&5
++  echo "$as_me:13183: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13158: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13186: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13161: \$? = $ac_status" >&5
++  echo "$as_me:13189: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -13169,7 +13197,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13172: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:13200: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -13188,13 +13216,13 @@
+     # on Irix 5.2, according to T.E. Dickey.
+     # The functions gethostbyname, getservbyname, and inet_addr are
+     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+-    echo "$as_me:13191: checking for gethostbyname" >&5
++    echo "$as_me:13219: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13197 "configure"
++#line 13225 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13225,16 +13253,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13228: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13256: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13231: \$? = $ac_status" >&5
++  echo "$as_me:13259: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13234: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13262: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13237: \$? = $ac_status" >&5
++  echo "$as_me:13265: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gethostbyname=yes
+ else
+@@ -13244,11 +13272,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13247: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:13275: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+-      echo "$as_me:13251: checking for gethostbyname in -lnsl" >&5
++      echo "$as_me:13279: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13256,7 +13284,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13259 "configure"
++#line 13287 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13275,16 +13303,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13278: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13306: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13281: \$? = $ac_status" >&5
++  echo "$as_me:13309: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13284: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13312: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13287: \$? = $ac_status" >&5
++  echo "$as_me:13315: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -13295,14 +13323,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13298: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:13326: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test "$ac_cv_lib_nsl_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+-        echo "$as_me:13305: checking for gethostbyname in -lbsd" >&5
++        echo "$as_me:13333: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13310,7 +13338,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13313 "configure"
++#line 13341 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13329,16 +13357,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13332: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13360: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13335: \$? = $ac_status" >&5
++  echo "$as_me:13363: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13338: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13366: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13341: \$? = $ac_status" >&5
++  echo "$as_me:13369: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -13349,7 +13377,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13352: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:13380: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test "$ac_cv_lib_bsd_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -13365,13 +13393,13 @@
+     # variants that don't use the nameserver (or something).  -lsocket
+     # must be given before -lnsl if both are needed.  We assume that
+     # if connect needs -lnsl, so does gethostbyname.
+-    echo "$as_me:13368: checking for connect" >&5
++    echo "$as_me:13396: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13374 "configure"
++#line 13402 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13402,16 +13430,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13405: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13433: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13408: \$? = $ac_status" >&5
++  echo "$as_me:13436: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13411: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13439: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13414: \$? = $ac_status" >&5
++  echo "$as_me:13442: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_connect=yes
+ else
+@@ -13421,11 +13449,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13424: result: $ac_cv_func_connect" >&5
++echo "$as_me:13452: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+ 
+     if test $ac_cv_func_connect = no; then
+-      echo "$as_me:13428: checking for connect in -lsocket" >&5
++      echo "$as_me:13456: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13433,7 +13461,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13436 "configure"
++#line 13464 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13452,16 +13480,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13455: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13483: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13458: \$? = $ac_status" >&5
++  echo "$as_me:13486: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13461: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13489: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13464: \$? = $ac_status" >&5
++  echo "$as_me:13492: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_socket_connect=yes
+ else
+@@ -13472,7 +13500,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13475: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:13503: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test "$ac_cv_lib_socket_connect" = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -13481,13 +13509,13 @@
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    echo "$as_me:13484: checking for remove" >&5
++    echo "$as_me:13512: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13490 "configure"
++#line 13518 "configure"
+ #include "confdefs.h"
+ #define remove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13518,16 +13546,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13521: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13549: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13524: \$? = $ac_status" >&5
++  echo "$as_me:13552: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13527: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13555: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13530: \$? = $ac_status" >&5
++  echo "$as_me:13558: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_remove=yes
+ else
+@@ -13537,11 +13565,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13540: result: $ac_cv_func_remove" >&5
++echo "$as_me:13568: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+ 
+     if test $ac_cv_func_remove = no; then
+-      echo "$as_me:13544: checking for remove in -lposix" >&5
++      echo "$as_me:13572: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13549,7 +13577,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13552 "configure"
++#line 13580 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13568,16 +13596,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13571: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13599: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13574: \$? = $ac_status" >&5
++  echo "$as_me:13602: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13577: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13605: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13580: \$? = $ac_status" >&5
++  echo "$as_me:13608: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_posix_remove=yes
+ else
+@@ -13588,7 +13616,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13591: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:13619: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test "$ac_cv_lib_posix_remove" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -13597,13 +13625,13 @@
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    echo "$as_me:13600: checking for shmat" >&5
++    echo "$as_me:13628: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13606 "configure"
++#line 13634 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13634,16 +13662,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13637: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13665: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13640: \$? = $ac_status" >&5
++  echo "$as_me:13668: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13643: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13671: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13646: \$? = $ac_status" >&5
++  echo "$as_me:13674: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_shmat=yes
+ else
+@@ -13653,11 +13681,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13656: result: $ac_cv_func_shmat" >&5
++echo "$as_me:13684: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+ 
+     if test $ac_cv_func_shmat = no; then
+-      echo "$as_me:13660: checking for shmat in -lipc" >&5
++      echo "$as_me:13688: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13665,7 +13693,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13668 "configure"
++#line 13696 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13684,16 +13712,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13687: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13715: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13690: \$? = $ac_status" >&5
++  echo "$as_me:13718: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13693: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13721: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13696: \$? = $ac_status" >&5
++  echo "$as_me:13724: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+@@ -13704,7 +13732,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13707: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:13735: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test "$ac_cv_lib_ipc_shmat" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -13722,7 +13750,7 @@
+   # These have to be linked with before -lX11, unlike the other
+   # libraries we check for below, so use a different variable.
+   # John Interrante, Karl Berry
+-  echo "$as_me:13725: checking for IceConnectionNumber in -lICE" >&5
++  echo "$as_me:13753: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13730,7 +13758,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13733 "configure"
++#line 13761 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13749,16 +13777,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13752: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13780: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13755: \$? = $ac_status" >&5
++  echo "$as_me:13783: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13758: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13786: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13761: \$? = $ac_status" >&5
++  echo "$as_me:13789: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -13769,7 +13797,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13772: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:13800: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -13781,7 +13809,7 @@
+ 
+ cf_x_athena=${cf_x_athena:-Xaw}
+ 
+-echo "$as_me:13784: checking if you want to link with Xaw 3d library" >&5
++echo "$as_me:13812: checking if you want to link with Xaw 3d library" >&5
+ echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
+ withval=
+ 
+@@ -13792,14 +13820,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=Xaw3d
+-	echo "$as_me:13795: result: yes" >&5
++	echo "$as_me:13823: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:13798: result: no" >&5
++	echo "$as_me:13826: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:13802: checking if you want to link with Xaw 3d xft library" >&5
++echo "$as_me:13830: checking if you want to link with Xaw 3d xft library" >&5
+ echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
+ withval=
+ 
+@@ -13810,14 +13838,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=Xaw3dxft
+-	echo "$as_me:13813: result: yes" >&5
++	echo "$as_me:13841: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:13816: result: no" >&5
++	echo "$as_me:13844: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:13820: checking if you want to link with neXT Athena library" >&5
++echo "$as_me:13848: checking if you want to link with neXT Athena library" >&5
+ echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
+ withval=
+ 
+@@ -13828,14 +13856,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=neXtaw
+-	echo "$as_me:13831: result: yes" >&5
++	echo "$as_me:13859: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:13834: result: no" >&5
++	echo "$as_me:13862: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:13838: checking if you want to link with Athena-Plus library" >&5
++echo "$as_me:13866: checking if you want to link with Athena-Plus library" >&5
+ echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
+ withval=
+ 
+@@ -13846,10 +13874,10 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=XawPlus
+-	echo "$as_me:13849: result: yes" >&5
++	echo "$as_me:13877: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:13852: result: no" >&5
++	echo "$as_me:13880: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -13869,17 +13897,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_athena_pkg"; then
+ 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
+ 
+-echo "${as_me:-configure}:13872: testing found package $cf_athena_pkg ..." 1>&5
++echo "${as_me:-configure}:13900: testing found package $cf_athena_pkg ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_athena_pkg" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_athena_pkg" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:13878: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13906: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:13882: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13910: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14010,20 +14038,20 @@
+ 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
+ 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14013: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:14041: testing ..trimmed $LIBS ..." 1>&5
+ 
+ 			;;
+ 		esac
+ 	done
+ 
+-echo "$as_me:14019: checking for usable $cf_x_athena/Xmu package" >&5
++echo "$as_me:14047: checking for usable $cf_x_athena/Xmu package" >&5
+ echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
+ if test "${cf_cv_xaw_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14026 "configure"
++#line 14054 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14041,16 +14069,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14044: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14072: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14047: \$? = $ac_status" >&5
++  echo "$as_me:14075: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14050: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14078: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14053: \$? = $ac_status" >&5
++  echo "$as_me:14081: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xaw_compat=yes
+ else
+@@ -14060,7 +14088,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14063: result: $cf_cv_xaw_compat" >&5
++echo "$as_me:14091: result: $cf_cv_xaw_compat" >&5
+ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
+ 
+ 			if test "$cf_cv_xaw_compat" = no
+@@ -14072,7 +14100,7 @@
+ 				(*)
+ 					test -n "$verbose" && echo "	work around broken package" 1>&6
+ 
+-echo "${as_me:-configure}:14075: testing work around broken package ..." 1>&5
++echo "${as_me:-configure}:14103: testing work around broken package ..." 1>&5
+ 
+ 					cf_save_xmu="$LIBS"
+ 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
+@@ -14080,17 +14108,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
+ 	test -n "$verbose" && echo "	found package xmu" 1>&6
+ 
+-echo "${as_me:-configure}:14083: testing found package xmu ..." 1>&5
++echo "${as_me:-configure}:14111: testing found package xmu ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xmu" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xmu" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14089: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14117: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xmu LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14093: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14121: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14210,12 +14238,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14213: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14241: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14218: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:14246: testing ...after  $LIBS ..." 1>&5
+ 
+ else
+ 	cf_pkgconfig_incs=
+@@ -14223,12 +14251,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14226: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14254: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14231: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:14259: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -14239,7 +14267,7 @@
+ 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
+ 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14242: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:14270: testing ..trimmed $LIBS ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -14264,17 +14292,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
+ 	test -n "$verbose" && echo "	found package Xext" 1>&6
+ 
+-echo "${as_me:-configure}:14267: testing found package Xext ..." 1>&5
++echo "${as_me:-configure}:14295: testing found package Xext ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "Xext" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "Xext" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14273: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14301: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package Xext LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14277: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14305: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14395,7 +14423,7 @@
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+ 
+-	echo "$as_me:14398: checking for XextCreateExtension in -lXext" >&5
++	echo "$as_me:14426: checking for XextCreateExtension in -lXext" >&5
+ echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14403,7 +14431,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXext  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14406 "configure"
++#line 14434 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14422,16 +14450,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14425: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14453: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14428: \$? = $ac_status" >&5
++  echo "$as_me:14456: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14431: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14459: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14434: \$? = $ac_status" >&5
++  echo "$as_me:14462: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_Xext_XextCreateExtension=yes
+ else
+@@ -14442,7 +14470,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14445: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
++echo "$as_me:14473: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
+ if test "$ac_cv_lib_Xext_XextCreateExtension" = yes; then
+ 
+@@ -14478,17 +14506,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
+ 	test -n "$verbose" && echo "	found package x11" 1>&6
+ 
+-echo "${as_me:-configure}:14481: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:14509: testing found package x11 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "x11" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14487: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14515: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14491: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14519: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14608,24 +14636,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:14611: WARNING: unable to find X11 library" >&5
++	{ echo "$as_me:14639: WARNING: unable to find X11 library" >&5
+ echo "$as_me: WARNING: unable to find X11 library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then
+ 	test -n "$verbose" && echo "	found package ice" 1>&6
+ 
+-echo "${as_me:-configure}:14618: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:14646: testing found package ice ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "ice" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14624: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14652: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14628: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14656: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14745,24 +14773,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:14748: WARNING: unable to find ICE library" >&5
++	{ echo "$as_me:14776: WARNING: unable to find ICE library" >&5
+ echo "$as_me: WARNING: unable to find ICE library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
+ 	test -n "$verbose" && echo "	found package sm" 1>&6
+ 
+-echo "${as_me:-configure}:14755: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:14783: testing found package sm ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "sm" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14761: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14789: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14765: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14793: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14882,24 +14910,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:14885: WARNING: unable to find SM library" >&5
++	{ echo "$as_me:14913: WARNING: unable to find SM library" >&5
+ echo "$as_me: WARNING: unable to find SM library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
+ 	test -n "$verbose" && echo "	found package xt" 1>&6
+ 
+-echo "${as_me:-configure}:14892: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:14920: testing found package xt ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xt" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14898: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14926: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14902: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14930: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15019,7 +15047,7 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:15022: WARNING: unable to find Xt library" >&5
++	{ echo "$as_me:15050: WARNING: unable to find Xt library" >&5
+ echo "$as_me: WARNING: unable to find Xt library" >&2;}
+ fi
+ 
+@@ -15032,17 +15060,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
+ 	test -n "$verbose" && echo "	found package xt" 1>&6
+ 
+-echo "${as_me:-configure}:15035: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:15063: testing found package xt ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xt" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15041: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15069: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15045: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15073: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15163,14 +15191,14 @@
+ 		;;
+ 	(*)
+ # we have an "xt" package, but it may omit Xt's dependency on X11
+-echo "$as_me:15166: checking for usable X dependency" >&5
++echo "$as_me:15194: checking for usable X dependency" >&5
+ echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
+ if test "${cf_cv_xt_x11_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15173 "configure"
++#line 15201 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -15190,16 +15218,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15193: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15221: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15196: \$? = $ac_status" >&5
++  echo "$as_me:15224: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15199: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15227: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15202: \$? = $ac_status" >&5
++  echo "$as_me:15230: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xt_x11_compat=yes
+ else
+@@ -15209,30 +15237,30 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15212: result: $cf_cv_xt_x11_compat" >&5
++echo "$as_me:15240: result: $cf_cv_xt_x11_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
+ 		if test "$cf_cv_xt_x11_compat" = no
+ 		then
+ 			test -n "$verbose" && echo "	work around broken X11 dependency" 1>&6
+ 
+-echo "${as_me:-configure}:15218: testing work around broken X11 dependency ..." 1>&5
++echo "${as_me:-configure}:15246: testing work around broken X11 dependency ..." 1>&5
+ 
+ 			# 2010/11/19 - good enough until a working Xt on Xcb is delivered.
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
+ 	test -n "$verbose" && echo "	found package x11" 1>&6
+ 
+-echo "${as_me:-configure}:15225: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:15253: testing found package x11 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "x11" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15231: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15259: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15235: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15263: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15355,12 +15383,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:15358: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:15386: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:15363: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:15391: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -15368,14 +15396,14 @@
+ 		;;
+ 	esac
+ 
+-echo "$as_me:15371: checking for usable X Toolkit package" >&5
++echo "$as_me:15399: checking for usable X Toolkit package" >&5
+ echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
+ if test "${cf_cv_xt_ice_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15378 "configure"
++#line 15406 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -15391,16 +15419,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15394: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15422: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15397: \$? = $ac_status" >&5
++  echo "$as_me:15425: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15400: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15428: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15403: \$? = $ac_status" >&5
++  echo "$as_me:15431: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xt_ice_compat=yes
+ else
+@@ -15410,7 +15438,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15413: result: $cf_cv_xt_ice_compat" >&5
++echo "$as_me:15441: result: $cf_cv_xt_ice_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
+ 
+ 	if test "$cf_cv_xt_ice_compat" = no
+@@ -15424,22 +15452,22 @@
+ 			(*)
+ 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
+ 
+-echo "${as_me:-configure}:15427: testing work around broken ICE dependency ..." 1>&5
++echo "${as_me:-configure}:15455: testing work around broken ICE dependency ..." 1>&5
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then
+ 	test -n "$verbose" && echo "	found package ice" 1>&6
+ 
+-echo "${as_me:-configure}:15432: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:15460: testing found package ice ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "ice" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15438: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15466: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15442: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15470: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15558,17 +15586,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
+ 	test -n "$verbose" && echo "	found package sm" 1>&6
+ 
+-echo "${as_me:-configure}:15561: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:15589: testing found package sm ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "sm" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15567: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15595: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15571: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15599: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15697,12 +15725,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:15700: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:15728: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:15705: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:15733: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -15722,7 +15750,7 @@
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15725: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15753: testing checking additions to CFLAGS ..." 1>&5
+ 
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -15807,7 +15835,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:15810: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:15838: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -15817,7 +15845,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:15820: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:15848: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -15827,7 +15855,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}:15830: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:15858: 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"
+@@ -15836,7 +15864,7 @@
+ 
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15839 "configure"
++#line 15867 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -15848,16 +15876,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15851: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15879: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15854: \$? = $ac_status" >&5
++  echo "$as_me:15882: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15857: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15885: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15860: \$? = $ac_status" >&5
++  echo "$as_me:15888: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -15865,12 +15893,12 @@
+ cat "conftest.$ac_ext" >&5
+ test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15868: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15896: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+ 
+ 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
+ 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15873: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:15901: testing but keeping change to \$CPPFLAGS ..." 1>&5
+ 
+ 	 fi
+ 	 CFLAGS="$cf_check_cflags"
+@@ -15878,13 +15906,13 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+ 
+-	echo "$as_me:15881: checking for XOpenDisplay" >&5
++	echo "$as_me:15909: checking for XOpenDisplay" >&5
+ echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
+ if test "${ac_cv_func_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15887 "configure"
++#line 15915 "configure"
+ #include "confdefs.h"
+ #define XOpenDisplay autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15915,16 +15943,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15918: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15946: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15921: \$? = $ac_status" >&5
++  echo "$as_me:15949: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15924: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15952: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15927: \$? = $ac_status" >&5
++  echo "$as_me:15955: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_XOpenDisplay=yes
+ else
+@@ -15934,13 +15962,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15937: result: $ac_cv_func_XOpenDisplay" >&5
++echo "$as_me:15965: result: $ac_cv_func_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
+ if test "$ac_cv_func_XOpenDisplay" = yes; then
+   :
+ else
+ 
+-	echo "$as_me:15943: checking for XOpenDisplay in -lX11" >&5
++	echo "$as_me:15971: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15948,7 +15976,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15951 "configure"
++#line 15979 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15967,16 +15995,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15970: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15998: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15973: \$? = $ac_status" >&5
++  echo "$as_me:16001: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15976: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16004: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15979: \$? = $ac_status" >&5
++  echo "$as_me:16007: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -15987,7 +16015,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:15990: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:16018: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then
+ 
+@@ -16011,13 +16039,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:16014: checking for XtAppInitialize" >&5
++	echo "$as_me:16042: checking for XtAppInitialize" >&5
+ echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
+ if test "${ac_cv_func_XtAppInitialize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16020 "configure"
++#line 16048 "configure"
+ #include "confdefs.h"
+ #define XtAppInitialize autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16048,16 +16076,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16051: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16079: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16054: \$? = $ac_status" >&5
++  echo "$as_me:16082: \$? = $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:16085: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16060: \$? = $ac_status" >&5
++  echo "$as_me:16088: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_XtAppInitialize=yes
+ else
+@@ -16067,13 +16095,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16070: result: $ac_cv_func_XtAppInitialize" >&5
++echo "$as_me:16098: result: $ac_cv_func_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
+ if test "$ac_cv_func_XtAppInitialize" = yes; then
+   :
+ else
+ 
+-	echo "$as_me:16076: checking for XtAppInitialize in -lXt" >&5
++	echo "$as_me:16104: checking for XtAppInitialize in -lXt" >&5
+ echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16081,7 +16109,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16084 "configure"
++#line 16112 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16100,16 +16128,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16103: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16131: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16106: \$? = $ac_status" >&5
++  echo "$as_me:16134: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16109: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16137: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16112: \$? = $ac_status" >&5
++  echo "$as_me:16140: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_Xt_XtAppInitialize=yes
+ else
+@@ -16120,7 +16148,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16123: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
++echo "$as_me:16151: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
+ if test "$ac_cv_lib_Xt_XtAppInitialize" = yes; then
+ 
+@@ -16137,7 +16165,7 @@
+ fi
+ 
+ if test "$cf_have_X_LIBS" = no ; then
+-	{ echo "$as_me:16140: WARNING: Unable to successfully link X Toolkit library (-lXt) with
++	{ echo "$as_me:16168: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+ test program.  You will have to check and add the proper libraries by hand
+ to makefile." >&5
+ echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+@@ -16178,14 +16206,14 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
+ 
+-			echo "$as_me:16181: checking for $cf_test in $cf_path" >&5
++			echo "$as_me:16209: checking for $cf_test in $cf_path" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
+ 		else
+-			echo "$as_me:16184: checking for $cf_test" >&5
++			echo "$as_me:16212: checking for $cf_test" >&5
+ echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
+ 		fi
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16188 "configure"
++#line 16216 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16199,16 +16227,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16202: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16230: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16205: \$? = $ac_status" >&5
++  echo "$as_me:16233: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16208: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16236: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16211: \$? = $ac_status" >&5
++  echo "$as_me:16239: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -16217,7 +16245,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-		echo "$as_me:16220: result: $cf_result" >&5
++		echo "$as_me:16248: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
+@@ -16233,7 +16261,7 @@
+ done
+ 
+ if test -z "$cf_x_athena_inc" ; then
+-	{ echo "$as_me:16236: WARNING: Unable to find Athena header files" >&5
++	{ echo "$as_me:16264: WARNING: Unable to find Athena header files" >&5
+ echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
+ elif test "$cf_x_athena_inc" != default ; then
+ 
+@@ -16298,10 +16326,10 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-		echo "$as_me:16301: checking for $cf_test in $cf_libs" >&5
++		echo "$as_me:16329: checking for $cf_test in $cf_libs" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16304 "configure"
++#line 16332 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -16318,16 +16346,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16321: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16349: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16324: \$? = $ac_status" >&5
++  echo "$as_me:16352: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16327: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16355: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16330: \$? = $ac_status" >&5
++  echo "$as_me:16358: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -16336,7 +16364,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:16339: result: $cf_result" >&5
++		echo "$as_me:16367: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
+@@ -16353,7 +16381,7 @@
+ done
+ 
+ if test -z "$cf_x_athena_lib" ; then
+-	{ { echo "$as_me:16356: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
++	{ { echo "$as_me:16384: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+ echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -16387,7 +16415,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:16390: checking for $ac_word" >&5
++echo "$as_me:16418: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16402,7 +16430,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:16405: found $ac_dir/$ac_word" >&5
++echo "$as_me:16433: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -16410,10 +16438,10 @@
+ fi
+ XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
+ if test -n "$XCURSES_CONFIG"; then
+-  echo "$as_me:16413: result: $XCURSES_CONFIG" >&5
++  echo "$as_me:16441: result: $XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$XCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:16416: result: no" >&5
++  echo "$as_me:16444: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -16426,7 +16454,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:16429: checking for $ac_word" >&5
++echo "$as_me:16457: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16441,7 +16469,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
+-echo "$as_me:16444: found $ac_dir/$ac_word" >&5
++echo "$as_me:16472: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -16449,10 +16477,10 @@
+ fi
+ ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
+ if test -n "$ac_ct_XCURSES_CONFIG"; then
+-  echo "$as_me:16452: result: $ac_ct_XCURSES_CONFIG" >&5
++  echo "$as_me:16480: result: $ac_ct_XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:16455: result: no" >&5
++  echo "$as_me:16483: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -16587,7 +16615,7 @@
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16590: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16618: testing checking additions to CFLAGS ..." 1>&5
+ 
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -16672,7 +16700,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:16675: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:16703: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -16682,7 +16710,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:16685: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:16713: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -16692,7 +16720,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}:16695: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:16723: 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"
+@@ -16701,7 +16729,7 @@
+ 
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16704 "configure"
++#line 16732 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -16713,16 +16741,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16716: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16744: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16719: \$? = $ac_status" >&5
++  echo "$as_me:16747: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16722: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16750: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16725: \$? = $ac_status" >&5
++  echo "$as_me:16753: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -16730,12 +16758,12 @@
+ cat "conftest.$ac_ext" >&5
+ test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16733: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16761: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+ 
+ 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
+ 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16738: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16766: testing but keeping change to \$CPPFLAGS ..." 1>&5
+ 
+ 	 fi
+ 	 CFLAGS="$cf_check_cflags"
+@@ -16743,7 +16771,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:16746: checking for XOpenDisplay in -lX11" >&5
++echo "$as_me:16774: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16751,7 +16779,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16754 "configure"
++#line 16782 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16770,16 +16798,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16773: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16801: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16776: \$? = $ac_status" >&5
++  echo "$as_me:16804: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16779: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16807: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16782: \$? = $ac_status" >&5
++  echo "$as_me:16810: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -16790,7 +16818,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16793: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:16821: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then
+ 
+@@ -16812,7 +16840,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16815: checking for XCurses library" >&5
++echo "$as_me:16843: checking for XCurses library" >&5
+ echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
+ if test "${cf_cv_lib_XCurses+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16835,7 +16863,7 @@
+ LIBS="$cf_add_libs"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16838 "configure"
++#line 16866 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16850,16 +16878,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16853: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16881: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16856: \$? = $ac_status" >&5
++  echo "$as_me:16884: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16859: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16887: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16862: \$? = $ac_status" >&5
++  echo "$as_me:16890: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_lib_XCurses=yes
+ else
+@@ -16870,7 +16898,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16873: result: $cf_cv_lib_XCurses" >&5
++echo "$as_me:16901: result: $cf_cv_lib_XCurses" >&5
+ echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
+ 
+ fi
+@@ -16885,23 +16913,23 @@
+ #define XCURSES 1
+ EOF
+ 
+-	echo "$as_me:16888: checking for xcurses.h" >&5
++	echo "$as_me:16916: checking for xcurses.h" >&5
+ echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
+ if test "${ac_cv_header_xcurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16894 "configure"
++#line 16922 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16898: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16926: \"$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:16904: \$? = $ac_status" >&5
++  echo "$as_me:16932: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16920,7 +16948,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16923: result: $ac_cv_header_xcurses_h" >&5
++echo "$as_me:16951: result: $ac_cv_header_xcurses_h" >&5
+ echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
+ if test "$ac_cv_header_xcurses_h" = yes; then
+ 
+@@ -16931,26 +16959,26 @@
+ fi
+ 
+ else
+-	{ { echo "$as_me:16934: error: Cannot link with XCurses" >&5
++	{ { echo "$as_me:16962: error: Cannot link with XCurses" >&5
+ echo "$as_me: error: Cannot link with XCurses" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ 	;;
+ (*)
+-	{ { echo "$as_me:16941: error: unexpected screen-value: $cf_cv_screen" >&5
++	{ { echo "$as_me:16969: error: unexpected screen-value: $cf_cv_screen" >&5
+ echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+-echo "$as_me:16947: checking for _nc_init_pthreads" >&5
++echo "$as_me:16975: checking for _nc_init_pthreads" >&5
+ echo $ECHO_N "checking for _nc_init_pthreads... $ECHO_C" >&6
+ if test "${ac_cv_func__nc_init_pthreads+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16953 "configure"
++#line 16981 "configure"
+ #include "confdefs.h"
+ #define _nc_init_pthreads autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16981,16 +17009,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16984: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17012: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16987: \$? = $ac_status" >&5
++  echo "$as_me:17015: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16990: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17018: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16993: \$? = $ac_status" >&5
++  echo "$as_me:17021: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func__nc_init_pthreads=yes
+ else
+@@ -17000,7 +17028,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17003: result: $ac_cv_func__nc_init_pthreads" >&5
++echo "$as_me:17031: result: $ac_cv_func__nc_init_pthreads" >&5
+ echo "${ECHO_T}$ac_cv_func__nc_init_pthreads" >&6
+ if test "$ac_cv_func__nc_init_pthreads" = yes; then
+   cf_cv_ncurses_pthreads=yes
+@@ -17035,7 +17063,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17038: checking for X11 rgb file" >&5
++echo "$as_me:17066: 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.
+@@ -17080,26 +17108,24 @@
+ 	cf_path_syntax="$ac_default_prefix"
+ fi
+ 
+-case ".$cf_path" in
+-(.\$\(*\)*|.\'*\'*)
+-	;;
+-(..|./*|.\\*)
++case "x$cf_path" in
++(x\$\(*\)*|x\'*\'*)
+ 	;;
+-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
++(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	;;
+-(.\$\{*prefix\}*|.\$\{*dir\}*)
++(x\$\{*prefix\}*|x\$\{*dir\}*)
+ 	eval cf_path="$cf_path"
+-	case ".$cf_path" in
+-	(.NONE/*)
++	case "x$cf_path" in
++	(xNONE/*)
+ 		cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 		;;
+ 	esac
+ 	;;
+-(.no|.NONE/*)
++(xno|xNONE/*)
+ 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:17102: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:17128: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -17107,7 +17133,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17110: result: $RGB_PATH" >&5
++echo "$as_me:17136: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:17177: 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.
+@@ -17168,10 +17194,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17171: result: $FORM_NAME" >&5
++echo "$as_me:17197: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:17174: checking for desired basename for menu library" >&5
++echo "$as_me:17200: 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.
+@@ -17191,10 +17217,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17194: result: $MENU_NAME" >&5
++echo "$as_me:17220: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:17197: checking for desired basename for panel library" >&5
++echo "$as_me:17223: 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.
+@@ -17214,10 +17240,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17217: result: $PANEL_NAME" >&5
++echo "$as_me:17243: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:17220: checking if you want to check for panel functions" >&5
++echo "$as_me:17246: checking if you want to check for panel functions" >&5
+ echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-panel or --disable-panel was given.
+@@ -17234,7 +17260,7 @@
+ 	cf_enable_panel=$cf_default_panel
+ 
+ fi;
+-echo "$as_me:17237: result: $cf_enable_panel" >&5
++echo "$as_me:17263: result: $cf_enable_panel" >&5
+ echo "${ECHO_T}$cf_enable_panel" >&6
+ if test $cf_enable_panel = yes
+ then
+@@ -17245,13 +17271,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:17248: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
++	echo "$as_me:17274: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists "$PANEL_NAME$cf_cv_libtype" ; then
+-		echo "$as_me:17251: result: yes" >&5
++		echo "$as_me:17277: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:17254: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
++		echo "$as_me:17280: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CFLAGS="$CFLAGS"
+@@ -17401,7 +17427,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17404 "configure"
++#line 17430 "configure"
+ #include "confdefs.h"
+ #include <$PANEL_NAME.h>
+ int
+@@ -17413,37 +17439,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17416: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17442: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17419: \$? = $ac_status" >&5
++  echo "$as_me:17445: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17422: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17448: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17425: \$? = $ac_status" >&5
++  echo "$as_me:17451: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17431 "configure"
++#line 17457 "configure"
+ #include "confdefs.h"
+ #include <$PANEL_NAME.h>
+ 				int main(void)
+ 				{ (void) new_panel ( 0 ); return 0; }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17438: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17464: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17441: \$? = $ac_status" >&5
++  echo "$as_me:17467: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17443: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17469: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17446: \$? = $ac_status" >&5
++  echo "$as_me:17472: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -17460,7 +17486,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:17463: result: $cf_have_curses_lib" >&5
++		echo "$as_me:17489: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" = "yes"
+@@ -17481,7 +17507,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh`
+-echo "$as_me:17484: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
++echo "$as_me:17510: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17489,7 +17515,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$PANEL_NAME$cf_cv_libtype  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17492 "configure"
++#line 17518 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17508,16 +17534,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17511: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17537: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17514: \$? = $ac_status" >&5
++  echo "$as_me:17540: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17517: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17543: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17520: \$? = $ac_status" >&5
++  echo "$as_me:17546: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -17528,7 +17554,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17531: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:17557: 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
+ 
+@@ -17561,7 +17587,7 @@
+ 	cf_curses_headers="$cf_curses_headers panel.h"
+ fi
+ 
+-echo "$as_me:17564: checking if you want to check for menu functions" >&5
++echo "$as_me:17590: checking if you want to check for menu functions" >&5
+ echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-menu or --disable-menu was given.
+@@ -17578,7 +17604,7 @@
+ 	cf_enable_menu=$cf_default_menu
+ 
+ fi;
+-echo "$as_me:17581: result: $cf_enable_menu" >&5
++echo "$as_me:17607: result: $cf_enable_menu" >&5
+ echo "${ECHO_T}$cf_enable_menu" >&6
+ if test $cf_enable_menu = yes
+ then
+@@ -17587,14 +17613,14 @@
+ 		;;
+ 	(curses*)
+ 
+-echo "$as_me:17590: checking for NetBSD menu.h" >&5
++echo "$as_me:17616: checking for NetBSD menu.h" >&5
+ echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_menu_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17597 "configure"
++#line 17623 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -17612,16 +17638,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17615: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17641: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17618: \$? = $ac_status" >&5
++  echo "$as_me:17644: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17621: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17647: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17624: \$? = $ac_status" >&5
++  echo "$as_me:17650: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_netbsd_menu_h=yes
+ 
+@@ -17633,7 +17659,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17636: result: $cf_cv_netbsd_menu_h" >&5
++echo "$as_me:17662: result: $cf_cv_netbsd_menu_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
+ 
+ test "$cf_cv_netbsd_menu_h" = yes &&
+@@ -17650,13 +17676,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:17653: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
++	echo "$as_me:17679: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists "$MENU_NAME$cf_cv_libtype" ; then
+-		echo "$as_me:17656: result: yes" >&5
++		echo "$as_me:17682: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:17659: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
++		echo "$as_me:17685: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CFLAGS="$CFLAGS"
+@@ -17806,7 +17832,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17809 "configure"
++#line 17835 "configure"
+ #include "confdefs.h"
+ #include <$MENU_NAME.h>
+ int
+@@ -17818,37 +17844,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17821: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17847: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17824: \$? = $ac_status" >&5
++  echo "$as_me:17850: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17827: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17853: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17830: \$? = $ac_status" >&5
++  echo "$as_me:17856: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17836 "configure"
++#line 17862 "configure"
+ #include "confdefs.h"
+ #include <$MENU_NAME.h>
+ 				int main(void)
+ 				{ (void) menu_driver ( 0,0 ); return 0; }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17843: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17869: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17846: \$? = $ac_status" >&5
++  echo "$as_me:17872: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17848: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17874: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17851: \$? = $ac_status" >&5
++  echo "$as_me:17877: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -17865,7 +17891,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:17868: result: $cf_have_curses_lib" >&5
++		echo "$as_me:17894: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" = "yes"
+@@ -17886,7 +17912,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh`
+-echo "$as_me:17889: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
++echo "$as_me:17915: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17894,7 +17920,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$MENU_NAME$cf_cv_libtype  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17897 "configure"
++#line 17923 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17913,16 +17939,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17916: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17942: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17919: \$? = $ac_status" >&5
++  echo "$as_me:17945: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17922: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17948: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17925: \$? = $ac_status" >&5
++  echo "$as_me:17951: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -17933,7 +17959,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17936: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:17962: 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
+ 
+@@ -17966,7 +17992,7 @@
+ 	cf_curses_headers="$cf_curses_headers menu.h"
+ fi
+ 
+-echo "$as_me:17969: checking if you want to check for form functions" >&5
++echo "$as_me:17995: checking if you want to check for form functions" >&5
+ echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-form or --disable-form was given.
+@@ -17983,7 +18009,7 @@
+ 	cf_enable_form=$cf_default_form
+ 
+ fi;
+-echo "$as_me:17986: result: $cf_enable_form" >&5
++echo "$as_me:18012: result: $cf_enable_form" >&5
+ echo "${ECHO_T}$cf_enable_form" >&6
+ if test $cf_enable_form = yes
+ then
+@@ -17992,14 +18018,14 @@
+ 		;;
+ 	(curses*)
+ 
+-echo "$as_me:17995: checking for NetBSD form.h" >&5
++echo "$as_me:18021: checking for NetBSD form.h" >&5
+ echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_form_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18002 "configure"
++#line 18028 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18018,16 +18044,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18021: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18047: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18024: \$? = $ac_status" >&5
++  echo "$as_me:18050: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18027: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18053: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18030: \$? = $ac_status" >&5
++  echo "$as_me:18056: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_netbsd_form_h=yes
+ 
+@@ -18039,7 +18065,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:18042: result: $cf_cv_netbsd_form_h" >&5
++echo "$as_me:18068: result: $cf_cv_netbsd_form_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
+ 
+ test "$cf_cv_netbsd_form_h" = yes &&
+@@ -18056,13 +18082,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:18059: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
++	echo "$as_me:18085: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists "$FORM_NAME$cf_cv_libtype" ; then
+-		echo "$as_me:18062: result: yes" >&5
++		echo "$as_me:18088: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:18065: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
++		echo "$as_me:18091: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CFLAGS="$CFLAGS"
+@@ -18212,7 +18238,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18215 "configure"
++#line 18241 "configure"
+ #include "confdefs.h"
+ #include <$FORM_NAME.h>
+ int
+@@ -18224,37 +18250,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18227: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18253: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18230: \$? = $ac_status" >&5
++  echo "$as_me:18256: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18233: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18259: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18236: \$? = $ac_status" >&5
++  echo "$as_me:18262: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18242 "configure"
++#line 18268 "configure"
+ #include "confdefs.h"
+ #include <$FORM_NAME.h>
+ 				int main(void)
+ 				{ (void) form_driver ( 0,0 ); return 0; }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:18249: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18275: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18252: \$? = $ac_status" >&5
++  echo "$as_me:18278: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:18254: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18280: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18257: \$? = $ac_status" >&5
++  echo "$as_me:18283: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -18271,7 +18297,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:18274: result: $cf_have_curses_lib" >&5
++		echo "$as_me:18300: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" = "yes"
+@@ -18292,7 +18318,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh`
+-echo "$as_me:18295: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
++echo "$as_me:18321: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18300,7 +18326,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$FORM_NAME$cf_cv_libtype  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18303 "configure"
++#line 18329 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18319,16 +18345,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18322: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18348: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18325: \$? = $ac_status" >&5
++  echo "$as_me:18351: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18328: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18354: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18331: \$? = $ac_status" >&5
++  echo "$as_me:18357: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -18339,7 +18365,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18342: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:18368: 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
+ 
+@@ -18377,23 +18403,23 @@
+ for ac_header in $cf_curses_headers
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18380: checking for $ac_header" >&5
++echo "$as_me:18406: 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 18386 "configure"
++#line 18412 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18390: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18416: \"$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:18396: \$? = $ac_status" >&5
++  echo "$as_me:18422: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18412,7 +18438,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18415: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18441: 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:18451: 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 18431 "configure"
++#line 18457 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -18444,16 +18470,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18447: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18473: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18450: \$? = $ac_status" >&5
++  echo "$as_me:18476: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18453: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18479: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18456: \$? = $ac_status" >&5
++  echo "$as_me:18482: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -18463,7 +18489,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18466: result: $ac_cv_header_time" >&5
++echo "$as_me:18492: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -18474,7 +18500,6 @@
+ fi
+ 
+ for ac_header in \
+-getopt.h \
+ locale.h \
+ math.h \
+ stdarg.h \
+@@ -18482,27 +18507,26 @@
+ sys/select.h \
+ sys/time.h \
+ termios.h \
+-unistd.h \
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18489: checking for $ac_header" >&5
++echo "$as_me:18513: 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 18495 "configure"
++#line 18519 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18499: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18523: \"$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:18505: \$? = $ac_status" >&5
++  echo "$as_me:18529: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18521,7 +18545,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18524: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18548: 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:18561: 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 18543 "configure"
++#line 18567 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18547: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18571: \"$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:18553: \$? = $ac_status" >&5
++  echo "$as_me:18577: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18569,7 +18593,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18572: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18596: 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:18606: 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
+@@ -18589,7 +18613,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18592 "configure"
++#line 18616 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -18602,16 +18626,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18605: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18629: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18608: \$? = $ac_status" >&5
++  echo "$as_me:18632: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18611: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18635: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18614: \$? = $ac_status" >&5
++  echo "$as_me:18638: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -18623,7 +18647,7 @@
+ done
+ 
+ fi
+-echo "$as_me:18626: result: $cf_cv_getopt_header" >&5
++echo "$as_me:18650: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -18641,13 +18665,13 @@
+ fi
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:18644: checking for clock_gettime" >&5
++echo "$as_me:18668: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18650 "configure"
++#line 18674 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18678,16 +18702,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18681: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18705: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18684: \$? = $ac_status" >&5
++  echo "$as_me:18708: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18687: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18711: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18690: \$? = $ac_status" >&5
++  echo "$as_me:18714: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -18697,12 +18721,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18700: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:18724: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:18705: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:18729: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18710,7 +18734,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18713 "configure"
++#line 18737 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18729,16 +18753,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18732: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18756: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18735: \$? = $ac_status" >&5
++  echo "$as_me:18759: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18738: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18762: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18741: \$? = $ac_status" >&5
++  echo "$as_me:18765: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -18749,7 +18773,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18752: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:18776: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -18761,14 +18785,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:18764: checking if clock_gettime links" >&5
++echo "$as_me:18788: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18771 "configure"
++#line 18795 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -18786,16 +18810,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18789: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18813: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18792: \$? = $ac_status" >&5
++  echo "$as_me:18816: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18795: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18819: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18798: \$? = $ac_status" >&5
++  echo "$as_me:18822: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -18806,7 +18830,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:18809: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:18833: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -18820,13 +18844,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:18823: checking for gettimeofday" >&5
++echo "$as_me:18847: 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 18829 "configure"
++#line 18853 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18857,16 +18881,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18860: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18884: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18863: \$? = $ac_status" >&5
++  echo "$as_me:18887: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18866: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18890: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18869: \$? = $ac_status" >&5
++  echo "$as_me:18893: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -18876,7 +18900,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18879: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:18903: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -18886,7 +18910,7 @@
+ 
+ else
+ 
+-echo "$as_me:18889: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:18913: 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
+@@ -18894,7 +18918,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18897 "configure"
++#line 18921 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18913,16 +18937,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18916: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18940: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18919: \$? = $ac_status" >&5
++  echo "$as_me:18943: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18922: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18946: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18925: \$? = $ac_status" >&5
++  echo "$as_me:18949: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -18933,7 +18957,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18936: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:18960: 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
+ 
+@@ -18971,13 +18995,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:18974: checking for $ac_func" >&5
++echo "$as_me:18998: 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 18980 "configure"
++#line 19004 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19008,16 +19032,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19011: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19035: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19014: \$? = $ac_status" >&5
++  echo "$as_me:19038: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19017: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19041: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19020: \$? = $ac_status" >&5
++  echo "$as_me:19044: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -19027,7 +19051,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19030: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:19054: 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:19065: checking if we can use termcap.h" >&5
+ echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
+ if test "${cf_cv_have_termcap_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19048 "configure"
++#line 19072 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19066,16 +19090,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19069: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19093: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19072: \$? = $ac_status" >&5
++  echo "$as_me:19096: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19075: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19099: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19078: \$? = $ac_status" >&5
++  echo "$as_me:19102: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_termcap_h=yes
+ else
+@@ -19085,7 +19109,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19088: result: $cf_cv_have_termcap_h" >&5
++echo "$as_me:19112: result: $cf_cv_have_termcap_h" >&5
+ echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
+ if test "x$cf_cv_have_termcap_h" = xyes
+ then
+@@ -19095,14 +19119,14 @@
+ EOF
+ 
+ else
+-echo "$as_me:19098: checking if we can use ncurses/termcap.h" >&5
++echo "$as_me:19122: checking if we can use ncurses/termcap.h" >&5
+ echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
+ if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19105 "configure"
++#line 19129 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19123,16 +19147,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19126: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19150: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19129: \$? = $ac_status" >&5
++  echo "$as_me:19153: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19132: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19156: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19135: \$? = $ac_status" >&5
++  echo "$as_me:19159: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_ncurses_termcap_h=yes
+ else
+@@ -19142,7 +19166,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19145: result: $cf_cv_have_ncurses_termcap_h" >&5
++echo "$as_me:19169: result: $cf_cv_have_ncurses_termcap_h" >&5
+ echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
+ test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -19152,7 +19176,7 @@
+ fi
+ 
+ if test "x$ac_cv_func_getopt" = xno; then
+-	{ { echo "$as_me:19155: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:19179: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -19171,13 +19195,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:19174: checking for $ac_func" >&5
++echo "$as_me:19198: 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 19180 "configure"
++#line 19204 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19208,16 +19232,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19211: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19235: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19214: \$? = $ac_status" >&5
++  echo "$as_me:19238: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19217: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19241: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19220: \$? = $ac_status" >&5
++  echo "$as_me:19244: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -19227,7 +19251,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19230: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:19254: 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:19266: checking definition to turn on extended curses functions" >&5
+ echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
+ if test "${cf_cv_need_xopen_extension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19247,7 +19271,7 @@
+ 
+ cf_cv_need_xopen_extension=unknown
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19250 "configure"
++#line 19274 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -19280,16 +19304,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19283: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19307: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19286: \$? = $ac_status" >&5
++  echo "$as_me:19310: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19289: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19313: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19292: \$? = $ac_status" >&5
++  echo "$as_me:19316: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_xopen_extension=none
+ else
+@@ -19299,7 +19323,7 @@
+ 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19302 "configure"
++#line 19326 "configure"
+ #include "confdefs.h"
+ 
+ #define $cf_try_xopen_extension 1
+@@ -19325,16 +19349,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19328: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19352: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19331: \$? = $ac_status" >&5
++  echo "$as_me:19355: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19334: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19358: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19337: \$? = $ac_status" >&5
++  echo "$as_me:19361: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
+ else
+@@ -19348,7 +19372,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:19351: result: $cf_cv_need_xopen_extension" >&5
++echo "$as_me:19375: result: $cf_cv_need_xopen_extension" >&5
+ echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
+ 
+ case "$cf_cv_need_xopen_extension" in
+@@ -19360,7 +19384,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19363: checking for term.h" >&5
++echo "$as_me:19387: checking for term.h" >&5
+ echo $ECHO_N "checking for term.h... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19381,7 +19405,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19384 "configure"
++#line 19408 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19395,16 +19419,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19398: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19422: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19401: \$? = $ac_status" >&5
++  echo "$as_me:19425: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19404: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19428: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19407: \$? = $ac_status" >&5
++  echo "$as_me:19431: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_term_header=$cf_header
+ 	 break
+@@ -19423,7 +19447,7 @@
+ 	for cf_header in ncurses/term.h ncursesw/term.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19426 "configure"
++#line 19450 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19441,16 +19465,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19444: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19468: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19447: \$? = $ac_status" >&5
++  echo "$as_me:19471: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19450: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19474: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19453: \$? = $ac_status" >&5
++  echo "$as_me:19477: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_term_header=$cf_header
+ 			 break
+@@ -19465,7 +19489,7 @@
+ esac
+ 
+ fi
+-echo "$as_me:19468: result: $cf_cv_term_header" >&5
++echo "$as_me:19492: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ case "$cf_cv_term_header" in
+@@ -19492,7 +19516,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19495: checking for unctrl.h" >&5
++echo "$as_me:19519: checking for unctrl.h" >&5
+ echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
+ if test "${cf_cv_unctrl_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19513,7 +19537,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19516 "configure"
++#line 19540 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19527,16 +19551,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19530: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19554: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19533: \$? = $ac_status" >&5
++  echo "$as_me:19557: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19536: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19560: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19539: \$? = $ac_status" >&5
++  echo "$as_me:19563: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unctrl_header=$cf_header
+ 	 break
+@@ -19549,12 +19573,12 @@
+ done
+ 
+ fi
+-echo "$as_me:19552: result: $cf_cv_unctrl_header" >&5
++echo "$as_me:19576: result: $cf_cv_unctrl_header" >&5
+ echo "${ECHO_T}$cf_cv_unctrl_header" >&6
+ 
+ case "$cf_cv_unctrl_header" in
+ (no)
+-	{ echo "$as_me:19557: WARNING: unctrl.h header not found" >&5
++	{ echo "$as_me:19581: WARNING: unctrl.h header not found" >&5
+ echo "$as_me: WARNING: unctrl.h header not found" >&2;}
+ 	;;
+ esac
+@@ -19652,10 +19676,10 @@
+ 
+ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 
+-	echo "$as_me:19655: checking for ${cf_func}" >&5
++	echo "$as_me:19679: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:19658: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:19682: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19664,7 +19688,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19667 "configure"
++#line 19691 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -19697,16 +19721,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19700: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19724: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19703: \$? = $ac_status" >&5
++  echo "$as_me:19727: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19706: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19730: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19709: \$? = $ac_status" >&5
++  echo "$as_me:19733: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -19722,7 +19746,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:19725: result: $cf_result" >&5
++	echo "$as_me:19749: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" != no; then
+ 		cat >>confdefs.h <&5
++	echo "$as_me:19764: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:19743: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:19767: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19749,7 +19773,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19752 "configure"
++#line 19776 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -19782,16 +19806,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19785: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19809: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19788: \$? = $ac_status" >&5
++  echo "$as_me:19812: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19791: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19815: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19794: \$? = $ac_status" >&5
++  echo "$as_me:19818: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -19807,7 +19831,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:19810: result: $cf_result" >&5
++	echo "$as_me:19834: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" != no; then
+ 		cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF
+-#line 19834 "configure"
++#line 19858 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19851,21 +19875,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19854: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19878: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19857: \$? = $ac_status" >&5
++  echo "$as_me:19881: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19860: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19884: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19863: \$? = $ac_status" >&5
++  echo "$as_me:19887: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
+ 
+-echo "${as_me:-configure}:19868: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
++echo "${as_me:-configure}:19892: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+ 
+ 		cat >>confdefs.h <&5
++echo "$as_me:19912: checking for ncurses extended functions" >&5
+ echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19895 "configure"
++#line 19919 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19907,16 +19931,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19910: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19934: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19913: \$? = $ac_status" >&5
++  echo "$as_me:19937: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19916: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19940: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19919: \$? = $ac_status" >&5
++  echo "$as_me:19943: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_ext_funcs=defined
+ else
+@@ -19924,7 +19948,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19927 "configure"
++#line 19951 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19949,16 +19973,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19952: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19976: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19955: \$? = $ac_status" >&5
++  echo "$as_me:19979: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19958: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19982: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19961: \$? = $ac_status" >&5
++  echo "$as_me:19985: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_ext_funcs=yes
+ else
+@@ -19972,7 +19996,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:19975: result: $cf_cv_ncurses_ext_funcs" >&5
++echo "$as_me:19999: result: $cf_cv_ncurses_ext_funcs" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
+ test "$cf_cv_ncurses_ext_funcs" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -19986,11 +20010,11 @@
+ 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
+ 	then
+ 		cf_define_xpg5=no
+-		echo "$as_me:19989: checking if _XPG5 should be defined to enable wide-characters" >&5
++		echo "$as_me:20013: checking if _XPG5 should be defined to enable wide-characters" >&5
+ echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19993 "configure"
++#line 20017 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20003,16 +20027,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20006: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20030: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20009: \$? = $ac_status" >&5
++  echo "$as_me:20033: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20012: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20036: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20015: \$? = $ac_status" >&5
++  echo "$as_me:20039: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -20021,7 +20045,7 @@
+ cf_save_cppflags="$CPPFLAGS"
+ 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20024 "configure"
++#line 20048 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20034,16 +20058,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20037: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20061: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20040: \$? = $ac_status" >&5
++  echo "$as_me:20064: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20043: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20067: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20046: \$? = $ac_status" >&5
++  echo "$as_me:20070: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_define_xpg5=yes
+ else
+@@ -20054,7 +20078,7 @@
+ 			 CPPFLAGS="$cf_save_cppflags"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-		echo "$as_me:20057: result: $cf_define_xpg5" >&5
++		echo "$as_me:20081: result: $cf_define_xpg5" >&5
+ echo "${ECHO_T}$cf_define_xpg5" >&6
+ 
+ 		if test "$cf_define_xpg5" = yes
+@@ -20063,14 +20087,14 @@
+ 		fi
+ 	fi
+ 
+-	echo "$as_me:20066: checking for wide-character functions" >&5
++	echo "$as_me:20090: checking for wide-character functions" >&5
+ echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
+ if test "${cf_cv_widechar_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20073 "configure"
++#line 20097 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20087,16 +20111,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20090: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20114: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20093: \$? = $ac_status" >&5
++  echo "$as_me:20117: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20096: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20120: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20099: \$? = $ac_status" >&5
++  echo "$as_me:20123: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_widechar_funcs=yes
+ else
+@@ -20107,7 +20131,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20110: result: $cf_cv_widechar_funcs" >&5
++echo "$as_me:20134: result: $cf_cv_widechar_funcs" >&5
+ echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
+ 	if test "$cf_cv_widechar_funcs" != no ; then
+ 
+@@ -20128,14 +20152,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20131: checking if $cf_cv_screen library uses pthreads" >&5
++echo "$as_me:20155: checking if $cf_cv_screen library uses pthreads" >&5
+ echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
+ if test "${cf_cv_use_pthreads+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20138 "configure"
++#line 20162 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20153,16 +20177,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20156: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20180: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20159: \$? = $ac_status" >&5
++  echo "$as_me:20183: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20162: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20186: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20165: \$? = $ac_status" >&5
++  echo "$as_me:20189: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_use_pthreads=yes
+ else
+@@ -20173,21 +20197,21 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20176: result: $cf_cv_use_pthreads" >&5
++echo "$as_me:20200: result: $cf_cv_use_pthreads" >&5
+ echo "${ECHO_T}$cf_cv_use_pthreads" >&6
+ test $cf_cv_use_pthreads = yes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_PTHREADS 1
+ EOF
+ 
+-echo "$as_me:20183: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:20207: 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 20190 "configure"
++#line 20214 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20207,16 +20231,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20210: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20234: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20213: \$? = $ac_status" >&5
++  echo "$as_me:20237: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20216: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20240: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20219: \$? = $ac_status" >&5
++  echo "$as_me:20243: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -20228,7 +20252,7 @@
+ 
+ fi
+ 
+-echo "$as_me:20231: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:20255: 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
+@@ -20237,7 +20261,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:20240: checking for openpty in -lutil" >&5
++echo "$as_me:20264: 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
+@@ -20245,7 +20269,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20248 "configure"
++#line 20272 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20264,16 +20288,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20267: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20291: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20270: \$? = $ac_status" >&5
++  echo "$as_me:20294: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20273: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20297: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20276: \$? = $ac_status" >&5
++  echo "$as_me:20300: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -20284,7 +20308,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20287: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:20311: 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
+@@ -20292,7 +20316,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:20295: checking for openpty header" >&5
++echo "$as_me:20319: 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
+@@ -20319,7 +20343,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20322 "configure"
++#line 20346 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20337,16 +20361,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20340: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20364: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20343: \$? = $ac_status" >&5
++  echo "$as_me:20367: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20346: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20370: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20349: \$? = $ac_status" >&5
++  echo "$as_me:20373: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -20364,7 +20388,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:20367: result: $cf_cv_func_openpty" >&5
++echo "$as_me:20391: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -20398,7 +20422,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:20401: checking for function curses_version" >&5
++echo "$as_me:20425: checking for function curses_version" >&5
+ echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
+ if test "${cf_cv_func_curses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20408,7 +20432,7 @@
+   cf_cv_func_curses_version=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20411 "configure"
++#line 20435 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -20424,15 +20448,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:20427: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20451: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20430: \$? = $ac_status" >&5
++  echo "$as_me:20454: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:20432: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20456: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20435: \$? = $ac_status" >&5
++  echo "$as_me:20459: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_curses_version=yes
+ 
+@@ -20447,14 +20471,14 @@
+ fi
+ rm -f core
+ fi
+-echo "$as_me:20450: result: $cf_cv_func_curses_version" >&5
++echo "$as_me:20474: result: $cf_cv_func_curses_version" >&5
+ echo "${ECHO_T}$cf_cv_func_curses_version" >&6
+ test "$cf_cv_func_curses_version" = yes &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_CURSES_VERSION 1
+ EOF
+ 
+-echo "$as_me:20457: checking for alternate character set array" >&5
++echo "$as_me:20481: checking for alternate character set array" >&5
+ echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_acs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20464,7 +20488,7 @@
+ for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20467 "configure"
++#line 20491 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20480,16 +20504,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20483: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20507: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20486: \$? = $ac_status" >&5
++  echo "$as_me:20510: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20489: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20513: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20492: \$? = $ac_status" >&5
++  echo "$as_me:20516: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_acs_map=$name; break
+ else
+@@ -20500,7 +20524,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20503: result: $cf_cv_curses_acs_map" >&5
++echo "$as_me:20527: result: $cf_cv_curses_acs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
+ 
+ test "$cf_cv_curses_acs_map" != unknown &&
+@@ -20510,7 +20534,7 @@
+ 
+ if test "$cf_enable_widec" = yes; then
+ 
+-echo "$as_me:20513: checking for wide alternate character set array" >&5
++echo "$as_me:20537: checking for wide alternate character set array" >&5
+ echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20520,7 +20544,7 @@
+ 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20523 "configure"
++#line 20547 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20536,16 +20560,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20539: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20563: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20542: \$? = $ac_status" >&5
++  echo "$as_me:20566: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20545: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20569: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20548: \$? = $ac_status" >&5
++  echo "$as_me:20572: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_wacs_map=$name
+ 	 break
+@@ -20556,7 +20580,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	done
+ fi
+-echo "$as_me:20559: result: $cf_cv_curses_wacs_map" >&5
++echo "$as_me:20583: result: $cf_cv_curses_wacs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
+ 
+ test "$cf_cv_curses_wacs_map" != unknown &&
+@@ -20564,7 +20588,7 @@
+ #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
+ EOF
+ 
+-echo "$as_me:20567: checking for wide alternate character constants" >&5
++echo "$as_me:20591: checking for wide alternate character constants" >&5
+ echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_symbols+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20574,7 +20598,7 @@
+ if test "$cf_cv_curses_wacs_map" != unknown
+ then
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20577 "configure"
++#line 20601 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20591,16 +20615,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20594: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20618: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20597: \$? = $ac_status" >&5
++  echo "$as_me:20621: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20600: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20624: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20603: \$? = $ac_status" >&5
++  echo "$as_me:20627: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -20610,7 +20634,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ else
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20613 "configure"
++#line 20637 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20626,16 +20650,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20629: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20653: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20632: \$? = $ac_status" >&5
++  echo "$as_me:20656: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20635: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20659: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20638: \$? = $ac_status" >&5
++  echo "$as_me:20662: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -20646,7 +20670,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:20649: result: $cf_cv_curses_wacs_symbols" >&5
++echo "$as_me:20673: result: $cf_cv_curses_wacs_symbols" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
+ 
+ test "$cf_cv_curses_wacs_symbols" != no &&
+@@ -20656,10 +20680,10 @@
+ 
+ fi
+ 
+-echo "$as_me:20659: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:20683: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20662 "configure"
++#line 20686 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20677,16 +20701,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20680: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20704: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20683: \$? = $ac_status" >&5
++  echo "$as_me:20707: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20686: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20710: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20689: \$? = $ac_status" >&5
++  echo "$as_me:20713: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -20695,7 +20719,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:20698: result: $cf_result" >&5
++echo "$as_me:20722: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -20716,14 +20740,14 @@
+ if test "$cf_enable_widec" = yes; then
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:20719: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:20743: 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 20726 "configure"
++#line 20750 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20741,23 +20765,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20744: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20768: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20747: \$? = $ac_status" >&5
++  echo "$as_me:20771: \$? = $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:20774: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20753: \$? = $ac_status" >&5
++  echo "$as_me:20777: \$? = $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 20760 "configure"
++#line 20784 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20776,16 +20800,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20779: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20803: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20782: \$? = $ac_status" >&5
++  echo "$as_me:20806: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20785: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20809: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20788: \$? = $ac_status" >&5
++  echo "$as_me:20812: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -20797,7 +20821,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20800: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:20824: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -20820,14 +20844,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:20823: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:20847: 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 20830 "configure"
++#line 20854 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20845,23 +20869,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20848: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20872: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20851: \$? = $ac_status" >&5
++  echo "$as_me:20875: \$? = $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:20878: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20857: \$? = $ac_status" >&5
++  echo "$as_me:20881: \$? = $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 20864 "configure"
++#line 20888 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20880,16 +20904,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20883: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20907: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20886: \$? = $ac_status" >&5
++  echo "$as_me:20910: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20889: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20913: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20892: \$? = $ac_status" >&5
++  echo "$as_me:20916: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -20901,7 +20925,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20904: result: $cf_cv_wchar_t" >&5
++echo "$as_me:20928: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -20924,14 +20948,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:20927: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:20951: 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 20934 "configure"
++#line 20958 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20949,23 +20973,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20952: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20976: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20955: \$? = $ac_status" >&5
++  echo "$as_me:20979: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20958: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20982: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20961: \$? = $ac_status" >&5
++  echo "$as_me:20985: \$? = $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 20968 "configure"
++#line 20992 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20984,16 +21008,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20987: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21011: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20990: \$? = $ac_status" >&5
++  echo "$as_me:21014: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20993: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21017: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20996: \$? = $ac_status" >&5
++  echo "$as_me:21020: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -21005,7 +21029,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21008: result: $cf_cv_wint_t" >&5
++echo "$as_me:21032: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -21029,10 +21053,10 @@
+ 
+ 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
+ 
+-echo "$as_me:21032: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21056: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21035 "configure"
++#line 21059 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21050,16 +21074,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21053: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21077: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21056: \$? = $ac_status" >&5
++  echo "$as_me:21080: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21059: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21083: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21062: \$? = $ac_status" >&5
++  echo "$as_me:21086: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21068,7 +21092,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21071: result: $cf_result" >&5
++echo "$as_me:21095: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -21090,10 +21114,10 @@
+ 
+ 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
+ 
+-echo "$as_me:21093: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21117: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21096 "configure"
++#line 21120 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21111,16 +21135,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21114: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21138: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21117: \$? = $ac_status" >&5
++  echo "$as_me:21141: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21120: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21144: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21123: \$? = $ac_status" >&5
++  echo "$as_me:21147: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21129,7 +21153,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21132: result: $cf_result" >&5
++echo "$as_me:21156: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -21151,10 +21175,10 @@
+ 
+ 	if test "$NCURSES_OK_WINT_T" = 0 ; then
+ 
+-echo "$as_me:21154: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21178: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21157 "configure"
++#line 21181 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21172,16 +21196,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21175: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21199: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21178: \$? = $ac_status" >&5
++  echo "$as_me:21202: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21181: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21205: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21184: \$? = $ac_status" >&5
++  echo "$as_me:21208: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21190,7 +21214,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21193: result: $cf_result" >&5
++echo "$as_me:21217: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -21219,11 +21243,11 @@
+ boolfnames \
+ ttytype
+ do
+-echo "$as_me:21222: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21246: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21226 "configure"
++#line 21250 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -21256,16 +21280,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21259: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21283: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21262: \$? = $ac_status" >&5
++  echo "$as_me:21286: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21265: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21289: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21268: \$? = $ac_status" >&5
++  echo "$as_me:21292: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ 
+@@ -21275,7 +21299,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21278: result: $cf_result" >&5
++echo "$as_me:21302: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test "$cf_result" = yes ; then
+@@ -21287,14 +21311,14 @@
+ EOF
+ 
+ else
+-	echo "$as_me:21290: checking for data $cf_data in library" >&5
++	echo "$as_me:21314: checking for data $cf_data in library" >&5
+ echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6
+ 	# BSD linkers insist on making weak linkage, but resolve at runtime.
+ 	if test "$cross_compiling" = yes; then
+ 
+ 	# cross-compiling
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21297 "configure"
++#line 21321 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -21333,16 +21357,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21336: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21360: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21339: \$? = $ac_status" >&5
++  echo "$as_me:21363: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21342: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21366: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21345: \$? = $ac_status" >&5
++  echo "$as_me:21369: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21354,7 +21378,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21357 "configure"
++#line 21381 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -21386,15 +21410,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21389: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21413: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21392: \$? = $ac_status" >&5
++  echo "$as_me:21416: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21394: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21418: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21397: \$? = $ac_status" >&5
++  echo "$as_me:21421: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ 
+@@ -21406,7 +21430,7 @@
+ fi
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-	echo "$as_me:21409: result: $cf_result" >&5
++	echo "$as_me:21433: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = yes ; then
+ 
+@@ -21423,7 +21447,7 @@
+ 
+ if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
+ then
+-	echo "$as_me:21426: checking for X" >&5
++	echo "$as_me:21450: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
+ # Check whether --with-x or --without-x was given.
+@@ -21527,17 +21551,17 @@
+   # Guess where to find include files, by looking for Intrinsic.h.
+   # First, try using that file with no special directory specified.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21530 "configure"
++#line 21554 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:21534: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:21558: \"$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:21540: \$? = $ac_status" >&5
++  echo "$as_me:21564: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -21570,7 +21594,7 @@
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21573 "configure"
++#line 21597 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -21582,16 +21606,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21585: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21609: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21588: \$? = $ac_status" >&5
++  echo "$as_me:21612: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21591: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21615: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21594: \$? = $ac_status" >&5
++  echo "$as_me:21618: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -21629,7 +21653,7 @@
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:21632: result: $have_x" >&5
++  echo "$as_me:21656: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+   no_x=yes
+ else
+@@ -21639,7 +21663,7 @@
+   # Update the cache value to reflect the command line values.
+   ac_cv_have_x="have_x=yes \
+ 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  echo "$as_me:21642: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "$as_me:21666: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+@@ -21666,11 +21690,11 @@
+     # others require no space.  Words are not sufficient . . . .
+     case `(uname -sr) 2>/dev/null` in
+     "SunOS 5"*)
+-      echo "$as_me:21669: checking whether -R must be followed by a space" >&5
++      echo "$as_me:21693: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+       cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21673 "configure"
++#line 21697 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21682,16 +21706,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21685: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21709: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21688: \$? = $ac_status" >&5
++  echo "$as_me:21712: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21691: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21715: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21694: \$? = $ac_status" >&5
++  echo "$as_me:21718: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_nospace=yes
+ else
+@@ -21701,13 +21725,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+       if test $ac_R_nospace = yes; then
+-	echo "$as_me:21704: result: no" >&5
++	echo "$as_me:21728: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	X_LIBS="$X_LIBS -R$x_libraries"
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21710 "configure"
++#line 21734 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21719,16 +21743,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21722: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21746: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21725: \$? = $ac_status" >&5
++  echo "$as_me:21749: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21728: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21752: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21731: \$? = $ac_status" >&5
++  echo "$as_me:21755: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_space=yes
+ else
+@@ -21738,11 +21762,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	if test $ac_R_space = yes; then
+-	  echo "$as_me:21741: result: yes" >&5
++	  echo "$as_me:21765: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ 	else
+-	  echo "$as_me:21745: result: neither works" >&5
++	  echo "$as_me:21769: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ 	fi
+       fi
+@@ -21762,7 +21786,7 @@
+     # the Alpha needs dnet_stub (dnet does not exist).
+     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21765 "configure"
++#line 21789 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21781,22 +21805,22 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21784: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21808: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21787: \$? = $ac_status" >&5
++  echo "$as_me:21811: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21790: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21814: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21793: \$? = $ac_status" >&5
++  echo "$as_me:21817: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:21799: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:21823: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21804,7 +21828,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21807 "configure"
++#line 21831 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21823,16 +21847,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21826: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21850: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21829: \$? = $ac_status" >&5
++  echo "$as_me:21853: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21832: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21856: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21835: \$? = $ac_status" >&5
++  echo "$as_me:21859: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -21843,14 +21867,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21846: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:21870: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      echo "$as_me:21853: checking for dnet_ntoa in -ldnet_stub" >&5
++      echo "$as_me:21877: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21858,7 +21882,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21861 "configure"
++#line 21885 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21877,16 +21901,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21880: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21904: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21883: \$? = $ac_status" >&5
++  echo "$as_me:21907: \$? = $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:21910: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21889: \$? = $ac_status" >&5
++  echo "$as_me:21913: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -21897,7 +21921,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21900: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:21924: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -21916,13 +21940,13 @@
+     # on Irix 5.2, according to T.E. Dickey.
+     # The functions gethostbyname, getservbyname, and inet_addr are
+     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+-    echo "$as_me:21919: checking for gethostbyname" >&5
++    echo "$as_me:21943: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21925 "configure"
++#line 21949 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21953,16 +21977,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21956: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21980: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21959: \$? = $ac_status" >&5
++  echo "$as_me:21983: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21962: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21986: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21965: \$? = $ac_status" >&5
++  echo "$as_me:21989: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gethostbyname=yes
+ else
+@@ -21972,11 +21996,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21975: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:21999: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+-      echo "$as_me:21979: checking for gethostbyname in -lnsl" >&5
++      echo "$as_me:22003: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21984,7 +22008,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21987 "configure"
++#line 22011 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22003,16 +22027,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22006: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22030: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22009: \$? = $ac_status" >&5
++  echo "$as_me:22033: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22012: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22036: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22015: \$? = $ac_status" >&5
++  echo "$as_me:22039: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -22023,14 +22047,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22026: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:22050: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test "$ac_cv_lib_nsl_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+-        echo "$as_me:22033: checking for gethostbyname in -lbsd" >&5
++        echo "$as_me:22057: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22038,7 +22062,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22041 "configure"
++#line 22065 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22057,16 +22081,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22060: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22084: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22063: \$? = $ac_status" >&5
++  echo "$as_me:22087: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22066: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22090: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22069: \$? = $ac_status" >&5
++  echo "$as_me:22093: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -22077,7 +22101,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22080: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:22104: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test "$ac_cv_lib_bsd_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -22093,13 +22117,13 @@
+     # variants that don't use the nameserver (or something).  -lsocket
+     # must be given before -lnsl if both are needed.  We assume that
+     # if connect needs -lnsl, so does gethostbyname.
+-    echo "$as_me:22096: checking for connect" >&5
++    echo "$as_me:22120: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22102 "configure"
++#line 22126 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22130,16 +22154,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22133: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22157: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22136: \$? = $ac_status" >&5
++  echo "$as_me:22160: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22139: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22163: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22142: \$? = $ac_status" >&5
++  echo "$as_me:22166: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_connect=yes
+ else
+@@ -22149,11 +22173,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22152: result: $ac_cv_func_connect" >&5
++echo "$as_me:22176: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+ 
+     if test $ac_cv_func_connect = no; then
+-      echo "$as_me:22156: checking for connect in -lsocket" >&5
++      echo "$as_me:22180: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22161,7 +22185,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22164 "configure"
++#line 22188 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22180,16 +22204,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22183: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22207: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22186: \$? = $ac_status" >&5
++  echo "$as_me:22210: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22189: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22213: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22192: \$? = $ac_status" >&5
++  echo "$as_me:22216: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_socket_connect=yes
+ else
+@@ -22200,7 +22224,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22203: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:22227: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test "$ac_cv_lib_socket_connect" = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -22209,13 +22233,13 @@
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    echo "$as_me:22212: checking for remove" >&5
++    echo "$as_me:22236: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22218 "configure"
++#line 22242 "configure"
+ #include "confdefs.h"
+ #define remove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22246,16 +22270,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22249: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22273: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22252: \$? = $ac_status" >&5
++  echo "$as_me:22276: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22255: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22279: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22258: \$? = $ac_status" >&5
++  echo "$as_me:22282: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_remove=yes
+ else
+@@ -22265,11 +22289,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22268: result: $ac_cv_func_remove" >&5
++echo "$as_me:22292: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+ 
+     if test $ac_cv_func_remove = no; then
+-      echo "$as_me:22272: checking for remove in -lposix" >&5
++      echo "$as_me:22296: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22277,7 +22301,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22280 "configure"
++#line 22304 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22296,16 +22320,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22299: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22323: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22302: \$? = $ac_status" >&5
++  echo "$as_me:22326: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22305: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22329: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22308: \$? = $ac_status" >&5
++  echo "$as_me:22332: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_posix_remove=yes
+ else
+@@ -22316,7 +22340,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22319: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:22343: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test "$ac_cv_lib_posix_remove" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -22325,13 +22349,13 @@
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    echo "$as_me:22328: checking for shmat" >&5
++    echo "$as_me:22352: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22334 "configure"
++#line 22358 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22362,16 +22386,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22365: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22389: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22368: \$? = $ac_status" >&5
++  echo "$as_me:22392: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22371: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22395: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22374: \$? = $ac_status" >&5
++  echo "$as_me:22398: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_shmat=yes
+ else
+@@ -22381,11 +22405,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22384: result: $ac_cv_func_shmat" >&5
++echo "$as_me:22408: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+ 
+     if test $ac_cv_func_shmat = no; then
+-      echo "$as_me:22388: checking for shmat in -lipc" >&5
++      echo "$as_me:22412: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22393,7 +22417,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22396 "configure"
++#line 22420 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22412,16 +22436,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22415: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22439: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22418: \$? = $ac_status" >&5
++  echo "$as_me:22442: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22421: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22445: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22424: \$? = $ac_status" >&5
++  echo "$as_me:22448: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+@@ -22432,7 +22456,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22435: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:22459: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test "$ac_cv_lib_ipc_shmat" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -22450,7 +22474,7 @@
+   # These have to be linked with before -lX11, unlike the other
+   # libraries we check for below, so use a different variable.
+   # John Interrante, Karl Berry
+-  echo "$as_me:22453: checking for IceConnectionNumber in -lICE" >&5
++  echo "$as_me:22477: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22458,7 +22482,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22461 "configure"
++#line 22485 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22477,16 +22501,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22480: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22504: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22483: \$? = $ac_status" >&5
++  echo "$as_me:22507: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22486: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22510: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22489: \$? = $ac_status" >&5
++  echo "$as_me:22513: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -22497,7 +22521,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22500: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:22524: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -22544,16 +22568,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22547: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22571: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22552: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22576: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22556: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22580: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -22592,16 +22616,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22595: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:22619: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22600: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:22624: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22604: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22628: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -22640,23 +22664,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22643: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:22667: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22648: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:22672: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22652: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22676: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:22659: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:22683: 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.
+@@ -22673,7 +22697,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:22676: result: $enable_warnings" >&5
++echo "$as_me:22700: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -22696,10 +22720,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:22699: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:22723: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -22749,12 +22773,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:22752: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:22776: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22755: \$? = $ac_status" >&5
++  echo "$as_me:22779: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:22757: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:22781: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -22832,7 +22856,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22835 "configure"
++#line 22859 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22847,26 +22871,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22850: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22874: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22853: \$? = $ac_status" >&5
++  echo "$as_me:22877: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22856: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22880: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22859: \$? = $ac_status" >&5
++  echo "$as_me:22883: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:22862: checking for X11/Xt const-feature" >&5
++echo "$as_me:22886: 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 22869 "configure"
++#line 22893 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -22884,16 +22908,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22887: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22911: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22890: \$? = $ac_status" >&5
++  echo "$as_me:22914: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22893: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22917: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22896: \$? = $ac_status" >&5
++  echo "$as_me:22920: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -22908,7 +22932,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22911: result: $cf_cv_const_x_string" >&5
++echo "$as_me:22935: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -22937,7 +22961,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:22980: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -22969,12 +22993,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:22972: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:22996: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22975: \$? = $ac_status" >&5
++  echo "$as_me:22999: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:22977: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:23001: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -22982,7 +23006,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:22985: checking for $CC warning options..." >&5
++	{ echo "$as_me:23009: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -23005,12 +23029,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:23008: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:23032: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23011: \$? = $ac_status" >&5
++  echo "$as_me:23035: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:23013: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:23037: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -23018,7 +23042,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:23021: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:23045: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -23028,7 +23052,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:23031: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:23055: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -23045,7 +23069,7 @@
+ 
+ fi
+ 
+-echo "$as_me:23048: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:23072: 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.
+@@ -23067,7 +23091,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:23070: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:23094: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -23181,23 +23205,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:23184: checking for dmalloc.h" >&5
++	echo "$as_me:23208: 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 23190 "configure"
++#line 23214 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:23194: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23218: \"$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:23200: \$? = $ac_status" >&5
++  echo "$as_me:23224: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23216,11 +23240,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23219: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:23243: 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:23223: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:23247: 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
+@@ -23228,7 +23252,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23231 "configure"
++#line 23255 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -23247,16 +23271,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23250: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23274: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23253: \$? = $ac_status" >&5
++  echo "$as_me:23277: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23256: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23280: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23259: \$? = $ac_status" >&5
++  echo "$as_me:23283: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -23267,7 +23291,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23270: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:23294: 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:23309: 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.
+@@ -23304,7 +23328,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:23307: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:23331: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -23418,23 +23442,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:23421: checking for dbmalloc.h" >&5
++	echo "$as_me:23445: 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 23427 "configure"
++#line 23451 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:23431: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23455: \"$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:23437: \$? = $ac_status" >&5
++  echo "$as_me:23461: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23453,11 +23477,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23456: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:23480: 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:23460: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:23484: 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
+@@ -23465,7 +23489,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23468 "configure"
++#line 23492 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -23484,16 +23508,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23487: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23511: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23490: \$? = $ac_status" >&5
++  echo "$as_me:23514: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23493: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23517: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23496: \$? = $ac_status" >&5
++  echo "$as_me:23520: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -23504,7 +23528,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23507: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:23531: 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:23546: 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.
+@@ -23541,7 +23565,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:23544: result: ${with_valgrind:-no}" >&5
++echo "$as_me:23568: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -23654,7 +23678,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:23657: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:23681: 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.
+@@ -23665,7 +23689,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:23668: result: $with_no_leaks" >&5
++echo "$as_me:23692: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -23683,7 +23707,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:23686: checking for an rpath option" >&5
++	echo "$as_me:23710: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -23714,12 +23738,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:23717: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:23741: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:23722: checking if we need a space after rpath option" >&5
++		echo "$as_me:23746: 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"
+ 
+@@ -23740,7 +23764,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23743 "configure"
++#line 23767 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -23752,16 +23776,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23755: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23779: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23758: \$? = $ac_status" >&5
++  echo "$as_me:23782: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23761: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23785: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23764: \$? = $ac_status" >&5
++  echo "$as_me:23788: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -23771,14 +23795,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:23774: result: $cf_rpath_space" >&5
++		echo "$as_me:23798: 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:23781: checking if rpath-hack should be disabled" >&5
++echo "$as_me:23805: 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.
+@@ -23796,22 +23820,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:23799: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:23823: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:23804: checking for updated LDFLAGS" >&5
++echo "$as_me:23828: 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:23807: result: maybe" >&5
++	echo "$as_me:23831: 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:23814: checking for $ac_word" >&5
++echo "$as_me:23838: 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
+@@ -23826,7 +23850,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:23829: found $ac_dir/$ac_word" >&5
++echo "$as_me:23853: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -23834,10 +23858,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:23837: result: $cf_ldd_prog" >&5
++  echo "$as_me:23861: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:23840: result: no" >&5
++  echo "$as_me:23864: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -23851,7 +23875,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23854 "configure"
++#line 23878 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -23863,16 +23887,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23866: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23890: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23869: \$? = $ac_status" >&5
++  echo "$as_me:23893: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23872: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23896: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23875: \$? = $ac_status" >&5
++  echo "$as_me:23899: \$? = $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`
+@@ -23900,7 +23924,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:23903: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:23927: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -23912,11 +23936,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23915: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23939: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23919: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23943: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -23953,7 +23977,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:23956: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:23980: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -23966,11 +23990,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23969: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23993: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:23973: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:23997: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -24007,7 +24031,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:24010: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:24034: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -24020,14 +24044,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:24023: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:24047: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:24027: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:24051: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:24030: result: no" >&5
++	echo "$as_me:24054: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -24117,7 +24141,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:24120: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:24144: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -24298,7 +24322,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:24301: error: ambiguous option: $1
++    { { echo "$as_me:24325: 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;}
+@@ -24317,7 +24341,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:24320: error: unrecognized option: $1
++  -*) { { echo "$as_me:24344: 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;}
+@@ -24367,7 +24391,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:24370: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:24394: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -24459,6 +24483,10 @@
+ s,@host_cpu@,$host_cpu,;t t
+ s,@host_vendor@,$host_vendor,;t t
+ s,@host_os@,$host_os,;t t
++s,@target@,$target,;t t
++s,@target_cpu@,$target_cpu,;t t
++s,@target_vendor@,$target_vendor,;t t
++s,@target_os@,$target_os,;t t
+ s,@SET_MAKE@,$SET_MAKE,;t t
+ s,@CC@,$CC,;t t
+ s,@CFLAGS@,$CFLAGS,;t t
+@@ -24475,6 +24503,8 @@
+ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+ s,@INSTALL_DATA@,$INSTALL_DATA,;t t
++s,@GLOB_FULLPATH_POSIX@,$GLOB_FULLPATH_POSIX,;t t
++s,@GLOB_FULLPATH_OTHER@,$GLOB_FULLPATH_OTHER,;t t
+ s,@INSTALL_OPT_S@,$INSTALL_OPT_S,;t t
+ s,@INSTALL_OPT_O@,$INSTALL_OPT_O,;t t
+ s,@LINT@,$LINT,;t t
+@@ -24675,7 +24705,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:24678: creating $ac_file" >&5
++    { echo "$as_me:24708: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -24693,7 +24723,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:24696: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:24726: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -24706,7 +24736,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:24709: error: cannot find input file: $f" >&5
++           { { echo "$as_me:24739: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -24722,7 +24752,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:24725: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:24755: 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;}
+@@ -24731,7 +24761,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:24734: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:24764: 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;}
+@@ -24776,7 +24806,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:24779: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:24809: 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;}
+@@ -24787,7 +24817,7 @@
+     $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:24790: WARNING: Some variables may not be substituted:
++      { echo "$as_me:24820: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -24836,7 +24866,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:24839: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:24869: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -24847,7 +24877,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:24850: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:24880: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -24860,7 +24890,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:24863: error: cannot find input file: $f" >&5
++           { { echo "$as_me:24893: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -24918,7 +24948,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:24921: $ac_file is unchanged" >&5
++      { echo "$as_me:24951: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+Index: test/configure.in
+Prereq:  1.174 
+--- ncurses-6.5-20240727+/test/configure.in	2024-03-30 14:31:11.000000000 +0000
++++ ncurses-6.5-20240810/test/configure.in	2024-08-10 14:11:56.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1996-on
+ dnl
+-dnl $Id: configure.in,v 1.174 2024/03/30 14:31:11 tom Exp $
++dnl $Id: configure.in,v 1.177 2024/08/10 14:11:56 tom Exp $
+ dnl This is a simple configuration-script for the ncurses test programs that
+ dnl allows the test-directory to be separately configured against a reference
+ dnl system (i.e., sysvr4 curses)
+@@ -48,12 +48,10 @@
+ 
+ CF_INHERIT_SCRIPT(config.guess)
+ CF_INHERIT_SCRIPT(config.sub)
+-CF_CHECK_CACHE
+-
+-AC_ARG_PROGRAM
+ 
+ CF_HELP_MESSAGE(General Options:)
+ 
++CF_WITH_SYSTYPE
+ AC_PROG_MAKE_SET
+ CF_PROG_CC
+ AC_C_INLINE
+@@ -240,7 +238,6 @@
+ 
+ AC_HEADER_TIME
+ AC_CHECK_HEADERS( \
+-getopt.h \
+ locale.h \
+ math.h \
+ stdarg.h \
+@@ -248,7 +245,6 @@
+ sys/select.h \
+ sys/time.h \
+ termios.h \
+-unistd.h \
+ )
+ 
+ CF_GETOPT_HEADER
diff --git a/packages/ncurses/6.5/ncurses-6.5-20240817.patch b/packages/ncurses/6.5/ncurses-6.5-20240817.patch
new file mode 100644
index 0000000000..55fe610c8d
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20240817.patch
@@ -0,0 +1,42091 @@
+# ncurses 6.5 - patch 20240817 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20240817.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sat Aug 17 23:27:01 UTC 2024
+# ------------------------------------------------------------------------------
+# Ada95/Makefile.in                |   16 
+# Ada95/aclocal.m4                 |   36 
+# Ada95/configure                  | 2992 ++++++++++-----------
+# Ada95/configure.in               |   19 
+# Ada95/doc/Makefile.in            |    8 
+# Ada95/gen/Makefile.in            |   12 
+# Ada95/samples/Makefile.in        |    8 
+# Ada95/src/Makefile.in            |    6 
+# INSTALL                          |    8 
+# NEWS                             |   11 
+# VERSION                          |    2 
+# aclocal.m4                       |   86 
+# c++/Makefile.in                  |   10 
+# configure                        | 5140 ++++++++++++++++++-------------------
+# configure.in                     |   21 
+# dist.mk                          |    4 
+# form/Makefile.in                 |   12 
+# include/Makefile.in              |    6 
+# man/Makefile.in                  |   13 
+# menu/Makefile.in                 |   12 
+# misc/Makefile.in                 |   28 
+# misc/terminfo.src                |   63 
+# mk-1st.awk                       |   70 
+# ncurses/Makefile.in              |   10 
+# 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/Makefile.in                |   12 
+# progs/Makefile.in                |   55 
+# test/Makefile.in                 |   12 
+# test/aclocal.m4                  |   36 
+# test/configure                   | 3922 ++++++++++++++--------------
+# test/configure.in                |    3 
+# 37 files changed, 6455 insertions(+), 6200 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/Makefile.in
+Prereq:  1.30 
+--- ncurses-6.5-20240810+/Ada95/Makefile.in	2022-12-17 23:33:33.000000000 +0000
++++ ncurses-6.5-20240817/Ada95/Makefile.in	2024-08-11 00:24:28.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.30 2022/12/17 23:33:33 tom Exp $
++# $Id: Makefile.in,v 1.31 2024/08/11 00:24:28 tom Exp $
+ ##############################################################################
+-# Copyright 2020-2021,2022 Thomas E. Dickey                                  #
++# Copyright 2020-2022,2024 Thomas E. Dickey                                  #
+ # Copyright 1998-2010,2015 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -31,7 +31,7 @@
+ #  Author:  Juergen Pfeifer, 1996
+ #
+ #  Version Control
+-#  $Revision: 1.30 $
++#  $Revision: 1.31 $
+ #
+ SHELL		= @SHELL@
+ VPATH		= @srcdir@
+@@ -47,12 +47,12 @@
+ libexecdir	= @libexecdir@
+ includedir	= @includedir@
+ 
+-BINDIR		= $(DESTDIR)$(bindir)
+-DATADIR		= $(DESTDIR)$(datadir)
+-LIBDIR		= $(DESTDIR)$(libdir)
+-LIBEXECDIR	= $(DESTDIR)$(libexecdir)
++BINDIR		= $(DESTDIR)$(bindir@MERGE_PREFIX@)
++DATADIR		= $(DESTDIR)$(datadir@MERGE_PREFIX@)
++LIBDIR		= $(DESTDIR)$(libdir@MERGE_PREFIX@)
++LIBEXECDIR	= $(DESTDIR)$(libexecdir@MERGE_PREFIX@)
+ 
+-SUBDIRS         = @ADA_SUBDIRS@
++SUBDIRS		= @ADA_SUBDIRS@
+ 
+ INSTALL		= @INSTALL@ @INSTALL_OPT_O@
+ INSTALL_SCRIPT	= @INSTALL@
+Index: Ada95/aclocal.m4
+Prereq:  1.220 
+--- ncurses-6.5-20240810+/Ada95/aclocal.m4	2024-08-10 15:52:30.000000000 +0000
++++ ncurses-6.5-20240817/Ada95/aclocal.m4	2024-08-11 00:23:05.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: aclocal.m4,v 1.220 2024/08/10 15:52:30 tom Exp $
++dnl $Id: aclocal.m4,v 1.221 2024/08/11 00:23:05 tom Exp $
+ dnl Macros used in NCURSES Ada95 auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -2265,6 +2265,40 @@
+ AC_SUBST(INSTALL_OPT_S)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_INSTALL_PREFIX version: 1 updated: 2024/08/10 20:16:32
++dnl -----------------
++dnl Special option for use by system-builders: the install-prefix is used to
++dnl adjust the location into which the actual install is done, so that an
++dnl archive can be built without modifying the host system's configuration.
++AC_DEFUN([CF_INSTALL_PREFIX],[
++AC_MSG_CHECKING(for an installation directory prefix)
++AC_ARG_WITH(install-prefix,
++	[  --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix],
++	[case "x$withval" in
++	(xyes|xno)
++		;;
++	(*)	DESTDIR="$withval"
++		;;
++	esac])
++AC_MSG_RESULT([${DESTDIR:-(none)}])
++AC_SUBST(DESTDIR)
++
++AC_MSG_CHECKING(if installation directory prefix should be merged)
++CF_ARG_ENABLE(install-prefix,
++	[  --enable-install-prefix merge DESTDIR with installation prefix],
++	cf_install_prefix=yes,
++	cf_install_prefix=no)
++AC_MSG_RESULT($cf_install_prefix)
++
++if test "$cf_install_prefix" = yes ; then
++	MERGE_PREFIX=':$(prefix)%=%'
++else
++	MERGE_PREFIX=''
++fi
++
++AC_SUBST(MERGE_PREFIX)
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_INTEL_COMPILER version: 9 updated: 2023/02/18 17:41:25
+ dnl -----------------
+ dnl Check if the given compiler is really the Intel compiler for Linux.  It
+Index: Ada95/configure
+--- ncurses-6.5-20240810+/Ada95/configure	2024-08-03 17:38:14.000000000 +0000
++++ ncurses-6.5-20240817/Ada95/configure	2024-08-11 00:23:38.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.93 .
++# From configure.in Revision: 1.94 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20240618.
+ #
+@@ -714,7 +714,8 @@
+   --with-pkg-config-libdir[=XXX] use given directory for installing pc-files
+   --without-tests         suppress build with test-programs
+   --enable-mixed-case     tic should assume mixed-case filenames
+-  --with-install-prefix   prefixes actual install-location ($DESTDIR)
++  --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix
++  --enable-install-prefix merge DESTDIR with installation prefix
+ Build-Tools Needed to Compile Temporary Applications for Cross-compiling:
+   --with-build-cc=XXX     the build C compiler ($BUILD_CC)
+   --with-build-cpp=XXX    the build C preprocessor ($BUILD_CPP)
+@@ -952,7 +953,7 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+   if test -r "$ac_site_file"; then
+-    { echo "$as_me:955: loading site script $ac_site_file" >&5
++    { echo "$as_me:956: loading site script $ac_site_file" >&5
+ echo "$as_me: loading site script $ac_site_file" >&6;}
+     cat "$ac_site_file" >&5
+     . "$ac_site_file"
+@@ -963,7 +964,7 @@
+   # Some versions of bash will fail to source /dev/null (special
+   # files actually), so we avoid doing that.
+   if test -f "$cache_file"; then
+-    { echo "$as_me:966: loading cache $cache_file" >&5
++    { echo "$as_me:967: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+       [\\/]* | ?:[\\/]* ) . $cache_file;;
+@@ -971,7 +972,7 @@
+     esac
+   fi
+ else
+-  { echo "$as_me:974: creating cache $cache_file" >&5
++  { echo "$as_me:975: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+@@ -987,21 +988,21 @@
+   eval ac_new_val="\$ac_env_${ac_var}_value"
+   case "$ac_old_set,$ac_new_set" in
+     set,)
+-      { echo "$as_me:990: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++      { echo "$as_me:991: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,set)
+-      { echo "$as_me:994: error: \`$ac_var' was not set in the previous run" >&5
++      { echo "$as_me:995: error: \`$ac_var' was not set in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,);;
+     *)
+       if test "x$ac_old_val" != "x$ac_new_val"; then
+-        { echo "$as_me:1000: error: \`$ac_var' has changed since the previous run:" >&5
++        { echo "$as_me:1001: error: \`$ac_var' has changed since the previous run:" >&5
+ echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+-        { echo "$as_me:1002:   former value:  $ac_old_val" >&5
++        { echo "$as_me:1003:   former value:  $ac_old_val" >&5
+ echo "$as_me:   former value:  $ac_old_val" >&2;}
+-        { echo "$as_me:1004:   current value: $ac_new_val" >&5
++        { echo "$as_me:1005:   current value: $ac_new_val" >&5
+ echo "$as_me:   current value: $ac_new_val" >&2;}
+         ac_cache_corrupted=:
+       fi;;
+@@ -1020,9 +1021,9 @@
+   fi
+ done
+ if "$ac_cache_corrupted"; then
+-  { echo "$as_me:1023: error: changes in the environment can compromise the build" >&5
++  { echo "$as_me:1024: error: changes in the environment can compromise the build" >&5
+ echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  { { echo "$as_me:1025: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++  { { echo "$as_me:1026: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1051,10 +1052,10 @@
+ echo "#! $SHELL" >conftest.sh
+ echo  "exit 0"   >>conftest.sh
+ chmod +x conftest.sh
+-if { (echo "$as_me:1054: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:1055: PATH=\".;.\"; conftest.sh") >&5
+   (PATH=".;."; conftest.sh) 2>&5
+   ac_status=$?
+-  echo "$as_me:1057: \$? = $ac_status" >&5
++  echo "$as_me:1058: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+   ac_path_separator=';'
+ else
+@@ -1086,7 +1087,7 @@
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:1089: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++  { { echo "$as_me:1090: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+ echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1096,11 +1097,11 @@
+ 
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+-  { { echo "$as_me:1099: error: cannot run $ac_config_sub" >&5
++  { { echo "$as_me:1100: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:1103: checking build system type" >&5
++echo "$as_me:1104: checking build system type" >&5
+ echo $ECHO_N "checking build system type... $ECHO_C" >&6
+ if test "${ac_cv_build+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1109,23 +1110,23 @@
+ test -z "$ac_cv_build_alias" &&
+   ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+-  { { echo "$as_me:1112: error: cannot guess build type; you must specify one" >&5
++  { { echo "$as_me:1113: error: cannot guess build type; you must specify one" >&5
+ echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+    { (exit 1); exit 1; }; }
+ ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` ||
+-  { { echo "$as_me:1116: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++  { { echo "$as_me:1117: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1121: result: $ac_cv_build" >&5
++echo "$as_me:1122: result: $ac_cv_build" >&5
+ echo "${ECHO_T}$ac_cv_build" >&6
+ build=$ac_cv_build
+ build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+-echo "$as_me:1128: checking host system type" >&5
++echo "$as_me:1129: checking host system type" >&5
+ echo $ECHO_N "checking host system type... $ECHO_C" >&6
+ if test "${ac_cv_host+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1134,12 +1135,12 @@
+ test -z "$ac_cv_host_alias" &&
+   ac_cv_host_alias=$ac_cv_build_alias
+ ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` ||
+-  { { echo "$as_me:1137: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++  { { echo "$as_me:1138: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1142: result: $ac_cv_host" >&5
++echo "$as_me:1143: result: $ac_cv_host" >&5
+ echo "${ECHO_T}$ac_cv_host" >&6
+ host=$ac_cv_host
+ host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1147,7 +1148,7 @@
+ host_os=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+ if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
+-	echo "$as_me:1150: checking target system type" >&5
++	echo "$as_me:1151: checking target system type" >&5
+ echo $ECHO_N "checking target system type... $ECHO_C" >&6
+ if test "${ac_cv_target+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1156,12 +1157,12 @@
+ test "x$ac_cv_target_alias" = "x" &&
+   ac_cv_target_alias=$ac_cv_host_alias
+ ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` ||
+-  { { echo "$as_me:1159: error: $ac_config_sub $ac_cv_target_alias failed" >&5
++  { { echo "$as_me:1160: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1164: result: $ac_cv_target" >&5
++echo "$as_me:1165: result: $ac_cv_target" >&5
+ echo "${ECHO_T}$ac_cv_target" >&6
+ target=$ac_cv_target
+ target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1193,13 +1194,13 @@
+ fi
+ 
+ test -z "$system_name" && system_name="$cf_cv_system_name"
+-test -n "$cf_cv_system_name" && echo "$as_me:1196: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1197: result: Configuring for $cf_cv_system_name" >&5
+ echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
+ 
+ if test ".$system_name" != ".$cf_cv_system_name" ; then
+-	echo "$as_me:1200: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++	echo "$as_me:1201: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+ echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
+-	{ { echo "$as_me:1202: error: \"Please remove config.cache and try again.\"" >&5
++	{ { echo "$as_me:1203: error: \"Please remove config.cache and try again.\"" >&5
+ echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1207,7 +1208,7 @@
+ # Check whether --with-system-type or --without-system-type was given.
+ if test "${with_system_type+set}" = set; then
+   withval="$with_system_type"
+-  { echo "$as_me:1210: WARNING: overriding system type to $withval" >&5
++  { echo "$as_me:1211: WARNING: overriding system type to $withval" >&5
+ echo "$as_me: WARNING: overriding system type to $withval" >&2;}
+ 	cf_cv_system_name=$withval
+ 	host_os=$withval
+@@ -1222,7 +1223,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:1225: checking for $ac_word" >&5
++echo "$as_me:1226: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_GREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1237,7 +1238,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_GREP="$ac_prog"
+-echo "$as_me:1240: found $ac_dir/$ac_word" >&5
++echo "$as_me:1241: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1245,10 +1246,10 @@
+ fi
+ GREP=$ac_cv_prog_GREP
+ if test -n "$GREP"; then
+-  echo "$as_me:1248: result: $GREP" >&5
++  echo "$as_me:1249: result: $GREP" >&5
+ echo "${ECHO_T}$GREP" >&6
+ else
+-  echo "$as_me:1251: result: no" >&5
++  echo "$as_me:1252: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1256,7 +1257,7 @@
+ done
+ test -n "$GREP" || GREP=": "
+ 
+-echo "$as_me:1259: checking for fgrep" >&5
++echo "$as_me:1260: checking for fgrep" >&5
+ echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
+ if test "${ac_cv_path_FGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1268,7 +1269,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:1271: checking for $ac_word" >&5
++echo "$as_me:1272: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_FGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1285,7 +1286,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_FGREP="$ac_dir/$ac_word"
+-   echo "$as_me:1288: found $ac_dir/$ac_word" >&5
++   echo "$as_me:1289: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -1296,10 +1297,10 @@
+ FGREP=$ac_cv_path_FGREP
+ 
+ if test -n "$FGREP"; then
+-  echo "$as_me:1299: result: $FGREP" >&5
++  echo "$as_me:1300: result: $FGREP" >&5
+ echo "${ECHO_T}$FGREP" >&6
+ else
+-  echo "$as_me:1302: result: no" >&5
++  echo "$as_me:1303: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1307,16 +1308,16 @@
+ done
+ test -n "$FGREP" || FGREP=": "
+ 
+-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1310: error: cannot find workable fgrep" >&5
++     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1311: error: cannot find workable fgrep" >&5
+ echo "$as_me: error: cannot find workable fgrep" >&2;}
+    { (exit 1); exit 1; }; }
+    fi
+ fi
+-echo "$as_me:1315: result: $ac_cv_path_FGREP" >&5
++echo "$as_me:1316: result: $ac_cv_path_FGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_FGREP" >&6
+  FGREP="$ac_cv_path_FGREP"
+ 
+-echo "$as_me:1319: checking for prefix" >&5
++echo "$as_me:1320: checking for prefix" >&5
+ echo $ECHO_N "checking for prefix... $ECHO_C" >&6
+ if test "x$prefix" = "xNONE" ; then
+ 	case "$cf_cv_system_name" in
+@@ -1328,11 +1329,11 @@
+ 		;;
+ 	esac
+ fi
+-echo "$as_me:1331: result: $prefix" >&5
++echo "$as_me:1332: result: $prefix" >&5
+ echo "${ECHO_T}$prefix" >&6
+ 
+ if test "x$prefix" = "xNONE" ; then
+-echo "$as_me:1335: checking for default include-directory" >&5
++echo "$as_me:1336: checking for default include-directory" >&5
+ echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
+ test -n "$verbose" && echo 1>&6
+ for cf_symbol in \
+@@ -1355,7 +1356,7 @@
+ 	fi
+ 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
+ done
+-echo "$as_me:1358: result: $includedir" >&5
++echo "$as_me:1359: result: $includedir" >&5
+ echo "${ECHO_T}$includedir" >&6
+ fi
+ 
+@@ -1382,7 +1383,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:1385: checking for $ac_word" >&5
++echo "$as_me:1386: 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
+@@ -1399,7 +1400,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:1402: found $ac_dir/$ac_word" >&5
++   echo "$as_me:1403: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -1411,10 +1412,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+ 
+ if test -n "$cf_TEMP_gnat"; then
+-  echo "$as_me:1414: result: $cf_TEMP_gnat" >&5
++  echo "$as_me:1415: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+-  echo "$as_me:1417: result: no" >&5
++  echo "$as_me:1418: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1424,7 +1425,7 @@
+ 		unset cf_cv_gnat_version
+ 		unset cf_TEMP_gnat
+ 
+-echo "$as_me:1427: checking for $cf_prog_gnat version" >&5
++echo "$as_me:1428: 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
+@@ -1435,7 +1436,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:1438: result: $cf_cv_gnat_version" >&5
++echo "$as_me:1439: 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
+@@ -1464,7 +1465,7 @@
+ 			cd conftest.src
+ 			for cf_gprconfig in Ada C
+ 			do
+-				echo "$as_me:1467: checking for gprconfig name for $cf_gprconfig" >&5
++				echo "$as_me:1468: 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
+@@ -1483,10 +1484,10 @@
+ 				if test -n "$cf_gprconfig_value"
+ 				then
+ 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+-					echo "$as_me:1486: result: $cf_gprconfig_value" >&5
++					echo "$as_me:1487: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ 				else
+-					echo "$as_me:1489: result: missing" >&5
++					echo "$as_me:1490: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ 					cf_ada_config="#"
+ 					break
+@@ -1499,7 +1500,7 @@
+ 	if test "x$cf_ada_config" != "x#"
+ 	then
+ 
+-echo "$as_me:1502: checking for gnat version" >&5
++echo "$as_me:1503: 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
+@@ -1510,7 +1511,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:1513: result: $cf_cv_gnat_version" >&5
++echo "$as_me:1514: 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
+ 
+@@ -1519,7 +1520,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ echo "$as_me:1522: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:1523: 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
+ 	;;
+@@ -1527,7 +1528,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:1530: checking for $ac_word" >&5
++echo "$as_me:1531: 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
+@@ -1542,7 +1543,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:1545: found $ac_dir/$ac_word" >&5
++echo "$as_me:1546: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1551,20 +1552,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:1554: result: $M4_exists" >&5
++  echo "$as_me:1555: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:1557: result: no" >&5
++  echo "$as_me:1558: 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:1563: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++			{ echo "$as_me:1564: 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:1567: checking if GNAT works" >&5
++			echo "$as_me:1568: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf ./conftest* ./*~conftest*
+@@ -1592,7 +1593,7 @@
+ fi
+ rm -rf ./conftest* ./*~conftest*
+ 
+-			echo "$as_me:1595: result: $cf_cv_prog_gnat_correct" >&5
++			echo "$as_me:1596: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 		fi
+ 	else
+@@ -1608,7 +1609,7 @@
+ 		# Here is a workaround.
+ 		# Extract the first word of "gnatgcc", so it can be a program name with args.
+ set dummy gnatgcc; ac_word=$2
+-echo "$as_me:1611: checking for $ac_word" >&5
++echo "$as_me:1612: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_cf_cv_path_gnatgcc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1625,7 +1626,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_cf_cv_path_gnatgcc="$ac_dir/$ac_word"
+-   echo "$as_me:1628: found $ac_dir/$ac_word" >&5
++   echo "$as_me:1629: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -1637,16 +1638,16 @@
+ cf_cv_path_gnatgcc=$ac_cv_path_cf_cv_path_gnatgcc
+ 
+ if test -n "$cf_cv_path_gnatgcc"; then
+-  echo "$as_me:1640: result: $cf_cv_path_gnatgcc" >&5
++  echo "$as_me:1641: result: $cf_cv_path_gnatgcc" >&5
+ echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
+ else
+-  echo "$as_me:1643: result: no" >&5
++  echo "$as_me:1644: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 		if test "$cf_cv_path_gnatgcc" != no
+ 		then
+-			echo "$as_me:1649: checking for improvement" >&5
++			echo "$as_me:1650: checking for improvement" >&5
+ echo $ECHO_N "checking for improvement... $ECHO_C" >&6
+ 			cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null`
+ 			case "x$cf_file_gnatgcc" in
+@@ -1657,7 +1658,7 @@
+ 				cf_cv_path_gnatgcc=no
+ 				;;
+ 			esac
+-			echo "$as_me:1660: result: $cf_cv_path_gnatgcc" >&5
++			echo "$as_me:1661: result: $cf_cv_path_gnatgcc" >&5
+ echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
+ 			test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc
+ 			cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc"
+@@ -1682,7 +1683,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:1685: checking for $ac_word" >&5
++echo "$as_me:1686: 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
+@@ -1697,7 +1698,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:1700: found $ac_dir/$ac_word" >&5
++echo "$as_me:1701: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1705,10 +1706,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1708: result: $CC" >&5
++  echo "$as_me:1709: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1711: result: no" >&5
++  echo "$as_me:1712: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1721,7 +1722,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:1724: checking for $ac_word" >&5
++echo "$as_me:1725: 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
+@@ -1736,7 +1737,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:1739: found $ac_dir/$ac_word" >&5
++echo "$as_me:1740: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1744,10 +1745,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1747: result: $ac_ct_CC" >&5
++  echo "$as_me:1748: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1750: result: no" >&5
++  echo "$as_me:1751: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1757,32 +1758,32 @@
+   CC=$ac_ct_CC
+ fi
+ 
+-test -z "$CC" && { { echo "$as_me:1760: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1761: 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:1765:" \
++echo "$as_me:1766:" \
+      "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo "$2"`
+-{ (eval echo "$as_me:1768: \"$ac_compiler --version &5\"") >&5
++{ (eval echo "$as_me:1769: \"$ac_compiler --version &5\"") >&5
+   (eval $ac_compiler --version &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1771: \$? = $ac_status" >&5
++  echo "$as_me:1772: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:1773: \"$ac_compiler -v &5\"") >&5
++{ (eval echo "$as_me:1774: \"$ac_compiler -v &5\"") >&5
+   (eval $ac_compiler -v &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1776: \$? = $ac_status" >&5
++  echo "$as_me:1777: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:1778: \"$ac_compiler -V &5\"") >&5
++{ (eval echo "$as_me:1779: \"$ac_compiler -V &5\"") >&5
+   (eval $ac_compiler -V &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1781: \$? = $ac_status" >&5
++  echo "$as_me:1782: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1785 "configure"
++#line 1786 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1798,13 +1799,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:1801: checking for C compiler default output" >&5
++echo "$as_me:1802: 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:1804: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1805: \"$ac_link_default\"") >&5
+   (eval $ac_link_default) 2>&5
+   ac_status=$?
+-  echo "$as_me:1807: \$? = $ac_status" >&5
++  echo "$as_me:1808: \$? = $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
+@@ -1827,34 +1828,34 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:1830: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1831: 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:1836: result: $ac_file" >&5
++echo "$as_me:1837: 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:1841: checking whether the C compiler works" >&5
++echo "$as_me:1842: 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:1847: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1848: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1850: \$? = $ac_status" >&5
++  echo "$as_me:1851: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+-	{ { echo "$as_me:1857: error: cannot run C compiled programs.
++	{ { echo "$as_me:1858: 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;}
+@@ -1862,24 +1863,24 @@
+     fi
+   fi
+ fi
+-echo "$as_me:1865: result: yes" >&5
++echo "$as_me:1866: 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:1872: checking whether we are cross compiling" >&5
++echo "$as_me:1873: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:1874: result: $cross_compiling" >&5
++echo "$as_me:1875: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+ 
+-echo "$as_me:1877: checking for executable suffix" >&5
++echo "$as_me:1878: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:1879: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1880: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:1882: \$? = $ac_status" >&5
++  echo "$as_me:1883: \$? = $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
+@@ -1895,25 +1896,25 @@
+   esac
+ done
+ else
+-  { { echo "$as_me:1898: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:1899: 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:1904: result: $ac_cv_exeext" >&5
++echo "$as_me:1905: 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:1910: checking for object suffix" >&5
++echo "$as_me:1911: 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 1916 "configure"
++#line 1917 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1925,10 +1926,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:1928: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1929: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1931: \$? = $ac_status" >&5
++  echo "$as_me:1932: \$? = $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
+@@ -1940,24 +1941,24 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:1943: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:1944: 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:1950: result: $ac_cv_objext" >&5
++echo "$as_me:1951: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:1954: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:1955: 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 1960 "configure"
++#line 1961 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1972,16 +1973,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1975: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1976: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1978: \$? = $ac_status" >&5
++  echo "$as_me:1979: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:1981: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1982: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1984: \$? = $ac_status" >&5
++  echo "$as_me:1985: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -1993,19 +1994,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:1996: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:1997: 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:2002: checking whether $CC accepts -g" >&5
++echo "$as_me:2003: 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 2008 "configure"
++#line 2009 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2017,16 +2018,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2020: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2021: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2023: \$? = $ac_status" >&5
++  echo "$as_me:2024: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2026: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2027: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2029: \$? = $ac_status" >&5
++  echo "$as_me:2030: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cc_g=yes
+ else
+@@ -2036,7 +2037,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:2039: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:2040: 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
+@@ -2063,16 +2064,16 @@
+ #endif
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2066: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2067: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2069: \$? = $ac_status" >&5
++  echo "$as_me:2070: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2072: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2073: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2075: \$? = $ac_status" >&5
++  echo "$as_me:2076: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   for ac_declaration in \
+    ''\
+@@ -2084,7 +2085,7 @@
+    'void exit (int);'
+ do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2087 "configure"
++#line 2088 "configure"
+ #include "confdefs.h"
+ #include 
+ $ac_declaration
+@@ -2097,16 +2098,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2100: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2101: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2103: \$? = $ac_status" >&5
++  echo "$as_me:2104: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2106: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2107: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2109: \$? = $ac_status" >&5
++  echo "$as_me:2110: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -2116,7 +2117,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2119 "configure"
++#line 2120 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -2128,16 +2129,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2131: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2132: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2134: \$? = $ac_status" >&5
++  echo "$as_me:2135: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2137: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2138: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2140: \$? = $ac_status" >&5
++  echo "$as_me:2141: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -2167,11 +2168,11 @@
+ 
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+-	echo "$as_me:2170: checking version of $CC" >&5
++	echo "$as_me:2171: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+-	echo "$as_me:2174: result: $GCC_VERSION" >&5
++	echo "$as_me:2175: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+ 
+@@ -2180,12 +2181,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:2183: checking if this is really Intel C compiler" >&5
++		echo "$as_me:2184: 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 2188 "configure"
++#line 2189 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2202,16 +2203,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2205: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2206: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2208: \$? = $ac_status" >&5
++  echo "$as_me:2209: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2211: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2212: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2214: \$? = $ac_status" >&5
++  echo "$as_me:2215: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -2222,7 +2223,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:2225: result: $INTEL_COMPILER" >&5
++		echo "$as_me:2226: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ 		;;
+ 	esac
+@@ -2231,11 +2232,11 @@
+ CLANG_COMPILER=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:2234: checking if this is really Clang C compiler" >&5
++	echo "$as_me:2235: 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 2238 "configure"
++#line 2239 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2252,16 +2253,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2255: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2256: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2258: \$? = $ac_status" >&5
++  echo "$as_me:2259: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2261: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2262: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2264: \$? = $ac_status" >&5
++  echo "$as_me:2265: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_COMPILER=yes
+ 
+@@ -2271,7 +2272,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:2274: result: $CLANG_COMPILER" >&5
++	echo "$as_me:2275: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+ 
+@@ -2280,30 +2281,30 @@
+ if test "x$CLANG_COMPILER" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:2283: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:2284: 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:2290: checking version of $CC" >&5
++	echo "$as_me:2291: 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:2294: result: $CLANG_VERSION" >&5
++	echo "$as_me:2295: 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:2301: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:2302: 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 2306 "configure"
++#line 2307 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -2317,16 +2318,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:2320: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2321: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2323: \$? = $ac_status" >&5
++  echo "$as_me:2324: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:2326: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2327: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2329: \$? = $ac_status" >&5
++  echo "$as_me:2330: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -2337,13 +2338,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:2340: result: $cf_clang_optok" >&5
++		echo "$as_me:2341: 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}:2346: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:2347: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -2352,7 +2353,7 @@
+ 	done
+ fi
+ 
+-echo "$as_me:2355: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:2356: 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
+@@ -2360,7 +2361,7 @@
+   ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2363 "configure"
++#line 2364 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -2407,16 +2408,16 @@
+ do
+   CC="$ac_save_CC $ac_arg"
+   rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2410: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2411: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2413: \$? = $ac_status" >&5
++  echo "$as_me:2414: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2416: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2417: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2419: \$? = $ac_status" >&5
++  echo "$as_me:2420: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -2433,10 +2434,10 @@
+ 
+ case "x$ac_cv_prog_cc_stdc" in
+   x|xno)
+-    echo "$as_me:2436: result: none needed" >&5
++    echo "$as_me:2437: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+   *)
+-    echo "$as_me:2439: result: $ac_cv_prog_cc_stdc" >&5
++    echo "$as_me:2440: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+     CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+@@ -2444,13 +2445,13 @@
+ # This should have been defined by AC_PROG_CC
+ : "${CC:=cc}"
+ 
+-echo "$as_me:2447: checking \$CFLAGS variable" >&5
++echo "$as_me:2448: checking \$CFLAGS variable" >&5
+ echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
+ case "x$CFLAGS" in
+ (*-[IUD]*)
+-	echo "$as_me:2451: result: broken" >&5
++	echo "$as_me:2452: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2453: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
++	{ echo "$as_me:2454: 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=
+@@ -2558,18 +2559,18 @@
+ 	done
+ 	;;
+ (*)
+-	echo "$as_me:2561: result: ok" >&5
++	echo "$as_me:2562: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+ 
+-echo "$as_me:2566: checking \$CC variable" >&5
++echo "$as_me:2567: checking \$CC variable" >&5
+ echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+ case "$CC" in
+ (*[\ \	]-*)
+-	echo "$as_me:2570: result: broken" >&5
++	echo "$as_me:2571: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2572: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++	{ echo "$as_me:2573: 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/[ ]*[ ]-[^ ].*//'`
+@@ -2686,19 +2687,19 @@
+ 	done
+ 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
+ 
+-echo "${as_me:-configure}:2689: testing resulting CC: '$CC' ..." 1>&5
++echo "${as_me:-configure}:2690: testing resulting CC: '$CC' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:2693: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2694: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:2697: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2698: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+ 
+ 	;;
+ (*)
+-	echo "$as_me:2701: result: ok" >&5
++	echo "$as_me:2702: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+@@ -2706,7 +2707,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:2709: checking for egrep" >&5
++echo "$as_me:2710: checking for egrep" >&5
+ echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+ if test "${ac_cv_path_EGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2718,7 +2719,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:2721: checking for $ac_word" >&5
++echo "$as_me:2722: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_EGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2735,7 +2736,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_EGREP="$ac_dir/$ac_word"
+-   echo "$as_me:2738: found $ac_dir/$ac_word" >&5
++   echo "$as_me:2739: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -2746,10 +2747,10 @@
+ EGREP=$ac_cv_path_EGREP
+ 
+ if test -n "$EGREP"; then
+-  echo "$as_me:2749: result: $EGREP" >&5
++  echo "$as_me:2750: result: $EGREP" >&5
+ echo "${ECHO_T}$EGREP" >&6
+ else
+-  echo "$as_me:2752: result: no" >&5
++  echo "$as_me:2753: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2757,12 +2758,12 @@
+ done
+ test -n "$EGREP" || EGREP=": "
+ 
+-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2760: error: cannot find workable egrep" >&5
++     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2761: error: cannot find workable egrep" >&5
+ echo "$as_me: error: cannot find workable egrep" >&2;}
+    { (exit 1); exit 1; }; }
+    fi
+ fi
+-echo "$as_me:2765: result: $ac_cv_path_EGREP" >&5
++echo "$as_me:2766: result: $ac_cv_path_EGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_EGREP" >&6
+  EGREP="$ac_cv_path_EGREP"
+ 
+@@ -2772,7 +2773,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:2775: checking how to run the C preprocessor" >&5
++echo "$as_me:2776: 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
+@@ -2793,18 +2794,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 2796 "configure"
++#line 2797 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2801: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2802: \"$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:2807: \$? = $ac_status" >&5
++  echo "$as_me:2808: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2827,17 +2828,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2830 "configure"
++#line 2831 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:2834: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2835: \"$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:2840: \$? = $ac_status" >&5
++  echo "$as_me:2841: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2874,7 +2875,7 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:2877: result: $CPP" >&5
++echo "$as_me:2878: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -2884,18 +2885,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 2887 "configure"
++#line 2888 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2892: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2893: \"$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:2898: \$? = $ac_status" >&5
++  echo "$as_me:2899: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2918,17 +2919,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2921 "configure"
++#line 2922 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:2925: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2926: \"$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:2931: \$? = $ac_status" >&5
++  echo "$as_me:2932: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2956,7 +2957,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:2959: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:2960: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -2969,14 +2970,14 @@
+ ac_main_return="return"
+ 
+ if test $ac_cv_c_compiler_gnu = yes; then
+-    echo "$as_me:2972: checking whether $CC needs -traditional" >&5
++    echo "$as_me:2973: 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 2979 "configure"
++#line 2980 "configure"
+ #include "confdefs.h"
+ #include 
+ int Autoconf = TIOCGETP;
+@@ -2991,7 +2992,7 @@
+ 
+   if test $ac_cv_prog_gcc_traditional = no; then
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2994 "configure"
++#line 2995 "configure"
+ #include "confdefs.h"
+ #include 
+ int Autoconf = TCGETA;
+@@ -3004,14 +3005,14 @@
+ 
+   fi
+ fi
+-echo "$as_me:3007: result: $ac_cv_prog_gcc_traditional" >&5
++echo "$as_me:3008: 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:3014: checking whether $CC understands -c and -o together" >&5
++echo "$as_me:3015: 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
+@@ -3026,15 +3027,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:3029: \"$ac_try\"") >&5
++if { (eval echo "$as_me:3030: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3032: \$? = $ac_status" >&5
++  echo "$as_me:3033: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:3034: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:3035: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3037: \$? = $ac_status" >&5
++  echo "$as_me:3038: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CC_c_o=yes
+@@ -3045,10 +3046,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CC_c_o" = yes; then
+-  echo "$as_me:3048: result: yes" >&5
++  echo "$as_me:3049: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:3051: result: no" >&5
++  echo "$as_me:3052: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3069,7 +3070,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:3072: checking for $ac_word" >&5
++echo "$as_me:3073: 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
+@@ -3084,7 +3085,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+-echo "$as_me:3087: found $ac_dir/$ac_word" >&5
++echo "$as_me:3088: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3092,21 +3093,21 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "$as_me:3095: result: $AWK" >&5
++  echo "$as_me:3096: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+-  echo "$as_me:3098: result: no" >&5
++  echo "$as_me:3099: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   test -n "$AWK" && break
+ done
+ 
+-test -z "$AWK" && { { echo "$as_me:3105: error: No awk program found" >&5
++test -z "$AWK" && { { echo "$as_me:3106: error: No awk program found" >&5
+ echo "$as_me: error: No awk program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:3109: checking for egrep" >&5
++echo "$as_me:3110: checking for egrep" >&5
+ echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+ if test "${ac_cv_prog_egrep+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3116,11 +3117,11 @@
+ 		else ac_cv_prog_egrep='egrep'
+ 	fi
+ fi
+-echo "$as_me:3119: result: $ac_cv_prog_egrep" >&5
++echo "$as_me:3120: result: $ac_cv_prog_egrep" >&5
+ echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+ 	EGREP=$ac_cv_prog_egrep
+ 
+-	test -z "$EGREP" && { { echo "$as_me:3123: error: No egrep program found" >&5
++	test -z "$EGREP" && { { echo "$as_me:3124: error: No egrep program found" >&5
+ echo "$as_me: error: No egrep program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -3136,7 +3137,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:3139: checking for a BSD compatible install" >&5
++echo "$as_me:3140: 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
+@@ -3185,7 +3186,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:3188: result: $INSTALL" >&5
++echo "$as_me:3189: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -3196,18 +3197,18 @@
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+-echo "$as_me:3199: checking whether ln -s works" >&5
++echo "$as_me:3200: 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:3203: result: yes" >&5
++  echo "$as_me:3204: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:3206: result: no, using $LN_S" >&5
++  echo "$as_me:3207: result: no, using $LN_S" >&5
+ echo "${ECHO_T}no, using $LN_S" >&6
+ fi
+ 
+-echo "$as_me:3210: checking if $LN_S -f options work" >&5
++echo "$as_me:3211: 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
+@@ -3219,7 +3220,7 @@
+ 	cf_prog_ln_sf=no
+ fi
+ rm -f conf$$.dst conf$$src
+-echo "$as_me:3222: result: $cf_prog_ln_sf" >&5
++echo "$as_me:3223: 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"
+@@ -3247,7 +3248,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:3250: checking for a BSD compatible install" >&5
++echo "$as_me:3251: 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
+@@ -3296,7 +3297,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:3299: result: $INSTALL" >&5
++echo "$as_me:3300: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -3317,7 +3318,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:3320: checking if you want to install stripped executables" >&5
++echo "$as_me:3321: 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.
+@@ -3334,7 +3335,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:3337: result: $enable_stripping" >&5
++echo "$as_me:3338: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -3345,7 +3346,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:3348: checking if install accepts -p option" >&5
++echo "$as_me:3349: 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
+@@ -3376,10 +3377,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:3379: result: $cf_cv_install_p" >&5
++echo "$as_me:3380: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:3382: checking if install needs to be told about ownership" >&5
++echo "$as_me:3383: 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)
+@@ -3390,7 +3391,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:3393: result: $with_install_o" >&5
++echo "$as_me:3394: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -3401,7 +3402,7 @@
+ 
+ if test -n "$INSTALL_OPT_S"
+ then
+-	echo "$as_me:3404: checking if you want to specify strip-program" >&5
++	echo "$as_me:3405: checking if you want to specify strip-program" >&5
+ echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
+ 
+ # Check whether --with-strip-program or --without-strip-program was given.
+@@ -3411,11 +3412,11 @@
+ else
+   with_strip_program=no
+ fi;
+-	echo "$as_me:3414: result: $with_strip_program" >&5
++	echo "$as_me:3415: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ 	if test "$with_strip_program" != no
+ 	then
+-		echo "$as_me:3418: checking if strip-program is supported with this installer" >&5
++		echo "$as_me:3419: checking if strip-program is supported with this installer" >&5
+ echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
+ 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
+ 		check_install_strip=no
+@@ -3436,11 +3437,11 @@
+ 				done
+ 			fi
+ 		fi
+-		echo "$as_me:3439: result: $check_install_strip" >&5
++		echo "$as_me:3440: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ 		case "$check_install_strip" in
+ 		(no)
+-			{ echo "$as_me:3443: WARNING: $cf_install_program does not support strip program option" >&5
++			{ echo "$as_me:3444: WARNING: $cf_install_program does not support strip program option" >&5
+ echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
+ 			with_strip_program=no
+ 			;;
+@@ -3455,7 +3456,7 @@
+ 			chmod +x "$INSTALL"
+ 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
+ 
+-echo "${as_me:-configure}:3458: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:3459: testing created $INSTALL ..." 1>&5
+ 
+ 			;;
+ 		(option)
+@@ -3465,7 +3466,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:3468: checking for long file names" >&5
++echo "$as_me:3469: 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
+@@ -3504,7 +3505,7 @@
+   rm -rf "$ac_xdir" 2>/dev/null
+ done
+ fi
+-echo "$as_me:3507: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:3508: 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
+ 
+@@ -3516,7 +3517,7 @@
+ 
+ # if we find pkg-config, check if we should install the ".pc" files.
+ 
+-echo "$as_me:3519: checking if you want to use pkg-config" >&5
++echo "$as_me:3520: 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.
+@@ -3526,7 +3527,7 @@
+ else
+   cf_pkg_config=yes
+ fi;
+-echo "$as_me:3529: result: $cf_pkg_config" >&5
++echo "$as_me:3530: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+ 
+ case "$cf_pkg_config" in
+@@ -3538,7 +3539,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:3541: checking for $ac_word" >&5
++echo "$as_me:3542: 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
+@@ -3555,7 +3556,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:3558: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3559: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3566,10 +3567,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:3569: result: $PKG_CONFIG" >&5
++  echo "$as_me:3570: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+-  echo "$as_me:3572: result: no" >&5
++  echo "$as_me:3573: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3578,7 +3579,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:3581: checking for $ac_word" >&5
++echo "$as_me:3582: 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
+@@ -3595,7 +3596,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:3598: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3599: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3607,10 +3608,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ 
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  echo "$as_me:3610: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:3611: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+-  echo "$as_me:3613: result: no" >&5
++  echo "$as_me:3614: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3651,24 +3652,24 @@
+ 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:3654: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++	{ { echo "$as_me:3655: 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:3661: WARNING: pkg-config is not installed" >&5
++	{ echo "$as_me:3662: 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:3667: checking for pkg-config library directory" >&5
++	echo "$as_me:3668: checking for pkg-config library directory" >&5
+ echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
+ 	;;
+ (*)
+-	echo "$as_me:3671: checking for $PKG_CONFIG library directory" >&5
++	echo "$as_me:3672: checking for $PKG_CONFIG library directory" >&5
+ echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
+ 	;;
+ esac
+@@ -3695,7 +3696,7 @@
+ case "x$cf_search_path" in
+ (xlibdir)
+ 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+-	echo "$as_me:3698: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:3699: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+@@ -3706,16 +3707,16 @@
+ 	;;
+ (x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	PKG_CONFIG_LIBDIR="$cf_search_path"
+-	echo "$as_me:3709: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:3710: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+ (xyes|xauto)
+-	echo "$as_me:3714: result: auto" >&5
++	echo "$as_me:3715: 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:3718: checking for search-list" >&5
++	echo "$as_me:3719: checking for search-list" >&5
+ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+ 	if test "x$PKG_CONFIG" != xnone
+ 	then
+@@ -3750,11 +3751,11 @@
+ "`
+ 	fi
+ 
+-	echo "$as_me:3753: result: $cf_search_path" >&5
++	echo "$as_me:3754: result: $cf_search_path" >&5
+ echo "${ECHO_T}$cf_search_path" >&6
+ 	;;
+ (*)
+-	{ { echo "$as_me:3757: error: Unexpected option value: $cf_search_path" >&5
++	{ { echo "$as_me:3758: error: Unexpected option value: $cf_search_path" >&5
+ echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -3762,7 +3763,7 @@
+ 
+ if test -n "$cf_search_path"
+ then
+-	echo "$as_me:3765: checking for first directory" >&5
++	echo "$as_me:3766: 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
+@@ -3773,7 +3774,7 @@
+ 			break
+ 		fi
+ 	done
+-	echo "$as_me:3776: result: $cf_pkg_config_path" >&5
++	echo "$as_me:3777: result: $cf_pkg_config_path" >&5
+ echo "${ECHO_T}$cf_pkg_config_path" >&6
+ 
+ 	if test "x$cf_pkg_config_path" != xnone ; then
+@@ -3783,7 +3784,7 @@
+ 
+ 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+ 	then
+-		echo "$as_me:3786: checking for workaround" >&5
++		echo "$as_me:3787: checking for workaround" >&5
+ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+ 		if test "$prefix" = "NONE" ; then
+ 			cf_prefix="$ac_default_prefix"
+@@ -3806,12 +3807,12 @@
+ 			esac
+ 		done
+ 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+-		echo "$as_me:3809: result: $PKG_CONFIG_LIBDIR" >&5
++		echo "$as_me:3810: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:3814: checking if you want to build test-programs" >&5
++echo "$as_me:3815: 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.
+@@ -3821,10 +3822,10 @@
+ else
+   cf_with_tests=yes
+ fi;
+-echo "$as_me:3824: result: $cf_with_tests" >&5
++echo "$as_me:3825: result: $cf_with_tests" >&5
+ echo "${ECHO_T}$cf_with_tests" >&6
+ 
+-echo "$as_me:3827: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:3828: 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.
+@@ -3834,11 +3835,11 @@
+ else
+   enable_mixedcase=auto
+ fi;
+-echo "$as_me:3837: result: $enable_mixedcase" >&5
++echo "$as_me:3838: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+ 
+-echo "$as_me:3841: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:3842: 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
+@@ -3865,7 +3866,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:3868: result: $cf_cv_mixedcase" >&5
++echo "$as_me:3869: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -3883,7 +3884,7 @@
+ fi
+ 
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:3886: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:3887: 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
+@@ -3903,16 +3904,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:3906: result: yes" >&5
++  echo "$as_me:3907: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:3910: result: no" >&5
++  echo "$as_me:3911: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+-echo "$as_me:3915: checking for \".PHONY\" make-support" >&5
++echo "$as_me:3916: 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
+@@ -3967,7 +3968,7 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:3970: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:3971: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+@@ -3978,7 +3979,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:3981: checking for $ac_word" >&5
++echo "$as_me:3982: 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
+@@ -3993,7 +3994,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:3996: found $ac_dir/$ac_word" >&5
++echo "$as_me:3997: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4001,10 +4002,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:4004: result: $CTAGS" >&5
++  echo "$as_me:4005: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:4007: result: no" >&5
++  echo "$as_me:4008: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4015,7 +4016,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:4018: checking for $ac_word" >&5
++echo "$as_me:4019: 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
+@@ -4030,7 +4031,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:4033: found $ac_dir/$ac_word" >&5
++echo "$as_me:4034: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4038,10 +4039,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:4041: result: $ETAGS" >&5
++  echo "$as_me:4042: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:4044: result: no" >&5
++  echo "$as_me:4045: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4050,7 +4051,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:4053: checking for $ac_word" >&5
++echo "$as_me:4054: 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
+@@ -4065,7 +4066,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:4068: found $ac_dir/$ac_word" >&5
++echo "$as_me:4069: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4074,17 +4075,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:4077: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:4078: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:4080: result: no" >&5
++  echo "$as_me:4081: 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:4087: checking for $ac_word" >&5
++echo "$as_me:4088: 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
+@@ -4099,7 +4100,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:4102: found $ac_dir/$ac_word" >&5
++echo "$as_me:4103: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4108,10 +4109,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:4111: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:4112: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:4114: result: no" >&5
++  echo "$as_me:4115: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4131,7 +4132,7 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:4134: checking for makeflags variable" >&5
++echo "$as_me:4135: 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
+@@ -4161,7 +4162,7 @@
+ 			;;
+ 		(*)
+ 
+-echo "${as_me:-configure}:4164: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:4165: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -4169,13 +4170,13 @@
+ 	rm -f cf_makeflags.tmp
+ 
+ fi
+-echo "$as_me:4172: result: $cf_cv_makeflags" >&5
++echo "$as_me:4173: 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:4178: checking for $ac_word" >&5
++echo "$as_me:4179: 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
+@@ -4190,7 +4191,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:4193: found $ac_dir/$ac_word" >&5
++echo "$as_me:4194: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4198,10 +4199,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:4201: result: $RANLIB" >&5
++  echo "$as_me:4202: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:4204: result: no" >&5
++  echo "$as_me:4205: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4210,7 +4211,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:4213: checking for $ac_word" >&5
++echo "$as_me:4214: 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
+@@ -4225,7 +4226,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:4228: found $ac_dir/$ac_word" >&5
++echo "$as_me:4229: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4234,10 +4235,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:4237: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:4238: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:4240: result: no" >&5
++  echo "$as_me:4241: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4249,7 +4250,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:4252: checking for $ac_word" >&5
++echo "$as_me:4253: 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
+@@ -4264,7 +4265,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:4267: found $ac_dir/$ac_word" >&5
++echo "$as_me:4268: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4272,10 +4273,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:4275: result: $LD" >&5
++  echo "$as_me:4276: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:4278: result: no" >&5
++  echo "$as_me:4279: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4284,7 +4285,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:4287: checking for $ac_word" >&5
++echo "$as_me:4288: 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
+@@ -4299,7 +4300,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:4302: found $ac_dir/$ac_word" >&5
++echo "$as_me:4303: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4308,10 +4309,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:4311: result: $ac_ct_LD" >&5
++  echo "$as_me:4312: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:4314: result: no" >&5
++  echo "$as_me:4315: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4323,7 +4324,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:4326: checking for $ac_word" >&5
++echo "$as_me:4327: 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
+@@ -4338,7 +4339,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:4341: found $ac_dir/$ac_word" >&5
++echo "$as_me:4342: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4346,10 +4347,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:4349: result: $AR" >&5
++  echo "$as_me:4350: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:4352: result: no" >&5
++  echo "$as_me:4353: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4358,7 +4359,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:4361: checking for $ac_word" >&5
++echo "$as_me:4362: 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
+@@ -4373,7 +4374,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:4376: found $ac_dir/$ac_word" >&5
++echo "$as_me:4377: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4382,10 +4383,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:4385: result: $ac_ct_AR" >&5
++  echo "$as_me:4386: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:4388: result: no" >&5
++  echo "$as_me:4389: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4397,7 +4398,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:4400: checking for $ac_word" >&5
++echo "$as_me:4401: 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
+@@ -4412,7 +4413,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:4415: found $ac_dir/$ac_word" >&5
++echo "$as_me:4416: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4420,10 +4421,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:4423: result: $AR" >&5
++  echo "$as_me:4424: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:4426: result: no" >&5
++  echo "$as_me:4427: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4432,7 +4433,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:4435: checking for $ac_word" >&5
++echo "$as_me:4436: 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
+@@ -4447,7 +4448,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:4450: found $ac_dir/$ac_word" >&5
++echo "$as_me:4451: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4456,10 +4457,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:4459: result: $ac_ct_AR" >&5
++  echo "$as_me:4460: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:4462: result: no" >&5
++  echo "$as_me:4463: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4468,7 +4469,7 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-echo "$as_me:4471: checking for options to update archives" >&5
++echo "$as_me:4472: 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
+@@ -4505,13 +4506,13 @@
+ 			rm -f conftest.a
+ 
+ 			cat >"conftest.$ac_ext" <&5
++			if { (eval echo "$as_me:4512: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4514: \$? = $ac_status" >&5
++  echo "$as_me:4515: \$? = $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
+@@ -4522,7 +4523,7 @@
+ 			else
+ 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-echo "${as_me:-configure}:4525: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:4526: testing cannot compile test-program ..." 1>&5
+ 
+ 				break
+ 			fi
+@@ -4532,7 +4533,7 @@
+ 	esac
+ 
+ fi
+-echo "$as_me:4535: result: $cf_cv_ar_flags" >&5
++echo "$as_me:4536: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+ if test -n "$ARFLAGS" ; then
+@@ -4543,31 +4544,57 @@
+ 	ARFLAGS=$cf_cv_ar_flags
+ fi
+ 
+-	echo "$as_me:4546: checking for PATH separator" >&5
++	echo "$as_me:4547: 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:4553: result: $PATH_SEPARATOR" >&5
++	echo "$as_me:4554: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+ 
+-echo "$as_me:4556: checking if you have specified an install-prefix" >&5
+-echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
++echo "$as_me:4557: checking for an installation directory prefix" >&5
++echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-install-prefix or --without-install-prefix was given.
+ if test "${with_install_prefix+set}" = set; then
+   withval="$with_install_prefix"
+-  case "$withval" in
+-	(yes|no)
++  case "x$withval" in
++	(xyes|xno)
+ 		;;
+ 	(*)	DESTDIR="$withval"
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:4569: result: $DESTDIR" >&5
+-echo "${ECHO_T}$DESTDIR" >&6
++echo "$as_me:4570: result: ${DESTDIR:-(none)}" >&5
++echo "${ECHO_T}${DESTDIR:-(none)}" >&6
++
++echo "$as_me:4573: checking if installation directory prefix should be merged" >&5
++echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6
++
++# Check whether --enable-install-prefix or --disable-install-prefix was given.
++if test "${enable_install_prefix+set}" = set; then
++  enableval="$enable_install_prefix"
++  test "$enableval" != yes && enableval=no
++	if test "$enableval" != "no" ; then
++    cf_install_prefix=yes
++	else
++		cf_install_prefix=no
++	fi
++else
++  enableval=no
++	cf_install_prefix=no
++
++fi;
++echo "$as_me:4590: result: $cf_install_prefix" >&5
++echo "${ECHO_T}$cf_install_prefix" >&6
++
++if test "$cf_install_prefix" = yes ; then
++	MERGE_PREFIX=':$(prefix)%=%'
++else
++	MERGE_PREFIX=''
++fi
+ 
+ ###############################################################################
+ 
+@@ -4594,7 +4621,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:4597: checking for $ac_word" >&5
++echo "$as_me:4624: 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
+@@ -4609,7 +4636,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:4612: found $ac_dir/$ac_word" >&5
++echo "$as_me:4639: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4617,10 +4644,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:4620: result: $BUILD_CC" >&5
++  echo "$as_me:4647: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:4623: result: no" >&5
++  echo "$as_me:4650: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4629,12 +4656,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+ 
+ fi;
+-	echo "$as_me:4632: checking for native build C compiler" >&5
++	echo "$as_me:4659: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:4634: result: $BUILD_CC" >&5
++	echo "$as_me:4661: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:4637: checking for native build C preprocessor" >&5
++	echo "$as_me:4664: 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.
+@@ -4644,10 +4671,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:4647: result: $BUILD_CPP" >&5
++	echo "$as_me:4674: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:4650: checking for native build C flags" >&5
++	echo "$as_me:4677: 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.
+@@ -4655,10 +4682,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:4658: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:4685: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:4661: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:4688: 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.
+@@ -4666,10 +4693,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:4669: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:4696: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:4672: checking for native build linker-flags" >&5
++	echo "$as_me:4699: 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.
+@@ -4677,10 +4704,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:4680: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:4707: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:4683: checking for native build linker-libraries" >&5
++	echo "$as_me:4710: 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.
+@@ -4688,7 +4715,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:4691: result: $BUILD_LIBS" >&5
++	echo "$as_me:4718: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -4697,7 +4724,7 @@
+ 
+ 	: ${BUILD_CC:='${CC}'}
+ 
+-	echo "$as_me:4700: checking if the build-compiler \"$BUILD_CC\" works" >&5
++	echo "$as_me:4727: checking if the build-compiler \"$BUILD_CC\" works" >&5
+ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
+ 
+ 	cf_save_crossed=$cross_compiling
+@@ -4711,7 +4738,7 @@
+   cf_ok_build_cc=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4714 "configure"
++#line 4741 "configure"
+ #include "confdefs.h"
+ #include 
+ 		int main(int argc, char *argv[])
+@@ -4721,15 +4748,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:4724: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4751: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4727: \$? = $ac_status" >&5
++  echo "$as_me:4754: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:4729: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4756: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4732: \$? = $ac_status" >&5
++  echo "$as_me:4759: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_ok_build_cc=yes
+ else
+@@ -4744,12 +4771,12 @@
+ 	cross_compiling=$cf_save_crossed
+ 	ac_link=$cf_save_ac_link
+ 
+-	echo "$as_me:4747: result: $cf_ok_build_cc" >&5
++	echo "$as_me:4774: result: $cf_ok_build_cc" >&5
+ echo "${ECHO_T}$cf_ok_build_cc" >&6
+ 
+ 	if test "$cf_ok_build_cc" != yes
+ 	then
+-		{ { echo "$as_me:4752: error: Cross-build requires two compilers.
++		{ { echo "$as_me:4779: 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;}
+@@ -4774,7 +4801,7 @@
+ ### shared, for example.
+ cf_list_models=""
+ 
+-echo "$as_me:4777: checking if you want to build shared C-objects" >&5
++echo "$as_me:4804: 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.
+@@ -4784,27 +4811,27 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:4787: result: $with_shared" >&5
++echo "$as_me:4814: result: $with_shared" >&5
+ echo "${ECHO_T}$with_shared" >&6
+ test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
+ 
+-echo "$as_me:4791: checking for specified models" >&5
++echo "$as_me:4818: 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:4794: result: $cf_list_models" >&5
++echo "$as_me:4821: 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:4799: checking for default model" >&5
++echo "$as_me:4826: 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:4802: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:4829: 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:4807: checking for specific curses-directory" >&5
++echo "$as_me:4834: 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.
+@@ -4814,7 +4841,7 @@
+ else
+   cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:4817: result: $cf_cv_curses_dir" >&5
++echo "$as_me:4844: 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"
+@@ -4843,7 +4870,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4846: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:4873: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -4879,7 +4906,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4882 "configure"
++#line 4909 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4891,16 +4918,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4894: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4921: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4897: \$? = $ac_status" >&5
++  echo "$as_me:4924: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4900: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4927: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4903: \$? = $ac_status" >&5
++  echo "$as_me:4930: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -4917,7 +4944,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}:4920: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4947: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -4953,7 +4980,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}:4956: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:4983: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -4968,13 +4995,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:4971: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:4998: 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:4974: result: yes" >&5
++		echo "$as_me:5001: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:4977: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:5004: 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
+ 
+@@ -5107,7 +5134,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5110 "configure"
++#line 5137 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5119,37 +5146,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:5122: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5149: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5125: \$? = $ac_status" >&5
++  echo "$as_me:5152: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:5128: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5155: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5131: \$? = $ac_status" >&5
++  echo "$as_me:5158: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5137 "configure"
++#line 5164 "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:5144: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5171: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5147: \$? = $ac_status" >&5
++  echo "$as_me:5174: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:5149: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5176: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5152: \$? = $ac_status" >&5
++  echo "$as_me:5179: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -5323,7 +5350,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5326 "configure"
++#line 5353 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5335,37 +5362,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:5338: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5365: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5341: \$? = $ac_status" >&5
++  echo "$as_me:5368: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:5344: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5371: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5347: \$? = $ac_status" >&5
++  echo "$as_me:5374: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5353 "configure"
++#line 5380 "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:5360: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5387: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5363: \$? = $ac_status" >&5
++  echo "$as_me:5390: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:5365: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5392: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5368: \$? = $ac_status" >&5
++  echo "$as_me:5395: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -5382,7 +5409,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:5385: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:5412: 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"
+@@ -5398,7 +5425,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:5401: checking for terminfo header" >&5
++echo "$as_me:5428: 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
+@@ -5416,7 +5443,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5419 "configure"
++#line 5446 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -5431,16 +5458,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5434: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5461: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5437: \$? = $ac_status" >&5
++  echo "$as_me:5464: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5440: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5467: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5443: \$? = $ac_status" >&5
++  echo "$as_me:5470: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -5456,7 +5483,7 @@
+ done
+ 
+ fi
+-echo "$as_me:5459: result: $cf_cv_term_header" >&5
++echo "$as_me:5486: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -5491,7 +5518,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:5494: result: no" >&5
++		echo "$as_me:5521: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -5507,7 +5534,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:5510: checking for $ac_word" >&5
++echo "$as_me:5537: 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
+@@ -5522,7 +5549,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:5525: found $ac_dir/$ac_word" >&5
++echo "$as_me:5552: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5530,10 +5557,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:5533: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:5560: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:5536: result: no" >&5
++  echo "$as_me:5563: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5546,7 +5573,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:5549: checking for $ac_word" >&5
++echo "$as_me:5576: 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
+@@ -5561,7 +5588,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:5564: found $ac_dir/$ac_word" >&5
++echo "$as_me:5591: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5569,10 +5596,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:5572: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:5599: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:5575: result: no" >&5
++  echo "$as_me:5602: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5729,7 +5756,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:5732: checking if we have identified curses headers" >&5
++echo "$as_me:5759: 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
+@@ -5741,7 +5768,7 @@
+ 	curses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5744 "configure"
++#line 5771 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -5753,16 +5780,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5756: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5783: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5759: \$? = $ac_status" >&5
++  echo "$as_me:5786: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5762: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5789: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5765: \$? = $ac_status" >&5
++  echo "$as_me:5792: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -5773,11 +5800,11 @@
+ done
+ 
+ fi
+-echo "$as_me:5776: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:5803: 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:5780: error: No curses header-files found" >&5
++	{ { echo "$as_me:5807: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -5787,23 +5814,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:5790: checking for $ac_header" >&5
++echo "$as_me:5817: 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 5796 "configure"
++#line 5823 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:5800: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:5827: \"$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:5806: \$? = $ac_status" >&5
++  echo "$as_me:5833: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -5822,7 +5849,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:5825: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:5852: 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 5881 "configure"
++#line 5908 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5890,16 +5917,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5893: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5920: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5896: \$? = $ac_status" >&5
++  echo "$as_me:5923: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5899: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5926: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5902: \$? = $ac_status" >&5
++  echo "$as_me:5929: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5916,7 +5943,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}:5919: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5946: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -5935,7 +5962,7 @@
+ 
+ }
+ 
+-echo "$as_me:5938: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:5965: 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
+@@ -5947,7 +5974,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5950 "configure"
++#line 5977 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -5971,16 +5998,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5974: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6001: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5977: \$? = $ac_status" >&5
++  echo "$as_me:6004: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5980: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6007: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5983: \$? = $ac_status" >&5
++  echo "$as_me:6010: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -5995,14 +6022,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:5998: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:6025: 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:6005: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:6032: 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
+@@ -6123,7 +6150,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6126 "configure"
++#line 6153 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6135,16 +6162,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6138: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6165: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6141: \$? = $ac_status" >&5
++  echo "$as_me:6168: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6144: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6171: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6147: \$? = $ac_status" >&5
++  echo "$as_me:6174: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6161,7 +6188,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}:6164: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6191: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -6184,7 +6211,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6187 "configure"
++#line 6214 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -6208,16 +6235,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6211: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6238: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6214: \$? = $ac_status" >&5
++  echo "$as_me:6241: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6217: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6244: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6220: \$? = $ac_status" >&5
++  echo "$as_me:6247: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -6238,12 +6265,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6241: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6268: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:6246: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:6273: 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%/[^/]*$%%'`
+@@ -6279,7 +6306,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6282 "configure"
++#line 6309 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6291,16 +6318,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6294: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6321: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6297: \$? = $ac_status" >&5
++  echo "$as_me:6324: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6300: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6327: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6303: \$? = $ac_status" >&5
++  echo "$as_me:6330: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6317,7 +6344,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}:6320: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6347: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -6365,7 +6392,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:6368: checking for terminfo header" >&5
++echo "$as_me:6395: 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
+@@ -6383,7 +6410,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6386 "configure"
++#line 6413 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -6398,16 +6425,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6401: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6428: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6404: \$? = $ac_status" >&5
++  echo "$as_me:6431: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6407: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6434: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6410: \$? = $ac_status" >&5
++  echo "$as_me:6437: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -6423,7 +6450,7 @@
+ done
+ 
+ fi
+-echo "$as_me:6426: result: $cf_cv_term_header" >&5
++echo "$as_me:6453: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -6461,7 +6488,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:6464: checking for ncurses version" >&5
++echo "$as_me:6491: 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
+@@ -6487,10 +6514,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:6490: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:6517: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6493: \$? = $ac_status" >&5
++  echo "$as_me:6520: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -6500,7 +6527,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6503 "configure"
++#line 6530 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -6527,15 +6554,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6530: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6557: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6533: \$? = $ac_status" >&5
++  echo "$as_me:6560: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:6535: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6562: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6538: \$? = $ac_status" >&5
++  echo "$as_me:6565: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -6549,7 +6576,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:6552: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:6579: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -6562,7 +6589,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:6565: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:6592: 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
+@@ -6570,7 +6597,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6573 "configure"
++#line 6600 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6589,16 +6616,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6592: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6619: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6595: \$? = $ac_status" >&5
++  echo "$as_me:6622: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6598: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6625: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6601: \$? = $ac_status" >&5
++  echo "$as_me:6628: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -6609,10 +6636,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6612: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:6639: 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:6615: checking for initscr in -lgpm" >&5
++  echo "$as_me:6642: 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
+@@ -6620,7 +6647,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6623 "configure"
++#line 6650 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6639,16 +6666,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6642: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6669: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6645: \$? = $ac_status" >&5
++  echo "$as_me:6672: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6648: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6675: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6651: \$? = $ac_status" >&5
++  echo "$as_me:6678: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -6659,7 +6686,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6662: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:6689: 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"
+@@ -6674,7 +6701,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:6677: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:6704: 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
+@@ -6682,7 +6709,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6685 "configure"
++#line 6712 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6701,16 +6728,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6704: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6731: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6707: \$? = $ac_status" >&5
++  echo "$as_me:6734: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6710: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6737: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6713: \$? = $ac_status" >&5
++  echo "$as_me:6740: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -6721,7 +6748,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6724: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:6751: 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"
+@@ -6770,13 +6797,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:6773: checking for initscr" >&5
++	echo "$as_me:6800: 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 6779 "configure"
++#line 6806 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -6807,16 +6834,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6810: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6837: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6813: \$? = $ac_status" >&5
++  echo "$as_me:6840: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6816: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6843: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6819: \$? = $ac_status" >&5
++  echo "$as_me:6846: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -6826,18 +6853,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6829: result: $ac_cv_func_initscr" >&5
++echo "$as_me:6856: 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:6836: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:6863: 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 6840 "configure"
++#line 6867 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6849,25 +6876,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6852: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6879: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6855: \$? = $ac_status" >&5
++  echo "$as_me:6882: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6858: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6885: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6861: \$? = $ac_status" >&5
++  echo "$as_me:6888: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:6863: result: yes" >&5
++  echo "$as_me:6890: 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:6870: result: no" >&5
++echo "$as_me:6897: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -6935,11 +6962,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:6938: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:6965: 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 6942 "configure"
++#line 6969 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6951,25 +6978,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6954: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6981: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6957: \$? = $ac_status" >&5
++  echo "$as_me:6984: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6960: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6987: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6963: \$? = $ac_status" >&5
++  echo "$as_me:6990: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:6965: result: yes" >&5
++  echo "$as_me:6992: 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:6972: result: no" >&5
++echo "$as_me:6999: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -6984,7 +7011,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:6987: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:7014: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6992,7 +7019,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:6995: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:7022: 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
+@@ -7002,7 +7029,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7005 "configure"
++#line 7032 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7014,23 +7041,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7017: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7044: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7020: \$? = $ac_status" >&5
++  echo "$as_me:7047: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7023: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7050: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7026: \$? = $ac_status" >&5
++  echo "$as_me:7053: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:7028: result: yes" >&5
++  echo "$as_me:7055: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:7033: result: no" >&5
++echo "$as_me:7060: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -7048,7 +7075,7 @@
+ 	NCURSES_CONFIG=none
+ fi
+ 
+-echo "$as_me:7051: checking for specified curses library type" >&5
++echo "$as_me:7078: checking for specified curses library type" >&5
+ echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
+ 
+ # Check whether --with-screen or --without-screen was given.
+@@ -7068,23 +7095,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7071: checking for $ac_header" >&5
++echo "$as_me:7098: 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 7077 "configure"
++#line 7104 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7081: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7108: \"$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:7087: \$? = $ac_status" >&5
++  echo "$as_me:7114: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7103,7 +7130,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7106: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7133: 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:7143: 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
+@@ -7121,7 +7148,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7124 "configure"
++#line 7151 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -7138,16 +7165,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7141: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7168: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7144: \$? = $ac_status" >&5
++  echo "$as_me:7171: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7147: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7174: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7150: \$? = $ac_status" >&5
++  echo "$as_me:7177: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -7159,12 +7186,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:7162: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7189: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7167 "configure"
++#line 7194 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7177,16 +7204,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7180: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7207: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7183: \$? = $ac_status" >&5
++  echo "$as_me:7210: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7186: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7213: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7189: \$? = $ac_status" >&5
++  echo "$as_me:7216: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -7200,7 +7227,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7203 "configure"
++#line 7230 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7213,16 +7240,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7216: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7243: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7219: \$? = $ac_status" >&5
++  echo "$as_me:7246: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7222: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7249: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7225: \$? = $ac_status" >&5
++  echo "$as_me:7252: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -7239,9 +7266,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:7242: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:7269: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:7244: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7271: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -7332,7 +7359,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}:7335: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7362: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -7340,7 +7367,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7343 "configure"
++#line 7370 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7353,21 +7380,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7356: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7383: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7359: \$? = $ac_status" >&5
++  echo "$as_me:7386: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7362: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7389: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7365: \$? = $ac_status" >&5
++  echo "$as_me:7392: \$? = $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}:7370: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7397: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -7385,7 +7412,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:7388: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7415: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -7460,13 +7487,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}:7463: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7490: 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 7469 "configure"
++#line 7496 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7479,21 +7506,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7482: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7509: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7485: \$? = $ac_status" >&5
++  echo "$as_me:7512: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7488: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7515: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7491: \$? = $ac_status" >&5
++  echo "$as_me:7518: \$? = $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}:7496: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7523: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -7535,7 +7562,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7538: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:7565: 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
+@@ -7573,7 +7600,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7576 "configure"
++#line 7603 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7585,16 +7612,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7588: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7615: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7591: \$? = $ac_status" >&5
++  echo "$as_me:7618: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7594: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7621: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7597: \$? = $ac_status" >&5
++  echo "$as_me:7624: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -7611,7 +7638,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}:7614: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:7641: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -7647,7 +7674,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}:7650: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7677: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7677,13 +7704,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:7680: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:7707: 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:7683: result: yes" >&5
++		echo "$as_me:7710: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:7686: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:7713: 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
+ 
+@@ -7816,7 +7843,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7819 "configure"
++#line 7846 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7828,37 +7855,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7831: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7858: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7834: \$? = $ac_status" >&5
++  echo "$as_me:7861: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7837: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7864: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7840: \$? = $ac_status" >&5
++  echo "$as_me:7867: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7846 "configure"
++#line 7873 "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:7853: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7880: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7856: \$? = $ac_status" >&5
++  echo "$as_me:7883: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:7858: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7885: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7861: \$? = $ac_status" >&5
++  echo "$as_me:7888: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -8032,7 +8059,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8035 "configure"
++#line 8062 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8044,37 +8071,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8047: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8074: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8050: \$? = $ac_status" >&5
++  echo "$as_me:8077: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8053: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8080: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8056: \$? = $ac_status" >&5
++  echo "$as_me:8083: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8062 "configure"
++#line 8089 "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:8069: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8096: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8072: \$? = $ac_status" >&5
++  echo "$as_me:8099: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:8074: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8101: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8077: \$? = $ac_status" >&5
++  echo "$as_me:8104: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -8091,7 +8118,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:8094: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:8121: 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"
+@@ -8107,7 +8134,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:8110: checking for terminfo header" >&5
++echo "$as_me:8137: 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
+@@ -8125,7 +8152,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8128 "configure"
++#line 8155 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8140,16 +8167,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8143: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8170: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8146: \$? = $ac_status" >&5
++  echo "$as_me:8173: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8149: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8176: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8152: \$? = $ac_status" >&5
++  echo "$as_me:8179: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -8165,7 +8192,7 @@
+ done
+ 
+ fi
+-echo "$as_me:8168: result: $cf_cv_term_header" >&5
++echo "$as_me:8195: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -8200,7 +8227,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:8203: result: no" >&5
++		echo "$as_me:8230: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -8216,7 +8243,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:8219: checking for $ac_word" >&5
++echo "$as_me:8246: 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
+@@ -8231,7 +8258,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:8234: found $ac_dir/$ac_word" >&5
++echo "$as_me:8261: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8239,10 +8266,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:8242: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:8269: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:8245: result: no" >&5
++  echo "$as_me:8272: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8255,7 +8282,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:8258: checking for $ac_word" >&5
++echo "$as_me:8285: 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
+@@ -8270,7 +8297,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:8273: found $ac_dir/$ac_word" >&5
++echo "$as_me:8300: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8278,10 +8305,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:8281: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:8308: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:8284: result: no" >&5
++  echo "$as_me:8311: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8438,7 +8465,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:8441: checking if we have identified curses headers" >&5
++echo "$as_me:8468: 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
+@@ -8450,7 +8477,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8453 "configure"
++#line 8480 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -8462,16 +8489,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8465: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8492: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8468: \$? = $ac_status" >&5
++  echo "$as_me:8495: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8471: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8498: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8474: \$? = $ac_status" >&5
++  echo "$as_me:8501: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -8482,11 +8509,11 @@
+ done
+ 
+ fi
+-echo "$as_me:8485: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:8512: 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:8489: error: No curses header-files found" >&5
++	{ { echo "$as_me:8516: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8496,23 +8523,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:8499: checking for $ac_header" >&5
++echo "$as_me:8526: 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 8505 "configure"
++#line 8532 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8509: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8536: \"$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:8515: \$? = $ac_status" >&5
++  echo "$as_me:8542: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8531,7 +8558,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8534: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8561: 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 8590 "configure"
++#line 8617 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8599,16 +8626,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8602: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8629: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8605: \$? = $ac_status" >&5
++  echo "$as_me:8632: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8608: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8635: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8611: \$? = $ac_status" >&5
++  echo "$as_me:8638: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -8625,7 +8652,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}:8628: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8655: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8644,7 +8671,7 @@
+ 
+ }
+ 
+-echo "$as_me:8647: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:8674: 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
+@@ -8656,7 +8683,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8659 "configure"
++#line 8686 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -8680,16 +8707,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8683: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8710: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8686: \$? = $ac_status" >&5
++  echo "$as_me:8713: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8689: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8716: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8692: \$? = $ac_status" >&5
++  echo "$as_me:8719: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -8704,14 +8731,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:8707: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:8734: 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:8714: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:8741: 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
+@@ -8832,7 +8859,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8835 "configure"
++#line 8862 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8844,16 +8871,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8847: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8874: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8850: \$? = $ac_status" >&5
++  echo "$as_me:8877: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8853: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8880: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8856: \$? = $ac_status" >&5
++  echo "$as_me:8883: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -8870,7 +8897,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}:8873: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8900: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8893,7 +8920,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8896 "configure"
++#line 8923 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -8917,16 +8944,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8920: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8947: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8923: \$? = $ac_status" >&5
++  echo "$as_me:8950: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8926: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8953: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8929: \$? = $ac_status" >&5
++  echo "$as_me:8956: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -8947,12 +8974,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8950: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8977: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:8955: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:8982: 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%/[^/]*$%%'`
+@@ -8988,7 +9015,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8991 "configure"
++#line 9018 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9000,16 +9027,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9003: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9030: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9006: \$? = $ac_status" >&5
++  echo "$as_me:9033: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9009: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9036: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9012: \$? = $ac_status" >&5
++  echo "$as_me:9039: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9026,7 +9053,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}:9029: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9056: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9074,7 +9101,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9077: checking for terminfo header" >&5
++echo "$as_me:9104: 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
+@@ -9092,7 +9119,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9095 "configure"
++#line 9122 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9107,16 +9134,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9110: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9137: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9113: \$? = $ac_status" >&5
++  echo "$as_me:9140: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9116: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9143: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9119: \$? = $ac_status" >&5
++  echo "$as_me:9146: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -9132,7 +9159,7 @@
+ done
+ 
+ fi
+-echo "$as_me:9135: result: $cf_cv_term_header" >&5
++echo "$as_me:9162: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9170,7 +9197,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:9173: checking for ncurses version" >&5
++echo "$as_me:9200: 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
+@@ -9196,10 +9223,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:9199: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:9226: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9202: \$? = $ac_status" >&5
++  echo "$as_me:9229: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -9209,7 +9236,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9212 "configure"
++#line 9239 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -9236,15 +9263,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9239: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9266: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9242: \$? = $ac_status" >&5
++  echo "$as_me:9269: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9244: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9271: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9247: \$? = $ac_status" >&5
++  echo "$as_me:9274: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -9258,7 +9285,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:9261: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:9288: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -9271,7 +9298,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:9274: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:9301: 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
+@@ -9279,7 +9306,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9282 "configure"
++#line 9309 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9298,16 +9325,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9301: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9328: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9304: \$? = $ac_status" >&5
++  echo "$as_me:9331: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9307: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9334: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9310: \$? = $ac_status" >&5
++  echo "$as_me:9337: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -9318,10 +9345,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9321: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:9348: 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:9324: checking for initscr in -lgpm" >&5
++  echo "$as_me:9351: 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
+@@ -9329,7 +9356,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9332 "configure"
++#line 9359 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9348,16 +9375,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9351: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9378: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9354: \$? = $ac_status" >&5
++  echo "$as_me:9381: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9357: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9384: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9360: \$? = $ac_status" >&5
++  echo "$as_me:9387: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -9368,7 +9395,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9371: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:9398: 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"
+@@ -9383,7 +9410,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:9386: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:9413: 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
+@@ -9391,7 +9418,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9394 "configure"
++#line 9421 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9410,16 +9437,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9413: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9440: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9416: \$? = $ac_status" >&5
++  echo "$as_me:9443: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9419: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9446: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9422: \$? = $ac_status" >&5
++  echo "$as_me:9449: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -9430,7 +9457,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9433: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:9460: 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"
+@@ -9479,13 +9506,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:9482: checking for initscr" >&5
++	echo "$as_me:9509: 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 9488 "configure"
++#line 9515 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9516,16 +9543,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9519: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9546: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9522: \$? = $ac_status" >&5
++  echo "$as_me:9549: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9525: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9552: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9528: \$? = $ac_status" >&5
++  echo "$as_me:9555: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -9535,18 +9562,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:9538: result: $ac_cv_func_initscr" >&5
++echo "$as_me:9565: 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:9545: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:9572: 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 9549 "configure"
++#line 9576 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9558,25 +9585,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9561: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9588: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9564: \$? = $ac_status" >&5
++  echo "$as_me:9591: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9567: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9594: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9570: \$? = $ac_status" >&5
++  echo "$as_me:9597: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:9572: result: yes" >&5
++  echo "$as_me:9599: 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:9579: result: no" >&5
++echo "$as_me:9606: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -9644,11 +9671,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:9647: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:9674: 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 9651 "configure"
++#line 9678 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9660,25 +9687,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9663: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9690: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9666: \$? = $ac_status" >&5
++  echo "$as_me:9693: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9669: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9696: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9672: \$? = $ac_status" >&5
++  echo "$as_me:9699: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:9674: result: yes" >&5
++  echo "$as_me:9701: 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:9681: result: no" >&5
++echo "$as_me:9708: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -9693,7 +9720,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:9696: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:9723: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -9701,7 +9728,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:9704: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:9731: 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
+@@ -9711,7 +9738,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9714 "configure"
++#line 9741 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9723,23 +9750,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9726: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9753: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9729: \$? = $ac_status" >&5
++  echo "$as_me:9756: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9732: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9759: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9735: \$? = $ac_status" >&5
++  echo "$as_me:9762: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:9737: result: yes" >&5
++  echo "$as_me:9764: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:9742: result: no" >&5
++echo "$as_me:9769: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -9764,13 +9791,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:9767: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:9794: 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:9770: result: yes" >&5
++		echo "$as_me:9797: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:9773: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:9800: 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
+ 
+@@ -9903,7 +9930,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9906 "configure"
++#line 9933 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9915,37 +9942,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9918: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9945: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9921: \$? = $ac_status" >&5
++  echo "$as_me:9948: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9924: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9951: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9927: \$? = $ac_status" >&5
++  echo "$as_me:9954: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9933 "configure"
++#line 9960 "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:9940: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9967: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9943: \$? = $ac_status" >&5
++  echo "$as_me:9970: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9945: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9972: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9948: \$? = $ac_status" >&5
++  echo "$as_me:9975: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -10119,7 +10146,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10122 "configure"
++#line 10149 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10131,37 +10158,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10134: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10161: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10137: \$? = $ac_status" >&5
++  echo "$as_me:10164: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10140: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10167: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10143: \$? = $ac_status" >&5
++  echo "$as_me:10170: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10149 "configure"
++#line 10176 "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:10156: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10183: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10159: \$? = $ac_status" >&5
++  echo "$as_me:10186: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10161: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10188: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10164: \$? = $ac_status" >&5
++  echo "$as_me:10191: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -10178,7 +10205,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:10181: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:10208: 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"
+@@ -10194,7 +10221,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:10197: checking for terminfo header" >&5
++echo "$as_me:10224: 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
+@@ -10212,7 +10239,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10215 "configure"
++#line 10242 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -10227,16 +10254,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10230: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10257: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10233: \$? = $ac_status" >&5
++  echo "$as_me:10260: \$? = $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:10263: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10239: \$? = $ac_status" >&5
++  echo "$as_me:10266: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -10252,7 +10279,7 @@
+ done
+ 
+ fi
+-echo "$as_me:10255: result: $cf_cv_term_header" >&5
++echo "$as_me:10282: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10287,7 +10314,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:10290: result: no" >&5
++		echo "$as_me:10317: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -10303,7 +10330,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:10306: checking for $ac_word" >&5
++echo "$as_me:10333: 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
+@@ -10318,7 +10345,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:10321: found $ac_dir/$ac_word" >&5
++echo "$as_me:10348: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -10326,10 +10353,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:10329: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:10356: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:10332: result: no" >&5
++  echo "$as_me:10359: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -10342,7 +10369,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:10345: checking for $ac_word" >&5
++echo "$as_me:10372: 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
+@@ -10357,7 +10384,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:10360: found $ac_dir/$ac_word" >&5
++echo "$as_me:10387: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -10365,10 +10392,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:10368: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:10395: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:10371: result: no" >&5
++  echo "$as_me:10398: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -10525,7 +10552,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:10528: checking if we have identified curses headers" >&5
++echo "$as_me:10555: 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
+@@ -10537,7 +10564,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10540 "configure"
++#line 10567 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -10549,16 +10576,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10552: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10579: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10555: \$? = $ac_status" >&5
++  echo "$as_me:10582: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10558: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10585: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10561: \$? = $ac_status" >&5
++  echo "$as_me:10588: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -10569,11 +10596,11 @@
+ done
+ 
+ fi
+-echo "$as_me:10572: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:10599: 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:10576: error: No curses header-files found" >&5
++	{ { echo "$as_me:10603: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -10583,23 +10610,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:10586: checking for $ac_header" >&5
++echo "$as_me:10613: 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 10592 "configure"
++#line 10619 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10596: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:10623: \"$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:10602: \$? = $ac_status" >&5
++  echo "$as_me:10629: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10618,7 +10645,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:10621: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:10648: 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 10677 "configure"
++#line 10704 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10686,16 +10713,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10689: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10716: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10692: \$? = $ac_status" >&5
++  echo "$as_me:10719: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10695: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10722: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10698: \$? = $ac_status" >&5
++  echo "$as_me:10725: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10712,7 +10739,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}:10715: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10742: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10731,7 +10758,7 @@
+ 
+ }
+ 
+-echo "$as_me:10734: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:10761: 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
+@@ -10743,7 +10770,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10746 "configure"
++#line 10773 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -10767,16 +10794,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10770: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10797: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10773: \$? = $ac_status" >&5
++  echo "$as_me:10800: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10776: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10803: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10779: \$? = $ac_status" >&5
++  echo "$as_me:10806: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -10791,14 +10818,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:10794: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:10821: 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:10801: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:10828: 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
+@@ -10919,7 +10946,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10922 "configure"
++#line 10949 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10931,16 +10958,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10934: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10961: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10937: \$? = $ac_status" >&5
++  echo "$as_me:10964: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10940: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10967: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10943: \$? = $ac_status" >&5
++  echo "$as_me:10970: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10957,7 +10984,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}:10960: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10987: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10980,7 +11007,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10983 "configure"
++#line 11010 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -11004,16 +11031,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11007: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11034: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11010: \$? = $ac_status" >&5
++  echo "$as_me:11037: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11013: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11040: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11016: \$? = $ac_status" >&5
++  echo "$as_me:11043: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -11034,12 +11061,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11037: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11064: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:11042: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:11069: 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%/[^/]*$%%'`
+@@ -11075,7 +11102,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11078 "configure"
++#line 11105 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11087,16 +11114,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11090: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11117: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11093: \$? = $ac_status" >&5
++  echo "$as_me:11120: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11096: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11123: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11099: \$? = $ac_status" >&5
++  echo "$as_me:11126: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11113,7 +11140,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}:11116: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11143: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -11161,7 +11188,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:11164: checking for terminfo header" >&5
++echo "$as_me:11191: 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
+@@ -11179,7 +11206,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11182 "configure"
++#line 11209 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -11194,16 +11221,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11197: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11224: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11200: \$? = $ac_status" >&5
++  echo "$as_me:11227: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11203: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11230: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11206: \$? = $ac_status" >&5
++  echo "$as_me:11233: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -11219,7 +11246,7 @@
+ done
+ 
+ fi
+-echo "$as_me:11222: result: $cf_cv_term_header" >&5
++echo "$as_me:11249: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -11257,7 +11284,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:11260: checking for ncurses version" >&5
++echo "$as_me:11287: 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
+@@ -11283,10 +11310,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:11286: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:11313: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11289: \$? = $ac_status" >&5
++  echo "$as_me:11316: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -11296,7 +11323,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11299 "configure"
++#line 11326 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11323,15 +11350,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:11326: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11353: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11329: \$? = $ac_status" >&5
++  echo "$as_me:11356: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:11331: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11358: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11334: \$? = $ac_status" >&5
++  echo "$as_me:11361: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -11345,7 +11372,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:11348: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:11375: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -11358,7 +11385,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:11361: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:11388: 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
+@@ -11366,7 +11393,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11369 "configure"
++#line 11396 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11385,16 +11412,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11388: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11415: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11391: \$? = $ac_status" >&5
++  echo "$as_me:11418: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11394: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11421: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11397: \$? = $ac_status" >&5
++  echo "$as_me:11424: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -11405,10 +11432,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11408: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:11435: 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:11411: checking for initscr in -lgpm" >&5
++  echo "$as_me:11438: 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
+@@ -11416,7 +11443,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11419 "configure"
++#line 11446 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11435,16 +11462,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11438: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11465: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11441: \$? = $ac_status" >&5
++  echo "$as_me:11468: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11444: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11471: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11447: \$? = $ac_status" >&5
++  echo "$as_me:11474: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -11455,7 +11482,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11458: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:11485: 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"
+@@ -11470,7 +11497,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:11473: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:11500: 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
+@@ -11478,7 +11505,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11481 "configure"
++#line 11508 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11497,16 +11524,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11500: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11527: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11503: \$? = $ac_status" >&5
++  echo "$as_me:11530: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11506: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11533: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11509: \$? = $ac_status" >&5
++  echo "$as_me:11536: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -11517,7 +11544,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11520: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:11547: 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"
+@@ -11566,13 +11593,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:11569: checking for initscr" >&5
++	echo "$as_me:11596: 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 11575 "configure"
++#line 11602 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -11603,16 +11630,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11606: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11633: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11609: \$? = $ac_status" >&5
++  echo "$as_me:11636: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11612: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11639: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11615: \$? = $ac_status" >&5
++  echo "$as_me:11642: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -11622,18 +11649,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:11625: result: $ac_cv_func_initscr" >&5
++echo "$as_me:11652: 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:11632: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:11659: 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 11636 "configure"
++#line 11663 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11645,25 +11672,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11648: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11675: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11651: \$? = $ac_status" >&5
++  echo "$as_me:11678: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11654: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11681: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11657: \$? = $ac_status" >&5
++  echo "$as_me:11684: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:11659: result: yes" >&5
++  echo "$as_me:11686: 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:11666: result: no" >&5
++echo "$as_me:11693: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -11731,11 +11758,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:11734: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:11761: 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 11738 "configure"
++#line 11765 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11747,25 +11774,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11750: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11777: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11753: \$? = $ac_status" >&5
++  echo "$as_me:11780: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11756: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11783: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11759: \$? = $ac_status" >&5
++  echo "$as_me:11786: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:11761: result: yes" >&5
++  echo "$as_me:11788: 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:11768: result: no" >&5
++echo "$as_me:11795: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -11780,7 +11807,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:11783: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:11810: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -11788,7 +11815,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:11791: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:11818: 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
+@@ -11798,7 +11825,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11801 "configure"
++#line 11828 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11810,23 +11837,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11813: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11840: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11816: \$? = $ac_status" >&5
++  echo "$as_me:11843: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11819: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11846: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11822: \$? = $ac_status" >&5
++  echo "$as_me:11849: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:11824: result: yes" >&5
++  echo "$as_me:11851: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:11829: result: no" >&5
++echo "$as_me:11856: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -11846,7 +11873,7 @@
+ 
+ 	;;
+ (*)
+-	{ { echo "$as_me:11849: error: unexpected screen-value: $cf_cv_screen" >&5
++	{ { echo "$as_me:11876: error: unexpected screen-value: $cf_cv_screen" >&5
+ echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -11885,10 +11912,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:11888: \"$cf_try\"") >&5
++		{ (eval echo "$as_me:11915: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11891: \$? = $ac_status" >&5
++  echo "$as_me:11918: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 		if test -f conftest.out ; then
+ 			cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ 	][ 	]*//" conftest.out`
+@@ -11906,17 +11933,17 @@
+ 
+ cf_cv_timestamp=`date`
+ 
+-echo "$as_me:11909: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
++echo "$as_me:11936: 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:11912: checking if KEY_RESIZE is supported" >&5
++echo "$as_me:11939: checking if KEY_RESIZE is supported" >&5
+ echo $ECHO_N "checking if KEY_RESIZE is supported... $ECHO_C" >&6
+ if test "${cf_cv_curses_resizes+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11919 "configure"
++#line 11946 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11928,16 +11955,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11931: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11958: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11934: \$? = $ac_status" >&5
++  echo "$as_me:11961: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11937: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11964: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11940: \$? = $ac_status" >&5
++  echo "$as_me:11967: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_resizes=yes
+ else
+@@ -11947,12 +11974,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:11950: result: $cf_cv_curses_resizes" >&5
++echo "$as_me:11977: result: $cf_cv_curses_resizes" >&5
+ echo "${ECHO_T}$cf_cv_curses_resizes" >&6
+ cf_cv_enable_sigwinch=0
+ test "$cf_cv_curses_resizes" = yes && cf_cv_enable_sigwinch=1
+ 
+-echo "$as_me:11955: checking if you want to have a library-prefix" >&5
++echo "$as_me:11982: 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.
+@@ -11962,7 +11989,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:11965: result: $with_lib_prefix" >&5
++echo "$as_me:11992: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test "$with_lib_prefix" = auto
+@@ -12000,7 +12027,7 @@
+ 	test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
+ fi
+ 
+-echo "$as_me:12003: checking for default loader flags" >&5
++echo "$as_me:12030: 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=''   ;;
+@@ -12008,13 +12035,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:12011: result: $LD_MODEL" >&5
++echo "$as_me:12038: 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:12017: checking for an rpath option" >&5
++	echo "$as_me:12044: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -12045,12 +12072,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:12048: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:12075: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:12053: checking if we need a space after rpath option" >&5
++		echo "$as_me:12080: 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"
+ 
+@@ -12071,7 +12098,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12074 "configure"
++#line 12101 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12083,16 +12110,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12086: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12113: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12089: \$? = $ac_status" >&5
++  echo "$as_me:12116: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12092: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12119: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12095: \$? = $ac_status" >&5
++  echo "$as_me:12122: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -12102,7 +12129,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:12105: result: $cf_rpath_space" >&5
++		echo "$as_me:12132: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -12124,7 +12151,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:12127: checking whether to use release or ABI version in shared library file names" >&5
++	echo "$as_me:12154: checking whether to use release or ABI version in shared library file names" >&5
+ echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
+ 
+ # Check whether --with-shlib-version or --without-shlib-version was given.
+@@ -12139,9 +12166,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:12142: result: $withval" >&5
++		echo "$as_me:12169: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:12144: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:12171: 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; }; }
+ 		;;
+@@ -12150,7 +12177,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:12153: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:12180: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -12173,14 +12200,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:12176: checking which $CC option to use" >&5
++		echo "$as_me:12203: 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 12183 "configure"
++#line 12210 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12192,16 +12219,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12195: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12222: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12198: \$? = $ac_status" >&5
++  echo "$as_me:12225: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12201: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12228: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12204: \$? = $ac_status" >&5
++  echo "$as_me:12231: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -12210,7 +12237,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		done
+-		echo "$as_me:12213: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:12240: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -12281,7 +12308,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:12284: checking if ld -search_paths_first works" >&5
++		echo "$as_me:12311: 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
+@@ -12290,7 +12317,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12293 "configure"
++#line 12320 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12302,16 +12329,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12305: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12332: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12308: \$? = $ac_status" >&5
++  echo "$as_me:12335: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12311: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12338: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12314: \$? = $ac_status" >&5
++  echo "$as_me:12341: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -12322,7 +12349,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:12325: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:12352: 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"
+@@ -12672,7 +12699,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12675 "configure"
++#line 12702 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12684,16 +12711,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12687: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12714: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12690: \$? = $ac_status" >&5
++  echo "$as_me:12717: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12693: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12720: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12696: \$? = $ac_status" >&5
++  echo "$as_me:12723: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -12730,7 +12757,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:12733: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:12760: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -12740,7 +12767,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <
+ int main(int argc, char *argv[])
+ {
+@@ -12752,18 +12779,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:12755: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:12782: 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:12757: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:12784: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12760: \$? = $ac_status" >&5
++  echo "$as_me:12787: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-				echo "$as_me:12762: result: yes" >&5
++				echo "$as_me:12789: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:12766: result: no" >&5
++				echo "$as_me:12793: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -12778,17 +12805,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:12781: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:12808: 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}:12785: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:12812: 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:12791: checking if you want to link sample programs with rpath option" >&5
++	echo "$as_me:12818: 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.
+@@ -12798,7 +12825,7 @@
+ else
+   with_rpath_link=yes
+ fi;
+-	echo "$as_me:12801: result: $with_rpath_link" >&5
++	echo "$as_me:12828: result: $with_rpath_link" >&5
+ echo "${ECHO_T}$with_rpath_link" >&6
+ 	if test "$with_rpath_link" = no
+ 	then
+@@ -12811,7 +12838,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:12814: checking if you want broken-linker support code" >&5
++echo "$as_me:12841: 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.
+@@ -12821,7 +12848,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:12824: result: $with_broken_linker" >&5
++echo "$as_me:12851: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : "${BROKEN_LINKER:=0}"
+@@ -12836,14 +12863,14 @@
+ 
+ # Check to define _XOPEN_SOURCE "automatically"
+ 
+-echo "$as_me:12839: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:12866: 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 12846 "configure"
++#line 12873 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12862,16 +12889,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12865: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12892: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12868: \$? = $ac_status" >&5
++  echo "$as_me:12895: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12871: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12898: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12874: \$? = $ac_status" >&5
++  echo "$as_me:12901: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -12882,7 +12909,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12885: result: $cf_cv_posix_visible" >&5
++echo "$as_me:12912: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -12924,14 +12951,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:12927: checking if this is the GNU C library" >&5
++echo "$as_me:12954: 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 12934 "configure"
++#line 12961 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12950,16 +12977,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12953: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12980: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12956: \$? = $ac_status" >&5
++  echo "$as_me:12983: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12959: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12986: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12962: \$? = $ac_status" >&5
++  echo "$as_me:12989: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -12970,7 +12997,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12973: result: $cf_cv_gnu_library" >&5
++echo "$as_me:13000: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -12978,7 +13005,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:12981: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:13008: 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
+@@ -12990,7 +13017,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12993 "configure"
++#line 13020 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13009,16 +13036,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13012: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13039: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13015: \$? = $ac_status" >&5
++  echo "$as_me:13042: \$? = $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:13045: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13021: \$? = $ac_status" >&5
++  echo "$as_me:13048: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -13030,12 +13057,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:13033: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:13060: 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:13038: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:13065: 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
+@@ -13140,7 +13167,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13143 "configure"
++#line 13170 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -13160,16 +13187,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13163: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13190: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13166: \$? = $ac_status" >&5
++  echo "$as_me:13193: \$? = $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:13196: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13172: \$? = $ac_status" >&5
++  echo "$as_me:13199: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -13180,7 +13207,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13183: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:13210: 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
+@@ -13189,14 +13216,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:13192: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:13219: 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 13199 "configure"
++#line 13226 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13211,16 +13238,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13214: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13241: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13217: \$? = $ac_status" >&5
++  echo "$as_me:13244: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13220: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13247: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13223: \$? = $ac_status" >&5
++  echo "$as_me:13250: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -13327,7 +13354,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13330 "configure"
++#line 13357 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13342,16 +13369,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13345: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13372: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13348: \$? = $ac_status" >&5
++  echo "$as_me:13375: \$? = $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:13378: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13354: \$? = $ac_status" >&5
++  echo "$as_me:13381: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -13366,12 +13393,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13369: result: $cf_cv_gnu_source" >&5
++echo "$as_me:13396: 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:13374: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:13401: 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
+@@ -13381,7 +13408,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13384 "configure"
++#line 13411 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13396,16 +13423,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13399: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13426: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13402: \$? = $ac_status" >&5
++  echo "$as_me:13429: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13405: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13432: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13408: \$? = $ac_status" >&5
++  echo "$as_me:13435: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -13416,7 +13443,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13419: result: $cf_cv_default_source" >&5
++echo "$as_me:13446: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -13453,16 +13480,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:13456: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:13483: 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}:13462: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:13489: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13465 "configure"
++#line 13492 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13477,16 +13504,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13480: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13507: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13483: \$? = $ac_status" >&5
++  echo "$as_me:13510: \$? = $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:13513: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13489: \$? = $ac_status" >&5
++  echo "$as_me:13516: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -13507,7 +13534,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13510 "configure"
++#line 13537 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13522,16 +13549,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13525: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13552: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13528: \$? = $ac_status" >&5
++  echo "$as_me:13555: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13531: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13558: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13534: \$? = $ac_status" >&5
++  echo "$as_me:13561: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13542,7 +13569,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:13545: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:13572: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -13550,10 +13577,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:13553: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:13580: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13556 "configure"
++#line 13583 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13568,16 +13595,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13571: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13598: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13574: \$? = $ac_status" >&5
++  echo "$as_me:13601: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13577: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13604: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13580: \$? = $ac_status" >&5
++  echo "$as_me:13607: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13593,7 +13620,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13596: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:13623: 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
+@@ -13710,7 +13737,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:13713: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:13740: 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
+@@ -13742,14 +13769,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:13745: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:13772: 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 13752 "configure"
++#line 13779 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13767,16 +13794,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13770: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13797: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13773: \$? = $ac_status" >&5
++  echo "$as_me:13800: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13776: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13803: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13779: \$? = $ac_status" >&5
++  echo "$as_me:13806: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -13788,7 +13815,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13791 "configure"
++#line 13818 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13806,16 +13833,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13809: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13836: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13812: \$? = $ac_status" >&5
++  echo "$as_me:13839: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13815: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13842: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13818: \$? = $ac_status" >&5
++  echo "$as_me:13845: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -13830,7 +13857,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13833: result: $cf_cv_xopen_source" >&5
++echo "$as_me:13860: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -13990,16 +14017,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:13993: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:14020: 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}:13999: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:14026: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14002 "configure"
++#line 14029 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14014,16 +14041,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14017: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14044: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14020: \$? = $ac_status" >&5
++  echo "$as_me:14047: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14023: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14050: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14026: \$? = $ac_status" >&5
++  echo "$as_me:14053: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -14044,7 +14071,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14047 "configure"
++#line 14074 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14059,16 +14086,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14062: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14089: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14065: \$? = $ac_status" >&5
++  echo "$as_me:14092: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14068: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14095: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14071: \$? = $ac_status" >&5
++  echo "$as_me:14098: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -14079,7 +14106,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:14082: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:14109: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -14087,10 +14114,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:14090: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:14117: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14093 "configure"
++#line 14120 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14105,16 +14132,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14108: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14135: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14111: \$? = $ac_status" >&5
++  echo "$as_me:14138: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14114: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14141: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14117: \$? = $ac_status" >&5
++  echo "$as_me:14144: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -14130,7 +14157,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14133: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:14160: 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
+@@ -14243,10 +14270,10 @@
+ 	if test "$cf_cv_xopen_source" = no ; then
+ 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+ 
+-echo "${as_me:-configure}:14246: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:14273: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14249 "configure"
++#line 14276 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14264,23 +14291,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14267: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14294: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14270: \$? = $ac_status" >&5
++  echo "$as_me:14297: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14273: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14300: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14276: \$? = $ac_status" >&5
++  echo "$as_me:14303: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-			{ echo "$as_me:14283: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++			{ echo "$as_me:14310: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ 			CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -14303,7 +14330,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}:14306: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:14333: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -14315,7 +14342,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}:14318: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:14345: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -14403,7 +14430,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:14406: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:14433: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -14413,7 +14440,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:14416: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:14443: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -14423,7 +14450,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}:14426: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:14453: 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"
+@@ -14435,10 +14462,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:14438: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:14465: 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 14441 "configure"
++#line 14468 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14453,16 +14480,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14456: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14483: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14459: \$? = $ac_status" >&5
++  echo "$as_me:14486: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14462: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14489: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14465: \$? = $ac_status" >&5
++  echo "$as_me:14492: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -14471,12 +14498,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:14474: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:14501: 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 14479 "configure"
++#line 14506 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14491,16 +14518,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14494: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14521: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14497: \$? = $ac_status" >&5
++  echo "$as_me:14524: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14500: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14527: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14503: \$? = $ac_status" >&5
++  echo "$as_me:14530: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -14511,19 +14538,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:14514: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:14541: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:14519: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:14546: 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 14526 "configure"
++#line 14553 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14541,16 +14568,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14544: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14571: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14547: \$? = $ac_status" >&5
++  echo "$as_me:14574: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14550: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14577: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14553: \$? = $ac_status" >&5
++  echo "$as_me:14580: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -14562,7 +14589,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14565 "configure"
++#line 14592 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14580,16 +14607,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14583: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14610: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14586: \$? = $ac_status" >&5
++  echo "$as_me:14613: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14589: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14616: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14592: \$? = $ac_status" >&5
++  echo "$as_me:14619: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -14604,7 +14631,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14607: result: $cf_cv_xopen_source" >&5
++echo "$as_me:14634: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -14751,13 +14778,13 @@
+ fi
+ fi # cf_cv_posix_visible
+ 
+-echo "$as_me:14754: checking for ANSI C header files" >&5
++echo "$as_me:14781: 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 14760 "configure"
++#line 14787 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -14765,13 +14792,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:14768: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:14795: \"$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:14774: \$? = $ac_status" >&5
++  echo "$as_me:14801: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14793,7 +14820,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 14796 "configure"
++#line 14823 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -14811,7 +14838,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 14814 "configure"
++#line 14841 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -14832,7 +14859,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14835 "configure"
++#line 14862 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -14858,15 +14885,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:14861: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14888: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14864: \$? = $ac_status" >&5
++  echo "$as_me:14891: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:14866: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14893: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14869: \$? = $ac_status" >&5
++  echo "$as_me:14896: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -14879,7 +14906,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:14882: result: $ac_cv_header_stdc" >&5
++echo "$as_me:14909: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -14895,28 +14922,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:14898: checking for $ac_header" >&5
++echo "$as_me:14925: 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 14904 "configure"
++#line 14931 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14910: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14937: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14913: \$? = $ac_status" >&5
++  echo "$as_me:14940: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14916: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14943: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14919: \$? = $ac_status" >&5
++  echo "$as_me:14946: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -14926,7 +14953,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14929: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:14956: 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:14966: checking whether exit is declared" >&5
+ echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
+ if test "${ac_cv_have_decl_exit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14945 "configure"
++#line 14972 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14957,16 +14984,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14960: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14987: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14963: \$? = $ac_status" >&5
++  echo "$as_me:14990: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14966: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14993: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14969: \$? = $ac_status" >&5
++  echo "$as_me:14996: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_have_decl_exit=yes
+ else
+@@ -14976,7 +15003,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14979: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:15006: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+ 
+ # Check whether --enable-largefile or --disable-largefile was given.
+@@ -14986,7 +15013,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:14989: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:15016: 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
+@@ -14998,7 +15025,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 15001 "configure"
++#line 15028 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15018,16 +15045,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15021: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15048: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15024: \$? = $ac_status" >&5
++  echo "$as_me:15051: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15027: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15054: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15030: \$? = $ac_status" >&5
++  echo "$as_me:15057: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -15037,16 +15064,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15040: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15067: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15043: \$? = $ac_status" >&5
++  echo "$as_me:15070: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15046: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15073: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15049: \$? = $ac_status" >&5
++  echo "$as_me:15076: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -15060,13 +15087,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:15063: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:15090: 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:15069: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:15096: 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
+@@ -15074,7 +15101,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15077 "configure"
++#line 15104 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15094,16 +15121,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15097: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15124: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15100: \$? = $ac_status" >&5
++  echo "$as_me:15127: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15103: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15130: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15106: \$? = $ac_status" >&5
++  echo "$as_me:15133: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -15112,7 +15139,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15115 "configure"
++#line 15142 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -15133,16 +15160,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15136: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15163: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15139: \$? = $ac_status" >&5
++  echo "$as_me:15166: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15142: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15169: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15145: \$? = $ac_status" >&5
++  echo "$as_me:15172: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -15153,7 +15180,7 @@
+   break
+ done
+ fi
+-echo "$as_me:15156: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:15183: 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
+ 
+@@ -15163,7 +15190,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:15166: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:15193: 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
+@@ -15171,7 +15198,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15174 "configure"
++#line 15201 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15191,16 +15218,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15194: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15221: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15197: \$? = $ac_status" >&5
++  echo "$as_me:15224: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15200: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15227: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15203: \$? = $ac_status" >&5
++  echo "$as_me:15230: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -15209,7 +15236,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15212 "configure"
++#line 15239 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -15230,16 +15257,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15233: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15260: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15236: \$? = $ac_status" >&5
++  echo "$as_me:15263: \$? = $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:15266: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15242: \$? = $ac_status" >&5
++  echo "$as_me:15269: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -15250,7 +15277,7 @@
+   break
+ done
+ fi
+-echo "$as_me:15253: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:15280: 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
+ 
+@@ -15263,7 +15290,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:15266: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:15293: 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
+@@ -15271,7 +15298,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15274 "configure"
++#line 15301 "configure"
+ #include "confdefs.h"
+ #include 
+     #include 
+@@ -15286,16 +15313,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15289: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15316: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15292: \$? = $ac_status" >&5
++  echo "$as_me:15319: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15295: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15322: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15298: \$? = $ac_status" >&5
++  echo "$as_me:15325: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -15304,7 +15331,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15307 "configure"
++#line 15334 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -15320,16 +15347,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15323: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15350: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15326: \$? = $ac_status" >&5
++  echo "$as_me:15353: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15329: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15356: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15332: \$? = $ac_status" >&5
++  echo "$as_me:15359: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -15340,7 +15367,7 @@
+   break
+ done
+ fi
+-echo "$as_me:15343: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:15370: 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
+ 
+@@ -15354,13 +15381,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:15357: checking for fseeko" >&5
++echo "$as_me:15384: 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 15363 "configure"
++#line 15390 "configure"
+ #include "confdefs.h"
+ #include 
+                              #include 
+@@ -15374,16 +15401,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15377: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15404: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15380: \$? = $ac_status" >&5
++  echo "$as_me:15407: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15383: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15410: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15386: \$? = $ac_status" >&5
++  echo "$as_me:15413: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -15393,7 +15420,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15396: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:15423: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -15432,14 +15459,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:15435: checking whether to use struct dirent64" >&5
++	echo "$as_me:15462: 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 15442 "configure"
++#line 15469 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -15466,16 +15493,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15469: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15496: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15472: \$? = $ac_status" >&5
++  echo "$as_me:15499: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15475: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15502: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15478: \$? = $ac_status" >&5
++  echo "$as_me:15505: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -15486,7 +15513,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15489: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:15516: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -15496,7 +15523,7 @@
+ 	fi
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:15499: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:15526: 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.
+@@ -15506,7 +15533,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:15509: result: $with_rcs_ids" >&5
++echo "$as_me:15536: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "$with_rcs_ids" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -15516,7 +15543,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15519: checking if you want to build with function extensions" >&5
++echo "$as_me:15546: 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.
+@@ -15526,7 +15553,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:15529: result: $with_ext_funcs" >&5
++echo "$as_me:15556: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "$with_ext_funcs" = yes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -15544,7 +15571,7 @@
+ fi
+ 
+ ###   use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:15547: checking for extended use of const keyword" >&5
++echo "$as_me:15574: 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.
+@@ -15554,7 +15581,7 @@
+ else
+   with_ext_const=no
+ fi;
+-echo "$as_me:15557: result: $with_ext_const" >&5
++echo "$as_me:15584: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "$with_ext_const" = yes ; then
+@@ -15564,7 +15591,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:15567: checking if you want all development code" >&5
++echo "$as_me:15594: 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.
+@@ -15574,7 +15601,7 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:15577: result: $with_develop" >&5
++echo "$as_me:15604: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###############################################################################
+@@ -15583,7 +15610,7 @@
+ # This is still experimental (20080329), but should ultimately be moved to
+ # the script-block --with-normal, etc.
+ 
+-echo "$as_me:15586: checking if you want to link with the pthread library" >&5
++echo "$as_me:15613: 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.
+@@ -15593,27 +15620,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:15596: result: $with_pthread" >&5
++echo "$as_me:15623: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:15600: checking for pthread.h" >&5
++	echo "$as_me:15627: 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 15606 "configure"
++#line 15633 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:15610: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:15637: \"$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:15616: \$? = $ac_status" >&5
++  echo "$as_me:15643: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15632,7 +15659,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:15635: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:15662: 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
+ 
+@@ -15642,7 +15669,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:15645: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:15672: 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"
+ 
+@@ -15663,7 +15690,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15666 "configure"
++#line 15693 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15680,16 +15707,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15683: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15710: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15686: \$? = $ac_status" >&5
++  echo "$as_me:15713: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15689: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15716: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15692: \$? = $ac_status" >&5
++  echo "$as_me:15719: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -15699,7 +15726,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:15702: result: $with_pthread" >&5
++	    echo "$as_me:15729: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -15727,7 +15754,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:15730: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:15757: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -15736,7 +15763,7 @@
+ 
+ fi
+ 
+-echo "$as_me:15739: checking if you want to use weak-symbols for pthreads" >&5
++echo "$as_me:15766: 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.
+@@ -15746,18 +15773,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-echo "$as_me:15749: result: $use_weak_symbols" >&5
++echo "$as_me:15776: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ if test "$use_weak_symbols" = yes ; then
+ 
+-echo "$as_me:15753: checking if $CC supports weak symbols" >&5
++echo "$as_me:15780: 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 15760 "configure"
++#line 15787 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15783,16 +15810,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15786: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15813: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15789: \$? = $ac_status" >&5
++  echo "$as_me:15816: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15792: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15819: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15795: \$? = $ac_status" >&5
++  echo "$as_me:15822: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -15803,7 +15830,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15806: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:15833: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ else
+@@ -15832,13 +15859,13 @@
+ fi
+ 
+ # OpenSUSE is installing ncurses6, using reentrant option.
+-echo "$as_me:15835: checking for _nc_TABSIZE" >&5
++echo "$as_me:15862: 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 15841 "configure"
++#line 15868 "configure"
+ #include "confdefs.h"
+ #define _nc_TABSIZE autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15869,16 +15896,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15872: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15899: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15875: \$? = $ac_status" >&5
++  echo "$as_me:15902: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15878: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15905: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15881: \$? = $ac_status" >&5
++  echo "$as_me:15908: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func__nc_TABSIZE=yes
+ else
+@@ -15888,7 +15915,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15891: result: $ac_cv_func__nc_TABSIZE" >&5
++echo "$as_me:15918: 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
+@@ -15900,7 +15927,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:15903: checking if you want experimental reentrant code" >&5
++echo "$as_me:15930: 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.
+@@ -15910,7 +15937,7 @@
+ else
+   with_reentrant=$assume_reentrant
+ fi;
+-echo "$as_me:15913: result: $with_reentrant" >&5
++echo "$as_me:15940: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "$with_reentrant" = yes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -15933,7 +15960,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:15936: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:15963: 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.
+@@ -15943,7 +15970,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:15946: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:15973: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -15957,7 +15984,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:15960: checking if you want to see long compiling messages" >&5
++echo "$as_me:15987: 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.
+@@ -15991,10 +16018,10 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:15994: result: $enableval" >&5
++echo "$as_me:16021: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+-echo "$as_me:15997: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:16024: 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.
+@@ -16011,17 +16038,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:16014: result: $enable_stdnoreturn" >&5
++echo "$as_me:16041: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:16018: checking for C11 _Noreturn feature" >&5
++echo "$as_me:16045: 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 16024 "configure"
++#line 16051 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -16037,16 +16064,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16040: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16067: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16043: \$? = $ac_status" >&5
++  echo "$as_me:16070: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16046: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16073: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16049: \$? = $ac_status" >&5
++  echo "$as_me:16076: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -16057,7 +16084,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16060: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:16087: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -16113,16 +16140,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16116: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16143: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16121: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16148: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16125: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16152: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -16161,16 +16188,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16164: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16191: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16169: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16196: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16173: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16200: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -16209,23 +16236,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16212: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16239: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16217: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16244: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16221: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16248: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:16228: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:16255: 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.
+@@ -16242,7 +16269,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:16245: result: $enable_warnings" >&5
++echo "$as_me:16272: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -16266,7 +16293,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16269 "configure"
++#line 16296 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16281,26 +16308,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16284: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16311: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16287: \$? = $ac_status" >&5
++  echo "$as_me:16314: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16290: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16317: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16293: \$? = $ac_status" >&5
++  echo "$as_me:16320: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:16296: checking for X11/Xt const-feature" >&5
++echo "$as_me:16323: 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 16303 "configure"
++#line 16330 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -16318,16 +16345,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16321: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16348: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16324: \$? = $ac_status" >&5
++  echo "$as_me:16351: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16327: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16354: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16330: \$? = $ac_status" >&5
++  echo "$as_me:16357: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -16342,7 +16369,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16345: result: $cf_cv_const_x_string" >&5
++echo "$as_me:16372: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -16371,7 +16398,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:16417: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -16403,12 +16430,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:16406: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:16433: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16409: \$? = $ac_status" >&5
++  echo "$as_me:16436: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:16411: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:16438: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -16416,7 +16443,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:16419: checking for $CC warning options..." >&5
++	{ echo "$as_me:16446: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -16439,12 +16466,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:16442: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:16469: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16445: \$? = $ac_status" >&5
++  echo "$as_me:16472: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:16447: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:16474: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -16452,7 +16479,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:16455: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:16482: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -16462,7 +16489,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:16465: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:16492: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -16495,10 +16522,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:16498: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:16525: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -16548,12 +16575,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:16551: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:16578: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16554: \$? = $ac_status" >&5
++  echo "$as_me:16581: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:16556: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:16583: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -16621,7 +16648,7 @@
+ fi
+ 
+ ###	use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:16624: checking if you want to enable runtime assertions" >&5
++echo "$as_me:16651: 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.
+@@ -16631,7 +16658,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:16634: result: $with_assertions" >&5
++echo "$as_me:16661: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -16684,7 +16711,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16687: checking whether to add trace feature to all models" >&5
++echo "$as_me:16714: 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.
+@@ -16694,7 +16721,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:16697: result: $cf_with_trace" >&5
++echo "$as_me:16724: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "$cf_with_trace" = yes ; then
+@@ -16708,7 +16735,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:16711: checking if we want to use GNAT projects" >&5
++echo "$as_me:16738: 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.
+@@ -16725,21 +16752,21 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:16728: result: $enable_gnat_projects" >&5
++echo "$as_me:16755: 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:16735: checking if ssp library is needed" >&5
++echo "$as_me:16762: 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 16742 "configure"
++#line 16769 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16756,16 +16783,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16759: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16786: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16762: \$? = $ac_status" >&5
++  echo "$as_me:16789: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16765: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16792: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16768: \$? = $ac_status" >&5
++  echo "$as_me:16795: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -16775,7 +16802,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16778 "configure"
++#line 16805 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16792,16 +16819,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16795: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16822: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16798: \$? = $ac_status" >&5
++  echo "$as_me:16825: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16801: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16828: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16804: \$? = $ac_status" >&5
++  echo "$as_me:16831: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -16815,7 +16842,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16818: result: $cf_cv_need_libssp" >&5
++echo "$as_me:16845: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -16843,13 +16870,13 @@
+ (*)
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:16846: checking for clock_gettime" >&5
++echo "$as_me:16873: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16852 "configure"
++#line 16879 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16880,16 +16907,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16883: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16910: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16886: \$? = $ac_status" >&5
++  echo "$as_me:16913: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16889: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16916: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16892: \$? = $ac_status" >&5
++  echo "$as_me:16919: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -16899,12 +16926,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16902: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:16929: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:16907: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:16934: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16912,7 +16939,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16915 "configure"
++#line 16942 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16931,16 +16958,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16934: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16961: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16937: \$? = $ac_status" >&5
++  echo "$as_me:16964: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16940: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16967: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16943: \$? = $ac_status" >&5
++  echo "$as_me:16970: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -16951,7 +16978,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16954: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:16981: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -16963,14 +16990,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:16966: checking if clock_gettime links" >&5
++echo "$as_me:16993: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16973 "configure"
++#line 17000 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -16988,16 +17015,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16991: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17018: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16994: \$? = $ac_status" >&5
++  echo "$as_me:17021: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16997: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17024: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17000: \$? = $ac_status" >&5
++  echo "$as_me:17027: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -17008,7 +17035,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17011: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:17038: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -17022,13 +17049,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:17025: checking for gettimeofday" >&5
++echo "$as_me:17052: 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 17031 "configure"
++#line 17058 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17059,16 +17086,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17062: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17089: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17065: \$? = $ac_status" >&5
++  echo "$as_me:17092: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17068: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17095: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17071: \$? = $ac_status" >&5
++  echo "$as_me:17098: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -17078,7 +17105,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17081: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:17108: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -17088,7 +17115,7 @@
+ 
+ else
+ 
+-echo "$as_me:17091: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:17118: 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
+@@ -17096,7 +17123,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17099 "configure"
++#line 17126 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17115,16 +17142,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17118: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17145: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17121: \$? = $ac_status" >&5
++  echo "$as_me:17148: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17124: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17151: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17127: \$? = $ac_status" >&5
++  echo "$as_me:17154: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -17135,7 +17162,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17138: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:17165: 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
+ 
+@@ -17168,13 +17195,13 @@
+ esac
+ 
+ ###	Checks for header files.
+-echo "$as_me:17171: checking for signed char" >&5
++echo "$as_me:17198: 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 17177 "configure"
++#line 17204 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17189,16 +17216,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17192: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17219: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17195: \$? = $ac_status" >&5
++  echo "$as_me:17222: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17198: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17225: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17201: \$? = $ac_status" >&5
++  echo "$as_me:17228: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -17208,10 +17235,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17211: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:17238: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:17214: checking size of signed char" >&5
++echo "$as_me:17241: 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
+@@ -17220,7 +17247,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17223 "configure"
++#line 17250 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17232,21 +17259,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17235: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17262: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17238: \$? = $ac_status" >&5
++  echo "$as_me:17265: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17241: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17268: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17244: \$? = $ac_status" >&5
++  echo "$as_me:17271: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17249 "configure"
++#line 17276 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17258,16 +17285,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17261: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17288: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17264: \$? = $ac_status" >&5
++  echo "$as_me:17291: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17267: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17294: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17270: \$? = $ac_status" >&5
++  echo "$as_me:17297: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -17283,7 +17310,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17286 "configure"
++#line 17313 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17295,16 +17322,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17298: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17325: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17301: \$? = $ac_status" >&5
++  echo "$as_me:17328: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17304: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17331: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17307: \$? = $ac_status" >&5
++  echo "$as_me:17334: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -17320,7 +17347,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 17323 "configure"
++#line 17350 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17332,16 +17359,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17335: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17362: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17338: \$? = $ac_status" >&5
++  echo "$as_me:17365: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17341: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17368: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17344: \$? = $ac_status" >&5
++  echo "$as_me:17371: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -17354,12 +17381,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:17357: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:17384: 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 17362 "configure"
++#line 17389 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17375,15 +17402,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17378: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17405: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17381: \$? = $ac_status" >&5
++  echo "$as_me:17408: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17383: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17410: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17386: \$? = $ac_status" >&5
++  echo "$as_me:17413: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -17399,7 +17426,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:17402: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:17429: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:17438: 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 17417 "configure"
++#line 17444 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -17429,16 +17456,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17432: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17459: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17435: \$? = $ac_status" >&5
++  echo "$as_me:17462: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17438: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17465: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17441: \$? = $ac_status" >&5
++  echo "$as_me:17468: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -17448,7 +17475,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17451: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17478: 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:17491: 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
+@@ -17469,7 +17496,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17472 "configure"
++#line 17499 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17488,16 +17515,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17491: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17518: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17494: \$? = $ac_status" >&5
++  echo "$as_me:17521: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17497: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17524: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17500: \$? = $ac_status" >&5
++  echo "$as_me:17527: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -17508,14 +17535,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17511: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:17538: 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:17518: checking for opendir in -lx" >&5
++  echo "$as_me:17545: 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
+@@ -17523,7 +17550,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17526 "configure"
++#line 17553 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17542,16 +17569,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17545: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17572: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17548: \$? = $ac_status" >&5
++  echo "$as_me:17575: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17551: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17578: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17554: \$? = $ac_status" >&5
++  echo "$as_me:17581: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -17562,7 +17589,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17565: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:17592: 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"
+@@ -17570,13 +17597,13 @@
+ 
+ fi
+ 
+-echo "$as_me:17573: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:17600: 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 17579 "configure"
++#line 17606 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -17592,16 +17619,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17595: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17622: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17598: \$? = $ac_status" >&5
++  echo "$as_me:17625: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17601: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17628: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17604: \$? = $ac_status" >&5
++  echo "$as_me:17631: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -17611,7 +17638,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17614: result: $ac_cv_header_time" >&5
++echo "$as_me:17641: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -17629,13 +17656,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:17632: checking for an ANSI C-conforming const" >&5
++echo "$as_me:17659: 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 17638 "configure"
++#line 17665 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17697,16 +17724,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17700: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17727: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17703: \$? = $ac_status" >&5
++  echo "$as_me:17730: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17706: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17733: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17709: \$? = $ac_status" >&5
++  echo "$as_me:17736: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -17716,7 +17743,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17719: result: $ac_cv_c_const" >&5
++echo "$as_me:17746: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -17728,7 +17755,7 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:17731: checking if data-only library module links" >&5
++echo "$as_me:17758: 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
+@@ -17736,20 +17763,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:17769: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17745: \$? = $ac_status" >&5
++  echo "$as_me:17772: \$? = $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:17796: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17772: \$? = $ac_status" >&5
++  echo "$as_me:17799: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -17782,7 +17809,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17785 "configure"
++#line 17812 "configure"
+ #include "confdefs.h"
+ 
+ 	extern int testfunc(void);
+@@ -17793,15 +17820,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17796: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17823: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17799: \$? = $ac_status" >&5
++  echo "$as_me:17826: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17801: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17828: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17804: \$? = $ac_status" >&5
++  echo "$as_me:17831: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -17816,7 +17843,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17819: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:17846: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -17835,23 +17862,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17838: checking for $ac_header" >&5
++echo "$as_me:17865: 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 17844 "configure"
++#line 17871 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17848: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:17875: \"$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:17854: \$? = $ac_status" >&5
++  echo "$as_me:17881: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17870,7 +17897,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17873: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17900: 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:17910: 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
+@@ -17891,7 +17918,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17894 "configure"
++#line 17921 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17926,15 +17953,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17929: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17956: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17932: \$? = $ac_status" >&5
++  echo "$as_me:17959: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17934: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17961: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17937: \$? = $ac_status" >&5
++  echo "$as_me:17964: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -17949,16 +17976,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:17952: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:17979: 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:17955: checking for mkstemp" >&5
++	echo "$as_me:17982: 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 17961 "configure"
++#line 17988 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17989,16 +18016,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17992: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18019: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17995: \$? = $ac_status" >&5
++  echo "$as_me:18022: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17998: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18025: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18001: \$? = $ac_status" >&5
++  echo "$as_me:18028: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -18008,7 +18035,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18011: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:18038: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -18029,7 +18056,7 @@
+ if test "$cf_with_ada" != "no" ; then
+ 	if test	"$cf_cv_prog_gnat_correct" = yes; then
+ 
+-	echo "$as_me:18032: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:18059: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -18046,10 +18073,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:18049: result: $ADAFLAGS" >&5
++	echo "$as_me:18076: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:18052: checking if GNATPREP supports -T option" >&5
++echo "$as_me:18079: 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
+@@ -18059,11 +18086,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:18062: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:18089: 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:18066: checking if GNAT supports generics" >&5
++echo "$as_me:18093: 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])
+@@ -18073,7 +18100,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:18076: result: $cf_gnat_generics" >&5
++echo "$as_me:18103: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -18085,7 +18112,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:18088: checking if GNAT supports SIGINT" >&5
++echo "$as_me:18115: 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
+@@ -18133,7 +18160,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:18136: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:18163: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -18146,7 +18173,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:18149: checking if GNAT supports project files" >&5
++echo "$as_me:18176: 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]*)
+@@ -18209,15 +18236,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:18212: result: $cf_gnat_projects" >&5
++echo "$as_me:18239: 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:18218: checking if GNAT supports libraries" >&5
++	echo "$as_me:18245: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:18220: result: $cf_gnat_libraries" >&5
++	echo "$as_me:18247: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -18237,7 +18264,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:18240: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:18267: 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
+@@ -18249,7 +18276,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:18252: checking for Ada95 compiler" >&5
++echo "$as_me:18279: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -18260,12 +18287,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:18263: result: $cf_ada_compiler" >&5
++echo "$as_me:18290: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 		cf_ada_package=terminal_interface
+ 
+-echo "$as_me:18268: checking for Ada95 include directory" >&5
++echo "$as_me:18295: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -18299,7 +18326,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:18302: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:18329: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -18308,10 +18335,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:18311: result: $ADA_INCLUDE" >&5
++echo "$as_me:18338: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:18314: checking for Ada95 object directory" >&5
++echo "$as_me:18341: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -18345,7 +18372,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:18348: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:18375: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -18354,10 +18381,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:18357: result: $ADA_OBJECTS" >&5
++echo "$as_me:18384: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:18360: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:18387: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -18378,11 +18405,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:18381: result: $with_ada_sharedlib" >&5
++echo "$as_me:18408: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+-	{ echo "$as_me:18385: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++	{ echo "$as_me:18412: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+ 
+@@ -18400,7 +18427,7 @@
+ 
+ 		# allow the Ada binding to be renamed
+ 
+-echo "$as_me:18403: checking for Ada95 curses library name" >&5
++echo "$as_me:18430: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -18416,16 +18443,16 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18419: result: $ADA_LIBNAME" >&5
++echo "$as_me:18446: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 	else
+-		{ { echo "$as_me:18423: error: No usable Ada compiler found" >&5
++		{ { echo "$as_me:18450: 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:18428: error: The Ada compiler is needed for this package" >&5
++	{ { echo "$as_me:18455: 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
+@@ -18465,7 +18492,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:18468: checking default library suffix" >&5
++echo "$as_me:18495: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -18476,10 +18503,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:18479: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:18506: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:18482: checking default library-dependency suffix" >&5
++echo "$as_me:18509: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -18562,10 +18589,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:18565: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:18592: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:18568: checking default object directory" >&5
++echo "$as_me:18595: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -18581,7 +18608,7 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:18584: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:18611: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ ### Set up low-level terminfo dependencies for makefiles.
+@@ -18723,7 +18750,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:18726: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:18753: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -18904,7 +18931,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:18907: error: ambiguous option: $1
++    { { echo "$as_me:18934: 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;}
+@@ -18923,7 +18950,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:18926: error: unrecognized option: $1
++  -*) { { echo "$as_me:18953: 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;}
+@@ -18998,7 +19025,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:19001: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:19028: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -19143,6 +19170,7 @@
+ s,@ac_ct_AR@,$ac_ct_AR,;t t
+ s,@ARFLAGS@,$ARFLAGS,;t t
+ s,@DESTDIR@,$DESTDIR,;t t
++s,@MERGE_PREFIX@,$MERGE_PREFIX,;t t
+ s,@BUILD_CC@,$BUILD_CC,;t t
+ s,@BUILD_CPP@,$BUILD_CPP,;t t
+ s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t
+@@ -19364,7 +19392,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:19367: creating $ac_file" >&5
++    { echo "$as_me:19395: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -19382,7 +19410,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:19385: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:19413: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -19395,7 +19423,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:19398: error: cannot find input file: $f" >&5
++           { { echo "$as_me:19426: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -19411,7 +19439,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:19414: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:19442: 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;}
+@@ -19420,7 +19448,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:19423: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:19451: 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;}
+@@ -19465,7 +19493,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:19468: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:19496: 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;}
+@@ -19476,7 +19504,7 @@
+     $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:19479: WARNING: Some variables may not be substituted:
++      { echo "$as_me:19507: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -19525,7 +19553,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:19528: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:19556: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -19536,7 +19564,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:19539: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:19567: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -19549,7 +19577,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:19552: error: cannot find input file: $f" >&5
++           { { echo "$as_me:19580: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -19607,7 +19635,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:19610: $ac_file is unchanged" >&5
++      { echo "$as_me:19638: $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.93 
+--- ncurses-6.5-20240810+/Ada95/configure.in	2024-05-19 09:12:05.000000000 +0000
++++ ncurses-6.5-20240817/Ada95/configure.in	2024-08-11 00:22:07.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: configure.in,v 1.93 2024/05/19 09:12:05 tom Exp $
++dnl $Id: configure.in,v 1.94 2024/08/11 00:22:07 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.93 $)
++AC_REVISION($Revision: 1.94 $)
+ AC_INIT(gen/gen.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -115,20 +115,7 @@
+ CF_AR_FLAGS
+ CF_PATHSEP
+ 
+-dnl Special option for use by system-builders: the install-prefix is used to
+-dnl adjust the location into which the actual install is done, so that an
+-dnl archive can be built without modifying the host system's configuration.
+-AC_MSG_CHECKING(if you have specified an install-prefix)
+-AC_ARG_WITH(install-prefix,
+-	[  --with-install-prefix   prefixes actual install-location ($DESTDIR)],
+-	[case "$withval" in
+-	(yes|no)
+-		;;
+-	(*)	DESTDIR="$withval"
+-		;;
+-	esac])
+-AC_MSG_RESULT($DESTDIR)
+-AC_SUBST(DESTDIR)
++CF_INSTALL_PREFIX
+ 
+ ###############################################################################
+ CF_HELP_MESSAGE(Build-Tools Needed to Compile Temporary Applications for Cross-compiling:)
+Index: Ada95/doc/Makefile.in
+Prereq:  1.9 
+--- ncurses-6.5-20240810+/Ada95/doc/Makefile.in	2021-07-03 15:45:33.000000000 +0000
++++ ncurses-6.5-20240817/Ada95/doc/Makefile.in	2024-08-10 18:18:19.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.9 2021/07/03 15:45:33 tom Exp $
++# $Id: Makefile.in,v 1.10 2024/08/10 18:18:19 tom Exp $
+ ##############################################################################
+-# Copyright 2019-2020,2021 Thomas E. Dickey                                  #
++# Copyright 2019-2021,2024 Thomas E. Dickey                                  #
+ # Copyright 2011-2015,2018 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -49,8 +49,8 @@
+ DFT_ARG_SUFFIX	= @DFT_ARG_SUFFIX@
+ 
+ THIS		= @ADA_LIBNAME@
+-DOCDIR		= $(DESTDIR)$(datadir)/doc/$(THIS)
+-MANDIR		= $(DESTDIR)$(mandir)/man1
++DOCDIR		= $(DESTDIR)$(datadir@MERGE_PREFIX@)/doc/$(THIS)
++MANDIR		= $(DESTDIR)$(mandir@MERGE_PREFIX@)/man1
+ 
+ ################################################################################
+ 
+Index: Ada95/gen/Makefile.in
+Prereq:  1.104 
+--- ncurses-6.5-20240810+/Ada95/gen/Makefile.in	2024-06-15 14:56:14.000000000 +0000
++++ ncurses-6.5-20240817/Ada95/gen/Makefile.in	2024-08-10 17:55:15.000000000 +0000
+@@ -30,7 +30,7 @@
+ #  Author:  Juergen Pfeifer, 1996
+ #     and:  Thomas E. Dickey, 1997
+ #
+-#  $Id: Makefile.in,v 1.104 2024/06/15 14:56:14 tom Exp $
++#  $Id: Makefile.in,v 1.105 2024/08/10 17:55:15 tom Exp $
+ #
+ .SUFFIXES:
+ 
+@@ -48,6 +48,8 @@
+ bindir		= @bindir@
+ includedir	= @includedir@
+ 
++BINDIR		= $(DESTDIR)$(bindir@MERGE_PREFIX@)
++
+ INSTALL		= @INSTALL@ @INSTALL_OPT_O@
+ INSTALL_SCRIPT	= @INSTALL_SCRIPT@
+ INSTALL_DATA	= @INSTALL_DATA@
+@@ -163,19 +165,19 @@
+ 
+ sources:
+ 
+-$(DESTDIR)$(bindir) :
++$(BINDIR) :
+ 	mkdir -p $@
+ 
+ install \
+ install.libs :: \
+ 		$(GEN_TARGETS) \
+-		$(DESTDIR)$(bindir) \
++		$(BINDIR) \
+ 		$(ADACURSES_CONFIG)
+-	$(INSTALL_SCRIPT) $(ADACURSES_CONFIG) $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
++	$(INSTALL_SCRIPT) $(ADACURSES_CONFIG) $(BINDIR)/$(ADACURSES_CONFIG)
+ 
+ uninstall \
+ uninstall.libs ::
+-	-rm -f $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
++	-rm -f $(BINDIR)/$(ADACURSES_CONFIG)
+ 
+ $(PROG_GENERATE):  gen.o
+ 	@ECHO_LD@ $(LINK) $(CFLAGS_NORMAL) gen.o $(ACTUAL_LDFLAGS) -o $@
+Index: Ada95/samples/Makefile.in
+Prereq:  1.65 
+--- ncurses-6.5-20240810+/Ada95/samples/Makefile.in	2024-06-15 15:13:11.000000000 +0000
++++ ncurses-6.5-20240817/Ada95/samples/Makefile.in	2024-08-10 17:56:19.000000000 +0000
+@@ -29,7 +29,7 @@
+ #
+ #  Author:  Juergen Pfeifer, 1996
+ #
+-#  $Id: Makefile.in,v 1.65 2024/06/15 15:13:11 tom Exp $
++#  $Id: Makefile.in,v 1.66 2024/08/10 17:56:19 tom Exp $
+ #
+ .SUFFIXES:
+ 
+@@ -78,9 +78,9 @@
+ 
+ RANLIB		= @RANLIB@
+ ################################################################################
+-BINDIR		= $(DESTDIR)$(bindir)
+-DATADIR		= $(DESTDIR)$(datadir)
+-LIBDIR		= $(DESTDIR)$(libdir)
++BINDIR		= $(DESTDIR)$(bindir@MERGE_PREFIX@)
++DATADIR		= $(DESTDIR)$(datadir@MERGE_PREFIX@)
++LIBDIR		= $(DESTDIR)$(libdir@MERGE_PREFIX@)
+ 
+ MY_DATADIR	= $(DATADIR)/@ADA_LIBNAME@
+ THIS_DATADIR	= $(datadir)/@ADA_LIBNAME@
+Index: Ada95/src/Makefile.in
+Prereq:  1.96 
+--- ncurses-6.5-20240810+/Ada95/src/Makefile.in	2021-07-03 15:45:33.000000000 +0000
++++ ncurses-6.5-20240817/Ada95/src/Makefile.in	2024-08-10 18:18:44.000000000 +0000
+@@ -1,5 +1,5 @@
+ ##############################################################################
+-# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
++# Copyright 2018-2021,2024 Thomas E. Dickey                                  #
+ # Copyright 1999-2016,2018 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -29,7 +29,7 @@
+ #
+ #  Author:  Juergen Pfeifer, 1996
+ #
+-#  $Id: Makefile.in,v 1.96 2021/07/03 15:45:33 tom Exp $
++#  $Id: Makefile.in,v 1.97 2024/08/10 18:18:44 tom Exp $
+ #
+ .SUFFIXES:
+ 
+@@ -51,7 +51,7 @@
+ includedir	= @includedir@
+ libdir		= @libdir@
+ 
+-LIBDIR		= $(DESTDIR)$(libdir)
++LIBDIR		= $(DESTDIR)$(libdir@MERGE_PREFIX@)
+ ADA_INCLUDE	= $(DESTDIR)@ADA_INCLUDE@
+ ADA_OBJECTS	= $(DESTDIR)@ADA_OBJECTS@
+ 
+Index: INSTALL
+Prereq:  1.256 
+--- ncurses-6.5-20240810+/INSTALL	2024-06-08 21:06:02.000000000 +0000
++++ ncurses-6.5-20240817/INSTALL	2024-08-10 17:43:39.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: INSTALL,v 1.256 2024/06/08 21:06:02 Branden.Robinson Exp $
++-- $Id: INSTALL,v 1.257 2024/08/10 17:43:39 tom Exp $
+ ---------------------------------------------------------------------
+              How to install Ncurses/Terminfo on your system
+ ---------------------------------------------------------------------
+@@ -650,6 +650,12 @@
+ 	may not be accurate, or that your stty settings have disabled the use
+ 	of tabs.
+ 
++    --enable-install-prefix
++	Extend the --with-install-prefix feature to replace the prefix value
++	with $DESTDIR rather than simply prepending $DESTDIR to install
++	pathnames.  This works with any "make" which supports AT&T style
++	variable substitution.
++
+     --enable-interop
+ 	Compile-in experimental interop bindings.  These provide generic types
+ 	for the form-library.
+Index: NEWS
+Prereq:  1.4160 
+--- ncurses-6.5-20240810+/NEWS	2024-08-10 09:45:21.000000000 +0000
++++ ncurses-6.5-20240817/NEWS	2024-08-17 22:54:38.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4160 2024/08/10 09:45:21 tom Exp $
++-- $Id: NEWS,v 1.4164 2024/08/17 22:54:38 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.
+ 
++20240817
++	+ review/update foot for 1.18.1 -TD
++	+ add a note about DomTerm 3.2.0 -TD
++	+ add new glob-expressions variables to list in config.status script
++	  (patch by Werner Fink).
++	+ add --enable-install-prefix to modify behavior of $DESTDIR to merge
++	  or replace the value set by --prefix (adapted from suggestion by
++	  Eli Zaretskii).
++
+ 20240810
+ 	+ modify misc/Makefile.in and misc/run_tic.in so that $DESTDIR is set
+ 	  and used only in the makefile.
+Index: VERSION
+--- ncurses-6.5-20240810+/VERSION	2024-08-10 09:45:21.000000000 +0000
++++ ncurses-6.5-20240817/VERSION	2024-08-17 09:37:53.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20240810
++5:0:10	6.5	20240817
+Index: aclocal.m4
+Prereq:  1.1087 
+--- ncurses-6.5-20240810+/aclocal.m4	2024-08-10 15:51:16.000000000 +0000
++++ ncurses-6.5-20240817/aclocal.m4	2024-08-11 00:17:28.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1087 2024/08/10 15:51:16 tom Exp $
++dnl $Id: aclocal.m4,v 1.1088 2024/08/11 00:17:28 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -4218,6 +4218,40 @@
+ AC_SUBST(INSTALL_OPT_S)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_INSTALL_PREFIX version: 1 updated: 2024/08/10 20:16:32
++dnl -----------------
++dnl Special option for use by system-builders: the install-prefix is used to
++dnl adjust the location into which the actual install is done, so that an
++dnl archive can be built without modifying the host system's configuration.
++AC_DEFUN([CF_INSTALL_PREFIX],[
++AC_MSG_CHECKING(for an installation directory prefix)
++AC_ARG_WITH(install-prefix,
++	[  --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix],
++	[case "x$withval" in
++	(xyes|xno)
++		;;
++	(*)	DESTDIR="$withval"
++		;;
++	esac])
++AC_MSG_RESULT([${DESTDIR:-(none)}])
++AC_SUBST(DESTDIR)
++
++AC_MSG_CHECKING(if installation directory prefix should be merged)
++CF_ARG_ENABLE(install-prefix,
++	[  --enable-install-prefix merge DESTDIR with installation prefix],
++	cf_install_prefix=yes,
++	cf_install_prefix=no)
++AC_MSG_RESULT($cf_install_prefix)
++
++if test "$cf_install_prefix" = yes ; then
++	MERGE_PREFIX=':$(prefix)%=%'
++else
++	MERGE_PREFIX=''
++fi
++
++AC_SUBST(MERGE_PREFIX)
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_INTEL_COMPILER version: 9 updated: 2023/02/18 17:41:25
+ dnl -----------------
+ dnl Check if the given compiler is really the Intel compiler for Linux.  It
+@@ -5986,31 +6020,6 @@
+ AC_MSG_RESULT($MANPAGE_TBL)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_MB_LEN_MAX version: 1 updated: 2024/03/02 15:45:10
+-dnl -------------
+-dnl Check if  defines a usable MB_LEN_MAX.  That may be because it is
+-dnl not defined, or it may be a bogus value.
+-AC_DEFUN([CF_MB_LEN_MAX],[
+-AC_CACHE_CHECK(if MB_LEN_MAX is usable,cf_cv_mb_len_max,[
+-AC_TRY_COMPILE([
+-$ac_includes_default
+-#include ],
+-[
+-#if defined(MB_LEN_MAX) && MB_LEN_MAX >= 6
+-	${cf_cv_main_return:-return}(0);
+-#else
+-#error MB_LEN_MAX is not usable
+-#endif
+-],	[cf_cv_mb_len_max=yes],
+-	[cf_cv_mb_len_max=no])])
+-if test "$cf_cv_mb_len_max" = yes
+-then
+-	AC_DEFINE(HAVE_CONSISTENT_MB_LEN_MAX,1,[Define to 1 if MB_LEN_MAX is usable])
+-else
+-	AC_MSG_WARN(MB_LEN_MAX is missing/inconsistent in system headers)
+-fi
+-])dnl
+-dnl ---------------------------------------------------------------------------
+ dnl CF_MAN_PAGES version: 59 updated: 2024/03/30 08:27:40
+ dnl ------------
+ dnl Try to determine if the man-pages on the system are compressed, and if
+@@ -6398,6 +6407,31 @@
+ fi
+ ])
+ dnl ---------------------------------------------------------------------------
++dnl CF_MB_LEN_MAX version: 1 updated: 2024/03/02 15:45:10
++dnl -------------
++dnl Check if  defines a usable MB_LEN_MAX.  That may be because it is
++dnl not defined, or it may be a bogus value.
++AC_DEFUN([CF_MB_LEN_MAX],[
++AC_CACHE_CHECK(if MB_LEN_MAX is usable,cf_cv_mb_len_max,[
++AC_TRY_COMPILE([
++$ac_includes_default
++#include ],
++[
++#if defined(MB_LEN_MAX) && MB_LEN_MAX >= 6
++	${cf_cv_main_return:-return}(0);
++#else
++#error MB_LEN_MAX is not usable
++#endif
++],	[cf_cv_mb_len_max=yes],
++	[cf_cv_mb_len_max=no])])
++if test "$cf_cv_mb_len_max" = yes
++then
++	AC_DEFINE(HAVE_CONSISTENT_MB_LEN_MAX,1,[Define to 1 if MB_LEN_MAX is usable])
++else
++	AC_MSG_WARN(MB_LEN_MAX is missing/inconsistent in system headers)
++fi
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_MIXEDCASE_FILENAMES version: 9 updated: 2021/01/01 16:53:59
+ dnl ----------------------
+ dnl Check if the file-system supports mixed-case filenames.  If we're able to
+Index: c++/Makefile.in
+Prereq:  1.133 
+--- ncurses-6.5-20240810+/c++/Makefile.in	2021-07-03 18:53:57.000000000 +0000
++++ ncurses-6.5-20240817/c++/Makefile.in	2024-08-11 15:48:44.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.133 2021/07/03 18:53:57 tom Exp $
++# $Id: Makefile.in,v 1.135 2024/08/11 15:48:44 tom Exp $
+ ##############################################################################
+-# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
++# Copyright 2018-2021,2024 Thomas E. Dickey                                  #
+ # Copyright 1998-2015,2016 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -54,7 +54,9 @@
+ includedir	= @includedir@
+ includesubdir	= @includesubdir@
+ 
+-INCLUDEDIR	= $(DESTDIR)$(includedir)$(includesubdir)
++INCLUDEDIR	= $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
++BINDIR		= $(DESTDIR)$(bindir@MERGE_PREFIX@)
++LIBDIR		= $(DESTDIR)$(libdir@MERGE_PREFIX@)
+ 
+ PACKAGE		= @PACKAGE@
+ 
+@@ -191,7 +193,7 @@
+ tags:
+ 	$(CTAGS) *.[h] *.cc
+ 
+-$(DESTDIR)$(libdir) :
++$(LIBDIR) :
+ 	mkdir -p $@
+ 
+ mostlyclean ::
+Index: configure
+--- ncurses-6.5-20240810+/configure	2024-08-10 15:51:41.000000000 +0000
++++ ncurses-6.5-20240817/configure	2024-08-17 13:44:13.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.783 .
++# From configure.in Revision: 1.785 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20240618.
+ #
+@@ -736,6 +736,7 @@
+   --with-pc-suffix[=XXX]  suffix pkg-config files with XXX
+   --enable-mixed-case     tic should assume mixed-case filenames
+   --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix
++  --enable-install-prefix merge DESTDIR with installation prefix
+ Build-Tools Needed to Compile Temporary Applications for Cross-compiling:
+   --with-build-cc=XXX     the build C compiler ($BUILD_CC)
+   --with-build-cpp=XXX    the build C preprocessor ($BUILD_CPP)
+@@ -1077,7 +1078,7 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+   if test -r "$ac_site_file"; then
+-    { echo "$as_me:1080: loading site script $ac_site_file" >&5
++    { echo "$as_me:1081: loading site script $ac_site_file" >&5
+ echo "$as_me: loading site script $ac_site_file" >&6;}
+     cat "$ac_site_file" >&5
+     . "$ac_site_file"
+@@ -1088,7 +1089,7 @@
+   # Some versions of bash will fail to source /dev/null (special
+   # files actually), so we avoid doing that.
+   if test -f "$cache_file"; then
+-    { echo "$as_me:1091: loading cache $cache_file" >&5
++    { echo "$as_me:1092: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+       [\\/]* | ?:[\\/]* ) . $cache_file;;
+@@ -1096,7 +1097,7 @@
+     esac
+   fi
+ else
+-  { echo "$as_me:1099: creating cache $cache_file" >&5
++  { echo "$as_me:1100: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+@@ -1112,21 +1113,21 @@
+   eval ac_new_val="\$ac_env_${ac_var}_value"
+   case "$ac_old_set,$ac_new_set" in
+     set,)
+-      { echo "$as_me:1115: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++      { echo "$as_me:1116: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,set)
+-      { echo "$as_me:1119: error: \`$ac_var' was not set in the previous run" >&5
++      { echo "$as_me:1120: error: \`$ac_var' was not set in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,);;
+     *)
+       if test "x$ac_old_val" != "x$ac_new_val"; then
+-        { echo "$as_me:1125: error: \`$ac_var' has changed since the previous run:" >&5
++        { echo "$as_me:1126: error: \`$ac_var' has changed since the previous run:" >&5
+ echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+-        { echo "$as_me:1127:   former value:  $ac_old_val" >&5
++        { echo "$as_me:1128:   former value:  $ac_old_val" >&5
+ echo "$as_me:   former value:  $ac_old_val" >&2;}
+-        { echo "$as_me:1129:   current value: $ac_new_val" >&5
++        { echo "$as_me:1130:   current value: $ac_new_val" >&5
+ echo "$as_me:   current value: $ac_new_val" >&2;}
+         ac_cache_corrupted=:
+       fi;;
+@@ -1145,9 +1146,9 @@
+   fi
+ done
+ if "$ac_cache_corrupted"; then
+-  { echo "$as_me:1148: error: changes in the environment can compromise the build" >&5
++  { echo "$as_me:1149: error: changes in the environment can compromise the build" >&5
+ echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  { { echo "$as_me:1150: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++  { { echo "$as_me:1151: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1176,10 +1177,10 @@
+ echo "#! $SHELL" >conftest.sh
+ echo  "exit 0"   >>conftest.sh
+ chmod +x conftest.sh
+-if { (echo "$as_me:1179: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:1180: PATH=\".;.\"; conftest.sh") >&5
+   (PATH=".;."; conftest.sh) 2>&5
+   ac_status=$?
+-  echo "$as_me:1182: \$? = $ac_status" >&5
++  echo "$as_me:1183: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+   ac_path_separator=';'
+ else
+@@ -1196,7 +1197,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:1199: checking for $ac_word" >&5
++echo "$as_me:1200: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_GREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1211,7 +1212,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_GREP="$ac_prog"
+-echo "$as_me:1214: found $ac_dir/$ac_word" >&5
++echo "$as_me:1215: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1219,10 +1220,10 @@
+ fi
+ GREP=$ac_cv_prog_GREP
+ if test -n "$GREP"; then
+-  echo "$as_me:1222: result: $GREP" >&5
++  echo "$as_me:1223: result: $GREP" >&5
+ echo "${ECHO_T}$GREP" >&6
+ else
+-  echo "$as_me:1225: result: no" >&5
++  echo "$as_me:1226: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1230,7 +1231,7 @@
+ done
+ test -n "$GREP" || GREP=": "
+ 
+-echo "$as_me:1233: checking for egrep" >&5
++echo "$as_me:1234: checking for egrep" >&5
+ echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+ if test "${ac_cv_path_EGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1242,7 +1243,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:1245: checking for $ac_word" >&5
++echo "$as_me:1246: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_EGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1259,7 +1260,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_EGREP="$ac_dir/$ac_word"
+-   echo "$as_me:1262: found $ac_dir/$ac_word" >&5
++   echo "$as_me:1263: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -1270,10 +1271,10 @@
+ EGREP=$ac_cv_path_EGREP
+ 
+ if test -n "$EGREP"; then
+-  echo "$as_me:1273: result: $EGREP" >&5
++  echo "$as_me:1274: result: $EGREP" >&5
+ echo "${ECHO_T}$EGREP" >&6
+ else
+-  echo "$as_me:1276: result: no" >&5
++  echo "$as_me:1277: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1281,12 +1282,12 @@
+ done
+ test -n "$EGREP" || EGREP=": "
+ 
+-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:1284: error: cannot find workable egrep" >&5
++     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:1285: error: cannot find workable egrep" >&5
+ echo "$as_me: error: cannot find workable egrep" >&2;}
+    { (exit 1); exit 1; }; }
+    fi
+ fi
+-echo "$as_me:1289: result: $ac_cv_path_EGREP" >&5
++echo "$as_me:1290: result: $ac_cv_path_EGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_EGREP" >&6
+  EGREP="$ac_cv_path_EGREP"
+ 
+@@ -1297,11 +1298,11 @@
+ cf_cv_abi_default=${NCURSES_MAJOR}
+ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
+ cf_cv_timestamp=`date`
+-echo "$as_me:1300: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&5
++echo "$as_me:1301: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&5
+ echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&6
+ 
+ if test -f "$srcdir/VERSION" ; then
+-	echo "$as_me:1304: checking for package version" >&5
++	echo "$as_me:1305: checking for package version" >&5
+ echo $ECHO_N "checking for package version... $ECHO_C" >&6
+ 
+ 	# if there are not enough fields, cut returns the last one...
+@@ -1313,39 +1314,39 @@
+ 	VERSION="$cf_field1"
+ 
+ 	VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'`
+-	test -z "$VERSION_MAJOR" && { { echo "$as_me:1316: error: missing major-version" >&5
++	test -z "$VERSION_MAJOR" && { { echo "$as_me:1317: error: missing major-version" >&5
+ echo "$as_me: error: missing major-version" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ 	VERSION_MINOR=`echo "$cf_field2" | sed -e 's/^[^.]*\.//' -e 's/-.*//'`
+-	test -z "$VERSION_MINOR" && { { echo "$as_me:1321: error: missing minor-version" >&5
++	test -z "$VERSION_MINOR" && { { echo "$as_me:1322: error: missing minor-version" >&5
+ echo "$as_me: error: missing minor-version" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-	echo "$as_me:1325: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
++	echo "$as_me:1326: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
+ echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6
+ 
+-	echo "$as_me:1328: checking for package patch date" >&5
++	echo "$as_me:1329: checking for package patch date" >&5
+ echo $ECHO_N "checking for package patch date... $ECHO_C" >&6
+ 	VERSION_PATCH=`echo "$cf_field3" | sed -e 's/^[^-]*-//'`
+ 	case .$VERSION_PATCH in
+ 	(.)
+-		{ { echo "$as_me:1333: error: missing patch-date $VERSION_PATCH" >&5
++		{ { echo "$as_me:1334: error: missing patch-date $VERSION_PATCH" >&5
+ echo "$as_me: error: missing patch-date $VERSION_PATCH" >&2;}
+    { (exit 1); exit 1; }; }
+ 		;;
+ 	(.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9])
+ 		;;
+ 	(*)
+-		{ { echo "$as_me:1340: error: illegal patch-date $VERSION_PATCH" >&5
++		{ { echo "$as_me:1341: error: illegal patch-date $VERSION_PATCH" >&5
+ echo "$as_me: error: illegal patch-date $VERSION_PATCH" >&2;}
+    { (exit 1); exit 1; }; }
+ 		;;
+ 	esac
+-	echo "$as_me:1345: result: $VERSION_PATCH" >&5
++	echo "$as_me:1346: result: $VERSION_PATCH" >&5
+ echo "${ECHO_T}$VERSION_PATCH" >&6
+ else
+-	{ { echo "$as_me:1348: error: did not find $srcdir/VERSION" >&5
++	{ { echo "$as_me:1349: error: did not find $srcdir/VERSION" >&5
+ echo "$as_me: error: did not find $srcdir/VERSION" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1353,19 +1354,19 @@
+ # show the actual data that we have for versions:
+ test -n "$verbose" && echo "	ABI VERSION $VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:1356: testing ABI VERSION $VERSION ..." 1>&5
++echo "${as_me:-configure}:1357: testing ABI VERSION $VERSION ..." 1>&5
+ 
+ test -n "$verbose" && echo "	VERSION_MAJOR $VERSION_MAJOR" 1>&6
+ 
+-echo "${as_me:-configure}:1360: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
++echo "${as_me:-configure}:1361: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
+ 
+ test -n "$verbose" && echo "	VERSION_MINOR $VERSION_MINOR" 1>&6
+ 
+-echo "${as_me:-configure}:1364: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
++echo "${as_me:-configure}:1365: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
+ 
+ test -n "$verbose" && echo "	VERSION_PATCH $VERSION_PATCH" 1>&6
+ 
+-echo "${as_me:-configure}:1368: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
++echo "${as_me:-configure}:1369: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
+ 
+ 	PACKAGE=ncurses
+ 
+@@ -1386,7 +1387,7 @@
+ # Check whether --with-rel-version or --without-rel-version was given.
+ if test "${with_rel_version+set}" = set; then
+   withval="$with_rel_version"
+-  { echo "$as_me:1389: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
++  { echo "$as_me:1390: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
+ echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;}
+  cf_cv_rel_version=$withval
+ fi;
+@@ -1400,13 +1401,13 @@
+   (0)
+  	;;
+   (*)
+-	{ { echo "$as_me:1403: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
++	{ { echo "$as_me:1404: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
+ echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;}
+    { (exit 1); exit 1; }; }
+  	;;
+   esac
+ else
+-  { { echo "$as_me:1409: error: Release major-version value is empty" >&5
++  { { echo "$as_me:1410: error: Release major-version value is empty" >&5
+ echo "$as_me: error: Release major-version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1416,13 +1417,13 @@
+   (0)
+  	;;
+   (*)
+-	{ { echo "$as_me:1419: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
++	{ { echo "$as_me:1420: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
+ echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;}
+    { (exit 1); exit 1; }; }
+  	;;
+   esac
+ else
+-  { { echo "$as_me:1425: error: Release minor-version value is empty" >&5
++  { { echo "$as_me:1426: error: Release minor-version value is empty" >&5
+ echo "$as_me: error: Release minor-version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1435,7 +1436,7 @@
+ 
+ 	if test "x$cf_cv_abi_version" != "x$withval"
+ 	then
+-		{ echo "$as_me:1438: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
++		{ echo "$as_me:1439: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
+ echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
+ 		case "$cf_cv_rel_version" in
+ 		(5.*)
+@@ -1454,13 +1455,13 @@
+   (0)
+  	;;
+   (*)
+-	{ { echo "$as_me:1457: error: ABI version is not a number: $cf_cv_abi_version" >&5
++	{ { echo "$as_me:1458: error: ABI version is not a number: $cf_cv_abi_version" >&5
+ echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;}
+    { (exit 1); exit 1; }; }
+  	;;
+   esac
+ else
+-  { { echo "$as_me:1463: error: ABI version value is empty" >&5
++  { { echo "$as_me:1464: error: ABI version value is empty" >&5
+ echo "$as_me: error: ABI version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1493,7 +1494,7 @@
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:1496: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++  { { echo "$as_me:1497: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+ echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1503,11 +1504,11 @@
+ 
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+-  { { echo "$as_me:1506: error: cannot run $ac_config_sub" >&5
++  { { echo "$as_me:1507: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:1510: checking build system type" >&5
++echo "$as_me:1511: checking build system type" >&5
+ echo $ECHO_N "checking build system type... $ECHO_C" >&6
+ if test "${ac_cv_build+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1516,23 +1517,23 @@
+ test -z "$ac_cv_build_alias" &&
+   ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+-  { { echo "$as_me:1519: error: cannot guess build type; you must specify one" >&5
++  { { echo "$as_me:1520: error: cannot guess build type; you must specify one" >&5
+ echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+    { (exit 1); exit 1; }; }
+ ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` ||
+-  { { echo "$as_me:1523: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++  { { echo "$as_me:1524: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1528: result: $ac_cv_build" >&5
++echo "$as_me:1529: result: $ac_cv_build" >&5
+ echo "${ECHO_T}$ac_cv_build" >&6
+ build=$ac_cv_build
+ build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+-echo "$as_me:1535: checking host system type" >&5
++echo "$as_me:1536: checking host system type" >&5
+ echo $ECHO_N "checking host system type... $ECHO_C" >&6
+ if test "${ac_cv_host+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1541,12 +1542,12 @@
+ test -z "$ac_cv_host_alias" &&
+   ac_cv_host_alias=$ac_cv_build_alias
+ ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` ||
+-  { { echo "$as_me:1544: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++  { { echo "$as_me:1545: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1549: result: $ac_cv_host" >&5
++echo "$as_me:1550: result: $ac_cv_host" >&5
+ echo "${ECHO_T}$ac_cv_host" >&6
+ host=$ac_cv_host
+ host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1554,7 +1555,7 @@
+ host_os=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+ if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
+-	echo "$as_me:1557: checking target system type" >&5
++	echo "$as_me:1558: checking target system type" >&5
+ echo $ECHO_N "checking target system type... $ECHO_C" >&6
+ if test "${ac_cv_target+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1563,12 +1564,12 @@
+ test "x$ac_cv_target_alias" = "x" &&
+   ac_cv_target_alias=$ac_cv_host_alias
+ ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` ||
+-  { { echo "$as_me:1566: error: $ac_config_sub $ac_cv_target_alias failed" >&5
++  { { echo "$as_me:1567: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1571: result: $ac_cv_target" >&5
++echo "$as_me:1572: result: $ac_cv_target" >&5
+ echo "${ECHO_T}$ac_cv_target" >&6
+ target=$ac_cv_target
+ target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1600,13 +1601,13 @@
+ fi
+ 
+ test -z "$system_name" && system_name="$cf_cv_system_name"
+-test -n "$cf_cv_system_name" && echo "$as_me:1603: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1604: result: Configuring for $cf_cv_system_name" >&5
+ echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
+ 
+ if test ".$system_name" != ".$cf_cv_system_name" ; then
+-	echo "$as_me:1607: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++	echo "$as_me:1608: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+ echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
+-	{ { echo "$as_me:1609: error: \"Please remove config.cache and try again.\"" >&5
++	{ { echo "$as_me:1610: error: \"Please remove config.cache and try again.\"" >&5
+ echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1614,7 +1615,7 @@
+ # Check whether --with-system-type or --without-system-type was given.
+ if test "${with_system_type+set}" = set; then
+   withval="$with_system_type"
+-  { echo "$as_me:1617: WARNING: overriding system type to $withval" >&5
++  { echo "$as_me:1618: WARNING: overriding system type to $withval" >&5
+ echo "$as_me: WARNING: overriding system type to $withval" >&2;}
+ 	cf_cv_system_name=$withval
+ 	host_os=$withval
+@@ -1625,7 +1626,7 @@
+ cf_user_CFLAGS="$CFLAGS"
+ 
+ ###	Default install-location
+-echo "$as_me:1628: checking for fgrep" >&5
++echo "$as_me:1629: checking for fgrep" >&5
+ echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
+ if test "${ac_cv_path_FGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1637,7 +1638,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:1640: checking for $ac_word" >&5
++echo "$as_me:1641: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_FGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1654,7 +1655,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_FGREP="$ac_dir/$ac_word"
+-   echo "$as_me:1657: found $ac_dir/$ac_word" >&5
++   echo "$as_me:1658: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -1665,10 +1666,10 @@
+ FGREP=$ac_cv_path_FGREP
+ 
+ if test -n "$FGREP"; then
+-  echo "$as_me:1668: result: $FGREP" >&5
++  echo "$as_me:1669: result: $FGREP" >&5
+ echo "${ECHO_T}$FGREP" >&6
+ else
+-  echo "$as_me:1671: result: no" >&5
++  echo "$as_me:1672: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1676,16 +1677,16 @@
+ done
+ test -n "$FGREP" || FGREP=": "
+ 
+-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1679: error: cannot find workable fgrep" >&5
++     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1680: error: cannot find workable fgrep" >&5
+ echo "$as_me: error: cannot find workable fgrep" >&2;}
+    { (exit 1); exit 1; }; }
+    fi
+ fi
+-echo "$as_me:1684: result: $ac_cv_path_FGREP" >&5
++echo "$as_me:1685: result: $ac_cv_path_FGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_FGREP" >&6
+  FGREP="$ac_cv_path_FGREP"
+ 
+-echo "$as_me:1688: checking for prefix" >&5
++echo "$as_me:1689: checking for prefix" >&5
+ echo $ECHO_N "checking for prefix... $ECHO_C" >&6
+ if test "x$prefix" = "xNONE" ; then
+ 	case "$cf_cv_system_name" in
+@@ -1697,11 +1698,11 @@
+ 		;;
+ 	esac
+ fi
+-echo "$as_me:1700: result: $prefix" >&5
++echo "$as_me:1701: result: $prefix" >&5
+ echo "${ECHO_T}$prefix" >&6
+ 
+ if test "x$prefix" = "xNONE" ; then
+-echo "$as_me:1704: checking for default include-directory" >&5
++echo "$as_me:1705: checking for default include-directory" >&5
+ echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
+ test -n "$verbose" && echo 1>&6
+ for cf_symbol in \
+@@ -1724,7 +1725,7 @@
+ 	fi
+ 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
+ done
+-echo "$as_me:1727: result: $includedir" >&5
++echo "$as_me:1728: result: $includedir" >&5
+ echo "${ECHO_T}$includedir" >&6
+ fi
+ 
+@@ -1789,20 +1790,20 @@
+   (0)
+  	;;
+   (*)
+-	{ { echo "$as_me:1792: error: ABI altered is not a number: $withval" >&5
++	{ { echo "$as_me:1793: error: ABI altered is not a number: $withval" >&5
+ echo "$as_me: error: ABI altered is not a number: $withval" >&2;}
+    { (exit 1); exit 1; }; }
+  	;;
+   esac
+ else
+-  { { echo "$as_me:1798: error: ABI altered value is empty" >&5
++  { { echo "$as_me:1799: error: ABI altered value is empty" >&5
+ echo "$as_me: error: ABI altered value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ 	if test "$cf_cv_abi_version" != "$withval"
+ 	then
+-		{ echo "$as_me:1805: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
++		{ echo "$as_me:1806: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
+ echo "$as_me: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&2;}
+ 		cf_cv_abi_version=$withval
+ 	fi
+@@ -1832,7 +1833,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:1835: 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_path_cf_TEMP_gnat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1849,7 +1850,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:1852: found $ac_dir/$ac_word" >&5
++   echo "$as_me:1853: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -1861,10 +1862,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+ 
+ if test -n "$cf_TEMP_gnat"; then
+-  echo "$as_me:1864: result: $cf_TEMP_gnat" >&5
++  echo "$as_me:1865: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+-  echo "$as_me:1867: result: no" >&5
++  echo "$as_me:1868: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1874,7 +1875,7 @@
+ 		unset cf_cv_gnat_version
+ 		unset cf_TEMP_gnat
+ 
+-echo "$as_me:1877: checking for $cf_prog_gnat version" >&5
++echo "$as_me:1878: 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
+@@ -1885,7 +1886,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:1888: result: $cf_cv_gnat_version" >&5
++echo "$as_me:1889: 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
+@@ -1914,7 +1915,7 @@
+ 			cd conftest.src
+ 			for cf_gprconfig in Ada C
+ 			do
+-				echo "$as_me:1917: checking for gprconfig name for $cf_gprconfig" >&5
++				echo "$as_me:1918: 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
+@@ -1933,10 +1934,10 @@
+ 				if test -n "$cf_gprconfig_value"
+ 				then
+ 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+-					echo "$as_me:1936: result: $cf_gprconfig_value" >&5
++					echo "$as_me:1937: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ 				else
+-					echo "$as_me:1939: result: missing" >&5
++					echo "$as_me:1940: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ 					cf_ada_config="#"
+ 					break
+@@ -1949,7 +1950,7 @@
+ 	if test "x$cf_ada_config" != "x#"
+ 	then
+ 
+-echo "$as_me:1952: checking for gnat version" >&5
++echo "$as_me:1953: 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
+@@ -1960,7 +1961,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:1963: result: $cf_cv_gnat_version" >&5
++echo "$as_me:1964: 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
+ 
+@@ -1969,7 +1970,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ echo "$as_me:1972: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:1973: 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
+ 	;;
+@@ -1977,7 +1978,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:1980: checking for $ac_word" >&5
++echo "$as_me:1981: 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
+@@ -1992,7 +1993,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:1995: found $ac_dir/$ac_word" >&5
++echo "$as_me:1996: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2001,20 +2002,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:2004: result: $M4_exists" >&5
++  echo "$as_me:2005: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:2007: result: no" >&5
++  echo "$as_me:2008: 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:2013: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++			{ echo "$as_me:2014: 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:2017: checking if GNAT works" >&5
++			echo "$as_me:2018: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf ./conftest* ./*~conftest*
+@@ -2042,7 +2043,7 @@
+ fi
+ rm -rf ./conftest* ./*~conftest*
+ 
+-			echo "$as_me:2045: result: $cf_cv_prog_gnat_correct" >&5
++			echo "$as_me:2046: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 		fi
+ 	else
+@@ -2058,7 +2059,7 @@
+ 		# Here is a workaround.
+ 		# Extract the first word of "gnatgcc", so it can be a program name with args.
+ set dummy gnatgcc; ac_word=$2
+-echo "$as_me:2061: checking for $ac_word" >&5
++echo "$as_me:2062: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_cf_cv_path_gnatgcc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2075,7 +2076,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_cf_cv_path_gnatgcc="$ac_dir/$ac_word"
+-   echo "$as_me:2078: found $ac_dir/$ac_word" >&5
++   echo "$as_me:2079: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -2087,16 +2088,16 @@
+ cf_cv_path_gnatgcc=$ac_cv_path_cf_cv_path_gnatgcc
+ 
+ if test -n "$cf_cv_path_gnatgcc"; then
+-  echo "$as_me:2090: result: $cf_cv_path_gnatgcc" >&5
++  echo "$as_me:2091: result: $cf_cv_path_gnatgcc" >&5
+ echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
+ else
+-  echo "$as_me:2093: result: no" >&5
++  echo "$as_me:2094: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 		if test "$cf_cv_path_gnatgcc" != no
+ 		then
+-			echo "$as_me:2099: checking for improvement" >&5
++			echo "$as_me:2100: checking for improvement" >&5
+ echo $ECHO_N "checking for improvement... $ECHO_C" >&6
+ 			cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null`
+ 			case "x$cf_file_gnatgcc" in
+@@ -2107,7 +2108,7 @@
+ 				cf_cv_path_gnatgcc=no
+ 				;;
+ 			esac
+-			echo "$as_me:2110: result: $cf_cv_path_gnatgcc" >&5
++			echo "$as_me:2111: result: $cf_cv_path_gnatgcc" >&5
+ echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
+ 			test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc
+ 			cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc"
+@@ -2132,7 +2133,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:2135: checking for $ac_word" >&5
++echo "$as_me:2136: 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
+@@ -2147,7 +2148,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:2150: found $ac_dir/$ac_word" >&5
++echo "$as_me:2151: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2155,10 +2156,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:2158: result: $CC" >&5
++  echo "$as_me:2159: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:2161: result: no" >&5
++  echo "$as_me:2162: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2171,7 +2172,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:2174: checking for $ac_word" >&5
++echo "$as_me:2175: 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
+@@ -2186,7 +2187,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:2189: found $ac_dir/$ac_word" >&5
++echo "$as_me:2190: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2194,10 +2195,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:2197: result: $ac_ct_CC" >&5
++  echo "$as_me:2198: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:2200: result: no" >&5
++  echo "$as_me:2201: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2207,32 +2208,32 @@
+   CC=$ac_ct_CC
+ fi
+ 
+-test -z "$CC" && { { echo "$as_me:2210: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:2211: 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:2215:" \
++echo "$as_me:2216:" \
+      "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo "$2"`
+-{ (eval echo "$as_me:2218: \"$ac_compiler --version &5\"") >&5
++{ (eval echo "$as_me:2219: \"$ac_compiler --version &5\"") >&5
+   (eval $ac_compiler --version &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2221: \$? = $ac_status" >&5
++  echo "$as_me:2222: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:2223: \"$ac_compiler -v &5\"") >&5
++{ (eval echo "$as_me:2224: \"$ac_compiler -v &5\"") >&5
+   (eval $ac_compiler -v &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2226: \$? = $ac_status" >&5
++  echo "$as_me:2227: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:2228: \"$ac_compiler -V &5\"") >&5
++{ (eval echo "$as_me:2229: \"$ac_compiler -V &5\"") >&5
+   (eval $ac_compiler -V &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2231: \$? = $ac_status" >&5
++  echo "$as_me:2232: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2235 "configure"
++#line 2236 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2248,13 +2249,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:2251: checking for C compiler default output" >&5
++echo "$as_me:2252: 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:2254: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:2255: \"$ac_link_default\"") >&5
+   (eval $ac_link_default) 2>&5
+   ac_status=$?
+-  echo "$as_me:2257: \$? = $ac_status" >&5
++  echo "$as_me:2258: \$? = $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
+@@ -2277,34 +2278,34 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:2280: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:2281: 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:2286: result: $ac_file" >&5
++echo "$as_me:2287: 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:2291: checking whether the C compiler works" >&5
++echo "$as_me:2292: 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:2297: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2298: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2300: \$? = $ac_status" >&5
++  echo "$as_me:2301: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+-	{ { echo "$as_me:2307: error: cannot run C compiled programs.
++	{ { echo "$as_me:2308: 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;}
+@@ -2312,24 +2313,24 @@
+     fi
+   fi
+ fi
+-echo "$as_me:2315: result: yes" >&5
++echo "$as_me:2316: 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:2322: checking whether we are cross compiling" >&5
++echo "$as_me:2323: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:2324: result: $cross_compiling" >&5
++echo "$as_me:2325: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+ 
+-echo "$as_me:2327: checking for executable suffix" >&5
++echo "$as_me:2328: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:2329: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2330: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2332: \$? = $ac_status" >&5
++  echo "$as_me:2333: \$? = $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
+@@ -2345,25 +2346,25 @@
+   esac
+ done
+ else
+-  { { echo "$as_me:2348: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:2349: 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:2354: result: $ac_cv_exeext" >&5
++echo "$as_me:2355: 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:2360: checking for object suffix" >&5
++echo "$as_me:2361: 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 2366 "configure"
++#line 2367 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2375,10 +2376,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:2378: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2379: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2381: \$? = $ac_status" >&5
++  echo "$as_me:2382: \$? = $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
+@@ -2390,24 +2391,24 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:2393: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:2394: 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:2400: result: $ac_cv_objext" >&5
++echo "$as_me:2401: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:2404: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:2405: 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 2410 "configure"
++#line 2411 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2422,16 +2423,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2425: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2426: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2428: \$? = $ac_status" >&5
++  echo "$as_me:2429: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2431: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2432: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2434: \$? = $ac_status" >&5
++  echo "$as_me:2435: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -2443,19 +2444,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:2446: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:2447: 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:2452: checking whether $CC accepts -g" >&5
++echo "$as_me:2453: 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 2458 "configure"
++#line 2459 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2467,16 +2468,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2470: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2471: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2473: \$? = $ac_status" >&5
++  echo "$as_me:2474: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2476: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2477: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2479: \$? = $ac_status" >&5
++  echo "$as_me:2480: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cc_g=yes
+ else
+@@ -2486,7 +2487,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:2489: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:2490: 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
+@@ -2513,16 +2514,16 @@
+ #endif
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2516: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2517: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2519: \$? = $ac_status" >&5
++  echo "$as_me:2520: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2522: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2523: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2525: \$? = $ac_status" >&5
++  echo "$as_me:2526: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   for ac_declaration in \
+    ''\
+@@ -2534,7 +2535,7 @@
+    'void exit (int);'
+ do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2537 "configure"
++#line 2538 "configure"
+ #include "confdefs.h"
+ #include 
+ $ac_declaration
+@@ -2547,16 +2548,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2550: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2551: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2553: \$? = $ac_status" >&5
++  echo "$as_me:2554: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2556: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2557: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2559: \$? = $ac_status" >&5
++  echo "$as_me:2560: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -2566,7 +2567,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2569 "configure"
++#line 2570 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -2578,16 +2579,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2581: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2582: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2584: \$? = $ac_status" >&5
++  echo "$as_me:2585: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2587: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2588: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2590: \$? = $ac_status" >&5
++  echo "$as_me:2591: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -2617,11 +2618,11 @@
+ 
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+-	echo "$as_me:2620: checking version of $CC" >&5
++	echo "$as_me:2621: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+-	echo "$as_me:2624: result: $GCC_VERSION" >&5
++	echo "$as_me:2625: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+ 
+@@ -2630,12 +2631,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:2633: checking if this is really Intel C compiler" >&5
++		echo "$as_me:2634: 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 2638 "configure"
++#line 2639 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2652,16 +2653,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2655: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2656: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2658: \$? = $ac_status" >&5
++  echo "$as_me:2659: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2661: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2662: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2664: \$? = $ac_status" >&5
++  echo "$as_me:2665: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -2672,7 +2673,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:2675: result: $INTEL_COMPILER" >&5
++		echo "$as_me:2676: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ 		;;
+ 	esac
+@@ -2681,11 +2682,11 @@
+ CLANG_COMPILER=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:2684: checking if this is really Clang C compiler" >&5
++	echo "$as_me:2685: 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 2688 "configure"
++#line 2689 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2702,16 +2703,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2705: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2706: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2708: \$? = $ac_status" >&5
++  echo "$as_me:2709: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2711: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2712: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2714: \$? = $ac_status" >&5
++  echo "$as_me:2715: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_COMPILER=yes
+ 
+@@ -2721,7 +2722,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:2724: result: $CLANG_COMPILER" >&5
++	echo "$as_me:2725: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+ 
+@@ -2730,30 +2731,30 @@
+ if test "x$CLANG_COMPILER" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:2733: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:2734: 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:2740: checking version of $CC" >&5
++	echo "$as_me:2741: 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:2744: result: $CLANG_VERSION" >&5
++	echo "$as_me:2745: 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:2751: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:2752: 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 2756 "configure"
++#line 2757 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -2767,16 +2768,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:2770: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2771: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2773: \$? = $ac_status" >&5
++  echo "$as_me:2774: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:2776: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2777: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2779: \$? = $ac_status" >&5
++  echo "$as_me:2780: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -2787,13 +2788,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:2790: result: $cf_clang_optok" >&5
++		echo "$as_me:2791: 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}:2796: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:2797: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -2802,7 +2803,7 @@
+ 	done
+ fi
+ 
+-echo "$as_me:2805: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:2806: 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
+@@ -2810,7 +2811,7 @@
+   ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2813 "configure"
++#line 2814 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -2857,16 +2858,16 @@
+ do
+   CC="$ac_save_CC $ac_arg"
+   rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2860: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2861: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2863: \$? = $ac_status" >&5
++  echo "$as_me:2864: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2866: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2867: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2869: \$? = $ac_status" >&5
++  echo "$as_me:2870: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -2883,10 +2884,10 @@
+ 
+ case "x$ac_cv_prog_cc_stdc" in
+   x|xno)
+-    echo "$as_me:2886: result: none needed" >&5
++    echo "$as_me:2887: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+   *)
+-    echo "$as_me:2889: result: $ac_cv_prog_cc_stdc" >&5
++    echo "$as_me:2890: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+     CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+@@ -2894,13 +2895,13 @@
+ # This should have been defined by AC_PROG_CC
+ : "${CC:=cc}"
+ 
+-echo "$as_me:2897: checking \$CFLAGS variable" >&5
++echo "$as_me:2898: checking \$CFLAGS variable" >&5
+ echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
+ case "x$CFLAGS" in
+ (*-[IUD]*)
+-	echo "$as_me:2901: result: broken" >&5
++	echo "$as_me:2902: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2903: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
++	{ echo "$as_me:2904: 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=
+@@ -3008,18 +3009,18 @@
+ 	done
+ 	;;
+ (*)
+-	echo "$as_me:3011: result: ok" >&5
++	echo "$as_me:3012: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+ 
+-echo "$as_me:3016: checking \$CC variable" >&5
++echo "$as_me:3017: checking \$CC variable" >&5
+ echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+ case "$CC" in
+ (*[\ \	]-*)
+-	echo "$as_me:3020: result: broken" >&5
++	echo "$as_me:3021: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:3022: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++	{ echo "$as_me:3023: 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/[ ]*[ ]-[^ ].*//'`
+@@ -3136,19 +3137,19 @@
+ 	done
+ 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
+ 
+-echo "${as_me:-configure}:3139: testing resulting CC: '$CC' ..." 1>&5
++echo "${as_me:-configure}:3140: testing resulting CC: '$CC' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:3143: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
++echo "${as_me:-configure}:3144: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:3147: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
++echo "${as_me:-configure}:3148: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+ 
+ 	;;
+ (*)
+-	echo "$as_me:3151: result: ok" >&5
++	echo "$as_me:3152: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+@@ -3162,7 +3163,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:3165: checking how to run the C preprocessor" >&5
++echo "$as_me:3166: 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
+@@ -3183,18 +3184,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 3186 "configure"
++#line 3187 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:3191: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3192: \"$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:3197: \$? = $ac_status" >&5
++  echo "$as_me:3198: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3217,17 +3218,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3220 "configure"
++#line 3221 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:3224: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3225: \"$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:3230: \$? = $ac_status" >&5
++  echo "$as_me:3231: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3264,7 +3265,7 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:3267: result: $CPP" >&5
++echo "$as_me:3268: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -3274,18 +3275,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 3277 "configure"
++#line 3278 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:3282: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3283: \"$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:3288: \$? = $ac_status" >&5
++  echo "$as_me:3289: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3308,17 +3309,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3311 "configure"
++#line 3312 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:3315: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3316: \"$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:3321: \$? = $ac_status" >&5
++  echo "$as_me:3322: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3346,7 +3347,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:3349: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:3350: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -3359,14 +3360,14 @@
+ ac_main_return="return"
+ 
+ if test $ac_cv_c_compiler_gnu = yes; then
+-    echo "$as_me:3362: checking whether $CC needs -traditional" >&5
++    echo "$as_me:3363: 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 3369 "configure"
++#line 3370 "configure"
+ #include "confdefs.h"
+ #include 
+ int Autoconf = TIOCGETP;
+@@ -3381,7 +3382,7 @@
+ 
+   if test $ac_cv_prog_gcc_traditional = no; then
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3384 "configure"
++#line 3385 "configure"
+ #include "confdefs.h"
+ #include 
+ int Autoconf = TCGETA;
+@@ -3394,14 +3395,14 @@
+ 
+   fi
+ fi
+-echo "$as_me:3397: result: $ac_cv_prog_gcc_traditional" >&5
++echo "$as_me:3398: 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:3404: checking whether $CC understands -c and -o together" >&5
++echo "$as_me:3405: 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
+@@ -3416,15 +3417,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:3419: \"$ac_try\"") >&5
++if { (eval echo "$as_me:3420: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3422: \$? = $ac_status" >&5
++  echo "$as_me:3423: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:3424: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:3425: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3427: \$? = $ac_status" >&5
++  echo "$as_me:3428: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CC_c_o=yes
+@@ -3435,10 +3436,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CC_c_o" = yes; then
+-  echo "$as_me:3438: result: yes" >&5
++  echo "$as_me:3439: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:3441: result: no" >&5
++  echo "$as_me:3442: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3452,7 +3453,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:3455: checking for $ac_word" >&5
++echo "$as_me:3456: 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
+@@ -3469,7 +3470,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:3472: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3473: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3480,10 +3481,10 @@
+ LDCONFIG=$ac_cv_path_LDCONFIG
+ 
+ if test -n "$LDCONFIG"; then
+-  echo "$as_me:3483: result: $LDCONFIG" >&5
++  echo "$as_me:3484: result: $LDCONFIG" >&5
+ echo "${ECHO_T}$LDCONFIG" >&6
+ else
+-  echo "$as_me:3486: result: no" >&5
++  echo "$as_me:3487: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3491,7 +3492,7 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:3494: checking if you want to ensure bool is consistent with C++" >&5
++echo "$as_me:3495: 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.
+@@ -3501,7 +3502,7 @@
+ else
+   cf_with_cxx=yes
+ fi;
+-echo "$as_me:3504: result: $cf_with_cxx" >&5
++echo "$as_me:3505: result: $cf_with_cxx" >&5
+ echo "${ECHO_T}$cf_with_cxx" >&6
+ if test "X$cf_with_cxx" = Xno ; then
+ 	CXX=""
+@@ -3519,7 +3520,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:3522: checking for $ac_word" >&5
++echo "$as_me:3523: 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
+@@ -3534,7 +3535,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:3537: found $ac_dir/$ac_word" >&5
++echo "$as_me:3538: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3542,10 +3543,10 @@
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+-  echo "$as_me:3545: result: $CXX" >&5
++  echo "$as_me:3546: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$as_me:3548: result: no" >&5
++  echo "$as_me:3549: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3558,7 +3559,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:3561: checking for $ac_word" >&5
++echo "$as_me:3562: 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
+@@ -3573,7 +3574,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:3576: found $ac_dir/$ac_word" >&5
++echo "$as_me:3577: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3581,10 +3582,10 @@
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+-  echo "$as_me:3584: result: $ac_ct_CXX" >&5
++  echo "$as_me:3585: result: $ac_ct_CXX" >&5
+ echo "${ECHO_T}$ac_ct_CXX" >&6
+ else
+-  echo "$as_me:3587: result: no" >&5
++  echo "$as_me:3588: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3596,32 +3597,32 @@
+ fi
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:3599:" \
++echo "$as_me:3600:" \
+      "checking for C++ compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:3602: \"$ac_compiler --version &5\"") >&5
++{ (eval echo "$as_me:3603: \"$ac_compiler --version &5\"") >&5
+   (eval $ac_compiler --version &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:3605: \$? = $ac_status" >&5
++  echo "$as_me:3606: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:3607: \"$ac_compiler -v &5\"") >&5
++{ (eval echo "$as_me:3608: \"$ac_compiler -v &5\"") >&5
+   (eval $ac_compiler -v &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:3610: \$? = $ac_status" >&5
++  echo "$as_me:3611: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:3612: \"$ac_compiler -V &5\"") >&5
++{ (eval echo "$as_me:3613: \"$ac_compiler -V &5\"") >&5
+   (eval $ac_compiler -V &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:3615: \$? = $ac_status" >&5
++  echo "$as_me:3616: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 
+-echo "$as_me:3618: checking whether we are using the GNU C++ compiler" >&5
++echo "$as_me:3619: 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 3624 "configure"
++#line 3625 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3636,16 +3637,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3639: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3640: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3642: \$? = $ac_status" >&5
++  echo "$as_me:3643: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3645: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3646: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3648: \$? = $ac_status" >&5
++  echo "$as_me:3649: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -3657,19 +3658,19 @@
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:3660: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "$as_me:3661: 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:3666: checking whether $CXX accepts -g" >&5
++echo "$as_me:3667: 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 3672 "configure"
++#line 3673 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3681,16 +3682,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3684: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3685: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3687: \$? = $ac_status" >&5
++  echo "$as_me:3688: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3690: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3691: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3693: \$? = $ac_status" >&5
++  echo "$as_me:3694: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cxx_g=yes
+ else
+@@ -3700,7 +3701,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3703: result: $ac_cv_prog_cxx_g" >&5
++echo "$as_me:3704: 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
+@@ -3727,7 +3728,7 @@
+    'void exit (int);'
+ do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3730 "configure"
++#line 3731 "configure"
+ #include "confdefs.h"
+ #include 
+ $ac_declaration
+@@ -3740,16 +3741,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3743: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3744: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3746: \$? = $ac_status" >&5
++  echo "$as_me:3747: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3749: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3750: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3752: \$? = $ac_status" >&5
++  echo "$as_me:3753: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -3759,7 +3760,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3762 "configure"
++#line 3763 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -3771,16 +3772,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3774: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3775: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3777: \$? = $ac_status" >&5
++  echo "$as_me:3778: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3780: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3781: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3783: \$? = $ac_status" >&5
++  echo "$as_me:3784: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -3814,7 +3815,7 @@
+ 	then
+ 		# Several of the C++ configurations do not work, particularly when
+ 		# cross-compiling (20140913 -TD)
+-		echo "$as_me:3817: checking if $CXX works" >&5
++		echo "$as_me:3818: checking if $CXX works" >&5
+ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
+ 
+ 		save_CPPFLAGS="$CPPFLAGS"
+@@ -3822,7 +3823,7 @@
+ 		CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3825 "configure"
++#line 3826 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -3839,16 +3840,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3842: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3843: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3845: \$? = $ac_status" >&5
++  echo "$as_me:3846: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3848: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3849: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3851: \$? = $ac_status" >&5
++  echo "$as_me:3852: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_works=yes
+ else
+@@ -3859,11 +3860,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CPPFLAGS="$save_CPPFLAGS"
+ 
+-		echo "$as_me:3862: result: $cf_cxx_works" >&5
++		echo "$as_me:3863: result: $cf_cxx_works" >&5
+ echo "${ECHO_T}$cf_cxx_works" >&6
+ 		if test "x$cf_cxx_works" = xno
+ 		then
+-			{ echo "$as_me:3866: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
++			{ echo "$as_me:3867: 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
+@@ -3879,7 +3880,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:3882: checking for $ac_word" >&5
++echo "$as_me:3883: 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
+@@ -3896,7 +3897,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:3899: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3900: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3907,17 +3908,17 @@
+ CXX=$ac_cv_path_CXX
+ 
+ if test -n "$CXX"; then
+-  echo "$as_me:3910: result: $CXX" >&5
++  echo "$as_me:3911: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$as_me:3913: result: no" >&5
++  echo "$as_me:3914: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 	fi
+ 	case "x$CXX" in
+ 	(x|xg++)
+-		{ echo "$as_me:3920: WARNING: You don't have any C++ compiler, too bad" >&5
++		{ echo "$as_me:3921: 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="";
+ 		;;
+@@ -3926,7 +3927,7 @@
+ 
+ GXX_VERSION=none
+ if test "$GXX" = yes; then
+-	echo "$as_me:3929: checking version of ${CXX:-g++}" >&5
++	echo "$as_me:3930: checking version of ${CXX:-g++}" >&5
+ echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
+ 	GXX_VERSION="`${CXX:-g++} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	if test -z "$GXX_VERSION"
+@@ -3934,7 +3935,7 @@
+ 		GXX_VERSION=unknown
+ 		GXX=no
+ 	fi
+-	echo "$as_me:3937: result: $GXX_VERSION" >&5
++	echo "$as_me:3938: result: $GXX_VERSION" >&5
+ echo "${ECHO_T}$GXX_VERSION" >&6
+ fi
+ 
+@@ -3942,12 +3943,12 @@
+ ([1-9][0-9].*)
+ 	;;
+ (1.*|2.[0-6]*)
+-	{ echo "$as_me:3945: WARNING: templates do not work" >&5
++	{ echo "$as_me:3946: WARNING: templates do not work" >&5
+ echo "$as_me: WARNING: templates do not work" >&2;}
+ 	;;
+ esac
+ 
+-echo "$as_me:3950: checking if you want to build C++ binding and demo" >&5
++echo "$as_me:3951: 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.
+@@ -3957,15 +3958,15 @@
+ else
+   cf_with_cxx_binding=$cf_with_cxx
+ fi;
+-echo "$as_me:3960: result: $cf_with_cxx_binding" >&5
++echo "$as_me:3961: result: $cf_with_cxx_binding" >&5
+ echo "${ECHO_T}$cf_with_cxx_binding" >&6
+ 
+-echo "$as_me:3963: checking if you want to build with Ada" >&5
++echo "$as_me:3964: 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:3965: result: $cf_with_ada" >&5
++echo "$as_me:3966: result: $cf_with_ada" >&5
+ echo "${ECHO_T}$cf_with_ada" >&6
+ 
+-echo "$as_me:3968: checking if you want to install terminal database" >&5
++echo "$as_me:3969: 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.
+@@ -3975,10 +3976,10 @@
+ else
+   cf_with_db_install=yes
+ fi;
+-echo "$as_me:3978: result: $cf_with_db_install" >&5
++echo "$as_me:3979: result: $cf_with_db_install" >&5
+ echo "${ECHO_T}$cf_with_db_install" >&6
+ 
+-echo "$as_me:3981: checking if you want to install manpages" >&5
++echo "$as_me:3982: 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.
+@@ -3988,10 +3989,10 @@
+ else
+   cf_with_manpages=yes
+ fi;
+-echo "$as_me:3991: result: $cf_with_manpages" >&5
++echo "$as_me:3992: result: $cf_with_manpages" >&5
+ echo "${ECHO_T}$cf_with_manpages" >&6
+ 
+-echo "$as_me:3994: checking if you want to build programs such as tic" >&5
++echo "$as_me:3995: 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.
+@@ -4001,10 +4002,10 @@
+ else
+   cf_with_progs=yes
+ fi;
+-echo "$as_me:4004: result: $cf_with_progs" >&5
++echo "$as_me:4005: result: $cf_with_progs" >&5
+ echo "${ECHO_T}$cf_with_progs" >&6
+ 
+-echo "$as_me:4007: checking if you want to build test-programs" >&5
++echo "$as_me:4008: 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.
+@@ -4014,10 +4015,10 @@
+ else
+   cf_with_tests=yes
+ fi;
+-echo "$as_me:4017: result: $cf_with_tests" >&5
++echo "$as_me:4018: result: $cf_with_tests" >&5
+ echo "${ECHO_T}$cf_with_tests" >&6
+ 
+-echo "$as_me:4020: checking if you wish to install curses.h" >&5
++echo "$as_me:4021: 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.
+@@ -4027,7 +4028,7 @@
+ else
+   with_curses_h=yes
+ fi;
+-echo "$as_me:4030: result: $with_curses_h" >&5
++echo "$as_me:4031: result: $with_curses_h" >&5
+ echo "${ECHO_T}$with_curses_h" >&6
+ 
+ modules_to_build="ncurses"
+@@ -4051,7 +4052,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:4054: checking for $ac_word" >&5
++echo "$as_me:4055: 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
+@@ -4066,7 +4067,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+-echo "$as_me:4069: found $ac_dir/$ac_word" >&5
++echo "$as_me:4070: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4074,17 +4075,17 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "$as_me:4077: result: $AWK" >&5
++  echo "$as_me:4078: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+-  echo "$as_me:4080: result: no" >&5
++  echo "$as_me:4081: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   test -n "$AWK" && break
+ done
+ 
+-test -z "$AWK" && { { echo "$as_me:4087: error: No awk program found" >&5
++test -z "$AWK" && { { echo "$as_me:4088: error: No awk program found" >&5
+ echo "$as_me: error: No awk program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -4111,7 +4112,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:4114: checking for a BSD compatible install" >&5
++echo "$as_me:4115: 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
+@@ -4160,7 +4161,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:4163: result: $INSTALL" >&5
++echo "$as_me:4164: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -4185,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:4188: 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_LINT+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4200,7 +4201,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LINT="$ac_prog"
+-echo "$as_me:4203: found $ac_dir/$ac_word" >&5
++echo "$as_me:4204: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4208,10 +4209,10 @@
+ fi
+ LINT=$ac_cv_prog_LINT
+ if test -n "$LINT"; then
+-  echo "$as_me:4211: result: $LINT" >&5
++  echo "$as_me:4212: result: $LINT" >&5
+ echo "${ECHO_T}$LINT" >&6
+ else
+-  echo "$as_me:4214: result: no" >&5
++  echo "$as_me:4215: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4224,18 +4225,18 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:4227: checking whether ln -s works" >&5
++echo "$as_me:4228: 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:4231: result: yes" >&5
++  echo "$as_me:4232: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:4234: result: no, using $LN_S" >&5
++  echo "$as_me:4235: result: no, using $LN_S" >&5
+ echo "${ECHO_T}no, using $LN_S" >&6
+ fi
+ 
+-echo "$as_me:4238: checking if $LN_S -f options work" >&5
++echo "$as_me:4239: 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
+@@ -4247,12 +4248,12 @@
+ 	cf_prog_ln_sf=no
+ fi
+ rm -f conf$$.dst conf$$src
+-echo "$as_me:4250: result: $cf_prog_ln_sf" >&5
++echo "$as_me:4251: 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:4255: checking for long file names" >&5
++echo "$as_me:4256: 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
+@@ -4291,7 +4292,7 @@
+   rm -rf "$ac_xdir" 2>/dev/null
+ done
+ fi
+-echo "$as_me:4294: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:4295: 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
+ 
+@@ -4310,7 +4311,7 @@
+   withval="$with_config_suffix"
+   case "x$withval" in
+ 	(xyes|xno)
+-		{ echo "$as_me:4313: WARNING: expected a value for config-suffix option" >&5
++		{ echo "$as_me:4314: 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"
+@@ -4320,7 +4321,7 @@
+ 
+ # If we find pkg-config, check if we should install the ".pc" files.
+ 
+-echo "$as_me:4323: checking if you want to use pkg-config" >&5
++echo "$as_me:4324: 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.
+@@ -4330,7 +4331,7 @@
+ else
+   cf_pkg_config=yes
+ fi;
+-echo "$as_me:4333: result: $cf_pkg_config" >&5
++echo "$as_me:4334: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+ 
+ case "$cf_pkg_config" in
+@@ -4342,7 +4343,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:4345: checking for $ac_word" >&5
++echo "$as_me:4346: 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
+@@ -4359,7 +4360,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:4362: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4363: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -4370,10 +4371,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:4373: result: $PKG_CONFIG" >&5
++  echo "$as_me:4374: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+-  echo "$as_me:4376: result: no" >&5
++  echo "$as_me:4377: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4382,7 +4383,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:4385: checking for $ac_word" >&5
++echo "$as_me:4386: 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
+@@ -4399,7 +4400,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:4402: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4403: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -4411,10 +4412,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ 
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  echo "$as_me:4414: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:4415: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+-  echo "$as_me:4417: result: no" >&5
++  echo "$as_me:4418: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4455,24 +4456,24 @@
+ 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4458: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++	{ { echo "$as_me:4459: 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:4465: WARNING: pkg-config is not installed" >&5
++	{ echo "$as_me:4466: 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:4471: checking for pkg-config library directory" >&5
++	echo "$as_me:4472: checking for pkg-config library directory" >&5
+ echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
+ 	;;
+ (*)
+-	echo "$as_me:4475: checking for $PKG_CONFIG library directory" >&5
++	echo "$as_me:4476: checking for $PKG_CONFIG library directory" >&5
+ echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
+ 	;;
+ esac
+@@ -4499,7 +4500,7 @@
+ case "x$cf_search_path" in
+ (xlibdir)
+ 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+-	echo "$as_me:4502: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:4503: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+@@ -4510,16 +4511,16 @@
+ 	;;
+ (x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	PKG_CONFIG_LIBDIR="$cf_search_path"
+-	echo "$as_me:4513: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:4514: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+ (xyes|xauto)
+-	echo "$as_me:4518: result: auto" >&5
++	echo "$as_me:4519: 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:4522: checking for search-list" >&5
++	echo "$as_me:4523: checking for search-list" >&5
+ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+ 	if test "x$PKG_CONFIG" != xnone
+ 	then
+@@ -4554,11 +4555,11 @@
+ "`
+ 	fi
+ 
+-	echo "$as_me:4557: result: $cf_search_path" >&5
++	echo "$as_me:4558: result: $cf_search_path" >&5
+ echo "${ECHO_T}$cf_search_path" >&6
+ 	;;
+ (*)
+-	{ { echo "$as_me:4561: error: Unexpected option value: $cf_search_path" >&5
++	{ { echo "$as_me:4562: error: Unexpected option value: $cf_search_path" >&5
+ echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -4566,7 +4567,7 @@
+ 
+ if test -n "$cf_search_path"
+ then
+-	echo "$as_me:4569: checking for first directory" >&5
++	echo "$as_me:4570: 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
+@@ -4577,7 +4578,7 @@
+ 			break
+ 		fi
+ 	done
+-	echo "$as_me:4580: result: $cf_pkg_config_path" >&5
++	echo "$as_me:4581: result: $cf_pkg_config_path" >&5
+ echo "${ECHO_T}$cf_pkg_config_path" >&6
+ 
+ 	if test "x$cf_pkg_config_path" != xnone ; then
+@@ -4587,7 +4588,7 @@
+ 
+ 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+ 	then
+-		echo "$as_me:4590: checking for workaround" >&5
++		echo "$as_me:4591: checking for workaround" >&5
+ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+ 		if test "$prefix" = "NONE" ; then
+ 			cf_prefix="$ac_default_prefix"
+@@ -4610,17 +4611,17 @@
+ 			esac
+ 		done
+ 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+-		echo "$as_me:4613: result: $PKG_CONFIG_LIBDIR" >&5
++		echo "$as_me:4614: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	fi
+ fi
+ 
+ if test "x$PKG_CONFIG" != xnone
+ then
+-	echo "$as_me:4620: checking if we should install .pc files for $PKG_CONFIG" >&5
++	echo "$as_me:4621: 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:4623: checking if we should install .pc files" >&5
++	echo "$as_me:4624: checking if we should install .pc files" >&5
+ echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
+ fi
+ 
+@@ -4631,7 +4632,7 @@
+ else
+   enable_pc_files=no
+ fi;
+-echo "$as_me:4634: result: $enable_pc_files" >&5
++echo "$as_me:4635: result: $enable_pc_files" >&5
+ echo "${ECHO_T}$enable_pc_files" >&6
+ 
+ if test "x$enable_pc_files" != xno
+@@ -4639,7 +4640,7 @@
+ 	MAKE_PC_FILES=
+ 	case "x$PKG_CONFIG_LIBDIR" in
+ 	(xno|xnone|xyes|x)
+-		{ echo "$as_me:4642: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
++		{ echo "$as_me:4643: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+ echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
+ 		;;
+ 	(*)
+@@ -4668,7 +4669,7 @@
+ 	cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4671: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
++	{ { echo "$as_me:4672: 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; }; }
+ 	;;
+@@ -4682,7 +4683,7 @@
+ 
+ if test -z "$MAKE_PC_FILES"
+ then
+-	echo "$as_me:4685: checking for suffix to add to pkg-config files" >&5
++	echo "$as_me:4686: checking for suffix to add to pkg-config files" >&5
+ echo $ECHO_N "checking for suffix to add to pkg-config files... $ECHO_C" >&6
+ 
+ # Check whether --with-pc-suffix or --without-pc-suffix was given.
+@@ -4697,13 +4698,13 @@
+ 	esac
+ fi;
+ 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
+-	echo "$as_me:4700: result: $PC_MODULE_SUFFIX" >&5
++	echo "$as_me:4701: result: $PC_MODULE_SUFFIX" >&5
+ echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
+ 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
+ 
+ fi
+ 
+-echo "$as_me:4706: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:4707: 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.
+@@ -4713,11 +4714,11 @@
+ else
+   enable_mixedcase=auto
+ fi;
+-echo "$as_me:4716: result: $enable_mixedcase" >&5
++echo "$as_me:4717: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+ 
+-echo "$as_me:4720: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:4721: 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
+@@ -4744,7 +4745,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:4747: result: $cf_cv_mixedcase" >&5
++echo "$as_me:4748: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -4763,7 +4764,7 @@
+ fi
+ 
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:4766: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:4767: 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
+@@ -4783,16 +4784,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:4786: result: yes" >&5
++  echo "$as_me:4787: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:4790: result: no" >&5
++  echo "$as_me:4791: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+-echo "$as_me:4795: checking for \".PHONY\" make-support" >&5
++echo "$as_me:4796: 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
+@@ -4847,7 +4848,7 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:4850: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:4851: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+@@ -4858,7 +4859,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:4861: checking for $ac_word" >&5
++echo "$as_me:4862: 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
+@@ -4873,7 +4874,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:4876: found $ac_dir/$ac_word" >&5
++echo "$as_me:4877: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4881,10 +4882,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:4884: result: $CTAGS" >&5
++  echo "$as_me:4885: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:4887: result: no" >&5
++  echo "$as_me:4888: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4895,7 +4896,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:4898: checking for $ac_word" >&5
++echo "$as_me:4899: 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
+@@ -4910,7 +4911,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:4913: found $ac_dir/$ac_word" >&5
++echo "$as_me:4914: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4918,10 +4919,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:4921: result: $ETAGS" >&5
++  echo "$as_me:4922: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:4924: result: no" >&5
++  echo "$as_me:4925: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4930,7 +4931,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:4933: checking for $ac_word" >&5
++echo "$as_me:4934: 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
+@@ -4945,7 +4946,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:4948: found $ac_dir/$ac_word" >&5
++echo "$as_me:4949: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4954,17 +4955,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:4957: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:4958: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:4960: result: no" >&5
++  echo "$as_me:4961: 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:4967: checking for $ac_word" >&5
++echo "$as_me:4968: 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
+@@ -4979,7 +4980,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:4982: found $ac_dir/$ac_word" >&5
++echo "$as_me:4983: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4988,10 +4989,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:4991: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:4992: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:4994: result: no" >&5
++  echo "$as_me:4995: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5011,7 +5012,7 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:5014: checking for makeflags variable" >&5
++echo "$as_me:5015: 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
+@@ -5041,7 +5042,7 @@
+ 			;;
+ 		(*)
+ 
+-echo "${as_me:-configure}:5044: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:5045: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -5049,13 +5050,13 @@
+ 	rm -f cf_makeflags.tmp
+ 
+ fi
+-echo "$as_me:5052: result: $cf_cv_makeflags" >&5
++echo "$as_me:5053: 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:5058: checking for $ac_word" >&5
++echo "$as_me:5059: 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
+@@ -5070,7 +5071,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:5073: found $ac_dir/$ac_word" >&5
++echo "$as_me:5074: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5078,10 +5079,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:5081: result: $RANLIB" >&5
++  echo "$as_me:5082: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:5084: result: no" >&5
++  echo "$as_me:5085: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5090,7 +5091,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:5093: checking for $ac_word" >&5
++echo "$as_me:5094: 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
+@@ -5105,7 +5106,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:5108: found $ac_dir/$ac_word" >&5
++echo "$as_me:5109: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5114,10 +5115,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:5117: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:5118: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:5120: result: no" >&5
++  echo "$as_me:5121: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5129,7 +5130,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:5132: checking for $ac_word" >&5
++echo "$as_me:5133: 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
+@@ -5144,7 +5145,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:5147: found $ac_dir/$ac_word" >&5
++echo "$as_me:5148: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5152,10 +5153,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:5155: result: $LD" >&5
++  echo "$as_me:5156: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:5158: result: no" >&5
++  echo "$as_me:5159: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5164,7 +5165,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:5167: checking for $ac_word" >&5
++echo "$as_me:5168: 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
+@@ -5179,7 +5180,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:5182: found $ac_dir/$ac_word" >&5
++echo "$as_me:5183: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5188,10 +5189,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:5191: result: $ac_ct_LD" >&5
++  echo "$as_me:5192: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:5194: result: no" >&5
++  echo "$as_me:5195: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5203,7 +5204,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:5206: checking for $ac_word" >&5
++echo "$as_me:5207: 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
+@@ -5218,7 +5219,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:5221: found $ac_dir/$ac_word" >&5
++echo "$as_me:5222: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5226,10 +5227,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:5229: result: $AR" >&5
++  echo "$as_me:5230: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:5232: result: no" >&5
++  echo "$as_me:5233: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5238,7 +5239,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:5241: checking for $ac_word" >&5
++echo "$as_me:5242: 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
+@@ -5253,7 +5254,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:5256: found $ac_dir/$ac_word" >&5
++echo "$as_me:5257: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5262,10 +5263,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:5265: result: $ac_ct_AR" >&5
++  echo "$as_me:5266: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:5268: result: no" >&5
++  echo "$as_me:5269: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5277,7 +5278,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:5280: checking for $ac_word" >&5
++echo "$as_me:5281: 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
+@@ -5292,7 +5293,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:5295: found $ac_dir/$ac_word" >&5
++echo "$as_me:5296: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5300,10 +5301,10 @@
+ fi
+ NM=$ac_cv_prog_NM
+ if test -n "$NM"; then
+-  echo "$as_me:5303: result: $NM" >&5
++  echo "$as_me:5304: result: $NM" >&5
+ echo "${ECHO_T}$NM" >&6
+ else
+-  echo "$as_me:5306: result: no" >&5
++  echo "$as_me:5307: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5312,7 +5313,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:5315: checking for $ac_word" >&5
++echo "$as_me:5316: 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
+@@ -5327,7 +5328,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:5330: found $ac_dir/$ac_word" >&5
++echo "$as_me:5331: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5336,10 +5337,10 @@
+ fi
+ ac_ct_NM=$ac_cv_prog_ac_ct_NM
+ if test -n "$ac_ct_NM"; then
+-  echo "$as_me:5339: result: $ac_ct_NM" >&5
++  echo "$as_me:5340: result: $ac_ct_NM" >&5
+ echo "${ECHO_T}$ac_ct_NM" >&6
+ else
+-  echo "$as_me:5342: result: no" >&5
++  echo "$as_me:5343: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5351,7 +5352,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:5354: checking for $ac_word" >&5
++echo "$as_me:5355: 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
+@@ -5366,7 +5367,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:5369: found $ac_dir/$ac_word" >&5
++echo "$as_me:5370: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5374,10 +5375,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:5377: result: $AR" >&5
++  echo "$as_me:5378: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:5380: result: no" >&5
++  echo "$as_me:5381: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5386,7 +5387,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:5389: checking for $ac_word" >&5
++echo "$as_me:5390: 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
+@@ -5401,7 +5402,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:5404: found $ac_dir/$ac_word" >&5
++echo "$as_me:5405: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5410,10 +5411,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:5413: result: $ac_ct_AR" >&5
++  echo "$as_me:5414: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:5416: result: no" >&5
++  echo "$as_me:5417: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5422,7 +5423,7 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-echo "$as_me:5425: checking for options to update archives" >&5
++echo "$as_me:5426: 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
+@@ -5459,13 +5460,13 @@
+ 			rm -f conftest.a
+ 
+ 			cat >"conftest.$ac_ext" <&5
++			if { (eval echo "$as_me:5466: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5468: \$? = $ac_status" >&5
++  echo "$as_me:5469: \$? = $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
+@@ -5476,7 +5477,7 @@
+ 			else
+ 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-echo "${as_me:-configure}:5479: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:5480: testing cannot compile test-program ..." 1>&5
+ 
+ 				break
+ 			fi
+@@ -5486,7 +5487,7 @@
+ 	esac
+ 
+ fi
+-echo "$as_me:5489: result: $cf_cv_ar_flags" >&5
++echo "$as_me:5490: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+ if test -n "$ARFLAGS" ; then
+@@ -5497,7 +5498,7 @@
+ 	ARFLAGS=$cf_cv_ar_flags
+ fi
+ 
+-echo "$as_me:5500: checking for an installation directory prefix" >&5
++echo "$as_me:5501: checking for an installation directory prefix" >&5
+ echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-install-prefix or --without-install-prefix was given.
+@@ -5510,9 +5511,35 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:5513: result: ${DESTDIR:-(none)}" >&5
++echo "$as_me:5514: result: ${DESTDIR:-(none)}" >&5
+ echo "${ECHO_T}${DESTDIR:-(none)}" >&6
+ 
++echo "$as_me:5517: checking if installation directory prefix should be merged" >&5
++echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6
++
++# Check whether --enable-install-prefix or --disable-install-prefix was given.
++if test "${enable_install_prefix+set}" = set; then
++  enableval="$enable_install_prefix"
++  test "$enableval" != yes && enableval=no
++	if test "$enableval" != "no" ; then
++    cf_install_prefix=yes
++	else
++		cf_install_prefix=no
++	fi
++else
++  enableval=no
++	cf_install_prefix=no
++
++fi;
++echo "$as_me:5534: result: $cf_install_prefix" >&5
++echo "${ECHO_T}$cf_install_prefix" >&6
++
++if test "$cf_install_prefix" = yes ; then
++	MERGE_PREFIX=':$(prefix)%=%'
++else
++	MERGE_PREFIX=''
++fi
++
+ ###############################################################################
+ 
+ # If we're cross-compiling, allow the user to override the tools and their
+@@ -5545,7 +5572,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:5548: checking for $ac_word" >&5
++echo "$as_me:5575: 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
+@@ -5560,7 +5587,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:5563: found $ac_dir/$ac_word" >&5
++echo "$as_me:5590: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5568,10 +5595,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:5571: result: $BUILD_CC" >&5
++  echo "$as_me:5598: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:5574: result: no" >&5
++  echo "$as_me:5601: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5580,12 +5607,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+ 
+ fi;
+-	echo "$as_me:5583: checking for native build C compiler" >&5
++	echo "$as_me:5610: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:5585: result: $BUILD_CC" >&5
++	echo "$as_me:5612: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:5588: checking for native build C preprocessor" >&5
++	echo "$as_me:5615: 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.
+@@ -5595,10 +5622,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:5598: result: $BUILD_CPP" >&5
++	echo "$as_me:5625: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:5601: checking for native build C flags" >&5
++	echo "$as_me:5628: 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.
+@@ -5606,10 +5633,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:5609: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:5636: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:5612: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:5639: 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.
+@@ -5617,10 +5644,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:5620: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:5647: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:5623: checking for native build linker-flags" >&5
++	echo "$as_me:5650: 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.
+@@ -5628,10 +5655,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:5631: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:5658: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:5634: checking for native build linker-libraries" >&5
++	echo "$as_me:5661: 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.
+@@ -5639,7 +5666,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:5642: result: $BUILD_LIBS" >&5
++	echo "$as_me:5669: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -5648,7 +5675,7 @@
+ 
+ 	: ${BUILD_CC:='${CC}'}
+ 
+-	echo "$as_me:5651: checking if the build-compiler \"$BUILD_CC\" works" >&5
++	echo "$as_me:5678: checking if the build-compiler \"$BUILD_CC\" works" >&5
+ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
+ 
+ 	cf_save_crossed=$cross_compiling
+@@ -5662,7 +5689,7 @@
+   cf_ok_build_cc=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5665 "configure"
++#line 5692 "configure"
+ #include "confdefs.h"
+ #include 
+ 		int main(int argc, char *argv[])
+@@ -5672,15 +5699,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:5675: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5702: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5678: \$? = $ac_status" >&5
++  echo "$as_me:5705: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:5680: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5707: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5683: \$? = $ac_status" >&5
++  echo "$as_me:5710: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_ok_build_cc=yes
+ else
+@@ -5695,12 +5722,12 @@
+ 	cross_compiling=$cf_save_crossed
+ 	ac_link=$cf_save_ac_link
+ 
+-	echo "$as_me:5698: result: $cf_ok_build_cc" >&5
++	echo "$as_me:5725: result: $cf_ok_build_cc" >&5
+ echo "${ECHO_T}$cf_ok_build_cc" >&6
+ 
+ 	if test "$cf_ok_build_cc" != yes
+ 	then
+-		{ { echo "$as_me:5703: error: Cross-build requires two compilers.
++		{ { echo "$as_me:5730: 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;}
+@@ -5725,7 +5752,7 @@
+ ### shared, for example.
+ cf_list_models=""
+ 
+-echo "$as_me:5728: checking if libtool -version-number should be used" >&5
++echo "$as_me:5755: 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.
+@@ -5742,7 +5769,7 @@
+ 	cf_libtool_version=yes
+ 
+ fi;
+-echo "$as_me:5745: result: $cf_libtool_version" >&5
++echo "$as_me:5772: result: $cf_libtool_version" >&5
+ echo "${ECHO_T}$cf_libtool_version" >&6
+ 
+ if test "$cf_libtool_version" = yes ; then
+@@ -5751,25 +5778,25 @@
+ 	LIBTOOL_VERSION="-version-info"
+ 	case "x$VERSION" in
+ 	(x)
+-		{ echo "$as_me:5754: WARNING: VERSION was not set" >&5
++		{ echo "$as_me:5781: 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}:5761: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5788: 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}:5768: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5795: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:5772: WARNING: unexpected VERSION value: $VERSION" >&5
++		{ echo "$as_me:5799: WARNING: unexpected VERSION value: $VERSION" >&5
+ echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
+ 		;;
+ 	esac
+@@ -5791,7 +5818,7 @@
+ LIB_INSTALL=
+ LIB_UNINSTALL=
+ 
+-echo "$as_me:5794: checking if you want to build libraries with libtool" >&5
++echo "$as_me:5821: 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.
+@@ -5801,7 +5828,7 @@
+ else
+   with_libtool=no
+ fi;
+-echo "$as_me:5804: result: $with_libtool" >&5
++echo "$as_me:5831: result: $with_libtool" >&5
+ echo "${ECHO_T}$with_libtool" >&6
+ if test "$with_libtool" != "no"; then
+ 
+@@ -5830,7 +5857,7 @@
+ 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:5833: error: expected a pathname, not \"$with_libtool\"" >&5
++	{ { echo "$as_me:5860: error: expected a pathname, not \"$with_libtool\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -5843,7 +5870,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:5846: checking for $ac_word" >&5
++echo "$as_me:5873: 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
+@@ -5858,7 +5885,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:5861: found $ac_dir/$ac_word" >&5
++echo "$as_me:5888: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5866,10 +5893,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5869: result: $LIBTOOL" >&5
++  echo "$as_me:5896: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5872: result: no" >&5
++  echo "$as_me:5899: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5882,7 +5909,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:5885: checking for $ac_word" >&5
++echo "$as_me:5912: 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
+@@ -5897,7 +5924,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:5900: found $ac_dir/$ac_word" >&5
++echo "$as_me:5927: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5905,10 +5932,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:5908: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:5935: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:5911: result: no" >&5
++  echo "$as_me:5938: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5939,7 +5966,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:5942: checking for $ac_word" >&5
++echo "$as_me:5969: 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
+@@ -5954,7 +5981,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:5957: found $ac_dir/$ac_word" >&5
++echo "$as_me:5984: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5962,10 +5989,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5965: result: $LIBTOOL" >&5
++  echo "$as_me:5992: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5968: result: no" >&5
++  echo "$as_me:5995: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5978,7 +6005,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:5981: checking for $ac_word" >&5
++echo "$as_me:6008: 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
+@@ -5993,7 +6020,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:5996: found $ac_dir/$ac_word" >&5
++echo "$as_me:6023: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -6001,10 +6028,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:6004: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:6031: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:6007: result: no" >&5
++  echo "$as_me:6034: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6026,7 +6053,7 @@
+ 		fi
+ 	fi
+ 	if test -z "$LIBTOOL" ; then
+-		{ { echo "$as_me:6029: error: Cannot find libtool" >&5
++		{ { echo "$as_me:6056: error: Cannot find libtool" >&5
+ echo "$as_me: error: Cannot find libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -6042,7 +6069,7 @@
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+ then
+-	echo "$as_me:6045: checking version of $LIBTOOL" >&5
++	echo "$as_me:6072: checking version of $LIBTOOL" >&5
+ echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+@@ -6053,7 +6080,7 @@
+ fi
+ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+ 
+-	echo "$as_me:6056: result: $cf_cv_libtool_version" >&5
++	echo "$as_me:6083: result: $cf_cv_libtool_version" >&5
+ echo "${ECHO_T}$cf_cv_libtool_version" >&6
+ 
+ 	if test -n "$cf_cv_libtool_version"
+@@ -6063,19 +6090,19 @@
+ 		(*...GNU-libtool...*)
+ 			;;
+ 		(*)
+-			{ { echo "$as_me:6066: error: This is not GNU libtool" >&5
++			{ { echo "$as_me:6093: 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:6072: error: No version found for $LIBTOOL" >&5
++		{ { echo "$as_me:6099: 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:6078: error: GNU libtool has not been found" >&5
++	{ { echo "$as_me:6105: error: GNU libtool has not been found" >&5
+ echo "$as_me: error: GNU libtool has not been found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6111,7 +6138,7 @@
+ 
+ else
+ 
+-echo "$as_me:6114: checking if you want to build shared libraries" >&5
++echo "$as_me:6141: 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.
+@@ -6121,11 +6148,11 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:6124: result: $with_shared" >&5
++echo "$as_me:6151: 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:6128: checking if you want to build static libraries" >&5
++echo "$as_me:6155: 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.
+@@ -6135,11 +6162,11 @@
+ else
+   with_normal=yes
+ fi;
+-echo "$as_me:6138: result: $with_normal" >&5
++echo "$as_me:6165: 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:6142: checking if you want to build debug libraries" >&5
++echo "$as_me:6169: 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.
+@@ -6149,11 +6176,11 @@
+ else
+   with_debug=yes
+ fi;
+-echo "$as_me:6152: result: $with_debug" >&5
++echo "$as_me:6179: 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:6156: checking if you want to build profiling libraries" >&5
++echo "$as_me:6183: 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.
+@@ -6163,7 +6190,7 @@
+ else
+   with_profile=no
+ fi;
+-echo "$as_me:6166: result: $with_profile" >&5
++echo "$as_me:6193: result: $with_profile" >&5
+ echo "${ECHO_T}$with_profile" >&6
+ test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
+ 
+@@ -6171,7 +6198,7 @@
+ 
+ if test "X$cf_with_cxx_binding" != Xno; then
+ if test "x$with_shared" = "xyes"; then
+-echo "$as_me:6174: checking if you want to build C++ shared libraries" >&5
++echo "$as_me:6201: 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.
+@@ -6181,26 +6208,26 @@
+ else
+   with_shared_cxx=no
+ fi;
+-echo "$as_me:6184: result: $with_shared_cxx" >&5
++echo "$as_me:6211: result: $with_shared_cxx" >&5
+ echo "${ECHO_T}$with_shared_cxx" >&6
+ fi
+ fi
+ 
+ ###############################################################################
+ 
+-echo "$as_me:6191: checking for specified models" >&5
++echo "$as_me:6218: 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:6195: result: $cf_list_models" >&5
++echo "$as_me:6222: 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:6200: checking for default model" >&5
++echo "$as_me:6227: 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:6203: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:6230: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+ 
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+@@ -6214,7 +6241,7 @@
+ LIB_DIR=../lib
+ LIB_2ND=../../lib
+ 
+-echo "$as_me:6217: checking if you want to have a library-prefix" >&5
++echo "$as_me:6244: 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.
+@@ -6224,7 +6251,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:6227: result: $with_lib_prefix" >&5
++echo "$as_me:6254: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test "$with_lib_prefix" = auto
+@@ -6255,24 +6282,24 @@
+ 
+ LIB_SUFFIX=
+ 
+-	echo "$as_me:6258: checking for PATH separator" >&5
++	echo "$as_me:6285: 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:6265: result: $PATH_SEPARATOR" >&5
++	echo "$as_me:6292: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+ 
+ # headers needed for checks...
+-echo "$as_me:6269: checking for ANSI C header files" >&5
++echo "$as_me:6296: 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 6275 "configure"
++#line 6302 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -6280,13 +6307,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:6283: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:6310: \"$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:6289: \$? = $ac_status" >&5
++  echo "$as_me:6316: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6308,7 +6335,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 6311 "configure"
++#line 6338 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6326,7 +6353,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 6329 "configure"
++#line 6356 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6347,7 +6374,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6350 "configure"
++#line 6377 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -6373,15 +6400,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6376: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6403: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6379: \$? = $ac_status" >&5
++  echo "$as_me:6406: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:6381: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6408: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6384: \$? = $ac_status" >&5
++  echo "$as_me:6411: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6394,7 +6421,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:6397: result: $ac_cv_header_stdc" >&5
++echo "$as_me:6424: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -6410,28 +6437,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6413: checking for $ac_header" >&5
++echo "$as_me:6440: 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 6419 "configure"
++#line 6446 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6425: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6452: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6428: \$? = $ac_status" >&5
++  echo "$as_me:6455: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6431: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6458: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6434: \$? = $ac_status" >&5
++  echo "$as_me:6461: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -6441,7 +6468,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6444: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6471: 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:6481: checking whether exit is declared" >&5
+ echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
+ if test "${ac_cv_have_decl_exit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6460 "configure"
++#line 6487 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -6472,16 +6499,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6475: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6502: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6478: \$? = $ac_status" >&5
++  echo "$as_me:6505: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6481: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6508: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6484: \$? = $ac_status" >&5
++  echo "$as_me:6511: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_have_decl_exit=yes
+ else
+@@ -6491,19 +6518,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6494: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:6521: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+ 
+ 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:6500: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:6527: 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 6506 "configure"
++#line 6533 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -6518,16 +6545,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6521: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6548: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6524: \$? = $ac_status" >&5
++  echo "$as_me:6551: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6527: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6554: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6530: \$? = $ac_status" >&5
++  echo "$as_me:6557: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -6537,7 +6564,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6540: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6567: 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:6580: 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
+@@ -6558,7 +6585,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6561 "configure"
++#line 6588 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6577,16 +6604,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6580: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6607: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6583: \$? = $ac_status" >&5
++  echo "$as_me:6610: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6586: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6613: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6589: \$? = $ac_status" >&5
++  echo "$as_me:6616: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -6597,14 +6624,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6600: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:6627: 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:6607: checking for opendir in -lx" >&5
++  echo "$as_me:6634: 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
+@@ -6612,7 +6639,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6615 "configure"
++#line 6642 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6631,16 +6658,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6634: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6661: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6637: \$? = $ac_status" >&5
++  echo "$as_me:6664: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6640: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6667: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6643: \$? = $ac_status" >&5
++  echo "$as_me:6670: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -6651,7 +6678,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6654: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:6681: 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"
+@@ -6661,7 +6688,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:6664: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:6691: 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.
+@@ -6671,10 +6698,10 @@
+ else
+   with_termlib=no
+ fi;
+-echo "$as_me:6674: result: $with_termlib" >&5
++echo "$as_me:6701: result: $with_termlib" >&5
+ echo "${ECHO_T}$with_termlib" >&6
+ 
+-echo "$as_me:6677: checking if you want to build a separate tic library" >&5
++echo "$as_me:6704: 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.
+@@ -6684,7 +6711,7 @@
+ else
+   with_ticlib=no
+ fi;
+-echo "$as_me:6687: result: $with_ticlib" >&5
++echo "$as_me:6714: result: $with_ticlib" >&5
+ echo "${ECHO_T}$with_ticlib" >&6
+ 
+ if test X"$CC_G_OPT" = X"" ; then
+@@ -6697,7 +6724,7 @@
+ 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
+ fi
+ 
+-echo "$as_me:6700: checking for default loader flags" >&5
++echo "$as_me:6727: 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=''   ;;
+@@ -6706,13 +6733,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:6709: result: ${LD_MODEL:-(none)}" >&5
++echo "$as_me:6736: result: ${LD_MODEL:-(none)}" >&5
+ echo "${ECHO_T}${LD_MODEL:-(none)}" >&6
+ 
+ case "$DFT_LWR_MODEL" in
+ (shared)
+ 
+-echo "$as_me:6715: checking if rpath option should be used" >&5
++echo "$as_me:6742: 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.
+@@ -6722,10 +6749,10 @@
+ else
+   cf_cv_enable_rpath=no
+ fi;
+-echo "$as_me:6725: result: $cf_cv_enable_rpath" >&5
++echo "$as_me:6752: result: $cf_cv_enable_rpath" >&5
+ echo "${ECHO_T}$cf_cv_enable_rpath" >&6
+ 
+-echo "$as_me:6728: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:6755: 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.
+@@ -6735,7 +6762,7 @@
+ else
+   cf_cv_do_relink=yes
+ fi;
+-echo "$as_me:6738: result: $cf_cv_do_relink" >&5
++echo "$as_me:6765: result: $cf_cv_do_relink" >&5
+ echo "${ECHO_T}$cf_cv_do_relink" >&6
+ 	;;
+ esac
+@@ -6746,7 +6773,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:6749: checking for an rpath option" >&5
++	echo "$as_me:6776: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -6777,12 +6804,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:6780: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:6807: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:6785: checking if we need a space after rpath option" >&5
++		echo "$as_me:6812: 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"
+ 
+@@ -6803,7 +6830,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6806 "configure"
++#line 6833 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -6815,16 +6842,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6818: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6845: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6821: \$? = $ac_status" >&5
++  echo "$as_me:6848: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6824: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6851: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6827: \$? = $ac_status" >&5
++  echo "$as_me:6854: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -6834,7 +6861,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:6837: result: $cf_rpath_space" >&5
++		echo "$as_me:6864: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -6856,7 +6883,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:6859: checking whether to use release or ABI version in shared library file names" >&5
++	echo "$as_me:6886: checking whether to use release or ABI version in shared library file names" >&5
+ echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
+ 
+ # Check whether --with-shlib-version or --without-shlib-version was given.
+@@ -6871,9 +6898,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:6874: result: $withval" >&5
++		echo "$as_me:6901: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:6876: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:6903: 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; }; }
+ 		;;
+@@ -6882,7 +6909,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:6885: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:6912: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -6905,14 +6932,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:6908: checking which $CC option to use" >&5
++		echo "$as_me:6935: 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 6915 "configure"
++#line 6942 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6924,16 +6951,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6927: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6954: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6930: \$? = $ac_status" >&5
++  echo "$as_me:6957: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6933: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6960: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6936: \$? = $ac_status" >&5
++  echo "$as_me:6963: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -6942,7 +6969,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		done
+-		echo "$as_me:6945: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:6972: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -7013,7 +7040,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:7016: checking if ld -search_paths_first works" >&5
++		echo "$as_me:7043: 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
+@@ -7022,7 +7049,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7025 "configure"
++#line 7052 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -7034,16 +7061,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7037: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7064: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7040: \$? = $ac_status" >&5
++  echo "$as_me:7067: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7043: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7070: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7046: \$? = $ac_status" >&5
++  echo "$as_me:7073: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -7054,7 +7081,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:7057: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:7084: 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"
+@@ -7404,7 +7431,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7407 "configure"
++#line 7434 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7416,16 +7443,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7419: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7446: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7422: \$? = $ac_status" >&5
++  echo "$as_me:7449: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7425: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7452: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7428: \$? = $ac_status" >&5
++  echo "$as_me:7455: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -7462,7 +7489,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:7465: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:7492: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -7472,7 +7499,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <
+ int main(int argc, char *argv[])
+ {
+@@ -7484,18 +7511,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:7487: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:7514: 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:7489: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:7516: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7492: \$? = $ac_status" >&5
++  echo "$as_me:7519: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-				echo "$as_me:7494: result: yes" >&5
++				echo "$as_me:7521: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:7498: result: no" >&5
++				echo "$as_me:7525: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -7510,17 +7537,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:7513: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:7540: 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}:7517: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7544: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ for model in $cf_list_models ; do
+ 	case "$model" in
+ 	(libtool)
+ 
+-echo "$as_me:7523: checking for additional libtool options" >&5
++echo "$as_me:7550: 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.
+@@ -7530,7 +7557,7 @@
+ else
+   with_libtool_opts=no
+ fi;
+-echo "$as_me:7533: result: $with_libtool_opts" >&5
++echo "$as_me:7560: result: $with_libtool_opts" >&5
+ echo "${ECHO_T}$with_libtool_opts" >&6
+ 
+ case .$with_libtool_opts in
+@@ -7541,7 +7568,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:7544: checking if exported-symbols file should be used" >&5
++echo "$as_me:7571: 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.
+@@ -7556,7 +7583,7 @@
+ 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
+ 
+ fi
+-echo "$as_me:7559: result: $with_export_syms" >&5
++echo "$as_me:7586: result: $with_export_syms" >&5
+ echo "${ECHO_T}$with_export_syms" >&6
+ if test "x$with_export_syms" != xno
+ then
+@@ -7567,15 +7594,15 @@
+ 		;;
+ 	(shared)
+ 		if test "$CC_SHARED_OPTS" = "unknown"; then
+-			{ { echo "$as_me:7570: error: Shared libraries are not supported in this version" >&5
++			{ { echo "$as_me:7597: 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:7575: checking if current CFLAGS link properly" >&5
++		echo "$as_me:7602: 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 7578 "configure"
++#line 7605 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7587,16 +7614,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7590: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7617: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7593: \$? = $ac_status" >&5
++  echo "$as_me:7620: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7596: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7623: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7599: \$? = $ac_status" >&5
++  echo "$as_me:7626: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cflags_work=yes
+ else
+@@ -7605,18 +7632,18 @@
+ cf_cflags_work=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:7608: result: $cf_cflags_work" >&5
++		echo "$as_me:7635: 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}:7614: testing try to work around by appending shared-options ..." 1>&5
++echo "${as_me:-configure}:7641: testing try to work around by appending shared-options ..." 1>&5
+ 
+ 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
+ 		fi
+ 
+-echo "$as_me:7619: checking if versioned-symbols file should be used" >&5
++echo "$as_me:7646: 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.
+@@ -7634,18 +7661,18 @@
+ (xno)
+ 	;;
+ (x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+-	test -f "$with_versioned_syms" || { { echo "$as_me:7637: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:7664: 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:7642: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:7669: 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:7648: result: $with_versioned_syms" >&5
++echo "$as_me:7675: result: $with_versioned_syms" >&5
+ echo "${ECHO_T}$with_versioned_syms" >&6
+ 
+ RESULTING_SYMS=
+@@ -7661,7 +7688,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}:7664: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7691: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*-dy\ *)
+@@ -7669,11 +7696,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}:7672: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7699: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:7676: WARNING: this system does not support versioned-symbols" >&5
++		{ echo "$as_me:7703: WARNING: this system does not support versioned-symbols" >&5
+ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
+ 		;;
+ 	esac
+@@ -7685,7 +7712,7 @@
+ 	# symbols.
+ 	if test "x$VERSIONED_SYMS" != "x"
+ 	then
+-		echo "$as_me:7688: checking if wildcards can be used to selectively omit symbols" >&5
++		echo "$as_me:7715: 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
+ 
+@@ -7722,7 +7749,7 @@
+ } submodule_1.0;
+ EOF
+ 		cat >conftest.$ac_ext <&5
++		echo "$as_me:7783: result: $WILDCARD_SYMS" >&5
+ echo "${ECHO_T}$WILDCARD_SYMS" >&6
+ 		rm -f conftest.*
+ 	fi
+@@ -7766,7 +7793,7 @@
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+ 
+-echo "$as_me:7769: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:7796: 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.
+@@ -7776,27 +7803,27 @@
+ else
+   with_gpm=maybe
+ fi;
+-echo "$as_me:7779: result: $with_gpm" >&5
++echo "$as_me:7806: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7783: checking for gpm.h" >&5
++	echo "$as_me:7810: 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 7789 "configure"
++#line 7816 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:7793: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7820: \"$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:7799: \$? = $ac_status" >&5
++  echo "$as_me:7826: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7815,7 +7842,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7818: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:7845: 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
+ 
+@@ -7826,7 +7853,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}:7829: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:7856: testing assuming we really have GPM library ..." 1>&5
+ 
+ cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+@@ -7834,7 +7861,7 @@
+ 
+ 			with_gpm=yes
+ 		else
+-			echo "$as_me:7837: checking for Gpm_Open in -lgpm" >&5
++			echo "$as_me:7864: 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
+@@ -7842,7 +7869,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7845 "configure"
++#line 7872 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7861,16 +7888,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7864: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7891: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7867: \$? = $ac_status" >&5
++  echo "$as_me:7894: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7870: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7897: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7873: \$? = $ac_status" >&5
++  echo "$as_me:7900: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -7881,18 +7908,18 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7884: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:7911: 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:7891: WARNING: Cannot link with GPM library" >&5
++					{ echo "$as_me:7918: WARNING: Cannot link with GPM library" >&5
+ echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
+ 					with_gpm=no
+ 				else
+-					{ { echo "$as_me:7895: error: Cannot link with GPM library" >&5
++					{ { echo "$as_me:7922: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+    { (exit 1); exit 1; }; }
+ 				fi
+@@ -7903,7 +7930,7 @@
+ 
+ else
+ 
+-		test "$with_gpm" != maybe && { echo "$as_me:7906: WARNING: Cannot find GPM header" >&5
++		test "$with_gpm" != maybe && { echo "$as_me:7933: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ 		with_gpm=no
+ 
+@@ -7912,7 +7939,7 @@
+ fi
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7915: checking if you want to load GPM dynamically" >&5
++	echo "$as_me:7942: 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.
+@@ -7922,18 +7949,18 @@
+ else
+   with_dlsym=yes
+ fi;
+-	echo "$as_me:7925: result: $with_dlsym" >&5
++	echo "$as_me:7952: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ 	if test "x$with_dlsym" = xyes ; then
+ 
+ cf_have_dlsym=no
+-echo "$as_me:7930: checking for dlsym" >&5
++echo "$as_me:7957: 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 7936 "configure"
++#line 7963 "configure"
+ #include "confdefs.h"
+ #define dlsym autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7964,16 +7991,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7967: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7994: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7970: \$? = $ac_status" >&5
++  echo "$as_me:7997: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7973: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8000: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7976: \$? = $ac_status" >&5
++  echo "$as_me:8003: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_dlsym=yes
+ else
+@@ -7983,14 +8010,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7986: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:8013: 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:7993: checking for dlsym in -ldl" >&5
++echo "$as_me:8020: 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
+@@ -7998,7 +8025,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8001 "configure"
++#line 8028 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8017,16 +8044,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8020: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8047: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8023: \$? = $ac_status" >&5
++  echo "$as_me:8050: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8026: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8053: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8029: \$? = $ac_status" >&5
++  echo "$as_me:8056: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dl_dlsym=yes
+ else
+@@ -8037,7 +8064,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8040: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:8067: 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
+ 
+@@ -8066,10 +8093,10 @@
+ LIBS="$cf_add_libs"
+  }
+ 
+-	echo "$as_me:8069: checking whether able to link to dl*() functions" >&5
++	echo "$as_me:8096: 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 8072 "configure"
++#line 8099 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8087,16 +8114,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8090: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8117: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8093: \$? = $ac_status" >&5
++  echo "$as_me:8120: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8096: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8123: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8099: \$? = $ac_status" >&5
++  echo "$as_me:8126: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ cat >>confdefs.h <<\EOF
+@@ -8107,15 +8134,15 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-		{ { echo "$as_me:8110: error: Cannot link test program for libdl" >&5
++		{ { echo "$as_me:8137: 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:8115: result: ok" >&5
++	echo "$as_me:8142: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+-	{ { echo "$as_me:8118: error: Cannot find dlsym function" >&5
++	{ { echo "$as_me:8145: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8123,12 +8150,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}:8126: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:8153: testing assuming soname for gpm is $with_gpm ..." 1>&5
+ 
+ 			cf_cv_gpm_soname="$with_gpm"
+ 		else
+ 
+-echo "$as_me:8131: checking for soname of gpm library" >&5
++echo "$as_me:8158: 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
+@@ -8162,15 +8189,15 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-	if { (eval echo "$as_me:8165: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:8192: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8168: \$? = $ac_status" >&5
++  echo "$as_me:8195: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:8170: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:8197: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8173: \$? = $ac_status" >&5
++  echo "$as_me:8200: \$? = $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
+@@ -8181,7 +8208,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:8184: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:8211: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+ 
+ 		fi
+@@ -8249,7 +8276,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+ 
+-echo "$as_me:8252: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:8279: 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
+@@ -8257,7 +8284,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8260 "configure"
++#line 8287 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8276,16 +8303,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8279: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8306: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8282: \$? = $ac_status" >&5
++  echo "$as_me:8309: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8285: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8312: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8288: \$? = $ac_status" >&5
++  echo "$as_me:8315: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -8296,11 +8323,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8299: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:8326: 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:8303: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:8330: 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
+@@ -8324,15 +8351,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:8327: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:8354: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8330: \$? = $ac_status" >&5
++  echo "$as_me:8357: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:8332: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:8359: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8335: \$? = $ac_status" >&5
++  echo "$as_me:8362: \$? = $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
+@@ -8344,11 +8371,11 @@
+ fi
+ 
+ fi
+-echo "$as_me:8347: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:8374: 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:8351: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++	{ echo "$as_me:8378: 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
+ 
+@@ -8356,7 +8383,7 @@
+ 
+ fi
+ 
+-echo "$as_me:8359: checking if you want to use PCRE2 for regular-expressions" >&5
++echo "$as_me:8386: 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.
+@@ -8365,7 +8392,7 @@
+ 
+ fi;
+ test -z "$with_pcre2" && with_pcre2=no
+-echo "$as_me:8368: result: $with_pcre2" >&5
++echo "$as_me:8395: result: $with_pcre2" >&5
+ echo "${ECHO_T}$with_pcre2" >&6
+ 
+ if test "x$with_pcre2" != xno ; then
+@@ -8376,17 +8403,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}:8379: testing found package $cf_with_pcre2 ..." 1>&5
++echo "${as_me:-configure}:8406: 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}:8385: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:8412: 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}:8389: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:8416: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -8510,7 +8537,7 @@
+ fi
+ 
+ 	done
+-	cf_with_pcre2_ok=yes || { { echo "$as_me:8513: error: Cannot find PCRE2 library" >&5
++	cf_with_pcre2_ok=yes || { { echo "$as_me:8540: error: Cannot find PCRE2 library" >&5
+ echo "$as_me: error: Cannot find PCRE2 library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -8523,7 +8550,7 @@
+ 	(*pcre2-posix*|*pcreposix*)
+ 		;;
+ 	(*)
+-		echo "$as_me:8526: checking for regcomp in -lpcre2-posix" >&5
++		echo "$as_me:8553: 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
+@@ -8531,7 +8558,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcre2-posix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8534 "configure"
++#line 8561 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8550,16 +8577,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8553: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8580: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8556: \$? = $ac_status" >&5
++  echo "$as_me:8583: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8559: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8586: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8562: \$? = $ac_status" >&5
++  echo "$as_me:8589: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcre2_posix_regcomp=yes
+ else
+@@ -8570,7 +8597,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8573: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
++echo "$as_me:8600: 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
+ 
+@@ -8591,7 +8618,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  echo "$as_me:8594: checking for regcomp in -lpcreposix" >&5
++  echo "$as_me:8621: 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
+@@ -8599,7 +8626,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcreposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8602 "configure"
++#line 8629 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8618,16 +8645,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8621: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8648: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8624: \$? = $ac_status" >&5
++  echo "$as_me:8651: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8627: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8654: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8630: \$? = $ac_status" >&5
++  echo "$as_me:8657: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcreposix_regcomp=yes
+ else
+@@ -8638,7 +8665,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8641: result: $ac_cv_lib_pcreposix_regcomp" >&5
++echo "$as_me:8668: 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
+ 
+@@ -8659,7 +8686,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  { { echo "$as_me:8662: error: Cannot find PCRE2 POSIX library" >&5
++  { { echo "$as_me:8689: error: Cannot find PCRE2 POSIX library" >&5
+ echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8674,23 +8701,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:8677: checking for $ac_header" >&5
++echo "$as_me:8704: 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 8683 "configure"
++#line 8710 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8687: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8714: \"$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:8693: \$? = $ac_status" >&5
++  echo "$as_me:8720: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8709,7 +8736,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8712: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8739: 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:8752: 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 8731 "configure"
++#line 8758 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -8759,16 +8786,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8762: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8789: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8765: \$? = $ac_status" >&5
++  echo "$as_me:8792: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8768: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8795: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8771: \$? = $ac_status" >&5
++  echo "$as_me:8798: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -8778,7 +8805,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8781: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:8808: 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:8795: checking if you want to use sysmouse" >&5
++echo "$as_me:8822: 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.
+@@ -8804,7 +8831,7 @@
+ fi;
+ 	if test "$cf_with_sysmouse" != no ; then
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8807 "configure"
++#line 8834 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8827,16 +8854,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8830: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8857: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8833: \$? = $ac_status" >&5
++  echo "$as_me:8860: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8836: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8863: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8839: \$? = $ac_status" >&5
++  echo "$as_me:8866: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_with_sysmouse=yes
+ else
+@@ -8846,7 +8873,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	fi
+-echo "$as_me:8849: result: $cf_with_sysmouse" >&5
++echo "$as_me:8876: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -8856,7 +8883,7 @@
+ fi
+ 
+ # pretend that ncurses==ncursesw==ncursest
+-echo "$as_me:8859: checking if you want to disable library suffixes" >&5
++echo "$as_me:8886: 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.
+@@ -8873,13 +8900,13 @@
+ 	disable_lib_suffixes=no
+ 
+ fi;
+-echo "$as_me:8876: result: $disable_lib_suffixes" >&5
++echo "$as_me:8903: 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:8882: checking if rpath-hack should be disabled" >&5
++echo "$as_me:8909: 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.
+@@ -8897,22 +8924,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:8900: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:8927: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:8905: checking for updated LDFLAGS" >&5
++echo "$as_me:8932: 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:8908: result: maybe" >&5
++	echo "$as_me:8935: 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:8915: checking for $ac_word" >&5
++echo "$as_me:8942: 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
+@@ -8927,7 +8954,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:8930: found $ac_dir/$ac_word" >&5
++echo "$as_me:8957: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8935,10 +8962,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:8938: result: $cf_ldd_prog" >&5
++  echo "$as_me:8965: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:8941: result: no" >&5
++  echo "$as_me:8968: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8952,7 +8979,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8955 "configure"
++#line 8982 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8964,16 +8991,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8967: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8994: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8970: \$? = $ac_status" >&5
++  echo "$as_me:8997: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8973: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9000: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8976: \$? = $ac_status" >&5
++  echo "$as_me:9003: \$? = $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`
+@@ -9001,7 +9028,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:9004: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:9031: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -9013,11 +9040,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9016: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9043: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9020: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9047: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -9054,7 +9081,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:9057: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9084: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -9067,11 +9094,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9070: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9097: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:9074: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9101: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -9108,7 +9135,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:9111: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9138: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -9121,14 +9148,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:9124: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9151: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9128: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9155: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:9131: result: no" >&5
++	echo "$as_me:9158: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9142,7 +9169,7 @@
+ EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
+ if test -n "$EXTRA_PKG_LDFLAGS"
+ then
+-	echo "$as_me:9145: checking if you want to disable extra LDFLAGS for package-scripts" >&5
++	echo "$as_me:9172: 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.
+@@ -9159,7 +9186,7 @@
+ 	disable_pkg_ldflags=no
+ 
+ fi;
+-	echo "$as_me:9162: result: $disable_pkg_ldflags" >&5
++	echo "$as_me:9189: result: $disable_pkg_ldflags" >&5
+ echo "${ECHO_T}$disable_pkg_ldflags" >&6
+ 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
+ fi
+@@ -9167,7 +9194,7 @@
+ ###############################################################################
+ 
+ ###	use option --with-extra-suffix to append suffix to headers and libraries
+-echo "$as_me:9170: checking for extra suffix to append to header/library paths" >&5
++echo "$as_me:9197: checking for extra suffix to append to header/library paths" >&5
+ echo $ECHO_N "checking for extra suffix to append to header/library paths... $ECHO_C" >&6
+ EXTRA_SUFFIX=
+ 
+@@ -9186,11 +9213,11 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:9189: result: ${EXTRA_SUFFIX:-(none)}" >&5
++echo "$as_me:9216: result: ${EXTRA_SUFFIX:-(none)}" >&5
+ echo "${ECHO_T}${EXTRA_SUFFIX:-(none)}" >&6
+ 
+ ###	use option --disable-overwrite to leave out the link to -lcurses
+-echo "$as_me:9193: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:9220: 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.
+@@ -9200,10 +9227,10 @@
+ else
+   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:9203: result: $with_overwrite" >&5
++echo "$as_me:9230: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+ 
+-echo "$as_me:9206: checking if external terminfo-database is used" >&5
++echo "$as_me:9233: 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.
+@@ -9213,7 +9240,7 @@
+ else
+   use_database=yes
+ fi;
+-echo "$as_me:9216: result: $use_database" >&5
++echo "$as_me:9243: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+ 
+ case "$host_os" in
+@@ -9229,7 +9256,7 @@
+ if test "$use_database" != no ; then
+ 	NCURSES_USE_DATABASE=1
+ 
+-	echo "$as_me:9232: checking which terminfo source-file will be installed" >&5
++	echo "$as_me:9259: 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.
+@@ -9237,10 +9264,10 @@
+   withval="$with_database"
+   TERMINFO_SRC=$withval
+ fi;
+-	echo "$as_me:9240: result: $TERMINFO_SRC" >&5
++	echo "$as_me:9267: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+ 
+-	echo "$as_me:9243: checking whether to use hashed database instead of directory/tree" >&5
++	echo "$as_me:9270: 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.
+@@ -9250,13 +9277,13 @@
+ else
+   with_hashed_db=no
+ fi;
+-	echo "$as_me:9253: result: $with_hashed_db" >&5
++	echo "$as_me:9280: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ 	with_hashed_db=no
+ fi
+ 
+-echo "$as_me:9259: checking for list of fallback terminal descriptions" >&5
++echo "$as_me:9286: checking for list of fallback terminal descriptions" >&5
+ echo $ECHO_N "checking for list of fallback terminal descriptions... $ECHO_C" >&6
+ 
+ # Check whether --with-fallbacks or --without-fallbacks was given.
+@@ -9266,7 +9293,7 @@
+ else
+   with_fallback=
+ fi;
+-echo "$as_me:9269: result: ${with_fallback:-(none)}" >&5
++echo "$as_me:9296: result: ${with_fallback:-(none)}" >&5
+ echo "${ECHO_T}${with_fallback:-(none)}" >&6
+ 
+ case ".$with_fallback" in
+@@ -9274,7 +9301,7 @@
+ 	FALLBACK_LIST=
+ 	;;
+ (.yes)
+-	{ echo "$as_me:9277: WARNING: expected a list of terminal descriptions" >&5
++	{ echo "$as_me:9304: WARNING: expected a list of terminal descriptions" >&5
+ echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
+ 	;;
+ (*)
+@@ -9290,7 +9317,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:9293: checking for $ac_word" >&5
++echo "$as_me:9320: 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
+@@ -9305,7 +9332,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:9308: found $ac_dir/$ac_word" >&5
++echo "$as_me:9335: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9313,10 +9340,10 @@
+ fi
+ TIC=$ac_cv_prog_TIC
+ if test -n "$TIC"; then
+-  echo "$as_me:9316: result: $TIC" >&5
++  echo "$as_me:9343: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:9319: result: no" >&5
++  echo "$as_me:9346: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9325,7 +9352,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:9328: checking for $ac_word" >&5
++echo "$as_me:9355: 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
+@@ -9340,7 +9367,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:9343: found $ac_dir/$ac_word" >&5
++echo "$as_me:9370: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9348,10 +9375,10 @@
+ fi
+ ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
+ if test -n "$ac_ct_TIC"; then
+-  echo "$as_me:9351: result: $ac_ct_TIC" >&5
++  echo "$as_me:9378: result: $ac_ct_TIC" >&5
+ echo "${ECHO_T}$ac_ct_TIC" >&6
+ else
+-  echo "$as_me:9354: result: no" >&5
++  echo "$as_me:9381: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9363,7 +9390,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:9366: checking for $ac_word" >&5
++echo "$as_me:9393: 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
+@@ -9378,7 +9405,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:9381: found $ac_dir/$ac_word" >&5
++echo "$as_me:9408: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9386,10 +9413,10 @@
+ fi
+ INFOCMP=$ac_cv_prog_INFOCMP
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:9389: result: $INFOCMP" >&5
++  echo "$as_me:9416: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:9392: result: no" >&5
++  echo "$as_me:9419: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9398,7 +9425,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:9401: checking for $ac_word" >&5
++echo "$as_me:9428: 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
+@@ -9413,7 +9440,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:9416: found $ac_dir/$ac_word" >&5
++echo "$as_me:9443: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9421,10 +9448,10 @@
+ fi
+ ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
+ if test -n "$ac_ct_INFOCMP"; then
+-  echo "$as_me:9424: result: $ac_ct_INFOCMP" >&5
++  echo "$as_me:9451: result: $ac_ct_INFOCMP" >&5
+ echo "${ECHO_T}$ac_ct_INFOCMP" >&6
+ else
+-  echo "$as_me:9427: result: no" >&5
++  echo "$as_me:9454: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9439,10 +9466,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:9442: checking for tic program for fallbacks" >&5
++  echo "$as_me:9469: checking for tic program for fallbacks" >&5
+ echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
+ 		TIC=$withval
+-		echo "$as_me:9445: result: $TIC" >&5
++		echo "$as_me:9472: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -9468,7 +9495,7 @@
+ 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9471: error: expected a pathname, not \"$TIC\"" >&5
++	{ { echo "$as_me:9498: error: expected a pathname, not \"$TIC\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9481,7 +9508,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:9484: checking for $ac_word" >&5
++echo "$as_me:9511: 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
+@@ -9498,7 +9525,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:9501: found $ac_dir/$ac_word" >&5
++   echo "$as_me:9528: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -9509,10 +9536,10 @@
+ TIC=$ac_cv_path_TIC
+ 
+ if test -n "$TIC"; then
+-  echo "$as_me:9512: result: $TIC" >&5
++  echo "$as_me:9539: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:9515: result: no" >&5
++  echo "$as_me:9542: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9569,7 +9596,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:9572: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9599: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:9614: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -9593,10 +9620,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:9596: checking for infocmp program for fallbacks" >&5
++  echo "$as_me:9623: checking for infocmp program for fallbacks" >&5
+ echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
+ 		INFOCMP=$withval
+-		echo "$as_me:9599: result: $INFOCMP" >&5
++		echo "$as_me:9626: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -9622,7 +9649,7 @@
+ 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9625: error: expected a pathname, not \"$INFOCMP\"" >&5
++	{ { echo "$as_me:9652: error: expected a pathname, not \"$INFOCMP\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9635,7 +9662,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:9638: checking for $ac_word" >&5
++echo "$as_me:9665: 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
+@@ -9652,7 +9679,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:9655: found $ac_dir/$ac_word" >&5
++   echo "$as_me:9682: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -9663,10 +9690,10 @@
+ INFOCMP=$ac_cv_path_INFOCMP
+ 
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:9666: result: $INFOCMP" >&5
++  echo "$as_me:9693: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:9669: result: no" >&5
++  echo "$as_me:9696: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9723,7 +9750,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:9726: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9753: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:9768: WARNING: no infocmp program found for fallbacks" >&5
+ echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -9748,7 +9775,7 @@
+ 	test -z "$INFOCMP" && FALLBACK_LIST=
+ 	if test -z "$FALLBACK_LIST"
+ 	then
+-		{ echo "$as_me:9751: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
++		{ echo "$as_me:9778: 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
+@@ -9756,7 +9783,7 @@
+ USE_FALLBACKS=
+ test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
+ 
+-echo "$as_me:9759: checking if you want modern xterm or antique" >&5
++echo "$as_me:9786: 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.
+@@ -9770,7 +9797,7 @@
+ (no) with_xterm_new=xterm-old;;
+ (*)	 with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:9773: result: $with_xterm_new" >&5
++echo "$as_me:9800: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+ 
+@@ -9783,7 +9810,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9786: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:9813: 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.
+@@ -9807,13 +9834,13 @@
+ 	with_xterm_kbs=$withval
+ 	;;
+ esac
+-echo "$as_me:9810: result: $with_xterm_kbs" >&5
++echo "$as_me:9837: result: $with_xterm_kbs" >&5
+ echo "${ECHO_T}$with_xterm_kbs" >&6
+ XTERM_KBS=$with_xterm_kbs
+ 
+ if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
+ then
+-	{ echo "$as_me:9816: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
++	{ echo "$as_me:9843: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
+ echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;}
+ fi
+ 
+@@ -9823,7 +9850,7 @@
+ 	MAKE_TERMINFO="#"
+ else
+ 
+-echo "$as_me:9826: checking for list of terminfo directories" >&5
++echo "$as_me:9853: 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.
+@@ -9861,7 +9888,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9864: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:9891: 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; }; }
+ 	;;
+@@ -9884,7 +9911,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9887: result: $TERMINFO_DIRS" >&5
++echo "$as_me:9914: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <&5
++	{ echo "$as_me:9923: 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:9902: checking for default terminfo directory" >&5
++echo "$as_me:9929: 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.
+@@ -9933,7 +9960,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9936: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:9963: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9942,7 +9969,7 @@
+ fi
+ eval TERMINFO="$withval"
+ 
+-echo "$as_me:9945: result: $TERMINFO" >&5
++echo "$as_me:9972: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:9983: 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.
+@@ -9965,7 +9992,7 @@
+   with_big_core=no
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9968 "configure"
++#line 9995 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -9979,15 +10006,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9982: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10009: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9985: \$? = $ac_status" >&5
++  echo "$as_me:10012: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9987: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10014: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9990: \$? = $ac_status" >&5
++  echo "$as_me:10017: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_big_core=yes
+ else
+@@ -9999,7 +10026,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi;
+-echo "$as_me:10002: result: $with_big_core" >&5
++echo "$as_me:10029: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10009,7 +10036,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:10012: checking if big-strings option selected" >&5
++echo "$as_me:10039: 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.
+@@ -10033,14 +10060,14 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:10036: result: $with_big_strings" >&5
++echo "$as_me:10063: 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:10043: checking if you want termcap-fallback support" >&5
++echo "$as_me:10070: 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.
+@@ -10050,14 +10077,14 @@
+ else
+   with_termcap=no
+ fi;
+-echo "$as_me:10053: result: $with_termcap" >&5
++echo "$as_me:10080: 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:10060: error: You have disabled the database w/o specifying fallbacks" >&5
++			{ { echo "$as_me:10087: 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
+@@ -10070,13 +10097,13 @@
+ else
+ 
+ 	if test "$with_ticlib" != no ; then
+-		{ { echo "$as_me:10073: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++		{ { echo "$as_me:10100: 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:10079: checking for list of termcap files" >&5
++	echo "$as_me:10106: 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.
+@@ -10114,7 +10141,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:10117: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:10144: 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; }; }
+ 	;;
+@@ -10137,7 +10164,7 @@
+ 	;;
+ esac
+ 
+-	echo "$as_me:10140: result: $TERMPATH" >&5
++	echo "$as_me:10167: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ 	test -n "$TERMPATH" &&
+ cat >>confdefs.h <&5
++	echo "$as_me:10175: 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.
+@@ -10155,14 +10182,14 @@
+ else
+   with_getcap=no
+ fi;
+-	echo "$as_me:10158: result: $with_getcap" >&5
++	echo "$as_me:10185: 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:10165: checking if translated termcaps will be cached in ~/.terminfo" >&5
++	echo "$as_me:10192: 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.
+@@ -10172,7 +10199,7 @@
+ else
+   with_getcap_cache=no
+ fi;
+-	echo "$as_me:10175: result: $with_getcap_cache" >&5
++	echo "$as_me:10202: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ 	test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10182,7 +10209,7 @@
+ fi
+ 
+ ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:10185: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:10212: 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.
+@@ -10192,14 +10219,14 @@
+ else
+   with_home_terminfo=yes
+ fi;
+-echo "$as_me:10195: result: $with_home_terminfo" >&5
++echo "$as_me:10222: 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:10202: checking if you want to permit root to use ncurses environment variables" >&5
++echo "$as_me:10229: 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.
+@@ -10209,14 +10236,14 @@
+ else
+   with_root_environ=yes
+ fi;
+-echo "$as_me:10212: result: $with_root_environ" >&5
++echo "$as_me:10239: 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:10219: checking if you want to permit setuid programs to access all files" >&5
++echo "$as_me:10246: 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-access or --disable-root-access was given.
+@@ -10226,14 +10253,14 @@
+ else
+   with_root_access=yes
+ fi;
+-echo "$as_me:10229: result: $with_root_access" >&5
++echo "$as_me:10256: result: $with_root_access" >&5
+ echo "${ECHO_T}$with_root_access" >&6
+ test "x$with_root_access" = xyes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_ROOT_ACCESS 1
+ EOF
+ 
+-echo "$as_me:10236: checking if you want to permit setuid use of ncurses environment variables" >&5
++echo "$as_me:10263: checking if you want to permit setuid use of ncurses environment variables" >&5
+ echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
+ 
+ # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
+@@ -10243,7 +10270,7 @@
+ else
+   with_setuid_environ=$with_root_environ
+ fi;
+-echo "$as_me:10246: result: $with_setuid_environ" >&5
++echo "$as_me:10273: result: $with_setuid_environ" >&5
+ echo "${ECHO_T}$with_setuid_environ" >&6
+ test "x$with_setuid_environ" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10258,23 +10285,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:10261: checking for $ac_header" >&5
++echo "$as_me:10288: 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 10267 "configure"
++#line 10294 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10271: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:10298: \"$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:10277: \$? = $ac_status" >&5
++  echo "$as_me:10304: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10293,7 +10320,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:10296: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:10323: 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:10338: 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 10317 "configure"
++#line 10344 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10345,16 +10372,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10348: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10375: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10351: \$? = $ac_status" >&5
++  echo "$as_me:10378: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10354: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10381: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10357: \$? = $ac_status" >&5
++  echo "$as_me:10384: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -10364,7 +10391,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10367: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10394: 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:10411: 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 10390 "configure"
++#line 10417 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10418,16 +10445,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10421: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10448: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10424: \$? = $ac_status" >&5
++  echo "$as_me:10451: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10427: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10454: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10430: \$? = $ac_status" >&5
++  echo "$as_me:10457: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -10437,7 +10464,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10440: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10467: 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:10478: 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
+@@ -10461,7 +10488,7 @@
+ 			eval 'ac_cv_func_'$cf_func'=error'
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10464 "configure"
++#line 10491 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -10495,15 +10522,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10498: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10525: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10501: \$? = $ac_status" >&5
++  echo "$as_me:10528: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10503: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10530: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10506: \$? = $ac_status" >&5
++  echo "$as_me:10533: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -10521,7 +10548,7 @@
+ 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+ 
+ fi
+-echo "$as_me:10524: result: $cf_cv_link_funcs" >&5
++echo "$as_me:10551: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ 	test "$ac_cv_func_link"    = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -10541,7 +10568,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:10544: checking if tic should use symbolic links" >&5
++	echo "$as_me:10571: 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.
+@@ -10551,21 +10578,21 @@
+ else
+   with_symlinks=no
+ fi;
+-	echo "$as_me:10554: result: $with_symlinks" >&5
++	echo "$as_me:10581: 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:10561: checking if tic should use hard links" >&5
++	echo "$as_me:10588: 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:10568: result: $with_links" >&5
++	echo "$as_me:10595: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+ 
+@@ -10581,7 +10608,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:10584: checking if you want broken-linker support code" >&5
++echo "$as_me:10611: 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.
+@@ -10591,7 +10618,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:10594: result: $with_broken_linker" >&5
++echo "$as_me:10621: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : "${BROKEN_LINKER:=0}"
+@@ -10605,7 +10632,7 @@
+ fi
+ 
+ ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:10608: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:10635: 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.
+@@ -10615,7 +10642,7 @@
+ else
+   with_bsdpad=no
+ fi;
+-echo "$as_me:10618: result: $with_bsdpad" >&5
++echo "$as_me:10645: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10634,14 +10661,14 @@
+ # Check to define _XOPEN_SOURCE "automatically"
+ CPPFLAGS_before_XOPEN="$CPPFLAGS"
+ 
+-echo "$as_me:10637: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:10664: 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 10644 "configure"
++#line 10671 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10660,16 +10687,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10663: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10690: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10666: \$? = $ac_status" >&5
++  echo "$as_me:10693: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10669: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10696: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10672: \$? = $ac_status" >&5
++  echo "$as_me:10699: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -10680,7 +10707,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10683: result: $cf_cv_posix_visible" >&5
++echo "$as_me:10710: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -10722,14 +10749,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:10725: checking if this is the GNU C library" >&5
++echo "$as_me:10752: 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 10732 "configure"
++#line 10759 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10748,16 +10775,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10751: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10778: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10754: \$? = $ac_status" >&5
++  echo "$as_me:10781: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10757: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10784: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10760: \$? = $ac_status" >&5
++  echo "$as_me:10787: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -10768,7 +10795,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10771: result: $cf_cv_gnu_library" >&5
++echo "$as_me:10798: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -10776,7 +10803,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:10779: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:10806: 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
+@@ -10788,7 +10815,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10791 "configure"
++#line 10818 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10807,16 +10834,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10810: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10837: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10813: \$? = $ac_status" >&5
++  echo "$as_me:10840: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10816: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10843: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10819: \$? = $ac_status" >&5
++  echo "$as_me:10846: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -10828,12 +10855,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:10831: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:10858: 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:10836: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:10863: 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
+@@ -10938,7 +10965,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10941 "configure"
++#line 10968 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -10958,16 +10985,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10961: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10988: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10964: \$? = $ac_status" >&5
++  echo "$as_me:10991: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10967: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10994: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10970: \$? = $ac_status" >&5
++  echo "$as_me:10997: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -10978,7 +11005,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10981: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:11008: 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
+@@ -10987,14 +11014,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:10990: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:11017: 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 10997 "configure"
++#line 11024 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11009,16 +11036,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11012: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11039: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11015: \$? = $ac_status" >&5
++  echo "$as_me:11042: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11018: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11045: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11021: \$? = $ac_status" >&5
++  echo "$as_me:11048: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -11125,7 +11152,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11128 "configure"
++#line 11155 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11140,16 +11167,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11143: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11170: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11146: \$? = $ac_status" >&5
++  echo "$as_me:11173: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11149: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11176: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11152: \$? = $ac_status" >&5
++  echo "$as_me:11179: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -11164,12 +11191,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11167: result: $cf_cv_gnu_source" >&5
++echo "$as_me:11194: 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:11172: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:11199: 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
+@@ -11179,7 +11206,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11182 "configure"
++#line 11209 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11194,16 +11221,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11197: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11224: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11200: \$? = $ac_status" >&5
++  echo "$as_me:11227: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11203: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11230: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11206: \$? = $ac_status" >&5
++  echo "$as_me:11233: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -11214,7 +11241,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11217: result: $cf_cv_default_source" >&5
++echo "$as_me:11244: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -11251,16 +11278,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:11254: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11281: 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}:11260: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11287: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11263 "configure"
++#line 11290 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11275,16 +11302,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11278: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11305: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11281: \$? = $ac_status" >&5
++  echo "$as_me:11308: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11284: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11311: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11287: \$? = $ac_status" >&5
++  echo "$as_me:11314: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11305,7 +11332,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11308 "configure"
++#line 11335 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11320,16 +11347,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11323: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11350: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11326: \$? = $ac_status" >&5
++  echo "$as_me:11353: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11329: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11356: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11332: \$? = $ac_status" >&5
++  echo "$as_me:11359: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11340,7 +11367,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11343: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11370: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11348,10 +11375,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11351: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11378: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11354 "configure"
++#line 11381 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11366,16 +11393,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11369: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11396: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11372: \$? = $ac_status" >&5
++  echo "$as_me:11399: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11375: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11402: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11378: \$? = $ac_status" >&5
++  echo "$as_me:11405: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11391,7 +11418,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11394: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11421: 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
+@@ -11508,7 +11535,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:11511: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:11538: 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
+@@ -11540,14 +11567,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:11543: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:11570: 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 11550 "configure"
++#line 11577 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11565,16 +11592,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11568: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11595: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11571: \$? = $ac_status" >&5
++  echo "$as_me:11598: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11574: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11601: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11577: \$? = $ac_status" >&5
++  echo "$as_me:11604: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11586,7 +11613,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11589 "configure"
++#line 11616 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11604,16 +11631,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11607: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11634: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11610: \$? = $ac_status" >&5
++  echo "$as_me:11637: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11613: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11640: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11616: \$? = $ac_status" >&5
++  echo "$as_me:11643: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11628,7 +11655,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11631: result: $cf_cv_xopen_source" >&5
++echo "$as_me:11658: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -11788,16 +11815,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:11791: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11818: 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}:11797: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11824: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11800 "configure"
++#line 11827 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11812,16 +11839,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11815: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11842: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11818: \$? = $ac_status" >&5
++  echo "$as_me:11845: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11821: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11848: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11824: \$? = $ac_status" >&5
++  echo "$as_me:11851: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11842,7 +11869,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11845 "configure"
++#line 11872 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11857,16 +11884,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11860: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11887: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11863: \$? = $ac_status" >&5
++  echo "$as_me:11890: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11866: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11893: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11869: \$? = $ac_status" >&5
++  echo "$as_me:11896: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11877,7 +11904,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11880: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11907: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11885,10 +11912,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11888: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11915: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11891 "configure"
++#line 11918 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11903,16 +11930,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11906: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11933: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11909: \$? = $ac_status" >&5
++  echo "$as_me:11936: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11912: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11939: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11915: \$? = $ac_status" >&5
++  echo "$as_me:11942: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11928,7 +11955,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11931: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11958: 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
+@@ -12041,10 +12068,10 @@
+ 	if test "$cf_cv_xopen_source" = no ; then
+ 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+ 
+-echo "${as_me:-configure}:12044: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:12071: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12047 "configure"
++#line 12074 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12062,23 +12089,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12065: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12092: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12068: \$? = $ac_status" >&5
++  echo "$as_me:12095: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12071: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12098: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12074: \$? = $ac_status" >&5
++  echo "$as_me:12101: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-			{ echo "$as_me:12081: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++			{ echo "$as_me:12108: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ 			CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -12101,7 +12128,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}:12104: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12131: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -12113,7 +12140,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}:12116: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:12143: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -12201,7 +12228,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:12204: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:12231: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -12211,7 +12238,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:12214: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:12241: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -12221,7 +12248,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}:12224: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:12251: 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"
+@@ -12233,10 +12260,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:12236: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:12263: 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 12239 "configure"
++#line 12266 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12251,16 +12278,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12254: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12281: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12257: \$? = $ac_status" >&5
++  echo "$as_me:12284: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12260: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12287: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12263: \$? = $ac_status" >&5
++  echo "$as_me:12290: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -12269,12 +12296,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:12272: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:12299: 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 12277 "configure"
++#line 12304 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12289,16 +12316,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12292: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12319: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12295: \$? = $ac_status" >&5
++  echo "$as_me:12322: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12298: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12325: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12301: \$? = $ac_status" >&5
++  echo "$as_me:12328: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -12309,19 +12336,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:12312: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:12339: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:12317: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:12344: 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 12324 "configure"
++#line 12351 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12339,16 +12366,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12342: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12369: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12345: \$? = $ac_status" >&5
++  echo "$as_me:12372: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12348: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12375: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12351: \$? = $ac_status" >&5
++  echo "$as_me:12378: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12360,7 +12387,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12363 "configure"
++#line 12390 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12378,16 +12405,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12381: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12408: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12384: \$? = $ac_status" >&5
++  echo "$as_me:12411: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12387: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12414: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12390: \$? = $ac_status" >&5
++  echo "$as_me:12417: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12402,7 +12429,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12405: result: $cf_cv_xopen_source" >&5
++echo "$as_me:12432: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -12553,14 +12580,14 @@
+ 
+ # Work around breakage on OS X
+ 
+-echo "$as_me:12556: checking if SIGWINCH is defined" >&5
++echo "$as_me:12583: 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 12563 "configure"
++#line 12590 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12575,23 +12602,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12578: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12605: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12581: \$? = $ac_status" >&5
++  echo "$as_me:12608: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12584: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12611: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12587: \$? = $ac_status" >&5
++  echo "$as_me:12614: \$? = $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 12594 "configure"
++#line 12621 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -12609,16 +12636,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12612: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12639: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12615: \$? = $ac_status" >&5
++  echo "$as_me:12642: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12618: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12645: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12621: \$? = $ac_status" >&5
++  echo "$as_me:12648: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -12632,11 +12659,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12635: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:12662: 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:12639: checking for actual SIGWINCH definition" >&5
++echo "$as_me:12666: 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
+@@ -12647,7 +12674,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12650 "configure"
++#line 12677 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -12669,16 +12696,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12672: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12699: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12675: \$? = $ac_status" >&5
++  echo "$as_me:12702: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12678: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12705: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12681: \$? = $ac_status" >&5
++  echo "$as_me:12708: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -12692,7 +12719,7 @@
+ done
+ 
+ fi
+-echo "$as_me:12695: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:12722: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -12702,13 +12729,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:12705: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:12732: 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 12711 "configure"
++#line 12738 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12722,16 +12749,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12725: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12752: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12728: \$? = $ac_status" >&5
++  echo "$as_me:12755: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12731: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12758: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12734: \$? = $ac_status" >&5
++  echo "$as_me:12761: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -12742,7 +12769,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12745: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:12772: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test "$am_cv_langinfo_codeset" = yes; then
+ 
+@@ -12756,7 +12783,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+ 
+-echo "$as_me:12759: checking if you want wide-character code" >&5
++echo "$as_me:12786: 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.
+@@ -12766,7 +12793,7 @@
+ else
+   with_widec=$cf_dft_widec
+ fi;
+-echo "$as_me:12769: result: $with_widec" >&5
++echo "$as_me:12796: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ 
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -12788,7 +12815,7 @@
+ 	(*_XOPEN_SOURCE=*)
+ 		;;
+ 	(*)
+-		{ echo "$as_me:12791: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
++		{ echo "$as_me:12818: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
+ 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
+ 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
+@@ -12801,23 +12828,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:12804: checking for $ac_header" >&5
++echo "$as_me:12831: 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 12810 "configure"
++#line 12837 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:12814: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12841: \"$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:12820: \$? = $ac_status" >&5
++  echo "$as_me:12847: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12836,7 +12863,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:12839: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:12866: 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:12876: 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 12856 "configure"
++#line 12883 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12875,16 +12902,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12878: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12905: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12881: \$? = $ac_status" >&5
++  echo "$as_me:12908: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12884: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12911: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12887: \$? = $ac_status" >&5
++  echo "$as_me:12914: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_h_okay=yes
+ else
+@@ -12894,16 +12921,16 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12897: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:12924: 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:12903: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:12930: 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 12906 "configure"
++#line 12933 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12919,16 +12946,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12922: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12949: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12925: \$? = $ac_status" >&5
++  echo "$as_me:12952: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12928: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12955: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12931: \$? = $ac_status" >&5
++  echo "$as_me:12958: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=no
+ else
+@@ -12937,16 +12964,16 @@
+ cf_result=yes
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:12940: result: $cf_result" >&5
++echo "$as_me:12967: 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:12946: checking checking for compatible value versus " >&5
++	echo "$as_me:12973: 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 12949 "configure"
++#line 12976 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12962,16 +12989,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12965: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12992: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12968: \$? = $ac_status" >&5
++  echo "$as_me:12995: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12971: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12998: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12974: \$? = $ac_status" >&5
++  echo "$as_me:13001: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -12980,7 +13007,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:12983: result: $cf_result" >&5
++	echo "$as_me:13010: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = no ; then
+ 		# perhaps we can override it - try...
+@@ -12990,7 +13017,7 @@
+ 
+ fi
+ 
+-echo "$as_me:12993: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:13020: 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
+@@ -13061,7 +13088,7 @@
+   cf_cv_wcwidth_graphics=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13064 "configure"
++#line 13091 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13106,15 +13133,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:13109: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13136: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13112: \$? = $ac_status" >&5
++  echo "$as_me:13139: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:13114: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13141: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13117: \$? = $ac_status" >&5
++  echo "$as_me:13144: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wcwidth_graphics=yes
+ else
+@@ -13127,7 +13154,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:13130: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:13157: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+ 
+ 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -13138,13 +13165,13 @@
+ for ac_func in putwc btowc wctob wmemchr 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:13141: checking for $ac_func" >&5
++echo "$as_me:13168: 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 13147 "configure"
++#line 13174 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13175,16 +13202,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13178: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13205: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13181: \$? = $ac_status" >&5
++  echo "$as_me:13208: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13184: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13211: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13187: \$? = $ac_status" >&5
++  echo "$as_me:13214: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -13194,7 +13221,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13197: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:13224: 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:13239: 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 13218 "configure"
++#line 13245 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13222: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:13249: \"$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:13228: \$? = $ac_status" >&5
++  echo "$as_me:13255: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13244,7 +13271,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:13247: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:13274: 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:13284: 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
+@@ -13262,7 +13289,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13265 "configure"
++#line 13292 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13279,16 +13306,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13282: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13309: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13285: \$? = $ac_status" >&5
++  echo "$as_me:13312: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13288: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13315: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13291: \$? = $ac_status" >&5
++  echo "$as_me:13318: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -13300,12 +13327,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:13303: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13330: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13308 "configure"
++#line 13335 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13318,16 +13345,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13321: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13348: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13324: \$? = $ac_status" >&5
++  echo "$as_me:13351: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13327: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13354: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13330: \$? = $ac_status" >&5
++  echo "$as_me:13357: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -13341,7 +13368,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13344 "configure"
++#line 13371 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13354,16 +13381,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13357: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13384: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13360: \$? = $ac_status" >&5
++  echo "$as_me:13387: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13363: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13390: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13366: \$? = $ac_status" >&5
++  echo "$as_me:13393: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -13380,9 +13407,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:13383: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:13410: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:13385: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13412: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13473,7 +13500,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}:13476: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13503: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -13481,7 +13508,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13484 "configure"
++#line 13511 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13494,21 +13521,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13497: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13524: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13500: \$? = $ac_status" >&5
++  echo "$as_me:13527: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13503: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13530: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13506: \$? = $ac_status" >&5
++  echo "$as_me:13533: \$? = $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}:13511: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13538: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13526,7 +13553,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:13529: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13556: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -13601,13 +13628,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}:13604: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13631: 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 13610 "configure"
++#line 13637 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13620,21 +13647,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13623: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13650: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13626: \$? = $ac_status" >&5
++  echo "$as_me:13653: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13629: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13656: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13632: \$? = $ac_status" >&5
++  echo "$as_me:13659: \$? = $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}:13637: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13664: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -13676,7 +13703,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13679: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:13706: 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
+@@ -13714,7 +13741,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13717 "configure"
++#line 13744 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13726,16 +13753,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13729: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13756: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13732: \$? = $ac_status" >&5
++  echo "$as_me:13759: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13735: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13762: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13738: \$? = $ac_status" >&5
++  echo "$as_me:13765: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13752,7 +13779,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}:13755: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:13782: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -13788,7 +13815,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}:13791: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:13818: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -13820,14 +13847,14 @@
+ 	fi
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:13823: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:13850: 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 13830 "configure"
++#line 13857 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13845,23 +13872,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13848: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13875: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13851: \$? = $ac_status" >&5
++  echo "$as_me:13878: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13854: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13881: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13857: \$? = $ac_status" >&5
++  echo "$as_me:13884: \$? = $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 13864 "configure"
++#line 13891 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13880,16 +13907,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13883: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13910: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13886: \$? = $ac_status" >&5
++  echo "$as_me:13913: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13889: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13916: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13892: \$? = $ac_status" >&5
++  echo "$as_me:13919: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -13901,7 +13928,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13904: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:13931: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -13919,14 +13946,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:13922: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:13949: 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 13929 "configure"
++#line 13956 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13944,23 +13971,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13947: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13974: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13950: \$? = $ac_status" >&5
++  echo "$as_me:13977: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13953: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13980: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13956: \$? = $ac_status" >&5
++  echo "$as_me:13983: \$? = $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 13963 "configure"
++#line 13990 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13979,16 +14006,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13982: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14009: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13985: \$? = $ac_status" >&5
++  echo "$as_me:14012: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13988: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14015: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13991: \$? = $ac_status" >&5
++  echo "$as_me:14018: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -14000,7 +14027,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14003: result: $cf_cv_wchar_t" >&5
++echo "$as_me:14030: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -14023,14 +14050,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:14026: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:14053: 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 14033 "configure"
++#line 14060 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14048,23 +14075,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14051: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14078: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14054: \$? = $ac_status" >&5
++  echo "$as_me:14081: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14057: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14084: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14060: \$? = $ac_status" >&5
++  echo "$as_me:14087: \$? = $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 14067 "configure"
++#line 14094 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14083,16 +14110,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14086: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14113: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14089: \$? = $ac_status" >&5
++  echo "$as_me:14116: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14092: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14119: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14095: \$? = $ac_status" >&5
++  echo "$as_me:14122: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -14104,7 +14131,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14107: result: $cf_cv_wint_t" >&5
++echo "$as_me:14134: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -14136,7 +14163,7 @@
+ fi
+ 
+ ###   use option --disable-lp64 to allow long chtype
+-echo "$as_me:14139: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:14166: 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.
+@@ -14146,7 +14173,7 @@
+ else
+   with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:14149: result: $with_lp64" >&5
++echo "$as_me:14176: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+ 
+ if test "x$with_lp64" = xyes ; then
+@@ -14162,7 +14189,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:14165: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:14192: 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
+@@ -14174,7 +14201,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 14177 "configure"
++#line 14204 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14194,16 +14221,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14197: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14224: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14200: \$? = $ac_status" >&5
++  echo "$as_me:14227: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14203: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14230: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14206: \$? = $ac_status" >&5
++  echo "$as_me:14233: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14213,16 +14240,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14216: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14243: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14219: \$? = $ac_status" >&5
++  echo "$as_me:14246: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14222: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14249: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14225: \$? = $ac_status" >&5
++  echo "$as_me:14252: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -14236,13 +14263,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:14239: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:14266: 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:14245: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:14272: 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
+@@ -14250,7 +14277,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14253 "configure"
++#line 14280 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14270,16 +14297,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14273: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14300: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14276: \$? = $ac_status" >&5
++  echo "$as_me:14303: \$? = $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:14306: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14282: \$? = $ac_status" >&5
++  echo "$as_me:14309: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14288,7 +14315,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14291 "configure"
++#line 14318 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -14309,16 +14336,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14312: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14339: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14315: \$? = $ac_status" >&5
++  echo "$as_me:14342: \$? = $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:14345: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14321: \$? = $ac_status" >&5
++  echo "$as_me:14348: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -14329,7 +14356,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14332: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:14359: 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
+ 
+@@ -14339,7 +14366,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:14342: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:14369: 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
+@@ -14347,7 +14374,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14350 "configure"
++#line 14377 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14367,16 +14394,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14370: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14397: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14373: \$? = $ac_status" >&5
++  echo "$as_me:14400: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14376: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14403: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14379: \$? = $ac_status" >&5
++  echo "$as_me:14406: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14385,7 +14412,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14388 "configure"
++#line 14415 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -14406,16 +14433,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14409: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14436: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14412: \$? = $ac_status" >&5
++  echo "$as_me:14439: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14415: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14442: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14418: \$? = $ac_status" >&5
++  echo "$as_me:14445: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -14426,7 +14453,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14429: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:14456: 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
+ 
+@@ -14439,7 +14466,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:14442: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:14469: 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
+@@ -14447,7 +14474,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14450 "configure"
++#line 14477 "configure"
+ #include "confdefs.h"
+ #include 
+     #include 
+@@ -14462,16 +14489,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14465: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14492: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14468: \$? = $ac_status" >&5
++  echo "$as_me:14495: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14471: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14498: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14474: \$? = $ac_status" >&5
++  echo "$as_me:14501: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14480,7 +14507,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14483 "configure"
++#line 14510 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -14496,16 +14523,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14499: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14526: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14502: \$? = $ac_status" >&5
++  echo "$as_me:14529: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14505: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14532: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14508: \$? = $ac_status" >&5
++  echo "$as_me:14535: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -14516,7 +14543,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14519: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:14546: 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
+ 
+@@ -14530,13 +14557,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:14533: checking for fseeko" >&5
++echo "$as_me:14560: 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 14539 "configure"
++#line 14566 "configure"
+ #include "confdefs.h"
+ #include 
+                              #include 
+@@ -14550,16 +14577,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14553: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14580: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14556: \$? = $ac_status" >&5
++  echo "$as_me:14583: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14559: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14586: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14562: \$? = $ac_status" >&5
++  echo "$as_me:14589: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -14569,7 +14596,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14572: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:14599: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -14608,14 +14635,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:14611: checking whether to use struct dirent64" >&5
++	echo "$as_me:14638: 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 14618 "configure"
++#line 14645 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -14642,16 +14669,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14645: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14672: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14648: \$? = $ac_status" >&5
++  echo "$as_me:14675: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14651: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14678: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14654: \$? = $ac_status" >&5
++  echo "$as_me:14681: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -14662,7 +14689,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14665: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:14692: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -14672,7 +14699,7 @@
+ 	fi
+ 
+ ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:14675: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:14702: 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.
+@@ -14682,14 +14709,14 @@
+ else
+   with_tparm_varargs=yes
+ fi;
+-echo "$as_me:14685: result: $with_tparm_varargs" >&5
++echo "$as_me:14712: 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:14692: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:14719: 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.
+@@ -14699,14 +14726,14 @@
+ else
+   with_tic_depends=yes
+ fi;
+-echo "$as_me:14702: result: $with_tic_depends" >&5
++echo "$as_me:14729: 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:14709: checking if you want to enable wattr* macros" >&5
++echo "$as_me:14736: 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.
+@@ -14718,15 +14745,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ 	NCURSES_WATTR_MACROS=0
+-	echo "$as_me:14721: result: no" >&5
++	echo "$as_me:14748: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ else
+ 	NCURSES_WATTR_MACROS=1
+-	echo "$as_me:14725: result: yes" >&5
++	echo "$as_me:14752: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ fi
+ 
+-echo "$as_me:14729: checking for X11 rgb file" >&5
++echo "$as_me:14756: 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.
+@@ -14788,7 +14815,7 @@
+ 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:14791: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:14818: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14796,7 +14823,7 @@
+ 
+ fi
+ 
+-echo "$as_me:14799: result: $RGB_PATH" >&5
++echo "$as_me:14826: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:14841: 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.
+@@ -14821,17 +14848,17 @@
+ else
+   NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:14824: result: $NCURSES_BOOL" >&5
++echo "$as_me:14851: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ case x$NCURSES_BOOL in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14828: error: expected a type name for bool" >&5
++	{ { echo "$as_me:14855: error: expected a type name for bool" >&5
+ echo "$as_me: error: expected a type name for bool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+-echo "$as_me:14834: checking for alternate terminal capabilities file" >&5
++echo "$as_me:14861: 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.
+@@ -14843,16 +14870,16 @@
+ fi;
+ if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
+ then
+-	{ echo "$as_me:14846: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
++	{ echo "$as_me:14873: 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:14850: result: $TERMINFO_CAPS" >&5
++echo "$as_me:14877: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+ 
+ ###   use option --with-chtype to override chtype's type
+ 
+-echo "$as_me:14855: checking for type of chtype" >&5
++echo "$as_me:14882: 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.
+@@ -14862,11 +14889,11 @@
+ else
+   NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:14865: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:14892: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ case x$NCURSES_CHTYPE in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14869: error: expected a type name for chtype" >&5
++	{ { echo "$as_me:14896: error: expected a type name for chtype" >&5
+ echo "$as_me: error: expected a type name for chtype" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14874,7 +14901,7 @@
+ 
+ ###   use option --with-ospeed to override ospeed's type
+ 
+-echo "$as_me:14877: checking for type of ospeed" >&5
++echo "$as_me:14904: 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.
+@@ -14884,11 +14911,11 @@
+ else
+   NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:14887: result: $NCURSES_OSPEED" >&5
++echo "$as_me:14914: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ case x$NCURSES_OSPEED in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14891: error: expected a type name for ospeed" >&5
++	{ { echo "$as_me:14918: error: expected a type name for ospeed" >&5
+ echo "$as_me: error: expected a type name for ospeed" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14896,7 +14923,7 @@
+ 
+ ###   use option --with-mmask-t to override mmask_t's type
+ 
+-echo "$as_me:14899: checking for type of mmask-t" >&5
++echo "$as_me:14926: 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.
+@@ -14906,18 +14933,18 @@
+ else
+   NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:14909: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:14936: result: $NCURSES_MMASK_T" >&5
+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+ case x$NCURSES_MMASK_T in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14913: error: expected a type name for mmask-t" >&5
++	{ { echo "$as_me:14940: error: expected a type name for mmask-t" >&5
+ echo "$as_me: error: expected a type name for mmask-t" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ ###   use option --with-ccharw-max to override CCHARW_MAX size
+-echo "$as_me:14920: checking for size CCHARW_MAX" >&5
++echo "$as_me:14947: 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.
+@@ -14927,16 +14954,16 @@
+ else
+   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
+ fi;
+-echo "$as_me:14930: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:14957: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+ 
+-echo "$as_me:14933: checking for signed char" >&5
++echo "$as_me:14960: 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 14939 "configure"
++#line 14966 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14951,16 +14978,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14954: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14981: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14957: \$? = $ac_status" >&5
++  echo "$as_me:14984: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14960: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14987: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14963: \$? = $ac_status" >&5
++  echo "$as_me:14990: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -14970,10 +14997,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14973: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:15000: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:14976: checking size of signed char" >&5
++echo "$as_me:15003: 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
+@@ -14982,7 +15009,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14985 "configure"
++#line 15012 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14994,21 +15021,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14997: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15024: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15000: \$? = $ac_status" >&5
++  echo "$as_me:15027: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15003: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15030: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15006: \$? = $ac_status" >&5
++  echo "$as_me:15033: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15011 "configure"
++#line 15038 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15020,16 +15047,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15023: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15050: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15026: \$? = $ac_status" >&5
++  echo "$as_me:15053: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15029: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15056: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15032: \$? = $ac_status" >&5
++  echo "$as_me:15059: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -15045,7 +15072,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15048 "configure"
++#line 15075 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15057,16 +15084,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15060: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15087: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15063: \$? = $ac_status" >&5
++  echo "$as_me:15090: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15066: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15093: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15069: \$? = $ac_status" >&5
++  echo "$as_me:15096: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -15082,7 +15109,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 15085 "configure"
++#line 15112 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15094,16 +15121,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15097: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15124: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15100: \$? = $ac_status" >&5
++  echo "$as_me:15127: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15103: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15130: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15106: \$? = $ac_status" >&5
++  echo "$as_me:15133: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -15116,12 +15143,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:15119: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:15146: 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 15124 "configure"
++#line 15151 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15137,15 +15164,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:15140: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15167: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15143: \$? = $ac_status" >&5
++  echo "$as_me:15170: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:15145: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15172: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15148: \$? = $ac_status" >&5
++  echo "$as_me:15175: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -15161,7 +15188,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:15164: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:15191: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:15202: checking whether to use signed chars for Boolean array in term.h" >&5
+ echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
+ 
+ # Check whether --enable-signed-char or --disable-signed-char was given.
+@@ -15182,13 +15209,13 @@
+ else
+   with_signed_char=$cf_dft_signed_char
+ fi;
+-echo "$as_me:15185: result: $with_signed_char" >&5
++echo "$as_me:15212: 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:15191: checking for type of tparm-arg" >&5
++echo "$as_me:15218: checking for type of tparm-arg" >&5
+ echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6
+ 
+ # Check whether --with-tparm-arg or --without-tparm-arg was given.
+@@ -15198,18 +15225,18 @@
+ else
+   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:15201: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:15228: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+ case x$NCURSES_TPARM_ARG in
+ (x|xyes|xno)
+-	{ { echo "$as_me:15205: error: expected a type name for tparm-arg" >&5
++	{ { echo "$as_me:15232: error: expected a type name for tparm-arg" >&5
+ echo "$as_me: error: expected a type name for tparm-arg" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:15212: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:15239: 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.
+@@ -15219,7 +15246,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:15222: result: $with_rcs_ids" >&5
++echo "$as_me:15249: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15228,7 +15255,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:15231: checking format of man-pages" >&5
++echo "$as_me:15258: 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.
+@@ -15319,10 +15346,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:15322: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:15349: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+-	{ echo "$as_me:15325: WARNING: Unexpected manpage-format $cf_unknown" >&5
++	{ echo "$as_me:15352: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+ 
+@@ -15363,7 +15390,7 @@
+ esac
+ done
+ 
+-echo "$as_me:15366: checking for manpage renaming" >&5
++echo "$as_me:15393: 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.
+@@ -15392,15 +15419,15 @@
+ elif test "$MANPAGE_RENAMES" = no ; then
+ 	:
+ elif test ! -f "$MANPAGE_RENAMES" ; then
+-	{ { echo "$as_me:15395: error: not a filename: $MANPAGE_RENAMES" >&5
++	{ { echo "$as_me:15422: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-echo "$as_me:15400: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:15427: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+ 
+-echo "$as_me:15403: checking if manpage aliases will be installed" >&5
++echo "$as_me:15430: 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.
+@@ -15411,7 +15438,7 @@
+   MANPAGE_ALIASES=yes
+ fi;
+ 
+-echo "$as_me:15414: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:15441: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+ 
+ case "x$LN_S" in
+@@ -15425,7 +15452,7 @@
+ 
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:15428: checking if manpage symlinks should be used" >&5
++echo "$as_me:15455: 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.
+@@ -15438,17 +15465,17 @@
+ 
+ if test "$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+-	{ echo "$as_me:15441: WARNING: cannot make symlinks" >&5
++	{ echo "$as_me:15468: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ 	MANPAGE_SYMLINKS=no
+ fi
+ fi
+ 
+-echo "$as_me:15447: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:15474: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+ 
+-echo "$as_me:15451: checking for manpage tbl" >&5
++echo "$as_me:15478: 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.
+@@ -15459,7 +15486,7 @@
+   MANPAGE_TBL=no
+ fi;
+ 
+-echo "$as_me:15462: result: $MANPAGE_TBL" >&5
++echo "$as_me:15489: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+ 
+ if test "$prefix" = "NONE" ; then
+@@ -15777,7 +15804,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15780: checking if you want to build with function extensions" >&5
++echo "$as_me:15807: 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.
+@@ -15787,7 +15814,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:15790: result: $with_ext_funcs" >&5
++echo "$as_me:15817: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -15844,7 +15871,7 @@
+ 	GENERATED_EXT_FUNCS=
+ fi
+ 
+-echo "$as_me:15847: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:15874: 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.
+@@ -15854,7 +15881,7 @@
+ else
+   with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:15857: result: $with_sp_funcs" >&5
++echo "$as_me:15884: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ 	NCURSES_SP_FUNCS=1
+@@ -15873,7 +15900,7 @@
+ 	GENERATED_SP_FUNCS=
+ fi
+ 
+-echo "$as_me:15876: checking if you want to build with terminal-driver" >&5
++echo "$as_me:15903: 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.
+@@ -15883,7 +15910,7 @@
+ else
+   with_term_driver=no
+ fi;
+-echo "$as_me:15886: result: $with_term_driver" >&5
++echo "$as_me:15913: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+ 
+@@ -15892,19 +15919,19 @@
+ EOF
+ 
+ 	if test "x$with_termlib" != xno ; then
+-		{ { echo "$as_me:15895: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:15922: 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:15900: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:15927: 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:15907: checking for extended use of const keyword" >&5
++echo "$as_me:15934: 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.
+@@ -15914,7 +15941,7 @@
+ else
+   with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:15917: result: $with_ext_const" >&5
++echo "$as_me:15944: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -15922,7 +15949,7 @@
+ fi
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:15925: checking if you want to use extended colors" >&5
++echo "$as_me:15952: 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.
+@@ -15932,12 +15959,12 @@
+ else
+   with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:15935: result: $with_ext_colors" >&5
++echo "$as_me:15962: 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:15940: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:15967: 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)
+@@ -15948,7 +15975,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:15951: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:15978: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -15976,7 +16003,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:15979: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:16006: 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.
+@@ -15986,7 +16013,7 @@
+ else
+   with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:15989: result: $with_ext_mouse" >&5
++echo "$as_me:16016: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ if test "x$with_ext_mouse" = xyes ; then
+ 
+@@ -15996,7 +16023,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:15999: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16026: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16013,7 +16040,7 @@
+ fi
+ 
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:16016: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:16043: 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.
+@@ -16023,7 +16050,7 @@
+ else
+   with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:16026: result: $with_ext_putwin" >&5
++echo "$as_me:16053: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+ 
+@@ -16033,7 +16060,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16036: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:16063: 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.
+@@ -16043,7 +16070,7 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:16046: result: $with_no_padding" >&5
++echo "$as_me:16073: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16051,7 +16078,7 @@
+ EOF
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:16054: checking if you want SIGWINCH handler" >&5
++echo "$as_me:16081: 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.
+@@ -16061,7 +16088,7 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:16064: result: $with_sigwinch" >&5
++echo "$as_me:16091: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ if test "x$with_sigwinch" = xyes
+ then
+@@ -16076,7 +16103,7 @@
+ fi
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:16079: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:16106: 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.
+@@ -16086,7 +16113,7 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:16089: result: $with_tcap_names" >&5
++echo "$as_me:16116: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ if test "x$with_tcap_names" = xyes; then
+@@ -16100,7 +16127,7 @@
+ 
+ ##############################################################################
+ 
+-echo "$as_me:16103: checking if you want to link with the pthread library" >&5
++echo "$as_me:16130: 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.
+@@ -16110,27 +16137,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:16113: result: $with_pthread" >&5
++echo "$as_me:16140: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:16117: checking for pthread.h" >&5
++	echo "$as_me:16144: 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 16123 "configure"
++#line 16150 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16127: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16154: \"$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:16133: \$? = $ac_status" >&5
++  echo "$as_me:16160: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16149,7 +16176,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16152: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:16179: 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
+ 
+@@ -16159,7 +16186,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:16162: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:16189: 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"
+ 
+@@ -16180,7 +16207,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16183 "configure"
++#line 16210 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16197,16 +16224,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16200: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16227: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16203: \$? = $ac_status" >&5
++  echo "$as_me:16230: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16206: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16233: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16209: \$? = $ac_status" >&5
++  echo "$as_me:16236: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -16216,7 +16243,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:16219: result: $with_pthread" >&5
++	    echo "$as_me:16246: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -16244,7 +16271,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:16247: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:16274: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -16254,13 +16281,13 @@
+ fi
+ 
+ if test "x$with_pthread" != xno; then
+-	echo "$as_me:16257: checking for pthread_kill" >&5
++	echo "$as_me:16284: 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 16263 "configure"
++#line 16290 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16291,16 +16318,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16294: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16321: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16297: \$? = $ac_status" >&5
++  echo "$as_me:16324: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16300: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16327: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16303: \$? = $ac_status" >&5
++  echo "$as_me:16330: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_pthread_kill=yes
+ else
+@@ -16310,11 +16337,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16313: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:16340: 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:16317: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:16344: 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.
+@@ -16324,7 +16351,7 @@
+ else
+   use_pthreads_eintr=no
+ fi;
+-		echo "$as_me:16327: result: $use_pthreads_eintr" >&5
++		echo "$as_me:16354: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ 		if test "x$use_pthreads_eintr" = xyes ; then
+ 
+@@ -16335,7 +16362,7 @@
+ 		fi
+ fi
+ 
+-	echo "$as_me:16338: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:16365: 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.
+@@ -16345,18 +16372,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-	echo "$as_me:16348: result: $use_weak_symbols" >&5
++	echo "$as_me:16375: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ 	if test "x$use_weak_symbols" = xyes ; then
+ 
+-echo "$as_me:16352: checking if $CC supports weak symbols" >&5
++echo "$as_me:16379: 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 16359 "configure"
++#line 16386 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16382,16 +16409,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16385: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16412: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16388: \$? = $ac_status" >&5
++  echo "$as_me:16415: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16391: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16418: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16394: \$? = $ac_status" >&5
++  echo "$as_me:16421: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -16402,7 +16429,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16405: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:16432: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ 	else
+@@ -16452,7 +16479,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:16455: checking if you want reentrant code" >&5
++echo "$as_me:16482: 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.
+@@ -16462,7 +16489,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:16465: result: $with_reentrant" >&5
++echo "$as_me:16492: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -16551,7 +16578,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16554: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16581: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16563,7 +16590,7 @@
+ 	NCURSES_SIZE_T=$cf_dft_ordinate_type
+ fi
+ 
+-echo "$as_me:16566: checking whether curses library structures should be opaque" >&5
++echo "$as_me:16593: checking whether curses library structures should be opaque" >&5
+ echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
+@@ -16585,16 +16612,16 @@
+ 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16588: result: $enable_opaque_curses" >&5
++echo "$as_me:16615: 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:16593: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:16620: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:16597: checking whether form library structures should be opaque" >&5
++echo "$as_me:16624: checking whether form library structures should be opaque" >&5
+ echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-form or --disable-opaque-form was given.
+@@ -16611,10 +16638,10 @@
+ 	enable_opaque_form=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16614: result: $enable_opaque_form" >&5
++echo "$as_me:16641: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+ 
+-echo "$as_me:16617: checking whether menu library structures should be opaque" >&5
++echo "$as_me:16644: checking whether menu library structures should be opaque" >&5
+ echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
+@@ -16631,10 +16658,10 @@
+ 	enable_opaque_menu=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16634: result: $enable_opaque_menu" >&5
++echo "$as_me:16661: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+ 
+-echo "$as_me:16637: checking whether panel library structures should be opaque" >&5
++echo "$as_me:16664: checking whether panel library structures should be opaque" >&5
+ echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
+@@ -16651,7 +16678,7 @@
+ 	enable_opaque_panel=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16654: result: $enable_opaque_panel" >&5
++echo "$as_me:16681: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+ 
+ NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -16661,7 +16688,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:16664: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:16691: 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.
+@@ -16671,7 +16698,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:16674: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:16701: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -16684,7 +16711,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:16687: checking if you want all development code" >&5
++echo "$as_me:16714: 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.
+@@ -16694,11 +16721,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:16697: result: $with_develop" >&5
++echo "$as_me:16724: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###   use option --enable-check-size to detect screensize with CPR
+-echo "$as_me:16701: checking if you want to check screensize of serial terminals" >&5
++echo "$as_me:16728: checking if you want to check screensize of serial terminals" >&5
+ echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
+ 
+ # Check whether --enable-check-size or --disable-check-size was given.
+@@ -16708,7 +16735,7 @@
+ else
+   enable_check_size=$with_develop
+ fi;
+-echo "$as_me:16711: result: $enable_check_size" >&5
++echo "$as_me:16738: result: $enable_check_size" >&5
+ echo "${ECHO_T}$enable_check_size" >&6
+ test "x$enable_check_size" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16716,7 +16743,7 @@
+ EOF
+ 
+ ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
+-echo "$as_me:16719: checking if you want hard-tabs code" >&5
++echo "$as_me:16746: 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.
+@@ -16726,7 +16753,7 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:16729: result: $enable_hard_tabs" >&5
++echo "$as_me:16756: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16734,7 +16761,7 @@
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:16737: checking if you want limited support for xmc" >&5
++echo "$as_me:16764: 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.
+@@ -16744,7 +16771,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:16747: result: $enable_xmc_glitch" >&5
++echo "$as_me:16774: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16754,7 +16781,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:16757: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:16784: 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.
+@@ -16764,7 +16791,7 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:16767: result: $with_assumed_color" >&5
++echo "$as_me:16794: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16772,7 +16799,7 @@
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:16775: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:16802: 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.
+@@ -16782,7 +16809,7 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:16785: result: $with_hashmap" >&5
++echo "$as_me:16812: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16790,7 +16817,7 @@
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:16793: checking if you want colorfgbg code" >&5
++echo "$as_me:16820: 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.
+@@ -16800,7 +16827,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:16803: result: $with_colorfgbg" >&5
++echo "$as_me:16830: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16808,7 +16835,7 @@
+ EOF
+ 
+ ###   use option --enable-fvisibility to turn on use of gcc-specific feature
+-echo "$as_me:16811: checking if you want to use gcc -fvisibility option" >&5
++echo "$as_me:16838: 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.
+@@ -16818,14 +16845,14 @@
+ else
+   cf_with_fvisibility=no
+ fi;
+-echo "$as_me:16821: result: $cf_with_fvisibility" >&5
++echo "$as_me:16848: 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:16828: checking if $CC -fvisibility=hidden option works" >&5
++echo "$as_me:16855: 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
+@@ -16834,7 +16861,7 @@
+     cf_save_cflags="$CFLAGS"
+     CFLAGS="$CFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16837 "configure"
++#line 16864 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16850,16 +16877,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16853: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16880: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16856: \$? = $ac_status" >&5
++  echo "$as_me:16883: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16859: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16886: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16862: \$? = $ac_status" >&5
++  echo "$as_me:16889: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden=yes
+ else
+@@ -16871,7 +16898,7 @@
+     CFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16874: result: $cf_cv_fvisibility_hidden" >&5
++echo "$as_me:16901: result: $cf_cv_fvisibility_hidden" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
+ 
+ 	if test "x$cf_cv_fvisibility_hidden" = xyes
+@@ -16986,7 +17013,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:16989: checking if $CXX -fvisibility=hidden option works" >&5
++echo "$as_me:17016: 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
+@@ -16995,7 +17022,7 @@
+     cf_save_cflags="$CXXFLAGS"
+     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16998 "configure"
++#line 17025 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -17011,16 +17038,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17014: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17041: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17017: \$? = $ac_status" >&5
++  echo "$as_me:17044: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17047: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17023: \$? = $ac_status" >&5
++  echo "$as_me:17050: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden2=yes
+ else
+@@ -17032,7 +17059,7 @@
+     CXXFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:17035: result: $cf_cv_fvisibility_hidden2" >&5
++echo "$as_me:17062: result: $cf_cv_fvisibility_hidden2" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
+ 
+ 		if test "x$cf_cv_fvisibility_hidden2" = xyes
+@@ -17155,7 +17182,7 @@
+ fi
+ 
+ ###   use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:17158: checking if you want interop bindings" >&5
++echo "$as_me:17185: 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.
+@@ -17165,13 +17192,13 @@
+ else
+   with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:17168: result: $with_exp_interop" >&5
++echo "$as_me:17195: 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:17174: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:17201: 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.
+@@ -17181,13 +17208,13 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:17184: result: $with_safe_sprintf" >&5
++echo "$as_me:17211: 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:17190: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:17217: 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.
+@@ -17197,7 +17224,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:17200: result: $with_scroll_hints" >&5
++echo "$as_me:17227: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -17206,7 +17233,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17209: checking if you want wgetch-events code" >&5
++echo "$as_me:17236: 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.
+@@ -17216,7 +17243,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:17219: result: $with_wgetch_events" >&5
++echo "$as_me:17246: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ if test "x$with_wgetch_events" = xyes ; then
+ 
+@@ -17231,7 +17258,7 @@
+ 
+ case "$cf_cv_system_name" in
+ (*mingw32*|*mingw64*|*-msvc*)
+-	echo "$as_me:17234: checking if you want experimental-Windows driver" >&5
++	echo "$as_me:17261: 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.
+@@ -17241,7 +17268,7 @@
+ else
+   with_exp_win32=no
+ fi;
+-	echo "$as_me:17244: result: $with_exp_win32" >&5
++	echo "$as_me:17271: result: $with_exp_win32" >&5
+ echo "${ECHO_T}$with_exp_win32" >&6
+ 	if test "x$with_exp_win32" = xyes
+ 	then
+@@ -17267,7 +17294,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:17270: checking if you want to see long compiling messages" >&5
++echo "$as_me:17297: 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.
+@@ -17301,7 +17328,7 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:17304: result: $enableval" >&5
++echo "$as_me:17331: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ if test "x$enable_echo" = xyes; then
+@@ -17314,7 +17341,7 @@
+ 
+ # --disable-stripping is used for debugging
+ 
+-echo "$as_me:17317: checking if you want to install stripped executables" >&5
++echo "$as_me:17344: 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.
+@@ -17331,7 +17358,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:17334: result: $enable_stripping" >&5
++echo "$as_me:17361: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -17342,7 +17369,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:17345: checking if install accepts -p option" >&5
++echo "$as_me:17372: 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
+@@ -17373,10 +17400,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:17376: result: $cf_cv_install_p" >&5
++echo "$as_me:17403: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:17379: checking if install needs to be told about ownership" >&5
++echo "$as_me:17406: 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)
+@@ -17387,7 +17414,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17390: result: $with_install_o" >&5
++echo "$as_me:17417: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -17398,7 +17425,7 @@
+ 
+ if test -n "$INSTALL_OPT_S"
+ then
+-	echo "$as_me:17401: checking if you want to specify strip-program" >&5
++	echo "$as_me:17428: checking if you want to specify strip-program" >&5
+ echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
+ 
+ # Check whether --with-strip-program or --without-strip-program was given.
+@@ -17408,11 +17435,11 @@
+ else
+   with_strip_program=no
+ fi;
+-	echo "$as_me:17411: result: $with_strip_program" >&5
++	echo "$as_me:17438: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ 	if test "$with_strip_program" != no
+ 	then
+-		echo "$as_me:17415: checking if strip-program is supported with this installer" >&5
++		echo "$as_me:17442: checking if strip-program is supported with this installer" >&5
+ echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
+ 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
+ 		check_install_strip=no
+@@ -17433,11 +17460,11 @@
+ 				done
+ 			fi
+ 		fi
+-		echo "$as_me:17436: result: $check_install_strip" >&5
++		echo "$as_me:17463: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ 		case "$check_install_strip" in
+ 		(no)
+-			{ echo "$as_me:17440: WARNING: $cf_install_program does not support strip program option" >&5
++			{ echo "$as_me:17467: WARNING: $cf_install_program does not support strip program option" >&5
+ echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
+ 			with_strip_program=no
+ 			;;
+@@ -17452,7 +17479,7 @@
+ 			chmod +x "$INSTALL"
+ 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
+ 
+-echo "${as_me:-configure}:17455: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:17482: testing created $INSTALL ..." 1>&5
+ 
+ 			;;
+ 		(option)
+@@ -17478,7 +17505,7 @@
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+ 
+-echo "$as_me:17481: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:17508: 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.
+@@ -17495,17 +17522,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:17498: result: $enable_stdnoreturn" >&5
++echo "$as_me:17525: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:17502: checking for C11 _Noreturn feature" >&5
++echo "$as_me:17529: 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 17508 "configure"
++#line 17535 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17521,16 +17548,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17524: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17551: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17527: \$? = $ac_status" >&5
++  echo "$as_me:17554: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17530: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17557: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17533: \$? = $ac_status" >&5
++  echo "$as_me:17560: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -17541,7 +17568,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17544: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:17571: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -17597,16 +17624,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17600: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17627: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17605: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17632: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17609: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17636: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17645,16 +17672,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17648: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17675: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17653: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17680: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17657: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17684: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17693,23 +17720,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17696: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17723: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17701: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17728: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17705: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17732: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:17712: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:17739: 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.
+@@ -17726,7 +17753,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:17729: result: $enable_warnings" >&5
++echo "$as_me:17756: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -17750,7 +17777,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17753 "configure"
++#line 17780 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17765,26 +17792,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17768: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17795: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17771: \$? = $ac_status" >&5
++  echo "$as_me:17798: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17774: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17801: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17777: \$? = $ac_status" >&5
++  echo "$as_me:17804: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:17780: checking for X11/Xt const-feature" >&5
++echo "$as_me:17807: 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 17787 "configure"
++#line 17814 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -17802,16 +17829,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17805: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17832: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17808: \$? = $ac_status" >&5
++  echo "$as_me:17835: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17811: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17838: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17814: \$? = $ac_status" >&5
++  echo "$as_me:17841: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -17826,7 +17853,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17829: result: $cf_cv_const_x_string" >&5
++echo "$as_me:17856: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -17855,7 +17882,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:17901: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -17887,12 +17914,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17890: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17917: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17893: \$? = $ac_status" >&5
++  echo "$as_me:17920: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17895: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17922: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -17900,7 +17927,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:17903: checking for $CC warning options..." >&5
++	{ echo "$as_me:17930: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -17923,12 +17950,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:17926: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17953: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17929: \$? = $ac_status" >&5
++  echo "$as_me:17956: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17931: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17958: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -17936,7 +17963,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17939: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17966: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17946,7 +17973,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17949: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17976: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17979,10 +18006,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:17982: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:18009: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -18032,12 +18059,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:18035: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18062: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18038: \$? = $ac_status" >&5
++  echo "$as_me:18065: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18040: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:18067: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -18109,12 +18136,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:18112: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:18139: 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 18117 "configure"
++#line 18144 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18131,16 +18158,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18134: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18161: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18137: \$? = $ac_status" >&5
++  echo "$as_me:18164: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18140: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18167: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18143: \$? = $ac_status" >&5
++  echo "$as_me:18170: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -18151,7 +18178,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:18154: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:18181: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -18160,11 +18187,11 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:18163: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:18190: 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 18167 "configure"
++#line 18194 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18181,16 +18208,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18184: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18211: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18187: \$? = $ac_status" >&5
++  echo "$as_me:18214: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18190: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18217: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18193: \$? = $ac_status" >&5
++  echo "$as_me:18220: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_CPLUSPLUS=yes
+ 
+@@ -18200,7 +18227,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:18203: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:18230: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -18209,30 +18236,30 @@
+ if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:18212: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:18239: 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:18219: checking version of $CC" >&5
++	echo "$as_me:18246: 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:18223: result: $CLANG_VERSION" >&5
++	echo "$as_me:18250: 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:18230: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:18257: 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 18235 "configure"
++#line 18262 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -18246,16 +18273,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18249: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18276: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18252: \$? = $ac_status" >&5
++  echo "$as_me:18279: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18255: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18282: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18258: \$? = $ac_status" >&5
++  echo "$as_me:18285: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -18266,13 +18293,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:18269: result: $cf_clang_optok" >&5
++		echo "$as_me:18296: 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}:18275: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:18302: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -18289,7 +18316,7 @@
+ ac_main_return="return"
+ 
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:18337: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -18324,12 +18351,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:18327: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18354: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18330: \$? = $ac_status" >&5
++  echo "$as_me:18357: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18332: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18359: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -18338,7 +18365,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:18341: checking for $CXX warning options..." >&5
++	{ echo "$as_me:18368: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -18368,16 +18395,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:18371: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18398: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18374: \$? = $ac_status" >&5
++  echo "$as_me:18401: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18376: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18403: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:18380: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18407: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -18395,7 +18422,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:18398: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:18425: 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.
+@@ -18405,7 +18432,7 @@
+ else
+   enable_string_hacks=no
+ fi;
+-echo "$as_me:18408: result: $enable_string_hacks" >&5
++echo "$as_me:18435: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+ 
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -18414,15 +18441,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:18417: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:18444: 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:18419: checking for strlcat" >&5
++	echo "$as_me:18446: 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 18425 "configure"
++#line 18452 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18453,16 +18480,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18456: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18483: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18459: \$? = $ac_status" >&5
++  echo "$as_me:18486: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18462: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18489: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18465: \$? = $ac_status" >&5
++  echo "$as_me:18492: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -18472,7 +18499,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18475: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:18502: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+ 
+@@ -18482,7 +18509,7 @@
+ 
+ else
+ 
+-		echo "$as_me:18485: checking for strlcat in -lbsd" >&5
++		echo "$as_me:18512: 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
+@@ -18490,7 +18517,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18493 "configure"
++#line 18520 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18509,16 +18536,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18512: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18539: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18515: \$? = $ac_status" >&5
++  echo "$as_me:18542: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18518: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18545: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18521: \$? = $ac_status" >&5
++  echo "$as_me:18548: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -18529,7 +18556,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18532: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:18559: 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
+ 
+@@ -18552,23 +18579,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18555: checking for $ac_header" >&5
++echo "$as_me:18582: 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 18561 "configure"
++#line 18588 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18565: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18592: \"$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:18571: \$? = $ac_status" >&5
++  echo "$as_me:18598: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18587,7 +18614,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18590: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18617: 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:18638: 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 18617 "configure"
++#line 18644 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18645,16 +18672,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18648: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18675: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18651: \$? = $ac_status" >&5
++  echo "$as_me:18678: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18654: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18681: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18657: \$? = $ac_status" >&5
++  echo "$as_me:18684: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -18664,7 +18691,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18667: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:18694: 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:18707: 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.
+@@ -18687,7 +18714,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:18690: result: $with_assertions" >&5
++echo "$as_me:18717: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -18703,7 +18730,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:18706: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:18733: 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.
+@@ -18725,7 +18752,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:18728: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:18755: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18839,23 +18866,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:18842: checking for dmalloc.h" >&5
++	echo "$as_me:18869: 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 18848 "configure"
++#line 18875 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:18852: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18879: \"$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:18858: \$? = $ac_status" >&5
++  echo "$as_me:18885: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18874,11 +18901,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18877: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:18904: 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:18881: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:18908: 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
+@@ -18886,7 +18913,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18889 "configure"
++#line 18916 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18905,16 +18932,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18908: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18935: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18911: \$? = $ac_status" >&5
++  echo "$as_me:18938: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18914: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18941: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18917: \$? = $ac_status" >&5
++  echo "$as_me:18944: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -18925,7 +18952,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18928: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:18955: 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:18970: 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.
+@@ -18962,7 +18989,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:18965: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:18992: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19076,23 +19103,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:19079: checking for dbmalloc.h" >&5
++	echo "$as_me:19106: 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 19085 "configure"
++#line 19112 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:19089: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:19116: \"$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:19095: \$? = $ac_status" >&5
++  echo "$as_me:19122: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19111,11 +19138,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:19114: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:19141: 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:19118: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:19145: 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
+@@ -19123,7 +19150,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19126 "configure"
++#line 19153 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19142,16 +19169,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19145: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19172: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19148: \$? = $ac_status" >&5
++  echo "$as_me:19175: \$? = $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:19178: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19154: \$? = $ac_status" >&5
++  echo "$as_me:19181: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -19162,7 +19189,7 @@
+ 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_dbmalloc_debug_malloc" >&5
++echo "$as_me:19192: 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:19207: 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.
+@@ -19199,7 +19226,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:19202: result: ${with_valgrind:-no}" >&5
++echo "$as_me:19229: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19312,7 +19339,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19315: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:19342: 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.
+@@ -19323,7 +19350,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:19326: result: $with_no_leaks" >&5
++echo "$as_me:19353: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -19375,7 +19402,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19378: checking whether to add trace feature to all models" >&5
++echo "$as_me:19405: 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.
+@@ -19385,7 +19412,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:19388: result: $cf_with_trace" >&5
++echo "$as_me:19415: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -19405,7 +19432,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:19408: checking if we want to use GNAT projects" >&5
++echo "$as_me:19435: 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.
+@@ -19422,7 +19449,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:19425: result: $enable_gnat_projects" >&5
++echo "$as_me:19452: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -19435,14 +19462,14 @@
+ 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+ 	fi
+ 
+-echo "$as_me:19438: checking if ssp library is needed" >&5
++echo "$as_me:19465: 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 19445 "configure"
++#line 19472 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19459,16 +19486,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19462: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19489: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19465: \$? = $ac_status" >&5
++  echo "$as_me:19492: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19468: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19495: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19471: \$? = $ac_status" >&5
++  echo "$as_me:19498: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -19478,7 +19505,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19481 "configure"
++#line 19508 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19495,16 +19522,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19498: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19525: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19501: \$? = $ac_status" >&5
++  echo "$as_me:19528: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19504: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19531: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19507: \$? = $ac_status" >&5
++  echo "$as_me:19534: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -19518,7 +19545,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19521: result: $cf_cv_need_libssp" >&5
++echo "$as_me:19548: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -19547,14 +19574,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19550: checking if -lm needed for math functions" >&5
++echo "$as_me:19577: 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 19557 "configure"
++#line 19584 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19570,16 +19597,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19573: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19600: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19576: \$? = $ac_status" >&5
++  echo "$as_me:19603: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19579: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19606: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19582: \$? = $ac_status" >&5
++  echo "$as_me:19609: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -19589,7 +19616,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19592: result: $cf_cv_need_libm" >&5
++echo "$as_me:19619: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ 
+ if test "$cf_cv_need_libm" = yes
+@@ -19597,14 +19624,14 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lm"
+-	echo "$as_me:19600: checking if -lm is available for math functions" >&5
++	echo "$as_me:19627: checking if -lm is available for math functions" >&5
+ echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
+ if test "${cf_cv_have_libm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19607 "configure"
++#line 19634 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19620,16 +19647,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19623: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19650: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19626: \$? = $ac_status" >&5
++  echo "$as_me:19653: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19629: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19656: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19632: \$? = $ac_status" >&5
++  echo "$as_me:19659: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_libm=yes
+ else
+@@ -19639,7 +19666,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19642: result: $cf_cv_have_libm" >&5
++echo "$as_me:19669: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ 	LIBS="$cf_save_LIBS"
+ 
+@@ -19661,13 +19688,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:19664: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:19691: 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 19670 "configure"
++#line 19697 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -19683,16 +19710,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19686: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19713: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19689: \$? = $ac_status" >&5
++  echo "$as_me:19716: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19692: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19719: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19695: \$? = $ac_status" >&5
++  echo "$as_me:19722: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -19702,7 +19729,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19705: result: $ac_cv_header_time" >&5
++echo "$as_me:19732: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -19717,7 +19744,7 @@
+ case "$host_os" in
+ (mingw*)
+ 	# -lsystre -ltre -lintl -liconv
+-	echo "$as_me:19720: checking for regcomp in -lsystre" >&5
++	echo "$as_me:19747: 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
+@@ -19725,7 +19752,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsystre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19728 "configure"
++#line 19755 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19744,16 +19771,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19747: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19774: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19750: \$? = $ac_status" >&5
++  echo "$as_me:19777: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19753: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19780: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19756: \$? = $ac_status" >&5
++  echo "$as_me:19783: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_systre_regcomp=yes
+ else
+@@ -19764,11 +19791,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19767: result: $ac_cv_lib_systre_regcomp" >&5
++echo "$as_me:19794: 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:19771: checking for libiconv_open in -liconv" >&5
++		echo "$as_me:19798: 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
+@@ -19776,7 +19803,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19779 "configure"
++#line 19806 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19795,16 +19822,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19798: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19825: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19801: \$? = $ac_status" >&5
++  echo "$as_me:19828: \$? = $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:19831: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19807: \$? = $ac_status" >&5
++  echo "$as_me:19834: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_iconv_libiconv_open=yes
+ else
+@@ -19815,7 +19842,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19818: result: $ac_cv_lib_iconv_libiconv_open" >&5
++echo "$as_me:19845: 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
+ 
+@@ -19837,7 +19864,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19840: checking for libintl_gettext in -lintl" >&5
++		echo "$as_me:19867: 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
+@@ -19845,7 +19872,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19848 "configure"
++#line 19875 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19864,16 +19891,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19867: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19894: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19870: \$? = $ac_status" >&5
++  echo "$as_me:19897: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19873: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19900: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19876: \$? = $ac_status" >&5
++  echo "$as_me:19903: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_intl_libintl_gettext=yes
+ else
+@@ -19884,7 +19911,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19887: result: $ac_cv_lib_intl_libintl_gettext" >&5
++echo "$as_me:19914: 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
+ 
+@@ -19906,7 +19933,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19909: checking for tre_regcomp in -ltre" >&5
++		echo "$as_me:19936: 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
+@@ -19914,7 +19941,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19917 "configure"
++#line 19944 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19933,16 +19960,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19936: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19963: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19939: \$? = $ac_status" >&5
++  echo "$as_me:19966: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19942: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19969: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19945: \$? = $ac_status" >&5
++  echo "$as_me:19972: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_tre_tre_regcomp=yes
+ else
+@@ -19953,7 +19980,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19956: result: $ac_cv_lib_tre_tre_regcomp" >&5
++echo "$as_me:19983: 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
+ 
+@@ -19995,7 +20022,7 @@
+ 
+ else
+ 
+-		echo "$as_me:19998: checking for regcomp in -lgnurx" >&5
++		echo "$as_me:20025: 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
+@@ -20003,7 +20030,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgnurx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20006 "configure"
++#line 20033 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20022,16 +20049,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20025: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20052: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20028: \$? = $ac_status" >&5
++  echo "$as_me:20055: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20031: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20058: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20034: \$? = $ac_status" >&5
++  echo "$as_me:20061: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gnurx_regcomp=yes
+ else
+@@ -20042,7 +20069,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20045: result: $ac_cv_lib_gnurx_regcomp" >&5
++echo "$as_me:20072: 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
+ 
+@@ -20070,13 +20097,13 @@
+ 	;;
+ (*)
+ 	cf_regex_libs="regex re"
+-	echo "$as_me:20073: checking for regcomp" >&5
++	echo "$as_me:20100: 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 20079 "configure"
++#line 20106 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20107,16 +20134,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20110: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20137: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20113: \$? = $ac_status" >&5
++  echo "$as_me:20140: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20116: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20143: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20119: \$? = $ac_status" >&5
++  echo "$as_me:20146: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -20126,7 +20153,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20129: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:20156: 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
+@@ -20135,7 +20162,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:20138: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:20165: 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
+@@ -20143,7 +20170,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20146 "configure"
++#line 20173 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20162,16 +20189,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20165: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20192: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20168: \$? = $ac_status" >&5
++  echo "$as_me:20195: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20171: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20198: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20174: \$? = $ac_status" >&5
++  echo "$as_me:20201: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -20182,7 +20209,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20185: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:20212: 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
+ 
+@@ -20214,13 +20241,13 @@
+ esac
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:20217: checking for compile" >&5
++	echo "$as_me:20244: 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 20223 "configure"
++#line 20250 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20251,16 +20278,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20254: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20281: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20257: \$? = $ac_status" >&5
++  echo "$as_me:20284: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20260: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20287: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20263: \$? = $ac_status" >&5
++  echo "$as_me:20290: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -20270,13 +20297,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20273: result: $ac_cv_func_compile" >&5
++echo "$as_me:20300: 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:20279: checking for compile in -lgen" >&5
++		echo "$as_me:20306: 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
+@@ -20284,7 +20311,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20287 "configure"
++#line 20314 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20303,16 +20330,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20306: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20333: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20309: \$? = $ac_status" >&5
++  echo "$as_me:20336: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20312: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20339: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20315: \$? = $ac_status" >&5
++  echo "$as_me:20342: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -20323,7 +20350,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20326: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:20353: 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
+ 
+@@ -20351,11 +20378,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:20354: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:20381: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:20358: checking for regular-expression headers" >&5
++echo "$as_me:20385: 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
+@@ -20367,7 +20394,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20370 "configure"
++#line 20397 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -20384,16 +20411,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20387: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20414: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20390: \$? = $ac_status" >&5
++  echo "$as_me:20417: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20393: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20420: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20396: \$? = $ac_status" >&5
++  echo "$as_me:20423: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20410,7 +20437,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20413 "configure"
++#line 20440 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$cf_regex_hdr>
+@@ -20430,16 +20457,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20433: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20460: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20436: \$? = $ac_status" >&5
++  echo "$as_me:20463: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20439: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20466: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20442: \$? = $ac_status" >&5
++  echo "$as_me:20469: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20455,11 +20482,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:20458: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:20485: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case "$cf_cv_regex_hdrs" in
+-	(no)		{ echo "$as_me:20462: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:20489: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -20497,23 +20524,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20500: checking for $ac_header" >&5
++echo "$as_me:20527: 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 20506 "configure"
++#line 20533 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20510: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20537: \"$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:20516: \$? = $ac_status" >&5
++  echo "$as_me:20543: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20532,7 +20559,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20535: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20562: 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:20575: 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 20554 "configure"
++#line 20581 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20558: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20585: \"$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:20564: \$? = $ac_status" >&5
++  echo "$as_me:20591: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20580,7 +20607,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20583: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20610: 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:20620: 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
+@@ -20600,7 +20627,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20603 "configure"
++#line 20630 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20613,16 +20640,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20616: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20643: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20619: \$? = $ac_status" >&5
++  echo "$as_me:20646: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20622: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20649: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20625: \$? = $ac_status" >&5
++  echo "$as_me:20652: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -20634,7 +20661,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20637: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20664: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -20651,14 +20678,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20654: checking if external environ is declared" >&5
++echo "$as_me:20681: 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 20661 "configure"
++#line 20688 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -20671,16 +20698,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20674: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20701: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20677: \$? = $ac_status" >&5
++  echo "$as_me:20704: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20680: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20707: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20683: \$? = $ac_status" >&5
++  echo "$as_me:20710: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_environ=yes
+ else
+@@ -20691,7 +20718,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20694: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20721: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+ 
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20706,14 +20733,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:20709: checking if external environ exists" >&5
++echo "$as_me:20736: 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 20716 "configure"
++#line 20743 "configure"
+ #include "confdefs.h"
+ 
+ #undef environ
+@@ -20728,16 +20755,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20731: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20758: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20734: \$? = $ac_status" >&5
++  echo "$as_me:20761: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20737: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20764: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20740: \$? = $ac_status" >&5
++  echo "$as_me:20767: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_environ=yes
+ else
+@@ -20748,7 +20775,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20751: result: $cf_cv_have_environ" >&5
++echo "$as_me:20778: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+ 
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20761,13 +20788,13 @@
+ 
+ fi
+ 
+-echo "$as_me:20764: checking for getenv" >&5
++echo "$as_me:20791: 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 20770 "configure"
++#line 20797 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20798,16 +20825,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20801: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20828: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20804: \$? = $ac_status" >&5
++  echo "$as_me:20831: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20807: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20834: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20810: \$? = $ac_status" >&5
++  echo "$as_me:20837: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_getenv=yes
+ else
+@@ -20817,19 +20844,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20820: result: $ac_cv_func_getenv" >&5
++echo "$as_me:20847: 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:20826: checking for $ac_func" >&5
++echo "$as_me:20853: 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 20832 "configure"
++#line 20859 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20860,16 +20887,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20863: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20890: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20866: \$? = $ac_status" >&5
++  echo "$as_me:20893: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20869: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20896: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20872: \$? = $ac_status" >&5
++  echo "$as_me:20899: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -20879,7 +20906,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20882: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:20909: 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:20919: 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
+@@ -20899,7 +20926,7 @@
+   cf_cv_consistent_getenv=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20902 "configure"
++#line 20929 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21004,15 +21031,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21007: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21034: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21010: \$? = $ac_status" >&5
++  echo "$as_me:21037: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21012: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21039: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21015: \$? = $ac_status" >&5
++  echo "$as_me:21042: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_consistent_getenv=yes
+ else
+@@ -21025,7 +21052,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:21028: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:21055: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+ 
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -21040,18 +21067,18 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ 	test "x$cf_with_trace" = xyes
+ then
+-	{ echo "$as_me:21043: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++	{ echo "$as_me:21070: 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:21047: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:21074: 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 21054 "configure"
++#line 21081 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21071,16 +21098,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21074: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21101: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21077: \$? = $ac_status" >&5
++  echo "$as_me:21104: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21080: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21107: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21083: \$? = $ac_status" >&5
++  echo "$as_me:21110: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -21092,7 +21119,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21095: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:21122: 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
+@@ -21107,13 +21134,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:21110: checking for an ANSI C-conforming const" >&5
++echo "$as_me:21137: 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 21116 "configure"
++#line 21143 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21175,16 +21202,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21178: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21205: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21181: \$? = $ac_status" >&5
++  echo "$as_me:21208: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21184: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21211: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21187: \$? = $ac_status" >&5
++  echo "$as_me:21214: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -21194,7 +21221,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21197: result: $ac_cv_c_const" >&5
++echo "$as_me:21224: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -21204,7 +21231,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21207: checking for inline" >&5
++echo "$as_me:21234: 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
+@@ -21212,7 +21239,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21215 "configure"
++#line 21242 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo (void) {return 0; }
+@@ -21221,16 +21248,16 @@
+ 
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21224: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21251: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21227: \$? = $ac_status" >&5
++  echo "$as_me:21254: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21230: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21257: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21233: \$? = $ac_status" >&5
++  echo "$as_me:21260: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -21241,7 +21268,7 @@
+ done
+ 
+ fi
+-echo "$as_me:21244: result: $ac_cv_c_inline" >&5
++echo "$as_me:21271: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -21267,7 +21294,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:21270: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:21297: 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
+@@ -21276,7 +21303,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21279 "configure"
++#line 21306 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -21288,16 +21315,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21291: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21318: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21294: \$? = $ac_status" >&5
++  echo "$as_me:21321: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21297: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21324: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21300: \$? = $ac_status" >&5
++  echo "$as_me:21327: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -21309,7 +21336,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:21312: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:21339: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -21415,7 +21442,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:21418: checking for signal global datatype" >&5
++echo "$as_me:21445: 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
+@@ -21427,7 +21454,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21430 "configure"
++#line 21457 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21451,16 +21478,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21454: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21481: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21457: \$? = $ac_status" >&5
++  echo "$as_me:21484: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21460: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21487: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21463: \$? = $ac_status" >&5
++  echo "$as_me:21490: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21474,7 +21501,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21477: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21504: 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:21513: 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
+@@ -21493,7 +21520,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21496 "configure"
++#line 21523 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21528,15 +21555,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21531: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21558: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21534: \$? = $ac_status" >&5
++  echo "$as_me:21561: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21536: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21563: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21539: \$? = $ac_status" >&5
++  echo "$as_me:21566: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21551,7 +21578,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21554: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21581: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:21593: 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 21573 "configure"
++#line 21600 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21582,16 +21609,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21585: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21612: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21588: \$? = $ac_status" >&5
++  echo "$as_me:21615: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21591: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21618: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21594: \$? = $ac_status" >&5
++  echo "$as_me:21621: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -21603,7 +21630,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21606: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21633: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -21619,14 +21646,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:21622: checking if external errno is declared" >&5
++echo "$as_me:21649: 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 21629 "configure"
++#line 21656 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21640,16 +21667,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21643: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21670: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21646: \$? = $ac_status" >&5
++  echo "$as_me:21673: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21649: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21676: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21652: \$? = $ac_status" >&5
++  echo "$as_me:21679: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -21660,7 +21687,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21663: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21690: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21675,14 +21702,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:21678: checking if external errno exists" >&5
++echo "$as_me:21705: 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 21685 "configure"
++#line 21712 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -21697,16 +21724,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21700: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21727: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21703: \$? = $ac_status" >&5
++  echo "$as_me:21730: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21706: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21733: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21709: \$? = $ac_status" >&5
++  echo "$as_me:21736: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -21717,7 +21744,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21720: result: $cf_cv_have_errno" >&5
++echo "$as_me:21747: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21730,7 +21757,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21733: checking if data-only library module links" >&5
++echo "$as_me:21760: 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
+@@ -21738,20 +21765,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:21771: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21747: \$? = $ac_status" >&5
++  echo "$as_me:21774: \$? = $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:21798: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21774: \$? = $ac_status" >&5
++  echo "$as_me:21801: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -21784,7 +21811,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21787 "configure"
++#line 21814 "configure"
+ #include "confdefs.h"
+ 
+ 	extern int testfunc(void);
+@@ -21795,15 +21822,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21798: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21825: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21801: \$? = $ac_status" >&5
++  echo "$as_me:21828: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21803: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21830: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21806: \$? = $ac_status" >&5
++  echo "$as_me:21833: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -21818,7 +21845,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21821: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21848: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21833,13 +21860,13 @@
+ ###	Checks for library functions.
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:21836: checking for clock_gettime" >&5
++echo "$as_me:21863: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21842 "configure"
++#line 21869 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21870,16 +21897,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21873: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21900: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21876: \$? = $ac_status" >&5
++  echo "$as_me:21903: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21879: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21906: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21882: \$? = $ac_status" >&5
++  echo "$as_me:21909: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -21889,12 +21916,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21892: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:21919: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:21897: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:21924: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21902,7 +21929,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21905 "configure"
++#line 21932 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21921,16 +21948,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21924: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21951: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21927: \$? = $ac_status" >&5
++  echo "$as_me:21954: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21930: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21957: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21933: \$? = $ac_status" >&5
++  echo "$as_me:21960: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -21941,7 +21968,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21944: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:21971: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -21953,14 +21980,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:21956: checking if clock_gettime links" >&5
++echo "$as_me:21983: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21963 "configure"
++#line 21990 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21978,16 +22005,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21981: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22008: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21984: \$? = $ac_status" >&5
++  echo "$as_me:22011: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21987: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22014: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21990: \$? = $ac_status" >&5
++  echo "$as_me:22017: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -21998,7 +22025,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22001: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:22028: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -22012,13 +22039,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:22015: checking for gettimeofday" >&5
++echo "$as_me:22042: 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 22021 "configure"
++#line 22048 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22049,16 +22076,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22052: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22079: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22055: \$? = $ac_status" >&5
++  echo "$as_me:22082: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22058: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22085: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22061: \$? = $ac_status" >&5
++  echo "$as_me:22088: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -22068,7 +22095,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22071: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:22098: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -22078,7 +22105,7 @@
+ 
+ else
+ 
+-echo "$as_me:22081: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:22108: 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
+@@ -22086,7 +22113,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22089 "configure"
++#line 22116 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22105,16 +22132,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22108: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22135: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22111: \$? = $ac_status" >&5
++  echo "$as_me:22138: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22114: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22141: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22117: \$? = $ac_status" >&5
++  echo "$as_me:22144: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -22125,7 +22152,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22128: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:22155: 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
+ 
+@@ -22184,13 +22211,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:22187: checking for $ac_func" >&5
++echo "$as_me:22214: 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 22193 "configure"
++#line 22220 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22221,16 +22248,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22224: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22251: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22227: \$? = $ac_status" >&5
++  echo "$as_me:22254: \$? = $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:22257: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22233: \$? = $ac_status" >&5
++  echo "$as_me:22260: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -22240,7 +22267,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22243: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:22270: 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:22280: 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 22260 "configure"
++#line 22287 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22272,16 +22299,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22275: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22302: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22278: \$? = $ac_status" >&5
++  echo "$as_me:22305: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22281: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22308: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22284: \$? = $ac_status" >&5
++  echo "$as_me:22311: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_PATH_TTYS=yes
+ else
+@@ -22291,7 +22318,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22294: result: $cf_cv_PATH_TTYS" >&5
++echo "$as_me:22321: result: $cf_cv_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
+ 
+ if test $cf_cv_PATH_TTYS = no
+@@ -22313,7 +22340,7 @@
+ 
+ if test $cf_cv_PATH_TTYS != no
+ then
+-	echo "$as_me:22316: checking if _PATH_TTYS file exists" >&5
++	echo "$as_me:22343: 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
+@@ -22323,7 +22350,7 @@
+   cf_cv_have_PATH_TTYS=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22326 "configure"
++#line 22353 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22336,15 +22363,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22339: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22366: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22342: \$? = $ac_status" >&5
++  echo "$as_me:22369: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22344: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22371: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22347: \$? = $ac_status" >&5
++  echo "$as_me:22374: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_PATH_TTYS=yes
+ else
+@@ -22356,7 +22383,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22359: result: $cf_cv_have_PATH_TTYS" >&5
++echo "$as_me:22386: 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
+@@ -22368,14 +22395,14 @@
+ #define HAVE_PATH_TTYS 1
+ EOF
+ 
+-	echo "$as_me:22371: checking for getttynam" >&5
++	echo "$as_me:22398: 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 22378 "configure"
++#line 22405 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22387,16 +22414,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22390: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22417: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22393: \$? = $ac_status" >&5
++  echo "$as_me:22420: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22396: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22423: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22399: \$? = $ac_status" >&5
++  echo "$as_me:22426: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_getttynam=yes
+ else
+@@ -22406,7 +22433,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22409: result: $cf_cv_func_getttynam" >&5
++echo "$as_me:22436: 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
+@@ -22416,7 +22443,7 @@
+ 
+ if test "x$ac_cv_func_getopt" = xno && \
+    test "x$cf_with_progs$cf_with_tests" != xnono; then
+-	{ { echo "$as_me:22419: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:22446: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -22425,7 +22452,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:22428: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:22455: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -22438,14 +22465,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:22441: checking for terminal-capability database functions" >&5
++echo "$as_me:22468: 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 22448 "configure"
++#line 22475 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22465,16 +22492,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22468: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22495: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22471: \$? = $ac_status" >&5
++  echo "$as_me:22498: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22474: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22501: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22477: \$? = $ac_status" >&5
++  echo "$as_me:22504: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -22485,7 +22512,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22488: result: $cf_cv_cgetent" >&5
++echo "$as_me:22515: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -22495,14 +22522,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:22498: checking if cgetent uses const parameter" >&5
++echo "$as_me:22525: 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 22505 "configure"
++#line 22532 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -22525,16 +22552,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22528: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22555: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22531: \$? = $ac_status" >&5
++  echo "$as_me:22558: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22534: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22561: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22537: \$? = $ac_status" >&5
++  echo "$as_me:22564: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -22545,7 +22572,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22548: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:22575: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -22559,14 +22586,14 @@
+ 
+ fi
+ 
+-echo "$as_me:22562: checking for isascii" >&5
++echo "$as_me:22589: 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 22569 "configure"
++#line 22596 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22578,16 +22605,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22581: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22608: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22584: \$? = $ac_status" >&5
++  echo "$as_me:22611: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22587: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22614: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22590: \$? = $ac_status" >&5
++  echo "$as_me:22617: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -22598,7 +22625,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22601: result: $cf_cv_have_isascii" >&5
++echo "$as_me:22628: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -22606,10 +22633,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:22609: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:22636: 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 22612 "configure"
++#line 22639 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22623,16 +22650,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22626: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22653: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22629: \$? = $ac_status" >&5
++  echo "$as_me:22656: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22632: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22659: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22635: \$? = $ac_status" >&5
++  echo "$as_me:22662: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=no
+ else
+@@ -22640,7 +22667,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22643 "configure"
++#line 22670 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22655,16 +22682,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22658: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22685: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22661: \$? = $ac_status" >&5
++  echo "$as_me:22688: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22664: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22691: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22667: \$? = $ac_status" >&5
++  echo "$as_me:22694: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=yes
+ 
+@@ -22680,11 +22707,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:22683: result: $sigact_bad" >&5
++echo "$as_me:22710: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:22687: checking if nanosleep really works" >&5
++echo "$as_me:22714: 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
+@@ -22694,7 +22721,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22697 "configure"
++#line 22724 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22720,15 +22747,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22723: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22750: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22726: \$? = $ac_status" >&5
++  echo "$as_me:22753: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22728: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22755: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22731: \$? = $ac_status" >&5
++  echo "$as_me:22758: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -22740,7 +22767,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22743: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:22770: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -22757,23 +22784,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22760: checking for $ac_header" >&5
++echo "$as_me:22787: 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 22766 "configure"
++#line 22793 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22770: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22797: \"$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:22776: \$? = $ac_status" >&5
++  echo "$as_me:22803: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22792,7 +22819,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22795: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22822: 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:22839: 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 22815 "configure"
++#line 22842 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22824,16 +22851,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22827: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22854: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22830: \$? = $ac_status" >&5
++  echo "$as_me:22857: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22833: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22860: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22836: \$? = $ac_status" >&5
++  echo "$as_me:22863: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=no
+ else
+@@ -22841,7 +22868,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22844 "configure"
++#line 22871 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22855,16 +22882,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22858: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22885: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22861: \$? = $ac_status" >&5
++  echo "$as_me:22888: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22864: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22891: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22867: \$? = $ac_status" >&5
++  echo "$as_me:22894: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=unknown
+ else
+@@ -22880,19 +22907,19 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:22883: result: $termios_bad" >&5
++	echo "$as_me:22910: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:22888: checking for tcgetattr" >&5
++echo "$as_me:22915: 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 22895 "configure"
++#line 22922 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22920,16 +22947,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22923: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22950: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22926: \$? = $ac_status" >&5
++  echo "$as_me:22953: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22929: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22956: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22932: \$? = $ac_status" >&5
++  echo "$as_me:22959: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -22939,21 +22966,21 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22942: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:22969: 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:22949: checking for vsscanf function or workaround" >&5
++echo "$as_me:22976: 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 22956 "configure"
++#line 22983 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22979,16 +23006,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22982: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23009: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22985: \$? = $ac_status" >&5
++  echo "$as_me:23012: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22988: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23015: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22991: \$? = $ac_status" >&5
++  echo "$as_me:23018: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -22996,7 +23023,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22999 "configure"
++#line 23026 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23018,16 +23045,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23021: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23048: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23024: \$? = $ac_status" >&5
++  echo "$as_me:23051: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23027: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23054: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23030: \$? = $ac_status" >&5
++  echo "$as_me:23057: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -23035,7 +23062,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23038 "configure"
++#line 23065 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23057,16 +23084,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23060: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23087: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23063: \$? = $ac_status" >&5
++  echo "$as_me:23090: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23066: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23093: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23069: \$? = $ac_status" >&5
++  echo "$as_me:23096: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -23081,7 +23108,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23084: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:23111: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case "$cf_cv_func_vsscanf" in
+@@ -23107,23 +23134,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:23110: checking for $ac_header" >&5
++echo "$as_me:23137: 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 23116 "configure"
++#line 23143 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23120: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23147: \"$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:23126: \$? = $ac_status" >&5
++  echo "$as_me:23153: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23142,7 +23169,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23145: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23172: 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:23182: 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
+@@ -23163,7 +23190,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23166 "configure"
++#line 23193 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23198,15 +23225,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23201: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23228: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23204: \$? = $ac_status" >&5
++  echo "$as_me:23231: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23206: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23233: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23209: \$? = $ac_status" >&5
++  echo "$as_me:23236: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -23221,16 +23248,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:23224: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:23251: 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:23227: checking for mkstemp" >&5
++	echo "$as_me:23254: 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 23233 "configure"
++#line 23260 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23261,16 +23288,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23264: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23291: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23267: \$? = $ac_status" >&5
++  echo "$as_me:23294: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23270: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23297: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23273: \$? = $ac_status" >&5
++  echo "$as_me:23300: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -23280,7 +23307,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23283: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:23310: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -23301,21 +23328,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:23304: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:23331: 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:23307: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:23334: 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:23313: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:23340: 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 23318 "configure"
++#line 23345 "configure"
+ #include "confdefs.h"
+ #include 
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -23332,15 +23359,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23335: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23362: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23338: \$? = $ac_status" >&5
++  echo "$as_me:23365: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23340: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23367: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23343: \$? = $ac_status" >&5
++  echo "$as_me:23370: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -23353,7 +23380,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:23356: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:23383: 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
+ 
+@@ -23364,13 +23391,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:23367: checking for intptr_t" >&5
++echo "$as_me:23394: 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 23373 "configure"
++#line 23400 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23385,16 +23412,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23388: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23415: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23391: \$? = $ac_status" >&5
++  echo "$as_me:23418: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23394: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23421: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23397: \$? = $ac_status" >&5
++  echo "$as_me:23424: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -23404,7 +23431,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23407: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:23434: 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
+   :
+@@ -23416,13 +23443,13 @@
+ 
+ fi
+ 
+-echo "$as_me:23419: checking for ssize_t" >&5
++echo "$as_me:23446: 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 23425 "configure"
++#line 23452 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23437,16 +23464,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23440: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23467: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23443: \$? = $ac_status" >&5
++  echo "$as_me:23470: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23446: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23473: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23449: \$? = $ac_status" >&5
++  echo "$as_me:23476: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -23456,7 +23483,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23459: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:23486: 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
+   :
+@@ -23468,14 +23495,14 @@
+ 
+ fi
+ 
+-echo "$as_me:23471: checking for type sigaction_t" >&5
++echo "$as_me:23498: 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 23478 "configure"
++#line 23505 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23488,16 +23515,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23491: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23518: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23494: \$? = $ac_status" >&5
++  echo "$as_me:23521: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23497: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23524: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23500: \$? = $ac_status" >&5
++  echo "$as_me:23527: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -23508,14 +23535,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:23511: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:23538: 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:23518: checking declaration of size-change" >&5
++echo "$as_me:23545: 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
+@@ -23536,7 +23563,7 @@
+ 
+ 	fi
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23539 "configure"
++#line 23566 "configure"
+ #include "confdefs.h"
+ #include 
+ #ifdef HAVE_TERMIOS_H
+@@ -23586,16 +23613,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23589: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23616: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23592: \$? = $ac_status" >&5
++  echo "$as_me:23619: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23595: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23622: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23598: \$? = $ac_status" >&5
++  echo "$as_me:23625: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -23614,7 +23641,7 @@
+ done
+ 
+ fi
+-echo "$as_me:23617: result: $cf_cv_sizechange" >&5
++echo "$as_me:23644: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -23632,13 +23659,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:23635: checking for memmove" >&5
++echo "$as_me:23662: 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 23641 "configure"
++#line 23668 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23669,16 +23696,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23672: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23699: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23675: \$? = $ac_status" >&5
++  echo "$as_me:23702: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23678: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23705: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23681: \$? = $ac_status" >&5
++  echo "$as_me:23708: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -23688,19 +23715,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23691: result: $ac_cv_func_memmove" >&5
++echo "$as_me:23718: 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:23697: checking for bcopy" >&5
++echo "$as_me:23724: 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 23703 "configure"
++#line 23730 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23731,16 +23758,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23734: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23761: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23737: \$? = $ac_status" >&5
++  echo "$as_me:23764: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23740: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23767: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23743: \$? = $ac_status" >&5
++  echo "$as_me:23770: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -23750,11 +23777,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23753: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:23780: 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:23757: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:23784: 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
+@@ -23764,7 +23791,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23767 "configure"
++#line 23794 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23780,15 +23807,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23783: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23810: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23786: \$? = $ac_status" >&5
++  echo "$as_me:23813: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23788: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23815: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23791: \$? = $ac_status" >&5
++  echo "$as_me:23818: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -23801,7 +23828,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:23804: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:23831: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -23828,13 +23855,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23831: checking for $ac_func" >&5
++echo "$as_me:23858: 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 23837 "configure"
++#line 23864 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23865,16 +23892,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23868: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23895: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23871: \$? = $ac_status" >&5
++  echo "$as_me:23898: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23874: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23901: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23877: \$? = $ac_status" >&5
++  echo "$as_me:23904: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23884,7 +23911,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23887: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23914: 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:23924: 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
+@@ -23904,7 +23931,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23907 "configure"
++#line 23934 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23957,15 +23984,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23960: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23987: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23963: \$? = $ac_status" >&5
++  echo "$as_me:23990: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23965: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23992: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23968: \$? = $ac_status" >&5
++  echo "$as_me:23995: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -23977,21 +24004,21 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23980: result: $cf_cv_working_poll" >&5
++echo "$as_me:24007: 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:23987: checking if MB_LEN_MAX is usable" >&5
++echo "$as_me:24014: checking if MB_LEN_MAX is usable" >&5
+ echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
+ if test "${cf_cv_mb_len_max+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23994 "configure"
++#line 24021 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24011,16 +24038,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24014: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24041: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24017: \$? = $ac_status" >&5
++  echo "$as_me:24044: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24047: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24023: \$? = $ac_status" >&5
++  echo "$as_me:24050: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mb_len_max=yes
+ else
+@@ -24030,7 +24057,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24033: result: $cf_cv_mb_len_max" >&5
++echo "$as_me:24060: result: $cf_cv_mb_len_max" >&5
+ echo "${ECHO_T}$cf_cv_mb_len_max" >&6
+ if test "$cf_cv_mb_len_max" = yes
+ then
+@@ -24040,18 +24067,18 @@
+ EOF
+ 
+ else
+-	{ echo "$as_me:24043: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
++	{ echo "$as_me:24070: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+ echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
+ fi
+ 
+-echo "$as_me:24047: checking for va_copy" >&5
++echo "$as_me:24074: 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 24054 "configure"
++#line 24081 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24068,16 +24095,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24071: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24098: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24074: \$? = $ac_status" >&5
++  echo "$as_me:24101: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24077: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24104: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24080: \$? = $ac_status" >&5
++  echo "$as_me:24107: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -24087,7 +24114,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24090: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:24117: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -24099,14 +24126,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:24102: checking for __va_copy" >&5
++echo "$as_me:24129: 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 24109 "configure"
++#line 24136 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24123,16 +24150,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24126: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24153: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24129: \$? = $ac_status" >&5
++  echo "$as_me:24156: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24132: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24159: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24135: \$? = $ac_status" >&5
++  echo "$as_me:24162: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -24142,7 +24169,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24145: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:24172: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -24154,14 +24181,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:24157: checking for __builtin_va_copy" >&5
++echo "$as_me:24184: 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 24164 "configure"
++#line 24191 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24178,16 +24205,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24181: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24208: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24184: \$? = $ac_status" >&5
++  echo "$as_me:24211: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24187: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24214: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24190: \$? = $ac_status" >&5
++  echo "$as_me:24217: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -24197,7 +24224,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24200: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:24227: 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 &&
+@@ -24215,14 +24242,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:24218: checking if we can simply copy va_list" >&5
++	echo "$as_me:24245: 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 24225 "configure"
++#line 24252 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24239,16 +24266,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24242: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24269: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24245: \$? = $ac_status" >&5
++  echo "$as_me:24272: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24248: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24275: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24251: \$? = $ac_status" >&5
++  echo "$as_me:24278: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -24258,19 +24285,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24261: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:24288: 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:24266: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:24293: 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 24273 "configure"
++#line 24300 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24287,16 +24314,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24290: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24317: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24293: \$? = $ac_status" >&5
++  echo "$as_me:24320: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24296: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24323: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24299: \$? = $ac_status" >&5
++  echo "$as_me:24326: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -24306,7 +24333,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24309: result: $cf_cv_array_va_list" >&5
++echo "$as_me:24336: 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
+@@ -24317,13 +24344,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:24320: checking for pid_t" >&5
++echo "$as_me:24347: 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 24326 "configure"
++#line 24353 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24338,16 +24365,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24341: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24368: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24344: \$? = $ac_status" >&5
++  echo "$as_me:24371: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24347: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24374: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24350: \$? = $ac_status" >&5
++  echo "$as_me:24377: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -24357,7 +24384,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24360: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:24387: 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
+   :
+@@ -24372,23 +24399,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:24375: checking for $ac_header" >&5
++echo "$as_me:24402: 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 24381 "configure"
++#line 24408 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:24385: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:24412: \"$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:24391: \$? = $ac_status" >&5
++  echo "$as_me:24418: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -24407,7 +24434,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24410: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:24437: 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:24450: 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 24429 "configure"
++#line 24456 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -24457,16 +24484,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24460: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24487: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24463: \$? = $ac_status" >&5
++  echo "$as_me:24490: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24466: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24493: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24469: \$? = $ac_status" >&5
++  echo "$as_me:24496: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -24476,7 +24503,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24479: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:24506: 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:24518: 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
+@@ -24511,15 +24538,15 @@
+       }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24514: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24541: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24517: \$? = $ac_status" >&5
++  echo "$as_me:24544: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24519: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24546: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24522: \$? = $ac_status" >&5
++  echo "$as_me:24549: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -24531,7 +24558,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24534: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:24561: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -24545,12 +24572,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:24548: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24575: 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:24553: checking for working vfork" >&5
++  echo "$as_me:24580: 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
+@@ -24559,7 +24586,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24562 "configure"
++#line 24589 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include 
+@@ -24652,15 +24679,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24655: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24682: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24658: \$? = $ac_status" >&5
++  echo "$as_me:24685: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24660: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24687: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24663: \$? = $ac_status" >&5
++  echo "$as_me:24690: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -24672,13 +24699,13 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24675: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:24702: 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:24681: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24708: 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
+ 
+@@ -24703,7 +24730,7 @@
+ 
+ fi
+ 
+-echo "$as_me:24706: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:24733: 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
+@@ -24713,7 +24740,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24716 "configure"
++#line 24743 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24748,15 +24775,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24751: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24778: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24754: \$? = $ac_status" >&5
++  echo "$as_me:24781: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24756: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24783: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24759: \$? = $ac_status" >&5
++  echo "$as_me:24786: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fopen_bin_r=yes
+ else
+@@ -24769,7 +24796,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:24772: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:24799: 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
+@@ -24778,7 +24805,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:24781: checking for openpty in -lutil" >&5
++echo "$as_me:24808: 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
+@@ -24786,7 +24813,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24789 "configure"
++#line 24816 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -24805,16 +24832,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24808: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24835: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24811: \$? = $ac_status" >&5
++  echo "$as_me:24838: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24814: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24841: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24817: \$? = $ac_status" >&5
++  echo "$as_me:24844: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -24825,7 +24852,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:24828: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:24855: 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
+@@ -24833,7 +24860,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:24836: checking for openpty header" >&5
++echo "$as_me:24863: 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
+@@ -24860,7 +24887,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24863 "configure"
++#line 24890 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -24878,16 +24905,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24881: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24908: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24884: \$? = $ac_status" >&5
++  echo "$as_me:24911: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24887: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24914: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24890: \$? = $ac_status" >&5
++  echo "$as_me:24917: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -24905,7 +24932,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:24908: result: $cf_cv_func_openpty" >&5
++echo "$as_me:24935: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -24978,7 +25005,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24981 "configure"
++#line 25008 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -24990,16 +25017,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24993: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25020: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24996: \$? = $ac_status" >&5
++  echo "$as_me:25023: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24999: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25026: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25002: \$? = $ac_status" >&5
++  echo "$as_me:25029: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25016,7 +25043,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}:25019: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25046: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25052,7 +25079,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}:25055: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25082: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25063,7 +25090,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:25066: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:25093: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -25135,7 +25162,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25138 "configure"
++#line 25165 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -25147,16 +25174,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25150: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25177: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25153: \$? = $ac_status" >&5
++  echo "$as_me:25180: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25156: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25183: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25159: \$? = $ac_status" >&5
++  echo "$as_me:25186: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25173,7 +25200,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}:25176: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25203: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25253,7 +25280,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}:25256: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25283: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25270,23 +25297,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:25273: checking for db.h" >&5
++echo "$as_me:25300: 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 25279 "configure"
++#line 25306 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:25283: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25310: \"$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:25289: \$? = $ac_status" >&5
++  echo "$as_me:25316: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -25305,11 +25332,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25308: result: $ac_cv_header_db_h" >&5
++echo "$as_me:25335: 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:25312: checking for version of db" >&5
++echo "$as_me:25339: 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
+@@ -25320,10 +25347,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:25323: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:25350: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25326 "configure"
++#line 25353 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25353,16 +25380,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25356: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25383: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25359: \$? = $ac_status" >&5
++  echo "$as_me:25386: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25362: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25389: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25365: \$? = $ac_status" >&5
++  echo "$as_me:25392: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -25376,16 +25403,16 @@
+ done
+ 
+ fi
+-echo "$as_me:25379: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:25406: 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:25383: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:25410: 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:25388: checking for db libraries" >&5
++echo "$as_me:25415: 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
+@@ -25415,10 +25442,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:25418: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:25445: testing checking for library $cf_db_libs ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25421 "configure"
++#line 25448 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25473,16 +25500,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25476: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25503: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25479: \$? = $ac_status" >&5
++  echo "$as_me:25506: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25482: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25509: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25485: \$? = $ac_status" >&5
++  echo "$as_me:25512: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -25502,11 +25529,11 @@
+ done
+ 
+ fi
+-echo "$as_me:25505: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:25532: 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:25509: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:25536: 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
+@@ -25532,7 +25559,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:25535: error: Cannot find db.h" >&5
++	{ { echo "$as_me:25562: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -25547,7 +25574,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:25550: checking if we should include stdbool.h" >&5
++echo "$as_me:25577: 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
+@@ -25555,7 +25582,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25558 "configure"
++#line 25585 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -25567,23 +25594,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25570: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25597: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25573: \$? = $ac_status" >&5
++  echo "$as_me:25600: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25576: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25603: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25579: \$? = $ac_status" >&5
++  echo "$as_me:25606: \$? = $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 25586 "configure"
++#line 25613 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -25599,16 +25626,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25602: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25629: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25605: \$? = $ac_status" >&5
++  echo "$as_me:25632: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25608: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25635: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25611: \$? = $ac_status" >&5
++  echo "$as_me:25638: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -25622,13 +25649,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:25625: result: yes" >&5
++then	echo "$as_me:25652: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25627: result: no" >&5
++else	echo "$as_me:25654: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:25631: checking for builtin bool type" >&5
++echo "$as_me:25658: 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
+@@ -25636,7 +25663,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25639 "configure"
++#line 25666 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25651,16 +25678,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25654: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25681: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25657: \$? = $ac_status" >&5
++  echo "$as_me:25684: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25660: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25687: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25663: \$? = $ac_status" >&5
++  echo "$as_me:25690: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -25673,9 +25700,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:25676: result: yes" >&5
++then	echo "$as_me:25703: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25678: result: no" >&5
++else	echo "$as_me:25705: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -25692,10 +25719,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:25695: checking if we already have C++ library" >&5
++	echo "$as_me:25722: 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 25698 "configure"
++#line 25725 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -25709,16 +25736,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25712: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25739: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25715: \$? = $ac_status" >&5
++  echo "$as_me:25742: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25718: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25745: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25721: \$? = $ac_status" >&5
++  echo "$as_me:25748: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -25727,7 +25754,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-	echo "$as_me:25730: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:25757: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -25746,7 +25773,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:25749: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:25776: 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
+@@ -25772,7 +25799,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25775 "configure"
++#line 25802 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -25786,16 +25813,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25789: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25816: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25792: \$? = $ac_status" >&5
++  echo "$as_me:25819: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25795: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25822: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25798: \$? = $ac_status" >&5
++  echo "$as_me:25825: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -25807,7 +25834,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:25810: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:25837: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -25829,7 +25856,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:25832: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:25859: 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
+@@ -25844,15 +25871,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:25847: \"$ac_try\"") >&5
++if { (eval echo "$as_me:25874: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25850: \$? = $ac_status" >&5
++  echo "$as_me:25877: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25852: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:25879: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25855: \$? = $ac_status" >&5
++  echo "$as_me:25882: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -25863,10 +25890,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+-  echo "$as_me:25866: result: yes" >&5
++  echo "$as_me:25893: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:25869: result: no" >&5
++  echo "$as_me:25896: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -25886,7 +25913,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:25889: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:25916: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -25907,7 +25934,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25910 "configure"
++#line 25937 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -25921,16 +25948,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25924: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25951: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25927: \$? = $ac_status" >&5
++  echo "$as_me:25954: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25930: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25957: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25933: \$? = $ac_status" >&5
++  echo "$as_me:25960: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -25967,7 +25994,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25970 "configure"
++#line 25997 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25981,16 +26008,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25984: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26011: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25987: \$? = $ac_status" >&5
++  echo "$as_me:26014: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25990: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26017: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25993: \$? = $ac_status" >&5
++  echo "$as_me:26020: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -26023,7 +26050,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	LIBS="$cf_save"
+-	echo "$as_me:26026: result: $cf_cxx_library" >&5
++	echo "$as_me:26053: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -26039,7 +26066,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:26042: checking how to run the C++ preprocessor" >&5
++echo "$as_me:26069: 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
+@@ -26056,18 +26083,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 26059 "configure"
++#line 26086 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26064: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26091: \"$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:26070: \$? = $ac_status" >&5
++  echo "$as_me:26097: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26090,17 +26117,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26093 "configure"
++#line 26120 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26097: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26124: \"$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:26103: \$? = $ac_status" >&5
++  echo "$as_me:26130: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26137,7 +26164,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:26140: result: $CXXCPP" >&5
++echo "$as_me:26167: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -26147,18 +26174,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 26150 "configure"
++#line 26177 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26155: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26182: \"$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:26161: \$? = $ac_status" >&5
++  echo "$as_me:26188: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26181,17 +26208,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26184 "configure"
++#line 26211 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26188: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26215: \"$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:26194: \$? = $ac_status" >&5
++  echo "$as_me:26221: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26219,7 +26246,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:26222: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:26249: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -26234,23 +26261,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:26237: checking for $ac_header" >&5
++echo "$as_me:26264: 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 26243 "configure"
++#line 26270 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26247: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26274: \"$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:26253: \$? = $ac_status" >&5
++  echo "$as_me:26280: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26269,7 +26296,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26272: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26299: 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:26312: 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 26291 "configure"
++#line 26318 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26295: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26322: \"$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:26301: \$? = $ac_status" >&5
++  echo "$as_me:26328: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26317,7 +26344,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26320: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26347: 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:26358: 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 26334 "configure"
++#line 26361 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26348,16 +26375,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26351: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26378: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26354: \$? = $ac_status" >&5
++  echo "$as_me:26381: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26357: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26384: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26360: \$? = $ac_status" >&5
++  echo "$as_me:26387: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -26366,7 +26393,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:26369: result: $cf_iostream_namespace" >&5
++	echo "$as_me:26396: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -26377,7 +26404,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:26380: checking if we should include stdbool.h" >&5
++echo "$as_me:26407: 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
+@@ -26385,7 +26412,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26388 "configure"
++#line 26415 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -26397,23 +26424,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26400: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26427: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26403: \$? = $ac_status" >&5
++  echo "$as_me:26430: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26406: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26433: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26409: \$? = $ac_status" >&5
++  echo "$as_me:26436: \$? = $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 26416 "configure"
++#line 26443 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -26429,16 +26456,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26432: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26459: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26435: \$? = $ac_status" >&5
++  echo "$as_me:26462: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26438: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26465: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26441: \$? = $ac_status" >&5
++  echo "$as_me:26468: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -26452,13 +26479,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:26455: result: yes" >&5
++then	echo "$as_me:26482: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:26457: result: no" >&5
++else	echo "$as_me:26484: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:26461: checking for builtin bool type" >&5
++echo "$as_me:26488: 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
+@@ -26466,7 +26493,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26469 "configure"
++#line 26496 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26481,16 +26508,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26484: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26511: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26487: \$? = $ac_status" >&5
++  echo "$as_me:26514: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26490: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26517: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26493: \$? = $ac_status" >&5
++  echo "$as_me:26520: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -26503,19 +26530,19 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:26506: result: yes" >&5
++then	echo "$as_me:26533: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:26508: result: no" >&5
++else	echo "$as_me:26535: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:26512: checking for bool" >&5
++echo "$as_me:26539: 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 26518 "configure"
++#line 26545 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26550,16 +26577,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26553: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26580: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26556: \$? = $ac_status" >&5
++  echo "$as_me:26583: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26559: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26586: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26562: \$? = $ac_status" >&5
++  echo "$as_me:26589: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -26569,10 +26596,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26572: result: $ac_cv_type_bool" >&5
++echo "$as_me:26599: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:26575: checking size of bool" >&5
++echo "$as_me:26602: 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
+@@ -26581,7 +26608,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26584 "configure"
++#line 26611 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26613,21 +26640,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26616: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26643: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26619: \$? = $ac_status" >&5
++  echo "$as_me:26646: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26622: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26649: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26625: \$? = $ac_status" >&5
++  echo "$as_me:26652: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26630 "configure"
++#line 26657 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26659,16 +26686,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26662: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26689: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26665: \$? = $ac_status" >&5
++  echo "$as_me:26692: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26668: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26695: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26671: \$? = $ac_status" >&5
++  echo "$as_me:26698: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -26684,7 +26711,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26687 "configure"
++#line 26714 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26716,16 +26743,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26719: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26746: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26722: \$? = $ac_status" >&5
++  echo "$as_me:26749: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26725: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26752: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26728: \$? = $ac_status" >&5
++  echo "$as_me:26755: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -26741,7 +26768,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 26744 "configure"
++#line 26771 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26773,16 +26800,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26776: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26803: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26779: \$? = $ac_status" >&5
++  echo "$as_me:26806: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26782: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26809: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26785: \$? = $ac_status" >&5
++  echo "$as_me:26812: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -26795,12 +26822,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:26798: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:26825: 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 26803 "configure"
++#line 26830 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26836,15 +26863,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26839: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26866: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26842: \$? = $ac_status" >&5
++  echo "$as_me:26869: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26844: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26871: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26847: \$? = $ac_status" >&5
++  echo "$as_me:26874: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -26860,13 +26887,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:26863: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:26890: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:26896: 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
+@@ -26885,7 +26912,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26888 "configure"
++#line 26915 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26926,15 +26953,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26929: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26956: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26932: \$? = $ac_status" >&5
++  echo "$as_me:26959: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26934: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26961: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26937: \$? = $ac_status" >&5
++  echo "$as_me:26964: \$? = $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
+@@ -26951,19 +26978,19 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:26954: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:26981: 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:26961: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:26988: 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:26966: checking for special defines needed for etip.h" >&5
++echo "$as_me:26993: 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"
+@@ -26981,7 +27008,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 26984 "configure"
++#line 27011 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26995,16 +27022,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26998: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27025: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27001: \$? = $ac_status" >&5
++  echo "$as_me:27028: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27004: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27031: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27007: \$? = $ac_status" >&5
++  echo "$as_me:27034: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:27055: result: ${cf_result:-(none)}" >&5
+ echo "${ECHO_T}${cf_result:-(none)}" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27033: checking if $CXX accepts override keyword" >&5
++echo "$as_me:27060: checking if $CXX accepts override keyword" >&5
+ echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
+ if test "${cf_cv_cpp_override+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27047,7 +27074,7 @@
+   cf_cv_cpp_override=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27050 "configure"
++#line 27077 "configure"
+ #include "confdefs.h"
+ 
+ class base
+@@ -27066,15 +27093,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27069: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27096: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27072: \$? = $ac_status" >&5
++  echo "$as_me:27099: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27074: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27101: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27077: \$? = $ac_status" >&5
++  echo "$as_me:27104: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_override=yes
+ else
+@@ -27093,7 +27120,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27096: result: $cf_cv_cpp_override" >&5
++echo "$as_me:27123: result: $cf_cv_cpp_override" >&5
+ echo "${ECHO_T}$cf_cv_cpp_override" >&6
+ fi
+ test "$cf_cv_cpp_override" = yes &&
+@@ -27102,7 +27129,7 @@
+ EOF
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27105: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:27132: 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
+@@ -27119,7 +27146,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27122 "configure"
++#line 27149 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -27138,15 +27165,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27141: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27168: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27144: \$? = $ac_status" >&5
++  echo "$as_me:27171: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27146: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27173: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27149: \$? = $ac_status" >&5
++  echo "$as_me:27176: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -27165,7 +27192,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27168: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:27195: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -27175,7 +27202,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:27178: checking if $CXX accepts static_cast" >&5
++echo "$as_me:27205: 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
+@@ -27189,7 +27216,7 @@
+ ac_main_return="return"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27192 "configure"
++#line 27219 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -27233,16 +27260,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27236: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27263: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27239: \$? = $ac_status" >&5
++  echo "$as_me:27266: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27242: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27269: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27245: \$? = $ac_status" >&5
++  echo "$as_me:27272: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -27260,7 +27287,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27263: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:27290: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -27309,13 +27336,13 @@
+ 	else
+ 		if test "$cf_cv_header_stdbool_h" = 1 ; then
+ 
+-echo "$as_me:27312: checking for bool" >&5
++echo "$as_me:27339: 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 27318 "configure"
++#line 27345 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27350,16 +27377,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27353: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27380: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27356: \$? = $ac_status" >&5
++  echo "$as_me:27383: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27359: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27386: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27362: \$? = $ac_status" >&5
++  echo "$as_me:27389: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -27369,10 +27396,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27372: result: $ac_cv_type_bool" >&5
++echo "$as_me:27399: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:27375: checking size of bool" >&5
++echo "$as_me:27402: 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
+@@ -27381,7 +27408,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27384 "configure"
++#line 27411 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27413,21 +27440,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27416: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27443: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27419: \$? = $ac_status" >&5
++  echo "$as_me:27446: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27422: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27449: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27425: \$? = $ac_status" >&5
++  echo "$as_me:27452: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27430 "configure"
++#line 27457 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27459,16 +27486,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27462: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27489: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27465: \$? = $ac_status" >&5
++  echo "$as_me:27492: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27468: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27495: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27471: \$? = $ac_status" >&5
++  echo "$as_me:27498: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -27484,7 +27511,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27487 "configure"
++#line 27514 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27516,16 +27543,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27519: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27546: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27522: \$? = $ac_status" >&5
++  echo "$as_me:27549: \$? = $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:27552: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27528: \$? = $ac_status" >&5
++  echo "$as_me:27555: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27541,7 +27568,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 27571 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27573,16 +27600,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27576: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27603: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27579: \$? = $ac_status" >&5
++  echo "$as_me:27606: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27582: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27609: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27585: \$? = $ac_status" >&5
++  echo "$as_me:27612: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27595,12 +27622,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27598: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27625: 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 27603 "configure"
++#line 27630 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27636,15 +27663,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27639: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27666: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27642: \$? = $ac_status" >&5
++  echo "$as_me:27669: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27644: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27671: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27647: \$? = $ac_status" >&5
++  echo "$as_me:27674: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27660,13 +27687,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27663: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27690: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27696: 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
+@@ -27685,7 +27712,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27688 "configure"
++#line 27715 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27726,15 +27753,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27729: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27756: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27732: \$? = $ac_status" >&5
++  echo "$as_me:27759: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27734: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27761: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27737: \$? = $ac_status" >&5
++  echo "$as_me:27764: \$? = $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
+@@ -27751,26 +27778,26 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:27754: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:27781: 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:27761: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:27788: 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:27767: checking for fallback type of bool" >&5
++			echo "$as_me:27794: 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:27773: result: $cf_cv_type_of_bool" >&5
++			echo "$as_me:27800: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 		fi
+ 	fi
+@@ -27799,7 +27826,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:27802: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:27829: 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
+@@ -27810,7 +27837,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:27813: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:27840: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -27827,10 +27854,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:27830: result: $ADAFLAGS" >&5
++	echo "$as_me:27857: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:27833: checking if GNATPREP supports -T option" >&5
++echo "$as_me:27860: 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
+@@ -27840,11 +27867,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:27843: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:27870: 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:27847: checking if GNAT supports generics" >&5
++echo "$as_me:27874: 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])
+@@ -27854,7 +27881,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:27857: result: $cf_gnat_generics" >&5
++echo "$as_me:27884: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -27866,7 +27893,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:27869: checking if GNAT supports SIGINT" >&5
++echo "$as_me:27896: 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
+@@ -27914,7 +27941,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:27917: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:27944: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -27927,7 +27954,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:27930: checking if GNAT supports project files" >&5
++echo "$as_me:27957: 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]*)
+@@ -27990,15 +28017,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:27993: result: $cf_gnat_projects" >&5
++echo "$as_me:28020: 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:27999: checking if GNAT supports libraries" >&5
++	echo "$as_me:28026: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:28001: result: $cf_gnat_libraries" >&5
++	echo "$as_me:28028: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -28018,7 +28045,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:28021: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:28048: 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
+@@ -28030,7 +28057,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:28033: checking for Ada95 compiler" >&5
++echo "$as_me:28060: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -28041,12 +28068,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:28044: result: $cf_ada_compiler" >&5
++echo "$as_me:28071: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:28049: checking for Ada95 include directory" >&5
++echo "$as_me:28076: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -28080,7 +28107,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28083: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28110: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28089,10 +28116,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:28092: result: $ADA_INCLUDE" >&5
++echo "$as_me:28119: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:28095: checking for Ada95 object directory" >&5
++echo "$as_me:28122: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -28126,7 +28153,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28129: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28156: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28135,10 +28162,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:28138: result: $ADA_OBJECTS" >&5
++echo "$as_me:28165: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:28141: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:28168: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -28159,11 +28186,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:28162: result: $with_ada_sharedlib" >&5
++echo "$as_me:28189: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+-	{ echo "$as_me:28166: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++	{ echo "$as_me:28193: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+ 
+@@ -28181,7 +28208,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:28184: checking for Ada95 curses library name" >&5
++echo "$as_me:28211: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -28197,7 +28224,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28200: result: $ADA_LIBNAME" >&5
++echo "$as_me:28227: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -28208,13 +28235,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:28211: checking for wchar_t" >&5
++	echo "$as_me:28238: 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 28217 "configure"
++#line 28244 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28229,16 +28256,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28232: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28259: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28235: \$? = $ac_status" >&5
++  echo "$as_me:28262: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28238: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28265: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28241: \$? = $ac_status" >&5
++  echo "$as_me:28268: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -28248,10 +28275,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:28251: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:28278: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:28254: checking size of wchar_t" >&5
++echo "$as_me:28281: 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
+@@ -28260,7 +28287,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28263 "configure"
++#line 28290 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28272,21 +28299,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28275: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28302: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28278: \$? = $ac_status" >&5
++  echo "$as_me:28305: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28281: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28308: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28284: \$? = $ac_status" >&5
++  echo "$as_me:28311: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28289 "configure"
++#line 28316 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28298,16 +28325,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28301: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28328: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28304: \$? = $ac_status" >&5
++  echo "$as_me:28331: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28307: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28334: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28310: \$? = $ac_status" >&5
++  echo "$as_me:28337: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -28323,7 +28350,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28326 "configure"
++#line 28353 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28335,16 +28362,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28338: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28365: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28341: \$? = $ac_status" >&5
++  echo "$as_me:28368: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28344: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28371: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28347: \$? = $ac_status" >&5
++  echo "$as_me:28374: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -28360,7 +28387,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 28363 "configure"
++#line 28390 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28372,16 +28399,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28375: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28402: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28378: \$? = $ac_status" >&5
++  echo "$as_me:28405: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28381: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28408: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28384: \$? = $ac_status" >&5
++  echo "$as_me:28411: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -28394,12 +28421,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:28397: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:28424: 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 28402 "configure"
++#line 28429 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28415,15 +28442,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:28418: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28445: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28421: \$? = $ac_status" >&5
++  echo "$as_me:28448: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:28423: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28450: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28426: \$? = $ac_status" >&5
++  echo "$as_me:28453: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -28439,7 +28466,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:28442: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:28469: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&6
+ 
+-echo "${as_me:-configure}:28455: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:28482: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -28470,7 +28497,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:28473: checking for library subsets" >&5
++echo "$as_me:28500: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -28524,7 +28551,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:28527: result: $LIB_SUBSETS" >&5
++echo "$as_me:28554: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -28555,7 +28582,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:28558: checking default library suffix" >&5
++echo "$as_me:28585: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28566,10 +28593,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:28569: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:28596: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:28572: checking default library-dependency suffix" >&5
++echo "$as_me:28599: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -28652,10 +28679,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:28655: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28682: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:28658: checking default object directory" >&5
++echo "$as_me:28685: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28671,11 +28698,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:28674: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28701: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28678: checking c++ library-dependency suffix" >&5
++echo "$as_me:28705: 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++)
+@@ -28768,7 +28795,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:28771: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:28798: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -28944,19 +28971,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:28947: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:28974: 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:28956: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:28983: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28959: \$? = $ac_status" >&5
++  echo "$as_me:28986: \$? = $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
+@@ -28967,10 +28994,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28970 "configure"
++#line 28997 "configure"
+ #include "confdefs.h"
+ 
+-#line 28973 "configure"
++#line 29000 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -28985,16 +29012,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:28988: \"$ac_link\"") >&5
++if { (eval echo "$as_me:29015: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28991: \$? = $ac_status" >&5
++  echo "$as_me:29018: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:28994: \"$ac_try\"") >&5
++  { (eval echo "$as_me:29021: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28997: \$? = $ac_status" >&5
++  echo "$as_me:29024: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -29017,7 +29044,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:29020: result: $cf_ldflags_static" >&5
++	echo "$as_me:29047: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test "$cf_ldflags_static" != yes
+@@ -29033,7 +29060,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29036: checking where we will install curses.h" >&5
++echo "$as_me:29063: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -29043,7 +29070,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:29046: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:29073: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -29051,7 +29078,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:29054: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:29081: 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
+@@ -29076,7 +29103,7 @@
+ 
+ # pkgsrc uses these
+ 
+-echo "$as_me:29079: checking for desired basename for form library" >&5
++echo "$as_me:29106: 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.
+@@ -29096,10 +29123,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29099: result: $FORM_NAME" >&5
++echo "$as_me:29126: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:29102: checking for desired basename for menu library" >&5
++echo "$as_me:29129: 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.
+@@ -29119,10 +29146,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29122: result: $MENU_NAME" >&5
++echo "$as_me:29149: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:29125: checking for desired basename for panel library" >&5
++echo "$as_me:29152: 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.
+@@ -29142,10 +29169,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29145: result: $PANEL_NAME" >&5
++echo "$as_me:29172: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:29148: checking for desired basename for cxx library" >&5
++echo "$as_me:29175: 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.
+@@ -29165,13 +29192,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29168: result: $CXX_NAME" >&5
++echo "$as_me:29195: 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:29174: checking for src modules" >&5
++echo "$as_me:29201: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -29230,7 +29257,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:29233: result: $cf_cv_src_modules" >&5
++echo "$as_me:29260: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -29391,7 +29418,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:29394: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:29421: 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//'`
+@@ -29402,7 +29429,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:29405: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
++echo "$as_me:29432: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -29418,7 +29445,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:29421: result: $PKG_CFLAGS" >&5
++echo "$as_me:29448: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ case "$cf_cv_system_name" in
+@@ -29490,7 +29517,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
+ 
+-echo "${as_me:-configure}:29493: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
++echo "${as_me:-configure}:29520: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+ 
+ fi
+ 
+@@ -29517,7 +29544,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:29520: checking for linker search path" >&5
++echo "$as_me:29547: 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
+@@ -29565,7 +29592,7 @@
+ 			cf_pathlist="$cf_pathlist /lib /usr/lib"
+ 			;;
+ 		(*)
+-			{ echo "$as_me:29568: WARNING: problem with Solaris architecture" >&5
++			{ echo "$as_me:29595: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ 			;;
+ 		esac
+@@ -29606,7 +29633,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:29609: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29636: 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'`
+@@ -29692,7 +29719,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29695: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29722: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -29873,7 +29900,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:29876: error: ambiguous option: $1
++    { { echo "$as_me:29903: 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;}
+@@ -29892,7 +29919,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:29895: error: unrecognized option: $1
++  -*) { { echo "$as_me:29922: 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;}
+@@ -29938,6 +29965,8 @@
+ ECHO_LD="$ECHO_LD"
+ EXTRA_SUFFIX="$EXTRA_SUFFIX"
+ FORM_NAME="$FORM_NAME"
++GLOB_FULLPATH_OTHER="$GLOB_FULLPATH_OTHER"
++GLOB_FULLPATH_POSIX="$GLOB_FULLPATH_POSIX"
+ LDCONFIG="$LDCONFIG"
+ LIBTOOL_VERSION="$LIBTOOL_VERSION"
+ LIB_NAME="$LIB_NAME"
+@@ -30022,7 +30051,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:30025: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:30054: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -30190,6 +30219,7 @@
+ s,@ac_ct_NM@,$ac_ct_NM,;t t
+ s,@ARFLAGS@,$ARFLAGS,;t t
+ s,@DESTDIR@,$DESTDIR,;t t
++s,@MERGE_PREFIX@,$MERGE_PREFIX,;t t
+ s,@BUILD_CC@,$BUILD_CC,;t t
+ s,@BUILD_CPP@,$BUILD_CPP,;t t
+ s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t
+@@ -30546,7 +30576,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:30549: creating $ac_file" >&5
++    { echo "$as_me:30579: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -30564,7 +30594,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30567: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30597: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -30577,7 +30607,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30580: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30610: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30593,7 +30623,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:30596: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:30626: 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;}
+@@ -30602,7 +30632,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:30605: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:30635: 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;}
+@@ -30647,7 +30677,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:30650: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:30680: 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;}
+@@ -30658,7 +30688,7 @@
+     $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:30661: WARNING: Some variables may not be substituted:
++      { echo "$as_me:30691: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30707,7 +30737,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:30710: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:30740: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -30718,7 +30748,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30721: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30751: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -30731,7 +30761,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30734: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30764: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30789,7 +30819,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:30792: $ac_file is unchanged" >&5
++      { echo "$as_me:30822: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -31176,7 +31206,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}:31179: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:31209: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: configure.in
+Prereq:  1.783 
+--- ncurses-6.5-20240810+/configure.in	2024-07-20 23:46:58.000000000 +0000
++++ ncurses-6.5-20240817/configure.in	2024-08-17 13:44:13.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.783 2024/07/20 23:46:58 tom Exp $
++dnl $Id: configure.in,v 1.785 2024/08/17 13:44:13 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.783 $)
++AC_REVISION($Revision: 1.785 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -265,20 +265,7 @@
+ AC_CHECK_TOOL(NM, nm, nm)
+ CF_AR_FLAGS
+ 
+-dnl Special option for use by system-builders: the install-prefix is used to
+-dnl adjust the location into which the actual install is done, so that an
+-dnl archive can be built without modifying the host system's configuration.
+-AC_MSG_CHECKING(for an installation directory prefix)
+-AC_ARG_WITH(install-prefix,
+-	[  --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix],
+-	[case "x$withval" in
+-	(xyes|xno)
+-		;;
+-	(*)	DESTDIR="$withval"
+-		;;
+-	esac])
+-AC_MSG_RESULT([${DESTDIR:-(none)}])
+-AC_SUBST(DESTDIR)
++CF_INSTALL_PREFIX
+ 
+ ###############################################################################
+ CF_HELP_MESSAGE(Build-Tools Needed to Compile Temporary Applications for Cross-compiling:)
+@@ -2553,6 +2540,8 @@
+ ECHO_LD="$ECHO_LD"
+ EXTRA_SUFFIX="$EXTRA_SUFFIX"
+ FORM_NAME="$FORM_NAME"
++GLOB_FULLPATH_OTHER="$GLOB_FULLPATH_OTHER"
++GLOB_FULLPATH_POSIX="$GLOB_FULLPATH_POSIX"
+ LDCONFIG="$LDCONFIG"
+ LIBTOOL_VERSION="$LIBTOOL_VERSION"
+ LIB_NAME="$LIB_NAME"
+Index: dist.mk
+Prereq:  1.1626 
+--- ncurses-6.5-20240810+/dist.mk	2024-08-10 09:45:21.000000000 +0000
++++ ncurses-6.5-20240817/dist.mk	2024-08-17 09:37:53.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1626 2024/08/10 09:45:21 tom Exp $
++# $Id: dist.mk,v 1.1627 2024/08/17 09:37:53 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 = 5
+-NCURSES_PATCH = 20240810
++NCURSES_PATCH = 20240817
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: form/Makefile.in
+Prereq:  1.72 
+--- ncurses-6.5-20240810+/form/Makefile.in	2021-07-03 15:45:33.000000000 +0000
++++ ncurses-6.5-20240817/form/Makefile.in	2024-08-11 00:51:41.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.72 2021/07/03 15:45:33 tom Exp $
++# $Id: Makefile.in,v 1.74 2024/08/11 00:51:41 tom Exp $
+ ##############################################################################
+-# Copyright 2020,2021 Thomas E. Dickey                                       #
++# Copyright 2020-2021,2024 Thomas E. Dickey                                  #
+ # Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -61,7 +61,9 @@
+ includedir	= @includedir@
+ includesubdir	= @includesubdir@
+ 
+-INCLUDEDIR	= $(DESTDIR)$(includedir)$(includesubdir)
++INCLUDEDIR	= $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
++BINDIR		= $(DESTDIR)$(bindir@MERGE_PREFIX@)
++LIBDIR		= $(DESTDIR)$(libdir@MERGE_PREFIX@)
+ 
+ PACKAGE		= @PACKAGE@
+ 
+@@ -153,8 +155,8 @@
+ 
+ sources :	$(AUTO_SRC)
+ 
+-$(DESTDIR)$(bindir) \
+-$(DESTDIR)$(libdir) :
++$(BINDIR) \
++$(LIBDIR) :
+ 	mkdir -p $@
+ 
+ # make copies to simplify include-paths while still keeping form's include
+Index: include/Makefile.in
+Prereq:  1.53 
+--- ncurses-6.5-20240810+/include/Makefile.in	2021-07-03 18:56:51.000000000 +0000
++++ ncurses-6.5-20240817/include/Makefile.in	2024-08-10 18:19:10.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.53 2021/07/03 18:56:51 tom Exp $
++# $Id: Makefile.in,v 1.54 2024/08/10 18:19:10 tom Exp $
+ ##############################################################################
+-# Copyright 2019-2020,2021 Thomas E. Dickey                                  #
++# Copyright 2019-2021,2024 Thomas E. Dickey                                  #
+ # Copyright 1998-2013,2015 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -51,7 +51,7 @@
+ includedir	= @includedir@
+ includesubdir	= @includesubdir@
+ 
+-INCLUDEDIR	= $(DESTDIR)$(includedir)$(includesubdir)
++INCLUDEDIR	= $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
+ 
+ INSTALL		= @INSTALL@
+ INSTALL_DATA	= @INSTALL_DATA@
+Index: man/Makefile.in
+Prereq:  1.54 
+--- ncurses-6.5-20240810+/man/Makefile.in	2022-10-22 16:36:40.000000000 +0000
++++ ncurses-6.5-20240817/man/Makefile.in	2024-08-10 18:19:16.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.54 2022/10/22 16:36:40 tom Exp $
++# $Id: Makefile.in,v 1.55 2024/08/10 18:19:16 tom Exp $
+ ##############################################################################
+-# Copyright 2019-2021,2022 Thomas E. Dickey                                  #
++# Copyright 2019-2022,2024 Thomas E. Dickey                                  #
+ # Copyright 1998-2013,2015 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -47,7 +47,8 @@
+ mandir		= @mandir@
+ includesubdir	= @includesubdir@
+ 
+-INCLUDEDIR	= $(DESTDIR)$(includedir)$(includesubdir)
++INCLUDEDIR	= $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
++MANDIR		= $(DESTDIR)$(mandir@MERGE_PREFIX@)
+ 
+ INSTALL		= @INSTALL@
+ INSTALL_DATA	= @INSTALL_DATA@
+@@ -72,12 +73,12 @@
+ depend :
+ tags :
+ 
+-$(DESTDIR)$(mandir) :
++$(MANDIR) :
+ 	mkdir -p $@
+ 
+-EDITARGS = $(DESTDIR)$(mandir) $(srcdir) terminfo.5 *-config.1 $(srcdir)/*.[0-9]*
++EDITARGS = $(MANDIR) $(srcdir) terminfo.5 *-config.1 $(srcdir)/*.[0-9]*
+ 
+-install install.man : terminfo.5 $(DESTDIR)$(mandir)
++install install.man : terminfo.5 $(MANDIR)
+ 	$(SHELL) ../edit_man.sh normal installing $(EDITARGS)
+ 
+ uninstall uninstall.man :
+Index: menu/Makefile.in
+Prereq:  1.71 
+--- ncurses-6.5-20240810+/menu/Makefile.in	2021-07-03 15:45:33.000000000 +0000
++++ ncurses-6.5-20240817/menu/Makefile.in	2024-08-11 00:51:30.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.71 2021/07/03 15:45:33 tom Exp $
++# $Id: Makefile.in,v 1.72 2024/08/11 00:51:30 tom Exp $
+ ##############################################################################
+-# Copyright 2020,2021 Thomas E. Dickey                                       #
++# Copyright 2020-2021,2024 Thomas E. Dickey                                  #
+ # Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -61,7 +61,9 @@
+ includedir	= @includedir@
+ includesubdir	= @includesubdir@
+ 
+-INCLUDEDIR	= $(DESTDIR)$(includedir)$(includesubdir)
++INCLUDEDIR	= $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
++BINDIR		= $(DESTDIR)$(bindir@MERGE_PREFIX@)
++LIBDIR		= $(DESTDIR)$(libdir@MERGE_PREFIX@)
+ 
+ PACKAGE		= @PACKAGE@
+ 
+@@ -155,8 +157,8 @@
+ 
+ sources :	$(AUTO_SRC)
+ 
+-$(DESTDIR)$(bindir) \
+-$(DESTDIR)$(libdir) :
++$(BINDIR) \
++$(LIBDIR) :
+ 	mkdir -p $@
+ 
+ # make copies to simplify include-paths while still keeping menu's include
+Index: misc/Makefile.in
+Prereq:  1.82 
+--- ncurses-6.5-20240810+/misc/Makefile.in	2024-08-04 14:49:08.000000000 +0000
++++ ncurses-6.5-20240817/misc/Makefile.in	2024-08-10 18:06:18.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.82 2024/08/04 14:49:08 tom Exp $
++# $Id: Makefile.in,v 1.83 2024/08/10 18:06:18 tom Exp $
+ ##############################################################################
+ # Copyright 2018-2021,2024 Thomas E. Dickey                                  #
+ # Copyright 1998-2016,2017 Free Software Foundation, Inc.                    #
+@@ -61,7 +61,7 @@
+ datadir		= @datadir@
+ includesubdir	= @includesubdir@
+ 
+-INCLUDEDIR	= $(DESTDIR)$(includedir)$(includesubdir)
++INCLUDEDIR	= $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
+ 
+ tabsetdir	= $(datadir)/tabset
+ ticdir		= @TERMINFO@
+@@ -75,14 +75,16 @@
+ 
+ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+ 
+-BINDIR		= $(DESTDIR)$(bindir)
+-DATADIR		= $(DESTDIR)$(datadir)
++BINDIR		= $(DESTDIR)$(bindir@MERGE_PREFIX@)
++DATADIR		= $(DESTDIR)$(datadir@MERGE_PREFIX@)
+ 
+-@MAKE_DATABASE@INSTALL_PREFIX	= $(DESTDIR)$(prefix)
+-@MAKE_DATABASE@LIBDIR		= $(DESTDIR)$(libdir)
+-@MAKE_DATABASE@TICDIR		= $(DESTDIR)$(ticdir)
+-@MAKE_DATABASE@TICFILE		= $(DESTDIR)$(ticfile)
+-@MAKE_DATABASE@TABSETDIR	= $(DESTDIR)$(tabsetdir)
++@MAKE_DATABASE@INSTALL_PREFIX	= $(DESTDIR)$(prefix@MERGE_PREFIX@)
++@MAKE_DATABASE@LIBDIR		= $(DESTDIR)$(libdir@MERGE_PREFIX@)
++@MAKE_DATABASE@TICDIR		= $(DESTDIR)$(ticdir@MERGE_PREFIX@)
++@MAKE_DATABASE@TICFILE		= $(DESTDIR)$(ticfile@MERGE_PREFIX@)
++@MAKE_DATABASE@TABSETDIR	= $(DESTDIR)$(tabsetdir@MERGE_PREFIX@)
++
++@MAKE_PC_FILES@INSTALL_CONFIG	= $(DESTDIR)$(PKG_CONFIG_LIBDIR@MERGE_PREFIX@)
+ 
+ ################################################################################
+ 
+@@ -152,11 +154,11 @@
+ @MAKE_PC_FILES@install.libs :: pc-files
+ @MAKE_PC_FILES@	@$(SHELL) -c 'case "x$(PKG_CONFIG_LIBDIR)" in \
+ @MAKE_PC_FILES@		x@GLOB_FULLPATH_POSIX@|x@GLOB_FULLPATH_OTHER@) \
+-@MAKE_PC_FILES@			mkdir -p $(DESTDIR)$(PKG_CONFIG_LIBDIR); \
++@MAKE_PC_FILES@			mkdir -p $(INSTALL_CONFIG); \
+ @MAKE_PC_FILES@			for name in $(PC_FILES); do \
+ @MAKE_PC_FILES@				test -f $$name || continue; \
+ @MAKE_PC_FILES@				echo installing $$name; \
+-@MAKE_PC_FILES@				$(INSTALL_DATA) $$name $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; \
++@MAKE_PC_FILES@				$(INSTALL_DATA) $$name $(INSTALL_CONFIG)/$$name; \
+ @MAKE_PC_FILES@			done \
+ @MAKE_PC_FILES@			;; \
+ @MAKE_PC_FILES@		*) \
+@@ -197,12 +199,12 @@
+ 
+ uninstall.libs :
+ 	-rm -f $(BINDIR)/$(NCURSES_CONFIG)
+-@MAKE_PC_FILES@	@$(SHELL) -c 'case x$(DESTDIR)$(PKG_CONFIG_LIBDIR) in \
++@MAKE_PC_FILES@	@$(SHELL) -c 'case x$(INSTALL_CONFIG) in \
+ @MAKE_PC_FILES@	x@GLOB_FULLPATH_POSIX@|x@GLOB_FULLPATH_OTHER@) \
+ @MAKE_PC_FILES@		for name in $(PC_FILES); do \
+ @MAKE_PC_FILES@			test -f $$name || continue; \
+ @MAKE_PC_FILES@			echo uninstalling $$name; \
+-@MAKE_PC_FILES@			rm -f $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; \
++@MAKE_PC_FILES@			rm -f $(INSTALL_CONFIG)/$$name; \
+ @MAKE_PC_FILES@		done \
+ @MAKE_PC_FILES@		;; \
+ @MAKE_PC_FILES@	esac'
+Index: misc/terminfo.src
+--- ncurses-6.5-20240810+/misc/terminfo.src	2024-07-27 16:58:08.000000000 +0000
++++ ncurses-6.5-20240817/misc/terminfo.src	2024-08-17 22:45:40.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.1146 $
+-#	$Date: 2024/07/27 16:58:08 $
++#	$Revision: 1.1149 $
++#	$Date: 2024/08/17 22:45:40 $
+ #
+ # 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
+@@ -7903,7 +7903,15 @@
+ 
+ #### Foot
+ # https://codeberg.org/dnkl/foot/
+-# Version 1.8.2
++# Version 1.18.1 2024/08/17
++#
++# vttest:
++#	device attributes list 28=rectangular editing
++#	supports rectangle operations, but problems with left/right margins
++#	reports window-size, but not icon or window label
++#	numeric keypad has no application-mode
++#
++# Version 1.8.2 2021/07/31
+ #
+ # This identifies as a VT220 with 4=sixel and 22=color, however:
+ # tack:
+@@ -7940,20 +7948,25 @@
+ 	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, dim=\E[2m,
+ 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
+ 	flash=\E]555\E\\, ind=\n, is2=\E[!p\E[4l\E>, kbs=^?,
+-	kcbt=\E[Z, oc=\E]104\E\\, op=\E[39;49m, ri=\EM,
+-	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
+-	rs1=\Ec, rs2=\E[!p\E[4l\E>,
++	kcbt=\E[Z, nel=\EE, oc=\E]104\E\\, op=\E[39;49m, ri=\EM,
++	rmam=\E[?7l, rmkx=\E[?1l\E>, rmm=\E[?1036h\E[?1034l,
++	rmso=\E[27m, rmul=\E[24m, rs1=\Ec, rs2=\E[!p\E[4l\E>,
+ 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
+ 	    %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
+-	sgr0=\E(B\E[m, smam=\E[?7h, smkx=\E[?1h\E=, E3=\E[3J,
++	sgr0=\E(B\E[m, smam=\E[?7h, smkx=\E[?1h\E=,
++	smm=\E[?1036l\E[?1034h, E3=\E[3J, Smulx=\E[4:%p1%dm,
++	rv=\E\\[>1;[0-9][0-9][0-9][0-9][0-9][0-9];0c,
++	xr=\EP>\\|foot\\([0-9]+\\.[0-9]+\\.[0-9]+(-[0-9]+-g[a-f[0-9]
++	   +)?\\)?\E\\\\,
+ 	use=att610+cvis, use=ansi+csr, use=ansi+cup,
+ 	use=ansi+enq, use=ansi+local, use=ansi+idc, use=ansi+idl,
+ 	use=ansi+rca2, use=ansi+rep, use=ansi+tabs,
+ 	use=ansi+sgrbold, use=ecma+index, use=ecma+italics,
+-	use=ecma+strikeout, use=xterm+acs, use=xterm+alt+title,
+-	use=xterm+pcfkeys, use=xterm+sm+1006, use=xterm+tmux2,
+-	use=xterm+sl-alt, use=bracketed+paste,
+-	use=report+version, use=xterm+focus,
++	use=ecma+strikeout, use=kitty+setal, use=xterm+acs,
++	use=xterm+alt+title, use=xterm+pcfkeys,
++	use=xterm+sm+1006, use=xterm+tmux2, use=xterm+sl-alt,
++	use=bracketed+paste, use=report+version,
++	use=xterm+focus,
+ 
+ ######## WEB CLIENTS
+ 
+@@ -7969,6 +7982,30 @@
+ # it can connect to, and display in, a web browser, or as a standalone Qt
+ # application.  Either way, it displays in the current desktop session.
+ #
++# Testing AppImage for 3.2.0, on Fedora 40:
++# + appears to implement erase-display by painting a double-line on the screen,
++#   doesn't use full screen for ded though it sort-of works for vi.
++# + sets TERMINFO in its shell, and TERM=domterm-xterm which doesn't work when
++#   doing sudo.  According to the git log, that was April 1, 2023.  The VTE
++#   developers copied this feature (i.e., a partially workable private terminal
++#   database) in February 2024.
++# + the canonical name for the terminal description is still "domterm", and
++#   presumably the "domterm-xterm" alias is a workaround for hardcoded scripts
++#   that look for "xterm".
++# + almost all of the differences between ncurses's "domterm" and DomTerm's
++#   are additions, but (read further) most are untestable due to breakage in
++#   the program.
++# + DomTerm's updated terminal description says it implements italics, but
++# + hangs in tack when doing blink (just before testing italics)
++# + vttest, ncurses test-program also fare badly, e.g., due to improper line
++#   wrapping and/or inability to consistently clear the screen.
++#
++# The review of DomTerm 3.2.0 was prompted by noticing this page
++#     https://domterm.org/Wire-byte-protocol.html
++# which goes on at length for extensions which collide with a commonly-used
++# control for restoring a saved cursor position:
++#     CSI u     Restore cursor (SCORC, also ANSI.SYS).
++#
+ # Testing current code (2019/07/06) with Fedora 30:
+ # tack
+ #	no flash
+@@ -27599,4 +27636,8 @@
+ #	+ modify wezterm, omitting its broken left/right margin feature (report
+ #	  by Thayne McCombs) -TD
+ #
++# 2024-08-17
++#	+ review/update foot for 1.18.1 -TD
++#	+ add a note about DomTerm 3.2.0 -TD
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: mk-1st.awk
+Prereq:  1.125 
+--- ncurses-6.5-20240810+/mk-1st.awk	2023-04-22 15:49:59.000000000 +0000
++++ ncurses-6.5-20240817/mk-1st.awk	2024-08-11 09:04:32.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: mk-1st.awk,v 1.125 2023/04/22 15:49:59 tom Exp $
++# $Id: mk-1st.awk,v 1.128 2024/08/11 09:04:32 tom Exp $
+ ##############################################################################
+-# Copyright 2018-2021,2023 Thomas E. Dickey                                  #
++# Copyright 2018-2023,2024 Thomas E. Dickey                                  #
+ # Copyright 1998-2016,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -253,9 +253,9 @@
+ 	}
+ function install_dll(directory,filename) {
+ 		src_name = sprintf("../lib/%s", filename);
+-		dst_name = sprintf("$(DESTDIR)%s/%s", directory, filename);
++		dst_name = sprintf("%s/%s", directory, filename);
+ 		printf "\t@echo installing %s as %s\n", src_name, dst_name
+-		if ( directory == "$(bindir)" ) {
++		if ( directory == "$(BINDIR)" ) {
+ 			program = "$(INSTALL) -m 755";
+ 		} else {
+ 			program = "$(INSTALL_LIB)";
+@@ -403,14 +403,14 @@
+ 
+ 				if ( ShlibVer == "cygdll" || ShlibVer == "msysdll" || ShlibVer == "mingw" || ShlibVer == "msvcdll") {
+ 
+-					dst_dirs = "$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)";
++					dst_dirs = "$(BINDIR) $(LIBDIR)";
+ 					printf "install.%s :: %s $(LIBRARIES)\n", name, dst_dirs
+-					install_dll("$(bindir)",end_name);
+-					install_dll("$(libdir)",imp_name);
++					install_dll("$(BINDIR)",end_name);
++					install_dll("$(LIBDIR)",imp_name);
+ 
+ 				} else {
+ 
+-					lib_dir = "$(DESTDIR)$(libdir)";
++					lib_dir = "$(LIBDIR)";
+ 					printf "install.%s :: %s/%s\n", name, lib_dir, end_name
+ 					print ""
+ 					if ( ReLink == "yes" ) {
+@@ -430,13 +430,13 @@
+ 						}
+ 						ovr_name = sprintf("%scurses%s.a", curses_prefix, suffix)
+ 						printf "\t@echo linking %s to %s\n", imp_name, ovr_name
+-						printf "\tcd $(DESTDIR)$(libdir) && ("
++						printf "\tcd $(LIBDIR) && ("
+ 						symlink(imp_name, ovr_name)
+ 						printf ")\n"
+ 					} else {
+ 						ovr_name = sprintf("libcurses%s", suffix)
+ 						printf "\t@echo linking %s to %s\n", end_name, ovr_name
+-						printf "\tcd $(DESTDIR)$(libdir) && ("
++						printf "\tcd $(LIBDIR) && ("
+ 						symlink(end_name, ovr_name)
+ 						printf ")\n"
+ 					}
+@@ -450,19 +450,19 @@
+ 				printf "uninstall.%s ::\n", name
+ 				if ( ShlibVer == "cygdll" || ShlibVer == "msysdll" || ShlibVer == "mingw" || ShlibVer == "msvcdll") {
+ 
+-					printf "\t@echo uninstalling $(DESTDIR)$(bindir)/%s\n", end_name
+-					printf "\t-@rm -f $(DESTDIR)$(bindir)/%s\n", end_name
++					printf "\t@echo uninstalling $(BINDIR)/%s\n", end_name
++					printf "\t-@rm -f $(BINDIR)/%s\n", end_name
+ 
+-					printf "\t@echo uninstalling $(DESTDIR)$(libdir)/%s\n", imp_name
+-					printf "\t-@rm -f $(DESTDIR)$(libdir)/%s\n", imp_name
++					printf "\t@echo uninstalling $(LIBDIR)/%s\n", imp_name
++					printf "\t-@rm -f $(LIBDIR)/%s\n", imp_name
+ 
+ 				} else {
+-					printf "\t@echo uninstalling $(DESTDIR)$(libdir)/%s\n", end_name
+-					removelinks("$(DESTDIR)$(libdir)")
++					printf "\t@echo uninstalling $(LIBDIR)/%s\n", end_name
++					removelinks("$(LIBDIR)")
+ 					if ( overwrite == "yes" && name == "ncurses" )
+ 					{
+ 						ovr_name = sprintf("libcurses%s", suffix)
+-						printf "\t-@rm -f $(DESTDIR)$(libdir)/%s\n", ovr_name
++						printf "\t-@rm -f $(LIBDIR)/%s\n", ovr_name
+ 					}
+ 				}
+ 				if ( rmSoLocs == "yes" ) {
+@@ -503,7 +503,7 @@
+ 				print  "install \\"
+ 				print  "install.libs \\"
+ 				printf "install.%s :: \\\n", trim_suffix(name);
+-				printf "\t\t$(DESTDIR)$(libdir) \\\n";
++				printf "\t\t$(LIBDIR) \\\n";
+ 				use_name = TermlibRoot USE_LIB_SUFFIX
+ 				if ( (name != use_name ) && ( index(name, "++") == 0 ) && ( index(name, "tic") == 1 || index(name, "ncurses") == 1 ) ) {
+ 					if ( trim_suffix(TermlibRoot) != trim_suffix(name) ) {
+@@ -514,14 +514,14 @@
+ 					}
+ 				}
+ 				printf "\t\t../lib/%s\n", lib_name
+-				printf "\t@echo installing ../lib/%s as $(DESTDIR)$(libdir)/%s\n", lib_name, lib_name
+-				printf "\tcd ../lib; $(LIBTOOL_INSTALL) $(INSTALL) %s $(DESTDIR)$(libdir)\n", lib_name
++				printf "\t@echo installing ../lib/%s as $(LIBDIR)/%s\n", lib_name, lib_name
++				printf "\tcd ../lib; $(LIBTOOL_INSTALL) $(INSTALL) %s $(LIBDIR)\n", lib_name
+ 				print  ""
+ 				print  "uninstall \\"
+ 				print  "uninstall.libs \\"
+ 				printf "uninstall.%s ::\n", trim_suffix(name)
+-				printf "\t@echo uninstalling $(DESTDIR)$(libdir)/%s\n", lib_name
+-				printf "\t-@$(LIBTOOL_UNINSTALL) rm -f $(DESTDIR)$(libdir)/%s\n", lib_name
++				printf "\t@echo uninstalling $(LIBDIR)/%s\n", lib_name
++				printf "\t-@$(LIBTOOL_UNINSTALL) rm -f $(LIBDIR)/%s\n", lib_name
+ 			}
+ 			else
+ 			{
+@@ -542,41 +542,41 @@
+ 				print  ""
+ 				print  "install \\"
+ 				print  "install.libs \\"
+-				printf "install.%s :: $(DESTDIR)$(libdir) ../lib/%s\n", name, lib_name
+-				printf "\t@echo installing ../lib/%s as $(DESTDIR)$(libdir)/%s\n", lib_name, lib_name
+-				printf "\t$(INSTALL_DATA) ../lib/%s $(DESTDIR)$(libdir)/%s\n", lib_name, lib_name
++				printf "install.%s :: $(LIBDIR) ../lib/%s\n", name, lib_name
++				printf "\t@echo installing ../lib/%s as $(LIBDIR)/%s\n", lib_name, lib_name
++				printf "\t$(INSTALL_DATA) ../lib/%s $(LIBDIR)/%s\n", lib_name, lib_name
+ 				if ( overwrite == "yes" && lib_name == "libncurses.a" )
+ 				{
+ 					printf "\t@echo linking libcurses.a to libncurses.a\n"
+-					printf "\t-@rm -f $(DESTDIR)$(libdir)/libcurses.a\n"
+-					printf "\t(cd $(DESTDIR)$(libdir) && "
++					printf "\t-@rm -f $(LIBDIR)/libcurses.a\n"
++					printf "\t(cd $(LIBDIR) && "
+ 					symlink("libncurses.a", "libcurses.a")
+ 					printf ")\n"
+ 				}
+ 				if ( ReRanlib == "yes" )
+ 				{
+-					printf "\t$(RANLIB) $(DESTDIR)$(libdir)/%s\n", lib_name
++					printf "\t$(RANLIB) $(LIBDIR)/%s\n", lib_name
+ 				}
+ 				if ( host == "vxworks" )
+ 				{
+-					printf "\t@echo installing ../lib/lib%s$o as $(DESTDIR)$(libdir)/lib%s$o\n", name, name
+-					printf "\t$(INSTALL_DATA) ../lib/lib%s$o $(DESTDIR)$(libdir)/lib%s$o\n", name, name
++					printf "\t@echo installing ../lib/lib%s$o as $(LIBDIR)/lib%s$o\n", name, name
++					printf "\t$(INSTALL_DATA) ../lib/lib%s$o $(LIBDIR)/lib%s$o\n", name, name
+ 				}
+ 				print  ""
+ 				print  "uninstall \\"
+ 				print  "uninstall.libs \\"
+ 				printf "uninstall.%s ::\n", name
+-				printf "\t@echo uninstalling $(DESTDIR)$(libdir)/%s\n", lib_name
+-				printf "\t-@rm -f $(DESTDIR)$(libdir)/%s\n", lib_name
++				printf "\t@echo uninstalling $(LIBDIR)/%s\n", lib_name
++				printf "\t-@rm -f $(LIBDIR)/%s\n", lib_name
+ 				if ( overwrite == "yes" && lib_name == "libncurses.a" )
+ 				{
+ 					printf "\t@echo linking libcurses.a to libncurses.a\n"
+-					printf "\t-@rm -f $(DESTDIR)$(libdir)/libcurses.a\n"
++					printf "\t-@rm -f $(LIBDIR)/libcurses.a\n"
+ 				}
+ 				if ( host == "vxworks" )
+ 				{
+-					printf "\t@echo uninstalling $(DESTDIR)$(libdir)/lib%s$o\n", name
+-					printf "\t-@rm -f $(DESTDIR)$(libdir)/lib%s$o\n", name
++					printf "\t@echo uninstalling $(LIBDIR)/lib%s$o\n", name
++					printf "\t-@rm -f $(LIBDIR)/lib%s$o\n", name
+ 				}
+ 			}
+ 			print ""
+Index: ncurses/Makefile.in
+Prereq:  1.184 
+--- ncurses-6.5-20240810+/ncurses/Makefile.in	2024-01-19 12:00:00.000000000 +0000
++++ ncurses-6.5-20240817/ncurses/Makefile.in	2024-08-10 18:07:57.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.184 2024/01/19 12:00:00 tom Exp $
++# $Id: Makefile.in,v 1.185 2024/08/10 18:07:57 tom Exp $
+ ##############################################################################
+ # Copyright 2018-2022,2024 Thomas E. Dickey                                  #
+ # Copyright 1998-2017,2018 Free Software Foundation, Inc.                    #
+@@ -69,7 +69,9 @@
+ datadir		= @datadir@
+ includesubdir	= @includesubdir@
+ 
+-INCLUDEDIR	= $(DESTDIR)$(includedir)$(includesubdir)
++INCLUDEDIR	= $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
++BINDIR		= $(DESTDIR)$(bindir@MERGE_PREFIX@)
++LIBDIR		= $(DESTDIR)$(libdir@MERGE_PREFIX@)
+ 
+ PACKAGE		= @PACKAGE@
+ 
+@@ -235,8 +237,8 @@
+ 
+ sources:	$(AUTO_SRC)
+ 
+-$(DESTDIR)$(bindir) \
+-$(DESTDIR)$(libdir) :
++$(BINDIR) \
++$(LIBDIR) :
+ 	mkdir -p $@
+ 
+ ../lib : ; mkdir $@
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20240810+/package/debian-mingw/changelog	2024-08-10 09:45:21.000000000 +0000
++++ ncurses-6.5-20240817/package/debian-mingw/changelog	2024-08-11 00:14:44.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240810) unstable; urgency=low
++ncurses6td (6.5+20240817) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 10 Aug 2024 05:45:21 -0400
++ -- Thomas E. Dickey   Sat, 10 Aug 2024 20:14:44 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20240810+/package/debian-mingw64/changelog	2024-08-10 09:45:21.000000000 +0000
++++ ncurses-6.5-20240817/package/debian-mingw64/changelog	2024-08-11 00:14:44.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240810) unstable; urgency=low
++ncurses6td (6.5+20240817) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 10 Aug 2024 05:45:21 -0400
++ -- Thomas E. Dickey   Sat, 10 Aug 2024 20:14:44 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20240810+/package/debian/changelog	2024-08-10 09:45:21.000000000 +0000
++++ ncurses-6.5-20240817/package/debian/changelog	2024-08-11 00:14:44.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240810) unstable; urgency=low
++ncurses6td (6.5+20240817) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 10 Aug 2024 05:45:21 -0400
++ -- Thomas E. Dickey   Sat, 10 Aug 2024 20:14:44 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.661 
+--- ncurses-6.5-20240810+/package/mingw-ncurses.nsi	2024-08-10 09:45:21.000000000 +0000
++++ ncurses-6.5-20240817/package/mingw-ncurses.nsi	2024-08-11 00:14:44.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.661 2024/08/10 09:45:21 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.662 2024/08/11 00:14:44 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "0810"
++!define VERSION_MMDD  "0817"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20240810+/package/mingw-ncurses.spec	2024-08-10 09:45:21.000000000 +0000
++++ ncurses-6.5-20240817/package/mingw-ncurses.spec	2024-08-11 00:14:44.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20240810
++Release: 20240817
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20240810+/package/ncurses.spec	2024-08-10 09:45:21.000000000 +0000
++++ ncurses-6.5-20240817/package/ncurses.spec	2024-08-11 00:14:44.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20240810
++Release: 20240817
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20240810+/package/ncursest.spec	2024-08-10 09:45:21.000000000 +0000
++++ ncurses-6.5-20240817/package/ncursest.spec	2024-08-11 00:14:44.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20240810
++Release: 20240817
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: panel/Makefile.in
+Prereq:  1.76 
+--- ncurses-6.5-20240810+/panel/Makefile.in	2021-07-03 15:45:33.000000000 +0000
++++ ncurses-6.5-20240817/panel/Makefile.in	2024-08-10 18:19:45.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.76 2021/07/03 15:45:33 tom Exp $
++# $Id: Makefile.in,v 1.77 2024/08/10 18:19:45 tom Exp $
+ ##############################################################################
+-# Copyright 2020,2021 Thomas E. Dickey                                       #
++# Copyright 2020-2021,2024 Thomas E. Dickey                                  #
+ # Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -63,7 +63,9 @@
+ datadir		= @datadir@
+ includesubdir	= @includesubdir@
+ 
+-INCLUDEDIR	= $(DESTDIR)$(includedir)$(includesubdir)
++INCLUDEDIR	= $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
++BINDIR		= $(DESTDIR)$(bindir@MERGE_PREFIX@)
++LIBDIR		= $(DESTDIR)$(libdir@MERGE_PREFIX@)
+ 
+ PACKAGE		= @PACKAGE@
+ 
+@@ -155,8 +157,8 @@
+ 
+ sources:	$(AUTO_SRC)
+ 
+-$(DESTDIR)$(bindir) \
+-$(DESTDIR)$(libdir) :
++$(BINDIR) \
++$(LIBDIR) :
+ 	mkdir -p $@
+ 
+ # make a copy to simplify include-paths while still keeping panel's include
+Index: progs/Makefile.in
+Prereq:  1.115 
+--- ncurses-6.5-20240810+/progs/Makefile.in	2024-04-08 18:33:54.000000000 +0000
++++ ncurses-6.5-20240817/progs/Makefile.in	2024-08-10 18:13:22.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.115 2024/04/08 18:33:54 tom Exp $
++# $Id: Makefile.in,v 1.116 2024/08/10 18:13:22 tom Exp $
+ ##############################################################################
+ # Copyright 2020-2021,2024 Thomas E. Dickey                                  #
+ # Copyright 1998-2016,2018 Free Software Foundation, Inc.                    #
+@@ -66,7 +66,8 @@
+ datadir		= @datadir@
+ includesubdir	= @includesubdir@
+ 
+-INCLUDEDIR	= $(DESTDIR)$(includedir)$(includesubdir)
++INCLUDEDIR	= $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir)
++BINDIR		= $(DESTDIR)$(bindir@MERGE_PREFIX@)
+ 
+ PACKAGE		= @PACKAGE@
+ 
+@@ -230,37 +231,37 @@
+ 	echo "#define PROG_INIT      \"$(define_init)\""		>>$@
+ 	echo "#endif /* __TRANSFORM_H */"				>>$@
+ 
+-install.progs: $(AUTO_SRC) $(PROGS) $(DESTDIR)$(bindir)
+-@MAKE_TERMINFO@	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tic$x     $(DESTDIR)$(bindir)/$(actual_tic)
+-@MAKE_TERMINFO@	$(LIBTOOL_INSTALL) $(INSTALL_PROG) toe$x     $(DESTDIR)$(bindir)/$(actual_toe)
++install.progs: $(AUTO_SRC) $(PROGS) $(BINDIR)
++@MAKE_TERMINFO@	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tic$x     $(BINDIR)/$(actual_tic)
++@MAKE_TERMINFO@	$(LIBTOOL_INSTALL) $(INSTALL_PROG) toe$x     $(BINDIR)/$(actual_toe)
+ @MAKE_TERMINFO@	@echo "linking $(actual_infotocap) to $(actual_tic)"
+-@MAKE_TERMINFO@	-@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap)
+-@MAKE_TERMINFO@	( cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_infotocap) )
++@MAKE_TERMINFO@	-@rm -f $(BINDIR)/$(actual_infotocap)
++@MAKE_TERMINFO@	( cd $(BINDIR) && $(LN_S) $(actual_tic) $(actual_infotocap) )
+ @MAKE_TERMINFO@	@echo "linking $(actual_captoinfo) to $(actual_tic)"
+-@MAKE_TERMINFO@	-@rm -f $(DESTDIR)$(bindir)/$(actual_captoinfo)
+-@MAKE_TERMINFO@	( cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_captoinfo) )
+-	$(LIBTOOL_INSTALL) $(INSTALL_PROG) infocmp$x $(DESTDIR)$(bindir)/$(actual_infocmp)
+-	$(LIBTOOL_INSTALL) $(INSTALL_PROG) clear$x   $(DESTDIR)$(bindir)/$(actual_clear)
+-	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tabs$x    $(DESTDIR)$(bindir)/$(actual_tabs)
+-	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tput$x    $(DESTDIR)$(bindir)/$(actual_tput)
+-	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tset$x    $(DESTDIR)$(bindir)/$(actual_tset)
++@MAKE_TERMINFO@	-@rm -f $(BINDIR)/$(actual_captoinfo)
++@MAKE_TERMINFO@	( cd $(BINDIR) && $(LN_S) $(actual_tic) $(actual_captoinfo) )
++	$(LIBTOOL_INSTALL) $(INSTALL_PROG) infocmp$x $(BINDIR)/$(actual_infocmp)
++	$(LIBTOOL_INSTALL) $(INSTALL_PROG) clear$x   $(BINDIR)/$(actual_clear)
++	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tabs$x    $(BINDIR)/$(actual_tabs)
++	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tput$x    $(BINDIR)/$(actual_tput)
++	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tset$x    $(BINDIR)/$(actual_tset)
+ 	@echo "linking $(actual_reset) to $(actual_tset)"
+-	-@rm -f $(DESTDIR)$(bindir)/$(actual_reset)
+-	( cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tset) $(actual_reset) )
++	-@rm -f $(BINDIR)/$(actual_reset)
++	( cd $(BINDIR) && $(LN_S) $(actual_tset) $(actual_reset) )
+ 
+ uninstall.progs:
+-@MAKE_TERMINFO@	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tic)
+-@MAKE_TERMINFO@	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_toe)
+-@MAKE_TERMINFO@	-@rm -f $(DESTDIR)$(bindir)/$(actual_captoinfo)
+-@MAKE_TERMINFO@	-@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap)
+-	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_infocmp)
+-	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_clear)
+-	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tabs)
+-	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tput)
+-	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tset)
+-	-@rm -f $(DESTDIR)$(bindir)/$(actual_reset)
++@MAKE_TERMINFO@	-@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_tic)
++@MAKE_TERMINFO@	-@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_toe)
++@MAKE_TERMINFO@	-@rm -f $(BINDIR)/$(actual_captoinfo)
++@MAKE_TERMINFO@	-@rm -f $(BINDIR)/$(actual_infotocap)
++	-@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_infocmp)
++	-@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_clear)
++	-@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_tabs)
++	-@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_tput)
++	-@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_tset)
++	-@rm -f $(BINDIR)/$(actual_reset)
+ 
+-$(DESTDIR)$(bindir) :
++$(BINDIR) :
+ 	mkdir -p $@
+ 
+ #
+Index: test/Makefile.in
+Prereq:  1.130 
+--- ncurses-6.5-20240810+/test/Makefile.in	2021-12-18 23:00:28.000000000 +0000
++++ ncurses-6.5-20240817/test/Makefile.in	2024-08-10 18:19:56.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.130 2021/12/18 23:00:28 tom Exp $
++# $Id: Makefile.in,v 1.131 2024/08/10 18:19:56 tom Exp $
+ ##############################################################################
+-# Copyright 2020,2021 Thomas E. Dickey                                       #
++# Copyright 2020-2021,2024 Thomas E. Dickey                                  #
+ # Copyright 1998-2017,2018 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -61,10 +61,10 @@
+ 
+ real_bindir	= $(libexecdir)/$(PACKAGE)
+ 
+-BINDIR		= $(DESTDIR)$(bindir)
+-LIBEXECDIR	= $(DESTDIR)$(libexecdir)
+-LIBDIR		= $(DESTDIR)$(libdir)
+-DATADIR		= $(DESTDIR)$(datadir)
++BINDIR		= $(DESTDIR)$(bindir@MERGE_PREFIX@)
++LIBEXECDIR	= $(DESTDIR)$(libexecdir@MERGE_PREFIX@)
++LIBDIR		= $(DESTDIR)$(libdir@MERGE_PREFIX@)
++DATADIR		= $(DESTDIR)$(datadir@MERGE_PREFIX@)
+ 
+ REAL_BINDIR	= $(LIBEXECDIR)/$(PACKAGE)
+ 
+Index: test/aclocal.m4
+Prereq:  1.227 
+--- ncurses-6.5-20240810+/test/aclocal.m4	2024-08-10 14:31:42.000000000 +0000
++++ ncurses-6.5-20240817/test/aclocal.m4	2024-08-11 09:11:30.000000000 +0000
+@@ -27,7 +27,7 @@
+ dnl authorization.                                                           *
+ dnl***************************************************************************
+ dnl
+-dnl $Id: aclocal.m4,v 1.227 2024/08/10 14:31:42 tom Exp $
++dnl $Id: aclocal.m4,v 1.228 2024/08/11 09:11:30 tom Exp $
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+@@ -2390,6 +2390,40 @@
+ AC_SUBST(INSTALL_OPT_S)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_INSTALL_PREFIX version: 1 updated: 2024/08/10 20:16:32
++dnl -----------------
++dnl Special option for use by system-builders: the install-prefix is used to
++dnl adjust the location into which the actual install is done, so that an
++dnl archive can be built without modifying the host system's configuration.
++AC_DEFUN([CF_INSTALL_PREFIX],[
++AC_MSG_CHECKING(for an installation directory prefix)
++AC_ARG_WITH(install-prefix,
++	[  --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix],
++	[case "x$withval" in
++	(xyes|xno)
++		;;
++	(*)	DESTDIR="$withval"
++		;;
++	esac])
++AC_MSG_RESULT([${DESTDIR:-(none)}])
++AC_SUBST(DESTDIR)
++
++AC_MSG_CHECKING(if installation directory prefix should be merged)
++CF_ARG_ENABLE(install-prefix,
++	[  --enable-install-prefix merge DESTDIR with installation prefix],
++	cf_install_prefix=yes,
++	cf_install_prefix=no)
++AC_MSG_RESULT($cf_install_prefix)
++
++if test "$cf_install_prefix" = yes ; then
++	MERGE_PREFIX=':$(prefix)%=%'
++else
++	MERGE_PREFIX=''
++fi
++
++AC_SUBST(MERGE_PREFIX)
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_INTEL_COMPILER version: 9 updated: 2023/02/18 17:41:25
+ dnl -----------------
+ dnl Check if the given compiler is really the Intel compiler for Linux.  It
+Index: test/configure
+--- ncurses-6.5-20240810+/test/configure	2024-08-10 15:48:47.000000000 +0000
++++ ncurses-6.5-20240817/test/configure	2024-08-11 09:11:55.000000000 +0000
+@@ -711,6 +711,8 @@
+   --enable-string-hacks   work around bogus compiler/loader warnings
+   --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD
+   --disable-echo          do not display "compiling" commands
++  --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix
++  --enable-install-prefix merge DESTDIR with installation prefix
+ Curses Version-dependent Options:
+   --with-ncurses-wrap-prefix naming-prefix for ncurses wrapped-variables
+   --disable-widec         disable checks for wide-character functions
+@@ -934,7 +936,7 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+   if test -r "$ac_site_file"; then
+-    { echo "$as_me:937: loading site script $ac_site_file" >&5
++    { echo "$as_me:939: loading site script $ac_site_file" >&5
+ echo "$as_me: loading site script $ac_site_file" >&6;}
+     cat "$ac_site_file" >&5
+     . "$ac_site_file"
+@@ -945,7 +947,7 @@
+   # Some versions of bash will fail to source /dev/null (special
+   # files actually), so we avoid doing that.
+   if test -f "$cache_file"; then
+-    { echo "$as_me:948: loading cache $cache_file" >&5
++    { echo "$as_me:950: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+       [\\/]* | ?:[\\/]* ) . $cache_file;;
+@@ -953,7 +955,7 @@
+     esac
+   fi
+ else
+-  { echo "$as_me:956: creating cache $cache_file" >&5
++  { echo "$as_me:958: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+@@ -969,21 +971,21 @@
+   eval ac_new_val="\$ac_env_${ac_var}_value"
+   case "$ac_old_set,$ac_new_set" in
+     set,)
+-      { echo "$as_me:972: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++      { echo "$as_me:974: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,set)
+-      { echo "$as_me:976: error: \`$ac_var' was not set in the previous run" >&5
++      { echo "$as_me:978: error: \`$ac_var' was not set in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,);;
+     *)
+       if test "x$ac_old_val" != "x$ac_new_val"; then
+-        { echo "$as_me:982: error: \`$ac_var' has changed since the previous run:" >&5
++        { echo "$as_me:984: error: \`$ac_var' has changed since the previous run:" >&5
+ echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+-        { echo "$as_me:984:   former value:  $ac_old_val" >&5
++        { echo "$as_me:986:   former value:  $ac_old_val" >&5
+ echo "$as_me:   former value:  $ac_old_val" >&2;}
+-        { echo "$as_me:986:   current value: $ac_new_val" >&5
++        { echo "$as_me:988:   current value: $ac_new_val" >&5
+ echo "$as_me:   current value: $ac_new_val" >&2;}
+         ac_cache_corrupted=:
+       fi;;
+@@ -1002,9 +1004,9 @@
+   fi
+ done
+ if "$ac_cache_corrupted"; then
+-  { echo "$as_me:1005: error: changes in the environment can compromise the build" >&5
++  { echo "$as_me:1007: error: changes in the environment can compromise the build" >&5
+ echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  { { echo "$as_me:1007: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++  { { echo "$as_me:1009: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1033,10 +1035,10 @@
+ echo "#! $SHELL" >conftest.sh
+ echo  "exit 0"   >>conftest.sh
+ chmod +x conftest.sh
+-if { (echo "$as_me:1036: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:1038: PATH=\".;.\"; conftest.sh") >&5
+   (PATH=".;."; conftest.sh) 2>&5
+   ac_status=$?
+-  echo "$as_me:1039: \$? = $ac_status" >&5
++  echo "$as_me:1041: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+   ac_path_separator=';'
+ else
+@@ -1068,7 +1070,7 @@
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:1071: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++  { { echo "$as_me:1073: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+ echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1078,11 +1080,11 @@
+ 
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+-  { { echo "$as_me:1081: error: cannot run $ac_config_sub" >&5
++  { { echo "$as_me:1083: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:1085: checking build system type" >&5
++echo "$as_me:1087: checking build system type" >&5
+ echo $ECHO_N "checking build system type... $ECHO_C" >&6
+ if test "${ac_cv_build+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1091,23 +1093,23 @@
+ test -z "$ac_cv_build_alias" &&
+   ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+-  { { echo "$as_me:1094: error: cannot guess build type; you must specify one" >&5
++  { { echo "$as_me:1096: error: cannot guess build type; you must specify one" >&5
+ echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+    { (exit 1); exit 1; }; }
+ ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` ||
+-  { { echo "$as_me:1098: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++  { { echo "$as_me:1100: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1103: result: $ac_cv_build" >&5
++echo "$as_me:1105: result: $ac_cv_build" >&5
+ echo "${ECHO_T}$ac_cv_build" >&6
+ build=$ac_cv_build
+ build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+-echo "$as_me:1110: checking host system type" >&5
++echo "$as_me:1112: checking host system type" >&5
+ echo $ECHO_N "checking host system type... $ECHO_C" >&6
+ if test "${ac_cv_host+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1116,12 +1118,12 @@
+ test -z "$ac_cv_host_alias" &&
+   ac_cv_host_alias=$ac_cv_build_alias
+ ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` ||
+-  { { echo "$as_me:1119: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++  { { echo "$as_me:1121: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1124: result: $ac_cv_host" >&5
++echo "$as_me:1126: result: $ac_cv_host" >&5
+ echo "${ECHO_T}$ac_cv_host" >&6
+ host=$ac_cv_host
+ host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1129,7 +1131,7 @@
+ host_os=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+ if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
+-	echo "$as_me:1132: checking target system type" >&5
++	echo "$as_me:1134: checking target system type" >&5
+ echo $ECHO_N "checking target system type... $ECHO_C" >&6
+ if test "${ac_cv_target+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1138,12 +1140,12 @@
+ test "x$ac_cv_target_alias" = "x" &&
+   ac_cv_target_alias=$ac_cv_host_alias
+ ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` ||
+-  { { echo "$as_me:1141: error: $ac_config_sub $ac_cv_target_alias failed" >&5
++  { { echo "$as_me:1143: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1146: result: $ac_cv_target" >&5
++echo "$as_me:1148: result: $ac_cv_target" >&5
+ echo "${ECHO_T}$ac_cv_target" >&6
+ target=$ac_cv_target
+ target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1175,13 +1177,13 @@
+ fi
+ 
+ test -z "$system_name" && system_name="$cf_cv_system_name"
+-test -n "$cf_cv_system_name" && echo "$as_me:1178: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1180: result: Configuring for $cf_cv_system_name" >&5
+ echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
+ 
+ if test ".$system_name" != ".$cf_cv_system_name" ; then
+-	echo "$as_me:1182: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++	echo "$as_me:1184: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+ echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
+-	{ { echo "$as_me:1184: error: \"Please remove config.cache and try again.\"" >&5
++	{ { echo "$as_me:1186: error: \"Please remove config.cache and try again.\"" >&5
+ echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1189,14 +1191,14 @@
+ # Check whether --with-system-type or --without-system-type was given.
+ if test "${with_system_type+set}" = set; then
+   withval="$with_system_type"
+-  { echo "$as_me:1192: WARNING: overriding system type to $withval" >&5
++  { echo "$as_me:1194: WARNING: overriding system type to $withval" >&5
+ echo "$as_me: WARNING: overriding system type to $withval" >&2;}
+ 	cf_cv_system_name=$withval
+ 	host_os=$withval
+ 
+ fi;
+ 
+-echo "$as_me:1199: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:1201: 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
+@@ -1216,11 +1218,11 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:1219: result: yes" >&5
++  echo "$as_me:1221: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:1223: result: no" >&5
++  echo "$as_me:1225: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+@@ -1234,7 +1236,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-echo "$as_me:1237: checking for $ac_word" >&5
++echo "$as_me:1239: 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
+@@ -1249,7 +1251,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-echo "$as_me:1252: found $ac_dir/$ac_word" >&5
++echo "$as_me:1254: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1257,10 +1259,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1260: result: $CC" >&5
++  echo "$as_me:1262: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1263: result: no" >&5
++  echo "$as_me:1265: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1269,7 +1271,7 @@
+   ac_ct_CC=$CC
+   # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-echo "$as_me:1272: checking for $ac_word" >&5
++echo "$as_me:1274: 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
+@@ -1284,7 +1286,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="gcc"
+-echo "$as_me:1287: found $ac_dir/$ac_word" >&5
++echo "$as_me:1289: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1292,10 +1294,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1295: result: $ac_ct_CC" >&5
++  echo "$as_me:1297: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1298: result: no" >&5
++  echo "$as_me:1300: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1308,7 +1310,7 @@
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-echo "$as_me:1311: checking for $ac_word" >&5
++echo "$as_me:1313: 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
+@@ -1323,7 +1325,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+-echo "$as_me:1326: found $ac_dir/$ac_word" >&5
++echo "$as_me:1328: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1331,10 +1333,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1334: result: $CC" >&5
++  echo "$as_me:1336: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1337: result: no" >&5
++  echo "$as_me:1339: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1343,7 +1345,7 @@
+   ac_ct_CC=$CC
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:1346: checking for $ac_word" >&5
++echo "$as_me:1348: 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
+@@ -1358,7 +1360,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="cc"
+-echo "$as_me:1361: found $ac_dir/$ac_word" >&5
++echo "$as_me:1363: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1366,10 +1368,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1369: result: $ac_ct_CC" >&5
++  echo "$as_me:1371: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1372: result: no" >&5
++  echo "$as_me:1374: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1382,7 +1384,7 @@
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:1385: checking for $ac_word" >&5
++echo "$as_me:1387: 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
+@@ -1402,7 +1404,7 @@
+   continue
+ fi
+ ac_cv_prog_CC="cc"
+-echo "$as_me:1405: found $ac_dir/$ac_word" >&5
++echo "$as_me:1407: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1424,10 +1426,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1427: result: $CC" >&5
++  echo "$as_me:1429: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1430: result: no" >&5
++  echo "$as_me:1432: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1438,7 +1440,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:1441: checking for $ac_word" >&5
++echo "$as_me:1443: 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
+@@ -1453,7 +1455,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:1456: found $ac_dir/$ac_word" >&5
++echo "$as_me:1458: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1461,10 +1463,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1464: result: $CC" >&5
++  echo "$as_me:1466: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1467: result: no" >&5
++  echo "$as_me:1469: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1477,7 +1479,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:1480: checking for $ac_word" >&5
++echo "$as_me:1482: 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
+@@ -1492,7 +1494,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:1495: found $ac_dir/$ac_word" >&5
++echo "$as_me:1497: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1500,10 +1502,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1503: result: $ac_ct_CC" >&5
++  echo "$as_me:1505: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1506: result: no" >&5
++  echo "$as_me:1508: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1515,32 +1517,32 @@
+ 
+ fi
+ 
+-test -z "$CC" && { { echo "$as_me:1518: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1520: 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:1523:" \
++echo "$as_me:1525:" \
+      "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo "$2"`
+-{ (eval echo "$as_me:1526: \"$ac_compiler --version &5\"") >&5
++{ (eval echo "$as_me:1528: \"$ac_compiler --version &5\"") >&5
+   (eval $ac_compiler --version &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1529: \$? = $ac_status" >&5
++  echo "$as_me:1531: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:1531: \"$ac_compiler -v &5\"") >&5
++{ (eval echo "$as_me:1533: \"$ac_compiler -v &5\"") >&5
+   (eval $ac_compiler -v &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1534: \$? = $ac_status" >&5
++  echo "$as_me:1536: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:1536: \"$ac_compiler -V &5\"") >&5
++{ (eval echo "$as_me:1538: \"$ac_compiler -V &5\"") >&5
+   (eval $ac_compiler -V &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1539: \$? = $ac_status" >&5
++  echo "$as_me:1541: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1543 "configure"
++#line 1545 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1556,13 +1558,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:1559: checking for C compiler default output" >&5
++echo "$as_me:1561: 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:1562: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1564: \"$ac_link_default\"") >&5
+   (eval $ac_link_default) 2>&5
+   ac_status=$?
+-  echo "$as_me:1565: \$? = $ac_status" >&5
++  echo "$as_me:1567: \$? = $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
+@@ -1585,34 +1587,34 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:1588: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1590: 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:1594: result: $ac_file" >&5
++echo "$as_me:1596: 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:1599: checking whether the C compiler works" >&5
++echo "$as_me:1601: 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:1605: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1607: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1608: \$? = $ac_status" >&5
++  echo "$as_me:1610: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+-	{ { echo "$as_me:1615: error: cannot run C compiled programs.
++	{ { echo "$as_me:1617: 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;}
+@@ -1620,24 +1622,24 @@
+     fi
+   fi
+ fi
+-echo "$as_me:1623: result: yes" >&5
++echo "$as_me:1625: 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:1630: checking whether we are cross compiling" >&5
++echo "$as_me:1632: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:1632: result: $cross_compiling" >&5
++echo "$as_me:1634: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+ 
+-echo "$as_me:1635: checking for executable suffix" >&5
++echo "$as_me:1637: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:1637: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1639: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:1640: \$? = $ac_status" >&5
++  echo "$as_me:1642: \$? = $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
+@@ -1653,25 +1655,25 @@
+   esac
+ done
+ else
+-  { { echo "$as_me:1656: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:1658: 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:1662: result: $ac_cv_exeext" >&5
++echo "$as_me:1664: 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:1668: checking for object suffix" >&5
++echo "$as_me:1670: 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 1674 "configure"
++#line 1676 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1683,10 +1685,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:1686: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1688: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1689: \$? = $ac_status" >&5
++  echo "$as_me:1691: \$? = $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
+@@ -1698,24 +1700,24 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:1701: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:1703: 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:1708: result: $ac_cv_objext" >&5
++echo "$as_me:1710: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:1712: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:1714: 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 1718 "configure"
++#line 1720 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1730,16 +1732,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1733: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1735: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1736: \$? = $ac_status" >&5
++  echo "$as_me:1738: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:1739: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1741: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1742: \$? = $ac_status" >&5
++  echo "$as_me:1744: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -1751,19 +1753,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:1754: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:1756: 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:1760: checking whether $CC accepts -g" >&5
++echo "$as_me:1762: 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 1766 "configure"
++#line 1768 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1775,16 +1777,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1778: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1780: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1781: \$? = $ac_status" >&5
++  echo "$as_me:1783: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:1784: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1786: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1787: \$? = $ac_status" >&5
++  echo "$as_me:1789: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cc_g=yes
+ else
+@@ -1794,7 +1796,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:1797: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:1799: 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
+@@ -1821,16 +1823,16 @@
+ #endif
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1824: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1826: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1827: \$? = $ac_status" >&5
++  echo "$as_me:1829: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:1830: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1832: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1833: \$? = $ac_status" >&5
++  echo "$as_me:1835: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   for ac_declaration in \
+    ''\
+@@ -1842,7 +1844,7 @@
+    'void exit (int);'
+ do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1845 "configure"
++#line 1847 "configure"
+ #include "confdefs.h"
+ #include 
+ $ac_declaration
+@@ -1855,16 +1857,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1858: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1860: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1861: \$? = $ac_status" >&5
++  echo "$as_me:1863: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:1864: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1866: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1867: \$? = $ac_status" >&5
++  echo "$as_me:1869: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -1874,7 +1876,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1877 "configure"
++#line 1879 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -1886,16 +1888,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1889: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1891: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1892: \$? = $ac_status" >&5
++  echo "$as_me:1894: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:1895: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1897: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1898: \$? = $ac_status" >&5
++  echo "$as_me:1900: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -1925,11 +1927,11 @@
+ 
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+-	echo "$as_me:1928: checking version of $CC" >&5
++	echo "$as_me:1930: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+-	echo "$as_me:1932: result: $GCC_VERSION" >&5
++	echo "$as_me:1934: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+ 
+@@ -1938,12 +1940,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:1941: checking if this is really Intel C compiler" >&5
++		echo "$as_me:1943: 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 1946 "configure"
++#line 1948 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1960,16 +1962,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:1963: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1965: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1966: \$? = $ac_status" >&5
++  echo "$as_me:1968: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:1969: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1971: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1972: \$? = $ac_status" >&5
++  echo "$as_me:1974: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -1980,7 +1982,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:1983: result: $INTEL_COMPILER" >&5
++		echo "$as_me:1985: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ 		;;
+ 	esac
+@@ -1989,11 +1991,11 @@
+ CLANG_COMPILER=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:1992: checking if this is really Clang C compiler" >&5
++	echo "$as_me:1994: 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 1996 "configure"
++#line 1998 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2010,16 +2012,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2013: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2015: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2016: \$? = $ac_status" >&5
++  echo "$as_me:2018: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2019: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2021: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2022: \$? = $ac_status" >&5
++  echo "$as_me:2024: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_COMPILER=yes
+ 
+@@ -2029,7 +2031,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:2032: result: $CLANG_COMPILER" >&5
++	echo "$as_me:2034: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+ 
+@@ -2038,30 +2040,30 @@
+ if test "x$CLANG_COMPILER" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:2041: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:2043: 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:2048: checking version of $CC" >&5
++	echo "$as_me:2050: 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:2052: result: $CLANG_VERSION" >&5
++	echo "$as_me:2054: 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:2059: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:2061: 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 2064 "configure"
++#line 2066 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -2075,16 +2077,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:2078: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2080: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2081: \$? = $ac_status" >&5
++  echo "$as_me:2083: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:2084: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2086: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2087: \$? = $ac_status" >&5
++  echo "$as_me:2089: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -2095,13 +2097,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:2098: result: $cf_clang_optok" >&5
++		echo "$as_me:2100: 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}:2104: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:2106: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -2110,7 +2112,7 @@
+ 	done
+ fi
+ 
+-echo "$as_me:2113: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:2115: 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
+@@ -2118,7 +2120,7 @@
+   ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2121 "configure"
++#line 2123 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -2165,16 +2167,16 @@
+ do
+   CC="$ac_save_CC $ac_arg"
+   rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2168: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2170: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2171: \$? = $ac_status" >&5
++  echo "$as_me:2173: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2174: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2176: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2177: \$? = $ac_status" >&5
++  echo "$as_me:2179: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -2191,10 +2193,10 @@
+ 
+ case "x$ac_cv_prog_cc_stdc" in
+   x|xno)
+-    echo "$as_me:2194: result: none needed" >&5
++    echo "$as_me:2196: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+   *)
+-    echo "$as_me:2197: result: $ac_cv_prog_cc_stdc" >&5
++    echo "$as_me:2199: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+     CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+@@ -2202,13 +2204,13 @@
+ # This should have been defined by AC_PROG_CC
+ : "${CC:=cc}"
+ 
+-echo "$as_me:2205: checking \$CFLAGS variable" >&5
++echo "$as_me:2207: checking \$CFLAGS variable" >&5
+ echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
+ case "x$CFLAGS" in
+ (*-[IUD]*)
+-	echo "$as_me:2209: result: broken" >&5
++	echo "$as_me:2211: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2211: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
++	{ echo "$as_me:2213: 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=
+@@ -2316,18 +2318,18 @@
+ 	done
+ 	;;
+ (*)
+-	echo "$as_me:2319: result: ok" >&5
++	echo "$as_me:2321: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+ 
+-echo "$as_me:2324: checking \$CC variable" >&5
++echo "$as_me:2326: checking \$CC variable" >&5
+ echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+ case "$CC" in
+ (*[\ \	]-*)
+-	echo "$as_me:2328: result: broken" >&5
++	echo "$as_me:2330: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2330: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++	{ echo "$as_me:2332: 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/[ ]*[ ]-[^ ].*//'`
+@@ -2444,24 +2446,24 @@
+ 	done
+ 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
+ 
+-echo "${as_me:-configure}:2447: testing resulting CC: '$CC' ..." 1>&5
++echo "${as_me:-configure}:2449: testing resulting CC: '$CC' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:2451: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2453: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:2455: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2457: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+ 
+ 	;;
+ (*)
+-	echo "$as_me:2459: result: ok" >&5
++	echo "$as_me:2461: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+ 
+-echo "$as_me:2464: checking for inline" >&5
++echo "$as_me:2466: 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
+@@ -2469,7 +2471,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2472 "configure"
++#line 2474 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo (void) {return 0; }
+@@ -2478,16 +2480,16 @@
+ 
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2481: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2483: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2484: \$? = $ac_status" >&5
++  echo "$as_me:2486: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2487: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2489: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2490: \$? = $ac_status" >&5
++  echo "$as_me:2492: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -2498,7 +2500,7 @@
+ done
+ 
+ fi
+-echo "$as_me:2501: result: $ac_cv_c_inline" >&5
++echo "$as_me:2503: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -2517,7 +2519,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:2520: checking for $ac_word" >&5
++echo "$as_me:2522: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_GREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2532,7 +2534,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_GREP="$ac_prog"
+-echo "$as_me:2535: found $ac_dir/$ac_word" >&5
++echo "$as_me:2537: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2540,10 +2542,10 @@
+ fi
+ GREP=$ac_cv_prog_GREP
+ if test -n "$GREP"; then
+-  echo "$as_me:2543: result: $GREP" >&5
++  echo "$as_me:2545: result: $GREP" >&5
+ echo "${ECHO_T}$GREP" >&6
+ else
+-  echo "$as_me:2546: result: no" >&5
++  echo "$as_me:2548: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2551,7 +2553,7 @@
+ done
+ test -n "$GREP" || GREP=": "
+ 
+-echo "$as_me:2554: checking for egrep" >&5
++echo "$as_me:2556: checking for egrep" >&5
+ echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+ if test "${ac_cv_path_EGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2563,7 +2565,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:2566: checking for $ac_word" >&5
++echo "$as_me:2568: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_EGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2580,7 +2582,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_EGREP="$ac_dir/$ac_word"
+-   echo "$as_me:2583: found $ac_dir/$ac_word" >&5
++   echo "$as_me:2585: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -2591,10 +2593,10 @@
+ EGREP=$ac_cv_path_EGREP
+ 
+ if test -n "$EGREP"; then
+-  echo "$as_me:2594: result: $EGREP" >&5
++  echo "$as_me:2596: result: $EGREP" >&5
+ echo "${ECHO_T}$EGREP" >&6
+ else
+-  echo "$as_me:2597: result: no" >&5
++  echo "$as_me:2599: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2602,12 +2604,12 @@
+ done
+ test -n "$EGREP" || EGREP=": "
+ 
+-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2605: error: cannot find workable egrep" >&5
++     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2607: error: cannot find workable egrep" >&5
+ echo "$as_me: error: cannot find workable egrep" >&2;}
+    { (exit 1); exit 1; }; }
+    fi
+ fi
+-echo "$as_me:2610: result: $ac_cv_path_EGREP" >&5
++echo "$as_me:2612: result: $ac_cv_path_EGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_EGREP" >&6
+  EGREP="$ac_cv_path_EGREP"
+ 
+@@ -2617,7 +2619,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:2620: checking how to run the C preprocessor" >&5
++echo "$as_me:2622: 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
+@@ -2638,18 +2640,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 2641 "configure"
++#line 2643 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2646: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2648: \"$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:2652: \$? = $ac_status" >&5
++  echo "$as_me:2654: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2672,17 +2674,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2675 "configure"
++#line 2677 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:2679: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2681: \"$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:2685: \$? = $ac_status" >&5
++  echo "$as_me:2687: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2719,7 +2721,7 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:2722: result: $CPP" >&5
++echo "$as_me:2724: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -2729,18 +2731,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 2732 "configure"
++#line 2734 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2737: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2739: \"$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:2743: \$? = $ac_status" >&5
++  echo "$as_me:2745: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2763,17 +2765,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2766 "configure"
++#line 2768 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:2770: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2772: \"$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:2776: \$? = $ac_status" >&5
++  echo "$as_me:2778: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2801,7 +2803,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:2804: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:2806: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -2817,7 +2819,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:2820: checking for $ac_word" >&5
++echo "$as_me:2822: 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
+@@ -2832,7 +2834,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+-echo "$as_me:2835: found $ac_dir/$ac_word" >&5
++echo "$as_me:2837: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2840,10 +2842,10 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "$as_me:2843: result: $AWK" >&5
++  echo "$as_me:2845: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+-  echo "$as_me:2846: result: no" >&5
++  echo "$as_me:2848: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2873,7 +2875,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:2876: checking for a BSD compatible install" >&5
++echo "$as_me:2878: 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
+@@ -2922,7 +2924,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:2925: result: $INSTALL" >&5
++echo "$as_me:2927: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -2943,7 +2945,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:2946: checking if you want to install stripped executables" >&5
++echo "$as_me:2948: 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.
+@@ -2960,7 +2962,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:2963: result: $enable_stripping" >&5
++echo "$as_me:2965: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -2971,7 +2973,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:2974: checking if install accepts -p option" >&5
++echo "$as_me:2976: 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
+@@ -3002,10 +3004,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:3005: result: $cf_cv_install_p" >&5
++echo "$as_me:3007: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:3008: checking if install needs to be told about ownership" >&5
++echo "$as_me:3010: 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)
+@@ -3016,7 +3018,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:3019: result: $with_install_o" >&5
++echo "$as_me:3021: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -3027,7 +3029,7 @@
+ 
+ if test -n "$INSTALL_OPT_S"
+ then
+-	echo "$as_me:3030: checking if you want to specify strip-program" >&5
++	echo "$as_me:3032: checking if you want to specify strip-program" >&5
+ echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
+ 
+ # Check whether --with-strip-program or --without-strip-program was given.
+@@ -3037,11 +3039,11 @@
+ else
+   with_strip_program=no
+ fi;
+-	echo "$as_me:3040: result: $with_strip_program" >&5
++	echo "$as_me:3042: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ 	if test "$with_strip_program" != no
+ 	then
+-		echo "$as_me:3044: checking if strip-program is supported with this installer" >&5
++		echo "$as_me:3046: checking if strip-program is supported with this installer" >&5
+ echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
+ 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
+ 		check_install_strip=no
+@@ -3062,11 +3064,11 @@
+ 				done
+ 			fi
+ 		fi
+-		echo "$as_me:3065: result: $check_install_strip" >&5
++		echo "$as_me:3067: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ 		case "$check_install_strip" in
+ 		(no)
+-			{ echo "$as_me:3069: WARNING: $cf_install_program does not support strip program option" >&5
++			{ echo "$as_me:3071: WARNING: $cf_install_program does not support strip program option" >&5
+ echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
+ 			with_strip_program=no
+ 			;;
+@@ -3081,7 +3083,7 @@
+ 			chmod +x "$INSTALL"
+ 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
+ 
+-echo "${as_me:-configure}:3084: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:3086: testing created $INSTALL ..." 1>&5
+ 
+ 			;;
+ 		(option)
+@@ -3095,7 +3097,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:3098: checking for $ac_word" >&5
++echo "$as_me:3100: 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
+@@ -3110,7 +3112,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LINT="$ac_prog"
+-echo "$as_me:3113: found $ac_dir/$ac_word" >&5
++echo "$as_me:3115: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3118,10 +3120,10 @@
+ fi
+ LINT=$ac_cv_prog_LINT
+ if test -n "$LINT"; then
+-  echo "$as_me:3121: result: $LINT" >&5
++  echo "$as_me:3123: result: $LINT" >&5
+ echo "${ECHO_T}$LINT" >&6
+ else
+-  echo "$as_me:3124: result: no" >&5
++  echo "$as_me:3126: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3134,7 +3136,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:3137: checking for \".PHONY\" make-support" >&5
++echo "$as_me:3139: 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
+@@ -3189,14 +3191,14 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:3192: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:3194: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+ test "x$cf_cv_make_PHONY" = xyes && MAKE_PHONY=
+ test "x$cf_cv_make_PHONY" != xyes && MAKE_NO_PHONY=
+ 
+-echo "$as_me:3199: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:3201: 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
+@@ -3223,7 +3225,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:3226: result: $cf_cv_mixedcase" >&5
++echo "$as_me:3228: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -3234,7 +3236,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:3237: checking for $ac_word" >&5
++echo "$as_me:3239: 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
+@@ -3249,7 +3251,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:3252: found $ac_dir/$ac_word" >&5
++echo "$as_me:3254: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3257,10 +3259,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:3260: result: $CTAGS" >&5
++  echo "$as_me:3262: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:3263: result: no" >&5
++  echo "$as_me:3265: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3271,7 +3273,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:3274: checking for $ac_word" >&5
++echo "$as_me:3276: 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
+@@ -3286,7 +3288,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:3289: found $ac_dir/$ac_word" >&5
++echo "$as_me:3291: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3294,10 +3296,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:3297: result: $ETAGS" >&5
++  echo "$as_me:3299: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:3300: result: no" >&5
++  echo "$as_me:3302: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3306,7 +3308,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:3309: checking for $ac_word" >&5
++echo "$as_me:3311: 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
+@@ -3321,7 +3323,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:3324: found $ac_dir/$ac_word" >&5
++echo "$as_me:3326: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3330,17 +3332,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:3333: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:3335: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:3336: result: no" >&5
++  echo "$as_me:3338: 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:3343: checking for $ac_word" >&5
++echo "$as_me:3345: 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
+@@ -3355,7 +3357,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:3358: found $ac_dir/$ac_word" >&5
++echo "$as_me:3360: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3364,10 +3366,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:3367: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:3369: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:3370: result: no" >&5
++  echo "$as_me:3372: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3387,14 +3389,14 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:3390: checking if -lm needed for math functions" >&5
++echo "$as_me:3392: 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 3397 "configure"
++#line 3399 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -3410,16 +3412,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3413: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3415: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3416: \$? = $ac_status" >&5
++  echo "$as_me:3418: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:3419: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3421: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3422: \$? = $ac_status" >&5
++  echo "$as_me:3424: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -3429,7 +3431,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3432: result: $cf_cv_need_libm" >&5
++echo "$as_me:3434: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ 
+ if test "$cf_cv_need_libm" = yes
+@@ -3437,14 +3439,14 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lm"
+-	echo "$as_me:3440: checking if -lm is available for math functions" >&5
++	echo "$as_me:3442: checking if -lm is available for math functions" >&5
+ echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
+ if test "${cf_cv_have_libm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3447 "configure"
++#line 3449 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -3460,16 +3462,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3463: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3465: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3466: \$? = $ac_status" >&5
++  echo "$as_me:3468: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:3469: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3471: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3472: \$? = $ac_status" >&5
++  echo "$as_me:3474: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_libm=yes
+ else
+@@ -3479,7 +3481,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3482: result: $cf_cv_have_libm" >&5
++echo "$as_me:3484: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ 	LIBS="$cf_save_LIBS"
+ 
+@@ -3534,7 +3536,7 @@
+ cf_cv_screen=curses
+ cf_cv_libtype=
+ 
+-echo "$as_me:3537: checking for fgrep" >&5
++echo "$as_me:3539: checking for fgrep" >&5
+ echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
+ if test "${ac_cv_path_FGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3546,7 +3548,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:3551: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_FGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3563,7 +3565,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_FGREP="$ac_dir/$ac_word"
+-   echo "$as_me:3566: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3568: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3574,10 +3576,10 @@
+ FGREP=$ac_cv_path_FGREP
+ 
+ if test -n "$FGREP"; then
+-  echo "$as_me:3577: result: $FGREP" >&5
++  echo "$as_me:3579: result: $FGREP" >&5
+ echo "${ECHO_T}$FGREP" >&6
+ else
+-  echo "$as_me:3580: result: no" >&5
++  echo "$as_me:3582: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3585,16 +3587,16 @@
+ done
+ test -n "$FGREP" || FGREP=": "
+ 
+-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3588: error: cannot find workable fgrep" >&5
++     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3590: error: cannot find workable fgrep" >&5
+ echo "$as_me: error: cannot find workable fgrep" >&2;}
+    { (exit 1); exit 1; }; }
+    fi
+ fi
+-echo "$as_me:3593: result: $ac_cv_path_FGREP" >&5
++echo "$as_me:3595: result: $ac_cv_path_FGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_FGREP" >&6
+  FGREP="$ac_cv_path_FGREP"
+ 
+-echo "$as_me:3597: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:3599: 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.
+@@ -3611,17 +3613,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:3614: result: $enable_stdnoreturn" >&5
++echo "$as_me:3616: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:3618: checking for C11 _Noreturn feature" >&5
++echo "$as_me:3620: 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 3624 "configure"
++#line 3626 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -3637,16 +3639,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3640: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3642: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3643: \$? = $ac_status" >&5
++  echo "$as_me:3645: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3646: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3648: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3649: \$? = $ac_status" >&5
++  echo "$as_me:3651: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -3657,7 +3659,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:3660: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:3662: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -3696,10 +3698,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:3699: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:3701: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -3749,12 +3751,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:3752: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:3754: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3755: \$? = $ac_status" >&5
++  echo "$as_me:3757: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:3757: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:3759: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -3813,7 +3815,7 @@
+ rm -rf ./conftest*
+ fi
+ 
+-echo "$as_me:3816: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:3818: 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.
+@@ -3823,7 +3825,7 @@
+ else
+   enable_string_hacks=no
+ fi;
+-echo "$as_me:3826: result: $enable_string_hacks" >&5
++echo "$as_me:3828: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+ 
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -3832,15 +3834,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:3835: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:3837: 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:3837: checking for strlcat" >&5
++	echo "$as_me:3839: 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 3843 "configure"
++#line 3845 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -3871,16 +3873,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3874: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3876: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3877: \$? = $ac_status" >&5
++  echo "$as_me:3879: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:3880: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3882: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3883: \$? = $ac_status" >&5
++  echo "$as_me:3885: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -3890,7 +3892,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3893: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:3895: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+ 
+@@ -3900,7 +3902,7 @@
+ 
+ else
+ 
+-		echo "$as_me:3903: checking for strlcat in -lbsd" >&5
++		echo "$as_me:3905: 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
+@@ -3908,7 +3910,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3911 "configure"
++#line 3913 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -3927,16 +3929,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3930: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3932: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3933: \$? = $ac_status" >&5
++  echo "$as_me:3935: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:3936: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3938: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3939: \$? = $ac_status" >&5
++  echo "$as_me:3941: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -3947,7 +3949,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:3950: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:3952: 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
+ 
+@@ -3970,23 +3972,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:3973: checking for $ac_header" >&5
++echo "$as_me:3975: 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 3979 "configure"
++#line 3981 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:3983: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3985: \"$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:3989: \$? = $ac_status" >&5
++  echo "$as_me:3991: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -4005,7 +4007,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:4008: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:4010: 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:4031: 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 4035 "configure"
++#line 4037 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -4063,16 +4065,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:4066: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4068: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4069: \$? = $ac_status" >&5
++  echo "$as_me:4071: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:4072: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4074: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4075: \$? = $ac_status" >&5
++  echo "$as_me:4077: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -4082,7 +4084,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:4085: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:4087: 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:4099: 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 4104 "configure"
++#line 4106 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4120,16 +4122,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4123: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4125: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4126: \$? = $ac_status" >&5
++  echo "$as_me:4128: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4129: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4131: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4132: \$? = $ac_status" >&5
++  echo "$as_me:4134: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -4140,7 +4142,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4143: result: $cf_cv_posix_visible" >&5
++echo "$as_me:4145: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -4182,14 +4184,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:4185: checking if this is the GNU C library" >&5
++echo "$as_me:4187: 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 4192 "configure"
++#line 4194 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4208,16 +4210,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4211: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4213: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4214: \$? = $ac_status" >&5
++  echo "$as_me:4216: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4217: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4219: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4220: \$? = $ac_status" >&5
++  echo "$as_me:4222: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -4228,7 +4230,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4231: result: $cf_cv_gnu_library" >&5
++echo "$as_me:4233: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -4236,7 +4238,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:4239: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:4241: 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
+@@ -4248,7 +4250,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4251 "configure"
++#line 4253 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4267,16 +4269,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4270: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4272: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4273: \$? = $ac_status" >&5
++  echo "$as_me:4275: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4276: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4278: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4279: \$? = $ac_status" >&5
++  echo "$as_me:4281: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -4288,12 +4290,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:4291: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:4293: 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:4296: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:4298: 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
+@@ -4398,7 +4400,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4401 "configure"
++#line 4403 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -4418,16 +4420,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4421: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4423: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4424: \$? = $ac_status" >&5
++  echo "$as_me:4426: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4427: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4429: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4430: \$? = $ac_status" >&5
++  echo "$as_me:4432: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -4438,7 +4440,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4441: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:4443: 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
+@@ -4447,14 +4449,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:4450: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:4452: 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 4457 "configure"
++#line 4459 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4469,16 +4471,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4472: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4474: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4475: \$? = $ac_status" >&5
++  echo "$as_me:4477: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4478: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4480: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4481: \$? = $ac_status" >&5
++  echo "$as_me:4483: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -4585,7 +4587,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4588 "configure"
++#line 4590 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4600,16 +4602,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4603: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4605: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4606: \$? = $ac_status" >&5
++  echo "$as_me:4608: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4609: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4611: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4612: \$? = $ac_status" >&5
++  echo "$as_me:4614: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -4624,12 +4626,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4627: result: $cf_cv_gnu_source" >&5
++echo "$as_me:4629: 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:4632: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:4634: 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
+@@ -4639,7 +4641,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4642 "configure"
++#line 4644 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4654,16 +4656,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4657: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4659: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4660: \$? = $ac_status" >&5
++  echo "$as_me:4662: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4663: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4665: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4666: \$? = $ac_status" >&5
++  echo "$as_me:4668: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -4674,7 +4676,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4677: result: $cf_cv_default_source" >&5
++echo "$as_me:4679: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -4711,16 +4713,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:4714: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:4716: 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}:4720: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:4722: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4723 "configure"
++#line 4725 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4735,16 +4737,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4738: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4740: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4741: \$? = $ac_status" >&5
++  echo "$as_me:4743: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4744: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4746: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4747: \$? = $ac_status" >&5
++  echo "$as_me:4749: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -4765,7 +4767,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4768 "configure"
++#line 4770 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4780,16 +4782,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4783: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4785: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4786: \$? = $ac_status" >&5
++  echo "$as_me:4788: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4789: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4791: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4792: \$? = $ac_status" >&5
++  echo "$as_me:4794: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -4800,7 +4802,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:4803: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:4805: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -4808,10 +4810,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:4811: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:4813: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4814 "configure"
++#line 4816 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4826,16 +4828,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4829: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4831: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4832: \$? = $ac_status" >&5
++  echo "$as_me:4834: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4835: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4837: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4838: \$? = $ac_status" >&5
++  echo "$as_me:4840: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -4851,7 +4853,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4854: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:4856: 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
+@@ -4968,7 +4970,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:4971: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:4973: 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
+@@ -5000,14 +5002,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:5003: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:5005: 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 5010 "configure"
++#line 5012 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -5025,16 +5027,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5028: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5030: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5031: \$? = $ac_status" >&5
++  echo "$as_me:5033: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5034: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5036: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5037: \$? = $ac_status" >&5
++  echo "$as_me:5039: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -5046,7 +5048,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5049 "configure"
++#line 5051 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -5064,16 +5066,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5067: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5069: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5070: \$? = $ac_status" >&5
++  echo "$as_me:5072: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5073: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5075: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5076: \$? = $ac_status" >&5
++  echo "$as_me:5078: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -5088,7 +5090,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:5091: result: $cf_cv_xopen_source" >&5
++echo "$as_me:5093: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -5248,16 +5250,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:5251: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:5253: 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}:5257: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:5259: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5260 "configure"
++#line 5262 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5272,16 +5274,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5275: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5277: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5278: \$? = $ac_status" >&5
++  echo "$as_me:5280: \$? = $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:5283: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5284: \$? = $ac_status" >&5
++  echo "$as_me:5286: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -5302,7 +5304,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5305 "configure"
++#line 5307 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5317,16 +5319,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5320: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5322: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5323: \$? = $ac_status" >&5
++  echo "$as_me:5325: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5326: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5328: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5329: \$? = $ac_status" >&5
++  echo "$as_me:5331: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5337,7 +5339,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:5340: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:5342: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -5345,10 +5347,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:5348: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:5350: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5351 "configure"
++#line 5353 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5363,16 +5365,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5366: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5368: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5369: \$? = $ac_status" >&5
++  echo "$as_me:5371: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5372: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5374: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5375: \$? = $ac_status" >&5
++  echo "$as_me:5377: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5388,7 +5390,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:5391: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:5393: 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
+@@ -5501,10 +5503,10 @@
+ 	if test "$cf_cv_xopen_source" = no ; then
+ 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+ 
+-echo "${as_me:-configure}:5504: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:5506: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5507 "configure"
++#line 5509 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -5522,23 +5524,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5525: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5527: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5528: \$? = $ac_status" >&5
++  echo "$as_me:5530: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5531: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5533: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5534: \$? = $ac_status" >&5
++  echo "$as_me:5536: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-			{ echo "$as_me:5541: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++			{ echo "$as_me:5543: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ 			CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -5561,7 +5563,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}:5564: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:5566: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -5573,7 +5575,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}:5576: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:5578: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -5661,7 +5663,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:5664: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:5666: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -5671,7 +5673,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:5674: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:5676: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -5681,7 +5683,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}:5684: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:5686: 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"
+@@ -5693,10 +5695,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:5696: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:5698: 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 5699 "configure"
++#line 5701 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5711,16 +5713,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5714: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5716: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5717: \$? = $ac_status" >&5
++  echo "$as_me:5719: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5720: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5722: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5723: \$? = $ac_status" >&5
++  echo "$as_me:5725: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -5729,12 +5731,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:5732: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:5734: 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 5737 "configure"
++#line 5739 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5749,16 +5751,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5752: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5754: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5755: \$? = $ac_status" >&5
++  echo "$as_me:5757: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5758: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5760: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5761: \$? = $ac_status" >&5
++  echo "$as_me:5763: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -5769,19 +5771,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:5772: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:5774: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:5777: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:5779: 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 5784 "configure"
++#line 5786 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -5799,16 +5801,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5802: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5804: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5805: \$? = $ac_status" >&5
++  echo "$as_me:5807: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5808: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5810: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5811: \$? = $ac_status" >&5
++  echo "$as_me:5813: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -5820,7 +5822,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5823 "configure"
++#line 5825 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -5838,16 +5840,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5841: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5843: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5844: \$? = $ac_status" >&5
++  echo "$as_me:5846: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5847: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5849: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5850: \$? = $ac_status" >&5
++  echo "$as_me:5852: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -5862,7 +5864,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:5865: result: $cf_cv_xopen_source" >&5
++echo "$as_me:5867: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -6009,13 +6011,13 @@
+ fi
+ fi # cf_cv_posix_visible
+ 
+-echo "$as_me:6012: checking for ANSI C header files" >&5
++echo "$as_me:6014: 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 6018 "configure"
++#line 6020 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -6023,13 +6025,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:6026: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:6028: \"$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:6032: \$? = $ac_status" >&5
++  echo "$as_me:6034: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6051,7 +6053,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 6054 "configure"
++#line 6056 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6069,7 +6071,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 6072 "configure"
++#line 6074 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6090,7 +6092,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6093 "configure"
++#line 6095 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -6116,15 +6118,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6119: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6121: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6122: \$? = $ac_status" >&5
++  echo "$as_me:6124: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:6124: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6126: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6127: \$? = $ac_status" >&5
++  echo "$as_me:6129: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6137,7 +6139,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:6140: result: $ac_cv_header_stdc" >&5
++echo "$as_me:6142: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -6153,28 +6155,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6156: checking for $ac_header" >&5
++echo "$as_me:6158: 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 6162 "configure"
++#line 6164 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6168: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6170: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6171: \$? = $ac_status" >&5
++  echo "$as_me:6173: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6174: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6176: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6177: \$? = $ac_status" >&5
++  echo "$as_me:6179: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -6184,7 +6186,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6187: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6189: 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:6199: checking whether exit is declared" >&5
+ echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
+ if test "${ac_cv_have_decl_exit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6203 "configure"
++#line 6205 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -6215,16 +6217,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6218: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6220: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6221: \$? = $ac_status" >&5
++  echo "$as_me:6223: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6224: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6226: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6227: \$? = $ac_status" >&5
++  echo "$as_me:6229: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_have_decl_exit=yes
+ else
+@@ -6234,10 +6236,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6237: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:6239: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+ 
+-echo "$as_me:6240: checking for signal global datatype" >&5
++echo "$as_me:6242: 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
+@@ -6249,7 +6251,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6252 "configure"
++#line 6254 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -6273,16 +6275,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6276: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6278: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6279: \$? = $ac_status" >&5
++  echo "$as_me:6281: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6282: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6284: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6285: \$? = $ac_status" >&5
++  echo "$as_me:6287: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -6296,7 +6298,7 @@
+ 
+ fi
+ 
+-echo "$as_me:6299: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:6301: 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:6310: 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 6315 "configure"
++#line 6317 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -6327,23 +6329,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6330: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6332: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6333: \$? = $ac_status" >&5
++  echo "$as_me:6335: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6336: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6338: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6339: \$? = $ac_status" >&5
++  echo "$as_me:6341: \$? = $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 6346 "configure"
++#line 6348 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -6361,16 +6363,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6364: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6366: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6367: \$? = $ac_status" >&5
++  echo "$as_me:6369: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6370: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6372: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6373: \$? = $ac_status" >&5
++  echo "$as_me:6375: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -6384,11 +6386,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:6387: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:6389: 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:6391: checking for actual SIGWINCH definition" >&5
++echo "$as_me:6393: 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
+@@ -6399,7 +6401,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6402 "configure"
++#line 6404 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -6421,16 +6423,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6424: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6426: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6427: \$? = $ac_status" >&5
++  echo "$as_me:6429: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6430: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6432: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6433: \$? = $ac_status" >&5
++  echo "$as_me:6435: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -6444,7 +6446,7 @@
+ done
+ 
+ fi
+-echo "$as_me:6447: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:6449: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -6454,13 +6456,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:6457: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:6459: 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 6463 "configure"
++#line 6465 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -6474,16 +6476,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6477: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6479: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6480: \$? = $ac_status" >&5
++  echo "$as_me:6482: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6483: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6485: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6486: \$? = $ac_status" >&5
++  echo "$as_me:6488: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -6494,7 +6496,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:6497: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:6499: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test "$am_cv_langinfo_codeset" = yes; then
+ 
+@@ -6504,7 +6506,7 @@
+ 
+ 	fi
+ 
+-echo "$as_me:6507: checking if you want to use pkg-config" >&5
++echo "$as_me:6509: 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.
+@@ -6514,7 +6516,7 @@
+ else
+   cf_pkg_config=yes
+ fi;
+-echo "$as_me:6517: result: $cf_pkg_config" >&5
++echo "$as_me:6519: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+ 
+ case "$cf_pkg_config" in
+@@ -6526,7 +6528,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:6529: checking for $ac_word" >&5
++echo "$as_me:6531: 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
+@@ -6543,7 +6545,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:6546: found $ac_dir/$ac_word" >&5
++   echo "$as_me:6548: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -6554,10 +6556,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:6557: result: $PKG_CONFIG" >&5
++  echo "$as_me:6559: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+-  echo "$as_me:6560: result: no" >&5
++  echo "$as_me:6562: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6566,7 +6568,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:6569: checking for $ac_word" >&5
++echo "$as_me:6571: 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
+@@ -6583,7 +6585,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:6586: found $ac_dir/$ac_word" >&5
++   echo "$as_me:6588: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -6595,10 +6597,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ 
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  echo "$as_me:6598: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:6600: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+-  echo "$as_me:6601: result: no" >&5
++  echo "$as_me:6603: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6639,18 +6641,18 @@
+ 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:6642: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++	{ { echo "$as_me:6644: 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:6649: WARNING: pkg-config is not installed" >&5
++	{ echo "$as_me:6651: WARNING: pkg-config is not installed" >&5
+ echo "$as_me: WARNING: pkg-config is not installed" >&2;}
+ fi
+ 
+-echo "$as_me:6653: checking if you want to see long compiling messages" >&5
++echo "$as_me:6655: 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.
+@@ -6684,10 +6686,52 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:6687: result: $enableval" >&5
++echo "$as_me:6689: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+-echo "$as_me:6690: checking for ncurses wrap-prefix" >&5
++echo "$as_me:6692: checking for an installation directory prefix" >&5
++echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
++
++# Check whether --with-install-prefix or --without-install-prefix was given.
++if test "${with_install_prefix+set}" = set; then
++  withval="$with_install_prefix"
++  case "x$withval" in
++	(xyes|xno)
++		;;
++	(*)	DESTDIR="$withval"
++		;;
++	esac
++fi;
++echo "$as_me:6705: result: ${DESTDIR:-(none)}" >&5
++echo "${ECHO_T}${DESTDIR:-(none)}" >&6
++
++echo "$as_me:6708: checking if installation directory prefix should be merged" >&5
++echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6
++
++# Check whether --enable-install-prefix or --disable-install-prefix was given.
++if test "${enable_install_prefix+set}" = set; then
++  enableval="$enable_install_prefix"
++  test "$enableval" != yes && enableval=no
++	if test "$enableval" != "no" ; then
++    cf_install_prefix=yes
++	else
++		cf_install_prefix=no
++	fi
++else
++  enableval=no
++	cf_install_prefix=no
++
++fi;
++echo "$as_me:6725: result: $cf_install_prefix" >&5
++echo "${ECHO_T}$cf_install_prefix" >&6
++
++if test "$cf_install_prefix" = yes ; then
++	MERGE_PREFIX=':$(prefix)%=%'
++else
++	MERGE_PREFIX=''
++fi
++
++echo "$as_me:6734: checking for ncurses wrap-prefix" >&5
+ echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given.
+@@ -6697,10 +6741,10 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-echo "$as_me:6700: result: $NCURSES_WRAP_PREFIX" >&5
++echo "$as_me:6744: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ 
+-echo "$as_me:6703: checking if you want to check for wide-character functions" >&5
++echo "$as_me:6747: checking if you want to check for wide-character functions" >&5
+ echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-widec or --disable-widec was given.
+@@ -6717,10 +6761,10 @@
+ 	cf_enable_widec=yes
+ 
+ fi;
+-echo "$as_me:6720: result: $cf_enable_widec" >&5
++echo "$as_me:6764: result: $cf_enable_widec" >&5
+ echo "${ECHO_T}$cf_enable_widec" >&6
+ 
+-echo "$as_me:6723: checking for specific curses-directory" >&5
++echo "$as_me:6767: 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.
+@@ -6730,7 +6774,7 @@
+ else
+   cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:6733: result: $cf_cv_curses_dir" >&5
++echo "$as_me:6777: 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"
+@@ -6759,7 +6803,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:6762: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:6806: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -6795,7 +6839,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6798 "configure"
++#line 6842 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6807,16 +6851,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6810: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6854: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6813: \$? = $ac_status" >&5
++  echo "$as_me:6857: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6816: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6860: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6819: \$? = $ac_status" >&5
++  echo "$as_me:6863: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6833,7 +6877,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}:6836: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6880: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -6869,7 +6913,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}:6872: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6916: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -6882,7 +6926,7 @@
+ 
+ cf_cv_screen=curses
+ 
+-echo "$as_me:6885: checking for specified curses library type" >&5
++echo "$as_me:6929: checking for specified curses library type" >&5
+ echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
+ 
+ # Check whether --with-screen or --without-screen was given.
+@@ -6926,13 +6970,13 @@
+ fi;
+ fi;
+ 
+-echo "$as_me:6929: result: $cf_cv_screen" >&5
++echo "$as_me:6973: result: $cf_cv_screen" >&5
+ echo "${ECHO_T}$cf_cv_screen" >&6
+ 
+ case $cf_cv_screen in
+ (curses|curses_*)
+ 
+-echo "$as_me:6935: checking for extra include directories" >&5
++echo "$as_me:6979: checking for extra include directories" >&5
+ echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
+ if test "${cf_cv_curses_incdir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6958,7 +7002,7 @@
+ esac
+ 
+ fi
+-echo "$as_me:6961: result: $cf_cv_curses_incdir" >&5
++echo "$as_me:7005: result: $cf_cv_curses_incdir" >&5
+ echo "${ECHO_T}$cf_cv_curses_incdir" >&6
+ if test "$cf_cv_curses_incdir" != no
+ then
+@@ -6968,7 +7012,7 @@
+ 
+ fi
+ 
+-echo "$as_me:6971: checking if we have identified curses headers" >&5
++echo "$as_me:7015: 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
+@@ -6980,7 +7024,7 @@
+ 	curses.h  ncurses/ncurses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6983 "configure"
++#line 7027 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -6992,16 +7036,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6995: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7039: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6998: \$? = $ac_status" >&5
++  echo "$as_me:7042: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7001: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7045: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7004: \$? = $ac_status" >&5
++  echo "$as_me:7048: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -7012,11 +7056,11 @@
+ done
+ 
+ fi
+-echo "$as_me:7015: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:7059: 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:7019: error: No curses header-files found" >&5
++	{ { echo "$as_me:7063: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7026,23 +7070,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:7029: checking for $ac_header" >&5
++echo "$as_me:7073: 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 7035 "configure"
++#line 7079 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7039: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7083: \"$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:7045: \$? = $ac_status" >&5
++  echo "$as_me:7089: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7061,7 +7105,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7064: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7108: 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:7118: 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
+@@ -7089,7 +7133,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7092 "configure"
++#line 7136 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -7104,16 +7148,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7107: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7151: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7110: \$? = $ac_status" >&5
++  echo "$as_me:7154: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7113: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7157: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7116: \$? = $ac_status" >&5
++  echo "$as_me:7160: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -7129,7 +7173,7 @@
+ done
+ 
+ fi
+-echo "$as_me:7132: result: $cf_cv_term_header" >&5
++echo "$as_me:7176: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -7161,7 +7205,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:7164: checking for ncurses version" >&5
++echo "$as_me:7208: 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
+@@ -7187,10 +7231,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:7190: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:7234: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7193: \$? = $ac_status" >&5
++  echo "$as_me:7237: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -7200,7 +7244,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7203 "configure"
++#line 7247 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -7227,15 +7271,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:7230: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7274: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7233: \$? = $ac_status" >&5
++  echo "$as_me:7277: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:7235: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7279: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7238: \$? = $ac_status" >&5
++  echo "$as_me:7282: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -7249,17 +7293,17 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:7252: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:7296: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:7259: checking if we have identified curses libraries" >&5
++echo "$as_me:7303: checking if we have identified curses libraries" >&5
+ echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7262 "configure"
++#line 7306 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7271,16 +7315,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7274: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7318: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7277: \$? = $ac_status" >&5
++  echo "$as_me:7321: \$? = $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:7324: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7283: \$? = $ac_status" >&5
++  echo "$as_me:7327: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -7289,13 +7333,13 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-echo "$as_me:7292: result: $cf_result" >&5
++echo "$as_me:7336: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test "$cf_result" = no ; then
+ case "$host_os" in
+ (freebsd*)
+-	echo "$as_me:7298: checking for tgoto in -lmytinfo" >&5
++	echo "$as_me:7342: 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
+@@ -7303,7 +7347,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7306 "configure"
++#line 7350 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7322,16 +7366,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7325: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7369: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7328: \$? = $ac_status" >&5
++  echo "$as_me:7372: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7331: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7375: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7334: \$? = $ac_status" >&5
++  echo "$as_me:7378: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -7342,7 +7386,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7345: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:7389: 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
+ 
+@@ -7372,7 +7416,7 @@
+ 	# term.h) for cur_colr
+ 	if test "x$cf_cv_screen" = "xcurses_colr"
+ 	then
+-		echo "$as_me:7375: checking for initscr in -lcur_colr" >&5
++		echo "$as_me:7419: checking for initscr in -lcur_colr" >&5
+ echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
+ if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7380,7 +7424,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcur_colr  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7383 "configure"
++#line 7427 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7399,16 +7443,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7402: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7446: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7405: \$? = $ac_status" >&5
++  echo "$as_me:7449: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7408: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7452: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7411: \$? = $ac_status" >&5
++  echo "$as_me:7455: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_cur_colr_initscr=yes
+ else
+@@ -7419,7 +7463,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7422: result: $ac_cv_lib_cur_colr_initscr" >&5
++echo "$as_me:7466: result: $ac_cv_lib_cur_colr_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
+ if test "$ac_cv_lib_cur_colr_initscr" = yes; then
+ 
+@@ -7443,7 +7487,7 @@
+ 
+ else
+ 
+-		echo "$as_me:7446: checking for initscr in -lHcurses" >&5
++		echo "$as_me:7490: checking for initscr in -lHcurses" >&5
+ echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
+ if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7451,7 +7495,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lHcurses  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7454 "configure"
++#line 7498 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7470,16 +7514,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7473: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7517: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7476: \$? = $ac_status" >&5
++  echo "$as_me:7520: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7479: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7523: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7482: \$? = $ac_status" >&5
++  echo "$as_me:7526: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_Hcurses_initscr=yes
+ else
+@@ -7490,7 +7534,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7493: result: $ac_cv_lib_Hcurses_initscr" >&5
++echo "$as_me:7537: result: $ac_cv_lib_Hcurses_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
+ if test "$ac_cv_lib_Hcurses_initscr" = yes; then
+ 
+@@ -7548,7 +7592,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}:7551: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7595: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7577,7 +7621,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}:7580: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7624: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7608,7 +7652,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}:7611: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7655: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7643,7 +7687,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}:7646: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7690: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7687,13 +7731,13 @@
+ 	# because it may be needed to link the test-case for initscr.
+ 	if test "x$cf_term_lib" = x
+ 	then
+-		echo "$as_me:7690: checking for tgoto" >&5
++		echo "$as_me:7734: checking for tgoto" >&5
+ echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
+ if test "${ac_cv_func_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7696 "configure"
++#line 7740 "configure"
+ #include "confdefs.h"
+ #define tgoto autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7724,16 +7768,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7727: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7771: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7730: \$? = $ac_status" >&5
++  echo "$as_me:7774: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7733: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7777: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7736: \$? = $ac_status" >&5
++  echo "$as_me:7780: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_tgoto=yes
+ else
+@@ -7743,7 +7787,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7746: result: $ac_cv_func_tgoto" >&5
++echo "$as_me:7790: result: $ac_cv_func_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_func_tgoto" >&6
+ if test "$ac_cv_func_tgoto" = yes; then
+   cf_term_lib=predefined
+@@ -7752,7 +7796,7 @@
+ 			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
+ 			do
+ 				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
+-echo "$as_me:7755: checking for tgoto in -l$cf_term_lib" >&5
++echo "$as_me:7799: checking for tgoto in -l$cf_term_lib" >&5
+ echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7760,7 +7804,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_term_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7763 "configure"
++#line 7807 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7779,16 +7823,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7782: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7826: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7785: \$? = $ac_status" >&5
++  echo "$as_me:7829: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7788: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7832: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7791: \$? = $ac_status" >&5
++  echo "$as_me:7835: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -7799,7 +7843,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7802: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:7846: 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
+ 
+@@ -7822,10 +7866,10 @@
+ 		do
+ 			LIBS="-l$cf_curs_lib $cf_save_LIBS"
+ 			if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
+-				echo "$as_me:7825: checking if we can link with $cf_curs_lib library" >&5
++				echo "$as_me:7869: checking if we can link with $cf_curs_lib library" >&5
+ echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7828 "configure"
++#line 7872 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7837,16 +7881,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7840: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7884: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7843: \$? = $ac_status" >&5
++  echo "$as_me:7887: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7846: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7890: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7849: \$? = $ac_status" >&5
++  echo "$as_me:7893: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -7855,16 +7899,16 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-				echo "$as_me:7858: result: $cf_result" >&5
++				echo "$as_me:7902: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 				test "$cf_result" = yes && break
+ 			elif test "$cf_curs_lib" = "$cf_term_lib" ; then
+ 				cf_result=no
+ 			elif test "$cf_term_lib" != predefined ; then
+-				echo "$as_me:7864: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
++				echo "$as_me:7908: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+ echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7867 "configure"
++#line 7911 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7876,16 +7920,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7879: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7923: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7882: \$? = $ac_status" >&5
++  echo "$as_me:7926: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7885: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7929: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7888: \$? = $ac_status" >&5
++  echo "$as_me:7932: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=no
+ else
+@@ -7894,7 +7938,7 @@
+ 
+ 					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
+ 					cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7897 "configure"
++#line 7941 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7906,16 +7950,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7909: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7953: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7912: \$? = $ac_status" >&5
++  echo "$as_me:7956: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7915: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7959: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7918: \$? = $ac_status" >&5
++  echo "$as_me:7962: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -7927,13 +7971,13 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-				echo "$as_me:7930: result: $cf_result" >&5
++				echo "$as_me:7974: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 				test "$cf_result" != error && break
+ 			fi
+ 		done
+ 	fi
+-	test "$cf_curs_lib" = unknown && { { echo "$as_me:7936: error: no curses library found" >&5
++	test "$cf_curs_lib" = unknown && { { echo "$as_me:7980: error: no curses library found" >&5
+ echo "$as_me: error: no curses library found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7945,23 +7989,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7948: checking for $ac_header" >&5
++echo "$as_me:7992: 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 7954 "configure"
++#line 7998 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7958: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8002: \"$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:7964: \$? = $ac_status" >&5
++  echo "$as_me:8008: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7980,7 +8024,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7983: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8027: 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:8037: 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
+@@ -7998,7 +8042,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8001 "configure"
++#line 8045 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -8015,16 +8059,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8018: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8062: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8021: \$? = $ac_status" >&5
++  echo "$as_me:8065: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8024: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8068: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8027: \$? = $ac_status" >&5
++  echo "$as_me:8071: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -8036,12 +8080,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:8039: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8083: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8044 "configure"
++#line 8088 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8054,16 +8098,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8057: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8101: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8060: \$? = $ac_status" >&5
++  echo "$as_me:8104: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8063: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8107: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8066: \$? = $ac_status" >&5
++  echo "$as_me:8110: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -8077,7 +8121,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8080 "configure"
++#line 8124 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8090,16 +8134,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8093: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8137: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8096: \$? = $ac_status" >&5
++  echo "$as_me:8140: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8099: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8143: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8102: \$? = $ac_status" >&5
++  echo "$as_me:8146: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -8116,9 +8160,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:8119: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:8163: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:8121: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8165: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -8209,7 +8253,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}:8212: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8256: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -8217,7 +8261,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8220 "configure"
++#line 8264 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8230,21 +8274,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8233: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8277: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8236: \$? = $ac_status" >&5
++  echo "$as_me:8280: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8239: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8283: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8242: \$? = $ac_status" >&5
++  echo "$as_me:8286: \$? = $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}:8247: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8291: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -8262,7 +8306,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:8265: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8309: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -8337,13 +8381,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}:8340: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8384: 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 8346 "configure"
++#line 8390 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8356,21 +8400,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8359: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8403: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8362: \$? = $ac_status" >&5
++  echo "$as_me:8406: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8365: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8409: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8368: \$? = $ac_status" >&5
++  echo "$as_me:8412: \$? = $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}:8373: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8417: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -8412,7 +8456,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8415: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:8459: 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
+@@ -8450,7 +8494,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8453 "configure"
++#line 8497 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8462,16 +8506,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8465: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8509: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8468: \$? = $ac_status" >&5
++  echo "$as_me:8512: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8471: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8515: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8474: \$? = $ac_status" >&5
++  echo "$as_me:8518: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -8488,7 +8532,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}:8491: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8535: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8524,7 +8568,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}:8527: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:8571: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -8554,13 +8598,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:8557: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:8601: 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:8560: result: yes" >&5
++		echo "$as_me:8604: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:8563: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:8607: 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
+ 
+@@ -8693,7 +8737,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8696 "configure"
++#line 8740 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8705,37 +8749,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8708: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8752: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8711: \$? = $ac_status" >&5
++  echo "$as_me:8755: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8714: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8758: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8717: \$? = $ac_status" >&5
++  echo "$as_me:8761: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8723 "configure"
++#line 8767 "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:8730: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8774: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8733: \$? = $ac_status" >&5
++  echo "$as_me:8777: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:8735: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8779: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8738: \$? = $ac_status" >&5
++  echo "$as_me:8782: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -8909,7 +8953,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8912 "configure"
++#line 8956 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8921,37 +8965,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8924: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8968: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8927: \$? = $ac_status" >&5
++  echo "$as_me:8971: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8930: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8974: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8933: \$? = $ac_status" >&5
++  echo "$as_me:8977: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8939 "configure"
++#line 8983 "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:8946: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8990: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8949: \$? = $ac_status" >&5
++  echo "$as_me:8993: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:8951: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8995: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8954: \$? = $ac_status" >&5
++  echo "$as_me:8998: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -8968,7 +9012,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:8971: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:9015: 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"
+@@ -8984,7 +9028,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:8987: checking for terminfo header" >&5
++echo "$as_me:9031: 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
+@@ -9002,7 +9046,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9005 "configure"
++#line 9049 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9017,16 +9061,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9020: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9064: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9023: \$? = $ac_status" >&5
++  echo "$as_me:9067: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9026: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9070: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9029: \$? = $ac_status" >&5
++  echo "$as_me:9073: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -9042,7 +9086,7 @@
+ done
+ 
+ fi
+-echo "$as_me:9045: result: $cf_cv_term_header" >&5
++echo "$as_me:9089: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9077,7 +9121,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:9080: result: no" >&5
++		echo "$as_me:9124: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -9093,7 +9137,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:9096: checking for $ac_word" >&5
++echo "$as_me:9140: 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
+@@ -9108,7 +9152,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:9111: found $ac_dir/$ac_word" >&5
++echo "$as_me:9155: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9116,10 +9160,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:9119: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:9163: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:9122: result: no" >&5
++  echo "$as_me:9166: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9132,7 +9176,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:9135: checking for $ac_word" >&5
++echo "$as_me:9179: 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
+@@ -9147,7 +9191,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:9150: found $ac_dir/$ac_word" >&5
++echo "$as_me:9194: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9155,10 +9199,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:9158: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:9202: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:9161: result: no" >&5
++  echo "$as_me:9205: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9315,7 +9359,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:9318: checking if we have identified curses headers" >&5
++echo "$as_me:9362: 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
+@@ -9327,7 +9371,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9330 "configure"
++#line 9374 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -9339,16 +9383,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9342: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9386: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9345: \$? = $ac_status" >&5
++  echo "$as_me:9389: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9348: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9392: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9351: \$? = $ac_status" >&5
++  echo "$as_me:9395: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -9359,11 +9403,11 @@
+ done
+ 
+ fi
+-echo "$as_me:9362: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:9406: 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:9366: error: No curses header-files found" >&5
++	{ { echo "$as_me:9410: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -9373,23 +9417,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:9376: checking for $ac_header" >&5
++echo "$as_me:9420: 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 9382 "configure"
++#line 9426 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:9386: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:9430: \"$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:9392: \$? = $ac_status" >&5
++  echo "$as_me:9436: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9408,7 +9452,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:9411: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:9455: 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 9467 "configure"
++#line 9511 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9476,16 +9520,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9479: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9523: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9482: \$? = $ac_status" >&5
++  echo "$as_me:9526: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9485: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9529: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9488: \$? = $ac_status" >&5
++  echo "$as_me:9532: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9502,7 +9546,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}:9505: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9549: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9521,7 +9565,7 @@
+ 
+ }
+ 
+-echo "$as_me:9524: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:9568: 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
+@@ -9533,7 +9577,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9536 "configure"
++#line 9580 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -9557,16 +9601,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9560: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9604: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9563: \$? = $ac_status" >&5
++  echo "$as_me:9607: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9566: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9610: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9569: \$? = $ac_status" >&5
++  echo "$as_me:9613: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -9581,14 +9625,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:9584: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:9628: 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:9591: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:9635: 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
+@@ -9709,7 +9753,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9712 "configure"
++#line 9756 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9721,16 +9765,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9724: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9768: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9727: \$? = $ac_status" >&5
++  echo "$as_me:9771: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9730: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9774: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9733: \$? = $ac_status" >&5
++  echo "$as_me:9777: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9747,7 +9791,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}:9750: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9794: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9770,7 +9814,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9773 "configure"
++#line 9817 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -9794,16 +9838,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9797: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9841: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9800: \$? = $ac_status" >&5
++  echo "$as_me:9844: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9803: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9847: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9806: \$? = $ac_status" >&5
++  echo "$as_me:9850: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -9824,12 +9868,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9827: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9871: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:9832: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:9876: 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%/[^/]*$%%'`
+@@ -9865,7 +9909,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9868 "configure"
++#line 9912 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9877,16 +9921,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9880: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9924: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9883: \$? = $ac_status" >&5
++  echo "$as_me:9927: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9886: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9930: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9889: \$? = $ac_status" >&5
++  echo "$as_me:9933: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9903,7 +9947,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}:9906: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9950: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9951,7 +9995,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9954: checking for terminfo header" >&5
++echo "$as_me:9998: 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
+@@ -9969,7 +10013,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9972 "configure"
++#line 10016 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9984,16 +10028,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9987: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10031: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9990: \$? = $ac_status" >&5
++  echo "$as_me:10034: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9993: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10037: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9996: \$? = $ac_status" >&5
++  echo "$as_me:10040: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -10009,7 +10053,7 @@
+ done
+ 
+ fi
+-echo "$as_me:10012: result: $cf_cv_term_header" >&5
++echo "$as_me:10056: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10047,7 +10091,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:10050: checking for ncurses version" >&5
++echo "$as_me:10094: 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
+@@ -10073,10 +10117,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:10076: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:10120: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10079: \$? = $ac_status" >&5
++  echo "$as_me:10123: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -10086,7 +10130,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10089 "configure"
++#line 10133 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -10113,15 +10157,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10116: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10160: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10119: \$? = $ac_status" >&5
++  echo "$as_me:10163: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10121: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10165: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10124: \$? = $ac_status" >&5
++  echo "$as_me:10168: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -10135,7 +10179,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:10138: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:10182: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -10148,7 +10192,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:10151: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:10195: 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
+@@ -10156,7 +10200,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10159 "configure"
++#line 10203 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10175,16 +10219,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10178: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10222: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10181: \$? = $ac_status" >&5
++  echo "$as_me:10225: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10184: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10228: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10187: \$? = $ac_status" >&5
++  echo "$as_me:10231: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -10195,10 +10239,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10198: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:10242: 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:10201: checking for initscr in -lgpm" >&5
++  echo "$as_me:10245: 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
+@@ -10206,7 +10250,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10209 "configure"
++#line 10253 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10225,16 +10269,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10228: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10272: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10231: \$? = $ac_status" >&5
++  echo "$as_me:10275: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10234: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10278: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10237: \$? = $ac_status" >&5
++  echo "$as_me:10281: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -10245,7 +10289,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10248: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:10292: 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"
+@@ -10260,7 +10304,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:10263: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:10307: 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
+@@ -10268,7 +10312,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10271 "configure"
++#line 10315 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10287,16 +10331,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10290: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10334: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10293: \$? = $ac_status" >&5
++  echo "$as_me:10337: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10296: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10340: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10299: \$? = $ac_status" >&5
++  echo "$as_me:10343: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -10307,7 +10351,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10310: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:10354: 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"
+@@ -10356,13 +10400,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:10359: checking for initscr" >&5
++	echo "$as_me:10403: 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 10365 "configure"
++#line 10409 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10393,16 +10437,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10396: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10440: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10399: \$? = $ac_status" >&5
++  echo "$as_me:10443: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10402: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10446: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10405: \$? = $ac_status" >&5
++  echo "$as_me:10449: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -10412,18 +10456,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10415: result: $ac_cv_func_initscr" >&5
++echo "$as_me:10459: 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:10422: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:10466: 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 10426 "configure"
++#line 10470 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10435,25 +10479,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10438: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10482: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10441: \$? = $ac_status" >&5
++  echo "$as_me:10485: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10444: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10488: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10447: \$? = $ac_status" >&5
++  echo "$as_me:10491: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:10449: result: yes" >&5
++  echo "$as_me:10493: 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:10456: result: no" >&5
++echo "$as_me:10500: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -10521,11 +10565,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:10524: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:10568: 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 10528 "configure"
++#line 10572 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10537,25 +10581,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10540: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10584: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10543: \$? = $ac_status" >&5
++  echo "$as_me:10587: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10546: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10590: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10549: \$? = $ac_status" >&5
++  echo "$as_me:10593: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:10551: result: yes" >&5
++  echo "$as_me:10595: 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:10558: result: no" >&5
++echo "$as_me:10602: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -10570,7 +10614,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:10573: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:10617: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -10578,7 +10622,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:10581: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:10625: 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
+@@ -10588,7 +10632,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10591 "configure"
++#line 10635 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10600,23 +10644,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10603: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10647: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10606: \$? = $ac_status" >&5
++  echo "$as_me:10650: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10609: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10653: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10612: \$? = $ac_status" >&5
++  echo "$as_me:10656: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:10614: result: yes" >&5
++  echo "$as_me:10658: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:10619: result: no" >&5
++echo "$as_me:10663: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -10641,13 +10685,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:10644: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:10688: 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:10647: result: yes" >&5
++		echo "$as_me:10691: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:10650: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:10694: 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
+ 
+@@ -10780,7 +10824,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10783 "configure"
++#line 10827 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10792,37 +10836,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10795: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10839: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10798: \$? = $ac_status" >&5
++  echo "$as_me:10842: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10801: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10845: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10804: \$? = $ac_status" >&5
++  echo "$as_me:10848: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10810 "configure"
++#line 10854 "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:10817: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10861: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10820: \$? = $ac_status" >&5
++  echo "$as_me:10864: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10822: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10866: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10825: \$? = $ac_status" >&5
++  echo "$as_me:10869: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -10996,7 +11040,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10999 "configure"
++#line 11043 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11008,37 +11052,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11011: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11055: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11014: \$? = $ac_status" >&5
++  echo "$as_me:11058: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11017: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11061: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11020: \$? = $ac_status" >&5
++  echo "$as_me:11064: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11026 "configure"
++#line 11070 "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:11033: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11077: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11036: \$? = $ac_status" >&5
++  echo "$as_me:11080: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:11038: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11082: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11041: \$? = $ac_status" >&5
++  echo "$as_me:11085: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -11055,7 +11099,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:11058: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:11102: 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"
+@@ -11071,7 +11115,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:11074: checking for terminfo header" >&5
++echo "$as_me:11118: 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
+@@ -11089,7 +11133,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11092 "configure"
++#line 11136 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -11104,16 +11148,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11107: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11151: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11110: \$? = $ac_status" >&5
++  echo "$as_me:11154: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11113: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11157: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11116: \$? = $ac_status" >&5
++  echo "$as_me:11160: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -11129,7 +11173,7 @@
+ done
+ 
+ fi
+-echo "$as_me:11132: result: $cf_cv_term_header" >&5
++echo "$as_me:11176: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -11164,7 +11208,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:11167: result: no" >&5
++		echo "$as_me:11211: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -11180,7 +11224,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:11183: checking for $ac_word" >&5
++echo "$as_me:11227: 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
+@@ -11195,7 +11239,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:11198: found $ac_dir/$ac_word" >&5
++echo "$as_me:11242: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -11203,10 +11247,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:11206: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:11250: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:11209: result: no" >&5
++  echo "$as_me:11253: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -11219,7 +11263,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:11222: checking for $ac_word" >&5
++echo "$as_me:11266: 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
+@@ -11234,7 +11278,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:11237: found $ac_dir/$ac_word" >&5
++echo "$as_me:11281: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -11242,10 +11286,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:11245: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:11289: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:11248: result: no" >&5
++  echo "$as_me:11292: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -11402,7 +11446,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:11405: checking if we have identified curses headers" >&5
++echo "$as_me:11449: 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
+@@ -11414,7 +11458,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11417 "configure"
++#line 11461 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -11426,16 +11470,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11429: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11473: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11432: \$? = $ac_status" >&5
++  echo "$as_me:11476: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11435: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11479: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11438: \$? = $ac_status" >&5
++  echo "$as_me:11482: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -11446,11 +11490,11 @@
+ done
+ 
+ fi
+-echo "$as_me:11449: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:11493: 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:11453: error: No curses header-files found" >&5
++	{ { echo "$as_me:11497: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -11460,23 +11504,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:11463: checking for $ac_header" >&5
++echo "$as_me:11507: 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 11469 "configure"
++#line 11513 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:11473: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:11517: \"$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:11479: \$? = $ac_status" >&5
++  echo "$as_me:11523: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11495,7 +11539,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:11498: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:11542: 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 11554 "configure"
++#line 11598 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11563,16 +11607,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11566: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11610: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11569: \$? = $ac_status" >&5
++  echo "$as_me:11613: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11572: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11616: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11575: \$? = $ac_status" >&5
++  echo "$as_me:11619: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11589,7 +11633,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}:11592: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11636: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -11608,7 +11652,7 @@
+ 
+ }
+ 
+-echo "$as_me:11611: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:11655: 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
+@@ -11620,7 +11664,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11623 "configure"
++#line 11667 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -11644,16 +11688,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11647: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11691: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11650: \$? = $ac_status" >&5
++  echo "$as_me:11694: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11653: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11697: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11656: \$? = $ac_status" >&5
++  echo "$as_me:11700: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -11668,14 +11712,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:11671: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:11715: 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:11678: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:11722: 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
+@@ -11796,7 +11840,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11799 "configure"
++#line 11843 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11808,16 +11852,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11811: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11855: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11814: \$? = $ac_status" >&5
++  echo "$as_me:11858: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11817: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11861: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11820: \$? = $ac_status" >&5
++  echo "$as_me:11864: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11834,7 +11878,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}:11837: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11881: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -11857,7 +11901,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11860 "configure"
++#line 11904 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -11881,16 +11925,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11884: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11928: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11887: \$? = $ac_status" >&5
++  echo "$as_me:11931: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11890: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11934: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11893: \$? = $ac_status" >&5
++  echo "$as_me:11937: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -11911,12 +11955,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11914: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11958: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:11919: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:11963: 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%/[^/]*$%%'`
+@@ -11952,7 +11996,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11955 "configure"
++#line 11999 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11964,16 +12008,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11967: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12011: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11970: \$? = $ac_status" >&5
++  echo "$as_me:12014: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11973: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12017: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11976: \$? = $ac_status" >&5
++  echo "$as_me:12020: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11990,7 +12034,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}:11993: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:12037: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -12038,7 +12082,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:12041: checking for terminfo header" >&5
++echo "$as_me:12085: 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
+@@ -12056,7 +12100,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12059 "configure"
++#line 12103 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -12071,16 +12115,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12074: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12118: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12077: \$? = $ac_status" >&5
++  echo "$as_me:12121: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12080: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12124: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12083: \$? = $ac_status" >&5
++  echo "$as_me:12127: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -12096,7 +12140,7 @@
+ done
+ 
+ fi
+-echo "$as_me:12099: result: $cf_cv_term_header" >&5
++echo "$as_me:12143: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -12134,7 +12178,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:12137: checking for ncurses version" >&5
++echo "$as_me:12181: 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
+@@ -12160,10 +12204,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:12163: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:12207: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12166: \$? = $ac_status" >&5
++  echo "$as_me:12210: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -12173,7 +12217,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12176 "configure"
++#line 12220 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12200,15 +12244,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:12203: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12247: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12206: \$? = $ac_status" >&5
++  echo "$as_me:12250: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:12208: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12252: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12211: \$? = $ac_status" >&5
++  echo "$as_me:12255: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -12222,7 +12266,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:12225: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:12269: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -12235,7 +12279,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:12238: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:12282: 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
+@@ -12243,7 +12287,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12246 "configure"
++#line 12290 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12262,16 +12306,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12265: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12309: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12268: \$? = $ac_status" >&5
++  echo "$as_me:12312: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12271: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12315: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12274: \$? = $ac_status" >&5
++  echo "$as_me:12318: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -12282,10 +12326,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12285: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:12329: 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:12288: checking for initscr in -lgpm" >&5
++  echo "$as_me:12332: 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
+@@ -12293,7 +12337,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12296 "configure"
++#line 12340 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12312,16 +12356,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12315: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12359: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12318: \$? = $ac_status" >&5
++  echo "$as_me:12362: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12321: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12365: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12324: \$? = $ac_status" >&5
++  echo "$as_me:12368: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -12332,7 +12376,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12335: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:12379: 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"
+@@ -12347,7 +12391,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:12350: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:12394: 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
+@@ -12355,7 +12399,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12358 "configure"
++#line 12402 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12374,16 +12418,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12377: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12421: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12380: \$? = $ac_status" >&5
++  echo "$as_me:12424: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12383: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12427: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12386: \$? = $ac_status" >&5
++  echo "$as_me:12430: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -12394,7 +12438,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12397: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:12441: 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"
+@@ -12443,13 +12487,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:12446: checking for initscr" >&5
++	echo "$as_me:12490: 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 12452 "configure"
++#line 12496 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12480,16 +12524,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12483: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12527: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12486: \$? = $ac_status" >&5
++  echo "$as_me:12530: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12489: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12533: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12492: \$? = $ac_status" >&5
++  echo "$as_me:12536: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -12499,18 +12543,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12502: result: $ac_cv_func_initscr" >&5
++echo "$as_me:12546: 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:12509: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:12553: 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 12513 "configure"
++#line 12557 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12522,25 +12566,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12525: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12569: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12528: \$? = $ac_status" >&5
++  echo "$as_me:12572: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12531: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12575: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12534: \$? = $ac_status" >&5
++  echo "$as_me:12578: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:12536: result: yes" >&5
++  echo "$as_me:12580: 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:12543: result: no" >&5
++echo "$as_me:12587: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -12608,11 +12652,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:12611: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:12655: 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 12615 "configure"
++#line 12659 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12624,25 +12668,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12627: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12671: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12630: \$? = $ac_status" >&5
++  echo "$as_me:12674: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12633: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12677: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12636: \$? = $ac_status" >&5
++  echo "$as_me:12680: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:12638: result: yes" >&5
++  echo "$as_me:12682: 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:12645: result: no" >&5
++echo "$as_me:12689: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -12657,7 +12701,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:12660: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:12704: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -12665,7 +12709,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:12668: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:12712: 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
+@@ -12675,7 +12719,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12678 "configure"
++#line 12722 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12687,23 +12731,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12690: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12734: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12693: \$? = $ac_status" >&5
++  echo "$as_me:12737: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12696: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12740: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12699: \$? = $ac_status" >&5
++  echo "$as_me:12743: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:12701: result: yes" >&5
++  echo "$as_me:12745: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:12706: result: no" >&5
++echo "$as_me:12750: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -12723,7 +12767,7 @@
+ 
+ 	;;
+ (pdcurses)
+-	echo "$as_me:12726: checking for X" >&5
++	echo "$as_me:12770: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
+ # Check whether --with-x or --without-x was given.
+@@ -12827,17 +12871,17 @@
+   # Guess where to find include files, by looking for Intrinsic.h.
+   # First, try using that file with no special directory specified.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12830 "configure"
++#line 12874 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:12834: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12878: \"$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:12840: \$? = $ac_status" >&5
++  echo "$as_me:12884: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12870,7 +12914,7 @@
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12873 "configure"
++#line 12917 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12882,16 +12926,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12885: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12929: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12888: \$? = $ac_status" >&5
++  echo "$as_me:12932: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12891: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12935: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12894: \$? = $ac_status" >&5
++  echo "$as_me:12938: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -12929,7 +12973,7 @@
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:12932: result: $have_x" >&5
++  echo "$as_me:12976: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+   no_x=yes
+ else
+@@ -12939,7 +12983,7 @@
+   # Update the cache value to reflect the command line values.
+   ac_cv_have_x="have_x=yes \
+ 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  echo "$as_me:12942: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "$as_me:12986: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+@@ -12966,11 +13010,11 @@
+     # others require no space.  Words are not sufficient . . . .
+     case `(uname -sr) 2>/dev/null` in
+     "SunOS 5"*)
+-      echo "$as_me:12969: checking whether -R must be followed by a space" >&5
++      echo "$as_me:13013: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+       cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12973 "configure"
++#line 13017 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12982,16 +13026,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12985: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13029: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12988: \$? = $ac_status" >&5
++  echo "$as_me:13032: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12991: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13035: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12994: \$? = $ac_status" >&5
++  echo "$as_me:13038: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_nospace=yes
+ else
+@@ -13001,13 +13045,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+       if test $ac_R_nospace = yes; then
+-	echo "$as_me:13004: result: no" >&5
++	echo "$as_me:13048: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	X_LIBS="$X_LIBS -R$x_libraries"
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13010 "configure"
++#line 13054 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -13019,16 +13063,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13022: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13066: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13025: \$? = $ac_status" >&5
++  echo "$as_me:13069: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13028: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13072: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13031: \$? = $ac_status" >&5
++  echo "$as_me:13075: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_space=yes
+ else
+@@ -13038,11 +13082,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	if test $ac_R_space = yes; then
+-	  echo "$as_me:13041: result: yes" >&5
++	  echo "$as_me:13085: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ 	else
+-	  echo "$as_me:13045: result: neither works" >&5
++	  echo "$as_me:13089: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ 	fi
+       fi
+@@ -13062,7 +13106,7 @@
+     # the Alpha needs dnet_stub (dnet does not exist).
+     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13065 "configure"
++#line 13109 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13081,22 +13125,22 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13084: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13128: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13087: \$? = $ac_status" >&5
++  echo "$as_me:13131: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13090: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13134: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13093: \$? = $ac_status" >&5
++  echo "$as_me:13137: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:13099: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:13143: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13104,7 +13148,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13107 "configure"
++#line 13151 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13123,16 +13167,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13126: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13170: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13129: \$? = $ac_status" >&5
++  echo "$as_me:13173: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13132: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13176: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13135: \$? = $ac_status" >&5
++  echo "$as_me:13179: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -13143,14 +13187,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13146: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:13190: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      echo "$as_me:13153: checking for dnet_ntoa in -ldnet_stub" >&5
++      echo "$as_me:13197: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13158,7 +13202,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13161 "configure"
++#line 13205 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13177,16 +13221,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13180: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13224: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13183: \$? = $ac_status" >&5
++  echo "$as_me:13227: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13186: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13230: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13189: \$? = $ac_status" >&5
++  echo "$as_me:13233: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -13197,7 +13241,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13200: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:13244: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -13216,13 +13260,13 @@
+     # on Irix 5.2, according to T.E. Dickey.
+     # The functions gethostbyname, getservbyname, and inet_addr are
+     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+-    echo "$as_me:13219: checking for gethostbyname" >&5
++    echo "$as_me:13263: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13225 "configure"
++#line 13269 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13253,16 +13297,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13256: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13300: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13259: \$? = $ac_status" >&5
++  echo "$as_me:13303: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13262: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13306: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13265: \$? = $ac_status" >&5
++  echo "$as_me:13309: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gethostbyname=yes
+ else
+@@ -13272,11 +13316,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13275: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:13319: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+-      echo "$as_me:13279: checking for gethostbyname in -lnsl" >&5
++      echo "$as_me:13323: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13284,7 +13328,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13287 "configure"
++#line 13331 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13303,16 +13347,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13306: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13350: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13309: \$? = $ac_status" >&5
++  echo "$as_me:13353: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13312: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13356: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13315: \$? = $ac_status" >&5
++  echo "$as_me:13359: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -13323,14 +13367,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13326: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:13370: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test "$ac_cv_lib_nsl_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+-        echo "$as_me:13333: checking for gethostbyname in -lbsd" >&5
++        echo "$as_me:13377: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13338,7 +13382,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13341 "configure"
++#line 13385 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13357,16 +13401,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13360: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13404: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13363: \$? = $ac_status" >&5
++  echo "$as_me:13407: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13366: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13410: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13369: \$? = $ac_status" >&5
++  echo "$as_me:13413: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -13377,7 +13421,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13380: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:13424: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test "$ac_cv_lib_bsd_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -13393,13 +13437,13 @@
+     # variants that don't use the nameserver (or something).  -lsocket
+     # must be given before -lnsl if both are needed.  We assume that
+     # if connect needs -lnsl, so does gethostbyname.
+-    echo "$as_me:13396: checking for connect" >&5
++    echo "$as_me:13440: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13402 "configure"
++#line 13446 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13430,16 +13474,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13433: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13477: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13436: \$? = $ac_status" >&5
++  echo "$as_me:13480: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13439: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13483: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13442: \$? = $ac_status" >&5
++  echo "$as_me:13486: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_connect=yes
+ else
+@@ -13449,11 +13493,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13452: result: $ac_cv_func_connect" >&5
++echo "$as_me:13496: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+ 
+     if test $ac_cv_func_connect = no; then
+-      echo "$as_me:13456: checking for connect in -lsocket" >&5
++      echo "$as_me:13500: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13461,7 +13505,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13464 "configure"
++#line 13508 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13480,16 +13524,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13483: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13527: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13486: \$? = $ac_status" >&5
++  echo "$as_me:13530: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13489: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13533: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13492: \$? = $ac_status" >&5
++  echo "$as_me:13536: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_socket_connect=yes
+ else
+@@ -13500,7 +13544,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13503: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:13547: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test "$ac_cv_lib_socket_connect" = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -13509,13 +13553,13 @@
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    echo "$as_me:13512: checking for remove" >&5
++    echo "$as_me:13556: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13518 "configure"
++#line 13562 "configure"
+ #include "confdefs.h"
+ #define remove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13546,16 +13590,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13549: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13593: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13552: \$? = $ac_status" >&5
++  echo "$as_me:13596: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13555: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13599: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13558: \$? = $ac_status" >&5
++  echo "$as_me:13602: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_remove=yes
+ else
+@@ -13565,11 +13609,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13568: result: $ac_cv_func_remove" >&5
++echo "$as_me:13612: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+ 
+     if test $ac_cv_func_remove = no; then
+-      echo "$as_me:13572: checking for remove in -lposix" >&5
++      echo "$as_me:13616: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13577,7 +13621,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13580 "configure"
++#line 13624 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13596,16 +13640,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13599: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13643: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13602: \$? = $ac_status" >&5
++  echo "$as_me:13646: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13605: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13649: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13608: \$? = $ac_status" >&5
++  echo "$as_me:13652: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_posix_remove=yes
+ else
+@@ -13616,7 +13660,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13619: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:13663: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test "$ac_cv_lib_posix_remove" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -13625,13 +13669,13 @@
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    echo "$as_me:13628: checking for shmat" >&5
++    echo "$as_me:13672: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13634 "configure"
++#line 13678 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13662,16 +13706,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13665: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13709: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13668: \$? = $ac_status" >&5
++  echo "$as_me:13712: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13671: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13715: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13674: \$? = $ac_status" >&5
++  echo "$as_me:13718: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_shmat=yes
+ else
+@@ -13681,11 +13725,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13684: result: $ac_cv_func_shmat" >&5
++echo "$as_me:13728: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+ 
+     if test $ac_cv_func_shmat = no; then
+-      echo "$as_me:13688: checking for shmat in -lipc" >&5
++      echo "$as_me:13732: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13693,7 +13737,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13696 "configure"
++#line 13740 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13712,16 +13756,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13715: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13759: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13718: \$? = $ac_status" >&5
++  echo "$as_me:13762: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13721: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13765: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13724: \$? = $ac_status" >&5
++  echo "$as_me:13768: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+@@ -13732,7 +13776,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13735: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:13779: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test "$ac_cv_lib_ipc_shmat" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -13750,7 +13794,7 @@
+   # These have to be linked with before -lX11, unlike the other
+   # libraries we check for below, so use a different variable.
+   # John Interrante, Karl Berry
+-  echo "$as_me:13753: checking for IceConnectionNumber in -lICE" >&5
++  echo "$as_me:13797: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13758,7 +13802,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13761 "configure"
++#line 13805 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13777,16 +13821,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13780: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13824: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13783: \$? = $ac_status" >&5
++  echo "$as_me:13827: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13786: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13830: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13789: \$? = $ac_status" >&5
++  echo "$as_me:13833: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -13797,7 +13841,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13800: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:13844: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -13809,7 +13853,7 @@
+ 
+ cf_x_athena=${cf_x_athena:-Xaw}
+ 
+-echo "$as_me:13812: checking if you want to link with Xaw 3d library" >&5
++echo "$as_me:13856: checking if you want to link with Xaw 3d library" >&5
+ echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
+ withval=
+ 
+@@ -13820,14 +13864,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=Xaw3d
+-	echo "$as_me:13823: result: yes" >&5
++	echo "$as_me:13867: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:13826: result: no" >&5
++	echo "$as_me:13870: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:13830: checking if you want to link with Xaw 3d xft library" >&5
++echo "$as_me:13874: checking if you want to link with Xaw 3d xft library" >&5
+ echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
+ withval=
+ 
+@@ -13838,14 +13882,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=Xaw3dxft
+-	echo "$as_me:13841: result: yes" >&5
++	echo "$as_me:13885: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:13844: result: no" >&5
++	echo "$as_me:13888: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:13848: checking if you want to link with neXT Athena library" >&5
++echo "$as_me:13892: checking if you want to link with neXT Athena library" >&5
+ echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
+ withval=
+ 
+@@ -13856,14 +13900,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=neXtaw
+-	echo "$as_me:13859: result: yes" >&5
++	echo "$as_me:13903: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:13862: result: no" >&5
++	echo "$as_me:13906: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:13866: checking if you want to link with Athena-Plus library" >&5
++echo "$as_me:13910: checking if you want to link with Athena-Plus library" >&5
+ echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
+ withval=
+ 
+@@ -13874,10 +13918,10 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=XawPlus
+-	echo "$as_me:13877: result: yes" >&5
++	echo "$as_me:13921: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:13880: result: no" >&5
++	echo "$as_me:13924: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -13897,17 +13941,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_athena_pkg"; then
+ 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
+ 
+-echo "${as_me:-configure}:13900: testing found package $cf_athena_pkg ..." 1>&5
++echo "${as_me:-configure}:13944: testing found package $cf_athena_pkg ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_athena_pkg" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_athena_pkg" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:13906: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13950: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:13910: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13954: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14038,20 +14082,20 @@
+ 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
+ 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14041: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:14085: testing ..trimmed $LIBS ..." 1>&5
+ 
+ 			;;
+ 		esac
+ 	done
+ 
+-echo "$as_me:14047: checking for usable $cf_x_athena/Xmu package" >&5
++echo "$as_me:14091: checking for usable $cf_x_athena/Xmu package" >&5
+ echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
+ if test "${cf_cv_xaw_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14054 "configure"
++#line 14098 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14069,16 +14113,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14072: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14116: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14075: \$? = $ac_status" >&5
++  echo "$as_me:14119: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14078: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14122: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14081: \$? = $ac_status" >&5
++  echo "$as_me:14125: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xaw_compat=yes
+ else
+@@ -14088,7 +14132,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14091: result: $cf_cv_xaw_compat" >&5
++echo "$as_me:14135: result: $cf_cv_xaw_compat" >&5
+ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
+ 
+ 			if test "$cf_cv_xaw_compat" = no
+@@ -14100,7 +14144,7 @@
+ 				(*)
+ 					test -n "$verbose" && echo "	work around broken package" 1>&6
+ 
+-echo "${as_me:-configure}:14103: testing work around broken package ..." 1>&5
++echo "${as_me:-configure}:14147: testing work around broken package ..." 1>&5
+ 
+ 					cf_save_xmu="$LIBS"
+ 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
+@@ -14108,17 +14152,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
+ 	test -n "$verbose" && echo "	found package xmu" 1>&6
+ 
+-echo "${as_me:-configure}:14111: testing found package xmu ..." 1>&5
++echo "${as_me:-configure}:14155: testing found package xmu ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xmu" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xmu" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14117: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14161: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xmu LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14121: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14165: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14238,12 +14282,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14241: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14285: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14246: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:14290: testing ...after  $LIBS ..." 1>&5
+ 
+ else
+ 	cf_pkgconfig_incs=
+@@ -14251,12 +14295,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14254: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14298: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14259: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:14303: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -14267,7 +14311,7 @@
+ 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
+ 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14270: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:14314: testing ..trimmed $LIBS ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -14292,17 +14336,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
+ 	test -n "$verbose" && echo "	found package Xext" 1>&6
+ 
+-echo "${as_me:-configure}:14295: testing found package Xext ..." 1>&5
++echo "${as_me:-configure}:14339: testing found package Xext ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "Xext" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "Xext" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14301: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14345: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package Xext LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14305: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14349: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14423,7 +14467,7 @@
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+ 
+-	echo "$as_me:14426: checking for XextCreateExtension in -lXext" >&5
++	echo "$as_me:14470: checking for XextCreateExtension in -lXext" >&5
+ echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14431,7 +14475,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXext  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14434 "configure"
++#line 14478 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14450,16 +14494,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14453: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14497: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14456: \$? = $ac_status" >&5
++  echo "$as_me:14500: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14459: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14503: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14462: \$? = $ac_status" >&5
++  echo "$as_me:14506: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_Xext_XextCreateExtension=yes
+ else
+@@ -14470,7 +14514,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14473: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
++echo "$as_me:14517: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
+ if test "$ac_cv_lib_Xext_XextCreateExtension" = yes; then
+ 
+@@ -14506,17 +14550,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
+ 	test -n "$verbose" && echo "	found package x11" 1>&6
+ 
+-echo "${as_me:-configure}:14509: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:14553: testing found package x11 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "x11" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14515: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14559: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14519: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14563: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14636,24 +14680,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:14639: WARNING: unable to find X11 library" >&5
++	{ echo "$as_me:14683: WARNING: unable to find X11 library" >&5
+ echo "$as_me: WARNING: unable to find X11 library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then
+ 	test -n "$verbose" && echo "	found package ice" 1>&6
+ 
+-echo "${as_me:-configure}:14646: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:14690: testing found package ice ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "ice" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14652: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14696: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14656: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14700: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14773,24 +14817,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:14776: WARNING: unable to find ICE library" >&5
++	{ echo "$as_me:14820: WARNING: unable to find ICE library" >&5
+ echo "$as_me: WARNING: unable to find ICE library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
+ 	test -n "$verbose" && echo "	found package sm" 1>&6
+ 
+-echo "${as_me:-configure}:14783: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:14827: testing found package sm ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "sm" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14789: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14833: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14793: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14837: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14910,24 +14954,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:14913: WARNING: unable to find SM library" >&5
++	{ echo "$as_me:14957: WARNING: unable to find SM library" >&5
+ echo "$as_me: WARNING: unable to find SM library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
+ 	test -n "$verbose" && echo "	found package xt" 1>&6
+ 
+-echo "${as_me:-configure}:14920: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:14964: testing found package xt ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xt" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14926: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14970: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14930: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14974: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15047,7 +15091,7 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:15050: WARNING: unable to find Xt library" >&5
++	{ echo "$as_me:15094: WARNING: unable to find Xt library" >&5
+ echo "$as_me: WARNING: unable to find Xt library" >&2;}
+ fi
+ 
+@@ -15060,17 +15104,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
+ 	test -n "$verbose" && echo "	found package xt" 1>&6
+ 
+-echo "${as_me:-configure}:15063: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:15107: testing found package xt ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xt" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15069: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15113: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15073: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15117: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15191,14 +15235,14 @@
+ 		;;
+ 	(*)
+ # we have an "xt" package, but it may omit Xt's dependency on X11
+-echo "$as_me:15194: checking for usable X dependency" >&5
++echo "$as_me:15238: checking for usable X dependency" >&5
+ echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
+ if test "${cf_cv_xt_x11_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15201 "configure"
++#line 15245 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -15218,16 +15262,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15221: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15265: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15224: \$? = $ac_status" >&5
++  echo "$as_me:15268: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15227: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15271: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15230: \$? = $ac_status" >&5
++  echo "$as_me:15274: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xt_x11_compat=yes
+ else
+@@ -15237,30 +15281,30 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15240: result: $cf_cv_xt_x11_compat" >&5
++echo "$as_me:15284: result: $cf_cv_xt_x11_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
+ 		if test "$cf_cv_xt_x11_compat" = no
+ 		then
+ 			test -n "$verbose" && echo "	work around broken X11 dependency" 1>&6
+ 
+-echo "${as_me:-configure}:15246: testing work around broken X11 dependency ..." 1>&5
++echo "${as_me:-configure}:15290: testing work around broken X11 dependency ..." 1>&5
+ 
+ 			# 2010/11/19 - good enough until a working Xt on Xcb is delivered.
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
+ 	test -n "$verbose" && echo "	found package x11" 1>&6
+ 
+-echo "${as_me:-configure}:15253: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:15297: testing found package x11 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "x11" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15259: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15303: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15263: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15307: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15383,12 +15427,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:15386: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:15430: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:15391: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:15435: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -15396,14 +15440,14 @@
+ 		;;
+ 	esac
+ 
+-echo "$as_me:15399: checking for usable X Toolkit package" >&5
++echo "$as_me:15443: checking for usable X Toolkit package" >&5
+ echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
+ if test "${cf_cv_xt_ice_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15406 "configure"
++#line 15450 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -15419,16 +15463,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15422: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15466: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15425: \$? = $ac_status" >&5
++  echo "$as_me:15469: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15428: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15472: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15431: \$? = $ac_status" >&5
++  echo "$as_me:15475: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xt_ice_compat=yes
+ else
+@@ -15438,7 +15482,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15441: result: $cf_cv_xt_ice_compat" >&5
++echo "$as_me:15485: result: $cf_cv_xt_ice_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
+ 
+ 	if test "$cf_cv_xt_ice_compat" = no
+@@ -15452,22 +15496,22 @@
+ 			(*)
+ 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
+ 
+-echo "${as_me:-configure}:15455: testing work around broken ICE dependency ..." 1>&5
++echo "${as_me:-configure}:15499: testing work around broken ICE dependency ..." 1>&5
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then
+ 	test -n "$verbose" && echo "	found package ice" 1>&6
+ 
+-echo "${as_me:-configure}:15460: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:15504: testing found package ice ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "ice" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15466: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15510: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15470: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15514: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15586,17 +15630,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
+ 	test -n "$verbose" && echo "	found package sm" 1>&6
+ 
+-echo "${as_me:-configure}:15589: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:15633: testing found package sm ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "sm" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15595: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15639: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15599: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15643: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15725,12 +15769,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:15728: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:15772: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:15733: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:15777: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -15750,7 +15794,7 @@
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15753: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15797: testing checking additions to CFLAGS ..." 1>&5
+ 
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -15835,7 +15879,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:15838: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:15882: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -15845,7 +15889,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:15848: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:15892: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -15855,7 +15899,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}:15858: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:15902: 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"
+@@ -15864,7 +15908,7 @@
+ 
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15867 "configure"
++#line 15911 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -15876,16 +15920,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15879: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15923: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15882: \$? = $ac_status" >&5
++  echo "$as_me:15926: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15885: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15929: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15888: \$? = $ac_status" >&5
++  echo "$as_me:15932: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -15893,12 +15937,12 @@
+ cat "conftest.$ac_ext" >&5
+ test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15896: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15940: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+ 
+ 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
+ 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15901: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:15945: testing but keeping change to \$CPPFLAGS ..." 1>&5
+ 
+ 	 fi
+ 	 CFLAGS="$cf_check_cflags"
+@@ -15906,13 +15950,13 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+ 
+-	echo "$as_me:15909: checking for XOpenDisplay" >&5
++	echo "$as_me:15953: checking for XOpenDisplay" >&5
+ echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
+ if test "${ac_cv_func_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15915 "configure"
++#line 15959 "configure"
+ #include "confdefs.h"
+ #define XOpenDisplay autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15943,16 +15987,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15946: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15990: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15949: \$? = $ac_status" >&5
++  echo "$as_me:15993: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15952: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15996: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15955: \$? = $ac_status" >&5
++  echo "$as_me:15999: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_XOpenDisplay=yes
+ else
+@@ -15962,13 +16006,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15965: result: $ac_cv_func_XOpenDisplay" >&5
++echo "$as_me:16009: result: $ac_cv_func_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
+ if test "$ac_cv_func_XOpenDisplay" = yes; then
+   :
+ else
+ 
+-	echo "$as_me:15971: checking for XOpenDisplay in -lX11" >&5
++	echo "$as_me:16015: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15976,7 +16020,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15979 "configure"
++#line 16023 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -15995,16 +16039,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15998: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16042: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16001: \$? = $ac_status" >&5
++  echo "$as_me:16045: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16004: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16048: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16007: \$? = $ac_status" >&5
++  echo "$as_me:16051: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -16015,7 +16059,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16018: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:16062: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then
+ 
+@@ -16039,13 +16083,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:16042: checking for XtAppInitialize" >&5
++	echo "$as_me:16086: checking for XtAppInitialize" >&5
+ echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
+ if test "${ac_cv_func_XtAppInitialize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16048 "configure"
++#line 16092 "configure"
+ #include "confdefs.h"
+ #define XtAppInitialize autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16076,16 +16120,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16079: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16123: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16082: \$? = $ac_status" >&5
++  echo "$as_me:16126: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16085: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16129: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16088: \$? = $ac_status" >&5
++  echo "$as_me:16132: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_XtAppInitialize=yes
+ else
+@@ -16095,13 +16139,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16098: result: $ac_cv_func_XtAppInitialize" >&5
++echo "$as_me:16142: result: $ac_cv_func_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
+ if test "$ac_cv_func_XtAppInitialize" = yes; then
+   :
+ else
+ 
+-	echo "$as_me:16104: checking for XtAppInitialize in -lXt" >&5
++	echo "$as_me:16148: checking for XtAppInitialize in -lXt" >&5
+ echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16109,7 +16153,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16112 "configure"
++#line 16156 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16128,16 +16172,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16131: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16175: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16134: \$? = $ac_status" >&5
++  echo "$as_me:16178: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16137: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16181: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16140: \$? = $ac_status" >&5
++  echo "$as_me:16184: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_Xt_XtAppInitialize=yes
+ else
+@@ -16148,7 +16192,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16151: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
++echo "$as_me:16195: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
+ if test "$ac_cv_lib_Xt_XtAppInitialize" = yes; then
+ 
+@@ -16165,7 +16209,7 @@
+ fi
+ 
+ if test "$cf_have_X_LIBS" = no ; then
+-	{ echo "$as_me:16168: WARNING: Unable to successfully link X Toolkit library (-lXt) with
++	{ echo "$as_me:16212: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+ test program.  You will have to check and add the proper libraries by hand
+ to makefile." >&5
+ echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+@@ -16206,14 +16250,14 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
+ 
+-			echo "$as_me:16209: checking for $cf_test in $cf_path" >&5
++			echo "$as_me:16253: checking for $cf_test in $cf_path" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
+ 		else
+-			echo "$as_me:16212: checking for $cf_test" >&5
++			echo "$as_me:16256: checking for $cf_test" >&5
+ echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
+ 		fi
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16216 "configure"
++#line 16260 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16227,16 +16271,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16230: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16274: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16233: \$? = $ac_status" >&5
++  echo "$as_me:16277: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16236: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16280: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16239: \$? = $ac_status" >&5
++  echo "$as_me:16283: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -16245,7 +16289,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-		echo "$as_me:16248: result: $cf_result" >&5
++		echo "$as_me:16292: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
+@@ -16261,7 +16305,7 @@
+ done
+ 
+ if test -z "$cf_x_athena_inc" ; then
+-	{ echo "$as_me:16264: WARNING: Unable to find Athena header files" >&5
++	{ echo "$as_me:16308: WARNING: Unable to find Athena header files" >&5
+ echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
+ elif test "$cf_x_athena_inc" != default ; then
+ 
+@@ -16326,10 +16370,10 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-		echo "$as_me:16329: checking for $cf_test in $cf_libs" >&5
++		echo "$as_me:16373: checking for $cf_test in $cf_libs" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16332 "configure"
++#line 16376 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -16346,16 +16390,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16349: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16393: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16352: \$? = $ac_status" >&5
++  echo "$as_me:16396: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16355: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16399: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16358: \$? = $ac_status" >&5
++  echo "$as_me:16402: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -16364,7 +16408,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:16367: result: $cf_result" >&5
++		echo "$as_me:16411: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
+@@ -16381,7 +16425,7 @@
+ done
+ 
+ if test -z "$cf_x_athena_lib" ; then
+-	{ { echo "$as_me:16384: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
++	{ { echo "$as_me:16428: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+ echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -16415,7 +16459,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:16418: checking for $ac_word" >&5
++echo "$as_me:16462: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16430,7 +16474,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:16433: found $ac_dir/$ac_word" >&5
++echo "$as_me:16477: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -16438,10 +16482,10 @@
+ fi
+ XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
+ if test -n "$XCURSES_CONFIG"; then
+-  echo "$as_me:16441: result: $XCURSES_CONFIG" >&5
++  echo "$as_me:16485: result: $XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$XCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:16444: result: no" >&5
++  echo "$as_me:16488: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -16454,7 +16498,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:16457: checking for $ac_word" >&5
++echo "$as_me:16501: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16469,7 +16513,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
+-echo "$as_me:16472: found $ac_dir/$ac_word" >&5
++echo "$as_me:16516: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -16477,10 +16521,10 @@
+ fi
+ ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
+ if test -n "$ac_ct_XCURSES_CONFIG"; then
+-  echo "$as_me:16480: result: $ac_ct_XCURSES_CONFIG" >&5
++  echo "$as_me:16524: result: $ac_ct_XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:16483: result: no" >&5
++  echo "$as_me:16527: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -16615,7 +16659,7 @@
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16618: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16662: testing checking additions to CFLAGS ..." 1>&5
+ 
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -16700,7 +16744,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:16703: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:16747: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -16710,7 +16754,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:16713: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:16757: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -16720,7 +16764,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}:16723: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:16767: 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"
+@@ -16729,7 +16773,7 @@
+ 
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16732 "configure"
++#line 16776 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -16741,16 +16785,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16744: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16788: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16747: \$? = $ac_status" >&5
++  echo "$as_me:16791: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16750: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16794: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16753: \$? = $ac_status" >&5
++  echo "$as_me:16797: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -16758,12 +16802,12 @@
+ cat "conftest.$ac_ext" >&5
+ test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16761: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16805: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+ 
+ 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
+ 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16766: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16810: testing but keeping change to \$CPPFLAGS ..." 1>&5
+ 
+ 	 fi
+ 	 CFLAGS="$cf_check_cflags"
+@@ -16771,7 +16815,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:16774: checking for XOpenDisplay in -lX11" >&5
++echo "$as_me:16818: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16779,7 +16823,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16782 "configure"
++#line 16826 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16798,16 +16842,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16801: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16845: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16804: \$? = $ac_status" >&5
++  echo "$as_me:16848: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16807: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16851: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16810: \$? = $ac_status" >&5
++  echo "$as_me:16854: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -16818,7 +16862,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16821: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:16865: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then
+ 
+@@ -16840,7 +16884,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16843: checking for XCurses library" >&5
++echo "$as_me:16887: checking for XCurses library" >&5
+ echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
+ if test "${cf_cv_lib_XCurses+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16863,7 +16907,7 @@
+ LIBS="$cf_add_libs"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16866 "configure"
++#line 16910 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16878,16 +16922,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16881: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16925: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16884: \$? = $ac_status" >&5
++  echo "$as_me:16928: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16887: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16931: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16890: \$? = $ac_status" >&5
++  echo "$as_me:16934: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_lib_XCurses=yes
+ else
+@@ -16898,7 +16942,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16901: result: $cf_cv_lib_XCurses" >&5
++echo "$as_me:16945: result: $cf_cv_lib_XCurses" >&5
+ echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
+ 
+ fi
+@@ -16913,23 +16957,23 @@
+ #define XCURSES 1
+ EOF
+ 
+-	echo "$as_me:16916: checking for xcurses.h" >&5
++	echo "$as_me:16960: checking for xcurses.h" >&5
+ echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
+ if test "${ac_cv_header_xcurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16922 "configure"
++#line 16966 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16926: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16970: \"$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:16932: \$? = $ac_status" >&5
++  echo "$as_me:16976: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16948,7 +16992,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16951: result: $ac_cv_header_xcurses_h" >&5
++echo "$as_me:16995: result: $ac_cv_header_xcurses_h" >&5
+ echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
+ if test "$ac_cv_header_xcurses_h" = yes; then
+ 
+@@ -16959,26 +17003,26 @@
+ fi
+ 
+ else
+-	{ { echo "$as_me:16962: error: Cannot link with XCurses" >&5
++	{ { echo "$as_me:17006: error: Cannot link with XCurses" >&5
+ echo "$as_me: error: Cannot link with XCurses" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ 	;;
+ (*)
+-	{ { echo "$as_me:16969: error: unexpected screen-value: $cf_cv_screen" >&5
++	{ { echo "$as_me:17013: error: unexpected screen-value: $cf_cv_screen" >&5
+ echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+-echo "$as_me:16975: checking for _nc_init_pthreads" >&5
++echo "$as_me:17019: checking for _nc_init_pthreads" >&5
+ echo $ECHO_N "checking for _nc_init_pthreads... $ECHO_C" >&6
+ if test "${ac_cv_func__nc_init_pthreads+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16981 "configure"
++#line 17025 "configure"
+ #include "confdefs.h"
+ #define _nc_init_pthreads autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17009,16 +17053,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17012: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17056: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17015: \$? = $ac_status" >&5
++  echo "$as_me:17059: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17018: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17062: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17021: \$? = $ac_status" >&5
++  echo "$as_me:17065: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func__nc_init_pthreads=yes
+ else
+@@ -17028,7 +17072,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17031: result: $ac_cv_func__nc_init_pthreads" >&5
++echo "$as_me:17075: result: $ac_cv_func__nc_init_pthreads" >&5
+ echo "${ECHO_T}$ac_cv_func__nc_init_pthreads" >&6
+ if test "$ac_cv_func__nc_init_pthreads" = yes; then
+   cf_cv_ncurses_pthreads=yes
+@@ -17063,7 +17107,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17066: checking for X11 rgb file" >&5
++echo "$as_me:17110: 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.
+@@ -17125,7 +17169,7 @@
+ 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:17128: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:17172: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -17133,7 +17177,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17136: result: $RGB_PATH" >&5
++echo "$as_me:17180: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:17221: 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.
+@@ -17194,10 +17238,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17197: result: $FORM_NAME" >&5
++echo "$as_me:17241: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:17200: checking for desired basename for menu library" >&5
++echo "$as_me:17244: 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.
+@@ -17217,10 +17261,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17220: result: $MENU_NAME" >&5
++echo "$as_me:17264: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:17223: checking for desired basename for panel library" >&5
++echo "$as_me:17267: 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.
+@@ -17240,10 +17284,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17243: result: $PANEL_NAME" >&5
++echo "$as_me:17287: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:17246: checking if you want to check for panel functions" >&5
++echo "$as_me:17290: checking if you want to check for panel functions" >&5
+ echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-panel or --disable-panel was given.
+@@ -17260,7 +17304,7 @@
+ 	cf_enable_panel=$cf_default_panel
+ 
+ fi;
+-echo "$as_me:17263: result: $cf_enable_panel" >&5
++echo "$as_me:17307: result: $cf_enable_panel" >&5
+ echo "${ECHO_T}$cf_enable_panel" >&6
+ if test $cf_enable_panel = yes
+ then
+@@ -17271,13 +17315,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:17274: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
++	echo "$as_me:17318: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists "$PANEL_NAME$cf_cv_libtype" ; then
+-		echo "$as_me:17277: result: yes" >&5
++		echo "$as_me:17321: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:17280: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
++		echo "$as_me:17324: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CFLAGS="$CFLAGS"
+@@ -17427,7 +17471,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17430 "configure"
++#line 17474 "configure"
+ #include "confdefs.h"
+ #include <$PANEL_NAME.h>
+ int
+@@ -17439,37 +17483,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17442: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17486: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17445: \$? = $ac_status" >&5
++  echo "$as_me:17489: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17448: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17492: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17451: \$? = $ac_status" >&5
++  echo "$as_me:17495: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17457 "configure"
++#line 17501 "configure"
+ #include "confdefs.h"
+ #include <$PANEL_NAME.h>
+ 				int main(void)
+ 				{ (void) new_panel ( 0 ); return 0; }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17464: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17508: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17467: \$? = $ac_status" >&5
++  echo "$as_me:17511: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17469: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17513: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17472: \$? = $ac_status" >&5
++  echo "$as_me:17516: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -17486,7 +17530,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:17489: result: $cf_have_curses_lib" >&5
++		echo "$as_me:17533: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" = "yes"
+@@ -17507,7 +17551,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh`
+-echo "$as_me:17510: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
++echo "$as_me:17554: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17515,7 +17559,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$PANEL_NAME$cf_cv_libtype  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17518 "configure"
++#line 17562 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17534,16 +17578,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17537: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17581: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17540: \$? = $ac_status" >&5
++  echo "$as_me:17584: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17543: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17587: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17546: \$? = $ac_status" >&5
++  echo "$as_me:17590: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -17554,7 +17598,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17557: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:17601: 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
+ 
+@@ -17587,7 +17631,7 @@
+ 	cf_curses_headers="$cf_curses_headers panel.h"
+ fi
+ 
+-echo "$as_me:17590: checking if you want to check for menu functions" >&5
++echo "$as_me:17634: checking if you want to check for menu functions" >&5
+ echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-menu or --disable-menu was given.
+@@ -17604,7 +17648,7 @@
+ 	cf_enable_menu=$cf_default_menu
+ 
+ fi;
+-echo "$as_me:17607: result: $cf_enable_menu" >&5
++echo "$as_me:17651: result: $cf_enable_menu" >&5
+ echo "${ECHO_T}$cf_enable_menu" >&6
+ if test $cf_enable_menu = yes
+ then
+@@ -17613,14 +17657,14 @@
+ 		;;
+ 	(curses*)
+ 
+-echo "$as_me:17616: checking for NetBSD menu.h" >&5
++echo "$as_me:17660: checking for NetBSD menu.h" >&5
+ echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_menu_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17623 "configure"
++#line 17667 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -17638,16 +17682,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17641: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17685: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17644: \$? = $ac_status" >&5
++  echo "$as_me:17688: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17647: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17691: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17650: \$? = $ac_status" >&5
++  echo "$as_me:17694: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_netbsd_menu_h=yes
+ 
+@@ -17659,7 +17703,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17662: result: $cf_cv_netbsd_menu_h" >&5
++echo "$as_me:17706: result: $cf_cv_netbsd_menu_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
+ 
+ test "$cf_cv_netbsd_menu_h" = yes &&
+@@ -17676,13 +17720,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:17679: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
++	echo "$as_me:17723: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists "$MENU_NAME$cf_cv_libtype" ; then
+-		echo "$as_me:17682: result: yes" >&5
++		echo "$as_me:17726: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:17685: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
++		echo "$as_me:17729: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CFLAGS="$CFLAGS"
+@@ -17832,7 +17876,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17835 "configure"
++#line 17879 "configure"
+ #include "confdefs.h"
+ #include <$MENU_NAME.h>
+ int
+@@ -17844,37 +17888,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17847: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17891: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17850: \$? = $ac_status" >&5
++  echo "$as_me:17894: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17853: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17897: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17856: \$? = $ac_status" >&5
++  echo "$as_me:17900: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17862 "configure"
++#line 17906 "configure"
+ #include "confdefs.h"
+ #include <$MENU_NAME.h>
+ 				int main(void)
+ 				{ (void) menu_driver ( 0,0 ); return 0; }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17869: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17913: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17872: \$? = $ac_status" >&5
++  echo "$as_me:17916: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17874: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17918: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17877: \$? = $ac_status" >&5
++  echo "$as_me:17921: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -17891,7 +17935,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:17894: result: $cf_have_curses_lib" >&5
++		echo "$as_me:17938: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" = "yes"
+@@ -17912,7 +17956,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh`
+-echo "$as_me:17915: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
++echo "$as_me:17959: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17920,7 +17964,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$MENU_NAME$cf_cv_libtype  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17923 "configure"
++#line 17967 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17939,16 +17983,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17942: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17986: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17945: \$? = $ac_status" >&5
++  echo "$as_me:17989: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17948: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17992: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17951: \$? = $ac_status" >&5
++  echo "$as_me:17995: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -17959,7 +18003,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17962: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:18006: 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
+ 
+@@ -17992,7 +18036,7 @@
+ 	cf_curses_headers="$cf_curses_headers menu.h"
+ fi
+ 
+-echo "$as_me:17995: checking if you want to check for form functions" >&5
++echo "$as_me:18039: checking if you want to check for form functions" >&5
+ echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-form or --disable-form was given.
+@@ -18009,7 +18053,7 @@
+ 	cf_enable_form=$cf_default_form
+ 
+ fi;
+-echo "$as_me:18012: result: $cf_enable_form" >&5
++echo "$as_me:18056: result: $cf_enable_form" >&5
+ echo "${ECHO_T}$cf_enable_form" >&6
+ if test $cf_enable_form = yes
+ then
+@@ -18018,14 +18062,14 @@
+ 		;;
+ 	(curses*)
+ 
+-echo "$as_me:18021: checking for NetBSD form.h" >&5
++echo "$as_me:18065: checking for NetBSD form.h" >&5
+ echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_form_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18028 "configure"
++#line 18072 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18044,16 +18088,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18047: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18091: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18050: \$? = $ac_status" >&5
++  echo "$as_me:18094: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18053: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18097: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18056: \$? = $ac_status" >&5
++  echo "$as_me:18100: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_netbsd_form_h=yes
+ 
+@@ -18065,7 +18109,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:18068: result: $cf_cv_netbsd_form_h" >&5
++echo "$as_me:18112: result: $cf_cv_netbsd_form_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
+ 
+ test "$cf_cv_netbsd_form_h" = yes &&
+@@ -18082,13 +18126,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:18085: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
++	echo "$as_me:18129: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists "$FORM_NAME$cf_cv_libtype" ; then
+-		echo "$as_me:18088: result: yes" >&5
++		echo "$as_me:18132: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:18091: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
++		echo "$as_me:18135: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CFLAGS="$CFLAGS"
+@@ -18238,7 +18282,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18241 "configure"
++#line 18285 "configure"
+ #include "confdefs.h"
+ #include <$FORM_NAME.h>
+ int
+@@ -18250,37 +18294,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18253: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18297: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18256: \$? = $ac_status" >&5
++  echo "$as_me:18300: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18259: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18303: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18262: \$? = $ac_status" >&5
++  echo "$as_me:18306: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18268 "configure"
++#line 18312 "configure"
+ #include "confdefs.h"
+ #include <$FORM_NAME.h>
+ 				int main(void)
+ 				{ (void) form_driver ( 0,0 ); return 0; }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:18275: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18319: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18278: \$? = $ac_status" >&5
++  echo "$as_me:18322: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:18280: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18324: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18283: \$? = $ac_status" >&5
++  echo "$as_me:18327: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -18297,7 +18341,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:18300: result: $cf_have_curses_lib" >&5
++		echo "$as_me:18344: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" = "yes"
+@@ -18318,7 +18362,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh`
+-echo "$as_me:18321: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
++echo "$as_me:18365: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18326,7 +18370,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$FORM_NAME$cf_cv_libtype  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18329 "configure"
++#line 18373 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18345,16 +18389,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18348: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18392: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18351: \$? = $ac_status" >&5
++  echo "$as_me:18395: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18354: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18398: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18357: \$? = $ac_status" >&5
++  echo "$as_me:18401: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -18365,7 +18409,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18368: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:18412: 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
+ 
+@@ -18403,23 +18447,23 @@
+ for ac_header in $cf_curses_headers
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18406: checking for $ac_header" >&5
++echo "$as_me:18450: 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 18412 "configure"
++#line 18456 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18416: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18460: \"$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:18422: \$? = $ac_status" >&5
++  echo "$as_me:18466: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18438,7 +18482,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18441: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18485: 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:18495: 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 18457 "configure"
++#line 18501 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -18470,16 +18514,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18473: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18517: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18476: \$? = $ac_status" >&5
++  echo "$as_me:18520: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18479: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18523: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18482: \$? = $ac_status" >&5
++  echo "$as_me:18526: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -18489,7 +18533,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18492: result: $ac_cv_header_time" >&5
++echo "$as_me:18536: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -18510,23 +18554,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18513: checking for $ac_header" >&5
++echo "$as_me:18557: 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 18519 "configure"
++#line 18563 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18523: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18567: \"$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:18529: \$? = $ac_status" >&5
++  echo "$as_me:18573: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18545,7 +18589,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18548: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18592: 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:18605: 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 18567 "configure"
++#line 18611 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18571: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18615: \"$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:18577: \$? = $ac_status" >&5
++  echo "$as_me:18621: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18593,7 +18637,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18596: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18640: 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:18650: 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
+@@ -18613,7 +18657,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18616 "configure"
++#line 18660 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -18626,16 +18670,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18629: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18673: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18632: \$? = $ac_status" >&5
++  echo "$as_me:18676: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18635: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18679: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18638: \$? = $ac_status" >&5
++  echo "$as_me:18682: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -18647,7 +18691,7 @@
+ done
+ 
+ fi
+-echo "$as_me:18650: result: $cf_cv_getopt_header" >&5
++echo "$as_me:18694: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -18665,13 +18709,13 @@
+ fi
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:18668: checking for clock_gettime" >&5
++echo "$as_me:18712: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18674 "configure"
++#line 18718 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18702,16 +18746,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18705: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18749: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18708: \$? = $ac_status" >&5
++  echo "$as_me:18752: \$? = $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:18755: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18714: \$? = $ac_status" >&5
++  echo "$as_me:18758: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -18721,12 +18765,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18724: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:18768: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:18729: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:18773: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18734,7 +18778,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18737 "configure"
++#line 18781 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18753,16 +18797,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18756: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18800: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18759: \$? = $ac_status" >&5
++  echo "$as_me:18803: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18762: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18806: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18765: \$? = $ac_status" >&5
++  echo "$as_me:18809: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -18773,7 +18817,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18776: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:18820: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -18785,14 +18829,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:18788: checking if clock_gettime links" >&5
++echo "$as_me:18832: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18795 "configure"
++#line 18839 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -18810,16 +18854,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18813: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18857: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18816: \$? = $ac_status" >&5
++  echo "$as_me:18860: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18819: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18863: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18822: \$? = $ac_status" >&5
++  echo "$as_me:18866: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -18830,7 +18874,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:18833: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:18877: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -18844,13 +18888,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:18847: checking for gettimeofday" >&5
++echo "$as_me:18891: 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 18853 "configure"
++#line 18897 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18881,16 +18925,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18884: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18928: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18887: \$? = $ac_status" >&5
++  echo "$as_me:18931: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18890: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18934: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18893: \$? = $ac_status" >&5
++  echo "$as_me:18937: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -18900,7 +18944,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18903: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:18947: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -18910,7 +18954,7 @@
+ 
+ else
+ 
+-echo "$as_me:18913: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:18957: 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
+@@ -18918,7 +18962,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18921 "configure"
++#line 18965 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18937,16 +18981,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18940: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18984: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18943: \$? = $ac_status" >&5
++  echo "$as_me:18987: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18946: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18990: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18949: \$? = $ac_status" >&5
++  echo "$as_me:18993: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -18957,7 +19001,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18960: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:19004: 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
+ 
+@@ -18995,13 +19039,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:18998: checking for $ac_func" >&5
++echo "$as_me:19042: 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 19004 "configure"
++#line 19048 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19032,16 +19076,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19035: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19079: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19038: \$? = $ac_status" >&5
++  echo "$as_me:19082: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19041: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19085: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19044: \$? = $ac_status" >&5
++  echo "$as_me:19088: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -19051,7 +19095,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19054: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:19098: 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:19109: checking if we can use termcap.h" >&5
+ echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
+ if test "${cf_cv_have_termcap_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19072 "configure"
++#line 19116 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19090,16 +19134,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19093: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19137: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19096: \$? = $ac_status" >&5
++  echo "$as_me:19140: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19099: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19143: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19102: \$? = $ac_status" >&5
++  echo "$as_me:19146: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_termcap_h=yes
+ else
+@@ -19109,7 +19153,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19112: result: $cf_cv_have_termcap_h" >&5
++echo "$as_me:19156: result: $cf_cv_have_termcap_h" >&5
+ echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
+ if test "x$cf_cv_have_termcap_h" = xyes
+ then
+@@ -19119,14 +19163,14 @@
+ EOF
+ 
+ else
+-echo "$as_me:19122: checking if we can use ncurses/termcap.h" >&5
++echo "$as_me:19166: checking if we can use ncurses/termcap.h" >&5
+ echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
+ if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19129 "configure"
++#line 19173 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19147,16 +19191,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19150: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19194: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19153: \$? = $ac_status" >&5
++  echo "$as_me:19197: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19156: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19200: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19159: \$? = $ac_status" >&5
++  echo "$as_me:19203: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_ncurses_termcap_h=yes
+ else
+@@ -19166,7 +19210,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19169: result: $cf_cv_have_ncurses_termcap_h" >&5
++echo "$as_me:19213: result: $cf_cv_have_ncurses_termcap_h" >&5
+ echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
+ test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -19176,7 +19220,7 @@
+ fi
+ 
+ if test "x$ac_cv_func_getopt" = xno; then
+-	{ { echo "$as_me:19179: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:19223: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -19195,13 +19239,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:19198: checking for $ac_func" >&5
++echo "$as_me:19242: 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 19204 "configure"
++#line 19248 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19232,16 +19276,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19235: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19279: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19238: \$? = $ac_status" >&5
++  echo "$as_me:19282: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19241: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19285: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19244: \$? = $ac_status" >&5
++  echo "$as_me:19288: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -19251,7 +19295,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19254: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:19298: 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:19310: checking definition to turn on extended curses functions" >&5
+ echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
+ if test "${cf_cv_need_xopen_extension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19271,7 +19315,7 @@
+ 
+ cf_cv_need_xopen_extension=unknown
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19274 "configure"
++#line 19318 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -19304,16 +19348,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19307: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19351: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19310: \$? = $ac_status" >&5
++  echo "$as_me:19354: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19313: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19357: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19316: \$? = $ac_status" >&5
++  echo "$as_me:19360: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_xopen_extension=none
+ else
+@@ -19323,7 +19367,7 @@
+ 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19326 "configure"
++#line 19370 "configure"
+ #include "confdefs.h"
+ 
+ #define $cf_try_xopen_extension 1
+@@ -19349,16 +19393,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19352: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19396: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19355: \$? = $ac_status" >&5
++  echo "$as_me:19399: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19358: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19402: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19361: \$? = $ac_status" >&5
++  echo "$as_me:19405: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
+ else
+@@ -19372,7 +19416,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:19375: result: $cf_cv_need_xopen_extension" >&5
++echo "$as_me:19419: result: $cf_cv_need_xopen_extension" >&5
+ echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
+ 
+ case "$cf_cv_need_xopen_extension" in
+@@ -19384,7 +19428,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19387: checking for term.h" >&5
++echo "$as_me:19431: checking for term.h" >&5
+ echo $ECHO_N "checking for term.h... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19405,7 +19449,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19408 "configure"
++#line 19452 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19419,16 +19463,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19422: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19466: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19425: \$? = $ac_status" >&5
++  echo "$as_me:19469: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19428: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19472: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19431: \$? = $ac_status" >&5
++  echo "$as_me:19475: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_term_header=$cf_header
+ 	 break
+@@ -19447,7 +19491,7 @@
+ 	for cf_header in ncurses/term.h ncursesw/term.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19450 "configure"
++#line 19494 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19465,16 +19509,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19468: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19512: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19471: \$? = $ac_status" >&5
++  echo "$as_me:19515: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19474: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19518: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19477: \$? = $ac_status" >&5
++  echo "$as_me:19521: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_term_header=$cf_header
+ 			 break
+@@ -19489,7 +19533,7 @@
+ esac
+ 
+ fi
+-echo "$as_me:19492: result: $cf_cv_term_header" >&5
++echo "$as_me:19536: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ case "$cf_cv_term_header" in
+@@ -19516,7 +19560,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19519: checking for unctrl.h" >&5
++echo "$as_me:19563: checking for unctrl.h" >&5
+ echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
+ if test "${cf_cv_unctrl_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19537,7 +19581,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19540 "configure"
++#line 19584 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19551,16 +19595,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19554: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19598: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19557: \$? = $ac_status" >&5
++  echo "$as_me:19601: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19560: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19604: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19563: \$? = $ac_status" >&5
++  echo "$as_me:19607: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unctrl_header=$cf_header
+ 	 break
+@@ -19573,12 +19617,12 @@
+ done
+ 
+ fi
+-echo "$as_me:19576: result: $cf_cv_unctrl_header" >&5
++echo "$as_me:19620: result: $cf_cv_unctrl_header" >&5
+ echo "${ECHO_T}$cf_cv_unctrl_header" >&6
+ 
+ case "$cf_cv_unctrl_header" in
+ (no)
+-	{ echo "$as_me:19581: WARNING: unctrl.h header not found" >&5
++	{ echo "$as_me:19625: WARNING: unctrl.h header not found" >&5
+ echo "$as_me: WARNING: unctrl.h header not found" >&2;}
+ 	;;
+ esac
+@@ -19676,10 +19720,10 @@
+ 
+ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 
+-	echo "$as_me:19679: checking for ${cf_func}" >&5
++	echo "$as_me:19723: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:19682: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:19726: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19688,7 +19732,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19691 "configure"
++#line 19735 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -19721,16 +19765,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19724: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19768: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19727: \$? = $ac_status" >&5
++  echo "$as_me:19771: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19730: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19774: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19733: \$? = $ac_status" >&5
++  echo "$as_me:19777: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -19746,7 +19790,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:19749: result: $cf_result" >&5
++	echo "$as_me:19793: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" != no; then
+ 		cat >>confdefs.h <&5
++	echo "$as_me:19808: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:19767: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:19811: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19773,7 +19817,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19776 "configure"
++#line 19820 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -19806,16 +19850,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19809: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19853: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19812: \$? = $ac_status" >&5
++  echo "$as_me:19856: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19815: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19859: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19818: \$? = $ac_status" >&5
++  echo "$as_me:19862: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -19831,7 +19875,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:19834: result: $cf_result" >&5
++	echo "$as_me:19878: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" != no; then
+ 		cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF
+-#line 19858 "configure"
++#line 19902 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19875,21 +19919,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19878: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19922: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19881: \$? = $ac_status" >&5
++  echo "$as_me:19925: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19884: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19928: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19887: \$? = $ac_status" >&5
++  echo "$as_me:19931: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
+ 
+-echo "${as_me:-configure}:19892: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
++echo "${as_me:-configure}:19936: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+ 
+ 		cat >>confdefs.h <&5
++echo "$as_me:19956: checking for ncurses extended functions" >&5
+ echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19919 "configure"
++#line 19963 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19931,16 +19975,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19934: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19978: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19937: \$? = $ac_status" >&5
++  echo "$as_me:19981: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19940: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19984: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19943: \$? = $ac_status" >&5
++  echo "$as_me:19987: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_ext_funcs=defined
+ else
+@@ -19948,7 +19992,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19951 "configure"
++#line 19995 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19973,16 +20017,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19976: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20020: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19979: \$? = $ac_status" >&5
++  echo "$as_me:20023: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19982: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20026: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19985: \$? = $ac_status" >&5
++  echo "$as_me:20029: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_ext_funcs=yes
+ else
+@@ -19996,7 +20040,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:19999: result: $cf_cv_ncurses_ext_funcs" >&5
++echo "$as_me:20043: result: $cf_cv_ncurses_ext_funcs" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
+ test "$cf_cv_ncurses_ext_funcs" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -20010,11 +20054,11 @@
+ 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
+ 	then
+ 		cf_define_xpg5=no
+-		echo "$as_me:20013: checking if _XPG5 should be defined to enable wide-characters" >&5
++		echo "$as_me:20057: checking if _XPG5 should be defined to enable wide-characters" >&5
+ echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20017 "configure"
++#line 20061 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20027,16 +20071,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20030: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20074: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20033: \$? = $ac_status" >&5
++  echo "$as_me:20077: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20036: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20080: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20039: \$? = $ac_status" >&5
++  echo "$as_me:20083: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -20045,7 +20089,7 @@
+ cf_save_cppflags="$CPPFLAGS"
+ 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20048 "configure"
++#line 20092 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20058,16 +20102,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20061: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20105: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20064: \$? = $ac_status" >&5
++  echo "$as_me:20108: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20067: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20111: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20070: \$? = $ac_status" >&5
++  echo "$as_me:20114: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_define_xpg5=yes
+ else
+@@ -20078,7 +20122,7 @@
+ 			 CPPFLAGS="$cf_save_cppflags"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-		echo "$as_me:20081: result: $cf_define_xpg5" >&5
++		echo "$as_me:20125: result: $cf_define_xpg5" >&5
+ echo "${ECHO_T}$cf_define_xpg5" >&6
+ 
+ 		if test "$cf_define_xpg5" = yes
+@@ -20087,14 +20131,14 @@
+ 		fi
+ 	fi
+ 
+-	echo "$as_me:20090: checking for wide-character functions" >&5
++	echo "$as_me:20134: checking for wide-character functions" >&5
+ echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
+ if test "${cf_cv_widechar_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20097 "configure"
++#line 20141 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20111,16 +20155,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20114: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20158: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20117: \$? = $ac_status" >&5
++  echo "$as_me:20161: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20120: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20164: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20123: \$? = $ac_status" >&5
++  echo "$as_me:20167: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_widechar_funcs=yes
+ else
+@@ -20131,7 +20175,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20134: result: $cf_cv_widechar_funcs" >&5
++echo "$as_me:20178: result: $cf_cv_widechar_funcs" >&5
+ echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
+ 	if test "$cf_cv_widechar_funcs" != no ; then
+ 
+@@ -20152,14 +20196,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20155: checking if $cf_cv_screen library uses pthreads" >&5
++echo "$as_me:20199: checking if $cf_cv_screen library uses pthreads" >&5
+ echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
+ if test "${cf_cv_use_pthreads+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20162 "configure"
++#line 20206 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20177,16 +20221,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20180: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20224: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20183: \$? = $ac_status" >&5
++  echo "$as_me:20227: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20186: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20230: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20189: \$? = $ac_status" >&5
++  echo "$as_me:20233: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_use_pthreads=yes
+ else
+@@ -20197,21 +20241,21 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20200: result: $cf_cv_use_pthreads" >&5
++echo "$as_me:20244: result: $cf_cv_use_pthreads" >&5
+ echo "${ECHO_T}$cf_cv_use_pthreads" >&6
+ test $cf_cv_use_pthreads = yes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_PTHREADS 1
+ EOF
+ 
+-echo "$as_me:20207: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:20251: 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 20214 "configure"
++#line 20258 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20231,16 +20275,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20234: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20278: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20237: \$? = $ac_status" >&5
++  echo "$as_me:20281: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20240: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20284: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20243: \$? = $ac_status" >&5
++  echo "$as_me:20287: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -20252,7 +20296,7 @@
+ 
+ fi
+ 
+-echo "$as_me:20255: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:20299: 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
+@@ -20261,7 +20305,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:20264: checking for openpty in -lutil" >&5
++echo "$as_me:20308: 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
+@@ -20269,7 +20313,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20272 "configure"
++#line 20316 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20288,16 +20332,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20291: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20335: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20294: \$? = $ac_status" >&5
++  echo "$as_me:20338: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20297: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20341: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20300: \$? = $ac_status" >&5
++  echo "$as_me:20344: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -20308,7 +20352,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20311: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:20355: 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
+@@ -20316,7 +20360,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:20319: checking for openpty header" >&5
++echo "$as_me:20363: 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
+@@ -20343,7 +20387,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20346 "configure"
++#line 20390 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20361,16 +20405,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20364: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20408: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20367: \$? = $ac_status" >&5
++  echo "$as_me:20411: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20370: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20414: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20373: \$? = $ac_status" >&5
++  echo "$as_me:20417: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -20388,7 +20432,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:20391: result: $cf_cv_func_openpty" >&5
++echo "$as_me:20435: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -20422,7 +20466,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:20425: checking for function curses_version" >&5
++echo "$as_me:20469: checking for function curses_version" >&5
+ echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
+ if test "${cf_cv_func_curses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20432,7 +20476,7 @@
+   cf_cv_func_curses_version=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20435 "configure"
++#line 20479 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -20448,15 +20492,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:20451: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20495: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20454: \$? = $ac_status" >&5
++  echo "$as_me:20498: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:20456: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20500: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20459: \$? = $ac_status" >&5
++  echo "$as_me:20503: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_curses_version=yes
+ 
+@@ -20471,14 +20515,14 @@
+ fi
+ rm -f core
+ fi
+-echo "$as_me:20474: result: $cf_cv_func_curses_version" >&5
++echo "$as_me:20518: result: $cf_cv_func_curses_version" >&5
+ echo "${ECHO_T}$cf_cv_func_curses_version" >&6
+ test "$cf_cv_func_curses_version" = yes &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_CURSES_VERSION 1
+ EOF
+ 
+-echo "$as_me:20481: checking for alternate character set array" >&5
++echo "$as_me:20525: checking for alternate character set array" >&5
+ echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_acs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20488,7 +20532,7 @@
+ for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20491 "configure"
++#line 20535 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20504,16 +20548,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20507: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20551: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20510: \$? = $ac_status" >&5
++  echo "$as_me:20554: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20513: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20557: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20516: \$? = $ac_status" >&5
++  echo "$as_me:20560: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_acs_map=$name; break
+ else
+@@ -20524,7 +20568,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20527: result: $cf_cv_curses_acs_map" >&5
++echo "$as_me:20571: result: $cf_cv_curses_acs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
+ 
+ test "$cf_cv_curses_acs_map" != unknown &&
+@@ -20534,7 +20578,7 @@
+ 
+ if test "$cf_enable_widec" = yes; then
+ 
+-echo "$as_me:20537: checking for wide alternate character set array" >&5
++echo "$as_me:20581: checking for wide alternate character set array" >&5
+ echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20544,7 +20588,7 @@
+ 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20547 "configure"
++#line 20591 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20560,16 +20604,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20563: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20607: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20566: \$? = $ac_status" >&5
++  echo "$as_me:20610: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20569: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20613: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20572: \$? = $ac_status" >&5
++  echo "$as_me:20616: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_wacs_map=$name
+ 	 break
+@@ -20580,7 +20624,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	done
+ fi
+-echo "$as_me:20583: result: $cf_cv_curses_wacs_map" >&5
++echo "$as_me:20627: result: $cf_cv_curses_wacs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
+ 
+ test "$cf_cv_curses_wacs_map" != unknown &&
+@@ -20588,7 +20632,7 @@
+ #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
+ EOF
+ 
+-echo "$as_me:20591: checking for wide alternate character constants" >&5
++echo "$as_me:20635: checking for wide alternate character constants" >&5
+ echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_symbols+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20598,7 +20642,7 @@
+ if test "$cf_cv_curses_wacs_map" != unknown
+ then
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20601 "configure"
++#line 20645 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20615,16 +20659,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20618: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20662: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20621: \$? = $ac_status" >&5
++  echo "$as_me:20665: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20624: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20668: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20627: \$? = $ac_status" >&5
++  echo "$as_me:20671: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -20634,7 +20678,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ else
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20637 "configure"
++#line 20681 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20650,16 +20694,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20653: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20697: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20656: \$? = $ac_status" >&5
++  echo "$as_me:20700: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20659: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20703: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20662: \$? = $ac_status" >&5
++  echo "$as_me:20706: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -20670,7 +20714,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:20673: result: $cf_cv_curses_wacs_symbols" >&5
++echo "$as_me:20717: result: $cf_cv_curses_wacs_symbols" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
+ 
+ test "$cf_cv_curses_wacs_symbols" != no &&
+@@ -20680,10 +20724,10 @@
+ 
+ fi
+ 
+-echo "$as_me:20683: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:20727: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20686 "configure"
++#line 20730 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20701,16 +20745,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20704: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20748: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20707: \$? = $ac_status" >&5
++  echo "$as_me:20751: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20710: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20754: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20713: \$? = $ac_status" >&5
++  echo "$as_me:20757: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -20719,7 +20763,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:20722: result: $cf_result" >&5
++echo "$as_me:20766: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -20740,14 +20784,14 @@
+ if test "$cf_enable_widec" = yes; then
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:20743: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:20787: 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 20750 "configure"
++#line 20794 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20765,23 +20809,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20768: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20812: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20771: \$? = $ac_status" >&5
++  echo "$as_me:20815: \$? = $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:20818: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20777: \$? = $ac_status" >&5
++  echo "$as_me:20821: \$? = $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 20784 "configure"
++#line 20828 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20800,16 +20844,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20803: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20847: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20806: \$? = $ac_status" >&5
++  echo "$as_me:20850: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20809: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20853: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20812: \$? = $ac_status" >&5
++  echo "$as_me:20856: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -20821,7 +20865,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20824: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:20868: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -20844,14 +20888,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:20847: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:20891: 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 20854 "configure"
++#line 20898 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20869,23 +20913,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20872: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20916: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20875: \$? = $ac_status" >&5
++  echo "$as_me:20919: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20878: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20922: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20881: \$? = $ac_status" >&5
++  echo "$as_me:20925: \$? = $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 20888 "configure"
++#line 20932 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20904,16 +20948,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20907: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20951: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20910: \$? = $ac_status" >&5
++  echo "$as_me:20954: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20913: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20957: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20916: \$? = $ac_status" >&5
++  echo "$as_me:20960: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -20925,7 +20969,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20928: result: $cf_cv_wchar_t" >&5
++echo "$as_me:20972: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -20948,14 +20992,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:20951: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:20995: 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 20958 "configure"
++#line 21002 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20973,23 +21017,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20976: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21020: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20979: \$? = $ac_status" >&5
++  echo "$as_me:21023: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20982: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21026: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20985: \$? = $ac_status" >&5
++  echo "$as_me:21029: \$? = $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 20992 "configure"
++#line 21036 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21008,16 +21052,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21011: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21055: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21014: \$? = $ac_status" >&5
++  echo "$as_me:21058: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21017: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21061: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21020: \$? = $ac_status" >&5
++  echo "$as_me:21064: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -21029,7 +21073,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21032: result: $cf_cv_wint_t" >&5
++echo "$as_me:21076: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -21053,10 +21097,10 @@
+ 
+ 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
+ 
+-echo "$as_me:21056: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21100: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21059 "configure"
++#line 21103 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21074,16 +21118,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21077: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21121: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21080: \$? = $ac_status" >&5
++  echo "$as_me:21124: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21083: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21127: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21086: \$? = $ac_status" >&5
++  echo "$as_me:21130: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21092,7 +21136,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21095: result: $cf_result" >&5
++echo "$as_me:21139: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -21114,10 +21158,10 @@
+ 
+ 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
+ 
+-echo "$as_me:21117: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21161: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21120 "configure"
++#line 21164 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21135,16 +21179,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21138: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21182: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21141: \$? = $ac_status" >&5
++  echo "$as_me:21185: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21144: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21188: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21147: \$? = $ac_status" >&5
++  echo "$as_me:21191: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21153,7 +21197,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21156: result: $cf_result" >&5
++echo "$as_me:21200: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -21175,10 +21219,10 @@
+ 
+ 	if test "$NCURSES_OK_WINT_T" = 0 ; then
+ 
+-echo "$as_me:21178: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21222: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21181 "configure"
++#line 21225 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21196,16 +21240,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21199: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21243: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21202: \$? = $ac_status" >&5
++  echo "$as_me:21246: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21205: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21249: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21208: \$? = $ac_status" >&5
++  echo "$as_me:21252: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21214,7 +21258,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21217: result: $cf_result" >&5
++echo "$as_me:21261: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -21243,11 +21287,11 @@
+ boolfnames \
+ ttytype
+ do
+-echo "$as_me:21246: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21290: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21250 "configure"
++#line 21294 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -21280,16 +21324,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21283: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21327: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21286: \$? = $ac_status" >&5
++  echo "$as_me:21330: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21289: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21333: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21292: \$? = $ac_status" >&5
++  echo "$as_me:21336: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ 
+@@ -21299,7 +21343,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21302: result: $cf_result" >&5
++echo "$as_me:21346: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test "$cf_result" = yes ; then
+@@ -21311,14 +21355,14 @@
+ EOF
+ 
+ else
+-	echo "$as_me:21314: checking for data $cf_data in library" >&5
++	echo "$as_me:21358: checking for data $cf_data in library" >&5
+ echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6
+ 	# BSD linkers insist on making weak linkage, but resolve at runtime.
+ 	if test "$cross_compiling" = yes; then
+ 
+ 	# cross-compiling
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21321 "configure"
++#line 21365 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -21357,16 +21401,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21360: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21404: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21363: \$? = $ac_status" >&5
++  echo "$as_me:21407: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21366: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21410: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21369: \$? = $ac_status" >&5
++  echo "$as_me:21413: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21378,7 +21422,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21381 "configure"
++#line 21425 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -21410,15 +21454,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21413: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21457: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21416: \$? = $ac_status" >&5
++  echo "$as_me:21460: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21418: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21462: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21421: \$? = $ac_status" >&5
++  echo "$as_me:21465: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ 
+@@ -21430,7 +21474,7 @@
+ fi
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-	echo "$as_me:21433: result: $cf_result" >&5
++	echo "$as_me:21477: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = yes ; then
+ 
+@@ -21447,7 +21491,7 @@
+ 
+ if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
+ then
+-	echo "$as_me:21450: checking for X" >&5
++	echo "$as_me:21494: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
+ # Check whether --with-x or --without-x was given.
+@@ -21551,17 +21595,17 @@
+   # Guess where to find include files, by looking for Intrinsic.h.
+   # First, try using that file with no special directory specified.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21554 "configure"
++#line 21598 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:21558: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:21602: \"$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:21564: \$? = $ac_status" >&5
++  echo "$as_me:21608: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -21594,7 +21638,7 @@
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21597 "configure"
++#line 21641 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -21606,16 +21650,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21609: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21653: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21612: \$? = $ac_status" >&5
++  echo "$as_me:21656: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21615: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21659: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21618: \$? = $ac_status" >&5
++  echo "$as_me:21662: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -21653,7 +21697,7 @@
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:21656: result: $have_x" >&5
++  echo "$as_me:21700: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+   no_x=yes
+ else
+@@ -21663,7 +21707,7 @@
+   # Update the cache value to reflect the command line values.
+   ac_cv_have_x="have_x=yes \
+ 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  echo "$as_me:21666: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "$as_me:21710: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+@@ -21690,11 +21734,11 @@
+     # others require no space.  Words are not sufficient . . . .
+     case `(uname -sr) 2>/dev/null` in
+     "SunOS 5"*)
+-      echo "$as_me:21693: checking whether -R must be followed by a space" >&5
++      echo "$as_me:21737: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+       cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21697 "configure"
++#line 21741 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21706,16 +21750,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21709: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21753: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21712: \$? = $ac_status" >&5
++  echo "$as_me:21756: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21715: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21759: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21718: \$? = $ac_status" >&5
++  echo "$as_me:21762: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_nospace=yes
+ else
+@@ -21725,13 +21769,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+       if test $ac_R_nospace = yes; then
+-	echo "$as_me:21728: result: no" >&5
++	echo "$as_me:21772: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	X_LIBS="$X_LIBS -R$x_libraries"
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21734 "configure"
++#line 21778 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21743,16 +21787,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21746: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21790: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21749: \$? = $ac_status" >&5
++  echo "$as_me:21793: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21752: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21796: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21755: \$? = $ac_status" >&5
++  echo "$as_me:21799: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_space=yes
+ else
+@@ -21762,11 +21806,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	if test $ac_R_space = yes; then
+-	  echo "$as_me:21765: result: yes" >&5
++	  echo "$as_me:21809: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ 	else
+-	  echo "$as_me:21769: result: neither works" >&5
++	  echo "$as_me:21813: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ 	fi
+       fi
+@@ -21786,7 +21830,7 @@
+     # the Alpha needs dnet_stub (dnet does not exist).
+     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21789 "configure"
++#line 21833 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21805,22 +21849,22 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21808: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21852: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21811: \$? = $ac_status" >&5
++  echo "$as_me:21855: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21814: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21858: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21817: \$? = $ac_status" >&5
++  echo "$as_me:21861: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:21823: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:21867: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21828,7 +21872,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21831 "configure"
++#line 21875 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21847,16 +21891,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21850: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21894: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21853: \$? = $ac_status" >&5
++  echo "$as_me:21897: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21856: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21900: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21859: \$? = $ac_status" >&5
++  echo "$as_me:21903: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -21867,14 +21911,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21870: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:21914: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      echo "$as_me:21877: checking for dnet_ntoa in -ldnet_stub" >&5
++      echo "$as_me:21921: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21882,7 +21926,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21885 "configure"
++#line 21929 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21901,16 +21945,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21904: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21948: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21907: \$? = $ac_status" >&5
++  echo "$as_me:21951: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21910: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21954: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21913: \$? = $ac_status" >&5
++  echo "$as_me:21957: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -21921,7 +21965,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21924: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:21968: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -21940,13 +21984,13 @@
+     # on Irix 5.2, according to T.E. Dickey.
+     # The functions gethostbyname, getservbyname, and inet_addr are
+     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+-    echo "$as_me:21943: checking for gethostbyname" >&5
++    echo "$as_me:21987: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21949 "configure"
++#line 21993 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21977,16 +22021,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21980: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22024: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21983: \$? = $ac_status" >&5
++  echo "$as_me:22027: \$? = $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:22030: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21989: \$? = $ac_status" >&5
++  echo "$as_me:22033: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gethostbyname=yes
+ else
+@@ -21996,11 +22040,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21999: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:22043: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+-      echo "$as_me:22003: checking for gethostbyname in -lnsl" >&5
++      echo "$as_me:22047: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22008,7 +22052,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22011 "configure"
++#line 22055 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22027,16 +22071,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22030: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22074: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22033: \$? = $ac_status" >&5
++  echo "$as_me:22077: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22036: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22080: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22039: \$? = $ac_status" >&5
++  echo "$as_me:22083: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -22047,14 +22091,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22050: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:22094: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test "$ac_cv_lib_nsl_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+-        echo "$as_me:22057: checking for gethostbyname in -lbsd" >&5
++        echo "$as_me:22101: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22062,7 +22106,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22065 "configure"
++#line 22109 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22081,16 +22125,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22084: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22128: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22087: \$? = $ac_status" >&5
++  echo "$as_me:22131: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22090: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22134: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22093: \$? = $ac_status" >&5
++  echo "$as_me:22137: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -22101,7 +22145,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22104: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:22148: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test "$ac_cv_lib_bsd_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -22117,13 +22161,13 @@
+     # variants that don't use the nameserver (or something).  -lsocket
+     # must be given before -lnsl if both are needed.  We assume that
+     # if connect needs -lnsl, so does gethostbyname.
+-    echo "$as_me:22120: checking for connect" >&5
++    echo "$as_me:22164: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22126 "configure"
++#line 22170 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22154,16 +22198,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22157: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22201: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22160: \$? = $ac_status" >&5
++  echo "$as_me:22204: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22163: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22207: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22166: \$? = $ac_status" >&5
++  echo "$as_me:22210: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_connect=yes
+ else
+@@ -22173,11 +22217,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22176: result: $ac_cv_func_connect" >&5
++echo "$as_me:22220: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+ 
+     if test $ac_cv_func_connect = no; then
+-      echo "$as_me:22180: checking for connect in -lsocket" >&5
++      echo "$as_me:22224: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22185,7 +22229,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22188 "configure"
++#line 22232 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22204,16 +22248,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22207: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22251: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22210: \$? = $ac_status" >&5
++  echo "$as_me:22254: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22213: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22257: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22216: \$? = $ac_status" >&5
++  echo "$as_me:22260: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_socket_connect=yes
+ else
+@@ -22224,7 +22268,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22227: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:22271: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test "$ac_cv_lib_socket_connect" = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -22233,13 +22277,13 @@
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    echo "$as_me:22236: checking for remove" >&5
++    echo "$as_me:22280: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22242 "configure"
++#line 22286 "configure"
+ #include "confdefs.h"
+ #define remove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22270,16 +22314,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22273: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22317: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22276: \$? = $ac_status" >&5
++  echo "$as_me:22320: \$? = $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:22323: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22282: \$? = $ac_status" >&5
++  echo "$as_me:22326: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_remove=yes
+ else
+@@ -22289,11 +22333,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22292: result: $ac_cv_func_remove" >&5
++echo "$as_me:22336: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+ 
+     if test $ac_cv_func_remove = no; then
+-      echo "$as_me:22296: checking for remove in -lposix" >&5
++      echo "$as_me:22340: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22301,7 +22345,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22304 "configure"
++#line 22348 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22320,16 +22364,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22323: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22367: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22326: \$? = $ac_status" >&5
++  echo "$as_me:22370: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22329: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22373: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22332: \$? = $ac_status" >&5
++  echo "$as_me:22376: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_posix_remove=yes
+ else
+@@ -22340,7 +22384,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22343: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:22387: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test "$ac_cv_lib_posix_remove" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -22349,13 +22393,13 @@
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    echo "$as_me:22352: checking for shmat" >&5
++    echo "$as_me:22396: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22358 "configure"
++#line 22402 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22386,16 +22430,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22389: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22433: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22392: \$? = $ac_status" >&5
++  echo "$as_me:22436: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22395: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22439: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22398: \$? = $ac_status" >&5
++  echo "$as_me:22442: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_shmat=yes
+ else
+@@ -22405,11 +22449,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22408: result: $ac_cv_func_shmat" >&5
++echo "$as_me:22452: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+ 
+     if test $ac_cv_func_shmat = no; then
+-      echo "$as_me:22412: checking for shmat in -lipc" >&5
++      echo "$as_me:22456: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22417,7 +22461,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22420 "configure"
++#line 22464 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22436,16 +22480,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22439: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22483: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22442: \$? = $ac_status" >&5
++  echo "$as_me:22486: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22445: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22489: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22448: \$? = $ac_status" >&5
++  echo "$as_me:22492: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+@@ -22456,7 +22500,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22459: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:22503: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test "$ac_cv_lib_ipc_shmat" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -22474,7 +22518,7 @@
+   # These have to be linked with before -lX11, unlike the other
+   # libraries we check for below, so use a different variable.
+   # John Interrante, Karl Berry
+-  echo "$as_me:22477: checking for IceConnectionNumber in -lICE" >&5
++  echo "$as_me:22521: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22482,7 +22526,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22485 "configure"
++#line 22529 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22501,16 +22545,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22504: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22548: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22507: \$? = $ac_status" >&5
++  echo "$as_me:22551: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22510: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22554: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22513: \$? = $ac_status" >&5
++  echo "$as_me:22557: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -22521,7 +22565,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22524: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:22568: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -22568,16 +22612,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22571: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22615: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22576: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22620: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22580: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22624: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -22616,16 +22660,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22619: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:22663: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22624: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:22668: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22628: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22672: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -22664,23 +22708,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22667: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:22711: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22672: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:22716: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22676: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22720: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:22683: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:22727: 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.
+@@ -22697,7 +22741,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:22700: result: $enable_warnings" >&5
++echo "$as_me:22744: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -22720,10 +22764,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:22723: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:22767: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -22773,12 +22817,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:22776: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:22820: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22779: \$? = $ac_status" >&5
++  echo "$as_me:22823: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:22781: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:22825: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -22856,7 +22900,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22859 "configure"
++#line 22903 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22871,26 +22915,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22874: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22918: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22877: \$? = $ac_status" >&5
++  echo "$as_me:22921: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22880: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22924: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22883: \$? = $ac_status" >&5
++  echo "$as_me:22927: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:22886: checking for X11/Xt const-feature" >&5
++echo "$as_me:22930: 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 22893 "configure"
++#line 22937 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -22908,16 +22952,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22911: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22955: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22914: \$? = $ac_status" >&5
++  echo "$as_me:22958: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22917: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22961: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22920: \$? = $ac_status" >&5
++  echo "$as_me:22964: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -22932,7 +22976,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22935: result: $cf_cv_const_x_string" >&5
++echo "$as_me:22979: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -22961,7 +23005,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:23024: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -22993,12 +23037,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:22996: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:23040: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22999: \$? = $ac_status" >&5
++  echo "$as_me:23043: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:23001: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:23045: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -23006,7 +23050,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:23009: checking for $CC warning options..." >&5
++	{ echo "$as_me:23053: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -23029,12 +23073,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:23032: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:23076: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23035: \$? = $ac_status" >&5
++  echo "$as_me:23079: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:23037: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:23081: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -23042,7 +23086,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:23045: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:23089: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -23052,7 +23096,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:23055: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:23099: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -23069,7 +23113,7 @@
+ 
+ fi
+ 
+-echo "$as_me:23072: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:23116: 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.
+@@ -23091,7 +23135,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:23094: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:23138: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -23205,23 +23249,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:23208: checking for dmalloc.h" >&5
++	echo "$as_me:23252: 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 23214 "configure"
++#line 23258 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:23218: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23262: \"$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:23224: \$? = $ac_status" >&5
++  echo "$as_me:23268: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23240,11 +23284,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23243: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:23287: 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:23247: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:23291: 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
+@@ -23252,7 +23296,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23255 "configure"
++#line 23299 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -23271,16 +23315,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23274: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23318: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23277: \$? = $ac_status" >&5
++  echo "$as_me:23321: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23280: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23324: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23283: \$? = $ac_status" >&5
++  echo "$as_me:23327: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -23291,7 +23335,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23294: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:23338: 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:23353: 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.
+@@ -23328,7 +23372,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:23331: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:23375: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -23442,23 +23486,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:23445: checking for dbmalloc.h" >&5
++	echo "$as_me:23489: 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 23451 "configure"
++#line 23495 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:23455: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23499: \"$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:23461: \$? = $ac_status" >&5
++  echo "$as_me:23505: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23477,11 +23521,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23480: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:23524: 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:23484: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:23528: 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
+@@ -23489,7 +23533,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23492 "configure"
++#line 23536 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -23508,16 +23552,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23511: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23555: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23514: \$? = $ac_status" >&5
++  echo "$as_me:23558: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23517: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23561: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23520: \$? = $ac_status" >&5
++  echo "$as_me:23564: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -23528,7 +23572,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23531: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:23575: 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:23590: 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.
+@@ -23565,7 +23609,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:23568: result: ${with_valgrind:-no}" >&5
++echo "$as_me:23612: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -23678,7 +23722,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:23681: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:23725: 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.
+@@ -23689,7 +23733,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:23692: result: $with_no_leaks" >&5
++echo "$as_me:23736: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -23707,7 +23751,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:23710: checking for an rpath option" >&5
++	echo "$as_me:23754: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -23738,12 +23782,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:23741: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:23785: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:23746: checking if we need a space after rpath option" >&5
++		echo "$as_me:23790: 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"
+ 
+@@ -23764,7 +23808,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23767 "configure"
++#line 23811 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -23776,16 +23820,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23779: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23823: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23782: \$? = $ac_status" >&5
++  echo "$as_me:23826: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23785: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23829: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23788: \$? = $ac_status" >&5
++  echo "$as_me:23832: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -23795,14 +23839,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:23798: result: $cf_rpath_space" >&5
++		echo "$as_me:23842: 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:23805: checking if rpath-hack should be disabled" >&5
++echo "$as_me:23849: 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.
+@@ -23820,22 +23864,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:23823: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:23867: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:23828: checking for updated LDFLAGS" >&5
++echo "$as_me:23872: 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:23831: result: maybe" >&5
++	echo "$as_me:23875: 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:23838: checking for $ac_word" >&5
++echo "$as_me:23882: 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
+@@ -23850,7 +23894,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:23853: found $ac_dir/$ac_word" >&5
++echo "$as_me:23897: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -23858,10 +23902,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:23861: result: $cf_ldd_prog" >&5
++  echo "$as_me:23905: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:23864: result: no" >&5
++  echo "$as_me:23908: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -23875,7 +23919,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23878 "configure"
++#line 23922 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -23887,16 +23931,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23890: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23934: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23893: \$? = $ac_status" >&5
++  echo "$as_me:23937: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23896: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23940: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23899: \$? = $ac_status" >&5
++  echo "$as_me:23943: \$? = $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`
+@@ -23924,7 +23968,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:23927: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:23971: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -23936,11 +23980,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23939: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23983: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23943: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23987: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -23977,7 +24021,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:23980: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:24024: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -23990,11 +24034,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23993: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:24037: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:23997: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:24041: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -24031,7 +24075,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:24034: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:24078: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -24044,14 +24088,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:24047: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:24091: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:24051: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:24095: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:24054: result: no" >&5
++	echo "$as_me:24098: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -24141,7 +24185,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:24144: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:24188: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -24322,7 +24366,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:24325: error: ambiguous option: $1
++    { { echo "$as_me:24369: 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;}
+@@ -24341,7 +24385,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:24344: error: unrecognized option: $1
++  -*) { { echo "$as_me:24388: 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;}
+@@ -24391,7 +24435,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:24394: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:24438: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -24555,6 +24599,8 @@
+ s,@RULE_CC@,$RULE_CC,;t t
+ s,@SHOW_CC@,$SHOW_CC,;t t
+ s,@ECHO_CC@,$ECHO_CC,;t t
++s,@DESTDIR@,$DESTDIR,;t t
++s,@MERGE_PREFIX@,$MERGE_PREFIX,;t t
+ s,@NCURSES_WRAP_PREFIX@,$NCURSES_WRAP_PREFIX,;t t
+ s,@NCURSES_CONFIG@,$NCURSES_CONFIG,;t t
+ s,@ac_ct_NCURSES_CONFIG@,$ac_ct_NCURSES_CONFIG,;t t
+@@ -24705,7 +24751,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:24708: creating $ac_file" >&5
++    { echo "$as_me:24754: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -24723,7 +24769,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:24726: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:24772: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -24736,7 +24782,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:24739: error: cannot find input file: $f" >&5
++           { { echo "$as_me:24785: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -24752,7 +24798,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:24755: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:24801: 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;}
+@@ -24761,7 +24807,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:24764: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:24810: 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;}
+@@ -24806,7 +24852,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:24809: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:24855: 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;}
+@@ -24817,7 +24863,7 @@
+     $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:24820: WARNING: Some variables may not be substituted:
++      { echo "$as_me:24866: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -24866,7 +24912,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:24869: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:24915: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -24877,7 +24923,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:24880: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:24926: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -24890,7 +24936,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:24893: error: cannot find input file: $f" >&5
++           { { echo "$as_me:24939: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -24948,7 +24994,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:24951: $ac_file is unchanged" >&5
++      { echo "$as_me:24997: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+Index: test/configure.in
+Prereq:  1.177 
+--- ncurses-6.5-20240810+/test/configure.in	2024-08-10 14:11:56.000000000 +0000
++++ ncurses-6.5-20240817/test/configure.in	2024-08-11 09:08:54.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1996-on
+ dnl
+-dnl $Id: configure.in,v 1.177 2024/08/10 14:11:56 tom Exp $
++dnl $Id: configure.in,v 1.178 2024/08/11 09:08:54 tom Exp $
+ dnl This is a simple configuration-script for the ncurses test programs that
+ dnl allows the test-directory to be separately configured against a reference
+ dnl system (i.e., sysvr4 curses)
+@@ -118,6 +118,7 @@
+ dnl ---------------------------------------------------------------------------
+ CF_PKG_CONFIG
+ CF_DISABLE_ECHO
++CF_INSTALL_PREFIX
+ 
+ dnl ---------------------------------------------------------------------------
+ CF_HELP_MESSAGE(Curses Version-dependent Options:)
diff --git a/packages/ncurses/6.5/ncurses-6.5-20240824.patch b/packages/ncurses/6.5/ncurses-6.5-20240824.patch
new file mode 100644
index 0000000000..749f95b949
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20240824.patch
@@ -0,0 +1,355 @@
+# ncurses 6.5 - patch 20240824 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20240824.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Aug 25 00:54:42 UTC 2024
+# ------------------------------------------------------------------------------
+# NEWS                             |    6 +++++-
+# 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 +-
+# progs/Makefile.in                |    4 ++--
+# progs/infocmp.c                  |   27 ++++++++++++++++++---------
+# progs/tabs.c                     |    9 +++++----
+# test/demo_keyok.c                |    6 ++++--
+# 14 files changed, 48 insertions(+), 32 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4164 
+--- ncurses-6.5-20240817+/NEWS	2024-08-17 22:54:38.000000000 +0000
++++ ncurses-6.5-20240824/NEWS	2024-08-24 20:11:44.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4164 2024/08/17 22:54:38 tom Exp $
++-- $Id: NEWS,v 1.4166 2024/08/24 20:11:44 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.
+ 
++20240824
++	+ modify infocmp and tabs to use actual name in usage and header.
++	+ modify test/demo_keyok.c to accept ^Q for quit, for consistency.
++
+ 20240817
+ 	+ review/update foot for 1.18.1 -TD
+ 	+ add a note about DomTerm 3.2.0 -TD
+Index: VERSION
+--- ncurses-6.5-20240817+/VERSION	2024-08-17 09:37:53.000000000 +0000
++++ ncurses-6.5-20240824/VERSION	2024-08-24 10:17:07.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20240817
++5:0:10	6.5	20240824
+Index: dist.mk
+Prereq:  1.1627 
+--- ncurses-6.5-20240817+/dist.mk	2024-08-17 09:37:53.000000000 +0000
++++ ncurses-6.5-20240824/dist.mk	2024-08-24 10:17:07.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1627 2024/08/17 09:37:53 tom Exp $
++# $Id: dist.mk,v 1.1628 2024/08/24 10:17: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 = 5
+-NCURSES_PATCH = 20240817
++NCURSES_PATCH = 20240824
+ 
+ # 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.5-20240817+/package/debian-mingw/changelog	2024-08-11 00:14:44.000000000 +0000
++++ ncurses-6.5-20240824/package/debian-mingw/changelog	2024-08-24 10:17:07.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240817) unstable; urgency=low
++ncurses6td (6.5+20240824) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 10 Aug 2024 20:14:44 -0400
++ -- Thomas E. Dickey   Sat, 24 Aug 2024 06:17:07 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20240817+/package/debian-mingw64/changelog	2024-08-11 00:14:44.000000000 +0000
++++ ncurses-6.5-20240824/package/debian-mingw64/changelog	2024-08-24 10:17:07.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240817) unstable; urgency=low
++ncurses6td (6.5+20240824) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 10 Aug 2024 20:14:44 -0400
++ -- Thomas E. Dickey   Sat, 24 Aug 2024 06:17:07 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20240817+/package/debian/changelog	2024-08-11 00:14:44.000000000 +0000
++++ ncurses-6.5-20240824/package/debian/changelog	2024-08-24 10:17:07.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240817) unstable; urgency=low
++ncurses6td (6.5+20240824) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 10 Aug 2024 20:14:44 -0400
++ -- Thomas E. Dickey   Sat, 24 Aug 2024 06:17:07 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.662 
+--- ncurses-6.5-20240817+/package/mingw-ncurses.nsi	2024-08-11 00:14:44.000000000 +0000
++++ ncurses-6.5-20240824/package/mingw-ncurses.nsi	2024-08-24 10:17:07.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.662 2024/08/11 00:14:44 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.663 2024/08/24 10:17:07 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "0817"
++!define VERSION_MMDD  "0824"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20240817+/package/mingw-ncurses.spec	2024-08-11 00:14:44.000000000 +0000
++++ ncurses-6.5-20240824/package/mingw-ncurses.spec	2024-08-24 10:17:07.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20240817
++Release: 20240824
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20240817+/package/ncurses.spec	2024-08-11 00:14:44.000000000 +0000
++++ ncurses-6.5-20240824/package/ncurses.spec	2024-08-24 10:17:07.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20240817
++Release: 20240824
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20240817+/package/ncursest.spec	2024-08-11 00:14:44.000000000 +0000
++++ ncurses-6.5-20240824/package/ncursest.spec	2024-08-24 10:17:07.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20240817
++Release: 20240824
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/Makefile.in
+Prereq:  1.116 
+--- ncurses-6.5-20240817+/progs/Makefile.in	2024-08-10 18:13:22.000000000 +0000
++++ ncurses-6.5-20240824/progs/Makefile.in	2024-08-24 22:51:58.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.116 2024/08/10 18:13:22 tom Exp $
++# $Id: Makefile.in,v 1.117 2024/08/24 22:51:58 tom Exp $
+ ##############################################################################
+ # Copyright 2020-2021,2024 Thomas E. Dickey                                  #
+ # Copyright 1998-2016,2018 Free Software Foundation, Inc.                    #
+@@ -95,7 +95,7 @@
+ 
+ INCDIR		= $(top_srcdir)/include
+ NCUDIR		= $(top_srcdir)/ncurses
+-CPPFLAGS	= -DHAVE_CONFIG_H -I../progs -I../ncurses -I$(top_srcdir)/ncurses @CPPFLAGS@
++CPPFLAGS	= -DHAVE_CONFIG_H -DACTUAL_TIC="\"$(actual_tic)\"" -I../progs -I../ncurses -I$(top_srcdir)/ncurses @CPPFLAGS@
+ 
+ CCFLAGS		= $(CPPFLAGS) $(CFLAGS)
+ 
+Index: progs/infocmp.c
+Prereq:  1.163 
+--- ncurses-6.5-20240817+/progs/infocmp.c	2023-12-16 17:27:47.000000000 +0000
++++ ncurses-6.5-20240824/progs/infocmp.c	2024-08-24 22:57:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2020-2023,2024 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,11 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: infocmp.c,v 1.163 2023/12/16 17:27:47 tom Exp $")
++MODULE_ID("$Id: infocmp.c,v 1.164 2024/08/24 22:57:24 tom Exp $")
++
++#ifndef ACTUAL_TIC
++#define ACTUAL_TIC "tic"
++#endif
+ 
+ #define MAX_STRING	1024	/* maximum formatted string */
+ 
+@@ -61,6 +65,9 @@
+ static ENTRY *entries;		/* terminfo entries */
+ static int termcount;		/* count of terminal entries */
+ 
++static const char usage_string[] = \
++"Usage: %s [options] [-A directory] [-B directory] [termname...]";
++
+ static bool limited = TRUE;	/* "-r" option is not set */
+ static bool quiet = FALSE;
+ static bool literal = FALSE;
+@@ -1216,7 +1223,6 @@
+ #define DATA(s) s "\n"
+     static const char head[] =
+     {
+-	DATA("Usage: infocmp [options] [-A directory] [-B directory] [termname...]")
+ 	DATA("")
+ 	DATA("Options:")
+     };
+@@ -1271,14 +1277,16 @@
+     const size_t last = SIZEOF(options);
+     const size_t left = (last + 1) / 2;
+     size_t n;
++    FILE *fp = stderr;
+ 
+-    fputs(head, stderr);
++    fprintf(fp, usage_string, _nc_progname);
++    fputs(head, fp);
+     for (n = 0; n < left; n++) {
+ 	size_t m = n + left;
+ 	if (m < last)
+-	    fprintf(stderr, "%-40.40s%s\n", options[n], options[m]);
++	    fprintf(fp, "%-40.40s%s\n", options[n], options[m]);
+ 	else
+-	    fprintf(stderr, "%s\n", options[n]);
++	    fprintf(fp, "%s\n", options[n]);
+     }
+     ExitProgram(EXIT_FAILURE);
+ }
+@@ -1933,8 +1941,8 @@
+ 				   tname[0]);
+ 		if (!quiet)
+ 		    (void)
+-			printf("#\tReconstructed via infocmp from file: %s\n",
+-			       tfile[0]);
++			printf("#\tReconstructed via %s from file: %s\n",
++			       _nc_progname, tfile[0]);
+ 		dump_entry(&entries[0].tterm,
+ 			   suppress_untranslatable,
+ 			   limited,
+@@ -1980,7 +1988,8 @@
+     } else if (compare == C_USEALL) {
+ 	(void) fprintf(stderr, "Sorry, -u doesn't work with -F\n");
+     } else if (compare == C_DEFAULT) {
+-	(void) fprintf(stderr, "Use `tic -[CI] ' for this.\n");
++	(void) fprintf(stderr,
++		       "Use `" ACTUAL_TIC " -[CI] ' for this.\n");
+     } else if (argc - optind != 2) {
+ 	(void) fprintf(stderr,
+ 		       "File comparison needs exactly two file arguments.\n");
+Index: progs/tabs.c
+Prereq:  1.53 
+--- ncurses-6.5-20240817+/progs/tabs.c	2023-11-04 20:46:09.000000000 +0000
++++ ncurses-6.5-20240824/progs/tabs.c	2024-08-24 22:56:43.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2020-2023,2024 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.53 2023/11/04 20:46:09 tom Exp $")
++MODULE_ID("$Id: tabs.c,v 1.54 2024/08/24 22:56:43 tom Exp $")
+ 
+ static GCC_NORETURN void usage(void);
+ 
+@@ -445,7 +445,6 @@
+ #define DATA(s) s "\n"
+     static const char msg[] =
+     {
+-	DATA("Usage: tabs [options] [tabstop-list]")
+ 	DATA("")
+ 	DATA("Options:")
+ 	DATA("  -0       reset tabs")
+@@ -468,9 +467,11 @@
+ 	DATA("or 1,+10,+10 which is the same.")
+     };
+ #undef DATA
++    FILE *fp = stderr;
+ 
+     fflush(stdout);
+-    fputs(msg, stderr);
++    fprintf(fp, "Usage: %s [options] [tabstop-list]\n", _nc_progname);
++    fputs(msg, fp);
+     ExitProgram(EXIT_FAILURE);
+ }
+ 
+Index: test/demo_keyok.c
+Prereq:  1.9 
+--- ncurses-6.5-20240817+/test/demo_keyok.c	2022-12-10 23:31:31.000000000 +0000
++++ ncurses-6.5-20240824/test/demo_keyok.c	2024-08-24 17:16:49.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2022 Thomas E. Dickey                                     *
++ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2002-2006,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_keyok.c,v 1.9 2022/12/10 23:31:31 tom Exp $
++ * $Id: demo_keyok.c,v 1.10 2024/08/24 17:16:49 tom Exp $
+  *
+  * Demonstrate the keyok() function.
+  * Thomas Dickey - 2002/11/23
+@@ -93,6 +93,8 @@
+ 
+     while ((ch = wgetch(win)) != ERR) {
+ 	const char *name = keyname(ch);
++	if (ch == QUIT)
++	    break;
+ 	if (ch == ESCAPE && prior == ch)
+ 	    break;
+ 	prior = ch;
diff --git a/packages/ncurses/6.5/ncurses-6.5-20240831.patch b/packages/ncurses/6.5/ncurses-6.5-20240831.patch
new file mode 100644
index 0000000000..f817db5411
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20240831.patch
@@ -0,0 +1,885 @@
+# ncurses 6.5 - patch 20240831 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20240831.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sat Aug 31 22:36:56 UTC 2024
+# ------------------------------------------------------------------------------
+# NEWS                             |   14 +++++++++++++-
+# VERSION                          |    2 +-
+# configure                        |    4 ++--
+# configure.in                     |    6 +++---
+# dist.mk                          |    4 ++--
+# include/nc_mingw.h               |    8 +++++---
+# include/nc_win32.h               |    8 +++++---
+# include/win32_curses.h           |    7 ++-----
+# ncurses/base/lib_getch.c         |   10 +++++-----
+# ncurses/curses.priv.h            |   32 ++++++++++++++++++++++++++------
+# ncurses/tinfo/lib_napms.c        |    6 +++---
+# ncurses/tinfo/lib_print.c        |    4 ++--
+# ncurses/tinfo/lib_setup.c        |    7 +++----
+# ncurses/tinfo/lib_win32con.c     |    6 +++---
+# ncurses/tinfo/lib_win32util.c    |    8 ++++----
+# ncurses/tinfo/tinfo_driver.c     |    4 ++--
+# ncurses/tinfo/write_entry.c      |    4 ++--
+# ncurses/trace/lib_trace.c        |    4 ++--
+# ncurses/widechar/widechars.c     |    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 +-
+# test/dots_termcap.c              |    8 ++++----
+# test/dots_xcurses.c              |    6 +++---
+# test/rain.c                      |    6 +++---
+# test/test.priv.h                 |   10 +++++-----
+# test/test_mouse.c                |    4 ++--
+# test/widechars.h                 |    4 ++--
+# 32 files changed, 119 insertions(+), 87 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4166 
+--- ncurses-6.5-20240824+/NEWS	2024-08-24 20:11:44.000000000 +0000
++++ ncurses-6.5-20240831/NEWS	2024-08-31 21:21:26.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4166 2024/08/24 20:11:44 tom Exp $
++-- $Id: NEWS,v 1.4169 2024/08/31 21:21:26 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,18 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20240831
++	+ build-fix for a case in msys2 where gettimeofday() was available but
++	  the fallback was partly configured.
++	> patch by Rafael Kitover:
++	+ separate the _NC_WINDOWS platform macro into _NC_WINDOWS_NATIVE,
++	  for MinGW and other native Win32 support, and _NC_WINDOWS, to make
++	  some Win32 features available under the Cygwin runtime, in this case
++	  the term-driver.
++	+ make some minor adjustments to allow
++	      ./configure --enable-term-driver
++	  to also work on Cygwin platforms such as Cygwin and MSYS2.
++
+ 20240824
+ 	+ modify infocmp and tabs to use actual name in usage and header.
+ 	+ modify test/demo_keyok.c to accept ^Q for quit, for consistency.
+Index: VERSION
+--- ncurses-6.5-20240824+/VERSION	2024-08-24 10:17:07.000000000 +0000
++++ ncurses-6.5-20240831/VERSION	2024-08-31 09:52:35.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20240824
++5:0:10	6.5	20240831
+Index: configure
+--- ncurses-6.5-20240824+/configure	2024-08-17 13:44:13.000000000 +0000
++++ ncurses-6.5-20240831/configure	2024-08-31 21:01:19.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.785 .
++# From configure.in Revision: 1.786 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20240618.
+ #
+@@ -28526,7 +28526,7 @@
+ if test "$with_term_driver" != no ; then
+ 	LIB_SUBSETS="${LIB_SUBSETS}+port_drivers"
+ 	case "$cf_cv_system_name" in
+-	(*mingw32*|*mingw64*)
++	(*mingw32*|*mingw64*|*msys*|*cygwin*)
+ 		if test "x$with_exp_win32" = xyes ; then
+ 			LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo+port_win32"
+ 		else
+Index: configure.in
+Prereq:  1.785 
+--- ncurses-6.5-20240824+/configure.in	2024-08-17 13:44:13.000000000 +0000
++++ ncurses-6.5-20240831/configure.in	2024-08-31 10:46:01.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.785 2024/08/17 13:44:13 tom Exp $
++dnl $Id: configure.in,v 1.786 2024/08/31 10:46:01 Rafael.Kitover 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.785 $)
++AC_REVISION($Revision: 1.786 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -2075,7 +2075,7 @@
+ if test "$with_term_driver" != no ; then
+ 	LIB_SUBSETS="${LIB_SUBSETS}+port_drivers"
+ 	case "$cf_cv_system_name" in
+-	(*mingw32*|*mingw64*)
++	(*mingw32*|*mingw64*|*msys*|*cygwin*)
+ 		if test "x$with_exp_win32" = xyes ; then
+ 			LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo+port_win32"
+ 		else
+Index: dist.mk
+Prereq:  1.1628 
+--- ncurses-6.5-20240824+/dist.mk	2024-08-24 10:17:07.000000000 +0000
++++ ncurses-6.5-20240831/dist.mk	2024-08-31 09:52:35.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1628 2024/08/24 10:17:07 tom Exp $
++# $Id: dist.mk,v 1.1629 2024/08/31 09:52:35 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 = 5
+-NCURSES_PATCH = 20240824
++NCURSES_PATCH = 20240831
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: include/nc_mingw.h
+Prereq:  1.12 
+--- ncurses-6.5-20240824+/include/nc_mingw.h	2024-05-04 19:16:38.000000000 +0000
++++ ncurses-6.5-20240831/include/nc_mingw.h	2024-08-31 15:50:24.000000000 +0000
+@@ -31,12 +31,14 @@
+  * Author: Thomas Dickey, 2008-on                                           *
+  ****************************************************************************/
+ 
+-/* $Id: nc_mingw.h,v 1.12 2024/05/04 19:16:38 tom Exp $ */
++/* $Id: nc_mingw.h,v 1.13 2024/08/31 15:50:24 tom Exp $ */
+ 
+ #ifndef NC_MINGW_H
+ #define NC_MINGW_H 1
+ 
+-#ifdef _WIN32
++#include 
++
++#if defined(_WIN32) || defined(__MSYS__) || defined(__CYGWIN__)
+ 
+ #ifdef WINVER
+ #  if WINVER < 0x0501
+@@ -85,6 +87,6 @@
+ }
+ #endif
+ 
+-#endif /* _WIN32 */
++#endif /* _WIN32|__MSYS__|__CYGWIN__ */
+ 
+ #endif /* NC_MINGW_H */
+Index: include/nc_win32.h
+Prereq:  1.12 
+--- ncurses-6.5-20240824+/include/nc_win32.h	2024-05-04 19:17:03.000000000 +0000
++++ ncurses-6.5-20240831/include/nc_win32.h	2024-08-31 18:17:21.000000000 +0000
+@@ -31,15 +31,17 @@
+  * Author: Thomas Dickey, 2008-on                                           *
+  ****************************************************************************/
+ 
+-/* $Id: nc_win32.h,v 1.12 2024/05/04 19:17:03 tom Exp $ */
++/* $Id: nc_win32.h,v 1.13 2024/08/31 18:17:21 tom Exp $ */
+ 
+ #ifndef NC_WIN32_H
+ #define NC_WIN32_H 1
+ 
++#include 
++
+ #if defined(_WIN32) || defined(_WIN64)
+ 
+-#ifndef _NC_WINDOWS
+-#define _NC_WINDOWS
++#ifndef _NC_WINDOWS_NATIVE
++#define _NC_WINDOWS_NATIVE
+ #endif
+ 
+ #ifdef TERMIOS
+Index: include/win32_curses.h
+Prereq:  1.3 
+--- ncurses-6.5-20240824+/include/win32_curses.h	2021-06-17 21:26:02.000000000 +0000
++++ ncurses-6.5-20240831/include/win32_curses.h	2024-08-31 18:17:44.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2018-2021,2024 Thomas E. Dickey                                *
+  * Copyright 2008-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -31,7 +31,7 @@
+  * Author: Juergen Pfeifer, 2008-on                                         *
+  ****************************************************************************/
+ 
+-/* $Id: win32_curses.h,v 1.3 2021/06/17 21:26:02 tom Exp $ */
++/* $Id: win32_curses.h,v 1.4 2024/08/31 18:17:44 tom Exp $ */
+ 
+ /*
+  * This is the interface we use on Windows to mimic the control of the settings
+@@ -68,8 +68,5 @@
+ #undef sleep
+ #define sleep(n) Sleep((n) * 1000)
+ 
+-#undef gettimeofday
+-#define gettimeofday(tv,tz) _nc_gettimeofday(tv,tz)
+-
+ #endif /* _NC_WIN32_CURSES_H */
+ #endif /* _WIN32||_WIN64 */
+Index: ncurses/base/lib_getch.c
+Prereq:  1.146 
+--- ncurses-6.5-20240824+/ncurses/base/lib_getch.c	2023-04-29 18:57:12.000000000 +0000
++++ ncurses-6.5-20240831/ncurses/base/lib_getch.c	2024-08-31 15:54:49.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -44,7 +44,7 @@
+ #define NEED_KEY_EVENT
+ #include 
+ 
+-MODULE_ID("$Id: lib_getch.c,v 1.146 2023/04/29 18:57:12 tom Exp $")
++MODULE_ID("$Id: lib_getch.c,v 1.147 2024/08/31 15:54:49 tom Exp $")
+ 
+ #include 
+ 
+@@ -135,7 +135,7 @@
+ }
+ 
+ #ifdef USE_TERM_DRIVER
+-# if defined(_NC_WINDOWS) && !defined(EXP_WIN32_DRIVER)
++# if defined(_NC_WINDOWS_NATIVE) && !defined(EXP_WIN32_DRIVER)
+ static HANDLE
+ _nc_get_handle(int fd)
+ {
+@@ -163,7 +163,7 @@
+ 				   _nc_console_handle(sp->_ifd),
+ 				   delay EVENTLIST_2nd(evl));
+     } else
+-# elif defined(_NC_WINDOWS)
++# elif defined(_NC_WINDOWS_NATIVE)
+     /* if we emulate terminfo on console, we have to use the console routine */
+     if (IsTermInfoOnConsole(sp)) {
+ 	HANDLE fd = _nc_get_handle(sp->_ifd);
+@@ -315,7 +315,7 @@
+ 				 &buf);
+ 	    _nc_set_read_thread(FALSE);
+ 	} else
+-# elif defined(_NC_WINDOWS)
++# elif defined(_NC_WINDOWS_NATIVE)
+ 	if (NC_ISATTY(sp->_ifd) && IsTermInfoOnConsole(sp) && IsCbreak(sp))
+ 	    n = _nc_mingw_console_read(sp,
+ 				       _nc_get_handle(sp->_ifd),
+Index: ncurses/curses.priv.h
+Prereq:  1.689 
+--- ncurses-6.5-20240824+/ncurses/curses.priv.h	2024-05-11 19:05:45.000000000 +0000
++++ ncurses-6.5-20240831/ncurses/curses.priv.h	2024-08-31 10:46:01.000000000 +0000
+@@ -35,7 +35,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: curses.priv.h,v 1.689 2024/05/11 19:05:45 tom Exp $
++ * $Id: curses.priv.h,v 1.690 2024/08/31 10:46:01 Rafael.Kitover Exp $
+  *
+  *	curses.priv.h
+  *
+@@ -88,13 +88,24 @@
+ #endif
+ 
+ /* Some Windows related defines */
++
+ #undef _NC_WINDOWS
+-#if (defined(_WIN32) || defined(_WIN64))
++#if (defined(_WIN32) || defined(_WIN64__) || defined(__MSYS__) || defined(__CYGWIN__))
+ #define _NC_WINDOWS
+ #else
+ #undef EXP_WIN32_DRIVER
+ #endif
+ 
++#undef _NC_CYGWIN
++#if (defined(__MSYS__) || defined(__CYGWIN__))
++#define _NC_CYGWIN
++#endif
++
++#undef _NC_WINDOWS_NATIVE
++#if (defined(_WIN32) || defined(_WIN64))
++#define _NC_WINDOWS_NATIVE
++#endif
++
+ #undef _NC_MINGW
+ #if (defined(__MINGW32__) || defined(__MINGW64__))
+ #define _NC_MINGW
+@@ -197,7 +208,7 @@
+  * the path separator in configure doesn't work properly. So, if building
+  * for MinGW, we enforce the correct Windows PATH separator
+  */
+-#if defined(_NC_WINDOWS)
++#if defined(_NC_WINDOWS_NATIVE)
+ #  ifdef NCURSES_PATHSEP
+ #    undef NCURSES_PATHSEP
+ #  endif
+@@ -223,6 +234,15 @@
+ #endif
+ 
+ /*
++ * The stricmp() function is in MSVCRT, and cannot be called or linked from
++ * Cygwin runtime-dependent binaries currently. Use the POSIX strcaseccmp()
++ * function instead which is pretty much the same.
++ */
++#if defined(_NC_CYGWIN)
++#define stricmp(s1, s2) strcasecmp(s1, s2)
++#endif
++
++/*
+  * Not all platforms have memmove; some have an equivalent bcopy.  (Some may
+  * have neither).
+  */
+@@ -2238,7 +2258,7 @@
+  */
+ #if USE_WIDEC_SUPPORT
+ 
+-#if defined(_NC_WINDOWS) && !defined(_NC_MSC) && !defined(EXP_WIN32_DRIVER)
++#if defined(_NC_WINDOWS_NATIVE) && !defined(_NC_MSC) && !defined(EXP_WIN32_DRIVER)
+ /*
+  * MinGW has wide-character functions, but they do not work correctly.
+  */
+@@ -2252,9 +2272,9 @@
+ extern int __MINGW_NOTHROW _nc_mblen(const char *, size_t);
+ #define mblen(s,n) _nc_mblen(s, n)
+ 
+-#endif /* _NC_WINDOWS && !_NC_MSC */
++#endif /* _NC_WINDOWS_NATIVE && !_NC_MSC */
+ 
+-#if defined(_NC_WINDOWS) || defined(_NC_MINGW)
++#if defined(_NC_WINDOWS_NATIVE) || defined(_NC_MINGW)
+ /* see wcwidth.c */
+ extern NCURSES_EXPORT(int) mk_wcwidth(uint32_t);
+ #define wcwidth(ucs) _nc_wcwidth(ucs)
+Index: ncurses/tinfo/lib_napms.c
+Prereq:  1.28 
+--- ncurses-6.5-20240824+/ncurses/tinfo/lib_napms.c	2023-09-16 16:09:33.000000000 +0000
++++ ncurses-6.5-20240831/ncurses/tinfo/lib_napms.c	2024-08-31 15:55:00.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2023 Thomas E. Dickey                                     *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -52,7 +52,7 @@
+ #endif
+ #endif
+ 
+-MODULE_ID("$Id: lib_napms.c,v 1.28 2023/09/16 16:09:33 tom Exp $")
++MODULE_ID("$Id: lib_napms.c,v 1.29 2024/08/31 15:55:00 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ NCURSES_SP_NAME(napms) (NCURSES_SP_DCLx int ms)
+@@ -78,7 +78,7 @@
+ 	    request = remaining;
+ 	}
+     }
+-#elif defined(_NC_WINDOWS)
++#elif defined(_NC_WINDOWS_NATIVE)
+     Sleep((DWORD) ms);
+ #else
+     _nc_timed_wait(0, 0, ms, (int *) 0 EVENTLIST_2nd(0));
+Index: ncurses/tinfo/lib_print.c
+Prereq:  1.32 
+--- ncurses-6.5-20240824+/ncurses/tinfo/lib_print.c	2024-07-27 19:22:23.000000000 +0000
++++ ncurses-6.5-20240831/ncurses/tinfo/lib_print.c	2024-08-31 10:46:01.000000000 +0000
+@@ -40,7 +40,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_print.c,v 1.32 2024/07/27 19:22:23 tom Exp $")
++MODULE_ID("$Id: lib_print.c,v 1.33 2024/08/31 10:46:01 Rafael.Kitover Exp $")
+ 
+ NCURSES_EXPORT(int)
+ NCURSES_SP_NAME(mcprint) (NCURSES_SP_DCLx char *data, int len)
+@@ -98,7 +98,7 @@
+      * kernel will ship the contiguous clist items from the last write
+      * immediately.
+      */
+-#ifndef _NC_WINDOWS
++#ifndef _NC_WINDOWS_NATIVE
+     (void) sleep(0);
+ #endif
+     free(mybuf);
+Index: ncurses/tinfo/lib_setup.c
+Prereq:  1.242 
+--- ncurses-6.5-20240824+/ncurses/tinfo/lib_setup.c	2024-07-27 19:14:45.000000000 +0000
++++ ncurses-6.5-20240831/ncurses/tinfo/lib_setup.c	2024-08-31 21:15:54.000000000 +0000
+@@ -49,7 +49,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: lib_setup.c,v 1.242 2024/07/27 19:14:45 tom Exp $")
++MODULE_ID("$Id: lib_setup.c,v 1.244 2024/08/31 21:15:54 tom Exp $")
+ 
+ /****************************************************************************
+  *
+@@ -334,7 +334,6 @@
+ 	char *s;
+ 	char cc;
+ 	const char *skipped;
+-	int scanned;
+ 
+ 	s = memset(buf, '\0', sizeof(buf));
+ 	do {
+@@ -350,7 +349,7 @@
+ 	cc = '\0';
+ 	if (skipped != buf
+ 	    && *skipped != '\0'
+-	    && (scanned = sscanf(skip_csi(buf), "%d;%d%c", &y, &x, &cc)) == 3
++	    && sscanf(skip_csi(buf), "%d;%d%c", &y, &x, &cc) == 3
+ 	    && (cc == 'R')) {
+ 	    *row = y;
+ 	    *col = x;
+@@ -759,7 +758,7 @@
+     static int result = 0;
+ 
+     if (!initialized) {
+-#if defined(_NC_WINDOWS) && USE_WIDEC_SUPPORT
++#if defined(_NC_WINDOWS_NATIVE) && USE_WIDEC_SUPPORT
+ 	result = 1;
+ #elif HAVE_LANGINFO_CODESET
+ 	char *env = nl_langinfo(CODESET);
+Index: ncurses/tinfo/lib_win32con.c
+Prereq:  1.14 
+--- ncurses-6.5-20240824+/ncurses/tinfo/lib_win32con.c	2023-08-05 20:44:38.000000000 +0000
++++ ncurses-6.5-20240831/ncurses/tinfo/lib_win32con.c	2024-08-31 15:55:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2021,2023 Thomas E. Dickey                                *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -38,9 +38,9 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_win32con.c,v 1.14 2023/08/05 20:44:38 tom Exp $")
++MODULE_ID("$Id: lib_win32con.c,v 1.15 2024/08/31 15:55:10 tom Exp $")
+ 
+-#ifdef _NC_WINDOWS
++#if defined(_NC_WINDOWS)
+ 
+ #ifdef _NC_MINGW
+ #include 
+Index: ncurses/tinfo/lib_win32util.c
+Prereq:  1.4 
+--- ncurses-6.5-20240824+/ncurses/tinfo/lib_win32util.c	2023-06-17 17:19:06.000000000 +0000
++++ ncurses-6.5-20240831/ncurses/tinfo/lib_win32util.c	2024-08-31 15:55:16.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2021,2023 Thomas E. Dickey                                *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -34,9 +34,9 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_win32util.c,v 1.4 2023/06/17 17:19:06 tom Exp $")
++MODULE_ID("$Id: lib_win32util.c,v 1.5 2024/08/31 15:55:16 tom Exp $")
+ 
+-#ifdef _NC_WINDOWS
++#ifdef _NC_WINDOWS_NATIVE
+ #include 
+ 
+ #ifdef _NC_CHECK_MINTTY
+@@ -131,4 +131,4 @@
+ }
+ #endif // HAVE_GETTIMEOFDAY == 2
+ 
+-#endif // _NC_WINDOWS
++#endif // _NC_WINDOWS_NATIVE
+Index: ncurses/tinfo/tinfo_driver.c
+Prereq:  1.75 
+--- ncurses-6.5-20240824+/ncurses/tinfo/tinfo_driver.c	2024-05-11 19:20:44.000000000 +0000
++++ ncurses-6.5-20240831/ncurses/tinfo/tinfo_driver.c	2024-08-31 10:46:01.000000000 +0000
+@@ -52,7 +52,7 @@
+ # endif
+ #endif
+ 
+-MODULE_ID("$Id: tinfo_driver.c,v 1.75 2024/05/11 19:20:44 tom Exp $")
++MODULE_ID("$Id: tinfo_driver.c,v 1.76 2024/08/31 10:46:01 Rafael.Kitover Exp $")
+ 
+ /*
+  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
+@@ -1504,7 +1504,7 @@
+ 
+ static DRIVER_ENTRY DriverTable[] =
+ {
+-#ifdef _NC_WINDOWS
++#ifdef USE_WIN32CON_DRIVER
+     {"win32console", &_nc_WIN_DRIVER},
+ #endif
+     {"tinfo", &_nc_TINFO_DRIVER}	/* must be last */
+Index: ncurses/tinfo/write_entry.c
+Prereq:  1.133 
+--- ncurses-6.5-20240824+/ncurses/tinfo/write_entry.c	2024-07-27 19:15:16.000000000 +0000
++++ ncurses-6.5-20240831/ncurses/tinfo/write_entry.c	2024-08-31 10:46:01.000000000 +0000
+@@ -42,7 +42,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: write_entry.c,v 1.133 2024/07/27 19:15:16 tom Exp $")
++MODULE_ID("$Id: write_entry.c,v 1.134 2024/08/31 10:46:01 Rafael.Kitover Exp $")
+ 
+ #if 1
+ #define TRACE_OUT(p) DEBUG(2, p)
+@@ -200,7 +200,7 @@
+ 
+ 	if ((rc = stat(path, &statbuf)) == -1) {
+ 	    rc = mkdir(path
+-#ifndef _NC_WINDOWS
++#ifndef _NC_WINDOWS_NATIVE
+ 		       ,0777
+ #endif
+ 		);
+Index: ncurses/trace/lib_trace.c
+Prereq:  1.106 
+--- ncurses-6.5-20240824+/ncurses/trace/lib_trace.c	2024-02-24 18:28:19.000000000 +0000
++++ ncurses-6.5-20240831/ncurses/trace/lib_trace.c	2024-08-31 10:48:22.000000000 +0000
+@@ -48,7 +48,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_trace.c,v 1.106 2024/02/24 18:28:19 tom Exp $")
++MODULE_ID("$Id: lib_trace.c,v 1.107 2024/08/31 10:48:22 tom Exp $")
+ 
+ NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
+ 
+@@ -261,7 +261,7 @@
+ 	if ((pthread_self))
+ # endif
+ 	    fprintf(fp, "%#" PRIxPTR ":",
+-#ifdef _NC_WINDOWS
++#ifdef _NC_WINDOWS_NATIVE
+ 		    CASTxPTR(pthread_self().p)
+ #else
+ 		    CASTxPTR(pthread_self())
+Index: ncurses/widechar/widechars.c
+Prereq:  1.9 
+--- ncurses-6.5-20240824+/ncurses/widechar/widechars.c	2020-08-29 16:22:03.000000000 +0000
++++ ncurses-6.5-20240831/ncurses/widechar/widechars.c	2024-08-31 15:55:27.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018,2020 Thomas E. Dickey                                     *
++ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
+  * Copyright 2012,2013 Free Software Foundation, Inc.                       *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -31,9 +31,9 @@
+ 
+ #if USE_WIDEC_SUPPORT
+ 
+-MODULE_ID("$Id: widechars.c,v 1.9 2020/08/29 16:22:03 juergen Exp $")
++MODULE_ID("$Id: widechars.c,v 1.10 2024/08/31 15:55:27 tom Exp $")
+ 
+-#if (defined(_NC_WINDOWS)) && !defined(_NC_MSC)
++#if defined(_NC_MINGW)
+ /*
+  * MinGW has wide-character functions, but they do not work correctly.
+  */
+@@ -148,6 +148,6 @@
+     return result;
+ }
+ 
+-#endif /* _NC_WINDOWS */
++#endif /* _NC_MINGW */
+ 
+ #endif /* USE_WIDEC_SUPPORT */
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20240824+/package/debian-mingw/changelog	2024-08-24 10:17:07.000000000 +0000
++++ ncurses-6.5-20240831/package/debian-mingw/changelog	2024-08-31 09:52:35.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240824) unstable; urgency=low
++ncurses6td (6.5+20240831) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 24 Aug 2024 06:17:07 -0400
++ -- Thomas E. Dickey   Sat, 31 Aug 2024 05:52:35 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20240824+/package/debian-mingw64/changelog	2024-08-24 10:17:07.000000000 +0000
++++ ncurses-6.5-20240831/package/debian-mingw64/changelog	2024-08-31 09:52:35.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240824) unstable; urgency=low
++ncurses6td (6.5+20240831) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 24 Aug 2024 06:17:07 -0400
++ -- Thomas E. Dickey   Sat, 31 Aug 2024 05:52:35 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20240824+/package/debian/changelog	2024-08-24 10:17:07.000000000 +0000
++++ ncurses-6.5-20240831/package/debian/changelog	2024-08-31 09:52:35.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240824) unstable; urgency=low
++ncurses6td (6.5+20240831) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 24 Aug 2024 06:17:07 -0400
++ -- Thomas E. Dickey   Sat, 31 Aug 2024 05:52:35 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.663 
+--- ncurses-6.5-20240824+/package/mingw-ncurses.nsi	2024-08-24 10:17:07.000000000 +0000
++++ ncurses-6.5-20240831/package/mingw-ncurses.nsi	2024-08-31 09:52:35.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.663 2024/08/24 10:17:07 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.664 2024/08/31 09:52:35 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "0824"
++!define VERSION_MMDD  "0831"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20240824+/package/mingw-ncurses.spec	2024-08-24 10:17:07.000000000 +0000
++++ ncurses-6.5-20240831/package/mingw-ncurses.spec	2024-08-31 09:52:35.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20240824
++Release: 20240831
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20240824+/package/ncurses.spec	2024-08-24 10:17:07.000000000 +0000
++++ ncurses-6.5-20240831/package/ncurses.spec	2024-08-31 09:52:35.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20240824
++Release: 20240831
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20240824+/package/ncursest.spec	2024-08-24 10:17:07.000000000 +0000
++++ ncurses-6.5-20240831/package/ncursest.spec	2024-08-31 09:52:35.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20240824
++Release: 20240831
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/dots_termcap.c
+Prereq:  1.32 
+--- ncurses-6.5-20240824+/test/dots_termcap.c	2023-02-25 18:11:21.000000000 +0000
++++ ncurses-6.5-20240831/test/dots_termcap.c	2024-08-31 15:55:46.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2013-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,14 +30,14 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: dots_termcap.c,v 1.32 2023/02/25 18:11:21 tom Exp $
++ * $Id: dots_termcap.c,v 1.33 2024/08/31 15:55:46 tom Exp $
+  *
+  * A simple demo of the termcap interface.
+  */
+ #define USE_TINFO
+ #include 
+ 
+-#if !defined(_NC_WINDOWS)
++#if !defined(_NC_WINDOWS_NATIVE)
+ #include 
+ #endif
+ 
+@@ -162,7 +162,7 @@
+ my_napms(int ms)
+ {
+     if (ms > 0) {
+-#if defined(_NC_WINDOWS)
++#if defined(_NC_WINDOWS_NATIVE)
+ 	Sleep((unsigned int) ms);
+ #else
+ 	struct timeval data;
+Index: test/dots_xcurses.c
+Prereq:  1.29 
+--- ncurses-6.5-20240824+/test/dots_xcurses.c	2023-01-07 17:21:48.000000000 +0000
++++ ncurses-6.5-20240831/test/dots_xcurses.c	2024-08-31 15:55:52.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2017 Free Software Foundation, Inc.                            *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,13 +30,13 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: dots_xcurses.c,v 1.29 2023/01/07 17:21:48 tom Exp $
++ * $Id: dots_xcurses.c,v 1.30 2024/08/31 15:55:52 tom Exp $
+  *
+  * A simple demo of the wide-curses interface used for comparison with termcap.
+  */
+ #include 
+ 
+-#if !defined(_NC_WINDOWS)
++#if !defined(_NC_WINDOWS_NATIVE)
+ #include 
+ #endif
+ 
+Index: test/rain.c
+Prereq:  1.57 
+--- ncurses-6.5-20240824+/test/rain.c	2022-12-04 00:40:11.000000000 +0000
++++ ncurses-6.5-20240831/test/rain.c	2024-08-31 15:56:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2022 Thomas E. Dickey                                *
++ * Copyright 2018-2022,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: rain.c,v 1.57 2022/12/04 00:40:11 tom Exp $
++ * $Id: rain.c,v 1.58 2024/08/31 15:56:10 tom Exp $
+  */
+ #include 
+ #include 
+@@ -229,7 +229,7 @@
+      * Find myself in the list of threads so we can count the number of loops.
+      */
+     for (mystats = 0; mystats < MAX_THREADS; ++mystats) {
+-#if defined(_NC_WINDOWS) && !defined(__WINPTHREADS_VERSION)
++#if defined(_NC_WINDOWS_NATIVE) && !defined(__WINPTHREADS_VERSION)
+ 	if (drop_threads[mystats].myself.p == pthread_self().p)
+ #else
+ 	if (drop_threads[mystats].myself == pthread_self())
+Index: test/test.priv.h
+Prereq:  1.218 
+--- ncurses-6.5-20240824+/test/test.priv.h	2024-02-10 14:40:03.000000000 +0000
++++ ncurses-6.5-20240831/test/test.priv.h	2024-08-31 10:46:01.000000000 +0000
+@@ -30,7 +30,7 @@
+ /****************************************************************************
+  *  Author: Thomas E. Dickey                    1996-on                     *
+  ****************************************************************************/
+-/* $Id: test.priv.h,v 1.218 2024/02/10 14:40:03 tom Exp $ */
++/* $Id: test.priv.h,v 1.219 2024/08/31 10:46:01 Rafael.Kitover Exp $ */
+ 
+ #ifndef __TEST_PRIV_H
+ #define __TEST_PRIV_H 1
+@@ -1047,12 +1047,12 @@
+ #define EXIT_FAILURE 1
+ #endif
+ 
+-#undef _NC_WINDOWS
++#undef _NC_WINDOWS_NATIVE
+ #if (defined(_WIN32) || defined(_WIN64))
+-#define _NC_WINDOWS 1
++#define _NC_WINDOWS_NATIVE 1
+ #endif
+ 
+-#if defined(_NC_WINDOWS) || defined(USE_WIN32CON_DRIVER)
++#if defined(_NC_WINDOWS_NATIVE) || defined(USE_WIN32CON_DRIVER)
+ 
+ #if defined(PDCURSES)
+ #ifdef WINVER
+@@ -1184,7 +1184,7 @@
+ #define InitAndCatch(init,handler) do { init; CATCHALL(handler); } while (0)
+ #endif
+ 
+-#if defined(_NC_WINDOWS) || defined(USE_WIN32CON_DRIVER)
++#if defined(_NC_WINDOWS_NATIVE) || defined(USE_WIN32CON_DRIVER)
+ #define SetupAlarm(opt)	(void)opt
+ #else
+ #define SetupAlarm(opt)	if (opt) alarm((unsigned)opt)
+Index: test/test_mouse.c
+Prereq:  1.31 
+--- ncurses-6.5-20240824+/test/test_mouse.c	2024-03-30 20:45:31.000000000 +0000
++++ ncurses-6.5-20240831/test/test_mouse.c	2024-08-31 10:46:01.000000000 +0000
+@@ -22,7 +22,7 @@
+  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+  ****************************************************************************/
+ /*
+- * $Id: test_mouse.c,v 1.31 2024/03/30 20:45:31 tom Exp $
++ * $Id: test_mouse.c,v 1.32 2024/08/31 10:46:01 Rafael.Kitover Exp $
+  *
+  * Author: Leonid S Usov
+  *
+@@ -31,7 +31,7 @@
+ 
+ #include 
+ 
+-#if defined(NCURSES_MOUSE_VERSION) && !defined(_NC_WINDOWS)
++#if defined(NCURSES_MOUSE_VERSION) && !defined(_NC_WINDOWS_NATIVE)
+ 
+ static int logoffset = 0;
+ 
+Index: test/widechars.h
+--- ncurses-6.5-20240824+/test/widechars.h	2020-09-13 00:20:21.000000000 +0000
++++ ncurses-6.5-20240831/test/widechars.h	2024-08-31 15:56:21.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018,2020 Thomas E. Dickey                                     *
++ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
+  * Copyright 2012 Free Software Foundation, Inc.                            *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -34,7 +34,7 @@
+ 
+ #if USE_WIDEC_SUPPORT
+ 
+-#if defined(_NC_WINDOWS) && !defined(_MSC_VER) && !defined(EXP_WIN32_DRIVER)
++#if defined(_NC_MINGW)
+ /*
+  * MinGW has wide-character functions, but they do not work correctly.
+  */
diff --git a/packages/ncurses/6.5/ncurses-6.5-20240914.patch b/packages/ncurses/6.5/ncurses-6.5-20240914.patch
new file mode 100644
index 0000000000..e87cda0998
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20240914.patch
@@ -0,0 +1,11059 @@
+# ncurses 6.5 - patch 20240914 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20240914.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Sep 15 00:18:41 UTC 2024
+# ------------------------------------------------------------------------------
+# NEWS                                    |   12 
+# VERSION                                 |    2 
+# dist.mk                                 |    4 
+# doc/html/NCURSES-Programming-HOWTO.html | 4209 +++++++++++++++---------------
+# doc/html/man/captoinfo.1m.html          |   53 
+# doc/html/man/curs_bkgd.3x.html          |   14 
+# doc/html/man/curs_bkgrnd.3x.html        |   30 
+# doc/html/man/curs_extend.3x.html        |   14 
+# doc/html/man/curs_get_wch.3x.html       |   18 
+# doc/html/man/curs_getch.3x.html         |   53 
+# doc/html/man/curs_initscr.3x.html       |    8 
+# doc/html/man/curs_inopts.3x.html        |   72 
+# doc/html/man/curs_ins_wstr.3x.html      |   10 
+# doc/html/man/curs_instr.3x.html         |   10 
+# doc/html/man/curs_inwstr.3x.html        |   16 
+# doc/html/man/curs_kernel.3x.html        |  106 
+# doc/html/man/curs_outopts.3x.html       |   28 
+# doc/html/man/curs_refresh.3x.html       |   10 
+# doc/html/man/curs_scroll.3x.html        |   32 
+# doc/html/man/curs_termcap.3x.html       |   75 
+# doc/html/man/curs_terminfo.3x.html      |  284 +-
+# doc/html/man/curs_util.3x.html          |    8 
+# doc/html/man/curs_variables.3x.html     |   16 
+# doc/html/man/curs_window.3x.html        |   42 
+# doc/html/man/infocmp.1m.html            |   25 
+# doc/html/man/legacy_coding.3x.html      |   14 
+# doc/html/man/ncurses.3x.html            |  625 ++--
+# doc/html/man/tabs.1.html                |   75 
+# doc/html/man/terminfo.5.html            |    4 
+# doc/html/man/tic.1m.html                |   10 
+# doc/html/man/tput.1.html                |   12 
+# man/captoinfo.1m                        |   11 
+# man/curs_bkgd.3x                        |   10 
+# man/curs_bkgrnd.3x                      |   19 
+# man/curs_extend.3x                      |    6 
+# man/curs_get_wch.3x                     |   14 
+# man/curs_getch.3x                       |   15 
+# man/curs_initscr.3x                     |   10 
+# man/curs_inopts.3x                      |   25 
+# man/curs_ins_wstr.3x                    |    6 
+# man/curs_instr.3x                       |   26 
+# man/curs_inwstr.3x                      |   28 
+# man/curs_kernel.3x                      |  169 -
+# man/curs_outopts.3x                     |   65 
+# man/curs_refresh.3x                     |    6 
+# man/curs_scroll.3x                      |   29 
+# man/curs_termcap.3x                     |  295 +-
+# man/curs_terminfo.3x                    |  105 
+# man/curs_util.3x                        |   10 
+# man/curs_variables.3x                   |   60 
+# man/curs_window.3x                      |   38 
+# man/infocmp.1m                          |   41 
+# man/legacy_coding.3x                    |   17 
+# man/manlinks.sed                        |    3 
+# man/ncurses.3x                          |   49 
+# man/tabs.1                              |   42 
+# man/terminfo.tail                       |    4 
+# man/tic.1m                              |    6 
+# man/tput.1                              |    6 
+# misc/ncurses-config.in                  |    6 
+# misc/terminfo.src                       |   18 
+# ncurses/tinfo/lib_tputs.c               |   10 
+# 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 
+# 69 files changed, 3799 insertions(+), 3263 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4169 
+--- ncurses-6.5-20240831+/NEWS	2024-08-31 21:21:26.000000000 +0000
++++ ncurses-6.5-20240914/NEWS	2024-09-14 23:14:09.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4169 2024/08/31 21:21:26 tom Exp $
++-- $Id: NEWS,v 1.4175 2024/09/14 23:14:09 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.
+ 
++20240914
++	+ modify _nc_flush() to also flush stderr to help the flash capability
++	  to work in bash (patch by Harm te Hennepe, cf: 20201128)
++	+ omit -g and -fXXX flags from CFLAGS in misc/ncurses-config.in
++	+ improve formatting/style of manpages (patches by Branden Robinson).
++	+ improve examples in NCURSES-Programming-HOWTO.html
++	+ update comments in terminfo.src -TD
++
+ 20240831
+ 	+ build-fix for a case in msys2 where gettimeofday() was available but
+ 	  the fallback was partly configured.
+@@ -4387,7 +4395,7 @@
+ 20140621
+ 	+ change shared-library suffix for AIX 5 and 6 to ".so", avoiding
+ 	  conflict with the static library (report by Ben Lentz).
+-	+ document RPATH_LIST in INSTALLATION file, as part of workarounds for
++	+ document RPATH_LIST in INSTALL file, as part of workarounds for
+ 	  upgrading an ncurses library using the "--with-shared" option.
+ 	+ modify test/ncurses.c c/C tests to cycle through subsets of the
+ 	  total number of colors, to better illustrate 8/16/88/256-colors by
+Index: VERSION
+--- ncurses-6.5-20240831+/VERSION	2024-08-31 09:52:35.000000000 +0000
++++ ncurses-6.5-20240914/VERSION	2024-09-14 12:14:00.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20240831
++5:0:10	6.5	20240914
+Index: dist.mk
+Prereq:  1.1629 
+--- ncurses-6.5-20240831+/dist.mk	2024-08-31 09:52:35.000000000 +0000
++++ ncurses-6.5-20240914/dist.mk	2024-09-14 12:14:00.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1629 2024/08/31 09:52:35 tom Exp $
++# $Id: dist.mk,v 1.1631 2024/09/14 12:14:00 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 = 5
+-NCURSES_PATCH = 20240831
++NCURSES_PATCH = 20240914
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/NCURSES-Programming-HOWTO.html
+--- ncurses-6.5-20240831+/doc/html/NCURSES-Programming-HOWTO.html	2023-10-21 16:35:57.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/NCURSES-Programming-HOWTO.html	2024-09-08 21:12:23.000000000 +0000
+@@ -15,21 +15,35 @@
+       
                                                                                                    NCURSES
+       Programming HOWTO
                                                                                                    
+ 
+-      
                                                                                                    Pradeep
+-      Padala
                                                                                                    
++      
                                                                                                    
++        
++        
                                                                                                    Pradeep
++        Padala
                                                                                                    
++
++        
                                                                                                    
++          
                                                                                                    
++            
                                                                                                    
++            
                                                                                                    
++          
                                                                                                    
++        
                                                                                                    
+ 
+-      
                                                                                                    
+-        
                                                                                                    
+-          
                                                                                                    
+-          
                                                                                                    
++        
                                                                                                    Thomas E.
++        Dickey
                                                                                                    
++
++        
                                                                                                    
++          
                                                                                                    
++            
                                                                                                    
++            
                                                                                                    
++          
                                                                                                    
+         
                                                                                                    
+       
                                                                                                    
+ 
+-      
                                                                                                    v1.9, 2005-06-20
                                                                                                    
++      
                                                                                                    v2.1, 2024-09-08
                                                                                                    
+ 
+       
                                                                                                    
+-        
++        
                                                                                                    
+           
+             
+ 
+           
++            
++            
++            
++          
++
++          
++            
++          
++
++          
+             
+             
+             
+@@ -179,14 +205,14 @@
+ 
+       
                                                                                                    
+         
                                                                                                    
+-          
++          
+           
                                                                                                    This
+           document is intended to be an "All in One" guide for
+           programming with ncurses and its sister libraries. We
+           graduate from a simple "Hello World" program to more
+           complex form manipulation. No prior experience in ncurses
+           is assumed. Send comments to this
++          "mailto:bug-ncurses@gnu.org" target="_top">this
+           address
+           
                                                                                                    
+         
                                                                                                    
+@@ -223,8 +249,8 @@
+ 
+             
                                                                                                    
+               
                                                                                                    
+-                
                                                                                                    1.6.1. Readily available
+-                formats from tldp.org
                                                                                                    
++                
                                                                                                    1.6.1. Alternative
++                formats
                                                                                                    
+ 
+                 
                                                                                                    1.6.2. Building from
+                 source
                                                                                                    
+@@ -299,7 +325,7 @@
+             
                                                                                                    6.1. addch() class of
+             functions
                                                                                                    
+ 
+-            
                                                                                                    6.2. mvaddch(), waddch() and
++            
                                                                                                    6.2. mvaddch(), waddch() and
+             mvwaddch()
                                                                                                    
+ 
+             
                                                                                                    6.3. printw() class of
+@@ -658,7 +684,7 @@
+       of bytes. All the capabilities (such as moving the cursor to
+       a new location, erasing part of the screen, scrolling the
+       screen, changing modes, etc.) of terminals could be accessed
+-      through these series of bytes. These control seeuqnces are
++      through these series of bytes. These control sequences are
+       usually called escape sequences, because they start with an
+       escape(0x1B) character. Even today, with proper emulation, we
+       can send escape sequences to the emulator and achieve the
+@@ -767,36 +793,41 @@
+         package
+         
                                                                                                    
+ 
+-        
                                                                                                    NCURSES can be obtained from ftp://ftp.gnu.org/pub/gnu/ncurses/ncurses.tar.gz
+-        or any of the ftp sites mentioned in https://www.gnu.org/order/ftp.html.
                                                                                                    
++        
                                                                                                    NCURSES can be obtained from
                                                                                                    
+ 
+-        
                                                                                                    Read the README and INSTALL files for details on to how
+-        to install it. It usually involves the following
+-        operations.
                                                                                                    
++        
                                                                                                      
++          
                                                                                                    • 
++            
                                                                                                      the home page at https://invisible-island.net, as well as
                                                                                                      
++          
                                                                                                      • 
+ 
+-        
                                                                                                          tar zxvf ncurses<version>.tar.gz  # unzip and untar the archive
+-    cd ncurses<version>               # cd to the directory
+-    ./configure                             # configure the build according to your 
+-                                            # environment
+-    make                                    # make it
+-    su root                                 # become root
+-    make install                            # install it
                                                                                                      
+-        
                                                                                                      Using the
+-        RPM
+-        
                                                                                                      
++          
                                                                                                    • 
++            
                                                                                                      https://ftp.gnu.org/pub/gnu/ncurses/
++            or
                                                                                                      
++          
                                                                                                      • 
+ 
+-        
                                                                                                      NCURSES RPM can be found and downloaded from https://rpmfind.net
+-        . The RPM can be installed with the following command after
+-        becoming root.
                                                                                                      
++          
                                                                                                    • 
++            
                                                                                                      any of the mirror sites mentioned in https://www.gnu.org/order/ftp.html.
                                                                                                      
++          
                                                                                                      • 
++        
                                                                                                    
++
++        
                                                                                                    Read the README and INSTALL files for details on to how to install
++        it. It usually involves the following operations.
                                                                                                    
+ 
+         
                                                                                                        rpm -i <downloaded rpm>
                                                                                                    
++        "PROGRAMLISTING">    tar zxvf ncurses<version>.tar.gz  # unzip and untar the archive
++    cd ncurses<version>               # cd to the directory
++    ./configure                       # configure the build according to your
++                                      # environment
++    make                              # make it
++    su root                           # become root
++    make install                      # install it
+       
                                                                                                    
+ 
+       
                                                                                                    
+@@ -819,10 +850,10 @@
+         
                                                                                                    1.5. About the Programs
                                                                                                    
+ 
+-        
                                                                                                    All the programs in the document are available in zipped
+-        form here. Unzip and untar it. The directory
++        
                                                                                                    All the programs in the document are available in
++        gzipped form here. Ungzip and untar it. The directory
+         structure looks like this.
                                                                                                    
+ 
+         
                                                                                                    ncurses
+@@ -850,7 +881,7 @@
+     |
+     |----> hanoi.c   -- The Towers of Hanoi Solver
+     |----> life.c    -- The Game of Life demo
+-    |----> magic.c   -- An Odd Order Magic Square builder 
++    |----> magic.c   -- An Odd Order Magic Square builder
+     |----> queens.c  -- The famous N-Queens Solver
+     |----> shuffle.c -- A fun game, if you have time to kill
+     |----> tt.c      -- A very trivial typing tutor
+@@ -866,23 +897,23 @@
+     |                               -- rt from box()
+     |----> printw_example.c      -- A very simple printw() example
+     |----> scanw_example.c       -- A very simple getstr() example
+-    |----> simple_attr.c         -- A program that can print a c file with 
++    |----> simple_attr.c         -- A program that can print a c file with
+     |                               -- comments in attribute
+     |----> simple_color.c        -- A simple example demonstrating colors
+-    |----> simple_key.c          -- A menu accessible with keyboard UP, DOWN 
++    |----> simple_key.c          -- A menu accessible with keyboard UP, DOWN
+     |                               -- arrows
+     |----> temp_leave.c          -- Demonstrates temporarily leaving curses mode
+     |----> win_border.c          -- Shows Creation of windows and borders
+     |----> with_chgat.c          -- chgat() usage example
+ 
+-  forms 
++  forms
+     |
+     |----> form_attrib.c     -- Usage of field attributes
+     |----> form_options.c    -- Usage of field options
+     |----> form_simple.c     -- A simple form example
+     |----> form_win.c        -- Demo of windows associated with forms
+ 
+-  menus 
++  menus
+     |
+     |----> menu_attrib.c     -- Usage of menu attributes
+     |----> menu_item_data.c  -- Usage of item_name(), etc. functions
+@@ -894,9 +925,9 @@
+     |----> menu_userptr.c    -- Usage of user pointer
+     |----> menu_win.c        -- Demo of windows associated with menus
+ 
+-  panels 
++  panels
+     |
+-    |----> panel_browse.c    -- Panel browsing through tab. Usage of user 
++    |----> panel_browse.c    -- Panel browsing through tab. Usage of user
+     |                           -- pointer
+     |----> panel_hide.c      -- Hiding and Un hiding of panels
+     |----> panel_resize.c    -- Moving and resizing of panels
+@@ -914,12 +945,6 @@
+         
                                                                                                    For every example, I have included path name for the
+         file relative to the examples directory.
                                                                                                    
+ 
+-        
                                                                                                    If you prefer browsing individual programs, point your
+-        browser to https://tldp.org/HOWTO/NCURSES-Programming-HOWTO/ncurses_programs/
                                                                                                    
+-
+         
                                                                                                    All the programs are released under the same license
+         that is used by ncurses (MIT-style). This gives you the
+         ability to do pretty much anything other than claiming them
+@@ -933,40 +958,38 @@
+         
                                                                                                    1.6. Other Formats of the document
                                                                                                    
+ 
+-        
                                                                                                    This howto is also available in various other formats on
+-        the tldp.org site. Here are the links to other formats of
+-        this document.
                                                                                                    
++        
                                                                                                    This howto is also available in other formats. Here are
++        the links to other formats of this document.
                                                                                                    
+ 
+         
                                                                                                    
+           
                                                                                                    
+ 
+           
                                                                                                    1.6.1. Readily available formats from
+-          tldp.org
                                                                                                    
++          "LISTFORMATS">1.6.1. Alternative formats
+ 
+           
+         
                                                                                                    
+@@ -977,37 +1000,29 @@
+           
                                                                                                    1.6.2. Building from source
                                                                                                    
+ 
+-          
                                                                                                    If above links are broken or if you want to experiment
+-          with sgml read on.
                                                                                                    
++          
                                                                                                    The sources for this HOWTO can be retrieved from
                                                                                                    
+ 
+-          
                                                                                                    
    Get both the source and the tar,gzipped programs, available at
+-        http://cvsview.tldp.org/index.cgi/LDP/howto/docbook/
+-        NCURSES-HOWTO/NCURSES-Programming-HOWTO.sgml
+-        http://cvsview.tldp.org/index.cgi/LDP/howto/docbook/
+-        NCURSES-HOWTO/ncurses_programs.tar.gz
+-
+-    Unzip ncurses_programs.tar.gz with
+-    tar zxvf ncurses_programs.tar.gz
+-
+-    Use jade to create various formats. For example if you just want to create
+-    the multiple html files, you would use
+-        jade -t sgml -i html -d <path to docbook html stylesheet>
+-        NCURSES-Programming-HOWTO.sgml
+-    to get pdf, first create a single html file of the HOWTO with 
+-        jade -t sgml -i html -d <path to docbook html stylesheet> -V nochunks
+-        NCURSES-Programming-HOWTO.sgml > NCURSES-ONE-BIG-FILE.html
+-    then use htmldoc to get pdf file with
+-        htmldoc --size universal -t pdf --firstpage p1 -f <output file name.pdf>
+-        NCURSES-ONE-BIG-FILE.html
+-    for ps, you would use
+-        htmldoc --size universal -t ps --firstpage p1 -f <output file name.ps>
+-        NCURSES-ONE-BIG-FILE.html
                                                                                                    
+-          
                                                                                                    See LDP Author guide for more details. If all else
+-          fails, mail me at ppadala@gmail.com
                                                                                                    
++          
                                                                                                    
++            
++
++            
                                                                                                    https://github.com/ThomasDickey/ncurses-howto-snapshots
                                                                                                    
++          
                                                                                                    
++
++          
                                                                                                    These tools were used to format the HOWTO and build
++          the examples:
                                                                                                    
++
++          
                                                                                                      
++            
                                                                                                    • 
++              
                                                                                                      docbook-utils (a Debian package)
                                                                                                      
++            
                                                                                                      • 
++
++            
                                                                                                    • 
++              
                                                                                                      gcc
                                                                                                      
++            
                                                                                                      • 
++          
                                                                                                    
+         
                                                                                                    
+       
+ 
+@@ -1017,21 +1032,22 @@
+         
                                                                                                    1.7.
+         Credits
                                                                                                    
+ 
+-        
                                                                                                    I thank Sharath and Emre Akbas for helping me with few
+-        sections. The introduction was initially written by
+-        sharath. I rewrote it with few excerpts taken from his
+-        initial work. Emre helped in writing printw and scanw
+-        sections.
                                                                                                    
+-
+-        
                                                                                                    Perl equivalents of the example programs are contributed
+-        by Anuradha Ratnaweera.
                                                                                                    
+-
+-        
                                                                                                    Then comes Ravi Parimi, my dearest friend, who has
+-        been on this project before even one line was written. He
+-        constantly bombarded me with suggestions and patiently
++        
                                                                                                    I thank Sharath and Emre Akbas for
++        helping me with few sections. The introduction was
++        initially written by Sharath. I rewrote it with few
++        excerpts taken from his initial work. Emre helped in
++        writing printw and scanw sections.
                                                                                                    
++
++        
                                                                                                    Perl equivalents of the example programs were
++        contributed by Anuradha Ratnaweera.
                                                                                                    
++
++        
                                                                                                    Then comes Ravi Parimi, my dearest friend, who
++        has been on this project before even one line was written.
++        He constantly bombarded me with suggestions and patiently
+         reviewed the whole text. He also checked each program on
+         Linux and Solaris.
                                                                                                    
+       
+@@ -1150,15 +1166,16 @@
+           
                                                                                                    #include <curses.h>
+ 
+-int main()
+-{       
+-        initscr();                      /* Start curses mode              */
+-        printw("Hello World !!!");      /* Print Hello World              */
+-        refresh();                      /* Print it on to the real screen */
+-        getch();                        /* Wait for user input */
+-        endwin();                       /* End curses mode                */
++int
++main(void)
++{
++    initscr();                  /* Start curses mode              */
++    printw("Hello World !!!");  /* Print Hello World              */
++    refresh();                  /* Print it on to the real screen */
++    getch();                    /* Wait for user input */
++    endwin();                   /* End curses mode                */
+ 
+-        return 0;
++    return 0;
+ }
                                                                                                    
+         
+       
+@@ -1388,34 +1405,36 @@
+           
                                                                                                    #include <curses.h>
+ 
+-int main()
+-{       int ch;
++int
++main(void)
++{
++    int ch;
+ 
+-        initscr();                      /* Start curses mode            */
+-        raw();                          /* Line buffering disabled      */
+-        keypad(stdscr, TRUE);           /* We get F1, F2 etc..          */
+-        noecho();                       /* Don't echo() while we do getch */
+-
+-        printw("Type any character to see it in bold\n");
+-        ch = getch();                   /* If raw() hadn't been called
+-                                         * we have to press enter before it
+-                                         * gets to the program          */
+-        if(ch == KEY_F(1))              /* Without keypad enabled this will */
+-                printw("F1 Key pressed");/*  not get to us either       */
+-                                        /* Without noecho() some ugly escape
+-                                         * characters might have been printed
+-                                         * on screen                    */
+-        else
+-        {       printw("The pressed key is ");
+-                attron(A_BOLD);
+-                printw("%c", ch);
+-                attroff(A_BOLD);
+-        }
+-        refresh();                      /* Print it on to the real screen */
+-        getch();                        /* Wait for user input */
+-        endwin();                       /* End curses mode                */
++    initscr();                  /* Start curses mode            */
++    raw();                      /* Line buffering disabled      */
++    keypad(stdscr, TRUE);       /* We get F1, F2 etc..          */
++    noecho();                   /* Don't echo() while we do getch */
++
++    printw("Type any character to see it in bold\n");
++    ch = getch();               /* If raw() hadn't been called
++                                 * we have to press enter before it
++                                 * gets to the program          */
++    if (ch == KEY_F(1))         /* Without keypad enabled this will */
++        printw("F1 Key pressed"); /*  not get to us either       */
++                                /* Without noecho() some ugly escape
++                                 * characters might have been printed
++                                 * on screen                    */
++    else {
++        printw("The pressed key is ");
++        attron(A_BOLD);
++        printw("%c", ch);
++        attroff(A_BOLD);
++    }
++    refresh();                  /* Print it on to the real screen */
++    getch();                    /* Wait for user input */
++    endwin();                   /* End curses mode                */
+ 
+-        return 0;
++    return 0;
+ }
                                                                                                    
+         
+ 
+@@ -1573,7 +1592,7 @@
+       
                                                                                                    
+         
                                                                                                    
+ 
+-        
                                                                                                    6.2.
++        
                                                                                                    6.2.
+         mvaddch(), waddch() and mvwaddch()
                                                                                                    
+ 
+         
                                                                                                    mvaddch() is used to move the
+@@ -1669,24 +1688,25 @@
+ 
+             
                                                                                                    #include <curses.h>
+-#include <string.h> 
+- 
+-int main()
+-{
+- char mesg[]="Just a string";           /* message to be appeared on the screen */
+- int row,col;                           /* to store the number of rows and *
+-                                         * the number of columns of the screen */
+- initscr();                             /* start the curses mode */
+- getmaxyx(stdscr,row,col);              /* get the number of rows and columns */
+- mvprintw(row/2,(col-strlen(mesg))/2,"%s",mesg);
+-                                        /* print the message at the center of the screen */
+- mvprintw(row-2,0,"This screen has %d rows and %d columns\n",row,col);
+- printw("Try resizing your window(if possible) and then run this program again");
+- refresh();
+- getch();
+- endwin();
++#include <string.h>
++
++int
++main(void)
++{
++    char mesg[] = "Just a string";      /* message to be appeared on the screen */
++    int row, col;               /* to store the number of rows and *
++                                 * the number of columns of the screen */
++    initscr();                  /* start the curses mode */
++    getmaxyx(stdscr, row, col); /* get the number of rows and columns */
++    mvprintw(row / 2, (col - (int) strlen(mesg)) / 2, "%s", mesg);
++    /* print the message at the center of the screen */
++    mvprintw(row - 2, 0, "This screen has %d rows and %d columns\n", row, col);
++    printw("Try resizing your window(if possible) and then run this program again");
++    refresh();
++    getch();
++    endwin();
+ 
+- return 0;
++    return 0;
+ }
                                                                                                    
+           
                                                                                                    
+ 
+@@ -1865,24 +1885,25 @@
+ 
+           
                                                                                                    #include <curses.h>
+-#include <string.h> 
+- 
+-int main()
+-{
+- char mesg[]="Enter a string: ";                /* message to be appeared on the screen */
+- char str[80];
+- int row,col;                           /* to store the number of rows and *
+-                                         * the number of columns of the screen */
+- initscr();                             /* start the curses mode */
+- getmaxyx(stdscr,row,col);              /* get the number of rows and columns */
+- mvprintw(row/2,(col-strlen(mesg))/2,"%s",mesg);
+-                                /* print the message at the center of the screen */
+- getstr(str);
+- mvprintw(LINES - 2, 0, "You Entered: %s", str);
+- getch();
+- endwin();
++#include <string.h>
++
++int
++main(void)
++{
++    char mesg[] = "Enter a string: ";   /* message to be appeared on the screen */
++    char str[80];
++    int row, col;               /* to store the number of rows and *
++                                 * the number of columns of the screen */
++    initscr();                  /* start the curses mode */
++    getmaxyx(stdscr, row, col); /* get the number of rows and columns */
++    mvprintw(row / 2, (col - (int) strlen(mesg)) / 2, "%s", mesg);
++    /* print the message at the center of the screen */
++    getstr(str);
++    mvprintw(LINES - 2, 0, "You Entered: %s", str);
++    getch();
++    endwin();
+ 
+- return 0;
++    return 0;
+ }
                                                                                                    
+         
+       
+@@ -1911,55 +1932,54 @@
+ #include <curses.h>
+ #include <stdlib.h>
+ 
+-int main(int argc, char *argv[])
+-{ 
+-  int ch, prev, row, col;
+-  prev = EOF;
+-  FILE *fp;
+-  int y, x;
+-
+-  if(argc != 2)
+-  {
+-    printf("Usage: %s <a c file name>\n", argv[0]);
+-    exit(1);
+-  }
+-  fp = fopen(argv[1], "r");
+-  if(fp == NULL)
+-  {
+-    perror("Cannot open input file");
+-    exit(1);
+-  }
+-  initscr();                            /* Start curses mode */
+-  getmaxyx(stdscr, row, col);           /* find the boundaries of the screeen */
+-  while((ch = fgetc(fp)) != EOF)        /* read the file till we reach the end */
+-  {
+-    getyx(stdscr, y, x);                /* get the current cursor position */
+-    if(y == (row - 1))                  /* are we are at the end of the screen */
+-    {
+-      printw("<-Press Any Key->");      /* tell the user to press a key */
+-      getch();
+-      clear();                          /* clear the screen */
+-      move(0, 0);                       /* start at the beginning of the screen */
++int
++main(int argc, char *argv[])
++{
++    int ch, prev, row, col;
++    prev = EOF;
++    FILE *fp;
++    int y, x;
++
++    if (argc != 2) {
++        printf("Usage: %s <a c file name>\n", argv[0]);
++        exit(1);
+     }
+-    if(prev == '/' && ch == '*')        /* If it is / and * then only
+-                                         * switch bold on */    
++    fp = fopen(argv[1], "r");
++    if (fp == NULL) {
++        perror("Cannot open input file");
++        exit(1);
++    }
++    initscr();                          /* Start curses mode */
++    getmaxyx(stdscr, row, col);         /* find the boundaries of the screeen */
++    (void) col;
++    while ((ch = fgetc(fp)) != EOF)     /* read the file till we reach the end */
+     {
+-      attron(A_BOLD);                   /* cut bold on */
+-      getyx(stdscr, y, x);              /* get the current cursor position */
+-      move(y, x - 1);                   /* back up one space */
+-      printw("%c%c", '/', ch);          /* The actual printing is done here */
++        getyx(stdscr, y, x);            /* get the current cursor position */
++        if (y == (row - 1))             /* are we are at the end of the screen */
++        {
++            printw("<-Press Any Key->"); /* tell the user to press a key */
++            getch();
++            clear();                    /* clear the screen */
++            move(0, 0);                 /* start at the beginning of the screen */
++        }
++        if (prev == '/' && ch == '*')   /* If it is / and * then only
++                                         * switch bold on */
++        {
++            attron(A_BOLD);             /* cut bold on */
++            getyx(stdscr, y, x);        /* get the current cursor position */
++            move(y, x - 1);             /* back up one space */
++            printw("%c%c", '/', ch);    /* The actual printing is done here */
++        } else
++            printw("%c", ch);
++        refresh();
++        if (prev == '*' && ch == '/')
++            attroff(A_BOLD);    /* Switch it off once we got *
++                                 * and then / */
++        prev = ch;
+     }
+-    else
+-      printw("%c", ch);
+-    refresh();
+-    if(prev == '*' && ch == '/')
+-      attroff(A_BOLD);                  /* Switch it off once we got *
+-                                         * and then / */
+-    prev = ch;
+-  }
+-  endwin();                             /* End curses mode */
+-  fclose(fp);
+-  return 0;
++    endwin();                   /* End curses mode */
++    fclose(fp);
++    return 0;
+ }
+       
+ 
+@@ -2002,8 +2022,8 @@
+         following video attributes, which are defined in
+         <curses.h> can be passed to these functions.
                                                                                                    
+ 
+-        
                                                                                                        
+-    A_NORMAL        Normal display (no highlight)
++        
                                                                                                    
    A_NORMAL        Normal display (no highlight)
+     A_STANDOUT      Best highlighting mode of the terminal.
+     A_UNDERLINE     Underlining
+     A_REVERSE       Reverse video
+@@ -2014,10 +2034,9 @@
+     A_INVIS         Invisible or blank mode
+     A_ALTCHARSET    Alternate character set
+     A_CHARTEXT      Bit-mask to extract a character
+-    COLOR_PAIR(n)   Color-pair number n 
+-    
                                                                                                    
++    COLOR_PAIR(n)   Color-pair number n
                                                                                                    
+         
                                                                                                    The last one is the most colorful one :-) Colors are
+-        explained in the next
++        explained in the next
+         sections.
                                                                                                    
+ 
+         
                                                                                                    We can OR(|) any number of above attributes to get a
+@@ -2129,27 +2148,29 @@
+           
                                                                                                    #include <curses.h>
+ 
+-int main(int argc, char *argv[])
+-{       initscr();                      /* Start curses mode            */
+-        start_color();                  /* Start color functionality    */
+-        
+-        init_pair(1, COLOR_CYAN, COLOR_BLACK);
+-        printw("A Big string which i didn't care to type fully ");
+-        mvchgat(0, 0, -1, A_BLINK, 1, NULL);    
+-        /* 
+-         * First two parameters specify the position at which to start 
+-         * Third parameter number of characters to update. -1 means till 
+-         * end of line
+-         * Forth parameter is the normal attribute you wanted to give 
+-         * to the character
+-         * Fifth is the color index. It is the index given during init_pair()
+-         * use 0 if you didn't want color
+-         * Sixth one is always NULL 
+-         */
+-        refresh();
+-        getch();
+-        endwin();                       /* End curses mode                */
+-        return 0;
++int
++main(void)
++{
++    initscr();                  /* Start curses mode            */
++    start_color();              /* Start color functionality    */
++
++    init_pair(1, COLOR_CYAN, COLOR_BLACK);
++    printw("A Big string which i didn't care to type fully ");
++    mvchgat(0, 0, -1, A_BLINK, 1, NULL);
++    /* 
++     * First two parameters specify the position at which to start 
++     * Third parameter number of characters to update. -1 means till 
++     * end of line
++     * Forth parameter is the normal attribute you wanted to give 
++     * to the character
++     * Fifth is the color index. It is the index given during init_pair()
++     * use 0 if you didn't want color
++     * Sixth one is always NULL 
++     */
++    refresh();
++    getch();
++    endwin();                   /* End curses mode                */
++    return 0;
+ }
                                                                                                    
+         
+ 
+@@ -2222,81 +2243,86 @@
+ WINDOW *create_newwin(int height, int width, int starty, int startx);
+ void destroy_win(WINDOW *local_win);
+ 
+-int main(int argc, char *argv[])
+-{       WINDOW *my_win;
+-        int startx, starty, width, height;
+-        int ch;
+-
+-        initscr();                      /* Start curses mode            */
+-        cbreak();                       /* Line buffering disabled, Pass on
+-                                         * everty thing to me           */
+-        keypad(stdscr, TRUE);           /* I need that nifty F1         */
+-
+-        height = 3;
+-        width = 10;
+-        starty = (LINES - height) / 2;  /* Calculating for a center placement */
+-        startx = (COLS - width) / 2;    /* of the window                */
+-        printw("Press F1 to exit");
+-        refresh();
+-        my_win = create_newwin(height, width, starty, startx);
++int
++main(void)
++{
++    WINDOW *my_win;
++    int startx, starty, width, height;
++    int ch;
++
++    initscr();                  /* Start curses mode            */
++    cbreak();                   /* Line buffering disabled, Pass on
++                                 * every thing to me            */
++    keypad(stdscr, TRUE);       /* I need that nifty F1         */
++
++    height = 3;
++    width = 10;
++    starty = (LINES - height) / 2;      /* Calculating for a center placement */
++    startx = (COLS - width) / 2;        /* of the window                */
++    printw("Press F1 to exit");
++    refresh();
++    my_win = create_newwin(height, width, starty, startx);
+ 
+-        while((ch = getch()) != KEY_F(1))
+-        {       switch(ch)
+-                {       case KEY_LEFT:
+-                                destroy_win(my_win);
+-                                my_win = create_newwin(height, width, starty,--startx);
+-                                break;
+-                        case KEY_RIGHT:
+-                                destroy_win(my_win);
+-                                my_win = create_newwin(height, width, starty,++startx);
+-                                break;
+-                        case KEY_UP:
+-                                destroy_win(my_win);
+-                                my_win = create_newwin(height, width, --starty,startx);
+-                                break;
+-                        case KEY_DOWN:
+-                                destroy_win(my_win);
+-                                my_win = create_newwin(height, width, ++starty,startx);
+-                                break;  
+-                }
++    while ((ch = getch()) != KEY_F(1)) {
++        switch (ch) {
++        case KEY_LEFT:
++            destroy_win(my_win);
++            my_win = create_newwin(height, width, starty, --startx);
++            break;
++        case KEY_RIGHT:
++            destroy_win(my_win);
++            my_win = create_newwin(height, width, starty, ++startx);
++            break;
++        case KEY_UP:
++            destroy_win(my_win);
++            my_win = create_newwin(height, width, --starty, startx);
++            break;
++        case KEY_DOWN:
++            destroy_win(my_win);
++            my_win = create_newwin(height, width, ++starty, startx);
++            break;
+         }
+-                
+-        endwin();                       /* End curses mode                */
+-        return 0;
++    }
++
++    endwin();                   /* End curses mode                */
++    return 0;
+ }
+ 
+-WINDOW *create_newwin(int height, int width, int starty, int startx)
+-{       WINDOW *local_win;
++WINDOW *
++create_newwin(int height, int width, int starty, int startx)
++{
++    WINDOW *local_win;
+ 
+-        local_win = newwin(height, width, starty, startx);
+-        box(local_win, 0 , 0);          /* 0, 0 gives default characters 
+-                                         * for the vertical and horizontal
+-                                         * lines                        */
+-        wrefresh(local_win);            /* Show that box                */
++    local_win = newwin(height, width, starty, startx);
++    box(local_win, 0, 0);       /* 0, 0 gives default characters 
++                                 * for the vertical and horizontal
++                                 * lines                        */
++    wrefresh(local_win);        /* Show that box                */
+ 
+-        return local_win;
++    return local_win;
+ }
+ 
+-void destroy_win(WINDOW *local_win)
+-{       
+-        /* box(local_win, ' ', ' '); : This won't produce the desired
+-         * result of erasing the window. It will leave its four corners 
+-         * and so an ugly remnant of window. 
+-         */
+-        wborder(local_win, ' ', ' ', ' ',' ',' ',' ',' ',' ');
+-        /* The parameters taken are 
+-         * 1. win: the window on which to operate
+-         * 2. ls: character to be used for the left side of the window 
+-         * 3. rs: character to be used for the right side of the window 
+-         * 4. ts: character to be used for the top side of the window 
+-         * 5. bs: character to be used for the bottom side of the window 
+-         * 6. tl: character to be used for the top left corner of the window 
+-         * 7. tr: character to be used for the top right corner of the window 
+-         * 8. bl: character to be used for the bottom left corner of the window 
+-         * 9. br: character to be used for the bottom right corner of the window
+-         */
+-        wrefresh(local_win);
+-        delwin(local_win);
++void
++destroy_win(WINDOW *local_win)
++{
++    /* box(local_win, ' ', ' '); : This won't produce the desired
++     * result of erasing the window. It will leave its four corners 
++     * and so an ugly remnant of window. 
++     */
++    wborder(local_win, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ');
++    /* The parameters taken are 
++     * 1. win: the window on which to operate
++     * 2. ls: character to be used for the left side of the window 
++     * 3. rs: character to be used for the right side of the window 
++     * 4. ts: character to be used for the top side of the window 
++     * 5. bs: character to be used for the bottom side of the window 
++     * 6. tl: character to be used for the top left corner of the window 
++     * 7. tr: character to be used for the top right corner of the window 
++     * 8. bl: character to be used for the bottom left corner of the window 
++     * 9. br: character to be used for the bottom right corner of the window
++     */
++    wrefresh(local_win);
++    delwin(local_win);
+ }
+         
+       
+@@ -2391,122 +2417,129 @@
+           "INLINEMEDIAOBJECT">#include <curses.h>
+ 
+ typedef struct _win_border_struct {
+-        chtype  ls, rs, ts, bs, 
+-                tl, tr, bl, br;
+-}WIN_BORDER;
++    chtype ls, rs, ts, bs, tl, tr, bl, br;
++} WIN_BORDER;
+ 
+ typedef struct _WIN_struct {
+ 
+-        int startx, starty;
+-        int height, width;
+-        WIN_BORDER border;
+-}WIN;
+-
+-void init_win_params(WIN *p_win);
+-void print_win_params(WIN *p_win);
+-void create_box(WIN *win, bool flag);
+-
+-int main(int argc, char *argv[])
+-{       WIN win;
+-        int ch;
+-
+-        initscr();                      /* Start curses mode            */
+-        start_color();                  /* Start the color functionality */
+-        cbreak();                       /* Line buffering disabled, Pass on
+-                                         * everty thing to me           */
+-        keypad(stdscr, TRUE);           /* I need that nifty F1         */
+-        noecho();
+-        init_pair(1, COLOR_CYAN, COLOR_BLACK);
+-
+-        /* Initialize the window parameters */
+-        init_win_params(&win);
+-        print_win_params(&win);
++    int startx, starty;
++    int height, width;
++    WIN_BORDER border;
++} WIN;
++
++void init_win_params(WIN * p_win);
++void print_win_params(WIN * p_win);
++void create_box(WIN * win, bool flag);
+ 
+-        attron(COLOR_PAIR(1));
+-        printw("Press F1 to exit");
+-        refresh();
+-        attroff(COLOR_PAIR(1));
+-        
+-        create_box(&win, TRUE);
+-        while((ch = getch()) != KEY_F(1))
+-        {       switch(ch)
+-                {       case KEY_LEFT:
+-                                create_box(&win, FALSE);
+-                                --win.startx;
+-                                create_box(&win, TRUE);
+-                                break;
+-                        case KEY_RIGHT:
+-                                create_box(&win, FALSE);
+-                                ++win.startx;
+-                                create_box(&win, TRUE);
+-                                break;
+-                        case KEY_UP:
+-                                create_box(&win, FALSE);
+-                                --win.starty;
+-                                create_box(&win, TRUE);
+-                                break;
+-                        case KEY_DOWN:
+-                                create_box(&win, FALSE);
+-                                ++win.starty;
+-                                create_box(&win, TRUE);
+-                                break;  
+-                }
++int
++main(void)
++{
++    WIN win;
++    int ch;
++
++    initscr();                  /* Start curses mode            */
++    start_color();              /* Start the color functionality */
++    cbreak();                   /* Line buffering disabled, Pass on
++                                 * everty thing to me                 */
++    keypad(stdscr, TRUE);       /* I need that nifty F1         */
++    noecho();
++    init_pair(1, COLOR_CYAN, COLOR_BLACK);
++
++    /* Initialize the window parameters */
++    init_win_params(&win);
++    print_win_params(&win);
++
++    attron(COLOR_PAIR(1));
++    printw("Press F1 to exit");
++    refresh();
++    attroff(COLOR_PAIR(1));
++
++    create_box(&win, TRUE);
++    while ((ch = getch()) != KEY_F(1)) {
++        switch (ch) {
++        case KEY_LEFT:
++            create_box(&win, FALSE);
++            --win.startx;
++            create_box(&win, TRUE);
++            break;
++        case KEY_RIGHT:
++            create_box(&win, FALSE);
++            ++win.startx;
++            create_box(&win, TRUE);
++            break;
++        case KEY_UP:
++            create_box(&win, FALSE);
++            --win.starty;
++            create_box(&win, TRUE);
++            break;
++        case KEY_DOWN:
++            create_box(&win, FALSE);
++            ++win.starty;
++            create_box(&win, TRUE);
++            break;
+         }
+-        endwin();                       /* End curses mode                */
+-        return 0;
++    }
++    endwin();                   /* End curses mode                */
++    return 0;
+ }
+-void init_win_params(WIN *p_win)
++void
++init_win_params(WIN * p_win)
+ {
+-        p_win->height = 3;
+-        p_win->width = 10;
+-        p_win->starty = (LINES - p_win->height)/2;      
+-        p_win->startx = (COLS - p_win->width)/2;
+-
+-        p_win->border.ls = '|';
+-        p_win->border.rs = '|';
+-        p_win->border.ts = '-';
+-        p_win->border.bs = '-';
+-        p_win->border.tl = '+';
+-        p_win->border.tr = '+';
+-        p_win->border.bl = '+';
+-        p_win->border.br = '+';
++    p_win->height = 3;
++    p_win->width = 10;
++    p_win->starty = (LINES - p_win->height) / 2;
++    p_win->startx = (COLS - p_win->width) / 2;
++
++    p_win->border.ls = '|';
++    p_win->border.rs = '|';
++    p_win->border.ts = '-';
++    p_win->border.bs = '-';
++    p_win->border.tl = '+';
++    p_win->border.tr = '+';
++    p_win->border.bl = '+';
++    p_win->border.br = '+';
+ 
+ }
+-void print_win_params(WIN *p_win)
++
++void
++print_win_params(WIN * p_win)
+ {
+ #ifdef _DEBUG
+-        mvprintw(25, 0, "%d %d %d %d", p_win->startx, p_win->starty, 
+-                                p_win->width, p_win->height);
+-        refresh();
++    mvprintw(25, 0, "%d %d %d %d", p_win->startx, p_win->starty,
++             p_win->width, p_win->height);
++    refresh();
++#else
++    (void) p_win;
+ #endif
+ }
+-void create_box(WIN *p_win, bool flag)
+-{       int i, j;
+-        int x, y, w, h;
+-
+-        x = p_win->startx;
+-        y = p_win->starty;
+-        w = p_win->width;
+-        h = p_win->height;
+-
+-        if(flag == TRUE)
+-        {       mvaddch(y, x, p_win->border.tl);
+-                mvaddch(y, x + w, p_win->border.tr);
+-                mvaddch(y + h, x, p_win->border.bl);
+-                mvaddch(y + h, x + w, p_win->border.br);
+-                mvhline(y, x + 1, p_win->border.ts, w - 1);
+-                mvhline(y + h, x + 1, p_win->border.bs, w - 1);
+-                mvvline(y + 1, x, p_win->border.ls, h - 1);
+-                mvvline(y + 1, x + w, p_win->border.rs, h - 1);
+ 
+-        }
+-        else
+-                for(j = y; j <= y + h; ++j)
+-                        for(i = x; i <= x + w; ++i)
+-                                mvaddch(j, i, ' ');
+-                                
+-        refresh();
++void
++create_box(WIN * p_win, bool flag)
++{
++    int i, j;
++    int x, y, w, h;
+ 
++    x = p_win->startx;
++    y = p_win->starty;
++    w = p_win->width;
++    h = p_win->height;
++
++    if (flag == TRUE) {
++        mvaddch(y, x, p_win->border.tl);
++        mvaddch(y, x + w, p_win->border.tr);
++        mvaddch(y + h, x, p_win->border.bl);
++        mvaddch(y + h, x + w, p_win->border.br);
++        mvhline(y, x + 1, p_win->border.ts, w - 1);
++        mvhline(y + h, x + 1, p_win->border.bs, w - 1);
++        mvvline(y + 1, x, p_win->border.ls, h - 1);
++        mvvline(y + 1, x + w, p_win->border.rs, h - 1);
++
++    } else
++        for (j = y; j <= y + h; ++j)
++            for (i = x; i <= x + w; ++i)
++                mvaddch(j, i, ' ');
++
++    refresh();
+ }
+         
+       
+@@ -2535,44 +2568,48 @@
+ #include <string.h>
+ #include <curses.h>
+ 
+-void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string);
+-int main(int argc, char *argv[])
+-{       initscr();                      /* Start curses mode            */
+-        if(has_colors() == FALSE)
+-        {       endwin();
+-                printf("Your terminal does not support color\n");
+-                exit(1);
+-        }
+-        start_color();                  /* Start color                  */
+-        init_pair(1, COLOR_RED, COLOR_BLACK);
++void print_in_middle(WINDOW *win, int starty, int startx, int width, const char *string);
+ 
+-        attron(COLOR_PAIR(1));
+-        print_in_middle(stdscr, LINES / 2, 0, 0, "Viola !!! In color ...");
+-        attroff(COLOR_PAIR(1));
+-        getch();
++int
++main(void)
++{
++    initscr();                  /* Start curses mode            */
++    if (has_colors() == FALSE) {
+         endwin();
++        printf("Your terminal does not support color\n");
++        exit(1);
++    }
++    start_color();              /* Start color                  */
++    init_pair(1, COLOR_RED, COLOR_BLACK);
++
++    attron(COLOR_PAIR(1));
++    print_in_middle(stdscr, LINES / 2, 0, 0, "Viola !!! In color ...");
++    attroff(COLOR_PAIR(1));
++    getch();
++    endwin();
+ }
+-void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string)
+-{       int length, x, y;
+-        float temp;
+-
+-        if(win == NULL)
+-                win = stdscr;
+-        getyx(win, y, x);
+-        if(startx != 0)
+-                x = startx;
+-        if(starty != 0)
+-                y = starty;
+-        if(width == 0)
+-                width = 80;
+-
+-        length = strlen(string);
+-        temp = (width - length)/ 2;
+-        x = startx + (int)temp;
+-        mvwprintw(win, y, x, "%s", string);
+-        refresh();
+-}
+-
++void
++print_in_middle(WINDOW *win, int starty, int startx, int width, const char *string)
++{
++    int length, x, y;
++    float temp;
++
++    if (win == NULL)
++        win = stdscr;
++    getyx(win, y, x);
++    if (startx != 0)
++        x = startx;
++    if (starty != 0)
++        y = starty;
++    if (width == 0)
++        width = 80;
++
++    length = (int) strlen(string);
++    temp = (float) (width - length) / 2;
++    x = startx + (int) temp;
++    mvwprintw(win, y, x, "%s", string);
++    refresh();
++}
+         
+ 
+         
                                                                                                    As you can see, to start using color, you should first
+@@ -2724,93 +2761,100 @@
+           "INLINEMEDIAOBJECT">#include <curses.h>
+ 
+ #define WIDTH 30
+-#define HEIGHT 10 
++#define HEIGHT 10
+ 
+ int startx = 0;
+ int starty = 0;
+ 
+-char *choices[] = { 
+-                        "Choice 1",
+-                        "Choice 2",
+-                        "Choice 3",
+-                        "Choice 4",
+-                        "Exit",
+-                  };
++const char *choices[] =
++{
++    "Choice 1",
++    "Choice 2",
++    "Choice 3",
++    "Choice 4",
++    "Exit",
++};
+ int n_choices = sizeof(choices) / sizeof(char *);
+ void print_menu(WINDOW *menu_win, int highlight);
+ 
+-int main()
+-{       WINDOW *menu_win;
+-        int highlight = 1;
+-        int choice = 0;
+-        int c;
+-
+-        initscr();
+-        clear();
+-        noecho();
+-        cbreak();       /* Line buffering disabled. pass on everything */
+-        startx = (80 - WIDTH) / 2;
+-        starty = (24 - HEIGHT) / 2;
+-                
+-        menu_win = newwin(HEIGHT, WIDTH, starty, startx);
+-        keypad(menu_win, TRUE);
+-        mvprintw(0, 0, "Use arrow keys to go up and down, Press enter to select a choice");
+-        refresh();
++int
++main(void)
++{
++    WINDOW *menu_win;
++    int highlight = 1;
++    int choice = 0;
++    int c;
++
++    initscr();
++    clear();
++    noecho();
++    cbreak();                   /* Line buffering disabled. pass on everything */
++    startx = (80 - WIDTH) / 2;
++    starty = (24 - HEIGHT) / 2;
++
++    menu_win = newwin(HEIGHT, WIDTH, starty, startx);
++    keypad(menu_win, TRUE);
++    mvprintw(0, 0,
++             "Use arrow keys to go up and down, Press enter to select a choice");
++    refresh();
++    print_menu(menu_win, highlight);
++    while (1) {
++        c = wgetch(menu_win);
++        switch (c) {
++        case KEY_UP:
++            if (highlight == 1)
++                highlight = n_choices;
++            else
++                --highlight;
++            break;
++        case KEY_DOWN:
++            if (highlight == n_choices)
++                highlight = 1;
++            else
++                ++highlight;
++            break;
++        case 10:
++            choice = highlight;
++            break;
++        default:
++            mvprintw(24, 0,
++                     "Character pressed is = %3d Hopefully it can be printed as '%c'",
++                     c, c);
++            refresh();
++            break;
++        }
+         print_menu(menu_win, highlight);
+-        while(1)
+-        {       c = wgetch(menu_win);
+-                switch(c)
+-                {       case KEY_UP:
+-                                if(highlight == 1)
+-                                        highlight = n_choices;
+-                                else
+-                                        --highlight;
+-                                break;
+-                        case KEY_DOWN:
+-                                if(highlight == n_choices)
+-                                        highlight = 1;
+-                                else 
+-                                        ++highlight;
+-                                break;
+-                        case 10:
+-                                choice = highlight;
+-                                break;
+-                        default:
+-                                mvprintw(24, 0, "Character pressed is = %3d Hopefully it can be printed as '%c'", c, c);
+-                                refresh();
+-                                break;
+-                }
+-                print_menu(menu_win, highlight);
+-                if(choice != 0) /* User did a choice come out of the infinite loop */
+-                        break;
+-        }       
+-        mvprintw(23, 0, "You chose choice %d with choice string %s\n", choice, choices[choice - 1]);
+-        clrtoeol();
+-        refresh();
+-        endwin();
+-        return 0;
++        if (choice != 0)        /* User did a choice come out of the infinite loop */
++            break;
++    }
++    mvprintw(23, 0, "You chose choice %d with choice string %s\n", choice,
++             choices[choice - 1]);
++    clrtoeol();
++    refresh();
++    endwin();
++    return 0;
+ }
+ 
+-void print_menu(WINDOW *menu_win, int highlight)
++void
++print_menu(WINDOW *menu_win, int highlight)
+ {
+-        int x, y, i;    
++    int x, y, i;
+ 
+-        x = 2;
+-        y = 2;
+-        box(menu_win, 0, 0);
+-        for(i = 0; i < n_choices; ++i)
+-        {       if(highlight == i + 1) /* High light the present choice */
+-                {       wattron(menu_win, A_REVERSE); 
+-                        mvwprintw(menu_win, y, x, "%s", choices[i]);
+-                        wattroff(menu_win, A_REVERSE);
+-                }
+-                else
+-                        mvwprintw(menu_win, y, x, "%s", choices[i]);
+-                ++y;
+-        }
+-        wrefresh(menu_win);
+-}
+-
++    x = 2;
++    y = 2;
++    box(menu_win, 0, 0);
++    for (i = 0; i < n_choices; ++i) {
++        if (highlight == i + 1) /* Highlight the present choice */
++        {
++            wattron(menu_win, A_REVERSE);
++            mvwprintw(menu_win, y, x, "%s", choices[i]);
++            wattroff(menu_win, A_REVERSE);
++        } else
++            mvwprintw(menu_win, y, x, "%s", choices[i]);
++        ++y;
++    }
++    wrefresh(menu_win);
++}
+         
+       
+     
+@@ -2904,7 +2948,7 @@
+         short id;         /* ID to distinguish multiple devices */
+         int x, y, z;      /* event coordinates */
+         mmask_t bstate;   /* button state bits */
+-    }    
++    }
+         
                                                                                                    The bstate is the main variable
+         we are interested in. It tells the button state of the
+         mouse.
                                                                                                    
+@@ -2942,103 +2986,112 @@
+ int startx = 0;
+ int starty = 0;
+ 
+-char *choices[] = {     "Choice 1",
+-                        "Choice 2",
+-                        "Choice 3",
+-                        "Choice 4",
+-                        "Exit",
+-                  };
++const char *choices[] =
++{"Choice 1",
++ "Choice 2",
++ "Choice 3",
++ "Choice 4",
++ "Exit",
++};
+ 
+ int n_choices = sizeof(choices) / sizeof(char *);
+ 
+ void print_menu(WINDOW *menu_win, int highlight);
+ void report_choice(int mouse_x, int mouse_y, int *p_choice);
+ 
+-int main()
+-{       int c, choice = 0;
+-        WINDOW *menu_win;
+-        MEVENT event;
+-
+-        /* Initialize curses */
+-        initscr();
+-        clear();
+-        noecho();
+-        cbreak();       //Line buffering disabled. pass on everything
+-
+-        /* Try to put the window in the middle of screen */
+-        startx = (80 - WIDTH) / 2;
+-        starty = (24 - HEIGHT) / 2;
+-
+-        attron(A_REVERSE);
+-        mvprintw(23, 1, "Click on Exit to quit (Works best in a virtual console)");
+-        refresh();
+-        attroff(A_REVERSE);
++int
++main(void)
++{
++    int c, choice = 0;
++    WINDOW *menu_win;
++    MEVENT event;
++
++    /* Initialize curses */
++    initscr();
++    clear();
++    noecho();
++    cbreak();                   /* Line buffering disabled. pass everything */
++
++    /* Try to put the window in the middle of screen */
++    startx = (80 - WIDTH) / 2;
++    starty = (24 - HEIGHT) / 2;
++
++    attron(A_REVERSE);
++    mvprintw(23, 1,
++             "Click on Exit to quit (Works best in a virtual console)");
++    refresh();
++    attroff(A_REVERSE);
+ 
+-        /* Print the menu for the first time */
+-        menu_win = newwin(HEIGHT, WIDTH, starty, startx);
+-        keypad(menu_win, TRUE);
+-        print_menu(menu_win, 1);
+-        /* Get all the mouse events */
+-        mousemask(ALL_MOUSE_EVENTS, NULL);
+-
+-        while(1)
+-        {       c = wgetch(menu_win);
+-                switch(c)
+-                {       case KEY_MOUSE:
+-                        if(getmouse(&event) == OK)
+-                        {       /* When the user clicks left mouse button */
+-                                if(event.bstate & BUTTON1_PRESSED)
+-                                {       report_choice(event.x + 1, event.y + 1, &choice);
+-                                        if(choice == -1) //Exit chosen
+-                                                goto end;
+-                                        mvprintw(22, 1, "Choice made is : %d String Chosen is \"%10s\"", choice, choices[choice - 1]);
+-                                        refresh();
+-                                }
+-                        }
+-                        print_menu(menu_win, choice);
+-                        break;
++    /* Print the menu for the first time */
++    menu_win = newwin(HEIGHT, WIDTH, starty, startx);
++    keypad(menu_win, TRUE);
++    print_menu(menu_win, 1);
++    /* Get all the mouse events */
++    mousemask(ALL_MOUSE_EVENTS, NULL);
++
++    while (1) {
++        c = wgetch(menu_win);
++        switch (c) {
++        case KEY_MOUSE:
++            if (getmouse(&event) == OK) {       /* When the user clicks left mouse button */
++                if (event.bstate & BUTTON1_PRESSED) {
++                    report_choice(event.x + 1, event.y + 1, &choice);
++                    if (choice == -1)   /* Exit chosen */
++                        goto end;
++                    mvprintw(22, 1,
++                             "Choice made is : %d String Chosen is \"%10s\"",
++                             choice, choices[choice - 1]);
++                    refresh();
+                 }
++            }
++            print_menu(menu_win, choice);
++            break;
+         }
+-end:
+-        endwin();
+-        return 0;
++    }
++  end:
++    endwin();
++    return 0;
+ }
+ 
+-void print_menu(WINDOW *menu_win, int highlight)
++void
++print_menu(WINDOW *menu_win, int highlight)
+ {
+-        int x, y, i;
++    int x, y, i;
+ 
+-        x = 2;
+-        y = 2;
+-        box(menu_win, 0, 0);
+-        for(i = 0; i < n_choices; ++i)
+-        {       if(highlight == i + 1)
+-                {       wattron(menu_win, A_REVERSE);
+-                        mvwprintw(menu_win, y, x, "%s", choices[i]);
+-                        wattroff(menu_win, A_REVERSE);
+-                }
+-                else
+-                        mvwprintw(menu_win, y, x, "%s", choices[i]);
+-                ++y;
+-        }
+-        wrefresh(menu_win);
++    x = 2;
++    y = 2;
++    box(menu_win, 0, 0);
++    for (i = 0; i < n_choices; ++i) {
++        if (highlight == i + 1) {
++            wattron(menu_win, A_REVERSE);
++            mvwprintw(menu_win, y, x, "%s", choices[i]);
++            wattroff(menu_win, A_REVERSE);
++        } else
++            mvwprintw(menu_win, y, x, "%s", choices[i]);
++        ++y;
++    }
++    wrefresh(menu_win);
+ }
+ 
+ /* Report the choice according to mouse position */
+-void report_choice(int mouse_x, int mouse_y, int *p_choice)
+-{       int i,j, choice;
++void
++report_choice(int mouse_x, int mouse_y, int *p_choice)
++{
++    int i, j, choice;
+ 
+-        i = startx + 2;
+-        j = starty + 3;
++    i = startx + 2;
++    j = starty + 3;
+ 
+-        for(choice = 0; choice < n_choices; ++choice)
+-                if(mouse_y == j + choice && mouse_x >= i && mouse_x <= i + strlen(choices[choice]))
+-                {       if(choice == n_choices - 1)
+-                                *p_choice = -1;
+-                        else
+-                                *p_choice = choice + 1;
+-                        break;
+-                }
++    for (choice = 0; choice < n_choices; ++choice)
++        if (mouse_y == j + choice
++            && mouse_x >= i
++            && mouse_x <= i + (int) strlen(choices[choice])) {
++            if (choice == n_choices - 1)
++                *p_choice = -1;
++            else
++                *p_choice = choice + 1;
++            break;
++        }
+ }
+         
+       
+@@ -3086,7 +3139,7 @@
+ 
+         
                                                                                                        getyx(win, y, x);
+     /* win: window pointer
+-     *   y, x: y, x co-ordinates will be put into this variables 
++     *   y, x: y, x co-ordinates will be put into this variables
+      */
                                                                                                    
+         
                                                                                                    The function getparyx() gets the beginning co-ordinates
+         of the sub window relative to the main window. This is some
+@@ -3195,23 +3248,24 @@
+           "INLINEMEDIAOBJECT">#include <stdlib.h>
+ #include <curses.h>
+ 
+-int main()
+-{       
+-        initscr();                      /* Start curses mode              */
+-        printw("Hello World !!!\n");    /* Print Hello World              */
+-        refresh();                      /* Print it on to the real screen */
+-        def_prog_mode();                /* Save the tty modes             */
+-        endwin();                       /* End curses mode temporarily    */
+-        system("/bin/sh");              /* Do whatever you like in cooked mode */
+-        reset_prog_mode();              /* Return to the previous tty mode*/
+-                                        /* stored by def_prog_mode()      */
+-        refresh();                      /* Do refresh() to restore the    */
+-                                        /* Screen contents                */
+-        printw("Another String\n");     /* Back to curses use the full    */
+-        refresh();                      /* capabilities of curses         */
+-        endwin();                       /* End curses mode                */
++int
++main(void)
++{
++    initscr();                  /* Start curses mode              */
++    printw("Hello World !!!\n");        /* Print Hello World              */
++    refresh();                  /* Print it on to the real screen */
++    def_prog_mode();            /* Save the tty modes             */
++    endwin();                   /* End curses mode temporarily    */
++    system("/bin/sh");          /* Do whatever you like in cooked mode */
++    reset_prog_mode();          /* Return to the previous tty mode */
++    /* stored by def_prog_mode()      */
++    refresh();                  /* Do refresh() to restore the    */
++    /* Screen contents                */
++    printw("Another String\n"); /* Back to curses use the full    */
++    refresh();                  /* capabilities of curses         */
++    endwin();                   /* End curses mode                */
+ 
+-        return 0;
++    return 0;
+ }
+         
+       
+@@ -3239,47 +3293,47 @@
+           
                                                                                                    #include <curses.h>
+ 
+-int main()
++int main(void)
+ {
+-        initscr();
++    initscr();
+ 
+-        printw("Upper left corner           "); addch(ACS_ULCORNER); printw("\n"); 
+-        printw("Lower left corner           "); addch(ACS_LLCORNER); printw("\n");
+-        printw("Lower right corner          "); addch(ACS_LRCORNER); printw("\n");
+-        printw("Tee pointing right          "); addch(ACS_LTEE); printw("\n");
+-        printw("Tee pointing left           "); addch(ACS_RTEE); printw("\n");
+-        printw("Tee pointing up             "); addch(ACS_BTEE); printw("\n");
+-        printw("Tee pointing down           "); addch(ACS_TTEE); printw("\n");
+-        printw("Horizontal line             "); addch(ACS_HLINE); printw("\n");
+-        printw("Vertical line               "); addch(ACS_VLINE); printw("\n");
+-        printw("Large Plus or cross over    "); addch(ACS_PLUS); printw("\n");
+-        printw("Scan Line 1                 "); addch(ACS_S1); printw("\n");
+-        printw("Scan Line 3                 "); addch(ACS_S3); printw("\n");
+-        printw("Scan Line 7                 "); addch(ACS_S7); printw("\n");
+-        printw("Scan Line 9                 "); addch(ACS_S9); printw("\n");
+-        printw("Diamond                     "); addch(ACS_DIAMOND); printw("\n");
+-        printw("Checker board (stipple)     "); addch(ACS_CKBOARD); printw("\n");
+-        printw("Degree Symbol               "); addch(ACS_DEGREE); printw("\n");
+-        printw("Plus/Minus Symbol           "); addch(ACS_PLMINUS); printw("\n");
+-        printw("Bullet                      "); addch(ACS_BULLET); printw("\n");
+-        printw("Arrow Pointing Left         "); addch(ACS_LARROW); printw("\n");
+-        printw("Arrow Pointing Right        "); addch(ACS_RARROW); printw("\n");
+-        printw("Arrow Pointing Down         "); addch(ACS_DARROW); printw("\n");
+-        printw("Arrow Pointing Up           "); addch(ACS_UARROW); printw("\n");
+-        printw("Board of squares            "); addch(ACS_BOARD); printw("\n");
+-        printw("Lantern Symbol              "); addch(ACS_LANTERN); printw("\n");
+-        printw("Solid Square Block          "); addch(ACS_BLOCK); printw("\n");
+-        printw("Less/Equal sign             "); addch(ACS_LEQUAL); printw("\n");
+-        printw("Greater/Equal sign          "); addch(ACS_GEQUAL); printw("\n");
+-        printw("Pi                          "); addch(ACS_PI); printw("\n");
+-        printw("Not equal                   "); addch(ACS_NEQUAL); printw("\n");
+-        printw("UK pound sign               "); addch(ACS_STERLING); printw("\n");
++    printw("Upper left corner           "); addch(ACS_ULCORNER); printw("\n"); 
++    printw("Lower left corner           "); addch(ACS_LLCORNER); printw("\n");
++    printw("Lower right corner          "); addch(ACS_LRCORNER); printw("\n");
++    printw("Tee pointing right          "); addch(ACS_LTEE); printw("\n");
++    printw("Tee pointing left           "); addch(ACS_RTEE); printw("\n");
++    printw("Tee pointing up             "); addch(ACS_BTEE); printw("\n");
++    printw("Tee pointing down           "); addch(ACS_TTEE); printw("\n");
++    printw("Horizontal line             "); addch(ACS_HLINE); printw("\n");
++    printw("Vertical line               "); addch(ACS_VLINE); printw("\n");
++    printw("Large Plus or cross over    "); addch(ACS_PLUS); printw("\n");
++    printw("Scan Line 1                 "); addch(ACS_S1); printw("\n");
++    printw("Scan Line 3                 "); addch(ACS_S3); printw("\n");
++    printw("Scan Line 7                 "); addch(ACS_S7); printw("\n");
++    printw("Scan Line 9                 "); addch(ACS_S9); printw("\n");
++    printw("Diamond                     "); addch(ACS_DIAMOND); printw("\n");
++    printw("Checker board (stipple)     "); addch(ACS_CKBOARD); printw("\n");
++    printw("Degree Symbol               "); addch(ACS_DEGREE); printw("\n");
++    printw("Plus/Minus Symbol           "); addch(ACS_PLMINUS); printw("\n");
++    printw("Bullet                      "); addch(ACS_BULLET); printw("\n");
++    printw("Arrow Pointing Left         "); addch(ACS_LARROW); printw("\n");
++    printw("Arrow Pointing Right        "); addch(ACS_RARROW); printw("\n");
++    printw("Arrow Pointing Down         "); addch(ACS_DARROW); printw("\n");
++    printw("Arrow Pointing Up           "); addch(ACS_UARROW); printw("\n");
++    printw("Board of squares            "); addch(ACS_BOARD); printw("\n");
++    printw("Lantern Symbol              "); addch(ACS_LANTERN); printw("\n");
++    printw("Solid Square Block          "); addch(ACS_BLOCK); printw("\n");
++    printw("Less/Equal sign             "); addch(ACS_LEQUAL); printw("\n");
++    printw("Greater/Equal sign          "); addch(ACS_GEQUAL); printw("\n");
++    printw("Pi                          "); addch(ACS_PI); printw("\n");
++    printw("Not equal                   "); addch(ACS_NEQUAL); printw("\n");
++    printw("UK pound sign               "); addch(ACS_STERLING); printw("\n");
+ 
+-        refresh();
+-        getch();
+-        endwin();
++    refresh();
++    getch();
++    endwin();
+ 
+-        return 0;
++    return 0;
+ }
                                                                                                    
+         
+       
+@@ -3415,42 +3469,45 @@
+           
                                                                                                    #include <panel.h>
+ 
+-int main()
+-{       WINDOW *my_wins[3];
+-        PANEL  *my_panels[3];
+-        int lines = 10, cols = 40, y = 2, x = 4, i;
+-
+-        initscr();
+-        cbreak();
+-        noecho();
+-
+-        /* Create windows for the panels */
+-        my_wins[0] = newwin(lines, cols, y, x);
+-        my_wins[1] = newwin(lines, cols, y + 1, x + 5);
+-        my_wins[2] = newwin(lines, cols, y + 2, x + 10);
+-
+-        /* 
+-         * Create borders around the windows so that you can see the effect
+-         * of panels
+-         */
+-        for(i = 0; i < 3; ++i)
+-                box(my_wins[i], 0, 0);
+-
+-        /* Attach a panel to each window */     /* Order is bottom up */
+-        my_panels[0] = new_panel(my_wins[0]);   /* Push 0, order: stdscr-0 */
+-        my_panels[1] = new_panel(my_wins[1]);   /* Push 1, order: stdscr-0-1 */
+-        my_panels[2] = new_panel(my_wins[2]);   /* Push 2, order: stdscr-0-1-2 */
+-
+-        /* Update the stacking order. 2nd panel will be on top */
+-        update_panels();
+-
+-        /* Show it on the screen */
+-        doupdate();
+-        
+-        getch();
+-        endwin();
+-}
+-
                                                                                                    
++int
++main(void)
++{
++    WINDOW *my_wins[3];
++    PANEL *my_panels[3];
++    int lines = 10, cols = 40, y = 2, x = 4, i;
++
++    initscr();
++    cbreak();
++    noecho();
++
++    /* Create windows for the panels */
++    my_wins[0] = newwin(lines, cols, y, x);
++    my_wins[1] = newwin(lines, cols, y + 1, x + 5);
++    my_wins[2] = newwin(lines, cols, y + 2, x + 10);
++
++    /* 
++     * Create borders around the windows so that you can see the effect
++     * of panels
++     */
++    for (i = 0; i < 3; ++i)
++        box(my_wins[i], 0, 0);
++
++    /* Attach a panel to each window */
++    /* Order is bottom up */
++    my_panels[0] = new_panel(my_wins[0]);       /* Push 0, order: stdscr-0 */
++    my_panels[1] = new_panel(my_wins[1]);       /* Push 1, order: stdscr-0-1 */
++    my_panels[2] = new_panel(my_wins[2]);       /* Push 2, order: stdscr-0-1-2 */
++
++    /* Update the stacking order. 2nd panel will be on top */
++    update_panels();
++
++    /* Show it on the screen */
++    doupdate();
++
++    getch();
++    endwin();
++    return 0;
++}
+         
+ 
+         
                                                                                                    As you can see, above program follows a simple flow as
+@@ -3484,116 +3541,128 @@
+ #define NCOLS 40
+ 
+ void init_wins(WINDOW **wins, int n);
+-void win_show(WINDOW *win, char *label, int label_color);
+-void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color);
++void win_show(WINDOW *win, const char *label, int label_color);
++void print_in_middle(WINDOW *win, int starty, int startx,
++                     int width, const char *string, chtype color);
+ 
+-int main()
+-{       WINDOW *my_wins[3];
+-        PANEL  *my_panels[3];
+-        PANEL  *top;
+-        int ch;
+-
+-        /* Initialize curses */
+-        initscr();
+-        start_color();
+-        cbreak();
+-        noecho();
+-        keypad(stdscr, TRUE);
+-
+-        /* Initialize all the colors */
+-        init_pair(1, COLOR_RED, COLOR_BLACK);
+-        init_pair(2, COLOR_GREEN, COLOR_BLACK);
+-        init_pair(3, COLOR_BLUE, COLOR_BLACK);
+-        init_pair(4, COLOR_CYAN, COLOR_BLACK);
+-
+-        init_wins(my_wins, 3);
+-        
+-        /* Attach a panel to each window */     /* Order is bottom up */
+-        my_panels[0] = new_panel(my_wins[0]);   /* Push 0, order: stdscr-0 */
+-        my_panels[1] = new_panel(my_wins[1]);   /* Push 1, order: stdscr-0-1 */
+-        my_panels[2] = new_panel(my_wins[2]);   /* Push 2, order: stdscr-0-1-2 */
+-
+-        /* Set up the user pointers to the next panel */
+-        set_panel_userptr(my_panels[0], my_panels[1]);
+-        set_panel_userptr(my_panels[1], my_panels[2]);
+-        set_panel_userptr(my_panels[2], my_panels[0]);
+-
+-        /* Update the stacking order. 2nd panel will be on top */
++int
++main(void)
++{
++    WINDOW *my_wins[3];
++    PANEL *my_panels[3];
++    PANEL *top;
++    int ch;
++
++    /* Initialize curses */
++    initscr();
++    start_color();
++    cbreak();
++    noecho();
++    keypad(stdscr, TRUE);
++
++    /* Initialize all the colors */
++    init_pair(1, COLOR_RED, COLOR_BLACK);
++    init_pair(2, COLOR_GREEN, COLOR_BLACK);
++    init_pair(3, COLOR_BLUE, COLOR_BLACK);
++    init_pair(4, COLOR_CYAN, COLOR_BLACK);
++
++    init_wins(my_wins, 3);
++
++    /* Attach a panel to each window */
++    /* Order is bottom up */
++    my_panels[0] = new_panel(my_wins[0]);       /* Push 0, order: stdscr-0 */
++    my_panels[1] = new_panel(my_wins[1]);       /* Push 1, order: stdscr-0-1 */
++    my_panels[2] = new_panel(my_wins[2]);       /* Push 2, order: stdscr-0-1-2 */
++
++    /* Set up the user pointers to the next panel */
++    set_panel_userptr(my_panels[0], my_panels[1]);
++    set_panel_userptr(my_panels[1], my_panels[2]);
++    set_panel_userptr(my_panels[2], my_panels[0]);
++
++    /* Update the stacking order. 2nd panel will be on top */
++    update_panels();
++
++    /* Show it on the screen */
++    attron(COLOR_PAIR(4));
++    mvprintw(LINES - 2, 0,
++             "Use tab to browse through the windows (F1 to Exit)");
++    attroff(COLOR_PAIR(4));
++    doupdate();
++
++    top = my_panels[2];
++    while ((ch = getch()) != KEY_F(1)) {
++        switch (ch) {
++        case 9:
++            top = (PANEL *) panel_userptr(top);
++            top_panel(top);
++            break;
++        }
+         update_panels();
+-
+-        /* Show it on the screen */
+-        attron(COLOR_PAIR(4));
+-        mvprintw(LINES - 2, 0, "Use tab to browse through the windows (F1 to Exit)");
+-        attroff(COLOR_PAIR(4));
+         doupdate();
+-
+-        top = my_panels[2];
+-        while((ch = getch()) != KEY_F(1))
+-        {       switch(ch)
+-                {       case 9:
+-                                top = (PANEL *)panel_userptr(top);
+-                                top_panel(top);
+-                                break;
+-                }
+-                update_panels();
+-                doupdate();
+-        }
+-        endwin();
+-        return 0;
++    }
++    endwin();
++    return 0;
+ }
+ 
+ /* Put all the windows */
+-void init_wins(WINDOW **wins, int n)
+-{       int x, y, i;
+-        char label[80];
+-
+-        y = 2;
+-        x = 10;
+-        for(i = 0; i < n; ++i)
+-        {       wins[i] = newwin(NLINES, NCOLS, y, x);
+-                sprintf(label, "Window Number %d", i + 1);
+-                win_show(wins[i], label, i + 1);
+-                y += 3;
+-                x += 7;
+-        }
++void
++init_wins(WINDOW **wins, int n)
++{
++    int x, y, i;
++    char label[80];
++
++    y = 2;
++    x = 10;
++    for (i = 0; i < n; ++i) {
++        wins[i] = newwin(NLINES, NCOLS, y, x);
++        sprintf(label, "Window Number %d", i + 1);
++        win_show(wins[i], label, i + 1);
++        y += 3;
++        x += 7;
++    }
+ }
+ 
+ /* Show the window with a border and a label */
+-void win_show(WINDOW *win, char *label, int label_color)
+-{       int startx, starty, height, width;
++void
++win_show(WINDOW *win, const char *label, int label_color)
++{
++    int height, width;
+ 
+-        getbegyx(win, starty, startx);
+-        getmaxyx(win, height, width);
++    getmaxyx(win, height, width);
++    (void) height;
+ 
+-        box(win, 0, 0);
+-        mvwaddch(win, 2, 0, ACS_LTEE); 
+-        mvwhline(win, 2, 1, ACS_HLINE, width - 2); 
+-        mvwaddch(win, 2, width - 1, ACS_RTEE); 
+-        
+-        print_in_middle(win, 1, 0, width, label, COLOR_PAIR(label_color));
++    box(win, 0, 0);
++    mvwaddch(win, 2, 0, ACS_LTEE);
++    mvwhline(win, 2, 1, ACS_HLINE, width - 2);
++    mvwaddch(win, 2, width - 1, ACS_RTEE);
++
++    print_in_middle(win, 1, 0, width, label, COLOR_PAIR(label_color));
+ }
+ 
+-void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color)
+-{       int length, x, y;
+-        float temp;
+-
+-        if(win == NULL)
+-                win = stdscr;
+-        getyx(win, y, x);
+-        if(startx != 0)
+-                x = startx;
+-        if(starty != 0)
+-                y = starty;
+-        if(width == 0)
+-                width = 80;
+-
+-        length = strlen(string);
+-        temp = (width - length)/ 2;
+-        x = startx + (int)temp;
+-        wattron(win, color);
+-        mvwprintw(win, y, x, "%s", string);
+-        wattroff(win, color);
+-        refresh();
++void
++print_in_middle(WINDOW *win, int starty, int startx,
++                int width, const char *string, chtype color)
++{
++    int length, x, y;
++    float temp;
++
++    if (win == NULL)
++        win = stdscr;
++    getyx(win, y, x);
++    if (startx != 0)
++        x = startx;
++    if (starty != 0)
++        y = starty;
++    if (width == 0)
++        width = 80;
++
++    length = (int) strlen(string);
++    temp = (float) (width - length) / 2;
++    x = startx + (int) temp;
++    wattron(win, color);
++    mvwprintw(win, y, x, "%s", string);
++    wattroff(win, color);
++    refresh();
+ }
+         
+       
+@@ -3660,236 +3729,253 @@
+ #include <panel.h>
+ 
+ typedef struct _PANEL_DATA {
+-        int x, y, w, h;
+-        char label[80]; 
+-        int label_color;
+-        PANEL *next;
+-}PANEL_DATA;
++    int x, y, w, h;
++    char label[80];
++    int label_color;
++    PANEL *next;
++} PANEL_DATA;
+ 
+ #define NLINES 10
+ #define NCOLS 40
+ 
+ void init_wins(WINDOW **wins, int n);
+-void win_show(WINDOW *win, char *label, int label_color);
+-void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color);
++void win_show(WINDOW *win, const char *label, int label_color);
++void print_in_middle(WINDOW *win, int starty, int startx,
++                     int width, const char *string, chtype color);
+ void set_user_ptrs(PANEL **panels, int n);
+ 
+-int main()
+-{       WINDOW *my_wins[3];
+-        PANEL  *my_panels[3];
+-        PANEL_DATA  *top;
+-        PANEL *stack_top;
+-        WINDOW *temp_win, *old_win;
+-        int ch;
+-        int newx, newy, neww, newh;
+-        int size = FALSE, move = FALSE;
+-
+-        /* Initialize curses */
+-        initscr();
+-        start_color();
+-        cbreak();
+-        noecho();
+-        keypad(stdscr, TRUE);
+-
+-        /* Initialize all the colors */
+-        init_pair(1, COLOR_RED, COLOR_BLACK);
+-        init_pair(2, COLOR_GREEN, COLOR_BLACK);
+-        init_pair(3, COLOR_BLUE, COLOR_BLACK);
+-        init_pair(4, COLOR_CYAN, COLOR_BLACK);
+-
+-        init_wins(my_wins, 3);
+-        
+-        /* Attach a panel to each window */     /* Order is bottom up */
+-        my_panels[0] = new_panel(my_wins[0]);   /* Push 0, order: stdscr-0 */
+-        my_panels[1] = new_panel(my_wins[1]);   /* Push 1, order: stdscr-0-1 */
+-        my_panels[2] = new_panel(my_wins[2]);   /* Push 2, order: stdscr-0-1-2 */
+-
+-        set_user_ptrs(my_panels, 3);
+-        /* Update the stacking order. 2nd panel will be on top */
+-        update_panels();
++int
++main(void)
++{
++    WINDOW *my_wins[3];
++    PANEL *my_panels[3];
++    PANEL_DATA *top;
++    PANEL *stack_top;
++    WINDOW *temp_win, *old_win;
++    int ch;
++    int newx, newy, neww, newh;
++    int size = FALSE, move = FALSE;
++
++    /* Initialize curses */
++    initscr();
++    start_color();
++    cbreak();
++    noecho();
++    keypad(stdscr, TRUE);
++
++    /* Initialize all the colors */
++    init_pair(1, COLOR_RED, COLOR_BLACK);
++    init_pair(2, COLOR_GREEN, COLOR_BLACK);
++    init_pair(3, COLOR_BLUE, COLOR_BLACK);
++    init_pair(4, COLOR_CYAN, COLOR_BLACK);
++
++    init_wins(my_wins, 3);
++
++    /* Attach a panel to each window */
++    /* Order is bottom up */
++    my_panels[0] = new_panel(my_wins[0]);       /* Push 0, order: stdscr-0 */
++    my_panels[1] = new_panel(my_wins[1]);       /* Push 1, order: stdscr-0-1 */
++    my_panels[2] = new_panel(my_wins[2]);       /* Push 2, order: stdscr-0-1-2 */
++
++    set_user_ptrs(my_panels, 3);
++    /* Update the stacking order. 2nd panel will be on top */
++    update_panels();
++
++    /* Show it on the screen */
++    attron(COLOR_PAIR(4));
++    mvprintw(LINES - 3, 0, "Use 'm' for moving, 'r' for resizing");
++    mvprintw(LINES - 2, 0,
++             "Use tab to browse through the windows (F1 to Exit)");
++    attroff(COLOR_PAIR(4));
++    doupdate();
++
++    stack_top = my_panels[2];
++    top = (PANEL_DATA *) panel_userptr(stack_top);
++    newx = top->x;
++    newy = top->y;
++    neww = top->w;
++    newh = top->h;
++    while ((ch = getch()) != KEY_F(1)) {
++        switch (ch) {
++        case 9:         /* Tab */
++            top = (PANEL_DATA *) panel_userptr(stack_top);
++            top_panel(top->next);
++            stack_top = top->next;
++            top = (PANEL_DATA *) panel_userptr(stack_top);
++            newx = top->x;
++            newy = top->y;
++            neww = top->w;
++            newh = top->h;
++            break;
++        case 'r':               /* Re-Size */
++            size = TRUE;
++            attron(COLOR_PAIR(4));
++            mvprintw(LINES - 4, 0,
++                     "Entered Resizing :Use Arrow Keys to resize and press <ENTER> to end resizing");
++            refresh();
++            attroff(COLOR_PAIR(4));
++            break;
++        case 'm':               /* Move */
++            attron(COLOR_PAIR(4));
++            mvprintw(LINES - 4, 0,
++                     "Entered Moving: Use Arrow Keys to Move and press <ENTER> to end moving");
++            refresh();
++            attroff(COLOR_PAIR(4));
++            move = TRUE;
++            break;
++        case KEY_LEFT:
++            if (size == TRUE) {
++                --newx;
++                ++neww;
++            }
++            if (move == TRUE)
++                --newx;
++            break;
++        case KEY_RIGHT:
++            if (size == TRUE) {
++                ++newx;
++                --neww;
++            }
++            if (move == TRUE)
++                ++newx;
++            break;
++        case KEY_UP:
++            if (size == TRUE) {
++                --newy;
++                ++newh;
++            }
++            if (move == TRUE)
++                --newy;
++            break;
++        case KEY_DOWN:
++            if (size == TRUE) {
++                ++newy;
++                --newh;
++            }
++            if (move == TRUE)
++                ++newy;
++            break;
++        case 10:                /* Enter */
++            move(LINES - 4, 0);
++            clrtoeol();
++            refresh();
++            if (size == TRUE) {
++                old_win = panel_window(stack_top);
++                temp_win = newwin(newh, neww, newy, newx);
++                replace_panel(stack_top, temp_win);
++                win_show(temp_win, top->label, top->label_color);
++                delwin(old_win);
++                size = FALSE;
++            }
++            if (move == TRUE) {
++                move_panel(stack_top, newy, newx);
++                move = FALSE;
++            }
++            break;
+ 
+-        /* Show it on the screen */
++        }
+         attron(COLOR_PAIR(4));
+         mvprintw(LINES - 3, 0, "Use 'm' for moving, 'r' for resizing");
+-        mvprintw(LINES - 2, 0, "Use tab to browse through the windows (F1 to Exit)");
++        mvprintw(LINES - 2, 0,
++                 "Use tab to browse through the windows (F1 to Exit)");
+         attroff(COLOR_PAIR(4));
++        refresh();
++        update_panels();
+         doupdate();
+-
+-        stack_top = my_panels[2];
+-        top = (PANEL_DATA *)panel_userptr(stack_top);
+-        newx = top->x;
+-        newy = top->y;
+-        neww = top->w;
+-        newh = top->h;
+-        while((ch = getch()) != KEY_F(1))
+-        {       switch(ch)
+-                {       case 9:         /* Tab */
+-                                top = (PANEL_DATA *)panel_userptr(stack_top);
+-                                top_panel(top->next);
+-                                stack_top = top->next;
+-                                top = (PANEL_DATA *)panel_userptr(stack_top);
+-                                newx = top->x;
+-                                newy = top->y;
+-                                neww = top->w;
+-                                newh = top->h;
+-                                break;
+-                        case 'r':       /* Re-Size*/
+-                                size = TRUE;
+-                                attron(COLOR_PAIR(4));
+-                                mvprintw(LINES - 4, 0, "Entered Resizing :Use Arrow Keys to resize and press <ENTER> to end resizing");
+-                                refresh();
+-                                attroff(COLOR_PAIR(4));
+-                                break;
+-                        case 'm':       /* Move */
+-                                attron(COLOR_PAIR(4));
+-                                mvprintw(LINES - 4, 0, "Entered Moving: Use Arrow Keys to Move and press <ENTER> to end moving");
+-                                refresh();
+-                                attroff(COLOR_PAIR(4));
+-                                move = TRUE;
+-                                break;
+-                        case KEY_LEFT:
+-                                if(size == TRUE)
+-                                {       --newx;
+-                                        ++neww;
+-                                }
+-                                if(move == TRUE)
+-                                        --newx;
+-                                break;
+-                        case KEY_RIGHT:
+-                                if(size == TRUE)
+-                                {       ++newx;
+-                                        --neww;
+-                                }
+-                                if(move == TRUE)
+-                                        ++newx;
+-                                break;
+-                        case KEY_UP:
+-                                if(size == TRUE)
+-                                {       --newy;
+-                                        ++newh;
+-                                }
+-                                if(move == TRUE)
+-                                        --newy;
+-                                break;
+-                        case KEY_DOWN:
+-                                if(size == TRUE)
+-                                {       ++newy;
+-                                        --newh;
+-                                }
+-                                if(move == TRUE)
+-                                        ++newy;
+-                                break;
+-                        case 10:        /* Enter */
+-                                move(LINES - 4, 0);
+-                                clrtoeol();
+-                                refresh();
+-                                if(size == TRUE)
+-                                {       old_win = panel_window(stack_top);
+-                                        temp_win = newwin(newh, neww, newy, newx);
+-                                        replace_panel(stack_top, temp_win);
+-                                        win_show(temp_win, top->label, top->label_color); 
+-                                        delwin(old_win);
+-                                        size = FALSE;
+-                                }
+-                                if(move == TRUE)
+-                                {       move_panel(stack_top, newy, newx);
+-                                        move = FALSE;
+-                                }
+-                                break;
+-                        
+-                }
+-                attron(COLOR_PAIR(4));
+-                mvprintw(LINES - 3, 0, "Use 'm' for moving, 'r' for resizing");
+-                mvprintw(LINES - 2, 0, "Use tab to browse through the windows (F1 to Exit)");
+-                attroff(COLOR_PAIR(4));
+-                refresh();      
+-                update_panels();
+-                doupdate();
+-        }
+-        endwin();
+-        return 0;
++    }
++    endwin();
++    return 0;
+ }
+ 
+ /* Put all the windows */
+-void init_wins(WINDOW **wins, int n)
+-{       int x, y, i;
+-        char label[80];
+-
+-        y = 2;
+-        x = 10;
+-        for(i = 0; i < n; ++i)
+-        {       wins[i] = newwin(NLINES, NCOLS, y, x);
+-                sprintf(label, "Window Number %d", i + 1);
+-                win_show(wins[i], label, i + 1);
+-                y += 3;
+-                x += 7;
+-        }
++void
++init_wins(WINDOW **wins, int n)
++{
++    int x, y, i;
++    char label[80];
++
++    y = 2;
++    x = 10;
++    for (i = 0; i < n; ++i) {
++        wins[i] = newwin(NLINES, NCOLS, y, x);
++        sprintf(label, "Window Number %d", i + 1);
++        win_show(wins[i], label, i + 1);
++        y += 3;
++        x += 7;
++    }
+ }
+ 
+ /* Set the PANEL_DATA structures for individual panels */
+-void set_user_ptrs(PANEL **panels, int n)
+-{       PANEL_DATA *ptrs;
+-        WINDOW *win;
+-        int x, y, w, h, i;
+-        char temp[80];
+-        
+-        ptrs = (PANEL_DATA *)calloc(n, sizeof(PANEL_DATA));
+-
+-        for(i = 0;i < n; ++i)
+-        {       win = panel_window(panels[i]);
+-                getbegyx(win, y, x);
+-                getmaxyx(win, h, w);
+-                ptrs[i].x = x;
+-                ptrs[i].y = y;
+-                ptrs[i].w = w;
+-                ptrs[i].h = h;
+-                sprintf(temp, "Window Number %d", i + 1);
+-                strcpy(ptrs[i].label, temp);
+-                ptrs[i].label_color = i + 1;
+-                if(i + 1 == n)
+-                        ptrs[i].next = panels[0];
+-                else
+-                        ptrs[i].next = panels[i + 1];
+-                set_panel_userptr(panels[i], &ptrs[i]);
+-        }
++void
++set_user_ptrs(PANEL **panels, int n)
++{
++    PANEL_DATA *ptrs;
++    WINDOW *win;
++    int x, y, w, h, i;
++    char temp[80];
++
++    ptrs = (PANEL_DATA *) calloc((size_t) n, sizeof(PANEL_DATA));
++
++    for (i = 0; i < n; ++i) {
++        win = panel_window(panels[i]);
++        getbegyx(win, y, x);
++        getmaxyx(win, h, w);
++        ptrs[i].x = x;
++        ptrs[i].y = y;
++        ptrs[i].w = w;
++        ptrs[i].h = h;
++        sprintf(temp, "Window Number %d", i + 1);
++        strcpy(ptrs[i].label, temp);
++        ptrs[i].label_color = i + 1;
++        if (i + 1 == n)
++            ptrs[i].next = panels[0];
++        else
++            ptrs[i].next = panels[i + 1];
++        set_panel_userptr(panels[i], &ptrs[i]);
++    }
+ }
+ 
+ /* Show the window with a border and a label */
+-void win_show(WINDOW *win, char *label, int label_color)
+-{       int startx, starty, height, width;
++void
++win_show(WINDOW *win, const char *label, int label_color)
++{
++    int height, width;
++
++    getmaxyx(win, height, width);
++    (void) height;
+ 
+-        getbegyx(win, starty, startx);
+-        getmaxyx(win, height, width);
++    box(win, 0, 0);
++    mvwaddch(win, 2, 0, ACS_LTEE);
++    mvwhline(win, 2, 1, ACS_HLINE, width - 2);
++    mvwaddch(win, 2, width - 1, ACS_RTEE);
+ 
+-        box(win, 0, 0);
+-        mvwaddch(win, 2, 0, ACS_LTEE); 
+-        mvwhline(win, 2, 1, ACS_HLINE, width - 2); 
+-        mvwaddch(win, 2, width - 1, ACS_RTEE); 
+-        
+-        print_in_middle(win, 1, 0, width, label, COLOR_PAIR(label_color));
++    print_in_middle(win, 1, 0, width, label, COLOR_PAIR(label_color));
+ }
+ 
+-void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color)
+-{       int length, x, y;
+-        float temp;
+-
+-        if(win == NULL)
+-                win = stdscr;
+-        getyx(win, y, x);
+-        if(startx != 0)
+-                x = startx;
+-        if(starty != 0)
+-                y = starty;
+-        if(width == 0)
+-                width = 80;
+-
+-        length = strlen(string);
+-        temp = (width - length)/ 2;
+-        x = startx + (int)temp;
+-        wattron(win, color);
+-        mvwprintw(win, y, x, "%s", string);
+-        wattroff(win, color);
+-        refresh();
++void
++print_in_middle(WINDOW *win, int starty, int startx,
++                int width, const char *string, chtype color)
++{
++    int length, x, y;
++    float temp;
++
++    if (win == NULL)
++        win = stdscr;
++    getyx(win, y, x);
++    if (startx != 0)
++        x = startx;
++    if (starty != 0)
++        y = starty;
++    if (width == 0)
++        width = 80;
++
++    length = (int) strlen(string);
++    temp = (float) (width - length) / 2;
++    x = startx + (int) temp;
++    wattron(win, color);
++    mvwprintw(win, y, x, "%s", string);
++    wattroff(win, color);
++    refresh();
+ }
+         
+ 
+@@ -3952,158 +4038,167 @@
+ #include <panel.h>
+ 
+ typedef struct _PANEL_DATA {
+-        int hide;       /* TRUE if panel is hidden */
+-}PANEL_DATA;
++    int hide;                   /* TRUE if panel is hidden */
++} PANEL_DATA;
+ 
+ #define NLINES 10
+ #define NCOLS 40
+ 
+ void init_wins(WINDOW **wins, int n);
+-void win_show(WINDOW *win, char *label, int label_color);
+-void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color);
+-
+-int main()
+-{       WINDOW *my_wins[3];
+-        PANEL  *my_panels[3];
+-        PANEL_DATA panel_datas[3];
+-        PANEL_DATA *temp;
+-        int ch;
+-
+-        /* Initialize curses */
+-        initscr();
+-        start_color();
+-        cbreak();
+-        noecho();
+-        keypad(stdscr, TRUE);
+-
+-        /* Initialize all the colors */
+-        init_pair(1, COLOR_RED, COLOR_BLACK);
+-        init_pair(2, COLOR_GREEN, COLOR_BLACK);
+-        init_pair(3, COLOR_BLUE, COLOR_BLACK);
+-        init_pair(4, COLOR_CYAN, COLOR_BLACK);
+-
+-        init_wins(my_wins, 3);
+-        
+-        /* Attach a panel to each window */     /* Order is bottom up */
+-        my_panels[0] = new_panel(my_wins[0]);   /* Push 0, order: stdscr-0 */
+-        my_panels[1] = new_panel(my_wins[1]);   /* Push 1, order: stdscr-0-1 */
+-        my_panels[2] = new_panel(my_wins[2]);   /* Push 2, order: stdscr-0-1-2 */
+-
+-        /* Initialize panel data saying that nothing is hidden */
+-        panel_datas[0].hide = FALSE;
+-        panel_datas[1].hide = FALSE;
+-        panel_datas[2].hide = FALSE;
+-
+-        set_panel_userptr(my_panels[0], &panel_datas[0]);
+-        set_panel_userptr(my_panels[1], &panel_datas[1]);
+-        set_panel_userptr(my_panels[2], &panel_datas[2]);
++void win_show(WINDOW *win, const char *label, int label_color);
++void print_in_middle(WINDOW *win, int starty, int startx,
++                     int width, const char *string, chtype color);
+ 
+-        /* Update the stacking order. 2nd panel will be on top */
++int
++main(void)
++{
++    WINDOW *my_wins[3];
++    PANEL *my_panels[3];
++    PANEL_DATA panel_datas[3];
++    PANEL_DATA *temp;
++    int ch;
++
++    /* Initialize curses */
++    initscr();
++    start_color();
++    cbreak();
++    noecho();
++    keypad(stdscr, TRUE);
++
++    /* Initialize all the colors */
++    init_pair(1, COLOR_RED, COLOR_BLACK);
++    init_pair(2, COLOR_GREEN, COLOR_BLACK);
++    init_pair(3, COLOR_BLUE, COLOR_BLACK);
++    init_pair(4, COLOR_CYAN, COLOR_BLACK);
++
++    init_wins(my_wins, 3);
++
++    /* Attach a panel to each window */
++    /* Order is bottom up */
++    my_panels[0] = new_panel(my_wins[0]);       /* Push 0, order: stdscr-0 */
++    my_panels[1] = new_panel(my_wins[1]);       /* Push 1, order: stdscr-0-1 */
++    my_panels[2] = new_panel(my_wins[2]);       /* Push 2, order: stdscr-0-1-2 */
++
++    /* Initialize panel data saying that nothing is hidden */
++    panel_datas[0].hide = FALSE;
++    panel_datas[1].hide = FALSE;
++    panel_datas[2].hide = FALSE;
++
++    set_panel_userptr(my_panels[0], &panel_datas[0]);
++    set_panel_userptr(my_panels[1], &panel_datas[1]);
++    set_panel_userptr(my_panels[2], &panel_datas[2]);
++
++    /* Update the stacking order. 2nd panel will be on top */
++    update_panels();
++
++    /* Show it on the screen */
++    attron(COLOR_PAIR(4));
++    mvprintw(LINES - 3, 0,
++             "Show or Hide a window with 'a'(first window)  'b'(Second Window)  'c'(Third Window)");
++    mvprintw(LINES - 2, 0, "F1 to Exit");
++
++    attroff(COLOR_PAIR(4));
++    doupdate();
++
++    while ((ch = getch()) != KEY_F(1)) {
++        switch (ch) {
++        case 'a':
++            temp = (PANEL_DATA *) panel_userptr(my_panels[0]);
++            if (temp->hide == FALSE) {
++                hide_panel(my_panels[0]);
++                temp->hide = TRUE;
++            } else {
++                show_panel(my_panels[0]);
++                temp->hide = FALSE;
++            }
++            break;
++        case 'b':
++            temp = (PANEL_DATA *) panel_userptr(my_panels[1]);
++            if (temp->hide == FALSE) {
++                hide_panel(my_panels[1]);
++                temp->hide = TRUE;
++            } else {
++                show_panel(my_panels[1]);
++                temp->hide = FALSE;
++            }
++            break;
++        case 'c':
++            temp = (PANEL_DATA *) panel_userptr(my_panels[2]);
++            if (temp->hide == FALSE) {
++                hide_panel(my_panels[2]);
++                temp->hide = TRUE;
++            } else {
++                show_panel(my_panels[2]);
++                temp->hide = FALSE;
++            }
++            break;
++        }
+         update_panels();
+-
+-        /* Show it on the screen */
+-        attron(COLOR_PAIR(4));
+-        mvprintw(LINES - 3, 0, "Show or Hide a window with 'a'(first window)  'b'(Second Window)  'c'(Third Window)");
+-        mvprintw(LINES - 2, 0, "F1 to Exit");
+-
+-        attroff(COLOR_PAIR(4));
+         doupdate();
+-        
+-        while((ch = getch()) != KEY_F(1))
+-        {       switch(ch)
+-                {       case 'a':                       
+-                                temp = (PANEL_DATA *)panel_userptr(my_panels[0]);
+-                                if(temp->hide == FALSE)
+-                                {       hide_panel(my_panels[0]);
+-                                        temp->hide = TRUE;
+-                                }
+-                                else
+-                                {       show_panel(my_panels[0]);
+-                                        temp->hide = FALSE;
+-                                }
+-                                break;
+-                        case 'b':
+-                                temp = (PANEL_DATA *)panel_userptr(my_panels[1]);
+-                                if(temp->hide == FALSE)
+-                                {       hide_panel(my_panels[1]);
+-                                        temp->hide = TRUE;
+-                                }
+-                                else
+-                                {       show_panel(my_panels[1]);
+-                                        temp->hide = FALSE;
+-                                }
+-                                break;
+-                        case 'c':
+-                                temp = (PANEL_DATA *)panel_userptr(my_panels[2]);
+-                                if(temp->hide == FALSE)
+-                                {       hide_panel(my_panels[2]);
+-                                        temp->hide = TRUE;
+-                                }
+-                                else
+-                                {       show_panel(my_panels[2]);
+-                                        temp->hide = FALSE;
+-                                }
+-                                break;
+-                }
+-                update_panels();
+-                doupdate();
+-        }
+-        endwin();
+-        return 0;
++    }
++    endwin();
++    return 0;
+ }
+ 
+ /* Put all the windows */
+-void init_wins(WINDOW **wins, int n)
+-{       int x, y, i;
+-        char label[80];
+-
+-        y = 2;
+-        x = 10;
+-        for(i = 0; i < n; ++i)
+-        {       wins[i] = newwin(NLINES, NCOLS, y, x);
+-                sprintf(label, "Window Number %d", i + 1);
+-                win_show(wins[i], label, i + 1);
+-                y += 3;
+-                x += 7;
+-        }
++void
++init_wins(WINDOW **wins, int n)
++{
++    int x, y, i;
++    char label[80];
++
++    y = 2;
++    x = 10;
++    for (i = 0; i < n; ++i) {
++        wins[i] = newwin(NLINES, NCOLS, y, x);
++        sprintf(label, "Window Number %d", i + 1);
++        win_show(wins[i], label, i + 1);
++        y += 3;
++        x += 7;
++    }
+ }
+ 
+ /* Show the window with a border and a label */
+-void win_show(WINDOW *win, char *label, int label_color)
+-{       int startx, starty, height, width;
++void
++win_show(WINDOW *win, const char *label, int label_color)
++{
++    int height, width;
++
++    getmaxyx(win, height, width);
++    (void) height;
+ 
+-        getbegyx(win, starty, startx);
+-        getmaxyx(win, height, width);
++    box(win, 0, 0);
++    mvwaddch(win, 2, 0, ACS_LTEE);
++    mvwhline(win, 2, 1, ACS_HLINE, width - 2);
++    mvwaddch(win, 2, width - 1, ACS_RTEE);
+ 
+-        box(win, 0, 0);
+-        mvwaddch(win, 2, 0, ACS_LTEE); 
+-        mvwhline(win, 2, 1, ACS_HLINE, width - 2); 
+-        mvwaddch(win, 2, width - 1, ACS_RTEE); 
+-        
+-        print_in_middle(win, 1, 0, width, label, COLOR_PAIR(label_color));
++    print_in_middle(win, 1, 0, width, label, COLOR_PAIR(label_color));
+ }
+ 
+-void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color)
+-{       int length, x, y;
+-        float temp;
+-
+-        if(win == NULL)
+-                win = stdscr;
+-        getyx(win, y, x);
+-        if(startx != 0)
+-                x = startx;
+-        if(starty != 0)
+-                y = starty;
+-        if(width == 0)
+-                width = 80;
+-
+-        length = strlen(string);
+-        temp = (width - length)/ 2;
+-        x = startx + (int)temp;
+-        wattron(win, color);
+-        mvwprintw(win, y, x, "%s", string);
+-        wattroff(win, color);
+-        refresh();
++void
++print_in_middle(WINDOW *win, int starty, int startx,
++                int width, const char *string, chtype color)
++{
++    int length, x, y;
++    float temp;
++
++    if (win == NULL)
++        win = stdscr;
++    getyx(win, y, x);
++    if (startx != 0)
++        x = startx;
++    if (starty != 0)
++        y = starty;
++    if (width == 0)
++        width = 80;
++
++    length = (int) strlen(string);
++    temp = (float) (width - length) / 2;
++    x = startx + (int) temp;
++    wattron(win, color);
++    mvwprintw(win, y, x, "%s", string);
++    wattroff(win, color);
++    refresh();
+ }
+         
+       
+@@ -4235,56 +4330,56 @@
+ #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+ #define CTRLD   4
+ 
+-char *choices[] = {
+-                        "Choice 1",
+-                        "Choice 2",
+-                        "Choice 3",
+-                        "Choice 4",
+-                        "Exit",
+-                  };
+-
+-int main()
+-{       ITEM **my_items;
+-        int c;                          
+-        MENU *my_menu;
+-        int n_choices, i;
+-        ITEM *cur_item;
+-        
+-        
+-        initscr();
+-        cbreak();
+-        noecho();
+-        keypad(stdscr, TRUE);
+-        
+-        n_choices = ARRAY_SIZE(choices);
+-        my_items = (ITEM **)calloc(n_choices + 1, sizeof(ITEM *));
+-
+-        for(i = 0; i < n_choices; ++i)
+-                my_items[i] = new_item(choices[i], choices[i]);
+-        my_items[n_choices] = (ITEM *)NULL;
+-
+-        my_menu = new_menu((ITEM **)my_items);
+-        mvprintw(LINES - 2, 0, "F1 to Exit");
+-        post_menu(my_menu);
+-        refresh();
++const char *choices[] =
++{
++    "Choice 1",
++    "Choice 2",
++    "Choice 3",
++    "Choice 4",
++    "Exit",
++};
+ 
+-        while((c = getch()) != KEY_F(1))
+-        {   switch(c)
+-            {   case KEY_DOWN:
+-                        menu_driver(my_menu, REQ_DOWN_ITEM);
+-                                break;
+-                        case KEY_UP:
+-                                menu_driver(my_menu, REQ_UP_ITEM);
+-                                break;
+-                }
+-        }       
++int
++main(void)
++{
++    ITEM **my_items;
++    int c;
++    MENU *my_menu;
++    int n_choices, i;
++
++    initscr();
++    cbreak();
++    noecho();
++    keypad(stdscr, TRUE);
++
++    n_choices = ARRAY_SIZE(choices);
++    my_items = (ITEM **) calloc((size_t) (n_choices + 1), sizeof(ITEM *));
++
++    for (i = 0; i < n_choices; ++i)
++        my_items[i] = new_item(choices[i], choices[i]);
++    my_items[n_choices] = (ITEM *) NULL;
++
++    my_menu = new_menu((ITEM **) my_items);
++    mvprintw(LINES - 2, 0, "F1 to Exit");
++    post_menu(my_menu);
++    refresh();
+ 
+-        free_item(my_items[0]);
+-        free_item(my_items[1]);
+-        free_menu(my_menu);
+-        endwin();
+-}
+-        
++    while ((c = getch()) != KEY_F(1)) {
++        switch (c) {
++        case KEY_DOWN:
++            menu_driver(my_menu, REQ_DOWN_ITEM);
++            break;
++        case KEY_UP:
++            menu_driver(my_menu, REQ_UP_ITEM);
++            break;
++        }
++    }
++
++    free_item(my_items[0]);
++    free_item(my_items[1]);
++    free_menu(my_menu);
++    endwin();
++}
+         
+ 
+         
                                                                                                    This program demonstrates the basic concepts involved in
+@@ -4304,21 +4399,21 @@
+         requests.
                                                                                                    
+ 
+         
                                                                                                    
     REQ_LEFT_ITEM         Move left to an item.
+-     REQ_RIGHT_ITEM      Move right to an item.
+-     REQ_UP_ITEM         Move up to an item.
+-     REQ_DOWN_ITEM       Move down to an item.
+-     REQ_SCR_ULINE       Scroll up a line.
+-     REQ_SCR_DLINE          Scroll down a line.
+-     REQ_SCR_DPAGE          Scroll down a page.
+-     REQ_SCR_UPAGE         Scroll up a page.
++        "PROGRAMLISTING">
     REQ_LEFT_ITEM      Move left to an item.
++     REQ_RIGHT_ITEM     Move right to an item.
++     REQ_UP_ITEM        Move up to an item.
++     REQ_DOWN_ITEM      Move down to an item.
++     REQ_SCR_ULINE      Scroll up a line.
++     REQ_SCR_DLINE      Scroll down a line.
++     REQ_SCR_DPAGE      Scroll down a page.
++     REQ_SCR_UPAGE      Scroll up a page.
+      REQ_FIRST_ITEM     Move to the first item.
+-     REQ_LAST_ITEM         Move to the last item.
+-     REQ_NEXT_ITEM         Move to the next item.
+-     REQ_PREV_ITEM         Move to the previous item. 
+-     REQ_TOGGLE_ITEM     Select/deselect an item.
+-     REQ_CLEAR_PATTERN     Clear the menu pattern buffer.
+-     REQ_BACK_PATTERN      Delete the previous character from the pattern buffer.
++     REQ_LAST_ITEM      Move to the last item.
++     REQ_NEXT_ITEM      Move to the next item.
++     REQ_PREV_ITEM      Move to the previous item.
++     REQ_TOGGLE_ITEM    Select/deselect an item.
++     REQ_CLEAR_PATTERN  Clear the menu pattern buffer.
++     REQ_BACK_PATTERN   Delete the previous character from the pattern buffer.
+      REQ_NEXT_MATCH     Move to the next item matching the pattern match.
+      REQ_PREV_MATCH     Move to the previous item matching the pattern match.
                                                                                                    
+         
                                                                                                    Don't get overwhelmed by the number of options. We will
+@@ -4485,105 +4580,113 @@
+ #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+ #define CTRLD   4
+ 
+-char *choices[] = {
+-                        "Choice 1",
+-                        "Choice 2",
+-                        "Choice 3",
+-                        "Choice 4",
+-                        "Exit",
+-                        (char *)NULL,
+-                  };
+-void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color);
+-
+-int main()
+-{       ITEM **my_items;
+-        int c;                          
+-        MENU *my_menu;
+-        WINDOW *my_menu_win;
+-        int n_choices, i;
+-        
+-        /* Initialize curses */
+-        initscr();
+-        start_color();
+-        cbreak();
+-        noecho();
+-        keypad(stdscr, TRUE);
+-        init_pair(1, COLOR_RED, COLOR_BLACK);
+-
+-        /* Create items */
+-        n_choices = ARRAY_SIZE(choices);
+-        my_items = (ITEM **)calloc(n_choices, sizeof(ITEM *));
+-        for(i = 0; i < n_choices; ++i)
+-                my_items[i] = new_item(choices[i], choices[i]);
+-
+-        /* Create menu */
+-        my_menu = new_menu((ITEM **)my_items);
+-
+-        /* Create the window to be associated with the menu */
+-        my_menu_win = newwin(10, 40, 4, 4);
+-        keypad(my_menu_win, TRUE);
+-     
+-        /* Set main window and sub window */
+-        set_menu_win(my_menu, my_menu_win);
+-        set_menu_sub(my_menu, derwin(my_menu_win, 6, 38, 3, 1));
+-
+-        /* Set menu mark to the string " * " */
+-        set_menu_mark(my_menu, " * ");
+-
+-        /* Print a border around the main window and print a title */
+-        box(my_menu_win, 0, 0);
+-        print_in_middle(my_menu_win, 1, 0, 40, "My Menu", COLOR_PAIR(1));
+-        mvwaddch(my_menu_win, 2, 0, ACS_LTEE);
+-        mvwhline(my_menu_win, 2, 1, ACS_HLINE, 38);
+-        mvwaddch(my_menu_win, 2, 39, ACS_RTEE);
+-        mvprintw(LINES - 2, 0, "F1 to exit");
+-        refresh();
+-        
+-        /* Post the menu */
+-        post_menu(my_menu);
+-        wrefresh(my_menu_win);
++const char *choices[] =
++{
++    "Choice 1",
++    "Choice 2",
++    "Choice 3",
++    "Choice 4",
++    "Exit",
++    (char *) NULL,
++};
+ 
+-        while((c = wgetch(my_menu_win)) != KEY_F(1))
+-        {       switch(c)
+-                {       case KEY_DOWN:
+-                                menu_driver(my_menu, REQ_DOWN_ITEM);
+-                                break;
+-                        case KEY_UP:
+-                                menu_driver(my_menu, REQ_UP_ITEM);
+-                                break;
+-                }
+-                wrefresh(my_menu_win);
+-        }       
++void print_in_middle(WINDOW *win, int starty, int startx,
++                     int width, const char *string, chtype color);
+ 
+-        /* Unpost and free all the memory taken up */
+-        unpost_menu(my_menu);
+-        free_menu(my_menu);
+-        for(i = 0; i < n_choices; ++i)
+-                free_item(my_items[i]);
+-        endwin();
++int
++main(void)
++{
++    ITEM **my_items;
++    int c;
++    MENU *my_menu;
++    WINDOW *my_menu_win;
++    int n_choices, i;
++
++    /* Initialize curses */
++    initscr();
++    start_color();
++    cbreak();
++    noecho();
++    keypad(stdscr, TRUE);
++    init_pair(1, COLOR_RED, COLOR_BLACK);
++
++    /* Create items */
++    n_choices = ARRAY_SIZE(choices);
++    my_items = (ITEM **) calloc((size_t) n_choices, sizeof(ITEM *));
++    for (i = 0; i < n_choices; ++i)
++        my_items[i] = new_item(choices[i], choices[i]);
++
++    /* Create menu */
++    my_menu = new_menu((ITEM **) my_items);
++
++    /* Create the window to be associated with the menu */
++    my_menu_win = newwin(10, 40, 4, 4);
++    keypad(my_menu_win, TRUE);
++
++    /* Set main window and sub window */
++    set_menu_win(my_menu, my_menu_win);
++    set_menu_sub(my_menu, derwin(my_menu_win, 6, 38, 3, 1));
++
++    /* Set menu mark to the string " * " */
++    set_menu_mark(my_menu, " * ");
++
++    /* Print a border around the main window and print a title */
++    box(my_menu_win, 0, 0);
++    print_in_middle(my_menu_win, 1, 0, 40, "My Menu", COLOR_PAIR(1));
++    mvwaddch(my_menu_win, 2, 0, ACS_LTEE);
++    mvwhline(my_menu_win, 2, 1, ACS_HLINE, 38);
++    mvwaddch(my_menu_win, 2, 39, ACS_RTEE);
++    mvprintw(LINES - 2, 0, "F1 to exit");
++    refresh();
++
++    /* Post the menu */
++    post_menu(my_menu);
++    wrefresh(my_menu_win);
++
++    while ((c = wgetch(my_menu_win)) != KEY_F(1)) {
++        switch (c) {
++        case KEY_DOWN:
++            menu_driver(my_menu, REQ_DOWN_ITEM);
++            break;
++        case KEY_UP:
++            menu_driver(my_menu, REQ_UP_ITEM);
++            break;
++        }
++        wrefresh(my_menu_win);
++    }
++
++    /* Unpost and free all the memory taken up */
++    unpost_menu(my_menu);
++    free_menu(my_menu);
++    for (i = 0; i < n_choices; ++i)
++        free_item(my_items[i]);
++    endwin();
+ }
+ 
+-void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color)
+-{       int length, x, y;
+-        float temp;
+-
+-        if(win == NULL)
+-                win = stdscr;
+-        getyx(win, y, x);
+-        if(startx != 0)
+-                x = startx;
+-        if(starty != 0)
+-                y = starty;
+-        if(width == 0)
+-                width = 80;
+-
+-        length = strlen(string);
+-        temp = (width - length)/ 2;
+-        x = startx + (int)temp;
+-        wattron(win, color);
+-        mvwprintw(win, y, x, "%s", string);
+-        wattroff(win, color);
+-        refresh();
++void
++print_in_middle(WINDOW *win, int starty, int startx,
++                int width, const char *string, chtype color)
++{
++    int length, x, y;
++    float temp;
++
++    if (win == NULL)
++        win = stdscr;
++    getyx(win, y, x);
++    if (startx != 0)
++        x = startx;
++    if (starty != 0)
++        y = starty;
++    if (width == 0)
++        width = 80;
++
++    length = (int) strlen(string);
++    temp = (float) (width - length) / 2;
++    x = startx + (int) temp;
++    wattron(win, color);
++    mvwprintw(win, y, x, "%s", string);
++    wattroff(win, color);
++    refresh();
+ }
+         
+ 
+@@ -4624,123 +4727,132 @@
+ #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+ #define CTRLD   4
+ 
+-char *choices[] = {
+-                        "Choice 1",
+-                        "Choice 2",
+-                        "Choice 3",
+-                        "Choice 4",
+-                        "Choice 5",
+-                        "Choice 6",
+-                        "Choice 7",
+-                        "Choice 8",
+-                        "Choice 9",
+-                        "Choice 10",
+-                        "Exit",
+-                        (char *)NULL,
+-                  };
+-void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color);
+-
+-int main()
+-{       ITEM **my_items;
+-        int c;                          
+-        MENU *my_menu;
+-        WINDOW *my_menu_win;
+-        int n_choices, i;
+-        
+-        /* Initialize curses */
+-        initscr();
+-        start_color();
+-        cbreak();
+-        noecho();
+-        keypad(stdscr, TRUE);
+-        init_pair(1, COLOR_RED, COLOR_BLACK);
+-        init_pair(2, COLOR_CYAN, COLOR_BLACK);
+-
+-        /* Create items */
+-        n_choices = ARRAY_SIZE(choices);
+-        my_items = (ITEM **)calloc(n_choices, sizeof(ITEM *));
+-        for(i = 0; i < n_choices; ++i)
+-                my_items[i] = new_item(choices[i], choices[i]);
+-
+-        /* Create menu */
+-        my_menu = new_menu((ITEM **)my_items);
+-
+-        /* Create the window to be associated with the menu */
+-        my_menu_win = newwin(10, 40, 4, 4);
+-        keypad(my_menu_win, TRUE);
+-     
+-        /* Set main window and sub window */
+-        set_menu_win(my_menu, my_menu_win);
+-        set_menu_sub(my_menu, derwin(my_menu_win, 6, 38, 3, 1));
+-        set_menu_format(my_menu, 5, 1);
+-                        
+-        /* Set menu mark to the string " * " */
+-        set_menu_mark(my_menu, " * ");
+-
+-        /* Print a border around the main window and print a title */
+-        box(my_menu_win, 0, 0);
+-        print_in_middle(my_menu_win, 1, 0, 40, "My Menu", COLOR_PAIR(1));
+-        mvwaddch(my_menu_win, 2, 0, ACS_LTEE);
+-        mvwhline(my_menu_win, 2, 1, ACS_HLINE, 38);
+-        mvwaddch(my_menu_win, 2, 39, ACS_RTEE);
+-        
+-        /* Post the menu */
+-        post_menu(my_menu);
+-        wrefresh(my_menu_win);
+-        
+-        attron(COLOR_PAIR(2));
+-        mvprintw(LINES - 2, 0, "Use PageUp and PageDown to scroll down or up a page of items");
+-        mvprintw(LINES - 1, 0, "Arrow Keys to navigate (F1 to Exit)");
+-        attroff(COLOR_PAIR(2));
+-        refresh();
++const char *choices[] =
++{
++    "Choice 1",
++    "Choice 2",
++    "Choice 3",
++    "Choice 4",
++    "Choice 5",
++    "Choice 6",
++    "Choice 7",
++    "Choice 8",
++    "Choice 9",
++    "Choice 10",
++    "Exit",
++    (char *) NULL,
++};
+ 
+-        while((c = wgetch(my_menu_win)) != KEY_F(1))
+-        {       switch(c)
+-                {       case KEY_DOWN:
+-                                menu_driver(my_menu, REQ_DOWN_ITEM);
+-                                break;
+-                        case KEY_UP:
+-                                menu_driver(my_menu, REQ_UP_ITEM);
+-                                break;
+-                        case KEY_NPAGE:
+-                                menu_driver(my_menu, REQ_SCR_DPAGE);
+-                                break;
+-                        case KEY_PPAGE:
+-                                menu_driver(my_menu, REQ_SCR_UPAGE);
+-                                break;
+-                }
+-                wrefresh(my_menu_win);
+-        }       
++void print_in_middle(WINDOW *win, int starty, int startx,
++                     int width, const char *string, chtype color);
+ 
+-        /* Unpost and free all the memory taken up */
+-        unpost_menu(my_menu);
+-        free_menu(my_menu);
+-        for(i = 0; i < n_choices; ++i)
+-                free_item(my_items[i]);
+-        endwin();
++int
++main(void)
++{
++    ITEM **my_items;
++    int c;
++    MENU *my_menu;
++    WINDOW *my_menu_win;
++    int n_choices, i;
++
++    /* Initialize curses */
++    initscr();
++    start_color();
++    cbreak();
++    noecho();
++    keypad(stdscr, TRUE);
++    init_pair(1, COLOR_RED, COLOR_BLACK);
++    init_pair(2, COLOR_CYAN, COLOR_BLACK);
++
++    /* Create items */
++    n_choices = ARRAY_SIZE(choices);
++    my_items = (ITEM **) calloc((size_t) n_choices, sizeof(ITEM *));
++    for (i = 0; i < n_choices; ++i)
++        my_items[i] = new_item(choices[i], choices[i]);
++
++    /* Create menu */
++    my_menu = new_menu((ITEM **) my_items);
++
++    /* Create the window to be associated with the menu */
++    my_menu_win = newwin(10, 40, 4, 4);
++    keypad(my_menu_win, TRUE);
++
++    /* Set main window and sub window */
++    set_menu_win(my_menu, my_menu_win);
++    set_menu_sub(my_menu, derwin(my_menu_win, 6, 38, 3, 1));
++    set_menu_format(my_menu, 5, 1);
++
++    /* Set menu mark to the string " * " */
++    set_menu_mark(my_menu, " * ");
++
++    /* Print a border around the main window and print a title */
++    box(my_menu_win, 0, 0);
++    print_in_middle(my_menu_win, 1, 0, 40, "My Menu", COLOR_PAIR(1));
++    mvwaddch(my_menu_win, 2, 0, ACS_LTEE);
++    mvwhline(my_menu_win, 2, 1, ACS_HLINE, 38);
++    mvwaddch(my_menu_win, 2, 39, ACS_RTEE);
++
++    /* Post the menu */
++    post_menu(my_menu);
++    wrefresh(my_menu_win);
++
++    attron(COLOR_PAIR(2));
++    mvprintw(LINES - 2, 0,
++             "Use PageUp and PageDown to scroll down or up a page of items");
++    mvprintw(LINES - 1, 0, "Arrow Keys to navigate (F1 to Exit)");
++    attroff(COLOR_PAIR(2));
++    refresh();
++
++    while ((c = wgetch(my_menu_win)) != KEY_F(1)) {
++        switch (c) {
++        case KEY_DOWN:
++            menu_driver(my_menu, REQ_DOWN_ITEM);
++            break;
++        case KEY_UP:
++            menu_driver(my_menu, REQ_UP_ITEM);
++            break;
++        case KEY_NPAGE:
++            menu_driver(my_menu, REQ_SCR_DPAGE);
++            break;
++        case KEY_PPAGE:
++            menu_driver(my_menu, REQ_SCR_UPAGE);
++            break;
++        }
++        wrefresh(my_menu_win);
++    }
++
++    /* Unpost and free all the memory taken up */
++    unpost_menu(my_menu);
++    free_menu(my_menu);
++    for (i = 0; i < n_choices; ++i)
++        free_item(my_items[i]);
++    endwin();
+ }
+ 
+-void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color)
+-{       int length, x, y;
+-        float temp;
+-
+-        if(win == NULL)
+-                win = stdscr;
+-        getyx(win, y, x);
+-        if(startx != 0)
+-                x = startx;
+-        if(starty != 0)
+-                y = starty;
+-        if(width == 0)
+-                width = 80;
+-
+-        length = strlen(string);
+-        temp = (width - length)/ 2;
+-        x = startx + (int)temp;
+-        wattron(win, color);
+-        mvwprintw(win, y, x, "%s", string);
+-        wattroff(win, color);
+-        refresh();
++void
++print_in_middle(WINDOW *win, int starty, int startx,
++                int width, const char *string, chtype color)
++{
++    int length, x, y;
++    float temp;
++
++    if (win == NULL)
++        win = stdscr;
++    getyx(win, y, x);
++    if (startx != 0)
++        x = startx;
++    if (starty != 0)
++        y = starty;
++    if (width == 0)
++        width = 80;
++
++    length = (int) strlen(string);
++    temp = (float) (width - length) / 2;
++    x = startx + (int) temp;
++    wattron(win, color);
++    mvwprintw(win, y, x, "%s", string);
++    wattroff(win, color);
++    refresh();
+ }
+         
+ 
+@@ -4785,96 +4897,99 @@
+ #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+ #define CTRLD   4
+ 
+-char *choices[] = {
+-                        "Choice 1", "Choice 2", "Choice 3", "Choice 4", "Choice 5",
+-                        "Choice 6", "Choice 7", "Choice 8", "Choice 9", "Choice 10",
+-                        "Choice 11", "Choice 12", "Choice 13", "Choice 14", "Choice 15",
+-                        "Choice 16", "Choice 17", "Choice 18", "Choice 19", "Choice 20",
+-                        "Exit",
+-                        (char *)NULL,
+-                  };
+-
+-int main()
+-{       ITEM **my_items;
+-        int c;                          
+-        MENU *my_menu;
+-        WINDOW *my_menu_win;
+-        int n_choices, i;
+-        
+-        /* Initialize curses */
+-        initscr();
+-        start_color();
+-        cbreak();
+-        noecho();
+-        keypad(stdscr, TRUE);
+-        init_pair(1, COLOR_RED, COLOR_BLACK);
+-        init_pair(2, COLOR_CYAN, COLOR_BLACK);
+-
+-        /* Create items */
+-        n_choices = ARRAY_SIZE(choices);
+-        my_items = (ITEM **)calloc(n_choices, sizeof(ITEM *));
+-        for(i = 0; i < n_choices; ++i)
+-                my_items[i] = new_item(choices[i], choices[i]);
+-
+-        /* Create menu */
+-        my_menu = new_menu((ITEM **)my_items);
+-
+-        /* Set menu option not to show the description */
+-        menu_opts_off(my_menu, O_SHOWDESC);
+-
+-        /* Create the window to be associated with the menu */
+-        my_menu_win = newwin(10, 70, 4, 4);
+-        keypad(my_menu_win, TRUE);
+-     
+-        /* Set main window and sub window */
+-        set_menu_win(my_menu, my_menu_win);
+-        set_menu_sub(my_menu, derwin(my_menu_win, 6, 68, 3, 1));
+-        set_menu_format(my_menu, 5, 3);
+-        set_menu_mark(my_menu, " * ");
+-
+-        /* Print a border around the main window and print a title */
+-        box(my_menu_win, 0, 0);
+-        
+-        attron(COLOR_PAIR(2));
+-        mvprintw(LINES - 3, 0, "Use PageUp and PageDown to scroll");
+-        mvprintw(LINES - 2, 0, "Use Arrow Keys to navigate (F1 to Exit)");
+-        attroff(COLOR_PAIR(2));
+-        refresh();
++const char *choices[] =
++{
++    "Choice 1", "Choice 2", "Choice 3", "Choice 4", "Choice 5",
++    "Choice 6", "Choice 7", "Choice 8", "Choice 9", "Choice 10",
++    "Choice 11", "Choice 12", "Choice 13", "Choice 14", "Choice 15",
++    "Choice 16", "Choice 17", "Choice 18", "Choice 19", "Choice 20",
++    "Exit",
++    (char *) NULL,
++};
++
++int
++main(void)
++{
++    ITEM **my_items;
++    int c;
++    MENU *my_menu;
++    WINDOW *my_menu_win;
++    int n_choices, i;
++
++    /* Initialize curses */
++    initscr();
++    start_color();
++    cbreak();
++    noecho();
++    keypad(stdscr, TRUE);
++    init_pair(1, COLOR_RED, COLOR_BLACK);
++    init_pair(2, COLOR_CYAN, COLOR_BLACK);
++
++    /* Create items */
++    n_choices = ARRAY_SIZE(choices);
++    my_items = (ITEM **) calloc((size_t) n_choices, sizeof(ITEM *));
++    for (i = 0; i < n_choices; ++i)
++        my_items[i] = new_item(choices[i], choices[i]);
++
++    /* Create menu */
++    my_menu = new_menu((ITEM **) my_items);
++
++    /* Set menu option not to show the description */
++    menu_opts_off(my_menu, O_SHOWDESC);
++
++    /* Create the window to be associated with the menu */
++    my_menu_win = newwin(10, 70, 4, 4);
++    keypad(my_menu_win, TRUE);
++
++    /* Set main window and sub window */
++    set_menu_win(my_menu, my_menu_win);
++    set_menu_sub(my_menu, derwin(my_menu_win, 6, 68, 3, 1));
++    set_menu_format(my_menu, 5, 3);
++    set_menu_mark(my_menu, " * ");
++
++    /* Print a border around the main window and print a title */
++    box(my_menu_win, 0, 0);
++
++    attron(COLOR_PAIR(2));
++    mvprintw(LINES - 3, 0, "Use PageUp and PageDown to scroll");
++    mvprintw(LINES - 2, 0, "Use Arrow Keys to navigate (F1 to Exit)");
++    attroff(COLOR_PAIR(2));
++    refresh();
+ 
+-        /* Post the menu */
+-        post_menu(my_menu);
++    /* Post the menu */
++    post_menu(my_menu);
++    wrefresh(my_menu_win);
++
++    while ((c = wgetch(my_menu_win)) != KEY_F(1)) {
++        switch (c) {
++        case KEY_DOWN:
++            menu_driver(my_menu, REQ_DOWN_ITEM);
++            break;
++        case KEY_UP:
++            menu_driver(my_menu, REQ_UP_ITEM);
++            break;
++        case KEY_LEFT:
++            menu_driver(my_menu, REQ_LEFT_ITEM);
++            break;
++        case KEY_RIGHT:
++            menu_driver(my_menu, REQ_RIGHT_ITEM);
++            break;
++        case KEY_NPAGE:
++            menu_driver(my_menu, REQ_SCR_DPAGE);
++            break;
++        case KEY_PPAGE:
++            menu_driver(my_menu, REQ_SCR_UPAGE);
++            break;
++        }
+         wrefresh(my_menu_win);
+-        
+-        while((c = wgetch(my_menu_win)) != KEY_F(1))
+-        {       switch(c)
+-                {       case KEY_DOWN:
+-                                menu_driver(my_menu, REQ_DOWN_ITEM);
+-                                break;
+-                        case KEY_UP:
+-                                menu_driver(my_menu, REQ_UP_ITEM);
+-                                break;
+-                        case KEY_LEFT:
+-                                menu_driver(my_menu, REQ_LEFT_ITEM);
+-                                break;
+-                        case KEY_RIGHT:
+-                                menu_driver(my_menu, REQ_RIGHT_ITEM);
+-                                break;
+-                        case KEY_NPAGE:
+-                                menu_driver(my_menu, REQ_SCR_DPAGE);
+-                                break;
+-                        case KEY_PPAGE:
+-                                menu_driver(my_menu, REQ_SCR_UPAGE);
+-                                break;
+-                }
+-                wrefresh(my_menu_win);
+-        }       
++    }
+ 
+-        /* Unpost and free all the memory taken up */
+-        unpost_menu(my_menu);
+-        free_menu(my_menu);
+-        for(i = 0; i < n_choices; ++i)
+-                free_item(my_items[i]);
+-        endwin();
++    /* Unpost and free all the memory taken up */
++    unpost_menu(my_menu);
++    free_menu(my_menu);
++    for (i = 0; i < n_choices; ++i)
++        free_item(my_items[i]);
++    endwin();
+ }
+         
+ 
+@@ -4940,84 +5055,87 @@
+ #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+ #define CTRLD   4
+ 
+-char *choices[] = {
+-                        "Choice 1",
+-                        "Choice 2",
+-                        "Choice 3",
+-                        "Choice 4",
+-                        "Choice 5",
+-                        "Choice 6",
+-                        "Choice 7",
+-                        "Exit",
+-                  };
+-
+-int main()
+-{       ITEM **my_items;
+-        int c;                          
+-        MENU *my_menu;
+-        int n_choices, i;
+-        ITEM *cur_item;
+-        
+-        /* Initialize curses */ 
+-        initscr();
+-        cbreak();
+-        noecho();
+-        keypad(stdscr, TRUE);
+-
+-        /* Initialize items */
+-        n_choices = ARRAY_SIZE(choices);
+-        my_items = (ITEM **)calloc(n_choices + 1, sizeof(ITEM *));
+-        for(i = 0; i < n_choices; ++i)
+-                my_items[i] = new_item(choices[i], choices[i]);
+-        my_items[n_choices] = (ITEM *)NULL;
+-
+-        my_menu = new_menu((ITEM **)my_items);
+-
+-        /* Make the menu multi valued */
+-        menu_opts_off(my_menu, O_ONEVALUE);
+-
+-        mvprintw(LINES - 3, 0, "Use <SPACE> to select or unselect an item.");
+-        mvprintw(LINES - 2, 0, "<ENTER> to see presently selected items(F1 to Exit)");
+-        post_menu(my_menu);
+-        refresh();
++const char *choices[] =
++{
++    "Choice 1",
++    "Choice 2",
++    "Choice 3",
++    "Choice 4",
++    "Choice 5",
++    "Choice 6",
++    "Choice 7",
++    "Exit",
++};
+ 
+-        while((c = getch()) != KEY_F(1))
+-        {       switch(c)
+-                {       case KEY_DOWN:
+-                                menu_driver(my_menu, REQ_DOWN_ITEM);
+-                                break;
+-                        case KEY_UP:
+-                                menu_driver(my_menu, REQ_UP_ITEM);
+-                                break;
+-                        case ' ':
+-                                menu_driver(my_menu, REQ_TOGGLE_ITEM);
+-                                break;
+-                        case 10:        /* Enter */
+-                        {       char temp[200];
+-                                ITEM **items;
+-
+-                                items = menu_items(my_menu);
+-                                temp[0] = '\0';
+-                                for(i = 0; i < item_count(my_menu); ++i)
+-                                        if(item_value(items[i]) == TRUE)
+-                                        {       strcat(temp, item_name(items[i]));
+-                                                strcat(temp, " ");
+-                                        }
+-                                move(20, 0);
+-                                clrtoeol();
+-                                mvprintw(20, 0, temp);
+-                                refresh();
+-                        }
+-                        break;
+-                }
+-        }       
++int
++main(void)
++{
++    ITEM **my_items;
++    int c;
++    MENU *my_menu;
++    int n_choices, i;
++
++    /* Initialize curses */
++    initscr();
++    cbreak();
++    noecho();
++    keypad(stdscr, TRUE);
++
++    /* Initialize items */
++    n_choices = ARRAY_SIZE(choices);
++    my_items = (ITEM **) calloc((size_t) (n_choices + 1), sizeof(ITEM *));
++    for (i = 0; i < n_choices; ++i)
++        my_items[i] = new_item(choices[i], choices[i]);
++    my_items[n_choices] = (ITEM *) NULL;
++
++    my_menu = new_menu((ITEM **) my_items);
++
++    /* Make the menu multi valued */
++    menu_opts_off(my_menu, O_ONEVALUE);
++
++    mvprintw(LINES - 3, 0, "Use <SPACE> to select or unselect an item.");
++    mvprintw(LINES - 2, 0,
++             "<ENTER> to see presently selected items(F1 to Exit)");
++    post_menu(my_menu);
++    refresh();
+ 
+-        free_item(my_items[0]);
+-        free_item(my_items[1]);
+-        free_menu(my_menu);
+-        endwin();
+-}
+-        
++    while ((c = getch()) != KEY_F(1)) {
++        switch (c) {
++        case KEY_DOWN:
++            menu_driver(my_menu, REQ_DOWN_ITEM);
++            break;
++        case KEY_UP:
++            menu_driver(my_menu, REQ_UP_ITEM);
++            break;
++        case ' ':
++            menu_driver(my_menu, REQ_TOGGLE_ITEM);
++            break;
++        case 10:                /* Enter */
++            {
++                char temp[200];
++                ITEM **items;
++
++                items = menu_items(my_menu);
++                temp[0] = '\0';
++                for (i = 0; i < item_count(my_menu); ++i)
++                    if (item_value(items[i]) == TRUE) {
++                        strcat(temp, item_name(items[i]));
++                        strcat(temp, " ");
++                    }
++                move(20, 0);
++                clrtoeol();
++                mvaddstr(20, 0, temp);
++                refresh();
++            }
++            break;
++        }
++    }
++
++    free_item(my_items[0]);
++    free_item(my_items[1]);
++    free_menu(my_menu);
++    endwin();
++}
+         
+ 
+         
                                                                                                    Whew, A lot of new functions. Let's take them one after
+@@ -5077,81 +5195,82 @@
+ #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+ #define CTRLD   4
+ 
+-char *choices[] = {
+-                        "Choice 1",
+-                        "Choice 2",
+-                        "Choice 3",
+-                        "Choice 4",
+-                        "Choice 5",
+-                        "Choice 6",
+-                        "Choice 7",
+-                        "Exit",
+-                  };
+-
+-int main()
+-{       ITEM **my_items;
+-        int c;                          
+-        MENU *my_menu;
+-        int n_choices, i;
+-        ITEM *cur_item;
+-        
+-        /* Initialize curses */ 
+-        initscr();
+-        start_color();
+-        cbreak();
+-        noecho();
+-        keypad(stdscr, TRUE);
+-        init_pair(1, COLOR_RED, COLOR_BLACK);
+-        init_pair(2, COLOR_GREEN, COLOR_BLACK);
+-        init_pair(3, COLOR_MAGENTA, COLOR_BLACK);
+-
+-        /* Initialize items */
+-        n_choices = ARRAY_SIZE(choices);
+-        my_items = (ITEM **)calloc(n_choices + 1, sizeof(ITEM *));
+-        for(i = 0; i < n_choices; ++i)
+-                my_items[i] = new_item(choices[i], choices[i]);
+-        my_items[n_choices] = (ITEM *)NULL;
+-        item_opts_off(my_items[3], O_SELECTABLE);
+-        item_opts_off(my_items[6], O_SELECTABLE);
+-
+-        /* Create menu */
+-        my_menu = new_menu((ITEM **)my_items);
+-
+-        /* Set fore ground and back ground of the menu */
+-        set_menu_fore(my_menu, COLOR_PAIR(1) | A_REVERSE);
+-        set_menu_back(my_menu, COLOR_PAIR(2));
+-        set_menu_grey(my_menu, COLOR_PAIR(3));
+-
+-        /* Post the menu */
+-        mvprintw(LINES - 3, 0, "Press <ENTER> to see the option selected");
+-        mvprintw(LINES - 2, 0, "Up and Down arrow keys to navigate (F1 to Exit)");
+-        post_menu(my_menu);
+-        refresh();
++const char *choices[] =
++{
++    "Choice 1",
++    "Choice 2",
++    "Choice 3",
++    "Choice 4",
++    "Choice 5",
++    "Choice 6",
++    "Choice 7",
++    "Exit",
++};
+ 
+-        while((c = getch()) != KEY_F(1))
+-        {       switch(c)
+-                {       case KEY_DOWN:
+-                                menu_driver(my_menu, REQ_DOWN_ITEM);
+-                                break;
+-                        case KEY_UP:
+-                                menu_driver(my_menu, REQ_UP_ITEM);
+-                                break;
+-                        case 10: /* Enter */
+-                                move(20, 0);
+-                                clrtoeol();
+-                                mvprintw(20, 0, "Item selected is : %s", 
+-                                                item_name(current_item(my_menu)));
+-                                pos_menu_cursor(my_menu);
+-                                break;
+-                }
+-        }       
+-        unpost_menu(my_menu);
+-        for(i = 0; i < n_choices; ++i)
+-                free_item(my_items[i]);
+-        free_menu(my_menu);
+-        endwin();
+-}
+-        
++int
++main(void)
++{
++    ITEM **my_items;
++    int c;
++    MENU *my_menu;
++    int n_choices, i;
++
++    /* Initialize curses */
++    initscr();
++    start_color();
++    cbreak();
++    noecho();
++    keypad(stdscr, TRUE);
++    init_pair(1, COLOR_RED, COLOR_BLACK);
++    init_pair(2, COLOR_GREEN, COLOR_BLACK);
++    init_pair(3, COLOR_MAGENTA, COLOR_BLACK);
++
++    /* Initialize items */
++    n_choices = ARRAY_SIZE(choices);
++    my_items = (ITEM **) calloc((size_t) (n_choices + 1), sizeof(ITEM *));
++    for (i = 0; i < n_choices; ++i)
++        my_items[i] = new_item(choices[i], choices[i]);
++    my_items[n_choices] = (ITEM *) NULL;
++    item_opts_off(my_items[3], O_SELECTABLE);
++    item_opts_off(my_items[6], O_SELECTABLE);
++
++    /* Create menu */
++    my_menu = new_menu((ITEM **) my_items);
++
++    /* Set fore ground and back ground of the menu */
++    set_menu_fore(my_menu, COLOR_PAIR(1) | A_REVERSE);
++    set_menu_back(my_menu, COLOR_PAIR(2));
++    set_menu_grey(my_menu, COLOR_PAIR(3));
++
++    /* Post the menu */
++    mvprintw(LINES - 3, 0, "Press <ENTER> to see the option selected");
++    mvprintw(LINES - 2, 0, "Up and Down arrow keys to navigate (F1 to Exit)");
++    post_menu(my_menu);
++    refresh();
++
++    while ((c = getch()) != KEY_F(1)) {
++        switch (c) {
++        case KEY_DOWN:
++            menu_driver(my_menu, REQ_DOWN_ITEM);
++            break;
++        case KEY_UP:
++            menu_driver(my_menu, REQ_UP_ITEM);
++            break;
++        case 10:                /* Enter */
++            move(20, 0);
++            clrtoeol();
++            mvprintw(20, 0, "Item selected is : %s",
++                     item_name(current_item(my_menu)));
++            pos_menu_cursor(my_menu);
++            break;
++        }
++    }
++    unpost_menu(my_menu);
++    for (i = 0; i < n_choices; ++i)
++        free_item(my_items[i]);
++    free_menu(my_menu);
++    endwin();
++}
+         
+       
+ 
+@@ -5181,87 +5300,99 @@
+ #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+ #define CTRLD   4
+ 
+-char *choices[] = {
+-                        "Choice 1",
+-                        "Choice 2",
+-                        "Choice 3",
+-                        "Choice 4",
+-                        "Choice 5",
+-                        "Choice 6",
+-                        "Choice 7",
+-                        "Exit",
+-                  };
+-void func(char *name);
+-
+-int main()
+-{       ITEM **my_items;
+-        int c;                          
+-        MENU *my_menu;
+-        int n_choices, i;
+-        ITEM *cur_item;
+-        
+-        /* Initialize curses */ 
+-        initscr();
+-        start_color();
+-        cbreak();
+-        noecho();
+-        keypad(stdscr, TRUE);
+-        init_pair(1, COLOR_RED, COLOR_BLACK);
+-        init_pair(2, COLOR_GREEN, COLOR_BLACK);
+-        init_pair(3, COLOR_MAGENTA, COLOR_BLACK);
+-
+-        /* Initialize items */
+-        n_choices = ARRAY_SIZE(choices);
+-        my_items = (ITEM **)calloc(n_choices + 1, sizeof(ITEM *));
+-        for(i = 0; i < n_choices; ++i)
+-        {       my_items[i] = new_item(choices[i], choices[i]);
+-                /* Set the user pointer */
+-                set_item_userptr(my_items[i], func);
+-        }
+-        my_items[n_choices] = (ITEM *)NULL;
++const char *choices[] =
++{
++    "Choice 1",
++    "Choice 2",
++    "Choice 3",
++    "Choice 4",
++    "Choice 5",
++    "Choice 6",
++    "Choice 7",
++    "Exit",
++};
++
++typedef union {
++    void (*my_func) (const char *);
++    void *data;
++} MY_DATA;
+ 
+-        /* Create menu */
+-        my_menu = new_menu((ITEM **)my_items);
++void func(const char *name);
+ 
+-        /* Post the menu */
+-        mvprintw(LINES - 3, 0, "Press <ENTER> to see the option selected");
+-        mvprintw(LINES - 2, 0, "Up and Down arrow keys to navigate (F1 to Exit)");
+-        post_menu(my_menu);
+-        refresh();
++int
++main(void)
++{
++    ITEM **my_items;
++    int c;
++    MENU *my_menu;
++    int n_choices, i;
++
++    /* Initialize curses */
++    initscr();
++    start_color();
++    cbreak();
++    noecho();
++    keypad(stdscr, TRUE);
++    init_pair(1, COLOR_RED, COLOR_BLACK);
++    init_pair(2, COLOR_GREEN, COLOR_BLACK);
++    init_pair(3, COLOR_MAGENTA, COLOR_BLACK);
++
++    /* Initialize items */
++    n_choices = ARRAY_SIZE(choices);
++    my_items = (ITEM **) calloc((size_t) (n_choices + 1), sizeof(ITEM *));
++    for (i = 0; i < n_choices; ++i) {
++        MY_DATA data = { func };
++        my_items[i] = new_item(choices[i], choices[i]);
++        /* Set the user pointer */
++        set_item_userptr(my_items[i], (void *) &data);
++    }
++    my_items[n_choices] = (ITEM *) NULL;
+ 
+-        while((c = getch()) != KEY_F(1))
+-        {       switch(c)
+-                {       case KEY_DOWN:
+-                                menu_driver(my_menu, REQ_DOWN_ITEM);
+-                                break;
+-                        case KEY_UP:
+-                                menu_driver(my_menu, REQ_UP_ITEM);
+-                                break;
+-                        case 10: /* Enter */
+-                        {       ITEM *cur;
+-                                void (*p)(char *);
+-
+-                                cur = current_item(my_menu);
+-                                p = item_userptr(cur);
+-                                p((char *)item_name(cur));
+-                                pos_menu_cursor(my_menu);
+-                                break;
+-                        }
+-                        break;
+-                }
+-        }       
+-        unpost_menu(my_menu);
+-        for(i = 0; i < n_choices; ++i)
+-                free_item(my_items[i]);
+-        free_menu(my_menu);
+-        endwin();
++    /* Create menu */
++    my_menu = new_menu((ITEM **) my_items);
++
++    /* Post the menu */
++    mvprintw(LINES - 3, 0, "Press <ENTER> to see the option selected");
++    mvprintw(LINES - 2, 0, "Up and Down arrow keys to navigate (F1 to Exit)");
++    post_menu(my_menu);
++    refresh();
++
++    while ((c = getch()) != KEY_F(1)) {
++        switch (c) {
++        case KEY_DOWN:
++            menu_driver(my_menu, REQ_DOWN_ITEM);
++            break;
++        case KEY_UP:
++            menu_driver(my_menu, REQ_UP_ITEM);
++            break;
++        case 10:                /* Enter */
++            {
++                ITEM *cur;
++                const MY_DATA *data;
++
++                cur = current_item(my_menu);
++                data = item_userptr(cur);
++                data->my_func(item_name(cur));
++                pos_menu_cursor(my_menu);
++                break;
++            }
++            break;
++        }
++    }
++    unpost_menu(my_menu);
++    for (i = 0; i < n_choices; ++i)
++        free_item(my_items[i]);
++    free_menu(my_menu);
++    endwin();
+ }
+ 
+-void func(char *name)
+-{       move(20, 0);
+-        clrtoeol();
+-        mvprintw(20, 0, "Item selected is : %s", name);
+-}       
++void
++func(const char *name)
++{
++    move(20, 0);
++    clrtoeol();
++    mvprintw(20, 0, "Item selected is : %s", name);
++}
+         
+       
+     
+@@ -5384,69 +5515,71 @@
+           
                                                                                                    #include <form.h>
+ 
+-int main()
+-{       FIELD *field[3];
+-        FORM  *my_form;
+-        int ch;
+-        
+-        /* Initialize curses */
+-        initscr();
+-        cbreak();
+-        noecho();
+-        keypad(stdscr, TRUE);
+-
+-        /* Initialize the fields */
+-        field[0] = new_field(1, 10, 4, 18, 0, 0);
+-        field[1] = new_field(1, 10, 6, 18, 0, 0);
+-        field[2] = NULL;
+-
+-        /* Set field options */
+-        set_field_back(field[0], A_UNDERLINE);  /* Print a line for the option  */
+-        field_opts_off(field[0], O_AUTOSKIP);   /* Don't go to next field when this */
++int
++main(void)
++{
++    FIELD *field[3];
++    FORM *my_form;
++    int ch;
++
++    /* Initialize curses */
++    initscr();
++    cbreak();
++    noecho();
++    keypad(stdscr, TRUE);
++
++    /* Initialize the fields */
++    field[0] = new_field(1, 10, 4, 18, 0, 0);
++    field[1] = new_field(1, 10, 6, 18, 0, 0);
++    field[2] = NULL;
++
++    /* Set field options */
++    set_field_back(field[0], A_UNDERLINE);      /* Print a line for the option  */
++    field_opts_off(field[0], O_AUTOSKIP);       /* Don't go to next field when this */
+                                                 /* Field is filled up           */
+-        set_field_back(field[1], A_UNDERLINE); 
+-        field_opts_off(field[1], O_AUTOSKIP);
++    set_field_back(field[1], A_UNDERLINE);
++    field_opts_off(field[1], O_AUTOSKIP);
+ 
+-        /* Create the form and post it */
+-        my_form = new_form(field);
+-        post_form(my_form);
+-        refresh();
+-        
+-        mvprintw(4, 10, "Value 1:");
+-        mvprintw(6, 10, "Value 2:");
+-        refresh();
++    /* Create the form and post it */
++    my_form = new_form(field);
++    post_form(my_form);
++    refresh();
+ 
+-        /* Loop through to get user requests */
+-        while((ch = getch()) != KEY_F(1))
+-        {       switch(ch)
+-                {       case KEY_DOWN:
+-                                /* Go to next field */
+-                                form_driver(my_form, REQ_NEXT_FIELD);
+-                                /* Go to the end of the present buffer */
+-                                /* Leaves nicely at the last character */
+-                                form_driver(my_form, REQ_END_LINE);
+-                                break;
+-                        case KEY_UP:
+-                                /* Go to previous field */
+-                                form_driver(my_form, REQ_PREV_FIELD);
+-                                form_driver(my_form, REQ_END_LINE);
+-                                break;
+-                        default:
+-                                /* If this is a normal character, it gets */
+-                                /* Printed                                */    
+-                                form_driver(my_form, ch);
+-                                break;
+-                }
++    mvprintw(4, 10, "Value 1:");
++    mvprintw(6, 10, "Value 2:");
++    refresh();
++
++    /* Loop through to get user requests */
++    while ((ch = getch()) != KEY_F(1)) {
++        switch (ch) {
++        case KEY_DOWN:
++            /* Go to next field */
++            form_driver(my_form, REQ_NEXT_FIELD);
++            /* Go to the end of the present buffer */
++            /* Leaves nicely at the last character */
++            form_driver(my_form, REQ_END_LINE);
++            break;
++        case KEY_UP:
++            /* Go to previous field */
++            form_driver(my_form, REQ_PREV_FIELD);
++            form_driver(my_form, REQ_END_LINE);
++            break;
++        default:
++            /* If this is a normal character, it gets */
++            /* Printed                                */
++            form_driver(my_form, ch);
++            break;
+         }
++    }
+ 
+-        /* Un post form and free the memory */
+-        unpost_form(my_form);
+-        free_form(my_form);
+-        free_field(field[0]);
+-        free_field(field[1]); 
++    /* Un post form and free the memory */
++    unpost_form(my_form);
++    free_form(my_form);
++    free_field(field[0]);
++    free_field(field[1]);
+ 
+-        endwin();
+-        return 0;
++    endwin();
++    return 0;
+ }
                                                                                                    
+         
+ 
+@@ -5502,7 +5635,7 @@
+ 
+           
                                                                                                    int field_info(     FIELD *field,              /* field from which to fetch */
+-                    int *height, *int width,   /* field size */ 
++                    int *height, *int width,   /* field size */
+                     int *top, int *left,       /* upper left corner */
+                     int *offscreen,            /* number of offscreen rows */
+                     int *nbuf);                /* number of working buffers */
                                                                                                    
+@@ -5562,21 +5695,21 @@
+ 
+           
                                                                                                    
int set_field_fore(FIELD *field,        /* field to alter */
+-                   chtype attr);        /* attribute to set */ 
++                   chtype attr);        /* attribute to set */
+ 
+ chtype field_fore(FIELD *field);        /* field to query */
+                                         /* returns foreground attribute */
+ 
+ int set_field_back(FIELD *field,        /* field to alter */
+-                   chtype attr);        /* attribute to set */ 
++                   chtype attr);        /* attribute to set */
+ 
+ chtype field_back(FIELD *field);        /* field to query */
+                                         /* returns background attribute */
+ 
+ int set_field_pad(FIELD *field,         /* field to alter */
+-                  int pad);             /* pad character to set */ 
++                  int pad);             /* pad character to set */
+ 
+-chtype field_pad(FIELD *field);         /* field to query */  
++chtype field_pad(FIELD *field);         /* field to query */
+                                         /* returns present pad character */
                                                                                                    
+           
                                                                                                    Though above functions seem quite simple, using colors
+           with set_field_fore() may be frustrating in the
+@@ -5599,78 +5732,81 @@
+             
                                                                                                    #include <form.h>
+ 
+-int main()
+-{       FIELD *field[3];
+-        FORM  *my_form;
+-        int ch;
+-        
+-        /* Initialize curses */
+-        initscr();
+-        start_color();
+-        cbreak();
+-        noecho();
+-        keypad(stdscr, TRUE);
+-
+-        /* Initialize few color pairs */
+-        init_pair(1, COLOR_WHITE, COLOR_BLUE);
+-        init_pair(2, COLOR_WHITE, COLOR_BLUE);
+-
+-        /* Initialize the fields */
+-        field[0] = new_field(1, 10, 4, 18, 0, 0);
+-        field[1] = new_field(1, 10, 6, 18, 0, 0);
+-        field[2] = NULL;
+-
+-        /* Set field options */
+-        set_field_fore(field[0], COLOR_PAIR(1));/* Put the field with blue background */
+-        set_field_back(field[0], COLOR_PAIR(2));/* and white foreground (characters */
++int
++main(void)
++{
++    FIELD *field[3];
++    FORM *my_form;
++    int ch;
++
++    /* Initialize curses */
++    initscr();
++    start_color();
++    cbreak();
++    noecho();
++    keypad(stdscr, TRUE);
++
++    /* Initialize few color pairs */
++    init_pair(1, COLOR_WHITE, COLOR_BLUE);
++    init_pair(2, COLOR_WHITE, COLOR_BLUE);
++
++    /* Initialize the fields */
++    field[0] = new_field(1, 10, 4, 18, 0, 0);
++    field[1] = new_field(1, 10, 6, 18, 0, 0);
++    field[2] = NULL;
++
++    /* Set field options */
++    set_field_fore(field[0], COLOR_PAIR(1));    /* Put the field with blue background */
++    set_field_back(field[0], COLOR_PAIR(2));    /* and white foreground (characters */
+                                                 /* are printed in white         */
+-        field_opts_off(field[0], O_AUTOSKIP);   /* Don't go to next field when this */
++    field_opts_off(field[0], O_AUTOSKIP);       /* Don't go to next field when this */
+                                                 /* Field is filled up           */
+-        set_field_back(field[1], A_UNDERLINE); 
+-        field_opts_off(field[1], O_AUTOSKIP);
++    set_field_back(field[1], A_UNDERLINE);
++    field_opts_off(field[1], O_AUTOSKIP);
+ 
+-        /* Create the form and post it */
+-        my_form = new_form(field);
+-        post_form(my_form);
+-        refresh();
+-        
+-        set_current_field(my_form, field[0]); /* Set focus to the colored field */
+-        mvprintw(4, 10, "Value 1:");
+-        mvprintw(6, 10, "Value 2:");
+-        mvprintw(LINES - 2, 0, "Use UP, DOWN arrow keys to switch between fields");
+-        refresh();
++    /* Create the form and post it */
++    my_form = new_form(field);
++    post_form(my_form);
++    refresh();
+ 
+-        /* Loop through to get user requests */
+-        while((ch = getch()) != KEY_F(1))
+-        {       switch(ch)
+-                {       case KEY_DOWN:
+-                                /* Go to next field */
+-                                form_driver(my_form, REQ_NEXT_FIELD);
+-                                /* Go to the end of the present buffer */
+-                                /* Leaves nicely at the last character */
+-                                form_driver(my_form, REQ_END_LINE);
+-                                break;
+-                        case KEY_UP:
+-                                /* Go to previous field */
+-                                form_driver(my_form, REQ_PREV_FIELD);
+-                                form_driver(my_form, REQ_END_LINE);
+-                                break;
+-                        default:
+-                                /* If this is a normal character, it gets */
+-                                /* Printed                                */    
+-                                form_driver(my_form, ch);
+-                                break;
+-                }
++    set_current_field(my_form, field[0]);       /* Set focus to the colored field */
++    mvprintw(4, 10, "Value 1:");
++    mvprintw(6, 10, "Value 2:");
++    mvprintw(LINES - 2, 0,
++             "Use UP, DOWN arrow keys to switch between fields");
++    refresh();
++
++    /* Loop through to get user requests */
++    while ((ch = getch()) != KEY_F(1)) {
++        switch (ch) {
++        case KEY_DOWN:
++            /* Go to next field */
++            form_driver(my_form, REQ_NEXT_FIELD);
++            /* Go to the end of the present buffer */
++            /* Leaves nicely at the last character */
++            form_driver(my_form, REQ_END_LINE);
++            break;
++        case KEY_UP:
++            /* Go to previous field */
++            form_driver(my_form, REQ_PREV_FIELD);
++            form_driver(my_form, REQ_END_LINE);
++            break;
++        default:
++            /* If this is a normal character, it gets */
++            /* Printed                                */
++            form_driver(my_form, ch);
++            break;
+         }
++    }
+ 
+-        /* Un post form and free the memory */
+-        unpost_form(my_form);
+-        free_form(my_form);
+-        free_field(field[0]);
+-        free_field(field[1]); 
++    /* Un post form and free the memory */
++    unpost_form(my_form);
++    free_form(my_form);
++    free_field(field[0]);
++    free_field(field[1]);
+ 
+-        endwin();
+-        return 0;
++    endwin();
++    return 0;
+ }
                                                                                                    
+           
+ 
+@@ -5694,15 +5830,15 @@
+ 
+           
                                                                                                    int set_field_opts(FIELD *field,          /* field to alter */
+-                   int attr);             /* attribute to set */ 
++                   int attr);             /* attribute to set */
+ 
+ int field_opts_on(FIELD *field,           /* field to alter */
+-                  int attr);              /* attributes to turn on */ 
++                  int attr);              /* attributes to turn on */
+ 
+ int field_opts_off(FIELD *field,          /* field to alter */
+-                  int attr);              /* attributes to turn off */ 
++                  int attr);              /* attributes to turn off */
+ 
+-int field_opts(FIELD *field);             /* field to query */ 
                                                                                                    
++int field_opts(FIELD *field);             /* field to query */
+           
                                                                                                    The function set_field_opts() can be used to directly
+           set attributes of a field or you can choose to switch a
+           few attributes on and off with field_opts_on() and
+@@ -5842,73 +5978,75 @@
+ 
+ #define N_FIELDS 3
+ 
+-int main()
+-{       FIELD *field[N_FIELDS];
+-        FORM  *my_form;
+-        int ch, i;
+-        
+-        /* Initialize curses */
+-        initscr();
+-        cbreak();
+-        noecho();
+-        keypad(stdscr, TRUE);
+-
+-        /* Initialize the fields */
+-        for(i = 0; i < N_FIELDS - 1; ++i)
+-                field[i] = new_field(1, WIDTH, STARTY + i * 2, STARTX, 0, 0);
+-        field[N_FIELDS - 1] = NULL;
+-
+-        /* Set field options */
+-        set_field_back(field[1], A_UNDERLINE);  /* Print a line for the option  */
+-        
+-        field_opts_off(field[0], O_ACTIVE); /* This field is a static label */
+-        field_opts_off(field[1], O_PUBLIC); /* This filed is like a password field*/
+-        field_opts_off(field[1], O_AUTOSKIP); /* To avoid entering the same field */
+-                                              /* after last character is entered */
+-        
+-        /* Create the form and post it */
+-        my_form = new_form(field);
+-        post_form(my_form);
+-        refresh();
+-        
+-        set_field_just(field[0], JUSTIFY_CENTER); /* Center Justification */
+-        set_field_buffer(field[0], 0, "This is a static Field"); 
+-                                                  /* Initialize the field  */
+-        mvprintw(STARTY, STARTX - 10, "Field 1:");
+-        mvprintw(STARTY + 2, STARTX - 10, "Field 2:");
+-        refresh();
++int
++main(void)
++{
++    FIELD *field[N_FIELDS];
++    FORM *my_form;
++    int ch, i;
++
++    /* Initialize curses */
++    initscr();
++    cbreak();
++    noecho();
++    keypad(stdscr, TRUE);
++
++    /* Initialize the fields */
++    for (i = 0; i < N_FIELDS - 1; ++i)
++        field[i] = new_field(1, WIDTH, STARTY + i * 2, STARTX, 0, 0);
++    field[N_FIELDS - 1] = NULL;
++
++    /* Set field options */
++    set_field_back(field[1], A_UNDERLINE);      /* Print a line for the option  */
++
++    field_opts_off(field[0], O_ACTIVE);         /* This field is a static label */
++    field_opts_off(field[1], O_PUBLIC);         /* This filed is like a password field */
++    field_opts_off(field[1], O_AUTOSKIP);       /* To avoid entering the same field */
++                                                /* after last character is entered */
++
++    /* Create the form and post it */
++    my_form = new_form(field);
++    post_form(my_form);
++    refresh();
+ 
+-        /* Loop through to get user requests */
+-        while((ch = getch()) != KEY_F(1))
+-        {       switch(ch)
+-                {       case KEY_DOWN:
+-                                /* Go to next field */
+-                                form_driver(my_form, REQ_NEXT_FIELD);
+-                                /* Go to the end of the present buffer */
+-                                /* Leaves nicely at the last character */
+-                                form_driver(my_form, REQ_END_LINE);
+-                                break;
+-                        case KEY_UP:
+-                                /* Go to previous field */
+-                                form_driver(my_form, REQ_PREV_FIELD);
+-                                form_driver(my_form, REQ_END_LINE);
+-                                break;
+-                        default:
+-                                /* If this is a normal character, it gets */
+-                                /* Printed                                */    
+-                                form_driver(my_form, ch);
+-                                break;
+-                }
++    set_field_just(field[0], JUSTIFY_CENTER);   /* Center Justification */
++    set_field_buffer(field[0], 0, "This is a static Field");
++    /* Initialize the field  */
++    mvprintw(STARTY, STARTX - 10, "Field 1:");
++    mvprintw(STARTY + 2, STARTX - 10, "Field 2:");
++    refresh();
++
++    /* Loop through to get user requests */
++    while ((ch = getch()) != KEY_F(1)) {
++        switch (ch) {
++        case KEY_DOWN:
++            /* Go to next field */
++            form_driver(my_form, REQ_NEXT_FIELD);
++            /* Go to the end of the present buffer */
++            /* Leaves nicely at the last character */
++            form_driver(my_form, REQ_END_LINE);
++            break;
++        case KEY_UP:
++            /* Go to previous field */
++            form_driver(my_form, REQ_PREV_FIELD);
++            form_driver(my_form, REQ_END_LINE);
++            break;
++        default:
++            /* If this is a normal character, it gets */
++            /* Printed                                */
++            form_driver(my_form, ch);
++            break;
+         }
++    }
+ 
+-        /* Un post form and free the memory */
+-        unpost_form(my_form);
+-        free_form(my_form);
+-        free_field(field[0]);
+-        free_field(field[1]); 
++    /* Un post form and free the memory */
++    unpost_form(my_form);
++    free_form(my_form);
++    free_field(field[0]);
++    free_field(field[1]);
+ 
+-        endwin();
+-        return 0;
++    endwin();
++    return 0;
+ }
+           
+ 
+@@ -5961,7 +6099,7 @@
+           pointer.
                                                                                                    
+ 
+           
                                                                                                    int set_field_userptr(FIELD *field,   
++          "PROGRAMLISTING">int set_field_userptr(FIELD *field,
+            char *userptr);      /* the user pointer you wish to associate */
+                                 /* with the field    */
+ 
+@@ -6132,115 +6270,122 @@
+           "INLINEMEDIAOBJECT">#include <string.h>
+ #include <form.h>
+ 
+-void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color);
++void print_in_middle(WINDOW *win, int starty, int startx,
++                     int width, const char *string, chtype color);
+ 
+-int main()
++int
++main(void)
+ {
+-        FIELD *field[3];
+-        FORM  *my_form;
+-        WINDOW *my_form_win;
+-        int ch, rows, cols;
+-        
+-        /* Initialize curses */
+-        initscr();
+-        start_color();
+-        cbreak();
+-        noecho();
+-        keypad(stdscr, TRUE);
+-
+-        /* Initialize few color pairs */
+-        init_pair(1, COLOR_RED, COLOR_BLACK);
+-
+-        /* Initialize the fields */
+-        field[0] = new_field(1, 10, 6, 1, 0, 0);
+-        field[1] = new_field(1, 10, 8, 1, 0, 0);
+-        field[2] = NULL;
+-
+-        /* Set field options */
+-        set_field_back(field[0], A_UNDERLINE);
+-        field_opts_off(field[0], O_AUTOSKIP); /* Don't go to next field when this */
+-                                              /* Field is filled up             */
+-        set_field_back(field[1], A_UNDERLINE); 
+-        field_opts_off(field[1], O_AUTOSKIP);
+-        
+-        /* Create the form and post it */
+-        my_form = new_form(field);
+-        
+-        /* Calculate the area required for the form */
+-        scale_form(my_form, &rows, &cols);
+-
+-        /* Create the window to be associated with the form */
+-        my_form_win = newwin(rows + 4, cols + 4, 4, 4);
+-        keypad(my_form_win, TRUE);
+-
+-        /* Set main window and sub window */
+-        set_form_win(my_form, my_form_win);
+-        set_form_sub(my_form, derwin(my_form_win, rows, cols, 2, 2));
+-
+-        /* Print a border around the main window and print a title */
+-        box(my_form_win, 0, 0);
+-        print_in_middle(my_form_win, 1, 0, cols + 4, "My Form", COLOR_PAIR(1));
+-        
+-        post_form(my_form);
+-        wrefresh(my_form_win);
++    FIELD *field[3];
++    FORM *my_form;
++    WINDOW *my_form_win;
++    int ch, rows, cols;
++
++    /* Initialize curses */
++    initscr();
++    start_color();
++    cbreak();
++    noecho();
++    keypad(stdscr, TRUE);
++
++    /* Initialize few color pairs */
++    init_pair(1, COLOR_RED, COLOR_BLACK);
++
++    /* Initialize the fields */
++    field[0] = new_field(1, 10, 6, 1, 0, 0);
++    field[1] = new_field(1, 10, 8, 1, 0, 0);
++    field[2] = NULL;
++
++    /* Set field options */
++    set_field_back(field[0], A_UNDERLINE);
++    field_opts_off(field[0], O_AUTOSKIP);
++    /* Don't go to next field when this */
++    /* Field is filled up             */
++    set_field_back(field[1], A_UNDERLINE);
++    field_opts_off(field[1], O_AUTOSKIP);
++
++    /* Create the form and post it */
++    my_form = new_form(field);
++
++    /* Calculate the area required for the form */
++    scale_form(my_form, &rows, &cols);
++
++    /* Create the window to be associated with the form */
++    my_form_win = newwin(rows + 4, cols + 4, 4, 4);
++    keypad(my_form_win, TRUE);
++
++    /* Set main window and sub window */
++    set_form_win(my_form, my_form_win);
++    set_form_sub(my_form, derwin(my_form_win, rows, cols, 2, 2));
++
++    /* Print a border around the main window and print a title */
++    box(my_form_win, 0, 0);
++    print_in_middle(my_form_win, 1, 0, cols + 4, "My Form", COLOR_PAIR(1));
+ 
+-        mvprintw(LINES - 2, 0, "Use UP, DOWN arrow keys to switch between fields");
+-        refresh();
++    post_form(my_form);
++    wrefresh(my_form_win);
+ 
+-        /* Loop through to get user requests */
+-        while((ch = wgetch(my_form_win)) != KEY_F(1))
+-        {       switch(ch)
+-                {       case KEY_DOWN:
+-                                /* Go to next field */
+-                                form_driver(my_form, REQ_NEXT_FIELD);
+-                                /* Go to the end of the present buffer */
+-                                /* Leaves nicely at the last character */
+-                                form_driver(my_form, REQ_END_LINE);
+-                                break;
+-                        case KEY_UP:
+-                                /* Go to previous field */
+-                                form_driver(my_form, REQ_PREV_FIELD);
+-                                form_driver(my_form, REQ_END_LINE);
+-                                break;
+-                        default:
+-                                /* If this is a normal character, it gets */
+-                                /* Printed                                */    
+-                                form_driver(my_form, ch);
+-                                break;
+-                }
++    mvprintw(LINES - 2, 0,
++             "Use UP, DOWN arrow keys to switch between fields");
++    refresh();
++
++    /* Loop through to get user requests */
++    while ((ch = wgetch(my_form_win)) != KEY_F(1)) {
++        switch (ch) {
++        case KEY_DOWN:
++            /* Go to next field */
++            form_driver(my_form, REQ_NEXT_FIELD);
++            /* Go to the end of the present buffer */
++            /* Leaves nicely at the last character */
++            form_driver(my_form, REQ_END_LINE);
++            break;
++        case KEY_UP:
++            /* Go to previous field */
++            form_driver(my_form, REQ_PREV_FIELD);
++            form_driver(my_form, REQ_END_LINE);
++            break;
++        default:
++            /* If this is a normal character, it gets */
++            /* Printed                                */
++            form_driver(my_form, ch);
++            break;
+         }
++    }
+ 
+-        /* Un post form and free the memory */
+-        unpost_form(my_form);
+-        free_form(my_form);
+-        free_field(field[0]);
+-        free_field(field[1]); 
++    /* Un post form and free the memory */
++    unpost_form(my_form);
++    free_form(my_form);
++    free_field(field[0]);
++    free_field(field[1]);
+ 
+-        endwin();
+-        return 0;
++    endwin();
++    return 0;
+ }
+ 
+-void print_in_middle(WINDOW *win, int starty, int startx, int width, char *string, chtype color)
+-{       int length, x, y;
+-        float temp;
+-
+-        if(win == NULL)
+-                win = stdscr;
+-        getyx(win, y, x);
+-        if(startx != 0)
+-                x = startx;
+-        if(starty != 0)
+-                y = starty;
+-        if(width == 0)
+-                width = 80;
+-
+-        length = strlen(string);
+-        temp = (width - length)/ 2;
+-        x = startx + (int)temp;
+-        wattron(win, color);
+-        mvwprintw(win, y, x, "%s", string);
+-        wattroff(win, color);
+-        refresh();
++void
++print_in_middle(WINDOW *win, int starty, int startx,
++                int width, const char *string, chtype color)
++{
++    int length, x, y;
++    float temp;
++
++    if (win == NULL)
++        win = stdscr;
++    getyx(win, y, x);
++    if (startx != 0)
++        x = startx;
++    if (starty != 0)
++        y = starty;
++    if (width == 0)
++        width = 80;
++
++    length = (int) strlen(string);
++    temp = (float) (width - length) / 2;
++    x = startx + (int) temp;
++    wattron(win, color);
++    mvwprintw(win, y, x, "%s", string);
++    wattroff(win, color);
++    refresh();
+ }
                                                                                                    
+         
+       
+@@ -6290,8 +6435,8 @@
+         can also specify custom validation, though it is a bit
+         tricky and cumbersome.
                                                                                                    
+ 
+-        
                                                                                                    TYPE_ALPHA
                                                                                                    
++        
                                                                                                    TYPE_ALPHA
                                                                                                    
+ 
+         
                                                                                                    This field type accepts alphabetic data; no blanks, no
+         digits, no special characters (this is checked at
+@@ -6308,8 +6453,8 @@
+         width, the validation check will always fail. A minimum
+         width of zero makes field completion optional.
                                                                                                    
+ 
+-        
                                                                                                    TYPE_ALNUM
                                                                                                    
++        
                                                                                                    TYPE_ALNUM
                                                                                                    
+ 
+         
                                                                                                    This field type accepts alphabetic data and digits; no
+         blanks, no special characters (this is checked at
+@@ -6325,8 +6470,8 @@
+         validation check will always fail. A minimum width of zero
+         makes field completion optional.
                                                                                                    
+ 
+-        
                                                                                                    TYPE_ENUM
                                                                                                    
++        
                                                                                                    TYPE_ENUM
                                                                                                    
+ 
+         
                                                                                                    This type allows you to restrict a field's values to be
+         among a specified set of string values (for example, the
+@@ -6358,8 +6503,8 @@
+         
                                                                                                    The REQ_NEXT_CHOICE and REQ_PREV_CHOICE input requests
+         can be particularly useful with these fields.
                                                                                                    
+ 
+-        
                                                                                                    TYPE_INTEGER
                                                                                                    
++        
                                                                                                    TYPE_INTEGER
                                                                                                    
+ 
+         
                                                                                                    This field type accepts an integer. It is set up as
+         follows:
                                                                                                    
+@@ -6381,8 +6526,8 @@
+         
                                                                                                    A TYPE_INTEGER value buffer can conveniently be
+         interpreted with the C library function atoi(3).
                                                                                                    
+ 
+-        
                                                                                                    TYPE_NUMERIC
                                                                                                    
++        
                                                                                                    TYPE_NUMERIC
                                                                                                    
+ 
+         
                                                                                                    This field type accepts a decimal number. It is set up
+         as follows:
                                                                                                    
+@@ -6404,8 +6549,8 @@
+         
                                                                                                    A TYPE_NUMERIC value buffer can conveniently be
+         interpreted with the C library function atof(3).
                                                                                                    
+ 
+-        
                                                                                                    TYPE_REGEXP
                                                                                                    
++        
                                                                                                    TYPE_REGEXP
                                                                                                    
+ 
+         
                                                                                                    This field type accepts data matching a regular
+         expression. It is set up as follows:
                                                                                                    
+@@ -7034,7 +7179,7 @@
+ Alphalist             Allows a user to select from a list of words, with
+                       the ability to narrow the search list by typing in a
+                       few characters of the desired word.
+-Buttonbox             This creates a multiple button widget. 
++Buttonbox             This creates a multiple button widget.
+ Calendar              Creates a little simple calendar widget.
+ Dialog                Prompts the user with a message, and the user
+                       can pick an answer from the buttons provided.
+@@ -7057,17 +7202,17 @@
+                       field)
+ Radio List            Creates a radio button list.
+ Scale                 Creates a numeric scale. Used for allowing a user to
+-                      pick a numeric value and restrict them to a range of 
++                      pick a numeric value and restrict them to a range of
+                       values.
+ Scrolling List        Creates a scrolling list/menu list.
+-Scrolling Window      Creates a scrolling log file viewer. Can add 
+-                      information into the window while its running. 
++Scrolling Window      Creates a scrolling log file viewer. Can add
++                      information into the window while its running.
+                       A good widget for displaying the progress of
+                       something. (akin to a console window)
+ Selection List        Creates a multiple option selection list.
+ Slider                Akin to the scale widget, this widget provides a
+                       visual slide bar to represent the numeric value.
+-Template              Creates a entry field with character sensitive 
++Template              Creates a entry field with character sensitive
+                       positions. Used for pre-formatted fields like
+                       dates and phone numbers.
+ Viewer                This is a file/information viewer. Very useful
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.5-20240831+/doc/html/man/captoinfo.1m.html	2024-04-27 18:38:45.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/captoinfo.1m.html	2024-09-14 20:23:25.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: captoinfo.1m,v 1.63 2024/03/23 20:37:25 tom Exp @
++  * @Id: captoinfo.1m,v 1.65 2024/09/14 00:39:51 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-captoinfo 1m 2024-03-23 ncurses 6.5 User commands
++captoinfo 1m 2024-09-13 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                    captoinfo 1m 2024-03-23 ncurses 6.5 User commands
                                                                                                    
++
                                                                                                    captoinfo 1m 2024-09-13 ncurses 6.5 User commands
                                                                                                    
+ 
                                                                                                    + captoinfo(1m)                    User commands                   captoinfo(1m)
+ 
+@@ -77,12 +77,11 @@
+ 
+ 
                                                                                                    Translations from Nonstandard Capabilities
                                                                                                    +        captoinfo  translates  some  obsolete,  nonstandard  capabilities  into
+-       standard  (SVr4/XSI  Curses)  terminfo  capabilities.   It   issues   a
+-       diagnostic  to the standard error stream for each, inviting the user to
+-       check that it has not mistakenly  translated  an  unknown  or  mistyped
+-       capability name.
++       standard terminfo capabilities.  It issues a diagnostic to the standard
++       error  stream  for  each,  inviting  the  user to check that it has not
++       mistakenly translated an unknown or mistyped capability name.
+ 
+-                     Name
++                 termcap Code
+               Obsolete   Standard    Origin      terminfo capability
+               ---------------------------------------------------------
+                  BO         mr        AT&T      enter_reverse_mode
+@@ -111,14 +110,14 @@
+                  KE         F4      Tektronix   key_f14
+                  KF         F5      Tektronix   key_f15
+                  BC         Sb      Tektronix   set_background
+-
+                  FC         Sf      Tektronix   set_foreground
++
+                  HS         mh        IRIX      enter_dim_mode
+ 
+        XENIX termcap had a set of extension capabilities, corresponding to box
+        drawing characters of CCSID ("code page") 437, as follows.
+ 
+-                      termcap Name            Graphic
++                      termcap Code            Graphic
+                       -----------------------------------------
+                            G2        upper left corner
+                            G3        lower left corner
+@@ -144,27 +143,27 @@
+                            Gc        double intersection
+                            GG        ACS magic cookie count
+ 
+-       captoinfo composes single-line capabilities into an  acsc  string,  and
++       captoinfo  composes  single-line  capabilities into an acsc string, and
+        discards GG and double-line capabilities with a warning diagnostic.
+ 
+-       IBM's  AIX  has  a  terminfo facility descended from SVr1 terminfo, but
+-       which is incompatible with the SVr4 format.  captoinfo  translates  the
++       IBM's AIX has a terminfo facility descended  from  SVr1  terminfo,  but
++       which  is  incompatible with the SVr4 format.  captoinfo translates the
+        following AIX extensions.
+ 
+-                                     IBM    XSI
+-                                    -------------
+-                                    ksel    kslt
+-                                    kbtab   kcbt
+-                                    font0   s0ds
+-                                    font1   s1ds
+-                                    font2   s2ds
+-                                    font3   s3ds
++                                    IBM    X/Open
++                                   ---------------
++                                   ksel    kslt
++                                   kbtab   kcbt
++                                   font0   s0ds
++                                   font1   s1ds
++                                   font2   s2ds
++                                   font3   s3ds
+ 
+-       Additionally,  this  program  translates  the AIX box1 capability to an
++       Additionally, this program translates the AIX  box1  capability  to  an
+        acsc string.
+ 
+-       The  HP-UX  terminfo  library   supports   two   nonstandard   terminfo
+-       capabilities,  meml  (memory lock) and memu (memory unlock).  captoinfo
++       The   HP-UX   terminfo   library   supports  two  nonstandard  terminfo
++       capabilities, meml (memory lock) and memu (memory  unlock).   captoinfo
+        discards these with a warning message.
+ 
+ 
+@@ -174,11 +173,11 @@
+ 
+ 
+ 
                                                                                                    PORTABILITY
                                                                                                    +-       X/Open Curses, Issue 7 (2009) describes tic  briefly,  but  omits  this
++       X/Open  Curses,  Issue  7  (2009) describes tic briefly, but omits this
+        program.
+ 
+        SVr4 systems provide captoinfo as a separate application from tic.  Its
+-       -v option does not accept a trace level argument n; repeat -v  n  times
++       -v  option  does not accept a trace level argument n; repeat -v n times
+        instead.
+ 
+        NetBSD does not provide this application.
+@@ -194,7 +193,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-23                     captoinfo(1m)
++ncurses 6.5                       2024-09-13                     captoinfo(1m)
+ 
                                                                                                    
+ 
                                                                                                    
+ 
                                                                                                      
+Index: doc/html/man/curs_bkgd.3x.html
+--- ncurses-6.5-20240831+/doc/html/man/curs_bkgd.3x.html	2024-04-27 18:38:46.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/curs_bkgd.3x.html	2024-09-14 20:23:25.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_bkgd.3x,v 1.61 2024/04/20 18:54:36 tom Exp @
++  * @Id: curs_bkgd.3x,v 1.63 2024/09/14 20:06:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_bkgd 3x 2024-04-20 ncurses 6.5 Library calls
++curs_bkgd 3x 2024-09-14 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                      curs_bkgd 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                      
++
                                                                                                      curs_bkgd 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                      
+ 
                                                                                                      + curs_bkgd(3x)                    Library calls                   curs_bkgd(3x)
+ 
+@@ -64,7 +64,7 @@
+ 
+ 
+ 
                                                                                                      DESCRIPTION
                                                                                                      +-       The  background  of  a  curses  window  (in  the  library's  non-"wide"
++       The  background  of  a  curses  window  (in  the   library's   non-wide
+        configuration)   is  a  chtype  combining  a  set  of  attributes  (see
+        curs_attr(3x)) with a character called the blank character.
+ 
+@@ -177,19 +177,19 @@
+        Neither X/Open  Curses  nor  the  SVr4  manual  pages  detail  how  the
+        rendition  of  characters  on  the  screen  updates  when bkgd or wbkgd
+        changes the background character.  ncurses, like SVr4 curses, does  not
+-       (in  its  non-"wide"  configuration)  store  the  background and window
++       (in  its  non-wide  configuration)  store  the  background  and  window
+        attribute contributions to each character cell separately.
+ 
+ 
+ 
                                                                                                      SEE ALSO
                                                                                                      +-       curs_bkgrnd(3x) describes the corresponding  functions  in  the  "wide"
++       curs_bkgrnd(3x) describes  the  corresponding  functions  in  the  wide
+        configuration of ncurses.
+ 
+        curses(3x), curs_addch(3x), curs_attr(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                     curs_bkgd(3x)
++ncurses 6.5                       2024-09-14                     curs_bkgd(3x)
+ 
                                                                                                      
+ 
                                                                                                      
+ 
                                                                                                        
+Index: doc/html/man/curs_bkgrnd.3x.html
+--- ncurses-6.5-20240831+/doc/html/man/curs_bkgrnd.3x.html	2024-04-27 18:38:46.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/curs_bkgrnd.3x.html	2024-09-14 20:23:25.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_bkgrnd.3x,v 1.42 2024/04/20 18:54:36 tom Exp @
++  * @Id: curs_bkgrnd.3x,v 1.44 2024/09/14 20:06:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_bkgrnd 3x 2024-04-20 ncurses 6.5 Library calls
++curs_bkgrnd 3x 2024-09-14 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                        curs_bkgrnd 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                        
++
                                                                                                        curs_bkgrnd 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                        
+ 
                                                                                                        + curs_bkgrnd(3x)                  Library calls                 curs_bkgrnd(3x)
+ 
+@@ -65,15 +65,15 @@
+ 
+ 
+ 
                                                                                                        DESCRIPTION
                                                                                                        +-       The  background  of  a  curses  window   (in   the   library's   "wide"
+-       configuration)  is  a  cchar_t  combining  a  set  of  attributes  (see
+-       curs_attr(3x)) with a complex character called the blank character.
+-
+-       The blank character is a spacing character that  populates  a  window's
+-       character  cells  when  their  contents are erased without replacement.
+-       The background's attributes are combined with all non-blank  characters
+-       written  to  the  window,  as  with  the  wadd_wch(3x) and wins_wch(3x)
+-       families of functions.
++       The background of a curses window (in the library's wide configuration)
++       is a cchar_t combining a set of attributes (see curs_attr(3x)) with the
++       window's blank character.
++
++       The blank character is a spacing complex  character  that  populates  a
++       window's  character  cells  when  their  contents  are  erased  without
++       replacement.  The background's attributes are combined  with  all  non-
++       blank  characters  written  to the window, as with the wadd_wch(3x) and
++       wins_wch(3x) families of functions.
+ 
+        The blank character and  attributes  of  the  background  combine  with
+        characters  written  to  the window as described below.  The background
+@@ -156,7 +156,7 @@
+ 
                                                                                                        NOTES
                                                                                                        +        bkgrnd, bkgrndset, and getbkgrnd may be implemented as macros.
+ 
+-       Unlike  their  counterparts in the non-"wide" configuration of ncurses,
++       Unlike  their  counterparts  in  the non-wide configuration of ncurses,
+        getbkgrnd and wgetbkgrnd supply the background character and  attribute
+        in a modifiable cchar_t parameter, not as the return value.
+ 
+@@ -170,14 +170,14 @@
+ 
+ 
+ 
                                                                                                        SEE ALSO
                                                                                                        +-       curs_bkgd(3x)  describes  the corresponding functions in the non-"wide"
++       curs_bkgd(3x)  describes  the  corresponding  functions in the non-wide
+        configuration of ncurses.
+ 
+        curses(3x), curs_add_wch(3x), curs_attr(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                   curs_bkgrnd(3x)
++ncurses 6.5                       2024-09-14                   curs_bkgrnd(3x)
+ 
                                                                                                        
+ 
                                                                                                        
+ 
                                                                                                          
+Index: doc/html/man/curs_extend.3x.html
+--- ncurses-6.5-20240831+/doc/html/man/curs_extend.3x.html	2024-07-27 23:23:56.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/curs_extend.3x.html	2024-09-14 20:23:26.000000000 +0000
+@@ -28,19 +28,19 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey 1999-on
+-  * @Id: curs_extend.3x,v 1.49 2024/07/27 23:21:36 tom Exp @
++  * @Id: curs_extend.3x,v 1.51 2024/09/14 20:06:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_extend 3x 2024-07-27 ncurses 6.5 Library calls
++curs_extend 3x 2024-09-14 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                          curs_extend 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                          
++
                                                                                                          curs_extend 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                          
+ 
                                                                                                          + curs_extend(3x)                  Library calls                 curs_extend(3x)
+ 
+@@ -110,13 +110,13 @@
+ 
                                                                                                          SEE ALSO
                                                                                                          +        ncurses offers several other extensions to the X/Open Curses API.
+ 
+-       curs_getch(3x),    curs_mouse(3x),    curs_print(3x),    curs_util(3x),
+-       default_colors(3x),     define_key(3x),     keybound(3x),    keyok(3x),
+-       resizeterm(3x), wresize(3x)
++       curs_getch(3x),   curs_inopts(3x),   curs_mouse(3x),    curs_print(3x),
++       curs_util(3x),    default_colors(3x),   define_key(3x),   keybound(3x),
++       keyok(3x), new_pair(3x), resizeterm(3x), wresize(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                   curs_extend(3x)
++ncurses 6.5                       2024-09-14                   curs_extend(3x)
+ 
                                                                                                          
+ 
                                                                                                          
+ 
                                                                                                            
+Index: doc/html/man/curs_get_wch.3x.html
+--- ncurses-6.5-20240831+/doc/html/man/curs_get_wch.3x.html	2024-07-20 22:19:03.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/curs_get_wch.3x.html	2024-09-14 20:23:26.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_get_wch.3x,v 1.45 2024/07/20 21:43:33 tom Exp @
++  * @Id: curs_get_wch.3x,v 1.47 2024/09/14 20:06:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_get_wch 3x 2024-07-20 ncurses 6.5 Library calls
++curs_get_wch 3x 2024-09-14 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                            curs_get_wch 3x 2024-07-20 ncurses 6.5 Library calls
                                                                                                            
++
                                                                                                            curs_get_wch 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                            
+ 
                                                                                                            + curs_get_wch(3x)                 Library calls                curs_get_wch(3x)
+ 
+@@ -48,16 +48,16 @@
+ 
+ 
                                                                                                            NAME
                                                                                                            +        get_wch,  wget_wch,  mvget_wch,  mvwget_wch,  unget_wch  - get (or push
+-       back) a wide character from curses terminal keyboard
++       back) a wide character from curses terminal keyboard buffer
+ 
+ 
+ 
                                                                                                            SYNOPSIS
                                                                                                            +        #include <curses.h>
+ 
+-       int get_wch(wint_t *wch);
+-       int wget_wch(WINDOW *win, wint_t *wch);
+-       int mvget_wch(int y, int x, wint_t *wch);
+-       int mvwget_wch(WINDOW *win, int y, int x, wint_t *wch);
++       int get_wch(wint_t * wch);
++       int wget_wch(WINDOW * win, wint_t * wch);
++       int mvget_wch(int y, int x, wint_t * wch);
++       int mvwget_wch(WINDOW * win, int y, int x, wint_t * wch);
+ 
+        int unget_wch(const wchar_t wc);
+ 
+@@ -172,7 +172,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-20                  curs_get_wch(3x)
++ncurses 6.5                       2024-09-14                  curs_get_wch(3x)
+ 
                                                                                                            
+ 
                                                                                                            
+ 
                                                                                                              
+Index: doc/html/man/curs_getch.3x.html
+--- ncurses-6.5-20240831+/doc/html/man/curs_getch.3x.html	2024-07-20 22:19:03.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/curs_getch.3x.html	2024-09-14 20:23:26.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_getch.3x,v 1.99 2024/07/20 21:43:33 tom Exp @
++  * @Id: curs_getch.3x,v 1.101 2024/09/14 20:06:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_getch 3x 2024-07-20 ncurses 6.5 Library calls
++curs_getch 3x 2024-09-14 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                              curs_getch 3x 2024-07-20 ncurses 6.5 Library calls
                                                                                                              
++
                                                                                                              curs_getch 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                              
+ 
                                                                                                              + curs_getch(3x)                   Library calls                  curs_getch(3x)
+ 
+@@ -49,16 +49,16 @@
+ 
+ 
                                                                                                              NAME
                                                                                                              +        getch, wgetch, mvgetch, mvwgetch, ungetch, has_key - get (or push back)
+-       characters from curses terminal keyboard
++       characters from curses terminal keyboard buffer
+ 
+ 
+ 
                                                                                                              SYNOPSIS
                                                                                                              +        #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);
++       int mvwgetch(WINDOW * win, int y, int x);
+ 
+        int ungetch(int c);
+ 
+@@ -367,16 +367,17 @@
+        fewer.  A curses application can expect such a keyboard to transmit key
+        codes   KEY_UP,   KEY_DOWN,  KEY_LEFT,  KEY_RIGHT,  KEY_HOME,  KEY_END,
+        KEY_PPAGE (Page Up), KEY_NPAGE (Page  Down),  KEY_IC  (Insert),  KEY_DC
+-       (Delete), and KEY_F(n) for 1 <= n <= 12.
++       (Delete), KEY_A1, KEY_A3, KEY_B2, KEY_C1, KEY_C3, and KEY_F(n) for 1 <=
++       n <= 12.
+ 
+ 
+ 
                                                                                                              EXTENSIONS
                                                                                                              +        In ncurses, when a window's "no time-out" mode is not set, the ESCDELAY
+-       variable configures the duration of the timer used  to  disambiguate  a
+-       function  key character sequence from a series of key strokes beginning
++       variable  configures  the  duration of the timer used to disambiguate a
++       function key character sequence from a series of key strokes  beginning
+        with ESC typed by the user; see curs_variables(3x).
+ 
+-       has_key was designed for ncurses, and is  not  found  in  SVr4  curses,
++       has_key  was  designed  for  ncurses,  and is not found in SVr4 curses,
+        4.4BSD curses, or any other previous curses implementation.
+ 
+ 
+@@ -384,50 +385,50 @@
+        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       Except as noted in section "EXTENSIONS" above, X/Open Curses,  Issue  4
++       Except  as  noted in section "EXTENSIONS" above, X/Open Curses, Issue 4
+        describes these functions.  It specifies no error conditions for them.
+ 
+        wgetch reads only single-byte characters.
+ 
+-       The  echo  behavior  of  these  functions on input of KEY_ or backspace
++       The echo behavior of these functions on  input  of  KEY_  or  backspace
+        characters is not documented in SVr4 curses.
+ 
+-       The behavior of wgetch in  the  presence  of  signal  handlers  is  not
+-       documented  in  SVr4  curses  and  is unspecified by X/Open Curses.  In
+-       historical curses implementations, it varied depending on  whether  the
+-       operating  system's  dispatch  of  a  signal to a handler interrupted a
++       The  behavior  of  wgetch  in  the  presence  of signal handlers is not
++       documented in SVr4 curses and is  unspecified  by  X/Open  Curses.   In
++       historical  curses  implementations, it varied depending on whether the
++       operating system's dispatch of a signal  to  a  handler  interrupted  a
+        read(2) call in progress, and also (in some implementations) whether an
+-       input  timeout  or  non-blocking  mode had been set.  A portable curses
+-       application prepares  for  two  cases:  (a)  signal  receipt  does  not
++       input timeout or non-blocking mode had been  set.   A  portable  curses
++       application  prepares  for  two  cases:  (a)  signal  receipt  does not
+        interrupt wgetch; or (b) signal receipt interrupts wgetch and causes it
+        to return ERR with errno set to EINTR.
+ 
+        KEY_MOUSE is mentioned in X/Open Curses, along with a few related term-
+-       info  capabilities, but no higher-level functions use the feature.  The
++       info capabilities, but no higher-level functions use the feature.   The
+        implementation in ncurses is an extension.
+ 
+-       KEY_RESIZE and has_key are extensions first  implemented  for  ncurses.
++       KEY_RESIZE  and  has_key  are extensions first implemented for ncurses.
+        By  2022,  PDCurses  and  NetBSD  curses  had  added  them  along  with
+        KEY_MOUSE.
+ 
+ 
+ 
                                                                                                              SEE ALSO
                                                                                                              +-       ECMA-6 "7-bit  coded  Character  Set"  <https://ecma-international.org/
++       ECMA-6  "7-bit  coded  Character  Set" <https://ecma-international.org/
+        publications-and-standards/standards/ecma-6/>
+ 
+-       ECMA-48   "Control   Functions  for  Coded  Character  Sets"  <https://
++       ECMA-48  "Control  Functions  for  Coded  Character   Sets"   <https://
+        ecma-international.org/publications-and-standards/standards/ecma-48/>
+ 
+-       curs_get_wch(3x) describes comparable functions of the ncurses  library
++       curs_get_wch(3x)  describes comparable functions of the ncurses library
+        in its wide-character configuration (ncursesw).
+ 
+-       curses(3x),     curs_addch(3x),     curs_inopts(3x),    curs_mouse(3x),
+-       curs_move(3x), curs_outopts(3x), curs_refresh(3x),  curs_variables(3x),
++       curses(3x),    curs_addch(3x),     curs_inopts(3x),     curs_mouse(3x),
++       curs_move(3x),  curs_outopts(3x), curs_refresh(3x), curs_variables(3x),
+        resizeterm(3x), ascii(7)
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-20                    curs_getch(3x)
++ncurses 6.5                       2024-09-14                    curs_getch(3x)
+ 
                                                                                                              
+ 
                                                                                                              
+ 
                                                                                                                
+Index: doc/html/man/curs_initscr.3x.html
+--- ncurses-6.5-20240831+/doc/html/man/curs_initscr.3x.html	2024-06-08 23:12:49.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/curs_initscr.3x.html	2024-09-14 20:23:26.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_initscr.3x,v 1.75 2024/06/08 20:34:23 tom Exp @
++  * @Id: curs_initscr.3x,v 1.77 2024/09/11 21:00:07 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_initscr 3x 2024-06-08 ncurses 6.5 Library calls
++curs_initscr 3x 2024-09-11 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                curs_initscr 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                
++
                                                                                                                curs_initscr 3x 2024-09-11 ncurses 6.5 Library calls
                                                                                                                
+ 
                                                                                                                + curs_initscr(3x)                 Library calls                curs_initscr(3x)
+ 
+@@ -303,7 +303,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                  curs_initscr(3x)
++ncurses 6.5                       2024-09-11                  curs_initscr(3x)
+ 
                                                                                                                
+ 
                                                                                                                
+ 
                                                                                                                  
+Index: doc/html/man/curs_inopts.3x.html
+--- ncurses-6.5-20240831+/doc/html/man/curs_inopts.3x.html	2024-06-15 20:39:28.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/curs_inopts.3x.html	2024-09-14 20:23:26.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inopts.3x,v 1.75 2024/06/15 19:49:39 tom Exp @
++  * @Id: curs_inopts.3x,v 1.77 2024/09/14 20:06:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inopts 3x 2024-06-15 ncurses 6.5 Library calls
++curs_inopts 3x 2024-09-14 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                  curs_inopts 3x 2024-06-15 ncurses 6.5 Library calls
                                                                                                                  
++
                                                                                                                  curs_inopts 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                  
+ 
                                                                                                                  + curs_inopts(3x)                  Library calls                 curs_inopts(3x)
+ 
+@@ -114,7 +114,7 @@
+        buffering and erase and kill character processing (the interrupt, quit,
+        suspend,  and  flow  control  characters  are  unaffected)  and   makes
+        characters  typed  by  the  user  immediately available to the program.
+-       nocbreak returns the terminal to normal ("cooked") mode.
++       nocbreak restores the terminal's normal ("cooked") line discipline.
+ 
+        The state of the terminal is unknown to a curses  application  when  it
+        starts; therefore, a program should call cbreak or nocbreak explicitly.
+@@ -163,24 +163,24 @@
+ 
+ 
                                                                                                                  meta
                                                                                                                  +        Initially, whether the terminal returns 7- or 8-bit character codes  on
+-       input  depends  on  the  configuration  of  the  terminal  driver;  see
+-       termios(3).  To force 8 bits to be returned, call meta(..., TRUE); this
+-       is  equivalent,  on  POSIX  systems,  to  setting  the  CS8 flag on the
+-       terminal.  To force 7 bits to be returned, call meta(..., FALSE);  this
+-       is  equivalent,  on  POSIX  systems,  to  setting  the  CS7 flag on the
+-       terminal.  The window argument, win, is always ignored.  If  the  term-
+-       info  string  capabilities meta_on (smm) and meta_off (rmm) are defined
+-       for the terminal type, enabling meta mode sends smm to the terminal and
+-       disabling it sends rmm to the terminal.
++       input  depends  on  the  configuration of the terminal driver; on POSIX
++       systems, see  termios(3).   To  force  8  bits  to  be  returned,  call
++       meta(...,  TRUE);  this is equivalent, on POSIX systems, to setting the
++       CS8 flag on the terminal.   To  force  7  bits  to  be  returned,  call
++       meta(...,  FALSE); this is equivalent, on POSIX systems, to setting the
++       CS7 flag on the terminal.  The window argument, win, is always ignored.
++       If  the  terminfo  string capabilities meta_on (smm) and meta_off (rmm)
++       are defined for the terminal type, enabling meta mode sends smm to  the
++       terminal and disabling it sends rmm to the terminal.
+ 
+ 
+ 
                                                                                                                  nl, nonl
                                                                                                                  +        Initially,  whether  the  terminal  reports a carriage return using the
+        character code for a line feed in cbreak or raw modes  depends  on  the
+        configuration  of  the  terminal driver; see termios(3).  nl configures
+-       the terminal to perform this translation.  nonl disables it.  In normal
+-       (or  "cooked")  mode,  the  terminal  driver always translates carriage
+-       returns to line feeds.
++       the terminal to perform this translation.  nonl disables it.  Under its
++       normal   ("cooked")   line   discipline,  the  terminal  driver  always
++       translates carriage returns to line feeds.
+ 
+ 
+ 
                                                                                                                  nodelay
                                                                                                                  +@@ -202,17 +202,17 @@
+ 
                                                                                                                  qiflush, noqiflush
                                                                                                                  +        qiflush and noqiflush configure the terminal driver's treatment of  its
+        input and output queues when it handles the interrupt, suspend, or quit
+-       characters  in  cbreak  and  "cooked"  modes;  on  POSIX  systems,  see
+-       termios(3).  The default behavior is inherited from the terminal driver
+-       settings.  Calling qiflush configures the terminal to flush the  queues
+-       when  any  of  these  events  occurs,  giving  the impression of faster
+-       response to user input, but making the library's model  of  the  screen
+-       contents  incorrect.   Calling  noqiflush  prevents  such flushing, but
+-       might frustrate impatient users on slow connections if a curses  update
+-       of the screen is in progress when the event occurs; see typeahead below
+-       for a mitigation of this problem.  You may want to call noqiflush in  a
+-       signal  handler  if you want output to continue after the handler exits
+-       as though the interrupt had not occurred.
++       characters under the normal ("cooked") or  cbreak  line  discplines  on
++       POSIX  systems; see termios(3).  The default behavior is inherited from
++       the terminal driver settings.  Calling qiflush configures the  terminal
++       to  flush  the  queues  when  any  of  these  events occurs, giving the
++       impression of faster response to user input, but making  the  library's
++       model  of  the  screen  contents incorrect.  Calling noqiflush prevents
++       such flushing, but might frustrate impatient users on slow  connections
++       if  a curses update of the screen is in progress when the event occurs;
++       see typeahead below for a mitigation of this problem.  You may want  to
++       call noqiflush in a signal handler if you want output to continue after
++       the handler exits as though the interrupt had not occurred.
+ 
+ 
+ 
                                                                                                                  raw, noraw
                                                                                                                  +@@ -222,8 +222,8 @@
+        control   characters  uninterpreted  to  the  application,  instead  of
+        generating a signal or  acting  on  I/O  flow.   The  behavior  of  the
+        terminal's   "Break"   key   (if   any)   depends  on  terminal  driver
+-       configuration parameters that curses does not  handle.   noraw  returns
+-       the terminal to normal ("cooked") mode.
++       configuration parameters that curses does not handle.   noraw  restores
++       the terminal's normal ("cooked") line discipline.
+ 
+ 
+ 
                                                                                                                  timeout, wtimeout
                                                                                                                  +@@ -272,10 +272,10 @@
+        noqiflush, qiflush, timeout, and wtimeout may be implemented as macros.
+ 
+        noraw  and  nocbreak follow historical practice in that they attempt to
+-       restore normal ("cooked") mode from raw and cbreak modes, respectively.
+-       Mixing  raw/noraw  calls  with  cbreak/nocbreak calls leads to terminal
+-       driver control states that are hard to predict or understand; doing  so
+-       is not recommended.
++       restore the terminal's normal ("cooked") line discipline from  raw  and
++       cbreak,  respectively.   Mixing  raw/noraw  calls  with cbreak/nocbreak
++       calls leads to terminal driver control states that are hard to  predict
++       or understand; doing so is not recommended.
+ 
+ 
+ 
                                                                                                                  EXTENSIONS
                                                                                                                  +@@ -312,8 +312,8 @@
+        curses, clearing the terminal driver's "echo"  flag  when  initializing
+        the  screen.  BSD curses did not, but its raw function turned it off as
+        a side effect.  For best portability, call echo  or  noecho  explicitly
+-       just  after  initialization,  even  if  your  program remains in normal
+-       ("cooked") mode.
++       just  after initialization, even if your program retains the terminal's
++       normal ("cooked") line discipline.
+ 
+        X/Open Curses is ambiguous regarding whether  raw  should  disable  the
+        carriage  return and line feed translation feature controlled by nl and
+@@ -382,7 +382,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-15                   curs_inopts(3x)
++ncurses 6.5                       2024-09-14                   curs_inopts(3x)
+ 
                                                                                                                  
+ 
                                                                                                                  
+ 
                                                                                                                    
+Index: doc/html/man/curs_ins_wstr.3x.html
+--- ncurses-6.5-20240831+/doc/html/man/curs_ins_wstr.3x.html	2024-07-27 23:11:31.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/curs_ins_wstr.3x.html	2024-09-14 20:23:26.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_ins_wstr.3x,v 1.44 2024/07/27 20:15:31 tom Exp @
++  * @Id: curs_ins_wstr.3x,v 1.46 2024/09/14 20:06:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_ins_wstr 3x 2024-07-27 ncurses 6.5 Library calls
++curs_ins_wstr 3x 2024-09-14 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                    curs_ins_wstr 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                    
++
                                                                                                                    curs_ins_wstr 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                    
+ 
                                                                                                                    + curs_ins_wstr(3x)                Library calls               curs_ins_wstr(3x)
+ 
+@@ -120,7 +120,7 @@
+        functions named winswstr and winsnwstr (and the usual variants).  These
+        were later additions to SVr4.x, not appearing in the first SVr4 (1989).
+        They  differ from X/Open's later wins_wstr and wins_nwstr in that their
+-       wstr parameters are not const-qualified.
++       wstr parameters are not const-qualified.
+ 
+ 
+ 
                                                                                                                    SEE ALSO
                                                                                                                    +@@ -131,7 +131,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                 curs_ins_wstr(3x)
++ncurses 6.5                       2024-09-14                 curs_ins_wstr(3x)
+ 
                                                                                                                    
+ 
                                                                                                                    
+ 
                                                                                                                      
+Index: doc/html/man/curs_instr.3x.html
+--- ncurses-6.5-20240831+/doc/html/man/curs_instr.3x.html	2024-06-08 23:12:49.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/curs_instr.3x.html	2024-09-14 20:23:26.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_instr.3x,v 1.57 2024/06/08 20:47:39 tom Exp @
++  * @Id: curs_instr.3x,v 1.59 2024/09/14 20:06:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_instr 3x 2024-06-08 ncurses 6.5 Library calls
++curs_instr 3x 2024-09-14 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                      curs_instr 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                      
++
                                                                                                                      curs_instr 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                      
+ 
                                                                                                                      + curs_instr(3x)                   Library calls                  curs_instr(3x)
+ 
+@@ -47,7 +47,7 @@
+ 
+ 
+ 
                                                                                                                      NAME
                                                                                                                      +-       instr,  innstr, winstr, winnstr, mvinstr, mvinnstr, mvwinstr, mvwinnstr
++       instr,  winstr, mvinstr, mvwinstr, innstr, winnstr, mvinnstr, mvwinnstr
+        - get a string from a curses window
+ 
+ 
+@@ -138,7 +138,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                    curs_instr(3x)
++ncurses 6.5                       2024-09-14                    curs_instr(3x)
+ 
                                                                                                                      
+ 
                                                                                                                      
+ 
                                                                                                                        
+Index: doc/html/man/curs_inwstr.3x.html
+--- ncurses-6.5-20240831+/doc/html/man/curs_inwstr.3x.html	2024-06-08 23:12:49.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/curs_inwstr.3x.html	2024-09-14 20:23:26.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inwstr.3x,v 1.45 2024/06/08 21:19:18 tom Exp @
++  * @Id: curs_inwstr.3x,v 1.47 2024/09/14 20:06:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inwstr 3x 2024-06-08 ncurses 6.5 Library calls
++curs_inwstr 3x 2024-09-14 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                        curs_inwstr 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                        
++
                                                                                                                        curs_inwstr 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                        
+ 
                                                                                                                        + curs_inwstr(3x)                  Library calls                 curs_inwstr(3x)
+ 
+@@ -47,7 +47,7 @@
+ 
+ 
+ 
                                                                                                                        NAME
                                                                                                                        +-       inwstr,  innwstr,  winwstr,  winnwstr,  mvinwstr, mvinnwstr, mvwinwstr,
++       inwstr,  winwstr,  mvinwstr,  mvwinwstr,  innwstr, winnwstr, mvinnwstr,
+        mvwinnwstr - get a wide-character string from a curses window
+ 
+ 
+@@ -70,9 +70,9 @@
+        starting  at the cursor and stopping at the end of the line, and stores
+        it in wstr, terminating it with a wide null character and omitting  any
+        attributes  and  color pair identifier that curses associates with each
+-       character.  winnwstr does the same, but copies  at  most  n  characters
+-       from  win.   An  n  of  -1  implies  no limit; winnwstr then works like
+-       winwstr.  ncurses(3x) describes the variants of these functions.
++       character.   winnwstr  does  the  same,  but  copies  at  most  n  wide
++       characters  from win.  An n of -1 implies no limit; winnwstr then works
++       like winwstr.  ncurses(3x) describes the variants of these functions.
+ 
+ 
+ 
                                                                                                                        RETURN VALUE
                                                                                                                        +@@ -135,7 +135,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                   curs_inwstr(3x)
++ncurses 6.5                       2024-09-14                   curs_inwstr(3x)
+ 
                                                                                                                        
+ 
                                                                                                                        
+ 
                                                                                                                          
+Index: doc/html/man/curs_kernel.3x.html
+--- ncurses-6.5-20240831+/doc/html/man/curs_kernel.3x.html	2024-06-22 22:55:08.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/curs_kernel.3x.html	2024-09-14 20:23:26.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_kernel.3x,v 1.67 2024/06/22 21:24:26 tom Exp @
++  * @Id: curs_kernel.3x,v 1.70 2024/09/14 20:14:54 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_kernel 3x 2024-06-22 ncurses 6.5 Library calls
++curs_kernel 3x 2024-09-14 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                          curs_kernel 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                                          
++
                                                                                                                          curs_kernel 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                          
+ 
                                                                                                                          + curs_kernel(3x)                  Library calls                 curs_kernel(3x)
+ 
+@@ -124,10 +124,10 @@
+ 
+ 
+ 
                                                                                                                          curs_set
                                                                                                                          +-       The  curs_set  routine  sets  the cursor state to invisible, normal, or
+-       very visible for visibility equal to 0, 1, or 2 respectively.   If  the
+-       terminal  supports  the visibility requested, the previous cursor state
+-       is returned; otherwise, ERR is returned.
++       curs_set adjusts the cursor visibility to "invisible", "visible", "very
++       visible", as its argument is 0, 1, or 2, respectively.  It returns  the
++       previous  visibility  if  the  requested  one  is  supported,  and  ERR
++       otherwise.
+ 
+ 
+ 
                                                                                                                          mvcur
                                                                                                                          +@@ -178,41 +178,44 @@
+ 
+ 
+ 
                                                                                                                          RETURN VALUE
                                                                                                                          +-       Except for curs_set, these routines always return OK.
++       Except  for  curs_set,  these functions return OK on success and ERR on
++       failure.
+ 
+-       curs_set  returns  the  previous  cursor state, or ERR if the requested
+-       visibility is not supported.
++       curs_set returns the previous cursor visibility, and returns ERR if the
++       terminal type does not support the requested visibility.
+ 
+-       X/Open defines no error conditions.  In this implementation
++       napms always succeeds.
+ 
+-       def_prog_mode, def_shell_mode, reset_prog_mode, reset_shell_mode
+-            return ERR if the terminal was not initialized, or if the I/O call
+-            to obtain the terminal settings fails.
++       mvcur  fails  if  the  position  (newrow, newcol) is outside the screen
++       boundaries.
+ 
+-       ripoffline
+-            returns  ERR if the maximum number of ripped-off lines exceeds the
+-            maximum (5).
++       In ncurses,
+ 
++       o   def_prog_mode,      def_shell_mode,      reset_prog_mode,       and
++           reset_shell_mode return ERR if the terminal was not initialized, or
++           if the operating system's function for obtaining terminal  settings
++           fails.
+ 
+-
                                                                                                                          NOTES
                                                                                                                          +-       Note that getsyx is a macro, so & is not necessary before the variables
+-       y and x.
++       o   ripoffline  returns  ERR  if the maximum number of ripped-off lines
++           exceeds the maximum (5).
+ 
+-       Older  SVr4  man  pages  warn  that  the  return  value of curs_set "is
+-       currently incorrect".  This implementation gets it right, but it may be
+-       unwise to count on the correctness of the return value anywhere else.
+ 
+-       Both ncurses and SVr4 will call curs_set in endwin if curs_set 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.
++
                                                                                                                          NOTES
                                                                                                                          ++       getsyx is a macro; use of  the  &  operator  before  its  arguments  is
++       unnecessary.
++
++       The  endwin  function of both ncurses and SVr4 curses calls curs_set if
++       the latter has previously been called to set the cursor visiblility  to
++       a  value  other than normal; that is, either invisible or very visible.
++       There is no way for ncurses to determine the initial cursor  visibility
++       to restore it.
+ 
+ 
+ 
                                                                                                                          EXTENSIONS
                                                                                                                          +-       In ncurses, mvcur accepts -1 for either or both old coordinates.   This
+-       value  tells ncurses that the old location is unknown, and that it must
+-       use only absolute motion, as with the cursor_address (cup)  capability,
+-       rather  than  the  least  costly  combination  of absolute and relative
++       In  ncurses, mvcur accepts -1 for either or both old coordinates.  This
++       value tells ncurses that the old location is unknown, and that it  must
++       use  only absolute motion, as with the cursor_address (cup) capability,
++       rather than the least  costly  combination  of  absolute  and  relative
+        motion.
+ 
+ 
+@@ -220,28 +223,37 @@
+        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       The  virtual  screen  functions  setsyx and getsyx are not described in
+-       X/Open Curses, Issue 4.  All other functions are as described in X/Open
+-       Curses.
+-
+-       The  SVr4  documentation  describes  setsyx and getsyx as having return
+-       type int.  This is misleading, as they are macros  with  no  documented
+-       semantics for the return value.
++       The virtual screen functions setsyx and getsyx  are  not  described  in
++       X/Open  Curses  Issue 4.   SVr4  documents each of them as returning an
++       int.  This is  misleading,  as  they  are  macros  with  no  documented
++       semantics for returning values.
++
++       All other functions are as described in X/Open Curses.  It specifies no
++       error conditions for them, except as described for curs_set in  section
++       "RETURN VALUE" above.
++
++       Older  SVr4  man  pages  warn  that  the  return  value of curs_set "is
++       currently incorrect".  This implementation gets it right, but  counting
++       on its correctness anywhere else may be unwise.
++
++       X/Open  Curses specifies ripoffline as returning OK with no possibility
++       of failure ("[c]alls to ripoffline above this limit [five  lines]  have
++       no effect but report success").
+ 
+        X/Open Curses notes:
+ 
+-              "After  use  of mvcur(), the model Curses maintains of the state
+-              of the  terminal  might  not  match  the  actual  state  of  the
+-              terminal.   An  application  should touch and refresh the window
+-              before resuming conventional use of Curses."
++              After use of mvcur(), the model Curses maintains of the state of
++              the terminal might not match the actual state of  the  terminal.
++              An  application  should  touch  and  refresh  the  window before
++              resuming conventional use of Curses.
+ 
+-       Both ncurses and SVr4 curses implement  mvcur  using  the  SCREEN  data
++       Both ncurses and SVr4 curses implement mvcur using  the  SCREEN  object
+        allocated  in  either initscr(3x) or newterm(3x).  X/Open Curses states
+-       that the old location must be given for mvcur to accommodate  terminals
++       that the old location must be given for mvcur to accommodate  terminals
+        that lack absolute cursor positioning.
+ 
+-       If interrupted, ncurses restarts napms.  That, and the limitation to 30
+-       seconds, are different from other implementations.
++       If  interrupted  by  a  signal,  ncurses restarts napms.  That, and the
++       limitation to 30 seconds, differ from other implementations.
+ 
+ 
+ 
                                                                                                                          SEE ALSO
                                                                                                                          +@@ -250,7 +262,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-22                   curs_kernel(3x)
++ncurses 6.5                       2024-09-14                   curs_kernel(3x)
+ 
                                                                                                                          
+ 
                                                                                                                          
+ 
                                                                                                                            
+Index: doc/html/man/curs_outopts.3x.html
+--- ncurses-6.5-20240831+/doc/html/man/curs_outopts.3x.html	2024-07-27 23:11:32.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/curs_outopts.3x.html	2024-09-14 20:23:26.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_outopts.3x,v 1.69 2024/07/27 19:55:45 tom Exp @
++  * @Id: curs_outopts.3x,v 1.71 2024/09/14 20:06:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_outopts 3x 2024-07-27 ncurses 6.5 Library calls
++curs_outopts 3x 2024-09-14 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                            curs_outopts 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                            
++
                                                                                                                            curs_outopts 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                            
+ 
                                                                                                                            + curs_outopts(3x)                 Library calls                curs_outopts(3x)
+ 
+@@ -166,22 +166,22 @@
+ 
+ 
+ 
                                                                                                                            PORTABILITY
                                                                                                                            +-       These functions are described in X/Open Curses, Issue 4.  It  specifies
+-       no error conditions for them.
++       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
++       error conditions for them.
+ 
+-       Some  historic  curses implementations had, as an undocumented feature,
+-       the  ability  to  do  the  equivalent  of  clearok(...,  1)  by  saying
+-       touchwin(stdscr) or clear(stdscr).  This will not work under ncurses.
++       Some  historic  curses implementations, as an undocumented feature, did
++       the  equivalent  of  "clearok(...,   1)"   when   touchwin(stdstr)   or
++       clear(stdstr) were used.  This trick does not work with ncurses.
+ 
+-       Earlier  System  V  curses implementations specified that with scrollok
++       Early  System V  curses  implementations  specified  that with scrollok
+        enabled, any window modification triggering  a  scroll  also  forced  a
+        physical  refresh.   X/Open  Curses  does not require this, and ncurses
+-       avoids doing it  to  perform  better  vertical-motion  optimization  at
+-       wrefresh time.
++       avoids  doing  so  to  better  optimize   vertical   motions   upon   a
++       wrefresh(3x).
+ 
+        X/Open Curses does not mention that the cursor should be made invisible
+-       as a side-effect of leaveok.  SVr4 curses documentation does this,  but
+-       the code does not.  Use curs_set to make the cursor invisible.
++       as a side-effect of leaveok.  SVr4 curses documentation notes this, but
++       the code neglects it.  Use curs_set(3x) to make the cursor invisible.
+ 
+ 
+ 
                                                                                                                            HISTORY
                                                                                                                            +@@ -195,7 +195,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                  curs_outopts(3x)
++ncurses 6.5                       2024-09-14                  curs_outopts(3x)
+ 
                                                                                                                            
+ 
                                                                                                                            
+ 
                                                                                                                              
+Index: doc/html/man/curs_refresh.3x.html
+--- ncurses-6.5-20240831+/doc/html/man/curs_refresh.3x.html	2024-07-27 23:11:32.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/curs_refresh.3x.html	2024-09-14 20:23:26.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_refresh.3x,v 1.50 2024/07/27 19:55:45 tom Exp @
++  * @Id: curs_refresh.3x,v 1.52 2024/09/14 20:06:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_refresh 3x 2024-07-27 ncurses 6.5 Library calls
++curs_refresh 3x 2024-09-14 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                              curs_refresh 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                              
++
                                                                                                                              curs_refresh 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                              
+ 
                                                                                                                              + curs_refresh(3x)                 Library calls                curs_refresh(3x)
+ 
+@@ -155,11 +155,11 @@
+ 
+ 
+ 
                                                                                                                              SEE ALSO
                                                                                                                              +-       curses(3x), curs_outopts(3x) curs_variables(3x)
++       curses(3x), curs_outopts(3x), curs_variables(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                  curs_refresh(3x)
++ncurses 6.5                       2024-09-14                  curs_refresh(3x)
+ 
                                                                                                                              
+ 
                                                                                                                              
+ 
                                                                                                                                
+Index: doc/html/man/curs_scroll.3x.html
+--- ncurses-6.5-20240831+/doc/html/man/curs_scroll.3x.html	2024-05-25 22:33:42.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/curs_scroll.3x.html	2024-09-14 20:23:26.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_scroll.3x,v 1.45 2024/05/25 20:16:27 tom Exp @
++  * @Id: curs_scroll.3x,v 1.47 2024/09/14 20:06:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_scroll 3x 2024-05-25 ncurses 6.5 Library calls
++curs_scroll 3x 2024-09-14 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                curs_scroll 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                                
++
                                                                                                                                curs_scroll 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                
+ 
                                                                                                                                + curs_scroll(3x)                  Library calls                 curs_scroll(3x)
+ 
+@@ -63,16 +63,18 @@
+        scroll  scrolls  the  given window up one line.  That is, every visible
+        line we might number i becomes line i-1.  The text of the top  line  in
+        the  window  disappears  and  the  bottom  line is populated with blank
+-       characters; see bkgd(3x) or bkgrnd(3x).  As  an  optimization,  if  the
+-       scrolling  region  of  the  window  is  the entire screen, the physical
+-       screen may be scrolled at the same time; see curscr(3x).
++       characters; see bkgd(3x) (wide-character API users: bkgrnd(3x)).  As an
++       optimization,  if  the  scrolling  region  of  the window is the entire
++       screen, the physical screen may be  scrolled  at  the  same  time;  see
++       curscr(3x).
+ 
+-       scrl and wscrl scroll  stdscr  or  the  specified  window  up  or  down
+-       depending on the sign of n.
++       scrl and wscrl scrolls the specified window win up or down per the sign
++       of n.
+ 
+        o   For positive n, line i+n becomes i (scrolling up);
+ 
+-       o   for negative n, line i-n becomes i (scrolling down).
++       o   for negative n, line i-n becomes i (scrolling  down).   ncurses(3x)
++           describes the scrl variant of this function.
+ 
+        The  cursor does not move.  These functions perform no operation unless
+        scrolling is enabled for the window via scrollok(3x).
+@@ -102,12 +104,12 @@
+        SVr4  indicates  that  the   optimization   of   physically   scrolling
+        immediately  if  the scroll region is the entire screen "is" performed,
+        not "may be" performed.  ncurses deliberately does not  guarantee  that
+-       this  will occur, to leave open the possibility of smarter optimization
+-       of multiple scroll actions on the next update.
++       this  occurs,  to  leave open the possibility of better optimization of
++       multiple scroll actions on the next update.
+ 
+-       Neither SVr4 curses nor  X/Open  Curses  specify  whether  the  current
+-       attribute  or  current  color  pair  of  blanks generated by the scroll
+-       function are zeroed.  ncurses does so.
++       Neither SVr4 curses nor X/Open Curses specify whether  these  functions
++       zero  the  attributes  or color pair identifier of the blank character.
++       In ncurses, they do not.
+ 
+ 
+ 
                                                                                                                                SEE ALSO
                                                                                                                                +@@ -115,7 +117,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                   curs_scroll(3x)
++ncurses 6.5                       2024-09-14                   curs_scroll(3x)
+ 
                                                                                                                                
+ 
                                                                                                                                
+ 
                                                                                                                                  
+Index: doc/html/man/curs_termcap.3x.html
+--- ncurses-6.5-20240831+/doc/html/man/curs_termcap.3x.html	2024-06-22 22:55:08.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/curs_termcap.3x.html	2024-09-14 20:23:27.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_termcap.3x,v 1.87 2024/06/22 21:28:07 tom Exp @
++  * @Id: curs_termcap.3x,v 1.89 2024/09/14 20:06:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_termcap 3x 2024-06-22 ncurses 6.5 Library calls
++curs_termcap 3x 2024-09-14 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                  curs_termcap 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                                                  
++
                                                                                                                                  curs_termcap 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                  
+ 
                                                                                                                                  + curs_termcap(3x)                 Library calls                curs_termcap(3x)
+ 
+@@ -229,55 +229,55 @@
+        o   X/Open   Curses,   Issue  4,  Version  2  (1996),  describes  these
+            functions, marking them as "TO BE WITHDRAWN".
+ 
+-       o   X/Open Curses, Issue 7 (2009) marks the  termcap  interface  (along
+-           with vwprintw and vwscanw) as withdrawn.
++       o   X/Open Curses, Issue 7 (2009) withdrew the termcap interface (along
++           with the vwprintw and vwscanw functions).
+ 
+        Neither  X/Open  Curses  nor  the  SVr4 man pages documented the return
+-       values of tgetent correctly, though all three shown here were  in  fact
++       values of tgetent correctly, though all three shown here were  in  fact
+        returned  ever  since  SVr1.   In particular, an omission in the X/Open
+-       Curses specification has  been  misinterpreted  to  mean  that  tgetent
++       Curses specification has  been  misinterpreted  to  mean  that  tgetent
+        returns  OK  or  ERR.   Because  the  purpose  of these functions is to
+        provide compatibility with the termcap library, that  is  a  defect  in
+        X/Open Curses, Issue 4, Version 2 rather than in ncurses.
+ 
+-   Compatibility with BSD termcap
+-       Externally  visible  variables  are  provided  for  support  of certain
++   Compatibility with BSD termcap
++       ncurses  provides  externally  visible  variables  to  support  certain
+        termcap  applications.   However,  their  correct   usage   is   poorly
+        documented; for example, it is unclear when reading and writing them is
+        meaningful.  In particular, some applications are reported  to  declare
+        and/or modify ospeed.
+ 
+        The  constraint  that only the first two characters of the id parameter
+-       are used escapes many application developers.  The BSD termcap  library
+-       did  not require a trailing null character on the capability identifier
+-       passed to tgetstr,  tgetnum,  and  tgetflag.   Some  applications  thus
+-       assume  that  the  termcap interface does not require the trailing null
+-       character for the capability identifier.
+-
+-       o   ncurses disallows matches by the termcap interface against extended
+-           capability   names   that  are  longer  than  two  characters;  see
+-           user_caps(5).
++       are looked  up  in  the  terminal  database  escapes  many  application
++       developers.   The  BSD  termcap library did not require a trailing null
++       character after the capability identifier passed to  tgetstr,  tgetnum,
++       and tgetflag.  Some applications thus assume that the termcap interface
++       does not  require  the  trailing  null  character  for  the  capability
++       identifier.
+ 
+-       The BSD termcap function tgetent returns the text of a termcap entry in
++       ncurses  disallows  matches  by  the termcap interface against extended
++       capability names that are longer than two characters; see user_caps(5).
++
++       The BSD termcap function tgetent returns the text of a termcap entry in
+        the  buffer  passed  as an argument.  This library, like other terminfo
+        implementations, does not store terminal type descriptions as text.  It
+        sets the buffer contents to a null-terminated string.
+ 
+ 
+ 
                                                                                                                                  Header File
                                                                                                                                  +-       This  library  includes a termcap.h header for compatibility with other
+-       implementations, but the  header  is  rarely  used  because  the  other
+-       implementations are not strictly compatible.
++       This  library  includes  a termcap.h header file for compatibility with
++       other  implementations,  but  it  is  rarely  used  because  the  other
++       implementations are not mutually compatible; see below.
+ 
+ 
+ 
                                                                                                                                  HISTORY
                                                                                                                                  +        Bill  Joy  originated  a  forerunner  of termcap called "ttycap", dated
+        September 1977, and released in 1BSD (March 1978).  It used many of the
+-       same  function  names  as the later termcap, such as tgetent, tgetflag,
+-       tgetnum, and tgetstr.
++       same  function  names  as the later termcap, such as tgetent, tgetflag,
++       tgetnum, and tgetstr.
+ 
+        A clear descendant, the termlib library, followed in 2BSD  (May  1979),
+-       adding tgoto and tputs.  The former applied at that time only to cursor
++       adding tgoto and tputs.  The former applied at that time only to cursor
+        positioning  capabilities,  thus  the  overly  specific  name.   Little
+        changed  in 3BSD (late 1979) except the addition of test programs and a
+        termlib man page, which documented the API shown in section  "SYNOPSIS"
+@@ -300,18 +300,18 @@
+            shows that this was added in mid-1992.  The libedit header file was
+            used  internally  as  a  convenience  for  compiling  the  editline
+            library.  It declared function prototypes, but no global variables.
+-           This header file was added to NetBSD's termcap library in mid-1994.
++           NetBSD's termcap library added this header file in mid-1994.
+ 
+        Meanwhile, GNU termcap began development in 1990.   Its  first  release
+-       (1.0)  in  1991  included  a  termcap.h  header.   Its  second (1.1) in
+-       September 1992 modified the  header  to  use  const  for  the  function
+-       prototypes  in  the  header where one would expect the parameters to be
+-       read-only.   BSD  termcap  did  not.   The  prototype  for  tputs  also
++       (1.0)  in  1991  included  a  termcap.h  header file.  Its second (1.1)
++       release in September 1992 modified  the  file  to  use  const  for  the
++       function  prototypes in the header where one would expect parameters to
++       be read-only.  BSD termcap did  not.   The  prototype  for  tputs  also
+        differed,  but  in that instance, it was libedit that differed from BSD
+        termcap.
+ 
+-       GNU termcap 1.3 was bundled with bash(1) in  mid-1993  to  support  the
+-       readline(3) library.
++       GNU bash(1) has bundled GNU termcap 1.3 since mid-1993 to  support  its
++       readline(3) library, and continues to use it if configured to do so.
+ 
+        ncurses  1.8.1 (November 1993) provided a termcap.h file.  It reflected
+        influence  from  GNU  termcap  and  emacs(1)  (rather  than   jove(1)),
+@@ -321,9 +321,9 @@
+ 
+        o   const-qualified function prototypes, and
+ 
+-       o   a prototype for tparam, a GNU termcap feature.
++       o   a prototype for tparam, a GNU termcap feature.
+ 
+-       Later  (in mid-1996) the tparam function was removed from ncurses.  Any
++       Later  (in mid-1996) the tparam function was removed from ncurses.  Any
+        two of the four implementations thus differ, and programs  that  intend
+        to work with all termcap library interfaces must account for that fact.
+ 
+@@ -363,13 +363,14 @@
+ 
+ 
+ 
                                                                                                                                  SEE ALSO
                                                                                                                                  +-       curses(3x), curs_terminfo(3x), putc(3), term_variables(3x), terminfo(5)
++       TCTEST - A Termcap Test Utility
++       <https://invisible-island.net/ncurses/tctest.html>
+ 
+-       https://invisible-island.net/ncurses/tctest.html
++       curses(3x), curs_terminfo(3x), putc(3), term_variables(3x), terminfo(5)
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-22                  curs_termcap(3x)
++ncurses 6.5                       2024-09-14                  curs_termcap(3x)
+ 
                                                                                                                                  
+ 
                                                                                                                                  
+ 
                                                                                                                                    
+Index: doc/html/man/curs_terminfo.3x.html
+--- ncurses-6.5-20240831+/doc/html/man/curs_terminfo.3x.html	2024-06-08 23:12:49.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/curs_terminfo.3x.html	2024-09-14 20:23:27.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_terminfo.3x,v 1.142 2024/06/08 23:05:52 tom Exp @
++  * @Id: curs_terminfo.3x,v 1.144 2024/09/14 20:06:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_terminfo 3x 2024-06-08 ncurses 6.5 Library calls
++curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                    curs_terminfo 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                                    
++
                                                                                                                                    curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                    
+ 
                                                                                                                                    + curs_terminfo(3x)                Library calls               curs_terminfo(3x)
+ 
+@@ -210,81 +210,80 @@
+        setupterm  stores  its  information  about  the  terminal in a TERMINAL
+        structure pointed to by the global variable cur_term.  If it detects an
+        error,  or  decides  that  the  terminal  is  unsuitable  (hardcopy  or
+-       generic), it discards this information,  making  it  not  available  to
++       generic), it  discards  this  information,  making  it  unavailable  to
+        applications.
+ 
+-       If  setupterm  is called repeatedly for the same terminal type, it will
+-       reuse  the  information.   It  maintains  only  one  copy  of  a  given
+-       terminal's  capabilities  in  memory.   If  it  is called for different
+-       terminal types,  setupterm  allocates  new  storage  for  each  set  of
+-       terminal capabilities.
+-
+-       set_curterm  sets  cur_term  to  nterm,  and  makes all of the terminfo
+-       Boolean, numeric, and string variables use the values from  nterm.   It
+-       returns the old value of cur_term.
+-
+-       del_curterm  frees the space pointed to by oterm and makes it available
+-       for further use.  If oterm is the same as cur_term, references  to  any
+-       of  the  terminfo Boolean, numeric, and string variables thereafter may
+-       refer to invalid memory locations  until  another  setupterm  has  been
+-       called.
+-
+-       restartterm  is  similar  to  setupterm  and initscr, except that it is
+-       called after restoring memory to a previous state  (for  example,  when
+-       reloading a game saved as a core image dump).  restartterm assumes that
+-       the windows and the input and output  options  are  the  same  as  when
+-       memory was saved, but the terminal type and baud rate may be different.
+-       Accordingly, restartterm  saves  various  terminal  state  bits,  calls
+-       setupterm, and then restores the bits.
++       If setupterm is called repeatedly for the same terminal type, it reuses
++       the information.   It  maintains  only  one  copy  of  a  given  type's
++       capabilities  in  memory.   If  called  for  different types, setupterm
++       allocates new storage for each set of terminal capabilities.
++
++       set_curterm sets cur_term to nterm, making all of the terminfo Boolean,
++       numeric, and string capabilities use the values from nterm.  It returns
++       the old value of cur_term.
++
++       del_curterm frees the memory pointed to by oterm, making  it  available
++       for  further  use.  If oterm is the same as cur_term, references to any
++       of the terminfo Boolean, numeric, and  string  capabilities  thereafter
++       may refer to invalid memory locations until setupterm is called again.
++
++       restartterm  is  similar  to  setupterm,  but is intended for use after
++       restoring program  memory  to  a  previous  state  (for  example,  when
++       reloading  an  application  that  has  been suspended from one terminal
++       session and restored in another).  restartterm assumes that the display
++       dimensions and the input and output options are the same as when memory
++       was  saved,  but  the  terminal  type  and  line  speed   may   differ.
++       Accordingly,   restartterm   saves   relevant   terminal  state,  calls
++       setupterm, then restores that state.
+ 
+ 
+ 
                                                                                                                                    Formatting Output
                                                                                                                                    +-       tparm  instantiates  the  string  str with parameters pi.  A pointer is
++       tparm instantiates the string str with parameters  pi.   A  pointer  is
+        returned to the result of str with the parameters applied.  Application
+        developers should keep in mind these quirks of the interface:
+ 
+-       o   Although  tparm's actual parameters may be integers or strings, the
++       o   Although tparm's actual parameters may be integers or strings,  the
+            prototype expects long (integer) values.
+ 
+-       o   Aside from  the  set_attributes  (sgr)  capability,  most  terminal
++       o   Aside  from  the  set_attributes  (sgr)  capability,  most terminal
+            capabilities require no more than one or two parameters.
+ 
+-       o   Padding  information  is  ignored  by  tparm;  it is interpreted by
++       o   Padding information is ignored  by  tparm;  it  is  interpreted  by
+            tputs.
+ 
+-       o   The capability string is  null-terminated.   Use  "\200"  where  an
++       o   The  capability  string  is  null-terminated.   Use "\200" where an
+            ASCII NUL is needed in the output.
+ 
+-       tiparm  is  a  newer  form  of  tparm which uses stdarg.h rather than a
+-       fixed-parameter list.  Its numeric  parameters  are  ints  rather  than
++       tiparm is a newer form of tparm  which  uses  stdarg.h  rather  than  a
++       fixed-parameter  list.   Its  numeric  parameters  are ints rather than
+        longs.
+ 
+-       Both  tparm  and  tiparm  assume that the application passes parameters
+-       consistent with the terminal description.  Two extensions are  provided
++       Both tparm and tiparm assume that  the  application  passes  parameters
++       consistent  with the terminal description.  Two extensions are provided
+        as alternatives to deal with untrusted data.
+ 
+-       o   tiparm_s  is an extension which is a safer formatting function than
++       o   tiparm_s is an extension which is a safer formatting function  than
+            tparm or tiparm, because it allows the developer to tell the curses
+-           library  how  many  parameters to expect in the parameter list, and
++           library how many parameters to expect in the  parameter  list,  and
+            which may be string parameters.
+ 
+-           The mask parameter has one bit set for each of the  parameters  (up
++           The  mask  parameter has one bit set for each of the parameters (up
+            to 9) passed as char pointers rather than numbers.
+ 
+-       o   The   extension  tiscan_s  allows  the  application  to  inspect  a
++       o   The  extension  tiscan_s  allows  the  application  to  inspect   a
+            formatting capability to see what the curses library would assume.
+ 
+ 
+ 
                                                                                                                                    Output Functions
                                                                                                                                    +-       String capabilities can  contain  padding  information,  a  time  delay
++       String  capabilities  can  contain  padding  information,  a time delay
+        (accommodating performance limitations of hardware terminals) expressed
+        as $<n>, where n is a nonnegative integral count of milliseconds.  If n
+        exceeds 30,000 (thirty seconds), it is capped at that value.
+ 
+-       tputs  interprets  time-delay information in the string str and outputs
++       tputs interprets time-delay information in the string str  and  outputs
+        it, executing the delays:
+ 
+-       o   The str parameter must be a terminfo string variable or the  return
++       o   The  str parameter must be a terminfo string variable or the return
+            value of tparm or tiparm.
+ 
+        o   affcnt is the number of lines affected, or 1 if not applicable.
+@@ -292,8 +291,8 @@
+        o   putc is a putchar-like function to which the characters are passed,
+            one at a time.
+ 
+-           If tputs processes  a  time-delay,  it  uses  the  delay_output(3x)
+-           function,  routing  any  resulting  padding characters through this
++           If  tputs  processes  a  time-delay,  it  uses the delay_output(3x)
++           function, routing any resulting  padding  characters  through  this
+            function.
+ 
+        putp calls "tputs(str, 1, putchar)".  The output of putp always goes to
+@@ -305,30 +304,30 @@
+ 
+        vidattr is like vidputs, except that it outputs through putchar(3).
+ 
+-       vid_attr  and vid_puts correspond to vidattr and vidputs, respectively.
+-       They use multiple parameters to represent the character attributes  and
++       vid_attr and vid_puts correspond to vidattr and vidputs,  respectively.
++       They  use multiple parameters to represent the character attributes and
+        color; namely,
+ 
+        o   attrs, of type attr_t, for the attributes and
+ 
+        o   pair, of type short, for the color pair number.
+ 
+-       Use  the  attribute  constants  prefixed  with  "WA_" with vid_attr and
++       Use the attribute constants  prefixed  with  "WA_"  with  vid_attr  and
+        vid_puts.
+ 
+-       X/Open Curses reserves the opts argument for future  use,  saying  that
+-       applications  must  provide  a  null pointer for that argument; but see
++       X/Open  Curses  reserves  the opts argument for future use, saying that
++       applications must provide a null pointer for  that  argument;  but  see
+        section "EXTENSIONS" below.
+ 
+-       While putp is a low-level function that does not use high-level  curses
+-       state,  ncurses  declares it in curses.h because System V did this (see
++       While  putp is a low-level function that does not use high-level curses
++       state, ncurses declares it in curses.h because System V did  this  (see
+        section "HISTORY" below).
+ 
+ 
+ 
                                                                                                                                    Terminal Capability Functions
                                                                                                                                    +-       tigetflag, tigetnum, and tigetstr return the value  of  the  capability
+-       corresponding  to  the terminfo cap-code, such as xenl, passed to them.
+-       The cap-code for each capability is given in the table column  entitled
++       tigetflag,  tigetnum,  and  tigetstr return the value of the capability
++       corresponding to the terminfo cap-code, such as xenl, passed  to  them.
++       The  cap-code for each capability is given in the table column entitled
+        cap-code code in the capabilities section of terminfo(5).
+ 
+        These functions return special values to denote errors.
+@@ -371,26 +370,26 @@
+ 
+ 
                                                                                                                                    Releasing Memory
                                                                                                                                    +        Each successful call to setupterm allocates memory to hold the terminal
+-       description.  As a side effect, it  sets  cur_term  to  point  to  this
++       description.   As  a  side  effect,  it  sets cur_term to point to this
+        memory.  If an application calls
+ 
+               del_curterm(cur_term);
+ 
+        the memory will be freed.
+ 
+-       The  formatting functions tparm and tiparm extend the storage allocated
++       The formatting functions tparm and tiparm extend the storage  allocated
+        by setupterm as follows.
+ 
+-       o   They add the "static" terminfo  variables  [a-z].   Before  ncurses
++       o   They  add  the  "static"  terminfo variables [a-z].  Before ncurses
+            6.3, those were shared by all screens.  With ncurses 6.3, those are
+            allocated per screen.  See terminfo(5).
+ 
+-       o   To improve performance, ncurses 6.3 caches the result of  analyzing
+-           terminfo  strings  for  their parameter types.  That is stored as a
++       o   To  improve performance, ncurses 6.3 caches the result of analyzing
++           terminfo strings for their parameter types.  That is  stored  as  a
+            binary tree referenced from the TERMINAL structure.
+ 
+        The higher-level initscr and newterm functions use setupterm.  Normally
+-       they  do  not free this memory, but it is possible to do that using the
++       they do not free this memory, but it is possible to do that  using  the
+        delscreen(3x) function.
+ 
+ 
+@@ -406,35 +405,35 @@
+             fails if the associated call to setupterm returns ERR.
+ 
+        setupterm
+-            fails if it cannot allocate enough memory, or create  the  initial
+-            windows  (stdscr,  curscr,  and newscr) Other error conditions are
++            fails  if  it cannot allocate enough memory, or create the initial
++            windows (stdscr, curscr, and newscr) Other  error  conditions  are
+             documented above.
+ 
+        tparm
+-            returns a null pointer if the capability would require  unexpected
+-            parameters;  that  is,  too  many,  too  few,  or  incorrect types
++            returns  a null pointer if the capability would require unexpected
++            parameters; that  is,  too  many,  too  few,  or  incorrect  types
+             (strings where integers are expected, or vice versa).
+ 
+        tputs
+-            fails if the string parameter is null.  It  does  not  detect  I/O
+-            errors:  X/Open  Curses states that tputs ignores the return value
++            fails  if  the  string  parameter is null.  It does not detect I/O
++            errors: X/Open Curses states that tputs ignores the  return  value
+             of the output function putc.
+ 
+ 
+ 
                                                                                                                                    NOTES
                                                                                                                                    +-       The vid_attr function in ncurses is a special case.  It was  originally
++       The  vid_attr function in ncurses is a special case.  It was originally
+        implemented based on a draft of X/Open Curses, as a macro, before other
+-       parts of the ncurses wide-character API were developed, and unlike  the
+-       other  wide-character  functions,  is  also  provided  in the non-wide-
++       parts  of the ncurses wide-character API were developed, and unlike the
++       other wide-character functions,  is  also  provided  in  the  non-wide-
+        character configuration.
+ 
+ 
+ 
                                                                                                                                    EXTENSIONS
                                                                                                                                    +-       The functions marked as extensions were designed for ncurses,  and  are
+-       not  found  in SVr4 curses, 4.4BSD curses, or any other previous curses
++       The  functions  marked as extensions were designed for ncurses, and are
++       not found in SVr4 curses, 4.4BSD curses, or any other  previous  curses
+        implementation.
+ 
+-       ncurses allows opts to be a pointer to int, which  overrides  the  pair
++       ncurses  allows  opts  to be a pointer to int, which overrides the pair
+        (short) argument.
+ 
+ 
+@@ -444,78 +443,79 @@
+ 
+ 
+ 
                                                                                                                                    Compatibility Macros
                                                                                                                                    +-       This implementation  provides  a  few  macros  for  compatibility  with
+-       systems  before  SVr4  (see  section  "HISTORY"  below).   They include
+-       Bcrmode, Bfixterm, Bgettmode,  Bnocrmode,  Bresetterm,  Bsaveterm,  and
++       This  implementation  provides  a  few  macros  for  compatibility with
++       systems before  SVr4  (see  section  "HISTORY"  below).   They  include
++       Bcrmode,  Bfixterm,  Bgettmode,  Bnocrmode,  Bresetterm, Bsaveterm, and
+        Bsetterm.
+ 
+-       In  SVr4,  these  are  found  in  curses.h, but except for setterm, are
++       In SVr4, these are found in  curses.h,  but  except  for  setterm,  are
+        likewise macros.  The one function, setterm, is mentioned in the manual
+        page.  It further notes that setterm was replaced by setupterm, stating
+        that the call
+               setupterm(term, 1, (int *)0)
+-       provides the same  functionality  as  setterm(term),  discouraging  the
+-       latter  for  new programs.  ncurses implements each of these symbols as
++
++       provides  the  same  functionality  as  setterm(term), discouraging the
++       latter for new programs.  ncurses implements each of these  symbols  as
+        macros for BSD curses compatibility.
+ 
+ 
+ 
                                                                                                                                    Legacy Data
                                                                                                                                    +-       setupterm copies the terminal name to the array ttytype.  This  is  not
++       setupterm  copies  the terminal name to the array ttytype.  This is not
+        part of X/Open Curses, but is assumed by some applications.
+ 
+-       Other  implementions  may not declare the capability name arrays.  Some
+-       provide them without declaring them.  X/Open Curses  does  not  specify
++       Other implementions may not declare the capability name  arrays.   Some
++       provide  them  without  declaring them.  X/Open Curses does not specify
+        them.
+ 
+-       Extended  terminal  capability  names,  as defined by "tic -x", are not
++       Extended terminal capability names, as defined by  "tic  -x",  are  not
+        stored in the arrays described here.
+ 
+ 
+ 
                                                                                                                                    Output Buffering
                                                                                                                                    +-       Older versions of ncurses assumed that the file  descriptor  passed  to
++       Older  versions  of  ncurses assumed that the file descriptor passed to
+        setupterm from initscr or newterm uses buffered I/O, and would write to
+-       the corresponding stream.  In  addition  to  the  limitation  that  the
+-       terminal  was  left  in  block-buffered  mode  on  exit  (like System V
+-       curses), it was problematic because ncurses did not  allow  a  reliable
++       the  corresponding  stream.   In  addition  to  the limitation that the
++       terminal was  left  in  block-buffered  mode  on  exit  (like  System V
++       curses),  it  was  problematic because ncurses did not allow a reliable
+        way to clean up on receiving SIGTSTP.
+ 
+-       The  current version (ncurses6) uses output buffers managed directly by
++       The current version (ncurses6) uses output buffers managed directly  by
+        ncurses.  Some of the low-level functions described in this manual page
+-       write  to  the  standard  output.  They are not signal-safe.  The high-
++       write to the standard output.  They are  not  signal-safe.   The  high-
+        level functions in ncurses employ alternate versions of these functions
+        using the more reliable buffering scheme.
+ 
+ 
+ 
                                                                                                                                    Function Prototypes
                                                                                                                                    +-       The  X/Open  Curses  prototypes  are  based  on  the SVr4 curses header
+-       declarations, which were defined at the same time the  C  language  was
++       The X/Open Curses prototypes  are  based  on  the  SVr4  curses  header
++       declarations,  which  were  defined at the same time the C language was
+        first standardized in the late 1980s.
+ 
+-       o   X/Open  Curses  uses  const  less  effectively  than a later design
+-           might, sometimes applying it needlessly to values that are  already
+-           constant,  and  in  most cases overlooking parameters that normally
+-           would use const.  Passing const-qualified parameters  to  functions
+-           that  do  not  declare  them  const  may  prevent  the program from
+-           compiling.   On  the  other  hand,  "writable   strings"   are   an
++       o   X/Open Curses uses const  less  effectively  than  a  later  design
++           might,  sometimes applying it needlessly to values that are already
++           constant, and in most cases overlooking  parameters  that  normally
++           would  use  const.  Passing const-qualified parameters to functions
++           that do not  declare  them  const  may  prevent  the  program  from
++           compiling.    On   the   other  hand,  "writable  strings"  are  an
+            obsolescent feature.
+ 
+-           As  an  extension,  this implementation can be configured to change
+-           the function prototypes to use the const keyword.  The ncurses  ABI
++           As an extension, this implementation can be  configured  to  change
++           the  function prototypes to use the const keyword.  The ncurses ABI
+            6 enables this feature by default.
+ 
+-       o   X/Open  Curses  prototypes tparm with a fixed number of parameters,
++       o   X/Open Curses prototypes tparm with a fixed number  of  parameters,
+            rather than a variable argument list.
+ 
+-           This implementation uses a  variable  argument  list,  but  can  be
+-           configured  to use the fixed-parameter list.  Portable applications
+-           should provide nine parameters after the format;  zeroes  are  fine
++           This  implementation  uses  a  variable  argument  list, but can be
++           configured to use the fixed-parameter list.  Portable  applications
++           should  provide  nine  parameters after the format; zeroes are fine
+            for this purpose.
+ 
+-           In  response  to review comments by Thomas E. Dickey, X/Open Curses
++           In response to review comments by Thomas E. Dickey,  X/Open  Curses
+            Issue 7 proposed the tiparm function in mid-2009.
+ 
+-           While tiparm is always provided in ncurses, the older form is  only
+-           available  as  a build-time configuration option.  If not specially
++           While  tiparm is always provided in ncurses, the older form is only
++           available as a build-time configuration option.  If  not  specially
+            configured, tparm is the same as tiparm.
+ 
+        Both forms of tparm have drawbacks:
+@@ -523,56 +523,56 @@
+        o   Most of the calls to tparm use only one or two parameters.  Passing
+            nine on each call is awkward.
+ 
+-           Using  long  for the numeric parameter type is a workaround to make
+-           the parameter use the same amount of  stack  as  a  pointer.   That
+-           approach  dates  back  to the mid-1980s, before C was standardized.
+-           Since then, there is a standard (and pointers are not  required  to
++           Using long for the numeric parameter type is a workaround  to  make
++           the  parameter  use  the  same  amount of stack as a pointer.  That
++           approach dates back to the mid-1980s, before  C  was  standardized.
++           Since  then,  there is a standard (and pointers are not required to
+            fit in a long).
+ 
+-       o   Providing  the  right  number of parameters for a variadic function
++       o   Providing the right number of parameters for  a  variadic  function
+            such  as  tiparm  can  be  a  problem,  in  particular  for  string
+-           parameters.   However,  only a few terminfo capabilities use string
+-           parameters (for instance, the ones used for  programmable  function
++           parameters.  However, only a few terminfo capabilities  use  string
++           parameters  (for  instance, the ones used for programmable function
+            keys).
+ 
+            The ncurses library checks usage of these capabilities, and returns
+-           ERR if the capability mishandles string parameters.  But it  cannot
++           ERR  if the capability mishandles string parameters.  But it cannot
+            check if a calling program provides strings in the right places for
+            the tparm calls.
+ 
+-           The tput(1) program checks its use of  these  capabilities  with  a
++           The  tput(1)  program  checks  its use of these capabilities with a
+            table, so that it calls tparm correctly.
+ 
+    Special TERM treatment
+        If configured to use the terminal driver, as with the MinGW port,
+ 
+-       o   setupterm  interprets  a missing/empty TERM variable as the special
++       o   setupterm interprets a missing/empty TERM variable as  the  special
+            value "unknown".
+ 
+            SVr4 curses uses the special value "dumb".
+ 
+-           The difference  between  the  two  is  that  the  former  uses  the
+-           generic_type  (gn)  terminfo capability, while the latter does not.
++           The  difference  between  the  two  is  that  the  former  uses the
++           generic_type (gn) terminfo capability, while the latter  does  not.
+            A generic terminal is unsuitable for full-screen applications.
+ 
+-       o   setupterm allows explicit use of the the windows console driver  by
+-           checking  if $TERM is set to "#win32con" or an abbreviation of that
++       o   setupterm  allows explicit use of the the windows console driver by
++           checking if $TERM is set to "#win32con" or an abbreviation of  that
+            string.
+ 
+ 
+ 
                                                                                                                                    Other Portability Issues
                                                                                                                                    +-       In SVr4, set_curterm returns an int, OK or  ERR.   We  have  chosen  to
++       In  SVr4,  set_curterm  returns  an  int, OK or ERR.  We have chosen to
+        implement the X/Open Curses semantics.
+ 
+-       In SVr4, the third argument of tputs has the type "int (*putc)(char)".
++       In SVr4, the third argument of tputs has the type "int (*putc)(char)".
+ 
+-       At  least one implementation of X/Open Curses (Solaris) returns a value
+-       other than OK or ERR from tputs.  It instead returns the length of  the
++       At least one implementation of X/Open Curses (Solaris) returns a  value
++       other  than OK or ERR from tputs.  It instead returns the length of the
+        string, and does no error checking.
+ 
+ 
+ 
                                                                                                                                    HISTORY
                                                                                                                                    +-       SVr2  (1984)  introduced  the terminfo feature.  Its programming manual
++       SVr2 (1984) introduced the terminfo feature.   Its  programming  manual
+        mentioned the following low-level functions.
+ 
+        Function    Description
+@@ -592,7 +592,7 @@
+        vidattr     like vidputs, but output through putchar
+        vidputs     write string to terminal, applying specified attributes
+ 
+-       The programming manual also mentioned functions  provided  for  termcap
++       The  programming  manual  also mentioned functions provided for termcap
+        compatibility (commenting that they "may go away at a later date").
+ 
+        Function   Description
+@@ -604,11 +604,11 @@
+        tgoto      apply parameters to given capability
+        tputs      write characters via a function parameter, applying padding
+ 
+-       Early  terminfo  programs  obtained capability values from the TERMINAL
++       Early terminfo programs obtained capability values  from  the  TERMINAL
+        structure initialized by setupterm.
+ 
+-       SVr3  (1987)  extended  terminfo  by  adding  functions   to   retrieve
+-       capability  values  (like the termcap interface), and reusing tgoto and
++       SVr3   (1987)   extended  terminfo  by  adding  functions  to  retrieve
++       capability values (like the termcap interface), and reusing  tgoto  and
+        tputs.
+ 
+        Function    Description
+@@ -617,7 +617,7 @@
+        tigetnum    get numeric entry for given id
+        tigetstr    get string entry for given id
+ 
+-       SVr3 also replaced several of the SVr2 terminfo functions that  had  no
++       SVr3  also  replaced several of the SVr2 terminfo functions that had no
+        counterpart in the termcap interface, documenting them as obsolete.
+ 
+        Function    Replaced by
+@@ -630,37 +630,37 @@
+        saveterm    def_prog_mode
+        setterm     setupterm
+ 
+-       SVr3  kept  the mvcur, vidattr, and vidputs functions, along with putp,
+-       tparm, and tputs.  The latter were needed to support  padding,  and  to
+-       handle  capabilities  accessed by functions such as vidattr (which used
++       SVr3 kept the mvcur, vidattr, and vidputs functions, along  with  putp,
++       tparm,  and  tputs.   The latter were needed to support padding, and to
++       handle capabilities accessed by functions such as vidattr  (which  used
+        more than the two parameters supported by tgoto).
+ 
+-       SVr3  introduced  the  functions   for   switching   between   terminal
+-       descriptions;   for   example,  set_curterm.   Some  changes  reflected
++       SVr3   introduced   the   functions   for  switching  between  terminal
++       descriptions;  for  example,  set_curterm.   Some   changes   reflected
+        incremental improvements to the SVr2 library.
+ 
+-       o   The TERMINAL type definition was introduced  in  SVr3.01,  for  the
++       o   The  TERMINAL  type  definition  was introduced in SVr3.01, for the
+            term structure provided in SVr2.
+ 
+-       o   Various  global  variables  such as boolnames were mentioned in the
+-           programming manual at this point, though  the  variables  had  been
++       o   Various global variables such as boolnames were  mentioned  in  the
++           programming  manual  at  this  point, though the variables had been
+            provided in SVr2.
+ 
+        SVr4 (1989) added the vid_attr and vid_puts functions.
+ 
+-       Other  low-level  functions  are declared in the curses header files of
+-       Unix systems, but none are documented.  Those noted  as  "obsolete"  by
++       Other low-level functions are declared in the curses  header  files  of
++       Unix  systems,  but  none are documented.  Those noted as "obsolete" by
+        SVr3 remained in use by System V's vi(1) editor.
+ 
+ 
+ 
                                                                                                                                    SEE ALSO
                                                                                                                                    +        curses(3x),   curs_initscr(3x),   curs_kernel(3x),   curs_memleaks(3x),
+-       curs_termcap(3x),  curs_variables(3x),   putc(3),   term_variables(3x),
++       curs_termcap(3x),   curs_variables(3x),   putc(3),  term_variables(3x),
+        terminfo(5)
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                 curs_terminfo(3x)
++ncurses 6.5                       2024-09-14                 curs_terminfo(3x)
+ 
                                                                                                                                    
+ 
                                                                                                                                    
+ 
                                                                                                                                      
+Index: doc/html/man/curs_util.3x.html
+--- ncurses-6.5-20240831+/doc/html/man/curs_util.3x.html	2024-07-27 23:11:32.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/curs_util.3x.html	2024-09-14 20:23:27.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_util.3x,v 1.114 2024/07/27 19:55:45 tom Exp @
++  * @Id: curs_util.3x,v 1.116 2024/09/11 21:02:40 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_util 3x 2024-07-27 ncurses 6.5 Library calls
++curs_util 3x 2024-09-11 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                      curs_util 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                      
++
                                                                                                                                      curs_util 3x 2024-09-11 ncurses 6.5 Library calls
                                                                                                                                      
+ 
                                                                                                                                      + curs_util(3x)                    Library calls                   curs_util(3x)
+ 
+@@ -405,7 +405,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                     curs_util(3x)
++ncurses 6.5                       2024-09-11                     curs_util(3x)
+ 
                                                                                                                                      
+ 
                                                                                                                                      
+ 
                                                                                                                                        
+Index: doc/html/man/curs_variables.3x.html
+--- ncurses-6.5-20240831+/doc/html/man/curs_variables.3x.html	2024-06-22 22:55:09.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/curs_variables.3x.html	2024-09-14 20:23:27.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_variables.3x,v 1.49 2024/06/22 21:25:23 tom Exp @
++  * @Id: curs_variables.3x,v 1.51 2024/09/14 20:06:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_variables 3x 2024-06-22 ncurses 6.5 Library calls
++curs_variables 3x 2024-09-14 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                        curs_variables 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                                                        
++
                                                                                                                                        curs_variables 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                        
+ 
                                                                                                                                        + curs_variables(3x)               Library calls              curs_variables(3x)
+ 
+@@ -258,15 +258,15 @@
+ 
+ 
+ 
                                                                                                                                        SEE ALSO
                                                                                                                                        +-       curses(3x),   curs_color(3x),    curs_opaque(3x),    curs_terminfo(3x),
+-       curs_threads(3x), term_variables(3x), terminfo(5)
+-
+-       [UAX  #29]  "Unicode  Standard  Annex  #29: Unicode Text Segmentation";
++       [UAX #29] "Unicode Standard Annex #29: Unicode Text Segmentation"
+        <https://unicode.org/reports/tr29/>
+ 
++       curses(3x),    curs_color(3x),    curs_opaque(3x),   curs_terminfo(3x),
++       curs_threads(3x), term_variables(3x), terminfo(5)
++
+ 
+ 
+-ncurses 6.5                       2024-06-22                curs_variables(3x)
++ncurses 6.5                       2024-09-14                curs_variables(3x)
+ 
                                                                                                                                        
+ 
                                                                                                                                        
+ 
                                                                                                                                          
+Index: doc/html/man/curs_window.3x.html
+--- ncurses-6.5-20240831+/doc/html/man/curs_window.3x.html	2024-06-01 23:07:17.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/curs_window.3x.html	2024-09-14 20:23:27.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_window.3x,v 1.52 2024/06/01 22:29:08 tom Exp @
++  * @Id: curs_window.3x,v 1.54 2024/09/14 20:06:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_window 3x 2024-06-01 ncurses 6.5 Library calls
++curs_window 3x 2024-09-14 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                          curs_window 3x 2024-06-01 ncurses 6.5 Library calls
                                                                                                                                          
++
                                                                                                                                          curs_window 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                          
+ 
                                                                                                                                          + curs_window(3x)                  Library calls                 curs_window(3x)
+ 
+@@ -54,23 +54,23 @@
+ 
                                                                                                                                          SYNOPSIS
                                                                                                                                          +        #include <curses.h>
+ 
+-       WINDOW *newwin(
+-             int nlines, int ncols,
+-             int begin_y, int begin_x);
+-       int delwin(WINDOW *win);
+-       int mvwin(WINDOW *win, int y, int x);
+-       WINDOW *subwin(WINDOW *orig,
+-             int nlines, int ncols,
+-             int begin_y, int begin_x);
+-       WINDOW *derwin(WINDOW *orig,
+-             int nlines, int ncols,
+-             int begin_y, int begin_x);
+-       int mvderwin(WINDOW *win, int par_y, int par_x);
+-       WINDOW *dupwin(WINDOW *win);
+-       void wsyncup(WINDOW *win);
+-       int syncok(WINDOW *win, bool bf);
+-       void wcursyncup(WINDOW *win);
+-       void wsyncdown(WINDOW *win);
++       WINDOW * newwin(
++            int nlines, int ncols,
++            int begin_y, int begin_x);
++       int delwin(WINDOW * win);
++       int mvwin(WINDOW * win, int y, int x);
++       WINDOW * subwin(WINDOW * orig,
++            int nlines, int ncols,
++            int begin_y, int begin_x);
++       WINDOW * derwin(WINDOW * orig,
++            int nlines, int ncols,
++            int begin_y, int begin_x);
++       int mvderwin(WINDOW * win, int par_y, int par_x);
++       WINDOW * dupwin(WINDOW * win);
++       void wsyncup(WINDOW * win);
++       int syncok(WINDOW * win, bool bf);
++       void wcursyncup(WINDOW * win);
++       void wsyncdown(WINDOW * win);
+ 
+ 
+ 
                                                                                                                                          DESCRIPTION
                                                                                                                                          +@@ -248,7 +248,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-01                   curs_window(3x)
++ncurses 6.5                       2024-09-14                   curs_window(3x)
+ 
                                                                                                                                          
+ 
                                                                                                                                          
+ 
                                                                                                                                            
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.5-20240831+/doc/html/man/infocmp.1m.html	2024-05-11 21:39:58.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/infocmp.1m.html	2024-09-14 20:23:28.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: infocmp.1m,v 1.110 2024/05/11 20:39:53 tom Exp @
++  * @Id: infocmp.1m,v 1.112 2024/09/14 20:06:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-infocmp 1m 2024-05-11 ncurses 6.5 User commands
++infocmp 1m 2024-09-14 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                            infocmp 1m 2024-05-11 ncurses 6.5 User commands
                                                                                                                                            
++
                                                                                                                                            infocmp 1m 2024-09-14 ncurses 6.5 User commands
                                                                                                                                            
+ 
                                                                                                                                            + infocmp(1m)                      User commands                     infocmp(1m)
+ 
+@@ -52,10 +52,9 @@
+ 
+ 
+ 
                                                                                                                                            SYNOPSIS
                                                                                                                                            +-       infocmp [-1cCdDeEFgGiIKlLnpqrtTuUVWx]
+-             [-v n] [-s d| i| l| c] [-Q n] [-R subset]
+-             [-w width] [-A directory] [-B directory]
+-             [terminal-type ...]
++       infocmp [-1cCdDeEFgGiIKlLnpqrtTuUVWx] [-A directory] [-B directory]
++              [-Q encoding] [-R subset] [-s key] [-v level] [-w width]
++              [terminal-type ... ]
+ 
+ 
+ 
                                                                                                                                            DESCRIPTION
                                                                                                                                            +@@ -84,7 +83,7 @@
+ 
+        o   NULL for missing integer or string variables
+ 
+-       Use the -q option to show the distinction between absent and  cancelled
++       Use the -q option to show the distinction between absent  and  canceled
+        capabilities.
+ 
+        These  options  produce a list which you can use to compare two or more
+@@ -217,7 +216,7 @@
+        are superfluous.  infocmp will flag any other terminal-type use= fields
+        that were not needed.
+ 
+-   Changing Databases [-A directory] [-B directory]
++   Changing Databases [-A directory] [-B directory]
+        Like  other  ncurses  utilities,  infocmp  looks   for   the   terminal
+        descriptions   in  several  places.   You  can  use  the  TERMINFO  and
+        TERMINFO_DIRS environment variables to override the compiled-in default
+@@ -313,10 +312,10 @@
+                       LL            home-down
+                       RSR           reset scroll region
+                       -----------------------------------------
+-
+                       DECSTR        soft reset (VT320)
+                       S7C1T         7-bit controls (VT220)
+                       -----------------------------------------
++
+                       ISO DEC G0    enable DEC graphics for G0
+                       ISO UK G0     enable UK chars for G0
+                       ISO US G0     enable US chars for G0
+@@ -378,7 +377,7 @@
+                 and using "-" for absent capabilities, "@" for canceled rather
+                 than "NULL".
+ 
+-            o   However,   show   differences  between  absent  and  cancelled
++            o   However,   show   differences   between  absent  and  canceled
+                 capabilities.
+ 
+             o   Omit the "Reconstructed from" comment for source listings.
+@@ -472,7 +471,7 @@
+        The -0, -1, -E, -F, -G, -Q, -R, -T, -V, -a, -e, -f, -g, -i, -l, -p,  -q
+        and -t options are not supported in SVr4 curses.
+ 
+-       SVr4   infocmp  does  not  distinguish  between  absent  and  cancelled
++       SVr4   infocmp   does  not  distinguish  between  absent  and  canceled
+        capabilities.  Also, it shows missing integer capabilities as  -1  (the
+        internal   value   used   to   represent   missing   integers).    This
+        implementation shows those as  "NULL",  for  consistency  with  missing
+@@ -531,7 +530,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-11                       infocmp(1m)
++ncurses 6.5                       2024-09-14                       infocmp(1m)
+ 
                                                                                                                                            
+ 
                                                                                                                                            
+ 
                                                                                                                                              
+Index: doc/html/man/legacy_coding.3x.html
+--- ncurses-6.5-20240831+/doc/html/man/legacy_coding.3x.html	2024-07-27 23:11:33.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/legacy_coding.3x.html	2024-09-14 20:23:28.000000000 +0000
+@@ -28,19 +28,19 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey
+-  * @Id: legacy_coding.3x,v 1.30 2024/07/27 19:44:30 tom Exp @
++  * @Id: legacy_coding.3x,v 1.32 2024/09/14 20:06:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-legacy_coding 3x 2024-07-27 ncurses 6.5 Library calls
++legacy_coding 3x 2024-09-14 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                              legacy_coding 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                              
++
                                                                                                                                              legacy_coding 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                              
+ 
                                                                                                                                              + legacy_coding(3x)                Library calls               legacy_coding(3x)
+ 
+@@ -58,11 +58,11 @@
+ 
+ 
+ 
                                                                                                                                              DESCRIPTION
                                                                                                                                              +-       use_legacy_coding is an extension to the curses library.  It allows the
+-       caller to change the result of unctrl(3x), suppressing isprint(3)-based
++       use_legacy_coding,  an ncurses extension to the curses library, permits
++       customiztion  of  unctrl(3x)  behavior,  suppressing   isprint(3)-based
+        checks  within  the  library  that  would  normally  cause  nonprinting
+        characters to be rendered in visible form.  The alteration affects only
+-       eight-bit characters.
++       byte-wide characters with the most significant bit set.
+ 
+        The level parameter controls the result.
+ 
+@@ -105,7 +105,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                 legacy_coding(3x)
++ncurses 6.5                       2024-09-14                 legacy_coding(3x)
+ 
                                                                                                                                              
+ 
                                                                                                                                              
+ 
                                                                                                                                                
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.5-20240831+/doc/html/man/ncurses.3x.html	2024-07-27 23:11:34.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/ncurses.3x.html	2024-09-14 20:23:28.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: ncurses.3x,v 1.229 2024/07/27 20:10:07 tom Exp @
++  * @Id: ncurses.3x,v 1.231 2024/09/14 20:06:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-ncurses 3x 2024-07-27 ncurses 6.5 Library calls
++ncurses 3x 2024-09-14 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                ncurses 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                                
++
                                                                                                                                                ncurses 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                                
+ 
                                                                                                                                                + ncurses(3x)                      Library calls                     ncurses(3x)
+ 
+@@ -57,11 +57,11 @@
+ 
+ 
                                                                                                                                                DESCRIPTION
                                                                                                                                                +        The  "new  curses" library offers the programmer a terminal-independent
+-       means of reading keyboard and mouse input and  updating  character-cell
+-       terminals  with  output  optimized to minimize screen updates.  ncurses
++       means of reading keyboard and mouse input and writing to character-cell
++       displays  with  output  optimized  to minimize screen updates.  ncurses
+        replaces the curses libraries from System V Release 4 Unix ("SVr4") and
+        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
+-       document describes ncurses version 6.5 (patch 20240727).
++       document describes ncurses version 6.5 (patch 20240914).
+ 
+        ncurses permits control of the terminal screen's contents;  abstraction
+        and  subdivision thereof with windows and pads; acquisition of keyboard
+@@ -122,7 +122,7 @@
+        behavior from the library when the locale has not been set up.
+ 
+        initscr(3x) or newterm(3x) must be called to initialize  curses  before
+-       use of any functions that deal with windows and screens.
++       use of any functions that access or manipulate windows or screens.
+ 
+        To  get  character-at-a-time  input  without echoing--most interactive,
+        screen-oriented programs want this--use the following sequence.
+@@ -232,7 +232,7 @@
+        The  "w"  function  is typically the elemental one; the removal of this
+        prefix usually indicates operation on stdscr.
+ 
+-       Four functions prefixed with "p" require a pad argument.
++       Four functions prefixed with "p" require a pad argument; see below.
+ 
+        In function synopses, ncurses man pages apply the  following  names  to
+        parameters.  We introduce the character types in the next subsection.
+@@ -280,60 +280,59 @@
+                  variants  to  their  non-wide  counterparts; where a non-wide
+                  function name contains "ch" or "str", prefix it with "_w"  to
+                  obtain  the  wide  counterpart.   For example, waddch becomes
+-                 wadd_wch.  (Exceptions that add only  "w"  comprise  addwstr,
+-                 inwstr,  and their variants.)  Another exception is ins_nwstr
+-                 and  its  variants,  which  is  spelled   thus   instead   of
+-                 "insn_wstr".
++                 wadd_wch.  Another exception is ins_nwstr (and its variants),
++                 spelled  thus  instead  of "insn_wstr".  (Exceptions that add
++                 only "w" comprise addwstr, inwstr, and their variants.)
+ 
+-                 This  convention  is  inapplicable  to some non-wide function
++                 This convention is inapplicable  to  some  non-wide  function
+                  names,  so  other  transformations  are  used  for  the  wide
+                  configuration:  the  window  background  management  function
+-                 "bkgd"  becomes  "bkgrnd";  the  window  border-drawing   and
+-                 -clearing  functions  are suffixed with "_set"; and character
+-                 attribute  manipulation  functions   like   "attron"   become
++                 "bkgd"   becomes  "bkgrnd";  the  window  border-drawing  and
++                 -clearing functions are suffixed with "_set";  and  character
++                 attribute   manipulation   functions   like  "attron"  become
+                  "attr_on".
+ 
+                  cchar_t  is a curses complex character and corresponds to the
+-                          non-wide configuration's chtype.  It is a  structure
+-                          type   because  it  requires  more  storage  than  a
+-                          standard scalar type offers.  A character  code  may
+-                          not  be  representable  as a char, and moreover more
++                          non-wide  configuration's chtype.  It is a structure
++                          type  because  it  requires  more  storage  than   a
++                          standard  scalar  type offers.  A character code may
++                          not be representable as a char,  and  moreover  more
+                           than one character may occupy a cell (as with accent
+-                          marks  and  other diacritics).  Each character is of
++                          marks and other diacritics).  Each character  is  of
+                           type  wchar_t;  a  complex  character  contains  one
+                           spacing  character  and  zero  or  more  non-spacing
+-                          characters  (see  below).   A  string   of   complex
+-                          characters  ends with a cchar_t whose wchar_t member
+-                          is the null wide character.  Attributes and a  color
++                          characters   (see   below).   A  string  of  complex
++                          characters ends with a cchar_t whose wchar_t  member
++                          is  the null wide character.  Attributes and a color
+                           pair identifier are stored in separate fields of the
+                           structure,  not  combined  into  an  integer  as  in
+                           chtype.
+ 
+                  Each cell of a WINDOW is stored as a cchar_t.
+ 
+-                 setcchar(3x)  and  getcchar(3x)  store  and  retrieve cchar_t
+-                 data.  The wide library API of ncurses depends  on  two  data
++                 setcchar(3x) and  getcchar(3x)  store  and  retrieve  cchar_t
++                 data.   The  wide  library API of ncurses depends on two data
+                  types standardized by ISO C95.
+ 
+-                 wchar_t  stores  a wide character.  Like chtype, it may be an
+-                          alias of int.  Depending on the character  encoding,
+-                          a  wide  character  may  be spacing, meaning that it
+-                          occupies a character cell by  itself  and  typically
+-                          accompanies   cursor  advancement,  or  non-spacing,
+-                          meaning that it occupies the same cell as a  spacing
+-                          character,  is often regarded as a "modifier" of the
+-                          base glyph with which  it  combines,  and  typically
++                 wchar_t  stores a wide character.  Like chtype, it may be  an
++                          alias  of int.  Depending on the character encoding,
++                          a wide character may be  spacing,  meaning  that  it
++                          occupies  a  character  cell by itself and typically
++                          accompanies  cursor  advancement,  or   non-spacing,
++                          meaning  that it occupies the same cell as a spacing
++                          character, is often regarded as a "modifier" of  the
++                          base  glyph  with  which  it combines, and typically
+                           does not advance the cursor.
+ 
+-                 wint_t   can   store   a   wchar_t   or  the  constant  WEOF,
+-                          analogously to the int-sized character  manipulation
++                 wint_t   can  store  a  wchar_t   or   the   constant   WEOF,
++                          analogously  to the int-sized character manipulation
+                           functions of ISO C and its constant EOF.
+ 
+ 
+ 
                                                                                                                                                Function Name Index
                                                                                                                                                +        The following table lists the curses functions provided in the non-wide
+-       and wide APIs and the  corresponding  man  pages  that  describe  them.
+-       Those  flagged  with  "*"  are  ncurses-specific,  neither described by
++       and  wide  APIs  and  the  corresponding  man pages that describe them.
++       Those flagged with  "*"  are  ncurses-specific,  neither  described  by
+        X/Open Curses nor present in SVr4.
+ 
+                     curses Function Name     Man Page
+@@ -385,8 +384,8 @@
+                     def_prog_mode            curs_kernel(3x)
+                     def_shell_mode           curs_kernel(3x)
+                     define_key               define_key(3x)*
+-
+                     del_curterm              curs_terminfo(3x)
++
+                     delay_output             curs_util(3x)
+                     delch                    curs_delch(3x)
+                     deleteln                 curs_deleteln(3x)
+@@ -452,8 +451,8 @@
+                     in_wch                   curs_in_wch(3x)
+                     in_wchnstr               curs_in_wchstr(3x)
+                     in_wchstr                curs_in_wchstr(3x)
+-
+                     inch                     curs_inch(3x)
++
+                     inchnstr                 curs_inchstr(3x)
+                     inchstr                  curs_inchstr(3x)
+                     init_color               curs_color(3x)
+@@ -519,8 +518,8 @@
+                     mvaddnstr                curs_addstr(3x)
+                     mvaddnwstr               curs_addwstr(3x)
+                     mvaddstr                 curs_addstr(3x)
+-
+                     mvaddwstr                curs_addwstr(3x)
++
+                     mvchgat                  curs_attr(3x)
+                     mvcur                    curs_kernel(3x)
+                     mvdelch                  curs_delch(3x)
+@@ -586,8 +585,8 @@
+                     mvwins_wch               curs_ins_wch(3x)
+                     mvwins_wstr              curs_ins_wstr(3x)
+                     mvwinsch                 curs_insch(3x)
+-
+                     mvwinsnstr               curs_insstr(3x)
++
+                     mvwinsstr                curs_insstr(3x)
+                     mvwinstr                 curs_instr(3x)
+                     mvwinwstr                curs_inwstr(3x)
+@@ -653,8 +652,8 @@
+                     slk_attr_set             curs_slk(3x)
+                     slk_attroff              curs_slk(3x)
+                     slk_attron               curs_slk(3x)
+-
+                     slk_attrset              curs_slk(3x)
++
+                     slk_clear                curs_slk(3x)
+                     slk_color                curs_slk(3x)
+                     slk_init                 curs_slk(3x)
+@@ -720,8 +719,8 @@
+                     wadd_wchstr              curs_add_wchstr(3x)
+                     waddch                   curs_addch(3x)
+                     waddchnstr               curs_addchstr(3x)
+-
+                     waddchstr                curs_addchstr(3x)
++
+                     waddnstr                 curs_addstr(3x)
+                     waddnwstr                curs_addwstr(3x)
+                     waddstr                  curs_addstr(3x)
+@@ -787,8 +786,8 @@
+                     wprintw                  curs_printw(3x)
+                     wredrawln                curs_refresh(3x)
+                     wrefresh                 curs_refresh(3x)
+-
+                     wresize                  wresize(3x)*
++
+                     wscanw                   curs_scanw(3x)
+                     wscrl                    curs_scroll(3x)
+                     wsetscrreg               curs_outopts(3x)
+@@ -802,43 +801,43 @@
+                     wvline                   curs_border(3x)
+                     wvline_set               curs_border_set(3x)
+ 
+-       ncurses's   screen-pointer   extension   adds   additional    functions
+-       corresponding  to  many  of  the  above, each with an "_sp" suffix; see
++       ncurses's    screen-pointer   extension   adds   additional   functions
++       corresponding to many of the above, each  with  an  "_sp"  suffix;  see
+        curs_sp_funcs(3x).
+ 
+-       The availability of some extensions is  configurable  when  ncurses  is
+-       compiled;  see  sections  "ALTERNATE  CONFIGURATIONS"  and "EXTENSIONS"
++       The  availability  of  some  extensions is configurable when ncurses is
++       compiled; see  sections  "ALTERNATE  CONFIGURATIONS"  and  "EXTENSIONS"
+        below.
+ 
+ 
+ 
                                                                                                                                                RETURN VALUE
                                                                                                                                                +-       Unless otherwise noted,  functions  that  return  integers  return  the
+-       constants  OK  on  success  and ERR on failure; see curs_variables(3x).
+-       Functions that return pointers  return  NULL  on  failure.   Typically,
+-       ncurses  treats  a  null  pointer  passed  as a function parameter as a
+-       failure.  Functions prefixed with "mv" first  perform  cursor  movement
++       Unless  otherwise  noted,  functions  that  return  integers return the
++       constants OK on success and ERR  on  failure;  see  curs_variables(3x).
++       Functions  that  return  pointers  return  NULL on failure.  Typically,
++       ncurses treats a null pointer passed  as  a  function  parameter  as  a
++       failure.   Functions  prefixed  with "mv" first perform cursor movement
+        and fail if the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                ENVIRONMENT
                                                                                                                                                +-       The  following  symbols  from  the  process  environment  customize the
+-       runtime  behavior  of  ncurses  applications.   The  library   may   be
+-       configured   to   disregard   the  variables  TERMINFO,  TERMINFO_DIRS,
+-       TERMPATH, and HOME, if  the  user  is  the  superuser  (root),  or  the
++       The following  symbols  from  the  process  environment  customize  the
++       runtime   behavior   of  ncurses  applications.   The  library  may  be
++       configured  to  disregard  the   variables   TERMINFO,   TERMINFO_DIRS,
++       TERMPATH,  and  HOME,  if  the  user  is  the  superuser (root), or the
+        application uses setuid(2) or setgid(2).
+ 
+ 
+ 
                                                                                                                                                BAUDRATE
                                                                                                                                                +-       The  debugging  library  checks  this variable when the application has
+-       redirected output to a file.  Its integral value is used for  the  baud
+-       rate.   If  that  value  is absent or invalid, ncurses uses 9600.  This
+-       feature allows developers to construct repeatable test cases that  take
+-       into  account optimization decisions that depend on the terminal's line
+-       speed.
++       The debugging library checks this variable  when  the  application  has
++       redirected  output to a file.  ncurses interprets its integral value as
++       the terminal's line speed in bits per second.  If that value is  absent
++       or  invalid,  ncurses  uses  9600.   This  feature allows developers to
++       construct repeatable test cases that  take  into  account  optimization
++       decisions that depend on the terminal's line speed.
+ 
+ 
+ 
                                                                                                                                                CC (command character)
                                                                                                                                                +-       When set, the command_character  (cmdch)  capability  value  of  loaded
++       When  set,  the  command_character  (cmdch)  capability value of loaded
+        terminfo entries changes to the value of this variable.  Very few term-
+        info entries provide this feature.
+ 
+@@ -849,9 +848,10 @@
+ 
+ 
                                                                                                                                                COLUMNS
                                                                                                                                                +        This  variable  specifies  the  width  of  the  screen  in  characters.
+-       Applications  running  in  a  windowing environment usually are able to
+-       obtain the width of the window in which they are executing.  If COLUMNS
+-       is not defined and the terminal's screen size is not available from the
++       Applications running in a windowing environment  usually  are  able  to
++       obtain  the  width  of the window in which they are executing.  ncurses
++       enforces an upper limit of 512 when reading the value.  If  COLUMNS  is
++       not  defined  and  the terminal's screen size is not available from the
+        terminal driver, ncurses uses the size specified by the columns  (cols)
+        capability  of  the  terminal type's entry in the terminfo database, if
+        any.
+@@ -864,177 +864,176 @@
+        overrides  the  library's  use  of  the  screen  size obtained from the
+        operating system.
+ 
+-       The  COLUMNS  and  LINES  variables  may  be  specified  independently.
+-       ncurses  enforces an upper limit of 512 on each when reading the value.
+-       This property is useful to circumvent misfeatures  of  legacy  terminal
+-       type  descriptions; xterm(1) descriptions specifying 65 lines were once
+-       notorious.   For  best  results,  avoid  specifying  cols   and   lines
++       The COLUMNS and LINES variables may be specified  independently.   This
++       property  is  useful  to circumvent misfeatures of legacy terminal type
++       descriptions; xterm(1)  descriptions  specifying  65  lines  were  once
++       notorious.    For   best  results,  avoid  specifying  cols  and  lines
+        capability codes in terminfo descriptions of terminal emulators.
+ 
+-       use_env(3x)  can  disable use of the process environment in determining
+-       the screen size.  use_tioctl(3x) can update COLUMNS and LINES to  match
++       use_env(3x) can disable use of the process environment  in  determining
++       the  screen size.  use_tioctl(3x) can update COLUMNS and LINES to match
+        the screen size obtained from system calls or the terminal database.
+ 
+ 
+ 
                                                                                                                                                ESCDELAY
                                                                                                                                                +-       For  curses  to  distinguish  the ESC character resulting from a user's
+-       press of the "Escape" key on the input device  from  one  beginning  an
++       For curses to distinguish the ESC character  resulting  from  a  user's
++       press  of  the  "Escape"  key on the input device from one beginning an
+        escape sequence (as commonly produced by function keys), it waits after
+-       receiving the  escape  character  to  see  if  further  characters  are
+-       available  on  the  input  stream  within  a  short interval.  A global
+-       variable ESCDELAY stores this interval in  milliseconds.   The  default
++       receiving  the  escape  character  to  see  if  further  characters are
++       available on the input  stream  within  a  short  interval.   A  global
++       variable  ESCDELAY  stores  this interval in milliseconds.  The default
+        value of 1000 (one second) is adequate for most uses.  This environment
+-       variable overrides it; ncurses enforces an upper limit  of  30,000  (30
++       variable  overrides  it;  ncurses enforces an upper limit of 30,000 (30
+        seconds) when reading the value.
+ 
+-       The  most common instance where you may wish to change this value is to
++       The most common instance where you may wish to change this value is  to
+        work with a remote host over a slow communication channel.  If the host
+-       running  a  curses  application  does  not receive the characters of an
+-       escape sequence in a timely manner, the library can interpret  them  as
++       running a curses application does not  receive  the  characters  of  an
++       escape  sequence  in a timely manner, the library can interpret them as
+        multiple key stroke events.
+ 
+        xterm(1) mouse events are a form of escape sequence; therefore, if your
+-       application makes heavy use  of  multiple-clicking,  you  may  wish  to
+-       lengthen  the  default value because the delay applies to the composite
++       application  makes  heavy  use  of  multiple-clicking,  you may wish to
++       lengthen the default value because the delay applies to  the  composite
+        multi-click event as well as the individual clicks.
+ 
+-       Portable applications should not rely upon the presence of ESCDELAY  in
+-       either  form,  but  setting  the  environment  variable rather than the
++       Portable  applications should not rely upon the presence of ESCDELAY in
++       either form, but setting  the  environment  variable  rather  than  the
+        global variable does not create problems when compiling an application.
+ 
+-       If keypad(3x) is disabled for the  curses  window  receiving  input,  a
++       If  keypad(3x)  is  disabled  for  the curses window receiving input, a
+        program must disambiguate escape sequences itself.
+ 
+ 
+ 
                                                                                                                                                HOME
                                                                                                                                                +-       ncurses  may read and write auxiliary terminal descriptions in .termcap
++       ncurses may read and write auxiliary terminal descriptions in  .termcap
+        and .terminfo files in the user's home directory.
+ 
+ 
+ 
                                                                                                                                                LINES
                                                                                                                                                +-       This counterpart to COLUMNS specifies  the  height  of  the  screen  in
+-       characters.   The  corresponding terminfo capability and code is lines.
++       This  counterpart  to  COLUMNS  specifies  the  height of the screen in
++       characters.  The corresponding terminfo capability and code  is  lines.
+        See the description of the COLUMNS variable above.
+ 
+ 
+ 
                                                                                                                                                MOUSE_BUTTONS_123
                                                                                                                                                +-       (OS/2 EMX port only) OS/2 numbers a three-button  mouse  inconsistently
+-       with  other platforms, such that 1 is the left button, 2 the right, and
+-       3 the middle.  This variable customizes  the  mouse  button  numbering.
+-       Its  value  must be three digits 1-3 in any order.  By default, ncurses
++       (OS/2  EMX  port only) OS/2 numbers a three-button mouse inconsistently
++       with other platforms, such that 1 is the left button, 2 the right,  and
++       3  the  middle.   This  variable customizes the mouse button numbering.
++       Its value must be three digits 1-3 in any order.  By  default,  ncurses
+        assumes a numbering of "132".
+ 
+ 
+ 
                                                                                                                                                NCURSES_ASSUMED_COLORS
                                                                                                                                                +-       If set, this  variable  overrides  the  ncurses  library's  compiled-in
+-       assumption  that  the terminal's default colors are white on black; see
+-       default_colors(3x).  Set the foreground  and  background  color  values
+-       with  this  environment  variable  by  assigning  it two integer values
++       If  set,  this  variable  overrides  the  ncurses library's compiled-in
++       assumption that the terminal's default colors are white on  black;  see
++       default_colors(3x).   Set  the  foreground  and background color values
++       with this environment variable  by  assigning  it  two  integer  values
+        separated  by  a  comma,  indicating  foregound  and  background  color
+        numbers, respectively.
+ 
+-       For  example,  to tell ncurses not to assume anything about the colors,
+-       use a value of "-1,-1".  To make the  default  color  scheme  green  on
+-       black,  use  "2,0".   ncurses accepts integral values from -1 up to the
++       For example, to tell ncurses not to assume anything about  the  colors,
++       use  a  value  of  "-1,-1".   To make the default color scheme green on
++       black, use "2,0".  ncurses accepts integral values from -1  up  to  the
+        value of the terminfo max_colors (colors) capability.
+ 
+ 
+ 
                                                                                                                                                NCURSES_CONSOLE2
                                                                                                                                                +-       (MinGW  port  only)  The  Console2  program  defectively  handles   the
+-       Microsoft  Console  API  call  CreateConsoleScreenBuffer.  Applications
+-       that use it will hang.  However, it is possible to simulate the  action
+-       of  this  call  by mapping coordinates, explicitly saving and restoring
+-       the original screen contents.  Setting the environment  variable  NCGDB
++       (MinGW   port  only)  The  Console2  program  defectively  handles  the
++       Microsoft Console  API  call  CreateConsoleScreenBuffer.   Applications
++       that  use it will hang.  However, it is possible to simulate the action
++       of this call by mapping coordinates, explicitly  saving  and  restoring
++       the  original  screen contents.  Setting the environment variable NCGDB
+        has the same effect.
+ 
+ 
+ 
                                                                                                                                                NCURSES_GPM_TERMS
                                                                                                                                                +-       (Linux  only) When ncurses is configured to use the GPM interface, this
+-       variable may list  one  or  more  terminal  type  names,  delimited  by
+-       vertical  bars  (|) or colons (:), against which the TERM variable (see
+-       below) is matched.  An empty value disables the  GPM  interface,  using
+-       ncurses's  built-in  support  for xterm(1) mouse protocols instead.  If
+-       the variable is absent, ncurses attempts to open GPM if  TERM  contains
++       (Linux only) When ncurses is configured to use the GPM interface,  this
++       variable  may  list  one  or  more  terminal  type  names, delimited by
++       vertical bars (|) or colons (:), against which the TERM  variable  (see
++       below)  is  matched.   An empty value disables the GPM interface, using
++       ncurses's built-in support for xterm(1) mouse  protocols  instead.   If
++       the  variable  is absent, ncurses attempts to open GPM if TERM contains
+        "linux".
+ 
+ 
+ 
                                                                                                                                                NCURSES_NO_HARD_TABS
                                                                                                                                                +-       ncurses  may  use  tab  characters in cursor movement optimization.  In
+-       some cases, your terminal driver may not  handle  them  properly.   Set
++       ncurses may use tab characters in  cursor  movement  optimization.   In
++       some  cases,  your  terminal  driver may not handle them properly.  Set
+        this environment variable to any value to disable the feature.  You can
+        also adjust your stty(1) settings to avoid the problem.
+ 
+ 
+ 
                                                                                                                                                NCURSES_NO_MAGIC_COOKIE
                                                                                                                                                +-       Many terminals store video attributes as  a  property  of  a  character
+-       cell,  as  curses  does.   Historically, some recorded changes in video
+-       attributes as data that  logically  occupies  character  cells  on  the
+-       display,  switching attributes on or off, similarly to tags in a markup
+-       language; these are termed "magic cookies", and  must  be  subsequently
+-       overprinted.   If  the  terminfo  entry for your terminal type does not
++       Many  terminals  store  video  attributes  as a property of a character
++       cell, as curses does.  Historically, some  recorded  changes  in  video
++       attributes  as  data  that  logically  occupies  character cells on the
++       display, switching attributes on or off, similarly to tags in a  markup
++       language;  these  are  termed "magic cookies", and must be subsequently
++       overprinted.  If the terminfo entry for your  terminal  type  does  not
+        adequately describe its handling of magic cookies, set this variable to
+        any value to instruct ncurses to disable attributes entirely.
+ 
+ 
+ 
                                                                                                                                                NCURSES_NO_PADDING
                                                                                                                                                +        Most  terminal  type  descriptions  in  the  terminfo  database  detail
+-       hardware  devices.   Many  people  use  curses-based  applications   in
+-       terminal  emulator programs that run in a windowing environment.  These
+-       programs can duplicate all of the  important  features  of  a  hardware
+-       terminal,  but  often lack their limitations.  Chief among these absent
++       hardware   devices.   Many  people  use  curses-based  applications  in
++       terminal emulator programs that run in a windowing environment.   These
++       programs  can  duplicate  all  of  the important features of a hardware
++       terminal, but often lack their limitations.  Chief among  these  absent
+        drawbacks is the problem of data flow management; that is, limiting the
+-       speed  of  communication  to  what the hardware could handle.  Unless a
+-       hardware terminal is interfaced into  a  terminal  concentrator  (which
+-       does  flow  control), an application must manage flow itself to prevent
++       speed of communication to what the hardware  could  handle.   Unless  a
++       hardware  terminal  is  interfaced  into a terminal concentrator (which
++       does flow control), an application must manage flow itself  to  prevent
+        overruns and data loss.
+ 
+-       A solution that comes at no hardware cost  is  for  an  application  to
+-       pause  after  directing  a  terminal  to  execute  an operation that it
+-       performs slowly, such as clearing  the  display.   Many  terminal  type
+-       descriptions,  including that for the VT100, embed delay specifications
+-       in capabilities.  You may  wish  to  use  these  terminal  descriptions
+-       without  paying the performance penalty.  Set NCURSES_NO_PADDING to any
+-       value to disable all but mandatory padding.  Mandatory padding is  used
++       A  solution  that  comes  at  no hardware cost is for an application to
++       pause after directing a  terminal  to  execute  an  operation  that  it
++       performs  slowly,  such  as  clearing  the display.  Many terminal type
++       descriptions, including that for the VT100, embed delay  specifications
++       in  capabilities.   You  may  wish  to  use these terminal descriptions
++       without paying the performance penalty.  Set NCURSES_NO_PADDING to  any
++       value  to disable all but mandatory padding.  Mandatory padding is used
+        by such terminal capabilities as flash_screen (flash).
+ 
+ 
+ 
                                                                                                                                                NCURSES_NO_SETBUF
                                                                                                                                                +-       (Obsolete)  Prior to internal changes developed in ncurses 5.9 (patches
+-       20120825 through 20130126), the library used setbuf(3) to enable  fully
+-       buffered  output  when initializing the terminal.  This was done, as in
+-       SVr4 curses, to increase performance.  For testing  purposes,  both  of
+-       ncurses  and  of  certain applications, this feature was made optional.
+-       Setting this variable disabled output  buffering,  leaving  the  output
++       (Obsolete) Prior to internal changes developed in ncurses 5.9  (patches
++       20120825  through 20130126), the library used setbuf(3) to enable fully
++       buffered output when initializing the terminal.  This was done,  as  in
++       SVr4  curses,  to  increase performance.  For testing purposes, both of
++       ncurses and of certain applications, this feature  was  made  optional.
++       Setting  this  variable  disabled  output buffering, leaving the output
+        stream in the original (usually line-buffered) mode.
+ 
+-       Nowadays,  ncurses performs its own buffering and does not require this
+-       workaround; it does not modify the buffering  of  the  standard  output
+-       stream.   This  approach makes signal handling, as for interrupts, more
+-       robust.  A drawback  is  that  certain  unconventional  programs  mixed
+-       stdio(3)  calls  with ncurses calls and (usually) got the behavior they
+-       expected.  This is no longer the case; ncurses does not  write  to  the
++       Nowadays, ncurses performs its own buffering and does not require  this
++       workaround;  it  does  not  modify the buffering of the standard output
++       stream.  This approach makes signal handling, as for  interrupts,  more
++       robust.   A  drawback  is  that  certain  unconventional programs mixed
++       stdio(3) calls with ncurses calls and (usually) got the  behavior  they
++       expected.   This  is  no longer the case; ncurses does not write to the
+        standard output file descriptor through a stdio-buffered stream.
+ 
+-       As  a  special case, low-level API calls such as putp(3x) still use the
+-       standard output stream.  High-level curses calls such as printw(3x)  do
++       As a special case, low-level API calls such as putp(3x) still  use  the
++       standard  output stream.  High-level curses calls such as printw(3x) do
+        not.
+ 
+ 
+ 
                                                                                                                                                NCURSES_NO_UTF8_ACS
                                                                                                                                                +-       At  initialization,  ncurses inspects the TERM environment variable for
+-       special  cases  where   VT100   forms-drawing   characters   (and   the
+-       corresponding  alternate character set terminfo capabilities) are known
++       At initialization, ncurses inspects the TERM environment  variable  for
++       special   cases   where   VT100   forms-drawing   characters  (and  the
++       corresponding alternate character set terminfo capabilities) are  known
+        to  be  unsupported  by  terminal  types  that  otherwise  claim  VT100
+        compatibility.  Specifically, when running in a UTF-8 locale, the Linux
+-       virtual console device and the GNU screen(1) program ignore them.   Set
++       virtual  console device and the GNU screen(1) program ignore them.  Set
+        this  variable  to  a  nonzero  value  to  instruct  ncurses  that  the
+        terminal's ACS support is broken; the library then outputs Unicode code
+        points that correspond to the forms-drawing characters.  Set it to zero
+        (or a non-integer) to disable the special check for terminal type names
+-       matching  "linux" or "screen", directing ncurses to assume that the ACS
++       matching "linux" or "screen", directing ncurses to assume that the  ACS
+        feature works if the terminal type description advertises it.
+ 
+-       As an alternative to use  of  this  variable,  ncurses  checks  for  an
++       As  an  alternative  to  use  of  this  variable, ncurses checks for an
+        extended terminfo numeric capability U8 that can be compiled using "tic
+        -x".  Examples follow.
+ 
+@@ -1047,62 +1046,62 @@
+           xterm-utf8|xterm relying on UTF-8 line-graphics,
+                   U8#1, use=xterm,
+ 
+-       The two-character name "U8" was chosen to permit its use via  ncurses's
++       The  two-character name "U8" was chosen to permit its use via ncurses's
+        termcap interface.
+ 
+ 
+ 
                                                                                                                                                NCURSES_TRACE
                                                                                                                                                +-       At  initialization, ncurses (in its debugging configuration) checks for
+-       this variable's presence.  If  defined  with  an  integral  value,  the
++       At initialization, ncurses (in its debugging configuration) checks  for
++       this  variable's  presence.   If  defined  with  an integral value, the
+        library calls curses_trace(3x) with that value as the argument.
+ 
+ 
+ 
                                                                                                                                                TERM
                                                                                                                                                +-       The  TERM variable denotes the terminal type.  Each is distinct, though
+-       many are similar.  It is commonly set by  terminal  emulators  to  help
+-       applications  find  a  workable  terminal  description.   Some choose a
+-       popular approximation such as "ansi", "vt100", or "xterm"  rather  than
+-       an  exact  fit to their capabilities.  Not infrequently, an application
+-       will have problems with that approach; for example, a  key  stroke  may
+-       not  operate  correctly,  or  produce  no  effect  but  seeming garbage
++       The TERM variable denotes the terminal type.  Each is distinct,  though
++       many  are  similar.   It  is commonly set by terminal emulators to help
++       applications find a  workable  terminal  description.   Some  choose  a
++       popular  approximation  such as "ansi", "vt100", or "xterm" rather than
++       an exact fit to their capabilities.  Not infrequently,  an  application
++       will  have  problems  with that approach; for example, a key stroke may
++       not operate  correctly,  or  produce  no  effect  but  seeming  garbage
+        characters on the screen.
+ 
+-       Setting TERM has no effect on hardware operation; it  affects  the  way
+-       applications  communicate  with  the  terminal.  Likewise, as a general
+-       rule (xterm(1) being a rare exception), terminal emulators  that  allow
++       Setting  TERM  has  no effect on hardware operation; it affects the way
++       applications communicate with the terminal.   Likewise,  as  a  general
++       rule  (xterm(1)  being a rare exception), terminal emulators that allow
+        you to specify TERM as a parameter or configuration value do not change
+        their behavior to match that setting.
+ 
+ 
+ 
                                                                                                                                                TERMCAP
                                                                                                                                                +        If ncurses is configured with termcap support, it checks for a terminal
+-       type  description  in  termcap  format if one in terminfo format is not
+-       available.  Setting this variable directs ncurses to ignore  the  usual
+-       termcap  database  location, /etc/termcap; see TERMPATH below.  TERMCAP
+-       should contain either a terminal description  (with  newlines  stripped
+-       out),  or  a file name indicating where the information required by the
++       type description in termcap format if one in  terminfo  format  is  not
++       available.   Setting  this variable directs ncurses to ignore the usual
++       termcap database location, /etc/termcap; see TERMPATH  below.   TERMCAP
++       should  contain  either  a terminal description (with newlines stripped
++       out), or a file name indicating where the information required  by  the
+        TERM environment variable is stored.
+ 
+ 
+ 
                                                                                                                                                TERMINFO
                                                                                                                                                +-       ncurses can be configured to read terminal type  description  databases
+-       in  various locations using different formats.  This variable overrides
++       ncurses  can  be configured to read terminal type description databases
++       in various locations using different formats.  This variable  overrides
+        the default location.
+ 
+-       o   Descriptions in terminfo format are normally stored in a  directory
+-           tree  using subdirectories named by the common first letters of the
++       o   Descriptions  in terminfo format are normally stored in a directory
++           tree using subdirectories named by the common first letters of  the
+            terminal types named therein.  This is the scheme used in System V.
+ 
+        o   If ncurses is configured to use hashed databases, then TERMINFO may
+-           name  its  location,  such  as  /usr/share/terminfo.db, rather than
++           name its location,  such  as  /usr/share/terminfo.db,  rather  than
+            /usr/share/terminfo/.
+ 
+-       The hashed database uses less disk space and is a  little  faster  than
++       The  hashed  database  uses less disk space and is a little faster than
+        the directory tree.  However, some applications assume the existence of
+        the directory tree, and read it directly rather than using the terminfo
+        API.
+ 
+-       o   If  ncurses  is  configured with termcap support, this variable may
++       o   If ncurses is configured with termcap support,  this  variable  may
+            contain the location of a termcap file.
+ 
+        o   If the value of TERMINFO begins with "hex:" or "b64:", ncurses uses
+@@ -1112,10 +1111,10 @@
+                   TERMINFO=$(infocmp -0 -Q2 -q)
+                   export TERMINFO
+ 
+-           The compiled description is used only  if  it  corresponds  to  the
++           The  compiled  description  is  used  only if it corresponds to the
+            terminal type identified by TERM.
+ 
+-       Setting  TERMINFO  is  the  simplest,  but  not the only, way to direct
++       Setting TERMINFO is the simplest, but  not  the  only,  way  to  direct
+        ncurses to a terminal database.  The search path is as follows.
+ 
+        o   the last terminal database to which the running ncurses application
+@@ -1133,16 +1132,16 @@
+ 
+ 
+ 
                                                                                                                                                TERMINFO_DIRS
                                                                                                                                                +-       This  variable  specifies  a  list of locations, akin to PATH, in which
+-       ncurses searches  for  the  terminal  type  descriptions  described  by
+-       TERMINFO  above.   The  list  items are separated by colons on Unix and
+-       semicolons on  OS/2  EMX.   System V  terminfo  lacks  a  corresponding
++       This variable specifies a list of locations, akin  to  PATH,  in  which
++       ncurses  searches  for  the  terminal  type  descriptions  described by
++       TERMINFO above.  The list items are separated by  colons  on  Unix  and
++       semicolons  on  OS/2  EMX.   System V  terminfo  lacks  a corresponding
+        feature; TERMINFO_DIRS is an ncurses extension.
+ 
+ 
+ 
                                                                                                                                                TERMPATH
                                                                                                                                                +        If TERMCAP does not hold a terminal type description or file name, then
+-       ncurses checks the contents of TERMPATH, a list of locations,  akin  to
++       ncurses  checks  the contents of TERMPATH, a list of locations, akin to
+        PATH, in which it searches for termcap terminal type descriptions.  The
+        list items are separated by colons on Unix and semicolons on OS/2 EMX.
+ 
+@@ -1152,9 +1151,9 @@
+ 
+ 
+ 
                                                                                                                                                ALTERNATE CONFIGURATIONS
                                                                                                                                                +-       Many different ncurses configurations are possible, determined  by  the
+-       options  given  to the configure script when building the library.  Run
+-       the script with the --help option to peruse them all.   A  few  are  of
++       Many  different  ncurses configurations are possible, determined by the
++       options given to the configure script when building the  library.   Run
++       the  script  with  the  --help option to peruse them all.  A few are of
+        particular significance to the application developer employing ncurses.
+ 
+        --disable-overwrite
+@@ -1163,24 +1162,24 @@
+ 
+                 #include <curses.h>
+ 
+-            This option is used to avoid file name conflicts  between  ncurses
+-            and  an existing curses installation on the system.  If ncurses is
+-            installed disabling overwrite, it  puts  its  header  files  in  a
++            This  option  is used to avoid file name conflicts between ncurses
++            and an existing curses installation on the system.  If ncurses  is
++            installed  disabling  overwrite,  it  puts  its  header files in a
+             subdirectory.  Here is an example.
+ 
+                 #include <ncurses/curses.h>
+ 
+-            Installation  also  omits  a  symbolic  link  that would cause the
+-            compiler's -lcurses option  to  link  object  files  with  ncurses
++            Installation also omits a  symbolic  link  that  would  cause  the
++            compiler's  -lcurses  option  to  link  object  files with ncurses
+             instead of the system curses library.
+ 
+-            The  directory  used  by this configuration of ncurses is shown in
++            The directory used by this configuration of ncurses  is  shown  in
+             section "SYNOPSIS" above.
+ 
+        --enable-widec
+-            The  configure  script   renames   the   library   and   (if   the
+-            --disable-overwrite  option  is  used)  puts the header files in a
+-            different subdirectory.  All of  the  library  names  have  a  "w"
++            The   configure   script   renames   the   library   and  (if  the
++            --disable-overwrite option is used) puts the  header  files  in  a
++            different  subdirectory.   All  of  the  library  names have a "w"
+             appended to them, i.e., instead of
+ 
+                 -lncurses
+@@ -1189,62 +1188,62 @@
+ 
+                 -lncursesw
+ 
+-            You  must  also  enable  the wide-character features in the header
+-            file when compiling for the  wide-character  library  to  use  the
+-            extended  (wide-character)  functions.   The  symbol which enables
++            You must also enable the wide-character  features  in  the  header
++            file  when  compiling  for  the  wide-character library to use the
++            extended (wide-character) functions.   The  symbol  which  enables
+             these features has changed since X/Open Curses, Issue 4:
+ 
+-            o   Originally, the wide-character  feature  required  the  symbol
++            o   Originally,  the  wide-character  feature  required the symbol
+                 _XOPEN_SOURCE_EXTENDED  but  that  was  only  valid  for  XPG4
+                 (1996).
+ 
+-            o   Later, that was deemed conflicting with _XOPEN_SOURCE  defined
++            o   Later,  that was deemed conflicting with _XOPEN_SOURCE defined
+                 to 500.
+ 
+-            o   As  of  mid-2018,  none of the features in this implementation
+-                require a _XOPEN_SOURCE feature greater  than  600.   However,
++            o   As of mid-2018, none of the features  in  this  implementation
++                require  a  _XOPEN_SOURCE  feature greater than 600.  However,
+                 X/Open Curses, Issue 7 (2009) recommends defining it to 700.
+ 
+-            o   Alternatively,   you   can  enable  the  feature  by  defining
+-                NCURSES_WIDECHAR with the caveat that some other  header  file
+-                than  curses.h  may require a specific value for _XOPEN_SOURCE
++            o   Alternatively,  you  can  enable  the  feature   by   defining
++                NCURSES_WIDECHAR  with  the caveat that some other header file
++                than curses.h may require a specific value  for  _XOPEN_SOURCE
+                 (or a system-specific symbol).
+ 
+-            The curses.h header file installed for the wide-character  library
+-            is  designed  to be compatible with the non-wide library's header.
+-            Only the size of the WINDOW structure  differs;  few  applications
++            The  curses.h header file installed for the wide-character library
++            is designed to be compatible with the non-wide  library's  header.
++            Only  the  size  of the WINDOW structure differs; few applications
+             require more than pointers to WINDOWs.
+ 
+             If  the  headers  are  installed  allowing  overwrite,  the  wide-
+-            character library's headers should be  installed  last,  to  allow
++            character  library's  headers  should  be installed last, to allow
+             applications to be built using either library from the same set of
+             headers.
+ 
+        --with-pthread
+-            The configure script renames the  library.   All  of  the  library
+-            names  have  a  "t"  appended  to  them  (before  any "w" added by
++            The  configure  script  renames  the  library.  All of the library
++            names have a "t"  appended  to  them  (before  any  "w"  added  by
+             --enable-widec).
+ 
+             The global variables such as LINES are replaced by macros to allow
+             read-only access.  At the same time, setter-functions are provided
+-            to set these values.  Some applications  (very  few)  may  require
++            to  set  these  values.   Some applications (very few) may require
+             changes to work with this convention.
+ 
+        --with-shared
+        --with-normal
+        --with-debug
+        --with-profile
+-            The  shared  and  normal  (static)  library  names differ by their
+-            suffixes, e.g., libncurses.so and  libncurses.a.   The  debug  and
+-            profiling  libraries  add  a  "_g"  and  a  "_p" to the root names
++            The shared and normal  (static)  library  names  differ  by  their
++            suffixes,  e.g.,  libncurses.so  and  libncurses.a.  The debug and
++            profiling libraries add a "_g"  and  a  "_p"  to  the  root  names
+             respectively, e.g., libncurses_g.a and libncurses_p.a.
+ 
+        --with-termlib
+-            Low-level functions which do not depend upon whether  the  library
++            Low-level  functions  which do not depend upon whether the library
+             supports wide-characters, are provided in the tinfo library.
+ 
+-            By  doing  this, it is possible to share the tinfo library between
+-            wide/normal configurations as well  as  reduce  the  size  of  the
++            By doing this, it is possible to share the tinfo  library  between
++            wide/normal  configurations  as  well  as  reduce  the size of the
+             library when only low-level functions are needed.
+ 
+             Those functions are described in these pages:
+@@ -1264,8 +1263,8 @@
+             o   curs_util(3x) - miscellaneous curses utility routines
+ 
+        --with-trace
+-            The  trace  function normally resides in the debug library, but it
+-            is sometimes useful to  configure  this  in  the  shared  library.
++            The trace function normally resides in the debug library,  but  it
++            is  sometimes  useful  to  configure  this  in the shared library.
+             Configure scripts should check for the function's existence rather
+             than assuming it is always in the debug library.
+ 
+@@ -1279,213 +1278,213 @@
+ 
+ 
+ 
                                                                                                                                                NOTES
                                                                                                                                                +-       X/Open Curses permits most functions it specifies to be made  available
++       X/Open  Curses permits most functions it specifies to be made available
+        as macros as well.  ncurses does so
+ 
+        o   for functions that return values via their parameters,
+ 
+        o   to support obsolete features,
+ 
+-       o   to  reuse functions (for example, those that move the cursor before
++       o   to reuse functions (for example, those that move the cursor  before
+            another operation), and
+ 
+        o   in a few special cases.
+ 
+-       If the standard  output  file  descriptor  of  an  ncurses  program  is
+-       redirected  to  something  that  is  not a terminal device, the library
+-       writes screen updates to the standard error file descriptor.  This  was
++       If  the  standard  output  file  descriptor  of  an  ncurses program is
++       redirected to something that is not  a  terminal  device,  the  library
++       writes  screen updates to the standard error file descriptor.  This was
+        an undocumented feature of SVr3 curses.
+ 
+-       See  subsection  "Header  Files"  below  regarding  symbols  exposed by
++       See subsection  "Header  Files"  below  regarding  symbols  exposed  by
+        inclusion of curses.h.
+ 
+ 
+ 
                                                                                                                                                EXTENSIONS
                                                                                                                                                +-       ncurses enables an application  to  capture  mouse  events  on  certain
++       ncurses  enables  an  application  to  capture  mouse events on certain
+        terminals, including xterm(1); see curs_mouse(3x).
+ 
+-       ncurses  provides  a  means of responding to window resizing events, as
+-       when running in a GUI terminal emulator application such as xterm;  see
++       ncurses provides a means of responding to window  resizing  events,  as
++       when  running in a GUI terminal emulator application such as xterm; see
+        resizeterm(3x) and wresize(3x).
+ 
+        ncurses allows an application to query the terminal for the presence of
+        a wide variety of special keys; see has_key(3x).
+ 
+        ncurses extends the fixed set of function key capabilities specified by
+-       X/Open   Curses  by  allowing  the  application  programmer  to  define
+-       additional key events at runtime; see define_key(3x),  key_defined(3x),
++       X/Open  Curses  by  allowing  the  application  programmer  to   define
++       additional  key events at runtime; see define_key(3x), key_defined(3x),
+        keybound(3x), and keyok(3x).
+ 
+-       ncurses   can   exploit  the  capabilities  of  terminals  implementing
+-       ISO 6429/ECMA-48  SGR 39  and  SGR 49   sequences,   which   allow   an
+-       application  to  reset  the  terminal  to  its  original foreground and
+-       background colors.  From a user's perspective, the application is  able
+-       to  draw colored text on a background whose color is set independently,
++       ncurses  can  exploit  the  capabilities  of   terminals   implementing
++       ISO 6429/ECMA-48   SGR 39   and   SGR 49   sequences,  which  allow  an
++       application to reset  the  terminal  to  its  original  foreground  and
++       background  colors.  From a user's perspective, the application is able
++       to draw colored text on a background whose color is set  independently,
+        providing better control over color contrasts.  See default_colors(3x).
+ 
+-       An ncurses application  can  eschew  knowledge  of  SCREEN  and  WINDOW
+-       structure   internals,   instead   using  accessor  functions  such  as
++       An  ncurses  application  can  eschew  knowledge  of  SCREEN and WINDOW
++       structure  internals,  instead  using  accessor   functions   such   as
+        is_cbreak(3x) and is_scrollok(3x).
+ 
+-       ncurses enables an application  to  direct  its  output  to  a  printer
++       ncurses  enables  an  application  to  direct  its  output to a printer
+        attached to the terminal device; see curs_print(3x).
+ 
+-       ncurses  offers slk_attr(3x) as a counterpart of attr_get(3x) for soft-
+-       label key lines, and extended_slk_color(3x) as a form of  slk_color(3x)
+-       that  can  gather  color  information  from  them  when many colors are
++       ncurses offers slk_attr(3x) as a counterpart of attr_get(3x) for  soft-
++       label  key lines, and extended_slk_color(3x) as a form of slk_color(3x)
++       that can gather color  information  from  them  when  many  colors  are
+        supported.
+ 
+-       ncurses   permits   modification   of   unctrl(3x)'s   behavior;    see
++       ncurses    permits   modification   of   unctrl(3x)'s   behavior;   see
+        use_legacy_coding(3x).
+ 
+-       Rudimentary  support  for multi-threaded applications may be available;
++       Rudimentary support for multi-threaded applications may  be  available;
+        see curs_threads(3x).
+ 
+-       Functions that ease the management of multiple screens can be  exposed;
++       Functions  that ease the management of multiple screens can be exposed;
+        see curs_sp_funcs(3x).
+ 
+-       To  aid  applications  to  debug their memory usage, ncurses optionally
+-       offers functions  to  more  aggressively  free  memory  it  dynamically
++       To aid applications to debug their  memory  usage,  ncurses  optionally
++       offers  functions  to  more  aggressively  free  memory  it dynamically
+        allocates itself; see curs_memleaks(3x).
+ 
+-       The  library  facilitates auditing and troubleshooting of its behavior;
++       The library facilitates auditing and troubleshooting of  its  behavior;
+        see curs_trace(3x).
+ 
+-       Compiling ncurses with the option -DUSE_GETCAP causes it to  fall  back
+-       to  reading /etc/termcap if the terminal setup code cannot find a term-
++       Compiling  ncurses  with the option -DUSE_GETCAP causes it to fall back
++       to reading /etc/termcap if the terminal setup code cannot find a  term-
+        info  entry  corresponding  to  TERM.   Use  of  this  feature  is  not
+-       recommended,  as  it essentially includes an entire termcap compiler in
+-       the ncurses startup code, at a cost in  memory  usage  and  application
++       recommended, as it essentially includes an entire termcap  compiler  in
++       the  ncurses  startup  code,  at a cost in memory usage and application
+        launch latency.
+ 
+-       PDCurses   and  NetBSD  curses  incorporate  some  ncurses  extensions.
++       PDCurses  and  NetBSD  curses  incorporate  some  ncurses   extensions.
+        Individual man pages indicate where this is the case.
+ 
+ 
+ 
                                                                                                                                                PORTABILITY
                                                                                                                                                +        X/Open Curses defines two levels of conformance, "base" and "enhanced".
+        The latter includes several additional features, such as wide-character
+-       and color support.  ncurses intends base-level conformance with  X/Open
+-       Curses,  and  supports  all  features  of its enhanced level except the
++       and  color support.  ncurses intends base-level conformance with X/Open
++       Curses, and supports all features of  its  enhanced  level  except  the
+        untic utility.
+ 
+-       Differences between X/Open Curses and ncurses  are  documented  in  the
++       Differences  between  X/Open  Curses  and ncurses are documented in the
+        "PORTABILITY" sections of applicable man pages.
+ 
+ 
+ 
                                                                                                                                                Error Checking
                                                                                                                                                +-       In  many cases, X/Open Curses is vague about error conditions, omitting
++       In many cases, X/Open Curses is vague about error conditions,  omitting
+        some of the SVr4 documentation.
+ 
+-       Unlike other implementations, ncurses checks pointer  parameters,  such
+-       as  those to WINDOW structures, to ensure that they are not null.  This
+-       is done primarily to guard  against  programmer  error.   The  standard
++       Unlike  other  implementations, ncurses checks pointer parameters, such
++       as those to WINDOW structures, to ensure that they are not null.   This
++       is  done  primarily  to  guard  against programmer error.  The standard
+        interface does not provide a way for the library to tell an application
+-       which of several possible errors occurred.  An application that  relies
+-       on  ncurses  to  check  its function parameters for validity limits its
++       which  of several possible errors occurred.  An application that relies
++       on ncurses to check its function parameters  for  validity  limits  its
+        portability and robustness.
+ 
+ 
+ 
                                                                                                                                                Padding Differences
                                                                                                                                                +-       In historical curses implementations, delays embedded in  the  terminfo
+-       capabilities  carriage_return  (cr),  scroll_forward (ind), cursor_left
++       In  historical  curses implementations, delays embedded in the terminfo
++       capabilities carriage_return (cr),  scroll_forward  (ind),  cursor_left
+        (cub1), form_feed (ff), and tab (ht) activated corresponding delay bits
+-       in  the  Unix terminal driver.  ncurses performs all padding by sending
+-       NUL bytes to the device.  This method is slightly more  expensive,  but
+-       narrows   the   interface   to   the   Unix  kernel  significantly  and
++       in the Unix terminal driver.  ncurses performs all padding  by  sending
++       NUL  bytes  to the device.  This method is slightly more expensive, but
++       narrows  the  interface  to   the   Unix   kernel   significantly   and
+        correspondingly increases the package's portability.
+ 
+ 
+ 
                                                                                                                                                Header Files
                                                                                                                                                +-       The header file curses.h itself includes the header files  stdio.h  and
++       The  header  file curses.h itself includes the header files stdio.h and
+        unctrl.h.
+ 
+        X/Open Curses has more to say,
+ 
+-           The  inclusion  of  curses.h  may make visible all symbols from the
++           The inclusion of curses.h may make visible  all  symbols  from  the
+            headers stdio.h, term.h, termios.h, and wchar.h.
+ 
+        but does not finish the story.  A more complete account follows.
+ 
+        o   The first curses, in 4BSD, provided a curses.h file.
+ 
+-           BSD curses code included curses.h and  unctrl.h  from  an  internal
++           BSD  curses  code  included  curses.h and unctrl.h from an internal
+            header file curses.ext, where "ext" abbreviated "externs".
+ 
+-           The  implementations of printw and scanw used undocumented internal
+-           functions of the standard I/O library (_doprnt  and  _doscan),  but
++           The implementations of printw and scanw used undocumented  internal
++           functions  of  the  standard I/O library (_doprnt and _doscan), but
+            nothing in curses.h itself relied upon stdio.h.
+ 
+-       o   SVr2  curses  added  newterm, which relies upon stdio.h because its
++       o   SVr2 curses added newterm, which relies upon  stdio.h  because  its
+            function prototype employs the FILE type.
+ 
+            SVr4 curses added putwin and getwin, which also use stdio.h.
+ 
+            X/Open Curses specifies all three of these functions.
+ 
+-           SVr4 curses and X/Open Curses  do  not  require  the  developer  to
+-           include  stdio.h  before  curses.h.  Both document use of curses as
++           SVr4  curses  and  X/Open  Curses  do  not require the developer to
++           include stdio.h before curses.h.  Both document use  of  curses  as
+            requiring only curses.h.
+ 
+            As a result, standard curses.h always includes stdio.h.
+ 
+-       o   X/Open Curses and SVr4 curses  are  inconsistent  with  respect  to
++       o   X/Open  Curses  and  SVr4  curses  are inconsistent with respect to
+            unctrl.h.
+ 
+-           As  noted in curs_util(3x), ncurses includes unctrl.h from curses.h
++           As noted in curs_util(3x), ncurses includes unctrl.h from  curses.h
+            (as SVr4 does).
+ 
+-       o   X/Open Curses's comments about term.h and termios.h  may  refer  to
++       o   X/Open  Curses's  comments  about term.h and termios.h may refer to
+            HP-UX and AIX.
+ 
+-           HP-UX  curses includes term.h from curses.h to declare setupterm in
++           HP-UX curses includes term.h from curses.h to declare setupterm  in
+            curses.h, but ncurses and Solaris curses do not.
+ 
+-           AIX curses includes  term.h  and  termios.h.   Again,  ncurses  and
++           AIX  curses  includes  term.h  and  termios.h.   Again, ncurses and
+            Solaris curses do not.
+ 
+-       o   X/Open  Curses  says that curses.h may include term.h, but does not
++       o   X/Open Curses says that curses.h may include term.h, but  does  not
+            require it to do so.
+ 
+-           Some programs use functions declared in both curses.h  and  term.h,
+-           and  must  include  both header files in the same module.  Very old
+-           versions of  AIX  curses  required  inclusion  of  curses.h  before
++           Some  programs  use functions declared in both curses.h and term.h,
++           and must include both header files in the same  module.   Very  old
++           versions  of  AIX  curses  required  inclusion  of  curses.h before
+            term.h.
+ 
+-           The  header  files supplied by ncurses include the standard library
+-           headers required for its  declarations,  so  ncurses's  own  header
+-           files  can  be  included  in  any  order.  But for portability, you
+-           should include curses.h before term.h.
++           The header files supplied by ncurses include the  standard  library
++           headers  required  for  its  declarations,  so ncurses's own header
++           files can be included in any order.  For portability  even  to  old
++           AIX systems, include curses.h before term.h.
+ 
+-       o   X/Open Curses says "may make visible" because  including  a  header
+-           file  does  not  necessarily  make visible all of the symbols in it
++       o   X/Open  Curses  says  "may make visible" because including a header
++           file does not necessarily make visible all of  the  symbols  in  it
+            (consider #ifdef and similar).
+ 
+-           For instance, ncurses's curses.h may include wchar.h if the  proper
+-           symbol  is defined, and if ncurses is configured for wide-character
+-           support.  If wchar.h is included, its symbols may be  made  visible
++           For  instance, ncurses's curses.h may include wchar.h if the proper
++           symbol is defined, and if ncurses is configured for  wide-character
++           support.   If  wchar.h is included, its symbols may be made visible
+            depending on the value of the _XOPEN_SOURCE feature test macro.
+ 
+        o   X/Open Curses mandates an application's inclusion of one standard C
+-           library header in a  special  case:  stdarg.h  before  curses.h  to
+-           prototype  the  functions  vw_printw  and  vw_scanw (as well as the
+-           obsolete vwprintw and vwscanw).  Each of  these  takes  a  variadic
++           library  header  in  a  special  case:  stdarg.h before curses.h to
++           prototype the functions vw_printw and  vw_scanw  (as  well  as  the
++           obsolete  vwprintw  and  vwscanw).   Each of these takes a variadic
+            argument list, a va_list parameter, like that of printf(3).
+ 
+-           SVr3  curses  introduced  the  two  obsolete  functions, and X/Open
+-           Curses the others.   In  between,  SVr4  curses  provided  for  the
+-           possibility  that  an application might include either varargs.h or
+-           stdarg.h.  These represented  contrasting  approaches  to  handling
+-           variadic  argument  lists.   The older interface, varargs.h, used a
+-           pointer to char for variadic functions' va_list parameter.   Later,
+-           the  list  acquired its own standard data type, va_list, defined in
+-           stdarg.h, empowering the compiler to check the types of a  function
+-           call's  actual  parameters  against the formal ones declared in its
++           SVr3 curses introduced  the  two  obsolete  functions,  and  X/Open
++           Curses  the  others.   In  between,  SVr4  curses  provided for the
++           possibility that an application might include either  varargs.h  or
++           stdarg.h.   These  represented  contrasting  approaches to handling
++           variadic argument lists.  The older interface,  varargs.h,  used  a
++           pointer  to char for variadic functions' va_list parameter.  Later,
++           the list acquired its own standard data type, va_list,  defined  in
++           stdarg.h,  empowering the compiler to check the types of a function
++           call's actual parameters against the formal ones  declared  in  its
+            prototype.
+ 
+-           No  conforming  implementations  of  X/Open   Curses   require   an
++           No   conforming   implementations   of  X/Open  Curses  require  an
+            application to include stdarg.h before curses.h because they either
+-           have allowed for a special type, or,  like  ncurses,  they  include
++           have  allowed  for  a  special type, or, like ncurses, they include
+            stdarg.h themselves to provide a portable interface.
+ 
+ 
+@@ -1499,7 +1498,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                       ncurses(3x)
++ncurses 6.5                       2024-09-14                       ncurses(3x)
+ 
                                                                                                                                                
+ 
                                                                                                                                                
+ 
                                                                                                                                                  
+Index: doc/html/man/tabs.1.html
+--- ncurses-6.5-20240831+/doc/html/man/tabs.1.html	2024-06-22 22:55:11.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/tabs.1.html	2024-09-14 20:23:29.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tabs.1,v 1.61 2024/06/22 22:15:32 tom Exp @
++  * @Id: tabs.1,v 1.63 2024/09/14 20:06:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-tabs 1 2024-06-22 ncurses 6.5 User commands
++tabs 1 2024-09-14 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                  tabs 1 2024-06-22 ncurses 6.5 User commands
                                                                                                                                                  
++
                                                                                                                                                  tabs 1 2024-09-14 ncurses 6.5 User commands
                                                                                                                                                  
+ 
                                                                                                                                                  + tabs(1)                          User commands                         tabs(1)
+ 
+@@ -195,61 +195,60 @@
+ 
+ 
+ 
                                                                                                                                                  PORTABILITY
                                                                                                                                                  +-       IEEE  Std  1003.1/The  Open   Group   Base   Specifications   Issue   7
+-       (POSIX.1-2008) describes a tabs utility.  However,
++       IEEE  Std   1003.1/The   Open   Group   Base   Specifications   Issue 7
++       (POSIX.1-2008) describes a tabs utility.  However,
+ 
+        o   this  standard  describes  a  +m  option  to  set a terminal's left
+            margin.  Very few of the entries in the terminal  database  provide
+            the   set_left_margin   (smgl)   or   set_left_margin_parm  (smglp)
+            capabilities needed to support the feature.
+ 
+-       o   There is no counterpart in X/Open Curses Issue 7 for this  utility,
+-           unlike tput(1).
++       o   Unlike tput(1), tabs has no specification in X/Open Curses Issue 7.
+ 
+-       The  -d  (debug)  and  -n  (no-op)  options  are ncurses extensions not
++       The -d (debug) and  -n  (no-op)  options  are  ncurses  extensions  not
+        provided by other implementations.
+ 
+ 
+ 
                                                                                                                                                  HISTORY
                                                                                                                                                  +-       A tabs utility appeared in PWB/Unix  1.0  (1977).   A  reduced  version
+-       shipped  in  Seventh  Edition  Unix (early 1979) and in 3BSD (later the
+-       same year); it supported a "-n" option to set the first tab stop at the
+-       left margin.  That option is not specified by POSIX.
+-
+-       The  PWB/Unix  tabs  utility  returned  in  System III (1980), and used
+-       built-in tables to support a  half-dozen  hardcopy  terminal  (printer)
+-       types.   It  also had logic to support setting the left margin, as well
++       A  tabs  utility  appeared  in  PWB/Unix 1.0 (1977).  A reduced version
++       shipped in Seventh Edition Unix (early 1979) and  in  3BSD  (later  the
++       same  year);  it  supported an option "-n" to set the first tab stop at
++       the left margin.  That option is not specified by POSIX.
++
++       The PWB/Unix tabs utility returned  in  System  III  (1980),  and  used
++       built-in  tables  to  support  a half-dozen hardcopy terminal (printer)
++       types.  It also had logic to support setting the left margin,  as  well
+        as a feature for copying the tab settings from a file.
+ 
+-       Versions of the program in later releases of AT&T Unix, such  as  SVr4,
+-       added  support  for  the  terminal database, but retained the tables to
+-       support the printers.  By this time, System V tput had incorporated the
+-       tab  stop  initialization feature of BSD's tset from 1982, but employed
++       Versions  of  the program in later releases of AT&T Unix, such as SVr4,
++       added support for the terminal database, but  retained  the  tables  to
++       support the printers.  By this time, System V tput had incorporated the
++       tab stop initialization feature of BSD's tset from 1982,  but  employed
+        the terminfo database to do so.
+ 
+-       The +m option was documented in the POSIX Base Specifications  Issue  5
+-       (Unix98,  1997), then omitted in Issue 6 (Unix03, 2004) without express
+-       motivation, though an introductory comment "and optionally adjusts  the
+-       margin"   remains,   overlooked  in  the  removal.   The  tabs  utility
+-       documented in Issues 6 and later has no mechanism for setting  margins.
+-       The  +m  option  in ncurses tabs differs from the SVr4 feature by using
+-       terminal capabilities rather than built-in tables.
+-
+-       POSIX  documents  no  limit  on  the  number  of  tab   stops.    Other
+-       implementations impose one; the limit is 20 in PWB/Unix's tabs utility.
+-       While some terminals may not accept an arbitrary number of  tab  stops,
+-       ncurses  tabs  attempts  to set tab stops up to the right margin if the
++       The  +m  option was documented in the POSIX Base Specifications Issue 5
++       (Unix98, 1997), then omitted in Issue 6 (Unix03, 2004) without  express
++       motivation,  though an introductory comment "and optionally adjusts the
++       margin"  remains,  overlooked  in  the  removal.   The   tabs   utility
++       documented  in Issues 6 and later has no mechanism for setting margins.
++       The +m option in ncurses tabs (tabs) differs from the SVr4  feature  by
++       using terminal capabilities rather than built-in tables.
++
++       POSIX   documents   no  limit  on  the  number  of  tab  stops.   Other
++       implementations impose one; the limit is 20 in PWB/Unix's tabs utility.
++       While  some  terminals may not accept an arbitrary number of tab stops,
++       ncurses tabs attempts to set tab stops up to the right  margin  if  the
+        list thereof is sufficiently long.
+ 
+-       The "Rationale" section of the Issue 6 tabs reference page details  how
+-       the  committee  considered  redesigning  the  tabs  and tput utilities,
++       The  "Rationale" section of the Issue 6 tabs reference page details how
++       the committee considered  redesigning  the  tabs  and  tput  utilities,
+        without settling on an improved solution.  It claims that
+ 
+-           no known historical version of  tabs  supports  the  capability  of
++           no  known  historical  version  of  tabs supports the capability of
+            setting arbitrary tab stops.
+ 
+-       The   feature  described  in  subsection  "Explicit  Lists"  above  was
+-       implemented in PWB/Unix, and permitted  the  setting  of  abitrary  tab
++       The  feature  described  in  subsection  "Explicit  Lists"  above   was
++       implemented  in  PWB/Unix,  and  permitted  the setting of abitrary tab
+        stops nevertheless.
+ 
+ 
+@@ -258,7 +257,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-22                           tabs(1)
++ncurses 6.5                       2024-09-14                           tabs(1)
+ 
                                                                                                                                                  
+ 
                                                                                                                                                  
+ 
                                                                                                                                                    
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.5-20240831+/doc/html/man/terminfo.5.html	2024-07-27 23:11:34.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/terminfo.5.html	2024-09-14 20:23:29.000000000 +0000
+@@ -71,7 +71,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This document describes ncurses version 6.5 (patch 20240727).
++       This document describes ncurses version 6.5 (patch 20240914).
+ 
+ 
+ 
                                                                                                                                                    terminfo Entry Syntax
                                                                                                                                                    +@@ -2437,7 +2437,7 @@
+        X/Open  Curses  does  not  mention italics.  Portable applications must
+        assume that  numeric  capabilities  are  signed  16-bit  values.   This
+        includes  the  no_color_video  (ncv)  capability.  The 32768 mask value
+-       used for italics with ncv can be confused with an absent  or  cancelled
++       used for italics with ncv can be confused with an  absent  or  canceled
+        ncv.   If  italics  should work with colors, then the ncv value must be
+        specified, even if it is zero.
+ 
+Index: doc/html/man/tic.1m.html
+--- ncurses-6.5-20240831+/doc/html/man/tic.1m.html	2024-05-11 21:39:59.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/tic.1m.html	2024-09-14 20:23:29.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tic.1m,v 1.111 2024/05/11 20:39:53 tom Exp @
++  * @Id: tic.1m,v 1.113 2024/09/14 20:06:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-tic 1m 2024-05-11 ncurses 6.5 User commands
++tic 1m 2024-09-14 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                    tic 1m 2024-05-11 ncurses 6.5 User commands
                                                                                                                                                    
++
                                                                                                                                                    tic 1m 2024-09-14 ncurses 6.5 User commands
                                                                                                                                                    
+ 
                                                                                                                                                    + tic(1m)                          User commands                         tic(1m)
+ 
+@@ -420,7 +420,7 @@
+        System  V  Release  2  provided  a  tic  utility.  It accepted a single
+        option: -v (optionally  followed  by  a  number).   According  to  Ross
+        Ridge's comment in mytinfo, this version of tic was unable to represent
+-       cancelled capabilities.
++       canceled capabilities.
+ 
+        System V Release 3 provided a different tic utility, written  by  Pavel
+        Curtis,  (originally named "compile" in pcurses).  This added an option
+@@ -482,7 +482,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-11                           tic(1m)
++ncurses 6.5                       2024-09-14                           tic(1m)
+ 
                                                                                                                                                    
+ 
                                                                                                                                                    
+ 
                                                                                                                                                      
+Index: doc/html/man/tput.1.html
+--- ncurses-6.5-20240831+/doc/html/man/tput.1.html	2024-06-22 22:55:11.000000000 +0000
++++ ncurses-6.5-20240914/doc/html/man/tput.1.html	2024-09-14 20:23:29.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tput.1,v 1.118 2024/06/22 21:28:35 tom Exp @
++  * @Id: tput.1,v 1.120 2024/09/14 20:06:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-tput 1 2024-06-22 ncurses 6.5 User commands
++tput 1 2024-09-14 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                      tput 1 2024-06-22 ncurses 6.5 User commands
                                                                                                                                                      
++
                                                                                                                                                      tput 1 2024-09-14 ncurses 6.5 User commands
                                                                                                                                                      
+ 
                                                                                                                                                      + tput(1)                          User commands                         tput(1)
+ 
+@@ -411,8 +411,8 @@
+        o   It assigns exit status 255  to  a  numeric  variable  that  is  not
+            specified in the terminfo database.  That likely is a documentation
+            error, mistaking  the  "-1"  written  to  the  standard  output  to
+-           indicate   an   absent  or  cancelled  numeric  capability  for  an
+-           (unsigned) exit status.
++           indicate an absent or canceled numeric capability for an (unsigned)
++           exit status.
+ 
+        The various System V implementations (AIX, HP-UX, Solaris) use the same
+        exit statuses as ncurses.
+@@ -559,7 +559,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-22                           tput(1)
++ncurses 6.5                       2024-09-14                           tput(1)
+ 
                                                                                                                                                      
+ 
                                                                                                                                                      
+ 
                                                                                                                                                        
+Index: man/captoinfo.1m
+Prereq:  1.63 
+--- ncurses-6.5-20240831+/man/captoinfo.1m	2024-03-23 20:37:25.000000000 +0000
++++ ncurses-6.5-20240914/man/captoinfo.1m	2024-09-14 00:39:51.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: captoinfo.1m,v 1.63 2024/03/23 20:37:25 tom Exp $
+-.TH @CAPTOINFO@ 1M 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: captoinfo.1m,v 1.65 2024/09/14 00:39:51 tom Exp $
++.TH @CAPTOINFO@ 1M 2024-09-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -84,7 +84,6 @@
+ .SS "Translations from Nonstandard Capabilities"
+ \fB\%@CAPTOINFO@\fP translates some obsolete,
+ nonstandard capabilities into standard
+-(SVr4/XSI Curses)
+ \fI\%\%term\%info\fP capabilities.
+ It issues a diagnostic to the standard error stream for each,
+ inviting the user to check that it has not mistakenly translated an
+@@ -96,7 +95,7 @@
+ Cb S  L  L
+ Cb Cb Cb Cb
+ Cb Cb C  Lb.
+-Name
++\f(BItermcap\fP Code
+ Obsolete	Standard	Origin	\f(BIterminfo\fP capability
+ _
+ BO	mr	AT&T	enter_reverse_mode
+@@ -138,7 +137,7 @@
+ center;
+ cb cb
+ cb l .
+-\f(BItermcap\fP Name	Graphic
++\f(BItermcap\fP Code	Graphic
+ _
+ G2	upper left corner
+ G3	lower left corner
+@@ -184,7 +183,7 @@
+ center;
+ cb cb
+ l  l .
+-IBM	XSI
++IBM	X/Open
+ _
+ ksel	kslt
+ kbtab	kcbt
+Index: man/curs_bkgd.3x
+Prereq:  1.61 
+--- ncurses-6.5-20240831+/man/curs_bkgd.3x	2024-04-20 18:54:36.000000000 +0000
++++ ncurses-6.5-20240914/man/curs_bkgd.3x	2024-09-14 20:06:50.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_bkgd.3x,v 1.61 2024/04/20 18:54:36 tom Exp $
+-.TH curs_bkgd 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_bkgd.3x,v 1.63 2024/09/14 20:06:50 tom Exp $
++.TH curs_bkgd 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -69,7 +69,7 @@
+ of a
+ .I curses
+ window
+-(in the library's non-\*(``wide\*('' configuration)
++(in the library's non-wide configuration)
+ is a
+ .I \%chtype
+ combining a set of attributes
+@@ -213,12 +213,12 @@
+ like SVr4
+ .IR curses ,
+ does not
+-(in its non-\*(``wide\*('' configuration)
++(in its non-wide configuration)
+ store the background and window attribute contributions to each
+ character cell separately.
+ .SH SEE ALSO
+ \fB\%curs_bkgrnd\fP(3X) describes the corresponding functions in the
+-\*(``wide\*('' configuration of
++wide configuration of
+ .IR \%ncurses .
+ .PP
+ \fB\%curses\fP(3X),
+Index: man/curs_bkgrnd.3x
+Prereq:  1.42 
+--- ncurses-6.5-20240831+/man/curs_bkgrnd.3x	2024-04-20 18:54:36.000000000 +0000
++++ ncurses-6.5-20240914/man/curs_bkgrnd.3x	2024-09-14 20:06:50.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_bkgrnd.3x,v 1.42 2024/04/20 18:54:36 tom Exp $
+-.TH curs_bkgrnd 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_bkgrnd.3x,v 1.44 2024/09/14 20:06:50 tom Exp $
++.TH curs_bkgrnd 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -71,16 +71,17 @@
+ of a
+ .I curses
+ window
+-(in the library's \*(``wide\*('' configuration)
++(in the library's wide configuration)
+ is a
+ .I \%cchar_t
+ combining a set of attributes
+ (see \fB\%curs_attr\fP(3X))
+-with a complex character called the
+-.I "blank character."
++with the window's blank character.
+ .PP
+-The blank character is a spacing character that populates a window's
+-character cells when their contents are erased without replacement.
++The
++.I "blank character"
++is a spacing complex character that populates a window's character cells
++when their contents are erased without replacement.
+ The background's attributes are combined with all non-blank characters
+ written to the window,
+ as with the \fB\%wadd_wch\fP(3X) and \fB\%wins_wch\fP(3X) families of
+@@ -191,7 +192,7 @@
+ \fB\%getbkgrnd\fP
+ may be implemented as macros.
+ .PP
+-Unlike their counterparts in the non-\*(``wide\*('' configuration of
++Unlike their counterparts in the non-wide configuration of
+ .IR \%ncurses ,
+ \fB\%getbkgrnd\fP and \fB\%wgetbkgrnd\fP supply the background character
+ and attribute in a modifiable
+@@ -208,7 +209,7 @@
+ .IR curses .
+ .SH SEE ALSO
+ \fB\%curs_bkgd\fP(3X) describes the corresponding functions in the
+-non-\*(``wide\*('' configuration of
++non-wide configuration of
+ .IR \%ncurses .
+ .PP
+ \fB\%curses\fP(3X),
+Index: man/curs_extend.3x
+Prereq:  1.49 
+--- ncurses-6.5-20240831+/man/curs_extend.3x	2024-07-27 23:21:36.000000000 +0000
++++ ncurses-6.5-20240914/man/curs_extend.3x	2024-09-14 20:06:50.000000000 +0000
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1999-on
+ .\"
+-.\" $Id: curs_extend.3x,v 1.49 2024/07/27 23:21:36 tom Exp $
+-.TH curs_extend 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_extend.3x,v 1.51 2024/09/14 20:06:50 tom Exp $
++.TH curs_extend 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -115,6 +115,7 @@
+ offers several other extensions to the X/Open Curses API.
+ .PP
+ \fB\%curs_getch\fP(3X),
++\fB\%curs_inopts\fP(3X),
+ \fB\%curs_mouse\fP(3X),
+ \fB\%curs_print\fP(3X),
+ \fB\%curs_util\fP(3X),
+@@ -122,5 +123,6 @@
+ \fB\%define_key\fP(3X),
+ \fB\%keybound\fP(3X),
+ \fB\%keyok\fP(3X),
++\fB\%new_pair\fP(3X),
+ \fB\%resizeterm\fP(3X),
+ \fB\%wresize\fP(3X)
+Index: man/curs_get_wch.3x
+Prereq:  1.45 
+--- ncurses-6.5-20240831+/man/curs_get_wch.3x	2024-07-20 21:43:33.000000000 +0000
++++ ncurses-6.5-20240914/man/curs_get_wch.3x	2024-09-14 20:06:50.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_get_wch.3x,v 1.45 2024/07/20 21:43:33 tom Exp $
+-.TH curs_get_wch 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_get_wch.3x,v 1.47 2024/09/14 20:06:50 tom Exp $
++.TH curs_get_wch 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -50,15 +50,15 @@
+ \fB\%mvget_wch\fP,
+ \fB\%mvwget_wch\fP,
+ \fB\%unget_wch\fP \-
+-get (or push back) a wide character from \fIcurses\fR terminal keyboard
++get (or push back) a wide character from \fIcurses\fR terminal keyboard buffer
+ .SH SYNOPSIS
+ .nf
+ \fB#include 
+ .PP
+-\fBint get_wch(wint_t *\fIwch\fP);
+-\fBint wget_wch(WINDOW *\fIwin\fP, wint_t *\fIwch\fP);
+-\fBint mvget_wch(int \fIy\fP, int \fIx\fP, wint_t *\fIwch\fP);
+-\fBint mvwget_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t *\fIwch\fP);
++\fBint get_wch(wint_t * \fIwch\fP);
++\fBint wget_wch(WINDOW * \fIwin\fP, wint_t * \fIwch\fP);
++\fBint mvget_wch(int \fIy\fP, int \fIx\fP, wint_t * \fIwch\fP);
++\fBint mvwget_wch(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t * \fIwch\fP);
+ .PP
+ \fBint unget_wch(const wchar_t \fIwc\fP);
+ .fi
+Index: man/curs_getch.3x
+Prereq:  1.99 
+--- ncurses-6.5-20240831+/man/curs_getch.3x	2024-07-20 21:43:33.000000000 +0000
++++ ncurses-6.5-20240914/man/curs_getch.3x	2024-09-14 20:06:50.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getch.3x,v 1.99 2024/07/20 21:43:33 tom Exp $
+-.TH curs_getch 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_getch.3x,v 1.101 2024/09/14 20:06:50 tom Exp $
++.TH curs_getch 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -57,15 +57,15 @@
+ \fB\%mvwgetch\fP,
+ \fB\%ungetch\fP,
+ \fB\%has_key\fP \-
+-get (or push back) characters from \fIcurses\fR terminal keyboard
++get (or push back) characters from \fIcurses\fR terminal keyboard buffer
+ .SH SYNOPSIS
+ .nf
+ .B #include 
+ .PP
+ .B int getch(void);
+-.B int wgetch(WINDOW *\fIwin\fP);
++.B int wgetch(WINDOW * \fIwin\fP);
+ .B int mvgetch(int \fIy\fP, int \fIx\fP);
+-.B int mvwgetch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
++.B int mvwgetch(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP);
+ .PP
+ .B int ungetch(int \fIc\fP);
+ .PP
+@@ -594,6 +594,11 @@
+ (Insert),
+ .B \%KEY_DC
+ (Delete),
++.BR \%KEY_A1 ","
++.BR \%KEY_A3 ","
++.BR \%KEY_B2 ","
++.BR \%KEY_C1 ","
++.BR \%KEY_C3 ","
+ and
+ .BI \%KEY_F( n )
+ for 1 \(<=
+Index: man/curs_initscr.3x
+Prereq:  1.75 
+--- ncurses-6.5-20240831+/man/curs_initscr.3x	2024-06-08 20:34:23.000000000 +0000
++++ ncurses-6.5-20240914/man/curs_initscr.3x	2024-09-11 21:00:07.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_initscr.3x,v 1.75 2024/06/08 20:34:23 tom Exp $
+-.TH curs_initscr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_initscr.3x,v 1.77 2024/09/11 21:00:07 tom Exp $
++.TH curs_initscr 3X 2024-09-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -77,7 +77,7 @@
+ .PP
+ The initscr code determines the terminal type and initializes all \fBcurses\fP
+ data structures.
+-\fBinitscr\fP also causes the first call to \fBrefresh\fP(3X)
++\fBinitscr\fP also causes the first call to \fB\%refresh\fP(3X)
+ to clear the screen.
+ If errors occur, \fBinitscr\fP writes an appropriate error
+ message to standard error and exits;
+@@ -128,11 +128,11 @@
+ .bP
+ restores tty modes (see \fBreset_shell_mode\fP(3X)).
+ .PP
+-Calling \fBrefresh\fP(3X) or \fBdoupdate\fP(3X) after a
++Calling \fB\%refresh\fP(3X) or \fBdoupdate\fP(3X) after a
+ temporary escape causes the program to resume visual mode.
+ .SS isendwin
+ The \fBisendwin\fP routine returns \fBTRUE\fP if \fBendwin\fP has been
+-called without any subsequent calls to \fBwrefresh\fP,
++called without any subsequent calls to \fB\%wrefresh\fP,
+ and \fBFALSE\fP otherwise.
+ .SS set_term
+ The \fBset_term\fP routine is used to switch between different terminals.
+Index: man/curs_inopts.3x
+Prereq:  1.75 
+--- ncurses-6.5-20240831+/man/curs_inopts.3x	2024-06-15 19:49:39.000000000 +0000
++++ ncurses-6.5-20240914/man/curs_inopts.3x	2024-09-14 20:06:50.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inopts.3x,v 1.75 2024/06/15 19:49:39 tom Exp $
+-.TH curs_inopts 3X 2024-06-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inopts.3x,v 1.77 2024/09/14 20:06:50 tom Exp $
++.TH curs_inopts 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -147,7 +147,7 @@
+ and makes characters typed by the user immediately available to the
+ program.
+ .B \%nocbreak
+-returns the terminal to normal (\*(``cooked\*('') mode.
++restores the terminal's normal (\*(``cooked\*('') line discipline.
+ .PP
+ The state of the terminal is unknown to a
+ .I curses
+@@ -283,6 +283,7 @@
+ Initially,
+ whether the terminal returns 7- or 8-bit character codes on input
+ depends on the configuration of the terminal driver;
++on POSIX systems,
+ see \fI\%termios\fP(3).
+ To force 8 bits to be returned,
+ call
+@@ -327,7 +328,7 @@
+ configures the terminal to perform this translation.
+ .B nonl
+ disables it.
+-In normal (or \*(``cooked\*('') mode,
++Under its normal (\*(``cooked\*('') line discipline,
+ the terminal driver always translates carriage returns to line feeds.
+ .\"
+ .SS nodelay
+@@ -364,10 +365,8 @@
+ configure the terminal driver's treatment of its input and output queues
+ when it handles the interrupt,
+ suspend,
+-or quit characters in
+-.I \%cbreak
+-and \*(``cooked\*('' modes;
+-on POSIX systems,
++or quit characters under the normal (\*(``cooked\*('')
++or cbreak line discplines on POSIX systems;
+ see \fI\%termios\fP(3).
+ The default behavior is inherited from the terminal driver settings.
+ Calling
+@@ -413,7 +412,7 @@
+ .I curses
+ does not handle.
+ .B \%noraw
+-returns the terminal to normal (\*(``cooked\*('') mode.
++restores the terminal's normal (\*(``cooked\*('') line discipline.
+ .\"
+ .SS "timeout, wtimeout"
+ .B \%wtimeout
+@@ -558,8 +557,9 @@
+ .B \%noraw
+ and
+ .B \%nocbreak
+-follow historical practice in that they attempt to restore normal
+-(\*(``cooked\*('') mode from raw and cbreak modes,
++follow historical practice in that they attempt to restore
++the terminal's normal (\*(``cooked\*('') line discipline
++from raw and cbreak,
+ respectively.
+ Mixing
+ .BR \%raw / noraw
+@@ -642,7 +642,8 @@
+ or
+ .B \%noecho
+ explicitly just after initialization,
+-even if your program remains in normal (\*(``cooked\*('') mode.
++even if your program retains the terminal's normal (\*(``cooked\*('')
++line discipline.
+ .PP
+ X/Open Curses is ambiguous regarding whether
+ .I raw
+Index: man/curs_ins_wstr.3x
+Prereq:  1.44 
+--- ncurses-6.5-20240831+/man/curs_ins_wstr.3x	2024-07-27 20:15:31.000000000 +0000
++++ ncurses-6.5-20240914/man/curs_ins_wstr.3x	2024-09-14 20:06:50.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_ins_wstr.3x,v 1.44 2024/07/27 20:15:31 tom Exp $
+-.TH curs_ins_wstr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_ins_wstr.3x,v 1.46 2024/09/14 20:06:50 tom Exp $
++.TH curs_ins_wstr 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -188,7 +188,7 @@
+ in that their
+ .I wstr
+ parameters are not
+-.IR const -qualified .
++.IR const "-qualified."
+ .SH SEE ALSO
+ \fB\%curs_insstr\fP(3X) describes comparable functions of the
+ .I \%ncurses
+Index: man/curs_instr.3x
+Prereq:  1.57 
+--- ncurses-6.5-20240831+/man/curs_instr.3x	2024-06-08 20:47:39.000000000 +0000
++++ ncurses-6.5-20240914/man/curs_instr.3x	2024-09-14 20:06:50.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_instr.3x,v 1.57 2024/06/08 20:47:39 tom Exp $
+-.TH curs_instr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_instr.3x,v 1.59 2024/09/14 20:06:50 tom Exp $
++.TH curs_instr 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -46,27 +46,27 @@
+ ..
+ .SH NAME
+ \fB\%instr\fP,
+-\fB\%innstr\fP,
+ \fB\%winstr\fP,
+-\fB\%winnstr\fP,
+ \fB\%mvinstr\fP,
+-\fB\%mvinnstr\fP,
+ \fB\%mvwinstr\fP,
++\fB\%innstr\fP,
++\fB\%winnstr\fP,
++\fB\%mvinnstr\fP,
+ \fB\%mvwinnstr\fP \-
+ get a string from a \fIcurses\fR window
+ .SH SYNOPSIS
+ .nf
+ \fB#include 
+ .PP
+-\fBint instr(char *\ \fIstr\fP);
+-\fBint winstr(WINDOW *\ \fIwin\fP, char *\ \fIstr\fP);
+-\fBint mvinstr(int \fIy\fP, int \fIx\fP, char *\ \fIstr\fP);
+-\fBint mvwinstr(WINDOW *\ \fIwin\fP, int \fIy\fP, int \fIx\fP, char *\ \fIstr\fP);
++\fBint instr(char * \fIstr\fP);
++\fBint winstr(WINDOW * \fIwin\fP, char * \fIstr\fP);
++\fBint mvinstr(int \fIy\fP, int \fIx\fP, char * \fIstr\fP);
++\fBint mvwinstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, char * \fIstr\fP);
+ .PP
+-\fBint innstr(char *\ \fIstr\fP, int \fIn\fP);
+-\fBint winnstr(WINDOW *\ \fIwin\fP, char *\ \fIstr\fP, int \fIn\fP);
+-\fBint mvinnstr(int \fIy\fP, int \fIx\fP, char *\ \fIstr\fP, int \fIn\fP);
+-\fBint mvwinnstr(WINDOW *\ \fIwin\fP, int \fIy\fP, int \fIx\fP, char *\ \fIstr\fP, int \fIn\fP);
++\fBint innstr(char * \fIstr\fP, int \fIn\fP);
++\fBint winnstr(WINDOW * \fIwin\fP, char * \fIstr\fP, int \fIn\fP);
++\fBint mvinnstr(int \fIy\fP, int \fIx\fP, char * \fIstr\fP, int \fIn\fP);
++\fBint mvwinnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, char * \fIstr\fP, int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
+ .B \%winstr
+Index: man/curs_inwstr.3x
+Prereq:  1.45 
+--- ncurses-6.5-20240831+/man/curs_inwstr.3x	2024-06-08 21:19:18.000000000 +0000
++++ ncurses-6.5-20240914/man/curs_inwstr.3x	2024-09-14 20:06:50.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inwstr.3x,v 1.45 2024/06/08 21:19:18 tom Exp $
+-.TH curs_inwstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inwstr.3x,v 1.47 2024/09/14 20:06:50 tom Exp $
++.TH curs_inwstr 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -45,27 +45,27 @@
+ ..
+ .SH NAME
+ \fB\%inwstr\fP,
+-\fB\%innwstr\fP,
+ \fB\%winwstr\fP,
+-\fB\%winnwstr\fP,
+ \fB\%mvinwstr\fP,
+-\fB\%mvinnwstr\fP,
+ \fB\%mvwinwstr\fP,
++\fB\%innwstr\fP,
++\fB\%winnwstr\fP,
++\fB\%mvinnwstr\fP,
+ \fB\%mvwinnwstr\fP \-
+ get a wide-character string from a \fIcurses\fR window
+ .SH SYNOPSIS
+ .nf
+ \fB#include 
+ .PP
+-\fBint inwstr(wchar_t *\ \fIwstr\fP);
+-\fBint winwstr(WINDOW *\ \fIwin\fP, wchar_t *\ \fIwstr\fP);
+-\fBint mvinwstr(int \fIy\fP, int \fIx\fP, wchar_t *\ \fIwstr\fP);
+-\fBint mvwinwstr(WINDOW *\ \fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t *\ \fIwstr\fP);
++\fBint inwstr(wchar_t * \fIwstr\fP);
++\fBint winwstr(WINDOW * \fIwin\fP, wchar_t * \fIwstr\fP);
++\fBint mvinwstr(int \fIy\fP, int \fIx\fP, wchar_t * \fIwstr\fP);
++\fBint mvwinwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t * \fIwstr\fP);
+ .PP
+-\fBint innwstr(wchar_t *\ \fIwstr\fP, int \fIn\fP);
+-\fBint winnwstr(WINDOW *\ \fIwin\fP, wchar_t *\ \fIwstr\fP, int \fIn\fP);
+-\fBint mvinnwstr(int \fIy\fP, int \fIx\fP, wchar_t *\ \fIwstr\fP, int \fIn\fP);
+-\fBint mvwinnwstr(WINDOW *\ \fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t *\ \fIwstr\fP, int \fIn\fP);
++\fBint innwstr(wchar_t * \fIwstr\fP, int \fIn\fP);
++\fBint winnwstr(WINDOW * \fIwin\fP, wchar_t * \fIwstr\fP, int \fIn\fP);
++\fBint mvinnwstr(int \fIy\fP, int \fIx\fP, wchar_t * \fIwstr\fP, int \fIn\fP);
++\fBint mvwinnwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t * \fIwstr\fP, int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
+ .B \%winwstr
+@@ -86,7 +86,7 @@
+ does the same,
+ but copies at most
+ .I n
+-characters from
++wide characters from
+ .IR win "."
+ An
+ .I n
+Index: man/curs_kernel.3x
+Prereq:  1.67 
+--- ncurses-6.5-20240831+/man/curs_kernel.3x	2024-06-22 21:24:26.000000000 +0000
++++ ncurses-6.5-20240914/man/curs_kernel.3x	2024-09-14 20:14:54.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_kernel.3x,v 1.67 2024/06/22 21:24:26 tom Exp $
+-.TH curs_kernel 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_kernel.3x,v 1.70 2024/09/14 20:14:54 tom Exp $
++.TH curs_kernel 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -167,12 +167,23 @@
+ Few applications use this feature;
+ most call \fB\%wmove\fP(3X) instead.
+ .SS curs_set
+-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.
++.B \%curs_set
++adjusts the cursor visibility to
++\*(``invisible\*('',
++\*(``visible\*('',
++\*(``very visible\*('',
++as its argument is
++.BR 0 ,
++.BR 1 ,
++or
++.BR 2 ,
++respectively.
++It returns the previous
++.I visibility
++if the requested one is supported,
++and
++.B ERR
++otherwise.
+ .SS mvcur
+ .B \%mvcur
+ provides low-level cursor motion.
+@@ -245,41 +256,72 @@
+ \fBripoffline\fP can be called up to five times before calling \fBinitscr\fP or
+ \fBnewterm\fP.
+ .SH RETURN VALUE
+-Except for \fBcurs_set\fP, these routines always return \fBOK\fP.
++Except for
++.BR \%curs_set ","
++these functions return
++.B OK
++on success and
++.B ERR
++on failure.
++.PP
++.B \%curs_set
++returns the previous cursor visibility,
++and returns
++.B ERR
++if the terminal type does not support the requested
++.IR visibility "."
++.PP
++.B \%napms
++always succeeds.
+ .PP
+-\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
+-\fBdef_prog_mode\fP, \fBdef_shell_mode\fP, \fBreset_prog_mode\fP, \fBreset_shell_mode\fP
++.B \%mvcur
++fails if the position
++.RI ( newrow ,
++.IR newcol )
++is outside the screen boundaries.
++.PP
++In
++.IR \%ncurses ","
++.bP
++.BR \%def_prog_mode ","
++.BR \%def_shell_mode ","
++.BR \%reset_prog_mode ","
++and
++.B \%reset_shell_mode
+ return
+ .B ERR
+-if the terminal was not initialized, or
+-if the I/O call to obtain the terminal settings fails.
+-.TP 5
+-\fBripoffline\fP
++if the terminal was not initialized,
++or if the operating system's function for obtaining terminal settings
++fails.
++.bP
++.B \%ripoffline
+ returns
+ .B ERR
+ if the maximum number of ripped-off lines
+ exceeds the maximum (5).
+ .SH NOTES
+-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\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 \fI\%ncurses\fP 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
++.B \%getsyx
++is a macro;
++use of the
++.B &
++operator before its arguments is unnecessary.
++.PP
++The
++.B \%endwin
++function of both
++.I \%ncurses
++and SVr4
++.I curses
++calls
++.B \%curs_set
++if the latter has previously been called to set the cursor visiblility
++to a value other than normal;
++that is,
++either
+ invisible or very visible.
+-There is no way for \fI\%ncurses\fP to determine the initial cursor
+-state to restore that.
++There is no way for
++.I \%ncurses
++to determine the initial cursor visibility to restore it.
+ .SH EXTENSIONS
+ In
+ .IR \%ncurses ","
+@@ -304,24 +346,51 @@
+ .B \%NCURSES_VERSION
+ preprocessor macro.
+ .PP
+-The \fIvirtual screen\fP functions \fBsetsyx\fP and \fBgetsyx\fP
+-are not described in X/Open Curses, Issue 4.
+-All other functions are as described in X/Open Curses.
++The
++.I "virtual screen"
++functions
++.I \%setsyx
++and
++.I \%getsyx
++are not described in X/Open Curses Issue\ 4.
++SVr4 documents each of them
++as returning an
++.IR int "."
++This is misleading,
++as they are macros with no documented semantics for returning values.
+ .PP
+-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.
++All other functions are as described in X/Open Curses.
++It specifies no error conditions for them,
++except as described for
++.I \%curs_set
++in section \*(``RETURN VALUE\*('' above.
++.PP
++Older SVr4 man pages warn that the return value of
++.B \%curs_set
++\*(``is currently incorrect\*(''.
++This implementation gets it right,
++but counting on its correctness anywhere else may be unwise.
++.PP
++X/Open Curses specifies
++.I \%ripoffline
++as returning
++.B OK
++with no possibility of failure
++(\*(``[c]alls to
++.I \%ripoffline
++above this limit
++[five lines]
++have no effect but report success\*('').
+ .PP
+ X/Open Curses notes:
+ .RS
+ .PP
+-\*(``After use of
++After use of
+ .IR \%mvcur "(),"
+ the model Curses maintains of the state of the terminal might not
+ match the actual state of the terminal.
+ An application should touch and refresh the window before
+-resuming conventional use of Curses.\*(''
++resuming conventional use of Curses.
+ .RE
+ .PP
+ Both
+@@ -332,15 +401,19 @@
+ .B \%mvcur
+ using the
+ .I SCREEN
+-data allocated in either \fB\%initscr\fP(3X) or \fB\%newterm\fP(3X).
++object allocated in either \fB\%initscr\fP(3X) or \fB\%newterm\fP(3X).
+ X/Open Curses states that the old location must be given for
+-.B \%mvcur
++.I \%mvcur
+ to accommodate terminals that lack absolute cursor positioning.
+ .\" X/Open Curses Issue 7, p. 161
+ .PP
+-If interrupted, \fI\%ncurses\fP restarts \fBnapms\fP.
+-That, and the limitation to 30 seconds,
+-are different from other implementations.
++If interrupted by a signal,
++.I \%ncurses
++restarts
++.IR \%napms "."
++That,
++and the limitation to 30 seconds,
++differ from other implementations.
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_initscr\fP(3X),
+Index: man/curs_outopts.3x
+Prereq:  1.69 
+--- ncurses-6.5-20240831+/man/curs_outopts.3x	2024-07-27 19:55:45.000000000 +0000
++++ ncurses-6.5-20240914/man/curs_outopts.3x	2024-09-14 20:06:50.000000000 +0000
+@@ -27,8 +27,19 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_outopts.3x,v 1.69 2024/07/27 19:55:45 tom Exp $
+-.TH curs_outopts 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_outopts.3x,v 1.71 2024/09/14 20:06:50 tom Exp $
++.TH curs_outopts 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.ie \n(.g \{\
++.ds `` \(lq
++.ds '' \(rq
++.\}
++.el \{\
++.ie t .ds `` ``
++.el   .ds `` ""
++.ie t .ds '' ''
++.el   .ds '' ""
++.\}
++.
+ .de bP
+ .ie n  .IP \(bu 4
+ .el    .IP \(bu 2
+@@ -166,25 +177,45 @@
+ The \fBimmedok\fP routine is useful for windows that are used as terminal
+ emulators.
+ .SH PORTABILITY
+-These functions are described in X/Open Curses, Issue 4.
++X/Open Curses,
++Issue 4 describes these functions.
+ It specifies no error conditions for them.
+ .PP
+-Some historic curses implementations had, as an undocumented feature, the
+-ability to do the equivalent of \fBclearok(..., 1)\fP by saying
+-\fBtouchwin(stdscr)\fP or \fBclear(stdscr)\fP.
+-This will not work under \fI\%ncurses\fP.
+-.PP
+-Earlier System V curses implementations specified that with \fBscrollok\fP
+-enabled, any window modification triggering a scroll also forced a physical
+-refresh.
+-X/Open Curses does not require this, and \fI\%ncurses\fP avoids doing
+-it to perform better vertical-motion optimization at \fBwrefresh\fP
+-time.
++Some historic
++.I curses
++implementations,
++as an undocumented feature,
++did the equivalent of
++.RB \*(`` \%clearok( .\|.\|. ", 1)" \*(''
++when
++.B \%touchwin(stdstr)
++or
++.B \%clear(stdstr)
++were used.
++This trick does not work with
++.IR \%ncurses .
++.PP
++Early System\ V
++.I curses
++implementations specified that with
++.B \%scrollok
++enabled,
++any window modification triggering a scroll
++also forced a physical refresh.
++X/Open Curses does not require this,
++and
++.I \%ncurses
++avoids doing so to better optimize vertical motions upon a
++\fB\%wrefresh\fP(3X).
+ .PP
+ X/Open Curses does not mention that the cursor should be
+-made invisible as a side-effect of \fBleaveok\fP.
+-SVr4 curses documentation does this, but the code does not.
+-Use \fBcurs_set\fP to make the cursor invisible.
++made invisible as a side-effect of
++.BR \%leaveok .
++SVr4
++.I curses
++documentation notes this,
++but the code neglects it.
++Use \fB\%curs_set\fP(3X) to make the cursor invisible.
+ .SH HISTORY
+ .I \%ncurses
+ formerly treated \fBnl\fP(3X) and \fBnonl\fP(3X) as both input
+Index: man/curs_refresh.3x
+Prereq:  1.50 
+--- ncurses-6.5-20240831+/man/curs_refresh.3x	2024-07-27 19:55:45.000000000 +0000
++++ ncurses-6.5-20240914/man/curs_refresh.3x	2024-09-14 20:06:50.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_refresh.3x,v 1.50 2024/07/27 19:55:45 tom Exp $
+-.TH curs_refresh 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_refresh.3x,v 1.52 2024/09/14 20:06:50 tom Exp $
++.TH curs_refresh 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -164,5 +164,5 @@
+ \fBwnoutrefresh\fP call to guarantee an entire-contents copy anywhere.
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+-\fB\%curs_outopts\fP(3X)
++\fB\%curs_outopts\fP(3X),
+ \fB\%curs_variables\fP(3X)
+Index: man/curs_scroll.3x
+Prereq:  1.45 
+--- ncurses-6.5-20240831+/man/curs_scroll.3x	2024-05-25 20:16:27.000000000 +0000
++++ ncurses-6.5-20240914/man/curs_scroll.3x	2024-09-14 20:06:50.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_scroll.3x,v 1.45 2024/05/25 20:16:27 tom Exp $
+-.TH curs_scroll 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_scroll.3x,v 1.47 2024/09/14 20:06:50 tom Exp $
++.TH curs_scroll 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -68,7 +68,8 @@
+ .IR i "\-1."
+ The text of the top line in the window disappears and the bottom line
+ is populated with blank characters;
+-see \fB\%bkgd\fP(3X) or \fB\%bkgrnd\fP(3X).
++see \fB\%bkgd\fP(3X)
++(wide-character API users: \fB\%bkgrnd\fP(3X)).
+ As an optimization,
+ if the scrolling region of the window is the entire screen,
+ the physical screen may be scrolled at the same time;
+@@ -77,9 +78,9 @@
+ .B \%scrl
+ and
+ .B \%wscrl
+-scroll
+-.B \%stdscr
+-or the specified window up or down depending on the sign of
++scrolls the specified window
++.I win
++up or down per the sign of
+ .IR n "."
+ .bP
+ For positive
+@@ -97,6 +98,9 @@
+ becomes
+ .I i
+ (scrolling down).
++\fB\%ncurses\fP(3X) describes the
++.B \%scrl
++variant of this function.
+ .PP
+ The cursor does not move.
+ These functions perform no operation unless scrolling is enabled for the
+@@ -147,16 +151,17 @@
+ if the scroll region is the entire screen \*(``is\*('' performed,
+ not \*(``may be\*('' performed.
+ .I \%ncurses
+-deliberately does not guarantee that this will occur,
+-to leave open the possibility of smarter optimization of multiple scroll
++deliberately does not guarantee that this occurs,
++to leave open the possibility of better optimization of multiple scroll
+ actions on the next update.
+ .PP
+ Neither SVr4
+ .I curses
+-nor X/Open Curses specify whether the current attribute or current color
+-pair of blanks generated by the scroll function are zeroed.
+-.I \%ncurses
+-does so.
++nor X/Open Curses specify whether these functions zero the attributes or
++color pair identifier of the blank character.
++In
++.IR \%ncurses ","
++they do not.
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_outopts\fP(3X)
+Index: man/curs_termcap.3x
+Prereq:  1.87 
+--- ncurses-6.5-20240831+/man/curs_termcap.3x	2024-06-22 21:28:07.000000000 +0000
++++ ncurses-6.5-20240914/man/curs_termcap.3x	2024-09-14 20:06:50.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_termcap.3x,v 1.87 2024/06/22 21:28:07 tom Exp $
+-.TH curs_termcap 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_termcap.3x,v 1.89 2024/09/14 20:06:50 tom Exp $
++.TH curs_termcap 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -45,6 +45,51 @@
+ .el    .IP \(bu 2
+ ..
+ .
++.\" URL hyperlink support macros from groff's "an-ext.tmac"
++.
++.\" Save the automatic hyphenation mode.
++.\"
++.\" In AT&T troff, there was no register exposing the hyphenation mode,
++.\" and no way to save and restore it.  Set `mH` to a reasonable value
++.\" for your implementation and preference.
++.de mY
++.  ie !\\n(.g \
++.    nr mH 14
++.  el \
++.    do nr mH \\n[.hy] \" groff extension register
++..
++.
++.\" Prepare link text for mail/web hyperlinks.  `MT` and `UR` call this.
++.de mV
++.  ds mU \\$1\"
++..
++.
++.\" Emit hyperlink.  The optional argument supplies trailing punctuation
++.\" after link text.  `ME` and `UE` call this.
++.de mQ
++.  mY
++.  nh
++<\\*(mU>\\$1
++.  hy \\n(mH
++.  rm mU
++..
++.
++.\" Start URL.
++.\" .UR url
++.if !\n(.g \{\
++.de UR
++.  mV \\$1
++..
++.\}
++.
++.\" End URL.
++.\" .UE [punctuation]
++.if !\n(.g \{\
++.de UE
++.  mQ \\$1
++..
++.\}
++.
+ .SH NAME
+ \fB\%PC\fP,
+ \fB\%UP\fP,
+@@ -302,96 +347,148 @@
+ .SH PORTABILITY
+ These functions are no longer standardized
+ (and the variables never were);
+-\fI\%ncurses\fP provides them to support legacy applications.
++.I \%ncurses
++provides them to support legacy applications.
+ They should not be used in new programs.
+ .SS Standards
+ .bP
+-X/Open Curses, Issue 4, Version 2 (1996),
++X/Open Curses,
++Issue 4,
++Version 2 (1996),
+ describes these functions,
+ marking them as
+ \*(``TO BE WITHDRAWN\*(''.
+ .bP
+-X/Open Curses, Issue 7 (2009) marks the \fItermcap\fP interface
+-(along with \fB\%vwprintw\fP and \fB\%vwscanw\fP) as withdrawn.
++X/Open Curses,
++Issue 7 (2009) withdrew the
++.I termcap
++interface
++(along with the
++.I \%vwprintw
++and
++.I \%vwscanw
++functions).
+ .PP
+ Neither X/Open Curses nor the SVr4 man pages documented the return
+-values of \fB\%tgetent\fP correctly,
++values of
++.I \%tgetent
++correctly,
+ though all three shown here were in fact returned ever since SVr1.
+ In particular,
+ an omission in the X/Open Curses specification has been misinterpreted
+-to mean that \fB\%tgetent\fP returns \fBOK\fP or \fBERR\fP.
++to mean that
++.I \%tgetent
++returns
++.B OK
++or
++.BR ERR "."
+ Because the purpose of these functions is to provide compatibility with
+-the \fItermcap\fP library,
+-that is a defect in X/Open Curses, Issue 4, Version 2
+-rather than in \fI\%ncurses\fP.
+-.SS "Compatibility with BSD \fItermcap\fP"
+-Externally visible variables are provided for support of certain
+-\fItermcap\fP applications.
++the
++.I termcap
++library,
++that is a defect in X/Open Curses,
++Issue 4,
++Version 2
++rather than in
++.IR \%ncurses "."
++.SS "Compatibility with BSD \f(BItermcap\fP"
++.I \%ncurses
++provides externally visible variables to support certain
++.I termcap
++applications.
+ However,
+ their correct usage is poorly documented;
+ for example,
+ it is unclear when reading and writing them is meaningful.
+ In particular,
+-some applications are reported to declare and/or modify \fB\%ospeed\fP.
++some applications are reported to declare and/or modify
++.BR \%ospeed "."
+ .PP
+-The constraint that only the first two characters of the \fIid\fP
+-parameter are used escapes many application developers.
+-The BSD \fItermcap\fP library did not require a trailing null character
+-on the capability identifier passed to \fB\%tgetstr\fP,
+-\fB\%tgetnum\fP,
++The constraint that only the first two characters of the
++.I id
++parameter are looked up in the terminal database
++escapes many application developers.
++The BSD
++.I termcap
++library did not require a trailing null character
++after the capability identifier passed to
++.IR \%tgetstr ","
++.IR \%tgetnum ","
+ and
+-\fB\%tgetflag\fP.
++.IR \%tgetflag "."
+ .\" See .
+-Some applications thus assume that the \fItermcap\fP interface does not
+-require the trailing null character for the capability identifier.
+-.bP
++Some applications thus assume that the
++.I termcap
++interface does not require the trailing null character
++for the capability identifier.
++.PP
+ .I \%ncurses
+-disallows matches by the \fItermcap\fP interface against extended
+-capability names that are longer than two characters;
++disallows matches by the
++.I termcap
++interface against extended capability names
++that are longer than two characters;
+ see \fB\%user_caps\fP(5).
+ .PP
+-The BSD \fItermcap\fP function \fB\%tgetent\fP returns the text of a
+-\fItermcap\fP entry in the buffer passed as an argument.
++The BSD
++.I termcap
++function
++.I \%tgetent
++returns the text of a
++.I termcap
++entry in the buffer passed as an argument.
+ This library,
+-like other \fI\%term\%info\fP implementations,
++like other
++.I \%term\%info
++implementations,
+ does not store terminal type descriptions as text.
+ It sets the buffer contents to a null-terminated string.
+ .SS "Header File"
+-This library includes a \fI\%termcap.h\fP header for compatibility with
+-other implementations,
+-but the header is rarely used because the other implementations are not
+-strictly compatible.
++This library includes a
++.I \%termcap.h
++header file for compatibility with other implementations,
++but it is rarely used because the other implementations
++are not mutually compatible;
++see below.
+ .SH HISTORY
+ .\" See https://www.oreilly.com/openbook/opensources/book/kirkmck.html
+ .\" for much BSD release history.
+-Bill Joy originated a forerunner of \fItermcap\fP called
+-\*(``ttycap\*('',
++Bill Joy originated a forerunner of
++.I termcap
++called \*(``ttycap\*('',
+ dated September 1977,
+ and released in 1BSD
+ (March 1978).
+ .\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/s7/ttycap.c
+ .\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/man7/ttycap.7
+-It used many of the same function names as the later \fItermcap\fP,
++It used many of the same function names as the later
++.IR termcap ","
+ such as
+-\fB\%tgetent\fP,
+-\fB\%tgetflag\fP,
+-\fB\%tgetnum\fP,
++.IR \%tgetent ","
++.IR \%tgetflag ","
++.IR \%tgetnum ","
+ and
+-\fB\%tgetstr\fP.
++.IR \%tgetstr "."
+ .PP
+ A clear descendant,
+-the \fItermlib\fP library,
++the
++.I termlib
++library,
+ .\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=2BSD/src/termlib/
+ followed in 2BSD
+ (May 1979),
+-adding \fB\%tgoto\fP and \fB\%tputs\fP.
++adding
++.I \%tgoto
++and
++.IR \%tputs "."
+ The former applied at that time only to cursor positioning capabilities,
+ .\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=2BSD/bin/etc/termcap
+ thus the overly specific name.
+ Little changed in 3BSD
+ (late 1979)
+-except the addition of test programs and a \fI\%termlib\fP man page,
++except the addition of test programs and a
++.I termlib
++man page,
+ which documented the API shown in section \*(``SYNOPSIS\*('' above.
+ .\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/src/lib/\
+ .\"   libtermlib/
+@@ -400,7 +497,10 @@
+ .PP
+ 4BSD
+ (November 1980)
+-renamed \fItermlib\fP to \fItermcap\fP
++renamed
++.I termlib
++to
++.I termcap
+ .\" ...except in the source tree...
+ .\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/src/lib/\
+ .\"   libtermlib/makefile
+@@ -418,8 +518,9 @@
+ The library long antedated the standard and thus provided no header file
+ declaring them.
+ Nevertheless,
+-the BSD sources included two different \fI\%termcap.h\fP header files
+-over time.
++the BSD sources included two different
++.I \%termcap.h
++header files over time.
+ .bP
+ One was used internally by \fIjove\fP(1) from 4.3BSD onward.
+ .\" 2BSD became a branch retaining support for non-virtual memory
+@@ -435,55 +536,93 @@
+ .\"   https://minnie.tuhs.org/cgi-bin/utree.pl?file=4.3BSD/usr/contrib/\
+ .\"     jove/Makefile
+ .\" --much too late for 2BSD (1979).
+-It declared global symbols for the \fItermcap\fP variables that it used.
++It declared global symbols for the
++.I termcap
++variables that it used.
+ .bP
+ The other appeared in 4.4BSD-Lite Release 2
+ (June 1995)
+-as part of \fIlibedit\fP
+-(also known as the \fI\%edit\%line\fP library).
++as part of
++.I libedit
++(also known as the
++.I \%edit\%line
++library).
+ CSRG source history shows that this was added in mid-1992.
+-The \fIlibedit\fP header file was used internally as a convenience for
+-compiling the \fI\%edit\%line\fP library.
++The
++.I libedit
++header file was used internally as a convenience
++for compiling the
++.I \%edit\%line
++library.
+ It declared function prototypes,
+ but no global variables.
+-This header file was added to NetBSD's \fItermcap\fP library in
+-mid-1994.
++NetBSD's
++.I termcap
++library added this header file in mid-1994.
+ .PP
+ Meanwhile,
+-GNU \fItermcap\fP began development in 1990.
+-Its first release (1.0) in 1991 included a \fI\%termcap.h\fP header.
+-Its second (1.1) in September 1992 modified the header to use
+-\fIconst\fP for the function prototypes in the header where one would
+-expect the parameters to be read-only.
+-BSD \fItermcap\fP did not.
+-The prototype for \fB\%tputs\fP also differed,
++GNU
++.I termcap
++began development in 1990.
++Its first release (1.0) in 1991 included a
++.I \%termcap.h
++header file.
++Its second (1.1) release in September 1992 modified the file to use
++.I const
++for the function prototypes in the header where one would
++expect parameters to be read-only.
++BSD
++.I termcap
++did not.
++The prototype for
++.I \%tputs
++also differed,
+ but in that instance,
+-it was \fIlibedit\fP that differed from BSD \fItermcap\fP.
+-.PP
+-GNU \fItermcap\fP 1.3 was bundled with \fIbash\fP(1) in mid-1993 to
+-support the \fI\%readline\fP(3) library.
++it was
++.I libedit
++that differed from BSD
++.IR termcap "."
++.PP
++GNU \fIbash\fP(1) has bundled GNU
++.I termcap
++1.3 since mid-1993 to support its \fI\%readline\fP(3) library,
++and continues to use it if configured to do so.
+ .PP
+-\fI\%ncurses\fP 1.8.1
++.I \%ncurses
++1.8.1
+ (November 1993)
+-provided a \fI\%termcap.h\fP file.
+-It reflected influence from GNU \fItermcap\fP and \fI\%emacs\fP(1)
++provided a
++.I \%termcap.h
++file.
++It reflected influence from GNU
++.I termcap
++and \fI\%emacs\fP(1)
+ (rather than \fIjove\fP(1)),
+ providing the following interface:
+ .bP
+-global symbols used by \fI\%emacs\fP,
++global symbols used by
++.IR \%emacs ","
+ .bP
+-\fIconst\fP-qualified function prototypes,
++.IR const -qualified
++function prototypes,
+ and
+ .bP
+-a prototype for \fBtparam\fP,
+-a GNU \fItermcap\fP feature.
++a prototype for
++.IR tparam ","
++a GNU
++.I termcap
++feature.
+ .PP
+ Later
+ (in mid-1996)
+-the \fB\%tparam\fP function was removed from \fI\%ncurses\fP.
++the
++.I tparam
++function was removed from
++.IR \%ncurses "."
+ Any two of the four implementations thus differ,
+-and programs that intend to work with all \fItermcap\fP library
+-interfaces must account for that fact.
++and programs that intend to work with all
++.I termcap
++library interfaces must account for that fact.
+ .SH BUGS
+ If you call \fB\%tgetstr\fP to fetch
+ .B \%column_address
+@@ -538,10 +677,14 @@
+ the \fItermcap\fP interface to accommodate the latter's limitation in
+ this respect.
+ .SH "SEE ALSO"
++.na
++.UR https://invisible\-island.net/ncurses/tctest.html
++\fITCTEST - A Termcap Test Utility\fP
++.UE
++.ad
++.PP
+ \fB\%curses\fP(3X),
+ \fB\%curs_terminfo\fP(3X),
+ \fB\%putc\fP(3),
+ \fB\%term_variables\fP(3X),
+ \fB\%terminfo\fP(5)
+-.PP
+-https://invisible\-island.net/ncurses/tctest.html
+Index: man/curs_terminfo.3x
+Prereq:  1.142 
+--- ncurses-6.5-20240831+/man/curs_terminfo.3x	2024-06-08 23:05:52.000000000 +0000
++++ ncurses-6.5-20240914/man/curs_terminfo.3x	2024-09-14 20:06:50.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_terminfo.3x,v 1.142 2024/06/08 23:05:52 tom Exp $
+-.TH curs_terminfo 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_terminfo.3x,v 1.144 2024/09/14 20:06:50 tom Exp $
++.TH curs_terminfo 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -330,57 +330,76 @@
+ .RE
+ .\" ********************************************************************
+ .SS "The Terminal State"
+-\fB\%setupterm\fP stores its information about the terminal in a
++.B \%setupterm
++stores its information about the terminal in a
+ .I \%TERMINAL
+-structure pointed to by the global variable \fB\%cur_term\fP.
++structure pointed to by the global variable
++.BR \%cur_term "."
+ If it detects an error,
+ or decides that the terminal is unsuitable
+ (hardcopy or generic),
+ it discards this information,
+-making it not available to applications.
++making it unavailable to applications.
+ .PP
+-If \fB\%setupterm\fP is called repeatedly for the same terminal type,
+-it will reuse the information.
+-It maintains only one copy of a given terminal's capabilities in memory.
+-If it is called for different terminal types,
+-\fB\%setupterm\fP allocates new storage for each set of terminal
+-capabilities.
+-.PP
+-\fB\%set_curterm\fP sets \fB\%cur_term\fP to
+-.IR \%nterm ,
+-and makes all of the
++If
++.B \%setupterm
++is called repeatedly for the same terminal type,
++it reuses the information.
++It maintains only one copy of a given type's capabilities in memory.
++If called for different types,
++.B \%setupterm
++allocates new storage for each set of terminal capabilities.
++.PP
++.B \%set_curterm
++sets
++.B \%cur_term
++to
++.IR \%nterm ","
++making all of the
+ .I \%term\%info
+ Boolean,
+ numeric,
+-and string variables use the values from
+-.IR \%nterm .
+-It returns the old value of \fB\%cur_term\fP.
+-.PP
+-\fB\%del_curterm\fP frees the space pointed to by
+-.I \%oterm
+-and makes it available for further use.
++and string capabilities use the values from
++.IR \%nterm "."
++It returns the old value of
++.BR \%cur_term "."
++.PP
++.B \%del_curterm
++frees the memory pointed to by
++.BR \%oterm ","
++making it available for further use.
+ If
+-.I \%oterm
++.B \%oterm
+ is
+-the same as \fB\%cur_term\fP,
++the same as
++.BR \%cur_term ","
+ references to any of the
+ .I \%term\%info
+ Boolean,
+ numeric,
+-and string variables thereafter may refer to invalid memory locations
+-until another \fB\%setupterm\fP has been called.
+-.PP
+-\fB\%restartterm\fP is similar to \fB\%setupterm\fP and \fB\%initscr\fP,
+-except that it is called after restoring memory to a previous state
++and string capabilities thereafter may refer to invalid memory locations
++until
++.B \%setupterm
++is called again.
++.PP
++.B \%restartterm
++is similar to
++.BR \%setupterm ","
++but is intended for use after restoring program memory
++to a previous state
+ (for example,
+-when reloading a game saved as a core image dump).
+-\fB\%restartterm\fP assumes that the windows and the input and output
+-options are the same as when memory was saved,
+-but the terminal type and baud rate may be different.
++when reloading an application that has been suspended from one terminal
++session and restored in another).
++.B \%restartterm
++assumes that the display dimensions
++and the input and output options are the same as when memory was saved,
++but the terminal type and line speed may differ.
+ Accordingly,
+-\fB\%restartterm\fP saves various terminal state bits,
+-calls \fB\%setupterm\fP,
+-and then restores the bits.
++.B \%restartterm
++saves relevant terminal state,
++calls
++.BR \%setupterm ","
++then restores that state.
+ .\" ********************************************************************
+ .SS "Formatting Output"
+ \fB\%tparm\fP instantiates the string
+@@ -922,15 +941,18 @@
+ \*(``#win32con\*('' or an abbreviation of that string.
+ .SS "Other Portability Issues"
+ In SVr4,
+-\fB\%set_curterm\fP returns an
+-.IR int ,
++.I \%set_curterm
++returns an
++.IR int ","
+ .B OK
+ or
+-.BR ERR .
++.BR ERR "."
+ We have chosen to implement the X/Open Curses semantics.
+ .PP
+ In SVr4,
+-the third argument of \fB\%tputs\fP has the type
++the third argument of
++.I \%tputs
++has the type
+ .RB \*(`` "int (*putc)(char)" \*(''.
+ .PP
+ At least one implementation of X/Open Curses (Solaris) returns a value
+@@ -938,7 +960,8 @@
+ .B OK
+ or
+ .B ERR
+-from \fB\%tputs\fP.
++from
++.IR \%tputs "."
+ It instead returns the length of the string,
+ and does no error checking.
+ .\" ********************************************************************
+Index: man/curs_util.3x
+Prereq:  1.114 
+--- ncurses-6.5-20240831+/man/curs_util.3x	2024-07-27 19:55:45.000000000 +0000
++++ ncurses-6.5-20240914/man/curs_util.3x	2024-09-11 21:02:40.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_util.3x,v 1.114 2024/07/27 19:55:45 tom Exp $
+-.TH curs_util 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_util.3x,v 1.116 2024/09/11 21:02:40 tom Exp $
++.TH curs_util 3X 2024-09-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -418,7 +418,7 @@
+ the parameter is in the range 128\-159,
+ i.e.,
+ a C1 control code.
+-If \fBuse_legacy_coding\fP(3X) has been called with a \fB2\fP parameter,
++If \fB\%use_legacy_coding\fP(3X) has been called with a \fB2\fP parameter,
+ \fBunctrl\fP returns the parameter,
+ i.e.,
+ a one-character string with
+@@ -453,7 +453,7 @@
+ printable.
+ This implementation uses 8 bits
+ but does not modify the string to reflect locale.
+-The \fBuse_legacy_coding\fP(3X) function allows the caller to
++The \fB\%use_legacy_coding\fP(3X) function allows the caller to
+ change the output of \fBunctrl\fP.
+ .PP
+ Likewise,
+@@ -462,7 +462,7 @@
+ i.e.,
+ it determines whether to use the \*(``M\-\*('' prefix
+ for \*(``meta\*('' keys (codes in the range 128 to 255).
+-Both \fBuse_legacy_coding\fP(3X) and \fBmeta\fP(3X) succeed only after
++Both \fB\%use_legacy_coding\fP(3X) and \fBmeta\fP(3X) succeed only after
+ curses is initialized.
+ X/Open Curses does not document the treatment of codes 128 to 159.
+ When treating them as \*(``meta\*('' keys
+Index: man/curs_variables.3x
+Prereq:  1.49 
+--- ncurses-6.5-20240831+/man/curs_variables.3x	2024-06-22 21:25:23.000000000 +0000
++++ ncurses-6.5-20240914/man/curs_variables.3x	2024-09-14 20:06:50.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_variables.3x,v 1.49 2024/06/22 21:25:23 tom Exp $
+-.TH curs_variables 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_variables.3x,v 1.51 2024/09/14 20:06:50 tom Exp $
++.TH curs_variables 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -48,6 +48,51 @@
+ .el    .IP \(bu 2
+ ..
+ .
++.\" URL hyperlink support macros from groff's "an-ext.tmac"
++.
++.\" Save the automatic hyphenation mode.
++.\"
++.\" In AT&T troff, there was no register exposing the hyphenation mode,
++.\" and no way to save and restore it.  Set `mH` to a reasonable value
++.\" for your implementation and preference.
++.de mY
++.  ie !\\n(.g \
++.    nr mH 14
++.  el \
++.    do nr mH \\n[.hy] \" groff extension register
++..
++.
++.\" Prepare link text for mail/web hyperlinks.  `MT` and `UR` call this.
++.de mV
++.  ds mU \\$1\"
++..
++.
++.\" Emit hyperlink.  The optional argument supplies trailing punctuation
++.\" after link text.  `ME` and `UE` call this.
++.de mQ
++.  mY
++.  nh
++<\\*(mU>\\$1
++.  hy \\n(mH
++.  rm mU
++..
++.
++.\" Start URL.
++.\" .UR url
++.if !\n(.g \{\
++.de UR
++.  mV \\$1
++..
++.\}
++.
++.\" End URL.
++.\" .UE [punctuation]
++.if !\n(.g \{\
++.de UE
++.  mQ \\$1
++..
++.\}
++.
+ .SH NAME
+ \fI\%bool\fP,
+ \fI\%chtype\fP,
+@@ -316,6 +361,13 @@
+ most users have decided either to override the value,
+ or to rely upon its default.
+ .SH SEE ALSO
++.na
++.UR https://\*:unicode\*:.org/\*:reports/\*:tr29/
++[UAX #29] \*(``Unicode Standard Annex #29: Unicode Text
++Segmentation\*(''
++.UE
++.ad
++.PP
+ \fB\%curses\fP(3X),
+ \fB\%curs_color\fP(3X),
+ \fB\%curs_opaque\fP(3X),
+@@ -323,7 +375,3 @@
+ \fB\%curs_threads\fP(3X),
+ \fB\%term_variables\fP(3X),
+ \fB\%terminfo\fP(5)
+-.PP
+-[UAX #29] \*(``Unicode Standard Annex #29: Unicode Text
+-Segmentation\*('';
+-\%
+Index: man/curs_window.3x
+Prereq:  1.52 
+--- ncurses-6.5-20240831+/man/curs_window.3x	2024-06-01 22:29:08.000000000 +0000
++++ ncurses-6.5-20240914/man/curs_window.3x	2024-09-14 20:06:50.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_window.3x,v 1.52 2024/06/01 22:29:08 tom Exp $
+-.TH curs_window 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_window.3x,v 1.54 2024/09/14 20:06:50 tom Exp $
++.TH curs_window 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%newwin\fP,
+ \fB\%delwin\fP,
+@@ -46,23 +46,23 @@
+ .nf
+ \fB#include 
+ .PP
+-\fBWINDOW *newwin(
+-      \fBint \fInlines\fB, int \fIncols\fB,\fR
+-      \fBint \fIbegin_y\fB, int \fIbegin_x\fB);\fR
+-\fBint delwin(WINDOW *\fIwin\fB);\fR
+-\fBint mvwin(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
+-\fBWINDOW *subwin(WINDOW *\fIorig\fB,\fR
+-      \fBint \fInlines\fB, int \fIncols\fB,\fR
+-      \fBint \fIbegin_y\fB, int \fIbegin_x\fB);\fR
+-\fBWINDOW *derwin(WINDOW *\fIorig\fB,\fR
+-      \fBint \fInlines\fB, int \fIncols\fB,\fR
+-      \fBint \fIbegin_y\fB, int \fIbegin_x\fB);\fR
+-\fBint mvderwin(WINDOW *\fIwin\fB, int \fIpar_y\fB, int \fIpar_x\fB);\fR
+-\fBWINDOW *dupwin(WINDOW *\fIwin\fB);\fR
+-\fBvoid wsyncup(WINDOW *\fIwin\fB);\fR
+-\fBint syncok(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
+-\fBvoid wcursyncup(WINDOW *\fIwin\fB);\fR
+-\fBvoid wsyncdown(WINDOW *\fIwin\fB);\fR
++\fBWINDOW * newwin(
++	int \fInlines\fP, int \fIncols\fP,
++	int \fIbegin_y\fP, int \fIbegin_x\fP);
++\fBint delwin(WINDOW * \fIwin\fP);
++\fBint mvwin(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP);
++\fBWINDOW * subwin(WINDOW * \fIorig\fP,
++	int \fInlines\fP, int \fIncols\fP,
++	int \fIbegin_y\fP, int \fIbegin_x\fP);
++\fBWINDOW * derwin(WINDOW * \fIorig\fP,
++	int \fInlines\fP, int \fIncols\fP,
++	int \fIbegin_y\fP, int \fIbegin_x\fP);
++\fBint mvderwin(WINDOW * \fIwin\fP, int \fIpar_y\fP, int \fIpar_x\fP);
++\fBWINDOW * dupwin(WINDOW * \fIwin\fP);
++\fBvoid wsyncup(WINDOW * \fIwin\fP);
++\fBint syncok(WINDOW * \fIwin\fP, bool \fIbf\fP);
++\fBvoid wcursyncup(WINDOW * \fIwin\fP);
++\fBvoid wsyncdown(WINDOW * \fIwin\fP);
+ .fi
+ .SH DESCRIPTION
+ .SS newwin
+Index: man/infocmp.1m
+Prereq:  1.110 
+--- ncurses-6.5-20240831+/man/infocmp.1m	2024-05-11 20:39:53.000000000 +0000
++++ ncurses-6.5-20240914/man/infocmp.1m	2024-09-14 20:06:50.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: infocmp.1m,v 1.110 2024/05/11 20:39:53 tom Exp $
+-.TH @INFOCMP@ 1M 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: infocmp.1m,v 1.112 2024/09/14 20:06:50 tom Exp $
++.TH @INFOCMP@ 1M 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -53,7 +53,10 @@
+ \fB@INFOCMP@\fP \-
+ compare or print out \fIterminfo\fP descriptions
+ .SH SYNOPSIS
+-\fB@INFOCMP@\fP [\fB\-\
++.na
++.HP
++.B @INFOCMP@
++.RB [ \-\
+ 1\
+ c\
+ C\
+@@ -80,10 +83,24 @@
+ V\
+ W\
+ x\
+-\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]
+-      [\fB\-w\fP\ \fIwidth\fP] [\fB\-A\fP\ \fIdirectory\fP] [\fB\-B\fP\ \fIdirectory\fP]
+-      [\fIterminal-type\fP ...]
++]
++.RB [ \-A\ \c
++.IR directory ]
++.RB [ \-B\ \c
++.IR directory ]
++.RB [ \-Q\ \c
++.IR encoding ]
++.RB [ \-R\ \c
++.IR subset ]
++.RB [ \-s\ \c
++.IR key ]
++.RB [ \-v\ \c
++.IR level ]
++.RB [ \-w\ \c
++.IR width ]
++.RI [ \%terminal\%-type
++\&.\|.\|.\& ]
++.ad
+ .SH DESCRIPTION
+ \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
+@@ -111,7 +128,7 @@
+ \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.
++\fIabsent\fP and \fIcanceled\fP capabilities.
+ .PP
+ These options produce a list which you can use to compare two
+ or more terminal descriptions:
+@@ -277,7 +294,7 @@
+ superfluous.
+ \fB@INFOCMP@\fP will flag any other \fIterminal-type use=\fP fields that
+ were not needed.
+-.SS "Changing Databases [\-A \fIdirectory\fR] [\-B \fIdirectory\fR]"
++.SS "Changing Databases [\-A \f(BIdirectory\fP] [\-B \f(BIdirectory\fP]"
+ Like other \fI\%ncurses\fP utilities,
+ \fB@INFOCMP@\fP looks for the terminal descriptions in several places.
+ You can use the \fI\%TERMINFO\fP and \fI\%TERMINFO_DIRS\fP environment
+@@ -478,7 +495,8 @@
+ \*(``\-\*('' for absent capabilities, \*(``@\*(''
+ for canceled rather than \*(``NULL\*(''.
+ .bP
+-However, show differences between absent and cancelled capabilities.
++However,
++show differences between absent and canceled capabilities.
+ .bP
+ Omit the \*(``Reconstructed from\*('' comment for source listings.
+ .RE
+@@ -607,7 +625,8 @@
+ \fB\-t\fP
+ options are not supported in SVr4 curses.
+ .PP
+-SVr4 infocmp does not distinguish between absent and cancelled capabilities.
++SVr4
++infocmp does not distinguish between absent and canceled capabilities.
+ Also, it shows missing integer capabilities as \fB\-1\fP
+ (the internal value used to represent missing integers).
+ This implementation shows those as \*(``NULL\*('',
+Index: man/legacy_coding.3x
+Prereq:  1.30 
+--- ncurses-6.5-20240831+/man/legacy_coding.3x	2024-07-27 19:44:30.000000000 +0000
++++ ncurses-6.5-20240914/man/legacy_coding.3x	2024-09-14 20:06:50.000000000 +0000
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey
+ .\"
+-.\" $Id: legacy_coding.3x,v 1.30 2024/07/27 19:44:30 tom Exp $
+-.TH legacy_coding 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: legacy_coding.3x,v 1.32 2024/09/14 20:06:50 tom Exp $
++.TH legacy_coding 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%use_legacy_coding\fP \-
+ override \fIcurses\fR locale encoding checks
+@@ -41,15 +41,18 @@
+ \fBint use_legacy_coding(int \fIlevel\fP);
+ .fi
+ .SH DESCRIPTION
+-.B \%use_legacy_coding
+-is an extension to the
++.BR \%use_legacy_coding ","
++an
++.I \%ncurses
++extension to the
+ .I curses
+-library.
+-It allows the caller to change the result of \fB\%unctrl\fP(3X),
++library,
++permits customiztion of \fB\%unctrl\fP(3X) behavior,
+ suppressing \fI\%isprint\fP(3)-based checks within the library that
+ would normally cause nonprinting characters to be rendered in visible
+ form.
+-The alteration affects only eight-bit characters.
++The alteration affects only byte-wide characters with the most
++significant bit set.
+ .PP
+ The
+ .I level
+Index: man/manlinks.sed
+Prereq:  1.21 
+--- ncurses-6.5-20240831+/man/manlinks.sed	2024-04-20 22:25:36.000000000 +0000
++++ ncurses-6.5-20240914/man/manlinks.sed	2024-09-14 23:49:39.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: manlinks.sed,v 1.21 2024/04/20 22:25:36 tom Exp $
++# $Id: manlinks.sed,v 1.22 2024/09/14 23:49:39 tom Exp $
+ ##############################################################################
+ # Copyright 2020-2023,2024 Thomas E. Dickey                                  #
+ # Copyright 2000-2003,2008 Free Software Foundation, Inc.                    #
+@@ -53,6 +53,7 @@
+ s/[ 	][ 	]*$//
+ s/[ 	][ 	]*/ /g
+ /^$/d
++/^[<>]/d
+ #
+ # convert ".SH" into a more manageable form
+ s/\.SH[ 	][ 	]*/.SH_(/
+Index: man/ncurses.3x
+Prereq:  1.229 
+--- ncurses-6.5-20240831+/man/ncurses.3x	2024-07-27 20:10:07.000000000 +0000
++++ ncurses-6.5-20240914/man/ncurses.3x	2024-09-14 20:06:50.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: ncurses.3x,v 1.229 2024/07/27 20:10:07 tom Exp $
+-.TH ncurses 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: ncurses.3x,v 1.231 2024/09/14 20:06:50 tom Exp $
++.TH ncurses 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -64,7 +64,7 @@
+ .SH DESCRIPTION
+ The \*(``new curses\*('' library offers the programmer a
+ terminal-independent means of reading keyboard and mouse input and
+-updating character-cell terminals with output optimized to minimize
++writing to character-cell displays with output optimized to minimize
+ screen updates.
+ .I \%ncurses
+ replaces the
+@@ -200,7 +200,8 @@
+ \fB\%initscr\fP(3X) or \fB\%newterm\fP(3X)
+ must be called to initialize
+ .I curses
+-before use of any functions that deal with windows and screens.
++before use of any functions
++that access or manipulate windows or screens.
+ .PP
+ To get character-at-a-time input without echoing\(emmost interactive,
+ screen-oriented programs want this\(emuse the following sequence.
+@@ -419,7 +420,10 @@
+ the removal of this prefix usually indicates operation on
+ .BR \%stdscr .
+ .PP
+-Four functions prefixed with \*(``p\*('' require a pad argument.
++Four functions prefixed with \*(``p\*('' require a
++.I pad
++argument;
++see below.
+ .PP
+ In function synopses,
+ .I \%ncurses
+@@ -507,6 +511,10 @@
+ prefix it with \*(``_w\*('' to obtain the wide counterpart.
+ For example,
+ \fB\%waddch\fP becomes \fB\%wadd_wch\fP.
++Another exception is
++.B \%ins_nwstr
++(and its variants),
++spelled thus instead of \*(``insn_wstr\*(''.
+ (Exceptions that add only \*(``w\*('' comprise
+ .BR \%addwstr ,
+ .BR \%inwstr ,
+@@ -517,10 +525,6 @@
+ .\" operated on `chtype`s assuming that they were wide enough for a
+ .\" `wchar_t` plus attribute and color pair bits; X/Open Curses did not
+ .\" standardize these.
+-Another exception is
+-.B \%ins_nwstr
+-and its variants,
+-which is spelled thus instead of \*(``insn_wstr\*(''.
+ .IP
+ This convention is inapplicable to some non-wide function names,
+ so other transformations are used for the wide configuration:
+@@ -1119,7 +1123,9 @@
+ .SS "\fIBAUDRATE\fP"
+ The debugging library checks this variable when the application has
+ redirected output to a file.
+-Its integral value is used for the baud rate.
++.I \%ncurses
++interprets its integral value as the terminal's line speed
++in bits per second.
+ If that value is absent or invalid,
+ .I \%ncurses
+ uses 9600.
+@@ -1146,6 +1152,8 @@
+ This variable specifies the width of the screen in characters.
+ Applications running in a windowing environment usually are able to
+ obtain the width of the window in which they are executing.
++.I \%ncurses
++enforces an upper limit of 512 when reading the value.
+ If
+ .I \%COLUMNS
+ is not defined and the terminal's screen size is not available from the
+@@ -1176,8 +1184,6 @@
+ and
+ .I \%LINES
+ variables may be specified independently.
+-.I \%ncurses
+-enforces an upper limit of 512 on each when reading the value.
+ This property is useful to circumvent misfeatures of legacy terminal
+ type descriptions;
+ \fI\%xterm\fP(1) descriptions specifying 65 lines were once notorious.
+@@ -1719,7 +1725,7 @@
+ .I \%configure
+ script when building the library.
+ Run the script with the
+-.B \-\-help
++.B \%\-\-help
+ option to peruse them all.
+ A few are of particular significance to the application developer
+ employing
+@@ -1759,7 +1765,7 @@
+ .RE
+ .PP
+ Installation also omits a symbolic link that would cause the compiler's
+-.B \-lcurses
++.B \%\-lcurses
+ option to link object files with
+ .I \%ncurses
+ instead of the system
+@@ -1773,7 +1779,9 @@
+ .TP 5
+ .B \-\-enable\-widec
+ The configure script renames the library and
+-(if the \fB\-\-disable\-overwrite\fP option is used)
++(if the
++.B \%\-\-disable\-overwrite
++option is used)
+ puts the header files in a different subdirectory.
+ All of the library names have a \*(``w\*('' appended to them,
+ i.e., instead of
+@@ -1781,7 +1789,7 @@
+ .PP
+ .RS 4
+ .EX
+-\fB\-lncurses\fP
++.B \-lncurses
+ .EE
+ .RE
+ .PP
+@@ -1789,7 +1797,7 @@
+ .PP
+ .RS 4
+ .EX
+-\fB\-lncursesw\fP
++.B \-lncursesw
+ .EE
+ .RE
+ .PP
+@@ -1829,7 +1837,8 @@
+ .B \-\-with\-pthread
+ The configure script renames the library.
+ All of the library names have a \*(``t\*('' appended to them
+-(before any \*(``w\*('' added by \fB\-\-enable\-widec\fP).
++(before any \*(``w\*('' added by
++.BR \%\-\-enable\-widec ).
+ .IP
+ The global variables such as \fBLINES\fP are replaced by macros to
+ allow read-only access.
+@@ -2244,8 +2253,8 @@
+ so
+ .IR \%ncurses 's
+ own header files can be included in any order.
+-But for portability,
+-you should include
++For portability even to old AIX systems,
++include
+ .I \%curses.h
+ before
+ .IR \%term.h .
+Index: man/tabs.1
+Prereq:  1.61 
+--- ncurses-6.5-20240831+/man/tabs.1	2024-06-22 22:15:32.000000000 +0000
++++ ncurses-6.5-20240914/man/tabs.1	2024-09-14 20:06:50.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tabs.1,v 1.61 2024/06/22 22:15:32 tom Exp $
+-.TH @TABS@ 1 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: tabs.1,v 1.63 2024/09/14 20:06:50 tom Exp $
++.TH @TABS@ 1 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -78,7 +78,7 @@
+ .PP
+ .RS 4
+ .EX
+-tabs \-8
++@TABS@ \-8
+ .EE
+ .RE
+ .PP
+@@ -128,8 +128,8 @@
+ .PP
+ .RS 4
+ .EX
+-tabs 1,6,11,16,21
+-tabs 1 6 11 16 21
++@TABS@ 1,6,11,16,21
++@TABS@ 1 6 11 16 21
+ .EE
+ .RE
+ .PP
+@@ -139,7 +139,7 @@
+ .PP
+ .RS 4
+ .EX
+-tabs 1,+5,+5,+5,+5
++@TABS@ 1,+5,+5,+5,+5
+ .EE
+ .RE
+ .PP
+@@ -229,10 +229,10 @@
+ .I @DATADIR@/tabset
+ tab stop initialization database
+ .SH PORTABILITY
+-IEEE Std 1003.1/The Open Group Base Specifications Issue 7
++IEEE Std 1003.1/The Open Group Base Specifications Issue\ 7
+ (POSIX.1-2008)
+ describes a
+-.B tabs
++.I tabs
+ utility.
+ However,
+ .bP
+@@ -247,8 +247,9 @@
+ .RB \%( smglp )
+ capabilities needed to support the feature.
+ .bP
+-There is no counterpart in X/Open Curses Issue 7 for this utility,
+-unlike \fB@TPUT@\fP(1).
++Unlike \fB@TPUT@\fP(1),
++.I tabs
++has no specification in X/Open Curses Issue\ 7.
+ .PP
+ The
+ .B \-d
+@@ -259,7 +260,7 @@
+ extensions not provided by other implementations.
+ .SH HISTORY
+ A
+-.B tabs
++.I tabs
+ utility appeared in PWB/Unix 1.0 (1977).
+ .\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=PWB1/sys/source/s2/\
+ .\"   tabs.c
+@@ -270,7 +271,7 @@
+ .\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/src/cmd/\
+ .\"   tabs.c
+ (later the same year);
+-it supported a \*(``\-n\*('' option to set the first tab stop at the
++it supported an option \*(``\-n\*('' to set the first tab stop at the
+ left margin.
+ That option is not specified by POSIX.
+ .PP
+@@ -289,9 +290,9 @@
+ but retained the tables to support the printers.
+ By this time,
+ System\ V
+-.B tput
++.I tput
+ had incorporated the tab stop initialization feature of BSD's
+-.B tset
++.I tset
+ from 1982,
+ but employed the
+ .I \%term\%info
+@@ -308,20 +309,21 @@
+ \*(``and optionally adjusts the margin\*('' remains,
+ overlooked in the removal.
+ The
+-.B tabs
++.I tabs
+ utility documented in Issues 6 and later has no mechanism for setting
+ margins.
+ The
+ .B +m
+ option in
+ .I \%ncurses
+-\fB\%@TABS@\fP differs from the SVr4 feature by using terminal
++.I tabs
++(\fB\%@TABS@\fP) differs from the SVr4 feature by using terminal
+ capabilities rather than built-in tables.
+ .PP
+ POSIX documents no limit on the number of tab stops.
+ Other implementations impose one;
+ the limit is 20 in PWB/Unix's
+-.B tabs
++.I tabs
+ utility.
+ While some terminals may not accept an arbitrary number of tab stops,
+ .I \%ncurses
+@@ -329,13 +331,13 @@
+ list thereof is sufficiently long.
+ .PP
+ The \*(``Rationale\*('' section of the Issue 6
+-.B tabs
++.I tabs
+ reference page
+ .\" https://pubs.opengroup.org/onlinepubs/009604499/utilities/tabs.html
+ details how the committee considered redesigning the
+-.B tabs
++.I tabs
+ and
+-.B tput
++.I tput
+ utilities,
+ without settling on an improved solution.
+ It claims that
+Index: man/terminfo.tail
+Prereq:  1.151 
+--- ncurses-6.5-20240831+/man/terminfo.tail	2024-06-22 21:25:23.000000000 +0000
++++ ncurses-6.5-20240914/man/terminfo.tail	2024-09-14 00:43:08.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: terminfo.tail,v 1.151 2024/06/22 21:25:23 tom Exp $
++.\" $Id: terminfo.tail,v 1.152 2024/09/14 00:43:08 Branden.Robinson Exp $
+ .ps +1
+ .SS "User-Defined Capabilities"
+ .
+@@ -2059,7 +2059,7 @@
+ signed 16-bit values.
+ This includes the \fIno_color_video\fP (\fBncv\fP) capability.
+ The 32768 mask value used for italics with \fBncv\fP can be confused with
+-an absent or cancelled \fBncv\fP.
++an absent or canceled \fBncv\fP.
+ If italics should work with colors,
+ then the \fBncv\fP value must be specified, even if it is zero.
+ .PP
+Index: man/tic.1m
+Prereq:  1.111 
+--- ncurses-6.5-20240831+/man/tic.1m	2024-05-11 20:39:53.000000000 +0000
++++ ncurses-6.5-20240914/man/tic.1m	2024-09-14 20:06:50.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tic.1m,v 1.111 2024/05/11 20:39:53 tom Exp $
+-.TH @TIC@ 1M 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: tic.1m,v 1.113 2024/09/14 20:06:50 tom Exp $
++.TH @TIC@ 1M 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -547,7 +547,7 @@
+ It accepted a single option: \fB\-v\fP (optionally followed by a number).
+ According to Ross Ridge's comment in \fImytinfo\fP,
+ this version of \fBtic\fP was
+-unable to represent cancelled capabilities.
++unable to represent canceled capabilities.
+ .PP
+ System V Release 3 provided a different \fBtic\fP utility,
+ written by Pavel Curtis,
+Index: man/tput.1
+Prereq:  1.118 
+--- ncurses-6.5-20240831+/man/tput.1	2024-06-22 21:28:35.000000000 +0000
++++ ncurses-6.5-20240914/man/tput.1	2024-09-14 20:06:50.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tput.1,v 1.118 2024/06/22 21:28:35 tom Exp $
+-.TH @TPUT@ 1 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: tput.1,v 1.120 2024/09/14 20:06:50 tom Exp $
++.TH @TPUT@ 1 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -730,7 +730,7 @@
+ database.
+ That likely is a documentation error,
+ mistaking the \*(``\-1\*('' written to the standard output to indicate
+-an absent or cancelled numeric capability for an (unsigned) exit status.
++an absent or canceled numeric capability for an (unsigned) exit status.
+ .PP
+ The various System\ V implementations
+ (AIX,
+Index: misc/ncurses-config.in
+Prereq:  1.54 
+--- ncurses-6.5-20240831+/misc/ncurses-config.in	2024-07-13 20:00:52.000000000 +0000
++++ ncurses-6.5-20240914/misc/ncurses-config.in	2024-09-14 22:16:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ #!@SHELL@
+-# $Id: ncurses-config.in,v 1.54 2024/07/13 20:00:52 tom Exp $
++# $Id: ncurses-config.in,v 1.55 2024/09/14 22:16:56 tom Exp $
+ ##############################################################################
+ # Copyright 2018-2022,2024 Thomas E. Dickey                                  #
+ # Copyright 2006-2015,2017 Free Software Foundation, Inc.                    #
+@@ -208,7 +208,7 @@
+ 		for opt in $CFLAGS
+ 		do
+ 			case "x$opt" in
+-			x-[OW]*)
++			x-[fgOW]*)
+ 				opt=
+ 				;;
+ 			esac
+@@ -244,7 +244,7 @@
+ 		for opt in $CFLAGS
+ 		do
+ 			case "x$opt" in
+-			x-[I]*|x-[OW]*)
++			x-[I]*|x-[fgOW]*)
+ 				opt=
+ 				;;
+ 			esac
+Index: misc/terminfo.src
+--- ncurses-6.5-20240831+/misc/terminfo.src	2024-08-17 22:45:40.000000000 +0000
++++ ncurses-6.5-20240914/misc/terminfo.src	2024-09-07 16:23:31.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.1149 $
+-#	$Date: 2024/08/17 22:45:40 $
++#	$Revision: 1.1150 $
++#	$Date: 2024/09/07 16:23: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
+@@ -3683,7 +3683,8 @@
+ # features.
+ #
+ # iTerm2 3.5.0 comes with a 4-year-old copy of xterm's terminfo (June 2020),
+-# which is modified:
++# which is modified, using the ncurses TERMINFO_DIRS variable to substitute
++# this locally:
+ # + xterm-nrc and xterm+pcfN are removed
+ # + the developer made changes to adapt it to the 16-year-old version of
+ #   ncurses bundled with MacOS, i.e., changing the mouse protocol to the
+@@ -7985,10 +7986,10 @@
+ # Testing AppImage for 3.2.0, on Fedora 40:
+ # + appears to implement erase-display by painting a double-line on the screen,
+ #   doesn't use full screen for ded though it sort-of works for vi.
+-# + sets TERMINFO in its shell, and TERM=domterm-xterm which doesn't work when
+-#   doing sudo.  According to the git log, that was April 1, 2023.  The VTE
+-#   developers copied this feature (i.e., a partially workable private terminal
+-#   database) in February 2024.
++# + sets TERMINFO in its shell (imitating iTerm2), and TERM=domterm-xterm which
++#   doesn't work when doing sudo.  According to the git log, that was April 1,
++#   2023.  The VTE developers copied the feature (i.e., a partially workable
++#   private terminal database) in February 2024.
+ # + the canonical name for the terminal description is still "domterm", and
+ #   presumably the "domterm-xterm" alias is a workaround for hardcoded scripts
+ #   that look for "xterm".
+@@ -27640,4 +27641,7 @@
+ #	+ review/update foot for 1.18.1 -TD
+ #	+ add a note about DomTerm 3.2.0 -TD
+ #
++# 2024-09-07
++#	+ update comments -TD
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: ncurses/tinfo/lib_tputs.c
+Prereq:  1.111 
+--- ncurses-6.5-20240831+/ncurses/tinfo/lib_tputs.c	2023-09-16 16:05:15.000000000 +0000
++++ ncurses-6.5-20240914/ncurses/tinfo/lib_tputs.c	2024-09-14 23:11:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -52,7 +52,7 @@
+ #include 		/* ospeed */
+ #include 
+ 
+-MODULE_ID("$Id: lib_tputs.c,v 1.111 2023/09/16 16:05:15 tom Exp $")
++MODULE_ID("$Id: lib_tputs.c,v 1.113 2024/09/14 23:11:32 tom Exp $")
+ 
+ NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
+ NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */
+@@ -150,12 +150,14 @@
+ 		}
+ 	    }
+ 	} else if (SP_PARM->out_buffer == 0) {
+-	    TR(TRACE_CHARPUT, ("flushing stdout"));
++	    TR(TRACE_CHARPUT, ("flushing stdout/stderr"));
+ 	    fflush(stdout);
++	    fflush(stderr);
+ 	}
+     } else {
+-	TR(TRACE_CHARPUT, ("flushing stdout"));
++	TR(TRACE_CHARPUT, ("flushing stdout/stderr"));
+ 	fflush(stdout);
++	fflush(stderr);
+     }
+     if (SP_PARM != 0)
+ 	SP_PARM->out_inuse = 0;
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20240831+/package/debian-mingw/changelog	2024-08-31 09:52:35.000000000 +0000
++++ ncurses-6.5-20240914/package/debian-mingw/changelog	2024-09-13 23:30:09.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240831) unstable; urgency=low
++ncurses6td (6.5+20240914) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 31 Aug 2024 05:52:35 -0400
++ -- Thomas E. Dickey   Fri, 13 Sep 2024 19:30:09 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20240831+/package/debian-mingw64/changelog	2024-08-31 09:52:35.000000000 +0000
++++ ncurses-6.5-20240914/package/debian-mingw64/changelog	2024-09-13 23:30:09.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240831) unstable; urgency=low
++ncurses6td (6.5+20240914) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 31 Aug 2024 05:52:35 -0400
++ -- Thomas E. Dickey   Fri, 13 Sep 2024 19:30:09 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20240831+/package/debian/changelog	2024-08-31 09:52:35.000000000 +0000
++++ ncurses-6.5-20240914/package/debian/changelog	2024-09-13 23:30:09.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240831) unstable; urgency=low
++ncurses6td (6.5+20240914) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 31 Aug 2024 05:52:35 -0400
++ -- Thomas E. Dickey   Fri, 13 Sep 2024 19:30:09 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.664 
+--- ncurses-6.5-20240831+/package/mingw-ncurses.nsi	2024-08-31 09:52:35.000000000 +0000
++++ ncurses-6.5-20240914/package/mingw-ncurses.nsi	2024-09-13 23:30:09.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.664 2024/08/31 09:52:35 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.666 2024/09/13 23:30:09 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "0831"
++!define VERSION_MMDD  "0914"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20240831+/package/mingw-ncurses.spec	2024-08-31 09:52:35.000000000 +0000
++++ ncurses-6.5-20240914/package/mingw-ncurses.spec	2024-09-13 23:30:09.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20240831
++Release: 20240914
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20240831+/package/ncurses.spec	2024-08-31 09:52:35.000000000 +0000
++++ ncurses-6.5-20240914/package/ncurses.spec	2024-09-13 23:30:09.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20240831
++Release: 20240914
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20240831+/package/ncursest.spec	2024-08-31 09:52:35.000000000 +0000
++++ ncurses-6.5-20240914/package/ncursest.spec	2024-09-13 23:30:09.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20240831
++Release: 20240914
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/packages/ncurses/6.5/ncurses-6.5-20240922.patch b/packages/ncurses/6.5/ncurses-6.5-20240922.patch
new file mode 100644
index 0000000000..14aa07cf59
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20240922.patch
@@ -0,0 +1,4189 @@
+# ncurses 6.5 - patch 20240922 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20240922.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Sep 22 23:25:11 UTC 2024
+# ------------------------------------------------------------------------------
+# NEWS                                |   16 +
+# VERSION                             |    2 
+# dist.mk                             |    4 
+# doc/html/man/curs_addch.3x.html     |  133 +++++------
+# doc/html/man/curs_attr.3x.html      |   14 -
+# doc/html/man/curs_bkgd.3x.html      |   89 +++----
+# doc/html/man/curs_bkgrnd.3x.html    |   71 +++--
+# doc/html/man/curs_delch.3x.html     |   16 -
+# doc/html/man/curs_deleteln.3x.html  |   31 +-
+# doc/html/man/curs_initscr.3x.html   |  166 +++++++------
+# doc/html/man/curs_inopts.3x.html    |   10 
+# doc/html/man/curs_kernel.3x.html    |   12 -
+# doc/html/man/curs_move.3x.html      |   10 
+# doc/html/man/curs_scr_dump.3x.html  |   25 +-
+# doc/html/man/curs_scroll.3x.html    |   22 -
+# doc/html/man/curs_termcap.3x.html   |   75 +++---
+# doc/html/man/curs_util.3x.html      |   12 -
+# doc/html/man/curs_variables.3x.html |   10 
+# doc/html/man/infocmp.1m.html        |   57 ++--
+# doc/html/man/ncurses.3x.html        |   36 +--
+# doc/html/man/tabs.1.html            |   20 -
+# doc/html/man/terminfo.5.html        |    4 
+# doc/html/man/wresize.3x.html        |   33 +-
+# man/curs_addch.3x                   |    9 
+# man/curs_attr.3x                    |    6 
+# man/curs_bkgd.3x                    |   53 ++--
+# man/curs_bkgrnd.3x                  |   50 ++--
+# man/curs_delch.3x                   |    6 
+# man/curs_deleteln.3x                |   15 -
+# man/curs_initscr.3x                 |  406 +++++++++++++++++++++++-----------
+# man/curs_inopts.3x                  |    6 
+# man/curs_kernel.3x                  |    8 
+# man/curs_move.3x                    |   10 
+# man/curs_scr_dump.3x                |   22 +
+# man/curs_scroll.3x                  |    8 
+# man/curs_termcap.3x                 |   15 -
+# man/curs_util.3x                    |    6 
+# man/curs_variables.3x               |    6 
+# man/infocmp.1m                      |   89 ++++---
+# man/ncurses.3x                      |   20 -
+# man/tabs.1                          |   21 -
+# man/terminfo.tail                   |    6 
+# man/wresize.3x                      |   11 
+# misc/ncurses-config.in              |   25 --
+# ncurses/base/MKlib_gen.sh           |   50 +++-
+# ncurses/base/lib_refresh.c          |    8 
+# ncurses/base/lib_screen.c           |   31 +-
+# ncurses/base/resizeterm.c           |   15 -
+# ncurses/tinfo/access.c              |   39 +++
+# ncurses/wcwidth.h                   |    3 
+# 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/back_ground.c                  |   26 +-
+# test/background.c                   |   38 ++-
+# 59 files changed, 1126 insertions(+), 772 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4175 
+--- ncurses-6.5-20240914+/NEWS	2024-09-14 23:14:09.000000000 +0000
++++ ncurses-6.5-20240922/NEWS	2024-09-22 20:50:07.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4175 2024/09/14 23:14:09 tom Exp $
++-- $Id: NEWS,v 1.4182 2024/09/22 20:50:07 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,20 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20240922
++	+ add a few null-pointer checks in ncurses
++	+ improve test-driver in ncurses/link_test.c
++	+ restore background character in manpages as described in X/Open
++	  Curses section 3.3.6, and add option "-c" to test programs to
++	  illustrate a non-blank character in the window background property.
++	+ improve formatting/style of manpages (patches by Branden Robinson).
++	+ modify ncurses*-config to add -I option in --cflag where needed for
++	  --disable-overwrite to match ".pc" files.
++	+ disallow directories and block/character devices in safe-open.
++	+ amend scr_restore() and scr_init() to remove the target window only
++	  after validating the source window which will replace the target
++	  (report by Zixi Liu).
++
+ 20240914
+ 	+ modify _nc_flush() to also flush stderr to help the flash capability
+ 	  to work in bash (patch by Harm te Hennepe, cf: 20201128)
+Index: VERSION
+--- ncurses-6.5-20240914+/VERSION	2024-09-14 12:14:00.000000000 +0000
++++ ncurses-6.5-20240922/VERSION	2024-09-22 18:38:38.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20240914
++5:0:10	6.5	20240922
+Index: dist.mk
+Prereq:  1.1631 
+--- ncurses-6.5-20240914+/dist.mk	2024-09-14 12:14:00.000000000 +0000
++++ ncurses-6.5-20240922/dist.mk	2024-09-22 18:38:38.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1631 2024/09/14 12:14:00 tom Exp $
++# $Id: dist.mk,v 1.1633 2024/09/22 18:38: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 = 5
+-NCURSES_PATCH = 20240914
++NCURSES_PATCH = 20240922
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/curs_addch.3x.html
+--- ncurses-6.5-20240914+/doc/html/man/curs_addch.3x.html	2024-07-27 23:11:31.000000000 +0000
++++ ncurses-6.5-20240922/doc/html/man/curs_addch.3x.html	2024-09-21 18:35:26.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addch.3x,v 1.98 2024/07/27 20:08:58 tom Exp @
++  * @Id: curs_addch.3x,v 1.100 2024/09/21 18:03:23 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addch 3x 2024-07-27 ncurses 6.5 Library calls
++curs_addch 3x 2024-09-21 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                        curs_addch 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                                        
++
                                                                                                                                                        curs_addch 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                        
+ 
                                                                                                                                                        + curs_addch(3x)                   Library calls                  curs_addch(3x)
+ 
+@@ -110,22 +110,23 @@
+ 
+ 
                                                                                                                                                        wechochar
                                                                                                                                                        +        echochar and wechochar are equivalent to calling (w)addch  followed  by
+-       (w)refresh.   curses  interprets  these functions as a hint that only a
+-       single  character  is  being  output;  for  non-control  characters,  a
+-       considerable performance gain may be enjoyed by employing them.
++       (w)refresh.   curses  interprets  these  functions  as  a  hint  to its
++       optimizer that only a single character cell  in  the  window  is  being
++       altered  between  refreshes; for non-control characters, a considerable
++       performance gain may be enjoyed by employing them.
+ 
+ 
+ 
                                                                                                                                                        Forms-Drawing Characters
                                                                                                                                                        +-       curses  defines  macros starting with ACS_ that can be used with waddch
+-       to write line-drawing and  other  special  characters  to  the  screen.
+-       ncurses  terms  these forms-drawing characters.  The ACS default listed
+-       below is used if the acs_chars  (acsc)  terminfo  capability  does  not
+-       define  a  terminal-specific replacement for it, or if the terminal and
+-       locale configuration requires Unicode to access  these  characters  but
++       curses defines macros starting with ACS_ that can be used  with  waddch
++       to  write  line-drawing  and  other  special  characters to the screen.
++       ncurses terms these forms-drawing characters.  The ACS  default  listed
++       below  is  used  if  the  acs_chars (acsc) terminfo capability does not
++       define a terminal-specific replacement for it, or if the  terminal  and
++       locale  configuration  requires  Unicode to access these characters but
+        the  library  is  unable  to  use  Unicode.   The  "acsc  char"  column
+        corresponds to how the characters are specified in the acs_chars (acsc)
+        string capability, and the characters in it may appear on the screen if
+-       the terminal type's database entry incorrectly advertises ACS  support.
++       the  terminal type's database entry incorrectly advertises ACS support.
+        The name "ACS" originates in the Alternate Character Set feature of the
+        DEC VT100 terminal.
+ 
+@@ -173,24 +174,24 @@
+ 
+        o   win is NULL,
+ 
+-       o   wrapping to a new line is impossible because scrollok(3x)  has  not
+-           been  called  on  win  when a write to its bottom right location is
++       o   wrapping  to  a new line is impossible because scrollok(3x) has not
++           been called on win when a write to its  bottom  right  location  is
+            attempted, or
+ 
+-       o   it is not possible to  add  a  complete  character  at  the  cursor
++       o   it  is  not  possible  to  add  a  complete character at the cursor
+            position.
+ 
+        The last may be due to different causes:
+ 
+-       o   conversion  of  a  wide character to a multibyte character sequence
++       o   conversion of a wide character to a  multibyte  character  sequence
+            can fail, or
+ 
+-       o   at least one of the bytes resulting from wide character  conversion
+-           to  a  multibyte  character sequence cannot be added to the window.
+-           See section "PORTABILITY" below regarding the use  of  waddch  with
++       o   at  least one of the bytes resulting from wide character conversion
++           to a multibyte character sequence cannot be added  to  the  window.
++           See  section  "PORTABILITY"  below regarding the use of waddch with
+            wide characters.
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
++       Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+@@ -201,7 +202,7 @@
+ 
                                                                                                                                                        EXTENSIONS
                                                                                                                                                        + 
+ 
                                                                                                                                                        TABSIZE
                                                                                                                                                        +-       SVr4 and other versions of curses implement the TABSIZE  variable,  but
++       SVr4  and  other versions of curses implement the TABSIZE variable, but
+        X/Open Curses does not specify it; see curs_variables(3x).
+ 
+ 
+@@ -209,90 +210,90 @@
+        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
++       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+        error conditions for them.
+ 
+-       SVr4  curses  describes  a  successful return value only as "an integer
++       SVr4 curses describes a successful return value  only  as  "an  integer
+        value other than ERR".
+ 
+-       The defaults specified for forms-drawing characters apply in the  POSIX
++       The  defaults specified for forms-drawing characters apply in the POSIX
+        locale.
+ 
+ 
+ 
                                                                                                                                                        ACS Symbols
                                                                                                                                                        +-       X/Open  Curses  states  that  the  ACS_ definitions are char constants.
++       X/Open Curses states that the  ACS_  definitions  are  char  constants.
+        Some implementations are problematic.
+ 
+-       o   Solaris curses, for example, defines the ACS symbols as  constants;
++       o   Solaris  curses, for example, defines the ACS symbols as constants;
+            others define them as elements of an array.
+ 
+-           This  implementation  uses  an  array, acs_map, as did SVr4 curses.
++           This implementation uses an array, acs_map,  as  did  SVr4  curses.
+            NetBSD also uses an array, actually named _acs_char, with a #define
+            for compatibility.
+ 
+-       o   HP-UX  curses  equates  some  of  the ACS_ symbols to the analogous
+-           WACS_ symbols as if the ACS_  symbols  were  wide  characters  (see
+-           curs_add_wch(3x)).   The  misdefined  symbols  are  the  arrows and
++       o   HP-UX curses equates some of the  ACS_  symbols  to  the  analogous
++           WACS_  symbols  as  if  the  ACS_ symbols were wide characters (see
++           curs_add_wch(3x)).  The  misdefined  symbols  are  the  arrows  and
+            others that are not used for line drawing.
+ 
+-       o   X/Open Curses (Issues 2 through 7) has a  typographical  error  for
+-           the  ACS_LANTERN  symbol,  equating  its  "VT100+ Character" to "I"
+-           (capital I), while the header  files  for  SVr4  curses  and  other
++       o   X/Open  Curses  (Issues  2 through 7) has a typographical error for
++           the ACS_LANTERN symbol, equating  its  "VT100+  Character"  to  "I"
++           (capital  I),  while  the  header  files  for SVr4 curses and other
+            implementations use "i" (small i).
+ 
+-           None  of  the terminal descriptions on Unix platforms use uppercase
+-           I, except  for  Solaris  (in  its  terminfo  entry  for  screen(1),
+-           apparently  based on the X/Open documentation around 1995).  On the
+-           other hand, its gs6300 (AT&T PC6300 with EMOTS  Terminal  Emulator)
++           None of the terminal descriptions on Unix platforms  use  uppercase
++           I,  except  for  Solaris  (in  its  terminfo  entry  for screen(1),
++           apparently based on the X/Open documentation around 1995).  On  the
++           other  hand,  its gs6300 (AT&T PC6300 with EMOTS Terminal Emulator)
+            description uses lowercase i.
+ 
+-       Some  ACS  symbols  (ACS_S3,  ACS_S7,  ACS_LEQUAL,  ACS_GEQUAL, ACS_PI,
+-       ACS_NEQUAL, and ACS_STERLING)  were  not  documented  in  any  publicly
+-       released  System V.   However, many publicly available terminfo entries
+-       include acsc capabilities in which their key characters  (pryz{|})  are
+-       embedded,  and  a  second-hand list of their character descriptions has
+-       come to light.  The ncurses developers invented ACS-prefixed names  for
++       Some ACS  symbols  (ACS_S3,  ACS_S7,  ACS_LEQUAL,  ACS_GEQUAL,  ACS_PI,
++       ACS_NEQUAL,  and  ACS_STERLING)  were  not  documented  in any publicly
++       released System V.  However, many publicly available  terminfo  entries
++       include  acsc  capabilities in which their key characters (pryz{|}) are
++       embedded, and a second-hand list of their  character  descriptions  has
++       come  to light.  The ncurses developers invented ACS-prefixed names for
+        them.
+ 
+        The displayed values of ACS_ constants depend on
+ 
+        o   the  ncurses  ABI--for  example,  wide-character  versus  non-wide-
+-           character configurations  (the  former  is  capable  of  displaying
++           character  configurations  (the  former  is  capable  of displaying
+            Unicode while the latter is not), and
+ 
+        o   whether the locale uses UTF-8 encoding.
+ 
+-       In  certain  cases,  the  terminal  is  unable to display forms-drawing
+-       characters  except  by  using  UTF-8;  see  the   discussion   of   the
++       In certain cases, the  terminal  is  unable  to  display  forms-drawing
++       characters   except   by   using  UTF-8;  see  the  discussion  of  the
+        NCURSES_NO_UTF8_ACS environment variable in ncurses(3x).
+ 
+ 
+ 
                                                                                                                                                        Character Set
                                                                                                                                                        +-       X/Open  Curses  assumes  that the parameter passed to waddch contains a
+-       single character.  That character may have been more  than  eight  bits
+-       wide  in  an  SVr3 or SVr4 implementation, but X/Open Curses leaves the
+-       width of a non-wide character code unspecified.  The  standard  further
+-       does  not specify the internal structure of a chtype, though the use of
+-       bit operations to combine the character  code  with  attributes  and  a
++       X/Open Curses assumes that the parameter passed to  waddch  contains  a
++       single  character.   That  character may have been more than eight bits
++       wide in an SVr3 or SVr4 implementation, but X/Open  Curses  leaves  the
++       width  of  a non-wide character code unspecified.  The standard further
++       does not specify the internal structure of a chtype, though the use  of
++       bit  operations  to  combine  the  character code with attributes and a
+        color pair identifier into a chtype for passage to waddch is common.  A
+        portable application uses only the macros discussed in curs_attr(3x) to
+        manipulate a chtype.
+ 
+        In ncurses, chtype holds an eight-bit character, but the library allows
+-       a multibyte character sequence to be passed via a succession  of  calls
+-       to  waddch.   Other  implementations  do  not;  a waddch call transmits
+-       exactly one character, which may be rendered  in  one  or  more  screen
+-       locations  depending  on  whether  it  is  printable  (see unctrl(3x)).
+-       Depending on the locale, ncurses  inspects  the  byte  passed  in  each
+-       waddch  call  and  checks whether the latest call continues a multibyte
+-       character.   When  a  character  is  complete,  ncurses  displays   the
+-       character   and  advances  the  cursor.   If  the  calling  application
++       a  multibyte  character sequence to be passed via a succession of calls
++       to waddch.  Other implementations  do  not;  a  waddch  call  transmits
++       exactly  one  character,  which  may  be rendered in one or more screen
++       locations depending  on  whether  it  is  printable  (see  unctrl(3x)).
++       Depending  on  the  locale,  ncurses  inspects  the byte passed in each
++       waddch call and checks whether the latest call  continues  a  multibyte
++       character.    When  a  character  is  complete,  ncurses  displays  the
++       character  and  advances  the  cursor.   If  the  calling   application
+        interrupts the succession of bytes in a multibyte character sequence by
+-       changing  the  current  location--for  example, with wmove(3x)--ncurses
++       changing the current  location--for  example,  with  wmove(3x)--ncurses
+        discards the incomplete character.
+ 
+        For  portability  to  other  implementations,  do  not  rely  upon  the
+-       foregoing  behavior.  Check whether a character can be represented as a
++       foregoing behavior.  Check whether a character can be represented as  a
+        single byte in the current locale.
+ 
+        o   If it can, call either waddch or wadd_wch.
+@@ -307,16 +308,16 @@
+ 
+ 
+ 
                                                                                                                                                        SEE ALSO
                                                                                                                                                        +-       curs_add_wch(3x) describes comparable functions of the ncurses  library
++       curs_add_wch(3x)  describes comparable functions of the ncurses library
+        in its wide-character configuration (ncursesw).
+ 
+        curses(3x),    curs_addchstr(3x),    curs_addstr(3x),    curs_attr(3x),
+-       curs_clear(3x),  curs_inch(3x),   curs_outopts(3x),   curs_refresh(3x),
++       curs_clear(3x),   curs_inch(3x),   curs_outopts(3x),  curs_refresh(3x),
+        curs_variables(3x), putchar(3)
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                    curs_addch(3x)
++ncurses 6.5                       2024-09-21                    curs_addch(3x)
+ 
                                                                                                                                                        
+ 
                                                                                                                                                        
+ 
                                                                                                                                                          
+Index: doc/html/man/curs_attr.3x.html
+--- ncurses-6.5-20240914+/doc/html/man/curs_attr.3x.html	2024-07-27 23:11:31.000000000 +0000
++++ ncurses-6.5-20240922/doc/html/man/curs_attr.3x.html	2024-09-22 18:37:10.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_attr.3x,v 1.110 2024/07/27 19:57:55 tom Exp @
++  * @Id: curs_attr.3x,v 1.113 2024/09/21 23:39:04 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_attr 3x 2024-07-27 ncurses 6.5 Library calls
++curs_attr 3x 2024-09-21 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                          curs_attr 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                                          
++
                                                                                                                                                          curs_attr 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                          
+ 
                                                                                                                                                          + curs_attr(3x)                    Library calls                   curs_attr(3x)
+ 
+@@ -406,9 +406,9 @@
+        o   pads, soft-keys were added in SVr3, and
+ 
+        Goodheart did not mention the background character or the cchar_t type.
+-       Those are respectively SVr4 and X/Open features.  He did mention the A_
+-       constants, but did not indicate their values.  Those were not the  same
+-       in different systems, even for those marked as System V.
++       Those  are respectively SVr3.1 and X/Open features.  He did mention the
++       A_ constants, but did not indicate their values.  Those  were  not  the
++       same in different systems, even for those marked as System V.
+ 
+        Different  Unix  systems  used  different  sizes  for the bit-fields in
+        chtype for characters and colors, and took into account  the  different
+@@ -497,7 +497,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                     curs_attr(3x)
++ncurses 6.5                       2024-09-21                     curs_attr(3x)
+ 
                                                                                                                                                          
+ 
                                                                                                                                                          
+ 
                                                                                                                                                            
+Index: doc/html/man/curs_bkgd.3x.html
+--- ncurses-6.5-20240914+/doc/html/man/curs_bkgd.3x.html	2024-09-14 20:23:25.000000000 +0000
++++ ncurses-6.5-20240922/doc/html/man/curs_bkgd.3x.html	2024-09-22 18:37:10.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_bkgd.3x,v 1.63 2024/09/14 20:06:50 tom Exp @
++  * @Id: curs_bkgd.3x,v 1.64 2024/09/22 18:16:03 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_bkgd 3x 2024-09-14 ncurses 6.5 Library calls
++curs_bkgd 3x 2024-09-22 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                            curs_bkgd 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                                            
++
                                                                                                                                                            curs_bkgd 3x 2024-09-22 ncurses 6.5 Library calls
                                                                                                                                                            
+ 
                                                                                                                                                            + curs_bkgd(3x)                    Library calls                   curs_bkgd(3x)
+ 
+@@ -64,20 +64,24 @@
+ 
+ 
+ 
                                                                                                                                                            DESCRIPTION
                                                                                                                                                            +-       The  background  of  a  curses  window  (in  the   library's   non-wide
+-       configuration)   is  a  chtype  combining  a  set  of  attributes  (see
+-       curs_attr(3x)) with a character called the blank character.
+-
+-       The blank character is a spacing character that  populates  a  window's
+-       character  cells  when  their  contents are erased without replacement.
+-       The background's attributes are combined with all non-blank  characters
+-       written  to  the window, as with the waddch(3x) and winsch(3x) families
+-       of functions.
+-
+-       The blank character and  attributes  of  the  background  combine  with
+-       characters  written  to  the window as described below.  The background
+-       becomes a property of the character  and  moves  with  it  through  any
+-       scrolling and insert/delete line/character operations.
++       Every curses window has a background property.  In the  library's  non-
++       wide  configuration,  this property is a chtype which combines a set of
++       attributes with the  background  character  (see  curs_attr(3x)).   The
++       background character is a spacing character.
++
++       When  erasing  parts  of  the  screen,  curses fills the cells with the
++       background character.  curses also  uses  the  window  background  when
++       writing characters to the screen:
++
++       o   The attribute part of the background is combined with all non-blank
++           characters that are written into the window, as with the waddch(3x)
++           and winsch(3x) families of functions.
++
++       o   Both  the  character  and  attribute  parts  of  the background are
++           combined with blank characters that are written into the window.
++
++       The background becomes a property of the character and  moves  with  it
++       through any scrolling and insert/delete line/character operations.
+ 
+        To  the  extent possible on a given terminal, the attribute part of the
+        background is displayed as the graphic rendition of the  character  put
+@@ -101,8 +105,8 @@
+        blank.
+ 
+        o   ncurses first compares  the  cell's  character  to  the  previously
+-           specified  blank  character;  if they match, ncurses writes the new
+-           blank character to the cell.
++           specified  background  character; if they match, ncurses writes the
++           new background character to the cell.
+ 
+        o   ncurses then checks if the cell uses color, that is, its color pair
+            value  is  nonzero.   If not, it simply replaces the attributes and
+@@ -121,75 +125,76 @@
+            the current background, and then adding  attributes  from  the  new
+            background.
+ 
+-       ncurses  treats  a  background  character  value of zero (0) as a blank
+-       character.
++       If the new background's character is nonspacing, ncurses reuses the old
++       background character, except for one special  case:  ncurses  treats  a
++       background character value of zero (0) as a space.
+ 
+-       If the terminal does not support  color,  or  if  color  has  not  been
+-       initialized  with  start_color(3x),  ncurses ignores the new background
++       If  the  terminal  does  not  support  color,  or if color has not been
++       initialized with start_color(3x), ncurses ignores  the  new  background
+        character's color attribute.
+ 
+ 
+ 
                                                                                                                                                            bkgdset, wbkgdset
                                                                                                                                                            +-       bkgdset and  wbkgdset  manipulate  the  background  of  the  applicable
++       bkgdset  and  wbkgdset  manipulate  the  background  of  the applicable
+        window, without updating the character cells as bkgd and wbkgd do; only
+        future writes reflect the updated background.
+ 
+ 
+ 
                                                                                                                                                            getbkgd
                                                                                                                                                            +-       getbkgd obtains the given window's background character  and  attribute
++       getbkgd  obtains  the given window's background character and attribute
+        combination.
+ 
+ 
+ 
                                                                                                                                                            RETURN VALUE
                                                                                                                                                            +-       Functions  returning  an int return OK on success.  bkgd returns ERR if
+-       the library has not been initialized.  wbkgd and getbkgd return ERR  if
++       Functions returning an int return OK on success.  bkgd returns  ERR  if
++       the  library has not been initialized.  wbkgd and getbkgd return ERR if
+        a WINDOW pointer argument is null.
+ 
+        bkgdset and wbkgdset do not return a value.
+ 
+-       getbkgd   returns   a   window's  background  character  and  attribute
++       getbkgd  returns  a  window's  background   character   and   attribute
+        combination.
+ 
+ 
+ 
                                                                                                                                                            NOTES
                                                                                                                                                            +-       Unusually, there is no wgetbkgd function; getbkgd behaves as one  would
++       Unusually,  there is no wgetbkgd function; getbkgd behaves as one would
+        expect wgetbkgd to, accepting a WINDOW pointer argument.
+ 
+        bkgd and bkgdset may be implemented as macros.
+ 
+-       X/Open  Curses  mentions that the character part of the background must
+-       be a single-byte value.  ncurses, like SVr4 curses,  checks  to  ensure
++       X/Open Curses mentions that the character part of the  background  must
++       be  a  single-byte  value.  ncurses, like SVr4 curses, checks to ensure
+        that, and will reuse the old background character if the check fails.
+ 
+ 
+ 
                                                                                                                                                            PORTABILITY
                                                                                                                                                            +-       X/Open  Curses,  Issue  4 describes these functions.  It specifies that
+-       bkgd, wbkgd, and getbkgd return ERR on failure  (in  the  case  of  the
++       X/Open Curses, Issue 4 describes these functions.   It  specifies  that
++       bkgd,  wbkgd,  and  getbkgd  return  ERR on failure (in the case of the
+        last,  this  value  is  cast  to  chtype),  but  describes  no  failure
+        conditions.
+ 
+-       The SVr4.0 manual says that bkgd and wbkgd may return  OK  "or  a  non-
+-       negative  integer  if immedok is set", which refers to the return value
+-       from wrefresh(3x), used to implement the  immediate  repainting.   SVr4
+-       curses's  wrefresh  returns  the  number  of  characters written to the
++       The  SVr4.0  manual  says  that bkgd and wbkgd may return OK "or a non-
++       negative integer if immedok is set", which refers to the  return  value
++       from  wrefresh(3x),  used  to implement the immediate repainting.  SVr4
++       curses's wrefresh returns the  number  of  characters  written  to  the
+        screen during the refresh.  ncurses does not do that.
+ 
+-       Neither X/Open  Curses  nor  the  SVr4  manual  pages  detail  how  the
+-       rendition  of  characters  on  the  screen  updates  when bkgd or wbkgd
+-       changes the background character.  ncurses, like SVr4 curses, does  not
++       Neither  X/Open  Curses  nor  the  SVr4  manual  pages  detail  how the
++       rendition of characters on  the  screen  updates  when  bkgd  or  wbkgd
++       changes  the background character.  ncurses, like SVr4 curses, does not
+        (in  its  non-wide  configuration)  store  the  background  and  window
+        attribute contributions to each character cell separately.
+ 
+ 
+ 
                                                                                                                                                            SEE ALSO
                                                                                                                                                            +-       curs_bkgrnd(3x) describes  the  corresponding  functions  in  the  wide
++       curs_bkgrnd(3x)  describes  the  corresponding  functions  in  the wide
+        configuration of ncurses.
+ 
+        curses(3x), curs_addch(3x), curs_attr(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-14                     curs_bkgd(3x)
++ncurses 6.5                       2024-09-22                     curs_bkgd(3x)
+ 
                                                                                                                                                            
+ 
                                                                                                                                                            
+ 
                                                                                                                                                              
+Index: doc/html/man/curs_bkgrnd.3x.html
+--- ncurses-6.5-20240914+/doc/html/man/curs_bkgrnd.3x.html	2024-09-14 20:23:25.000000000 +0000
++++ ncurses-6.5-20240922/doc/html/man/curs_bkgrnd.3x.html	2024-09-22 18:37:10.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_bkgrnd.3x,v 1.44 2024/09/14 20:06:50 tom Exp @
++  * @Id: curs_bkgrnd.3x,v 1.46 2024/09/22 18:23:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_bkgrnd 3x 2024-09-14 ncurses 6.5 Library calls
++curs_bkgrnd 3x 2024-09-22 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                              curs_bkgrnd 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                                              
++
                                                                                                                                                              curs_bkgrnd 3x 2024-09-22 ncurses 6.5 Library calls
                                                                                                                                                              
+ 
                                                                                                                                                              + curs_bkgrnd(3x)                  Library calls                 curs_bkgrnd(3x)
+ 
+@@ -65,20 +65,24 @@
+ 
+ 
+ 
                                                                                                                                                              DESCRIPTION
                                                                                                                                                              +-       The background of a curses window (in the library's wide configuration)
+-       is a cchar_t combining a set of attributes (see curs_attr(3x)) with the
+-       window's blank character.
+-
+-       The blank character is a spacing complex  character  that  populates  a
+-       window's  character  cells  when  their  contents  are  erased  without
+-       replacement.  The background's attributes are combined  with  all  non-
+-       blank  characters  written  to the window, as with the wadd_wch(3x) and
+-       wins_wch(3x) families of functions.
+-
+-       The blank character and  attributes  of  the  background  combine  with
+-       characters  written  to  the window as described below.  The background
+-       becomes a property of the character  and  moves  with  it  through  any
+-       scrolling and insert/delete line/character operations.
++       Every curses window has a background property.  In the  library's  wide
++       configuration,  this  property  is  a  cchar_t  which combines a set of
++       attributes  with  the  background  character  (see  curs_attr(3x))  The
++       background character is a spacing character.
++
++       When  erasing  parts  of  the  screen,  curses fills the cells with the
++       background character.  curses also  uses  the  window  background  when
++       writing characters to the screen:
++
++       o   The attribute part of the background is combined with all non-blank
++           characters  that  are  written  into  the  window,  as   with   the
++           wadd_wch(3x) and wins_wch(3x) families of functions.
++
++       o   Both  the  character  and  attribute  parts  of  the background are
++           combined with blank characters that are written into the window.
++
++       The background becomes a property of the character and  moves  with  it
++       through any scrolling and insert/delete line/character operations.
+ 
+        To  the  extent possible on a given terminal, the attribute part of the
+        background is displayed as the graphic rendition of the  character  put
+@@ -102,8 +106,8 @@
+        blank.
+ 
+        o   ncurses first compares  the  cell's  character  to  the  previously
+-           specified  blank  character;  if they match, ncurses writes the new
+-           blank character to the cell.
++           specified  background  character; if they match, ncurses writes the
++           new background character to the cell.
+ 
+        o   ncurses then checks if the cell uses color, that is, its color pair
+            value  is  nonzero.   If not, it simply replaces the attributes and
+@@ -122,30 +126,31 @@
+            the current background, and then adding  attributes  from  the  new
+            background.
+ 
+-       ncurses  treats  a  background  character  value of zero (0) as a blank
+-       character.
++       If the new background's character is nonspacing, ncurses reuses the old
++       background character, except for one special  case:  ncurses  treats  a
++       background character value of zero (0) as a space.
+ 
+-       If the terminal does not support  color,  or  if  color  has  not  been
+-       initialized  with  start_color(3x),  ncurses ignores the new background
++       If  the  terminal  does  not  support  color,  or if color has not been
++       initialized with start_color(3x), ncurses ignores  the  new  background
+        character's color attribute.
+ 
+ 
+ 
                                                                                                                                                              bkgrndset, wbkgrndset
                                                                                                                                                              +-       bkgrndset and wbkgrndset manipulate the background  of  the  applicable
+-       window,  without updating the character cells as bkgrnd and wbkgrnd do;
++       bkgrndset  and  wbkgrndset  manipulate the background of the applicable
++       window, without updating the character cells as bkgrnd and wbkgrnd  do;
+        only future writes reflect the updated background.
+ 
+ 
+ 
                                                                                                                                                              getbkgrnd, wgetbkgrnd
                                                                                                                                                              +-       The getbkgrnd and wgetbkgrnd functions obtain the background  character
+-       and  attribute  pair of stdscr or the specified window and store it via
++       The  getbkgrnd and wgetbkgrnd functions obtain the background character
++       and attribute pair of stdscr or the specified window and store  it  via
+        the wch pointer.
+ 
+ 
+ 
                                                                                                                                                              RETURN VALUE
                                                                                                                                                              +        bkgrndset and wbkgrndset do not return a value.
+ 
+-       The other functions return ERR upon failure and OK  upon  success.   In
++       The  other  functions  return ERR upon failure and OK upon success.  In
+        ncurses, failure occurs if
+ 
+        o   a WINDOW pointer win is null, or
+@@ -156,13 +161,13 @@
+ 
                                                                                                                                                              NOTES
                                                                                                                                                              +        bkgrnd, bkgrndset, and getbkgrnd may be implemented as macros.
+ 
+-       Unlike  their  counterparts  in  the non-wide configuration of ncurses,
+-       getbkgrnd and wgetbkgrnd supply the background character and  attribute
++       Unlike their counterparts in the  non-wide  configuration  of  ncurses,
++       getbkgrnd  and wgetbkgrnd supply the background character and attribute
+        in a modifiable cchar_t parameter, not as the return value.
+ 
+ 
+ 
                                                                                                                                                              PORTABILITY
                                                                                                                                                              +-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
++       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+        error conditions for them.
+ 
+        X/Open Curses does not provide details of how the rendition is updated.
+@@ -170,14 +175,14 @@
+ 
+ 
+ 
                                                                                                                                                              SEE ALSO
                                                                                                                                                              +-       curs_bkgd(3x)  describes  the  corresponding  functions in the non-wide
++       curs_bkgd(3x) describes the corresponding  functions  in  the  non-wide
+        configuration of ncurses.
+ 
+        curses(3x), curs_add_wch(3x), curs_attr(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-14                   curs_bkgrnd(3x)
++ncurses 6.5                       2024-09-22                   curs_bkgrnd(3x)
+ 
                                                                                                                                                              
+ 
                                                                                                                                                              
+ 
                                                                                                                                                                
+Index: doc/html/man/curs_delch.3x.html
+--- ncurses-6.5-20240914+/doc/html/man/curs_delch.3x.html	2024-07-27 23:11:31.000000000 +0000
++++ ncurses-6.5-20240922/doc/html/man/curs_delch.3x.html	2024-09-22 18:37:10.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_delch.3x,v 1.37 2024/07/27 20:14:16 tom Exp @
++  * @Id: curs_delch.3x,v 1.39 2024/09/21 23:43:41 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_delch 3x 2024-07-27 ncurses 6.5 Library calls
++curs_delch 3x 2024-09-21 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                curs_delch 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                                                
++
                                                                                                                                                                curs_delch 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                                
+ 
                                                                                                                                                                + curs_delch(3x)                   Library calls                  curs_delch(3x)
+ 
+@@ -64,10 +64,10 @@
+        wdelch deletes the character at the cursor position in win.   It  moves
+        all  characters to the right of the cursor on the same line to the left
+        one position and replaces the contents of the rightmost position on the
+-       line  with  the  window's blank character; see bkgd(3x) (wide-character
+-       API users: bkgrnd(3x)).  The cursor position  does  not  change  (after
+-       moving to (y, x), if specified).  ncurses(3x) describes the variants of
+-       this function.
++       line  with  the  window's  background  character;  see  bkgd(3x) (wide-
++       character API users: bkgrnd(3x)).  The cursor position does not  change
++       (after  moving  to  (y,  x),  if specified).  ncurses(3x) describes the
++       variants of this function.
+ 
+ 
+ 
                                                                                                                                                                RETURN VALUE
                                                                                                                                                                +@@ -103,7 +103,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                    curs_delch(3x)
++ncurses 6.5                       2024-09-21                    curs_delch(3x)
+ 
                                                                                                                                                                
+ 
                                                                                                                                                                
+ 
                                                                                                                                                                  
+Index: doc/html/man/curs_deleteln.3x.html
+--- ncurses-6.5-20240914+/doc/html/man/curs_deleteln.3x.html	2024-07-27 23:11:31.000000000 +0000
++++ ncurses-6.5-20240922/doc/html/man/curs_deleteln.3x.html	2024-09-22 18:37:10.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_deleteln.3x,v 1.40 2024/07/27 20:12:02 tom Exp @
++  * @Id: curs_deleteln.3x,v 1.41 2024/09/22 18:35:00 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_deleteln 3x 2024-07-27 ncurses 6.5 Library calls
++curs_deleteln 3x 2024-09-22 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                  curs_deleteln 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                                                  
++
                                                                                                                                                                  curs_deleteln 3x 2024-09-22 ncurses 6.5 Library calls
                                                                                                                                                                  
+ 
                                                                                                                                                                  + curs_deleteln(3x)                Library calls               curs_deleteln(3x)
+ 
+@@ -67,15 +67,16 @@
+ 
                                                                                                                                                                  DESCRIPTION
                                                                                                                                                                  +        wdeleteln deletes the line at the cursor in win;  all  lines  below  it
+        move  up  one  line.  curses then fills the bottom line of win with the
+-       blank character configured by wbkgdset(3x) (wide-character  API  users:
+-       wbkgrndset(3x)).  The cursor position does not change.
++       background character configured  by  wbkgdset(3x)  (wide-character  API
++       users: wbkgrndset(3x)).  The cursor position does not change.
+ 
+-       winsertln  inserts  a  line  of  blank characters above the line at the
+-       cursor in win; the content of the window's bottom line  is  lost.   The
+-       cursor position does not change.
++       winsertln inserts a new, empty line of characters above the line at the
++       cursor in win, shifting the existing lines down by one.  The content of
++       the  window's  bottom  line is lost; curses fills the new line with the
++       background character.  The cursor position does not change.
+ 
+-       winsdelln  inserts  or  deletes  n lines  in  win  as  n is positive or
+-       negative, respectively,  as  if  by  repeatedly  calling  winsertln  or
++       winsdelln inserts or deletes  n lines  in  win  as  n  is  positive  or
++       negative,  respectively,  as  if  by  repeatedly  calling  winsertln or
+        wdeleteln.
+ 
+        ncurses(3x) describes the variants of these functions.
+@@ -90,16 +91,16 @@
+ 
                                                                                                                                                                  NOTES
                                                                                                                                                                  +        All of these functions except winsdelln may be implemented as macros.
+ 
+-       These  functions  do  not require the terminal to possess hardware line
+-       deletion or insertion capabilities.   Even  if  available,  by  default
++       These functions do not require the terminal to  possess  hardware  line
++       deletion  or  insertion  capabilities.   Even  if available, by default
+        curses does not use them; see idlok(3x).
+ 
+ 
+ 
                                                                                                                                                                  PORTABILITY
                                                                                                                                                                  +-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
++       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+        error conditions for them.
+ 
+-       SVr4 curses describes a successful return value  only  as  "an  integer
++       SVr4  curses  describes  a  successful return value only as "an integer
+        value other than ERR".
+ 
+ 
+@@ -114,7 +115,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                 curs_deleteln(3x)
++ncurses 6.5                       2024-09-22                 curs_deleteln(3x)
+ 
                                                                                                                                                                  
+ 
                                                                                                                                                                  
+ 
                                                                                                                                                                    
+Index: doc/html/man/curs_initscr.3x.html
+--- ncurses-6.5-20240914+/doc/html/man/curs_initscr.3x.html	2024-09-14 20:23:26.000000000 +0000
++++ ncurses-6.5-20240922/doc/html/man/curs_initscr.3x.html	2024-09-21 18:35:26.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_initscr.3x,v 1.77 2024/09/11 21:00:07 tom Exp @
++  * @Id: curs_initscr.3x,v 1.79 2024/09/21 17:59:36 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_initscr 3x 2024-09-11 ncurses 6.5 Library calls
++curs_initscr 3x 2024-09-21 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                    curs_initscr 3x 2024-09-11 ncurses 6.5 Library calls
                                                                                                                                                                    
++
                                                                                                                                                                    curs_initscr 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                                    
+ 
                                                                                                                                                                    + curs_initscr(3x)                 Library calls                curs_initscr(3x)
+ 
+@@ -54,127 +54,145 @@
+ 
                                                                                                                                                                    SYNOPSIS
                                                                                                                                                                    +        #include <curses.h>
+ 
+-       WINDOW *initscr(void);
++       WINDOW * initscr(void);
+        int endwin(void);
+ 
+        bool isendwin(void);
+ 
+-       SCREEN *newterm(const char *type, FILE *outf, FILE *inf);
+-       SCREEN *set_term(SCREEN *new);
+-       void delscreen(SCREEN* sp);
++       SCREEN * newterm(const char * type, FILE * outf, FILE * inf);
++       SCREEN * set_term(SCREEN * new);
++       void delscreen(SCREEN * sp);
+ 
+ 
+ 
                                                                                                                                                                    DESCRIPTION
                                                                                                                                                                    + 
+ 
                                                                                                                                                                    initscr
                                                                                                                                                                    +-       initscr is normally the first curses routine to call when  initializing
+-       a  program.   A few special routines sometimes need to be called before
+-       it; these are slk_init(3x), filter, ripoffline, use_env.  For multiple-
+-       terminal applications, newterm may be called before initscr.
+-
+-       The  initscr  code  determines  the  terminal  type and initializes all
+-       curses  data  structures.   initscr  also  causes  the  first  call  to
+-       refresh(3x)  to  clear  the screen.  If errors occur, initscr writes an
+-       appropriate error message to standard error  and  exits;  otherwise,  a
+-       pointer is returned to stdscr.
++       initscr determines the terminal  type  and  initializes  the  library's
++       SCREEN,  WINDOW,  and  other data structures.  It is normally the first
++       curses function call a program performs.  However, an application  with
++       unusual needs might employ a few other curses functions beforehand:
++
++       o   slk_init(3x) to set up soft-label keys;
++
++       o   filter(3x)  if  the  program  is  designed  to operate in a process
++           pipeline;
++
++       o   ripoffline(3x) to reserve up to five lines at the top and/or bottom
++           of  the  screen  from  management  by  stdscr,  the standard curses
++           window; and
++
++       o   use_env(3x) and/or use_tioctl(3x) to configure use of  the  process
++           environment  and  operating system's terminal driver, respectively,
++           when determining the dimensions of the terminal display.
++
++       Further, a curses program might call newterm prior  to  or  instead  of
++       initscr in two specialized cases described in its subsection below.
++
++       initscr  causes  the  first  refresh(3x)  call to clear the screen.  If
++       errors occur, initscr writes an appropriate diagnostic message  to  the
++       standard  error  stream  and  exits; otherwise, it returns a pointer to
++       stdscr.
+ 
+ 
+ 
                                                                                                                                                                    newterm
                                                                                                                                                                    +-       A program that outputs to more than one terminal should use the newterm
+-       routine for each terminal instead of initscr.  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 newterm.
++       An application that manages multiple terminals should call newterm once
++       for each such device instead of initscr.  newterm's arguments are
+ 
+-       The  routine  newterm  should  be  called  once  for each terminal.  It
+-       returns a variable of  type  SCREEN  *  which  should  be  saved  as  a
+-       reference to that terminal.  newterm's arguments are
++       o   the  type  of  the  associated  terminal,  or  NULL to use the TERM
++           environment variable;
+ 
+-       o   the type of the terminal to be used in place of $TERM,
++       o   an output stream outf connected to the terminal; and
+ 
+-       o   an output stream connected to the terminal, and
+-
+-       o   an input stream connected to the terminal
+-
+-       If the type parameter is NULL, $TERM will be used.
+-
+-       The  file  descriptor  of the output stream is passed to setupterm(3x),
+-       which returns a pointer to  a  TERMINAL  structure.   newterm's  return
+-       value holds a pointer to the TERMINAL structure.
++       o   an input stream inf  connected  to  the  terminal.   It  returns  a
++           variable  of  structure  type  SCREEN  *, which should be saved for
++           later use with set_term and delscreen.
++
++       newterm passes the file descriptor of the output stream to the terminfo
++       function setupterm(3x), which returns a pointer to a TERMINAL structure
++       that newterm stores in the SCREEN it returns to the application.
++
++       An application that needs to inspect a terminal type's capabilities, so
++       that  it  can  continue  to run in a line-oriented mode if the terminal
++       cannot support a screen-oriented program, would also use  newterm.   If
++       at most one terminal connection is needed, the programmer could perform
++       such a capability test, decide which mode in  which  to  operate,  then
++       call  delscreen  on  the  pointer returned by newterm, and proceed with
++       either initscr or a non-curses interface.
+ 
+ 
+ 
                                                                                                                                                                    endwin
                                                                                                                                                                    +-       The  program  must also call endwin for each terminal being used before
+-       exiting from curses.  If newterm is called more than once for the  same
++       The program must also call endwin for each terminal being  used  before
++       exiting  from curses.  If newterm is called more than once for the same
+        terminal, the first terminal referred to must be the last one for which
+        endwin is called.
+ 
+-       A program should always call endwin before  exiting  or  escaping  from
+-       curses mode temporarily.  This routine
++       A  program  should always call endwin before exiting the application or
++       temporarily suspending curses's management of the terminal.  endwin:
+ 
+        o   resets colors to correspond with the default color pair 0,
+ 
+        o   moves the cursor to the lower left-hand corner of the screen,
+ 
+-       o   clears  the  remainder  of  the  line  so  that it uses the default
++       o   clears the remainder of the  line  so  that  it  uses  the  default
+            colors,
+ 
+        o   sets the cursor to normal visibility (see curs_set(3x)),
+ 
+-       o   stops  cursor-addressing  mode  using  the  exit_ca_mode   terminal
+-           capability,
++       o   if  applicable, stops cursor-addressing mode using the exit_ca_mode
++           (rmcup) terminal capability, and
+ 
+-       o   restores tty modes (see reset_shell_mode(3x)).
++       o   restores terminal modes (see reset_shell_mode(3x)).
+ 
+-       Calling refresh(3x) or doupdate(3x) after a temporary escape causes the
+-       program to resume visual mode.
++       Calling refresh(3x) or doupdate(3x) after  a  temporary  escape  causes
++       curses to resume managing the terminal.
+ 
+ 
+ 
                                                                                                                                                                    isendwin
                                                                                                                                                                    +-       The isendwin routine returns TRUE if endwin has been called without any
+-       subsequent calls to wrefresh, and FALSE otherwise.
++       isendwin  returns TRUE if endwin has been called without any subsequent
++       calls to wrefresh(3x), and FALSE otherwise.
+ 
+ 
+ 
                                                                                                                                                                    set_term
                                                                                                                                                                    +-       The  set_term  routine  is  used to switch between different terminals.
+-       The screen  reference  new  becomes  the  new  current  terminal.   The
+-       previous terminal is returned by the routine.  This is the only routine
+-       which manipulates SCREEN pointers; all other routines affect  only  the
+-       current terminal.
++       set_term re-orients the curses library's operations to another terminal
++       when the application has arranged to manage more than one with newterm.
++       set_term expects a SCREEN pointer previously returned by newterm as  an
++       argument,  and  returns  the previous one.  set_term is the only curses
++       API function that manipulates SCREEN pointers; all others  affect  only
++       the current terminal.
+ 
+ 
+ 
                                                                                                                                                                    delscreen
                                                                                                                                                                    +-       The  delscreen  routine  frees  storage associated with the SCREEN data
+-       structure.  The endwin routine does not do this, so delscreen should be
+-       called after endwin if a particular SCREEN is no longer needed.
++       delscreen  frees  the  storage  backing  the  supplied  SCREEN  pointer
++       argument.  endwin does not, so that an application can resume  managing
++       a  terminal  with  curses  after  a (possibly conditional or temporary)
++       suspension; see curs_kernel(3x).  Call delscreen after  endwin  when  a
++       particular SCREEN structure is no longer needed.
+ 
+ 
+ 
                                                                                                                                                                    RETURN VALUE
                                                                                                                                                                    +-       endwin  returns  the  integer  ERR  upon failure and OK upon successful
+-       completion.
++       endwin returns OK on success and ERR on failure.
+ 
+-       Routines that return pointers always return NULL on error.
+-
+-       X/Open defines no error conditions.  In this implementation
++       In ncurses,
+ 
+        o   endwin returns ERR if
+ 
+-           o   the terminal was not initialized, or
++           o   the terminal was not initialized,
+ 
+            o   endwin is called more than once without updating the screen, or
+ 
+-           o   reset_shell_mode(3x) return ERR.
++           o   reset_shell_mode(3x) returns ERR.
+ 
+-       o   newterm returns ERR if it cannot allocate the data  structures  for
+-           the  screen,  or for the top-level windows within the screen, i.e.,
+-           curscr, newscr, or stdscr.
++       o   newterm  returns  ERR  if it cannot allocate storage for the SCREEN
++           data structure or the top-level windows  thereof:  curscr,  newscr,
++           and stdscr.
+ 
+-       o   set_term returns no error.
++       Functions  that  return  pointers  return  NULL  on error.  In ncurses,
++       set_term does not fail.
+ 
+ 
+ 
                                                                                                                                                                    PORTABILITY
                                                                                                                                                                    +-       These functions were described in X/Open Curses, Issue 4.  As of  2015,
+-       the current document is X/Open Curses, Issue 7.
++       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
++       error conditions for them.
+ 
+ 
+ 
                                                                                                                                                                    Differences
                                                                                                                                                                    +@@ -222,19 +240,17 @@
+        descriptor can have different behavior  depending  on  which  structure
+        holds the corresponding descriptor.
+ 
+-       For example
+-
+-       o   NetBSD's  baudrate(3x)  function  uses  the descriptor in TERMINAL.
+-           ncurses and SVr4 use the descriptor in SCREEN.
++       o   NetBSD's   baudrate  function  uses  the  descriptor  in  TERMINAL.
++           ncurses and SVr4 curses use the descriptor in SCREEN.
+ 
+        o   NetBSD and ncurses use the descriptor in TERMINAL for terminal  I/O
+            modes,  e.g.,  def_shell_mode(3x),  def_prog_mode(3x).  SVr4 curses
+            uses the descriptor in SCREEN.
+ 
+-   Unset TERM Variable
++   Unset TERM Variable
+        If the TERM variable is  missing  or  empty,  initscr  uses  the  value
+        "unknown",  which  normally  corresponds  to  a terminal entry with the
+-       generic (gn) capability.  Generic entries are detected by setupterm(3x)
++       generic (gn) capability.  Generic entries are detected by setupterm(3x)
+        and  cannot  be  used for full-screen operation.  Other implementations
+        may handle a missing/empty TERM variable differently.
+ 
+@@ -303,7 +319,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-11                  curs_initscr(3x)
++ncurses 6.5                       2024-09-21                  curs_initscr(3x)
+ 
                                                                                                                                                                    
+ 
                                                                                                                                                                    
+ 
                                                                                                                                                                      
+Index: doc/html/man/curs_inopts.3x.html
+--- ncurses-6.5-20240914+/doc/html/man/curs_inopts.3x.html	2024-09-14 20:23:26.000000000 +0000
++++ ncurses-6.5-20240922/doc/html/man/curs_inopts.3x.html	2024-09-21 18:35:26.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inopts.3x,v 1.77 2024/09/14 20:06:50 tom Exp @
++  * @Id: curs_inopts.3x,v 1.79 2024/09/21 18:05:49 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inopts 3x 2024-09-14 ncurses 6.5 Library calls
++curs_inopts 3x 2024-09-21 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                      curs_inopts 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                                                      
++
                                                                                                                                                                      curs_inopts 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                                      
+ 
                                                                                                                                                                      + curs_inopts(3x)                  Library calls                 curs_inopts(3x)
+ 
+@@ -202,7 +202,7 @@
+ 
                                                                                                                                                                      qiflush, noqiflush
                                                                                                                                                                      +        qiflush and noqiflush configure the terminal driver's treatment of  its
+        input and output queues when it handles the interrupt, suspend, or quit
+-       characters under the normal ("cooked") or  cbreak  line  discplines  on
++       characters under the normal ("cooked") or cbreak  line  disciplines  on
+        POSIX  systems; see termios(3).  The default behavior is inherited from
+        the terminal driver settings.  Calling qiflush configures the  terminal
+        to  flush  the  queues  when  any  of  these  events occurs, giving the
+@@ -382,7 +382,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-14                   curs_inopts(3x)
++ncurses 6.5                       2024-09-21                   curs_inopts(3x)
+ 
                                                                                                                                                                      
+ 
                                                                                                                                                                      
+ 
                                                                                                                                                                        
+Index: doc/html/man/curs_kernel.3x.html
+--- ncurses-6.5-20240914+/doc/html/man/curs_kernel.3x.html	2024-09-14 20:23:26.000000000 +0000
++++ ncurses-6.5-20240922/doc/html/man/curs_kernel.3x.html	2024-09-21 18:35:27.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_kernel.3x,v 1.70 2024/09/14 20:14:54 tom Exp @
++  * @Id: curs_kernel.3x,v 1.72 2024/09/21 18:05:20 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_kernel 3x 2024-09-14 ncurses 6.5 Library calls
++curs_kernel 3x 2024-09-21 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                        curs_kernel 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                                                        
++
                                                                                                                                                                        curs_kernel 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                                        
+ 
                                                                                                                                                                        + curs_kernel(3x)                  Library calls                 curs_kernel(3x)
+ 
+@@ -196,8 +196,8 @@
+            if the operating system's function for obtaining terminal  settings
+            fails.
+ 
+-       o   ripoffline  returns  ERR  if the maximum number of ripped-off lines
+-           exceeds the maximum (5).
++       o   ripoffline  returns  ERR  if the accumulated quantity of ripped-off
++           lines would exceed the maximum (5).
+ 
+ 
+ 
                                                                                                                                                                        NOTES
                                                                                                                                                                        +@@ -262,7 +262,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-14                   curs_kernel(3x)
++ncurses 6.5                       2024-09-21                   curs_kernel(3x)
+ 
                                                                                                                                                                        
+ 
                                                                                                                                                                        
+ 
                                                                                                                                                                          
+Index: doc/html/man/curs_move.3x.html
+--- ncurses-6.5-20240914+/doc/html/man/curs_move.3x.html	2024-07-27 23:11:32.000000000 +0000
++++ ncurses-6.5-20240922/doc/html/man/curs_move.3x.html	2024-09-21 18:35:27.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_move.3x,v 1.44 2024/07/27 20:11:42 tom Exp @
++  * @Id: curs_move.3x,v 1.46 2024/09/21 18:03:44 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_move 3x 2024-07-27 ncurses 6.5 Library calls
++curs_move 3x 2024-09-21 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                          curs_move 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                                                          
++
                                                                                                                                                                          curs_move 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                                          
+ 
                                                                                                                                                                          + curs_move(3x)                    Library calls                   curs_move(3x)
+ 
+@@ -70,7 +70,7 @@
+ 
+        They fail if the position (y, x) is outside the window boundaries.
+ 
+-       In ncurses, wmove fails if its WINDOW pointer argument is NULL.
++       In ncurses, wmove fails if win is NULL.
+ 
+ 
+ 
                                                                                                                                                                          NOTES
                                                                                                                                                                          +@@ -93,7 +93,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                     curs_move(3x)
++ncurses 6.5                       2024-09-21                     curs_move(3x)
+ 
                                                                                                                                                                          
+ 
                                                                                                                                                                          
+ 
                                                                                                                                                                            
+Index: doc/html/man/curs_scr_dump.3x.html
+--- ncurses-6.5-20240914+/doc/html/man/curs_scr_dump.3x.html	2024-06-08 23:12:49.000000000 +0000
++++ ncurses-6.5-20240922/doc/html/man/curs_scr_dump.3x.html	2024-09-21 18:35:27.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_scr_dump.3x,v 1.47 2024/06/08 20:33:56 tom Exp @
++  * @Id: curs_scr_dump.3x,v 1.49 2024/09/21 09:30:22 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_scr_dump 3x 2024-06-08 ncurses 6.5 Library calls
++curs_scr_dump 3x 2024-09-21 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                            curs_scr_dump 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                                                                            
++
                                                                                                                                                                            curs_scr_dump 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                                            
+ 
                                                                                                                                                                            + curs_scr_dump(3x)                Library calls               curs_scr_dump(3x)
+ 
+@@ -139,19 +139,30 @@
+        considered  invalid  "if the time-stamp of the tty is old" but does not
+        define "old".
+ 
++       As of 2024, PDCurses provides these functions.  NetBSD curses does  not
++       provide these functions, although it provides getwin.
++
++       Other  implementations  of curses store the window in binary form.  One
++       drawback to binary form is that this makes the dump dependent upon  the
++       curses  library's  internal  data  structures.   Rather  than  do that,
++       ncurses stores the dump in textual form, allowing more flexible use  of
++       the  data.   For  instance,  SVr4  curses scr_restore requires that the
++       dumped window have the same dimensions as the restored window.  ncurses
++       uses wresize to adjust the restored window size.
++
+ 
+ 
                                                                                                                                                                            HISTORY
                                                                                                                                                                            +-       SVr3 (1987) introduced scr_dump,  scr_init,  and  scr_restore.   SVr3.1
++       SVr3  (1987)  introduced  scr_dump,  scr_init, and scr_restore.  SVr3.1
+        added scr_set.
+ 
+ 
+ 
                                                                                                                                                                            SEE ALSO
                                                                                                                                                                            +-       curses(3x),    curs_initscr(3x),    curs_refresh(3x),    curs_util(3x),
+-       system(3), scr_dump(5), terminfo(5)
++       curses(3x), curs_initscr(3x), curs_refresh(3x), curs_util(3x),
++       system(3), scr_dump(5), terminfo(5), wresize(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                 curs_scr_dump(3x)
++ncurses 6.5                       2024-09-21                 curs_scr_dump(3x)
+ 
                                                                                                                                                                            
+ 
                                                                                                                                                                            
+ 
                                                                                                                                                                              
+Index: doc/html/man/curs_scroll.3x.html
+--- ncurses-6.5-20240914+/doc/html/man/curs_scroll.3x.html	2024-09-14 20:23:26.000000000 +0000
++++ ncurses-6.5-20240922/doc/html/man/curs_scroll.3x.html	2024-09-22 18:37:11.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_scroll.3x,v 1.47 2024/09/14 20:06:50 tom Exp @
++  * @Id: curs_scroll.3x,v 1.49 2024/09/22 14:08:11 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_scroll 3x 2024-09-14 ncurses 6.5 Library calls
++curs_scroll 3x 2024-09-22 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                              curs_scroll 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                                                              
++
                                                                                                                                                                              curs_scroll 3x 2024-09-22 ncurses 6.5 Library calls
                                                                                                                                                                              
+ 
                                                                                                                                                                              + curs_scroll(3x)                  Library calls                 curs_scroll(3x)
+ 
+@@ -62,11 +62,11 @@
+ 
                                                                                                                                                                              DESCRIPTION
                                                                                                                                                                              +        scroll  scrolls  the  given window up one line.  That is, every visible
+        line we might number i becomes line i-1.  The text of the top  line  in
+-       the  window  disappears  and  the  bottom  line is populated with blank
+-       characters; see bkgd(3x) (wide-character API users: bkgrnd(3x)).  As an
+-       optimization,  if  the  scrolling  region  of  the window is the entire
+-       screen, the physical screen may be  scrolled  at  the  same  time;  see
+-       curscr(3x).
++       the  window  disappears  and  the  bottom  line  is  populated with the
++       background  character;  see   bkgd(3x)   (wide-character   API   users:
++       bkgrnd(3x)).  As an optimization, if the scrolling region of the window
++       is the entire screen, the physical screen may be scrolled at  the  same
++       time; see curscr(3x).
+ 
+        scrl and wscrl scrolls the specified window win up or down per the sign
+        of n.
+@@ -108,8 +108,8 @@
+        multiple scroll actions on the next update.
+ 
+        Neither SVr4 curses nor X/Open Curses specify whether  these  functions
+-       zero  the  attributes  or color pair identifier of the blank character.
+-       In ncurses, they do not.
++       zero  the  attributes  or  color  pair  identifier  of  the  background
++       character.  In ncurses, they do not.
+ 
+ 
+ 
                                                                                                                                                                              SEE ALSO
                                                                                                                                                                              +@@ -117,7 +117,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-14                   curs_scroll(3x)
++ncurses 6.5                       2024-09-22                   curs_scroll(3x)
+ 
                                                                                                                                                                              
+ 
                                                                                                                                                                              
+ 
                                                                                                                                                                                
+Index: doc/html/man/curs_termcap.3x.html
+--- ncurses-6.5-20240914+/doc/html/man/curs_termcap.3x.html	2024-09-14 20:23:27.000000000 +0000
++++ ncurses-6.5-20240922/doc/html/man/curs_termcap.3x.html	2024-09-21 18:35:27.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_termcap.3x,v 1.89 2024/09/14 20:06:50 tom Exp @
++  * @Id: curs_termcap.3x,v 1.91 2024/09/21 18:00:03 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_termcap 3x 2024-09-14 ncurses 6.5 Library calls
++curs_termcap 3x 2024-09-21 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                curs_termcap 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                                                                
++
                                                                                                                                                                                curs_termcap 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                                                
+ 
                                                                                                                                                                                + curs_termcap(3x)                 Library calls                curs_termcap(3x)
+ 
+@@ -284,37 +284,38 @@
+        above.
+ 
+        4BSD  (November 1980) renamed termlib to termcap and added another test
+-       program.  The library remained much the same though 4.3BSD (June 1986).
+-       4.4BSD-Lite (June 1994) refactored it, leaving the API unchanged.
++       program.  The library remained  much  the  same  through  4.3BSD  (June
++       1986).    4.4BSD-Lite  (June  1994)  refactored  it,  leaving  the  API
++       unchanged.
+ 
+-       Function  prototypes were a feature of ANSI C (1989).  The library long
++       Function prototypes were a feature of ANSI C (1989).  The library  long
+        antedated the standard and thus provided no header file declaring them.
+-       Nevertheless,  the  BSD sources included two different termcap.h header
++       Nevertheless, the BSD sources included two different  termcap.h  header
+        files over time.
+ 
+        o   One was used internally by jove(1) from 4.3BSD onward.  It declared
+            global symbols for the termcap variables that it used.
+ 
+-       o   The  other appeared in 4.4BSD-Lite Release 2 (June 1995) as part of
+-           libedit (also known as the editline library).  CSRG source  history
++       o   The other appeared in 4.4BSD-Lite Release 2 (June 1995) as part  of
++           libedit  (also known as the editline library).  CSRG source history
+            shows that this was added in mid-1992.  The libedit header file was
+            used  internally  as  a  convenience  for  compiling  the  editline
+            library.  It declared function prototypes, but no global variables.
+            NetBSD's termcap library added this header file in mid-1994.
+ 
+-       Meanwhile, GNU termcap began development in 1990.   Its  first  release
+-       (1.0)  in  1991  included  a  termcap.h  header file.  Its second (1.1)
+-       release in September 1992 modified  the  file  to  use  const  for  the
+-       function  prototypes in the header where one would expect parameters to
+-       be read-only.  BSD termcap did  not.   The  prototype  for  tputs  also
+-       differed,  but  in that instance, it was libedit that differed from BSD
++       Meanwhile,  GNU  termcap  began development in 1990.  Its first release
++       (1.0) in 1991 included a  termcap.h  header  file.   Its  second  (1.1)
++       release  in  September  1992  modified  the  file  to use const for the
++       function prototypes in the header where one would expect parameters  to
++       be  read-only.   BSD  termcap  did  not.   The prototype for tputs also
++       differed, but in that instance, it was libedit that differed  from  BSD
+        termcap.
+ 
+-       GNU bash(1) has bundled GNU termcap 1.3 since mid-1993 to  support  its
++       GNU  bash(1)  has bundled GNU termcap 1.3 since mid-1993 to support its
+        readline(3) library, and continues to use it if configured to do so.
+ 
+-       ncurses  1.8.1 (November 1993) provided a termcap.h file.  It reflected
+-       influence  from  GNU  termcap  and  emacs(1)  (rather  than   jove(1)),
++       ncurses 1.8.1 (November 1993) provided a termcap.h file.  It  reflected
++       influence   from  GNU  termcap  and  emacs(1)  (rather  than  jove(1)),
+        providing the following interface:
+ 
+        o   global symbols used by emacs,
+@@ -323,54 +324,54 @@
+ 
+        o   a prototype for tparam, a GNU termcap feature.
+ 
+-       Later  (in mid-1996) the tparam function was removed from ncurses.  Any
+-       two of the four implementations thus differ, and programs  that  intend
++       Later (in mid-1996) the tparam function was removed from ncurses.   Any
++       two  of  the four implementations thus differ, and programs that intend
+        to work with all termcap library interfaces must account for that fact.
+ 
+ 
+ 
                                                                                                                                                                                BUGS
                                                                                                                                                                                +        If  you  call  tgetstr  to  fetch  column_address  (ch)  or  any  other
+-       parameterized string capability, be aware that it is returned in  term-
++       parameterized  string capability, be aware that it is returned in term-
+        info notation, not the older and not-quite-compatible termcap notation.
+-       This does not cause problems if all you do with it  is  call  tgoto  or
+-       tparm,   which   both   parametrically   expand  terminfo-style  string
+-       capabilities as terminfo does.  (If ncurses is  configured  to  support
+-       termcap,  tgoto  checks whether the string is terminfo-style by looking
+-       for "%p" parameters or "<...>"  delays,  and  invokes  a  termcap-style
++       This  does  not  cause  problems if all you do with it is call tgoto or
++       tparm,  which  both   parametrically   expand   terminfo-style   string
++       capabilities  as  terminfo  does.  (If ncurses is configured to support
++       termcap, tgoto checks whether the string is terminfo-style  by  looking
++       for  "%p"  parameters  or  "<...>"  delays, and invokes a termcap-style
+        parser if the string appears not to use terminfo syntax.)
+ 
+-       Because  terminfo's  syntax  for padding in string capabilities differs
++       Because terminfo's syntax for padding in  string  capabilities  differs
+        from termcap's, users can be surprised.
+ 
+-       o   tputs("50") in a terminfo system transmits "50" rather  than  busy-
++       o   tputs("50")  in  a terminfo system transmits "50" rather than busy-
+            waiting for 50 milliseconds.
+ 
+-       o   However,  if  ncurses is configured to support termcap, it may also
++       o   However, if ncurses is configured to support termcap, it  may  also
+            have been configured to support BSD-style padding.
+ 
+-           In that case, tputs inspects strings  passed  to  it,  looking  for
++           In  that  case,  tputs  inspects  strings passed to it, looking for
+            digits at the beginning of the string.
+ 
+-           tputs("50")  in  a termcap system may busy-wait for 50 milliseconds
++           tputs("50") in a termcap system may busy-wait for  50  milliseconds
+            rather than transmitting "50".
+ 
+        termcap  has  nothing  analogous  to  terminfo's  set_attributes  (sgr)
+-       capability.   One  consequence is that termcap applications assume that
+-       "me" (equivalent to terminfo's exit_attribute_mode  (sgr0)  capability)
+-       does  not  reset  the alternate character set.  ncurses checks for, and
++       capability.  One consequence is that termcap applications  assume  that
++       "me"  (equivalent  to terminfo's exit_attribute_mode (sgr0) capability)
++       does not reset the alternate character set.  ncurses  checks  for,  and
+        modifies the data shared with, the termcap interface to accommodate the
+        latter's limitation in this respect.
+ 
+ 
+ 
                                                                                                                                                                                SEE ALSO
                                                                                                                                                                                +-       TCTEST - A Termcap Test Utility
+-       <https://invisible-island.net/ncurses/tctest.html>
++       TCTEST -- A Termcap Test Utility <https://invisible-island.net/ncurses/
++       tctest.html>
+ 
+        curses(3x), curs_terminfo(3x), putc(3), term_variables(3x), terminfo(5)
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-14                  curs_termcap(3x)
++ncurses 6.5                       2024-09-21                  curs_termcap(3x)
+ 
                                                                                                                                                                                
+ 
                                                                                                                                                                                
+ 
                                                                                                                                                                                  
+Index: doc/html/man/curs_util.3x.html
+--- ncurses-6.5-20240914+/doc/html/man/curs_util.3x.html	2024-09-14 20:23:27.000000000 +0000
++++ ncurses-6.5-20240922/doc/html/man/curs_util.3x.html	2024-09-21 18:35:27.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_util.3x,v 1.116 2024/09/11 21:02:40 tom Exp @
++  * @Id: curs_util.3x,v 1.118 2024/09/21 09:30:22 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_util 3x 2024-09-11 ncurses 6.5 Library calls
++curs_util 3x 2024-09-21 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                  curs_util 3x 2024-09-11 ncurses 6.5 Library calls
                                                                                                                                                                                  
++
                                                                                                                                                                                  curs_util 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                                                  
+ 
                                                                                                                                                                                  + curs_util(3x)                    Library calls                   curs_util(3x)
+ 
+@@ -399,13 +399,13 @@
+ 
+ 
+ 
                                                                                                                                                                                  SEE ALSO
                                                                                                                                                                                  +-       curses(3x),   curs_initscr(3x),    curs_inopts(3x),    curs_kernel(3x),
+-       curs_scr_dump(3x),        curs_sp_funcs(3x),        curs_variables(3x),
++       curses(3x), curs_initscr(3x), curs_inopts(3x), curs_kernel(3x),
++       curs_scr_dump(3x), curs_sp_funcs(3x), curs_variables(3x),
+        legacy_coding(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-11                     curs_util(3x)
++ncurses 6.5                       2024-09-21                     curs_util(3x)
+ 
                                                                                                                                                                                  
+ 
                                                                                                                                                                                  
+ 
                                                                                                                                                                                    
+Index: doc/html/man/curs_variables.3x.html
+--- ncurses-6.5-20240914+/doc/html/man/curs_variables.3x.html	2024-09-14 20:23:27.000000000 +0000
++++ ncurses-6.5-20240922/doc/html/man/curs_variables.3x.html	2024-09-21 18:35:27.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_variables.3x,v 1.51 2024/09/14 20:06:50 tom Exp @
++  * @Id: curs_variables.3x,v 1.53 2024/09/21 18:01:56 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_variables 3x 2024-09-14 ncurses 6.5 Library calls
++curs_variables 3x 2024-09-21 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                    curs_variables 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                                                                    
++
                                                                                                                                                                                    curs_variables 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                                                    
+ 
                                                                                                                                                                                    + curs_variables(3x)               Library calls              curs_variables(3x)
+ 
+@@ -258,7 +258,7 @@
+ 
+ 
+ 
                                                                                                                                                                                    SEE ALSO
                                                                                                                                                                                    +-       [UAX #29] "Unicode Standard Annex #29: Unicode Text Segmentation"
++       [UAX #29] "Unicode  Standard  Annex  #29:  Unicode  Text  Segmentation"
+        <https://unicode.org/reports/tr29/>
+ 
+        curses(3x),    curs_color(3x),    curs_opaque(3x),   curs_terminfo(3x),
+@@ -266,7 +266,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-14                curs_variables(3x)
++ncurses 6.5                       2024-09-21                curs_variables(3x)
+ 
                                                                                                                                                                                    
+ 
                                                                                                                                                                                    
+ 
                                                                                                                                                                                      
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.5-20240914+/doc/html/man/infocmp.1m.html	2024-09-14 20:23:28.000000000 +0000
++++ ncurses-6.5-20240922/doc/html/man/infocmp.1m.html	2024-09-21 18:35:28.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: infocmp.1m,v 1.112 2024/09/14 20:06:50 tom Exp @
++  * @Id: infocmp.1m,v 1.114 2024/09/21 18:04:29 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-infocmp 1m 2024-09-14 ncurses 6.5 User commands
++infocmp 1m 2024-09-21 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                      infocmp 1m 2024-09-14 ncurses 6.5 User commands
                                                                                                                                                                                      
++
                                                                                                                                                                                      infocmp 1m 2024-09-21 ncurses 6.5 User commands
                                                                                                                                                                                      
+ 
                                                                                                                                                                                      + infocmp(1m)                      User commands                     infocmp(1m)
+ 
+@@ -52,8 +52,8 @@
+ 
+ 
+ 
                                                                                                                                                                                      SYNOPSIS
                                                                                                                                                                                      +-       infocmp [-1cCdDeEFgGiIKlLnpqrtTuUVWx] [-A directory] [-B directory]
+-              [-Q encoding] [-R subset] [-s key] [-v level] [-w width]
++       infocmp   [-1cCdDeEFgGiIKlLnpqrtTuUVWx]  [-A directory]  [-B directory]
++              [-Q encoding]   [-R subset]   [-s key]   [-v level]   [-w width]
+               [terminal-type ... ]
+ 
+ 
+@@ -468,48 +468,47 @@
+ 
+ 
+ 
                                                                                                                                                                                      EXTENSIONS
                                                                                                                                                                                      +-       The -0, -1, -E, -F, -G, -Q, -R, -T, -V, -a, -e, -f, -g, -i, -l, -p,  -q
+-       and -t options are not supported in SVr4 curses.
+-
+-       SVr4   infocmp   does  not  distinguish  between  absent  and  canceled
+-       capabilities.  Also, it shows missing integer capabilities as  -1  (the
+-       internal   value   used   to   represent   missing   integers).    This
+-       implementation shows those as  "NULL",  for  consistency  with  missing
+-       strings.
+-
+-       The  -r  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 -r -RBSD.
++       The -0, -1, -a, -e, -E, -f, -F, -g, -G, -i, -l, -p, -q, -Q, -R, -t, -T,
++       and -V options are ncurses extensions.
+ 
+ 
+ 
                                                                                                                                                                                      PORTABILITY
                                                                                                                                                                                      +-       X/Open  Curses,  Issue  7 (2009) provides a description of infocmp.  It
+-       does not mention the options used for converting to termcap format.
++       X/Open  Curses,  Issue 7 (2009) specifies infocmp.  It does not mention
++       options for producing descriptions in termcap format.
++
++       SVr4  infocmp  does  not  distinguish  between  absent   and   canceled
++       capabilities.   It  furthermore reports missing integer capabilities as
++       -1 (its internal representation).  ncurses shows these  as  "NULL"  for
++       consistency with missing string capabilities.
++
++       The  -r  option  of  ncurses infocmp uses SVr4's notion of of "termcap"
++       capabilities.  BSD curses had a more restricted set.  To see only those
++       present in 4.4BSD, use "-r -RBSD".
+ 
+ 
+ 
                                                                                                                                                                                      HISTORY
                                                                                                                                                                                      +-       Although System V Release 2 provided a  terminfo  library,  it  had  no
++       Although  System  V  Release  2  provided a terminfo library, it had no
+        documented tool for decompiling the terminal descriptions.  Tony Hansen
+        (AT&T) wrote the first infocmp in early 1984, for System V Release 3.
+ 
+-       Eric Raymond  used  the  AT&T  documentation  in  1995  to  provide  an
+-       equivalent  infocmp  for  ncurses.   In  addition,  he  added a few new
++       Eric  Raymond  used  the  AT&T  documentation  in  1995  to  provide an
++       equivalent infocmp for ncurses.   In  addition,  he  added  a  few  new
+        features such as:
+ 
+-       o   the  -e  option,  to  support   fallback   (compiled-in)   terminal
++       o   the   -e   option,   to  support  fallback  (compiled-in)  terminal
+            descriptions
+ 
+        o   the -i option, to help with analysis
+ 
+-       Later,  Thomas  Dickey added the -x (user-defined capabilities) option,
+-       and the  -E  option  to  support  fallback  entries  with  user-defined
++       Later, Thomas Dickey added the -x (user-defined  capabilities)  option,
++       and  the  -E  option  to  support  fallback  entries  with user-defined
+        capabilities.
+ 
+        For a complete list, see the EXTENSIONS section.
+ 
+-       In  2010,  Roy  Marples  provided an infocmp program for NetBSD.  It is
+-       less capable than the SVr4 or ncurses  versions  (e.g.,  it  lacks  the
+-       sorting  options  documented in X/Open), but does include the -x option
++       In 2010, Roy Marples provided an infocmp program  for  NetBSD.   It  is
++       less  capable  than  the  SVr4  or ncurses versions (e.g., it lacks the
++       sorting options documented in X/Open), but does include the  -x  option
+        adapted from ncurses.
+ 
+ 
+@@ -530,7 +529,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-14                       infocmp(1m)
++ncurses 6.5                       2024-09-21                       infocmp(1m)
+ 
                                                                                                                                                                                      
+ 
                                                                                                                                                                                      
+ 
                                                                                                                                                                                        
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.5-20240914+/doc/html/man/ncurses.3x.html	2024-09-14 20:23:28.000000000 +0000
++++ ncurses-6.5-20240922/doc/html/man/ncurses.3x.html	2024-09-21 18:35:29.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: ncurses.3x,v 1.231 2024/09/14 20:06:50 tom Exp @
++  * @Id: ncurses.3x,v 1.233 2024/09/21 18:02:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-ncurses 3x 2024-09-14 ncurses 6.5 Library calls
++ncurses 3x 2024-09-21 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                        ncurses 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                                                                        
++
                                                                                                                                                                                        ncurses 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                                                        
+ 
                                                                                                                                                                                        + ncurses(3x)                      Library calls                     ncurses(3x)
+ 
+@@ -61,7 +61,7 @@
+        displays  with  output  optimized  to minimize screen updates.  ncurses
+        replaces the curses libraries from System V Release 4 Unix ("SVr4") and
+        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
+-       document describes ncurses version 6.5 (patch 20240914).
++       document describes ncurses version 6.5 (patch 20240921).
+ 
+        ncurses permits control of the terminal screen's contents;  abstraction
+        and  subdivision thereof with windows and pads; acquisition of keyboard
+@@ -188,12 +188,12 @@
+        VT100 and other terminals.  See addch(3x).
+ 
+        curses is implemented using the operating system's terminal driver; key
+-       events are received not as scan codes but as byte sequences.  Graphical
+-       keycaps  (alphanumeric  and punctuation keys, and the space) appear as-
+-       is.  Everything else, including the tab, enter/return,  keypad,  arrow,
+-       and function keys, appears as a control character or a multibyte escape
+-       sequence.  curses can translate the latter into unique key codes.   See
+-       keypad(3x) and getch(3x).
++       events are received not as scan  codes  but  as  byte  sequences.   The
++       driver  reports  graphical  keycaps (alphanumeric and punctuation keys,
++       and  the  space)  as-is.    Everything   else,   including   the   tab,
++       enter/return,  keypad, arrow, and function keys, appears to curses as a
++       control character or a multibyte escape sequence.  curses can translate
++       the latter into unique key codes.  See keypad(3x) and getch(3x).
+ 
+        ncurses provides reimplementations of the SVr4 panel(3x), form(3x), and
+        menu(3x)  libraries;  they  permit   overlapping   windows   and   ease
+@@ -308,11 +308,11 @@
+                           structure,  not  combined  into  an  integer  as  in
+                           chtype.
+ 
+-                 Each cell of a WINDOW is stored as a cchar_t.
++                 Each cell of a WINDOW is stored as a  cchar_t.   setcchar(3x)
++                 and getcchar(3x) store and retrieve cchar_t data.
+ 
+-                 setcchar(3x) and  getcchar(3x)  store  and  retrieve  cchar_t
+-                 data.   The  wide  library API of ncurses depends on two data
+-                 types standardized by ISO C95.
++                 The  wide  library  API  of ncurses depends on two data types
++                 standardized by ISO C95.
+ 
+                  wchar_t  stores a wide character.  Like chtype, it may be  an
+                           alias  of int.  Depending on the character encoding,
+@@ -324,9 +324,9 @@
+                           base  glyph  with  which  it combines, and typically
+                           does not advance the cursor.
+ 
+-                 wint_t   can  store  a  wchar_t   or   the   constant   WEOF,
++                 wint_t   can  store  a  wchar_t   or   the   constant   WEOF,
+                           analogously  to the int-sized character manipulation
+-                          functions of ISO C and its constant EOF.
++                          functions of ISO C and its constant EOF.
+ 
+ 
+ 
                                                                                                                                                                                        Function Name Index
                                                                                                                                                                                        +@@ -1089,7 +1089,7 @@
+        the default location.
+ 
+        o   Descriptions  in terminfo format are normally stored in a directory
+-           tree using subdirectories named by the common first letters of  the
++           tree using subdirectories named for the common first letters of the
+            terminal types named therein.  This is the scheme used in System V.
+ 
+        o   If ncurses is configured to use hashed databases, then TERMINFO may
+@@ -1498,7 +1498,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-14                       ncurses(3x)
++ncurses 6.5                       2024-09-21                       ncurses(3x)
+ 
                                                                                                                                                                                        
+ 
                                                                                                                                                                                        
+ 
                                                                                                                                                                                          
+Index: doc/html/man/tabs.1.html
+--- ncurses-6.5-20240914+/doc/html/man/tabs.1.html	2024-09-14 20:23:29.000000000 +0000
++++ ncurses-6.5-20240922/doc/html/man/tabs.1.html	2024-09-21 18:35:29.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tabs.1,v 1.63 2024/09/14 20:06:50 tom Exp @
++  * @Id: tabs.1,v 1.65 2024/09/21 18:04:07 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-tabs 1 2024-09-14 ncurses 6.5 User commands
++tabs 1 2024-09-21 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                          tabs 1 2024-09-14 ncurses 6.5 User commands
                                                                                                                                                                                          
++
                                                                                                                                                                                          tabs 1 2024-09-21 ncurses 6.5 User commands
                                                                                                                                                                                          
+ 
                                                                                                                                                                                          + tabs(1)                          User commands                         tabs(1)
+ 
+@@ -203,7 +203,7 @@
+            the   set_left_margin   (smgl)   or   set_left_margin_parm  (smglp)
+            capabilities needed to support the feature.
+ 
+-       o   Unlike tput(1), tabs has no specification in X/Open Curses Issue 7.
++       o   Unlike tput, tabs has no specification in X/Open Curses Issue 7.
+ 
+        The -d (debug) and  -n  (no-op)  options  are  ncurses  extensions  not
+        provided by other implementations.
+@@ -215,7 +215,7 @@
+        same  year);  it  supported an option "-n" to set the first tab stop at
+        the left margin.  That option is not specified by POSIX.
+ 
+-       The PWB/Unix tabs utility returned  in  System  III  (1980),  and  used
++       The PWB/Unix tabs utility returned  in  System  III  (1980),  and  used
+        built-in  tables  to  support  a half-dozen hardcopy terminal (printer)
+        types.  It also had logic to support setting the left margin,  as  well
+        as a feature for copying the tab settings from a file.
+@@ -231,14 +231,14 @@
+        motivation,  though an introductory comment "and optionally adjusts the
+        margin"  remains,  overlooked  in  the  removal.   The   tabs   utility
+        documented  in Issues 6 and later has no mechanism for setting margins.
+-       The +m option in ncurses tabs (tabs) differs from the SVr4  feature  by
+-       using terminal capabilities rather than built-in tables.
++       The +m option in ncurses's implementation differs from the SVr4 feature
++       by using terminal capabilities rather than built-in tables.
+ 
+        POSIX   documents   no  limit  on  the  number  of  tab  stops.   Other
+        implementations impose one; the limit is 20 in PWB/Unix's tabs utility.
+        While  some  terminals may not accept an arbitrary number of tab stops,
+-       ncurses tabs attempts to set tab stops up to the right  margin  if  the
+-       list thereof is sufficiently long.
++       ncurses attempts to set tab stops up to the right margin  if  the  list
++       thereof is sufficiently long.
+ 
+        The  "Rationale" section of the Issue 6 tabs reference page details how
+        the committee considered  redesigning  the  tabs  and  tput  utilities,
+@@ -257,7 +257,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-14                           tabs(1)
++ncurses 6.5                       2024-09-21                           tabs(1)
+ 
                                                                                                                                                                                          
+ 
                                                                                                                                                                                          
+ 
                                                                                                                                                                                            
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.5-20240914+/doc/html/man/terminfo.5.html	2024-09-14 20:23:29.000000000 +0000
++++ ncurses-6.5-20240922/doc/html/man/terminfo.5.html	2024-09-21 18:35:29.000000000 +0000
+@@ -71,7 +71,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This document describes ncurses version 6.5 (patch 20240914).
++       This document describes ncurses version 6.5 (patch 20240921).
+ 
+ 
+ 
                                                                                                                                                    terminfo Entry Syntax
                                                                                                                                                    +@@ -2108,7 +2108,7 @@
+ 
+        o   Tektronix-like terminals have a predefined set of N colors (where N
+            is usually 8), and can set character-cell foreground and background
+-           characters independently, mixing them into N * N color pairs.
++           colors independently, mixing them into N * N color pairs.
+ 
+        o   On  HP-like  terminals,  the  user  must  set  each  color  pair up
+            separately  (foreground  and  background  are   not   independently
+Index: doc/html/man/wresize.3x.html
+--- ncurses-6.5-20240914+/doc/html/man/wresize.3x.html	2024-07-27 23:11:34.000000000 +0000
++++ ncurses-6.5-20240922/doc/html/man/wresize.3x.html	2024-09-22 18:37:13.000000000 +0000
+@@ -28,19 +28,19 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey 1996
+-  * @Id: wresize.3x,v 1.40 2024/07/27 20:08:58 tom Exp @
++  * @Id: wresize.3x,v 1.42 2024/09/21 23:48:27 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-wresize 3x 2024-07-27 ncurses 6.5 Library calls
++wresize 3x 2024-09-21 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                    wresize 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                                    
++
                                                                                                                                                    wresize 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                    
+ 
                                                                                                                                                    + wresize(3x)                      Library calls                     wresize(3x)
+ 
+@@ -60,27 +60,28 @@
+ 
                                                                                                                                                    DESCRIPTION
                                                                                                                                                    +        wresize,  an  ncurses  extension  to  the  curses  library, reallocates
+        storage for win, adjusting its dimensions to  lines  and  columns.   If
+-       either  dimension  is  larger than its current value, ncurses fills the
+-       expanded part of the window with  the  blank  character  configured  by
+-       wbkgdset(3x) (wide-character API users: wbkgrndset(3x)).
++       either dimension is larger than its current value, ncurses the expanded
++       part of the window is filled with blanks merged with current background
++       rendition  (configured  by  wbkgdset(3x),  or  by  wide-character  API:
++       wbkgrndset(3x)).
+ 
+ 
+ 
                                                                                                                                                    RETURN VALUE
                                                                                                                                                    +-       wresize  returns  OK on success and ERR on failure.  It fails if either
+-       lines or columns is less than or equal to zero, or if an  error  occurs
++       wresize returns OK on success and ERR on failure.  It fails  if  either
++       lines  or  columns is less than or equal to zero, or if an error occurs
+        while (re)allocating memory for win.
+ 
+ 
+ 
                                                                                                                                                    NOTES
                                                                                                                                                    +-       The  only restriction placed on the values of lines and columns is that
+-       they be greater than zero.  They are not compared to the dimensions  of
+-       the  curses screen; this keeps the logic of resizeterm(3x) simple.  The
+-       caller must ensure that  win's  dimensions  fit  within  those  of  the
++       The only restriction placed on the values of lines and columns is  that
++       they  be greater than zero.  They are not compared to the dimensions of
++       the curses screen; this keeps the logic of resizeterm(3x) simple.   The
++       caller  must  ensure  that  win's  dimensions  fit  within those of the
+        screen.
+ 
+ 
+ 
                                                                                                                                                    EXTENSIONS
                                                                                                                                                    +-       wresize  is  an ncurses(3x) extension, and is not found in SVr4 curses,
++       wresize is an ncurses(3x) extension, and is not found in  SVr4  curses,
+        4.4BSD curses, or any other previous curses implementation.
+ 
+ 
+@@ -88,14 +89,14 @@
+        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       NetBSD  curses adopted wresize in 2001 (release 1.5.3), and PDCurses in
++       NetBSD curses adopted wresize in 2001 (release 1.5.3), and PDCurses  in
+        2004 (version 2.7).
+ 
+        It is not possible to resize windows with SVr4 curses.
+ 
+ 
+ 
                                                                                                                                                    HISTORY
                                                                                                                                                    +-       Thomas Dickey developed wresize as an extension to BSD curses in  1988,
++       Thomas  Dickey developed wresize as an extension to BSD curses in 1988,
+        and brought it to ncurses in mid-1995.
+ 
+ 
+@@ -108,7 +109,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                       wresize(3x)
++ncurses 6.5                       2024-09-21                       wresize(3x)
+ 
                                                                                                                                                    
+ 
                                                                                                                                                    
+ 
                                                                                                                                                      
+Index: man/curs_addch.3x
+Prereq:  1.98 
+--- ncurses-6.5-20240914+/man/curs_addch.3x	2024-07-27 20:08:58.000000000 +0000
++++ ncurses-6.5-20240922/man/curs_addch.3x	2024-09-21 18:03:23.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addch.3x,v 1.98 2024/07/27 20:08:58 tom Exp $
+-.TH curs_addch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addch.3x,v 1.100 2024/09/21 18:03:23 tom Exp $
++.TH curs_addch 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -149,8 +149,9 @@
+ followed by
+ .RB \%( w ) refresh .
+ .I curses
+-interprets these functions as a hint that only a single character is
+-being output;
++interprets these functions as a hint to its optimizer
++that only a single character cell in the window
++is being altered between refreshes;
+ for non-control characters,
+ a considerable performance gain may be enjoyed by employing them.
+ .\" TODO: Combine the following with the "Line Drawing" subsection of
+Index: man/curs_attr.3x
+Prereq:  1.110 
+--- ncurses-6.5-20240914+/man/curs_attr.3x	2024-07-27 19:57:55.000000000 +0000
++++ ncurses-6.5-20240922/man/curs_attr.3x	2024-09-21 23:39:04.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_attr.3x,v 1.110 2024/07/27 19:57:55 tom Exp $
+-.TH curs_attr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_attr.3x,v 1.113 2024/09/21 23:39:04 tom Exp $
++.TH curs_attr 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -589,7 +589,7 @@
+ Goodheart did not mention the background character or the
+ .I \%cchar_t
+ type.
+-Those are respectively SVr4 and X/Open features.
++Those are respectively SVr3.1 and X/Open features.
+ He did mention the \fBA_\fP constants, but did not indicate their values.
+ Those were not the same in different systems,
+ even for those marked as System V.
+Index: man/curs_bkgd.3x
+Prereq:  1.63 
+--- ncurses-6.5-20240914+/man/curs_bkgd.3x	2024-09-14 20:06:50.000000000 +0000
++++ ncurses-6.5-20240922/man/curs_bkgd.3x	2024-09-22 18:16:03.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_bkgd.3x,v 1.63 2024/09/14 20:06:50 tom Exp $
+-.TH curs_bkgd 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_bkgd.3x,v 1.64 2024/09/22 18:16:03 tom Exp $
++.TH curs_bkgd 3X 2024-09-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -64,28 +64,31 @@
+ \fBchtype getbkgd(WINDOW *\fIwin\fP);
+ .fi
+ .SH DESCRIPTION
+-The
+-.I background
+-of a
++Every
+ .I curses
+-window
+-(in the library's non-wide configuration)
+-is a
++window has a background property.
++In the library's non-wide configuration,
++this property is a
+ .I \%chtype
+-combining a set of attributes
+-(see \fB\%curs_attr\fP(3X))
+-with a character called the
+-.I "blank character."
+-.PP
+-The blank character is a spacing character that populates a window's
+-character cells when their contents are erased without replacement.
+-The background's attributes are combined with all non-blank characters
+-written to the window,
++which combines a set of attributes with the
++.I "background character"
++(see \fB\%curs_attr\fP(3X)).
++The background character is a spacing character.
++.PP
++When erasing parts of the screen,
++.I curses
++fills the cells with the background character.
++.I curses
++also uses the window background when writing characters to the screen:
++.bP
++The attribute part of the background is combined with all
++non-blank characters that are written into the window,
+ as with the \fB\%waddch\fP(3X) and \fB\%winsch\fP(3X) families of
+ functions.
++.bP
++Both the character and attribute parts of the background are combined with
++blank characters that are written into the window.
+ .PP
+-The blank character and attributes of the background combine with
+-characters written to the window as described below.
+ The background becomes a property of the character and moves with it
+ through any scrolling and insert/delete line/character operations.
+ .PP
+@@ -111,11 +114,11 @@
+ whether or not it is blank.
+ .bP
+ .I \%ncurses
+-first compares the cell's character to the previously specified blank
+-character;
++first compares the cell's character to the previously specified
++background character;
+ if they match,
+ .I \%ncurses
+-writes the new blank character to the cell.
++writes the new background character to the cell.
+ .bP
+ .I \%ncurses
+ then checks if the cell uses color,
+@@ -141,8 +144,12 @@
+ first removing those that may have come from the current background,
+ and then adding attributes from the new background.
+ .PP
++If the new background's character is nonspacing,
++.I \%ncurses
++reuses the old background character,
++except for one special case:
+ .I \%ncurses
+-treats a background character value of zero (0) as a blank character.
++treats a background character value of zero (0) as a space.
+ .PP
+ If the terminal does not support color,
+ or if color has not been initialized with \fB\%start_color\fP(3X),
+Index: man/curs_bkgrnd.3x
+Prereq:  1.44 
+--- ncurses-6.5-20240914+/man/curs_bkgrnd.3x	2024-09-14 20:06:50.000000000 +0000
++++ ncurses-6.5-20240922/man/curs_bkgrnd.3x	2024-09-22 18:23:50.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_bkgrnd.3x,v 1.44 2024/09/14 20:06:50 tom Exp $
+-.TH curs_bkgrnd 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_bkgrnd.3x,v 1.46 2024/09/22 18:23:50 tom Exp $
++.TH curs_bkgrnd 3X 2024-09-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -66,29 +66,31 @@
+ \fBint wgetbkgrnd(WINDOW *\fIwin\fP, cchar_t *\fIwch\fP);
+ .fi
+ .SH DESCRIPTION
+-The
+-.I background
+-of a
++Every
+ .I curses
+-window
+-(in the library's wide configuration)
+-is a
++window has a background property.
++In the library's wide configuration,
++this property is a
+ .I \%cchar_t
+-combining a set of attributes
++which combines a set of attributes with the
++.I "background character"
+ (see \fB\%curs_attr\fP(3X))
+-with the window's blank character.
++The background character is a spacing character.
+ .PP
+-The
+-.I "blank character"
+-is a spacing complex character that populates a window's character cells
+-when their contents are erased without replacement.
+-The background's attributes are combined with all non-blank characters
+-written to the window,
++When erasing parts of the screen,
++.I curses
++fills the cells with the background character.
++.I curses
++also uses the window background when writing characters to the screen:
++.bP
++The attribute part of the background is combined with all
++non-blank characters that are written into the window,
+ as with the \fB\%wadd_wch\fP(3X) and \fB\%wins_wch\fP(3X) families of
+ functions.
++.bP
++Both the character and attribute parts of the background are combined with
++blank characters that are written into the window.
+ .PP
+-The blank character and attributes of the background combine with
+-characters written to the window as described below.
+ The background becomes a property of the character and moves with it
+ through any scrolling and insert/delete line/character operations.
+ .PP
+@@ -114,11 +116,11 @@
+ whether or not it is blank.
+ .bP
+ .I \%ncurses
+-first compares the cell's character to the previously specified blank
+-character;
++first compares the cell's character to the previously specified
++background character;
+ if they match,
+ .I \%ncurses
+-writes the new blank character to the cell.
++writes the new background character to the cell.
+ .bP
+ .I \%ncurses
+ then checks if the cell uses color,
+@@ -144,8 +146,12 @@
+ first removing those that may have come from the current background,
+ and then adding attributes from the new background.
+ .PP
++If the new background's character is nonspacing,
++.I \%ncurses
++reuses the old background character,
++except for one special case:
+ .I \%ncurses
+-treats a background character value of zero (0) as a blank character.
++treats a background character value of zero (0) as a space.
+ .PP
+ If the terminal does not support color,
+ or if color has not been initialized with \fB\%start_color\fP(3X),
+Index: man/curs_delch.3x
+Prereq:  1.37 
+--- ncurses-6.5-20240914+/man/curs_delch.3x	2024-07-27 20:14:16.000000000 +0000
++++ ncurses-6.5-20240922/man/curs_delch.3x	2024-09-21 23:43:41.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_delch.3x,v 1.37 2024/07/27 20:14:16 tom Exp $
+-.TH curs_delch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_delch.3x,v 1.39 2024/09/21 23:43:41 tom Exp $
++.TH curs_delch 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -60,7 +60,7 @@
+ .IR win .
+ It moves all characters to the right of the cursor on the same line to
+ the left one position and replaces the contents of the rightmost
+-position on the line with the window's blank character;
++position on the line with the window's background character;
+ see \fB\%bkgd\fP(3X)
+ (wide-character API users: \fB\%bkgrnd\fP(3X)).
+ The cursor position does not change
+Index: man/curs_deleteln.3x
+Prereq:  1.40 
+--- ncurses-6.5-20240914+/man/curs_deleteln.3x	2024-07-27 20:12:02.000000000 +0000
++++ ncurses-6.5-20240922/man/curs_deleteln.3x	2024-09-22 18:35:00.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_deleteln.3x,v 1.40 2024/07/27 20:12:02 tom Exp $
+-.TH curs_deleteln 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_deleteln.3x,v 1.41 2024/09/22 18:35:00 tom Exp $
++.TH curs_deleteln 3X 2024-09-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -69,15 +69,18 @@
+ .I curses
+ then fills the bottom line of
+ .I win
+-with the blank character
++with the background character
+ configured by \fB\%wbkgdset\fP(3X)
+ (wide-character API users: \fB\%wbkgrndset\fP(3X)).
+ The cursor position does not change.
+ .PP
+ .B \%winsertln
+-inserts a line of blank characters above the line at the cursor in
+-.IR win ;
+-the content of the window's bottom line is lost.
++inserts a new, empty line of characters above the line at the cursor in
++.IR win ,
++shifting the existing lines down by one.
++The content of the window's bottom line is lost;
++.I curses
++fills the new line with the background character.
+ The cursor position does not change.
+ .PP
+ .B \%winsdelln
+Index: man/curs_initscr.3x
+Prereq:  1.77 
+--- ncurses-6.5-20240914+/man/curs_initscr.3x	2024-09-11 21:00:07.000000000 +0000
++++ ncurses-6.5-20240922/man/curs_initscr.3x	2024-09-21 17:59:36.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_initscr.3x,v 1.77 2024/09/11 21:00:07 tom Exp $
+-.TH curs_initscr 3X 2024-09-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_initscr.3x,v 1.79 2024/09/21 17:59:36 tom Exp $
++.TH curs_initscr 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -56,65 +56,149 @@
+ .nf
+ \fB#include 
+ .PP
+-\fBWINDOW *initscr(void);
++\fBWINDOW * initscr(void);
+ \fBint endwin(void);
+ .PP
+ \fBbool isendwin(void);
+ .PP
+-\fBSCREEN *newterm(const char *\fItype\fP, FILE *\fIoutf\fP, FILE *\fIinf\fP);
+-\fBSCREEN *set_term(SCREEN *\fInew\fP);
+-\fBvoid delscreen(SCREEN* \fIsp\fP);
++\fBSCREEN * newterm(const char * \fItype\fP, FILE * \fIoutf\fP, FILE * \fIinf\fP);
++\fBSCREEN * set_term(SCREEN * \fInew\fP);
++\fBvoid delscreen(SCREEN * \fIsp\fP);
+ .fi
+ .SH DESCRIPTION
+ .SS initscr
+-\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\fP(3X), \fBfilter\fP, \fBripoffline\fP,
+-\fBuse_env\fP.
+-For multiple-terminal applications,
+-\fBnewterm\fP may be called before \fBinitscr\fP.
+-.PP
+-The initscr code determines the terminal type and initializes all \fBcurses\fP
+-data structures.
+-\fBinitscr\fP also causes the first call to \fB\%refresh\fP(3X)
+-to clear the screen.
+-If errors occur, \fBinitscr\fP writes an appropriate error
+-message to standard error and exits;
+-otherwise, a pointer is returned to \fBstdscr\fP.
++.B \%initscr
++determines the terminal type and initializes the library's
++.IR SCREEN ","
++.IR WINDOW ","
++and other data structures.
++It is normally the first
++.I curses
++function call a program performs.
++However,
++an application with unusual needs might employ a few other
++.I curses
++functions beforehand:
++.bP
++\fB\%slk_init\fP(3X) to set up soft-label keys;
++.bP
++\fB\%filter\fP(3X) if the program is designed to operate in a process
++pipeline;
++.bP
++\fB\%ripoffline\fP(3X) to reserve up to five lines at the top and/or
++bottom of the screen from management by
++.BR \%stdscr ","
++the standard
++.I curses
++window;
++and
++.bP
++\fB\%use_env\fP(3X) and/or \fB\%use_tioctl\fP(3X) to configure use of
++the process environment and operating system's terminal driver,
++respectively,
++when determining the dimensions of the terminal display.
++.PP
++Further,
++a
++.I curses
++program might call
++.B \%newterm
++prior to or instead of
++.B \%initscr
++in two specialized cases described in its subsection below.
++.PP
++.B \%initscr
++causes the first \fB\%refresh\fP(3X) call to clear the screen.
++If errors occur,
++.B \%initscr
++writes an appropriate diagnostic message to the standard error stream
++and exits;
++otherwise,
++it returns a pointer to
++.BR stdscr "."
+ .SS newterm
+-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\fP.
+-.PP
+-The routine \fBnewterm\fP should be called once for each terminal.
+-It returns a variable of type \fISCREEN *\fP which should be saved
+-as a reference to that terminal.
+-\fBnewterm\fP's arguments are
+-.bP
+-the \fItype\fP of the terminal to be used in place of \fB$TERM\fP,
+-.bP
+-an output stream connected to the terminal, and
+-.bP
+-an input stream connected to the terminal
+-.PP
+-If the \fItype\fP parameter is \fBNULL\fP, \fB$TERM\fP will be used.
+-.PP
+-The file descriptor of the output stream is passed to \fBsetupterm\fP(3X),
+-which returns a pointer to a \fI\%TERMINAL\fP structure.
+-\fBnewterm\fP's return value holds a pointer to the \fI\%TERMINAL\fP structure.
++An application that manages multiple terminals should call
++.B \%newterm
++once for each such device
++.I instead
++of
++.BR \%initscr "."
++.BR \%newterm 's
++arguments are
++.bP
++the
++.I type
++of the associated terminal,
++or
++.I NULL
++to use the
++.I TERM
++environment variable;
++.bP
++an output stream
++.I outf
++connected to the terminal;
++and
++.bP
++an input stream
++.I inf
++connected to the terminal.
++It returns a variable of structure type
++.I SCREEN
++.BR * ","
++which should be saved for later use with
++.B \%set_term
++and
++.BR \%delscreen "."
++.PP
++.B \%newterm
++passes the file descriptor of the output stream to the
++.I \%term\%info
++function \fB\%setupterm\fP(3X),
++which returns a pointer to a
++.I \%TERMINAL
++structure that
++.B \%newterm
++stores in the
++.I SCREEN
++it returns to the application.
++.PP
++An application that needs to inspect a terminal type's capabilities,
++so that it can continue to run in a line-oriented mode
++if the terminal cannot support a screen-oriented program,
++would also use
++.BR \%newterm "."
++If at most one terminal connection is needed,
++the programmer could perform such a capability test,
++decide which mode in which to operate,
++then call
++.B \%delscreen
++on the pointer returned by
++.BR \%newterm ","
++and proceed with either
++.B \%initscr
++or a
++.RI non- curses
++interface.
+ .SS endwin
+ The program must also call
+-\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\fP before exiting or escaping from
+-\fBcurses\fP mode temporarily.
+-This routine
++.B \%endwin
++for each terminal being used before exiting from
++.IR curses "."
++If
++.B \%newterm
++is called more than once for the same terminal,
++the first terminal referred to must be the last one for which
++.B \%endwin
++is called.
++.PP
++A program should always call
++.B \%endwin
++before exiting the application
++or temporarily suspending
++.IR curses "'s"
++management of the terminal.
++.BR \%endwin ":"
+ .bP
+ resets colors to correspond with the default color pair 0,
+ .bP
+@@ -122,132 +206,200 @@
+ .bP
+ clears the remainder of the line so that it uses the default colors,
+ .bP
+-sets the cursor to normal visibility (see \fBcurs_set\fP(3X)),
+-.bP
+-stops cursor-addressing mode using the \fIexit_ca_mode\fP terminal capability,
++sets the cursor to normal visibility
++(see \fB\%curs_set\fP(3X)),
+ .bP
+-restores tty modes (see \fBreset_shell_mode\fP(3X)).
+-.PP
+-Calling \fB\%refresh\fP(3X) or \fBdoupdate\fP(3X) after a
+-temporary escape causes the program to resume visual mode.
++if applicable,
++stops cursor-addressing mode using the
++.B \%exit_ca_mode
++.RB \%( rmcup )
++terminal capability,
++and
++.bP
++restores terminal modes (see \fB\%reset_shell_mode\fP(3X)).
++.PP
++Calling \fB\%refresh\fP(3X) or \fB\%doupdate\fP(3X) after a
++temporary escape causes
++.I curses
++to resume managing the terminal.
+ .SS isendwin
+-The \fBisendwin\fP routine returns \fBTRUE\fP if \fBendwin\fP has been
+-called without any subsequent calls to \fB\%wrefresh\fP,
+-and \fBFALSE\fP otherwise.
++.B \%isendwin
++returns
++.B TRUE
++if
++.B \%endwin
++has been called without any subsequent calls to \fB\%wrefresh\fP(3X),
++and
++.B FALSE
++otherwise.
+ .SS set_term
+-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 \fISCREEN\fP pointers;
+-all other routines affect only the current terminal.
++.B \%set_term
++re-orients the
++.I curses
++library's operations to another terminal
++when the application has arranged to manage more than one with
++.BR \%newterm "."
++.B \%set_term
++expects a
++.I SCREEN
++pointer previously returned by
++.B \%newterm
++as an argument,
++and returns the previous one.
++.B \%set_term
++is the only
++.I curses
++API function that manipulates
++.I SCREEN
++pointers;
++all others affect only the current terminal.
+ .SS delscreen
+-The \fBdelscreen\fP routine frees storage associated with the
+-\fISCREEN\fP data structure.
+-The \fBendwin\fP routine does not do
+-this, so \fBdelscreen\fP should be called after \fBendwin\fP if a
+-particular \fISCREEN\fP is no longer needed.
++.B \%delscreen
++frees the storage backing the supplied
++.I SCREEN
++pointer argument.
++.B \%endwin
++does not,
++so that an application can resume managing a terminal with
++.I curses
++after a
++(possibly conditional or temporary)
++suspension;
++see \fB\%curs_kernel\fP(3X).
++Call
++.B \%delscreen
++after
++.B \%endwin
++when a particular
++.I SCREEN
++structure
++is no longer needed.
+ .SH RETURN VALUE
+-\fBendwin\fP returns the integer \fBERR\fP upon failure and \fBOK\fP
+-upon successful completion.
+-.PP
+-Routines that return pointers always return \fBNULL\fP on error.
++.B \%endwin
++returns
++.B OK
++on success and
++.B ERR
++on failure.
+ .PP
+-X/Open defines no error conditions.
+-In this implementation
++In
++.IR \%ncurses ","
+ .bP
+-\fBendwin\fP returns
++.B \%endwin
++returns
+ .B ERR
+ if
+ .RS
+ .bP
+-the terminal was not initialized, or
++the terminal was not initialized,
+ .bP
+-\fBendwin\fP is called more than once without updating the screen, or
++.B \%endwin
++is called more than once without updating the screen,
++or
+ .bP
+-\fBreset_shell_mode\fP(3X) return
++\fB\%reset_shell_mode\fP(3X) returns
+ .BR ERR "."
+ .RE
+ .bP
+-\fBnewterm\fP
++.B \%newterm
+ returns
+ .B ERR
+-if it cannot allocate the data structures for the screen,
+-or for the top-level windows within the screen,
+-i.e.,
+-\fBcurscr\fP, \fBnewscr\fP, or \fBstdscr\fP.
+-.bP
+-\fBset_term\fP
+-returns no error.
++if it cannot allocate storage for the
++.I SCREEN
++data structure
++or the top-level windows thereof:
++.BR \%curscr ","
++.BR \%newscr ","
++and
++.BR \%stdscr "."
++.PP
++Functions that return pointers return
++.I NULL
++on error.
++In
++.IR \%ncurses ","
++.B \%set_term
++does not fail.
+ .SH PORTABILITY
+-These functions were described in X/Open Curses, Issue 4.
+-As of 2015, the current document is X/Open Curses, Issue 7.
++X/Open Curses,
++Issue 4 describes these functions.
++It specifies no error conditions for them.
+ .SS Differences
+ X/Open Curses specifies that portable applications must not
+-call \fBinitscr\fP more than once:
++call \fB\%initscr\fP more than once:
+ .bP
+-The portable way to use \fBinitscr\fP is once only,
++The portable way to use \fB\%initscr\fP is once only,
+ using \fB\%refresh\fP(3X)
+-to restore the screen after \fBendwin\fP.
++to restore the screen after \fB\%endwin\fP.
+ .bP
+-This implementation allows using \fBinitscr\fP after \fBendwin\fP.
++This implementation allows using \fB\%initscr\fP after \fB\%endwin\fP.
+ .PP
+ Old versions of curses, e.g., BSD 4.4, would return a null pointer
+-from \fBinitscr\fP when an error is detected, rather than exiting.
+-It is safe but redundant to check the return value of \fBinitscr\fP
++from \fB\%initscr\fP when an error is detected, rather than exiting.
++It is safe but redundant to check the return value of \fB\%initscr\fP
+ in X/Open Curses.
+ .PP
+-Calling \fBendwin\fP does not dispose of the memory allocated in \fBinitscr\fP
+-or \fBnewterm\fP.
++Calling \fB\%endwin\fP does not dispose of the memory allocated in
++\fB\%initscr\fP or \fB\%newterm\fP.
+ Deleting a \fISCREEN\fP provides a way to do this:
+ .bP
+-X/Open Curses does not say what happens to \fI\%WINDOW\fPs when \fBdelscreen\fP
++X/Open Curses does not say what happens to \fI\%WINDOW\fPs when
++\fB\%delscreen\fP
+ \*(``frees storage associated with the \fISCREEN\fP\*(''
+ nor does the SVr4 documentation help,
+-adding that it should be called after \fBendwin\fP if a \fISCREEN\fP
++adding that it should be called after \fB\%endwin\fP if a \fISCREEN\fP
+ is no longer needed.
+ .bP
+ However, \fI\%WINDOW\fPs are implicitly associated with a \fISCREEN\fP.
+-so that it is reasonable to expect \fBdelscreen\fP to deal with these.
++so that it is reasonable to expect \fB\%delscreen\fP to deal with these.
+ .bP
+ SVr4 curses deletes the standard \fI\%WINDOW\fP structures
+-\fBstdscr\fP and \fBcurscr\fP as well as a work area \fBnewscr\fP.
++\fB\%stdscr\fP and \fB\%curscr\fP as well as a work area \fB\%newscr\fP.
+ SVr4 curses ignores other windows.
+ .bP
+ Since version 4.0 (1996),
+ \fI\%ncurses\fP has maintained a list of all windows for each screen,
+-using that information to delete those windows when \fBdelscreen\fP is called.
++using that information to delete those windows when \fB\%delscreen\fP is
++called.
+ .bP
+ NetBSD copied this feature of \fI\%ncurses\fP in 2001.
+ PDCurses follows the SVr4 model,
+ deleting only the standard \fI\%WINDOW\fP structures.
+ .SS "High-level versus Low-level"
+ Different implementations may disagree regarding the level of some functions.
+-For example, \fISCREEN\fP (returned by \fBnewterm\fP) and
+-\fI\%TERMINAL\fP (returned by \fBsetupterm\fP(3X)) hold file descriptors for
+-the output stream.
+-If an application switches screens using \fBset_term\fR,
+-or switches terminals using \fBset_curterm\fP(3X),
++For example, \fISCREEN\fP (returned by \fB\%newterm\fP) and
++\fI\%TERMINAL\fP (returned by \fB\%setupterm\fP(3X)) hold file
++descriptors for the output stream.
++If an application switches screens using \fB\%set_term\fR,
++or switches terminals using \fB\%set_curterm\fP(3X),
+ applications which use the output file descriptor can have different
+ behavior depending on which structure holds the corresponding descriptor.
+-.PP
+-For example
+ .bP
+-NetBSD's \fBbaudrate\fP(3X) function uses the descriptor in \fI\%TERMINAL\fP.
+-\fI\%ncurses\fP and SVr4 use the descriptor in \fISCREEN\fP.
++NetBSD's
++.I \%baudrate
++function uses the descriptor in
++.IR \%TERMINAL "."
++.I \%ncurses
++and SVr4
++.I curses
++use the descriptor in
++.IR SCREEN "."
+ .bP
+ NetBSD and \fI\%ncurses\fP use the descriptor
+ in \fI\%TERMINAL\fP
+ for terminal I/O modes,
+ e.g.,
+-\fBdef_shell_mode\fP(3X),
+-\fBdef_prog_mode\fP(3X).
++\fB\%def_shell_mode\fP(3X),
++\fB\%def_prog_mode\fP(3X).
+ SVr4 curses uses the descriptor in \fISCREEN\fP.
+-.SS "Unset \fITERM\fP Variable"
+-If the \fITERM\fP variable is missing or empty, \fBinitscr\fP uses the
++.SS "Unset \f(BITERM\fP Variable"
++If the \fITERM\fP variable is missing or empty, \fB\%initscr\fP uses the
+ value \*(``unknown\*('',
+-which normally corresponds to a terminal entry with the \fIgeneric\fP
+-(\fIgn\fP) capability.
+-Generic entries are detected by \fBsetupterm\fP(3X)
++which normally corresponds to a terminal entry with the
++.B \%generic
++.RB ( gn )
++capability.
++Generic entries are detected by \fB\%setupterm\fP(3X)
+ and cannot be used for full-screen operation.
+ Other implementations may handle
+ a missing/empty \fITERM\fP variable differently.
+@@ -271,7 +423,7 @@
+ .RE
+ .PP
+ This implementation establishes signal handlers during initialization,
+-e.g., \fBinitscr\fP or \fBnewterm\fP.
++e.g., \fB\%initscr\fP or \fB\%newterm\fP.
+ Applications which must handle these signals should set up the corresponding
+ handlers \fIafter\fP initializing the library:
+ .TP 5
+@@ -283,18 +435,18 @@
+ Walking the \fISCREEN\fP list is unsafe, since all list management
+ is done without any signal blocking.
+ .bP
+-On systems which have \fBREENTRANT\fP turned on, \fBset_term\fP uses
++On systems which have \fB\%REENTRANT\fP turned on, \fB\%set_term\fP uses
+ functions which could deadlock or misbehave in other ways.
+ .bP
+-\fBendwin\fP calls other functions,
++\fB\%endwin\fP calls other functions,
+ many of which use \fI\%stdio\fP(3) or other library functions which are
+ clearly unsafe.
+ .RE
+ .TP 5
+ .B SIGTERM
+-This uses the same handler as \fBSIGINT\fP, with the same limitations.
++This uses the same handler as \fB\%SIGINT\fP, with the same limitations.
+ It is not mentioned in X/Open Curses, but is more suitable for this
+-purpose than \fBSIGQUIT\fP (which is used in debugging).
++purpose than \fB\%SIGQUIT\fP (which is used in debugging).
+ .TP 5
+ .B SIGTSTP
+ This handles the \fIstop\fP signal, used in job control.
+@@ -324,8 +476,8 @@
+ .BR \%KEY_RESIZE "."
+ .RE
+ .IP
+-At the same time, \fI\%ncurses\fP calls \fBresizeterm\fP to adjust the
+-standard screen \fBstdscr\fP,
++At the same time, \fI\%ncurses\fP calls \fB\%resizeterm\fP to adjust the
++standard screen \fB\%stdscr\fP,
+ and update other data such as \fBLINES\fP and \fBCOLS\fP.
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+Index: man/curs_inopts.3x
+Prereq:  1.77 
+--- ncurses-6.5-20240914+/man/curs_inopts.3x	2024-09-14 20:06:50.000000000 +0000
++++ ncurses-6.5-20240922/man/curs_inopts.3x	2024-09-21 18:05:49.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inopts.3x,v 1.77 2024/09/14 20:06:50 tom Exp $
+-.TH curs_inopts 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inopts.3x,v 1.79 2024/09/21 18:05:49 tom Exp $
++.TH curs_inopts 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -366,7 +366,7 @@
+ when it handles the interrupt,
+ suspend,
+ or quit characters under the normal (\*(``cooked\*('')
+-or cbreak line discplines on POSIX systems;
++or cbreak line disciplines on POSIX systems;
+ see \fI\%termios\fP(3).
+ The default behavior is inherited from the terminal driver settings.
+ Calling
+Index: man/curs_kernel.3x
+Prereq:  1.70 
+--- ncurses-6.5-20240914+/man/curs_kernel.3x	2024-09-14 20:14:54.000000000 +0000
++++ ncurses-6.5-20240922/man/curs_kernel.3x	2024-09-21 18:05:20.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_kernel.3x,v 1.70 2024/09/14 20:14:54 tom Exp $
+-.TH curs_kernel 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_kernel.3x,v 1.72 2024/09/21 18:05:20 tom Exp $
++.TH curs_kernel 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -297,8 +297,8 @@
+ .B \%ripoffline
+ returns
+ .B ERR
+-if the maximum number of ripped-off lines
+-exceeds the maximum (5).
++if the accumulated quantity of ripped-off lines
++would exceed the maximum (5).
+ .SH NOTES
+ .B \%getsyx
+ is a macro;
+Index: man/curs_move.3x
+Prereq:  1.44 
+--- ncurses-6.5-20240914+/man/curs_move.3x	2024-07-27 20:11:42.000000000 +0000
++++ ncurses-6.5-20240922/man/curs_move.3x	2024-09-21 18:03:44.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_move.3x,v 1.44 2024/07/27 20:11:42 tom Exp $
+-.TH curs_move 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_move.3x,v 1.46 2024/09/21 18:03:44 tom Exp $
++.TH curs_move 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -85,9 +85,9 @@
+ In
+ .IR \%ncurses ,
+ .B \%wmove
+-fails if its
+-.I \%WINDOW
+-pointer argument is
++fails if
++.I win
++is
+ .BR NULL .
+ .SH NOTES
+ .B \%move
+Index: man/curs_scr_dump.3x
+Prereq:  1.47 
+--- ncurses-6.5-20240914+/man/curs_scr_dump.3x	2024-06-08 20:33:56.000000000 +0000
++++ ncurses-6.5-20240922/man/curs_scr_dump.3x	2024-09-21 09:30:22.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_scr_dump.3x,v 1.47 2024/06/08 20:33:56 tom Exp $
+-.TH curs_scr_dump 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_scr_dump.3x,v 1.49 2024/09/21 09:30:22 tom Exp $
++.TH curs_scr_dump 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -202,6 +202,19 @@
+ such that the dump data is also considered invalid
+ \*(``if the time-stamp of the tty is old\*(''
+ but does not define \*(``old\*(''.
++.PP
++As of 2024, PDCurses provides these functions.
++NetBSD curses does not provide these functions,
++although it provides \fB\%getwin\fP.
++.PP
++Other implementations of curses store the window in binary form.
++One drawback to binary form is that this makes the dump dependent upon
++the curses library's internal data structures.
++Rather than do that, ncurses stores the dump in textual form,
++allowing more flexible use of the data.
++For instance, SVr4 curses \fB\%scr_restore\fP requires that the
++dumped window have the same dimensions as the restored window.
++ncurses uses \fB\%wresize\fP to adjust the restored window size.
+ .SH HISTORY
+ SVr3 (1987) introduced
+ .BR \%scr_dump ","
+@@ -211,10 +224,13 @@
+ SVr3.1 added
+ .BR \%scr_set "."
+ .SH SEE ALSO
++.na
+ \fB\%curses\fP(3X),
+ \fB\%curs_initscr\fP(3X),
+ \fB\%curs_refresh\fP(3X),
+ \fB\%curs_util\fP(3X),
+ \fB\%system\fP(3),
+ \fB\%scr_dump\fP(5),
+-\fB\%terminfo\fP(5)
++\fB\%terminfo\fP(5),
++\fB\%wresize\fP(3X)
++.ad
+Index: man/curs_scroll.3x
+Prereq:  1.47 
+--- ncurses-6.5-20240914+/man/curs_scroll.3x	2024-09-14 20:06:50.000000000 +0000
++++ ncurses-6.5-20240922/man/curs_scroll.3x	2024-09-22 14:08:11.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_scroll.3x,v 1.47 2024/09/14 20:06:50 tom Exp $
+-.TH curs_scroll 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_scroll.3x,v 1.49 2024/09/22 14:08:11 tom Exp $
++.TH curs_scroll 3X 2024-09-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -67,7 +67,7 @@
+ becomes line
+ .IR i "\-1."
+ The text of the top line in the window disappears and the bottom line
+-is populated with blank characters;
++is populated with the background character;
+ see \fB\%bkgd\fP(3X)
+ (wide-character API users: \fB\%bkgrnd\fP(3X)).
+ As an optimization,
+@@ -158,7 +158,7 @@
+ Neither SVr4
+ .I curses
+ nor X/Open Curses specify whether these functions zero the attributes or
+-color pair identifier of the blank character.
++color pair identifier of the background character.
+ In
+ .IR \%ncurses ","
+ they do not.
+Index: man/curs_termcap.3x
+Prereq:  1.89 
+--- ncurses-6.5-20240914+/man/curs_termcap.3x	2024-09-14 20:06:50.000000000 +0000
++++ ncurses-6.5-20240922/man/curs_termcap.3x	2024-09-21 18:00:03.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_termcap.3x,v 1.89 2024/09/14 20:06:50 tom Exp $
+-.TH curs_termcap 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_termcap.3x,v 1.91 2024/09/21 18:00:03 tom Exp $
++.TH curs_termcap 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -40,6 +40,9 @@
+ .el   .ds '' ""
+ .\}
+ .
++.ie \n(.g .ds : \:
++.el       .ds : \" empty
++.
+ .de bP
+ .ie n  .IP \(bu 4
+ .el    .IP \(bu 2
+@@ -505,7 +508,7 @@
+ .\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/src/lib/\
+ .\"   libtermlib/makefile
+ and added another test program.
+-The library remained much the same though 4.3BSD
++The library remained much the same through 4.3BSD
+ (June 1986).
+ 4.4BSD-Lite
+ (June 1994)
+@@ -677,11 +680,9 @@
+ the \fItermcap\fP interface to accommodate the latter's limitation in
+ this respect.
+ .SH "SEE ALSO"
+-.na
+-.UR https://invisible\-island.net/ncurses/tctest.html
+-\fITCTEST - A Termcap Test Utility\fP
++.UR https://\*:invisible\-\*:island\*:.net/\*:ncurses/\*:tctest\*:.html
++.I "TCTEST \(em A Termcap Test Utility"
+ .UE
+-.ad
+ .PP
+ \fB\%curses\fP(3X),
+ \fB\%curs_terminfo\fP(3X),
+Index: man/curs_util.3x
+Prereq:  1.116 
+--- ncurses-6.5-20240914+/man/curs_util.3x	2024-09-11 21:02:40.000000000 +0000
++++ ncurses-6.5-20240922/man/curs_util.3x	2024-09-21 09:30:22.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_util.3x,v 1.116 2024/09/11 21:02:40 tom Exp $
+-.TH curs_util 3X 2024-09-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_util.3x,v 1.118 2024/09/21 09:30:22 tom Exp $
++.TH curs_util 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -523,6 +523,7 @@
+ and 6.0 (2015)
+ .IR \%use_tioctl "." \" 20120714
+ .SH SEE ALSO
++.na
+ \fB\%curses\fP(3X),
+ \fB\%curs_initscr\fP(3X),
+ \fB\%curs_inopts\fP(3X),
+@@ -531,3 +532,4 @@
+ \fB\%curs_sp_funcs\fP(3X),
+ \fB\%curs_variables\fP(3X),
+ \fB\%legacy_coding\fP(3X)
++.ad
+Index: man/curs_variables.3x
+Prereq:  1.51 
+--- ncurses-6.5-20240914+/man/curs_variables.3x	2024-09-14 20:06:50.000000000 +0000
++++ ncurses-6.5-20240922/man/curs_variables.3x	2024-09-21 18:01:56.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_variables.3x,v 1.51 2024/09/14 20:06:50 tom Exp $
+-.TH curs_variables 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_variables.3x,v 1.53 2024/09/21 18:01:56 tom Exp $
++.TH curs_variables 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -361,12 +361,10 @@
+ most users have decided either to override the value,
+ or to rely upon its default.
+ .SH SEE ALSO
+-.na
+ .UR https://\*:unicode\*:.org/\*:reports/\*:tr29/
+ [UAX #29] \*(``Unicode Standard Annex #29: Unicode Text
+ Segmentation\*(''
+ .UE
+-.ad
+ .PP
+ \fB\%curses\fP(3X),
+ \fB\%curs_color\fP(3X),
+Index: man/infocmp.1m
+Prereq:  1.112 
+--- ncurses-6.5-20240914+/man/infocmp.1m	2024-09-14 20:06:50.000000000 +0000
++++ ncurses-6.5-20240922/man/infocmp.1m	2024-09-21 18:04:29.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: infocmp.1m,v 1.112 2024/09/14 20:06:50 tom Exp $
+-.TH @INFOCMP@ 1M 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: infocmp.1m,v 1.114 2024/09/21 18:04:29 tom Exp $
++.TH @INFOCMP@ 1M 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -53,7 +53,6 @@
+ \fB@INFOCMP@\fP \-
+ compare or print out \fIterminfo\fP descriptions
+ .SH SYNOPSIS
+-.na
+ .HP
+ .B @INFOCMP@
+ .RB [ \-\
+@@ -100,7 +99,6 @@
+ .IR width ]
+ .RI [ \%terminal\%-type
+ \&.\|.\|.\& ]
+-.ad
+ .SH DESCRIPTION
+ \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
+@@ -605,41 +603,58 @@
+ compiled terminal description database
+ .SH EXTENSIONS
+ The
+-\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.
++.BR \-0 ","
++.BR \-1 ","
++.BR \-a ","
++.BR \-e ","
++.BR \-E ","
++.BR \-f ","
++.BR \-F ","
++.BR \-g ","
++.BR \-G ","
++.BR \-i ","
++.BR \-l ","
++.BR \-p ","
++.BR \-q ","
++.BR \-Q ","
++.BR \-R ","
++.BR \-t ","
++.BR \-T ","
++and
++.B \-V
++options are
++.I \%ncurses
++extensions.
++.SH PORTABILITY
++X/Open Curses, Issue 7 (2009) specifies
++.IR \%infocmp "."
++It does not mention options for producing descriptions in
++.I \%term\%cap
++format.
+ .PP
+ SVr4
+-infocmp does not distinguish between absent and canceled capabilities.
+-Also, it shows missing integer capabilities as \fB\-1\fP
+-(the internal value used to represent missing integers).
+-This implementation shows those as \*(``NULL\*('',
+-for consistency with missing strings.
+-.PP
+-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\fP \fB\-RBSD\fP.
+-.SH PORTABILITY
+-X/Open Curses, Issue 7 (2009) provides a description of \fBinfocmp\fP.
+-It does not mention the options used for converting to termcap format.
++.I \%infocmp
++does not distinguish between absent and canceled capabilities.
++It furthermore reports missing integer capabilities as
++.B \-1
++(its internal representation).
++.I \%ncurses
++shows these as \*(``NULL\*(''
++for consistency with missing string capabilities.
++.PP
++The
++.B \-r
++option
++of
++.I \%ncurses
++.I \%infocmp
++uses SVr4's notion of of \*(``termcap\*('' capabilities.
++BSD
++.I curses
++had a more restricted set.
++To see only those present in 4.4BSD,
++use
++.RB \*(`` "\-r \-RBSD" \*(''.
+ .SH HISTORY
+ Although System V Release 2 provided a terminfo library,
+ it had no documented tool for decompiling the terminal descriptions.
+Index: man/ncurses.3x
+Prereq:  1.231 
+--- ncurses-6.5-20240914+/man/ncurses.3x	2024-09-14 20:06:50.000000000 +0000
++++ ncurses-6.5-20240922/man/ncurses.3x	2024-09-21 18:02:58.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: ncurses.3x,v 1.231 2024/09/14 20:06:50 tom Exp $
+-.TH ncurses 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: ncurses.3x,v 1.233 2024/09/21 18:02:58 tom Exp $
++.TH ncurses 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -333,17 +333,19 @@
+ .I curses
+ is implemented using the operating system's terminal driver;
+ key events are received not as scan codes but as byte sequences.
+-Graphical keycaps
++The driver reports graphical keycaps
+ (alphanumeric and punctuation keys,
+ and the space)
+-appear as-is.
++as-is.
+ Everything else,
+ including the tab,
+ enter/return,
+ keypad,
+ arrow,
+ and function keys,
+-appears as a control character or a multibyte
++appears to
++.I curses
++as a control character or a multibyte
+ .I "escape sequence."
+ .I curses
+ can translate the latter into unique
+@@ -566,11 +568,11 @@
+ .I \%WINDOW
+ is stored as a
+ .IR \%cchar_t .
+-.PP
+ \fB\%setcchar\fP(3X) and \fB\%getcchar\fP(3X)
+ store and retrieve
+ .I \%cchar_t
+ data.
++.PP
+ The wide library API of
+ .I \%ncurses
+ depends on two data types standardized by ISO C95.
+@@ -597,11 +599,11 @@
+ can store a
+ .I \%wchar_t
+ or the constant
+-.BR \%WEOF ,
++.IR \%WEOF ,
+ analogously to the
+ .IR int -sized
+ character manipulation functions of ISO C and its constant
+-.BR \%EOF .
++.IR \%EOF .
+ .RE
+ .\"
+ .SS "Function Name Index"
+@@ -1578,7 +1580,7 @@
+ Descriptions in
+ .I \%term\%info
+ format are normally stored in a directory tree using subdirectories
+-named by the common first letters of the terminal types named therein.
++named for the common first letters of the terminal types named therein.
+ This is the scheme used in System\ V.
+ .bP
+ If
+Index: man/tabs.1
+Prereq:  1.63 
+--- ncurses-6.5-20240914+/man/tabs.1	2024-09-14 20:06:50.000000000 +0000
++++ ncurses-6.5-20240922/man/tabs.1	2024-09-21 18:04:07.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tabs.1,v 1.63 2024/09/14 20:06:50 tom Exp $
+-.TH @TABS@ 1 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: tabs.1,v 1.65 2024/09/21 18:04:07 tom Exp $
++.TH @TABS@ 1 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -247,7 +247,8 @@
+ .RB \%( smglp )
+ capabilities needed to support the feature.
+ .bP
+-Unlike \fB@TPUT@\fP(1),
++Unlike
++.IR tput ,
+ .I tabs
+ has no specification in X/Open Curses Issue\ 7.
+ .PP
+@@ -276,7 +277,7 @@
+ That option is not specified by POSIX.
+ .PP
+ The PWB/Unix
+-.B tabs
++.I tabs
+ utility returned in System III (1980),
+ and used built-in tables
+ to support a half-dozen hardcopy terminal (printer) types.
+@@ -315,10 +316,10 @@
+ The
+ .B +m
+ option in
+-.I \%ncurses
+-.I tabs
+-(\fB\%@TABS@\fP) differs from the SVr4 feature by using terminal
+-capabilities rather than built-in tables.
++.IR \%ncurses 's
++implementation
++differs from the SVr4 feature by using terminal capabilities
++rather than built-in tables.
+ .PP
+ POSIX documents no limit on the number of tab stops.
+ Other implementations impose one;
+@@ -327,8 +328,8 @@
+ utility.
+ While some terminals may not accept an arbitrary number of tab stops,
+ .I \%ncurses
+-\fB\%@TABS@\fP attempts to set tab stops up to the right margin if the
+-list thereof is sufficiently long.
++attempts to set tab stops up to the right margin
++if the list thereof is sufficiently long.
+ .PP
+ The \*(``Rationale\*('' section of the Issue 6
+ .I tabs
+Index: man/terminfo.tail
+Prereq:  1.152 
+--- ncurses-6.5-20240914+/man/terminfo.tail	2024-09-14 00:43:08.000000000 +0000
++++ ncurses-6.5-20240922/man/terminfo.tail	2024-09-21 17:54:42.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: terminfo.tail,v 1.152 2024/09/14 00:43:08 Branden.Robinson Exp $
++.\" $Id: terminfo.tail,v 1.153 2024/09/21 17:54:42 Branden.Robinson Exp $
+ .ps +1
+ .SS "User-Defined Capabilities"
+ .
+@@ -1629,8 +1629,8 @@
+ terminals have a predefined set of \fIN\fP colors
+ (where \fIN\fP is usually 8),
+ and can set
+-character-cell foreground and background characters independently, mixing them
+-into \fIN\fP\ *\ \fIN\fP color pairs.
++character-cell foreground and background colors independently,
++mixing them into \fIN\fP\ *\ \fIN\fP color pairs.
+ .bP
+ On HP-like terminals, the user must set each color
+ pair up separately (foreground and background are not independently settable).
+Index: man/wresize.3x
+Prereq:  1.40 
+--- ncurses-6.5-20240914+/man/wresize.3x	2024-07-27 20:08:58.000000000 +0000
++++ ncurses-6.5-20240922/man/wresize.3x	2024-09-21 23:48:27.000000000 +0000
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1996
+ .\"
+-.\" $Id: wresize.3x,v 1.40 2024/07/27 20:08:58 tom Exp $
+-.TH wresize 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: wresize.3x,v 1.42 2024/09/21 23:48:27 tom Exp $
++.TH wresize 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%wresize\fP \-
+ resize a \fIcurses\fR window
+@@ -55,9 +55,10 @@
+ .IR columns "."
+ If either dimension is larger than its current value,
+ .I \%ncurses
+-fills the expanded part of the window with the blank character
+-configured by \fB\%wbkgdset\fP(3X)
+-(wide-character API users: \fB\%wbkgrndset\fP(3X)).
++the expanded part of the window is filled with blanks merged with
++current background rendition
++(configured by \fB\%wbkgdset\fP(3X),
++or by wide-character API: \fB\%wbkgrndset\fP(3X)).
+ .SH RETURN VALUE
+ .B \%wresize
+ returns
+Index: misc/ncurses-config.in
+Prereq:  1.55 
+--- ncurses-6.5-20240914+/misc/ncurses-config.in	2024-09-14 22:16:56.000000000 +0000
++++ ncurses-6.5-20240922/misc/ncurses-config.in	2024-09-21 17:24:52.000000000 +0000
+@@ -1,5 +1,5 @@
+ #!@SHELL@
+-# $Id: ncurses-config.in,v 1.55 2024/09/14 22:16:56 tom Exp $
++# $Id: ncurses-config.in,v 1.56 2024/09/21 17:24:52 tom Exp $
+ ##############################################################################
+ # Copyright 2018-2022,2024 Thomas E. Dickey                                  #
+ # Copyright 2006-2015,2017 Free Software Foundation, Inc.                    #
+@@ -50,8 +50,6 @@
+ TINFO_LIB="@TINFO_ARG_SUFFIX@"
+ RPATH_LIST="@RPATH_LIST@"
+ 
+-includesubdir="@includedir@/${THIS}"
+-
+ # Ensure that RPATH_LIST contains only absolute pathnames, if it is nonempty.
+ # We cannot filter it out within the build-process since the variable is used
+ # in some special cases of installation using a relative path.
+@@ -80,11 +78,14 @@
+ # the headers to include like this:
+ #	
+ if [ x@WITH_OVERWRITE@ = xno ]; then
++	includesubdir="@includedir@/${THIS}"
+ 	case $includedir in
+ 	$prefix/include/ncurses@LIB_SUFFIX@@EXTRA_SUFFIX@)
+ 		includedir=`echo "$includedir" | sed -e 's,/[^/]*$,,'`
+ 		;;
+ 	esac
++else
++	includesubdir="@includedir@"
+ fi
+ 
+ LIBS="@LIBS@"
+@@ -95,20 +96,10 @@
+ fi
+ 
+ CFLAGS="@PKG_CFLAGS@"
+-if [ "$includedir" != "/usr/include" ]; then
+-	if [ "x@WITH_OVERWRITE@" = xno ]
+-	then
+-		[ -n "$CFLAGS" ] && CFLAGS="$CFLAGS "
+-		CFLAGS="$CFLAGS -I${includesubdir}"
+-	fi
+-	[ -n "$CFLAGS" ] && CFLAGS="$CFLAGS "
+-	CFLAGS="$CFLAGS-I${includedir}"
+-	includetop=`echo "$includedir" | sed -e 's,/include/[^/]*$,/include,'`
+-	[ "$includetop" = "/usr/include" ] && includetop="$includedir"
+-	if [ "x$includetop" != "x$includedir" ]
+-	then
+-		[ -n "$CFLAGS" ] && CFLAGS="$CFLAGS "
+-		CFLAGS="$CFLAGS-I$includetop"
++if [ "$includesubdir" != "/usr/include" ]; then
++	CFLAGS="$CFLAGS -I${includesubdir}"
++	if [ "$includedir" != "/usr/include" ]; then
++		[ x@WITH_OVERWRITE@ = xno ] && CFLAGS="$CFLAGS -I${includedir}"
+ 	fi
+ fi
+ 
+Index: ncurses/base/MKlib_gen.sh
+Prereq:  1.73 
+--- ncurses-6.5-20240914+/ncurses/base/MKlib_gen.sh	2022-10-01 13:14:20.000000000 +0000
++++ ncurses-6.5-20240922/ncurses/base/MKlib_gen.sh	2024-09-22 20:41:58.000000000 +0000
+@@ -2,10 +2,10 @@
+ #
+ # MKlib_gen.sh -- generate sources from curses.h macro definitions
+ #
+-# ($Id: MKlib_gen.sh,v 1.73 2022/10/01 13:14:20 tom Exp $)
++# ($Id: MKlib_gen.sh,v 1.74 2024/09/22 20:41:58 tom Exp $)
+ #
+ ##############################################################################
+-# Copyright 2018-2021,2022 Thomas E. Dickey                                  #
++# Copyright 2018-2022,2024 Thomas E. Dickey                                  #
+ # Copyright 1998-2016,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -464,8 +464,11 @@
+ 		}
+ END		{
+ 		if ( "$USE" != "generated" ) {
+-			print "int main(void)"
+-			print "{"
++			print  "static int link_test(int code)"
++			print  "{"
++			print  "  switch(code)"
++			print  "  {"
++			casenum = 1;
+ 			for (n = 1; n < start; ++n) {
+ 				value = calls[n];
+ 				if ( value !~ /P_POUNDC/ ) {
+@@ -480,13 +483,15 @@
+ 					sub(/^/,"call_",value);
+ 					gsub(/ (a[0-9]|z) /, " 0 ", value);
+ 					gsub(/ int[ \t]*[(][^)]+[)][(][^)]+[)]/, "0", value);
+-					printf "\t%s;\n", value;
++					printf "    case %d: %s; break;\n", casenum++, value;
+ 				} else {
+ 					print value;
+ 				}
+ 			}
+-			print "	return 0;"
+-			print "}"
++			print  "  default: return 0; /* case did not exist */"
++			print  "  }"
++			print  "  return 1; /* case exists */"
++			print  "}"
+ 		}
+ 		}
+ EOF1
+@@ -527,3 +532,34 @@
+ 	-e '/#ident/d' \
+ 	-e '/#line/d' \
+ | sed -f $ED4
++
++# a simple test-driver checks one or all of the linkages
++if test "$USE" = "implemented"
++then
++cat <<"EOF"
++int main(int argc, char *argv[])
++{
++	int n;
++	int rc;
++	if (argc > 1)
++	{
++		rc = !link_test(atoi(argv[1]));
++	}
++	else
++	{
++		rc = 0;
++		for (n = 1; ; ++n)
++		{
++			printf("TEST %d\n", n);
++			fflush(stdout);
++			if (!link_test(n))
++			{
++				rc = 1;
++				break;
++			}
++		}
++	}
++	return rc;
++}
++EOF
++fi
+Index: ncurses/base/lib_refresh.c
+Prereq:  1.48 
+--- ncurses-6.5-20240914+/ncurses/base/lib_refresh.c	2023-05-27 20:13:10.000000000 +0000
++++ ncurses-6.5-20240922/ncurses/base/lib_refresh.c	2024-09-22 20:17:40.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2021,2023 Thomas E. Dickey                                *
++ * Copyright 2020-2023,2024 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.48 2023/05/27 20:13:10 tom Exp $")
++MODULE_ID("$Id: lib_refresh.c,v 1.49 2024/09/22 20:17:40 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ wrefresh(WINDOW *win)
+@@ -55,7 +55,7 @@
+ 
+     T((T_CALLED("wrefresh(%p)"), (void *) win));
+ 
+-    if (win == 0) {
++    if (SP_PARM == NULL || win == NULL) {
+ 	code = ERR;
+     } else if (win == CurScreen(SP_PARM)) {
+ 	CurScreen(SP_PARM)->_clear = TRUE;
+@@ -92,7 +92,7 @@
+ 
+     T((T_CALLED("wnoutrefresh(%p)"), (void *) win));
+ 
+-    if (win == NULL)
++    if (SP_PARM == NULL || win == NULL)
+ 	returnCode(ERR);
+ 
+     /*
+Index: ncurses/base/lib_screen.c
+Prereq:  1.106 
+--- ncurses-6.5-20240914+/ncurses/base/lib_screen.c	2024-07-27 19:22:23.000000000 +0000
++++ ncurses-6.5-20240922/ncurses/base/lib_screen.c	2024-09-22 20:20:36.000000000 +0000
+@@ -42,7 +42,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_screen.c,v 1.106 2024/07/27 19:22:23 tom Exp $")
++MODULE_ID("$Id: lib_screen.c,v 1.108 2024/09/22 20:20:36 tom Exp $")
+ 
+ #define MAX_SIZE 0x3fff		/* 16k is big enough for a window or pad */
+ 
+@@ -960,7 +960,6 @@
+ 	}
+     }
+ #endif
+-    delwin(target);
+     return result;
+ }
+ 
+@@ -972,14 +971,17 @@
+ 
+     T((T_CALLED("scr_restore(%p,%s)"), (void *) SP_PARM, _nc_visbuf(file)));
+ 
+-    if (_nc_access(file, R_OK) >= 0
++    if (SP_PARM != NULL
++	&& _nc_access(file, R_OK) >= 0
+ 	&& (fp = safe_fopen(file, BIN_R)) != 0) {
+-	NewScreen(SP_PARM) = replace_window(NewScreen(SP_PARM), fp);
++	WINDOW *my_newscr = replace_window(NewScreen(SP_PARM), fp);
++	(void) fclose(fp);
++	if (my_newscr != NULL) {
++	    delwin(NewScreen(SP_PARM));
++	    NewScreen(SP_PARM) = my_newscr;
+ #if !USE_REENTRANT
+-	newscr = NewScreen(SP_PARM);
++	    newscr = my_newscr;
+ #endif
+-	(void) fclose(fp);
+-	if (NewScreen(SP_PARM) != 0) {
+ 	    code = OK;
+ 	}
+     }
+@@ -1020,7 +1022,7 @@
+ 
+     T((T_CALLED("scr_init(%p,%s)"), (void *) SP_PARM, _nc_visbuf(file)));
+ 
+-    if (SP_PARM != 0 &&
++    if (SP_PARM != NULL &&
+ #ifdef USE_TERM_DRIVER
+ 	InfoOf(SP_PARM).caninit
+ #else
+@@ -1031,12 +1033,14 @@
+ 
+ 	if (_nc_access(file, R_OK) >= 0
+ 	    && (fp = safe_fopen(file, BIN_R)) != 0) {
+-	    CurScreen(SP_PARM) = replace_window(CurScreen(SP_PARM), fp);
++	    WINDOW *my_curscr = replace_window(CurScreen(SP_PARM), fp);
++	    (void) fclose(fp);
++	    if (my_curscr != NULL) {
++		delwin(CurScreen(SP_PARM));
++		CurScreen(SP_PARM) = my_curscr;
+ #if !USE_REENTRANT
+-	    curscr = CurScreen(SP_PARM);
++		curscr = my_curscr;
+ #endif
+-	    (void) fclose(fp);
+-	    if (CurScreen(SP_PARM) != 0) {
+ 		code = OK;
+ 	    }
+ 	}
+@@ -1059,7 +1063,8 @@
+ 
+     T((T_CALLED("scr_set(%p,%s)"), (void *) SP_PARM, _nc_visbuf(file)));
+ 
+-    if (NCURSES_SP_NAME(scr_init) (NCURSES_SP_ARGx file) == OK) {
++    if (SP_PARM != NULL
++	&& NCURSES_SP_NAME(scr_init) (NCURSES_SP_ARGx file) == OK) {
+ 	delwin(NewScreen(SP_PARM));
+ 	NewScreen(SP_PARM) = dupwin(curscr);
+ #if !USE_REENTRANT
+Index: ncurses/base/resizeterm.c
+Prereq:  1.55 
+--- ncurses-6.5-20240914+/ncurses/base/resizeterm.c	2024-07-27 23:04:55.000000000 +0000
++++ ncurses-6.5-20240922/ncurses/base/resizeterm.c	2024-09-22 20:25:15.000000000 +0000
+@@ -46,7 +46,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: resizeterm.c,v 1.55 2024/07/27 23:04:55 tom Exp $")
++MODULE_ID("$Id: resizeterm.c,v 1.56 2024/09/22 20:25:15 tom Exp $")
+ 
+ /*
+  * If we're trying to be reentrant, do not want any local statics.
+@@ -105,6 +105,7 @@
+     T((T_CALLED("is_term_resized(%p, %d, %d)"), (void *) SP_PARM, ToLines, ToCols));
+     returnCode(ToLines > 0
+ 	       && ToCols > 0
++	       && SP_PARM != NULL
+ 	       && (ToLines != screen_lines(SP_PARM)
+ 		   || ToCols != screen_columns(SP_PARM)));
+ }
+@@ -354,10 +355,10 @@
+ 
+     T((T_CALLED("resize_term(%p,%d,%d) old(%d,%d)"),
+        (void *) SP_PARM, ToLines, ToCols,
+-       (SP_PARM == 0) ? -1 : screen_lines(SP_PARM),
+-       (SP_PARM == 0) ? -1 : screen_columns(SP_PARM)));
++       (SP_PARM == NULL) ? -1 : screen_lines(SP_PARM),
++       (SP_PARM == NULL) ? -1 : screen_columns(SP_PARM)));
+ 
+-    if (SP_PARM == 0 || ToLines <= 0 || ToCols <= 0) {
++    if (SP_PARM == NULL || ToLines <= 0 || ToCols <= 0) {
+ 	returnCode(ERR);
+     }
+ 
+@@ -473,10 +474,10 @@
+ 
+     T((T_CALLED("resizeterm(%p, %d,%d) old(%d,%d)"),
+        (void *) SP_PARM, ToLines, ToCols,
+-       (SP_PARM == 0) ? -1 : screen_lines(SP_PARM),
+-       (SP_PARM == 0) ? -1 : screen_columns(SP_PARM)));
++       (SP_PARM == NULL) ? -1 : screen_lines(SP_PARM),
++       (SP_PARM == NULL) ? -1 : screen_columns(SP_PARM)));
+ 
+-    if (SP_PARM != 0 && ToLines > 0 && ToCols > 0) {
++    if (SP_PARM != NULL && ToLines > 0 && ToCols > 0) {
+ 	result = OK;
+ 	SP_PARM->_sig_winch = FALSE;
+ 
+Index: ncurses/tinfo/access.c
+Prereq:  1.37 
+--- ncurses-6.5-20240914+/ncurses/tinfo/access.c	2023-06-24 21:55:09.000000000 +0000
++++ ncurses-6.5-20240922/ncurses/tinfo/access.c	2024-09-21 15:12:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2021,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2011,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -52,7 +52,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: access.c,v 1.37 2023/06/24 21:55:09 tom Exp $")
++MODULE_ID("$Id: access.c,v 1.39 2024/09/21 15:12:56 tom Exp $")
+ 
+ #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
+ 
+@@ -247,6 +247,29 @@
+ }
+ 
+ #ifndef USE_ROOT_ACCESS
++static int
++is_a_file(int fd)
++{
++    int result = FALSE;
++    if (fd >= 0) {
++	struct stat sb;
++	if (fstat(fd, &sb) == 0) {
++	    switch (sb.st_mode & S_IFMT) {
++	    case S_IFBLK:
++	    case S_IFCHR:
++	    case S_IFDIR:
++		/* disallow devices and directories */
++		break;
++	    default:
++		/* allow regular files, fifos and sockets */
++		result = TRUE;
++		break;
++	    }
++	}
++    }
++    return result;
++}
++
+ /*
+  * Limit privileges if possible; otherwise disallow access for updating files.
+  */
+@@ -263,6 +286,12 @@
+ 	result = fopen(path, mode);
+     }
+ #endif
++    if (result != NULL) {
++	if (!is_a_file(fileno(result))) {
++	    fclose(result);
++	    result = NULL;
++	}
++    }
+     return result;
+ }
+ 
+@@ -279,6 +308,12 @@
+ 	result = open(path, flags, mode);
+     }
+ #endif
++    if (result >= 0) {
++	if (!is_a_file(result)) {
++	    close(result);
++	    result = -1;
++	}
++    }
+     return result;
+ }
+ #endif /* USE_ROOT_ACCESS */
+Index: ncurses/wcwidth.h
+Prereq:  1.6 
+--- ncurses-6.5-20240914+/ncurses/wcwidth.h	2024-05-04 18:44:25.000000000 +0000
++++ ncurses-6.5-20240922/ncurses/wcwidth.h	2024-09-21 15:49:15.000000000 +0000
+@@ -1,4 +1,4 @@
+-/* $Id: wcwidth.h,v 1.6 2024/05/04 18:44:25 tom Exp $ */
++/* $Id: wcwidth.h,v 1.7 2024/09/21 15:49:15 tom Exp $ */
+ 
+ /*
+  * Copyright 2002-2023,2024 by Thomas E. Dickey
+@@ -124,6 +124,7 @@
+ #include 
+ 
+ #include 
++#include 
+ 
+ struct interval {
+   unsigned long first;
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20240914+/package/debian-mingw/changelog	2024-09-13 23:30:09.000000000 +0000
++++ ncurses-6.5-20240922/package/debian-mingw/changelog	2024-09-22 18:38:38.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240914) unstable; urgency=low
++ncurses6td (6.5+20240922) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Fri, 13 Sep 2024 19:30:09 -0400
++ -- Thomas E. Dickey   Sun, 22 Sep 2024 14:38:38 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20240914+/package/debian-mingw64/changelog	2024-09-13 23:30:09.000000000 +0000
++++ ncurses-6.5-20240922/package/debian-mingw64/changelog	2024-09-22 18:38:38.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240914) unstable; urgency=low
++ncurses6td (6.5+20240922) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Fri, 13 Sep 2024 19:30:09 -0400
++ -- Thomas E. Dickey   Sun, 22 Sep 2024 14:38:38 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20240914+/package/debian/changelog	2024-09-13 23:30:09.000000000 +0000
++++ ncurses-6.5-20240922/package/debian/changelog	2024-09-22 18:38:38.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240914) unstable; urgency=low
++ncurses6td (6.5+20240922) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Fri, 13 Sep 2024 19:30:09 -0400
++ -- Thomas E. Dickey   Sun, 22 Sep 2024 14:38:38 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.666 
+--- ncurses-6.5-20240914+/package/mingw-ncurses.nsi	2024-09-13 23:30:09.000000000 +0000
++++ ncurses-6.5-20240922/package/mingw-ncurses.nsi	2024-09-22 18:38:38.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.666 2024/09/13 23:30:09 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.668 2024/09/22 18:38:38 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "0914"
++!define VERSION_MMDD  "0922"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20240914+/package/mingw-ncurses.spec	2024-09-13 23:30:09.000000000 +0000
++++ ncurses-6.5-20240922/package/mingw-ncurses.spec	2024-09-22 18:38:38.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20240914
++Release: 20240922
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20240914+/package/ncurses.spec	2024-09-13 23:30:09.000000000 +0000
++++ ncurses-6.5-20240922/package/ncurses.spec	2024-09-22 18:38:38.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20240914
++Release: 20240922
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20240914+/package/ncursest.spec	2024-09-13 23:30:09.000000000 +0000
++++ ncurses-6.5-20240922/package/ncursest.spec	2024-09-22 18:38:38.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20240914
++Release: 20240922
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/back_ground.c
+Prereq:  1.9 
+--- ncurses-6.5-20240914+/test/back_ground.c	2022-12-10 22:28:50.000000000 +0000
++++ ncurses-6.5-20240922/test/back_ground.c	2024-09-22 21:33:17.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2021,2022 Thomas E. Dickey                                     *
++ * Copyright 2021-2022,2024 Thomas E. Dickey                                *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: back_ground.c,v 1.9 2022/12/10 22:28:50 tom Exp $
++ * $Id: back_ground.c,v 1.11 2024/09/22 21:33:17 tom Exp $
+  */
+ 
+ #include 
+@@ -40,7 +40,7 @@
+ 
+ static int default_bg = COLOR_BLACK;
+ static int default_fg = COLOR_WHITE;
+-static wchar_t wide_fill = L' ';
++static wchar_t fill_char = L' ';
+ 
+ static wchar_t
+ decode_wchar(const char *value)
+@@ -78,7 +78,7 @@
+     }
+     dump_window(stdscr);
+ 
+-    blank[0] = wide_fill;
++    blank[0] = fill_char;
+     blank[1] = L'\0';
+ 
+     printw("Initializing pair 1 to red/%s\n", color_name(default_bg));
+@@ -182,6 +182,7 @@
+ 	," -a       invoke assume_default_colors, repeat to use in init_pair"
+ #endif
+ 	," -b XXX   specify background color"
++	," -c XXX   specify background character"
+ #if HAVE_USE_DEFAULT_COLORS
+ 	," -d       invoke use_default_colors, repeat to use in init_pair"
+ #endif
+@@ -214,7 +215,7 @@
+ 
+     setlocale(LC_ALL, "");
+ 
+-    while ((ch = getopt(argc, argv, OPTS_COMMON "ab:df:l:wW:")) != -1) {
++    while ((ch = getopt(argc, argv, OPTS_COMMON "ab:c:df:l:wW:")) != -1) {
+ 	switch (ch) {
+ #if HAVE_ASSUME_DEFAULT_COLORS
+ 	case 'a':
+@@ -224,6 +225,17 @@
+ 	case 'b':
+ 	    default_bg = color_code(optarg);
+ 	    break;
++	case 'c':
++	    if (strlen(optarg) > 1) {
++		char *check = NULL;
++		long value = strtol(optarg, &check, 0);
++		if (*check != '\0')
++		    usage(FALSE);
++		fill_char = (wchar_t) value;
++	    } else {
++		fill_char = *optarg;
++	    }
++	    break;
+ #if HAVE_USE_DEFAULT_COLORS
+ 	case 'd':
+ 	    ++d_option;
+@@ -237,10 +249,10 @@
+ 		usage(FALSE);
+ 	    break;
+ 	case 'w':
+-	    wide_fill = L'\u2591';
++	    fill_char = L'\u2591';
+ 	    break;
+ 	case 'W':
+-	    wide_fill = decode_wchar(optarg);
++	    fill_char = decode_wchar(optarg);
+ 	    break;
+ 	case OPTS_VERSION:
+ 	    show_version(argv);
+Index: test/background.c
+Prereq:  1.24 
+--- ncurses-6.5-20240914+/test/background.c	2022-12-10 22:28:50.000000000 +0000
++++ ncurses-6.5-20240922/test/background.c	2024-09-22 22:34:49.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
++ * Copyright 2018-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2003-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: background.c,v 1.24 2022/12/10 22:28:50 tom Exp $
++ * $Id: background.c,v 1.27 2024/09/22 22:34:49 tom Exp $
+  */
+ 
+ #define NEED_COLOR_CODE 1
+@@ -37,6 +37,7 @@
+ 
+ static int default_bg = COLOR_BLACK;
+ static int default_fg = COLOR_WHITE;
++static unsigned char fill_char = ' ';
+ 
+ static void
+ test_background(void)
+@@ -45,6 +46,7 @@
+     int row;
+     int chr;
+ 
++    printw("Background character %#x\n", fill_char);
+     if (pair_content(0, &f, &b) == ERR) {
+ 	printw("pair 0 contains no data\n");
+     } else {
+@@ -54,13 +56,13 @@
+ 
+     printw("Initializing pair 1 to red/%s\n", color_name(default_bg));
+     init_pair(1, COLOR_RED, (NCURSES_COLOR_T) default_bg);
+-    bkgdset((chtype) (' ' | COLOR_PAIR(1)));
++    bkgdset((chtype) (fill_char | COLOR_PAIR(1)));
+     printw("RED/BLACK\n");
+     dump_window(stdscr);
+ 
+     printw("Initializing pair 2 to %s/blue\n", color_name(default_fg));
+     init_pair(2, (NCURSES_COLOR_T) default_fg, COLOR_BLUE);
+-    bkgdset((chtype) (' ' | COLOR_PAIR(2)));
++    bkgdset((chtype) (fill_char | COLOR_PAIR(2)));
+     printw("This line should be %s/blue\n", color_name(default_fg));
+     dump_window(stdscr);
+ 
+@@ -98,33 +100,33 @@
+     printw("j\n");
+     dump_window(stdscr);
+ 
+-    bkgdset((chtype) (' ' | COLOR_PAIR(0)));
++    bkgdset((chtype) (fill_char | COLOR_PAIR(0)));
+     printw("Default Colors\n");
+     dump_window(stdscr);
+ 
+     printw("Resetting colors to pair 1\n");
+-    bkgdset((chtype) (' ' | COLOR_PAIR(1)));
++    bkgdset((chtype) (fill_char | COLOR_PAIR(1)));
+     printw("This line should be red/%s\n", color_name(default_bg));
+     dump_window(stdscr);
+ 
+     printw("Setting screen to pair 0\n");
+-    bkgd((chtype) (' ' | COLOR_PAIR(0)));
++    bkgd((chtype) (fill_char | COLOR_PAIR(0)));
+     dump_window(stdscr);
+ 
+     printw("Setting screen to pair 1\n");
+-    bkgd((chtype) (' ' | COLOR_PAIR(1)));
++    bkgd((chtype) (fill_char | COLOR_PAIR(1)));
+     dump_window(stdscr);
+ 
+     printw("Setting screen to pair 2\n");
+-    bkgd((chtype) (' ' | COLOR_PAIR(2)));
++    bkgd((chtype) (fill_char | COLOR_PAIR(2)));
+     dump_window(stdscr);
+ 
+     printw("Setting screen to pair 3\n");
+-    bkgd((chtype) (' ' | COLOR_PAIR(3)));
++    bkgd((chtype) (fill_char | COLOR_PAIR(3)));
+     dump_window(stdscr);
+ 
+     printw("Setting screen to pair 0\n");
+-    bkgd((chtype) (' ' | COLOR_PAIR(0)));
++    bkgd((chtype) (fill_char | COLOR_PAIR(0)));
+     dump_window(stdscr);
+ }
+ 
+@@ -141,6 +143,7 @@
+ 	," -a       invoke assume_default_colors, repeat to use in init_pair"
+ #endif
+ 	," -b XXX   specify background color"
++	," -c XXX   specify background character"
+ #if HAVE_USE_DEFAULT_COLORS
+ 	," -d       invoke use_default_colors, repeat to use in init_pair"
+ #endif
+@@ -171,7 +174,7 @@
+ 
+     setlocale(LC_ALL, "");
+ 
+-    while ((ch = getopt(argc, argv, OPTS_COMMON "ab:df:l:")) != -1) {
++    while ((ch = getopt(argc, argv, OPTS_COMMON "ab:c:df:l:")) != -1) {
+ 	switch (ch) {
+ #if HAVE_ASSUME_DEFAULT_COLORS
+ 	case 'a':
+@@ -181,6 +184,17 @@
+ 	case 'b':
+ 	    default_bg = color_code(optarg);
+ 	    break;
++	case 'c':
++	    if (strlen(optarg) > 1) {
++		char *check = NULL;
++		long value = strtol(optarg, &check, 0);
++		if (*check != '\0')
++		    usage(FALSE);
++		fill_char = (unsigned char) value;
++	    } else {
++		fill_char = (unsigned char) *optarg;
++	    }
++	    break;
+ #if HAVE_USE_DEFAULT_COLORS
+ 	case 'd':
+ 	    ++d_option;
diff --git a/packages/ncurses/6.5/ncurses-6.5-20240928.patch b/packages/ncurses/6.5/ncurses-6.5-20240928.patch
new file mode 100644
index 0000000000..6271cfdc11
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20240928.patch
@@ -0,0 +1,491 @@
+# ncurses 6.5 - patch 20240928 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20240928.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sat Sep 28 22:43:54 UTC 2024
+# ------------------------------------------------------------------------------
+# NEWS                             |   10 +++++++++-
+# VERSION                          |    2 +-
+# dist.mk                          |    4 ++--
+# misc/gen-pkgconfig.in            |   10 +++++-----
+# misc/ncurses-config.in           |   10 +++++-----
+# ncurses/base/lib_newwin.c        |   13 +++----------
+# ncurses/base/lib_pad.c           |    8 ++++----
+# ncurses/base/wresize.c           |    8 +++++---
+# ncurses/curses.priv.h            |    4 +++-
+# ncurses/tinfo/write_entry.c      |   10 +++++++---
+# 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                  |   32 +++++++++++++++++++++++++++-----
+# test/back_ground.c               |    4 ++--
+# 19 files changed, 84 insertions(+), 53 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4182 
+--- ncurses-6.5-20240922+/NEWS	2024-09-22 20:50:07.000000000 +0000
++++ ncurses-6.5-20240928/NEWS	2024-09-28 20:27:44.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4182 2024/09/22 20:50:07 tom Exp $
++-- $Id: NEWS,v 1.4185 2024/09/28 20:27:44 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.
+ 
++20240928
++	+ improve error-message from infocmp when a terminal entry cannot be
++	  opened (patch by Branden Robinson).
++	+ improve filtering of -L options in misc/gen-pkgconfig.in and in
++	  misc/ncurses-config.in
++	+ add check in wresize() for out-of-range dimensions (report by Peter
++	  Bierma). 
++
+ 20240922
+ 	+ add a few null-pointer checks in ncurses
+ 	+ improve test-driver in ncurses/link_test.c
+Index: VERSION
+--- ncurses-6.5-20240922+/VERSION	2024-09-22 18:38:38.000000000 +0000
++++ ncurses-6.5-20240928/VERSION	2024-09-28 09:53:21.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20240922
++5:0:10	6.5	20240928
+Index: dist.mk
+Prereq:  1.1633 
+--- ncurses-6.5-20240922+/dist.mk	2024-09-22 18:38:38.000000000 +0000
++++ ncurses-6.5-20240928/dist.mk	2024-09-28 09:53:21.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1633 2024/09/22 18:38:38 tom Exp $
++# $Id: dist.mk,v 1.1634 2024/09/28 09:53:21 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 = 5
+-NCURSES_PATCH = 20240922
++NCURSES_PATCH = 20240928
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: misc/gen-pkgconfig.in
+Prereq:  1.57 
+--- ncurses-6.5-20240922+/misc/gen-pkgconfig.in	2024-06-22 21:02:53.000000000 +0000
++++ ncurses-6.5-20240928/misc/gen-pkgconfig.in	2024-09-28 20:21:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ #!@SHELL@
+-# $Id: gen-pkgconfig.in,v 1.57 2024/06/22 21:02:53 tom Exp $
++# $Id: gen-pkgconfig.in,v 1.58 2024/09/28 20:21:23 tom Exp $
+ ##############################################################################
+ # Copyright 2018-2022,2024 Thomas E. Dickey                                  #
+ # Copyright 2009-2015,2018 Free Software Foundation, Inc.                    #
+@@ -112,7 +112,7 @@
+ 		@LD_SEARCHPATH@) # skip standard libdir
+ 			if [ "$lib_check" = "$libdir" ]
+ 			then
+-				lib_first=yes
++				lib_first=no
+ 				IFS_save="$IFS"
+ 				IFS='|'
+ 				LIBDIRS="@LD_SEARCHPATH@"
+@@ -120,11 +120,11 @@
+ 				do
+ 					if [ -d "$lib_check" ]
+ 					then
+-						if [ "$lib_check" != "$libdir" ]
++						if [ "$lib_check" = "$libdir" ]
+ 						then
+-							lib_first=no
++							lib_first=yes
++							break
+ 						fi
+-						break
+ 					fi
+ 				done
+ 				IFS="$IFS_save"
+Index: misc/ncurses-config.in
+Prereq:  1.56 
+--- ncurses-6.5-20240922+/misc/ncurses-config.in	2024-09-21 17:24:52.000000000 +0000
++++ ncurses-6.5-20240928/misc/ncurses-config.in	2024-09-28 20:18:19.000000000 +0000
+@@ -1,5 +1,5 @@
+ #!@SHELL@
+-# $Id: ncurses-config.in,v 1.56 2024/09/21 17:24:52 tom Exp $
++# $Id: ncurses-config.in,v 1.57 2024/09/28 20:18:19 tom Exp $
+ ##############################################################################
+ # Copyright 2018-2022,2024 Thomas E. Dickey                                  #
+ # Copyright 2006-2015,2017 Free Software Foundation, Inc.                    #
+@@ -132,7 +132,7 @@
+ 		@LD_SEARCHPATH@) # skip standard libdir
+ 			if [ "$lib_check" = "$libdir" ]
+ 			then
+-				lib_first=yes
++				lib_first=no
+ 				IFS_save="$IFS"
+ 				IFS='|'
+ 				LIBDIRS="@LD_SEARCHPATH@"
+@@ -140,11 +140,11 @@
+ 				do
+ 					if [ -d "$lib_check" ]
+ 					then
+-						if [ "$lib_check" != "$libdir" ]
++						if [ "$lib_check" = "$libdir" ]
+ 						then
+-							lib_first=no
++							lib_first=yes
++							break
+ 						fi
+-						break
+ 					fi
+ 				done
+ 				IFS="$IFS_save"
+Index: ncurses/base/lib_newwin.c
+Prereq:  1.76 
+--- ncurses-6.5-20240922+/ncurses/base/lib_newwin.c	2021-10-23 18:53:38.000000000 +0000
++++ ncurses-6.5-20240928/ncurses/base/lib_newwin.c	2024-09-28 15:55:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2024 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.76 2021/10/23 18:53:38 tom Exp $")
++MODULE_ID("$Id: lib_newwin.c,v 1.77 2024/09/28 15:55:56 tom Exp $")
+ 
+ #define window_is(name) ((sp)->_##name == win)
+ 
+@@ -255,13 +255,6 @@
+     returnWin(result);
+ }
+ 
+-static bool
+-dimension_limit(int value)
+-{
+-    NCURSES_SIZE_T test = (NCURSES_SIZE_T) value;
+-    return (test == value && value > 0);
+-}
+-
+ NCURSES_EXPORT(WINDOW *)
+ NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_DCLx
+ 			      int num_lines,
+@@ -281,7 +274,7 @@
+     if (SP_PARM == 0)
+ 	returnWin(0);
+ 
+-    if (!dimension_limit(num_lines) || !dimension_limit(num_columns))
++    if (!OK_DIMENSION(num_lines) || !OK_DIMENSION(num_columns))
+ 	returnWin(0);
+ 
+     if ((wp = typeCalloc(WINDOWLIST, 1)) == 0)
+Index: ncurses/base/lib_pad.c
+Prereq:  1.50 
+--- ncurses-6.5-20240922+/ncurses/base/lib_pad.c	2021-10-23 22:57:27.000000000 +0000
++++ ncurses-6.5-20240928/ncurses/base/lib_pad.c	2024-09-28 15:40:42.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2010,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: lib_pad.c,v 1.50 2021/10/23 22:57:27 tom Exp $")
++MODULE_ID("$Id: lib_pad.c,v 1.51 2024/09/28 15:40:42 tom Exp $")
+ 
+ NCURSES_EXPORT(WINDOW *)
+ NCURSES_SP_NAME(newpad) (NCURSES_SP_DCLx int l, int c)
+@@ -197,8 +197,8 @@
+ #endif /* TRACE */
+ #if USE_SCROLL_HINTS
+     if (win->_pad._pad_y >= 0) {
+-	displaced = pminrow - win->_pad._pad_y
+-	    - (sminrow - win->_pad._pad_top);
++	displaced = ((pminrow - win->_pad._pad_y) -
++		     (sminrow - win->_pad._pad_top));
+ 	T(("pad being shifted by %d line(s)", displaced));
+     } else
+ 	displaced = 0;
+Index: ncurses/base/wresize.c
+Prereq:  1.43 
+--- ncurses-6.5-20240922+/ncurses/base/wresize.c	2023-10-21 11:13:03.000000000 +0000
++++ ncurses-6.5-20240928/ncurses/base/wresize.c	2024-09-28 15:56:07.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2021,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 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.43 2023/10/21 11:13:03 tom Exp $")
++MODULE_ID("$Id: wresize.c,v 1.44 2024/09/28 15:56:07 tom Exp $")
+ 
+ static int
+ cleanup_lines(struct ldat *data, int length)
+@@ -125,9 +125,11 @@
+     }
+ #endif
+ 
+-    if (!win || --ToLines < 0 || --ToCols < 0)
++    if (!win || !OK_DIMENSION(ToLines) || !OK_DIMENSION(ToCols))
+ 	returnCode(ERR);
+ 
++    ToLines--;
++    ToCols--;
+     size_x = win->_maxx;
+     size_y = win->_maxy;
+ 
+Index: ncurses/curses.priv.h
+Prereq:  1.690 
+--- ncurses-6.5-20240922+/ncurses/curses.priv.h	2024-08-31 10:46:01.000000000 +0000
++++ ncurses-6.5-20240928/ncurses/curses.priv.h	2024-09-28 15:35:01.000000000 +0000
+@@ -35,7 +35,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: curses.priv.h,v 1.690 2024/08/31 10:46:01 Rafael.Kitover Exp $
++ * $Id: curses.priv.h,v 1.691 2024/09/28 15:35:01 tom Exp $
+  *
+  *	curses.priv.h
+  *
+@@ -1550,6 +1550,8 @@
+ 		((x) >= 0 && (x) <= (w)->_maxx && \
+ 		 (y) >= 0 && (y) <= (w)->_maxy))
+ 
++#define OK_DIMENSION(n)	((NCURSES_SIZE_T)(n) == (n) && (n) > 0)
++
+ #define CHANGED_CELL(line,col) \
+ 	if (line->firstchar == _NOCHANGE) \
+ 		line->firstchar = line->lastchar = (NCURSES_SIZE_T) (col); \
+Index: ncurses/tinfo/write_entry.c
+Prereq:  1.134 
+--- ncurses-6.5-20240922+/ncurses/tinfo/write_entry.c	2024-08-31 10:46:01.000000000 +0000
++++ ncurses-6.5-20240928/ncurses/tinfo/write_entry.c	2024-09-28 17:31:09.000000000 +0000
+@@ -42,7 +42,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: write_entry.c,v 1.134 2024/08/31 10:46:01 Rafael.Kitover Exp $")
++MODULE_ID("$Id: write_entry.c,v 1.135 2024/09/28 17:31:09 tom Exp $")
+ 
+ #if 1
+ #define TRACE_OUT(p) DEBUG(2, p)
+@@ -153,8 +153,12 @@
+ 	    rc = 0;
+ 	}
+     } else {
+-	if ((strlen(top) + strlen(src) + 6) <= limit) {
+-	    _nc_SPRINTF(dst, _nc_SLIMIT(limit) "%s/%s", top, src);
++	size_t len_top = strlen(top);
++	size_t len_src = strlen(src);
++	if ((len_top + len_src + 6) <= limit) {
++	    _nc_SPRINTF(dst, _nc_SLIMIT(limit) "%.*s/%.*s",
++			(int) len_top, top,
++			(int) len_src, src);
+ 	    rc = 0;
+ 	}
+     }
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20240922+/package/debian-mingw/changelog	2024-09-22 18:38:38.000000000 +0000
++++ ncurses-6.5-20240928/package/debian-mingw/changelog	2024-09-28 09:53:21.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240922) unstable; urgency=low
++ncurses6td (6.5+20240928) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 22 Sep 2024 14:38:38 -0400
++ -- Thomas E. Dickey   Sat, 28 Sep 2024 05:53:21 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20240922+/package/debian-mingw64/changelog	2024-09-22 18:38:38.000000000 +0000
++++ ncurses-6.5-20240928/package/debian-mingw64/changelog	2024-09-28 09:53:21.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240922) unstable; urgency=low
++ncurses6td (6.5+20240928) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 22 Sep 2024 14:38:38 -0400
++ -- Thomas E. Dickey   Sat, 28 Sep 2024 05:53:21 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20240922+/package/debian/changelog	2024-09-22 18:38:38.000000000 +0000
++++ ncurses-6.5-20240928/package/debian/changelog	2024-09-28 09:53:21.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240922) unstable; urgency=low
++ncurses6td (6.5+20240928) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 22 Sep 2024 14:38:38 -0400
++ -- Thomas E. Dickey   Sat, 28 Sep 2024 05:53:21 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.668 
+--- ncurses-6.5-20240922+/package/mingw-ncurses.nsi	2024-09-22 18:38:38.000000000 +0000
++++ ncurses-6.5-20240928/package/mingw-ncurses.nsi	2024-09-28 09:53:21.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.668 2024/09/22 18:38:38 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.669 2024/09/28 09:53:21 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "0922"
++!define VERSION_MMDD  "0928"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20240922+/package/mingw-ncurses.spec	2024-09-22 18:38:38.000000000 +0000
++++ ncurses-6.5-20240928/package/mingw-ncurses.spec	2024-09-28 09:53:21.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20240922
++Release: 20240928
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20240922+/package/ncurses.spec	2024-09-22 18:38:38.000000000 +0000
++++ ncurses-6.5-20240928/package/ncurses.spec	2024-09-28 09:53:21.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20240922
++Release: 20240928
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20240922+/package/ncursest.spec	2024-09-22 18:38:38.000000000 +0000
++++ ncurses-6.5-20240928/package/ncursest.spec	2024-09-28 09:53:21.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20240922
++Release: 20240928
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/infocmp.c
+Prereq:  1.164 
+--- ncurses-6.5-20240922+/progs/infocmp.c	2024-08-24 22:57:24.000000000 +0000
++++ ncurses-6.5-20240928/progs/infocmp.c	2024-09-28 20:26:22.000000000 +0000
+@@ -43,7 +43,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: infocmp.c,v 1.164 2024/08/24 22:57:24 tom Exp $")
++MODULE_ID("$Id: infocmp.c,v 1.165 2024/09/28 20:26:22 Branden.Robinson Exp $")
+ 
+ #ifndef ACTUAL_TIC
+ #define ACTUAL_TIC "tic"
+@@ -1878,10 +1878,32 @@
+ 	    }
+ 
+ 	    if (status <= 0) {
+-		(void) fprintf(stderr,
+-			       "%s: couldn't open terminfo file %s.\n",
+-			       _nc_progname,
+-			       tfile[termcount]);
++		switch (status) {
++		case TGETENT_NO:
++		    (void) fprintf(stderr,
++				   "%s: error: no match in terminfo"
++				   " database for terminal type"
++				   " \"%s\"\n",
++				   _nc_progname,
++				   tname[termcount]);
++		    break;
++		case TGETENT_ERR:
++		    /*
++		     * Several database files might be checked; their
++		     * file names are not exposed via this API.  The
++		     * best we can do is report how the final one
++		     * attempted failed.  Also, tfile[termcount] is
++		     * deeply misleading when a hashed database is used.
++		     */
++		    (void) fprintf(stderr,
++				   "%s: error: unable to open terminfo"
++				   " database: %s\n",
++				   _nc_progname,
++				   strerror(errno));
++		    break;
++		default:
++		    assert(0 == "unhandled _nc_read_entry2 return");
++		}
+ 		MAIN_LEAKS();
+ 		ExitProgram(EXIT_FAILURE);
+ 	    }
+Index: test/back_ground.c
+Prereq:  1.11 
+--- ncurses-6.5-20240922+/test/back_ground.c	2024-09-22 21:33:17.000000000 +0000
++++ ncurses-6.5-20240928/test/back_ground.c	2024-09-28 16:19:19.000000000 +0000
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: back_ground.c,v 1.11 2024/09/22 21:33:17 tom Exp $
++ * $Id: back_ground.c,v 1.12 2024/09/28 16:19:19 tom Exp $
+  */
+ 
+ #include 
+@@ -233,7 +233,7 @@
+ 		    usage(FALSE);
+ 		fill_char = (wchar_t) value;
+ 	    } else {
+-		fill_char = *optarg;
++		fill_char = (wchar_t) *optarg;
+ 	    }
+ 	    break;
+ #if HAVE_USE_DEFAULT_COLORS
diff --git a/packages/ncurses/6.5/ncurses-6.5-20241006.patch b/packages/ncurses/6.5/ncurses-6.5-20241006.patch
new file mode 100644
index 0000000000..90ced0bdf1
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20241006.patch
@@ -0,0 +1,3460 @@
+# ncurses 6.5 - patch 20241006 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20241006.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Oct  6 23:44:01 UTC 2024
+# ------------------------------------------------------------------------------
+# NEWS                             |    6 +++
+# VERSION                          |    2 -
+# c++/cursesf.cc                   |    6 +--
+# c++/cursesf.h                    |    6 +--
+# c++/cursesm.cc                   |    6 +--
+# c++/cursesm.h                    |    6 +--
+# c++/cursesp.cc                   |    6 +--
+# c++/cursespad.cc                 |    6 +--
+# c++/cursslk.cc                   |   12 +++----
+# c++/cursslk.h                    |    6 +--
+# dist.mk                          |    4 +-
+# misc/terminfo.src                |   23 +++++++++++--
+# ncurses/base/lib_screen.c        |    4 +-
+# ncurses/base/new_pair.c          |    4 +-
+# ncurses/curses.priv.h            |    4 +-
+# ncurses/new_pair.h               |    4 +-
+# ncurses/tinfo/trim_sgr0.c        |    7 ++--
+# ncurses/tty/lib_twait.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 -
+# test/blue.c                      |   10 +++---
+# test/bs.c                        |    8 ++--
+# test/cardfile.c                  |   12 +++----
+# test/chgat.c                     |    6 +--
+# test/clip_printw.c               |    8 ++--
+# test/color_name.h                |    6 +--
+# test/demo_defkey.c               |    4 +-
+# test/demo_forms.c                |   22 ++++++-------
+# test/demo_menus.c                |   32 ++++++++++---------
+# test/demo_new_pair.c             |    4 +-
+# test/demo_panels.c               |   16 ++++-----
+# test/demo_termcap.c              |   18 +++++-----
+# test/demo_terminfo.c             |   18 +++++-----
+# test/dots.c                      |    6 +--
+# test/dots_mvcur.c                |    6 +--
+# test/dots_termcap.c              |    8 ++--
+# test/dup_field.c                 |   14 ++++----
+# test/filter.c                    |    6 +--
+# test/form_driver_w.c             |    6 +--
+# test/gdc.c                       |   10 +++---
+# test/inch_wide.c                 |    6 +--
+# test/inchs.c                     |    6 +--
+# test/ins_wide.c                  |    6 +--
+# test/insdelln.c                  |    8 ++--
+# test/inserts.c                   |    6 +--
+# test/knight.c                    |    7 ++--
+# test/list_keys.c                 |    8 ++--
+# test/move_field.c                |   18 +++++-----
+# test/movewindow.c                |   16 ++++-----
+# test/ncurses.c                   |   61 +++++++++++++++++++------------------
+# test/padview.c                   |   12 +++----
+# test/parse_rgb.h                 |    6 +--
+# test/picsmap.c                   |   14 ++++----
+# test/popup_msg.c                 |    8 ++--
+# test/popup_msg.h                 |    6 +--
+# test/railroad.c                  |    6 +--
+# test/rain.c                      |   20 ++++++------
+# test/redraw.c                    |    6 +--
+# test/savescreen.c                |   14 ++++----
+# test/tclock.c                    |    4 +-
+# test/test.priv.h                 |   10 +++---
+# test/test_add_wchstr.c           |    6 +--
+# test/test_addchstr.c             |    6 +--
+# test/test_addstr.c               |    6 +--
+# test/test_addwstr.c              |    6 +--
+# test/test_endwin.c               |    6 +--
+# test/test_get_wstr.c             |    8 ++--
+# test/test_getstr.c               |    8 ++--
+# test/test_instr.c                |    8 ++--
+# test/test_inwstr.c               |    8 ++--
+# test/test_mouse.c                |    4 +-
+# test/test_opaque.c               |    8 ++--
+# test/test_sgr.c                  |   26 +++++++--------
+# test/test_tparm.c                |   12 +++----
+# test/test_vidputs.c              |    6 +--
+# test/testcurs.c                  |    8 ++--
+# test/testscanw.c                 |    6 +--
+# test/view.c                      |   21 +++++-------
+# 83 files changed, 392 insertions(+), 369 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4185 
+--- ncurses-6.5-20240928+/NEWS	2024-09-28 20:27:44.000000000 +0000
++++ ncurses-6.5-20241006/NEWS	2024-10-06 08:53:45.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4185 2024/09/28 20:27:44 tom Exp $
++-- $Id: NEWS,v 1.4188 2024/10/06 08:53:45 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.
+ 
++20241006
++	+ fixes for compiler warnings/cppcheck.
++	+ use xterm+alt+title in wezterm -TD
++
+ 20240928
+ 	+ improve error-message from infocmp when a terminal entry cannot be
+ 	  opened (patch by Branden Robinson).
+Index: VERSION
+--- ncurses-6.5-20240928+/VERSION	2024-09-28 09:53:21.000000000 +0000
++++ ncurses-6.5-20241006/VERSION	2024-10-06 08:53:45.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20240928
++5:0:10	6.5	20241006
+Index: c++/cursesf.cc
+Prereq:  1.26 
+--- ncurses-6.5-20240928+/c++/cursesf.cc	2021-04-17 18:11:08.000000000 +0000
++++ ncurses-6.5-20241006/c++/cursesf.cc	2024-10-05 22:47:12.000000000 +0000
+@@ -1,6 +1,6 @@
+ // * this is for making emacs happy: -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright 2019-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2019-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2005,2011 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -36,7 +36,7 @@
+ #include "cursesf.h"
+ #include "cursesapp.h"
+ 
+-MODULE_ID("$Id: cursesf.cc,v 1.26 2021/04/17 18:11:08 tom Exp $")
++MODULE_ID("$Id: cursesf.cc,v 1.27 2024/10/05 22:47:12 tom Exp $")
+ 
+ NCursesFormField::~NCursesFormField () THROWS(NCursesException)
+ {
+@@ -76,7 +76,7 @@
+ 
+ void NCursesForm::setDefaultAttributes()
+ {
+-  NCursesApplication* S = NCursesApplication::getApplication();
++  const NCursesApplication* S = NCursesApplication::getApplication();
+ 
+   int n = count();
+   if (n > 0) {
+Index: c++/cursesf.h
+Prereq:  1.39 
+--- ncurses-6.5-20240928+/c++/cursesf.h	2022-08-20 20:52:15.000000000 +0000
++++ ncurses-6.5-20241006/c++/cursesf.h	2024-10-05 22:47:12.000000000 +0000
+@@ -1,7 +1,7 @@
+ // * This makes emacs happy -*-Mode: C++;-*-
+ // vile:cppmode
+ /****************************************************************************
+- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
++ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2014 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -33,7 +33,7 @@
+  *   Author: Juergen Pfeifer, 1997                                          *
+  ****************************************************************************/
+ 
+-// $Id: cursesf.h,v 1.39 2022/08/20 20:52:15 tom Exp $
++// $Id: cursesf.h,v 1.40 2024/10/05 22:47:12 tom Exp $
+ 
+ #ifndef NCURSES_CURSESF_H_incl
+ #define NCURSES_CURSESF_H_incl 1
+@@ -384,7 +384,7 @@
+   }
+ 
+   inline void *get_user() {
+-    UserHook* uptr = reinterpret_cast(::form_userptr (form));
++    const UserHook* uptr = reinterpret_cast(::form_userptr (form));
+     assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==form);
+     return uptr->m_user;
+   }
+Index: c++/cursesm.cc
+Prereq:  1.27 
+--- ncurses-6.5-20240928+/c++/cursesm.cc	2021-04-17 18:11:08.000000000 +0000
++++ ncurses-6.5-20241006/c++/cursesm.cc	2024-10-05 22:47:12.000000000 +0000
+@@ -1,6 +1,6 @@
+ // * this is for making emacs happy: -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright 2019-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2019-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2011,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -36,7 +36,7 @@
+ #include "cursesm.h"
+ #include "cursesapp.h"
+ 
+-MODULE_ID("$Id: cursesm.cc,v 1.27 2021/04/17 18:11:08 tom Exp $")
++MODULE_ID("$Id: cursesm.cc,v 1.28 2024/10/05 22:47:12 tom Exp $")
+ 
+ NCursesMenuItem::~NCursesMenuItem() THROWS(NCursesException)
+ {
+@@ -168,7 +168,7 @@
+ void
+ NCursesMenu::setDefaultAttributes()
+ {
+-  NCursesApplication* S = NCursesApplication::getApplication();
++  const NCursesApplication* S = NCursesApplication::getApplication();
+   if (S) {
+     ::set_menu_fore(menu, S->foregrounds());
+     ::set_menu_back(menu, S->backgrounds());
+Index: c++/cursesm.h
+Prereq:  1.35 
+--- ncurses-6.5-20240928+/c++/cursesm.h	2022-08-20 20:52:15.000000000 +0000
++++ ncurses-6.5-20241006/c++/cursesm.h	2024-10-05 22:47:12.000000000 +0000
+@@ -1,6 +1,6 @@
+ // * This makes emacs happy -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
++ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2014 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -32,7 +32,7 @@
+  *   Author: Juergen Pfeifer, 1997                                          *
+  ****************************************************************************/
+ 
+-// $Id: cursesm.h,v 1.35 2022/08/20 20:52:15 tom Exp $
++// $Id: cursesm.h,v 1.36 2024/10/05 22:47:12 tom Exp $
+ 
+ #ifndef NCURSES_CURSESM_H_incl
+ #define NCURSES_CURSESM_H_incl 1
+@@ -245,7 +245,7 @@
+   }
+ 
+   inline void *get_user() {
+-    UserHook* uptr = STATIC_CAST(UserHook*)(::menu_userptr (menu));
++    const UserHook* uptr = STATIC_CAST(UserHook*)(::menu_userptr (menu));
+     assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==menu);
+     return uptr->m_user;
+   }
+Index: c++/cursesp.cc
+Prereq:  1.27 
+--- ncurses-6.5-20240928+/c++/cursesp.cc	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241006/c++/cursesp.cc	2024-10-05 22:47:12.000000000 +0000
+@@ -1,6 +1,6 @@
+ // * this is for making emacs happy: -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright 2019,2020 Thomas E. Dickey                                     *
++ * Copyright 2019-2020,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2003,2005 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -35,7 +35,7 @@
+ #include "internal.h"
+ #include "cursesp.h"
+ 
+-MODULE_ID("$Id: cursesp.cc,v 1.27 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: cursesp.cc,v 1.28 2024/10/05 22:47:12 tom Exp $")
+ 
+ NCursesPanel* NCursesPanel::dummy = static_cast(0);
+ 
+@@ -64,7 +64,7 @@
+ void
+ NCursesPanel::redraw()
+ {
+-  PANEL *pan;
++  const PANEL *pan;
+ 
+   pan = ::panel_above(NULL);
+   while (pan) {
+Index: c++/cursespad.cc
+Prereq:  1.18 
+--- ncurses-6.5-20240928+/c++/cursespad.cc	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241006/c++/cursespad.cc	2024-10-05 22:47:12.000000000 +0000
+@@ -1,6 +1,6 @@
+ // * this is for making emacs happy: -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1999-2012,2013 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -36,7 +36,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: cursespad.cc,v 1.18 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: cursespad.cc,v 1.19 2024/10/05 22:47:12 tom Exp $")
+ 
+ NCursesPad::NCursesPad(int nlines, int ncols)
+   : NCursesWindow(),
+@@ -221,7 +221,7 @@
+ void NCursesFramedPad::OnOperation(int pad_req)
+ {
+   (void) pad_req;
+-  NCursesWindow* W = Win();
++  const NCursesWindow* W = Win();
+   NCursesWindow* W2 = getWindow();
+ 
+   if ((static_cast(0) != W) && (static_cast(0) != W2)) {
+Index: c++/cursslk.cc
+Prereq:  1.22 
+--- ncurses-6.5-20240928+/c++/cursslk.cc	2024-06-15 21:07:30.000000000 +0000
++++ ncurses-6.5-20241006/c++/cursslk.cc	2024-10-05 19:36:22.000000000 +0000
+@@ -35,10 +35,10 @@
+ #include "internal.h"
+ #include "cursesapp.h"
+ 
+-MODULE_ID("$Id: cursslk.cc,v 1.22 2024/06/15 21:07:30 tom Exp $")
++MODULE_ID("$Id: cursslk.cc,v 1.23 2024/10/05 19:36:22 tom Exp $")
+ 
+ Soft_Label_Key_Set::Soft_Label_Key&
+-  Soft_Label_Key_Set::Soft_Label_Key::operator=(char *text)
++  Soft_Label_Key_Set::Soft_Label_Key::operator=(const char *text)
+ {
+   delete[] label;
+   size_t need = 1 + ::strlen(text);
+@@ -111,11 +111,11 @@
+ 
+ void Soft_Label_Key_Set::activate_label(int i, bool bf) {
+   if (!b_attrInit) {
+-    NCursesApplication* A = NCursesApplication::getApplication();
++    const NCursesApplication* A = NCursesApplication::getApplication();
+     if (A) attrset(A->labels());
+     b_attrInit = TRUE;
+   }
+-  Soft_Label_Key& K = (*this)[i];
++  const Soft_Label_Key& K = (*this)[i];
+   if (ERR==::slk_set(K.num,bf?K.label:"",K.format))
+     Error("slk_set");
+   noutrefresh();
+@@ -124,12 +124,12 @@
+ void Soft_Label_Key_Set::activate_labels(bool bf)
+ {
+   if (!b_attrInit) {
+-    NCursesApplication* A = NCursesApplication::getApplication();
++    const NCursesApplication* A = NCursesApplication::getApplication();
+     if (A) attrset(A->labels());
+     b_attrInit = TRUE;
+   }
+   for(int i=1; i <= num_labels; i++) {
+-    Soft_Label_Key& K = (*this)[i];
++    const Soft_Label_Key& K = (*this)[i];
+     if (ERR==::slk_set(K.num,bf?K.label:"",K.format))
+       Error("slk_set");
+   }
+Index: c++/cursslk.h
+Prereq:  1.19 
+--- ncurses-6.5-20240928+/c++/cursslk.h	2021-04-17 18:11:08.000000000 +0000
++++ ncurses-6.5-20241006/c++/cursslk.h	2024-10-05 22:47:12.000000000 +0000
+@@ -1,7 +1,7 @@
+ // * this is for making emacs happy: -*-Mode: C++;-*-
+ // vile:cppmode
+ /****************************************************************************
+- * Copyright 2019-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2019-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2003,2005 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -33,7 +33,7 @@
+  *   Author: Juergen Pfeifer, 1997                                          *
+  ****************************************************************************/
+ 
+-// $Id: cursslk.h,v 1.19 2021/04/17 18:11:08 tom Exp $
++// $Id: cursslk.h,v 1.20 2024/10/05 22:47:12 tom Exp $
+ 
+ #ifndef NCURSES_CURSSLK_H_incl
+ #define NCURSES_CURSSLK_H_incl
+@@ -62,7 +62,7 @@
+ 
+   public:
+     // Set the text of the Label
+-    Soft_Label_Key& operator=(char *text);
++    Soft_Label_Key& operator=(const char *text);
+ 
+     // Set the Justification of the Label
+     Soft_Label_Key& operator=(Justification just) {
+Index: dist.mk
+Prereq:  1.1634 
+--- ncurses-6.5-20240928+/dist.mk	2024-09-28 09:53:21.000000000 +0000
++++ ncurses-6.5-20241006/dist.mk	2024-10-06 08:53:45.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1634 2024/09/28 09:53:21 tom Exp $
++# $Id: dist.mk,v 1.1636 2024/10/06 08:53:45 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 = 5
+-NCURSES_PATCH = 20240928
++NCURSES_PATCH = 20241006
+ 
+ # 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.5-20240928+/misc/terminfo.src	2024-09-07 16:23:31.000000000 +0000
++++ ncurses-6.5-20241006/misc/terminfo.src	2024-10-05 16:04:17.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.1150 $
+-#	$Date: 2024/09/07 16:23:31 $
++#	$Revision: 1.1153 $
++#	$Date: 2024/10/05 16:04:17 $
+ #
+ # 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
+@@ -8060,6 +8060,17 @@
+ # "wezterm is a terminal emulator with support for modern features
+ #  such as fonts with ligatures, hyperlinks, tabs and multiple windows."
+ #
++# The documentation bears mention.  It refers to the "ANSI" standard and
++# 	https://wezfurlong.org/wezterm/what-is-a-terminal.html#ansi-and-ecma-48
++# X3.64 (withdrawn long ago).  A related website
++#	https://github.com/wez/ecma48
++# states that ECMA-48 was issued in 1979 and not revised since.  Actually that
++# was the second revision; the fifth revision in 1991 is current.  The source
++# code refers to the second revision in a half-dozen places.  Further, there
++# are three times as many references to Wikipedia as to xterm's documentation.
++# The git commit comments in several instances hint at an incomplete reading
++# of the relevant standards.
++#
+ # wezterm-20240203-110809-5046fc22 tested with MacOS
+ # General:
+ # + initial screensize is now 80x24
+@@ -8094,7 +8105,7 @@
+ # + poor (doesn't copy anyone, most of the results are wrong)
+ # vttest:
+ # + DA is VT5xx with sixel, selective erase, user windows, color
+-# + DA2 is VT220 version 277
++# + DA2 is VT220 version 277, perhaps a reference to xterm #277
+ # + only the VT100 character set works, contrary to DA/DA2.
+ # + no NRCS, either
+ # + double-sized character work, with some debris
+@@ -8136,7 +8147,7 @@
+ 	use=ansi+rep, use=ansi+sgrdim, use=bracketed+paste,
+ 	use=ecma+index, use=ecma+italics, use=ecma+strikeout,
+ 	use=report+version, use=vt220+cvis,
+-	use=xterm+256color2, use=xterm+alt1049,
++	use=xterm+256color2, use=xterm+alt+title,
+ 	use=xterm+focus, use=xterm+pcc2, use=xterm+pce2,
+ 	use=xterm+pcf2, use=xterm+sl-alt, use=xterm+sm+1006,
+ 	use=xterm+tmux,
+@@ -27644,4 +27655,8 @@
+ # 2024-09-07
+ #	+ update comments -TD
+ #
++# 2024-10-05
++#	+ use xterm+alt+title in wezterm -TD
++#	+ update comments -TD
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: ncurses/base/lib_screen.c
+Prereq:  1.108 
+--- ncurses-6.5-20240928+/ncurses/base/lib_screen.c	2024-09-22 20:20:36.000000000 +0000
++++ ncurses-6.5-20241006/ncurses/base/lib_screen.c	2024-10-05 20:47:44.000000000 +0000
+@@ -42,7 +42,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_screen.c,v 1.108 2024/09/22 20:20:36 tom Exp $")
++MODULE_ID("$Id: lib_screen.c,v 1.109 2024/10/05 20:47:44 tom Exp $")
+ 
+ #define MAX_SIZE 0x3fff		/* 16k is big enough for a window or pad */
+ 
+@@ -943,7 +943,7 @@
+  * Replace a window covering the whole screen, i.e., newscr or curscr.
+  */
+ static WINDOW *
+-replace_window(WINDOW *target, FILE *source)
++replace_window(const WINDOW *target, FILE *source)
+ {
+     WINDOW *result = getwin(source);
+ #if NCURSES_EXT_FUNCS
+Index: ncurses/base/new_pair.c
+Prereq:  1.24 
+--- ncurses-6.5-20240928+/ncurses/base/new_pair.c	2024-07-27 19:22:23.000000000 +0000
++++ ncurses-6.5-20241006/ncurses/base/new_pair.c	2024-10-05 20:51:29.000000000 +0000
+@@ -61,7 +61,7 @@
+ 
+ #endif
+ 
+-MODULE_ID("$Id: new_pair.c,v 1.24 2024/07/27 19:22:23 tom Exp $")
++MODULE_ID("$Id: new_pair.c,v 1.25 2024/10/05 20:51:29 tom Exp $")
+ 
+ #if NCURSES_EXT_COLORS
+ 
+@@ -193,7 +193,7 @@
+  * pair table.
+  */
+ NCURSES_EXPORT(void)
+-_nc_reset_color_pair(SCREEN *sp, int pair, colorpair_t * next)
++_nc_reset_color_pair(SCREEN *sp, int pair, const colorpair_t * next)
+ {
+     colorpair_t *last;
+ 
+Index: ncurses/curses.priv.h
+Prereq:  1.691 
+--- ncurses-6.5-20240928+/ncurses/curses.priv.h	2024-09-28 15:35:01.000000000 +0000
++++ ncurses-6.5-20241006/ncurses/curses.priv.h	2024-10-05 21:01:50.000000000 +0000
+@@ -35,7 +35,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: curses.priv.h,v 1.691 2024/09/28 15:35:01 tom Exp $
++ * $Id: curses.priv.h,v 1.692 2024/10/05 21:01:50 tom Exp $
+  *
+  *	curses.priv.h
+  *
+@@ -2170,7 +2170,7 @@
+ extern NCURSES_EXPORT(int) _nc_read_termcap_entry (const char *const, TERMTYPE2 *const);
+ extern NCURSES_EXPORT(int) _nc_setup_tinfo(const char *, TERMTYPE2 *);
+ extern NCURSES_EXPORT(int) _nc_setupscreen (int, int, FILE *, int, int);
+-extern NCURSES_EXPORT(int) _nc_timed_wait (SCREEN *, int, int, int * EVENTLIST_2nd(_nc_eventlist *));
++extern NCURSES_EXPORT(int) _nc_timed_wait (const SCREEN *, int, int, int * EVENTLIST_2nd(_nc_eventlist *));
+ extern NCURSES_EXPORT(int) _nc_trans_string (char *, const char *);
+ extern NCURSES_EXPORT(void) _nc_init_termtype (TERMTYPE2 *const);
+ extern NCURSES_EXPORT(void) _nc_do_color (int, int, int, NCURSES_OUTC);
+Index: ncurses/new_pair.h
+Prereq:  1.14 
+--- ncurses-6.5-20240928+/ncurses/new_pair.h	2024-05-25 23:10:33.000000000 +0000
++++ ncurses-6.5-20241006/ncurses/new_pair.h	2024-10-05 20:57:47.000000000 +0000
+@@ -34,7 +34,7 @@
+ /*
+  * Common type definitions and macros for new_pair.c, lib_color.c
+  *
+- * $Id: new_pair.h,v 1.14 2024/05/25 23:10:33 tom Exp $
++ * $Id: new_pair.h,v 1.15 2024/10/05 20:57:47 tom Exp $
+  */
+ 
+ #ifndef NEW_PAIR_H
+@@ -116,7 +116,7 @@
+ #if NCURSES_EXT_FUNCS && NCURSES_EXT_COLORS
+ extern NCURSES_EXPORT(void)     _nc_copy_pairs(SCREEN*, colorpair_t*, colorpair_t*, int);
+ extern NCURSES_EXPORT(void)     _nc_free_ordered_pairs(SCREEN*);
+-extern NCURSES_EXPORT(void)     _nc_reset_color_pair(SCREEN*, int, colorpair_t*);
++extern NCURSES_EXPORT(void)     _nc_reset_color_pair(SCREEN*, int, const colorpair_t*);
+ extern NCURSES_EXPORT(void)     _nc_set_color_pair(SCREEN*, int, int);
+ #else
+ #define _nc_free_ordered_pairs(sp) /* nothing */
+Index: ncurses/tinfo/trim_sgr0.c
+Prereq:  1.23 
+--- ncurses-6.5-20240928+/ncurses/tinfo/trim_sgr0.c	2024-07-27 19:22:23.000000000 +0000
++++ ncurses-6.5-20241006/ncurses/tinfo/trim_sgr0.c	2024-10-05 20:53:48.000000000 +0000
+@@ -37,7 +37,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: trim_sgr0.c,v 1.23 2024/07/27 19:22:23 tom Exp $")
++MODULE_ID("$Id: trim_sgr0.c,v 1.24 2024/10/05 20:53:48 tom Exp $")
+ 
+ #undef CUR
+ #define CUR tp->
+@@ -237,12 +237,10 @@
+ 
+     if (PRESENT(exit_attribute_mode)
+ 	&& PRESENT(set_attributes)) {
+-	bool found = FALSE;
+ 	char *on = set_attribute_9(tp, 1);
+ 	char *off = set_attribute_9(tp, 0);
+ 	char *end = strdup(exit_attribute_mode);
+ 	char *tmp;
+-	size_t i, j, k;
+ 
+ 	TR(TRACE_DATABASE, ("checking if we can trim sgr0 based on sgr"));
+ 	TR(TRACE_DATABASE, ("sgr0       %s", _nc_visbuf(end)));
+@@ -255,6 +253,9 @@
+ 	    FreeIfNeeded(off);
+ 	} else if (similar_sgr(off, end)
+ 		   && !similar_sgr(off, on)) {
++	    bool found = FALSE;
++	    size_t i, j, k;
++
+ 	    TR(TRACE_DATABASE, ("adjusting sgr(9:off) : %s", _nc_visbuf(off)));
+ 	    result = off;
+ 	    /*
+Index: ncurses/tty/lib_twait.c
+Prereq:  1.81 
+--- ncurses-6.5-20240928+/ncurses/tty/lib_twait.c	2023-09-16 16:30:40.000000000 +0000
++++ ncurses-6.5-20241006/ncurses/tty/lib_twait.c	2024-10-05 22:47:12.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -76,7 +76,7 @@
+ #endif
+ #undef CUR
+ 
+-MODULE_ID("$Id: lib_twait.c,v 1.81 2023/09/16 16:30:40 tom Exp $")
++MODULE_ID("$Id: lib_twait.c,v 1.82 2024/10/05 22:47:12 tom Exp $")
+ 
+ /*
+  * Returns an elapsed time, in milliseconds (if possible).
+@@ -168,7 +168,7 @@
+  * descriptors.
+  */
+ NCURSES_EXPORT(int)
+-_nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
++_nc_timed_wait(const SCREEN *sp MAYBE_UNUSED,
+ 	       int mode MAYBE_UNUSED,
+ 	       int milliseconds,
+ 	       int *timeleft
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20240928+/package/debian-mingw/changelog	2024-09-28 09:53:21.000000000 +0000
++++ ncurses-6.5-20241006/package/debian-mingw/changelog	2024-10-06 08:53:45.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240928) unstable; urgency=low
++ncurses6td (6.5+20241006) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 28 Sep 2024 05:53:21 -0400
++ -- Thomas E. Dickey   Sun, 06 Oct 2024 04:53:45 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20240928+/package/debian-mingw64/changelog	2024-09-28 09:53:21.000000000 +0000
++++ ncurses-6.5-20241006/package/debian-mingw64/changelog	2024-10-06 08:53:45.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240928) unstable; urgency=low
++ncurses6td (6.5+20241006) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 28 Sep 2024 05:53:21 -0400
++ -- Thomas E. Dickey   Sun, 06 Oct 2024 04:53:45 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20240928+/package/debian/changelog	2024-09-28 09:53:21.000000000 +0000
++++ ncurses-6.5-20241006/package/debian/changelog	2024-10-06 08:53:45.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20240928) unstable; urgency=low
++ncurses6td (6.5+20241006) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 28 Sep 2024 05:53:21 -0400
++ -- Thomas E. Dickey   Sun, 06 Oct 2024 04:53:45 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.669 
+--- ncurses-6.5-20240928+/package/mingw-ncurses.nsi	2024-09-28 09:53:21.000000000 +0000
++++ ncurses-6.5-20241006/package/mingw-ncurses.nsi	2024-10-06 08:53:45.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.669 2024/09/28 09:53:21 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.671 2024/10/06 08:53:45 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "0928"
++!define VERSION_MMDD  "1006"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20240928+/package/mingw-ncurses.spec	2024-09-28 09:53:21.000000000 +0000
++++ ncurses-6.5-20241006/package/mingw-ncurses.spec	2024-10-06 08:53:45.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20240928
++Release: 20241006
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20240928+/package/ncurses.spec	2024-09-28 09:53:21.000000000 +0000
++++ ncurses-6.5-20241006/package/ncurses.spec	2024-10-06 08:53:45.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20240928
++Release: 20241006
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20240928+/package/ncursest.spec	2024-09-28 09:53:21.000000000 +0000
++++ ncurses-6.5-20241006/package/ncursest.spec	2024-10-06 08:53:45.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20240928
++Release: 20241006
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/blue.c
+Prereq:  1.55 
+--- ncurses-6.5-20240928+/test/blue.c	2022-12-10 23:31:31.000000000 +0000
++++ ncurses-6.5-20241006/test/blue.c	2024-10-05 19:26:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
++ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -37,7 +37,7 @@
+  *****************************************************************************/
+ 
+ /*
+- * $Id: blue.c,v 1.55 2022/12/10 23:31:31 tom Exp $
++ * $Id: blue.c,v 1.56 2024/10/05 19:26:24 tom Exp $
+  */
+ 
+ #include 
+@@ -437,7 +437,7 @@
+ static void
+ use_pc_display(void)
+ {
+-    char *check = nl_langinfo(CODESET);
++    const char *check = nl_langinfo(CODESET);
+     if (!strcmp(check, "UTF-8")) {
+ #if USE_WIDEC_SUPPORT
+ 	suits = uglyphs;
+@@ -448,8 +448,8 @@
+ 	    !strcmp(check, "CP437") ||
+ 	    !strcmp(check, "IBM850") ||
+ 	    !strcmp(check, "CP850")) {
+-	    char *smacs = tigetstr("smacs");
+-	    char *smpch = tigetstr("smpch");
++	    const char *smacs = tigetstr("smacs");
++	    const char *smpch = tigetstr("smpch");
+ 	    /*
+ 	     * The ncurses library makes this check to decide whether to allow
+ 	     * the alternate character set for the (normally) nonprinting codes.
+Index: test/bs.c
+Prereq:  1.79 
+--- ncurses-6.5-20240928+/test/bs.c	2023-05-27 20:13:10.000000000 +0000
++++ ncurses-6.5-20241006/test/bs.c	2024-10-05 19:26:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -35,7 +35,7 @@
+  * v2.0 featuring strict ANSI/POSIX conformance, November 1993.
+  * v2.1 with ncurses mouse support, September 1995
+  *
+- * $Id: bs.c,v 1.79 2023/05/27 20:13:10 tom Exp $
++ * $Id: bs.c,v 1.80 2024/10/05 19:26:24 tom Exp $
+  */
+ 
+ #include 
+@@ -147,7 +147,7 @@
+     bool placed;		/* has it been placed on the board? */
+ } ship_t;
+ 
+-static bool checkplace(int b, ship_t * ss, int vis);
++static bool checkplace(int b, const ship_t * ss, int vis);
+ 
+ #define SHIPIT(name, symbol, length) { name, 0, symbol, length, 0,0, 0, FALSE }
+ 
+@@ -686,7 +686,7 @@
+ }
+ 
+ static bool
+-checkplace(int b, ship_t * ss, int vis)
++checkplace(int b, const ship_t * ss, int vis)
+ {
+     int l, xend, yend;
+ 
+Index: test/cardfile.c
+Prereq:  1.51 
+--- ncurses-6.5-20240928+/test/cardfile.c	2022-12-04 00:40:11.000000000 +0000
++++ ncurses-6.5-20241006/test/cardfile.c	2024-10-05 19:26:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
++ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
+  * Copyright 1999-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: cardfile.c,v 1.51 2022/12/04 00:40:11 tom Exp $
++ * $Id: cardfile.c,v 1.52 2024/10/05 19:26:24 tom Exp $
+  *
+  * File format: text beginning in column 1 is a title; other text is content.
+  */
+@@ -161,7 +161,7 @@
+ }
+ 
+ static CARD *
+-find_card(char *title)
++find_card(const char *title)
+ {
+     CARD *card;
+ 
+@@ -173,7 +173,7 @@
+ }
+ 
+ static void
+-read_data(char *fname)
++read_data(const char *fname)
+ {
+     FILE *fp;
+ 
+@@ -341,7 +341,7 @@
+ }
+ 
+ static FIELD **
+-make_fields(CARD * p, int form_high, int form_wide)
++make_fields(const CARD * p, int form_high, int form_wide)
+ {
+     FIELD **f = typeCalloc(FIELD *, (size_t) 3);
+ 
+@@ -385,7 +385,7 @@
+ /*******************************************************************************/
+ 
+ static void
+-cardfile(char *fname)
++cardfile(const char *fname)
+ {
+     WINDOW *win;
+     CARD *p;
+Index: test/chgat.c
+Prereq:  1.21 
+--- ncurses-6.5-20240928+/test/chgat.c	2024-06-29 17:45:32.000000000 +0000
++++ ncurses-6.5-20241006/test/chgat.c	2024-10-06 22:35:55.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: chgat.c,v 1.21 2024/06/29 17:45:32 tom Exp $
++ * $Id: chgat.c,v 1.23 2024/10/06 22:35:55 tom Exp $
+  *
+  * test-driver for chgat/wchgat/mvchgat/mvwchgat
+  */
+@@ -160,7 +160,7 @@
+ }
+ 
+ static void
+-do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *))
++do_subwindow(WINDOW *win, const STATUS * sp, void func(WINDOW *))
+ {
+     WINDOW *win1 = newwin(sp->y_max - 2, sp->x_max - 2,
+ 			  sp->y_beg + 1, sp->x_beg + 1);
+@@ -204,7 +204,7 @@
+ static void
+ show_help(WINDOW *win)
+ {
+-    static const char *msgs[] =
++    static NCURSES_CONST char *msgs[] =
+     {
+ 	"Basic commands:"
+ 	,"Use h/j/k/l or arrow keys to move the cursor."
+Index: test/clip_printw.c
+Prereq:  1.23 
+--- ncurses-6.5-20240928+/test/clip_printw.c	2023-09-30 19:57:44.000000000 +0000
++++ ncurses-6.5-20241006/test/clip_printw.c	2024-10-06 22:36:25.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: clip_printw.c,v 1.23 2023/09/30 19:57:44 tom Exp $
++ * $Id: clip_printw.c,v 1.25 2024/10/06 22:36:25 tom Exp $
+  *
+  * demonstrate how to use printw with/without wrapping.
+  */
+@@ -212,7 +212,7 @@
+ }
+ 
+ static void
+-do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *))
++do_subwindow(WINDOW *win, const STATUS * sp, void func(WINDOW *))
+ {
+     WINDOW *win1 = newwin(sp->y_max - (2 * MARGIN),
+ 			  sp->x_max - (2 * MARGIN),
+@@ -268,7 +268,7 @@
+ static void
+ show_help(WINDOW *win)
+ {
+-    static const char *msgs[] =
++    static NCURSES_CONST char *msgs[] =
+     {
+ 	"Basic commands:"
+ 	,"Use h/j/k/l or arrow keys to move the cursor."
+Index: test/color_name.h
+Prereq:  1.9 
+--- ncurses-6.5-20240928+/test/color_name.h	2021-04-24 23:25:29.000000000 +0000
++++ ncurses-6.5-20241006/test/color_name.h	2024-10-05 19:26:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2018-2021,2024 Thomas E. Dickey                                *
+  * Copyright 2011-2012,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: color_name.h,v 1.9 2021/04/24 23:25:29 tom Exp $
++ * $Id: color_name.h,v 1.10 2024/10/05 19:26:24 tom Exp $
+  */
+ 
+ #ifndef __COLORNAME_H
+@@ -63,7 +63,6 @@
+ {
+     int result = 0;
+     char *endp = 0;
+-    size_t n;
+ 
+     if ((result = (int) strtol(color, &endp, 0)) >= 0
+ 	&& (endp == 0 || *endp == 0)) {
+@@ -71,6 +70,7 @@
+     } else if (!strcmp(color, "default")) {
+ 	result = -1;
+     } else {
++	size_t n;
+ 	for (n = 0; n < SIZEOF(the_color_names); ++n) {
+ 	    if (!strcmp(the_color_names[n], color)) {
+ 		result = (int) n;
+Index: test/demo_defkey.c
+Prereq:  1.35 
+--- ncurses-6.5-20240928+/test/demo_defkey.c	2024-01-20 20:46:12.000000000 +0000
++++ ncurses-6.5-20241006/test/demo_defkey.c	2024-10-05 18:20:04.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_defkey.c,v 1.35 2024/01/20 20:46:12 tom Exp $
++ * $Id: demo_defkey.c,v 1.36 2024/10/05 18:20:04 tom Exp $
+  *
+  * Demonstrate the define_key() function.
+  * Thomas Dickey - 2002/11/23
+@@ -199,7 +199,7 @@
+ }
+ 
+ static void
+-redefine(WINDOW *win, char *string, int code)
++redefine(WINDOW *win, const char *string, int code)
+ {
+     really_define_key(win, string, code);
+ }
+Index: test/demo_forms.c
+Prereq:  1.63 
+--- ncurses-6.5-20240928+/test/demo_forms.c	2023-11-11 00:29:53.000000000 +0000
++++ ncurses-6.5-20241006/test/demo_forms.c	2024-10-06 21:15:12.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2003-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_forms.c,v 1.63 2023/11/11 00:29:53 tom Exp $
++ * $Id: demo_forms.c,v 1.67 2024/10/06 21:15:12 tom Exp $
+  *
+  * Demonstrate a variety of functions from the form library.
+  * Thomas Dickey - 2003/4/26
+@@ -148,7 +148,7 @@
+ }
+ 
+ static FIELD *
+-make_label(const char *label, int frow, int fcol)
++make_label(NCURSES_CONST char *label, int frow, int fcol)
+ {
+     FIELD *f = new_field(1, (int) strlen(label), frow, fcol, 0, 0);
+ 
+@@ -242,7 +242,7 @@
+ #define O_SELECTABLE (O_ACTIVE | O_VISIBLE)
+ 
+ static FIELD *
+-another_field(FORM *form, const FIELD *const field)
++another_field(NCURSES_CONST FORM *form, NCURSES_CONST FIELD *const field)
+ {
+     FIELD **f = form_fields(form);
+     FIELD *result = 0;
+@@ -306,9 +306,9 @@
+ }
+ 
+ static void
+-show_current_field(WINDOW *win, FORM *form)
++show_current_field(WINDOW *win, NCURSES_CONST FORM *form)
+ {
+-    FIELD *field;
++    NCURSES_CONST FIELD *field;
+     int field_rows, field_cols, field_max;
+     int currow, curcol;
+ 
+@@ -325,7 +325,7 @@
+     waddch(win, '\n');
+ 
+     if ((field = current_field(form)) != 0) {
+-	FIELDTYPE *type;
++	NCURSES_CONST FIELDTYPE *type;
+ 	int nbuf;
+ 
+ 	wprintw(win, "Page %d%s, Field %d/%d%s:",
+@@ -383,7 +383,7 @@
+ 
+ 	waddstr(win, "\n");
+ 	for (nbuf = 0; nbuf <= 2; ++nbuf) {
+-	    char *buffer;
++	    NCURSES_CONST char *buffer;
+ 	    if ((buffer = field_buffer(field, nbuf)) != 0) {
+ 		wprintw(win, "buffer %d:", nbuf);
+ 		(void) wattrset(win, A_REVERSE);
+@@ -408,8 +408,8 @@
+     int c;
+     unsigned n = 0;
+     int pg;
+-    const char *fname;
+-    static const char *my_enum[] =
++    NCURSES_CONST char *fname;
++    static NCURSES_CONST char *my_enum[] =
+     {"first", "second", "third", 0};
+ 
+ #ifdef NCURSES_MOUSE_VERSION
+@@ -515,7 +515,7 @@
+     f[n] = (FIELD *) 0;
+ 
+     if ((form = new_form(f)) != 0) {
+-	WINDOW *w;
++	NCURSES_CONST WINDOW *w;
+ 	WINDOW *also;
+ 	int finished = 0;
+ 
+Index: test/demo_menus.c
+Prereq:  1.80 
+--- ncurses-6.5-20240928+/test/demo_menus.c	2023-05-27 20:13:10.000000000 +0000
++++ ncurses-6.5-20241006/test/demo_menus.c	2024-10-06 19:58:28.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2003-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_menus.c,v 1.80 2023/05/27 20:13:10 tom Exp $
++ * $Id: demo_menus.c,v 1.82 2024/10/06 19:58:28 tom Exp $
+  *
+  * Demonstrate a variety of functions from the menu library.
+  * Thomas Dickey - 2005/4/9
+@@ -185,7 +185,7 @@
+ }
+ 
+ static int
+-menu_getc(MENU * m)
++menu_getc(NCURSES_CONST MENU * m)
+ {
+     return wGetchar(menu_win(m));
+ }
+@@ -214,7 +214,7 @@
+ my_menu_init(MENU * menu)
+ {
+     Trace(("called MenuHook my_menu_init"));
+-    mvwprintw(status, 2, 0, "menu_init %p", (void *) menu);
++    mvwprintw(status, 2, 0, "menu_init %p", (const void *) menu);
+     wclrtoeol(status);
+     wrefresh(status);
+ }
+@@ -223,7 +223,7 @@
+ my_menu_term(MENU * menu)
+ {
+     Trace(("called MenuHook my_menu_term"));
+-    mvwprintw(status, 2, 0, "menu_term %p", (void *) menu);
++    mvwprintw(status, 2, 0, "menu_term %p", (const void *) menu);
+     wclrtoeol(status);
+     wrefresh(status);
+ }
+@@ -231,7 +231,7 @@
+ static void
+ my_item_init(MENU * menu)
+ {
+-    ITEM *item = current_item(menu);
++    NCURSES_CONST ITEM *item = current_item(menu);
+     const char *name = item_name(item);
+ 
+     Trace(("called MenuHook my_item_init (%s)", name));
+@@ -243,7 +243,7 @@
+ static void
+ my_item_term(MENU * menu)
+ {
+-    ITEM *item = current_item(menu);
++    NCURSES_CONST ITEM *item = current_item(menu);
+     const char *name = item_name(item);
+ 
+     Trace(("called MenuHook my_item_term (%s)", name));
+@@ -348,7 +348,7 @@
+ 
+ /* force the given menu to appear */
+ static void
+-menu_display(MENU * m)
++menu_display(NCURSES_CONST MENU * m)
+ {
+     touchwin(menu_win(m));
+     wrefresh(menu_win(m));
+@@ -584,10 +584,10 @@
+  * the others
+  */
+ static bool
+-update_trace_menu(MENU * m)
++update_trace_menu(NCURSES_CONST MENU * m)
+ {
+     ITEM **items;
+-    ITEM *i;
++    NCURSES_CONST ITEM *i;
+     bool changed = FALSE;
+ 
+     items = menu_items(m);
+@@ -613,7 +613,7 @@
+     int result;
+ 
+     for (ip = menu_items(mpTrace); *ip; ip++) {
+-	MENU_DATA *td = (MENU_DATA *) item_userptr(*ip);
++	NCURSES_CONST MENU_DATA *td = (MENU_DATA *) item_userptr(*ip);
+ 	unsigned mask = td->mask;
+ 	if (mask == 0)
+ 	    set_item_value(*ip, _nc_tracing == 0);
+@@ -628,7 +628,7 @@
+ 	    unsigned newtrace = 0;
+ 	    for (ip = menu_items(mpTrace); *ip; ip++) {
+ 		if (item_value(*ip)) {
+-		    MENU_DATA *td = (MENU_DATA *) item_userptr(*ip);
++		    NCURSES_CONST MENU_DATA *td = (MENU_DATA *) item_userptr(*ip);
+ 		    newtrace |= td->mask;
+ 		}
+ 	    }
+@@ -718,7 +718,9 @@
+ }
+ 
+ static int
+-move_menu(MENU * menu, MENU * current, int by_y, int by_x)
++move_menu(NCURSES_CONST MENU * menu,
++	  NCURSES_CONST MENU * current,
++	  int by_y, int by_x)
+ {
+     WINDOW *top_win = menu_win(menu);
+     WINDOW *sub_win = menu_sub(menu);
+@@ -798,7 +800,7 @@
+ #endif /* defined(KEY_RESIZE) && NCURSES_EXT_FUNCS */
+ 
+ static void
+-show_status(int ch, MENU * menu)
++show_status(int ch, NCURSES_CONST MENU * menu)
+ {
+     wmove(status, 0, 0);
+     wprintw(status, "key %s, menu %d, mark %s, match %s",
+@@ -919,7 +921,7 @@
+ 	wrefresh(menu_win(last_menu));
+ 	if (code == E_UNKNOWN_COMMAND
+ 	    || code == E_NOT_POSTED) {
+-	    ITEM *item = current_item(last_menu);
++	    NCURSES_CONST ITEM *item = current_item(last_menu);
+ 	    MENU_DATA *td = (MENU_DATA *) item_userptr(item);
+ 	    td->func((int) td->mask);
+ 	}
+Index: test/demo_new_pair.c
+Prereq:  1.28 
+--- ncurses-6.5-20240928+/test/demo_new_pair.c	2024-06-29 19:30:26.000000000 +0000
++++ ncurses-6.5-20241006/test/demo_new_pair.c	2024-10-05 18:21:44.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_new_pair.c,v 1.28 2024/06/29 19:30:26 tom Exp $
++ * $Id: demo_new_pair.c,v 1.29 2024/10/05 18:21:44 tom Exp $
+  *
+  * Demonstrate the alloc_pair() function.
+  */
+@@ -49,7 +49,7 @@
+ static bool
+ valid_cap(NCURSES_CONST char *name)
+ {
+-    char *value = tigetstr(name);
++    const char *value = tigetstr(name);
+     return (value != 0 && value != (char *) -1) ? TRUE : FALSE;
+ }
+ 
+Index: test/demo_panels.c
+Prereq:  1.48 
+--- ncurses-6.5-20240928+/test/demo_panels.c	2022-12-04 00:40:11.000000000 +0000
++++ ncurses-6.5-20241006/test/demo_panels.c	2024-10-06 20:01:21.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2022 Thomas E. Dickey                                *
++ * Copyright 2018-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2003-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_panels.c,v 1.48 2022/12/04 00:40:11 tom Exp $
++ * $Id: demo_panels.c,v 1.50 2024/10/06 20:01:21 tom Exp $
+  *
+  * Demonstrate a variety of functions from the panel library.
+  */
+@@ -42,7 +42,7 @@
+ #define TEMP_POS '>'
+ 
+ typedef void (*InitPanel) (void);
+-typedef void (*FillPanel) (PANEL *);
++typedef void (*FillPanel) (NCURSES_CONST PANEL *);
+ 
+ static bool use_colors = FALSE;
+ static bool unboxed = FALSE;
+@@ -301,7 +301,7 @@
+ 	int code;
+ 	int y0, x0;
+ 	int y1, x1;
+-	WINDOW *win = panel_window(pans[which]);
++	NCURSES_CONST WINDOW *win = panel_window(pans[which]);
+ 	char also[80];
+ 
+ 	getbegyx(win, y0, x0);
+@@ -368,7 +368,7 @@
+ }
+ 
+ static void
+-fill_panel(PANEL *pan)
++fill_panel(NCURSES_CONST PANEL *pan)
+ {
+     WINDOW *win = panel_window(pan);
+     const char *userptr = (const char *) panel_userptr(pan);
+@@ -388,7 +388,7 @@
+ }
+ 
+ static void
+-fill_unboxed(PANEL *pan)
++fill_unboxed(NCURSES_CONST PANEL *pan)
+ {
+     WINDOW *win = panel_window(pan);
+     const char *userptr = (const char *) panel_userptr(pan);
+@@ -431,7 +431,7 @@
+ }
+ 
+ static void
+-fill_wide_panel(PANEL *pan)
++fill_wide_panel(NCURSES_CONST PANEL *pan)
+ {
+     WINDOW *win = panel_window(pan);
+     int num = ((const char *) panel_userptr(pan))[1];
+@@ -453,7 +453,7 @@
+ #define MAX_PANELS 5
+ 
+ static int
+-which_panel(PANEL *px[MAX_PANELS + 1], PANEL *pan)
++which_panel(PANEL *px[MAX_PANELS + 1], NCURSES_CONST PANEL *pan)
+ {
+     int result = 0;
+     int j;
+Index: test/demo_termcap.c
+Prereq:  1.65 
+--- ncurses-6.5-20240928+/test/demo_termcap.c	2023-05-27 20:13:10.000000000 +0000
++++ ncurses-6.5-20241006/test/demo_termcap.c	2024-10-06 20:05:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2005-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: demo_termcap.c,v 1.65 2023/05/27 20:13:10 tom Exp $
++ * $Id: demo_termcap.c,v 1.70 2024/10/06 20:05:09 tom Exp $
+  *
+  * A simple demo of the termcap interface.
+  */
+@@ -256,7 +256,7 @@
+      * to hold all of the strings extracted from the terminal entry.
+      */
+     char area[1024], *ap = area;
+-    char *str;
++    NCURSES_CONST char *str;
+     int num;
+ 
+     if ((str = tgetstr(cap, &ap)) != 0) {
+@@ -289,7 +289,7 @@
+ }
+ 
+ static void
+-brute_force(const char *name)
++brute_force(NCURSES_CONST char *name)
+ {
+     char buffer[1024];
+ 
+@@ -369,7 +369,7 @@
+ #ifdef NCURSES_VERSION
+ 	if (x_opt && (my_blob == 0) && y_opt) {
+ #if NCURSES_XNAMES
+-	    TERMTYPE *term = (TERMTYPE *) cur_term;
++	    NCURSES_CONST TERMTYPE *term = (TERMTYPE *) cur_term;
+ 	    if (term != 0
+ 		&& ((NUM_BOOLEANS(term) != BOOLCOUNT)
+ 		    || (NUM_NUMBERS(term) != NUMCOUNT)
+@@ -781,12 +781,12 @@
+ {
+     int ch;
+     int n;
+-    char *name;
++    NCURSES_CONST char *name;
+     bool a_opt = FALSE;
+ #if defined(NCURSES_VERSION) || defined(HAVE_CURSES_DATA_OSPEED)
+     bool v_opt = FALSE;
+ #endif
+-    char *input_name = 0;
++    NCURSES_CONST char *input_name = 0;
+ 
+     int repeat;
+     int r_opt = 1;
+@@ -867,7 +867,7 @@
+ 	    } else if ((name = getenv("TERM")) != 0) {
+ 		brute_force(name);
+ 	    } else {
+-		static char dumb[] = "dumb";
++		static NCURSES_CONST char dumb[] = "dumb";
+ 		brute_force(dumb);
+ 	    }
+ 	}
+@@ -894,7 +894,7 @@
+ 	    } else if ((name = getenv("TERM")) != 0) {
+ 		demo_termcap(name);
+ 	    } else {
+-		static char dumb[] = "dumb";
++		static NCURSES_CONST char dumb[] = "dumb";
+ 		demo_termcap(dumb);
+ 	    }
+ 	}
+Index: test/demo_terminfo.c
+Prereq:  1.57 
+--- ncurses-6.5-20240928+/test/demo_terminfo.c	2023-05-27 20:13:10.000000000 +0000
++++ ncurses-6.5-20241006/test/demo_terminfo.c	2024-10-06 21:16:43.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2009-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: demo_terminfo.c,v 1.57 2023/05/27 20:13:10 tom Exp $
++ * $Id: demo_terminfo.c,v 1.59 2024/10/06 21:16:43 tom Exp $
+  *
+  * A simple demo of the terminfo interface.
+  */
+@@ -253,7 +253,7 @@
+ #define LegalItem(c,n) (n)
+ 
+ static void
+-brute_force(const char *name)
++brute_force(NCURSES_CONST char *name)
+ {
+ #define MAX_FORCE 5		/* omit "colors", since CPU-time is a problem */
+     static const char legal[] = "\
+@@ -324,7 +324,7 @@
+ #endif
+ 
+ static void
+-demo_terminfo(char *name)
++demo_terminfo(NCURSES_CONST char *name)
+ {
+     unsigned n;
+     NCURSES_CONST char *cap;
+@@ -366,7 +366,7 @@
+     if (x_opt && (my_blob == 0)) {
+ 	if (y_opt) {
+ #if NCURSES_XNAMES
+-	    TERMTYPE *term = (TERMTYPE *) cur_term;
++	    const TERMTYPE *term = (TERMTYPE *) cur_term;
+ 	    if (term != 0
+ 		&& ((NUM_BOOLEANS(term) != BOOLCOUNT)
+ 		    || (NUM_NUMBERS(term) != NUMCOUNT)
+@@ -813,9 +813,9 @@
+     int ch;
+     int n;
+     int repeat;
+-    char *name;
++    NCURSES_CONST char *name;
+     int r_opt = 1;
+-    char *input_name = 0;
++    const char *input_name = 0;
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON "abd:e:fi:nqr:sxy")) != -1) {
+ 	switch (ch) {
+@@ -891,7 +891,7 @@
+ 	    } else if ((name = getenv("TERM")) != 0) {
+ 		brute_force(name);
+ 	    } else {
+-		static char dumb[] = "dumb";
++		static NCURSES_CONST char dumb[] = "dumb";
+ 		brute_force(dumb);
+ 	    }
+ 	}
+@@ -918,7 +918,7 @@
+ 	    } else if ((name = getenv("TERM")) != 0) {
+ 		demo_terminfo(name);
+ 	    } else {
+-		static char dumb[] = "dumb";
++		static NCURSES_CONST char dumb[] = "dumb";
+ 		demo_terminfo(dumb);
+ 	    }
+ 	}
+Index: test/dots.c
+Prereq:  1.45 
+--- ncurses-6.5-20240928+/test/dots.c	2023-01-07 17:21:48.000000000 +0000
++++ ncurses-6.5-20241006/test/dots.c	2024-10-06 21:17:54.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1999-2013,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey  1999
+  *
+- * $Id: dots.c,v 1.45 2023/01/07 17:21:48 tom Exp $
++ * $Id: dots.c,v 1.46 2024/10/06 21:17:54 tom Exp $
+  *
+  * A simple demo of the terminfo interface.
+  */
+@@ -61,7 +61,7 @@
+ }
+ 
+ static bool
+-outs(const char *s)
++outs(NCURSES_CONST char *s)
+ {
+     if (VALID_STRING(s)) {
+ 	tputs(s, 1, outc);
+Index: test/dots_mvcur.c
+Prereq:  1.31 
+--- ncurses-6.5-20240928+/test/dots_mvcur.c	2023-01-07 17:21:48.000000000 +0000
++++ ncurses-6.5-20241006/test/dots_mvcur.c	2024-10-06 21:17:54.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2007-2013,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey - 2007
+  *
+- * $Id: dots_mvcur.c,v 1.31 2023/01/07 17:21:48 tom Exp $
++ * $Id: dots_mvcur.c,v 1.32 2024/10/06 21:17:54 tom Exp $
+  *
+  * A simple demo of the terminfo interface, and mvcur.
+  */
+@@ -62,7 +62,7 @@
+ }
+ 
+ static bool
+-outs(const char *s)
++outs(NCURSES_CONST char *s)
+ {
+     if (VALID_STRING(s)) {
+ 	tputs(s, 1, outc);
+Index: test/dots_termcap.c
+Prereq:  1.33 
+--- ncurses-6.5-20240928+/test/dots_termcap.c	2024-08-31 15:55:46.000000000 +0000
++++ ncurses-6.5-20241006/test/dots_termcap.c	2024-10-06 21:18:35.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: dots_termcap.c,v 1.33 2024/08/31 15:55:46 tom Exp $
++ * $Id: dots_termcap.c,v 1.35 2024/10/06 21:18:35 tom Exp $
+  *
+  * A simple demo of the termcap interface.
+  */
+@@ -113,7 +113,7 @@
+ }
+ 
+ static bool
+-outs(char *s)
++outs(NCURSES_CONST char *s)
+ {
+     if (VALID_STRING(s)) {
+ 	tputs(s, 1, outc);
+@@ -178,7 +178,7 @@
+ get_number(NCURSES_CONST char *cap, const char *env)
+ {
+     int result = tgetnum(cap);
+-    char *value = env ? getenv(env) : 0;
++    const char *value = env ? getenv(env) : 0;
+     if (value != 0 && *value != 0) {
+ 	char *next = 0;
+ 	long check = strtol(value, &next, 10);
+@@ -229,7 +229,7 @@
+     double c;
+     char buffer[1024];
+     char area[1024];
+-    char *name;
++    NCURSES_CONST char *name;
+     size_t need;
+     char *my_env;
+ 
+Index: test/dup_field.c
+Prereq:  1.9 
+--- ncurses-6.5-20240928+/test/dup_field.c	2024-06-29 17:45:32.000000000 +0000
++++ ncurses-6.5-20241006/test/dup_field.c	2024-10-06 20:07:19.000000000 +0000
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: dup_field.c,v 1.9 2024/06/29 17:45:32 tom Exp $
++ * $Id: dup_field.c,v 1.11 2024/10/06 20:07:19 tom Exp $
+  *
+  * Demonstrate dup_field().
+  */
+@@ -146,27 +146,27 @@
+ }
+ 
+ static FieldAttrs *
+-my_field_attrs(FIELD *f)
++my_field_attrs(NCURSES_CONST FIELD *f)
+ {
+     return (FieldAttrs *) field_userptr(f);
+ }
+ 
+ static int
+-buffer_length(FIELD *f)
++buffer_length(NCURSES_CONST FIELD *f)
+ {
+     return my_field_attrs(f)->row_lengths[0];
+ }
+ 
+ static void
+-set_buffer_length(FIELD *f, int length)
++set_buffer_length(NCURSES_CONST FIELD *f, int length)
+ {
+     my_field_attrs(f)->row_lengths[0] = length;
+ }
+ 
+ static int
+-offset_in_field(FORM *form)
++offset_in_field(NCURSES_CONST FORM *form)
+ {
+-    FIELD *field = current_field(form);
++    NCURSES_CONST FIELD *field = current_field(form);
+     int currow, curcol;
+ 
+     form_getyx(form, currow, curcol);
+@@ -245,7 +245,7 @@
+ 
+ 	default:
+ 	    modified = (ch < MIN_FORM_COMMAND
+-			&& isprint(ch));
++			&& isprint(UChar(ch)));
+ 	    break;
+ 	}
+ 
+Index: test/filter.c
+Prereq:  1.38 
+--- ncurses-6.5-20240928+/test/filter.c	2022-12-04 00:40:11.000000000 +0000
++++ ncurses-6.5-20241006/test/filter.c	2024-10-05 19:26:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
++ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author:  Thomas E. Dickey 1998
+  *
+- * $Id: filter.c,v 1.38 2022/12/04 00:40:11 tom Exp $
++ * $Id: filter.c,v 1.39 2024/10/05 19:26:24 tom Exp $
+  *
+  * An example of the 'filter()' function in ncurses, this program prompts
+  * for commands and executes them (like a command shell).  It illustrates
+@@ -65,7 +65,7 @@
+     if (clocked) {
+ 	if (limit >= 3) {
+ 	    time_t now = time((time_t *) 0);
+-	    struct tm *my = localtime(&now);
++	    const struct tm *my = localtime(&now);
+ 	    char buffer[80];
+ 	    int skip, y, x;
+ 	    int margin;
+Index: test/form_driver_w.c
+Prereq:  1.17 
+--- ncurses-6.5-20240928+/test/form_driver_w.c	2022-12-10 23:31:31.000000000 +0000
++++ ncurses-6.5-20241006/test/form_driver_w.c	2024-10-06 23:13:40.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2022 Thomas E. Dickey                                     *
++ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2013-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -32,7 +32,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: form_driver_w.c,v 1.17 2022/12/10 23:31:31 tom Exp $
++ * $Id: form_driver_w.c,v 1.18 2024/10/06 23:13:40 tom Exp $
+  *
+  * Test form_driver_w (int, int, wchar_t), a wide char aware
+  * replacement of form_driver.
+@@ -68,7 +68,7 @@
+ int
+ main(int argc, char *argv[])
+ {
+-    static const char *help[] =
++    static NCURSES_CONST char *help[] =
+     {
+ 	"Commands:",
+ 	"  ^D,^Q,ESC           - quit program",
+Index: test/gdc.c
+Prereq:  1.60 
+--- ncurses-6.5-20240928+/test/gdc.c	2024-06-29 19:59:06.000000000 +0000
++++ ncurses-6.5-20241006/test/gdc.c	2024-10-06 20:08:59.000000000 +0000
+@@ -34,7 +34,7 @@
+  * modified 10-18-89 for curses (jrl)
+  * 10-18-89 added signal handling
+  *
+- * $Id: gdc.c,v 1.60 2024/06/29 19:59:06 tom Exp $
++ * $Id: gdc.c,v 1.62 2024/10/06 20:08:59 tom Exp $
+  */
+ 
+ #include 
+@@ -181,7 +181,7 @@
+     int check;
+     time_t result;
+     char c = 0;
+-    struct tm *tm;
++    NCURSES_CONST struct tm *tm;
+ 
+     switch (sscanf(value, "%d:%d:%d%c", &hh, &mm, &ss, &c)) {
+     default:
+@@ -243,7 +243,7 @@
+ main(int argc, char *argv[])
+ {
+     time_t now;
+-    struct tm *tm;
++    NCURSES_CONST struct tm *tm;
+     long t, a;
+     int i, j, s, k, ch;
+     int count = 0;
+@@ -293,7 +293,7 @@
+ 
+     InitAndCatch({
+ 	if (redirected) {
+-	    char *name = getenv("TERM");
++	    NCURSES_CONST char *name = getenv("TERM");
+ 	    if (name == 0
+ 		|| newterm(name, ofp, ifp) == 0) {
+ 		fprintf(stderr, "cannot open terminal\n");
+@@ -431,7 +431,7 @@
+ 	    _nc_STRNCPY(buf, ctime(&now), (size_t) 30);
+ 	    {
+ 		char *d2 = buf + 10;
+-		char *s2 = buf + 19;
++		NCURSES_CONST char *s2 = buf + 19;
+ 		while ((*d2++ = *s2++) != '\0') ;
+ 	    }
+ 	    MvAddStr(16, 30, buf);
+Index: test/inch_wide.c
+Prereq:  1.13 
+--- ncurses-6.5-20240928+/test/inch_wide.c	2022-12-10 23:55:34.000000000 +0000
++++ ncurses-6.5-20241006/test/inch_wide.c	2024-10-06 23:14:31.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
++ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2007-2010,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: inch_wide.c,v 1.13 2022/12/10 23:55:34 tom Exp $
++ * $Id: inch_wide.c,v 1.14 2024/10/06 23:14:31 tom Exp $
+  */
+ /*
+        int in_wch(cchar_t *wcval);
+@@ -61,7 +61,7 @@
+ static int
+ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
+ {
+-    static const char *help[] =
++    static NCURSES_CONST char *help[] =
+     {
+ 	"Test input from screen using inch(), etc., in a moveable viewport.",
+ 	"",
+Index: test/inchs.c
+Prereq:  1.19 
+--- ncurses-6.5-20240928+/test/inchs.c	2022-12-11 00:01:39.000000000 +0000
++++ ncurses-6.5-20241006/test/inchs.c	2024-10-06 21:17:54.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
++ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2007-2012,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: inchs.c,v 1.19 2022/12/11 00:01:39 tom Exp $
++ * $Id: inchs.c,v 1.20 2024/10/06 21:17:54 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  */
+@@ -71,7 +71,7 @@
+ static int
+ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
+ {
+-    static const char *help[] =
++    static NCURSES_CONST char *help[] =
+     {
+ 	"Test input from screen using inch(), etc., in a moveable viewport.",
+ 	"",
+Index: test/ins_wide.c
+Prereq:  1.30 
+--- ncurses-6.5-20240928+/test/ins_wide.c	2022-12-10 22:28:50.000000000 +0000
++++ ncurses-6.5-20241006/test/ins_wide.c	2024-10-05 19:26:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2022 Thomas E. Dickey                                     *
++ * Copyright 2020-2022,2024 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: ins_wide.c,v 1.30 2022/12/10 22:28:50 tom Exp $
++ * $Id: ins_wide.c,v 1.31 2024/10/05 19:26:24 tom Exp $
+  *
+  * Demonstrate the wins_wstr() and wins_wch functions.
+  * Thomas Dickey - 2002/11/23
+@@ -73,7 +73,7 @@
+ static int n_opt = -1;
+ 
+ static void
+-legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length)
++legend(WINDOW *win, int level, Options state, const wchar_t *buffer, int length)
+ {
+     const char *showstate;
+ 
+Index: test/insdelln.c
+Prereq:  1.15 
+--- ncurses-6.5-20240928+/test/insdelln.c	2022-12-10 23:31:31.000000000 +0000
++++ ncurses-6.5-20241006/test/insdelln.c	2024-10-06 21:08:52.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
++ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2008-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: insdelln.c,v 1.15 2022/12/10 23:31:31 tom Exp $
++ * $Id: insdelln.c,v 1.17 2024/10/06 21:08:52 tom Exp $
+  *
+  * test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln
+  */
+@@ -160,7 +160,7 @@
+ }
+ 
+ static void
+-do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *))
++do_subwindow(WINDOW *win, const STATUS * sp, void func(WINDOW *))
+ {
+     WINDOW *win1 = newwin(sp->y_max - 2, sp->x_max - 2,
+ 			  sp->y_beg + 1, sp->x_beg + 1);
+@@ -204,7 +204,7 @@
+ static void
+ show_help(WINDOW *win)
+ {
+-    static const char *table[] =
++    static NCURSES_CONST char *table[] =
+     {
+ 	"Basic commands:"
+ 	,"Use h/j/k/l or arrow keys to move the cursor."
+Index: test/inserts.c
+Prereq:  1.34 
+--- ncurses-6.5-20240928+/test/inserts.c	2022-12-10 22:28:50.000000000 +0000
++++ ncurses-6.5-20241006/test/inserts.c	2024-10-05 19:26:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2022 Thomas E. Dickey                                     *
++ * Copyright 2020-2022,2024 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: inserts.c,v 1.34 2022/12/10 22:28:50 tom Exp $
++ * $Id: inserts.c,v 1.35 2024/10/05 19:26:24 tom Exp $
+  *
+  * Demonstrate the winsstr() and winsch functions.
+  * Thomas Dickey - 2002/10/19
+@@ -98,7 +98,7 @@
+ }
+ 
+ static int
+-ColOf(char *buffer, int length, int margin)
++ColOf(const char *buffer, int length, int margin)
+ {
+     int n;
+     int result;
+Index: test/knight.c
+Prereq:  1.52 
+--- ncurses-6.5-20240928+/test/knight.c	2022-12-04 00:40:11.000000000 +0000
++++ ncurses-6.5-20241006/test/knight.c	2024-10-05 19:38:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
++ * Copyright 2018-2022,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2013,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -34,7 +34,7 @@
+  * Eric S. Raymond  July 22 1995.  Mouse support
+  * added September 20th 1995.
+  *
+- * $Id: knight.c,v 1.52 2022/12/04 00:40:11 tom Exp $
++ * $Id: knight.c,v 1.53 2024/10/05 19:38:58 tom Exp $
+  */
+ 
+ #include 
+@@ -450,7 +450,8 @@
+ }
+ 
+ static bool
+-evaluate_move(SQUARES squares, HISTORY * doneData, int doneSize, int row, int column)
++evaluate_move(SQUARES squares, const HISTORY * doneData, int doneSize,
++	      int row, int column)
+ {
+     if (doneSize <= 1)
+ 	return (TRUE);
+Index: test/list_keys.c
+Prereq:  1.33 
+--- ncurses-6.5-20240928+/test/list_keys.c	2023-11-11 00:35:05.000000000 +0000
++++ ncurses-6.5-20241006/test/list_keys.c	2024-10-05 19:26:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2016,2017 Free Software Foundation, Inc.                       *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: list_keys.c,v 1.33 2023/11/11 00:35:05 tom Exp $
++ * $Id: list_keys.c,v 1.34 2024/10/05 19:26:24 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -297,7 +297,7 @@
+ #if NCURSES_XNAMES
+     if (x_opt) {
+ 	for (k = 0; k < count; ++k) {
+-	    TERMTYPE *term;
++	    const TERMTYPE *term;
+ 	    set_curterm(terms[k]);
+ 	    term = (TERMTYPE *) cur_term;
+ 	    total += (size_t) (NUM_STRINGS(term) - STRCOUNT);
+@@ -348,7 +348,7 @@
+ 	widths1 = (int) strlen(modifier);
+ 
+     for (k = 0; k < count; ++k) {
+-	char *value;
++	const char *value;
+ 	set_curterm(terms[k]);
+ 	if ((value = termname()) == NULL)
+ 	    failed("termname");
+Index: test/move_field.c
+Prereq:  1.16 
+--- ncurses-6.5-20240928+/test/move_field.c	2024-06-29 17:45:02.000000000 +0000
++++ ncurses-6.5-20241006/test/move_field.c	2024-10-06 21:12:35.000000000 +0000
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: move_field.c,v 1.16 2024/06/29 17:45:02 tom Exp $
++ * $Id: move_field.c,v 1.19 2024/10/06 21:12:35 tom Exp $
+  *
+  * Demonstrate move_field().
+  */
+@@ -146,27 +146,27 @@
+ }
+ 
+ static FieldAttrs *
+-my_field_attrs(FIELD *f)
++my_field_attrs(NCURSES_CONST FIELD *f)
+ {
+     return (FieldAttrs *) field_userptr(f);
+ }
+ 
+ static int
+-buffer_length(FIELD *f)
++buffer_length(NCURSES_CONST FIELD *f)
+ {
+     return my_field_attrs(f)->row_lengths[0];
+ }
+ 
+ static void
+-set_buffer_length(FIELD *f, int length)
++set_buffer_length(NCURSES_CONST FIELD *f, int length)
+ {
+     my_field_attrs(f)->row_lengths[0] = length;
+ }
+ 
+ static int
+-offset_in_field(FORM *form)
++offset_in_field(NCURSES_CONST FORM *form)
+ {
+-    FIELD *field = current_field(form);
++    NCURSES_CONST FIELD *field = current_field(form);
+     int currow, curcol;
+ 
+     form_getyx(form, currow, curcol);
+@@ -245,7 +245,7 @@
+ 
+ 	default:
+ 	    modified = (ch < MIN_FORM_COMMAND
+-			&& isprint(ch));
++			&& isprint(UChar(ch)));
+ 	    break;
+ 	}
+ 
+@@ -275,9 +275,9 @@
+ 
+ /* display a status message to show what's happening */
+ static void
+-show_status(FORM *form, FIELD *field)
++show_status(NCURSES_CONST FORM *form, NCURSES_CONST FIELD *field)
+ {
+-    WINDOW *sub = form_sub(form);
++    NCURSES_CONST WINDOW *sub = form_sub(form);
+     int currow, curcol;
+ 
+     getyx(stdscr, currow, curcol);
+Index: test/movewindow.c
+Prereq:  1.54 
+--- ncurses-6.5-20240928+/test/movewindow.c	2023-05-27 20:13:10.000000000 +0000
++++ ncurses-6.5-20241006/test/movewindow.c	2024-10-06 18:44:26.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 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.54 2023/05/27 20:13:10 tom Exp $
++ * $Id: movewindow.c,v 1.56 2024/10/06 18:44:26 tom Exp $
+  *
+  * Demonstrate move functions for windows and derived windows from the curses
+  * library.
+@@ -135,7 +135,7 @@
+  */
+ static PAIR *
+ selectcell(WINDOW *parent,
+-	   WINDOW *child,
++	   NCURSES_CONST WINDOW *child,
+ 	   int uli, int ulj,
+ 	   int lri, int lrj,
+ 	   bool relative,
+@@ -252,7 +252,7 @@
+     int max_col = (parent == stdscr) ? COL_MAX : getmaxx(parent);
+     int min_line = (parent == stdscr) ? LINE_MIN : 0;
+     int max_line = (parent == stdscr) ? LINE_MAX : getmaxy(parent);
+-    PAIR *tmp;
++    NCURSES_CONST PAIR *tmp;
+     bool result = FALSE;
+ 
+     head_line("Use arrows to move cursor, anything else to mark corner 1");
+@@ -346,7 +346,7 @@
+ }
+ 
+ static WINDOW *
+-parent_of(WINDOW *win)
++parent_of(NCURSES_CONST WINDOW *win)
+ {
+     WINDOW *result = 0;
+     int n = window2num(win);
+@@ -435,7 +435,7 @@
+ 	int max_col = top ? COL_MAX : getmaxx(parent);
+ 	int min_line = top ? LINE_MIN : 0;
+ 	int max_line = top ? LINE_MAX : getmaxy(parent);
+-	PAIR *tmp;
++	NCURSES_CONST PAIR *tmp;
+ 	bool more;
+ 
+ 	head_line("Select new position for %swindow", top ? "" : "sub");
+@@ -474,7 +474,7 @@
+ }
+ 
+ static void
+-show_derwin(WINDOW *win)
++show_derwin(NCURSES_CONST WINDOW *win)
+ {
+     int pary, parx, maxy, maxx;
+ 
+@@ -500,7 +500,7 @@
+ 	int max_col = top ? COL_MAX : getmaxx(parent);
+ 	int min_line = top ? LINE_MIN : 0;
+ 	int max_line = top ? LINE_MAX : getmaxy(parent);
+-	PAIR *tmp;
++	NCURSES_CONST PAIR *tmp;
+ 	bool more;
+ 
+ 	show_derwin(win);
+Index: test/ncurses.c
+Prereq:  1.538 
+--- ncurses-6.5-20240928+/test/ncurses.c	2023-11-11 01:23:59.000000000 +0000
++++ ncurses-6.5-20241006/test/ncurses.c	2024-10-06 20:18:59.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 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.538 2023/11/11 01:23:59 tom Exp $
++$Id: ncurses.c,v 1.541 2024/10/06 20:18:59 tom Exp $
+ 
+ ***************************************************************************/
+ 
+@@ -273,7 +273,7 @@
+ 	    ++x;
+ 	    break;
+ 	default:
+-	    if (!isprint(ch) || ch >= KEY_MIN) {
++	    if (!isprint(UChar(ch)) || ch >= KEY_MIN) {
+ 		beep();
+ 	    } else if ((int) strlen(buffer) < limit) {
+ 		int j;
+@@ -928,7 +928,7 @@
+ 		/* at least Solaris SVR4 curses breaks unctrl(128), etc. */
+ 		c2 &= 0x7f;
+ #endif
+-		if (isprint(c))
++		if (isprint(UChar(c)))
+ 		    (void) wprintw(win, "%c", UChar(c));
+ 		else if (c2 != UChar(c))
+ 		    (void) wprintw(win, "M-%s", unctrl(c2));
+@@ -1693,7 +1693,7 @@
+ 	    chtype extras = (chtype) ac;
+ 
+ 	    if (UseColors) {
+-		NCURSES_PAIRS_T pair = 0;
++		NCURSES_PAIRS_T pair;
+ 		if ((fg != COLOR_BLACK) || (bg != COLOR_BLACK)) {
+ 		    pair = 1;
+ 		    if (init_pair(pair, fg, bg) == ERR) {
+@@ -2345,7 +2345,6 @@
+ 	for (i = (NCURSES_PAIRS_T) (base_row * per_row); i < pairs_max; i++) {
+ 	    int row = grid_top + (i / per_row) - base_row;
+ 	    int col = (i % per_row + 1) * width;
+-	    NCURSES_PAIRS_T pair = i;
+ 
+ 	    if ((i / per_row) > row_limit)
+ 		break;
+@@ -2355,6 +2354,7 @@
+ 	    if (row >= 0 && move(row, col) != ERR) {
+ 		NCURSES_COLOR_T fg = (NCURSES_COLOR_T) InxToFG(i);
+ 		NCURSES_COLOR_T bg = (NCURSES_COLOR_T) InxToBG(i);
++		NCURSES_PAIRS_T pair = i;
+ 
+ 		init_pair(pair, fg, bg);
+ 		attron(COLOR_PAIR(pair));
+@@ -2517,7 +2517,7 @@
+ static int
+ x_color_test(bool recur GCC_UNUSED)
+ {
+-    long i;
++    int i;
+     int top = 0, width;
+     int base_row = 0;
+     int grid_top = top + 3;
+@@ -2613,17 +2613,17 @@
+ 	/* show color names/numbers across the top */
+ 	for (i = 0; i < per_row; i++) {
+ 	    show_color_name(top + 2,
+-			    ((int) i + 1) * width,
+-			    (int) i * zoom_size + MinColors,
++			    (i + 1) * width,
++			    i * zoom_size + MinColors,
+ 			    opt_wide,
+ 			    opt_zoom);
+ 	}
+ 
+ 	/* show a grid of colors, with color names/ numbers on the left */
+ 	for (i = (base_row * per_row); i < pairs_max; i++) {
+-	    int row = grid_top + ((int) i / per_row) - base_row;
+-	    int col = ((int) i % per_row + 1) * width;
+-	    int pair = (int) i;
++	    int row = grid_top + (i / per_row) - base_row;
++	    int col = (i % per_row + 1) * width;
++	    int pair = i;
+ 
+ 	    if ((i / per_row) > row_limit)
+ 		break;
+@@ -2828,7 +2828,7 @@
+ #define DecodeRGB(n) (NCURSES_COLOR_T) ((n * 1000) / 0xffff)
+ 
+ static void
+-init_all_colors(bool xterm_colors, char *palette_file)
++init_all_colors(bool xterm_colors, NCURSES_CONST char *palette_file)
+ {
+     NCURSES_PAIRS_T cp;
+     all_colors = typeMalloc(RGB_DATA, (unsigned) MaxColors);
+@@ -3317,7 +3317,7 @@
+ {
+     int c, fmt = 1;
+     char buf[9];
+-    char *s;
++    NCURSES_CONST char *s;
+     attr_t attr = A_NORMAL;
+     unsigned at_code = 0;
+ #if HAVE_SLK_COLOR
+@@ -3938,8 +3938,7 @@
+ 
+     *dst = *src;
+     do {
+-	int count;
+-	TEST_CCHAR(src, count, {
++	TEST_CCHAR(src, {
+ 	    attr |= (test_attrs & A_ALTCHARSET);
+ 	    setcchar(dst, test_wch, attr, pair, NULL);
+ 	}, {
+@@ -4810,7 +4809,8 @@
+ /* Ask user for a window definition */
+ {
+     WINDOW *rwindow;
+-    pair ul, lr, *tmp;
++    pair ul, lr;
++    NCURSES_CONST pair *tmp;
+ 
+     move(0, 0);
+     clrtoeol();
+@@ -5014,7 +5014,8 @@
+ #if HAVE_WRESIZE
+ 	case CTRL('X'):	/* resize window */
+ 	    if (current) {
+-		pair *tmp, ul, lr;
++		NCURSES_CONST pair *tmp;
++		pair ul, lr;
+ 		int mx, my;
+ 
+ 		move(0, 0);
+@@ -5249,7 +5250,7 @@
+ }
+ 
+ static void
+-fill_panel(PANEL *pan)
++fill_panel(NCURSES_CONST PANEL *pan)
+ {
+     WINDOW *win = panel_window(pan);
+     const char *userptr = (const char *) panel_userptr(pan);
+@@ -5286,7 +5287,7 @@
+ }
+ 
+ static void
+-fill_wide_panel(PANEL *pan)
++fill_wide_panel(NCURSES_CONST PANEL *pan)
+ {
+     WINDOW *win = panel_window(pan);
+     const char *userptr = (const char *) panel_userptr(pan);
+@@ -5336,7 +5337,7 @@
+ }
+ 
+ static int
+-demo_panels(void (*InitPanel) (WINDOW *), void (*FillPanel) (PANEL *))
++demo_panels(void (*InitPanel) (WINDOW *), void (*FillPanel) (NCURSES_CONST PANEL *))
+ {
+     int count;
+     int itmp;
+@@ -6246,7 +6247,8 @@
+ run_trace_menu(MENU * m)
+ {
+     ITEM **items;
+-    ITEM *i, **p;
++    NCURSES_CONST ITEM *i;
++    ITEM **p;
+ 
+     for (;;) {
+ 	bool changed = FALSE;
+@@ -6424,7 +6426,7 @@
+ 
+     if (field_info(me, &rows, &cols, &frow, &fcol, &nrow, &nbuf) == E_OK
+ 	&& nbuf > 0) {
+-	char *source = field_buffer(me, 1);
++	NCURSES_CONST char *source = field_buffer(me, 1);
+ 	size_t have = (source ? strlen(source) : 0) + 1;
+ 	size_t need = 80 + have;
+ 	char *temp = malloc(need);
+@@ -6434,7 +6436,7 @@
+ 	    _nc_STRNCPY(temp, source ? source : "", have + 1);
+ 	    len = (size_t) (char *) field_userptr(me);
+ 	    if (c <= KEY_MAX) {
+-		if (isgraph(c) && (len + 1) < sizeof(temp)) {
++		if (isgraph(UChar(c)) && (len + 1) < sizeof(temp)) {
+ 		    temp[len++] = (char) c;
+ 		    temp[len] = 0;
+ 		    set_field_buffer(me, 1, temp);
+@@ -6484,7 +6486,7 @@
+ }
+ 
+ static int
+-form_virtualize(FORM *f, WINDOW *w)
++form_virtualize(NCURSES_CONST FORM *f, WINDOW *w)
+ {
+     /* *INDENT-OFF* */
+     static const struct {
+@@ -6658,7 +6660,7 @@
+ static
+ FIELDCHECK_CB(pw_field_check)
+ {
+-    char *s = field_buffer(fld, 0);
++    NCURSES_CONST char *s = field_buffer(fld, 0);
+     int n;
+ 
+     for (n = 0; s[n] != '\0'; ++n) {
+@@ -6680,7 +6682,8 @@
+ form_test(bool recur GCC_UNUSED)
+ {
+     FORM *form;
+-    FIELD *f[12], *secure;
++    FIELD *f[12];
++    NCURSES_CONST FIELD *secure;
+     FIELDTYPE *fty_middle = new_fieldtype(mi_field_check, mi_char_check);
+     FIELDTYPE *fty_passwd = new_fieldtype(pw_field_check, pw_char_check);
+     int c;
+@@ -7176,7 +7179,7 @@
+ }
+ 
+ static void
+-overlap_test_4(int flavor, WINDOW *a, WINDOW *b)
++overlap_test_4(int flavor, NCURSES_CONST WINDOW *a, WINDOW *b)
+ {
+     switch ((otCOPY) flavor) {
+     case otCOPY_overwrite:
+@@ -7899,7 +7902,7 @@
+     bool monochrome = FALSE;
+ #if HAVE_COLOR_CONTENT
+     bool xterm_colors = FALSE;
+-    char *palette_file = 0;
++    NCURSES_CONST char *palette_file = 0;
+ #endif
+ 
+     setlocale(LC_ALL, "");
+Index: test/padview.c
+Prereq:  1.22 
+--- ncurses-6.5-20240928+/test/padview.c	2022-12-04 00:40:11.000000000 +0000
++++ ncurses-6.5-20241006/test/padview.c	2024-10-06 21:08:25.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
++ * Copyright 2019-2022,2024 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 @@
+ /*
+  * clone of view.c, using pads
+  *
+- * $Id: padview.c,v 1.22 2022/12/04 00:40:11 tom Exp $
++ * $Id: padview.c,v 1.24 2024/10/06 21:08:25 tom Exp $
+  */
+ 
+ #include 
+@@ -182,7 +182,7 @@
+ 
+ #if USE_WIDEC_SUPPORT
+     if (!memcmp("\357\273\277", my_blob, 3)) {
+-	char *s = my_blob + 3;
++	const char *s = my_blob + 3;
+ 	char *d = my_blob;
+ 	Trace(("trim BOM"));
+ 	do {
+@@ -213,7 +213,7 @@
+     for (k = 0; my_vec[k]; ++k) {
+ 	char *s;
+ #if USE_WIDEC_SUPPORT
+-	char *last = my_vec[k] + (int) strlen(my_vec[k]);
++	const char *last = my_vec[k] + (int) strlen(my_vec[k]);
+ 	wchar_t wch[2];
+ 	size_t rc;
+ #ifndef state_unused
+@@ -279,7 +279,7 @@
+ int
+ main(int argc, char *argv[])
+ {
+-    static const char *help[] =
++    static NCURSES_CONST char *help[] =
+     {
+ 	"Commands:",
+ 	"  q,^Q,ESC       - quit this program",
+@@ -532,7 +532,7 @@
+ 	    beep();
+ 	    break;
+ 	}
+-	if (c >= KEY_MIN || (c > 0 && !isdigit(c))) {
++	if (c >= KEY_MIN || (c > 0 && !isdigit(UChar(c)))) {
+ 	    got_number = FALSE;
+ 	    value = 0;
+ 	}
+Index: test/parse_rgb.h
+Prereq:  1.5 
+--- ncurses-6.5-20240928+/test/parse_rgb.h	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241006/test/parse_rgb.h	2024-10-05 19:26:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018,2020 Thomas E. Dickey                                     *
++ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: parse_rgb.h,v 1.5 2020/02/02 23:34:34 tom Exp $
++ * $Id: parse_rgb.h,v 1.6 2024/10/05 19:26:24 tom Exp $
+  *
+  * Sample implementation of ncurses RGB extension from user_caps(5).
+  */
+@@ -49,7 +49,7 @@
+ 	int bits;
+ 	int pwr2;
+ 	int r = 0, g = 0, b = 0;
+-	char *data;
++	const char *data;
+ 	char ch;
+ 
+ 	for (max_bits = 0, pwr2 = 1;
+Index: test/picsmap.c
+Prereq:  1.149 
+--- ncurses-6.5-20240928+/test/picsmap.c	2023-04-23 23:20:37.000000000 +0000
++++ ncurses-6.5-20241006/test/picsmap.c	2024-10-05 19:26:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 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.149 2023/04/23 23:20:37 tom Exp $
++ * $Id: picsmap.c,v 1.150 2024/10/05 19:26:24 tom Exp $
+  *
+  * Author: Thomas E. Dickey
+  *
+@@ -574,7 +574,7 @@
+ 	    _nc_STRCAT(full_name, filename, need);
+ 	    if (tries & 4) {
+ 		char *t = s;
+-		char *tc;
++		const char *tc;
+ 		int num;
+ 		char chr;
+ 		int found = 0;
+@@ -1374,8 +1374,8 @@
+ 		int r, g, b, nocolor;
+ 		float rf, gf, bf;
+ 		unsigned check;
+-		char *t;
+-		char *s = t = strchr(buffer, '#');
++		char *s = strchr(buffer, '#');
++		const char *t = s;
+ 		bool matched = FALSE;
+ 
+ 		if (s != 0) {
+@@ -1492,7 +1492,7 @@
+ #define fg_color(pics,n) (pics->fgcol[n].fgcol)
+ 
+ static void
+-dump_picture(PICS_HEAD * pics)
++dump_picture(const PICS_HEAD * pics)
+ {
+     int y, x;
+ 
+@@ -1767,7 +1767,7 @@
+ #if USE_EXTENDED_COLORS
+ 	case 'x':
+ 	    {
+-		char *s = optarg;
++		const char *s = optarg;
+ 		while (*s) {
+ 		    switch (*s++) {
+ 		    case 'p':
+Index: test/popup_msg.c
+Prereq:  1.12 
+--- ncurses-6.5-20240928+/test/popup_msg.c	2024-06-29 18:34:58.000000000 +0000
++++ ncurses-6.5-20241006/test/popup_msg.c	2024-10-06 21:07:01.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: popup_msg.c,v 1.12 2024/06/29 18:34:58 tom Exp $
++ * $Id: popup_msg.c,v 1.13 2024/10/06 21:07:01 tom Exp $
+  *
+  * Show a multi-line message in a window which may extend beyond the screen.
+  *
+@@ -62,7 +62,7 @@
+  * Display a temporary window, e.g., to display a help-message.
+  */
+ void
+-popup_msg(WINDOW *parent, const char *const *msg)
++popup_msg(WINDOW *parent, NCURSES_CONST char *const *msg)
+ {
+     int x0 = 4;
+     int y0 = 2;
+@@ -171,12 +171,12 @@
+ void
+ popup_msg2(WINDOW *parent, char **msg)
+ {
+-    popup_msg(parent, (const char *const *) msg);
++    popup_msg(parent, (NCURSES_CONST char *const *) msg);
+ }
+ 
+ #else
+ void
+-popup_msg(WINDOW *parent, const char *const *msg)
++popup_msg(WINDOW *parent, NCURSES_CONST char *const *msg)
+ {
+     (void) parent;
+     (void) msg;
+Index: test/popup_msg.h
+Prereq:  1.5 
+--- ncurses-6.5-20240928+/test/popup_msg.h	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241006/test/popup_msg.h	2024-10-06 21:17:54.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018,2020 Thomas E. Dickey                                     *
++ * Copyright 2018-2020,2024 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.h,v 1.5 2020/02/02 23:34:34 tom Exp $
++ * $Id: popup_msg.h,v 1.6 2024/10/06 21:17:54 tom Exp $
+  *
+  * Utility functions for a popup-message or help-screen.
+  */
+@@ -37,7 +37,7 @@
+ 
+ #include 
+ 
+-extern void popup_msg(WINDOW *parent, const char *const *msg);
++extern void popup_msg(WINDOW *parent, NCURSES_CONST char *const *msg);
+ extern void popup_msg2(WINDOW *parent, char **msg);
+ 
+ #endif /* POPUP_MSG_H_incl */
+Index: test/railroad.c
+Prereq:  1.26 
+--- ncurses-6.5-20240928+/test/railroad.c	2022-12-11 00:12:13.000000000 +0000
++++ ncurses-6.5-20241006/test/railroad.c	2024-10-05 19:26:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
++ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2000-2013,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey - 2000
+  *
+- * $Id: railroad.c,v 1.26 2022/12/11 00:12:13 tom Exp $
++ * $Id: railroad.c,v 1.27 2024/10/05 19:26:24 tom Exp $
+  *
+  * A simple demo of the termcap interface.
+  */
+@@ -113,7 +113,7 @@
+ static void
+ ShowSign(char *string)
+ {
+-    char *base = string;
++    const char *base = string;
+     int first, last;
+ 
+     if (moveit != 0) {
+Index: test/rain.c
+Prereq:  1.58 
+--- ncurses-6.5-20240928+/test/rain.c	2024-08-31 15:56:10.000000000 +0000
++++ ncurses-6.5-20241006/test/rain.c	2024-10-06 21:09:00.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: rain.c,v 1.58 2024/08/31 15:56:10 tom Exp $
++ * $Id: rain.c,v 1.62 2024/10/06 21:09:00 tom Exp $
+  */
+ #include 
+ #include 
+@@ -45,7 +45,7 @@
+ 
+ struct DATA;
+ 
+-typedef void (*DrawPart) (struct DATA *);
++typedef void (*DrawPart) (const struct DATA *);
+ 
+ typedef struct DATA {
+     int y, x;
+@@ -118,25 +118,25 @@
+ }
+ 
+ static void
+-part1(DATA * drop)
++part1(const DATA * drop)
+ {
+     MvAddCh(drop->y, drop->x, '.');
+ }
+ 
+ static void
+-part2(DATA * drop)
++part2(const DATA * drop)
+ {
+     MvAddCh(drop->y, drop->x, 'o');
+ }
+ 
+ static void
+-part3(DATA * drop)
++part3(const DATA * drop)
+ {
+     MvAddCh(drop->y, drop->x, 'O');
+ }
+ 
+ static void
+-part4(DATA * drop)
++part4(const DATA * drop)
+ {
+     MvAddCh(drop->y - 1, drop->x, '-');
+     MvAddStr(drop->y, drop->x - 1, "|.|");
+@@ -144,7 +144,7 @@
+ }
+ 
+ static void
+-part5(DATA * drop)
++part5(const DATA * drop)
+ {
+     MvAddCh(drop->y - 2, drop->x, '-');
+     MvAddStr(drop->y - 1, drop->x - 1, "/ \\");
+@@ -154,7 +154,7 @@
+ }
+ 
+ static void
+-part6(DATA * drop)
++part6(const DATA * drop)
+ {
+     MvAddCh(drop->y - 2, drop->x, ' ');
+     MvAddStr(drop->y - 1, drop->x - 1, "   ");
+@@ -186,7 +186,7 @@
+ }
+ 
+ static void
+-draw_part(void (*func) (DATA *), int state, DATA * data)
++draw_part(void (*func) (const DATA *), int state, DATA * data)
+ {
+     data->func = func;
+     data->state = state;
+@@ -328,7 +328,7 @@
+ int
+ main(int argc, char *argv[])
+ {
+-    static const char *help[] =
++    static NCURSES_CONST char *help[] =
+     {
+ 	"Commands:",
+ 	" q/Q        exit the program",
+Index: test/redraw.c
+Prereq:  1.17 
+--- ncurses-6.5-20240928+/test/redraw.c	2022-12-10 22:28:50.000000000 +0000
++++ ncurses-6.5-20241006/test/redraw.c	2024-10-06 21:17:54.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2021,2022 Thomas E. Dickey                                *
++ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2006-2012,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: redraw.c,v 1.17 2022/12/10 22:28:50 tom Exp $
++ * $Id: redraw.c,v 1.18 2024/10/06 21:17:54 tom Exp $
+  *
+  * Demonstrate the redrawwin() and wredrawln() functions.
+  * Thomas Dickey - 2006/11/4
+@@ -61,7 +61,7 @@
+ static void
+ test_redraw(WINDOW *win)
+ {
+-    static const char *help[] =
++    static NCURSES_CONST char *help[] =
+     {
+ 	"Commands:",
+ 	"  ^Q/ESC/q   - quit",
+Index: test/savescreen.c
+Prereq:  1.62 
+--- ncurses-6.5-20240928+/test/savescreen.c	2022-12-10 23:23:27.000000000 +0000
++++ ncurses-6.5-20241006/test/savescreen.c	2024-10-06 21:10:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
++ * Copyright 2018-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2006-2017,2018 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: savescreen.c,v 1.62 2022/12/10 23:23:27 tom Exp $
++ * $Id: savescreen.c,v 1.65 2024/10/06 21:10:09 tom Exp $
+  *
+  * Demonstrate save/restore functions from the curses library.
+  * Thomas Dickey - 2007/7/14
+@@ -96,7 +96,7 @@
+ }
+ 
+ static int
+-load_screen(char *filename)
++load_screen(NCURSES_CONST char *filename)
+ {
+     int result;
+ 
+@@ -170,7 +170,7 @@
+ #if USE_WIDEC_SUPPORT
+     cchar_t mycc;
+ #endif
+-    char *filename = files[which];
++    NCURSES_CONST char *filename = files[which];
+     bool dumped = FALSE;
+ 
+     if (filename != 0) {
+@@ -216,7 +216,7 @@
+ static void
+ editor_help(void)
+ {
+-    static const char *msgs[] =
++    static NCURSES_CONST char *msgs[] =
+     {
+ 	"You are now in the screen-editor, which allows you to make some",
+ 	"lines on the screen, as well as save copies of the screen to a",
+@@ -238,7 +238,7 @@
+ static void
+ replay_help(void)
+ {
+-    static const char *msgs[] =
++    static NCURSES_CONST char *msgs[] =
+     {
+ 	"You are now in the screen-loader, which allows you to view",
+ 	"the dumped/restored screens.",
+@@ -286,7 +286,7 @@
+     bool replaying = FALSE;
+     bool done = FALSE;
+     char **files;
+-    char *fill_by = 0;
++    NCURSES_CONST char *fill_by = 0;
+ #if USE_WIDEC_SUPPORT
+     cchar_t mycc;
+     static const wchar_t mywc[2] =
+Index: test/tclock.c
+Prereq:  1.48 
+--- ncurses-6.5-20240928+/test/tclock.c	2023-02-25 16:42:22.000000000 +0000
++++ ncurses-6.5-20241006/test/tclock.c	2024-10-05 18:47:56.000000000 +0000
+@@ -1,4 +1,4 @@
+-/* $Id: tclock.c,v 1.48 2023/02/25 16:42:22 tom Exp $ */
++/* $Id: tclock.c,v 1.49 2024/10/05 18:47:56 tom Exp $ */
+ 
+ #define NEED_TIME_H
+ #include 
+@@ -145,7 +145,7 @@
+     int lastbeep = -1;
+     bool odd = FALSE;
+     time_t tim;
+-    struct tm *t;
++    const struct tm *t;
+     char szChar[20];
+     char *text;
+     short my_bg = COLOR_BLACK;
+Index: test/test.priv.h
+Prereq:  1.219 
+--- ncurses-6.5-20240928+/test/test.priv.h	2024-08-31 10:46:01.000000000 +0000
++++ ncurses-6.5-20241006/test/test.priv.h	2024-10-05 19:01:00.000000000 +0000
+@@ -30,7 +30,7 @@
+ /****************************************************************************
+  *  Author: Thomas E. Dickey                    1996-on                     *
+  ****************************************************************************/
+-/* $Id: test.priv.h,v 1.219 2024/08/31 10:46:01 Rafael.Kitover Exp $ */
++/* $Id: test.priv.h,v 1.220 2024/10/05 19:01:00 tom Exp $ */
+ 
+ #ifndef __TEST_PRIV_H
+ #define __TEST_PRIV_H 1
+@@ -765,8 +765,8 @@
+ 
+ #define VERSION_COMMON() \
+ static char *version_common(char **argv) { \
+-	char *base = argv[0]; \
+-	char *part = strrchr(base, '/'); \
++	const char *base = argv[0]; \
++	const char *part = strrchr(base, '/'); \
+ 	size_t need = strlen(base) + 80; \
+ 	char *result = malloc(need); \
+ 	if (result != NULL) { \
+@@ -916,8 +916,8 @@
+  * Workaround in case getcchar() returns a positive value when the source
+  * string produces only a L'\0'.
+  */
+-#define TEST_CCHAR(s, count, then_stmt, else_stmt) \
+-	if ((count = getcchar(s, NULL, NULL, NULL, NULL)) > 0) { \
++#define TEST_CCHAR(s, then_stmt, else_stmt) \
++	if (getcchar(s, NULL, NULL, NULL, NULL) > 0) { \
+ 	    wchar_t test_wch[CCHARW_MAX + 2]; \
+ 	    attr_t test_attrs; \
+ 	    NCURSES_PAIRS_T test_pair; \
+Index: test/test_add_wchstr.c
+Prereq:  1.34 
+--- ncurses-6.5-20240928+/test/test_add_wchstr.c	2022-12-10 22:28:50.000000000 +0000
++++ ncurses-6.5-20241006/test/test_add_wchstr.c	2024-10-05 19:26:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2021,2022 Thomas E. Dickey                                *
++ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2009-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_add_wchstr.c,v 1.34 2022/12/10 22:28:50 tom Exp $
++ * $Id: test_add_wchstr.c,v 1.35 2024/10/05 19:26:24 tom Exp $
+  *
+  * Demonstrate the waddwchstr() and wadd_wch functions.
+  * Thomas Dickey - 2009/9/12
+@@ -158,7 +158,7 @@
+ }
+ 
+ static void
+-legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length)
++legend(WINDOW *win, int level, Options state, const wchar_t *buffer, int length)
+ {
+     const char *showstate;
+ 
+Index: test/test_addchstr.c
+Prereq:  1.29 
+--- ncurses-6.5-20240928+/test/test_addchstr.c	2022-12-10 22:28:50.000000000 +0000
++++ ncurses-6.5-20241006/test/test_addchstr.c	2024-10-05 19:26:24.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2022 Thomas E. Dickey                                     *
++ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2009-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_addchstr.c,v 1.29 2022/12/10 22:28:50 tom Exp $
++ * $Id: test_addchstr.c,v 1.30 2024/10/05 19:26:24 tom Exp $
+  *
+  * Demonstrate the waddchstr() and waddch functions.
+  * Thomas Dickey - 2009/9/12
+@@ -169,7 +169,7 @@
+ }
+ 
+ static int
+-ColOf(char *buffer, int length, int margin)
++ColOf(const char *buffer, int length, int margin)
+ {
+     int n;
+     int result;
+Index: test/test_addstr.c
+Prereq:  1.20 
+--- ncurses-6.5-20240928+/test/test_addstr.c	2022-12-10 22:28:50.000000000 +0000
++++ ncurses-6.5-20241006/test/test_addstr.c	2024-10-05 19:27:33.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2022 Thomas E. Dickey                                     *
++ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2009-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_addstr.c,v 1.20 2022/12/10 22:28:50 tom Exp $
++ * $Id: test_addstr.c,v 1.21 2024/10/05 19:27:33 tom Exp $
+  *
+  * Demonstrate the waddstr() and waddch functions.
+  * Thomas Dickey - 2009/9/12
+@@ -91,7 +91,7 @@
+ }
+ 
+ static int
+-ColOf(char *buffer, int length, int margin)
++ColOf(const char *buffer, int length, int margin)
+ {
+     int n;
+     int result;
+Index: test/test_addwstr.c
+Prereq:  1.22 
+--- ncurses-6.5-20240928+/test/test_addwstr.c	2023-05-27 20:13:10.000000000 +0000
++++ ncurses-6.5-20241006/test/test_addwstr.c	2024-10-05 19:27:33.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2009-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_addwstr.c,v 1.22 2023/05/27 20:13:10 tom Exp $
++ * $Id: test_addwstr.c,v 1.23 2024/10/05 19:27:33 tom Exp $
+  *
+  * Demonstrate the waddwstr() and wadd_wch functions.
+  * Thomas Dickey - 2009/9/12
+@@ -82,7 +82,7 @@
+ static int n_opt = -1;
+ 
+ static void
+-legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length)
++legend(WINDOW *win, int level, Options state, const wchar_t *buffer, int length)
+ {
+     const char *showstate;
+ 
+Index: test/test_endwin.c
+Prereq:  1.2 
+--- ncurses-6.5-20240928+/test/test_endwin.c	2023-11-10 15:17:19.000000000 +0000
++++ ncurses-6.5-20241006/test/test_endwin.c	2024-10-05 19:27:33.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2023 Thomas E. Dickey                                          *
++ * Copyright 2023,2024 Thomas E. Dickey                                     *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_endwin.c,v 1.2 2023/11/10 15:17:19 tom Exp $
++ * $Id: test_endwin.c,v 1.3 2024/10/05 19:27:33 tom Exp $
+  */
+ #include 
+ 
+@@ -67,7 +67,7 @@
+     int rc_e1 = OK;
+     int rc_e2 = OK;
+     int rc_e3 = OK;
+-    SCREEN *sp = NULL;
++    const SCREEN *sp = NULL;
+     bool opt_e = FALSE;
+     bool opt_i = FALSE;
+     bool opt_n = FALSE;
+Index: test/test_get_wstr.c
+Prereq:  1.14 
+--- ncurses-6.5-20240928+/test/test_get_wstr.c	2022-12-10 23:59:13.000000000 +0000
++++ ncurses-6.5-20241006/test/test_get_wstr.c	2024-10-06 23:15:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2022 Thomas E. Dickey                                     *
++ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2007-2011,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_get_wstr.c,v 1.14 2022/12/10 23:59:13 tom Exp $
++ * $Id: test_get_wstr.c,v 1.16 2024/10/06 23:15:10 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -69,7 +69,7 @@
+ }
+ 
+ static int
+-Remainder(WINDOW *txtwin)
++Remainder(const WINDOW *txtwin)
+ {
+     int result = getmaxx(txtwin) - getcurx(txtwin);
+     return (result > 0) ? result : 0;
+@@ -138,7 +138,7 @@
+ static int
+ recursive_test(int level, char **argv, WINDOW *strwin)
+ {
+-    static const char *help[] =
++    static NCURSES_CONST char *help[] =
+     {
+ 	"Commands:",
+ 	"  q,^Q,ESC       - quit this program",
+Index: test/test_getstr.c
+Prereq:  1.16 
+--- ncurses-6.5-20240928+/test/test_getstr.c	2022-12-10 23:58:37.000000000 +0000
++++ ncurses-6.5-20241006/test/test_getstr.c	2024-10-06 22:36:46.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2022 Thomas E. Dickey                                     *
++ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2007-2012,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_getstr.c,v 1.16 2022/12/10 23:58:37 tom Exp $
++ * $Id: test_getstr.c,v 1.19 2024/10/06 22:36:46 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -76,7 +76,7 @@
+ }
+ 
+ static int
+-Remainder(WINDOW *txtwin)
++Remainder(NCURSES_CONST WINDOW *txtwin)
+ {
+     int result = getmaxx(txtwin) - getcurx(txtwin);
+     return (result > 0) ? result : 0;
+@@ -145,7 +145,7 @@
+ static int
+ recursive_test(int level, char **argv, WINDOW *strwin)
+ {
+-    static const char *help[] =
++    static NCURSES_CONST char *help[] =
+     {
+ 	"Commands:",
+ 	"  q,^Q,ESC       - quit this program",
+Index: test/test_instr.c
+Prereq:  1.13 
+--- ncurses-6.5-20240928+/test/test_instr.c	2024-06-29 18:42:53.000000000 +0000
++++ ncurses-6.5-20241006/test/test_instr.c	2024-10-06 21:11:54.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_instr.c,v 1.13 2024/06/29 18:42:53 tom Exp $
++ * $Id: test_instr.c,v 1.15 2024/10/06 21:11:54 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -56,13 +56,13 @@
+ }
+ 
+ static void
+-show_1st(WINDOW *win, int line, char *buffer)
++show_1st(WINDOW *win, int line, NCURSES_CONST char *buffer)
+ {
+     MvWAddStr(win, line, 5, buffer);
+ }
+ 
+ static void
+-showmore(WINDOW *win, int line, char *buffer)
++showmore(WINDOW *win, int line, NCURSES_CONST char *buffer)
+ {
+     wmove(win, line, 0);
+     wclrtoeol(win);
+@@ -72,7 +72,7 @@
+ static void
+ show_help(WINDOW *win)
+ {
+-    static const char *msgs[] =
++    static NCURSES_CONST char *msgs[] =
+     {
+ 	"Show file contents and a viewport from the variants of winstr."
+ 	,"Use h/j/k/l or arrow keys to move the viewport."
+Index: test/test_inwstr.c
+Prereq:  1.9 
+--- ncurses-6.5-20240928+/test/test_inwstr.c	2024-06-29 18:40:02.000000000 +0000
++++ ncurses-6.5-20241006/test/test_inwstr.c	2024-10-06 23:15:38.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_inwstr.c,v 1.9 2024/06/29 18:40:02 tom Exp $
++ * $Id: test_inwstr.c,v 1.11 2024/10/06 23:15:38 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -59,13 +59,13 @@
+ }
+ 
+ static void
+-show_1st(WINDOW *win, int line, wchar_t *buffer)
++show_1st(WINDOW *win, int line, const wchar_t *buffer)
+ {
+     (void) mvwaddwstr(win, line, 5, buffer);
+ }
+ 
+ static void
+-showmore(WINDOW *win, int line, wchar_t *buffer)
++showmore(WINDOW *win, int line, const wchar_t *buffer)
+ {
+     wmove(win, line, 0);
+     wclrtoeol(win);
+@@ -75,7 +75,7 @@
+ static void
+ show_help(WINDOW *win)
+ {
+-    static const char *msgs[] =
++    static NCURSES_CONST char *msgs[] =
+     {
+ 	"Show file contents and a viewport from the variants of winwstr."
+ 	,"Use h/j/k/l or arrow keys to move the viewport."
+Index: test/test_mouse.c
+Prereq:  1.32 
+--- ncurses-6.5-20240928+/test/test_mouse.c	2024-08-31 10:46:01.000000000 +0000
++++ ncurses-6.5-20241006/test/test_mouse.c	2024-10-05 18:47:56.000000000 +0000
+@@ -22,7 +22,7 @@
+  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+  ****************************************************************************/
+ /*
+- * $Id: test_mouse.c,v 1.32 2024/08/31 10:46:01 Rafael.Kitover Exp $
++ * $Id: test_mouse.c,v 1.33 2024/10/05 18:47:56 tom Exp $
+  *
+  * Author: Leonid S Usov
+  *
+@@ -38,7 +38,7 @@
+ static void
+ raw_loop(void)
+ {
+-    char *xtermcap;
++    const char *xtermcap;
+ 
+     printf("Entering raw mode. Ctrl-c to quit.\n");
+ 
+Index: test/test_opaque.c
+Prereq:  1.15 
+--- ncurses-6.5-20240928+/test/test_opaque.c	2022-12-11 00:03:10.000000000 +0000
++++ ncurses-6.5-20241006/test/test_opaque.c	2024-10-05 19:27:33.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2021,2022 Thomas E. Dickey                                *
++ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2007-2008,2009 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_opaque.c,v 1.15 2022/12/11 00:03:10 tom Exp $
++ * $Id: test_opaque.c,v 1.16 2024/10/05 19:27:33 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -157,13 +157,13 @@
+ }
+ 
+ static int
+-status_y(WINDOW *stswin, int cell)
++status_y(const WINDOW *stswin, int cell)
+ {
+     return (cell % getmaxy(stswin));
+ }
+ 
+ static int
+-status_x(WINDOW *stswin, int cell)
++status_x(const WINDOW *stswin, int cell)
+ {
+     return (15 * (cell / getmaxy(stswin)));
+ }
+Index: test/test_sgr.c
+Prereq:  1.22 
+--- ncurses-6.5-20240928+/test/test_sgr.c	2023-05-27 20:13:10.000000000 +0000
++++ ncurses-6.5-20241006/test/test_sgr.c	2024-10-06 21:05:50.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2015-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: test_sgr.c,v 1.22 2023/05/27 20:13:10 tom Exp $
++ * $Id: test_sgr.c,v 1.25 2024/10/06 21:05:50 tom Exp $
+  *
+  * A simple demo of the sgr/sgr0 terminal capabilities.
+  */
+@@ -142,10 +142,10 @@
+ #define MASK_REV  (1 << 2)
+ 
+ static void
+-dumpit(unsigned bits, unsigned ignore, const char *sgr, const char *sgr0)
++dumpit(unsigned bits, unsigned ignore, NCURSES_CONST char *sgr, NCURSES_CONST char *sgr0)
+ {
+-    static const char sample[] = "abcdefghijklm";
+-    static char params[] = "SURBDBIPA";
++    static NCURSES_CONST char sample[] = "abcdefghijklm";
++    static NCURSES_CONST char params[] = "SURBDBIPA";
+     unsigned n;
+ 
+     printf("%4u ", bits);
+@@ -177,12 +177,11 @@
+ static void
+ brute_force(const char *name)
+ {
+-    unsigned count;
+-    char *my_sgr;
+-    char *my_sgr0;
+-    char *my_bold;
+-    char *my_revs;
+-    char *my_smso;
++    NCURSES_CONST char *my_sgr;
++    NCURSES_CONST char *my_sgr0;
++    NCURSES_CONST char *my_bold;
++    NCURSES_CONST char *my_revs;
++    NCURSES_CONST char *my_smso;
+     char *my_name = strdup(name);
+ 
+     if (db_list) {
+@@ -219,6 +218,7 @@
+ 	unsigned ignore = 0;
+ 	unsigned reason = 0;
+ 	unsigned repeat = 0;
++	unsigned count;
+ 	for (count = 0; count < MAXSGR; ++count) {
+ 	    values[count] = tparm(my_sgr,
+ 				  BITS2P(1),
+@@ -334,7 +334,7 @@
+ main(int argc, char *argv[])
+ {
+     int ch;
+-    char *name;
++    const char *name;
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON "d:e:nq")) != -1) {
+ 	switch (ch) {
+@@ -369,7 +369,7 @@
+     } else if ((name = getenv("TERM")) != 0) {
+ 	brute_force(name);
+     } else {
+-	static char dumb[] = "dumb";
++	static const char dumb[] = "dumb";
+ 	brute_force(dumb);
+     }
+ 
+Index: test/test_tparm.c
+Prereq:  1.39 
+--- ncurses-6.5-20240928+/test/test_tparm.c	2023-11-11 01:00:03.000000000 +0000
++++ ncurses-6.5-20241006/test/test_tparm.c	2024-10-06 20:50:27.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -29,7 +29,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: test_tparm.c,v 1.39 2023/11/11 01:00:03 tom Exp $
++ * $Id: test_tparm.c,v 1.42 2024/10/06 20:50:27 tom Exp $
+  *
+  * Exercise tparm/tiparm, either for all possible capabilities with fixed
+  * parameters, or one capability with specific combinations of parameters.
+@@ -107,7 +107,7 @@
+ }
+ 
+ static int
+-isNumeric(char *source)
++isNumeric(NCURSES_CONST char *source)
+ {
+     char *next = 0;
+     long value = strtol(source, &next, 0);
+@@ -245,7 +245,7 @@
+ #define NS_9(fmt)	NS_8(fmt), NumStr(8)
+ 
+ static void
+-test_tparm(const char *name, const char *format, long *number, char **string)
++test_tparm(const char *name, NCURSES_CONST char *format, long *number, char **string)
+ {
+     char *use_strings[MAX_PARM];
+     char *result = NULL;
+@@ -527,7 +527,7 @@
+ 	    }
+ 	} else {
+ 	    char *s = t_opt;
+-	    char *t;
++	    NCURSES_CONST char *t;
+ 	    while ((t = strtok(s, ",")) != 0) {
+ 		s = 0;
+ 		if (len_terms + 2 >= max_terms) {
+@@ -603,7 +603,7 @@
+ #if NCURSES_XNAMES
+ 	    len_caps = std_caps;
+ 	    if (cur_term) {
+-		TERMTYPE *term = (TERMTYPE *) cur_term;
++		NCURSES_CONST TERMTYPE *term = (TERMTYPE *) cur_term;
+ 		for (n = STRCOUNT; n < NUM_STRINGS(term); ++n) {
+ 		    GrowArray(all_caps, max_caps, len_caps);
+ 		    GrowArray(cap_name, max_name, len_caps);
+Index: test/test_vidputs.c
+Prereq:  1.15 
+--- ncurses-6.5-20240928+/test/test_vidputs.c	2022-12-10 23:23:27.000000000 +0000
++++ ncurses-6.5-20241006/test/test_vidputs.c	2024-10-06 21:17:54.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2021,2022 Thomas E. Dickey                                *
++ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2013-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_vidputs.c,v 1.15 2022/12/10 23:23:27 tom Exp $
++ * $Id: test_vidputs.c,v 1.16 2024/10/06 21:17:54 tom Exp $
+  *
+  * Demonstrate the vidputs and vidattr functions.
+  * Thomas Dickey - 2013/01/12
+@@ -51,7 +51,7 @@
+ }
+ 
+ static bool
+-outs(const char *s)
++outs(NCURSES_CONST char *s)
+ {
+     if (VALID_STRING(s)) {
+ 	tputs(s, 1, outc);
+Index: test/testcurs.c
+Prereq:  1.58 
+--- ncurses-6.5-20240928+/test/testcurs.c	2023-05-28 14:23:34.000000000 +0000
++++ ncurses-6.5-20241006/test/testcurs.c	2024-10-05 19:17:19.000000000 +0000
+@@ -6,7 +6,7 @@
+  *  wrs(5/28/93) -- modified to be consistent (perform identically) with either
+  *                  PDCurses or under Unix System V, R4
+  *
+- * $Id: testcurs.c,v 1.58 2023/05/28 14:23:34 tom Exp $
++ * $Id: testcurs.c,v 1.59 2024/10/05 19:17:19 tom Exp $
+  */
+ 
+ #include 
+@@ -245,7 +245,7 @@
+ 	wclrtobot(win);
+ 	if (c >= KEY_MIN)
+ 	    wprintw(win, "Key Pressed: %s", keyname(c));
+-	else if (isprint(c))
++	else if (isprint(UChar(c)))
+ 	    wprintw(win, "Key Pressed: %c", c);
+ 	else
+ 	    wprintw(win, "Key Pressed: %s", unctrl(UChar(c)));
+@@ -748,8 +748,8 @@
+ 	keypad(stdscr, TRUE);
+ 	raw();
+ 	key = getch();
+-	if (key < KEY_MIN && key > 0 && isalpha(key)) {
+-	    if (islower(key))
++	if (key < KEY_MIN && key > 0 && isalpha(UChar(key))) {
++	    if (islower(UChar(key)))
+ 		key = toupper(key);
+ 	    for (n = 0; n < MAX_OPTIONS; ++n) {
+ 		if (key == command[n].text[0]) {
+Index: test/testscanw.c
+Prereq:  1.15 
+--- ncurses-6.5-20240928+/test/testscanw.c	2022-12-11 00:10:29.000000000 +0000
++++ ncurses-6.5-20241006/test/testscanw.c	2024-10-05 19:27:33.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
++ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2002,2006 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+  * Date:  1997/03/17
+  * From:  bayern@morpheus.cis.yale.edu
+  *
+- * $Id: testscanw.c,v 1.15 2022/12/11 00:10:29 tom Exp $
++ * $Id: testscanw.c,v 1.16 2024/10/05 19:27:33 tom Exp $
+  */
+ #include 
+ 
+@@ -85,7 +85,7 @@
+     curses_trace(TRACE_UPDATE | TRACE_CALLS);
+ #endif
+     while (optind < argc) {
+-	char *token = argv[optind++];
++	const char *token = argv[optind++];
+ 	if (isdigit(UChar(*token)))
+ 	    move(atoi(token), 0);
+ 	else if (!strcmp(token, "k+"))
+Index: test/view.c
+Prereq:  1.145 
+--- ncurses-6.5-20240928+/test/view.c	2022-12-04 00:40:11.000000000 +0000
++++ ncurses-6.5-20241006/test/view.c	2024-10-06 21:08:05.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
++ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -52,7 +52,7 @@
+  * scroll operation worked, and the refresh() code only had to do a
+  * partial repaint.
+  *
+- * $Id: view.c,v 1.145 2022/12/04 00:40:11 tom Exp $
++ * $Id: view.c,v 1.147 2024/10/06 21:08:05 tom Exp $
+  */
+ 
+ #include 
+@@ -93,8 +93,7 @@
+ 
+ #if USE_WIDEC_SUPPORT
+     for (;;) {
+-	int count;
+-	TEST_CCHAR(src, count, {
++	TEST_CCHAR(src, {
+ 	    int len = wcwidth(test_wch[0]);
+ 	    result += (len > 0) ? len : 1;
+ 	    ++src;
+@@ -186,12 +185,10 @@
+ 	     */
+ 	    {
+ 		int j;
+-		int width = 1;
++		int width;
+ 
+ 		for (j = actual = 0; j < shift; ++j) {
+-		    int count;
+-
+-		    TEST_CCHAR(s + j, count, {
++		    TEST_CCHAR(s + j, {
+ 			width = wcwidth(test_wch[0]);
+ 		    }
+ 		    , {
+@@ -294,7 +291,7 @@
+ 
+ #if USE_WIDEC_SUPPORT
+     if (!memcmp("\357\273\277", my_blob, 3)) {
+-	char *s = my_blob + 3;
++	const char *s = my_blob + 3;
+ 	char *d = my_blob;
+ 	Trace(("trim BOM"));
+ 	do {
+@@ -329,7 +326,7 @@
+ 	char *s;
+ 	int y, x;
+ #if USE_WIDEC_SUPPORT
+-	char *last = my_vec[k] + (int) strlen(my_vec[k]);
++	const char *last = my_vec[k] + (int) strlen(my_vec[k]);
+ 	wchar_t wch[2];
+ 	size_t rc;
+ #ifndef state_unused
+@@ -408,7 +405,7 @@
+ int
+ main(int argc, char *argv[])
+ {
+-    static const char *help[] =
++    static NCURSES_CONST char *help[] =
+     {
+ 	"Commands:",
+ 	"  q,^Q,ESC       - quit this program",
+@@ -659,7 +656,7 @@
+ 	    beep();
+ 	    break;
+ 	}
+-	if (c >= KEY_MIN || (c > 0 && !isdigit(c))) {
++	if (c >= KEY_MIN || (c > 0 && !isdigit(UChar(c)))) {
+ 	    got_number = FALSE;
+ 	    value = 0;
+ 	}
diff --git a/packages/ncurses/6.5/ncurses-6.5-20241019.patch b/packages/ncurses/6.5/ncurses-6.5-20241019.patch
new file mode 100644
index 0000000000..03d9750d6b
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20241019.patch
@@ -0,0 +1,1169 @@
+# ncurses 6.5 - patch 20241019 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20241019.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sat Oct 19 23:59:17 UTC 2024
+# ------------------------------------------------------------------------------
+# NEWS                             |    6 ++++-
+# VERSION                          |    2 -
+# dist.mk                          |    4 +--
+# include/nc_win32.h               |    4 +--
+# ncurses/base/lib_delch.c         |    6 ++---
+# ncurses/base/lib_mouse.c         |    6 ++---
+# ncurses/base/lib_set_term.c      |   10 ++++++---
+# ncurses/curses.priv.h            |    8 +++----
+# ncurses/tinfo/captoinfo.c        |    5 +---
+# ncurses/tinfo/entries.c          |    4 +--
+# ncurses/tinfo/lib_setup.c        |    4 +--
+# ncurses/tinfo/lib_win32con.c     |    4 +--
+# ncurses/tinfo/parse_entry.c      |    4 +--
+# ncurses/tinfo/trim_sgr0.c        |    6 +++--
+# ncurses/tinfo/write_entry.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 -
+# progs/clear.c                    |    6 ++---
+# progs/dump_entry.c               |   24 ++++++++++++-----------
+# progs/infocmp.c                  |   36 +++++++++++++++++------------------
+# progs/tabs.c                     |    8 +++----
+# progs/tic.c                      |   38 ++++++++++++++++++-------------------
+# progs/toe.c                      |   22 ++++++++++-----------
+# progs/tset.c                     |    6 ++---
+# test/demo_menus.c                |    4 +--
+# 30 files changed, 127 insertions(+), 116 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4188 
+--- ncurses-6.5-20241006+/NEWS	2024-10-06 08:53:45.000000000 +0000
++++ ncurses-6.5-20241019/NEWS	2024-10-19 21:59:42.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4188 2024/10/06 08:53:45 tom Exp $
++-- $Id: NEWS,v 1.4191 2024/10/19 21:59:42 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.
+ 
++20241019
++	+ fixes for compiler warnings/cppcheck.
++	+ build-fixes for DJGPP configuration (patches by Stas Sergeev)
++
+ 20241006
+ 	+ fixes for compiler warnings/cppcheck.
+ 	+ use xterm+alt+title in wezterm -TD
+Index: VERSION
+--- ncurses-6.5-20241006+/VERSION	2024-10-06 08:53:45.000000000 +0000
++++ ncurses-6.5-20241019/VERSION	2024-10-19 09:59:06.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20241006
++5:0:10	6.5	20241019
+Index: dist.mk
+Prereq:  1.1636 
+--- ncurses-6.5-20241006+/dist.mk	2024-10-06 08:53:45.000000000 +0000
++++ ncurses-6.5-20241019/dist.mk	2024-10-19 09:59:06.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1636 2024/10/06 08:53:45 tom Exp $
++# $Id: dist.mk,v 1.1637 2024/10/19 09:59:06 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 = 5
+-NCURSES_PATCH = 20241006
++NCURSES_PATCH = 20241019
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: include/nc_win32.h
+Prereq:  1.13 
+--- ncurses-6.5-20241006+/include/nc_win32.h	2024-08-31 18:17:21.000000000 +0000
++++ ncurses-6.5-20241019/include/nc_win32.h	2024-10-19 21:06:23.000000000 +0000
+@@ -31,7 +31,7 @@
+  * Author: Thomas Dickey, 2008-on                                           *
+  ****************************************************************************/
+ 
+-/* $Id: nc_win32.h,v 1.13 2024/08/31 18:17:21 tom Exp $ */
++/* $Id: nc_win32.h,v 1.14 2024/10/19 21:06:23 tom Exp $ */
+ 
+ #ifndef NC_WIN32_H
+ #define NC_WIN32_H 1
+@@ -105,7 +105,7 @@
+ extern NCURSES_EXPORT(void)   _nc_console_selectActiveHandle(void);
+ extern NCURSES_EXPORT(bool)   _nc_console_get_SBI(void);
+ extern NCURSES_EXPORT(void)   _nc_console_set_scrollback(bool normal, CONSOLE_SCREEN_BUFFER_INFO * info);
+-extern NCURSES_EXPORT(int)    _nc_console_testmouse(SCREEN *,HANDLE,int EVENTLIST_2nd(_nc_eventlist*));
++extern NCURSES_EXPORT(int)    _nc_console_testmouse(const SCREEN *,HANDLE,int EVENTLIST_2nd(_nc_eventlist*));
+ extern NCURSES_EXPORT(int)    _nc_console_keyok(int keycode,int flag);
+ extern NCURSES_EXPORT(bool)   _nc_console_keyExist(int keycode);
+ extern NCURSES_EXPORT(bool)   _nc_console_checkinit(bool initFlag, bool assumeTermInfo);
+Index: ncurses/base/lib_delch.c
+Prereq:  1.15 
+--- ncurses-6.5-20241006+/ncurses/base/lib_delch.c	2024-07-27 19:23:21.000000000 +0000
++++ ncurses-6.5-20241019/ncurses/base/lib_delch.c	2024-10-19 21:20:46.000000000 +0000
+@@ -41,7 +41,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_delch.c,v 1.15 2024/07/27 19:23:21 tom Exp $")
++MODULE_ID("$Id: lib_delch.c,v 1.16 2024/10/19 21:20:46 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ wdelch(WINDOW *win)
+@@ -54,8 +54,8 @@
+ 	NCURSES_CH_T blank = win->_nc_bkgd;
+ 	struct ldat *line = &(win->_line[win->_cury]);
+ 	NCURSES_CH_T *end = &(line->text[win->_maxx]);
+-	NCURSES_CH_T *temp2 = &(line->text[win->_curx + 1]);
+-	NCURSES_CH_T *temp1 = temp2 - 1;
++	NCURSES_CH_T *temp1 = &(line->text[win->_curx]);
++	const NCURSES_CH_T *temp2 = temp1 + 1;
+ 
+ 	CHANGED_TO_EOL(line, win->_curx, win->_maxx);
+ 	while (temp1 < end)
+Index: ncurses/base/lib_mouse.c
+Prereq:  1.200 
+--- ncurses-6.5-20241006+/ncurses/base/lib_mouse.c	2024-02-17 21:13:01.000000000 +0000
++++ ncurses-6.5-20241019/ncurses/base/lib_mouse.c	2024-10-19 21:03:19.000000000 +0000
+@@ -85,7 +85,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_mouse.c,v 1.200 2024/02/17 21:13:01 tom Exp $")
++MODULE_ID("$Id: lib_mouse.c,v 1.201 2024/10/19 21:03:19 tom Exp $")
+ 
+ #include 
+ 
+@@ -1219,7 +1219,7 @@
+ } SGR_DATA;
+ 
+ static bool
+-read_SGR(SCREEN *sp, SGR_DATA * result)
++read_SGR(const SCREEN *sp, SGR_DATA * result)
+ {
+     char kbuf[80];		/* bigger than any possible mouse response */
+     int grabbed = 0;
+@@ -2042,7 +2042,7 @@
+ /* This may be used by other routines to ask for the existence of mouse
+    support */
+ NCURSES_EXPORT(bool)
+-_nc_has_mouse(SCREEN *sp)
++_nc_has_mouse(const SCREEN *sp)
+ {
+     return (((0 == sp) || (sp->_mouse_type == M_NONE)) ? FALSE : TRUE);
+ }
+Index: ncurses/base/lib_set_term.c
+Prereq:  1.184 
+--- ncurses-6.5-20241006+/ncurses/base/lib_set_term.c	2022-12-10 21:34:12.000000000 +0000
++++ ncurses-6.5-20241019/ncurses/base/lib_set_term.c	2024-10-19 19:41:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
++ * Copyright 2018-2022,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -47,6 +47,10 @@
+ #include 
+ #include 
+ 
++#ifdef __DJGPP__
++#include 
++#endif
++
+ #if USE_GPM_SUPPORT
+ #ifdef HAVE_LIBDL
+ /* use dynamic loader to avoid linkage dependency */
+@@ -57,7 +61,7 @@
+ #undef CUR
+ #define CUR SP_TERMTYPE
+ 
+-MODULE_ID("$Id: lib_set_term.c,v 1.184 2022/12/10 21:34:12 tom Exp $")
++MODULE_ID("$Id: lib_set_term.c,v 1.186 2024/10/19 19:41:09 tom Exp $")
+ 
+ #ifdef USE_TERM_DRIVER
+ #define MaxColors      InfoOf(sp).maxcolors
+@@ -423,7 +427,7 @@
+ #ifdef __DJGPP__
+     T(("setting output mode to binary"));
+     fflush(output);
+-    setmode(output, O_BINARY);
++    setmode(fileno(output), O_BINARY);
+ #endif
+ #if defined(EXP_WIN32_DRIVER)
+     T(("setting output mode to binary"));
+Index: ncurses/curses.priv.h
+Prereq:  1.692 
+--- ncurses-6.5-20241006+/ncurses/curses.priv.h	2024-10-05 21:01:50.000000000 +0000
++++ ncurses-6.5-20241019/ncurses/curses.priv.h	2024-10-19 21:23:40.000000000 +0000
+@@ -35,7 +35,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: curses.priv.h,v 1.692 2024/10/05 21:01:50 tom Exp $
++ * $Id: curses.priv.h,v 1.694 2024/10/19 21:23:40 tom Exp $
+  *
+  *	curses.priv.h
+  *
+@@ -208,7 +208,7 @@
+  * the path separator in configure doesn't work properly. So, if building
+  * for MinGW, we enforce the correct Windows PATH separator
+  */
+-#if defined(_NC_WINDOWS_NATIVE)
++#if defined(_NC_WINDOWS_NATIVE) || defined(__DJGPP__)
+ #  ifdef NCURSES_PATHSEP
+ #    undef NCURSES_PATHSEP
+ #  endif
+@@ -2059,7 +2059,7 @@
+ extern NCURSES_EXPORT(void) _nc_screen_wrap (void);
+ 
+ /* lib_mouse.c */
+-extern NCURSES_EXPORT(bool) _nc_has_mouse (SCREEN *);
++extern NCURSES_EXPORT(bool) _nc_has_mouse (const SCREEN *);
+ 
+ /* lib_mvcur.c */
+ #define INFINITY	1000000	/* cost: too high to use */
+@@ -2175,7 +2175,7 @@
+ extern NCURSES_EXPORT(void) _nc_init_termtype (TERMTYPE2 *const);
+ extern NCURSES_EXPORT(void) _nc_do_color (int, int, int, NCURSES_OUTC);
+ extern NCURSES_EXPORT(void) _nc_flush (void);
+-extern NCURSES_EXPORT(void) _nc_free_entry (ENTRY *, TERMTYPE2 *);
++extern NCURSES_EXPORT(void) _nc_free_entry (ENTRY *, const TERMTYPE2 *);
+ extern NCURSES_EXPORT(void) _nc_freeall (void);
+ extern NCURSES_EXPORT(void) _nc_hash_map (void);
+ extern NCURSES_EXPORT(void) _nc_init_keytry (SCREEN *);
+Index: ncurses/tinfo/captoinfo.c
+Prereq:  1.103 
+--- ncurses-6.5-20241006+/ncurses/tinfo/captoinfo.c	2024-07-27 19:22:23.000000000 +0000
++++ ncurses-6.5-20241019/ncurses/tinfo/captoinfo.c	2024-10-19 21:18:54.000000000 +0000
+@@ -98,7 +98,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: captoinfo.c,v 1.103 2024/07/27 19:22:23 tom Exp $")
++MODULE_ID("$Id: captoinfo.c,v 1.104 2024/10/19 21:18:54 tom Exp $")
+ 
+ #if 0
+ #define DEBUG_THIS(p) DEBUG(9, p)
+@@ -535,8 +535,7 @@
+ static int
+ bcd_expression(const char *str)
+ {
+-    /* leave this non-const for HPUX */
+-    static char fmt[] = "%%p%c%%{10}%%/%%{16}%%*%%p%c%%{10}%%m%%+";
++    static const char fmt[] = "%%p%c%%{10}%%/%%{16}%%*%%p%c%%{10}%%m%%+";
+     int len = 0;
+     char ch1, ch2;
+ 
+Index: ncurses/tinfo/entries.c
+Prereq:  1.36 
+--- ncurses-6.5-20241006+/ncurses/tinfo/entries.c	2024-07-27 19:22:23.000000000 +0000
++++ ncurses-6.5-20241019/ncurses/tinfo/entries.c	2024-10-19 21:23:31.000000000 +0000
+@@ -38,7 +38,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: entries.c,v 1.36 2024/07/27 19:22:23 tom Exp $")
++MODULE_ID("$Id: entries.c,v 1.37 2024/10/19 21:23:31 tom Exp $")
+ 
+ /****************************************************************************
+  *
+@@ -91,7 +91,7 @@
+ }
+ 
+ NCURSES_EXPORT(void)
+-_nc_free_entry(ENTRY * headp, TERMTYPE2 *tterm)
++_nc_free_entry(ENTRY * headp, const TERMTYPE2 *tterm)
+ /* free the allocated storage consumed by the given list entry */
+ {
+     ENTRY *ep;
+Index: ncurses/tinfo/lib_setup.c
+Prereq:  1.244 
+--- ncurses-6.5-20241006+/ncurses/tinfo/lib_setup.c	2024-08-31 21:15:54.000000000 +0000
++++ ncurses-6.5-20241019/ncurses/tinfo/lib_setup.c	2024-10-19 21:17:36.000000000 +0000
+@@ -49,7 +49,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: lib_setup.c,v 1.244 2024/08/31 21:15:54 tom Exp $")
++MODULE_ID("$Id: lib_setup.c,v 1.245 2024/10/19 21:17:36 tom Exp $")
+ 
+ /****************************************************************************
+  *
+@@ -320,7 +320,7 @@
+ }
+ 
+ static bool
+-get_position(TERMINAL *termp, int fd, int *row, int *col)
++get_position(const TERMINAL *termp, int fd, int *row, int *col)
+ {
+     bool result = FALSE;
+     size_t need = strlen(user7);
+Index: ncurses/tinfo/lib_win32con.c
+Prereq:  1.15 
+--- ncurses-6.5-20241006+/ncurses/tinfo/lib_win32con.c	2024-08-31 15:55:10.000000000 +0000
++++ ncurses-6.5-20241019/ncurses/tinfo/lib_win32con.c	2024-10-19 21:06:11.000000000 +0000
+@@ -38,7 +38,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_win32con.c,v 1.15 2024/08/31 15:55:10 tom Exp $")
++MODULE_ID("$Id: lib_win32con.c,v 1.16 2024/10/19 21:06:11 tom Exp $")
+ 
+ #if defined(_NC_WINDOWS)
+ 
+@@ -996,7 +996,7 @@
+ 
+ NCURSES_EXPORT(int)
+ _nc_console_testmouse(
+-			 SCREEN *sp,
++			 const SCREEN *sp,
+ 			 HANDLE hdl,
+ 			 int delay
+ 			 EVENTLIST_2nd(_nc_eventlist * evl))
+Index: ncurses/tinfo/parse_entry.c
+Prereq:  1.109 
+--- ncurses-6.5-20241006+/ncurses/tinfo/parse_entry.c	2024-07-27 19:22:23.000000000 +0000
++++ ncurses-6.5-20241019/ncurses/tinfo/parse_entry.c	2024-10-19 21:22:04.000000000 +0000
+@@ -48,7 +48,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: parse_entry.c,v 1.109 2024/07/27 19:22:23 tom Exp $")
++MODULE_ID("$Id: parse_entry.c,v 1.110 2024/10/19 21:22:04 tom Exp $")
+ 
+ #ifdef LINT
+ static short const parametrized[] =
+@@ -707,7 +707,7 @@
+ }
+ 
+ static void
+-append_acs(string_desc * dst, int code, char *src)
++append_acs(string_desc * dst, int code, const char *src)
+ {
+     if (VALID_STRING(src) && strlen(src) == 1) {
+ 	append_acs0(dst, code, src, 0);
+Index: ncurses/tinfo/trim_sgr0.c
+Prereq:  1.24 
+--- ncurses-6.5-20241006+/ncurses/tinfo/trim_sgr0.c	2024-10-05 20:53:48.000000000 +0000
++++ ncurses-6.5-20241019/ncurses/tinfo/trim_sgr0.c	2024-10-19 21:18:18.000000000 +0000
+@@ -37,7 +37,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: trim_sgr0.c,v 1.24 2024/10/05 20:53:48 tom Exp $")
++MODULE_ID("$Id: trim_sgr0.c,v 1.25 2024/10/19 21:18:18 tom Exp $")
+ 
+ #undef CUR
+ #define CUR tp->
+@@ -254,7 +254,7 @@
+ 	} else if (similar_sgr(off, end)
+ 		   && !similar_sgr(off, on)) {
+ 	    bool found = FALSE;
+-	    size_t i, j, k;
++	    size_t i, j;
+ 
+ 	    TR(TRACE_DATABASE, ("adjusting sgr(9:off) : %s", _nc_visbuf(off)));
+ 	    result = off;
+@@ -262,6 +262,8 @@
+ 	     * If rmacs is a substring of sgr(0), remove that chunk.
+ 	     */
+ 	    if (PRESENT(exit_alt_charset_mode)) {
++		size_t k;
++
+ 		TR(TRACE_DATABASE, ("scan for rmacs %s", _nc_visbuf(exit_alt_charset_mode)));
+ 		j = strlen(off);
+ 		k = strlen(exit_alt_charset_mode);
+Index: ncurses/tinfo/write_entry.c
+Prereq:  1.135 
+--- ncurses-6.5-20241006+/ncurses/tinfo/write_entry.c	2024-09-28 17:31:09.000000000 +0000
++++ ncurses-6.5-20241019/ncurses/tinfo/write_entry.c	2024-10-19 21:19:32.000000000 +0000
+@@ -42,7 +42,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: write_entry.c,v 1.135 2024/09/28 17:31:09 tom Exp $")
++MODULE_ID("$Id: write_entry.c,v 1.136 2024/10/19 21:19:32 tom Exp $")
+ 
+ #if 1
+ #define TRACE_OUT(p) DEBUG(2, p)
+@@ -125,12 +125,12 @@
+     static const char dirnames[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+     static bool verified[sizeof(dirnames)];
+ 
+-    char dir[sizeof(LEAF_FMT)];
+     const char *s = 0;
+ 
+     if (code == 0 || (s = (strchr) (dirnames, code)) == 0) {
+ 	_nc_err_abort("Illegal terminfo subdirectory \"" LEAF_FMT "\"", code);
+     } else if (!verified[s - dirnames]) {
++	char dir[sizeof(LEAF_FMT)];
+ 	_nc_SPRINTF(dir, _nc_SLIMIT(sizeof(dir)) LEAF_FMT, code);
+ 	if (make_db_root(dir) < 0) {
+ 	    _nc_err_abort("%s/%s: permission denied", _nc_tic_dir(NULL), dir);
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20241006+/package/debian-mingw/changelog	2024-10-06 08:53:45.000000000 +0000
++++ ncurses-6.5-20241019/package/debian-mingw/changelog	2024-10-19 09:59:06.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241006) unstable; urgency=low
++ncurses6td (6.5+20241019) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 06 Oct 2024 04:53:45 -0400
++ -- Thomas E. Dickey   Sat, 19 Oct 2024 05:59:06 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20241006+/package/debian-mingw64/changelog	2024-10-06 08:53:45.000000000 +0000
++++ ncurses-6.5-20241019/package/debian-mingw64/changelog	2024-10-19 09:59:06.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241006) unstable; urgency=low
++ncurses6td (6.5+20241019) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 06 Oct 2024 04:53:45 -0400
++ -- Thomas E. Dickey   Sat, 19 Oct 2024 05:59:06 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20241006+/package/debian/changelog	2024-10-06 08:53:45.000000000 +0000
++++ ncurses-6.5-20241019/package/debian/changelog	2024-10-19 09:59:06.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241006) unstable; urgency=low
++ncurses6td (6.5+20241019) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 06 Oct 2024 04:53:45 -0400
++ -- Thomas E. Dickey   Sat, 19 Oct 2024 05:59:06 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.671 
+--- ncurses-6.5-20241006+/package/mingw-ncurses.nsi	2024-10-06 08:53:45.000000000 +0000
++++ ncurses-6.5-20241019/package/mingw-ncurses.nsi	2024-10-19 09:59:06.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.671 2024/10/06 08:53:45 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.672 2024/10/19 09:59:06 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "1006"
++!define VERSION_MMDD  "1019"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20241006+/package/mingw-ncurses.spec	2024-10-06 08:53:45.000000000 +0000
++++ ncurses-6.5-20241019/package/mingw-ncurses.spec	2024-10-19 09:59:06.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20241006
++Release: 20241019
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20241006+/package/ncurses.spec	2024-10-06 08:53:45.000000000 +0000
++++ ncurses-6.5-20241019/package/ncurses.spec	2024-10-19 09:59:06.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20241006
++Release: 20241019
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20241006+/package/ncursest.spec	2024-10-06 08:53:45.000000000 +0000
++++ ncurses-6.5-20241019/package/ncursest.spec	2024-10-19 09:59:06.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20241006
++Release: 20241019
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/clear.c
+Prereq:  1.24 
+--- ncurses-6.5-20241006+/progs/clear.c	2021-03-20 18:23:14.000000000 +0000
++++ ncurses-6.5-20241019/progs/clear.c	2024-10-19 22:00:53.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2024 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 
+ #include 
+ 
+-MODULE_ID("$Id: clear.c,v 1.24 2021/03/20 18:23:14 tom Exp $")
++MODULE_ID("$Id: clear.c,v 1.25 2024/10/19 22:00:53 tom Exp $")
+ 
+ const char *_nc_progname = "clear";
+ 
+@@ -71,7 +71,7 @@
+     TTY tty_settings;
+     int fd;
+     int c;
+-    char *term;
++    NCURSES_CONST char *term;
+     bool opt_x = FALSE;		/* clear scrollback if possible */
+ 
+     _nc_progname = _nc_rootname(argv[0]);
+Index: progs/dump_entry.c
+Prereq:  1.196 
+--- ncurses-6.5-20241006+/progs/dump_entry.c	2023-05-27 20:13:10.000000000 +0000
++++ ncurses-6.5-20241019/progs/dump_entry.c	2024-10-19 22:00:53.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 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.196 2023/05/27 20:13:10 tom Exp $")
++MODULE_ID("$Id: dump_entry.c,v 1.197 2024/10/19 22:00:53 tom Exp $")
+ 
+ #define DISCARD(string) string = ABSENT_STRING
+ #define PRINTF (void) printf
+@@ -725,7 +725,7 @@
+  * given leading text.
+  */
+ static bool
+-leading_DYN(DYNBUF * buffer, const char *leading)
++leading_DYN(const DYNBUF * buffer, const char *leading)
+ {
+     bool result = FALSE;
+     size_t need = strlen(leading);
+@@ -1118,7 +1118,7 @@
+ 			      : ((*srccap == 'k')
+ 				 ? 0
+ 				 : has_params(srccap, FALSE)));
+-		char *cv = _nc_infotocap(name, srccap, params);
++		const char *cv = _nc_infotocap(name, srccap, params);
+ 
+ 		if (cv == 0) {
+ 		    if (outform == F_TCONVERR) {
+@@ -1129,7 +1129,8 @@
+ 		    } else if (suppress_untranslatable) {
+ 			continue;
+ 		    } else {
+-			char *s = srccap, *d = buffer;
++			const char *s = srccap;
++			char *d = buffer;
+ 			int need = 3 + (int) strlen(name);
+ 			while ((*d = *s++) != 0) {
+ 			    if ((d - buffer + 2) >= (int) sizeof(buffer)) {
+@@ -1210,7 +1211,8 @@
+ 	    bool box_ok = TRUE;
+ 	    const char *acstrans = "lqkxjmwuvtn";
+ 	    const char *cp;
+-	    char *tp, *sp, boxchars[11];
++	    const char *sp;
++	    char *tp, boxchars[11];
+ 
+ 	    tp = boxchars;
+ 	    for (cp = acstrans; *cp; cp++) {
+@@ -1324,7 +1326,7 @@
+ }
+ 
+ static char *
+-find_string(TERMTYPE2 *tterm, char *name)
++find_string(TERMTYPE2 *tterm, const char *name)
+ {
+     PredIdx n;
+     for (n = 0; n < NUM_STRINGS(tterm); ++n) {
+@@ -1352,7 +1354,7 @@
+     char name[20];
+ 
+     for (n = 0; n <= 10; ++n) {
+-	char *cap;
++	const char *cap;
+ 
+ 	_nc_SPRINTF(name, _nc_SLIMIT(sizeof(name)) "lf%d", n);
+ 	cap = find_string(tterm, name);
+@@ -1379,7 +1381,7 @@
+     char name[20];
+ 
+     for (n = 60; n >= 0; --n) {
+-	char *cap;
++	const char *cap;
+ 
+ 	_nc_SPRINTF(name, _nc_SLIMIT(sizeof(name)) "kf%d", n);
+ 	cap = find_string(tterm, name);
+@@ -1444,7 +1446,7 @@
+ }
+ 
+ static void
+-encode_b64(char *target, char *source, unsigned state, int *saved)
++encode_b64(char *target, const char *source, unsigned state, int *saved)
+ {
+     /* RFC-4648 */
+     static const char data[] =
+@@ -1509,7 +1511,7 @@
+ 		}
+ 	    }
+ 	    if (quickdump & 2) {
+-		static char padding[] =
++		static const char padding[] =
+ 		{0, 0};
+ 		int value = 0;
+ 
+Index: progs/infocmp.c
+Prereq:  1.165 
+--- ncurses-6.5-20241006+/progs/infocmp.c	2024-09-28 20:26:22.000000000 +0000
++++ ncurses-6.5-20241019/progs/infocmp.c	2024-10-19 21:43:11.000000000 +0000
+@@ -43,7 +43,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: infocmp.c,v 1.165 2024/09/28 20:26:22 Branden.Robinson Exp $")
++MODULE_ID("$Id: infocmp.c,v 1.166 2024/10/19 21:43:11 tom Exp $")
+ 
+ #ifndef ACTUAL_TIC
+ #define ACTUAL_TIC "tic"
+@@ -132,7 +132,7 @@
+ }
+ 
+ static void
+-canonical_name(char *source, char *target)
++canonical_name(const char *source, char *target)
+ /* extract the terminal type's primary name */
+ {
+     int limit = NAMESIZE;
+@@ -214,8 +214,6 @@
+     switch (type) {
+     case BOOLEAN:
+ 	{
+-	    int is_set = FALSE;
+-
+ 	    /*
+ 	     * This assumes that multiple use entries are supposed
+ 	     * to contribute the logical or of their boolean capabilities.
+@@ -228,6 +226,8 @@
+ 	     * recorded in the terminfo database.
+ 	     */
+ 	    if (idx < NUM_BOOLEANS(&(entries[0].tterm))) {
++		int is_set = FALSE;
++
+ 		for (ep = &entries[1]; ep < entries + termcount; ep++) {
+ 		    if (idx < NUM_BOOLEANS(&(ep->tterm))
+ 			&& (is_set = ep->tterm.Booleans[idx])) {
+@@ -242,14 +242,14 @@
+ 
+     case NUMBER:
+ 	{
+-	    int value = ABSENT_NUMERIC;
+-
+ 	    /*
+ 	     * We take the semantics of multiple uses to be 'each
+ 	     * capability gets the first non-default value found
+ 	     * in the sequence of use entries'.
+ 	     */
+ 	    if (idx < NUM_NUMBERS(&(entries[0].tterm))) {
++		int value = ABSENT_NUMERIC;
++
+ 		for (ep = &entries[1]; ep < entries + termcount; ep++)
+ 		    if (idx < NUM_NUMBERS(&(ep->tterm))
+ 			&& VALID_NUMERIC(ep->tterm.Numbers[idx])) {
+@@ -265,8 +265,8 @@
+ 
+     case STRING:
+ 	{
+-	    char *termstr = entries[0].tterm.Strings[idx];
+-	    char *usestr = ABSENT_STRING;
++	    const char *termstr = entries[0].tterm.Strings[idx];
++	    const char *usestr = ABSENT_STRING;
+ 
+ 	    /*
+ 	     * We take the semantics of multiple uses to be 'each
+@@ -302,7 +302,7 @@
+ }
+ 
+ static bool
+-useeq(ENTRY * e1, ENTRY * e2)
++useeq(const ENTRY * e1, const ENTRY * e2)
+ /* are the use references in two entries equivalent? */
+ {
+     unsigned i, j;
+@@ -329,7 +329,7 @@
+ }
+ 
+ static bool
+-entryeq(TERMTYPE2 *t1, TERMTYPE2 *t2)
++entryeq(const TERMTYPE2 *t1, const TERMTYPE2 *t2)
+ /* are two entries equivalent? */
+ {
+     unsigned i;
+@@ -352,7 +352,7 @@
+ #define TIC_EXPAND(result) _nc_tic_expand(result, outform==F_TERMINFO, numbers)
+ 
+ static void
+-print_uses(ENTRY * ep, FILE *fp)
++print_uses(const ENTRY * ep, FILE *fp)
+ /* print an entry's use references */
+ {
+     if (!ep->nuses) {
+@@ -404,7 +404,7 @@
+ }
+ 
+ static void
+-dump_string(char *val, char *buf)
++dump_string(const char *val, char *buf)
+ /* display the value of a string capability */
+ {
+     if (val == ABSENT_STRING)
+@@ -479,13 +479,13 @@
+ compare_predicate(PredType type, PredIdx idx, const char *name)
+ /* predicate function to use for entry difference reports */
+ {
+-    ENTRY *e1 = &entries[0];
+-    ENTRY *e2 = &entries[1];
++    const ENTRY *e1 = &entries[0];
++    const ENTRY *e2 = &entries[1];
+     char buf1[MAX_STRING];
+     char buf2[MAX_STRING];
+     int b1, b2;
+     int n1, n2;
+-    char *s1, *s2;
++    const char *s1, *s2;
+     bool found;
+     int extra = 1;
+ 
+@@ -866,7 +866,7 @@
+ 
+ 	/* first, check other capabilities in this entry */
+ 	for (i = 0; i < STRCOUNT; i++) {
+-	    char *cp = tp->Strings[i];
++	    const char *cp = tp->Strings[i];
+ 
+ 	    /* don't use function-key capabilities */
+ 	    if (strnames[i] == NULL)
+@@ -1331,7 +1331,7 @@
+ 
+ /* dump C initializers for the terminal type */
+ static void
+-dump_initializers(TERMTYPE2 *term)
++dump_initializers(const TERMTYPE2 *term)
+ {
+     unsigned n;
+     const char *str = 0;
+@@ -1455,7 +1455,7 @@
+ 
+ /* dump C initializers for the terminal type */
+ static void
+-dump_termtype(TERMTYPE2 *term)
++dump_termtype(const TERMTYPE2 *term)
+ {
+     (void) printf("\t%s\n\t\t%s,\n", L_CURL, name_initializer("alias"));
+     (void) printf("\t\t(char *)0,\t/* pointer to string table */\n");
+Index: progs/tabs.c
+Prereq:  1.54 
+--- ncurses-6.5-20241006+/progs/tabs.c	2024-08-24 22:56:43.000000000 +0000
++++ ncurses-6.5-20241019/progs/tabs.c	2024-10-19 21:45:18.000000000 +0000
+@@ -39,7 +39,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: tabs.c,v 1.54 2024/08/24 22:56:43 tom Exp $")
++MODULE_ID("$Id: tabs.c,v 1.55 2024/10/19 21:45:18 tom Exp $")
+ 
+ static GCC_NORETURN void usage(void);
+ 
+@@ -78,7 +78,7 @@
+ {
+     bool result = FALSE;
+     if (VALID_STRING(clear_all_tabs)) {
+-	char *param = skip_csi(clear_all_tabs);
++	const char *param = skip_csi(clear_all_tabs);
+ 	if (!strcmp(param, "3g"))
+ 	    result = TRUE;
+     }
+@@ -86,7 +86,7 @@
+ }
+ 
+ static void
+-do_tabs(int *tab_list)
++do_tabs(const int *tab_list)
+ {
+     int last = 1;
+     int stop;
+@@ -229,7 +229,7 @@
+  * ruler.
+  */
+ static void
+-write_tabs(int *tab_list, const char *new_line)
++write_tabs(const int *tab_list, const char *new_line)
+ {
+     int stop;
+ 
+Index: progs/tic.c
+Prereq:  1.325 
+--- ncurses-6.5-20241006+/progs/tic.c	2024-03-02 19:33:22.000000000 +0000
++++ ncurses-6.5-20241019/progs/tic.c	2024-10-19 21:31:50.000000000 +0000
+@@ -49,7 +49,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: tic.c,v 1.325 2024/03/02 19:33:22 tom Exp $")
++MODULE_ID("$Id: tic.c,v 1.326 2024/10/19 21:31:50 tom Exp $")
+ 
+ #define STDIN_NAME ""
+ 
+@@ -203,7 +203,8 @@
+ {
+     unsigned n;
+     int ch;
+-    char *s, *d, *t;
++    char *s, *d;
++    const char *t;
+     char result[MAX_ENTRY_SIZE];
+ 
+     /*
+@@ -411,7 +412,6 @@
+     char my_altfile[PATH_MAX];
+     FILE *result = 0;
+     FILE *target;
+-    int ch;
+ 
+     if (alt_file == NULL)
+ 	alt_file = my_altfile;
+@@ -423,7 +423,7 @@
+     } else {
+ 	clearerr(source);
+ 	for (;;) {
+-	    ch = fgetc(source);
++	    int ch = fgetc(source);
+ 	    if (feof(source)) {
+ 		break;
+ 	    } else if (ferror(source)) {
+@@ -1119,7 +1119,7 @@
+  * Check if the alternate character-set capabilities are consistent.
+  */
+ static void
+-check_acs(TERMTYPE2 *tp)
++check_acs(const TERMTYPE2 *tp)
+ {
+     int vt100_smacs = 0;
+     int vt100_rmacs = 0;
+@@ -1332,7 +1332,7 @@
+ 
+     if ((ch = keypad_final(string)) != '\0') {
+ 	const char *list = "PQRSwxymtuvlqrsPpn";	/* app-keypad except "Enter" */
+-	char *test = (strchr) (list, ch);
++	const char *test = (strchr) (list, ch);
+ 	if (test != 0)
+ 	    result = (long) (test - list);
+     }
+@@ -1363,7 +1363,7 @@
+ 	}
+     }
+     if (!repeated) {
+-	char *up = list[1];
++	const char *up = list[1];
+ 	size_t prefix = (size_t) csi_length(up);
+ 	size_t suffix;
+ 
+@@ -1410,7 +1410,7 @@
+ #define UNEXPECTED(name) if (PRESENT(name)) _nc_warning("unexpected " #name ", for %s", why)
+ 
+ static void
+-check_noaddress(TERMTYPE2 *tp, const char *why)
++check_noaddress(const TERMTYPE2 *tp, const char *why)
+ {
+     UNEXPECTED(column_address);
+     UNEXPECTED(cursor_address);
+@@ -1541,7 +1541,7 @@
+  * is mapped inconsistently.
+  */
+ static void
+-check_keypad(TERMTYPE2 *tp)
++check_keypad(const TERMTYPE2 *tp)
+ {
+     char show[80];
+ 
+@@ -1727,7 +1727,7 @@
+ 	bool have_kmouse = FALSE;
+ 	bool use_sgr_39_49 = FALSE;
+ 	const char *name_39_49 = "orig_pair or orig_colors";
+-	char *name = _nc_first_name(tp->term_names);
++	const char *name = _nc_first_name(tp->term_names);
+ 	bool is_screen = !strncmp(name, "screen", 6);
+ 	bool screen_base = (is_screen
+ 			    && strchr(name, '.') == NULL);
+@@ -1985,7 +1985,7 @@
+  * markers.
+  */
+ static void
+-check_params(TERMTYPE2 *tp, const char *name, const char *value, int extended)
++check_params(const TERMTYPE2 *tp, const char *name, const char *value, int extended)
+ {
+     int expected = expected_params(name);
+     int actual = 0;
+@@ -2149,7 +2149,7 @@
+ }
+ 
+ static void
+-check_delays(TERMTYPE2 *tp, const char *name, const char *value)
++check_delays(const TERMTYPE2 *tp, const char *name, const char *value)
+ {
+     const char *p, *q;
+     const char *first = 0;
+@@ -2575,7 +2575,7 @@
+ similar_sgr(int num, char *a, char *b)
+ {
+     char *base_a = a;
+-    char *base_b = b;
++    const char *base_b = b;
+     int delaying = 0;
+ 
+     while (*b != 0) {
+@@ -2631,7 +2631,7 @@
+ }
+ 
+ static char *
+-check_sgr(TERMTYPE2 *tp, char *zero, int num, char *cap, const char *name)
++check_sgr(const TERMTYPE2 *tp, const char *zero, int num, char *cap, const char *name)
+ {
+     char *test;
+ 
+@@ -2731,7 +2731,7 @@
+ }
+ 
+ static void
+-show_fkey_name(NAME_VALUE * data)
++show_fkey_name(const NAME_VALUE * data)
+ {
+     if (data->keycode > 0) {
+ 	fprintf(stderr, " %s", keyname(data->keycode));
+@@ -2909,7 +2909,7 @@
+  * Check if the given capability contains a given SGR attribute.
+  */
+ static void
+-check_sgr_param(TERMTYPE2 *tp, int code, const char *name, char *value)
++check_sgr_param(TERMTYPE2 *tp, int code, const char *name, const char *const value)
+ {
+     if (VALID_STRING(value)) {
+ 	int ncv = ((code != 0) ? (1 << (code - 1)) : 0);
+@@ -3111,7 +3111,7 @@
+ }
+ 
+ static int
+-guess_ANSI_VTxx(TERMTYPE2 *tp)
++guess_ANSI_VTxx(const TERMTYPE2 *tp)
+ {
+     int result = -1;
+     int checks = 0;
+@@ -3151,7 +3151,7 @@
+  */
+ #if defined(user6) && defined(user7) && defined(user8) && defined(user9)
+ static void
+-check_user_6789(TERMTYPE2 *tp)
++check_user_6789(const TERMTYPE2 *tp)
+ {
+     /*
+      * Check if the terminal is known to not 
+@@ -3200,7 +3200,7 @@
+     check_conflict(tp);
+ 
+     for_each_string(j, tp) {
+-	char *a = tp->Strings[j];
++	const char *a = tp->Strings[j];
+ 	if (VALID_STRING(a)) {
+ 	    const char *name = ExtStrname(tp, (int) j, strnames);
+ 	    /*
+Index: progs/toe.c
+Prereq:  1.89 
+--- ncurses-6.5-20241006+/progs/toe.c	2023-07-01 17:04:46.000000000 +0000
++++ ncurses-6.5-20241019/progs/toe.c	2024-10-19 22:00:53.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2013,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -45,7 +45,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: toe.c,v 1.89 2023/07/01 17:04:46 tom Exp $")
++MODULE_ID("$Id: toe.c,v 1.90 2024/10/19 22:00:53 tom Exp $")
+ 
+ #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, ".."))
+ 
+@@ -265,10 +265,10 @@
+ typedef void (DescHook) (int /* db_index */ ,
+ 			 int /* db_limit */ ,
+ 			 const char * /* term_name */ ,
+-			 TERMTYPE2 * /* term */ );
++			 const TERMTYPE2 * /* term */ );
+ 
+ static const char *
+-term_description(TERMTYPE2 *tp)
++term_description(const TERMTYPE2 *tp)
+ {
+     const char *desc;
+ 
+@@ -283,7 +283,7 @@
+ 
+ /* display a description for the type */
+ static void
+-deschook(int db_index, int db_limit, const char *term_name, TERMTYPE2 *tp)
++deschook(int db_index, int db_limit, const char *term_name, const TERMTYPE2 *tp)
+ {
+     (void) db_index;
+     (void) db_limit;
+@@ -307,7 +307,7 @@
+ }
+ 
+ static unsigned long
+-checksum_of(TERMTYPE2 *tp)
++checksum_of(const TERMTYPE2 *tp)
+ {
+     unsigned long result = string_sum(tp->term_names);
+     unsigned i;
+@@ -326,7 +326,7 @@
+ 
+ /* collect data, to sort before display */
+ static void
+-sorthook(int db_index, int db_limit, const char *term_name, TERMTYPE2 *tp)
++sorthook(int db_index, int db_limit, const char *term_name, const TERMTYPE2 *tp)
+ {
+     TERMDATA *data = new_termdata();
+ 
+@@ -385,7 +385,7 @@
+ 
+ #if NCURSES_USE_DATABASE
+ static char *
+-copy_entryname(DIRENT * src)
++copy_entryname(const DIRENT * src)
+ {
+     size_t len = NAMLEN(src);
+     char *result = malloc(len + 1);
+@@ -411,7 +411,7 @@
+ 	if (_nc_is_dir_path(eargv[i])) {
+ 	    char *cwd_buf = 0;
+ 	    DIR *termdir;
+-	    DIRENT *subdir;
++	    const DIRENT *subdir;
+ 
+ 	    if ((termdir = opendir(eargv[i])) == 0) {
+ 		(void) fflush(stdout);
+@@ -428,7 +428,7 @@
+ 		size_t cwd_len;
+ 		char *name_1;
+ 		DIR *entrydir;
+-		DIRENT *entry;
++		const DIRENT *entry;
+ 
+ 		name_1 = copy_entryname(subdir);
+ 		if (isDotname(name_1)) {
+@@ -605,7 +605,7 @@
+     bool direct_dependencies = FALSE;
+     bool invert_dependencies = FALSE;
+     bool header = FALSE;
+-    char *report_file = 0;
++    const char *report_file = 0;
+     int code;
+     int this_opt, last_opt = '?';
+     unsigned v_opt = 0;
+Index: progs/tset.c
+Prereq:  1.135 
+--- ncurses-6.5-20241006+/progs/tset.c	2024-04-20 22:20:41.000000000 +0000
++++ ncurses-6.5-20241019/progs/tset.c	2024-10-19 21:40:28.000000000 +0000
+@@ -98,7 +98,7 @@
+ char *ttyname(int fd);
+ #endif
+ 
+-MODULE_ID("$Id: tset.c,v 1.135 2024/04/20 22:20:41 tom Exp $")
++MODULE_ID("$Id: tset.c,v 1.136 2024/10/19 21:40:28 tom Exp $")
+ 
+ #ifndef environ
+ extern char **environ;
+@@ -543,7 +543,7 @@
+ get_termcap_entry(int fd, char *userarg)
+ {
+     int errret;
+-    char *p;
++    const char *p;
+     const char *ttype;
+ #if HAVE_PATH_TTYS
+ #if HAVE_GETTTYNAM
+@@ -676,7 +676,7 @@
+ obsolete(char **argv)
+ {
+     for (; *argv; ++argv) {
+-	char *parm = argv[0];
++	const char *parm = argv[0];
+ 
+ 	if (parm[0] == '-' && parm[1] == '\0') {
+ 	    argv[0] = strdup("-q");
+Index: test/demo_menus.c
+Prereq:  1.82 
+--- ncurses-6.5-20241006+/test/demo_menus.c	2024-10-06 19:58:28.000000000 +0000
++++ ncurses-6.5-20241019/test/demo_menus.c	2024-10-19 21:53:57.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_menus.c,v 1.82 2024/10/06 19:58:28 tom Exp $
++ * $Id: demo_menus.c,v 1.83 2024/10/19 21:53:57 tom Exp $
+  *
+  * Demonstrate a variety of functions from the menu library.
+  * Thomas Dickey - 2005/4/9
+@@ -755,7 +755,7 @@
+  * Move the menus around on the screen, to test mvwin().
+  */
+ static void
+-move_menus(MENU * current, int by_y, int by_x)
++move_menus(NCURSES_CONST MENU * current, int by_y, int by_x)
+ {
+     if (move_menu(mpBanner, current, by_y, by_x) != ERR) {
+ 	erase();
diff --git a/packages/ncurses/6.5/ncurses-6.5-20241026.patch b/packages/ncurses/6.5/ncurses-6.5-20241026.patch
new file mode 100644
index 0000000000..fa795a9f84
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20241026.patch
@@ -0,0 +1,321 @@
+# ncurses 6.5 - patch 20241026 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20241026.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sat Oct 26 20:19:11 UTC 2024
+# ------------------------------------------------------------------------------
+# NEWS                             |    8 ++++
+# VERSION                          |    2 -
+# dist.mk                          |    4 +-
+# misc/terminfo.src                |   63 +++++++++++++++++++++++++++++++------
+# 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/popup_msg.c                 |    6 +--
+# 12 files changed, 78 insertions(+), 27 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4191 
+--- ncurses-6.5-20241019+/NEWS	2024-10-19 21:59:42.000000000 +0000
++++ ncurses-6.5-20241026/NEWS	2024-10-26 19:40:20.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4191 2024/10/19 21:59:42 tom Exp $
++-- $Id: NEWS,v 1.4193 2024/10/26 19:40: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.
+ 
++20241026
++	+ update ms-terminal -TD
++	+ add ms-terminal-direct -TD
++	+ correct dimensions in test/popup_msg.c, fixing an overrun (patch by
++	  Stas Sergeev, cf: 20211219).
++
+ 20241019
+ 	+ fixes for compiler warnings/cppcheck.
+ 	+ build-fixes for DJGPP configuration (patches by Stas Sergeev)
+Index: VERSION
+--- ncurses-6.5-20241019+/VERSION	2024-10-19 09:59:06.000000000 +0000
++++ ncurses-6.5-20241026/VERSION	2024-10-26 10:01:22.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20241019
++5:0:10	6.5	20241026
+Index: dist.mk
+Prereq:  1.1637 
+--- ncurses-6.5-20241019+/dist.mk	2024-10-19 09:59:06.000000000 +0000
++++ ncurses-6.5-20241026/dist.mk	2024-10-26 10:01:22.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1637 2024/10/19 09:59:06 tom Exp $
++# $Id: dist.mk,v 1.1638 2024/10/26 10:01:22 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 = 5
+-NCURSES_PATCH = 20241019
++NCURSES_PATCH = 20241026
+ 
+ # 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.5-20241019+/misc/terminfo.src	2024-10-05 16:04:17.000000000 +0000
++++ ncurses-6.5-20241026/misc/terminfo.src	2024-10-26 19:09:10.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.1153 $
+-#	$Date: 2024/10/05 16:04:17 $
++#	$Revision: 1.1155 $
++#	$Date: 2024/10/26 19:09:10 $
+ #
+ # 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
+@@ -4634,11 +4634,45 @@
+ 	use=ansi+local, use=ecma+sgr, use=ecma+color,
+ 	use=vt220+cvis, use=vt220+pcedit, use=xterm+nopcfkeys,
+ 
+-# Windows Terminal (Preview)
++# Windows Terminal
+ # https://github.com/microsoft/terminal
+ #
++# Version 1.21.2911.0
++# 2024-10-17
++#
++# - The "About" dialog has a pointer to the release notes, but that turns out
++#   to be for all branches.  This particular version (unlike those previously
++#   tested) happens to be a non-preview version.
++# - Windows Terminal #2958 has relevant discussion.
++#
++# tack:
++# - keypad escapes still do not work
++# - meta mode does not work
++# - when running tests, the screen maximized and did not resume normal size
++#
++# vttest:
++# - identifies as a VT100-level terminal supporting Greek and Turkish (not
++#   applicable to a VT100), horizontal scrolling () and DRCS (seems to work)
++# - left/right margins work
++# - DECSCUSR is okay except for mode 1
++# - SL/SR fail
++# - does not support XTVERSION
++# - some mouse controls work, but not highlight tracking and X10 compatibility
++# - mouse focus events appear - but not in the test-screen (like VTE).
++# - cursor position after alternate screen is correct for 1049, not otherwise
++# - window reporting does not work
++#
++# wraptest:
++# - DECRC does not restore wrap
++#
++# other:
++# - change history says it supports bracketed paste
++# - Greek and Turkish character sets work with GL, not GR
++# - source code says it implements OSC 52, as well as 12, 112, but not 104.
++#
+ # Windows 10 22H2 (also Windows 11)
+ # Version 1.16.10261.0
++# 2020-01-25
+ #
+ # - Windows Terminal #1553: "Feature Request:  Mouse/Touch/Pointer Bindings
+ #   (like middle-click paste, right-click context menu, etc.)", compare to
+@@ -4649,6 +4683,7 @@
+ #
+ # Windows 10 21H1
+ # Version 1.9.1942.0
++# 2021-07-13
+ #
+ # This has longstanding issues with CR/LF mapping, e.g.,
+ # - first reported by Juergen Pfeifer August 13, 2020, with workaround
+@@ -4698,6 +4733,7 @@
+ #
+ # Windows 10 1903
+ # Version 0.2.1831.0
++# 2019-07-02
+ #
+ # The task manager shows this as "OpenConsole.exe", which differs
+ # from the "Windows Command Processor" used for the command-prompt.
+@@ -4734,13 +4770,18 @@
+ # - color palette can be altered, but OSC 104 for resetting does not work
+ # - crashed with a script used for testing NRCS.
+ # - does not recognize either xterm+direct or xterm+indirect escapes.
+-ms-terminal|Windows10 terminal,
++ms-terminal|Windows terminal,
++	use=xterm+256color, use=ms+terminal,
++ms-terminal-direct|Windows terminal with direct-colors,
++	use=xterm+direct, use=ms+terminal,
++ms+terminal|building block for Windows terminal,
+ 	npc,
+-	cud1=\E[B, kcbt=\E[Z, rmkx=\E[?1l, rmm@, smkx=\E[?1h, smm@,
+-	Cr@, Ms@, use=linux+kbs, use=xterm+256color,
+-	use=xterm+pcfkeys, use=ansi+rep, use=xterm+sm+1006,
+-	use=ecma+index, use=ecma+italics, use=ecma+strikeout,
+-	use=xterm-basic, use=xterm+tmux,
++	cud1=\E[B, kcbt=\E[Z, oc@, rmkx=\E[?1l, rmm@, smkx=\E[?1h,
++	smm@, rv=\E\\[>0;10;1c, use=linux+kbs,
++	use=bracketed+paste, use=xterm+pcfkeys, use=ansi+rep,
++	use=xterm+sm+1006, use=ecma+index, use=ecma+italics,
++	use=ecma+strikeout, use=vt420+lrmm, use=xterm-basic,
++	use=xterm+focus, use=xterm+tmux,
+ 
+ #### Visual Studio
+ # Visual Studio Code 1.45.0 uses xterm.js 12.8.1 (see https://xtermjs.org/).
+@@ -27659,4 +27700,8 @@
+ #	+ use xterm+alt+title in wezterm -TD
+ #	+ update comments -TD
+ #
++# 2024-10-26
++#	+ update ms-terminal -TD
++#	+ add ms-terminal-direct -TD
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20241019+/package/debian-mingw/changelog	2024-10-19 09:59:06.000000000 +0000
++++ ncurses-6.5-20241026/package/debian-mingw/changelog	2024-10-26 10:01:22.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241019) unstable; urgency=low
++ncurses6td (6.5+20241026) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 19 Oct 2024 05:59:06 -0400
++ -- Thomas E. Dickey   Sat, 26 Oct 2024 06:01:22 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20241019+/package/debian-mingw64/changelog	2024-10-19 09:59:06.000000000 +0000
++++ ncurses-6.5-20241026/package/debian-mingw64/changelog	2024-10-26 10:01:22.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241019) unstable; urgency=low
++ncurses6td (6.5+20241026) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 19 Oct 2024 05:59:06 -0400
++ -- Thomas E. Dickey   Sat, 26 Oct 2024 06:01:22 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20241019+/package/debian/changelog	2024-10-19 09:59:06.000000000 +0000
++++ ncurses-6.5-20241026/package/debian/changelog	2024-10-26 10:01:22.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241019) unstable; urgency=low
++ncurses6td (6.5+20241026) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 19 Oct 2024 05:59:06 -0400
++ -- Thomas E. Dickey   Sat, 26 Oct 2024 06:01:22 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.672 
+--- ncurses-6.5-20241019+/package/mingw-ncurses.nsi	2024-10-19 09:59:06.000000000 +0000
++++ ncurses-6.5-20241026/package/mingw-ncurses.nsi	2024-10-26 10:01:22.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.672 2024/10/19 09:59:06 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.673 2024/10/26 10:01:22 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "1019"
++!define VERSION_MMDD  "1026"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20241019+/package/mingw-ncurses.spec	2024-10-19 09:59:06.000000000 +0000
++++ ncurses-6.5-20241026/package/mingw-ncurses.spec	2024-10-26 10:01:22.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20241019
++Release: 20241026
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20241019+/package/ncurses.spec	2024-10-19 09:59:06.000000000 +0000
++++ ncurses-6.5-20241026/package/ncurses.spec	2024-10-26 10:01:22.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20241019
++Release: 20241026
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20241019+/package/ncursest.spec	2024-10-19 09:59:06.000000000 +0000
++++ ncurses-6.5-20241026/package/ncursest.spec	2024-10-26 10:01:22.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20241019
++Release: 20241026
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/popup_msg.c
+Prereq:  1.13 
+--- ncurses-6.5-20241019+/test/popup_msg.c	2024-10-06 21:07:01.000000000 +0000
++++ ncurses-6.5-20241026/test/popup_msg.c	2024-10-26 19:28:11.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: popup_msg.c,v 1.13 2024/10/06 21:07:01 tom Exp $
++ * $Id: popup_msg.c,v 1.14 2024/10/26 19:28:11 Stas.Sergeev Exp $
+  *
+  * Show a multi-line message in a window which may extend beyond the screen.
+  *
+@@ -83,11 +83,11 @@
+ 	if (width < check)
+ 	    width = check;
+     }
+-    length = n + 2;
++    length = n;
+ 
+     if ((help = newwin(high, wide, y0, x0)) == 0)
+ 	return;
+-    if ((data = newpad(length + 1, width + 1)) == 0) {
++    if ((data = newpad(length + 2, width + 1)) == 0) {
+ 	delwin(help);
+ 	return;
+     }
diff --git a/packages/ncurses/6.5/ncurses-6.5-20241102.patch b/packages/ncurses/6.5/ncurses-6.5-20241102.patch
new file mode 100644
index 0000000000..69472292c7
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20241102.patch
@@ -0,0 +1,317 @@
+# ncurses 6.5 - patch 20241102 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20241102.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Nov  3 00:56:48 UTC 2024
+# ------------------------------------------------------------------------------
+# NEWS                             |    7 +++++-
+# VERSION                          |    2 -
+# dist.mk                          |    4 +--
+# misc/terminfo.src                |   40 ++++++++++++++++++++++++++++++-------
+# ncurses/base/lib_set_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 -
+# 12 files changed, 54 insertions(+), 28 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4193 
+--- ncurses-6.5-20241026+/NEWS	2024-10-26 19:40:20.000000000 +0000
++++ ncurses-6.5-20241102/NEWS	2024-11-02 21:08:17.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4193 2024/10/26 19:40:20 tom Exp $
++-- $Id: NEWS,v 1.4195 2024/11/02 21:08:17 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.
+ 
++20241102
++	+ remove djgpp-specific initialization to binary mode (report/patch by
++	  Stas Sergeev).
++	+ add extended-keys for djgpp 2.05 -TD
++
+ 20241026
+ 	+ update ms-terminal -TD
+ 	+ add ms-terminal-direct -TD
+Index: VERSION
+--- ncurses-6.5-20241026+/VERSION	2024-10-26 10:01:22.000000000 +0000
++++ ncurses-6.5-20241102/VERSION	2024-11-02 09:59:53.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20241026
++5:0:10	6.5	20241102
+Index: dist.mk
+Prereq:  1.1638 
+--- ncurses-6.5-20241026+/dist.mk	2024-10-26 10:01:22.000000000 +0000
++++ ncurses-6.5-20241102/dist.mk	2024-11-02 09:59:53.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1638 2024/10/26 10:01:22 tom Exp $
++# $Id: dist.mk,v 1.1639 2024/11/02 09:59:53 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 = 5
+-NCURSES_PATCH = 20241026
++NCURSES_PATCH = 20241102
+ 
+ # 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.5-20241026+/misc/terminfo.src	2024-10-26 19:09:10.000000000 +0000
++++ ncurses-6.5-20241102/misc/terminfo.src	2024-11-02 20:48:46.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.1155 $
+-#	$Date: 2024/10/26 19:09:10 $
++#	$Revision: 1.1157 $
++#	$Date: 2024/11/02 20:48:46 $
+ #
+ # 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
+@@ -9514,6 +9514,7 @@
+ # Oddly enough, while several combinations of modifiers are tabulated, there is
+ # none for shifted cursor keys.
+ #
++# kf1-kf12:
+ #	F1			\E[[A
+ #	F2			\E[[B
+ #	F3			\E[[C
+@@ -9538,6 +9539,7 @@
+ #	Right Arrow		\E[C
+ #	Up Arrow		\E[A
+ #
++# kf13-kf24:
+ #	Shift-F1		\E[25~
+ #	Shift-F2		\E[26~
+ #	Shift-F3		\E[27~
+@@ -9551,6 +9553,7 @@
+ #	Shift-F11		\E[35~
+ #	Shift-F12		\E[36~
+ #
++# kf25-kf36:
+ #	Ctrl-F1			\E[47~
+ #	Ctrl-F2			\E[48~
+ #	Ctrl-F3			\E[49~
+@@ -9575,6 +9578,7 @@
+ #	Ctrl-Right Arrow	\E[40~
+ #	Ctrl-Up Arrow		\E[37~
+ #
++# kf37-kf48:
+ #	Alt-F1			\E[59~
+ #	Alt-F2			\E[60~
+ #	Alt-F3			\E[61~
+@@ -9588,6 +9592,7 @@
+ #	Alt-F11			\E[79~
+ #	Alt-F12			\E[80~
+ #
++# ignore (conflicting):
+ #	Alt-Delete		\E[65~
+ #	Alt-Down Arrow		\E[60~
+ #	Alt-End			\E[66~
+@@ -9626,7 +9631,7 @@
+ #	Alt-X			\E[104~
+ #	Alt-Y			\E[105~
+ #	Alt-Z			\E[106~
+-djgpp|ANSI emulation for DJGPP alpha,
++djgpp|ANSI emulation for DJGPP 2.05,
+ 	am, bce, msgr, xhp, xon, xt,
+ 	colors#8, it#8, pairs#64,
+ 	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j
+@@ -9637,16 +9642,34 @@
+ 	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, el1=\E[1K,
+ 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@,
+ 	ich1=\E[@, ind=\E[S, kf1=\E[[A, kf10=\E[21~, kf11=\E[23~,
+-	kf12=\E[24~, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E,
++	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[27~,
++	kf16=\E[28~, kf17=\E[29~, kf18=\E[30~, kf19=\E[31~,
++	kf2=\E[[B, kf20=\E[32~, kf21=\E[33~, kf22=\E[34~,
++	kf23=\E[35~, kf24=\E[36~, kf25=\E[47~, kf26=\E[48~,
++	kf27=\E[49~, kf28=\E[50~, kf29=\E[51~, kf3=\E[[C,
++	kf30=\E[52~, kf31=\E[53~, kf32=\E[54~, kf33=\E[55~,
++	kf34=\E[56~, kf35=\E[57~, kf36=\E[58~, kf37=\E[59~,
++	kf38=\E[60~, kf39=\E[61~, kf4=\E[[D, kf40=\E[62~,
++	kf41=\E[63~, kf42=\E[64~, kf43=\E[65~, kf44=\E[66~,
++	kf45=\E[67~, kf46=\E[68~, kf48=\E[80~, kf5=\E[[E,
+ 	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+ 	khome=\E[1~, nel=\r\n, op=\E[37;40m, ri=\E[T, rmso=\E[m,
+ 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+ 	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%e;25%;%?
+ 	    %p6%t;1%;%?%p7%t;8%;m,
+ 	sgr0=\E[m, smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd,
+-	use=ansi+arrows, use=ansi+erase, use=ansi+idl,
+-	use=ansi+local, use=ansi+sgr, use=vt220+pcedit,
+-	use=ecma+index,
++	alt_A=\E[82~, alt_B=\E[82~, alt_C=\E[83~, alt_D=\E[84~,
++	alt_E=\E[85~, alt_F=\E[86~, alt_G=\E[87~, alt_H=\E[88~,
++	alt_I=\E[89~, alt_J=\E[90~, alt_K=\E[91~, alt_L=\E[92~,
++	alt_M=\E[93~, alt_N=\E[94~, alt_O=\E[95~, alt_P=\E[96~,
++	alt_Q=\E[97~, alt_R=\E[98~, alt_S=\E[99~, alt_T=\E[100~,
++	alt_U=\E[101~, alt_V=\E[102~, alt_W=\E[103~,
++	alt_X=\E[104~, alt_Y=\E[105~, alt_Z=\E[106~, kDC5=\E[43~,
++	kDN5=\E[38~, kEND5=\E[44~, kHOM5=\E[41~, kIC5=\E[42~,
++	kLFT5=\E[39~, kNXT5=\E[46~, kPRV5=\E[45~, kRIT5=\E[40~,
++	kUP5=\E[37~, use=ansi+arrows, use=ansi+erase,
++	use=ansi+idl, use=ansi+local, use=ansi+sgr,
++	use=vt220+pcedit, use=ecma+index,
+ 
+ djgpp203|entry for DJGPP 2.03,
+ 	OTbs, am,
+@@ -27704,4 +27727,7 @@
+ #	+ update ms-terminal -TD
+ #	+ add ms-terminal-direct -TD
+ #
++# 2024-11-02
++#	+ add extended-keys for djgpp 2.05 -TD
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: ncurses/base/lib_set_term.c
+Prereq:  1.186 
+--- ncurses-6.5-20241026+/ncurses/base/lib_set_term.c	2024-10-19 19:41:09.000000000 +0000
++++ ncurses-6.5-20241102/ncurses/base/lib_set_term.c	2024-11-02 21:00:54.000000000 +0000
+@@ -61,7 +61,7 @@
+ #undef CUR
+ #define CUR SP_TERMTYPE
+ 
+-MODULE_ID("$Id: lib_set_term.c,v 1.186 2024/10/19 19:41:09 tom Exp $")
++MODULE_ID("$Id: lib_set_term.c,v 1.187 2024/11/02 21:00:54 tom Exp $")
+ 
+ #ifdef USE_TERM_DRIVER
+ #define MaxColors      InfoOf(sp).maxcolors
+@@ -424,11 +424,6 @@
+ #endif
+ 	T(("filter screensize %dx%d", slines, scolumns));
+     }
+-#ifdef __DJGPP__
+-    T(("setting output mode to binary"));
+-    fflush(output);
+-    setmode(fileno(output), O_BINARY);
+-#endif
+ #if defined(EXP_WIN32_DRIVER)
+     T(("setting output mode to binary"));
+     fflush(output);
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20241026+/package/debian-mingw/changelog	2024-10-26 10:01:22.000000000 +0000
++++ ncurses-6.5-20241102/package/debian-mingw/changelog	2024-11-02 09:59:53.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241026) unstable; urgency=low
++ncurses6td (6.5+20241102) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 26 Oct 2024 06:01:22 -0400
++ -- Thomas E. Dickey   Sat, 02 Nov 2024 05:59:53 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20241026+/package/debian-mingw64/changelog	2024-10-26 10:01:22.000000000 +0000
++++ ncurses-6.5-20241102/package/debian-mingw64/changelog	2024-11-02 09:59:53.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241026) unstable; urgency=low
++ncurses6td (6.5+20241102) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 26 Oct 2024 06:01:22 -0400
++ -- Thomas E. Dickey   Sat, 02 Nov 2024 05:59:53 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20241026+/package/debian/changelog	2024-10-26 10:01:22.000000000 +0000
++++ ncurses-6.5-20241102/package/debian/changelog	2024-11-02 09:59:53.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241026) unstable; urgency=low
++ncurses6td (6.5+20241102) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 26 Oct 2024 06:01:22 -0400
++ -- Thomas E. Dickey   Sat, 02 Nov 2024 05:59:53 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.673 
+--- ncurses-6.5-20241026+/package/mingw-ncurses.nsi	2024-10-26 10:01:22.000000000 +0000
++++ ncurses-6.5-20241102/package/mingw-ncurses.nsi	2024-11-02 09:59:53.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.673 2024/10/26 10:01:22 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.674 2024/11/02 09:59:53 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "1026"
++!define VERSION_MMDD  "1102"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20241026+/package/mingw-ncurses.spec	2024-10-26 10:01:22.000000000 +0000
++++ ncurses-6.5-20241102/package/mingw-ncurses.spec	2024-11-02 09:59:53.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20241026
++Release: 20241102
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20241026+/package/ncurses.spec	2024-10-26 10:01:22.000000000 +0000
++++ ncurses-6.5-20241102/package/ncurses.spec	2024-11-02 09:59:53.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20241026
++Release: 20241102
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20241026+/package/ncursest.spec	2024-10-26 10:01:22.000000000 +0000
++++ ncurses-6.5-20241102/package/ncursest.spec	2024-11-02 09:59:53.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20241026
++Release: 20241102
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/packages/ncurses/6.5/ncurses-6.5-20241109.patch b/packages/ncurses/6.5/ncurses-6.5-20241109.patch
new file mode 100644
index 0000000000..a1d8c4e5f5
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20241109.patch
@@ -0,0 +1,25445 @@
+# ncurses 6.5 - patch 20241109 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20241109.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Nov 10 01:10:49 UTC 2024
+# ------------------------------------------------------------------------------
+# Ada95/aclocal.m4                 |   11 
+# Ada95/configure                  |  951 +++++-----
+# NEWS                             |   10 
+# VERSION                          |    2 
+# aclocal.m4                       |   15 
+# configure                        | 3241 ++++++++++++++++++-------------------
+# dist.mk                          |    4 
+# ncurses/base/lib_set_term.c      |    6 
+# ncurses/tinfo/access.c           |    4 
+# ncurses/tinfo/alloc_entry.c      |    9 
+# ncurses/tinfo/hashed_db.c        |   33 
+# ncurses/tinfo/write_entry.c      |   25 
+# 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                  |    4 
+# progs/tic.c                      |    6 
+# test/aclocal.m4                  |    7 
+# test/configure                   | 3185 ++++++++++++++++++------------------
+# test/demo_new_pair.c             |   10 
+# test/demo_panels.c               |    5 
+# 25 files changed, 3798 insertions(+), 3752 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/aclocal.m4
+Prereq:  1.221 
+--- ncurses-6.5-20241102+/Ada95/aclocal.m4	2024-08-11 00:23:05.000000000 +0000
++++ ncurses-6.5-20241109/Ada95/aclocal.m4	2024-11-09 23:14:10.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: aclocal.m4,v 1.221 2024/08/11 00:23:05 tom Exp $
++dnl $Id: aclocal.m4,v 1.222 2024/11/09 23:14:10 tom Exp $
+ dnl Macros used in NCURSES Ada95 auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -4777,7 +4777,7 @@
+ ])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_WITH_ADA version: 1 updated: 2024/05/18 13:55:23
++dnl CF_WITH_ADA version: 2 updated: 2024/11/09 18:07:29
+ dnl -----------
+ dnl Check for the Ada compiler (unless requested to not do this), which causes
+ dnl a further check for a C compiler which can work with the Ada compiler.
+@@ -4800,7 +4800,7 @@
+ 		AC_PATH_PROG(cf_cv_path_gnatgcc,gnatgcc,no)
+ 		if test "$cf_cv_path_gnatgcc" != no
+ 		then
+-			AC_MSG_CHECKING(for improvement) 
++			AC_MSG_CHECKING(for improvement)
+ 			cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null`
+ 			case "x$cf_file_gnatgcc" in
+ 			(*script*)
+@@ -5217,7 +5217,7 @@
+ ])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_XOPEN_SOURCE version: 67 updated: 2023/09/06 18:55:27
++dnl CF_XOPEN_SOURCE version: 68 updated: 2024/11/09 18:07:29
+ dnl ---------------
+ dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
+ dnl or adapt to the vendor's definitions to get equivalent functionality,
+@@ -5280,6 +5280,9 @@
+ (linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
+ 	CF_GNU_SOURCE($cf_XOPEN_SOURCE)
+ 	;;
++linux*musl)
++	cf_xopen_source="-D_BSD_SOURCE"
++	;;
+ (minix*)
+ 	cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this...
+ 	;;
+Index: Ada95/configure
+--- ncurses-6.5-20241102+/Ada95/configure	2024-08-11 00:23:38.000000000 +0000
++++ ncurses-6.5-20241109/Ada95/configure	2024-11-09 23:14:34.000000000 +0000
+@@ -13458,6 +13458,9 @@
+ fi
+ 
+ 	;;
++linux*musl)
++	cf_xopen_source="-D_BSD_SOURCE"
++	;;
+ (minix*)
+ 	cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this...
+ 	;;
+@@ -13480,16 +13483,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:13483: 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}:13489: 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 13492 "configure"
++#line 13495 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13504,16 +13507,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13507: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13510: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13510: \$? = $ac_status" >&5
++  echo "$as_me:13513: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13513: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13516: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13516: \$? = $ac_status" >&5
++  echo "$as_me:13519: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -13534,7 +13537,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13537 "configure"
++#line 13540 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13549,16 +13552,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13552: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13555: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13555: \$? = $ac_status" >&5
++  echo "$as_me:13558: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13558: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13561: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13561: \$? = $ac_status" >&5
++  echo "$as_me:13564: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13569,7 +13572,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:13572: 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"
+@@ -13577,10 +13580,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:13580: 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 13583 "configure"
++#line 13586 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13595,16 +13598,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13598: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13601: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13601: \$? = $ac_status" >&5
++  echo "$as_me:13604: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13604: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13607: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13607: \$? = $ac_status" >&5
++  echo "$as_me:13610: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13620,7 +13623,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13623: 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
+@@ -13737,7 +13740,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:13740: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:13743: 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
+@@ -13769,14 +13772,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:13772: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:13775: 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 13779 "configure"
++#line 13782 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13794,16 +13797,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13797: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13800: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13800: \$? = $ac_status" >&5
++  echo "$as_me:13803: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13803: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13806: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13806: \$? = $ac_status" >&5
++  echo "$as_me:13809: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -13815,7 +13818,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13818 "configure"
++#line 13821 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13833,16 +13836,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13836: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13839: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13839: \$? = $ac_status" >&5
++  echo "$as_me:13842: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13842: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13845: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13845: \$? = $ac_status" >&5
++  echo "$as_me:13848: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -13857,7 +13860,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13860: result: $cf_cv_xopen_source" >&5
++echo "$as_me:13863: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -14017,16 +14020,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:14020: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:14023: 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}:14026: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:14029: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14029 "configure"
++#line 14032 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14041,16 +14044,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14044: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14047: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14047: \$? = $ac_status" >&5
++  echo "$as_me:14050: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14050: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14053: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14053: \$? = $ac_status" >&5
++  echo "$as_me:14056: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -14071,7 +14074,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14074 "configure"
++#line 14077 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14086,16 +14089,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14089: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14092: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14092: \$? = $ac_status" >&5
++  echo "$as_me:14095: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14095: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14098: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14098: \$? = $ac_status" >&5
++  echo "$as_me:14101: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -14106,7 +14109,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:14109: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:14112: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -14114,10 +14117,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:14117: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:14120: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14120 "configure"
++#line 14123 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14132,16 +14135,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14135: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14138: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14138: \$? = $ac_status" >&5
++  echo "$as_me:14141: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14141: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14144: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14144: \$? = $ac_status" >&5
++  echo "$as_me:14147: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -14157,7 +14160,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14160: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:14163: 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
+@@ -14270,10 +14273,10 @@
+ 	if test "$cf_cv_xopen_source" = no ; then
+ 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+ 
+-echo "${as_me:-configure}:14273: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:14276: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14276 "configure"
++#line 14279 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14291,23 +14294,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14294: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14297: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14297: \$? = $ac_status" >&5
++  echo "$as_me:14300: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14300: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14303: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14303: \$? = $ac_status" >&5
++  echo "$as_me:14306: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-			{ echo "$as_me:14310: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++			{ echo "$as_me:14313: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ 			CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -14330,7 +14333,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}:14333: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:14336: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -14342,7 +14345,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}:14345: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:14348: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -14430,7 +14433,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:14433: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:14436: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -14440,7 +14443,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:14443: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:14446: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -14450,7 +14453,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}:14453: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:14456: 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"
+@@ -14462,10 +14465,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:14465: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:14468: 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 14468 "configure"
++#line 14471 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14480,16 +14483,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14483: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14486: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14486: \$? = $ac_status" >&5
++  echo "$as_me:14489: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14489: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14492: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14492: \$? = $ac_status" >&5
++  echo "$as_me:14495: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -14498,12 +14501,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:14501: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:14504: 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 14506 "configure"
++#line 14509 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14518,16 +14521,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14521: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14524: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14524: \$? = $ac_status" >&5
++  echo "$as_me:14527: \$? = $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:14530: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14530: \$? = $ac_status" >&5
++  echo "$as_me:14533: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -14538,19 +14541,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:14541: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:14544: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:14546: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:14549: 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 14553 "configure"
++#line 14556 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14568,16 +14571,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14571: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14574: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14574: \$? = $ac_status" >&5
++  echo "$as_me:14577: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14577: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14580: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14580: \$? = $ac_status" >&5
++  echo "$as_me:14583: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -14589,7 +14592,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14592 "configure"
++#line 14595 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14607,16 +14610,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14610: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14613: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14613: \$? = $ac_status" >&5
++  echo "$as_me:14616: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14616: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14619: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14619: \$? = $ac_status" >&5
++  echo "$as_me:14622: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -14631,7 +14634,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14634: result: $cf_cv_xopen_source" >&5
++echo "$as_me:14637: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -14778,13 +14781,13 @@
+ fi
+ fi # cf_cv_posix_visible
+ 
+-echo "$as_me:14781: checking for ANSI C header files" >&5
++echo "$as_me:14784: 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 14787 "configure"
++#line 14790 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -14792,13 +14795,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:14795: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:14798: \"$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:14801: \$? = $ac_status" >&5
++  echo "$as_me:14804: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14820,7 +14823,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 14823 "configure"
++#line 14826 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -14838,7 +14841,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 14841 "configure"
++#line 14844 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -14859,7 +14862,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14862 "configure"
++#line 14865 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -14885,15 +14888,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:14888: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14891: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14891: \$? = $ac_status" >&5
++  echo "$as_me:14894: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:14893: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14896: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14896: \$? = $ac_status" >&5
++  echo "$as_me:14899: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -14906,7 +14909,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:14909: result: $ac_cv_header_stdc" >&5
++echo "$as_me:14912: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -14922,28 +14925,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:14925: checking for $ac_header" >&5
++echo "$as_me:14928: 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 14931 "configure"
++#line 14934 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14937: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14940: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14940: \$? = $ac_status" >&5
++  echo "$as_me:14943: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14943: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14946: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14946: \$? = $ac_status" >&5
++  echo "$as_me:14949: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -14953,7 +14956,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14956: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:14959: 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:14969: checking whether exit is declared" >&5
+ echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
+ if test "${ac_cv_have_decl_exit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14972 "configure"
++#line 14975 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14984,16 +14987,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14987: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14990: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14990: \$? = $ac_status" >&5
++  echo "$as_me:14993: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14993: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14996: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14996: \$? = $ac_status" >&5
++  echo "$as_me:14999: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_have_decl_exit=yes
+ else
+@@ -15003,7 +15006,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15006: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:15009: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+ 
+ # Check whether --enable-largefile or --disable-largefile was given.
+@@ -15013,7 +15016,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:15016: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:15019: 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
+@@ -15025,7 +15028,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 15028 "configure"
++#line 15031 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15045,16 +15048,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15048: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15051: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15051: \$? = $ac_status" >&5
++  echo "$as_me:15054: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15054: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15057: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15057: \$? = $ac_status" >&5
++  echo "$as_me:15060: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -15064,16 +15067,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15067: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15070: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15070: \$? = $ac_status" >&5
++  echo "$as_me:15073: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15073: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15076: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15076: \$? = $ac_status" >&5
++  echo "$as_me:15079: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -15087,13 +15090,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:15090: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:15093: 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:15096: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:15099: 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
+@@ -15101,7 +15104,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15104 "configure"
++#line 15107 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15121,16 +15124,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15124: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15127: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15127: \$? = $ac_status" >&5
++  echo "$as_me:15130: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15130: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15133: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15133: \$? = $ac_status" >&5
++  echo "$as_me:15136: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -15139,7 +15142,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15142 "configure"
++#line 15145 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -15160,16 +15163,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15163: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15166: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15166: \$? = $ac_status" >&5
++  echo "$as_me:15169: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15169: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15172: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15172: \$? = $ac_status" >&5
++  echo "$as_me:15175: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -15180,7 +15183,7 @@
+   break
+ done
+ fi
+-echo "$as_me:15183: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:15186: 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
+ 
+@@ -15190,7 +15193,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:15193: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:15196: 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
+@@ -15198,7 +15201,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15201 "configure"
++#line 15204 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15218,16 +15221,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15221: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15224: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15224: \$? = $ac_status" >&5
++  echo "$as_me:15227: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15227: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15230: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15230: \$? = $ac_status" >&5
++  echo "$as_me:15233: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -15236,7 +15239,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15239 "configure"
++#line 15242 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -15257,16 +15260,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15260: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15263: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15263: \$? = $ac_status" >&5
++  echo "$as_me:15266: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15266: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15269: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15269: \$? = $ac_status" >&5
++  echo "$as_me:15272: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -15277,7 +15280,7 @@
+   break
+ done
+ fi
+-echo "$as_me:15280: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:15283: 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
+ 
+@@ -15290,7 +15293,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:15293: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:15296: 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
+@@ -15298,7 +15301,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15301 "configure"
++#line 15304 "configure"
+ #include "confdefs.h"
+ #include 
+     #include 
+@@ -15313,16 +15316,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15316: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15319: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15319: \$? = $ac_status" >&5
++  echo "$as_me:15322: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15322: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15325: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15325: \$? = $ac_status" >&5
++  echo "$as_me:15328: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -15331,7 +15334,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15334 "configure"
++#line 15337 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -15347,16 +15350,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15350: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15353: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15353: \$? = $ac_status" >&5
++  echo "$as_me:15356: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15356: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15359: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15359: \$? = $ac_status" >&5
++  echo "$as_me:15362: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -15367,7 +15370,7 @@
+   break
+ done
+ fi
+-echo "$as_me:15370: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:15373: 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
+ 
+@@ -15381,13 +15384,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:15384: checking for fseeko" >&5
++echo "$as_me:15387: 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 15390 "configure"
++#line 15393 "configure"
+ #include "confdefs.h"
+ #include 
+                              #include 
+@@ -15401,16 +15404,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15404: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15407: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15407: \$? = $ac_status" >&5
++  echo "$as_me:15410: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15410: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15413: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15413: \$? = $ac_status" >&5
++  echo "$as_me:15416: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -15420,7 +15423,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15423: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:15426: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -15459,14 +15462,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:15462: checking whether to use struct dirent64" >&5
++	echo "$as_me:15465: 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 15469 "configure"
++#line 15472 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -15493,16 +15496,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15496: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15499: \"$ac_compile\"") >&5
+   (eval $ac_compile) 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_objext"'
+-  { (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
+   cf_cv_struct_dirent64=yes
+ else
+@@ -15513,7 +15516,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15516: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:15519: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -15523,7 +15526,7 @@
+ 	fi
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:15526: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:15529: 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.
+@@ -15533,7 +15536,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:15536: result: $with_rcs_ids" >&5
++echo "$as_me:15539: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "$with_rcs_ids" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -15543,7 +15546,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15546: checking if you want to build with function extensions" >&5
++echo "$as_me:15549: 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.
+@@ -15553,7 +15556,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:15556: result: $with_ext_funcs" >&5
++echo "$as_me:15559: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "$with_ext_funcs" = yes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -15571,7 +15574,7 @@
+ fi
+ 
+ ###   use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:15574: checking for extended use of const keyword" >&5
++echo "$as_me:15577: 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.
+@@ -15581,7 +15584,7 @@
+ else
+   with_ext_const=no
+ fi;
+-echo "$as_me:15584: result: $with_ext_const" >&5
++echo "$as_me:15587: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "$with_ext_const" = yes ; then
+@@ -15591,7 +15594,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:15594: checking if you want all development code" >&5
++echo "$as_me:15597: 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.
+@@ -15601,7 +15604,7 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:15604: result: $with_develop" >&5
++echo "$as_me:15607: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###############################################################################
+@@ -15610,7 +15613,7 @@
+ # This is still experimental (20080329), but should ultimately be moved to
+ # the script-block --with-normal, etc.
+ 
+-echo "$as_me:15613: checking if you want to link with the pthread library" >&5
++echo "$as_me:15616: 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.
+@@ -15620,27 +15623,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:15623: result: $with_pthread" >&5
++echo "$as_me:15626: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:15627: checking for pthread.h" >&5
++	echo "$as_me:15630: 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 15633 "configure"
++#line 15636 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:15637: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:15640: \"$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:15643: \$? = $ac_status" >&5
++  echo "$as_me:15646: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15659,7 +15662,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:15662: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:15665: 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
+ 
+@@ -15669,7 +15672,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:15672: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:15675: 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"
+ 
+@@ -15690,7 +15693,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15693 "configure"
++#line 15696 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15707,16 +15710,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15710: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15713: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15713: \$? = $ac_status" >&5
++  echo "$as_me:15716: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15716: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15719: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15719: \$? = $ac_status" >&5
++  echo "$as_me:15722: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -15726,7 +15729,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:15729: result: $with_pthread" >&5
++	    echo "$as_me:15732: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -15754,7 +15757,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:15757: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:15760: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -15763,7 +15766,7 @@
+ 
+ fi
+ 
+-echo "$as_me:15766: checking if you want to use weak-symbols for pthreads" >&5
++echo "$as_me:15769: 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.
+@@ -15773,18 +15776,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-echo "$as_me:15776: result: $use_weak_symbols" >&5
++echo "$as_me:15779: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ if test "$use_weak_symbols" = yes ; then
+ 
+-echo "$as_me:15780: checking if $CC supports weak symbols" >&5
++echo "$as_me:15783: 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 15787 "configure"
++#line 15790 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15810,16 +15813,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15813: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15816: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15816: \$? = $ac_status" >&5
++  echo "$as_me:15819: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15819: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15822: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15822: \$? = $ac_status" >&5
++  echo "$as_me:15825: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -15830,7 +15833,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15833: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:15836: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ else
+@@ -15859,13 +15862,13 @@
+ fi
+ 
+ # OpenSUSE is installing ncurses6, using reentrant option.
+-echo "$as_me:15862: checking for _nc_TABSIZE" >&5
++echo "$as_me:15865: 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 15868 "configure"
++#line 15871 "configure"
+ #include "confdefs.h"
+ #define _nc_TABSIZE autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15896,16 +15899,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15899: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15902: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15902: \$? = $ac_status" >&5
++  echo "$as_me:15905: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15905: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15908: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15908: \$? = $ac_status" >&5
++  echo "$as_me:15911: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func__nc_TABSIZE=yes
+ else
+@@ -15915,7 +15918,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15918: result: $ac_cv_func__nc_TABSIZE" >&5
++echo "$as_me:15921: 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
+@@ -15927,7 +15930,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:15930: checking if you want experimental reentrant code" >&5
++echo "$as_me:15933: 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.
+@@ -15937,7 +15940,7 @@
+ else
+   with_reentrant=$assume_reentrant
+ fi;
+-echo "$as_me:15940: result: $with_reentrant" >&5
++echo "$as_me:15943: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "$with_reentrant" = yes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -15960,7 +15963,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:15963: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:15966: 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.
+@@ -15970,7 +15973,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:15973: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:15976: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -15984,7 +15987,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:15987: checking if you want to see long compiling messages" >&5
++echo "$as_me:15990: 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.
+@@ -16018,10 +16021,10 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:16021: result: $enableval" >&5
++echo "$as_me:16024: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+-echo "$as_me:16024: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:16027: 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.
+@@ -16038,17 +16041,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:16041: result: $enable_stdnoreturn" >&5
++echo "$as_me:16044: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:16045: checking for C11 _Noreturn feature" >&5
++echo "$as_me:16048: 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 16051 "configure"
++#line 16054 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -16064,16 +16067,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16067: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16070: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16070: \$? = $ac_status" >&5
++  echo "$as_me:16073: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16073: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16076: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16076: \$? = $ac_status" >&5
++  echo "$as_me:16079: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -16084,7 +16087,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16087: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:16090: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -16140,16 +16143,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16143: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16146: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16148: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16151: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16152: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16155: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -16188,16 +16191,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16191: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16194: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16196: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16199: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16200: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16203: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -16236,23 +16239,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16239: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16242: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16244: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16247: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16248: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16251: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:16255: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:16258: 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.
+@@ -16269,7 +16272,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:16272: result: $enable_warnings" >&5
++echo "$as_me:16275: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -16293,7 +16296,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16296 "configure"
++#line 16299 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16308,26 +16311,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16311: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16314: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16314: \$? = $ac_status" >&5
++  echo "$as_me:16317: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16317: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16320: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16320: \$? = $ac_status" >&5
++  echo "$as_me:16323: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:16323: checking for X11/Xt const-feature" >&5
++echo "$as_me:16326: 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 16330 "configure"
++#line 16333 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -16345,16 +16348,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16348: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16351: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16351: \$? = $ac_status" >&5
++  echo "$as_me:16354: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16354: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16357: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16357: \$? = $ac_status" >&5
++  echo "$as_me:16360: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -16369,7 +16372,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16372: result: $cf_cv_const_x_string" >&5
++echo "$as_me:16375: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -16398,7 +16401,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:16420: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -16430,12 +16433,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:16433: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:16436: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16436: \$? = $ac_status" >&5
++  echo "$as_me:16439: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:16438: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:16441: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -16443,7 +16446,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:16446: checking for $CC warning options..." >&5
++	{ echo "$as_me:16449: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -16466,12 +16469,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:16469: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:16472: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16472: \$? = $ac_status" >&5
++  echo "$as_me:16475: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:16474: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:16477: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -16479,7 +16482,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:16482: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:16485: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -16489,7 +16492,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:16492: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:16495: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -16522,10 +16525,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:16525: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:16528: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -16575,12 +16578,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:16578: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:16581: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16581: \$? = $ac_status" >&5
++  echo "$as_me:16584: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:16583: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:16586: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -16648,7 +16651,7 @@
+ fi
+ 
+ ###	use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:16651: checking if you want to enable runtime assertions" >&5
++echo "$as_me:16654: 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.
+@@ -16658,7 +16661,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:16661: result: $with_assertions" >&5
++echo "$as_me:16664: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -16711,7 +16714,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16714: checking whether to add trace feature to all models" >&5
++echo "$as_me:16717: 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.
+@@ -16721,7 +16724,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:16724: result: $cf_with_trace" >&5
++echo "$as_me:16727: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "$cf_with_trace" = yes ; then
+@@ -16735,7 +16738,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:16738: checking if we want to use GNAT projects" >&5
++echo "$as_me:16741: 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.
+@@ -16752,21 +16755,21 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:16755: result: $enable_gnat_projects" >&5
++echo "$as_me:16758: 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:16762: checking if ssp library is needed" >&5
++echo "$as_me:16765: 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 16769 "configure"
++#line 16772 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16783,16 +16786,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16786: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16789: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16789: \$? = $ac_status" >&5
++  echo "$as_me:16792: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16792: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16795: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16795: \$? = $ac_status" >&5
++  echo "$as_me:16798: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -16802,7 +16805,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16805 "configure"
++#line 16808 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16819,16 +16822,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16822: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16825: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16825: \$? = $ac_status" >&5
++  echo "$as_me:16828: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16828: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16831: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16831: \$? = $ac_status" >&5
++  echo "$as_me:16834: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -16842,7 +16845,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16845: result: $cf_cv_need_libssp" >&5
++echo "$as_me:16848: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -16870,13 +16873,13 @@
+ (*)
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:16873: checking for clock_gettime" >&5
++echo "$as_me:16876: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16879 "configure"
++#line 16882 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16907,16 +16910,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16910: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16913: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16913: \$? = $ac_status" >&5
++  echo "$as_me:16916: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16916: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16919: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16919: \$? = $ac_status" >&5
++  echo "$as_me:16922: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -16926,12 +16929,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16929: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:16932: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:16934: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:16937: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16939,7 +16942,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16942 "configure"
++#line 16945 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16958,16 +16961,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16961: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16964: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16964: \$? = $ac_status" >&5
++  echo "$as_me:16967: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16967: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16970: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16970: \$? = $ac_status" >&5
++  echo "$as_me:16973: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -16978,7 +16981,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16981: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:16984: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -16990,14 +16993,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:16993: checking if clock_gettime links" >&5
++echo "$as_me:16996: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17000 "configure"
++#line 17003 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17015,16 +17018,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17018: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17021: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17021: \$? = $ac_status" >&5
++  echo "$as_me:17024: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17024: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17027: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17027: \$? = $ac_status" >&5
++  echo "$as_me:17030: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -17035,7 +17038,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17038: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:17041: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -17049,13 +17052,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:17052: checking for gettimeofday" >&5
++echo "$as_me:17055: 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 17058 "configure"
++#line 17061 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17086,16 +17089,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17089: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17092: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17092: \$? = $ac_status" >&5
++  echo "$as_me:17095: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17095: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17098: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17098: \$? = $ac_status" >&5
++  echo "$as_me:17101: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -17105,7 +17108,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17108: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:17111: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -17115,7 +17118,7 @@
+ 
+ else
+ 
+-echo "$as_me:17118: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:17121: 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
+@@ -17123,7 +17126,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17126 "configure"
++#line 17129 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17142,16 +17145,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17145: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17148: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17148: \$? = $ac_status" >&5
++  echo "$as_me:17151: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17151: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17154: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17154: \$? = $ac_status" >&5
++  echo "$as_me:17157: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -17162,7 +17165,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17165: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:17168: 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
+ 
+@@ -17195,13 +17198,13 @@
+ esac
+ 
+ ###	Checks for header files.
+-echo "$as_me:17198: checking for signed char" >&5
++echo "$as_me:17201: 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 17204 "configure"
++#line 17207 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17216,16 +17219,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17219: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17222: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17222: \$? = $ac_status" >&5
++  echo "$as_me:17225: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17225: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17228: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17228: \$? = $ac_status" >&5
++  echo "$as_me:17231: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -17235,10 +17238,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17238: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:17241: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:17241: checking size of signed char" >&5
++echo "$as_me:17244: 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
+@@ -17247,7 +17250,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17250 "configure"
++#line 17253 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17259,21 +17262,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17262: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17265: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17265: \$? = $ac_status" >&5
++  echo "$as_me:17268: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17268: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17271: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17271: \$? = $ac_status" >&5
++  echo "$as_me:17274: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17276 "configure"
++#line 17279 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17285,16 +17288,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17288: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17291: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17291: \$? = $ac_status" >&5
++  echo "$as_me:17294: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17294: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17297: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17297: \$? = $ac_status" >&5
++  echo "$as_me:17300: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -17310,7 +17313,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17313 "configure"
++#line 17316 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17322,16 +17325,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17325: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17328: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17328: \$? = $ac_status" >&5
++  echo "$as_me:17331: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17331: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17334: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17334: \$? = $ac_status" >&5
++  echo "$as_me:17337: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -17347,7 +17350,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 17350 "configure"
++#line 17353 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17359,16 +17362,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17362: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17365: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17365: \$? = $ac_status" >&5
++  echo "$as_me:17368: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17368: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17371: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17371: \$? = $ac_status" >&5
++  echo "$as_me:17374: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -17381,12 +17384,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:17384: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:17387: 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 17389 "configure"
++#line 17392 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17402,15 +17405,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17405: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17408: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17408: \$? = $ac_status" >&5
++  echo "$as_me:17411: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17410: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17413: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17413: \$? = $ac_status" >&5
++  echo "$as_me:17416: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -17426,7 +17429,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:17429: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:17432: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:17441: 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 17444 "configure"
++#line 17447 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -17456,16 +17459,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17459: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17462: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17462: \$? = $ac_status" >&5
++  echo "$as_me:17465: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17465: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17468: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17468: \$? = $ac_status" >&5
++  echo "$as_me:17471: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -17475,7 +17478,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17478: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17481: 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:17494: 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
+@@ -17496,7 +17499,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17499 "configure"
++#line 17502 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17515,16 +17518,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17518: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17521: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17521: \$? = $ac_status" >&5
++  echo "$as_me:17524: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17524: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17527: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17527: \$? = $ac_status" >&5
++  echo "$as_me:17530: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -17535,14 +17538,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17538: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:17541: 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:17545: checking for opendir in -lx" >&5
++  echo "$as_me:17548: 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
+@@ -17550,7 +17553,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17553 "configure"
++#line 17556 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17569,16 +17572,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17572: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17575: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17575: \$? = $ac_status" >&5
++  echo "$as_me:17578: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17578: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17581: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17581: \$? = $ac_status" >&5
++  echo "$as_me:17584: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -17589,7 +17592,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17592: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:17595: 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"
+@@ -17597,13 +17600,13 @@
+ 
+ fi
+ 
+-echo "$as_me:17600: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:17603: 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 17606 "configure"
++#line 17609 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -17619,16 +17622,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17622: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17625: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17625: \$? = $ac_status" >&5
++  echo "$as_me:17628: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17628: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17631: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17631: \$? = $ac_status" >&5
++  echo "$as_me:17634: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -17638,7 +17641,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17641: result: $ac_cv_header_time" >&5
++echo "$as_me:17644: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -17656,13 +17659,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:17659: checking for an ANSI C-conforming const" >&5
++echo "$as_me:17662: 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 17665 "configure"
++#line 17668 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17724,16 +17727,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17727: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17730: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17730: \$? = $ac_status" >&5
++  echo "$as_me:17733: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17733: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17736: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17736: \$? = $ac_status" >&5
++  echo "$as_me:17739: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -17743,7 +17746,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17746: result: $ac_cv_c_const" >&5
++echo "$as_me:17749: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -17755,7 +17758,7 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:17758: checking if data-only library module links" >&5
++echo "$as_me:17761: 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
+@@ -17763,20 +17766,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:17772: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17772: \$? = $ac_status" >&5
++  echo "$as_me:17775: \$? = $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:17799: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17799: \$? = $ac_status" >&5
++  echo "$as_me:17802: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -17809,7 +17812,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17812 "configure"
++#line 17815 "configure"
+ #include "confdefs.h"
+ 
+ 	extern int testfunc(void);
+@@ -17820,15 +17823,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17823: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17826: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17826: \$? = $ac_status" >&5
++  echo "$as_me:17829: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17828: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17831: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17831: \$? = $ac_status" >&5
++  echo "$as_me:17834: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -17843,7 +17846,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17846: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:17849: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -17862,23 +17865,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17865: checking for $ac_header" >&5
++echo "$as_me:17868: 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 17871 "configure"
++#line 17874 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17875: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:17878: \"$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:17881: \$? = $ac_status" >&5
++  echo "$as_me:17884: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17897,7 +17900,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17900: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17903: 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:17913: 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
+@@ -17918,7 +17921,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17921 "configure"
++#line 17924 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17953,15 +17956,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17956: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17959: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17959: \$? = $ac_status" >&5
++  echo "$as_me:17962: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17961: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17964: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17964: \$? = $ac_status" >&5
++  echo "$as_me:17967: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -17976,16 +17979,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:17979: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:17982: 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:17982: checking for mkstemp" >&5
++	echo "$as_me:17985: 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 17988 "configure"
++#line 17991 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18016,16 +18019,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18019: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18022: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18022: \$? = $ac_status" >&5
++  echo "$as_me:18025: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18025: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18028: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18028: \$? = $ac_status" >&5
++  echo "$as_me:18031: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -18035,7 +18038,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18038: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:18041: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -18056,7 +18059,7 @@
+ if test "$cf_with_ada" != "no" ; then
+ 	if test	"$cf_cv_prog_gnat_correct" = yes; then
+ 
+-	echo "$as_me:18059: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:18062: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -18073,10 +18076,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:18076: result: $ADAFLAGS" >&5
++	echo "$as_me:18079: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:18079: checking if GNATPREP supports -T option" >&5
++echo "$as_me:18082: 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
+@@ -18086,11 +18089,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:18089: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:18092: 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:18093: checking if GNAT supports generics" >&5
++echo "$as_me:18096: 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])
+@@ -18100,7 +18103,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:18103: result: $cf_gnat_generics" >&5
++echo "$as_me:18106: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -18112,7 +18115,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:18115: checking if GNAT supports SIGINT" >&5
++echo "$as_me:18118: 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
+@@ -18160,7 +18163,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:18163: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:18166: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -18173,7 +18176,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:18176: checking if GNAT supports project files" >&5
++echo "$as_me:18179: 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]*)
+@@ -18236,15 +18239,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:18239: result: $cf_gnat_projects" >&5
++echo "$as_me:18242: 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:18245: checking if GNAT supports libraries" >&5
++	echo "$as_me:18248: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:18247: result: $cf_gnat_libraries" >&5
++	echo "$as_me:18250: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -18264,7 +18267,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:18267: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:18270: 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
+@@ -18276,7 +18279,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:18279: checking for Ada95 compiler" >&5
++echo "$as_me:18282: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -18287,12 +18290,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:18290: result: $cf_ada_compiler" >&5
++echo "$as_me:18293: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 		cf_ada_package=terminal_interface
+ 
+-echo "$as_me:18295: checking for Ada95 include directory" >&5
++echo "$as_me:18298: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -18326,7 +18329,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:18329: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:18332: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -18335,10 +18338,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:18338: result: $ADA_INCLUDE" >&5
++echo "$as_me:18341: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:18341: checking for Ada95 object directory" >&5
++echo "$as_me:18344: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -18372,7 +18375,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:18375: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:18378: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -18381,10 +18384,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:18384: result: $ADA_OBJECTS" >&5
++echo "$as_me:18387: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:18387: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:18390: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -18405,11 +18408,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:18408: result: $with_ada_sharedlib" >&5
++echo "$as_me:18411: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+-	{ echo "$as_me:18412: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++	{ echo "$as_me:18415: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+ 
+@@ -18427,7 +18430,7 @@
+ 
+ 		# allow the Ada binding to be renamed
+ 
+-echo "$as_me:18430: checking for Ada95 curses library name" >&5
++echo "$as_me:18433: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -18443,16 +18446,16 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18446: result: $ADA_LIBNAME" >&5
++echo "$as_me:18449: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 	else
+-		{ { echo "$as_me:18450: error: No usable Ada compiler found" >&5
++		{ { echo "$as_me:18453: 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:18455: error: The Ada compiler is needed for this package" >&5
++	{ { echo "$as_me:18458: 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
+@@ -18492,7 +18495,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:18495: checking default library suffix" >&5
++echo "$as_me:18498: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -18503,10 +18506,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:18506: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:18509: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:18509: checking default library-dependency suffix" >&5
++echo "$as_me:18512: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -18589,10 +18592,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:18592: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:18595: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:18595: checking default object directory" >&5
++echo "$as_me:18598: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -18608,7 +18611,7 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:18611: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:18614: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ ### Set up low-level terminfo dependencies for makefiles.
+@@ -18750,7 +18753,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:18753: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:18756: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -18931,7 +18934,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:18934: error: ambiguous option: $1
++    { { echo "$as_me:18937: 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;}
+@@ -18950,7 +18953,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:18953: error: unrecognized option: $1
++  -*) { { echo "$as_me:18956: 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;}
+@@ -19025,7 +19028,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:19028: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:19031: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -19392,7 +19395,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:19395: creating $ac_file" >&5
++    { echo "$as_me:19398: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -19410,7 +19413,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:19413: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:19416: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -19423,7 +19426,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:19426: error: cannot find input file: $f" >&5
++           { { echo "$as_me:19429: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -19439,7 +19442,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:19442: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:19445: 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;}
+@@ -19448,7 +19451,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:19451: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:19454: 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;}
+@@ -19493,7 +19496,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:19496: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:19499: 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;}
+@@ -19504,7 +19507,7 @@
+     $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:19507: WARNING: Some variables may not be substituted:
++      { echo "$as_me:19510: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -19553,7 +19556,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:19556: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:19559: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -19564,7 +19567,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:19567: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:19570: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -19577,7 +19580,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:19580: error: cannot find input file: $f" >&5
++           { { echo "$as_me:19583: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -19635,7 +19638,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:19638: $ac_file is unchanged" >&5
++      { echo "$as_me:19641: $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.4195 
+--- ncurses-6.5-20241102+/NEWS	2024-11-02 21:08:17.000000000 +0000
++++ ncurses-6.5-20241109/NEWS	2024-11-09 23:12:36.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4195 2024/11/02 21:08:17 tom Exp $
++-- $Id: NEWS,v 1.4199 2024/11/09 23:12:36 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.
+ 
++20241109
++	+ work around musl header ifdef's (report by Urs Jansen, cf: Gentoo
++	  #920266).
++	+ improve error-reporting in write_entry.c (report by Changqing Li).
++	+ remove unused #include from DJGPP configuration (report by Stas
++	  Sergeev).
++	+ workaround/fix issues from clang-analyze
++
+ 20241102
+ 	+ remove djgpp-specific initialization to binary mode (report/patch by
+ 	  Stas Sergeev).
+Index: VERSION
+--- ncurses-6.5-20241102+/VERSION	2024-11-02 09:59:53.000000000 +0000
++++ ncurses-6.5-20241109/VERSION	2024-11-09 11:12:30.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20241102
++5:0:10	6.5	20241109
+Index: aclocal.m4
+Prereq:  1.1088 
+--- ncurses-6.5-20241102+/aclocal.m4	2024-08-11 00:17:28.000000000 +0000
++++ ncurses-6.5-20241109/aclocal.m4	2024-11-09 23:12:47.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1088 2024/08/11 00:17:28 tom Exp $
++dnl $Id: aclocal.m4,v 1.1090 2024/11/09 23:12:47 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -1750,7 +1750,7 @@
+ ])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CPP_OVERRIDE version: 1 updated: 2022/08/20 16:07:10
++dnl CF_CPP_OVERRIDE version: 2 updated: 2024/11/09 18:07:29
+ dnl ---------------
+ dnl Check if the C++ compiler accepts the override keyword.  This is a C++-11
+ dnl feature.
+@@ -1765,7 +1765,7 @@
+ class base
+ {
+ public:
+-	virtual int foo(float x) = 0; 
++	virtual int foo(float x) = 0;
+ };
+ 
+ 
+@@ -9081,7 +9081,7 @@
+ cf_cv_abi_default=$cf_cv_abi_version
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_WITH_ADA version: 1 updated: 2024/05/18 13:55:23
++dnl CF_WITH_ADA version: 2 updated: 2024/11/09 18:07:29
+ dnl -----------
+ dnl Check for the Ada compiler (unless requested to not do this), which causes
+ dnl a further check for a C compiler which can work with the Ada compiler.
+@@ -9104,7 +9104,7 @@
+ 		AC_PATH_PROG(cf_cv_path_gnatgcc,gnatgcc,no)
+ 		if test "$cf_cv_path_gnatgcc" != no
+ 		then
+-			AC_MSG_CHECKING(for improvement) 
++			AC_MSG_CHECKING(for improvement)
+ 			cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null`
+ 			case "x$cf_file_gnatgcc" in
+ 			(*script*)
+@@ -10219,7 +10219,7 @@
+ AC_SUBST(no_x11_rgb)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_XOPEN_SOURCE version: 67 updated: 2023/09/06 18:55:27
++dnl CF_XOPEN_SOURCE version: 68 updated: 2024/11/09 18:07:29
+ dnl ---------------
+ dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
+ dnl or adapt to the vendor's definitions to get equivalent functionality,
+@@ -10282,6 +10282,9 @@
+ (linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
+ 	CF_GNU_SOURCE($cf_XOPEN_SOURCE)
+ 	;;
++linux*musl)
++	cf_xopen_source="-D_BSD_SOURCE"
++	;;
+ (minix*)
+ 	cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this...
+ 	;;
+Index: configure
+--- ncurses-6.5-20241102+/configure	2024-08-31 21:01:19.000000000 +0000
++++ ncurses-6.5-20241109/configure	2024-11-09 23:13:16.000000000 +0000
+@@ -11256,6 +11256,9 @@
+ fi
+ 
+ 	;;
++linux*musl)
++	cf_xopen_source="-D_BSD_SOURCE"
++	;;
+ (minix*)
+ 	cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this...
+ 	;;
+@@ -11278,16 +11281,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:11281: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11284: 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}:11287: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11290: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11290 "configure"
++#line 11293 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11302,16 +11305,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11305: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11308: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11308: \$? = $ac_status" >&5
++  echo "$as_me:11311: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11311: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11314: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11314: \$? = $ac_status" >&5
++  echo "$as_me:11317: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11332,7 +11335,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11335 "configure"
++#line 11338 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11347,16 +11350,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11350: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11353: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11353: \$? = $ac_status" >&5
++  echo "$as_me:11356: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11356: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11359: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11359: \$? = $ac_status" >&5
++  echo "$as_me:11362: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11367,7 +11370,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11370: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11373: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11375,10 +11378,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11378: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11381: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11381 "configure"
++#line 11384 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11393,16 +11396,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11396: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11399: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11399: \$? = $ac_status" >&5
++  echo "$as_me:11402: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11402: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11405: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11405: \$? = $ac_status" >&5
++  echo "$as_me:11408: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11418,7 +11421,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11421: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11424: 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
+@@ -11535,7 +11538,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:11538: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:11541: 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
+@@ -11567,14 +11570,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:11570: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:11573: 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 11577 "configure"
++#line 11580 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11592,16 +11595,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11595: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11598: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11598: \$? = $ac_status" >&5
++  echo "$as_me:11601: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11601: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11604: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11604: \$? = $ac_status" >&5
++  echo "$as_me:11607: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11613,7 +11616,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11616 "configure"
++#line 11619 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11631,16 +11634,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11634: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11637: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11637: \$? = $ac_status" >&5
++  echo "$as_me:11640: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11640: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11643: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11643: \$? = $ac_status" >&5
++  echo "$as_me:11646: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11655,7 +11658,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11658: result: $cf_cv_xopen_source" >&5
++echo "$as_me:11661: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -11815,16 +11818,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:11818: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11821: 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}:11824: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11827: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11827 "configure"
++#line 11830 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11839,16 +11842,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11842: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11845: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11845: \$? = $ac_status" >&5
++  echo "$as_me:11848: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11848: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11851: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11851: \$? = $ac_status" >&5
++  echo "$as_me:11854: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11869,7 +11872,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11872 "configure"
++#line 11875 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11884,16 +11887,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11887: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11890: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11890: \$? = $ac_status" >&5
++  echo "$as_me:11893: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11893: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11896: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11896: \$? = $ac_status" >&5
++  echo "$as_me:11899: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11904,7 +11907,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11907: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11910: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11912,10 +11915,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11915: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11918: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11918 "configure"
++#line 11921 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11930,16 +11933,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11933: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11936: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11936: \$? = $ac_status" >&5
++  echo "$as_me:11939: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11939: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11942: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11942: \$? = $ac_status" >&5
++  echo "$as_me:11945: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11955,7 +11958,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11958: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11961: 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
+@@ -12068,10 +12071,10 @@
+ 	if test "$cf_cv_xopen_source" = no ; then
+ 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+ 
+-echo "${as_me:-configure}:12071: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:12074: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12074 "configure"
++#line 12077 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12089,23 +12092,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12092: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12095: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12095: \$? = $ac_status" >&5
++  echo "$as_me:12098: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12098: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12101: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12101: \$? = $ac_status" >&5
++  echo "$as_me:12104: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-			{ echo "$as_me:12108: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++			{ echo "$as_me:12111: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ 			CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -12128,7 +12131,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}:12131: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12134: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -12140,7 +12143,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}:12143: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:12146: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -12228,7 +12231,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:12231: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:12234: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -12238,7 +12241,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:12241: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:12244: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -12248,7 +12251,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}:12251: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:12254: 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"
+@@ -12260,10 +12263,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:12263: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:12266: 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 12266 "configure"
++#line 12269 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12278,16 +12281,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12281: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12284: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12284: \$? = $ac_status" >&5
++  echo "$as_me:12287: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12287: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12290: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12290: \$? = $ac_status" >&5
++  echo "$as_me:12293: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -12296,12 +12299,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:12299: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:12302: 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 12304 "configure"
++#line 12307 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12316,16 +12319,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12319: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12322: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12322: \$? = $ac_status" >&5
++  echo "$as_me:12325: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12325: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12328: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12328: \$? = $ac_status" >&5
++  echo "$as_me:12331: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -12336,19 +12339,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:12339: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:12342: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:12344: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:12347: 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 12351 "configure"
++#line 12354 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12366,16 +12369,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12369: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12372: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12372: \$? = $ac_status" >&5
++  echo "$as_me:12375: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12375: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12378: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12378: \$? = $ac_status" >&5
++  echo "$as_me:12381: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12387,7 +12390,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12390 "configure"
++#line 12393 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12405,16 +12408,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12408: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12411: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12411: \$? = $ac_status" >&5
++  echo "$as_me:12414: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12414: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12417: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12417: \$? = $ac_status" >&5
++  echo "$as_me:12420: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12429,7 +12432,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12432: result: $cf_cv_xopen_source" >&5
++echo "$as_me:12435: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -12580,14 +12583,14 @@
+ 
+ # Work around breakage on OS X
+ 
+-echo "$as_me:12583: checking if SIGWINCH is defined" >&5
++echo "$as_me:12586: 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 12590 "configure"
++#line 12593 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12602,23 +12605,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12605: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12608: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12608: \$? = $ac_status" >&5
++  echo "$as_me:12611: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12611: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12614: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12614: \$? = $ac_status" >&5
++  echo "$as_me:12617: \$? = $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 12621 "configure"
++#line 12624 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -12636,16 +12639,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12639: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12642: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12642: \$? = $ac_status" >&5
++  echo "$as_me:12645: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12645: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12648: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12648: \$? = $ac_status" >&5
++  echo "$as_me:12651: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -12659,11 +12662,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12662: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:12665: 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:12666: checking for actual SIGWINCH definition" >&5
++echo "$as_me:12669: 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
+@@ -12674,7 +12677,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12677 "configure"
++#line 12680 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -12696,16 +12699,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12699: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12702: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12702: \$? = $ac_status" >&5
++  echo "$as_me:12705: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12705: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12708: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12708: \$? = $ac_status" >&5
++  echo "$as_me:12711: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -12719,7 +12722,7 @@
+ done
+ 
+ fi
+-echo "$as_me:12722: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:12725: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -12729,13 +12732,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:12732: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:12735: 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 12738 "configure"
++#line 12741 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12749,16 +12752,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12752: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12755: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12755: \$? = $ac_status" >&5
++  echo "$as_me:12758: \$? = $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:12761: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12761: \$? = $ac_status" >&5
++  echo "$as_me:12764: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -12769,7 +12772,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12772: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:12775: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test "$am_cv_langinfo_codeset" = yes; then
+ 
+@@ -12783,7 +12786,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+ 
+-echo "$as_me:12786: checking if you want wide-character code" >&5
++echo "$as_me:12789: 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.
+@@ -12793,7 +12796,7 @@
+ else
+   with_widec=$cf_dft_widec
+ fi;
+-echo "$as_me:12796: result: $with_widec" >&5
++echo "$as_me:12799: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ 
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -12815,7 +12818,7 @@
+ 	(*_XOPEN_SOURCE=*)
+ 		;;
+ 	(*)
+-		{ echo "$as_me:12818: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
++		{ echo "$as_me:12821: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
+ 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
+ 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
+@@ -12828,23 +12831,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:12831: checking for $ac_header" >&5
++echo "$as_me:12834: 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 12837 "configure"
++#line 12840 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:12841: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12844: \"$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:12847: \$? = $ac_status" >&5
++  echo "$as_me:12850: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12863,7 +12866,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:12866: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:12869: 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:12879: 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 12883 "configure"
++#line 12886 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12902,16 +12905,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12905: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12908: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12908: \$? = $ac_status" >&5
++  echo "$as_me:12911: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12911: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12914: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12914: \$? = $ac_status" >&5
++  echo "$as_me:12917: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_h_okay=yes
+ else
+@@ -12921,16 +12924,16 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12924: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:12927: 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:12930: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:12933: 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 12933 "configure"
++#line 12936 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12946,16 +12949,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12949: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12952: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12952: \$? = $ac_status" >&5
++  echo "$as_me:12955: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12955: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12958: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12958: \$? = $ac_status" >&5
++  echo "$as_me:12961: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=no
+ else
+@@ -12964,16 +12967,16 @@
+ cf_result=yes
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:12967: result: $cf_result" >&5
++echo "$as_me:12970: 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:12973: checking checking for compatible value versus " >&5
++	echo "$as_me:12976: 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 12976 "configure"
++#line 12979 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12989,16 +12992,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12992: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12995: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12995: \$? = $ac_status" >&5
++  echo "$as_me:12998: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12998: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13001: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13001: \$? = $ac_status" >&5
++  echo "$as_me:13004: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -13007,7 +13010,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:13010: result: $cf_result" >&5
++	echo "$as_me:13013: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = no ; then
+ 		# perhaps we can override it - try...
+@@ -13017,7 +13020,7 @@
+ 
+ fi
+ 
+-echo "$as_me:13020: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:13023: 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
+@@ -13088,7 +13091,7 @@
+   cf_cv_wcwidth_graphics=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13091 "configure"
++#line 13094 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13133,15 +13136,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:13136: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13139: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13139: \$? = $ac_status" >&5
++  echo "$as_me:13142: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:13141: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13144: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13144: \$? = $ac_status" >&5
++  echo "$as_me:13147: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wcwidth_graphics=yes
+ else
+@@ -13154,7 +13157,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:13157: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:13160: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+ 
+ 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -13165,13 +13168,13 @@
+ for ac_func in putwc btowc wctob wmemchr 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:13168: checking for $ac_func" >&5
++echo "$as_me:13171: 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 13174 "configure"
++#line 13177 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13202,16 +13205,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13205: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13208: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13208: \$? = $ac_status" >&5
++  echo "$as_me:13211: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13211: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13214: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13214: \$? = $ac_status" >&5
++  echo "$as_me:13217: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -13221,7 +13224,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13224: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:13227: 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:13242: 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 13245 "configure"
++#line 13248 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13249: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:13252: \"$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:13255: \$? = $ac_status" >&5
++  echo "$as_me:13258: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13271,7 +13274,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:13274: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:13277: 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:13287: 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
+@@ -13289,7 +13292,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13292 "configure"
++#line 13295 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13306,16 +13309,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13309: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13312: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13312: \$? = $ac_status" >&5
++  echo "$as_me:13315: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13315: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13318: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13318: \$? = $ac_status" >&5
++  echo "$as_me:13321: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -13327,12 +13330,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:13330: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13333: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13335 "configure"
++#line 13338 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13345,16 +13348,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13348: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13351: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13351: \$? = $ac_status" >&5
++  echo "$as_me:13354: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13354: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13357: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13357: \$? = $ac_status" >&5
++  echo "$as_me:13360: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -13368,7 +13371,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13371 "configure"
++#line 13374 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13381,16 +13384,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13384: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13387: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13387: \$? = $ac_status" >&5
++  echo "$as_me:13390: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13390: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13393: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13393: \$? = $ac_status" >&5
++  echo "$as_me:13396: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -13407,9 +13410,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:13410: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:13413: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:13412: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13415: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13500,7 +13503,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}:13503: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13506: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -13508,7 +13511,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13511 "configure"
++#line 13514 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13521,21 +13524,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13524: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13527: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13527: \$? = $ac_status" >&5
++  echo "$as_me:13530: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13530: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13533: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13533: \$? = $ac_status" >&5
++  echo "$as_me:13536: \$? = $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}:13538: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13541: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13553,7 +13556,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:13556: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13559: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -13628,13 +13631,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}:13631: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13634: 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 13637 "configure"
++#line 13640 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13647,21 +13650,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13650: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13653: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13653: \$? = $ac_status" >&5
++  echo "$as_me:13656: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13656: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13659: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13659: \$? = $ac_status" >&5
++  echo "$as_me:13662: \$? = $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}:13664: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13667: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -13703,7 +13706,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13706: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:13709: 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
+@@ -13741,7 +13744,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13744 "configure"
++#line 13747 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13753,16 +13756,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13756: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13759: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13759: \$? = $ac_status" >&5
++  echo "$as_me:13762: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13762: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13765: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13765: \$? = $ac_status" >&5
++  echo "$as_me:13768: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13779,7 +13782,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}:13782: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:13785: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -13815,7 +13818,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}:13818: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:13821: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -13847,14 +13850,14 @@
+ 	fi
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:13850: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:13853: 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 13857 "configure"
++#line 13860 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13872,23 +13875,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13875: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13878: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13878: \$? = $ac_status" >&5
++  echo "$as_me:13881: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13881: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13884: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13884: \$? = $ac_status" >&5
++  echo "$as_me:13887: \$? = $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 13891 "configure"
++#line 13894 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13907,16 +13910,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13910: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13913: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13913: \$? = $ac_status" >&5
++  echo "$as_me:13916: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13916: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13919: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13919: \$? = $ac_status" >&5
++  echo "$as_me:13922: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -13928,7 +13931,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13931: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:13934: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -13946,14 +13949,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:13949: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:13952: 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 13956 "configure"
++#line 13959 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13971,23 +13974,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13974: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13977: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13977: \$? = $ac_status" >&5
++  echo "$as_me:13980: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13980: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13983: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13983: \$? = $ac_status" >&5
++  echo "$as_me:13986: \$? = $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 13990 "configure"
++#line 13993 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14006,16 +14009,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14009: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14012: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14012: \$? = $ac_status" >&5
++  echo "$as_me:14015: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14015: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14018: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14018: \$? = $ac_status" >&5
++  echo "$as_me:14021: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -14027,7 +14030,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14030: result: $cf_cv_wchar_t" >&5
++echo "$as_me:14033: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -14050,14 +14053,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:14053: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:14056: 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 14060 "configure"
++#line 14063 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14075,23 +14078,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14078: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14081: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14081: \$? = $ac_status" >&5
++  echo "$as_me:14084: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14084: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14087: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14087: \$? = $ac_status" >&5
++  echo "$as_me:14090: \$? = $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 14094 "configure"
++#line 14097 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14110,16 +14113,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14113: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14116: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14116: \$? = $ac_status" >&5
++  echo "$as_me:14119: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14119: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14122: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14122: \$? = $ac_status" >&5
++  echo "$as_me:14125: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -14131,7 +14134,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14134: result: $cf_cv_wint_t" >&5
++echo "$as_me:14137: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -14163,7 +14166,7 @@
+ fi
+ 
+ ###   use option --disable-lp64 to allow long chtype
+-echo "$as_me:14166: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:14169: 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.
+@@ -14173,7 +14176,7 @@
+ else
+   with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:14176: result: $with_lp64" >&5
++echo "$as_me:14179: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+ 
+ if test "x$with_lp64" = xyes ; then
+@@ -14189,7 +14192,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:14192: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:14195: 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
+@@ -14201,7 +14204,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 14204 "configure"
++#line 14207 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14221,16 +14224,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14224: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14227: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14227: \$? = $ac_status" >&5
++  echo "$as_me:14230: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14230: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14233: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14233: \$? = $ac_status" >&5
++  echo "$as_me:14236: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14240,16 +14243,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 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_sys_largefile_CC=' -n32'; break
+ else
+@@ -14263,13 +14266,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:14266: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:14269: 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:14272: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:14275: 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
+@@ -14277,7 +14280,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14280 "configure"
++#line 14283 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14297,16 +14300,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14300: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14303: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14303: \$? = $ac_status" >&5
++  echo "$as_me:14306: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14306: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14309: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14309: \$? = $ac_status" >&5
++  echo "$as_me:14312: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14315,7 +14318,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14318 "configure"
++#line 14321 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -14336,16 +14339,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14339: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14342: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14342: \$? = $ac_status" >&5
++  echo "$as_me:14345: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14345: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14348: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14348: \$? = $ac_status" >&5
++  echo "$as_me:14351: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -14356,7 +14359,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14359: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:14362: 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
+ 
+@@ -14366,7 +14369,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:14369: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:14372: 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
+@@ -14374,7 +14377,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14377 "configure"
++#line 14380 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14394,16 +14397,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14397: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14400: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14400: \$? = $ac_status" >&5
++  echo "$as_me:14403: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14403: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14406: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14406: \$? = $ac_status" >&5
++  echo "$as_me:14409: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14412,7 +14415,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14415 "configure"
++#line 14418 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -14433,16 +14436,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14436: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14439: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14439: \$? = $ac_status" >&5
++  echo "$as_me:14442: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14442: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14445: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14445: \$? = $ac_status" >&5
++  echo "$as_me:14448: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -14453,7 +14456,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14456: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:14459: 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
+ 
+@@ -14466,7 +14469,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:14469: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:14472: 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
+@@ -14474,7 +14477,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14477 "configure"
++#line 14480 "configure"
+ #include "confdefs.h"
+ #include 
+     #include 
+@@ -14489,16 +14492,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14492: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14495: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14495: \$? = $ac_status" >&5
++  echo "$as_me:14498: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14498: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14501: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14501: \$? = $ac_status" >&5
++  echo "$as_me:14504: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14507,7 +14510,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14510 "configure"
++#line 14513 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -14523,16 +14526,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14526: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14529: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14529: \$? = $ac_status" >&5
++  echo "$as_me:14532: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14532: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14535: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14535: \$? = $ac_status" >&5
++  echo "$as_me:14538: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -14543,7 +14546,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14546: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:14549: 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
+ 
+@@ -14557,13 +14560,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:14560: checking for fseeko" >&5
++echo "$as_me:14563: 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 14566 "configure"
++#line 14569 "configure"
+ #include "confdefs.h"
+ #include 
+                              #include 
+@@ -14577,16 +14580,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14580: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14583: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14583: \$? = $ac_status" >&5
++  echo "$as_me:14586: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14586: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14589: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14589: \$? = $ac_status" >&5
++  echo "$as_me:14592: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -14596,7 +14599,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14599: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:14602: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -14635,14 +14638,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:14638: checking whether to use struct dirent64" >&5
++	echo "$as_me:14641: 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 14645 "configure"
++#line 14648 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -14669,16 +14672,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14672: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14675: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14675: \$? = $ac_status" >&5
++  echo "$as_me:14678: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14678: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14681: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14681: \$? = $ac_status" >&5
++  echo "$as_me:14684: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -14689,7 +14692,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14692: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:14695: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -14699,7 +14702,7 @@
+ 	fi
+ 
+ ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:14702: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:14705: 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.
+@@ -14709,14 +14712,14 @@
+ else
+   with_tparm_varargs=yes
+ fi;
+-echo "$as_me:14712: result: $with_tparm_varargs" >&5
++echo "$as_me:14715: 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:14719: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:14722: 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.
+@@ -14726,14 +14729,14 @@
+ else
+   with_tic_depends=yes
+ fi;
+-echo "$as_me:14729: result: $with_tic_depends" >&5
++echo "$as_me:14732: 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:14736: checking if you want to enable wattr* macros" >&5
++echo "$as_me:14739: 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.
+@@ -14745,15 +14748,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ 	NCURSES_WATTR_MACROS=0
+-	echo "$as_me:14748: result: no" >&5
++	echo "$as_me:14751: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ else
+ 	NCURSES_WATTR_MACROS=1
+-	echo "$as_me:14752: result: yes" >&5
++	echo "$as_me:14755: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ fi
+ 
+-echo "$as_me:14756: checking for X11 rgb file" >&5
++echo "$as_me:14759: 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.
+@@ -14815,7 +14818,7 @@
+ 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:14818: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:14821: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14823,7 +14826,7 @@
+ 
+ fi
+ 
+-echo "$as_me:14826: result: $RGB_PATH" >&5
++echo "$as_me:14829: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:14844: 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.
+@@ -14848,17 +14851,17 @@
+ else
+   NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:14851: result: $NCURSES_BOOL" >&5
++echo "$as_me:14854: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ case x$NCURSES_BOOL in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14855: error: expected a type name for bool" >&5
++	{ { echo "$as_me:14858: error: expected a type name for bool" >&5
+ echo "$as_me: error: expected a type name for bool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+-echo "$as_me:14861: checking for alternate terminal capabilities file" >&5
++echo "$as_me:14864: 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.
+@@ -14870,16 +14873,16 @@
+ fi;
+ if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
+ then
+-	{ echo "$as_me:14873: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
++	{ echo "$as_me:14876: 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:14877: result: $TERMINFO_CAPS" >&5
++echo "$as_me:14880: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+ 
+ ###   use option --with-chtype to override chtype's type
+ 
+-echo "$as_me:14882: checking for type of chtype" >&5
++echo "$as_me:14885: 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.
+@@ -14889,11 +14892,11 @@
+ else
+   NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:14892: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:14895: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ case x$NCURSES_CHTYPE in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14896: error: expected a type name for chtype" >&5
++	{ { echo "$as_me:14899: error: expected a type name for chtype" >&5
+ echo "$as_me: error: expected a type name for chtype" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14901,7 +14904,7 @@
+ 
+ ###   use option --with-ospeed to override ospeed's type
+ 
+-echo "$as_me:14904: checking for type of ospeed" >&5
++echo "$as_me:14907: 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.
+@@ -14911,11 +14914,11 @@
+ else
+   NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:14914: result: $NCURSES_OSPEED" >&5
++echo "$as_me:14917: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ case x$NCURSES_OSPEED in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14918: error: expected a type name for ospeed" >&5
++	{ { echo "$as_me:14921: error: expected a type name for ospeed" >&5
+ echo "$as_me: error: expected a type name for ospeed" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14923,7 +14926,7 @@
+ 
+ ###   use option --with-mmask-t to override mmask_t's type
+ 
+-echo "$as_me:14926: checking for type of mmask-t" >&5
++echo "$as_me:14929: 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.
+@@ -14933,18 +14936,18 @@
+ else
+   NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:14936: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:14939: result: $NCURSES_MMASK_T" >&5
+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+ case x$NCURSES_MMASK_T in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14940: error: expected a type name for mmask-t" >&5
++	{ { echo "$as_me:14943: error: expected a type name for mmask-t" >&5
+ echo "$as_me: error: expected a type name for mmask-t" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ ###   use option --with-ccharw-max to override CCHARW_MAX size
+-echo "$as_me:14947: checking for size CCHARW_MAX" >&5
++echo "$as_me:14950: 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.
+@@ -14954,16 +14957,16 @@
+ else
+   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
+ fi;
+-echo "$as_me:14957: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:14960: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+ 
+-echo "$as_me:14960: checking for signed char" >&5
++echo "$as_me:14963: 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 14966 "configure"
++#line 14969 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14978,16 +14981,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14981: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14984: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14984: \$? = $ac_status" >&5
++  echo "$as_me:14987: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14987: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14990: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14990: \$? = $ac_status" >&5
++  echo "$as_me:14993: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -14997,10 +15000,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15000: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:15003: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:15003: checking size of signed char" >&5
++echo "$as_me:15006: 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
+@@ -15009,7 +15012,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15012 "configure"
++#line 15015 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15021,21 +15024,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15024: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15027: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15027: \$? = $ac_status" >&5
++  echo "$as_me:15030: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15030: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15033: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15033: \$? = $ac_status" >&5
++  echo "$as_me:15036: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15038 "configure"
++#line 15041 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15047,16 +15050,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15050: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15053: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15053: \$? = $ac_status" >&5
++  echo "$as_me:15056: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15056: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15059: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15059: \$? = $ac_status" >&5
++  echo "$as_me:15062: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -15072,7 +15075,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15075 "configure"
++#line 15078 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15084,16 +15087,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15087: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15090: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15090: \$? = $ac_status" >&5
++  echo "$as_me:15093: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15093: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15096: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15096: \$? = $ac_status" >&5
++  echo "$as_me:15099: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -15109,7 +15112,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 15112 "configure"
++#line 15115 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15121,16 +15124,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15124: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15127: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15127: \$? = $ac_status" >&5
++  echo "$as_me:15130: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15130: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15133: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15133: \$? = $ac_status" >&5
++  echo "$as_me:15136: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -15143,12 +15146,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:15146: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:15149: 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 15151 "configure"
++#line 15154 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15164,15 +15167,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:15167: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15170: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15170: \$? = $ac_status" >&5
++  echo "$as_me:15173: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:15172: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15175: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15175: \$? = $ac_status" >&5
++  echo "$as_me:15178: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -15188,7 +15191,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:15191: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:15194: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:15205: checking whether to use signed chars for Boolean array in term.h" >&5
+ echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
+ 
+ # Check whether --enable-signed-char or --disable-signed-char was given.
+@@ -15209,13 +15212,13 @@
+ else
+   with_signed_char=$cf_dft_signed_char
+ fi;
+-echo "$as_me:15212: result: $with_signed_char" >&5
++echo "$as_me:15215: 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:15218: checking for type of tparm-arg" >&5
++echo "$as_me:15221: checking for type of tparm-arg" >&5
+ echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6
+ 
+ # Check whether --with-tparm-arg or --without-tparm-arg was given.
+@@ -15225,18 +15228,18 @@
+ else
+   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:15228: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:15231: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+ case x$NCURSES_TPARM_ARG in
+ (x|xyes|xno)
+-	{ { echo "$as_me:15232: error: expected a type name for tparm-arg" >&5
++	{ { echo "$as_me:15235: error: expected a type name for tparm-arg" >&5
+ echo "$as_me: error: expected a type name for tparm-arg" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:15239: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:15242: 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.
+@@ -15246,7 +15249,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:15249: result: $with_rcs_ids" >&5
++echo "$as_me:15252: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15255,7 +15258,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:15258: checking format of man-pages" >&5
++echo "$as_me:15261: 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.
+@@ -15346,10 +15349,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:15349: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:15352: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+-	{ echo "$as_me:15352: WARNING: Unexpected manpage-format $cf_unknown" >&5
++	{ echo "$as_me:15355: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+ 
+@@ -15390,7 +15393,7 @@
+ esac
+ done
+ 
+-echo "$as_me:15393: checking for manpage renaming" >&5
++echo "$as_me:15396: 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.
+@@ -15419,15 +15422,15 @@
+ elif test "$MANPAGE_RENAMES" = no ; then
+ 	:
+ elif test ! -f "$MANPAGE_RENAMES" ; then
+-	{ { echo "$as_me:15422: error: not a filename: $MANPAGE_RENAMES" >&5
++	{ { echo "$as_me:15425: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-echo "$as_me:15427: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:15430: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+ 
+-echo "$as_me:15430: checking if manpage aliases will be installed" >&5
++echo "$as_me:15433: 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.
+@@ -15438,7 +15441,7 @@
+   MANPAGE_ALIASES=yes
+ fi;
+ 
+-echo "$as_me:15441: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:15444: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+ 
+ case "x$LN_S" in
+@@ -15452,7 +15455,7 @@
+ 
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:15455: checking if manpage symlinks should be used" >&5
++echo "$as_me:15458: 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.
+@@ -15465,17 +15468,17 @@
+ 
+ if test "$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+-	{ echo "$as_me:15468: WARNING: cannot make symlinks" >&5
++	{ echo "$as_me:15471: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ 	MANPAGE_SYMLINKS=no
+ fi
+ fi
+ 
+-echo "$as_me:15474: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:15477: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+ 
+-echo "$as_me:15478: checking for manpage tbl" >&5
++echo "$as_me:15481: 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.
+@@ -15486,7 +15489,7 @@
+   MANPAGE_TBL=no
+ fi;
+ 
+-echo "$as_me:15489: result: $MANPAGE_TBL" >&5
++echo "$as_me:15492: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+ 
+ if test "$prefix" = "NONE" ; then
+@@ -15804,7 +15807,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15807: checking if you want to build with function extensions" >&5
++echo "$as_me:15810: 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.
+@@ -15814,7 +15817,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:15817: result: $with_ext_funcs" >&5
++echo "$as_me:15820: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -15871,7 +15874,7 @@
+ 	GENERATED_EXT_FUNCS=
+ fi
+ 
+-echo "$as_me:15874: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:15877: 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.
+@@ -15881,7 +15884,7 @@
+ else
+   with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:15884: result: $with_sp_funcs" >&5
++echo "$as_me:15887: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ 	NCURSES_SP_FUNCS=1
+@@ -15900,7 +15903,7 @@
+ 	GENERATED_SP_FUNCS=
+ fi
+ 
+-echo "$as_me:15903: checking if you want to build with terminal-driver" >&5
++echo "$as_me:15906: 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.
+@@ -15910,7 +15913,7 @@
+ else
+   with_term_driver=no
+ fi;
+-echo "$as_me:15913: result: $with_term_driver" >&5
++echo "$as_me:15916: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+ 
+@@ -15919,19 +15922,19 @@
+ EOF
+ 
+ 	if test "x$with_termlib" != xno ; then
+-		{ { echo "$as_me:15922: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:15925: 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:15927: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:15930: 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:15934: checking for extended use of const keyword" >&5
++echo "$as_me:15937: 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.
+@@ -15941,7 +15944,7 @@
+ else
+   with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:15944: result: $with_ext_const" >&5
++echo "$as_me:15947: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -15949,7 +15952,7 @@
+ fi
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:15952: checking if you want to use extended colors" >&5
++echo "$as_me:15955: 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.
+@@ -15959,12 +15962,12 @@
+ else
+   with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:15962: result: $with_ext_colors" >&5
++echo "$as_me:15965: 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:15967: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:15970: 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)
+@@ -15975,7 +15978,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:15978: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:15981: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16003,7 +16006,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:16006: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:16009: 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.
+@@ -16013,7 +16016,7 @@
+ else
+   with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:16016: result: $with_ext_mouse" >&5
++echo "$as_me:16019: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ if test "x$with_ext_mouse" = xyes ; then
+ 
+@@ -16023,7 +16026,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16026: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16029: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16040,7 +16043,7 @@
+ fi
+ 
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:16043: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:16046: 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.
+@@ -16050,7 +16053,7 @@
+ else
+   with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:16053: result: $with_ext_putwin" >&5
++echo "$as_me:16056: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+ 
+@@ -16060,7 +16063,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16063: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:16066: 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.
+@@ -16070,7 +16073,7 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:16073: result: $with_no_padding" >&5
++echo "$as_me:16076: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16078,7 +16081,7 @@
+ EOF
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:16081: checking if you want SIGWINCH handler" >&5
++echo "$as_me:16084: 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.
+@@ -16088,7 +16091,7 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:16091: result: $with_sigwinch" >&5
++echo "$as_me:16094: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ if test "x$with_sigwinch" = xyes
+ then
+@@ -16103,7 +16106,7 @@
+ fi
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:16106: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:16109: 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.
+@@ -16113,7 +16116,7 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:16116: result: $with_tcap_names" >&5
++echo "$as_me:16119: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ if test "x$with_tcap_names" = xyes; then
+@@ -16127,7 +16130,7 @@
+ 
+ ##############################################################################
+ 
+-echo "$as_me:16130: checking if you want to link with the pthread library" >&5
++echo "$as_me:16133: 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.
+@@ -16137,27 +16140,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:16140: result: $with_pthread" >&5
++echo "$as_me:16143: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:16144: checking for pthread.h" >&5
++	echo "$as_me:16147: 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 16150 "configure"
++#line 16153 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16154: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16157: \"$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:16160: \$? = $ac_status" >&5
++  echo "$as_me:16163: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16176,7 +16179,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16179: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:16182: 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
+ 
+@@ -16186,7 +16189,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:16189: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:16192: 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"
+ 
+@@ -16207,7 +16210,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16210 "configure"
++#line 16213 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16224,16 +16227,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16227: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16230: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16230: \$? = $ac_status" >&5
++  echo "$as_me:16233: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16233: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16236: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16236: \$? = $ac_status" >&5
++  echo "$as_me:16239: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -16243,7 +16246,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:16246: result: $with_pthread" >&5
++	    echo "$as_me:16249: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -16271,7 +16274,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:16274: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:16277: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -16281,13 +16284,13 @@
+ fi
+ 
+ if test "x$with_pthread" != xno; then
+-	echo "$as_me:16284: checking for pthread_kill" >&5
++	echo "$as_me:16287: 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 16290 "configure"
++#line 16293 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16318,16 +16321,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16321: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16324: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16324: \$? = $ac_status" >&5
++  echo "$as_me:16327: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16327: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16330: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16330: \$? = $ac_status" >&5
++  echo "$as_me:16333: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_pthread_kill=yes
+ else
+@@ -16337,11 +16340,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16340: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:16343: 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:16344: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:16347: 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.
+@@ -16351,7 +16354,7 @@
+ else
+   use_pthreads_eintr=no
+ fi;
+-		echo "$as_me:16354: result: $use_pthreads_eintr" >&5
++		echo "$as_me:16357: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ 		if test "x$use_pthreads_eintr" = xyes ; then
+ 
+@@ -16362,7 +16365,7 @@
+ 		fi
+ fi
+ 
+-	echo "$as_me:16365: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:16368: 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.
+@@ -16372,18 +16375,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-	echo "$as_me:16375: result: $use_weak_symbols" >&5
++	echo "$as_me:16378: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ 	if test "x$use_weak_symbols" = xyes ; then
+ 
+-echo "$as_me:16379: checking if $CC supports weak symbols" >&5
++echo "$as_me:16382: 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 16386 "configure"
++#line 16389 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16409,16 +16412,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16412: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16415: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16415: \$? = $ac_status" >&5
++  echo "$as_me:16418: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16418: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16421: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16421: \$? = $ac_status" >&5
++  echo "$as_me:16424: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -16429,7 +16432,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16432: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:16435: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ 	else
+@@ -16479,7 +16482,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:16482: checking if you want reentrant code" >&5
++echo "$as_me:16485: 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.
+@@ -16489,7 +16492,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:16492: result: $with_reentrant" >&5
++echo "$as_me:16495: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -16578,7 +16581,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16581: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16584: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16590,7 +16593,7 @@
+ 	NCURSES_SIZE_T=$cf_dft_ordinate_type
+ fi
+ 
+-echo "$as_me:16593: checking whether curses library structures should be opaque" >&5
++echo "$as_me:16596: checking whether curses library structures should be opaque" >&5
+ echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
+@@ -16612,16 +16615,16 @@
+ 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16615: result: $enable_opaque_curses" >&5
++echo "$as_me:16618: 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:16620: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:16623: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:16624: checking whether form library structures should be opaque" >&5
++echo "$as_me:16627: checking whether form library structures should be opaque" >&5
+ echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-form or --disable-opaque-form was given.
+@@ -16638,10 +16641,10 @@
+ 	enable_opaque_form=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16641: result: $enable_opaque_form" >&5
++echo "$as_me:16644: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+ 
+-echo "$as_me:16644: checking whether menu library structures should be opaque" >&5
++echo "$as_me:16647: checking whether menu library structures should be opaque" >&5
+ echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
+@@ -16658,10 +16661,10 @@
+ 	enable_opaque_menu=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16661: result: $enable_opaque_menu" >&5
++echo "$as_me:16664: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+ 
+-echo "$as_me:16664: checking whether panel library structures should be opaque" >&5
++echo "$as_me:16667: checking whether panel library structures should be opaque" >&5
+ echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
+@@ -16678,7 +16681,7 @@
+ 	enable_opaque_panel=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16681: result: $enable_opaque_panel" >&5
++echo "$as_me:16684: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+ 
+ NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -16688,7 +16691,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:16691: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:16694: 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.
+@@ -16698,7 +16701,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:16701: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:16704: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -16711,7 +16714,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:16714: checking if you want all development code" >&5
++echo "$as_me:16717: 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.
+@@ -16721,11 +16724,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:16724: result: $with_develop" >&5
++echo "$as_me:16727: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###   use option --enable-check-size to detect screensize with CPR
+-echo "$as_me:16728: checking if you want to check screensize of serial terminals" >&5
++echo "$as_me:16731: checking if you want to check screensize of serial terminals" >&5
+ echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
+ 
+ # Check whether --enable-check-size or --disable-check-size was given.
+@@ -16735,7 +16738,7 @@
+ else
+   enable_check_size=$with_develop
+ fi;
+-echo "$as_me:16738: result: $enable_check_size" >&5
++echo "$as_me:16741: result: $enable_check_size" >&5
+ echo "${ECHO_T}$enable_check_size" >&6
+ test "x$enable_check_size" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16743,7 +16746,7 @@
+ EOF
+ 
+ ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
+-echo "$as_me:16746: checking if you want hard-tabs code" >&5
++echo "$as_me:16749: 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.
+@@ -16753,7 +16756,7 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:16756: result: $enable_hard_tabs" >&5
++echo "$as_me:16759: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16761,7 +16764,7 @@
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:16764: checking if you want limited support for xmc" >&5
++echo "$as_me:16767: 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.
+@@ -16771,7 +16774,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:16774: result: $enable_xmc_glitch" >&5
++echo "$as_me:16777: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16781,7 +16784,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:16784: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:16787: 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.
+@@ -16791,7 +16794,7 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:16794: result: $with_assumed_color" >&5
++echo "$as_me:16797: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16799,7 +16802,7 @@
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:16802: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:16805: 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.
+@@ -16809,7 +16812,7 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:16812: result: $with_hashmap" >&5
++echo "$as_me:16815: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16817,7 +16820,7 @@
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:16820: checking if you want colorfgbg code" >&5
++echo "$as_me:16823: 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.
+@@ -16827,7 +16830,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:16830: result: $with_colorfgbg" >&5
++echo "$as_me:16833: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16835,7 +16838,7 @@
+ EOF
+ 
+ ###   use option --enable-fvisibility to turn on use of gcc-specific feature
+-echo "$as_me:16838: checking if you want to use gcc -fvisibility option" >&5
++echo "$as_me:16841: 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.
+@@ -16845,14 +16848,14 @@
+ else
+   cf_with_fvisibility=no
+ fi;
+-echo "$as_me:16848: result: $cf_with_fvisibility" >&5
++echo "$as_me:16851: 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:16855: checking if $CC -fvisibility=hidden option works" >&5
++echo "$as_me:16858: 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
+@@ -16861,7 +16864,7 @@
+     cf_save_cflags="$CFLAGS"
+     CFLAGS="$CFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16864 "configure"
++#line 16867 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16877,16 +16880,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16880: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16883: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16883: \$? = $ac_status" >&5
++  echo "$as_me:16886: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16886: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16889: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16889: \$? = $ac_status" >&5
++  echo "$as_me:16892: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden=yes
+ else
+@@ -16898,7 +16901,7 @@
+     CFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16901: result: $cf_cv_fvisibility_hidden" >&5
++echo "$as_me:16904: result: $cf_cv_fvisibility_hidden" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
+ 
+ 	if test "x$cf_cv_fvisibility_hidden" = xyes
+@@ -17013,7 +17016,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:17016: checking if $CXX -fvisibility=hidden option works" >&5
++echo "$as_me:17019: 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
+@@ -17022,7 +17025,7 @@
+     cf_save_cflags="$CXXFLAGS"
+     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17025 "configure"
++#line 17028 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -17038,16 +17041,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17041: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17044: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17044: \$? = $ac_status" >&5
++  echo "$as_me:17047: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17047: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17050: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17050: \$? = $ac_status" >&5
++  echo "$as_me:17053: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden2=yes
+ else
+@@ -17059,7 +17062,7 @@
+     CXXFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:17062: result: $cf_cv_fvisibility_hidden2" >&5
++echo "$as_me:17065: result: $cf_cv_fvisibility_hidden2" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
+ 
+ 		if test "x$cf_cv_fvisibility_hidden2" = xyes
+@@ -17182,7 +17185,7 @@
+ fi
+ 
+ ###   use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:17185: checking if you want interop bindings" >&5
++echo "$as_me:17188: 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.
+@@ -17192,13 +17195,13 @@
+ else
+   with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:17195: result: $with_exp_interop" >&5
++echo "$as_me:17198: 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:17201: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:17204: 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.
+@@ -17208,13 +17211,13 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:17211: result: $with_safe_sprintf" >&5
++echo "$as_me:17214: 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:17217: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:17220: 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.
+@@ -17224,7 +17227,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:17227: result: $with_scroll_hints" >&5
++echo "$as_me:17230: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -17233,7 +17236,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17236: checking if you want wgetch-events code" >&5
++echo "$as_me:17239: 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.
+@@ -17243,7 +17246,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:17246: result: $with_wgetch_events" >&5
++echo "$as_me:17249: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ if test "x$with_wgetch_events" = xyes ; then
+ 
+@@ -17258,7 +17261,7 @@
+ 
+ case "$cf_cv_system_name" in
+ (*mingw32*|*mingw64*|*-msvc*)
+-	echo "$as_me:17261: checking if you want experimental-Windows driver" >&5
++	echo "$as_me:17264: 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.
+@@ -17268,7 +17271,7 @@
+ else
+   with_exp_win32=no
+ fi;
+-	echo "$as_me:17271: result: $with_exp_win32" >&5
++	echo "$as_me:17274: result: $with_exp_win32" >&5
+ echo "${ECHO_T}$with_exp_win32" >&6
+ 	if test "x$with_exp_win32" = xyes
+ 	then
+@@ -17294,7 +17297,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:17297: checking if you want to see long compiling messages" >&5
++echo "$as_me:17300: 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.
+@@ -17328,7 +17331,7 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:17331: result: $enableval" >&5
++echo "$as_me:17334: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ if test "x$enable_echo" = xyes; then
+@@ -17341,7 +17344,7 @@
+ 
+ # --disable-stripping is used for debugging
+ 
+-echo "$as_me:17344: checking if you want to install stripped executables" >&5
++echo "$as_me:17347: 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.
+@@ -17358,7 +17361,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:17361: result: $enable_stripping" >&5
++echo "$as_me:17364: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -17369,7 +17372,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:17372: checking if install accepts -p option" >&5
++echo "$as_me:17375: 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
+@@ -17400,10 +17403,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:17403: result: $cf_cv_install_p" >&5
++echo "$as_me:17406: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:17406: checking if install needs to be told about ownership" >&5
++echo "$as_me:17409: 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)
+@@ -17414,7 +17417,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17417: result: $with_install_o" >&5
++echo "$as_me:17420: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -17425,7 +17428,7 @@
+ 
+ if test -n "$INSTALL_OPT_S"
+ then
+-	echo "$as_me:17428: checking if you want to specify strip-program" >&5
++	echo "$as_me:17431: checking if you want to specify strip-program" >&5
+ echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
+ 
+ # Check whether --with-strip-program or --without-strip-program was given.
+@@ -17435,11 +17438,11 @@
+ else
+   with_strip_program=no
+ fi;
+-	echo "$as_me:17438: result: $with_strip_program" >&5
++	echo "$as_me:17441: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ 	if test "$with_strip_program" != no
+ 	then
+-		echo "$as_me:17442: checking if strip-program is supported with this installer" >&5
++		echo "$as_me:17445: checking if strip-program is supported with this installer" >&5
+ echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
+ 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
+ 		check_install_strip=no
+@@ -17460,11 +17463,11 @@
+ 				done
+ 			fi
+ 		fi
+-		echo "$as_me:17463: result: $check_install_strip" >&5
++		echo "$as_me:17466: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ 		case "$check_install_strip" in
+ 		(no)
+-			{ echo "$as_me:17467: WARNING: $cf_install_program does not support strip program option" >&5
++			{ echo "$as_me:17470: WARNING: $cf_install_program does not support strip program option" >&5
+ echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
+ 			with_strip_program=no
+ 			;;
+@@ -17479,7 +17482,7 @@
+ 			chmod +x "$INSTALL"
+ 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
+ 
+-echo "${as_me:-configure}:17482: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:17485: testing created $INSTALL ..." 1>&5
+ 
+ 			;;
+ 		(option)
+@@ -17505,7 +17508,7 @@
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+ 
+-echo "$as_me:17508: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:17511: 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.
+@@ -17522,17 +17525,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:17525: result: $enable_stdnoreturn" >&5
++echo "$as_me:17528: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:17529: checking for C11 _Noreturn feature" >&5
++echo "$as_me:17532: 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 17535 "configure"
++#line 17538 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17548,16 +17551,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17551: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17554: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17554: \$? = $ac_status" >&5
++  echo "$as_me:17557: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17557: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17560: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17560: \$? = $ac_status" >&5
++  echo "$as_me:17563: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -17568,7 +17571,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17571: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:17574: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -17624,16 +17627,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17627: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17630: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17632: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17635: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17636: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17639: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17672,16 +17675,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17675: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17678: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17680: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17683: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17684: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17687: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17720,23 +17723,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17723: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17726: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17728: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17731: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17732: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17735: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:17739: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:17742: 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.
+@@ -17753,7 +17756,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:17756: result: $enable_warnings" >&5
++echo "$as_me:17759: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -17777,7 +17780,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17780 "configure"
++#line 17783 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17792,26 +17795,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17795: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17798: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17798: \$? = $ac_status" >&5
++  echo "$as_me:17801: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17801: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17804: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17804: \$? = $ac_status" >&5
++  echo "$as_me:17807: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:17807: checking for X11/Xt const-feature" >&5
++echo "$as_me:17810: 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 17814 "configure"
++#line 17817 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -17829,16 +17832,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17832: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17835: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17835: \$? = $ac_status" >&5
++  echo "$as_me:17838: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17838: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17841: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17841: \$? = $ac_status" >&5
++  echo "$as_me:17844: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -17853,7 +17856,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17856: result: $cf_cv_const_x_string" >&5
++echo "$as_me:17859: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -17882,7 +17885,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:17904: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -17914,12 +17917,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17917: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17920: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17920: \$? = $ac_status" >&5
++  echo "$as_me:17923: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17922: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17925: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -17927,7 +17930,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:17930: checking for $CC warning options..." >&5
++	{ echo "$as_me:17933: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -17950,12 +17953,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:17953: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17956: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17956: \$? = $ac_status" >&5
++  echo "$as_me:17959: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17958: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17961: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -17963,7 +17966,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17966: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17969: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17973,7 +17976,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17976: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17979: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -18006,10 +18009,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:18009: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:18012: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -18059,12 +18062,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:18062: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18065: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18065: \$? = $ac_status" >&5
++  echo "$as_me:18068: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18067: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:18070: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -18136,12 +18139,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:18139: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:18142: 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 18144 "configure"
++#line 18147 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18158,16 +18161,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18161: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18164: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18164: \$? = $ac_status" >&5
++  echo "$as_me:18167: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18167: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18170: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18170: \$? = $ac_status" >&5
++  echo "$as_me:18173: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -18178,7 +18181,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:18181: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:18184: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -18187,11 +18190,11 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:18190: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:18193: 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 18194 "configure"
++#line 18197 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18208,16 +18211,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18211: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18214: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18214: \$? = $ac_status" >&5
++  echo "$as_me:18217: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18217: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18220: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18220: \$? = $ac_status" >&5
++  echo "$as_me:18223: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_CPLUSPLUS=yes
+ 
+@@ -18227,7 +18230,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:18230: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:18233: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -18236,30 +18239,30 @@
+ if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:18239: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:18242: 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:18246: checking version of $CC" >&5
++	echo "$as_me:18249: 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:18250: result: $CLANG_VERSION" >&5
++	echo "$as_me:18253: 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:18257: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:18260: 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 18262 "configure"
++#line 18265 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -18273,16 +18276,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18276: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18279: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18279: \$? = $ac_status" >&5
++  echo "$as_me:18282: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18282: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18285: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18285: \$? = $ac_status" >&5
++  echo "$as_me:18288: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -18293,13 +18296,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:18296: result: $cf_clang_optok" >&5
++		echo "$as_me:18299: 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}:18302: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:18305: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -18316,7 +18319,7 @@
+ ac_main_return="return"
+ 
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:18340: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -18351,12 +18354,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:18354: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18357: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18357: \$? = $ac_status" >&5
++  echo "$as_me:18360: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18359: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18362: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -18365,7 +18368,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:18368: checking for $CXX warning options..." >&5
++	{ echo "$as_me:18371: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -18395,16 +18398,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:18398: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18401: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18401: \$? = $ac_status" >&5
++  echo "$as_me:18404: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18403: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18406: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:18407: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18410: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -18422,7 +18425,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:18425: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:18428: 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.
+@@ -18432,7 +18435,7 @@
+ else
+   enable_string_hacks=no
+ fi;
+-echo "$as_me:18435: result: $enable_string_hacks" >&5
++echo "$as_me:18438: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+ 
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -18441,15 +18444,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:18444: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:18447: 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:18446: checking for strlcat" >&5
++	echo "$as_me:18449: 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 18452 "configure"
++#line 18455 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18480,16 +18483,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18483: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18486: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18486: \$? = $ac_status" >&5
++  echo "$as_me:18489: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18489: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18492: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18492: \$? = $ac_status" >&5
++  echo "$as_me:18495: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -18499,7 +18502,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18502: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:18505: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+ 
+@@ -18509,7 +18512,7 @@
+ 
+ else
+ 
+-		echo "$as_me:18512: checking for strlcat in -lbsd" >&5
++		echo "$as_me:18515: 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
+@@ -18517,7 +18520,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18520 "configure"
++#line 18523 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18536,16 +18539,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18539: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18542: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18542: \$? = $ac_status" >&5
++  echo "$as_me:18545: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18545: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18548: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18548: \$? = $ac_status" >&5
++  echo "$as_me:18551: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -18556,7 +18559,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18559: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:18562: 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
+ 
+@@ -18579,23 +18582,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18582: checking for $ac_header" >&5
++echo "$as_me:18585: 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 18588 "configure"
++#line 18591 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18592: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18595: \"$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:18598: \$? = $ac_status" >&5
++  echo "$as_me:18601: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18614,7 +18617,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18617: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18620: 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:18641: 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 18644 "configure"
++#line 18647 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18672,16 +18675,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18675: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18678: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18678: \$? = $ac_status" >&5
++  echo "$as_me:18681: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18681: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18684: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18684: \$? = $ac_status" >&5
++  echo "$as_me:18687: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -18691,7 +18694,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18694: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:18697: 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:18710: 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.
+@@ -18714,7 +18717,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:18717: result: $with_assertions" >&5
++echo "$as_me:18720: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -18730,7 +18733,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:18733: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:18736: 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.
+@@ -18752,7 +18755,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:18755: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:18758: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18866,23 +18869,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:18869: checking for dmalloc.h" >&5
++	echo "$as_me:18872: 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 18875 "configure"
++#line 18878 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:18879: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18882: \"$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:18885: \$? = $ac_status" >&5
++  echo "$as_me:18888: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18901,11 +18904,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18904: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:18907: 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:18908: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:18911: 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
+@@ -18913,7 +18916,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18916 "configure"
++#line 18919 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18932,16 +18935,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18935: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18938: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18938: \$? = $ac_status" >&5
++  echo "$as_me:18941: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18941: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18944: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18944: \$? = $ac_status" >&5
++  echo "$as_me:18947: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -18952,7 +18955,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18955: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:18958: 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:18973: 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.
+@@ -18989,7 +18992,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:18992: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:18995: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19103,23 +19106,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:19106: checking for dbmalloc.h" >&5
++	echo "$as_me:19109: 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 19112 "configure"
++#line 19115 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:19116: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:19119: \"$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:19122: \$? = $ac_status" >&5
++  echo "$as_me:19125: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19138,11 +19141,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:19141: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:19144: 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:19145: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:19148: 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
+@@ -19150,7 +19153,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19153 "configure"
++#line 19156 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19169,16 +19172,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19172: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19175: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19175: \$? = $ac_status" >&5
++  echo "$as_me:19178: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19178: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19181: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19181: \$? = $ac_status" >&5
++  echo "$as_me:19184: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -19189,7 +19192,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19192: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:19195: 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:19210: 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.
+@@ -19226,7 +19229,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:19229: result: ${with_valgrind:-no}" >&5
++echo "$as_me:19232: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19339,7 +19342,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19342: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:19345: 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.
+@@ -19350,7 +19353,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:19353: result: $with_no_leaks" >&5
++echo "$as_me:19356: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -19402,7 +19405,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19405: checking whether to add trace feature to all models" >&5
++echo "$as_me:19408: 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.
+@@ -19412,7 +19415,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:19415: result: $cf_with_trace" >&5
++echo "$as_me:19418: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -19432,7 +19435,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:19435: checking if we want to use GNAT projects" >&5
++echo "$as_me:19438: 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.
+@@ -19449,7 +19452,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:19452: result: $enable_gnat_projects" >&5
++echo "$as_me:19455: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -19462,14 +19465,14 @@
+ 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+ 	fi
+ 
+-echo "$as_me:19465: checking if ssp library is needed" >&5
++echo "$as_me:19468: 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 19472 "configure"
++#line 19475 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -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
+   cf_cv_need_libssp=no
+ else
+@@ -19505,7 +19508,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19508 "configure"
++#line 19511 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19522,16 +19525,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19525: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19528: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19528: \$? = $ac_status" >&5
++  echo "$as_me:19531: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19531: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19534: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19534: \$? = $ac_status" >&5
++  echo "$as_me:19537: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -19545,7 +19548,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19548: result: $cf_cv_need_libssp" >&5
++echo "$as_me:19551: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -19574,14 +19577,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19577: checking if -lm needed for math functions" >&5
++echo "$as_me:19580: 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 19584 "configure"
++#line 19587 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19597,16 +19600,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19600: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19603: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19603: \$? = $ac_status" >&5
++  echo "$as_me:19606: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19606: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19609: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19609: \$? = $ac_status" >&5
++  echo "$as_me:19612: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -19616,7 +19619,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19619: result: $cf_cv_need_libm" >&5
++echo "$as_me:19622: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ 
+ if test "$cf_cv_need_libm" = yes
+@@ -19624,14 +19627,14 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lm"
+-	echo "$as_me:19627: checking if -lm is available for math functions" >&5
++	echo "$as_me:19630: checking if -lm is available for math functions" >&5
+ echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
+ if test "${cf_cv_have_libm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19634 "configure"
++#line 19637 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19647,16 +19650,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19650: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19653: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19653: \$? = $ac_status" >&5
++  echo "$as_me:19656: \$? = $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:19659: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19659: \$? = $ac_status" >&5
++  echo "$as_me:19662: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_libm=yes
+ else
+@@ -19666,7 +19669,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19669: result: $cf_cv_have_libm" >&5
++echo "$as_me:19672: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ 	LIBS="$cf_save_LIBS"
+ 
+@@ -19688,13 +19691,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:19691: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:19694: 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 19697 "configure"
++#line 19700 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -19710,16 +19713,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19713: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19716: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19716: \$? = $ac_status" >&5
++  echo "$as_me:19719: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19719: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19722: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19722: \$? = $ac_status" >&5
++  echo "$as_me:19725: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -19729,7 +19732,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19732: result: $ac_cv_header_time" >&5
++echo "$as_me:19735: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -19744,7 +19747,7 @@
+ case "$host_os" in
+ (mingw*)
+ 	# -lsystre -ltre -lintl -liconv
+-	echo "$as_me:19747: checking for regcomp in -lsystre" >&5
++	echo "$as_me:19750: 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
+@@ -19752,7 +19755,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsystre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19755 "configure"
++#line 19758 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19771,16 +19774,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19774: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19777: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19777: \$? = $ac_status" >&5
++  echo "$as_me:19780: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19780: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19783: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19783: \$? = $ac_status" >&5
++  echo "$as_me:19786: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_systre_regcomp=yes
+ else
+@@ -19791,11 +19794,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19794: result: $ac_cv_lib_systre_regcomp" >&5
++echo "$as_me:19797: 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:19798: checking for libiconv_open in -liconv" >&5
++		echo "$as_me:19801: 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
+@@ -19803,7 +19806,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19806 "configure"
++#line 19809 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19822,16 +19825,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19825: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19828: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19828: \$? = $ac_status" >&5
++  echo "$as_me:19831: \$? = $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:19834: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19834: \$? = $ac_status" >&5
++  echo "$as_me:19837: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_iconv_libiconv_open=yes
+ else
+@@ -19842,7 +19845,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19845: result: $ac_cv_lib_iconv_libiconv_open" >&5
++echo "$as_me:19848: 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
+ 
+@@ -19864,7 +19867,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19867: checking for libintl_gettext in -lintl" >&5
++		echo "$as_me:19870: 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
+@@ -19872,7 +19875,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19875 "configure"
++#line 19878 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19891,16 +19894,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19894: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19897: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19897: \$? = $ac_status" >&5
++  echo "$as_me:19900: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19900: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19903: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19903: \$? = $ac_status" >&5
++  echo "$as_me:19906: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_intl_libintl_gettext=yes
+ else
+@@ -19911,7 +19914,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19914: result: $ac_cv_lib_intl_libintl_gettext" >&5
++echo "$as_me:19917: 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
+ 
+@@ -19933,7 +19936,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19936: checking for tre_regcomp in -ltre" >&5
++		echo "$as_me:19939: 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
+@@ -19941,7 +19944,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19944 "configure"
++#line 19947 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19960,16 +19963,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19963: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19966: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19966: \$? = $ac_status" >&5
++  echo "$as_me:19969: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19969: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19972: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19972: \$? = $ac_status" >&5
++  echo "$as_me:19975: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_tre_tre_regcomp=yes
+ else
+@@ -19980,7 +19983,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19983: result: $ac_cv_lib_tre_tre_regcomp" >&5
++echo "$as_me:19986: 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
+ 
+@@ -20022,7 +20025,7 @@
+ 
+ else
+ 
+-		echo "$as_me:20025: checking for regcomp in -lgnurx" >&5
++		echo "$as_me:20028: 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
+@@ -20030,7 +20033,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgnurx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20033 "configure"
++#line 20036 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20049,16 +20052,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20052: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20055: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20055: \$? = $ac_status" >&5
++  echo "$as_me:20058: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20058: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20061: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20061: \$? = $ac_status" >&5
++  echo "$as_me:20064: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gnurx_regcomp=yes
+ else
+@@ -20069,7 +20072,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20072: result: $ac_cv_lib_gnurx_regcomp" >&5
++echo "$as_me:20075: 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
+ 
+@@ -20097,13 +20100,13 @@
+ 	;;
+ (*)
+ 	cf_regex_libs="regex re"
+-	echo "$as_me:20100: checking for regcomp" >&5
++	echo "$as_me:20103: 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 20106 "configure"
++#line 20109 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20134,16 +20137,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20137: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20140: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20140: \$? = $ac_status" >&5
++  echo "$as_me:20143: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20143: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20146: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20146: \$? = $ac_status" >&5
++  echo "$as_me:20149: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -20153,7 +20156,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20156: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:20159: 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
+@@ -20162,7 +20165,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:20165: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:20168: 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
+@@ -20170,7 +20173,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20173 "configure"
++#line 20176 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20189,16 +20192,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20192: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20195: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20195: \$? = $ac_status" >&5
++  echo "$as_me:20198: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20198: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20201: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20201: \$? = $ac_status" >&5
++  echo "$as_me:20204: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -20209,7 +20212,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20212: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:20215: 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
+ 
+@@ -20241,13 +20244,13 @@
+ esac
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:20244: checking for compile" >&5
++	echo "$as_me:20247: 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 20250 "configure"
++#line 20253 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20278,16 +20281,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20281: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20284: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20284: \$? = $ac_status" >&5
++  echo "$as_me:20287: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20287: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20290: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20290: \$? = $ac_status" >&5
++  echo "$as_me:20293: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -20297,13 +20300,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20300: result: $ac_cv_func_compile" >&5
++echo "$as_me:20303: 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:20306: checking for compile in -lgen" >&5
++		echo "$as_me:20309: 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
+@@ -20311,7 +20314,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20314 "configure"
++#line 20317 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20330,16 +20333,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20333: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20336: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20336: \$? = $ac_status" >&5
++  echo "$as_me:20339: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20339: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20342: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20342: \$? = $ac_status" >&5
++  echo "$as_me:20345: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -20350,7 +20353,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20353: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:20356: 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
+ 
+@@ -20378,11 +20381,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:20381: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:20384: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:20385: checking for regular-expression headers" >&5
++echo "$as_me:20388: 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
+@@ -20394,7 +20397,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20397 "configure"
++#line 20400 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -20411,16 +20414,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20414: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20417: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20417: \$? = $ac_status" >&5
++  echo "$as_me:20420: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20420: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20423: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20423: \$? = $ac_status" >&5
++  echo "$as_me:20426: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20437,7 +20440,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20440 "configure"
++#line 20443 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$cf_regex_hdr>
+@@ -20457,16 +20460,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20460: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20463: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20463: \$? = $ac_status" >&5
++  echo "$as_me:20466: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20466: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20469: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20469: \$? = $ac_status" >&5
++  echo "$as_me:20472: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20482,11 +20485,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:20485: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:20488: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case "$cf_cv_regex_hdrs" in
+-	(no)		{ echo "$as_me:20489: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:20492: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -20524,23 +20527,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20527: checking for $ac_header" >&5
++echo "$as_me:20530: 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 20533 "configure"
++#line 20536 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20537: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20540: \"$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:20543: \$? = $ac_status" >&5
++  echo "$as_me:20546: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20559,7 +20562,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20562: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20565: 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:20578: 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 20581 "configure"
++#line 20584 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20585: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20588: \"$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:20591: \$? = $ac_status" >&5
++  echo "$as_me:20594: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20607,7 +20610,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20610: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20613: 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:20623: 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
+@@ -20627,7 +20630,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20630 "configure"
++#line 20633 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20640,16 +20643,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20643: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20646: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20646: \$? = $ac_status" >&5
++  echo "$as_me:20649: \$? = $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:20652: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20652: \$? = $ac_status" >&5
++  echo "$as_me:20655: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -20661,7 +20664,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20664: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20667: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -20678,14 +20681,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20681: checking if external environ is declared" >&5
++echo "$as_me:20684: 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 20688 "configure"
++#line 20691 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -20698,16 +20701,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20701: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20704: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20704: \$? = $ac_status" >&5
++  echo "$as_me:20707: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20707: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20710: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20710: \$? = $ac_status" >&5
++  echo "$as_me:20713: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_environ=yes
+ else
+@@ -20718,7 +20721,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20721: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20724: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+ 
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20733,14 +20736,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:20736: checking if external environ exists" >&5
++echo "$as_me:20739: 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 20743 "configure"
++#line 20746 "configure"
+ #include "confdefs.h"
+ 
+ #undef environ
+@@ -20755,16 +20758,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20758: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20761: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20761: \$? = $ac_status" >&5
++  echo "$as_me:20764: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20764: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20767: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20767: \$? = $ac_status" >&5
++  echo "$as_me:20770: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_environ=yes
+ else
+@@ -20775,7 +20778,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20778: result: $cf_cv_have_environ" >&5
++echo "$as_me:20781: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+ 
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20788,13 +20791,13 @@
+ 
+ fi
+ 
+-echo "$as_me:20791: checking for getenv" >&5
++echo "$as_me:20794: 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 20797 "configure"
++#line 20800 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20825,16 +20828,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20828: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20831: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20831: \$? = $ac_status" >&5
++  echo "$as_me:20834: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20834: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20837: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20837: \$? = $ac_status" >&5
++  echo "$as_me:20840: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_getenv=yes
+ else
+@@ -20844,19 +20847,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20847: result: $ac_cv_func_getenv" >&5
++echo "$as_me:20850: 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:20853: checking for $ac_func" >&5
++echo "$as_me:20856: 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 20859 "configure"
++#line 20862 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20887,16 +20890,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20890: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20893: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20893: \$? = $ac_status" >&5
++  echo "$as_me:20896: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20896: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20899: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20899: \$? = $ac_status" >&5
++  echo "$as_me:20902: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -20906,7 +20909,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20909: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:20912: 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:20922: 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
+@@ -20926,7 +20929,7 @@
+   cf_cv_consistent_getenv=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20929 "configure"
++#line 20932 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21031,15 +21034,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21034: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21037: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21037: \$? = $ac_status" >&5
++  echo "$as_me:21040: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21039: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21042: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21042: \$? = $ac_status" >&5
++  echo "$as_me:21045: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_consistent_getenv=yes
+ else
+@@ -21052,7 +21055,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:21055: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:21058: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+ 
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -21067,18 +21070,18 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ 	test "x$cf_with_trace" = xyes
+ then
+-	{ echo "$as_me:21070: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++	{ echo "$as_me:21073: 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:21074: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:21077: 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 21081 "configure"
++#line 21084 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21098,16 +21101,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21101: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21104: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21104: \$? = $ac_status" >&5
++  echo "$as_me:21107: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21107: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21110: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21110: \$? = $ac_status" >&5
++  echo "$as_me:21113: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -21119,7 +21122,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21122: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:21125: 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
+@@ -21134,13 +21137,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:21137: checking for an ANSI C-conforming const" >&5
++echo "$as_me:21140: 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 21143 "configure"
++#line 21146 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21202,16 +21205,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21205: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21208: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21208: \$? = $ac_status" >&5
++  echo "$as_me:21211: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21211: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21214: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21214: \$? = $ac_status" >&5
++  echo "$as_me:21217: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -21221,7 +21224,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21224: result: $ac_cv_c_const" >&5
++echo "$as_me:21227: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -21231,7 +21234,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21234: checking for inline" >&5
++echo "$as_me:21237: 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
+@@ -21239,7 +21242,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21242 "configure"
++#line 21245 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo (void) {return 0; }
+@@ -21248,16 +21251,16 @@
+ 
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21251: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21254: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21254: \$? = $ac_status" >&5
++  echo "$as_me:21257: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21257: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21260: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21260: \$? = $ac_status" >&5
++  echo "$as_me:21263: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -21268,7 +21271,7 @@
+ done
+ 
+ fi
+-echo "$as_me:21271: result: $ac_cv_c_inline" >&5
++echo "$as_me:21274: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -21294,7 +21297,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:21297: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:21300: 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
+@@ -21303,7 +21306,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21306 "configure"
++#line 21309 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -21315,16 +21318,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21318: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21321: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21321: \$? = $ac_status" >&5
++  echo "$as_me:21324: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21324: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21327: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21327: \$? = $ac_status" >&5
++  echo "$as_me:21330: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -21336,7 +21339,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:21339: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:21342: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -21442,7 +21445,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:21445: checking for signal global datatype" >&5
++echo "$as_me:21448: 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
+@@ -21454,7 +21457,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21457 "configure"
++#line 21460 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21478,16 +21481,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21481: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21484: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21484: \$? = $ac_status" >&5
++  echo "$as_me:21487: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21487: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21490: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21490: \$? = $ac_status" >&5
++  echo "$as_me:21493: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21501,7 +21504,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21504: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21507: 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:21516: 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
+@@ -21520,7 +21523,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21523 "configure"
++#line 21526 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21555,15 +21558,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21558: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21561: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21561: \$? = $ac_status" >&5
++  echo "$as_me:21564: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21563: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21566: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21566: \$? = $ac_status" >&5
++  echo "$as_me:21569: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21578,7 +21581,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21581: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21584: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:21596: 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 21600 "configure"
++#line 21603 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21609,16 +21612,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21612: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21615: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21615: \$? = $ac_status" >&5
++  echo "$as_me:21618: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21618: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21621: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21621: \$? = $ac_status" >&5
++  echo "$as_me:21624: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -21630,7 +21633,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21633: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21636: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -21646,14 +21649,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:21649: checking if external errno is declared" >&5
++echo "$as_me:21652: 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 21656 "configure"
++#line 21659 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21667,16 +21670,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21670: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21673: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21673: \$? = $ac_status" >&5
++  echo "$as_me:21676: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21676: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21679: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21679: \$? = $ac_status" >&5
++  echo "$as_me:21682: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -21687,7 +21690,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21690: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21693: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21702,14 +21705,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:21705: checking if external errno exists" >&5
++echo "$as_me:21708: 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 21712 "configure"
++#line 21715 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -21724,16 +21727,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21727: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21730: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21730: \$? = $ac_status" >&5
++  echo "$as_me:21733: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21733: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21736: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21736: \$? = $ac_status" >&5
++  echo "$as_me:21739: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -21744,7 +21747,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21747: result: $cf_cv_have_errno" >&5
++echo "$as_me:21750: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21757,7 +21760,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21760: checking if data-only library module links" >&5
++echo "$as_me:21763: 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
+@@ -21765,20 +21768,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:21774: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21774: \$? = $ac_status" >&5
++  echo "$as_me:21777: \$? = $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:21801: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21801: \$? = $ac_status" >&5
++  echo "$as_me:21804: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -21811,7 +21814,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21814 "configure"
++#line 21817 "configure"
+ #include "confdefs.h"
+ 
+ 	extern int testfunc(void);
+@@ -21822,15 +21825,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21825: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21828: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21828: \$? = $ac_status" >&5
++  echo "$as_me:21831: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21830: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21833: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21833: \$? = $ac_status" >&5
++  echo "$as_me:21836: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -21845,7 +21848,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21848: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21851: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21860,13 +21863,13 @@
+ ###	Checks for library functions.
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:21863: checking for clock_gettime" >&5
++echo "$as_me:21866: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21869 "configure"
++#line 21872 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21897,16 +21900,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21900: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21903: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21903: \$? = $ac_status" >&5
++  echo "$as_me:21906: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21906: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21909: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21909: \$? = $ac_status" >&5
++  echo "$as_me:21912: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -21916,12 +21919,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21919: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:21922: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:21924: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:21927: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21929,7 +21932,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21932 "configure"
++#line 21935 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21948,16 +21951,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21951: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21954: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21954: \$? = $ac_status" >&5
++  echo "$as_me:21957: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21957: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21960: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21960: \$? = $ac_status" >&5
++  echo "$as_me:21963: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -21968,7 +21971,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21971: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:21974: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -21980,14 +21983,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:21983: checking if clock_gettime links" >&5
++echo "$as_me:21986: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21990 "configure"
++#line 21993 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22005,16 +22008,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22008: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22011: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22011: \$? = $ac_status" >&5
++  echo "$as_me:22014: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22014: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22017: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22017: \$? = $ac_status" >&5
++  echo "$as_me:22020: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -22025,7 +22028,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22028: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:22031: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -22039,13 +22042,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:22042: checking for gettimeofday" >&5
++echo "$as_me:22045: 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 22048 "configure"
++#line 22051 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22076,16 +22079,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22079: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22082: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22082: \$? = $ac_status" >&5
++  echo "$as_me:22085: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22085: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22088: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22088: \$? = $ac_status" >&5
++  echo "$as_me:22091: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -22095,7 +22098,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22098: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:22101: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -22105,7 +22108,7 @@
+ 
+ else
+ 
+-echo "$as_me:22108: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:22111: 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
+@@ -22113,7 +22116,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22116 "configure"
++#line 22119 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22132,16 +22135,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22135: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22138: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22138: \$? = $ac_status" >&5
++  echo "$as_me:22141: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22141: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22144: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22144: \$? = $ac_status" >&5
++  echo "$as_me:22147: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -22152,7 +22155,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22155: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:22158: 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
+ 
+@@ -22211,13 +22214,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:22214: checking for $ac_func" >&5
++echo "$as_me:22217: 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 22220 "configure"
++#line 22223 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22248,16 +22251,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22251: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22254: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22254: \$? = $ac_status" >&5
++  echo "$as_me:22257: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22257: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22260: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22260: \$? = $ac_status" >&5
++  echo "$as_me:22263: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -22267,7 +22270,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22270: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:22273: 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:22283: 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 22287 "configure"
++#line 22290 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22299,16 +22302,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22302: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22305: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22305: \$? = $ac_status" >&5
++  echo "$as_me:22308: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22308: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22311: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22311: \$? = $ac_status" >&5
++  echo "$as_me:22314: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_PATH_TTYS=yes
+ else
+@@ -22318,7 +22321,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22321: result: $cf_cv_PATH_TTYS" >&5
++echo "$as_me:22324: result: $cf_cv_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
+ 
+ if test $cf_cv_PATH_TTYS = no
+@@ -22340,7 +22343,7 @@
+ 
+ if test $cf_cv_PATH_TTYS != no
+ then
+-	echo "$as_me:22343: checking if _PATH_TTYS file exists" >&5
++	echo "$as_me:22346: 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
+@@ -22350,7 +22353,7 @@
+   cf_cv_have_PATH_TTYS=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22353 "configure"
++#line 22356 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22363,15 +22366,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22366: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22369: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22369: \$? = $ac_status" >&5
++  echo "$as_me:22372: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22371: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22374: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22374: \$? = $ac_status" >&5
++  echo "$as_me:22377: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_PATH_TTYS=yes
+ else
+@@ -22383,7 +22386,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22386: result: $cf_cv_have_PATH_TTYS" >&5
++echo "$as_me:22389: 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
+@@ -22395,14 +22398,14 @@
+ #define HAVE_PATH_TTYS 1
+ EOF
+ 
+-	echo "$as_me:22398: checking for getttynam" >&5
++	echo "$as_me:22401: 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 22405 "configure"
++#line 22408 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22414,16 +22417,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22417: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22420: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22420: \$? = $ac_status" >&5
++  echo "$as_me:22423: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22423: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22426: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22426: \$? = $ac_status" >&5
++  echo "$as_me:22429: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_getttynam=yes
+ else
+@@ -22433,7 +22436,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22436: result: $cf_cv_func_getttynam" >&5
++echo "$as_me:22439: 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
+@@ -22443,7 +22446,7 @@
+ 
+ if test "x$ac_cv_func_getopt" = xno && \
+    test "x$cf_with_progs$cf_with_tests" != xnono; then
+-	{ { echo "$as_me:22446: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:22449: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -22452,7 +22455,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:22455: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:22458: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -22465,14 +22468,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:22468: checking for terminal-capability database functions" >&5
++echo "$as_me:22471: 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 22475 "configure"
++#line 22478 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22492,16 +22495,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "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='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22501: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22504: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22504: \$? = $ac_status" >&5
++  echo "$as_me:22507: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -22512,7 +22515,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22515: result: $cf_cv_cgetent" >&5
++echo "$as_me:22518: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -22522,14 +22525,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:22525: checking if cgetent uses const parameter" >&5
++echo "$as_me:22528: 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 22532 "configure"
++#line 22535 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -22552,16 +22555,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22555: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22558: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22558: \$? = $ac_status" >&5
++  echo "$as_me:22561: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22561: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22564: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22564: \$? = $ac_status" >&5
++  echo "$as_me:22567: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -22572,7 +22575,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22575: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:22578: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -22586,14 +22589,14 @@
+ 
+ fi
+ 
+-echo "$as_me:22589: checking for isascii" >&5
++echo "$as_me:22592: 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 22596 "configure"
++#line 22599 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22605,16 +22608,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22608: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22611: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22611: \$? = $ac_status" >&5
++  echo "$as_me:22614: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22614: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22617: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22617: \$? = $ac_status" >&5
++  echo "$as_me:22620: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -22625,7 +22628,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22628: result: $cf_cv_have_isascii" >&5
++echo "$as_me:22631: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -22633,10 +22636,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:22636: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:22639: 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 22639 "configure"
++#line 22642 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22650,16 +22653,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22653: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22656: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22656: \$? = $ac_status" >&5
++  echo "$as_me:22659: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22659: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22662: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22662: \$? = $ac_status" >&5
++  echo "$as_me:22665: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=no
+ else
+@@ -22667,7 +22670,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22670 "configure"
++#line 22673 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22682,16 +22685,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22685: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22688: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22688: \$? = $ac_status" >&5
++  echo "$as_me:22691: \$? = $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:22694: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22694: \$? = $ac_status" >&5
++  echo "$as_me:22697: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=yes
+ 
+@@ -22707,11 +22710,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:22710: result: $sigact_bad" >&5
++echo "$as_me:22713: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:22714: checking if nanosleep really works" >&5
++echo "$as_me:22717: 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
+@@ -22721,7 +22724,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22724 "configure"
++#line 22727 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22747,15 +22750,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22750: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22753: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22753: \$? = $ac_status" >&5
++  echo "$as_me:22756: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22755: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22758: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22758: \$? = $ac_status" >&5
++  echo "$as_me:22761: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -22767,7 +22770,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22770: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:22773: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -22784,23 +22787,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22787: checking for $ac_header" >&5
++echo "$as_me:22790: 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 22793 "configure"
++#line 22796 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22797: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22800: \"$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:22803: \$? = $ac_status" >&5
++  echo "$as_me:22806: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22819,7 +22822,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22822: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22825: 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:22842: 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 22842 "configure"
++#line 22845 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22851,16 +22854,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22854: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22857: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22857: \$? = $ac_status" >&5
++  echo "$as_me:22860: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22860: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22863: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22863: \$? = $ac_status" >&5
++  echo "$as_me:22866: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=no
+ else
+@@ -22868,7 +22871,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22871 "configure"
++#line 22874 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22882,16 +22885,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22885: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22888: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22888: \$? = $ac_status" >&5
++  echo "$as_me:22891: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22891: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22894: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22894: \$? = $ac_status" >&5
++  echo "$as_me:22897: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=unknown
+ else
+@@ -22907,19 +22910,19 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:22910: result: $termios_bad" >&5
++	echo "$as_me:22913: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:22915: checking for tcgetattr" >&5
++echo "$as_me:22918: 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 22922 "configure"
++#line 22925 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22947,16 +22950,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22950: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22953: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22953: \$? = $ac_status" >&5
++  echo "$as_me:22956: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22956: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22959: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22959: \$? = $ac_status" >&5
++  echo "$as_me:22962: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -22966,21 +22969,21 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22969: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:22972: 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:22976: checking for vsscanf function or workaround" >&5
++echo "$as_me:22979: 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 22983 "configure"
++#line 22986 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23006,16 +23009,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23009: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23012: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23012: \$? = $ac_status" >&5
++  echo "$as_me:23015: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "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_func_vsscanf=vsscanf
+ else
+@@ -23023,7 +23026,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23026 "configure"
++#line 23029 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23045,16 +23048,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23048: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23051: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23051: \$? = $ac_status" >&5
++  echo "$as_me:23054: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23054: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23057: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23057: \$? = $ac_status" >&5
++  echo "$as_me:23060: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -23062,7 +23065,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23065 "configure"
++#line 23068 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23084,16 +23087,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23087: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23090: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23090: \$? = $ac_status" >&5
++  echo "$as_me:23093: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23093: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23096: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23096: \$? = $ac_status" >&5
++  echo "$as_me:23099: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -23108,7 +23111,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23111: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:23114: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case "$cf_cv_func_vsscanf" in
+@@ -23134,23 +23137,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:23137: checking for $ac_header" >&5
++echo "$as_me:23140: 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 23143 "configure"
++#line 23146 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23147: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23150: \"$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:23153: \$? = $ac_status" >&5
++  echo "$as_me:23156: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23169,7 +23172,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23172: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23175: 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:23185: 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
+@@ -23190,7 +23193,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23193 "configure"
++#line 23196 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23225,15 +23228,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23228: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23231: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23231: \$? = $ac_status" >&5
++  echo "$as_me:23234: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23233: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23236: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23236: \$? = $ac_status" >&5
++  echo "$as_me:23239: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -23248,16 +23251,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:23251: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:23254: 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:23254: checking for mkstemp" >&5
++	echo "$as_me:23257: 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 23260 "configure"
++#line 23263 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23288,16 +23291,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23291: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23294: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23294: \$? = $ac_status" >&5
++  echo "$as_me:23297: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23297: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23300: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23300: \$? = $ac_status" >&5
++  echo "$as_me:23303: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -23307,7 +23310,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23310: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:23313: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -23328,21 +23331,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:23331: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:23334: 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:23334: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:23337: 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:23340: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:23343: 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 23345 "configure"
++#line 23348 "configure"
+ #include "confdefs.h"
+ #include 
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -23359,15 +23362,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23362: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23365: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23365: \$? = $ac_status" >&5
++  echo "$as_me:23368: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23367: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23370: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23370: \$? = $ac_status" >&5
++  echo "$as_me:23373: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -23380,7 +23383,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:23383: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:23386: 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
+ 
+@@ -23391,13 +23394,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:23394: checking for intptr_t" >&5
++echo "$as_me:23397: 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 23400 "configure"
++#line 23403 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23412,16 +23415,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23415: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23418: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23418: \$? = $ac_status" >&5
++  echo "$as_me:23421: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23421: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23424: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23424: \$? = $ac_status" >&5
++  echo "$as_me:23427: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -23431,7 +23434,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23434: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:23437: 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
+   :
+@@ -23443,13 +23446,13 @@
+ 
+ fi
+ 
+-echo "$as_me:23446: checking for ssize_t" >&5
++echo "$as_me:23449: 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 23452 "configure"
++#line 23455 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23464,16 +23467,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23467: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23470: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23470: \$? = $ac_status" >&5
++  echo "$as_me:23473: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23473: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23476: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23476: \$? = $ac_status" >&5
++  echo "$as_me:23479: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -23483,7 +23486,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23486: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:23489: 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
+   :
+@@ -23495,14 +23498,14 @@
+ 
+ fi
+ 
+-echo "$as_me:23498: checking for type sigaction_t" >&5
++echo "$as_me:23501: 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 23505 "configure"
++#line 23508 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23515,16 +23518,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23518: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23521: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23521: \$? = $ac_status" >&5
++  echo "$as_me:23524: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23524: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23527: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23527: \$? = $ac_status" >&5
++  echo "$as_me:23530: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -23535,14 +23538,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:23538: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:23541: 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:23545: checking declaration of size-change" >&5
++echo "$as_me:23548: 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
+@@ -23563,7 +23566,7 @@
+ 
+ 	fi
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23566 "configure"
++#line 23569 "configure"
+ #include "confdefs.h"
+ #include 
+ #ifdef HAVE_TERMIOS_H
+@@ -23613,16 +23616,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23616: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23619: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23619: \$? = $ac_status" >&5
++  echo "$as_me:23622: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23622: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23625: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23625: \$? = $ac_status" >&5
++  echo "$as_me:23628: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -23641,7 +23644,7 @@
+ done
+ 
+ fi
+-echo "$as_me:23644: result: $cf_cv_sizechange" >&5
++echo "$as_me:23647: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -23659,13 +23662,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:23662: checking for memmove" >&5
++echo "$as_me:23665: 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 23668 "configure"
++#line 23671 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23696,16 +23699,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23699: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23702: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23702: \$? = $ac_status" >&5
++  echo "$as_me:23705: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23705: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23708: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23708: \$? = $ac_status" >&5
++  echo "$as_me:23711: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -23715,19 +23718,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23718: result: $ac_cv_func_memmove" >&5
++echo "$as_me:23721: 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:23724: checking for bcopy" >&5
++echo "$as_me:23727: 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 23730 "configure"
++#line 23733 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23758,16 +23761,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23761: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23764: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23764: \$? = $ac_status" >&5
++  echo "$as_me:23767: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23767: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23770: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23770: \$? = $ac_status" >&5
++  echo "$as_me:23773: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -23777,11 +23780,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23780: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:23783: 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:23784: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:23787: 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
+@@ -23791,7 +23794,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23794 "configure"
++#line 23797 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23807,15 +23810,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23810: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23813: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23813: \$? = $ac_status" >&5
++  echo "$as_me:23816: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23815: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23818: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23818: \$? = $ac_status" >&5
++  echo "$as_me:23821: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -23828,7 +23831,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:23831: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:23834: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -23855,13 +23858,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23858: checking for $ac_func" >&5
++echo "$as_me:23861: 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 23864 "configure"
++#line 23867 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23892,16 +23895,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23895: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23898: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23898: \$? = $ac_status" >&5
++  echo "$as_me:23901: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23901: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23904: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23904: \$? = $ac_status" >&5
++  echo "$as_me:23907: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23911,7 +23914,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23914: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23917: 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:23927: 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
+@@ -23931,7 +23934,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23934 "configure"
++#line 23937 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23984,15 +23987,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23987: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23990: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23990: \$? = $ac_status" >&5
++  echo "$as_me:23993: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23992: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23995: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23995: \$? = $ac_status" >&5
++  echo "$as_me:23998: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -24004,21 +24007,21 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24007: result: $cf_cv_working_poll" >&5
++echo "$as_me:24010: 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:24014: checking if MB_LEN_MAX is usable" >&5
++echo "$as_me:24017: checking if MB_LEN_MAX is usable" >&5
+ echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
+ if test "${cf_cv_mb_len_max+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24021 "configure"
++#line 24024 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24038,16 +24041,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24041: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24044: \"$ac_compile\"") >&5
+   (eval $ac_compile) 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_objext"'
+-  { (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
+   cf_cv_mb_len_max=yes
+ else
+@@ -24057,7 +24060,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24060: result: $cf_cv_mb_len_max" >&5
++echo "$as_me:24063: result: $cf_cv_mb_len_max" >&5
+ echo "${ECHO_T}$cf_cv_mb_len_max" >&6
+ if test "$cf_cv_mb_len_max" = yes
+ then
+@@ -24067,18 +24070,18 @@
+ EOF
+ 
+ else
+-	{ echo "$as_me:24070: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
++	{ echo "$as_me:24073: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+ echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
+ fi
+ 
+-echo "$as_me:24074: checking for va_copy" >&5
++echo "$as_me:24077: 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 24081 "configure"
++#line 24084 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24095,16 +24098,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24098: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24101: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24101: \$? = $ac_status" >&5
++  echo "$as_me:24104: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24104: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24107: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24107: \$? = $ac_status" >&5
++  echo "$as_me:24110: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -24114,7 +24117,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24117: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:24120: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -24126,14 +24129,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:24129: checking for __va_copy" >&5
++echo "$as_me:24132: 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 24136 "configure"
++#line 24139 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24150,16 +24153,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24153: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24156: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24156: \$? = $ac_status" >&5
++  echo "$as_me:24159: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24159: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24162: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24162: \$? = $ac_status" >&5
++  echo "$as_me:24165: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -24169,7 +24172,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24172: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:24175: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -24181,14 +24184,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:24184: checking for __builtin_va_copy" >&5
++echo "$as_me:24187: 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 24191 "configure"
++#line 24194 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24205,16 +24208,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24208: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24211: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24211: \$? = $ac_status" >&5
++  echo "$as_me:24214: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24214: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24217: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24217: \$? = $ac_status" >&5
++  echo "$as_me:24220: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -24224,7 +24227,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24227: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:24230: 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 &&
+@@ -24242,14 +24245,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:24245: checking if we can simply copy va_list" >&5
++	echo "$as_me:24248: 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 24252 "configure"
++#line 24255 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24266,16 +24269,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24269: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24272: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24272: \$? = $ac_status" >&5
++  echo "$as_me:24275: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24275: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24278: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24278: \$? = $ac_status" >&5
++  echo "$as_me:24281: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -24285,19 +24288,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24288: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:24291: 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:24293: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:24296: 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 24300 "configure"
++#line 24303 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24314,16 +24317,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24317: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24320: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24320: \$? = $ac_status" >&5
++  echo "$as_me:24323: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24323: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24326: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24326: \$? = $ac_status" >&5
++  echo "$as_me:24329: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -24333,7 +24336,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24336: result: $cf_cv_array_va_list" >&5
++echo "$as_me:24339: 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
+@@ -24344,13 +24347,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:24347: checking for pid_t" >&5
++echo "$as_me:24350: 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 24353 "configure"
++#line 24356 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24365,16 +24368,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24368: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24371: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24371: \$? = $ac_status" >&5
++  echo "$as_me:24374: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24374: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24377: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24377: \$? = $ac_status" >&5
++  echo "$as_me:24380: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -24384,7 +24387,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24387: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:24390: 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
+   :
+@@ -24399,23 +24402,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:24402: checking for $ac_header" >&5
++echo "$as_me:24405: 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 24408 "configure"
++#line 24411 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:24412: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:24415: \"$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:24418: \$? = $ac_status" >&5
++  echo "$as_me:24421: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -24434,7 +24437,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24437: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:24440: 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:24453: 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 24456 "configure"
++#line 24459 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -24484,16 +24487,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24487: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24490: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24490: \$? = $ac_status" >&5
++  echo "$as_me:24493: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24493: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24496: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24496: \$? = $ac_status" >&5
++  echo "$as_me:24499: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -24503,7 +24506,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24506: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:24509: 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:24521: 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
+@@ -24538,15 +24541,15 @@
+       }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24541: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24544: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24544: \$? = $ac_status" >&5
++  echo "$as_me:24547: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24546: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24549: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24549: \$? = $ac_status" >&5
++  echo "$as_me:24552: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -24558,7 +24561,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24561: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:24564: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -24572,12 +24575,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:24575: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24578: 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:24580: checking for working vfork" >&5
++  echo "$as_me:24583: 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
+@@ -24586,7 +24589,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24589 "configure"
++#line 24592 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include 
+@@ -24679,15 +24682,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24682: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24685: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24685: \$? = $ac_status" >&5
++  echo "$as_me:24688: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24687: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24690: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24690: \$? = $ac_status" >&5
++  echo "$as_me:24693: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -24699,13 +24702,13 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24702: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:24705: 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:24708: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24711: 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
+ 
+@@ -24730,7 +24733,7 @@
+ 
+ fi
+ 
+-echo "$as_me:24733: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:24736: 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
+@@ -24740,7 +24743,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24743 "configure"
++#line 24746 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24775,15 +24778,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24778: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24781: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24781: \$? = $ac_status" >&5
++  echo "$as_me:24784: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24783: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24786: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24786: \$? = $ac_status" >&5
++  echo "$as_me:24789: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fopen_bin_r=yes
+ else
+@@ -24796,7 +24799,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:24799: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:24802: 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
+@@ -24805,7 +24808,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:24808: checking for openpty in -lutil" >&5
++echo "$as_me:24811: 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
+@@ -24813,7 +24816,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24816 "configure"
++#line 24819 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -24832,16 +24835,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24835: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24838: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24838: \$? = $ac_status" >&5
++  echo "$as_me:24841: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24841: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24844: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24844: \$? = $ac_status" >&5
++  echo "$as_me:24847: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -24852,7 +24855,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:24855: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:24858: 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
+@@ -24860,7 +24863,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:24863: checking for openpty header" >&5
++echo "$as_me:24866: 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
+@@ -24887,7 +24890,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24890 "configure"
++#line 24893 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -24905,16 +24908,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24908: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24911: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24911: \$? = $ac_status" >&5
++  echo "$as_me:24914: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24914: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24917: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24917: \$? = $ac_status" >&5
++  echo "$as_me:24920: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -24932,7 +24935,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:24935: result: $cf_cv_func_openpty" >&5
++echo "$as_me:24938: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -25005,7 +25008,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25008 "configure"
++#line 25011 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -25017,16 +25020,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25020: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25023: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25023: \$? = $ac_status" >&5
++  echo "$as_me:25026: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25026: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25029: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25029: \$? = $ac_status" >&5
++  echo "$as_me:25032: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25043,7 +25046,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}:25046: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25049: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25079,7 +25082,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}:25082: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25085: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25090,7 +25093,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:25093: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:25096: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -25162,7 +25165,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25165 "configure"
++#line 25168 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -25174,16 +25177,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25177: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25180: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25180: \$? = $ac_status" >&5
++  echo "$as_me:25183: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25183: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25186: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25186: \$? = $ac_status" >&5
++  echo "$as_me:25189: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25200,7 +25203,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}:25203: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25206: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25280,7 +25283,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}:25283: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25286: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25297,23 +25300,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:25300: checking for db.h" >&5
++echo "$as_me:25303: 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 25306 "configure"
++#line 25309 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:25310: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25313: \"$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:25316: \$? = $ac_status" >&5
++  echo "$as_me:25319: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -25332,11 +25335,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25335: result: $ac_cv_header_db_h" >&5
++echo "$as_me:25338: 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:25339: checking for version of db" >&5
++echo "$as_me:25342: 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
+@@ -25347,10 +25350,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:25350: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:25353: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25353 "configure"
++#line 25356 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25380,16 +25383,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25383: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25386: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25386: \$? = $ac_status" >&5
++  echo "$as_me:25389: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25389: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25392: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25392: \$? = $ac_status" >&5
++  echo "$as_me:25395: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -25403,16 +25406,16 @@
+ done
+ 
+ fi
+-echo "$as_me:25406: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:25409: 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:25410: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:25413: 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:25415: checking for db libraries" >&5
++echo "$as_me:25418: 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
+@@ -25442,10 +25445,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:25445: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:25448: testing checking for library $cf_db_libs ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25448 "configure"
++#line 25451 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25500,16 +25503,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25503: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25506: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25506: \$? = $ac_status" >&5
++  echo "$as_me:25509: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25509: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25512: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25512: \$? = $ac_status" >&5
++  echo "$as_me:25515: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -25529,11 +25532,11 @@
+ done
+ 
+ fi
+-echo "$as_me:25532: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:25535: 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:25536: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:25539: 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
+@@ -25559,7 +25562,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:25562: error: Cannot find db.h" >&5
++	{ { echo "$as_me:25565: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -25574,7 +25577,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:25577: checking if we should include stdbool.h" >&5
++echo "$as_me:25580: 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
+@@ -25582,7 +25585,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25585 "configure"
++#line 25588 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -25594,23 +25597,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25597: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25600: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25600: \$? = $ac_status" >&5
++  echo "$as_me:25603: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25603: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25606: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25606: \$? = $ac_status" >&5
++  echo "$as_me:25609: \$? = $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 25613 "configure"
++#line 25616 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -25626,16 +25629,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25629: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25632: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25632: \$? = $ac_status" >&5
++  echo "$as_me:25635: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25635: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25638: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25638: \$? = $ac_status" >&5
++  echo "$as_me:25641: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -25649,13 +25652,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:25652: result: yes" >&5
++then	echo "$as_me:25655: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25654: result: no" >&5
++else	echo "$as_me:25657: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:25658: checking for builtin bool type" >&5
++echo "$as_me:25661: 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
+@@ -25663,7 +25666,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25666 "configure"
++#line 25669 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25678,16 +25681,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25681: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25684: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25684: \$? = $ac_status" >&5
++  echo "$as_me:25687: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25687: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25690: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25690: \$? = $ac_status" >&5
++  echo "$as_me:25693: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -25700,9 +25703,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:25703: result: yes" >&5
++then	echo "$as_me:25706: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25705: result: no" >&5
++else	echo "$as_me:25708: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -25719,10 +25722,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:25722: checking if we already have C++ library" >&5
++	echo "$as_me:25725: 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 25725 "configure"
++#line 25728 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -25736,16 +25739,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25739: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25742: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25742: \$? = $ac_status" >&5
++  echo "$as_me:25745: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25745: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25748: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25748: \$? = $ac_status" >&5
++  echo "$as_me:25751: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -25754,7 +25757,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-	echo "$as_me:25757: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:25760: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -25773,7 +25776,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:25776: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:25779: 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
+@@ -25799,7 +25802,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25802 "configure"
++#line 25805 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -25813,16 +25816,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25816: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25819: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25819: \$? = $ac_status" >&5
++  echo "$as_me:25822: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25822: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25825: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25825: \$? = $ac_status" >&5
++  echo "$as_me:25828: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -25834,7 +25837,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:25837: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:25840: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -25856,7 +25859,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:25859: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:25862: 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
+@@ -25871,15 +25874,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:25874: \"$ac_try\"") >&5
++if { (eval echo "$as_me:25877: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25877: \$? = $ac_status" >&5
++  echo "$as_me:25880: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25879: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:25882: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25882: \$? = $ac_status" >&5
++  echo "$as_me:25885: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -25890,10 +25893,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+-  echo "$as_me:25893: result: yes" >&5
++  echo "$as_me:25896: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:25896: result: no" >&5
++  echo "$as_me:25899: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -25913,7 +25916,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:25916: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:25919: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -25934,7 +25937,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25937 "configure"
++#line 25940 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -25948,16 +25951,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25951: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25954: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25954: \$? = $ac_status" >&5
++  echo "$as_me:25957: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25957: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25960: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25960: \$? = $ac_status" >&5
++  echo "$as_me:25963: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -25994,7 +25997,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25997 "configure"
++#line 26000 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26008,16 +26011,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26011: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26014: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26014: \$? = $ac_status" >&5
++  echo "$as_me:26017: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26017: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26020: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26020: \$? = $ac_status" >&5
++  echo "$as_me:26023: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -26050,7 +26053,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	LIBS="$cf_save"
+-	echo "$as_me:26053: result: $cf_cxx_library" >&5
++	echo "$as_me:26056: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -26066,7 +26069,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:26069: checking how to run the C++ preprocessor" >&5
++echo "$as_me:26072: 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
+@@ -26083,18 +26086,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 26086 "configure"
++#line 26089 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26091: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26094: \"$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:26097: \$? = $ac_status" >&5
++  echo "$as_me:26100: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26117,17 +26120,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26120 "configure"
++#line 26123 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26124: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26127: \"$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:26130: \$? = $ac_status" >&5
++  echo "$as_me:26133: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26164,7 +26167,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:26167: result: $CXXCPP" >&5
++echo "$as_me:26170: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -26174,18 +26177,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 26177 "configure"
++#line 26180 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26182: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26185: \"$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:26188: \$? = $ac_status" >&5
++  echo "$as_me:26191: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26208,17 +26211,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26211 "configure"
++#line 26214 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26215: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26218: \"$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:26221: \$? = $ac_status" >&5
++  echo "$as_me:26224: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26246,7 +26249,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:26249: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:26252: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -26261,23 +26264,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:26264: checking for $ac_header" >&5
++echo "$as_me:26267: 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 26270 "configure"
++#line 26273 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26274: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26277: \"$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:26280: \$? = $ac_status" >&5
++  echo "$as_me:26283: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26296,7 +26299,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26299: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26302: 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:26315: 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 26318 "configure"
++#line 26321 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26322: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26325: \"$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:26328: \$? = $ac_status" >&5
++  echo "$as_me:26331: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26344,7 +26347,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26347: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26350: 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:26361: 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 26361 "configure"
++#line 26364 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26375,16 +26378,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26378: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26381: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26381: \$? = $ac_status" >&5
++  echo "$as_me:26384: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26384: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26387: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26387: \$? = $ac_status" >&5
++  echo "$as_me:26390: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -26393,7 +26396,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:26396: result: $cf_iostream_namespace" >&5
++	echo "$as_me:26399: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -26404,7 +26407,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:26407: checking if we should include stdbool.h" >&5
++echo "$as_me:26410: 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
+@@ -26412,7 +26415,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26415 "configure"
++#line 26418 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -26424,23 +26427,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26427: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26430: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26430: \$? = $ac_status" >&5
++  echo "$as_me:26433: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26433: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26436: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26436: \$? = $ac_status" >&5
++  echo "$as_me:26439: \$? = $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 26443 "configure"
++#line 26446 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -26456,16 +26459,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26459: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26462: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26462: \$? = $ac_status" >&5
++  echo "$as_me:26465: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26465: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26468: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26468: \$? = $ac_status" >&5
++  echo "$as_me:26471: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -26479,13 +26482,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:26482: result: yes" >&5
++then	echo "$as_me:26485: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:26484: result: no" >&5
++else	echo "$as_me:26487: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:26488: checking for builtin bool type" >&5
++echo "$as_me:26491: 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
+@@ -26493,7 +26496,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26496 "configure"
++#line 26499 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26508,16 +26511,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26511: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26514: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26514: \$? = $ac_status" >&5
++  echo "$as_me:26517: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26517: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26520: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26520: \$? = $ac_status" >&5
++  echo "$as_me:26523: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -26530,19 +26533,19 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:26533: result: yes" >&5
++then	echo "$as_me:26536: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:26535: result: no" >&5
++else	echo "$as_me:26538: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:26539: checking for bool" >&5
++echo "$as_me:26542: 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 26545 "configure"
++#line 26548 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26577,16 +26580,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26580: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26583: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26583: \$? = $ac_status" >&5
++  echo "$as_me:26586: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26586: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26589: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26589: \$? = $ac_status" >&5
++  echo "$as_me:26592: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -26596,10 +26599,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26599: result: $ac_cv_type_bool" >&5
++echo "$as_me:26602: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:26602: checking size of bool" >&5
++echo "$as_me:26605: 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
+@@ -26608,7 +26611,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26611 "configure"
++#line 26614 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26640,21 +26643,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26643: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26646: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26646: \$? = $ac_status" >&5
++  echo "$as_me:26649: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26649: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26652: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26652: \$? = $ac_status" >&5
++  echo "$as_me:26655: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26657 "configure"
++#line 26660 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26686,16 +26689,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26689: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26692: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26692: \$? = $ac_status" >&5
++  echo "$as_me:26695: \$? = $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:26698: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26698: \$? = $ac_status" >&5
++  echo "$as_me:26701: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -26711,7 +26714,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26714 "configure"
++#line 26717 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26743,16 +26746,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26746: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26749: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26749: \$? = $ac_status" >&5
++  echo "$as_me:26752: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26752: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26755: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26755: \$? = $ac_status" >&5
++  echo "$as_me:26758: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -26768,7 +26771,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 26771 "configure"
++#line 26774 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26800,16 +26803,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26803: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26806: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26806: \$? = $ac_status" >&5
++  echo "$as_me:26809: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26809: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26812: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26812: \$? = $ac_status" >&5
++  echo "$as_me:26815: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -26822,12 +26825,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:26825: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:26828: 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 26830 "configure"
++#line 26833 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26863,15 +26866,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26866: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26869: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26869: \$? = $ac_status" >&5
++  echo "$as_me:26872: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26871: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26874: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26874: \$? = $ac_status" >&5
++  echo "$as_me:26877: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -26887,13 +26890,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:26890: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:26893: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:26899: 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
+@@ -26912,7 +26915,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26915 "configure"
++#line 26918 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26953,15 +26956,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26956: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26959: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26959: \$? = $ac_status" >&5
++  echo "$as_me:26962: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26961: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26964: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26964: \$? = $ac_status" >&5
++  echo "$as_me:26967: \$? = $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
+@@ -26978,19 +26981,19 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:26981: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:26984: 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:26988: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:26991: 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:26993: checking for special defines needed for etip.h" >&5
++echo "$as_me:26996: 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"
+@@ -27008,7 +27011,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 27011 "configure"
++#line 27014 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -27022,16 +27025,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27025: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27028: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27028: \$? = $ac_status" >&5
++  echo "$as_me:27031: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27031: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27034: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27034: \$? = $ac_status" >&5
++  echo "$as_me:27037: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:27058: result: ${cf_result:-(none)}" >&5
+ echo "${ECHO_T}${cf_result:-(none)}" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27060: checking if $CXX accepts override keyword" >&5
++echo "$as_me:27063: checking if $CXX accepts override keyword" >&5
+ echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
+ if test "${cf_cv_cpp_override+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27074,7 +27077,7 @@
+   cf_cv_cpp_override=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27077 "configure"
++#line 27080 "configure"
+ #include "confdefs.h"
+ 
+ class base
+@@ -27093,15 +27096,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27096: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27099: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27099: \$? = $ac_status" >&5
++  echo "$as_me:27102: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27101: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27104: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27104: \$? = $ac_status" >&5
++  echo "$as_me:27107: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_override=yes
+ else
+@@ -27120,7 +27123,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27123: result: $cf_cv_cpp_override" >&5
++echo "$as_me:27126: result: $cf_cv_cpp_override" >&5
+ echo "${ECHO_T}$cf_cv_cpp_override" >&6
+ fi
+ test "$cf_cv_cpp_override" = yes &&
+@@ -27129,7 +27132,7 @@
+ EOF
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27132: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:27135: 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
+@@ -27146,7 +27149,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27149 "configure"
++#line 27152 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -27165,15 +27168,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27168: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27171: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27171: \$? = $ac_status" >&5
++  echo "$as_me:27174: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27173: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27176: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27176: \$? = $ac_status" >&5
++  echo "$as_me:27179: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -27192,7 +27195,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27195: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:27198: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -27202,7 +27205,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:27205: checking if $CXX accepts static_cast" >&5
++echo "$as_me:27208: 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
+@@ -27216,7 +27219,7 @@
+ ac_main_return="return"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27219 "configure"
++#line 27222 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -27260,16 +27263,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27263: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27266: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27266: \$? = $ac_status" >&5
++  echo "$as_me:27269: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27269: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27272: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27272: \$? = $ac_status" >&5
++  echo "$as_me:27275: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -27287,7 +27290,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27290: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:27293: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -27336,13 +27339,13 @@
+ 	else
+ 		if test "$cf_cv_header_stdbool_h" = 1 ; then
+ 
+-echo "$as_me:27339: checking for bool" >&5
++echo "$as_me:27342: 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 27345 "configure"
++#line 27348 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27377,16 +27380,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27380: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27383: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27383: \$? = $ac_status" >&5
++  echo "$as_me:27386: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27386: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27389: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27389: \$? = $ac_status" >&5
++  echo "$as_me:27392: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -27396,10 +27399,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27399: result: $ac_cv_type_bool" >&5
++echo "$as_me:27402: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:27402: checking size of bool" >&5
++echo "$as_me:27405: 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
+@@ -27408,7 +27411,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27411 "configure"
++#line 27414 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27440,21 +27443,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27443: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27446: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27446: \$? = $ac_status" >&5
++  echo "$as_me:27449: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27449: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27452: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27452: \$? = $ac_status" >&5
++  echo "$as_me:27455: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27457 "configure"
++#line 27460 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27486,16 +27489,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27489: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27492: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27492: \$? = $ac_status" >&5
++  echo "$as_me:27495: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27495: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27498: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27498: \$? = $ac_status" >&5
++  echo "$as_me:27501: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -27511,7 +27514,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27514 "configure"
++#line 27517 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27543,16 +27546,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27546: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27549: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27549: \$? = $ac_status" >&5
++  echo "$as_me:27552: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27552: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27555: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27555: \$? = $ac_status" >&5
++  echo "$as_me:27558: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27568,7 +27571,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 27571 "configure"
++#line 27574 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27600,16 +27603,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27603: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27606: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27606: \$? = $ac_status" >&5
++  echo "$as_me:27609: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27609: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27612: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27612: \$? = $ac_status" >&5
++  echo "$as_me:27615: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27622,12 +27625,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27625: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27628: 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 27630 "configure"
++#line 27633 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27663,15 +27666,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27666: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27669: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27669: \$? = $ac_status" >&5
++  echo "$as_me:27672: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27671: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27674: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27674: \$? = $ac_status" >&5
++  echo "$as_me:27677: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27687,13 +27690,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27690: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27693: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27699: 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
+@@ -27712,7 +27715,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27715 "configure"
++#line 27718 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27753,15 +27756,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27756: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27759: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27759: \$? = $ac_status" >&5
++  echo "$as_me:27762: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27761: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27764: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27764: \$? = $ac_status" >&5
++  echo "$as_me:27767: \$? = $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
+@@ -27778,26 +27781,26 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:27781: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:27784: 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:27788: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:27791: 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:27794: checking for fallback type of bool" >&5
++			echo "$as_me:27797: 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:27800: result: $cf_cv_type_of_bool" >&5
++			echo "$as_me:27803: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 		fi
+ 	fi
+@@ -27826,7 +27829,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:27829: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:27832: 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
+@@ -27837,7 +27840,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:27840: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:27843: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -27854,10 +27857,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:27857: result: $ADAFLAGS" >&5
++	echo "$as_me:27860: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:27860: checking if GNATPREP supports -T option" >&5
++echo "$as_me:27863: 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
+@@ -27867,11 +27870,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:27870: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:27873: 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:27874: checking if GNAT supports generics" >&5
++echo "$as_me:27877: 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])
+@@ -27881,7 +27884,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:27884: result: $cf_gnat_generics" >&5
++echo "$as_me:27887: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -27893,7 +27896,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:27896: checking if GNAT supports SIGINT" >&5
++echo "$as_me:27899: 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
+@@ -27941,7 +27944,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:27944: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:27947: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -27954,7 +27957,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:27957: checking if GNAT supports project files" >&5
++echo "$as_me:27960: 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]*)
+@@ -28017,15 +28020,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:28020: result: $cf_gnat_projects" >&5
++echo "$as_me:28023: 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:28026: checking if GNAT supports libraries" >&5
++	echo "$as_me:28029: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:28028: result: $cf_gnat_libraries" >&5
++	echo "$as_me:28031: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -28045,7 +28048,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:28048: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:28051: 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
+@@ -28057,7 +28060,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:28060: checking for Ada95 compiler" >&5
++echo "$as_me:28063: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -28068,12 +28071,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:28071: result: $cf_ada_compiler" >&5
++echo "$as_me:28074: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:28076: checking for Ada95 include directory" >&5
++echo "$as_me:28079: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -28107,7 +28110,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28110: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28113: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28116,10 +28119,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:28119: result: $ADA_INCLUDE" >&5
++echo "$as_me:28122: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:28122: checking for Ada95 object directory" >&5
++echo "$as_me:28125: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -28153,7 +28156,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28156: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28159: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28162,10 +28165,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:28165: result: $ADA_OBJECTS" >&5
++echo "$as_me:28168: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:28168: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:28171: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -28186,11 +28189,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:28189: result: $with_ada_sharedlib" >&5
++echo "$as_me:28192: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+-	{ echo "$as_me:28193: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++	{ echo "$as_me:28196: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+ 
+@@ -28208,7 +28211,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:28211: checking for Ada95 curses library name" >&5
++echo "$as_me:28214: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -28224,7 +28227,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28227: result: $ADA_LIBNAME" >&5
++echo "$as_me:28230: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -28235,13 +28238,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:28238: checking for wchar_t" >&5
++	echo "$as_me:28241: 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 28244 "configure"
++#line 28247 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28256,16 +28259,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28259: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28262: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28262: \$? = $ac_status" >&5
++  echo "$as_me:28265: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28265: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28268: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28268: \$? = $ac_status" >&5
++  echo "$as_me:28271: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -28275,10 +28278,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:28278: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:28281: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:28281: checking size of wchar_t" >&5
++echo "$as_me:28284: 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
+@@ -28287,7 +28290,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28290 "configure"
++#line 28293 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28299,21 +28302,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28302: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28305: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28305: \$? = $ac_status" >&5
++  echo "$as_me:28308: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28308: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28311: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28311: \$? = $ac_status" >&5
++  echo "$as_me:28314: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28316 "configure"
++#line 28319 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28325,16 +28328,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28328: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28331: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28331: \$? = $ac_status" >&5
++  echo "$as_me:28334: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28334: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28337: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28337: \$? = $ac_status" >&5
++  echo "$as_me:28340: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -28350,7 +28353,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28353 "configure"
++#line 28356 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28362,16 +28365,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28365: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28368: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28368: \$? = $ac_status" >&5
++  echo "$as_me:28371: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28371: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28374: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28374: \$? = $ac_status" >&5
++  echo "$as_me:28377: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -28387,7 +28390,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 28390 "configure"
++#line 28393 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28399,16 +28402,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28402: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28405: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28405: \$? = $ac_status" >&5
++  echo "$as_me:28408: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28408: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28411: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28411: \$? = $ac_status" >&5
++  echo "$as_me:28414: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -28421,12 +28424,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:28424: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:28427: 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 28429 "configure"
++#line 28432 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28442,15 +28445,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:28445: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28448: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28448: \$? = $ac_status" >&5
++  echo "$as_me:28451: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:28450: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28453: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28453: \$? = $ac_status" >&5
++  echo "$as_me:28456: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -28466,7 +28469,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:28469: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:28472: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&6
+ 
+-echo "${as_me:-configure}:28482: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:28485: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -28497,7 +28500,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:28500: checking for library subsets" >&5
++echo "$as_me:28503: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -28551,7 +28554,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:28554: result: $LIB_SUBSETS" >&5
++echo "$as_me:28557: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -28582,7 +28585,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:28585: checking default library suffix" >&5
++echo "$as_me:28588: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28593,10 +28596,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:28596: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:28599: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:28599: checking default library-dependency suffix" >&5
++echo "$as_me:28602: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -28679,10 +28682,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:28682: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28685: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:28685: checking default object directory" >&5
++echo "$as_me:28688: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28698,11 +28701,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:28701: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28704: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28705: checking c++ library-dependency suffix" >&5
++echo "$as_me:28708: 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++)
+@@ -28795,7 +28798,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:28798: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:28801: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -28971,19 +28974,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:28974: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:28977: 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:28983: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:28986: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28986: \$? = $ac_status" >&5
++  echo "$as_me:28989: \$? = $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
+@@ -28994,10 +28997,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28997 "configure"
++#line 29000 "configure"
+ #include "confdefs.h"
+ 
+-#line 29000 "configure"
++#line 29003 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -29012,16 +29015,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:29015: \"$ac_link\"") >&5
++if { (eval echo "$as_me:29018: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:29018: \$? = $ac_status" >&5
++  echo "$as_me:29021: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:29021: \"$ac_try\"") >&5
++  { (eval echo "$as_me:29024: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:29024: \$? = $ac_status" >&5
++  echo "$as_me:29027: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -29044,7 +29047,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:29047: result: $cf_ldflags_static" >&5
++	echo "$as_me:29050: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test "$cf_ldflags_static" != yes
+@@ -29060,7 +29063,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29063: checking where we will install curses.h" >&5
++echo "$as_me:29066: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -29070,7 +29073,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:29073: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:29076: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -29078,7 +29081,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:29081: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:29084: 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
+@@ -29103,7 +29106,7 @@
+ 
+ # pkgsrc uses these
+ 
+-echo "$as_me:29106: checking for desired basename for form library" >&5
++echo "$as_me:29109: 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.
+@@ -29123,10 +29126,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29126: result: $FORM_NAME" >&5
++echo "$as_me:29129: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:29129: checking for desired basename for menu library" >&5
++echo "$as_me:29132: 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.
+@@ -29146,10 +29149,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29149: result: $MENU_NAME" >&5
++echo "$as_me:29152: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:29152: checking for desired basename for panel library" >&5
++echo "$as_me:29155: 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.
+@@ -29169,10 +29172,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29172: result: $PANEL_NAME" >&5
++echo "$as_me:29175: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:29175: checking for desired basename for cxx library" >&5
++echo "$as_me:29178: 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.
+@@ -29192,13 +29195,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29195: result: $CXX_NAME" >&5
++echo "$as_me:29198: 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:29201: checking for src modules" >&5
++echo "$as_me:29204: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -29257,7 +29260,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:29260: result: $cf_cv_src_modules" >&5
++echo "$as_me:29263: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -29418,7 +29421,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:29421: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:29424: 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//'`
+@@ -29429,7 +29432,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:29432: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
++echo "$as_me:29435: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -29445,7 +29448,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:29448: result: $PKG_CFLAGS" >&5
++echo "$as_me:29451: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ case "$cf_cv_system_name" in
+@@ -29517,7 +29520,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
+ 
+-echo "${as_me:-configure}:29520: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
++echo "${as_me:-configure}:29523: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+ 
+ fi
+ 
+@@ -29544,7 +29547,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:29547: checking for linker search path" >&5
++echo "$as_me:29550: 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
+@@ -29592,7 +29595,7 @@
+ 			cf_pathlist="$cf_pathlist /lib /usr/lib"
+ 			;;
+ 		(*)
+-			{ echo "$as_me:29595: WARNING: problem with Solaris architecture" >&5
++			{ echo "$as_me:29598: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ 			;;
+ 		esac
+@@ -29633,7 +29636,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:29636: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29639: 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'`
+@@ -29719,7 +29722,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29722: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29725: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -29900,7 +29903,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:29903: error: ambiguous option: $1
++    { { echo "$as_me:29906: 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;}
+@@ -29919,7 +29922,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:29922: error: unrecognized option: $1
++  -*) { { echo "$as_me:29925: 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;}
+@@ -30051,7 +30054,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:30054: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:30057: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -30576,7 +30579,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:30579: creating $ac_file" >&5
++    { echo "$as_me:30582: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -30594,7 +30597,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30597: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30600: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -30607,7 +30610,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30610: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30613: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30623,7 +30626,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:30626: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:30629: 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;}
+@@ -30632,7 +30635,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:30635: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:30638: 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;}
+@@ -30677,7 +30680,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:30680: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:30683: 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;}
+@@ -30688,7 +30691,7 @@
+     $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:30691: WARNING: Some variables may not be substituted:
++      { echo "$as_me:30694: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30737,7 +30740,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:30740: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:30743: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -30748,7 +30751,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30751: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30754: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -30761,7 +30764,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30764: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30767: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30819,7 +30822,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:30822: $ac_file is unchanged" >&5
++      { echo "$as_me:30825: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -31206,7 +31209,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}:31209: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:31212: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: dist.mk
+Prereq:  1.1639 
+--- ncurses-6.5-20241102+/dist.mk	2024-11-02 09:59:53.000000000 +0000
++++ ncurses-6.5-20241109/dist.mk	2024-11-09 11:12:30.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1639 2024/11/02 09:59:53 tom Exp $
++# $Id: dist.mk,v 1.1640 2024/11/09 11:12:30 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 = 5
+-NCURSES_PATCH = 20241102
++NCURSES_PATCH = 20241109
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: ncurses/base/lib_set_term.c
+Prereq:  1.187 
+--- ncurses-6.5-20241102+/ncurses/base/lib_set_term.c	2024-11-02 21:00:54.000000000 +0000
++++ ncurses-6.5-20241109/ncurses/base/lib_set_term.c	2024-11-09 16:36:29.000000000 +0000
+@@ -47,10 +47,6 @@
+ #include 
+ #include 
+ 
+-#ifdef __DJGPP__
+-#include 
+-#endif
+-
+ #if USE_GPM_SUPPORT
+ #ifdef HAVE_LIBDL
+ /* use dynamic loader to avoid linkage dependency */
+@@ -61,7 +57,7 @@
+ #undef CUR
+ #define CUR SP_TERMTYPE
+ 
+-MODULE_ID("$Id: lib_set_term.c,v 1.187 2024/11/02 21:00:54 tom Exp $")
++MODULE_ID("$Id: lib_set_term.c,v 1.188 2024/11/09 16:36:29 tom Exp $")
+ 
+ #ifdef USE_TERM_DRIVER
+ #define MaxColors      InfoOf(sp).maxcolors
+Index: ncurses/tinfo/access.c
+Prereq:  1.39 
+--- ncurses-6.5-20241102+/ncurses/tinfo/access.c	2024-09-21 15:12:56.000000000 +0000
++++ ncurses-6.5-20241109/ncurses/tinfo/access.c	2024-11-09 18:30:28.000000000 +0000
+@@ -52,7 +52,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: access.c,v 1.39 2024/09/21 15:12:56 tom Exp $")
++MODULE_ID("$Id: access.c,v 1.40 2024/11/09 18:30:28 tom Exp $")
+ 
+ #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
+ 
+@@ -132,6 +132,7 @@
+     int result;
+ 
+     if (path == 0) {
++	errno = ENOENT;
+ 	result = -1;
+     } else if (ACCESS(path, mode) < 0) {
+ 	if ((mode & W_OK) != 0
+@@ -150,6 +151,7 @@
+ 
+ 	    result = ACCESS(head, R_OK | W_OK | X_OK);
+ 	} else {
++	    errno = EPERM;
+ 	    result = -1;
+ 	}
+     } else {
+Index: ncurses/tinfo/alloc_entry.c
+Prereq:  1.79 
+--- ncurses-6.5-20241102+/ncurses/tinfo/alloc_entry.c	2023-09-15 08:16:12.000000000 +0000
++++ ncurses-6.5-20241109/ncurses/tinfo/alloc_entry.c	2024-11-09 20:36:48.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 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.79 2023/09/15 08:16:12 tom Exp $")
++MODULE_ID("$Id: alloc_entry.c,v 1.80 2024/11/09 20:36:48 tom Exp $")
+ 
+ #define ABSENT_OFFSET    -1
+ #define CANCELLED_OFFSET -2
+@@ -194,7 +194,10 @@
+     }
+ 
+     TYPE_MALLOC(char, next_free, tp->str_table);
+-    (void) memcpy(tp->str_table, stringbuf, next_free);
++    if (stringbuf == NULL)
++	(void) memset(tp->str_table, 0, next_free);
++    else
++	(void) memcpy(tp->str_table, stringbuf, next_free);
+ 
+     tp->term_names = tp->str_table + n;
+     for_each_string(i, &(ep->tterm)) {
+Index: ncurses/tinfo/hashed_db.c
+Prereq:  1.19 
+--- ncurses-6.5-20241102+/ncurses/tinfo/hashed_db.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241109/ncurses/tinfo/hashed_db.c	2024-11-09 19:23:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019,2020 Thomas E. Dickey                                     *
++ * Copyright 2019-2020,2024 Thomas E. Dickey                                *
+  * Copyright 2006-2011,2013 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -37,7 +37,7 @@
+ 
+ #if USE_HASHED_DB
+ 
+-MODULE_ID("$Id: hashed_db.c,v 1.19 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: hashed_db.c,v 1.20 2024/11/09 19:23:11 tom Exp $")
+ 
+ #if HASHED_DB_API >= 2
+ static DBC *cursor;
+@@ -94,22 +94,25 @@
+     }
+ }
+ 
+-static void
++static bool
+ make_connection(DB * db, const char *path, bool modify)
+ {
++    bool code = FALSE;
+     MYCONN *p = typeCalloc(MYCONN, 1);
+ 
+-    if (p != 0) {
+-	p->db = db;
++    if (p != NULL) {
+ 	p->path = strdup(path);
+-	p->modify = modify;
+-	if (p->path != 0) {
++	if (p->path != NULL) {
++	    p->db = db;
++	    p->modify = modify;
+ 	    p->next = connections;
+ 	    connections = p;
++	    code = TRUE;
+ 	} else {
+ 	    free(p);
+ 	}
+     }
++    return code;
+ }
+ 
+ /*
+@@ -118,13 +121,13 @@
+ NCURSES_EXPORT(DB *)
+ _nc_db_open(const char *path, bool modify)
+ {
+-    DB *result = 0;
++    DB *result = NULL;
+     int code;
+ 
+     if (connections == 0)
+ 	atexit(cleanup);
+ 
+-    if ((result = find_connection(path, modify)) == 0) {
++    if ((result = find_connection(path, modify)) == NULL) {
+ 
+ #if HASHED_DB_API >= 4
+ 	db_create(&result, NULL, 0);
+@@ -135,7 +138,7 @@
+ 				 DB_HASH,
+ 				 modify ? DB_CREATE : DB_RDONLY,
+ 				 0644)) != 0) {
+-	    result = 0;
++	    result = NULL;
+ 	}
+ #elif HASHED_DB_API >= 3
+ 	db_create(&result, NULL, 0);
+@@ -145,7 +148,7 @@
+ 				 DB_HASH,
+ 				 modify ? DB_CREATE : DB_RDONLY,
+ 				 0644)) != 0) {
+-	    result = 0;
++	    result = NULL;
+ 	}
+ #elif HASHED_DB_API >= 2
+ 	if ((code = db_open(path,
+@@ -155,7 +158,7 @@
+ 			    (DB_ENV *) 0,
+ 			    (DB_INFO *) 0,
+ 			    &result)) != 0) {
+-	    result = 0;
++	    result = NULL;
+ 	}
+ #else
+ 	if ((result = dbopen(path,
+@@ -166,11 +169,11 @@
+ 	    code = errno;
+ 	}
+ #endif
+-	if (result != 0) {
+-	    make_connection(result, path, modify);
++	if (result != NULL && make_connection(result, path, modify)) {
+ 	    T(("opened %s", path));
+ 	} else {
+-	    T(("cannot open %s: %s", path, strerror(code)));
++	    T(("cannot open %s: (errno %d) %s", path, code, strerror(code)));
++	    errno = code;
+ 	}
+     }
+     return result;
+Index: ncurses/tinfo/write_entry.c
+Prereq:  1.136 
+--- ncurses-6.5-20241102+/ncurses/tinfo/write_entry.c	2024-10-19 21:19:32.000000000 +0000
++++ ncurses-6.5-20241109/ncurses/tinfo/write_entry.c	2024-11-09 19:24:01.000000000 +0000
+@@ -42,7 +42,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: write_entry.c,v 1.136 2024/10/19 21:19:32 tom Exp $")
++MODULE_ID("$Id: write_entry.c,v 1.137 2024/11/09 19:24:01 tom Exp $")
+ 
+ #if 1
+ #define TRACE_OUT(p) DEBUG(2, p)
+@@ -86,17 +86,21 @@
+ 	size_t actual;
+ 
+ 	if (fp == 0) {
+-	    perror(filename);
+-	    _nc_syserr_abort("cannot open %s/%s", _nc_tic_dir(0), filename);
++	    _nc_syserr_abort("cannot open %s/%s: (errno %d) %s",
++			     _nc_tic_dir(0),
++			     filename,
++			     errno,
++			     strerror(errno));
+ 	}
+ 
+ 	actual = fwrite(buffer, sizeof(char), (size_t) offset, fp);
+ 	if (actual != offset) {
+ 	    int myerr = ferror(fp) ? errno : 0;
+ 	    if (myerr) {
+-		_nc_syserr_abort("error writing %s/%s: %s",
++		_nc_syserr_abort("error writing %s/%s: (errno %d) %s",
+ 				 _nc_tic_dir(NULL),
+ 				 filename,
++				 myerr,
+ 				 strerror(myerr));
+ 	    } else {
+ 		_nc_syserr_abort("error writing %s/%s: %u bytes vs actual %lu",
+@@ -133,7 +137,11 @@
+ 	char dir[sizeof(LEAF_FMT)];
+ 	_nc_SPRINTF(dir, _nc_SLIMIT(sizeof(dir)) LEAF_FMT, code);
+ 	if (make_db_root(dir) < 0) {
+-	    _nc_err_abort("%s/%s: permission denied", _nc_tic_dir(NULL), dir);
++	    _nc_err_abort("%s/%s: (errno %d) %s",
++			  _nc_tic_dir(NULL),
++			  dir,
++			  errno,
++			  strerror(errno));
+ 	} else {
+ 	    verified[s - dirnames] = TRUE;
+ 	}
+@@ -211,6 +219,7 @@
+ 	} else if (_nc_access(path, R_OK | W_OK | X_OK) < 0) {
+ 	    rc = -1;		/* permission denied */
+ 	} else if (!(S_ISDIR(statbuf.st_mode))) {
++	    errno = ENOTDIR;
+ 	    rc = -1;		/* not a directory */
+ 	}
+ #endif
+@@ -248,8 +257,10 @@
+ 	    }
+ 	}
+ 	if (!success) {
+-	    _nc_err_abort("%s: permission denied (errno %d)",
+-			  destination, errno);
++	    _nc_err_abort("%s: (errno %d) %s",
++			  destination,
++			  errno,
++			  strerror(errno));
+ 	}
+     }
+ 
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20241102+/package/debian-mingw/changelog	2024-11-02 09:59:53.000000000 +0000
++++ ncurses-6.5-20241109/package/debian-mingw/changelog	2024-11-09 11:12:30.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241102) unstable; urgency=low
++ncurses6td (6.5+20241109) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 02 Nov 2024 05:59:53 -0400
++ -- Thomas E. Dickey   Sat, 09 Nov 2024 06:12:30 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20241102+/package/debian-mingw64/changelog	2024-11-02 09:59:53.000000000 +0000
++++ ncurses-6.5-20241109/package/debian-mingw64/changelog	2024-11-09 11:12:30.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241102) unstable; urgency=low
++ncurses6td (6.5+20241109) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 02 Nov 2024 05:59:53 -0400
++ -- Thomas E. Dickey   Sat, 09 Nov 2024 06:12:30 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20241102+/package/debian/changelog	2024-11-02 09:59:53.000000000 +0000
++++ ncurses-6.5-20241109/package/debian/changelog	2024-11-09 11:12:30.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241102) unstable; urgency=low
++ncurses6td (6.5+20241109) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 02 Nov 2024 05:59:53 -0400
++ -- Thomas E. Dickey   Sat, 09 Nov 2024 06:12:30 -0500
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.674 
+--- ncurses-6.5-20241102+/package/mingw-ncurses.nsi	2024-11-02 09:59:53.000000000 +0000
++++ ncurses-6.5-20241109/package/mingw-ncurses.nsi	2024-11-09 11:12:30.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.674 2024/11/02 09:59:53 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.675 2024/11/09 11:12:30 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "1102"
++!define VERSION_MMDD  "1109"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20241102+/package/mingw-ncurses.spec	2024-11-02 09:59:53.000000000 +0000
++++ ncurses-6.5-20241109/package/mingw-ncurses.spec	2024-11-09 11:12:30.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20241102
++Release: 20241109
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20241102+/package/ncurses.spec	2024-11-02 09:59:53.000000000 +0000
++++ ncurses-6.5-20241109/package/ncurses.spec	2024-11-09 11:12:30.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20241102
++Release: 20241109
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20241102+/package/ncursest.spec	2024-11-02 09:59:53.000000000 +0000
++++ ncurses-6.5-20241109/package/ncursest.spec	2024-11-09 11:12:30.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20241102
++Release: 20241109
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/infocmp.c
+Prereq:  1.166 
+--- ncurses-6.5-20241102+/progs/infocmp.c	2024-10-19 21:43:11.000000000 +0000
++++ ncurses-6.5-20241109/progs/infocmp.c	2024-11-09 19:33:50.000000000 +0000
+@@ -43,7 +43,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: infocmp.c,v 1.166 2024/10/19 21:43:11 tom Exp $")
++MODULE_ID("$Id: infocmp.c,v 1.167 2024/11/09 19:33:50 tom Exp $")
+ 
+ #ifndef ACTUAL_TIC
+ #define ACTUAL_TIC "tic"
+@@ -1053,7 +1053,7 @@
+ 
+     for (n = 0; n < argc && n < MAXCOMPARE; n++) {
+ 	if (freopen(argv[n], "r", stdin) == 0)
+-	    _nc_err_abort("Can't open %s", argv[n]);
++	    _nc_err_abort("Can't open %s: %s", argv[n], strerror(errno));
+ 
+ #if NO_LEAKS
+ 	entered[n].head = _nc_head;
+Index: progs/tic.c
+Prereq:  1.326 
+--- ncurses-6.5-20241102+/progs/tic.c	2024-10-19 21:31:50.000000000 +0000
++++ ncurses-6.5-20241109/progs/tic.c	2024-11-09 23:03:26.000000000 +0000
+@@ -49,7 +49,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: tic.c,v 1.326 2024/10/19 21:31:50 tom Exp $")
++MODULE_ID("$Id: tic.c,v 1.328 2024/11/09 23:03:26 tom Exp $")
+ 
+ #define STDIN_NAME ""
+ 
+@@ -517,8 +517,10 @@
+ 	    }
+ 	    if (pass == 1) {
+ 		if ((dst = typeCalloc(char *, nn + 1)) == NULL)
+-		      failed("make_namelist");
++		      failed("make_namelist (alloc)");
+ 		rewind(fp);
++		if (errno != 0)
++		      failed("make_namelist (rewind)");
+ 	    }
+ 	}
+ 	fclose(fp);
+Index: test/aclocal.m4
+Prereq:  1.228 
+--- ncurses-6.5-20241102+/test/aclocal.m4	2024-08-11 09:11:30.000000000 +0000
++++ ncurses-6.5-20241109/test/aclocal.m4	2024-11-09 23:15:41.000000000 +0000
+@@ -27,7 +27,7 @@
+ dnl authorization.                                                           *
+ dnl***************************************************************************
+ dnl
+-dnl $Id: aclocal.m4,v 1.228 2024/08/11 09:11:30 tom Exp $
++dnl $Id: aclocal.m4,v 1.229 2024/11/09 23:15:41 tom Exp $
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+@@ -4551,7 +4551,7 @@
+ 
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_XOPEN_SOURCE version: 67 updated: 2023/09/06 18:55:27
++dnl CF_XOPEN_SOURCE version: 68 updated: 2024/11/09 18:07:29
+ dnl ---------------
+ dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
+ dnl or adapt to the vendor's definitions to get equivalent functionality,
+@@ -4614,6 +4614,9 @@
+ (linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
+ 	CF_GNU_SOURCE($cf_XOPEN_SOURCE)
+ 	;;
++linux*musl)
++	cf_xopen_source="-D_BSD_SOURCE"
++	;;
+ (minix*)
+ 	cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this...
+ 	;;
+Index: test/configure
+--- ncurses-6.5-20241102+/test/configure	2024-08-11 09:11:55.000000000 +0000
++++ ncurses-6.5-20241109/test/configure	2024-11-09 23:17:16.000000000 +0000
+@@ -4691,6 +4691,9 @@
+ fi
+ 
+ 	;;
++linux*musl)
++	cf_xopen_source="-D_BSD_SOURCE"
++	;;
+ (minix*)
+ 	cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this...
+ 	;;
+@@ -4713,16 +4716,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:4716: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:4719: 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}:4722: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:4725: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4725 "configure"
++#line 4728 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4737,16 +4740,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4740: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4743: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4743: \$? = $ac_status" >&5
++  echo "$as_me:4746: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4746: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4749: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4749: \$? = $ac_status" >&5
++  echo "$as_me:4752: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -4767,7 +4770,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4770 "configure"
++#line 4773 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4782,16 +4785,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4785: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4788: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4788: \$? = $ac_status" >&5
++  echo "$as_me:4791: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4791: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4794: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4794: \$? = $ac_status" >&5
++  echo "$as_me:4797: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -4802,7 +4805,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:4805: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:4808: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -4810,10 +4813,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:4813: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:4816: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4816 "configure"
++#line 4819 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4828,16 +4831,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4831: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4834: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4834: \$? = $ac_status" >&5
++  echo "$as_me:4837: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4837: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4840: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4840: \$? = $ac_status" >&5
++  echo "$as_me:4843: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -4853,7 +4856,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4856: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:4859: 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
+@@ -4970,7 +4973,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:4973: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:4976: 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
+@@ -5002,14 +5005,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:5005: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:5008: 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 5012 "configure"
++#line 5015 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -5027,16 +5030,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5030: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5033: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5033: \$? = $ac_status" >&5
++  echo "$as_me:5036: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5036: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5039: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5039: \$? = $ac_status" >&5
++  echo "$as_me:5042: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -5048,7 +5051,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5051 "configure"
++#line 5054 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -5066,16 +5069,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5069: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5072: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5072: \$? = $ac_status" >&5
++  echo "$as_me:5075: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5075: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5078: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5078: \$? = $ac_status" >&5
++  echo "$as_me:5081: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -5090,7 +5093,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:5093: result: $cf_cv_xopen_source" >&5
++echo "$as_me:5096: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -5250,16 +5253,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:5253: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:5256: 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}:5259: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:5262: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5262 "configure"
++#line 5265 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5274,16 +5277,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5277: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5280: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5280: \$? = $ac_status" >&5
++  echo "$as_me:5283: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5283: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5286: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5286: \$? = $ac_status" >&5
++  echo "$as_me:5289: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -5304,7 +5307,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5307 "configure"
++#line 5310 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5319,16 +5322,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5322: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5325: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5325: \$? = $ac_status" >&5
++  echo "$as_me:5328: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5328: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5331: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5331: \$? = $ac_status" >&5
++  echo "$as_me:5334: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5339,7 +5342,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:5342: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:5345: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -5347,10 +5350,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:5350: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:5353: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5353 "configure"
++#line 5356 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5365,16 +5368,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5368: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5371: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5371: \$? = $ac_status" >&5
++  echo "$as_me:5374: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5374: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5377: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5377: \$? = $ac_status" >&5
++  echo "$as_me:5380: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5390,7 +5393,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:5393: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:5396: 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
+@@ -5503,10 +5506,10 @@
+ 	if test "$cf_cv_xopen_source" = no ; then
+ 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+ 
+-echo "${as_me:-configure}:5506: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:5509: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5509 "configure"
++#line 5512 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -5524,23 +5527,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5527: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5530: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5530: \$? = $ac_status" >&5
++  echo "$as_me:5533: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5533: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5536: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5536: \$? = $ac_status" >&5
++  echo "$as_me:5539: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-			{ echo "$as_me:5543: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++			{ echo "$as_me:5546: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ 			CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -5563,7 +5566,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}:5566: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:5569: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -5575,7 +5578,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}:5578: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:5581: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -5663,7 +5666,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:5666: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:5669: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -5673,7 +5676,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:5676: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:5679: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -5683,7 +5686,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}:5686: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:5689: 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"
+@@ -5695,10 +5698,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:5698: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:5701: 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 5701 "configure"
++#line 5704 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5713,16 +5716,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5716: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5719: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5719: \$? = $ac_status" >&5
++  echo "$as_me:5722: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5722: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5725: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5725: \$? = $ac_status" >&5
++  echo "$as_me:5728: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -5731,12 +5734,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:5734: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:5737: 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 5739 "configure"
++#line 5742 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5751,16 +5754,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5754: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5757: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5757: \$? = $ac_status" >&5
++  echo "$as_me:5760: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5760: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5763: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5763: \$? = $ac_status" >&5
++  echo "$as_me:5766: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -5771,19 +5774,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:5774: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:5777: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:5779: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:5782: 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 5786 "configure"
++#line 5789 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -5801,16 +5804,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5804: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5807: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5807: \$? = $ac_status" >&5
++  echo "$as_me:5810: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5810: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5813: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5813: \$? = $ac_status" >&5
++  echo "$as_me:5816: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -5822,7 +5825,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5825 "configure"
++#line 5828 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -5840,16 +5843,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5843: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5846: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5846: \$? = $ac_status" >&5
++  echo "$as_me:5849: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5849: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5852: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5852: \$? = $ac_status" >&5
++  echo "$as_me:5855: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -5864,7 +5867,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:5867: result: $cf_cv_xopen_source" >&5
++echo "$as_me:5870: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -6011,13 +6014,13 @@
+ fi
+ fi # cf_cv_posix_visible
+ 
+-echo "$as_me:6014: checking for ANSI C header files" >&5
++echo "$as_me:6017: 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 6020 "configure"
++#line 6023 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -6025,13 +6028,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:6028: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:6031: \"$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:6034: \$? = $ac_status" >&5
++  echo "$as_me:6037: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6053,7 +6056,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 6056 "configure"
++#line 6059 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6071,7 +6074,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 6074 "configure"
++#line 6077 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6092,7 +6095,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6095 "configure"
++#line 6098 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -6118,15 +6121,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6121: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6124: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6124: \$? = $ac_status" >&5
++  echo "$as_me:6127: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:6126: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6129: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6129: \$? = $ac_status" >&5
++  echo "$as_me:6132: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6139,7 +6142,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:6142: result: $ac_cv_header_stdc" >&5
++echo "$as_me:6145: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -6155,28 +6158,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6158: checking for $ac_header" >&5
++echo "$as_me:6161: 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 6164 "configure"
++#line 6167 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6170: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6173: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6173: \$? = $ac_status" >&5
++  echo "$as_me:6176: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6176: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6179: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6179: \$? = $ac_status" >&5
++  echo "$as_me:6182: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -6186,7 +6189,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6189: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6192: 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:6202: checking whether exit is declared" >&5
+ echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
+ if test "${ac_cv_have_decl_exit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6205 "configure"
++#line 6208 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -6217,16 +6220,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6220: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6223: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6223: \$? = $ac_status" >&5
++  echo "$as_me:6226: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6226: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6229: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6229: \$? = $ac_status" >&5
++  echo "$as_me:6232: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_have_decl_exit=yes
+ else
+@@ -6236,10 +6239,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6239: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:6242: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+ 
+-echo "$as_me:6242: checking for signal global datatype" >&5
++echo "$as_me:6245: 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
+@@ -6251,7 +6254,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6254 "configure"
++#line 6257 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -6275,16 +6278,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6278: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6281: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6281: \$? = $ac_status" >&5
++  echo "$as_me:6284: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6284: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6287: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6287: \$? = $ac_status" >&5
++  echo "$as_me:6290: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -6298,7 +6301,7 @@
+ 
+ fi
+ 
+-echo "$as_me:6301: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:6304: 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:6313: 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 6317 "configure"
++#line 6320 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -6329,23 +6332,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6332: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6335: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6335: \$? = $ac_status" >&5
++  echo "$as_me:6338: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6338: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6341: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6341: \$? = $ac_status" >&5
++  echo "$as_me:6344: \$? = $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 6348 "configure"
++#line 6351 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -6363,16 +6366,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6366: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6369: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6369: \$? = $ac_status" >&5
++  echo "$as_me:6372: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6372: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6375: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6375: \$? = $ac_status" >&5
++  echo "$as_me:6378: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -6386,11 +6389,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:6389: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:6392: 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:6393: checking for actual SIGWINCH definition" >&5
++echo "$as_me:6396: 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
+@@ -6401,7 +6404,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6404 "configure"
++#line 6407 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -6423,16 +6426,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6426: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6429: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6429: \$? = $ac_status" >&5
++  echo "$as_me:6432: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6432: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6435: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6435: \$? = $ac_status" >&5
++  echo "$as_me:6438: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -6446,7 +6449,7 @@
+ done
+ 
+ fi
+-echo "$as_me:6449: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:6452: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -6456,13 +6459,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:6459: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:6462: 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 6465 "configure"
++#line 6468 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -6476,16 +6479,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6479: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6482: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6482: \$? = $ac_status" >&5
++  echo "$as_me:6485: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6485: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6488: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6488: \$? = $ac_status" >&5
++  echo "$as_me:6491: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -6496,7 +6499,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:6499: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:6502: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test "$am_cv_langinfo_codeset" = yes; then
+ 
+@@ -6506,7 +6509,7 @@
+ 
+ 	fi
+ 
+-echo "$as_me:6509: checking if you want to use pkg-config" >&5
++echo "$as_me:6512: 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.
+@@ -6516,7 +6519,7 @@
+ else
+   cf_pkg_config=yes
+ fi;
+-echo "$as_me:6519: result: $cf_pkg_config" >&5
++echo "$as_me:6522: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+ 
+ case "$cf_pkg_config" in
+@@ -6528,7 +6531,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:6531: checking for $ac_word" >&5
++echo "$as_me:6534: 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
+@@ -6545,7 +6548,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:6548: found $ac_dir/$ac_word" >&5
++   echo "$as_me:6551: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -6556,10 +6559,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:6559: result: $PKG_CONFIG" >&5
++  echo "$as_me:6562: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+-  echo "$as_me:6562: result: no" >&5
++  echo "$as_me:6565: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6568,7 +6571,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:6571: checking for $ac_word" >&5
++echo "$as_me:6574: 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
+@@ -6585,7 +6588,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:6588: found $ac_dir/$ac_word" >&5
++   echo "$as_me:6591: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -6597,10 +6600,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ 
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  echo "$as_me:6600: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:6603: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+-  echo "$as_me:6603: result: no" >&5
++  echo "$as_me:6606: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6641,18 +6644,18 @@
+ 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:6644: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++	{ { echo "$as_me:6647: 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:6651: WARNING: pkg-config is not installed" >&5
++	{ echo "$as_me:6654: WARNING: pkg-config is not installed" >&5
+ echo "$as_me: WARNING: pkg-config is not installed" >&2;}
+ fi
+ 
+-echo "$as_me:6655: checking if you want to see long compiling messages" >&5
++echo "$as_me:6658: 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.
+@@ -6686,10 +6689,10 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:6689: result: $enableval" >&5
++echo "$as_me:6692: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+-echo "$as_me:6692: checking for an installation directory prefix" >&5
++echo "$as_me:6695: checking for an installation directory prefix" >&5
+ echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-install-prefix or --without-install-prefix was given.
+@@ -6702,10 +6705,10 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:6705: result: ${DESTDIR:-(none)}" >&5
++echo "$as_me:6708: result: ${DESTDIR:-(none)}" >&5
+ echo "${ECHO_T}${DESTDIR:-(none)}" >&6
+ 
+-echo "$as_me:6708: checking if installation directory prefix should be merged" >&5
++echo "$as_me:6711: checking if installation directory prefix should be merged" >&5
+ echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6
+ 
+ # Check whether --enable-install-prefix or --disable-install-prefix was given.
+@@ -6722,7 +6725,7 @@
+ 	cf_install_prefix=no
+ 
+ fi;
+-echo "$as_me:6725: result: $cf_install_prefix" >&5
++echo "$as_me:6728: result: $cf_install_prefix" >&5
+ echo "${ECHO_T}$cf_install_prefix" >&6
+ 
+ if test "$cf_install_prefix" = yes ; then
+@@ -6731,7 +6734,7 @@
+ 	MERGE_PREFIX=''
+ fi
+ 
+-echo "$as_me:6734: checking for ncurses wrap-prefix" >&5
++echo "$as_me:6737: checking for ncurses wrap-prefix" >&5
+ echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given.
+@@ -6741,10 +6744,10 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-echo "$as_me:6744: result: $NCURSES_WRAP_PREFIX" >&5
++echo "$as_me:6747: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ 
+-echo "$as_me:6747: checking if you want to check for wide-character functions" >&5
++echo "$as_me:6750: checking if you want to check for wide-character functions" >&5
+ echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-widec or --disable-widec was given.
+@@ -6761,10 +6764,10 @@
+ 	cf_enable_widec=yes
+ 
+ fi;
+-echo "$as_me:6764: result: $cf_enable_widec" >&5
++echo "$as_me:6767: result: $cf_enable_widec" >&5
+ echo "${ECHO_T}$cf_enable_widec" >&6
+ 
+-echo "$as_me:6767: checking for specific curses-directory" >&5
++echo "$as_me:6770: 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.
+@@ -6774,7 +6777,7 @@
+ else
+   cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:6777: result: $cf_cv_curses_dir" >&5
++echo "$as_me:6780: 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"
+@@ -6803,7 +6806,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:6806: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:6809: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -6839,7 +6842,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6842 "configure"
++#line 6845 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6851,16 +6854,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6854: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6857: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6857: \$? = $ac_status" >&5
++  echo "$as_me:6860: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6860: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6863: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6863: \$? = $ac_status" >&5
++  echo "$as_me:6866: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6877,7 +6880,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}:6880: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6883: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -6913,7 +6916,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}:6916: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6919: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -6926,7 +6929,7 @@
+ 
+ cf_cv_screen=curses
+ 
+-echo "$as_me:6929: checking for specified curses library type" >&5
++echo "$as_me:6932: checking for specified curses library type" >&5
+ echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
+ 
+ # Check whether --with-screen or --without-screen was given.
+@@ -6970,13 +6973,13 @@
+ fi;
+ fi;
+ 
+-echo "$as_me:6973: result: $cf_cv_screen" >&5
++echo "$as_me:6976: result: $cf_cv_screen" >&5
+ echo "${ECHO_T}$cf_cv_screen" >&6
+ 
+ case $cf_cv_screen in
+ (curses|curses_*)
+ 
+-echo "$as_me:6979: checking for extra include directories" >&5
++echo "$as_me:6982: checking for extra include directories" >&5
+ echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
+ if test "${cf_cv_curses_incdir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7002,7 +7005,7 @@
+ esac
+ 
+ fi
+-echo "$as_me:7005: result: $cf_cv_curses_incdir" >&5
++echo "$as_me:7008: result: $cf_cv_curses_incdir" >&5
+ echo "${ECHO_T}$cf_cv_curses_incdir" >&6
+ if test "$cf_cv_curses_incdir" != no
+ then
+@@ -7012,7 +7015,7 @@
+ 
+ fi
+ 
+-echo "$as_me:7015: checking if we have identified curses headers" >&5
++echo "$as_me:7018: 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
+@@ -7024,7 +7027,7 @@
+ 	curses.h  ncurses/ncurses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7027 "configure"
++#line 7030 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -7036,16 +7039,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7039: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7042: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7042: \$? = $ac_status" >&5
++  echo "$as_me:7045: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7045: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7048: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7048: \$? = $ac_status" >&5
++  echo "$as_me:7051: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -7056,11 +7059,11 @@
+ done
+ 
+ fi
+-echo "$as_me:7059: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:7062: 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:7063: error: No curses header-files found" >&5
++	{ { echo "$as_me:7066: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7070,23 +7073,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:7073: checking for $ac_header" >&5
++echo "$as_me:7076: 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 7079 "configure"
++#line 7082 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7083: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7086: \"$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:7089: \$? = $ac_status" >&5
++  echo "$as_me:7092: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7105,7 +7108,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7108: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7111: 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:7121: 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
+@@ -7133,7 +7136,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7136 "configure"
++#line 7139 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -7148,16 +7151,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7151: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7154: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7154: \$? = $ac_status" >&5
++  echo "$as_me:7157: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7157: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7160: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7160: \$? = $ac_status" >&5
++  echo "$as_me:7163: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -7173,7 +7176,7 @@
+ done
+ 
+ fi
+-echo "$as_me:7176: result: $cf_cv_term_header" >&5
++echo "$as_me:7179: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -7205,7 +7208,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:7208: checking for ncurses version" >&5
++echo "$as_me:7211: 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
+@@ -7231,10 +7234,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:7234: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:7237: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7237: \$? = $ac_status" >&5
++  echo "$as_me:7240: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -7244,7 +7247,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7247 "configure"
++#line 7250 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -7271,15 +7274,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:7274: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7277: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7277: \$? = $ac_status" >&5
++  echo "$as_me:7280: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:7279: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7282: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7282: \$? = $ac_status" >&5
++  echo "$as_me:7285: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -7293,17 +7296,17 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:7296: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:7299: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:7303: checking if we have identified curses libraries" >&5
++echo "$as_me:7306: checking if we have identified curses libraries" >&5
+ echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7306 "configure"
++#line 7309 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7315,16 +7318,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7318: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7321: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7321: \$? = $ac_status" >&5
++  echo "$as_me:7324: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7324: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7327: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7327: \$? = $ac_status" >&5
++  echo "$as_me:7330: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -7333,13 +7336,13 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-echo "$as_me:7336: result: $cf_result" >&5
++echo "$as_me:7339: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test "$cf_result" = no ; then
+ case "$host_os" in
+ (freebsd*)
+-	echo "$as_me:7342: checking for tgoto in -lmytinfo" >&5
++	echo "$as_me:7345: 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
+@@ -7347,7 +7350,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7350 "configure"
++#line 7353 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7366,16 +7369,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7369: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7372: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7372: \$? = $ac_status" >&5
++  echo "$as_me:7375: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7375: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7378: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7378: \$? = $ac_status" >&5
++  echo "$as_me:7381: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -7386,7 +7389,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7389: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:7392: 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
+ 
+@@ -7416,7 +7419,7 @@
+ 	# term.h) for cur_colr
+ 	if test "x$cf_cv_screen" = "xcurses_colr"
+ 	then
+-		echo "$as_me:7419: checking for initscr in -lcur_colr" >&5
++		echo "$as_me:7422: checking for initscr in -lcur_colr" >&5
+ echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
+ if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7424,7 +7427,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcur_colr  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7427 "configure"
++#line 7430 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7443,16 +7446,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7446: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7449: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7449: \$? = $ac_status" >&5
++  echo "$as_me:7452: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7452: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7455: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7455: \$? = $ac_status" >&5
++  echo "$as_me:7458: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_cur_colr_initscr=yes
+ else
+@@ -7463,7 +7466,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7466: result: $ac_cv_lib_cur_colr_initscr" >&5
++echo "$as_me:7469: result: $ac_cv_lib_cur_colr_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
+ if test "$ac_cv_lib_cur_colr_initscr" = yes; then
+ 
+@@ -7487,7 +7490,7 @@
+ 
+ else
+ 
+-		echo "$as_me:7490: checking for initscr in -lHcurses" >&5
++		echo "$as_me:7493: checking for initscr in -lHcurses" >&5
+ echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
+ if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7495,7 +7498,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lHcurses  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7498 "configure"
++#line 7501 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7514,16 +7517,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7517: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7520: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7520: \$? = $ac_status" >&5
++  echo "$as_me:7523: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7523: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7526: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7526: \$? = $ac_status" >&5
++  echo "$as_me:7529: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_Hcurses_initscr=yes
+ else
+@@ -7534,7 +7537,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7537: result: $ac_cv_lib_Hcurses_initscr" >&5
++echo "$as_me:7540: result: $ac_cv_lib_Hcurses_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
+ if test "$ac_cv_lib_Hcurses_initscr" = yes; then
+ 
+@@ -7592,7 +7595,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}:7595: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7598: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7621,7 +7624,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}:7624: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7627: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7652,7 +7655,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}:7655: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7658: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7687,7 +7690,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}:7690: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7693: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7731,13 +7734,13 @@
+ 	# because it may be needed to link the test-case for initscr.
+ 	if test "x$cf_term_lib" = x
+ 	then
+-		echo "$as_me:7734: checking for tgoto" >&5
++		echo "$as_me:7737: checking for tgoto" >&5
+ echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
+ if test "${ac_cv_func_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7740 "configure"
++#line 7743 "configure"
+ #include "confdefs.h"
+ #define tgoto autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -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_func_tgoto=yes
+ else
+@@ -7787,7 +7790,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7790: result: $ac_cv_func_tgoto" >&5
++echo "$as_me:7793: result: $ac_cv_func_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_func_tgoto" >&6
+ if test "$ac_cv_func_tgoto" = yes; then
+   cf_term_lib=predefined
+@@ -7796,7 +7799,7 @@
+ 			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
+ 			do
+ 				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
+-echo "$as_me:7799: checking for tgoto in -l$cf_term_lib" >&5
++echo "$as_me:7802: checking for tgoto in -l$cf_term_lib" >&5
+ echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7804,7 +7807,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_term_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7807 "configure"
++#line 7810 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7823,16 +7826,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7826: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7829: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7829: \$? = $ac_status" >&5
++  echo "$as_me:7832: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7832: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7835: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7835: \$? = $ac_status" >&5
++  echo "$as_me:7838: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -7843,7 +7846,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7846: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:7849: 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
+ 
+@@ -7866,10 +7869,10 @@
+ 		do
+ 			LIBS="-l$cf_curs_lib $cf_save_LIBS"
+ 			if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
+-				echo "$as_me:7869: checking if we can link with $cf_curs_lib library" >&5
++				echo "$as_me:7872: checking if we can link with $cf_curs_lib library" >&5
+ echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7872 "configure"
++#line 7875 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7881,16 +7884,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7884: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7887: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7887: \$? = $ac_status" >&5
++  echo "$as_me:7890: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7890: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7893: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7893: \$? = $ac_status" >&5
++  echo "$as_me:7896: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -7899,16 +7902,16 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-				echo "$as_me:7902: result: $cf_result" >&5
++				echo "$as_me:7905: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 				test "$cf_result" = yes && break
+ 			elif test "$cf_curs_lib" = "$cf_term_lib" ; then
+ 				cf_result=no
+ 			elif test "$cf_term_lib" != predefined ; then
+-				echo "$as_me:7908: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
++				echo "$as_me:7911: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+ echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7911 "configure"
++#line 7914 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7920,16 +7923,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7923: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7926: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7926: \$? = $ac_status" >&5
++  echo "$as_me:7929: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7929: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7932: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7932: \$? = $ac_status" >&5
++  echo "$as_me:7935: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=no
+ else
+@@ -7938,7 +7941,7 @@
+ 
+ 					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
+ 					cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7941 "configure"
++#line 7944 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7950,16 +7953,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7953: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7956: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7956: \$? = $ac_status" >&5
++  echo "$as_me:7959: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7959: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7962: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7962: \$? = $ac_status" >&5
++  echo "$as_me:7965: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -7971,13 +7974,13 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-				echo "$as_me:7974: result: $cf_result" >&5
++				echo "$as_me:7977: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 				test "$cf_result" != error && break
+ 			fi
+ 		done
+ 	fi
+-	test "$cf_curs_lib" = unknown && { { echo "$as_me:7980: error: no curses library found" >&5
++	test "$cf_curs_lib" = unknown && { { echo "$as_me:7983: error: no curses library found" >&5
+ echo "$as_me: error: no curses library found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7989,23 +7992,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7992: checking for $ac_header" >&5
++echo "$as_me:7995: 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 7998 "configure"
++#line 8001 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8002: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8005: \"$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:8008: \$? = $ac_status" >&5
++  echo "$as_me:8011: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8024,7 +8027,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8027: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8030: 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:8040: 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
+@@ -8042,7 +8045,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8045 "configure"
++#line 8048 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -8059,16 +8062,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8062: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8065: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8065: \$? = $ac_status" >&5
++  echo "$as_me:8068: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8068: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8071: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8071: \$? = $ac_status" >&5
++  echo "$as_me:8074: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -8080,12 +8083,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:8083: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8086: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8088 "configure"
++#line 8091 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8098,16 +8101,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8101: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8104: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8104: \$? = $ac_status" >&5
++  echo "$as_me:8107: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8107: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8110: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8110: \$? = $ac_status" >&5
++  echo "$as_me:8113: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -8121,7 +8124,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8124 "configure"
++#line 8127 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8134,16 +8137,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8137: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8140: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8140: \$? = $ac_status" >&5
++  echo "$as_me:8143: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8143: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8146: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8146: \$? = $ac_status" >&5
++  echo "$as_me:8149: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -8160,9 +8163,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:8163: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:8166: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:8165: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8168: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -8253,7 +8256,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}:8256: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8259: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -8261,7 +8264,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8264 "configure"
++#line 8267 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8274,21 +8277,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8277: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8280: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8280: \$? = $ac_status" >&5
++  echo "$as_me:8283: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8283: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8286: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8286: \$? = $ac_status" >&5
++  echo "$as_me:8289: \$? = $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}:8291: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8294: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -8306,7 +8309,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:8309: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8312: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -8381,13 +8384,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}:8384: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8387: 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 8390 "configure"
++#line 8393 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8400,21 +8403,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8403: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8406: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8406: \$? = $ac_status" >&5
++  echo "$as_me:8409: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8409: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8412: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8412: \$? = $ac_status" >&5
++  echo "$as_me:8415: \$? = $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}:8417: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8420: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -8456,7 +8459,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8459: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:8462: 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
+@@ -8494,7 +8497,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8497 "configure"
++#line 8500 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8506,16 +8509,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8509: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8512: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8512: \$? = $ac_status" >&5
++  echo "$as_me:8515: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8515: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8518: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8518: \$? = $ac_status" >&5
++  echo "$as_me:8521: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -8532,7 +8535,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}:8535: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8538: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8568,7 +8571,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}:8571: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:8574: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -8598,13 +8601,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:8601: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:8604: 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:8604: result: yes" >&5
++		echo "$as_me:8607: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:8607: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:8610: 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
+ 
+@@ -8737,7 +8740,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8740 "configure"
++#line 8743 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8749,37 +8752,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8752: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8755: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8755: \$? = $ac_status" >&5
++  echo "$as_me:8758: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8758: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8761: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8761: \$? = $ac_status" >&5
++  echo "$as_me:8764: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8767 "configure"
++#line 8770 "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:8774: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8777: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8777: \$? = $ac_status" >&5
++  echo "$as_me:8780: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:8779: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8782: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8782: \$? = $ac_status" >&5
++  echo "$as_me:8785: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -8953,7 +8956,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8956 "configure"
++#line 8959 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8965,37 +8968,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8968: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8971: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8971: \$? = $ac_status" >&5
++  echo "$as_me:8974: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8974: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8977: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8977: \$? = $ac_status" >&5
++  echo "$as_me:8980: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8983 "configure"
++#line 8986 "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:8990: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8993: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8993: \$? = $ac_status" >&5
++  echo "$as_me:8996: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:8995: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8998: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8998: \$? = $ac_status" >&5
++  echo "$as_me:9001: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -9012,7 +9015,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:9015: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:9018: 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"
+@@ -9028,7 +9031,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:9031: checking for terminfo header" >&5
++echo "$as_me:9034: 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
+@@ -9046,7 +9049,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9049 "configure"
++#line 9052 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9061,16 +9064,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9064: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9067: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9067: \$? = $ac_status" >&5
++  echo "$as_me:9070: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9070: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9073: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9073: \$? = $ac_status" >&5
++  echo "$as_me:9076: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -9086,7 +9089,7 @@
+ done
+ 
+ fi
+-echo "$as_me:9089: result: $cf_cv_term_header" >&5
++echo "$as_me:9092: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9121,7 +9124,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:9124: result: no" >&5
++		echo "$as_me:9127: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -9137,7 +9140,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:9140: checking for $ac_word" >&5
++echo "$as_me:9143: 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
+@@ -9152,7 +9155,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:9155: found $ac_dir/$ac_word" >&5
++echo "$as_me:9158: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9160,10 +9163,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:9163: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:9166: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:9166: result: no" >&5
++  echo "$as_me:9169: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9176,7 +9179,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:9179: checking for $ac_word" >&5
++echo "$as_me:9182: 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
+@@ -9191,7 +9194,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:9194: found $ac_dir/$ac_word" >&5
++echo "$as_me:9197: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9199,10 +9202,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:9202: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:9205: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:9205: result: no" >&5
++  echo "$as_me:9208: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9359,7 +9362,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:9362: checking if we have identified curses headers" >&5
++echo "$as_me:9365: 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
+@@ -9371,7 +9374,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9374 "configure"
++#line 9377 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -9383,16 +9386,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9386: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9389: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9389: \$? = $ac_status" >&5
++  echo "$as_me:9392: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9392: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9395: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9395: \$? = $ac_status" >&5
++  echo "$as_me:9398: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -9403,11 +9406,11 @@
+ done
+ 
+ fi
+-echo "$as_me:9406: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:9409: 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:9410: error: No curses header-files found" >&5
++	{ { echo "$as_me:9413: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -9417,23 +9420,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:9420: checking for $ac_header" >&5
++echo "$as_me:9423: 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 9426 "configure"
++#line 9429 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:9430: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:9433: \"$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:9436: \$? = $ac_status" >&5
++  echo "$as_me:9439: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9452,7 +9455,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:9455: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:9458: 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 9511 "configure"
++#line 9514 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9520,16 +9523,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9523: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9526: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9526: \$? = $ac_status" >&5
++  echo "$as_me:9529: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9529: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9532: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9532: \$? = $ac_status" >&5
++  echo "$as_me:9535: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9546,7 +9549,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}:9549: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9552: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9565,7 +9568,7 @@
+ 
+ }
+ 
+-echo "$as_me:9568: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:9571: 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
+@@ -9577,7 +9580,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9580 "configure"
++#line 9583 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -9601,16 +9604,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9604: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9607: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9607: \$? = $ac_status" >&5
++  echo "$as_me:9610: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9610: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9613: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9613: \$? = $ac_status" >&5
++  echo "$as_me:9616: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -9625,14 +9628,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:9628: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:9631: 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:9635: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:9638: 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
+@@ -9753,7 +9756,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9756 "configure"
++#line 9759 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9765,16 +9768,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9768: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9771: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9771: \$? = $ac_status" >&5
++  echo "$as_me:9774: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9774: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9777: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9777: \$? = $ac_status" >&5
++  echo "$as_me:9780: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9791,7 +9794,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}:9794: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9797: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9814,7 +9817,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9817 "configure"
++#line 9820 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -9838,16 +9841,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9841: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9844: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9844: \$? = $ac_status" >&5
++  echo "$as_me:9847: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9847: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9850: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9850: \$? = $ac_status" >&5
++  echo "$as_me:9853: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -9868,12 +9871,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9871: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9874: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:9876: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:9879: 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%/[^/]*$%%'`
+@@ -9909,7 +9912,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9912 "configure"
++#line 9915 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9921,16 +9924,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9924: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9927: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9927: \$? = $ac_status" >&5
++  echo "$as_me:9930: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9930: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9933: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9933: \$? = $ac_status" >&5
++  echo "$as_me:9936: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9947,7 +9950,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}:9950: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9953: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9995,7 +9998,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9998: checking for terminfo header" >&5
++echo "$as_me:10001: 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
+@@ -10013,7 +10016,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10016 "configure"
++#line 10019 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -10028,16 +10031,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10031: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10034: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10034: \$? = $ac_status" >&5
++  echo "$as_me:10037: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10037: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10040: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10040: \$? = $ac_status" >&5
++  echo "$as_me:10043: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -10053,7 +10056,7 @@
+ done
+ 
+ fi
+-echo "$as_me:10056: result: $cf_cv_term_header" >&5
++echo "$as_me:10059: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10091,7 +10094,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:10094: checking for ncurses version" >&5
++echo "$as_me:10097: 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
+@@ -10117,10 +10120,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:10120: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:10123: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10123: \$? = $ac_status" >&5
++  echo "$as_me:10126: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -10130,7 +10133,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10133 "configure"
++#line 10136 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -10157,15 +10160,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10160: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10163: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10163: \$? = $ac_status" >&5
++  echo "$as_me:10166: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10165: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10168: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10168: \$? = $ac_status" >&5
++  echo "$as_me:10171: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -10179,7 +10182,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:10182: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:10185: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -10192,7 +10195,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:10195: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:10198: 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
+@@ -10200,7 +10203,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10203 "configure"
++#line 10206 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10219,16 +10222,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10222: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10225: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10225: \$? = $ac_status" >&5
++  echo "$as_me:10228: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10228: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10231: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10231: \$? = $ac_status" >&5
++  echo "$as_me:10234: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -10239,10 +10242,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10242: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:10245: 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:10245: checking for initscr in -lgpm" >&5
++  echo "$as_me:10248: 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
+@@ -10250,7 +10253,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10253 "configure"
++#line 10256 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10269,16 +10272,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10272: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10275: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10275: \$? = $ac_status" >&5
++  echo "$as_me:10278: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10278: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10281: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10281: \$? = $ac_status" >&5
++  echo "$as_me:10284: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -10289,7 +10292,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10292: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:10295: 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"
+@@ -10304,7 +10307,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:10307: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:10310: 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
+@@ -10312,7 +10315,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10315 "configure"
++#line 10318 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10331,16 +10334,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10334: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10337: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10337: \$? = $ac_status" >&5
++  echo "$as_me:10340: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10340: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10343: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10343: \$? = $ac_status" >&5
++  echo "$as_me:10346: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -10351,7 +10354,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10354: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:10357: 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"
+@@ -10400,13 +10403,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:10403: checking for initscr" >&5
++	echo "$as_me:10406: 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 10409 "configure"
++#line 10412 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10437,16 +10440,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10440: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10443: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10443: \$? = $ac_status" >&5
++  echo "$as_me:10446: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10446: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10449: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10449: \$? = $ac_status" >&5
++  echo "$as_me:10452: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -10456,18 +10459,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10459: result: $ac_cv_func_initscr" >&5
++echo "$as_me:10462: 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:10466: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:10469: 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 10470 "configure"
++#line 10473 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10479,25 +10482,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10482: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10485: \"$ac_link\"") >&5
+   (eval $ac_link) 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_exeext"'
+-  { (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
+-  echo "$as_me:10493: result: yes" >&5
++  echo "$as_me:10496: 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:10500: result: no" >&5
++echo "$as_me:10503: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -10565,11 +10568,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:10568: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:10571: 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 10572 "configure"
++#line 10575 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10581,25 +10584,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10584: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10587: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10587: \$? = $ac_status" >&5
++  echo "$as_me:10590: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10590: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10593: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10593: \$? = $ac_status" >&5
++  echo "$as_me:10596: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:10595: result: yes" >&5
++  echo "$as_me:10598: 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:10602: result: no" >&5
++echo "$as_me:10605: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -10614,7 +10617,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:10617: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:10620: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -10622,7 +10625,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:10625: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:10628: 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
+@@ -10632,7 +10635,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10635 "configure"
++#line 10638 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10644,23 +10647,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10647: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10650: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10650: \$? = $ac_status" >&5
++  echo "$as_me:10653: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10653: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10656: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10656: \$? = $ac_status" >&5
++  echo "$as_me:10659: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:10658: result: yes" >&5
++  echo "$as_me:10661: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:10663: result: no" >&5
++echo "$as_me:10666: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -10685,13 +10688,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:10688: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:10691: 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:10691: result: yes" >&5
++		echo "$as_me:10694: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:10694: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:10697: 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
+ 
+@@ -10824,7 +10827,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10827 "configure"
++#line 10830 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10836,37 +10839,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10839: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10842: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10842: \$? = $ac_status" >&5
++  echo "$as_me:10845: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10845: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10848: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10848: \$? = $ac_status" >&5
++  echo "$as_me:10851: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10854 "configure"
++#line 10857 "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:10861: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10864: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10864: \$? = $ac_status" >&5
++  echo "$as_me:10867: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10866: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10869: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10869: \$? = $ac_status" >&5
++  echo "$as_me:10872: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -11040,7 +11043,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11043 "configure"
++#line 11046 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11052,37 +11055,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11055: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11058: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11058: \$? = $ac_status" >&5
++  echo "$as_me:11061: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11061: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11064: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11064: \$? = $ac_status" >&5
++  echo "$as_me:11067: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11070 "configure"
++#line 11073 "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:11077: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11080: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11080: \$? = $ac_status" >&5
++  echo "$as_me:11083: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:11082: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11085: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11085: \$? = $ac_status" >&5
++  echo "$as_me:11088: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -11099,7 +11102,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:11102: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:11105: 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"
+@@ -11115,7 +11118,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:11118: checking for terminfo header" >&5
++echo "$as_me:11121: 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
+@@ -11133,7 +11136,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11136 "configure"
++#line 11139 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -11148,16 +11151,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11151: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11154: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11154: \$? = $ac_status" >&5
++  echo "$as_me:11157: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11157: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11160: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11160: \$? = $ac_status" >&5
++  echo "$as_me:11163: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -11173,7 +11176,7 @@
+ done
+ 
+ fi
+-echo "$as_me:11176: result: $cf_cv_term_header" >&5
++echo "$as_me:11179: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -11208,7 +11211,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:11211: result: no" >&5
++		echo "$as_me:11214: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -11224,7 +11227,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:11227: checking for $ac_word" >&5
++echo "$as_me:11230: 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
+@@ -11239,7 +11242,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:11242: found $ac_dir/$ac_word" >&5
++echo "$as_me:11245: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -11247,10 +11250,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:11250: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:11253: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:11253: result: no" >&5
++  echo "$as_me:11256: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -11263,7 +11266,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:11266: checking for $ac_word" >&5
++echo "$as_me:11269: 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
+@@ -11278,7 +11281,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:11281: found $ac_dir/$ac_word" >&5
++echo "$as_me:11284: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -11286,10 +11289,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:11289: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:11292: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:11292: result: no" >&5
++  echo "$as_me:11295: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -11446,7 +11449,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:11449: checking if we have identified curses headers" >&5
++echo "$as_me:11452: 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
+@@ -11458,7 +11461,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11461 "configure"
++#line 11464 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -11470,16 +11473,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11473: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11476: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11476: \$? = $ac_status" >&5
++  echo "$as_me:11479: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11479: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11482: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11482: \$? = $ac_status" >&5
++  echo "$as_me:11485: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -11490,11 +11493,11 @@
+ done
+ 
+ fi
+-echo "$as_me:11493: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:11496: 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:11497: error: No curses header-files found" >&5
++	{ { echo "$as_me:11500: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -11504,23 +11507,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:11507: checking for $ac_header" >&5
++echo "$as_me:11510: 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 11513 "configure"
++#line 11516 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:11517: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:11520: \"$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:11523: \$? = $ac_status" >&5
++  echo "$as_me:11526: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11539,7 +11542,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:11542: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:11545: 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 11598 "configure"
++#line 11601 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11607,16 +11610,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11610: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11613: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11613: \$? = $ac_status" >&5
++  echo "$as_me:11616: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11616: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11619: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11619: \$? = $ac_status" >&5
++  echo "$as_me:11622: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11633,7 +11636,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}:11636: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11639: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -11652,7 +11655,7 @@
+ 
+ }
+ 
+-echo "$as_me:11655: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:11658: 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
+@@ -11664,7 +11667,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11667 "configure"
++#line 11670 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -11688,16 +11691,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11691: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11694: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11694: \$? = $ac_status" >&5
++  echo "$as_me:11697: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11697: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11700: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11700: \$? = $ac_status" >&5
++  echo "$as_me:11703: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -11712,14 +11715,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:11715: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:11718: 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:11722: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:11725: 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
+@@ -11840,7 +11843,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11843 "configure"
++#line 11846 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11852,16 +11855,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11855: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11858: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11858: \$? = $ac_status" >&5
++  echo "$as_me:11861: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11861: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11864: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11864: \$? = $ac_status" >&5
++  echo "$as_me:11867: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11878,7 +11881,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}:11881: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11884: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -11901,7 +11904,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11904 "configure"
++#line 11907 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -11925,16 +11928,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11928: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11931: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11931: \$? = $ac_status" >&5
++  echo "$as_me:11934: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11934: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11937: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11937: \$? = $ac_status" >&5
++  echo "$as_me:11940: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -11955,12 +11958,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11958: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11961: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:11963: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:11966: 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%/[^/]*$%%'`
+@@ -11996,7 +11999,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11999 "configure"
++#line 12002 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12008,16 +12011,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12011: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12014: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12014: \$? = $ac_status" >&5
++  echo "$as_me:12017: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12017: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12020: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12020: \$? = $ac_status" >&5
++  echo "$as_me:12023: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -12034,7 +12037,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}:12037: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:12040: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -12082,7 +12085,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:12085: checking for terminfo header" >&5
++echo "$as_me:12088: 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
+@@ -12100,7 +12103,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12103 "configure"
++#line 12106 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -12115,16 +12118,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12118: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12121: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12121: \$? = $ac_status" >&5
++  echo "$as_me:12124: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12124: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12127: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12127: \$? = $ac_status" >&5
++  echo "$as_me:12130: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -12140,7 +12143,7 @@
+ done
+ 
+ fi
+-echo "$as_me:12143: result: $cf_cv_term_header" >&5
++echo "$as_me:12146: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -12178,7 +12181,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:12181: checking for ncurses version" >&5
++echo "$as_me:12184: 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
+@@ -12204,10 +12207,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:12207: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:12210: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12210: \$? = $ac_status" >&5
++  echo "$as_me:12213: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -12217,7 +12220,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12220 "configure"
++#line 12223 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12244,15 +12247,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:12247: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12250: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12250: \$? = $ac_status" >&5
++  echo "$as_me:12253: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:12252: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12255: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12255: \$? = $ac_status" >&5
++  echo "$as_me:12258: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -12266,7 +12269,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:12269: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:12272: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -12279,7 +12282,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:12282: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:12285: 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
+@@ -12287,7 +12290,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12290 "configure"
++#line 12293 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12306,16 +12309,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12309: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12312: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12312: \$? = $ac_status" >&5
++  echo "$as_me:12315: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12315: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12318: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12318: \$? = $ac_status" >&5
++  echo "$as_me:12321: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -12326,10 +12329,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12329: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:12332: 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:12332: checking for initscr in -lgpm" >&5
++  echo "$as_me:12335: 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
+@@ -12337,7 +12340,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12340 "configure"
++#line 12343 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12356,16 +12359,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12359: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12362: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12362: \$? = $ac_status" >&5
++  echo "$as_me:12365: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12365: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12368: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12368: \$? = $ac_status" >&5
++  echo "$as_me:12371: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -12376,7 +12379,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12379: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:12382: 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"
+@@ -12391,7 +12394,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:12394: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:12397: 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
+@@ -12399,7 +12402,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12402 "configure"
++#line 12405 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12418,16 +12421,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12421: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12424: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12424: \$? = $ac_status" >&5
++  echo "$as_me:12427: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12427: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12430: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12430: \$? = $ac_status" >&5
++  echo "$as_me:12433: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -12438,7 +12441,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12441: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:12444: 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"
+@@ -12487,13 +12490,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:12490: checking for initscr" >&5
++	echo "$as_me:12493: 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 12496 "configure"
++#line 12499 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12524,16 +12527,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12527: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12530: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12530: \$? = $ac_status" >&5
++  echo "$as_me:12533: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12533: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12536: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12536: \$? = $ac_status" >&5
++  echo "$as_me:12539: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -12543,18 +12546,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12546: result: $ac_cv_func_initscr" >&5
++echo "$as_me:12549: 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:12553: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:12556: 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 12557 "configure"
++#line 12560 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12566,25 +12569,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12569: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12572: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12572: \$? = $ac_status" >&5
++  echo "$as_me:12575: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12575: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12578: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12578: \$? = $ac_status" >&5
++  echo "$as_me:12581: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:12580: result: yes" >&5
++  echo "$as_me:12583: 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:12587: result: no" >&5
++echo "$as_me:12590: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -12652,11 +12655,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:12655: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:12658: 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 12659 "configure"
++#line 12662 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12668,25 +12671,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12671: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12674: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12674: \$? = $ac_status" >&5
++  echo "$as_me:12677: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12677: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12680: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12680: \$? = $ac_status" >&5
++  echo "$as_me:12683: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:12682: result: yes" >&5
++  echo "$as_me:12685: 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:12689: result: no" >&5
++echo "$as_me:12692: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -12701,7 +12704,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:12704: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:12707: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -12709,7 +12712,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:12712: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:12715: 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
+@@ -12719,7 +12722,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12722 "configure"
++#line 12725 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12731,23 +12734,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12734: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12737: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12737: \$? = $ac_status" >&5
++  echo "$as_me:12740: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12740: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12743: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12743: \$? = $ac_status" >&5
++  echo "$as_me:12746: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:12745: result: yes" >&5
++  echo "$as_me:12748: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:12750: result: no" >&5
++echo "$as_me:12753: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -12767,7 +12770,7 @@
+ 
+ 	;;
+ (pdcurses)
+-	echo "$as_me:12770: checking for X" >&5
++	echo "$as_me:12773: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
+ # Check whether --with-x or --without-x was given.
+@@ -12871,17 +12874,17 @@
+   # Guess where to find include files, by looking for Intrinsic.h.
+   # First, try using that file with no special directory specified.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12874 "configure"
++#line 12877 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:12878: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12881: \"$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:12884: \$? = $ac_status" >&5
++  echo "$as_me:12887: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12914,7 +12917,7 @@
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12917 "configure"
++#line 12920 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12926,16 +12929,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12929: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12932: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12932: \$? = $ac_status" >&5
++  echo "$as_me:12935: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12935: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12938: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12938: \$? = $ac_status" >&5
++  echo "$as_me:12941: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -12973,7 +12976,7 @@
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:12976: result: $have_x" >&5
++  echo "$as_me:12979: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+   no_x=yes
+ else
+@@ -12983,7 +12986,7 @@
+   # Update the cache value to reflect the command line values.
+   ac_cv_have_x="have_x=yes \
+ 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  echo "$as_me:12986: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "$as_me:12989: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+@@ -13010,11 +13013,11 @@
+     # others require no space.  Words are not sufficient . . . .
+     case `(uname -sr) 2>/dev/null` in
+     "SunOS 5"*)
+-      echo "$as_me:13013: checking whether -R must be followed by a space" >&5
++      echo "$as_me:13016: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+       cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13017 "configure"
++#line 13020 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -13026,16 +13029,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13029: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13032: \"$ac_link\"") >&5
+   (eval $ac_link) 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_exeext"'
+-  { (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
+   ac_R_nospace=yes
+ else
+@@ -13045,13 +13048,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+       if test $ac_R_nospace = yes; then
+-	echo "$as_me:13048: result: no" >&5
++	echo "$as_me:13051: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	X_LIBS="$X_LIBS -R$x_libraries"
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13054 "configure"
++#line 13057 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -13063,16 +13066,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13066: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13069: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13069: \$? = $ac_status" >&5
++  echo "$as_me:13072: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13072: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13075: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13075: \$? = $ac_status" >&5
++  echo "$as_me:13078: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_space=yes
+ else
+@@ -13082,11 +13085,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	if test $ac_R_space = yes; then
+-	  echo "$as_me:13085: result: yes" >&5
++	  echo "$as_me:13088: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ 	else
+-	  echo "$as_me:13089: result: neither works" >&5
++	  echo "$as_me:13092: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ 	fi
+       fi
+@@ -13106,7 +13109,7 @@
+     # the Alpha needs dnet_stub (dnet does not exist).
+     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13109 "configure"
++#line 13112 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13125,22 +13128,22 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13128: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13131: \"$ac_link\"") >&5
+   (eval $ac_link) 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_exeext"'
+-  { (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
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:13143: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:13146: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13148,7 +13151,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13151 "configure"
++#line 13154 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13167,16 +13170,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13170: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13173: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13173: \$? = $ac_status" >&5
++  echo "$as_me:13176: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13176: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13179: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13179: \$? = $ac_status" >&5
++  echo "$as_me:13182: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -13187,14 +13190,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13190: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:13193: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      echo "$as_me:13197: checking for dnet_ntoa in -ldnet_stub" >&5
++      echo "$as_me:13200: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13202,7 +13205,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13205 "configure"
++#line 13208 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13221,16 +13224,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13224: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13227: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13227: \$? = $ac_status" >&5
++  echo "$as_me:13230: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13230: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13233: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13233: \$? = $ac_status" >&5
++  echo "$as_me:13236: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -13241,7 +13244,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13244: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:13247: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -13260,13 +13263,13 @@
+     # on Irix 5.2, according to T.E. Dickey.
+     # The functions gethostbyname, getservbyname, and inet_addr are
+     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+-    echo "$as_me:13263: checking for gethostbyname" >&5
++    echo "$as_me:13266: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13269 "configure"
++#line 13272 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13297,16 +13300,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13300: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13303: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13303: \$? = $ac_status" >&5
++  echo "$as_me:13306: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13306: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13309: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13309: \$? = $ac_status" >&5
++  echo "$as_me:13312: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gethostbyname=yes
+ else
+@@ -13316,11 +13319,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13319: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:13322: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+-      echo "$as_me:13323: checking for gethostbyname in -lnsl" >&5
++      echo "$as_me:13326: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13328,7 +13331,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13331 "configure"
++#line 13334 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13347,16 +13350,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13350: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13353: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13353: \$? = $ac_status" >&5
++  echo "$as_me:13356: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13356: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13359: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13359: \$? = $ac_status" >&5
++  echo "$as_me:13362: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -13367,14 +13370,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13370: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:13373: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test "$ac_cv_lib_nsl_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+-        echo "$as_me:13377: checking for gethostbyname in -lbsd" >&5
++        echo "$as_me:13380: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13382,7 +13385,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13385 "configure"
++#line 13388 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13401,16 +13404,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13404: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13407: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13407: \$? = $ac_status" >&5
++  echo "$as_me:13410: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13410: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13413: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13413: \$? = $ac_status" >&5
++  echo "$as_me:13416: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -13421,7 +13424,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13424: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:13427: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test "$ac_cv_lib_bsd_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -13437,13 +13440,13 @@
+     # variants that don't use the nameserver (or something).  -lsocket
+     # must be given before -lnsl if both are needed.  We assume that
+     # if connect needs -lnsl, so does gethostbyname.
+-    echo "$as_me:13440: checking for connect" >&5
++    echo "$as_me:13443: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13446 "configure"
++#line 13449 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13474,16 +13477,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13477: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13480: \"$ac_link\"") >&5
+   (eval $ac_link) 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_exeext"'
+-  { (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
+   ac_cv_func_connect=yes
+ else
+@@ -13493,11 +13496,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13496: result: $ac_cv_func_connect" >&5
++echo "$as_me:13499: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+ 
+     if test $ac_cv_func_connect = no; then
+-      echo "$as_me:13500: checking for connect in -lsocket" >&5
++      echo "$as_me:13503: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13505,7 +13508,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13508 "configure"
++#line 13511 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13524,16 +13527,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13527: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13530: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13530: \$? = $ac_status" >&5
++  echo "$as_me:13533: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13533: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13536: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13536: \$? = $ac_status" >&5
++  echo "$as_me:13539: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_socket_connect=yes
+ else
+@@ -13544,7 +13547,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13547: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:13550: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test "$ac_cv_lib_socket_connect" = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -13553,13 +13556,13 @@
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    echo "$as_me:13556: checking for remove" >&5
++    echo "$as_me:13559: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13562 "configure"
++#line 13565 "configure"
+ #include "confdefs.h"
+ #define remove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13590,16 +13593,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13593: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13596: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13596: \$? = $ac_status" >&5
++  echo "$as_me:13599: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13599: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13602: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13602: \$? = $ac_status" >&5
++  echo "$as_me:13605: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_remove=yes
+ else
+@@ -13609,11 +13612,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13612: result: $ac_cv_func_remove" >&5
++echo "$as_me:13615: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+ 
+     if test $ac_cv_func_remove = no; then
+-      echo "$as_me:13616: checking for remove in -lposix" >&5
++      echo "$as_me:13619: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13621,7 +13624,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13624 "configure"
++#line 13627 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13640,16 +13643,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13643: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13646: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13646: \$? = $ac_status" >&5
++  echo "$as_me:13649: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13649: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13652: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13652: \$? = $ac_status" >&5
++  echo "$as_me:13655: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_posix_remove=yes
+ else
+@@ -13660,7 +13663,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13663: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:13666: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test "$ac_cv_lib_posix_remove" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -13669,13 +13672,13 @@
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    echo "$as_me:13672: checking for shmat" >&5
++    echo "$as_me:13675: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13678 "configure"
++#line 13681 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13706,16 +13709,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13709: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13712: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13712: \$? = $ac_status" >&5
++  echo "$as_me:13715: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13715: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13718: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13718: \$? = $ac_status" >&5
++  echo "$as_me:13721: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_shmat=yes
+ else
+@@ -13725,11 +13728,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13728: result: $ac_cv_func_shmat" >&5
++echo "$as_me:13731: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+ 
+     if test $ac_cv_func_shmat = no; then
+-      echo "$as_me:13732: checking for shmat in -lipc" >&5
++      echo "$as_me:13735: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13737,7 +13740,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13740 "configure"
++#line 13743 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13756,16 +13759,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13759: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13762: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13762: \$? = $ac_status" >&5
++  echo "$as_me:13765: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13765: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13768: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13768: \$? = $ac_status" >&5
++  echo "$as_me:13771: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+@@ -13776,7 +13779,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13779: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:13782: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test "$ac_cv_lib_ipc_shmat" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -13794,7 +13797,7 @@
+   # These have to be linked with before -lX11, unlike the other
+   # libraries we check for below, so use a different variable.
+   # John Interrante, Karl Berry
+-  echo "$as_me:13797: checking for IceConnectionNumber in -lICE" >&5
++  echo "$as_me:13800: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13802,7 +13805,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13805 "configure"
++#line 13808 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13821,16 +13824,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13824: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13827: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13827: \$? = $ac_status" >&5
++  echo "$as_me:13830: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13830: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13833: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13833: \$? = $ac_status" >&5
++  echo "$as_me:13836: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -13841,7 +13844,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13844: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:13847: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -13853,7 +13856,7 @@
+ 
+ cf_x_athena=${cf_x_athena:-Xaw}
+ 
+-echo "$as_me:13856: checking if you want to link with Xaw 3d library" >&5
++echo "$as_me:13859: checking if you want to link with Xaw 3d library" >&5
+ echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
+ withval=
+ 
+@@ -13864,14 +13867,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=Xaw3d
+-	echo "$as_me:13867: result: yes" >&5
++	echo "$as_me:13870: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:13870: result: no" >&5
++	echo "$as_me:13873: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:13874: checking if you want to link with Xaw 3d xft library" >&5
++echo "$as_me:13877: checking if you want to link with Xaw 3d xft library" >&5
+ echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
+ withval=
+ 
+@@ -13882,14 +13885,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=Xaw3dxft
+-	echo "$as_me:13885: result: yes" >&5
++	echo "$as_me:13888: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:13888: result: no" >&5
++	echo "$as_me:13891: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:13892: checking if you want to link with neXT Athena library" >&5
++echo "$as_me:13895: checking if you want to link with neXT Athena library" >&5
+ echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
+ withval=
+ 
+@@ -13900,14 +13903,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=neXtaw
+-	echo "$as_me:13903: result: yes" >&5
++	echo "$as_me:13906: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:13906: result: no" >&5
++	echo "$as_me:13909: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:13910: checking if you want to link with Athena-Plus library" >&5
++echo "$as_me:13913: checking if you want to link with Athena-Plus library" >&5
+ echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
+ withval=
+ 
+@@ -13918,10 +13921,10 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=XawPlus
+-	echo "$as_me:13921: result: yes" >&5
++	echo "$as_me:13924: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:13924: result: no" >&5
++	echo "$as_me:13927: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -13941,17 +13944,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_athena_pkg"; then
+ 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
+ 
+-echo "${as_me:-configure}:13944: testing found package $cf_athena_pkg ..." 1>&5
++echo "${as_me:-configure}:13947: testing found package $cf_athena_pkg ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_athena_pkg" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_athena_pkg" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:13950: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13953: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:13954: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13957: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14082,20 +14085,20 @@
+ 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
+ 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14085: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:14088: testing ..trimmed $LIBS ..." 1>&5
+ 
+ 			;;
+ 		esac
+ 	done
+ 
+-echo "$as_me:14091: checking for usable $cf_x_athena/Xmu package" >&5
++echo "$as_me:14094: checking for usable $cf_x_athena/Xmu package" >&5
+ echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
+ if test "${cf_cv_xaw_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14098 "configure"
++#line 14101 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14113,16 +14116,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14116: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14119: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14119: \$? = $ac_status" >&5
++  echo "$as_me:14122: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14122: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14125: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14125: \$? = $ac_status" >&5
++  echo "$as_me:14128: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xaw_compat=yes
+ else
+@@ -14132,7 +14135,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14135: result: $cf_cv_xaw_compat" >&5
++echo "$as_me:14138: result: $cf_cv_xaw_compat" >&5
+ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
+ 
+ 			if test "$cf_cv_xaw_compat" = no
+@@ -14144,7 +14147,7 @@
+ 				(*)
+ 					test -n "$verbose" && echo "	work around broken package" 1>&6
+ 
+-echo "${as_me:-configure}:14147: testing work around broken package ..." 1>&5
++echo "${as_me:-configure}:14150: testing work around broken package ..." 1>&5
+ 
+ 					cf_save_xmu="$LIBS"
+ 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
+@@ -14152,17 +14155,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
+ 	test -n "$verbose" && echo "	found package xmu" 1>&6
+ 
+-echo "${as_me:-configure}:14155: testing found package xmu ..." 1>&5
++echo "${as_me:-configure}:14158: testing found package xmu ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xmu" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xmu" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14161: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14164: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xmu LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14165: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14168: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14282,12 +14285,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14285: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14288: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14290: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:14293: testing ...after  $LIBS ..." 1>&5
+ 
+ else
+ 	cf_pkgconfig_incs=
+@@ -14295,12 +14298,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14298: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14301: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14303: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:14306: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -14311,7 +14314,7 @@
+ 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
+ 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14314: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:14317: testing ..trimmed $LIBS ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -14336,17 +14339,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
+ 	test -n "$verbose" && echo "	found package Xext" 1>&6
+ 
+-echo "${as_me:-configure}:14339: testing found package Xext ..." 1>&5
++echo "${as_me:-configure}:14342: testing found package Xext ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "Xext" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "Xext" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14345: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14348: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package Xext LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14349: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14352: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14467,7 +14470,7 @@
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+ 
+-	echo "$as_me:14470: checking for XextCreateExtension in -lXext" >&5
++	echo "$as_me:14473: checking for XextCreateExtension in -lXext" >&5
+ echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14475,7 +14478,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXext  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14478 "configure"
++#line 14481 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14494,16 +14497,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14497: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14500: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14500: \$? = $ac_status" >&5
++  echo "$as_me:14503: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14503: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14506: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14506: \$? = $ac_status" >&5
++  echo "$as_me:14509: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_Xext_XextCreateExtension=yes
+ else
+@@ -14514,7 +14517,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14517: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
++echo "$as_me:14520: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
+ if test "$ac_cv_lib_Xext_XextCreateExtension" = yes; then
+ 
+@@ -14550,17 +14553,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
+ 	test -n "$verbose" && echo "	found package x11" 1>&6
+ 
+-echo "${as_me:-configure}:14553: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:14556: testing found package x11 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "x11" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14559: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14562: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14563: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14566: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14680,24 +14683,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:14683: WARNING: unable to find X11 library" >&5
++	{ echo "$as_me:14686: WARNING: unable to find X11 library" >&5
+ echo "$as_me: WARNING: unable to find X11 library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then
+ 	test -n "$verbose" && echo "	found package ice" 1>&6
+ 
+-echo "${as_me:-configure}:14690: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:14693: testing found package ice ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "ice" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14696: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14699: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14700: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14703: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14817,24 +14820,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:14820: WARNING: unable to find ICE library" >&5
++	{ echo "$as_me:14823: WARNING: unable to find ICE library" >&5
+ echo "$as_me: WARNING: unable to find ICE library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
+ 	test -n "$verbose" && echo "	found package sm" 1>&6
+ 
+-echo "${as_me:-configure}:14827: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:14830: testing found package sm ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "sm" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14833: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14836: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14837: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14840: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14954,24 +14957,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:14957: WARNING: unable to find SM library" >&5
++	{ echo "$as_me:14960: WARNING: unable to find SM library" >&5
+ echo "$as_me: WARNING: unable to find SM library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
+ 	test -n "$verbose" && echo "	found package xt" 1>&6
+ 
+-echo "${as_me:-configure}:14964: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:14967: testing found package xt ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xt" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14970: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14973: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14974: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14977: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15091,7 +15094,7 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:15094: WARNING: unable to find Xt library" >&5
++	{ echo "$as_me:15097: WARNING: unable to find Xt library" >&5
+ echo "$as_me: WARNING: unable to find Xt library" >&2;}
+ fi
+ 
+@@ -15104,17 +15107,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
+ 	test -n "$verbose" && echo "	found package xt" 1>&6
+ 
+-echo "${as_me:-configure}:15107: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:15110: testing found package xt ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xt" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15113: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15116: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15117: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15120: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15235,14 +15238,14 @@
+ 		;;
+ 	(*)
+ # we have an "xt" package, but it may omit Xt's dependency on X11
+-echo "$as_me:15238: checking for usable X dependency" >&5
++echo "$as_me:15241: checking for usable X dependency" >&5
+ echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
+ if test "${cf_cv_xt_x11_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15245 "configure"
++#line 15248 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -15262,16 +15265,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15265: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15268: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15268: \$? = $ac_status" >&5
++  echo "$as_me:15271: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15271: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15274: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15274: \$? = $ac_status" >&5
++  echo "$as_me:15277: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xt_x11_compat=yes
+ else
+@@ -15281,30 +15284,30 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15284: result: $cf_cv_xt_x11_compat" >&5
++echo "$as_me:15287: result: $cf_cv_xt_x11_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
+ 		if test "$cf_cv_xt_x11_compat" = no
+ 		then
+ 			test -n "$verbose" && echo "	work around broken X11 dependency" 1>&6
+ 
+-echo "${as_me:-configure}:15290: testing work around broken X11 dependency ..." 1>&5
++echo "${as_me:-configure}:15293: testing work around broken X11 dependency ..." 1>&5
+ 
+ 			# 2010/11/19 - good enough until a working Xt on Xcb is delivered.
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
+ 	test -n "$verbose" && echo "	found package x11" 1>&6
+ 
+-echo "${as_me:-configure}:15297: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:15300: testing found package x11 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "x11" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15303: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15306: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15307: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15310: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15427,12 +15430,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:15430: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:15433: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:15435: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:15438: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -15440,14 +15443,14 @@
+ 		;;
+ 	esac
+ 
+-echo "$as_me:15443: checking for usable X Toolkit package" >&5
++echo "$as_me:15446: checking for usable X Toolkit package" >&5
+ echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
+ if test "${cf_cv_xt_ice_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15450 "configure"
++#line 15453 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -15463,16 +15466,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15466: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15469: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15469: \$? = $ac_status" >&5
++  echo "$as_me:15472: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15472: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15475: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15475: \$? = $ac_status" >&5
++  echo "$as_me:15478: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xt_ice_compat=yes
+ else
+@@ -15482,7 +15485,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15485: result: $cf_cv_xt_ice_compat" >&5
++echo "$as_me:15488: result: $cf_cv_xt_ice_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
+ 
+ 	if test "$cf_cv_xt_ice_compat" = no
+@@ -15496,22 +15499,22 @@
+ 			(*)
+ 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
+ 
+-echo "${as_me:-configure}:15499: testing work around broken ICE dependency ..." 1>&5
++echo "${as_me:-configure}:15502: testing work around broken ICE dependency ..." 1>&5
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then
+ 	test -n "$verbose" && echo "	found package ice" 1>&6
+ 
+-echo "${as_me:-configure}:15504: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:15507: testing found package ice ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "ice" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15510: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15513: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15514: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15517: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15630,17 +15633,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
+ 	test -n "$verbose" && echo "	found package sm" 1>&6
+ 
+-echo "${as_me:-configure}:15633: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:15636: testing found package sm ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "sm" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15639: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15642: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15643: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15646: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15769,12 +15772,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:15772: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:15775: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:15777: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:15780: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -15794,7 +15797,7 @@
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15797: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15800: testing checking additions to CFLAGS ..." 1>&5
+ 
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -15879,7 +15882,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:15882: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:15885: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -15889,7 +15892,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:15892: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:15895: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -15899,7 +15902,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}:15902: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:15905: 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"
+@@ -15908,7 +15911,7 @@
+ 
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15911 "configure"
++#line 15914 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -15920,16 +15923,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15923: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15926: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15926: \$? = $ac_status" >&5
++  echo "$as_me:15929: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15929: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15932: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15932: \$? = $ac_status" >&5
++  echo "$as_me:15935: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -15937,12 +15940,12 @@
+ cat "conftest.$ac_ext" >&5
+ test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15940: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15943: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+ 
+ 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
+ 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15945: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:15948: testing but keeping change to \$CPPFLAGS ..." 1>&5
+ 
+ 	 fi
+ 	 CFLAGS="$cf_check_cflags"
+@@ -15950,13 +15953,13 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+ 
+-	echo "$as_me:15953: checking for XOpenDisplay" >&5
++	echo "$as_me:15956: checking for XOpenDisplay" >&5
+ echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
+ if test "${ac_cv_func_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15959 "configure"
++#line 15962 "configure"
+ #include "confdefs.h"
+ #define XOpenDisplay autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15987,16 +15990,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15990: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15993: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15993: \$? = $ac_status" >&5
++  echo "$as_me:15996: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15996: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15999: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15999: \$? = $ac_status" >&5
++  echo "$as_me:16002: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_XOpenDisplay=yes
+ else
+@@ -16006,13 +16009,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16009: result: $ac_cv_func_XOpenDisplay" >&5
++echo "$as_me:16012: result: $ac_cv_func_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
+ if test "$ac_cv_func_XOpenDisplay" = yes; then
+   :
+ else
+ 
+-	echo "$as_me:16015: checking for XOpenDisplay in -lX11" >&5
++	echo "$as_me:16018: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16020,7 +16023,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16023 "configure"
++#line 16026 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16039,16 +16042,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16042: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16045: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16045: \$? = $ac_status" >&5
++  echo "$as_me:16048: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16048: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16051: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16051: \$? = $ac_status" >&5
++  echo "$as_me:16054: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -16059,7 +16062,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16062: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:16065: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then
+ 
+@@ -16083,13 +16086,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:16086: checking for XtAppInitialize" >&5
++	echo "$as_me:16089: checking for XtAppInitialize" >&5
+ echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
+ if test "${ac_cv_func_XtAppInitialize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16092 "configure"
++#line 16095 "configure"
+ #include "confdefs.h"
+ #define XtAppInitialize autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16120,16 +16123,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16123: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16126: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16126: \$? = $ac_status" >&5
++  echo "$as_me:16129: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16129: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16132: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16132: \$? = $ac_status" >&5
++  echo "$as_me:16135: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_XtAppInitialize=yes
+ else
+@@ -16139,13 +16142,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16142: result: $ac_cv_func_XtAppInitialize" >&5
++echo "$as_me:16145: result: $ac_cv_func_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
+ if test "$ac_cv_func_XtAppInitialize" = yes; then
+   :
+ else
+ 
+-	echo "$as_me:16148: checking for XtAppInitialize in -lXt" >&5
++	echo "$as_me:16151: checking for XtAppInitialize in -lXt" >&5
+ echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16153,7 +16156,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16156 "configure"
++#line 16159 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16172,16 +16175,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16175: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16178: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16178: \$? = $ac_status" >&5
++  echo "$as_me:16181: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16181: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16184: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16184: \$? = $ac_status" >&5
++  echo "$as_me:16187: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_Xt_XtAppInitialize=yes
+ else
+@@ -16192,7 +16195,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16195: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
++echo "$as_me:16198: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
+ if test "$ac_cv_lib_Xt_XtAppInitialize" = yes; then
+ 
+@@ -16209,7 +16212,7 @@
+ fi
+ 
+ if test "$cf_have_X_LIBS" = no ; then
+-	{ echo "$as_me:16212: WARNING: Unable to successfully link X Toolkit library (-lXt) with
++	{ echo "$as_me:16215: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+ test program.  You will have to check and add the proper libraries by hand
+ to makefile." >&5
+ echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+@@ -16250,14 +16253,14 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
+ 
+-			echo "$as_me:16253: checking for $cf_test in $cf_path" >&5
++			echo "$as_me:16256: checking for $cf_test in $cf_path" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
+ 		else
+-			echo "$as_me:16256: checking for $cf_test" >&5
++			echo "$as_me:16259: checking for $cf_test" >&5
+ echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
+ 		fi
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16260 "configure"
++#line 16263 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16271,16 +16274,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16274: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16277: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16277: \$? = $ac_status" >&5
++  echo "$as_me:16280: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16280: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16283: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16283: \$? = $ac_status" >&5
++  echo "$as_me:16286: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -16289,7 +16292,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-		echo "$as_me:16292: result: $cf_result" >&5
++		echo "$as_me:16295: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
+@@ -16305,7 +16308,7 @@
+ done
+ 
+ if test -z "$cf_x_athena_inc" ; then
+-	{ echo "$as_me:16308: WARNING: Unable to find Athena header files" >&5
++	{ echo "$as_me:16311: WARNING: Unable to find Athena header files" >&5
+ echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
+ elif test "$cf_x_athena_inc" != default ; then
+ 
+@@ -16370,10 +16373,10 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-		echo "$as_me:16373: checking for $cf_test in $cf_libs" >&5
++		echo "$as_me:16376: checking for $cf_test in $cf_libs" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16376 "configure"
++#line 16379 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -16390,16 +16393,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16393: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16396: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16396: \$? = $ac_status" >&5
++  echo "$as_me:16399: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16399: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16402: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16402: \$? = $ac_status" >&5
++  echo "$as_me:16405: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -16408,7 +16411,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:16411: result: $cf_result" >&5
++		echo "$as_me:16414: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
+@@ -16425,7 +16428,7 @@
+ done
+ 
+ if test -z "$cf_x_athena_lib" ; then
+-	{ { echo "$as_me:16428: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
++	{ { echo "$as_me:16431: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+ echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -16459,7 +16462,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:16462: checking for $ac_word" >&5
++echo "$as_me:16465: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16474,7 +16477,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:16477: found $ac_dir/$ac_word" >&5
++echo "$as_me:16480: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -16482,10 +16485,10 @@
+ fi
+ XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
+ if test -n "$XCURSES_CONFIG"; then
+-  echo "$as_me:16485: result: $XCURSES_CONFIG" >&5
++  echo "$as_me:16488: result: $XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$XCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:16488: result: no" >&5
++  echo "$as_me:16491: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -16498,7 +16501,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:16501: checking for $ac_word" >&5
++echo "$as_me:16504: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16513,7 +16516,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
+-echo "$as_me:16516: found $ac_dir/$ac_word" >&5
++echo "$as_me:16519: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -16521,10 +16524,10 @@
+ fi
+ ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
+ if test -n "$ac_ct_XCURSES_CONFIG"; then
+-  echo "$as_me:16524: result: $ac_ct_XCURSES_CONFIG" >&5
++  echo "$as_me:16527: result: $ac_ct_XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:16527: result: no" >&5
++  echo "$as_me:16530: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -16659,7 +16662,7 @@
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16662: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16665: testing checking additions to CFLAGS ..." 1>&5
+ 
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -16744,7 +16747,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:16747: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:16750: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -16754,7 +16757,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:16757: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:16760: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -16764,7 +16767,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}:16767: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:16770: 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"
+@@ -16773,7 +16776,7 @@
+ 
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16776 "configure"
++#line 16779 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -16785,16 +16788,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16788: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16791: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16791: \$? = $ac_status" >&5
++  echo "$as_me:16794: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16794: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16797: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16797: \$? = $ac_status" >&5
++  echo "$as_me:16800: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -16802,12 +16805,12 @@
+ cat "conftest.$ac_ext" >&5
+ test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16805: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16808: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+ 
+ 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
+ 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16810: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16813: testing but keeping change to \$CPPFLAGS ..." 1>&5
+ 
+ 	 fi
+ 	 CFLAGS="$cf_check_cflags"
+@@ -16815,7 +16818,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:16818: checking for XOpenDisplay in -lX11" >&5
++echo "$as_me:16821: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16823,7 +16826,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16826 "configure"
++#line 16829 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16842,16 +16845,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16845: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16848: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16848: \$? = $ac_status" >&5
++  echo "$as_me:16851: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16851: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16854: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16854: \$? = $ac_status" >&5
++  echo "$as_me:16857: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -16862,7 +16865,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16865: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:16868: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then
+ 
+@@ -16884,7 +16887,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16887: checking for XCurses library" >&5
++echo "$as_me:16890: checking for XCurses library" >&5
+ echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
+ if test "${cf_cv_lib_XCurses+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16907,7 +16910,7 @@
+ LIBS="$cf_add_libs"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16910 "configure"
++#line 16913 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16922,16 +16925,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16925: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16928: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16928: \$? = $ac_status" >&5
++  echo "$as_me:16931: \$? = $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:16934: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16934: \$? = $ac_status" >&5
++  echo "$as_me:16937: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_lib_XCurses=yes
+ else
+@@ -16942,7 +16945,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16945: result: $cf_cv_lib_XCurses" >&5
++echo "$as_me:16948: result: $cf_cv_lib_XCurses" >&5
+ echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
+ 
+ fi
+@@ -16957,23 +16960,23 @@
+ #define XCURSES 1
+ EOF
+ 
+-	echo "$as_me:16960: checking for xcurses.h" >&5
++	echo "$as_me:16963: checking for xcurses.h" >&5
+ echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
+ if test "${ac_cv_header_xcurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16966 "configure"
++#line 16969 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16970: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16973: \"$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:16976: \$? = $ac_status" >&5
++  echo "$as_me:16979: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16992,7 +16995,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16995: result: $ac_cv_header_xcurses_h" >&5
++echo "$as_me:16998: result: $ac_cv_header_xcurses_h" >&5
+ echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
+ if test "$ac_cv_header_xcurses_h" = yes; then
+ 
+@@ -17003,26 +17006,26 @@
+ fi
+ 
+ else
+-	{ { echo "$as_me:17006: error: Cannot link with XCurses" >&5
++	{ { echo "$as_me:17009: error: Cannot link with XCurses" >&5
+ echo "$as_me: error: Cannot link with XCurses" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ 	;;
+ (*)
+-	{ { echo "$as_me:17013: error: unexpected screen-value: $cf_cv_screen" >&5
++	{ { echo "$as_me:17016: error: unexpected screen-value: $cf_cv_screen" >&5
+ echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+-echo "$as_me:17019: checking for _nc_init_pthreads" >&5
++echo "$as_me:17022: checking for _nc_init_pthreads" >&5
+ echo $ECHO_N "checking for _nc_init_pthreads... $ECHO_C" >&6
+ if test "${ac_cv_func__nc_init_pthreads+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17025 "configure"
++#line 17028 "configure"
+ #include "confdefs.h"
+ #define _nc_init_pthreads autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17053,16 +17056,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17056: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17059: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17059: \$? = $ac_status" >&5
++  echo "$as_me:17062: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17062: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17065: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17065: \$? = $ac_status" >&5
++  echo "$as_me:17068: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func__nc_init_pthreads=yes
+ else
+@@ -17072,7 +17075,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17075: result: $ac_cv_func__nc_init_pthreads" >&5
++echo "$as_me:17078: result: $ac_cv_func__nc_init_pthreads" >&5
+ echo "${ECHO_T}$ac_cv_func__nc_init_pthreads" >&6
+ if test "$ac_cv_func__nc_init_pthreads" = yes; then
+   cf_cv_ncurses_pthreads=yes
+@@ -17107,7 +17110,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17110: checking for X11 rgb file" >&5
++echo "$as_me:17113: 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.
+@@ -17169,7 +17172,7 @@
+ 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:17172: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:17175: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -17177,7 +17180,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17180: result: $RGB_PATH" >&5
++echo "$as_me:17183: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:17224: 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.
+@@ -17238,10 +17241,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17241: result: $FORM_NAME" >&5
++echo "$as_me:17244: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:17244: checking for desired basename for menu library" >&5
++echo "$as_me:17247: 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.
+@@ -17261,10 +17264,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17264: result: $MENU_NAME" >&5
++echo "$as_me:17267: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:17267: checking for desired basename for panel library" >&5
++echo "$as_me:17270: 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.
+@@ -17284,10 +17287,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17287: result: $PANEL_NAME" >&5
++echo "$as_me:17290: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:17290: checking if you want to check for panel functions" >&5
++echo "$as_me:17293: checking if you want to check for panel functions" >&5
+ echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-panel or --disable-panel was given.
+@@ -17304,7 +17307,7 @@
+ 	cf_enable_panel=$cf_default_panel
+ 
+ fi;
+-echo "$as_me:17307: result: $cf_enable_panel" >&5
++echo "$as_me:17310: result: $cf_enable_panel" >&5
+ echo "${ECHO_T}$cf_enable_panel" >&6
+ if test $cf_enable_panel = yes
+ then
+@@ -17315,13 +17318,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:17318: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
++	echo "$as_me:17321: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists "$PANEL_NAME$cf_cv_libtype" ; then
+-		echo "$as_me:17321: result: yes" >&5
++		echo "$as_me:17324: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:17324: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
++		echo "$as_me:17327: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CFLAGS="$CFLAGS"
+@@ -17471,7 +17474,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17474 "configure"
++#line 17477 "configure"
+ #include "confdefs.h"
+ #include <$PANEL_NAME.h>
+ int
+@@ -17483,37 +17486,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17486: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17489: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17489: \$? = $ac_status" >&5
++  echo "$as_me:17492: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17492: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17495: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17495: \$? = $ac_status" >&5
++  echo "$as_me:17498: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17501 "configure"
++#line 17504 "configure"
+ #include "confdefs.h"
+ #include <$PANEL_NAME.h>
+ 				int main(void)
+ 				{ (void) new_panel ( 0 ); return 0; }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17508: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17511: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17511: \$? = $ac_status" >&5
++  echo "$as_me:17514: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17513: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17516: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17516: \$? = $ac_status" >&5
++  echo "$as_me:17519: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -17530,7 +17533,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:17533: result: $cf_have_curses_lib" >&5
++		echo "$as_me:17536: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" = "yes"
+@@ -17551,7 +17554,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh`
+-echo "$as_me:17554: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
++echo "$as_me:17557: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17559,7 +17562,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$PANEL_NAME$cf_cv_libtype  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17562 "configure"
++#line 17565 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17578,16 +17581,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17581: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17584: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17584: \$? = $ac_status" >&5
++  echo "$as_me:17587: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17587: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17590: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17590: \$? = $ac_status" >&5
++  echo "$as_me:17593: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -17598,7 +17601,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17601: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:17604: 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
+ 
+@@ -17631,7 +17634,7 @@
+ 	cf_curses_headers="$cf_curses_headers panel.h"
+ fi
+ 
+-echo "$as_me:17634: checking if you want to check for menu functions" >&5
++echo "$as_me:17637: checking if you want to check for menu functions" >&5
+ echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-menu or --disable-menu was given.
+@@ -17648,7 +17651,7 @@
+ 	cf_enable_menu=$cf_default_menu
+ 
+ fi;
+-echo "$as_me:17651: result: $cf_enable_menu" >&5
++echo "$as_me:17654: result: $cf_enable_menu" >&5
+ echo "${ECHO_T}$cf_enable_menu" >&6
+ if test $cf_enable_menu = yes
+ then
+@@ -17657,14 +17660,14 @@
+ 		;;
+ 	(curses*)
+ 
+-echo "$as_me:17660: checking for NetBSD menu.h" >&5
++echo "$as_me:17663: checking for NetBSD menu.h" >&5
+ echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_menu_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17667 "configure"
++#line 17670 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -17682,16 +17685,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17685: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17688: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17688: \$? = $ac_status" >&5
++  echo "$as_me:17691: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17691: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17694: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17694: \$? = $ac_status" >&5
++  echo "$as_me:17697: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_netbsd_menu_h=yes
+ 
+@@ -17703,7 +17706,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17706: result: $cf_cv_netbsd_menu_h" >&5
++echo "$as_me:17709: result: $cf_cv_netbsd_menu_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
+ 
+ test "$cf_cv_netbsd_menu_h" = yes &&
+@@ -17720,13 +17723,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:17723: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
++	echo "$as_me:17726: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists "$MENU_NAME$cf_cv_libtype" ; then
+-		echo "$as_me:17726: result: yes" >&5
++		echo "$as_me:17729: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:17729: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
++		echo "$as_me:17732: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CFLAGS="$CFLAGS"
+@@ -17876,7 +17879,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17879 "configure"
++#line 17882 "configure"
+ #include "confdefs.h"
+ #include <$MENU_NAME.h>
+ int
+@@ -17888,37 +17891,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17891: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17894: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17894: \$? = $ac_status" >&5
++  echo "$as_me:17897: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17897: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17900: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17900: \$? = $ac_status" >&5
++  echo "$as_me:17903: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17906 "configure"
++#line 17909 "configure"
+ #include "confdefs.h"
+ #include <$MENU_NAME.h>
+ 				int main(void)
+ 				{ (void) menu_driver ( 0,0 ); return 0; }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17913: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17916: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17916: \$? = $ac_status" >&5
++  echo "$as_me:17919: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17918: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17921: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17921: \$? = $ac_status" >&5
++  echo "$as_me:17924: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -17935,7 +17938,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:17938: result: $cf_have_curses_lib" >&5
++		echo "$as_me:17941: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" = "yes"
+@@ -17956,7 +17959,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh`
+-echo "$as_me:17959: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
++echo "$as_me:17962: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17964,7 +17967,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$MENU_NAME$cf_cv_libtype  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17967 "configure"
++#line 17970 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17983,16 +17986,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17986: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17989: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17989: \$? = $ac_status" >&5
++  echo "$as_me:17992: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17992: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17995: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17995: \$? = $ac_status" >&5
++  echo "$as_me:17998: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -18003,7 +18006,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18006: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:18009: 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
+ 
+@@ -18036,7 +18039,7 @@
+ 	cf_curses_headers="$cf_curses_headers menu.h"
+ fi
+ 
+-echo "$as_me:18039: checking if you want to check for form functions" >&5
++echo "$as_me:18042: checking if you want to check for form functions" >&5
+ echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-form or --disable-form was given.
+@@ -18053,7 +18056,7 @@
+ 	cf_enable_form=$cf_default_form
+ 
+ fi;
+-echo "$as_me:18056: result: $cf_enable_form" >&5
++echo "$as_me:18059: result: $cf_enable_form" >&5
+ echo "${ECHO_T}$cf_enable_form" >&6
+ if test $cf_enable_form = yes
+ then
+@@ -18062,14 +18065,14 @@
+ 		;;
+ 	(curses*)
+ 
+-echo "$as_me:18065: checking for NetBSD form.h" >&5
++echo "$as_me:18068: checking for NetBSD form.h" >&5
+ echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_form_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18072 "configure"
++#line 18075 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18088,16 +18091,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18091: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18094: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18094: \$? = $ac_status" >&5
++  echo "$as_me:18097: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18097: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18100: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18100: \$? = $ac_status" >&5
++  echo "$as_me:18103: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_netbsd_form_h=yes
+ 
+@@ -18109,7 +18112,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:18112: result: $cf_cv_netbsd_form_h" >&5
++echo "$as_me:18115: result: $cf_cv_netbsd_form_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
+ 
+ test "$cf_cv_netbsd_form_h" = yes &&
+@@ -18126,13 +18129,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:18129: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
++	echo "$as_me:18132: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists "$FORM_NAME$cf_cv_libtype" ; then
+-		echo "$as_me:18132: result: yes" >&5
++		echo "$as_me:18135: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:18135: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
++		echo "$as_me:18138: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CFLAGS="$CFLAGS"
+@@ -18282,7 +18285,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18285 "configure"
++#line 18288 "configure"
+ #include "confdefs.h"
+ #include <$FORM_NAME.h>
+ int
+@@ -18294,37 +18297,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18297: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18300: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18300: \$? = $ac_status" >&5
++  echo "$as_me:18303: \$? = $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:18306: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18306: \$? = $ac_status" >&5
++  echo "$as_me:18309: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18312 "configure"
++#line 18315 "configure"
+ #include "confdefs.h"
+ #include <$FORM_NAME.h>
+ 				int main(void)
+ 				{ (void) form_driver ( 0,0 ); return 0; }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:18319: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18322: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18322: \$? = $ac_status" >&5
++  echo "$as_me:18325: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:18324: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18327: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18327: \$? = $ac_status" >&5
++  echo "$as_me:18330: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -18341,7 +18344,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:18344: result: $cf_have_curses_lib" >&5
++		echo "$as_me:18347: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" = "yes"
+@@ -18362,7 +18365,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh`
+-echo "$as_me:18365: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
++echo "$as_me:18368: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18370,7 +18373,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$FORM_NAME$cf_cv_libtype  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18373 "configure"
++#line 18376 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18389,16 +18392,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18392: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18395: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18395: \$? = $ac_status" >&5
++  echo "$as_me:18398: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18398: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18401: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18401: \$? = $ac_status" >&5
++  echo "$as_me:18404: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -18409,7 +18412,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18412: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:18415: 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
+ 
+@@ -18447,23 +18450,23 @@
+ for ac_header in $cf_curses_headers
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18450: checking for $ac_header" >&5
++echo "$as_me:18453: 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 18456 "configure"
++#line 18459 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18460: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18463: \"$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:18466: \$? = $ac_status" >&5
++  echo "$as_me:18469: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18482,7 +18485,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18485: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18488: 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:18498: 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 18501 "configure"
++#line 18504 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -18514,16 +18517,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18517: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18520: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18520: \$? = $ac_status" >&5
++  echo "$as_me:18523: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18523: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18526: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18526: \$? = $ac_status" >&5
++  echo "$as_me:18529: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -18533,7 +18536,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18536: result: $ac_cv_header_time" >&5
++echo "$as_me:18539: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -18554,23 +18557,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18557: checking for $ac_header" >&5
++echo "$as_me:18560: 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 18563 "configure"
++#line 18566 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18567: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18570: \"$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:18573: \$? = $ac_status" >&5
++  echo "$as_me:18576: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18589,7 +18592,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18592: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18595: 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:18608: 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 18611 "configure"
++#line 18614 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18615: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18618: \"$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:18621: \$? = $ac_status" >&5
++  echo "$as_me:18624: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18637,7 +18640,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18640: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18643: 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:18653: 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
+@@ -18657,7 +18660,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18660 "configure"
++#line 18663 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -18670,16 +18673,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18673: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18676: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18676: \$? = $ac_status" >&5
++  echo "$as_me:18679: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18679: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18682: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18682: \$? = $ac_status" >&5
++  echo "$as_me:18685: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -18691,7 +18694,7 @@
+ done
+ 
+ fi
+-echo "$as_me:18694: result: $cf_cv_getopt_header" >&5
++echo "$as_me:18697: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -18709,13 +18712,13 @@
+ fi
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:18712: checking for clock_gettime" >&5
++echo "$as_me:18715: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18718 "configure"
++#line 18721 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18746,16 +18749,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18749: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18752: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18752: \$? = $ac_status" >&5
++  echo "$as_me:18755: \$? = $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:18758: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18758: \$? = $ac_status" >&5
++  echo "$as_me:18761: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -18765,12 +18768,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18768: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:18771: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:18773: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:18776: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18778,7 +18781,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18781 "configure"
++#line 18784 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18797,16 +18800,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18800: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18803: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18803: \$? = $ac_status" >&5
++  echo "$as_me:18806: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18806: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18809: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18809: \$? = $ac_status" >&5
++  echo "$as_me:18812: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -18817,7 +18820,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18820: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:18823: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -18829,14 +18832,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:18832: checking if clock_gettime links" >&5
++echo "$as_me:18835: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18839 "configure"
++#line 18842 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -18854,16 +18857,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18857: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18860: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18860: \$? = $ac_status" >&5
++  echo "$as_me:18863: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18863: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18866: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18866: \$? = $ac_status" >&5
++  echo "$as_me:18869: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -18874,7 +18877,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:18877: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:18880: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -18888,13 +18891,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:18891: checking for gettimeofday" >&5
++echo "$as_me:18894: 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 18897 "configure"
++#line 18900 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18925,16 +18928,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18928: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18931: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18931: \$? = $ac_status" >&5
++  echo "$as_me:18934: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18934: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18937: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18937: \$? = $ac_status" >&5
++  echo "$as_me:18940: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -18944,7 +18947,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18947: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:18950: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -18954,7 +18957,7 @@
+ 
+ else
+ 
+-echo "$as_me:18957: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:18960: 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
+@@ -18962,7 +18965,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18965 "configure"
++#line 18968 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18981,16 +18984,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18984: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18987: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18987: \$? = $ac_status" >&5
++  echo "$as_me:18990: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18990: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18993: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18993: \$? = $ac_status" >&5
++  echo "$as_me:18996: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -19001,7 +19004,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19004: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:19007: 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
+ 
+@@ -19039,13 +19042,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:19042: checking for $ac_func" >&5
++echo "$as_me:19045: 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 19048 "configure"
++#line 19051 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19076,16 +19079,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19079: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19082: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19082: \$? = $ac_status" >&5
++  echo "$as_me:19085: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19085: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19088: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19088: \$? = $ac_status" >&5
++  echo "$as_me:19091: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -19095,7 +19098,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19098: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:19101: 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:19112: checking if we can use termcap.h" >&5
+ echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
+ if test "${cf_cv_have_termcap_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19116 "configure"
++#line 19119 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19134,16 +19137,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19137: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19140: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19140: \$? = $ac_status" >&5
++  echo "$as_me:19143: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19143: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19146: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19146: \$? = $ac_status" >&5
++  echo "$as_me:19149: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_termcap_h=yes
+ else
+@@ -19153,7 +19156,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19156: result: $cf_cv_have_termcap_h" >&5
++echo "$as_me:19159: result: $cf_cv_have_termcap_h" >&5
+ echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
+ if test "x$cf_cv_have_termcap_h" = xyes
+ then
+@@ -19163,14 +19166,14 @@
+ EOF
+ 
+ else
+-echo "$as_me:19166: checking if we can use ncurses/termcap.h" >&5
++echo "$as_me:19169: checking if we can use ncurses/termcap.h" >&5
+ echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
+ if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19173 "configure"
++#line 19176 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19191,16 +19194,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19194: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19197: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19197: \$? = $ac_status" >&5
++  echo "$as_me:19200: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19200: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19203: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19203: \$? = $ac_status" >&5
++  echo "$as_me:19206: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_ncurses_termcap_h=yes
+ else
+@@ -19210,7 +19213,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19213: result: $cf_cv_have_ncurses_termcap_h" >&5
++echo "$as_me:19216: result: $cf_cv_have_ncurses_termcap_h" >&5
+ echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
+ test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -19220,7 +19223,7 @@
+ fi
+ 
+ if test "x$ac_cv_func_getopt" = xno; then
+-	{ { echo "$as_me:19223: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:19226: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -19239,13 +19242,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:19242: checking for $ac_func" >&5
++echo "$as_me:19245: 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 19248 "configure"
++#line 19251 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19276,16 +19279,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19279: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19282: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19282: \$? = $ac_status" >&5
++  echo "$as_me:19285: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19285: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19288: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19288: \$? = $ac_status" >&5
++  echo "$as_me:19291: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -19295,7 +19298,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19298: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:19301: 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:19313: checking definition to turn on extended curses functions" >&5
+ echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
+ if test "${cf_cv_need_xopen_extension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19315,7 +19318,7 @@
+ 
+ cf_cv_need_xopen_extension=unknown
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19318 "configure"
++#line 19321 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -19348,16 +19351,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19351: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19354: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19354: \$? = $ac_status" >&5
++  echo "$as_me:19357: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19357: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19360: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19360: \$? = $ac_status" >&5
++  echo "$as_me:19363: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_xopen_extension=none
+ else
+@@ -19367,7 +19370,7 @@
+ 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19370 "configure"
++#line 19373 "configure"
+ #include "confdefs.h"
+ 
+ #define $cf_try_xopen_extension 1
+@@ -19393,16 +19396,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19396: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19399: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19399: \$? = $ac_status" >&5
++  echo "$as_me:19402: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19402: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19405: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19405: \$? = $ac_status" >&5
++  echo "$as_me:19408: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
+ else
+@@ -19416,7 +19419,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:19419: result: $cf_cv_need_xopen_extension" >&5
++echo "$as_me:19422: result: $cf_cv_need_xopen_extension" >&5
+ echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
+ 
+ case "$cf_cv_need_xopen_extension" in
+@@ -19428,7 +19431,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19431: checking for term.h" >&5
++echo "$as_me:19434: checking for term.h" >&5
+ echo $ECHO_N "checking for term.h... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19449,7 +19452,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19452 "configure"
++#line 19455 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19463,16 +19466,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19466: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19469: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19469: \$? = $ac_status" >&5
++  echo "$as_me:19472: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19472: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19475: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19475: \$? = $ac_status" >&5
++  echo "$as_me:19478: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_term_header=$cf_header
+ 	 break
+@@ -19491,7 +19494,7 @@
+ 	for cf_header in ncurses/term.h ncursesw/term.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19494 "configure"
++#line 19497 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19509,16 +19512,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19512: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19515: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19515: \$? = $ac_status" >&5
++  echo "$as_me:19518: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19518: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19521: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19521: \$? = $ac_status" >&5
++  echo "$as_me:19524: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_term_header=$cf_header
+ 			 break
+@@ -19533,7 +19536,7 @@
+ esac
+ 
+ fi
+-echo "$as_me:19536: result: $cf_cv_term_header" >&5
++echo "$as_me:19539: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ case "$cf_cv_term_header" in
+@@ -19560,7 +19563,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19563: checking for unctrl.h" >&5
++echo "$as_me:19566: checking for unctrl.h" >&5
+ echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
+ if test "${cf_cv_unctrl_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19581,7 +19584,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19584 "configure"
++#line 19587 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19595,16 +19598,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19598: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19601: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19601: \$? = $ac_status" >&5
++  echo "$as_me:19604: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19604: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19607: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19607: \$? = $ac_status" >&5
++  echo "$as_me:19610: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unctrl_header=$cf_header
+ 	 break
+@@ -19617,12 +19620,12 @@
+ done
+ 
+ fi
+-echo "$as_me:19620: result: $cf_cv_unctrl_header" >&5
++echo "$as_me:19623: result: $cf_cv_unctrl_header" >&5
+ echo "${ECHO_T}$cf_cv_unctrl_header" >&6
+ 
+ case "$cf_cv_unctrl_header" in
+ (no)
+-	{ echo "$as_me:19625: WARNING: unctrl.h header not found" >&5
++	{ echo "$as_me:19628: WARNING: unctrl.h header not found" >&5
+ echo "$as_me: WARNING: unctrl.h header not found" >&2;}
+ 	;;
+ esac
+@@ -19720,10 +19723,10 @@
+ 
+ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 
+-	echo "$as_me:19723: checking for ${cf_func}" >&5
++	echo "$as_me:19726: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:19726: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:19729: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19732,7 +19735,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19735 "configure"
++#line 19738 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -19765,16 +19768,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19768: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19771: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19771: \$? = $ac_status" >&5
++  echo "$as_me:19774: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19774: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19777: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19777: \$? = $ac_status" >&5
++  echo "$as_me:19780: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -19790,7 +19793,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:19793: result: $cf_result" >&5
++	echo "$as_me:19796: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" != no; then
+ 		cat >>confdefs.h <&5
++	echo "$as_me:19811: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:19811: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:19814: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19817,7 +19820,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19820 "configure"
++#line 19823 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -19850,16 +19853,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19853: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19856: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19856: \$? = $ac_status" >&5
++  echo "$as_me:19859: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19859: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19862: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19862: \$? = $ac_status" >&5
++  echo "$as_me:19865: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -19875,7 +19878,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:19878: result: $cf_result" >&5
++	echo "$as_me:19881: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" != no; then
+ 		cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF
+-#line 19902 "configure"
++#line 19905 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19919,21 +19922,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19922: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19925: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19925: \$? = $ac_status" >&5
++  echo "$as_me:19928: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19928: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19931: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19931: \$? = $ac_status" >&5
++  echo "$as_me:19934: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
+ 
+-echo "${as_me:-configure}:19936: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
++echo "${as_me:-configure}:19939: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+ 
+ 		cat >>confdefs.h <&5
++echo "$as_me:19959: checking for ncurses extended functions" >&5
+ echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19963 "configure"
++#line 19966 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19975,16 +19978,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19978: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19981: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19981: \$? = $ac_status" >&5
++  echo "$as_me:19984: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19984: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19987: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19987: \$? = $ac_status" >&5
++  echo "$as_me:19990: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_ext_funcs=defined
+ else
+@@ -19992,7 +19995,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19995 "configure"
++#line 19998 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20017,16 +20020,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20020: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20023: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20023: \$? = $ac_status" >&5
++  echo "$as_me:20026: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20026: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20029: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20029: \$? = $ac_status" >&5
++  echo "$as_me:20032: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_ext_funcs=yes
+ else
+@@ -20040,7 +20043,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20043: result: $cf_cv_ncurses_ext_funcs" >&5
++echo "$as_me:20046: result: $cf_cv_ncurses_ext_funcs" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
+ test "$cf_cv_ncurses_ext_funcs" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -20054,11 +20057,11 @@
+ 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
+ 	then
+ 		cf_define_xpg5=no
+-		echo "$as_me:20057: checking if _XPG5 should be defined to enable wide-characters" >&5
++		echo "$as_me:20060: checking if _XPG5 should be defined to enable wide-characters" >&5
+ echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20061 "configure"
++#line 20064 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20071,16 +20074,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20074: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20077: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20077: \$? = $ac_status" >&5
++  echo "$as_me:20080: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20080: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20083: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20083: \$? = $ac_status" >&5
++  echo "$as_me:20086: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -20089,7 +20092,7 @@
+ cf_save_cppflags="$CPPFLAGS"
+ 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20092 "configure"
++#line 20095 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20102,16 +20105,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20105: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20108: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20108: \$? = $ac_status" >&5
++  echo "$as_me:20111: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20111: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20114: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20114: \$? = $ac_status" >&5
++  echo "$as_me:20117: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_define_xpg5=yes
+ else
+@@ -20122,7 +20125,7 @@
+ 			 CPPFLAGS="$cf_save_cppflags"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-		echo "$as_me:20125: result: $cf_define_xpg5" >&5
++		echo "$as_me:20128: result: $cf_define_xpg5" >&5
+ echo "${ECHO_T}$cf_define_xpg5" >&6
+ 
+ 		if test "$cf_define_xpg5" = yes
+@@ -20131,14 +20134,14 @@
+ 		fi
+ 	fi
+ 
+-	echo "$as_me:20134: checking for wide-character functions" >&5
++	echo "$as_me:20137: checking for wide-character functions" >&5
+ echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
+ if test "${cf_cv_widechar_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20141 "configure"
++#line 20144 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20155,16 +20158,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20158: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20161: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20161: \$? = $ac_status" >&5
++  echo "$as_me:20164: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20164: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20167: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20167: \$? = $ac_status" >&5
++  echo "$as_me:20170: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_widechar_funcs=yes
+ else
+@@ -20175,7 +20178,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20178: result: $cf_cv_widechar_funcs" >&5
++echo "$as_me:20181: result: $cf_cv_widechar_funcs" >&5
+ echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
+ 	if test "$cf_cv_widechar_funcs" != no ; then
+ 
+@@ -20196,14 +20199,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20199: checking if $cf_cv_screen library uses pthreads" >&5
++echo "$as_me:20202: checking if $cf_cv_screen library uses pthreads" >&5
+ echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
+ if test "${cf_cv_use_pthreads+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20206 "configure"
++#line 20209 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20221,16 +20224,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20224: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20227: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20227: \$? = $ac_status" >&5
++  echo "$as_me:20230: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20230: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20233: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20233: \$? = $ac_status" >&5
++  echo "$as_me:20236: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_use_pthreads=yes
+ else
+@@ -20241,21 +20244,21 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20244: result: $cf_cv_use_pthreads" >&5
++echo "$as_me:20247: result: $cf_cv_use_pthreads" >&5
+ echo "${ECHO_T}$cf_cv_use_pthreads" >&6
+ test $cf_cv_use_pthreads = yes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_PTHREADS 1
+ EOF
+ 
+-echo "$as_me:20251: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:20254: 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 20258 "configure"
++#line 20261 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20275,16 +20278,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20278: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20281: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20281: \$? = $ac_status" >&5
++  echo "$as_me:20284: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20284: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20287: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20287: \$? = $ac_status" >&5
++  echo "$as_me:20290: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -20296,7 +20299,7 @@
+ 
+ fi
+ 
+-echo "$as_me:20299: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:20302: 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
+@@ -20305,7 +20308,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:20308: checking for openpty in -lutil" >&5
++echo "$as_me:20311: 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
+@@ -20313,7 +20316,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20316 "configure"
++#line 20319 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20332,16 +20335,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20335: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20338: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20338: \$? = $ac_status" >&5
++  echo "$as_me:20341: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20341: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20344: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20344: \$? = $ac_status" >&5
++  echo "$as_me:20347: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -20352,7 +20355,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20355: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:20358: 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
+@@ -20360,7 +20363,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:20363: checking for openpty header" >&5
++echo "$as_me:20366: 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
+@@ -20387,7 +20390,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20390 "configure"
++#line 20393 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20405,16 +20408,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20408: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20411: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20411: \$? = $ac_status" >&5
++  echo "$as_me:20414: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20414: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20417: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20417: \$? = $ac_status" >&5
++  echo "$as_me:20420: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -20432,7 +20435,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:20435: result: $cf_cv_func_openpty" >&5
++echo "$as_me:20438: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -20466,7 +20469,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:20469: checking for function curses_version" >&5
++echo "$as_me:20472: checking for function curses_version" >&5
+ echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
+ if test "${cf_cv_func_curses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20476,7 +20479,7 @@
+   cf_cv_func_curses_version=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20479 "configure"
++#line 20482 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -20492,15 +20495,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:20495: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20498: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20498: \$? = $ac_status" >&5
++  echo "$as_me:20501: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:20500: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20503: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20503: \$? = $ac_status" >&5
++  echo "$as_me:20506: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_curses_version=yes
+ 
+@@ -20515,14 +20518,14 @@
+ fi
+ rm -f core
+ fi
+-echo "$as_me:20518: result: $cf_cv_func_curses_version" >&5
++echo "$as_me:20521: result: $cf_cv_func_curses_version" >&5
+ echo "${ECHO_T}$cf_cv_func_curses_version" >&6
+ test "$cf_cv_func_curses_version" = yes &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_CURSES_VERSION 1
+ EOF
+ 
+-echo "$as_me:20525: checking for alternate character set array" >&5
++echo "$as_me:20528: checking for alternate character set array" >&5
+ echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_acs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20532,7 +20535,7 @@
+ for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20535 "configure"
++#line 20538 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20548,16 +20551,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20551: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20554: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20554: \$? = $ac_status" >&5
++  echo "$as_me:20557: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20557: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20560: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20560: \$? = $ac_status" >&5
++  echo "$as_me:20563: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_acs_map=$name; break
+ else
+@@ -20568,7 +20571,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20571: result: $cf_cv_curses_acs_map" >&5
++echo "$as_me:20574: result: $cf_cv_curses_acs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
+ 
+ test "$cf_cv_curses_acs_map" != unknown &&
+@@ -20578,7 +20581,7 @@
+ 
+ if test "$cf_enable_widec" = yes; then
+ 
+-echo "$as_me:20581: checking for wide alternate character set array" >&5
++echo "$as_me:20584: checking for wide alternate character set array" >&5
+ echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20588,7 +20591,7 @@
+ 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20591 "configure"
++#line 20594 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20604,16 +20607,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20607: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20610: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20610: \$? = $ac_status" >&5
++  echo "$as_me:20613: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20613: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20616: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20616: \$? = $ac_status" >&5
++  echo "$as_me:20619: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_wacs_map=$name
+ 	 break
+@@ -20624,7 +20627,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	done
+ fi
+-echo "$as_me:20627: result: $cf_cv_curses_wacs_map" >&5
++echo "$as_me:20630: result: $cf_cv_curses_wacs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
+ 
+ test "$cf_cv_curses_wacs_map" != unknown &&
+@@ -20632,7 +20635,7 @@
+ #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
+ EOF
+ 
+-echo "$as_me:20635: checking for wide alternate character constants" >&5
++echo "$as_me:20638: checking for wide alternate character constants" >&5
+ echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_symbols+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20642,7 +20645,7 @@
+ if test "$cf_cv_curses_wacs_map" != unknown
+ then
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20645 "configure"
++#line 20648 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20659,16 +20662,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20662: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20665: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20665: \$? = $ac_status" >&5
++  echo "$as_me:20668: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20668: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20671: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20671: \$? = $ac_status" >&5
++  echo "$as_me:20674: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -20678,7 +20681,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ else
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20681 "configure"
++#line 20684 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20694,16 +20697,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20697: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20700: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20700: \$? = $ac_status" >&5
++  echo "$as_me:20703: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20703: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20706: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20706: \$? = $ac_status" >&5
++  echo "$as_me:20709: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -20714,7 +20717,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:20717: result: $cf_cv_curses_wacs_symbols" >&5
++echo "$as_me:20720: result: $cf_cv_curses_wacs_symbols" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
+ 
+ test "$cf_cv_curses_wacs_symbols" != no &&
+@@ -20724,10 +20727,10 @@
+ 
+ fi
+ 
+-echo "$as_me:20727: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:20730: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20730 "configure"
++#line 20733 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20745,16 +20748,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20748: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20751: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20751: \$? = $ac_status" >&5
++  echo "$as_me:20754: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20754: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20757: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20757: \$? = $ac_status" >&5
++  echo "$as_me:20760: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -20763,7 +20766,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:20766: result: $cf_result" >&5
++echo "$as_me:20769: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -20784,14 +20787,14 @@
+ if test "$cf_enable_widec" = yes; then
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:20787: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:20790: 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 20794 "configure"
++#line 20797 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20809,23 +20812,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20812: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20815: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20815: \$? = $ac_status" >&5
++  echo "$as_me:20818: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20818: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20821: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20821: \$? = $ac_status" >&5
++  echo "$as_me:20824: \$? = $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 20828 "configure"
++#line 20831 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20844,16 +20847,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20847: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20850: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20850: \$? = $ac_status" >&5
++  echo "$as_me:20853: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20853: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20856: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20856: \$? = $ac_status" >&5
++  echo "$as_me:20859: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -20865,7 +20868,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20868: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:20871: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -20888,14 +20891,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:20891: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:20894: 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 20898 "configure"
++#line 20901 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20913,23 +20916,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20916: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20919: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20919: \$? = $ac_status" >&5
++  echo "$as_me:20922: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20922: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20925: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20925: \$? = $ac_status" >&5
++  echo "$as_me:20928: \$? = $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 20932 "configure"
++#line 20935 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20948,16 +20951,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20951: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20954: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20954: \$? = $ac_status" >&5
++  echo "$as_me:20957: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20957: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20960: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20960: \$? = $ac_status" >&5
++  echo "$as_me:20963: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -20969,7 +20972,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20972: result: $cf_cv_wchar_t" >&5
++echo "$as_me:20975: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -20992,14 +20995,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:20995: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:20998: 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 21002 "configure"
++#line 21005 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21017,23 +21020,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21020: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21023: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21023: \$? = $ac_status" >&5
++  echo "$as_me:21026: \$? = $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:21029: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21029: \$? = $ac_status" >&5
++  echo "$as_me:21032: \$? = $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 21036 "configure"
++#line 21039 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21052,16 +21055,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21055: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21058: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21058: \$? = $ac_status" >&5
++  echo "$as_me:21061: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21061: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21064: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21064: \$? = $ac_status" >&5
++  echo "$as_me:21067: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -21073,7 +21076,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21076: result: $cf_cv_wint_t" >&5
++echo "$as_me:21079: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -21097,10 +21100,10 @@
+ 
+ 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
+ 
+-echo "$as_me:21100: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21103: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21103 "configure"
++#line 21106 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21118,16 +21121,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21121: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21124: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21124: \$? = $ac_status" >&5
++  echo "$as_me:21127: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21127: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21130: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21130: \$? = $ac_status" >&5
++  echo "$as_me:21133: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21136,7 +21139,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21139: result: $cf_result" >&5
++echo "$as_me:21142: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -21158,10 +21161,10 @@
+ 
+ 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
+ 
+-echo "$as_me:21161: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21164: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21164 "configure"
++#line 21167 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21179,16 +21182,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21182: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21185: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21185: \$? = $ac_status" >&5
++  echo "$as_me:21188: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21188: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21191: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21191: \$? = $ac_status" >&5
++  echo "$as_me:21194: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21197,7 +21200,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21200: result: $cf_result" >&5
++echo "$as_me:21203: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -21219,10 +21222,10 @@
+ 
+ 	if test "$NCURSES_OK_WINT_T" = 0 ; then
+ 
+-echo "$as_me:21222: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21225: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21225 "configure"
++#line 21228 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21240,16 +21243,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21243: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21246: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21246: \$? = $ac_status" >&5
++  echo "$as_me:21249: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21249: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21252: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21252: \$? = $ac_status" >&5
++  echo "$as_me:21255: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21258,7 +21261,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21261: result: $cf_result" >&5
++echo "$as_me:21264: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -21287,11 +21290,11 @@
+ boolfnames \
+ ttytype
+ do
+-echo "$as_me:21290: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21293: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21294 "configure"
++#line 21297 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -21324,16 +21327,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21327: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21330: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21330: \$? = $ac_status" >&5
++  echo "$as_me:21333: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21333: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21336: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21336: \$? = $ac_status" >&5
++  echo "$as_me:21339: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ 
+@@ -21343,7 +21346,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21346: result: $cf_result" >&5
++echo "$as_me:21349: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test "$cf_result" = yes ; then
+@@ -21355,14 +21358,14 @@
+ EOF
+ 
+ else
+-	echo "$as_me:21358: checking for data $cf_data in library" >&5
++	echo "$as_me:21361: checking for data $cf_data in library" >&5
+ echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6
+ 	# BSD linkers insist on making weak linkage, but resolve at runtime.
+ 	if test "$cross_compiling" = yes; then
+ 
+ 	# cross-compiling
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21365 "configure"
++#line 21368 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -21401,16 +21404,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21404: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21407: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21407: \$? = $ac_status" >&5
++  echo "$as_me:21410: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21410: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21413: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21413: \$? = $ac_status" >&5
++  echo "$as_me:21416: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21422,7 +21425,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21425 "configure"
++#line 21428 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -21454,15 +21457,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21457: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21460: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21460: \$? = $ac_status" >&5
++  echo "$as_me:21463: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21462: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21465: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21465: \$? = $ac_status" >&5
++  echo "$as_me:21468: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ 
+@@ -21474,7 +21477,7 @@
+ fi
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-	echo "$as_me:21477: result: $cf_result" >&5
++	echo "$as_me:21480: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = yes ; then
+ 
+@@ -21491,7 +21494,7 @@
+ 
+ if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
+ then
+-	echo "$as_me:21494: checking for X" >&5
++	echo "$as_me:21497: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
+ # Check whether --with-x or --without-x was given.
+@@ -21595,17 +21598,17 @@
+   # Guess where to find include files, by looking for Intrinsic.h.
+   # First, try using that file with no special directory specified.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21598 "configure"
++#line 21601 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:21602: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:21605: \"$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:21608: \$? = $ac_status" >&5
++  echo "$as_me:21611: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -21638,7 +21641,7 @@
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21641 "configure"
++#line 21644 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -21650,16 +21653,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21653: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21656: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21656: \$? = $ac_status" >&5
++  echo "$as_me:21659: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21659: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21662: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21662: \$? = $ac_status" >&5
++  echo "$as_me:21665: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -21697,7 +21700,7 @@
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:21700: result: $have_x" >&5
++  echo "$as_me:21703: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+   no_x=yes
+ else
+@@ -21707,7 +21710,7 @@
+   # Update the cache value to reflect the command line values.
+   ac_cv_have_x="have_x=yes \
+ 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  echo "$as_me:21710: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "$as_me:21713: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+@@ -21734,11 +21737,11 @@
+     # others require no space.  Words are not sufficient . . . .
+     case `(uname -sr) 2>/dev/null` in
+     "SunOS 5"*)
+-      echo "$as_me:21737: checking whether -R must be followed by a space" >&5
++      echo "$as_me:21740: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+       cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21741 "configure"
++#line 21744 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21750,16 +21753,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21753: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21756: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21756: \$? = $ac_status" >&5
++  echo "$as_me:21759: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21759: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21762: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21762: \$? = $ac_status" >&5
++  echo "$as_me:21765: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_nospace=yes
+ else
+@@ -21769,13 +21772,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+       if test $ac_R_nospace = yes; then
+-	echo "$as_me:21772: result: no" >&5
++	echo "$as_me:21775: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	X_LIBS="$X_LIBS -R$x_libraries"
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21778 "configure"
++#line 21781 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21787,16 +21790,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21790: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21793: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21793: \$? = $ac_status" >&5
++  echo "$as_me:21796: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21796: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21799: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21799: \$? = $ac_status" >&5
++  echo "$as_me:21802: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_space=yes
+ else
+@@ -21806,11 +21809,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	if test $ac_R_space = yes; then
+-	  echo "$as_me:21809: result: yes" >&5
++	  echo "$as_me:21812: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ 	else
+-	  echo "$as_me:21813: result: neither works" >&5
++	  echo "$as_me:21816: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ 	fi
+       fi
+@@ -21830,7 +21833,7 @@
+     # the Alpha needs dnet_stub (dnet does not exist).
+     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21833 "configure"
++#line 21836 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21849,22 +21852,22 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21852: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21855: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21855: \$? = $ac_status" >&5
++  echo "$as_me:21858: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21858: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21861: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21861: \$? = $ac_status" >&5
++  echo "$as_me:21864: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:21867: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:21870: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21872,7 +21875,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21875 "configure"
++#line 21878 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21891,16 +21894,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21894: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21897: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21897: \$? = $ac_status" >&5
++  echo "$as_me:21900: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21900: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21903: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21903: \$? = $ac_status" >&5
++  echo "$as_me:21906: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -21911,14 +21914,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21914: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:21917: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      echo "$as_me:21921: checking for dnet_ntoa in -ldnet_stub" >&5
++      echo "$as_me:21924: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21926,7 +21929,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21929 "configure"
++#line 21932 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21945,16 +21948,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21948: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21951: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21951: \$? = $ac_status" >&5
++  echo "$as_me:21954: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21954: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21957: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21957: \$? = $ac_status" >&5
++  echo "$as_me:21960: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -21965,7 +21968,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21968: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:21971: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -21984,13 +21987,13 @@
+     # on Irix 5.2, according to T.E. Dickey.
+     # The functions gethostbyname, getservbyname, and inet_addr are
+     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+-    echo "$as_me:21987: checking for gethostbyname" >&5
++    echo "$as_me:21990: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21993 "configure"
++#line 21996 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22021,16 +22024,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22024: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22027: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22027: \$? = $ac_status" >&5
++  echo "$as_me:22030: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22030: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22033: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22033: \$? = $ac_status" >&5
++  echo "$as_me:22036: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gethostbyname=yes
+ else
+@@ -22040,11 +22043,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22043: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:22046: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+-      echo "$as_me:22047: checking for gethostbyname in -lnsl" >&5
++      echo "$as_me:22050: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22052,7 +22055,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22055 "configure"
++#line 22058 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22071,16 +22074,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22074: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22077: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22077: \$? = $ac_status" >&5
++  echo "$as_me:22080: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22080: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22083: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22083: \$? = $ac_status" >&5
++  echo "$as_me:22086: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -22091,14 +22094,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22094: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:22097: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test "$ac_cv_lib_nsl_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+-        echo "$as_me:22101: checking for gethostbyname in -lbsd" >&5
++        echo "$as_me:22104: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22106,7 +22109,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22109 "configure"
++#line 22112 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22125,16 +22128,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22128: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22131: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22131: \$? = $ac_status" >&5
++  echo "$as_me:22134: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22134: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22137: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22137: \$? = $ac_status" >&5
++  echo "$as_me:22140: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -22145,7 +22148,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22148: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:22151: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test "$ac_cv_lib_bsd_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -22161,13 +22164,13 @@
+     # variants that don't use the nameserver (or something).  -lsocket
+     # must be given before -lnsl if both are needed.  We assume that
+     # if connect needs -lnsl, so does gethostbyname.
+-    echo "$as_me:22164: checking for connect" >&5
++    echo "$as_me:22167: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22170 "configure"
++#line 22173 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22198,16 +22201,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22201: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22204: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22204: \$? = $ac_status" >&5
++  echo "$as_me:22207: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22207: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22210: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22210: \$? = $ac_status" >&5
++  echo "$as_me:22213: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_connect=yes
+ else
+@@ -22217,11 +22220,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22220: result: $ac_cv_func_connect" >&5
++echo "$as_me:22223: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+ 
+     if test $ac_cv_func_connect = no; then
+-      echo "$as_me:22224: checking for connect in -lsocket" >&5
++      echo "$as_me:22227: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22229,7 +22232,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22232 "configure"
++#line 22235 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22248,16 +22251,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22251: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22254: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22254: \$? = $ac_status" >&5
++  echo "$as_me:22257: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22257: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22260: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22260: \$? = $ac_status" >&5
++  echo "$as_me:22263: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_socket_connect=yes
+ else
+@@ -22268,7 +22271,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22271: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:22274: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test "$ac_cv_lib_socket_connect" = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -22277,13 +22280,13 @@
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    echo "$as_me:22280: checking for remove" >&5
++    echo "$as_me:22283: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+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 remove 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_remove=yes
+ else
+@@ -22333,11 +22336,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22336: result: $ac_cv_func_remove" >&5
++echo "$as_me:22339: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+ 
+     if test $ac_cv_func_remove = no; then
+-      echo "$as_me:22340: checking for remove in -lposix" >&5
++      echo "$as_me:22343: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22345,7 +22348,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22348 "configure"
++#line 22351 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22364,16 +22367,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22367: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22370: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22370: \$? = $ac_status" >&5
++  echo "$as_me:22373: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22373: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22376: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22376: \$? = $ac_status" >&5
++  echo "$as_me:22379: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_posix_remove=yes
+ else
+@@ -22384,7 +22387,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22387: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:22390: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test "$ac_cv_lib_posix_remove" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -22393,13 +22396,13 @@
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    echo "$as_me:22396: checking for shmat" >&5
++    echo "$as_me:22399: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22402 "configure"
++#line 22405 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22430,16 +22433,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22433: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22436: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22436: \$? = $ac_status" >&5
++  echo "$as_me:22439: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22439: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22442: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22442: \$? = $ac_status" >&5
++  echo "$as_me:22445: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_shmat=yes
+ else
+@@ -22449,11 +22452,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22452: result: $ac_cv_func_shmat" >&5
++echo "$as_me:22455: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+ 
+     if test $ac_cv_func_shmat = no; then
+-      echo "$as_me:22456: checking for shmat in -lipc" >&5
++      echo "$as_me:22459: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22461,7 +22464,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22464 "configure"
++#line 22467 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22480,16 +22483,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22483: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22486: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22486: \$? = $ac_status" >&5
++  echo "$as_me:22489: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22489: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22492: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22492: \$? = $ac_status" >&5
++  echo "$as_me:22495: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+@@ -22500,7 +22503,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22503: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:22506: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test "$ac_cv_lib_ipc_shmat" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -22518,7 +22521,7 @@
+   # These have to be linked with before -lX11, unlike the other
+   # libraries we check for below, so use a different variable.
+   # John Interrante, Karl Berry
+-  echo "$as_me:22521: checking for IceConnectionNumber in -lICE" >&5
++  echo "$as_me:22524: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22526,7 +22529,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22529 "configure"
++#line 22532 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22545,16 +22548,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22548: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22551: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22551: \$? = $ac_status" >&5
++  echo "$as_me:22554: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22554: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22557: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22557: \$? = $ac_status" >&5
++  echo "$as_me:22560: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -22565,7 +22568,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22568: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:22571: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -22612,16 +22615,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22615: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22618: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22620: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22623: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22624: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22627: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -22660,16 +22663,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22663: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:22666: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22668: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:22671: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22672: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22675: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -22708,23 +22711,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22711: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:22714: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22716: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:22719: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22720: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22723: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:22727: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:22730: 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.
+@@ -22741,7 +22744,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:22744: result: $enable_warnings" >&5
++echo "$as_me:22747: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -22764,10 +22767,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:22767: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:22770: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -22817,12 +22820,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:22820: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:22823: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22823: \$? = $ac_status" >&5
++  echo "$as_me:22826: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:22825: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:22828: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -22900,7 +22903,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22903 "configure"
++#line 22906 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22915,26 +22918,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22918: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22921: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22921: \$? = $ac_status" >&5
++  echo "$as_me:22924: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22924: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22927: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22927: \$? = $ac_status" >&5
++  echo "$as_me:22930: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:22930: checking for X11/Xt const-feature" >&5
++echo "$as_me:22933: 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 22937 "configure"
++#line 22940 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -22952,16 +22955,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22955: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22958: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22958: \$? = $ac_status" >&5
++  echo "$as_me:22961: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22961: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22964: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22964: \$? = $ac_status" >&5
++  echo "$as_me:22967: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -22976,7 +22979,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22979: result: $cf_cv_const_x_string" >&5
++echo "$as_me:22982: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -23005,7 +23008,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:23027: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -23037,12 +23040,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:23040: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:23043: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23043: \$? = $ac_status" >&5
++  echo "$as_me:23046: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:23045: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:23048: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -23050,7 +23053,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:23053: checking for $CC warning options..." >&5
++	{ echo "$as_me:23056: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -23073,12 +23076,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:23076: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:23079: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23079: \$? = $ac_status" >&5
++  echo "$as_me:23082: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:23081: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:23084: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -23086,7 +23089,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:23089: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:23092: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -23096,7 +23099,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:23099: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:23102: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -23113,7 +23116,7 @@
+ 
+ fi
+ 
+-echo "$as_me:23116: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:23119: 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.
+@@ -23135,7 +23138,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:23138: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:23141: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -23249,23 +23252,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:23252: checking for dmalloc.h" >&5
++	echo "$as_me:23255: 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 23258 "configure"
++#line 23261 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:23262: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23265: \"$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:23268: \$? = $ac_status" >&5
++  echo "$as_me:23271: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23284,11 +23287,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23287: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:23290: 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:23291: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:23294: 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
+@@ -23296,7 +23299,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23299 "configure"
++#line 23302 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -23315,16 +23318,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23318: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23321: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23321: \$? = $ac_status" >&5
++  echo "$as_me:23324: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23324: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23327: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23327: \$? = $ac_status" >&5
++  echo "$as_me:23330: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -23335,7 +23338,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23338: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:23341: 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:23356: 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.
+@@ -23372,7 +23375,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:23375: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:23378: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -23486,23 +23489,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:23489: checking for dbmalloc.h" >&5
++	echo "$as_me:23492: 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 23495 "configure"
++#line 23498 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:23499: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23502: \"$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:23505: \$? = $ac_status" >&5
++  echo "$as_me:23508: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23521,11 +23524,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23524: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:23527: 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:23528: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:23531: 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
+@@ -23533,7 +23536,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23536 "configure"
++#line 23539 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -23552,16 +23555,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23555: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23558: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23558: \$? = $ac_status" >&5
++  echo "$as_me:23561: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23561: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23564: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23564: \$? = $ac_status" >&5
++  echo "$as_me:23567: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -23572,7 +23575,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23575: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:23578: 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:23593: 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.
+@@ -23609,7 +23612,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:23612: result: ${with_valgrind:-no}" >&5
++echo "$as_me:23615: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -23722,7 +23725,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:23725: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:23728: 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.
+@@ -23733,7 +23736,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:23736: result: $with_no_leaks" >&5
++echo "$as_me:23739: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -23751,7 +23754,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:23754: checking for an rpath option" >&5
++	echo "$as_me:23757: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -23782,12 +23785,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:23785: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:23788: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:23790: checking if we need a space after rpath option" >&5
++		echo "$as_me:23793: 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"
+ 
+@@ -23808,7 +23811,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23811 "configure"
++#line 23814 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -23820,16 +23823,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23823: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23826: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23826: \$? = $ac_status" >&5
++  echo "$as_me:23829: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23829: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23832: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23832: \$? = $ac_status" >&5
++  echo "$as_me:23835: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -23839,14 +23842,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:23842: result: $cf_rpath_space" >&5
++		echo "$as_me:23845: 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:23849: checking if rpath-hack should be disabled" >&5
++echo "$as_me:23852: 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.
+@@ -23864,22 +23867,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:23867: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:23870: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:23872: checking for updated LDFLAGS" >&5
++echo "$as_me:23875: 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:23875: result: maybe" >&5
++	echo "$as_me:23878: 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:23882: checking for $ac_word" >&5
++echo "$as_me:23885: 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
+@@ -23894,7 +23897,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:23897: found $ac_dir/$ac_word" >&5
++echo "$as_me:23900: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -23902,10 +23905,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:23905: result: $cf_ldd_prog" >&5
++  echo "$as_me:23908: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:23908: result: no" >&5
++  echo "$as_me:23911: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -23919,7 +23922,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23922 "configure"
++#line 23925 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -23931,16 +23934,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23934: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23937: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23937: \$? = $ac_status" >&5
++  echo "$as_me:23940: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23940: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23943: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23943: \$? = $ac_status" >&5
++  echo "$as_me:23946: \$? = $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`
+@@ -23968,7 +23971,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:23971: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:23974: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -23980,11 +23983,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23983: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23986: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23987: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23990: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -24021,7 +24024,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:24024: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:24027: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -24034,11 +24037,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:24037: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:24040: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:24041: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:24044: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -24075,7 +24078,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:24078: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:24081: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -24088,14 +24091,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:24091: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:24094: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:24095: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:24098: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:24098: result: no" >&5
++	echo "$as_me:24101: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -24185,7 +24188,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:24188: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:24191: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -24366,7 +24369,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:24369: error: ambiguous option: $1
++    { { echo "$as_me:24372: 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;}
+@@ -24385,7 +24388,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:24388: error: unrecognized option: $1
++  -*) { { echo "$as_me:24391: 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;}
+@@ -24435,7 +24438,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:24438: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:24441: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -24751,7 +24754,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:24754: creating $ac_file" >&5
++    { echo "$as_me:24757: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -24769,7 +24772,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:24772: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:24775: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -24782,7 +24785,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:24785: error: cannot find input file: $f" >&5
++           { { echo "$as_me:24788: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -24798,7 +24801,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:24801: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:24804: 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;}
+@@ -24807,7 +24810,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:24810: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:24813: 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;}
+@@ -24852,7 +24855,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:24855: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:24858: 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;}
+@@ -24863,7 +24866,7 @@
+     $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:24866: WARNING: Some variables may not be substituted:
++      { echo "$as_me:24869: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -24912,7 +24915,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:24915: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:24918: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -24923,7 +24926,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:24926: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:24929: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -24936,7 +24939,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:24939: error: cannot find input file: $f" >&5
++           { { echo "$as_me:24942: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -24994,7 +24997,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:24997: $ac_file is unchanged" >&5
++      { echo "$as_me:25000: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+Index: test/demo_new_pair.c
+Prereq:  1.29 
+--- ncurses-6.5-20241102+/test/demo_new_pair.c	2024-10-05 18:21:44.000000000 +0000
++++ ncurses-6.5-20241109/test/demo_new_pair.c	2024-11-09 20:43:56.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_new_pair.c,v 1.29 2024/10/05 18:21:44 tom Exp $
++ * $Id: demo_new_pair.c,v 1.31 2024/11/09 20:43:56 tom Exp $
+  *
+  * Demonstrate the alloc_pair() function.
+  */
+@@ -205,7 +205,7 @@
+     wchar_t wch[2];
+     time_t start = now();
+     long total_cells = 0;
+-    FILE *output = 0;
++    FILE *output = NULL;
+ 
+     setlocale(LC_ALL, "");
+ 
+@@ -245,7 +245,8 @@
+     }
+     if (newterm(NULL, output, stdin) == 0) {
+ 	fprintf(stderr, "Cannot initialize terminal\n");
+-	fclose(output);
++	if (output != NULL)
++	    fclose(output);
+ 	ExitProgram(EXIT_FAILURE);
+     }
+     (void) cbreak();		/* read chars without wait for \n */
+@@ -384,7 +385,8 @@
+ 	++current;
+     }
+     stop_curses();
+-    fclose(output);
++    if (output != NULL)
++	fclose(output);
+ 
+     printf("%.1f cells/second\n",
+ 	   (double) (total_cells) / (double) (now() - start));
+Index: test/demo_panels.c
+Prereq:  1.50 
+--- ncurses-6.5-20241102+/test/demo_panels.c	2024-10-06 20:01:21.000000000 +0000
++++ ncurses-6.5-20241109/test/demo_panels.c	2024-11-09 22:54:38.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_panels.c,v 1.50 2024/10/06 20:01:21 tom Exp $
++ * $Id: demo_panels.c,v 1.51 2024/11/09 22:54:38 tom Exp $
+  *
+  * Demonstrate a variety of functions from the panel library.
+  */
+@@ -656,8 +656,9 @@
+ 	(void) wgetch(win);
+     } else {
+ 	int c0 = 0;
+-	for (;;) {
++	while (length < limit - 3) {
+ 	    int ch = wgetch(win);
++	    memset(buffer + length, 0, 3);
+ 	    if (ch == ERR || ch == QUIT || ch == ESCAPE) {
+ 		buffer[0] = '\0';
+ 		break;
diff --git a/packages/ncurses/6.5/ncurses-6.5-20241123.patch b/packages/ncurses/6.5/ncurses-6.5-20241123.patch
new file mode 100644
index 0000000000..d0b2fa7c43
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20241123.patch
@@ -0,0 +1,2742 @@
+# ncurses 6.5 - patch 20241123 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20241123.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Nov 24 01:16:21 UTC 2024
+# ------------------------------------------------------------------------------
+# NEWS                             |    7 
+# VERSION                          |    2 
+# configure                        |  339 +++++++++++++++++--------------------
+# configure.in                     |   15 -
+# dist.mk                          |    4 
+# menu/m_item_new.c                |    6 
+# ncurses/base/lib_color.c         |   10 -
+# ncurses/base/lib_mouse.c         |   16 -
+# ncurses/base/lib_newterm.c       |    4 
+# ncurses/base/lib_set_term.c      |    6 
+# ncurses/base/lib_touch.c         |   12 -
+# ncurses/base/resizeterm.c        |    4 
+# ncurses/curses.priv.h            |   12 -
+# ncurses/llib-lncurses            |   20 +-
+# ncurses/llib-lncursest           |   20 +-
+# ncurses/llib-lncursestw          |   22 +-
+# ncurses/llib-lncursesw           |   22 +-
+# ncurses/llib-ltinfo              |   14 -
+# ncurses/llib-ltinfot             |   14 -
+# ncurses/llib-ltinfotw            |   14 -
+# ncurses/llib-ltinfow             |   14 -
+# ncurses/tinfo/comp_scan.c        |    4 
+# ncurses/tinfo/lib_has_cap.c      |    8 
+# ncurses/tinfo/lib_options.c      |    6 
+# ncurses/tinfo/lib_setup.c        |   12 -
+# ncurses/tinfo/parse_entry.c      |    4 
+# ncurses/trace/lib_trace.c        |    6 
+# ncurses/trace/lib_tracechr.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 
+# progs/infocmp.c                  |    4 
+# progs/toe.c                      |    4 
+# progs/tput.c                     |    6 
+# progs/tset.c                     |    6 
+# test/demo_panels.c               |    4 
+# test/test_opaque.c               |   20 +-
+# 41 files changed, 336 insertions(+), 351 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4199 
+--- ncurses-6.5-20241109+/NEWS	2024-11-09 23:12:36.000000000 +0000
++++ ncurses-6.5-20241123/NEWS	2024-11-23 22:57:05.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4199 2024/11/09 23:12:36 tom Exp $
++-- $Id: NEWS,v 1.4203 2024/11/23 22:57:05 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.
+ 
++20241123
++	+ remove dependency on stdbool.h from configure script check for type
++	  of bool when C++ binding is omitted (report by Sam James).
++	+ compiler-warning fixes
++
+ 20241109
+ 	+ work around musl header ifdef's (report by Urs Jansen, cf: Gentoo
+ 	  #920266).
+Index: VERSION
+--- ncurses-6.5-20241109+/VERSION	2024-11-09 11:12:30.000000000 +0000
++++ ncurses-6.5-20241123/VERSION	2024-11-23 10:51:23.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20241109
++5:0:10	6.5	20241123
+Index: configure
+--- ncurses-6.5-20241109+/configure	2024-11-09 23:13:16.000000000 +0000
++++ ncurses-6.5-20241123/configure	2024-11-23 22:59:00.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.786 .
++# From configure.in Revision: 1.787 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20240618.
+ #
+@@ -27337,15 +27337,14 @@
+ 		cf_cv_type_of_bool=$NCURSES_BOOL
+ 		cf_cv_header_stdbool_h=0
+ 	else
+-		if test "$cf_cv_header_stdbool_h" = 1 ; then
+ 
+-echo "$as_me:27342: checking for bool" >&5
++echo "$as_me:27341: 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 27348 "configure"
++#line 27347 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27380,16 +27379,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27383: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27382: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27386: \$? = $ac_status" >&5
++  echo "$as_me:27385: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27389: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27388: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27392: \$? = $ac_status" >&5
++  echo "$as_me:27391: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -27399,10 +27398,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27402: result: $ac_cv_type_bool" >&5
++echo "$as_me:27401: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:27405: checking size of bool" >&5
++echo "$as_me:27404: 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
+@@ -27411,7 +27410,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27414 "configure"
++#line 27413 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27443,21 +27442,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27446: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27445: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27449: \$? = $ac_status" >&5
++  echo "$as_me:27448: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27452: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27451: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27455: \$? = $ac_status" >&5
++  echo "$as_me:27454: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27460 "configure"
++#line 27459 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27489,16 +27488,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27492: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27491: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27495: \$? = $ac_status" >&5
++  echo "$as_me:27494: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27498: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27497: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27501: \$? = $ac_status" >&5
++  echo "$as_me:27500: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -27514,7 +27513,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27517 "configure"
++#line 27516 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27546,16 +27545,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27549: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27548: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27552: \$? = $ac_status" >&5
++  echo "$as_me:27551: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27555: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27554: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27558: \$? = $ac_status" >&5
++  echo "$as_me:27557: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27571,7 +27570,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 27574 "configure"
++#line 27573 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27603,16 +27602,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27606: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27605: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27609: \$? = $ac_status" >&5
++  echo "$as_me:27608: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27612: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27611: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27615: \$? = $ac_status" >&5
++  echo "$as_me:27614: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27625,12 +27624,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27628: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27627: 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 27633 "configure"
++#line 27632 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27666,15 +27665,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27669: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27668: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27672: \$? = $ac_status" >&5
++  echo "$as_me:27671: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27674: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27673: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27677: \$? = $ac_status" >&5
++  echo "$as_me:27676: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27690,13 +27689,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27693: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27692: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27698: 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
+@@ -27715,7 +27714,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27718 "configure"
++#line 27717 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27756,15 +27755,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27759: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27758: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27762: \$? = $ac_status" >&5
++  echo "$as_me:27761: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27764: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27763: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27767: \$? = $ac_status" >&5
++  echo "$as_me:27766: \$? = $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
+@@ -27781,28 +27780,18 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:27784: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:27783: 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:27791: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:27790: 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:27797: 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:27803: result: $cf_cv_type_of_bool" >&5
+-echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+-		fi
+ 	fi
+ fi
+ 
+@@ -27829,7 +27818,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:27832: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:27821: 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
+@@ -27840,7 +27829,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:27843: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:27832: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -27857,10 +27846,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:27860: result: $ADAFLAGS" >&5
++	echo "$as_me:27849: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:27863: checking if GNATPREP supports -T option" >&5
++echo "$as_me:27852: 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
+@@ -27870,11 +27859,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:27873: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:27862: 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:27877: checking if GNAT supports generics" >&5
++echo "$as_me:27866: 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])
+@@ -27884,7 +27873,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:27887: result: $cf_gnat_generics" >&5
++echo "$as_me:27876: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -27896,7 +27885,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:27899: checking if GNAT supports SIGINT" >&5
++echo "$as_me:27888: 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
+@@ -27944,7 +27933,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:27947: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:27936: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -27957,7 +27946,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:27960: checking if GNAT supports project files" >&5
++echo "$as_me:27949: 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]*)
+@@ -28020,15 +28009,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:28023: result: $cf_gnat_projects" >&5
++echo "$as_me:28012: 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:28029: checking if GNAT supports libraries" >&5
++	echo "$as_me:28018: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:28031: result: $cf_gnat_libraries" >&5
++	echo "$as_me:28020: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -28048,7 +28037,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:28051: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:28040: 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
+@@ -28060,7 +28049,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:28063: checking for Ada95 compiler" >&5
++echo "$as_me:28052: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -28071,12 +28060,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:28074: result: $cf_ada_compiler" >&5
++echo "$as_me:28063: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:28079: checking for Ada95 include directory" >&5
++echo "$as_me:28068: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -28110,7 +28099,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28113: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28102: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28119,10 +28108,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:28122: result: $ADA_INCLUDE" >&5
++echo "$as_me:28111: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:28125: checking for Ada95 object directory" >&5
++echo "$as_me:28114: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -28156,7 +28145,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28159: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28148: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28165,10 +28154,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:28168: result: $ADA_OBJECTS" >&5
++echo "$as_me:28157: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:28171: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:28160: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -28189,11 +28178,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:28192: result: $with_ada_sharedlib" >&5
++echo "$as_me:28181: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+-	{ echo "$as_me:28196: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++	{ echo "$as_me:28185: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+ 
+@@ -28211,7 +28200,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:28214: checking for Ada95 curses library name" >&5
++echo "$as_me:28203: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -28227,7 +28216,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28230: result: $ADA_LIBNAME" >&5
++echo "$as_me:28219: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -28238,13 +28227,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:28241: checking for wchar_t" >&5
++	echo "$as_me:28230: 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 28247 "configure"
++#line 28236 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28259,16 +28248,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28262: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28251: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28265: \$? = $ac_status" >&5
++  echo "$as_me:28254: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28268: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28257: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28271: \$? = $ac_status" >&5
++  echo "$as_me:28260: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -28278,10 +28267,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:28281: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:28270: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:28284: checking size of wchar_t" >&5
++echo "$as_me:28273: 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
+@@ -28290,7 +28279,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28293 "configure"
++#line 28282 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28302,21 +28291,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28305: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28294: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28308: \$? = $ac_status" >&5
++  echo "$as_me:28297: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28311: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28300: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28314: \$? = $ac_status" >&5
++  echo "$as_me:28303: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28319 "configure"
++#line 28308 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28328,16 +28317,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28331: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28320: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28334: \$? = $ac_status" >&5
++  echo "$as_me:28323: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28337: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28326: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28340: \$? = $ac_status" >&5
++  echo "$as_me:28329: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -28353,7 +28342,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28356 "configure"
++#line 28345 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28365,16 +28354,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28368: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28357: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28371: \$? = $ac_status" >&5
++  echo "$as_me:28360: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28374: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28363: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28377: \$? = $ac_status" >&5
++  echo "$as_me:28366: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -28390,7 +28379,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 28393 "configure"
++#line 28382 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28402,16 +28391,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28405: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28394: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28408: \$? = $ac_status" >&5
++  echo "$as_me:28397: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28411: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28400: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28414: \$? = $ac_status" >&5
++  echo "$as_me:28403: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -28424,12 +28413,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:28427: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:28416: 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 28432 "configure"
++#line 28421 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28445,15 +28434,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:28448: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28437: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28451: \$? = $ac_status" >&5
++  echo "$as_me:28440: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:28453: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28442: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28456: \$? = $ac_status" >&5
++  echo "$as_me:28445: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -28469,7 +28458,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:28472: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:28461: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&6
+ 
+-echo "${as_me:-configure}:28485: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:28474: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -28500,7 +28489,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:28503: checking for library subsets" >&5
++echo "$as_me:28492: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -28554,7 +28543,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:28557: result: $LIB_SUBSETS" >&5
++echo "$as_me:28546: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -28585,7 +28574,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:28588: checking default library suffix" >&5
++echo "$as_me:28577: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28596,10 +28585,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:28599: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:28588: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:28602: checking default library-dependency suffix" >&5
++echo "$as_me:28591: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -28682,10 +28671,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:28685: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28674: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:28688: checking default object directory" >&5
++echo "$as_me:28677: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28701,11 +28690,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:28704: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28693: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28708: checking c++ library-dependency suffix" >&5
++echo "$as_me:28697: 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++)
+@@ -28798,7 +28787,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:28801: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:28790: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -28974,19 +28963,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:28977: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:28966: 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:28986: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:28975: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28989: \$? = $ac_status" >&5
++  echo "$as_me:28978: \$? = $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
+@@ -28997,10 +28986,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 29000 "configure"
++#line 28989 "configure"
+ #include "confdefs.h"
+ 
+-#line 29003 "configure"
++#line 28992 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -29015,16 +29004,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:29018: \"$ac_link\"") >&5
++if { (eval echo "$as_me:29007: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:29021: \$? = $ac_status" >&5
++  echo "$as_me:29010: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:29024: \"$ac_try\"") >&5
++  { (eval echo "$as_me:29013: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:29027: \$? = $ac_status" >&5
++  echo "$as_me:29016: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -29047,7 +29036,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:29050: result: $cf_ldflags_static" >&5
++	echo "$as_me:29039: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test "$cf_ldflags_static" != yes
+@@ -29063,7 +29052,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29066: checking where we will install curses.h" >&5
++echo "$as_me:29055: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -29073,7 +29062,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:29076: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:29065: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -29081,7 +29070,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:29084: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:29073: 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
+@@ -29106,7 +29095,7 @@
+ 
+ # pkgsrc uses these
+ 
+-echo "$as_me:29109: checking for desired basename for form library" >&5
++echo "$as_me:29098: 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.
+@@ -29126,10 +29115,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29129: result: $FORM_NAME" >&5
++echo "$as_me:29118: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:29132: checking for desired basename for menu library" >&5
++echo "$as_me:29121: 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.
+@@ -29149,10 +29138,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29152: result: $MENU_NAME" >&5
++echo "$as_me:29141: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:29155: checking for desired basename for panel library" >&5
++echo "$as_me:29144: 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.
+@@ -29172,10 +29161,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29175: result: $PANEL_NAME" >&5
++echo "$as_me:29164: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:29178: checking for desired basename for cxx library" >&5
++echo "$as_me:29167: 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.
+@@ -29195,13 +29184,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29198: result: $CXX_NAME" >&5
++echo "$as_me:29187: 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:29204: checking for src modules" >&5
++echo "$as_me:29193: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -29260,7 +29249,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:29263: result: $cf_cv_src_modules" >&5
++echo "$as_me:29252: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -29421,7 +29410,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:29424: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:29413: 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//'`
+@@ -29432,7 +29421,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:29435: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
++echo "$as_me:29424: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -29448,7 +29437,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:29451: result: $PKG_CFLAGS" >&5
++echo "$as_me:29440: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ case "$cf_cv_system_name" in
+@@ -29520,7 +29509,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
+ 
+-echo "${as_me:-configure}:29523: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
++echo "${as_me:-configure}:29512: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+ 
+ fi
+ 
+@@ -29547,7 +29536,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:29550: checking for linker search path" >&5
++echo "$as_me:29539: 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
+@@ -29595,7 +29584,7 @@
+ 			cf_pathlist="$cf_pathlist /lib /usr/lib"
+ 			;;
+ 		(*)
+-			{ echo "$as_me:29598: WARNING: problem with Solaris architecture" >&5
++			{ echo "$as_me:29587: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ 			;;
+ 		esac
+@@ -29636,7 +29625,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:29639: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29628: 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'`
+@@ -29722,7 +29711,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29725: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29714: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -29903,7 +29892,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:29906: error: ambiguous option: $1
++    { { echo "$as_me:29895: 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;}
+@@ -29922,7 +29911,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:29925: error: unrecognized option: $1
++  -*) { { echo "$as_me:29914: 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;}
+@@ -30054,7 +30043,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:30057: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:30046: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -30579,7 +30568,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:30582: creating $ac_file" >&5
++    { echo "$as_me:30571: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -30597,7 +30586,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30600: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30589: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -30610,7 +30599,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30613: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30602: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30626,7 +30615,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:30629: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:30618: 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;}
+@@ -30635,7 +30624,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:30638: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:30627: 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;}
+@@ -30680,7 +30669,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:30683: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:30672: 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;}
+@@ -30691,7 +30680,7 @@
+     $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:30694: WARNING: Some variables may not be substituted:
++      { echo "$as_me:30683: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30740,7 +30729,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:30743: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:30732: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -30751,7 +30740,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30754: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30743: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -30764,7 +30753,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30767: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30756: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30822,7 +30811,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:30825: $ac_file is unchanged" >&5
++      { echo "$as_me:30814: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -31209,7 +31198,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}:31212: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:31201: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: configure.in
+Prereq:  1.786 
+--- ncurses-6.5-20241109+/configure.in	2024-08-31 10:46:01.000000000 +0000
++++ ncurses-6.5-20241123/configure.in	2024-11-23 22:52:31.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.786 2024/08/31 10:46:01 Rafael.Kitover Exp $
++dnl $Id: configure.in,v 1.787 2024/11/23 22:52:31 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.786 $)
++AC_REVISION($Revision: 1.787 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -1942,16 +1942,7 @@
+ 		cf_cv_type_of_bool=$NCURSES_BOOL
+ 		cf_cv_header_stdbool_h=0
+ 	else
+-		if test "$cf_cv_header_stdbool_h" = 1 ; then
+-			CF_BOOL_SIZE
+-		else
+-			AC_MSG_CHECKING(for fallback type of bool)
+-			case "$host_cpu" in
+-			(i?86)	cf_cv_type_of_bool=char	;;
+-			(*)	cf_cv_type_of_bool=int	;;
+-			esac
+-			AC_MSG_RESULT($cf_cv_type_of_bool)
+-		fi
++		CF_BOOL_SIZE
+ 	fi
+ fi
+ AC_SUBST(CXXLIBS)
+Index: dist.mk
+Prereq:  1.1640 
+--- ncurses-6.5-20241109+/dist.mk	2024-11-09 11:12:30.000000000 +0000
++++ ncurses-6.5-20241123/dist.mk	2024-11-23 10:51:23.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1640 2024/11/09 11:12:30 tom Exp $
++# $Id: dist.mk,v 1.1642 2024/11/23 10:51:23 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 = 5
+-NCURSES_PATCH = 20241109
++NCURSES_PATCH = 20241123
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: menu/m_item_new.c
+Prereq:  1.38 
+--- ncurses-6.5-20241109+/menu/m_item_new.c	2021-06-17 21:26:02.000000000 +0000
++++ ncurses-6.5-20241123/menu/m_item_new.c	2024-11-23 19:16:50.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2010,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -45,7 +45,7 @@
+ #endif
+ #endif
+ 
+-MODULE_ID("$Id: m_item_new.c,v 1.38 2021/06/17 21:26:02 tom Exp $")
++MODULE_ID("$Id: m_item_new.c,v 1.39 2024/11/23 19:16:50 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnmenu
+@@ -60,7 +60,7 @@
+ static bool
+ Is_Printable_String(const char *s)
+ {
+-  int result = TRUE;
++  bool result = TRUE;
+ 
+ #if USE_WIDEC_SUPPORT
+   int count = (int)mbstowcs(0, s, 0);
+Index: ncurses/base/lib_color.c
+Prereq:  1.151 
+--- ncurses-6.5-20241109+/ncurses/base/lib_color.c	2024-05-25 23:10:42.000000000 +0000
++++ ncurses-6.5-20241123/ncurses/base/lib_color.c	2024-11-23 18:27:25.000000000 +0000
+@@ -49,7 +49,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_color.c,v 1.151 2024/05/25 23:10:42 tom Exp $")
++MODULE_ID("$Id: lib_color.c,v 1.152 2024/11/23 18:27:25 tom Exp $")
+ 
+ #ifdef USE_TERM_DRIVER
+ #define CanChange      InfoOf(SP_PARM).canchange
+@@ -776,7 +776,7 @@
+ NCURSES_EXPORT(bool)
+ NCURSES_SP_NAME(can_change_color) (NCURSES_SP_DCL)
+ {
+-    int result = FALSE;
++    bool result = FALSE;
+ 
+     T((T_CALLED("can_change_color(%p)"), (void *) SP_PARM));
+ 
+@@ -784,7 +784,7 @@
+ 	result = TRUE;
+     }
+ 
+-    returnCode(result);
++    returnBool(result);
+ }
+ 
+ #if NCURSES_SP_FUNCS
+@@ -798,7 +798,7 @@
+ NCURSES_EXPORT(bool)
+ NCURSES_SP_NAME(has_colors) (NCURSES_SP_DCL0)
+ {
+-    int code = FALSE;
++    bool code = FALSE;
+ 
+     (void) SP_PARM;
+     T((T_CALLED("has_colors(%p)"), (void *) SP_PARM));
+@@ -814,7 +814,7 @@
+ 		     || set_color_pair)) ? TRUE : FALSE);
+ #endif
+     }
+-    returnCode(code);
++    returnBool(code);
+ }
+ 
+ #if NCURSES_SP_FUNCS
+Index: ncurses/base/lib_mouse.c
+Prereq:  1.201 
+--- ncurses-6.5-20241109+/ncurses/base/lib_mouse.c	2024-10-19 21:03:19.000000000 +0000
++++ ncurses-6.5-20241123/ncurses/base/lib_mouse.c	2024-11-23 19:06:20.000000000 +0000
+@@ -85,7 +85,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_mouse.c,v 1.201 2024/10/19 21:03:19 tom Exp $")
++MODULE_ID("$Id: lib_mouse.c,v 1.202 2024/11/23 19:06:20 tom Exp $")
+ 
+ #include 
+ 
+@@ -440,7 +440,7 @@
+ #endif
+ 
+ static void
+-enable_xterm_mouse(SCREEN *sp, int enable)
++enable_xterm_mouse(SCREEN *sp, bool enable)
+ {
+     TPUTS_TRACE(enable
+ 		? "xterm mouse initialization"
+@@ -455,7 +455,7 @@
+ 
+ #if defined(USE_TERM_DRIVER)
+ static void
+-enable_win32_mouse(SCREEN *sp, int enable)
++enable_win32_mouse(SCREEN *sp, bool enable)
+ {
+ #if defined(EXP_WIN32_DRIVER)
+     enable_xterm_mouse(sp, enable);
+@@ -485,7 +485,7 @@
+ 	const char *env = getenv("TERM");
+ 	if (list != 0) {
+ 	    if (env != 0) {
+-		result = _nc_name_match(list, env, "|:");
++		result = _nc_name_match(list, env, "|:") ? TRUE : FALSE;
+ 	    }
+ 	} else {
+ 	    /* GPM checks the beginning of the $TERM variable to decide if it
+@@ -796,7 +796,7 @@
+ 	}
+ 	result = sp->_mouse_initialized;
+     }
+-    returnCode(result);
++    returnBool(result);
+ }
+ 
+ /*
+@@ -1404,7 +1404,7 @@
+ }
+ 
+ static void
+-mouse_activate(SCREEN *sp, int on)
++mouse_activate(SCREEN *sp, bool on)
+ {
+     T((T_CALLED("mouse_activate(%p,%s)"),
+        (void *) SP_PARM, on ? "on" : "off"));
+@@ -1422,7 +1422,7 @@
+ #if NCURSES_EXT_FUNCS
+ 	    NCURSES_SP_NAME(keyok) (NCURSES_SP_ARGx KEY_MOUSE, on);
+ #endif
+-	    enable_xterm_mouse(sp, 1);
++	    enable_xterm_mouse(sp, TRUE);
+ 	    break;
+ #if USE_GPM_SUPPORT
+ 	case M_GPM:
+@@ -1462,7 +1462,7 @@
+ 
+ 	switch (sp->_mouse_type) {
+ 	case M_XTERM:
+-	    enable_xterm_mouse(sp, 0);
++	    enable_xterm_mouse(sp, FALSE);
+ 	    break;
+ #if USE_GPM_SUPPORT
+ 	case M_GPM:
+Index: ncurses/base/lib_newterm.c
+Prereq:  1.105 
+--- ncurses-6.5-20241109+/ncurses/base/lib_newterm.c	2024-05-11 19:06:59.000000000 +0000
++++ ncurses-6.5-20241123/ncurses/base/lib_newterm.c	2024-11-23 18:33:35.000000000 +0000
+@@ -49,7 +49,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_newterm.c,v 1.105 2024/05/11 19:06:59 tom Exp $")
++MODULE_ID("$Id: lib_newterm.c,v 1.106 2024/11/23 18:33:35 tom Exp $")
+ 
+ #ifdef USE_TERM_DRIVER
+ #define NumLabels      InfoOf(SP_PARM).numlabels
+@@ -212,7 +212,7 @@
+ 	   TINFO_SETUP_TERM(&new_term, name,
+ 			    fileno(_ofp), &errret, FALSE) != ERR) {
+ 	int slk_format;
+-	int filter_mode;
++	bool filter_mode;
+ 
+ 	_nc_set_screen(0);
+ #ifdef USE_TERM_DRIVER
+Index: ncurses/base/lib_set_term.c
+Prereq:  1.188 
+--- ncurses-6.5-20241109+/ncurses/base/lib_set_term.c	2024-11-09 16:36:29.000000000 +0000
++++ ncurses-6.5-20241123/ncurses/base/lib_set_term.c	2024-11-23 18:33:50.000000000 +0000
+@@ -57,7 +57,7 @@
+ #undef CUR
+ #define CUR SP_TERMTYPE
+ 
+-MODULE_ID("$Id: lib_set_term.c,v 1.188 2024/11/09 16:36:29 tom Exp $")
++MODULE_ID("$Id: lib_set_term.c,v 1.189 2024/11/23 18:33:50 tom Exp $")
+ 
+ #ifdef USE_TERM_DRIVER
+ #define MaxColors      InfoOf(sp).maxcolors
+@@ -315,7 +315,7 @@
+ 				     int slines,
+ 				     int scolumns,
+ 				     FILE *output,
+-				     int filtered,
++				     bool filtered,
+ 				     int slk_format)
+ {
+ #ifndef USE_TERM_DRIVER
+@@ -766,7 +766,7 @@
+ _nc_setupscreen(int slines GCC_UNUSED,
+ 		int scolumns GCC_UNUSED,
+ 		FILE *output,
+-		int filtered,
++		bool filtered,
+ 		int slk_format)
+ {
+     SCREEN *sp = 0;
+Index: ncurses/base/lib_touch.c
+Prereq:  1.16 
+--- ncurses-6.5-20241109+/ncurses/base/lib_touch.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241123/ncurses/base/lib_touch.c	2024-11-23 19:17:05.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 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 
+ 
+-MODULE_ID("$Id: lib_touch.c,v 1.16 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_touch.c,v 1.17 2024/11/23 19:17:05 tom Exp $")
+ 
+ #undef is_linetouched
+ 
+@@ -55,10 +55,10 @@
+ 
+     /* XSI doesn't define any error, and gcc ultimately made it impossible */
+     if (!win || (line > win->_maxy) || (line < 0)) {
+-	returnCode(FALSE);
++	returnBool(FALSE);
+     }
+ 
+-    returnCode(win->_line[line].firstchar != _NOCHANGE ? TRUE : FALSE);
++    returnBool(win->_line[line].firstchar != _NOCHANGE ? TRUE : FALSE);
+ }
+ 
+ NCURSES_EXPORT(bool)
+@@ -71,9 +71,9 @@
+ 
+ 	for (i = 0; i <= win->_maxy; i++)
+ 	    if (win->_line[i].firstchar != _NOCHANGE)
+-		returnCode(TRUE);
++		returnBool(TRUE);
+     }
+-    returnCode(FALSE);
++    returnBool(FALSE);
+ }
+ 
+ NCURSES_EXPORT(int)
+Index: ncurses/base/resizeterm.c
+Prereq:  1.56 
+--- ncurses-6.5-20241109+/ncurses/base/resizeterm.c	2024-09-22 20:25:15.000000000 +0000
++++ ncurses-6.5-20241123/ncurses/base/resizeterm.c	2024-11-23 18:35:34.000000000 +0000
+@@ -46,7 +46,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: resizeterm.c,v 1.56 2024/09/22 20:25:15 tom Exp $")
++MODULE_ID("$Id: resizeterm.c,v 1.57 2024/11/23 18:35:34 tom Exp $")
+ 
+ /*
+  * If we're trying to be reentrant, do not want any local statics.
+@@ -103,7 +103,7 @@
+ NCURSES_SP_NAME(is_term_resized) (NCURSES_SP_DCLx int ToLines, int ToCols)
+ {
+     T((T_CALLED("is_term_resized(%p, %d, %d)"), (void *) SP_PARM, ToLines, ToCols));
+-    returnCode(ToLines > 0
++    returnBool(ToLines > 0
+ 	       && ToCols > 0
+ 	       && SP_PARM != NULL
+ 	       && (ToLines != screen_lines(SP_PARM)
+Index: ncurses/curses.priv.h
+Prereq:  1.694 
+--- ncurses-6.5-20241109+/ncurses/curses.priv.h	2024-10-19 21:23:40.000000000 +0000
++++ ncurses-6.5-20241123/ncurses/curses.priv.h	2024-11-23 18:40:45.000000000 +0000
+@@ -35,7 +35,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: curses.priv.h,v 1.694 2024/10/19 21:23:40 tom Exp $
++ * $Id: curses.priv.h,v 1.695 2024/11/23 18:40:45 tom Exp $
+  *
+  *	curses.priv.h
+  *
+@@ -1733,7 +1733,7 @@
+ #define returnPtrDB(rc)		do { TR(TRACE_DATABASE,(T_RETURN("%p"), (rc))); return (rc); } while (0)
+ #define returnVoidDB		do { TR(TRACE_DATABASE,(T_RETURN(""))); return; } while (0)
+ 
+-extern NCURSES_EXPORT(NCURSES_BOOL)     _nc_retrace_bool (int);
++extern NCURSES_EXPORT(bool)             _nc_retrace_bool (bool);
+ extern NCURSES_EXPORT(NCURSES_CONST void *) _nc_retrace_cvoid_ptr (NCURSES_CONST void *);
+ extern NCURSES_EXPORT(SCREEN *)         _nc_retrace_sp (SCREEN *);
+ extern NCURSES_EXPORT(WINDOW *)         _nc_retrace_win (WINDOW *);
+@@ -2067,7 +2067,7 @@
+ 
+ /* lib_setup.c */
+ extern NCURSES_EXPORT(char *) _nc_get_locale(void);
+-extern NCURSES_EXPORT(int)    _nc_unicode_locale(void);
++extern NCURSES_EXPORT(bool)   _nc_unicode_locale(void);
+ extern NCURSES_EXPORT(int)    _nc_locale_breaks_acs(TERMINAL *);
+ extern NCURSES_EXPORT(int)    _nc_setupterm(const char *, int, int *, int);
+ extern NCURSES_EXPORT(void)   _nc_tinfo_cmdch(TERMINAL *, int);
+@@ -2161,7 +2161,7 @@
+ extern NCURSES_EXPORT(int) _nc_baudrate (int);
+ extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *);
+ extern NCURSES_EXPORT(int) _nc_getenv_num (const char *);
+-extern NCURSES_EXPORT(int) _nc_keypad (SCREEN *, int);
++extern NCURSES_EXPORT(int) _nc_keypad (SCREEN *, bool);
+ extern NCURSES_EXPORT(int) _nc_ospeed (int);
+ extern NCURSES_EXPORT(int) _nc_outch (int);
+ extern NCURSES_EXPORT(int) _nc_putchar (int);
+@@ -2169,7 +2169,7 @@
+ extern NCURSES_EXPORT(int) _nc_putp_flush(const char *, const char *);
+ extern NCURSES_EXPORT(int) _nc_read_termcap_entry (const char *const, TERMTYPE2 *const);
+ extern NCURSES_EXPORT(int) _nc_setup_tinfo(const char *, TERMTYPE2 *);
+-extern NCURSES_EXPORT(int) _nc_setupscreen (int, int, FILE *, int, int);
++extern NCURSES_EXPORT(int) _nc_setupscreen (int, int, FILE *, bool, int);
+ extern NCURSES_EXPORT(int) _nc_timed_wait (const SCREEN *, int, int, int * EVENTLIST_2nd(_nc_eventlist *));
+ extern NCURSES_EXPORT(int) _nc_trans_string (char *, const char *);
+ extern NCURSES_EXPORT(void) _nc_init_termtype (TERMTYPE2 *const);
+@@ -2627,7 +2627,7 @@
+ extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_ripoffline)(SCREEN*, int, int (*)(WINDOW *,int));
+ extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_scrolln)(SCREEN*, int, int, int, int);
+ extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_set_tty_mode)(SCREEN*, TTY*);
+-extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_setupscreen)(SCREEN**, int, int, FILE *, int, int);
++extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_setupscreen)(SCREEN**, int, int, FILE *, bool, int);
+ extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_tgetent)(SCREEN*,char*,const char *);
+ extern NCURSES_EXPORT(void)     NCURSES_SP_NAME(_nc_do_color)(SCREEN*, int, int, int, NCURSES_SP_OUTC);
+ extern NCURSES_EXPORT(void)     NCURSES_SP_NAME(_nc_do_xmc_glitch)(SCREEN*, attr_t);
+Index: ncurses/llib-lncurses
+--- ncurses-6.5-20241109+/ncurses/llib-lncurses	2023-08-12 18:53:52.000000000 +0000
++++ ncurses-6.5-20241123/ncurses/llib-lncurses	2024-11-23 21:33:59.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -1475,7 +1475,7 @@
+ 
+ #undef _nc_has_mouse
+ NCURSES_BOOL _nc_has_mouse(
+-		SCREEN	*sp)
++		const SCREEN *sp)
+ 		{ return(*(NCURSES_BOOL *)0); }
+ 
+ #undef has_mouse_sp
+@@ -2032,7 +2032,7 @@
+ 		int	slines,
+ 		int	scolumns,
+ 		FILE	*output,
+-		int	filtered,
++		NCURSES_BOOL filtered,
+ 		int	slk_format)
+ 		{ return(*(int *)0); }
+ 
+@@ -2041,7 +2041,7 @@
+ 		int	slines,
+ 		int	scolumns,
+ 		FILE	*output,
+-		int	filtered,
++		NCURSES_BOOL filtered,
+ 		int	slk_format)
+ 		{ return(*(int *)0); }
+ 
+@@ -2994,7 +2994,7 @@
+ #undef _nc_free_entry
+ void	_nc_free_entry(
+ 		ENTRY	*headp,
+-		TERMTYPE *tterm)
++		const TERMTYPE *tterm)
+ 		{ /* void */ }
+ 
+ #undef _nc_free_entries
+@@ -3339,7 +3339,7 @@
+ #undef _nc_keypad
+ int	_nc_keypad(
+ 		SCREEN	*sp,
+-		int	flag)
++		NCURSES_BOOL flag)
+ 		{ return(*(int *)0); }
+ 
+ /* ./tinfo/lib_raw.c */
+@@ -3525,8 +3525,8 @@
+ 		{ return(*(char **)0); }
+ 
+ #undef _nc_unicode_locale
+-int	_nc_unicode_locale(void)
+-		{ return(*(int *)0); }
++NCURSES_BOOL _nc_unicode_locale(void)
++		{ return(*(NCURSES_BOOL *)0); }
+ 
+ #undef _nc_locale_breaks_acs
+ int	_nc_locale_breaks_acs(
+@@ -3848,7 +3848,7 @@
+ 
+ #undef _nc_retrace_bool
+ NCURSES_BOOL _nc_retrace_bool(
+-		int	code)
++		NCURSES_BOOL code)
+ 		{ return(*(NCURSES_BOOL *)0); }
+ 
+ #undef _nc_retrace_char
+@@ -4054,7 +4054,7 @@
+ 
+ #undef _nc_timed_wait
+ int	_nc_timed_wait(
+-		SCREEN	*sp,
++		const SCREEN *sp,
+ 		int	mode,
+ 		int	milliseconds,
+ 		int	*timeleft)
+Index: ncurses/llib-lncursest
+--- ncurses-6.5-20241109+/ncurses/llib-lncursest	2023-08-12 18:55:32.000000000 +0000
++++ ncurses-6.5-20241123/ncurses/llib-lncursest	2024-11-23 21:33:59.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -1484,7 +1484,7 @@
+ 
+ #undef _nc_has_mouse
+ NCURSES_BOOL _nc_has_mouse(
+-		SCREEN	*sp)
++		const SCREEN *sp)
+ 		{ return(*(NCURSES_BOOL *)0); }
+ 
+ #undef has_mouse_sp
+@@ -2041,7 +2041,7 @@
+ 		int	slines,
+ 		int	scolumns,
+ 		FILE	*output,
+-		int	filtered,
++		NCURSES_BOOL filtered,
+ 		int	slk_format)
+ 		{ return(*(int *)0); }
+ 
+@@ -2050,7 +2050,7 @@
+ 		int	slines,
+ 		int	scolumns,
+ 		FILE	*output,
+-		int	filtered,
++		NCURSES_BOOL filtered,
+ 		int	slk_format)
+ 		{ return(*(int *)0); }
+ 
+@@ -3008,7 +3008,7 @@
+ #undef _nc_free_entry
+ void	_nc_free_entry(
+ 		ENTRY	*headp,
+-		TERMTYPE *tterm)
++		const TERMTYPE *tterm)
+ 		{ /* void */ }
+ 
+ #undef _nc_free_entries
+@@ -3394,7 +3394,7 @@
+ #undef _nc_keypad
+ int	_nc_keypad(
+ 		SCREEN	*sp,
+-		int	flag)
++		NCURSES_BOOL flag)
+ 		{ return(*(int *)0); }
+ 
+ /* ./tinfo/lib_raw.c */
+@@ -3602,8 +3602,8 @@
+ 		{ return(*(char **)0); }
+ 
+ #undef _nc_unicode_locale
+-int	_nc_unicode_locale(void)
+-		{ return(*(int *)0); }
++NCURSES_BOOL _nc_unicode_locale(void)
++		{ return(*(NCURSES_BOOL *)0); }
+ 
+ #undef _nc_locale_breaks_acs
+ int	_nc_locale_breaks_acs(
+@@ -3947,7 +3947,7 @@
+ 
+ #undef _nc_retrace_bool
+ NCURSES_BOOL _nc_retrace_bool(
+-		int	code)
++		NCURSES_BOOL code)
+ 		{ return(*(NCURSES_BOOL *)0); }
+ 
+ #undef _nc_retrace_char
+@@ -4164,7 +4164,7 @@
+ 
+ #undef _nc_timed_wait
+ int	_nc_timed_wait(
+-		SCREEN	*sp,
++		const SCREEN *sp,
+ 		int	mode,
+ 		int	milliseconds,
+ 		int	*timeleft)
+Index: ncurses/llib-lncursestw
+--- ncurses-6.5-20241109+/ncurses/llib-lncursestw	2023-08-12 18:54:59.000000000 +0000
++++ ncurses-6.5-20241123/ncurses/llib-lncursestw	2024-11-23 21:33:59.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2009-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -2065,7 +2065,7 @@
+ 
+ #undef _nc_has_mouse
+ NCURSES_BOOL _nc_has_mouse(
+-		SCREEN	*sp)
++		const SCREEN *sp)
+ 		{ return(*(NCURSES_BOOL *)0); }
+ 
+ #undef has_mouse_sp
+@@ -2622,7 +2622,7 @@
+ 		int	slines,
+ 		int	scolumns,
+ 		FILE	*output,
+-		int	filtered,
++		NCURSES_BOOL filtered,
+ 		int	slk_format)
+ 		{ return(*(int *)0); }
+ 
+@@ -2631,7 +2631,7 @@
+ 		int	slines,
+ 		int	scolumns,
+ 		FILE	*output,
+-		int	filtered,
++		NCURSES_BOOL filtered,
+ 		int	slk_format)
+ 		{ return(*(int *)0); }
+ 
+@@ -3581,7 +3581,7 @@
+ void	_nc_reset_color_pair(
+ 		SCREEN	*sp,
+ 		int	pair,
+-		colorpair_t *next)
++		const colorpair_t *next)
+ 		{ /* void */ }
+ 
+ #undef _nc_set_color_pair
+@@ -3959,7 +3959,7 @@
+ #undef _nc_free_entry
+ void	_nc_free_entry(
+ 		ENTRY	*headp,
+-		TERMTYPE2 *tterm)
++		const TERMTYPE2 *tterm)
+ 		{ /* void */ }
+ 
+ #undef _nc_free_entries
+@@ -4355,7 +4355,7 @@
+ #undef _nc_keypad
+ int	_nc_keypad(
+ 		SCREEN	*sp,
+-		int	flag)
++		NCURSES_BOOL flag)
+ 		{ return(*(int *)0); }
+ 
+ /* ./tinfo/lib_raw.c */
+@@ -4563,8 +4563,8 @@
+ 		{ return(*(char **)0); }
+ 
+ #undef _nc_unicode_locale
+-int	_nc_unicode_locale(void)
+-		{ return(*(int *)0); }
++NCURSES_BOOL _nc_unicode_locale(void)
++		{ return(*(NCURSES_BOOL *)0); }
+ 
+ #undef _nc_locale_breaks_acs
+ int	_nc_locale_breaks_acs(
+@@ -4908,7 +4908,7 @@
+ 
+ #undef _nc_retrace_bool
+ NCURSES_BOOL _nc_retrace_bool(
+-		int	code)
++		NCURSES_BOOL code)
+ 		{ return(*(NCURSES_BOOL *)0); }
+ 
+ #undef _nc_retrace_char
+@@ -5136,7 +5136,7 @@
+ 
+ #undef _nc_timed_wait
+ int	_nc_timed_wait(
+-		SCREEN	*sp,
++		const SCREEN *sp,
+ 		int	mode,
+ 		int	milliseconds,
+ 		int	*timeleft)
+Index: ncurses/llib-lncursesw
+--- ncurses-6.5-20241109+/ncurses/llib-lncursesw	2023-08-12 18:54:25.000000000 +0000
++++ ncurses-6.5-20241123/ncurses/llib-lncursesw	2024-11-23 21:33:59.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2001-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -2056,7 +2056,7 @@
+ 
+ #undef _nc_has_mouse
+ NCURSES_BOOL _nc_has_mouse(
+-		SCREEN	*sp)
++		const SCREEN *sp)
+ 		{ return(*(NCURSES_BOOL *)0); }
+ 
+ #undef has_mouse_sp
+@@ -2613,7 +2613,7 @@
+ 		int	slines,
+ 		int	scolumns,
+ 		FILE	*output,
+-		int	filtered,
++		NCURSES_BOOL filtered,
+ 		int	slk_format)
+ 		{ return(*(int *)0); }
+ 
+@@ -2622,7 +2622,7 @@
+ 		int	slines,
+ 		int	scolumns,
+ 		FILE	*output,
+-		int	filtered,
++		NCURSES_BOOL filtered,
+ 		int	slk_format)
+ 		{ return(*(int *)0); }
+ 
+@@ -3572,7 +3572,7 @@
+ void	_nc_reset_color_pair(
+ 		SCREEN	*sp,
+ 		int	pair,
+-		colorpair_t *next)
++		const colorpair_t *next)
+ 		{ /* void */ }
+ 
+ #undef _nc_set_color_pair
+@@ -3945,7 +3945,7 @@
+ #undef _nc_free_entry
+ void	_nc_free_entry(
+ 		ENTRY	*headp,
+-		TERMTYPE2 *tterm)
++		const TERMTYPE2 *tterm)
+ 		{ /* void */ }
+ 
+ #undef _nc_free_entries
+@@ -4300,7 +4300,7 @@
+ #undef _nc_keypad
+ int	_nc_keypad(
+ 		SCREEN	*sp,
+-		int	flag)
++		NCURSES_BOOL flag)
+ 		{ return(*(int *)0); }
+ 
+ /* ./tinfo/lib_raw.c */
+@@ -4486,8 +4486,8 @@
+ 		{ return(*(char **)0); }
+ 
+ #undef _nc_unicode_locale
+-int	_nc_unicode_locale(void)
+-		{ return(*(int *)0); }
++NCURSES_BOOL _nc_unicode_locale(void)
++		{ return(*(NCURSES_BOOL *)0); }
+ 
+ #undef _nc_locale_breaks_acs
+ int	_nc_locale_breaks_acs(
+@@ -4809,7 +4809,7 @@
+ 
+ #undef _nc_retrace_bool
+ NCURSES_BOOL _nc_retrace_bool(
+-		int	code)
++		NCURSES_BOOL code)
+ 		{ return(*(NCURSES_BOOL *)0); }
+ 
+ #undef _nc_retrace_char
+@@ -5026,7 +5026,7 @@
+ 
+ #undef _nc_timed_wait
+ int	_nc_timed_wait(
+-		SCREEN	*sp,
++		const SCREEN *sp,
+ 		int	mode,
+ 		int	milliseconds,
+ 		int	*timeleft)
+Index: ncurses/llib-ltinfo
+--- ncurses-6.5-20241109+/ncurses/llib-ltinfo	2023-08-12 18:54:05.000000000 +0000
++++ ncurses-6.5-20241123/ncurses/llib-ltinfo	2024-11-23 21:33:59.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2012-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -265,7 +265,7 @@
+ #undef _nc_free_entry
+ void	_nc_free_entry(
+ 		ENTRY	*headp,
+-		TERMTYPE *tterm)
++		const TERMTYPE *tterm)
+ 		{ /* void */ }
+ 
+ #undef _nc_free_entries
+@@ -610,7 +610,7 @@
+ #undef _nc_keypad
+ int	_nc_keypad(
+ 		SCREEN	*sp,
+-		int	flag)
++		NCURSES_BOOL flag)
+ 		{ return(*(int *)0); }
+ 
+ /* ./tinfo/lib_raw.c */
+@@ -796,8 +796,8 @@
+ 		{ return(*(char **)0); }
+ 
+ #undef _nc_unicode_locale
+-int	_nc_unicode_locale(void)
+-		{ return(*(int *)0); }
++NCURSES_BOOL _nc_unicode_locale(void)
++		{ return(*(NCURSES_BOOL *)0); }
+ 
+ #undef _nc_locale_breaks_acs
+ int	_nc_locale_breaks_acs(
+@@ -1119,7 +1119,7 @@
+ 
+ #undef _nc_retrace_bool
+ NCURSES_BOOL _nc_retrace_bool(
+-		int	code)
++		NCURSES_BOOL code)
+ 		{ return(*(NCURSES_BOOL *)0); }
+ 
+ #undef _nc_retrace_char
+@@ -1325,7 +1325,7 @@
+ 
+ #undef _nc_timed_wait
+ int	_nc_timed_wait(
+-		SCREEN	*sp,
++		const SCREEN *sp,
+ 		int	mode,
+ 		int	milliseconds,
+ 		int	*timeleft)
+Index: ncurses/llib-ltinfot
+--- ncurses-6.5-20241109+/ncurses/llib-ltinfot	2023-08-12 18:55:45.000000000 +0000
++++ ncurses-6.5-20241123/ncurses/llib-ltinfot	2024-11-23 21:33:59.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2013-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -270,7 +270,7 @@
+ #undef _nc_free_entry
+ void	_nc_free_entry(
+ 		ENTRY	*headp,
+-		TERMTYPE *tterm)
++		const TERMTYPE *tterm)
+ 		{ /* void */ }
+ 
+ #undef _nc_free_entries
+@@ -656,7 +656,7 @@
+ #undef _nc_keypad
+ int	_nc_keypad(
+ 		SCREEN	*sp,
+-		int	flag)
++		NCURSES_BOOL flag)
+ 		{ return(*(int *)0); }
+ 
+ /* ./tinfo/lib_raw.c */
+@@ -864,8 +864,8 @@
+ 		{ return(*(char **)0); }
+ 
+ #undef _nc_unicode_locale
+-int	_nc_unicode_locale(void)
+-		{ return(*(int *)0); }
++NCURSES_BOOL _nc_unicode_locale(void)
++		{ return(*(NCURSES_BOOL *)0); }
+ 
+ #undef _nc_locale_breaks_acs
+ int	_nc_locale_breaks_acs(
+@@ -1209,7 +1209,7 @@
+ 
+ #undef _nc_retrace_bool
+ NCURSES_BOOL _nc_retrace_bool(
+-		int	code)
++		NCURSES_BOOL code)
+ 		{ return(*(NCURSES_BOOL *)0); }
+ 
+ #undef _nc_retrace_char
+@@ -1426,7 +1426,7 @@
+ 
+ #undef _nc_timed_wait
+ int	_nc_timed_wait(
+-		SCREEN	*sp,
++		const SCREEN *sp,
+ 		int	mode,
+ 		int	milliseconds,
+ 		int	*timeleft)
+Index: ncurses/llib-ltinfotw
+--- ncurses-6.5-20241109+/ncurses/llib-ltinfotw	2023-08-12 18:55:14.000000000 +0000
++++ ncurses-6.5-20241123/ncurses/llib-ltinfotw	2024-11-23 21:33:59.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2012-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -282,7 +282,7 @@
+ #undef _nc_free_entry
+ void	_nc_free_entry(
+ 		ENTRY	*headp,
+-		TERMTYPE2 *tterm)
++		const TERMTYPE2 *tterm)
+ 		{ /* void */ }
+ 
+ #undef _nc_free_entries
+@@ -678,7 +678,7 @@
+ #undef _nc_keypad
+ int	_nc_keypad(
+ 		SCREEN	*sp,
+-		int	flag)
++		NCURSES_BOOL flag)
+ 		{ return(*(int *)0); }
+ 
+ /* ./tinfo/lib_raw.c */
+@@ -886,8 +886,8 @@
+ 		{ return(*(char **)0); }
+ 
+ #undef _nc_unicode_locale
+-int	_nc_unicode_locale(void)
+-		{ return(*(int *)0); }
++NCURSES_BOOL _nc_unicode_locale(void)
++		{ return(*(NCURSES_BOOL *)0); }
+ 
+ #undef _nc_locale_breaks_acs
+ int	_nc_locale_breaks_acs(
+@@ -1231,7 +1231,7 @@
+ 
+ #undef _nc_retrace_bool
+ NCURSES_BOOL _nc_retrace_bool(
+-		int	code)
++		NCURSES_BOOL code)
+ 		{ return(*(NCURSES_BOOL *)0); }
+ 
+ #undef _nc_retrace_char
+@@ -1459,7 +1459,7 @@
+ 
+ #undef _nc_timed_wait
+ int	_nc_timed_wait(
+-		SCREEN	*sp,
++		const SCREEN *sp,
+ 		int	mode,
+ 		int	milliseconds,
+ 		int	*timeleft)
+Index: ncurses/llib-ltinfow
+--- ncurses-6.5-20241109+/ncurses/llib-ltinfow	2023-08-12 18:54:39.000000000 +0000
++++ ncurses-6.5-20241123/ncurses/llib-ltinfow	2024-11-23 21:33:59.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2012-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -277,7 +277,7 @@
+ #undef _nc_free_entry
+ void	_nc_free_entry(
+ 		ENTRY	*headp,
+-		TERMTYPE2 *tterm)
++		const TERMTYPE2 *tterm)
+ 		{ /* void */ }
+ 
+ #undef _nc_free_entries
+@@ -632,7 +632,7 @@
+ #undef _nc_keypad
+ int	_nc_keypad(
+ 		SCREEN	*sp,
+-		int	flag)
++		NCURSES_BOOL flag)
+ 		{ return(*(int *)0); }
+ 
+ /* ./tinfo/lib_raw.c */
+@@ -818,8 +818,8 @@
+ 		{ return(*(char **)0); }
+ 
+ #undef _nc_unicode_locale
+-int	_nc_unicode_locale(void)
+-		{ return(*(int *)0); }
++NCURSES_BOOL _nc_unicode_locale(void)
++		{ return(*(NCURSES_BOOL *)0); }
+ 
+ #undef _nc_locale_breaks_acs
+ int	_nc_locale_breaks_acs(
+@@ -1141,7 +1141,7 @@
+ 
+ #undef _nc_retrace_bool
+ NCURSES_BOOL _nc_retrace_bool(
+-		int	code)
++		NCURSES_BOOL code)
+ 		{ return(*(NCURSES_BOOL *)0); }
+ 
+ #undef _nc_retrace_char
+@@ -1358,7 +1358,7 @@
+ 
+ #undef _nc_timed_wait
+ int	_nc_timed_wait(
+-		SCREEN	*sp,
++		const SCREEN *sp,
+ 		int	mode,
+ 		int	milliseconds,
+ 		int	*timeleft)
+Index: ncurses/tinfo/comp_scan.c
+Prereq:  1.123 
+--- ncurses-6.5-20241109+/ncurses/tinfo/comp_scan.c	2024-07-27 19:22:23.000000000 +0000
++++ ncurses-6.5-20241123/ncurses/tinfo/comp_scan.c	2024-11-23 18:45:01.000000000 +0000
+@@ -51,7 +51,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: comp_scan.c,v 1.123 2024/07/27 19:22:23 tom Exp $")
++MODULE_ID("$Id: comp_scan.c,v 1.124 2024/11/23 18:45:01 tom Exp $")
+ 
+ /*
+  * Maximum length of string capability we'll accept before raising an error.
+@@ -61,7 +61,7 @@
+ 
+ #define iswhite(ch)	(ch == ' '  ||  ch == '\t')
+ 
+-NCURSES_EXPORT_VAR (int) _nc_syntax = 0;         /* termcap or terminfo? */
++NCURSES_EXPORT_VAR (int) _nc_syntax = SYN_TERMINFO;  /* termcap or terminfo? */
+ NCURSES_EXPORT_VAR (int) _nc_strict_bsd = 1;  /* ncurses extended termcap? */
+ NCURSES_EXPORT_VAR (long) _nc_curr_file_pos = 0; /* file offset of current line */
+ NCURSES_EXPORT_VAR (long) _nc_comment_start = 0; /* start of comment range before name */
+Index: ncurses/tinfo/lib_has_cap.c
+Prereq:  1.11 
+--- ncurses-6.5-20241109+/ncurses/tinfo/lib_has_cap.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241123/ncurses/tinfo/lib_has_cap.c	2024-11-23 19:17:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2009,2013 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -47,7 +47,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_has_cap.c,v 1.11 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_has_cap.c,v 1.12 2024/11/23 19:17:15 tom Exp $")
+ 
+ NCURSES_EXPORT(bool)
+ NCURSES_SP_NAME(has_ic) (NCURSES_SP_DCL0)
+@@ -62,7 +62,7 @@
+ 		&& (delete_character || parm_dch)) ? TRUE : FALSE;
+     }
+ 
+-    returnCode(code);
++    returnBool(code);
+ }
+ 
+ #if NCURSES_SP_FUNCS
+@@ -83,7 +83,7 @@
+ 		&& (delete_line || parm_delete_line)) ? TRUE : FALSE;
+     }
+ 
+-    returnCode(code);
++    returnBool(code);
+ }
+ 
+ #if NCURSES_SP_FUNCS
+Index: ncurses/tinfo/lib_options.c
+Prereq:  1.83 
+--- ncurses-6.5-20241109+/ncurses/tinfo/lib_options.c	2023-04-29 18:56:12.000000000 +0000
++++ ncurses-6.5-20241123/ncurses/tinfo/lib_options.c	2024-11-23 19:17:25.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2021,2023 Thomas E. Dickey                                *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -47,7 +47,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_options.c,v 1.83 2023/04/29 18:56:12 tom Exp $")
++MODULE_ID("$Id: lib_options.c,v 1.84 2024/11/23 19:17:25 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ idlok(WINDOW *win, bool flag)
+@@ -330,7 +330,7 @@
+  * the terminal state _before_ switching modes.
+  */
+ NCURSES_EXPORT(int)
+-_nc_keypad(SCREEN *sp, int flag)
++_nc_keypad(SCREEN *sp, bool flag)
+ {
+     int rc = ERR;
+ 
+Index: ncurses/tinfo/lib_setup.c
+Prereq:  1.245 
+--- ncurses-6.5-20241109+/ncurses/tinfo/lib_setup.c	2024-10-19 21:17:36.000000000 +0000
++++ ncurses-6.5-20241123/ncurses/tinfo/lib_setup.c	2024-11-23 18:32:54.000000000 +0000
+@@ -49,7 +49,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: lib_setup.c,v 1.245 2024/10/19 21:17:36 tom Exp $")
++MODULE_ID("$Id: lib_setup.c,v 1.246 2024/11/23 18:32:54 tom Exp $")
+ 
+ /****************************************************************************
+  *
+@@ -751,24 +751,24 @@
+ /*
+  * Check if we are running in a UTF-8 locale.
+  */
+-NCURSES_EXPORT(int)
++NCURSES_EXPORT(bool)
+ _nc_unicode_locale(void)
+ {
+     static bool initialized = FALSE;
+-    static int result = 0;
++    static bool result = FALSE;
+ 
+     if (!initialized) {
+ #if defined(_NC_WINDOWS_NATIVE) && USE_WIDEC_SUPPORT
+-	result = 1;
++	result = TRUE;
+ #elif HAVE_LANGINFO_CODESET
+ 	char *env = nl_langinfo(CODESET);
+-	result = !strcmp(env, "UTF-8");
++	result = !strcmp(env, "UTF-8") ? TRUE : FALSE;
+ 	T(("_nc_unicode_locale(%s) ->%d", env, result));
+ #else
+ 	char *env = _nc_get_locale();
+ 	if (env != 0) {
+ 	    if (strstr(env, ".UTF-8") != 0) {
+-		result = 1;
++		result = TRUE;
+ 		T(("_nc_unicode_locale(%s) ->%d", env, result));
+ 	    }
+ 	}
+Index: ncurses/tinfo/parse_entry.c
+Prereq:  1.110 
+--- ncurses-6.5-20241109+/ncurses/tinfo/parse_entry.c	2024-10-19 21:22:04.000000000 +0000
++++ ncurses-6.5-20241123/ncurses/tinfo/parse_entry.c	2024-11-23 18:49:08.000000000 +0000
+@@ -48,7 +48,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: parse_entry.c,v 1.110 2024/10/19 21:22:04 tom Exp $")
++MODULE_ID("$Id: parse_entry.c,v 1.111 2024/11/23 18:49:08 tom Exp $")
+ 
+ #ifdef LINT
+ static short const parametrized[] =
+@@ -395,7 +395,7 @@
+ 	} else {
+ 	    /* normal token lookup */
+ 	    entry_ptr = _nc_find_entry(_nc_curr_token.tk_name,
+-				       _nc_get_hash_table(_nc_syntax));
++				       _nc_get_hash_table(_nc_syntax == SYN_TERMCAP));
+ 
+ 	    /*
+ 	     * Our kluge to handle aliasing.  The reason it is done
+Index: ncurses/trace/lib_trace.c
+Prereq:  1.107 
+--- ncurses-6.5-20241109+/ncurses/trace/lib_trace.c	2024-08-31 10:48:22.000000000 +0000
++++ ncurses-6.5-20241123/ncurses/trace/lib_trace.c	2024-11-23 18:40:23.000000000 +0000
+@@ -48,7 +48,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_trace.c,v 1.107 2024/08/31 10:48:22 tom Exp $")
++MODULE_ID("$Id: lib_trace.c,v 1.108 2024/11/23 18:40:23 tom Exp $")
+ 
+ NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
+ 
+@@ -295,8 +295,8 @@
+ }
+ 
+ /* Trace 'bool' return-values */
+-NCURSES_EXPORT(NCURSES_BOOL)
+-_nc_retrace_bool(int code)
++NCURSES_EXPORT(bool)
++_nc_retrace_bool(bool code)
+ {
+     T((T_RETURN("%s"), code ? "TRUE" : "FALSE"));
+     return code;
+Index: ncurses/trace/lib_tracechr.c
+Prereq:  1.24 
+--- ncurses-6.5-20241109+/ncurses/trace/lib_tracechr.c	2024-02-04 00:11:35.000000000 +0000
++++ ncurses-6.5-20241123/ncurses/trace/lib_tracechr.c	2024-11-23 19:50:34.000000000 +0000
+@@ -40,7 +40,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_tracechr.c,v 1.24 2024/02/04 00:11:35 tom Exp $")
++MODULE_ID("$Id: lib_tracechr.c,v 1.25 2024/11/23 19:50:34 tom Exp $")
+ 
+ #ifdef TRACE
+ 
+@@ -59,7 +59,7 @@
+ 	if (name == 0 || *name == '\0')
+ 	    name = "NULL";
+ 	_nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize)
+-		    "'%.30s' = \\x%02x", name, ch);
++		    "'%.30s' = \\x%02x", name, UChar(ch));
+     } else if (!is8bits(ch)
+ 	       || (_nc_unicode_locale() && !is7bits(ch))
+ 	       || !isprint(UChar(ch))) {
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20241109+/package/debian-mingw/changelog	2024-11-09 11:12:30.000000000 +0000
++++ ncurses-6.5-20241123/package/debian-mingw/changelog	2024-11-23 10:51:23.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241109) unstable; urgency=low
++ncurses6td (6.5+20241123) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 09 Nov 2024 06:12:30 -0500
++ -- Thomas E. Dickey   Sat, 23 Nov 2024 05:51:23 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20241109+/package/debian-mingw64/changelog	2024-11-09 11:12:30.000000000 +0000
++++ ncurses-6.5-20241123/package/debian-mingw64/changelog	2024-11-23 10:51:23.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241109) unstable; urgency=low
++ncurses6td (6.5+20241123) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 09 Nov 2024 06:12:30 -0500
++ -- Thomas E. Dickey   Sat, 23 Nov 2024 05:51:23 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20241109+/package/debian/changelog	2024-11-09 11:12:30.000000000 +0000
++++ ncurses-6.5-20241123/package/debian/changelog	2024-11-23 10:51:23.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241109) unstable; urgency=low
++ncurses6td (6.5+20241123) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 09 Nov 2024 06:12:30 -0500
++ -- Thomas E. Dickey   Sat, 23 Nov 2024 05:51:23 -0500
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.675 
+--- ncurses-6.5-20241109+/package/mingw-ncurses.nsi	2024-11-09 11:12:30.000000000 +0000
++++ ncurses-6.5-20241123/package/mingw-ncurses.nsi	2024-11-23 10:51:23.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.675 2024/11/09 11:12:30 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.677 2024/11/23 10:51:23 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "1109"
++!define VERSION_MMDD  "1123"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20241109+/package/mingw-ncurses.spec	2024-11-09 11:12:30.000000000 +0000
++++ ncurses-6.5-20241123/package/mingw-ncurses.spec	2024-11-23 10:51:23.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20241109
++Release: 20241123
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20241109+/package/ncurses.spec	2024-11-09 11:12:30.000000000 +0000
++++ ncurses-6.5-20241123/package/ncurses.spec	2024-11-23 10:51:23.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20241109
++Release: 20241123
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20241109+/package/ncursest.spec	2024-11-09 11:12:30.000000000 +0000
++++ ncurses-6.5-20241123/package/ncursest.spec	2024-11-23 10:51:23.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20241109
++Release: 20241123
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/infocmp.c
+Prereq:  1.167 
+--- ncurses-6.5-20241109+/progs/infocmp.c	2024-11-09 19:33:50.000000000 +0000
++++ ncurses-6.5-20241123/progs/infocmp.c	2024-11-23 19:54:44.000000000 +0000
+@@ -43,7 +43,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: infocmp.c,v 1.167 2024/11/09 19:33:50 tom Exp $")
++MODULE_ID("$Id: infocmp.c,v 1.168 2024/11/23 19:54:44 tom Exp $")
+ 
+ #ifndef ACTUAL_TIC
+ #define ACTUAL_TIC "tic"
+@@ -1344,7 +1344,7 @@
+ 	    char buf[MAX_STRING], *sp, *tp;
+ 
+ 	    tp = buf;
+-#define TP_LIMIT	((MAX_STRING - 5) - (size_t)(tp - buf))
++#define TP_LIMIT	((MAX_STRING - 6) - (size_t)(tp - buf))
+ 	    *tp++ = '"';
+ 	    for (sp = term->Strings[n];
+ 		 *sp != 0 && TP_LIMIT > 2;
+Index: progs/toe.c
+Prereq:  1.90 
+--- ncurses-6.5-20241109+/progs/toe.c	2024-10-19 22:00:53.000000000 +0000
++++ ncurses-6.5-20241123/progs/toe.c	2024-11-23 20:09:23.000000000 +0000
+@@ -45,7 +45,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: toe.c,v 1.90 2024/10/19 22:00:53 tom Exp $")
++MODULE_ID("$Id: toe.c,v 1.91 2024/11/23 20:09:23 tom Exp $")
+ 
+ #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, ".."))
+ 
+@@ -436,7 +436,7 @@
+ 		    continue;
+ 		}
+ 
+-		cwd_len = NAMLEN(subdir) + strlen(eargv[i]) + 3;
++		cwd_len = strlen(name_1) + strlen(eargv[i]) + 3;
+ 		cwd_buf = typeRealloc(char, cwd_len, cwd_buf);
+ 		if (cwd_buf == 0)
+ 		    failed("realloc cwd_buf");
+Index: progs/tput.c
+Prereq:  1.104 
+--- ncurses-6.5-20241109+/progs/tput.c	2024-04-20 22:20:51.000000000 +0000
++++ ncurses-6.5-20241123/progs/tput.c	2024-11-23 19:38:51.000000000 +0000
+@@ -47,7 +47,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: tput.c,v 1.104 2024/04/20 22:20:51 tom Exp $")
++MODULE_ID("$Id: tput.c,v 1.105 2024/11/23 19:38:51 tom Exp $")
+ 
+ #define PUTS(s)		fputs(s, stdout)
+ 
+@@ -182,8 +182,8 @@
+ 	    NCURSES_INT2 my_rows = lines;
+ 	    NCURSES_INT2 my_cols = columns;
+ 	    set_window_size(fd, &my_rows, &my_cols);
+-	    lines = my_rows;
+-	    columns = my_cols;
++	    lines = (short) my_rows;
++	    columns = (short) my_cols;
+ 	}
+ #else
+ 	(void) fd;
+Index: progs/tset.c
+Prereq:  1.136 
+--- ncurses-6.5-20241109+/progs/tset.c	2024-10-19 21:40:28.000000000 +0000
++++ ncurses-6.5-20241123/progs/tset.c	2024-11-23 19:39:01.000000000 +0000
+@@ -98,7 +98,7 @@
+ char *ttyname(int fd);
+ #endif
+ 
+-MODULE_ID("$Id: tset.c,v 1.136 2024/10/19 21:40:28 tom Exp $")
++MODULE_ID("$Id: tset.c,v 1.137 2024/11/23 19:39:01 tom Exp $")
+ 
+ #ifndef environ
+ extern char **environ;
+@@ -872,8 +872,8 @@
+ 	    NCURSES_INT2 my_rows = lines;
+ 	    NCURSES_INT2 my_cols = columns;
+ 	    set_window_size(my_fd, &my_rows, &my_cols);
+-	    lines = my_rows;
+-	    columns = my_cols;
++	    lines = (short) my_rows;
++	    columns = (short) my_cols;
+ 	}
+ #endif
+ 	if (opt_c) {
+Index: test/demo_panels.c
+Prereq:  1.51 
+--- ncurses-6.5-20241109+/test/demo_panels.c	2024-11-09 22:54:38.000000000 +0000
++++ ncurses-6.5-20241123/test/demo_panels.c	2024-11-23 19:07:23.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_panels.c,v 1.51 2024/11/09 22:54:38 tom Exp $
++ * $Id: demo_panels.c,v 1.52 2024/11/23 19:07:23 tom Exp $
+  *
+  * Demonstrate a variety of functions from the panel library.
+  */
+@@ -509,7 +509,7 @@
+     for (j = 1; j <= MAX_PANELS; ++j) {
+ 	table[j].valid = (px[j] != 0);
+ 	if (table[j].valid) {
+-	    table[j].hidden = panel_hidden(px[j]);
++	    table[j].hidden = panel_hidden(px[j]) ? TRUE : FALSE;
+ 	    table[j].above = panel_above(px[j]);
+ 	    table[j].below = panel_below(px[j]);
+ 	}
+Index: test/test_opaque.c
+Prereq:  1.16 
+--- ncurses-6.5-20241109+/test/test_opaque.c	2024-10-05 19:27:33.000000000 +0000
++++ ncurses-6.5-20241123/test/test_opaque.c	2024-11-23 19:10:23.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_opaque.c,v 1.16 2024/10/05 19:27:33 tom Exp $
++ * $Id: test_opaque.c,v 1.17 2024/11/23 19:10:23 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -79,7 +79,7 @@
+ test_opaque_idcok(WINDOW *win, int mode)
+ {
+     if (mode >= 0) {
+-	idcok(win, mode);
++	idcok(win, (bool) mode);
+     }
+     return is_idcok(win);
+ }
+@@ -88,7 +88,7 @@
+ test_opaque_idlok(WINDOW *win, int mode)
+ {
+     if (mode >= 0) {
+-	idlok(win, mode);
++	idlok(win, (bool) mode);
+     }
+     return is_idlok(win);
+ }
+@@ -97,7 +97,7 @@
+ test_opaque_immedok(WINDOW *win, int mode)
+ {
+     if (mode >= 0) {
+-	immedok(win, mode);
++	immedok(win, (bool) mode);
+     }
+     return is_immedok(win);
+ }
+@@ -106,7 +106,7 @@
+ test_opaque_keypad(WINDOW *win, int mode)
+ {
+     if (mode >= 0) {
+-	keypad(win, mode);
++	keypad(win, (bool) mode);
+     }
+     return is_keypad(win);
+ }
+@@ -115,7 +115,7 @@
+ test_opaque_leaveok(WINDOW *win, int mode)
+ {
+     if (mode >= 0) {
+-	leaveok(win, mode);
++	leaveok(win, (bool) mode);
+     }
+     return is_leaveok(win);
+ }
+@@ -124,7 +124,7 @@
+ test_opaque_nodelay(WINDOW *win, int mode)
+ {
+     if (mode >= 0) {
+-	nodelay(win, mode);
++	nodelay(win, (bool) mode);
+     }
+     return is_nodelay(win);
+ }
+@@ -133,7 +133,7 @@
+ test_opaque_notimeout(WINDOW *win, int mode)
+ {
+     if (mode >= 0) {
+-	notimeout(win, mode);
++	notimeout(win, (bool) mode);
+     }
+     return is_notimeout(win);
+ }
+@@ -142,7 +142,7 @@
+ test_opaque_scrollok(WINDOW *win, int mode)
+ {
+     if (mode >= 0) {
+-	scrollok(win, mode);
++	scrollok(win, (bool) mode);
+     }
+     return is_scrollok(win);
+ }
+@@ -151,7 +151,7 @@
+ test_opaque_syncok(WINDOW *win, int mode)
+ {
+     if (mode >= 0) {
+-	syncok(win, mode);
++	syncok(win, (bool) mode);
+     }
+     return is_syncok(win);
+ }
diff --git a/packages/ncurses/6.5/ncurses-6.5-20241130.patch b/packages/ncurses/6.5/ncurses-6.5-20241130.patch
new file mode 100644
index 0000000000..50a40ed173
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20241130.patch
@@ -0,0 +1,28725 @@
+# ncurses 6.5 - patch 20241130 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20241130.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Dec  1 01:12:32 UTC 2024
+# ------------------------------------------------------------------------------
+# NEWS                             |    9 
+# VERSION                          |    2 
+# aclocal.m4                       |    9 
+# configure                        | 4461 ++++++++++++++++++-------------------
+# dist.mk                          |    4 
+# form/fld_def.c                   |    6 
+# form/fld_dup.c                   |    6 
+# menu/mf_common.h                 |    6 
+# ncurses/base/lib_addch.c         |    4 
+# ncurses/curses.priv.h            |    4 
+# ncurses/tinfo/comp_expand.c      |    6 
+# ncurses/tinfo/hashed_db.c        |    4 
+# ncurses/trace/visbuf.c           |    6 
+# ncurses/win32con/win_driver.c    |   13 
+# 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                  |    4 
+# progs/tic.c                      |   10 
+# progs/tput.c                     |    8 
+# progs/tset.c                     |    4 
+# test/aclocal.m4                  |    9 
+# test/back_ground.c               |   12 
+# test/background.c                |   12 
+# test/bs.c                        |    8 
+# test/cardfile.c                  |    8 
+# test/color_content.c             |   12 
+# test/combine.c                   |   22 
+# test/configure                   | 3449 ++++++++++++++--------------
+# test/demo_menus.c                |    8 
+# test/demo_tabs.c                 |   10 
+# test/demo_termcap.c              |    6 
+# test/demo_terminfo.c             |    6 
+# test/dots_curses.c               |    6 
+# test/dots_xcurses.c              |    4 
+# test/filter.c                    |   14 
+# test/gdc.c                       |    4 
+# test/hashtest.c                  |   22 
+# test/list_keys.c                 |    6 
+# test/ncurses.c                   |   12 
+# test/padview.c                   |   14 
+# test/pair_content.c              |   12 
+# test/picsmap.c                   |   10 
+# test/savescreen.c                |    4 
+# test/test_arrays.c               |   32 
+# test/test_endwin.c               |   12 
+# test/test_mouse.c                |    6 
+# test/view.c                      |   14 
+# test/worm.c                      |   33 
+# 53 files changed, 4182 insertions(+), 4173 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4203 
+--- ncurses-6.5-20241123+/NEWS	2024-11-23 22:57:05.000000000 +0000
++++ ncurses-6.5-20241130/NEWS	2024-11-30 19:41:55.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4203 2024/11/23 22:57:05 tom Exp $
++-- $Id: NEWS,v 1.4207 2024/11/30 19:41:55 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.
+ 
++20241130
++	+ improve configure check for lint program.
++	+ adjust options in test-programs to allow for consistent use of -c/-l
++	  for command/logging.
++	+ modify win_driver.c for MinGW to handle shift-tab and control-tab as
++	  back-tab (report by Axel Reinhold)
++
+ 20241123
+ 	+ remove dependency on stdbool.h from configure script check for type
+ 	  of bool when C++ binding is omitted (report by Sam James).
+Index: VERSION
+--- ncurses-6.5-20241123+/VERSION	2024-11-23 10:51:23.000000000 +0000
++++ ncurses-6.5-20241130/VERSION	2024-11-30 10:55:07.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20241123
++5:0:10	6.5	20241130
+Index: aclocal.m4
+Prereq:  1.1090 
+--- ncurses-6.5-20241123+/aclocal.m4	2024-11-09 23:12:47.000000000 +0000
++++ ncurses-6.5-20241130/aclocal.m4	2024-11-30 19:41:19.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1090 2024/11/09 23:12:47 tom Exp $
++dnl $Id: aclocal.m4,v 1.1091 2024/11/30 19:41:19 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -7169,14 +7169,17 @@
+ AC_SUBST(LDCONFIG)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_PROG_LINT version: 5 updated: 2022/08/20 15:44:13
++dnl CF_PROG_LINT version: 7 updated: 2024/11/30 14:37:45
+ dnl ------------
+ AC_DEFUN([CF_PROG_LINT],
+ [
+ AC_CHECK_PROGS(LINT, lint cppcheck splint)
+ case "x$LINT" in
++(xlint|x*/lint) # NetBSD 10
++	test -z "$LINT_OPTS" && LINT_OPTS="-chapbrxzgFS -v -Ac11"
++	;;
+ (xcppcheck|x*/cppcheck)
+-	test -z "$LINT_OPTS" && LINT_OPTS="--enable=all"
++	test -z "$LINT_OPTS" && LINT_OPTS="--enable=all -D__CPPCHECK__"
+ 	;;
+ esac
+ AC_SUBST(LINT_OPTS)
+Index: configure
+--- ncurses-6.5-20241123+/configure	2024-11-23 22:59:00.000000000 +0000
++++ ncurses-6.5-20241130/configure	2024-11-30 19:42:38.000000000 +0000
+@@ -4220,23 +4220,26 @@
+ done
+ 
+ case "x$LINT" in
++(xlint|x*/lint) # NetBSD 10
++	test -z "$LINT_OPTS" && LINT_OPTS="-chapbrxzgFS -v -Ac11"
++	;;
+ (xcppcheck|x*/cppcheck)
+-	test -z "$LINT_OPTS" && LINT_OPTS="--enable=all"
++	test -z "$LINT_OPTS" && LINT_OPTS="--enable=all -D__CPPCHECK__"
+ 	;;
+ esac
+ 
+-echo "$as_me:4228: checking whether ln -s works" >&5
++echo "$as_me:4231: 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:4232: result: yes" >&5
++  echo "$as_me:4235: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:4235: result: no, using $LN_S" >&5
++  echo "$as_me:4238: result: no, using $LN_S" >&5
+ echo "${ECHO_T}no, using $LN_S" >&6
+ fi
+ 
+-echo "$as_me:4239: checking if $LN_S -f options work" >&5
++echo "$as_me:4242: 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
+@@ -4248,12 +4251,12 @@
+ 	cf_prog_ln_sf=no
+ fi
+ rm -f conf$$.dst conf$$src
+-echo "$as_me:4251: result: $cf_prog_ln_sf" >&5
++echo "$as_me:4254: 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:4256: checking for long file names" >&5
++echo "$as_me:4259: 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
+@@ -4292,7 +4295,7 @@
+   rm -rf "$ac_xdir" 2>/dev/null
+ done
+ fi
+-echo "$as_me:4295: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:4298: 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
+ 
+@@ -4311,7 +4314,7 @@
+   withval="$with_config_suffix"
+   case "x$withval" in
+ 	(xyes|xno)
+-		{ echo "$as_me:4314: WARNING: expected a value for config-suffix option" >&5
++		{ echo "$as_me:4317: 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"
+@@ -4321,7 +4324,7 @@
+ 
+ # If we find pkg-config, check if we should install the ".pc" files.
+ 
+-echo "$as_me:4324: checking if you want to use pkg-config" >&5
++echo "$as_me:4327: 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.
+@@ -4331,7 +4334,7 @@
+ else
+   cf_pkg_config=yes
+ fi;
+-echo "$as_me:4334: result: $cf_pkg_config" >&5
++echo "$as_me:4337: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+ 
+ case "$cf_pkg_config" in
+@@ -4343,7 +4346,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:4346: checking for $ac_word" >&5
++echo "$as_me:4349: 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
+@@ -4360,7 +4363,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:4363: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4366: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -4371,10 +4374,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:4374: result: $PKG_CONFIG" >&5
++  echo "$as_me:4377: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+-  echo "$as_me:4377: result: no" >&5
++  echo "$as_me:4380: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4383,7 +4386,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:4386: checking for $ac_word" >&5
++echo "$as_me:4389: 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
+@@ -4400,7 +4403,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:4403: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4406: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -4412,10 +4415,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ 
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  echo "$as_me:4415: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:4418: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+-  echo "$as_me:4418: result: no" >&5
++  echo "$as_me:4421: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4456,24 +4459,24 @@
+ 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4459: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++	{ { echo "$as_me:4462: 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:4466: WARNING: pkg-config is not installed" >&5
++	{ echo "$as_me:4469: 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:4472: checking for pkg-config library directory" >&5
++	echo "$as_me:4475: checking for pkg-config library directory" >&5
+ echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
+ 	;;
+ (*)
+-	echo "$as_me:4476: checking for $PKG_CONFIG library directory" >&5
++	echo "$as_me:4479: checking for $PKG_CONFIG library directory" >&5
+ echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
+ 	;;
+ esac
+@@ -4500,7 +4503,7 @@
+ case "x$cf_search_path" in
+ (xlibdir)
+ 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+-	echo "$as_me:4503: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:4506: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+@@ -4511,16 +4514,16 @@
+ 	;;
+ (x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	PKG_CONFIG_LIBDIR="$cf_search_path"
+-	echo "$as_me:4514: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:4517: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+ (xyes|xauto)
+-	echo "$as_me:4519: result: auto" >&5
++	echo "$as_me:4522: 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:4523: checking for search-list" >&5
++	echo "$as_me:4526: checking for search-list" >&5
+ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+ 	if test "x$PKG_CONFIG" != xnone
+ 	then
+@@ -4555,11 +4558,11 @@
+ "`
+ 	fi
+ 
+-	echo "$as_me:4558: result: $cf_search_path" >&5
++	echo "$as_me:4561: result: $cf_search_path" >&5
+ echo "${ECHO_T}$cf_search_path" >&6
+ 	;;
+ (*)
+-	{ { echo "$as_me:4562: error: Unexpected option value: $cf_search_path" >&5
++	{ { echo "$as_me:4565: error: Unexpected option value: $cf_search_path" >&5
+ echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -4567,7 +4570,7 @@
+ 
+ if test -n "$cf_search_path"
+ then
+-	echo "$as_me:4570: checking for first directory" >&5
++	echo "$as_me:4573: 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
+@@ -4578,7 +4581,7 @@
+ 			break
+ 		fi
+ 	done
+-	echo "$as_me:4581: result: $cf_pkg_config_path" >&5
++	echo "$as_me:4584: result: $cf_pkg_config_path" >&5
+ echo "${ECHO_T}$cf_pkg_config_path" >&6
+ 
+ 	if test "x$cf_pkg_config_path" != xnone ; then
+@@ -4588,7 +4591,7 @@
+ 
+ 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+ 	then
+-		echo "$as_me:4591: checking for workaround" >&5
++		echo "$as_me:4594: checking for workaround" >&5
+ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+ 		if test "$prefix" = "NONE" ; then
+ 			cf_prefix="$ac_default_prefix"
+@@ -4611,17 +4614,17 @@
+ 			esac
+ 		done
+ 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+-		echo "$as_me:4614: result: $PKG_CONFIG_LIBDIR" >&5
++		echo "$as_me:4617: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	fi
+ fi
+ 
+ if test "x$PKG_CONFIG" != xnone
+ then
+-	echo "$as_me:4621: checking if we should install .pc files for $PKG_CONFIG" >&5
++	echo "$as_me:4624: 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:4624: checking if we should install .pc files" >&5
++	echo "$as_me:4627: checking if we should install .pc files" >&5
+ echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
+ fi
+ 
+@@ -4632,7 +4635,7 @@
+ else
+   enable_pc_files=no
+ fi;
+-echo "$as_me:4635: result: $enable_pc_files" >&5
++echo "$as_me:4638: result: $enable_pc_files" >&5
+ echo "${ECHO_T}$enable_pc_files" >&6
+ 
+ if test "x$enable_pc_files" != xno
+@@ -4640,7 +4643,7 @@
+ 	MAKE_PC_FILES=
+ 	case "x$PKG_CONFIG_LIBDIR" in
+ 	(xno|xnone|xyes|x)
+-		{ echo "$as_me:4643: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
++		{ echo "$as_me:4646: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+ echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
+ 		;;
+ 	(*)
+@@ -4669,7 +4672,7 @@
+ 	cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4672: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
++	{ { echo "$as_me:4675: 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; }; }
+ 	;;
+@@ -4683,7 +4686,7 @@
+ 
+ if test -z "$MAKE_PC_FILES"
+ then
+-	echo "$as_me:4686: checking for suffix to add to pkg-config files" >&5
++	echo "$as_me:4689: checking for suffix to add to pkg-config files" >&5
+ echo $ECHO_N "checking for suffix to add to pkg-config files... $ECHO_C" >&6
+ 
+ # Check whether --with-pc-suffix or --without-pc-suffix was given.
+@@ -4698,13 +4701,13 @@
+ 	esac
+ fi;
+ 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
+-	echo "$as_me:4701: result: $PC_MODULE_SUFFIX" >&5
++	echo "$as_me:4704: result: $PC_MODULE_SUFFIX" >&5
+ echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
+ 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
+ 
+ fi
+ 
+-echo "$as_me:4707: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:4710: 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.
+@@ -4714,11 +4717,11 @@
+ else
+   enable_mixedcase=auto
+ fi;
+-echo "$as_me:4717: result: $enable_mixedcase" >&5
++echo "$as_me:4720: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+ 
+-echo "$as_me:4721: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:4724: 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
+@@ -4745,7 +4748,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:4748: result: $cf_cv_mixedcase" >&5
++echo "$as_me:4751: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -4764,7 +4767,7 @@
+ fi
+ 
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:4767: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:4770: 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
+@@ -4784,16 +4787,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:4787: result: yes" >&5
++  echo "$as_me:4790: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:4791: result: no" >&5
++  echo "$as_me:4794: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+-echo "$as_me:4796: checking for \".PHONY\" make-support" >&5
++echo "$as_me:4799: 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
+@@ -4848,7 +4851,7 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:4851: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:4854: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+@@ -4859,7 +4862,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:4862: 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_CTAGS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4874,7 +4877,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:4877: found $ac_dir/$ac_word" >&5
++echo "$as_me:4880: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4882,10 +4885,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:4885: result: $CTAGS" >&5
++  echo "$as_me:4888: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:4888: result: no" >&5
++  echo "$as_me:4891: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4896,7 +4899,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:4899: checking for $ac_word" >&5
++echo "$as_me:4902: 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
+@@ -4911,7 +4914,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:4914: found $ac_dir/$ac_word" >&5
++echo "$as_me:4917: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4919,10 +4922,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:4922: result: $ETAGS" >&5
++  echo "$as_me:4925: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:4925: result: no" >&5
++  echo "$as_me:4928: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4931,7 +4934,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:4934: checking for $ac_word" >&5
++echo "$as_me:4937: 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
+@@ -4946,7 +4949,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:4949: found $ac_dir/$ac_word" >&5
++echo "$as_me:4952: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4955,17 +4958,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:4958: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:4961: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:4961: result: no" >&5
++  echo "$as_me:4964: 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:4968: checking for $ac_word" >&5
++echo "$as_me:4971: 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
+@@ -4980,7 +4983,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:4983: found $ac_dir/$ac_word" >&5
++echo "$as_me:4986: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4989,10 +4992,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:4992: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:4995: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:4995: result: no" >&5
++  echo "$as_me:4998: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5012,7 +5015,7 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:5015: checking for makeflags variable" >&5
++echo "$as_me:5018: 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
+@@ -5042,7 +5045,7 @@
+ 			;;
+ 		(*)
+ 
+-echo "${as_me:-configure}:5045: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:5048: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -5050,13 +5053,13 @@
+ 	rm -f cf_makeflags.tmp
+ 
+ fi
+-echo "$as_me:5053: result: $cf_cv_makeflags" >&5
++echo "$as_me:5056: 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:5059: checking for $ac_word" >&5
++echo "$as_me:5062: 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
+@@ -5071,7 +5074,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:5074: found $ac_dir/$ac_word" >&5
++echo "$as_me:5077: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5079,10 +5082,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:5082: result: $RANLIB" >&5
++  echo "$as_me:5085: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:5085: result: no" >&5
++  echo "$as_me:5088: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5091,7 +5094,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:5094: checking for $ac_word" >&5
++echo "$as_me:5097: 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
+@@ -5106,7 +5109,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:5109: found $ac_dir/$ac_word" >&5
++echo "$as_me:5112: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5115,10 +5118,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:5118: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:5121: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:5121: result: no" >&5
++  echo "$as_me:5124: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5130,7 +5133,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:5133: checking for $ac_word" >&5
++echo "$as_me:5136: 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
+@@ -5145,7 +5148,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:5148: found $ac_dir/$ac_word" >&5
++echo "$as_me:5151: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5153,10 +5156,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:5156: result: $LD" >&5
++  echo "$as_me:5159: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:5159: result: no" >&5
++  echo "$as_me:5162: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5165,7 +5168,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:5168: checking for $ac_word" >&5
++echo "$as_me:5171: 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
+@@ -5180,7 +5183,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:5183: found $ac_dir/$ac_word" >&5
++echo "$as_me:5186: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5189,10 +5192,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:5192: result: $ac_ct_LD" >&5
++  echo "$as_me:5195: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:5195: result: no" >&5
++  echo "$as_me:5198: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5204,7 +5207,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:5207: checking for $ac_word" >&5
++echo "$as_me:5210: 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
+@@ -5219,7 +5222,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:5222: found $ac_dir/$ac_word" >&5
++echo "$as_me:5225: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5227,10 +5230,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:5230: result: $AR" >&5
++  echo "$as_me:5233: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:5233: result: no" >&5
++  echo "$as_me:5236: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5239,7 +5242,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:5242: checking for $ac_word" >&5
++echo "$as_me:5245: 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
+@@ -5254,7 +5257,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:5257: found $ac_dir/$ac_word" >&5
++echo "$as_me:5260: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5263,10 +5266,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:5266: result: $ac_ct_AR" >&5
++  echo "$as_me:5269: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:5269: result: no" >&5
++  echo "$as_me:5272: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5278,7 +5281,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:5281: checking for $ac_word" >&5
++echo "$as_me:5284: 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
+@@ -5293,7 +5296,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:5296: found $ac_dir/$ac_word" >&5
++echo "$as_me:5299: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5301,10 +5304,10 @@
+ fi
+ NM=$ac_cv_prog_NM
+ if test -n "$NM"; then
+-  echo "$as_me:5304: result: $NM" >&5
++  echo "$as_me:5307: result: $NM" >&5
+ echo "${ECHO_T}$NM" >&6
+ else
+-  echo "$as_me:5307: result: no" >&5
++  echo "$as_me:5310: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5313,7 +5316,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:5316: checking for $ac_word" >&5
++echo "$as_me:5319: 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
+@@ -5328,7 +5331,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:5331: found $ac_dir/$ac_word" >&5
++echo "$as_me:5334: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5337,10 +5340,10 @@
+ fi
+ ac_ct_NM=$ac_cv_prog_ac_ct_NM
+ if test -n "$ac_ct_NM"; then
+-  echo "$as_me:5340: result: $ac_ct_NM" >&5
++  echo "$as_me:5343: result: $ac_ct_NM" >&5
+ echo "${ECHO_T}$ac_ct_NM" >&6
+ else
+-  echo "$as_me:5343: result: no" >&5
++  echo "$as_me:5346: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5352,7 +5355,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:5355: checking for $ac_word" >&5
++echo "$as_me:5358: 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
+@@ -5367,7 +5370,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:5370: found $ac_dir/$ac_word" >&5
++echo "$as_me:5373: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5375,10 +5378,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:5378: result: $AR" >&5
++  echo "$as_me:5381: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:5381: result: no" >&5
++  echo "$as_me:5384: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5387,7 +5390,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:5390: checking for $ac_word" >&5
++echo "$as_me:5393: 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
+@@ -5402,7 +5405,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:5405: found $ac_dir/$ac_word" >&5
++echo "$as_me:5408: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5411,10 +5414,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:5414: result: $ac_ct_AR" >&5
++  echo "$as_me:5417: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:5417: result: no" >&5
++  echo "$as_me:5420: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5423,7 +5426,7 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-echo "$as_me:5426: checking for options to update archives" >&5
++echo "$as_me:5429: 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
+@@ -5460,13 +5463,13 @@
+ 			rm -f conftest.a
+ 
+ 			cat >"conftest.$ac_ext" <&5
++			if { (eval echo "$as_me:5469: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5469: \$? = $ac_status" >&5
++  echo "$as_me:5472: \$? = $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
+@@ -5477,7 +5480,7 @@
+ 			else
+ 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-echo "${as_me:-configure}:5480: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:5483: testing cannot compile test-program ..." 1>&5
+ 
+ 				break
+ 			fi
+@@ -5487,7 +5490,7 @@
+ 	esac
+ 
+ fi
+-echo "$as_me:5490: result: $cf_cv_ar_flags" >&5
++echo "$as_me:5493: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+ if test -n "$ARFLAGS" ; then
+@@ -5498,7 +5501,7 @@
+ 	ARFLAGS=$cf_cv_ar_flags
+ fi
+ 
+-echo "$as_me:5501: checking for an installation directory prefix" >&5
++echo "$as_me:5504: checking for an installation directory prefix" >&5
+ echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-install-prefix or --without-install-prefix was given.
+@@ -5511,10 +5514,10 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:5514: result: ${DESTDIR:-(none)}" >&5
++echo "$as_me:5517: result: ${DESTDIR:-(none)}" >&5
+ echo "${ECHO_T}${DESTDIR:-(none)}" >&6
+ 
+-echo "$as_me:5517: checking if installation directory prefix should be merged" >&5
++echo "$as_me:5520: checking if installation directory prefix should be merged" >&5
+ echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6
+ 
+ # Check whether --enable-install-prefix or --disable-install-prefix was given.
+@@ -5531,7 +5534,7 @@
+ 	cf_install_prefix=no
+ 
+ fi;
+-echo "$as_me:5534: result: $cf_install_prefix" >&5
++echo "$as_me:5537: result: $cf_install_prefix" >&5
+ echo "${ECHO_T}$cf_install_prefix" >&6
+ 
+ if test "$cf_install_prefix" = yes ; then
+@@ -5572,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:5575: 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_BUILD_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5587,7 +5590,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:5590: found $ac_dir/$ac_word" >&5
++echo "$as_me:5593: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5595,10 +5598,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:5598: result: $BUILD_CC" >&5
++  echo "$as_me:5601: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:5601: result: no" >&5
++  echo "$as_me:5604: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5607,12 +5610,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+ 
+ fi;
+-	echo "$as_me:5610: checking for native build C compiler" >&5
++	echo "$as_me:5613: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:5612: result: $BUILD_CC" >&5
++	echo "$as_me:5615: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:5615: checking for native build C preprocessor" >&5
++	echo "$as_me:5618: 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.
+@@ -5622,10 +5625,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:5625: result: $BUILD_CPP" >&5
++	echo "$as_me:5628: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:5628: checking for native build C flags" >&5
++	echo "$as_me:5631: 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.
+@@ -5633,10 +5636,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:5636: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:5639: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:5639: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:5642: 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.
+@@ -5644,10 +5647,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:5647: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:5650: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:5650: checking for native build linker-flags" >&5
++	echo "$as_me:5653: 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.
+@@ -5655,10 +5658,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:5658: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:5661: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:5661: checking for native build linker-libraries" >&5
++	echo "$as_me:5664: 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.
+@@ -5666,7 +5669,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:5669: result: $BUILD_LIBS" >&5
++	echo "$as_me:5672: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -5675,7 +5678,7 @@
+ 
+ 	: ${BUILD_CC:='${CC}'}
+ 
+-	echo "$as_me:5678: checking if the build-compiler \"$BUILD_CC\" works" >&5
++	echo "$as_me:5681: checking if the build-compiler \"$BUILD_CC\" works" >&5
+ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
+ 
+ 	cf_save_crossed=$cross_compiling
+@@ -5689,7 +5692,7 @@
+   cf_ok_build_cc=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5692 "configure"
++#line 5695 "configure"
+ #include "confdefs.h"
+ #include 
+ 		int main(int argc, char *argv[])
+@@ -5699,15 +5702,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:5702: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5705: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5705: \$? = $ac_status" >&5
++  echo "$as_me:5708: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:5707: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5710: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5710: \$? = $ac_status" >&5
++  echo "$as_me:5713: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_ok_build_cc=yes
+ else
+@@ -5722,12 +5725,12 @@
+ 	cross_compiling=$cf_save_crossed
+ 	ac_link=$cf_save_ac_link
+ 
+-	echo "$as_me:5725: result: $cf_ok_build_cc" >&5
++	echo "$as_me:5728: result: $cf_ok_build_cc" >&5
+ echo "${ECHO_T}$cf_ok_build_cc" >&6
+ 
+ 	if test "$cf_ok_build_cc" != yes
+ 	then
+-		{ { echo "$as_me:5730: error: Cross-build requires two compilers.
++		{ { echo "$as_me:5733: 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;}
+@@ -5752,7 +5755,7 @@
+ ### shared, for example.
+ cf_list_models=""
+ 
+-echo "$as_me:5755: checking if libtool -version-number should be used" >&5
++echo "$as_me:5758: 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.
+@@ -5769,7 +5772,7 @@
+ 	cf_libtool_version=yes
+ 
+ fi;
+-echo "$as_me:5772: result: $cf_libtool_version" >&5
++echo "$as_me:5775: result: $cf_libtool_version" >&5
+ echo "${ECHO_T}$cf_libtool_version" >&6
+ 
+ if test "$cf_libtool_version" = yes ; then
+@@ -5778,25 +5781,25 @@
+ 	LIBTOOL_VERSION="-version-info"
+ 	case "x$VERSION" in
+ 	(x)
+-		{ echo "$as_me:5781: WARNING: VERSION was not set" >&5
++		{ echo "$as_me:5784: 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}:5788: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5791: 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}:5795: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5798: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:5799: WARNING: unexpected VERSION value: $VERSION" >&5
++		{ echo "$as_me:5802: WARNING: unexpected VERSION value: $VERSION" >&5
+ echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
+ 		;;
+ 	esac
+@@ -5818,7 +5821,7 @@
+ LIB_INSTALL=
+ LIB_UNINSTALL=
+ 
+-echo "$as_me:5821: checking if you want to build libraries with libtool" >&5
++echo "$as_me:5824: 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.
+@@ -5828,7 +5831,7 @@
+ else
+   with_libtool=no
+ fi;
+-echo "$as_me:5831: result: $with_libtool" >&5
++echo "$as_me:5834: result: $with_libtool" >&5
+ echo "${ECHO_T}$with_libtool" >&6
+ if test "$with_libtool" != "no"; then
+ 
+@@ -5857,7 +5860,7 @@
+ 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:5860: error: expected a pathname, not \"$with_libtool\"" >&5
++	{ { echo "$as_me:5863: error: expected a pathname, not \"$with_libtool\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -5870,7 +5873,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:5873: checking for $ac_word" >&5
++echo "$as_me:5876: 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
+@@ -5885,7 +5888,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:5888: found $ac_dir/$ac_word" >&5
++echo "$as_me:5891: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5893,10 +5896,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5896: result: $LIBTOOL" >&5
++  echo "$as_me:5899: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5899: result: no" >&5
++  echo "$as_me:5902: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5909,7 +5912,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:5912: checking for $ac_word" >&5
++echo "$as_me:5915: 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
+@@ -5924,7 +5927,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:5927: found $ac_dir/$ac_word" >&5
++echo "$as_me:5930: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5932,10 +5935,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:5935: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:5938: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:5938: result: no" >&5
++  echo "$as_me:5941: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5966,7 +5969,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:5969: checking for $ac_word" >&5
++echo "$as_me:5972: 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
+@@ -5981,7 +5984,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:5984: found $ac_dir/$ac_word" >&5
++echo "$as_me:5987: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5989,10 +5992,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5992: result: $LIBTOOL" >&5
++  echo "$as_me:5995: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5995: result: no" >&5
++  echo "$as_me:5998: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6005,7 +6008,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:6008: checking for $ac_word" >&5
++echo "$as_me:6011: 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
+@@ -6020,7 +6023,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:6023: found $ac_dir/$ac_word" >&5
++echo "$as_me:6026: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -6028,10 +6031,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:6031: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:6034: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:6034: result: no" >&5
++  echo "$as_me:6037: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6053,7 +6056,7 @@
+ 		fi
+ 	fi
+ 	if test -z "$LIBTOOL" ; then
+-		{ { echo "$as_me:6056: error: Cannot find libtool" >&5
++		{ { echo "$as_me:6059: error: Cannot find libtool" >&5
+ echo "$as_me: error: Cannot find libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -6069,7 +6072,7 @@
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+ then
+-	echo "$as_me:6072: checking version of $LIBTOOL" >&5
++	echo "$as_me:6075: checking version of $LIBTOOL" >&5
+ echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+@@ -6080,7 +6083,7 @@
+ fi
+ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+ 
+-	echo "$as_me:6083: result: $cf_cv_libtool_version" >&5
++	echo "$as_me:6086: result: $cf_cv_libtool_version" >&5
+ echo "${ECHO_T}$cf_cv_libtool_version" >&6
+ 
+ 	if test -n "$cf_cv_libtool_version"
+@@ -6090,19 +6093,19 @@
+ 		(*...GNU-libtool...*)
+ 			;;
+ 		(*)
+-			{ { echo "$as_me:6093: error: This is not GNU libtool" >&5
++			{ { echo "$as_me:6096: 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:6099: error: No version found for $LIBTOOL" >&5
++		{ { echo "$as_me:6102: 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:6105: error: GNU libtool has not been found" >&5
++	{ { echo "$as_me:6108: error: GNU libtool has not been found" >&5
+ echo "$as_me: error: GNU libtool has not been found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6138,7 +6141,7 @@
+ 
+ else
+ 
+-echo "$as_me:6141: checking if you want to build shared libraries" >&5
++echo "$as_me:6144: 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.
+@@ -6148,11 +6151,11 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:6151: result: $with_shared" >&5
++echo "$as_me:6154: 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:6155: checking if you want to build static libraries" >&5
++echo "$as_me:6158: 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.
+@@ -6162,11 +6165,11 @@
+ else
+   with_normal=yes
+ fi;
+-echo "$as_me:6165: result: $with_normal" >&5
++echo "$as_me:6168: 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:6169: checking if you want to build debug libraries" >&5
++echo "$as_me:6172: 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.
+@@ -6176,11 +6179,11 @@
+ else
+   with_debug=yes
+ fi;
+-echo "$as_me:6179: result: $with_debug" >&5
++echo "$as_me:6182: 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:6183: checking if you want to build profiling libraries" >&5
++echo "$as_me:6186: 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.
+@@ -6190,7 +6193,7 @@
+ else
+   with_profile=no
+ fi;
+-echo "$as_me:6193: result: $with_profile" >&5
++echo "$as_me:6196: result: $with_profile" >&5
+ echo "${ECHO_T}$with_profile" >&6
+ test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
+ 
+@@ -6198,7 +6201,7 @@
+ 
+ if test "X$cf_with_cxx_binding" != Xno; then
+ if test "x$with_shared" = "xyes"; then
+-echo "$as_me:6201: checking if you want to build C++ shared libraries" >&5
++echo "$as_me:6204: 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.
+@@ -6208,26 +6211,26 @@
+ else
+   with_shared_cxx=no
+ fi;
+-echo "$as_me:6211: result: $with_shared_cxx" >&5
++echo "$as_me:6214: result: $with_shared_cxx" >&5
+ echo "${ECHO_T}$with_shared_cxx" >&6
+ fi
+ fi
+ 
+ ###############################################################################
+ 
+-echo "$as_me:6218: checking for specified models" >&5
++echo "$as_me:6221: 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:6222: result: $cf_list_models" >&5
++echo "$as_me:6225: 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:6227: checking for default model" >&5
++echo "$as_me:6230: 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:6230: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:6233: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+ 
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+@@ -6241,7 +6244,7 @@
+ LIB_DIR=../lib
+ LIB_2ND=../../lib
+ 
+-echo "$as_me:6244: checking if you want to have a library-prefix" >&5
++echo "$as_me:6247: 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.
+@@ -6251,7 +6254,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:6254: result: $with_lib_prefix" >&5
++echo "$as_me:6257: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test "$with_lib_prefix" = auto
+@@ -6282,24 +6285,24 @@
+ 
+ LIB_SUFFIX=
+ 
+-	echo "$as_me:6285: checking for PATH separator" >&5
++	echo "$as_me:6288: 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:6292: result: $PATH_SEPARATOR" >&5
++	echo "$as_me:6295: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+ 
+ # headers needed for checks...
+-echo "$as_me:6296: checking for ANSI C header files" >&5
++echo "$as_me:6299: 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 6302 "configure"
++#line 6305 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -6307,13 +6310,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:6310: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:6313: \"$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:6316: \$? = $ac_status" >&5
++  echo "$as_me:6319: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6335,7 +6338,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 6338 "configure"
++#line 6341 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6353,7 +6356,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 6356 "configure"
++#line 6359 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6374,7 +6377,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6377 "configure"
++#line 6380 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -6400,15 +6403,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6403: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6406: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6406: \$? = $ac_status" >&5
++  echo "$as_me:6409: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:6408: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6411: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6411: \$? = $ac_status" >&5
++  echo "$as_me:6414: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6421,7 +6424,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:6424: result: $ac_cv_header_stdc" >&5
++echo "$as_me:6427: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -6437,28 +6440,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6440: checking for $ac_header" >&5
++echo "$as_me:6443: 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 6446 "configure"
++#line 6449 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6452: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6455: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6455: \$? = $ac_status" >&5
++  echo "$as_me:6458: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6458: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6461: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6461: \$? = $ac_status" >&5
++  echo "$as_me:6464: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -6468,7 +6471,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6471: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6474: 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:6484: checking whether exit is declared" >&5
+ echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
+ if test "${ac_cv_have_decl_exit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6487 "configure"
++#line 6490 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -6499,16 +6502,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6502: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6505: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6505: \$? = $ac_status" >&5
++  echo "$as_me:6508: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6508: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6511: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6511: \$? = $ac_status" >&5
++  echo "$as_me:6514: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_have_decl_exit=yes
+ else
+@@ -6518,19 +6521,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6521: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:6524: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+ 
+ 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:6527: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:6530: 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 6533 "configure"
++#line 6536 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -6545,16 +6548,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6548: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6551: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6551: \$? = $ac_status" >&5
++  echo "$as_me:6554: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6554: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6557: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6557: \$? = $ac_status" >&5
++  echo "$as_me:6560: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -6564,7 +6567,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6567: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6570: 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:6583: 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
+@@ -6585,7 +6588,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6588 "configure"
++#line 6591 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6604,16 +6607,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6607: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6610: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6610: \$? = $ac_status" >&5
++  echo "$as_me:6613: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6613: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6616: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6616: \$? = $ac_status" >&5
++  echo "$as_me:6619: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -6624,14 +6627,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6627: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:6630: 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:6634: checking for opendir in -lx" >&5
++  echo "$as_me:6637: 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
+@@ -6639,7 +6642,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6642 "configure"
++#line 6645 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6658,16 +6661,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6661: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6664: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6664: \$? = $ac_status" >&5
++  echo "$as_me:6667: \$? = $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:6670: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6670: \$? = $ac_status" >&5
++  echo "$as_me:6673: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -6678,7 +6681,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6681: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:6684: 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"
+@@ -6688,7 +6691,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:6691: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:6694: 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.
+@@ -6698,10 +6701,10 @@
+ else
+   with_termlib=no
+ fi;
+-echo "$as_me:6701: result: $with_termlib" >&5
++echo "$as_me:6704: result: $with_termlib" >&5
+ echo "${ECHO_T}$with_termlib" >&6
+ 
+-echo "$as_me:6704: checking if you want to build a separate tic library" >&5
++echo "$as_me:6707: 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.
+@@ -6711,7 +6714,7 @@
+ else
+   with_ticlib=no
+ fi;
+-echo "$as_me:6714: result: $with_ticlib" >&5
++echo "$as_me:6717: result: $with_ticlib" >&5
+ echo "${ECHO_T}$with_ticlib" >&6
+ 
+ if test X"$CC_G_OPT" = X"" ; then
+@@ -6724,7 +6727,7 @@
+ 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
+ fi
+ 
+-echo "$as_me:6727: checking for default loader flags" >&5
++echo "$as_me:6730: 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=''   ;;
+@@ -6733,13 +6736,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:6736: result: ${LD_MODEL:-(none)}" >&5
++echo "$as_me:6739: result: ${LD_MODEL:-(none)}" >&5
+ echo "${ECHO_T}${LD_MODEL:-(none)}" >&6
+ 
+ case "$DFT_LWR_MODEL" in
+ (shared)
+ 
+-echo "$as_me:6742: checking if rpath option should be used" >&5
++echo "$as_me:6745: 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.
+@@ -6749,10 +6752,10 @@
+ else
+   cf_cv_enable_rpath=no
+ fi;
+-echo "$as_me:6752: result: $cf_cv_enable_rpath" >&5
++echo "$as_me:6755: result: $cf_cv_enable_rpath" >&5
+ echo "${ECHO_T}$cf_cv_enable_rpath" >&6
+ 
+-echo "$as_me:6755: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:6758: 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.
+@@ -6762,7 +6765,7 @@
+ else
+   cf_cv_do_relink=yes
+ fi;
+-echo "$as_me:6765: result: $cf_cv_do_relink" >&5
++echo "$as_me:6768: result: $cf_cv_do_relink" >&5
+ echo "${ECHO_T}$cf_cv_do_relink" >&6
+ 	;;
+ esac
+@@ -6773,7 +6776,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:6776: checking for an rpath option" >&5
++	echo "$as_me:6779: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -6804,12 +6807,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:6807: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:6810: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:6812: checking if we need a space after rpath option" >&5
++		echo "$as_me:6815: 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"
+ 
+@@ -6830,7 +6833,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6833 "configure"
++#line 6836 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -6842,16 +6845,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6845: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6848: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6848: \$? = $ac_status" >&5
++  echo "$as_me:6851: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6851: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6854: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6854: \$? = $ac_status" >&5
++  echo "$as_me:6857: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -6861,7 +6864,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:6864: result: $cf_rpath_space" >&5
++		echo "$as_me:6867: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -6883,7 +6886,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:6886: checking whether to use release or ABI version in shared library file names" >&5
++	echo "$as_me:6889: checking whether to use release or ABI version in shared library file names" >&5
+ echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
+ 
+ # Check whether --with-shlib-version or --without-shlib-version was given.
+@@ -6898,9 +6901,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:6901: result: $withval" >&5
++		echo "$as_me:6904: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:6903: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:6906: 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; }; }
+ 		;;
+@@ -6909,7 +6912,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:6912: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:6915: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -6932,14 +6935,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:6935: checking which $CC option to use" >&5
++		echo "$as_me:6938: 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 6942 "configure"
++#line 6945 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6951,16 +6954,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6954: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6957: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6957: \$? = $ac_status" >&5
++  echo "$as_me:6960: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6960: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6963: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6963: \$? = $ac_status" >&5
++  echo "$as_me:6966: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -6969,7 +6972,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		done
+-		echo "$as_me:6972: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:6975: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -7040,7 +7043,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:7043: checking if ld -search_paths_first works" >&5
++		echo "$as_me:7046: 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
+@@ -7049,7 +7052,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7052 "configure"
++#line 7055 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -7061,16 +7064,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7064: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7067: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7067: \$? = $ac_status" >&5
++  echo "$as_me:7070: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7070: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7073: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7073: \$? = $ac_status" >&5
++  echo "$as_me:7076: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -7081,7 +7084,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:7084: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:7087: 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"
+@@ -7431,7 +7434,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7434 "configure"
++#line 7437 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7443,16 +7446,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7446: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7449: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7449: \$? = $ac_status" >&5
++  echo "$as_me:7452: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7452: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7455: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7455: \$? = $ac_status" >&5
++  echo "$as_me:7458: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -7489,7 +7492,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:7492: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:7495: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -7499,7 +7502,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <
+ int main(int argc, char *argv[])
+ {
+@@ -7511,18 +7514,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:7514: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:7517: 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:7516: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:7519: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7519: \$? = $ac_status" >&5
++  echo "$as_me:7522: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-				echo "$as_me:7521: result: yes" >&5
++				echo "$as_me:7524: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:7525: result: no" >&5
++				echo "$as_me:7528: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -7537,17 +7540,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:7540: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:7543: 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}:7544: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7547: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ for model in $cf_list_models ; do
+ 	case "$model" in
+ 	(libtool)
+ 
+-echo "$as_me:7550: checking for additional libtool options" >&5
++echo "$as_me:7553: 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.
+@@ -7557,7 +7560,7 @@
+ else
+   with_libtool_opts=no
+ fi;
+-echo "$as_me:7560: result: $with_libtool_opts" >&5
++echo "$as_me:7563: result: $with_libtool_opts" >&5
+ echo "${ECHO_T}$with_libtool_opts" >&6
+ 
+ case .$with_libtool_opts in
+@@ -7568,7 +7571,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:7571: checking if exported-symbols file should be used" >&5
++echo "$as_me:7574: 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.
+@@ -7583,7 +7586,7 @@
+ 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
+ 
+ fi
+-echo "$as_me:7586: result: $with_export_syms" >&5
++echo "$as_me:7589: result: $with_export_syms" >&5
+ echo "${ECHO_T}$with_export_syms" >&6
+ if test "x$with_export_syms" != xno
+ then
+@@ -7594,15 +7597,15 @@
+ 		;;
+ 	(shared)
+ 		if test "$CC_SHARED_OPTS" = "unknown"; then
+-			{ { echo "$as_me:7597: error: Shared libraries are not supported in this version" >&5
++			{ { echo "$as_me:7600: 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:7602: checking if current CFLAGS link properly" >&5
++		echo "$as_me:7605: 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 7605 "configure"
++#line 7608 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7614,16 +7617,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7617: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7620: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7620: \$? = $ac_status" >&5
++  echo "$as_me:7623: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7623: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7626: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7626: \$? = $ac_status" >&5
++  echo "$as_me:7629: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cflags_work=yes
+ else
+@@ -7632,18 +7635,18 @@
+ cf_cflags_work=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:7635: result: $cf_cflags_work" >&5
++		echo "$as_me:7638: 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}:7641: testing try to work around by appending shared-options ..." 1>&5
++echo "${as_me:-configure}:7644: testing try to work around by appending shared-options ..." 1>&5
+ 
+ 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
+ 		fi
+ 
+-echo "$as_me:7646: checking if versioned-symbols file should be used" >&5
++echo "$as_me:7649: 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.
+@@ -7661,18 +7664,18 @@
+ (xno)
+ 	;;
+ (x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+-	test -f "$with_versioned_syms" || { { echo "$as_me:7664: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:7667: 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:7669: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:7672: 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:7675: result: $with_versioned_syms" >&5
++echo "$as_me:7678: result: $with_versioned_syms" >&5
+ echo "${ECHO_T}$with_versioned_syms" >&6
+ 
+ RESULTING_SYMS=
+@@ -7688,7 +7691,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}:7691: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7694: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*-dy\ *)
+@@ -7696,11 +7699,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}:7699: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7702: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:7703: WARNING: this system does not support versioned-symbols" >&5
++		{ echo "$as_me:7706: WARNING: this system does not support versioned-symbols" >&5
+ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
+ 		;;
+ 	esac
+@@ -7712,7 +7715,7 @@
+ 	# symbols.
+ 	if test "x$VERSIONED_SYMS" != "x"
+ 	then
+-		echo "$as_me:7715: checking if wildcards can be used to selectively omit symbols" >&5
++		echo "$as_me:7718: 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
+ 
+@@ -7749,7 +7752,7 @@
+ } submodule_1.0;
+ EOF
+ 		cat >conftest.$ac_ext <&5
++		echo "$as_me:7786: result: $WILDCARD_SYMS" >&5
+ echo "${ECHO_T}$WILDCARD_SYMS" >&6
+ 		rm -f conftest.*
+ 	fi
+@@ -7793,7 +7796,7 @@
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+ 
+-echo "$as_me:7796: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:7799: 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.
+@@ -7803,27 +7806,27 @@
+ else
+   with_gpm=maybe
+ fi;
+-echo "$as_me:7806: result: $with_gpm" >&5
++echo "$as_me:7809: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7810: checking for gpm.h" >&5
++	echo "$as_me:7813: 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 7816 "configure"
++#line 7819 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:7820: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7823: \"$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:7826: \$? = $ac_status" >&5
++  echo "$as_me:7829: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7842,7 +7845,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7845: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:7848: 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
+ 
+@@ -7853,7 +7856,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}:7856: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:7859: testing assuming we really have GPM library ..." 1>&5
+ 
+ cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+@@ -7861,7 +7864,7 @@
+ 
+ 			with_gpm=yes
+ 		else
+-			echo "$as_me:7864: checking for Gpm_Open in -lgpm" >&5
++			echo "$as_me:7867: 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
+@@ -7869,7 +7872,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7872 "configure"
++#line 7875 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7888,16 +7891,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7891: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7894: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7894: \$? = $ac_status" >&5
++  echo "$as_me:7897: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7897: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7900: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7900: \$? = $ac_status" >&5
++  echo "$as_me:7903: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -7908,18 +7911,18 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7911: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:7914: 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:7918: WARNING: Cannot link with GPM library" >&5
++					{ echo "$as_me:7921: WARNING: Cannot link with GPM library" >&5
+ echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
+ 					with_gpm=no
+ 				else
+-					{ { echo "$as_me:7922: error: Cannot link with GPM library" >&5
++					{ { echo "$as_me:7925: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+    { (exit 1); exit 1; }; }
+ 				fi
+@@ -7930,7 +7933,7 @@
+ 
+ else
+ 
+-		test "$with_gpm" != maybe && { echo "$as_me:7933: WARNING: Cannot find GPM header" >&5
++		test "$with_gpm" != maybe && { echo "$as_me:7936: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ 		with_gpm=no
+ 
+@@ -7939,7 +7942,7 @@
+ fi
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7942: checking if you want to load GPM dynamically" >&5
++	echo "$as_me:7945: 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.
+@@ -7949,18 +7952,18 @@
+ else
+   with_dlsym=yes
+ fi;
+-	echo "$as_me:7952: result: $with_dlsym" >&5
++	echo "$as_me:7955: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ 	if test "x$with_dlsym" = xyes ; then
+ 
+ cf_have_dlsym=no
+-echo "$as_me:7957: checking for dlsym" >&5
++echo "$as_me:7960: 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 7963 "configure"
++#line 7966 "configure"
+ #include "confdefs.h"
+ #define dlsym autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7991,16 +7994,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7994: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7997: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7997: \$? = $ac_status" >&5
++  echo "$as_me:8000: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8000: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8003: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8003: \$? = $ac_status" >&5
++  echo "$as_me:8006: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_dlsym=yes
+ else
+@@ -8010,14 +8013,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8013: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:8016: 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:8020: checking for dlsym in -ldl" >&5
++echo "$as_me:8023: 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
+@@ -8025,7 +8028,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8028 "configure"
++#line 8031 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8044,16 +8047,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8047: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8050: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8050: \$? = $ac_status" >&5
++  echo "$as_me:8053: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8053: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8056: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8056: \$? = $ac_status" >&5
++  echo "$as_me:8059: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dl_dlsym=yes
+ else
+@@ -8064,7 +8067,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8067: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:8070: 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
+ 
+@@ -8093,10 +8096,10 @@
+ LIBS="$cf_add_libs"
+  }
+ 
+-	echo "$as_me:8096: checking whether able to link to dl*() functions" >&5
++	echo "$as_me:8099: 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 8099 "configure"
++#line 8102 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8114,16 +8117,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8117: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8120: \"$ac_link\"") >&5
+   (eval $ac_link) 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_exeext"'
+-  { (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
+ 
+ cat >>confdefs.h <<\EOF
+@@ -8134,15 +8137,15 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-		{ { echo "$as_me:8137: error: Cannot link test program for libdl" >&5
++		{ { echo "$as_me:8140: 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:8142: result: ok" >&5
++	echo "$as_me:8145: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+-	{ { echo "$as_me:8145: error: Cannot find dlsym function" >&5
++	{ { echo "$as_me:8148: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8150,12 +8153,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}:8153: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:8156: testing assuming soname for gpm is $with_gpm ..." 1>&5
+ 
+ 			cf_cv_gpm_soname="$with_gpm"
+ 		else
+ 
+-echo "$as_me:8158: checking for soname of gpm library" >&5
++echo "$as_me:8161: 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
+@@ -8189,15 +8192,15 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-	if { (eval echo "$as_me:8192: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:8195: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8195: \$? = $ac_status" >&5
++  echo "$as_me:8198: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:8197: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:8200: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8200: \$? = $ac_status" >&5
++  echo "$as_me:8203: \$? = $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
+@@ -8208,7 +8211,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:8211: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:8214: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+ 
+ 		fi
+@@ -8276,7 +8279,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+ 
+-echo "$as_me:8279: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:8282: 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
+@@ -8284,7 +8287,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8287 "configure"
++#line 8290 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8303,16 +8306,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8306: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8309: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8309: \$? = $ac_status" >&5
++  echo "$as_me:8312: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8312: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8315: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8315: \$? = $ac_status" >&5
++  echo "$as_me:8318: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -8323,11 +8326,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8326: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:8329: 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:8330: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:8333: 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
+@@ -8351,15 +8354,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:8354: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:8357: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8357: \$? = $ac_status" >&5
++  echo "$as_me:8360: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:8359: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:8362: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8362: \$? = $ac_status" >&5
++  echo "$as_me:8365: \$? = $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
+@@ -8371,11 +8374,11 @@
+ fi
+ 
+ fi
+-echo "$as_me:8374: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:8377: 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:8378: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++	{ echo "$as_me:8381: 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
+ 
+@@ -8383,7 +8386,7 @@
+ 
+ fi
+ 
+-echo "$as_me:8386: checking if you want to use PCRE2 for regular-expressions" >&5
++echo "$as_me:8389: 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.
+@@ -8392,7 +8395,7 @@
+ 
+ fi;
+ test -z "$with_pcre2" && with_pcre2=no
+-echo "$as_me:8395: result: $with_pcre2" >&5
++echo "$as_me:8398: result: $with_pcre2" >&5
+ echo "${ECHO_T}$with_pcre2" >&6
+ 
+ if test "x$with_pcre2" != xno ; then
+@@ -8403,17 +8406,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}:8406: testing found package $cf_with_pcre2 ..." 1>&5
++echo "${as_me:-configure}:8409: 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}:8412: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:8415: 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}:8416: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:8419: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -8537,7 +8540,7 @@
+ fi
+ 
+ 	done
+-	cf_with_pcre2_ok=yes || { { echo "$as_me:8540: error: Cannot find PCRE2 library" >&5
++	cf_with_pcre2_ok=yes || { { echo "$as_me:8543: error: Cannot find PCRE2 library" >&5
+ echo "$as_me: error: Cannot find PCRE2 library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -8550,7 +8553,7 @@
+ 	(*pcre2-posix*|*pcreposix*)
+ 		;;
+ 	(*)
+-		echo "$as_me:8553: checking for regcomp in -lpcre2-posix" >&5
++		echo "$as_me:8556: 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
+@@ -8558,7 +8561,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcre2-posix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8561 "configure"
++#line 8564 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8577,16 +8580,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8580: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8583: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8583: \$? = $ac_status" >&5
++  echo "$as_me:8586: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8586: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8589: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8589: \$? = $ac_status" >&5
++  echo "$as_me:8592: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcre2_posix_regcomp=yes
+ else
+@@ -8597,7 +8600,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8600: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
++echo "$as_me:8603: 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
+ 
+@@ -8618,7 +8621,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  echo "$as_me:8621: checking for regcomp in -lpcreposix" >&5
++  echo "$as_me:8624: 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
+@@ -8626,7 +8629,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcreposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8629 "configure"
++#line 8632 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8645,16 +8648,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8648: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8651: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8651: \$? = $ac_status" >&5
++  echo "$as_me:8654: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8654: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8657: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8657: \$? = $ac_status" >&5
++  echo "$as_me:8660: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcreposix_regcomp=yes
+ else
+@@ -8665,7 +8668,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8668: result: $ac_cv_lib_pcreposix_regcomp" >&5
++echo "$as_me:8671: 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
+ 
+@@ -8686,7 +8689,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  { { echo "$as_me:8689: error: Cannot find PCRE2 POSIX library" >&5
++  { { echo "$as_me:8692: error: Cannot find PCRE2 POSIX library" >&5
+ echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8701,23 +8704,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:8704: checking for $ac_header" >&5
++echo "$as_me:8707: 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 8710 "configure"
++#line 8713 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8714: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8717: \"$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:8720: \$? = $ac_status" >&5
++  echo "$as_me:8723: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8736,7 +8739,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8739: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8742: 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:8755: 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 8758 "configure"
++#line 8761 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -8786,16 +8789,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8789: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8792: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8792: \$? = $ac_status" >&5
++  echo "$as_me:8795: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8795: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8798: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8798: \$? = $ac_status" >&5
++  echo "$as_me:8801: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -8805,7 +8808,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8808: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:8811: 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:8822: checking if you want to use sysmouse" >&5
++echo "$as_me:8825: 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.
+@@ -8831,7 +8834,7 @@
+ fi;
+ 	if test "$cf_with_sysmouse" != no ; then
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8834 "configure"
++#line 8837 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8854,16 +8857,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8857: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8860: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8860: \$? = $ac_status" >&5
++  echo "$as_me:8863: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8863: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8866: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8866: \$? = $ac_status" >&5
++  echo "$as_me:8869: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_with_sysmouse=yes
+ else
+@@ -8873,7 +8876,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	fi
+-echo "$as_me:8876: result: $cf_with_sysmouse" >&5
++echo "$as_me:8879: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -8883,7 +8886,7 @@
+ fi
+ 
+ # pretend that ncurses==ncursesw==ncursest
+-echo "$as_me:8886: checking if you want to disable library suffixes" >&5
++echo "$as_me:8889: 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.
+@@ -8900,13 +8903,13 @@
+ 	disable_lib_suffixes=no
+ 
+ fi;
+-echo "$as_me:8903: result: $disable_lib_suffixes" >&5
++echo "$as_me:8906: 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:8909: checking if rpath-hack should be disabled" >&5
++echo "$as_me:8912: 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.
+@@ -8924,22 +8927,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:8927: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:8930: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:8932: checking for updated LDFLAGS" >&5
++echo "$as_me:8935: 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:8935: result: maybe" >&5
++	echo "$as_me:8938: 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:8942: checking for $ac_word" >&5
++echo "$as_me:8945: 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
+@@ -8954,7 +8957,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:8957: found $ac_dir/$ac_word" >&5
++echo "$as_me:8960: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8962,10 +8965,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:8965: result: $cf_ldd_prog" >&5
++  echo "$as_me:8968: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:8968: result: no" >&5
++  echo "$as_me:8971: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8979,7 +8982,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8982 "configure"
++#line 8985 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8991,16 +8994,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8994: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8997: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8997: \$? = $ac_status" >&5
++  echo "$as_me:9000: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9000: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9003: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9003: \$? = $ac_status" >&5
++  echo "$as_me:9006: \$? = $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`
+@@ -9028,7 +9031,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:9031: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:9034: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -9040,11 +9043,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9043: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9046: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9047: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9050: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -9081,7 +9084,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:9084: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9087: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -9094,11 +9097,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9097: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9100: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:9101: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9104: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -9135,7 +9138,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:9138: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9141: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -9148,14 +9151,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:9151: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9154: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9155: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9158: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:9158: result: no" >&5
++	echo "$as_me:9161: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9169,7 +9172,7 @@
+ EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
+ if test -n "$EXTRA_PKG_LDFLAGS"
+ then
+-	echo "$as_me:9172: checking if you want to disable extra LDFLAGS for package-scripts" >&5
++	echo "$as_me:9175: 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.
+@@ -9186,7 +9189,7 @@
+ 	disable_pkg_ldflags=no
+ 
+ fi;
+-	echo "$as_me:9189: result: $disable_pkg_ldflags" >&5
++	echo "$as_me:9192: result: $disable_pkg_ldflags" >&5
+ echo "${ECHO_T}$disable_pkg_ldflags" >&6
+ 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
+ fi
+@@ -9194,7 +9197,7 @@
+ ###############################################################################
+ 
+ ###	use option --with-extra-suffix to append suffix to headers and libraries
+-echo "$as_me:9197: checking for extra suffix to append to header/library paths" >&5
++echo "$as_me:9200: checking for extra suffix to append to header/library paths" >&5
+ echo $ECHO_N "checking for extra suffix to append to header/library paths... $ECHO_C" >&6
+ EXTRA_SUFFIX=
+ 
+@@ -9213,11 +9216,11 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:9216: result: ${EXTRA_SUFFIX:-(none)}" >&5
++echo "$as_me:9219: result: ${EXTRA_SUFFIX:-(none)}" >&5
+ echo "${ECHO_T}${EXTRA_SUFFIX:-(none)}" >&6
+ 
+ ###	use option --disable-overwrite to leave out the link to -lcurses
+-echo "$as_me:9220: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:9223: 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.
+@@ -9227,10 +9230,10 @@
+ else
+   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:9230: result: $with_overwrite" >&5
++echo "$as_me:9233: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+ 
+-echo "$as_me:9233: checking if external terminfo-database is used" >&5
++echo "$as_me:9236: 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.
+@@ -9240,7 +9243,7 @@
+ else
+   use_database=yes
+ fi;
+-echo "$as_me:9243: result: $use_database" >&5
++echo "$as_me:9246: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+ 
+ case "$host_os" in
+@@ -9256,7 +9259,7 @@
+ if test "$use_database" != no ; then
+ 	NCURSES_USE_DATABASE=1
+ 
+-	echo "$as_me:9259: checking which terminfo source-file will be installed" >&5
++	echo "$as_me:9262: 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.
+@@ -9264,10 +9267,10 @@
+   withval="$with_database"
+   TERMINFO_SRC=$withval
+ fi;
+-	echo "$as_me:9267: result: $TERMINFO_SRC" >&5
++	echo "$as_me:9270: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+ 
+-	echo "$as_me:9270: checking whether to use hashed database instead of directory/tree" >&5
++	echo "$as_me:9273: 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.
+@@ -9277,13 +9280,13 @@
+ else
+   with_hashed_db=no
+ fi;
+-	echo "$as_me:9280: result: $with_hashed_db" >&5
++	echo "$as_me:9283: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ 	with_hashed_db=no
+ fi
+ 
+-echo "$as_me:9286: checking for list of fallback terminal descriptions" >&5
++echo "$as_me:9289: checking for list of fallback terminal descriptions" >&5
+ echo $ECHO_N "checking for list of fallback terminal descriptions... $ECHO_C" >&6
+ 
+ # Check whether --with-fallbacks or --without-fallbacks was given.
+@@ -9293,7 +9296,7 @@
+ else
+   with_fallback=
+ fi;
+-echo "$as_me:9296: result: ${with_fallback:-(none)}" >&5
++echo "$as_me:9299: result: ${with_fallback:-(none)}" >&5
+ echo "${ECHO_T}${with_fallback:-(none)}" >&6
+ 
+ case ".$with_fallback" in
+@@ -9301,7 +9304,7 @@
+ 	FALLBACK_LIST=
+ 	;;
+ (.yes)
+-	{ echo "$as_me:9304: WARNING: expected a list of terminal descriptions" >&5
++	{ echo "$as_me:9307: WARNING: expected a list of terminal descriptions" >&5
+ echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
+ 	;;
+ (*)
+@@ -9317,7 +9320,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:9320: checking for $ac_word" >&5
++echo "$as_me:9323: 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
+@@ -9332,7 +9335,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:9335: found $ac_dir/$ac_word" >&5
++echo "$as_me:9338: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9340,10 +9343,10 @@
+ fi
+ TIC=$ac_cv_prog_TIC
+ if test -n "$TIC"; then
+-  echo "$as_me:9343: result: $TIC" >&5
++  echo "$as_me:9346: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:9346: result: no" >&5
++  echo "$as_me:9349: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9352,7 +9355,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:9355: checking for $ac_word" >&5
++echo "$as_me:9358: 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
+@@ -9367,7 +9370,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:9370: found $ac_dir/$ac_word" >&5
++echo "$as_me:9373: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9375,10 +9378,10 @@
+ fi
+ ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
+ if test -n "$ac_ct_TIC"; then
+-  echo "$as_me:9378: result: $ac_ct_TIC" >&5
++  echo "$as_me:9381: result: $ac_ct_TIC" >&5
+ echo "${ECHO_T}$ac_ct_TIC" >&6
+ else
+-  echo "$as_me:9381: result: no" >&5
++  echo "$as_me:9384: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9390,7 +9393,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:9393: checking for $ac_word" >&5
++echo "$as_me:9396: 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
+@@ -9405,7 +9408,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:9408: found $ac_dir/$ac_word" >&5
++echo "$as_me:9411: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9413,10 +9416,10 @@
+ fi
+ INFOCMP=$ac_cv_prog_INFOCMP
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:9416: result: $INFOCMP" >&5
++  echo "$as_me:9419: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:9419: result: no" >&5
++  echo "$as_me:9422: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9425,7 +9428,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:9428: checking for $ac_word" >&5
++echo "$as_me:9431: 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
+@@ -9440,7 +9443,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:9443: found $ac_dir/$ac_word" >&5
++echo "$as_me:9446: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9448,10 +9451,10 @@
+ fi
+ ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
+ if test -n "$ac_ct_INFOCMP"; then
+-  echo "$as_me:9451: result: $ac_ct_INFOCMP" >&5
++  echo "$as_me:9454: result: $ac_ct_INFOCMP" >&5
+ echo "${ECHO_T}$ac_ct_INFOCMP" >&6
+ else
+-  echo "$as_me:9454: result: no" >&5
++  echo "$as_me:9457: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9466,10 +9469,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:9469: checking for tic program for fallbacks" >&5
++  echo "$as_me:9472: checking for tic program for fallbacks" >&5
+ echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
+ 		TIC=$withval
+-		echo "$as_me:9472: result: $TIC" >&5
++		echo "$as_me:9475: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -9495,7 +9498,7 @@
+ 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9498: error: expected a pathname, not \"$TIC\"" >&5
++	{ { echo "$as_me:9501: error: expected a pathname, not \"$TIC\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9508,7 +9511,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:9511: checking for $ac_word" >&5
++echo "$as_me:9514: 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
+@@ -9525,7 +9528,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:9528: found $ac_dir/$ac_word" >&5
++   echo "$as_me:9531: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -9536,10 +9539,10 @@
+ TIC=$ac_cv_path_TIC
+ 
+ if test -n "$TIC"; then
+-  echo "$as_me:9539: result: $TIC" >&5
++  echo "$as_me:9542: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:9542: result: no" >&5
++  echo "$as_me:9545: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9596,7 +9599,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:9599: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9602: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:9617: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -9620,10 +9623,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:9623: checking for infocmp program for fallbacks" >&5
++  echo "$as_me:9626: checking for infocmp program for fallbacks" >&5
+ echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
+ 		INFOCMP=$withval
+-		echo "$as_me:9626: result: $INFOCMP" >&5
++		echo "$as_me:9629: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -9649,7 +9652,7 @@
+ 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9652: error: expected a pathname, not \"$INFOCMP\"" >&5
++	{ { echo "$as_me:9655: error: expected a pathname, not \"$INFOCMP\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9662,7 +9665,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:9665: checking for $ac_word" >&5
++echo "$as_me:9668: 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
+@@ -9679,7 +9682,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:9682: found $ac_dir/$ac_word" >&5
++   echo "$as_me:9685: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -9690,10 +9693,10 @@
+ INFOCMP=$ac_cv_path_INFOCMP
+ 
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:9693: result: $INFOCMP" >&5
++  echo "$as_me:9696: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:9696: result: no" >&5
++  echo "$as_me:9699: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9750,7 +9753,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:9753: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9756: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:9771: WARNING: no infocmp program found for fallbacks" >&5
+ echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -9775,7 +9778,7 @@
+ 	test -z "$INFOCMP" && FALLBACK_LIST=
+ 	if test -z "$FALLBACK_LIST"
+ 	then
+-		{ echo "$as_me:9778: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
++		{ echo "$as_me:9781: 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
+@@ -9783,7 +9786,7 @@
+ USE_FALLBACKS=
+ test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
+ 
+-echo "$as_me:9786: checking if you want modern xterm or antique" >&5
++echo "$as_me:9789: 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.
+@@ -9797,7 +9800,7 @@
+ (no) with_xterm_new=xterm-old;;
+ (*)	 with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:9800: result: $with_xterm_new" >&5
++echo "$as_me:9803: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+ 
+@@ -9810,7 +9813,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9813: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:9816: 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.
+@@ -9834,13 +9837,13 @@
+ 	with_xterm_kbs=$withval
+ 	;;
+ esac
+-echo "$as_me:9837: result: $with_xterm_kbs" >&5
++echo "$as_me:9840: result: $with_xterm_kbs" >&5
+ echo "${ECHO_T}$with_xterm_kbs" >&6
+ XTERM_KBS=$with_xterm_kbs
+ 
+ if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
+ then
+-	{ echo "$as_me:9843: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
++	{ echo "$as_me:9846: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
+ echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;}
+ fi
+ 
+@@ -9850,7 +9853,7 @@
+ 	MAKE_TERMINFO="#"
+ else
+ 
+-echo "$as_me:9853: checking for list of terminfo directories" >&5
++echo "$as_me:9856: 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.
+@@ -9888,7 +9891,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9891: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:9894: 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; }; }
+ 	;;
+@@ -9911,7 +9914,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9914: result: $TERMINFO_DIRS" >&5
++echo "$as_me:9917: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <&5
++	{ echo "$as_me:9926: 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:9929: checking for default terminfo directory" >&5
++echo "$as_me:9932: 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.
+@@ -9960,7 +9963,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9963: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:9966: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9969,7 +9972,7 @@
+ fi
+ eval TERMINFO="$withval"
+ 
+-echo "$as_me:9972: result: $TERMINFO" >&5
++echo "$as_me:9975: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:9986: 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.
+@@ -9992,7 +9995,7 @@
+   with_big_core=no
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9995 "configure"
++#line 9998 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10006,15 +10009,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10009: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10012: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10012: \$? = $ac_status" >&5
++  echo "$as_me:10015: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10014: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10017: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10017: \$? = $ac_status" >&5
++  echo "$as_me:10020: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_big_core=yes
+ else
+@@ -10026,7 +10029,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi;
+-echo "$as_me:10029: result: $with_big_core" >&5
++echo "$as_me:10032: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10036,7 +10039,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:10039: checking if big-strings option selected" >&5
++echo "$as_me:10042: 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.
+@@ -10060,14 +10063,14 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:10063: result: $with_big_strings" >&5
++echo "$as_me:10066: 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:10070: checking if you want termcap-fallback support" >&5
++echo "$as_me:10073: 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.
+@@ -10077,14 +10080,14 @@
+ else
+   with_termcap=no
+ fi;
+-echo "$as_me:10080: result: $with_termcap" >&5
++echo "$as_me:10083: 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:10087: error: You have disabled the database w/o specifying fallbacks" >&5
++			{ { echo "$as_me:10090: 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
+@@ -10097,13 +10100,13 @@
+ else
+ 
+ 	if test "$with_ticlib" != no ; then
+-		{ { echo "$as_me:10100: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++		{ { echo "$as_me:10103: 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:10106: checking for list of termcap files" >&5
++	echo "$as_me:10109: 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.
+@@ -10141,7 +10144,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:10144: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:10147: 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; }; }
+ 	;;
+@@ -10164,7 +10167,7 @@
+ 	;;
+ esac
+ 
+-	echo "$as_me:10167: result: $TERMPATH" >&5
++	echo "$as_me:10170: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ 	test -n "$TERMPATH" &&
+ cat >>confdefs.h <&5
++	echo "$as_me:10178: 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.
+@@ -10182,14 +10185,14 @@
+ else
+   with_getcap=no
+ fi;
+-	echo "$as_me:10185: result: $with_getcap" >&5
++	echo "$as_me:10188: 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:10192: checking if translated termcaps will be cached in ~/.terminfo" >&5
++	echo "$as_me:10195: 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.
+@@ -10199,7 +10202,7 @@
+ else
+   with_getcap_cache=no
+ fi;
+-	echo "$as_me:10202: result: $with_getcap_cache" >&5
++	echo "$as_me:10205: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ 	test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10209,7 +10212,7 @@
+ fi
+ 
+ ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:10212: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:10215: 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.
+@@ -10219,14 +10222,14 @@
+ else
+   with_home_terminfo=yes
+ fi;
+-echo "$as_me:10222: result: $with_home_terminfo" >&5
++echo "$as_me:10225: 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:10229: checking if you want to permit root to use ncurses environment variables" >&5
++echo "$as_me:10232: 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.
+@@ -10236,14 +10239,14 @@
+ else
+   with_root_environ=yes
+ fi;
+-echo "$as_me:10239: result: $with_root_environ" >&5
++echo "$as_me:10242: 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:10246: checking if you want to permit setuid programs to access all files" >&5
++echo "$as_me:10249: 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-access or --disable-root-access was given.
+@@ -10253,14 +10256,14 @@
+ else
+   with_root_access=yes
+ fi;
+-echo "$as_me:10256: result: $with_root_access" >&5
++echo "$as_me:10259: result: $with_root_access" >&5
+ echo "${ECHO_T}$with_root_access" >&6
+ test "x$with_root_access" = xyes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_ROOT_ACCESS 1
+ EOF
+ 
+-echo "$as_me:10263: checking if you want to permit setuid use of ncurses environment variables" >&5
++echo "$as_me:10266: checking if you want to permit setuid use of ncurses environment variables" >&5
+ echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
+ 
+ # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
+@@ -10270,7 +10273,7 @@
+ else
+   with_setuid_environ=$with_root_environ
+ fi;
+-echo "$as_me:10273: result: $with_setuid_environ" >&5
++echo "$as_me:10276: result: $with_setuid_environ" >&5
+ echo "${ECHO_T}$with_setuid_environ" >&6
+ test "x$with_setuid_environ" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10285,23 +10288,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:10288: checking for $ac_header" >&5
++echo "$as_me:10291: 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 10294 "configure"
++#line 10297 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10298: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:10301: \"$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:10304: \$? = $ac_status" >&5
++  echo "$as_me:10307: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10320,7 +10323,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:10323: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:10326: 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:10341: 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 10344 "configure"
++#line 10347 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10372,16 +10375,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10375: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10378: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10378: \$? = $ac_status" >&5
++  echo "$as_me:10381: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10381: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10384: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10384: \$? = $ac_status" >&5
++  echo "$as_me:10387: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -10391,7 +10394,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10394: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10397: 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:10414: 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 10417 "configure"
++#line 10420 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10445,16 +10448,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10448: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10451: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10451: \$? = $ac_status" >&5
++  echo "$as_me:10454: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10454: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10457: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10457: \$? = $ac_status" >&5
++  echo "$as_me:10460: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -10464,7 +10467,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10467: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10470: 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:10481: 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
+@@ -10488,7 +10491,7 @@
+ 			eval 'ac_cv_func_'$cf_func'=error'
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10491 "configure"
++#line 10494 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -10522,15 +10525,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10525: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10528: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10528: \$? = $ac_status" >&5
++  echo "$as_me:10531: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10530: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10533: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10533: \$? = $ac_status" >&5
++  echo "$as_me:10536: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -10548,7 +10551,7 @@
+ 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+ 
+ fi
+-echo "$as_me:10551: result: $cf_cv_link_funcs" >&5
++echo "$as_me:10554: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ 	test "$ac_cv_func_link"    = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -10568,7 +10571,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:10571: checking if tic should use symbolic links" >&5
++	echo "$as_me:10574: 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.
+@@ -10578,21 +10581,21 @@
+ else
+   with_symlinks=no
+ fi;
+-	echo "$as_me:10581: result: $with_symlinks" >&5
++	echo "$as_me:10584: 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:10588: checking if tic should use hard links" >&5
++	echo "$as_me:10591: 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:10595: result: $with_links" >&5
++	echo "$as_me:10598: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+ 
+@@ -10608,7 +10611,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:10611: checking if you want broken-linker support code" >&5
++echo "$as_me:10614: 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.
+@@ -10618,7 +10621,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:10621: result: $with_broken_linker" >&5
++echo "$as_me:10624: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : "${BROKEN_LINKER:=0}"
+@@ -10632,7 +10635,7 @@
+ fi
+ 
+ ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:10635: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:10638: 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.
+@@ -10642,7 +10645,7 @@
+ else
+   with_bsdpad=no
+ fi;
+-echo "$as_me:10645: result: $with_bsdpad" >&5
++echo "$as_me:10648: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10661,14 +10664,14 @@
+ # Check to define _XOPEN_SOURCE "automatically"
+ CPPFLAGS_before_XOPEN="$CPPFLAGS"
+ 
+-echo "$as_me:10664: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:10667: 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 10671 "configure"
++#line 10674 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10687,16 +10690,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10690: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10693: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10693: \$? = $ac_status" >&5
++  echo "$as_me:10696: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10696: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10699: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10699: \$? = $ac_status" >&5
++  echo "$as_me:10702: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -10707,7 +10710,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10710: result: $cf_cv_posix_visible" >&5
++echo "$as_me:10713: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -10749,14 +10752,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:10752: checking if this is the GNU C library" >&5
++echo "$as_me:10755: 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 10759 "configure"
++#line 10762 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10775,16 +10778,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10778: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10781: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10781: \$? = $ac_status" >&5
++  echo "$as_me:10784: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10784: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10787: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10787: \$? = $ac_status" >&5
++  echo "$as_me:10790: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -10795,7 +10798,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10798: result: $cf_cv_gnu_library" >&5
++echo "$as_me:10801: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -10803,7 +10806,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:10806: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:10809: 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
+@@ -10815,7 +10818,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10818 "configure"
++#line 10821 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10834,16 +10837,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10837: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10840: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10840: \$? = $ac_status" >&5
++  echo "$as_me:10843: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10843: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10846: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10846: \$? = $ac_status" >&5
++  echo "$as_me:10849: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -10855,12 +10858,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:10858: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:10861: 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:10863: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:10866: 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
+@@ -10965,7 +10968,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10968 "configure"
++#line 10971 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -10985,16 +10988,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10988: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10991: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10991: \$? = $ac_status" >&5
++  echo "$as_me:10994: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10994: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10997: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10997: \$? = $ac_status" >&5
++  echo "$as_me:11000: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -11005,7 +11008,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11008: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:11011: 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
+@@ -11014,14 +11017,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:11017: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:11020: 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 11024 "configure"
++#line 11027 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11036,16 +11039,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11039: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11042: \"$ac_compile\"") >&5
+   (eval $ac_compile) 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_objext"'
+-  { (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
+   cf_cv_gnu_source=no
+ else
+@@ -11152,7 +11155,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11155 "configure"
++#line 11158 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11167,16 +11170,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11170: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11173: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11173: \$? = $ac_status" >&5
++  echo "$as_me:11176: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11176: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11179: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11179: \$? = $ac_status" >&5
++  echo "$as_me:11182: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -11191,12 +11194,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11194: result: $cf_cv_gnu_source" >&5
++echo "$as_me:11197: 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:11199: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:11202: 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
+@@ -11206,7 +11209,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11209 "configure"
++#line 11212 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11221,16 +11224,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11224: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11227: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11227: \$? = $ac_status" >&5
++  echo "$as_me:11230: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11230: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11233: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11233: \$? = $ac_status" >&5
++  echo "$as_me:11236: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -11241,7 +11244,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11244: result: $cf_cv_default_source" >&5
++echo "$as_me:11247: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -11281,16 +11284,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:11284: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11287: 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}:11290: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11293: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11293 "configure"
++#line 11296 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11305,16 +11308,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11308: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11311: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11311: \$? = $ac_status" >&5
++  echo "$as_me:11314: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11314: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11317: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11317: \$? = $ac_status" >&5
++  echo "$as_me:11320: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11335,7 +11338,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11338 "configure"
++#line 11341 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11350,16 +11353,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11353: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11356: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11356: \$? = $ac_status" >&5
++  echo "$as_me:11359: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11359: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11362: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11362: \$? = $ac_status" >&5
++  echo "$as_me:11365: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11370,7 +11373,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11373: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11376: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11378,10 +11381,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11381: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11384: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11384 "configure"
++#line 11387 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11396,16 +11399,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11399: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11402: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11402: \$? = $ac_status" >&5
++  echo "$as_me:11405: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11405: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11408: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11408: \$? = $ac_status" >&5
++  echo "$as_me:11411: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11421,7 +11424,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11424: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11427: 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
+@@ -11538,7 +11541,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:11541: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:11544: 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
+@@ -11570,14 +11573,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:11573: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:11576: 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 11580 "configure"
++#line 11583 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11595,16 +11598,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11598: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11601: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11601: \$? = $ac_status" >&5
++  echo "$as_me:11604: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11604: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11607: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11607: \$? = $ac_status" >&5
++  echo "$as_me:11610: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11616,7 +11619,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11619 "configure"
++#line 11622 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11634,16 +11637,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11637: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11640: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11640: \$? = $ac_status" >&5
++  echo "$as_me:11643: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11643: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11646: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11646: \$? = $ac_status" >&5
++  echo "$as_me:11649: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11658,7 +11661,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11661: result: $cf_cv_xopen_source" >&5
++echo "$as_me:11664: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -11818,16 +11821,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:11821: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11824: 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}:11827: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11830: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11830 "configure"
++#line 11833 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11842,16 +11845,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11845: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11848: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11848: \$? = $ac_status" >&5
++  echo "$as_me:11851: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11851: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11854: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11854: \$? = $ac_status" >&5
++  echo "$as_me:11857: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11872,7 +11875,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11875 "configure"
++#line 11878 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11887,16 +11890,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11890: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11893: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11893: \$? = $ac_status" >&5
++  echo "$as_me:11896: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11896: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11899: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11899: \$? = $ac_status" >&5
++  echo "$as_me:11902: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11907,7 +11910,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11910: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11913: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11915,10 +11918,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11918: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11921: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11921 "configure"
++#line 11924 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11933,16 +11936,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11936: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11939: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11939: \$? = $ac_status" >&5
++  echo "$as_me:11942: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11942: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11945: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11945: \$? = $ac_status" >&5
++  echo "$as_me:11948: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11958,7 +11961,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11961: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11964: 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
+@@ -12071,10 +12074,10 @@
+ 	if test "$cf_cv_xopen_source" = no ; then
+ 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+ 
+-echo "${as_me:-configure}:12074: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:12077: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12077 "configure"
++#line 12080 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12092,23 +12095,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12095: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12098: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12098: \$? = $ac_status" >&5
++  echo "$as_me:12101: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12101: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12104: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12104: \$? = $ac_status" >&5
++  echo "$as_me:12107: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-			{ echo "$as_me:12111: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++			{ echo "$as_me:12114: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ 			CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -12131,7 +12134,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}:12134: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12137: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -12143,7 +12146,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}:12146: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:12149: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -12231,7 +12234,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:12234: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:12237: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -12241,7 +12244,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:12244: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:12247: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -12251,7 +12254,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}:12254: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:12257: 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"
+@@ -12263,10 +12266,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:12266: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:12269: 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 12269 "configure"
++#line 12272 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12281,16 +12284,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12284: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12287: \"$ac_compile\"") >&5
+   (eval $ac_compile) 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_objext"'
+-  { (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
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -12299,12 +12302,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:12302: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:12305: 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 12307 "configure"
++#line 12310 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12319,16 +12322,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12322: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12325: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12325: \$? = $ac_status" >&5
++  echo "$as_me:12328: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12328: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12331: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12331: \$? = $ac_status" >&5
++  echo "$as_me:12334: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -12339,19 +12342,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:12342: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:12345: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:12347: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:12350: 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 12354 "configure"
++#line 12357 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12369,16 +12372,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12372: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12375: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12375: \$? = $ac_status" >&5
++  echo "$as_me:12378: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12378: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12381: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12381: \$? = $ac_status" >&5
++  echo "$as_me:12384: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12390,7 +12393,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12393 "configure"
++#line 12396 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12408,16 +12411,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12411: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12414: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12414: \$? = $ac_status" >&5
++  echo "$as_me:12417: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12417: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12420: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12420: \$? = $ac_status" >&5
++  echo "$as_me:12423: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12432,7 +12435,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12435: result: $cf_cv_xopen_source" >&5
++echo "$as_me:12438: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -12583,14 +12586,14 @@
+ 
+ # Work around breakage on OS X
+ 
+-echo "$as_me:12586: checking if SIGWINCH is defined" >&5
++echo "$as_me:12589: 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 12593 "configure"
++#line 12596 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12605,23 +12608,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12608: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12611: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12611: \$? = $ac_status" >&5
++  echo "$as_me:12614: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12614: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12617: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12617: \$? = $ac_status" >&5
++  echo "$as_me:12620: \$? = $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 12624 "configure"
++#line 12627 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -12639,16 +12642,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12642: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12645: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12645: \$? = $ac_status" >&5
++  echo "$as_me:12648: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12648: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12651: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12651: \$? = $ac_status" >&5
++  echo "$as_me:12654: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -12662,11 +12665,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12665: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:12668: 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:12669: checking for actual SIGWINCH definition" >&5
++echo "$as_me:12672: 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
+@@ -12677,7 +12680,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12680 "configure"
++#line 12683 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -12699,16 +12702,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12702: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12705: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12705: \$? = $ac_status" >&5
++  echo "$as_me:12708: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12708: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12711: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12711: \$? = $ac_status" >&5
++  echo "$as_me:12714: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -12722,7 +12725,7 @@
+ done
+ 
+ fi
+-echo "$as_me:12725: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:12728: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -12732,13 +12735,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:12735: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:12738: 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 12741 "configure"
++#line 12744 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12752,16 +12755,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12755: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12758: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12758: \$? = $ac_status" >&5
++  echo "$as_me:12761: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12761: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12764: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12764: \$? = $ac_status" >&5
++  echo "$as_me:12767: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -12772,7 +12775,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12775: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:12778: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test "$am_cv_langinfo_codeset" = yes; then
+ 
+@@ -12786,7 +12789,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+ 
+-echo "$as_me:12789: checking if you want wide-character code" >&5
++echo "$as_me:12792: 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.
+@@ -12796,7 +12799,7 @@
+ else
+   with_widec=$cf_dft_widec
+ fi;
+-echo "$as_me:12799: result: $with_widec" >&5
++echo "$as_me:12802: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ 
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -12818,7 +12821,7 @@
+ 	(*_XOPEN_SOURCE=*)
+ 		;;
+ 	(*)
+-		{ echo "$as_me:12821: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
++		{ echo "$as_me:12824: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
+ 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
+ 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
+@@ -12831,23 +12834,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:12834: checking for $ac_header" >&5
++echo "$as_me:12837: 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 12840 "configure"
++#line 12843 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:12844: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12847: \"$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:12850: \$? = $ac_status" >&5
++  echo "$as_me:12853: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12866,7 +12869,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:12869: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:12872: 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:12882: 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 12886 "configure"
++#line 12889 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12905,16 +12908,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12908: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12911: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12911: \$? = $ac_status" >&5
++  echo "$as_me:12914: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12914: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12917: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12917: \$? = $ac_status" >&5
++  echo "$as_me:12920: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_h_okay=yes
+ else
+@@ -12924,16 +12927,16 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12927: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:12930: 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:12933: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:12936: 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 12936 "configure"
++#line 12939 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -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_result=no
+ else
+@@ -12967,16 +12970,16 @@
+ cf_result=yes
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:12970: result: $cf_result" >&5
++echo "$as_me:12973: 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:12976: checking checking for compatible value versus " >&5
++	echo "$as_me:12979: 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 12979 "configure"
++#line 12982 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12992,16 +12995,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12995: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12998: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12998: \$? = $ac_status" >&5
++  echo "$as_me:13001: \$? = $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:13004: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13004: \$? = $ac_status" >&5
++  echo "$as_me:13007: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -13010,7 +13013,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:13013: result: $cf_result" >&5
++	echo "$as_me:13016: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = no ; then
+ 		# perhaps we can override it - try...
+@@ -13020,7 +13023,7 @@
+ 
+ fi
+ 
+-echo "$as_me:13023: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:13026: 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
+@@ -13091,7 +13094,7 @@
+   cf_cv_wcwidth_graphics=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13094 "configure"
++#line 13097 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13136,15 +13139,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:13139: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13142: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13142: \$? = $ac_status" >&5
++  echo "$as_me:13145: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:13144: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13147: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13147: \$? = $ac_status" >&5
++  echo "$as_me:13150: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wcwidth_graphics=yes
+ else
+@@ -13157,7 +13160,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:13160: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:13163: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+ 
+ 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -13168,13 +13171,13 @@
+ for ac_func in putwc btowc wctob wmemchr 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:13171: checking for $ac_func" >&5
++echo "$as_me:13174: 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 13177 "configure"
++#line 13180 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13205,16 +13208,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13208: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13211: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13211: \$? = $ac_status" >&5
++  echo "$as_me:13214: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13214: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13217: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13217: \$? = $ac_status" >&5
++  echo "$as_me:13220: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -13224,7 +13227,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13227: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:13230: 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:13245: 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 13248 "configure"
++#line 13251 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13252: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:13255: \"$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:13258: \$? = $ac_status" >&5
++  echo "$as_me:13261: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13274,7 +13277,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:13277: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:13280: 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:13290: 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
+@@ -13292,7 +13295,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13295 "configure"
++#line 13298 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13309,16 +13312,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13312: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13315: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13315: \$? = $ac_status" >&5
++  echo "$as_me:13318: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13318: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13321: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13321: \$? = $ac_status" >&5
++  echo "$as_me:13324: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -13330,12 +13333,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:13333: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13336: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13338 "configure"
++#line 13341 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13348,16 +13351,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13351: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13354: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13354: \$? = $ac_status" >&5
++  echo "$as_me:13357: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13357: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13360: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13360: \$? = $ac_status" >&5
++  echo "$as_me:13363: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -13371,7 +13374,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13374 "configure"
++#line 13377 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13384,16 +13387,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13387: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13390: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13390: \$? = $ac_status" >&5
++  echo "$as_me:13393: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13393: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13396: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13396: \$? = $ac_status" >&5
++  echo "$as_me:13399: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -13410,9 +13413,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:13413: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:13416: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:13415: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13418: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13503,7 +13506,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}:13506: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13509: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -13511,7 +13514,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13514 "configure"
++#line 13517 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13524,21 +13527,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13527: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13530: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13530: \$? = $ac_status" >&5
++  echo "$as_me:13533: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13533: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13536: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13536: \$? = $ac_status" >&5
++  echo "$as_me:13539: \$? = $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}:13541: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13544: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13556,7 +13559,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:13559: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13562: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -13631,13 +13634,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}:13634: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13637: 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 13640 "configure"
++#line 13643 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13650,21 +13653,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13653: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13656: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13656: \$? = $ac_status" >&5
++  echo "$as_me:13659: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13659: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13662: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13662: \$? = $ac_status" >&5
++  echo "$as_me:13665: \$? = $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}:13667: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13670: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -13706,7 +13709,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13709: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:13712: 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
+@@ -13744,7 +13747,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13747 "configure"
++#line 13750 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13756,16 +13759,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13759: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13762: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13762: \$? = $ac_status" >&5
++  echo "$as_me:13765: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13765: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13768: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13768: \$? = $ac_status" >&5
++  echo "$as_me:13771: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13782,7 +13785,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}:13785: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:13788: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -13818,7 +13821,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}:13821: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:13824: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -13850,14 +13853,14 @@
+ 	fi
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:13853: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:13856: 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 13860 "configure"
++#line 13863 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13875,23 +13878,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13878: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13881: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13881: \$? = $ac_status" >&5
++  echo "$as_me:13884: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13884: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13887: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13887: \$? = $ac_status" >&5
++  echo "$as_me:13890: \$? = $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 13894 "configure"
++#line 13897 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13910,16 +13913,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13913: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13916: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13916: \$? = $ac_status" >&5
++  echo "$as_me:13919: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13919: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13922: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13922: \$? = $ac_status" >&5
++  echo "$as_me:13925: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -13931,7 +13934,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13934: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:13937: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -13949,14 +13952,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:13952: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:13955: 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 13959 "configure"
++#line 13962 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13974,23 +13977,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13977: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13980: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13980: \$? = $ac_status" >&5
++  echo "$as_me:13983: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13983: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13986: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13986: \$? = $ac_status" >&5
++  echo "$as_me:13989: \$? = $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 13993 "configure"
++#line 13996 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14009,16 +14012,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14012: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14015: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14015: \$? = $ac_status" >&5
++  echo "$as_me:14018: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14018: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14021: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14021: \$? = $ac_status" >&5
++  echo "$as_me:14024: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -14030,7 +14033,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14033: result: $cf_cv_wchar_t" >&5
++echo "$as_me:14036: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -14053,14 +14056,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:14056: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:14059: 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 14063 "configure"
++#line 14066 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14078,23 +14081,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14081: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14084: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14084: \$? = $ac_status" >&5
++  echo "$as_me:14087: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14087: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14090: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14090: \$? = $ac_status" >&5
++  echo "$as_me:14093: \$? = $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 14097 "configure"
++#line 14100 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14113,16 +14116,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14116: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14119: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14119: \$? = $ac_status" >&5
++  echo "$as_me:14122: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14122: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14125: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14125: \$? = $ac_status" >&5
++  echo "$as_me:14128: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -14134,7 +14137,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14137: result: $cf_cv_wint_t" >&5
++echo "$as_me:14140: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -14166,7 +14169,7 @@
+ fi
+ 
+ ###   use option --disable-lp64 to allow long chtype
+-echo "$as_me:14169: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:14172: 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.
+@@ -14176,7 +14179,7 @@
+ else
+   with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:14179: result: $with_lp64" >&5
++echo "$as_me:14182: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+ 
+ if test "x$with_lp64" = xyes ; then
+@@ -14192,7 +14195,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:14195: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:14198: 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
+@@ -14204,7 +14207,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 14207 "configure"
++#line 14210 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14224,16 +14227,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14227: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14230: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14230: \$? = $ac_status" >&5
++  echo "$as_me:14233: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14233: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14236: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14236: \$? = $ac_status" >&5
++  echo "$as_me:14239: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14243,16 +14246,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14246: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14249: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14249: \$? = $ac_status" >&5
++  echo "$as_me:14252: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14252: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14255: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14255: \$? = $ac_status" >&5
++  echo "$as_me:14258: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -14266,13 +14269,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:14269: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:14272: 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:14275: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:14278: 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
+@@ -14280,7 +14283,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14283 "configure"
++#line 14286 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14300,16 +14303,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14303: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14306: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14306: \$? = $ac_status" >&5
++  echo "$as_me:14309: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14309: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14312: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14312: \$? = $ac_status" >&5
++  echo "$as_me:14315: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14318,7 +14321,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14321 "configure"
++#line 14324 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -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_cv_sys_file_offset_bits=64; break
+ else
+@@ -14359,7 +14362,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14362: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:14365: 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
+ 
+@@ -14369,7 +14372,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:14372: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:14375: 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
+@@ -14377,7 +14380,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14380 "configure"
++#line 14383 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14397,16 +14400,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14400: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14403: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14403: \$? = $ac_status" >&5
++  echo "$as_me:14406: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14406: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14409: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14409: \$? = $ac_status" >&5
++  echo "$as_me:14412: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14415,7 +14418,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14418 "configure"
++#line 14421 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -14436,16 +14439,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14439: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14442: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14442: \$? = $ac_status" >&5
++  echo "$as_me:14445: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14445: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14448: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14448: \$? = $ac_status" >&5
++  echo "$as_me:14451: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -14456,7 +14459,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14459: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:14462: 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
+ 
+@@ -14469,7 +14472,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:14472: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:14475: 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
+@@ -14477,7 +14480,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14480 "configure"
++#line 14483 "configure"
+ #include "confdefs.h"
+ #include 
+     #include 
+@@ -14492,16 +14495,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14495: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14498: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14498: \$? = $ac_status" >&5
++  echo "$as_me:14501: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14501: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14504: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14504: \$? = $ac_status" >&5
++  echo "$as_me:14507: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14510,7 +14513,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14513 "configure"
++#line 14516 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -14526,16 +14529,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14529: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14532: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14532: \$? = $ac_status" >&5
++  echo "$as_me:14535: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14535: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14538: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14538: \$? = $ac_status" >&5
++  echo "$as_me:14541: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -14546,7 +14549,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14549: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:14552: 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
+ 
+@@ -14560,13 +14563,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:14563: checking for fseeko" >&5
++echo "$as_me:14566: 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 14569 "configure"
++#line 14572 "configure"
+ #include "confdefs.h"
+ #include 
+                              #include 
+@@ -14580,16 +14583,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14583: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14586: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14586: \$? = $ac_status" >&5
++  echo "$as_me:14589: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14589: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14592: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14592: \$? = $ac_status" >&5
++  echo "$as_me:14595: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -14599,7 +14602,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14602: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:14605: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -14638,14 +14641,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:14641: checking whether to use struct dirent64" >&5
++	echo "$as_me:14644: 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 14648 "configure"
++#line 14651 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -14672,16 +14675,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14675: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14678: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14678: \$? = $ac_status" >&5
++  echo "$as_me:14681: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14681: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14684: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14684: \$? = $ac_status" >&5
++  echo "$as_me:14687: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -14692,7 +14695,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14695: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:14698: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -14702,7 +14705,7 @@
+ 	fi
+ 
+ ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:14705: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:14708: 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.
+@@ -14712,14 +14715,14 @@
+ else
+   with_tparm_varargs=yes
+ fi;
+-echo "$as_me:14715: result: $with_tparm_varargs" >&5
++echo "$as_me:14718: 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:14722: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:14725: 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.
+@@ -14729,14 +14732,14 @@
+ else
+   with_tic_depends=yes
+ fi;
+-echo "$as_me:14732: result: $with_tic_depends" >&5
++echo "$as_me:14735: 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:14739: checking if you want to enable wattr* macros" >&5
++echo "$as_me:14742: 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.
+@@ -14748,15 +14751,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ 	NCURSES_WATTR_MACROS=0
+-	echo "$as_me:14751: result: no" >&5
++	echo "$as_me:14754: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ else
+ 	NCURSES_WATTR_MACROS=1
+-	echo "$as_me:14755: result: yes" >&5
++	echo "$as_me:14758: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ fi
+ 
+-echo "$as_me:14759: checking for X11 rgb file" >&5
++echo "$as_me:14762: 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.
+@@ -14818,7 +14821,7 @@
+ 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:14821: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:14824: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14826,7 +14829,7 @@
+ 
+ fi
+ 
+-echo "$as_me:14829: result: $RGB_PATH" >&5
++echo "$as_me:14832: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:14847: 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.
+@@ -14851,17 +14854,17 @@
+ else
+   NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:14854: result: $NCURSES_BOOL" >&5
++echo "$as_me:14857: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ case x$NCURSES_BOOL in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14858: error: expected a type name for bool" >&5
++	{ { echo "$as_me:14861: error: expected a type name for bool" >&5
+ echo "$as_me: error: expected a type name for bool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+-echo "$as_me:14864: checking for alternate terminal capabilities file" >&5
++echo "$as_me:14867: 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.
+@@ -14873,16 +14876,16 @@
+ fi;
+ if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
+ then
+-	{ echo "$as_me:14876: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
++	{ echo "$as_me:14879: 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:14880: result: $TERMINFO_CAPS" >&5
++echo "$as_me:14883: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+ 
+ ###   use option --with-chtype to override chtype's type
+ 
+-echo "$as_me:14885: checking for type of chtype" >&5
++echo "$as_me:14888: 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.
+@@ -14892,11 +14895,11 @@
+ else
+   NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:14895: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:14898: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ case x$NCURSES_CHTYPE in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14899: error: expected a type name for chtype" >&5
++	{ { echo "$as_me:14902: error: expected a type name for chtype" >&5
+ echo "$as_me: error: expected a type name for chtype" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14904,7 +14907,7 @@
+ 
+ ###   use option --with-ospeed to override ospeed's type
+ 
+-echo "$as_me:14907: checking for type of ospeed" >&5
++echo "$as_me:14910: 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.
+@@ -14914,11 +14917,11 @@
+ else
+   NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:14917: result: $NCURSES_OSPEED" >&5
++echo "$as_me:14920: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ case x$NCURSES_OSPEED in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14921: error: expected a type name for ospeed" >&5
++	{ { echo "$as_me:14924: error: expected a type name for ospeed" >&5
+ echo "$as_me: error: expected a type name for ospeed" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14926,7 +14929,7 @@
+ 
+ ###   use option --with-mmask-t to override mmask_t's type
+ 
+-echo "$as_me:14929: checking for type of mmask-t" >&5
++echo "$as_me:14932: 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.
+@@ -14936,18 +14939,18 @@
+ else
+   NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:14939: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:14942: result: $NCURSES_MMASK_T" >&5
+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+ case x$NCURSES_MMASK_T in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14943: error: expected a type name for mmask-t" >&5
++	{ { echo "$as_me:14946: error: expected a type name for mmask-t" >&5
+ echo "$as_me: error: expected a type name for mmask-t" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ ###   use option --with-ccharw-max to override CCHARW_MAX size
+-echo "$as_me:14950: checking for size CCHARW_MAX" >&5
++echo "$as_me:14953: 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.
+@@ -14957,16 +14960,16 @@
+ else
+   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
+ fi;
+-echo "$as_me:14960: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:14963: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+ 
+-echo "$as_me:14963: checking for signed char" >&5
++echo "$as_me:14966: 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 14969 "configure"
++#line 14972 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14981,16 +14984,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14984: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14987: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14987: \$? = $ac_status" >&5
++  echo "$as_me:14990: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14990: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14993: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14993: \$? = $ac_status" >&5
++  echo "$as_me:14996: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -15000,10 +15003,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15003: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:15006: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:15006: checking size of signed char" >&5
++echo "$as_me:15009: 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
+@@ -15012,7 +15015,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15015 "configure"
++#line 15018 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15024,21 +15027,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15027: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15030: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15030: \$? = $ac_status" >&5
++  echo "$as_me:15033: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15033: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15036: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15036: \$? = $ac_status" >&5
++  echo "$as_me:15039: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15041 "configure"
++#line 15044 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15050,16 +15053,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15053: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15056: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15056: \$? = $ac_status" >&5
++  echo "$as_me:15059: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15059: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15062: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15062: \$? = $ac_status" >&5
++  echo "$as_me:15065: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -15075,7 +15078,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15078 "configure"
++#line 15081 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15087,16 +15090,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15090: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15093: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15093: \$? = $ac_status" >&5
++  echo "$as_me:15096: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15096: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15099: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15099: \$? = $ac_status" >&5
++  echo "$as_me:15102: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -15112,7 +15115,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 15115 "configure"
++#line 15118 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15124,16 +15127,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15127: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15130: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15130: \$? = $ac_status" >&5
++  echo "$as_me:15133: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15133: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15136: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15136: \$? = $ac_status" >&5
++  echo "$as_me:15139: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -15146,12 +15149,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:15149: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:15152: 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 15154 "configure"
++#line 15157 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15167,15 +15170,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:15170: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15173: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15173: \$? = $ac_status" >&5
++  echo "$as_me:15176: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:15175: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15178: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15178: \$? = $ac_status" >&5
++  echo "$as_me:15181: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -15191,7 +15194,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:15194: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:15197: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:15208: checking whether to use signed chars for Boolean array in term.h" >&5
+ echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
+ 
+ # Check whether --enable-signed-char or --disable-signed-char was given.
+@@ -15212,13 +15215,13 @@
+ else
+   with_signed_char=$cf_dft_signed_char
+ fi;
+-echo "$as_me:15215: result: $with_signed_char" >&5
++echo "$as_me:15218: 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:15221: checking for type of tparm-arg" >&5
++echo "$as_me:15224: checking for type of tparm-arg" >&5
+ echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6
+ 
+ # Check whether --with-tparm-arg or --without-tparm-arg was given.
+@@ -15228,18 +15231,18 @@
+ else
+   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:15231: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:15234: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+ case x$NCURSES_TPARM_ARG in
+ (x|xyes|xno)
+-	{ { echo "$as_me:15235: error: expected a type name for tparm-arg" >&5
++	{ { echo "$as_me:15238: error: expected a type name for tparm-arg" >&5
+ echo "$as_me: error: expected a type name for tparm-arg" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:15242: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:15245: 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.
+@@ -15249,7 +15252,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:15252: result: $with_rcs_ids" >&5
++echo "$as_me:15255: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15258,7 +15261,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:15261: checking format of man-pages" >&5
++echo "$as_me:15264: 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.
+@@ -15349,10 +15352,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:15352: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:15355: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+-	{ echo "$as_me:15355: WARNING: Unexpected manpage-format $cf_unknown" >&5
++	{ echo "$as_me:15358: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+ 
+@@ -15393,7 +15396,7 @@
+ esac
+ done
+ 
+-echo "$as_me:15396: checking for manpage renaming" >&5
++echo "$as_me:15399: 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.
+@@ -15422,15 +15425,15 @@
+ elif test "$MANPAGE_RENAMES" = no ; then
+ 	:
+ elif test ! -f "$MANPAGE_RENAMES" ; then
+-	{ { echo "$as_me:15425: error: not a filename: $MANPAGE_RENAMES" >&5
++	{ { echo "$as_me:15428: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-echo "$as_me:15430: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:15433: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+ 
+-echo "$as_me:15433: checking if manpage aliases will be installed" >&5
++echo "$as_me:15436: 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.
+@@ -15441,7 +15444,7 @@
+   MANPAGE_ALIASES=yes
+ fi;
+ 
+-echo "$as_me:15444: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:15447: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+ 
+ case "x$LN_S" in
+@@ -15455,7 +15458,7 @@
+ 
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:15458: checking if manpage symlinks should be used" >&5
++echo "$as_me:15461: 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.
+@@ -15468,17 +15471,17 @@
+ 
+ if test "$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+-	{ echo "$as_me:15471: WARNING: cannot make symlinks" >&5
++	{ echo "$as_me:15474: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ 	MANPAGE_SYMLINKS=no
+ fi
+ fi
+ 
+-echo "$as_me:15477: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:15480: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+ 
+-echo "$as_me:15481: checking for manpage tbl" >&5
++echo "$as_me:15484: 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.
+@@ -15489,7 +15492,7 @@
+   MANPAGE_TBL=no
+ fi;
+ 
+-echo "$as_me:15492: result: $MANPAGE_TBL" >&5
++echo "$as_me:15495: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+ 
+ if test "$prefix" = "NONE" ; then
+@@ -15807,7 +15810,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15810: checking if you want to build with function extensions" >&5
++echo "$as_me:15813: 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.
+@@ -15817,7 +15820,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:15820: result: $with_ext_funcs" >&5
++echo "$as_me:15823: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -15874,7 +15877,7 @@
+ 	GENERATED_EXT_FUNCS=
+ fi
+ 
+-echo "$as_me:15877: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:15880: 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.
+@@ -15884,7 +15887,7 @@
+ else
+   with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:15887: result: $with_sp_funcs" >&5
++echo "$as_me:15890: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ 	NCURSES_SP_FUNCS=1
+@@ -15903,7 +15906,7 @@
+ 	GENERATED_SP_FUNCS=
+ fi
+ 
+-echo "$as_me:15906: checking if you want to build with terminal-driver" >&5
++echo "$as_me:15909: 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.
+@@ -15913,7 +15916,7 @@
+ else
+   with_term_driver=no
+ fi;
+-echo "$as_me:15916: result: $with_term_driver" >&5
++echo "$as_me:15919: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+ 
+@@ -15922,19 +15925,19 @@
+ EOF
+ 
+ 	if test "x$with_termlib" != xno ; then
+-		{ { echo "$as_me:15925: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:15928: 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:15930: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:15933: 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:15937: checking for extended use of const keyword" >&5
++echo "$as_me:15940: 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.
+@@ -15944,7 +15947,7 @@
+ else
+   with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:15947: result: $with_ext_const" >&5
++echo "$as_me:15950: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -15952,7 +15955,7 @@
+ fi
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:15955: checking if you want to use extended colors" >&5
++echo "$as_me:15958: 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.
+@@ -15962,12 +15965,12 @@
+ else
+   with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:15965: result: $with_ext_colors" >&5
++echo "$as_me:15968: 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:15970: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:15973: 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)
+@@ -15978,7 +15981,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:15981: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:15984: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16006,7 +16009,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:16009: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:16012: 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.
+@@ -16016,7 +16019,7 @@
+ else
+   with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:16019: result: $with_ext_mouse" >&5
++echo "$as_me:16022: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ if test "x$with_ext_mouse" = xyes ; then
+ 
+@@ -16026,7 +16029,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16029: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16032: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16043,7 +16046,7 @@
+ fi
+ 
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:16046: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:16049: 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.
+@@ -16053,7 +16056,7 @@
+ else
+   with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:16056: result: $with_ext_putwin" >&5
++echo "$as_me:16059: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+ 
+@@ -16063,7 +16066,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16066: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:16069: 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.
+@@ -16073,7 +16076,7 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:16076: result: $with_no_padding" >&5
++echo "$as_me:16079: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16081,7 +16084,7 @@
+ EOF
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:16084: checking if you want SIGWINCH handler" >&5
++echo "$as_me:16087: 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.
+@@ -16091,7 +16094,7 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:16094: result: $with_sigwinch" >&5
++echo "$as_me:16097: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ if test "x$with_sigwinch" = xyes
+ then
+@@ -16106,7 +16109,7 @@
+ fi
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:16109: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:16112: 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.
+@@ -16116,7 +16119,7 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:16119: result: $with_tcap_names" >&5
++echo "$as_me:16122: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ if test "x$with_tcap_names" = xyes; then
+@@ -16130,7 +16133,7 @@
+ 
+ ##############################################################################
+ 
+-echo "$as_me:16133: checking if you want to link with the pthread library" >&5
++echo "$as_me:16136: 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.
+@@ -16140,27 +16143,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:16143: result: $with_pthread" >&5
++echo "$as_me:16146: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:16147: checking for pthread.h" >&5
++	echo "$as_me:16150: 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 16153 "configure"
++#line 16156 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16157: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16160: \"$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:16163: \$? = $ac_status" >&5
++  echo "$as_me:16166: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16179,7 +16182,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16182: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:16185: 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
+ 
+@@ -16189,7 +16192,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:16192: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:16195: 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"
+ 
+@@ -16210,7 +16213,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16213 "configure"
++#line 16216 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -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
+   with_pthread=yes
+ else
+@@ -16246,7 +16249,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:16249: result: $with_pthread" >&5
++	    echo "$as_me:16252: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -16274,7 +16277,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:16277: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:16280: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -16284,13 +16287,13 @@
+ fi
+ 
+ if test "x$with_pthread" != xno; then
+-	echo "$as_me:16287: checking for pthread_kill" >&5
++	echo "$as_me:16290: 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 16293 "configure"
++#line 16296 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16321,16 +16324,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16324: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16327: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16327: \$? = $ac_status" >&5
++  echo "$as_me:16330: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16330: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16333: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16333: \$? = $ac_status" >&5
++  echo "$as_me:16336: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_pthread_kill=yes
+ else
+@@ -16340,11 +16343,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16343: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:16346: 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:16347: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:16350: 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.
+@@ -16354,7 +16357,7 @@
+ else
+   use_pthreads_eintr=no
+ fi;
+-		echo "$as_me:16357: result: $use_pthreads_eintr" >&5
++		echo "$as_me:16360: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ 		if test "x$use_pthreads_eintr" = xyes ; then
+ 
+@@ -16365,7 +16368,7 @@
+ 		fi
+ fi
+ 
+-	echo "$as_me:16368: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:16371: 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.
+@@ -16375,18 +16378,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-	echo "$as_me:16378: result: $use_weak_symbols" >&5
++	echo "$as_me:16381: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ 	if test "x$use_weak_symbols" = xyes ; then
+ 
+-echo "$as_me:16382: checking if $CC supports weak symbols" >&5
++echo "$as_me:16385: 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 16389 "configure"
++#line 16392 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16412,16 +16415,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16415: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16418: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16418: \$? = $ac_status" >&5
++  echo "$as_me:16421: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16421: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16424: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16424: \$? = $ac_status" >&5
++  echo "$as_me:16427: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -16432,7 +16435,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16435: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:16438: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ 	else
+@@ -16482,7 +16485,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:16485: checking if you want reentrant code" >&5
++echo "$as_me:16488: 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.
+@@ -16492,7 +16495,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:16495: result: $with_reentrant" >&5
++echo "$as_me:16498: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -16581,7 +16584,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16584: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16587: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16593,7 +16596,7 @@
+ 	NCURSES_SIZE_T=$cf_dft_ordinate_type
+ fi
+ 
+-echo "$as_me:16596: checking whether curses library structures should be opaque" >&5
++echo "$as_me:16599: checking whether curses library structures should be opaque" >&5
+ echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
+@@ -16615,16 +16618,16 @@
+ 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16618: result: $enable_opaque_curses" >&5
++echo "$as_me:16621: 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:16623: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:16626: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:16627: checking whether form library structures should be opaque" >&5
++echo "$as_me:16630: checking whether form library structures should be opaque" >&5
+ echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-form or --disable-opaque-form was given.
+@@ -16641,10 +16644,10 @@
+ 	enable_opaque_form=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16644: result: $enable_opaque_form" >&5
++echo "$as_me:16647: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+ 
+-echo "$as_me:16647: checking whether menu library structures should be opaque" >&5
++echo "$as_me:16650: checking whether menu library structures should be opaque" >&5
+ echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
+@@ -16661,10 +16664,10 @@
+ 	enable_opaque_menu=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16664: result: $enable_opaque_menu" >&5
++echo "$as_me:16667: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+ 
+-echo "$as_me:16667: checking whether panel library structures should be opaque" >&5
++echo "$as_me:16670: checking whether panel library structures should be opaque" >&5
+ echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
+@@ -16681,7 +16684,7 @@
+ 	enable_opaque_panel=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16684: result: $enable_opaque_panel" >&5
++echo "$as_me:16687: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+ 
+ NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -16691,7 +16694,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:16694: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:16697: 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.
+@@ -16701,7 +16704,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:16704: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:16707: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -16714,7 +16717,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:16717: checking if you want all development code" >&5
++echo "$as_me:16720: 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.
+@@ -16724,11 +16727,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:16727: result: $with_develop" >&5
++echo "$as_me:16730: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###   use option --enable-check-size to detect screensize with CPR
+-echo "$as_me:16731: checking if you want to check screensize of serial terminals" >&5
++echo "$as_me:16734: checking if you want to check screensize of serial terminals" >&5
+ echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
+ 
+ # Check whether --enable-check-size or --disable-check-size was given.
+@@ -16738,7 +16741,7 @@
+ else
+   enable_check_size=$with_develop
+ fi;
+-echo "$as_me:16741: result: $enable_check_size" >&5
++echo "$as_me:16744: result: $enable_check_size" >&5
+ echo "${ECHO_T}$enable_check_size" >&6
+ test "x$enable_check_size" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16746,7 +16749,7 @@
+ EOF
+ 
+ ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
+-echo "$as_me:16749: checking if you want hard-tabs code" >&5
++echo "$as_me:16752: 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.
+@@ -16756,7 +16759,7 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:16759: result: $enable_hard_tabs" >&5
++echo "$as_me:16762: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16764,7 +16767,7 @@
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:16767: checking if you want limited support for xmc" >&5
++echo "$as_me:16770: 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.
+@@ -16774,7 +16777,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:16777: result: $enable_xmc_glitch" >&5
++echo "$as_me:16780: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16784,7 +16787,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:16787: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:16790: 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.
+@@ -16794,7 +16797,7 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:16797: result: $with_assumed_color" >&5
++echo "$as_me:16800: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16802,7 +16805,7 @@
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:16805: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:16808: 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.
+@@ -16812,7 +16815,7 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:16815: result: $with_hashmap" >&5
++echo "$as_me:16818: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16820,7 +16823,7 @@
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:16823: checking if you want colorfgbg code" >&5
++echo "$as_me:16826: 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.
+@@ -16830,7 +16833,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:16833: result: $with_colorfgbg" >&5
++echo "$as_me:16836: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16838,7 +16841,7 @@
+ EOF
+ 
+ ###   use option --enable-fvisibility to turn on use of gcc-specific feature
+-echo "$as_me:16841: checking if you want to use gcc -fvisibility option" >&5
++echo "$as_me:16844: 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.
+@@ -16848,14 +16851,14 @@
+ else
+   cf_with_fvisibility=no
+ fi;
+-echo "$as_me:16851: result: $cf_with_fvisibility" >&5
++echo "$as_me:16854: 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:16858: checking if $CC -fvisibility=hidden option works" >&5
++echo "$as_me:16861: 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
+@@ -16864,7 +16867,7 @@
+     cf_save_cflags="$CFLAGS"
+     CFLAGS="$CFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16867 "configure"
++#line 16870 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16880,16 +16883,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16883: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16886: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16886: \$? = $ac_status" >&5
++  echo "$as_me:16889: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16889: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16892: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16892: \$? = $ac_status" >&5
++  echo "$as_me:16895: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden=yes
+ else
+@@ -16901,7 +16904,7 @@
+     CFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16904: result: $cf_cv_fvisibility_hidden" >&5
++echo "$as_me:16907: result: $cf_cv_fvisibility_hidden" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
+ 
+ 	if test "x$cf_cv_fvisibility_hidden" = xyes
+@@ -17016,7 +17019,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:17019: checking if $CXX -fvisibility=hidden option works" >&5
++echo "$as_me:17022: 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
+@@ -17025,7 +17028,7 @@
+     cf_save_cflags="$CXXFLAGS"
+     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17028 "configure"
++#line 17031 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -17041,16 +17044,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17044: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17047: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17047: \$? = $ac_status" >&5
++  echo "$as_me:17050: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17050: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17053: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17053: \$? = $ac_status" >&5
++  echo "$as_me:17056: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden2=yes
+ else
+@@ -17062,7 +17065,7 @@
+     CXXFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:17065: result: $cf_cv_fvisibility_hidden2" >&5
++echo "$as_me:17068: result: $cf_cv_fvisibility_hidden2" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
+ 
+ 		if test "x$cf_cv_fvisibility_hidden2" = xyes
+@@ -17185,7 +17188,7 @@
+ fi
+ 
+ ###   use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:17188: checking if you want interop bindings" >&5
++echo "$as_me:17191: 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.
+@@ -17195,13 +17198,13 @@
+ else
+   with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:17198: result: $with_exp_interop" >&5
++echo "$as_me:17201: 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:17204: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:17207: 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.
+@@ -17211,13 +17214,13 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:17214: result: $with_safe_sprintf" >&5
++echo "$as_me:17217: 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:17220: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:17223: 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.
+@@ -17227,7 +17230,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:17230: result: $with_scroll_hints" >&5
++echo "$as_me:17233: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -17236,7 +17239,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17239: checking if you want wgetch-events code" >&5
++echo "$as_me:17242: 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.
+@@ -17246,7 +17249,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:17249: result: $with_wgetch_events" >&5
++echo "$as_me:17252: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ if test "x$with_wgetch_events" = xyes ; then
+ 
+@@ -17261,7 +17264,7 @@
+ 
+ case "$cf_cv_system_name" in
+ (*mingw32*|*mingw64*|*-msvc*)
+-	echo "$as_me:17264: checking if you want experimental-Windows driver" >&5
++	echo "$as_me:17267: 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.
+@@ -17271,7 +17274,7 @@
+ else
+   with_exp_win32=no
+ fi;
+-	echo "$as_me:17274: result: $with_exp_win32" >&5
++	echo "$as_me:17277: result: $with_exp_win32" >&5
+ echo "${ECHO_T}$with_exp_win32" >&6
+ 	if test "x$with_exp_win32" = xyes
+ 	then
+@@ -17297,7 +17300,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:17300: checking if you want to see long compiling messages" >&5
++echo "$as_me:17303: 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.
+@@ -17331,7 +17334,7 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:17334: result: $enableval" >&5
++echo "$as_me:17337: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ if test "x$enable_echo" = xyes; then
+@@ -17344,7 +17347,7 @@
+ 
+ # --disable-stripping is used for debugging
+ 
+-echo "$as_me:17347: checking if you want to install stripped executables" >&5
++echo "$as_me:17350: 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.
+@@ -17361,7 +17364,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:17364: result: $enable_stripping" >&5
++echo "$as_me:17367: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -17372,7 +17375,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:17375: checking if install accepts -p option" >&5
++echo "$as_me:17378: 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
+@@ -17403,10 +17406,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:17406: result: $cf_cv_install_p" >&5
++echo "$as_me:17409: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:17409: checking if install needs to be told about ownership" >&5
++echo "$as_me:17412: 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)
+@@ -17417,7 +17420,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17420: result: $with_install_o" >&5
++echo "$as_me:17423: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -17428,7 +17431,7 @@
+ 
+ if test -n "$INSTALL_OPT_S"
+ then
+-	echo "$as_me:17431: checking if you want to specify strip-program" >&5
++	echo "$as_me:17434: checking if you want to specify strip-program" >&5
+ echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
+ 
+ # Check whether --with-strip-program or --without-strip-program was given.
+@@ -17438,11 +17441,11 @@
+ else
+   with_strip_program=no
+ fi;
+-	echo "$as_me:17441: result: $with_strip_program" >&5
++	echo "$as_me:17444: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ 	if test "$with_strip_program" != no
+ 	then
+-		echo "$as_me:17445: checking if strip-program is supported with this installer" >&5
++		echo "$as_me:17448: checking if strip-program is supported with this installer" >&5
+ echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
+ 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
+ 		check_install_strip=no
+@@ -17463,11 +17466,11 @@
+ 				done
+ 			fi
+ 		fi
+-		echo "$as_me:17466: result: $check_install_strip" >&5
++		echo "$as_me:17469: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ 		case "$check_install_strip" in
+ 		(no)
+-			{ echo "$as_me:17470: WARNING: $cf_install_program does not support strip program option" >&5
++			{ echo "$as_me:17473: WARNING: $cf_install_program does not support strip program option" >&5
+ echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
+ 			with_strip_program=no
+ 			;;
+@@ -17482,7 +17485,7 @@
+ 			chmod +x "$INSTALL"
+ 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
+ 
+-echo "${as_me:-configure}:17485: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:17488: testing created $INSTALL ..." 1>&5
+ 
+ 			;;
+ 		(option)
+@@ -17508,7 +17511,7 @@
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+ 
+-echo "$as_me:17511: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:17514: 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.
+@@ -17525,17 +17528,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:17528: result: $enable_stdnoreturn" >&5
++echo "$as_me:17531: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:17532: checking for C11 _Noreturn feature" >&5
++echo "$as_me:17535: 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 17538 "configure"
++#line 17541 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17551,16 +17554,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17554: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17557: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17557: \$? = $ac_status" >&5
++  echo "$as_me:17560: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17560: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17563: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17563: \$? = $ac_status" >&5
++  echo "$as_me:17566: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -17571,7 +17574,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17574: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:17577: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -17627,16 +17630,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17630: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17633: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17635: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17638: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17639: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17642: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17675,16 +17678,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17678: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17681: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17683: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17686: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17687: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17690: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17723,23 +17726,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17726: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17729: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17731: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17734: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17735: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17738: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:17742: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:17745: 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.
+@@ -17756,7 +17759,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:17759: result: $enable_warnings" >&5
++echo "$as_me:17762: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -17780,7 +17783,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17783 "configure"
++#line 17786 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17795,26 +17798,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17798: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17801: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17801: \$? = $ac_status" >&5
++  echo "$as_me:17804: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17804: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17807: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17807: \$? = $ac_status" >&5
++  echo "$as_me:17810: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:17810: checking for X11/Xt const-feature" >&5
++echo "$as_me:17813: 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 17817 "configure"
++#line 17820 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -17832,16 +17835,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17835: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17838: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17838: \$? = $ac_status" >&5
++  echo "$as_me:17841: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17841: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17844: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17844: \$? = $ac_status" >&5
++  echo "$as_me:17847: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -17856,7 +17859,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17859: result: $cf_cv_const_x_string" >&5
++echo "$as_me:17862: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -17885,7 +17888,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:17907: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -17917,12 +17920,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17920: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17923: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17923: \$? = $ac_status" >&5
++  echo "$as_me:17926: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17925: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17928: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -17930,7 +17933,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:17933: checking for $CC warning options..." >&5
++	{ echo "$as_me:17936: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -17953,12 +17956,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:17956: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17959: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17959: \$? = $ac_status" >&5
++  echo "$as_me:17962: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17961: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17964: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -17966,7 +17969,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17969: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17972: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17976,7 +17979,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17979: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17982: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -18009,10 +18012,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:18012: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:18015: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -18062,12 +18065,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:18065: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18068: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18068: \$? = $ac_status" >&5
++  echo "$as_me:18071: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18070: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:18073: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -18139,12 +18142,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:18142: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:18145: 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 18147 "configure"
++#line 18150 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18161,16 +18164,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18164: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18167: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18167: \$? = $ac_status" >&5
++  echo "$as_me:18170: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18170: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18173: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18173: \$? = $ac_status" >&5
++  echo "$as_me:18176: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -18181,7 +18184,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:18184: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:18187: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -18190,11 +18193,11 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:18193: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:18196: 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 18197 "configure"
++#line 18200 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18211,16 +18214,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18214: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18217: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18217: \$? = $ac_status" >&5
++  echo "$as_me:18220: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18220: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18223: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18223: \$? = $ac_status" >&5
++  echo "$as_me:18226: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_CPLUSPLUS=yes
+ 
+@@ -18230,7 +18233,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:18233: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:18236: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -18239,30 +18242,30 @@
+ if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:18242: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:18245: 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:18249: checking version of $CC" >&5
++	echo "$as_me:18252: 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:18253: result: $CLANG_VERSION" >&5
++	echo "$as_me:18256: 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:18260: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:18263: 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 18265 "configure"
++#line 18268 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -18276,16 +18279,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18279: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18282: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18282: \$? = $ac_status" >&5
++  echo "$as_me:18285: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18285: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18288: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18288: \$? = $ac_status" >&5
++  echo "$as_me:18291: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -18296,13 +18299,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:18299: result: $cf_clang_optok" >&5
++		echo "$as_me:18302: 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}:18305: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:18308: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -18319,7 +18322,7 @@
+ ac_main_return="return"
+ 
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:18343: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -18354,12 +18357,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:18357: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18360: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18360: \$? = $ac_status" >&5
++  echo "$as_me:18363: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18362: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18365: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -18368,7 +18371,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:18371: checking for $CXX warning options..." >&5
++	{ echo "$as_me:18374: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -18398,16 +18401,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:18401: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18404: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18404: \$? = $ac_status" >&5
++  echo "$as_me:18407: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18406: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18409: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:18410: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18413: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -18425,7 +18428,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:18428: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:18431: 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.
+@@ -18435,7 +18438,7 @@
+ else
+   enable_string_hacks=no
+ fi;
+-echo "$as_me:18438: result: $enable_string_hacks" >&5
++echo "$as_me:18441: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+ 
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -18444,15 +18447,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:18447: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:18450: 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:18449: checking for strlcat" >&5
++	echo "$as_me:18452: 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 18455 "configure"
++#line 18458 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18483,16 +18486,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18486: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18489: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18489: \$? = $ac_status" >&5
++  echo "$as_me:18492: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18492: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18495: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18495: \$? = $ac_status" >&5
++  echo "$as_me:18498: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -18502,7 +18505,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18505: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:18508: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+ 
+@@ -18512,7 +18515,7 @@
+ 
+ else
+ 
+-		echo "$as_me:18515: checking for strlcat in -lbsd" >&5
++		echo "$as_me:18518: 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
+@@ -18520,7 +18523,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18523 "configure"
++#line 18526 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18539,16 +18542,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18542: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18545: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18545: \$? = $ac_status" >&5
++  echo "$as_me:18548: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18548: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18551: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18551: \$? = $ac_status" >&5
++  echo "$as_me:18554: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -18559,7 +18562,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18562: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:18565: 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
+ 
+@@ -18582,23 +18585,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18585: checking for $ac_header" >&5
++echo "$as_me:18588: 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 18591 "configure"
++#line 18594 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18595: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18598: \"$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:18601: \$? = $ac_status" >&5
++  echo "$as_me:18604: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18617,7 +18620,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18620: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18623: 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:18644: 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 18647 "configure"
++#line 18650 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18675,16 +18678,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18678: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18681: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18681: \$? = $ac_status" >&5
++  echo "$as_me:18684: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18684: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18687: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18687: \$? = $ac_status" >&5
++  echo "$as_me:18690: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -18694,7 +18697,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18697: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:18700: 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:18713: 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.
+@@ -18717,7 +18720,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:18720: result: $with_assertions" >&5
++echo "$as_me:18723: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -18733,7 +18736,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:18736: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:18739: 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.
+@@ -18755,7 +18758,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:18758: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:18761: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18869,23 +18872,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:18872: checking for dmalloc.h" >&5
++	echo "$as_me:18875: 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 18878 "configure"
++#line 18881 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:18882: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18885: \"$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:18888: \$? = $ac_status" >&5
++  echo "$as_me:18891: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18904,11 +18907,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18907: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:18910: 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:18911: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:18914: 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
+@@ -18916,7 +18919,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18919 "configure"
++#line 18922 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18935,16 +18938,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18938: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18941: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18941: \$? = $ac_status" >&5
++  echo "$as_me:18944: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18944: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18947: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18947: \$? = $ac_status" >&5
++  echo "$as_me:18950: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -18955,7 +18958,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18958: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:18961: 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:18976: 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.
+@@ -18992,7 +18995,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:18995: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:18998: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19106,23 +19109,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:19109: checking for dbmalloc.h" >&5
++	echo "$as_me:19112: 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 19115 "configure"
++#line 19118 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:19119: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:19122: \"$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:19125: \$? = $ac_status" >&5
++  echo "$as_me:19128: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19141,11 +19144,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:19144: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:19147: 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:19148: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:19151: 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
+@@ -19153,7 +19156,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19156 "configure"
++#line 19159 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19172,16 +19175,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19175: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19178: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19178: \$? = $ac_status" >&5
++  echo "$as_me:19181: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19181: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19184: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19184: \$? = $ac_status" >&5
++  echo "$as_me:19187: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -19192,7 +19195,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19195: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:19198: 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:19213: 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.
+@@ -19229,7 +19232,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:19232: result: ${with_valgrind:-no}" >&5
++echo "$as_me:19235: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19342,7 +19345,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19345: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:19348: 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.
+@@ -19353,7 +19356,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:19356: result: $with_no_leaks" >&5
++echo "$as_me:19359: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -19405,7 +19408,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19408: checking whether to add trace feature to all models" >&5
++echo "$as_me:19411: 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.
+@@ -19415,7 +19418,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:19418: result: $cf_with_trace" >&5
++echo "$as_me:19421: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -19435,7 +19438,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:19438: checking if we want to use GNAT projects" >&5
++echo "$as_me:19441: 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.
+@@ -19452,7 +19455,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:19455: result: $enable_gnat_projects" >&5
++echo "$as_me:19458: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -19465,14 +19468,14 @@
+ 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+ 	fi
+ 
+-echo "$as_me:19468: checking if ssp library is needed" >&5
++echo "$as_me:19471: 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 19475 "configure"
++#line 19478 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19489,16 +19492,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19492: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19495: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19495: \$? = $ac_status" >&5
++  echo "$as_me:19498: \$? = $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:19501: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19501: \$? = $ac_status" >&5
++  echo "$as_me:19504: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -19508,7 +19511,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19511 "configure"
++#line 19514 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19525,16 +19528,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19528: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19531: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19531: \$? = $ac_status" >&5
++  echo "$as_me:19534: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19534: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19537: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19537: \$? = $ac_status" >&5
++  echo "$as_me:19540: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -19548,7 +19551,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19551: result: $cf_cv_need_libssp" >&5
++echo "$as_me:19554: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -19577,14 +19580,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19580: checking if -lm needed for math functions" >&5
++echo "$as_me:19583: 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 19587 "configure"
++#line 19590 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19600,16 +19603,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19603: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19606: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19606: \$? = $ac_status" >&5
++  echo "$as_me:19609: \$? = $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:19612: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19612: \$? = $ac_status" >&5
++  echo "$as_me:19615: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -19619,7 +19622,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19622: result: $cf_cv_need_libm" >&5
++echo "$as_me:19625: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ 
+ if test "$cf_cv_need_libm" = yes
+@@ -19627,14 +19630,14 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lm"
+-	echo "$as_me:19630: checking if -lm is available for math functions" >&5
++	echo "$as_me:19633: checking if -lm is available for math functions" >&5
+ echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
+ if test "${cf_cv_have_libm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19637 "configure"
++#line 19640 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19650,16 +19653,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19653: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19656: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19656: \$? = $ac_status" >&5
++  echo "$as_me:19659: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19659: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19662: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19662: \$? = $ac_status" >&5
++  echo "$as_me:19665: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_libm=yes
+ else
+@@ -19669,7 +19672,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19672: result: $cf_cv_have_libm" >&5
++echo "$as_me:19675: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ 	LIBS="$cf_save_LIBS"
+ 
+@@ -19691,13 +19694,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:19694: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:19697: 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 19700 "configure"
++#line 19703 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -19713,16 +19716,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19716: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19719: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19719: \$? = $ac_status" >&5
++  echo "$as_me:19722: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19722: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19725: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19725: \$? = $ac_status" >&5
++  echo "$as_me:19728: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -19732,7 +19735,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19735: result: $ac_cv_header_time" >&5
++echo "$as_me:19738: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -19747,7 +19750,7 @@
+ case "$host_os" in
+ (mingw*)
+ 	# -lsystre -ltre -lintl -liconv
+-	echo "$as_me:19750: checking for regcomp in -lsystre" >&5
++	echo "$as_me:19753: 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
+@@ -19755,7 +19758,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsystre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19758 "configure"
++#line 19761 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19774,16 +19777,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19777: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19780: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19780: \$? = $ac_status" >&5
++  echo "$as_me:19783: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19783: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19786: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19786: \$? = $ac_status" >&5
++  echo "$as_me:19789: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_systre_regcomp=yes
+ else
+@@ -19794,11 +19797,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19797: result: $ac_cv_lib_systre_regcomp" >&5
++echo "$as_me:19800: 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:19801: checking for libiconv_open in -liconv" >&5
++		echo "$as_me:19804: 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
+@@ -19806,7 +19809,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19809 "configure"
++#line 19812 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19825,16 +19828,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19828: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19831: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19831: \$? = $ac_status" >&5
++  echo "$as_me:19834: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19834: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19837: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19837: \$? = $ac_status" >&5
++  echo "$as_me:19840: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_iconv_libiconv_open=yes
+ else
+@@ -19845,7 +19848,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19848: result: $ac_cv_lib_iconv_libiconv_open" >&5
++echo "$as_me:19851: 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
+ 
+@@ -19867,7 +19870,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19870: checking for libintl_gettext in -lintl" >&5
++		echo "$as_me:19873: 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
+@@ -19875,7 +19878,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19878 "configure"
++#line 19881 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19894,16 +19897,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19897: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19900: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19900: \$? = $ac_status" >&5
++  echo "$as_me:19903: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19903: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19906: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19906: \$? = $ac_status" >&5
++  echo "$as_me:19909: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_intl_libintl_gettext=yes
+ else
+@@ -19914,7 +19917,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19917: result: $ac_cv_lib_intl_libintl_gettext" >&5
++echo "$as_me:19920: 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
+ 
+@@ -19936,7 +19939,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19939: checking for tre_regcomp in -ltre" >&5
++		echo "$as_me:19942: 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
+@@ -19944,7 +19947,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19947 "configure"
++#line 19950 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19963,16 +19966,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19966: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19969: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19969: \$? = $ac_status" >&5
++  echo "$as_me:19972: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19972: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19975: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19975: \$? = $ac_status" >&5
++  echo "$as_me:19978: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_tre_tre_regcomp=yes
+ else
+@@ -19983,7 +19986,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19986: result: $ac_cv_lib_tre_tre_regcomp" >&5
++echo "$as_me:19989: 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
+ 
+@@ -20025,7 +20028,7 @@
+ 
+ else
+ 
+-		echo "$as_me:20028: checking for regcomp in -lgnurx" >&5
++		echo "$as_me:20031: 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
+@@ -20033,7 +20036,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgnurx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20036 "configure"
++#line 20039 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -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
+   ac_cv_lib_gnurx_regcomp=yes
+ else
+@@ -20072,7 +20075,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20075: result: $ac_cv_lib_gnurx_regcomp" >&5
++echo "$as_me:20078: 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
+ 
+@@ -20100,13 +20103,13 @@
+ 	;;
+ (*)
+ 	cf_regex_libs="regex re"
+-	echo "$as_me:20103: checking for regcomp" >&5
++	echo "$as_me:20106: 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 20109 "configure"
++#line 20112 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20137,16 +20140,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20140: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20143: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20143: \$? = $ac_status" >&5
++  echo "$as_me:20146: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20146: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20149: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20149: \$? = $ac_status" >&5
++  echo "$as_me:20152: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -20156,7 +20159,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20159: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:20162: 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
+@@ -20165,7 +20168,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:20168: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:20171: 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
+@@ -20173,7 +20176,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20176 "configure"
++#line 20179 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20192,16 +20195,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20195: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20198: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20198: \$? = $ac_status" >&5
++  echo "$as_me:20201: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20201: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20204: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20204: \$? = $ac_status" >&5
++  echo "$as_me:20207: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -20212,7 +20215,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20215: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:20218: 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
+ 
+@@ -20244,13 +20247,13 @@
+ esac
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:20247: checking for compile" >&5
++	echo "$as_me:20250: 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 20253 "configure"
++#line 20256 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20281,16 +20284,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20284: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20287: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20287: \$? = $ac_status" >&5
++  echo "$as_me:20290: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20290: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20293: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20293: \$? = $ac_status" >&5
++  echo "$as_me:20296: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -20300,13 +20303,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20303: result: $ac_cv_func_compile" >&5
++echo "$as_me:20306: 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:20309: checking for compile in -lgen" >&5
++		echo "$as_me:20312: 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
+@@ -20314,7 +20317,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20317 "configure"
++#line 20320 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20333,16 +20336,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20336: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20339: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20339: \$? = $ac_status" >&5
++  echo "$as_me:20342: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20342: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20345: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20345: \$? = $ac_status" >&5
++  echo "$as_me:20348: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -20353,7 +20356,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20356: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:20359: 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
+ 
+@@ -20381,11 +20384,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:20384: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:20387: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:20388: checking for regular-expression headers" >&5
++echo "$as_me:20391: 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
+@@ -20397,7 +20400,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20400 "configure"
++#line 20403 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -20414,16 +20417,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20417: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20420: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20420: \$? = $ac_status" >&5
++  echo "$as_me:20423: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20423: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20426: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20426: \$? = $ac_status" >&5
++  echo "$as_me:20429: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20440,7 +20443,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20443 "configure"
++#line 20446 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$cf_regex_hdr>
+@@ -20460,16 +20463,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20463: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20466: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20466: \$? = $ac_status" >&5
++  echo "$as_me:20469: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20469: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20472: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20472: \$? = $ac_status" >&5
++  echo "$as_me:20475: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20485,11 +20488,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:20488: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:20491: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case "$cf_cv_regex_hdrs" in
+-	(no)		{ echo "$as_me:20492: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:20495: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -20527,23 +20530,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20530: checking for $ac_header" >&5
++echo "$as_me:20533: 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 20536 "configure"
++#line 20539 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20540: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20543: \"$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:20546: \$? = $ac_status" >&5
++  echo "$as_me:20549: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20562,7 +20565,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20565: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20568: 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:20581: 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 20584 "configure"
++#line 20587 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20588: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20591: \"$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:20594: \$? = $ac_status" >&5
++  echo "$as_me:20597: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20610,7 +20613,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20613: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20616: 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:20626: 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
+@@ -20630,7 +20633,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20633 "configure"
++#line 20636 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20643,16 +20646,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20646: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20649: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20649: \$? = $ac_status" >&5
++  echo "$as_me:20652: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20652: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20655: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20655: \$? = $ac_status" >&5
++  echo "$as_me:20658: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -20664,7 +20667,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20667: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20670: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -20681,14 +20684,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20684: checking if external environ is declared" >&5
++echo "$as_me:20687: 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 20691 "configure"
++#line 20694 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -20701,16 +20704,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20704: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20707: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20707: \$? = $ac_status" >&5
++  echo "$as_me:20710: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20710: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20713: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20713: \$? = $ac_status" >&5
++  echo "$as_me:20716: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_environ=yes
+ else
+@@ -20721,7 +20724,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20724: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20727: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+ 
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20736,14 +20739,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:20739: checking if external environ exists" >&5
++echo "$as_me:20742: 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 20746 "configure"
++#line 20749 "configure"
+ #include "confdefs.h"
+ 
+ #undef environ
+@@ -20758,16 +20761,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20761: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20764: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20764: \$? = $ac_status" >&5
++  echo "$as_me:20767: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20767: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20770: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20770: \$? = $ac_status" >&5
++  echo "$as_me:20773: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_environ=yes
+ else
+@@ -20778,7 +20781,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20781: result: $cf_cv_have_environ" >&5
++echo "$as_me:20784: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+ 
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20791,13 +20794,13 @@
+ 
+ fi
+ 
+-echo "$as_me:20794: checking for getenv" >&5
++echo "$as_me:20797: 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 20800 "configure"
++#line 20803 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20828,16 +20831,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20831: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20834: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20834: \$? = $ac_status" >&5
++  echo "$as_me:20837: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20837: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20840: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20840: \$? = $ac_status" >&5
++  echo "$as_me:20843: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_getenv=yes
+ else
+@@ -20847,19 +20850,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20850: result: $ac_cv_func_getenv" >&5
++echo "$as_me:20853: 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:20856: checking for $ac_func" >&5
++echo "$as_me:20859: 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 20862 "configure"
++#line 20865 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20890,16 +20893,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20893: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20896: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20896: \$? = $ac_status" >&5
++  echo "$as_me:20899: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20899: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20902: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20902: \$? = $ac_status" >&5
++  echo "$as_me:20905: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -20909,7 +20912,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20912: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:20915: 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:20925: 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
+@@ -20929,7 +20932,7 @@
+   cf_cv_consistent_getenv=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20932 "configure"
++#line 20935 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21034,15 +21037,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21037: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21040: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21040: \$? = $ac_status" >&5
++  echo "$as_me:21043: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21042: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21045: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21045: \$? = $ac_status" >&5
++  echo "$as_me:21048: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_consistent_getenv=yes
+ else
+@@ -21055,7 +21058,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:21058: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:21061: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+ 
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -21070,18 +21073,18 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ 	test "x$cf_with_trace" = xyes
+ then
+-	{ echo "$as_me:21073: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++	{ echo "$as_me:21076: 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:21077: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:21080: 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 21084 "configure"
++#line 21087 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21101,16 +21104,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21104: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21107: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21107: \$? = $ac_status" >&5
++  echo "$as_me:21110: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21110: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21113: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21113: \$? = $ac_status" >&5
++  echo "$as_me:21116: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -21122,7 +21125,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21125: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:21128: 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
+@@ -21137,13 +21140,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:21140: checking for an ANSI C-conforming const" >&5
++echo "$as_me:21143: 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 21146 "configure"
++#line 21149 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21205,16 +21208,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21208: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21211: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21211: \$? = $ac_status" >&5
++  echo "$as_me:21214: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21214: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21217: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21217: \$? = $ac_status" >&5
++  echo "$as_me:21220: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -21224,7 +21227,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21227: result: $ac_cv_c_const" >&5
++echo "$as_me:21230: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -21234,7 +21237,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21237: checking for inline" >&5
++echo "$as_me:21240: 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
+@@ -21242,7 +21245,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21245 "configure"
++#line 21248 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo (void) {return 0; }
+@@ -21251,16 +21254,16 @@
+ 
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21254: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21257: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21257: \$? = $ac_status" >&5
++  echo "$as_me:21260: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21260: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21263: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21263: \$? = $ac_status" >&5
++  echo "$as_me:21266: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -21271,7 +21274,7 @@
+ done
+ 
+ fi
+-echo "$as_me:21274: result: $ac_cv_c_inline" >&5
++echo "$as_me:21277: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -21297,7 +21300,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:21300: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:21303: 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
+@@ -21306,7 +21309,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21309 "configure"
++#line 21312 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -21318,16 +21321,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21321: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21324: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21324: \$? = $ac_status" >&5
++  echo "$as_me:21327: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21327: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21330: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21330: \$? = $ac_status" >&5
++  echo "$as_me:21333: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -21339,7 +21342,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:21342: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:21345: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -21445,7 +21448,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:21448: checking for signal global datatype" >&5
++echo "$as_me:21451: 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
+@@ -21457,7 +21460,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21460 "configure"
++#line 21463 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21481,16 +21484,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21484: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21487: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21487: \$? = $ac_status" >&5
++  echo "$as_me:21490: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21490: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21493: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21493: \$? = $ac_status" >&5
++  echo "$as_me:21496: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21504,7 +21507,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21507: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21510: 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:21519: 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
+@@ -21523,7 +21526,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21526 "configure"
++#line 21529 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21558,15 +21561,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21561: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21564: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21564: \$? = $ac_status" >&5
++  echo "$as_me:21567: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21566: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21569: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21569: \$? = $ac_status" >&5
++  echo "$as_me:21572: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21581,7 +21584,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21584: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21587: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:21599: 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 21603 "configure"
++#line 21606 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21612,16 +21615,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21615: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21618: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21618: \$? = $ac_status" >&5
++  echo "$as_me:21621: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21621: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21624: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21624: \$? = $ac_status" >&5
++  echo "$as_me:21627: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -21633,7 +21636,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21636: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21639: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -21649,14 +21652,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:21652: checking if external errno is declared" >&5
++echo "$as_me:21655: 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 21659 "configure"
++#line 21662 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21670,16 +21673,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21673: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21676: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21676: \$? = $ac_status" >&5
++  echo "$as_me:21679: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21679: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21682: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21682: \$? = $ac_status" >&5
++  echo "$as_me:21685: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -21690,7 +21693,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21693: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21696: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21705,14 +21708,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:21708: checking if external errno exists" >&5
++echo "$as_me:21711: 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 21715 "configure"
++#line 21718 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -21727,16 +21730,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21730: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21733: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21733: \$? = $ac_status" >&5
++  echo "$as_me:21736: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21736: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21739: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21739: \$? = $ac_status" >&5
++  echo "$as_me:21742: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -21747,7 +21750,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21750: result: $cf_cv_have_errno" >&5
++echo "$as_me:21753: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21760,7 +21763,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21763: checking if data-only library module links" >&5
++echo "$as_me:21766: 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
+@@ -21768,20 +21771,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:21777: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21777: \$? = $ac_status" >&5
++  echo "$as_me:21780: \$? = $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:21804: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21804: \$? = $ac_status" >&5
++  echo "$as_me:21807: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -21814,7 +21817,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21817 "configure"
++#line 21820 "configure"
+ #include "confdefs.h"
+ 
+ 	extern int testfunc(void);
+@@ -21825,15 +21828,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21828: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21831: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21831: \$? = $ac_status" >&5
++  echo "$as_me:21834: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./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_link_dataonly=yes
+ else
+@@ -21848,7 +21851,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21851: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21854: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21863,13 +21866,13 @@
+ ###	Checks for library functions.
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:21866: checking for clock_gettime" >&5
++echo "$as_me:21869: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21872 "configure"
++#line 21875 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21900,16 +21903,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21903: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21906: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21906: \$? = $ac_status" >&5
++  echo "$as_me:21909: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21909: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21912: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21912: \$? = $ac_status" >&5
++  echo "$as_me:21915: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -21919,12 +21922,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21922: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:21925: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:21927: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:21930: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21932,7 +21935,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21935 "configure"
++#line 21938 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21951,16 +21954,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21954: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21957: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21957: \$? = $ac_status" >&5
++  echo "$as_me:21960: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21960: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21963: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21963: \$? = $ac_status" >&5
++  echo "$as_me:21966: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -21971,7 +21974,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21974: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:21977: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -21983,14 +21986,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:21986: checking if clock_gettime links" >&5
++echo "$as_me:21989: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21993 "configure"
++#line 21996 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22008,16 +22011,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22011: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22014: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22014: \$? = $ac_status" >&5
++  echo "$as_me:22017: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22017: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22020: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22020: \$? = $ac_status" >&5
++  echo "$as_me:22023: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -22028,7 +22031,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22031: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:22034: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -22042,13 +22045,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:22045: checking for gettimeofday" >&5
++echo "$as_me:22048: 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 22051 "configure"
++#line 22054 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22079,16 +22082,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22082: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22085: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22085: \$? = $ac_status" >&5
++  echo "$as_me:22088: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22088: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22091: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22091: \$? = $ac_status" >&5
++  echo "$as_me:22094: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -22098,7 +22101,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22101: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:22104: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -22108,7 +22111,7 @@
+ 
+ else
+ 
+-echo "$as_me:22111: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:22114: 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
+@@ -22116,7 +22119,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22119 "configure"
++#line 22122 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22135,16 +22138,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22138: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22141: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22141: \$? = $ac_status" >&5
++  echo "$as_me:22144: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22144: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22147: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22147: \$? = $ac_status" >&5
++  echo "$as_me:22150: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -22155,7 +22158,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22158: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:22161: 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
+ 
+@@ -22214,13 +22217,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:22217: checking for $ac_func" >&5
++echo "$as_me:22220: 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 22223 "configure"
++#line 22226 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22251,16 +22254,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "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='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22260: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22263: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22263: \$? = $ac_status" >&5
++  echo "$as_me:22266: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -22270,7 +22273,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22273: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:22276: 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:22286: 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 22290 "configure"
++#line 22293 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22302,16 +22305,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22305: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22308: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22308: \$? = $ac_status" >&5
++  echo "$as_me:22311: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22311: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22314: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22314: \$? = $ac_status" >&5
++  echo "$as_me:22317: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_PATH_TTYS=yes
+ else
+@@ -22321,7 +22324,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22324: result: $cf_cv_PATH_TTYS" >&5
++echo "$as_me:22327: result: $cf_cv_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
+ 
+ if test $cf_cv_PATH_TTYS = no
+@@ -22343,7 +22346,7 @@
+ 
+ if test $cf_cv_PATH_TTYS != no
+ then
+-	echo "$as_me:22346: checking if _PATH_TTYS file exists" >&5
++	echo "$as_me:22349: 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
+@@ -22353,7 +22356,7 @@
+   cf_cv_have_PATH_TTYS=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22356 "configure"
++#line 22359 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22366,15 +22369,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22369: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22372: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22372: \$? = $ac_status" >&5
++  echo "$as_me:22375: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22374: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22377: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22377: \$? = $ac_status" >&5
++  echo "$as_me:22380: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_PATH_TTYS=yes
+ else
+@@ -22386,7 +22389,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22389: result: $cf_cv_have_PATH_TTYS" >&5
++echo "$as_me:22392: 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
+@@ -22398,14 +22401,14 @@
+ #define HAVE_PATH_TTYS 1
+ EOF
+ 
+-	echo "$as_me:22401: checking for getttynam" >&5
++	echo "$as_me:22404: 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 22408 "configure"
++#line 22411 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22417,16 +22420,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22420: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22423: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22423: \$? = $ac_status" >&5
++  echo "$as_me:22426: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22426: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22429: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22429: \$? = $ac_status" >&5
++  echo "$as_me:22432: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_getttynam=yes
+ else
+@@ -22436,7 +22439,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22439: result: $cf_cv_func_getttynam" >&5
++echo "$as_me:22442: 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
+@@ -22446,7 +22449,7 @@
+ 
+ if test "x$ac_cv_func_getopt" = xno && \
+    test "x$cf_with_progs$cf_with_tests" != xnono; then
+-	{ { echo "$as_me:22449: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:22452: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -22455,7 +22458,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:22458: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:22461: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -22468,14 +22471,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:22471: checking for terminal-capability database functions" >&5
++echo "$as_me:22474: 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 22478 "configure"
++#line 22481 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22495,16 +22498,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22498: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22501: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22501: \$? = $ac_status" >&5
++  echo "$as_me:22504: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22504: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22507: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22507: \$? = $ac_status" >&5
++  echo "$as_me:22510: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -22515,7 +22518,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22518: result: $cf_cv_cgetent" >&5
++echo "$as_me:22521: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -22525,14 +22528,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:22528: checking if cgetent uses const parameter" >&5
++echo "$as_me:22531: 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 22535 "configure"
++#line 22538 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -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
+   cf_cv_cgetent_const=yes
+ else
+@@ -22575,7 +22578,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22578: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:22581: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -22589,14 +22592,14 @@
+ 
+ fi
+ 
+-echo "$as_me:22592: checking for isascii" >&5
++echo "$as_me:22595: 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 22599 "configure"
++#line 22602 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22608,16 +22611,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22611: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22614: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22614: \$? = $ac_status" >&5
++  echo "$as_me:22617: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22617: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22620: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22620: \$? = $ac_status" >&5
++  echo "$as_me:22623: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -22628,7 +22631,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22631: result: $cf_cv_have_isascii" >&5
++echo "$as_me:22634: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -22636,10 +22639,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:22639: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:22642: 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 22642 "configure"
++#line 22645 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22653,16 +22656,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22656: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22659: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22659: \$? = $ac_status" >&5
++  echo "$as_me:22662: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22662: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22665: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22665: \$? = $ac_status" >&5
++  echo "$as_me:22668: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=no
+ else
+@@ -22670,7 +22673,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22673 "configure"
++#line 22676 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22685,16 +22688,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22688: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22691: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22691: \$? = $ac_status" >&5
++  echo "$as_me:22694: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22694: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22697: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22697: \$? = $ac_status" >&5
++  echo "$as_me:22700: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=yes
+ 
+@@ -22710,11 +22713,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:22713: result: $sigact_bad" >&5
++echo "$as_me:22716: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:22717: checking if nanosleep really works" >&5
++echo "$as_me:22720: 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
+@@ -22724,7 +22727,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22727 "configure"
++#line 22730 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22750,15 +22753,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22753: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22756: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22756: \$? = $ac_status" >&5
++  echo "$as_me:22759: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22758: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22761: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22761: \$? = $ac_status" >&5
++  echo "$as_me:22764: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -22770,7 +22773,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22773: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:22776: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -22787,23 +22790,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22790: checking for $ac_header" >&5
++echo "$as_me:22793: 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 22796 "configure"
++#line 22799 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22800: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22803: \"$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:22806: \$? = $ac_status" >&5
++  echo "$as_me:22809: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22822,7 +22825,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22825: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22828: 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:22845: 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 22845 "configure"
++#line 22848 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22854,16 +22857,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22857: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22860: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22860: \$? = $ac_status" >&5
++  echo "$as_me:22863: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22863: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22866: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22866: \$? = $ac_status" >&5
++  echo "$as_me:22869: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=no
+ else
+@@ -22871,7 +22874,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22874 "configure"
++#line 22877 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22885,16 +22888,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22888: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22891: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22891: \$? = $ac_status" >&5
++  echo "$as_me:22894: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22894: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22897: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22897: \$? = $ac_status" >&5
++  echo "$as_me:22900: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=unknown
+ else
+@@ -22910,19 +22913,19 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:22913: result: $termios_bad" >&5
++	echo "$as_me:22916: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:22918: checking for tcgetattr" >&5
++echo "$as_me:22921: 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 22925 "configure"
++#line 22928 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22950,16 +22953,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22953: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22956: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22956: \$? = $ac_status" >&5
++  echo "$as_me:22959: \$? = $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:22962: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22962: \$? = $ac_status" >&5
++  echo "$as_me:22965: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -22969,21 +22972,21 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22972: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:22975: 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:22979: checking for vsscanf function or workaround" >&5
++echo "$as_me:22982: 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 22986 "configure"
++#line 22989 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23009,16 +23012,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23012: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23015: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23015: \$? = $ac_status" >&5
++  echo "$as_me:23018: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23018: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23021: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23021: \$? = $ac_status" >&5
++  echo "$as_me:23024: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -23026,7 +23029,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23029 "configure"
++#line 23032 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23048,16 +23051,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23051: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23054: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23054: \$? = $ac_status" >&5
++  echo "$as_me:23057: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23057: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23060: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23060: \$? = $ac_status" >&5
++  echo "$as_me:23063: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -23065,7 +23068,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23068 "configure"
++#line 23071 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23087,16 +23090,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23090: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23093: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23093: \$? = $ac_status" >&5
++  echo "$as_me:23096: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23096: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23099: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23099: \$? = $ac_status" >&5
++  echo "$as_me:23102: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -23111,7 +23114,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23114: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:23117: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case "$cf_cv_func_vsscanf" in
+@@ -23137,23 +23140,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:23140: checking for $ac_header" >&5
++echo "$as_me:23143: 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 23146 "configure"
++#line 23149 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23150: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23153: \"$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:23156: \$? = $ac_status" >&5
++  echo "$as_me:23159: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23172,7 +23175,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23175: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23178: 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:23188: 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
+@@ -23193,7 +23196,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23196 "configure"
++#line 23199 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23228,15 +23231,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23231: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23234: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23234: \$? = $ac_status" >&5
++  echo "$as_me:23237: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23236: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23239: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23239: \$? = $ac_status" >&5
++  echo "$as_me:23242: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -23251,16 +23254,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:23254: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:23257: 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:23257: checking for mkstemp" >&5
++	echo "$as_me:23260: 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 23263 "configure"
++#line 23266 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23291,16 +23294,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23294: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23297: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23297: \$? = $ac_status" >&5
++  echo "$as_me:23300: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23300: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23303: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23303: \$? = $ac_status" >&5
++  echo "$as_me:23306: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -23310,7 +23313,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23313: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:23316: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -23331,21 +23334,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:23334: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:23337: 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:23337: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:23340: 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:23343: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:23346: 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 23348 "configure"
++#line 23351 "configure"
+ #include "confdefs.h"
+ #include 
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -23362,15 +23365,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23365: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23368: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23368: \$? = $ac_status" >&5
++  echo "$as_me:23371: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23370: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23373: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23373: \$? = $ac_status" >&5
++  echo "$as_me:23376: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -23383,7 +23386,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:23386: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:23389: 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
+ 
+@@ -23394,13 +23397,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:23397: checking for intptr_t" >&5
++echo "$as_me:23400: 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 23403 "configure"
++#line 23406 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23415,16 +23418,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23418: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23421: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23421: \$? = $ac_status" >&5
++  echo "$as_me:23424: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23424: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23427: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23427: \$? = $ac_status" >&5
++  echo "$as_me:23430: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -23434,7 +23437,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23437: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:23440: 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
+   :
+@@ -23446,13 +23449,13 @@
+ 
+ fi
+ 
+-echo "$as_me:23449: checking for ssize_t" >&5
++echo "$as_me:23452: 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 23455 "configure"
++#line 23458 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23467,16 +23470,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23470: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23473: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23473: \$? = $ac_status" >&5
++  echo "$as_me:23476: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23476: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23479: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23479: \$? = $ac_status" >&5
++  echo "$as_me:23482: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -23486,7 +23489,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23489: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:23492: 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
+   :
+@@ -23498,14 +23501,14 @@
+ 
+ fi
+ 
+-echo "$as_me:23501: checking for type sigaction_t" >&5
++echo "$as_me:23504: 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 23508 "configure"
++#line 23511 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23518,16 +23521,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23521: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23524: \"$ac_compile\"") >&5
+   (eval $ac_compile) 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_objext"'
+-  { (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_type_sigaction=yes
+ else
+@@ -23538,14 +23541,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:23541: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:23544: 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:23548: checking declaration of size-change" >&5
++echo "$as_me:23551: 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
+@@ -23566,7 +23569,7 @@
+ 
+ 	fi
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23569 "configure"
++#line 23572 "configure"
+ #include "confdefs.h"
+ #include 
+ #ifdef HAVE_TERMIOS_H
+@@ -23616,16 +23619,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23619: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23622: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23622: \$? = $ac_status" >&5
++  echo "$as_me:23625: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23625: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23628: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23628: \$? = $ac_status" >&5
++  echo "$as_me:23631: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -23644,7 +23647,7 @@
+ done
+ 
+ fi
+-echo "$as_me:23647: result: $cf_cv_sizechange" >&5
++echo "$as_me:23650: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -23662,13 +23665,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:23665: checking for memmove" >&5
++echo "$as_me:23668: 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 23671 "configure"
++#line 23674 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23699,16 +23702,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23702: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23705: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23705: \$? = $ac_status" >&5
++  echo "$as_me:23708: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23708: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23711: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23711: \$? = $ac_status" >&5
++  echo "$as_me:23714: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -23718,19 +23721,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23721: result: $ac_cv_func_memmove" >&5
++echo "$as_me:23724: 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:23727: checking for bcopy" >&5
++echo "$as_me:23730: 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 23733 "configure"
++#line 23736 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23761,16 +23764,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23764: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23767: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23767: \$? = $ac_status" >&5
++  echo "$as_me:23770: \$? = $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:23773: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23773: \$? = $ac_status" >&5
++  echo "$as_me:23776: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -23780,11 +23783,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23783: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:23786: 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:23787: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:23790: 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
+@@ -23794,7 +23797,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23797 "configure"
++#line 23800 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23810,15 +23813,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23813: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23816: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23816: \$? = $ac_status" >&5
++  echo "$as_me:23819: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23818: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23821: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23821: \$? = $ac_status" >&5
++  echo "$as_me:23824: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -23831,7 +23834,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:23834: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:23837: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -23858,13 +23861,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23861: checking for $ac_func" >&5
++echo "$as_me:23864: 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 23867 "configure"
++#line 23870 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23895,16 +23898,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23898: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23901: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23901: \$? = $ac_status" >&5
++  echo "$as_me:23904: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23904: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23907: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23907: \$? = $ac_status" >&5
++  echo "$as_me:23910: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23914,7 +23917,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23917: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23920: 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:23930: 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
+@@ -23934,7 +23937,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23937 "configure"
++#line 23940 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23987,15 +23990,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23990: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23993: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23993: \$? = $ac_status" >&5
++  echo "$as_me:23996: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23995: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23998: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23998: \$? = $ac_status" >&5
++  echo "$as_me:24001: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -24007,21 +24010,21 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24010: result: $cf_cv_working_poll" >&5
++echo "$as_me:24013: 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:24017: checking if MB_LEN_MAX is usable" >&5
++echo "$as_me:24020: checking if MB_LEN_MAX is usable" >&5
+ echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
+ if test "${cf_cv_mb_len_max+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24024 "configure"
++#line 24027 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24041,16 +24044,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24044: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24047: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24047: \$? = $ac_status" >&5
++  echo "$as_me:24050: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24050: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24053: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24053: \$? = $ac_status" >&5
++  echo "$as_me:24056: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mb_len_max=yes
+ else
+@@ -24060,7 +24063,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24063: result: $cf_cv_mb_len_max" >&5
++echo "$as_me:24066: result: $cf_cv_mb_len_max" >&5
+ echo "${ECHO_T}$cf_cv_mb_len_max" >&6
+ if test "$cf_cv_mb_len_max" = yes
+ then
+@@ -24070,18 +24073,18 @@
+ EOF
+ 
+ else
+-	{ echo "$as_me:24073: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
++	{ echo "$as_me:24076: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+ echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
+ fi
+ 
+-echo "$as_me:24077: checking for va_copy" >&5
++echo "$as_me:24080: 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 24084 "configure"
++#line 24087 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24098,16 +24101,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24101: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24104: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24104: \$? = $ac_status" >&5
++  echo "$as_me:24107: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24107: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24110: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24110: \$? = $ac_status" >&5
++  echo "$as_me:24113: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -24117,7 +24120,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24120: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:24123: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -24129,14 +24132,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:24132: checking for __va_copy" >&5
++echo "$as_me:24135: 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 24139 "configure"
++#line 24142 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24153,16 +24156,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24156: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24159: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24159: \$? = $ac_status" >&5
++  echo "$as_me:24162: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24162: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24165: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24165: \$? = $ac_status" >&5
++  echo "$as_me:24168: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -24172,7 +24175,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24175: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:24178: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -24184,14 +24187,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:24187: checking for __builtin_va_copy" >&5
++echo "$as_me:24190: 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 24194 "configure"
++#line 24197 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24208,16 +24211,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24211: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24214: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24214: \$? = $ac_status" >&5
++  echo "$as_me:24217: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24217: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24220: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24220: \$? = $ac_status" >&5
++  echo "$as_me:24223: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -24227,7 +24230,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24230: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:24233: 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 &&
+@@ -24245,14 +24248,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:24248: checking if we can simply copy va_list" >&5
++	echo "$as_me:24251: 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 24255 "configure"
++#line 24258 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24269,16 +24272,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24272: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24275: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24275: \$? = $ac_status" >&5
++  echo "$as_me:24278: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24278: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24281: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24281: \$? = $ac_status" >&5
++  echo "$as_me:24284: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -24288,19 +24291,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24291: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:24294: 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:24296: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:24299: 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 24303 "configure"
++#line 24306 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24317,16 +24320,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24320: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24323: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24323: \$? = $ac_status" >&5
++  echo "$as_me:24326: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24326: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24329: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24329: \$? = $ac_status" >&5
++  echo "$as_me:24332: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -24336,7 +24339,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24339: result: $cf_cv_array_va_list" >&5
++echo "$as_me:24342: 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
+@@ -24347,13 +24350,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:24350: checking for pid_t" >&5
++echo "$as_me:24353: 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 24356 "configure"
++#line 24359 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24368,16 +24371,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24371: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24374: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24374: \$? = $ac_status" >&5
++  echo "$as_me:24377: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24377: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24380: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24380: \$? = $ac_status" >&5
++  echo "$as_me:24383: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -24387,7 +24390,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24390: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:24393: 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
+   :
+@@ -24402,23 +24405,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:24405: checking for $ac_header" >&5
++echo "$as_me:24408: 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 24411 "configure"
++#line 24414 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:24415: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:24418: \"$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:24421: \$? = $ac_status" >&5
++  echo "$as_me:24424: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -24437,7 +24440,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24440: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:24443: 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:24456: 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 24459 "configure"
++#line 24462 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -24487,16 +24490,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24490: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24493: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24493: \$? = $ac_status" >&5
++  echo "$as_me:24496: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24496: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24499: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24499: \$? = $ac_status" >&5
++  echo "$as_me:24502: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -24506,7 +24509,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24509: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:24512: 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:24524: 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
+@@ -24541,15 +24544,15 @@
+       }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24544: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24547: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24547: \$? = $ac_status" >&5
++  echo "$as_me:24550: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24549: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24552: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24552: \$? = $ac_status" >&5
++  echo "$as_me:24555: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -24561,7 +24564,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24564: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:24567: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -24575,12 +24578,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:24578: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24581: 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:24583: checking for working vfork" >&5
++  echo "$as_me:24586: 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
+@@ -24589,7 +24592,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24592 "configure"
++#line 24595 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include 
+@@ -24682,15 +24685,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24685: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24688: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24688: \$? = $ac_status" >&5
++  echo "$as_me:24691: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24690: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24693: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24693: \$? = $ac_status" >&5
++  echo "$as_me:24696: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -24702,13 +24705,13 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24705: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:24708: 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:24711: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24714: 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
+ 
+@@ -24733,7 +24736,7 @@
+ 
+ fi
+ 
+-echo "$as_me:24736: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:24739: 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
+@@ -24743,7 +24746,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24746 "configure"
++#line 24749 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24778,15 +24781,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24781: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24784: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24784: \$? = $ac_status" >&5
++  echo "$as_me:24787: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./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_fopen_bin_r=yes
+ else
+@@ -24799,7 +24802,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:24802: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:24805: 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
+@@ -24808,7 +24811,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:24811: checking for openpty in -lutil" >&5
++echo "$as_me:24814: 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
+@@ -24816,7 +24819,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24819 "configure"
++#line 24822 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -24835,16 +24838,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24838: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24841: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24841: \$? = $ac_status" >&5
++  echo "$as_me:24844: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24844: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24847: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24847: \$? = $ac_status" >&5
++  echo "$as_me:24850: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -24855,7 +24858,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:24858: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:24861: 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
+@@ -24863,7 +24866,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:24866: checking for openpty header" >&5
++echo "$as_me:24869: 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
+@@ -24890,7 +24893,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24893 "configure"
++#line 24896 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -24908,16 +24911,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24911: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24914: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24914: \$? = $ac_status" >&5
++  echo "$as_me:24917: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24917: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24920: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24920: \$? = $ac_status" >&5
++  echo "$as_me:24923: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -24935,7 +24938,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:24938: result: $cf_cv_func_openpty" >&5
++echo "$as_me:24941: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -25008,7 +25011,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25011 "configure"
++#line 25014 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -25020,16 +25023,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25023: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25026: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25026: \$? = $ac_status" >&5
++  echo "$as_me:25029: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25029: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25032: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25032: \$? = $ac_status" >&5
++  echo "$as_me:25035: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25046,7 +25049,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}:25049: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25052: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25082,7 +25085,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}:25085: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25088: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25093,7 +25096,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:25096: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:25099: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -25165,7 +25168,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25168 "configure"
++#line 25171 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -25177,16 +25180,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25180: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25183: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25183: \$? = $ac_status" >&5
++  echo "$as_me:25186: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25186: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25189: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25189: \$? = $ac_status" >&5
++  echo "$as_me:25192: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25203,7 +25206,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}:25206: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25209: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25283,7 +25286,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}:25286: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25289: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25300,23 +25303,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:25303: checking for db.h" >&5
++echo "$as_me:25306: 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 25309 "configure"
++#line 25312 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:25313: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25316: \"$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:25319: \$? = $ac_status" >&5
++  echo "$as_me:25322: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -25335,11 +25338,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25338: result: $ac_cv_header_db_h" >&5
++echo "$as_me:25341: 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:25342: checking for version of db" >&5
++echo "$as_me:25345: 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
+@@ -25350,10 +25353,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:25353: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:25356: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25356 "configure"
++#line 25359 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25383,16 +25386,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25386: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25389: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25389: \$? = $ac_status" >&5
++  echo "$as_me:25392: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25392: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25395: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25395: \$? = $ac_status" >&5
++  echo "$as_me:25398: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -25406,16 +25409,16 @@
+ done
+ 
+ fi
+-echo "$as_me:25409: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:25412: 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:25413: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:25416: 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:25418: checking for db libraries" >&5
++echo "$as_me:25421: 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
+@@ -25445,10 +25448,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:25448: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:25451: testing checking for library $cf_db_libs ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25451 "configure"
++#line 25454 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25503,16 +25506,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25506: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25509: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25509: \$? = $ac_status" >&5
++  echo "$as_me:25512: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25512: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25515: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25515: \$? = $ac_status" >&5
++  echo "$as_me:25518: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -25532,11 +25535,11 @@
+ done
+ 
+ fi
+-echo "$as_me:25535: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:25538: 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:25539: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:25542: 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
+@@ -25562,7 +25565,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:25565: error: Cannot find db.h" >&5
++	{ { echo "$as_me:25568: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -25577,7 +25580,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:25580: checking if we should include stdbool.h" >&5
++echo "$as_me:25583: 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
+@@ -25585,7 +25588,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25588 "configure"
++#line 25591 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -25597,23 +25600,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25600: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25603: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25603: \$? = $ac_status" >&5
++  echo "$as_me:25606: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25606: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25609: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25609: \$? = $ac_status" >&5
++  echo "$as_me:25612: \$? = $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 25616 "configure"
++#line 25619 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -25629,16 +25632,16 @@
+ }
+ _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=1
+ else
+@@ -25652,13 +25655,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:25655: result: yes" >&5
++then	echo "$as_me:25658: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25657: result: no" >&5
++else	echo "$as_me:25660: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:25661: checking for builtin bool type" >&5
++echo "$as_me:25664: 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
+@@ -25666,7 +25669,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25669 "configure"
++#line 25672 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25681,16 +25684,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25684: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25687: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25687: \$? = $ac_status" >&5
++  echo "$as_me:25690: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25690: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25693: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25693: \$? = $ac_status" >&5
++  echo "$as_me:25696: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -25703,9 +25706,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:25706: result: yes" >&5
++then	echo "$as_me:25709: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25708: result: no" >&5
++else	echo "$as_me:25711: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -25722,10 +25725,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:25725: checking if we already have C++ library" >&5
++	echo "$as_me:25728: 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 25728 "configure"
++#line 25731 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -25739,16 +25742,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25742: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25745: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25745: \$? = $ac_status" >&5
++  echo "$as_me:25748: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25748: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25751: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25751: \$? = $ac_status" >&5
++  echo "$as_me:25754: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -25757,7 +25760,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-	echo "$as_me:25760: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:25763: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -25776,7 +25779,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:25779: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:25782: 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
+@@ -25802,7 +25805,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25805 "configure"
++#line 25808 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -25816,16 +25819,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25819: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25822: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25822: \$? = $ac_status" >&5
++  echo "$as_me:25825: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25825: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25828: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25828: \$? = $ac_status" >&5
++  echo "$as_me:25831: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -25837,7 +25840,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:25840: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:25843: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -25859,7 +25862,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:25862: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:25865: 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
+@@ -25874,15 +25877,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:25877: \"$ac_try\"") >&5
++if { (eval echo "$as_me:25880: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25880: \$? = $ac_status" >&5
++  echo "$as_me:25883: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25882: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:25885: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25885: \$? = $ac_status" >&5
++  echo "$as_me:25888: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -25893,10 +25896,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+-  echo "$as_me:25896: result: yes" >&5
++  echo "$as_me:25899: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:25899: result: no" >&5
++  echo "$as_me:25902: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -25916,7 +25919,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:25919: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:25922: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -25937,7 +25940,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25940 "configure"
++#line 25943 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -25951,16 +25954,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25954: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25957: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25957: \$? = $ac_status" >&5
++  echo "$as_me:25960: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25960: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25963: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25963: \$? = $ac_status" >&5
++  echo "$as_me:25966: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -25997,7 +26000,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26000 "configure"
++#line 26003 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26011,16 +26014,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26014: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26017: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26017: \$? = $ac_status" >&5
++  echo "$as_me:26020: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26023: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26023: \$? = $ac_status" >&5
++  echo "$as_me:26026: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -26053,7 +26056,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	LIBS="$cf_save"
+-	echo "$as_me:26056: result: $cf_cxx_library" >&5
++	echo "$as_me:26059: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -26069,7 +26072,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:26072: checking how to run the C++ preprocessor" >&5
++echo "$as_me:26075: 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
+@@ -26086,18 +26089,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 26089 "configure"
++#line 26092 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26094: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26097: \"$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:26100: \$? = $ac_status" >&5
++  echo "$as_me:26103: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26120,17 +26123,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26123 "configure"
++#line 26126 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26127: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26130: \"$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:26133: \$? = $ac_status" >&5
++  echo "$as_me:26136: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26167,7 +26170,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:26170: result: $CXXCPP" >&5
++echo "$as_me:26173: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -26177,18 +26180,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 26180 "configure"
++#line 26183 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26185: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26188: \"$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:26191: \$? = $ac_status" >&5
++  echo "$as_me:26194: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26211,17 +26214,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26214 "configure"
++#line 26217 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26218: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26221: \"$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:26224: \$? = $ac_status" >&5
++  echo "$as_me:26227: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26249,7 +26252,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:26252: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:26255: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -26264,23 +26267,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:26267: checking for $ac_header" >&5
++echo "$as_me:26270: 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 26273 "configure"
++#line 26276 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26277: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26280: \"$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:26283: \$? = $ac_status" >&5
++  echo "$as_me:26286: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26299,7 +26302,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26302: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26305: 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:26318: 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 26321 "configure"
++#line 26324 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26325: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26328: \"$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:26331: \$? = $ac_status" >&5
++  echo "$as_me:26334: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26347,7 +26350,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26350: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26353: 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:26364: 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 26364 "configure"
++#line 26367 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26378,16 +26381,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26381: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26384: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26384: \$? = $ac_status" >&5
++  echo "$as_me:26387: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26387: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26390: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26390: \$? = $ac_status" >&5
++  echo "$as_me:26393: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -26396,7 +26399,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:26399: result: $cf_iostream_namespace" >&5
++	echo "$as_me:26402: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -26407,7 +26410,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:26410: checking if we should include stdbool.h" >&5
++echo "$as_me:26413: 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
+@@ -26415,7 +26418,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26418 "configure"
++#line 26421 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -26427,23 +26430,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26430: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26433: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26433: \$? = $ac_status" >&5
++  echo "$as_me:26436: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26436: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26439: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26439: \$? = $ac_status" >&5
++  echo "$as_me:26442: \$? = $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 26446 "configure"
++#line 26449 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -26459,16 +26462,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26462: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26465: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26465: \$? = $ac_status" >&5
++  echo "$as_me:26468: \$? = $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:26471: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26471: \$? = $ac_status" >&5
++  echo "$as_me:26474: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -26482,13 +26485,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:26485: result: yes" >&5
++then	echo "$as_me:26488: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:26487: result: no" >&5
++else	echo "$as_me:26490: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:26491: checking for builtin bool type" >&5
++echo "$as_me:26494: 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
+@@ -26496,7 +26499,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26499 "configure"
++#line 26502 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26511,16 +26514,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26514: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26517: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26517: \$? = $ac_status" >&5
++  echo "$as_me:26520: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26520: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26523: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26523: \$? = $ac_status" >&5
++  echo "$as_me:26526: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -26533,19 +26536,19 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:26536: result: yes" >&5
++then	echo "$as_me:26539: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:26538: result: no" >&5
++else	echo "$as_me:26541: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:26542: checking for bool" >&5
++echo "$as_me:26545: 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 26548 "configure"
++#line 26551 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26580,16 +26583,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26583: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26586: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26586: \$? = $ac_status" >&5
++  echo "$as_me:26589: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26589: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26592: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26592: \$? = $ac_status" >&5
++  echo "$as_me:26595: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -26599,10 +26602,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26602: result: $ac_cv_type_bool" >&5
++echo "$as_me:26605: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:26605: checking size of bool" >&5
++echo "$as_me:26608: 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
+@@ -26611,7 +26614,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26614 "configure"
++#line 26617 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26643,21 +26646,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26646: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26649: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26649: \$? = $ac_status" >&5
++  echo "$as_me:26652: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26652: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26655: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26655: \$? = $ac_status" >&5
++  echo "$as_me:26658: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26660 "configure"
++#line 26663 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26689,16 +26692,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26692: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26695: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26695: \$? = $ac_status" >&5
++  echo "$as_me:26698: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26698: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26701: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26701: \$? = $ac_status" >&5
++  echo "$as_me:26704: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -26714,7 +26717,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26717 "configure"
++#line 26720 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26746,16 +26749,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26749: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26752: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26752: \$? = $ac_status" >&5
++  echo "$as_me:26755: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26755: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26758: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26758: \$? = $ac_status" >&5
++  echo "$as_me:26761: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -26771,7 +26774,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 26774 "configure"
++#line 26777 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26803,16 +26806,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26806: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26809: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26809: \$? = $ac_status" >&5
++  echo "$as_me:26812: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26812: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26815: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26815: \$? = $ac_status" >&5
++  echo "$as_me:26818: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -26825,12 +26828,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:26828: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:26831: 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 26833 "configure"
++#line 26836 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26866,15 +26869,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26869: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26872: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26872: \$? = $ac_status" >&5
++  echo "$as_me:26875: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26874: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26877: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26877: \$? = $ac_status" >&5
++  echo "$as_me:26880: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -26890,13 +26893,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:26893: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:26896: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:26902: 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
+@@ -26915,7 +26918,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26918 "configure"
++#line 26921 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26956,15 +26959,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26959: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26962: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26962: \$? = $ac_status" >&5
++  echo "$as_me:26965: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26964: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26967: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26967: \$? = $ac_status" >&5
++  echo "$as_me:26970: \$? = $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
+@@ -26981,19 +26984,19 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:26984: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:26987: 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:26991: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:26994: 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:26996: checking for special defines needed for etip.h" >&5
++echo "$as_me:26999: 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"
+@@ -27011,7 +27014,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 27014 "configure"
++#line 27017 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -27025,16 +27028,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27028: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27031: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27031: \$? = $ac_status" >&5
++  echo "$as_me:27034: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27034: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27037: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27037: \$? = $ac_status" >&5
++  echo "$as_me:27040: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:27061: result: ${cf_result:-(none)}" >&5
+ echo "${ECHO_T}${cf_result:-(none)}" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27063: checking if $CXX accepts override keyword" >&5
++echo "$as_me:27066: checking if $CXX accepts override keyword" >&5
+ echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
+ if test "${cf_cv_cpp_override+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27077,7 +27080,7 @@
+   cf_cv_cpp_override=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27080 "configure"
++#line 27083 "configure"
+ #include "confdefs.h"
+ 
+ class base
+@@ -27096,15 +27099,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27099: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27102: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27102: \$? = $ac_status" >&5
++  echo "$as_me:27105: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27104: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27107: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27107: \$? = $ac_status" >&5
++  echo "$as_me:27110: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_override=yes
+ else
+@@ -27123,7 +27126,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27126: result: $cf_cv_cpp_override" >&5
++echo "$as_me:27129: result: $cf_cv_cpp_override" >&5
+ echo "${ECHO_T}$cf_cv_cpp_override" >&6
+ fi
+ test "$cf_cv_cpp_override" = yes &&
+@@ -27132,7 +27135,7 @@
+ EOF
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27135: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:27138: 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
+@@ -27149,7 +27152,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27152 "configure"
++#line 27155 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -27168,15 +27171,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27171: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27174: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27174: \$? = $ac_status" >&5
++  echo "$as_me:27177: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27176: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27179: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27179: \$? = $ac_status" >&5
++  echo "$as_me:27182: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -27195,7 +27198,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27198: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:27201: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -27205,7 +27208,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:27208: checking if $CXX accepts static_cast" >&5
++echo "$as_me:27211: 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
+@@ -27219,7 +27222,7 @@
+ ac_main_return="return"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27222 "configure"
++#line 27225 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -27263,16 +27266,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27266: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27269: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27269: \$? = $ac_status" >&5
++  echo "$as_me:27272: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27272: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27275: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27275: \$? = $ac_status" >&5
++  echo "$as_me:27278: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -27290,7 +27293,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27293: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:27296: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -27338,13 +27341,13 @@
+ 		cf_cv_header_stdbool_h=0
+ 	else
+ 
+-echo "$as_me:27341: checking for bool" >&5
++echo "$as_me:27344: 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 27347 "configure"
++#line 27350 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27379,16 +27382,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27382: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27385: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27385: \$? = $ac_status" >&5
++  echo "$as_me:27388: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27388: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27391: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27391: \$? = $ac_status" >&5
++  echo "$as_me:27394: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -27398,10 +27401,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27401: result: $ac_cv_type_bool" >&5
++echo "$as_me:27404: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:27404: checking size of bool" >&5
++echo "$as_me:27407: 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
+@@ -27410,7 +27413,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27413 "configure"
++#line 27416 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27442,21 +27445,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27445: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27448: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27448: \$? = $ac_status" >&5
++  echo "$as_me:27451: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27451: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27454: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27454: \$? = $ac_status" >&5
++  echo "$as_me:27457: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27459 "configure"
++#line 27462 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27488,16 +27491,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27491: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27494: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27494: \$? = $ac_status" >&5
++  echo "$as_me:27497: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27497: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27500: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27500: \$? = $ac_status" >&5
++  echo "$as_me:27503: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -27513,7 +27516,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27516 "configure"
++#line 27519 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27545,16 +27548,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27548: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27551: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27551: \$? = $ac_status" >&5
++  echo "$as_me:27554: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27554: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27557: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27557: \$? = $ac_status" >&5
++  echo "$as_me:27560: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27570,7 +27573,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 27573 "configure"
++#line 27576 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27602,16 +27605,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27605: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27608: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27608: \$? = $ac_status" >&5
++  echo "$as_me:27611: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27611: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27614: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27614: \$? = $ac_status" >&5
++  echo "$as_me:27617: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27624,12 +27627,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27627: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27630: 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 27632 "configure"
++#line 27635 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27665,15 +27668,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27668: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27671: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27671: \$? = $ac_status" >&5
++  echo "$as_me:27674: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27673: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27676: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27676: \$? = $ac_status" >&5
++  echo "$as_me:27679: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27689,13 +27692,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27692: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27695: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27701: 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
+@@ -27714,7 +27717,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27717 "configure"
++#line 27720 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27755,15 +27758,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27758: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27761: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27761: \$? = $ac_status" >&5
++  echo "$as_me:27764: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27763: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27766: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27766: \$? = $ac_status" >&5
++  echo "$as_me:27769: \$? = $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
+@@ -27780,14 +27783,14 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:27783: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:27786: 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:27790: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:27793: 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
+@@ -27818,7 +27821,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:27821: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:27824: 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
+@@ -27829,7 +27832,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:27832: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:27835: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -27846,10 +27849,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:27849: result: $ADAFLAGS" >&5
++	echo "$as_me:27852: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:27852: checking if GNATPREP supports -T option" >&5
++echo "$as_me:27855: 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
+@@ -27859,11 +27862,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:27862: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:27865: 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:27866: checking if GNAT supports generics" >&5
++echo "$as_me:27869: 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])
+@@ -27873,7 +27876,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:27876: result: $cf_gnat_generics" >&5
++echo "$as_me:27879: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -27885,7 +27888,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:27888: checking if GNAT supports SIGINT" >&5
++echo "$as_me:27891: 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
+@@ -27933,7 +27936,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:27936: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:27939: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -27946,7 +27949,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:27949: checking if GNAT supports project files" >&5
++echo "$as_me:27952: 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]*)
+@@ -28009,15 +28012,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:28012: result: $cf_gnat_projects" >&5
++echo "$as_me:28015: 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:28018: checking if GNAT supports libraries" >&5
++	echo "$as_me:28021: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:28020: result: $cf_gnat_libraries" >&5
++	echo "$as_me:28023: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -28037,7 +28040,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:28040: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:28043: 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
+@@ -28049,7 +28052,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:28052: checking for Ada95 compiler" >&5
++echo "$as_me:28055: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -28060,12 +28063,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:28063: result: $cf_ada_compiler" >&5
++echo "$as_me:28066: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:28068: checking for Ada95 include directory" >&5
++echo "$as_me:28071: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -28099,7 +28102,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28102: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28105: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28108,10 +28111,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:28111: result: $ADA_INCLUDE" >&5
++echo "$as_me:28114: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:28114: checking for Ada95 object directory" >&5
++echo "$as_me:28117: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -28145,7 +28148,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28148: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28151: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28154,10 +28157,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:28157: result: $ADA_OBJECTS" >&5
++echo "$as_me:28160: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:28160: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:28163: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -28178,11 +28181,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:28181: result: $with_ada_sharedlib" >&5
++echo "$as_me:28184: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+-	{ echo "$as_me:28185: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++	{ echo "$as_me:28188: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+ 
+@@ -28200,7 +28203,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:28203: checking for Ada95 curses library name" >&5
++echo "$as_me:28206: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -28216,7 +28219,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28219: result: $ADA_LIBNAME" >&5
++echo "$as_me:28222: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -28227,13 +28230,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:28230: checking for wchar_t" >&5
++	echo "$as_me:28233: 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 28236 "configure"
++#line 28239 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28248,16 +28251,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28251: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28254: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28254: \$? = $ac_status" >&5
++  echo "$as_me:28257: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28257: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28260: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28260: \$? = $ac_status" >&5
++  echo "$as_me:28263: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -28267,10 +28270,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:28270: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:28273: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:28273: checking size of wchar_t" >&5
++echo "$as_me:28276: 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
+@@ -28279,7 +28282,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28282 "configure"
++#line 28285 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28291,21 +28294,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28294: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28297: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28297: \$? = $ac_status" >&5
++  echo "$as_me:28300: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28300: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28303: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28303: \$? = $ac_status" >&5
++  echo "$as_me:28306: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28308 "configure"
++#line 28311 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28317,16 +28320,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28320: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28323: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28323: \$? = $ac_status" >&5
++  echo "$as_me:28326: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28326: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28329: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28329: \$? = $ac_status" >&5
++  echo "$as_me:28332: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -28342,7 +28345,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28345 "configure"
++#line 28348 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28354,16 +28357,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28357: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28360: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28360: \$? = $ac_status" >&5
++  echo "$as_me:28363: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28363: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28366: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28366: \$? = $ac_status" >&5
++  echo "$as_me:28369: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -28379,7 +28382,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 28382 "configure"
++#line 28385 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28391,16 +28394,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28394: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28397: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28397: \$? = $ac_status" >&5
++  echo "$as_me:28400: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28400: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28403: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28403: \$? = $ac_status" >&5
++  echo "$as_me:28406: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -28413,12 +28416,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:28416: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:28419: 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 28421 "configure"
++#line 28424 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28434,15 +28437,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:28437: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28440: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28440: \$? = $ac_status" >&5
++  echo "$as_me:28443: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:28442: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28445: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28445: \$? = $ac_status" >&5
++  echo "$as_me:28448: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -28458,7 +28461,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:28461: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:28464: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&6
+ 
+-echo "${as_me:-configure}:28474: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:28477: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -28489,7 +28492,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:28492: checking for library subsets" >&5
++echo "$as_me:28495: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -28543,7 +28546,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:28546: result: $LIB_SUBSETS" >&5
++echo "$as_me:28549: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -28574,7 +28577,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:28577: checking default library suffix" >&5
++echo "$as_me:28580: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28585,10 +28588,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:28588: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:28591: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:28591: checking default library-dependency suffix" >&5
++echo "$as_me:28594: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -28671,10 +28674,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:28674: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28677: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:28677: checking default object directory" >&5
++echo "$as_me:28680: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28690,11 +28693,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:28693: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28696: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28697: checking c++ library-dependency suffix" >&5
++echo "$as_me:28700: 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++)
+@@ -28787,7 +28790,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:28790: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:28793: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -28963,19 +28966,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:28966: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:28969: 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:28975: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:28978: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28978: \$? = $ac_status" >&5
++  echo "$as_me:28981: \$? = $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
+@@ -28986,10 +28989,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28989 "configure"
++#line 28992 "configure"
+ #include "confdefs.h"
+ 
+-#line 28992 "configure"
++#line 28995 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -29004,16 +29007,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:29007: \"$ac_link\"") >&5
++if { (eval echo "$as_me:29010: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:29010: \$? = $ac_status" >&5
++  echo "$as_me:29013: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:29013: \"$ac_try\"") >&5
++  { (eval echo "$as_me:29016: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:29016: \$? = $ac_status" >&5
++  echo "$as_me:29019: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -29036,7 +29039,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:29039: result: $cf_ldflags_static" >&5
++	echo "$as_me:29042: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test "$cf_ldflags_static" != yes
+@@ -29052,7 +29055,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29055: checking where we will install curses.h" >&5
++echo "$as_me:29058: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -29062,7 +29065,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:29065: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:29068: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -29070,7 +29073,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:29073: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:29076: 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
+@@ -29095,7 +29098,7 @@
+ 
+ # pkgsrc uses these
+ 
+-echo "$as_me:29098: checking for desired basename for form library" >&5
++echo "$as_me:29101: 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.
+@@ -29115,10 +29118,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29118: result: $FORM_NAME" >&5
++echo "$as_me:29121: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:29121: checking for desired basename for menu library" >&5
++echo "$as_me:29124: 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.
+@@ -29138,10 +29141,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29141: result: $MENU_NAME" >&5
++echo "$as_me:29144: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:29144: checking for desired basename for panel library" >&5
++echo "$as_me:29147: 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.
+@@ -29161,10 +29164,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29164: result: $PANEL_NAME" >&5
++echo "$as_me:29167: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:29167: checking for desired basename for cxx library" >&5
++echo "$as_me:29170: 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.
+@@ -29184,13 +29187,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29187: result: $CXX_NAME" >&5
++echo "$as_me:29190: 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:29193: checking for src modules" >&5
++echo "$as_me:29196: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -29249,7 +29252,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:29252: result: $cf_cv_src_modules" >&5
++echo "$as_me:29255: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -29410,7 +29413,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:29413: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:29416: 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//'`
+@@ -29421,7 +29424,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:29424: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
++echo "$as_me:29427: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -29437,7 +29440,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:29440: result: $PKG_CFLAGS" >&5
++echo "$as_me:29443: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ case "$cf_cv_system_name" in
+@@ -29509,7 +29512,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
+ 
+-echo "${as_me:-configure}:29512: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
++echo "${as_me:-configure}:29515: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+ 
+ fi
+ 
+@@ -29536,7 +29539,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:29539: checking for linker search path" >&5
++echo "$as_me:29542: 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
+@@ -29584,7 +29587,7 @@
+ 			cf_pathlist="$cf_pathlist /lib /usr/lib"
+ 			;;
+ 		(*)
+-			{ echo "$as_me:29587: WARNING: problem with Solaris architecture" >&5
++			{ echo "$as_me:29590: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ 			;;
+ 		esac
+@@ -29625,7 +29628,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:29628: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29631: 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'`
+@@ -29711,7 +29714,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29714: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29717: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -29892,7 +29895,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:29895: error: ambiguous option: $1
++    { { echo "$as_me:29898: 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;}
+@@ -29911,7 +29914,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:29914: error: unrecognized option: $1
++  -*) { { echo "$as_me:29917: 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;}
+@@ -30043,7 +30046,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:30046: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:30049: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -30568,7 +30571,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:30571: creating $ac_file" >&5
++    { echo "$as_me:30574: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -30586,7 +30589,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30589: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30592: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -30599,7 +30602,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30602: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30605: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30615,7 +30618,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:30618: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:30621: 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;}
+@@ -30624,7 +30627,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:30627: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:30630: 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;}
+@@ -30669,7 +30672,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:30672: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:30675: 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;}
+@@ -30680,7 +30683,7 @@
+     $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:30683: WARNING: Some variables may not be substituted:
++      { echo "$as_me:30686: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30729,7 +30732,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:30732: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:30735: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -30740,7 +30743,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30743: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30746: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -30753,7 +30756,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30756: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30759: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30811,7 +30814,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:30814: $ac_file is unchanged" >&5
++      { echo "$as_me:30817: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -31198,7 +31201,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}:31201: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:31204: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: dist.mk
+Prereq:  1.1642 
+--- ncurses-6.5-20241123+/dist.mk	2024-11-23 10:51:23.000000000 +0000
++++ ncurses-6.5-20241130/dist.mk	2024-11-30 10:55:07.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1642 2024/11/23 10:51:23 tom Exp $
++# $Id: dist.mk,v 1.1643 2024/11/30 10:55: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 = 5
+-NCURSES_PATCH = 20241123
++NCURSES_PATCH = 20241130
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: form/fld_def.c
+Prereq:  1.44 
+--- ncurses-6.5-20241123+/form/fld_def.c	2021-03-27 23:49:53.000000000 +0000
++++ ncurses-6.5-20241130/form/fld_def.c	2024-11-30 21:41:08.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2014 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -33,7 +33,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fld_def.c,v 1.44 2021/03/27 23:49:53 tom Exp $")
++MODULE_ID("$Id: fld_def.c,v 1.45 2024/11/30 21:41:08 tom Exp $")
+ 
+ /* this can't be readonly */
+ static FIELD default_field =
+@@ -313,7 +313,7 @@
+ 	  size_t len;
+ 
+ 	  len = Total_Buffer_Size(New_Field);
+-	  if ((New_Field->buf = (FIELD_CELL *)malloc(len)))
++	  if ((New_Field->buf = (FIELD_CELL *)malloc(len)) != NULL)
+ 	    {
+ 	      /* Prefill buffers with blanks and insert terminating zeroes
+ 	         between buffers */
+Index: form/fld_dup.c
+Prereq:  1.18 
+--- ncurses-6.5-20241123+/form/fld_dup.c	2020-05-24 01:40:20.000000000 +0000
++++ ncurses-6.5-20241130/form/fld_dup.c	2024-11-30 21:40:55.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2010,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -33,7 +33,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fld_dup.c,v 1.18 2020/05/24 01:40:20 anonymous.maarten Exp $")
++MODULE_ID("$Id: fld_dup.c,v 1.19 2024/11/30 21:40:55 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnform
+@@ -83,7 +83,7 @@
+ 	  size_t len;
+ 
+ 	  len = Total_Buffer_Size(New_Field);
+-	  if ((New_Field->buf = (FIELD_CELL *)malloc(len * 20)))
++	  if ((New_Field->buf = (FIELD_CELL *)malloc(len * 20)) != NULL)
+ 	    {
+ 	      memcpy(New_Field->buf, field->buf, len);
+ 	      returnField(New_Field);
+Index: menu/mf_common.h
+Prereq:  0.25 
+--- ncurses-6.5-20241123+/menu/mf_common.h	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241130/menu/mf_common.h	2024-11-30 21:41:20.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2005,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -31,7 +31,7 @@
+  *   Author:  Juergen Pfeifer, 1995,1997                                    *
+  ****************************************************************************/
+ 
+-/* $Id: mf_common.h,v 0.25 2020/02/02 23:34:34 tom Exp $ */
++/* $Id: mf_common.h,v 0.26 2024/11/30 21:41:20 tom Exp $ */
+ 
+ /* Common internal header for menu and form library */
+ 
+@@ -64,7 +64,7 @@
+ #if USE_RCS_IDS
+ #define MODULE_ID(id) static const char Ident[] = id;
+ #else
+-#define MODULE_ID(id)		/*nothing */
++#define MODULE_ID(id)		/* nothing */
+ #endif
+ 
+ /* Maximum regular 8-bit character code */
+Index: ncurses/base/lib_addch.c
+Prereq:  1.142 
+--- ncurses-6.5-20241123+/ncurses/base/lib_addch.c	2024-07-27 19:22:23.000000000 +0000
++++ ncurses-6.5-20241130/ncurses/base/lib_addch.c	2024-11-30 21:18:07.000000000 +0000
+@@ -37,7 +37,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: lib_addch.c,v 1.142 2024/07/27 19:22:23 tom Exp $")
++MODULE_ID("$Id: lib_addch.c,v 1.143 2024/11/30 21:18:07 tom Exp $")
+ 
+ static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
+ 
+@@ -456,7 +456,7 @@
+ 	       s[1] == 0
+ 	)
+ 	|| (
+-	       (isprint((int) t) && !iscntrl((int) t))
++	       (isprint(UChar(t)) && !iscntrl(UChar(t)))
+ #if USE_WIDEC_SUPPORT
+ 	       || ((sp == 0 || !sp->_legacy_coding) &&
+ 		   (WINDOW_EXT(win, addch_used)
+Index: ncurses/curses.priv.h
+Prereq:  1.695 
+--- ncurses-6.5-20241123+/ncurses/curses.priv.h	2024-11-23 18:40:45.000000000 +0000
++++ ncurses-6.5-20241130/ncurses/curses.priv.h	2024-11-30 21:32:44.000000000 +0000
+@@ -35,7 +35,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: curses.priv.h,v 1.695 2024/11/23 18:40:45 tom Exp $
++ * $Id: curses.priv.h,v 1.696 2024/11/30 21:32:44 tom Exp $
+  *
+  *	curses.priv.h
+  *
+@@ -59,7 +59,7 @@
+ #if USE_RCS_IDS
+ #define MODULE_ID(id) static const char Ident[] = id;
+ #else
+-#define MODULE_ID(id) /*nothing*/
++#define MODULE_ID(id)		/* nothing */
+ #endif
+ 
+ #include 		/* for offsetof */
+Index: ncurses/tinfo/comp_expand.c
+Prereq:  1.35 
+--- ncurses-6.5-20241123+/ncurses/tinfo/comp_expand.c	2023-04-28 20:59:06.000000000 +0000
++++ ncurses-6.5-20241130/ncurses/tinfo/comp_expand.c	2024-11-30 21:24:57.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2021,2023 Thomas E. Dickey                                *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -36,7 +36,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: comp_expand.c,v 1.35 2023/04/28 20:59:06 tom Exp $")
++MODULE_ID("$Id: comp_expand.c,v 1.36 2024/11/30 21:24:57 tom Exp $")
+ 
+ #if 0
+ #define DEBUG_THIS(p) DEBUG(9, p)
+@@ -129,7 +129,7 @@
+ 		    if (dst != 0
+ 			&& *dst == R_BRACE
+ 			&& value < 127
+-			&& isprint((int) value)) {
++			&& isprint(UChar(value))) {
+ 			ch = (int) value;
+ 			buffer[bufp++] = S_QUOTE;
+ 			if (ch == '\\'
+Index: ncurses/tinfo/hashed_db.c
+Prereq:  1.20 
+--- ncurses-6.5-20241123+/ncurses/tinfo/hashed_db.c	2024-11-09 19:23:11.000000000 +0000
++++ ncurses-6.5-20241130/ncurses/tinfo/hashed_db.c	2024-11-30 21:16:41.000000000 +0000
+@@ -37,7 +37,7 @@
+ 
+ #if USE_HASHED_DB
+ 
+-MODULE_ID("$Id: hashed_db.c,v 1.20 2024/11/09 19:23:11 tom Exp $")
++MODULE_ID("$Id: hashed_db.c,v 1.21 2024/11/30 21:16:41 tom Exp $")
+ 
+ #if HASHED_DB_API >= 2
+ static DBC *cursor;
+@@ -167,6 +167,8 @@
+ 			     DB_HASH,
+ 			     NULL)) == 0) {
+ 	    code = errno;
++	} else {
++	    code = 0;
+ 	}
+ #endif
+ 	if (result != NULL && make_connection(result, path, modify)) {
+Index: ncurses/trace/visbuf.c
+Prereq:  1.54 
+--- ncurses-6.5-20241123+/ncurses/trace/visbuf.c	2023-05-27 20:13:10.000000000 +0000
++++ ncurses-6.5-20241130/ncurses/trace/visbuf.c	2024-11-30 21:24:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2021,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2001-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -43,7 +43,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: visbuf.c,v 1.54 2023/05/27 20:13:10 tom Exp $")
++MODULE_ID("$Id: visbuf.c,v 1.55 2024/11/30 21:24:09 tom Exp $")
+ 
+ #define NUM_VISBUFS 4
+ 
+@@ -72,7 +72,7 @@
+     } else if (c == '"' || c == '\\') {
+ 	*tp++ = '\\';
+ 	*tp++ = (char) c;
+-    } else if (is7bits((int) c) && (isgraph((int) c) || c == ' ')) {
++    } else if (is7bits(UChar(c)) && (isgraph(UChar(c)) || c == ' ')) {
+ 	*tp++ = (char) c;
+     } else if (c == '\n') {
+ 	*tp++ = '\\';
+Index: ncurses/win32con/win_driver.c
+Prereq:  1.75 
+--- ncurses-6.5-20241123+/ncurses/win32con/win_driver.c	2024-07-20 17:04:48.000000000 +0000
++++ ncurses-6.5-20241130/ncurses/win32con/win_driver.c	2024-11-28 00:17:49.000000000 +0000
+@@ -57,7 +57,7 @@
+ 
+ #define CONTROL_PRESSED (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)
+ 
+-MODULE_ID("$Id: win_driver.c,v 1.75 2024/07/20 17:04:48 tom Exp $")
++MODULE_ID("$Id: win_driver.c,v 1.76 2024/11/28 00:17:49 tom Exp $")
+ 
+ #define TypeAlloca(type,count) (type*) _alloca(sizeof(type) * (size_t) (count))
+ 
+@@ -96,7 +96,8 @@
+     GenMap(VK_RIGHT,  KEY_RIGHT),
+     GenMap(VK_DOWN,   KEY_DOWN),
+     GenMap(VK_DELETE, KEY_DC),
+-    GenMap(VK_INSERT, KEY_IC)
++    GenMap(VK_INSERT, KEY_IC),
++    GenMap(VK_TAB,    KEY_BTAB)
+ };
+ static const LONG ansi_keys[] =
+ {
+@@ -109,7 +110,8 @@
+     GenMap(VK_RIGHT,  'M'),
+     GenMap(VK_DOWN,   'P'),
+     GenMap(VK_DELETE, 'S'),
+-    GenMap(VK_INSERT, 'R')
++    GenMap(VK_INSERT, 'R'),
++    GenMap(VK_TAB,    'Z')
+ };
+ /* *INDENT-ON* */
+ #define N_INI ((int)array_length(keylist))
+@@ -2154,6 +2156,11 @@
+ 			  & (SHIFT_PRESSED | CONTROL_PRESSED))) {
+ 			*buf = KEY_BACKSPACE;
+ 		    }
++		} else if (vk == VK_TAB) {
++		    if ((inp_rec.Event.KeyEvent.dwControlKeyState
++			 & (SHIFT_PRESSED | CONTROL_PRESSED))) {
++			*buf = KEY_BTAB;
++		    }
+ 		}
+ 		break;
+ 	    } else if (inp_rec.EventType == MOUSE_EVENT) {
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20241123+/package/debian-mingw/changelog	2024-11-23 10:51:23.000000000 +0000
++++ ncurses-6.5-20241130/package/debian-mingw/changelog	2024-11-27 21:55:07.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241123) unstable; urgency=low
++ncurses6td (6.5+20241130) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 23 Nov 2024 05:51:23 -0500
++ -- Thomas E. Dickey   Wed, 27 Nov 2024 16:55:07 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20241123+/package/debian-mingw64/changelog	2024-11-23 10:51:23.000000000 +0000
++++ ncurses-6.5-20241130/package/debian-mingw64/changelog	2024-11-27 21:55:07.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241123) unstable; urgency=low
++ncurses6td (6.5+20241130) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 23 Nov 2024 05:51:23 -0500
++ -- Thomas E. Dickey   Wed, 27 Nov 2024 16:55:07 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20241123+/package/debian/changelog	2024-11-23 10:51:23.000000000 +0000
++++ ncurses-6.5-20241130/package/debian/changelog	2024-11-27 21:55:07.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241123) unstable; urgency=low
++ncurses6td (6.5+20241130) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 23 Nov 2024 05:51:23 -0500
++ -- Thomas E. Dickey   Wed, 27 Nov 2024 16:55:07 -0500
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.677 
+--- ncurses-6.5-20241123+/package/mingw-ncurses.nsi	2024-11-23 10:51:23.000000000 +0000
++++ ncurses-6.5-20241130/package/mingw-ncurses.nsi	2024-11-27 21:55:07.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.677 2024/11/23 10:51:23 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.678 2024/11/27 21:55:07 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "1123"
++!define VERSION_MMDD  "1130"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20241123+/package/mingw-ncurses.spec	2024-11-23 10:51:23.000000000 +0000
++++ ncurses-6.5-20241130/package/mingw-ncurses.spec	2024-11-27 21:55:07.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20241123
++Release: 20241130
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20241123+/package/ncurses.spec	2024-11-23 10:51:23.000000000 +0000
++++ ncurses-6.5-20241130/package/ncurses.spec	2024-11-27 21:55:07.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20241123
++Release: 20241130
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20241123+/package/ncursest.spec	2024-11-23 10:51:23.000000000 +0000
++++ ncurses-6.5-20241130/package/ncursest.spec	2024-11-27 21:55:07.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20241123
++Release: 20241130
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/infocmp.c
+Prereq:  1.168 
+--- ncurses-6.5-20241123+/progs/infocmp.c	2024-11-23 19:54:44.000000000 +0000
++++ ncurses-6.5-20241130/progs/infocmp.c	2024-11-30 21:29:41.000000000 +0000
+@@ -43,7 +43,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: infocmp.c,v 1.168 2024/11/23 19:54:44 tom Exp $")
++MODULE_ID("$Id: infocmp.c,v 1.169 2024/11/30 21:29:41 tom Exp $")
+ 
+ #ifndef ACTUAL_TIC
+ #define ACTUAL_TIC "tic"
+@@ -835,7 +835,7 @@
+ 		_nc_STRCAT(dst, ep, MAX_TERMINFO_LENGTH);
+ 	    _nc_STRCAT(dst, ";", MAX_TERMINFO_LENGTH);
+ 	} while
+-	    ((ep = strtok((char *) 0, ";")));
++	    ((ep = strtok((char *) 0, ";")) != NULL);
+ 
+ 	dst[strlen(dst) - 1] = '\0';
+ 
+Index: progs/tic.c
+Prereq:  1.328 
+--- ncurses-6.5-20241123+/progs/tic.c	2024-11-09 23:03:26.000000000 +0000
++++ ncurses-6.5-20241130/progs/tic.c	2024-11-30 21:29:07.000000000 +0000
+@@ -49,7 +49,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: tic.c,v 1.328 2024/11/09 23:03:26 tom Exp $")
++MODULE_ID("$Id: tic.c,v 1.329 2024/11/30 21:29:07 tom Exp $")
+ 
+ #define STDIN_NAME ""
+ 
+@@ -231,7 +231,7 @@
+ 			&& value > 0
+ 			&& value != '\\'	/* FIXME */
+ 			&& value < 127
+-			&& isprint((int) value)) {
++			&& isprint(UChar(value))) {
+ 			*d++ = S_QUOTE;
+ 			*d++ = (char) value;
+ 			*d++ = S_QUOTE;
+@@ -659,8 +659,8 @@
+ 	tried = outdir;
+     }
+ 
+-    if ((outdir = _nc_home_terminfo())) {
+-	if ((result = valid_db_path(outdir)) != 0) {
++    if ((outdir = _nc_home_terminfo()) != NULL) {
++	if ((result = valid_db_path(outdir)) != NULL) {
+ 	    printf("%s\n", result);
+ 	    free(result);
+ 	} else if (!specific) {
+@@ -2025,7 +2025,7 @@
+ 		_nc_warning("expected character after %% in %s", name);
+ 		break;
+ 	    } else if (*s == 'p') {
+-		if (*++s == '\0' || !isdigit((int) *s)) {
++		if (*++s == '\0' || !isdigit(UChar(*s))) {
+ 		    _nc_warning("expected digit after %%p in %s", name);
+ 		    return;
+ 		} else {
+Index: progs/tput.c
+Prereq:  1.105 
+--- ncurses-6.5-20241123+/progs/tput.c	2024-11-23 19:38:51.000000000 +0000
++++ ncurses-6.5-20241130/progs/tput.c	2024-11-30 21:47:34.000000000 +0000
+@@ -47,7 +47,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: tput.c,v 1.105 2024/11/23 19:38:51 tom Exp $")
++MODULE_ID("$Id: tput.c,v 1.106 2024/11/30 21:47:34 tom Exp $")
+ 
+ #define PUTS(s)		fputs(s, stdout)
+ 
+@@ -120,11 +120,11 @@
+     static char my_clear[] = "clear";
+ 
+     char *result = name;
+-    if ((is_init = same_program(name, program ? PROG_INIT : my_init)))
++    if ((is_init = same_program(name, program ? PROG_INIT : my_init)) == TRUE)
+ 	result = my_init;
+-    if ((is_reset = same_program(name, program ? PROG_RESET : my_reset)))
++    if ((is_reset = same_program(name, program ? PROG_RESET : my_reset)) == TRUE)
+ 	result = my_reset;
+-    if ((is_clear = same_program(name, program ? PROG_CLEAR : my_clear)))
++    if ((is_clear = same_program(name, program ? PROG_CLEAR : my_clear)) == TRUE)
+ 	result = my_clear;
+     return result;
+ }
+Index: progs/tset.c
+Prereq:  1.137 
+--- ncurses-6.5-20241123+/progs/tset.c	2024-11-23 19:39:01.000000000 +0000
++++ ncurses-6.5-20241130/progs/tset.c	2024-11-30 21:30:49.000000000 +0000
+@@ -98,7 +98,7 @@
+ char *ttyname(int fd);
+ #endif
+ 
+-MODULE_ID("$Id: tset.c,v 1.137 2024/11/23 19:39:01 tom Exp $")
++MODULE_ID("$Id: tset.c,v 1.138 2024/11/30 21:30:49 tom Exp $")
+ 
+ #ifndef environ
+ extern char **environ;
+@@ -574,7 +574,7 @@
+ 	 * there's an /etc/ttys to look up device-to-type mappings in.
+ 	 * Try ttyname(3); check for dialup or other mapping.
+ 	 */
+-	if ((t = getttynam(p))) {
++	if ((t = getttynam(p)) != NULL) {
+ 	    ttype = t->ty_type;
+ 	    goto map;
+ 	}
+Index: test/aclocal.m4
+Prereq:  1.229 
+--- ncurses-6.5-20241123+/test/aclocal.m4	2024-11-09 23:15:41.000000000 +0000
++++ ncurses-6.5-20241130/test/aclocal.m4	2024-11-30 19:43:11.000000000 +0000
+@@ -27,7 +27,7 @@
+ dnl authorization.                                                           *
+ dnl***************************************************************************
+ dnl
+-dnl $Id: aclocal.m4,v 1.229 2024/11/09 23:15:41 tom Exp $
++dnl $Id: aclocal.m4,v 1.230 2024/11/30 19:43:11 tom Exp $
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+@@ -3596,14 +3596,17 @@
+ esac
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_PROG_LINT version: 5 updated: 2022/08/20 15:44:13
++dnl CF_PROG_LINT version: 7 updated: 2024/11/30 14:37:45
+ dnl ------------
+ AC_DEFUN([CF_PROG_LINT],
+ [
+ AC_CHECK_PROGS(LINT, lint cppcheck splint)
+ case "x$LINT" in
++(xlint|x*/lint) # NetBSD 10
++	test -z "$LINT_OPTS" && LINT_OPTS="-chapbrxzgFS -v -Ac11"
++	;;
+ (xcppcheck|x*/cppcheck)
+-	test -z "$LINT_OPTS" && LINT_OPTS="--enable=all"
++	test -z "$LINT_OPTS" && LINT_OPTS="--enable=all -D__CPPCHECK__"
+ 	;;
+ esac
+ AC_SUBST(LINT_OPTS)
+Index: test/back_ground.c
+Prereq:  1.12 
+--- ncurses-6.5-20241123+/test/back_ground.c	2024-09-28 16:19:19.000000000 +0000
++++ ncurses-6.5-20241130/test/back_ground.c	2024-11-30 18:36:56.000000000 +0000
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: back_ground.c,v 1.12 2024/09/28 16:19:19 tom Exp $
++ * $Id: back_ground.c,v 1.14 2024/11/30 18:36:56 tom Exp $
+  */
+ 
+ #include 
+@@ -182,12 +182,12 @@
+ 	," -a       invoke assume_default_colors, repeat to use in init_pair"
+ #endif
+ 	," -b XXX   specify background color"
+-	," -c XXX   specify background character"
++	," -B XXX   specify background character"
+ #if HAVE_USE_DEFAULT_COLORS
+ 	," -d       invoke use_default_colors, repeat to use in init_pair"
+ #endif
+ 	," -f XXX   specify foreground color"
+-	," -l FILE  log window-dumps to this file"
++	," -L FILE  log window-dumps to this file"
+ 	," -w       fill background with stipple pattern"
+ 	," -W CODE  fill background with this Unicode value"
+     };
+@@ -215,7 +215,7 @@
+ 
+     setlocale(LC_ALL, "");
+ 
+-    while ((ch = getopt(argc, argv, OPTS_COMMON "ab:c:df:l:wW:")) != -1) {
++    while ((ch = getopt(argc, argv, OPTS_COMMON "B:L:W:ab:df:w")) != -1) {
+ 	switch (ch) {
+ #if HAVE_ASSUME_DEFAULT_COLORS
+ 	case 'a':
+@@ -225,7 +225,7 @@
+ 	case 'b':
+ 	    default_bg = color_code(optarg);
+ 	    break;
+-	case 'c':
++	case 'B':
+ 	    if (strlen(optarg) > 1) {
+ 		char *check = NULL;
+ 		long value = strtol(optarg, &check, 0);
+@@ -244,7 +244,7 @@
+ 	case 'f':
+ 	    default_fg = color_code(optarg);
+ 	    break;
+-	case 'l':
++	case 'L':
+ 	    if (!open_dump(optarg))
+ 		usage(FALSE);
+ 	    break;
+Index: test/background.c
+Prereq:  1.27 
+--- ncurses-6.5-20241123+/test/background.c	2024-09-22 22:34:49.000000000 +0000
++++ ncurses-6.5-20241130/test/background.c	2024-11-30 18:37:15.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: background.c,v 1.27 2024/09/22 22:34:49 tom Exp $
++ * $Id: background.c,v 1.29 2024/11/30 18:37:15 tom Exp $
+  */
+ 
+ #define NEED_COLOR_CODE 1
+@@ -143,12 +143,12 @@
+ 	," -a       invoke assume_default_colors, repeat to use in init_pair"
+ #endif
+ 	," -b XXX   specify background color"
+-	," -c XXX   specify background character"
++	," -B XXX   specify background character"
+ #if HAVE_USE_DEFAULT_COLORS
+ 	," -d       invoke use_default_colors, repeat to use in init_pair"
+ #endif
+ 	," -f XXX   specify foreground color"
+-	," -l FILE  log window-dumps to this file"
++	," -L FILE  log window-dumps to this file"
+     };
+     size_t n;
+ 
+@@ -174,7 +174,7 @@
+ 
+     setlocale(LC_ALL, "");
+ 
+-    while ((ch = getopt(argc, argv, OPTS_COMMON "ab:c:df:l:")) != -1) {
++    while ((ch = getopt(argc, argv, OPTS_COMMON "B:L:ab:df:")) != -1) {
+ 	switch (ch) {
+ #if HAVE_ASSUME_DEFAULT_COLORS
+ 	case 'a':
+@@ -184,7 +184,7 @@
+ 	case 'b':
+ 	    default_bg = color_code(optarg);
+ 	    break;
+-	case 'c':
++	case 'B':
+ 	    if (strlen(optarg) > 1) {
+ 		char *check = NULL;
+ 		long value = strtol(optarg, &check, 0);
+@@ -203,7 +203,7 @@
+ 	case 'f':
+ 	    default_fg = color_code(optarg);
+ 	    break;
+-	case 'l':
++	case 'L':
+ 	    if (!open_dump(optarg))
+ 		usage(FALSE);
+ 	    break;
+Index: test/bs.c
+Prereq:  1.80 
+--- ncurses-6.5-20241123+/test/bs.c	2024-10-05 19:26:24.000000000 +0000
++++ ncurses-6.5-20241130/test/bs.c	2024-11-30 16:47:02.000000000 +0000
+@@ -35,7 +35,7 @@
+  * v2.0 featuring strict ANSI/POSIX conformance, November 1993.
+  * v2.1 with ncurses mouse support, September 1995
+  *
+- * $Id: bs.c,v 1.80 2024/10/05 19:26:24 tom Exp $
++ * $Id: bs.c,v 1.81 2024/11/30 16:47:02 tom Exp $
+  */
+ 
+ #include 
+@@ -1193,7 +1193,7 @@
+ 	,USAGE_COMMON
+ 	,"Options:"
+ 	," -b       play a blitz game"
+-	," -c       ships may be adjacent"
++	," -p       ships may be packed/adjacent"
+ 	," -s       play a salvo game"
+     };
+     size_t n;
+@@ -1212,7 +1212,7 @@
+ {
+     int ch;
+ 
+-    while ((ch = getopt(argc, argv, OPTS_COMMON "bcs")) != -1) {
++    while ((ch = getopt(argc, argv, OPTS_COMMON "bps")) != -1) {
+ 	switch (ch) {
+ 	case 'b':
+ 	    blitz = 1;
+@@ -1230,7 +1230,7 @@
+ 		ExitProgram(EXIT_FAILURE);
+ 	    }
+ 	    break;
+-	case 'c':
++	case 'p':
+ 	    closepack = 1;
+ 	    break;
+ 	case OPTS_VERSION:
+Index: test/cardfile.c
+Prereq:  1.52 
+--- ncurses-6.5-20241123+/test/cardfile.c	2024-10-05 19:26:24.000000000 +0000
++++ ncurses-6.5-20241130/test/cardfile.c	2024-11-30 16:47:59.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: cardfile.c,v 1.52 2024/10/05 19:26:24 tom Exp $
++ * $Id: cardfile.c,v 1.53 2024/11/30 16:47:59 tom Exp $
+  *
+  * File format: text beginning in column 1 is a title; other text is content.
+  */
+@@ -558,7 +558,7 @@
+ 	,""
+ 	,USAGE_COMMON
+ 	,"Options:"
+-	," -c       use color if terminal supports it"
++	," -C       use color if terminal supports it"
+     };
+     size_t n;
+     for (n = 0; n < SIZEOF(msg); n++)
+@@ -578,9 +578,9 @@
+ 
+     setlocale(LC_ALL, "");
+ 
+-    while ((ch = getopt(argc, argv, OPTS_COMMON "c")) != -1) {
++    while ((ch = getopt(argc, argv, OPTS_COMMON "C")) != -1) {
+ 	switch (ch) {
+-	case 'c':
++	case 'C':
+ 	    try_color = TRUE;
+ 	    break;
+ 	case OPTS_VERSION:
+Index: test/color_content.c
+Prereq:  1.19 
+--- ncurses-6.5-20241123+/test/color_content.c	2023-02-25 16:48:02.000000000 +0000
++++ ncurses-6.5-20241130/test/color_content.c	2024-11-30 18:31:01.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: color_content.c,v 1.19 2023/02/25 16:48:02 tom Exp $
++ * $Id: color_content.c,v 1.21 2024/11/30 18:31:01 tom Exp $
+  */
+ 
+ #define NEED_TIME_H
+@@ -220,10 +220,10 @@
+ 	,"Options:"
+ 	," -f COLOR first color value to test (default: 0)"
+ 	," -i       interactive, showing test-progress"
+-	," -l COLOR last color value to test (default: max_colors-1)"
++	," -F COLOR last color value to test (default: max_colors-1)"
+ 	," -n       do not initialize color pairs"
+ 	," -p       print data for color content instead of testing"
+-	," -r COUNT repeat for given count"
++	," -r NUM   repeat tests NUM times"
+ 	," -s       initialize pairs sequentially rather than random"
+ #if USE_EXTENDED_COLOR
+ 	," -x       use extended color pairs/values"
+@@ -243,7 +243,7 @@
+ {
+     int ch;
+ 
+-    while ((ch = getopt(argc, argv, OPTS_COMMON "f:il:npr:sx")) != -1) {
++    while ((ch = getopt(argc, argv, OPTS_COMMON "f:iF:npr:sx")) != -1) {
+ 	switch (ch) {
+ 	case 'f':
+ 	    if ((f_opt = atoi(optarg)) <= 0)
+@@ -252,7 +252,7 @@
+ 	case 'i':
+ 	    i_opt = 1;
+ 	    break;
+-	case 'l':
++	case 'F':
+ 	    if ((l_opt = atoi(optarg)) <= 0)
+ 		usage(FALSE);
+ 	    break;
+Index: test/combine.c
+Prereq:  1.23 
+--- ncurses-6.5-20241123+/test/combine.c	2022-12-10 22:28:50.000000000 +0000
++++ ncurses-6.5-20241130/test/combine.c	2024-11-30 19:08:20.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2021,2022 Thomas E. Dickey                                     *
++,* Copyright 2021-2022,2024 Thomas E. Dickey                                *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: combine.c,v 1.23 2022/12/10 22:28:50 tom Exp $
++ * $Id: combine.c,v 1.25 2024/11/30 19:08:20 tom Exp $
+  */
+ 
+ #include 
+@@ -37,7 +37,7 @@
+ #include 
+ #include 
+ 
+-static int c_opt;
++static int k_opt;
+ static int r_opt;
+ 
+ static int
+@@ -68,7 +68,7 @@
+     move(row, col);
+     printw("[U+%04X]", over_ch);
+     do {
+-	if (c_opt) {
++	if (k_opt) {
+ 	    wchar_t source[2];
+ 	    cchar_t target;
+ 	    attr_t attr = reverse ? A_REVERSE : A_NORMAL;
+@@ -191,8 +191,8 @@
+ 	,"Demonstrate combining-characters."
+ 	,""
+ 	,"Options:"
+-	," -c       use cchar_t data rather than wchar_t string"
+-	," -l FILE  log window-dumps to this file"
++	," -k       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;
+@@ -215,12 +215,12 @@
+     bool log_option = FALSE;
+     const char *dump_log = "combine.log";
+ 
+-    while ((ch = getopt(argc, argv, OPTS_COMMON "cl:r")) != -1) {
++    while ((ch = getopt(argc, argv, OPTS_COMMON "kL:r")) != -1) {
+ 	switch (ch) {
+-	case 'c':
+-	    c_opt = TRUE;
++	case 'k':
++	    k_opt = TRUE;
+ 	    break;
+-	case 'l':
++	case 'L':
+ 	    log_option = TRUE;
+ 	    if (!open_dump(optarg))
+ 		usage(FALSE);
+@@ -273,7 +273,7 @@
+ 	    left_at = next_char(left_at);
+ 	    break;
+ 	case 'c':
+-	    c_opt = !c_opt;
++	    k_opt = !k_opt;
+ 	    break;
+ 	case 'r':
+ 	    r_opt = !r_opt;
+Index: test/configure
+--- ncurses-6.5-20241123+/test/configure	2024-11-09 23:17:16.000000000 +0000
++++ ncurses-6.5-20241130/test/configure	2024-11-30 19:43:38.000000000 +0000
+@@ -3131,12 +3131,15 @@
+ done
+ 
+ case "x$LINT" in
++(xlint|x*/lint) # NetBSD 10
++	test -z "$LINT_OPTS" && LINT_OPTS="-chapbrxzgFS -v -Ac11"
++	;;
+ (xcppcheck|x*/cppcheck)
+-	test -z "$LINT_OPTS" && LINT_OPTS="--enable=all"
++	test -z "$LINT_OPTS" && LINT_OPTS="--enable=all -D__CPPCHECK__"
+ 	;;
+ esac
+ 
+-echo "$as_me:3139: checking for \".PHONY\" make-support" >&5
++echo "$as_me:3142: 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
+@@ -3191,14 +3194,14 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:3194: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:3197: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+ test "x$cf_cv_make_PHONY" = xyes && MAKE_PHONY=
+ test "x$cf_cv_make_PHONY" != xyes && MAKE_NO_PHONY=
+ 
+-echo "$as_me:3201: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:3204: 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
+@@ -3225,7 +3228,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:3228: result: $cf_cv_mixedcase" >&5
++echo "$as_me:3231: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -3236,7 +3239,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:3239: checking for $ac_word" >&5
++echo "$as_me:3242: 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
+@@ -3251,7 +3254,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:3254: found $ac_dir/$ac_word" >&5
++echo "$as_me:3257: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3259,10 +3262,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:3262: result: $CTAGS" >&5
++  echo "$as_me:3265: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:3265: result: no" >&5
++  echo "$as_me:3268: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3273,7 +3276,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:3276: checking for $ac_word" >&5
++echo "$as_me:3279: 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
+@@ -3288,7 +3291,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:3291: found $ac_dir/$ac_word" >&5
++echo "$as_me:3294: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3296,10 +3299,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:3299: result: $ETAGS" >&5
++  echo "$as_me:3302: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:3302: result: no" >&5
++  echo "$as_me:3305: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3308,7 +3311,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:3311: checking for $ac_word" >&5
++echo "$as_me:3314: 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
+@@ -3323,7 +3326,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:3326: found $ac_dir/$ac_word" >&5
++echo "$as_me:3329: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3332,17 +3335,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:3335: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:3338: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:3338: result: no" >&5
++  echo "$as_me:3341: 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:3345: checking for $ac_word" >&5
++echo "$as_me:3348: 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
+@@ -3357,7 +3360,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:3360: found $ac_dir/$ac_word" >&5
++echo "$as_me:3363: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3366,10 +3369,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:3369: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:3372: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:3372: result: no" >&5
++  echo "$as_me:3375: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3389,14 +3392,14 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:3392: checking if -lm needed for math functions" >&5
++echo "$as_me:3395: 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 3399 "configure"
++#line 3402 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -3412,16 +3415,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3415: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3418: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3418: \$? = $ac_status" >&5
++  echo "$as_me:3421: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:3421: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3424: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3424: \$? = $ac_status" >&5
++  echo "$as_me:3427: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -3431,7 +3434,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3434: result: $cf_cv_need_libm" >&5
++echo "$as_me:3437: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ 
+ if test "$cf_cv_need_libm" = yes
+@@ -3439,14 +3442,14 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lm"
+-	echo "$as_me:3442: checking if -lm is available for math functions" >&5
++	echo "$as_me:3445: checking if -lm is available for math functions" >&5
+ echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
+ if test "${cf_cv_have_libm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3449 "configure"
++#line 3452 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -3462,16 +3465,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3465: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3468: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3468: \$? = $ac_status" >&5
++  echo "$as_me:3471: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:3471: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3474: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3474: \$? = $ac_status" >&5
++  echo "$as_me:3477: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_libm=yes
+ else
+@@ -3481,7 +3484,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3484: result: $cf_cv_have_libm" >&5
++echo "$as_me:3487: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ 	LIBS="$cf_save_LIBS"
+ 
+@@ -3536,7 +3539,7 @@
+ cf_cv_screen=curses
+ cf_cv_libtype=
+ 
+-echo "$as_me:3539: checking for fgrep" >&5
++echo "$as_me:3542: checking for fgrep" >&5
+ echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
+ if test "${ac_cv_path_FGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3548,7 +3551,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:3551: checking for $ac_word" >&5
++echo "$as_me:3554: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_FGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3565,7 +3568,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_FGREP="$ac_dir/$ac_word"
+-   echo "$as_me:3568: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3571: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3576,10 +3579,10 @@
+ FGREP=$ac_cv_path_FGREP
+ 
+ if test -n "$FGREP"; then
+-  echo "$as_me:3579: result: $FGREP" >&5
++  echo "$as_me:3582: result: $FGREP" >&5
+ echo "${ECHO_T}$FGREP" >&6
+ else
+-  echo "$as_me:3582: result: no" >&5
++  echo "$as_me:3585: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3587,16 +3590,16 @@
+ done
+ test -n "$FGREP" || FGREP=": "
+ 
+-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3590: error: cannot find workable fgrep" >&5
++     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3593: error: cannot find workable fgrep" >&5
+ echo "$as_me: error: cannot find workable fgrep" >&2;}
+    { (exit 1); exit 1; }; }
+    fi
+ fi
+-echo "$as_me:3595: result: $ac_cv_path_FGREP" >&5
++echo "$as_me:3598: result: $ac_cv_path_FGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_FGREP" >&6
+  FGREP="$ac_cv_path_FGREP"
+ 
+-echo "$as_me:3599: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:3602: 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.
+@@ -3613,17 +3616,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:3616: result: $enable_stdnoreturn" >&5
++echo "$as_me:3619: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:3620: checking for C11 _Noreturn feature" >&5
++echo "$as_me:3623: 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 3626 "configure"
++#line 3629 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -3639,16 +3642,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3642: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3645: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3645: \$? = $ac_status" >&5
++  echo "$as_me:3648: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3648: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3651: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3651: \$? = $ac_status" >&5
++  echo "$as_me:3654: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -3659,7 +3662,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:3662: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:3665: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -3698,10 +3701,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:3701: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:3704: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -3751,12 +3754,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:3754: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:3757: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3757: \$? = $ac_status" >&5
++  echo "$as_me:3760: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:3759: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:3762: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -3815,7 +3818,7 @@
+ rm -rf ./conftest*
+ fi
+ 
+-echo "$as_me:3818: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:3821: 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.
+@@ -3825,7 +3828,7 @@
+ else
+   enable_string_hacks=no
+ fi;
+-echo "$as_me:3828: result: $enable_string_hacks" >&5
++echo "$as_me:3831: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+ 
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -3834,15 +3837,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:3837: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:3840: 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:3839: checking for strlcat" >&5
++	echo "$as_me:3842: 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 3845 "configure"
++#line 3848 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -3873,16 +3876,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3876: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3879: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3879: \$? = $ac_status" >&5
++  echo "$as_me:3882: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:3882: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3885: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3885: \$? = $ac_status" >&5
++  echo "$as_me:3888: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -3892,7 +3895,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3895: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:3898: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+ 
+@@ -3902,7 +3905,7 @@
+ 
+ else
+ 
+-		echo "$as_me:3905: checking for strlcat in -lbsd" >&5
++		echo "$as_me:3908: 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
+@@ -3910,7 +3913,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3913 "configure"
++#line 3916 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -3929,16 +3932,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:3932: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3935: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3935: \$? = $ac_status" >&5
++  echo "$as_me:3938: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:3938: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3941: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3941: \$? = $ac_status" >&5
++  echo "$as_me:3944: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -3949,7 +3952,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:3952: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:3955: 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
+ 
+@@ -3972,23 +3975,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:3975: checking for $ac_header" >&5
++echo "$as_me:3978: 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 3981 "configure"
++#line 3984 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:3985: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3988: \"$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:3991: \$? = $ac_status" >&5
++  echo "$as_me:3994: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -4007,7 +4010,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:4010: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:4013: 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:4034: 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 4037 "configure"
++#line 4040 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -4065,16 +4068,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:4068: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4071: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4071: \$? = $ac_status" >&5
++  echo "$as_me:4074: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:4074: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4077: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4077: \$? = $ac_status" >&5
++  echo "$as_me:4080: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -4084,7 +4087,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:4087: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:4090: 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:4102: 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 4106 "configure"
++#line 4109 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4122,16 +4125,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4125: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4128: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4128: \$? = $ac_status" >&5
++  echo "$as_me:4131: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4131: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4134: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4134: \$? = $ac_status" >&5
++  echo "$as_me:4137: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -4142,7 +4145,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4145: result: $cf_cv_posix_visible" >&5
++echo "$as_me:4148: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -4184,14 +4187,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:4187: checking if this is the GNU C library" >&5
++echo "$as_me:4190: 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 4194 "configure"
++#line 4197 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4210,16 +4213,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4213: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4216: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4216: \$? = $ac_status" >&5
++  echo "$as_me:4219: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4219: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4222: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4222: \$? = $ac_status" >&5
++  echo "$as_me:4225: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -4230,7 +4233,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4233: result: $cf_cv_gnu_library" >&5
++echo "$as_me:4236: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -4238,7 +4241,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:4241: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:4244: 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
+@@ -4250,7 +4253,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4253 "configure"
++#line 4256 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4269,16 +4272,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4272: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4275: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4275: \$? = $ac_status" >&5
++  echo "$as_me:4278: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4278: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4281: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4281: \$? = $ac_status" >&5
++  echo "$as_me:4284: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -4290,12 +4293,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:4293: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:4296: 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:4298: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:4301: 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
+@@ -4400,7 +4403,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4403 "configure"
++#line 4406 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -4420,16 +4423,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4423: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4426: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4426: \$? = $ac_status" >&5
++  echo "$as_me:4429: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4429: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4432: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4432: \$? = $ac_status" >&5
++  echo "$as_me:4435: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -4440,7 +4443,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4443: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:4446: 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
+@@ -4449,14 +4452,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:4452: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:4455: 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 4459 "configure"
++#line 4462 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4471,16 +4474,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4474: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4477: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4477: \$? = $ac_status" >&5
++  echo "$as_me:4480: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4480: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4483: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4483: \$? = $ac_status" >&5
++  echo "$as_me:4486: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -4587,7 +4590,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4590 "configure"
++#line 4593 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4602,16 +4605,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4605: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4608: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4608: \$? = $ac_status" >&5
++  echo "$as_me:4611: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4611: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4614: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4614: \$? = $ac_status" >&5
++  echo "$as_me:4617: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -4626,12 +4629,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4629: result: $cf_cv_gnu_source" >&5
++echo "$as_me:4632: 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:4634: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:4637: 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
+@@ -4641,7 +4644,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4644 "configure"
++#line 4647 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4656,16 +4659,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4659: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4662: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4662: \$? = $ac_status" >&5
++  echo "$as_me:4665: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4665: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4668: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4668: \$? = $ac_status" >&5
++  echo "$as_me:4671: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -4676,7 +4679,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4679: result: $cf_cv_default_source" >&5
++echo "$as_me:4682: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -4716,16 +4719,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:4719: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:4722: 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}:4725: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:4728: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4728 "configure"
++#line 4731 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4740,16 +4743,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4743: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4746: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4746: \$? = $ac_status" >&5
++  echo "$as_me:4749: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4749: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4752: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4752: \$? = $ac_status" >&5
++  echo "$as_me:4755: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -4770,7 +4773,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4773 "configure"
++#line 4776 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4785,16 +4788,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4788: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4791: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4791: \$? = $ac_status" >&5
++  echo "$as_me:4794: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4794: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4797: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4797: \$? = $ac_status" >&5
++  echo "$as_me:4800: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -4805,7 +4808,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:4808: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:4811: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -4813,10 +4816,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:4816: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:4819: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4819 "configure"
++#line 4822 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4831,16 +4834,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4834: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4837: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4837: \$? = $ac_status" >&5
++  echo "$as_me:4840: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4840: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4843: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4843: \$? = $ac_status" >&5
++  echo "$as_me:4846: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -4856,7 +4859,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:4859: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:4862: 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
+@@ -4973,7 +4976,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:4976: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:4979: 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
+@@ -5005,14 +5008,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:5008: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:5011: 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 5015 "configure"
++#line 5018 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -5030,16 +5033,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5033: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5036: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5036: \$? = $ac_status" >&5
++  echo "$as_me:5039: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5039: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5042: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5042: \$? = $ac_status" >&5
++  echo "$as_me:5045: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -5051,7 +5054,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5054 "configure"
++#line 5057 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -5069,16 +5072,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5072: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5075: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5075: \$? = $ac_status" >&5
++  echo "$as_me:5078: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5078: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5081: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5081: \$? = $ac_status" >&5
++  echo "$as_me:5084: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -5093,7 +5096,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:5096: result: $cf_cv_xopen_source" >&5
++echo "$as_me:5099: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -5253,16 +5256,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:5256: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:5259: 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}:5262: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:5265: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5265 "configure"
++#line 5268 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5277,16 +5280,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5280: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5283: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5283: \$? = $ac_status" >&5
++  echo "$as_me:5286: \$? = $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:5289: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5289: \$? = $ac_status" >&5
++  echo "$as_me:5292: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -5307,7 +5310,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5310 "configure"
++#line 5313 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5322,16 +5325,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5325: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5328: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5328: \$? = $ac_status" >&5
++  echo "$as_me:5331: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5331: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5334: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5334: \$? = $ac_status" >&5
++  echo "$as_me:5337: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5342,7 +5345,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:5345: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:5348: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -5350,10 +5353,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:5353: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:5356: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5356 "configure"
++#line 5359 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5368,16 +5371,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5371: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5374: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5374: \$? = $ac_status" >&5
++  echo "$as_me:5377: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5377: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5380: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5380: \$? = $ac_status" >&5
++  echo "$as_me:5383: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5393,7 +5396,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:5396: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:5399: 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
+@@ -5506,10 +5509,10 @@
+ 	if test "$cf_cv_xopen_source" = no ; then
+ 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+ 
+-echo "${as_me:-configure}:5509: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:5512: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5512 "configure"
++#line 5515 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -5527,23 +5530,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5530: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5533: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5533: \$? = $ac_status" >&5
++  echo "$as_me:5536: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5536: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5539: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5539: \$? = $ac_status" >&5
++  echo "$as_me:5542: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-			{ echo "$as_me:5546: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++			{ echo "$as_me:5549: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ 			CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -5566,7 +5569,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}:5569: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:5572: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -5578,7 +5581,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}:5581: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:5584: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -5666,7 +5669,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:5669: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:5672: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -5676,7 +5679,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:5679: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:5682: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -5686,7 +5689,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}:5689: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:5692: 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"
+@@ -5698,10 +5701,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:5701: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:5704: 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 5704 "configure"
++#line 5707 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5716,16 +5719,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5719: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5722: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5722: \$? = $ac_status" >&5
++  echo "$as_me:5725: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5725: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5728: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5728: \$? = $ac_status" >&5
++  echo "$as_me:5731: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -5734,12 +5737,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:5737: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:5740: 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 5742 "configure"
++#line 5745 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5754,16 +5757,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5757: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5760: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5760: \$? = $ac_status" >&5
++  echo "$as_me:5763: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5763: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5766: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5766: \$? = $ac_status" >&5
++  echo "$as_me:5769: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -5774,19 +5777,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:5777: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:5780: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:5782: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:5785: 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 5789 "configure"
++#line 5792 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -5804,16 +5807,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5807: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5810: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5810: \$? = $ac_status" >&5
++  echo "$as_me:5813: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5813: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5816: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5816: \$? = $ac_status" >&5
++  echo "$as_me:5819: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -5825,7 +5828,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5828 "configure"
++#line 5831 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -5843,16 +5846,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5846: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5849: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5849: \$? = $ac_status" >&5
++  echo "$as_me:5852: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5852: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5855: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5855: \$? = $ac_status" >&5
++  echo "$as_me:5858: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -5867,7 +5870,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:5870: result: $cf_cv_xopen_source" >&5
++echo "$as_me:5873: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -6014,13 +6017,13 @@
+ fi
+ fi # cf_cv_posix_visible
+ 
+-echo "$as_me:6017: checking for ANSI C header files" >&5
++echo "$as_me:6020: 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 6023 "configure"
++#line 6026 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -6028,13 +6031,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:6031: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:6034: \"$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:6037: \$? = $ac_status" >&5
++  echo "$as_me:6040: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6056,7 +6059,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 6059 "configure"
++#line 6062 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6074,7 +6077,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 6077 "configure"
++#line 6080 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6095,7 +6098,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6098 "configure"
++#line 6101 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -6121,15 +6124,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6124: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6127: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6127: \$? = $ac_status" >&5
++  echo "$as_me:6130: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:6129: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6132: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6132: \$? = $ac_status" >&5
++  echo "$as_me:6135: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6142,7 +6145,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:6145: result: $ac_cv_header_stdc" >&5
++echo "$as_me:6148: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -6158,28 +6161,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6161: checking for $ac_header" >&5
++echo "$as_me:6164: 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 6167 "configure"
++#line 6170 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6173: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6176: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6176: \$? = $ac_status" >&5
++  echo "$as_me:6179: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6179: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6182: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6182: \$? = $ac_status" >&5
++  echo "$as_me:6185: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -6189,7 +6192,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6192: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6195: 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:6205: checking whether exit is declared" >&5
+ echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
+ if test "${ac_cv_have_decl_exit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6208 "configure"
++#line 6211 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -6220,16 +6223,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6223: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6226: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6226: \$? = $ac_status" >&5
++  echo "$as_me:6229: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6229: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6232: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6232: \$? = $ac_status" >&5
++  echo "$as_me:6235: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_have_decl_exit=yes
+ else
+@@ -6239,10 +6242,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6242: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:6245: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+ 
+-echo "$as_me:6245: checking for signal global datatype" >&5
++echo "$as_me:6248: 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
+@@ -6254,7 +6257,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6257 "configure"
++#line 6260 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -6278,16 +6281,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6281: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6284: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6284: \$? = $ac_status" >&5
++  echo "$as_me:6287: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6287: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6290: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6290: \$? = $ac_status" >&5
++  echo "$as_me:6293: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -6301,7 +6304,7 @@
+ 
+ fi
+ 
+-echo "$as_me:6304: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:6307: 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:6316: 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 6320 "configure"
++#line 6323 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -6332,23 +6335,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6335: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6338: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6338: \$? = $ac_status" >&5
++  echo "$as_me:6341: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6341: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6344: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6344: \$? = $ac_status" >&5
++  echo "$as_me:6347: \$? = $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 6351 "configure"
++#line 6354 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -6366,16 +6369,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6369: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6372: \"$ac_compile\"") >&5
+   (eval $ac_compile) 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_objext"'
+-  { (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
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -6389,11 +6392,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:6392: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:6395: 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:6396: checking for actual SIGWINCH definition" >&5
++echo "$as_me:6399: 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
+@@ -6404,7 +6407,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6407 "configure"
++#line 6410 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -6426,16 +6429,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6429: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6432: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6432: \$? = $ac_status" >&5
++  echo "$as_me:6435: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6435: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6438: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6438: \$? = $ac_status" >&5
++  echo "$as_me:6441: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -6449,7 +6452,7 @@
+ done
+ 
+ fi
+-echo "$as_me:6452: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:6455: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -6459,13 +6462,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:6462: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:6465: 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 6468 "configure"
++#line 6471 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -6479,16 +6482,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6482: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6485: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6485: \$? = $ac_status" >&5
++  echo "$as_me:6488: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6488: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6491: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6491: \$? = $ac_status" >&5
++  echo "$as_me:6494: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -6499,7 +6502,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:6502: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:6505: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test "$am_cv_langinfo_codeset" = yes; then
+ 
+@@ -6509,7 +6512,7 @@
+ 
+ 	fi
+ 
+-echo "$as_me:6512: checking if you want to use pkg-config" >&5
++echo "$as_me:6515: 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.
+@@ -6519,7 +6522,7 @@
+ else
+   cf_pkg_config=yes
+ fi;
+-echo "$as_me:6522: result: $cf_pkg_config" >&5
++echo "$as_me:6525: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+ 
+ case "$cf_pkg_config" in
+@@ -6531,7 +6534,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:6534: checking for $ac_word" >&5
++echo "$as_me:6537: 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
+@@ -6548,7 +6551,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:6551: found $ac_dir/$ac_word" >&5
++   echo "$as_me:6554: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -6559,10 +6562,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:6562: result: $PKG_CONFIG" >&5
++  echo "$as_me:6565: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+-  echo "$as_me:6565: result: no" >&5
++  echo "$as_me:6568: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6571,7 +6574,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:6574: checking for $ac_word" >&5
++echo "$as_me:6577: 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
+@@ -6588,7 +6591,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:6591: found $ac_dir/$ac_word" >&5
++   echo "$as_me:6594: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -6600,10 +6603,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ 
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  echo "$as_me:6603: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:6606: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+-  echo "$as_me:6606: result: no" >&5
++  echo "$as_me:6609: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6644,18 +6647,18 @@
+ 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:6647: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++	{ { echo "$as_me:6650: 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:6654: WARNING: pkg-config is not installed" >&5
++	{ echo "$as_me:6657: WARNING: pkg-config is not installed" >&5
+ echo "$as_me: WARNING: pkg-config is not installed" >&2;}
+ fi
+ 
+-echo "$as_me:6658: checking if you want to see long compiling messages" >&5
++echo "$as_me:6661: 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.
+@@ -6689,10 +6692,10 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:6692: result: $enableval" >&5
++echo "$as_me:6695: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+-echo "$as_me:6695: checking for an installation directory prefix" >&5
++echo "$as_me:6698: checking for an installation directory prefix" >&5
+ echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-install-prefix or --without-install-prefix was given.
+@@ -6705,10 +6708,10 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:6708: result: ${DESTDIR:-(none)}" >&5
++echo "$as_me:6711: result: ${DESTDIR:-(none)}" >&5
+ echo "${ECHO_T}${DESTDIR:-(none)}" >&6
+ 
+-echo "$as_me:6711: checking if installation directory prefix should be merged" >&5
++echo "$as_me:6714: checking if installation directory prefix should be merged" >&5
+ echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6
+ 
+ # Check whether --enable-install-prefix or --disable-install-prefix was given.
+@@ -6725,7 +6728,7 @@
+ 	cf_install_prefix=no
+ 
+ fi;
+-echo "$as_me:6728: result: $cf_install_prefix" >&5
++echo "$as_me:6731: result: $cf_install_prefix" >&5
+ echo "${ECHO_T}$cf_install_prefix" >&6
+ 
+ if test "$cf_install_prefix" = yes ; then
+@@ -6734,7 +6737,7 @@
+ 	MERGE_PREFIX=''
+ fi
+ 
+-echo "$as_me:6737: checking for ncurses wrap-prefix" >&5
++echo "$as_me:6740: checking for ncurses wrap-prefix" >&5
+ echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given.
+@@ -6744,10 +6747,10 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-echo "$as_me:6747: result: $NCURSES_WRAP_PREFIX" >&5
++echo "$as_me:6750: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ 
+-echo "$as_me:6750: checking if you want to check for wide-character functions" >&5
++echo "$as_me:6753: checking if you want to check for wide-character functions" >&5
+ echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-widec or --disable-widec was given.
+@@ -6764,10 +6767,10 @@
+ 	cf_enable_widec=yes
+ 
+ fi;
+-echo "$as_me:6767: result: $cf_enable_widec" >&5
++echo "$as_me:6770: result: $cf_enable_widec" >&5
+ echo "${ECHO_T}$cf_enable_widec" >&6
+ 
+-echo "$as_me:6770: checking for specific curses-directory" >&5
++echo "$as_me:6773: 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.
+@@ -6777,7 +6780,7 @@
+ else
+   cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:6780: result: $cf_cv_curses_dir" >&5
++echo "$as_me:6783: 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"
+@@ -6806,7 +6809,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:6809: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:6812: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -6842,7 +6845,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6845 "configure"
++#line 6848 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6854,16 +6857,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6857: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6860: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6860: \$? = $ac_status" >&5
++  echo "$as_me:6863: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6863: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6866: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6866: \$? = $ac_status" >&5
++  echo "$as_me:6869: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6880,7 +6883,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}:6883: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6886: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -6916,7 +6919,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}:6919: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6922: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -6929,7 +6932,7 @@
+ 
+ cf_cv_screen=curses
+ 
+-echo "$as_me:6932: checking for specified curses library type" >&5
++echo "$as_me:6935: checking for specified curses library type" >&5
+ echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
+ 
+ # Check whether --with-screen or --without-screen was given.
+@@ -6973,13 +6976,13 @@
+ fi;
+ fi;
+ 
+-echo "$as_me:6976: result: $cf_cv_screen" >&5
++echo "$as_me:6979: result: $cf_cv_screen" >&5
+ echo "${ECHO_T}$cf_cv_screen" >&6
+ 
+ case $cf_cv_screen in
+ (curses|curses_*)
+ 
+-echo "$as_me:6982: checking for extra include directories" >&5
++echo "$as_me:6985: checking for extra include directories" >&5
+ echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
+ if test "${cf_cv_curses_incdir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7005,7 +7008,7 @@
+ esac
+ 
+ fi
+-echo "$as_me:7008: result: $cf_cv_curses_incdir" >&5
++echo "$as_me:7011: result: $cf_cv_curses_incdir" >&5
+ echo "${ECHO_T}$cf_cv_curses_incdir" >&6
+ if test "$cf_cv_curses_incdir" != no
+ then
+@@ -7015,7 +7018,7 @@
+ 
+ fi
+ 
+-echo "$as_me:7018: checking if we have identified curses headers" >&5
++echo "$as_me:7021: 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
+@@ -7027,7 +7030,7 @@
+ 	curses.h  ncurses/ncurses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7030 "configure"
++#line 7033 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -7039,16 +7042,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7042: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7045: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7045: \$? = $ac_status" >&5
++  echo "$as_me:7048: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7048: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7051: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7051: \$? = $ac_status" >&5
++  echo "$as_me:7054: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -7059,11 +7062,11 @@
+ done
+ 
+ fi
+-echo "$as_me:7062: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:7065: 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:7066: error: No curses header-files found" >&5
++	{ { echo "$as_me:7069: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7073,23 +7076,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:7076: checking for $ac_header" >&5
++echo "$as_me:7079: 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 7082 "configure"
++#line 7085 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7086: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7089: \"$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:7092: \$? = $ac_status" >&5
++  echo "$as_me:7095: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7108,7 +7111,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7111: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7114: 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:7124: 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
+@@ -7136,7 +7139,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7139 "configure"
++#line 7142 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -7151,16 +7154,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7154: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7157: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7157: \$? = $ac_status" >&5
++  echo "$as_me:7160: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7160: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7163: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7163: \$? = $ac_status" >&5
++  echo "$as_me:7166: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -7176,7 +7179,7 @@
+ done
+ 
+ fi
+-echo "$as_me:7179: result: $cf_cv_term_header" >&5
++echo "$as_me:7182: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -7208,7 +7211,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:7211: checking for ncurses version" >&5
++echo "$as_me:7214: 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
+@@ -7234,10 +7237,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:7237: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:7240: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7240: \$? = $ac_status" >&5
++  echo "$as_me:7243: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -7247,7 +7250,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7250 "configure"
++#line 7253 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -7274,15 +7277,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:7277: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7280: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7280: \$? = $ac_status" >&5
++  echo "$as_me:7283: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:7282: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7285: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7285: \$? = $ac_status" >&5
++  echo "$as_me:7288: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -7296,17 +7299,17 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:7299: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:7302: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:7306: checking if we have identified curses libraries" >&5
++echo "$as_me:7309: checking if we have identified curses libraries" >&5
+ echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7309 "configure"
++#line 7312 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7318,16 +7321,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7321: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7324: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7324: \$? = $ac_status" >&5
++  echo "$as_me:7327: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7327: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7330: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7330: \$? = $ac_status" >&5
++  echo "$as_me:7333: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -7336,13 +7339,13 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-echo "$as_me:7339: result: $cf_result" >&5
++echo "$as_me:7342: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test "$cf_result" = no ; then
+ case "$host_os" in
+ (freebsd*)
+-	echo "$as_me:7345: checking for tgoto in -lmytinfo" >&5
++	echo "$as_me:7348: 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
+@@ -7350,7 +7353,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7353 "configure"
++#line 7356 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7369,16 +7372,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7372: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7375: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7375: \$? = $ac_status" >&5
++  echo "$as_me:7378: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7378: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7381: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7381: \$? = $ac_status" >&5
++  echo "$as_me:7384: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -7389,7 +7392,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7392: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:7395: 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
+ 
+@@ -7419,7 +7422,7 @@
+ 	# term.h) for cur_colr
+ 	if test "x$cf_cv_screen" = "xcurses_colr"
+ 	then
+-		echo "$as_me:7422: checking for initscr in -lcur_colr" >&5
++		echo "$as_me:7425: checking for initscr in -lcur_colr" >&5
+ echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
+ if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7427,7 +7430,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcur_colr  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7430 "configure"
++#line 7433 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7446,16 +7449,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7449: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7452: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7452: \$? = $ac_status" >&5
++  echo "$as_me:7455: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7455: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7458: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7458: \$? = $ac_status" >&5
++  echo "$as_me:7461: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_cur_colr_initscr=yes
+ else
+@@ -7466,7 +7469,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7469: result: $ac_cv_lib_cur_colr_initscr" >&5
++echo "$as_me:7472: result: $ac_cv_lib_cur_colr_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
+ if test "$ac_cv_lib_cur_colr_initscr" = yes; then
+ 
+@@ -7490,7 +7493,7 @@
+ 
+ else
+ 
+-		echo "$as_me:7493: checking for initscr in -lHcurses" >&5
++		echo "$as_me:7496: checking for initscr in -lHcurses" >&5
+ echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
+ if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7498,7 +7501,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lHcurses  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7501 "configure"
++#line 7504 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7517,16 +7520,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7520: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7523: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7523: \$? = $ac_status" >&5
++  echo "$as_me:7526: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7526: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7529: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7529: \$? = $ac_status" >&5
++  echo "$as_me:7532: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_Hcurses_initscr=yes
+ else
+@@ -7537,7 +7540,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7540: result: $ac_cv_lib_Hcurses_initscr" >&5
++echo "$as_me:7543: result: $ac_cv_lib_Hcurses_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
+ if test "$ac_cv_lib_Hcurses_initscr" = yes; then
+ 
+@@ -7595,7 +7598,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}:7598: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7601: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7624,7 +7627,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}:7627: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7630: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7655,7 +7658,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}:7658: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7661: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7690,7 +7693,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}:7693: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7696: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7734,13 +7737,13 @@
+ 	# because it may be needed to link the test-case for initscr.
+ 	if test "x$cf_term_lib" = x
+ 	then
+-		echo "$as_me:7737: checking for tgoto" >&5
++		echo "$as_me:7740: checking for tgoto" >&5
+ echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
+ if test "${ac_cv_func_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7743 "configure"
++#line 7746 "configure"
+ #include "confdefs.h"
+ #define tgoto autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7771,16 +7774,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7774: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7777: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7777: \$? = $ac_status" >&5
++  echo "$as_me:7780: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7780: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7783: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7783: \$? = $ac_status" >&5
++  echo "$as_me:7786: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_tgoto=yes
+ else
+@@ -7790,7 +7793,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7793: result: $ac_cv_func_tgoto" >&5
++echo "$as_me:7796: result: $ac_cv_func_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_func_tgoto" >&6
+ if test "$ac_cv_func_tgoto" = yes; then
+   cf_term_lib=predefined
+@@ -7799,7 +7802,7 @@
+ 			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
+ 			do
+ 				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
+-echo "$as_me:7802: checking for tgoto in -l$cf_term_lib" >&5
++echo "$as_me:7805: checking for tgoto in -l$cf_term_lib" >&5
+ echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7807,7 +7810,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_term_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7810 "configure"
++#line 7813 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7826,16 +7829,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7829: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7832: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7832: \$? = $ac_status" >&5
++  echo "$as_me:7835: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7835: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7838: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7838: \$? = $ac_status" >&5
++  echo "$as_me:7841: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -7846,7 +7849,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7849: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:7852: 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
+ 
+@@ -7869,10 +7872,10 @@
+ 		do
+ 			LIBS="-l$cf_curs_lib $cf_save_LIBS"
+ 			if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
+-				echo "$as_me:7872: checking if we can link with $cf_curs_lib library" >&5
++				echo "$as_me:7875: checking if we can link with $cf_curs_lib library" >&5
+ echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7875 "configure"
++#line 7878 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7884,16 +7887,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7887: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7890: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7890: \$? = $ac_status" >&5
++  echo "$as_me:7893: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7893: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7896: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7896: \$? = $ac_status" >&5
++  echo "$as_me:7899: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -7902,16 +7905,16 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-				echo "$as_me:7905: result: $cf_result" >&5
++				echo "$as_me:7908: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 				test "$cf_result" = yes && break
+ 			elif test "$cf_curs_lib" = "$cf_term_lib" ; then
+ 				cf_result=no
+ 			elif test "$cf_term_lib" != predefined ; then
+-				echo "$as_me:7911: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
++				echo "$as_me:7914: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+ echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7914 "configure"
++#line 7917 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7923,16 +7926,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7926: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7929: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7929: \$? = $ac_status" >&5
++  echo "$as_me:7932: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7932: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7935: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7935: \$? = $ac_status" >&5
++  echo "$as_me:7938: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=no
+ else
+@@ -7941,7 +7944,7 @@
+ 
+ 					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
+ 					cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7944 "configure"
++#line 7947 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7953,16 +7956,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7956: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7959: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7959: \$? = $ac_status" >&5
++  echo "$as_me:7962: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7962: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7965: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7965: \$? = $ac_status" >&5
++  echo "$as_me:7968: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -7974,13 +7977,13 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-				echo "$as_me:7977: result: $cf_result" >&5
++				echo "$as_me:7980: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 				test "$cf_result" != error && break
+ 			fi
+ 		done
+ 	fi
+-	test "$cf_curs_lib" = unknown && { { echo "$as_me:7983: error: no curses library found" >&5
++	test "$cf_curs_lib" = unknown && { { echo "$as_me:7986: error: no curses library found" >&5
+ echo "$as_me: error: no curses library found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7992,23 +7995,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7995: checking for $ac_header" >&5
++echo "$as_me:7998: 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 8001 "configure"
++#line 8004 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8005: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8008: \"$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:8011: \$? = $ac_status" >&5
++  echo "$as_me:8014: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8027,7 +8030,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8030: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8033: 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:8043: 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
+@@ -8045,7 +8048,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8048 "configure"
++#line 8051 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -8062,16 +8065,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8065: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8068: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8068: \$? = $ac_status" >&5
++  echo "$as_me:8071: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8071: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8074: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8074: \$? = $ac_status" >&5
++  echo "$as_me:8077: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -8083,12 +8086,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:8086: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8089: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8091 "configure"
++#line 8094 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8101,16 +8104,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8104: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8107: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8107: \$? = $ac_status" >&5
++  echo "$as_me:8110: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8110: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8113: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8113: \$? = $ac_status" >&5
++  echo "$as_me:8116: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -8124,7 +8127,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8127 "configure"
++#line 8130 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8137,16 +8140,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8140: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8143: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8143: \$? = $ac_status" >&5
++  echo "$as_me:8146: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8146: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8149: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8149: \$? = $ac_status" >&5
++  echo "$as_me:8152: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -8163,9 +8166,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:8166: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:8169: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:8168: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8171: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -8256,7 +8259,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}:8259: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8262: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -8264,7 +8267,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8267 "configure"
++#line 8270 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8277,21 +8280,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8280: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8283: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8283: \$? = $ac_status" >&5
++  echo "$as_me:8286: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8286: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8289: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8289: \$? = $ac_status" >&5
++  echo "$as_me:8292: \$? = $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}:8294: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8297: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -8309,7 +8312,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:8312: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8315: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -8384,13 +8387,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}:8387: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8390: 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 8393 "configure"
++#line 8396 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8403,21 +8406,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8406: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8409: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8409: \$? = $ac_status" >&5
++  echo "$as_me:8412: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8412: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8415: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8415: \$? = $ac_status" >&5
++  echo "$as_me:8418: \$? = $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}:8420: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8423: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -8459,7 +8462,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8462: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:8465: 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
+@@ -8497,7 +8500,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8500 "configure"
++#line 8503 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8509,16 +8512,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8512: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8515: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8515: \$? = $ac_status" >&5
++  echo "$as_me:8518: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8518: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8521: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8521: \$? = $ac_status" >&5
++  echo "$as_me:8524: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -8535,7 +8538,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}:8538: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8541: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8571,7 +8574,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}:8574: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:8577: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -8601,13 +8604,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:8604: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:8607: 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:8607: result: yes" >&5
++		echo "$as_me:8610: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:8610: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:8613: 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
+ 
+@@ -8740,7 +8743,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8743 "configure"
++#line 8746 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8752,37 +8755,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8755: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8758: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8758: \$? = $ac_status" >&5
++  echo "$as_me:8761: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8761: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8764: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8764: \$? = $ac_status" >&5
++  echo "$as_me:8767: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8770 "configure"
++#line 8773 "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:8777: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8780: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8780: \$? = $ac_status" >&5
++  echo "$as_me:8783: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:8782: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8785: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8785: \$? = $ac_status" >&5
++  echo "$as_me:8788: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -8956,7 +8959,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8959 "configure"
++#line 8962 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8968,37 +8971,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8971: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8974: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8974: \$? = $ac_status" >&5
++  echo "$as_me:8977: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8977: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8980: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8980: \$? = $ac_status" >&5
++  echo "$as_me:8983: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8986 "configure"
++#line 8989 "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:8993: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8996: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8996: \$? = $ac_status" >&5
++  echo "$as_me:8999: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:8998: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9001: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9001: \$? = $ac_status" >&5
++  echo "$as_me:9004: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -9015,7 +9018,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:9018: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:9021: 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"
+@@ -9031,7 +9034,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:9034: checking for terminfo header" >&5
++echo "$as_me:9037: 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
+@@ -9049,7 +9052,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9052 "configure"
++#line 9055 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9064,16 +9067,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9067: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9070: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9070: \$? = $ac_status" >&5
++  echo "$as_me:9073: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9073: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9076: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9076: \$? = $ac_status" >&5
++  echo "$as_me:9079: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -9089,7 +9092,7 @@
+ done
+ 
+ fi
+-echo "$as_me:9092: result: $cf_cv_term_header" >&5
++echo "$as_me:9095: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9124,7 +9127,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:9127: result: no" >&5
++		echo "$as_me:9130: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -9140,7 +9143,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:9143: checking for $ac_word" >&5
++echo "$as_me:9146: 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
+@@ -9155,7 +9158,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:9158: found $ac_dir/$ac_word" >&5
++echo "$as_me:9161: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9163,10 +9166,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:9166: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:9169: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:9169: result: no" >&5
++  echo "$as_me:9172: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9179,7 +9182,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:9182: checking for $ac_word" >&5
++echo "$as_me:9185: 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
+@@ -9194,7 +9197,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:9197: found $ac_dir/$ac_word" >&5
++echo "$as_me:9200: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9202,10 +9205,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:9205: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:9208: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:9208: result: no" >&5
++  echo "$as_me:9211: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9362,7 +9365,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:9365: checking if we have identified curses headers" >&5
++echo "$as_me:9368: 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
+@@ -9374,7 +9377,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9377 "configure"
++#line 9380 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -9386,16 +9389,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9389: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9392: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9392: \$? = $ac_status" >&5
++  echo "$as_me:9395: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9395: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9398: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9398: \$? = $ac_status" >&5
++  echo "$as_me:9401: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -9406,11 +9409,11 @@
+ done
+ 
+ fi
+-echo "$as_me:9409: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:9412: 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:9413: error: No curses header-files found" >&5
++	{ { echo "$as_me:9416: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -9420,23 +9423,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:9423: checking for $ac_header" >&5
++echo "$as_me:9426: 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 9429 "configure"
++#line 9432 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:9433: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:9436: \"$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:9439: \$? = $ac_status" >&5
++  echo "$as_me:9442: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9455,7 +9458,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:9458: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:9461: 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 9514 "configure"
++#line 9517 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9523,16 +9526,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9526: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9529: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9529: \$? = $ac_status" >&5
++  echo "$as_me:9532: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9532: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9535: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9535: \$? = $ac_status" >&5
++  echo "$as_me:9538: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9549,7 +9552,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}:9552: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9555: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9568,7 +9571,7 @@
+ 
+ }
+ 
+-echo "$as_me:9571: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:9574: 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
+@@ -9580,7 +9583,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9583 "configure"
++#line 9586 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -9604,16 +9607,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9607: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9610: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9610: \$? = $ac_status" >&5
++  echo "$as_me:9613: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9613: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9616: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9616: \$? = $ac_status" >&5
++  echo "$as_me:9619: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -9628,14 +9631,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:9631: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:9634: 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:9638: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:9641: 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
+@@ -9756,7 +9759,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9759 "configure"
++#line 9762 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -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
+   :
+ else
+@@ -9794,7 +9797,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}:9797: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9800: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9817,7 +9820,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9820 "configure"
++#line 9823 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -9841,16 +9844,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9844: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9847: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9847: \$? = $ac_status" >&5
++  echo "$as_me:9850: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9850: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9853: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9853: \$? = $ac_status" >&5
++  echo "$as_me:9856: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -9871,12 +9874,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9874: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9877: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:9879: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:9882: 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%/[^/]*$%%'`
+@@ -9912,7 +9915,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9915 "configure"
++#line 9918 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9924,16 +9927,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9927: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9930: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9930: \$? = $ac_status" >&5
++  echo "$as_me:9933: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9933: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9936: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9936: \$? = $ac_status" >&5
++  echo "$as_me:9939: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9950,7 +9953,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}:9953: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9956: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9998,7 +10001,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:10001: checking for terminfo header" >&5
++echo "$as_me:10004: 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
+@@ -10016,7 +10019,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10019 "configure"
++#line 10022 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -10031,16 +10034,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10034: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10037: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10037: \$? = $ac_status" >&5
++  echo "$as_me:10040: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10040: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10043: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10043: \$? = $ac_status" >&5
++  echo "$as_me:10046: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -10056,7 +10059,7 @@
+ done
+ 
+ fi
+-echo "$as_me:10059: result: $cf_cv_term_header" >&5
++echo "$as_me:10062: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10094,7 +10097,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:10097: checking for ncurses version" >&5
++echo "$as_me:10100: 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
+@@ -10120,10 +10123,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:10123: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:10126: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10126: \$? = $ac_status" >&5
++  echo "$as_me:10129: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -10133,7 +10136,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10136 "configure"
++#line 10139 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -10160,15 +10163,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10163: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10166: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10166: \$? = $ac_status" >&5
++  echo "$as_me:10169: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10168: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10171: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10171: \$? = $ac_status" >&5
++  echo "$as_me:10174: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -10182,7 +10185,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:10185: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:10188: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -10195,7 +10198,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:10198: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:10201: 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
+@@ -10203,7 +10206,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10206 "configure"
++#line 10209 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10222,16 +10225,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10225: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10228: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10228: \$? = $ac_status" >&5
++  echo "$as_me:10231: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10231: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10234: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10234: \$? = $ac_status" >&5
++  echo "$as_me:10237: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -10242,10 +10245,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10245: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:10248: 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:10248: checking for initscr in -lgpm" >&5
++  echo "$as_me:10251: 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
+@@ -10253,7 +10256,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10256 "configure"
++#line 10259 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10272,16 +10275,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10275: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10278: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10278: \$? = $ac_status" >&5
++  echo "$as_me:10281: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10281: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10284: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10284: \$? = $ac_status" >&5
++  echo "$as_me:10287: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -10292,7 +10295,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10295: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:10298: 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"
+@@ -10307,7 +10310,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:10310: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:10313: 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
+@@ -10315,7 +10318,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10318 "configure"
++#line 10321 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10334,16 +10337,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10337: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10340: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10340: \$? = $ac_status" >&5
++  echo "$as_me:10343: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10343: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10346: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10346: \$? = $ac_status" >&5
++  echo "$as_me:10349: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -10354,7 +10357,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10357: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:10360: 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"
+@@ -10403,13 +10406,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:10406: checking for initscr" >&5
++	echo "$as_me:10409: 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 10412 "configure"
++#line 10415 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10440,16 +10443,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10443: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10446: \"$ac_link\"") >&5
+   (eval $ac_link) 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_exeext"'
+-  { (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
+   ac_cv_func_initscr=yes
+ else
+@@ -10459,18 +10462,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10462: result: $ac_cv_func_initscr" >&5
++echo "$as_me:10465: 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:10469: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:10472: 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 10473 "configure"
++#line 10476 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10482,25 +10485,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10485: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10488: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10488: \$? = $ac_status" >&5
++  echo "$as_me:10491: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10491: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10494: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10494: \$? = $ac_status" >&5
++  echo "$as_me:10497: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:10496: result: yes" >&5
++  echo "$as_me:10499: 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:10503: result: no" >&5
++echo "$as_me:10506: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -10568,11 +10571,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:10571: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:10574: 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 10575 "configure"
++#line 10578 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10584,25 +10587,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10587: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10590: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10590: \$? = $ac_status" >&5
++  echo "$as_me:10593: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10593: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10596: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10596: \$? = $ac_status" >&5
++  echo "$as_me:10599: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:10598: result: yes" >&5
++  echo "$as_me:10601: 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:10605: result: no" >&5
++echo "$as_me:10608: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -10617,7 +10620,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:10620: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:10623: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -10625,7 +10628,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:10628: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:10631: 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
+@@ -10635,7 +10638,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10638 "configure"
++#line 10641 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10647,23 +10650,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10650: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10653: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10653: \$? = $ac_status" >&5
++  echo "$as_me:10656: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10656: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10659: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10659: \$? = $ac_status" >&5
++  echo "$as_me:10662: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:10661: result: yes" >&5
++  echo "$as_me:10664: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:10666: result: no" >&5
++echo "$as_me:10669: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -10688,13 +10691,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:10691: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:10694: 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:10694: result: yes" >&5
++		echo "$as_me:10697: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:10697: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:10700: 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
+ 
+@@ -10827,7 +10830,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10830 "configure"
++#line 10833 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10839,37 +10842,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10842: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10845: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10845: \$? = $ac_status" >&5
++  echo "$as_me:10848: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10848: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10851: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10851: \$? = $ac_status" >&5
++  echo "$as_me:10854: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10857 "configure"
++#line 10860 "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:10864: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10867: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10867: \$? = $ac_status" >&5
++  echo "$as_me:10870: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10869: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10872: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10872: \$? = $ac_status" >&5
++  echo "$as_me:10875: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -11043,7 +11046,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11046 "configure"
++#line 11049 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11055,37 +11058,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11058: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11061: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11061: \$? = $ac_status" >&5
++  echo "$as_me:11064: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11064: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11067: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11067: \$? = $ac_status" >&5
++  echo "$as_me:11070: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11073 "configure"
++#line 11076 "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:11080: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11083: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11083: \$? = $ac_status" >&5
++  echo "$as_me:11086: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:11085: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11088: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11088: \$? = $ac_status" >&5
++  echo "$as_me:11091: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -11102,7 +11105,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:11105: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:11108: 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"
+@@ -11118,7 +11121,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:11121: checking for terminfo header" >&5
++echo "$as_me:11124: 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
+@@ -11136,7 +11139,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11139 "configure"
++#line 11142 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -11151,16 +11154,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11154: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11157: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11157: \$? = $ac_status" >&5
++  echo "$as_me:11160: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11160: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11163: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11163: \$? = $ac_status" >&5
++  echo "$as_me:11166: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -11176,7 +11179,7 @@
+ done
+ 
+ fi
+-echo "$as_me:11179: result: $cf_cv_term_header" >&5
++echo "$as_me:11182: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -11211,7 +11214,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:11214: result: no" >&5
++		echo "$as_me:11217: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -11227,7 +11230,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:11230: checking for $ac_word" >&5
++echo "$as_me:11233: 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
+@@ -11242,7 +11245,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:11245: found $ac_dir/$ac_word" >&5
++echo "$as_me:11248: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -11250,10 +11253,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:11253: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:11256: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:11256: result: no" >&5
++  echo "$as_me:11259: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -11266,7 +11269,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:11269: checking for $ac_word" >&5
++echo "$as_me:11272: 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
+@@ -11281,7 +11284,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:11284: found $ac_dir/$ac_word" >&5
++echo "$as_me:11287: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -11289,10 +11292,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:11292: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:11295: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:11295: result: no" >&5
++  echo "$as_me:11298: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -11449,7 +11452,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:11452: checking if we have identified curses headers" >&5
++echo "$as_me:11455: 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
+@@ -11461,7 +11464,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11464 "configure"
++#line 11467 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -11473,16 +11476,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11476: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11479: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11479: \$? = $ac_status" >&5
++  echo "$as_me:11482: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11482: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11485: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11485: \$? = $ac_status" >&5
++  echo "$as_me:11488: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -11493,11 +11496,11 @@
+ done
+ 
+ fi
+-echo "$as_me:11496: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:11499: 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:11500: error: No curses header-files found" >&5
++	{ { echo "$as_me:11503: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -11507,23 +11510,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:11510: checking for $ac_header" >&5
++echo "$as_me:11513: 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 11516 "configure"
++#line 11519 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:11520: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:11523: \"$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:11526: \$? = $ac_status" >&5
++  echo "$as_me:11529: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11542,7 +11545,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:11545: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:11548: 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 11601 "configure"
++#line 11604 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11610,16 +11613,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11613: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11616: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11616: \$? = $ac_status" >&5
++  echo "$as_me:11619: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11619: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11622: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11622: \$? = $ac_status" >&5
++  echo "$as_me:11625: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11636,7 +11639,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}:11639: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11642: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -11655,7 +11658,7 @@
+ 
+ }
+ 
+-echo "$as_me:11658: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:11661: 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
+@@ -11667,7 +11670,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11670 "configure"
++#line 11673 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -11691,16 +11694,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11694: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11697: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11697: \$? = $ac_status" >&5
++  echo "$as_me:11700: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11700: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11703: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11703: \$? = $ac_status" >&5
++  echo "$as_me:11706: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -11715,14 +11718,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:11718: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:11721: 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:11725: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:11728: 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
+@@ -11843,7 +11846,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11846 "configure"
++#line 11849 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11855,16 +11858,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11858: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11861: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11861: \$? = $ac_status" >&5
++  echo "$as_me:11864: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11864: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11867: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11867: \$? = $ac_status" >&5
++  echo "$as_me:11870: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11881,7 +11884,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}:11884: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11887: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -11904,7 +11907,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11907 "configure"
++#line 11910 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -11928,16 +11931,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11931: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11934: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11934: \$? = $ac_status" >&5
++  echo "$as_me:11937: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11937: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11940: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11940: \$? = $ac_status" >&5
++  echo "$as_me:11943: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -11958,12 +11961,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11961: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11964: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:11966: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:11969: 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%/[^/]*$%%'`
+@@ -11999,7 +12002,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12002 "configure"
++#line 12005 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12011,16 +12014,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12014: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12017: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12017: \$? = $ac_status" >&5
++  echo "$as_me:12020: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12023: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12023: \$? = $ac_status" >&5
++  echo "$as_me:12026: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -12037,7 +12040,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}:12040: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:12043: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -12085,7 +12088,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:12088: checking for terminfo header" >&5
++echo "$as_me:12091: 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
+@@ -12103,7 +12106,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12106 "configure"
++#line 12109 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -12118,16 +12121,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12121: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12124: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12124: \$? = $ac_status" >&5
++  echo "$as_me:12127: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12127: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12130: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12130: \$? = $ac_status" >&5
++  echo "$as_me:12133: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -12143,7 +12146,7 @@
+ done
+ 
+ fi
+-echo "$as_me:12146: result: $cf_cv_term_header" >&5
++echo "$as_me:12149: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -12181,7 +12184,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:12184: checking for ncurses version" >&5
++echo "$as_me:12187: 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
+@@ -12207,10 +12210,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:12210: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:12213: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12213: \$? = $ac_status" >&5
++  echo "$as_me:12216: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -12220,7 +12223,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12223 "configure"
++#line 12226 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12247,15 +12250,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:12250: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12253: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12253: \$? = $ac_status" >&5
++  echo "$as_me:12256: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:12255: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12258: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12258: \$? = $ac_status" >&5
++  echo "$as_me:12261: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -12269,7 +12272,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:12272: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:12275: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -12282,7 +12285,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:12285: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:12288: 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
+@@ -12290,7 +12293,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12293 "configure"
++#line 12296 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12309,16 +12312,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12312: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12315: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12315: \$? = $ac_status" >&5
++  echo "$as_me:12318: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12318: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12321: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12321: \$? = $ac_status" >&5
++  echo "$as_me:12324: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -12329,10 +12332,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12332: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:12335: 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:12335: checking for initscr in -lgpm" >&5
++  echo "$as_me:12338: 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
+@@ -12340,7 +12343,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12343 "configure"
++#line 12346 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12359,16 +12362,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12362: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12365: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12365: \$? = $ac_status" >&5
++  echo "$as_me:12368: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12368: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12371: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12371: \$? = $ac_status" >&5
++  echo "$as_me:12374: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -12379,7 +12382,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12382: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:12385: 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"
+@@ -12394,7 +12397,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:12397: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:12400: 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
+@@ -12402,7 +12405,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12405 "configure"
++#line 12408 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12421,16 +12424,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12424: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12427: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12427: \$? = $ac_status" >&5
++  echo "$as_me:12430: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12430: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12433: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12433: \$? = $ac_status" >&5
++  echo "$as_me:12436: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -12441,7 +12444,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12444: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:12447: 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"
+@@ -12490,13 +12493,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:12493: checking for initscr" >&5
++	echo "$as_me:12496: 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 12499 "configure"
++#line 12502 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12527,16 +12530,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12530: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12533: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12533: \$? = $ac_status" >&5
++  echo "$as_me:12536: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12536: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12539: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12539: \$? = $ac_status" >&5
++  echo "$as_me:12542: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -12546,18 +12549,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12549: result: $ac_cv_func_initscr" >&5
++echo "$as_me:12552: 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:12556: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:12559: 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 12560 "configure"
++#line 12563 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12569,25 +12572,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12572: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12575: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12575: \$? = $ac_status" >&5
++  echo "$as_me:12578: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12578: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12581: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12581: \$? = $ac_status" >&5
++  echo "$as_me:12584: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:12583: result: yes" >&5
++  echo "$as_me:12586: 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:12590: result: no" >&5
++echo "$as_me:12593: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -12655,11 +12658,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:12658: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:12661: 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 12662 "configure"
++#line 12665 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12671,25 +12674,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12674: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12677: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12677: \$? = $ac_status" >&5
++  echo "$as_me:12680: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12680: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12683: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12683: \$? = $ac_status" >&5
++  echo "$as_me:12686: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:12685: result: yes" >&5
++  echo "$as_me:12688: 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:12692: result: no" >&5
++echo "$as_me:12695: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -12704,7 +12707,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:12707: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:12710: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -12712,7 +12715,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:12715: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:12718: 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
+@@ -12722,7 +12725,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12725 "configure"
++#line 12728 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12734,23 +12737,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12737: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12740: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12740: \$? = $ac_status" >&5
++  echo "$as_me:12743: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12743: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12746: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12746: \$? = $ac_status" >&5
++  echo "$as_me:12749: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:12748: result: yes" >&5
++  echo "$as_me:12751: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:12753: result: no" >&5
++echo "$as_me:12756: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -12770,7 +12773,7 @@
+ 
+ 	;;
+ (pdcurses)
+-	echo "$as_me:12773: checking for X" >&5
++	echo "$as_me:12776: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
+ # Check whether --with-x or --without-x was given.
+@@ -12874,17 +12877,17 @@
+   # Guess where to find include files, by looking for Intrinsic.h.
+   # First, try using that file with no special directory specified.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12877 "configure"
++#line 12880 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:12881: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12884: \"$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:12887: \$? = $ac_status" >&5
++  echo "$as_me:12890: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12917,7 +12920,7 @@
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12920 "configure"
++#line 12923 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12929,16 +12932,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12932: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12935: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12935: \$? = $ac_status" >&5
++  echo "$as_me:12938: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12938: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12941: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12941: \$? = $ac_status" >&5
++  echo "$as_me:12944: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -12976,7 +12979,7 @@
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:12979: result: $have_x" >&5
++  echo "$as_me:12982: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+   no_x=yes
+ else
+@@ -12986,7 +12989,7 @@
+   # Update the cache value to reflect the command line values.
+   ac_cv_have_x="have_x=yes \
+ 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  echo "$as_me:12989: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "$as_me:12992: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+@@ -13013,11 +13016,11 @@
+     # others require no space.  Words are not sufficient . . . .
+     case `(uname -sr) 2>/dev/null` in
+     "SunOS 5"*)
+-      echo "$as_me:13016: checking whether -R must be followed by a space" >&5
++      echo "$as_me:13019: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+       cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13020 "configure"
++#line 13023 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -13029,16 +13032,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13032: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13035: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13035: \$? = $ac_status" >&5
++  echo "$as_me:13038: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13038: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13041: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13041: \$? = $ac_status" >&5
++  echo "$as_me:13044: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_nospace=yes
+ else
+@@ -13048,13 +13051,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+       if test $ac_R_nospace = yes; then
+-	echo "$as_me:13051: result: no" >&5
++	echo "$as_me:13054: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	X_LIBS="$X_LIBS -R$x_libraries"
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13057 "configure"
++#line 13060 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -13066,16 +13069,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13069: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13072: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13072: \$? = $ac_status" >&5
++  echo "$as_me:13075: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13075: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13078: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13078: \$? = $ac_status" >&5
++  echo "$as_me:13081: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_space=yes
+ else
+@@ -13085,11 +13088,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	if test $ac_R_space = yes; then
+-	  echo "$as_me:13088: result: yes" >&5
++	  echo "$as_me:13091: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ 	else
+-	  echo "$as_me:13092: result: neither works" >&5
++	  echo "$as_me:13095: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ 	fi
+       fi
+@@ -13109,7 +13112,7 @@
+     # the Alpha needs dnet_stub (dnet does not exist).
+     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13112 "configure"
++#line 13115 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13128,22 +13131,22 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13131: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13134: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13134: \$? = $ac_status" >&5
++  echo "$as_me:13137: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13137: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13140: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13140: \$? = $ac_status" >&5
++  echo "$as_me:13143: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:13146: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:13149: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13151,7 +13154,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13154 "configure"
++#line 13157 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13170,16 +13173,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13173: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13176: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13176: \$? = $ac_status" >&5
++  echo "$as_me:13179: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13179: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13182: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13182: \$? = $ac_status" >&5
++  echo "$as_me:13185: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -13190,14 +13193,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13193: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:13196: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      echo "$as_me:13200: checking for dnet_ntoa in -ldnet_stub" >&5
++      echo "$as_me:13203: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13205,7 +13208,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13208 "configure"
++#line 13211 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13224,16 +13227,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13227: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13230: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13230: \$? = $ac_status" >&5
++  echo "$as_me:13233: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13233: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13236: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13236: \$? = $ac_status" >&5
++  echo "$as_me:13239: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -13244,7 +13247,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13247: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:13250: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -13263,13 +13266,13 @@
+     # on Irix 5.2, according to T.E. Dickey.
+     # The functions gethostbyname, getservbyname, and inet_addr are
+     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+-    echo "$as_me:13266: checking for gethostbyname" >&5
++    echo "$as_me:13269: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13272 "configure"
++#line 13275 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13300,16 +13303,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13303: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13306: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13306: \$? = $ac_status" >&5
++  echo "$as_me:13309: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13309: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13312: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13312: \$? = $ac_status" >&5
++  echo "$as_me:13315: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gethostbyname=yes
+ else
+@@ -13319,11 +13322,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13322: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:13325: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+-      echo "$as_me:13326: checking for gethostbyname in -lnsl" >&5
++      echo "$as_me:13329: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13331,7 +13334,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13334 "configure"
++#line 13337 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13350,16 +13353,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13353: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13356: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13356: \$? = $ac_status" >&5
++  echo "$as_me:13359: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13359: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13362: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13362: \$? = $ac_status" >&5
++  echo "$as_me:13365: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -13370,14 +13373,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13373: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:13376: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test "$ac_cv_lib_nsl_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+-        echo "$as_me:13380: checking for gethostbyname in -lbsd" >&5
++        echo "$as_me:13383: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13385,7 +13388,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13388 "configure"
++#line 13391 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13404,16 +13407,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13407: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13410: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13410: \$? = $ac_status" >&5
++  echo "$as_me:13413: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13413: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13416: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13416: \$? = $ac_status" >&5
++  echo "$as_me:13419: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -13424,7 +13427,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13427: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:13430: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test "$ac_cv_lib_bsd_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -13440,13 +13443,13 @@
+     # variants that don't use the nameserver (or something).  -lsocket
+     # must be given before -lnsl if both are needed.  We assume that
+     # if connect needs -lnsl, so does gethostbyname.
+-    echo "$as_me:13443: checking for connect" >&5
++    echo "$as_me:13446: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13449 "configure"
++#line 13452 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13477,16 +13480,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13480: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13483: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13483: \$? = $ac_status" >&5
++  echo "$as_me:13486: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13486: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13489: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13489: \$? = $ac_status" >&5
++  echo "$as_me:13492: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_connect=yes
+ else
+@@ -13496,11 +13499,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13499: result: $ac_cv_func_connect" >&5
++echo "$as_me:13502: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+ 
+     if test $ac_cv_func_connect = no; then
+-      echo "$as_me:13503: checking for connect in -lsocket" >&5
++      echo "$as_me:13506: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13508,7 +13511,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13511 "configure"
++#line 13514 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13527,16 +13530,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13530: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13533: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13533: \$? = $ac_status" >&5
++  echo "$as_me:13536: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13536: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13539: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13539: \$? = $ac_status" >&5
++  echo "$as_me:13542: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_socket_connect=yes
+ else
+@@ -13547,7 +13550,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13550: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:13553: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test "$ac_cv_lib_socket_connect" = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -13556,13 +13559,13 @@
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    echo "$as_me:13559: checking for remove" >&5
++    echo "$as_me:13562: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13565 "configure"
++#line 13568 "configure"
+ #include "confdefs.h"
+ #define remove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13593,16 +13596,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13596: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13599: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13599: \$? = $ac_status" >&5
++  echo "$as_me:13602: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13602: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13605: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13605: \$? = $ac_status" >&5
++  echo "$as_me:13608: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_remove=yes
+ else
+@@ -13612,11 +13615,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13615: result: $ac_cv_func_remove" >&5
++echo "$as_me:13618: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+ 
+     if test $ac_cv_func_remove = no; then
+-      echo "$as_me:13619: checking for remove in -lposix" >&5
++      echo "$as_me:13622: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13624,7 +13627,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13627 "configure"
++#line 13630 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13643,16 +13646,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13646: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13649: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13649: \$? = $ac_status" >&5
++  echo "$as_me:13652: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13652: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13655: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13655: \$? = $ac_status" >&5
++  echo "$as_me:13658: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_posix_remove=yes
+ else
+@@ -13663,7 +13666,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13666: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:13669: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test "$ac_cv_lib_posix_remove" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -13672,13 +13675,13 @@
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    echo "$as_me:13675: checking for shmat" >&5
++    echo "$as_me:13678: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13681 "configure"
++#line 13684 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13709,16 +13712,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13712: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13715: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13715: \$? = $ac_status" >&5
++  echo "$as_me:13718: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13718: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13721: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13721: \$? = $ac_status" >&5
++  echo "$as_me:13724: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_shmat=yes
+ else
+@@ -13728,11 +13731,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13731: result: $ac_cv_func_shmat" >&5
++echo "$as_me:13734: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+ 
+     if test $ac_cv_func_shmat = no; then
+-      echo "$as_me:13735: checking for shmat in -lipc" >&5
++      echo "$as_me:13738: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13740,7 +13743,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13743 "configure"
++#line 13746 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13759,16 +13762,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13762: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13765: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13765: \$? = $ac_status" >&5
++  echo "$as_me:13768: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13768: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13771: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13771: \$? = $ac_status" >&5
++  echo "$as_me:13774: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+@@ -13779,7 +13782,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13782: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:13785: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test "$ac_cv_lib_ipc_shmat" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -13797,7 +13800,7 @@
+   # These have to be linked with before -lX11, unlike the other
+   # libraries we check for below, so use a different variable.
+   # John Interrante, Karl Berry
+-  echo "$as_me:13800: checking for IceConnectionNumber in -lICE" >&5
++  echo "$as_me:13803: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13805,7 +13808,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13808 "configure"
++#line 13811 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13824,16 +13827,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13827: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13830: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13830: \$? = $ac_status" >&5
++  echo "$as_me:13833: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13833: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13836: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13836: \$? = $ac_status" >&5
++  echo "$as_me:13839: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -13844,7 +13847,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13847: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:13850: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -13856,7 +13859,7 @@
+ 
+ cf_x_athena=${cf_x_athena:-Xaw}
+ 
+-echo "$as_me:13859: checking if you want to link with Xaw 3d library" >&5
++echo "$as_me:13862: checking if you want to link with Xaw 3d library" >&5
+ echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
+ withval=
+ 
+@@ -13867,14 +13870,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=Xaw3d
+-	echo "$as_me:13870: result: yes" >&5
++	echo "$as_me:13873: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:13873: result: no" >&5
++	echo "$as_me:13876: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:13877: checking if you want to link with Xaw 3d xft library" >&5
++echo "$as_me:13880: checking if you want to link with Xaw 3d xft library" >&5
+ echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
+ withval=
+ 
+@@ -13885,14 +13888,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=Xaw3dxft
+-	echo "$as_me:13888: result: yes" >&5
++	echo "$as_me:13891: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:13891: result: no" >&5
++	echo "$as_me:13894: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:13895: checking if you want to link with neXT Athena library" >&5
++echo "$as_me:13898: checking if you want to link with neXT Athena library" >&5
+ echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
+ withval=
+ 
+@@ -13903,14 +13906,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=neXtaw
+-	echo "$as_me:13906: result: yes" >&5
++	echo "$as_me:13909: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:13909: result: no" >&5
++	echo "$as_me:13912: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:13913: checking if you want to link with Athena-Plus library" >&5
++echo "$as_me:13916: checking if you want to link with Athena-Plus library" >&5
+ echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
+ withval=
+ 
+@@ -13921,10 +13924,10 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=XawPlus
+-	echo "$as_me:13924: result: yes" >&5
++	echo "$as_me:13927: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:13927: result: no" >&5
++	echo "$as_me:13930: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -13944,17 +13947,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_athena_pkg"; then
+ 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
+ 
+-echo "${as_me:-configure}:13947: testing found package $cf_athena_pkg ..." 1>&5
++echo "${as_me:-configure}:13950: testing found package $cf_athena_pkg ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_athena_pkg" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_athena_pkg" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:13953: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13956: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:13957: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13960: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14085,20 +14088,20 @@
+ 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
+ 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14088: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:14091: testing ..trimmed $LIBS ..." 1>&5
+ 
+ 			;;
+ 		esac
+ 	done
+ 
+-echo "$as_me:14094: checking for usable $cf_x_athena/Xmu package" >&5
++echo "$as_me:14097: checking for usable $cf_x_athena/Xmu package" >&5
+ echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
+ if test "${cf_cv_xaw_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14101 "configure"
++#line 14104 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14116,16 +14119,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14119: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14122: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14122: \$? = $ac_status" >&5
++  echo "$as_me:14125: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14125: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14128: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14128: \$? = $ac_status" >&5
++  echo "$as_me:14131: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xaw_compat=yes
+ else
+@@ -14135,7 +14138,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14138: result: $cf_cv_xaw_compat" >&5
++echo "$as_me:14141: result: $cf_cv_xaw_compat" >&5
+ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
+ 
+ 			if test "$cf_cv_xaw_compat" = no
+@@ -14147,7 +14150,7 @@
+ 				(*)
+ 					test -n "$verbose" && echo "	work around broken package" 1>&6
+ 
+-echo "${as_me:-configure}:14150: testing work around broken package ..." 1>&5
++echo "${as_me:-configure}:14153: testing work around broken package ..." 1>&5
+ 
+ 					cf_save_xmu="$LIBS"
+ 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
+@@ -14155,17 +14158,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
+ 	test -n "$verbose" && echo "	found package xmu" 1>&6
+ 
+-echo "${as_me:-configure}:14158: testing found package xmu ..." 1>&5
++echo "${as_me:-configure}:14161: testing found package xmu ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xmu" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xmu" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14164: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14167: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xmu LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14168: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14171: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14285,12 +14288,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14288: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14291: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14293: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:14296: testing ...after  $LIBS ..." 1>&5
+ 
+ else
+ 	cf_pkgconfig_incs=
+@@ -14298,12 +14301,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14301: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14304: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14306: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:14309: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -14314,7 +14317,7 @@
+ 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
+ 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14317: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:14320: testing ..trimmed $LIBS ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -14339,17 +14342,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
+ 	test -n "$verbose" && echo "	found package Xext" 1>&6
+ 
+-echo "${as_me:-configure}:14342: testing found package Xext ..." 1>&5
++echo "${as_me:-configure}:14345: testing found package Xext ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "Xext" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "Xext" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14348: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14351: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package Xext LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14352: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14355: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14470,7 +14473,7 @@
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+ 
+-	echo "$as_me:14473: checking for XextCreateExtension in -lXext" >&5
++	echo "$as_me:14476: checking for XextCreateExtension in -lXext" >&5
+ echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14478,7 +14481,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXext  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14481 "configure"
++#line 14484 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14497,16 +14500,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14500: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14503: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14503: \$? = $ac_status" >&5
++  echo "$as_me:14506: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14506: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14509: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14509: \$? = $ac_status" >&5
++  echo "$as_me:14512: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_Xext_XextCreateExtension=yes
+ else
+@@ -14517,7 +14520,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14520: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
++echo "$as_me:14523: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
+ if test "$ac_cv_lib_Xext_XextCreateExtension" = yes; then
+ 
+@@ -14553,17 +14556,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
+ 	test -n "$verbose" && echo "	found package x11" 1>&6
+ 
+-echo "${as_me:-configure}:14556: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:14559: testing found package x11 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "x11" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14562: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14565: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14566: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14569: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14683,24 +14686,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:14686: WARNING: unable to find X11 library" >&5
++	{ echo "$as_me:14689: WARNING: unable to find X11 library" >&5
+ echo "$as_me: WARNING: unable to find X11 library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then
+ 	test -n "$verbose" && echo "	found package ice" 1>&6
+ 
+-echo "${as_me:-configure}:14693: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:14696: testing found package ice ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "ice" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14699: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14702: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14703: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14706: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14820,24 +14823,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:14823: WARNING: unable to find ICE library" >&5
++	{ echo "$as_me:14826: WARNING: unable to find ICE library" >&5
+ echo "$as_me: WARNING: unable to find ICE library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
+ 	test -n "$verbose" && echo "	found package sm" 1>&6
+ 
+-echo "${as_me:-configure}:14830: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:14833: testing found package sm ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "sm" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14836: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14839: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14840: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14843: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14957,24 +14960,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:14960: WARNING: unable to find SM library" >&5
++	{ echo "$as_me:14963: WARNING: unable to find SM library" >&5
+ echo "$as_me: WARNING: unable to find SM library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
+ 	test -n "$verbose" && echo "	found package xt" 1>&6
+ 
+-echo "${as_me:-configure}:14967: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:14970: testing found package xt ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xt" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14973: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14976: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14977: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14980: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15094,7 +15097,7 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:15097: WARNING: unable to find Xt library" >&5
++	{ echo "$as_me:15100: WARNING: unable to find Xt library" >&5
+ echo "$as_me: WARNING: unable to find Xt library" >&2;}
+ fi
+ 
+@@ -15107,17 +15110,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
+ 	test -n "$verbose" && echo "	found package xt" 1>&6
+ 
+-echo "${as_me:-configure}:15110: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:15113: testing found package xt ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xt" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15116: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15119: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15120: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15123: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15238,14 +15241,14 @@
+ 		;;
+ 	(*)
+ # we have an "xt" package, but it may omit Xt's dependency on X11
+-echo "$as_me:15241: checking for usable X dependency" >&5
++echo "$as_me:15244: checking for usable X dependency" >&5
+ echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
+ if test "${cf_cv_xt_x11_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15248 "configure"
++#line 15251 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -15265,16 +15268,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15268: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15271: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15271: \$? = $ac_status" >&5
++  echo "$as_me:15274: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15274: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15277: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15277: \$? = $ac_status" >&5
++  echo "$as_me:15280: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xt_x11_compat=yes
+ else
+@@ -15284,30 +15287,30 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15287: result: $cf_cv_xt_x11_compat" >&5
++echo "$as_me:15290: result: $cf_cv_xt_x11_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
+ 		if test "$cf_cv_xt_x11_compat" = no
+ 		then
+ 			test -n "$verbose" && echo "	work around broken X11 dependency" 1>&6
+ 
+-echo "${as_me:-configure}:15293: testing work around broken X11 dependency ..." 1>&5
++echo "${as_me:-configure}:15296: testing work around broken X11 dependency ..." 1>&5
+ 
+ 			# 2010/11/19 - good enough until a working Xt on Xcb is delivered.
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
+ 	test -n "$verbose" && echo "	found package x11" 1>&6
+ 
+-echo "${as_me:-configure}:15300: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:15303: testing found package x11 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "x11" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15306: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15309: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15310: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15313: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15430,12 +15433,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:15433: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:15436: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:15438: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:15441: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -15443,14 +15446,14 @@
+ 		;;
+ 	esac
+ 
+-echo "$as_me:15446: checking for usable X Toolkit package" >&5
++echo "$as_me:15449: checking for usable X Toolkit package" >&5
+ echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
+ if test "${cf_cv_xt_ice_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15453 "configure"
++#line 15456 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -15466,16 +15469,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15469: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15472: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15472: \$? = $ac_status" >&5
++  echo "$as_me:15475: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15475: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15478: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15478: \$? = $ac_status" >&5
++  echo "$as_me:15481: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xt_ice_compat=yes
+ else
+@@ -15485,7 +15488,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15488: result: $cf_cv_xt_ice_compat" >&5
++echo "$as_me:15491: result: $cf_cv_xt_ice_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
+ 
+ 	if test "$cf_cv_xt_ice_compat" = no
+@@ -15499,22 +15502,22 @@
+ 			(*)
+ 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
+ 
+-echo "${as_me:-configure}:15502: testing work around broken ICE dependency ..." 1>&5
++echo "${as_me:-configure}:15505: testing work around broken ICE dependency ..." 1>&5
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then
+ 	test -n "$verbose" && echo "	found package ice" 1>&6
+ 
+-echo "${as_me:-configure}:15507: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:15510: testing found package ice ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "ice" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15513: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15516: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15517: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15520: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15633,17 +15636,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
+ 	test -n "$verbose" && echo "	found package sm" 1>&6
+ 
+-echo "${as_me:-configure}:15636: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:15639: testing found package sm ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "sm" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15642: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15645: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15646: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15649: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15772,12 +15775,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:15775: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:15778: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:15780: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:15783: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -15797,7 +15800,7 @@
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15800: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15803: testing checking additions to CFLAGS ..." 1>&5
+ 
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -15882,7 +15885,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:15885: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:15888: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -15892,7 +15895,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:15895: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:15898: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -15902,7 +15905,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}:15905: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:15908: 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"
+@@ -15911,7 +15914,7 @@
+ 
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15914 "configure"
++#line 15917 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -15923,16 +15926,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15926: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15929: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15929: \$? = $ac_status" >&5
++  echo "$as_me:15932: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15932: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15935: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15935: \$? = $ac_status" >&5
++  echo "$as_me:15938: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -15940,12 +15943,12 @@
+ cat "conftest.$ac_ext" >&5
+ test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15943: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15946: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+ 
+ 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
+ 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15948: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:15951: testing but keeping change to \$CPPFLAGS ..." 1>&5
+ 
+ 	 fi
+ 	 CFLAGS="$cf_check_cflags"
+@@ -15953,13 +15956,13 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+ 
+-	echo "$as_me:15956: checking for XOpenDisplay" >&5
++	echo "$as_me:15959: checking for XOpenDisplay" >&5
+ echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
+ if test "${ac_cv_func_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15962 "configure"
++#line 15965 "configure"
+ #include "confdefs.h"
+ #define XOpenDisplay autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15990,16 +15993,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15993: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15996: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15996: \$? = $ac_status" >&5
++  echo "$as_me:15999: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15999: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16002: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16002: \$? = $ac_status" >&5
++  echo "$as_me:16005: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_XOpenDisplay=yes
+ else
+@@ -16009,13 +16012,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16012: result: $ac_cv_func_XOpenDisplay" >&5
++echo "$as_me:16015: result: $ac_cv_func_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
+ if test "$ac_cv_func_XOpenDisplay" = yes; then
+   :
+ else
+ 
+-	echo "$as_me:16018: checking for XOpenDisplay in -lX11" >&5
++	echo "$as_me:16021: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16023,7 +16026,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16026 "configure"
++#line 16029 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16042,16 +16045,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16045: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16048: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16048: \$? = $ac_status" >&5
++  echo "$as_me:16051: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16051: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16054: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16054: \$? = $ac_status" >&5
++  echo "$as_me:16057: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -16062,7 +16065,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16065: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:16068: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then
+ 
+@@ -16086,13 +16089,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:16089: checking for XtAppInitialize" >&5
++	echo "$as_me:16092: checking for XtAppInitialize" >&5
+ echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
+ if test "${ac_cv_func_XtAppInitialize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16095 "configure"
++#line 16098 "configure"
+ #include "confdefs.h"
+ #define XtAppInitialize autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16123,16 +16126,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16126: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16129: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16129: \$? = $ac_status" >&5
++  echo "$as_me:16132: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16132: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16135: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16135: \$? = $ac_status" >&5
++  echo "$as_me:16138: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_XtAppInitialize=yes
+ else
+@@ -16142,13 +16145,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16145: result: $ac_cv_func_XtAppInitialize" >&5
++echo "$as_me:16148: result: $ac_cv_func_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
+ if test "$ac_cv_func_XtAppInitialize" = yes; then
+   :
+ else
+ 
+-	echo "$as_me:16151: checking for XtAppInitialize in -lXt" >&5
++	echo "$as_me:16154: checking for XtAppInitialize in -lXt" >&5
+ echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16156,7 +16159,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16159 "configure"
++#line 16162 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16175,16 +16178,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16178: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16181: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16181: \$? = $ac_status" >&5
++  echo "$as_me:16184: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16184: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16187: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16187: \$? = $ac_status" >&5
++  echo "$as_me:16190: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_Xt_XtAppInitialize=yes
+ else
+@@ -16195,7 +16198,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16198: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
++echo "$as_me:16201: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
+ if test "$ac_cv_lib_Xt_XtAppInitialize" = yes; then
+ 
+@@ -16212,7 +16215,7 @@
+ fi
+ 
+ if test "$cf_have_X_LIBS" = no ; then
+-	{ echo "$as_me:16215: WARNING: Unable to successfully link X Toolkit library (-lXt) with
++	{ echo "$as_me:16218: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+ test program.  You will have to check and add the proper libraries by hand
+ to makefile." >&5
+ echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+@@ -16253,14 +16256,14 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
+ 
+-			echo "$as_me:16256: checking for $cf_test in $cf_path" >&5
++			echo "$as_me:16259: checking for $cf_test in $cf_path" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
+ 		else
+-			echo "$as_me:16259: checking for $cf_test" >&5
++			echo "$as_me:16262: checking for $cf_test" >&5
+ echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
+ 		fi
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16263 "configure"
++#line 16266 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16274,16 +16277,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16277: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16280: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16280: \$? = $ac_status" >&5
++  echo "$as_me:16283: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16283: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16286: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16286: \$? = $ac_status" >&5
++  echo "$as_me:16289: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -16292,7 +16295,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-		echo "$as_me:16295: result: $cf_result" >&5
++		echo "$as_me:16298: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
+@@ -16308,7 +16311,7 @@
+ done
+ 
+ if test -z "$cf_x_athena_inc" ; then
+-	{ echo "$as_me:16311: WARNING: Unable to find Athena header files" >&5
++	{ echo "$as_me:16314: WARNING: Unable to find Athena header files" >&5
+ echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
+ elif test "$cf_x_athena_inc" != default ; then
+ 
+@@ -16373,10 +16376,10 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-		echo "$as_me:16376: checking for $cf_test in $cf_libs" >&5
++		echo "$as_me:16379: checking for $cf_test in $cf_libs" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16379 "configure"
++#line 16382 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -16393,16 +16396,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16396: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16399: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16399: \$? = $ac_status" >&5
++  echo "$as_me:16402: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16402: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16405: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16405: \$? = $ac_status" >&5
++  echo "$as_me:16408: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -16411,7 +16414,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:16414: result: $cf_result" >&5
++		echo "$as_me:16417: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
+@@ -16428,7 +16431,7 @@
+ done
+ 
+ if test -z "$cf_x_athena_lib" ; then
+-	{ { echo "$as_me:16431: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
++	{ { echo "$as_me:16434: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+ echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -16462,7 +16465,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:16465: checking for $ac_word" >&5
++echo "$as_me:16468: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16477,7 +16480,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:16480: found $ac_dir/$ac_word" >&5
++echo "$as_me:16483: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -16485,10 +16488,10 @@
+ fi
+ XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
+ if test -n "$XCURSES_CONFIG"; then
+-  echo "$as_me:16488: result: $XCURSES_CONFIG" >&5
++  echo "$as_me:16491: result: $XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$XCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:16491: result: no" >&5
++  echo "$as_me:16494: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -16501,7 +16504,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:16504: checking for $ac_word" >&5
++echo "$as_me:16507: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16516,7 +16519,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
+-echo "$as_me:16519: found $ac_dir/$ac_word" >&5
++echo "$as_me:16522: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -16524,10 +16527,10 @@
+ fi
+ ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
+ if test -n "$ac_ct_XCURSES_CONFIG"; then
+-  echo "$as_me:16527: result: $ac_ct_XCURSES_CONFIG" >&5
++  echo "$as_me:16530: result: $ac_ct_XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:16530: result: no" >&5
++  echo "$as_me:16533: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -16662,7 +16665,7 @@
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16665: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16668: testing checking additions to CFLAGS ..." 1>&5
+ 
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -16747,7 +16750,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:16750: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:16753: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -16757,7 +16760,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:16760: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:16763: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -16767,7 +16770,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}:16770: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:16773: 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"
+@@ -16776,7 +16779,7 @@
+ 
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16779 "configure"
++#line 16782 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -16788,16 +16791,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16791: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16794: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16794: \$? = $ac_status" >&5
++  echo "$as_me:16797: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16797: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16800: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16800: \$? = $ac_status" >&5
++  echo "$as_me:16803: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -16805,12 +16808,12 @@
+ cat "conftest.$ac_ext" >&5
+ test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16808: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16811: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+ 
+ 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
+ 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16813: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16816: testing but keeping change to \$CPPFLAGS ..." 1>&5
+ 
+ 	 fi
+ 	 CFLAGS="$cf_check_cflags"
+@@ -16818,7 +16821,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:16821: checking for XOpenDisplay in -lX11" >&5
++echo "$as_me:16824: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16826,7 +16829,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16829 "configure"
++#line 16832 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16845,16 +16848,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16848: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16851: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16851: \$? = $ac_status" >&5
++  echo "$as_me:16854: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16854: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16857: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16857: \$? = $ac_status" >&5
++  echo "$as_me:16860: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -16865,7 +16868,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16868: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:16871: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then
+ 
+@@ -16887,7 +16890,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16890: checking for XCurses library" >&5
++echo "$as_me:16893: checking for XCurses library" >&5
+ echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
+ if test "${cf_cv_lib_XCurses+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16910,7 +16913,7 @@
+ LIBS="$cf_add_libs"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16913 "configure"
++#line 16916 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16925,16 +16928,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16928: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16931: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16931: \$? = $ac_status" >&5
++  echo "$as_me:16934: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16934: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16937: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16937: \$? = $ac_status" >&5
++  echo "$as_me:16940: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_lib_XCurses=yes
+ else
+@@ -16945,7 +16948,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16948: result: $cf_cv_lib_XCurses" >&5
++echo "$as_me:16951: result: $cf_cv_lib_XCurses" >&5
+ echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
+ 
+ fi
+@@ -16960,23 +16963,23 @@
+ #define XCURSES 1
+ EOF
+ 
+-	echo "$as_me:16963: checking for xcurses.h" >&5
++	echo "$as_me:16966: checking for xcurses.h" >&5
+ echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
+ if test "${ac_cv_header_xcurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16969 "configure"
++#line 16972 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16973: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16976: \"$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:16979: \$? = $ac_status" >&5
++  echo "$as_me:16982: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16995,7 +16998,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16998: result: $ac_cv_header_xcurses_h" >&5
++echo "$as_me:17001: result: $ac_cv_header_xcurses_h" >&5
+ echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
+ if test "$ac_cv_header_xcurses_h" = yes; then
+ 
+@@ -17006,26 +17009,26 @@
+ fi
+ 
+ else
+-	{ { echo "$as_me:17009: error: Cannot link with XCurses" >&5
++	{ { echo "$as_me:17012: error: Cannot link with XCurses" >&5
+ echo "$as_me: error: Cannot link with XCurses" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ 	;;
+ (*)
+-	{ { echo "$as_me:17016: error: unexpected screen-value: $cf_cv_screen" >&5
++	{ { echo "$as_me:17019: error: unexpected screen-value: $cf_cv_screen" >&5
+ echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+-echo "$as_me:17022: checking for _nc_init_pthreads" >&5
++echo "$as_me:17025: checking for _nc_init_pthreads" >&5
+ echo $ECHO_N "checking for _nc_init_pthreads... $ECHO_C" >&6
+ if test "${ac_cv_func__nc_init_pthreads+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17028 "configure"
++#line 17031 "configure"
+ #include "confdefs.h"
+ #define _nc_init_pthreads autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17056,16 +17059,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17059: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17062: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17062: \$? = $ac_status" >&5
++  echo "$as_me:17065: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17065: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17068: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17068: \$? = $ac_status" >&5
++  echo "$as_me:17071: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func__nc_init_pthreads=yes
+ else
+@@ -17075,7 +17078,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17078: result: $ac_cv_func__nc_init_pthreads" >&5
++echo "$as_me:17081: result: $ac_cv_func__nc_init_pthreads" >&5
+ echo "${ECHO_T}$ac_cv_func__nc_init_pthreads" >&6
+ if test "$ac_cv_func__nc_init_pthreads" = yes; then
+   cf_cv_ncurses_pthreads=yes
+@@ -17110,7 +17113,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17113: checking for X11 rgb file" >&5
++echo "$as_me:17116: 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.
+@@ -17172,7 +17175,7 @@
+ 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:17175: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:17178: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -17180,7 +17183,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17183: result: $RGB_PATH" >&5
++echo "$as_me:17186: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:17227: 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.
+@@ -17241,10 +17244,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17244: result: $FORM_NAME" >&5
++echo "$as_me:17247: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:17247: checking for desired basename for menu library" >&5
++echo "$as_me:17250: 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.
+@@ -17264,10 +17267,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17267: result: $MENU_NAME" >&5
++echo "$as_me:17270: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:17270: checking for desired basename for panel library" >&5
++echo "$as_me:17273: 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.
+@@ -17287,10 +17290,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17290: result: $PANEL_NAME" >&5
++echo "$as_me:17293: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:17293: checking if you want to check for panel functions" >&5
++echo "$as_me:17296: checking if you want to check for panel functions" >&5
+ echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-panel or --disable-panel was given.
+@@ -17307,7 +17310,7 @@
+ 	cf_enable_panel=$cf_default_panel
+ 
+ fi;
+-echo "$as_me:17310: result: $cf_enable_panel" >&5
++echo "$as_me:17313: result: $cf_enable_panel" >&5
+ echo "${ECHO_T}$cf_enable_panel" >&6
+ if test $cf_enable_panel = yes
+ then
+@@ -17318,13 +17321,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:17321: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
++	echo "$as_me:17324: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists "$PANEL_NAME$cf_cv_libtype" ; then
+-		echo "$as_me:17324: result: yes" >&5
++		echo "$as_me:17327: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:17327: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
++		echo "$as_me:17330: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CFLAGS="$CFLAGS"
+@@ -17474,7 +17477,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17477 "configure"
++#line 17480 "configure"
+ #include "confdefs.h"
+ #include <$PANEL_NAME.h>
+ int
+@@ -17486,37 +17489,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17489: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17492: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17492: \$? = $ac_status" >&5
++  echo "$as_me:17495: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17495: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17498: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17498: \$? = $ac_status" >&5
++  echo "$as_me:17501: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17504 "configure"
++#line 17507 "configure"
+ #include "confdefs.h"
+ #include <$PANEL_NAME.h>
+ 				int main(void)
+ 				{ (void) new_panel ( 0 ); return 0; }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17511: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17514: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17514: \$? = $ac_status" >&5
++  echo "$as_me:17517: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17516: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17519: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17519: \$? = $ac_status" >&5
++  echo "$as_me:17522: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -17533,7 +17536,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:17536: result: $cf_have_curses_lib" >&5
++		echo "$as_me:17539: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" = "yes"
+@@ -17554,7 +17557,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh`
+-echo "$as_me:17557: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
++echo "$as_me:17560: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17562,7 +17565,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$PANEL_NAME$cf_cv_libtype  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17565 "configure"
++#line 17568 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17581,16 +17584,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17584: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17587: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17587: \$? = $ac_status" >&5
++  echo "$as_me:17590: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17590: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17593: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17593: \$? = $ac_status" >&5
++  echo "$as_me:17596: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -17601,7 +17604,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17604: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:17607: 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
+ 
+@@ -17634,7 +17637,7 @@
+ 	cf_curses_headers="$cf_curses_headers panel.h"
+ fi
+ 
+-echo "$as_me:17637: checking if you want to check for menu functions" >&5
++echo "$as_me:17640: checking if you want to check for menu functions" >&5
+ echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-menu or --disable-menu was given.
+@@ -17651,7 +17654,7 @@
+ 	cf_enable_menu=$cf_default_menu
+ 
+ fi;
+-echo "$as_me:17654: result: $cf_enable_menu" >&5
++echo "$as_me:17657: result: $cf_enable_menu" >&5
+ echo "${ECHO_T}$cf_enable_menu" >&6
+ if test $cf_enable_menu = yes
+ then
+@@ -17660,14 +17663,14 @@
+ 		;;
+ 	(curses*)
+ 
+-echo "$as_me:17663: checking for NetBSD menu.h" >&5
++echo "$as_me:17666: checking for NetBSD menu.h" >&5
+ echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_menu_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17670 "configure"
++#line 17673 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -17685,16 +17688,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17688: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17691: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17691: \$? = $ac_status" >&5
++  echo "$as_me:17694: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17694: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17697: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17697: \$? = $ac_status" >&5
++  echo "$as_me:17700: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_netbsd_menu_h=yes
+ 
+@@ -17706,7 +17709,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17709: result: $cf_cv_netbsd_menu_h" >&5
++echo "$as_me:17712: result: $cf_cv_netbsd_menu_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
+ 
+ test "$cf_cv_netbsd_menu_h" = yes &&
+@@ -17723,13 +17726,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:17726: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
++	echo "$as_me:17729: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists "$MENU_NAME$cf_cv_libtype" ; then
+-		echo "$as_me:17729: result: yes" >&5
++		echo "$as_me:17732: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:17732: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
++		echo "$as_me:17735: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CFLAGS="$CFLAGS"
+@@ -17879,7 +17882,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17882 "configure"
++#line 17885 "configure"
+ #include "confdefs.h"
+ #include <$MENU_NAME.h>
+ int
+@@ -17891,37 +17894,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17894: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17897: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17897: \$? = $ac_status" >&5
++  echo "$as_me:17900: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17900: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17903: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17903: \$? = $ac_status" >&5
++  echo "$as_me:17906: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17909 "configure"
++#line 17912 "configure"
+ #include "confdefs.h"
+ #include <$MENU_NAME.h>
+ 				int main(void)
+ 				{ (void) menu_driver ( 0,0 ); return 0; }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17916: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17919: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17919: \$? = $ac_status" >&5
++  echo "$as_me:17922: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17921: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17924: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17924: \$? = $ac_status" >&5
++  echo "$as_me:17927: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -17938,7 +17941,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:17941: result: $cf_have_curses_lib" >&5
++		echo "$as_me:17944: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" = "yes"
+@@ -17959,7 +17962,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh`
+-echo "$as_me:17962: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
++echo "$as_me:17965: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17967,7 +17970,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$MENU_NAME$cf_cv_libtype  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17970 "configure"
++#line 17973 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17986,16 +17989,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17989: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17992: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17992: \$? = $ac_status" >&5
++  echo "$as_me:17995: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17995: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17998: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17998: \$? = $ac_status" >&5
++  echo "$as_me:18001: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -18006,7 +18009,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18009: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:18012: 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
+ 
+@@ -18039,7 +18042,7 @@
+ 	cf_curses_headers="$cf_curses_headers menu.h"
+ fi
+ 
+-echo "$as_me:18042: checking if you want to check for form functions" >&5
++echo "$as_me:18045: checking if you want to check for form functions" >&5
+ echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-form or --disable-form was given.
+@@ -18056,7 +18059,7 @@
+ 	cf_enable_form=$cf_default_form
+ 
+ fi;
+-echo "$as_me:18059: result: $cf_enable_form" >&5
++echo "$as_me:18062: result: $cf_enable_form" >&5
+ echo "${ECHO_T}$cf_enable_form" >&6
+ if test $cf_enable_form = yes
+ then
+@@ -18065,14 +18068,14 @@
+ 		;;
+ 	(curses*)
+ 
+-echo "$as_me:18068: checking for NetBSD form.h" >&5
++echo "$as_me:18071: checking for NetBSD form.h" >&5
+ echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_form_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18075 "configure"
++#line 18078 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18091,16 +18094,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18094: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18097: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18097: \$? = $ac_status" >&5
++  echo "$as_me:18100: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18100: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18103: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18103: \$? = $ac_status" >&5
++  echo "$as_me:18106: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_netbsd_form_h=yes
+ 
+@@ -18112,7 +18115,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:18115: result: $cf_cv_netbsd_form_h" >&5
++echo "$as_me:18118: result: $cf_cv_netbsd_form_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
+ 
+ test "$cf_cv_netbsd_form_h" = yes &&
+@@ -18129,13 +18132,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:18132: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
++	echo "$as_me:18135: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists "$FORM_NAME$cf_cv_libtype" ; then
+-		echo "$as_me:18135: result: yes" >&5
++		echo "$as_me:18138: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:18138: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
++		echo "$as_me:18141: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CFLAGS="$CFLAGS"
+@@ -18285,7 +18288,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18288 "configure"
++#line 18291 "configure"
+ #include "confdefs.h"
+ #include <$FORM_NAME.h>
+ int
+@@ -18297,37 +18300,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18300: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18303: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18303: \$? = $ac_status" >&5
++  echo "$as_me:18306: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18306: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18309: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18309: \$? = $ac_status" >&5
++  echo "$as_me:18312: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18315 "configure"
++#line 18318 "configure"
+ #include "confdefs.h"
+ #include <$FORM_NAME.h>
+ 				int main(void)
+ 				{ (void) form_driver ( 0,0 ); return 0; }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:18322: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18325: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18325: \$? = $ac_status" >&5
++  echo "$as_me:18328: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:18327: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18330: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18330: \$? = $ac_status" >&5
++  echo "$as_me:18333: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -18344,7 +18347,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:18347: result: $cf_have_curses_lib" >&5
++		echo "$as_me:18350: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" = "yes"
+@@ -18365,7 +18368,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh`
+-echo "$as_me:18368: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
++echo "$as_me:18371: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18373,7 +18376,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$FORM_NAME$cf_cv_libtype  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18376 "configure"
++#line 18379 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18392,16 +18395,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18395: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18398: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18398: \$? = $ac_status" >&5
++  echo "$as_me:18401: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18401: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18404: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18404: \$? = $ac_status" >&5
++  echo "$as_me:18407: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -18412,7 +18415,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18415: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:18418: 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
+ 
+@@ -18450,23 +18453,23 @@
+ for ac_header in $cf_curses_headers
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18453: checking for $ac_header" >&5
++echo "$as_me:18456: 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 18459 "configure"
++#line 18462 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18463: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18466: \"$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:18469: \$? = $ac_status" >&5
++  echo "$as_me:18472: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18485,7 +18488,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18488: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18491: 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:18501: 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 18504 "configure"
++#line 18507 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -18517,16 +18520,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18520: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18523: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18523: \$? = $ac_status" >&5
++  echo "$as_me:18526: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18526: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18529: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18529: \$? = $ac_status" >&5
++  echo "$as_me:18532: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -18536,7 +18539,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18539: result: $ac_cv_header_time" >&5
++echo "$as_me:18542: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -18557,23 +18560,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18560: checking for $ac_header" >&5
++echo "$as_me:18563: 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 18566 "configure"
++#line 18569 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18570: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18573: \"$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:18576: \$? = $ac_status" >&5
++  echo "$as_me:18579: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18592,7 +18595,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18595: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18598: 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:18611: 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 18614 "configure"
++#line 18617 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18618: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18621: \"$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:18624: \$? = $ac_status" >&5
++  echo "$as_me:18627: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18640,7 +18643,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18643: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18646: 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:18656: 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
+@@ -18660,7 +18663,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18663 "configure"
++#line 18666 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -18673,16 +18676,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18676: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18679: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18679: \$? = $ac_status" >&5
++  echo "$as_me:18682: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18682: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18685: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18685: \$? = $ac_status" >&5
++  echo "$as_me:18688: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -18694,7 +18697,7 @@
+ done
+ 
+ fi
+-echo "$as_me:18697: result: $cf_cv_getopt_header" >&5
++echo "$as_me:18700: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -18712,13 +18715,13 @@
+ fi
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:18715: checking for clock_gettime" >&5
++echo "$as_me:18718: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18721 "configure"
++#line 18724 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18749,16 +18752,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18752: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18755: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18755: \$? = $ac_status" >&5
++  echo "$as_me:18758: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18758: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18761: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18761: \$? = $ac_status" >&5
++  echo "$as_me:18764: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -18768,12 +18771,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18771: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:18774: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:18776: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:18779: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18781,7 +18784,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18784 "configure"
++#line 18787 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18800,16 +18803,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18803: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18806: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18806: \$? = $ac_status" >&5
++  echo "$as_me:18809: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18809: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18812: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18812: \$? = $ac_status" >&5
++  echo "$as_me:18815: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -18820,7 +18823,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18823: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:18826: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -18832,14 +18835,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:18835: checking if clock_gettime links" >&5
++echo "$as_me:18838: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18842 "configure"
++#line 18845 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -18857,16 +18860,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18860: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18863: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18863: \$? = $ac_status" >&5
++  echo "$as_me:18866: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18866: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18869: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18869: \$? = $ac_status" >&5
++  echo "$as_me:18872: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -18877,7 +18880,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:18880: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:18883: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -18891,13 +18894,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:18894: checking for gettimeofday" >&5
++echo "$as_me:18897: 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 18900 "configure"
++#line 18903 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18928,16 +18931,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18931: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18934: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18934: \$? = $ac_status" >&5
++  echo "$as_me:18937: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18937: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18940: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18940: \$? = $ac_status" >&5
++  echo "$as_me:18943: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -18947,7 +18950,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18950: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:18953: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -18957,7 +18960,7 @@
+ 
+ else
+ 
+-echo "$as_me:18960: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:18963: 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
+@@ -18965,7 +18968,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18968 "configure"
++#line 18971 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18984,16 +18987,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18987: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18990: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18990: \$? = $ac_status" >&5
++  echo "$as_me:18993: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18993: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18996: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18996: \$? = $ac_status" >&5
++  echo "$as_me:18999: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -19004,7 +19007,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19007: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:19010: 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
+ 
+@@ -19042,13 +19045,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:19045: checking for $ac_func" >&5
++echo "$as_me:19048: 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 19051 "configure"
++#line 19054 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19079,16 +19082,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19082: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19085: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19085: \$? = $ac_status" >&5
++  echo "$as_me:19088: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19088: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19091: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19091: \$? = $ac_status" >&5
++  echo "$as_me:19094: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -19098,7 +19101,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19101: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:19104: 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:19115: checking if we can use termcap.h" >&5
+ echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
+ if test "${cf_cv_have_termcap_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19119 "configure"
++#line 19122 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19137,16 +19140,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19140: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19143: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19143: \$? = $ac_status" >&5
++  echo "$as_me:19146: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19146: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19149: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19149: \$? = $ac_status" >&5
++  echo "$as_me:19152: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_termcap_h=yes
+ else
+@@ -19156,7 +19159,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19159: result: $cf_cv_have_termcap_h" >&5
++echo "$as_me:19162: result: $cf_cv_have_termcap_h" >&5
+ echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
+ if test "x$cf_cv_have_termcap_h" = xyes
+ then
+@@ -19166,14 +19169,14 @@
+ EOF
+ 
+ else
+-echo "$as_me:19169: checking if we can use ncurses/termcap.h" >&5
++echo "$as_me:19172: checking if we can use ncurses/termcap.h" >&5
+ echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
+ if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19176 "configure"
++#line 19179 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19194,16 +19197,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19197: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19200: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19200: \$? = $ac_status" >&5
++  echo "$as_me:19203: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19203: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19206: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19206: \$? = $ac_status" >&5
++  echo "$as_me:19209: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_ncurses_termcap_h=yes
+ else
+@@ -19213,7 +19216,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19216: result: $cf_cv_have_ncurses_termcap_h" >&5
++echo "$as_me:19219: result: $cf_cv_have_ncurses_termcap_h" >&5
+ echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
+ test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -19223,7 +19226,7 @@
+ fi
+ 
+ if test "x$ac_cv_func_getopt" = xno; then
+-	{ { echo "$as_me:19226: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:19229: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -19242,13 +19245,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:19245: checking for $ac_func" >&5
++echo "$as_me:19248: 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 19251 "configure"
++#line 19254 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19279,16 +19282,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19282: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19285: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19285: \$? = $ac_status" >&5
++  echo "$as_me:19288: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19288: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19291: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19291: \$? = $ac_status" >&5
++  echo "$as_me:19294: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -19298,7 +19301,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19301: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:19304: 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:19316: checking definition to turn on extended curses functions" >&5
+ echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
+ if test "${cf_cv_need_xopen_extension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19318,7 +19321,7 @@
+ 
+ cf_cv_need_xopen_extension=unknown
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19321 "configure"
++#line 19324 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -19351,16 +19354,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19354: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19357: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19357: \$? = $ac_status" >&5
++  echo "$as_me:19360: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19360: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19363: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19363: \$? = $ac_status" >&5
++  echo "$as_me:19366: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_xopen_extension=none
+ else
+@@ -19370,7 +19373,7 @@
+ 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19373 "configure"
++#line 19376 "configure"
+ #include "confdefs.h"
+ 
+ #define $cf_try_xopen_extension 1
+@@ -19396,16 +19399,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19399: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19402: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19402: \$? = $ac_status" >&5
++  echo "$as_me:19405: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19405: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19408: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19408: \$? = $ac_status" >&5
++  echo "$as_me:19411: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
+ else
+@@ -19419,7 +19422,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:19422: result: $cf_cv_need_xopen_extension" >&5
++echo "$as_me:19425: result: $cf_cv_need_xopen_extension" >&5
+ echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
+ 
+ case "$cf_cv_need_xopen_extension" in
+@@ -19431,7 +19434,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19434: checking for term.h" >&5
++echo "$as_me:19437: checking for term.h" >&5
+ echo $ECHO_N "checking for term.h... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19452,7 +19455,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19455 "configure"
++#line 19458 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19466,16 +19469,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19469: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19472: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19472: \$? = $ac_status" >&5
++  echo "$as_me:19475: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19475: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19478: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19478: \$? = $ac_status" >&5
++  echo "$as_me:19481: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_term_header=$cf_header
+ 	 break
+@@ -19494,7 +19497,7 @@
+ 	for cf_header in ncurses/term.h ncursesw/term.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19497 "configure"
++#line 19500 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19512,16 +19515,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19515: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19518: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19518: \$? = $ac_status" >&5
++  echo "$as_me:19521: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19521: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19524: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19524: \$? = $ac_status" >&5
++  echo "$as_me:19527: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_term_header=$cf_header
+ 			 break
+@@ -19536,7 +19539,7 @@
+ esac
+ 
+ fi
+-echo "$as_me:19539: result: $cf_cv_term_header" >&5
++echo "$as_me:19542: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ case "$cf_cv_term_header" in
+@@ -19563,7 +19566,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19566: checking for unctrl.h" >&5
++echo "$as_me:19569: checking for unctrl.h" >&5
+ echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
+ if test "${cf_cv_unctrl_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19584,7 +19587,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19587 "configure"
++#line 19590 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19598,16 +19601,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19601: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19604: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19604: \$? = $ac_status" >&5
++  echo "$as_me:19607: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19607: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19610: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19610: \$? = $ac_status" >&5
++  echo "$as_me:19613: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unctrl_header=$cf_header
+ 	 break
+@@ -19620,12 +19623,12 @@
+ done
+ 
+ fi
+-echo "$as_me:19623: result: $cf_cv_unctrl_header" >&5
++echo "$as_me:19626: result: $cf_cv_unctrl_header" >&5
+ echo "${ECHO_T}$cf_cv_unctrl_header" >&6
+ 
+ case "$cf_cv_unctrl_header" in
+ (no)
+-	{ echo "$as_me:19628: WARNING: unctrl.h header not found" >&5
++	{ echo "$as_me:19631: WARNING: unctrl.h header not found" >&5
+ echo "$as_me: WARNING: unctrl.h header not found" >&2;}
+ 	;;
+ esac
+@@ -19723,10 +19726,10 @@
+ 
+ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 
+-	echo "$as_me:19726: checking for ${cf_func}" >&5
++	echo "$as_me:19729: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:19729: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:19732: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19735,7 +19738,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19738 "configure"
++#line 19741 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -19768,16 +19771,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19771: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19774: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19774: \$? = $ac_status" >&5
++  echo "$as_me:19777: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19777: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19780: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19780: \$? = $ac_status" >&5
++  echo "$as_me:19783: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -19793,7 +19796,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:19796: result: $cf_result" >&5
++	echo "$as_me:19799: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" != no; then
+ 		cat >>confdefs.h <&5
++	echo "$as_me:19814: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:19814: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:19817: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19820,7 +19823,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19823 "configure"
++#line 19826 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -19853,16 +19856,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19856: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19859: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19859: \$? = $ac_status" >&5
++  echo "$as_me:19862: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19862: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19865: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19865: \$? = $ac_status" >&5
++  echo "$as_me:19868: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -19878,7 +19881,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:19881: result: $cf_result" >&5
++	echo "$as_me:19884: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" != no; then
+ 		cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF
+-#line 19905 "configure"
++#line 19908 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19922,21 +19925,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19925: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19928: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19928: \$? = $ac_status" >&5
++  echo "$as_me:19931: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19931: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19934: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19934: \$? = $ac_status" >&5
++  echo "$as_me:19937: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
+ 
+-echo "${as_me:-configure}:19939: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
++echo "${as_me:-configure}:19942: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+ 
+ 		cat >>confdefs.h <&5
++echo "$as_me:19962: checking for ncurses extended functions" >&5
+ echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19966 "configure"
++#line 19969 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19978,16 +19981,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19981: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19984: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19984: \$? = $ac_status" >&5
++  echo "$as_me:19987: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19987: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19990: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19990: \$? = $ac_status" >&5
++  echo "$as_me:19993: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_ext_funcs=defined
+ else
+@@ -19995,7 +19998,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19998 "configure"
++#line 20001 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20020,16 +20023,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20023: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20026: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20026: \$? = $ac_status" >&5
++  echo "$as_me:20029: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20029: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20032: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20032: \$? = $ac_status" >&5
++  echo "$as_me:20035: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_ext_funcs=yes
+ else
+@@ -20043,7 +20046,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20046: result: $cf_cv_ncurses_ext_funcs" >&5
++echo "$as_me:20049: result: $cf_cv_ncurses_ext_funcs" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
+ test "$cf_cv_ncurses_ext_funcs" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -20057,11 +20060,11 @@
+ 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
+ 	then
+ 		cf_define_xpg5=no
+-		echo "$as_me:20060: checking if _XPG5 should be defined to enable wide-characters" >&5
++		echo "$as_me:20063: checking if _XPG5 should be defined to enable wide-characters" >&5
+ echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20064 "configure"
++#line 20067 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20074,16 +20077,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20077: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20080: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20080: \$? = $ac_status" >&5
++  echo "$as_me:20083: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20083: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20086: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20086: \$? = $ac_status" >&5
++  echo "$as_me:20089: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -20092,7 +20095,7 @@
+ cf_save_cppflags="$CPPFLAGS"
+ 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20095 "configure"
++#line 20098 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20105,16 +20108,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20108: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20111: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20111: \$? = $ac_status" >&5
++  echo "$as_me:20114: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20114: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20117: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20117: \$? = $ac_status" >&5
++  echo "$as_me:20120: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_define_xpg5=yes
+ else
+@@ -20125,7 +20128,7 @@
+ 			 CPPFLAGS="$cf_save_cppflags"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-		echo "$as_me:20128: result: $cf_define_xpg5" >&5
++		echo "$as_me:20131: result: $cf_define_xpg5" >&5
+ echo "${ECHO_T}$cf_define_xpg5" >&6
+ 
+ 		if test "$cf_define_xpg5" = yes
+@@ -20134,14 +20137,14 @@
+ 		fi
+ 	fi
+ 
+-	echo "$as_me:20137: checking for wide-character functions" >&5
++	echo "$as_me:20140: checking for wide-character functions" >&5
+ echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
+ if test "${cf_cv_widechar_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20144 "configure"
++#line 20147 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20158,16 +20161,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20161: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20164: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20164: \$? = $ac_status" >&5
++  echo "$as_me:20167: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20167: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20170: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20170: \$? = $ac_status" >&5
++  echo "$as_me:20173: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_widechar_funcs=yes
+ else
+@@ -20178,7 +20181,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20181: result: $cf_cv_widechar_funcs" >&5
++echo "$as_me:20184: result: $cf_cv_widechar_funcs" >&5
+ echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
+ 	if test "$cf_cv_widechar_funcs" != no ; then
+ 
+@@ -20199,14 +20202,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20202: checking if $cf_cv_screen library uses pthreads" >&5
++echo "$as_me:20205: checking if $cf_cv_screen library uses pthreads" >&5
+ echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
+ if test "${cf_cv_use_pthreads+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20209 "configure"
++#line 20212 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20224,16 +20227,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20227: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20230: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20230: \$? = $ac_status" >&5
++  echo "$as_me:20233: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20233: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20236: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20236: \$? = $ac_status" >&5
++  echo "$as_me:20239: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_use_pthreads=yes
+ else
+@@ -20244,21 +20247,21 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20247: result: $cf_cv_use_pthreads" >&5
++echo "$as_me:20250: result: $cf_cv_use_pthreads" >&5
+ echo "${ECHO_T}$cf_cv_use_pthreads" >&6
+ test $cf_cv_use_pthreads = yes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_PTHREADS 1
+ EOF
+ 
+-echo "$as_me:20254: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:20257: 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 20261 "configure"
++#line 20264 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20278,16 +20281,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20281: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20284: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20284: \$? = $ac_status" >&5
++  echo "$as_me:20287: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20287: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20290: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20290: \$? = $ac_status" >&5
++  echo "$as_me:20293: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -20299,7 +20302,7 @@
+ 
+ fi
+ 
+-echo "$as_me:20302: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:20305: 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
+@@ -20308,7 +20311,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:20311: checking for openpty in -lutil" >&5
++echo "$as_me:20314: 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
+@@ -20316,7 +20319,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20319 "configure"
++#line 20322 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20335,16 +20338,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20338: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20341: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20341: \$? = $ac_status" >&5
++  echo "$as_me:20344: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20344: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20347: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20347: \$? = $ac_status" >&5
++  echo "$as_me:20350: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -20355,7 +20358,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20358: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:20361: 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
+@@ -20363,7 +20366,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:20366: checking for openpty header" >&5
++echo "$as_me:20369: 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
+@@ -20390,7 +20393,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20393 "configure"
++#line 20396 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20408,16 +20411,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20411: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20414: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20414: \$? = $ac_status" >&5
++  echo "$as_me:20417: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20417: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20420: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20420: \$? = $ac_status" >&5
++  echo "$as_me:20423: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -20435,7 +20438,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:20438: result: $cf_cv_func_openpty" >&5
++echo "$as_me:20441: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -20469,7 +20472,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:20472: checking for function curses_version" >&5
++echo "$as_me:20475: checking for function curses_version" >&5
+ echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
+ if test "${cf_cv_func_curses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20479,7 +20482,7 @@
+   cf_cv_func_curses_version=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20482 "configure"
++#line 20485 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -20495,15 +20498,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:20498: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20501: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20501: \$? = $ac_status" >&5
++  echo "$as_me:20504: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:20503: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20506: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20506: \$? = $ac_status" >&5
++  echo "$as_me:20509: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_curses_version=yes
+ 
+@@ -20518,14 +20521,14 @@
+ fi
+ rm -f core
+ fi
+-echo "$as_me:20521: result: $cf_cv_func_curses_version" >&5
++echo "$as_me:20524: result: $cf_cv_func_curses_version" >&5
+ echo "${ECHO_T}$cf_cv_func_curses_version" >&6
+ test "$cf_cv_func_curses_version" = yes &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_CURSES_VERSION 1
+ EOF
+ 
+-echo "$as_me:20528: checking for alternate character set array" >&5
++echo "$as_me:20531: checking for alternate character set array" >&5
+ echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_acs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20535,7 +20538,7 @@
+ for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20538 "configure"
++#line 20541 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20551,16 +20554,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20554: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20557: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20557: \$? = $ac_status" >&5
++  echo "$as_me:20560: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "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_curses_acs_map=$name; break
+ else
+@@ -20571,7 +20574,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20574: result: $cf_cv_curses_acs_map" >&5
++echo "$as_me:20577: result: $cf_cv_curses_acs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
+ 
+ test "$cf_cv_curses_acs_map" != unknown &&
+@@ -20581,7 +20584,7 @@
+ 
+ if test "$cf_enable_widec" = yes; then
+ 
+-echo "$as_me:20584: checking for wide alternate character set array" >&5
++echo "$as_me:20587: checking for wide alternate character set array" >&5
+ echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20591,7 +20594,7 @@
+ 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20594 "configure"
++#line 20597 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20607,16 +20610,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20610: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20613: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20613: \$? = $ac_status" >&5
++  echo "$as_me:20616: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20616: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20619: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20619: \$? = $ac_status" >&5
++  echo "$as_me:20622: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_wacs_map=$name
+ 	 break
+@@ -20627,7 +20630,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	done
+ fi
+-echo "$as_me:20630: result: $cf_cv_curses_wacs_map" >&5
++echo "$as_me:20633: result: $cf_cv_curses_wacs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
+ 
+ test "$cf_cv_curses_wacs_map" != unknown &&
+@@ -20635,7 +20638,7 @@
+ #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
+ EOF
+ 
+-echo "$as_me:20638: checking for wide alternate character constants" >&5
++echo "$as_me:20641: checking for wide alternate character constants" >&5
+ echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_symbols+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20645,7 +20648,7 @@
+ if test "$cf_cv_curses_wacs_map" != unknown
+ then
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20648 "configure"
++#line 20651 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20662,16 +20665,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20665: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20668: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20668: \$? = $ac_status" >&5
++  echo "$as_me:20671: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20671: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20674: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20674: \$? = $ac_status" >&5
++  echo "$as_me:20677: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -20681,7 +20684,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ else
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20684 "configure"
++#line 20687 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20697,16 +20700,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20700: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20703: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20703: \$? = $ac_status" >&5
++  echo "$as_me:20706: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20706: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20709: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20709: \$? = $ac_status" >&5
++  echo "$as_me:20712: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -20717,7 +20720,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:20720: result: $cf_cv_curses_wacs_symbols" >&5
++echo "$as_me:20723: result: $cf_cv_curses_wacs_symbols" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
+ 
+ test "$cf_cv_curses_wacs_symbols" != no &&
+@@ -20727,10 +20730,10 @@
+ 
+ fi
+ 
+-echo "$as_me:20730: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:20733: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20733 "configure"
++#line 20736 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20748,16 +20751,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20751: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20754: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20754: \$? = $ac_status" >&5
++  echo "$as_me:20757: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20757: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20760: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20760: \$? = $ac_status" >&5
++  echo "$as_me:20763: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -20766,7 +20769,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:20769: result: $cf_result" >&5
++echo "$as_me:20772: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -20787,14 +20790,14 @@
+ if test "$cf_enable_widec" = yes; then
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:20790: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:20793: 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 20797 "configure"
++#line 20800 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20812,23 +20815,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20815: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20818: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20818: \$? = $ac_status" >&5
++  echo "$as_me:20821: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20821: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20824: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20824: \$? = $ac_status" >&5
++  echo "$as_me:20827: \$? = $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 20831 "configure"
++#line 20834 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20847,16 +20850,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20850: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20853: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20853: \$? = $ac_status" >&5
++  echo "$as_me:20856: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20856: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20859: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20859: \$? = $ac_status" >&5
++  echo "$as_me:20862: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -20868,7 +20871,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20871: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:20874: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -20891,14 +20894,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:20894: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:20897: 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 20901 "configure"
++#line 20904 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20916,23 +20919,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20919: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20922: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20922: \$? = $ac_status" >&5
++  echo "$as_me:20925: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20925: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20928: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20928: \$? = $ac_status" >&5
++  echo "$as_me:20931: \$? = $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 20935 "configure"
++#line 20938 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20951,16 +20954,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20954: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20957: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20957: \$? = $ac_status" >&5
++  echo "$as_me:20960: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20960: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20963: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20963: \$? = $ac_status" >&5
++  echo "$as_me:20966: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -20972,7 +20975,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20975: result: $cf_cv_wchar_t" >&5
++echo "$as_me:20978: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -20995,14 +20998,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:20998: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:21001: 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 21005 "configure"
++#line 21008 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21020,23 +21023,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21023: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21026: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21026: \$? = $ac_status" >&5
++  echo "$as_me:21029: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21029: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21032: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21032: \$? = $ac_status" >&5
++  echo "$as_me:21035: \$? = $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 21039 "configure"
++#line 21042 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21055,16 +21058,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21058: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21061: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21061: \$? = $ac_status" >&5
++  echo "$as_me:21064: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21064: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21067: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21067: \$? = $ac_status" >&5
++  echo "$as_me:21070: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -21076,7 +21079,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21079: result: $cf_cv_wint_t" >&5
++echo "$as_me:21082: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -21100,10 +21103,10 @@
+ 
+ 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
+ 
+-echo "$as_me:21103: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21106: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21106 "configure"
++#line 21109 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21121,16 +21124,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21124: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21127: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21127: \$? = $ac_status" >&5
++  echo "$as_me:21130: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21130: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21133: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21133: \$? = $ac_status" >&5
++  echo "$as_me:21136: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21139,7 +21142,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21142: result: $cf_result" >&5
++echo "$as_me:21145: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -21161,10 +21164,10 @@
+ 
+ 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
+ 
+-echo "$as_me:21164: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21167: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21167 "configure"
++#line 21170 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21182,16 +21185,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21185: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21188: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21188: \$? = $ac_status" >&5
++  echo "$as_me:21191: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21191: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21194: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21194: \$? = $ac_status" >&5
++  echo "$as_me:21197: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21200,7 +21203,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21203: result: $cf_result" >&5
++echo "$as_me:21206: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -21222,10 +21225,10 @@
+ 
+ 	if test "$NCURSES_OK_WINT_T" = 0 ; then
+ 
+-echo "$as_me:21225: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21228: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21228 "configure"
++#line 21231 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21243,16 +21246,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21246: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21249: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21249: \$? = $ac_status" >&5
++  echo "$as_me:21252: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21252: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21255: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21255: \$? = $ac_status" >&5
++  echo "$as_me:21258: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21261,7 +21264,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21264: result: $cf_result" >&5
++echo "$as_me:21267: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -21290,11 +21293,11 @@
+ boolfnames \
+ ttytype
+ do
+-echo "$as_me:21293: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21296: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21297 "configure"
++#line 21300 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -21327,16 +21330,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21330: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21333: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21333: \$? = $ac_status" >&5
++  echo "$as_me:21336: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21336: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21339: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21339: \$? = $ac_status" >&5
++  echo "$as_me:21342: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ 
+@@ -21346,7 +21349,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21349: result: $cf_result" >&5
++echo "$as_me:21352: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test "$cf_result" = yes ; then
+@@ -21358,14 +21361,14 @@
+ EOF
+ 
+ else
+-	echo "$as_me:21361: checking for data $cf_data in library" >&5
++	echo "$as_me:21364: checking for data $cf_data in library" >&5
+ echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6
+ 	# BSD linkers insist on making weak linkage, but resolve at runtime.
+ 	if test "$cross_compiling" = yes; then
+ 
+ 	# cross-compiling
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21368 "configure"
++#line 21371 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -21404,16 +21407,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21407: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21410: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21410: \$? = $ac_status" >&5
++  echo "$as_me:21413: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21413: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21416: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21416: \$? = $ac_status" >&5
++  echo "$as_me:21419: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21425,7 +21428,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21428 "configure"
++#line 21431 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -21457,15 +21460,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21460: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21463: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21463: \$? = $ac_status" >&5
++  echo "$as_me:21466: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21465: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21468: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21468: \$? = $ac_status" >&5
++  echo "$as_me:21471: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ 
+@@ -21477,7 +21480,7 @@
+ fi
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-	echo "$as_me:21480: result: $cf_result" >&5
++	echo "$as_me:21483: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = yes ; then
+ 
+@@ -21494,7 +21497,7 @@
+ 
+ if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
+ then
+-	echo "$as_me:21497: checking for X" >&5
++	echo "$as_me:21500: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
+ # Check whether --with-x or --without-x was given.
+@@ -21598,17 +21601,17 @@
+   # Guess where to find include files, by looking for Intrinsic.h.
+   # First, try using that file with no special directory specified.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21601 "configure"
++#line 21604 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:21605: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:21608: \"$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:21611: \$? = $ac_status" >&5
++  echo "$as_me:21614: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -21641,7 +21644,7 @@
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21644 "configure"
++#line 21647 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -21653,16 +21656,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21656: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21659: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21659: \$? = $ac_status" >&5
++  echo "$as_me:21662: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21662: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21665: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21665: \$? = $ac_status" >&5
++  echo "$as_me:21668: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -21700,7 +21703,7 @@
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:21703: result: $have_x" >&5
++  echo "$as_me:21706: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+   no_x=yes
+ else
+@@ -21710,7 +21713,7 @@
+   # Update the cache value to reflect the command line values.
+   ac_cv_have_x="have_x=yes \
+ 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  echo "$as_me:21713: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "$as_me:21716: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+@@ -21737,11 +21740,11 @@
+     # others require no space.  Words are not sufficient . . . .
+     case `(uname -sr) 2>/dev/null` in
+     "SunOS 5"*)
+-      echo "$as_me:21740: checking whether -R must be followed by a space" >&5
++      echo "$as_me:21743: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+       cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21744 "configure"
++#line 21747 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21753,16 +21756,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21756: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21759: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21759: \$? = $ac_status" >&5
++  echo "$as_me:21762: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21762: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21765: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21765: \$? = $ac_status" >&5
++  echo "$as_me:21768: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_nospace=yes
+ else
+@@ -21772,13 +21775,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+       if test $ac_R_nospace = yes; then
+-	echo "$as_me:21775: result: no" >&5
++	echo "$as_me:21778: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	X_LIBS="$X_LIBS -R$x_libraries"
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21781 "configure"
++#line 21784 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21790,16 +21793,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21793: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21796: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21796: \$? = $ac_status" >&5
++  echo "$as_me:21799: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21799: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21802: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21802: \$? = $ac_status" >&5
++  echo "$as_me:21805: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_space=yes
+ else
+@@ -21809,11 +21812,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	if test $ac_R_space = yes; then
+-	  echo "$as_me:21812: result: yes" >&5
++	  echo "$as_me:21815: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ 	else
+-	  echo "$as_me:21816: result: neither works" >&5
++	  echo "$as_me:21819: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ 	fi
+       fi
+@@ -21833,7 +21836,7 @@
+     # the Alpha needs dnet_stub (dnet does not exist).
+     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21836 "configure"
++#line 21839 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21852,22 +21855,22 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21855: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21858: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21858: \$? = $ac_status" >&5
++  echo "$as_me:21861: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21861: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21864: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21864: \$? = $ac_status" >&5
++  echo "$as_me:21867: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:21870: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:21873: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21875,7 +21878,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21878 "configure"
++#line 21881 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21894,16 +21897,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21897: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21900: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21900: \$? = $ac_status" >&5
++  echo "$as_me:21903: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21903: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21906: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21906: \$? = $ac_status" >&5
++  echo "$as_me:21909: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -21914,14 +21917,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21917: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:21920: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      echo "$as_me:21924: checking for dnet_ntoa in -ldnet_stub" >&5
++      echo "$as_me:21927: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21929,7 +21932,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21932 "configure"
++#line 21935 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21948,16 +21951,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21951: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21954: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21954: \$? = $ac_status" >&5
++  echo "$as_me:21957: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21957: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21960: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21960: \$? = $ac_status" >&5
++  echo "$as_me:21963: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -21968,7 +21971,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21971: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:21974: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -21987,13 +21990,13 @@
+     # on Irix 5.2, according to T.E. Dickey.
+     # The functions gethostbyname, getservbyname, and inet_addr are
+     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+-    echo "$as_me:21990: checking for gethostbyname" >&5
++    echo "$as_me:21993: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21996 "configure"
++#line 21999 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22024,16 +22027,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22027: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22030: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22030: \$? = $ac_status" >&5
++  echo "$as_me:22033: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22033: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22036: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22036: \$? = $ac_status" >&5
++  echo "$as_me:22039: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gethostbyname=yes
+ else
+@@ -22043,11 +22046,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22046: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:22049: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+-      echo "$as_me:22050: checking for gethostbyname in -lnsl" >&5
++      echo "$as_me:22053: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22055,7 +22058,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22058 "configure"
++#line 22061 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22074,16 +22077,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22077: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22080: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22080: \$? = $ac_status" >&5
++  echo "$as_me:22083: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22083: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22086: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22086: \$? = $ac_status" >&5
++  echo "$as_me:22089: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -22094,14 +22097,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22097: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:22100: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test "$ac_cv_lib_nsl_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+-        echo "$as_me:22104: checking for gethostbyname in -lbsd" >&5
++        echo "$as_me:22107: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22109,7 +22112,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22112 "configure"
++#line 22115 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22128,16 +22131,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22131: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22134: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22134: \$? = $ac_status" >&5
++  echo "$as_me:22137: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22137: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22140: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22140: \$? = $ac_status" >&5
++  echo "$as_me:22143: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -22148,7 +22151,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22151: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:22154: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test "$ac_cv_lib_bsd_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -22164,13 +22167,13 @@
+     # variants that don't use the nameserver (or something).  -lsocket
+     # must be given before -lnsl if both are needed.  We assume that
+     # if connect needs -lnsl, so does gethostbyname.
+-    echo "$as_me:22167: checking for connect" >&5
++    echo "$as_me:22170: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22173 "configure"
++#line 22176 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22201,16 +22204,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22204: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22207: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22207: \$? = $ac_status" >&5
++  echo "$as_me:22210: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22210: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22213: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22213: \$? = $ac_status" >&5
++  echo "$as_me:22216: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_connect=yes
+ else
+@@ -22220,11 +22223,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22223: result: $ac_cv_func_connect" >&5
++echo "$as_me:22226: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+ 
+     if test $ac_cv_func_connect = no; then
+-      echo "$as_me:22227: checking for connect in -lsocket" >&5
++      echo "$as_me:22230: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22232,7 +22235,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22235 "configure"
++#line 22238 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22251,16 +22254,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "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='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22260: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22263: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22263: \$? = $ac_status" >&5
++  echo "$as_me:22266: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_socket_connect=yes
+ else
+@@ -22271,7 +22274,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22274: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:22277: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test "$ac_cv_lib_socket_connect" = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -22280,13 +22283,13 @@
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    echo "$as_me:22283: checking for remove" >&5
++    echo "$as_me:22286: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22289 "configure"
++#line 22292 "configure"
+ #include "confdefs.h"
+ #define remove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22317,16 +22320,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22320: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22323: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22323: \$? = $ac_status" >&5
++  echo "$as_me:22326: \$? = $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:22329: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22329: \$? = $ac_status" >&5
++  echo "$as_me:22332: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_remove=yes
+ else
+@@ -22336,11 +22339,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22339: result: $ac_cv_func_remove" >&5
++echo "$as_me:22342: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+ 
+     if test $ac_cv_func_remove = no; then
+-      echo "$as_me:22343: checking for remove in -lposix" >&5
++      echo "$as_me:22346: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22348,7 +22351,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22351 "configure"
++#line 22354 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22367,16 +22370,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22370: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22373: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22373: \$? = $ac_status" >&5
++  echo "$as_me:22376: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22376: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22379: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22379: \$? = $ac_status" >&5
++  echo "$as_me:22382: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_posix_remove=yes
+ else
+@@ -22387,7 +22390,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22390: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:22393: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test "$ac_cv_lib_posix_remove" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -22396,13 +22399,13 @@
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    echo "$as_me:22399: checking for shmat" >&5
++    echo "$as_me:22402: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22405 "configure"
++#line 22408 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22433,16 +22436,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22436: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22439: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22439: \$? = $ac_status" >&5
++  echo "$as_me:22442: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22442: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22445: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22445: \$? = $ac_status" >&5
++  echo "$as_me:22448: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_shmat=yes
+ else
+@@ -22452,11 +22455,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22455: result: $ac_cv_func_shmat" >&5
++echo "$as_me:22458: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+ 
+     if test $ac_cv_func_shmat = no; then
+-      echo "$as_me:22459: checking for shmat in -lipc" >&5
++      echo "$as_me:22462: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22464,7 +22467,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22467 "configure"
++#line 22470 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22483,16 +22486,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22486: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22489: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22489: \$? = $ac_status" >&5
++  echo "$as_me:22492: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22492: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22495: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22495: \$? = $ac_status" >&5
++  echo "$as_me:22498: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+@@ -22503,7 +22506,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22506: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:22509: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test "$ac_cv_lib_ipc_shmat" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -22521,7 +22524,7 @@
+   # These have to be linked with before -lX11, unlike the other
+   # libraries we check for below, so use a different variable.
+   # John Interrante, Karl Berry
+-  echo "$as_me:22524: checking for IceConnectionNumber in -lICE" >&5
++  echo "$as_me:22527: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22529,7 +22532,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22532 "configure"
++#line 22535 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22548,16 +22551,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22551: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22554: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22554: \$? = $ac_status" >&5
++  echo "$as_me:22557: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22557: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22560: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22560: \$? = $ac_status" >&5
++  echo "$as_me:22563: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -22568,7 +22571,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22571: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:22574: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -22615,16 +22618,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22618: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22621: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22623: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22626: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22627: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22630: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -22663,16 +22666,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22666: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:22669: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22671: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:22674: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22675: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22678: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -22711,23 +22714,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22714: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:22717: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22719: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:22722: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22723: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22726: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:22730: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:22733: 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.
+@@ -22744,7 +22747,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:22747: result: $enable_warnings" >&5
++echo "$as_me:22750: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -22767,10 +22770,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:22770: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:22773: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -22820,12 +22823,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:22823: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:22826: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22826: \$? = $ac_status" >&5
++  echo "$as_me:22829: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:22828: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:22831: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -22903,7 +22906,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22906 "configure"
++#line 22909 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22918,26 +22921,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22921: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22924: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22924: \$? = $ac_status" >&5
++  echo "$as_me:22927: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22927: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22930: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22930: \$? = $ac_status" >&5
++  echo "$as_me:22933: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:22933: checking for X11/Xt const-feature" >&5
++echo "$as_me:22936: 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 22940 "configure"
++#line 22943 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -22955,16 +22958,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22958: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22961: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22961: \$? = $ac_status" >&5
++  echo "$as_me:22964: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22964: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22967: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22967: \$? = $ac_status" >&5
++  echo "$as_me:22970: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -22979,7 +22982,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22982: result: $cf_cv_const_x_string" >&5
++echo "$as_me:22985: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -23008,7 +23011,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:23030: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -23040,12 +23043,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:23043: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:23046: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23046: \$? = $ac_status" >&5
++  echo "$as_me:23049: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:23048: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:23051: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -23053,7 +23056,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:23056: checking for $CC warning options..." >&5
++	{ echo "$as_me:23059: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -23076,12 +23079,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:23079: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:23082: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23082: \$? = $ac_status" >&5
++  echo "$as_me:23085: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:23084: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:23087: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -23089,7 +23092,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:23092: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:23095: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -23099,7 +23102,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:23102: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:23105: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -23116,7 +23119,7 @@
+ 
+ fi
+ 
+-echo "$as_me:23119: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:23122: 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.
+@@ -23138,7 +23141,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:23141: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:23144: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -23252,23 +23255,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:23255: checking for dmalloc.h" >&5
++	echo "$as_me:23258: 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 23261 "configure"
++#line 23264 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:23265: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23268: \"$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:23271: \$? = $ac_status" >&5
++  echo "$as_me:23274: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23287,11 +23290,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23290: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:23293: 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:23294: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:23297: 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
+@@ -23299,7 +23302,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23302 "configure"
++#line 23305 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -23318,16 +23321,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23321: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23324: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23324: \$? = $ac_status" >&5
++  echo "$as_me:23327: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23327: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23330: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23330: \$? = $ac_status" >&5
++  echo "$as_me:23333: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -23338,7 +23341,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23341: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:23344: 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:23359: 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.
+@@ -23375,7 +23378,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:23378: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:23381: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -23489,23 +23492,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:23492: checking for dbmalloc.h" >&5
++	echo "$as_me:23495: 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 23498 "configure"
++#line 23501 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:23502: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23505: \"$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:23508: \$? = $ac_status" >&5
++  echo "$as_me:23511: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23524,11 +23527,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23527: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:23530: 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:23531: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:23534: 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
+@@ -23536,7 +23539,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23539 "configure"
++#line 23542 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -23555,16 +23558,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23558: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23561: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23561: \$? = $ac_status" >&5
++  echo "$as_me:23564: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23564: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23567: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23567: \$? = $ac_status" >&5
++  echo "$as_me:23570: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -23575,7 +23578,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23578: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:23581: 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:23596: 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.
+@@ -23612,7 +23615,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:23615: result: ${with_valgrind:-no}" >&5
++echo "$as_me:23618: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -23725,7 +23728,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:23728: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:23731: 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.
+@@ -23736,7 +23739,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:23739: result: $with_no_leaks" >&5
++echo "$as_me:23742: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -23754,7 +23757,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:23757: checking for an rpath option" >&5
++	echo "$as_me:23760: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -23785,12 +23788,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:23788: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:23791: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:23793: checking if we need a space after rpath option" >&5
++		echo "$as_me:23796: 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"
+ 
+@@ -23811,7 +23814,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23814 "configure"
++#line 23817 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -23823,16 +23826,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23826: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23829: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23829: \$? = $ac_status" >&5
++  echo "$as_me:23832: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23832: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23835: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23835: \$? = $ac_status" >&5
++  echo "$as_me:23838: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -23842,14 +23845,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:23845: result: $cf_rpath_space" >&5
++		echo "$as_me:23848: 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:23852: checking if rpath-hack should be disabled" >&5
++echo "$as_me:23855: 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.
+@@ -23867,22 +23870,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:23870: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:23873: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:23875: checking for updated LDFLAGS" >&5
++echo "$as_me:23878: 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:23878: result: maybe" >&5
++	echo "$as_me:23881: 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:23885: checking for $ac_word" >&5
++echo "$as_me:23888: 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
+@@ -23897,7 +23900,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:23900: found $ac_dir/$ac_word" >&5
++echo "$as_me:23903: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -23905,10 +23908,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:23908: result: $cf_ldd_prog" >&5
++  echo "$as_me:23911: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:23911: result: no" >&5
++  echo "$as_me:23914: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -23922,7 +23925,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23925 "configure"
++#line 23928 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -23934,16 +23937,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23937: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23940: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23940: \$? = $ac_status" >&5
++  echo "$as_me:23943: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23943: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23946: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23946: \$? = $ac_status" >&5
++  echo "$as_me:23949: \$? = $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`
+@@ -23971,7 +23974,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:23974: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:23977: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -23983,11 +23986,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23986: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23989: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23990: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23993: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -24024,7 +24027,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:24027: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:24030: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -24037,11 +24040,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:24040: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:24043: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:24044: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:24047: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -24078,7 +24081,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:24081: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:24084: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -24091,14 +24094,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:24094: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:24097: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:24098: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:24101: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:24101: result: no" >&5
++	echo "$as_me:24104: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -24188,7 +24191,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:24191: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:24194: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -24369,7 +24372,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:24372: error: ambiguous option: $1
++    { { echo "$as_me:24375: 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;}
+@@ -24388,7 +24391,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:24391: error: unrecognized option: $1
++  -*) { { echo "$as_me:24394: 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;}
+@@ -24438,7 +24441,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:24441: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:24444: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -24754,7 +24757,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:24757: creating $ac_file" >&5
++    { echo "$as_me:24760: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -24772,7 +24775,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:24775: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:24778: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -24785,7 +24788,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:24788: error: cannot find input file: $f" >&5
++           { { echo "$as_me:24791: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -24801,7 +24804,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:24804: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:24807: 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;}
+@@ -24810,7 +24813,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:24813: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:24816: 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;}
+@@ -24855,7 +24858,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:24858: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:24861: 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;}
+@@ -24866,7 +24869,7 @@
+     $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:24869: WARNING: Some variables may not be substituted:
++      { echo "$as_me:24872: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -24915,7 +24918,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:24918: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:24921: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -24926,7 +24929,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:24929: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:24932: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -24939,7 +24942,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:24942: error: cannot find input file: $f" >&5
++           { { echo "$as_me:24945: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -24997,7 +25000,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:25000: $ac_file is unchanged" >&5
++      { echo "$as_me:25003: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+Index: test/demo_menus.c
+Prereq:  1.83 
+--- ncurses-6.5-20241123+/test/demo_menus.c	2024-10-19 21:53:57.000000000 +0000
++++ ncurses-6.5-20241130/test/demo_menus.c	2024-11-30 18:52:09.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_menus.c,v 1.83 2024/10/19 21:53:57 tom Exp $
++ * $Id: demo_menus.c,v 1.85 2024/11/30 18:52:09 tom Exp $
+  *
+  * Demonstrate a variety of functions from the menu library.
+  * Thomas Dickey - 2005/4/9
+@@ -991,7 +991,7 @@
+ 	," -H       rip-off header line (can repeat)"
+ #endif
+ #ifdef TRACE
+-	," -t mask  specify default trace-level (may toggle with ^T)"
++	," -D mask  specify trace mask (may toggle with ^T)"
+ #endif
+     };
+     size_t n;
+@@ -1011,7 +1011,7 @@
+     setlocale(LC_ALL, "");
+     START_TRACE();
+ 
+-    while ((ch = getopt(argc, argv, OPTS_COMMON "FHt:")) != -1) {
++    while ((ch = getopt(argc, argv, OPTS_COMMON "D:FH")) != -1) {
+ 	switch (ch) {
+ #if HAVE_RIPOFFLINE
+ 	case 'F':
+@@ -1022,7 +1022,7 @@
+ 	    break;
+ #endif /* HAVE_RIPOFFLINE */
+ #ifdef TRACE
+-	case 't':
++	case 'D':
+ 	    curses_trace((unsigned) strtoul(optarg, 0, 0));
+ 	    break;
+ #endif
+Index: test/demo_tabs.c
+Prereq:  1.10 
+--- ncurses-6.5-20241123+/test/demo_tabs.c	2022-12-04 00:40:11.000000000 +0000
++++ ncurses-6.5-20241130/test/demo_tabs.c	2024-11-30 18:47:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
++ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -29,7 +29,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: demo_tabs.c,v 1.10 2022/12/04 00:40:11 tom Exp $
++ * $Id: demo_tabs.c,v 1.12 2024/11/30 18:47:39 tom Exp $
+  *
+  * A simple demo of tabs in curses.
+  */
+@@ -48,7 +48,7 @@
+ 	,""
+ 	,USAGE_COMMON
+ 	,"Options:"
+-	," -l COUNT total number of lines to show"
++	," -m NUM   total number of lines to show"
+ 	," -t NUM   set TABSIZE variable to the given value"
+     };
+     unsigned n;
+@@ -69,9 +69,9 @@
+     int line_limit = -1;
+     int curses_stops = -1;
+ 
+-    while ((ch = getopt(argc, argv, OPTS_COMMON "l:t:")) != -1) {
++    while ((ch = getopt(argc, argv, OPTS_COMMON "m:t:")) != -1) {
+ 	switch (ch) {
+-	case 'l':
++	case 'm':
+ 	    line_limit = atoi(optarg);
+ 	    break;
+ 	case 't':
+Index: test/demo_termcap.c
+Prereq:  1.70 
+--- ncurses-6.5-20241123+/test/demo_termcap.c	2024-10-06 20:05:09.000000000 +0000
++++ ncurses-6.5-20241130/test/demo_termcap.c	2024-11-30 18:31:01.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: demo_termcap.c,v 1.70 2024/10/06 20:05:09 tom Exp $
++ * $Id: demo_termcap.c,v 1.72 2024/11/30 18:31:01 tom Exp $
+  *
+  * A simple demo of the termcap interface.
+  */
+@@ -756,10 +756,10 @@
+ 	," -b       print boolean-capabilities"
+ 	," -d LIST  colon-separated list of databases to use"
+ 	," -e NAME  environment variable to set with -d option"
+-	," -i NAME  terminal description to use as names for \"-a\" option, etc."
++	," -i NAME  terminal description to use as names for \"-a\" option"
+ 	," -n       print numeric-capabilities"
+ 	," -q       quiet (prints only counts)"
+-	," -r COUNT repeat for given count"
++	," -r NUM   repeat tests NUM times"
+ 	," -s       print string-capabilities"
+ 	," -v       print termcap-variables"
+ #ifdef NCURSES_VERSION
+Index: test/demo_terminfo.c
+Prereq:  1.59 
+--- ncurses-6.5-20241123+/test/demo_terminfo.c	2024-10-06 21:16:43.000000000 +0000
++++ ncurses-6.5-20241130/test/demo_terminfo.c	2024-11-30 18:31:01.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: demo_terminfo.c,v 1.59 2024/10/06 21:16:43 tom Exp $
++ * $Id: demo_terminfo.c,v 1.61 2024/11/30 18:31:01 tom Exp $
+  *
+  * A simple demo of the terminfo interface.
+  */
+@@ -786,11 +786,11 @@
+ 	," -b       print boolean-capabilities"
+ 	," -d LIST  colon-separated list of databases to use"
+ 	," -e NAME  environment variable to set with -d option"
+-	," -f       print full names"
++	," -f       print full terminfo names"
+ 	," -i NAME  terminal description to use as names for \"-a\" option"
+ 	," -n       print numeric-capabilities"
+ 	," -q       quiet (prints only counts)"
+-	," -r COUNT repeat for given count"
++	," -r NUM   repeat tests NUM times"
+ 	," -s       print string-capabilities"
+ #ifdef NCURSES_VERSION
+ 	," -x       print extended capabilities"
+Index: test/dots_curses.c
+Prereq:  1.25 
+--- ncurses-6.5-20241123+/test/dots_curses.c	2023-01-07 17:21:48.000000000 +0000
++++ ncurses-6.5-20241130/test/dots_curses.c	2024-11-30 17:48:07.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2014,2017 Free Software Foundation, Inc.                       *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: dots_curses.c,v 1.25 2023/01/07 17:21:48 tom Exp $
++ * $Id: dots_curses.c,v 1.26 2024/11/30 17:48:07 tom Exp $
+  *
+  * A simple demo of the curses interface used for comparison with termcap.
+  */
+@@ -97,7 +97,7 @@
+ 	,"Options:"
+ 	," -T TERM  override $TERM"
+ #if HAVE_USE_DEFAULT_COLORS
+-	," -d       invoke use_default_colors()"
++	," -d       invoke use_default_colors"
+ #endif
+ #if HAVE_USE_ENV
+ 	," -e       allow environment $LINES / $COLUMNS"
+Index: test/dots_xcurses.c
+Prereq:  1.30 
+--- ncurses-6.5-20241123+/test/dots_xcurses.c	2024-08-31 15:55:52.000000000 +0000
++++ ncurses-6.5-20241130/test/dots_xcurses.c	2024-11-30 17:41:18.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: dots_xcurses.c,v 1.30 2024/08/31 15:55:52 tom Exp $
++ * $Id: dots_xcurses.c,v 1.31 2024/11/30 17:41:18 tom Exp $
+  *
+  * A simple demo of the wide-curses interface used for comparison with termcap.
+  */
+@@ -120,7 +120,7 @@
+ 	,"Options:"
+ 	," -T TERM  override $TERM"
+ #if HAVE_USE_DEFAULT_COLORS
+-	," -d       invoke use_default_colors()"
++	," -d       invoke use_default_colors"
+ #endif
+ #if HAVE_USE_ENV
+ 	," -e       allow environment $LINES / $COLUMNS"
+Index: test/filter.c
+Prereq:  1.39 
+--- ncurses-6.5-20241123+/test/filter.c	2024-10-05 19:26:24.000000000 +0000
++++ ncurses-6.5-20241130/test/filter.c	2024-11-30 16:49:53.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+  * Author:  Thomas E. Dickey 1998
+  *
+- * $Id: filter.c,v 1.39 2024/10/05 19:26:24 tom Exp $
++ * $Id: filter.c,v 1.40 2024/11/30 16:49:53 tom Exp $
+  *
+  * An example of the 'filter()' function in ncurses, this program prompts
+  * for commands and executes them (like a command shell).  It illustrates
+@@ -310,7 +310,7 @@
+ #ifdef NCURSES_VERSION
+ 	," -a       suppress xterm alternate-screen by amending smcup/rmcup"
+ #endif
+-	," -c       show current time on prompt line with \"Command\""
++	," -t       show current time on prompt line with \"Command\""
+ #if HAVE_USE_DEFAULT_COLORS
+ 	," -d       invoke use_default_colors"
+ #endif
+@@ -335,7 +335,7 @@
+ #ifdef NCURSES_VERSION
+     bool a_option = FALSE;
+ #endif
+-    bool c_option = FALSE;
++    bool t_option = FALSE;
+ #if HAVE_USE_DEFAULT_COLORS
+     bool d_option = FALSE;
+ #endif
+@@ -344,15 +344,15 @@
+ 
+     setlocale(LC_ALL, "");
+ 
+-    while ((ch = getopt(argc, argv, OPTS_COMMON "adcip")) != -1) {
++    while ((ch = getopt(argc, argv, OPTS_COMMON "adtip")) != -1) {
+ 	switch (ch) {
+ #ifdef NCURSES_VERSION
+ 	case 'a':
+ 	    a_option = TRUE;
+ 	    break;
+ #endif
+-	case 'c':
+-	    c_option = TRUE;
++	case 't':
++	    t_option = TRUE;
+ 	    break;
+ #if HAVE_USE_DEFAULT_COLORS
+ 	case 'd':
+@@ -408,7 +408,7 @@
+ 
+     for (;;) {
+ 	int code = new_command(buffer, sizeof(buffer) - 1,
+-			       underline, c_option, p_option);
++			       underline, t_option, p_option);
+ 	if (code == ERR || *buffer == '\0')
+ 	    break;
+ 	reset_shell_mode();
+Index: test/gdc.c
+Prereq:  1.62 
+--- ncurses-6.5-20241123+/test/gdc.c	2024-10-06 20:08:59.000000000 +0000
++++ ncurses-6.5-20241130/test/gdc.c	2024-11-30 18:56:02.000000000 +0000
+@@ -34,7 +34,7 @@
+  * modified 10-18-89 for curses (jrl)
+  * 10-18-89 added signal handling
+  *
+- * $Id: gdc.c,v 1.62 2024/10/06 20:08:59 tom Exp $
++ * $Id: gdc.c,v 1.63 2024/11/30 18:56:02 tom Exp $
+  */
+ 
+ #include 
+@@ -166,7 +166,7 @@
+ #endif
+ 	," -n       reads input from /dev/null"
+ 	," -s       scrolls each digit into place"
+-	," -t TIME  specify starting time as hh:mm:ss (default is ``now'')"
++	," -t TIME  specify starting time as hh:mm:ss (default is \"now\")"
+     };
+     unsigned j;
+     for (j = 0; j < SIZEOF(msg); j++)
+Index: test/hashtest.c
+Prereq:  1.39 
+--- ncurses-6.5-20241123+/test/hashtest.c	2022-12-04 00:40:11.000000000 +0000
++++ ncurses-6.5-20241130/test/hashtest.c	2024-11-30 18:54:40.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
++ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2013,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -31,7 +31,7 @@
+  *
+  * Generate timing statistics for vertical-motion optimization.
+  *
+- * $Id: hashtest.c,v 1.39 2022/12/04 00:40:11 tom Exp $
++ * $Id: hashtest.c,v 1.42 2024/11/30 18:54:40 tom Exp $
+  */
+ 
+ #include 
+@@ -158,13 +158,13 @@
+ 	,""
+ 	,USAGE_COMMON
+ 	,"Options:"
+-	," -c       continuous (don't reset between refresh's)"
+-	," -F num   leave 'num' lines constant for footer"
+-	," -H num   leave 'num' lines constant for header"
+-	," -l num   repeat test 'num' times"
++	," -S       continuous (don't reset between refresh's)"
++	," -F NUM   leave NUM lines constant for footer"
++	," -H NUM   leave NUM lines constant for header"
++	," -r NUM   repeat tests NUM times"
+ 	," -n       test the normal optimizer"
+ 	," -o       test the hashed optimizer"
+-	," -r       reverse the loops"
++	," -R       reverse the loops"
+ 	," -s       single-step"
+ 	," -x       assume lower-right corner extension"
+     };
+@@ -188,9 +188,9 @@
+ 
+     setlocale(LC_ALL, "");
+ 
+-    while ((ch = getopt(argc, argv, OPTS_COMMON "cF:H:l:norsx")) != -1) {
++    while ((ch = getopt(argc, argv, OPTS_COMMON "F:H:RSnor:sx")) != -1) {
+ 	switch (ch) {
+-	case 'c':
++	case 'S':
+ 	    continuous = TRUE;
+ 	    break;
+ 	case 'F':
+@@ -199,7 +199,7 @@
+ 	case 'H':
+ 	    head_lines = atoi(optarg);
+ 	    break;
+-	case 'l':
++	case 'r':
+ 	    test_loops = atoi(optarg);
+ 	    assert(test_loops >= 0);
+ 	    break;
+@@ -209,7 +209,7 @@
+ 	case 'o':
+ 	    test_optimize = TRUE;
+ 	    break;
+-	case 'r':
++	case 'R':
+ 	    reverse_loops = TRUE;
+ 	    break;
+ 	case 's':
+Index: test/list_keys.c
+Prereq:  1.34 
+--- ncurses-6.5-20241123+/test/list_keys.c	2024-10-05 19:26:24.000000000 +0000
++++ ncurses-6.5-20241130/test/list_keys.c	2024-11-30 18:07:01.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: list_keys.c,v 1.34 2024/10/05 19:26:24 tom Exp $
++ * $Id: list_keys.c,v 1.36 2024/11/30 18:07:01 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -440,9 +440,9 @@
+ 	,""
+ 	,USAGE_COMMON
+ 	,"Options:"
+-	," -f       print full names"
++	," -f       print full terminfo names"
+ 	," -m       print modifier-column for shift/control keys"
+-	," -t       print result as CSV table"
++	," -t       print the result as CSV table"
+ #ifdef NCURSES_VERSION
+ 	," -x       print extended capabilities"
+ #endif
+Index: test/ncurses.c
+Prereq:  1.541 
+--- ncurses-6.5-20241123+/test/ncurses.c	2024-10-06 20:18:59.000000000 +0000
++++ ncurses-6.5-20241130/test/ncurses.c	2024-11-30 18:54:06.000000000 +0000
+@@ -41,7 +41,7 @@
+    Author: Eric S. Raymond  1993
+            Thomas E. Dickey (beginning revision 1.27 in 1996).
+ 
+-$Id: ncurses.c,v 1.541 2024/10/06 20:18:59 tom Exp $
++$Id: ncurses.c,v 1.544 2024/11/30 18:54:06 tom Exp $
+ 
+ ***************************************************************************/
+ 
+@@ -7647,7 +7647,7 @@
+ 	," -E       call use_env(FALSE) to ignore $LINES and $COLUMNS"
+ #endif
+ #if USE_SOFTKEYS
+-	," -e fmt   specify format for soft-keys test (e)"
++	," -e FMT   specify format for soft-keys test (e)"
+ #endif
+ #if HAVE_RIPOFFLINE
+ 	," -F       rip-off footer line (can repeat)"
+@@ -7658,13 +7658,13 @@
+ 	," -p file  rgb values to use in 'd' rather than ncurses's builtin"
+ #endif
+ #if USE_LIBPANEL
+-	," -s msec  specify nominal time for panel-demo (default: 1, to hold)"
++	," -s MSECS specify nominal time for panel-demo (default: 1, to hold)"
+ #endif
+ #if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20120714) && !defined(_NC_WINDOWS)
+ 	," -T       call use_tioctl(TRUE) to allow SIGWINCH to override environment"
+ #endif
+ #ifdef TRACE
+-	," -t mask  specify default trace-level (may toggle with ^T)"
++	," -D mask  specify trace mask (may toggle with ^T)"
+ #endif
+ #if HAVE_COLOR_CONTENT
+ 	," -x       use xterm-compatible control for reading color palette"
+@@ -7907,7 +7907,7 @@
+ 
+     setlocale(LC_ALL, "");
+ 
+-    while ((ch = getopt(argc, argv, OPTS_COMMON "a:dEe:FHmp:s:Tt:x")) != -1) {
++    while ((ch = getopt(argc, argv, OPTS_COMMON "D:EFHTa:de:mp:s:x")) != -1) {
+ 	switch (ch) {
+ #ifdef NCURSES_VERSION_PATCH
+ #if HAVE_USE_DEFAULT_COLORS
+@@ -7971,7 +7971,7 @@
+ 	    break;
+ #endif
+ #ifdef TRACE
+-	case 't':
++	case 'D':
+ 	    save_trace = (unsigned) strtol(optarg, 0, 0);
+ 	    break;
+ #endif
+Index: test/padview.c
+Prereq:  1.24 
+--- ncurses-6.5-20241123+/test/padview.c	2024-10-06 21:08:25.000000000 +0000
++++ ncurses-6.5-20241130/test/padview.c	2024-11-30 18:14:46.000000000 +0000
+@@ -29,7 +29,7 @@
+ /*
+  * clone of view.c, using pads
+  *
+- * $Id: padview.c,v 1.24 2024/10/06 21:08:25 tom Exp $
++ * $Id: padview.c,v 1.26 2024/11/30 18:14:46 tom Exp $
+  */
+ 
+ #include 
+@@ -256,15 +256,15 @@
+ 	,""
+ 	,USAGE_COMMON
+ 	,"Options:"
+-	," -c       use color if terminal supports it"
++	," -C       use color if terminal supports it"
+ 	," -i       ignore INT, QUIT, TERM signals"
+ #if USE_WIDEC_SUPPORT
+ 	," -n       use waddch (bytes) rather then wadd_wch (wide-chars)"
+ #endif
+-	," -s       start in single-step mode, waiting for input"
++	," -s       start in single-step mode"
+ #ifdef TRACE
+ 	," -t       trace screen updates"
+-	," -T NUM   specify trace mask"
++	," -D NUM   specify trace mask"
+ #endif
+     };
+     size_t n;
+@@ -318,9 +318,9 @@
+ 
+     setlocale(LC_ALL, "");
+ 
+-    while ((ch = getopt(argc, argv, OPTS_COMMON "cinstT:")) != -1) {
++    while ((ch = getopt(argc, argv, OPTS_COMMON "CD:inst")) != -1) {
+ 	switch (ch) {
+-	case 'c':
++	case 'C':
+ 	    try_color = TRUE;
+ 	    break;
+ 	case 'i':
+@@ -335,7 +335,7 @@
+ 	    single_step = TRUE;
+ 	    break;
+ #ifdef TRACE
+-	case 'T':
++	case 'D':
+ 	    {
+ 		char *next = 0;
+ 		int tvalue = (int) strtol(optarg, &next, 0);
+Index: test/pair_content.c
+Prereq:  1.22 
+--- ncurses-6.5-20241123+/test/pair_content.c	2023-02-25 16:43:56.000000000 +0000
++++ ncurses-6.5-20241130/test/pair_content.c	2024-11-30 18:31:01.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: pair_content.c,v 1.22 2023/02/25 16:43:56 tom Exp $
++ * $Id: pair_content.c,v 1.24 2024/11/30 18:31:01 tom Exp $
+  */
+ 
+ #define NEED_TIME_H
+@@ -213,10 +213,10 @@
+ 	,"Options:"
+ 	," -f PAIR  first color pair to test (default: 1)"
+ 	," -i       interactive, showing test-progress"
+-	," -l PAIR  last color pair to test (default: max_pairs-1)"
++	," -F PAIR  last color pair to test (default: max_pairs-1)"
+ 	," -n       do not initialize color pairs"
+ 	," -p       print data for color pairs instead of testing"
+-	," -r COUNT repeat for given count"
++	," -r NUM   repeat tests NUM times"
+ 	," -s       initialize pairs sequentially rather than random"
+ #if USE_EXTENDED_COLOR
+ 	," -x       use extended color pairs/values"
+@@ -236,7 +236,7 @@
+ {
+     int ch;
+ 
+-    while ((ch = getopt(argc, argv, OPTS_COMMON "f:il:npr:sx")) != -1) {
++    while ((ch = getopt(argc, argv, OPTS_COMMON "f:iF:npr:sx")) != -1) {
+ 	switch (ch) {
+ 	case 'f':
+ 	    if ((f_opt = atoi(optarg)) <= 0)
+@@ -245,7 +245,7 @@
+ 	case 'i':
+ 	    i_opt = 1;
+ 	    break;
+-	case 'l':
++	case 'F':
+ 	    if ((l_opt = atoi(optarg)) <= 0)
+ 		usage(FALSE);
+ 	    break;
+Index: test/picsmap.c
+Prereq:  1.150 
+--- ncurses-6.5-20241123+/test/picsmap.c	2024-10-05 19:26:24.000000000 +0000
++++ ncurses-6.5-20241130/test/picsmap.c	2024-11-30 21:39:57.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: picsmap.c,v 1.150 2024/10/05 19:26:24 tom Exp $
++ * $Id: picsmap.c,v 1.152 2024/11/30 21:39:57 tom Exp $
+  *
+  * Author: Thomas E. Dickey
+  *
+@@ -494,7 +494,7 @@
+ 	," -d       invoke use_default_colors"
+ #endif
+ 	," -L       add debugging information to logfile"
+-	," -l FILE  write informational messages to FILE"
++	," -F FILE  write informational messages to FILE"
+ 	," -p FILE  color-palette file (default \"$TERM.dat\")"
+ 	," -q       less verbose"
+ 	," -r FILE  xpm uses X rgb color-names in FILE (default \"" RGB_PATH "\")"
+@@ -948,6 +948,7 @@
+     for (n = 0; data[n] != 0; ++n) {
+ 	if (strlen(t = data[n]) >= sizeof(buf) - 1)
+ 	    continue;
++	t = strcpy(buf, t);
+ 	if (*(s = skip_s(t)) == '!')
+ 	    continue;
+ 
+@@ -1156,6 +1157,7 @@
+     for (n = 0; data[n] != 0; ++n) {
+ 	if (strlen(s = data[n]) >= sizeof(buf) - 1)
+ 	    continue;
++	s = strcpy(buf, s);
+ 	switch (state) {
+ 	case 0:
+ 	    if (match_c(s, " /* XPM */ ")) {
+@@ -1730,7 +1732,7 @@
+     const char *palette_path = 0;
+     const char *rgb_path = RGB_PATH;
+ 
+-    while ((ch = getopt(argc, argv, OPTS_COMMON "a:dLl:p:qr:s:x:")) != -1) {
++    while ((ch = getopt(argc, argv, OPTS_COMMON "a:dLF:p:qr:s:x:")) != -1) {
+ 	switch (ch) {
+ 	case 'a':
+ 	    if (sscanf(optarg, "%lf%c", &aspect_ratio, &ignore_ch) != 1
+@@ -1748,7 +1750,7 @@
+ 	case 'L':
+ 	    debugging = TRUE;
+ 	    break;
+-	case 'l':
++	case 'F':
+ 	    if ((logfp = fopen(optarg, "a")) == 0)
+ 		failed(optarg);
+ 	    break;
+Index: test/savescreen.c
+Prereq:  1.65 
+--- ncurses-6.5-20241123+/test/savescreen.c	2024-10-06 21:10:09.000000000 +0000
++++ ncurses-6.5-20241130/test/savescreen.c	2024-11-30 18:48:40.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: savescreen.c,v 1.65 2024/10/06 21:10:09 tom Exp $
++ * $Id: savescreen.c,v 1.66 2024/11/30 18:48:40 tom Exp $
+  *
+  * Demonstrate save/restore functions from the curses library.
+  * Thomas Dickey - 2007/7/14
+@@ -261,7 +261,7 @@
+ 	,""
+ 	,USAGE_COMMON
+ 	,"Options:"
+-	," -f file  fill/initialize screen using text from this file"
++	," -f FILE  fill/initialize screen using text from this file"
+ 	," -i       use scr_init/scr_restore rather than scr_set"
+ 	," -k       keep the restored dump-files rather than removing them"
+ 	," -r       replay the screen-dump files"
+Index: test/test_arrays.c
+Prereq:  1.13 
+--- ncurses-6.5-20241123+/test/test_arrays.c	2022-12-10 23:23:27.000000000 +0000
++++ ncurses-6.5-20241130/test/test_arrays.c	2024-11-30 17:00:55.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2022 Thomas E. Dickey                                     *
++ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2007-2010,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_arrays.c,v 1.13 2022/12/10 23:23:27 tom Exp $
++ * $Id: test_arrays.c,v 1.14 2024/11/30 17:00:55 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -53,7 +53,7 @@
+ 
+ static bool opt_C;
+ static bool opt_T;
+-static bool opt_c;
++static bool opt_s;
+ static bool opt_f;
+ static bool opt_n;
+ static bool opt_t;
+@@ -75,15 +75,15 @@
+ dump_plain(void)
+ {
+     PLAIN(opt_T && opt_n, boolnames);
+-    PLAIN(opt_C && opt_c, boolcodes);
++    PLAIN(opt_C && opt_s, boolcodes);
+     PLAIN(opt_T && opt_f, boolfnames);
+ 
+     PLAIN(opt_T && opt_n, numnames);
+-    PLAIN(opt_C && opt_c, numcodes);
++    PLAIN(opt_C && opt_s, numcodes);
+     PLAIN(opt_T && opt_f, numfnames);
+ 
+     PLAIN(opt_T && opt_n, strnames);
+-    PLAIN(opt_C && opt_c, strcodes);
++    PLAIN(opt_C && opt_s, strcodes);
+     PLAIN(opt_T && opt_f, strfnames);
+ }
+ 
+@@ -99,7 +99,7 @@
+     STRING(opt_t, "Index");
+     STRING(opt_t, "Type");
+     STRING(opt_n, "Name");
+-    STRING(opt_c, "Code");
++    STRING(opt_s, "Code");
+     STRING(opt_f, "FName");
+     printf("\n");
+ 
+@@ -108,7 +108,7 @@
+ 	NUMBER(opt_t, r);
+ 	STRING(opt_t, "bool");
+ 	STRING(opt_T && opt_n, boolnames[r]);
+-	STRING(opt_C && opt_c, boolcodes[r]);
++	STRING(opt_C && opt_s, boolcodes[r]);
+ 	STRING(opt_T && opt_f, boolfnames[r]);
+ 	printf("\n");
+     }
+@@ -118,7 +118,7 @@
+ 	NUMBER(opt_t, r);
+ 	STRING(opt_t, "num");
+ 	STRING(opt_T && opt_n, numnames[r]);
+-	STRING(opt_C && opt_c, numcodes[r]);
++	STRING(opt_C && opt_s, numcodes[r]);
+ 	STRING(opt_T && opt_f, numfnames[r]);
+ 	printf("\n");
+     }
+@@ -128,7 +128,7 @@
+ 	NUMBER(opt_t, r);
+ 	STRING(opt_t, "str");
+ 	STRING(opt_T && opt_n, strnames[r]);
+-	STRING(opt_C && opt_c, strcodes[r]);
++	STRING(opt_C && opt_s, strcodes[r]);
+ 	STRING(opt_T && opt_f, strfnames[r]);
+ 	printf("\n");
+     }
+@@ -148,7 +148,7 @@
+ 	,"Options:"
+ 	," -C       print termcap names"
+ 	," -T       print terminfo names"
+-	," -c       print termcap names"
++	," -s       print short termcap names"
+ 	," -f       print full terminfo names"
+ 	," -n       print short terminfo names"
+ 	," -t       print the result as CSV table"
+@@ -168,7 +168,7 @@
+ {
+     int ch;
+ 
+-    while ((ch = getopt(argc, argv, OPTS_COMMON "CTcfnt")) != -1) {
++    while ((ch = getopt(argc, argv, OPTS_COMMON "CTsfnt")) != -1) {
+ 	switch (ch) {
+ 	case 'C':
+ 	    opt_C = TRUE;
+@@ -176,8 +176,8 @@
+ 	case 'T':
+ 	    opt_T = TRUE;
+ 	    break;
+-	case 'c':
+-	    opt_c = TRUE;
++	case 's':
++	    opt_s = TRUE;
+ 	    break;
+ 	case 'f':
+ 	    opt_f = TRUE;
+@@ -202,8 +202,8 @@
+     if (!(opt_T || opt_C)) {
+ 	opt_T = opt_C = TRUE;
+     }
+-    if (!(opt_c || opt_f || opt_n)) {
+-	opt_c = opt_f = opt_n = TRUE;
++    if (!(opt_s || opt_f || opt_n)) {
++	opt_s = opt_f = opt_n = TRUE;
+     }
+ 
+     if (opt_t) {
+Index: test/test_endwin.c
+Prereq:  1.3 
+--- ncurses-6.5-20241123+/test/test_endwin.c	2024-10-05 19:27:33.000000000 +0000
++++ ncurses-6.5-20241130/test/test_endwin.c	2024-11-30 17:34:56.000000000 +0000
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_endwin.c,v 1.3 2024/10/05 19:27:33 tom Exp $
++ * $Id: test_endwin.c,v 1.4 2024/11/30 17:34:56 tom Exp $
+  */
+ #include 
+ 
+@@ -38,11 +38,11 @@
+ 	"Usage: test_endwin [options]"
+ 	,""
+ 	,"Options:"
+-	," -e   call endwin() an extra time"
+-	," -i   call initscr() before endwin()"
+-	," -n   call newterm() before endwin()"
+-	," -r   call refresh() before endwin()"
+-	," -s   call getch() after endwin(), to refresh screen"
++	," -e       call endwin() an extra time"
++	," -i       call initscr() before endwin()"
++	," -n       call newterm() before endwin()"
++	," -r       call refresh() before endwin()"
++	," -s       call getch() after endwin(), to refresh screen"
+ 	,""
+ 	,USAGE_COMMON
+     };
+Index: test/test_mouse.c
+Prereq:  1.33 
+--- ncurses-6.5-20241123+/test/test_mouse.c	2024-10-05 18:47:56.000000000 +0000
++++ ncurses-6.5-20241130/test/test_mouse.c	2024-11-30 18:46:48.000000000 +0000
+@@ -22,7 +22,7 @@
+  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+  ****************************************************************************/
+ /*
+- * $Id: test_mouse.c,v 1.33 2024/10/05 18:47:56 tom Exp $
++ * $Id: test_mouse.c,v 1.35 2024/11/30 18:46:48 tom Exp $
+  *
+  * Author: Leonid S Usov
+  *
+@@ -214,8 +214,8 @@
+ 	,USAGE_COMMON
+ 	,"Options:"
+ 	," -r       show raw input stream, injecting a new line before every ESC"
+-	," -i n     set mouse interval to n; default is 0 (no double-clicks)"
+-	," -T term  use terminal description other than $TERM"
++	," -i NUM   set mouse interval to NUM; default is 0 (no double-clicks)"
++	," -T TERM  override $TERM"
+     };
+     unsigned n;
+     for (n = 0; n < sizeof(msg) / sizeof(char *); ++n) {
+Index: test/view.c
+Prereq:  1.147 
+--- ncurses-6.5-20241123+/test/view.c	2024-10-06 21:08:05.000000000 +0000
++++ ncurses-6.5-20241130/test/view.c	2024-11-30 18:15:06.000000000 +0000
+@@ -52,7 +52,7 @@
+  * scroll operation worked, and the refresh() code only had to do a
+  * partial repaint.
+  *
+- * $Id: view.c,v 1.147 2024/10/06 21:08:05 tom Exp $
++ * $Id: view.c,v 1.149 2024/11/30 18:15:06 tom Exp $
+  */
+ 
+ #include 
+@@ -382,15 +382,15 @@
+ 	,""
+ 	,USAGE_COMMON
+ 	,"Options:"
+-	," -c       use color if terminal supports it"
++	," -C       use color if terminal supports it"
+ 	," -i       ignore INT, QUIT, TERM signals"
+ #if USE_WIDEC_SUPPORT
+ 	," -n       use waddch (bytes) rather then wadd_wch (wide-chars)"
+ #endif
+-	," -s       start in single-step mode, waiting for input"
++	," -s       start in single-step mode"
+ #ifdef TRACE
+ 	," -t       trace screen updates"
+-	," -T NUM   specify trace mask"
++	," -D NUM   specify trace mask"
+ #endif
+     };
+     size_t n;
+@@ -443,9 +443,9 @@
+ 
+     setlocale(LC_ALL, "");
+ 
+-    while ((ch = getopt(argc, argv, OPTS_COMMON "cinstT:")) != -1) {
++    while ((ch = getopt(argc, argv, OPTS_COMMON "CD:inst")) != -1) {
+ 	switch (ch) {
+-	case 'c':
++	case 'C':
+ 	    try_color = TRUE;
+ 	    break;
+ 	case 'i':
+@@ -460,7 +460,7 @@
+ 	    single_step = TRUE;
+ 	    break;
+ #ifdef TRACE
+-	case 'T':
++	case 'D':
+ 	    {
+ 		char *next = 0;
+ 		int tvalue = (int) strtol(optarg, &next, 0);
+Index: test/worm.c
+Prereq:  1.89 
+--- ncurses-6.5-20241123+/test/worm.c	2022-12-24 20:46:49.000000000 +0000
++++ ncurses-6.5-20241130/test/worm.c	2024-11-30 18:53:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2022 Thomas E. Dickey                                *
++ * Copyright 2018-2022,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -53,7 +53,7 @@
+   traces will be dumped.  The program stops and waits for one character of
+   input at the beginning and end of the interval.
+ 
+-  $Id: worm.c,v 1.89 2022/12/24 20:46:49 tom Exp $
++  $Id: worm.c,v 1.93 2024/11/30 18:53:39 tom Exp $
+ */
+ 
+ #include 
+@@ -119,9 +119,6 @@
+ #define Locked(statement) statement
+ #endif
+ 
+-#ifdef TRACE
+-static int generation, trace_start, trace_end;
+-#endif /* TRACE */
+ /* *INDENT-OFF* */
+ static const struct options {
+     int nopts;
+@@ -463,11 +460,10 @@
+ 	," -d       invoke use_default_colors"
+ #endif
+ 	," -f       fill screen with copies of \"WORM\" at start"
+-	," -l    set length of worms"
+-	," -n    set number of worms"
++	," -M NUM   set length of worms"
++	," -n NUM   set number of worms"
+ 	," -t       leave trail of \".\""
+ #ifdef TRACE
+-	," -T , set trace interval"
+ 	," -N       suppress cursor-movement optimization"
+ #endif
+     };
+@@ -497,7 +493,7 @@
+ 
+     setlocale(LC_ALL, "");
+ 
+-    while ((ch = getopt(argc, argv, OPTS_COMMON "dfl:n:tT:N")) != -1) {
++    while ((ch = getopt(argc, argv, OPTS_COMMON "M:Ndfn:t")) != -1) {
+ 	switch (ch) {
+ #if HAVE_USE_DEFAULT_COLORS
+ 	case 'd':
+@@ -507,7 +503,7 @@
+ 	case 'f':
+ 	    field = "WORM";
+ 	    break;
+-	case 'l':
++	case 'M':
+ 	    if ((length = atoi(optarg)) < 2 || length > MAX_LENGTH) {
+ 		fprintf(stderr, "%s: Invalid length\n", *argv);
+ 		usage(FALSE);
+@@ -523,10 +519,6 @@
+ 	    trail = '.';
+ 	    break;
+ #ifdef TRACE
+-	case 'T':
+-	    if (sscanf(optarg, "%d,%d", &trace_start, &trace_end) != 2)
+-		usage(FALSE);
+-	    break;
+ 	case 'N':
+ 	    _nc_optimize_enable ^= OPTIMIZE_ALL;	/* declared by ncurses */
+ 	    break;
+@@ -631,19 +623,6 @@
+     while (!done) {
+ 	Locked(++sequence);
+ 	if ((ch = get_input()) > 0) {
+-#ifdef TRACE
+-	    if (trace_start || trace_end) {
+-		if (generation == trace_start) {
+-		    curses_trace(TRACE_CALLS);
+-		    get_input();
+-		} else if (generation == trace_end) {
+-		    curses_trace(0);
+-		    get_input();
+-		}
+-
+-		generation++;
+-	    }
+-#endif
+ 
+ #ifdef KEY_RESIZE
+ 	    if (ch == KEY_RESIZE) {
diff --git a/packages/ncurses/6.5/ncurses-6.5-20241207.patch b/packages/ncurses/6.5/ncurses-6.5-20241207.patch
new file mode 100644
index 0000000000..952fd07277
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20241207.patch
@@ -0,0 +1,16808 @@
+# ncurses 6.5 - patch 20241207 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20241207.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Dec  8 02:11:12 UTC 2024
+# ------------------------------------------------------------------------------
+# NEWS                               |    5 
+# VERSION                            |    2 
+# dist.mk                            |    4 
+# form/fld_arg.c                     |    6 -
+# form/fld_attr.c                    |    6 -
+# form/fld_current.c                 |   12 +-
+# form/fld_def.c                     |   26 ++--
+# form/form.priv.h                   |    8 -
+# form/frm_driver.c                  |   28 ++--
+# form/frm_req_name.c                |    6 -
+# form/fty_enum.c                    |    6 -
+# form/fty_generic.c                 |   13 +-
+# form/fty_int.c                     |    4 
+# form/fty_num.c                     |    4 
+# form/fty_regex.c                   |    8 -
+# include/curses.h.in                |    8 -
+# menu/m_driver.c                    |    8 -
+# menu/m_global.c                    |   14 +-
+# menu/m_item_new.c                  |   10 -
+# menu/m_pattern.c                   |    6 -
+# menu/m_req_name.c                  |    6 -
+# menu/mf_common.h                   |    4 
+# ncurses/base/MKkeyname.awk         |   30 ++---
+# ncurses/base/MKlib_gen.sh          |    5 
+# ncurses/base/MKunctrl.awk          |   10 -
+# ncurses/base/define_key.c          |   10 -
+# ncurses/base/key_defined.c         |   10 -
+# ncurses/base/keybound.c            |    8 -
+# ncurses/base/keyok.c               |    8 -
+# ncurses/base/legacy_coding.c       |    6 -
+# ncurses/base/lib_addch.c           |    6 -
+# ncurses/base/lib_addstr.c          |   10 -
+# ncurses/base/lib_beep.c            |    6 -
+# ncurses/base/lib_bkgd.c            |    6 -
+# ncurses/base/lib_color.c           |   38 +++---
+# ncurses/base/lib_colorset.c        |    6 -
+# ncurses/base/lib_delwin.c          |    6 -
+# ncurses/base/lib_dft_fgbg.c        |    8 -
+# ncurses/base/lib_echo.c            |    8 -
+# ncurses/base/lib_erase.c           |    6 -
+# ncurses/base/lib_freeall.c         |   14 +-
+# ncurses/base/lib_getch.c           |    6 -
+# ncurses/base/lib_initscr.c         |    6 -
+# ncurses/base/lib_insch.c           |    6 -
+# ncurses/base/lib_insnstr.c         |    8 -
+# ncurses/base/lib_instr.c           |   12 +-
+# ncurses/base/lib_mouse.c           |   28 ++--
+# ncurses/base/lib_newterm.c         |   18 +--
+# ncurses/base/lib_newwin.c          |   67 ++++++-----
+# ncurses/base/lib_nl.c              |    8 -
+# ncurses/base/lib_overlay.c         |   10 -
+# ncurses/base/lib_pad.c             |   16 +-
+# ncurses/base/lib_printw.c          |    6 -
+# ncurses/base/lib_redrawln.c        |    6 -
+# ncurses/base/lib_restart.c         |    6 -
+# ncurses/base/lib_screen.c          |   56 ++++-----
+# ncurses/base/lib_set_term.c        |   74 ++++++-------
+# ncurses/base/lib_slk.c             |   20 +--
+# ncurses/base/lib_slkatr_set.c      |    8 -
+# ncurses/base/lib_slkatrof.c        |    6 -
+# ncurses/base/lib_slkatron.c        |    6 -
+# ncurses/base/lib_slkatrset.c       |    6 -
+# ncurses/base/lib_slkattr.c         |    6 -
+# ncurses/base/lib_slkclear.c        |    6 -
+# ncurses/base/lib_slkcolor.c        |    8 -
+# ncurses/base/lib_slklab.c          |    8 -
+# ncurses/base/lib_slkrefr.c         |    8 -
+# ncurses/base/lib_slkset.c          |   16 +-
+# ncurses/base/lib_slktouch.c        |    6 -
+# ncurses/base/lib_ungetch.c         |    6 -
+# ncurses/base/lib_wattron.c         |    6 -
+# ncurses/base/lib_winch.c           |    6 -
+# ncurses/base/lib_window.c          |   14 +-
+# ncurses/base/nc_panel.c            |    6 -
+# ncurses/base/new_pair.c            |   12 +-
+# ncurses/base/resizeterm.c          |   24 ++--
+# ncurses/base/tries.c               |   20 +--
+# ncurses/base/wresize.c             |   16 +-
+# ncurses/curses.priv.h              |   50 ++++----
+# ncurses/new_pair.h                 |    4 
+# ncurses/report_offsets.c           |    8 -
+# ncurses/tinfo/MKcaptab.awk         |    6 -
+# ncurses/tinfo/MKcaptab.sh          |   22 +--
+# ncurses/tinfo/MKcodes.awk          |    6 -
+# ncurses/tinfo/MKfallback.sh        |    6 -
+# ncurses/tinfo/MKnames.awk          |    6 -
+# ncurses/tinfo/MKuserdefs.sh        |    8 -
+# ncurses/tinfo/access.c             |   12 +-
+# ncurses/tinfo/add_tries.c          |   18 +--
+# ncurses/tinfo/alloc_entry.c        |   12 +-
+# ncurses/tinfo/alloc_ttype.c        |   12 +-
+# ncurses/tinfo/captoinfo.c          |   24 ++--
+# ncurses/tinfo/comp_error.c         |   16 +-
+# ncurses/tinfo/comp_expand.c        |   18 +--
+# ncurses/tinfo/comp_hash.c          |   14 +-
+# ncurses/tinfo/comp_parse.c         |   20 +--
+# ncurses/tinfo/comp_scan.c          |   62 +++++-----
+# ncurses/tinfo/db_iterator.c        |   54 ++++-----
+# ncurses/tinfo/doalloc.c            |    6 -
+# ncurses/tinfo/entries.c            |   24 ++--
+# ncurses/tinfo/getenv_num.c         |    8 -
+# ncurses/tinfo/home_terminfo.c      |    8 -
+# ncurses/tinfo/init_keytry.c        |    6 -
+# ncurses/tinfo/lib_acs.c            |   12 +-
+# ncurses/tinfo/lib_baudrate.c       |    6 -
+# ncurses/tinfo/lib_cur_term.c       |   14 +-
+# ncurses/tinfo/lib_data.c           |   26 ++--
+# ncurses/tinfo/lib_kernel.c         |   10 -
+# ncurses/tinfo/lib_options.c        |   16 +-
+# ncurses/tinfo/lib_print.c          |    6 -
+# ncurses/tinfo/lib_raw.c            |   18 +--
+# ncurses/tinfo/lib_setup.c          |   49 ++++----
+# ncurses/tinfo/lib_termcap.c        |   44 +++----
+# ncurses/tinfo/lib_termname.c       |    8 -
+# ncurses/tinfo/lib_ti.c             |   10 -
+# ncurses/tinfo/lib_tparm.c          |   32 ++---
+# ncurses/tinfo/lib_tputs.c          |   22 +--
+# ncurses/tinfo/lib_ttyflags.c       |   28 ++--
+# ncurses/tinfo/make_hash.c          |   38 +++---
+# ncurses/tinfo/make_keys.c          |   22 +--
+# ncurses/tinfo/name_match.c         |   14 +-
+# ncurses/tinfo/obsolete.c           |    8 -
+# ncurses/tinfo/parse_entry.c        |   24 ++--
+# ncurses/tinfo/read_entry.c         |   22 +--
+# ncurses/tinfo/strings.c            |   14 +-
+# ncurses/tinfo/trim_sgr0.c          |   12 +-
+# ncurses/tinfo/write_entry.c        |   12 +-
+# ncurses/trace/lib_trace.c          |   16 +-
+# ncurses/trace/lib_traceatr.c       |   24 ++--
+# ncurses/trace/lib_tracebits.c      |    6 -
+# ncurses/trace/lib_tracechr.c       |    8 -
+# ncurses/trace/lib_tracedmp.c       |    8 -
+# ncurses/trace/lib_tracemse.c       |   10 -
+# ncurses/trace/trace_buf.c          |   26 ++--
+# ncurses/trace/trace_tries.c        |   10 -
+# ncurses/trace/varargs.c            |   10 -
+# ncurses/trace/visbuf.c             |   20 +--
+# ncurses/tty/MKexpanded.sh          |   11 +
+# ncurses/tty/hardscroll.c           |   12 +-
+# ncurses/tty/hashmap.c              |    6 -
+# ncurses/tty/lib_mvcur.c            |   24 ++--
+# ncurses/tty/lib_tstp.c             |    8 -
+# ncurses/tty/lib_twait.c            |    4 
+# ncurses/tty/lib_vidattr.c          |   10 -
+# ncurses/tty/tty_update.c           |   28 ++--
+# ncurses/wcwidth.h                  |    4 
+# ncurses/widechar/lib_add_wch.c     |    4 
+# ncurses/widechar/lib_box_set.c     |    6 -
+# ncurses/widechar/lib_cchar.c       |    4 
+# ncurses/widechar/lib_get_wch.c     |    8 -
+# ncurses/widechar/lib_hline_set.c   |    6 -
+# ncurses/widechar/lib_in_wch.c      |    8 -
+# ncurses/widechar/lib_in_wchnstr.c  |    6 -
+# ncurses/widechar/lib_ins_wch.c     |    8 -
+# ncurses/widechar/lib_inwstr.c      |    6 -
+# ncurses/widechar/lib_pecho_wchar.c |    6 -
+# ncurses/widechar/lib_slk_wset.c    |    8 -
+# ncurses/widechar/lib_unget_wch.c   |   10 -
+# ncurses/widechar/lib_vid_attr.c    |   26 ++--
+# ncurses/widechar/lib_vline_set.c   |    6 -
+# ncurses/widechar/lib_wacs.c        |    8 -
+# ncurses/widechar/lib_wunctrl.c     |    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 
+# panel/p_above.c                    |   16 +-
+# panel/p_below.c                    |   18 +--
+# panel/p_new.c                      |    6 -
+# panel/panel.c                      |   18 +--
+# panel/panel.priv.h                 |    6 -
+# progs/dump_entry.c                 |   40 +++----
+# progs/infocmp.c                    |   56 ++++-----
+# progs/reset_cmd.c                  |   18 +--
+# progs/tabs.c                       |   38 +++---
+# progs/tic.c                        |  118 ++++++++++----------
+# progs/toe.c                        |   50 ++++----
+# progs/tput.c                       |   14 +-
+# progs/tset.c                       |   54 ++++-----
+# test/blue.c                        |    4 
+# test/bs.c                          |   12 +-
+# test/cardfile.c                    |   52 ++++-----
+# test/chgat.c                       |   24 ++--
+# test/clip_printw.c                 |   24 ++--
+# test/color_content.c               |    4 
+# test/color_name.h                  |    8 -
+# test/combine.c                     |    4 
+# test/demo_altkeys.c                |   12 +-
+# test/demo_defkey.c                 |   30 ++---
+# test/demo_forms.c                  |   36 +++---
+# test/demo_keyok.c                  |    4 
+# test/demo_menus.c                  |   58 +++++-----
+# test/demo_new_pair.c               |    8 -
+# test/demo_panels.c                 |   48 ++++----
+# test/demo_termcap.c                |   64 +++++------
+# test/demo_terminfo.c               |   66 +++++------
+# test/ditto.c                       |   20 +--
+# test/dots.c                        |    8 -
+# test/dots_curses.c                 |    4 
+# test/dots_mvcur.c                  |   10 -
+# test/dots_termcap.c                |   16 +-
+# test/dots_xcurses.c                |    4 
+# test/dump_window.c                 |   18 +--
+# test/dup_field.c                   |   12 +-
+# test/echochar.c                    |   10 -
+# test/edit_field.c                  |   14 +-
+# test/filter.c                      |   12 +-
+# test/foldkeys.c                    |   16 +-
+# test/form_driver_w.c               |    4 
+# test/gdc.c                         |    6 -
+# test/inch_wide.c                   |   14 +-
+# test/inchs.c                       |   16 +-
+# test/ins_wide.c                    |    8 -
+# test/insdelln.c                    |   22 +--
+# test/inserts.c                     |    8 -
+# test/key_names.c                   |    6 -
+# test/keynames.c                    |    6 -
+# test/linedata.h                    |   10 -
+# test/list_keys.c                   |   12 +-
+# test/move_field.c                  |   12 +-
+# test/movewindow.c                  |   42 +++----
+# test/ncurses.c                     |  199 +++++++++++++++++------------------
+# test/padview.c                     |   18 +--
+# test/pair_content.c                |    4 
+# test/picsmap.c                     |  132 +++++++++++------------
+# test/popup_msg.c                   |    8 -
+# test/railroad.c                    |   30 ++---
+# test/rain.c                        |    4 
+# test/redraw.c                      |    4 
+# test/savescreen.c                  |   22 +--
+# test/sp_tinfo.c                    |   10 -
+# test/tclock.c                      |    4 
+# test/test_add_wchstr.c             |   18 +--
+# test/test_addchstr.c               |   18 +--
+# test/test_addstr.c                 |    8 -
+# test/test_addwstr.c                |    8 -
+# test/test_arrays.c                 |    4 
+# test/test_get_wstr.c               |   14 +-
+# test/test_getstr.c                 |   14 +-
+# test/test_instr.c                  |   14 +-
+# test/test_inwstr.c                 |   14 +-
+# test/test_opaque.c                 |   12 +-
+# test/test_setupterm.c              |   10 -
+# test/test_sgr.c                    |   24 ++--
+# test/test_tparm.c                  |   49 ++++----
+# test/test_vid_puts.c               |    6 -
+# test/test_vidputs.c                |    4 
+# test/testcurs.c                    |   12 +-
+# test/view.c                        |   26 ++--
+# test/xmas.c                        |   78 ++++++-------
+# 253 files changed, 2122 insertions(+), 2100 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4207 
+--- ncurses-6.5-20241130+/NEWS	2024-11-30 19:41:55.000000000 +0000
++++ ncurses-6.5-20241207/NEWS	2024-12-07 23:51:39.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4207 2024/11/30 19:41:55 tom Exp $
++-- $Id: NEWS,v 1.4209 2024/12/07 23:51:39 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.
+ 
++20241207
++	+ strict compiler-warning fixes for upcoming gcc15
++
+ 20241130
+ 	+ improve configure check for lint program.
+ 	+ adjust options in test-programs to allow for consistent use of -c/-l
+Index: VERSION
+--- ncurses-6.5-20241130+/VERSION	2024-11-30 10:55:07.000000000 +0000
++++ ncurses-6.5-20241207/VERSION	2024-12-07 11:51:44.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20241130
++5:0:10	6.5	20241207
+Index: dist.mk
+Prereq:  1.1643 
+--- ncurses-6.5-20241130+/dist.mk	2024-11-30 10:55:07.000000000 +0000
++++ ncurses-6.5-20241207/dist.mk	2024-12-07 11:51:44.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1643 2024/11/30 10:55:07 tom Exp $
++# $Id: dist.mk,v 1.1644 2024/12/07 11:51:44 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 = 5
+-NCURSES_PATCH = 20241130
++NCURSES_PATCH = 20241207
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: form/fld_arg.c
+Prereq:  1.18 
+--- ncurses-6.5-20241130+/form/fld_arg.c	2020-12-11 22:05:24.000000000 +0000
++++ ncurses-6.5-20241207/form/fld_arg.c	2024-12-07 23:00:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018,2020 Thomas E. Dickey                                     *
++ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -33,7 +33,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fld_arg.c,v 1.18 2020/12/11 22:05:24 tom Exp $")
++MODULE_ID("$Id: fld_arg.c,v 1.19 2024/12/07 23:00:37 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnform
+@@ -75,7 +75,7 @@
+      TR_FUNC_ARG(1, copy_arg),
+      TR_FUNC_ARG(2, free_arg)));
+ 
+-  if (typ != 0 && make_arg != (void *)0)
++  if (typ != NULL && make_arg != NULL)
+     {
+       SetStatus(typ, _HAS_ARGS);
+       typ->makearg = make_arg;
+Index: form/fld_attr.c
+Prereq:  1.15 
+--- ncurses-6.5-20241130+/form/fld_attr.c	2020-12-11 22:05:24.000000000 +0000
++++ ncurses-6.5-20241207/form/fld_attr.c	2024-12-07 23:01:42.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -33,7 +33,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fld_attr.c,v 1.15 2020/12/11 22:05:24 tom Exp $")
++MODULE_ID("$Id: fld_attr.c,v 1.16 2024/12/07 23:01:42 tom Exp $")
+ 
+ /*----------------------------------------------------------------------------
+   Field-Attribute manipulation routines
+@@ -47,7 +47,7 @@
+    if ( attr==A_NORMAL || ((attr & A_ATTRIBUTES)==attr) )\
+      {\
+        Normalize_Field( field );\
+-       if (field != 0) \
++       if (field != NULL) \
+ 	 { \
+ 	 if ((field -> name) != attr)\
+ 	   {\
+Index: form/fld_current.c
+Prereq:  1.16 
+--- ncurses-6.5-20241130+/form/fld_current.c	2020-05-24 01:40:20.000000000 +0000
++++ ncurses-6.5-20241207/form/fld_current.c	2024-12-07 23:01:42.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -33,7 +33,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fld_current.c,v 1.16 2020/05/24 01:40:20 anonymous.maarten Exp $")
++MODULE_ID("$Id: fld_current.c,v 1.17 2024/12/07 23:01:42 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnform
+@@ -54,7 +54,7 @@
+   int err = E_OK;
+ 
+   T((T_CALLED("set_current_field(%p,%p)"), (void *)form, (void *)field));
+-  if (form == 0 || field == 0)
++  if (form == NULL || field == NULL)
+     {
+       RETURN(E_BAD_ARGUMENT);
+     }
+@@ -117,11 +117,11 @@
+ unfocus_current_field(FORM *const form)
+ {
+   T((T_CALLED("unfocus_current_field(%p)"), (const void *)form));
+-  if (form == 0)
++  if (form == NULL)
+     {
+       RETURN(E_BAD_ARGUMENT);
+     }
+-  else if (form->current == 0)
++  else if (form->current == NULL)
+     {
+       RETURN(E_REQUEST_DENIED);
+     }
+@@ -158,7 +158,7 @@
+ field_index(const FIELD *field)
+ {
+   T((T_CALLED("field_index(%p)"), (const void *)field));
+-  returnCode((field != 0 && field->form != 0) ? (int)field->index : -1);
++  returnCode((field != NULL && field->form != NULL) ? (int)field->index : -1);
+ }
+ 
+ /* fld_current.c ends here */
+Index: form/fld_def.c
+Prereq:  1.45 
+--- ncurses-6.5-20241130+/form/fld_def.c	2024-11-30 21:41:08.000000000 +0000
++++ ncurses-6.5-20241207/form/fld_def.c	2024-12-07 21:56:21.000000000 +0000
+@@ -33,7 +33,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fld_def.c,v 1.45 2024/11/30 21:41:08 tom Exp $")
++MODULE_ID("$Id: fld_def.c,v 1.46 2024/12/07 21:56:21 tom Exp $")
+ 
+ /* this can't be readonly */
+ static FIELD default_field =
+@@ -87,14 +87,14 @@
+ {
+   TypeArgument *res = (TypeArgument *)0;
+ 
+-  if (typ != 0 && (typ->status & _HAS_ARGS) != 0)
++  if (typ != NULL && (typ->status & _HAS_ARGS) != 0)
+     {
+       assert(err != 0 && ap != (va_list *)0);
+       if ((typ->status & _LINKED_TYPE) != 0)
+ 	{
+ 	  TypeArgument *p = typeMalloc(TypeArgument, 1);
+ 
+-	  if (p != 0)
++	  if (p != NULL)
+ 	    {
+ 	      p->left = _nc_Make_Argument(typ->left, ap, err);
+ 	      p->right = _nc_Make_Argument(typ->right, ap, err);
+@@ -134,14 +134,14 @@
+ {
+   TypeArgument *res = (TypeArgument *)0;
+ 
+-  if (typ != 0 && (typ->status & _HAS_ARGS) != 0)
++  if (typ != NULL && (typ->status & _HAS_ARGS) != 0)
+     {
+       assert(err != 0 && argp != 0);
+       if ((typ->status & _LINKED_TYPE) != 0)
+ 	{
+ 	  TypeArgument *p = typeMalloc(TypeArgument, 1);
+ 
+-	  if (p != 0)
++	  if (p != NULL)
+ 	    {
+ 	      p->left = _nc_Copy_Argument(typ, argp->left, err);
+ 	      p->right = _nc_Copy_Argument(typ, argp->right, err);
+@@ -180,11 +180,11 @@
+ FORM_EXPORT(void)
+ _nc_Free_Argument(const FIELDTYPE *typ, TypeArgument *argp)
+ {
+-  if (typ != 0 && (typ->status & _HAS_ARGS) != 0)
++  if (typ != NULL && (typ->status & _HAS_ARGS) != 0)
+     {
+       if ((typ->status & _LINKED_TYPE) != 0)
+ 	{
+-	  if (argp != 0)
++	  if (argp != NULL)
+ 	    {
+ 	      _nc_Free_Argument(typ->left, argp->left);
+ 	      _nc_Free_Argument(typ->right, argp->right);
+@@ -229,7 +229,7 @@
+     }
+   else
+     {
+-      if (dst->type != 0)
++      if (dst->type != NULL)
+ 	{
+ 	  dst->type->ref++;
+ 	}
+@@ -249,7 +249,7 @@
+ _nc_Free_Type(FIELD *field)
+ {
+   assert(field != 0);
+-  if (field->type != 0)
++  if (field->type != NULL)
+     {
+       field->type->ref--;
+       _nc_Free_Argument(field->type, (TypeArgument *)(field->arg));
+@@ -289,7 +289,7 @@
+       nrow >= 0 &&
+       nbuf >= 0 &&
+       ((err = E_SYSTEM_ERROR) != 0) &&	/* trick: this resets the default error */
+-      (New_Field = typeMalloc(FIELD, 1)) != 0)
++      (New_Field = typeMalloc(FIELD, 1)) != NULL)
+     {
+       T((T_CREATE("field %p"), (void *)New_Field));
+       *New_Field = default_field;
+@@ -360,13 +360,13 @@
+     {
+       RETURN(E_BAD_ARGUMENT);
+     }
+-  else if (field->form != 0)
++  else if (field->form != NULL)
+     {
+       RETURN(E_CONNECTED);
+     }
+   else if (field == field->link)
+     {
+-      if (field->buf != 0)
++      if (field->buf != NULL)
+ 	free(field->buf);
+     }
+   else
+@@ -380,7 +380,7 @@
+     }
+   _nc_Free_Type(field);
+ #if USE_WIDEC_SUPPORT
+-  if (field->expanded != 0)
++  if (field->expanded != NULL)
+     {
+       int n;
+ 
+Index: form/form.priv.h
+Prereq:  0.49 
+--- ncurses-6.5-20241130+/form/form.priv.h	2024-02-24 12:17:31.000000000 +0000
++++ ncurses-6.5-20241207/form/form.priv.h	2024-12-07 21:57:21.000000000 +0000
+@@ -31,7 +31,7 @@
+  *   Author:  Juergen Pfeifer, 1995,1997                                    *
+  ****************************************************************************/
+ 
+-/* $Id: form.priv.h,v 0.49 2024/02/24 12:17:31 tom Exp $ */
++/* $Id: form.priv.h,v 0.50 2024/12/07 21:57:21 tom Exp $ */
+ 
+ #ifndef FORM_PRIV_H
+ #define FORM_PRIV_H 1
+@@ -93,11 +93,11 @@
+ 
+ /* If form is NULL replace form argument by default-form */
+ #define Normalize_Form(form) \
+-  ((form) = (form != 0) ? (form) : _nc_Default_Form)
++  ((form) = (form != NULL) ? (form) : _nc_Default_Form)
+ 
+ /* If field is NULL replace field argument by default-field */
+ #define Normalize_Field(field) \
+-  ((field) = (field != 0) ? (field) : _nc_Default_Field)
++  ((field) = (field != NULL) ? (field) : _nc_Default_Field)
+ 
+ #if NCURSES_SP_FUNCS
+ #define Get_Form_Screen(form) \
+@@ -260,7 +260,7 @@
+       int len; \
+       int n; \
+       wchar_t *list = _nc_Widen_String((char *)buffer, &len); \
+-      if (list != 0) \
++      if (list != NULL) \
+ 	{ \
+ 	  result = TRUE; \
+ 	  for (n = 0; n < len; ++n) \
+Index: form/frm_driver.c
+Prereq:  1.136 
+--- ncurses-6.5-20241130+/form/frm_driver.c	2024-07-27 18:49:18.000000000 +0000
++++ ncurses-6.5-20241207/form/frm_driver.c	2024-12-07 21:57:21.000000000 +0000
+@@ -33,7 +33,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: frm_driver.c,v 1.136 2024/07/27 18:49:18 tom Exp $")
++MODULE_ID("$Id: frm_driver.c,v 1.137 2024/12/07 21:57:21 tom Exp $")
+ 
+ /*----------------------------------------------------------------------------
+   This is the core module of the form library. It contains the majority
+@@ -734,7 +734,7 @@
+ 	    {
+ 	      WINDOW *new_window = newpad(field->drows, field->dcols);
+ 
+-	      if (new_window != 0)
++	      if (new_window != NULL)
+ 		{
+ 		  assert(form != (FORM *)0);
+ 		  if (form->w)
+@@ -802,7 +802,7 @@
+ Field_encloses(FIELD *field, int ry, int rx)
+ {
+   T((T_CALLED("Field_encloses(%p)"), (void *)field));
+-  if (field != 0
++  if (field != NULL
+       && field->frow <= ry
+       && (field->frow + field->rows) > ry
+       && field->fcol <= rx
+@@ -1251,7 +1251,7 @@
+     return (E_SYSTEM_ERROR);
+ 
+   for (linked_field = field->link;
+-       (linked_field != field) && (linked_field != 0);
++       (linked_field != field) && (linked_field != NULL);
+        linked_field = linked_field->link)
+     {
+       int syncres;
+@@ -1458,7 +1458,7 @@
+ 	      werase(form->w);
+ 	      Perform_Justification(field, form->w);
+ 	      if (Field_Has_Option(field, O_DYNAMIC_JUSTIFY) &&
+-		  (form->w->_parent == 0))
++		  (form->w->_parent == NULL))
+ 		{
+ 		  copywin(form->w,
+ 			  Get_Form_Window(form),
+@@ -1480,7 +1480,7 @@
+     }
+   delwin(form->w);
+   form->w = (WINDOW *)0;
+-  form->current = 0;
++  form->current = NULL;
+ }
+ 
+ /*---------------------------------------------------------------------------
+@@ -4758,7 +4758,7 @@
+   int len;
+ 
+ #if USE_WIDEC_SUPPORT
+-  FIELD_CELL *widevalue = 0;
++  FIELD_CELL *widevalue = NULL;
+ #endif
+ 
+   T((T_CALLED("set_field_buffer(%p,%d,%s)"), (void *)field, buffer, _nc_visbuf(value)));
+@@ -4807,7 +4807,7 @@
+   wclear(field->working);
+   (void)mvwaddstr(field->working, 0, 0, value);
+ 
+-  if ((widevalue = typeCalloc(FIELD_CELL, len + 1)) == 0)
++  if ((widevalue = typeCalloc(FIELD_CELL, len + 1)) == NULL)
+     {
+       RETURN(E_SYSTEM_ERROR);
+     }
+@@ -4869,7 +4869,7 @@
+ FORM_EXPORT(char *)
+ field_buffer(const FIELD *field, int buffer)
+ {
+-  char *result = 0;
++  char *result = NULL;
+ 
+   T((T_CALLED("field_buffer(%p,%d)"), (const void *)field, buffer));
+ 
+@@ -4890,14 +4890,14 @@
+ 	      size_t next;
+ 
+ 	      init_mb(state);
+-	      next = _nc_wcrtomb(0, data[n].chars[0], &state);
++	      next = _nc_wcrtomb(NULL, data[n].chars[0], &state);
+ 	      if (next > 0)
+ 		need += next;
+ 	    }
+ 	}
+ 
+       /* allocate a place to store the expanded string */
+-      if (field->expanded[buffer] != 0)
++      if (field->expanded[buffer] != NULL)
+ 	free(field->expanded[buffer]);
+       field->expanded[buffer] = typeMalloc(char, need + 1);
+ 
+@@ -4909,7 +4909,7 @@
+        * contain embedded wide-character extensions).  Change the null-padding
+        * to blanks as needed.
+        */
+-      if ((result = field->expanded[buffer]) != 0)
++      if ((result = field->expanded[buffer]) != NULL)
+ 	{
+ 	  wclear(field->working);
+ 	  wmove(field->working, 0, 0);
+@@ -4937,7 +4937,7 @@
+ FORM_EXPORT(wchar_t *)
+ _nc_Widen_String(char *source, int *lengthp)
+ {
+-  wchar_t *result = 0;
++  wchar_t *result = NULL;
+   wchar_t wch = 0;
+   size_t given = strlen(source);
+   size_t tries;
+@@ -4999,7 +4999,7 @@
+ 	  result = typeCalloc(wchar_t, need);
+ 
+ 	  *lengthp = (int)need;
+-	  if (result == 0)
++	  if (result == NULL)
+ 	    break;
+ 	}
+     }
+Index: form/frm_req_name.c
+Prereq:  1.23 
+--- ncurses-6.5-20241130+/form/frm_req_name.c	2021-06-17 21:11:08.000000000 +0000
++++ ncurses-6.5-20241207/form/frm_req_name.c	2024-12-07 23:00:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2015 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -38,7 +38,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: frm_req_name.c,v 1.23 2021/06/17 21:11:08 tom Exp $")
++MODULE_ID("$Id: frm_req_name.c,v 1.24 2024/12/07 23:00:37 tom Exp $")
+ 
+ #define DATA(s) { s }
+ 
+@@ -153,7 +153,7 @@
+ 
+   T((T_CALLED("form_request_by_name(%s)"), _nc_visbuf(str)));
+ 
+-  if (str != 0 && (i = strlen(str)) != 0)
++  if (str != NULL && (i = strlen(str)) != 0)
+     {
+       char buf[16];		/* longest name is 10 chars */
+ 
+Index: form/fty_enum.c
+Prereq:  1.34 
+--- ncurses-6.5-20241130+/form/fty_enum.c	2024-07-27 18:50:22.000000000 +0000
++++ ncurses-6.5-20241207/form/fty_enum.c	2024-12-07 21:58:32.000000000 +0000
+@@ -35,7 +35,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fty_enum.c,v 1.34 2024/07/27 18:50:22 tom Exp $")
++MODULE_ID("$Id: fty_enum.c,v 1.35 2024/12/07 21:58:32 tom Exp $")
+ 
+ typedef struct
+   {
+@@ -104,7 +104,7 @@
+ 	      argp->kwds = typeMalloc(char *, cnt + 1);
+ 
+ 	      kp = kwds;
+-	      if ((kptarget = argp->kwds) != 0)
++	      if ((kptarget = argp->kwds) != NULL)
+ 		{
+ 		  while (kp && (*kp))
+ 		    {
+@@ -168,7 +168,7 @@
+ 	      char **kp = ap->kwds;
+ 	      result->kwds = typeMalloc(char *, 1 + ap->count);
+ 
+-	      if ((kptarget = result->kwds) != 0)
++	      if ((kptarget = result->kwds) != NULL)
+ 		{
+ 		  while (kp && (*kp))
+ 		    {
+Index: form/fty_generic.c
+Prereq:  1.16 
+--- ncurses-6.5-20241130+/form/fty_generic.c	2024-07-27 18:51:24.000000000 +0000
++++ ncurses-6.5-20241207/form/fty_generic.c	2024-12-07 23:12:11.000000000 +0000
+@@ -35,7 +35,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fty_generic.c,v 1.16 2024/07/27 18:51:24 tom Exp $")
++MODULE_ID("$Id: fty_generic.c,v 1.17 2024/12/07 23:12:11 tom Exp $")
+ 
+ /*
+  * This is not a full implementation of a field type, but adds some
+@@ -170,7 +170,10 @@
+ {
+   TypeArgument *res = (TypeArgument *)0;
+ 
+-  if (typ != 0 && (typ->status & _HAS_ARGS) != 0 && err != 0 && argiterator != 0)
++  if (typ != NULL
++      && (typ->status & _HAS_ARGS) != 0
++      && err != NULL
++      && argiterator != NULL)
+     {
+       if (typ->status & _LINKED_TYPE)
+ 	{
+@@ -189,14 +192,14 @@
+       else
+ 	{
+ 	  assert(typ->genericarg != (void *)0);
+-	  if (typ->genericarg == 0)
++	  if (typ->genericarg == NULL)
+ 	    *err += 1;
+ 	  else
+ 	    {
+ 	      void *argp;
+ 	      int valid = argiterator(&argp);
+ 
+-	      if (valid == 0 || argp == 0 ||
++	      if (valid == 0 || argp == NULL ||
+ 		  !(res = (TypeArgument *)typ->genericarg(argp)))
+ 		{
+ 		  *err += 1;
+@@ -282,7 +285,7 @@
+   int code = E_SYSTEM_ERROR;
+   WINDOW *res = (WINDOW *)0;
+ 
+-  if (form != 0 && pRow != 0 && pCol != 0)
++  if (form != NULL && pRow != NULL && pCol != NULL)
+     {
+       *pRow = form->currow;
+       *pCol = form->curcol;
+Index: form/fty_int.c
+Prereq:  1.34 
+--- ncurses-6.5-20241130+/form/fty_int.c	2024-07-27 18:35:02.000000000 +0000
++++ ncurses-6.5-20241207/form/fty_int.c	2024-12-07 21:58:32.000000000 +0000
+@@ -35,7 +35,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fty_int.c,v 1.34 2024/07/27 18:35:02 tom Exp $")
++MODULE_ID("$Id: fty_int.c,v 1.35 2024/12/07 21:58:32 tom Exp $")
+ 
+ #if USE_WIDEC_SUPPORT
+ #define isDigit(c) (iswdigit((wint_t)(c)) || isdigit(UChar(c)))
+@@ -184,7 +184,7 @@
+ 	  int len;
+ 	  wchar_t *list = _nc_Widen_String((char *)bp, &len);
+ 
+-	  if (list != 0)
++	  if (list != NULL)
+ 	    {
+ 	      bool blank = FALSE;
+ 	      int n;
+Index: form/fty_num.c
+Prereq:  1.38 
+--- ncurses-6.5-20241130+/form/fty_num.c	2024-07-27 18:33:58.000000000 +0000
++++ ncurses-6.5-20241207/form/fty_num.c	2024-12-07 21:58:32.000000000 +0000
+@@ -35,7 +35,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fty_num.c,v 1.38 2024/07/27 18:33:58 tom Exp $")
++MODULE_ID("$Id: fty_num.c,v 1.39 2024/12/07 21:58:32 tom Exp $")
+ 
+ #if HAVE_LOCALE_H
+ #include 
+@@ -203,7 +203,7 @@
+ 	  int len;
+ 	  wchar_t *list = _nc_Widen_String((char *)bp, &len);
+ 
+-	  if (list != 0)
++	  if (list != NULL)
+ 	    {
+ 	      bool blank = FALSE;
+ 	      int state = 0;
+Index: form/fty_regex.c
+Prereq:  1.33 
+--- ncurses-6.5-20241130+/form/fty_regex.c	2021-08-14 15:01:52.000000000 +0000
++++ ncurses-6.5-20241207/form/fty_regex.c	2024-12-07 23:02:27.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2018-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2015 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -35,7 +35,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fty_regex.c,v 1.33 2021/08/14 15:01:52 tom Exp $")
++MODULE_ID("$Id: fty_regex.c,v 1.34 2024/12/07 23:02:27 tom Exp $")
+ 
+ #if HAVE_REGEX_H_FUNCS || HAVE_LIB_PCRE2	/* We prefer POSIX regex */
+ 
+@@ -157,12 +157,12 @@
+       if (preg)
+ 	{
+ 	  T((T_CREATE("RegExp_Arg %p"), (void *)preg));
+-	  if (((preg->pRegExp = typeMalloc(regex_t, 1)) != 0)
++	  if (((preg->pRegExp = typeMalloc(regex_t, 1)) != NULL)
+ 	      && !regcomp(preg->pRegExp, rx,
+ 			  (REG_EXTENDED | REG_NOSUB | REG_NEWLINE)))
+ 	    {
+ 	      T((T_CREATE("regex_t %p"), (void *)preg->pRegExp));
+-	      if ((preg->refCount = typeMalloc(unsigned long, 1)) != 0)
++	      if ((preg->refCount = typeMalloc(unsigned long, 1)) != NULL)
+ 		 *(preg->refCount) = 1;
+ 	    }
+ 	  else
+Index: include/curses.h.in
+Prereq:  1.282 
+--- ncurses-6.5-20241130+/include/curses.h.in	2024-01-19 11:50:07.000000000 +0000
++++ ncurses-6.5-20241207/include/curses.h.in	2024-12-07 17:14:44.000000000 +0000
+@@ -33,7 +33,7 @@
+  *     and: Thomas E. Dickey                        1996-on                 *
+  ****************************************************************************/
+ 
+-/* $Id: curses.h.in,v 1.282 2024/01/19 11:50:07 tom Exp $ */
++/* $Id: curses.h.in,v 1.284 2024/12/07 17:14:44 tom Exp $ */
+ 
+ #ifndef __NCURSES_H
+ #define __NCURSES_H
+@@ -125,10 +125,10 @@
+  * doing so makes it incompatible with other implementations of X/Open Curses.
+  */
+ #undef  NCURSES_CONST
+-#define NCURSES_CONST @NCURSES_CONST@
++#define NCURSES_CONST @NCURSES_CONST@	/* for old compilers */
+ 
+ #undef NCURSES_INLINE
+-#define NCURSES_INLINE @NCURSES_INLINE@
++#define NCURSES_INLINE @NCURSES_INLINE@	/* for old compilers */
+ 
+ /*
+  * The standard type used for color values, and for color-pairs.  The latter
+@@ -833,7 +833,7 @@
+ extern NCURSES_EXPORT(int) vwprintw (WINDOW *, const char *, va_list) GCC_DEPRECATED(use vw_printw)	/* implemented */
+ 		GCC_PRINTFLIKE(2,0);
+ extern NCURSES_EXPORT(int) vw_printw (WINDOW *, const char *, va_list)	/* implemented */
+-		GCC_PRINTFLIKE(2,0);	
++		GCC_PRINTFLIKE(2,0);
+ extern NCURSES_EXPORT(int) vwscanw (WINDOW *, const char *, va_list) GCC_DEPRECATED(use vw_scanw)	/* implemented */
+ 		GCC_SCANFLIKE(2,0);
+ extern NCURSES_EXPORT(int) vw_scanw (WINDOW *, const char *, va_list)	/* implemented */
+Index: menu/m_driver.c
+Prereq:  1.38 
+--- ncurses-6.5-20241130+/menu/m_driver.c	2024-07-27 18:14:20.000000000 +0000
++++ ncurses-6.5-20241207/menu/m_driver.c	2024-12-07 22:01:57.000000000 +0000
+@@ -38,7 +38,7 @@
+ 
+ #include "menu.priv.h"
+ 
+-MODULE_ID("$Id: m_driver.c,v 1.38 2024/07/27 18:14:20 tom Exp $")
++MODULE_ID("$Id: m_driver.c,v 1.39 2024/12/07 22:01:57 tom Exp $")
+ 
+ /* Macros */
+ 
+@@ -307,7 +307,7 @@
+ 	  else
+ 	    {
+ 	      my_top_row += rdiff;
+-	      while (rdiff-- > 0 && item != 0 && item->down != 0)
++	      while (rdiff-- > 0 && item != NULL && item->down != NULL)
+ 		item = item->down;
+ 	    }
+ 	  break;
+@@ -320,7 +320,7 @@
+ 	  else
+ 	    {
+ 	      my_top_row -= rdiff;
+-	      while (rdiff-- > 0 && item != 0 && item->up != 0)
++	      while (rdiff-- > 0 && item != NULL && item->up != NULL)
+ 		item = item->up;
+ 	    }
+ 	  break;
+@@ -548,7 +548,7 @@
+ 	result = E_UNKNOWN_COMMAND;
+     }
+ 
+-  if (item == 0)
++  if (item == NULL)
+     {
+       result = E_BAD_STATE;
+     }
+Index: menu/m_global.c
+Prereq:  1.34 
+--- ncurses-6.5-20241130+/menu/m_global.c	2023-09-16 16:39:26.000000000 +0000
++++ ncurses-6.5-20241207/menu/m_global.c	2024-12-07 23:02:27.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2021,2023 Thomas E. Dickey                                *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2014 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -38,7 +38,7 @@
+ 
+ #include "menu.priv.h"
+ 
+-MODULE_ID("$Id: m_global.c,v 1.34 2023/09/16 16:39:26 tom Exp $")
++MODULE_ID("$Id: m_global.c,v 1.35 2024/12/07 23:02:27 tom Exp $")
+ 
+ static char mark[] = "-";
+ /* *INDENT-OFF* */
+@@ -256,13 +256,13 @@
+   int result = item->length;
+ 
+   T((T_CALLED("_nc_menu_text_width(%p)"), (const void *)item));
+-  if (result != 0 && item->str != 0)
++  if (result != 0 && item->str != NULL)
+     {
+-      int count = (int)mbstowcs(0, item->str, 0);
+-      wchar_t *temp = 0;
++      int count = (int)mbstowcs(NULL, item->str, 0);
++      wchar_t *temp = NULL;
+ 
+       if (count > 0
+-	  && (temp = typeMalloc(wchar_t, 2 + count)) != 0)
++	  && (temp = typeMalloc(wchar_t, 2 + count)) != NULL)
+ 	{
+ 	  int n;
+ 
+@@ -296,7 +296,7 @@
+ 
+   assert(menu && menu->items);
+ 
+-  if (menu->items != 0)
++  if (menu->items != NULL)
+     {
+       ITEM **items;
+ 
+Index: menu/m_item_new.c
+Prereq:  1.39 
+--- ncurses-6.5-20241130+/menu/m_item_new.c	2024-11-23 19:16:50.000000000 +0000
++++ ncurses-6.5-20241207/menu/m_item_new.c	2024-12-07 22:01:57.000000000 +0000
+@@ -45,7 +45,7 @@
+ #endif
+ #endif
+ 
+-MODULE_ID("$Id: m_item_new.c,v 1.39 2024/11/23 19:16:50 tom Exp $")
++MODULE_ID("$Id: m_item_new.c,v 1.40 2024/12/07 22:01:57 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnmenu
+@@ -63,13 +63,13 @@
+   bool result = TRUE;
+ 
+ #if USE_WIDEC_SUPPORT
+-  int count = (int)mbstowcs(0, s, 0);
+-  wchar_t *temp = 0;
++  int count = (int)mbstowcs(NULL, s, 0);
++  wchar_t *temp = NULL;
+ 
+   assert(s);
+ 
+   if (count > 0
+-      && (temp = typeCalloc(wchar_t, (2 + (unsigned)count))) != 0)
++      && (temp = typeCalloc(wchar_t, (2 + (unsigned)count))) != NULL)
+     {
+       int n;
+ 
+@@ -231,7 +231,7 @@
+ 	  else
+ 	    {
+ 	      menu->mark = old_mark;
+-	      menu->marklen = (short)((old_mark != 0) ? strlen(old_mark) : 0);
++	      menu->marklen = (short)((old_mark != NULL) ? strlen(old_mark) : 0);
+ 	      RETURN(E_SYSTEM_ERROR);
+ 	    }
+ 	}
+Index: menu/m_pattern.c
+Prereq:  1.20 
+--- ncurses-6.5-20241130+/menu/m_pattern.c	2021-06-17 21:20:30.000000000 +0000
++++ ncurses-6.5-20241207/menu/m_pattern.c	2024-12-07 23:00:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -38,7 +38,7 @@
+ 
+ #include "menu.priv.h"
+ 
+-MODULE_ID("$Id: m_pattern.c,v 1.20 2021/06/17 21:20:30 tom Exp $")
++MODULE_ID("$Id: m_pattern.c,v 1.21 2024/12/07 23:00:37 tom Exp $")
+ 
+ /*---------------------------------------------------------------------------
+ |   Facility      :  libnmenu
+@@ -57,7 +57,7 @@
+   static char empty[] = "";
+ 
+   T((T_CALLED("menu_pattern(%p)"), (const void *)menu));
+-  returnPtr(menu ? (menu->pattern ? menu->pattern : empty) : 0);
++  returnPtr(menu ? (menu->pattern ? menu->pattern : empty) : NULL);
+ }
+ 
+ /*---------------------------------------------------------------------------
+Index: menu/m_req_name.c
+Prereq:  1.27 
+--- ncurses-6.5-20241130+/menu/m_req_name.c	2021-06-17 21:11:08.000000000 +0000
++++ ncurses-6.5-20241207/menu/m_req_name.c	2024-12-07 23:00:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2015 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -38,7 +38,7 @@
+ 
+ #include "menu.priv.h"
+ 
+-MODULE_ID("$Id: m_req_name.c,v 1.27 2021/06/17 21:11:08 tom Exp $")
++MODULE_ID("$Id: m_req_name.c,v 1.28 2024/12/07 23:00:37 tom Exp $")
+ 
+ #define DATA(s) { s }
+ 
+@@ -106,7 +106,7 @@
+ 
+   T((T_CALLED("menu_request_by_name(%s)"), _nc_visbuf(str)));
+ 
+-  if (str != 0 && (i = strlen(str)) != 0)
++  if (str != NULL && (i = strlen(str)) != 0)
+     {
+       char buf[16];
+ 
+Index: menu/mf_common.h
+Prereq:  0.26 
+--- ncurses-6.5-20241130+/menu/mf_common.h	2024-11-30 21:41:20.000000000 +0000
++++ ncurses-6.5-20241207/menu/mf_common.h	2024-12-07 22:01:18.000000000 +0000
+@@ -31,7 +31,7 @@
+  *   Author:  Juergen Pfeifer, 1995,1997                                    *
+  ****************************************************************************/
+ 
+-/* $Id: mf_common.h,v 0.26 2024/11/30 21:41:20 tom Exp $ */
++/* $Id: mf_common.h,v 0.27 2024/12/07 22:01:18 tom Exp $ */
+ 
+ /* Common internal header for menu and form library */
+ 
+@@ -88,7 +88,7 @@
+ 
+ /* Call object hook */
+ #define Call_Hook( object, handler ) \
+-   if ( (object) != 0 && ((object)->handler) != (void *) 0 )\
++   if ( (object) != NULL && ((object)->handler) != (void *) 0 )\
+    {\
+ 	SetStatus(object, _IN_DRIVER);\
+ 	(object)->handler(object);\
+Index: ncurses/base/MKkeyname.awk
+Prereq:  1.51 
+--- ncurses-6.5-20241130+/ncurses/base/MKkeyname.awk	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/MKkeyname.awk	2024-12-07 21:09:39.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: MKkeyname.awk,v 1.51 2020/02/02 23:34:34 tom Exp $
++# $Id: MKkeyname.awk,v 1.53 2024/12/07 21:09:39 tom Exp $
+ ##############################################################################
+-# Copyright 2020 Thomas E. Dickey                                            #
++# Copyright 2020,2024 Thomas E. Dickey                                       #
+ # Copyright 1998-2016,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -59,7 +59,7 @@
+ 	if (bigstrings) {
+ 		printf "\t{ -1, 0 }};\n"
+ 		print ""
+-		print "static const char key_names[] = "names";"
++		print "static const char key_names[] ="names";"
+ 	} else {
+ 		printf "\t{ 0, 0 }};\n"
+ 	}
+@@ -72,7 +72,7 @@
+ 	print "safe_keyname (SCREEN *sp, int c)"
+ 	print "{"
+ 	print "	char name[20];"
+-	print "	NCURSES_CONST char *result = 0;"
++	print "	NCURSES_CONST char *result = NULL;"
+ 	print ""
+ 	print "	if (c == -1) {"
+ 	print "		result = \"-1\";"
+@@ -86,7 +86,7 @@
+ 		print "			}"
+ 		print "		}"
+ 	} else {
+-		print "		for (i = 0; _nc_key_names[i].name != 0; i++) {"
++		print "		for (i = 0; _nc_key_names[i].name != NULL; i++) {"
+ 		print "			if (_nc_key_names[i].code == c) {"
+ 		print "				result = (NCURSES_CONST char *)_nc_key_names[i].name;"
+ 		print "				break;"
+@@ -94,12 +94,12 @@
+ 		print "		}"
+ 	}
+ 	print ""
+-	print "		if (result == 0 && (c >= 0 && c < SIZEOF_TABLE)) {"
+-	print "			if (MyTable == 0)"
++	print "		if (result == NULL && (c >= 0 && c < SIZEOF_TABLE)) {"
++	print "			if (MyTable == NULL)"
+ 	print "				MyTable = typeCalloc(char *, SIZEOF_TABLE);"
+ 	print ""
+-	print "			if (MyTable != 0) {"
+-	print "				int m_prefix = (sp == 0 || sp->_use_meta);"
++	print "			if (MyTable != NULL) {"
++	print "				int m_prefix = (sp == NULL || sp->_use_meta);"
+ 	print ""
+ 	print "				/* if sense of meta() changed, discard cached data */"
+ 	print "				if (MyInit != (m_prefix + 1)) {"
+@@ -112,7 +112,7 @@
+ 	print "				}"
+ 	print ""
+ 	print "				/* create and cache result as needed */"
+-	print "				if (MyTable[c] == 0) {"
++	print "				if (MyTable[c] == NULL) {"
+ 	print "					int cc = c;"
+ 	print "					char *p = name;"
+ 	print "#define P_LIMIT (sizeof(name) - (size_t) (p - name))"
+@@ -132,22 +132,22 @@
+ 	print "				result = MyTable[c];"
+ 	print "			}"
+ 	print "#if NCURSES_EXT_FUNCS && NCURSES_XNAMES"
+-	print "		} else if (result == 0 && HasTerminal(sp)) {"
++	print "		} else if (result == NULL && HasTerminal(sp)) {"
+ 	print "			int j, k;"
+ 	print "			char * bound;"
+ 	print "			TERMTYPE2 *tp = &TerminalType(TerminalOf(sp));"
+ 	print "			unsigned save_trace = _nc_tracing;"
+ 	print ""
+ 	print "			_nc_tracing = 0;	/* prevent recursion via keybound() */"
+-	print "			for (j = 0; (bound = NCURSES_SP_NAME(keybound)(NCURSES_SP_ARGx c, j)) != 0; ++j) {"
++	print "			for (j = 0; (bound = NCURSES_SP_NAME(keybound)(NCURSES_SP_ARGx c, j)) != NULL; ++j) {"
+ 	print "				for(k = STRCOUNT; k < (int) NUM_STRINGS(tp);  k++) {"
+-	print "					if (tp->Strings[k] != 0 && !strcmp(bound, tp->Strings[k])) {"
++	print "					if (tp->Strings[k] != NULL && !strcmp(bound, tp->Strings[k])) {"
+ 	print "						result = ExtStrname(tp, k, strnames);"
+ 	print "						break;"
+ 	print "					}"
+ 	print "				}"
+ 	print "				free(bound);"
+-	print "				if (result != 0)"
++	print "				if (result != NULL)"
+ 	print "					break;"
+ 	print "			}"
+ 	print "			_nc_tracing = save_trace;"
+@@ -166,7 +166,7 @@
+ 	print "#if NO_LEAKS"
+ 	print "void _nc_keyname_leaks(void)"
+ 	print "{"
+-	print "	if (MyTable != 0) {"
++	print "	if (MyTable != NULL) {"
+ 	print "		int j;"
+ 	print "		for (j = 0; j < SIZEOF_TABLE; ++j) {"
+ 	print "			FreeIfNeeded(MyTable[j]);"
+Index: ncurses/base/MKlib_gen.sh
+Prereq:  1.74 
+--- ncurses-6.5-20241130+/ncurses/base/MKlib_gen.sh	2024-09-22 20:41:58.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/MKlib_gen.sh	2024-12-07 21:50:24.000000000 +0000
+@@ -2,7 +2,7 @@
+ #
+ # MKlib_gen.sh -- generate sources from curses.h macro definitions
+ #
+-# ($Id: MKlib_gen.sh,v 1.74 2024/09/22 20:41:58 tom Exp $)
++# ($Id: MKlib_gen.sh,v 1.75 2024/12/07 21:50:24 tom Exp $)
+ #
+ ##############################################################################
+ # Copyright 2018-2022,2024 Thomas E. Dickey                                  #
+@@ -188,6 +188,9 @@
+ cat >$ED4 <$ED4 <= 0 && check < (int)SIZEOF(unctrl_table)) {"
+ 		print  "#if NCURSES_EXT_FUNCS"
+-		print  "\t\tif ((sp != 0)"
++		print  "\t\tif ((sp != NULL)"
+ 		print  "\t\t && (sp->_legacy_coding > 1)"
+ 		print  "\t\t && (check >= 128)"
+ 		print  "\t\t && (check < 160))"
+@@ -156,7 +156,7 @@
+ 		print  "\t\tif ((check >= 160)"
+ 		print  "\t\t && (check < 256)"
+ 		print  "\t\t && !_nc_unicode_locale()"
+-		print  "\t\t && ((sp != 0)"
++		print  "\t\t && ((sp != NULL)"
+ 		print  "\t\t  && ((sp->_legacy_coding > 0)"
+ 		print  "\t\t   || (sp->_legacy_coding == 0"
+ 		print  "\t\t       && isprint(check)))))"
+@@ -165,7 +165,7 @@
+ 		print  "#endif /* NCURSES_EXT_FUNCS */"
+ 		printf "\t\t\tresult = %s_table[check];\n", stringname;
+ 		print  "\t} else {"
+-		print  "\t\tresult = 0;"
++		print  "\t\tresult = NULL;"
+ 		print  "\t}"
+ 		print  "\treturn (NCURSES_CONST char *)result;"
+ 		print  "}"
+Index: ncurses/base/define_key.c
+Prereq:  1.22 
+--- ncurses-6.5-20241130+/ncurses/base/define_key.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/define_key.c	2024-12-07 21:24:18.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2009,2014 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -34,7 +34,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: define_key.c,v 1.22 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: define_key.c,v 1.23 2024/12/07 21:24:18 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ NCURSES_SP_NAME(define_key) (NCURSES_SP_DCLx const char *str, int keycode)
+@@ -42,7 +42,7 @@
+     int code = ERR;
+ 
+     T((T_CALLED("define_key(%p, %s,%d)"), (void *) SP_PARM, _nc_visbuf(str), keycode));
+-    if (SP_PARM == 0 || !HasTInfoTerminal(SP_PARM)) {
++    if (SP_PARM == NULL || !HasTInfoTerminal(SP_PARM)) {
+ 	code = ERR;
+     } else if (keycode > 0) {
+ 	unsigned ukey = (unsigned) keycode;
+@@ -53,13 +53,13 @@
+ #define CallHasKey(keycode) NCURSES_SP_NAME(has_key)(NCURSES_SP_ARGx keycode)
+ #endif
+ 
+-	if (str != 0) {
++	if (str != NULL) {
+ 	    NCURSES_SP_NAME(define_key) (NCURSES_SP_ARGx str, 0);
+ 	} else if (CallHasKey(keycode)) {
+ 	    while (_nc_remove_key(&(SP_PARM->_keytry), ukey))
+ 		code = OK;
+ 	}
+-	if (str != 0) {
++	if (str != NULL) {
+ 	    if (NCURSES_SP_NAME(key_defined) (NCURSES_SP_ARGx str) == 0) {
+ 		if (_nc_add_to_try(&(SP_PARM->_keytry), str, ukey) == OK) {
+ 		    code = OK;
+Index: ncurses/base/key_defined.c
+Prereq:  1.11 
+--- ncurses-6.5-20241130+/ncurses/base/key_defined.c	2023-06-24 15:36:32.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/key_defined.c	2024-12-07 21:24:18.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2023 Thomas E. Dickey                                     *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2003-2006,2009 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -34,7 +34,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: key_defined.c,v 1.11 2023/06/24 15:36:32 tom Exp $")
++MODULE_ID("$Id: key_defined.c,v 1.12 2024/12/07 21:24:18 tom Exp $")
+ 
+ static int
+ find_definition(TRIES * tree, const char *str)
+@@ -43,9 +43,9 @@
+     int result = OK;
+ 
+     if (VALID_STRING(str) && *str != '\0') {
+-	for (ptr = tree; ptr != 0; ptr = ptr->sibling) {
++	for (ptr = tree; ptr != NULL; ptr = ptr->sibling) {
+ 	    if (UChar(*str) == UChar(ptr->ch)) {
+-		if (str[1] == '\0' && ptr->child != 0) {
++		if (str[1] == '\0' && ptr->child != NULL) {
+ 		    result = ERR;
+ 		} else if ((result = find_definition(ptr->child, str + 1))
+ 			   == OK) {
+@@ -72,7 +72,7 @@
+     int code = ERR;
+ 
+     T((T_CALLED("key_defined(%p, %s)"), (void *) SP_PARM, _nc_visbuf(str)));
+-    if (SP_PARM != 0 && str != 0) {
++    if (SP_PARM != NULL && str != NULL) {
+ 	code = find_definition(SP_PARM->_keytry, str);
+     }
+ 
+Index: ncurses/base/keybound.c
+Prereq:  1.12 
+--- ncurses-6.5-20241130+/ncurses/base/keybound.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/keybound.c	2024-12-07 21:24:18.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1999-2009,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: keybound.c,v 1.12 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: keybound.c,v 1.13 2024/12/07 21:24:18 tom Exp $")
+ 
+ /*
+  * Returns the count'th string definition which is associated with the
+@@ -43,10 +43,10 @@
+ NCURSES_EXPORT(char *)
+ NCURSES_SP_NAME(keybound) (NCURSES_SP_DCLx int code, int count)
+ {
+-    char *result = 0;
++    char *result = NULL;
+ 
+     T((T_CALLED("keybound(%p, %d,%d)"), (void *) SP_PARM, code, count));
+-    if (SP_PARM != 0 && code >= 0) {
++    if (SP_PARM != NULL && code >= 0) {
+ 	result = _nc_expand_try(SP_PARM->_keytry,
+ 				(unsigned) code,
+ 				&count,
+Index: ncurses/base/keyok.c
+Prereq:  1.17 
+--- ncurses-6.5-20241130+/ncurses/base/keyok.c	2021-06-17 21:26:02.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/keyok.c	2024-12-07 21:24:18.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2019-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2014 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -34,7 +34,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: keyok.c,v 1.17 2021/06/17 21:26:02 tom Exp $")
++MODULE_ID("$Id: keyok.c,v 1.18 2024/12/07 21:24:18 tom Exp $")
+ 
+ /*
+  * Enable (or disable) ncurses' interpretation of a keycode by adding (or
+@@ -63,7 +63,7 @@
+ 
+ 	    if (flag) {
+ 		while ((s = _nc_expand_try(SP_PARM->_key_ok,
+-					   ch, &count, (size_t) 0)) != 0) {
++					   ch, &count, (size_t) 0)) != NULL) {
+ 		    if (_nc_remove_key(&(SP_PARM->_key_ok), ch)) {
+ 			code = _nc_add_to_try(&(SP_PARM->_keytry), s, ch);
+ 			free(s);
+@@ -76,7 +76,7 @@
+ 		}
+ 	    } else {
+ 		while ((s = _nc_expand_try(SP_PARM->_keytry,
+-					   ch, &count, (size_t) 0)) != 0) {
++					   ch, &count, (size_t) 0)) != NULL) {
+ 		    if (_nc_remove_key(&(SP_PARM->_keytry), ch)) {
+ 			code = _nc_add_to_try(&(SP_PARM->_key_ok), s, ch);
+ 			free(s);
+Index: ncurses/base/legacy_coding.c
+Prereq:  1.6 
+--- ncurses-6.5-20241130+/ncurses/base/legacy_coding.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/legacy_coding.c	2024-12-07 20:00:48.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 2005,2009 Free Software Foundation, Inc.                       *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -34,7 +34,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: legacy_coding.c,v 1.6 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: legacy_coding.c,v 1.7 2024/12/07 20:00:48 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ NCURSES_SP_NAME(use_legacy_coding) (NCURSES_SP_DCLx int level)
+@@ -42,7 +42,7 @@
+     int result = ERR;
+ 
+     T((T_CALLED("use_legacy_coding(%p,%d)"), (void *) SP_PARM, level));
+-    if (level >= 0 && level <= 2 && SP_PARM != 0) {
++    if (level >= 0 && level <= 2 && SP_PARM != NULL) {
+ 	result = SP_PARM->_legacy_coding;
+ 	SP_PARM->_legacy_coding = level;
+     }
+Index: ncurses/base/lib_addch.c
+Prereq:  1.143 
+--- ncurses-6.5-20241130+/ncurses/base/lib_addch.c	2024-11-30 21:18:07.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_addch.c	2024-12-07 17:18:07.000000000 +0000
+@@ -37,7 +37,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: lib_addch.c,v 1.143 2024/11/30 21:18:07 tom Exp $")
++MODULE_ID("$Id: lib_addch.c,v 1.144 2024/12/07 17:18:07 tom Exp $")
+ 
+ static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
+ 
+@@ -451,14 +451,14 @@
+     if ((AttrOf(ch) & A_ALTCHARSET)
+ 	|| (
+ #if USE_WIDEC_SUPPORT
+-	       (sp != 0 && sp->_legacy_coding) &&
++	       (sp != NULL && sp->_legacy_coding) &&
+ #endif
+ 	       s[1] == 0
+ 	)
+ 	|| (
+ 	       (isprint(UChar(t)) && !iscntrl(UChar(t)))
+ #if USE_WIDEC_SUPPORT
+-	       || ((sp == 0 || !sp->_legacy_coding) &&
++	       || ((sp == NULL || !sp->_legacy_coding) &&
+ 		   (WINDOW_EXT(win, addch_used)
+ 		    || !_nc_is_charable(CharOf(ch))))
+ #endif
+Index: ncurses/base/lib_addstr.c
+Prereq:  1.62 
+--- ncurses-6.5-20241130+/ncurses/base/lib_addstr.c	2023-11-21 21:47:23.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_addstr.c	2024-12-07 20:00:48.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -45,7 +45,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_addstr.c,v 1.62 2023/11/21 21:47:23 tom Exp $")
++MODULE_ID("$Id: lib_addstr.c,v 1.63 2024/12/07 20:00:48 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ waddnstr(WINDOW *win, const char *astr, int n)
+@@ -55,7 +55,7 @@
+ 
+     T((T_CALLED("waddnstr(%p,%s,%d)"), (void *) win, _nc_visbufn(astr, n), n));
+ 
+-    if (win && (str != 0) && (n != 0)) {
++    if (win && (str != NULL) && (n != 0)) {
+ 	bool explicit = (n > 0);
+ 
+ 	TR(TRACE_VIRTPUT | TRACE_ATTRS,
+@@ -123,7 +123,7 @@
+ _nc_wchstrlen(const cchar_t *s)
+ {
+     int result = 0;
+-    if (s != 0) {
++    if (s != NULL) {
+ 	while (CharOf(s[result]) != L'\0') {
+ 	    result++;
+ 	}
+@@ -230,7 +230,7 @@
+ 
+     T((T_CALLED("waddnwstr(%p,%s,%d)"), (void *) win, _nc_viswbufn(str, n), n));
+ 
+-    if (win && (str != 0) && (n != 0)) {
++    if (win && (str != NULL) && (n != 0)) {
+ 	bool explicit = (n > 0);
+ 
+ 	TR(TRACE_VIRTPUT | TRACE_ATTRS,
+Index: ncurses/base/lib_beep.c
+Prereq:  1.18 
+--- ncurses-6.5-20241130+/ncurses/base/lib_beep.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_beep.c	2024-12-07 20:00:48.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2013,2014 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -47,7 +47,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_beep.c,v 1.18 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_beep.c,v 1.19 2024/12/07 20:00:48 tom Exp $")
+ 
+ /*
+  *	beep()
+@@ -69,7 +69,7 @@
+ 	res = CallDriver_1(SP_PARM, td_doBeepOrFlash, TRUE);
+ #else
+     /* FIXME: should make sure that we are not in altchar mode */
+-    if (cur_term == 0) {
++    if (cur_term == NULL) {
+ 	res = ERR;
+     } else if (bell) {
+ 	res = NCURSES_PUTP2_FLUSH("bell", bell);
+Index: ncurses/base/lib_bkgd.c
+Prereq:  1.63 
+--- ncurses-6.5-20241130+/ncurses/base/lib_bkgd.c	2021-05-08 14:58:12.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_bkgd.c	2024-12-07 20:00:48.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2018-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2014,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -37,7 +37,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_bkgd.c,v 1.63 2021/05/08 14:58:12 tom Exp $")
++MODULE_ID("$Id: lib_bkgd.c,v 1.64 2024/12/07 20:00:48 tom Exp $")
+ 
+ static const NCURSES_CH_T blank = NewChar(BLANK_TEXT);
+ 
+@@ -136,7 +136,7 @@
+ #define TraceChar(c) _tracechar(CharOf(c))
+ #endif
+ 
+-    if (SP == 0) {
++    if (SP == NULL) {
+ 	;
+     } else if (win) {
+ 	NCURSES_CH_T new_bkgd = CHDEREF(ch);
+Index: ncurses/base/lib_color.c
+Prereq:  1.152 
+--- ncurses-6.5-20241130+/ncurses/base/lib_color.c	2024-11-23 18:27:25.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_color.c	2024-12-07 17:28:13.000000000 +0000
+@@ -49,7 +49,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_color.c,v 1.152 2024/11/23 18:27:25 tom Exp $")
++MODULE_ID("$Id: lib_color.c,v 1.153 2024/12/07 17:28:13 tom Exp $")
+ 
+ #ifdef USE_TERM_DRIVER
+ #define CanChange      InfoOf(SP_PARM).canchange
+@@ -146,13 +146,13 @@
+ static int
+ default_fg(NCURSES_SP_DCL0)
+ {
+-    return (SP_PARM != 0) ? SP_PARM->_default_fg : COLOR_WHITE;
++    return (SP_PARM != NULL) ? SP_PARM->_default_fg : COLOR_WHITE;
+ }
+ 
+ static int
+ default_bg(NCURSES_SP_DCL0)
+ {
+-    return SP_PARM != 0 ? SP_PARM->_default_bg : COLOR_BLACK;
++    return SP_PARM != NULL ? SP_PARM->_default_bg : COLOR_BLACK;
+ }
+ #else
+ #define default_fg(sp) COLOR_WHITE
+@@ -273,7 +273,7 @@
+ 	    result->bits.red = UChar(n);
+ 	    result->bits.green = UChar(n);
+ 	    result->bits.blue = UChar(n);
+-	} else if ((s = tigetstr(name)) != 0 && VALID_STRING(s)) {
++	} else if ((s = tigetstr(name)) != NULL && VALID_STRING(s)) {
+ 	    int red = n;
+ 	    int green = n;
+ 	    int blue = width - (2 * n);
+@@ -312,7 +312,7 @@
+     bool result = FALSE;
+ 
+     (void) SP_PARM;
+-    if (orig_pair != 0) {
++    if (orig_pair != NULL) {
+ 	(void) NCURSES_PUTP2("orig_pair", orig_pair);
+ 	result = TRUE;
+     }
+@@ -339,7 +339,7 @@
+ #ifdef USE_TERM_DRIVER
+     result = CallDriver(SP_PARM, td_rescolors);
+ #else
+-    if (orig_colors != 0) {
++    if (orig_colors != NULL) {
+ 	NCURSES_PUTP2("orig_colors", orig_colors);
+ 	result = TRUE;
+     }
+@@ -362,7 +362,7 @@
+ 
+     T((T_CALLED("start_color(%p)"), (void *) SP_PARM));
+ 
+-    if (SP_PARM == 0) {
++    if (SP_PARM == NULL) {
+ 	result = ERR;
+     } else if (SP_PARM->_coloron) {
+ 	result = OK;
+@@ -406,12 +406,12 @@
+ #endif
+ 
+ 	    ReservePairs(SP_PARM, 16);
+-	    if (SP_PARM->_color_pairs != 0) {
++	    if (SP_PARM->_color_pairs != NULL) {
+ 		if (init_direct_colors(NCURSES_SP_ARG)) {
+ 		    result = OK;
+ 		} else {
+ 		    TYPE_CALLOC(color_t, maxcolors, SP_PARM->_color_table);
+-		    if (SP_PARM->_color_table != 0) {
++		    if (SP_PARM->_color_table != NULL) {
+ 			MakeColorPair(SP_PARM->_color_pairs[0],
+ 				      default_fg(NCURSES_SP_ARG),
+ 				      default_bg(NCURSES_SP_ARG));
+@@ -425,7 +425,7 @@
+ 		       COLORS, COLOR_PAIRS));
+ 
+ 		    SP_PARM->_coloron = 1;
+-		} else if (SP_PARM->_color_pairs != 0) {
++		} else if (SP_PARM->_color_pairs != NULL) {
+ 		    FreeAndNull(SP_PARM->_color_pairs);
+ 		}
+ 	    }
+@@ -526,13 +526,13 @@
+     if (have > sp->_pair_limit)
+ 	have = sp->_pair_limit;
+ 
+-    if (sp->_color_pairs == 0) {
++    if (sp->_color_pairs == NULL) {
+ 	TYPE_CALLOC(colorpair_t, have, sp->_color_pairs);
+     } else if (have > sp->_pair_alloc) {
+ #if NCURSES_EXT_COLORS && NCURSES_EXT_FUNCS
+ 	colorpair_t *next;
+ 
+-	if ((next = typeCalloc(colorpair_t, have)) == 0)
++	if ((next = typeCalloc(colorpair_t, have)) == NULL)
+ 	    _nc_err_abort(MSG_NO_MEMORY);
+ 	memcpy(next, sp->_color_pairs, (size_t) sp->_pair_alloc * sizeof(*next));
+ 	_nc_copy_pairs(sp, next, sp->_color_pairs, sp->_pair_alloc);
+@@ -546,7 +546,7 @@
+ 	}
+ #endif
+     }
+-    if (sp->_color_pairs != 0) {
++    if (sp->_color_pairs != NULL) {
+ 	sp->_pair_alloc = have;
+     }
+ }
+@@ -713,7 +713,7 @@
+        color,
+        r, g, b));
+ 
+-    if (sp == 0 || sp->_direct_color.value)
++    if (sp == NULL || sp->_direct_color.value)
+ 	returnCode(result);
+ 
+     maxcolors = MaxColors;
+@@ -837,7 +837,7 @@
+        (void *) g,
+        (void *) b));
+ 
+-    if (sp != 0) {
++    if (sp != NULL) {
+ 	int maxcolors = MaxColors;
+ 
+ 	if (color >= 0 && OkColorHi(color) && sp->_coloron) {
+@@ -1008,14 +1008,14 @@
+ 				    TIPARM_1(set_color_pair, pair),
+ 				    1, outc);
+ 	    return;
+-	} else if (SP_PARM != 0) {
++	} else if (SP_PARM != NULL) {
+ 	    if (_nc_pair_content(SP_PARM, pair, &fg, &bg) == ERR)
+ 		return;
+ 	}
+     }
+ 
+     if (old_pair >= 0
+-	&& SP_PARM != 0
++	&& SP_PARM != NULL
+ 	&& _nc_pair_content(SP_PARM, old_pair, &old_fg, &old_bg) != ERR) {
+ 	if ((isDefaultColor(fg) && !isDefaultColor(old_fg))
+ 	    || (isDefaultColor(bg) && !isDefaultColor(old_bg))) {
+@@ -1115,11 +1115,11 @@
+ NCURSES_EXPORT(void)
+ NCURSES_SP_NAME(reset_color_pairs) (NCURSES_SP_DCL0)
+ {
+-    if (SP_PARM != 0) {
++    if (SP_PARM != NULL) {
+ 	if (SP_PARM->_color_pairs) {
+ 	    _nc_free_ordered_pairs(SP_PARM);
+ 	    free(SP_PARM->_color_pairs);
+-	    SP_PARM->_color_pairs = 0;
++	    SP_PARM->_color_pairs = NULL;
+ 	    SP_PARM->_pair_alloc = 0;
+ 	    ReservePairs(SP_PARM, 16);
+ 	    clearok(CurScreen(SP_PARM), TRUE);
+Index: ncurses/base/lib_colorset.c
+Prereq:  1.16 
+--- ncurses-6.5-20241130+/ncurses/base/lib_colorset.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_colorset.c	2024-12-07 20:00:48.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -42,7 +42,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: lib_colorset.c,v 1.16 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_colorset.c,v 1.17 2024/12/07 20:00:48 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ wcolor_set(WINDOW *win, NCURSES_PAIRS_T pair_arg, void *opts)
+@@ -53,7 +53,7 @@
+     T((T_CALLED("wcolor_set(%p,%d)"), (void *) win, color_pair));
+     set_extended_pair(opts, color_pair);
+     if (win
+-	&& (SP != 0)
++	&& (SP != NULL)
+ 	&& (color_pair >= 0)
+ 	&& (color_pair < SP->_pair_limit)) {
+ 	TR(TRACE_ATTRS, ("... current %ld", (long) GET_WINDOW_PAIR(win)));
+Index: ncurses/base/lib_delwin.c
+Prereq:  1.28 
+--- ncurses-6.5-20241130+/ncurses/base/lib_delwin.c	2024-07-27 18:57:35.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_delwin.c	2024-12-07 17:28:13.000000000 +0000
+@@ -43,7 +43,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_delwin.c,v 1.28 2024/07/27 18:57:35 tom Exp $")
++MODULE_ID("$Id: lib_delwin.c,v 1.29 2024/12/07 17:28:13 tom Exp $")
+ 
+ static bool
+ cannot_delete(const WINDOW *win)
+@@ -80,7 +80,7 @@
+     T((T_CALLED("delwin(%p)"), (void *) win));
+ 
+     if (_nc_try_global(curses) == 0) {
+-	if (win == 0
++	if (win == NULL
+ 	    || cannot_delete(win)) {
+ 	    result = ERR;
+ 	} else if (IS_PAD(win)) {
+@@ -92,7 +92,7 @@
+ #endif
+ 	    if (IS_SUBWIN(win)) {
+ 		touchwin(win->_parent);
+-	    } else if (CurScreen(SP_PARM) != 0) {
++	    } else if (CurScreen(SP_PARM) != NULL) {
+ 		touchwin(CurScreen(SP_PARM));
+ 	    }
+ 	    result = _nc_freewin(win);
+Index: ncurses/base/lib_dft_fgbg.c
+Prereq:  1.31 
+--- ncurses-6.5-20241130+/ncurses/base/lib_dft_fgbg.c	2021-04-03 22:27:18.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_dft_fgbg.c	2024-12-07 20:00:48.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -38,7 +38,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_dft_fgbg.c,v 1.31 2021/04/03 22:27:18 tom Exp $")
++MODULE_ID("$Id: lib_dft_fgbg.c,v 1.32 2024/12/07 20:00:48 tom Exp $")
+ 
+ /*
+  * Modify the behavior of color-pair 0 so that the library doesn't assume that
+@@ -69,7 +69,7 @@
+     int code = ERR;
+ 
+     T((T_CALLED("assume_default_colors(%p,%d,%d)"), (void *) SP_PARM, fg, bg));
+-    if (SP_PARM != 0) {
++    if (SP_PARM != NULL) {
+ #ifdef USE_TERM_DRIVER
+ 	code = CallDriver_2(SP_PARM, td_defaultcolors, fg, bg);
+ #else
+@@ -79,7 +79,7 @@
+ 	    SP_PARM->_has_sgr_39_49 = (tigetflag("AX") == TRUE);
+ 	    SP_PARM->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : fg;
+ 	    SP_PARM->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : bg;
+-	    if (SP_PARM->_color_pairs != 0) {
++	    if (SP_PARM->_color_pairs != NULL) {
+ 		bool save = SP_PARM->_default_color;
+ 		SP_PARM->_assumed_color = TRUE;
+ 		SP_PARM->_default_color = TRUE;
+Index: ncurses/base/lib_echo.c
+Prereq:  1.10 
+--- ncurses-6.5-20241130+/ncurses/base/lib_echo.c	2023-04-29 18:57:12.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_echo.c	2024-12-07 20:00:48.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2023 Thomas E. Dickey                                     *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2000,2009 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -45,13 +45,13 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_echo.c,v 1.10 2023/04/29 18:57:12 tom Exp $")
++MODULE_ID("$Id: lib_echo.c,v 1.11 2024/12/07 20:00:48 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ NCURSES_SP_NAME(echo) (NCURSES_SP_DCL0)
+ {
+     T((T_CALLED("echo(%p)"), (void *) SP_PARM));
+-    if (0 == SP_PARM)
++    if (NULL == SP_PARM)
+ 	returnCode(ERR);
+     IsEcho(SP_PARM) = TRUE;
+     returnCode(OK);
+@@ -69,7 +69,7 @@
+ NCURSES_SP_NAME(noecho) (NCURSES_SP_DCL0)
+ {
+     T((T_CALLED("noecho(%p)"), (void *) SP_PARM));
+-    if (0 == SP_PARM)
++    if (NULL == SP_PARM)
+ 	returnCode(ERR);
+     IsEcho(SP_PARM) = FALSE;
+     returnCode(OK);
+Index: ncurses/base/lib_erase.c
+Prereq:  1.20 
+--- ncurses-6.5-20241130+/ncurses/base/lib_erase.c	2022-09-03 21:40:27.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_erase.c	2024-12-07 20:00:48.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2022 Thomas E. Dickey                                     *
++ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2009,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -42,7 +42,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_erase.c,v 1.20 2022/09/03 21:40:27 tom Exp $")
++MODULE_ID("$Id: lib_erase.c,v 1.21 2024/12/07 20:00:48 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ werase(WINDOW *win)
+@@ -71,7 +71,7 @@
+ 	     */
+ 	    if_WIDEC({
+ 		if (isWidecExt(start[0])) {
+-		    int x = (win->_parent != 0) ? (win->_begx) : 0;
++		    int x = (win->_parent != NULL) ? (win->_begx) : 0;
+ 		    while (x-- > 0) {
+ 			if (isWidecBase(start[-1])) {
+ 			    --start;
+Index: ncurses/base/lib_freeall.c
+Prereq:  1.77 
+--- ncurses-6.5-20241130+/ncurses/base/lib_freeall.c	2024-07-27 19:22:23.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_freeall.c	2024-12-07 18:00:11.000000000 +0000
+@@ -40,7 +40,7 @@
+ extern int malloc_errfd;	/* FIXME */
+ #endif
+ 
+-MODULE_ID("$Id: lib_freeall.c,v 1.77 2024/07/27 19:22:23 tom Exp $")
++MODULE_ID("$Id: lib_freeall.c,v 1.78 2024/12/07 18:00:11 tom Exp $")
+ 
+ /*
+  * Free all ncurses data.  This is used for testing only (there's no practical
+@@ -54,11 +54,11 @@
+     T((T_CALLED("_nc_freeall()")));
+ #if NO_LEAKS
+     _nc_globals.leak_checking = TRUE;
+-    if (SP_PARM != 0) {
+-	if (SP_PARM->_oldnum_list != 0) {
++    if (SP_PARM != NULL) {
++	if (SP_PARM->_oldnum_list != NULL) {
+ 	    FreeAndNull(SP_PARM->_oldnum_list);
+ 	}
+-	if (SP_PARM->_panelHook.destroy != 0) {
++	if (SP_PARM->_panelHook.destroy != NULL) {
+ 	    SP_PARM->_panelHook.destroy(SP_PARM->_panelHook.stdscr_pseudo_panel);
+ 	}
+ #if NCURSES_EXT_COLORS
+@@ -66,10 +66,10 @@
+ #endif
+     }
+ #endif
+-    if (SP_PARM != 0) {
++    if (SP_PARM != NULL) {
+ 	_nc_lock_global(curses);
+ 
+-	while (WindowList(SP_PARM) != 0) {
++	while (WindowList(SP_PARM) != NULL) {
+ 	    WINDOWLIST *p, *q;
+ 	    bool deleted = FALSE;
+ 
+@@ -119,7 +119,7 @@
+ 	_nc_unlock_global(curses);
+     }
+ 
+-    (void) _nc_printf_string(0, empty_va);
++    (void) _nc_printf_string(NULL, empty_va);
+ #ifdef TRACE
+     (void) _nc_trace_buf(-1, (size_t) 0);
+ #endif
+Index: ncurses/base/lib_getch.c
+Prereq:  1.147 
+--- ncurses-6.5-20241130+/ncurses/base/lib_getch.c	2024-08-31 15:54:49.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_getch.c	2024-12-07 17:40:33.000000000 +0000
+@@ -44,7 +44,7 @@
+ #define NEED_KEY_EVENT
+ #include 
+ 
+-MODULE_ID("$Id: lib_getch.c,v 1.147 2024/08/31 15:54:49 tom Exp $")
++MODULE_ID("$Id: lib_getch.c,v 1.148 2024/12/07 17:40:33 tom Exp $")
+ 
+ #include 
+ 
+@@ -414,7 +414,7 @@
+     SCREEN *sp = _nc_screen_of(win);
+     int rc;
+ 
+-    if (sp != 0) {
++    if (sp != NULL) {
+ #ifdef USE_PTHREADS
+ 	if (_nc_use_pthreads && sp != CURRENT_SCREEN) {
+ 	    SCREEN *save_SP;
+@@ -457,7 +457,7 @@
+     *result = 0;
+ 
+     sp = _nc_screen_of(win);
+-    if (win == 0 || sp == 0) {
++    if (win == NULL || sp == NULL) {
+ 	returnCode(ERR);
+     }
+ 
+Index: ncurses/base/lib_initscr.c
+Prereq:  1.48 
+--- ncurses-6.5-20241130+/ncurses/base/lib_initscr.c	2020-09-07 14:26:48.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_initscr.c	2024-12-07 20:00:48.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019,2020 Thomas E. Dickey                                     *
++ * Copyright 2019-2020,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -46,7 +46,7 @@
+ #include 		/* needed for ISC */
+ #endif
+ 
+-MODULE_ID("$Id: lib_initscr.c,v 1.48 2020/09/07 14:26:48 tom Exp $")
++MODULE_ID("$Id: lib_initscr.c,v 1.49 2024/12/07 20:00:48 tom Exp $")
+ 
+ NCURSES_EXPORT(WINDOW *)
+ initscr(void)
+@@ -90,7 +90,7 @@
+ 	    }
+ 	}
+ #endif
+-	if (newterm(name, stdout, stdin) == 0) {
++	if (newterm(name, stdout, stdin) == NULL) {
+ 	    fprintf(stderr, "Error opening terminal: %s.\n", name);
+ 	    ExitProgram(EXIT_FAILURE);
+ 	}
+Index: ncurses/base/lib_insch.c
+Prereq:  1.38 
+--- ncurses-6.5-20241130+/ncurses/base/lib_insch.c	2024-07-27 19:23:21.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_insch.c	2024-12-07 17:40:33.000000000 +0000
+@@ -44,7 +44,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: lib_insch.c,v 1.38 2024/07/27 19:23:21 tom Exp $")
++MODULE_ID("$Id: lib_insch.c,v 1.39 2024/12/07 17:40:33 tom Exp $")
+ 
+ /*
+  * Insert the given character, updating the current location to simplify
+@@ -85,7 +85,7 @@
+ #endif
+ 	       (isprint(ch8) ||
+ 		(ChAttrOf(ch) & A_ALTCHARSET) ||
+-		(sp != 0 && sp->_legacy_coding && !iscntrl(ch8)))) {
++		(sp != NULL && sp->_legacy_coding && !iscntrl(ch8)))) {
+ 	    if (win->_curx <= win->_maxx) {
+ 		struct ldat *line = &(win->_line[win->_cury]);
+ 		NCURSES_CH_T *end = &(line->text[win->_curx]);
+@@ -151,7 +151,7 @@
+ 
+     T((T_CALLED("winsch(%p, %s)"), (void *) win, _tracechtype(c)));
+ 
+-    if (win != 0) {
++    if (win != NULL) {
+ 	NCURSES_SIZE_T oy = win->_cury;
+ 	NCURSES_SIZE_T ox = win->_curx;
+ 
+Index: ncurses/base/lib_insnstr.c
+Prereq:  1.10 
+--- ncurses-6.5-20241130+/ncurses/base/lib_insnstr.c	2023-11-21 21:58:03.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_insnstr.c	2024-12-07 20:00:48.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2004-2009,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -41,7 +41,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: lib_insnstr.c,v 1.10 2023/11/21 21:58:03 tom Exp $")
++MODULE_ID("$Id: lib_insnstr.c,v 1.11 2024/12/07 20:00:48 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ winsnstr(WINDOW *win, const char *s, int n)
+@@ -51,7 +51,7 @@
+ 
+     T((T_CALLED("winsnstr(%p,%s,%d)"), (void *) win, _nc_visbufn(s, n), n));
+ 
+-    if (win != 0 && str != 0 && n != 0) {
++    if (win != NULL && str != NULL && n != 0) {
+ 	SCREEN *sp = _nc_screen_of(win);
+ #if USE_WIDEC_SUPPORT
+ 	/*
+@@ -64,7 +64,7 @@
+ 	if (sp->_screen_unicode) {
+ 	    size_t nn = (n > 0) ? (size_t) n : strlen(s);
+ 	    wchar_t *buffer = typeMalloc(wchar_t, nn + 1);
+-	    if (buffer != 0) {
++	    if (buffer != NULL) {
+ 		mbstate_t state;
+ 		size_t n3;
+ 		init_mb(state);
+Index: ncurses/base/lib_instr.c
+Prereq:  1.27 
+--- ncurses-6.5-20241130+/ncurses/base/lib_instr.c	2024-07-27 19:22:23.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_instr.c	2024-12-07 17:53:39.000000000 +0000
+@@ -42,7 +42,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_instr.c,v 1.27 2024/07/27 19:22:23 tom Exp $")
++MODULE_ID("$Id: lib_instr.c,v 1.28 2024/12/07 17:53:39 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ winnstr(WINDOW *win, char *str, int n)
+@@ -72,17 +72,17 @@
+ 		wchar_t *wch;
+ 		int n2;
+ 
+-		n2 = getcchar(cell, 0, 0, 0, 0);
++		n2 = getcchar(cell, NULL, NULL, NULL, NULL);
+ 		if (n2 > 0
+-		    && (wch = typeCalloc(wchar_t, (unsigned) n2 + 1)) != 0) {
++		    && (wch = typeCalloc(wchar_t, (unsigned) n2 + 1)) != NULL) {
+ 		    bool done = FALSE;
+ 
+-		    if (getcchar(cell, wch, &attrs, &pair, 0) == OK) {
++		    if (getcchar(cell, wch, &attrs, &pair, NULL) == OK) {
+ 			mbstate_t state;
+ 			size_t n3;
+ 
+ 			init_mb(state);
+-			n3 = wcstombs(0, wch, (size_t) 0);
++			n3 = wcstombs(NULL, wch, (size_t) 0);
+ 			if (!isEILSEQ(n3) && (n3 != 0) && (n3 <= MB_LEN_MAX)) {
+ 			    size_t need = n3 + 10 + (size_t) i;
+ 			    int have = (int) n3 + i;
+@@ -90,7 +90,7 @@
+ 			    /* check for loop-done as well as overflow */
+ 			    if (have > n || (int) need <= 0) {
+ 				done = TRUE;
+-			    } else if ((tmp = typeCalloc(char, need)) == 0) {
++			    } else if ((tmp = typeCalloc(char, need)) == NULL) {
+ 				done = TRUE;
+ 			    } else {
+ 				size_t i3;
+Index: ncurses/base/lib_mouse.c
+Prereq:  1.202 
+--- ncurses-6.5-20241130+/ncurses/base/lib_mouse.c	2024-11-23 19:06:20.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_mouse.c	2024-12-07 17:40:33.000000000 +0000
+@@ -85,7 +85,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_mouse.c,v 1.202 2024/11/23 19:06:20 tom Exp $")
++MODULE_ID("$Id: lib_mouse.c,v 1.203 2024/12/07 17:40:33 tom Exp $")
+ 
+ #include 
+ 
+@@ -391,7 +391,7 @@
+     sp->_mouse_xtermcap = tigetstr("XM");
+     if (VALID_STRING(sp->_mouse_xtermcap)) {
+ 	char *code = strstr(sp->_mouse_xtermcap, "[?");
+-	if (code != 0) {
++	if (code != NULL) {
+ 	    code += 2;
+ 	    while ((*code >= '0') && (*code <= '9')) {
+ 		char *next = code;
+@@ -761,7 +761,7 @@
+     /* we know how to recognize mouse events under "xterm" */
+     if (NonEmpty(key_mouse)) {
+ 	init_xterm_mouse(sp);
+-    } else if (strstr(SP_TERMTYPE term_names, "xterm") != 0) {
++    } else if (strstr(SP_TERMTYPE term_names, "xterm") != NULL) {
+ 	if (_nc_add_to_try(&(sp->_keytry), xterm_kmous, KEY_MOUSE) == OK)
+ 	    init_xterm_mouse(sp);
+     }
+@@ -778,7 +778,7 @@
+ 
+     T((T_CALLED("_nc_mouse_init(%p)"), (void *) sp));
+ 
+-    if (sp != 0) {
++    if (sp != NULL) {
+ 	if (!sp->_mouse_initialized) {
+ 	    int i;
+ 
+@@ -1834,10 +1834,10 @@
+ 
+     T((T_CALLED("getmouse(%p,%p)"), (void *) SP_PARM, (void *) aevent));
+ 
+-    if ((aevent != 0) &&
+-	(SP_PARM != 0) &&
++    if ((aevent != NULL) &&
++	(SP_PARM != NULL) &&
+ 	(SP_PARM->_mouse_type != M_NONE) &&
+-	(eventp = SP_PARM->_mouse_eventp) != 0) {
++	(eventp = SP_PARM->_mouse_eventp) != NULL) {
+ 	/* compute the current-event pointer */
+ 	MEVENT *prev = PREV(eventp);
+ 
+@@ -1890,9 +1890,9 @@
+ 
+     T((T_CALLED("ungetmouse(%p,%p)"), (void *) SP_PARM, (void *) aevent));
+ 
+-    if (aevent != 0 &&
+-	SP_PARM != 0 &&
+-	(eventp = SP_PARM->_mouse_eventp) != 0) {
++    if (aevent != NULL &&
++	SP_PARM != NULL &&
++	(eventp = SP_PARM->_mouse_eventp) != NULL) {
+ 
+ 	/* stick the given event in the next-free slot */
+ 	*eventp = *aevent;
+@@ -1926,7 +1926,7 @@
+        (unsigned long) newmask,
+        (void *) oldmask));
+ 
+-    if (SP_PARM != 0) {
++    if (SP_PARM != NULL) {
+ 	if (oldmask)
+ 	    *oldmask = SP_PARM->_mouse_mask;
+ 
+@@ -1988,7 +1988,7 @@
+ 
+     T((T_CALLED("wenclose(%p,%d,%d)"), (const void *) win, y, x));
+ 
+-    if (win != 0) {
++    if (win != NULL) {
+ 	y -= win->_yoffset;
+ 	if (IS_PAD(win)) {
+ 	    if (win->_pad._pad_y >= 0 &&
+@@ -2020,7 +2020,7 @@
+ 
+     T((T_CALLED("mouseinterval(%p,%d)"), (void *) SP_PARM, maxclick));
+ 
+-    if (SP_PARM != 0) {
++    if (SP_PARM != NULL) {
+ 	oldval = SP_PARM->_maxclick;
+ 	if (maxclick >= 0)
+ 	    SP_PARM->_maxclick = maxclick;
+@@ -2044,7 +2044,7 @@
+ NCURSES_EXPORT(bool)
+ _nc_has_mouse(const SCREEN *sp)
+ {
+-    return (((0 == sp) || (sp->_mouse_type == M_NONE)) ? FALSE : TRUE);
++    return (((NULL == sp) || (sp->_mouse_type == M_NONE)) ? FALSE : TRUE);
+ }
+ 
+ NCURSES_EXPORT(bool)
+Index: ncurses/base/lib_newterm.c
+Prereq:  1.106 
+--- ncurses-6.5-20241130+/ncurses/base/lib_newterm.c	2024-11-23 18:33:35.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_newterm.c	2024-12-07 17:41:36.000000000 +0000
+@@ -49,7 +49,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_newterm.c,v 1.106 2024/11/23 18:33:35 tom Exp $")
++MODULE_ID("$Id: lib_newterm.c,v 1.107 2024/12/07 17:41:36 tom Exp $")
+ 
+ #ifdef USE_TERM_DRIVER
+ #define NumLabels      InfoOf(SP_PARM).numlabels
+@@ -175,12 +175,12 @@
+ 			  FILE *ifp)
+ {
+     int errret;
+-    SCREEN *result = 0;
++    SCREEN *result = NULL;
+     SCREEN *current;
+     TERMINAL *its_term;
+     FILE *_ofp = ofp ? ofp : stdout;
+     FILE *_ifp = ifp ? ifp : stdin;
+-    TERMINAL *new_term = 0;
++    TERMINAL *new_term = NULL;
+ 
+     START_TRACE();
+     T((T_CALLED("newterm(%p, \"%s\", %p,%p)"),
+@@ -191,7 +191,7 @@
+ 
+ #if NCURSES_SP_FUNCS
+     assert(SP_PARM != 0);
+-    if (SP_PARM == 0)
++    if (SP_PARM == NULL)
+ 	returnSP(SP_PARM);
+ #endif
+ 
+@@ -199,7 +199,7 @@
+     _nc_lock_global(curses);
+ 
+     current = CURRENT_SCREEN;
+-    its_term = (current ? current->_term : 0);
++    its_term = (current ? current->_term : NULL);
+ 
+ #if defined(EXP_WIN32_DRIVER)
+     _setmode(fileno(_ifp), _O_BINARY);
+@@ -214,7 +214,7 @@
+ 	int slk_format;
+ 	bool filter_mode;
+ 
+-	_nc_set_screen(0);
++	_nc_set_screen(NULL);
+ #ifdef USE_TERM_DRIVER
+ 	assert(new_term != 0);
+ #endif
+@@ -241,7 +241,7 @@
+ 						 filter_mode,
+ 						 slk_format) == ERR) {
+ 	    _nc_set_screen(current);
+-	    result = 0;
++	    result = NULL;
+ 	} else {
+ 	    int value;
+ 	    int cols;
+@@ -318,7 +318,7 @@
+ 
+ 	    NCURSES_SP_NAME(baudrate) (NCURSES_SP_ARG);		/* sets a field in the screen structure */
+ 
+-	    SP_PARM->_keytry = 0;
++	    SP_PARM->_keytry = NULL;
+ 
+ 	    /* compute movement costs so we can do better move optimization */
+ #ifdef USE_TERM_DRIVER
+@@ -333,7 +333,7 @@
+ 	     * properly if we remove rmso or rmul.  Curses applications
+ 	     * shouldn't be looking at this detail.
+ 	     */
+-#define SGR0_TEST(mode) (mode != 0) && (exit_attribute_mode == 0 || strcmp(mode, exit_attribute_mode))
++#define SGR0_TEST(mode) (mode != NULL) && (exit_attribute_mode == NULL || strcmp(mode, exit_attribute_mode))
+ 	    SP_PARM->_use_rmso = SGR0_TEST(exit_standout_mode);
+ 	    SP_PARM->_use_rmul = SGR0_TEST(exit_underline_mode);
+ #if USE_ITALIC
+Index: ncurses/base/lib_newwin.c
+Prereq:  1.77 
+--- ncurses-6.5-20241130+/ncurses/base/lib_newwin.c	2024-09-28 15:55:56.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_newwin.c	2024-12-07 20:19:18.000000000 +0000
+@@ -44,7 +44,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: lib_newwin.c,v 1.77 2024/09/28 15:55:56 tom Exp $")
++MODULE_ID("$Id: lib_newwin.c,v 1.78 2024/12/07 20:19:18 tom Exp $")
+ 
+ #define window_is(name) ((sp)->_##name == win)
+ 
+@@ -53,9 +53,9 @@
+ 		sp->_##name = 0
+ #else
+ #define remove_window(name) \
+-		sp->_##name = 0; \
++		sp->_##name = NULL; \
+ 		if (win == name) \
+-		    name = 0
++		    name = NULL
+ #endif
+ 
+ static void
+@@ -64,7 +64,7 @@
+     SCREEN *sp;
+ 
+ #ifdef USE_SP_WINDOWLIST
+-    if ((sp = _nc_screen_of(win)) != 0) {
++    if ((sp = _nc_screen_of(win)) != NULL) {
+ 	if (window_is(curscr)) {
+ 	    remove_window(curscr);
+ 	} else if (window_is(stdscr)) {
+@@ -99,17 +99,17 @@
+ 
+     T((T_CALLED("_nc_freewin(%p)"), (void *) win));
+ 
+-    if (win != 0) {
++    if (win != NULL) {
+ 
+ 	if (_nc_nonsp_try_global(curses) == 0) {
+ 	    WINDOWLIST *p, *q;
+ 
+-	    q = 0;
++	    q = NULL;
+ 	    for (each_window(sp, p)) {
+ 
+ 		if (&(p->win) == win) {
+ 		    remove_window_from_screen(win);
+-		    if (q == 0)
++		    if (q == NULL)
+ 			WindowList(sp) = p->next;
+ 		    else
+ 			q->next = p->next;
+@@ -150,8 +150,8 @@
+ 	|| begx < 0
+ 	|| num_lines < 0
+ 	|| num_columns < 0
+-	|| SP_PARM == 0)
+-	returnWin(0);
++	|| SP_PARM == NULL)
++	returnWin(NULL);
+ 
+     if (num_lines == 0)
+ 	num_lines = SP_PARM->_lines_avail - begy;
+@@ -160,14 +160,14 @@
+ 
+     win = NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_ARGx
+ 					num_lines, num_columns, begy, begx, 0);
+-    if (win == 0)
+-	returnWin(0);
++    if (win == NULL)
++	returnWin(NULL);
+ 
+     for (i = 0; i < num_lines; i++) {
+ 	win->_line[i].text = typeCalloc(NCURSES_CH_T, (unsigned) num_columns);
+-	if (win->_line[i].text == 0) {
++	if (win->_line[i].text == NULL) {
+ 	    (void) _nc_freewin(win);
+-	    returnWin(0);
++	    returnWin(NULL);
+ 	}
+ 	for (ptr = win->_line[i].text;
+ 	     ptr < win->_line[i].text + num_columns;
+@@ -207,11 +207,14 @@
+     /*
+      * make sure window fits inside the original one
+      */
+-    if (begy < 0 || begx < 0 || orig == 0 || num_lines < 0 || num_columns < 0)
+-	returnWin(0);
+-    if (begy + num_lines > orig->_maxy + 1
++    if (begy < 0
++	|| begx < 0
++	|| orig == NULL
++	|| num_lines < 0
++	|| num_columns < 0
++	|| begy + num_lines > orig->_maxy + 1
+ 	|| begx + num_columns > orig->_maxx + 1)
+-	returnWin(0);
++	returnWin(NULL);
+ 
+     if (num_lines == 0)
+ 	num_lines = orig->_maxy + 1 - begy;
+@@ -225,8 +228,8 @@
+     win = NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_ARGx num_lines, num_columns,
+ 					orig->_begy + begy,
+ 					orig->_begx + begx, flags);
+-    if (win == 0)
+-	returnWin(0);
++    if (win == NULL)
++	returnWin(NULL);
+ 
+     win->_pary = begy;
+     win->_parx = begx;
+@@ -244,10 +247,10 @@
+ NCURSES_EXPORT(WINDOW *)
+ subwin(WINDOW *w, int l, int c, int y, int x)
+ {
+-    WINDOW *result = 0;
++    WINDOW *result = NULL;
+ 
+     T((T_CALLED("subwin(%p, %d, %d, %d, %d)"), (void *) w, l, c, y, x));
+-    if (w != 0) {
++    if (w != NULL) {
+ 	T(("parent has begy = %ld, begx = %ld", (long) w->_begy, (long) w->_begx));
+ 
+ 	result = derwin(w, l, c, y - w->_begy, x - w->_begx);
+@@ -271,20 +274,20 @@
+     T((T_CALLED("_nc_makenew(%p,%d,%d,%d,%d)"),
+        (void *) SP_PARM, num_lines, num_columns, begy, begx));
+ 
+-    if (SP_PARM == 0)
+-	returnWin(0);
++    if (SP_PARM == NULL)
++	returnWin(NULL);
+ 
+     if (!OK_DIMENSION(num_lines) || !OK_DIMENSION(num_columns))
+-	returnWin(0);
++	returnWin(NULL);
+ 
+-    if ((wp = typeCalloc(WINDOWLIST, 1)) == 0)
+-	returnWin(0);
++    if ((wp = typeCalloc(WINDOWLIST, 1)) == NULL)
++	returnWin(NULL);
+ 
+     win = &(wp->win);
+ 
+-    if ((win->_line = typeCalloc(struct ldat, ((unsigned) num_lines))) == 0) {
++    if ((win->_line = typeCalloc(struct ldat, ((unsigned) num_lines))) == NULL) {
+ 	free(wp);
+-	returnWin(0);
++	returnWin(NULL);
+     }
+ 
+     _nc_nonsp_lock_global(curses);
+@@ -315,7 +318,7 @@
+     win->_sync = 0;
+     win->_parx = -1;
+     win->_pary = -1;
+-    win->_parent = 0;
++    win->_parent = NULL;
+ 
+     win->_regtop = 0;
+     win->_regbottom = (NCURSES_SIZE_T) (num_lines - 1);
+@@ -382,18 +385,18 @@
+ NCURSES_EXPORT(WINDOW *)
+ _nc_curscr_of(SCREEN *sp)
+ {
+-    return (sp == 0) ? NULL : CurScreen(sp);
++    return (sp == NULL) ? NULL : CurScreen(sp);
+ }
+ 
+ NCURSES_EXPORT(WINDOW *)
+ _nc_newscr_of(SCREEN *sp)
+ {
+-    return (sp == 0) ? NULL : NewScreen(sp);
++    return (sp == NULL) ? NULL : NewScreen(sp);
+ }
+ 
+ NCURSES_EXPORT(WINDOW *)
+ _nc_stdscr_of(SCREEN *sp)
+ {
+-    return (sp == 0) ? NULL : StdScreen(sp);
++    return (sp == NULL) ? NULL : StdScreen(sp);
+ }
+ #endif
+Index: ncurses/base/lib_nl.c
+Prereq:  1.14 
+--- ncurses-6.5-20241130+/ncurses/base/lib_nl.c	2023-04-29 18:51:49.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_nl.c	2024-12-07 20:00:48.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2023 Thomas E. Dickey                                     *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2000,2009 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -45,7 +45,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_nl.c,v 1.14 2023/04/29 18:51:49 tom Exp $")
++MODULE_ID("$Id: lib_nl.c,v 1.15 2024/12/07 20:00:48 tom Exp $")
+ 
+ #ifdef __EMX__
+ #include 
+@@ -55,7 +55,7 @@
+ NCURSES_SP_NAME(nl) (NCURSES_SP_DCL0)
+ {
+     T((T_CALLED("nl(%p)"), (void *) SP_PARM));
+-    if (0 == SP_PARM)
++    if (NULL == SP_PARM)
+ 	returnCode(ERR);
+     IsNl(SP_PARM) = TRUE;
+ #ifdef __EMX__
+@@ -77,7 +77,7 @@
+ NCURSES_SP_NAME(nonl) (NCURSES_SP_DCL0)
+ {
+     T((T_CALLED("nonl(%p)"), (void *) SP_PARM));
+-    if (0 == SP_PARM)
++    if (NULL == SP_PARM)
+ 	returnCode(ERR);
+     IsNl(SP_PARM) = FALSE;
+ #ifdef __EMX__
+Index: ncurses/base/lib_overlay.c
+Prereq:  1.34 
+--- ncurses-6.5-20241130+/ncurses/base/lib_overlay.c	2023-09-16 16:39:07.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_overlay.c	2024-12-07 20:03:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2023 Thomas E. Dickey                                     *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2013,2016 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_overlay.c,v 1.34 2023/09/16 16:39:07 tom Exp $")
++MODULE_ID("$Id: lib_overlay.c,v 1.35 2024/12/07 20:03:37 tom Exp $")
+ 
+ static int
+ overlap(const WINDOW *const src, WINDOW *const dst, int const flag)
+@@ -50,7 +50,7 @@
+ 
+     T((T_CALLED("overlap(%p,%p,%d)"), (const void *) src, (void *) dst, flag));
+ 
+-    if (src != 0 && dst != 0) {
++    if (src != NULL && dst != NULL) {
+ 	int sx1, sy1, sx2, sy2;
+ 	int dx1, dy1, dx2, dy2;
+ 
+@@ -146,8 +146,8 @@
+        dminrow, dmincol,
+        dmaxrow, dmaxcol, over));
+ 
+-    if (src != 0
+-	&& dst != 0
++    if (src != NULL
++	&& dst != NULL
+ 	&& dmaxrow >= dminrow
+ 	&& dmaxcol >= dmincol) {
+ 	attr_t bk;
+Index: ncurses/base/lib_pad.c
+Prereq:  1.51 
+--- ncurses-6.5-20241130+/ncurses/base/lib_pad.c	2024-09-28 15:40:42.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_pad.c	2024-12-07 17:44:59.000000000 +0000
+@@ -43,7 +43,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_pad.c,v 1.51 2024/09/28 15:40:42 tom Exp $")
++MODULE_ID("$Id: lib_pad.c,v 1.52 2024/12/07 17:44:59 tom Exp $")
+ 
+ NCURSES_EXPORT(WINDOW *)
+ NCURSES_SP_NAME(newpad) (NCURSES_SP_DCLx int l, int c)
+@@ -55,17 +55,17 @@
+     T((T_CALLED("newpad(%p,%d, %d)"), (void *) SP_PARM, l, c));
+ 
+     if (l <= 0 || c <= 0)
+-	returnWin(0);
++	returnWin(NULL);
+ 
+     win = NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_ARGx l, c, 0, 0, _ISPAD);
+     if (win == NULL)
+-	returnWin(0);
++	returnWin(NULL);
+ 
+     for (i = 0; i < l; i++) {
+ 	if_USE_SCROLL_HINTS(win->_line[i].oldindex = _NEWINDEX);
+-	if ((win->_line[i].text = typeCalloc(NCURSES_CH_T, ((size_t) c))) == 0) {
++	if ((win->_line[i].text = typeCalloc(NCURSES_CH_T, ((size_t) c))) == NULL) {
+ 	    (void) _nc_freewin(win);
+-	    returnWin(0);
++	    returnWin(NULL);
+ 	}
+ 	for (ptr = win->_line[i].text; ptr < win->_line[i].text + c; ptr++)
+ 	    SetChar(*ptr, BLANK_TEXT, BLANK_ATTR);
+@@ -92,7 +92,7 @@
+     if (orig) {
+ 	if (!IS_PAD(orig)
+ 	    || ((win = derwin(orig, l, c, begy, begx)) == NULL))
+-	    returnWin(0);
++	    returnWin(NULL);
+     }
+     returnWin(win);
+ }
+@@ -143,7 +143,7 @@
+     T((T_CALLED("pnoutrefresh(%p, %d, %d, %d, %d, %d, %d)"),
+        (void *) win, pminrow, pmincol, sminrow, smincol, smaxrow, smaxcol));
+ 
+-    if (win == 0)
++    if (win == NULL)
+ 	returnCode(ERR);
+ 
+     if (!IS_PAD(win))
+@@ -331,7 +331,7 @@
+ {
+     T((T_CALLED("pechochar(%p, %s)"), (void *) pad, _tracechtype(ch)));
+ 
+-    if (pad == 0)
++    if (pad == NULL)
+ 	returnCode(ERR);
+ 
+     if (!IS_PAD(pad))
+Index: ncurses/base/lib_printw.c
+Prereq:  1.29 
+--- ncurses-6.5-20241130+/ncurses/base/lib_printw.c	2024-07-27 19:22:23.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_printw.c	2024-12-07 17:44:59.000000000 +0000
+@@ -40,7 +40,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_printw.c,v 1.29 2024/07/27 19:22:23 tom Exp $")
++MODULE_ID("$Id: lib_printw.c,v 1.30 2024/12/07 17:44:59 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ printw(const char *fmt, ...)
+@@ -142,7 +142,7 @@
+     T((T_CALLED("vwprintw(%p,%s,va_list)"), (void *) win, _nc_visbuf(fmt)));
+ 
+     buf = NCURSES_SP_NAME(_nc_printf_string) (NCURSES_SP_ARGx fmt, argp);
+-    if (buf != 0) {
++    if (buf != NULL) {
+ 	code = waddstr(win, buf);
+     }
+     returnCode(code);
+@@ -160,7 +160,7 @@
+     T((T_CALLED("vw_printw(%p,%s,va_list)"), (void *) win, _nc_visbuf(fmt)));
+ 
+     buf = NCURSES_SP_NAME(_nc_printf_string) (NCURSES_SP_ARGx fmt, argp);
+-    if (buf != 0) {
++    if (buf != NULL) {
+ 	code = waddstr(win, buf);
+     }
+     returnCode(code);
+Index: ncurses/base/lib_redrawln.c
+Prereq:  1.18 
+--- ncurses-6.5-20241130+/ncurses/base/lib_redrawln.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_redrawln.c	2024-12-07 20:03:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2009,2010 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_redrawln.c,v 1.18 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_redrawln.c,v 1.19 2024/12/07 20:03:37 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ wredrawln(WINDOW *win, int beg, int num)
+@@ -52,7 +52,7 @@
+ 
+     T((T_CALLED("wredrawln(%p,%d,%d)"), (void *) win, beg, num));
+ 
+-    if (win == 0)
++    if (win == NULL)
+ 	returnCode(ERR);
+ 
+     sp = _nc_screen_of(win);
+Index: ncurses/base/lib_restart.c
+Prereq:  1.18 
+--- ncurses-6.5-20241130+/ncurses/base/lib_restart.c	2023-04-29 19:01:25.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_restart.c	2024-12-07 20:03:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2023 Thomas E. Dickey                                     *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2015 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -42,7 +42,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_restart.c,v 1.18 2023/04/29 19:01:25 tom Exp $")
++MODULE_ID("$Id: lib_restart.c,v 1.19 2024/12/07 20:03:37 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ NCURSES_SP_NAME(restartterm) (NCURSES_SP_DCLx
+@@ -64,7 +64,7 @@
+ 
+     if (TINFO_SETUP_TERM(&new_term, termp, filenum, errret, FALSE) != OK) {
+ 	result = ERR;
+-    } else if (SP_PARM != 0) {
++    } else if (SP_PARM != NULL) {
+ 	TTY_FLAGS save_flags = SP_PARM->_tty_flags;
+ 
+ #ifdef USE_TERM_DRIVER
+Index: ncurses/base/lib_screen.c
+Prereq:  1.109 
+--- ncurses-6.5-20241130+/ncurses/base/lib_screen.c	2024-10-05 20:47:44.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_screen.c	2024-12-07 17:46:49.000000000 +0000
+@@ -42,7 +42,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_screen.c,v 1.109 2024/10/05 20:47:44 tom Exp $")
++MODULE_ID("$Id: lib_screen.c,v 1.110 2024/12/07 17:46:49 tom Exp $")
+ 
+ #define MAX_SIZE 0x3fff		/* 16k is big enough for a window or pad */
+ 
+@@ -172,7 +172,7 @@
+     char *result = malloc(limit);
+     char *buffer;
+ 
+-    if (result != 0) {
++    if (result != NULL) {
+ 	int ch = 0;
+ 	size_t used = 0;
+ 
+@@ -182,9 +182,9 @@
+ 	    if (used + 2 >= limit) {
+ 		limit += 1024;
+ 		buffer = realloc(result, limit);
+-		if (buffer == 0) {
++		if (buffer == NULL) {
+ 		    free(result);
+-		    result = 0;
++		    result = NULL;
+ 		    break;
+ 		}
+ 		result = buffer;
+@@ -201,7 +201,7 @@
+ 	    TR(TRACE_IEVENT, ("READ:%s", result));
+ 	} else if (used == 0) {
+ 	    free(result);
+-	    result = 0;
++	    result = NULL;
+ 	}
+     }
+     return result;
+@@ -306,7 +306,7 @@
+ 	    *target = 0;
+ 	    while (limit-- > 0) {
+ 		const char *find = strchr(digits, *source++);
+-		int ch = (find != 0) ? (int) (find - digits) : -1;
++		int ch = (find != NULL) ? (int) (find - digits) : -1;
+ 		*target *= base;
+ 		if (ch >= 0 && ch < base) {
+ 		    *target += ch;
+@@ -387,14 +387,14 @@
+ 	char *value;
+ 	char *txt = read_txt(fp);
+ 
+-	if (txt == 0)
++	if (txt == NULL)
+ 	    break;
+ 	if (!strcmp(txt, "rows:")) {
+ 	    free(txt);
+ 	    code = OK;
+ 	    break;
+ 	}
+-	if ((value = strchr(txt, '=')) == 0) {
++	if ((value = strchr(txt, '=')) == NULL) {
+ 	    free(txt);
+ 	    continue;
+ 	}
+@@ -506,8 +506,8 @@
+ 
+     T((T_CALLED("getwin(%p)"), (void *) filep));
+ 
+-    if (filep == 0) {
+-	returnWin(0);
++    if (filep == NULL) {
++	returnWin(NULL);
+     }
+ 
+     /*
+@@ -515,7 +515,7 @@
+      * screen-dump, or new-format.
+      */
+     if (read_block(&tmp, (size_t) 4, filep) < 0) {
+-	returnWin(0);
++	returnWin(NULL);
+     }
+     /*
+      * If this is a new-format file, and we do not support it, give up.
+@@ -524,9 +524,9 @@
+ #if NCURSES_EXT_PUTWIN
+ 	if (read_win(&tmp, filep) < 0)
+ #endif
+-	    returnWin(0);
++	    returnWin(NULL);
+     } else if (read_block(((char *) &tmp) + 4, sizeof(WINDOW) - 4, filep) < 0) {
+-	returnWin(0);
++	returnWin(NULL);
+     } else {
+ 	old_format = TRUE;
+     }
+@@ -538,7 +538,7 @@
+ 	tmp._maxy > MAX_SIZE ||
+ 	tmp._maxx == 0 ||
+ 	tmp._maxx > MAX_SIZE) {
+-	returnWin(0);
++	returnWin(NULL);
+     }
+ 
+     if (IS_PAD(&tmp)) {
+@@ -556,7 +556,7 @@
+      * fields, because the window hierarchy within which they
+      * made sense is probably gone.
+      */
+-    if (nwin != 0) {
++    if (nwin != NULL) {
+ 	int n;
+ 	size_t linesize = sizeof(NCURSES_CH_T) * (size_t) (tmp._maxx + 1);
+ 
+@@ -594,13 +594,13 @@
+ 	    for (n = 0; n <= nwin->_maxy; n++) {
+ 		if (read_block(nwin->_line[n].text, linesize, filep) < 0) {
+ 		    delwin(nwin);
+-		    returnWin(0);
++		    returnWin(NULL);
+ 		}
+ 	    }
+ 	}
+ #if NCURSES_EXT_PUTWIN
+ 	else {
+-	    char *txt = 0;
++	    char *txt = NULL;
+ 	    bool success = TRUE;
+ 	    NCURSES_CH_T prior = blank;
+ 
+@@ -609,7 +609,7 @@
+ 		long row;
+ 		char *next;
+ 
+-		if ((txt = read_txt(filep)) == 0) {
++		if ((txt = read_txt(filep)) == NULL) {
+ 		    T(("...failed to read string for row %d", n + 1));
+ 		    success = FALSE;
+ 		    break;
+@@ -628,13 +628,13 @@
+ 		    break;
+ 		}
+ 		free(txt);
+-		txt = 0;
++		txt = NULL;
+ 	    }
+ 
+ 	    if (!success) {
+ 		free(txt);
+ 		delwin(nwin);
+-		returnWin(0);
++		returnWin(NULL);
+ 	    }
+ 	}
+ #endif
+@@ -798,7 +798,7 @@
+     T((T_CALLED("putwin(%p,%p)"), (void *) win, (void *) filep));
+ 
+ #if NCURSES_EXT_PUTWIN
+-    if (win != 0) {
++    if (win != NULL) {
+ 	const char *version = curses_version();
+ 	char buffer[1024];
+ 	NCURSES_CH_T last_cell;
+@@ -966,14 +966,14 @@
+ NCURSES_EXPORT(int)
+ NCURSES_SP_NAME(scr_restore) (NCURSES_SP_DCLx const char *file)
+ {
+-    FILE *fp = 0;
++    FILE *fp = NULL;
+     int code = ERR;
+ 
+     T((T_CALLED("scr_restore(%p,%s)"), (void *) SP_PARM, _nc_visbuf(file)));
+ 
+     if (SP_PARM != NULL
+ 	&& _nc_access(file, R_OK) >= 0
+-	&& (fp = safe_fopen(file, BIN_R)) != 0) {
++	&& (fp = safe_fopen(file, BIN_R)) != NULL) {
+ 	WINDOW *my_newscr = replace_window(NewScreen(SP_PARM), fp);
+ 	(void) fclose(fp);
+ 	if (my_newscr != NULL) {
+@@ -1000,12 +1000,12 @@
+ scr_dump(const char *file)
+ {
+     int result;
+-    FILE *fp = 0;
++    FILE *fp = NULL;
+ 
+     T((T_CALLED("scr_dump(%s)"), _nc_visbuf(file)));
+ 
+     if (_nc_access(file, W_OK) < 0
+-	|| (fp = safe_fopen(file, BIN_W)) == 0) {
++	|| (fp = safe_fopen(file, BIN_W)) == NULL) {
+ 	result = ERR;
+     } else {
+ 	(void) putwin(newscr, fp);
+@@ -1029,10 +1029,10 @@
+ 	!(exit_ca_mode && non_rev_rmcup)
+ #endif
+ 	) {
+-	FILE *fp = 0;
++	FILE *fp = NULL;
+ 
+ 	if (_nc_access(file, R_OK) >= 0
+-	    && (fp = safe_fopen(file, BIN_R)) != 0) {
++	    && (fp = safe_fopen(file, BIN_R)) != NULL) {
+ 	    WINDOW *my_curscr = replace_window(CurScreen(SP_PARM), fp);
+ 	    (void) fclose(fp);
+ 	    if (my_curscr != NULL) {
+@@ -1070,7 +1070,7 @@
+ #if !USE_REENTRANT
+ 	newscr = NewScreen(SP_PARM);
+ #endif
+-	if (NewScreen(SP_PARM) != 0) {
++	if (NewScreen(SP_PARM) != NULL) {
+ 	    code = OK;
+ 	}
+     }
+Index: ncurses/base/lib_set_term.c
+Prereq:  1.189 
+--- ncurses-6.5-20241130+/ncurses/base/lib_set_term.c	2024-11-23 18:33:50.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_set_term.c	2024-12-07 17:58:16.000000000 +0000
+@@ -57,7 +57,7 @@
+ #undef CUR
+ #define CUR SP_TERMTYPE
+ 
+-MODULE_ID("$Id: lib_set_term.c,v 1.189 2024/11/23 18:33:50 tom Exp $")
++MODULE_ID("$Id: lib_set_term.c,v 1.190 2024/12/07 17:58:16 tom Exp $")
+ 
+ #ifdef USE_TERM_DRIVER
+ #define MaxColors      InfoOf(sp).maxcolors
+@@ -81,7 +81,7 @@
+     _nc_set_screen(screenp);
+     newSP = screenp;
+ 
+-    if (newSP != 0) {
++    if (newSP != NULL) {
+ 	TINFO_SET_CURTERM(newSP, newSP->_term);
+ #if !USE_REENTRANT
+ 	curscr = CurScreen(newSP);
+@@ -91,11 +91,11 @@
+ 	COLOR_PAIRS = newSP->_pair_count;
+ #endif
+     } else {
+-	TINFO_SET_CURTERM(oldSP, 0);
++	TINFO_SET_CURTERM(oldSP, NULL);
+ #if !USE_REENTRANT
+-	curscr = 0;
+-	newscr = 0;
+-	stdscr = 0;
++	curscr = NULL;
++	newscr = NULL;
++	stdscr = NULL;
+ 	COLORS = 0;
+ 	COLOR_PAIRS = 0;
+ #endif
+@@ -110,7 +110,7 @@
+ static void
+ _nc_free_keytry(TRIES * kt)
+ {
+-    if (kt != 0) {
++    if (kt != NULL) {
+ 	_nc_free_keytry(kt->child);
+ 	_nc_free_keytry(kt->sibling);
+ 	free(kt);
+@@ -120,7 +120,7 @@
+ static bool
+ delink_screen(SCREEN *sp)
+ {
+-    SCREEN *last = 0;
++    SCREEN *last = NULL;
+     SCREEN *temp;
+     bool result = FALSE;
+ 
+@@ -174,9 +174,9 @@
+ 	    }
+ 	}
+ 
+-	if (sp->_slk != 0) {
++	if (sp->_slk != NULL) {
+ 
+-	    if (sp->_slk->ent != 0) {
++	    if (sp->_slk->ent != NULL) {
+ 		int i;
+ 
+ 		for (i = 0; i < sp->_slk->labcnt; ++i) {
+@@ -186,14 +186,14 @@
+ 		free(sp->_slk->ent);
+ 	    }
+ 	    free(sp->_slk);
+-	    sp->_slk = 0;
++	    sp->_slk = NULL;
+ 	}
+ 
+ 	_nc_free_keytry(sp->_keytry);
+-	sp->_keytry = 0;
++	sp->_keytry = NULL;
+ 
+ 	_nc_free_keytry(sp->_key_ok);
+-	sp->_key_ok = 0;
++	sp->_key_ok = NULL;
+ 
+ 	FreeIfNeeded(sp->_current_attr);
+ 
+@@ -232,17 +232,17 @@
+ 	 */
+ 	if (is_current) {
+ #if !USE_REENTRANT
+-	    curscr = 0;
+-	    newscr = 0;
+-	    stdscr = 0;
++	    curscr = NULL;
++	    newscr = NULL;
++	    stdscr = NULL;
+ 	    COLORS = 0;
+ 	    COLOR_PAIRS = 0;
+ #endif
+-	    _nc_set_screen(0);
++	    _nc_set_screen(NULL);
+ #if USE_WIDEC_SUPPORT
+-	    if (SP == 0) {
++	    if (SP == NULL) {
+ 		FreeIfNeeded(_nc_wacs);
+-		_nc_wacs = 0;
++		_nc_wacs = NULL;
+ 	    }
+ #endif
+ 	} else {
+@@ -303,7 +303,7 @@
+ }
+ #endif
+ 
+-#define ReturnScreenError() do { _nc_set_screen(0); \
++#define ReturnScreenError() do { _nc_set_screen(NULL); \
+                             returnCode(ERR); } while (0)
+ 
+ /* OS-independent screen initializations */
+@@ -357,7 +357,7 @@
+     sp->_next_screen = _nc_screen_chain;
+     _nc_screen_chain = sp;
+ 
+-    if ((sp->_current_attr = typeCalloc(NCURSES_CH_T, 1)) == 0) {
++    if ((sp->_current_attr = typeCalloc(NCURSES_CH_T, 1)) == NULL) {
+ 	ReturnScreenError();
+     }
+ #else
+@@ -437,7 +437,7 @@
+ 	_setmode(fileno(output), _O_BINARY);
+ #endif
+     sp->out_limit = (size_t) ((2 + slines) * (6 + scolumns));
+-    if ((sp->out_buffer = malloc(sp->out_limit)) == 0)
++    if ((sp->out_buffer = malloc(sp->out_limit)) == NULL)
+ 	sp->out_limit = 0;
+     sp->out_inuse = 0;
+ 
+@@ -479,7 +479,7 @@
+      * Allow those assumed/default color assumptions to be overridden at
+      * runtime:
+      */
+-    if ((env = getenv("NCURSES_ASSUMED_COLORS")) != 0) {
++    if ((env = getenv("NCURSES_ASSUMED_COLORS")) != NULL) {
+ 	int fg, bg;
+ 	char sep1, sep2;
+ 	int count = sscanf(env, "%d%c%d%c", &fg, &sep1, &bg, &sep2);
+@@ -555,7 +555,7 @@
+      * in the environment, reset the support-flag.
+      */
+     if (magic_cookie_glitch >= 0) {
+-	if (getenv("NCURSES_NO_MAGIC_COOKIE") != 0) {
++	if (getenv("NCURSES_NO_MAGIC_COOKIE") != NULL) {
+ 	    support_cookies = FALSE;
+ 	}
+     }
+@@ -633,10 +633,10 @@
+     NCURSES_SP_NAME(_nc_init_acs) (NCURSES_SP_ARG);
+ #if USE_WIDEC_SUPPORT
+     sp->_screen_unicode = _nc_unicode_locale();
+-    if (_nc_wacs == 0) {
++    if (_nc_wacs == NULL) {
+ 	_nc_init_wacs();
+     }
+-    if (_nc_wacs == 0) {
++    if (_nc_wacs == NULL) {
+ 	ReturnScreenError();
+     }
+ 
+@@ -644,7 +644,7 @@
+ 			   && _nc_locale_breaks_acs(sp->_term));
+ #endif
+     env = _nc_get_locale();
+-    sp->_legacy_coding = ((env == 0)
++    sp->_legacy_coding = ((env == NULL)
+ 			  || !strcmp(env, "C")
+ 			  || !strcmp(env, "POSIX"));
+     T(("legacy-coding %d", sp->_legacy_coding));
+@@ -652,19 +652,19 @@
+     sp->_nc_sp_idcok = TRUE;
+     sp->_nc_sp_idlok = FALSE;
+ 
+-    sp->oldhash = 0;
+-    sp->newhash = 0;
++    sp->oldhash = NULL;
++    sp->newhash = NULL;
+ 
+     T(("creating newscr"));
+     NewScreen(sp) = NCURSES_SP_NAME(newwin) (NCURSES_SP_ARGx slines, scolumns,
+ 					     0, 0);
+-    if (NewScreen(sp) == 0) {
++    if (NewScreen(sp) == NULL) {
+ 	ReturnScreenError();
+     }
+     T(("creating curscr"));
+     CurScreen(sp) = NCURSES_SP_NAME(newwin) (NCURSES_SP_ARGx slines, scolumns,
+ 					     0, 0);
+-    if (CurScreen(sp) == 0) {
++    if (CurScreen(sp) == NULL) {
+ 	ReturnScreenError();
+     }
+ #if !USE_REENTRANT
+@@ -684,7 +684,7 @@
+      * unless we use the term-driver.
+      */
+ #ifndef USE_TERM_DRIVER
+-    if (cur_term != 0 &&
++    if (cur_term != NULL &&
+ 	!memcmp(&cur_term->Ottyb, &null_TTY, sizeof(TTY)))
+ #endif
+     {
+@@ -750,7 +750,7 @@
+     assert((sp->_lines_avail + sp->_topstolen + bottom_stolen) == slines);
+     if ((StdScreen(sp) = NCURSES_SP_NAME(newwin) (NCURSES_SP_ARGx
+ 						  sp->_lines_avail,
+-						  scolumns, 0, 0)) == 0) {
++						  scolumns, 0, 0)) == NULL) {
+ 	ReturnScreenError();
+     }
+     SET_LINES(sp->_lines_avail);
+@@ -769,7 +769,7 @@
+ 		bool filtered,
+ 		int slk_format)
+ {
+-    SCREEN *sp = 0;
++    SCREEN *sp = NULL;
+     int rc = NCURSES_SP_NAME(_nc_setupscreen) (&sp,
+ 					       slines,
+ 					       scolumns,
+@@ -777,7 +777,7 @@
+ 					       filtered,
+ 					       slk_format);
+     if (rc != OK)
+-	_nc_set_screen(0);
++	_nc_set_screen(NULL);
+     return rc;
+ }
+ #endif
+@@ -800,13 +800,13 @@
+        TR_FUNC_ARG(0, init)));
+ 
+ #if NCURSES_SP_FUNCS
+-    if (SP_PARM != 0 && SP_PARM->_prescreen)
++    if (SP_PARM != NULL && SP_PARM->_prescreen)
+ #endif
+     {
+ 	if (line == 0) {
+ 	    code = OK;
+ 	} else {
+-	    if (safe_ripoff_sp == 0) {
++	    if (safe_ripoff_sp == NULL) {
+ 		safe_ripoff_sp = safe_ripoff_stack;
+ 	    }
+ 	    if (safe_ripoff_sp < safe_ripoff_stack + N_RIPS) {
+Index: ncurses/base/lib_slk.c
+Prereq:  1.50 
+--- ncurses-6.5-20241130+/ncurses/base/lib_slk.c	2022-08-20 18:29:22.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_slk.c	2024-12-07 20:03:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2022 Thomas E. Dickey                                     *
++ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2010,2011 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -48,7 +48,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_slk.c,v 1.50 2022/08/20 18:29:22 tom Exp $")
++MODULE_ID("$Id: lib_slk.c,v 1.51 2024/12/07 20:03:37 tom Exp $")
+ 
+ #ifdef USE_TERM_DRIVER
+ #define NumLabels    InfoOf(SP_PARM).numlabels
+@@ -68,7 +68,7 @@
+ static int
+ slk_failed(NCURSES_SP_DCL0)
+ {
+-    if ((0 != SP_PARM) && SP_PARM->_slk) {
++    if ((NULL != SP_PARM) && SP_PARM->_slk) {
+ 	FreeIfNeeded(SP_PARM->_slk->ent);
+ 	free(SP_PARM->_slk);
+ 	SP_PARM->_slk = (SLK *) 0;
+@@ -148,7 +148,7 @@
+     assert(stwin);
+ 
+     sp = _nc_screen_of(stwin);
+-    if (0 == sp)
++    if (NULL == sp)
+ 	returnCode(ERR);
+ 
+     assert(TerminalOf(SP_PARM));
+@@ -157,7 +157,7 @@
+ 
+     if (SP_PARM->_slk) {	/* we did this already, so simply return */
+ 	returnCode(OK);
+-    } else if ((SP_PARM->_slk = typeCalloc(SLK, 1)) == 0)
++    } else if ((SP_PARM->_slk = typeCalloc(SLK, 1)) == NULL)
+ 	returnCode(ERR);
+ 
+     if (!SP_PARM->slk_format)
+@@ -196,13 +196,13 @@
+     for (i = 0; i < SP_PARM->_slk->labcnt; i++) {
+ 	size_t used = max_length + 1;
+ 
+-	SP_PARM->_slk->ent[i].ent_text = (char *) _nc_doalloc(0, used);
+-	if (SP_PARM->_slk->ent[i].ent_text == 0)
++	SP_PARM->_slk->ent[i].ent_text = (char *) _nc_doalloc(NULL, used);
++	if (SP_PARM->_slk->ent[i].ent_text == NULL)
+ 	    returnCode(slk_failed(NCURSES_SP_ARG));
+ 	memset(SP_PARM->_slk->ent[i].ent_text, 0, used);
+ 
+-	SP_PARM->_slk->ent[i].form_text = (char *) _nc_doalloc(0, used);
+-	if (SP_PARM->_slk->ent[i].form_text == 0)
++	SP_PARM->_slk->ent[i].form_text = (char *) _nc_doalloc(NULL, used);
++	if (SP_PARM->_slk->ent[i].form_text == NULL)
+ 	    returnCode(slk_failed(NCURSES_SP_ARG));
+ 
+ 	if (used > 1) {
+@@ -235,7 +235,7 @@
+ {
+     T((T_CALLED("slk_restore(%p)"), (void *) SP_PARM));
+ 
+-    if (0 == SP_PARM)
++    if (NULL == SP_PARM)
+ 	returnCode(ERR);
+     if (SP_PARM->_slk == NULL)
+ 	returnCode(ERR);
+Index: ncurses/base/lib_slkatr_set.c
+Prereq:  1.17 
+--- ncurses-6.5-20241130+/ncurses/base/lib_slkatr_set.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_slkatr_set.c	2024-12-07 20:03:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -39,7 +39,7 @@
+  */
+ #include 
+ 
+-MODULE_ID("$Id: lib_slkatr_set.c,v 1.17 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_slkatr_set.c,v 1.18 2024/12/07 20:03:37 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ NCURSES_SP_NAME(slk_attr_set) (NCURSES_SP_DCLx
+@@ -56,8 +56,8 @@
+        color_pair));
+ 
+     set_extended_pair(opts, color_pair);
+-    if (SP_PARM != 0
+-	&& SP_PARM->_slk != 0
++    if (SP_PARM != NULL
++	&& SP_PARM->_slk != NULL
+ 	&& color_pair >= 0
+ 	&& color_pair < SP_PARM->_pair_limit) {
+ 	TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
+Index: ncurses/base/lib_slkatrof.c
+Prereq:  1.12 
+--- ncurses-6.5-20241130+/ncurses/base/lib_slkatrof.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_slkatrof.c	2024-12-07 20:03:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2005,2009 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -39,14 +39,14 @@
+  */
+ #include 
+ 
+-MODULE_ID("$Id: lib_slkatrof.c,v 1.12 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_slkatrof.c,v 1.13 2024/12/07 20:03:37 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ NCURSES_SP_NAME(slk_attroff) (NCURSES_SP_DCLx const chtype attr)
+ {
+     T((T_CALLED("slk_attroff(%p,%s)"), (void *) SP_PARM, _traceattr(attr)));
+ 
+-    if (SP_PARM != 0 && SP_PARM->_slk != 0) {
++    if (SP_PARM != NULL && SP_PARM->_slk != NULL) {
+ 	TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
+ 	RemAttr(SP_PARM->_slk->attr, attr);
+ 	if ((attr & A_COLOR) != 0) {
+Index: ncurses/base/lib_slkatron.c
+Prereq:  1.13 
+--- ncurses-6.5-20241130+/ncurses/base/lib_slkatron.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_slkatron.c	2024-12-07 20:03:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -39,14 +39,14 @@
+  */
+ #include 
+ 
+-MODULE_ID("$Id: lib_slkatron.c,v 1.13 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_slkatron.c,v 1.14 2024/12/07 20:03:37 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ NCURSES_SP_NAME(slk_attron) (NCURSES_SP_DCLx const chtype attr)
+ {
+     T((T_CALLED("slk_attron(%p,%s)"), (void *) SP_PARM, _traceattr(attr)));
+ 
+-    if (SP_PARM != 0 && SP_PARM->_slk != 0) {
++    if (SP_PARM != NULL && SP_PARM->_slk != NULL) {
+ 	TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
+ 	AddAttr(SP_PARM->_slk->attr, attr);
+ 	if ((attr & A_COLOR) != 0) {
+Index: ncurses/base/lib_slkatrset.c
+Prereq:  1.11 
+--- ncurses-6.5-20241130+/ncurses/base/lib_slkatrset.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_slkatrset.c	2024-12-07 20:03:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2005,2009 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -39,14 +39,14 @@
+  */
+ #include 
+ 
+-MODULE_ID("$Id: lib_slkatrset.c,v 1.11 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_slkatrset.c,v 1.12 2024/12/07 20:03:37 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ NCURSES_SP_NAME(slk_attrset) (NCURSES_SP_DCLx const chtype attr)
+ {
+     T((T_CALLED("slk_attrset(%p,%s)"), (void *) SP_PARM, _traceattr(attr)));
+ 
+-    if (SP_PARM != 0 && SP_PARM->_slk != 0) {
++    if (SP_PARM != NULL && SP_PARM->_slk != NULL) {
+ 	SetAttr(SP_PARM->_slk->attr, attr);
+ 	returnCode(OK);
+     } else
+Index: ncurses/base/lib_slkattr.c
+Prereq:  1.12 
+--- ncurses-6.5-20241130+/ncurses/base/lib_slkattr.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_slkattr.c	2024-12-07 20:03:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -39,14 +39,14 @@
+  */
+ #include 
+ 
+-MODULE_ID("$Id: lib_slkattr.c,v 1.12 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_slkattr.c,v 1.13 2024/12/07 20:03:37 tom Exp $")
+ 
+ NCURSES_EXPORT(attr_t)
+ NCURSES_SP_NAME(slk_attr) (NCURSES_SP_DCL0)
+ {
+     T((T_CALLED("slk_attr(%p)"), (void *) SP_PARM));
+ 
+-    if (SP_PARM != 0 && SP_PARM->_slk != 0) {
++    if (SP_PARM != NULL && SP_PARM->_slk != NULL) {
+ 	attr_t result = AttrOf(SP_PARM->_slk->attr) & ALL_BUT_COLOR;
+ 	int pair = GetPair(SP_PARM->_slk->attr);
+ 
+Index: ncurses/base/lib_slkclear.c
+Prereq:  1.15 
+--- ncurses-6.5-20241130+/ncurses/base/lib_slkclear.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_slkclear.c	2024-12-07 20:03:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2007,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_slkclear.c,v 1.15 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_slkclear.c,v 1.16 2024/12/07 20:03:37 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ NCURSES_SP_NAME(slk_clear) (NCURSES_SP_DCL0)
+@@ -50,7 +50,7 @@
+ 
+     T((T_CALLED("slk_clear(%p)"), (void *) SP_PARM));
+ 
+-    if (SP_PARM != 0 && SP_PARM->_slk != 0) {
++    if (SP_PARM != NULL && SP_PARM->_slk != NULL) {
+ 	SP_PARM->_slk->hidden = TRUE;
+ 	/* For simulated SLK's it looks much more natural to
+ 	   inherit those attributes from the standard screen */
+Index: ncurses/base/lib_slkcolor.c
+Prereq:  1.20 
+--- ncurses-6.5-20241130+/ncurses/base/lib_slkcolor.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_slkcolor.c	2024-12-07 20:03:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018,2020 Thomas E. Dickey                                     *
++ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -39,7 +39,7 @@
+  */
+ #include 
+ 
+-MODULE_ID("$Id: lib_slkcolor.c,v 1.20 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_slkcolor.c,v 1.21 2024/12/07 20:03:37 tom Exp $")
+ 
+ static int
+ _nc_slk_color(SCREEN *sp, int pair_arg)
+@@ -48,8 +48,8 @@
+ 
+     T((T_CALLED("slk_color(%p,%d)"), (void *) sp, pair_arg));
+ 
+-    if (sp != 0
+-	&& sp->_slk != 0
++    if (sp != NULL
++	&& sp->_slk != NULL
+ 	&& pair_arg >= 0
+ 	&& pair_arg < sp->_pair_limit) {
+ 	TR(TRACE_ATTRS, ("... current is %s", _tracech_t(CHREF(sp->_slk->attr))));
+Index: ncurses/base/lib_slklab.c
+Prereq:  1.11 
+--- ncurses-6.5-20241130+/ncurses/base/lib_slklab.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_slklab.c	2024-12-07 20:03:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2003,2009 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -41,15 +41,15 @@
+  */
+ #include 
+ 
+-MODULE_ID("$Id: lib_slklab.c,v 1.11 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_slklab.c,v 1.12 2024/12/07 20:03:37 tom Exp $")
+ 
+ NCURSES_EXPORT(char *)
+ NCURSES_SP_NAME(slk_label) (NCURSES_SP_DCLx int n)
+ {
+     T((T_CALLED("slk_label(%p,%d)"), (void *) SP_PARM, n));
+ 
+-    if (SP_PARM == 0 || SP_PARM->_slk == 0 || n < 1 || n > SP_PARM->_slk->labcnt)
+-	returnPtr(0);
++    if (SP_PARM == NULL || SP_PARM->_slk == NULL || n < 1 || n > SP_PARM->_slk->labcnt)
++	returnPtr(NULL);
+     returnPtr(SP_PARM->_slk->ent[n - 1].ent_text);
+ }
+ 
+Index: ncurses/base/lib_slkrefr.c
+Prereq:  1.33 
+--- ncurses-6.5-20241130+/ncurses/base/lib_slkrefr.c	2024-07-27 19:23:59.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_slkrefr.c	2024-12-07 17:58:16.000000000 +0000
+@@ -44,7 +44,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_slkrefr.c,v 1.33 2024/07/27 19:23:59 tom Exp $")
++MODULE_ID("$Id: lib_slkrefr.c,v 1.34 2024/12/07 17:58:16 tom Exp $")
+ 
+ #ifdef USE_TERM_DRIVER
+ #define NumLabels    InfoOf(SP_PARM).numlabels
+@@ -83,7 +83,7 @@
+     SLK *slk;
+     int numlab;
+ 
+-    if (sp == 0)
++    if (sp == NULL)
+ 	return;
+ 
+     slk = sp->_slk;
+@@ -145,7 +145,7 @@
+ {
+     T((T_CALLED("slk_noutrefresh(%p)"), (void *) SP_PARM));
+ 
+-    if (SP_PARM == 0 || SP_PARM->_slk == 0)
++    if (SP_PARM == NULL || SP_PARM->_slk == NULL)
+ 	returnCode(ERR);
+     if (SP_PARM->_slk->hidden)
+ 	returnCode(OK);
+@@ -170,7 +170,7 @@
+ {
+     T((T_CALLED("slk_refresh(%p)"), (void *) SP_PARM));
+ 
+-    if (SP_PARM == 0 || SP_PARM->_slk == 0)
++    if (SP_PARM == NULL || SP_PARM->_slk == NULL)
+ 	returnCode(ERR);
+     if (SP_PARM->_slk->hidden)
+ 	returnCode(OK);
+Index: ncurses/base/lib_slkset.c
+Prereq:  1.26 
+--- ncurses-6.5-20241130+/ncurses/base/lib_slkset.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_slkset.c	2024-12-07 20:03:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019,2020 Thomas E. Dickey                                     *
++ * Copyright 2019-2020,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2011,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -45,7 +45,7 @@
+ #endif
+ #endif
+ 
+-MODULE_ID("$Id: lib_slkset.c,v 1.26 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_slkset.c,v 1.27 2024/12/07 20:03:37 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ NCURSES_SP_NAME(slk_set) (NCURSES_SP_DCLx int i, const char *astr, int format)
+@@ -60,14 +60,14 @@
+ 
+     T((T_CALLED("slk_set(%p, %d, \"%s\", %d)"), (void *) SP_PARM, i, str, format));
+ 
+-    if (SP_PARM == 0
+-	|| (slk = SP_PARM->_slk) == 0
++    if (SP_PARM == NULL
++	|| (slk = SP_PARM->_slk) == NULL
+ 	|| i < 1
+ 	|| i > slk->labcnt
+ 	|| format < 0
+ 	|| format > 2)
+ 	returnCode(ERR);
+-    if (str == 0)
++    if (str == NULL)
+ 	str = "";
+     --i;			/* Adjust numbering of labels */
+ 
+@@ -84,7 +84,7 @@
+ 	size_t need;
+ 
+ 	init_mb(state);
+-	need = mbrtowc(0, p, strlen(p), &state);
++	need = mbrtowc(NULL, p, strlen(p), &state);
+ 	if (need == (size_t) -1)
+ 	    break;
+ 	mbrtowc(&wc, p, need, &state);
+@@ -107,14 +107,14 @@
+ #endif
+ 
+     FreeIfNeeded(slk->ent[i].ent_text);
+-    if ((slk->ent[i].ent_text = strdup(str)) == 0)
++    if ((slk->ent[i].ent_text = strdup(str)) == NULL)
+ 	returnCode(ERR);
+     slk->ent[i].ent_text[numchrs] = '\0';
+ 
+     if ((slk->ent[i].form_text = (char *) _nc_doalloc(slk->ent[i].form_text,
+ 						      (size_t) (limit +
+ 								numchrs + 1))
+-	) == 0)
++	) == NULL)
+ 	returnCode(ERR);
+ 
+     switch (format) {
+Index: ncurses/base/lib_slktouch.c
+Prereq:  1.9 
+--- ncurses-6.5-20241130+/ncurses/base/lib_slktouch.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_slktouch.c	2024-12-07 20:03:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2000,2009 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -39,14 +39,14 @@
+  */
+ #include 
+ 
+-MODULE_ID("$Id: lib_slktouch.c,v 1.9 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_slktouch.c,v 1.10 2024/12/07 20:03:37 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ NCURSES_SP_NAME(slk_touch) (NCURSES_SP_DCL0)
+ {
+     T((T_CALLED("slk_touch(%p)"), (void *) SP_PARM));
+ 
+-    if (SP_PARM == 0 || SP_PARM->_slk == 0)
++    if (SP_PARM == NULL || SP_PARM->_slk == NULL)
+ 	returnCode(ERR);
+     SP_PARM->_slk->dirty = TRUE;
+ 
+Index: ncurses/base/lib_ungetch.c
+Prereq:  1.17 
+--- ncurses-6.5-20241130+/ncurses/base/lib_ungetch.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_ungetch.c	2024-12-07 20:03:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2011,2012 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_ungetch.c,v 1.17 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_ungetch.c,v 1.18 2024/12/07 20:03:37 tom Exp $")
+ 
+ #include 
+ 
+@@ -65,7 +65,7 @@
+ 
+     T((T_CALLED("ungetch(%p,%s)"), (void *) sp, _nc_tracechar(sp, ch)));
+ 
+-    if (sp != 0 && tail >= 0) {
++    if (sp != NULL && tail >= 0) {
+ 	if (head < 0) {
+ 	    head = 0;
+ 	    t_inc();
+Index: ncurses/base/lib_wattron.c
+Prereq:  1.13 
+--- ncurses-6.5-20241130+/ncurses/base/lib_wattron.c	2022-04-15 22:34:38.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_wattron.c	2024-12-07 20:03:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2022 Thomas E. Dickey                                     *
++ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -43,13 +43,13 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: lib_wattron.c,v 1.13 2022/04/15 22:34:38 tom Exp $")
++MODULE_ID("$Id: lib_wattron.c,v 1.14 2024/12/07 20:03:37 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ wattr_on(WINDOW *win, attr_t at, void *opts GCC_UNUSED)
+ {
+     T((T_CALLED("wattr_on(%p,%s)"), (void *) win, _traceattr(at)));
+-    if (win != 0) {
++    if (win != NULL) {
+ 	T(("... current %s (%d)",
+ 	   _traceattr(WINDOW_ATTRS(win)),
+ 	   GET_WINDOW_PAIR(win)));
+Index: ncurses/base/lib_winch.c
+Prereq:  1.9 
+--- ncurses-6.5-20241130+/ncurses/base/lib_winch.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_winch.c	2024-12-07 20:03:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -40,13 +40,13 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_winch.c,v 1.9 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_winch.c,v 1.10 2024/12/07 20:03:37 tom Exp $")
+ 
+ NCURSES_EXPORT(chtype)
+ winch(WINDOW *win)
+ {
+     T((T_CALLED("winch(%p)"), (void *) win));
+-    if (win != 0) {
++    if (win != NULL) {
+ 	returnChtype((chtype) CharOf(win->_line[win->_cury].text[win->_curx])
+ 		     | AttrOf(win->_line[win->_cury].text[win->_curx]));
+     } else {
+Index: ncurses/base/lib_window.c
+Prereq:  1.32 
+--- ncurses-6.5-20241130+/ncurses/base/lib_window.c	2021-10-23 23:06:24.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/lib_window.c	2024-12-07 20:03:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2024 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.32 2021/10/23 23:06:24 tom Exp $")
++MODULE_ID("$Id: lib_window.c,v 1.33 2024/12/07 20:03:37 tom Exp $")
+ 
+ NCURSES_EXPORT(void)
+ _nc_synchook(WINDOW *win)
+@@ -61,8 +61,8 @@
+ 
+     T((T_CALLED("mvderwin(%p,%d,%d)"), (void *) win, y, x));
+ 
+-    if (win != 0
+-	&& (orig = win->_parent) != 0
++    if (win != NULL
++	&& (orig = win->_parent) != NULL
+ 	&& (x >= 0 && y >= 0)
+ 	&& (x + getmaxx(win) <= getmaxx(orig))
+ 	&& (y + getmaxy(win) <= getmaxy(orig))) {
+@@ -178,11 +178,11 @@
+ dupwin(WINDOW *win)
+ /* make an exact duplicate of the given window */
+ {
+-    WINDOW *nwin = 0;
++    WINDOW *nwin = NULL;
+ 
+     T((T_CALLED("dupwin(%p)"), (void *) win));
+ 
+-    if (win != 0) {
++    if (win != NULL) {
+ #if NCURSES_SP_FUNCS
+ 	SCREEN *sp = _nc_screen_of(win);
+ #endif
+@@ -199,7 +199,7 @@
+ 					    win->_begx);
+ 	}
+ 
+-	if (nwin != 0) {
++	if (nwin != NULL) {
+ 	    int i;
+ 	    size_t linesize;
+ 
+Index: ncurses/base/nc_panel.c
+Prereq:  1.6 
+--- ncurses-6.5-20241130+/ncurses/base/nc_panel.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/nc_panel.c	2024-12-07 20:03:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2000,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: nc_panel.c,v 1.6 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: nc_panel.c,v 1.7 2024/12/07 20:03:37 tom Exp $")
+ 
+ NCURSES_EXPORT(struct panelhook *)
+ NCURSES_SP_NAME(_nc_panelhook) (NCURSES_SP_DCL0)
+@@ -42,7 +42,7 @@
+ 	    ? &(SP_PARM->_panelHook)
+ 	    : (CURRENT_SCREEN
+ 	       ? &(CURRENT_SCREEN->_panelHook)
+-	       : 0));
++	       : NULL));
+ }
+ 
+ #if NCURSES_SP_FUNCS
+Index: ncurses/base/new_pair.c
+Prereq:  1.25 
+--- ncurses-6.5-20241130+/ncurses/base/new_pair.c	2024-10-05 20:51:29.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/new_pair.c	2024-12-07 18:05:04.000000000 +0000
+@@ -61,7 +61,7 @@
+ 
+ #endif
+ 
+-MODULE_ID("$Id: new_pair.c,v 1.25 2024/10/05 20:51:29 tom Exp $")
++MODULE_ID("$Id: new_pair.c,v 1.26 2024/12/07 18:05:04 tom Exp $")
+ 
+ #if NCURSES_EXT_COLORS
+ 
+@@ -148,9 +148,9 @@
+ 
+     find.fg = fg;
+     find.bg = bg;
+-    if (sp != 0) {
++    if (sp != NULL) {
+ 	void *pp;
+-	if ((pp = tfind(&find, &sp->_ordered_pairs, compare_data)) != 0) {
++	if ((pp = tfind(&find, &sp->_ordered_pairs, compare_data)) != NULL) {
+ 	    const colorpair_t *temp = *(colorpair_t **) pp;
+ 	    result = (int) (temp - sp->_color_pairs);
+ 	}
+@@ -253,7 +253,7 @@
+     int n;
+     for (n = 0; n < length; ++n) {
+ 	const void *find = tfind(source + n, &sp->_ordered_pairs, compare_data);
+-	if (find != 0) {
++	if (find != NULL) {
+ 	    tdelete(source + n, &sp->_ordered_pairs, compare_data);
+ 	    tsearch(target + n, &sp->_ordered_pairs, compare_data);
+ 	}
+@@ -266,7 +266,7 @@
+     int pair;
+ 
+     T((T_CALLED("alloc_pair(%d,%d)"), fg, bg));
+-    if (SP_PARM == 0) {
++    if (SP_PARM == NULL) {
+ 	pair = -1;
+     } else if ((pair = _nc_find_color_pair(SP_PARM, fg, bg)) < 0) {
+ 	/*
+@@ -291,7 +291,7 @@
+ 	    if (!found && (SP_PARM->_pair_alloc < SP_PARM->_pair_limit)) {
+ 		pair = SP_PARM->_pair_alloc;
+ 		ReservePairs(SP_PARM, pair);
+-		if (SP_PARM->_color_pairs == 0) {
++		if (SP_PARM->_color_pairs == NULL) {
+ 		    pair = -1;
+ 		} else {
+ 		    found = TRUE;
+Index: ncurses/base/resizeterm.c
+Prereq:  1.57 
+--- ncurses-6.5-20241130+/ncurses/base/resizeterm.c	2024-11-23 18:35:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/resizeterm.c	2024-12-07 18:05:04.000000000 +0000
+@@ -46,7 +46,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: resizeterm.c,v 1.57 2024/11/23 18:35:34 tom Exp $")
++MODULE_ID("$Id: resizeterm.c,v 1.58 2024/12/07 18:05:04 tom Exp $")
+ 
+ /*
+  * If we're trying to be reentrant, do not want any local statics.
+@@ -123,10 +123,10 @@
+ static ripoff_t *
+ ripped_window(WINDOW *win)
+ {
+-    ripoff_t *result = 0;
++    ripoff_t *result = NULL;
+     ripoff_t *rop;
+ 
+-    if (win != 0) {
++    if (win != NULL) {
+ #ifdef USE_SP_RIPOFF
+ 	SCREEN *sp = _nc_screen_of(win);
+ #endif
+@@ -149,7 +149,7 @@
+ {
+     int result = 0;
+ 
+-    if (win != 0) {
++    if (win != NULL) {
+ 	ripoff_t *rop;
+ 
+ #ifdef USE_SP_RIPOFF
+@@ -175,7 +175,7 @@
+ {
+     int depth = 0;
+ 
+-    if (cmp != 0) {
++    if (cmp != NULL) {
+ #ifdef USE_SP_WINDOWLIST
+ 	SCREEN *sp = _nc_screen_of(cmp);
+ #endif
+@@ -200,9 +200,9 @@
+ {
+     int depth = 0;
+ 
+-    if (cmp != 0) {
++    if (cmp != NULL) {
+ 	WINDOW *tst;
+-	while ((tst = cmp->_parent) != 0) {
++	while ((tst = cmp->_parent) != NULL) {
+ 	    ++depth;
+ 	    cmp = tst;
+ 	}
+@@ -224,13 +224,13 @@
+ 
+     T((T_CALLED("adjust_window(%p,%d,%d)%s depth %d/%d currently %ldx%ld at %ld,%ld"),
+        (void *) win, ToLines, ToCols,
+-       (rop != 0) ? " (rip)" : "",
++       (rop != NULL) ? " (rip)" : "",
+        parent_depth(win),
+        child_depth(win),
+        (long) getmaxy(win), (long) getmaxx(win),
+        (long) getbegy(win) + win->_yoffset, (long) getbegx(win)));
+ 
+-    if (rop != 0 && rop->line < 0) {
++    if (rop != NULL && rop->line < 0) {
+ 	/*
+ 	 * If it is a ripped-off window at the bottom of the screen, simply
+ 	 * move it to the same relative position.
+@@ -484,8 +484,8 @@
+ 	if (NCURSES_SP_NAME(is_term_resized) (NCURSES_SP_ARGx ToLines, ToCols)) {
+ #if USE_SIGWINCH
+ 	    ripoff_t *rop;
+-	    bool slk_visible = (SP_PARM != 0
+-				&& SP_PARM->_slk != 0
++	    bool slk_visible = (SP_PARM != NULL
++				&& SP_PARM->_slk != NULL
+ 				&& !(SP_PARM->_slk->hidden));
+ 
+ 	    if (slk_visible) {
+@@ -506,7 +506,7 @@
+ 	     */
+ 	    for (each_ripoff(rop)) {
+ 		if (rop->win != StdScreen(SP_PARM)
+-		    && rop->win != 0
++		    && rop->win != NULL
+ 		    && rop->line < 0) {
+ 
+ 		    if (rop->hook != _nc_slk_initialize) {
+Index: ncurses/base/tries.c
+Prereq:  1.32 
+--- ncurses-6.5-20241130+/ncurses/base/tries.c	2023-06-24 15:36:23.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/tries.c	2024-12-07 21:24:18.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2023 Thomas E. Dickey                                     *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -41,7 +41,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: tries.c,v 1.32 2023/06/24 15:36:23 tom Exp $")
++MODULE_ID("$Id: tries.c,v 1.33 2024/12/07 21:24:18 tom Exp $")
+ 
+ /*
+  * Expand a keycode into the string that it corresponds to, returning null if
+@@ -51,12 +51,12 @@
+ _nc_expand_try(TRIES * tree, unsigned code, int *count, size_t len)
+ {
+     TRIES *ptr = tree;
+-    char *result = 0;
++    char *result = NULL;
+ 
+     if (code != 0) {
+-	while (ptr != 0) {
++	while (ptr != NULL) {
+ 	    if ((result = _nc_expand_try(ptr->child, code, count, len + 1))
+-		!= 0) {
++		!= NULL) {
+ 		break;
+ 	    }
+ 	    if (ptr->value == code) {
+@@ -69,8 +69,8 @@
+ 	    ptr = ptr->sibling;
+ 	}
+     }
+-    if (result != 0) {
+-	if (ptr != 0 && (result[len] = (char) ptr->ch) == 0)
++    if (result != NULL) {
++	if (ptr != NULL && (result[len] = (char) ptr->ch) == 0)
+ 	    *((unsigned char *) (result + len)) = 128;
+ #ifdef TRACE
+ 	if (len == 0 && USE_TRACEF(TRACE_MAXIMUM)) {
+@@ -96,7 +96,7 @@
+     if (code == 0)
+ 	returnCode(FALSE);
+ 
+-    while (*tree != 0) {
++    while (*tree != NULL) {
+ 	if (_nc_remove_key(&(*tree)->child, code)) {
+ 	    returnCode(TRUE);
+ 	}
+@@ -128,11 +128,11 @@
+     if (!VALID_STRING(string) || *string == 0)
+ 	returnCode(FALSE);
+ 
+-    while (*tree != 0) {
++    while (*tree != NULL) {
+ 	if (UChar((*tree)->ch) == UChar(*string)) {
+ 	    if (string[1] != 0)
+ 		returnCode(_nc_remove_string(&(*tree)->child, string + 1));
+-	    if ((*tree)->child == 0) {
++	    if ((*tree)->child == NULL) {
+ 		TRIES *to_free = *tree;
+ 		*tree = (*tree)->sibling;
+ 		free(to_free);
+Index: ncurses/base/wresize.c
+Prereq:  1.44 
+--- ncurses-6.5-20241130+/ncurses/base/wresize.c	2024-09-28 15:56:07.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/base/wresize.c	2024-12-07 18:08:56.000000000 +0000
+@@ -34,7 +34,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: wresize.c,v 1.44 2024/09/28 15:56:07 tom Exp $")
++MODULE_ID("$Id: wresize.c,v 1.45 2024/12/07 18:08:56 tom Exp $")
+ 
+ static int
+ cleanup_lines(struct ldat *data, int length)
+@@ -109,7 +109,7 @@
+ {
+     int col, row, size_x, size_y;
+     struct ldat *pline;
+-    struct ldat *new_lines = 0;
++    struct ldat *new_lines = NULL;
+ 
+ #ifdef TRACE
+     T((T_CALLED("wresize(%p,%d,%d)"), (void *) win, ToLines, ToCols));
+@@ -149,7 +149,7 @@
+ 	}
+ 	pline = win->_parent->_line;
+     } else {
+-	pline = 0;
++	pline = NULL;
+     }
+ 
+     /*
+@@ -158,7 +158,7 @@
+      * (at least temporarily) the array pointing to the individual lines.
+      */
+     new_lines = typeCalloc(struct ldat, (unsigned) (ToLines + 1));
+-    if (new_lines == 0)
++    if (new_lines == NULL)
+ 	returnCode(ERR);
+ 
+     /*
+@@ -175,7 +175,7 @@
+ 	    if (row <= size_y) {
+ 		if (ToCols != size_x) {
+ 		    s = typeMalloc(NCURSES_CH_T, (unsigned) ToCols + 1);
+-		    if (s == 0)
++		    if (s == NULL)
+ 			returnCode(cleanup_lines(new_lines, row));
+ 		    for (col = 0; col <= ToCols; ++col) {
+ 			bool valid = (col <= size_x);
+@@ -195,15 +195,15 @@
+ 		}
+ 	    } else {
+ 		s = typeMalloc(NCURSES_CH_T, (unsigned) ToCols + 1);
+-		if (s == 0)
++		if (s == NULL)
+ 		    returnCode(cleanup_lines(new_lines, row));
+ 		for (col = 0; col <= ToCols; ++col)
+ 		    s[col] = win->_nc_bkgd;
+ 	    }
+-	} else if (pline != 0 && pline[win->_pary + row].text != 0) {
++	} else if (pline != NULL && pline[win->_pary + row].text != NULL) {
+ 	    s = &pline[win->_pary + row].text[win->_parx];
+ 	} else {
+-	    s = 0;
++	    s = NULL;
+ 	}
+ 
+ 	if_USE_SCROLL_HINTS(new_lines[row].oldindex = row);
+Index: ncurses/curses.priv.h
+Prereq:  1.696 
+--- ncurses-6.5-20241130+/ncurses/curses.priv.h	2024-11-30 21:32:44.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/curses.priv.h	2024-12-07 18:27:10.000000000 +0000
+@@ -35,7 +35,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: curses.priv.h,v 1.696 2024/11/30 21:32:44 tom Exp $
++ * $Id: curses.priv.h,v 1.697 2024/12/07 18:27:10 tom Exp $
+  *
+  *	curses.priv.h
+  *
+@@ -445,8 +445,8 @@
+ #include 
+ #include 
+ 
+-#define IsPreScreen(sp)      (((sp) != 0) && sp->_prescreen)
+-#define HasTerminal(sp)      (((sp) != 0) && (0 != ((sp)->_term)))
++#define IsPreScreen(sp)      (((sp) != NULL) && sp->_prescreen)
++#define HasTerminal(sp)      (((sp) != NULL) && (NULL != ((sp)->_term)))
+ #define IsValidScreen(sp)    (HasTerminal(sp) && !IsPreScreen(sp))
+ 
+ #if USE_REENTRANT
+@@ -1291,7 +1291,7 @@
+ #define WINDOW_EXT(w,m) (((WINDOWLIST *)((void *)((char *)(w) - offsetof(WINDOWLIST, win))))->m)
+ 
+ #ifdef USE_SP_WINDOWLIST
+-#define SP_INIT_WINDOWLIST(sp)	WindowList(sp) = 0
++#define SP_INIT_WINDOWLIST(sp)	WindowList(sp) = NULL
+ #else
+ #define SP_INIT_WINDOWLIST(sp)	/* nothing */
+ #endif
+@@ -1308,7 +1308,7 @@
+     sp->_cursor            = -1;                \
+     SP_INIT_WINDOWLIST(sp);                     \
+     sp->_outch             = NCURSES_OUTC_FUNC; \
+-    sp->jump               = 0                  \
++    sp->jump               = NULL               \
+ 
+ /* usually in  */
+ #ifndef UCHAR_MAX
+@@ -1546,7 +1546,7 @@
+ #define CHANGED     -1
+ 
+ #define LEGALYX(w, y, x) \
+-	      ((w) != 0 && \
++	      ((w) != NULL && \
+ 		((x) >= 0 && (x) <= (w)->_maxx && \
+ 		 (y) >= 0 && (y) <= (w)->_maxy))
+ 
+@@ -1579,12 +1579,12 @@
+ #include 
+ #include 
+ 
+-#define FreeIfNeeded(p)  if ((p) != 0) free(p)
++#define FreeIfNeeded(p)  if ((p) != NULL) free(p)
+ 
+ /* FreeAndNull() is not a comma-separated expression because some compilers
+  * do not accept a mixture of void with values.
+  */
+-#define FreeAndNull(p)   do { free(p); p = 0; } while (0)
++#define FreeAndNull(p)   do { free(p); p = NULL; } while (0)
+ 
+ #ifdef EXP_OOM_TESTING
+ extern NCURSES_EXPORT(void *)	_nc_oom_malloc(size_t size);
+@@ -1606,21 +1606,21 @@
+ #define TYPE_MALLOC(type, size, name) \
+ 	do { \
+ 	    name = typeMalloc(type, size); \
+-	    if (name == 0) \
++	    if (name == NULL) \
+ 		_nc_err_abort(MSG_NO_MEMORY); \
+ 	} while (0)
+ 
+ #define TYPE_CALLOC(type, size, name) \
+ 	do { \
+ 	    name = typeCalloc(type, size); \
+-	    if (name == 0) \
++	    if (name == NULL) \
+ 		_nc_err_abort(MSG_NO_MEMORY); \
+ 	} while (0)
+ 
+ #define TYPE_REALLOC(type, size, name) \
+ 	do { \
+ 	    name = typeRealloc(type, size, name); \
+-	    if (name == 0) \
++	    if (name == NULL) \
+ 		_nc_err_abort(MSG_NO_MEMORY); \
+ 	} while (0)
+ 
+@@ -1652,8 +1652,8 @@
+ /*
+  * Standardize/simplify common loops
+  */
+-#define each_screen(p) p = _nc_screen_chain; p != 0; p = (p)->_next_screen
+-#define each_window(sp,p) p = WindowList(sp); p != 0; p = (p)->next
++#define each_screen(p) p = _nc_screen_chain; p != NULL; p = (p)->_next_screen
++#define each_window(sp,p) p = WindowList(sp); p != NULL; p = (p)->next
+ #define each_ripoff(p) p = safe_ripoff_stack; (p - safe_ripoff_stack) < N_RIPS; ++p
+ 
+ /*
+@@ -1665,8 +1665,8 @@
+ #define T_CREATE(fmt) "create :" fmt
+ #define T_RETURN(fmt) "return }" fmt
+ 
+-#define NonNull(s)              ((s) != 0 ? s : "")
+-#define NonEmpty(s)             ((s) != 0 && *(s) != '\0')
++#define NonNull(s)              ((s) != NULL ? s : "")
++#define NonEmpty(s)             ((s) != NULL && *(s) != '\0')
+ 
+ #ifdef TRACE
+ 
+@@ -1858,18 +1858,18 @@
+    TR(TRACE_ATTRS, ("new attribute is %s", _traceattr((S))));}
+ 
+ #define DelCharCost(sp,count) \
+-		((parm_dch != 0) \
++		((parm_dch != NULL) \
+ 		? sp->_dch_cost \
+-		: ((delete_character != 0) \
++		: ((delete_character != NULL) \
+ 			? (sp->_dch1_cost * count) \
+ 			: INFINITY))
+ 
+ #define InsCharCost(sp,count) \
+-		((parm_ich != 0) \
++		((parm_ich != NULL) \
+ 		? sp->_ich_cost \
+ 		: ((enter_insert_mode && exit_insert_mode) \
+ 		  ? sp->_smir_cost + sp->_rmir_cost + (sp->_ip_cost * count) \
+-		  : ((insert_character != 0) \
++		  : ((insert_character != NULL) \
+ 		    ? ((sp->_ich1_cost + sp->_ip_cost) * count) \
+ 		    : INFINITY)))
+ 
+@@ -1956,7 +1956,7 @@
+ #endif
+ 
+ #define save_ttytype(termp) \
+-	if (TerminalType(termp).term_names != 0) { \
++	if (TerminalType(termp).term_names != NULL) { \
+ 	    _nc_STRNCPY(ttytype, \
+ 	    		TerminalType(termp).term_names, \
+ 			NAMESIZE - 1); \
+@@ -2034,7 +2034,7 @@
+ extern NCURSES_EXPORT(void) _nc_change_pair(SCREEN *, int);
+ 
+ #define ReservePairs(sp,want) \
+-	    if ((sp->_color_pairs == 0) || (want >= sp->_pair_alloc)) \
++	    if ((sp->_color_pairs == NULL) || (want >= sp->_pair_alloc)) \
+ 		_nc_reserve_pairs(sp, want)
+ 
+ /* lib_getch.c */
+@@ -2077,7 +2077,7 @@
+ extern NCURSES_EXPORT(void)   _nc_forget_prescr(void);
+ #else
+ #define _nc_find_prescr()     _nc_prescreen.allocated
+-#define _nc_forget_prescr()   _nc_prescreen.allocated = 0
++#define _nc_forget_prescr()   _nc_prescreen.allocated = NULL
+ #endif
+ 
+ /* lib_set_term.c */
+@@ -2311,7 +2311,7 @@
+ 
+ #define USE_SETBUF_0 0
+ 
+-#define NC_OUTPUT(sp) ((sp != 0 && sp->_ofp != 0) ? sp->_ofp : stdout)
++#define NC_OUTPUT(sp) ((sp != NULL && sp->_ofp != NULL) ? sp->_ofp : stdout)
+ 
+ /*
+  * On systems with a broken linker, define 'SP' as a function to force the
+@@ -2385,7 +2385,7 @@
+ #define SetSafeOutcWrapper(outc)	    \
+     SCREEN* sp = CURRENT_SCREEN;            \
+     struct screen outc_wrapper;		    \
+-    if (sp==0) {                            \
++    if (sp == NULL) {                       \
+ 	sp = &outc_wrapper;                 \
+ 	memset(sp,0,sizeof(struct screen)); \
+ 	sp->_outch = _nc_outc_wrapper;      \
+@@ -2579,7 +2579,7 @@
+ #  endif
+ #else
+ #  define IsTermInfo(sp)       TRUE
+-#  define HasTInfoTerminal(sp) (0 != TerminalOf(sp))
++#  define HasTInfoTerminal(sp) (NULL != TerminalOf(sp))
+ #  if defined(EXP_WIN32_DRIVER)
+ #    define IsTermInfoOnConsole(sp) _nc_console_test(TerminalOf(sp)->Filedes)
+ #  else
+Index: ncurses/new_pair.h
+Prereq:  1.15 
+--- ncurses-6.5-20241130+/ncurses/new_pair.h	2024-10-05 20:57:47.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/new_pair.h	2024-12-07 17:27:35.000000000 +0000
+@@ -34,7 +34,7 @@
+ /*
+  * Common type definitions and macros for new_pair.c, lib_color.c
+  *
+- * $Id: new_pair.h,v 1.15 2024/10/05 20:57:47 tom Exp $
++ * $Id: new_pair.h,v 1.16 2024/12/07 17:27:35 tom Exp $
+  */
+ 
+ #ifndef NEW_PAIR_H
+@@ -111,7 +111,7 @@
+  * that the index is within the limits of the table which we allocated.
+  */
+ #define ValidPair(sp,pair) \
+-    ((sp != 0) && (pair >= 0) && (pair < sp->_pair_limit) && sp->_coloron)
++    ((sp != NULL) && (pair >= 0) && (pair < sp->_pair_limit) && sp->_coloron)
+ 
+ #if NCURSES_EXT_FUNCS && NCURSES_EXT_COLORS
+ extern NCURSES_EXPORT(void)     _nc_copy_pairs(SCREEN*, colorpair_t*, colorpair_t*, int);
+Index: ncurses/report_offsets.c
+Prereq:  1.29 
+--- ncurses-6.5-20241130+/ncurses/report_offsets.c	2024-05-25 23:00:26.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/report_offsets.c	2024-12-07 21:18:23.000000000 +0000
+@@ -34,10 +34,10 @@
+ #define NEW_PAIR_INTERNAL 1
+ #include 
+ 
+-MODULE_ID("$Id: report_offsets.c,v 1.29 2024/05/25 23:00:26 tom Exp $")
++MODULE_ID("$Id: report_offsets.c,v 1.30 2024/12/07 21:18:23 tom Exp $")
+ 
+ #define show_size(type) \
+-	flag = 0; \
++	flag = NULL; \
+ 	last = 0; \
+ 	printf("%5lu   " #type "\n", (unsigned long)sizeof(type))
+ #define show_name(name) \
+@@ -48,7 +48,7 @@
+ 		printf("?? incorrect order for " #type "." #member "\n"); \
+ 	printf("%5lu %c " #type "." #member "\n", next, flag ? *flag : ' '); \
+ 	last = next; \
+-	flag = 0
++	flag = NULL
+ 
+ #if NCURSES_WIDECHAR && NCURSES_EXT_COLORS
+ #define show_COLORS(type,member) { flag = "c"; show_offset(type,member); }
+@@ -104,7 +104,7 @@
+ int
+ main(void)
+ {
+-    const char *flag = 0;
++    const char *flag = NULL;
+     unsigned long last, next;
+ 
+     printf("Size/offsets of data structures:\n");
+Index: ncurses/tinfo/MKcaptab.awk
+Prereq:  1.21 
+--- ncurses-6.5-20241130+/ncurses/tinfo/MKcaptab.awk	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/MKcaptab.awk	2024-12-07 20:52:55.000000000 +0000
+@@ -1,5 +1,5 @@
+ ##############################################################################
+-# Copyright 2020 Thomas E. Dickey                                            #
++# Copyright 2020,2024 Thomas E. Dickey                                       #
+ # Copyright 1998-2006,2007 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: MKcaptab.awk,v 1.21 2020/02/02 23:34:34 tom Exp $
++# $Id: MKcaptab.awk,v 1.22 2024/12/07 20:52:55 tom Exp $
+ function add_string(text) {
+     if (text != "IGNORE") {
+ 	offsets[num_strings] = offset;
+@@ -53,7 +53,7 @@
+ 		printf "/* generated by MKcaptab.awk %s(%d) */\n", tablename, bigstrings;
+ 		print ""
+ 		if (bigstrings) {
+-		    printf "static struct alias *_nc_%s_table = 0;\n", tablename;
++		    printf "static struct alias *_nc_%s_table = NULL;\n", tablename;
+ 		    print "";
+ 		    printf "static const char %s_text[] = \"\\\n", tablename;
+ 		} else {
+Index: ncurses/tinfo/MKcaptab.sh
+Prereq:  1.20 
+--- ncurses-6.5-20241130+/ncurses/tinfo/MKcaptab.sh	2023-04-22 15:12:57.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/MKcaptab.sh	2024-12-07 21:30:44.000000000 +0000
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ ##############################################################################
+-# Copyright 2019-2020,2023 Thomas E. Dickey                                  #
++# Copyright 2019-2023,2024 Thomas E. Dickey                                  #
+ # Copyright 2007-2010,2011 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -27,13 +27,13 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: MKcaptab.sh,v 1.20 2023/04/22 15:12:57 tom Exp $
++# $Id: MKcaptab.sh,v 1.22 2024/12/07 21:30:44 tom Exp $
+ 
+ if test $# != 0
+ then
+ 	AWK="$1"; shift 1
+ else
+-	AWK=awk
++	AWK="awk"
+ fi
+ 
+ if test $# != 0
+@@ -71,12 +71,12 @@
+ /* *INDENT-OFF* */
+ EOF
+ 
+-cat "$@" |./make_hash 1 info $OPT1
+-cat "$@" |./make_hash 3 cap  $OPT1
++cat "$@" |./make_hash 1 info "$OPT1"
++cat "$@" |./make_hash 3 cap  "$OPT1"
+ 
+-cat "$@" |$AWK -f $OPT2 bigstrings=$OPT1 tablename=capalias
++cat "$@" |$AWK -f "$OPT2" bigstrings="$OPT1" tablename=capalias
+ 
+-cat "$@" |$AWK -f $OPT2 bigstrings=$OPT1 tablename=infoalias
++cat "$@" |$AWK -f "$OPT2" bigstrings="$OPT1" tablename=infoalias
+ 
+ cat <
+ 
+-MODULE_ID("$Id: access.c,v 1.40 2024/11/09 18:30:28 tom Exp $")
++MODULE_ID("$Id: access.c,v 1.41 2024/12/07 18:05:04 tom Exp $")
+ 
+ #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
+ 
+@@ -70,7 +70,7 @@
+     static char *temp;
+     char *s;
+ 
+-    if ((temp = strdup(result)) != 0)
++    if ((temp = strdup(result)) != NULL)
+ 	result = temp;
+ #if !MIXEDCASE_FILENAMES
+     for (s = result; *s != '\0'; ++s) {
+@@ -97,7 +97,7 @@
+ #define is_pathname(s) ((((s) != 0) && ((s)[0] == '/')) \
+ 		  || (((s)[0] != 0) && ((s)[1] == ':')))
+ #else
+-#define is_pathname(s) ((s) != 0 && (s)[0] == '/')
++#define is_pathname(s) ((s) != NULL && (s)[0] == '/')
+ #endif
+     return is_pathname(path);
+ }
+@@ -113,7 +113,7 @@
+     if (test == 0)
+ 	test = strrchr(path, '\\');
+ #endif
+-    if (test == 0)
++    if (test == NULL)
+ 	test = path;
+     else
+ 	test++;
+@@ -131,7 +131,7 @@
+ {
+     int result;
+ 
+-    if (path == 0) {
++    if (path == NULL) {
+ 	errno = ENOENT;
+ 	result = -1;
+     } else if (ACCESS(path, mode) < 0) {
+@@ -143,7 +143,7 @@
+ 
+ 	    _nc_STRCPY(head, path, sizeof(head));
+ 	    leaf = _nc_basename(head);
+-	    if (leaf == 0)
++	    if (leaf == NULL)
+ 		leaf = head;
+ 	    *leaf = '\0';
+ 	    if (head == leaf)
+Index: ncurses/tinfo/add_tries.c
+Prereq:  1.13 
+--- ncurses-6.5-20241130+/ncurses/tinfo/add_tries.c	2023-06-24 15:36:13.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/add_tries.c	2024-12-07 20:04:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -41,7 +41,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: add_tries.c,v 1.13 2023/06/24 15:36:13 tom Exp $")
++MODULE_ID("$Id: add_tries.c,v 1.14 2024/12/07 20:04:23 tom Exp $")
+ 
+ #define SET_TRY(dst,src) if ((dst->ch = *src++) == 128) dst->ch = '\0'
+ #define CMP_TRY(a,b) ((a)? (a == b) : (b == 128))
+@@ -57,14 +57,14 @@
+     if (!VALID_STRING(str) || *txt == '\0' || code == 0)
+ 	returnCode(ERR);
+ 
+-    if ((*tree) != 0) {
++    if ((*tree) != NULL) {
+ 	ptr = savedptr = (*tree);
+ 
+ 	for (;;) {
+ 	    unsigned char cmp = *txt;
+ 
+ 	    while (!CMP_TRY(ptr->ch, cmp)
+-		   && ptr->sibling != 0)
++		   && ptr->sibling != NULL)
+ 		ptr = ptr->sibling;
+ 
+ 	    if (CMP_TRY(ptr->ch, cmp)) {
+@@ -72,12 +72,12 @@
+ 		    ptr->value = (unsigned short) code;
+ 		    returnCode(OK);
+ 		}
+-		if (ptr->child != 0)
++		if (ptr->child != NULL)
+ 		    ptr = ptr->child;
+ 		else
+ 		    break;
+ 	    } else {
+-		if ((ptr->sibling = typeCalloc(TRIES, 1)) == 0) {
++		if ((ptr->sibling = typeCalloc(TRIES, 1)) == NULL) {
+ 		    returnCode(ERR);
+ 		}
+ 
+@@ -91,7 +91,7 @@
+     } else {			/* (*tree) == 0 :: First sequence to be added */
+ 	savedptr = ptr = (*tree) = typeCalloc(TRIES, 1);
+ 
+-	if (ptr == 0) {
++	if (ptr == NULL) {
+ 	    returnCode(ERR);
+ 	}
+ 
+@@ -106,8 +106,8 @@
+ 
+ 	ptr = ptr->child;
+ 
+-	if (ptr == 0) {
+-	    while ((ptr = savedptr) != 0) {
++	if (ptr == NULL) {
++	    while ((ptr = savedptr) != NULL) {
+ 		savedptr = ptr->child;
+ 		free(ptr);
+ 	    }
+Index: ncurses/tinfo/alloc_entry.c
+Prereq:  1.80 
+--- ncurses-6.5-20241130+/ncurses/tinfo/alloc_entry.c	2024-11-09 20:36:48.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/alloc_entry.c	2024-12-07 21:12:53.000000000 +0000
+@@ -48,7 +48,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: alloc_entry.c,v 1.80 2024/11/09 20:36:48 tom Exp $")
++MODULE_ID("$Id: alloc_entry.c,v 1.81 2024/12/07 21:12:53 tom Exp $")
+ 
+ #define ABSENT_OFFSET    -1
+ #define CANCELLED_OFFSET -2
+@@ -104,7 +104,7 @@
+ NCURSES_EXPORT(char *)
+ _nc_save_str(const char *string)
+ {
+-    char *result = 0;
++    char *result = NULL;
+     size_t old_next_free = next_free;
+ 
+     if (stringbuf != NULL) {
+@@ -164,7 +164,7 @@
+ 	}
+ 
+ 	for (i = 0; i < nuses; i++) {
+-	    if (ep->uses[i].name == 0) {
++	    if (ep->uses[i].name == NULL) {
+ 		ep->uses[i].name = _nc_save_str(ep->uses[i].name);
+ 	    }
+ 	}
+@@ -187,7 +187,7 @@
+     }
+ 
+     for (i = 0; i < nuses; i++) {
+-	if (ep->uses[i].name == 0)
++	if (ep->uses[i].name == NULL)
+ 	    useoffsets[i] = ABSENT_OFFSET;
+ 	else
+ 	    useoffsets[i] = (int) (ep->uses[i].name - stringbuf);
+@@ -237,7 +237,7 @@
+ 
+     for (i = 0; i < nuses; i++) {
+ 	if (useoffsets[i] == ABSENT_OFFSET) {
+-	    ep->uses[i].name = 0;
++	    ep->uses[i].name = NULL;
+ 	} else {
+ 	    ep->uses[i].name = strdup(tp->str_table + useoffsets[i]);
+ 	}
+@@ -258,7 +258,7 @@
+ #endif
+     unsigned i;
+ 
+-    if (source == 0 || from == 0 || target == 0 || to == 0)
++    if (source == NULL || from == NULL || target == NULL || to == NULL)
+ 	return;
+ 
+ #if NCURSES_XNAMES
+Index: ncurses/tinfo/alloc_ttype.c
+Prereq:  1.52 
+--- ncurses-6.5-20241130+/ncurses/tinfo/alloc_ttype.c	2024-07-27 19:22:23.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/alloc_ttype.c	2024-12-07 18:08:56.000000000 +0000
+@@ -43,7 +43,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: alloc_ttype.c,v 1.52 2024/07/27 19:22:23 tom Exp $")
++MODULE_ID("$Id: alloc_ttype.c,v 1.53 2024/12/07 18:08:56 tom Exp $")
+ 
+ #if NCURSES_XNAMES
+ /*
+@@ -532,8 +532,8 @@
+     char *new_table;
+     size_t new_table_size;
+ #if NCURSES_EXT_NUMBERS
+-    short *oldptr = 0;
+-    int *newptr = 0;
++    short *oldptr = NULL;
++    int *newptr = NULL;
+ #endif
+ 
+     DEBUG(2, (T_CALLED("copy_termtype(dst=%p, src=%p, mode=%d)"), (void *)
+@@ -594,7 +594,7 @@
+ 	TYPE_MALLOC(int, NUM_NUMBERS(dst), newptr);
+ 	dst->Numbers = newptr;
+     }
+-    if ((mode == srcINT) && (oldptr != 0)) {
++    if ((mode == srcINT) && (oldptr != NULL)) {
+ 	DEBUG(2, ("...copy int ->short"));
+ 	for (i = 0; i < NUM_NUMBERS(dst); ++i) {
+ 	    if (src->Numbers[i] > MAX_OF_TYPE(short)) {
+@@ -603,7 +603,7 @@
+ 		oldptr[i] = (short) src->Numbers[i];
+ 	    }
+ 	}
+-    } else if ((mode == dstINT) && (newptr != 0)) {
++    } else if ((mode == dstINT) && (newptr != NULL)) {
+ 	DEBUG(2, ("...copy short ->int"));
+ 	for (i = 0; i < NUM_NUMBERS(dst); ++i) {
+ 	    newptr[i] = ((const short *) (src->Numbers))[i];
+@@ -672,7 +672,7 @@
+ 	    }
+ 	}
+     } else {
+-	dst->ext_Names = 0;
++	dst->ext_Names = NULL;
+     }
+ #endif
+     (void) new_table_size;
+Index: ncurses/tinfo/captoinfo.c
+Prereq:  1.104 
+--- ncurses-6.5-20241130+/ncurses/tinfo/captoinfo.c	2024-10-19 21:18:54.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/captoinfo.c	2024-12-07 21:12:53.000000000 +0000
+@@ -98,7 +98,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: captoinfo.c,v 1.104 2024/10/19 21:18:54 tom Exp $")
++MODULE_ID("$Id: captoinfo.c,v 1.105 2024/12/07 21:12:53 tom Exp $")
+ 
+ #if 0
+ #define DEBUG_THIS(p) DEBUG(9, p)
+@@ -124,7 +124,7 @@
+ init_string(void)
+ /* initialize 'my_string', 'my_length' */
+ {
+-    if (my_string == 0)
++    if (my_string == NULL)
+ 	TYPE_MALLOC(char, my_length = 256, my_string);
+ 
+     *my_string = '\0';
+@@ -138,7 +138,7 @@
+     size_t need = have + strlen(s) + 2;
+     if (need > my_length) {
+ 	my_string = (char *) _nc_doalloc(my_string, my_length = (need + need));
+-	if (my_string == 0)
++	if (my_string == NULL)
+ 	    _nc_err_abort(MSG_NO_MEMORY);
+ 	d = my_string + have;
+     }
+@@ -313,8 +313,8 @@
+     dp = init_string();
+ 
+     /* skip the initial padding (if we haven't been told not to) */
+-    capstart = 0;
+-    if (s == 0)
++    capstart = NULL;
++    if (s == NULL)
+ 	s = "";
+     if (parameterized >= 0 && isdigit(UChar(*s)))
+ 	for (capstart = s; *s != '\0'; s++)
+@@ -619,7 +619,7 @@
+ {
+     int seenone = 0, seentwo = 0, saw_m = 0, saw_n = 0;
+     const char *padding;
+-    const char *trimmed = 0;
++    const char *trimmed = NULL;
+     int in0, in1, in2;
+     char ch1 = 0, ch2 = 0;
+     char *bufptr = init_string();
+@@ -655,9 +655,9 @@
+ 
+     for (; !syntax_error &&
+ 	 *str &&
+-	 ((trimmed == 0) || (str < trimmed)); str++) {
++	 ((trimmed == NULL) || (str < trimmed)); str++) {
+ 	int c1, c2;
+-	char *cp = 0;
++	char *cp = NULL;
+ 
+ 	if (str[0] == '^') {
+ 	    if (str[1] == '\0' || (str + 1) == trimmed) {
+@@ -743,7 +743,7 @@
+ 				++myfix;
+ 			    }
+ 			}
+-		    } else if (strchr("E\\nrtbf", xx1) == 0) {
++		    } else if (strchr("E\\nrtbf", xx1) == NULL) {
+ 			switch (xx1) {
+ 			case 'e':
+ 			    xx1 = 'E';
+@@ -814,7 +814,7 @@
+ 		   && ((in0 == 4 && in1 == 10 && in2 == 48)
+ 		       || (in0 == 3 && in1 == 9 && in2 == 38))) {
+ 	    /* dumb-down an optimized case from xterm-256color for termcap */
+-	    if ((str = strstr(str, ";m")) == 0)
++	    if ((str = strstr(str, ";m")) == NULL)
+ 		break;		/* cannot happen */
+ 	    ++str;
+ 	    if (in2 == 48) {
+@@ -981,7 +981,7 @@
+ 	 * but that may not be the end of the string.
+ 	 */
+ 	assert(str != 0);
+-	if (str == 0 || *str == '\0')
++	if (str == NULL || *str == '\0')
+ 	    break;
+ 
+     }				/* endwhile (*str) */
+@@ -1050,7 +1050,7 @@
+ NCURSES_EXPORT(void)
+ _nc_captoinfo_leaks(void)
+ {
+-    if (my_string != 0) {
++    if (my_string != NULL) {
+ 	FreeAndNull(my_string);
+     }
+     my_length = 0;
+Index: ncurses/tinfo/comp_error.c
+Prereq:  1.44 
+--- ncurses-6.5-20241130+/ncurses/tinfo/comp_error.c	2023-06-15 20:27:02.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/comp_error.c	2024-12-07 20:04:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -42,7 +42,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: comp_error.c,v 1.44 2023/06/15 20:27:02 tom Exp $")
++MODULE_ID("$Id: comp_error.c,v 1.45 2024/12/07 20:04:23 tom Exp $")
+ 
+ NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = FALSE;
+ NCURSES_EXPORT_VAR(int) _nc_curr_line = 0; /* current line # in input */
+@@ -75,9 +75,9 @@
+ _nc_set_type(const char *const name)
+ {
+ #define MY_SIZE (size_t) MAX_NAME_SIZE
+-    if (TermType == 0)
++    if (TermType == NULL)
+ 	TermType = typeMalloc(char, MY_SIZE + 1);
+-    if (TermType != 0) {
++    if (TermType != NULL) {
+ 	TermType[0] = '\0';
+ 	if (name) {
+ 	    _nc_STRNCAT(TermType, name, MY_SIZE, MY_SIZE);
+@@ -89,13 +89,13 @@
+ _nc_get_type(char *name)
+ {
+ #if NO_LEAKS
+-    if (name == 0 && TermType != 0) {
++    if (name == NULL && TermType != NULL) {
+ 	FreeAndNull(TermType);
+ 	return;
+     }
+ #endif
+-    if (name != 0)
+-	_nc_STRCPY(name, TermType != 0 ? TermType : "", MAX_NAME_SIZE);
++    if (name != NULL)
++	_nc_STRCPY(name, TermType != NULL ? TermType : "", MAX_NAME_SIZE);
+ }
+ 
+ static NCURSES_INLINE void
+@@ -106,7 +106,7 @@
+ 	fprintf(stderr, ", line %d", _nc_curr_line);
+     if (_nc_curr_col > 0)
+ 	fprintf(stderr, ", col %d", _nc_curr_col);
+-    if (TermType != 0 && TermType[0] != '\0')
++    if (TermType != NULL && TermType[0] != '\0')
+ 	fprintf(stderr, ", terminal '%s'", TermType);
+     fputc(':', stderr);
+     fputc(' ', stderr);
+Index: ncurses/tinfo/comp_expand.c
+Prereq:  1.36 
+--- ncurses-6.5-20241130+/ncurses/tinfo/comp_expand.c	2024-11-30 21:24:57.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/comp_expand.c	2024-12-07 21:12:53.000000000 +0000
+@@ -36,7 +36,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: comp_expand.c,v 1.36 2024/11/30 21:24:57 tom Exp $")
++MODULE_ID("$Id: comp_expand.c,v 1.37 2024/12/07 21:12:53 tom Exp $")
+ 
+ #if 0
+ #define DEBUG_THIS(p) DEBUG(9, p)
+@@ -73,18 +73,18 @@
+ 	int offset;
+     } fixups[MAX_TC_FIXUPS];
+ 
+-    if (srcp == 0) {
++    if (srcp == NULL) {
+ #if NO_LEAKS
+-	if (buffer != 0) {
++	if (buffer != NULL) {
+ 	    FreeAndNull(buffer);
+ 	    length = 0;
+ 	}
+ #endif
+-	return 0;
++	return NULL;
+     }
+-    if (buffer == 0 || need > length) {
+-	if ((buffer = typeRealloc(char, length = need, buffer)) == 0)
+-	      return 0;
++    if (buffer == NULL || need > length) {
++	if ((buffer = typeRealloc(char, length = need, buffer)) == NULL)
++	      return NULL;
+     }
+ 
+     DEBUG_THIS(("_nc_tic_expand %s:%s:%s",
+@@ -124,9 +124,9 @@
+ 	    case 1:
+ 		if (str[0] == L_BRACE
+ 		    && isdigit(UChar(str[1]))) {
+-		    char *dst = 0;
++		    char *dst = NULL;
+ 		    long value = strtol(str + 1, &dst, 0);
+-		    if (dst != 0
++		    if (dst != NULL
+ 			&& *dst == R_BRACE
+ 			&& value < 127
+ 			&& isprint(UChar(value))) {
+Index: ncurses/tinfo/comp_hash.c
+Prereq:  1.55 
+--- ncurses-6.5-20241130+/ncurses/tinfo/comp_hash.c	2023-06-24 13:29:43.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/comp_hash.c	2024-12-07 20:05:08.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2008,2009 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -45,7 +45,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: comp_hash.c,v 1.55 2023/06/24 13:29:43 tom Exp $")
++MODULE_ID("$Id: comp_hash.c,v 1.56 2024/12/07 20:05:08 tom Exp $")
+ 
+ /*
+  * Finds the entry for the given string in the hash table if present.
+@@ -58,7 +58,7 @@
+     bool termcap = (hash_table != _nc_get_hash_table(FALSE));
+     const HashData *data = _nc_get_hash_info(termcap);
+     int hashvalue;
+-    struct name_table_entry const *ptr = 0;
++    struct name_table_entry const *ptr = NULL;
+     struct name_table_entry const *real_table;
+ 
+     hashvalue = data->hash_of(string);
+@@ -71,7 +71,7 @@
+ 	ptr = real_table + data->table_data[hashvalue];
+ 	while (!data->compare_names(ptr->nte_name, string)) {
+ 	    if (ptr->nte_link < 0) {
+-		ptr = 0;
++		ptr = NULL;
+ 		break;
+ 	    }
+ 	    ptr = real_table + (ptr->nte_link
+@@ -108,7 +108,7 @@
+ 	    while (ptr->nte_type != type
+ 		   || !data->compare_names(ptr->nte_name, string)) {
+ 		if (ptr->nte_link < 0) {
+-		    ptr = 0;
++		    ptr = NULL;
+ 		    break;
+ 		}
+ 		ptr = table + (ptr->nte_link + data->table_data[data->table_size]);
+@@ -125,7 +125,7 @@
+ {
+     const HashData *data = _nc_get_hash_user();
+     int hashvalue;
+-    struct user_table_entry const *ptr = 0;
++    struct user_table_entry const *ptr = NULL;
+     struct user_table_entry const *real_table;
+ 
+     hashvalue = data->hash_of(string);
+@@ -138,7 +138,7 @@
+ 	ptr = real_table + data->table_data[hashvalue];
+ 	while (!data->compare_names(ptr->ute_name, string)) {
+ 	    if (ptr->ute_link < 0) {
+-		ptr = 0;
++		ptr = NULL;
+ 		break;
+ 	    }
+ 	    ptr = real_table + (ptr->ute_link
+Index: ncurses/tinfo/comp_parse.c
+Prereq:  1.135 
+--- ncurses-6.5-20241130+/ncurses/tinfo/comp_parse.c	2024-07-27 19:15:16.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/comp_parse.c	2024-12-07 21:12:53.000000000 +0000
+@@ -48,7 +48,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: comp_parse.c,v 1.135 2024/07/27 19:15:16 tom Exp $")
++MODULE_ID("$Id: comp_parse.c,v 1.136 2024/12/07 21:12:53 tom Exp $")
+ 
+ static void sanity_check2(TERMTYPE2 *, bool);
+ NCURSES_IMPEXP void (NCURSES_API *_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2;
+@@ -64,13 +64,13 @@
+     DEBUG(2, (T_CALLED("enqueue(ep=%p)"), (void *) ep));
+ 
+     newp = _nc_copy_entry(ep);
+-    if (newp == 0)
++    if (newp == NULL)
+ 	_nc_err_abort(MSG_NO_MEMORY);
+ 
+     newp->last = _nc_tail;
+     _nc_tail = newp;
+ 
+-    newp->next = 0;
++    newp->next = NULL;
+     if (newp->last)
+ 	newp->last->next = newp;
+     DEBUG(2, (T_RETURN("")));
+@@ -81,7 +81,7 @@
+ static char *
+ force_bar(char *dst, char *src)
+ {
+-    if (strchr(src, '|') == 0) {
++    if (strchr(src, '|') == NULL) {
+ 	size_t len = strlen(src);
+ 	if (len > MAX_NAME_SIZE)
+ 	    len = MAX_NAME_SIZE;
+@@ -91,7 +91,7 @@
+     }
+     return src;
+ }
+-#define ForceBar(dst, src) ((strchr(src, '|') == 0) ? force_bar(dst, src) : src)
++#define ForceBar(dst, src) ((strchr(src, '|') == NULL) ? force_bar(dst, src) : src)
+ 
+ #if NCURSES_USE_TERMCAP && NCURSES_XNAMES
+ static char *
+@@ -152,7 +152,7 @@
+ name_ending(char *name)
+ {
+     if (*name == '\0') {
+-	name = 0;
++	name = NULL;
+     } else {
+ 	while (*name != '\0' && *name != '|')
+ 	    ++name;
+@@ -403,7 +403,7 @@
+ _nc_resolve_uses2(bool fullresolve, bool literal)
+ /* try to resolve all use capabilities */
+ {
+-    ENTRY *qp, *rp, *lastread = 0;
++    ENTRY *qp, *rp, *lastread = NULL;
+     bool keepgoing;
+     unsigned i, j;
+     int total_unresolved, multiples;
+@@ -452,7 +452,7 @@
+ 	    char *lookfor = qp->uses[i].name;
+ 	    long lookline = qp->uses[i].line;
+ 
+-	    if (lookfor == 0)
++	    if (lookfor == NULL)
+ 		continue;
+ 
+ 	    foundit = FALSE;
+@@ -518,7 +518,7 @@
+ 
+ 		_nc_curr_line = (int) lookline;
+ 		_nc_warning("resolution of use=%s failed", lookfor);
+-		qp->uses[i].link = 0;
++		qp->uses[i].link = NULL;
+ 	    }
+ 	}
+     }
+@@ -758,7 +758,7 @@
+     _nc_names_leaks();
+     _nc_codes_leaks();
+ #endif
+-    _nc_tic_expand(0, FALSE, 0);
++    _nc_tic_expand(NULL, FALSE, 0);
+     T((T_RETURN("")));
+ }
+ 
+Index: ncurses/tinfo/comp_scan.c
+Prereq:  1.124 
+--- ncurses-6.5-20241130+/ncurses/tinfo/comp_scan.c	2024-11-23 18:45:01.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/comp_scan.c	2024-12-07 21:17:54.000000000 +0000
+@@ -51,7 +51,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: comp_scan.c,v 1.124 2024/11/23 18:45:01 tom Exp $")
++MODULE_ID("$Id: comp_scan.c,v 1.125 2024/12/07 21:17:54 tom Exp $")
+ 
+ /*
+  * Maximum length of string capability we'll accept before raising an error.
+@@ -70,7 +70,7 @@
+ 
+ NCURSES_EXPORT_VAR (struct token) _nc_curr_token =
+ {
+-    0, 0, 0
++    NULL, 0, NULL
+ };
+ 
+ /*****************************************************************************
+@@ -116,12 +116,12 @@
+        (T_CALLED("_nc_reset_input(fp=%p, buf=%p)"), (void *) fp, buf));
+ 
+     pushtype = NO_PUSHBACK;
+-    if (pushname != 0)
++    if (pushname != NULL)
+ 	pushname[0] = '\0';
+     yyin = fp;
+     bufstart = bufptr = buf;
+     _nc_curr_file_pos = 0L;
+-    if (fp != 0)
++    if (fp != NULL)
+ 	_nc_curr_line = 0;
+     _nc_curr_col = 0;
+ 
+@@ -197,18 +197,18 @@
+     int the_char;
+ 
+     if (!yyin) {
+-	if (result != 0) {
++	if (result != NULL) {
+ 	    FreeAndNull(result);
+ 	    FreeAndNull(pushname);
+-	    bufptr = 0;
+-	    bufstart = 0;
++	    bufptr = NULL;
++	    bufstart = NULL;
+ 	    allocated = 0;
+ 	}
+ 	/*
+ 	 * An string with an embedded null will truncate the input.  This is
+ 	 * intentional (we don't read binary files here).
+ 	 */
+-	if (bufptr == 0 || *bufptr == '\0')
++	if (bufptr == NULL || *bufptr == '\0')
+ 	    return (EOF);
+ 	if (*bufptr == '\n') {
+ 	    _nc_curr_line++;
+@@ -227,12 +227,12 @@
+ 
+ 	do {
+ 	    size_t used = 0;
+-	    bufstart = 0;
++	    bufstart = NULL;
+ 	    do {
+ 		if (used + (LEXBUFSIZ / 4) >= allocated) {
+ 		    allocated += (allocated + LEXBUFSIZ);
+ 		    result = typeRealloc(char, allocated, result);
+-		    if (result == 0)
++		    if (result == NULL)
+ 			return (EOF);
+ 		    if (bufstart)
+ 			bufstart = result;
+@@ -254,7 +254,7 @@
+ 		    if (used != 0)
+ 			_nc_STRCAT(result, "\n", allocated);
+ 		}
+-		if ((bufptr = bufstart) != 0) {
++		if ((bufptr = bufstart) != NULL) {
+ 		    used = strlen(bufptr);
+ 		    if (used == 0)
+ 			return (EOF);
+@@ -407,12 +407,12 @@
+     if (pushtype != NO_PUSHBACK) {
+ 	int retval = pushtype;
+ 
+-	_nc_set_type(pushname != 0 ? pushname : "");
++	_nc_set_type(pushname != NULL ? pushname : "");
+ 	DEBUG(3, ("pushed-back token: `%s', class %d",
+ 		  _nc_curr_token.tk_name, pushtype));
+ 
+ 	pushtype = NO_PUSHBACK;
+-	if (pushname != 0)
++	if (pushname != NULL)
+ 	    pushname[0] = '\0';
+ 
+ 	/* currtok wasn't altered by _nc_push_token() */
+@@ -421,11 +421,11 @@
+     }
+ 
+     if (end_of_stream()) {
+-	yyin = 0;
++	yyin = NULL;
+ 	(void) next_char();	/* frees its allocated memory */
+-	if (tok_buf != 0) {
++	if (tok_buf != NULL) {
+ 	    if (_nc_curr_token.tk_name == tok_buf)
+-		_nc_curr_token.tk_name = 0;
++		_nc_curr_token.tk_name = NULL;
+ 	}
+ 	DEBUG(3, (T_RETURN("%d"), EOF));
+ 	return (EOF);
+@@ -439,7 +439,7 @@
+     }
+ 
+     ch = eat_escaped_newline(ch);
+-    _nc_curr_token.tk_valstring = 0;
++    _nc_curr_token.tk_valstring = NULL;
+ 
+ #ifdef TRACE
+     old_line = _nc_curr_line;
+@@ -475,7 +475,7 @@
+ #if NCURSES_EXT_FUNCS
+ 	    && !(ch == '.' && _nc_disable_period)
+ #endif
+-	    && ((strchr) (terminfo_punct, (char) ch) == 0)) {
++	    && ((strchr) (terminfo_punct, (char) ch) == NULL)) {
+ 	    if (!silent)
+ 		_nc_warning("Illegal character (expected alphanumeric or %s) - '%s'",
+ 			    terminfo_punct, unctrl(UChar(ch)));
+@@ -483,7 +483,7 @@
+ 	    goto start_token;
+ 	}
+ 
+-	if (tok_buf == 0)
++	if (tok_buf == NULL)
+ 	    tok_buf = typeMalloc(char, TOK_BUF_SIZE);
+ 
+ #ifdef TRACE
+@@ -499,14 +499,14 @@
+ 	    _nc_start_line = _nc_curr_line;
+ 
+ 	    _nc_syntax = ERR;
+-	    after_name = 0;
+-	    after_list = 0;
++	    after_name = NULL;
++	    after_list = NULL;
+ 	    while ((ch = next_char()) != '\n') {
+ 		if (ch == EOF) {
+ 		    _nc_err_abort(MSG_NO_INPUTS);
+ 		} else if (ch == '|') {
+ 		    after_list = tok_ptr;
+-		    if (after_name == 0)
++		    if (after_name == NULL)
+ 			after_name = tok_ptr;
+ 		} else if (ch == ':' && last_char(0) != ',') {
+ 		    _nc_syntax = SYN_TERMCAP;
+@@ -519,7 +519,7 @@
+ 		     * If we did not see a '|', then we found a name with no
+ 		     * aliases or description.
+ 		     */
+-		    if (after_name == 0)
++		    if (after_name == NULL)
+ 			break;
+ 		    /*
+ 		     * We saw a comma, but are not entirely sure this is
+@@ -614,7 +614,7 @@
+ 	     * for following warning messages.  If there's no '|', then there
+ 	     * is no description.
+ 	     */
+-	    if (after_name != 0) {
++	    if (after_name != NULL) {
+ 		ch = *after_name;
+ 		*after_name = '\0';
+ 		_nc_set_type(tok_buf);
+@@ -625,11 +625,11 @@
+ 	     * Compute the boundary between the aliases and the description
+ 	     * field for syntax-checking purposes.
+ 	     */
+-	    if (after_list != 0) {
++	    if (after_list != NULL) {
+ 		if (!silent) {
+ 		    if (*after_list == '\0' || strchr("|", after_list[1]) != NULL) {
+ 			_nc_warning("empty longname field");
+-		    } else if (strchr(after_list, ' ') == 0) {
++		    } else if (strchr(after_list, ' ') == NULL) {
+ 			_nc_warning("older tic versions may treat the description field as an alias");
+ 		    }
+ 		}
+@@ -805,7 +805,7 @@
+ 	type = _nc_get_token(silent);
+ 
+     DEBUG(3, ("token: `%s', class %d",
+-	      ((_nc_curr_token.tk_name != 0)
++	      ((_nc_curr_token.tk_name != NULL)
+ 	       ? _nc_curr_token.tk_name
+ 	       : ""),
+ 	      type));
+@@ -1023,12 +1023,12 @@
+      * _nc_get_token() touches.
+      */
+     pushtype = tokclass;
+-    if (pushname == 0)
++    if (pushname == NULL)
+ 	pushname = typeMalloc(char, MAX_NAME_SIZE + 1);
+     _nc_get_type(pushname);
+ 
+     DEBUG(3, ("pushing token: `%s', class %d",
+-	      ((_nc_curr_token.tk_name != 0)
++	      ((_nc_curr_token.tk_name != NULL)
+ 	       ? _nc_curr_token.tk_name
+ 	       : ""),
+ 	      pushtype));
+@@ -1053,10 +1053,10 @@
+ NCURSES_EXPORT(void)
+ _nc_comp_scan_leaks(void)
+ {
+-    if (pushname != 0) {
++    if (pushname != NULL) {
+ 	FreeAndNull(pushname);
+     }
+-    if (tok_buf != 0) {
++    if (tok_buf != NULL) {
+ 	FreeAndNull(tok_buf);
+     }
+ }
+Index: ncurses/tinfo/db_iterator.c
+Prereq:  1.51 
+--- ncurses-6.5-20241130+/ncurses/tinfo/db_iterator.c	2024-07-27 19:22:23.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/db_iterator.c	2024-12-07 18:23:25.000000000 +0000
+@@ -44,7 +44,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: db_iterator.c,v 1.51 2024/07/27 19:22:23 tom Exp $")
++MODULE_ID("$Id: db_iterator.c,v 1.52 2024/12/07 18:23:25 tom Exp $")
+ 
+ #define HaveTicDirectory _nc_globals.have_tic_directory
+ #define KeepTicDirectory _nc_globals.keep_tic_directory
+@@ -127,12 +127,12 @@
+ 	const char *cached_value = my_vars[which].value;
+ 	bool same_value;
+ 
+-	if ((value = getenv(name)) != 0) {
++	if ((value = getenv(name)) != NULL) {
+ 	    value = strdup(value);
+ 	}
+-	same_value = ((value == 0 && cached_value == 0) ||
+-		      (value != 0 &&
+-		       cached_value != 0 &&
++	same_value = ((value == NULL && cached_value == NULL) ||
++		      (value != NULL &&
++		       cached_value != NULL &&
+ 		       strcmp(value, cached_value) == 0));
+ 
+ 	/* Set variable name to enable checks in cache_expired(). */
+@@ -153,7 +153,7 @@
+ static char *
+ cache_getenv(const char *name, DBDIRS which)
+ {
+-    char *result = 0;
++    char *result = NULL;
+ 
+     (void) update_getenv(name, which);
+     if (which < dbdLAST) {
+@@ -185,7 +185,7 @@
+     } else {
+ 	DBDIRS n;
+ 	for (n = (DBDIRS) 0; n < dbdLAST; ++n) {
+-	    if (my_vars[n].name != 0
++	    if (my_vars[n].name != NULL
+ 		&& update_getenv(my_vars[n].name, n)) {
+ 		result = TRUE;
+ 		break;
+@@ -225,7 +225,7 @@
+ 	} else if (HaveTicDirectory == 0) {
+ 	    if (use_terminfo_vars()) {
+ 		const char *envp;
+-		if ((envp = getenv("TERMINFO")) != 0)
++		if ((envp = getenv("TERMINFO")) != NULL)
+ 		    return _nc_tic_dir(envp);
+ 	    }
+ 	}
+@@ -251,7 +251,7 @@
+ NCURSES_EXPORT(void)
+ _nc_last_db(void)
+ {
+-    if (my_blob != 0 && cache_expired()) {
++    if (my_blob != NULL && cache_expired()) {
+ 	free_cache();
+     }
+ }
+@@ -268,14 +268,14 @@
+ 
+     (void) offset;
+     if ((int) *state < my_size
+-	&& my_list != 0
+-	&& my_list[*state] != 0) {
++	&& my_list != NULL
++	&& my_list[*state] != NULL) {
+ 	result = my_list[*state];
+ 	(*state)++;
+     } else {
+-	result = 0;
++	result = NULL;
+     }
+-    if (result != 0) {
++    if (result != NULL) {
+ 	T(("_nc_next_db %d %s", *state, result));
+     }
+     return result;
+@@ -293,7 +293,7 @@
+     /* build a blob containing all of the strings we will use for a lookup
+      * table.
+      */
+-    if (my_blob == 0 || (cache_has_expired = cache_expired())) {
++    if (my_blob == NULL || (cache_has_expired = cache_expired())) {
+ 	size_t blobsize = 0;
+ 	const char *values[dbdLAST];
+ 	struct stat *my_stat;
+@@ -303,7 +303,7 @@
+ 	    free_cache();
+ 
+ 	for (j = 0; j < dbdLAST; ++j)
+-	    values[j] = 0;
++	    values[j] = NULL;
+ 
+ 	/*
+ 	 * This is the first item in the list, and is used only when tic is
+@@ -344,13 +344,13 @@
+ 	}
+ 
+ 	for (j = 0; j < dbdLAST; ++j) {
+-	    if (values[j] == 0)
++	    if (values[j] == NULL)
+ 		values[j] = "";
+ 	    blobsize += 2 + strlen(values[j]);
+ 	}
+ 
+ 	my_blob = malloc(blobsize);
+-	if (my_blob != 0) {
++	if (my_blob != NULL) {
+ 	    *my_blob = '\0';
+ 	    for (j = 0; j < dbdLAST; ++j) {
+ 		add_to_blob(values[j], blobsize);
+@@ -366,7 +366,7 @@
+ 	    }
+ 	    my_list = typeCalloc(char *, blobsize);
+ 	    my_stat = typeCalloc(struct stat, blobsize);
+-	    if (my_list != 0 && my_stat != 0) {
++	    if (my_list != NULL && my_stat != NULL) {
+ 		int k = 0;
+ 		my_list[k++] = my_blob;
+ 		for (j = 0; my_blob[j] != '\0'; ++j) {
+@@ -381,11 +381,11 @@
+ 		/*
+ 		 * Eliminate duplicates from the list.
+ 		 */
+-		for (j = 0; my_list[j] != 0; ++j) {
++		for (j = 0; my_list[j] != NULL; ++j) {
+ #ifdef TERMINFO
+ 		    if (*my_list[j] == '\0') {
+ 			char *my_copy = strdup(TERMINFO);
+-			if (my_copy != 0)
++			if (my_copy != NULL)
+ 			    my_list[j] = my_copy;
+ 		    }
+ #endif
+@@ -394,7 +394,7 @@
+ 			if (!strcmp(my_list[j], my_list[k])) {
+ 			    T(("duplicate %s", my_list[j]));
+ 			    k = j - 1;
+-			    while ((my_list[j] = my_list[j + 1]) != 0) {
++			    while ((my_list[j] = my_list[j + 1]) != NULL) {
+ 				++j;
+ 			    }
+ 			    j = k;
+@@ -407,7 +407,7 @@
+ 		 * Eliminate non-existent databases, and those that happen to
+ 		 * be symlinked to another location.
+ 		 */
+-		for (j = 0; my_list[j] != 0; ++j) {
++		for (j = 0; my_list[j] != NULL; ++j) {
+ 		    bool found = check_existence(my_list[j], &my_stat[j]);
+ #if HAVE_LINK
+ 		    if (found) {
+@@ -423,7 +423,7 @@
+ 		    if (!found) {
+ 			T(("not found %s", my_list[j]));
+ 			k = j;
+-			while ((my_list[k] = my_list[k + 1]) != 0) {
++			while ((my_list[k] = my_list[k + 1]) != NULL) {
+ 			    ++k;
+ 			}
+ 			--j;
+@@ -446,14 +446,14 @@
+ {
+     DBDIRS which;
+ 
+-    if (my_blob != 0)
++    if (my_blob != NULL)
+ 	FreeAndNull(my_blob);
+-    if (my_list != 0)
++    if (my_list != NULL)
+ 	FreeAndNull(my_list);
+     for (which = 0; (int) which < dbdLAST; ++which) {
+-	my_vars[which].name = 0;
++	my_vars[which].name = NULL;
+ 	FreeIfNeeded(my_vars[which].value);
+-	my_vars[which].value = 0;
++	my_vars[which].value = NULL;
+     }
+     update_tic_dir(NULL);
+ }
+Index: ncurses/tinfo/doalloc.c
+Prereq:  1.14 
+--- ncurses-6.5-20241130+/ncurses/tinfo/doalloc.c	2021-04-24 23:43:39.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/doalloc.c	2024-12-07 20:05:08.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2002,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -40,7 +40,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: doalloc.c,v 1.14 2021/04/24 23:43:39 tom Exp $")
++MODULE_ID("$Id: doalloc.c,v 1.15 2024/12/07 20:05:08 tom Exp $")
+ 
+ void *
+ _nc_doalloc(void *oldp, size_t amount)
+@@ -51,7 +51,7 @@
+ 	if (amount == 0) {
+ 	    free(oldp);
+ 	    newp = NULL;
+-	} else if ((newp = realloc(oldp, amount)) == 0) {
++	} else if ((newp = realloc(oldp, amount)) == NULL) {
+ 	    free(oldp);
+ 	    errno = ENOMEM;	/* just in case 'free' reset */
+ 	}
+Index: ncurses/tinfo/entries.c
+Prereq:  1.37 
+--- ncurses-6.5-20241130+/ncurses/tinfo/entries.c	2024-10-19 21:23:31.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/entries.c	2024-12-07 18:23:25.000000000 +0000
+@@ -38,7 +38,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: entries.c,v 1.37 2024/10/19 21:23:31 tom Exp $")
++MODULE_ID("$Id: entries.c,v 1.38 2024/12/07 18:23:25 tom Exp $")
+ 
+ /****************************************************************************
+  *
+@@ -61,8 +61,8 @@
+  *	   _nc_head                _nc_tail
+  */
+ 
+-NCURSES_EXPORT_VAR(ENTRY *) _nc_head = 0;
+-NCURSES_EXPORT_VAR(ENTRY *) _nc_tail = 0;
++NCURSES_EXPORT_VAR(ENTRY *) _nc_head = NULL;
++NCURSES_EXPORT_VAR(ENTRY *) _nc_tail = NULL;
+ 
+ static ENTRY *
+ _nc_delink_entry(ENTRY * headp, const TERMTYPE2 *const tterm)
+@@ -70,12 +70,12 @@
+ {
+     ENTRY *ep, *last;
+ 
+-    for (last = 0, ep = headp; ep != 0; last = ep, ep = ep->next) {
++    for (last = NULL, ep = headp; ep != NULL; last = ep, ep = ep->next) {
+ 	if (&(ep->tterm) == tterm) {
+-	    if (last != 0) {
++	    if (last != NULL) {
+ 		last->next = ep->next;
+ 	    }
+-	    if (ep->next != 0) {
++	    if (ep->next != NULL) {
+ 		ep->next->last = last;
+ 	    }
+ 	    if (ep == _nc_head) {
+@@ -96,7 +96,7 @@
+ {
+     ENTRY *ep;
+ 
+-    if ((ep = _nc_delink_entry(headp, tterm)) != 0) {
++    if ((ep = _nc_delink_entry(headp, tterm)) != NULL) {
+ 	free(ep);
+     }
+ }
+@@ -107,7 +107,7 @@
+ {
+     (void) headp;		/* unused - _nc_head is altered here! */
+ 
+-    while (_nc_head != 0) {
++    while (_nc_head != NULL) {
+ 	_nc_free_termtype2(&(_nc_head->tterm));
+     }
+ }
+@@ -141,7 +141,7 @@
+     }
+     _nc_unlock_global(screen);
+ #endif
+-    if (TerminalOf(CURRENT_SCREEN) != 0) {
++    if (TerminalOf(CURRENT_SCREEN) != NULL) {
+ 	del_curterm(TerminalOf(CURRENT_SCREEN));
+     }
+     _nc_forget_prescr();
+@@ -149,8 +149,8 @@
+     _nc_comp_captab_leaks();
+     _nc_comp_userdefs_leaks();
+     _nc_free_entries(_nc_head);
+-    _nc_get_type(0);
+-    _nc_first_name(0);
++    _nc_get_type(NULL);
++    _nc_first_name(NULL);
+     _nc_db_iterator_leaks();
+     _nc_keyname_leaks();
+ #if BROKEN_LINKER || USE_REENTRANT
+@@ -160,7 +160,7 @@
+ #endif
+     _nc_comp_error_leaks();
+ 
+-    if ((s = _nc_home_terminfo()) != 0)
++    if ((s = _nc_home_terminfo()) != NULL)
+ 	free(s);
+ 
+ #ifdef TRACE
+Index: ncurses/tinfo/getenv_num.c
+Prereq:  1.9 
+--- ncurses-6.5-20241130+/ncurses/tinfo/getenv_num.c	2024-07-27 19:23:59.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/getenv_num.c	2024-12-07 18:14:49.000000000 +0000
+@@ -37,16 +37,16 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: getenv_num.c,v 1.9 2024/07/27 19:23:59 tom Exp $")
++MODULE_ID("$Id: getenv_num.c,v 1.10 2024/12/07 18:14:49 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ _nc_getenv_num(const char *name)
+ {
+-    char *dst = 0;
++    char *dst = NULL;
+     const char *src = getenv(name);
+     long value;
+ 
+-    if ((src == 0)
++    if ((src == NULL)
+ 	|| (value = strtol(src, &dst, 0)) < 0
+ 	|| (dst == src)
+ 	|| (*dst != '\0')
+@@ -59,7 +59,7 @@
+ NCURSES_EXPORT(void)
+ _nc_setenv_num(const char *name, int value)
+ {
+-    if (name != 0 && value >= 0) {
++    if (name != NULL && value >= 0) {
+ 	char buffer[128];
+ #if HAVE_SETENV
+ 	_nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) "%d", value);
+Index: ncurses/tinfo/home_terminfo.c
+Prereq:  1.18 
+--- ncurses-6.5-20241130+/ncurses/tinfo/home_terminfo.c	2024-07-27 19:23:21.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/home_terminfo.c	2024-12-07 18:14:49.000000000 +0000
+@@ -38,7 +38,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: home_terminfo.c,v 1.18 2024/07/27 19:23:21 tom Exp $")
++MODULE_ID("$Id: home_terminfo.c,v 1.19 2024/12/07 18:14:49 tom Exp $")
+ 
+ /* ncurses extension...fall back on user's private directory */
+ 
+@@ -47,14 +47,14 @@
+ NCURSES_EXPORT(char *)
+ _nc_home_terminfo(void)
+ {
+-    char *result = 0;
++    char *result = NULL;
+ #if USE_HOME_TERMINFO
+     if (use_terminfo_vars()) {
+ 
+-	if (MyBuffer == 0) {
++	if (MyBuffer == NULL) {
+ 	    const char *home;
+ 
+-	    if ((home = getenv("HOME")) != 0) {
++	    if ((home = getenv("HOME")) != NULL) {
+ 		size_t want = (strlen(home) + sizeof(PRIVATE_INFO));
+ 		TYPE_MALLOC(char, want, MyBuffer);
+ 		_nc_SPRINTF(MyBuffer, _nc_SLIMIT(want) PRIVATE_INFO, home);
+Index: ncurses/tinfo/init_keytry.c
+Prereq:  1.21 
+--- ncurses-6.5-20241130+/ncurses/tinfo/init_keytry.c	2024-07-27 19:23:59.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/init_keytry.c	2024-12-07 18:14:49.000000000 +0000
+@@ -30,7 +30,7 @@
+ #include 
+ #include 		/* struct tinfo_fkeys */
+ 
+-MODULE_ID("$Id: init_keytry.c,v 1.21 2024/07/27 19:23:59 tom Exp $")
++MODULE_ID("$Id: init_keytry.c,v 1.22 2024/12/07 18:14:49 tom Exp $")
+ 
+ /*
+ **      _nc_init_keytry()
+@@ -74,7 +74,7 @@
+      * mouse_activate() (which will call keyok()) are first called.
+      */
+ 
+-    if (sp != 0) {
++    if (sp != NULL) {
+ 	unsigned n;
+ 
+ 	for (n = 0; _nc_tinfo_fkeys[n].code; n++) {
+@@ -95,7 +95,7 @@
+ 	    for (n = STRCOUNT; n < NUM_STRINGS(tp); ++n) {
+ 		const char *name = ExtStrname(tp, (int) n, strnames);
+ 		const char *value = tp->Strings[n];
+-		if (name != 0
++		if (name != NULL
+ 		    && *name == 'k'
+ 		    && VALID_STRING(value)
+ 		    && NCURSES_SP_NAME(key_defined) (NCURSES_SP_ARGx
+Index: ncurses/tinfo/lib_acs.c
+Prereq:  1.50 
+--- ncurses-6.5-20241130+/ncurses/tinfo/lib_acs.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/lib_acs.c	2024-12-07 20:05:08.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2019,2020 Thomas E. Dickey                                *
++ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -40,7 +40,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_acs.c,v 1.50 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_acs.c,v 1.51 2024/12/07 20:05:08 tom Exp $")
+ 
+ #if BROKEN_LINKER || USE_REENTRANT
+ #define MyBuffer _nc_prescreen.real_acs_map
+@@ -81,7 +81,7 @@
+ NCURSES_SP_NAME(_nc_init_acs) (NCURSES_SP_DCL0)
+ {
+     chtype *fake_map = acs_map;
+-    chtype *real_map = SP_PARM != 0 ? SP_PARM->_acs_map : fake_map;
++    chtype *real_map = SP_PARM != NULL ? SP_PARM->_acs_map : fake_map;
+     int j;
+ 
+     T(("initializing ACS map"));
+@@ -183,7 +183,7 @@
+      *
+      * test/blue.c uses this feature.
+      */
+-#define PCH_KLUDGE(a,b) (a != 0 && b != 0 && !strcmp(a,b))
++#define PCH_KLUDGE(a,b) (a != NULL && b != NULL && !strcmp(a,b))
+     if (PCH_KLUDGE(enter_pc_charset_mode, enter_alt_charset_mode) &&
+ 	PCH_KLUDGE(exit_pc_charset_mode, exit_alt_charset_mode)) {
+ 	size_t i;
+@@ -191,7 +191,7 @@
+ 	    if (real_map[i] == 0) {
+ 		real_map[i] = (chtype) i;
+ 		if (real_map != fake_map) {
+-		    if (SP != 0)
++		    if (SP != NULL)
+ 			SP->_screen_acs_map[i] = TRUE;
+ 		}
+ 	    }
+@@ -210,7 +210,7 @@
+ 		   (int) i,
+ 		   _tracechar(UChar(acs_chars[i])),
+ 		   _tracechtype(real_map[UChar(acs_chars[i])])));
+-		if (SP != 0) {
++		if (SP != NULL) {
+ 		    SP->_screen_acs_map[UChar(acs_chars[i])] = TRUE;
+ 		}
+ 	    }
+Index: ncurses/tinfo/lib_baudrate.c
+Prereq:  1.45 
+--- ncurses-6.5-20241130+/ncurses/tinfo/lib_baudrate.c	2020-09-05 21:15:32.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/lib_baudrate.c	2024-12-07 20:05:08.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -84,7 +84,7 @@
+ #undef USE_OLD_TTY
+ #endif /* USE_OLD_TTY */
+ 
+-MODULE_ID("$Id: lib_baudrate.c,v 1.45 2020/09/05 21:15:32 tom Exp $")
++MODULE_ID("$Id: lib_baudrate.c,v 1.46 2024/12/07 20:05:08 tom Exp $")
+ 
+ /*
+  *	int
+@@ -279,7 +279,7 @@
+ #ifdef TRACE
+     if (IsValidTIScreen(SP_PARM)
+ 	&& !NC_ISATTY(fileno((SP_PARM && SP_PARM->_ofp) ? SP_PARM->_ofp : stdout))
+-	&& getenv("BAUDRATE") != 0) {
++	&& getenv("BAUDRATE") != NULL) {
+ 	int ret;
+ 	if ((ret = _nc_getenv_num("BAUDRATE")) <= 0)
+ 	    ret = 9600;
+Index: ncurses/tinfo/lib_cur_term.c
+Prereq:  1.49 
+--- ncurses-6.5-20241130+/ncurses/tinfo/lib_cur_term.c	2022-05-28 17:56:55.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/lib_cur_term.c	2024-12-07 20:05:08.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+-,* Copyright 2020-2021,2022 Thomas E. Dickey                                *
++,* Copyright 2020-2022,2024 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.49 2022/05/28 17:56:55 tom Exp $")
++MODULE_ID("$Id: lib_cur_term.c,v 1.50 2024/12/07 20:05:08 tom Exp $")
+ 
+ #undef CUR
+ #define CUR TerminalType(termp).
+@@ -74,7 +74,7 @@
+ }
+ 
+ #else
+-NCURSES_EXPORT_VAR(TERMINAL *) cur_term = 0;
++NCURSES_EXPORT_VAR(TERMINAL *) cur_term = NULL;
+ #endif
+ 
+ NCURSES_EXPORT(TERMINAL *)
+@@ -93,7 +93,7 @@
+ #else
+     cur_term = termp;
+ #endif
+-    if (termp != 0) {
++    if (termp != NULL) {
+ #ifdef USE_TERM_DRIVER
+ 	TERMINAL_CONTROL_BLOCK *TCB = (TERMINAL_CONTROL_BLOCK *) termp;
+ 	ospeed = (NCURSES_OSPEED) _nc_ospeed(termp->_baudrate);
+@@ -134,7 +134,7 @@
+ 
+     T((T_CALLED("del_curterm(%p, %p)"), (void *) SP_PARM, (void *) termp));
+ 
+-    if (termp != 0) {
++    if (termp != NULL) {
+ #ifdef USE_TERM_DRIVER
+ 	TERMINAL_CONTROL_BLOCK *TCB = (TERMINAL_CONTROL_BLOCK *) termp;
+ #endif
+@@ -155,11 +155,11 @@
+ #endif
+ 	_nc_free_termtype2(&TerminalType(termp));
+ 	if (termp == cur)
+-	    NCURSES_SP_NAME(set_curterm) (NCURSES_SP_ARGx 0);
++	    NCURSES_SP_NAME(set_curterm) (NCURSES_SP_ARGx NULL);
+ 
+ 	FreeIfNeeded(termp->_termname);
+ #if USE_HOME_TERMINFO
+-	if (_nc_globals.home_terminfo != 0) {
++	if (_nc_globals.home_terminfo != NULL) {
+ 	    FreeAndNull(_nc_globals.home_terminfo);
+ 	}
+ #endif
+Index: ncurses/tinfo/lib_data.c
+Prereq:  1.89 
+--- ncurses-6.5-20241130+/ncurses/tinfo/lib_data.c	2024-02-24 18:11:38.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/lib_data.c	2024-12-07 18:23:25.000000000 +0000
+@@ -43,7 +43,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_data.c,v 1.89 2024/02/24 18:11:38 tom Exp $")
++MODULE_ID("$Id: lib_data.c,v 1.90 2024/12/07 18:23:25 tom Exp $")
+ 
+ /*
+  * OS/2's native linker complains if we don't initialize public data when
+@@ -66,12 +66,12 @@
+     return CURRENT_SCREEN ? NewScreen(CURRENT_SCREEN) : 0;
+ }
+ #else
+-NCURSES_EXPORT_VAR(WINDOW *) stdscr = 0;
+-NCURSES_EXPORT_VAR(WINDOW *) curscr = 0;
+-NCURSES_EXPORT_VAR(WINDOW *) newscr = 0;
++NCURSES_EXPORT_VAR(WINDOW *) stdscr = NULL;
++NCURSES_EXPORT_VAR(WINDOW *) curscr = NULL;
++NCURSES_EXPORT_VAR(WINDOW *) newscr = NULL;
+ #endif
+ 
+-NCURSES_EXPORT_VAR(SCREEN *) _nc_screen_chain = 0;
++NCURSES_EXPORT_VAR(SCREEN *) _nc_screen_chain = NULL;
+ 
+ /*
+  * The variable 'SP' will be defined as a function on systems that cannot link
+@@ -129,7 +129,7 @@
+ 
+     FALSE,			/* have_tic_directory */
+     FALSE,			/* keep_tic_directory */
+-    0,				/* tic_directory */
++    NULL,			/* tic_directory */
+ 
+     NULL,			/* dbi_list */
+     0,				/* dbi_size */
+@@ -150,11 +150,11 @@
+     0,				/* tgetent_sequence */
+     0,				/* terminal_count */
+ 
+-    0,				/* dbd_blob */
+-    0,				/* dbd_list */
++    NULL,			/* dbd_blob */
++    NULL,			/* dbd_list */
+     0,				/* dbd_size */
+     0,				/* dbd_time */
+-    { { 0, 0 } },		/* dbd_vars */
++    { { NULL, NULL } },		/* dbd_vars */
+ 
+ #if HAVE_TSEARCH
+     NULL,			/* cached_tparm */
+@@ -230,7 +230,7 @@
+ #define STACK_FRAME_0s	{ STACK_FRAME_0 }
+ #define NUM_VARS_0s	{ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ 
+-#define RIPOFF_0	{ 0,0,0 }
++#define RIPOFF_0	{ NULL,0,NULL }
+ #define RIPOFF_0s	{ RIPOFF_0 }
+ 
+ NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen = {
+@@ -258,7 +258,7 @@
+     },
+     NULL,			/* saved_tty */
+     FALSE,			/* use_tioctl */
+-    0,				/* _outch */
++    NULL,			/* _outch */
+ #ifndef USE_SP_RIPOFF
+     RIPOFF_0s,			/* ripoff */
+     NULL,			/* rsp */
+@@ -291,9 +291,9 @@
+ NCURSES_EXPORT(SCREEN *)
+ _nc_screen_of(WINDOW *win)
+ {
+-    SCREEN *sp = 0;
++    SCREEN *sp = NULL;
+ 
+-    if (win != 0) {
++    if (win != NULL) {
+ 	sp = WINDOW_EXT(win, screen);
+     }
+     return (sp);
+Index: ncurses/tinfo/lib_kernel.c
+Prereq:  1.36 
+--- ncurses-6.5-20241130+/ncurses/tinfo/lib_kernel.c	2023-06-10 13:29:06.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/lib_kernel.c	2024-12-07 20:05:08.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -49,7 +49,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_kernel.c,v 1.36 2023/06/10 13:29:06 tom Exp $")
++MODULE_ID("$Id: lib_kernel.c,v 1.37 2024/12/07 20:05:08 tom Exp $")
+ 
+ #ifdef TERMIOS
+ static int
+@@ -89,7 +89,7 @@
+ 
+     T((T_CALLED("erasechar(%p)"), (void *) SP_PARM));
+ 
+-    if (termp != 0) {
++    if (termp != NULL) {
+ #ifdef TERMIOS
+ 	result = termp->Ottyb.c_cc[VERASE];
+ 	if (result == _nc_vdisable())
+@@ -126,7 +126,7 @@
+ 
+     T((T_CALLED("killchar(%p)"), (void *) SP_PARM));
+ 
+-    if (termp != 0) {
++    if (termp != NULL) {
+ #ifdef TERMIOS
+ 	result = termp->Ottyb.c_cc[VKILL];
+ 	if (result == _nc_vdisable())
+@@ -177,7 +177,7 @@
+ {
+     T((T_CALLED("flushinp(%p)"), (void *) SP_PARM));
+ 
+-    if (SP_PARM != 0) {
++    if (SP_PARM != NULL) {
+ 	if (NC_ISATTY(SP_PARM->_ifd))
+ 	    flush_input(SP_PARM->_ifd);
+ 	else if (NC_ISATTY(SP_PARM->_ofd))
+Index: ncurses/tinfo/lib_options.c
+Prereq:  1.84 
+--- ncurses-6.5-20241130+/ncurses/tinfo/lib_options.c	2024-11-23 19:17:25.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/lib_options.c	2024-12-07 18:24:47.000000000 +0000
+@@ -47,7 +47,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_options.c,v 1.84 2024/11/23 19:17:25 tom Exp $")
++MODULE_ID("$Id: lib_options.c,v 1.85 2024/12/07 18:24:47 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ idlok(WINDOW *win, bool flag)
+@@ -57,7 +57,7 @@
+ 
+     if (win) {
+ 	SCREEN *sp = _nc_screen_of(win);
+-	if (sp != 0
++	if (sp != NULL
+ #ifdef USE_TERM_DRIVER
+ 	    && IsTermInfo(sp)
+ #endif
+@@ -158,14 +158,14 @@
+ meta(WINDOW *win GCC_UNUSED, bool flag)
+ {
+     int result = ERR;
+-    SCREEN *sp = (win == 0) ? CURRENT_SCREEN : _nc_screen_of(win);
++    SCREEN *sp = (win == NULL) ? CURRENT_SCREEN : _nc_screen_of(win);
+ 
+     /* Ok, we stay relaxed and don't signal an error if win is NULL */
+     T((T_CALLED("meta(%p,%d)"), (void *) win, flag));
+ 
+     /* Ok, we stay relaxed and don't signal an error if win is NULL */
+ 
+-    if (sp != 0) {
++    if (sp != NULL) {
+ 	sp->_use_meta = flag;
+ #ifdef USE_TERM_DRIVER
+ 	if (IsTermInfo(sp)) {
+@@ -195,7 +195,7 @@
+     int code = ERR;
+     T((T_CALLED("curs_set(%p,%d)"), (void *) SP_PARM, vis));
+ 
+-    if (SP_PARM != 0 && vis >= 0 && vis <= 2) {
++    if (SP_PARM != NULL && vis >= 0 && vis <= 2) {
+ 	int cursor = SP_PARM->_cursor;
+ 	if (vis == cursor) {
+ 	    code = cursor;
+@@ -269,7 +269,7 @@
+ static int
+ has_key_internal(int keycode, TRIES * tp)
+ {
+-    if (tp == 0)
++    if (tp == NULL)
+ 	return (FALSE);
+     else if (tp->value == keycode)
+ 	return (TRUE);
+@@ -290,7 +290,7 @@
+ NCURSES_SP_NAME(has_key) (NCURSES_SP_DCLx int keycode)
+ {
+     T((T_CALLED("has_key(%p,%d)"), (void *) SP_PARM, keycode));
+-    returnCode(SP != 0 ? has_key_internal(keycode, SP_PARM->_keytry) : FALSE);
++    returnCode(SP != NULL ? has_key_internal(keycode, SP_PARM->_keytry) : FALSE);
+ }
+ 
+ #if NCURSES_SP_FUNCS
+@@ -334,7 +334,7 @@
+ {
+     int rc = ERR;
+ 
+-    if (sp != 0) {
++    if (sp != NULL) {
+ #ifdef USE_PTHREADS
+ 	/*
+ 	 * We might have this situation in a multithreaded application that
+Index: ncurses/tinfo/lib_print.c
+Prereq:  1.33 
+--- ncurses-6.5-20241130+/ncurses/tinfo/lib_print.c	2024-08-31 10:46:01.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/lib_print.c	2024-12-07 18:05:04.000000000 +0000
+@@ -40,7 +40,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_print.c,v 1.33 2024/08/31 10:46:01 Rafael.Kitover Exp $")
++MODULE_ID("$Id: lib_print.c,v 1.34 2024/12/07 18:05:04 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ NCURSES_SP_NAME(mcprint) (NCURSES_SP_DCLx char *data, int len)
+@@ -72,8 +72,8 @@
+ 
+     need = onsize + (size_t) len + offsize;
+ 
+-    if (switchon == 0
+-	|| (mybuf = typeMalloc(char, need + 1)) == 0) {
++    if (switchon == NULL
++	|| (mybuf = typeMalloc(char, need + 1)) == NULL) {
+ 	free(mybuf);
+ 	errno = ENOMEM;
+ 	return (ERR);
+Index: ncurses/tinfo/lib_raw.c
+Prereq:  1.31 
+--- ncurses-6.5-20241130+/ncurses/tinfo/lib_raw.c	2024-05-25 20:18:20.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/lib_raw.c	2024-12-07 18:24:47.000000000 +0000
+@@ -50,7 +50,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_raw.c,v 1.31 2024/05/25 20:18:20 Branden.Robinson Exp $")
++MODULE_ID("$Id: lib_raw.c,v 1.32 2024/12/07 18:24:47 tom Exp $")
+ 
+ #if HAVE_SYS_TERMIO_H
+ #include 		/* needed for ISC */
+@@ -85,7 +85,7 @@
+     TERMINAL *termp;
+ 
+     T((T_CALLED("raw(%p)"), (void *) SP_PARM));
+-    if ((termp = TerminalOf(SP_PARM)) != 0) {
++    if ((termp = TerminalOf(SP_PARM)) != NULL) {
+ 	TTY buf;
+ 
+ 	BEFORE("raw");
+@@ -141,7 +141,7 @@
+     TERMINAL *termp;
+ 
+     T((T_CALLED("cbreak(%p)"), (void *) SP_PARM));
+-    if ((termp = TerminalOf(SP_PARM)) != 0) {
++    if ((termp = TerminalOf(SP_PARM)) != NULL) {
+ 	TTY buf;
+ 
+ 	BEFORE("cbreak");
+@@ -185,7 +185,7 @@
+     TERMINAL *termp;
+ 
+     T((T_CALLED("qiflush(%p)"), (void *) SP_PARM));
+-    if ((termp = TerminalOf(SP_PARM)) != 0) {
++    if ((termp = TerminalOf(SP_PARM)) != NULL) {
+ 	TTY buf;
+ 	int result;
+ 
+@@ -220,7 +220,7 @@
+     TERMINAL *termp;
+ 
+     T((T_CALLED("noraw(%p)"), (void *) SP_PARM));
+-    if ((termp = TerminalOf(SP_PARM)) != 0) {
++    if ((termp = TerminalOf(SP_PARM)) != NULL) {
+ 	TTY buf;
+ 
+ 	BEFORE("noraw");
+@@ -275,7 +275,7 @@
+     TERMINAL *termp;
+ 
+     T((T_CALLED("nocbreak(%p)"), (void *) SP_PARM));
+-    if ((termp = TerminalOf(SP_PARM)) != 0) {
++    if ((termp = TerminalOf(SP_PARM)) != NULL) {
+ 	TTY buf;
+ 
+ 	BEFORE("nocbreak");
+@@ -316,7 +316,7 @@
+     TERMINAL *termp;
+ 
+     T((T_CALLED("noqiflush(%p)"), (void *) SP_PARM));
+-    if ((termp = TerminalOf(SP_PARM)) != 0) {
++    if ((termp = TerminalOf(SP_PARM)) != NULL) {
+ 	TTY buf;
+ 	int result;
+ 
+@@ -354,10 +354,10 @@
+     TERMINAL *termp;
+ 
+     T((T_CALLED("intrflush(%p,%d)"), (void *) SP_PARM, flag));
+-    if (SP_PARM == 0)
++    if (SP_PARM == NULL)
+ 	returnCode(ERR);
+ 
+-    if ((termp = TerminalOf(SP_PARM)) != 0) {
++    if ((termp = TerminalOf(SP_PARM)) != NULL) {
+ 	TTY buf;
+ 
+ 	BEFORE("intrflush");
+Index: ncurses/tinfo/lib_setup.c
+Prereq:  1.246 
+--- ncurses-6.5-20241130+/ncurses/tinfo/lib_setup.c	2024-11-23 18:32:54.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/lib_setup.c	2024-12-07 20:21:01.000000000 +0000
+@@ -49,7 +49,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: lib_setup.c,v 1.246 2024/11/23 18:32:54 tom Exp $")
++MODULE_ID("$Id: lib_setup.c,v 1.247 2024/12/07 20:21:01 tom Exp $")
+ 
+ /****************************************************************************
+  *
+@@ -533,7 +533,7 @@
+ 	    errno = 0;
+ 	    do {
+ 		if (ioctl(cur_term->Filedes, IOCTL_WINSIZE, &size) >= 0) {
+-		    *linep = ((sp != 0 && sp->_filtered)
++		    *linep = ((sp != NULL && sp->_filtered)
+ 			      ? 1
+ 			      : WINSIZE_ROWS(size));
+ 		    *colp = WINSIZE_COLS(size);
+@@ -553,7 +553,8 @@
+ 		/*
+ 		 * If environment variables are used, update them.
+ 		 */
+-		if ((sp == 0 || !sp->_filtered) && _nc_getenv_num("LINES") > 0) {
++		if ((sp == NULL || !sp->_filtered) &&
++		    _nc_getenv_num("LINES") > 0) {
+ 		    _nc_setenv_num("LINES", *linep);
+ 		}
+ 		if (_nc_getenv_num("COLUMNS") > 0) {
+@@ -636,17 +637,17 @@
+     int old_cols = columns;
+ #endif
+ 
+-    if (sp != 0) {
++    if (sp != NULL) {
+ 	TINFO_GET_SIZE(sp, sp->_term, &new_lines, &new_cols);
+ 	/*
+ 	 * See is_term_resized() and resizeterm().
+ 	 * We're doing it this way because those functions belong to the upper
+ 	 * ncurses library, while this resides in the lower terminfo library.
+ 	 */
+-	if (sp->_resize != 0) {
++	if (sp->_resize != NULL) {
+ 	    if ((new_lines != old_lines) || (new_cols != old_cols)) {
+ 		sp->_resize(NCURSES_SP_ARGx new_lines, new_cols);
+-	    } else if (sp->_sig_winch && (sp->_ungetch != 0)) {
++	    } else if (sp->_sig_winch && (sp->_ungetch != NULL)) {
+ 		sp->_ungetch(SP_PARM, KEY_RESIZE);	/* so application can know this */
+ 	    }
+ 	    sp->_sig_winch = FALSE;
+@@ -708,7 +709,7 @@
+      * since it is fairly common for developers to set the C compiler
+      * name as an environment variable - using the same symbol.
+      */
+-    if ((tmp = getenv("CC")) != 0 && strlen(tmp) == 1) {
++    if ((tmp = getenv("CC")) != NULL && strlen(tmp) == 1) {
+ 	unsigned i;
+ 	char CC = *tmp;
+ 
+@@ -736,7 +737,7 @@
+      * This is preferable to using getenv() since it ensures that we are using
+      * the locale which was actually initialized by the application.
+      */
+-    env = setlocale(LC_CTYPE, 0);
++    env = setlocale(LC_CTYPE, NULL);
+ #else
+     if (((env = getenv("LANG")) != 0 && *env != '\0')
+ 	|| ((env = getenv("LC_CTYPE")) != 0 && *env != '\0')
+@@ -778,8 +779,8 @@
+     return result;
+ }
+ 
+-#define CONTROL_N(s) ((s) != 0 && strstr(s, "\016") != 0)
+-#define CONTROL_O(s) ((s) != 0 && strstr(s, "\017") != 0)
++#define CONTROL_N(s) ((s) != NULL && strstr(s, "\016") != NULL)
++#define CONTROL_O(s) ((s) != NULL && strstr(s, "\017") != NULL)
+ 
+ /*
+  * Check for known broken cases where a UTF-8 locale breaks the alternate
+@@ -794,17 +795,17 @@
+     int result = 0;
+ 
+     T((T_CALLED("_nc_locale_breaks_acs:%d"), result));
+-    if (getenv(env_name) != 0) {
++    if (getenv(env_name) != NULL) {
+ 	result = _nc_getenv_num(env_name);
+     } else if ((value = tigetnum("U8")) >= 0) {
+ 	result = value;		/* use extension feature */
+-    } else if ((env = getenv("TERM")) != 0) {
++    } else if ((env = getenv("TERM")) != NULL) {
+ 	if (strstr(env, "linux")) {
+ 	    result = 1;		/* always broken */
+-	} else if (strstr(env, "screen") != 0
+-		   && ((env = getenv("TERMCAP")) != 0
+-		       && strstr(env, "screen") != 0)
+-		   && strstr(env, "hhII00") != 0) {
++	} else if (strstr(env, "screen") != NULL
++		   && ((env = getenv("TERMCAP")) != NULL
++		       && strstr(env, "screen") != NULL)
++		   && strstr(env, "hhII00") != NULL) {
+ 	    if (CONTROL_N(enter_alt_charset_mode) ||
+ 		CONTROL_O(enter_alt_charset_mode) ||
+ 		CONTROL_N(set_attributes) ||
+@@ -827,7 +828,7 @@
+     TERMINAL_CONTROL_BLOCK *TCB = 0;
+ #endif
+     TERMINAL *termp;
+-    SCREEN *sp = 0;
++    SCREEN *sp = NULL;
+     char *myname;
+     int code = ERR;
+ 
+@@ -847,7 +848,7 @@
+     T((T_CALLED("setupterm(%s,%d,%p)"), _nc_visbuf(tname), Filedes, (void *) errret));
+ #endif
+ 
+-    if (tname == 0) {
++    if (tname == NULL) {
+ 	tname = getenv("TERM");
+ #if defined(EXP_WIN32_DRIVER)
+ 	if (!VALID_TERM_ENV(tname, NO_TERMINAL)) {
+@@ -902,9 +903,9 @@
+      * properly with this feature).
+      */
+     if (reuse
+-	&& (termp != 0)
++	&& (termp != NULL)
+ 	&& termp->Filedes == Filedes
+-	&& termp->_termname != 0
++	&& termp->_termname != NULL
+ 	&& !strcmp(termp->_termname, myname)
+ 	&& _nc_name_match(TerminalType(termp).term_names, myname, "|")) {
+ 	T(("reusing existing terminal information and mode-settings"));
+@@ -923,7 +924,7 @@
+ 
+ 	termp = typeCalloc(TERMINAL, 1);
+ #endif
+-	if (termp == 0) {
++	if (termp == NULL) {
+ 	    ret_error1(TGETENT_ERR,
+ 		       "Not enough memory to create terminal structure.\n",
+ 		       myname, free(myname));
+@@ -1129,10 +1130,10 @@
+     T((T_CALLED("new_prescr()")));
+ 
+     _nc_lock_global(screen);
+-    if ((sp = _nc_find_prescr()) == 0) {
++    if ((sp = _nc_find_prescr()) == NULL) {
+ 	sp = _nc_alloc_screen_sp();
+ 	T(("_nc_alloc_screen_sp %p", (void *) sp));
+-	if (sp != 0) {
++	if (sp != NULL) {
+ #ifdef USE_PTHREADS
+ 	    PRESCREEN_LIST *p = typeCalloc(PRESCREEN_LIST, 1);
+ 	    if (p != 0) {
+@@ -1151,7 +1152,7 @@
+ 	    sp->_no_padding = _nc_prescreen._no_padding;
+ #endif
+ 	    sp->slk_format = 0;
+-	    sp->_slk = 0;
++	    sp->_slk = NULL;
+ 	    sp->_prescreen = TRUE;
+ 	    SP_PRE_INIT(sp);
+ #if USE_REENTRANT
+Index: ncurses/tinfo/lib_termcap.c
+Prereq:  1.90 
+--- ncurses-6.5-20241130+/ncurses/tinfo/lib_termcap.c	2024-07-27 19:22:23.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/lib_termcap.c	2024-12-07 18:26:04.000000000 +0000
+@@ -49,10 +49,10 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_termcap.c,v 1.90 2024/07/27 19:22:23 tom Exp $")
++MODULE_ID("$Id: lib_termcap.c,v 1.91 2024/12/07 18:26:04 tom Exp $")
+ 
+-NCURSES_EXPORT_VAR(char *) UP = 0;
+-NCURSES_EXPORT_VAR(char *) BC = 0;
++NCURSES_EXPORT_VAR(char *) UP = NULL;
++NCURSES_EXPORT_VAR(char *) BC = NULL;
+ 
+ #define MyCache  _nc_globals.tgetent_cache
+ #define CacheInx _nc_globals.tgetent_index
+@@ -125,18 +125,18 @@
+ 	bool same_result = (MyCache[n].last_used && MyCache[n].last_bufp == bufp);
+ 	if (same_result) {
+ 	    CacheInx = n;
+-	    if (FIX_SGR0 != 0) {
++	    if (FIX_SGR0 != NULL) {
+ 		FreeAndNull(FIX_SGR0);
+ 	    }
+ 	    /*
+ 	     * Also free the terminfo data that we loaded (much bigger leak).
+ 	     */
+-	    if (LAST_TRM != 0 && LAST_TRM != TerminalOf(SP_PARM)) {
++	    if (LAST_TRM != NULL && LAST_TRM != TerminalOf(SP_PARM)) {
+ 		const TERMINAL *trm = LAST_TRM;
+ 		NCURSES_SP_NAME(del_curterm) (NCURSES_SP_ARGx LAST_TRM);
+ 		for (CacheInx = 0; CacheInx < TGETENT_MAX; ++CacheInx)
+ 		    if (LAST_TRM == trm)
+-			LAST_TRM = 0;
++			LAST_TRM = NULL;
+ 		CacheInx = n;
+ 	    }
+ 	    found_cache = TRUE;
+@@ -157,13 +157,13 @@
+ 	LAST_TRM = TerminalOf(SP_PARM);
+ 	LAST_SEQ = ++CacheSeq;
+     } else {
+-	LAST_TRM = 0;
++	LAST_TRM = NULL;
+     }
+ 
+     PC = 0;
+-    UP = 0;
+-    BC = 0;
+-    FIX_SGR0 = 0;		/* don't free it - application may still use */
++    UP = NULL;
++    BC = NULL;
++    FIX_SGR0 = NULL;		/* don't free it - application may still use */
+ 
+     if (rc == 1) {
+ 
+@@ -180,12 +180,12 @@
+ 	    BC = backspace_if_not_bs;
+ 
+ 	if ((FIX_SGR0 = _nc_trim_sgr0(&TerminalType(TerminalOf(SP_PARM))))
+-	    != 0) {
++	    != NULL) {
+ 	    if (!strcmp(FIX_SGR0, exit_attribute_mode)) {
+ 		if (FIX_SGR0 != exit_attribute_mode) {
+ 		    free(FIX_SGR0);
+ 		}
+-		FIX_SGR0 = 0;
++		FIX_SGR0 = NULL;
+ 	    }
+ 	}
+ 	LAST_BUF = bufp;
+@@ -246,7 +246,7 @@
+ 	int j = -1;
+ 
+ 	entry_ptr = _nc_find_type_entry(id, BOOLEAN, TRUE);
+-	if (entry_ptr != 0) {
++	if (entry_ptr != NULL) {
+ 	    j = entry_ptr->nte_index;
+ 	}
+ #if NCURSES_XNAMES
+@@ -298,7 +298,7 @@
+ 	int j = -1;
+ 
+ 	entry_ptr = _nc_find_type_entry(id, NUMBER, TRUE);
+-	if (entry_ptr != 0) {
++	if (entry_ptr != NULL) {
+ 	    j = entry_ptr->nte_index;
+ 	}
+ #if NCURSES_XNAMES
+@@ -350,7 +350,7 @@
+ 	int j = -1;
+ 
+ 	entry_ptr = _nc_find_type_entry(id, STRING, TRUE);
+-	if (entry_ptr != 0) {
++	if (entry_ptr != NULL) {
+ 	    j = entry_ptr->nte_index;
+ 	}
+ #if NCURSES_XNAMES
+@@ -371,12 +371,12 @@
+ 	    /* setupterm forces canceled strings to null */
+ 	    if (VALID_STRING(result)) {
+ 		if (result == exit_attribute_mode
+-		    && FIX_SGR0 != 0) {
++		    && FIX_SGR0 != NULL) {
+ 		    result = FIX_SGR0;
+ 		    TR(TRACE_DATABASE, ("altered to : %s", _nc_visbuf(result)));
+ 		}
+-		if (area != 0
+-		    && *area != 0) {
++		if (area != NULL
++		    && *area != NULL) {
+ 		    _nc_STRCPY(*area, result, 1024);
+ 		    result = *area;
+ 		    *area += strlen(*area) + 1;
+@@ -401,13 +401,13 @@
+ NCURSES_EXPORT(void)
+ _nc_tgetent_leak(const TERMINAL *const termp)
+ {
+-    if (termp != 0) {
++    if (termp != NULL) {
+ 	int num;
+ 	for (CacheInx = 0; CacheInx < TGETENT_MAX; ++CacheInx) {
+ 	    if (LAST_TRM == termp) {
+ 		FreeAndNull(FIX_SGR0);
+-		if (LAST_TRM != 0) {
+-		    LAST_TRM = 0;
++		if (LAST_TRM != NULL) {
++		    LAST_TRM = NULL;
+ 		}
+ 		break;
+ 	    }
+@@ -420,7 +420,7 @@
+ {
+     int num;
+     for (CacheInx = 0; CacheInx < TGETENT_MAX; ++CacheInx) {
+-	if (LAST_TRM != 0) {
++	if (LAST_TRM != NULL) {
+ 	    del_curterm(LAST_TRM);
+ 	    _nc_tgetent_leak(LAST_TRM);
+ 	}
+Index: ncurses/tinfo/lib_termname.c
+Prereq:  1.13 
+--- ncurses-6.5-20241130+/ncurses/tinfo/lib_termname.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/lib_termname.c	2024-12-07 20:05:27.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2003,2009 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,17 +29,17 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_termname.c,v 1.13 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_termname.c,v 1.14 2024/12/07 20:05:27 tom Exp $")
+ 
+ NCURSES_EXPORT(char *)
+ NCURSES_SP_NAME(termname) (NCURSES_SP_DCL0)
+ {
+-    char *name = 0;
++    char *name = NULL;
+ 
+     T((T_CALLED("termname(%p)"), (void *) SP_PARM));
+ 
+ #if NCURSES_SP_FUNCS
+-    if (TerminalOf(SP_PARM) != 0) {
++    if (TerminalOf(SP_PARM) != NULL) {
+ 	name = TerminalOf(SP_PARM)->_termname;
+     }
+ #else
+Index: ncurses/tinfo/lib_ti.c
+Prereq:  1.34 
+--- ncurses-6.5-20241130+/ncurses/tinfo/lib_ti.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/lib_ti.c	2024-12-07 20:06:49.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018,2020 Thomas E. Dickey                                     *
++ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -37,7 +37,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_ti.c,v 1.34 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_ti.c,v 1.35 2024/12/07 20:06:49 tom Exp $")
+ 
+ #if 0
+ static bool
+@@ -63,7 +63,7 @@
+ 	int j = -1;
+ 
+ 	entry_ptr = _nc_find_type_entry(str, BOOLEAN, FALSE);
+-	if (entry_ptr != 0) {
++	if (entry_ptr != NULL) {
+ 	    j = entry_ptr->nte_index;
+ 	}
+ #if NCURSES_XNAMES
+@@ -108,7 +108,7 @@
+ 	int j = -1;
+ 
+ 	entry_ptr = _nc_find_type_entry(str, NUMBER, FALSE);
+-	if (entry_ptr != 0) {
++	if (entry_ptr != NULL) {
+ 	    j = entry_ptr->nte_index;
+ 	}
+ #if NCURSES_XNAMES
+@@ -155,7 +155,7 @@
+ 	int j = -1;
+ 
+ 	entry_ptr = _nc_find_type_entry(str, STRING, FALSE);
+-	if (entry_ptr != 0) {
++	if (entry_ptr != NULL) {
+ 	    j = entry_ptr->nte_index;
+ 	}
+ #if NCURSES_XNAMES
+Index: ncurses/tinfo/lib_tparm.c
+Prereq:  1.154 
+--- ncurses-6.5-20241130+/ncurses/tinfo/lib_tparm.c	2024-07-27 19:22:23.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/lib_tparm.c	2024-12-07 18:26:59.000000000 +0000
+@@ -53,7 +53,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: lib_tparm.c,v 1.154 2024/07/27 19:22:23 tom Exp $")
++MODULE_ID("$Id: lib_tparm.c,v 1.155 2024/12/07 18:26:59 tom Exp $")
+ 
+ /*
+  *	char *
+@@ -343,7 +343,7 @@
+ #define spop(tps) \
+     ((TPS(stack_ptr)-- > 0) \
+      ? ((!TPS(stack)[TPS(stack_ptr)].num_type \
+-        && TPS(stack)[TPS(stack_ptr)].data.str != 0) \
++        && TPS(stack)[TPS(stack_ptr)].data.str != NULL) \
+          ? TPS(stack)[TPS(stack_ptr)].data.str \
+          : dummy) \
+      : (tparm_error(tps, "spop: stack underflow"), \
+@@ -361,7 +361,7 @@
+ parse_format(const char *s, char *format, int *len)
+ {
+     *len = 0;
+-    if (format != 0) {
++    if (format != NULL) {
+ 	bool done = FALSE;
+ 	bool allowminus = FALSE;
+ 	bool dot = FALSE;
+@@ -475,13 +475,13 @@
+     int level = -1;
+     const char *cp = string;
+ 
+-    if (cp == 0)
++    if (cp == NULL)
+ 	return 0;
+ 
+     if ((len2 = strlen(cp)) + 2 > TPS(fmt_size)) {
+ 	TPS(fmt_size) += len2 + 2;
+ 	TPS(fmt_buff) = typeRealloc(char, TPS(fmt_size), TPS(fmt_buff));
+-	if (TPS(fmt_buff) == 0)
++	if (TPS(fmt_buff) == NULL)
+ 	    return 0;
+     }
+ 
+@@ -616,14 +616,14 @@
+ 	void *ft;
+ 
+ 	result->format = string;
+-	if ((ft = tfind(result, &MyCache, cmp_format)) != 0) {
++	if ((ft = tfind(result, &MyCache, cmp_format)) != NULL) {
+ 	    size_t len2;
+ 	    fs = *(TPARM_DATA **) ft;
+ 	    *result = *fs;
+ 	    if ((len2 = strlen(string)) + 2 > TPS(fmt_size)) {
+ 		TPS(fmt_size) += len2 + 2;
+ 		TPS(fmt_buff) = typeRealloc(char, TPS(fmt_size), TPS(fmt_buff));
+-		if (TPS(fmt_buff) == 0)
++		if (TPS(fmt_buff) == NULL)
+ 		    return ERR;
+ 	    }
+ 	} else
+@@ -637,7 +637,7 @@
+ 	    result->num_parsed = _nc_tparm_analyze(term, string,
+ 						   result->p_is_s,
+ 						   &(result->num_popped));
+-	    if (TPS(fmt_buff) == 0) {
++	    if (TPS(fmt_buff) == NULL) {
+ 		TR(TRACE_CALLS, ("%s: error in analysis", TPS(tname)));
+ 		rc = ERR;
+ 	    } else {
+@@ -654,10 +654,10 @@
+ 			result->tparm_type |= (1 << n);
+ 		}
+ #if HAVE_TSEARCH
+-		if ((fs = typeCalloc(TPARM_DATA, 1)) != 0) {
++		if ((fs = typeCalloc(TPARM_DATA, 1)) != NULL) {
+ 		    *fs = *result;
+-		    if ((fs->format = strdup(string)) != 0) {
+-			if (tsearch(fs, &MyCache, cmp_format) != 0) {
++		    if ((fs->format = strdup(string)) != NULL) {
++			if (tsearch(fs, &MyCache, cmp_format) != NULL) {
+ 			    ++MyCount;
+ 			} else {
+ 			    free(fs);
+@@ -690,9 +690,9 @@
+     int i;
+ 
+     for (i = 0; i < data->num_actual; i++) {
+-	if (data->p_is_s[i] != 0) {
++	if (data->p_is_s[i] != NULL) {
+ 	    char *value = va_arg(ap, char *);
+-	    if (value == 0)
++	    if (value == NULL)
+ 		value = dummy;
+ 	    data->p_is_s[i] = value;
+ 	    data->param[i] = 0;
+@@ -740,7 +740,7 @@
+     if (USE_TRACEF(TRACE_CALLS)) {
+ 	int i;
+ 	for (i = 0; i < data->num_actual; i++) {
+-	    if (data->p_is_s[i] != 0) {
++	    if (data->p_is_s[i] != NULL) {
+ 		save_text(tps, ", %s", _nc_visbuf(data->p_is_s[i]), 0);
+ 	    } else if ((long) data->param[i] > MAX_OF_TYPE(NCURSES_INT2) ||
+ 		       (long) data->param[i] < 0) {
+@@ -1003,12 +1003,12 @@
+ 		 */
+ 		if (!incremented_two) {
+ 		    incremented_two = TRUE;
+-		    if (data->p_is_s[0] == 0) {
++		    if (data->p_is_s[0] == NULL) {
+ 			data->param[0]++;
+ 			if (termcap_hack)
+ 			    TPS(stack)[0].data.num = (int) data->param[0];
+ 		    }
+-		    if (data->p_is_s[1] == 0) {
++		    if (data->p_is_s[1] == NULL) {
+ 			data->param[1]++;
+ 			if (termcap_hack)
+ 			    TPS(stack)[1].data.num = (int) data->param[1];
+Index: ncurses/tinfo/lib_tputs.c
+Prereq:  1.113 
+--- ncurses-6.5-20241130+/ncurses/tinfo/lib_tputs.c	2024-09-14 23:11:32.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/lib_tputs.c	2024-12-07 21:04:53.000000000 +0000
+@@ -52,7 +52,7 @@
+ #include 		/* ospeed */
+ #include 
+ 
+-MODULE_ID("$Id: lib_tputs.c,v 1.113 2024/09/14 23:11:32 tom Exp $")
++MODULE_ID("$Id: lib_tputs.c,v 1.115 2024/12/07 21:04:53 tom Exp $")
+ 
+ NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
+ NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */
+@@ -63,7 +63,7 @@
+ NCURSES_EXPORT(void)
+ _nc_set_no_padding(SCREEN *sp)
+ {
+-    bool no_padding = (getenv("NCURSES_NO_PADDING") != 0);
++    bool no_padding = (getenv("NCURSES_NO_PADDING") != NULL);
+ 
+     if (sp)
+ 	sp->_no_padding = no_padding;
+@@ -124,7 +124,7 @@
+ NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_DCL0)
+ {
+     T((T_CALLED("_nc_flush(%p)"), (void *) SP_PARM));
+-    if (SP_PARM != 0 && SP_PARM->_ofd >= 0) {
++    if (SP_PARM != NULL && SP_PARM->_ofd >= 0) {
+ 	TR(TRACE_CHARPUT, ("ofd:%d inuse:%lu buffer:%p",
+ 			   SP_PARM->_ofd,
+ 			   (unsigned long) SP_PARM->out_inuse,
+@@ -149,7 +149,7 @@
+ 		    break;	/* an error we can not recover from */
+ 		}
+ 	    }
+-	} else if (SP_PARM->out_buffer == 0) {
++	} else if (SP_PARM->out_buffer == NULL) {
+ 	    TR(TRACE_CHARPUT, ("flushing stdout/stderr"));
+ 	    fflush(stdout);
+ 	    fflush(stderr);
+@@ -159,7 +159,7 @@
+ 	fflush(stdout);
+ 	fflush(stderr);
+     }
+-    if (SP_PARM != 0)
++    if (SP_PARM != NULL)
+ 	SP_PARM->out_inuse = 0;
+     returnVoid;
+ }
+@@ -180,8 +180,8 @@
+     COUNT_OUTCHARS(1);
+ 
+     if (HasTInfoTerminal(SP_PARM)
+-	&& SP_PARM != 0) {
+-	if (SP_PARM->out_buffer != 0) {
++	&& SP_PARM != NULL) {
++	if (SP_PARM->out_buffer != NULL) {
+ 	    if (SP_PARM->out_inuse + 1 >= SP_PARM->out_limit)
+ 		NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
+ 	    SP_PARM->out_buffer[SP_PARM->out_inuse++] = (char) ch;
+@@ -259,7 +259,7 @@
+ {
+     int rc = ERR;
+ 
+-    if (string != 0) {
++    if (string != NULL) {
+ 	TPUTS_TRACE(name);
+ 	rc = NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
+ 				     string, 1, NCURSES_SP_NAME(_nc_outch));
+@@ -314,10 +314,10 @@
+     if (!VALID_STRING(string))
+ 	return ERR;
+ 
+-    if (SP_PARM != 0 && HasTInfoTerminal(SP_PARM)) {
++    if (SP_PARM != NULL && HasTInfoTerminal(SP_PARM)) {
+ 	if (
+ #if NCURSES_SP_FUNCS
+-	       (SP_PARM != 0 && SP_PARM->_term == 0)
++	       (SP_PARM != NULL && SP_PARM->_term == NULL)
+ #else
+ 	       cur_term == 0
+ #endif
+@@ -444,7 +444,7 @@
+ NCURSES_EXPORT(int)
+ _nc_outc_wrapper(SCREEN *sp, int c)
+ {
+-    if (0 == sp) {
++    if (NULL == sp) {
+ 	return fputc(c, stdout);
+     } else {
+ 	return sp->jump(c);
+Index: ncurses/tinfo/lib_ttyflags.c
+Prereq:  1.36 
+--- ncurses-6.5-20241130+/ncurses/tinfo/lib_ttyflags.c	2020-09-05 22:54:47.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/lib_ttyflags.c	2024-12-07 21:24:18.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -42,7 +42,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_ttyflags.c,v 1.36 2020/09/05 22:54:47 tom Exp $")
++MODULE_ID("$Id: lib_ttyflags.c,v 1.37 2024/12/07 21:24:18 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ NCURSES_SP_NAME(_nc_get_tty_mode) (NCURSES_SP_DCLx TTY * buf)
+@@ -50,7 +50,7 @@
+     TERMINAL *termp = TerminalOf(SP_PARM);
+     int result = OK;
+ 
+-    if (buf == 0 || termp == 0) {
++    if (buf == NULL || termp == NULL) {
+ 	result = ERR;
+     } else {
+ 
+@@ -75,7 +75,7 @@
+ 			termp ? termp->Filedes : -1,
+ 			_nc_trace_ttymode(buf)));
+     }
+-    if (result == ERR && buf != 0)
++    if (result == ERR && buf != NULL)
+ 	memset(buf, 0, sizeof(*buf));
+ 
+     return (result);
+@@ -94,12 +94,12 @@
+ {
+     int result = OK;
+ 
+-    if (buf == 0 || SP_PARM == 0) {
++    if (buf == NULL || SP_PARM == NULL) {
+ 	result = ERR;
+     } else {
+ 	TERMINAL *termp = TerminalOf(SP_PARM);
+ 
+-	if (0 == termp) {
++	if (NULL == termp) {
+ 	    result = ERR;
+ 	} else {
+ #ifdef USE_TERM_DRIVER
+@@ -113,7 +113,7 @@
+ 		    ) {
+ 		    if (errno == EINTR)
+ 			continue;
+-		    if ((errno == ENOTTY) && (SP_PARM != 0))
++		    if ((errno == ENOTTY) && (SP_PARM != NULL))
+ 			SP_PARM->_notty = TRUE;
+ 		    result = ERR;
+ 		}
+@@ -145,7 +145,7 @@
+     T((T_CALLED("def_shell_mode(%p) ->term %p"),
+        (void *) SP_PARM, (void *) termp));
+ 
+-    if (termp != 0) {
++    if (termp != NULL) {
+ #ifdef USE_TERM_DRIVER
+ 	rc = CallDriver_2(SP_PARM, td_mode, FALSE, TRUE);
+ #else
+@@ -185,7 +185,7 @@
+ 
+     T((T_CALLED("def_prog_mode(%p) ->term %p"), (void *) SP_PARM, (void *) termp));
+ 
+-    if (termp != 0) {
++    if (termp != NULL) {
+ #ifdef USE_TERM_DRIVER
+ 	rc = CallDriver_2(SP_PARM, td_mode, TRUE, TRUE);
+ #else
+@@ -223,7 +223,7 @@
+ 
+     T((T_CALLED("reset_prog_mode(%p) ->term %p"), (void *) SP_PARM, (void *) termp));
+ 
+-    if (termp != 0) {
++    if (termp != NULL) {
+ #ifdef USE_TERM_DRIVER
+ 	rc = CallDriver_2(SP_PARM, td_mode, TRUE, FALSE);
+ #else
+@@ -256,7 +256,7 @@
+     T((T_CALLED("reset_shell_mode(%p) ->term %p"),
+        (void *) SP_PARM, (void *) termp));
+ 
+-    if (termp != 0) {
++    if (termp != NULL) {
+ #ifdef USE_TERM_DRIVER
+ 	rc = CallDriver_2(SP_PARM, td_mode, FALSE, FALSE);
+ #else
+@@ -281,12 +281,12 @@
+ static TTY *
+ saved_tty(NCURSES_SP_DCL0)
+ {
+-    TTY *result = 0;
++    TTY *result = NULL;
+ 
+-    if (SP_PARM != 0) {
++    if (SP_PARM != NULL) {
+ 	result = (TTY *) & (SP_PARM->_saved_tty);
+     } else {
+-	if (_nc_prescreen.saved_tty == 0) {
++	if (_nc_prescreen.saved_tty == NULL) {
+ 	    _nc_prescreen.saved_tty = typeCalloc(TTY, 1);
+ 	}
+ 	result = _nc_prescreen.saved_tty;
+Index: ncurses/tinfo/make_hash.c
+Prereq:  1.34 
+--- ncurses-6.5-20241130+/ncurses/tinfo/make_hash.c	2024-03-02 19:35:40.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/make_hash.c	2024-12-07 20:51:15.000000000 +0000
+@@ -44,7 +44,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: make_hash.c,v 1.34 2024/03/02 19:35:40 tom Exp $")
++MODULE_ID("$Id: make_hash.c,v 1.36 2024/12/07 20:51:15 tom Exp $")
+ 
+ /*
+  *	_nc_make_hash_table()
+@@ -79,7 +79,7 @@
+ {
+     size_t need = strlen(s) + 1;
+     char *result = malloc(need);
+-    if (result == 0)
++    if (result == NULL)
+ 	failed("strmalloc");
+     _nc_STRCPY(result, s, need);
+     return result;
+@@ -153,7 +153,7 @@
+ count_columns(char **list)
+ {
+     int result = 0;
+-    if (list != 0) {
++    if (list != NULL) {
+ 	while (*list++) {
+ 	    ++result;
+ 	}
+@@ -168,17 +168,17 @@
+ 
+     int col = 0;
+ 
+-    if (buffer == 0) {
++    if (buffer == NULL) {
+ 	free(list);
+-	list = 0;
+-	return 0;
++	list = NULL;
++	return NULL;
+     }
+ 
+     if (*buffer != '#') {
+-	if (list == 0) {
++	if (list == NULL) {
+ 	    list = typeCalloc(char *, (MAX_COLUMNS + 1));
+-	    if (list == 0)
+-		return (0);
++	    if (list == NULL)
++		return (NULL);
+ 	}
+ 	while (*buffer != '\0') {
+ 	    char *s;
+@@ -205,7 +205,7 @@
+ 		break;
+ 	}
+     }
+-    return col ? list : 0;
++    return col ? list : NULL;
+ }
+ 
+ #define SetType(n,t) \
+@@ -272,8 +272,8 @@
+ 	|| (column >= MAX_COLUMNS)
+ 	|| *(root_name = argv[2]) == 0
+ 	|| (bigstring = atoi(argv[3])) < 0
+-	|| name_table == 0
+-	|| hash_table == 0) {
++	|| name_table == NULL
++	|| hash_table == NULL) {
+ 	fprintf(stderr, "usage: make_hash column root_name bigstring\n");
+ 	exit(EXIT_FAILURE);
+     }
+@@ -291,7 +291,7 @@
+ 	else
+ 	    buffer[sizeof(buffer) - 2] = '\0';
+ 	list = parse_columns(buffer);
+-	if (list == 0)		/* blank or comment */
++	if (list == NULL)	/* blank or comment */
+ 	    continue;
+ 	if (is_user) {
+ 	    if (strcmp(list[0], "userdef"))
+@@ -382,15 +382,15 @@
+ 		printf("\t%d,%d,",
+ 		       name_table[n].ute_argc,
+ 		       name_table[n].ute_args);
+-	    printf("\t%3d, %3d %s%c\n",
++	    printf("\t%3d, %3d %s%s\n",
+ 		   name_table[n].ute_index,
+ 		   name_table[n].ute_link,
+ 		   R_BRACE,
+-		   n < tablesize - 1 ? ',' : ' ');
++		   n < tablesize - 1 ? "," : "");
+ 	    len += (int) strlen(name_table[n].ute_name) + 1;
+ 	}
+ 	printf("%s;\n\n", R_BRACE);
+-	printf("static struct %s_table_entry *_nc_%s_table = 0;\n\n",
++	printf("static struct %s_table_entry *_nc_%s_table = NULL;\n\n",
+ 	       table_name,
+ 	       root_name);
+     } else {
+@@ -407,11 +407,11 @@
+ 		printf("\t%d,%d,",
+ 		       name_table[n].ute_argc,
+ 		       name_table[n].ute_args);
+-	    printf("\t%3d, %3d %s%c\n",
++	    printf("\t%3d, %3d %s%s\n",
+ 		   name_table[n].ute_index,
+ 		   name_table[n].ute_link,
+ 		   R_BRACE,
+-		   n < tablesize - 1 ? ',' : ' ');
++		   n < tablesize - 1 ? "," : "");
+ 	}
+ 	printf("%s;\n\n", R_BRACE);
+     }
+@@ -439,7 +439,7 @@
+ 	free((void *) name_table[n].ute_name);
+     }
+     free(name_table);
+-    parse_columns(0);
++    parse_columns(NULL);
+ 
+     return EXIT_SUCCESS;
+ }
+Index: ncurses/tinfo/make_keys.c
+Prereq:  1.23 
+--- ncurses-6.5-20241130+/ncurses/tinfo/make_keys.c	2021-08-18 20:55:25.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/make_keys.c	2024-12-07 20:06:49.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2011,2015 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -40,7 +40,7 @@
+ #define USE_TERMLIB 1
+ #include 
+ 
+-MODULE_ID("$Id: make_keys.c,v 1.23 2021/08/18 20:55:25 tom Exp $")
++MODULE_ID("$Id: make_keys.c,v 1.24 2024/12/07 20:06:49 tom Exp $")
+ 
+ #include 
+ 
+@@ -51,10 +51,10 @@
+ 
+     if (result == 0) {
+ 	unsigned n;
+-	for (n = 0; strnames[n] != 0; n++) {
++	for (n = 0; strnames[n] != NULL; n++) {
+ 	    ++result;
+ 	}
+-	for (n = 0; strfnames[n] != 0; n++) {
++	for (n = 0; strfnames[n] != NULL; n++) {
+ 	    ++result;
+ 	}
+     }
+@@ -66,14 +66,14 @@
+ {
+     unsigned n;
+     bool found = FALSE;
+-    for (n = 0; strnames[n] != 0; n++) {
++    for (n = 0; strnames[n] != NULL; n++) {
+ 	if (!strcmp(name, strnames[n])) {
+ 	    found = TRUE;
+ 	    break;
+ 	}
+     }
+     if (!found) {
+-	for (n = 0; strfnames[n] != 0; n++) {
++	for (n = 0; strfnames[n] != NULL; n++) {
+ 	    if (!strcmp(name, strfnames[n])) {
+ 		found = TRUE;
+ 		break;
+@@ -93,7 +93,7 @@
+     unsigned maxlen = 16;
+     int scanned;
+ 
+-    while (fgets(buffer, (int) sizeof(buffer), ifp) != 0) {
++    while (fgets(buffer, (int) sizeof(buffer), ifp) != NULL) {
+ 	if (*buffer == '#')
+ 	    continue;
+ 
+@@ -119,7 +119,7 @@
+ static void
+ write_list(FILE *ofp, const char **list)
+ {
+-    while (*list != 0)
++    while (*list != NULL)
+ 	fprintf(ofp, "%s\n", *list++);
+ }
+ 
+@@ -139,14 +139,14 @@
+ 	"static",
+ 	"#endif",
+ 	"const struct tinfo_fkeys _nc_tinfo_fkeys[] = {",
+-	0
++	NULL
+     };
+     static const char *suffix[] =
+     {
+ 	"\t{ 0, 0} };",
+ 	"",
+ 	"#endif /* _INIT_KEYTRY_H */",
+-	0
++	NULL
+     };
+ 
+     write_list(stdout, prefix);
+@@ -154,7 +154,7 @@
+ 	int n;
+ 	for (n = 1; n < argc; n++) {
+ 	    FILE *fp = fopen(argv[n], "r");
+-	    if (fp != 0) {
++	    if (fp != NULL) {
+ 		make_keys(fp, stdout);
+ 		fclose(fp);
+ 	    }
+Index: ncurses/tinfo/name_match.c
+Prereq:  1.25 
+--- ncurses-6.5-20241130+/ncurses/tinfo/name_match.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/name_match.c	2024-12-07 21:24:18.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2013,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -34,7 +34,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: name_match.c,v 1.25 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: name_match.c,v 1.26 2024/12/07 21:24:18 tom Exp $")
+ 
+ #define FirstName _nc_globals.first_name
+ 
+@@ -60,17 +60,17 @@
+ _nc_first_name(const char *const sp)
+ {
+ #if NO_LEAKS
+-    if (sp == 0) {
+-	if (FirstName != 0) {
++    if (sp == NULL) {
++	if (FirstName != NULL) {
+ 	    FreeAndNull(FirstName);
+ 	}
+     } else
+ #endif
+     {
+-	if (FirstName == 0)
++	if (FirstName == NULL)
+ 	    FirstName = typeMalloc(char, MAX_NAME_SIZE + 1);
+ 
+-	if (FirstName != 0) {
++	if (FirstName != NULL) {
+ 	    unsigned n;
+ 	    const char *src = sp;
+ #if NCURSES_USE_TERMCAP && NCURSES_XNAMES
+@@ -95,7 +95,7 @@
+ {
+     const char *s;
+ 
+-    if ((s = namelst) != 0) {
++    if ((s = namelst) != NULL) {
+ 	while (*s != '\0') {
+ 	    const char *d, *t;
+ 	    int code, found;
+Index: ncurses/tinfo/obsolete.c
+Prereq:  1.11 
+--- ncurses-6.5-20241130+/ncurses/tinfo/obsolete.c	2023-10-21 15:38:47.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/obsolete.c	2024-12-07 21:24:18.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2023 Thomas E. Dickey                                     *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2013-2014,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -37,7 +37,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: obsolete.c,v 1.11 2023/10/21 15:38:47 tom Exp $")
++MODULE_ID("$Id: obsolete.c,v 1.12 2024/12/07 21:24:18 tom Exp $")
+ 
+ /*
+  * Obsolete entrypoint retained for binary compatibility.
+@@ -126,7 +126,7 @@
+ 	rc = 0;
+     }
+ 
+-    if (target != 0) {
++    if (target != NULL) {
+ 	switch (rc) {
+ 	case 1:
+ 	    target[0] = CH(0);
+@@ -225,7 +225,7 @@
+ 	}
+     }
+ 
+-    if (target != 0) {
++    if (target != NULL) {
+ 	int shift = 0;
+ 	*target = 0;
+ 	for (j = 1; j < rc; j++) {
+Index: ncurses/tinfo/parse_entry.c
+Prereq:  1.111 
+--- ncurses-6.5-20241130+/ncurses/tinfo/parse_entry.c	2024-11-23 18:49:08.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/parse_entry.c	2024-12-07 21:13:36.000000000 +0000
+@@ -48,7 +48,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: parse_entry.c,v 1.111 2024/11/23 18:49:08 tom Exp $")
++MODULE_ID("$Id: parse_entry.c,v 1.112 2024/12/07 21:13:36 tom Exp $")
+ 
+ #ifdef LINT
+ static short const parametrized[] =
+@@ -204,7 +204,7 @@
+ {
+     struct user_table_entry const *entry = _nc_find_user_entry(name);
+     bool result = TRUE;
+-    if ((entry != 0) && (token_type != CANCEL)) {
++    if ((entry != NULL) && (token_type != CANCEL)) {
+ 	int have_type = (1 << token_type);
+ 	if (!(entry->ute_type & have_type)) {
+ 	    if (!silent)
+@@ -332,7 +332,7 @@
+ 
+     entryp->tterm.str_table = entryp->tterm.term_names = _nc_save_str(ptr);
+ 
+-    if (entryp->tterm.str_table == 0)
++    if (entryp->tterm.str_table == NULL)
+ 	returnDB(ERR);
+ 
+     DEBUG(2, ("Starting '%s'", ptr));
+@@ -350,7 +350,7 @@
+     _nc_set_type(name);
+ 
+     /* check for overly-long names and aliases */
+-    for (base = entryp->tterm.term_names; (ptr = strchr(base, '|')) != 0;
++    for (base = entryp->tterm.term_names; (ptr = strchr(base, '|')) != NULL;
+ 	 base = ptr + 1) {
+ 	if (ptr - base > MAX_ALIAS) {
+ 	    _nc_warning("%s `%.*s' may be too long",
+@@ -459,7 +459,7 @@
+ 		if (expected_type(_nc_curr_token.tk_name, token_type, silent)) {
+ 		    if ((entry_ptr = _nc_extend_names(entryp,
+ 						      _nc_curr_token.tk_name,
+-						      token_type)) != 0) {
++						      token_type)) != NULL) {
+ 			if (_nc_tracing >= DEBUG_LEVEL(1)) {
+ 			    _nc_warning("extended capability '%s'",
+ 					_nc_curr_token.tk_name);
+@@ -629,7 +629,7 @@
+ 		 * have picked up defaults via translation.
+ 		 */
+ 		for (i = 0; i < entryp->nuses; i++) {
+-		    if (entryp->uses[i].name != 0
++		    if (entryp->uses[i].name != NULL
+ 			&& !strchr(entryp->uses[i].name, '+'))
+ 			has_base_entry = TRUE;
+ 		}
+@@ -697,7 +697,7 @@
+ static void
+ append_acs0(string_desc * dst, int code, const char *src, size_t off)
+ {
+-    if (src != 0 && off < strlen(src)) {
++    if (src != NULL && off < strlen(src)) {
+ 	char temp[3];
+ 	temp[0] = (char) code;
+ 	temp[1] = src[off];
+@@ -929,15 +929,15 @@
+ 
+ 	/* we're going to use this for a special case later */
+ 	dp = strchr(other_non_function_keys, 'i');
+-	foundim = (dp != 0) && (dp[1] == 'm');
++	foundim = (dp != NULL) && (dp[1] == 'm');
+ 
+ 	/* look at each comma-separated capability in the ko string... */
+ 	for (base = other_non_function_keys;
+-	     (cp = strchr(base, ',')) != 0;
++	     (cp = strchr(base, ',')) != NULL;
+ 	     base = cp + 1) {
+ 	    size_t len = (unsigned) (cp - base);
+ 	    size_t n;
+-	    assoc const *ap = 0;
++	    assoc const *ap = NULL;
+ 
+ 	    for (n = 0; n < SIZEOF(ko_xlate); ++n) {
+ 		if (len == strlen(ko_xlate[n].from)
+@@ -946,7 +946,7 @@
+ 		    break;
+ 		}
+ 	    }
+-	    if (ap == 0) {
++	    if (ap == NULL) {
+ 		_nc_warning("unknown capability `%.*s' in ko string",
+ 			    (int) len, base);
+ 		continue;
+@@ -1143,7 +1143,7 @@
+ 	    return NOTFOUND;
+ 	}
+ 
+-	for (count = 0; names[count] != 0; count++) {
++	for (count = 0; names[count] != NULL; count++) {
+ 	    if (!strcmp(names[count], find)) {
+ 		struct name_table_entry const *entry_ptr = _nc_get_table(FALSE);
+ 		while (entry_ptr->nte_type != state
+Index: ncurses/tinfo/read_entry.c
+Prereq:  1.173 
+--- ncurses-6.5-20241130+/ncurses/tinfo/read_entry.c	2024-07-27 23:07:02.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/read_entry.c	2024-12-07 21:02:00.000000000 +0000
+@@ -42,7 +42,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: read_entry.c,v 1.173 2024/07/27 23:07:02 tom Exp $")
++MODULE_ID("$Id: read_entry.c,v 1.174 2024/12/07 21:02:00 tom Exp $")
+ 
+ #define MyNumber(n) (short) LOW_MSB(n)
+ 
+@@ -237,11 +237,11 @@
+     tp->ext_Numbers = 0;
+     tp->ext_Strings = 0;
+ #endif
+-    if (tp->Booleans == 0)
++    if (tp->Booleans == NULL)
+ 	TYPE_MALLOC(NCURSES_SBOOL, BOOLCOUNT, tp->Booleans);
+-    if (tp->Numbers == 0)
++    if (tp->Numbers == NULL)
+ 	TYPE_MALLOC(NCURSES_INT2, NUMCOUNT, tp->Numbers);
+-    if (tp->Strings == 0)
++    if (tp->Strings == NULL)
+ 	TYPE_MALLOC(char *, STRCOUNT, tp->Strings);
+ 
+     for_each_boolean(i, tp)
+@@ -346,7 +346,7 @@
+     want = (unsigned) (str_size + name_size + 1);
+     /* try to allocate space for the string table */
+     if (str_count * SIZEOF_SHORT >= max_entry_size
+-	|| (string_table = typeMalloc(char, want)) == 0) {
++	|| (string_table = typeMalloc(char, want)) == NULL) {
+ 	returnDB(TGETENT_NO);
+     }
+ 
+@@ -483,7 +483,7 @@
+ 
+ 	if (ext_str_limit) {
+ 	    ptr->ext_str_table = typeMalloc(char, (size_t) ext_str_limit);
+-	    if (ptr->ext_str_table == 0) {
++	    if (ptr->ext_str_table == NULL) {
+ 		returnDB(TGETENT_NO);
+ 	    }
+ 	    if (Read(ptr->ext_str_table, (unsigned) ext_str_limit) != ext_str_limit) {
+@@ -582,11 +582,11 @@
+ _nc_read_file_entry(const char *const filename, TERMTYPE2 *ptr)
+ /* return 1 if read, 0 if not found or garbled */
+ {
+-    FILE *fp = 0;
++    FILE *fp = NULL;
+     int code;
+ 
+     if (_nc_access(filename, R_OK) < 0
+-	|| (fp = safe_fopen(filename, BIN_R)) == 0) {
++	|| (fp = safe_fopen(filename, BIN_R)) == NULL) {
+ 	TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno));
+ 	code = TGETENT_NO;
+     } else {
+@@ -881,7 +881,7 @@
+ {
+     int code = TGETENT_NO;
+ 
+-    if (name == 0)
++    if (name == NULL)
+ 	return _nc_read_entry2("", filename, tp);
+ 
+     _nc_SPRINTF(filename, _nc_SLIMIT(PATH_MAX)
+@@ -891,7 +891,7 @@
+ 	|| strcmp(name, ".") == 0
+ 	|| strcmp(name, "..") == 0
+ 	|| _nc_pathlast(name) != 0
+-	|| strchr(name, NCURSES_PATHSEP) != 0) {
++	|| strchr(name, NCURSES_PATHSEP) != NULL) {
+ 	TR(TRACE_DATABASE, ("illegal or missing entry name '%s'", name));
+     } else {
+ #if NCURSES_USE_DATABASE
+@@ -901,7 +901,7 @@
+ 
+ 	_nc_first_db(&state, &offset);
+ 	code = TGETENT_ERR;
+-	while ((path = _nc_next_db(&state, &offset)) != 0) {
++	while ((path = _nc_next_db(&state, &offset)) != NULL) {
+ 	    code = _nc_read_tic_entry(filename, PATH_MAX, path, name, tp);
+ 	    if (code == TGETENT_YES) {
+ 		_nc_last_db();
+Index: ncurses/tinfo/strings.c
+Prereq:  1.11 
+--- ncurses-6.5-20241130+/ncurses/tinfo/strings.c	2023-05-27 20:13:10.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/strings.c	2024-12-07 21:24:18.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2023 Thomas E. Dickey                                     *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2000-2012,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -38,7 +38,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: strings.c,v 1.11 2023/05/27 20:13:10 tom Exp $")
++MODULE_ID("$Id: strings.c,v 1.12 2024/12/07 21:24:18 tom Exp $")
+ 
+ /****************************************************************************
+  * Useful string functions (especially for mvcur)
+@@ -71,12 +71,12 @@
+ NCURSES_EXPORT(string_desc *)
+ _nc_str_init(string_desc * dst, char *src, size_t len)
+ {
+-    if (dst != 0) {
++    if (dst != NULL) {
+ 	dst->s_head = src;
+ 	dst->s_tail = src;
+ 	dst->s_size = len - 1;
+ 	dst->s_init = dst->s_size;
+-	if (src != 0)
++	if (src != NULL)
+ 	    *src = 0;
+     }
+     return dst;
+@@ -88,7 +88,7 @@
+ NCURSES_EXPORT(string_desc *)
+ _nc_str_null(string_desc * dst, size_t len)
+ {
+-    return _nc_str_init(dst, 0, len);
++    return _nc_str_init(dst, NULL, len);
+ }
+ 
+ /*
+@@ -111,7 +111,7 @@
+ 	size_t len = strlen(src);
+ 
+ 	if (len < dst->s_size) {
+-	    if (dst->s_tail != 0) {
++	    if (dst->s_tail != NULL) {
+ 		_nc_STRCPY(dst->s_tail, src, dst->s_size);
+ 		dst->s_tail += len;
+ 	    }
+@@ -132,7 +132,7 @@
+ 	size_t len = strlen(src);
+ 
+ 	if (len < dst->s_size) {
+-	    if (dst->s_head != 0) {
++	    if (dst->s_head != NULL) {
+ 		_nc_STRCPY(dst->s_head, src, dst->s_size);
+ 		dst->s_tail = dst->s_head + len;
+ 	    }
+Index: ncurses/tinfo/trim_sgr0.c
+Prereq:  1.25 
+--- ncurses-6.5-20241130+/ncurses/tinfo/trim_sgr0.c	2024-10-19 21:18:18.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/trim_sgr0.c	2024-12-07 21:02:59.000000000 +0000
+@@ -37,7 +37,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: trim_sgr0.c,v 1.25 2024/10/19 21:18:18 tom Exp $")
++MODULE_ID("$Id: trim_sgr0.c,v 1.26 2024/12/07 21:02:59 tom Exp $")
+ 
+ #undef CUR
+ #define CUR tp->
+@@ -52,7 +52,7 @@
+     if (PRESENT(value))
+ 	result = strdup(value);
+     else
+-	result = 0;
++	result = NULL;
+     return result;
+ }
+ 
+@@ -60,7 +60,7 @@
+ is_csi(const char *s)
+ {
+     int result = 0;
+-    if (s != 0) {
++    if (s != NULL) {
+ 	if (UChar(s[0]) == CSI_CHR)
+ 	    result = 1;
+ 	else if (s[0] == ESC_CHR && s[1] == L_BLOCK)
+@@ -101,7 +101,7 @@
+ static bool
+ rewrite_sgr(char *s, const char *attr)
+ {
+-    if (s != 0) {
++    if (s != NULL) {
+ 	if (PRESENT(attr)) {
+ 	    size_t len_s = strlen(s);
+ 	    size_t len_a = strlen(attr);
+@@ -125,7 +125,7 @@
+ similar_sgr(char *a, char *b)
+ {
+     bool result = FALSE;
+-    if (a != 0 && b != 0) {
++    if (a != NULL && b != NULL) {
+ 	int csi_a = is_csi(a);
+ 	int csi_b = is_csi(b);
+ 	size_t len_a;
+@@ -300,7 +300,7 @@
+ 		}
+ 	    }
+ 	    if (!found
+-		&& (tmp = strstr(end, off)) != 0
++		&& (tmp = strstr(end, off)) != NULL
+ 		&& strcmp(end, off) != 0) {
+ 		i = (size_t) (tmp - end);
+ 		j = strlen(off);
+Index: ncurses/tinfo/write_entry.c
+Prereq:  1.137 
+--- ncurses-6.5-20241130+/ncurses/tinfo/write_entry.c	2024-11-09 19:24:01.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tinfo/write_entry.c	2024-12-07 21:13:36.000000000 +0000
+@@ -42,7 +42,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: write_entry.c,v 1.137 2024/11/09 19:24:01 tom Exp $")
++MODULE_ID("$Id: write_entry.c,v 1.138 2024/12/07 21:13:36 tom Exp $")
+ 
+ #if 1
+ #define TRACE_OUT(p) DEBUG(2, p)
+@@ -82,12 +82,12 @@
+     } else {
+ 	FILE *fp = ((_nc_access(filename, W_OK) == 0)
+ 		    ? safe_fopen(filename, BIN_W)
+-		    : 0);
++		    : NULL);
+ 	size_t actual;
+ 
+-	if (fp == 0) {
++	if (fp == NULL) {
+ 	    _nc_syserr_abort("cannot open %s/%s: (errno %d) %s",
+-			     _nc_tic_dir(0),
++			     _nc_tic_dir(NULL),
+ 			     filename,
+ 			     errno,
+ 			     strerror(errno));
+@@ -129,9 +129,9 @@
+     static const char dirnames[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+     static bool verified[sizeof(dirnames)];
+ 
+-    const char *s = 0;
++    const char *s = NULL;
+ 
+-    if (code == 0 || (s = (strchr) (dirnames, code)) == 0) {
++    if (code == 0 || (s = (strchr) (dirnames, code)) == NULL) {
+ 	_nc_err_abort("Illegal terminfo subdirectory \"" LEAF_FMT "\"", code);
+     } else if (!verified[s - dirnames]) {
+ 	char dir[sizeof(LEAF_FMT)];
+Index: ncurses/trace/lib_trace.c
+Prereq:  1.108 
+--- ncurses-6.5-20241130+/ncurses/trace/lib_trace.c	2024-11-23 18:40:23.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/trace/lib_trace.c	2024-12-07 21:02:00.000000000 +0000
+@@ -48,7 +48,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_trace.c,v 1.108 2024/11/23 18:40:23 tom Exp $")
++MODULE_ID("$Id: lib_trace.c,v 1.109 2024/12/07 21:02:00 tom Exp $")
+ 
+ NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
+ 
+@@ -135,7 +135,7 @@
+ 
+     Locked(result = _nc_tracing);
+ 
+-    if ((MyFP == 0) && tracelevel) {
++    if ((MyFP == NULL) && tracelevel) {
+ 	MyInit = TRUE;
+ 	if (MyFD >= 0) {
+ 	    MyFP = fdopen(MyFD, BIN_W);
+@@ -149,7 +149,7 @@
+ #define SAFE_MODE (O_CREAT | O_EXCL | O_RDWR)
+ 	    if (_nc_access(myFile, W_OK) < 0
+ 		|| (MyFD = safe_open3(myFile, SAFE_MODE, 0600)) < 0
+-		|| (MyFP = fdopen(MyFD, BIN_W)) == 0) {
++		|| (MyFP = fdopen(MyFD, BIN_W)) == NULL) {
+ 		;		/* EMPTY */
+ 	    }
+ 	}
+@@ -158,7 +158,7 @@
+ 	 * so that the trace-output gets flushed automatically at the
+ 	 * end of each line.  This is useful in case the program dies.
+ 	 */
+-	if (MyFP != 0) {
++	if (MyFP != NULL) {
+ #if HAVE_SETVBUF		/* ANSI */
+ 	    (void) setvbuf(MyFP, (char *) 0, _IOLBF, (size_t) 0);
+ #elif HAVE_SETBUF /* POSIX */
+@@ -188,10 +188,10 @@
+ 	    _tracef("- DEBUG_LEVEL(%u)", tracelevel >> TRACE_SHIFT);
+ 	}
+     } else if (tracelevel == 0) {
+-	if (MyFP != 0) {
++	if (MyFP != NULL) {
+ 	    MyFD = dup(MyFD);	/* allow reopen of same file */
+ 	    fclose(MyFP);
+-	    MyFP = 0;
++	    MyFP = NULL;
+ 	}
+ 	Locked(_nc_tracing = tracelevel);
+     } else if (_nc_tracing != tracelevel) {
+@@ -226,7 +226,7 @@
+ 
+ #ifdef TRACE
+     /* verbose-trace in the command-line utilities relies on this */
+-    if (fp == 0 && !MyInit && _nc_tracing >= DEBUG_LEVEL(1))
++    if (fp == NULL && !MyInit && _nc_tracing >= DEBUG_LEVEL(1))
+ 	fp = stderr;
+ #endif
+ 
+@@ -246,7 +246,7 @@
+ 	}
+     }
+ 
+-    if (doit != 0 && fp != 0) {
++    if (doit != 0 && fp != NULL) {
+ #ifdef USE_PTHREADS
+ 	/*
+ 	 * TRACE_ICALLS is "really" needed to show normal use with threaded
+Index: ncurses/trace/lib_traceatr.c
+Prereq:  1.97 
+--- ncurses-6.5-20241130+/ncurses/trace/lib_traceatr.c	2024-07-27 19:08:04.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/trace/lib_traceatr.c	2024-12-07 21:12:53.000000000 +0000
+@@ -44,7 +44,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_traceatr.c,v 1.97 2024/07/27 19:08:04 tom Exp $")
++MODULE_ID("$Id: lib_traceatr.c,v 1.98 2024/12/07 21:12:53 tom Exp $")
+ 
+ #define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name))
+ 
+@@ -126,7 +126,7 @@
+ #undef DATA
+     char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ);
+ 
+-    if (result != 0) {
++    if (result != NULL) {
+ 	size_t n;
+ 	unsigned save_nc_tracing = _nc_tracing;
+ 
+@@ -167,7 +167,7 @@
+ 	    }
+ 	}
+ 	if (ChAttrOf(newmode) == A_NORMAL) {
+-	    if (result != 0 && result[1] != '\0')
++	    if (result != NULL && result[1] != '\0')
+ 		(void) _nc_trace_bufcat(bufnum, "|");
+ 	    (void) _nc_trace_bufcat(bufnum, "A_NORMAL");
+ 	}
+@@ -248,14 +248,14 @@
+     };
+ #undef DATA
+ 
+-    const char *result = 0;
++    const char *result = NULL;
+ 
+ #if NCURSES_SP_FUNCS
+     (void) sp;
+ #endif
+-    if (SP_PARM != 0 && (attr & A_ALTCHARSET) && (acs_chars != 0)) {
++    if (SP_PARM != NULL && (attr & A_ALTCHARSET) && (acs_chars != NULL)) {
+ 	char *cp;
+-	const char *found = 0;
++	const char *found = NULL;
+ 
+ 	for (cp = acs_chars; cp[0] && cp[1]; cp += 2) {
+ 	    if (ChCharOf(UChar(cp[1])) == ChCharOf(ch)) {
+@@ -264,7 +264,7 @@
+ 	    }
+ 	}
+ 
+-	if (found != 0) {
++	if (found != NULL) {
+ 	    size_t n;
+ 
+ 	    ch = ChCharOf(UChar(*found));
+@@ -284,12 +284,12 @@
+ {
+     char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ);
+ 
+-    if (result != 0) {
++    if (result != NULL) {
+ 	const char *found;
+ 	attr_t attr = ChAttrOf(ch);
+ 
+ 	_nc_STRCPY(result, l_brace, TRACE_BUF_SIZE(bufnum));
+-	if ((found = _nc_altcharset_name(attr, ch)) != 0) {
++	if ((found = _nc_altcharset_name(attr, ch)) != NULL) {
+ 	    (void) _nc_trace_bufcat(bufnum, found);
+ 	    attr &= ~A_ALTCHARSET;
+ 	} else
+@@ -328,13 +328,13 @@
+ {
+     char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ);
+ 
+-    if (result != 0) {
++    if (result != NULL) {
+ 	_nc_STRCPY(result, l_brace, TRACE_BUF_SIZE(bufnum));
+-	if (ch != 0) {
++	if (ch != NULL) {
+ 	    const char *found;
+ 	    attr_t attr = AttrOfD(ch);
+ 
+-	    if ((found = _nc_altcharset_name(attr, (chtype) CharOfD(ch))) != 0) {
++	    if ((found = _nc_altcharset_name(attr, (chtype) CharOfD(ch))) != NULL) {
+ 		(void) _nc_trace_bufcat(bufnum, found);
+ 		attr &= ~A_ALTCHARSET;
+ 	    } else if (isWidecExt(CHDEREF(ch))) {
+Index: ncurses/trace/lib_tracebits.c
+Prereq:  1.31 
+--- ncurses-6.5-20241130+/ncurses/trace/lib_tracebits.c	2020-11-14 23:38:11.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/trace/lib_tracebits.c	2024-12-07 21:24:18.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019,2020 Thomas E. Dickey                                     *
++ * Copyright 2019-2020,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2015 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -35,7 +35,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_tracebits.c,v 1.31 2020/11/14 23:38:11 tom Exp $")
++MODULE_ID("$Id: lib_tracebits.c,v 1.32 2024/12/07 21:24:18 tom Exp $")
+ 
+ #if HAVE_SYS_TERMIO_H
+ #include 		/* needed for ISC */
+@@ -172,7 +172,7 @@
+ 			8 + sizeof(cflags) +
+ 			8 + sizeof(lflags) +
+ 			8);
+-    if (buf != 0) {
++    if (buf != NULL) {
+ 
+ 	if (tty->c_iflag & ALLIN)
+ 	    lookup_bits(buf, iflags, "iflags", tty->c_iflag);
+Index: ncurses/trace/lib_tracechr.c
+Prereq:  1.25 
+--- ncurses-6.5-20241130+/ncurses/trace/lib_tracechr.c	2024-11-23 19:50:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/trace/lib_tracechr.c	2024-12-07 21:02:00.000000000 +0000
+@@ -40,7 +40,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_tracechr.c,v 1.25 2024/11/23 19:50:34 tom Exp $")
++MODULE_ID("$Id: lib_tracechr.c,v 1.26 2024/12/07 21:02:00 tom Exp $")
+ 
+ #ifdef TRACE
+ 
+@@ -50,13 +50,13 @@
+ _nc_tracechar(SCREEN *sp, int ch)
+ {
+     NCURSES_CONST char *name;
+-    char *MyBuffer = ((sp != 0)
++    char *MyBuffer = ((sp != NULL)
+ 		      ? sp->tracechr_buf
+ 		      : _nc_globals.tracechr_buf);
+ 
+     if ((ch > KEY_MIN && !_nc_unicode_locale()) || ch < 0) {
+ 	name = safe_keyname(SP_PARM, ch);
+-	if (name == 0 || *name == '\0')
++	if (name == NULL || *name == '\0')
+ 	    name = "NULL";
+ 	_nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize)
+ 		    "'%.30s' = \\x%02x", name, UChar(ch));
+@@ -72,7 +72,7 @@
+ 		    "\\x%02x", ch);
+     } else {
+ 	name = safe_unctrl(SP_PARM, (chtype) ch);
+-	if (name == 0 || *name == 0)
++	if (name == NULL || *name == 0)
+ 	    name = "null";	/* shouldn't happen */
+ 	_nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize)
+ 		    "'%.30s' = \\x%02x", name, ch);
+Index: ncurses/trace/lib_tracedmp.c
+Prereq:  1.37 
+--- ncurses-6.5-20241130+/ncurses/trace/lib_tracedmp.c	2023-06-24 15:49:45.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/trace/lib_tracedmp.c	2024-12-07 20:06:49.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2023 Thomas E. Dickey                                     *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -40,7 +40,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: lib_tracedmp.c,v 1.37 2023/06/24 15:49:45 tom Exp $")
++MODULE_ID("$Id: lib_tracedmp.c,v 1.38 2024/12/07 20:06:49 tom Exp $")
+ 
+ #ifdef TRACE
+ 
+@@ -72,7 +72,7 @@
+ 	my_length = (unsigned) (2 * (width + 1));
+ 	my_buffer = typeRealloc(char, my_length, my_buffer);
+     }
+-    if (my_buffer == 0)
++    if (my_buffer == NULL)
+ 	return;
+ 
+     for (n = 0; n <= win->_maxy; ++n) {
+@@ -177,7 +177,7 @@
+     }
+ #if NO_LEAKS
+     free(my_buffer);
+-    my_buffer = 0;
++    my_buffer = NULL;
+     my_length = 0;
+ #endif
+ }
+Index: ncurses/trace/lib_tracemse.c
+Prereq:  1.23 
+--- ncurses-6.5-20241130+/ncurses/trace/lib_tracemse.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/trace/lib_tracemse.c	2024-12-07 20:06:49.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2012,2014 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -39,7 +39,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_tracemse.c,v 1.23 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_tracemse.c,v 1.24 2024/12/07 20:06:49 tom Exp $")
+ 
+ #ifdef TRACE
+ 
+@@ -117,9 +117,9 @@
+ NCURSES_EXPORT(char *)
+ _nc_tracemouse(SCREEN *sp, MEVENT const *ep)
+ {
+-    char *result = 0;
++    char *result = NULL;
+ 
+-    if (sp != 0) {
++    if (sp != NULL) {
+ 	_nc_SPRINTF(my_buffer, _nc_SLIMIT(sizeof(my_buffer))
+ 		    TRACEMSE_FMT,
+ 		    ep->id,
+@@ -138,7 +138,7 @@
+ NCURSES_EXPORT(mmask_t)
+ _nc_retrace_mmask_t(SCREEN *sp, mmask_t code)
+ {
+-    if (sp != 0) {
++    if (sp != NULL) {
+ 	*my_buffer = '\0';
+ 	T((T_RETURN("{%s}"), _nc_trace_mmask_t(sp, code)));
+     } else {
+Index: ncurses/trace/trace_buf.c
+Prereq:  1.22 
+--- ncurses-6.5-20241130+/ncurses/trace/trace_buf.c	2023-06-24 13:37:25.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/trace/trace_buf.c	2024-12-07 21:24:18.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2023 Thomas E. Dickey                                     *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2011,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -36,7 +36,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: trace_buf.c,v 1.22 2023/06/24 13:37:25 tom Exp $")
++MODULE_ID("$Id: trace_buf.c,v 1.23 2024/12/07 21:24:18 tom Exp $")
+ 
+ #ifdef TRACE
+ 
+@@ -46,22 +46,22 @@
+ static char *
+ _nc_trace_alloc(int bufnum, size_t want)
+ {
+-    char *result = 0;
++    char *result = NULL;
+ 
+     if (bufnum >= 0) {
+ 	if ((size_t) (bufnum + 1) > MySize) {
+ 	    size_t need = (size_t) (bufnum + 1) * 2;
+-	    if ((MyList = typeRealloc(TRACEBUF, need, MyList)) != 0) {
++	    if ((MyList = typeRealloc(TRACEBUF, need, MyList)) != NULL) {
+ 		while (need > MySize)
+-		    MyList[MySize++].text = 0;
++		    MyList[MySize++].text = NULL;
+ 	    }
+ 	}
+ 
+-	if (MyList != 0) {
+-	    if (MyList[bufnum].text == 0
++	if (MyList != NULL) {
++	    if (MyList[bufnum].text == NULL
+ 		|| want > MyList[bufnum].size) {
+ 		MyList[bufnum].text = typeRealloc(char, want, MyList[bufnum].text);
+-		if (MyList[bufnum].text != 0)
++		if (MyList[bufnum].text != NULL)
+ 		    MyList[bufnum].size = want;
+ 	    }
+ 	    result = MyList[bufnum].text;
+@@ -72,12 +72,12 @@
+ 	if (MySize) {
+ 	    if (MyList) {
+ 		while (MySize--) {
+-		    if (MyList[MySize].text != 0) {
++		    if (MyList[MySize].text != NULL) {
+ 			free(MyList[MySize].text);
+ 		    }
+ 		}
+ 		free(MyList);
+-		MyList = 0;
++		MyList = NULL;
+ 	    }
+ 	    MySize = 0;
+ 	}
+@@ -93,7 +93,7 @@
+ _nc_trace_buf(int bufnum, size_t want)
+ {
+     char *result = _nc_trace_alloc(bufnum, want);
+-    if (result != 0)
++    if (result != NULL)
+ 	*result = '\0';
+     return result;
+ }
+@@ -109,12 +109,12 @@
+     if (value == NULL)
+ 	value = "";
+     buffer = _nc_trace_alloc(bufnum, (size_t) 0);
+-    if (buffer != 0) {
++    if (buffer != NULL) {
+ 	size_t have = strlen(buffer);
+ 	size_t need = strlen(value) + have;
+ 
+ 	buffer = _nc_trace_alloc(bufnum, 1 + need);
+-	if (buffer != 0)
++	if (buffer != NULL)
+ 	    _nc_STRCPY(buffer + have, value, need);
+ 
+     }
+Index: ncurses/trace/trace_tries.c
+Prereq:  1.18 
+--- ncurses-6.5-20241130+/ncurses/trace/trace_tries.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/trace/trace_tries.c	2024-12-07 21:24:18.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1999-2011,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -36,7 +36,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: trace_tries.c,v 1.18 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: trace_tries.c,v 1.19 2024/12/07 21:24:18 tom Exp $")
+ 
+ #ifdef TRACE
+ #define my_buffer _nc_globals.tracetry_buf
+@@ -50,8 +50,8 @@
+ 	my_buffer = (unsigned char *) _nc_doalloc(my_buffer, my_length);
+     }
+ 
+-    if (my_buffer != 0) {
+-	while (tree != 0) {
++    if (my_buffer != NULL) {
++	while (tree != NULL) {
+ 	    if ((my_buffer[level] = tree->ch) == 0)
+ 		my_buffer[level] = 128;
+ 	    my_buffer[level + 1] = 0;
+@@ -69,7 +69,7 @@
+ NCURSES_EXPORT(void)
+ _nc_trace_tries(TRIES * tree)
+ {
+-    if ((my_buffer = typeMalloc(unsigned char, my_length = 80)) != 0) {
++    if ((my_buffer = typeMalloc(unsigned char, my_length = 80)) != NULL) {
+ 	_tracef("BEGIN tries %p", (void *) tree);
+ 	recur_tries(tree, 0);
+ 	_tracef(". . . tries %p", (void *) tree);
+Index: ncurses/trace/varargs.c
+Prereq:  1.14 
+--- ncurses-6.5-20241130+/ncurses/trace/varargs.c	2024-07-27 19:23:59.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/trace/varargs.c	2024-12-07 18:00:11.000000000 +0000
+@@ -35,7 +35,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: varargs.c,v 1.14 2024/07/27 19:23:59 tom Exp $")
++MODULE_ID("$Id: varargs.c,v 1.15 2024/12/07 18:00:11 tom Exp $")
+ 
+ #ifdef TRACE
+ 
+@@ -63,17 +63,17 @@
+     const char *param;
+     int n;
+ 
+-    if (fmt == 0 || *fmt == '\0')
++    if (fmt == NULL || *fmt == '\0')
+ 	return NULL;
+     if (MyLength == 0)
+ 	MyBuffer = typeMalloc(char, MyLength = BUFSIZ);
+-    if (MyBuffer == 0)
++    if (MyBuffer == NULL)
+ 	return NULL;
+     *MyBuffer = '\0';
+ 
+     while (*fmt != '\0') {
+ 	if (*fmt == '%') {
+-	    const char *pval = 0;	/* avoid const-cast */
++	    const char *pval = NULL;	/* avoid const-cast */
+ 	    const char *sval = "";
+ 	    double fval = 0.0;
+ 	    int done = FALSE;
+@@ -169,7 +169,7 @@
+ 			}
+ 			MyLength += strlen(param) + 2;
+ 			MyBuffer = typeRealloc(char, MyLength, MyBuffer);
+-			if (MyBuffer != 0) {
++			if (MyBuffer != NULL) {
+ 			    _nc_SPRINTF(MyBuffer + strlen(MyBuffer),
+ 					_nc_SLIMIT(MyLength - strlen(MyBuffer))
+ 					", %s", param);
+Index: ncurses/trace/visbuf.c
+Prereq:  1.55 
+--- ncurses-6.5-20241130+/ncurses/trace/visbuf.c	2024-11-30 21:24:09.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/trace/visbuf.c	2024-12-07 21:12:53.000000000 +0000
+@@ -43,7 +43,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: visbuf.c,v 1.55 2024/11/30 21:24:09 tom Exp $")
++MODULE_ID("$Id: visbuf.c,v 1.56 2024/12/07 21:12:53 tom Exp $")
+ 
+ #define NUM_VISBUFS 4
+ 
+@@ -109,11 +109,11 @@
+ static const char *
+ _nc_visbuf2n(int bufnum, const char *buf, int len)
+ {
+-    const char *vbuf = 0;
++    const char *vbuf = NULL;
+     char *tp;
+     int count;
+ 
+-    if (buf == 0)
++    if (buf == NULL)
+ 	return ("(null)");
+     if (buf == CANCELLED_STRING)
+ 	return ("(cancelled)");
+@@ -140,7 +140,7 @@
+ 	}
+     }
+ #endif
+-    if (tp != 0) {
++    if (tp != NULL) {
+ 	int c;
+ 
+ 	*tp++ = D_QUOTE;
+@@ -196,7 +196,7 @@
+     char *tp;
+     int count;
+ 
+-    if (buf == 0)
++    if (buf == NULL)
+ 	return ("(null)");
+ 
+     if (len < 0)
+@@ -212,7 +212,7 @@
+ 	vbuf = tp = mybuf[bufnum];
+     }
+ #endif
+-    if (tp != 0) {
++    if (tp != NULL) {
+ 	wchar_t c;
+ 
+ 	*tp++ = D_QUOTE;
+@@ -267,12 +267,12 @@
+     }
+     if (mylen < ++n) {
+ 	mylen = n + 80;
+-	if (mybuf != 0)
++	if (mybuf != NULL)
+ 	    mybuf = typeRealloc(wchar_t, mylen, mybuf);
+ 	else
+ 	    mybuf = typeMalloc(wchar_t, mylen);
+     }
+-    if (mybuf != 0) {
++    if (mybuf != NULL) {
+ 	for (n = 0; buf[n] != 0; ++n) {
+ 	    mybuf[n] = (wchar_t) buf[n];
+ 	}
+@@ -289,7 +289,7 @@
+ {
+     char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ);
+ 
+-    if (result != 0) {
++    if (result != NULL) {
+ 	int first = 0;
+ 
+ #if USE_WIDEC_SUPPORT
+@@ -317,7 +317,7 @@
+ 	    for (j = first; j <= last; ++j) {
+ 		const char *found = _nc_altcharset_name(attr, (chtype)
+ 							CharOf(buf[j]));
+-		if (found != 0) {
++		if (found != NULL) {
+ 		    (void) _nc_trace_bufcat(bufnum, found);
+ 		    attr &= ~A_ALTCHARSET;
+ 		} else
+Index: ncurses/tty/MKexpanded.sh
+Prereq:  1.24 
+--- ncurses-6.5-20241130+/ncurses/tty/MKexpanded.sh	2022-02-05 17:27:18.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tty/MKexpanded.sh	2024-12-07 20:48:46.000000000 +0000
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ ##############################################################################
+-# Copyright 2019-2020,2021 Thomas E. Dickey                                  #
++# Copyright 2019-2021,2024 Thomas E. Dickey                                  #
+ # Copyright 1998-2015,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -30,7 +30,7 @@
+ #
+ # Author: Thomas E. Dickey, 1997-on
+ #
+-# $Id: MKexpanded.sh,v 1.24 2022/02/05 17:27:18 tom Exp $
++# $Id: MKexpanded.sh,v 1.25 2024/12/07 20:48:46 tom Exp $
+ #
+ # Script to generate 'expanded.c', a dummy source that contains functions
+ # corresponding to complex macros used in this library.  By making functions,
+@@ -127,7 +127,12 @@
+ EOF
+ 
+ $preprocessor $TMP 2>/dev/null | \
+-	sed -e '1,/^IGNORE$/d' -e 's/^@/#/' -e 's/^#[ 	]*if_/#if /' -e "s,$TMP,expanded.c,"
++	sed -e '1,/^IGNORE$/d' \
++		-e 's/^@/#/' \
++		-e 's/^#[ 	]*if_/#if /' \
++		-e "s,$TMP,expanded.c," \
++		-e 's/[ 	][ 	]*$//' \
++		-e '/^#[ 	]*[0-9]/d'
+ 
+ cat <
+ 
+-MODULE_ID("$Id: hardscroll.c,v 1.58 2023/09/09 16:04:08 Nicholas.Marriott Exp $")
++MODULE_ID("$Id: hardscroll.c,v 1.59 2024/12/07 20:06:49 tom Exp $")
+ 
+ #if defined(SCROLLDEBUG) || defined(HASHDEBUG)
+ 
+@@ -169,7 +169,7 @@
+    if OLDNUM(n) == _NEWINDEX, then the line n in new, not shifted from
+    somewhere. */
+ NCURSES_EXPORT_VAR (int *)
+-  _nc_oldnums = 0;		/* obsolete: keep for ABI compat */
++  _nc_oldnums = NULL;		/* obsolete: keep for ABI compat */
+ 
+ # if USE_HASHMAP
+ #  define oldnums(sp)   (sp)->_oldnum_list
+@@ -196,7 +196,7 @@
+     /* get enough storage */
+     assert(OLDNUM_SIZE(SP_PARM) >= 0);
+     assert(screen_lines(SP_PARM) > 0);
+-    if ((oldnums(SP_PARM) == 0)
++    if ((oldnums(SP_PARM) == NULL)
+ 	|| (OLDNUM_SIZE(SP_PARM) < screen_lines(SP_PARM))) {
+ 	int need_lines = ((OLDNUM_SIZE(SP_PARM) < screen_lines(SP_PARM))
+ 			  ? screen_lines(SP_PARM)
+@@ -308,11 +308,11 @@
+ /* dump the state of the real and virtual oldnum fields */
+ {
+     if (USE_TRACEF(TRACE_UPDATE | TRACE_MOVE)) {
+-	char *buf = 0;
++	char *buf = NULL;
+ 	size_t want = ((size_t) screen_lines(SP_PARM) + 1) * 4;
+ 	(void) SP_PARM;
+ 
+-	if ((buf = typeMalloc(char, want)) != 0) {
++	if ((buf = typeMalloc(char, want)) != NULL) {
+ 	    int n;
+ 
+ 	    *buf = '\0';
+Index: ncurses/tty/hashmap.c
+Prereq:  1.72 
+--- ncurses-6.5-20241130+/ncurses/tty/hashmap.c	2024-07-27 19:22:23.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tty/hashmap.c	2024-12-07 17:18:07.000000000 +0000
+@@ -74,7 +74,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: hashmap.c,v 1.72 2024/07/27 19:22:23 tom Exp $")
++MODULE_ID("$Id: hashmap.c,v 1.73 2024/12/07 17:18:07 tom Exp $")
+ 
+ #ifdef HASHDEBUG
+ 
+@@ -311,10 +311,10 @@
+ 	}
+     } else {
+ 	/* re-hash all */
+-	if (oldhash(SP_PARM) == 0)
++	if (oldhash(SP_PARM) == NULL)
+ 	    oldhash(SP_PARM) = typeCalloc(unsigned long,
+ 					    (size_t) screen_lines(SP_PARM));
+-	if (newhash(SP_PARM) == 0)
++	if (newhash(SP_PARM) == NULL)
+ 	    newhash(SP_PARM) = typeCalloc(unsigned long,
+ 					    (size_t) screen_lines(SP_PARM));
+ 	if (!oldhash(SP_PARM) || !newhash(SP_PARM)) {
+Index: ncurses/tty/lib_mvcur.c
+Prereq:  1.161 
+--- ncurses-6.5-20241130+/ncurses/tty/lib_mvcur.c	2023-09-16 16:29:02.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tty/lib_mvcur.c	2024-12-07 20:06:49.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -160,7 +160,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_mvcur.c,v 1.161 2023/09/16 16:29:02 tom Exp $")
++MODULE_ID("$Id: lib_mvcur.c,v 1.162 2024/12/07 20:06:49 tom Exp $")
+ 
+ #define WANT_CHAR(sp, y, x) NewScreen(sp)->_line[y].text[x]	/* desired state */
+ 
+@@ -222,7 +222,7 @@
+ NCURSES_SP_NAME(_nc_msec_cost) (NCURSES_SP_DCLx const char *const cap, int affcnt)
+ /* compute the cost of a given operation */
+ {
+-    if (cap == 0)
++    if (cap == NULL)
+ 	return (INFINITY);
+     else {
+ 	const char *cp;
+@@ -364,7 +364,7 @@
+     SP_PARM->_home_cost = CostOf(cursor_home, 0);
+     SP_PARM->_ll_cost = CostOf(cursor_to_ll, 0);
+ #if USE_HARD_TABS
+-    if (getenv("NCURSES_NO_HARD_TABS") == 0
++    if (getenv("NCURSES_NO_HARD_TABS") == NULL
+ 	&& dest_tabs_magic_smso == 0
+ 	&& HasHardTabs()) {
+ 	SP_PARM->_ht_cost = CostOf(tab, 0);
+@@ -461,12 +461,12 @@
+      * nested on the various terminals (vt100, xterm, etc.) which use this
+      * feature.
+      */
+-    if (save_cursor != 0
+-	&& enter_ca_mode != 0
+-	&& strstr(enter_ca_mode, save_cursor) != 0) {
++    if (save_cursor != NULL
++	&& enter_ca_mode != NULL
++	&& strstr(enter_ca_mode, save_cursor) != NULL) {
+ 	T(("...suppressed sc/rc capability due to conflict with smcup/rmcup"));
+-	save_cursor = 0;
+-	restore_cursor = 0;
++	save_cursor = NULL;
++	restore_cursor = NULL;
+     }
+ 
+     /*
+@@ -580,7 +580,7 @@
+     if (to_y != from_y) {
+ 	vcost = INFINITY;
+ 
+-	if (row_address != 0
++	if (row_address != NULL
+ 	    && _nc_safe_strcat(target, TIPARM_1(row_address, to_y))) {
+ 	    vcost = SP_PARM->_vpa_cost;
+ 	}
+@@ -984,7 +984,7 @@
+     TR(TRACE_CALLS | TRACE_MOVE, (T_CALLED("_nc_real_mvcur(%p,%d,%d,%d,%d)"),
+ 				  (void *) SP_PARM, yold, xold, ynew, xnew));
+ 
+-    if (SP_PARM == 0) {
++    if (SP_PARM == NULL) {
+ 	code = ERR;
+     } else if (yold == ynew && xold == xnew) {
+ 	code = OK;
+@@ -1079,7 +1079,7 @@
+      * external calls.  Flush the output if the screen has not been
+      * initialized, e.g., when used from low-level terminfo programs.
+      */
+-    if ((SP_PARM != 0) && (SP_PARM->_endwin == ewInitial))
++    if ((SP_PARM != NULL) && (SP_PARM->_endwin == ewInitial))
+ 	NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
+     return rc;
+ }
+Index: ncurses/tty/lib_tstp.c
+Prereq:  1.54 
+--- ncurses-6.5-20241130+/ncurses/tty/lib_tstp.c	2022-12-24 22:22:10.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tty/lib_tstp.c	2024-12-07 20:06:49.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2021,2022 Thomas E. Dickey                                *
++ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2014,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: lib_tstp.c,v 1.54 2022/12/24 22:22:10 tom Exp $")
++MODULE_ID("$Id: lib_tstp.c,v 1.55 2024/12/07 20:06:49 tom Exp $")
+ 
+ #if defined(SIGTSTP) && (HAVE_SIGACTION || HAVE_SIGVEC)
+ #define USE_SIGTSTP 1
+@@ -159,7 +159,7 @@
+      *
+      * Don't do this if we're not in curses -
+      */
+-    if (sp != 0 && (sp->_endwin == ewRunning))
++    if (sp != NULL && (sp->_endwin == ewRunning))
+ #if HAVE_TCGETPGRP
+ 	if (tcgetpgrp(STDIN_FILENO) == getpgrp())
+ #endif
+@@ -269,7 +269,7 @@
+ 	{
+ 	    SCREEN *scan;
+ 	    for (each_screen(scan)) {
+-		if (scan->_ofp != 0
++		if (scan->_ofp != NULL
+ 		    && NC_ISATTY(fileno(scan->_ofp))) {
+ 		    scan->_outch = NCURSES_SP_NAME(_nc_outch);
+ 		}
+Index: ncurses/tty/lib_twait.c
+Prereq:  1.82 
+--- ncurses-6.5-20241130+/ncurses/tty/lib_twait.c	2024-10-05 22:47:12.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tty/lib_twait.c	2024-12-07 21:02:00.000000000 +0000
+@@ -76,7 +76,7 @@
+ #endif
+ #undef CUR
+ 
+-MODULE_ID("$Id: lib_twait.c,v 1.82 2024/10/05 22:47:12 tom Exp $")
++MODULE_ID("$Id: lib_twait.c,v 1.83 2024/12/07 21:02:00 tom Exp $")
+ 
+ /*
+  * Returns an elapsed time, in milliseconds (if possible).
+@@ -120,7 +120,7 @@
+ {
+     int event_delay = -1;
+ 
+-    if (evl != 0) {
++    if (evl != NULL) {
+ 	int n;
+ 
+ 	for (n = 0; n < evl->count; ++n) {
+Index: ncurses/tty/lib_vidattr.c
+Prereq:  1.79 
+--- ncurses-6.5-20241130+/ncurses/tty/lib_vidattr.c	2023-04-28 20:59:26.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tty/lib_vidattr.c	2024-12-07 20:08:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -70,7 +70,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_vidattr.c,v 1.79 2023/04/28 20:59:26 tom Exp $")
++MODULE_ID("$Id: lib_vidattr.c,v 1.80 2024/12/07 20:08:15 tom Exp $")
+ 
+ #define doPut(mode) \
+ 	TPUTS_TRACE(#mode); \
+@@ -114,9 +114,9 @@
+     attr_t turn_on, turn_off;
+     int pair;
+     bool reverse = FALSE;
+-    bool can_color = (SP_PARM == 0 || SP_PARM->_coloron);
++    bool can_color = (SP_PARM == NULL || SP_PARM->_coloron);
+ #if NCURSES_EXT_FUNCS
+-    bool fix_pair0 = (SP_PARM != 0 && SP_PARM->_coloron && !SP_PARM->_default_color);
++    bool fix_pair0 = (SP_PARM != NULL && SP_PARM->_coloron && !SP_PARM->_default_color);
+ #else
+ #define fix_pair0 FALSE
+ #endif
+@@ -134,7 +134,7 @@
+ 
+     TR(TRACE_ATTRS, ("previous attribute was %s", _traceattr(PreviousAttr)));
+ 
+-    if ((SP_PARM != 0)
++    if ((SP_PARM != NULL)
+ 	&& (magic_cookie_glitch > 0)) {
+ #if USE_XMC_SUPPORT
+ 	static const chtype table[] =
+Index: ncurses/tty/tty_update.c
+Prereq:  1.316 
+--- ncurses-6.5-20241130+/ncurses/tty/tty_update.c	2024-02-04 00:09:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/tty/tty_update.c	2024-12-07 18:00:11.000000000 +0000
+@@ -85,7 +85,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: tty_update.c,v 1.316 2024/02/04 00:09:34 tom Exp $")
++MODULE_ID("$Id: tty_update.c,v 1.317 2024/12/07 18:00:11 tom Exp $")
+ 
+ /*
+  * This define controls the line-breakout optimization.  Every once in a
+@@ -262,7 +262,7 @@
+ 		|| (SP_PARM->_legacy_coding > 1 && CharOf(CHDEREF(ch)) >= 128)
+ 		|| (AttrOf(attr) & A_ALTCHARSET
+ 		    && ((CharOfD(ch) < ACS_LEN
+-			 && SP_PARM->_acs_map != 0
++			 && SP_PARM->_acs_map != NULL
+ 			 && SP_PARM->_acs_map[CharOfD(ch)] != 0)
+ 			|| (CharOfD(ch) >= 128))))) {
+ 	    ;
+@@ -275,7 +275,7 @@
+ #endif
+ 
+     if ((AttrOf(attr) & A_ALTCHARSET)
+-	&& SP_PARM->_acs_map != 0
++	&& SP_PARM->_acs_map != NULL
+ 	&& ((CharOfD(ch) < ACS_LEN)
+ #if !NCURSES_WCWIDTH_GRAPHICS
+ 	    || is_wacs_value(CharOfD(ch))
+@@ -621,7 +621,7 @@
+ 		} else {
+ 		    return 1;	/* cursor stays in the middle */
+ 		}
+-	    } else if (repeat_char != 0 &&
++	    } else if (repeat_char != NULL &&
+ #if BSD_TPUTS
+ 		       !isdigit(UChar(CharOf(ntext0))) &&
+ #endif
+@@ -643,7 +643,7 @@
+ 		UpdateAttrs(SP_PARM, ntext0);
+ 		temp = ntext0;
+ 		if ((AttrOf(temp) & A_ALTCHARSET) &&
+-		    SP_PARM->_acs_map != 0 &&
++		    SP_PARM->_acs_map != NULL &&
+ 		    (SP_PARM->_acs_map[CharOf(temp)] & A_CHARTEXT) != 0) {
+ 		    SetChar(temp,
+ 			    (SP_PARM->_acs_map[CharOf(ntext0)] & A_CHARTEXT),
+@@ -745,7 +745,7 @@
+ 
+     _nc_lock_global(update);
+ 
+-    if (SP_PARM == 0) {
++    if (SP_PARM == NULL) {
+ 	_nc_unlock_global(update);
+ 	returnCode(ERR);
+     }
+@@ -762,7 +762,7 @@
+     if (SP_PARM == CURRENT_SCREEN) {
+ #endif
+ #define SyncScreens(internal,exported) \
+-	if (internal == 0) internal = exported; \
++	if (internal == NULL) internal = exported; \
+ 	if (internal != exported) exported = internal
+ 
+ 	SyncScreens(CurScreen(SP_PARM), curscr);
+@@ -773,9 +773,9 @@
+ #endif
+ #endif /* !USE_REENTRANT */
+ 
+-    if (CurScreen(SP_PARM) == 0
+-	|| NewScreen(SP_PARM) == 0
+-	|| StdScreen(SP_PARM) == 0) {
++    if (CurScreen(SP_PARM) == NULL
++	|| NewScreen(SP_PARM) == NULL
++	|| StdScreen(SP_PARM) == NULL) {
+ 	_nc_unlock_global(update);
+ 	returnCode(ERR);
+     }
+@@ -1132,7 +1132,7 @@
+ ClrUpdate(NCURSES_SP_DCL0)
+ {
+     TR(TRACE_UPDATE, (T_CALLED("ClrUpdate")));
+-    if (0 != SP_PARM) {
++    if (NULL != SP_PARM) {
+ 	int i;
+ 	NCURSES_CH_T blank = ClrBlank(NCURSES_SP_ARGx StdScreen(SP_PARM));
+ 	int nonempty = Min(screen_lines(SP_PARM),
+@@ -1159,7 +1159,7 @@
+ static void
+ ClrToEOL(NCURSES_SP_DCLx NCURSES_CH_T blank, int needclear)
+ {
+-    if (CurScreen(SP_PARM) != 0
++    if (CurScreen(SP_PARM) != NULL
+ 	&& SP_PARM->_cursrow >= 0) {
+ 	int j;
+ 
+@@ -2223,7 +2223,7 @@
+ NCURSES_EXPORT(void)
+ NCURSES_SP_NAME(_nc_screen_wrap) (NCURSES_SP_DCL0)
+ {
+-    if (SP_PARM != 0) {
++    if (SP_PARM != NULL) {
+ 
+ 	UpdateAttrs(SP_PARM, normal);
+ #if NCURSES_EXT_FUNCS
+@@ -2265,7 +2265,7 @@
+ NCURSES_EXPORT(void)
+ NCURSES_SP_NAME(_nc_do_xmc_glitch) (NCURSES_SP_DCLx attr_t previous)
+ {
+-    if (SP_PARM != 0) {
++    if (SP_PARM != NULL) {
+ 	attr_t chg = XMC_CHANGES(previous ^ AttrOf(SCREEN_ATTRS(SP_PARM)));
+ 
+ 	while (chg != 0) {
+Index: ncurses/wcwidth.h
+Prereq:  1.7 
+--- ncurses-6.5-20241130+/ncurses/wcwidth.h	2024-09-21 15:49:15.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/wcwidth.h	2024-12-07 16:20:09.000000000 +0000
+@@ -1,4 +1,4 @@
+-/* $Id: wcwidth.h,v 1.7 2024/09/21 15:49:15 tom Exp $ */
++/* $Id: wcwidth.h,v 1.8 2024/12/07 16:20:09 tom Exp $ */
+ 
+ /*
+  * Copyright 2002-2023,2024 by Thomas E. Dickey
+@@ -230,7 +230,7 @@
+ 
+   /* sorted list of non-overlapping intervals of non-spacing characters */
+   /* generated by
+-   *    uniset +cat=Me +cat=Mn +0600-0605 +061C +06DD +070F +1160-11FF +D7B0-D7C6 +D7CB-D7FB c 
++   *    uniset +cat=Me +cat=Mn +0600-0605 +061C +06DD +070F +1160-11FF +D7B0-D7C6 +D7CB-D7FB c
+    */
+   /* *INDENT-OFF* */
+   /* generated by run-uniset 1.9 */
+Index: ncurses/widechar/lib_add_wch.c
+Prereq:  1.19 
+--- ncurses-6.5-20241130+/ncurses/widechar/lib_add_wch.c	2024-07-27 19:22:23.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/widechar/lib_add_wch.c	2024-12-07 18:00:11.000000000 +0000
+@@ -40,7 +40,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: lib_add_wch.c,v 1.19 2024/07/27 19:22:23 tom Exp $")
++MODULE_ID("$Id: lib_add_wch.c,v 1.20 2024/12/07 18:00:11 tom Exp $")
+ 
+ /* clone/adapt lib_addch.c */
+ static const cchar_t blankchar = NewChar(BLANK_TEXT);
+@@ -384,7 +384,7 @@
+ 	win->_flags &= ~_WRAPPED;
+ 	break;
+     default:
+-	if ((s = wunctrl(&ch)) != 0) {
++	if ((s = wunctrl(&ch)) != NULL) {
+ 	    while (*s) {
+ 		cchar_t sch;
+ 		SetChar(sch, *s++, AttrOf(ch));
+Index: ncurses/widechar/lib_box_set.c
+Prereq:  1.7 
+--- ncurses-6.5-20241130+/ncurses/widechar/lib_box_set.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/widechar/lib_box_set.c	2024-12-07 20:08:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 2002-2009,2011 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_box_set.c,v 1.7 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_box_set.c,v 1.8 2024/12/07 20:08:15 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ wborder_set(WINDOW *win,
+@@ -67,7 +67,7 @@
+     if (!win)
+ 	returnCode(ERR);
+ 
+-#define RENDER_WITH_DEFAULT(ch,def) w ##ch = _nc_render(win, (ch == 0) ? *(const ARG_CH_T)def : *ch)
++#define RENDER_WITH_DEFAULT(ch,def) w ##ch = _nc_render(win, (ch == NULL) ? *(const ARG_CH_T)def : *ch)
+ 
+     RENDER_WITH_DEFAULT(ls, WACS_VLINE);
+     RENDER_WITH_DEFAULT(rs, WACS_VLINE);
+Index: ncurses/widechar/lib_cchar.c
+Prereq:  1.39 
+--- ncurses-6.5-20241130+/ncurses/widechar/lib_cchar.c	2024-07-27 19:22:23.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/widechar/lib_cchar.c	2024-12-07 18:07:52.000000000 +0000
+@@ -37,7 +37,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: lib_cchar.c,v 1.39 2024/07/27 19:22:23 tom Exp $")
++MODULE_ID("$Id: lib_cchar.c,v 1.40 2024/12/07 18:07:52 tom Exp $")
+ 
+ /*
+  * The SuSv2 description leaves some room for interpretation.  We'll assume wch
+@@ -135,7 +135,7 @@
+ 	     * If the value is not a null, return the length plus 1 for null.
+ 	     */
+ 	    code = (len < CCHARW_MAX) ? (len + 1) : CCHARW_MAX;
+-	} else if (attrs == 0 || pair_arg == 0) {
++	} else if (attrs == NULL || pair_arg == NULL) {
+ 	    code = ERR;
+ 	} else if (len >= 0) {
+ 	    int color_pair;
+Index: ncurses/widechar/lib_get_wch.c
+Prereq:  1.26 
+--- ncurses-6.5-20241130+/ncurses/widechar/lib_get_wch.c	2021-04-17 16:12:54.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/widechar/lib_get_wch.c	2024-12-07 20:08:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
+  * Copyright 2002-2011,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -41,7 +41,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: lib_get_wch.c,v 1.26 2021/04/17 16:12:54 tom Exp $")
++MODULE_ID("$Id: lib_get_wch.c,v 1.27 2024/12/07 20:08:15 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ wget_wch(WINDOW *win, wint_t *result)
+@@ -62,7 +62,7 @@
+     _nc_lock_global(curses);
+     sp = _nc_screen_of(win);
+ 
+-    if (sp != 0) {
++    if (sp != NULL) {
+ 	size_t count = 0;
+ 
+ 	for (;;) {
+@@ -112,7 +112,7 @@
+ 	code = ERR;
+     }
+ 
+-    if (result != 0)
++    if (result != NULL)
+ 	*result = (wint_t) value;
+ 
+     _nc_unlock_global(curses);
+Index: ncurses/widechar/lib_hline_set.c
+Prereq:  1.6 
+--- ncurses-6.5-20241130+/ncurses/widechar/lib_hline_set.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/widechar/lib_hline_set.c	2024-12-07 20:08:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 2002-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_hline_set.c,v 1.6 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_hline_set.c,v 1.7 2024/12/07 20:08:15 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ whline_set(WINDOW *win, const cchar_t *ch, int n)
+@@ -60,7 +60,7 @@
+ 
+ 	CHANGED_RANGE(line, start, end);
+ 
+-	if (ch == 0)
++	if (ch == NULL)
+ 	    wch = *WACS_HLINE;
+ 	else
+ 	    wch = *ch;
+Index: ncurses/widechar/lib_in_wch.c
+Prereq:  1.7 
+--- ncurses-6.5-20241130+/ncurses/widechar/lib_in_wch.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/widechar/lib_in_wch.c	2024-12-07 20:08:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 2002-2009,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_in_wch.c,v 1.7 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_in_wch.c,v 1.8 2024/12/07 20:08:15 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ win_wch(WINDOW *win, cchar_t *wcval)
+@@ -49,8 +49,8 @@
+ 
+     TR(TRACE_CCALLS, (T_CALLED("win_wch(%p,%p)"), (void *) win, (void *) wcval));
+ 
+-    if (win != 0
+-	&& wcval != 0) {
++    if (win != NULL
++	&& wcval != NULL) {
+ 	int row, col;
+ 
+ 	getyx(win, row, col);
+Index: ncurses/widechar/lib_in_wchnstr.c
+Prereq:  1.10 
+--- ncurses-6.5-20241130+/ncurses/widechar/lib_in_wchnstr.c	2024-07-27 19:23:21.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/widechar/lib_in_wchnstr.c	2024-12-07 18:03:14.000000000 +0000
+@@ -40,7 +40,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_in_wchnstr.c,v 1.10 2024/07/27 19:23:21 tom Exp $")
++MODULE_ID("$Id: lib_in_wchnstr.c,v 1.11 2024/12/07 18:03:14 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ win_wchnstr(WINDOW *win, cchar_t *wchstr, int n)
+@@ -48,8 +48,8 @@
+     int code = OK;
+ 
+     T((T_CALLED("win_wchnstr(%p,%p,%d)"), (void *) win, (void *) wchstr, n));
+-    if (win != 0
+-	&& wchstr != 0) {
++    if (win != NULL
++	&& wchstr != NULL) {
+ 	const NCURSES_CH_T *src;
+ 	int row, col;
+ 	int j, k, limit;
+Index: ncurses/widechar/lib_ins_wch.c
+Prereq:  1.30 
+--- ncurses-6.5-20241130+/ncurses/widechar/lib_ins_wch.c	2024-07-27 19:22:23.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/widechar/lib_ins_wch.c	2024-12-07 18:03:14.000000000 +0000
+@@ -40,7 +40,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_ins_wch.c,v 1.30 2024/07/27 19:22:23 tom Exp $")
++MODULE_ID("$Id: lib_ins_wch.c,v 1.31 2024/12/07 18:03:14 tom Exp $")
+ 
+ /*
+  * Insert the given character, updating the current location to simplify
+@@ -87,7 +87,7 @@
+ 
+     T((T_CALLED("wins_wch(%p, %s)"), (void *) win, _tracecchar_t(wch)));
+ 
+-    if (win != 0) {
++    if (win != NULL) {
+ 	NCURSES_SIZE_T oy = win->_cury;
+ 	NCURSES_SIZE_T ox = win->_curx;
+ 
+@@ -108,8 +108,8 @@
+     T((T_CALLED("wins_nwstr(%p,%s,%d)"),
+        (void *) win, _nc_viswbufn(wstr, n), n));
+ 
+-    if (win != 0
+-	&& wstr != 0
++    if (win != NULL
++	&& wstr != NULL
+ 	&& n != 0) {
+ 
+ 	if (n < 0) {
+Index: ncurses/widechar/lib_inwstr.c
+Prereq:  1.11 
+--- ncurses-6.5-20241130+/ncurses/widechar/lib_inwstr.c	2024-07-27 19:02:27.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/widechar/lib_inwstr.c	2024-12-07 18:03:14.000000000 +0000
+@@ -40,7 +40,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_inwstr.c,v 1.11 2024/07/27 19:02:27 tom Exp $")
++MODULE_ID("$Id: lib_inwstr.c,v 1.12 2024/12/07 18:03:14 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ winnwstr(WINDOW *win, wchar_t *wstr, int n)
+@@ -49,7 +49,7 @@
+     const cchar_t *text;
+ 
+     T((T_CALLED("winnwstr(%p,%p,%d)"), (void *) win, (void *) wstr, n));
+-    if (wstr != 0) {
++    if (wstr != NULL) {
+ 	if (win) {
+ 	    int row, col;
+ 	    int last = 0;
+@@ -99,7 +99,7 @@
+     int result = ERR;
+ 
+     T((T_CALLED("winwstr(%p,%p)"), (void *) win, (void *) wstr));
+-    if (win != 0) {
++    if (win != NULL) {
+ 	result = winnwstr(win, wstr,
+ 			  CCHARW_MAX * (win->_maxx - win->_curx + 1));
+     }
+Index: ncurses/widechar/lib_pecho_wchar.c
+Prereq:  1.4 
+--- ncurses-6.5-20241130+/ncurses/widechar/lib_pecho_wchar.c	2021-10-23 17:07:56.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/widechar/lib_pecho_wchar.c	2024-12-07 20:08:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
+  * Copyright 2004,2009 Free Software Foundation, Inc.                       *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -33,14 +33,14 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_pecho_wchar.c,v 1.4 2021/10/23 17:07:56 tom Exp $")
++MODULE_ID("$Id: lib_pecho_wchar.c,v 1.5 2024/12/07 20:08:15 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ pecho_wchar(WINDOW *pad, const cchar_t *wch)
+ {
+     T((T_CALLED("pecho_wchar(%p, %s)"), (void *) pad, _tracech_t(wch)));
+ 
+-    if (pad == 0)
++    if (pad == NULL)
+ 	returnCode(ERR);
+ 
+     if (!IS_PAD(pad))
+Index: ncurses/widechar/lib_slk_wset.c
+Prereq:  1.15 
+--- ncurses-6.5-20241130+/ncurses/widechar/lib_slk_wset.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/widechar/lib_slk_wset.c	2024-12-07 20:08:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 2003-2011,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -41,7 +41,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: lib_slk_wset.c,v 1.15 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_slk_wset.c,v 1.16 2024/12/07 20:08:15 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ slk_wset(int i, const wchar_t *astr, int format)
+@@ -52,7 +52,7 @@
+ 
+     T((T_CALLED("slk_wset(%d, %s, %d)"), i, _nc_viswbuf(astr), format));
+ 
+-    if (astr != 0) {
++    if (astr != NULL) {
+ 	size_t arglen;
+ 
+ 	init_mb(state);
+@@ -61,7 +61,7 @@
+ 	if ((arglen = wcsrtombs(NULL, &str, (size_t) 0, &state)) != (size_t) -1) {
+ 	    char *mystr;
+ 
+-	    if ((mystr = (char *) _nc_doalloc(0, arglen + 1)) != 0) {
++	    if ((mystr = (char *) _nc_doalloc(NULL, arglen + 1)) != NULL) {
+ 		str = astr;
+ 		if (wcsrtombs(mystr, &str, arglen, &state) != (size_t) -1) {
+ 		    /* glibc documentation claims that the terminating L'\0'
+Index: ncurses/widechar/lib_unget_wch.c
+Prereq:  1.18 
+--- ncurses-6.5-20241130+/ncurses/widechar/lib_unget_wch.c	2023-06-03 12:50:52.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/widechar/lib_unget_wch.c	2024-12-07 20:08:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2023 Thomas E. Dickey                                     *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2002-2011,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_unget_wch.c,v 1.18 2023/06/03 12:50:52 tom Exp $")
++MODULE_ID("$Id: lib_unget_wch.c,v 1.19 2024/12/07 20:08:15 tom Exp $")
+ 
+ /*
+  * Wrapper for wcrtomb() which obtains the length needed for the given
+@@ -51,7 +51,7 @@
+ {
+     int result;
+ 
+-    if (target == 0) {
++    if (target == NULL) {
+ 	wchar_t temp[2];
+ 	const wchar_t *tempp = temp;
+ 	temp[0] = source;
+@@ -75,13 +75,13 @@
+     T((T_CALLED("unget_wch(%p, %#lx)"), (void *) SP_PARM, (unsigned long) wch));
+ 
+     init_mb(state);
+-    length = _nc_wcrtomb(0, wch, &state);
++    length = _nc_wcrtomb(NULL, wch, &state);
+ 
+     if (length != (size_t) (-1)
+ 	&& length != 0) {
+ 	char *string;
+ 
+-	if ((string = (char *) malloc(length)) != 0) {
++	if ((string = (char *) malloc(length)) != NULL) {
+ 	    int n;
+ 
+ 	    init_mb(state);
+Index: ncurses/widechar/lib_vid_attr.c
+Prereq:  1.31 
+--- ncurses-6.5-20241130+/ncurses/widechar/lib_vid_attr.c	2023-04-28 20:59:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/widechar/lib_vid_attr.c	2024-12-07 20:08:59.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2002-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -37,7 +37,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_vid_attr.c,v 1.31 2023/04/28 20:59:34 tom Exp $")
++MODULE_ID("$Id: lib_vid_attr.c,v 1.32 2024/12/07 20:08:59 tom Exp $")
+ 
+ #define doPut(mode) \
+ 	TPUTS_TRACE(#mode); \
+@@ -87,9 +87,9 @@
+ 
+     attr_t turn_on, turn_off;
+     bool reverse = FALSE;
+-    bool can_color = (SP_PARM == 0 || SP_PARM->_coloron);
++    bool can_color = (SP_PARM == NULL || SP_PARM->_coloron);
+ #if NCURSES_EXT_FUNCS
+-    bool fix_pair0 = (SP_PARM != 0 && SP_PARM->_coloron && !SP_PARM->_default_color);
++    bool fix_pair0 = (SP_PARM != NULL && SP_PARM->_coloron && !SP_PARM->_default_color);
+ #else
+ #define fix_pair0 FALSE
+ #endif
+@@ -193,15 +193,15 @@
+ 	    TPUTS_TRACE("set_attributes");
+ 	    NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
+ 				    TIPARM_9(set_attributes,
+-					       (newmode & A_STANDOUT) != 0,
+-					       (newmode & A_UNDERLINE) != 0,
+-					       (newmode & A_REVERSE) != 0,
+-					       (newmode & A_BLINK) != 0,
+-					       (newmode & A_DIM) != 0,
+-					       (newmode & A_BOLD) != 0,
+-					       (newmode & A_INVIS) != 0,
+-					       (newmode & A_PROTECT) != 0,
+-					       (newmode & A_ALTCHARSET) != 0),
++					     (newmode & A_STANDOUT) != 0,
++					     (newmode & A_UNDERLINE) != 0,
++					     (newmode & A_REVERSE) != 0,
++					     (newmode & A_BLINK) != 0,
++					     (newmode & A_DIM) != 0,
++					     (newmode & A_BOLD) != 0,
++					     (newmode & A_INVIS) != 0,
++					     (newmode & A_PROTECT) != 0,
++					     (newmode & A_ALTCHARSET) != 0),
+ 				    1, outc);
+ 	    previous_attr &= ALL_BUT_COLOR;
+ 	    previous_pair = 0;
+Index: ncurses/widechar/lib_vline_set.c
+Prereq:  1.6 
+--- ncurses-6.5-20241130+/ncurses/widechar/lib_vline_set.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/widechar/lib_vline_set.c	2024-12-07 20:08:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 2002-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_vline_set.c,v 1.6 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_vline_set.c,v 1.7 2024/12/07 20:08:15 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ wvline_set(WINDOW *win, const cchar_t *ch, int n)
+@@ -58,7 +58,7 @@
+ 	if (end > win->_maxy)
+ 	    end = win->_maxy;
+ 
+-	if (ch == 0)
++	if (ch == NULL)
+ 	    wch = *WACS_VLINE;
+ 	else
+ 	    wch = *ch;
+Index: ncurses/widechar/lib_wacs.c
+Prereq:  1.20 
+--- ncurses-6.5-20241130+/ncurses/widechar/lib_wacs.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/widechar/lib_wacs.c	2024-12-07 20:08:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018,2020 Thomas E. Dickey                                     *
++ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
+  * Copyright 2002-2015,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -33,9 +33,9 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_wacs.c,v 1.20 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_wacs.c,v 1.21 2024/12/07 20:08:32 tom Exp $")
+ 
+-NCURSES_EXPORT_VAR(cchar_t) * _nc_wacs = 0;
++NCURSES_EXPORT_VAR(cchar_t) * _nc_wacs = NULL;
+ 
+ NCURSES_EXPORT(void)
+ _nc_init_wacs(void)
+@@ -119,7 +119,7 @@
+     T(("initializing WIDE-ACS map (Unicode is%s active)",
+        active ? "" : " not"));
+ 
+-    if ((_nc_wacs = typeCalloc(cchar_t, ACS_LEN)) != 0) {
++    if ((_nc_wacs = typeCalloc(cchar_t, ACS_LEN)) != NULL) {
+ 	unsigned n;
+ 
+ 	for (n = 0; n < SIZEOF(table); ++n) {
+Index: ncurses/widechar/lib_wunctrl.c
+Prereq:  1.18 
+--- ncurses-6.5-20241130+/ncurses/widechar/lib_wunctrl.c	2024-07-27 19:23:21.000000000 +0000
++++ ncurses-6.5-20241207/ncurses/widechar/lib_wunctrl.c	2024-12-07 18:03:14.000000000 +0000
+@@ -36,7 +36,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_wunctrl.c,v 1.18 2024/07/27 19:23:21 tom Exp $")
++MODULE_ID("$Id: lib_wunctrl.c,v 1.19 2024/12/07 18:03:14 tom Exp $")
+ 
+ NCURSES_EXPORT(wchar_t *)
+ NCURSES_SP_NAME(wunctrl) (NCURSES_SP_DCLx cchar_t *wc)
+@@ -44,9 +44,9 @@
+     static wchar_t str[CCHARW_MAX + 1];
+     wchar_t *result;
+ 
+-    if (wc == 0) {
+-	result = 0;
+-    } else if (SP_PARM != 0 && Charable(*wc)) {
++    if (wc == NULL) {
++	result = NULL;
++    } else if (SP_PARM != NULL && Charable(*wc)) {
+ 	wchar_t *wsp;
+ 	const char *p =
+ 	NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20241130+/package/debian-mingw/changelog	2024-11-27 21:55:07.000000000 +0000
++++ ncurses-6.5-20241207/package/debian-mingw/changelog	2024-12-07 11:51:44.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241130) unstable; urgency=low
++ncurses6td (6.5+20241207) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Wed, 27 Nov 2024 16:55:07 -0500
++ -- Thomas E. Dickey   Sat, 07 Dec 2024 06:51:44 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20241130+/package/debian-mingw64/changelog	2024-11-27 21:55:07.000000000 +0000
++++ ncurses-6.5-20241207/package/debian-mingw64/changelog	2024-12-07 11:51:44.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241130) unstable; urgency=low
++ncurses6td (6.5+20241207) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Wed, 27 Nov 2024 16:55:07 -0500
++ -- Thomas E. Dickey   Sat, 07 Dec 2024 06:51:44 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20241130+/package/debian/changelog	2024-11-27 21:55:07.000000000 +0000
++++ ncurses-6.5-20241207/package/debian/changelog	2024-12-07 11:51:44.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241130) unstable; urgency=low
++ncurses6td (6.5+20241207) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Wed, 27 Nov 2024 16:55:07 -0500
++ -- Thomas E. Dickey   Sat, 07 Dec 2024 06:51:44 -0500
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.678 
+--- ncurses-6.5-20241130+/package/mingw-ncurses.nsi	2024-11-27 21:55:07.000000000 +0000
++++ ncurses-6.5-20241207/package/mingw-ncurses.nsi	2024-12-07 11:51:44.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.678 2024/11/27 21:55:07 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.679 2024/12/07 11:51:44 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "1130"
++!define VERSION_MMDD  "1207"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20241130+/package/mingw-ncurses.spec	2024-11-27 21:55:07.000000000 +0000
++++ ncurses-6.5-20241207/package/mingw-ncurses.spec	2024-12-07 11:51:44.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20241130
++Release: 20241207
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20241130+/package/ncurses.spec	2024-11-27 21:55:07.000000000 +0000
++++ ncurses-6.5-20241207/package/ncurses.spec	2024-12-07 11:51:44.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20241130
++Release: 20241207
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20241130+/package/ncursest.spec	2024-11-27 21:55:07.000000000 +0000
++++ ncurses-6.5-20241207/package/ncursest.spec	2024-12-07 11:51:44.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20241130
++Release: 20241207
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: panel/p_above.c
+Prereq:  1.11 
+--- ncurses-6.5-20241130+/panel/p_above.c	2020-05-24 01:40:20.000000000 +0000
++++ ncurses-6.5-20241207/panel/p_above.c	2024-12-07 23:05:20.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2010,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -37,11 +37,11 @@
+  */
+ #include "panel.priv.h"
+ 
+-MODULE_ID("$Id: p_above.c,v 1.11 2020/05/24 01:40:20 anonymous.maarten Exp $")
++MODULE_ID("$Id: p_above.c,v 1.12 2024/12/07 23:05:20 tom Exp $")
+ 
+ #if NCURSES_SP_FUNCS
+ PANEL_EXPORT(PANEL *)
+-ground_panel(SCREEN * sp)
++ground_panel(SCREEN *sp)
+ {
+   T((T_CALLED("ground_panel(%p)"), (void *)sp));
+   if (sp)
+@@ -51,12 +51,12 @@
+       if (_nc_bottom_panel)	/* this is the pseudo panel */
+ 	returnPanel(_nc_bottom_panel->above);
+       else
+-	returnPanel(0);
++	returnPanel(NULL);
+     }
+   else
+     {
+-      if (0 == CURRENT_SCREEN)
+-	returnPanel(0);
++      if (NULL == CURRENT_SCREEN)
++	returnPanel(NULL);
+       else
+ 	returnPanel(ground_panel(CURRENT_SCREEN));
+     }
+@@ -64,7 +64,7 @@
+ #endif
+ 
+ PANEL_EXPORT(PANEL *)
+-panel_above(const PANEL * pan)
++panel_above(const PANEL *pan)
+ {
+   PANEL *result;
+ 
+@@ -78,7 +78,7 @@
+ #else
+       /* if top and bottom are equal, we have no or only the pseudo panel;
+          if not, we return the panel above the pseudo panel */
+-      result = EMPTY_STACK()? (PANEL *) 0 : _nc_bottom_panel->above;
++      result = EMPTY_STACK()? (PANEL *)0 : _nc_bottom_panel->above;
+ #endif
+     }
+   returnPanel(result);
+Index: panel/p_below.c
+Prereq:  1.11 
+--- ncurses-6.5-20241130+/panel/p_below.c	2020-05-24 01:40:20.000000000 +0000
++++ ncurses-6.5-20241207/panel/p_below.c	2024-12-07 23:05:20.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2010,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -37,11 +37,11 @@
+  */
+ #include "panel.priv.h"
+ 
+-MODULE_ID("$Id: p_below.c,v 1.11 2020/05/24 01:40:20 anonymous.maarten Exp $")
++MODULE_ID("$Id: p_below.c,v 1.12 2024/12/07 23:05:20 tom Exp $")
+ 
+ #if NCURSES_SP_FUNCS
+ PANEL_EXPORT(PANEL *)
+-ceiling_panel(SCREEN * sp)
++ceiling_panel(SCREEN *sp)
+ {
+   T((T_CALLED("ceiling_panel(%p)"), (void *)sp));
+   if (sp)
+@@ -49,12 +49,12 @@
+       struct panelhook *ph = NCURSES_SP_NAME(_nc_panelhook) (sp);
+ 
+       /* if top and bottom are equal, we have no or only the pseudo panel */
+-      returnPanel(EMPTY_STACK()? (PANEL *) 0 : _nc_top_panel);
++      returnPanel(EMPTY_STACK()? (PANEL *)0 : _nc_top_panel);
+     }
+   else
+     {
+-      if (0 == CURRENT_SCREEN)
+-	returnPanel(0);
++      if (NULL == CURRENT_SCREEN)
++	returnPanel(NULL);
+       else
+ 	returnPanel(ceiling_panel(CURRENT_SCREEN));
+     }
+@@ -62,7 +62,7 @@
+ #endif
+ 
+ PANEL_EXPORT(PANEL *)
+-panel_below(const PANEL * pan)
++panel_below(const PANEL *pan)
+ {
+   PANEL *result;
+ 
+@@ -71,7 +71,7 @@
+     {
+       GetHook(pan);
+       /* we must not return the pseudo panel */
+-      result = Is_Pseudo(pan->below) ? (PANEL *) 0 : pan->below;
++      result = Is_Pseudo(pan->below) ? (PANEL *)0 : pan->below;
+     }
+   else
+     {
+@@ -79,7 +79,7 @@
+       result = ceiling_panel(CURRENT_SCREEN);
+ #else
+       /* if top and bottom are equal, we have no or only the pseudo panel */
+-      result = EMPTY_STACK()? (PANEL *) 0 : _nc_top_panel;
++      result = EMPTY_STACK()? (PANEL *)0 : _nc_top_panel;
+ #endif
+     }
+   returnPanel(result);
+Index: panel/p_new.c
+Prereq:  1.24 
+--- ncurses-6.5-20241130+/panel/p_new.c	2021-10-23 15:12:06.000000000 +0000
++++ ncurses-6.5-20241207/panel/p_new.c	2024-12-07 23:00:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -39,7 +39,7 @@
+  */
+ #include "panel.priv.h"
+ 
+-MODULE_ID("$Id: p_new.c,v 1.24 2021/10/23 15:12:06 tom Exp $")
++MODULE_ID("$Id: p_new.c,v 1.25 2024/12/07 23:00:37 tom Exp $")
+ 
+ #ifdef TRACE
+ static char *stdscr_id;
+@@ -86,7 +86,7 @@
+       ph->destroy = del_panel;
+ #endif
+       _nc_stdscr_pseudo_panel = AllocPanel("root_panel");
+-      if (_nc_stdscr_pseudo_panel != 0)
++      if (_nc_stdscr_pseudo_panel != NULL)
+ 	{
+ 	  PANEL *pan = _nc_stdscr_pseudo_panel;
+ 	  WINDOW *win = SP_PARM->_stdscr;
+Index: panel/panel.c
+Prereq:  1.30 
+--- ncurses-6.5-20241130+/panel/panel.c	2020-09-26 18:05:17.000000000 +0000
++++ ncurses-6.5-20241207/panel/panel.c	2024-12-07 23:05:20.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2010,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -37,14 +37,14 @@
+ /* panel.c -- implementation of panels library, some core routines */
+ #include "panel.priv.h"
+ 
+-MODULE_ID("$Id: panel.c,v 1.30 2020/09/26 18:05:17 tom Exp $")
++MODULE_ID("$Id: panel.c,v 1.31 2024/12/07 23:05:20 tom Exp $")
+ 
+ /*+-------------------------------------------------------------------------
+ 	_nc_retrace_panel (pan)
+ --------------------------------------------------------------------------*/
+ #ifdef TRACE
+ PANEL_EXPORT(PANEL *)
+-_nc_retrace_panel(PANEL * pan)
++_nc_retrace_panel(PANEL *pan)
+ {
+   T((T_RETURN("%p"), (void *)pan));
+   return pan;
+@@ -61,7 +61,7 @@
+ {
+   char temp[32];
+ 
+-  if (ptr != 0)
++  if (ptr != NULL)
+     _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "%p", ptr);
+   else
+     _nc_STRCPY(temp, "", sizeof(temp));
+@@ -75,7 +75,7 @@
+ --------------------------------------------------------------------------*/
+ #ifdef TRACE
+ PANEL_EXPORT(void)
+-_nc_dPanel(const char *text, const PANEL * pan)
++_nc_dPanel(const char *text, const PANEL *pan)
+ {
+   _tracef("%s id=%s b=%s a=%s y=%d x=%d",
+ 	  text, USER_PTR(pan->user, 1),
+@@ -90,7 +90,7 @@
+ --------------------------------------------------------------------------*/
+ #ifdef TRACE
+ PANEL_EXPORT(void)
+-_nc_dStack(const char *fmt, int num, const PANEL * pan)
++_nc_dStack(const char *fmt, int num, const PANEL *pan)
+ {
+   char s80[80];
+ 
+@@ -116,7 +116,7 @@
+ --------------------------------------------------------------------------*/
+ #ifdef TRACE
+ PANEL_EXPORT(void)
+-_nc_Wnoutrefresh(const PANEL * pan)
++_nc_Wnoutrefresh(const PANEL *pan)
+ {
+   dPanel("wnoutrefresh", pan);
+   wnoutrefresh(pan->win);
+@@ -128,7 +128,7 @@
+ --------------------------------------------------------------------------*/
+ #ifdef TRACE
+ PANEL_EXPORT(void)
+-_nc_Touchpan(const PANEL * pan)
++_nc_Touchpan(const PANEL *pan)
+ {
+   dPanel("Touchpan", pan);
+   touchwin(pan->win);
+@@ -140,7 +140,7 @@
+ --------------------------------------------------------------------------*/
+ #ifdef TRACE
+ PANEL_EXPORT(void)
+-_nc_Touchline(const PANEL * pan, int start, int count)
++_nc_Touchline(const PANEL *pan, int start, int count)
+ {
+   char s80[80];
+ 
+Index: panel/panel.priv.h
+Prereq:  1.30 
+--- ncurses-6.5-20241130+/panel/panel.priv.h	2020-09-26 18:05:32.000000000 +0000
++++ ncurses-6.5-20241207/panel/panel.priv.h	2024-12-07 23:01:42.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ 
+-/* $Id: panel.priv.h,v 1.30 2020/09/26 18:05:32 tom Exp $ */
++/* $Id: panel.priv.h,v 1.31 2024/12/07 23:01:42 tom Exp $ */
+ 
+ #ifndef NCURSES_PANEL_PRIV_H
+ #define NCURSES_PANEL_PRIV_H 1
+@@ -86,7 +86,7 @@
+ #define GetScreenHook(sp) \
+ 			struct panelhook* ph = NCURSES_SP_NAME(_nc_panelhook)(sp)
+ #define GetPanelHook(pan) \
+-			GetScreenHook(pan ? _nc_screen_of((pan)->win) : 0)
++			GetScreenHook(pan ? _nc_screen_of((pan)->win) : NULL)
+ #define GetWindowHook(win) \
+ 			SCREEN* sp = _nc_screen_of(win); \
+ 			GetScreenHook(sp)
+Index: progs/dump_entry.c
+Prereq:  1.197 
+--- ncurses-6.5-20241130+/progs/dump_entry.c	2024-10-19 22:00:53.000000000 +0000
++++ ncurses-6.5-20241207/progs/dump_entry.c	2024-12-07 22:06:39.000000000 +0000
+@@ -40,7 +40,7 @@
+ #include 		/* this C file is generated */
+ #include 	/* so is this */
+ 
+-MODULE_ID("$Id: dump_entry.c,v 1.197 2024/10/19 22:00:53 tom Exp $")
++MODULE_ID("$Id: dump_entry.c,v 1.198 2024/12/07 22:06:39 tom Exp $")
+ 
+ #define DISCARD(string) string = ABSENT_STRING
+ #define PRINTF (void) printf
+@@ -121,7 +121,7 @@
+     if (want > dst->size) {
+ 	dst->size += (want + 1024);	/* be generous */
+ 	dst->text = typeRealloc(char, dst->size, dst->text);
+-	if (dst->text == 0)
++	if (dst->text == NULL)
+ 	    failed("strncpy_DYN");
+     }
+     _nc_STRNCPY(dst->text + dst->used, src, need + 1);
+@@ -132,7 +132,7 @@
+ static void
+ strcpy_DYN(DYNBUF * dst, const char *src)
+ {
+-    if (src == 0) {
++    if (src == NULL) {
+ 	dst->used = 0;
+ 	strcpy_DYN(dst, "");
+     } else {
+@@ -144,9 +144,9 @@
+ static void
+ free_DYN(DYNBUF * p)
+ {
+-    if (p->text != 0)
++    if (p->text != NULL)
+ 	free(p->text);
+-    p->text = 0;
++    p->text = NULL;
+     p->size = 0;
+     p->used = 0;
+ }
+@@ -170,7 +170,7 @@
+ {
+     const struct name_table_entry *np;
+ 
+-    if ((np = _nc_find_entry(name, _nc_get_hash_table(0))) != 0) {
++    if ((np = _nc_find_entry(name, _nc_get_hash_table(0))) != NULL) {
+ 	switch (np->nte_type) {
+ 	case BOOLEAN:
+ 	    NameTrans(bool_from_termcap, boolcodes);
+@@ -186,7 +186,7 @@
+ 	}
+     }
+ 
+-    return (0);
++    return (NULL);
+ }
+ 
+ void
+@@ -212,7 +212,7 @@
+     did_wrap = (width <= 0);
+ 
+     /* versions */
+-    if (version == 0)
++    if (version == NULL)
+ 	tversion = V_ALLCAPS;
+     else if (!strcmp(version, "SVr1") || !strcmp(version, "SVR1")
+ 	     || !strcmp(version, "Ultrix"))
+@@ -458,7 +458,7 @@
+ 		}
+ 		n++;
+ 	    }
+-	} else if (strchr("pPg", ch) != 0) {
++	} else if (strchr("pPg", ch) != NULL) {
+ 	    result += 2;
+ 	} else {
+ 	    result++;		/* ordinary operator */
+@@ -526,7 +526,7 @@
+     const char *fill = "\\s";
+     size_t need = strlen(src);
+     size_t size = strlen(fill);
+-    char *result = 0;
++    char *result = NULL;
+     int pass;
+     size_t s, d;
+     for (pass = 0; pass < 2; ++pass) {
+@@ -550,7 +550,7 @@
+ 	    result[d] = '\0';
+ 	} else {
+ 	    result = calloc(need + 1, sizeof(char));
+-	    if (result == 0)
++	    if (result == NULL)
+ 		failed("fill_spaces");
+ 	}
+     }
+@@ -598,7 +598,7 @@
+ 	if (TcOutput())
+ 	    trailer = "\\\n\t ";
+ 
+-	if (!TcOutput() && (p = strchr(fill, '=')) != 0) {
++	if (!TcOutput() && (p = strchr(fill, '=')) != NULL) {
+ 	    base = (int) (p + 1 - fill);
+ 	    if (base > 8)
+ 		base = 8;
+@@ -612,7 +612,7 @@
+ 	    align[base] = '\0';
+ 	}
+ 	/* "pretty" overrides wrapping if it already split the line */
+-	if (!pretty || strchr(fill, '\n') == 0) {
++	if (!pretty || strchr(fill, '\n') == NULL) {
+ 	    int tag = 0;
+ 
+ 	    if (TcOutput() && outbuf.used && !wrap_1ST(mode)) {
+@@ -841,7 +841,7 @@
+ 		    strncpy_DYN(&tmpbuf, src++, (size_t) 1);
+ 		    if (src[0] == '%'
+ 			&& src[1] != '\0'
+-			&& (strchr("?e;", src[1])) == 0) {
++			&& (strchr("?e;", src[1])) == NULL) {
+ 			tmpbuf.text[tmpbuf.used++] = '\n';
+ 			indent_DYN(&tmpbuf, level);
+ 		    }
+@@ -926,12 +926,12 @@
+ 
+     len = 12;			/* terminfo file-header */
+ 
+-    if (pred == 0) {
++    if (pred == NULL) {
+ 	cur_type = tterm;
+ 	pred = dump_predicate;
+     }
+ 
+-    strcpy_DYN(&outbuf, 0);
++    strcpy_DYN(&outbuf, NULL);
+     if (content_only) {
+ 	column = indent;	/* workaround to prevent empty lines */
+     } else {
+@@ -1120,7 +1120,7 @@
+ 				 : has_params(srccap, FALSE)));
+ 		const char *cv = _nc_infotocap(name, srccap, params);
+ 
+-		if (cv == 0) {
++		if (cv == NULL) {
+ 		    if (outform == F_TCONVERR) {
+ 			_nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
+ 				    "%s=!!! %s WILL NOT CONVERT !!!",
+@@ -1169,7 +1169,7 @@
+ 		char *src = _nc_tic_expand(capability,
+ 					   outform == F_TERMINFO, numbers);
+ 
+-		strcpy_DYN(&tmpbuf, 0);
++		strcpy_DYN(&tmpbuf, NULL);
+ 		strcpy_DYN(&tmpbuf, name);
+ 		strcpy_DYN(&tmpbuf, "=");
+ 		if (pretty
+@@ -1400,7 +1400,7 @@
+  * Check if the given acsc string is a 1-1 mapping, i.e., just-like-vt100.
+  * Also, since this is for termcap, we only care about the line-drawing map.
+  */
+-#define isLine(c) (strchr("lmkjtuvwqxn", c) != 0)
++#define isLine(c) (strchr("lmkjtuvwqxn", c) != NULL)
+ 
+ static bool
+ one_one_mapping(const char *mapping)
+@@ -1703,7 +1703,7 @@
+ 	}
+ 	outbuf.text[outbuf.used] = '\0';
+     }
+-    if (outbuf.text != 0) {
++    if (outbuf.text != NULL) {
+ 	(void) fputs(outbuf.text, stdout);
+ 	putchar('\n');
+     }
+Index: progs/infocmp.c
+Prereq:  1.169 
+--- ncurses-6.5-20241130+/progs/infocmp.c	2024-11-30 21:29:41.000000000 +0000
++++ ncurses-6.5-20241207/progs/infocmp.c	2024-12-07 22:10:45.000000000 +0000
+@@ -43,7 +43,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: infocmp.c,v 1.169 2024/11/30 21:29:41 tom Exp $")
++MODULE_ID("$Id: infocmp.c,v 1.170 2024/12/07 22:10:45 tom Exp $")
+ 
+ #ifndef ACTUAL_TIC
+ #define ACTUAL_TIC "tic"
+@@ -694,7 +694,7 @@
+ #define DATAX()        DATA("", "")
+ 
+ typedef struct {
+-    const char from[4];
++    const char from[8];
+     const char to[12];
+ } assoc;
+ 
+@@ -812,10 +812,10 @@
+ static char *
+ lookup_params(const assoc * table, char *dst, char *src)
+ {
+-    char *result = 0;
++    char *result = NULL;
+     const char *ep = strtok(src, ";");
+ 
+-    if (ep != 0) {
++    if (ep != NULL) {
+ 	const assoc *ap;
+ 
+ 	do {
+@@ -861,7 +861,7 @@
+ 	int csi;
+ 	size_t len = 0;
+ 	size_t next;
+-	const char *expansion = 0;
++	const char *expansion = NULL;
+ 	char buf3[MAX_TERMINFO_LENGTH];
+ 
+ 	/* first, check other capabilities in this entry */
+@@ -1052,14 +1052,14 @@
+ 	      FALSE, 0, 65535, itrace, FALSE, FALSE, FALSE);
+ 
+     for (n = 0; n < argc && n < MAXCOMPARE; n++) {
+-	if (freopen(argv[n], "r", stdin) == 0)
++	if (freopen(argv[n], "r", stdin) == NULL)
+ 	    _nc_err_abort("Can't open %s: %s", argv[n], strerror(errno));
+ 
+ #if NO_LEAKS
+ 	entered[n].head = _nc_head;
+ 	entered[n].tail = _nc_tail;
+ #endif
+-	_nc_head = _nc_tail = 0;
++	_nc_head = _nc_tail = NULL;
+ 
+ 	/* parse entries out of the source file */
+ 	_nc_set_source(argv[n]);
+@@ -1187,7 +1187,7 @@
+ 
+ 		names[0] = name1;
+ 		names[1] = name2;
+-		names[2] = 0;
++		names[2] = NULL;
+ 
+ 		entries[0] = *qp;
+ 		entries[1] = *rp;
+@@ -1298,12 +1298,12 @@
+     static size_t need;
+     char *s;
+ 
+-    if (initializer == 0) {
++    if (initializer == NULL) {
+ 	need = (strlen(entries->tterm.term_names)
+ 		+ strlen(type)
+ 		+ strlen(fmt));
+ 	initializer = (char *) malloc(need + 1);
+-	if (initializer == 0)
++	if (initializer == NULL)
+ 	    failed("any_initializer");
+     }
+ 
+@@ -1334,7 +1334,7 @@
+ dump_initializers(const TERMTYPE2 *term)
+ {
+     unsigned n;
+-    const char *str = 0;
++    const char *str = NULL;
+ 
+     printf("\nstatic char %s[] = \"%s\";\n\n",
+ 	   name_initializer("alias"), entries->tterm.term_names);
+@@ -1496,10 +1496,10 @@
+ static int
+ optarg_to_number(void)
+ {
+-    char *temp = 0;
++    char *temp = NULL;
+     long value = strtol(optarg, &temp, 0);
+ 
+-    if (temp == 0 || temp == optarg || *temp != 0) {
++    if (temp == NULL || temp == optarg || *temp != 0) {
+ 	fprintf(stderr, "Expected a number, not \"%s\"\n", optarg);
+ 	ExitProgram(EXIT_FAILURE);
+     }
+@@ -1511,7 +1511,7 @@
+ {
+     char *terminal;
+ 
+-    if ((terminal = getenv("TERM")) == 0) {
++    if ((terminal = getenv("TERM")) == NULL) {
+ 	(void) fprintf(stderr,
+ 		       "%s: environment variable TERM not set\n",
+ 		       _nc_progname);
+@@ -1531,7 +1531,7 @@
+     const char *path2;
+ 
+     _nc_first_db(&state, &offset);
+-    while ((path2 = _nc_next_db(&state, &offset)) != 0) {
++    while ((path2 = _nc_next_db(&state, &offset)) != NULL) {
+ 	printf("%s\n", path2);
+     }
+     _nc_last_db();
+@@ -1559,8 +1559,8 @@
+ {
+     /* Avoid "local data >32k" error with mwcc */
+     /* Also avoid overflowing smaller stacks on systems like AmigaOS */
+-    path *tfile = 0;
+-    char **tname = 0;
++    path *tfile = NULL;
++    char **tname = NULL;
+     size_t maxterms;
+ 
+     char **myargv;
+@@ -1576,7 +1576,7 @@
+     bool wrap_strings = FALSE;
+ 
+     /* where is the terminfo database location going to default to? */
+-    restdir = firstdir = 0;
++    restdir = firstdir = NULL;
+ 
+ #if NCURSES_XNAMES
+     use_extended_names(FALSE);
+@@ -1587,7 +1587,7 @@
+ 
+     /* make sure we have enough space to add two terminal entries */
+     myargv = typeCalloc(char *, (size_t) (argc + 3));
+-    if (myargv == 0)
++    if (myargv == NULL)
+ 	failed("myargv");
+ 
+     memcpy(myargv, argv, (sizeof(char *) * (size_t) argc));
+@@ -1671,7 +1671,7 @@
+ 	    outform = F_TERMINFO;
+ 	    if (sortmode == S_DEFAULT)
+ 		sortmode = S_VARIABLE;
+-	    tversion = 0;
++	    tversion = NULL;
+ 	    break;
+ 
+ 	case 'i':
+@@ -1712,7 +1712,7 @@
+ 	    break;
+ 
+ 	case 'r':
+-	    tversion = 0;
++	    tversion = NULL;
+ 	    break;
+ 
+ 	case 's':
+@@ -1780,20 +1780,20 @@
+     }
+ 
+     maxterms = (size_t) (argc + 2 - optind);
+-    if ((tfile = typeMalloc(path, maxterms)) == 0)
++    if ((tfile = typeMalloc(path, maxterms)) == NULL)
+ 	failed("tfile");
+-    if ((tname = typeCalloc(char *, maxterms)) == 0)
++    if ((tname = typeCalloc(char *, maxterms)) == NULL)
+ 	  failed("tname");
+-    if ((entries = typeCalloc(ENTRY, maxterms)) == 0)
++    if ((entries = typeCalloc(ENTRY, maxterms)) == NULL)
+ 	failed("entries");
+ #if NO_LEAKS
+-    if ((entered = typeCalloc(ENTERED, maxterms)) == 0)
++    if ((entered = typeCalloc(ENTERED, maxterms)) == NULL)
+ 	failed("entered");
+ #endif
+ 
+-    if (tfile == 0
+-	|| tname == 0
+-	|| entries == 0) {
++    if (tfile == NULL
++	|| tname == NULL
++	|| entries == NULL) {
+ 	fprintf(stderr, "%s: not enough memory\n", _nc_progname);
+ 	ExitProgram(EXIT_FAILURE);
+     }
+Index: progs/reset_cmd.c
+Prereq:  1.37 
+--- ncurses-6.5-20241130+/progs/reset_cmd.c	2024-04-08 17:29:34.000000000 +0000
++++ ncurses-6.5-20241207/progs/reset_cmd.c	2024-12-07 22:12:53.000000000 +0000
+@@ -53,7 +53,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: reset_cmd.c,v 1.37 2024/04/08 17:29:34 tom Exp $")
++MODULE_ID("$Id: reset_cmd.c,v 1.38 2024/12/07 22:12:53 tom Exp $")
+ 
+ /*
+  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
+@@ -104,8 +104,8 @@
+     char buf[BUFSIZ];
+     bool sent = FALSE;
+ 
+-    if (file != 0) {
+-	if ((fp = safe_fopen(file, "r")) == 0)
++    if (file != NULL) {
++	if ((fp = safe_fopen(file, "r")) == NULL)
+ 	    failed(file);
+ 
+ 	while ((nr = fread(buf, sizeof(char), sizeof(buf), fp)) != 0) {
+@@ -528,7 +528,7 @@
+ 
+     (void) old_settings;
+ #if TAB3
+-    if (old_settings != 0 &&
++    if (old_settings != NULL &&
+ 	old_settings->c_oflag & (TAB3 | ONLCR | OCRNL | ONLRET)) {
+ 	old_settings->c_oflag &= (TAB3 | ONLCR | OCRNL | ONLRET);
+ 	SET_TTY(fd, old_settings);
+@@ -539,11 +539,11 @@
+ 	    IGNORE_RC(system(init_prog));
+ 	}
+ 
+-	need_flush |= sent_string((use_reset && (reset_1string != 0))
++	need_flush |= sent_string((use_reset && (reset_1string != NULL))
+ 				  ? reset_1string
+ 				  : init_1string);
+ 
+-	need_flush |= sent_string((use_reset && (reset_2string != 0))
++	need_flush |= sent_string((use_reset && (reset_2string != NULL))
+ 				  ? reset_2string
+ 				  : init_2string);
+ 
+@@ -584,7 +584,7 @@
+ 
+ 	need_flush |= cat_file((use_reset && reset_file) ? reset_file : init_file);
+ 
+-	need_flush |= sent_string((use_reset && (reset_3string != 0))
++	need_flush |= sent_string((use_reset && (reset_3string != NULL))
+ 				  ? reset_3string
+ 				  : init_3string);
+     }
+@@ -629,7 +629,7 @@
+ 	 */
+     } else if (newer == 0177) {
+ 	(void) fprintf(stderr, "delete.\n");
+-    } else if ((p = key_backspace) != 0
++    } else if ((p = key_backspace) != NULL
+ 	       && newer == (unsigned char) p[0]
+ 	       && p[1] == '\0') {
+ 	(void) fprintf(stderr, "backspace.\n");
+@@ -655,7 +655,7 @@
+ void
+ reset_flush(void)
+ {
+-    if (my_file != 0)
++    if (my_file != NULL)
+ 	fflush(my_file);
+ }
+ 
+Index: progs/tabs.c
+Prereq:  1.55 
+--- ncurses-6.5-20241130+/progs/tabs.c	2024-10-19 21:45:18.000000000 +0000
++++ ncurses-6.5-20241207/progs/tabs.c	2024-12-07 22:10:45.000000000 +0000
+@@ -39,7 +39,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: tabs.c,v 1.55 2024/10/19 21:45:18 tom Exp $")
++MODULE_ID("$Id: tabs.c,v 1.56 2024/12/07 22:10:45 tom Exp $")
+ 
+ static GCC_NORETURN void usage(void);
+ 
+@@ -147,7 +147,7 @@
+ 			"%s: tab-stops are not in increasing order: %d %d\n",
+ 			_nc_progname, value, result[n - 1]);
+ 		free(result);
+-		result = 0;
++		result = NULL;
+ 		break;
+ 	    }
+ 	    ++n;
+@@ -159,7 +159,7 @@
+ 	}
+     }
+ 
+-    if (result != 0) {
++    if (result != NULL) {
+ 	/*
+ 	 * If there is only one value, then it is an option such as "-8".
+ 	 */
+@@ -250,7 +250,7 @@
+ trimmed_tab_list(const char *source)
+ {
+     char *result = strdup(source);
+-    if (result != 0) {
++    if (result != NULL) {
+ 	int j, k, last;
+ 
+ 	for (j = k = last = 0; result[j] != 0; ++j) {
+@@ -280,7 +280,7 @@
+ {
+     bool result = FALSE;
+ 
+-    if (source != 0) {
++    if (source != NULL) {
+ 	size_t len = strlen(source);
+ 	if (len != 0)
+ 	    result = (source[len - 1] != ',');
+@@ -303,7 +303,7 @@
+     char *result = *append;
+     char *copied = trimmed_tab_list(value);
+ 
+-    if (copied != 0 && *copied != '\0') {
++    if (copied != NULL && *copied != '\0') {
+ 	const char *comma = ",";
+ 	size_t need = 1 + strlen(copied);
+ 
+@@ -313,15 +313,15 @@
+ 	    comma = "";
+ 
+ 	need += strlen(comma);
+-	if (*append != 0)
++	if (*append != NULL)
+ 	    need += strlen(*append);
+ 
+ 	result = malloc(need);
+-	if (result == 0)
++	if (result == NULL)
+ 	    failed("add_to_tab_list");
+ 
+ 	*result = '\0';
+-	if (*append != 0) {
++	if (*append != NULL) {
+ 	    _nc_STRCPY(result, *append, need);
+ 	    free(*append);
+ 	}
+@@ -402,7 +402,7 @@
+ {
+     bool result = TRUE;
+ 
+-    if (tab_list != 0 && *tab_list != '\0') {
++    if (tab_list != NULL && *tab_list != '\0') {
+ 	if (comma_is_needed(tab_list)) {
+ 	    int n;
+ 
+@@ -433,7 +433,7 @@
+     while (*value != '\0' &&
+ 	   (isdigit(UChar(*value)) ||
+ 	    isspace(UChar(*value)) ||
+-	    strchr("+,", UChar(*value)) != 0)) {
++	    strchr("+,", UChar(*value)) != NULL)) {
+ 	++value;
+     }
+     return value;
+@@ -483,9 +483,9 @@
+     bool no_op = FALSE;
+     bool change_tty = FALSE;
+     int n, ch;
+-    NCURSES_CONST char *term_name = 0;
+-    char *append = 0;
+-    const char *tab_list = 0;
++    NCURSES_CONST char *term_name = NULL;
++    char *append = NULL;
++    const char *tab_list = NULL;
+     const char *new_line = "\n";
+     int margin = -1;
+     TTY tty_settings;
+@@ -493,7 +493,7 @@
+ 
+     _nc_progname = _nc_rootname(argv[0]);
+ 
+-    if ((term_name = getenv("TERM")) == 0)
++    if ((term_name = getenv("TERM")) == NULL)
+ 	term_name = "ansi+tabs";
+ 
+     /* cannot use getopt, since some options are two-character */
+@@ -617,11 +617,11 @@
+ 	    }
+ 	    break;
+ 	default:
+-	    if (append != 0) {
++	    if (append != NULL) {
+ 		if (tab_list != (const char *) append) {
+ 		    /* one of the predefined options was used */
+ 		    free(append);
+-		    append = 0;
++		    append = NULL;
+ 		}
+ 	    }
+ 	    tab_list = add_to_tab_list(&append, option);
+@@ -683,7 +683,7 @@
+ 
+ 	list = decode_tabs(tab_list, margin);
+ 
+-	if (list != 0) {
++	if (list != NULL) {
+ 	    if (!no_op)
+ 		do_tabs(list);
+ 	    if (debug) {
+@@ -704,7 +704,7 @@
+ 	}
+ 	rc = EXIT_SUCCESS;
+     }
+-    if (append != 0)
++    if (append != NULL)
+ 	free(append);
+     ExitProgram(rc);
+ }
+Index: progs/tic.c
+Prereq:  1.329 
+--- ncurses-6.5-20241130+/progs/tic.c	2024-11-30 21:29:07.000000000 +0000
++++ ncurses-6.5-20241207/progs/tic.c	2024-12-07 23:19:49.000000000 +0000
+@@ -49,7 +49,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: tic.c,v 1.329 2024/11/30 21:29:07 tom Exp $")
++MODULE_ID("$Id: tic.c,v 1.331 2024/12/07 23:19:49 tom Exp $")
+ 
+ #define STDIN_NAME ""
+ 
+@@ -61,7 +61,7 @@
+ static bool infodump = FALSE;	/* running as captoinfo? */
+ static bool showsummary = FALSE;
+ static unsigned debug_level;
+-static char **namelst = 0;
++static char **namelst = NULL;
+ static const char *to_remove;
+ 
+ #if NCURSES_XNAMES
+@@ -104,9 +104,9 @@
+ static void
+ free_namelist(char **src)
+ {
+-    if (src != 0) {
++    if (src != NULL) {
+ 	int n;
+-	for (n = 0; src[n] != 0; ++n)
++	for (n = 0; src[n] != NULL; ++n)
+ 	    free(src[n]);
+ 	free(src);
+     }
+@@ -120,9 +120,9 @@
+     free_namelist(namelst);
+     _nc_leaks_dump_entry();
+ #endif
+-    if (tmp_fp != 0)
++    if (tmp_fp != NULL)
+ 	fclose(tmp_fp);
+-    if (to_remove != 0) {
++    if (to_remove != NULL) {
+ 	int rc;
+ 
+ #if HAVE_REMOVE
+@@ -214,7 +214,7 @@
+     for (n = 0; n < STRCOUNT; n++) {
+ 	s = ep->tterm.Strings[n];
+ 	if (VALID_STRING(s)
+-	    && strchr(s, L_BRACE) != 0) {
++	    && strchr(s, L_BRACE) != NULL) {
+ 	    d = result;
+ 	    t = s;
+ 	    while ((ch = *t++) != 0) {
+@@ -224,9 +224,9 @@
+ 			break;
+ 		} else if ((ch == '%')
+ 			   && (*t == L_BRACE)) {
+-		    char *v = 0;
++		    char *v = NULL;
+ 		    long value = strtol(t + 1, &v, 0);
+-		    if (v != 0
++		    if (v != NULL
+ 			&& *v == R_BRACE
+ 			&& value > 0
+ 			&& value != '\\'	/* FIXME */
+@@ -334,14 +334,14 @@
+ 	    in_name = FALSE;
+ 
+ 	    suffix[0] = '\0';
+-	    if ((up = strchr(namebuf, '#')) != 0
+-		|| (up = strchr(namebuf, '=')) != 0
+-		|| ((up = strchr(namebuf, '@')) != 0 && up[1] == '>')) {
++	    if ((up = strchr(namebuf, '#')) != NULL
++		|| (up = strchr(namebuf, '=')) != NULL
++		|| ((up = strchr(namebuf, '@')) != NULL && up[1] == '>')) {
+ 		_nc_STRCPY(suffix, up, have);
+ 		*up = '\0';
+ 	    }
+ 
+-	    if ((tp = nametrans(namebuf)) != 0) {
++	    if ((tp = nametrans(namebuf)) != NULL) {
+ 		(void) putchar(':');
+ 		(void) fputs(tp, stdout);
+ 		(void) fputs(suffix, stdout);
+@@ -368,7 +368,7 @@
+ static char *
+ stripped(char *src)
+ {
+-    char *dst = 0;
++    char *dst = NULL;
+ 
+     while (isspace(UChar(*src)))
+ 	src++;
+@@ -388,7 +388,7 @@
+ static FILE *
+ open_tempfile(char *filename)
+ {
+-    FILE *result = 0;
++    FILE *result = NULL;
+ 
+     _nc_STRCPY(filename, "/tmp/XXXXXX", PATH_MAX);
+ #if HAVE_MKSTEMP
+@@ -410,7 +410,7 @@
+ copy_input(FILE *source, const char *filename, char *alt_file)
+ {
+     char my_altfile[PATH_MAX];
+-    FILE *result = 0;
++    FILE *result = NULL;
+     FILE *target;
+ 
+     if (alt_file == NULL)
+@@ -476,7 +476,7 @@
+ 	    ExitProgram(EXIT_FAILURE);
+ 	}
+ 	if (mode != S_IFREG) {
+-	    if (alt_file != 0) {
++	    if (alt_file != NULL) {
+ 		FILE *fp2 = copy_input(fp, filename, alt_file);
+ 		fp = fp2;
+ 	    } else {
+@@ -493,7 +493,7 @@
+ static char **
+ make_namelist(char *src)
+ {
+-    char **dst = 0;
++    char **dst = NULL;
+ 
+     char *s, *base;
+     unsigned pass, n, nn;
+@@ -501,14 +501,14 @@
+ 
+     if (src == NULL) {
+ 	/* EMPTY */ ;
+-    } else if (strchr(src, '/') != 0) {		/* a filename */
++    } else if (strchr(src, '/') != NULL) {	/* a filename */
+ 	FILE *fp = open_input(src, (char *) 0);
+ 
+ 	for (pass = 1; pass <= 2; pass++) {
+ 	    nn = 0;
+-	    while (fgets(buffer, sizeof(buffer), fp) != 0) {
+-		if ((s = stripped(buffer)) != 0) {
+-		    if (dst != 0)
++	    while (fgets(buffer, sizeof(buffer), fp) != NULL) {
++		if ((s = stripped(buffer)) != NULL) {
++		    if (dst != NULL)
+ 			dst[nn] = s;
+ 		    else
+ 			free(s);
+@@ -520,7 +520,7 @@
+ 		      failed("make_namelist (alloc)");
+ 		rewind(fp);
+ 		if (errno != 0)
+-		      failed("make_namelist (rewind)");
++		    failed("make_namelist (rewind)");
+ 	    }
+ 	}
+ 	fclose(fp);
+@@ -533,7 +533,7 @@
+ 			nn++;
+ 		    } else {
+ 			src[n] = '\0';
+-			if ((s = stripped(base)) != 0)
++			if ((s = stripped(base)) != NULL)
+ 			    dst[nn++] = s;
+ 			base = &src[n + 1];
+ 		    }
+@@ -547,9 +547,9 @@
+ 	    }
+ 	}
+     }
+-    if (showsummary && (dst != 0)) {
++    if (showsummary && (dst != NULL)) {
+ 	fprintf(log_fp, "Entries that will be compiled:\n");
+-	for (n = 0; dst[n] != 0; n++)
++	for (n = 0; dst[n] != NULL; n++)
+ 	    fprintf(log_fp, "%u:%s\n", n + 1, dst[n]);
+     }
+     return dst;
+@@ -561,10 +561,10 @@
+ {
+     bool code = FALSE;
+ 
+-    if (needle != 0) {
++    if (needle != NULL) {
+ 	size_t n;
+ 
+-	for (n = 0; needle[n] != 0; n++) {
++	for (n = 0; needle[n] != NULL; n++) {
+ 	    if (_nc_name_match(haystack, needle[n], "|")) {
+ 		code = TRUE;
+ 		break;
+@@ -608,7 +608,7 @@
+ 	    || access(result, R_OK | W_OK | X_OK) != 0) {
+ 	    DEBUG(1, ("...not a writable directory"));
+ 	    free(result);
+-	    result = 0;
++	    result = NULL;
+ 	}
+ #endif
+     } else {
+@@ -626,12 +626,12 @@
+ 	    } else {
+ 		DEBUG(1, ("...parent directory %s is not writable", result));
+ 		free(result);
+-		result = 0;
++		result = NULL;
+ 	    }
+ 	} else {
+ 	    DEBUG(1, ("... no parent directory"));
+ 	    free(result);
+-	    result = 0;
++	    result = NULL;
+ 	}
+     }
+     return result;
+@@ -645,14 +645,14 @@
+ static void
+ show_databases(const char *outdir)
+ {
+-    bool specific = (outdir != 0) || getenv("TERMINFO") != 0;
++    bool specific = (outdir != NULL) || getenv("TERMINFO") != NULL;
+     char *result;
+-    const char *tried = 0;
++    const char *tried = NULL;
+ 
+     if (outdir == NULL) {
+ 	outdir = _nc_tic_dir(NULL);
+     }
+-    if ((result = valid_db_path(outdir)) != 0) {
++    if ((result = valid_db_path(outdir)) != NULL) {
+ 	printf("%s\n", result);
+ 	free(result);
+     } else {
+@@ -924,13 +924,13 @@
+ 	if (infodump == TRUE) {
+ 	    /* captoinfo's no-argument case */
+ 	    source_file = "/etc/termcap";
+-	    if ((termcap = getenv("TERMCAP")) != 0
+-		&& (namelst = make_namelist(getenv("TERM"))) != 0) {
++	    if ((termcap = getenv("TERMCAP")) != NULL
++		&& (namelst = make_namelist(getenv("TERM"))) != NULL) {
+ 		if (access(termcap, F_OK) == 0) {
+ 		    /* file exists */
+ 		    source_file = termcap;
+ 		} else {
+-		    if ((tmp_fp = open_tempfile(my_tmpname)) != 0) {
++		    if ((tmp_fp = open_tempfile(my_tmpname)) != NULL) {
+ 			source_file = my_tmpname;
+ 			fprintf(tmp_fp, "%s\n", termcap);
+ 			fclose(tmp_fp);
+@@ -1335,7 +1335,7 @@
+     if ((ch = keypad_final(string)) != '\0') {
+ 	const char *list = "PQRSwxymtuvlqrsPpn";	/* app-keypad except "Enter" */
+ 	const char *test = (strchr) (list, ch);
+-	if (test != 0)
++	if (test != NULL)
+ 	    result = (long) (test - list);
+     }
+     return result;
+@@ -1712,8 +1712,8 @@
+ static bool
+ uses_SGR_39_49(const char *value)
+ {
+-    return (strstr(value, "39;49") != 0
+-	    || strstr(value, "49;39") != 0);
++    return (strstr(value, "39;49") != NULL
++	    || strstr(value, "49;39") != NULL);
+ }
+ 
+ /*
+@@ -1897,7 +1897,7 @@
+ static struct user_table_entry const *
+ lookup_user_capability(const char *name)
+ {
+-    struct user_table_entry const *result = 0;
++    struct user_table_entry const *result = NULL;
+     if (*name != 'k') {
+ 	result = _nc_find_user_entry(name);
+     }
+@@ -1929,7 +1929,7 @@
+ #if NCURSES_XNAMES
+     else if (using_extensions) {
+ 	struct user_table_entry const *p = lookup_user_capability(name);
+-	if (p != 0) {
++	if (p != NULL) {
+ 	    result = (int) p->ute_argc;
+ 	}
+     }
+@@ -2134,7 +2134,7 @@
+ skip_DECSCNM(const char *value, int *flag)
+ {
+     *flag = -1;
+-    if (value != 0) {
++    if (value != NULL) {
+ 	int skip = csi_length(value);
+ 	if (skip > 0 &&
+ 	    value[skip++] == '?' &&
+@@ -2154,13 +2154,13 @@
+ check_delays(const TERMTYPE2 *tp, const char *name, const char *value)
+ {
+     const char *p, *q;
+-    const char *first = 0;
+-    const char *last = 0;
++    const char *first = NULL;
++    const char *last = NULL;
+ 
+     for (p = value; *p != '\0'; ++p) {
+ 	if (p[0] == '$' && p[1] == '<') {
+ 	    const char *base = p + 2;
+-	    const char *mark = 0;
++	    const char *mark = NULL;
+ 	    bool mixed = FALSE;
+ 	    int proportional = 0;
+ 	    int mandatory = 0;
+@@ -2179,7 +2179,7 @@
+ 			++mandatory;
+ 		    if (mark == NULL)
+ 			mark = q;
+-		} else if (!(isalnum(UChar(*q)) || strchr("+-.", *q) != 0)) {
++		} else if (!(isalnum(UChar(*q)) || strchr("+-.", *q) != NULL)) {
+ 		    break;
+ 		} else if (proportional || mandatory) {
+ 		    mixed = TRUE;
+@@ -2215,7 +2215,7 @@
+     if (!strcmp(name, "flash") ||
+ 	!strcmp(name, "beep")) {
+ 
+-	if (first != 0) {
++	if (first != NULL) {
+ 	    if (first == value || *last == 0) {
+ 		/*
+ 		 * Delay is on one end or the other.
+@@ -2229,9 +2229,9 @@
+ 	     * Check for missing delay when using VT100 reverse-video.
+ 	     * A real VT100 might not need this, but terminal emulators do.
+ 	     */
+-	    if ((p = skip_DECSCNM(value, &flag)) != 0 &&
++	    if ((p = skip_DECSCNM(value, &flag)) != NULL &&
+ 		flag > 0 &&
+-		skip_DECSCNM(p, &flag) != 0 &&
++		skip_DECSCNM(p, &flag) != NULL &&
+ 		flag == 0) {
+ 		_nc_warning("expected a delay in %s", name);
+ 	    }
+@@ -2304,7 +2304,7 @@
+ 	break;
+     case Other:
+     default:
+-#define myParam(n) (p_is_s[n - 1] != 0 ? ((TPARM_ARG) strings[n]) : numbers[n])
++#define myParam(n) (p_is_s[n - 1] != NULL ? ((TPARM_ARG) strings[n]) : numbers[n])
+ 	result = TPARM_9(value,
+ 			 myParam(1),
+ 			 myParam(2),
+@@ -2648,7 +2648,7 @@
+ 		    num == 7,
+ 		    num == 8,
+ 		    num == 9);
+-    if (test != 0) {
++    if (test != NULL) {
+ 	if (PRESENT(cap)) {
+ 	    if (!similar_sgr(num, test, cap)) {
+ 		_nc_warning("%s differs from sgr(%d)\n\t%s=%s\n\tsgr(%d)=%s",
+@@ -2868,7 +2868,7 @@
+ static void
+ check_exit_attribute(const char *name, char *test, char *trimmed, char *untrimmed)
+ {
+-    if (VALID_STRING(test) && (trimmed != 0)) {
++    if (VALID_STRING(test) && (trimmed != NULL)) {
+ 	if (similar_sgr(-1, trimmed, test) ||
+ 	    similar_sgr(-1, untrimmed, test)) {
+ 	    _nc_warning("%s matches exit_attribute_mode", name);
+@@ -2963,7 +2963,7 @@
+     int result = -1;
+     const struct name_table_entry *np;
+ 
+-    if ((np = _nc_find_entry(name, _nc_get_hash_table(0))) != 0) {
++    if ((np = _nc_find_entry(name, _nc_get_hash_table(0))) != NULL) {
+ 	result = np->nte_type;
+     }
+     return result;
+@@ -2990,7 +2990,7 @@
+ static void
+ check_user_capability_type(const char *name, int actual)
+ {
+-    if (lookup_user_capability(name) == 0) {
++    if (lookup_user_capability(name) == NULL) {
+ 	int expected = standard_type(name);
+ 	if (expected >= 0) {
+ 	    _nc_warning("expected %s to be %s, but actually %s",
+@@ -3156,7 +3156,7 @@
+ check_user_6789(const TERMTYPE2 *tp)
+ {
+     /*
+-     * Check if the terminal is known to not 
++     * Check if the terminal is known to not
+      */
+ #define NO_QUERY(longname,shortname) \
+ 	if (PRESENT(longname)) _nc_warning(#shortname " is not supported")
+@@ -3272,7 +3272,7 @@
+     ANDMISSING(clear_all_tabs, set_tab);
+ 
+     if (PRESENT(set_attributes)) {
+-	char *zero = 0;
++	char *zero = NULL;
+ 
+ 	_nc_tparm_err = 0;
+ 	if (PRESENT(exit_attribute_mode)) {
+@@ -3282,7 +3282,7 @@
+ 	}
+ 	check_tparm_err(0);
+ 
+-	if (zero != 0) {
++	if (zero != NULL) {
+ 	    CHECK_SGR(1, enter_standout_mode);
+ 	    CHECK_SGR(2, enter_underline_mode);
+ 	    CHECK_SGR(3, enter_reverse_mode);
+@@ -3368,6 +3368,6 @@
+     /*
+      * Finally, do the non-verbose checks
+      */
+-    if (save_check_termtype != 0)
++    if (save_check_termtype != NULL)
+ 	save_check_termtype(tp, literal);
+ }
+Index: progs/toe.c
+Prereq:  1.91 
+--- ncurses-6.5-20241130+/progs/toe.c	2024-11-23 20:09:23.000000000 +0000
++++ ncurses-6.5-20241207/progs/toe.c	2024-12-07 22:12:53.000000000 +0000
+@@ -45,7 +45,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: toe.c,v 1.91 2024/11/23 20:09:23 tom Exp $")
++MODULE_ID("$Id: toe.c,v 1.92 2024/12/07 22:12:53 tom Exp $")
+ 
+ #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, ".."))
+ 
+@@ -86,7 +86,7 @@
+ strmalloc(const char *value)
+ {
+     char *result = strdup(value);
+-    if (result == 0) {
++    if (result == NULL) {
+ 	failed("strmalloc");
+     }
+     return result;
+@@ -100,7 +100,7 @@
+     if (want >= len_termdata) {
+ 	len_termdata = (2 * want) + 10;
+ 	ptr_termdata = typeRealloc(TERMDATA, len_termdata, ptr_termdata);
+-	if (ptr_termdata == 0)
++	if (ptr_termdata == NULL)
+ 	    failed("ptr_termdata");
+     }
+ 
+@@ -200,14 +200,14 @@
+ static void
+ free_termdata(void)
+ {
+-    if (ptr_termdata != 0) {
++    if (ptr_termdata != NULL) {
+ 	while (use_termdata != 0) {
+ 	    --use_termdata;
+ 	    free(ptr_termdata[use_termdata].term_name);
+ 	    free(ptr_termdata[use_termdata].description);
+ 	}
+ 	free(ptr_termdata);
+-	ptr_termdata = 0;
++	ptr_termdata = NULL;
+     }
+     use_termdata = 0;
+     len_termdata = 0;
+@@ -217,7 +217,7 @@
+ allocArgv(size_t count)
+ {
+     char **result = typeCalloc(char *, count + 1);
+-    if (result == 0)
++    if (result == NULL)
+ 	failed("realloc eargv");
+ 
+     assert(result != 0);
+@@ -272,8 +272,8 @@
+ {
+     const char *desc;
+ 
+-    if (tp->term_names == 0
+-	|| (desc = strrchr(tp->term_names, '|')) == 0
++    if (tp->term_names == NULL
++	|| (desc = strrchr(tp->term_names, '|')) == NULL
+ 	|| (*++desc == '\0')) {
+ 	desc = "(No description)";
+     }
+@@ -389,7 +389,7 @@
+ {
+     size_t len = NAMLEN(src);
+     char *result = malloc(len + 1);
+-    if (result == 0)
++    if (result == NULL)
+ 	failed("copy entryname");
+     memcpy(result, src->d_name, len);
+     result[len] = '\0';
+@@ -409,11 +409,11 @@
+     for (i = 0; i < eargc; i++) {
+ #if NCURSES_USE_DATABASE
+ 	if (_nc_is_dir_path(eargv[i])) {
+-	    char *cwd_buf = 0;
++	    char *cwd_buf = NULL;
+ 	    DIR *termdir;
+ 	    const DIRENT *subdir;
+ 
+-	    if ((termdir = opendir(eargv[i])) == 0) {
++	    if ((termdir = opendir(eargv[i])) == NULL) {
+ 		(void) fflush(stdout);
+ 		(void) fprintf(stderr,
+ 			       "%s: can't open terminfo directory %s\n",
+@@ -424,7 +424,7 @@
+ 	    if (verbosity)
+ 		(void) printf("#\n#%s:\n#\n", eargv[i]);
+ 
+-	    while ((subdir = readdir(termdir)) != 0) {
++	    while ((subdir = readdir(termdir)) != NULL) {
+ 		size_t cwd_len;
+ 		char *name_1;
+ 		DIR *entrydir;
+@@ -438,7 +438,7 @@
+ 
+ 		cwd_len = strlen(name_1) + strlen(eargv[i]) + 3;
+ 		cwd_buf = typeRealloc(char, cwd_len, cwd_buf);
+-		if (cwd_buf == 0)
++		if (cwd_buf == NULL)
+ 		    failed("realloc cwd_buf");
+ 
+ 		assert(cwd_buf != 0);
+@@ -451,11 +451,11 @@
+ 		    continue;
+ 
+ 		entrydir = opendir(".");
+-		if (entrydir == 0) {
++		if (entrydir == NULL) {
+ 		    perror(cwd_buf);
+ 		    continue;
+ 		}
+-		while ((entry = readdir(entrydir)) != 0) {
++		while ((entry = readdir(entrydir)) != NULL) {
+ 		    char *name_2;
+ 		    TERMTYPE2 lterm;
+ 		    char *cn;
+@@ -489,7 +489,7 @@
+ 		closedir(entrydir);
+ 	    }
+ 	    closedir(termdir);
+-	    if (cwd_buf != 0)
++	    if (cwd_buf != NULL)
+ 		free(cwd_buf);
+ 	    continue;
+ 	}
+@@ -605,7 +605,7 @@
+     bool direct_dependencies = FALSE;
+     bool invert_dependencies = FALSE;
+     bool header = FALSE;
+-    const char *report_file = 0;
++    const char *report_file = NULL;
+     int code;
+     int this_opt, last_opt = '?';
+     unsigned v_opt = 0;
+@@ -660,8 +660,8 @@
+     }
+     use_verbosity(v_opt);
+ 
+-    if (report_file != 0) {
+-	if (freopen(report_file, "r", stdin) == 0) {
++    if (report_file != NULL) {
++	if (freopen(report_file, "r", stdin) == NULL) {
+ 	    (void) fflush(stdout);
+ 	    fprintf(stderr, "%s: can't open %s\n", _nc_progname, report_file);
+ 	    ExitProgram(EXIT_FAILURE);
+@@ -669,7 +669,7 @@
+ 
+ 	/* parse entries out of the source file */
+ 	_nc_set_source(report_file);
+-	_nc_read_entry_source(stdin, 0, FALSE, FALSE, NULLHOOK);
++	_nc_read_entry_source(stdin, NULL, FALSE, FALSE, NULLHOOK);
+     }
+ 
+     /* maybe we want a direct-dependency listing? */
+@@ -729,7 +729,7 @@
+ 	DBDIRS state;
+ 	int offset;
+ 	int pass;
+-	char **eargv = 0;
++	char **eargv = NULL;
+ 
+ 	code = EXIT_FAILURE;
+ 	for (pass = 0; pass < 2; ++pass) {
+@@ -737,7 +737,7 @@
+ 	    const char *path;
+ 
+ 	    _nc_first_db(&state, &offset);
+-	    while ((path = _nc_next_db(&state, &offset)) != 0) {
++	    while ((path = _nc_next_db(&state, &offset)) != NULL) {
+ 		if (quick_prefix(path))
+ 		    continue;
+ 		if (pass) {
+@@ -747,7 +747,7 @@
+ 	    }
+ 	    if (!pass) {
+ 		eargv = allocArgv(count);
+-		if (eargv == 0)
++		if (eargv == NULL)
+ 		    failed("eargv");
+ 	    } else {
+ 		code = typelist((int) count, eargv, header, hook);
+@@ -761,10 +761,10 @@
+ 	char **eargv = allocArgv((size_t) 2);
+ 	size_t count = 0;
+ 
+-	if (eargv == 0)
++	if (eargv == NULL)
+ 	    failed("eargv");
+ 	_nc_first_db(&state, &offset);
+-	if ((path = _nc_next_db(&state, &offset)) != 0) {
++	if ((path = _nc_next_db(&state, &offset)) != NULL) {
+ 	    if (!quick_prefix(path))
+ 		eargv[count++] = strmalloc(path);
+ 	}
+Index: progs/tput.c
+Prereq:  1.106 
+--- ncurses-6.5-20241130+/progs/tput.c	2024-11-30 21:47:34.000000000 +0000
++++ ncurses-6.5-20241207/progs/tput.c	2024-12-07 22:12:53.000000000 +0000
+@@ -47,7 +47,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: tput.c,v 1.106 2024/11/30 21:47:34 tom Exp $")
++MODULE_ID("$Id: tput.c,v 1.107 2024/12/07 22:12:53 tom Exp $")
+ 
+ #define PUTS(s)		fputs(s, stdout)
+ 
+@@ -256,15 +256,15 @@
+ 	     */
+ 
+ 	    for (k = 1; (k < argc) && (k <= NUM_PARM); k++) {
+-		char *tmp = 0;
++		char *tmp = NULL;
+ 		strings[k] = argv[k];
+ 		numbers[k] = strtol(argv[k], &tmp, 0);
+-		if (tmp == 0 || *tmp != 0)
++		if (tmp == NULL || *tmp != 0)
+ 		    numbers[k] = 0;
+ 	    }
+ 	    for (k = argc; k <= NUM_PARM; k++) {
+ 		numbers[k] = 0;
+-		strings[k] = 0;
++		strings[k] = NULL;
+ 	    }
+ 
+ 	    paramType = tparm_type(name);
+@@ -342,7 +342,7 @@
+ 		/* FALLTHRU */
+ 	    default:
+ 		analyzed = _nc_tparm_analyze(NULL, s, p_is_s, &popcount);
+-#define myParam(n) (p_is_s[n - 1] != 0 ? ((TPARM_ARG) strings[n]) : numbers[n])
++#define myParam(n) (p_is_s[n - 1] != NULL ? ((TPARM_ARG) strings[n]) : numbers[n])
+ 		s = TPARM_9(s,
+ 			    myParam(1),
+ 			    myParam(2),
+@@ -440,7 +440,7 @@
+ 	argv += optind;
+     }
+ 
+-    if (term == 0 || *term == '\0')
++    if (term == NULL || *term == '\0')
+ 	quit(ErrUsage, "No value for $TERM and no -T specified");
+ 
+     fd = save_tty_settings(&tty_settings, need_tty);
+@@ -464,7 +464,7 @@
+ 	ExitProgram(code);
+     }
+ 
+-    while (fgets(buf, sizeof(buf), stdin) != 0) {
++    while (fgets(buf, sizeof(buf), stdin) != NULL) {
+ 	size_t need = strlen(buf);
+ 	char **argvec = typeCalloc(char *, need + 1);
+ 	char **argnow;
+Index: progs/tset.c
+Prereq:  1.138 
+--- ncurses-6.5-20241130+/progs/tset.c	2024-11-30 21:30:49.000000000 +0000
++++ ncurses-6.5-20241207/progs/tset.c	2024-12-07 22:14:46.000000000 +0000
+@@ -98,7 +98,7 @@
+ char *ttyname(int fd);
+ #endif
+ 
+-MODULE_ID("$Id: tset.c,v 1.138 2024/11/30 21:30:49 tom Exp $")
++MODULE_ID("$Id: tset.c,v 1.139 2024/12/07 22:14:46 tom Exp $")
+ 
+ #ifndef environ
+ extern char **environ;
+@@ -185,19 +185,19 @@
+ 	    (void) fprintf(stderr, "Terminal type? ");
+ 	(void) fflush(stderr);
+ 
+-	if (fgets(answer, sizeof(answer), stdin) == 0) {
+-	    if (dflt == 0) {
++	if (fgets(answer, sizeof(answer), stdin) == NULL) {
++	    if (dflt == NULL) {
+ 		exit_error();
+ 		/* NOTREACHED */
+ 	    }
+ 	    return (dflt);
+ 	}
+ 
+-	if ((p = strchr(answer, '\n')) != 0)
++	if ((p = strchr(answer, '\n')) != NULL)
+ 	    *p = '\0';
+ 	if (answer[0])
+ 	    return (answer);
+-	if (dflt != 0)
++	if (dflt != NULL)
+ 	    return (dflt);
+     }
+ }
+@@ -344,7 +344,7 @@
+ static int
+ tbaudrate(char *rate)
+ {
+-    const SPEEDS *sp = 0;
++    const SPEEDS *sp = NULL;
+     size_t n;
+ 
+     /* The baudrate number can be preceded by a 'B', which is ignored. */
+@@ -361,7 +361,7 @@
+ 	    break;
+ 	}
+     }
+-    if (sp == 0)
++    if (sp == NULL)
+ 	err("unknown baud rate %s", rate);
+     return (sp->speed);
+ }
+@@ -377,18 +377,18 @@
+     MAP *mapp;
+     char *copy, *p;
+     const char *termp;
+-    char *base = 0;
++    char *base = NULL;
+ 
+     copy = strdup(arg);
+     mapp = typeMalloc(MAP, 1);
+-    if (copy == 0 || mapp == 0)
++    if (copy == NULL || mapp == NULL)
+ 	failed("malloc");
+ 
+     assert(copy != 0);
+     assert(mapp != 0);
+ 
+-    mapp->next = 0;
+-    if (maplist == 0)
++    mapp->next = NULL;
++    if (maplist == NULL)
+ 	cur = maplist = mapp;
+     else {
+ 	cur->next = mapp;
+@@ -400,14 +400,14 @@
+ 
+     arg = strpbrk(arg, "><@=!:");
+ 
+-    if (arg == 0) {		/* [?]term */
++    if (arg == NULL) {		/* [?]term */
+ 	mapp->type = mapp->porttype;
+-	mapp->porttype = 0;
++	mapp->porttype = NULL;
+ 	goto done;
+     }
+ 
+     if (arg == mapp->porttype)	/* [><@=! baud]:term */
+-	termp = mapp->porttype = 0;
++	termp = mapp->porttype = NULL;
+     else
+ 	termp = base = arg;
+ 
+@@ -442,7 +442,7 @@
+ 	++arg;
+     } else {			/* Optional baudrate. */
+ 	arg = strchr(p = arg, ':');
+-	if (arg == 0)
++	if (arg == NULL)
+ 	    goto badmopt;
+ 	*arg++ = '\0';
+ 	mapp->speed = tbaudrate(p);
+@@ -451,7 +451,7 @@
+     mapp->type = arg;
+ 
+     /* Terminate porttype, if specified. */
+-    if (termp != 0)
++    if (termp != NULL)
+ 	*base = '\0';
+ 
+     /* If a NOT conditional, reverse the test. */
+@@ -499,7 +499,7 @@
+     int match;
+ 
+     for (mapp = maplist; mapp; mapp = mapp->next)
+-	if (mapp->porttype == 0 || !strcmp(mapp->porttype, type)) {
++	if (mapp->porttype == NULL || !strcmp(mapp->porttype, type)) {
+ 	    switch (mapp->conditional) {
+ 	    case 0:		/* No test specified. */
+ 		match = TRUE;
+@@ -562,11 +562,11 @@
+     }
+ 
+     /* Try the environment. */
+-    if ((ttype = getenv("TERM")) != 0)
++    if ((ttype = getenv("TERM")) != NULL)
+ 	goto map;
+ 
+ #if HAVE_PATH_TTYS
+-    if ((ttypath = ttyname(fd)) != 0) {
++    if ((ttypath = ttyname(fd)) != NULL) {
+ 	p = _nc_basename(ttypath);
+ #if HAVE_GETTTYNAM
+ 	/*
+@@ -616,14 +616,14 @@
+      * by out of date stuff in the environment.
+      */
+   found:
+-    if ((p = getenv("TERMCAP")) != 0 && !_nc_is_abs_path(p)) {
++    if ((p = getenv("TERMCAP")) != NULL && !_nc_is_abs_path(p)) {
+ 	/* 'unsetenv("TERMCAP")' is not portable.
+ 	 * The 'environ' array is better.
+ 	 */
+ 	int n;
+-	for (n = 0; environ[n] != 0; n++) {
++	for (n = 0; environ[n] != NULL; n++) {
+ 	    if (!strncmp("TERMCAP=", environ[n], (size_t) 8)) {
+-		while ((environ[n] = environ[n + 1]) != 0) {
++		while ((environ[n] = environ[n + 1]) != NULL) {
+ 		    n++;
+ 		}
+ 		break;
+@@ -639,7 +639,7 @@
+ 	if (ttype[1] != '\0')
+ 	    ttype = askuser(ttype + 1);
+ 	else
+-	    ttype = askuser(0);
++	    ttype = askuser(NULL);
+     }
+     /* Find the terminfo entry.  If it doesn't exist, ask the user. */
+     while (setupterm((NCURSES_CONST char *) ttype, fd, &errret)
+@@ -647,12 +647,12 @@
+ 	if (errret == 0) {
+ 	    (void) fprintf(stderr, "%s: unknown terminal type %s\n",
+ 			   _nc_progname, ttype);
+-	    ttype = 0;
++	    ttype = NULL;
+ 	} else {
+ 	    (void) fprintf(stderr,
+ 			   "%s: can't initialize terminal type %s (error %d)\n",
+ 			   _nc_progname, ttype, errret);
+-	    ttype = 0;
++	    ttype = NULL;
+ 	}
+ 	ttype = askuser(ttype);
+     }
+@@ -713,7 +713,7 @@
+      * Figure out what shell we're using.  A hack, we look for an
+      * environmental variable SHELL ending in "csh".
+      */
+-    if ((var = getenv("SHELL")) != 0
++    if ((var = getenv("SHELL")) != NULL
+ 	&& ((len = (int) strlen(leaf = _nc_basename(var))) >= 3)
+ 	&& !strcmp(leaf + len - 3, "csh"))
+ 	p = "set noglob;\nsetenv TERM %s;\nunset noglob;\n";
+@@ -806,7 +806,7 @@
+ 	    tkillchar = arg_to_char();
+ 	    break;
+ 	case 'm':		/* map identifier to type */
+-	    add_mapping(0, optarg);
++	    add_mapping(NULL, optarg);
+ 	    break;
+ 	case 'p':		/* OBSOLETE: map identifier to type */
+ 	    add_mapping("plugboard", optarg);
+Index: test/blue.c
+Prereq:  1.56 
+--- ncurses-6.5-20241130+/test/blue.c	2024-10-05 19:26:24.000000000 +0000
++++ ncurses-6.5-20241207/test/blue.c	2024-12-07 22:27:13.000000000 +0000
+@@ -37,7 +37,7 @@
+  *****************************************************************************/
+ 
+ /*
+- * $Id: blue.c,v 1.56 2024/10/05 19:26:24 tom Exp $
++ * $Id: blue.c,v 1.57 2024/12/07 22:27:13 tom Exp $
+  */
+ 
+ #include 
+@@ -454,7 +454,7 @@
+ 	     * The ncurses library makes this check to decide whether to allow
+ 	     * the alternate character set for the (normally) nonprinting codes.
+ 	     */
+-	    if (smacs != 0 && smpch != 0 && !strcmp(smacs, smpch)) {
++	    if (smacs != NULL && smpch != NULL && !strcmp(smacs, smpch)) {
+ 		suits = glyphs;
+ 	    }
+ 	}
+Index: test/bs.c
+Prereq:  1.81 
+--- ncurses-6.5-20241130+/test/bs.c	2024-11-30 16:47:02.000000000 +0000
++++ ncurses-6.5-20241207/test/bs.c	2024-12-07 22:18:28.000000000 +0000
+@@ -35,7 +35,7 @@
+  * v2.0 featuring strict ANSI/POSIX conformance, November 1993.
+  * v2.1 with ncurses mouse support, September 1995
+  *
+- * $Id: bs.c,v 1.81 2024/11/30 16:47:02 tom Exp $
++ * $Id: bs.c,v 1.82 2024/12/07 22:18:28 tom Exp $
+  */
+ 
+ #include 
+@@ -224,12 +224,12 @@
+ {
+     const char *tmpname;
+ 
+-    srand((unsigned) (time(0L) + getpid()));	/* Kick the random number generator */
++    srand((unsigned) (time(NULL) + getpid()));	/* Kick the random number generator */
+ 
+     InitAndCatch(initscr(), uninitgame);
+ 
+-    if ((tmpname = getlogin()) != 0 &&
+-	(your_name = strdup(tmpname)) != 0) {
++    if ((tmpname = getlogin()) != NULL &&
++	(your_name = strdup(tmpname)) != NULL) {
+ 	your_name[0] = (char) toupper(UChar(your_name[0]));
+     } else {
+ 	your_name = strdup(dftname);
+@@ -475,7 +475,7 @@
+ 	} else if (c == FF) {
+ 	    (void) clearok(stdscr, TRUE);
+ 	    (void) refresh();
+-	} else if (ss == 0) {
++	} else if (ss == NULL) {
+ 	    beep();		/* simple to verify, unlikely to happen */
+ 	} else if (c == 'r') {
+ 	    prompt(1, "Random-placing your %s", ss->name);
+@@ -877,7 +877,7 @@
+ 	    m = " You'll pick up survivors from my %s, I hope...!";
+ 	    break;
+ 	}
+-	if (m != 0) {
++	if (m != NULL) {
+ 	    (void) printw(m, ss->name);
+ 	}
+ 	(void) beep();
+Index: test/cardfile.c
+Prereq:  1.53 
+--- ncurses-6.5-20241130+/test/cardfile.c	2024-11-30 16:47:59.000000000 +0000
++++ ncurses-6.5-20241207/test/cardfile.c	2024-12-07 22:27:13.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: cardfile.c,v 1.53 2024/11/30 16:47:59 tom Exp $
++ * $Id: cardfile.c,v 1.54 2024/12/07 22:27:13 tom Exp $
+  *
+  * File format: text beginning in column 1 is a title; other text is content.
+  */
+@@ -47,7 +47,7 @@
+ #define pair_1 1
+ #define pair_2 2
+ 
+-#define isVisible(cardp) ((cardp)->panel != 0)
++#define isVisible(cardp) ((cardp)->panel != NULL)
+ 
+ enum {
+     MY_CTRL_x = MAX_FORM_COMMAND
+@@ -100,7 +100,7 @@
+ {
+     CARD *card, *p, *q;
+ 
+-    for (p = all_cards, q = 0; p != 0; q = p, p = p->link) {
++    for (p = all_cards, q = NULL; p != NULL; q = p, p = p->link) {
+ 	int cmp = strcmp(p->title, title);
+ 	if (cmp == 0)
+ 	    return p;
+@@ -112,7 +112,7 @@
+     card->title = strdup(title);
+     card->content = strdup("");
+ 
+-    if (q == 0) {
++    if (q == NULL) {
+ 	card->link = all_cards;
+ 	all_cards = card;
+     } else {
+@@ -132,7 +132,7 @@
+     if ((total = strlen(content)) != 0) {
+ 	size_t offset;
+ 
+-	if (card->content != 0 && (offset = strlen(card->content)) != 0) {
++	if (card->content != NULL && (offset = strlen(card->content)) != 0) {
+ 	    total += 1 + offset;
+ 	    card->content = typeRealloc(char, total + 1, card->content);
+ 	    if (card->content) {
+@@ -141,7 +141,7 @@
+ 	    }
+ 	} else {
+ 	    offset = 0;
+-	    if (card->content != 0)
++	    if (card->content != NULL)
+ 		free(card->content);
+ 	    card->content = typeMalloc(char, total + 1);
+ 	}
+@@ -165,7 +165,7 @@
+ {
+     CARD *card;
+ 
+-    for (card = all_cards; card != 0; card = card->link)
++    for (card = all_cards; card != NULL; card = card->link)
+ 	if (!strcmp(card->title, title))
+ 	    break;
+ 
+@@ -177,17 +177,17 @@
+ {
+     FILE *fp;
+ 
+-    if ((fp = fopen(fname, "r")) != 0) {
+-	CARD *card = 0;
++    if ((fp = fopen(fname, "r")) != NULL) {
++	CARD *card = NULL;
+ 	char buffer[BUFSIZ];
+ 
+ 	while (fgets(buffer, sizeof(buffer), fp)) {
+ 	    trim(buffer);
+ 	    if (isspace(UChar(*buffer))) {
+-		if (card == 0)
++		if (card == NULL)
+ 		    card = add_title("");
+ 		add_content(card, buffer);
+-	    } else if ((card = find_card(buffer)) == 0) {
++	    } else if ((card = find_card(buffer)) == NULL) {
+ 		card = add_title(buffer);
+ 	    }
+ 	}
+@@ -205,17 +205,17 @@
+     if (!strcmp(fname, default_name))
+ 	fname = "cardfile.out";
+ 
+-    if ((fp = fopen(fname, "w")) != 0) {
+-	CARD *p = 0;
++    if ((fp = fopen(fname, "w")) != NULL) {
++	CARD *p = NULL;
+ 
+-	for (p = all_cards; p != 0; p = p->link) {
++	for (p = all_cards; p != NULL; p = p->link) {
+ 	    FIELD **f = form_fields(p->form);
+ 	    int n;
+ 
+-	    for (n = 0; f[n] != 0; n++) {
++	    for (n = 0; f[n] != NULL; n++) {
+ 		char *s = field_buffer(f[n], 0);
+-		if (s != 0
+-		    && (s = strdup(s)) != 0) {
++		if (s != NULL
++		    && (s = strdup(s)) != NULL) {
+ 		    trim(s);
+ 		    fprintf(fp, "%s%s\n", n ? "\t" : "", s);
+ 		    free(s);
+@@ -237,7 +237,7 @@
+     CARD *p;
+     int count = 0;
+ 
+-    for (p = all_cards; p != 0; p = p->link)
++    for (p = all_cards; p != NULL; p = p->link)
+ 	count++;
+ 
+     return count;
+@@ -263,7 +263,7 @@
+ static CARD *
+ next_card(CARD * now)
+ {
+-    if (now->link != 0) {
++    if (now->link != NULL) {
+ 	CARD *tst = now->link;
+ 	if (isVisible(tst))
+ 	    now = tst;
+@@ -280,7 +280,7 @@
+ prev_card(CARD * now)
+ {
+     CARD *p;
+-    for (p = all_cards; p != 0; p = p->link) {
++    for (p = all_cards; p != NULL; p = p->link) {
+ 	if (p->link == now) {
+ 	    if (!isVisible(p))
+ 		p = prev_card(p);
+@@ -355,7 +355,7 @@
+     set_field_just(f[1], JUSTIFY_LEFT);
+     field_opts_off(f[1], O_BLANK);
+ 
+-    f[2] = 0;
++    f[2] = NULL;
+     return f;
+ }
+ 
+@@ -375,7 +375,7 @@
+ {
+     int n;
+ 
+-    for (n = 0; f[n] != 0; ++n) {
++    for (n = 0; f[n] != NULL; ++n) {
+ 	free_field(f[n]);
+     }
+     free(f);
+@@ -414,9 +414,9 @@
+     x = 0;
+ 
+     /* make a panel for each CARD */
+-    for (p = all_cards; p != 0; p = p->link) {
++    for (p = all_cards; p != NULL; p = p->link) {
+ 
+-	if ((win = newwin(panel_high, panel_wide, y, x)) == 0)
++	if ((win = newwin(panel_high, panel_wide, y, x)) == NULL)
+ 	    break;
+ 
+ 	wbkgd(win, (chtype) COLOR_PAIR(pair_2));
+@@ -478,7 +478,7 @@
+ 		x = 0;
+ 
+ 		show_legend();
+-		for (p = all_cards; p != 0; p = p->link) {
++		for (p = all_cards; p != NULL; p = p->link) {
+ 		    FIELD **oldf = form_fields(p->form);
+ 		    WINDOW *olds = form_sub(p->form);
+ 
+@@ -528,7 +528,7 @@
+ 	}
+     }
+ #if NO_LEAKS
+-    while (all_cards != 0) {
++    while (all_cards != NULL) {
+ 	p = all_cards;
+ 	all_cards = all_cards->link;
+ 
+Index: test/chgat.c
+Prereq:  1.23 
+--- ncurses-6.5-20241130+/test/chgat.c	2024-10-06 22:35:55.000000000 +0000
++++ ncurses-6.5-20241207/test/chgat.c	2024-12-07 22:27:13.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: chgat.c,v 1.23 2024/10/06 22:35:55 tom Exp $
++ * $Id: chgat.c,v 1.24 2024/12/07 22:27:13 tom Exp $
+  *
+  * test-driver for chgat/wchgat/mvchgat/mvwchgat
+  */
+@@ -77,7 +77,7 @@
+     };
+     /* *INDENT-ON* */
+ 
+-    const char *result = 0;
++    const char *result = NULL;
+ 
+     if (has_colors()) {
+ 	static bool first = TRUE;
+@@ -114,7 +114,7 @@
+     };
+     /* *INDENT-ON* */
+ 
+-    const char *result = 0;
++    const char *result = NULL;
+ 
+     if (state < SIZEOF(table)) {
+ 	*attr = table[state].attr;
+@@ -151,9 +151,9 @@
+     getyx(win, y, x);
+     wmove(win, 0, 0);
+     wprintw(win, "Count %d", sp->count);
+-    if (sp->v_msg != 0)
++    if (sp->v_msg != NULL)
+ 	wprintw(win, " Video %s", sp->v_msg);
+-    if (sp->c_msg != 0)
++    if (sp->c_msg != NULL)
+ 	wprintw(win, " Color %s", sp->c_msg);
+     wclrtoeol(win);
+     wmove(win, y, x);
+@@ -165,10 +165,10 @@
+     WINDOW *win1 = newwin(sp->y_max - 2, sp->x_max - 2,
+ 			  sp->y_beg + 1, sp->x_beg + 1);
+ 
+-    if (win1 != 0 && sp->y_max > 4 && sp->x_max > 4) {
++    if (win1 != NULL && sp->y_max > 4 && sp->x_max > 4) {
+ 	WINDOW *win2 = derwin(win1, sp->y_max - 4, sp->x_max - 4, 1, 1);
+ 
+-	if (win2 != 0) {
++	if (win2 != NULL) {
+ 	    box(win1, 0, 0);
+ 	    wrefresh(win1);
+ 	    func(win2);
+@@ -180,7 +180,7 @@
+ 	delwin(win1);
+ 	touchwin(win);
+     } else {
+-	if (win1 != 0)
++	if (win1 != NULL)
+ 	    delwin(win1);
+ 	beep();
+     }
+@@ -218,7 +218,7 @@
+ 	,"=     resets count to zero."
+ 	,"-     negates count."
+ 	,"?     shows this help-window"
+-	,0
++	,NULL
+     };
+ 
+     popup_msg(win, msgs);
+@@ -230,14 +230,14 @@
+     switch (sp->ch) {
+     case ' ':			/* next test-iteration */
+ 	if (has_colors()) {
+-	    if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == 0) {
++	    if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == NULL) {
+ 		sp->c_msg = color_params(sp->c = 0, &(sp->pair));
+-		if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
++		if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == NULL) {
+ 		    sp->v_msg = video_params(sp->v = 0, &(sp->attr));
+ 		}
+ 	    }
+ 	} else {
+-	    if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
++	    if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == NULL) {
+ 		sp->v_msg = video_params(sp->v = 0, &(sp->attr));
+ 	    }
+ 	}
+Index: test/clip_printw.c
+Prereq:  1.25 
+--- ncurses-6.5-20241130+/test/clip_printw.c	2024-10-06 22:36:25.000000000 +0000
++++ ncurses-6.5-20241207/test/clip_printw.c	2024-12-07 22:22:51.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: clip_printw.c,v 1.25 2024/10/06 22:36:25 tom Exp $
++ * $Id: clip_printw.c,v 1.26 2024/12/07 22:22:51 tom Exp $
+  *
+  * demonstrate how to use printw with/without wrapping.
+  */
+@@ -122,7 +122,7 @@
+     };
+     /* *INDENT-ON* */
+ 
+-    const char *result = 0;
++    const char *result = NULL;
+ 
+     if (has_colors()) {
+ 	static bool first = TRUE;
+@@ -161,7 +161,7 @@
+     };
+     /* *INDENT-ON* */
+ 
+-    const char *result = 0;
++    const char *result = NULL;
+ 
+     if (state < SIZEOF(table)) {
+ 	*attr = table[state].attr;
+@@ -201,9 +201,9 @@
+     wmove(win, 0, 0);
+     wprintw(win, "Clip %s", sp->single ? "line" : "window");
+     wprintw(win, " Count %d", sp->count);
+-    if (sp->v_msg != 0)
++    if (sp->v_msg != NULL)
+ 	wprintw(win, " Video %s", sp->v_msg);
+-    if (sp->c_msg != 0)
++    if (sp->c_msg != NULL)
+ 	wprintw(win, " Color %s", sp->c_msg);
+     wprintw(win, " (%d)", sp->status);
+     wclrtoeol(win);
+@@ -219,14 +219,14 @@
+ 			  sp->y_beg + MARGIN,
+ 			  sp->x_beg + MARGIN);
+ 
+-    if (win1 != 0 && sp->y_max > 4 && sp->x_max > 4) {
++    if (win1 != NULL && sp->y_max > 4 && sp->x_max > 4) {
+ 	WINDOW *win2 = derwin(win1,
+ 			      sp->y_max - (2 * MARGIN) - 2,
+ 			      sp->x_max - (2 * MARGIN) - 2,
+ 			      (win == stdscr) ? Y_BASE : Y_BASE,
+ 			      MARGIN);
+ 
+-	if (win2 != 0) {
++	if (win2 != NULL) {
+ 	    box(win1, 0, 0);
+ 	    wrefresh(win1);
+ 	    func(win2);
+@@ -283,7 +283,7 @@
+ 	,".     calls vw_printw at the current position with the given count."
+ 	,"=     resets count to zero."
+ 	,"?     shows this help-window"
+-	,0
++	,NULL
+     };
+ 
+     popup_msg(win, msgs);
+@@ -297,14 +297,14 @@
+     switch (sp->ch) {
+     case ' ':			/* next test-iteration */
+ 	if (has_colors()) {
+-	    if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == 0) {
++	    if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == NULL) {
+ 		sp->c_msg = color_params(sp->c = 0, &(sp->pair));
+-		if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
++		if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == NULL) {
+ 		    sp->v_msg = video_params(sp->v = 0, &(sp->attr));
+ 		}
+ 	    }
+ 	} else {
+-	    if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
++	    if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == NULL) {
+ 		sp->v_msg = video_params(sp->v = 0, &(sp->attr));
+ 	    }
+ 	}
+@@ -396,7 +396,7 @@
+ 		need = (unsigned) want - 1;
+ 		_nc_STRCPY(fmt, "%c%s%c", sizeof(fmt));
+ 	    }
+-	    if ((buffer = typeMalloc(char, need + 1)) != 0) {
++	    if ((buffer = typeMalloc(char, need + 1)) != NULL) {
+ 		for (j = 0; j < need; ++j) {
+ 		    buffer[j] = (char) ('A' + (j % 26));
+ 		}
+Index: test/color_content.c
+Prereq:  1.21 
+--- ncurses-6.5-20241130+/test/color_content.c	2024-11-30 18:31:01.000000000 +0000
++++ ncurses-6.5-20241207/test/color_content.c	2024-12-07 22:22:51.000000000 +0000
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: color_content.c,v 1.21 2024/11/30 18:31:01 tom Exp $
++ * $Id: color_content.c,v 1.22 2024/12/07 22:22:51 tom Exp $
+  */
+ 
+ #define NEED_TIME_H
+@@ -186,7 +186,7 @@
+ 	my_color_t g;
+ 	my_color_t b;
+ 	if (ColorContent(color, &r, &g, &b) == OK) {
+-	    if (expected != 0) {
++	    if (expected != NULL) {
+ 		if (r != expected[color].r)
+ 		    success = FALSE;
+ 		if (g != expected[color].g)
+Index: test/color_name.h
+Prereq:  1.10 
+--- ncurses-6.5-20241130+/test/color_name.h	2024-10-05 19:26:24.000000000 +0000
++++ ncurses-6.5-20241207/test/color_name.h	2024-12-07 22:17:24.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: color_name.h,v 1.10 2024/10/05 19:26:24 tom Exp $
++ * $Id: color_name.h,v 1.11 2024/12/07 22:17:24 tom Exp $
+  */
+ 
+ #ifndef __COLORNAME_H
+@@ -62,10 +62,10 @@
+ color_code(const char *color)
+ {
+     int result = 0;
+-    char *endp = 0;
++    char *endp = NULL;
+ 
+     if ((result = (int) strtol(color, &endp, 0)) >= 0
+-	&& (endp == 0 || *endp == 0)) {
++	&& (endp == NULL || *endp == 0)) {
+ 	;
+     } else if (!strcmp(color, "default")) {
+ 	result = -1;
+@@ -87,7 +87,7 @@
+ color_name(int color)
+ {
+     static char temp[20];
+-    const char *result = 0;
++    const char *result = NULL;
+ 
+     if (color >= (int) SIZEOF(the_color_names)) {
+ 	_nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "%d", color);
+Index: test/combine.c
+Prereq:  1.25 
+--- ncurses-6.5-20241130+/test/combine.c	2024-11-30 19:08:20.000000000 +0000
++++ ncurses-6.5-20241207/test/combine.c	2024-12-07 22:22:51.000000000 +0000
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: combine.c,v 1.25 2024/11/30 19:08:20 tom Exp $
++ * $Id: combine.c,v 1.26 2024/12/07 22:22:51 tom Exp $
+  */
+ 
+ #include 
+@@ -174,7 +174,7 @@
+ 	++d;
+     }
+     popup_msg2(current, msgs);
+-    for (s = 0; msgs[s] != 0; ++s) {
++    for (s = 0; msgs[s] != NULL; ++s) {
+ 	free(msgs[s]);
+     }
+     free(msgs);
+Index: test/demo_altkeys.c
+Prereq:  1.17 
+--- ncurses-6.5-20241130+/test/demo_altkeys.c	2023-02-25 18:08:02.000000000 +0000
++++ ncurses-6.5-20241207/test/demo_altkeys.c	2024-12-07 23:02:27.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2005-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_altkeys.c,v 1.17 2023/02/25 18:08:02 tom Exp $
++ * $Id: demo_altkeys.c,v 1.18 2024/12/07 23:02:27 tom Exp $
+  *
+  * Demonstrate the define_key() function.
+  * Thomas Dickey - 2005/10/22
+@@ -49,7 +49,7 @@
+ {
+     FILE *fp;
+ 
+-    if ((fp = fopen(MY_LOGFILE, "a")) != 0) {
++    if ((fp = fopen(MY_LOGFILE, "a")) != NULL) {
+ 	char temp[256];
+ 	int y, x, n;
+ 	int need = sizeof(temp) - 1;
+@@ -114,7 +114,7 @@
+     unlink(MY_LOGFILE);
+ 
+     setlocale(LC_ALL, "");
+-    if (newterm(0, stdout, stdin) == 0) {
++    if (newterm(NULL, stdout, stdin) == NULL) {
+ 	fprintf(stderr, "Cannot initialize terminal\n");
+ 	ExitProgram(EXIT_FAILURE);
+     }
+@@ -135,7 +135,7 @@
+     }
+     for (n = KEY_MIN; n < KEY_MAX; ++n) {
+ 	char *value;
+-	if ((value = keybound(n, 0)) != 0) {
++	if ((value = keybound(n, 0)) != NULL) {
+ 	    size_t need = strlen(value) + 2;
+ 	    char *temp = typeMalloc(char, need);
+ 	    _nc_SPRINTF(temp, _nc_SLIMIT(need) "\033%s", value);
+@@ -158,7 +158,7 @@
+ 	printw("Keycode %d, name %s%s\n",
+ 	       ch,
+ 	       escaped ? "ESC-" : "",
+-	       name != 0 ? name : "");
++	       name != NULL ? name : "");
+ 	log_last_line(stdscr);
+ 	clrtoeol();
+ 	if (ch == 'q')
+Index: test/demo_defkey.c
+Prereq:  1.36 
+--- ncurses-6.5-20241130+/test/demo_defkey.c	2024-10-05 18:20:04.000000000 +0000
++++ ncurses-6.5-20241207/test/demo_defkey.c	2024-12-07 22:22:51.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_defkey.c,v 1.36 2024/10/05 18:20:04 tom Exp $
++ * $Id: demo_defkey.c,v 1.37 2024/12/07 22:22:51 tom Exp $
+  *
+  * Demonstrate the define_key() function.
+  * Thomas Dickey - 2002/11/23
+@@ -47,7 +47,7 @@
+ {
+     FILE *fp;
+ 
+-    if ((fp = fopen(MY_LOGFILE, "a")) != 0) {
++    if ((fp = fopen(MY_LOGFILE, "a")) != NULL) {
+ 	char temp[256];
+ 	int y, x, n;
+ 	int need = sizeof(temp) - 1;
+@@ -98,7 +98,7 @@
+ static char *
+ visible(const char *string)
+ {
+-    char *result = 0;
++    char *result = NULL;
+ 
+     if (VALID_STRING(string) && *string != '\0') {
+ 	int pass;
+@@ -130,15 +130,15 @@
+     int rc;
+     const char *code_name = keyname(code);
+     char *old_string;
+-    char *vis_string = 0;
++    char *vis_string = NULL;
+     char temp[80];
+ 
+-    if (code_name == 0) {
++    if (code_name == NULL) {
+ 	_nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "Keycode %d", code);
+ 	code_name = temp;
+     }
+ 
+-    if ((old_string = keybound(code, 0)) != 0) {
++    if ((old_string = keybound(code, 0)) != NULL) {
+ 	wprintw(win, "%s is %s\n",
+ 		code_name,
+ 		vis_string = visible(old_string));
+@@ -153,7 +153,7 @@
+     if ((rc = key_defined(new_string)) > 0) {
+ 	wprintw(win, "%s was bound to %s\n", vis_string, keyname(rc));
+ 	log_last_line(win);
+-    } else if (new_string != 0 && rc < 0) {
++    } else if (new_string != NULL && rc < 0) {
+ 	wprintw(win, "%s conflicts with longer strings\n", vis_string);
+ 	log_last_line(win);
+     }
+@@ -161,18 +161,18 @@
+     if (rc == ERR) {
+ 	wprintw(win, "%s unchanged\n", code_name);
+ 	log_last_line(win);
+-    } else if (new_string != 0) {
++    } else if (new_string != NULL) {
+ 	wprintw(win, "%s is now bound to %s\n",
+ 		vis_string,
+ 		code_name);
+ 	log_last_line(win);
+-    } else if (old_string != 0) {
++    } else if (old_string != NULL) {
+ 	wprintw(win, "%s deleted\n", code_name);
+ 	log_last_line(win);
+     }
+-    if (vis_string != 0)
++    if (vis_string != NULL)
+ 	free(vis_string);
+-    if (old_string != 0)
++    if (old_string != NULL)
+ 	free(old_string);
+ }
+ 
+@@ -182,14 +182,14 @@
+     char *value = tigetstr(name);
+ 
+     if (VALID_STRING(value)) {
+-	const char *prefix = 0;
++	const char *prefix = NULL;
+ 
+ 	if (!(strncmp) (value, "\033[", (size_t) 2)) {
+ 	    prefix = "\033O";
+ 	} else if (!(strncmp) (value, "\033O", (size_t) 2)) {
+ 	    prefix = "\033[";
+ 	}
+-	if (prefix != 0) {
++	if (prefix != NULL) {
+ 	    char temp[BUFSIZ];
+ 	    _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
+ 			"%s%s", prefix, value + 2);
+@@ -207,7 +207,7 @@
+ static void
+ remove_definition(WINDOW *win, int code)
+ {
+-    really_define_key(win, 0, code);
++    really_define_key(win, NULL, code);
+ }
+ 
+ static void
+@@ -297,7 +297,7 @@
+ 	const char *name = keyname(ch);
+ 	wprintw(win, "Keycode %d, name %s\n",
+ 		ch,
+-		name != 0 ? name : "");
++		name != NULL ? name : "");
+ 	log_last_line(win);
+ 	wclrtoeol(win);
+ 	if (ch == 'q')
+Index: test/demo_forms.c
+Prereq:  1.67 
+--- ncurses-6.5-20241130+/test/demo_forms.c	2024-10-06 21:15:12.000000000 +0000
++++ ncurses-6.5-20241207/test/demo_forms.c	2024-12-07 22:27:13.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_forms.c,v 1.67 2024/10/06 21:15:12 tom Exp $
++ * $Id: demo_forms.c,v 1.68 2024/12/07 22:27:13 tom Exp $
+  *
+  * Demonstrate a variety of functions from the form library.
+  * Thomas Dickey - 2003/4/26
+@@ -50,7 +50,7 @@
+ static int j_value = 0;
+ static int m_value = 0;
+ static int o_value = 0;
+-static char *t_value = 0;
++static char *t_value = NULL;
+ 
+ static void
+ failed(const char *s)
+@@ -82,9 +82,9 @@
+ get_data(const char *name)
+ {
+     char *result = t_value;
+-    if (my_data != 0) {
++    if (my_data != NULL) {
+ 	int n;
+-	for (n = 0; my_data[n].name != 0; ++n) {
++	for (n = 0; my_data[n].name != NULL; ++n) {
+ 	    if (!strcmp(name, my_data[n].name)) {
+ 		result = my_data[n].value;
+ 		break;
+@@ -102,21 +102,21 @@
+ {
+     FILE *fp = fopen(filename, "r");
+ 
+-    if (fp != 0) {
++    if (fp != NULL) {
+ 	char buffer[BUFSIZ];
+ 	char *colon;
+ 	int more = 0;
+ 	int item = 0;
+ 
+ 	my_data = typeCalloc(MY_DATA, (size_t) 100);	/* FIXME */
+-	while (fgets(buffer, sizeof(buffer), fp) != 0) {
++	while (fgets(buffer, sizeof(buffer), fp) != NULL) {
+ 	    chomp(buffer);
+ 	    if (more) {
+ 		if (strcmp(buffer, ".")) {
+ 		    char *prior = my_data[more - 1].value;
+ 		    size_t need = strlen(buffer) + 2 + strlen(prior);
+ 		    char *value = typeRealloc(char, need, prior);
+-		    if (value == 0)
++		    if (value == NULL)
+ 			failed("realloc");
+ 		    _nc_STRCAT(value, "\n", need);
+ 		    _nc_STRCAT(value, buffer, need);
+@@ -126,13 +126,13 @@
+ 		}
+ 	    } else if (*buffer == '#') {
+ 		continue;
+-	    } else if ((colon = strchr(buffer, ':')) != 0) {
++	    } else if ((colon = strchr(buffer, ':')) != NULL) {
+ 		char *name;
+ 		char *value;
+ 		*colon++ = '\0';
+ 		name = strdup(buffer);
+ 		value = strdup(colon);
+-		if (name == 0 || value == 0)
++		if (name == NULL || value == NULL)
+ 		    failed("strdup");
+ 		my_data[item].name = name;
+ 		my_data[item].value = value;
+@@ -245,10 +245,10 @@
+ another_field(NCURSES_CONST FORM *form, NCURSES_CONST FIELD *const field)
+ {
+     FIELD **f = form_fields(form);
+-    FIELD *result = 0;
++    FIELD *result = NULL;
+     int n;
+ 
+-    for (n = 0; f[n] != 0; ++n) {
++    for (n = 0; f[n] != NULL; ++n) {
+ 	if (f[n] != field) {
+ 	    result = f[n];
+ 	    field_opts_on(result, O_SELECTABLE);
+@@ -273,7 +273,7 @@
+ 	help_edit_field();
+ 	break;
+     case MY_EDT_MODE:
+-	if ((field = current_field(form)) != 0) {
++	if ((field = current_field(form)) != NULL) {
+ 	    set_current_field(form, another_field(form, field));
+ 	    if ((unsigned) field_opts(field) & O_EDIT) {
+ 		field_opts_off(field, O_EDIT);
+@@ -324,7 +324,7 @@
+ 	waddstr(win, " behind");
+     waddch(win, '\n');
+ 
+-    if ((field = current_field(form)) != 0) {
++    if ((field = current_field(form)) != NULL) {
+ 	NCURSES_CONST FIELDTYPE *type;
+ 	int nbuf;
+ 
+@@ -333,7 +333,7 @@
+ 		new_page(field) ? "*" : "",
+ 		field_index(field), field_count(form),
+ 		field_arg(field) ? "(arg)" : "");
+-	if ((type = field_type(field)) != 0) {
++	if ((type = field_type(field)) != NULL) {
+ 	    if (type == TYPE_ALNUM)
+ 		waddstr(win, "ALNUM");
+ 	    else if (type == TYPE_ALPHA)
+@@ -384,7 +384,7 @@
+ 	waddstr(win, "\n");
+ 	for (nbuf = 0; nbuf <= 2; ++nbuf) {
+ 	    NCURSES_CONST char *buffer;
+-	    if ((buffer = field_buffer(field, nbuf)) != 0) {
++	    if ((buffer = field_buffer(field, nbuf)) != NULL) {
+ 		wprintw(win, "buffer %d:", nbuf);
+ 		(void) wattrset(win, A_REVERSE);
+ 		if (nbuf) {
+@@ -410,7 +410,7 @@
+     int pg;
+     NCURSES_CONST char *fname;
+     static NCURSES_CONST char *my_enum[] =
+-    {"first", "second", "third", 0};
++    {"first", "second", "third", NULL};
+ 
+ #ifdef NCURSES_MOUSE_VERSION
+     mousemask(ALL_MOUSE_EVENTS, (mmask_t *) 0);
+@@ -514,7 +514,7 @@
+ 
+     f[n] = (FIELD *) 0;
+ 
+-    if ((form = new_form(f)) != 0) {
++    if ((form = new_form(f)) != NULL) {
+ 	NCURSES_CONST WINDOW *w;
+ 	WINDOW *also;
+ 	int finished = 0;
+@@ -543,7 +543,7 @@
+ 
+ 	free_form(form);
+     }
+-    for (c = 0; f[c] != 0; c++) {
++    for (c = 0; f[c] != NULL; c++) {
+ 	free_edit_field(f[c]);
+ 	free_field(f[c]);
+     }
+Index: test/demo_keyok.c
+Prereq:  1.10 
+--- ncurses-6.5-20241130+/test/demo_keyok.c	2024-08-24 17:16:49.000000000 +0000
++++ ncurses-6.5-20241207/test/demo_keyok.c	2024-12-07 22:22:51.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_keyok.c,v 1.10 2024/08/24 17:16:49 tom Exp $
++ * $Id: demo_keyok.c,v 1.11 2024/12/07 22:22:51 tom Exp $
+  *
+  * Demonstrate the keyok() function.
+  * Thomas Dickey - 2002/11/23
+@@ -100,7 +100,7 @@
+ 	prior = ch;
+ 	wprintw(win, "Keycode %d, name %s\n",
+ 		ch,
+-		name != 0 ? name : "");
++		name != NULL ? name : "");
+ 	wclrtoeol(win);
+ 	wrefresh(win);
+ 	if (ch >= KEY_MIN) {
+Index: test/demo_menus.c
+Prereq:  1.85 
+--- ncurses-6.5-20241130+/test/demo_menus.c	2024-11-30 18:52:09.000000000 +0000
++++ ncurses-6.5-20241207/test/demo_menus.c	2024-12-07 22:27:13.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_menus.c,v 1.85 2024/11/30 18:52:09 tom Exp $
++ * $Id: demo_menus.c,v 1.86 2024/12/07 22:27:13 tom Exp $
+  *
+  * Demonstrate a variety of functions from the menu library.
+  * Thomas Dickey - 2005/4/9
+@@ -311,9 +311,9 @@
+ menu_destroy(MENU * m, int itemsToo)
+ {
+     Trace(("menu_destroy %p", (void *) m));
+-    if (m != 0) {
++    if (m != NULL) {
+ 	ITEM **items = menu_items(m);
+-	const char *blob = 0;
++	const char *blob = NULL;
+ 	int count;
+ 
+ 	count = item_count(m);
+@@ -335,7 +335,7 @@
+ 	if (count > 0 && itemsToo) {
+ 	    if (itemsToo & 1) {
+ 		ITEM **ip = items;
+-		if (ip != 0) {
++		if (ip != NULL) {
+ 		    while (*ip)
+ 			free_item(*ip++);
+ 		}
+@@ -362,14 +362,14 @@
+     static MENU_DATA table[] =
+     {
+ 	{"Exit", call_files, 0},
+-	{(char *) 0, 0, 0}
++	{(char *) 0, NULL, 0}
+     };
+     static ITEM *items[SIZEOF(table)];
+ 
+     ITEM **ip = items;
+     int n;
+ 
+-    for (n = 0; table[n].name != 0; ++n) {
++    for (n = 0; table[n].name != NULL; ++n) {
+ 	*ip = new_item(table[n].name, empty);
+ 	set_item_userptr(*ip, (void *) &table[n]);
+ 	++ip;
+@@ -413,17 +413,17 @@
+ 	MY_DATA("Pumas"),
+ 	MY_DATA("Lions, Tigers, Bears, (Oh my!), Newts, Platypi, Lemurs"),
+ 	MY_DATA("Lions, Tigers, Bears, (Oh my!), Newts, Platypi, Lemurs, Lions, Tigers, Bears, (Oh my!), Newts, Platypi, Lemurs"),
+-	{(char *) 0, 0, 0}
++	{(char *) 0, NULL, 0}
+     };
+     static ITEM **items;
+ 
+     ITEM **ip;
+-    MENU_DATA *ap = 0;
+-    MENU_DATA *myList = 0;
++    MENU_DATA *ap = NULL;
++    MENU_DATA *myList = NULL;
+     int i;
+     size_t count = 0;
+ 
+-    if (filename != 0) {
++    if (filename != NULL) {
+ 	struct stat sb;
+ 	if (stat(filename, &sb) == 0
+ 	    && (sb.st_mode & S_IFMT) == S_IFREG
+@@ -436,9 +436,9 @@
+ 	    Trace(("build_select_menu blob=%p, items=%p",
+ 		   (void *) blob,
+ 		   (void *) items));
+-	    if (blob != 0 && list != 0) {
++	    if (blob != NULL && list != NULL) {
+ 		FILE *fp = fopen(filename, "r");
+-		if (fp != 0) {
++		if (fp != NULL) {
+ 		    if (fread(blob, sizeof(char), size, fp) == size) {
+ 			bool mark = TRUE;
+ 			unsigned j, k;
+@@ -456,7 +456,7 @@
+ 				blob[j] = ' ';	/* menu items are printable */
+ 			    }
+ 			}
+-			list[k].name = 0;
++			list[k].name = NULL;
+ 			count = k;
+ 			ap = myList = list;
+ 		    }
+@@ -464,28 +464,28 @@
+ 		}
+ 		loaded_file = TRUE;
+ 	    }
+-	    if (ap == 0)
++	    if (ap == NULL)
+ 		free(items);
+ 	}
+     }
+-    if (ap == 0) {
++    if (ap == NULL) {
+ 	count = SIZEOF(table) - 1;
+ 	items = typeCalloc(ITEM *, count + 1);
+ 	ap = table;
+     }
+ 
+     ip = items;
+-    for (i = 0; ap[i].name != 0; ++i) {
++    for (i = 0; ap[i].name != NULL; ++i) {
+ 	ap[i].func = call_select;
+ 	ap[i].mask = (unsigned) i;
+ 	*ip = new_item(ap[i].name, empty);
+ 	set_item_userptr(*ip, (void *) &table[i]);
+ 	++ip;
+     }
+-    *ip = 0;
++    *ip = NULL;
+ 
+     mpSelect = menu_create(items, (int) count, 1, number);
+-    if (myList != 0)
++    if (myList != NULL)
+ 	free(myList);
+ }
+ 
+@@ -527,7 +527,7 @@
+     T_TBL(TRACE_ATTRS),
+     T_TBL(TRACE_MAXIMUM),
+     {
+-	(char *) 0, 0, 0
++	(char *) 0, NULL, 0
+     }
+ };
+ 
+@@ -539,7 +539,7 @@
+     ITEM **ip = items;
+     int n;
+ 
+-    for (n = 0; t_tbl[n].name != 0; n++) {
++    for (n = 0; t_tbl[n].name != NULL; n++) {
+ 	*ip = new_item(t_tbl[n].name, empty);
+ 	set_item_userptr(*ip, (void *) &t_tbl[n]);
+ 	++ip;
+@@ -556,8 +556,8 @@
+     static size_t need = 12;
+     int n;
+ 
+-    if (buf == 0) {
+-	for (n = 0; t_tbl[n].name != 0; n++)
++    if (buf == NULL) {
++	for (n = 0; t_tbl[n].name != NULL; n++)
+ 	    need += strlen(t_tbl[n].name) + 2;
+ 	buf = typeMalloc(char, need);
+ 	if (!buf)
+@@ -568,7 +568,7 @@
+ 	_nc_STRCAT(buf, t_tbl[0].name ? t_tbl[0].name : "", need);
+ 	_nc_STRCAT(buf, ", ", need);
+     } else {
+-	for (n = 1; t_tbl[n].name != 0; n++)
++	for (n = 1; t_tbl[n].name != NULL; n++)
+ 	    if ((tlevel & t_tbl[n].mask) == t_tbl[n].mask) {
+ 		_nc_STRCAT(buf, t_tbl[n].name, need);
+ 		_nc_STRCAT(buf, ", ", need);
+@@ -595,7 +595,7 @@
+     if (i == items[0]) {
+ 	if (item_value(i)) {
+ 	    ITEM **p;
+-	    for (p = items + 1; *p != 0; p++)
++	    for (p = items + 1; *p != NULL; p++)
+ 		if (item_value(*p)) {
+ 		    set_item_value(*p, FALSE);
+ 		    changed = TRUE;
+@@ -670,7 +670,7 @@
+ 	break;
+ #endif
+     default:
+-	result = 0;
++	result = NULL;
+ 	break;
+     }
+     return result;
+@@ -693,14 +693,14 @@
+ #ifdef TRACE
+ 	{"Trace", call_menus, 2},
+ #endif
+-	{(char *) 0, 0, 0}
++	{(char *) 0, NULL, 0}
+     };
+     static ITEM *items[SIZEOF(table)];
+ 
+     ITEM **ip = items;
+     int n;
+ 
+-    for (n = 0; table[n].name != 0; ++n) {
++    for (n = 0; table[n].name != NULL; ++n) {
+ 	*ip = new_item(table[n].name, empty);
+ 	set_item_userptr(*ip, (void *) &table[n]);
+ 	++ip;
+@@ -1023,7 +1023,7 @@
+ #endif /* HAVE_RIPOFFLINE */
+ #ifdef TRACE
+ 	case 'D':
+-	    curses_trace((unsigned) strtoul(optarg, 0, 0));
++	    curses_trace((unsigned) strtoul(optarg, NULL, 0));
+ 	    break;
+ #endif
+ 	case OPTS_VERSION:
+@@ -1046,7 +1046,7 @@
+ 	init_pair(2, COLOR_BLUE, COLOR_WHITE);
+     }
+     status = newwin(3, COLS, LINES - 3, 0);
+-    build_menus(argc > 1 ? argv[1] : 0);
++    build_menus(argc > 1 ? argv[1] : NULL);
+     perform_menus();
+     destroy_menus();
+ 
+Index: test/demo_new_pair.c
+Prereq:  1.31 
+--- ncurses-6.5-20241130+/test/demo_new_pair.c	2024-11-09 20:43:56.000000000 +0000
++++ ncurses-6.5-20241207/test/demo_new_pair.c	2024-12-07 22:22:51.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_new_pair.c,v 1.31 2024/11/09 20:43:56 tom Exp $
++ * $Id: demo_new_pair.c,v 1.32 2024/12/07 22:22:51 tom Exp $
+  *
+  * Demonstrate the alloc_pair() function.
+  */
+@@ -50,7 +50,7 @@
+ valid_cap(NCURSES_CONST char *name)
+ {
+     const char *value = tigetstr(name);
+-    return (value != 0 && value != (char *) -1) ? TRUE : FALSE;
++    return (value != NULL && value != (char *) -1) ? TRUE : FALSE;
+ }
+ 
+ static attr_t
+@@ -188,7 +188,7 @@
+ 	"  ?      print this screen (exit on any character).",
+ 	"",
+ 	"To exit this program, press ^Q, ^[ or \"q\".",
+-	0
++	NULL
+     };
+ 
+     bool done = FALSE;
+@@ -243,7 +243,7 @@
+ 	fprintf(stderr, "cannot open terminal for output\n");
+ 	ExitProgram(EXIT_FAILURE);
+     }
+-    if (newterm(NULL, output, stdin) == 0) {
++    if (newterm(NULL, output, stdin) == NULL) {
+ 	fprintf(stderr, "Cannot initialize terminal\n");
+ 	if (output != NULL)
+ 	    fclose(output);
+Index: test/demo_panels.c
+Prereq:  1.52 
+--- ncurses-6.5-20241130+/test/demo_panels.c	2024-11-23 19:07:23.000000000 +0000
++++ ncurses-6.5-20241207/test/demo_panels.c	2024-12-07 22:27:13.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_panels.c,v 1.52 2024/11/23 19:07:23 tom Exp $
++ * $Id: demo_panels.c,v 1.53 2024/12/07 22:27:13 tom Exp $
+  *
+  * Demonstrate a variety of functions from the panel library.
+  */
+@@ -52,18 +52,18 @@
+ static void
+ close_input(void)
+ {
+-    if (log_in != 0) {
++    if (log_in != NULL) {
+ 	fclose(log_in);
+-	log_in = 0;
++	log_in = NULL;
+     }
+ }
+ 
+ static void
+ close_output(void)
+ {
+-    if (log_out != 0) {
++    if (log_out != NULL) {
+ 	fclose(log_out);
+-	log_out = 0;
++	log_out = NULL;
+     }
+ }
+ 
+@@ -88,7 +88,7 @@
+ saywhat(NCURSES_CONST char *text)
+ {
+     WINDOW *win = statusline();
+-    if (text != 0 && *text != '\0') {
++    if (text != NULL && *text != '\0') {
+ 	waddstr(win, text);
+ 	waddstr(win, "; ");
+     }
+@@ -124,7 +124,7 @@
+ 
+     show_position(text, also, which, y1, x1);
+ 
+-    if (log_in != 0) {
++    if (log_in != NULL) {
+ 	if (fscanf(log_in, "%c%d,%d\n", &cmd, &y1, &x1) == 3) {
+ 	    switch (cmd) {
+ 	    case LAST_POS:
+@@ -204,12 +204,12 @@
+ mkpanel(short color, int rows, int cols, int tly, int tlx)
+ {
+     WINDOW *win;
+-    PANEL *pan = 0;
++    PANEL *pan = NULL;
+     char *userdata = typeMalloc(char, 6);
+ 
+-    if ((win = newwin(rows, cols, tly, tlx)) != 0) {
++    if ((win = newwin(rows, cols, tly, tlx)) != NULL) {
+ 	keypad(win, TRUE);
+-	if ((pan = new_panel(win)) == 0) {
++	if ((pan = new_panel(win)) == NULL) {
+ 	    delwin(win);
+ 	} else if (use_colors) {
+ 	    short fg = (short) ((color == COLOR_BLUE)
+@@ -231,7 +231,7 @@
+ static void
+ my_remove_panel(PANEL **pans, int which)
+ {
+-    if (pans[which] != 0) {
++    if (pans[which] != NULL) {
+ 	PANEL *pan = pans[which];
+ 	WINDOW *win = panel_window(pan);
+ 	char *user = (char *) panel_userptr(pan);
+@@ -240,7 +240,7 @@
+ 	del_panel(pan);
+ 	delwin(win);
+ 
+-	pans[which] = 0;
++	pans[which] = NULL;
+     }
+ }
+ 
+@@ -297,7 +297,7 @@
+ static void
+ my_move_panel(PANEL **pans, int which, bool continuous)
+ {
+-    if (pans[which] != 0) {
++    if (pans[which] != NULL) {
+ 	int code;
+ 	int y0, x0;
+ 	int y1, x1;
+@@ -322,7 +322,7 @@
+ static void
+ my_resize_panel(PANEL **pans, int which, FillPanel myFill)
+ {
+-    if (pans[which] != 0) {
++    if (pans[which] != NULL) {
+ 	int code;
+ 	int y0, x0;
+ 	int y1, x1;
+@@ -341,7 +341,7 @@
+ 				  ABS(x1 - x0) + 1,
+ 				  MIN(y0, y1),
+ 				  MIN(x0, x1));
+-	    if (next != 0) {
++	    if (next != NULL) {
+ 		keypad(next, TRUE);
+ 		if (use_colors) {
+ 		    wbkgdset(next, (chtype) (COLOR_PAIR(which) | ' '));
+@@ -411,7 +411,7 @@
+ 
+     source[0] = (wchar_t) (digit + 0xff10);
+     source[1] = 0;
+-    setcchar(target, source, A_NORMAL, 0, 0);
++    setcchar(target, source, A_NORMAL, 0, NULL);
+ }
+ 
+ static void
+@@ -507,7 +507,7 @@
+ 
+     memset(table, 0, sizeof(table));
+     for (j = 1; j <= MAX_PANELS; ++j) {
+-	table[j].valid = (px[j] != 0);
++	table[j].valid = (px[j] != NULL);
+ 	if (table[j].valid) {
+ 	    table[j].hidden = panel_hidden(px[j]) ? TRUE : FALSE;
+ 	    table[j].above = panel_above(px[j]);
+@@ -515,11 +515,11 @@
+ 	}
+     }
+ 
+-    if ((win = newwin(LINES - 1, COLS, 0, 0)) != 0) {
++    if ((win = newwin(LINES - 1, COLS, 0, 0)) != NULL) {
+ 	PANEL *pan;
+ 
+ 	keypad(win, TRUE);
+-	if ((pan = new_panel(win)) != 0) {
++	if ((pan = new_panel(win)) != NULL) {
+ 	    werase(win);
+ 	    MvWPrintw(win, 0, 0, "Panels:\n");
+ 	    for (j = 1; j <= MAX_PANELS; ++j) {
+@@ -554,7 +554,7 @@
+ static int my_##func(PANEL *pan) \
+ { \
+     int code = ERR; \
+-    if (pan != 0) { \
++    if (pan != NULL) { \
+ 	code = func(pan); \
+     } \
+     return code; \
+@@ -578,7 +578,7 @@
+ 	return;
+     }
+ 
+-    if (log_in != 0) {
++    if (log_in != NULL) {
+ 	pflush();
+     }
+ 
+@@ -617,7 +617,7 @@
+ static bool
+ ok_letter(int ch)
+ {
+-    return isalpha(UChar(ch)) && strchr("bcdhmMrst", ch) != 0;
++    return isalpha(UChar(ch)) && strchr("bcdhmMrst", ch) != NULL;
+ }
+ 
+ static bool
+@@ -644,8 +644,8 @@
+     waddstr(win, "Command:");
+     buffer[length = 0] = '\0';
+ 
+-    if (log_in != 0) {
+-	if (fgets(buffer, limit - 3, log_in) != 0) {
++    if (log_in != NULL) {
++	if (fgets(buffer, limit - 3, log_in) != NULL) {
+ 	    length = (int) strlen(buffer);
+ 	    while (length > 0 && isspace(UChar(buffer[length - 1])))
+ 		buffer[--length] = '\0';
+Index: test/demo_termcap.c
+Prereq:  1.72 
+--- ncurses-6.5-20241130+/test/demo_termcap.c	2024-11-30 18:31:01.000000000 +0000
++++ ncurses-6.5-20241207/test/demo_termcap.c	2024-12-07 22:27:13.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: demo_termcap.c,v 1.72 2024/11/30 18:31:01 tom Exp $
++ * $Id: demo_termcap.c,v 1.73 2024/12/07 22:27:13 tom Exp $
+  *
+  * A simple demo of the termcap interface.
+  */
+@@ -101,7 +101,7 @@
+ static long total_n_values;
+ static long total_s_values;
+ 
+-#define isCapName(c) (isgraph(c) && strchr("^=:\\", c) == 0)
++#define isCapName(c) (isgraph(c) && strchr("^=:\\", c) == NULL)
+ #define EachCapName(n) n = 33; n < 127; ++n
+ 
+ static char *
+@@ -150,17 +150,17 @@
+ static char *
+ next_dbitem(void)
+ {
+-    char *result = 0;
++    char *result = NULL;
+ 
+     if (db_list) {
+-	if ((result = db_list[db_item]) == 0) {
++	if ((result = db_list[db_item]) == NULL) {
+ 	    db_item = 0;
+ 	    result = db_list[0];
+ 	} else {
+ 	    db_item++;
+ 	}
+     }
+-    if (result != 0)
++    if (result != NULL)
+ 	printf("** %s\n", result);
+     return result;
+ }
+@@ -174,7 +174,7 @@
+ 	for (n = 0; db_list[n]; ++n)
+ 	    free(db_list[n]);
+ 	free(db_list);
+-	db_list = 0;
++	db_list = NULL;
+     }
+ }
+ #endif /* NO_LEAKS */
+@@ -259,7 +259,7 @@
+     NCURSES_CONST char *str;
+     int num;
+ 
+-    if ((str = tgetstr(cap, &ap)) != 0) {
++    if ((str = tgetstr(cap, &ap)) != NULL) {
+ 	total_values++;
+ 	total_s_values++;
+ 	if (!q_opt) {
+@@ -343,7 +343,7 @@
+ 	if (b_opt) {
+ 	    for (n = 0;; ++n) {
+ 		cap = my_boolcodes[n];
+-		if (cap == 0)
++		if (cap == NULL)
+ 		    break;
+ 		dumpit(cap);
+ 	    }
+@@ -352,7 +352,7 @@
+ 	if (n_opt) {
+ 	    for (n = 0;; ++n) {
+ 		cap = my_numcodes[n];
+-		if (cap == 0)
++		if (cap == NULL)
+ 		    break;
+ 		dumpit(cap);
+ 	    }
+@@ -361,16 +361,16 @@
+ 	if (s_opt) {
+ 	    for (n = 0;; ++n) {
+ 		cap = my_strcodes[n];
+-		if (cap == 0)
++		if (cap == NULL)
+ 		    break;
+ 		dumpit(cap);
+ 	    }
+ 	}
+ #ifdef NCURSES_VERSION
+-	if (x_opt && (my_blob == 0) && y_opt) {
++	if (x_opt && (my_blob == NULL) && y_opt) {
+ #if NCURSES_XNAMES
+ 	    NCURSES_CONST TERMTYPE *term = (TERMTYPE *) cur_term;
+-	    if (term != 0
++	    if (term != NULL
+ 		&& ((NUM_BOOLEANS(term) != BOOLCOUNT)
+ 		    || (NUM_NUMBERS(term) != NUMCOUNT)
+ 		    || (NUM_STRINGS(term) != STRCOUNT))) {
+@@ -429,16 +429,16 @@
+      * None of the arrays could be larger than the input-file, and since it
+      * is small, just allocate the maximum for simplicity.
+      */
+-    if ((my_blob = malloc((size_t) sb.st_size + 1)) == 0 ||
+-	(my_boolcodes = typeCalloc(char *, sb.st_size)) == 0 ||
+-	  (my_numcodes = typeCalloc(char *, sb.st_size)) == 0 ||
+-	  (my_numvalues = typeCalloc(char *, sb.st_size)) == 0 ||
+-	  (my_strcodes = typeCalloc(char *, sb.st_size)) == 0 ||
+-	  (my_strvalues = typeCalloc(char *, sb.st_size)) == 0) {
++    if ((my_blob = malloc((size_t) sb.st_size + 1)) == NULL ||
++	(my_boolcodes = typeCalloc(char *, sb.st_size)) == NULL ||
++	  (my_numcodes = typeCalloc(char *, sb.st_size)) == NULL ||
++	  (my_numvalues = typeCalloc(char *, sb.st_size)) == NULL ||
++	  (my_strcodes = typeCalloc(char *, sb.st_size)) == NULL ||
++	  (my_strvalues = typeCalloc(char *, sb.st_size)) == NULL) {
+ 	failed("cannot allocate memory for input-file");
+     }
+ 
+-    if ((fp = fopen(input_name, "r")) == 0) {
++    if ((fp = fopen(input_name, "r")) == NULL) {
+ 	failed("cannot open input-file");
+     } else {
+ 	len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp);
+@@ -674,11 +674,11 @@
+ 	    break;
+ 	}
+     }
+-    my_boolcodes[count_bools] = 0;
+-    my_numcodes[count_nums] = 0;
+-    my_numvalues[count_nums] = 0;
+-    my_strcodes[count_strs] = 0;
+-    my_strvalues[count_strs] = 0;
++    my_boolcodes[count_bools] = NULL;
++    my_numcodes[count_nums] = NULL;
++    my_numvalues[count_nums] = NULL;
++    my_strcodes[count_strs] = NULL;
++    my_strvalues[count_strs] = NULL;
+ 
+ #if 0
+     printf("bools:%d\n", (int) count_bools);
+@@ -702,11 +702,11 @@
+     int pass;
+     size_t count;
+     size_t length = 1;
+-    char **result = 0;
+-    char *unused = 0;
++    char **result = NULL;
++    char *unused = NULL;
+ 
+     for (pass = 0; pass < 2; ++pass) {
+-	for (count = 0; list[count] != 0; ++count) {
++	for (count = 0; list[count] != NULL; ++count) {
+ 	    size_t chunk = strlen(list[count]) + 1;
+ 	    if (pass == 0) {
+ 		length += chunk;
+@@ -720,7 +720,7 @@
+ 	    char *blob = malloc(length);
+ 	    result = typeCalloc(char *, count + 1);
+ 	    unused = blob;
+-	    if (blob == 0 || result == 0)
++	    if (blob == NULL || result == NULL)
+ 		failed("copy_code_list failed");
+ 	}
+     }
+@@ -786,7 +786,7 @@
+ #if defined(NCURSES_VERSION) || defined(HAVE_CURSES_DATA_OSPEED)
+     bool v_opt = FALSE;
+ #endif
+-    NCURSES_CONST char *input_name = 0;
++    NCURSES_CONST char *input_name = NULL;
+ 
+     int repeat;
+     int r_opt = 1;
+@@ -864,7 +864,7 @@
+ 		for (n = optind; n < argc; ++n) {
+ 		    brute_force(argv[n]);
+ 		}
+-	    } else if ((name = getenv("TERM")) != 0) {
++	    } else if ((name = getenv("TERM")) != NULL) {
+ 		brute_force(name);
+ 	    } else {
+ 		static NCURSES_CONST char dumb[] = "dumb";
+@@ -872,7 +872,7 @@
+ 	    }
+ 	}
+     } else {
+-	if (input_name != 0) {
++	if (input_name != NULL) {
+ 	    parse_description(input_name);
+ 	}
+ #if USE_CODE_LISTS
+@@ -891,7 +891,7 @@
+ 		for (n = optind; n < argc; ++n) {
+ 		    demo_termcap(argv[n]);
+ 		}
+-	    } else if ((name = getenv("TERM")) != 0) {
++	    } else if ((name = getenv("TERM")) != NULL) {
+ 		demo_termcap(name);
+ 	    } else {
+ 		static NCURSES_CONST char dumb[] = "dumb";
+Index: test/demo_terminfo.c
+Prereq:  1.61 
+--- ncurses-6.5-20241130+/test/demo_terminfo.c	2024-11-30 18:31:01.000000000 +0000
++++ ncurses-6.5-20241207/test/demo_terminfo.c	2024-12-07 22:27:13.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: demo_terminfo.c,v 1.61 2024/11/30 18:31:01 tom Exp $
++ * $Id: demo_terminfo.c,v 1.62 2024/12/07 22:27:13 tom Exp $
+  *
+  * A simple demo of the terminfo interface.
+  */
+@@ -141,17 +141,17 @@
+ static char *
+ next_dbitem(void)
+ {
+-    char *result = 0;
++    char *result = NULL;
+ 
+     if (db_list) {
+-	if ((result = db_list[db_item]) == 0) {
++	if ((result = db_list[db_item]) == NULL) {
+ 	    db_item = 0;
+ 	    result = db_list[0];
+ 	} else {
+ 	    db_item++;
+ 	}
+     }
+-    if (result != 0)
++    if (result != NULL)
+ 	printf("** %s\n", result);
+     return result;
+ }
+@@ -165,7 +165,7 @@
+ 	for (n = 0; db_list[n]; ++n)
+ 	    free(db_list[n]);
+ 	free(db_list);
+-	db_list = 0;
++	db_list = NULL;
+     }
+ }
+ #endif
+@@ -176,7 +176,7 @@
+     const char *str;
+     int num;
+ 
+-    if ((str = tigetstr(cap)) != 0 && (str != (char *) -1)) {
++    if ((str = tigetstr(cap)) != NULL && (str != (char *) -1)) {
+ 	total_values++;
+ 	total_s_values++;
+ 	if (!q_opt) {
+@@ -339,7 +339,7 @@
+     if (b_opt) {
+ 	for (n = 0;; ++n) {
+ 	    cap = my_boolcodes[n];
+-	    if (cap == 0)
++	    if (cap == NULL)
+ 		break;
+ 	    dumpit(cap, fullname(bool, n));
+ 	}
+@@ -348,7 +348,7 @@
+     if (n_opt) {
+ 	for (n = 0;; ++n) {
+ 	    cap = my_numcodes[n];
+-	    if (cap == 0)
++	    if (cap == NULL)
+ 		break;
+ 	    dumpit(cap, fullname(num, n));
+ 	}
+@@ -357,17 +357,17 @@
+     if (s_opt) {
+ 	for (n = 0;; ++n) {
+ 	    cap = my_strcodes[n];
+-	    if (cap == 0)
++	    if (cap == NULL)
+ 		break;
+ 	    dumpit(cap, fullname(str, n));
+ 	}
+     }
+ #ifdef NCURSES_VERSION
+-    if (x_opt && (my_blob == 0)) {
++    if (x_opt && (my_blob == NULL)) {
+ 	if (y_opt) {
+ #if NCURSES_XNAMES
+ 	    const TERMTYPE *term = (TERMTYPE *) cur_term;
+-	    if (term != 0
++	    if (term != NULL
+ 		&& ((NUM_BOOLEANS(term) != BOOLCOUNT)
+ 		    || (NUM_NUMBERS(term) != NUMCOUNT)
+ 		    || (NUM_STRINGS(term) != STRCOUNT))) {
+@@ -455,16 +455,16 @@
+      * None of the arrays could be larger than the input-file, and since it
+      * is small, just allocate the maximum for simplicity.
+      */
+-    if ((my_blob = malloc((size_t) sb.st_size + 1)) == 0 ||
+-	(my_boolcodes = typeCalloc(char *, sb.st_size)) == 0 ||
+-	  (my_numcodes = typeCalloc(char *, sb.st_size)) == 0 ||
+-	  (my_numvalues = typeCalloc(char *, sb.st_size)) == 0 ||
+-	  (my_strcodes = typeCalloc(char *, sb.st_size)) == 0 ||
+-	  (my_strvalues = typeCalloc(char *, sb.st_size)) == 0) {
++    if ((my_blob = malloc((size_t) sb.st_size + 1)) == NULL ||
++	(my_boolcodes = typeCalloc(char *, sb.st_size)) == NULL ||
++	  (my_numcodes = typeCalloc(char *, sb.st_size)) == NULL ||
++	  (my_numvalues = typeCalloc(char *, sb.st_size)) == NULL ||
++	  (my_strcodes = typeCalloc(char *, sb.st_size)) == NULL ||
++	  (my_strvalues = typeCalloc(char *, sb.st_size)) == NULL) {
+ 	failed("cannot allocate memory for input-file");
+     }
+ 
+-    if ((fp = fopen(input_name, "r")) == 0) {
++    if ((fp = fopen(input_name, "r")) == NULL) {
+ 	failed("cannot open input-file");
+     } else {
+ 	len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp);
+@@ -704,11 +704,11 @@
+ 	    break;
+ 	}
+     }
+-    my_boolcodes[count_bools] = 0;
+-    my_numcodes[count_nums] = 0;
+-    my_numvalues[count_nums] = 0;
+-    my_strcodes[count_strs] = 0;
+-    my_strvalues[count_strs] = 0;
++    my_boolcodes[count_bools] = NULL;
++    my_numcodes[count_nums] = NULL;
++    my_numvalues[count_nums] = NULL;
++    my_strcodes[count_strs] = NULL;
++    my_strvalues[count_strs] = NULL;
+ 
+ #if 0
+     printf("# bools:%d\n", (int) count_bools);
+@@ -732,11 +732,11 @@
+     int pass;
+     size_t count;
+     size_t length = 1;
+-    char **result = 0;
+-    char *unused = 0;
++    char **result = NULL;
++    char *unused = NULL;
+ 
+     for (pass = 0; pass < 2; ++pass) {
+-	for (count = 0; list[count] != 0; ++count) {
++	for (count = 0; list[count] != NULL; ++count) {
+ 	    size_t chunk = strlen(list[count]) + 1;
+ 	    if (pass == 0) {
+ 		length += chunk;
+@@ -750,7 +750,7 @@
+ 	    char *blob = malloc(length);
+ 	    result = typeCalloc(char *, count + 1);
+ 	    unused = blob;
+-	    if (blob == 0 || result == 0)
++	    if (blob == NULL || result == NULL)
+ 		failed("copy_code_list failed");
+ 	}
+     }
+@@ -815,7 +815,7 @@
+     int repeat;
+     NCURSES_CONST char *name;
+     int r_opt = 1;
+-    const char *input_name = 0;
++    const char *input_name = NULL;
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON "abd:e:fi:nqr:sxy")) != -1) {
+ 	switch (ch) {
+@@ -888,7 +888,7 @@
+ 		for (n = optind; n < argc; ++n) {
+ 		    brute_force(argv[n]);
+ 		}
+-	    } else if ((name = getenv("TERM")) != 0) {
++	    } else if ((name = getenv("TERM")) != NULL) {
+ 		brute_force(name);
+ 	    } else {
+ 		static NCURSES_CONST char dumb[] = "dumb";
+@@ -896,7 +896,7 @@
+ 	    }
+ 	}
+     } else {
+-	if (input_name != 0) {
++	if (input_name != NULL) {
+ 	    parse_description(input_name);
+ 	}
+ #if USE_CODE_LISTS
+@@ -915,7 +915,7 @@
+ 		for (n = optind; n < argc; ++n) {
+ 		    demo_terminfo(argv[n]);
+ 		}
+-	    } else if ((name = getenv("TERM")) != 0) {
++	    } else if ((name = getenv("TERM")) != NULL) {
+ 		demo_terminfo(name);
+ 	    } else {
+ 		static NCURSES_CONST char dumb[] = "dumb";
+@@ -933,8 +933,8 @@
+ 
+ #if NO_LEAKS
+     free_dblist();
+-    if (input_name != 0) {
+-	if (my_blob != 0) {
++    if (input_name != NULL) {
++	if (my_blob != NULL) {
+ 	    free(my_blob);
+ 	    free(my_boolcodes);
+ 	    free(my_numcodes);
+Index: test/ditto.c
+Prereq:  1.59 
+--- ncurses-6.5-20241130+/test/ditto.c	2023-09-23 17:08:43.000000000 +0000
++++ ncurses-6.5-20241207/test/ditto.c	2024-12-07 23:02:27.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey (1998-on)
+  *
+- * $Id: ditto.c,v 1.59 2023/09/23 17:08:43 tom Exp $
++ * $Id: ditto.c,v 1.60 2024/12/07 23:02:27 tom Exp $
+  *
+  * The program illustrates how to set up multiple screens from a single
+  * program.
+@@ -157,15 +157,15 @@
+     int aslave;
+     char slave_name[1024];
+     char s_option[sizeof(slave_name) + 80];
+-    const char *xterm_prog = 0;
++    const char *xterm_prog = NULL;
+ 
+-    if ((xterm_prog = getenv("XTERM_PROG")) == 0)
++    if ((xterm_prog = getenv("XTERM_PROG")) == NULL)
+ 	xterm_prog = "xterm";
+ 
+-    if (openpty(&amaster, &aslave, slave_name, 0, 0) != 0
++    if (openpty(&amaster, &aslave, slave_name, NULL, NULL) != 0
+ 	|| strlen(slave_name) > sizeof(slave_name) - 1)
+ 	failed("openpty");
+-    if (strrchr(slave_name, '/') == 0) {
++    if (strrchr(slave_name, '/') == NULL) {
+ 	errno = EISDIR;
+ 	failed(slave_name);
+     }
+@@ -176,7 +176,7 @@
+ 	_exit(0);
+     }
+     fp = fdopen(amaster, "r+");
+-    if (fp == 0)
++    if (fp == NULL)
+ 	failed(path);
+ #else
+     struct stat sb;
+@@ -266,7 +266,7 @@
+ 			     target->output,
+ 			     target->input);
+ 
+-    if (target->screen == 0)
++    if (target->screen == NULL)
+ 	failed("newterm");
+ 
+     (void) USING_SCREEN(target->screen, init_screen, target);
+@@ -429,7 +429,7 @@
+ 	}
+     }
+ 
+-    if ((data = typeCalloc(DITTO, (size_t) argc)) == 0)
++    if ((data = typeCalloc(DITTO, (size_t) argc)) == NULL)
+ 	failed("calloc data");
+ 
+     assert(data != 0);
+@@ -478,7 +478,7 @@
+      */
+     for (j = argc - 1; j >= 0; j--) {
+ 	LockIt();
+-	USING_SCREEN(data[j].screen, close_screen, 0);
++	USING_SCREEN(data[j].screen, close_screen, NULL);
+ 	fprintf(data[j].output, "**Closed\r\n");
+ 
+ 	/*
+Index: test/dots.c
+Prereq:  1.46 
+--- ncurses-6.5-20241130+/test/dots.c	2024-10-06 21:17:54.000000000 +0000
++++ ncurses-6.5-20241207/test/dots.c	2024-12-07 22:27:13.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey  1999
+  *
+- * $Id: dots.c,v 1.46 2024/10/06 21:17:54 tom Exp $
++ * $Id: dots.c,v 1.47 2024/12/07 22:27:13 tom Exp $
+  *
+  * A simple demo of the terminfo interface.
+  */
+@@ -102,7 +102,7 @@
+ get_number(NCURSES_CONST char *cap, int map)
+ {
+     int result = map;
+-    if (cap != 0) {
++    if (cap != NULL) {
+ 	int check = tigetnum(cap);
+ 	if (check > 0)
+ 	    result = check;
+@@ -191,12 +191,12 @@
+     SetupAlarm(r_option);
+     InitAndCatch(setupterm((char *) 0, 1, (int *) 0), onsig);
+ 
+-    srand((unsigned) time(0));
++    srand((unsigned) time(NULL));
+ 
+     outs(clear_screen);
+     outs(cursor_invisible);
+ 
+-#define GetNumber(ln,sn) get_number(f_option ? #sn : 0, ln)
++#define GetNumber(ln,sn) get_number(f_option ? #sn : NULL, ln)
+     my_colors = GetNumber(max_colors, colors);
+     if (my_colors > 1) {
+ 	if (!VALID_STRING(set_a_foreground)
+Index: test/dots_curses.c
+Prereq:  1.26 
+--- ncurses-6.5-20241130+/test/dots_curses.c	2024-11-30 17:48:07.000000000 +0000
++++ ncurses-6.5-20241207/test/dots_curses.c	2024-12-07 22:32:11.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: dots_curses.c,v 1.26 2024/11/30 17:48:07 tom Exp $
++ * $Id: dots_curses.c,v 1.27 2024/12/07 22:32:11 tom Exp $
+  *
+  * A simple demo of the curses interface used for comparison with termcap.
+  */
+@@ -170,7 +170,7 @@
+ 	}
+     }
+ 
+-    srand((unsigned) time(0));
++    srand((unsigned) time(NULL));
+ 
+     SetupAlarm(r_option);
+     InitAndCatch(initscr(), onsig);
+Index: test/dots_mvcur.c
+Prereq:  1.32 
+--- ncurses-6.5-20241130+/test/dots_mvcur.c	2024-10-06 21:17:54.000000000 +0000
++++ ncurses-6.5-20241207/test/dots_mvcur.c	2024-12-07 22:32:11.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey - 2007
+  *
+- * $Id: dots_mvcur.c,v 1.32 2024/10/06 21:17:54 tom Exp $
++ * $Id: dots_mvcur.c,v 1.33 2024/12/07 22:32:11 tom Exp $
+  *
+  * A simple demo of the terminfo interface, and mvcur.
+  */
+@@ -103,7 +103,7 @@
+ get_number(NCURSES_CONST char *cap, int map)
+ {
+     int result = map;
+-    if (cap != 0) {
++    if (cap != NULL) {
+ 	int check = tigetnum(cap);
+ 	if (check > 0)
+ 	    result = check;
+@@ -195,18 +195,18 @@
+     InitAndCatch((sp = newterm((char *) 0, stdout, stdin)), onsig);
+     refresh();			/* needed with Solaris curses to cancel endwin */
+ 
+-    if (sp == 0) {
++    if (sp == NULL) {
+ 	fprintf(stderr, "Cannot initialize terminal\n");
+ 	ExitProgram(EXIT_FAILURE);
+     }
+ 
+-    srand((unsigned) time(0));
++    srand((unsigned) time(NULL));
+ 
+     outs(clear_screen);
+     outs(cursor_home);
+     outs(cursor_invisible);
+ 
+-#define GetNumber(ln,sn) get_number(f_option ? #sn : 0, ln)
++#define GetNumber(ln,sn) get_number(f_option ? #sn : NULL, ln)
+     my_colors = GetNumber(max_colors, colors);
+     if (my_colors > 1) {
+ 	if (!VALID_STRING(set_a_foreground)
+Index: test/dots_termcap.c
+Prereq:  1.35 
+--- ncurses-6.5-20241130+/test/dots_termcap.c	2024-10-06 21:18:35.000000000 +0000
++++ ncurses-6.5-20241207/test/dots_termcap.c	2024-12-07 22:32:11.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: dots_termcap.c,v 1.35 2024/10/06 21:18:35 tom Exp $
++ * $Id: dots_termcap.c,v 1.37 2024/12/07 22:32:11 tom Exp $
+  *
+  * A simple demo of the termcap interface.
+  */
+@@ -153,7 +153,7 @@
+ /*
+  * napms is a curses function which happens to be usable without initializing
+  * the screen, but if this program happened to be build with a "real" termcap
+- * library, there is nothing like napms. 
++ * library, there is nothing like napms.
+  */
+ #if HAVE_NAPMS
+ #define my_napms(ms) napms(ms)
+@@ -178,9 +178,9 @@
+ get_number(NCURSES_CONST char *cap, const char *env)
+ {
+     int result = tgetnum(cap);
+-    const char *value = env ? getenv(env) : 0;
+-    if (value != 0 && *value != 0) {
+-	char *next = 0;
++    const char *value = env ? getenv(env) : NULL;
++    if (value != NULL && *value != 0) {
++	char *next = NULL;
+ 	long check = strtol(value, &next, 10);
+ 	if (check > 0 && *next == '\0')
+ 	    result = (int) check;
+@@ -263,12 +263,12 @@
+ 	}
+     }
+ 
+-    if ((name = getenv("TERM")) == 0) {
++    if ((name = getenv("TERM")) == NULL) {
+ 	fprintf(stderr, "TERM is not set\n");
+ 	ExitProgram(EXIT_FAILURE);
+     }
+ 
+-    srand((unsigned) time(0));
++    srand((unsigned) time(NULL));
+ 
+     SetupAlarm((unsigned) r_option);
+     InitAndCatch(ch = tgetent(buffer, name), onsig);
+@@ -285,7 +285,7 @@
+     }
+ 
+     num_colors = tgetnum("Co");
+-#define GetNumber(cap,env) get_number(cap, e_option ? env : 0)
++#define GetNumber(cap,env) get_number(cap, e_option ? env : NULL)
+     num_lines = GetNumber("li", "LINES");
+     num_columns = GetNumber("co", "COLUMNS");
+ 
+Index: test/dots_xcurses.c
+Prereq:  1.31 
+--- ncurses-6.5-20241130+/test/dots_xcurses.c	2024-11-30 17:41:18.000000000 +0000
++++ ncurses-6.5-20241207/test/dots_xcurses.c	2024-12-07 22:32:11.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: dots_xcurses.c,v 1.31 2024/11/30 17:41:18 tom Exp $
++ * $Id: dots_xcurses.c,v 1.32 2024/12/07 22:32:11 tom Exp $
+  *
+  * A simple demo of the wide-curses interface used for comparison with termcap.
+  */
+@@ -202,7 +202,7 @@
+     }
+ 
+     setlocale(LC_ALL, "");
+-    srand((unsigned) time(0));
++    srand((unsigned) time(NULL));
+ 
+     SetupAlarm(r_option);
+     InitAndCatch(initscr(), onsig);
+Index: test/dump_window.c
+Prereq:  1.5 
+--- ncurses-6.5-20241130+/test/dump_window.c	2023-11-11 00:30:50.000000000 +0000
++++ ncurses-6.5-20241207/test/dump_window.c	2024-12-07 23:03:07.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: dump_window.c,v 1.5 2023/11/11 00:30:50 tom Exp $
++ * $Id: dump_window.c,v 1.6 2024/12/07 23:03:07 tom Exp $
+  */
+ #include 
+ 
+@@ -37,7 +37,7 @@
+ {
+     int result = 0;
+     close_dump();
+-    if ((dumpfp = fopen(fn, "a")) != 0)
++    if ((dumpfp = fopen(fn, "a")) != NULL)
+ 	result = 1;
+     return result;
+ }
+@@ -45,9 +45,9 @@
+ void
+ close_dump(void)
+ {
+-    if (dumpfp != 0) {
++    if (dumpfp != NULL) {
+ 	fclose(dumpfp);
+-	dumpfp = 0;
++	dumpfp = NULL;
+     }
+ }
+ 
+@@ -55,14 +55,14 @@
+ dump_window(WINDOW *w)
+ {
+     wgetch(w);
+-    if (dumpfp != 0) {
++    if (dumpfp != NULL) {
+ 	int y, x;
+ 	int oldy, oldx;
+ 	int maxy, maxx;
+ 	int pass;
+-	char *cvec = 0;
+-	char *avec = 0;
+-	char *pvec = 0;
++	char *cvec = NULL;
++	char *avec = NULL;
++	char *pvec = NULL;
+ 	int ccnt = 0;
+ 	int acnt = 0;
+ 	int pcnt = 0;
+Index: test/dup_field.c
+Prereq:  1.11 
+--- ncurses-6.5-20241130+/test/dup_field.c	2024-10-06 20:07:19.000000000 +0000
++++ ncurses-6.5-20241207/test/dup_field.c	2024-12-07 22:32:11.000000000 +0000
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: dup_field.c,v 1.11 2024/10/06 20:07:19 tom Exp $
++ * $Id: dup_field.c,v 1.12 2024/12/07 22:32:11 tom Exp $
+  *
+  * Demonstrate dup_field().
+  */
+@@ -91,7 +91,7 @@
+ 	const char *code = keyname(commands[n].code);
+ 	size_t need = 5;
+ #ifdef NCURSES_VERSION
+-	if ((name = form_request_name(commands[n].result)) == 0)
++	if ((name = form_request_name(commands[n].result)) == NULL)
+ #endif
+ 	    name = commands[n].help;
+ 	need = 5 + strlen(code) + strlen(name);
+@@ -101,9 +101,9 @@
+     }
+     msgs[used++] =
+ 	strdup("Arrow keys move within a field as you would expect.");
+-    msgs[used] = 0;
++    msgs[used] = NULL;
+     popup_msg2(stdscr, msgs);
+-    for (n = 0; msgs[n] != 0; ++n) {
++    for (n = 0; msgs[n] != NULL; ++n) {
+ 	free(msgs[n]);
+     }
+     free(msgs);
+@@ -347,7 +347,7 @@
+ 
+     all_fields[n] = (FIELD *) 0;
+ 
+-    if ((form = new_form(all_fields)) != 0) {
++    if ((form = new_form(all_fields)) != NULL) {
+ 	int finished = 0;
+ 
+ 	post_form(form);
+@@ -369,7 +369,7 @@
+ 
+ 	free_form(form);
+     }
+-    for (c = 0; all_fields[c] != 0; c++) {
++    for (c = 0; all_fields[c] != NULL; c++) {
+ 	free_edit_field(all_fields[c]);
+ 	free_field(all_fields[c]);
+     }
+Index: test/echochar.c
+Prereq:  1.26 
+--- ncurses-6.5-20241130+/test/echochar.c	2023-05-27 20:13:10.000000000 +0000
++++ ncurses-6.5-20241207/test/echochar.c	2024-12-07 23:03:07.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2006-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: echochar.c,v 1.26 2023/05/27 20:13:10 tom Exp $
++ * $Id: echochar.c,v 1.27 2024/12/07 23:03:07 tom Exp $
+  *
+  * Demonstrate the echochar function (compare to dots.c).
+  * Thomas Dickey - 2006/11/4
+@@ -108,7 +108,7 @@
+     double c;
+     bool use_colors;
+     bool opt_r = FALSE;
+-    char *my_pairs = 0;
++    char *my_pairs = NULL;
+     int last_fg = 0;
+     int last_bg = 0;
+ 
+@@ -134,10 +134,10 @@
+ 	if (COLOR_PAIRS > 0) {
+ 	    my_pairs = typeCalloc(char, (size_t) COLOR_PAIRS);
+ 	}
+-	use_colors = (my_pairs != 0);
++	use_colors = (my_pairs != NULL);
+     }
+ 
+-    srand((unsigned) time(0));
++    srand((unsigned) time(NULL));
+ 
+     curs_set(0);
+ 
+Index: test/edit_field.c
+Prereq:  1.32 
+--- ncurses-6.5-20241130+/test/edit_field.c	2024-06-29 17:49:56.000000000 +0000
++++ ncurses-6.5-20241207/test/edit_field.c	2024-12-07 22:22:51.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: edit_field.c,v 1.32 2024/06/29 17:49:56 tom Exp $
++ * $Id: edit_field.c,v 1.33 2024/12/07 22:22:51 tom Exp $
+  *
+  * A wrapper for form_driver() which keeps track of the user's editing changes
+  * for each field, and makes the resulting length available as a
+@@ -188,7 +188,7 @@
+ 	const char *code = keyname(commands[n].code);
+ 	size_t need = 5;
+ #ifdef NCURSES_VERSION
+-	if ((name = form_request_name(commands[n].result)) == 0)
++	if ((name = form_request_name(commands[n].result)) == NULL)
+ #endif
+ 	    name = commands[n].help;
+ 	need = 5 + strlen(code) + strlen(name);
+@@ -198,9 +198,9 @@
+     }
+     msgs[used++] =
+ 	strdup("Arrow keys move within a field as you would expect.");
+-    msgs[used] = 0;
++    msgs[used] = NULL;
+     popup_msg2(stdscr, msgs);
+-    for (n = 0; msgs[n] != 0; ++n) {
++    for (n = 0; msgs[n] != NULL; ++n) {
+ 	free(msgs[n]);
+     }
+     free(msgs);
+@@ -249,7 +249,7 @@
+ {
+     char empty[1];
+     FieldAttrs *ptr = field_attrs(f);
+-    if (ptr == 0) {
++    if (ptr == NULL) {
+ 	int rows, cols, frow, fcol, nrow, nbuf;
+ 
+ 	ptr = typeCalloc(FieldAttrs, (size_t) 1);
+@@ -259,7 +259,7 @@
+ 	    ptr->row_lengths = typeCalloc(int, (size_t) nrow + 1);
+ 	}
+     }
+-    if (value == 0) {
++    if (value == NULL) {
+ 	value = empty;
+ 	*value = '\0';
+     }
+@@ -421,7 +421,7 @@
+ free_edit_field(FIELD *f)
+ {
+     FieldAttrs *ptr = field_attrs(f);
+-    if (ptr != 0) {
++    if (ptr != NULL) {
+ 	free(ptr->row_lengths);
+ 	free(ptr);
+     }
+Index: test/filter.c
+Prereq:  1.40 
+--- ncurses-6.5-20241130+/test/filter.c	2024-11-30 16:49:53.000000000 +0000
++++ ncurses-6.5-20241207/test/filter.c	2024-12-07 22:40:19.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+  * Author:  Thomas E. Dickey 1998
+  *
+- * $Id: filter.c,v 1.40 2024/11/30 16:49:53 tom Exp $
++ * $Id: filter.c,v 1.41 2024/12/07 22:40:19 tom Exp $
+  *
+  * An example of the 'filter()' function in ncurses, this program prompts
+  * for commands and executes them (like a command shell).  It illustrates
+@@ -264,12 +264,12 @@
+ /*
+  * Cancel xterm's alternate-screen mode (from dialog -TD)
+  */
+-#define isprivate(s) ((s) != 0 && strstr(s, "\033[?") != 0)
++#define isprivate(s) ((s) != NULL && strstr(s, "\033[?") != NULL)
+ static void
+ cancel_altscreen(void)
+ {
+     if (isatty(fileno(stdout))
+-	&& key_mouse != 0	/* xterm and kindred */
++	&& key_mouse != NULL	/* xterm and kindred */
+ 	&& isprivate(enter_ca_mode)
+ 	&& isprivate(exit_ca_mode)) {
+ 	/*
+@@ -292,8 +292,8 @@
+ 	 * implementation of alternate-screen in rxvt, etc., which clear more
+ 	 * of the display than they should.
+ 	 */
+-	enter_ca_mode = 0;
+-	exit_ca_mode = 0;
++	enter_ca_mode = NULL;
++	exit_ca_mode = NULL;
+     }
+ }
+ #endif
+@@ -380,7 +380,7 @@
+     if (i_option) {
+ 	initscr();
+     } else {
+-	if (newterm((char *) 0, stdout, stdin) == 0) {
++	if (newterm((char *) 0, stdout, stdin) == NULL) {
+ 	    fprintf(stderr, "cannot initialize terminal\n");
+ 	    ExitProgram(EXIT_FAILURE);
+ 	}
+Index: test/foldkeys.c
+Prereq:  1.12 
+--- ncurses-6.5-20241130+/test/foldkeys.c	2023-02-25 16:51:01.000000000 +0000
++++ ncurses-6.5-20241207/test/foldkeys.c	2024-12-07 23:03:07.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2006-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey, 2006
+  *
+- * $Id: foldkeys.c,v 1.12 2023/02/25 16:51:01 tom Exp $
++ * $Id: foldkeys.c,v 1.13 2024/12/07 23:03:07 tom Exp $
+  *
+  * Demonstrate a method for altering key definitions at runtime.
+  *
+@@ -55,7 +55,7 @@
+ {
+     FILE *fp;
+ 
+-    if ((fp = fopen(MY_LOGFILE, "a")) != 0) {
++    if ((fp = fopen(MY_LOGFILE, "a")) != NULL) {
+ 	char temp[256];
+ 	int y, x, n;
+ 	int need = sizeof(temp) - 1;
+@@ -112,7 +112,7 @@
+     for (code = 0; code < STRCOUNT; ++code) {
+ 	NCURSES_CONST char *name = strnames[code];
+ 	NCURSES_CONST char *value = tigetstr(name);
+-	if (value != 0 && value != (NCURSES_CONST char *) -1) {
++	if (value != NULL && value != (NCURSES_CONST char *) -1) {
+ 	    info[info_len].name = strnames[code];
+ 	    info[info_len].code = key_defined(value);
+ 	    info[info_len].value = value;
+@@ -129,7 +129,7 @@
+      */
+     for (code = KEY_MAX; code < MAX_KEYS; ++code) {
+ 	NCURSES_CONST char *name = keyname(code);
+-	if (name != 0) {
++	if (name != NULL) {
+ 	    info[info_len].name = name;
+ 	    info[info_len].code = code;
+ 	    info[info_len].value = tigetstr(name);
+@@ -156,7 +156,7 @@
+ 		      final) == 3
+ 	    && *final != ';'
+ 	    && (need = strlen(info[j].value)) != 0
+-	    && (value = strdup(info[j].value)) != 0) {
++	    && (value = strdup(info[j].value)) != NULL) {
+ 	    (void) need;	/* _nc_SLIMIT is normally nothing  */
+ 	    _nc_SPRINTF(value, _nc_SLIMIT(need) "\033[%d%c", first, *final);
+ 	    for (k = 0; k < info_len; ++k) {
+@@ -232,7 +232,7 @@
+     if (optind < argc)
+ 	usage(FALSE);
+ 
+-    if (newterm(0, stdout, stdin) == 0) {
++    if (newterm(NULL, stdout, stdin) == NULL) {
+ 	fprintf(stderr, "Cannot initialize terminal\n");
+ 	ExitProgram(EXIT_FAILURE);
+     }
+@@ -262,7 +262,7 @@
+ 	printw("Keycode %d, name %s%s\n",
+ 	       ch,
+ 	       escaped ? "ESC-" : "",
+-	       name != 0 ? name : "");
++	       name != NULL ? name : "");
+ 	log_last_line(stdscr);
+ 	clrtoeol();
+ 	if (ch == 'q')
+Index: test/form_driver_w.c
+Prereq:  1.18 
+--- ncurses-6.5-20241130+/test/form_driver_w.c	2024-10-06 23:13:40.000000000 +0000
++++ ncurses-6.5-20241207/test/form_driver_w.c	2024-12-07 22:32:11.000000000 +0000
+@@ -32,7 +32,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: form_driver_w.c,v 1.18 2024/10/06 23:13:40 tom Exp $
++ * $Id: form_driver_w.c,v 1.19 2024/12/07 22:32:11 tom Exp $
+  *
+  * Test form_driver_w (int, int, wchar_t), a wide char aware
+  * replacement of form_driver.
+@@ -74,7 +74,7 @@
+ 	"  ^D,^Q,ESC           - quit program",
+ 	"  ,        - move to next field",
+ 	"  ,      - move to previous field",
+-	0
++	NULL
+     };
+ 
+ #define NUM_FIELDS 3
+Index: test/gdc.c
+Prereq:  1.63 
+--- ncurses-6.5-20241130+/test/gdc.c	2024-11-30 18:56:02.000000000 +0000
++++ ncurses-6.5-20241207/test/gdc.c	2024-12-07 22:32:11.000000000 +0000
+@@ -34,7 +34,7 @@
+  * modified 10-18-89 for curses (jrl)
+  * 10-18-89 added signal handling
+  *
+- * $Id: gdc.c,v 1.63 2024/11/30 18:56:02 tom Exp $
++ * $Id: gdc.c,v 1.64 2024/12/07 22:32:11 tom Exp $
+  */
+ 
+ #include 
+@@ -294,8 +294,8 @@
+     InitAndCatch({
+ 	if (redirected) {
+ 	    NCURSES_CONST char *name = getenv("TERM");
+-	    if (name == 0
+-		|| newterm(name, ofp, ifp) == 0) {
++	    if (name == NULL
++		|| newterm(name, ofp, ifp) == NULL) {
+ 		fprintf(stderr, "cannot open terminal\n");
+ 		ExitProgram(EXIT_FAILURE);
+ 	    }
+Index: test/inch_wide.c
+Prereq:  1.14 
+--- ncurses-6.5-20241130+/test/inch_wide.c	2024-10-06 23:14:31.000000000 +0000
++++ ncurses-6.5-20241207/test/inch_wide.c	2024-12-07 22:32:11.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: inch_wide.c,v 1.14 2024/10/06 23:14:31 tom Exp $
++ * $Id: inch_wide.c,v 1.15 2024/12/07 22:32:11 tom Exp $
+  */
+ /*
+        int in_wch(cchar_t *wcval);
+@@ -70,11 +70,11 @@
+ 	" h,j,k,l (and arrow-keys) - move viewport",
+ 	" w                        - recur to new window",
+ 	"                            for next input file",
+-	0
++	NULL
+     };
+ 
+-    WINDOW *txtbox = 0;
+-    WINDOW *txtwin = 0;
++    WINDOW *txtbox = NULL;
++    WINDOW *txtwin = NULL;
+     FILE *fp;
+     int j;
+     int txt_x = 0, txt_y = 0;
+@@ -82,7 +82,7 @@
+     cchar_t ch;
+     cchar_t text[MAX_COLS];
+ 
+-    if (argv[level] == 0) {
++    if (argv[level] == NULL) {
+ 	beep();
+ 	return FALSE;
+     }
+@@ -110,7 +110,7 @@
+     txt_x = 0;
+     wmove(txtwin, txt_y, txt_x);
+ 
+-    if ((fp = fopen(argv[level], "r")) != 0) {
++    if ((fp = fopen(argv[level], "r")) != NULL) {
+ 	while ((j = fgetc(fp)) != EOF) {
+ 	    if (waddch(txtwin, UChar(j)) != OK) {
+ 		break;
+@@ -155,7 +155,7 @@
+ 	    break;
+ 	case 'w':
+ 	    test_inchs(level + 1, argv, chrwin, strwin);
+-	    if (txtbox != 0) {
++	    if (txtbox != NULL) {
+ 		touchwin(txtbox);
+ 		wnoutrefresh(txtbox);
+ 	    } else {
+Index: test/inchs.c
+Prereq:  1.20 
+--- ncurses-6.5-20241130+/test/inchs.c	2024-10-06 21:17:54.000000000 +0000
++++ ncurses-6.5-20241207/test/inchs.c	2024-12-07 22:32:11.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: inchs.c,v 1.20 2024/10/06 21:17:54 tom Exp $
++ * $Id: inchs.c,v 1.21 2024/12/07 22:32:11 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  */
+@@ -80,17 +80,17 @@
+ 	" h,j,k,l (and arrow-keys) - move viewport",
+ 	" w                        - recur to new window",
+ 	"                            for next input file",
+-	0
++	NULL
+     };
+-    WINDOW *txtbox = 0;
+-    WINDOW *txtwin = 0;
++    WINDOW *txtbox = NULL;
++    WINDOW *txtwin = NULL;
+     FILE *fp;
+     int ch, j;
+     int txt_x = 0, txt_y = 0;
+     int base_y;
+     chtype text[MAX_COLS];
+ 
+-    if (argv[level] == 0) {
++    if (argv[level] == NULL) {
+ 	beep();
+ 	return FALSE;
+     }
+@@ -109,7 +109,7 @@
+ 	txtwin = stdscr;
+ 	base_y = BASE_Y;
+     }
+-    if (txtwin == 0)
++    if (txtwin == NULL)
+ 	failed("cannot create txtwin");
+ 
+     keypad(txtwin, TRUE);	/* enable keyboard mapping */
+@@ -120,7 +120,7 @@
+     txt_x = 0;
+     wmove(txtwin, txt_y, txt_x);
+ 
+-    if ((fp = fopen(argv[level], "r")) != 0) {
++    if ((fp = fopen(argv[level], "r")) != NULL) {
+ 	while ((j = fgetc(fp)) != EOF) {
+ 	    if (waddch(txtwin, UChar(j)) != OK) {
+ 		break;
+@@ -165,7 +165,7 @@
+ 	    break;
+ 	case 'w':
+ 	    test_inchs(level + 1, argv, chrwin, strwin);
+-	    if (txtbox != 0) {
++	    if (txtbox != NULL) {
+ 		touchwin(txtbox);
+ 		wnoutrefresh(txtbox);
+ 	    } else {
+Index: test/ins_wide.c
+Prereq:  1.31 
+--- ncurses-6.5-20241130+/test/ins_wide.c	2024-10-05 19:26:24.000000000 +0000
++++ ncurses-6.5-20241207/test/ins_wide.c	2024-12-07 22:32:11.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: ins_wide.c,v 1.31 2024/10/05 19:26:24 tom Exp $
++ * $Id: ins_wide.c,v 1.32 2024/12/07 22:32:11 tom Exp $
+  *
+  * Demonstrate the wins_wstr() and wins_wch functions.
+  * Thomas Dickey - 2002/11/23
+@@ -225,9 +225,9 @@
+     int row2, col2;
+     int length;
+     wchar_t buffer[BUFSIZ];
+-    WINDOW *look = 0;
+-    WINDOW *work = 0;
+-    WINDOW *show = 0;
++    WINDOW *look = NULL;
++    WINDOW *work = NULL;
++    WINDOW *show = NULL;
+     int margin = (2 * MY_TABSIZE) - 1;
+     Options option = (Options) ((int) (m_opt ? oMove : oDefault)
+ 				| (int) ((w_opt || (level > 0))
+Index: test/insdelln.c
+Prereq:  1.17 
+--- ncurses-6.5-20241130+/test/insdelln.c	2024-10-06 21:08:52.000000000 +0000
++++ ncurses-6.5-20241207/test/insdelln.c	2024-12-07 22:32:11.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: insdelln.c,v 1.17 2024/10/06 21:08:52 tom Exp $
++ * $Id: insdelln.c,v 1.18 2024/12/07 22:32:11 tom Exp $
+  *
+  * test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln
+  */
+@@ -71,7 +71,7 @@
+     };
+     /* *INDENT-ON* */
+ 
+-    const char *result = 0;
++    const char *result = NULL;
+ 
+     if (has_colors()) {
+ 	static bool first = TRUE;
+@@ -107,7 +107,7 @@
+     };
+     /* *INDENT-ON* */
+ 
+-    const char *result = 0;
++    const char *result = NULL;
+ 
+     if (state < SIZEOF(table)) {
+ 	*attr = table[state].attr;
+@@ -144,9 +144,9 @@
+     getyx(win, y, x);
+     wmove(win, 0, 0);
+     wprintw(win, "Count %d", sp->count);
+-    if (sp->v_msg != 0)
++    if (sp->v_msg != NULL)
+ 	wprintw(win, " Video %s", sp->v_msg);
+-    if (sp->c_msg != 0)
++    if (sp->c_msg != NULL)
+ 	wprintw(win, " Color %s", sp->c_msg);
+     wclrtoeol(win);
+     wmove(win, y, x);
+@@ -165,10 +165,10 @@
+     WINDOW *win1 = newwin(sp->y_max - 2, sp->x_max - 2,
+ 			  sp->y_beg + 1, sp->x_beg + 1);
+ 
+-    if (win1 != 0 && sp->y_max > 4 && sp->x_max > 4) {
++    if (win1 != NULL && sp->y_max > 4 && sp->x_max > 4) {
+ 	WINDOW *win2 = derwin(win1, sp->y_max - 4, sp->x_max - 4, 1, 1);
+ 
+-	if (win2 != 0) {
++	if (win2 != NULL) {
+ 	    box(win1, 0, 0);
+ 	    wrefresh(win1);
+ 	    func(win2);
+@@ -222,7 +222,7 @@
+ 	,"q     quit"
+ 	,"=     resets count to zero."
+ 	,"?     shows this help-window"
+-	,0
++	,NULL
+     };
+ 
+     popup_msg(win, table);
+@@ -234,14 +234,14 @@
+     switch (sp->ch) {
+     case ' ':			/* next test-iteration */
+ 	if (has_colors()) {
+-	    if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == 0) {
++	    if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == NULL) {
+ 		sp->c_msg = color_params(sp->c = 0, &(sp->pair));
+-		if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
++		if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == NULL) {
+ 		    sp->v_msg = video_params(sp->v = 0, &(sp->attr));
+ 		}
+ 	    }
+ 	} else {
+-	    if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
++	    if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == NULL) {
+ 		sp->v_msg = video_params(sp->v = 0, &(sp->attr));
+ 	    }
+ 	}
+Index: test/inserts.c
+Prereq:  1.35 
+--- ncurses-6.5-20241130+/test/inserts.c	2024-10-05 19:26:24.000000000 +0000
++++ ncurses-6.5-20241207/test/inserts.c	2024-12-07 22:33:32.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: inserts.c,v 1.35 2024/10/05 19:26:24 tom Exp $
++ * $Id: inserts.c,v 1.36 2024/12/07 22:33:32 tom Exp $
+  *
+  * Demonstrate the winsstr() and winsch functions.
+  * Thomas Dickey - 2002/10/19
+@@ -147,9 +147,9 @@
+     int row2, col2;
+     int length;
+     char buffer[BUFSIZ];
+-    WINDOW *look = 0;
+-    WINDOW *work = 0;
+-    WINDOW *show = 0;
++    WINDOW *look = NULL;
++    WINDOW *work = NULL;
++    WINDOW *show = NULL;
+     int margin = (2 * MY_TABSIZE) - 1;
+     Options option = (Options) ((unsigned) (m_opt
+ 					    ? oMove
+Index: test/key_names.c
+Prereq:  1.11 
+--- ncurses-6.5-20241130+/test/key_names.c	2022-12-04 00:40:11.000000000 +0000
++++ ncurses-6.5-20241207/test/key_names.c	2024-12-07 23:00:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2022 Thomas E. Dickey                                     *
++ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2007-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: key_names.c,v 1.11 2022/12/04 00:40:11 tom Exp $
++ * $Id: key_names.c,v 1.12 2024/12/07 23:00:37 tom Exp $
+  */
+ 
+ #include 
+@@ -100,7 +100,7 @@
+     for (n = -1; n < KEY_MAX + 512; n++) {
+ 	int check = wcwidth((wchar_t) n);
+ 	const char *result = check >= 0 ? key_name((wchar_t) n) : "?";
+-	if (result != 0)
++	if (result != NULL)
+ 	    printf("%d(%5o):%s\n", n, n, result);
+     }
+     ExitProgram(EXIT_SUCCESS);
+Index: test/keynames.c
+Prereq:  1.13 
+--- ncurses-6.5-20241130+/test/keynames.c	2022-12-04 00:40:11.000000000 +0000
++++ ncurses-6.5-20241207/test/keynames.c	2024-12-07 23:00:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2022 Thomas E. Dickey                                     *
++ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2006,2008 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: keynames.c,v 1.13 2022/12/04 00:40:11 tom Exp $
++ * $Id: keynames.c,v 1.14 2024/12/07 23:00:37 tom Exp $
+  */
+ 
+ #include 
+@@ -97,7 +97,7 @@
+ 
+     for (n = -1; n < KEY_MAX + 512; n++) {
+ 	const char *result = keyname(n);
+-	if (result != 0)
++	if (result != NULL)
+ 	    printf("%d(%5o):%s\n", n, n, result);
+     }
+     ExitProgram(EXIT_SUCCESS);
+Index: test/linedata.h
+Prereq:  1.8 
+--- ncurses-6.5-20241130+/test/linedata.h	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241207/test/linedata.h	2024-12-07 23:00:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018,2020 Thomas E. Dickey                                     *
++ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
+  * Copyright 2009-2010,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: linedata.h,v 1.8 2020/02/02 23:34:34 tom Exp $
++ * $Id: linedata.h,v 1.9 2024/12/07 23:00:37 tom Exp $
+  *
+  * Utility functions for reading a line of text from a file.
+  */
+@@ -55,7 +55,7 @@
+ static void
+ init_linedata(const char *name)
+ {
+-    if ((linedata = fopen(name, "r")) == 0) {
++    if ((linedata = fopen(name, "r")) == NULL) {
+ 	failed(name);
+     }
+ }
+@@ -64,11 +64,11 @@
+ read_linedata(WINDOW *work)
+ {
+     int result;
+-    if (linedata != 0) {
++    if (linedata != NULL) {
+ 	result = fgetc(linedata);
+ 	if (result == EOF) {
+ 	    fclose(linedata);
+-	    linedata = 0;
++	    linedata = NULL;
+ 	    result = read_linedata(work);
+ 	} else {
+ 	    wrefresh(work);
+Index: test/list_keys.c
+Prereq:  1.36 
+--- ncurses-6.5-20241130+/test/list_keys.c	2024-11-30 18:07:01.000000000 +0000
++++ ncurses-6.5-20241207/test/list_keys.c	2024-12-07 22:33:32.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: list_keys.c,v 1.36 2024/11/30 18:07:01 tom Exp $
++ * $Id: list_keys.c,v 1.37 2024/12/07 22:33:32 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -86,7 +86,7 @@
+ {
+     const char *result = name;
+     int n;
+-    for (n = 0; strnames[n] != 0; ++n) {
++    for (n = 0; strnames[n] != NULL; ++n) {
+ 	if (!strcmp(name, strnames[n])) {
+ 	    result = strfnames[n];
+ 	    break;
+@@ -104,7 +104,7 @@
+     if (show && t_opt)
+ 	fputc('"', stdout);
+ 
+-    if (value != 0 && value != (char *) -1) {
++    if (value != NULL && value != (char *) -1) {
+ 	while (*value != 0) {
+ 	    char buffer[10];
+ 	    int ch = UChar(*value++);
+@@ -356,7 +356,7 @@
+ 	if (widths2 < check)
+ 	    widths2 = check;
+     }
+-    for (j = 0; Name(j) != 0; ++j) {
++    for (j = 0; Name(j) != NULL; ++j) {
+ 	if (valid_key(Name(j), terms, count)) {
+ 	    const char *label = f_opt ? full_name(Name(j)) : Name(j);
+ 	    check = (int) strlen(label);
+@@ -399,7 +399,7 @@
+ 
+     widthsx = widths0 + ((count + 1) * widths2);
+ 
+-    for (j = 0; Name(j) != 0; ++j) {
++    for (j = 0; Name(j) != NULL; ++j) {
+ 	if (j == 0 || (Type(j) != Type(j - 1)))
+ 	    draw_line(widthsx);
+ 	if (valid_key(Name(j), terms, count)) {
+@@ -498,7 +498,7 @@
+ 	int n;
+ 	for (n = optind; n < argc; ++n) {
+ 	    setupterm((NCURSES_CONST char *) argv[n], 1, &status);
+-	    if (status > 0 && cur_term != 0) {
++	    if (status > 0 && cur_term != NULL) {
+ 		terms[found++] = cur_term;
+ 	    }
+ 	}
+Index: test/move_field.c
+Prereq:  1.19 
+--- ncurses-6.5-20241130+/test/move_field.c	2024-10-06 21:12:35.000000000 +0000
++++ ncurses-6.5-20241207/test/move_field.c	2024-12-07 22:33:32.000000000 +0000
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: move_field.c,v 1.19 2024/10/06 21:12:35 tom Exp $
++ * $Id: move_field.c,v 1.20 2024/12/07 22:33:32 tom Exp $
+  *
+  * Demonstrate move_field().
+  */
+@@ -91,7 +91,7 @@
+ 	const char *code = keyname(commands[n].code);
+ 	size_t need = 5;
+ #ifdef NCURSES_VERSION
+-	if ((name = form_request_name(commands[n].result)) == 0)
++	if ((name = form_request_name(commands[n].result)) == NULL)
+ #endif
+ 	    name = commands[n].help;
+ 	need = 5 + strlen(code) + strlen(name);
+@@ -101,9 +101,9 @@
+     }
+     msgs[used++] =
+ 	strdup("Arrow keys move within a field as you would expect.");
+-    msgs[used] = 0;
++    msgs[used] = NULL;
+     popup_msg2(stdscr, msgs);
+-    for (n = 0; msgs[n] != 0; ++n) {
++    for (n = 0; msgs[n] != NULL; ++n) {
+ 	free(msgs[n]);
+     }
+     free(msgs);
+@@ -444,7 +444,7 @@
+ 
+     all_fields[n] = (FIELD *) 0;
+ 
+-    if ((form = new_form(all_fields)) != 0) {
++    if ((form = new_form(all_fields)) != NULL) {
+ 	int finished = 0;
+ 
+ 	post_form(form);
+@@ -466,7 +466,7 @@
+ 
+ 	free_form(form);
+     }
+-    for (c = 0; all_fields[c] != 0; c++) {
++    for (c = 0; all_fields[c] != NULL; c++) {
+ 	free_edit_field(all_fields[c]);
+ 	free_field(all_fields[c]);
+     }
+Index: test/movewindow.c
+Prereq:  1.56 
+--- ncurses-6.5-20241130+/test/movewindow.c	2024-10-06 18:44:26.000000000 +0000
++++ ncurses-6.5-20241207/test/movewindow.c	2024-12-07 22:33:32.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: movewindow.c,v 1.56 2024/10/06 18:44:26 tom Exp $
++ * $Id: movewindow.c,v 1.57 2024/12/07 22:33:32 tom Exp $
+  *
+  * Demonstrate move functions for windows and derived windows from the curses
+  * library.
+@@ -149,7 +149,7 @@
+     res.y = uli;
+     res.x = ulj;
+ 
+-    if (child != 0) {
++    if (child != NULL) {
+ 	if (relative) {
+ 	    getparyx(child, i, j);
+ 	} else {
+@@ -256,20 +256,20 @@
+     bool result = FALSE;
+ 
+     head_line("Use arrows to move cursor, anything else to mark corner 1");
+-    if ((tmp = selectcell(parent, 0,
++    if ((tmp = selectcell(parent, NULL,
+ 			  min_line, min_col,
+ 			  max_line, max_col,
+ 			  FALSE,
+-			  (bool *) 0)) != 0) {
++			  (bool *) 0)) != NULL) {
+ 	*ul = *tmp;
+ 	MvWAddCh(parent, ul->y, ul->x, '*');
+ 
+ 	head_line("Use arrows to move cursor, anything else to mark corner 2");
+-	if ((tmp = selectcell(parent, 0,
++	if ((tmp = selectcell(parent, NULL,
+ 			      ul->y, ul->x,
+ 			      max_line, max_col,
+ 			      FALSE,
+-			      (bool *) 0)) != 0) {
++			      (bool *) 0)) != NULL) {
+ 	    *lr = *tmp;
+ 	    MvWAddCh(parent, lr->y, lr->x, '*');
+ 	    wmove(parent, lr->y, lr->x);
+@@ -348,7 +348,7 @@
+ static WINDOW *
+ parent_of(NCURSES_CONST WINDOW *win)
+ {
+-    WINDOW *result = 0;
++    WINDOW *result = NULL;
+     int n = window2num(win);
+     if (n >= 0)
+ 	result = all_windows[n].parent;
+@@ -429,7 +429,7 @@
+     WINDOW *parent = parent_of(win);
+     bool result = FALSE;
+ 
+-    if (parent != 0) {
++    if (parent != NULL) {
+ 	bool top = (parent == stdscr);
+ 	int min_col = top ? COL_MIN : 0;
+ 	int max_col = top ? COL_MAX : getmaxx(parent);
+@@ -445,7 +445,7 @@
+ 				 min_line, min_col,
+ 				 max_line, max_col,
+ 				 FALSE,
+-				 &more)) != 0) {
++				 &more)) != NULL) {
+ 	    int y0, x0;
+ 	    getbegyx(parent, y0, x0);
+ 	    /*
+@@ -494,7 +494,7 @@
+     WINDOW *parent = parent_of(win);
+     bool result = FALSE;
+ 
+-    if (parent != 0) {
++    if (parent != NULL) {
+ 	bool top = (parent == stdscr);
+ 	int min_col = top ? COL_MIN : 0;
+ 	int max_col = top ? COL_MAX : getmaxx(parent);
+@@ -509,7 +509,7 @@
+ 				 min_line, min_col,
+ 				 max_line, max_col,
+ 				 TRUE,
+-				 &more)) != 0) {
++				 &more)) != NULL) {
+ 	    if (mvderwin(win, tmp->y, tmp->x) != ERR) {
+ 		refresh_all(win);
+ 		doupdate();
+@@ -577,16 +577,16 @@
+ create_my_window(WINDOW *current)
+ {
+     PAIR ul, lr;
+-    WINDOW *result = 0;
++    WINDOW *result = NULL;
+ 
+     if (getwindow(stdscr, &ul, &lr)) {
+ 	result = newwin(lines_of(ul, lr), cols_of(ul, lr), pair_of(ul));
+-	if (result != 0) {
++	if (result != NULL) {
+ 	    fill_window(result, 'c');
+ 	    add_window(stdscr, result);
+ 	}
+     }
+-    if (result == 0)
++    if (result == NULL)
+ 	result = current;
+     return result;
+ }
+@@ -595,16 +595,16 @@
+ create_my_derwin(WINDOW *parent)
+ {
+     PAIR ul, lr;
+-    WINDOW *result = 0;
++    WINDOW *result = NULL;
+ 
+     if (getwindow(parent, &ul, &lr)) {
+ 	result = derwin(parent, lines_of(ul, lr), cols_of(ul, lr), pair_of(ul));
+-	if (result != 0) {
++	if (result != NULL) {
+ 	    fill_window(result, 'd');
+ 	    add_window(parent, result);
+ 	}
+     }
+-    if (result == 0)
++    if (result == NULL)
+ 	result = parent;
+     return result;
+ }
+@@ -613,7 +613,7 @@
+ create_my_subwin(WINDOW *parent)
+ {
+     PAIR ul, lr;
+-    WINDOW *result = 0;
++    WINDOW *result = NULL;
+ 
+     if (getwindow(parent, &ul, &lr)) {
+ 	result = subwin(parent,
+@@ -621,12 +621,12 @@
+ 			cols_of(ul, lr),
+ 			ul.y + getbegy(parent),
+ 			ul.x + getbegx(parent));
+-	if (result != 0) {
++	if (result != NULL) {
+ 	    fill_window(result, 's');
+ 	    add_window(parent, result);
+ 	}
+     }
+-    if (result == 0)
++    if (result == NULL)
+ 	result = parent;
+     return result;
+ }
+@@ -718,7 +718,7 @@
+     nonl();
+     intrflush(stdscr, FALSE);
+ 
+-    add_window(0, current_win = stdscr);
++    add_window(NULL, current_win = stdscr);
+ 
+ #ifdef NCURSES_MOUSE_VERSION
+     (void) mousemask(BUTTON1_CLICKED, (mmask_t *) NULL);
+Index: test/ncurses.c
+Prereq:  1.544 
+--- ncurses-6.5-20241130+/test/ncurses.c	2024-11-30 18:54:06.000000000 +0000
++++ ncurses-6.5-20241207/test/ncurses.c	2024-12-07 23:22:39.000000000 +0000
+@@ -41,7 +41,7 @@
+    Author: Eric S. Raymond  1993
+            Thomas E. Dickey (beginning revision 1.27 in 1996).
+ 
+-$Id: ncurses.c,v 1.544 2024/11/30 18:54:06 tom Exp $
++$Id: ncurses.c,v 1.545 2024/12/07 23:22:39 tom Exp $
+ 
+ ***************************************************************************/
+ 
+@@ -121,23 +121,23 @@
+ #endif
+ 
+ #if HAVE_WCSRTOMBS
+-#define count_wchars(src, len, state)      wcsrtombs(0,   &src, len, state)
+-#define trans_wchars(dst, src, len, state) wcsrtombs(dst, &src, len, state)
++#define count_wchars(src, len, state)      wcsrtombs(NULL, &src, len, state)
++#define trans_wchars(dst, src, len, state) wcsrtombs(dst,  &src, len, state)
+ #define reset_wchars(state) init_mb(state)
+ #elif HAVE_WCSTOMBS && HAVE_MBTOWC && HAVE_MBLEN
+-#define count_wchars(src, len, state)      wcstombs(0,   src, len)
+-#define trans_wchars(dst, src, len, state) wcstombs(dst, src, len)
++#define count_wchars(src, len, state)      wcstombs(NULL, src, len)
++#define trans_wchars(dst, src, len, state) wcstombs(dst,  src, len)
+ #define reset_wchars(state) IGNORE_RC(mblen(NULL, 0)), IGNORE_RC(mbtowc(NULL, NULL, 0))
+ #define state_unused
+ #endif
+ 
+ #if HAVE_MBSRTOWCS
+-#define count_mbytes(src, len, state)      mbsrtowcs(0,   &src, len, state)
+-#define trans_mbytes(dst, src, len, state) mbsrtowcs(dst, &src, len, state)
++#define count_mbytes(src, len, state)      mbsrtowcs(NULL, &src, len, state)
++#define trans_mbytes(dst, src, len, state) mbsrtowcs(dst,  &src, len, state)
+ #define reset_mbytes(state) init_mb(state)
+ #elif HAVE_MBSTOWCS && HAVE_MBTOWC && HAVE_MBLEN
+-#define count_mbytes(src, len, state)      mbstowcs(0,   src, len)
+-#define trans_mbytes(dst, src, len, state) mbstowcs(dst, src, len)
++#define count_mbytes(src, len, state)      mbstowcs(NULL, src, len)
++#define trans_mbytes(dst, src, len, state) mbstowcs(dst,  src, len)
+ #define reset_mbytes(state) IGNORE_RC(mblen(NULL, 0)), IGNORE_RC(mbtowc(NULL, NULL, 0))
+ #define state_unused
+ #endif
+@@ -328,7 +328,7 @@
+ 
+     source[0] = fullwidth_digit(digit + '0');
+     source[1] = 0;
+-    setcchar(target, source, A_NORMAL, 0, 0);
++    setcchar(target, source, A_NORMAL, 0, NULL);
+ }
+ #endif
+ 
+@@ -683,7 +683,7 @@
+ 	const char *msg = help[n];
+ 	int row = 1 + (int) (n % chk);
+ 	int col = (n >= chk) ? COLS / 2 : 0;
+-	int flg = ((strstr(msg, "toggle") != 0)
++	int flg = ((strstr(msg, "toggle") != NULL)
+ 		   && (flags[UChar(*msg)] != FALSE));
+ 	if (*msg == '^' && ExitOnEscape())
+ 	    msg = "^[,^q -- quit";
+@@ -717,16 +717,16 @@
+     WINDOW *frame;
+ } WINSTACK;
+ 
+-static WINSTACK *winstack = 0;
++static WINSTACK *winstack = NULL;
+ static unsigned len_winstack = 0;
+ 
+ static void
+ forget_boxes(void)
+ {
+-    if (winstack != 0) {
++    if (winstack != NULL) {
+ 	free(winstack);
+     }
+-    winstack = 0;
++    winstack = NULL;
+     len_winstack = 0;
+ }
+ 
+@@ -737,7 +737,7 @@
+ 
+     assert(level < (unsigned) COLS);
+ 
+-    if (winstack == 0) {
++    if (winstack == NULL) {
+ 	len_winstack = 20;
+ 	winstack = typeMalloc(WINSTACK, len_winstack);
+     } else if (need >= len_winstack) {
+@@ -1030,7 +1030,7 @@
+ 	high -= 2;
+ 	wide -= 2;
+ 	werase(winstack[n].text);
+-	box_set(winstack[n].frame, 0, 0);
++	box_set(winstack[n].frame, NULL, NULL);
+ 	wnoutrefresh(winstack[n].frame);
+ 	wprintw(winstack[n].text,
+ 		"size %dx%d\n",
+@@ -1048,7 +1048,7 @@
+ wcstos(const wchar_t *src)
+ {
+     int need;
+-    char *result = 0;
++    char *result = NULL;
+     const wchar_t *tmp = src;
+ #ifndef state_unused
+     mbstate_t state;
+@@ -1057,11 +1057,11 @@
+     reset_wchars(state);
+     if ((need = (int) count_wchars(tmp, 0, &state)) > 0) {
+ 	unsigned have = (unsigned) need;
+-	if ((result = typeCalloc(char, have + 1)) != 0) {
++	if ((result = typeCalloc(char, have + 1)) != NULL) {
+ 	    tmp = src;
+ 	    if (trans_wchars(result, tmp, have, &state) != have) {
+ 		free(result);
+-		result = 0;
++		result = NULL;
+ 	    }
+ 	} else {
+ 	    failed("wcstos");
+@@ -1124,7 +1124,7 @@
+ 		for (n = 0; (wchar_buf[n] = (wchar_t) wint_buf[n]) != 0; ++n) {
+ 		    ;
+ 		}
+-		if ((temp = wcstos(wchar_buf)) != 0) {
++		if ((temp = wcstos(wchar_buf)) != NULL) {
+ 		    wprintw(win, "I saw %d characters:\n\t`%s'.",
+ 			    (int) wcslen(wchar_buf), temp);
+ 		    free(temp);
+@@ -1161,7 +1161,7 @@
+ 		WINDOW *wb = newwin(high, wide, new_y, new_x);
+ 		WINDOW *wi = newwin(high - 2, wide - 2, new_y + 1, new_x + 1);
+ 
+-		box_set(wb, 0, 0);
++		box_set(wb, NULL, NULL);
+ 		wrefresh(wb);
+ 		wmove(wi, 0, 0);
+ 		remember_boxes(level, wi, wb);
+@@ -1614,7 +1614,7 @@
+ 		Repaint();
+ 		break;
+ 	    case HELP_KEY_1:
+-		if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) {
++		if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != NULL) {
+ 		    box(helpwin, 0, 0);
+ 		    attr_legend(helpwin);
+ 		    wGetchar(helpwin);
+@@ -1837,7 +1837,7 @@
+ 
+     blank[0] = ' ';
+     blank[1] = 0;
+-    setcchar(&normal, blank, A_NORMAL, pair, 0);
++    setcchar(&normal, blank, A_NORMAL, pair, NULL);
+     bkgrnd(&normal);
+     bkgrndset(&normal);
+ }
+@@ -1854,7 +1854,7 @@
+     if (getbkgrnd(&ch) != ERR) {
+ 	wchar_t wch[CCHARW_MAX];
+ 
+-	if (getcchar(&ch, wch, &attr, &pair, 0) != ERR) {
++	if (getcchar(&ch, wch, &attr, &pair, NULL) != ERR) {
+ 	    result = attr;
+ 	}
+     }
+@@ -1895,17 +1895,17 @@
+ 	    wchar_t fill[2];
+ 	    fill[0] = *s;
+ 	    fill[1] = L'\0';
+-	    setcchar(&ch, fill, attr, pair, 0);
++	    setcchar(&ch, fill, attr, pair, NULL);
+ 	    (void) wadd_wch(win, &ch);
+ 	}
+     } else {
+ 	attr_t old_attr = 0;
+ 	NCURSES_PAIRS_T old_pair = 0;
+ 
+-	(void) (wattr_get) (win, &old_attr, &old_pair, 0);
+-	(void) wattr_set(win, attr, pair, 0);
++	(void) (wattr_get) (win, &old_attr, &old_pair, NULL);
++	(void) wattr_set(win, attr, pair, NULL);
+ 	(void) waddwstr(win, wide_attr_test_string);
+-	(void) wattr_set(win, old_attr, old_pair, 0);
++	(void) wattr_set(win, old_attr, old_pair, NULL);
+     }
+     if (skip)
+ 	printw("%*s", skip, " ");
+@@ -1969,8 +1969,8 @@
+ 		Repaint();
+ 		break;
+ 	    case HELP_KEY_1:
+-		if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) {
+-		    box_set(helpwin, 0, 0);
++		if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != NULL) {
++		    box_set(helpwin, NULL, NULL);
+ 		    attr_legend(helpwin);
+ 		    wGetchar(helpwin);
+ 		    delwin(helpwin);
+@@ -2074,7 +2074,7 @@
+ 	    set_wide_background(pair);
+ 	    erase();
+ 
+-	    box_set(stdscr, 0, 0);
++	    box_set(stdscr, NULL, NULL);
+ 	    MvAddStr(0, 20, "Character attribute test display");
+ 
+ 	    for (j = 0; j < my_size; ++j) {
+@@ -2258,7 +2258,7 @@
+     int col_limit;
+     int row_limit;
+     int per_row;
+-    char *numbered = 0;
++    char *numbered = NULL;
+     const char *hello;
+     bool done = FALSE;
+     bool opt_acsc = FALSE;
+@@ -2275,7 +2275,7 @@
+     }
+ 
+     numbered = typeCalloc(char, COLS + 1);
+-    done = ((COLS < 16) || (numbered == 0));
++    done = ((COLS < 16) || (numbered == NULL));
+ 
+     /*
+      * Because the number of colors is usually a power of two, we also use
+@@ -2481,7 +2481,7 @@
+ 	    }
+ 	    break;
+ 	case HELP_KEY_1:
+-	    if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) {
++	    if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != NULL) {
+ 		box(helpwin, 0, 0);
+ 		color_legend(helpwin, FALSE);
+ 		wGetchar(helpwin);
+@@ -2527,7 +2527,7 @@
+     int col_limit;
+     int row_limit;
+     int per_row;
+-    char *numbered = 0;
++    char *numbered = NULL;
+     const char *hello;
+     bool done = FALSE;
+     bool opt_acsc = FALSE;
+@@ -2537,7 +2537,7 @@
+     bool opt_nums = FALSE;
+     bool opt_xchr = FALSE;
+     int opt_zoom = 0;
+-    wchar_t *buffer = 0;
++    wchar_t *buffer = NULL;
+     WINDOW *helpwin;
+ 
+     if (!UseColors) {
+@@ -2546,7 +2546,7 @@
+     }
+     numbered = typeCalloc(char, COLS + 1);
+     buffer = typeCalloc(wchar_t, COLS + 1);
+-    done = ((COLS < 16) || (numbered == 0) || (buffer == 0));
++    done = ((COLS < 16) || (numbered == NULL) || (buffer == NULL));
+ 
+     /*
+      * Because the number of colors is usually a power of two, we also use
+@@ -2765,7 +2765,7 @@
+ 	    }
+ 	    break;
+ 	case HELP_KEY_1:
+-	    if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) {
++	    if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != NULL) {
+ 		box(helpwin, 0, 0);
+ 		color_legend(helpwin, TRUE);
+ 		wGetchar(helpwin);
+@@ -2875,14 +2875,14 @@
+ 	}
+ 	reset_prog_mode();
+     }
+-    if (palette_file != 0) {
++    if (palette_file != NULL) {
+ 	FILE *fp = fopen(palette_file, "r");
+-	if (fp != 0) {
++	if (fp != NULL) {
+ 	    char buffer[BUFSIZ];
+ 	    int red, green, blue;
+ 	    int scale = 1000;
+ 	    int c;
+-	    while (fgets(buffer, sizeof(buffer), fp) != 0) {
++	    while (fgets(buffer, sizeof(buffer), fp) != NULL) {
+ 		if (sscanf(buffer, "scale:%d", &c) == 1) {
+ 		    scale = c;
+ 		    if (scale < 100)
+@@ -3387,7 +3387,7 @@
+ 	case '8':
+ 	    MvAddStr(SLK_WORK, 0, "Please enter the label value: ");
+ 	    _nc_STRCPY(buf, "", sizeof(buf));
+-	    if ((s = slk_label(c - '0')) != 0) {
++	    if ((s = slk_label(c - '0')) != NULL) {
+ 		_nc_STRNCPY(buf, s, (size_t) 8);
+ 	    }
+ 	    wGetstring(stdscr, buf, 8);
+@@ -3508,7 +3508,7 @@
+ 	case '8':
+ 	    MvAddStr(SLK_WORK, 0, "Please enter the label value: ");
+ 	    *buf = 0;
+-	    if ((s = slk_label(c - '0')) != 0) {
++	    if ((s = slk_label(c - '0')) != NULL) {
+ 		char *temp = strdup(s);
+ 		size_t used = strlen(temp);
+ 		size_t want = SLKLEN;
+@@ -3821,7 +3821,7 @@
+     int c = 'a';
+     int pagesize = 32;
+     char *term = getenv("TERM");
+-    const char *pch_kludge = ((term != 0 && strstr(term, "linux"))
++    const char *pch_kludge = ((term != NULL && strstr(term, "linux"))
+ 			      ? "p=PC, "
+ 			      : "");
+     attr_t attr = A_NORMAL;
+@@ -3831,7 +3831,7 @@
+     int bg = COLOR_BLACK;
+     unsigned at_code = 0;
+     NCURSES_PAIRS_T pair = 0;
+-    void (*last_show_acs) (int, attr_t, NCURSES_PAIRS_T) = 0;
++    void (*last_show_acs) (int, attr_t, NCURSES_PAIRS_T) = NULL;
+     ATTR_TBL my_list[SIZEOF(attrs_to_test)];
+     unsigned my_size = init_attr_list(my_list, termattrs());
+ 
+@@ -3864,12 +3864,12 @@
+ 	case '2':
+ 	case '3':
+ 	    digit = (c - '0');
+-	    last_show_acs = 0;
++	    last_show_acs = NULL;
+ 	    break;
+ 	case '-':
+ 	    if (digit > 0) {
+ 		--digit;
+-		last_show_acs = 0;
++		last_show_acs = NULL;
+ 	    } else {
+ 		beep();
+ 	    }
+@@ -3877,7 +3877,7 @@
+ 	case '+':
+ 	    if (digit < 3) {
+ 		++digit;
+-		last_show_acs = 0;
++		last_show_acs = NULL;
+ 	    } else {
+ 		beep();
+ 	    }
+@@ -3901,7 +3901,7 @@
+ 	}
+ 	if (pagesize != 32) {
+ 	    show_256_chars(repeat, attr, pair);
+-	} else if (last_show_acs != 0) {
++	} else if (last_show_acs != NULL) {
+ 	    last_show_acs(repeat, attr, pair);
+ 	} else {
+ 	    show_upper_chars(digit * pagesize + 128, pagesize, repeat, attr, pair);
+@@ -3941,8 +3941,8 @@
+ 	TEST_CCHAR(src, {
+ 	    attr |= (test_attrs & A_ALTCHARSET);
+ 	    setcchar(dst, test_wch, attr, pair, NULL);
+-	}, {
+-	    ;
++	}
++	, {;
+ 	});
+     } while (0);
+     return dst;
+@@ -3981,7 +3981,7 @@
+ 
+ 	memset(&codes, 0, sizeof(codes));
+ 	codes[0] = code;
+-	setcchar(&temp, codes, attr, pair, 0);
++	setcchar(&temp, codes, attr, pair, NULL);
+ 	move(row, col);
+ 	if (wcwidth(code) == 0 && code != 0) {
+ 	    AddCh((chtype) space |
+@@ -4020,7 +4020,7 @@
+ 
+ 	memset(&codes, 0, sizeof(codes));
+ 	codes[0] = code;
+-	setcchar(&temp, codes, attr, pair, 0);
++	setcchar(&temp, codes, attr, pair, NULL);
+ 
+ 	do {
+ 	    int y, x;
+@@ -4298,10 +4298,10 @@
+     char temp[80];
+ 
+     MvPrintw(row, col, "%*s : ", COLS / 4, name);
+-    (void) attr_set(attr, pair, 0);
++    (void) attr_set(attr, pair, NULL);
+     _nc_STRNCPY(temp, code, 20);
+     addstr(temp);
+-    (void) attr_set(A_NORMAL, 0, 0);
++    (void) attr_set(A_NORMAL, 0, NULL);
+     return n + 1;
+ }
+ 
+@@ -4373,7 +4373,7 @@
+     int bg = COLOR_BLACK;
+     unsigned at_code = 0;
+     NCURSES_PAIRS_T pair = 0;
+-    void (*last_show_wacs) (int, attr_t, NCURSES_PAIRS_T) = 0;
++    void (*last_show_wacs) (int, attr_t, NCURSES_PAIRS_T) = NULL;
+     W_ATTR_TBL my_list[SIZEOF(w_attrs_to_test)];
+     unsigned my_size = init_w_attr_list(my_list, term_attrs());
+     char at_page[20];
+@@ -4436,26 +4436,26 @@
+ 		    at_page[--len] = '\0';
+ 	    } else if (c < 256 && isdigit(c)) {
+ 		digit = (unsigned) (c - '0');
+-		last_show_wacs = 0;
++		last_show_wacs = NULL;
+ 	    } else if (c == '+') {
+ 		++digit;
+ 		_nc_SPRINTF(at_page, _nc_SLIMIT(sizeof(at_page)) "%02x", digit);
+-		last_show_wacs = 0;
++		last_show_wacs = NULL;
+ 	    } else if (c == '-' && digit > 0) {
+ 		--digit;
+ 		_nc_SPRINTF(at_page, _nc_SLIMIT(sizeof(at_page)) "%02x",
+ 			    UChar(digit));
+-		last_show_wacs = 0;
++		last_show_wacs = NULL;
+ 	    } else if (c == '>' && repeat < (COLS / 4)) {
+ 		++repeat;
+ 	    } else if (c == '<' && repeat > 1) {
+ 		--repeat;
+ 	    } else if (c == '_') {
+ 		space = (space == ' ') ? '_' : ' ';
+-		last_show_wacs = 0;
++		last_show_wacs = NULL;
+ 	    } else if (cycle_w_attr(c, &at_code, &attr, my_list, my_size)
+ 		       || cycle_colors(c, &fg, &bg, &pair)) {
+-		if (last_show_wacs != 0)
++		if (last_show_wacs != NULL)
+ 		    break;
+ 	    } else {
+ 		beep();
+@@ -4465,7 +4465,7 @@
+ 	}
+ 	if (pagesize != 32) {
+ 	    show_paged_widechars(digit, pagesize, repeat, space, attr, pair);
+-	} else if (last_show_wacs != 0) {
++	} else if (last_show_wacs != NULL) {
+ 	    last_show_wacs(repeat, attr, pair);
+ 	} else {
+ 	    show_upper_widechars(digit * 32 + 128, repeat, space, attr, pair);
+@@ -4615,7 +4615,7 @@
+ static WINDOW *
+ frame_win(FRAME * curp)
+ {
+-    return (curp != 0) ? curp->wind : stdscr;
++    return (curp != NULL) ? curp->wind : stdscr;
+ }
+ 
+ /* We need to know if these flags are actually set, so don't look in FRAME.
+@@ -4834,7 +4834,7 @@
+     outerbox(ul, lr, TRUE);
+     refresh();
+ 
+-    if (rwindow != 0)
++    if (rwindow != NULL)
+ 	wrefresh(rwindow);
+ 
+     move(0, 0);
+@@ -4865,9 +4865,9 @@
+ static FRAME *
+ delete_framed(FRAME * fp, bool showit)
+ {
+-    FRAME *np = 0;
++    FRAME *np = NULL;
+ 
+-    if (fp != 0) {
++    if (fp != NULL) {
+ 	fp->last->next = fp->next;
+ 	fp->next->last = fp->last;
+ 
+@@ -4905,7 +4905,7 @@
+ 	transient((FRAME *) 0, (char *) 0);
+ 	switch (c) {
+ 	case CTRL('C'):
+-	    if ((neww = typeCalloc(FRAME, (size_t) 1)) == 0) {
++	    if ((neww = typeCalloc(FRAME, (size_t) 1)) == NULL) {
+ 		failed("scroll_test");
+ 		goto breakout;
+ 	    }
+@@ -4915,7 +4915,7 @@
+ 		goto breakout;
+ 	    }
+ 
+-	    if (current == 0) {	/* First element,  */
++	    if (current == NULL) {	/* First element,  */
+ 		neww->next = neww;	/*   so point it at itself */
+ 		neww->last = neww;
+ 	    } else {
+@@ -4970,7 +4970,7 @@
+ 
+ #if HAVE_PUTWIN && HAVE_GETWIN
+ 	case CTRL('W'):	/* save and delete window */
+-	    if ((current != 0) && (current == current->next)) {
++	    if ((current != NULL) && (current == current->next)) {
+ 		transient(current, "Will not save/delete ONLY window");
+ 		break;
+ 	    } else if ((fp = fopen(DUMPFILE, "w")) == (FILE *) 0) {
+@@ -4991,13 +4991,13 @@
+ 	    if ((fp = fopen(DUMPFILE, "r")) == (FILE *) 0) {
+ 		transient(current, "Can't open screen dump file");
+ 	    } else {
+-		if ((neww = typeCalloc(FRAME, (size_t) 1)) != 0) {
++		if ((neww = typeCalloc(FRAME, (size_t) 1)) != NULL) {
+ 
+-		    neww->next = current ? current->next : 0;
++		    neww->next = current ? current->next : NULL;
+ 		    neww->last = current;
+-		    if (neww->last != 0)
++		    if (neww->last != NULL)
+ 			neww->last->next = neww;
+-		    if (neww->next != 0)
++		    if (neww->next != NULL)
+ 			neww->next->last = neww;
+ 
+ 		    neww->wind = getwin(fp);
+@@ -5119,7 +5119,7 @@
+ 	 && (c != ERR));
+ 
+   breakout:
+-    while (current != 0)
++    while (current != NULL)
+ 	current = delete_framed(current, FALSE);
+ 
+     scrollok(stdscr, TRUE);	/* reset to driver's default */
+@@ -5180,7 +5180,7 @@
+ {
+     wmove(stdscr, LINES - 1, 0);
+     wclrtoeol(stdscr);
+-    if (text != 0 && *text != '\0') {
++    if (text != NULL && *text != '\0') {
+ 	waddstr(stdscr, text);
+ 	waddstr(stdscr, "; ");
+     }
+@@ -5194,10 +5194,10 @@
+ mkpanel(NCURSES_COLOR_T color, int rows, int cols, int tly, int tlx)
+ {
+     WINDOW *win;
+-    PANEL *pan = 0;
++    PANEL *pan = NULL;
+ 
+-    if ((win = newwin(rows, cols, tly, tlx)) != 0) {
+-	if ((pan = new_panel(win)) == 0) {
++    if ((win = newwin(rows, cols, tly, tlx)) != NULL) {
++	if ((pan = new_panel(win)) == NULL) {
+ 	    delwin(win);
+ 	} else if (UseColors) {
+ 	    NCURSES_COLOR_T fg = (NCURSES_COLOR_T) ((color == COLOR_BLUE)
+@@ -5337,7 +5337,8 @@
+ }
+ 
+ static int
+-demo_panels(void (*InitPanel) (WINDOW *), void (*FillPanel) (NCURSES_CONST PANEL *))
++demo_panels(void (*InitPanel) (WINDOW *),
++	    void (*FillPanel) (NCURSES_CONST PANEL *))
+ {
+     int count;
+     int itmp;
+@@ -5927,7 +5928,7 @@
+ {
+     WINDOW *panpad = newpad(PAD_HIGH, PAD_WIDE);
+ 
+-    if (panpad == 0) {
++    if (panpad == NULL) {
+ 	Cannot("cannot create requested pad");
+ 	return ERR;
+     }
+@@ -5990,7 +5991,7 @@
+     getbegyx(win, by, bx);
+     sw = w / 3;
+     sh = h / 3;
+-    if ((subWin = subwin(win, sh, sw, by + h - sh - 2, bx + w - sw - 2)) == 0)
++    if ((subWin = subwin(win, sh, sw, by + h - sh - 2, bx + w - sw - 2)) == NULL)
+ 	return ERR;
+ 
+ #ifdef A_COLOR
+@@ -6138,7 +6139,7 @@
+     refresh();
+ 
+     for (ap = animals; *ap; ap++) {
+-	if ((*ip = new_item(*ap, "")) != 0)
++	if ((*ip = new_item(*ap, "")) != NULL)
+ 	    ++ip;
+     }
+     *ip = (ITEM *) 0;
+@@ -6216,8 +6217,8 @@
+     static size_t need = 12;
+     int n;
+ 
+-    if (buf == 0) {
+-	for (n = 0; t_tbl[n].name != 0; n++)
++    if (buf == NULL) {
++	for (n = 0; t_tbl[n].name != NULL; n++)
+ 	    need += strlen(t_tbl[n].name) + 2;
+ 	buf = typeMalloc(char, need);
+ 	if (!buf)
+@@ -6228,7 +6229,7 @@
+ 	_nc_STRCAT(buf, t_tbl[0].name ? t_tbl[0].name : "", need);
+ 	_nc_STRCAT(buf, ", ", need);
+     } else {
+-	for (n = 1; t_tbl[n].name != 0; n++)
++	for (n = 1; t_tbl[n].name != NULL; n++)
+ 	    if ((tlevel & t_tbl[n].mask) == t_tbl[n].mask) {
+ 		_nc_STRCAT(buf, t_tbl[n].name, need);
+ 		_nc_STRCAT(buf, ", ", need);
+@@ -6260,14 +6261,14 @@
+ 	    i = current_item(m);
+ 	    if (i == items[0]) {
+ 		if (item_value(i)) {
+-		    for (p = items + 1; *p != 0; p++)
++		    for (p = items + 1; *p != NULL; p++)
+ 			if (item_value(*p)) {
+ 			    set_item_value(*p, FALSE);
+ 			    changed = TRUE;
+ 			}
+ 		}
+ 	    } else {
+-		for (p = items + 1; *p != 0; p++)
++		for (p = items + 1; *p != NULL; p++)
+ 		    if (item_value(*p)) {
+ 			set_item_value(items[0], FALSE);
+ 			changed = TRUE;
+@@ -6300,8 +6301,8 @@
+ 
+     refresh();
+ 
+-    for (n = 0; t_tbl[n].name != 0; n++) {
+-	if ((*ip = new_item(t_tbl[n].name, "")) != 0) {
++    for (n = 0; t_tbl[n].name != NULL; n++) {
++	if ((*ip = new_item(t_tbl[n].name, "")) != NULL) {
+ 	    ++ip;
+ 	}
+     }
+@@ -6431,7 +6432,7 @@
+ 	size_t need = 80 + have;
+ 	char *temp = malloc(need);
+ 
+-	if (temp != 0) {
++	if (temp != NULL) {
+ 	    size_t len;
+ 	    _nc_STRNCPY(temp, source ? source : "", have + 1);
+ 	    len = (size_t) (char *) field_userptr(me);
+@@ -6735,7 +6736,7 @@
+     set_field_type(f[n - 1], fty_passwd);
+     f[n] = (FIELD *) 0;
+ 
+-    if ((form = new_form(f)) != 0) {
++    if ((form = new_form(f)) != NULL) {
+ 	WINDOW *w;
+ 	int finished = 0;
+ 
+@@ -6764,7 +6765,7 @@
+ 
+ 	free_form(form);
+     }
+-    for (c = 0; f[c] != 0; c++)
++    for (c = 0; f[c] != NULL; c++)
+ 	free_field(f[c]);
+     free_fieldtype(fty_middle);
+     free_fieldtype(fty_passwd);
+@@ -6798,7 +6799,7 @@
+     getmaxyx(stdscr, y, x);
+     if (y < 23 || x < 80) {
+ 	Cannot("The screen is too small for this test");
+-	result = 0;
++	result = NULL;
+     } else {
+ 	int ymax = y - (overlap_HEAD + overlap_FOOT);
+ 	int high = ymax / 5;	/* equal-sized parts for cross */
+@@ -7206,9 +7207,9 @@
+     int shift = 0, last_refresh = -1;
+     int state, flavor[OVERLAP_FLAVORS];
+ 
+-    if ((win1 = make_overlap(0)) == 0) {
++    if ((win1 = make_overlap(0)) == NULL) {
+ 	return ERR;
+-    } else if ((win2 = make_overlap(1)) == 0) {
++    } else if ((win2 = make_overlap(1)) == NULL) {
+ 	delwin(win1);
+ 	return ERR;
+     }
+@@ -7406,9 +7407,9 @@
+     int shift = 0, last_refresh = -1;
+     int state, flavor[OVERLAP_FLAVORS];
+ 
+-    if ((win1 = make_overlap(0)) == 0) {
++    if ((win1 = make_overlap(0)) == NULL) {
+ 	return ERR;
+-    } else if ((win2 = make_overlap(1)) == 0) {
++    } else if ((win2 = make_overlap(1)) == NULL) {
+ 	delwin(win1);
+ 	return ERR;
+     }
+@@ -7902,7 +7903,7 @@
+     bool monochrome = FALSE;
+ #if HAVE_COLOR_CONTENT
+     bool xterm_colors = FALSE;
+-    NCURSES_CONST char *palette_file = 0;
++    NCURSES_CONST char *palette_file = NULL;
+ #endif
+ 
+     setlocale(LC_ALL, "");
+@@ -7972,7 +7973,7 @@
+ #endif
+ #ifdef TRACE
+ 	case 'D':
+-	    save_trace = (unsigned) strtol(optarg, 0, 0);
++	    save_trace = (unsigned) strtol(optarg, NULL, 0);
+ 	    break;
+ #endif
+ #if HAVE_COLOR_CONTENT
+Index: test/padview.c
+Prereq:  1.26 
+--- ncurses-6.5-20241130+/test/padview.c	2024-11-30 18:14:46.000000000 +0000
++++ ncurses-6.5-20241207/test/padview.c	2024-12-07 22:40:19.000000000 +0000
+@@ -29,7 +29,7 @@
+ /*
+  * clone of view.c, using pads
+  *
+- * $Id: padview.c,v 1.26 2024/11/30 18:14:46 tom Exp $
++ * $Id: padview.c,v 1.27 2024/12/07 22:40:19 tom Exp $
+  */
+ 
+ #include 
+@@ -124,7 +124,7 @@
+     size_t len;
+     struct stat sb;
+     char *my_blob;
+-    char **my_vec = 0;
++    char **my_vec = NULL;
+     WINDOW *my_pad;
+ 
+     if (stat(filename, &sb) != 0
+@@ -136,11 +136,11 @@
+ 	failed("input is empty");
+     }
+ 
+-    if ((fp = fopen(filename, "r")) == 0) {
++    if ((fp = fopen(filename, "r")) == NULL) {
+ 	failed("cannot open input-file");
+     }
+ 
+-    if ((my_blob = malloc((size_t) sb.st_size + 1)) == 0) {
++    if ((my_blob = malloc((size_t) sb.st_size + 1)) == NULL) {
+ 	failed("cannot allocate memory for input-file");
+     }
+ 
+@@ -171,7 +171,7 @@
+ 	}
+ 	num_lines = k;
+ 	if (pass == 0) {
+-	    if (((my_vec = typeCalloc(char *, (size_t) k + 2)) == 0)) {
++	    if (((my_vec = typeCalloc(char *, (size_t) k + 2)) == NULL)) {
+ 		failed("cannot allocate line-vector #1");
+ 	    }
+ 	} else {
+@@ -199,7 +199,7 @@
+     }
+     width = (width + 1) * 5;
+     my_pad = newpad(height, width);
+-    if (my_pad == 0)
++    if (my_pad == NULL)
+ 	failed("cannot allocate pad workspace");
+     if (try_color) {
+ 	wattrset(my_pad, COLOR_PAIR(my_pair));
+@@ -301,7 +301,7 @@
+ 	"  s              - use entered count for halfdelay() parameter",
+ 	"                 - if no entered count, stop nodelay()",
+ 	"          - begin nodelay()",
+-	0
++	NULL
+     };
+ 
+     int ch;
+@@ -337,9 +337,9 @@
+ #ifdef TRACE
+ 	case 'D':
+ 	    {
+-		char *next = 0;
++		char *next = NULL;
+ 		int tvalue = (int) strtol(optarg, &next, 0);
+-		if (tvalue < 0 || (next != 0 && *next != 0))
++		if (tvalue < 0 || (next != NULL && *next != 0))
+ 		    usage(FALSE);
+ 		curses_trace((unsigned) tvalue);
+ 	    }
+Index: test/pair_content.c
+Prereq:  1.24 
+--- ncurses-6.5-20241130+/test/pair_content.c	2024-11-30 18:31:01.000000000 +0000
++++ ncurses-6.5-20241207/test/pair_content.c	2024-12-07 22:45:15.000000000 +0000
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: pair_content.c,v 1.24 2024/11/30 18:31:01 tom Exp $
++ * $Id: pair_content.c,v 1.25 2024/12/07 22:45:15 tom Exp $
+  */
+ 
+ #define NEED_TIME_H
+@@ -181,7 +181,7 @@
+ 	my_color_t fg;
+ 	my_color_t bg;
+ 	if (PairContent(pair, &fg, &bg) == OK) {
+-	    if (expected != 0) {
++	    if (expected != NULL) {
+ 		if (fg != expected[pair].fg)
+ 		    success = FALSE;
+ 		if (bg != expected[pair].bg)
+Index: test/picsmap.c
+Prereq:  1.152 
+--- ncurses-6.5-20241130+/test/picsmap.c	2024-11-30 21:39:57.000000000 +0000
++++ ncurses-6.5-20241207/test/picsmap.c	2024-12-07 22:48:03.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: picsmap.c,v 1.152 2024/11/30 21:39:57 tom Exp $
++ * $Id: picsmap.c,v 1.153 2024/12/07 22:48:03 tom Exp $
+  *
+  * Author: Thomas E. Dickey
+  *
+@@ -109,7 +109,7 @@
+ static void warning(const char *fmt, ...) GCC_PRINTFLIKE(1, 2);
+ static int gather_c_values(int);
+ 
+-static FILE *logfp = 0;
++static FILE *logfp = NULL;
+ static double aspect_ratio = 0.6;
+ static bool in_curses = FALSE;
+ static bool debugging = FALSE;
+@@ -138,7 +138,7 @@
+ static void
+ logmsg(const char *fmt, ...)
+ {
+-    if (logfp != 0) {
++    if (logfp != NULL) {
+ 	va_list ap;
+ 	va_start(ap, fmt);
+ 	vfprintf(logfp, fmt, ap);
+@@ -151,7 +151,7 @@
+ static void
+ logmsg2(const char *fmt, ...)
+ {
+-    if (logfp != 0) {
++    if (logfp != NULL) {
+ 	va_list ap;
+ 	va_start(ap, fmt);
+ 	vfprintf(logfp, fmt, ap);
+@@ -163,7 +163,7 @@
+ static void
+ close_log(void)
+ {
+-    if (logfp != 0) {
++    if (logfp != NULL) {
+ 	logmsg("Allocations:");
+ 	logmsg("%8ld file", (long) how_much.file);
+ 	logmsg("%8ld name", (long) how_much.name);
+@@ -174,7 +174,7 @@
+ 	logmsg("%8ld cell", (long) how_much.cell);
+ 	logmsg("%8ld window", LINES * COLS * (long) sizeof(NCURSES_CH_T));
+ 	fclose(logfp);
+-	logfp = 0;
++	logfp = NULL;
+     }
+ }
+ 
+@@ -199,7 +199,7 @@
+ static void
+ warning(const char *fmt, ...)
+ {
+-    if (logfp != 0) {
++    if (logfp != NULL) {
+ 	va_list ap;
+ 	va_start(ap, fmt);
+ 	vfprintf(logfp, fmt, ap);
+@@ -219,7 +219,7 @@
+ static void
+ free_data(char **data)
+ {
+-    if (data != 0) {
++    if (data != NULL) {
+ 	free(data[0]);
+ 	free(data);
+     }
+@@ -228,12 +228,12 @@
+ static PICS_HEAD *
+ free_pics_head(PICS_HEAD * pics)
+ {
+-    if (pics != 0) {
++    if (pics != NULL) {
+ 	free(pics->fgcol);
+ 	free(pics->cells);
+ 	free(pics->name);
+ 	free(pics);
+-	pics = 0;
++	pics = NULL;
+     }
+     return pics;
+ }
+@@ -305,14 +305,14 @@
+     reading_ncols[next].count = 0;
+ 
+     check_c_values(__LINE__);
+-    if ((ft = tfind(I2P(next), &reading_ntree, compare_c_values)) != 0) {
++    if ((ft = tfind(I2P(next), &reading_ntree, compare_c_values)) != NULL) {
+ 	found = P2I(*ft);
+     } else {
+ 	if (reading_last + 2 >= reading_size) {
+ 	    int more = ((MAX(reading_last, reading_size) + 2) * 3) / 2;
+ 	    int last = reading_last + 1;
+ 	    FG_NODE *p = typeRealloc(FG_NODE, more, reading_ncols);
+-	    if (p == 0)
++	    if (p == NULL)
+ 		goto done;
+ 
+ 	    reading_size = more;
+@@ -323,7 +323,7 @@
+ 	}
+ 	++reading_last;
+ 	how_much.pair += sizeof(FG_NODE);
+-	if ((ft = tsearch(I2P(next), &reading_ntree, compare_c_values)) != 0) {
++	if ((ft = tsearch(I2P(next), &reading_ntree, compare_c_values)) != NULL) {
+ 	    found = P2I(*ft);
+ 	    if (found != next)
+ 		logmsg("OOPS expected slot %d, got %d", next, found);
+@@ -370,24 +370,24 @@
+ 
+     reading_last = 0;
+     reading_size = 0;
+-    reading_ncols = 0;
++    reading_ncols = NULL;
+ }
+ 
+ static void
+ dispose_c_values(void)
+ {
+ #if HAVE_TSEARCH
+-    if (reading_ntree != 0) {
++    if (reading_ntree != NULL) {
+ 	int n;
+ 	for (n = 0; n < reading_last; ++n) {
+ 	    tdelete(I2P(n), &reading_ntree, compare_c_values);
+ 	}
+-	reading_ntree = 0;
++	reading_ntree = NULL;
+     }
+ #endif
+-    if (reading_ncols != 0) {
++    if (reading_ncols != NULL) {
+ 	free(reading_ncols);
+-	reading_ncols = 0;
++	reading_ncols = NULL;
+     }
+     reading_last = 0;
+     reading_size = 0;
+@@ -413,7 +413,7 @@
+ static char **
+ read_file(const char *filename)
+ {
+-    char **result = 0;
++    char **result = NULL;
+     struct stat sb;
+ 
+     if (!quiet) {
+@@ -430,9 +430,9 @@
+ 	result = typeCalloc(char *, size + 1);
+ 	how_much.file += ((size + 1) * 2);
+ 
+-	if (blob != 0 && result != 0) {
++	if (blob != NULL && result != NULL) {
+ 	    FILE *fp = fopen(filename, "r");
+-	    if (fp != 0) {
++	    if (fp != NULL) {
+ 		logmsg("opened %s", filename);
+ 
+ 		if (fread(blob, sizeof(char), size, fp) == size) {
+@@ -457,7 +457,7 @@
+ 			    result[k++] = blob + j;
+ 			}
+ 		    }
+-		    result[k] = 0;
++		    result[k] = NULL;
+ 		    if (k && !binary) {
+ 			debugmsg2("[%5d] %s\n", k, result[k - 1]);
+ 		    }
+@@ -471,7 +471,7 @@
+ 	    debugmsg("...file is empty");
+ 	    free(blob);
+ 	    free(result);
+-	    result = 0;
++	    result = NULL;
+ 	} else if (binary) {
+ 	    debugmsg("...file is non-text");
+ 	}
+@@ -548,20 +548,20 @@
+ read_palette(const char *filename)
+ {
+     static const char *data_dir = DATA_DIR;
+-    char **result = 0;
++    char **result = NULL;
+     size_t last = strlen(filename);
+     size_t need = (strlen(data_dir) + 20 + last);
+     char *full_name = malloc(need);
+     char *s;
+     struct stat sb;
+ 
+-    if (full_name != 0) {
++    if (full_name != NULL) {
+ 	int tries;
+ 	for (tries = 0; tries < 8; ++tries) {
+ 
+ 	    *(s = full_name) = '\0';
+ 	    if (tries & 1) {
+-		if (strchr(filename, '/') == 0) {
++		if (strchr(filename, '/') == NULL) {
+ 		    _nc_SPRINTF(full_name, _nc_SLIMIT(need) "%s/", data_dir);
+ 		} else {
+ 		    continue;
+@@ -582,7 +582,7 @@
+ 		    if (*t == '-') {
+ 			if (sscanf(t, "-%d%c", &num, &chr) == 2 &&
+ 			    chr == 'c' &&
+-			    (tc = strchr(t, chr)) != 0 &&
++			    (tc = strchr(t, chr)) != NULL &&
+ 			    !(strncmp) (tc, "color", 5)) {
+ 			    found = 1;
+ 			}
+@@ -622,7 +622,7 @@
+ static void
+ init_palette(const char *palette_file)
+ {
+-    if (palette_file != 0) {
++    if (palette_file != NULL) {
+ 	char **data = read_palette(palette_file);
+ 
+ 	all_colors = typeMalloc(RGB_DATA, (unsigned) COLORS);
+@@ -641,12 +641,12 @@
+ #else
+ 	memset(all_colors, 0, sizeof(RGB_DATA) * (size_t) COLORS);
+ #endif
+-	if (data != 0) {
++	if (data != NULL) {
+ 	    int n;
+ 	    int red, green, blue;
+ 	    int scale = MaxSCALE;
+ 	    int c;
+-	    for (n = 0; data[n] != 0; ++n) {
++	    for (n = 0; data[n] != NULL; ++n) {
+ 		if (sscanf(data[n], "scale:%d", &c) == 1) {
+ 		    scale = c;
+ 		} else if (sscanf(data[n], "%d:%d %d %d",
+@@ -677,9 +677,9 @@
+ 	}
+ 
+ 	if ((power2 != COLORS) || ((shift % 3) != 0)) {
+-	    if (all_colors == 0) {
++	    if (all_colors == NULL) {
+ 		init_palette(getenv("TERM"));
+-		if (all_colors == 0) {
++		if (all_colors == NULL) {
+ 		    giveup("With %d colors, you need a palette-file", COLORS);
+ 		}
+ 	    }
+@@ -704,7 +704,7 @@
+ 	int green = (value & 0x00ff00) >> 8;
+ 	int blue  = (value & 0x0000ff) >> 0;
+ 
+-	if (all_colors != 0) {
++	if (all_colors != NULL) {
+ #define Diff2(n,m) ((m) - all_colors[n].m) * ((m) - all_colors[n].m)
+ #define Diff2S(n) Diff2(n,red) + Diff2(n,green) + Diff2(n,blue)
+ 	    int d2 = Diff2S(0);
+@@ -823,7 +823,7 @@
+ 		limit = -1;
+ 		ip = va_arg(ap, int *);
+ 		lv = strtol(source, &cp, ch == 'd' ? 10 : 16);
+-		if (cp != 0 && cp != source) {
++		if (cp != NULL && cp != source) {
+ 		    *ip = (int) lv;
+ 		    source = cp;
+ 		} else {
+@@ -834,13 +834,13 @@
+ 		/* floating point for pixels... */
+ 		fp = va_arg(ap, float *);
+ 		lv = strtol(source, &cp, 10);
+-		if (cp == 0 || cp == source)
++		if (cp == NULL || cp == source)
+ 		    goto finish;
+ 		*fp = (float) lv;
+ 		source = cp;
+ 		if (*source == '.') {
+ 		    lv = strtol(++source, &cp, 10);
+-		    if (cp == 0 || cp == source)
++		    if (cp == NULL || cp == source)
+ 			goto finish;
+ 		    {
+ 			float scale = 1.0f;
+@@ -907,7 +907,7 @@
+ 	    s += cpp;
+ 	    while (*s++ == '\t') {
+ 		char *t;
+-		for (t = arg2; (*s != '\0') && strchr("\t\"", *s) == 0;) {
++		for (t = arg2; (*s != '\0') && strchr("\t\"", *s) == NULL;) {
+ 		    if (*s == ' ') {
+ 			s = skip_cs(s);
+ 			break;
+@@ -915,7 +915,7 @@
+ 		    *t++ = *s++;
+ 		    *t = '\0';
+ 		}
+-		for (t = arg3; (*s != '\0') && strchr("\t\"", *s) == 0;) {
++		for (t = arg3; (*s != '\0') && strchr("\t\"", *s) == NULL;) {
+ 		    *t++ = *s++;
+ 		    *t = '\0';
+ 		}
+@@ -938,14 +938,14 @@
+     char *s, *t;
+     size_t item = 0;
+     size_t need;
+-    RGB_NAME *result = 0;
++    RGB_NAME *result = NULL;
+ 
+-    for (need = 0; data[need] != 0; ++need) ;
++    for (need = 0; data[need] != NULL; ++need) ;
+ 
+     result = typeCalloc(RGB_NAME, need + 2);
+     how_much.name += (sizeof(RGB_NAME) * (need + 2));
+ 
+-    for (n = 0; data[n] != 0; ++n) {
++    for (n = 0; data[n] != NULL; ++n) {
+ 	if (strlen(t = data[n]) >= sizeof(buf) - 1)
+ 	    continue;
+ 	t = strcpy(buf, t);
+@@ -993,10 +993,10 @@
+ static RGB_NAME *
+ lookup_rgb(const char *name)
+ {
+-    RGB_NAME *result = 0;
+-    if (rgb_table != 0) {
++    RGB_NAME *result = NULL;
++    if (rgb_table != NULL) {
+ 	int n;
+-	for (n = 0; rgb_table[n].name != 0; ++n) {
++	for (n = 0; rgb_table[n].name != NULL; ++n) {
+ 	    if (!CaselessCmp(name, rgb_table[n].name)) {
+ 		result = &rgb_table[n];
+ 		break;
+@@ -1029,7 +1029,7 @@
+     gather_c_values(0);
+     gather_c_values(0xffffff);
+ 
+-    for (n = 0; data[n] != 0; ++n) {
++    for (n = 0; data[n] != NULL; ++n) {
+ 	if (strlen(s = data[n]) >= sizeof(buf) - 1)
+ 	    continue;
+ 	switch (state) {
+@@ -1037,10 +1037,10 @@
+ 	case 1:
+ 	case 2:
+ 	    if (sscanf(s, "#define %1024s %d%c", buf, &num, &ch) >= 2) {
+-		if ((t = strstr(buf, "_width")) != 0) {
++		if ((t = strstr(buf, "_width")) != NULL) {
+ 		    state |= 1;
+ 		    result->wide = (short) bytes_of(num);
+-		} else if ((t = strstr(buf, "_height")) != 0) {
++		} else if ((t = strstr(buf, "_height")) != NULL) {
+ 		    state |= 2;
+ 		    result->high = (short) num;
+ 		} else {
+@@ -1067,7 +1067,7 @@
+ 		result->cells = typeCalloc(PICS_CELL, cells);
+ 		how_much.cell += (sizeof(PICS_CELL) * cells);
+ 
+-		if ((s = strchr(s, L_CURLY)) == 0)
++		if ((s = strchr(s, L_CURLY)) == NULL)
+ 		    break;
+ 		++s;
+ 	    } else {
+@@ -1147,14 +1147,14 @@
+     char arg1[BUFSIZ];
+     char arg2[BUFSIZ];
+     char arg3[BUFSIZ];
+-    char **list = 0;
++    char **list = NULL;
+ 
+     debugmsg("called parse_xpm");
+ 
+     result = typeCalloc(PICS_HEAD, 1);
+     how_much.head += sizeof(PICS_HEAD);
+ 
+-    for (n = 0; data[n] != 0; ++n) {
++    for (n = 0; data[n] != NULL; ++n) {
+ 	if (strlen(s = data[n]) >= sizeof(buf) - 1)
+ 	    continue;
+ 	s = strcpy(buf, s);
+@@ -1201,7 +1201,7 @@
+ 	    num_colors++;
+ 	    free(list[reading_last]);
+ 	    list[reading_last] = strdup(arg1);
+-	    if ((by_name = lookup_rgb(arg3)) != 0) {
++	    if ((by_name = lookup_rgb(arg3)) != NULL) {
+ 		found = gather_c_values(by_name->value);
+ 	    } else if (*arg3 == '#') {
+ 		char *rgb = arg3 + 1;
+@@ -1227,7 +1227,7 @@
+ 	    if (num_colors >= result->colors) {
+ 		finish_c_values(result);
+ 		state = 4;
+-		if (list[0] == 0)
++		if (list[0] == NULL)
+ 		    list[0] = strdup("\033");
+ 	    }
+ 	    break;
+@@ -1239,7 +1239,7 @@
+ 
+ 		    /* FIXME - factor out */
+ 		    for (c = 0; c < result->colors; ++c) {
+-			if (list[c] == 0) {
++			if (list[c] == NULL) {
+ 			    /* should not happen... */
+ 			    continue;
+ 			}
+@@ -1314,8 +1314,8 @@
+     result = typeCalloc(PICS_HEAD, 1);
+     how_much.head += sizeof(PICS_HEAD);
+ 
+-    if ((pp = popen(cmd, "r")) != 0) {
+-	if (fgets(buffer, sizeof(buffer), pp) != 0) {
++    if ((pp = popen(cmd, "r")) != NULL) {
++	if (fgets(buffer, sizeof(buffer), pp) != NULL) {
+ 	    size_t n = strlen(filename);
+ 	    debugmsg2("...read %s", buffer);
+ 	    if (strlen(buffer) > n &&
+@@ -1341,12 +1341,12 @@
+ 	_nc_STRCAT(cmd, " 2>/dev/null", need);
+ 
+     logmsg("...opening pipe to %s", cmd);
+-    if ((pp = popen(cmd, "r")) != 0) {
++    if ((pp = popen(cmd, "r")) != NULL) {
+ 	int count = 0;
+ 	int col = 0;
+ 	int row = 0;
+ 	int len = 0;
+-	while (fgets(buffer, sizeof(buffer), pp) != 0) {
++	while (fgets(buffer, sizeof(buffer), pp) != NULL) {
+ 	    debugmsg2("[%5d] %s", count + 1, buffer);
+ 	    if (strlen(buffer) > 160) {		/* 80 columns would be enough */
+ 		okay = FALSE;
+@@ -1380,7 +1380,7 @@
+ 		const char *t = s;
+ 		bool matched = FALSE;
+ 
+-		if (s != 0) {
++		if (s != NULL) {
+ 		    /* after the "#RGB", there are differences - just ignore */
+ 		    while (*s != '\0' && !isspace(UChar(*s)))
+ 			++s;
+@@ -1472,11 +1472,11 @@
+ read_picture(const char *filename, char **data)
+ {
+     PICS_HEAD *pics;
+-    if ((pics = parse_xbm(data)) == 0) {
++    if ((pics = parse_xbm(data)) == NULL) {
+ 	dispose_c_values();
+-	if ((pics = parse_xpm(data)) == 0) {
++	if ((pics = parse_xpm(data)) == NULL) {
+ 	    dispose_c_values();
+-	    if ((pics = parse_img(filename)) == 0) {
++	    if ((pics = parse_img(filename)) == NULL) {
+ 		dispose_c_values();
+ 		free_data(data);
+ 		warning("unexpected file-format for \"%s\"", filename);
+@@ -1638,7 +1638,7 @@
+     int total;
+     char buffer[256];
+ 
+-    if (logfp == 0)
++    if (logfp == NULL)
+ 	return;
+ 
+     qsort(pics->fgcol, (size_t) pics->colors, sizeof(FG_NODE), compare_fg_counts);
+@@ -1729,7 +1729,7 @@
+     int ch;
+     int opt_d = FALSE;
+     char ignore_ch;
+-    const char *palette_path = 0;
++    const char *palette_path = NULL;
+     const char *rgb_path = RGB_PATH;
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON "a:dLF:p:qr:s:x:")) != -1) {
+@@ -1751,7 +1751,7 @@
+ 	    debugging = TRUE;
+ 	    break;
+ 	case 'F':
+-	    if ((logfp = fopen(optarg, "a")) == 0)
++	    if ((logfp = fopen(optarg, "a")) == NULL)
+ 		failed(optarg);
+ 	    break;
+ 	case 'p':
+@@ -1810,11 +1810,11 @@
+ 	    PICS_HEAD *pics;
+ 	    char **data = read_file(argv[n]);
+ 
+-	    if (data == 0) {
++	    if (data == NULL) {
+ 		warning("cannot read \"%s\"", argv[n]);
+ 		continue;
+ 	    }
+-	    if ((pics = read_picture(argv[n], data)) != 0) {
++	    if ((pics = read_picture(argv[n], data)) != NULL) {
+ 		if (in_curses) {
+ 		    show_picture(pics);
+ 		} else {
+Index: test/popup_msg.c
+Prereq:  1.14 
+--- ncurses-6.5-20241130+/test/popup_msg.c	2024-10-26 19:28:11.000000000 +0000
++++ ncurses-6.5-20241207/test/popup_msg.c	2024-12-07 22:22:51.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: popup_msg.c,v 1.14 2024/10/26 19:28:11 Stas.Sergeev Exp $
++ * $Id: popup_msg.c,v 1.15 2024/12/07 22:22:51 tom Exp $
+  *
+  * Show a multi-line message in a window which may extend beyond the screen.
+  *
+@@ -78,16 +78,16 @@
+     int last_y;
+     int ch = ERR;
+ 
+-    for (n = 0; msg[n] != 0; ++n) {
++    for (n = 0; msg[n] != NULL; ++n) {
+ 	int check = (int) strlen(msg[n]);
+ 	if (width < check)
+ 	    width = check;
+     }
+     length = n;
+ 
+-    if ((help = newwin(high, wide, y0, x0)) == 0)
++    if ((help = newwin(high, wide, y0, x0)) == NULL)
+ 	return;
+-    if ((data = newpad(length + 2, width + 1)) == 0) {
++    if ((data = newpad(length + 2, width + 1)) == NULL) {
+ 	delwin(help);
+ 	return;
+     }
+Index: test/railroad.c
+Prereq:  1.27 
+--- ncurses-6.5-20241130+/test/railroad.c	2024-10-05 19:26:24.000000000 +0000
++++ ncurses-6.5-20241207/test/railroad.c	2024-12-07 22:48:03.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey - 2000
+  *
+- * $Id: railroad.c,v 1.27 2024/10/05 19:26:24 tom Exp $
++ * $Id: railroad.c,v 1.28 2024/12/07 22:48:03 tom Exp $
+  *
+  * A simple demo of the termcap interface.
+  */
+@@ -83,13 +83,13 @@
+ static void
+ Backup(void)
+ {
+-    tputs(backup != 0 ? backup : "\b", 1, outc);
++    tputs(backup != NULL ? backup : "\b", 1, outc);
+ }
+ 
+ static void
+ MyShowCursor(int flag)
+ {
+-    if (startC != 0 && finisC != 0) {
++    if (startC != NULL && finisC != NULL) {
+ 	tputs(flag ? startC : finisC, 1, outc);
+     }
+ }
+@@ -97,7 +97,7 @@
+ static void
+ StandOut(int flag)
+ {
+-    if (startS != 0 && finisS != 0) {
++    if (startS != NULL && finisS != NULL) {
+ 	tputs(flag ? startS : finisS, 1, outc);
+     }
+ }
+@@ -105,7 +105,7 @@
+ static void
+ Underline(int flag)
+ {
+-    if (startU != 0 && finisU != 0) {
++    if (startU != NULL && finisU != NULL) {
+ 	tputs(flag ? startU : finisU, 1, outc);
+     }
+ }
+@@ -116,7 +116,7 @@
+     const char *base = string;
+     int first, last;
+ 
+-    if (moveit != 0) {
++    if (moveit != NULL) {
+ 	tputs(tgoto(moveit, 0, height - 1), 1, outc);
+ 	tputs(wipeit, 1, outc);
+     }
+@@ -124,7 +124,7 @@
+     while (*string != 0) {
+ 	int ch = *string;
+ 	if (ch != ' ') {
+-	    if (moveit != 0) {
++	    if (moveit != NULL) {
+ 		for (first = length - 2; first >= (string - base); first--) {
+ 		    if (first < length - 1) {
+ 			tputs(tgoto(moveit, first + 1, height - 1), 1, outc);
+@@ -152,7 +152,7 @@
+ 		    Underline(0);
+ 		}
+ 	    }
+-	    if (moveit != 0)
++	    if (moveit != NULL)
+ 		Backup();
+ 	}
+ 	StandOut(1);
+@@ -161,7 +161,7 @@
+ 	fflush(stdout);
+ 	string++;
+     }
+-    if (moveit != 0)
++    if (moveit != NULL)
+ 	tputs(wipeit, 1, outc);
+     putchar('\n');
+ }
+@@ -190,7 +190,7 @@
+     char area[1024], *ap = area;
+     int z;
+ 
+-    if (name == 0)
++    if (name == NULL)
+ #ifdef EXP_WIN32_DRIVER
+ 	name = "ms-terminal";
+ #else
+@@ -205,12 +205,12 @@
+ 	length = tgetnum("co");
+ 	moveit = tgetstr("cm", &ap);
+ 
+-	if (wipeit == 0
+-	    || moveit == 0
++	if (wipeit == NULL
++	    || moveit == NULL
+ 	    || height <= 0
+ 	    || length <= 0) {
+-	    wipeit = 0;
+-	    moveit = 0;
++	    wipeit = NULL;
++	    moveit = NULL;
+ 	    height = 0;
+ 	    length = 0;
+ 	}
+@@ -276,7 +276,7 @@
+     } else {
+ 	static char world[] = "Hello World";
+ 	static char *hello[] =
+-	{world, 0};
++	{world, NULL};
+ 	railroad(hello);
+     }
+     ExitProgram(EXIT_SUCCESS);
+Index: test/rain.c
+Prereq:  1.62 
+--- ncurses-6.5-20241130+/test/rain.c	2024-10-06 21:09:00.000000000 +0000
++++ ncurses-6.5-20241207/test/rain.c	2024-12-07 22:46:42.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: rain.c,v 1.62 2024/10/06 21:09:00 tom Exp $
++ * $Id: rain.c,v 1.63 2024/12/07 22:46:42 tom Exp $
+  */
+ #include 
+ #include 
+@@ -335,7 +335,7 @@
+ 	" s          do single-step",
+ 	"     undo single-step",
+ 	"",
+-	0
++	NULL
+     };
+ 
+     bool done = FALSE;
+Index: test/redraw.c
+Prereq:  1.18 
+--- ncurses-6.5-20241130+/test/redraw.c	2024-10-06 21:17:54.000000000 +0000
++++ ncurses-6.5-20241207/test/redraw.c	2024-12-07 22:46:42.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: redraw.c,v 1.18 2024/10/06 21:17:54 tom Exp $
++ * $Id: redraw.c,v 1.19 2024/12/07 22:46:42 tom Exp $
+  *
+  * Demonstrate the redrawwin() and wredrawln() functions.
+  * Thomas Dickey - 2006/11/4
+@@ -76,7 +76,7 @@
+ 	"",
+ 	"Other control characters are added to the screen in printable form.",
+ 	"Other printable characters are added to the screen as is.",
+-	0
++	NULL
+     };
+ 
+     WINDOW *win1;
+Index: test/savescreen.c
+Prereq:  1.66 
+--- ncurses-6.5-20241130+/test/savescreen.c	2024-11-30 18:48:40.000000000 +0000
++++ ncurses-6.5-20241207/test/savescreen.c	2024-12-07 22:46:42.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: savescreen.c,v 1.66 2024/11/30 18:48:40 tom Exp $
++ * $Id: savescreen.c,v 1.67 2024/12/07 22:46:42 tom Exp $
+  *
+  * Demonstrate save/restore functions from the curses library.
+  * Thomas Dickey - 2007/7/14
+@@ -89,7 +89,7 @@
+     if (!keep_dumps) {
+ 	int n;
+ 
+-	for (n = 0; files[n] != 0; ++n) {
++	for (n = 0; files[n] != NULL; ++n) {
+ 	    unlink(files[n]);
+ 	}
+     }
+@@ -173,7 +173,7 @@
+     NCURSES_CONST char *filename = files[which];
+     bool dumped = FALSE;
+ 
+-    if (filename != 0) {
++    if (filename != NULL) {
+ 	dumped = TRUE;
+ 	show_what(color, ++which, last);
+ 	if (scr_dump(filename) == ERR) {
+@@ -230,7 +230,7 @@
+ 	"   a           toggle between '#' and graphic symbol for drawing",
+ 	"   c           change color drawn by line to next in palette",
+ 	"   h,j,k,l or arrows to move around the screen, drawing",
+-	0
++	NULL
+     };
+     popup_msg(stdscr, msgs);
+ }
+@@ -247,7 +247,7 @@
+ 	"   q           quit",
+ 	"        load the next screen",
+ 	"    load the previous screen",
+-	0
++	NULL
+     };
+     popup_msg(stdscr, msgs);
+ }
+@@ -286,7 +286,7 @@
+     bool replaying = FALSE;
+     bool done = FALSE;
+     char **files;
+-    NCURSES_CONST char *fill_by = 0;
++    NCURSES_CONST char *fill_by = NULL;
+ #if USE_WIDEC_SUPPORT
+     cchar_t mycc;
+     static const wchar_t mywc[2] =
+@@ -366,7 +366,7 @@
+ 	 * After that, use color pairs for constructing a test-pattern, e.g.,
+ 	 * imitating xterm's scripts.
+ 	 */
+-	if (fill_by == 0) {
++	if (fill_by == NULL) {
+ 	    if (COLORS <= 256) {
+ 		for (n = 0; n < COLORS; ++n)
+ 		    init_pair((short) (n + MAX_ANSI), (short) n, (short) n);
+@@ -407,7 +407,7 @@
+ 	    }
+ #endif
+ 	}
+-	if ((fill_by == 0) && !replaying) {
++	if ((fill_by == NULL) && !replaying) {
+ #if USE_WIDEC_SUPPORT
+ 	    int cube = 0;
+ #endif
+@@ -484,9 +484,9 @@
+ 	}
+     }
+ 
+-    if (fill_by != 0) {
++    if (fill_by != NULL) {
+ 	FILE *fp = fopen(fill_by, "r");
+-	if (fp != 0) {
++	if (fp != NULL) {
+ 	    bool filled = FALSE;
+ 	    move(1, 0);
+ 	    while ((ch = fgetc(fp)) != EOF) {
+@@ -577,7 +577,7 @@
+ 	int x = 0;
+ 	int color = 0;
+ 	int altchars = 0;
+-	bool dirty = use_colors || (fill_by != 0);
++	bool dirty = use_colors || (fill_by != NULL);
+ 
+ 	while (!done) {
+ 	    switch (get_command(color, which, last)) {
+Index: test/sp_tinfo.c
+Prereq:  1.29 
+--- ncurses-6.5-20241130+/test/sp_tinfo.c	2023-06-24 14:14:56.000000000 +0000
++++ ncurses-6.5-20241207/test/sp_tinfo.c	2024-12-07 23:03:07.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2019-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2017 Free Software Foundation, Inc.                            *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: sp_tinfo.c,v 1.29 2023/06/24 14:14:56 tom Exp $
++ * $Id: sp_tinfo.c,v 1.30 2024/12/07 23:03:07 tom Exp $
+  *
+  * TOTO: add option for non-sp-funcs interface
+  */
+@@ -138,7 +138,7 @@
+ show_string(MYDATA * data, const char *name, const char *value)
+ {
+     fprintf(data->fp, " %s = ", name);
+-    if (value == 0) {
++    if (value == NULL) {
+ 	fprintf(data->fp, "(missing)");
+     } else if (value == (char *) -1) {
+ 	fprintf(data->fp, "(canceled)");
+@@ -218,7 +218,7 @@
+     define_key_sp(sp, my_text, my_code);
+     has_key_sp(sp, 0);
+     key_defined_sp(sp, my_text);
+-    if ((s = keybound_sp(sp, my_code, 0)) != 0)
++    if ((s = keybound_sp(sp, my_code, 0)) != NULL)
+ 	free(s);
+ #endif
+     keyname_sp(sp, '?');
+@@ -240,7 +240,7 @@
+     typeahead_sp(sp, FALSE);	/* waddch */
+     use_env_sp(sp, FALSE);	/* newterm */
+     use_tioctl_sp(sp, FALSE);	/* newterm */
+-    intrflush_sp(sp, 0, 0);	/* wgetch */
++    intrflush_sp(sp, NULL, 0);	/* wgetch */
+     flushinp_sp(sp);		/* waddch */
+     halfdelay_sp(sp, 5);	/* wgetch */
+ 
+Index: test/tclock.c
+Prereq:  1.49 
+--- ncurses-6.5-20241130+/test/tclock.c	2024-10-05 18:47:56.000000000 +0000
++++ ncurses-6.5-20241207/test/tclock.c	2024-12-07 22:46:42.000000000 +0000
+@@ -1,4 +1,4 @@
+-/* $Id: tclock.c,v 1.49 2024/10/05 18:47:56 tom Exp $ */
++/* $Id: tclock.c,v 1.50 2024/12/07 22:46:42 tom Exp $ */
+ 
+ #define NEED_TIME_H
+ #include 
+@@ -220,7 +220,7 @@
+     for (;;) {
+ 	napms(100);
+ 
+-	tim = time(0);
++	tim = time(NULL);
+ 	t = localtime(&tim);
+ 
+ 	hours = (t->tm_hour + (t->tm_min / 60.0));
+Index: test/test_add_wchstr.c
+Prereq:  1.35 
+--- ncurses-6.5-20241130+/test/test_add_wchstr.c	2024-10-05 19:26:24.000000000 +0000
++++ ncurses-6.5-20241207/test/test_add_wchstr.c	2024-12-07 22:41:11.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_add_wchstr.c,v 1.35 2024/10/05 19:26:24 tom Exp $
++ * $Id: test_add_wchstr.c,v 1.36 2024/12/07 22:41:11 tom Exp $
+  *
+  * Demonstrate the waddwchstr() and wadd_wch functions.
+  * Thomas Dickey - 2009/9/12
+@@ -88,7 +88,7 @@
+ static size_t temp_length;
+ 
+ #define TempBuffer(source_len, source_cast) \
+-    if (source != 0) { \
++    if (source != NULL) { \
+ 	const char *temp; \
+ 	size_t need = source_len + 1; \
+ 	wchar_t have[2]; \
+@@ -107,7 +107,7 @@
+ 	    if (!pass_ctls \
+ 	     && have[0] != 0 \
+ 	     && have[0] < 256 \
+-	     && (temp = unctrl((chtype) have[0])) != 0 \
++	     && (temp = unctrl((chtype) have[0])) != NULL \
+ 	     && strlen(temp) > 1) { \
+ 		while (*temp != '\0') { \
+ 		    have[0] = (wchar_t) *temp++; \
+@@ -117,9 +117,9 @@
+ 		setcchar(&temp_buffer[n++], have, A_NORMAL, 0, NULL); \
+ 	    } \
+ 	} while (have[0] != 0); \
+-    } else if (temp_buffer != 0) { \
++    } else if (temp_buffer != NULL) { \
+ 	free(temp_buffer); \
+-	temp_buffer = 0; \
++	temp_buffer = NULL; \
+ 	temp_length = 0; \
+     } \
+     return temp_buffer;
+@@ -136,7 +136,7 @@
+ 	for (n = 0; source[n] != 0; ++n) {
+ 	    const char *s;
+ 
+-	    if ((source[n] < 256) && (s = unctrl((chtype) source[n])) != 0) {
++	    if ((source[n] < 256) && (s = unctrl((chtype) source[n])) != NULL) {
+ 		adjust += (strlen(s) - 1);
+ 	    }
+ 	}
+@@ -310,9 +310,9 @@
+     int row2, col2;
+     int length;
+     wchar_t buffer[BUFSIZ];
+-    WINDOW *look = 0;
+-    WINDOW *work = 0;
+-    WINDOW *show = 0;
++    WINDOW *look = NULL;
++    WINDOW *work = NULL;
++    WINDOW *show = NULL;
+     int margin = (2 * MY_TABSIZE) - 1;
+     Options option = (Options) ((unsigned) (m_opt
+ 					    ? oMove
+Index: test/test_addchstr.c
+Prereq:  1.30 
+--- ncurses-6.5-20241130+/test/test_addchstr.c	2024-10-05 19:26:24.000000000 +0000
++++ ncurses-6.5-20241207/test/test_addchstr.c	2024-12-07 22:41:11.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_addchstr.c,v 1.30 2024/10/05 19:26:24 tom Exp $
++ * $Id: test_addchstr.c,v 1.31 2024/12/07 22:41:11 tom Exp $
+  *
+  * Demonstrate the waddchstr() and waddch functions.
+  * Thomas Dickey - 2009/9/12
+@@ -82,7 +82,7 @@
+ 
+ 	for (n = 0; n < result; ++n) {
+ 	    const char *s = unctrl(UChar(source[n]));
+-	    if (s != 0) {
++	    if (s != NULL) {
+ 		adjust += (strlen(s) - 1);
+ 	    }
+ 	}
+@@ -94,7 +94,7 @@
+ static chtype *
+ ChStr(const char *source)
+ {
+-    if (source != 0) {
++    if (source != NULL) {
+ 	size_t need = ChLen(source) + 1;
+ 	int n = 0;
+ 
+@@ -107,7 +107,7 @@
+ 	do {
+ 	    const char *s;
+ 	    chtype ch = UChar(*source++);
+-	    if (!pass_ctls && (s = unctrl(ch)) != 0) {
++	    if (!pass_ctls && (s = unctrl(ch)) != NULL) {
+ 		while (*s != '\0') {
+ 		    temp_buffer[n++] = UChar(*s++);
+ 		}
+@@ -116,9 +116,9 @@
+ 	    }
+ 	} while (source[0] != 0);
+ 	temp_buffer[n] = 0;
+-    } else if (temp_buffer != 0) {
++    } else if (temp_buffer != NULL) {
+ 	free(temp_buffer);
+-	temp_buffer = 0;
++	temp_buffer = NULL;
+ 	temp_length = 0;
+     }
+     return temp_buffer;
+@@ -218,9 +218,9 @@
+     int row2, col2;
+     int length;
+     char buffer[BUFSIZ];
+-    WINDOW *look = 0;
+-    WINDOW *work = 0;
+-    WINDOW *show = 0;
++    WINDOW *look = NULL;
++    WINDOW *work = NULL;
++    WINDOW *show = NULL;
+     int margin = (2 * MY_TABSIZE) - 1;
+     Options option = (Options) ((unsigned) (m_opt
+ 					    ? oMove
+Index: test/test_addstr.c
+Prereq:  1.21 
+--- ncurses-6.5-20241130+/test/test_addstr.c	2024-10-05 19:27:33.000000000 +0000
++++ ncurses-6.5-20241207/test/test_addstr.c	2024-12-07 22:41:11.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_addstr.c,v 1.21 2024/10/05 19:27:33 tom Exp $
++ * $Id: test_addstr.c,v 1.22 2024/12/07 22:41:11 tom Exp $
+  *
+  * Demonstrate the waddstr() and waddch functions.
+  * Thomas Dickey - 2009/9/12
+@@ -140,9 +140,9 @@
+     int row2, col2;
+     int length;
+     char buffer[BUFSIZ];
+-    WINDOW *look = 0;
+-    WINDOW *work = 0;
+-    WINDOW *show = 0;
++    WINDOW *look = NULL;
++    WINDOW *work = NULL;
++    WINDOW *show = NULL;
+     int margin = (2 * MY_TABSIZE) - 1;
+     Options option = (Options) ((unsigned) (m_opt
+ 					    ? oMove
+Index: test/test_addwstr.c
+Prereq:  1.23 
+--- ncurses-6.5-20241130+/test/test_addwstr.c	2024-10-05 19:27:33.000000000 +0000
++++ ncurses-6.5-20241207/test/test_addwstr.c	2024-12-07 22:41:11.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_addwstr.c,v 1.23 2024/10/05 19:27:33 tom Exp $
++ * $Id: test_addwstr.c,v 1.24 2024/12/07 22:41:11 tom Exp $
+  *
+  * Demonstrate the waddwstr() and wadd_wch functions.
+  * Thomas Dickey - 2009/9/12
+@@ -233,9 +233,9 @@
+     int row2, col2;
+     int length;
+     wchar_t buffer[BUFSIZ];
+-    WINDOW *look = 0;
+-    WINDOW *work = 0;
+-    WINDOW *show = 0;
++    WINDOW *look = NULL;
++    WINDOW *work = NULL;
++    WINDOW *show = NULL;
+     int margin = (2 * MY_TABSIZE) - 1;
+     Options option = (Options) ((unsigned) (m_opt
+ 					    ? oMove
+Index: test/test_arrays.c
+Prereq:  1.14 
+--- ncurses-6.5-20241130+/test/test_arrays.c	2024-11-30 17:00:55.000000000 +0000
++++ ncurses-6.5-20241207/test/test_arrays.c	2024-12-07 22:46:42.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_arrays.c,v 1.14 2024/11/30 17:00:55 tom Exp $
++ * $Id: test_arrays.c,v 1.15 2024/12/07 22:46:42 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -66,7 +66,7 @@
+     int n;
+ 
+     printf("%s:\n", name);
+-    for (n = 0; list[n] != 0; ++n) {
++    for (n = 0; list[n] != NULL; ++n) {
+ 	printf("%5d:%s\n", n, list[n]);
+     }
+ }
+Index: test/test_get_wstr.c
+Prereq:  1.16 
+--- ncurses-6.5-20241130+/test/test_get_wstr.c	2024-10-06 23:15:10.000000000 +0000
++++ ncurses-6.5-20241207/test/test_get_wstr.c	2024-12-07 22:46:42.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_get_wstr.c,v 1.16 2024/10/06 23:15:10 tom Exp $
++ * $Id: test_get_wstr.c,v 1.17 2024/12/07 22:46:42 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -158,10 +158,10 @@
+ 	"",
+ 	"  w              - recur to subwindow",
+ 	"  ?,         - show help-screen",
+-	0
++	NULL
+     };
+-    WINDOW *txtbox = 0;
+-    WINDOW *txtwin = 0;
++    WINDOW *txtbox = NULL;
++    WINDOW *txtwin = NULL;
+     FILE *fp;
+     int ch;
+     int rc;
+@@ -172,7 +172,7 @@
+     int actual;
+     wint_t buffer[MAX_COLS];
+ 
+-    if (argv[level] == 0) {
++    if (argv[level] == NULL) {
+ 	beep();
+ 	return FALSE;
+     }
+@@ -200,7 +200,7 @@
+     txt_x = 0;
+     wmove(txtwin, txt_y, txt_x);
+ 
+-    if ((fp = fopen(argv[level], "r")) != 0) {
++    if ((fp = fopen(argv[level], "r")) != NULL) {
+ 	while ((ch = fgetc(fp)) != EOF) {
+ 	    if (waddch(txtwin, UChar(ch)) != OK) {
+ 		break;
+@@ -250,7 +250,7 @@
+ 
+ 	case 'w':
+ 	    recursive_test(level + 1, argv, strwin);
+-	    if (txtbox != 0) {
++	    if (txtbox != NULL) {
+ 		touchwin(txtbox);
+ 		wnoutrefresh(txtbox);
+ 	    } else {
+Index: test/test_getstr.c
+Prereq:  1.19 
+--- ncurses-6.5-20241130+/test/test_getstr.c	2024-10-06 22:36:46.000000000 +0000
++++ ncurses-6.5-20241207/test/test_getstr.c	2024-12-07 22:46:42.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_getstr.c,v 1.19 2024/10/06 22:36:46 tom Exp $
++ * $Id: test_getstr.c,v 1.20 2024/12/07 22:46:42 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -165,10 +165,10 @@
+ 	"",
+ 	"  w              - recur to subwindow",
+ 	"  ?,         - show help-screen",
+-	0
++	NULL
+     };
+-    WINDOW *txtbox = 0;
+-    WINDOW *txtwin = 0;
++    WINDOW *txtbox = NULL;
++    WINDOW *txtwin = NULL;
+     FILE *fp;
+     int ch;
+     int rc;
+@@ -180,7 +180,7 @@
+ 
+     char buffer[MAX_COLS];
+ 
+-    if (argv[level] == 0) {
++    if (argv[level] == NULL) {
+ 	beep();
+ 	return FALSE;
+     }
+@@ -208,7 +208,7 @@
+     txt_x = 0;
+     wmove(txtwin, txt_y, txt_x);
+ 
+-    if ((fp = fopen(argv[level], "r")) != 0) {
++    if ((fp = fopen(argv[level], "r")) != NULL) {
+ 	while ((ch = fgetc(fp)) != EOF) {
+ 	    if (waddch(txtwin, UChar(ch)) != OK) {
+ 		break;
+@@ -258,7 +258,7 @@
+ 
+ 	case 'w':
+ 	    recursive_test(level + 1, argv, strwin);
+-	    if (txtbox != 0) {
++	    if (txtbox != NULL) {
+ 		touchwin(txtbox);
+ 		wnoutrefresh(txtbox);
+ 	    } else {
+Index: test/test_instr.c
+Prereq:  1.15 
+--- ncurses-6.5-20241130+/test/test_instr.c	2024-10-06 21:11:54.000000000 +0000
++++ ncurses-6.5-20241207/test/test_instr.c	2024-12-07 22:46:42.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_instr.c,v 1.15 2024/10/06 21:11:54 tom Exp $
++ * $Id: test_instr.c,v 1.16 2024/12/07 22:46:42 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -83,7 +83,7 @@
+ 	,"w     opens new window on the next filename."
+ 	,"q     quits the current file/window."
+ 	,"?     shows this help-window"
+-	,0
++	,NULL
+     };
+ 
+     popup_msg(win, msgs);
+@@ -92,8 +92,8 @@
+ static int
+ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
+ {
+-    WINDOW *txtbox = 0;
+-    WINDOW *txtwin = 0;
++    WINDOW *txtbox = NULL;
++    WINDOW *txtwin = NULL;
+     FILE *fp;
+     int ch;
+     int txt_x = 0, txt_y = 0;
+@@ -102,7 +102,7 @@
+ 
+     char buffer[MAX_COLS];
+ 
+-    if (argv[level] == 0) {
++    if (argv[level] == NULL) {
+ 	beep();
+ 	return FALSE;
+     }
+@@ -131,7 +131,7 @@
+     txt_x = 0;
+     wmove(txtwin, txt_y, txt_x);
+ 
+-    if ((fp = fopen(argv[level], "r")) != 0) {
++    if ((fp = fopen(argv[level], "r")) != NULL) {
+ 	while ((ch = fgetc(fp)) != EOF) {
+ 	    if (waddch(txtwin, UChar(ch)) != OK) {
+ 		break;
+@@ -174,7 +174,7 @@
+ 	    break;
+ 	case 'w':
+ 	    recursive_test(level + 1, argv, chrwin, strwin);
+-	    if (txtbox != 0) {
++	    if (txtbox != NULL) {
+ 		touchwin(txtbox);
+ 		wnoutrefresh(txtbox);
+ 	    } else {
+Index: test/test_inwstr.c
+Prereq:  1.11 
+--- ncurses-6.5-20241130+/test/test_inwstr.c	2024-10-06 23:15:38.000000000 +0000
++++ ncurses-6.5-20241207/test/test_inwstr.c	2024-12-07 22:46:42.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_inwstr.c,v 1.11 2024/10/06 23:15:38 tom Exp $
++ * $Id: test_inwstr.c,v 1.12 2024/12/07 22:46:42 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -86,7 +86,7 @@
+ 	,"w     opens new window on the next filename."
+ 	,"q     quits the current file/window."
+ 	,"?     shows this help-window"
+-	,0
++	,NULL
+     };
+ 
+     popup_msg(win, msgs);
+@@ -95,8 +95,8 @@
+ static int
+ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
+ {
+-    WINDOW *txtbox = 0;
+-    WINDOW *txtwin = 0;
++    WINDOW *txtbox = NULL;
++    WINDOW *txtwin = NULL;
+     FILE *fp;
+     int ch;
+     int txt_x = 0, txt_y = 0;
+@@ -104,7 +104,7 @@
+     int limit = getmaxx(strwin) - 5;
+     wchar_t buffer[MAX_COLS];
+ 
+-    if (argv[level] == 0) {
++    if (argv[level] == NULL) {
+ 	beep();
+ 	return FALSE;
+     }
+@@ -132,7 +132,7 @@
+     txt_x = 0;
+     wmove(txtwin, txt_y, txt_x);
+ 
+-    if ((fp = fopen(argv[level], "r")) != 0) {
++    if ((fp = fopen(argv[level], "r")) != NULL) {
+ 	while ((ch = fgetc(fp)) != EOF) {
+ 	    if (waddch(txtwin, UChar(ch)) != OK) {
+ 		break;
+@@ -175,7 +175,7 @@
+ 	    break;
+ 	case 'w':
+ 	    recursive_test(level + 1, argv, chrwin, strwin);
+-	    if (txtbox != 0) {
++	    if (txtbox != NULL) {
+ 		touchwin(txtbox);
+ 		wnoutrefresh(txtbox);
+ 	    } else {
+Index: test/test_opaque.c
+Prereq:  1.17 
+--- ncurses-6.5-20241130+/test/test_opaque.c	2024-11-23 19:10:23.000000000 +0000
++++ ncurses-6.5-20241207/test/test_opaque.c	2024-12-07 22:46:42.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_opaque.c,v 1.17 2024/11/23 19:10:23 tom Exp $
++ * $Id: test_opaque.c,v 1.18 2024/12/07 22:46:42 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -269,8 +269,8 @@
+ static int
+ test_opaque(int level, char **argv, WINDOW *stswin)
+ {
+-    WINDOW *txtbox = 0;
+-    WINDOW *txtwin = 0;
++    WINDOW *txtbox = NULL;
++    WINDOW *txtwin = NULL;
+     FILE *fp;
+     int ch;
+     int txt_x = 0, txt_y = 0;
+@@ -278,7 +278,7 @@
+     bool in_status = FALSE;
+     int active = 0;
+ 
+-    if (argv[level] == 0) {
++    if (argv[level] == NULL) {
+ 	beep();
+ 	return FALSE;
+     }
+@@ -306,7 +306,7 @@
+     txt_x = 0;
+     wmove(txtwin, txt_y, txt_x);
+ 
+-    if ((fp = fopen(argv[level], "r")) != 0) {
++    if ((fp = fopen(argv[level], "r")) != NULL) {
+ 	while ((ch = fgetc(fp)) != EOF) {
+ 	    if (waddch(txtwin, UChar(ch)) != OK) {
+ 		break;
+@@ -393,7 +393,7 @@
+ 		break;
+ 	    case 'w':
+ 		test_opaque(level + 1, argv, stswin);
+-		if (txtbox != 0) {
++		if (txtbox != NULL) {
+ 		    touchwin(txtbox);
+ 		    wnoutrefresh(txtbox);
+ 		} else {
+Index: test/test_setupterm.c
+Prereq:  1.17 
+--- ncurses-6.5-20241130+/test/test_setupterm.c	2023-06-24 14:19:52.000000000 +0000
++++ ncurses-6.5-20241207/test/test_setupterm.c	2024-12-07 23:03:07.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2020-2023,2024 Thomas E. Dickey                                *
+  * Copyright 2015,2016 Free Software Foundation, Inc.                       *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: test_setupterm.c,v 1.17 2023/06/24 14:19:52 tom Exp $
++ * $Id: test_setupterm.c,v 1.18 2024/12/07 23:03:07 tom Exp $
+  *
+  * A simple demo of setupterm/restartterm.
+  */
+@@ -98,9 +98,9 @@
+     int expect_rc = -1;
+     int expect_err = -1;
+ 
+-    if (name == 0)
++    if (name == NULL)
+ 	name = getenv("TERM");
+-    if (name == 0)
++    if (name == NULL)
+ 	name = "?";
+ 
+     switch (*name) {
+@@ -244,7 +244,7 @@
+     }
+ 
+     if (a_opt) {
+-	static char predef[][9] =
++	static char predef[][12] =
+ 	{"vt100", "dumb", "lpr", "unknown", "none-such"};
+ 	if (optind < argc) {
+ 	    usage(FALSE);
+Index: test/test_sgr.c
+Prereq:  1.25 
+--- ncurses-6.5-20241130+/test/test_sgr.c	2024-10-06 21:05:50.000000000 +0000
++++ ncurses-6.5-20241207/test/test_sgr.c	2024-12-07 22:48:21.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: test_sgr.c,v 1.25 2024/10/06 21:05:50 tom Exp $
++ * $Id: test_sgr.c,v 1.26 2024/12/07 22:48:21 tom Exp $
+  *
+  * A simple demo of the sgr/sgr0 terminal capabilities.
+  */
+@@ -106,10 +106,10 @@
+ static char *
+ next_dbitem(void)
+ {
+-    char *result = 0;
++    char *result = NULL;
+ 
+     if (db_list) {
+-	if ((result = db_list[db_item]) == 0) {
++	if ((result = db_list[db_item]) == NULL) {
+ 	    db_item = 0;
+ 	    result = db_list[0];
+ 	} else {
+@@ -129,7 +129,7 @@
+ 	for (n = 0; db_list[n]; ++n)
+ 	    free(db_list[n]);
+ 	free(db_list);
+-	db_list = 0;
++	db_list = NULL;
+     }
+ }
+ #endif
+@@ -230,20 +230,20 @@
+ 				  BITS2P(7),
+ 				  BITS2P(8),
+ 				  BITS2P(9));
+-	    if (values[count] != 0) {
++	    if (values[count] != NULL) {
+ 		values[count] = strdup(values[count]);
+ 	    }
+ 	}
+ 	for (count = 0; count < MAXSGR; ++count) {
+-	    if (values[count] != 0) {
++	    if (values[count] != NULL) {
+ 		for (j = count + 1; j < MAXSGR; ++j) {
+-		    if (values[j] == 0)
++		    if (values[j] == NULL)
+ 			continue;
+ 		    if (strcmp(values[count], values[j]))
+ 			continue;
+ 		    if (one_bit(count, j)) {
+ 			free(values[j]);
+-			values[j] = 0;
++			values[j] = NULL;
+ 		    }
+ 		}
+ 	    }
+@@ -253,7 +253,7 @@
+ 	    for (count = 0; count < MAXSGR; ++count) {
+ 		if ((count & mask) != 0)
+ 		    continue;
+-		if (values[count] != 0 && values[count + mask] != 0) {
++		if (values[count] != NULL && values[count + mask] != NULL) {
+ 		    mask = 0;
+ 		    break;
+ 		}
+@@ -272,14 +272,14 @@
+ 	    }
+ 	}
+ 	for (count = 0; count < MAXSGR; ++count) {
+-	    if (values[count] != 0) {
++	    if (values[count] != NULL) {
+ 		bool found = FALSE;
+ 		if ((repeat & MASK_SMSO) != 0
+ 		    && (count & MASK_SMSO) != 0) {
+ 		    found = TRUE;
+ 		} else {
+ 		    for (j = 0; j < count; ++j) {
+-			if (values[j] != 0 && !strcmp(values[j], values[count])) {
++			if (values[j] != NULL && !strcmp(values[j], values[count])) {
+ 			    if ((repeat & MASK_SMSO) != 0
+ 				&& (j & MASK_SMSO) != 0
+ 				&& (count & reason) != 0) {
+@@ -366,7 +366,7 @@
+ 	for (n = optind; n < argc; ++n) {
+ 	    brute_force(argv[n]);
+ 	}
+-    } else if ((name = getenv("TERM")) != 0) {
++    } else if ((name = getenv("TERM")) != NULL) {
+ 	brute_force(name);
+     } else {
+ 	static const char dumb[] = "dumb";
+Index: test/test_tparm.c
+Prereq:  1.42 
+--- ncurses-6.5-20241130+/test/test_tparm.c	2024-10-06 20:50:27.000000000 +0000
++++ ncurses-6.5-20241207/test/test_tparm.c	2024-12-07 23:13:34.000000000 +0000
+@@ -29,7 +29,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: test_tparm.c,v 1.42 2024/10/06 20:50:27 tom Exp $
++ * $Id: test_tparm.c,v 1.43 2024/12/07 23:13:34 tom Exp $
+  *
+  * Exercise tparm/tiparm, either for all possible capabilities with fixed
+  * parameters, or one capability with specific combinations of parameters.
+@@ -52,7 +52,7 @@
+ 	    if (length + 2 >= limit) { \
+ 		limit *= 2; \
+ 		array = typeRealloc(char *, limit, array); \
+-		if (array == 0) { \
++		if (array == NULL) { \
+ 		    failed("no memory: " #array); \
+ 		} \
+ 	    }
+@@ -109,9 +109,9 @@
+ static int
+ isNumeric(NCURSES_CONST char *source)
+ {
+-    char *next = 0;
++    char *next = NULL;
+     long value = strtol(source, &next, 0);
+-    int result = (next == 0 || next == source || *next != '\0') ? 0 : 1;
++    int result = (next == NULL || next == source || *next != '\0') ? 0 : 1;
+     (void) value;
+     return result;
+ }
+@@ -121,10 +121,10 @@
+ {
+     int code = 1;
+     if (VALID_STRING(value)) {
+-	if (strstr(value, "%p") == 0
+-	    && strstr(value, "%d") == 0
+-	    && strstr(value, "%s") == 0
+-	    && (!p_opt || strstr(value, "$<") == 0)) {
++	if (strstr(value, "%p") == NULL
++	    && strstr(value, "%d") == NULL
++	    && strstr(value, "%s") == NULL
++	    && (!p_opt || strstr(value, "$<") == NULL)) {
+ 	    if (v_opt > 2)
+ 		printf("? %s noparams\n", name);
+ 	    code = 0;
+@@ -334,7 +334,7 @@
+     }
+     if (v_opt > 1) {
+ 	int n;
+-	printf(".. %3d =", result != 0 ? (int) strlen(result) : -1);
++	printf(".. %3d =", result != NULL ? (int) strlen(result) : -1);
+ 	for (n = 0; n < nparam; ++n) {
+ 	    if (use_strings[n]) {
+ 		if (number[n]) {
+@@ -398,7 +398,7 @@
+     int r_run, t_run, n_run;
+     char *old_term = getenv("TERM");
+     int r_opt = 1;
+-    char *t_opt = 0;
++    char *t_opt = NULL;
+ 
+     int std_caps = 0;		/* predefine items in all_caps[] */
+     int len_caps = 0;		/* cur # of items in all_caps[] */
+@@ -423,7 +423,10 @@
+     char **str_parms = typeCalloc(char *, max_parms);
+     long use_parms = 1;
+ 
+-    if (all_caps == 0 || all_terms == 0 || num_parms == 0 || str_parms == 0)
++    if (all_caps == NULL
++	|| all_terms == NULL
++	|| num_parms == NULL
++	|| str_parms == NULL)
+ 	failed("no memory");
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON "T:aipr:sv")) != -1) {
+@@ -479,7 +482,7 @@
+      */
+     while (optind < argc) {
+ 	if (isNumeric(argv[optind])) {
+-	    char *dummy = 0;
++	    char *dummy = NULL;
+ 	    long value = strtol(argv[optind], &dummy, 0);
+ 	    num_parms[len_parms] = (int) value;
+ 	}
+@@ -504,11 +507,11 @@
+      * Make a list of values for $TERM.  Accept "-" for standard input to
+      * simplify scripting a check of the whole database.
+      */
+-    old_term = strdup((old_term == 0) ? "unknown" : old_term);
+-    if (t_opt != 0) {
++    old_term = strdup((old_term == NULL) ? "unknown" : old_term);
++    if (t_opt != NULL) {
+ 	if (!strcmp(t_opt, "-")) {
+ 	    char buffer[BUFSIZ];
+-	    while (fgets(buffer, sizeof(buffer) - 1, stdin) != 0) {
++	    while (fgets(buffer, sizeof(buffer) - 1, stdin) != NULL) {
+ 		char *s = buffer;
+ 		char *t;
+ 		while (isspace(UChar(s[0])))
+@@ -520,7 +523,7 @@
+ 		if (len_terms + 2 >= max_terms) {
+ 		    max_terms *= 2;
+ 		    all_terms = typeRealloc(char *, max_terms, all_terms);
+-		    if (all_terms == 0)
++		    if (all_terms == NULL)
+ 			failed("no memory: all_terms");
+ 		}
+ 		all_terms[len_terms++] = s;
+@@ -528,12 +531,12 @@
+ 	} else {
+ 	    char *s = t_opt;
+ 	    NCURSES_CONST char *t;
+-	    while ((t = strtok(s, ",")) != 0) {
+-		s = 0;
++	    while ((t = strtok(s, ",")) != NULL) {
++		s = NULL;
+ 		if (len_terms + 2 >= max_terms) {
+ 		    max_terms *= 2;
+ 		    all_terms = typeRealloc(char *, max_terms, all_terms);
+-		    if (all_terms == 0)
++		    if (all_terms == NULL)
+ 			failed("no memory: all_terms");
+ 		}
+ 		all_terms[len_terms++] = strdup(t);
+@@ -542,7 +545,7 @@
+     } else {
+ 	all_terms[len_terms++] = strdup(old_term);
+     }
+-    all_terms[len_terms] = 0;
++    all_terms[len_terms] = NULL;
+     if (v_opt) {
+ 	printf("%d term%s:\n", PLURAL(len_terms));
+ 	if (v_opt > 3) {
+@@ -561,7 +564,7 @@
+      */
+     if (len_caps == 0) {
+ #if defined(HAVE_CURSES_DATA_BOOLNAMES) || defined(DECL_CURSES_DATA_BOOLNAMES)
+-	for (n = 0; strnames[n] != 0; ++n) {
++	for (n = 0; strnames[n] != NULL; ++n) {
+ 	    GrowArray(all_caps, max_caps, len_caps);
+ 	    all_caps[len_caps++] = strdup(strnames[n]);
+ 	}
+@@ -571,7 +574,7 @@
+ #endif
+     }
+     std_caps = len_caps;
+-    all_caps[len_caps] = 0;
++    all_caps[len_caps] = NULL;
+     if (v_opt) {
+ 	printf("%d name%s%s\n", PLURAL(len_caps), COLONS(len_caps));
+ 	if (v_opt > 3) {
+@@ -664,7 +667,7 @@
+ 		free(all_caps[n]);
+ 	    }
+ #endif
+-	    if (cur_term != 0) {
++	    if (cur_term != NULL) {
+ 		del_curterm(cur_term);
+ 	    } else {
+ 		printf("? no cur_term\n");
+Index: test/test_vid_puts.c
+Prereq:  1.17 
+--- ncurses-6.5-20241130+/test/test_vid_puts.c	2022-12-10 22:28:50.000000000 +0000
++++ ncurses-6.5-20241207/test/test_vid_puts.c	2024-12-07 23:03:19.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2021,2022 Thomas E. Dickey                                *
++ * Copyright 2020-2022,2024 Thomas E. Dickey                                *
+  * Copyright 2013-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_vid_puts.c,v 1.17 2022/12/10 22:28:50 tom Exp $
++ * $Id: test_vid_puts.c,v 1.18 2024/12/07 23:03:19 tom Exp $
+  *
+  * Demonstrate the vid_puts and vid_attr functions.
+  * Thomas Dickey - 2013/01/12
+@@ -63,7 +63,7 @@
+ static void
+ cleanup(void)
+ {
+-    if (cur_term != 0) {
++    if (cur_term != NULL) {
+ 	outs(exit_attribute_mode);
+ 	if (!outs(orig_colors))
+ 	    outs(orig_pair);
+Index: test/test_vidputs.c
+Prereq:  1.16 
+--- ncurses-6.5-20241130+/test/test_vidputs.c	2024-10-06 21:17:54.000000000 +0000
++++ ncurses-6.5-20241207/test/test_vidputs.c	2024-12-07 22:53:07.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_vidputs.c,v 1.16 2024/10/06 21:17:54 tom Exp $
++ * $Id: test_vidputs.c,v 1.17 2024/12/07 22:53:07 tom Exp $
+  *
+  * Demonstrate the vidputs and vidattr functions.
+  * Thomas Dickey - 2013/01/12
+@@ -63,7 +63,7 @@
+ static void
+ cleanup(void)
+ {
+-    if (cur_term != 0) {
++    if (cur_term != NULL) {
+ 	outs(exit_attribute_mode);
+ 	if (!outs(orig_colors))
+ 	    outs(orig_pair);
+Index: test/testcurs.c
+Prereq:  1.59 
+--- ncurses-6.5-20241130+/test/testcurs.c	2024-10-05 19:17:19.000000000 +0000
++++ ncurses-6.5-20241207/test/testcurs.c	2024-12-07 22:53:07.000000000 +0000
+@@ -6,7 +6,7 @@
+  *  wrs(5/28/93) -- modified to be consistent (perform identically) with either
+  *                  PDCurses or under Unix System V, R4
+  *
+- * $Id: testcurs.c,v 1.59 2024/10/05 19:17:19 tom Exp $
++ * $Id: testcurs.c,v 1.60 2024/12/07 22:53:07 tom Exp $
+  */
+ 
+ #include 
+@@ -488,14 +488,14 @@
+     *Buffer = 0;
+     scanw("%s", Buffer);
+ 
+-    if (TIGETSTR("cvvis", "vs") != 0) {
++    if (TIGETSTR("cvvis", "vs") != NULL) {
+ 	wclear(win);
+ 	curs_set(2);
+ 	MvWAddStr(win, 1, 1, "The cursor should appear as a block (visible)");
+ 	Continue(win);
+     }
+ 
+-    if (TIGETSTR("civis", "vi") != 0) {
++    if (TIGETSTR("civis", "vi") != NULL) {
+ 	wclear(win);
+ 	curs_set(0);
+ 	MvWAddStr(win, 1, 1,
+@@ -503,7 +503,7 @@
+ 	Continue(win);
+     }
+ 
+-    if (TIGETSTR("cnorm", "ve") != 0) {
++    if (TIGETSTR("cnorm", "ve") != NULL) {
+ 	wclear(win);
+ 	curs_set(1);
+ 	MvWAddStr(win, 1, 1, "The cursor should be an underline (normal)");
+@@ -592,7 +592,7 @@
+ {
+     WINDOW *pad;
+ 
+-    if ((pad = newpad(50, 100)) != 0) {
++    if ((pad = newpad(50, 100)) != NULL) {
+ 	WINDOW *spad;
+ 
+ 	wattron(pad, A_REVERSE);
+@@ -609,7 +609,7 @@
+ 	raw();
+ 	wgetch(pad);
+ 
+-	if ((spad = subpad(pad, 12, 25, 6, 52)) != 0) {
++	if ((spad = subpad(pad, 12, 25, 6, 52)) != NULL) {
+ 	    MvWAddStr(spad, 2, 2, "This is a new subpad");
+ 	    box(spad, 0, 0);
+ 	    delwin(spad);
+Index: test/view.c
+Prereq:  1.149 
+--- ncurses-6.5-20241130+/test/view.c	2024-11-30 18:15:06.000000000 +0000
++++ ncurses-6.5-20241207/test/view.c	2024-12-07 22:53:07.000000000 +0000
+@@ -52,7 +52,7 @@
+  * scroll operation worked, and the refresh() code only had to do a
+  * partial repaint.
+  *
+- * $Id: view.c,v 1.149 2024/11/30 18:15:06 tom Exp $
++ * $Id: view.c,v 1.150 2024/12/07 22:53:07 tom Exp $
+  */
+ 
+ #include 
+@@ -114,7 +114,7 @@
+ {
+     endwin();
+ #if NO_LEAKS
+-    if (vec_lines != 0) {
++    if (vec_lines != NULL) {
+ 	int n;
+ 	for (n = 0; n < num_lines; ++n) {
+ 	    free(vec_lines[n]);
+@@ -172,7 +172,7 @@
+ 	move(i, 0);
+ 	printw("%*d:", digits, actual);
+ 	clrtoeol();
+-	if ((s = lptr[i - 1]) == 0) {
++	if ((s = lptr[i - 1]) == NULL) {
+ 	    continue;
+ 	}
+ 	len = ch_len(s);
+@@ -233,7 +233,7 @@
+     size_t len;
+     struct stat sb;
+     char *my_blob;
+-    char **my_vec = 0;
++    char **my_vec = NULL;
+     WINDOW *my_win;
+ 
+     if (stat(filename, &sb) != 0
+@@ -245,11 +245,11 @@
+ 	failed("input is empty");
+     }
+ 
+-    if ((fp = fopen(filename, "r")) == 0) {
++    if ((fp = fopen(filename, "r")) == NULL) {
+ 	failed("cannot open input-file");
+     }
+ 
+-    if ((my_blob = malloc((size_t) sb.st_size + 1)) == 0) {
++    if ((my_blob = malloc((size_t) sb.st_size + 1)) == NULL) {
+ 	failed("cannot allocate memory for input-file");
+     }
+ 
+@@ -280,7 +280,7 @@
+ 	}
+ 	num_lines = k;
+ 	if (pass == 0) {
+-	    if (((my_vec = typeCalloc(char *, (size_t) k + 2)) == 0)) {
++	    if (((my_vec = typeCalloc(char *, (size_t) k + 2)) == NULL)) {
+ 		failed("cannot allocate line-vector #1");
+ 	    }
+ 	} else {
+@@ -307,11 +307,11 @@
+     }
+     width = (width + 1) * 5;
+     my_win = newwin(2, width, 0, 0);
+-    if (my_win == 0) {
++    if (my_win == NULL) {
+ 	failed("cannot allocate temporary window");
+     }
+ 
+-    if ((vec_lines = typeCalloc(NCURSES_CH_T *, (size_t) num_lines + 2)) == 0) {
++    if ((vec_lines = typeCalloc(NCURSES_CH_T *, (size_t) num_lines + 2)) == NULL) {
+ 	failed("cannot allocate line-vector #2");
+     }
+ 
+@@ -358,7 +358,7 @@
+ 	    x = width - 1;
+ 	wmove(my_win, 0, 0);
+ 	/* "x + 1" works with standard curses; some implementations are buggy */
+-	if ((vec_lines[k] = typeCalloc(NCURSES_CH_T, x + width + 1)) == 0) {
++	if ((vec_lines[k] = typeCalloc(NCURSES_CH_T, x + width + 1)) == NULL) {
+ 	    failed("cannot allocate line-vector #3");
+ 	}
+ #if USE_WIDEC_SUPPORT
+@@ -427,7 +427,7 @@
+ 	"  s              - use entered count for halfdelay() parameter",
+ 	"                 - if no entered count, stop nodelay()",
+ 	"          - begin nodelay()",
+-	0
++	NULL
+     };
+ 
+     int ch;
+@@ -462,9 +462,9 @@
+ #ifdef TRACE
+ 	case 'D':
+ 	    {
+-		char *next = 0;
++		char *next = NULL;
+ 		int tvalue = (int) strtol(optarg, &next, 0);
+-		if (tvalue < 0 || (next != 0 && *next != 0))
++		if (tvalue < 0 || (next != NULL && *next != 0))
+ 		    usage(FALSE);
+ 		curses_trace((unsigned) tvalue);
+ 	    }
+Index: test/xmas.c
+Prereq:  1.39 
+--- ncurses-6.5-20241130+/test/xmas.c	2022-12-04 00:40:11.000000000 +0000
++++ ncurses-6.5-20241207/test/xmas.c	2024-12-07 22:53:07.000000000 +0000
+@@ -92,7 +92,7 @@
+ /******************************************************************************/
+ 
+ /*
+- * $Id: xmas.c,v 1.39 2022/12/04 00:40:11 tom Exp $
++ * $Id: xmas.c,v 1.40 2024/12/07 22:53:07 tom Exp $
+  */
+ #include 
+ 
+@@ -140,7 +140,7 @@
+ {
+     if (has_colors()) {
+ 	int n = (int) (color + 1);
+-	if (my_pairs == 0)
++	if (my_pairs == NULL)
+ 	    my_pairs = typeCalloc(bool, (size_t) (COLORS + 1));
+ 	if (!my_pairs[n]) {
+ 	    init_pair((short) n, (short) color, (short) my_bg);
+@@ -638,7 +638,7 @@
+     stop_curses();
+ 
+ #if NO_LEAKS
+-    if (my_pairs != 0)
++    if (my_pairs != NULL)
+ 	free(my_pairs);
+ #endif
+ 
+@@ -715,44 +715,44 @@
+     }
+     curs_set(0);
+ 
+-    if ((treescrn = newwin(16, 27, 3, 53)) == 0 ||
+-	(treescrn2 = newwin(16, 27, 3, 53)) == 0 ||
+-	(treescrn3 = newwin(16, 27, 3, 53)) == 0 ||
+-	(treescrn4 = newwin(16, 27, 3, 53)) == 0 ||
+-	(treescrn5 = newwin(16, 27, 3, 53)) == 0 ||
+-	(treescrn6 = newwin(16, 27, 3, 53)) == 0 ||
+-	(treescrn7 = newwin(16, 27, 3, 53)) == 0 ||
+-	(treescrn8 = newwin(16, 27, 3, 53)) == 0 ||
+-
+-	(dotdeer0 = newwin(3, 71, 0, 8)) == 0 ||
+-
+-	(stardeer0 = newwin(4, 56, 0, 8)) == 0 ||
+-
+-	(lildeer0 = newwin(7, 53, 0, 8)) == 0 ||
+-	(lildeer1 = newwin(2, 4, 0, 0)) == 0 ||
+-	(lildeer2 = newwin(2, 4, 0, 0)) == 0 ||
+-	(lildeer3 = newwin(2, 4, 0, 0)) == 0 ||
+-
+-	(middeer0 = newwin(15, 42, 0, 8)) == 0 ||
+-	(middeer1 = newwin(3, 7, 0, 0)) == 0 ||
+-	(middeer2 = newwin(3, 7, 0, 0)) == 0 ||
+-	(middeer3 = newwin(3, 7, 0, 0)) == 0 ||
+-
+-	(bigdeer0 = newwin(10, 23, 0, 0)) == 0 ||
+-	(bigdeer1 = newwin(10, 23, 0, 0)) == 0 ||
+-	(bigdeer2 = newwin(10, 23, 0, 0)) == 0 ||
+-	(bigdeer3 = newwin(10, 23, 0, 0)) == 0 ||
+-	(bigdeer4 = newwin(10, 23, 0, 0)) == 0 ||
+-
+-	(lookdeer0 = newwin(10, 25, 0, 0)) == 0 ||
+-	(lookdeer1 = newwin(10, 25, 0, 0)) == 0 ||
+-	(lookdeer2 = newwin(10, 25, 0, 0)) == 0 ||
+-	(lookdeer3 = newwin(10, 25, 0, 0)) == 0 ||
+-	(lookdeer4 = newwin(10, 25, 0, 0)) == 0 ||
++    if ((treescrn = newwin(16, 27, 3, 53)) == NULL ||
++	(treescrn2 = newwin(16, 27, 3, 53)) == NULL ||
++	(treescrn3 = newwin(16, 27, 3, 53)) == NULL ||
++	(treescrn4 = newwin(16, 27, 3, 53)) == NULL ||
++	(treescrn5 = newwin(16, 27, 3, 53)) == NULL ||
++	(treescrn6 = newwin(16, 27, 3, 53)) == NULL ||
++	(treescrn7 = newwin(16, 27, 3, 53)) == NULL ||
++	(treescrn8 = newwin(16, 27, 3, 53)) == NULL ||
++
++	(dotdeer0 = newwin(3, 71, 0, 8)) == NULL ||
++
++	(stardeer0 = newwin(4, 56, 0, 8)) == NULL ||
++
++	(lildeer0 = newwin(7, 53, 0, 8)) == NULL ||
++	(lildeer1 = newwin(2, 4, 0, 0)) == NULL ||
++	(lildeer2 = newwin(2, 4, 0, 0)) == NULL ||
++	(lildeer3 = newwin(2, 4, 0, 0)) == NULL ||
++
++	(middeer0 = newwin(15, 42, 0, 8)) == NULL ||
++	(middeer1 = newwin(3, 7, 0, 0)) == NULL ||
++	(middeer2 = newwin(3, 7, 0, 0)) == NULL ||
++	(middeer3 = newwin(3, 7, 0, 0)) == NULL ||
++
++	(bigdeer0 = newwin(10, 23, 0, 0)) == NULL ||
++	(bigdeer1 = newwin(10, 23, 0, 0)) == NULL ||
++	(bigdeer2 = newwin(10, 23, 0, 0)) == NULL ||
++	(bigdeer3 = newwin(10, 23, 0, 0)) == NULL ||
++	(bigdeer4 = newwin(10, 23, 0, 0)) == NULL ||
++
++	(lookdeer0 = newwin(10, 25, 0, 0)) == NULL ||
++	(lookdeer1 = newwin(10, 25, 0, 0)) == NULL ||
++	(lookdeer2 = newwin(10, 25, 0, 0)) == NULL ||
++	(lookdeer3 = newwin(10, 25, 0, 0)) == NULL ||
++	(lookdeer4 = newwin(10, 25, 0, 0)) == NULL ||
+ 
+-	(w_holiday = newwin(1, 26, 3, 27)) == 0 ||
++	(w_holiday = newwin(1, 26, 3, 27)) == NULL ||
+ 
+-	(w_del_msg = newwin(1, 19, 23, 60)) == 0) {
++	(w_del_msg = newwin(1, 19, 23, 60)) == NULL) {
+ 	stop_curses();
+ 	fprintf(stderr, "Cannot create windows - screen too small\n");
+ 	ExitProgram(EXIT_FAILURE);
diff --git a/packages/ncurses/6.5/ncurses-6.5-20241214.patch b/packages/ncurses/6.5/ncurses-6.5-20241214.patch
new file mode 100644
index 0000000000..99ce15cc65
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20241214.patch
@@ -0,0 +1,14854 @@
+# ncurses 6.5 - patch 20241214 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20241214.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Dec 15 02:04:34 UTC 2024
+# ------------------------------------------------------------------------------
+# NEWS                             |    9 
+# VERSION                          |    2 
+# aclocal.m4                       |   93 
+# c++/cursesw.h                    |    5 
+# c++/etip.h.in                    |   12 
+# configure                        | 4024 +++++++++++++++++++------------------
+# configure.in                     |    8 
+# dist.mk                          |    4 
+# include/curses.h.in              |    6 
+# include/ncurses_defs             |   12 
+# ncurses/base/lib_beep.c          |    4 
+# ncurses/base/lib_color.c         |    4 
+# ncurses/base/lib_driver.c        |   10 
+# ncurses/base/lib_flash.c         |    6 
+# ncurses/base/lib_newwin.c        |    4 
+# ncurses/base/lib_restart.c       |    4 
+# ncurses/base/lib_set_term.c      |    4 
+# ncurses/build.priv.h             |    6 
+# ncurses/curses.priv.h            |    6 
+# ncurses/tinfo/MKcodes.awk        |    8 
+# ncurses/tinfo/MKnames.awk        |    8 
+# ncurses/tinfo/entries.c          |    4 
+# ncurses/tinfo/lib_acs.c          |    6 
+# ncurses/tinfo/lib_cur_term.c     |    4 
+# ncurses/tinfo/lib_data.c         |   12 
+# ncurses/tinfo/lib_napms.c        |    4 
+# ncurses/tinfo/lib_setup.c        |   28 
+# ncurses/tinfo/lib_termcap.c      |    6 
+# ncurses/tinfo/lib_ttyflags.c     |    4 
+# ncurses/tinfo/tinfo_driver.c     |   50 
+# ncurses/tty/lib_mvcur.c          |    4 
+# ncurses/tty/lib_tstp.c           |    2 
+# 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 
+# 39 files changed, 2320 insertions(+), 2065 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4209 
+--- ncurses-6.5-20241207+/NEWS	2024-12-07 23:51:39.000000000 +0000
++++ ncurses-6.5-20241214/NEWS	2024-12-14 20:03:39.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4209 2024/12/07 23:51:39 tom Exp $
++-- $Id: NEWS,v 1.4212 2024/12/14 20:03:39 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.
+ 
++20241214
++	+ avoid redefining bool in curses.h if the platform already supports
++	  that type (cf: 20241123).
++	+ move include  from etip.h.in to cursesw.hh, to work around
++	  breakage in Apple's port of ncurses.
++	+ strict compiler-warning fixes for upcoming gcc15
++
+ 20241207
+ 	+ strict compiler-warning fixes for upcoming gcc15
+ 
+Index: VERSION
+--- ncurses-6.5-20241207+/VERSION	2024-12-07 11:51:44.000000000 +0000
++++ ncurses-6.5-20241214/VERSION	2024-12-14 11:34:56.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20241207
++5:0:10	6.5	20241214
+Index: aclocal.m4
+Prereq:  1.1091 
+--- ncurses-6.5-20241207+/aclocal.m4	2024-11-30 19:41:19.000000000 +0000
++++ ncurses-6.5-20241214/aclocal.m4	2024-12-14 21:33:29.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1091 2024/11/30 19:41:19 tom Exp $
++dnl $Id: aclocal.m4,v 1.1096 2024/12/14 21:33:29 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -645,7 +645,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_BOOL_SIZE version: 20 updated: 2023/02/18 17:41:25
++dnl CF_BOOL_SIZE version: 21 updated: 2024/12/14 16:09:34
+ dnl ------------
+ dnl Test for the size of 'bool' in the configured C++ compiler (e.g., a type).
+ dnl Don't bother looking for bool.h, since it has been deprecated.
+@@ -702,7 +702,7 @@
+ int main(void)
+ {
+ 	FILE *fp = fopen("cf_test.out", "w");
+-	if (fp != 0) {
++	if (fp != NULL) {
+ 		bool x = true;
+ 		if ((bool)(-x) >= 0)
+ 			fputs("unsigned ", fp);
+@@ -741,7 +741,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_BUILD_CC version: 13 updated: 2024/06/22 13:42:22
++dnl CF_BUILD_CC version: 14 updated: 2024/12/14 11:58:01
+ dnl -----------
+ dnl If we're cross-compiling, allow the user to override the tools and their
+ dnl options.  The configure script is oriented toward identifying the host
+@@ -819,7 +819,7 @@
+ 	AC_TRY_RUN([#include 
+ 		int main(int argc, char *argv[])
+ 		{
+-			${cf_cv_main_return:-return}(argc < 0 || argv == 0 || argv[0] == 0);
++			${cf_cv_main_return:-return}(argc < 0 || argv == (void*)0 || argv[0] == (void*)0);
+ 		}
+ 	],
+ 		cf_ok_build_cc=yes,
+@@ -1196,7 +1196,7 @@
+ ])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CHECK_GETENV version: 4 updated: 2023/12/03 10:18:09
++dnl CF_CHECK_GETENV version: 5 updated: 2024/12/14 16:09:34
+ dnl ---------------
+ dnl Check if repeated getenv calls return the same pointer, e.g., it does not
+ dnl discard the previous pointer when returning a new one.
+@@ -1248,7 +1248,7 @@
+ 	for (j = 0; environ[j]; ++j) {
+ 		mynames[j] = str_alloc(environ[j]);
+ 		equals = strchr(mynames[j], '=');
+-		if (equals != 0) {
++		if (equals != NULL) {
+ 			*equals++ = '\\0';
+ 			myvalues[j] = str_alloc(equals);
+ 		} else {
+@@ -1447,6 +1447,19 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_CHECK_TYPE2 version: 2 updated: 2024/12/14 16:33:06
++dnl --------------
++dnl CF_CHECK_TYPE version: 5 updated: 2024/12/14 16:09:34
++dnl -------------
++dnl Check if the given type can be declared via the given header.
++dnl $1 = the type to check
++dnl $2 = the header (i.e., not one of the default includes)
++AC_DEFUN([CF_CHECK_TYPE2],[
++	AC_CHECK_TYPES($1,,,[
++$ac_includes_default
++ifelse($2,,,[#include <$2>])])
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_CHECK_WCHAR_H version: 5 updated: 2023/12/03 09:21:34
+ dnl ----------------
+ dnl Check if wchar.h can be used, i.e., without defining _XOPEN_SOURCE_EXTENDED
+@@ -1477,7 +1490,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CHECK_WCWIDTH_GRAPHICS version: 4 updated: 2023/12/03 10:17:07
++dnl CF_CHECK_WCWIDTH_GRAPHICS version: 5 updated: 2024/12/14 16:09:34
+ dnl -------------------------
+ dnl Most "modern" terminal emulators are based to some degree on VT100, and
+ dnl should support line-drawing.  Even with Unicode.  There is a problem.
+@@ -1596,8 +1609,8 @@
+ 		setlocale(LC_ALL, "en_US.UTF-8") ||
+ 		setlocale(LC_ALL, "en_US.utf8") ||
+ 		setlocale(LC_ALL, "en_US.utf-8")) {
+-		if ((fp = fopen("conftest.in", "r")) != 0) {
+-			while (fgets(buffer, MY_LEN, fp) != 0) {
++		if ((fp = fopen("conftest.in", "r")) != NULL) {
++			while (fgets(buffer, MY_LEN, fp) != NULL) {
+ 				if (*buffer == '-') {
+ 					fprintf(stderr, "\\t%s", buffer);
+ 				} else if (sscanf(buffer, "%x %s", &value, notes) == 2) {
+@@ -1689,7 +1702,7 @@
+ fi
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CONST_X_STRING version: 8 updated: 2023/12/01 17:22:50
++dnl CF_CONST_X_STRING version: 9 updated: 2024/12/04 03:49:57
+ dnl -----------------
+ dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
+ dnl character-strings.
+@@ -1716,7 +1729,7 @@
+ 
+ AC_TRY_COMPILE(
+ [
+-#include 
++$ac_includes_default
+ #include 
+ ],
+ [String foo = malloc(1); free((void*)foo)],[
+@@ -1727,7 +1740,7 @@
+ #undef  _CONST_X_STRING
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+ #undef  XTSTRINGDEFINES	/* X11R5 and later */
+-#include 
++$ac_includes_default
+ #include 
+ 		],[String foo = malloc(1); *foo = 0],[
+ 			cf_cv_const_x_string=no
+@@ -2536,7 +2549,7 @@
+ AC_SUBST(EXTRA_CFLAGS)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_FOPEN_BIN_R version: 3 updated: 2023/01/05 18:05:46
++dnl CF_FOPEN_BIN_R version: 4 updated: 2024/12/14 16:09:34
+ dnl --------------
+ dnl Check if fopen works when the "b" (binary) flag is added to the mode
+ dnl parameter.  POSIX ignores the "b", which c89 specified.  Some very old
+@@ -2550,14 +2563,14 @@
+ {
+ 	FILE *fp = fopen("conftest.tmp", "wb");
+ 	int rc = 0;
+-	if (fp != 0) {
++	if (fp != NULL) {
+ 		int p, q;
+ 		for (p = 0; p < 256; ++p) {
+ 			fputc(p, fp);
+ 		}
+ 		fclose(fp);
+ 		fp = fopen("conftest.tmp", "rb");
+-		if (fp != 0) {
++		if (fp != NULL) {
+ 			for (p = 0; p < 256; ++p) {
+ 				q = fgetc(fp);
+ 				if (q != p) {
+@@ -2590,7 +2603,7 @@
+ unset $1
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_FUNC_DLSYM version: 4 updated: 2015/09/12 14:46:44
++dnl CF_FUNC_DLSYM version: 5 updated: 2024/12/14 16:09:34
+ dnl -------------
+ dnl Test for dlsym() and related functions, as well as libdl.
+ dnl
+@@ -2610,9 +2623,12 @@
+ 	test "$cf_have_libdl" = yes && { CF_ADD_LIB(dl) }
+ 
+ 	AC_MSG_CHECKING(whether able to link to dl*() functions)
+-	AC_TRY_LINK([#include ],[
++	AC_TRY_LINK([
++	#include 
++	#include 
++	],[
+ 		void *obj;
+-		if ((obj = dlopen("filename", 0)) != 0) {
++		if ((obj = dlopen("filename", 0)) != NULL) {
+ 			if (dlsym(obj, "symbolname") == 0) {
+ 			dlclose(obj);
+ 			}
+@@ -2669,7 +2685,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_FUNC_GETTTYNAM version: 2 updated: 2023/01/05 18:06:28
++dnl CF_FUNC_GETTTYNAM version: 3 updated: 2024/12/14 16:09:34
+ 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
+@@ -2706,7 +2722,7 @@
+ 
+ int main(void) {
+ 	FILE *fp = fopen(_PATH_TTYS, "r");
+-	${cf_cv_main_return:-return} (fp == 0);
++	${cf_cv_main_return:-return} (fp == NULL);
+ }],
+ 			[cf_cv_have_PATH_TTYS=yes],
+ 			[cf_cv_have_PATH_TTYS=no],
+@@ -3099,7 +3115,7 @@
+ CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_GCC_WARNINGS version: 41 updated: 2021/01/01 16:53:59
++dnl CF_GCC_WARNINGS version: 42 updated: 2024/12/14 09:09:41
+ dnl ---------------
+ dnl Check if the compiler supports useful warning options.  There's a few that
+ dnl we don't use, simply because they're too noisy:
+@@ -3125,7 +3141,7 @@
+ if test "x$have_x" = xyes; then CF_CONST_X_STRING fi
+ cat > "conftest.$ac_ext" < conftest.$ac_ext <= 4
+-	DB *result = 0;
++	DB *result = NULL;
+ 	db_create(&result, NULL, 0);
+ 	result->open(result,
+ 		NULL,
+@@ -3908,7 +3924,7 @@
+ 		DB_CREATE,
+ 		0644);
+ #elif DB_VERSION_MAJOR >= 3
+-	DB *result = 0;
++	DB *result = NULL;
+ 	db_create(&result, NULL, 0);
+ 	result->open(result,
+ 		path,
+@@ -3917,7 +3933,7 @@
+ 		DB_CREATE,
+ 		0644);
+ #elif DB_VERSION_MAJOR >= 2
+-	DB *result = 0;
++	DB *result = NULL;
+ 	db_open(path,
+ 		DB_HASH,
+ 		DB_CREATE,
+@@ -3933,7 +3949,7 @@
+ 		     DB_HASH,
+ 		     0);
+ #endif
+-	${cf_cv_main_return:-return}(result != 0)
++	${cf_cv_main_return:-return}(result != NULL)
+ ],[
+ 	if test -n "$cf_db_libs" ; then
+ 		cf_cv_hashed_db_libs=$cf_db_libs
+@@ -5530,7 +5546,7 @@
+ 
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LINK_FUNCS version: 13 updated: 2023/12/03 09:24:04
++dnl CF_LINK_FUNCS version: 14 updated: 2024/12/14 16:09:34
+ dnl -------------
+ dnl Most Unix systems have both link and symlink, a few don't have symlink.
+ dnl A few non-Unix systems implement symlink, but not link.
+@@ -5565,7 +5581,7 @@
+ 	char dst[] = "conftest.chk";
+ 	struct stat src_sb, dst_sb;
+ 	FILE *fp = fopen(src, "w");
+-	if (fp == 0) { fail = 3; } else {
++	if (fp == NULL) { fail = 3; } else {
+ 		fclose(fp); stat(src, &src_sb);
+ 		if ($cf_func(src, dst) < 0) {
+ 			fail = 1;
+@@ -7208,7 +7224,7 @@
+ test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_REGEX version: 18 updated: 2021/01/01 16:53:59
++dnl CF_REGEX version: 19 updated: 2024/12/14 16:09:34
+ dnl --------
+ dnl Attempt to determine if we've got one of the flavors of regular-expression
+ dnl code that we can support.
+@@ -7279,8 +7295,9 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		AC_TRY_LINK([#include 
++#include 
+ #include <$cf_regex_hdr>],[
+-			regex_t *p = 0;
++			regex_t *p = NULL;
+ 			int x = regcomp(p, "", 0);
+ 			int y = regexec(p, "", 0, 0, 0);
+ 			(void)x;
+@@ -7506,7 +7523,7 @@
+ done
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_SHARED_OPTS version: 111 updated: 2024/03/29 20:08:49
++dnl CF_SHARED_OPTS version: 112 updated: 2024/12/14 16:09:34
+ dnl --------------
+ dnl --------------
+ dnl Attempt to determine the appropriate CC/LD options for creating a shared
+@@ -8022,7 +8039,7 @@
+ int main(int argc, char *argv[[]])
+ {
+ 	printf("hello\\n");
+-	return (argv[[argc-1]] == 0) ;
++	return (argv[[argc-1]] == NULL) ;
+ }
+ EOF
+ 		cf_save_CFLAGS="$CFLAGS"
+@@ -8654,7 +8671,7 @@
+ fi
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_TYPEOF_CHTYPE version: 11 updated: 2023/01/05 17:57:59
++dnl CF_TYPEOF_CHTYPE version: 12 updated: 2024/12/14 16:09:34
+ dnl ----------------
+ dnl Determine the type we should use for chtype (and attr_t, which is treated
+ dnl as the same thing).  We want around 32 bits, so on most machines want a
+@@ -8670,7 +8687,7 @@
+ int main(void)
+ {
+ 	FILE *fp = fopen("cf_test.out", "w");
+-	if (fp != 0) {
++	if (fp != NULL) {
+ 		char *result = "long";
+ 		if (sizeof(unsigned long) > sizeof(unsigned int)) {
+ 			int n;
+Index: c++/cursesw.h
+Prereq:  1.59 
+--- ncurses-6.5-20241207+/c++/cursesw.h	2022-08-20 20:52:15.000000000 +0000
++++ ncurses-6.5-20241214/c++/cursesw.h	2024-12-14 19:08:22.000000000 +0000
+@@ -1,7 +1,7 @@
+ // * This makes emacs happy -*-Mode: C++;-*-
+ // vile:cppmode
+ /****************************************************************************
+- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
++ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -32,7 +32,7 @@
+ #ifndef NCURSES_CURSESW_H_incl
+ #define NCURSES_CURSESW_H_incl 1
+ 
+-// $Id: cursesw.h,v 1.59 2022/08/20 20:52:15 tom Exp $
++// $Id: cursesw.h,v 1.60 2024/12/14 19:08:22 tom Exp $
+ 
+ extern "C" {
+ #  include   
+@@ -50,6 +50,7 @@
+ #define NCURSES_CXX_EXPORT_VAR(type) NCURSES_CXX_IMPEXP type
+ 
+ #include 
++#include 
+ 
+ /* SCO 3.2v4 curses.h includes term.h, which defines lines as a macro.
+    Undefine it here, because NCursesWindow uses lines as a method.  */
+Index: c++/etip.h.in
+Prereq:  1.50 
+--- ncurses-6.5-20241207+/c++/etip.h.in	2022-08-20 20:50:00.000000000 +0000
++++ ncurses-6.5-20241214/c++/etip.h.in	2024-12-14 19:08:16.000000000 +0000
+@@ -1,6 +1,6 @@
+ // * This makes emacs happy -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
++ * Copyright 2018-2022,2024 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -32,7 +32,7 @@
+  *   Author: Juergen Pfeifer, 1997                                          *
+  ****************************************************************************/
+ 
+-// $Id: etip.h.in,v 1.50 2022/08/20 20:50:00 tom Exp $
++// $Id: etip.h.in,v 1.51 2024/12/14 19:08:16 tom Exp $
+ 
+ #ifndef NCURSES_ETIP_H_incl
+ #define NCURSES_ETIP_H_incl 1
+@@ -118,7 +118,9 @@
+ #  include 
+ #endif
+ 
+-#include 
++// This used to include , but Apple's configuration as of 2024
++// provides only a broken version of ncurses's header, which interferes
++// with the configure script.
+ 
+ extern "C" {
+ #if HAVE_VALUES_H
+@@ -128,6 +130,10 @@
+ #include 
+ #include 
+ #include 
++
++#ifndef HAVE_CONFIG_H
++int endwin(void);	// needed for the configure check
++#endif
+ }
+ 
+ // Language features
+Index: configure
+--- ncurses-6.5-20241207+/configure	2024-11-30 19:42:38.000000000 +0000
++++ ncurses-6.5-20241214/configure	2024-12-15 02:03:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.787 .
++# From configure.in Revision: 1.788 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20240618.
+ #
+@@ -5697,7 +5697,7 @@
+ #include 
+ 		int main(int argc, char *argv[])
+ 		{
+-			${cf_cv_main_return:-return}(argc < 0 || argv == 0 || argv[0] == 0);
++			${cf_cv_main_return:-return}(argc < 0 || argv == (void*)0 || argv[0] == (void*)0);
+ 		}
+ 
+ _ACEOF
+@@ -7507,7 +7507,7 @@
+ int main(int argc, char *argv[])
+ {
+ 	printf("hello\\n");
+-	return (argv[argc-1] == 0) ;
++	return (argv[argc-1] == NULL) ;
+ }
+ EOF
+ 		cf_save_CFLAGS="$CFLAGS"
+@@ -8101,13 +8101,16 @@
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+ #line 8102 "configure"
+ #include "confdefs.h"
+-#include 
++
++	#include 
++	#include 
++
+ int
+ main (void)
+ {
+ 
+ 		void *obj;
+-		if ((obj = dlopen("filename", 0)) != 0) {
++		if ((obj = dlopen("filename", 0)) != NULL) {
+ 			if (dlsym(obj, "symbolname") == 0) {
+ 			dlclose(obj);
+ 			}
+@@ -8117,16 +8120,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8120: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8123: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8123: \$? = $ac_status" >&5
++  echo "$as_me:8126: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8126: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8129: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8129: \$? = $ac_status" >&5
++  echo "$as_me:8132: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ cat >>confdefs.h <<\EOF
+@@ -8137,15 +8140,15 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-		{ { echo "$as_me:8140: error: Cannot link test program for libdl" >&5
++		{ { echo "$as_me:8143: 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:8145: result: ok" >&5
++	echo "$as_me:8148: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+-	{ { echo "$as_me:8148: error: Cannot find dlsym function" >&5
++	{ { echo "$as_me:8151: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8153,12 +8156,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}:8156: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:8159: testing assuming soname for gpm is $with_gpm ..." 1>&5
+ 
+ 			cf_cv_gpm_soname="$with_gpm"
+ 		else
+ 
+-echo "$as_me:8161: checking for soname of gpm library" >&5
++echo "$as_me:8164: 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
+@@ -8192,15 +8195,15 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-	if { (eval echo "$as_me:8195: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:8198: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8198: \$? = $ac_status" >&5
++  echo "$as_me:8201: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:8200: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:8203: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8203: \$? = $ac_status" >&5
++  echo "$as_me:8206: \$? = $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
+@@ -8211,7 +8214,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:8214: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:8217: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+ 
+ 		fi
+@@ -8279,7 +8282,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+ 
+-echo "$as_me:8282: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:8285: 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
+@@ -8287,7 +8290,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8290 "configure"
++#line 8293 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8306,16 +8309,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8309: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8312: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8312: \$? = $ac_status" >&5
++  echo "$as_me:8315: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8315: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8318: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8318: \$? = $ac_status" >&5
++  echo "$as_me:8321: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -8326,11 +8329,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8329: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:8332: 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:8333: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:8336: 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
+@@ -8354,15 +8357,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:8357: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:8360: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8360: \$? = $ac_status" >&5
++  echo "$as_me:8363: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:8362: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:8365: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8365: \$? = $ac_status" >&5
++  echo "$as_me:8368: \$? = $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
+@@ -8374,11 +8377,11 @@
+ fi
+ 
+ fi
+-echo "$as_me:8377: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:8380: 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:8381: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++	{ echo "$as_me:8384: 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
+ 
+@@ -8386,7 +8389,7 @@
+ 
+ fi
+ 
+-echo "$as_me:8389: checking if you want to use PCRE2 for regular-expressions" >&5
++echo "$as_me:8392: 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.
+@@ -8395,7 +8398,7 @@
+ 
+ fi;
+ test -z "$with_pcre2" && with_pcre2=no
+-echo "$as_me:8398: result: $with_pcre2" >&5
++echo "$as_me:8401: result: $with_pcre2" >&5
+ echo "${ECHO_T}$with_pcre2" >&6
+ 
+ if test "x$with_pcre2" != xno ; then
+@@ -8406,17 +8409,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}:8409: testing found package $cf_with_pcre2 ..." 1>&5
++echo "${as_me:-configure}:8412: 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}:8415: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:8418: 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}:8419: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:8422: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -8540,7 +8543,7 @@
+ fi
+ 
+ 	done
+-	cf_with_pcre2_ok=yes || { { echo "$as_me:8543: error: Cannot find PCRE2 library" >&5
++	cf_with_pcre2_ok=yes || { { echo "$as_me:8546: error: Cannot find PCRE2 library" >&5
+ echo "$as_me: error: Cannot find PCRE2 library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -8553,7 +8556,7 @@
+ 	(*pcre2-posix*|*pcreposix*)
+ 		;;
+ 	(*)
+-		echo "$as_me:8556: checking for regcomp in -lpcre2-posix" >&5
++		echo "$as_me:8559: 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
+@@ -8561,7 +8564,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcre2-posix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8564 "configure"
++#line 8567 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8580,16 +8583,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8583: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8586: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8586: \$? = $ac_status" >&5
++  echo "$as_me:8589: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8589: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8592: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8592: \$? = $ac_status" >&5
++  echo "$as_me:8595: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcre2_posix_regcomp=yes
+ else
+@@ -8600,7 +8603,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8603: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
++echo "$as_me:8606: 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
+ 
+@@ -8621,7 +8624,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  echo "$as_me:8624: checking for regcomp in -lpcreposix" >&5
++  echo "$as_me:8627: 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
+@@ -8629,7 +8632,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcreposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8632 "configure"
++#line 8635 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8648,16 +8651,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8651: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8654: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8654: \$? = $ac_status" >&5
++  echo "$as_me:8657: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8657: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8660: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8660: \$? = $ac_status" >&5
++  echo "$as_me:8663: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcreposix_regcomp=yes
+ else
+@@ -8668,7 +8671,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8671: result: $ac_cv_lib_pcreposix_regcomp" >&5
++echo "$as_me:8674: 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
+ 
+@@ -8689,7 +8692,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  { { echo "$as_me:8692: error: Cannot find PCRE2 POSIX library" >&5
++  { { echo "$as_me:8695: error: Cannot find PCRE2 POSIX library" >&5
+ echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8704,23 +8707,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:8707: checking for $ac_header" >&5
++echo "$as_me:8710: 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 8713 "configure"
++#line 8716 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8717: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8720: \"$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:8723: \$? = $ac_status" >&5
++  echo "$as_me:8726: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8739,7 +8742,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8742: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8745: 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:8758: 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 8761 "configure"
++#line 8764 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -8789,16 +8792,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8792: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8795: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8795: \$? = $ac_status" >&5
++  echo "$as_me:8798: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8798: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8801: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8801: \$? = $ac_status" >&5
++  echo "$as_me:8804: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -8808,7 +8811,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8811: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:8814: 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:8825: checking if you want to use sysmouse" >&5
++echo "$as_me:8828: 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.
+@@ -8834,7 +8837,7 @@
+ fi;
+ 	if test "$cf_with_sysmouse" != no ; then
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8837 "configure"
++#line 8840 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8857,16 +8860,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8860: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8863: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8863: \$? = $ac_status" >&5
++  echo "$as_me:8866: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8866: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8869: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8869: \$? = $ac_status" >&5
++  echo "$as_me:8872: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_with_sysmouse=yes
+ else
+@@ -8876,7 +8879,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	fi
+-echo "$as_me:8879: result: $cf_with_sysmouse" >&5
++echo "$as_me:8882: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -8886,7 +8889,7 @@
+ fi
+ 
+ # pretend that ncurses==ncursesw==ncursest
+-echo "$as_me:8889: checking if you want to disable library suffixes" >&5
++echo "$as_me:8892: 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.
+@@ -8903,13 +8906,13 @@
+ 	disable_lib_suffixes=no
+ 
+ fi;
+-echo "$as_me:8906: result: $disable_lib_suffixes" >&5
++echo "$as_me:8909: 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:8912: checking if rpath-hack should be disabled" >&5
++echo "$as_me:8915: 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.
+@@ -8927,22 +8930,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:8930: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:8933: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:8935: checking for updated LDFLAGS" >&5
++echo "$as_me:8938: 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:8938: result: maybe" >&5
++	echo "$as_me:8941: 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:8945: checking for $ac_word" >&5
++echo "$as_me:8948: 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
+@@ -8957,7 +8960,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:8960: found $ac_dir/$ac_word" >&5
++echo "$as_me:8963: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8965,10 +8968,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:8968: result: $cf_ldd_prog" >&5
++  echo "$as_me:8971: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:8971: result: no" >&5
++  echo "$as_me:8974: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8982,7 +8985,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8985 "configure"
++#line 8988 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8994,16 +8997,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8997: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9000: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9000: \$? = $ac_status" >&5
++  echo "$as_me:9003: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9003: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9006: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9006: \$? = $ac_status" >&5
++  echo "$as_me:9009: \$? = $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`
+@@ -9031,7 +9034,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:9034: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:9037: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -9043,11 +9046,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9046: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9049: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9050: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9053: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -9084,7 +9087,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:9087: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9090: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -9097,11 +9100,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9100: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9103: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:9104: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9107: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -9138,7 +9141,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:9141: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9144: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -9151,14 +9154,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:9154: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9157: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9158: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9161: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:9161: result: no" >&5
++	echo "$as_me:9164: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9172,7 +9175,7 @@
+ EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
+ if test -n "$EXTRA_PKG_LDFLAGS"
+ then
+-	echo "$as_me:9175: checking if you want to disable extra LDFLAGS for package-scripts" >&5
++	echo "$as_me:9178: 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.
+@@ -9189,7 +9192,7 @@
+ 	disable_pkg_ldflags=no
+ 
+ fi;
+-	echo "$as_me:9192: result: $disable_pkg_ldflags" >&5
++	echo "$as_me:9195: result: $disable_pkg_ldflags" >&5
+ echo "${ECHO_T}$disable_pkg_ldflags" >&6
+ 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
+ fi
+@@ -9197,7 +9200,7 @@
+ ###############################################################################
+ 
+ ###	use option --with-extra-suffix to append suffix to headers and libraries
+-echo "$as_me:9200: checking for extra suffix to append to header/library paths" >&5
++echo "$as_me:9203: checking for extra suffix to append to header/library paths" >&5
+ echo $ECHO_N "checking for extra suffix to append to header/library paths... $ECHO_C" >&6
+ EXTRA_SUFFIX=
+ 
+@@ -9216,11 +9219,11 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:9219: result: ${EXTRA_SUFFIX:-(none)}" >&5
++echo "$as_me:9222: result: ${EXTRA_SUFFIX:-(none)}" >&5
+ echo "${ECHO_T}${EXTRA_SUFFIX:-(none)}" >&6
+ 
+ ###	use option --disable-overwrite to leave out the link to -lcurses
+-echo "$as_me:9223: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:9226: 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.
+@@ -9230,10 +9233,10 @@
+ else
+   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:9233: result: $with_overwrite" >&5
++echo "$as_me:9236: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+ 
+-echo "$as_me:9236: checking if external terminfo-database is used" >&5
++echo "$as_me:9239: 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.
+@@ -9243,7 +9246,7 @@
+ else
+   use_database=yes
+ fi;
+-echo "$as_me:9246: result: $use_database" >&5
++echo "$as_me:9249: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+ 
+ case "$host_os" in
+@@ -9259,7 +9262,7 @@
+ if test "$use_database" != no ; then
+ 	NCURSES_USE_DATABASE=1
+ 
+-	echo "$as_me:9262: checking which terminfo source-file will be installed" >&5
++	echo "$as_me:9265: 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.
+@@ -9267,10 +9270,10 @@
+   withval="$with_database"
+   TERMINFO_SRC=$withval
+ fi;
+-	echo "$as_me:9270: result: $TERMINFO_SRC" >&5
++	echo "$as_me:9273: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+ 
+-	echo "$as_me:9273: checking whether to use hashed database instead of directory/tree" >&5
++	echo "$as_me:9276: 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.
+@@ -9280,13 +9283,13 @@
+ else
+   with_hashed_db=no
+ fi;
+-	echo "$as_me:9283: result: $with_hashed_db" >&5
++	echo "$as_me:9286: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ 	with_hashed_db=no
+ fi
+ 
+-echo "$as_me:9289: checking for list of fallback terminal descriptions" >&5
++echo "$as_me:9292: checking for list of fallback terminal descriptions" >&5
+ echo $ECHO_N "checking for list of fallback terminal descriptions... $ECHO_C" >&6
+ 
+ # Check whether --with-fallbacks or --without-fallbacks was given.
+@@ -9296,7 +9299,7 @@
+ else
+   with_fallback=
+ fi;
+-echo "$as_me:9299: result: ${with_fallback:-(none)}" >&5
++echo "$as_me:9302: result: ${with_fallback:-(none)}" >&5
+ echo "${ECHO_T}${with_fallback:-(none)}" >&6
+ 
+ case ".$with_fallback" in
+@@ -9304,7 +9307,7 @@
+ 	FALLBACK_LIST=
+ 	;;
+ (.yes)
+-	{ echo "$as_me:9307: WARNING: expected a list of terminal descriptions" >&5
++	{ echo "$as_me:9310: WARNING: expected a list of terminal descriptions" >&5
+ echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
+ 	;;
+ (*)
+@@ -9320,7 +9323,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:9323: checking for $ac_word" >&5
++echo "$as_me:9326: 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
+@@ -9335,7 +9338,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:9338: found $ac_dir/$ac_word" >&5
++echo "$as_me:9341: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9343,10 +9346,10 @@
+ fi
+ TIC=$ac_cv_prog_TIC
+ if test -n "$TIC"; then
+-  echo "$as_me:9346: result: $TIC" >&5
++  echo "$as_me:9349: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:9349: result: no" >&5
++  echo "$as_me:9352: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9355,7 +9358,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:9358: checking for $ac_word" >&5
++echo "$as_me:9361: 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
+@@ -9370,7 +9373,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:9373: found $ac_dir/$ac_word" >&5
++echo "$as_me:9376: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9378,10 +9381,10 @@
+ fi
+ ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
+ if test -n "$ac_ct_TIC"; then
+-  echo "$as_me:9381: result: $ac_ct_TIC" >&5
++  echo "$as_me:9384: result: $ac_ct_TIC" >&5
+ echo "${ECHO_T}$ac_ct_TIC" >&6
+ else
+-  echo "$as_me:9384: result: no" >&5
++  echo "$as_me:9387: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9393,7 +9396,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:9396: checking for $ac_word" >&5
++echo "$as_me:9399: 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
+@@ -9408,7 +9411,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:9411: found $ac_dir/$ac_word" >&5
++echo "$as_me:9414: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9416,10 +9419,10 @@
+ fi
+ INFOCMP=$ac_cv_prog_INFOCMP
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:9419: result: $INFOCMP" >&5
++  echo "$as_me:9422: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:9422: result: no" >&5
++  echo "$as_me:9425: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9428,7 +9431,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:9431: checking for $ac_word" >&5
++echo "$as_me:9434: 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
+@@ -9443,7 +9446,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:9446: found $ac_dir/$ac_word" >&5
++echo "$as_me:9449: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9451,10 +9454,10 @@
+ fi
+ ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
+ if test -n "$ac_ct_INFOCMP"; then
+-  echo "$as_me:9454: result: $ac_ct_INFOCMP" >&5
++  echo "$as_me:9457: result: $ac_ct_INFOCMP" >&5
+ echo "${ECHO_T}$ac_ct_INFOCMP" >&6
+ else
+-  echo "$as_me:9457: result: no" >&5
++  echo "$as_me:9460: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9469,10 +9472,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:9472: checking for tic program for fallbacks" >&5
++  echo "$as_me:9475: checking for tic program for fallbacks" >&5
+ echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
+ 		TIC=$withval
+-		echo "$as_me:9475: result: $TIC" >&5
++		echo "$as_me:9478: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -9498,7 +9501,7 @@
+ 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9501: error: expected a pathname, not \"$TIC\"" >&5
++	{ { echo "$as_me:9504: error: expected a pathname, not \"$TIC\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9511,7 +9514,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:9514: checking for $ac_word" >&5
++echo "$as_me:9517: 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
+@@ -9528,7 +9531,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:9531: found $ac_dir/$ac_word" >&5
++   echo "$as_me:9534: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -9539,10 +9542,10 @@
+ TIC=$ac_cv_path_TIC
+ 
+ if test -n "$TIC"; then
+-  echo "$as_me:9542: result: $TIC" >&5
++  echo "$as_me:9545: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:9545: result: no" >&5
++  echo "$as_me:9548: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9599,7 +9602,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:9602: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9605: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:9620: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -9623,10 +9626,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:9626: checking for infocmp program for fallbacks" >&5
++  echo "$as_me:9629: checking for infocmp program for fallbacks" >&5
+ echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
+ 		INFOCMP=$withval
+-		echo "$as_me:9629: result: $INFOCMP" >&5
++		echo "$as_me:9632: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -9652,7 +9655,7 @@
+ 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9655: error: expected a pathname, not \"$INFOCMP\"" >&5
++	{ { echo "$as_me:9658: error: expected a pathname, not \"$INFOCMP\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9665,7 +9668,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:9668: checking for $ac_word" >&5
++echo "$as_me:9671: 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
+@@ -9682,7 +9685,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:9685: found $ac_dir/$ac_word" >&5
++   echo "$as_me:9688: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -9693,10 +9696,10 @@
+ INFOCMP=$ac_cv_path_INFOCMP
+ 
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:9696: result: $INFOCMP" >&5
++  echo "$as_me:9699: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:9699: result: no" >&5
++  echo "$as_me:9702: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9753,7 +9756,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:9756: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9759: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:9774: WARNING: no infocmp program found for fallbacks" >&5
+ echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -9778,7 +9781,7 @@
+ 	test -z "$INFOCMP" && FALLBACK_LIST=
+ 	if test -z "$FALLBACK_LIST"
+ 	then
+-		{ echo "$as_me:9781: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
++		{ echo "$as_me:9784: 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
+@@ -9786,7 +9789,7 @@
+ USE_FALLBACKS=
+ test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
+ 
+-echo "$as_me:9789: checking if you want modern xterm or antique" >&5
++echo "$as_me:9792: 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.
+@@ -9800,7 +9803,7 @@
+ (no) with_xterm_new=xterm-old;;
+ (*)	 with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:9803: result: $with_xterm_new" >&5
++echo "$as_me:9806: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+ 
+@@ -9813,7 +9816,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9816: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:9819: 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.
+@@ -9837,13 +9840,13 @@
+ 	with_xterm_kbs=$withval
+ 	;;
+ esac
+-echo "$as_me:9840: result: $with_xterm_kbs" >&5
++echo "$as_me:9843: result: $with_xterm_kbs" >&5
+ echo "${ECHO_T}$with_xterm_kbs" >&6
+ XTERM_KBS=$with_xterm_kbs
+ 
+ if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
+ then
+-	{ echo "$as_me:9846: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
++	{ echo "$as_me:9849: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
+ echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;}
+ fi
+ 
+@@ -9853,7 +9856,7 @@
+ 	MAKE_TERMINFO="#"
+ else
+ 
+-echo "$as_me:9856: checking for list of terminfo directories" >&5
++echo "$as_me:9859: 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.
+@@ -9891,7 +9894,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9894: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:9897: 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; }; }
+ 	;;
+@@ -9914,7 +9917,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9917: result: $TERMINFO_DIRS" >&5
++echo "$as_me:9920: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <&5
++	{ echo "$as_me:9929: 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:9932: checking for default terminfo directory" >&5
++echo "$as_me:9935: 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.
+@@ -9963,7 +9966,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9966: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:9969: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9972,7 +9975,7 @@
+ fi
+ eval TERMINFO="$withval"
+ 
+-echo "$as_me:9975: result: $TERMINFO" >&5
++echo "$as_me:9978: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:9989: 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.
+@@ -9995,7 +9998,7 @@
+   with_big_core=no
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9998 "configure"
++#line 10001 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10009,15 +10012,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10012: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10015: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10015: \$? = $ac_status" >&5
++  echo "$as_me:10018: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10017: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10020: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10020: \$? = $ac_status" >&5
++  echo "$as_me:10023: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_big_core=yes
+ else
+@@ -10029,7 +10032,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi;
+-echo "$as_me:10032: result: $with_big_core" >&5
++echo "$as_me:10035: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10039,7 +10042,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:10042: checking if big-strings option selected" >&5
++echo "$as_me:10045: 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.
+@@ -10063,14 +10066,14 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:10066: result: $with_big_strings" >&5
++echo "$as_me:10069: 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:10073: checking if you want termcap-fallback support" >&5
++echo "$as_me:10076: 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.
+@@ -10080,14 +10083,14 @@
+ else
+   with_termcap=no
+ fi;
+-echo "$as_me:10083: result: $with_termcap" >&5
++echo "$as_me:10086: 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:10090: error: You have disabled the database w/o specifying fallbacks" >&5
++			{ { echo "$as_me:10093: 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
+@@ -10100,13 +10103,13 @@
+ else
+ 
+ 	if test "$with_ticlib" != no ; then
+-		{ { echo "$as_me:10103: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++		{ { echo "$as_me:10106: 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:10109: checking for list of termcap files" >&5
++	echo "$as_me:10112: 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.
+@@ -10144,7 +10147,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:10147: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:10150: 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; }; }
+ 	;;
+@@ -10167,7 +10170,7 @@
+ 	;;
+ esac
+ 
+-	echo "$as_me:10170: result: $TERMPATH" >&5
++	echo "$as_me:10173: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ 	test -n "$TERMPATH" &&
+ cat >>confdefs.h <&5
++	echo "$as_me:10181: 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.
+@@ -10185,14 +10188,14 @@
+ else
+   with_getcap=no
+ fi;
+-	echo "$as_me:10188: result: $with_getcap" >&5
++	echo "$as_me:10191: 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:10195: checking if translated termcaps will be cached in ~/.terminfo" >&5
++	echo "$as_me:10198: 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.
+@@ -10202,7 +10205,7 @@
+ else
+   with_getcap_cache=no
+ fi;
+-	echo "$as_me:10205: result: $with_getcap_cache" >&5
++	echo "$as_me:10208: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ 	test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10212,7 +10215,7 @@
+ fi
+ 
+ ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:10215: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:10218: 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.
+@@ -10222,14 +10225,14 @@
+ else
+   with_home_terminfo=yes
+ fi;
+-echo "$as_me:10225: result: $with_home_terminfo" >&5
++echo "$as_me:10228: 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:10232: checking if you want to permit root to use ncurses environment variables" >&5
++echo "$as_me:10235: 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.
+@@ -10239,14 +10242,14 @@
+ else
+   with_root_environ=yes
+ fi;
+-echo "$as_me:10242: result: $with_root_environ" >&5
++echo "$as_me:10245: 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:10249: checking if you want to permit setuid programs to access all files" >&5
++echo "$as_me:10252: 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-access or --disable-root-access was given.
+@@ -10256,14 +10259,14 @@
+ else
+   with_root_access=yes
+ fi;
+-echo "$as_me:10259: result: $with_root_access" >&5
++echo "$as_me:10262: result: $with_root_access" >&5
+ echo "${ECHO_T}$with_root_access" >&6
+ test "x$with_root_access" = xyes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_ROOT_ACCESS 1
+ EOF
+ 
+-echo "$as_me:10266: checking if you want to permit setuid use of ncurses environment variables" >&5
++echo "$as_me:10269: checking if you want to permit setuid use of ncurses environment variables" >&5
+ echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
+ 
+ # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
+@@ -10273,7 +10276,7 @@
+ else
+   with_setuid_environ=$with_root_environ
+ fi;
+-echo "$as_me:10276: result: $with_setuid_environ" >&5
++echo "$as_me:10279: result: $with_setuid_environ" >&5
+ echo "${ECHO_T}$with_setuid_environ" >&6
+ test "x$with_setuid_environ" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10288,23 +10291,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:10291: checking for $ac_header" >&5
++echo "$as_me:10294: 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 10297 "configure"
++#line 10300 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10301: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:10304: \"$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:10307: \$? = $ac_status" >&5
++  echo "$as_me:10310: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10323,7 +10326,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:10326: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:10329: 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:10344: 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 10347 "configure"
++#line 10350 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10375,16 +10378,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10378: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10381: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10381: \$? = $ac_status" >&5
++  echo "$as_me:10384: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10384: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10387: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10387: \$? = $ac_status" >&5
++  echo "$as_me:10390: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -10394,7 +10397,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10397: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10400: 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:10417: 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 10420 "configure"
++#line 10423 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10448,16 +10451,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10451: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10454: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10454: \$? = $ac_status" >&5
++  echo "$as_me:10457: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10457: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10460: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10460: \$? = $ac_status" >&5
++  echo "$as_me:10463: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -10467,7 +10470,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10470: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10473: 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:10484: 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
+@@ -10491,7 +10494,7 @@
+ 			eval 'ac_cv_func_'$cf_func'=error'
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10494 "configure"
++#line 10497 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -10503,7 +10506,7 @@
+ 	char dst[] = "conftest.chk";
+ 	struct stat src_sb, dst_sb;
+ 	FILE *fp = fopen(src, "w");
+-	if (fp == 0) { fail = 3; } else {
++	if (fp == NULL) { fail = 3; } else {
+ 		fclose(fp); stat(src, &src_sb);
+ 		if ($cf_func(src, dst) < 0) {
+ 			fail = 1;
+@@ -10525,15 +10528,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10528: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10531: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10531: \$? = $ac_status" >&5
++  echo "$as_me:10534: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (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_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -10551,7 +10554,7 @@
+ 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+ 
+ fi
+-echo "$as_me:10554: result: $cf_cv_link_funcs" >&5
++echo "$as_me:10557: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ 	test "$ac_cv_func_link"    = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -10571,7 +10574,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:10574: checking if tic should use symbolic links" >&5
++	echo "$as_me:10577: 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.
+@@ -10581,21 +10584,21 @@
+ else
+   with_symlinks=no
+ fi;
+-	echo "$as_me:10584: result: $with_symlinks" >&5
++	echo "$as_me:10587: 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:10591: checking if tic should use hard links" >&5
++	echo "$as_me:10594: 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:10598: result: $with_links" >&5
++	echo "$as_me:10601: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+ 
+@@ -10611,7 +10614,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:10614: checking if you want broken-linker support code" >&5
++echo "$as_me:10617: 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.
+@@ -10621,7 +10624,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:10624: result: $with_broken_linker" >&5
++echo "$as_me:10627: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : "${BROKEN_LINKER:=0}"
+@@ -10635,7 +10638,7 @@
+ fi
+ 
+ ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:10638: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:10641: 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.
+@@ -10645,7 +10648,7 @@
+ else
+   with_bsdpad=no
+ fi;
+-echo "$as_me:10648: result: $with_bsdpad" >&5
++echo "$as_me:10651: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10664,14 +10667,14 @@
+ # Check to define _XOPEN_SOURCE "automatically"
+ CPPFLAGS_before_XOPEN="$CPPFLAGS"
+ 
+-echo "$as_me:10667: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:10670: 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 10674 "configure"
++#line 10677 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10690,16 +10693,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10693: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10696: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10696: \$? = $ac_status" >&5
++  echo "$as_me:10699: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10699: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10702: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10702: \$? = $ac_status" >&5
++  echo "$as_me:10705: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -10710,7 +10713,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10713: result: $cf_cv_posix_visible" >&5
++echo "$as_me:10716: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -10752,14 +10755,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:10755: checking if this is the GNU C library" >&5
++echo "$as_me:10758: 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 10762 "configure"
++#line 10765 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10778,16 +10781,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10781: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10784: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10784: \$? = $ac_status" >&5
++  echo "$as_me:10787: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10787: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10790: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10790: \$? = $ac_status" >&5
++  echo "$as_me:10793: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -10798,7 +10801,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10801: result: $cf_cv_gnu_library" >&5
++echo "$as_me:10804: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -10806,7 +10809,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:10809: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:10812: 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
+@@ -10818,7 +10821,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10821 "configure"
++#line 10824 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10837,16 +10840,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10840: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10843: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10843: \$? = $ac_status" >&5
++  echo "$as_me:10846: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10846: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10849: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10849: \$? = $ac_status" >&5
++  echo "$as_me:10852: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -10858,12 +10861,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:10861: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:10864: 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:10866: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:10869: 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
+@@ -10968,7 +10971,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10971 "configure"
++#line 10974 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -10988,16 +10991,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10991: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10994: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10994: \$? = $ac_status" >&5
++  echo "$as_me:10997: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10997: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11000: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11000: \$? = $ac_status" >&5
++  echo "$as_me:11003: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -11008,7 +11011,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11011: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:11014: 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
+@@ -11017,14 +11020,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:11020: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:11023: 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 11027 "configure"
++#line 11030 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11039,16 +11042,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11042: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11045: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11045: \$? = $ac_status" >&5
++  echo "$as_me:11048: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11048: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11051: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11051: \$? = $ac_status" >&5
++  echo "$as_me:11054: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -11155,7 +11158,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11158 "configure"
++#line 11161 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11170,16 +11173,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11173: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11176: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11176: \$? = $ac_status" >&5
++  echo "$as_me:11179: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11179: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11182: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11182: \$? = $ac_status" >&5
++  echo "$as_me:11185: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -11194,12 +11197,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11197: result: $cf_cv_gnu_source" >&5
++echo "$as_me:11200: 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:11202: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:11205: 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
+@@ -11209,7 +11212,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11212 "configure"
++#line 11215 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11224,16 +11227,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11227: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11230: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11230: \$? = $ac_status" >&5
++  echo "$as_me:11233: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11233: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11236: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11236: \$? = $ac_status" >&5
++  echo "$as_me:11239: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -11244,7 +11247,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11247: result: $cf_cv_default_source" >&5
++echo "$as_me:11250: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -11284,16 +11287,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:11287: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11290: 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}:11293: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11296: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11296 "configure"
++#line 11299 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11308,16 +11311,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11311: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11314: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11314: \$? = $ac_status" >&5
++  echo "$as_me:11317: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11317: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11320: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11320: \$? = $ac_status" >&5
++  echo "$as_me:11323: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11338,7 +11341,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11341 "configure"
++#line 11344 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11353,16 +11356,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11356: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11359: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11359: \$? = $ac_status" >&5
++  echo "$as_me:11362: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11362: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11365: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11365: \$? = $ac_status" >&5
++  echo "$as_me:11368: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11373,7 +11376,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11376: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11379: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11381,10 +11384,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11384: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11387: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11387 "configure"
++#line 11390 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11399,16 +11402,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11402: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11405: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11405: \$? = $ac_status" >&5
++  echo "$as_me:11408: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11408: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11411: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11411: \$? = $ac_status" >&5
++  echo "$as_me:11414: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11424,7 +11427,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11427: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11430: 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
+@@ -11541,7 +11544,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:11544: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:11547: 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
+@@ -11573,14 +11576,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:11576: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:11579: 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 11583 "configure"
++#line 11586 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11598,16 +11601,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11601: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11604: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11604: \$? = $ac_status" >&5
++  echo "$as_me:11607: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11607: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11610: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11610: \$? = $ac_status" >&5
++  echo "$as_me:11613: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11619,7 +11622,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11622 "configure"
++#line 11625 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11637,16 +11640,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11640: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11643: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11643: \$? = $ac_status" >&5
++  echo "$as_me:11646: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11646: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11649: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11649: \$? = $ac_status" >&5
++  echo "$as_me:11652: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11661,7 +11664,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11664: result: $cf_cv_xopen_source" >&5
++echo "$as_me:11667: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -11821,16 +11824,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:11824: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11827: 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}:11830: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11833: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11833 "configure"
++#line 11836 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11845,16 +11848,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11848: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11851: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11851: \$? = $ac_status" >&5
++  echo "$as_me:11854: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11854: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11857: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11857: \$? = $ac_status" >&5
++  echo "$as_me:11860: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11875,7 +11878,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11878 "configure"
++#line 11881 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11890,16 +11893,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11893: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11896: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11896: \$? = $ac_status" >&5
++  echo "$as_me:11899: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11899: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11902: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11902: \$? = $ac_status" >&5
++  echo "$as_me:11905: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11910,7 +11913,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11913: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11916: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11918,10 +11921,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11921: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11924: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11924 "configure"
++#line 11927 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11936,16 +11939,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11939: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11942: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11942: \$? = $ac_status" >&5
++  echo "$as_me:11945: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11945: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11948: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11948: \$? = $ac_status" >&5
++  echo "$as_me:11951: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11961,7 +11964,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11964: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11967: 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
+@@ -12074,10 +12077,10 @@
+ 	if test "$cf_cv_xopen_source" = no ; then
+ 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+ 
+-echo "${as_me:-configure}:12077: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:12080: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12080 "configure"
++#line 12083 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12095,23 +12098,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12098: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12101: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12101: \$? = $ac_status" >&5
++  echo "$as_me:12104: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12104: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12107: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12107: \$? = $ac_status" >&5
++  echo "$as_me:12110: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-			{ echo "$as_me:12114: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++			{ echo "$as_me:12117: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ 			CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -12134,7 +12137,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}:12137: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12140: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -12146,7 +12149,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}:12149: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:12152: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -12234,7 +12237,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:12237: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:12240: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -12244,7 +12247,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:12247: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:12250: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -12254,7 +12257,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}:12257: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:12260: 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"
+@@ -12266,10 +12269,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:12269: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:12272: 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 12272 "configure"
++#line 12275 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12284,16 +12287,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12287: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12290: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12290: \$? = $ac_status" >&5
++  echo "$as_me:12293: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12293: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12296: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12296: \$? = $ac_status" >&5
++  echo "$as_me:12299: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -12302,12 +12305,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:12305: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:12308: 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 12310 "configure"
++#line 12313 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12322,16 +12325,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12325: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12328: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12328: \$? = $ac_status" >&5
++  echo "$as_me:12331: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12331: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12334: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12334: \$? = $ac_status" >&5
++  echo "$as_me:12337: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -12342,19 +12345,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:12345: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:12348: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:12350: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:12353: 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 12357 "configure"
++#line 12360 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12372,16 +12375,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12375: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12378: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12378: \$? = $ac_status" >&5
++  echo "$as_me:12381: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12381: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12384: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12384: \$? = $ac_status" >&5
++  echo "$as_me:12387: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12393,7 +12396,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12396 "configure"
++#line 12399 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12411,16 +12414,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12414: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12417: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12417: \$? = $ac_status" >&5
++  echo "$as_me:12420: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12420: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12423: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12423: \$? = $ac_status" >&5
++  echo "$as_me:12426: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12435,7 +12438,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12438: result: $cf_cv_xopen_source" >&5
++echo "$as_me:12441: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -12586,14 +12589,14 @@
+ 
+ # Work around breakage on OS X
+ 
+-echo "$as_me:12589: checking if SIGWINCH is defined" >&5
++echo "$as_me:12592: 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 12596 "configure"
++#line 12599 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12608,23 +12611,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12611: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12614: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12614: \$? = $ac_status" >&5
++  echo "$as_me:12617: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12617: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12620: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12620: \$? = $ac_status" >&5
++  echo "$as_me:12623: \$? = $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 12627 "configure"
++#line 12630 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -12642,16 +12645,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12645: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12648: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12648: \$? = $ac_status" >&5
++  echo "$as_me:12651: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12651: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12654: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12654: \$? = $ac_status" >&5
++  echo "$as_me:12657: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -12665,11 +12668,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12668: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:12671: 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:12672: checking for actual SIGWINCH definition" >&5
++echo "$as_me:12675: 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
+@@ -12680,7 +12683,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12683 "configure"
++#line 12686 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -12702,16 +12705,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12705: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12708: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12708: \$? = $ac_status" >&5
++  echo "$as_me:12711: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12711: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12714: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12714: \$? = $ac_status" >&5
++  echo "$as_me:12717: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -12725,7 +12728,7 @@
+ done
+ 
+ fi
+-echo "$as_me:12728: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:12731: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -12735,13 +12738,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:12738: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:12741: 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 12744 "configure"
++#line 12747 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12755,16 +12758,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12758: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12761: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12761: \$? = $ac_status" >&5
++  echo "$as_me:12764: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12764: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12767: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12767: \$? = $ac_status" >&5
++  echo "$as_me:12770: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -12775,7 +12778,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12778: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:12781: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test "$am_cv_langinfo_codeset" = yes; then
+ 
+@@ -12789,7 +12792,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+ 
+-echo "$as_me:12792: checking if you want wide-character code" >&5
++echo "$as_me:12795: 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.
+@@ -12799,7 +12802,7 @@
+ else
+   with_widec=$cf_dft_widec
+ fi;
+-echo "$as_me:12802: result: $with_widec" >&5
++echo "$as_me:12805: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ 
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -12821,7 +12824,7 @@
+ 	(*_XOPEN_SOURCE=*)
+ 		;;
+ 	(*)
+-		{ echo "$as_me:12824: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
++		{ echo "$as_me:12827: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
+ 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
+ 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
+@@ -12834,23 +12837,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:12837: checking for $ac_header" >&5
++echo "$as_me:12840: 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 12843 "configure"
++#line 12846 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:12847: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12850: \"$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:12853: \$? = $ac_status" >&5
++  echo "$as_me:12856: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12869,7 +12872,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:12872: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:12875: 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:12885: 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 12889 "configure"
++#line 12892 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12908,16 +12911,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12911: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12914: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12914: \$? = $ac_status" >&5
++  echo "$as_me:12917: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12917: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12920: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12920: \$? = $ac_status" >&5
++  echo "$as_me:12923: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_h_okay=yes
+ else
+@@ -12927,16 +12930,16 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12930: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:12933: 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:12936: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:12939: 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 12939 "configure"
++#line 12942 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12952,16 +12955,16 @@
+ }
+ _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_result=no
+ else
+@@ -12970,16 +12973,16 @@
+ cf_result=yes
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:12973: result: $cf_result" >&5
++echo "$as_me:12976: 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:12979: checking checking for compatible value versus " >&5
++	echo "$as_me:12982: 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 12982 "configure"
++#line 12985 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12995,16 +12998,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12998: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13001: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13001: \$? = $ac_status" >&5
++  echo "$as_me:13004: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13004: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13007: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13007: \$? = $ac_status" >&5
++  echo "$as_me:13010: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -13013,7 +13016,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:13016: result: $cf_result" >&5
++	echo "$as_me:13019: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = no ; then
+ 		# perhaps we can override it - try...
+@@ -13023,7 +13026,7 @@
+ 
+ fi
+ 
+-echo "$as_me:13026: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:13029: 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
+@@ -13094,7 +13097,7 @@
+   cf_cv_wcwidth_graphics=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13097 "configure"
++#line 13100 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13118,8 +13121,8 @@
+ 		setlocale(LC_ALL, "en_US.UTF-8") ||
+ 		setlocale(LC_ALL, "en_US.utf8") ||
+ 		setlocale(LC_ALL, "en_US.utf-8")) {
+-		if ((fp = fopen("conftest.in", "r")) != 0) {
+-			while (fgets(buffer, MY_LEN, fp) != 0) {
++		if ((fp = fopen("conftest.in", "r")) != NULL) {
++			while (fgets(buffer, MY_LEN, fp) != NULL) {
+ 				if (*buffer == '-') {
+ 					fprintf(stderr, "\\t%s", buffer);
+ 				} else if (sscanf(buffer, "%x %s", &value, notes) == 2) {
+@@ -13139,15 +13142,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:13142: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13145: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13145: \$? = $ac_status" >&5
++  echo "$as_me:13148: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:13147: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13150: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13150: \$? = $ac_status" >&5
++  echo "$as_me:13153: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wcwidth_graphics=yes
+ else
+@@ -13160,7 +13163,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:13163: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:13166: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+ 
+ 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -13171,13 +13174,13 @@
+ for ac_func in putwc btowc wctob wmemchr 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:13174: checking for $ac_func" >&5
++echo "$as_me:13177: 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 13180 "configure"
++#line 13183 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13208,16 +13211,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13211: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13214: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13214: \$? = $ac_status" >&5
++  echo "$as_me:13217: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13217: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13220: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13220: \$? = $ac_status" >&5
++  echo "$as_me:13223: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -13227,7 +13230,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13230: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:13233: 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:13248: 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 13251 "configure"
++#line 13254 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13255: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:13258: \"$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:13261: \$? = $ac_status" >&5
++  echo "$as_me:13264: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13277,7 +13280,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:13280: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:13283: 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:13293: 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
+@@ -13295,7 +13298,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13298 "configure"
++#line 13301 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13312,16 +13315,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13315: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13318: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13318: \$? = $ac_status" >&5
++  echo "$as_me:13321: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13321: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13324: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13324: \$? = $ac_status" >&5
++  echo "$as_me:13327: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -13333,12 +13336,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:13336: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13339: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13341 "configure"
++#line 13344 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13351,16 +13354,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13354: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13357: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13357: \$? = $ac_status" >&5
++  echo "$as_me:13360: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13360: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13363: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13363: \$? = $ac_status" >&5
++  echo "$as_me:13366: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -13374,7 +13377,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13377 "configure"
++#line 13380 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13387,16 +13390,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13390: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13393: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13393: \$? = $ac_status" >&5
++  echo "$as_me:13396: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13396: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13399: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13399: \$? = $ac_status" >&5
++  echo "$as_me:13402: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -13413,9 +13416,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:13416: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:13419: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:13418: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13421: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13506,7 +13509,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}:13509: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13512: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -13514,7 +13517,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13517 "configure"
++#line 13520 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13527,21 +13530,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13530: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13533: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13533: \$? = $ac_status" >&5
++  echo "$as_me:13536: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13536: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13539: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13539: \$? = $ac_status" >&5
++  echo "$as_me:13542: \$? = $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}:13544: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13547: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13559,7 +13562,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:13562: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13565: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -13634,13 +13637,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}:13637: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13640: 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 13643 "configure"
++#line 13646 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13653,21 +13656,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13656: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13659: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13659: \$? = $ac_status" >&5
++  echo "$as_me:13662: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13662: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13665: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13665: \$? = $ac_status" >&5
++  echo "$as_me:13668: \$? = $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}:13670: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13673: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -13709,7 +13712,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13712: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:13715: 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
+@@ -13747,7 +13750,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13750 "configure"
++#line 13753 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13759,16 +13762,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13762: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13765: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13765: \$? = $ac_status" >&5
++  echo "$as_me:13768: \$? = $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:13771: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13771: \$? = $ac_status" >&5
++  echo "$as_me:13774: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13785,7 +13788,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}:13788: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:13791: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -13821,7 +13824,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}:13824: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:13827: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -13853,14 +13856,14 @@
+ 	fi
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:13856: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:13859: 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 13863 "configure"
++#line 13866 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13878,23 +13881,23 @@
+ }
+ _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_cv_mbstate_t=no
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13897 "configure"
++#line 13900 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13913,16 +13916,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13916: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13919: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13919: \$? = $ac_status" >&5
++  echo "$as_me:13922: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13922: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13925: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13925: \$? = $ac_status" >&5
++  echo "$as_me:13928: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -13934,7 +13937,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13937: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:13940: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -13952,14 +13955,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:13955: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:13958: 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 13962 "configure"
++#line 13965 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13977,23 +13980,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13980: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13983: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13983: \$? = $ac_status" >&5
++  echo "$as_me:13986: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13986: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13989: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13989: \$? = $ac_status" >&5
++  echo "$as_me:13992: \$? = $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 13996 "configure"
++#line 13999 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14012,16 +14015,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14015: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14018: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14018: \$? = $ac_status" >&5
++  echo "$as_me:14021: \$? = $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:14024: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14024: \$? = $ac_status" >&5
++  echo "$as_me:14027: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -14033,7 +14036,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14036: result: $cf_cv_wchar_t" >&5
++echo "$as_me:14039: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -14056,14 +14059,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:14059: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:14062: 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 14066 "configure"
++#line 14069 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14081,23 +14084,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14084: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14087: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14087: \$? = $ac_status" >&5
++  echo "$as_me:14090: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14090: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14093: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14093: \$? = $ac_status" >&5
++  echo "$as_me:14096: \$? = $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 14100 "configure"
++#line 14103 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14116,16 +14119,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14119: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14122: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14122: \$? = $ac_status" >&5
++  echo "$as_me:14125: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14125: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14128: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14128: \$? = $ac_status" >&5
++  echo "$as_me:14131: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -14137,7 +14140,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14140: result: $cf_cv_wint_t" >&5
++echo "$as_me:14143: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -14169,7 +14172,7 @@
+ fi
+ 
+ ###   use option --disable-lp64 to allow long chtype
+-echo "$as_me:14172: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:14175: 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.
+@@ -14179,7 +14182,7 @@
+ else
+   with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:14182: result: $with_lp64" >&5
++echo "$as_me:14185: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+ 
+ if test "x$with_lp64" = xyes ; then
+@@ -14195,7 +14198,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:14198: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:14201: 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
+@@ -14207,7 +14210,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 14210 "configure"
++#line 14213 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14227,16 +14230,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14230: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14233: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14233: \$? = $ac_status" >&5
++  echo "$as_me:14236: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14236: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14239: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14239: \$? = $ac_status" >&5
++  echo "$as_me:14242: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14246,16 +14249,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14249: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14252: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14252: \$? = $ac_status" >&5
++  echo "$as_me:14255: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14255: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14258: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14258: \$? = $ac_status" >&5
++  echo "$as_me:14261: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -14269,13 +14272,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:14272: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:14275: 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:14278: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:14281: 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
+@@ -14283,7 +14286,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14286 "configure"
++#line 14289 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14303,16 +14306,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14306: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14309: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14309: \$? = $ac_status" >&5
++  echo "$as_me:14312: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14312: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14315: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14315: \$? = $ac_status" >&5
++  echo "$as_me:14318: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14321,7 +14324,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14324 "configure"
++#line 14327 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -14342,16 +14345,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14345: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14348: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14348: \$? = $ac_status" >&5
++  echo "$as_me:14351: \$? = $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:14354: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14354: \$? = $ac_status" >&5
++  echo "$as_me:14357: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -14362,7 +14365,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14365: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:14368: 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
+ 
+@@ -14372,7 +14375,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:14375: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:14378: 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
+@@ -14380,7 +14383,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14383 "configure"
++#line 14386 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14400,16 +14403,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14403: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14406: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14406: \$? = $ac_status" >&5
++  echo "$as_me:14409: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14409: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14412: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14412: \$? = $ac_status" >&5
++  echo "$as_me:14415: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14418,7 +14421,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14421 "configure"
++#line 14424 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -14439,16 +14442,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14442: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14445: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14445: \$? = $ac_status" >&5
++  echo "$as_me:14448: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14448: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14451: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14451: \$? = $ac_status" >&5
++  echo "$as_me:14454: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -14459,7 +14462,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14462: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:14465: 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
+ 
+@@ -14472,7 +14475,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:14475: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:14478: 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
+@@ -14480,7 +14483,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14483 "configure"
++#line 14486 "configure"
+ #include "confdefs.h"
+ #include 
+     #include 
+@@ -14495,16 +14498,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14498: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14501: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14501: \$? = $ac_status" >&5
++  echo "$as_me:14504: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14504: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14507: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14507: \$? = $ac_status" >&5
++  echo "$as_me:14510: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14513,7 +14516,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14516 "configure"
++#line 14519 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -14529,16 +14532,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14532: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14535: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14535: \$? = $ac_status" >&5
++  echo "$as_me:14538: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14538: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14541: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14541: \$? = $ac_status" >&5
++  echo "$as_me:14544: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -14549,7 +14552,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14552: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:14555: 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
+ 
+@@ -14563,13 +14566,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:14566: checking for fseeko" >&5
++echo "$as_me:14569: 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 14572 "configure"
++#line 14575 "configure"
+ #include "confdefs.h"
+ #include 
+                              #include 
+@@ -14583,16 +14586,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14586: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14589: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14589: \$? = $ac_status" >&5
++  echo "$as_me:14592: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14592: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14595: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14595: \$? = $ac_status" >&5
++  echo "$as_me:14598: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -14602,7 +14605,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14605: 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
+ 
+@@ -14641,14 +14644,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:14644: 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 14651 "configure"
++#line 14654 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -14675,16 +14678,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14678: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14681: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14681: \$? = $ac_status" >&5
++  echo "$as_me:14684: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14684: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14687: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14687: \$? = $ac_status" >&5
++  echo "$as_me:14690: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -14695,7 +14698,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14698: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:14701: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -14705,7 +14708,7 @@
+ 	fi
+ 
+ ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:14708: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:14711: 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.
+@@ -14715,14 +14718,14 @@
+ else
+   with_tparm_varargs=yes
+ fi;
+-echo "$as_me:14718: result: $with_tparm_varargs" >&5
++echo "$as_me:14721: 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:14725: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:14728: 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.
+@@ -14732,14 +14735,14 @@
+ else
+   with_tic_depends=yes
+ fi;
+-echo "$as_me:14735: result: $with_tic_depends" >&5
++echo "$as_me:14738: 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:14742: checking if you want to enable wattr* macros" >&5
++echo "$as_me:14745: 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.
+@@ -14751,15 +14754,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ 	NCURSES_WATTR_MACROS=0
+-	echo "$as_me:14754: result: no" >&5
++	echo "$as_me:14757: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ else
+ 	NCURSES_WATTR_MACROS=1
+-	echo "$as_me:14758: result: yes" >&5
++	echo "$as_me:14761: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ fi
+ 
+-echo "$as_me:14762: checking for X11 rgb file" >&5
++echo "$as_me:14765: 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.
+@@ -14821,7 +14824,7 @@
+ 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:14824: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:14827: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14829,7 +14832,7 @@
+ 
+ fi
+ 
+-echo "$as_me:14832: result: $RGB_PATH" >&5
++echo "$as_me:14835: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:14850: 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.
+@@ -14854,17 +14857,17 @@
+ else
+   NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:14857: result: $NCURSES_BOOL" >&5
++echo "$as_me:14860: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ case x$NCURSES_BOOL in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14861: error: expected a type name for bool" >&5
++	{ { echo "$as_me:14864: error: expected a type name for bool" >&5
+ echo "$as_me: error: expected a type name for bool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+-echo "$as_me:14867: checking for alternate terminal capabilities file" >&5
++echo "$as_me:14870: 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.
+@@ -14876,16 +14879,16 @@
+ fi;
+ if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
+ then
+-	{ echo "$as_me:14879: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
++	{ echo "$as_me:14882: 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:14883: result: $TERMINFO_CAPS" >&5
++echo "$as_me:14886: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+ 
+ ###   use option --with-chtype to override chtype's type
+ 
+-echo "$as_me:14888: checking for type of chtype" >&5
++echo "$as_me:14891: 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.
+@@ -14895,11 +14898,11 @@
+ else
+   NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:14898: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:14901: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ case x$NCURSES_CHTYPE in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14902: error: expected a type name for chtype" >&5
++	{ { echo "$as_me:14905: error: expected a type name for chtype" >&5
+ echo "$as_me: error: expected a type name for chtype" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14907,7 +14910,7 @@
+ 
+ ###   use option --with-ospeed to override ospeed's type
+ 
+-echo "$as_me:14910: checking for type of ospeed" >&5
++echo "$as_me:14913: 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.
+@@ -14917,11 +14920,11 @@
+ else
+   NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:14920: result: $NCURSES_OSPEED" >&5
++echo "$as_me:14923: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ case x$NCURSES_OSPEED in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14924: error: expected a type name for ospeed" >&5
++	{ { echo "$as_me:14927: error: expected a type name for ospeed" >&5
+ echo "$as_me: error: expected a type name for ospeed" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14929,7 +14932,7 @@
+ 
+ ###   use option --with-mmask-t to override mmask_t's type
+ 
+-echo "$as_me:14932: checking for type of mmask-t" >&5
++echo "$as_me:14935: 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.
+@@ -14939,18 +14942,18 @@
+ else
+   NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:14942: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:14945: result: $NCURSES_MMASK_T" >&5
+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+ case x$NCURSES_MMASK_T in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14946: error: expected a type name for mmask-t" >&5
++	{ { echo "$as_me:14949: error: expected a type name for mmask-t" >&5
+ echo "$as_me: error: expected a type name for mmask-t" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ ###   use option --with-ccharw-max to override CCHARW_MAX size
+-echo "$as_me:14953: checking for size CCHARW_MAX" >&5
++echo "$as_me:14956: 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.
+@@ -14960,16 +14963,16 @@
+ else
+   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
+ fi;
+-echo "$as_me:14963: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:14966: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+ 
+-echo "$as_me:14966: checking for signed char" >&5
++echo "$as_me:14969: 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 14972 "configure"
++#line 14975 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14984,16 +14987,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14987: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14990: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14990: \$? = $ac_status" >&5
++  echo "$as_me:14993: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14993: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14996: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14996: \$? = $ac_status" >&5
++  echo "$as_me:14999: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -15003,10 +15006,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15006: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:15009: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:15009: checking size of signed char" >&5
++echo "$as_me:15012: 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
+@@ -15015,7 +15018,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15018 "configure"
++#line 15021 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15027,21 +15030,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15030: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15033: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15033: \$? = $ac_status" >&5
++  echo "$as_me:15036: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15036: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15039: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15039: \$? = $ac_status" >&5
++  echo "$as_me:15042: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15044 "configure"
++#line 15047 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15053,16 +15056,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15056: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15059: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15059: \$? = $ac_status" >&5
++  echo "$as_me:15062: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15062: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15065: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15065: \$? = $ac_status" >&5
++  echo "$as_me:15068: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -15078,7 +15081,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15081 "configure"
++#line 15084 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15090,16 +15093,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15093: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15096: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15096: \$? = $ac_status" >&5
++  echo "$as_me:15099: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15099: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15102: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15102: \$? = $ac_status" >&5
++  echo "$as_me:15105: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -15115,7 +15118,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 15118 "configure"
++#line 15121 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15127,16 +15130,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15130: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15133: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15133: \$? = $ac_status" >&5
++  echo "$as_me:15136: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15136: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15139: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15139: \$? = $ac_status" >&5
++  echo "$as_me:15142: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -15149,12 +15152,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:15152: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:15155: 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 15157 "configure"
++#line 15160 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15170,15 +15173,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:15173: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15176: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15176: \$? = $ac_status" >&5
++  echo "$as_me:15179: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:15178: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15181: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15181: \$? = $ac_status" >&5
++  echo "$as_me:15184: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -15194,7 +15197,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:15197: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:15200: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:15211: checking whether to use signed chars for Boolean array in term.h" >&5
+ echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
+ 
+ # Check whether --enable-signed-char or --disable-signed-char was given.
+@@ -15215,13 +15218,13 @@
+ else
+   with_signed_char=$cf_dft_signed_char
+ fi;
+-echo "$as_me:15218: result: $with_signed_char" >&5
++echo "$as_me:15221: 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:15224: checking for type of tparm-arg" >&5
++echo "$as_me:15227: checking for type of tparm-arg" >&5
+ echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6
+ 
+ # Check whether --with-tparm-arg or --without-tparm-arg was given.
+@@ -15231,18 +15234,18 @@
+ else
+   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:15234: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:15237: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+ case x$NCURSES_TPARM_ARG in
+ (x|xyes|xno)
+-	{ { echo "$as_me:15238: error: expected a type name for tparm-arg" >&5
++	{ { echo "$as_me:15241: error: expected a type name for tparm-arg" >&5
+ echo "$as_me: error: expected a type name for tparm-arg" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:15245: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:15248: 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.
+@@ -15252,7 +15255,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:15255: result: $with_rcs_ids" >&5
++echo "$as_me:15258: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15261,7 +15264,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:15264: checking format of man-pages" >&5
++echo "$as_me:15267: 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.
+@@ -15352,10 +15355,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:15355: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:15358: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+-	{ echo "$as_me:15358: WARNING: Unexpected manpage-format $cf_unknown" >&5
++	{ echo "$as_me:15361: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+ 
+@@ -15396,7 +15399,7 @@
+ esac
+ done
+ 
+-echo "$as_me:15399: checking for manpage renaming" >&5
++echo "$as_me:15402: 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.
+@@ -15425,15 +15428,15 @@
+ elif test "$MANPAGE_RENAMES" = no ; then
+ 	:
+ elif test ! -f "$MANPAGE_RENAMES" ; then
+-	{ { echo "$as_me:15428: error: not a filename: $MANPAGE_RENAMES" >&5
++	{ { echo "$as_me:15431: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-echo "$as_me:15433: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:15436: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+ 
+-echo "$as_me:15436: checking if manpage aliases will be installed" >&5
++echo "$as_me:15439: 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.
+@@ -15444,7 +15447,7 @@
+   MANPAGE_ALIASES=yes
+ fi;
+ 
+-echo "$as_me:15447: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:15450: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+ 
+ case "x$LN_S" in
+@@ -15458,7 +15461,7 @@
+ 
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:15461: checking if manpage symlinks should be used" >&5
++echo "$as_me:15464: 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.
+@@ -15471,17 +15474,17 @@
+ 
+ if test "$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+-	{ echo "$as_me:15474: WARNING: cannot make symlinks" >&5
++	{ echo "$as_me:15477: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ 	MANPAGE_SYMLINKS=no
+ fi
+ fi
+ 
+-echo "$as_me:15480: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:15483: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+ 
+-echo "$as_me:15484: checking for manpage tbl" >&5
++echo "$as_me:15487: 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.
+@@ -15492,7 +15495,7 @@
+   MANPAGE_TBL=no
+ fi;
+ 
+-echo "$as_me:15495: result: $MANPAGE_TBL" >&5
++echo "$as_me:15498: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+ 
+ if test "$prefix" = "NONE" ; then
+@@ -15810,7 +15813,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15813: checking if you want to build with function extensions" >&5
++echo "$as_me:15816: 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.
+@@ -15820,7 +15823,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:15823: result: $with_ext_funcs" >&5
++echo "$as_me:15826: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -15877,7 +15880,7 @@
+ 	GENERATED_EXT_FUNCS=
+ fi
+ 
+-echo "$as_me:15880: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:15883: 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.
+@@ -15887,7 +15890,7 @@
+ else
+   with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:15890: result: $with_sp_funcs" >&5
++echo "$as_me:15893: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ 	NCURSES_SP_FUNCS=1
+@@ -15906,7 +15909,7 @@
+ 	GENERATED_SP_FUNCS=
+ fi
+ 
+-echo "$as_me:15909: checking if you want to build with terminal-driver" >&5
++echo "$as_me:15912: 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.
+@@ -15916,7 +15919,7 @@
+ else
+   with_term_driver=no
+ fi;
+-echo "$as_me:15919: result: $with_term_driver" >&5
++echo "$as_me:15922: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+ 
+@@ -15925,19 +15928,19 @@
+ EOF
+ 
+ 	if test "x$with_termlib" != xno ; then
+-		{ { echo "$as_me:15928: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:15931: 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:15933: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:15936: 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:15940: checking for extended use of const keyword" >&5
++echo "$as_me:15943: 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.
+@@ -15947,7 +15950,7 @@
+ else
+   with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:15950: result: $with_ext_const" >&5
++echo "$as_me:15953: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -15955,7 +15958,7 @@
+ fi
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:15958: checking if you want to use extended colors" >&5
++echo "$as_me:15961: 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.
+@@ -15965,12 +15968,12 @@
+ else
+   with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:15968: result: $with_ext_colors" >&5
++echo "$as_me:15971: 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:15973: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:15976: 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)
+@@ -15981,7 +15984,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:15984: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:15987: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16009,7 +16012,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:16012: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:16015: 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.
+@@ -16019,7 +16022,7 @@
+ else
+   with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:16022: result: $with_ext_mouse" >&5
++echo "$as_me:16025: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ if test "x$with_ext_mouse" = xyes ; then
+ 
+@@ -16029,7 +16032,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16032: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16035: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16046,7 +16049,7 @@
+ fi
+ 
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:16049: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:16052: 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.
+@@ -16056,7 +16059,7 @@
+ else
+   with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:16059: result: $with_ext_putwin" >&5
++echo "$as_me:16062: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+ 
+@@ -16066,7 +16069,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16069: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:16072: 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.
+@@ -16076,7 +16079,7 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:16079: result: $with_no_padding" >&5
++echo "$as_me:16082: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16084,7 +16087,7 @@
+ EOF
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:16087: checking if you want SIGWINCH handler" >&5
++echo "$as_me:16090: 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.
+@@ -16094,7 +16097,7 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:16097: result: $with_sigwinch" >&5
++echo "$as_me:16100: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ if test "x$with_sigwinch" = xyes
+ then
+@@ -16109,7 +16112,7 @@
+ fi
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:16112: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:16115: 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.
+@@ -16119,7 +16122,7 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:16122: result: $with_tcap_names" >&5
++echo "$as_me:16125: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ if test "x$with_tcap_names" = xyes; then
+@@ -16133,7 +16136,7 @@
+ 
+ ##############################################################################
+ 
+-echo "$as_me:16136: checking if you want to link with the pthread library" >&5
++echo "$as_me:16139: 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.
+@@ -16143,27 +16146,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:16146: result: $with_pthread" >&5
++echo "$as_me:16149: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:16150: checking for pthread.h" >&5
++	echo "$as_me:16153: 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 16156 "configure"
++#line 16159 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16160: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16163: \"$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:16166: \$? = $ac_status" >&5
++  echo "$as_me:16169: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16182,7 +16185,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16185: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:16188: 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
+ 
+@@ -16192,7 +16195,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:16195: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:16198: 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"
+ 
+@@ -16213,7 +16216,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16216 "configure"
++#line 16219 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16230,16 +16233,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16233: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16236: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16236: \$? = $ac_status" >&5
++  echo "$as_me:16239: \$? = $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:16242: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16242: \$? = $ac_status" >&5
++  echo "$as_me:16245: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -16249,7 +16252,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:16252: result: $with_pthread" >&5
++	    echo "$as_me:16255: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -16277,7 +16280,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:16280: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:16283: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -16287,13 +16290,13 @@
+ fi
+ 
+ if test "x$with_pthread" != xno; then
+-	echo "$as_me:16290: checking for pthread_kill" >&5
++	echo "$as_me:16293: 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 16296 "configure"
++#line 16299 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16324,16 +16327,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16327: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16330: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16330: \$? = $ac_status" >&5
++  echo "$as_me:16333: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16333: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16336: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16336: \$? = $ac_status" >&5
++  echo "$as_me:16339: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_pthread_kill=yes
+ else
+@@ -16343,11 +16346,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16346: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:16349: 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:16350: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:16353: 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.
+@@ -16357,7 +16360,7 @@
+ else
+   use_pthreads_eintr=no
+ fi;
+-		echo "$as_me:16360: result: $use_pthreads_eintr" >&5
++		echo "$as_me:16363: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ 		if test "x$use_pthreads_eintr" = xyes ; then
+ 
+@@ -16368,7 +16371,7 @@
+ 		fi
+ fi
+ 
+-	echo "$as_me:16371: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:16374: 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.
+@@ -16378,18 +16381,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-	echo "$as_me:16381: result: $use_weak_symbols" >&5
++	echo "$as_me:16384: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ 	if test "x$use_weak_symbols" = xyes ; then
+ 
+-echo "$as_me:16385: checking if $CC supports weak symbols" >&5
++echo "$as_me:16388: 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 16392 "configure"
++#line 16395 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16415,16 +16418,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16418: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16421: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16421: \$? = $ac_status" >&5
++  echo "$as_me:16424: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16424: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16427: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16427: \$? = $ac_status" >&5
++  echo "$as_me:16430: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -16435,7 +16438,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16438: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:16441: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ 	else
+@@ -16485,7 +16488,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:16488: checking if you want reentrant code" >&5
++echo "$as_me:16491: 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.
+@@ -16495,7 +16498,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:16498: result: $with_reentrant" >&5
++echo "$as_me:16501: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -16584,7 +16587,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16587: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16590: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16596,7 +16599,7 @@
+ 	NCURSES_SIZE_T=$cf_dft_ordinate_type
+ fi
+ 
+-echo "$as_me:16599: checking whether curses library structures should be opaque" >&5
++echo "$as_me:16602: checking whether curses library structures should be opaque" >&5
+ echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
+@@ -16618,16 +16621,16 @@
+ 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16621: result: $enable_opaque_curses" >&5
++echo "$as_me:16624: 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:16626: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:16629: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:16630: checking whether form library structures should be opaque" >&5
++echo "$as_me:16633: checking whether form library structures should be opaque" >&5
+ echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-form or --disable-opaque-form was given.
+@@ -16644,10 +16647,10 @@
+ 	enable_opaque_form=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16647: result: $enable_opaque_form" >&5
++echo "$as_me:16650: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+ 
+-echo "$as_me:16650: checking whether menu library structures should be opaque" >&5
++echo "$as_me:16653: checking whether menu library structures should be opaque" >&5
+ echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
+@@ -16664,10 +16667,10 @@
+ 	enable_opaque_menu=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16667: result: $enable_opaque_menu" >&5
++echo "$as_me:16670: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+ 
+-echo "$as_me:16670: checking whether panel library structures should be opaque" >&5
++echo "$as_me:16673: checking whether panel library structures should be opaque" >&5
+ echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
+@@ -16684,7 +16687,7 @@
+ 	enable_opaque_panel=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16687: result: $enable_opaque_panel" >&5
++echo "$as_me:16690: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+ 
+ NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -16694,7 +16697,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:16697: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:16700: 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.
+@@ -16704,7 +16707,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:16707: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:16710: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -16717,7 +16720,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:16720: checking if you want all development code" >&5
++echo "$as_me:16723: 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.
+@@ -16727,11 +16730,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:16730: result: $with_develop" >&5
++echo "$as_me:16733: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###   use option --enable-check-size to detect screensize with CPR
+-echo "$as_me:16734: checking if you want to check screensize of serial terminals" >&5
++echo "$as_me:16737: checking if you want to check screensize of serial terminals" >&5
+ echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
+ 
+ # Check whether --enable-check-size or --disable-check-size was given.
+@@ -16741,7 +16744,7 @@
+ else
+   enable_check_size=$with_develop
+ fi;
+-echo "$as_me:16744: result: $enable_check_size" >&5
++echo "$as_me:16747: result: $enable_check_size" >&5
+ echo "${ECHO_T}$enable_check_size" >&6
+ test "x$enable_check_size" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16749,7 +16752,7 @@
+ EOF
+ 
+ ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
+-echo "$as_me:16752: checking if you want hard-tabs code" >&5
++echo "$as_me:16755: 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.
+@@ -16759,7 +16762,7 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:16762: result: $enable_hard_tabs" >&5
++echo "$as_me:16765: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16767,7 +16770,7 @@
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:16770: checking if you want limited support for xmc" >&5
++echo "$as_me:16773: 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.
+@@ -16777,7 +16780,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:16780: result: $enable_xmc_glitch" >&5
++echo "$as_me:16783: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16787,7 +16790,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:16790: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:16793: 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.
+@@ -16797,7 +16800,7 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:16800: result: $with_assumed_color" >&5
++echo "$as_me:16803: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16805,7 +16808,7 @@
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:16808: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:16811: 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.
+@@ -16815,7 +16818,7 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:16818: result: $with_hashmap" >&5
++echo "$as_me:16821: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16823,7 +16826,7 @@
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:16826: checking if you want colorfgbg code" >&5
++echo "$as_me:16829: 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.
+@@ -16833,7 +16836,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:16836: result: $with_colorfgbg" >&5
++echo "$as_me:16839: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16841,7 +16844,7 @@
+ EOF
+ 
+ ###   use option --enable-fvisibility to turn on use of gcc-specific feature
+-echo "$as_me:16844: checking if you want to use gcc -fvisibility option" >&5
++echo "$as_me:16847: 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.
+@@ -16851,14 +16854,14 @@
+ else
+   cf_with_fvisibility=no
+ fi;
+-echo "$as_me:16854: result: $cf_with_fvisibility" >&5
++echo "$as_me:16857: 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:16861: checking if $CC -fvisibility=hidden option works" >&5
++echo "$as_me:16864: 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
+@@ -16867,7 +16870,7 @@
+     cf_save_cflags="$CFLAGS"
+     CFLAGS="$CFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16870 "configure"
++#line 16873 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16883,16 +16886,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16886: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16889: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16889: \$? = $ac_status" >&5
++  echo "$as_me:16892: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16892: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16895: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16895: \$? = $ac_status" >&5
++  echo "$as_me:16898: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden=yes
+ else
+@@ -16904,7 +16907,7 @@
+     CFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16907: result: $cf_cv_fvisibility_hidden" >&5
++echo "$as_me:16910: result: $cf_cv_fvisibility_hidden" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
+ 
+ 	if test "x$cf_cv_fvisibility_hidden" = xyes
+@@ -17019,7 +17022,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:17022: checking if $CXX -fvisibility=hidden option works" >&5
++echo "$as_me:17025: 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
+@@ -17028,7 +17031,7 @@
+     cf_save_cflags="$CXXFLAGS"
+     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17031 "configure"
++#line 17034 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -17044,16 +17047,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17047: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17050: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17050: \$? = $ac_status" >&5
++  echo "$as_me:17053: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17053: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17056: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17056: \$? = $ac_status" >&5
++  echo "$as_me:17059: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden2=yes
+ else
+@@ -17065,7 +17068,7 @@
+     CXXFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:17068: result: $cf_cv_fvisibility_hidden2" >&5
++echo "$as_me:17071: result: $cf_cv_fvisibility_hidden2" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
+ 
+ 		if test "x$cf_cv_fvisibility_hidden2" = xyes
+@@ -17188,7 +17191,7 @@
+ fi
+ 
+ ###   use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:17191: checking if you want interop bindings" >&5
++echo "$as_me:17194: 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.
+@@ -17198,13 +17201,13 @@
+ else
+   with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:17201: result: $with_exp_interop" >&5
++echo "$as_me:17204: 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:17207: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:17210: 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.
+@@ -17214,13 +17217,13 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:17217: result: $with_safe_sprintf" >&5
++echo "$as_me:17220: 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:17223: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:17226: 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.
+@@ -17230,7 +17233,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:17233: result: $with_scroll_hints" >&5
++echo "$as_me:17236: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -17239,7 +17242,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17242: checking if you want wgetch-events code" >&5
++echo "$as_me:17245: 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.
+@@ -17249,7 +17252,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:17252: result: $with_wgetch_events" >&5
++echo "$as_me:17255: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ if test "x$with_wgetch_events" = xyes ; then
+ 
+@@ -17264,7 +17267,7 @@
+ 
+ case "$cf_cv_system_name" in
+ (*mingw32*|*mingw64*|*-msvc*)
+-	echo "$as_me:17267: checking if you want experimental-Windows driver" >&5
++	echo "$as_me:17270: 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.
+@@ -17274,7 +17277,7 @@
+ else
+   with_exp_win32=no
+ fi;
+-	echo "$as_me:17277: result: $with_exp_win32" >&5
++	echo "$as_me:17280: result: $with_exp_win32" >&5
+ echo "${ECHO_T}$with_exp_win32" >&6
+ 	if test "x$with_exp_win32" = xyes
+ 	then
+@@ -17300,7 +17303,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:17303: checking if you want to see long compiling messages" >&5
++echo "$as_me:17306: 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.
+@@ -17334,7 +17337,7 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:17337: result: $enableval" >&5
++echo "$as_me:17340: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ if test "x$enable_echo" = xyes; then
+@@ -17347,7 +17350,7 @@
+ 
+ # --disable-stripping is used for debugging
+ 
+-echo "$as_me:17350: checking if you want to install stripped executables" >&5
++echo "$as_me:17353: 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.
+@@ -17364,7 +17367,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:17367: result: $enable_stripping" >&5
++echo "$as_me:17370: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -17375,7 +17378,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:17378: checking if install accepts -p option" >&5
++echo "$as_me:17381: 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
+@@ -17406,10 +17409,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:17409: result: $cf_cv_install_p" >&5
++echo "$as_me:17412: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:17412: checking if install needs to be told about ownership" >&5
++echo "$as_me:17415: 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)
+@@ -17420,7 +17423,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17423: result: $with_install_o" >&5
++echo "$as_me:17426: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -17431,7 +17434,7 @@
+ 
+ if test -n "$INSTALL_OPT_S"
+ then
+-	echo "$as_me:17434: checking if you want to specify strip-program" >&5
++	echo "$as_me:17437: checking if you want to specify strip-program" >&5
+ echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
+ 
+ # Check whether --with-strip-program or --without-strip-program was given.
+@@ -17441,11 +17444,11 @@
+ else
+   with_strip_program=no
+ fi;
+-	echo "$as_me:17444: result: $with_strip_program" >&5
++	echo "$as_me:17447: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ 	if test "$with_strip_program" != no
+ 	then
+-		echo "$as_me:17448: checking if strip-program is supported with this installer" >&5
++		echo "$as_me:17451: checking if strip-program is supported with this installer" >&5
+ echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
+ 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
+ 		check_install_strip=no
+@@ -17466,11 +17469,11 @@
+ 				done
+ 			fi
+ 		fi
+-		echo "$as_me:17469: result: $check_install_strip" >&5
++		echo "$as_me:17472: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ 		case "$check_install_strip" in
+ 		(no)
+-			{ echo "$as_me:17473: WARNING: $cf_install_program does not support strip program option" >&5
++			{ echo "$as_me:17476: WARNING: $cf_install_program does not support strip program option" >&5
+ echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
+ 			with_strip_program=no
+ 			;;
+@@ -17485,7 +17488,7 @@
+ 			chmod +x "$INSTALL"
+ 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
+ 
+-echo "${as_me:-configure}:17488: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:17491: testing created $INSTALL ..." 1>&5
+ 
+ 			;;
+ 		(option)
+@@ -17511,7 +17514,7 @@
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+ 
+-echo "$as_me:17514: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:17517: 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.
+@@ -17528,17 +17531,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:17531: result: $enable_stdnoreturn" >&5
++echo "$as_me:17534: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:17535: checking for C11 _Noreturn feature" >&5
++echo "$as_me:17538: 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 17541 "configure"
++#line 17544 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17554,16 +17557,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17557: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17560: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17560: \$? = $ac_status" >&5
++  echo "$as_me:17563: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17563: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17566: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17566: \$? = $ac_status" >&5
++  echo "$as_me:17569: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -17574,7 +17577,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17577: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:17580: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -17630,16 +17633,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17633: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17636: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17638: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17641: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17642: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17645: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17678,16 +17681,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17681: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17684: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17686: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17689: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17690: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17693: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17726,23 +17729,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17729: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17732: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17734: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17737: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17738: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17741: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:17745: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:17748: 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.
+@@ -17759,7 +17762,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:17762: result: $enable_warnings" >&5
++echo "$as_me:17765: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -17783,10 +17786,10 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17786 "configure"
++#line 17789 "configure"
+ #include "confdefs.h"
+ 
+-#include 
++$ac_includes_default
+ #include 
+ 
+ int
+@@ -17798,32 +17801,32 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17801: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17804: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17804: \$? = $ac_status" >&5
++  echo "$as_me:17807: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17807: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17810: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17810: \$? = $ac_status" >&5
++  echo "$as_me:17813: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:17813: checking for X11/Xt const-feature" >&5
++echo "$as_me:17816: 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 17820 "configure"
++#line 17823 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+ #undef  XTSTRINGDEFINES	/* X11R5 and later */
+-#include 
++$ac_includes_default
+ #include 
+ 
+ int
+@@ -17835,16 +17838,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17838: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17841: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17841: \$? = $ac_status" >&5
++  echo "$as_me:17844: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17844: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17847: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17847: \$? = $ac_status" >&5
++  echo "$as_me:17850: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -17859,7 +17862,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17862: result: $cf_cv_const_x_string" >&5
++echo "$as_me:17865: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -17888,8 +17891,8 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:17910: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -17920,12 +17923,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17923: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17926: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17926: \$? = $ac_status" >&5
++  echo "$as_me:17929: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17928: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17931: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -17933,7 +17936,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:17936: checking for $CC warning options..." >&5
++	{ echo "$as_me:17939: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -17956,12 +17959,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:17959: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17962: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17962: \$? = $ac_status" >&5
++  echo "$as_me:17965: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17964: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17967: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -17969,7 +17972,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17972: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17975: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17979,7 +17982,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17982: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17985: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -18012,10 +18015,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:18015: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:18018: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -18065,12 +18068,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:18068: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18071: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18071: \$? = $ac_status" >&5
++  echo "$as_me:18074: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18073: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:18076: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -18142,12 +18145,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:18145: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:18148: 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 18150 "configure"
++#line 18153 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18164,16 +18167,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18167: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18170: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18170: \$? = $ac_status" >&5
++  echo "$as_me:18173: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18173: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18176: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18176: \$? = $ac_status" >&5
++  echo "$as_me:18179: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -18184,7 +18187,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:18187: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:18190: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -18193,11 +18196,11 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:18196: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:18199: 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 18200 "configure"
++#line 18203 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18214,16 +18217,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18217: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18220: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18220: \$? = $ac_status" >&5
++  echo "$as_me:18223: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18223: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18226: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18226: \$? = $ac_status" >&5
++  echo "$as_me:18229: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_CPLUSPLUS=yes
+ 
+@@ -18233,7 +18236,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:18236: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:18239: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -18242,30 +18245,30 @@
+ if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:18245: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:18248: 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:18252: checking version of $CC" >&5
++	echo "$as_me:18255: 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:18256: result: $CLANG_VERSION" >&5
++	echo "$as_me:18259: 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:18263: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:18266: 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 18268 "configure"
++#line 18271 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -18279,16 +18282,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18282: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18285: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18285: \$? = $ac_status" >&5
++  echo "$as_me:18288: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18288: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18291: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18291: \$? = $ac_status" >&5
++  echo "$as_me:18294: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -18299,13 +18302,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:18302: result: $cf_clang_optok" >&5
++		echo "$as_me:18305: 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}:18308: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:18311: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -18322,7 +18325,7 @@
+ ac_main_return="return"
+ 
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:18346: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -18357,12 +18360,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:18360: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18363: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18363: \$? = $ac_status" >&5
++  echo "$as_me:18366: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18365: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18368: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -18371,7 +18374,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:18374: checking for $CXX warning options..." >&5
++	{ echo "$as_me:18377: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -18401,16 +18404,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:18404: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18407: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18407: \$? = $ac_status" >&5
++  echo "$as_me:18410: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18409: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18412: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:18413: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18416: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -18428,7 +18431,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:18431: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:18434: 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.
+@@ -18438,7 +18441,7 @@
+ else
+   enable_string_hacks=no
+ fi;
+-echo "$as_me:18441: result: $enable_string_hacks" >&5
++echo "$as_me:18444: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+ 
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -18447,15 +18450,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:18450: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:18453: 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:18452: checking for strlcat" >&5
++	echo "$as_me:18455: 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 18458 "configure"
++#line 18461 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18486,16 +18489,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18489: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18492: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18492: \$? = $ac_status" >&5
++  echo "$as_me:18495: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18495: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18498: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18498: \$? = $ac_status" >&5
++  echo "$as_me:18501: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -18505,7 +18508,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18508: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:18511: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+ 
+@@ -18515,7 +18518,7 @@
+ 
+ else
+ 
+-		echo "$as_me:18518: checking for strlcat in -lbsd" >&5
++		echo "$as_me:18521: 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
+@@ -18523,7 +18526,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18526 "configure"
++#line 18529 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18542,16 +18545,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18545: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18548: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18548: \$? = $ac_status" >&5
++  echo "$as_me:18551: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18551: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18554: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18554: \$? = $ac_status" >&5
++  echo "$as_me:18557: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -18562,7 +18565,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18565: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:18568: 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
+ 
+@@ -18585,23 +18588,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18588: checking for $ac_header" >&5
++echo "$as_me:18591: 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 18594 "configure"
++#line 18597 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18598: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18601: \"$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:18604: \$? = $ac_status" >&5
++  echo "$as_me:18607: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18620,7 +18623,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18623: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18626: 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:18647: 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 18650 "configure"
++#line 18653 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18678,16 +18681,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18681: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18684: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18684: \$? = $ac_status" >&5
++  echo "$as_me:18687: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18687: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18690: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18690: \$? = $ac_status" >&5
++  echo "$as_me:18693: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -18697,7 +18700,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18700: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:18703: 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:18716: 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.
+@@ -18720,7 +18723,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:18723: result: $with_assertions" >&5
++echo "$as_me:18726: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -18736,7 +18739,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:18739: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:18742: 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.
+@@ -18758,7 +18761,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:18761: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:18764: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18872,23 +18875,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:18875: checking for dmalloc.h" >&5
++	echo "$as_me:18878: 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 18881 "configure"
++#line 18884 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:18885: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18888: \"$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:18891: \$? = $ac_status" >&5
++  echo "$as_me:18894: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18907,11 +18910,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18910: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:18913: 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:18914: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:18917: 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
+@@ -18919,7 +18922,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18922 "configure"
++#line 18925 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18938,16 +18941,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18941: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18944: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18944: \$? = $ac_status" >&5
++  echo "$as_me:18947: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18947: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18950: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18950: \$? = $ac_status" >&5
++  echo "$as_me:18953: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -18958,7 +18961,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18961: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:18964: 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:18979: 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.
+@@ -18995,7 +18998,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:18998: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:19001: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19109,23 +19112,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:19112: checking for dbmalloc.h" >&5
++	echo "$as_me:19115: 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 19118 "configure"
++#line 19121 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:19122: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:19125: \"$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:19128: \$? = $ac_status" >&5
++  echo "$as_me:19131: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19144,11 +19147,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:19147: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:19150: 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:19151: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:19154: 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
+@@ -19156,7 +19159,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19159 "configure"
++#line 19162 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19175,16 +19178,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19178: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19181: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19181: \$? = $ac_status" >&5
++  echo "$as_me:19184: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19184: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19187: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19187: \$? = $ac_status" >&5
++  echo "$as_me:19190: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -19195,7 +19198,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19198: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:19201: 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:19216: 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.
+@@ -19232,7 +19235,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:19235: result: ${with_valgrind:-no}" >&5
++echo "$as_me:19238: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19345,7 +19348,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19348: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:19351: 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.
+@@ -19356,7 +19359,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:19359: result: $with_no_leaks" >&5
++echo "$as_me:19362: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -19408,7 +19411,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19411: checking whether to add trace feature to all models" >&5
++echo "$as_me:19414: 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.
+@@ -19418,7 +19421,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:19421: result: $cf_with_trace" >&5
++echo "$as_me:19424: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -19438,7 +19441,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:19441: checking if we want to use GNAT projects" >&5
++echo "$as_me:19444: 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.
+@@ -19455,7 +19458,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:19458: result: $enable_gnat_projects" >&5
++echo "$as_me:19461: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -19468,14 +19471,14 @@
+ 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+ 	fi
+ 
+-echo "$as_me:19471: checking if ssp library is needed" >&5
++echo "$as_me:19474: 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 19478 "configure"
++#line 19481 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19492,16 +19495,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19495: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19498: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19498: \$? = $ac_status" >&5
++  echo "$as_me:19501: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19501: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19504: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19504: \$? = $ac_status" >&5
++  echo "$as_me:19507: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -19511,7 +19514,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19514 "configure"
++#line 19517 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19528,16 +19531,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19531: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19534: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19534: \$? = $ac_status" >&5
++  echo "$as_me:19537: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19537: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19540: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19540: \$? = $ac_status" >&5
++  echo "$as_me:19543: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -19551,7 +19554,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19554: result: $cf_cv_need_libssp" >&5
++echo "$as_me:19557: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -19580,14 +19583,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19583: checking if -lm needed for math functions" >&5
++echo "$as_me:19586: 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 19590 "configure"
++#line 19593 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19603,16 +19606,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19606: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19609: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19609: \$? = $ac_status" >&5
++  echo "$as_me:19612: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19612: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19615: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19615: \$? = $ac_status" >&5
++  echo "$as_me:19618: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -19622,7 +19625,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19625: result: $cf_cv_need_libm" >&5
++echo "$as_me:19628: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ 
+ if test "$cf_cv_need_libm" = yes
+@@ -19630,14 +19633,14 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lm"
+-	echo "$as_me:19633: checking if -lm is available for math functions" >&5
++	echo "$as_me:19636: checking if -lm is available for math functions" >&5
+ echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
+ if test "${cf_cv_have_libm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19640 "configure"
++#line 19643 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19653,16 +19656,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19656: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19659: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19659: \$? = $ac_status" >&5
++  echo "$as_me:19662: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19662: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19665: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19665: \$? = $ac_status" >&5
++  echo "$as_me:19668: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_libm=yes
+ else
+@@ -19672,7 +19675,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19675: result: $cf_cv_have_libm" >&5
++echo "$as_me:19678: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ 	LIBS="$cf_save_LIBS"
+ 
+@@ -19694,13 +19697,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:19697: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:19700: 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 19703 "configure"
++#line 19706 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -19716,16 +19719,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19719: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19722: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19722: \$? = $ac_status" >&5
++  echo "$as_me:19725: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19725: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19728: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19728: \$? = $ac_status" >&5
++  echo "$as_me:19731: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -19735,7 +19738,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19738: result: $ac_cv_header_time" >&5
++echo "$as_me:19741: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -19750,7 +19753,7 @@
+ case "$host_os" in
+ (mingw*)
+ 	# -lsystre -ltre -lintl -liconv
+-	echo "$as_me:19753: checking for regcomp in -lsystre" >&5
++	echo "$as_me:19756: 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
+@@ -19758,7 +19761,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsystre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19761 "configure"
++#line 19764 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19777,16 +19780,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19780: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19783: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19783: \$? = $ac_status" >&5
++  echo "$as_me:19786: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19786: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19789: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19789: \$? = $ac_status" >&5
++  echo "$as_me:19792: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_systre_regcomp=yes
+ else
+@@ -19797,11 +19800,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19800: result: $ac_cv_lib_systre_regcomp" >&5
++echo "$as_me:19803: 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:19804: checking for libiconv_open in -liconv" >&5
++		echo "$as_me:19807: 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
+@@ -19809,7 +19812,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19812 "configure"
++#line 19815 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19828,16 +19831,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19831: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19834: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19834: \$? = $ac_status" >&5
++  echo "$as_me:19837: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19837: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19840: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19840: \$? = $ac_status" >&5
++  echo "$as_me:19843: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_iconv_libiconv_open=yes
+ else
+@@ -19848,7 +19851,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19851: result: $ac_cv_lib_iconv_libiconv_open" >&5
++echo "$as_me:19854: 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
+ 
+@@ -19870,7 +19873,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19873: checking for libintl_gettext in -lintl" >&5
++		echo "$as_me:19876: 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
+@@ -19878,7 +19881,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19881 "configure"
++#line 19884 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19897,16 +19900,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19900: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19903: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19903: \$? = $ac_status" >&5
++  echo "$as_me:19906: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19906: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19909: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19909: \$? = $ac_status" >&5
++  echo "$as_me:19912: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_intl_libintl_gettext=yes
+ else
+@@ -19917,7 +19920,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19920: result: $ac_cv_lib_intl_libintl_gettext" >&5
++echo "$as_me:19923: 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
+ 
+@@ -19939,7 +19942,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19942: checking for tre_regcomp in -ltre" >&5
++		echo "$as_me:19945: 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
+@@ -19947,7 +19950,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19950 "configure"
++#line 19953 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19966,16 +19969,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19969: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19972: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19972: \$? = $ac_status" >&5
++  echo "$as_me:19975: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19975: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19978: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19978: \$? = $ac_status" >&5
++  echo "$as_me:19981: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_tre_tre_regcomp=yes
+ else
+@@ -19986,7 +19989,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19989: result: $ac_cv_lib_tre_tre_regcomp" >&5
++echo "$as_me:19992: 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
+ 
+@@ -20028,7 +20031,7 @@
+ 
+ else
+ 
+-		echo "$as_me:20031: checking for regcomp in -lgnurx" >&5
++		echo "$as_me:20034: 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
+@@ -20036,7 +20039,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgnurx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20039 "configure"
++#line 20042 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20055,16 +20058,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20058: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20061: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20061: \$? = $ac_status" >&5
++  echo "$as_me:20064: \$? = $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:20067: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20067: \$? = $ac_status" >&5
++  echo "$as_me:20070: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gnurx_regcomp=yes
+ else
+@@ -20075,7 +20078,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20078: result: $ac_cv_lib_gnurx_regcomp" >&5
++echo "$as_me:20081: 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
+ 
+@@ -20103,13 +20106,13 @@
+ 	;;
+ (*)
+ 	cf_regex_libs="regex re"
+-	echo "$as_me:20106: checking for regcomp" >&5
++	echo "$as_me:20109: 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 20112 "configure"
++#line 20115 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20140,16 +20143,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20143: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20146: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20146: \$? = $ac_status" >&5
++  echo "$as_me:20149: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20149: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20152: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20152: \$? = $ac_status" >&5
++  echo "$as_me:20155: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -20159,7 +20162,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20162: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:20165: 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
+@@ -20168,7 +20171,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:20171: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:20174: 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
+@@ -20176,7 +20179,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20179 "configure"
++#line 20182 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20195,16 +20198,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20198: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20201: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20201: \$? = $ac_status" >&5
++  echo "$as_me:20204: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20204: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20207: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20207: \$? = $ac_status" >&5
++  echo "$as_me:20210: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -20215,7 +20218,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20218: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:20221: 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
+ 
+@@ -20247,13 +20250,13 @@
+ esac
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:20250: checking for compile" >&5
++	echo "$as_me:20253: 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 20256 "configure"
++#line 20259 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20284,16 +20287,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20287: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20290: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20290: \$? = $ac_status" >&5
++  echo "$as_me:20293: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20293: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20296: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20296: \$? = $ac_status" >&5
++  echo "$as_me:20299: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -20303,13 +20306,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20306: result: $ac_cv_func_compile" >&5
++echo "$as_me:20309: 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:20312: checking for compile in -lgen" >&5
++		echo "$as_me:20315: 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
+@@ -20317,7 +20320,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20320 "configure"
++#line 20323 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20336,16 +20339,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20339: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20342: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20342: \$? = $ac_status" >&5
++  echo "$as_me:20345: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20345: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20348: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20348: \$? = $ac_status" >&5
++  echo "$as_me:20351: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -20356,7 +20359,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20359: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:20362: 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
+ 
+@@ -20384,11 +20387,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:20387: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:20390: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:20391: checking for regular-expression headers" >&5
++echo "$as_me:20394: 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
+@@ -20400,7 +20403,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20403 "configure"
++#line 20406 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -20417,16 +20420,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20420: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20423: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20423: \$? = $ac_status" >&5
++  echo "$as_me:20426: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20426: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20429: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20429: \$? = $ac_status" >&5
++  echo "$as_me:20432: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20443,15 +20446,16 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20446 "configure"
++#line 20449 "configure"
+ #include "confdefs.h"
+ #include 
++#include 
+ #include <$cf_regex_hdr>
+ int
+ main (void)
+ {
+ 
+-			regex_t *p = 0;
++			regex_t *p = NULL;
+ 			int x = regcomp(p, "", 0);
+ 			int y = regexec(p, "", 0, 0, 0);
+ 			(void)x;
+@@ -20463,16 +20467,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20466: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20470: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20469: \$? = $ac_status" >&5
++  echo "$as_me:20473: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20472: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20476: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20475: \$? = $ac_status" >&5
++  echo "$as_me:20479: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20488,11 +20492,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:20491: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:20495: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case "$cf_cv_regex_hdrs" in
+-	(no)		{ echo "$as_me:20495: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:20499: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -20530,23 +20534,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20533: checking for $ac_header" >&5
++echo "$as_me:20537: 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 20539 "configure"
++#line 20543 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20543: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20547: \"$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:20549: \$? = $ac_status" >&5
++  echo "$as_me:20553: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20565,7 +20569,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20568: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20572: 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:20585: 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 20587 "configure"
++#line 20591 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20591: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20595: \"$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:20597: \$? = $ac_status" >&5
++  echo "$as_me:20601: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20613,7 +20617,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20616: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20620: 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:20630: 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
+@@ -20633,7 +20637,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20636 "configure"
++#line 20640 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20646,16 +20650,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20649: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20653: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20652: \$? = $ac_status" >&5
++  echo "$as_me:20656: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20655: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20659: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20658: \$? = $ac_status" >&5
++  echo "$as_me:20662: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -20667,7 +20671,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20670: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20674: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -20684,14 +20688,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20687: checking if external environ is declared" >&5
++echo "$as_me:20691: 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 20694 "configure"
++#line 20698 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -20704,16 +20708,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20707: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20711: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20710: \$? = $ac_status" >&5
++  echo "$as_me:20714: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20713: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20717: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20716: \$? = $ac_status" >&5
++  echo "$as_me:20720: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_environ=yes
+ else
+@@ -20724,7 +20728,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20727: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20731: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+ 
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20739,14 +20743,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:20742: checking if external environ exists" >&5
++echo "$as_me:20746: 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 20749 "configure"
++#line 20753 "configure"
+ #include "confdefs.h"
+ 
+ #undef environ
+@@ -20761,16 +20765,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20764: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20768: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20767: \$? = $ac_status" >&5
++  echo "$as_me:20771: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20770: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20774: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20773: \$? = $ac_status" >&5
++  echo "$as_me:20777: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_environ=yes
+ else
+@@ -20781,7 +20785,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20784: result: $cf_cv_have_environ" >&5
++echo "$as_me:20788: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+ 
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20794,13 +20798,13 @@
+ 
+ fi
+ 
+-echo "$as_me:20797: checking for getenv" >&5
++echo "$as_me:20801: 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 20803 "configure"
++#line 20807 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20831,16 +20835,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20834: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20838: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20837: \$? = $ac_status" >&5
++  echo "$as_me:20841: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20840: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20844: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20843: \$? = $ac_status" >&5
++  echo "$as_me:20847: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_getenv=yes
+ else
+@@ -20850,19 +20854,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20853: result: $ac_cv_func_getenv" >&5
++echo "$as_me:20857: 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:20859: checking for $ac_func" >&5
++echo "$as_me:20863: 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 20865 "configure"
++#line 20869 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20893,16 +20897,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20896: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20900: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20899: \$? = $ac_status" >&5
++  echo "$as_me:20903: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20902: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20906: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20905: \$? = $ac_status" >&5
++  echo "$as_me:20909: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -20912,7 +20916,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20915: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:20919: 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:20929: 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
+@@ -20932,7 +20936,7 @@
+   cf_cv_consistent_getenv=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20935 "configure"
++#line 20939 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -20976,7 +20980,7 @@
+ 	for (j = 0; environ[j]; ++j) {
+ 		mynames[j] = str_alloc(environ[j]);
+ 		equals = strchr(mynames[j], '=');
+-		if (equals != 0) {
++		if (equals != NULL) {
+ 			*equals++ = '\\0';
+ 			myvalues[j] = str_alloc(equals);
+ 		} else {
+@@ -21037,15 +21041,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21040: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21044: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21043: \$? = $ac_status" >&5
++  echo "$as_me:21047: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21045: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21049: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21048: \$? = $ac_status" >&5
++  echo "$as_me:21052: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_consistent_getenv=yes
+ else
+@@ -21058,7 +21062,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:21061: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:21065: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+ 
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -21073,18 +21077,18 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ 	test "x$cf_with_trace" = xyes
+ then
+-	{ echo "$as_me:21076: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++	{ echo "$as_me:21080: 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:21080: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:21084: 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 21087 "configure"
++#line 21091 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21104,16 +21108,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21107: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21111: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21110: \$? = $ac_status" >&5
++  echo "$as_me:21114: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21113: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21117: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21116: \$? = $ac_status" >&5
++  echo "$as_me:21120: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -21125,7 +21129,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21128: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:21132: 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
+@@ -21140,13 +21144,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:21143: checking for an ANSI C-conforming const" >&5
++echo "$as_me:21147: 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 21149 "configure"
++#line 21153 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21208,16 +21212,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21211: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21215: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21214: \$? = $ac_status" >&5
++  echo "$as_me:21218: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21217: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21221: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21220: \$? = $ac_status" >&5
++  echo "$as_me:21224: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -21227,7 +21231,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21230: result: $ac_cv_c_const" >&5
++echo "$as_me:21234: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -21237,7 +21241,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21240: checking for inline" >&5
++echo "$as_me:21244: 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
+@@ -21245,7 +21249,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21248 "configure"
++#line 21252 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo (void) {return 0; }
+@@ -21254,16 +21258,16 @@
+ 
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21257: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21261: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21260: \$? = $ac_status" >&5
++  echo "$as_me:21264: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21263: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21267: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21266: \$? = $ac_status" >&5
++  echo "$as_me:21270: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -21274,7 +21278,7 @@
+ done
+ 
+ fi
+-echo "$as_me:21277: result: $ac_cv_c_inline" >&5
++echo "$as_me:21281: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -21300,7 +21304,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:21303: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:21307: 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
+@@ -21309,7 +21313,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21312 "configure"
++#line 21316 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -21321,16 +21325,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21324: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21328: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21327: \$? = $ac_status" >&5
++  echo "$as_me:21331: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21330: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21334: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21333: \$? = $ac_status" >&5
++  echo "$as_me:21337: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -21342,7 +21346,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:21345: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:21349: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -21448,7 +21452,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:21451: checking for signal global datatype" >&5
++echo "$as_me:21455: 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
+@@ -21460,7 +21464,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21463 "configure"
++#line 21467 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21484,16 +21488,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21487: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21491: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21490: \$? = $ac_status" >&5
++  echo "$as_me:21494: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21493: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21497: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21496: \$? = $ac_status" >&5
++  echo "$as_me:21500: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21507,7 +21511,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21510: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21514: 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:21523: 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
+@@ -21526,7 +21530,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21529 "configure"
++#line 21533 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21534,7 +21538,7 @@
+ int main(void)
+ {
+ 	FILE *fp = fopen("cf_test.out", "w");
+-	if (fp != 0) {
++	if (fp != NULL) {
+ 		char *result = "long";
+ 		if (sizeof(unsigned long) > sizeof(unsigned int)) {
+ 			int n;
+@@ -21561,15 +21565,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21564: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21568: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21567: \$? = $ac_status" >&5
++  echo "$as_me:21571: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21569: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21573: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21572: \$? = $ac_status" >&5
++  echo "$as_me:21576: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21584,7 +21588,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21587: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21591: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:21603: 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 21606 "configure"
++#line 21610 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21615,16 +21619,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21618: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21622: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21621: \$? = $ac_status" >&5
++  echo "$as_me:21625: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21624: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21628: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21627: \$? = $ac_status" >&5
++  echo "$as_me:21631: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -21636,7 +21640,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21639: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21643: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -21652,14 +21656,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:21655: checking if external errno is declared" >&5
++echo "$as_me:21659: 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 21662 "configure"
++#line 21666 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21673,16 +21677,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21676: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21680: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21679: \$? = $ac_status" >&5
++  echo "$as_me:21683: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21682: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21686: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21685: \$? = $ac_status" >&5
++  echo "$as_me:21689: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -21693,7 +21697,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21696: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21700: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21708,14 +21712,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:21711: checking if external errno exists" >&5
++echo "$as_me:21715: 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 21718 "configure"
++#line 21722 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -21730,16 +21734,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21733: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21737: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21736: \$? = $ac_status" >&5
++  echo "$as_me:21740: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21739: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21743: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21742: \$? = $ac_status" >&5
++  echo "$as_me:21746: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -21750,7 +21754,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21753: result: $cf_cv_have_errno" >&5
++echo "$as_me:21757: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21763,7 +21767,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21766: checking if data-only library module links" >&5
++echo "$as_me:21770: 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
+@@ -21771,20 +21775,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:21781: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21780: \$? = $ac_status" >&5
++  echo "$as_me:21784: \$? = $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:21808: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21807: \$? = $ac_status" >&5
++  echo "$as_me:21811: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -21817,7 +21821,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21820 "configure"
++#line 21824 "configure"
+ #include "confdefs.h"
+ 
+ 	extern int testfunc(void);
+@@ -21828,15 +21832,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21831: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21835: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21834: \$? = $ac_status" >&5
++  echo "$as_me:21838: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21836: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21840: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21839: \$? = $ac_status" >&5
++  echo "$as_me:21843: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -21851,7 +21855,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21854: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21858: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21866,13 +21870,13 @@
+ ###	Checks for library functions.
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:21869: checking for clock_gettime" >&5
++echo "$as_me:21873: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21875 "configure"
++#line 21879 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21903,16 +21907,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21906: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21910: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21909: \$? = $ac_status" >&5
++  echo "$as_me:21913: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21912: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21916: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21915: \$? = $ac_status" >&5
++  echo "$as_me:21919: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -21922,12 +21926,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21925: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:21929: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:21930: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:21934: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21935,7 +21939,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21938 "configure"
++#line 21942 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21954,16 +21958,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21957: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21961: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21960: \$? = $ac_status" >&5
++  echo "$as_me:21964: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21963: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21967: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21966: \$? = $ac_status" >&5
++  echo "$as_me:21970: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -21974,7 +21978,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21977: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:21981: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -21986,14 +21990,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:21989: checking if clock_gettime links" >&5
++echo "$as_me:21993: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21996 "configure"
++#line 22000 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22011,16 +22015,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22014: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22018: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22017: \$? = $ac_status" >&5
++  echo "$as_me:22021: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22024: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22023: \$? = $ac_status" >&5
++  echo "$as_me:22027: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -22031,7 +22035,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22034: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:22038: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -22045,13 +22049,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:22048: checking for gettimeofday" >&5
++echo "$as_me:22052: 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 22054 "configure"
++#line 22058 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22082,16 +22086,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22085: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22089: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22088: \$? = $ac_status" >&5
++  echo "$as_me:22092: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22091: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22095: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22094: \$? = $ac_status" >&5
++  echo "$as_me:22098: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -22101,7 +22105,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22104: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:22108: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -22111,7 +22115,7 @@
+ 
+ else
+ 
+-echo "$as_me:22114: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:22118: 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
+@@ -22119,7 +22123,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22122 "configure"
++#line 22126 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22138,16 +22142,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22141: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22145: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22144: \$? = $ac_status" >&5
++  echo "$as_me:22148: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22147: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22151: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22150: \$? = $ac_status" >&5
++  echo "$as_me:22154: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -22158,7 +22162,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22161: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:22165: 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
+ 
+@@ -22217,13 +22221,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:22220: checking for $ac_func" >&5
++echo "$as_me:22224: 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 22226 "configure"
++#line 22230 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22254,16 +22258,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22257: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22261: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22260: \$? = $ac_status" >&5
++  echo "$as_me:22264: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22263: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22267: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22266: \$? = $ac_status" >&5
++  echo "$as_me:22270: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -22273,7 +22277,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22276: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:22280: 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:22290: 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 22293 "configure"
++#line 22297 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22305,16 +22309,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22308: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22312: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22311: \$? = $ac_status" >&5
++  echo "$as_me:22315: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22314: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22318: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22317: \$? = $ac_status" >&5
++  echo "$as_me:22321: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_PATH_TTYS=yes
+ else
+@@ -22324,7 +22328,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22327: result: $cf_cv_PATH_TTYS" >&5
++echo "$as_me:22331: result: $cf_cv_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
+ 
+ if test $cf_cv_PATH_TTYS = no
+@@ -22346,7 +22350,7 @@
+ 
+ if test $cf_cv_PATH_TTYS != no
+ then
+-	echo "$as_me:22349: checking if _PATH_TTYS file exists" >&5
++	echo "$as_me:22353: 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
+@@ -22356,7 +22360,7 @@
+   cf_cv_have_PATH_TTYS=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22359 "configure"
++#line 22363 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22365,19 +22369,19 @@
+ 
+ int main(void) {
+ 	FILE *fp = fopen(_PATH_TTYS, "r");
+-	${cf_cv_main_return:-return} (fp == 0);
++	${cf_cv_main_return:-return} (fp == NULL);
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22372: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22376: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22375: \$? = $ac_status" >&5
++  echo "$as_me:22379: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22377: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22381: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22380: \$? = $ac_status" >&5
++  echo "$as_me:22384: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_PATH_TTYS=yes
+ else
+@@ -22389,7 +22393,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22392: result: $cf_cv_have_PATH_TTYS" >&5
++echo "$as_me:22396: 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
+@@ -22401,14 +22405,14 @@
+ #define HAVE_PATH_TTYS 1
+ EOF
+ 
+-	echo "$as_me:22404: checking for getttynam" >&5
++	echo "$as_me:22408: 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 22411 "configure"
++#line 22415 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22420,16 +22424,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22423: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22427: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22426: \$? = $ac_status" >&5
++  echo "$as_me:22430: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22429: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22433: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22432: \$? = $ac_status" >&5
++  echo "$as_me:22436: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_getttynam=yes
+ else
+@@ -22439,7 +22443,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22442: result: $cf_cv_func_getttynam" >&5
++echo "$as_me:22446: 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
+@@ -22449,7 +22453,7 @@
+ 
+ if test "x$ac_cv_func_getopt" = xno && \
+    test "x$cf_with_progs$cf_with_tests" != xnono; then
+-	{ { echo "$as_me:22452: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:22456: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -22458,7 +22462,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:22461: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:22465: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -22471,14 +22475,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:22474: checking for terminal-capability database functions" >&5
++echo "$as_me:22478: 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 22481 "configure"
++#line 22485 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22498,16 +22502,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22501: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22505: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22504: \$? = $ac_status" >&5
++  echo "$as_me:22508: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22507: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22511: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22510: \$? = $ac_status" >&5
++  echo "$as_me:22514: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -22518,7 +22522,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22521: result: $cf_cv_cgetent" >&5
++echo "$as_me:22525: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -22528,14 +22532,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:22531: checking if cgetent uses const parameter" >&5
++echo "$as_me:22535: 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 22538 "configure"
++#line 22542 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -22558,16 +22562,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22561: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22565: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22564: \$? = $ac_status" >&5
++  echo "$as_me:22568: \$? = $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:22571: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22570: \$? = $ac_status" >&5
++  echo "$as_me:22574: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -22578,7 +22582,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22581: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:22585: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -22592,14 +22596,14 @@
+ 
+ fi
+ 
+-echo "$as_me:22595: checking for isascii" >&5
++echo "$as_me:22599: 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 22602 "configure"
++#line 22606 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22611,16 +22615,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22614: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22618: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22617: \$? = $ac_status" >&5
++  echo "$as_me:22621: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22620: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22624: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22623: \$? = $ac_status" >&5
++  echo "$as_me:22627: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -22631,7 +22635,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22634: result: $cf_cv_have_isascii" >&5
++echo "$as_me:22638: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -22639,10 +22643,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:22642: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:22646: 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 22645 "configure"
++#line 22649 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22656,16 +22660,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22659: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22663: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22662: \$? = $ac_status" >&5
++  echo "$as_me:22666: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22665: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22669: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22668: \$? = $ac_status" >&5
++  echo "$as_me:22672: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=no
+ else
+@@ -22673,7 +22677,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22676 "configure"
++#line 22680 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22688,16 +22692,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22691: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22695: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22694: \$? = $ac_status" >&5
++  echo "$as_me:22698: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22697: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22701: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22700: \$? = $ac_status" >&5
++  echo "$as_me:22704: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=yes
+ 
+@@ -22713,11 +22717,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:22716: result: $sigact_bad" >&5
++echo "$as_me:22720: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:22720: checking if nanosleep really works" >&5
++echo "$as_me:22724: 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
+@@ -22727,7 +22731,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22730 "configure"
++#line 22734 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22753,15 +22757,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22756: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22760: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22759: \$? = $ac_status" >&5
++  echo "$as_me:22763: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22761: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22765: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22764: \$? = $ac_status" >&5
++  echo "$as_me:22768: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -22773,7 +22777,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22776: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:22780: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -22790,23 +22794,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22793: checking for $ac_header" >&5
++echo "$as_me:22797: 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 22799 "configure"
++#line 22803 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22803: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22807: \"$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:22809: \$? = $ac_status" >&5
++  echo "$as_me:22813: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22825,7 +22829,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22828: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22832: 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:22849: 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 22848 "configure"
++#line 22852 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22857,16 +22861,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22860: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22864: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22863: \$? = $ac_status" >&5
++  echo "$as_me:22867: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22866: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22870: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22869: \$? = $ac_status" >&5
++  echo "$as_me:22873: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=no
+ else
+@@ -22874,7 +22878,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22877 "configure"
++#line 22881 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22888,16 +22892,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22891: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22895: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22894: \$? = $ac_status" >&5
++  echo "$as_me:22898: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22897: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22901: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22900: \$? = $ac_status" >&5
++  echo "$as_me:22904: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=unknown
+ else
+@@ -22913,19 +22917,19 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:22916: result: $termios_bad" >&5
++	echo "$as_me:22920: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:22921: checking for tcgetattr" >&5
++echo "$as_me:22925: 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 22928 "configure"
++#line 22932 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22953,16 +22957,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22956: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22960: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22959: \$? = $ac_status" >&5
++  echo "$as_me:22963: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22962: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22966: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22965: \$? = $ac_status" >&5
++  echo "$as_me:22969: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -22972,21 +22976,21 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22975: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:22979: 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:22982: checking for vsscanf function or workaround" >&5
++echo "$as_me:22986: 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 22989 "configure"
++#line 22993 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23012,16 +23016,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23015: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23019: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23018: \$? = $ac_status" >&5
++  echo "$as_me:23022: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23021: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23025: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23024: \$? = $ac_status" >&5
++  echo "$as_me:23028: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -23029,7 +23033,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23032 "configure"
++#line 23036 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23051,16 +23055,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23054: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23058: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23057: \$? = $ac_status" >&5
++  echo "$as_me:23061: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23060: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23064: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23063: \$? = $ac_status" >&5
++  echo "$as_me:23067: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -23068,7 +23072,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23071 "configure"
++#line 23075 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23090,16 +23094,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23093: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23097: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23096: \$? = $ac_status" >&5
++  echo "$as_me:23100: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23099: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23103: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23102: \$? = $ac_status" >&5
++  echo "$as_me:23106: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -23114,7 +23118,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23117: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:23121: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case "$cf_cv_func_vsscanf" in
+@@ -23140,23 +23144,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:23143: checking for $ac_header" >&5
++echo "$as_me:23147: 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 23149 "configure"
++#line 23153 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23153: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23157: \"$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:23159: \$? = $ac_status" >&5
++  echo "$as_me:23163: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23175,7 +23179,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23178: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23182: 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:23192: 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
+@@ -23196,7 +23200,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23199 "configure"
++#line 23203 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23231,15 +23235,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23234: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23238: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23237: \$? = $ac_status" >&5
++  echo "$as_me:23241: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23239: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23243: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23242: \$? = $ac_status" >&5
++  echo "$as_me:23246: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -23254,16 +23258,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:23257: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:23261: 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:23260: checking for mkstemp" >&5
++	echo "$as_me:23264: 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 23266 "configure"
++#line 23270 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23294,16 +23298,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23297: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23301: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23300: \$? = $ac_status" >&5
++  echo "$as_me:23304: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23303: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23307: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23306: \$? = $ac_status" >&5
++  echo "$as_me:23310: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -23313,7 +23317,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23316: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:23320: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -23334,21 +23338,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:23337: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:23341: 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:23340: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:23344: 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:23346: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:23350: 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 23351 "configure"
++#line 23355 "configure"
+ #include "confdefs.h"
+ #include 
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -23365,15 +23369,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23368: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23372: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23371: \$? = $ac_status" >&5
++  echo "$as_me:23375: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23373: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23377: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23376: \$? = $ac_status" >&5
++  echo "$as_me:23380: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -23386,7 +23390,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:23389: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:23393: 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
+ 
+@@ -23397,13 +23401,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:23400: checking for intptr_t" >&5
++echo "$as_me:23404: 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 23406 "configure"
++#line 23410 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23418,16 +23422,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23421: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23425: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23424: \$? = $ac_status" >&5
++  echo "$as_me:23428: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23427: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23431: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23430: \$? = $ac_status" >&5
++  echo "$as_me:23434: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -23437,7 +23441,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23440: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:23444: 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
+   :
+@@ -23449,13 +23453,13 @@
+ 
+ fi
+ 
+-echo "$as_me:23452: checking for ssize_t" >&5
++echo "$as_me:23456: 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 23458 "configure"
++#line 23462 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23470,16 +23474,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23473: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23477: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23476: \$? = $ac_status" >&5
++  echo "$as_me:23480: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23479: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23483: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23482: \$? = $ac_status" >&5
++  echo "$as_me:23486: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -23489,7 +23493,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23492: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:23496: 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
+   :
+@@ -23501,14 +23505,14 @@
+ 
+ fi
+ 
+-echo "$as_me:23504: checking for type sigaction_t" >&5
++echo "$as_me:23508: 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 23511 "configure"
++#line 23515 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23521,16 +23525,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23524: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23528: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23527: \$? = $ac_status" >&5
++  echo "$as_me:23531: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23530: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23534: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23533: \$? = $ac_status" >&5
++  echo "$as_me:23537: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -23541,14 +23545,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:23544: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:23548: 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:23551: checking declaration of size-change" >&5
++echo "$as_me:23555: 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
+@@ -23569,7 +23573,7 @@
+ 
+ 	fi
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23572 "configure"
++#line 23576 "configure"
+ #include "confdefs.h"
+ #include 
+ #ifdef HAVE_TERMIOS_H
+@@ -23619,16 +23623,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23622: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23626: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23625: \$? = $ac_status" >&5
++  echo "$as_me:23629: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23628: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23632: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23631: \$? = $ac_status" >&5
++  echo "$as_me:23635: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -23647,7 +23651,7 @@
+ done
+ 
+ fi
+-echo "$as_me:23650: result: $cf_cv_sizechange" >&5
++echo "$as_me:23654: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -23665,13 +23669,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:23668: checking for memmove" >&5
++echo "$as_me:23672: 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 23674 "configure"
++#line 23678 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23702,16 +23706,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23705: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23709: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23708: \$? = $ac_status" >&5
++  echo "$as_me:23712: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23711: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23715: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23714: \$? = $ac_status" >&5
++  echo "$as_me:23718: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -23721,19 +23725,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23724: result: $ac_cv_func_memmove" >&5
++echo "$as_me:23728: 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:23730: checking for bcopy" >&5
++echo "$as_me:23734: 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 23736 "configure"
++#line 23740 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23764,16 +23768,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23767: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23771: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23770: \$? = $ac_status" >&5
++  echo "$as_me:23774: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23773: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23777: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23776: \$? = $ac_status" >&5
++  echo "$as_me:23780: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -23783,11 +23787,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23786: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:23790: 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:23790: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:23794: 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
+@@ -23797,7 +23801,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23800 "configure"
++#line 23804 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23813,15 +23817,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23816: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23820: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23819: \$? = $ac_status" >&5
++  echo "$as_me:23823: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23821: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23825: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23824: \$? = $ac_status" >&5
++  echo "$as_me:23828: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -23834,7 +23838,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:23837: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:23841: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -23861,13 +23865,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23864: checking for $ac_func" >&5
++echo "$as_me:23868: 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 23870 "configure"
++#line 23874 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23898,16 +23902,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23901: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23905: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23904: \$? = $ac_status" >&5
++  echo "$as_me:23908: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23907: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23911: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23910: \$? = $ac_status" >&5
++  echo "$as_me:23914: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23917,7 +23921,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23920: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23924: 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:23934: 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
+@@ -23937,7 +23941,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23940 "configure"
++#line 23944 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23990,15 +23994,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23993: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23997: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23996: \$? = $ac_status" >&5
++  echo "$as_me:24000: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23998: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24002: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24001: \$? = $ac_status" >&5
++  echo "$as_me:24005: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -24010,21 +24014,21 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24013: result: $cf_cv_working_poll" >&5
++echo "$as_me:24017: 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:24020: checking if MB_LEN_MAX is usable" >&5
++echo "$as_me:24024: checking if MB_LEN_MAX is usable" >&5
+ echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
+ if test "${cf_cv_mb_len_max+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24027 "configure"
++#line 24031 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24044,16 +24048,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24047: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24051: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24050: \$? = $ac_status" >&5
++  echo "$as_me:24054: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24053: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24057: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24056: \$? = $ac_status" >&5
++  echo "$as_me:24060: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mb_len_max=yes
+ else
+@@ -24063,7 +24067,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24066: result: $cf_cv_mb_len_max" >&5
++echo "$as_me:24070: result: $cf_cv_mb_len_max" >&5
+ echo "${ECHO_T}$cf_cv_mb_len_max" >&6
+ if test "$cf_cv_mb_len_max" = yes
+ then
+@@ -24073,18 +24077,18 @@
+ EOF
+ 
+ else
+-	{ echo "$as_me:24076: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
++	{ echo "$as_me:24080: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+ echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
+ fi
+ 
+-echo "$as_me:24080: checking for va_copy" >&5
++echo "$as_me:24084: 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 24087 "configure"
++#line 24091 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24101,16 +24105,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24104: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24108: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24107: \$? = $ac_status" >&5
++  echo "$as_me:24111: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24110: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24114: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24113: \$? = $ac_status" >&5
++  echo "$as_me:24117: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -24120,7 +24124,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24123: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:24127: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -24132,14 +24136,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:24135: checking for __va_copy" >&5
++echo "$as_me:24139: 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 24142 "configure"
++#line 24146 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24156,16 +24160,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24159: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24163: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24162: \$? = $ac_status" >&5
++  echo "$as_me:24166: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24165: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24169: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24168: \$? = $ac_status" >&5
++  echo "$as_me:24172: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -24175,7 +24179,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24178: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:24182: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -24187,14 +24191,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:24190: checking for __builtin_va_copy" >&5
++echo "$as_me:24194: 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 24197 "configure"
++#line 24201 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24211,16 +24215,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24214: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24218: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24217: \$? = $ac_status" >&5
++  echo "$as_me:24221: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24220: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24224: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24223: \$? = $ac_status" >&5
++  echo "$as_me:24227: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -24230,7 +24234,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24233: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:24237: 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 &&
+@@ -24248,14 +24252,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:24251: checking if we can simply copy va_list" >&5
++	echo "$as_me:24255: 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 24258 "configure"
++#line 24262 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24272,16 +24276,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24275: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24279: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24278: \$? = $ac_status" >&5
++  echo "$as_me:24282: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24281: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24285: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24284: \$? = $ac_status" >&5
++  echo "$as_me:24288: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -24291,19 +24295,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24294: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:24298: 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:24299: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:24303: 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 24306 "configure"
++#line 24310 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24320,16 +24324,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24323: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24327: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24326: \$? = $ac_status" >&5
++  echo "$as_me:24330: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24329: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24333: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24332: \$? = $ac_status" >&5
++  echo "$as_me:24336: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -24339,7 +24343,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24342: result: $cf_cv_array_va_list" >&5
++echo "$as_me:24346: 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
+@@ -24350,13 +24354,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:24353: checking for pid_t" >&5
++echo "$as_me:24357: 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 24359 "configure"
++#line 24363 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24371,16 +24375,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24374: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24378: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24377: \$? = $ac_status" >&5
++  echo "$as_me:24381: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24380: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24384: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24383: \$? = $ac_status" >&5
++  echo "$as_me:24387: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -24390,7 +24394,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24393: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:24397: 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
+   :
+@@ -24405,23 +24409,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:24408: checking for $ac_header" >&5
++echo "$as_me:24412: 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 24414 "configure"
++#line 24418 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:24418: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:24422: \"$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:24424: \$? = $ac_status" >&5
++  echo "$as_me:24428: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -24440,7 +24444,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24443: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:24447: 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:24460: 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 24462 "configure"
++#line 24466 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -24490,16 +24494,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24493: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24497: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24496: \$? = $ac_status" >&5
++  echo "$as_me:24500: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24499: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24503: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24502: \$? = $ac_status" >&5
++  echo "$as_me:24506: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -24509,7 +24513,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24512: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:24516: 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:24528: 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
+@@ -24544,15 +24548,15 @@
+       }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24547: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24551: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24550: \$? = $ac_status" >&5
++  echo "$as_me:24554: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24552: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24556: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24555: \$? = $ac_status" >&5
++  echo "$as_me:24559: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -24564,7 +24568,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24567: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:24571: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -24578,12 +24582,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:24581: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24585: 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:24586: checking for working vfork" >&5
++  echo "$as_me:24590: 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
+@@ -24592,7 +24596,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24595 "configure"
++#line 24599 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include 
+@@ -24685,15 +24689,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24688: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24692: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24691: \$? = $ac_status" >&5
++  echo "$as_me:24695: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24693: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24697: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24696: \$? = $ac_status" >&5
++  echo "$as_me:24700: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -24705,13 +24709,13 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24708: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:24712: 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:24714: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24718: 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
+ 
+@@ -24736,7 +24740,7 @@
+ 
+ fi
+ 
+-echo "$as_me:24739: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:24743: 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
+@@ -24746,7 +24750,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24749 "configure"
++#line 24753 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24755,14 +24759,14 @@
+ {
+ 	FILE *fp = fopen("conftest.tmp", "wb");
+ 	int rc = 0;
+-	if (fp != 0) {
++	if (fp != NULL) {
+ 		int p, q;
+ 		for (p = 0; p < 256; ++p) {
+ 			fputc(p, fp);
+ 		}
+ 		fclose(fp);
+ 		fp = fopen("conftest.tmp", "rb");
+-		if (fp != 0) {
++		if (fp != NULL) {
+ 			for (p = 0; p < 256; ++p) {
+ 				q = fgetc(fp);
+ 				if (q != p) {
+@@ -24781,15 +24785,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24784: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24788: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24787: \$? = $ac_status" >&5
++  echo "$as_me:24791: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24789: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24793: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24792: \$? = $ac_status" >&5
++  echo "$as_me:24796: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fopen_bin_r=yes
+ else
+@@ -24802,16 +24806,228 @@
+ fi
+ 
+ fi
+-echo "$as_me:24805: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:24809: 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
+ #define USE_FOPEN_BIN_R 1
+ EOF
+ 
++	echo "$as_me:24816: checking for cc_t" >&5
++echo $ECHO_N "checking for cc_t... $ECHO_C" >&6
++if test "${ac_cv_type_cc_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >"conftest.$ac_ext" <<_ACEOF
++#line 24822 "configure"
++#include "confdefs.h"
++
++$ac_includes_default
++#include 
++
++int
++main (void)
++{
++if ((cc_t *) 0)
++  return 0;
++if (sizeof (cc_t))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f "conftest.$ac_objext"
++if { (eval echo "$as_me:24840: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:24843: \$? = $ac_status" >&5
++  (exit "$ac_status"); } &&
++         { ac_try='test -s "conftest.$ac_objext"'
++  { (eval echo "$as_me:24846: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:24849: \$? = $ac_status" >&5
++  (exit "$ac_status"); }; }; then
++  ac_cv_type_cc_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat "conftest.$ac_ext" >&5
++ac_cv_type_cc_t=no
++fi
++rm -f "conftest.$ac_objext" "conftest.$ac_ext"
++fi
++echo "$as_me:24859: result: $ac_cv_type_cc_t" >&5
++echo "${ECHO_T}$ac_cv_type_cc_t" >&6
++if test "$ac_cv_type_cc_t" = yes; then
++
++cat >>confdefs.h <&5
++echo $ECHO_N "checking for speed_t... $ECHO_C" >&6
++if test "${ac_cv_type_speed_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >"conftest.$ac_ext" <<_ACEOF
++#line 24875 "configure"
++#include "confdefs.h"
++
++$ac_includes_default
++#include 
++
++int
++main (void)
++{
++if ((speed_t *) 0)
++  return 0;
++if (sizeof (speed_t))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f "conftest.$ac_objext"
++if { (eval echo "$as_me:24893: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:24896: \$? = $ac_status" >&5
++  (exit "$ac_status"); } &&
++         { ac_try='test -s "conftest.$ac_objext"'
++  { (eval echo "$as_me:24899: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:24902: \$? = $ac_status" >&5
++  (exit "$ac_status"); }; }; then
++  ac_cv_type_speed_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat "conftest.$ac_ext" >&5
++ac_cv_type_speed_t=no
++fi
++rm -f "conftest.$ac_objext" "conftest.$ac_ext"
++fi
++echo "$as_me:24912: result: $ac_cv_type_speed_t" >&5
++echo "${ECHO_T}$ac_cv_type_speed_t" >&6
++if test "$ac_cv_type_speed_t" = yes; then
++
++cat >>confdefs.h <&5
++echo $ECHO_N "checking for tcflag_t... $ECHO_C" >&6
++if test "${ac_cv_type_tcflag_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >"conftest.$ac_ext" <<_ACEOF
++#line 24928 "configure"
++#include "confdefs.h"
++
++$ac_includes_default
++#include 
++
++int
++main (void)
++{
++if ((tcflag_t *) 0)
++  return 0;
++if (sizeof (tcflag_t))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f "conftest.$ac_objext"
++if { (eval echo "$as_me:24946: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:24949: \$? = $ac_status" >&5
++  (exit "$ac_status"); } &&
++         { ac_try='test -s "conftest.$ac_objext"'
++  { (eval echo "$as_me:24952: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:24955: \$? = $ac_status" >&5
++  (exit "$ac_status"); }; }; then
++  ac_cv_type_tcflag_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat "conftest.$ac_ext" >&5
++ac_cv_type_tcflag_t=no
++fi
++rm -f "conftest.$ac_objext" "conftest.$ac_ext"
++fi
++echo "$as_me:24965: result: $ac_cv_type_tcflag_t" >&5
++echo "${ECHO_T}$ac_cv_type_tcflag_t" >&6
++if test "$ac_cv_type_tcflag_t" = yes; then
++
++cat >>confdefs.h <&5
++echo $ECHO_N "checking for sigset_t... $ECHO_C" >&6
++if test "${ac_cv_type_sigset_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >"conftest.$ac_ext" <<_ACEOF
++#line 24981 "configure"
++#include "confdefs.h"
++
++$ac_includes_default
++#include 
++
++int
++main (void)
++{
++if ((sigset_t *) 0)
++  return 0;
++if (sizeof (sigset_t))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f "conftest.$ac_objext"
++if { (eval echo "$as_me:24999: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:25002: \$? = $ac_status" >&5
++  (exit "$ac_status"); } &&
++         { ac_try='test -s "conftest.$ac_objext"'
++  { (eval echo "$as_me:25005: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:25008: \$? = $ac_status" >&5
++  (exit "$ac_status"); }; }; then
++  ac_cv_type_sigset_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat "conftest.$ac_ext" >&5
++ac_cv_type_sigset_t=no
++fi
++rm -f "conftest.$ac_objext" "conftest.$ac_ext"
++fi
++echo "$as_me:25018: result: $ac_cv_type_sigset_t" >&5
++echo "${ECHO_T}$ac_cv_type_sigset_t" >&6
++if test "$ac_cv_type_sigset_t" = yes; then
++
++cat >>confdefs.h <&5
++echo "$as_me:25030: 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
+@@ -24819,7 +25035,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24822 "configure"
++#line 25038 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -24838,16 +25054,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24841: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25057: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24844: \$? = $ac_status" >&5
++  echo "$as_me:25060: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24847: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25063: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24850: \$? = $ac_status" >&5
++  echo "$as_me:25066: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -24858,7 +25074,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:24861: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:25077: 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
+@@ -24866,7 +25082,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:24869: checking for openpty header" >&5
++echo "$as_me:25085: 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
+@@ -24893,7 +25109,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24896 "configure"
++#line 25112 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -24911,16 +25127,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24914: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25130: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24917: \$? = $ac_status" >&5
++  echo "$as_me:25133: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24920: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25136: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24923: \$? = $ac_status" >&5
++  echo "$as_me:25139: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -24938,7 +25154,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:24941: result: $cf_cv_func_openpty" >&5
++echo "$as_me:25157: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -25011,7 +25227,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25014 "configure"
++#line 25230 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -25023,16 +25239,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25026: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25242: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25029: \$? = $ac_status" >&5
++  echo "$as_me:25245: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25032: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25248: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25035: \$? = $ac_status" >&5
++  echo "$as_me:25251: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25049,7 +25265,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}:25052: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25268: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25085,7 +25301,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}:25088: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25304: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25096,7 +25312,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:25099: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:25315: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -25168,7 +25384,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25171 "configure"
++#line 25387 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -25180,16 +25396,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25183: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25399: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25186: \$? = $ac_status" >&5
++  echo "$as_me:25402: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25189: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25405: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25192: \$? = $ac_status" >&5
++  echo "$as_me:25408: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25206,7 +25422,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}:25209: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25425: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25286,7 +25502,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}:25289: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25505: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25303,23 +25519,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:25306: checking for db.h" >&5
++echo "$as_me:25522: 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 25312 "configure"
++#line 25528 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:25316: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25532: \"$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:25322: \$? = $ac_status" >&5
++  echo "$as_me:25538: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -25338,11 +25554,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25341: result: $ac_cv_header_db_h" >&5
++echo "$as_me:25557: 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:25345: checking for version of db" >&5
++echo "$as_me:25561: 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
+@@ -25353,10 +25569,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:25356: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:25572: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25359 "configure"
++#line 25575 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25386,16 +25602,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25389: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25605: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25392: \$? = $ac_status" >&5
++  echo "$as_me:25608: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25395: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25611: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25398: \$? = $ac_status" >&5
++  echo "$as_me:25614: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -25409,16 +25625,16 @@
+ done
+ 
+ fi
+-echo "$as_me:25412: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:25628: 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:25416: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:25632: 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:25421: checking for db libraries" >&5
++echo "$as_me:25637: 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
+@@ -25448,10 +25664,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:25451: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:25667: testing checking for library $cf_db_libs ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25454 "configure"
++#line 25670 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25464,7 +25680,7 @@
+ 	char *path = "/tmp/foo";
+ #ifdef DB_VERSION_MAJOR
+ #if DB_VERSION_MAJOR >= 4
+-	DB *result = 0;
++	DB *result = NULL;
+ 	db_create(&result, NULL, 0);
+ 	result->open(result,
+ 		NULL,
+@@ -25474,7 +25690,7 @@
+ 		DB_CREATE,
+ 		0644);
+ #elif DB_VERSION_MAJOR >= 3
+-	DB *result = 0;
++	DB *result = NULL;
+ 	db_create(&result, NULL, 0);
+ 	result->open(result,
+ 		path,
+@@ -25483,7 +25699,7 @@
+ 		DB_CREATE,
+ 		0644);
+ #elif DB_VERSION_MAJOR >= 2
+-	DB *result = 0;
++	DB *result = NULL;
+ 	db_open(path,
+ 		DB_HASH,
+ 		DB_CREATE,
+@@ -25499,23 +25715,23 @@
+ 		     DB_HASH,
+ 		     0);
+ #endif
+-	${cf_cv_main_return:-return}(result != 0)
++	${cf_cv_main_return:-return}(result != NULL)
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25509: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25725: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25512: \$? = $ac_status" >&5
++  echo "$as_me:25728: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25515: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25731: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25518: \$? = $ac_status" >&5
++  echo "$as_me:25734: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -25535,11 +25751,11 @@
+ done
+ 
+ fi
+-echo "$as_me:25538: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:25754: 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:25542: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:25758: 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
+@@ -25565,7 +25781,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:25568: error: Cannot find db.h" >&5
++	{ { echo "$as_me:25784: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -25580,7 +25796,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:25583: checking if we should include stdbool.h" >&5
++echo "$as_me:25799: 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
+@@ -25588,7 +25804,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25591 "configure"
++#line 25807 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -25600,23 +25816,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25603: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25819: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25606: \$? = $ac_status" >&5
++  echo "$as_me:25822: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25609: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25825: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25612: \$? = $ac_status" >&5
++  echo "$as_me:25828: \$? = $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 25619 "configure"
++#line 25835 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -25632,16 +25848,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25635: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25851: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25638: \$? = $ac_status" >&5
++  echo "$as_me:25854: \$? = $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:25857: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25644: \$? = $ac_status" >&5
++  echo "$as_me:25860: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -25655,13 +25871,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:25658: result: yes" >&5
++then	echo "$as_me:25874: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25660: result: no" >&5
++else	echo "$as_me:25876: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:25664: checking for builtin bool type" >&5
++echo "$as_me:25880: 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
+@@ -25669,7 +25885,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25672 "configure"
++#line 25888 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25684,16 +25900,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25687: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25903: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25690: \$? = $ac_status" >&5
++  echo "$as_me:25906: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25693: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25909: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25696: \$? = $ac_status" >&5
++  echo "$as_me:25912: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -25706,9 +25922,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:25709: result: yes" >&5
++then	echo "$as_me:25925: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25711: result: no" >&5
++else	echo "$as_me:25927: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -25725,10 +25941,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:25728: checking if we already have C++ library" >&5
++	echo "$as_me:25944: 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 25731 "configure"
++#line 25947 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -25742,16 +25958,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25745: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25961: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25748: \$? = $ac_status" >&5
++  echo "$as_me:25964: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25751: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25967: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25754: \$? = $ac_status" >&5
++  echo "$as_me:25970: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -25760,7 +25976,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-	echo "$as_me:25763: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:25979: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -25779,7 +25995,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:25782: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:25998: 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
+@@ -25805,7 +26021,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25808 "configure"
++#line 26024 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -25819,16 +26035,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25822: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26038: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25825: \$? = $ac_status" >&5
++  echo "$as_me:26041: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25828: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26044: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25831: \$? = $ac_status" >&5
++  echo "$as_me:26047: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -25840,7 +26056,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:25843: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:26059: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -25862,7 +26078,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:25865: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:26081: 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
+@@ -25877,15 +26093,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:25880: \"$ac_try\"") >&5
++if { (eval echo "$as_me:26096: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25883: \$? = $ac_status" >&5
++  echo "$as_me:26099: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25885: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:26101: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25888: \$? = $ac_status" >&5
++  echo "$as_me:26104: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -25896,10 +26112,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+-  echo "$as_me:25899: result: yes" >&5
++  echo "$as_me:26115: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:25902: result: no" >&5
++  echo "$as_me:26118: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -25919,7 +26135,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:25922: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:26138: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -25940,7 +26156,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25943 "configure"
++#line 26159 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -25954,16 +26170,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25957: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26173: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25960: \$? = $ac_status" >&5
++  echo "$as_me:26176: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25963: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26179: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25966: \$? = $ac_status" >&5
++  echo "$as_me:26182: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -26000,7 +26216,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26003 "configure"
++#line 26219 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26014,16 +26230,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26017: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26233: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26020: \$? = $ac_status" >&5
++  echo "$as_me:26236: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26023: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26239: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26026: \$? = $ac_status" >&5
++  echo "$as_me:26242: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -26056,7 +26272,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	LIBS="$cf_save"
+-	echo "$as_me:26059: result: $cf_cxx_library" >&5
++	echo "$as_me:26275: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -26072,7 +26288,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:26075: checking how to run the C++ preprocessor" >&5
++echo "$as_me:26291: 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
+@@ -26089,18 +26305,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 26092 "configure"
++#line 26308 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26097: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26313: \"$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:26103: \$? = $ac_status" >&5
++  echo "$as_me:26319: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26123,17 +26339,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26126 "configure"
++#line 26342 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26130: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26346: \"$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:26136: \$? = $ac_status" >&5
++  echo "$as_me:26352: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26170,7 +26386,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:26173: result: $CXXCPP" >&5
++echo "$as_me:26389: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -26180,18 +26396,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 26183 "configure"
++#line 26399 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26188: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26404: \"$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:26194: \$? = $ac_status" >&5
++  echo "$as_me:26410: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26214,17 +26430,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26217 "configure"
++#line 26433 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26221: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26437: \"$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:26227: \$? = $ac_status" >&5
++  echo "$as_me:26443: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26252,7 +26468,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:26255: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:26471: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -26267,23 +26483,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:26270: checking for $ac_header" >&5
++echo "$as_me:26486: 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 26276 "configure"
++#line 26492 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26280: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26496: \"$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:26286: \$? = $ac_status" >&5
++  echo "$as_me:26502: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26302,7 +26518,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26305: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26521: 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:26534: 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 26324 "configure"
++#line 26540 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26328: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26544: \"$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:26334: \$? = $ac_status" >&5
++  echo "$as_me:26550: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26350,7 +26566,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26353: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26569: 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:26580: 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 26367 "configure"
++#line 26583 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26381,16 +26597,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26384: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26600: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26387: \$? = $ac_status" >&5
++  echo "$as_me:26603: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26390: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26606: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26393: \$? = $ac_status" >&5
++  echo "$as_me:26609: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -26399,7 +26615,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:26402: result: $cf_iostream_namespace" >&5
++	echo "$as_me:26618: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -26410,7 +26626,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:26413: checking if we should include stdbool.h" >&5
++echo "$as_me:26629: 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
+@@ -26418,7 +26634,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26421 "configure"
++#line 26637 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -26430,23 +26646,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26433: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26649: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26436: \$? = $ac_status" >&5
++  echo "$as_me:26652: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26439: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26655: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26442: \$? = $ac_status" >&5
++  echo "$as_me:26658: \$? = $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 26449 "configure"
++#line 26665 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -26462,16 +26678,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26465: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26681: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26468: \$? = $ac_status" >&5
++  echo "$as_me:26684: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26471: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26687: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26474: \$? = $ac_status" >&5
++  echo "$as_me:26690: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -26485,13 +26701,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:26488: result: yes" >&5
++then	echo "$as_me:26704: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:26490: result: no" >&5
++else	echo "$as_me:26706: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:26494: checking for builtin bool type" >&5
++echo "$as_me:26710: 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
+@@ -26499,7 +26715,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26502 "configure"
++#line 26718 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26514,16 +26730,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26517: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26733: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26520: \$? = $ac_status" >&5
++  echo "$as_me:26736: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26523: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26739: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26526: \$? = $ac_status" >&5
++  echo "$as_me:26742: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -26536,19 +26752,19 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:26539: result: yes" >&5
++then	echo "$as_me:26755: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:26541: result: no" >&5
++else	echo "$as_me:26757: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:26545: checking for bool" >&5
++echo "$as_me:26761: 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 26551 "configure"
++#line 26767 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26583,16 +26799,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26586: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26802: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26589: \$? = $ac_status" >&5
++  echo "$as_me:26805: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26592: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26808: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26595: \$? = $ac_status" >&5
++  echo "$as_me:26811: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -26602,10 +26818,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26605: result: $ac_cv_type_bool" >&5
++echo "$as_me:26821: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:26608: checking size of bool" >&5
++echo "$as_me:26824: 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
+@@ -26614,7 +26830,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26617 "configure"
++#line 26833 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26646,21 +26862,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26649: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26865: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26652: \$? = $ac_status" >&5
++  echo "$as_me:26868: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26655: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26871: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26658: \$? = $ac_status" >&5
++  echo "$as_me:26874: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26663 "configure"
++#line 26879 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26692,16 +26908,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26695: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26911: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26698: \$? = $ac_status" >&5
++  echo "$as_me:26914: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26701: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26917: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26704: \$? = $ac_status" >&5
++  echo "$as_me:26920: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -26717,7 +26933,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26720 "configure"
++#line 26936 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26749,16 +26965,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26752: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26968: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26755: \$? = $ac_status" >&5
++  echo "$as_me:26971: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26758: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26974: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26761: \$? = $ac_status" >&5
++  echo "$as_me:26977: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -26774,7 +26990,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 26777 "configure"
++#line 26993 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26806,16 +27022,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26809: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27025: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26812: \$? = $ac_status" >&5
++  echo "$as_me:27028: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26815: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27031: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26818: \$? = $ac_status" >&5
++  echo "$as_me:27034: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -26828,12 +27044,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:26831: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27047: 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 26836 "configure"
++#line 27052 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26869,15 +27085,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26872: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27088: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26875: \$? = $ac_status" >&5
++  echo "$as_me:27091: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26877: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27093: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26880: \$? = $ac_status" >&5
++  echo "$as_me:27096: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -26893,13 +27109,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:26896: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27112: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27118: 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
+@@ -26918,7 +27134,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26921 "configure"
++#line 27137 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26944,7 +27160,7 @@
+ int main(void)
+ {
+ 	FILE *fp = fopen("cf_test.out", "w");
+-	if (fp != 0) {
++	if (fp != NULL) {
+ 		bool x = true;
+ 		if ((bool)(-x) >= 0)
+ 			fputs("unsigned ", fp);
+@@ -26959,15 +27175,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26962: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27178: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26965: \$? = $ac_status" >&5
++  echo "$as_me:27181: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26967: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27183: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26970: \$? = $ac_status" >&5
++  echo "$as_me:27186: \$? = $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
+@@ -26984,19 +27200,19 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:26987: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:27203: 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:26994: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:27210: 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:26999: checking for special defines needed for etip.h" >&5
++echo "$as_me:27215: 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"
+@@ -27014,7 +27230,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 27017 "configure"
++#line 27233 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -27028,16 +27244,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27031: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27247: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27034: \$? = $ac_status" >&5
++  echo "$as_me:27250: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27037: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27253: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27040: \$? = $ac_status" >&5
++  echo "$as_me:27256: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:27277: result: ${cf_result:-(none)}" >&5
+ echo "${ECHO_T}${cf_result:-(none)}" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27066: checking if $CXX accepts override keyword" >&5
++echo "$as_me:27282: checking if $CXX accepts override keyword" >&5
+ echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
+ if test "${cf_cv_cpp_override+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27080,7 +27296,7 @@
+   cf_cv_cpp_override=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27083 "configure"
++#line 27299 "configure"
+ #include "confdefs.h"
+ 
+ class base
+@@ -27099,15 +27315,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27102: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27318: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27105: \$? = $ac_status" >&5
++  echo "$as_me:27321: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27107: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27323: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27110: \$? = $ac_status" >&5
++  echo "$as_me:27326: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_override=yes
+ else
+@@ -27126,7 +27342,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27129: result: $cf_cv_cpp_override" >&5
++echo "$as_me:27345: result: $cf_cv_cpp_override" >&5
+ echo "${ECHO_T}$cf_cv_cpp_override" >&6
+ fi
+ test "$cf_cv_cpp_override" = yes &&
+@@ -27135,7 +27351,7 @@
+ EOF
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27138: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:27354: 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
+@@ -27152,7 +27368,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27155 "configure"
++#line 27371 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -27171,15 +27387,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27174: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27390: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27177: \$? = $ac_status" >&5
++  echo "$as_me:27393: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27179: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27395: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27182: \$? = $ac_status" >&5
++  echo "$as_me:27398: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -27198,7 +27414,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27201: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:27417: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -27208,7 +27424,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:27211: checking if $CXX accepts static_cast" >&5
++echo "$as_me:27427: 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
+@@ -27222,7 +27438,7 @@
+ ac_main_return="return"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27225 "configure"
++#line 27441 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -27266,16 +27482,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27269: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27485: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27272: \$? = $ac_status" >&5
++  echo "$as_me:27488: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27275: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27491: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27278: \$? = $ac_status" >&5
++  echo "$as_me:27494: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -27293,7 +27509,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27296: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:27512: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -27341,13 +27557,13 @@
+ 		cf_cv_header_stdbool_h=0
+ 	else
+ 
+-echo "$as_me:27344: checking for bool" >&5
++echo "$as_me:27560: 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 27350 "configure"
++#line 27566 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27382,16 +27598,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27385: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27601: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27388: \$? = $ac_status" >&5
++  echo "$as_me:27604: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27391: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27607: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27394: \$? = $ac_status" >&5
++  echo "$as_me:27610: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -27401,10 +27617,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27404: result: $ac_cv_type_bool" >&5
++echo "$as_me:27620: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:27407: checking size of bool" >&5
++echo "$as_me:27623: 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
+@@ -27413,7 +27629,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27416 "configure"
++#line 27632 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27445,21 +27661,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27448: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27664: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27451: \$? = $ac_status" >&5
++  echo "$as_me:27667: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27454: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27670: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27457: \$? = $ac_status" >&5
++  echo "$as_me:27673: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27462 "configure"
++#line 27678 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27491,16 +27707,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27494: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27710: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27497: \$? = $ac_status" >&5
++  echo "$as_me:27713: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27500: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27716: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27503: \$? = $ac_status" >&5
++  echo "$as_me:27719: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -27516,7 +27732,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27519 "configure"
++#line 27735 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27548,16 +27764,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27551: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27767: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27554: \$? = $ac_status" >&5
++  echo "$as_me:27770: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27557: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27773: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27560: \$? = $ac_status" >&5
++  echo "$as_me:27776: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27573,7 +27789,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 27576 "configure"
++#line 27792 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27605,16 +27821,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27608: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27824: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27611: \$? = $ac_status" >&5
++  echo "$as_me:27827: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27614: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27830: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27617: \$? = $ac_status" >&5
++  echo "$as_me:27833: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27627,12 +27843,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27630: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27846: 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 27635 "configure"
++#line 27851 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27668,15 +27884,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27671: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27887: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27674: \$? = $ac_status" >&5
++  echo "$as_me:27890: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27676: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27892: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27679: \$? = $ac_status" >&5
++  echo "$as_me:27895: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27692,13 +27908,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27695: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27911: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27917: 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
+@@ -27717,7 +27933,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27720 "configure"
++#line 27936 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27743,7 +27959,7 @@
+ int main(void)
+ {
+ 	FILE *fp = fopen("cf_test.out", "w");
+-	if (fp != 0) {
++	if (fp != NULL) {
+ 		bool x = true;
+ 		if ((bool)(-x) >= 0)
+ 			fputs("unsigned ", fp);
+@@ -27758,15 +27974,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27761: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27977: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27764: \$? = $ac_status" >&5
++  echo "$as_me:27980: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27766: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27982: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27769: \$? = $ac_status" >&5
++  echo "$as_me:27985: \$? = $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
+@@ -27783,14 +27999,14 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:27786: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:28002: 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:27793: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:28009: 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
+@@ -27821,7 +28037,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:27824: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:28040: 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
+@@ -27832,7 +28048,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:27835: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:28051: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -27849,10 +28065,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:27852: result: $ADAFLAGS" >&5
++	echo "$as_me:28068: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:27855: checking if GNATPREP supports -T option" >&5
++echo "$as_me:28071: 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
+@@ -27862,11 +28078,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:27865: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:28081: 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:27869: checking if GNAT supports generics" >&5
++echo "$as_me:28085: 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])
+@@ -27876,7 +28092,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:27879: result: $cf_gnat_generics" >&5
++echo "$as_me:28095: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -27888,7 +28104,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:27891: checking if GNAT supports SIGINT" >&5
++echo "$as_me:28107: 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
+@@ -27936,7 +28152,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:27939: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:28155: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -27949,7 +28165,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:27952: checking if GNAT supports project files" >&5
++echo "$as_me:28168: 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]*)
+@@ -28012,15 +28228,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:28015: result: $cf_gnat_projects" >&5
++echo "$as_me:28231: 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:28021: checking if GNAT supports libraries" >&5
++	echo "$as_me:28237: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:28023: result: $cf_gnat_libraries" >&5
++	echo "$as_me:28239: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -28040,7 +28256,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:28043: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:28259: 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
+@@ -28052,7 +28268,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:28055: checking for Ada95 compiler" >&5
++echo "$as_me:28271: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -28063,12 +28279,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:28066: result: $cf_ada_compiler" >&5
++echo "$as_me:28282: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:28071: checking for Ada95 include directory" >&5
++echo "$as_me:28287: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -28102,7 +28318,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28105: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28321: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28111,10 +28327,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:28114: result: $ADA_INCLUDE" >&5
++echo "$as_me:28330: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:28117: checking for Ada95 object directory" >&5
++echo "$as_me:28333: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -28148,7 +28364,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28151: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28367: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28157,10 +28373,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:28160: result: $ADA_OBJECTS" >&5
++echo "$as_me:28376: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:28163: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:28379: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -28181,11 +28397,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:28184: result: $with_ada_sharedlib" >&5
++echo "$as_me:28400: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+-	{ echo "$as_me:28188: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++	{ echo "$as_me:28404: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+ 
+@@ -28203,7 +28419,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:28206: checking for Ada95 curses library name" >&5
++echo "$as_me:28422: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -28219,7 +28435,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28222: result: $ADA_LIBNAME" >&5
++echo "$as_me:28438: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -28230,13 +28446,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:28233: checking for wchar_t" >&5
++	echo "$as_me:28449: 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 28239 "configure"
++#line 28455 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28251,16 +28467,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28254: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28470: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28257: \$? = $ac_status" >&5
++  echo "$as_me:28473: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28260: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28476: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28263: \$? = $ac_status" >&5
++  echo "$as_me:28479: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -28270,10 +28486,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:28273: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:28489: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:28276: checking size of wchar_t" >&5
++echo "$as_me:28492: 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
+@@ -28282,7 +28498,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28285 "configure"
++#line 28501 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28294,21 +28510,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28297: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28513: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28300: \$? = $ac_status" >&5
++  echo "$as_me:28516: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28303: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28519: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28306: \$? = $ac_status" >&5
++  echo "$as_me:28522: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28311 "configure"
++#line 28527 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28320,16 +28536,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28323: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28539: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28326: \$? = $ac_status" >&5
++  echo "$as_me:28542: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28329: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28545: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28332: \$? = $ac_status" >&5
++  echo "$as_me:28548: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -28345,7 +28561,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28348 "configure"
++#line 28564 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28357,16 +28573,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28360: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28576: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28363: \$? = $ac_status" >&5
++  echo "$as_me:28579: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28366: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28582: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28369: \$? = $ac_status" >&5
++  echo "$as_me:28585: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -28382,7 +28598,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 28385 "configure"
++#line 28601 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28394,16 +28610,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28397: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28613: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28400: \$? = $ac_status" >&5
++  echo "$as_me:28616: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28403: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28619: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28406: \$? = $ac_status" >&5
++  echo "$as_me:28622: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -28416,12 +28632,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:28419: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:28635: 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 28424 "configure"
++#line 28640 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28437,15 +28653,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:28440: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28656: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28443: \$? = $ac_status" >&5
++  echo "$as_me:28659: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:28445: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28661: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28448: \$? = $ac_status" >&5
++  echo "$as_me:28664: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -28461,7 +28677,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:28464: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:28680: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&6
+ 
+-echo "${as_me:-configure}:28477: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:28693: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -28492,7 +28708,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:28495: checking for library subsets" >&5
++echo "$as_me:28711: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -28546,7 +28762,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:28549: result: $LIB_SUBSETS" >&5
++echo "$as_me:28765: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -28577,7 +28793,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:28580: checking default library suffix" >&5
++echo "$as_me:28796: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28588,10 +28804,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:28591: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:28807: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:28594: checking default library-dependency suffix" >&5
++echo "$as_me:28810: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -28674,10 +28890,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:28677: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28893: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:28680: checking default object directory" >&5
++echo "$as_me:28896: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28693,11 +28909,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:28696: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28912: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28700: checking c++ library-dependency suffix" >&5
++echo "$as_me:28916: 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++)
+@@ -28790,7 +29006,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:28793: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:29009: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -28966,19 +29182,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:28969: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:29185: 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:28978: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:29194: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28981: \$? = $ac_status" >&5
++  echo "$as_me:29197: \$? = $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
+@@ -28989,10 +29205,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28992 "configure"
++#line 29208 "configure"
+ #include "confdefs.h"
+ 
+-#line 28995 "configure"
++#line 29211 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -29007,16 +29223,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:29010: \"$ac_link\"") >&5
++if { (eval echo "$as_me:29226: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:29013: \$? = $ac_status" >&5
++  echo "$as_me:29229: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:29016: \"$ac_try\"") >&5
++  { (eval echo "$as_me:29232: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:29019: \$? = $ac_status" >&5
++  echo "$as_me:29235: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -29039,7 +29255,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:29042: result: $cf_ldflags_static" >&5
++	echo "$as_me:29258: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test "$cf_ldflags_static" != yes
+@@ -29055,7 +29271,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29058: checking where we will install curses.h" >&5
++echo "$as_me:29274: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -29065,7 +29281,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:29068: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:29284: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -29073,7 +29289,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:29076: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:29292: 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
+@@ -29098,7 +29314,7 @@
+ 
+ # pkgsrc uses these
+ 
+-echo "$as_me:29101: checking for desired basename for form library" >&5
++echo "$as_me:29317: 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.
+@@ -29118,10 +29334,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29121: result: $FORM_NAME" >&5
++echo "$as_me:29337: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:29124: checking for desired basename for menu library" >&5
++echo "$as_me:29340: 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.
+@@ -29141,10 +29357,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29144: result: $MENU_NAME" >&5
++echo "$as_me:29360: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:29147: checking for desired basename for panel library" >&5
++echo "$as_me:29363: 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.
+@@ -29164,10 +29380,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29167: result: $PANEL_NAME" >&5
++echo "$as_me:29383: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:29170: checking for desired basename for cxx library" >&5
++echo "$as_me:29386: 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.
+@@ -29187,13 +29403,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29190: result: $CXX_NAME" >&5
++echo "$as_me:29406: 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:29196: checking for src modules" >&5
++echo "$as_me:29412: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -29252,7 +29468,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:29255: result: $cf_cv_src_modules" >&5
++echo "$as_me:29471: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -29413,7 +29629,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:29416: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:29632: 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//'`
+@@ -29424,7 +29640,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:29427: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
++echo "$as_me:29643: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -29440,7 +29656,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:29443: result: $PKG_CFLAGS" >&5
++echo "$as_me:29659: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ case "$cf_cv_system_name" in
+@@ -29512,7 +29728,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
+ 
+-echo "${as_me:-configure}:29515: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
++echo "${as_me:-configure}:29731: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+ 
+ fi
+ 
+@@ -29539,7 +29755,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:29542: checking for linker search path" >&5
++echo "$as_me:29758: 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
+@@ -29587,7 +29803,7 @@
+ 			cf_pathlist="$cf_pathlist /lib /usr/lib"
+ 			;;
+ 		(*)
+-			{ echo "$as_me:29590: WARNING: problem with Solaris architecture" >&5
++			{ echo "$as_me:29806: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ 			;;
+ 		esac
+@@ -29628,7 +29844,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:29631: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29847: 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'`
+@@ -29714,7 +29930,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29717: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29933: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -29895,7 +30111,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:29898: error: ambiguous option: $1
++    { { echo "$as_me:30114: 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;}
+@@ -29914,7 +30130,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:29917: error: unrecognized option: $1
++  -*) { { echo "$as_me:30133: 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;}
+@@ -30046,7 +30262,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:30049: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:30265: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -30571,7 +30787,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:30574: creating $ac_file" >&5
++    { echo "$as_me:30790: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -30589,7 +30805,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30592: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30808: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -30602,7 +30818,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30605: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30821: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30618,7 +30834,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:30621: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:30837: 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;}
+@@ -30627,7 +30843,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:30630: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:30846: 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;}
+@@ -30672,7 +30888,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:30675: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:30891: 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;}
+@@ -30683,7 +30899,7 @@
+     $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:30686: WARNING: Some variables may not be substituted:
++      { echo "$as_me:30902: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30732,7 +30948,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:30735: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:30951: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -30743,7 +30959,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30746: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30962: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -30756,7 +30972,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30759: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30975: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30814,7 +31030,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:30817: $ac_file is unchanged" >&5
++      { echo "$as_me:31033: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -31201,7 +31417,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}:31204: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:31420: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: configure.in
+Prereq:  1.787 
+--- ncurses-6.5-20241207+/configure.in	2024-11-23 22:52:31.000000000 +0000
++++ ncurses-6.5-20241214/configure.in	2024-12-14 21:14:32.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.787 2024/11/23 22:52:31 tom Exp $
++dnl $Id: configure.in,v 1.788 2024/12/14 21:14:32 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.787 $)
++AC_REVISION($Revision: 1.788 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -1871,6 +1871,10 @@
+ CF_VA_COPY
+ AC_FUNC_VFORK
+ CF_FOPEN_BIN_R
++CF_CHECK_TYPE2(cc_t,termios.h)
++CF_CHECK_TYPE2(speed_t,termios.h)
++CF_CHECK_TYPE2(tcflag_t,termios.h)
++CF_CHECK_TYPE2(sigset_t,signal.h)
+ 
+ # special check for test/ditto.c
+ CF_FUNC_OPENPTY
+Index: dist.mk
+Prereq:  1.1644 
+--- ncurses-6.5-20241207+/dist.mk	2024-12-07 11:51:44.000000000 +0000
++++ ncurses-6.5-20241214/dist.mk	2024-12-14 11:34:56.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1644 2024/12/07 11:51:44 tom Exp $
++# $Id: dist.mk,v 1.1645 2024/12/14 11:34:56 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 = 5
+-NCURSES_PATCH = 20241207
++NCURSES_PATCH = 20241214
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: include/curses.h.in
+Prereq:  1.284 
+--- ncurses-6.5-20241207+/include/curses.h.in	2024-12-07 17:14:44.000000000 +0000
++++ ncurses-6.5-20241214/include/curses.h.in	2024-12-14 23:49:34.000000000 +0000
+@@ -33,7 +33,7 @@
+  *     and: Thomas E. Dickey                        1996-on                 *
+  ****************************************************************************/
+ 
+-/* $Id: curses.h.in,v 1.284 2024/12/07 17:14:44 tom Exp $ */
++/* $Id: curses.h.in,v 1.287 2024/12/14 23:49:34 tom Exp $ */
+ 
+ #ifndef __NCURSES_H
+ #define __NCURSES_H
+@@ -296,7 +296,7 @@
+ #include 
+ /* use whatever the C compiler decides bool really is */
+ #define NCURSES_BOOL bool
+-#else
++#elif !defined(__cplusplus) && !@cf_cv_builtin_bool@
+ /* there is no predefined bool - use our own */
+ #undef bool
+ #define bool NCURSES_BOOL
+@@ -311,7 +311,7 @@
+ #define NCURSES_CAST(type,value) (type)(value)
+ #endif
+ 
+-#define NCURSES_OK_ADDR(p) (0 != NCURSES_CAST(const void *, (p)))
++#define NCURSES_OK_ADDR(p) (NULL != NCURSES_CAST(const void *, (p)))
+ 
+ /*
+  * X/Open attributes.  In the ncurses implementation, they are identical to the
+Index: include/ncurses_defs
+Prereq:  1.112 
+--- ncurses-6.5-20241207+/include/ncurses_defs	2024-05-19 09:02:51.000000000 +0000
++++ ncurses-6.5-20241214/include/ncurses_defs	2024-12-14 21:20:43.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: ncurses_defs,v 1.112 2024/05/19 09:02:51 tom Exp $
++# $Id: ncurses_defs,v 1.113 2024/12/14 21:20:43 tom Exp $
+ ##############################################################################
+ # Copyright 2018-2023,2024 Thomas E. Dickey                                  #
+ # Copyright 2000-2016,2017 Free Software Foundation, Inc.                    #
+@@ -50,6 +50,7 @@
+ HAVE_BSD_STRING_H
+ HAVE_BTOWC
+ HAVE_BUILTIN_H
++HAVE_CC_T
+ HAVE_CHGAT	1
+ HAVE_CLOCK_GETTIME
+ HAVE_COLOR_CONTENT	1
+@@ -158,11 +159,13 @@
+ HAVE_SETVBUF
+ HAVE_SGTTY_H
+ HAVE_SIGACTION
++HAVE_SIGSET_T
+ HAVE_SIGVEC
+ HAVE_SIZECHANGE
+ HAVE_SLK_COLOR
+ HAVE_SLK_INIT	1
+ HAVE_SNPRINTF
++HAVE_SPEED_T
+ HAVE_STDINT_H
+ HAVE_STRDUP
+ HAVE_STRLCAT
+@@ -170,8 +173,8 @@
+ HAVE_STRSTR
+ HAVE_SYMLINK
+ HAVE_SYSCONF
+-HAVE_SYS_BSDTYPES_H
+ HAVE_SYS_AUXV_H
++HAVE_SYS_BSDTYPES_H
+ HAVE_SYS_IOCTL_H
+ HAVE_SYS_PARAM_H
+ HAVE_SYS_POLL_H
+@@ -180,6 +183,7 @@
+ HAVE_SYS_TIMES_H
+ HAVE_SYS_TIME_H
+ HAVE_SYS_TIME_SELECT
++HAVE_TCFLAG_T
+ HAVE_TCGETATTR
+ HAVE_TCGETPGRP
+ HAVE_TELL
+@@ -193,10 +197,10 @@
+ HAVE_TGETENT	1
+ HAVE_TIGETNUM	1
+ HAVE_TIGETSTR	1
++HAVE_TIMES
+ HAVE_TIPARM	1
+ HAVE_TIPARM_S	1
+ HAVE_TISCAN_S	1
+-HAVE_TIMES
+ HAVE_TPUTS_SP
+ HAVE_TSEARCH
+ HAVE_TYPEAHEAD	1
+@@ -231,8 +235,8 @@
+ HAVE_WRESIZE
+ HAVE_WSYNCDOWN	1
+ HAVE__DOSCAN
+-HAVE__TRACEF
+ HAVE__NC_TPARM_ANALYZE 1
++HAVE__TRACEF
+ MIXEDCASE_FILENAMES
+ NCURSES_CHAR_EQ
+ NCURSES_EXPANDED
+Index: ncurses/base/lib_beep.c
+Prereq:  1.19 
+--- ncurses-6.5-20241207+/ncurses/base/lib_beep.c	2024-12-07 20:00:48.000000000 +0000
++++ ncurses-6.5-20241214/ncurses/base/lib_beep.c	2024-12-15 00:03:48.000000000 +0000
+@@ -47,7 +47,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_beep.c,v 1.19 2024/12/07 20:00:48 tom Exp $")
++MODULE_ID("$Id: lib_beep.c,v 1.20 2024/12/15 00:03:48 tom Exp $")
+ 
+ /*
+  *	beep()
+@@ -65,7 +65,7 @@
+     T((T_CALLED("beep(%p)"), (void *) SP_PARM));
+ 
+ #ifdef USE_TERM_DRIVER
+-    if (SP_PARM != 0)
++    if (SP_PARM != NULL)
+ 	res = CallDriver_1(SP_PARM, td_doBeepOrFlash, TRUE);
+ #else
+     /* FIXME: should make sure that we are not in altchar mode */
+Index: ncurses/base/lib_color.c
+Prereq:  1.153 
+--- ncurses-6.5-20241207+/ncurses/base/lib_color.c	2024-12-07 17:28:13.000000000 +0000
++++ ncurses-6.5-20241214/ncurses/base/lib_color.c	2024-12-14 23:49:54.000000000 +0000
+@@ -49,7 +49,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_color.c,v 1.153 2024/12/07 17:28:13 tom Exp $")
++MODULE_ID("$Id: lib_color.c,v 1.154 2024/12/14 23:49:54 tom Exp $")
+ 
+ #ifdef USE_TERM_DRIVER
+ #define CanChange      InfoOf(SP_PARM).canchange
+@@ -540,7 +540,7 @@
+ 	sp->_color_pairs = next;
+ #else
+ 	TYPE_REALLOC(colorpair_t, have, sp->_color_pairs);
+-	if (sp->_color_pairs != 0) {
++	if (sp->_color_pairs != NULL) {
+ 	    memset(sp->_color_pairs + sp->_pair_alloc, 0,
+ 		   sizeof(colorpair_t) * (size_t) (have - sp->_pair_alloc));
+ 	}
+Index: ncurses/base/lib_driver.c
+Prereq:  1.9 
+--- ncurses-6.5-20241207+/ncurses/base/lib_driver.c	2020-08-29 19:53:35.000000000 +0000
++++ ncurses-6.5-20241214/ncurses/base/lib_driver.c	2024-12-14 22:31:35.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018,2020 Thomas E. Dickey                                     *
++ * Copyright 2018-2020,2024 Thomas E. Dickey                                *
+  * Copyright 2009-2012,2014 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -34,7 +34,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_driver.c,v 1.9 2020/08/29 19:53:35 tom Exp $")
++MODULE_ID("$Id: lib_driver.c,v 1.10 2024/12/14 22:31:35 tom Exp $")
+ 
+ #ifndef EXP_WIN32_DRIVER
+ typedef struct DriverEntry {
+@@ -56,7 +56,7 @@
+     int code = ERR;
+     size_t i;
+     TERM_DRIVER *res = (TERM_DRIVER *) 0;
+-    TERM_DRIVER *use = 0;
++    TERM_DRIVER *use = NULL;
+ 
+     T((T_CALLED("_nc_get_driver(%p, %s, %p)"),
+        (void *) TCB, NonNull(name), (void *) errret));
+@@ -72,7 +72,7 @@
+ 	    }
+ 	}
+     }
+-    if (use != 0) {
++    if (use != NULL) {
+ 	TCB->drv = use;
+ 	code = OK;
+     }
+@@ -98,7 +98,7 @@
+ {
+     int code = ERR;
+ 
+-    if (0 != TerminalOf(sp))
++    if (NULL != TerminalOf(sp))
+ 	code = CallDriver_2(sp, td_print, data, len);
+     return (code);
+ }
+Index: ncurses/base/lib_flash.c
+Prereq:  1.15 
+--- ncurses-6.5-20241207+/ncurses/base/lib_flash.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241214/ncurses/base/lib_flash.c	2024-12-14 22:31:47.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2024 Thomas E. Dickey                                     *
+  * Copyright 1998-2013,2014 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -47,7 +47,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_flash.c,v 1.15 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_flash.c,v 1.16 2024/12/14 22:31:47 tom Exp $")
+ 
+ /*
+  *	flash()
+@@ -64,7 +64,7 @@
+ 
+     T((T_CALLED("flash(%p)"), (void *) SP_PARM));
+ #ifdef USE_TERM_DRIVER
+-    if (SP_PARM != 0)
++    if (SP_PARM != NULL)
+ 	res = CallDriver_1(SP_PARM, td_doBeepOrFlash, FALSE);
+ #else
+     if (HasTerminal(SP_PARM)) {
+Index: ncurses/base/lib_newwin.c
+Prereq:  1.78 
+--- ncurses-6.5-20241207+/ncurses/base/lib_newwin.c	2024-12-07 20:19:18.000000000 +0000
++++ ncurses-6.5-20241214/ncurses/base/lib_newwin.c	2024-12-14 23:50:18.000000000 +0000
+@@ -44,13 +44,13 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: lib_newwin.c,v 1.78 2024/12/07 20:19:18 tom Exp $")
++MODULE_ID("$Id: lib_newwin.c,v 1.79 2024/12/14 23:50:18 tom Exp $")
+ 
+ #define window_is(name) ((sp)->_##name == win)
+ 
+ #if USE_REENTRANT
+ #define remove_window(name) \
+-		sp->_##name = 0
++		sp->_##name = NULL
+ #else
+ #define remove_window(name) \
+ 		sp->_##name = NULL; \
+Index: ncurses/base/lib_restart.c
+Prereq:  1.19 
+--- ncurses-6.5-20241207+/ncurses/base/lib_restart.c	2024-12-07 20:03:37.000000000 +0000
++++ ncurses-6.5-20241214/ncurses/base/lib_restart.c	2024-12-15 00:04:09.000000000 +0000
+@@ -42,7 +42,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_restart.c,v 1.19 2024/12/07 20:03:37 tom Exp $")
++MODULE_ID("$Id: lib_restart.c,v 1.20 2024/12/15 00:04:09 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ NCURSES_SP_NAME(restartterm) (NCURSES_SP_DCLx
+@@ -52,7 +52,7 @@
+ {
+     int result;
+ #ifdef USE_TERM_DRIVER
+-    TERMINAL *new_term = 0;
++    TERMINAL *new_term = NULL;
+ #endif
+ 
+     START_TRACE();
+Index: ncurses/base/lib_set_term.c
+Prereq:  1.190 
+--- ncurses-6.5-20241207+/ncurses/base/lib_set_term.c	2024-12-07 17:58:16.000000000 +0000
++++ ncurses-6.5-20241214/ncurses/base/lib_set_term.c	2024-12-15 00:04:13.000000000 +0000
+@@ -57,7 +57,7 @@
+ #undef CUR
+ #define CUR SP_TERMTYPE
+ 
+-MODULE_ID("$Id: lib_set_term.c,v 1.190 2024/12/07 17:58:16 tom Exp $")
++MODULE_ID("$Id: lib_set_term.c,v 1.191 2024/12/15 00:04:13 tom Exp $")
+ 
+ #ifdef USE_TERM_DRIVER
+ #define MaxColors      InfoOf(sp).maxcolors
+@@ -160,7 +160,7 @@
+ 		 rop++) {
+ 		if (rop->win) {
+ 		    (void) delwin(rop->win);
+-		    rop->win = 0;
++		    rop->win = NULL;
+ 		}
+ 	    }
+ 	}
+Index: ncurses/build.priv.h
+Prereq:  1.12 
+--- ncurses-6.5-20241207+/ncurses/build.priv.h	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20241214/ncurses/build.priv.h	2024-12-14 22:32:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019,2020 Thomas E. Dickey                                     *
++ * Copyright 2019-2020,2024 Thomas E. Dickey                                *
+  * Copyright 2010,2012 Free Software Foundation, Inc.                       *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -32,7 +32,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: build.priv.h,v 1.12 2020/02/02 23:34:34 tom Exp $
++ * $Id: build.priv.h,v 1.13 2024/12/14 22:32:09 tom Exp $
+  *
+  *	build.priv.h
+  *
+@@ -78,7 +78,7 @@
+ #define EXIT_FAILURE 1
+ #endif
+ 
+-#define FreeAndNull(p)   do { free(p); p = 0; } while (0)
++#define FreeAndNull(p)   do { free(p); p = NULL; } while (0)
+ #define UChar(c)         ((unsigned char)(c))
+ #define SIZEOF(v)        (sizeof(v) / sizeof(v[0]))
+ 
+Index: ncurses/curses.priv.h
+Prereq:  1.697 
+--- ncurses-6.5-20241207+/ncurses/curses.priv.h	2024-12-07 18:27:10.000000000 +0000
++++ ncurses-6.5-20241214/ncurses/curses.priv.h	2024-12-15 00:04:23.000000000 +0000
+@@ -35,7 +35,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: curses.priv.h,v 1.697 2024/12/07 18:27:10 tom Exp $
++ * $Id: curses.priv.h,v 1.698 2024/12/15 00:04:23 tom Exp $
+  *
+  *	curses.priv.h
+  *
+@@ -2568,8 +2568,8 @@
+ 	 && strncmp(value, "/dev/pts/", 9))
+ 
+ #ifdef USE_TERM_DRIVER
+-#  define IsTermInfo(sp)       ((TCBOf(sp) != 0) && ((TCBOf(sp)->drv->isTerminfo)))
+-#  define HasTInfoTerminal(sp) ((0 != TerminalOf(sp)) && IsTermInfo(sp))
++#  define IsTermInfo(sp)       ((TCBOf(sp) != NULL) && ((TCBOf(sp)->drv->isTerminfo)))
++#  define HasTInfoTerminal(sp) ((NULL != TerminalOf(sp)) && IsTermInfo(sp))
+ #  if defined(EXP_WIN32_DRIVER)
+ #    define IsTermInfoOnConsole(sp) (IsTermInfo(sp) && _nc_console_test(TerminalOf(sp)->Filedes))
+ #  elif defined(USE_WIN32CON_DRIVER)
+Index: ncurses/tinfo/MKcodes.awk
+Prereq:  1.12 
+--- ncurses-6.5-20241207+/ncurses/tinfo/MKcodes.awk	2024-12-07 20:03:37.000000000 +0000
++++ ncurses-6.5-20241214/ncurses/tinfo/MKcodes.awk	2024-12-14 23:45:36.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: MKcodes.awk,v 1.12 2024/12/07 20:03:37 tom Exp $
++# $Id: MKcodes.awk,v 1.13 2024/12/14 23:45:36 tom Exp $
+ function large_item(value) {
+ 	result = sprintf("%d,", offset);
+ 	offset = offset + length(value) + 1;
+@@ -63,7 +63,7 @@
+ 	printf "%s",  value
+ 	print  "};"
+ 	print  ""
+-	printf "static NCURSES_CONST char ** ptr_%s = 0;\n", name
++	printf "static NCURSES_CONST char ** ptr_%s = NULL;\n", name
+ 	print  ""
+ }
+ 
+@@ -114,8 +114,8 @@
+ 			print  "static IT *"
+ 			print  "alloc_array(NCURSES_CONST char ***value, const short *offsets, unsigned size)"
+ 			print  "{"
+-			print  "	if (*value == 0) {"
+-			print  "		if ((*value = typeCalloc(NCURSES_CONST char *, size + 1)) != 0) {"
++			print  "	if (*value == NULL) {"
++			print  "		if ((*value = typeCalloc(NCURSES_CONST char *, size + 1)) != NULL) {"
+ 			print  "			unsigned n;"
+ 			print  "			for (n = 0; n < size; ++n) {"
+ 			print  "				(*value)[n] = (NCURSES_CONST char *) _nc_code_blob + offsets[n];"
+Index: ncurses/tinfo/MKnames.awk
+Prereq:  1.25 
+--- ncurses-6.5-20241207+/ncurses/tinfo/MKnames.awk	2024-12-07 20:04:23.000000000 +0000
++++ ncurses-6.5-20241214/ncurses/tinfo/MKnames.awk	2024-12-14 23:44:37.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: MKnames.awk,v 1.25 2024/12/07 20:04:23 tom Exp $
++# $Id: MKnames.awk,v 1.26 2024/12/14 23:44:37 tom Exp $
+ function large_item(value) {
+ 	result = sprintf("%d,", offset);
+ 	offset = offset + length(value) + 1;
+@@ -63,7 +63,7 @@
+ 	printf "%s",  value
+ 	print  "};"
+ 	print  ""
+-	printf "static NCURSES_CONST char ** ptr_%s = 0;\n", name
++	printf "static NCURSES_CONST char ** ptr_%s = NULL;\n", name
+ 	print  ""
+ }
+ 
+@@ -123,8 +123,8 @@
+ 			print  "static IT *"
+ 			print  "alloc_array(NCURSES_CONST char ***value, const short *offsets, unsigned size)"
+ 			print  "{"
+-			print  "	if (*value == 0) {"
+-			print  "		if ((*value = typeCalloc(NCURSES_CONST char *, size + 1)) != 0) {"
++			print  "	if (*value == NULL) {"
++			print  "		if ((*value = typeCalloc(NCURSES_CONST char *, size + 1)) != NULL) {"
+ 			print  "			unsigned n;"
+ 			print  "			for (n = 0; n < size; ++n) {"
+ 			print  "				(*value)[n] = (NCURSES_CONST char *) _nc_name_blob + offsets[n];"
+Index: ncurses/tinfo/entries.c
+Prereq:  1.38 
+--- ncurses-6.5-20241207+/ncurses/tinfo/entries.c	2024-12-07 18:23:25.000000000 +0000
++++ ncurses-6.5-20241214/ncurses/tinfo/entries.c	2024-12-14 23:48:20.000000000 +0000
+@@ -38,7 +38,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: entries.c,v 1.38 2024/12/07 18:23:25 tom Exp $")
++MODULE_ID("$Id: entries.c,v 1.39 2024/12/14 23:48:20 tom Exp $")
+ 
+ /****************************************************************************
+  *
+@@ -133,7 +133,7 @@
+     {
+ 	PRESCREEN_LIST *p;
+ 	pthread_t id = GetThreadID();
+-	for (p = _nc_prescreen.allocated; p != 0; p = p->next) {
++	for (p = _nc_prescreen.allocated; p != NULL; p = p->next) {
+ 	    if (p->id == id && p->sp != CURRENT_SCREEN) {
+ 		FreeAndNull(p->sp);
+ 	    }
+Index: ncurses/tinfo/lib_acs.c
+Prereq:  1.51 
+--- ncurses-6.5-20241207+/ncurses/tinfo/lib_acs.c	2024-12-07 20:05:08.000000000 +0000
++++ ncurses-6.5-20241214/ncurses/tinfo/lib_acs.c	2024-12-15 00:11:15.000000000 +0000
+@@ -40,14 +40,14 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_acs.c,v 1.51 2024/12/07 20:05:08 tom Exp $")
++MODULE_ID("$Id: lib_acs.c,v 1.52 2024/12/15 00:11:15 tom Exp $")
+ 
+ #if BROKEN_LINKER || USE_REENTRANT
+ #define MyBuffer _nc_prescreen.real_acs_map
+ NCURSES_EXPORT(chtype *)
+ NCURSES_PUBLIC_VAR(acs_map) (void)
+ {
+-    if (MyBuffer == 0)
++    if (MyBuffer == NULL)
+ 	MyBuffer = typeCalloc(chtype, ACS_LEN);
+     return MyBuffer;
+ }
+@@ -66,7 +66,7 @@
+     chtype *map;
+     if (c < 0 || c >= ACS_LEN)
+ 	return (chtype) 0;
+-    map = (SP_PARM != 0) ? SP_PARM->_acs_map :
++    map = (SP_PARM != NULL) ? SP_PARM->_acs_map :
+ #if BROKEN_LINKER || USE_REENTRANT
+ 	_nc_prescreen.real_acs_map
+ #else
+Index: ncurses/tinfo/lib_cur_term.c
+Prereq:  1.50 
+--- ncurses-6.5-20241207+/ncurses/tinfo/lib_cur_term.c	2024-12-07 20:05:08.000000000 +0000
++++ ncurses-6.5-20241214/ncurses/tinfo/lib_cur_term.c	2024-12-14 23:48:20.000000000 +0000
+@@ -41,7 +41,7 @@
+ #include 		/* ospeed */
+ #include 		/* VALID_STRING */
+ 
+-MODULE_ID("$Id: lib_cur_term.c,v 1.50 2024/12/07 20:05:08 tom Exp $")
++MODULE_ID("$Id: lib_cur_term.c,v 1.51 2024/12/14 23:48:20 tom Exp $")
+ 
+ #undef CUR
+ #define CUR TerminalType(termp).
+@@ -51,7 +51,7 @@
+ NCURSES_EXPORT(TERMINAL *)
+ NCURSES_SP_NAME(_nc_get_cur_term) (NCURSES_SP_DCL0)
+ {
+-    return ((0 != TerminalOf(SP_PARM)) ? TerminalOf(SP_PARM) : CurTerm);
++    return ((NULL != TerminalOf(SP_PARM)) ? TerminalOf(SP_PARM) : CurTerm);
+ }
+ 
+ #if NCURSES_SP_FUNCS
+Index: ncurses/tinfo/lib_data.c
+Prereq:  1.90 
+--- ncurses-6.5-20241207+/ncurses/tinfo/lib_data.c	2024-12-07 18:23:25.000000000 +0000
++++ ncurses-6.5-20241214/ncurses/tinfo/lib_data.c	2024-12-15 01:28:56.000000000 +0000
+@@ -43,7 +43,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_data.c,v 1.90 2024/12/07 18:23:25 tom Exp $")
++MODULE_ID("$Id: lib_data.c,v 1.92 2024/12/15 01:28:56 tom Exp $")
+ 
+ /*
+  * OS/2's native linker complains if we don't initialize public data when
+@@ -53,17 +53,17 @@
+ NCURSES_EXPORT(WINDOW *)
+ NCURSES_PUBLIC_VAR(stdscr) (void)
+ {
+-    return CURRENT_SCREEN ? StdScreen(CURRENT_SCREEN) : 0;
++    return CURRENT_SCREEN ? StdScreen(CURRENT_SCREEN) : NULL;
+ }
+ NCURSES_EXPORT(WINDOW *)
+ NCURSES_PUBLIC_VAR(curscr) (void)
+ {
+-    return CURRENT_SCREEN ? CurScreen(CURRENT_SCREEN) : 0;
++    return CURRENT_SCREEN ? CurScreen(CURRENT_SCREEN) : NULL;
+ }
+ NCURSES_EXPORT(WINDOW *)
+ NCURSES_PUBLIC_VAR(newscr) (void)
+ {
+-    return CURRENT_SCREEN ? NewScreen(CURRENT_SCREEN) : 0;
++    return CURRENT_SCREEN ? NewScreen(CURRENT_SCREEN) : NULL;
+ }
+ #else
+ NCURSES_EXPORT_VAR(WINDOW *) stdscr = NULL;
+@@ -162,7 +162,7 @@
+ #endif /* HAVE_TSEARCH */
+ 
+ #ifdef USE_TERM_DRIVER
+-    0,				/* term_driver */
++    NULL,			/* term_driver */
+ #endif
+ 
+ #ifndef USE_SP_WINDOWLIST
+@@ -272,7 +272,7 @@
+     0,				/* COLS */
+     8,				/* TABSIZE */
+     1000,			/* ESCDELAY */
+-    0,				/* cur_term */
++    NULL,			/* cur_term */
+ #endif
+ #ifdef TRACE
+ #if BROKEN_LINKER || USE_REENTRANT
+Index: ncurses/tinfo/lib_napms.c
+Prereq:  1.29 
+--- ncurses-6.5-20241207+/ncurses/tinfo/lib_napms.c	2024-08-31 15:55:00.000000000 +0000
++++ ncurses-6.5-20241214/ncurses/tinfo/lib_napms.c	2024-12-14 23:57:01.000000000 +0000
+@@ -52,7 +52,7 @@
+ #endif
+ #endif
+ 
+-MODULE_ID("$Id: lib_napms.c,v 1.29 2024/08/31 15:55:00 tom Exp $")
++MODULE_ID("$Id: lib_napms.c,v 1.30 2024/12/14 23:57:01 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ NCURSES_SP_NAME(napms) (NCURSES_SP_DCLx int ms)
+@@ -81,7 +81,7 @@
+ #elif defined(_NC_WINDOWS_NATIVE)
+     Sleep((DWORD) ms);
+ #else
+-    _nc_timed_wait(0, 0, ms, (int *) 0 EVENTLIST_2nd(0));
++    _nc_timed_wait(NULL, 0, ms, (int *) 0 EVENTLIST_2nd(NULL));
+ #endif
+ #endif /* !USE_TERM_DRIVER */
+ 
+Index: ncurses/tinfo/lib_setup.c
+Prereq:  1.247 
+--- ncurses-6.5-20241207+/ncurses/tinfo/lib_setup.c	2024-12-07 20:21:01.000000000 +0000
++++ ncurses-6.5-20241214/ncurses/tinfo/lib_setup.c	2024-12-15 00:12:19.000000000 +0000
+@@ -49,7 +49,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: lib_setup.c,v 1.247 2024/12/07 20:21:01 tom Exp $")
++MODULE_ID("$Id: lib_setup.c,v 1.248 2024/12/15 00:12:19 tom Exp $")
+ 
+ /****************************************************************************
+  *
+@@ -115,7 +115,7 @@
+ #if NCURSES_SP_FUNCS
+     if (CURRENT_SCREEN) {
+ 	TERMINAL *termp = TerminalOf(CURRENT_SCREEN);
+-	if (termp != 0) {
++	if (termp != NULL) {
+ 	    result = TerminalType(termp).term_names;
+ 	}
+     }
+@@ -475,7 +475,7 @@
+     TCB->drv->td_size(TCB, linep, colp);
+ 
+ #if USE_REENTRANT
+-    if (sp != 0) {
++    if (sp != NULL) {
+ 	sp->_TABSIZE = my_tabsize;
+     }
+ #else
+@@ -606,7 +606,7 @@
+ 	my_tabsize = 8;
+ 
+ #if USE_REENTRANT
+-    if (sp != 0)
++    if (sp != NULL)
+ 	sp->_TABSIZE = my_tabsize;
+ #else
+     TABSIZE = my_tabsize;
+@@ -825,7 +825,7 @@
+ 		 int reuse)
+ {
+ #ifdef USE_TERM_DRIVER
+-    TERMINAL_CONTROL_BLOCK *TCB = 0;
++    TERMINAL_CONTROL_BLOCK *TCB = NULL;
+ #endif
+     TERMINAL *termp;
+     SCREEN *sp = NULL;
+@@ -838,7 +838,7 @@
+     T((T_CALLED("_nc_setupterm_ex(%p,%s,%d,%p)"),
+        (void *) tp, _nc_visbuf(tname), Filedes, (void *) errret));
+ 
+-    if (tp == 0) {
++    if (tp == NULL) {
+ 	ret_error0(TGETENT_ERR,
+ 		   "Invalid parameter, internal error.\n");
+     } else
+@@ -916,8 +916,8 @@
+     } else {
+ #ifdef USE_TERM_DRIVER
+ 	TERMINAL_CONTROL_BLOCK *my_tcb;
+-	termp = 0;
+-	if ((my_tcb = typeCalloc(TERMINAL_CONTROL_BLOCK, 1)) != 0)
++	termp = NULL;
++	if ((my_tcb = typeCalloc(TERMINAL_CONTROL_BLOCK, 1)) != NULL)
+ 	    termp = &(my_tcb->term);
+ #else
+ 	int status;
+@@ -1076,10 +1076,10 @@
+ NCURSES_EXPORT(SCREEN *)
+ _nc_find_prescr(void)
+ {
+-    SCREEN *result = 0;
++    SCREEN *result = NULL;
+     PRESCREEN_LIST *p;
+     pthread_t id = GetThreadID();
+-    for (p = _nc_prescreen.allocated; p != 0; p = p->next) {
++    for (p = _nc_prescreen.allocated; p != NULL; p = p->next) {
+ 	if (p->id == id) {
+ 	    result = p->sp;
+ 	    break;
+@@ -1099,7 +1099,7 @@
+     PRESCREEN_LIST *p, *q;
+     pthread_t id = GetThreadID();
+     _nc_lock_global(screen);
+-    for (p = _nc_prescreen.allocated, q = 0; p != 0; q = p, p = p->next) {
++    for (p = _nc_prescreen.allocated, q = NULL; p != NULL; q = p, p = p->next) {
+ 	if (p->id == id) {
+ 	    if (q) {
+ 		q->next = p->next;
+@@ -1136,7 +1136,7 @@
+ 	if (sp != NULL) {
+ #ifdef USE_PTHREADS
+ 	    PRESCREEN_LIST *p = typeCalloc(PRESCREEN_LIST, 1);
+-	    if (p != 0) {
++	    if (p != NULL) {
+ 		p->id = GetThreadID();
+ 		p->sp = sp;
+ 		p->next = _nc_prescreen.allocated;
+@@ -1180,14 +1180,14 @@
+ 	      int reuse)
+ {
+     int rc = ERR;
+-    TERMINAL *termp = 0;
++    TERMINAL *termp = NULL;
+ 
+     _nc_init_pthreads();
+     _nc_lock_global(prescreen);
+     START_TRACE();
+     if (TINFO_SETUP_TERM(&termp, tname, Filedes, errret, reuse) == OK) {
+ 	_nc_forget_prescr();
+-	if (NCURSES_SP_NAME(set_curterm) (CURRENT_SCREEN_PRE, termp) != 0) {
++	if (NCURSES_SP_NAME(set_curterm) (CURRENT_SCREEN_PRE, termp) != NULL) {
+ 	    rc = OK;
+ 	}
+     }
+Index: ncurses/tinfo/lib_termcap.c
+Prereq:  1.91 
+--- ncurses-6.5-20241207+/ncurses/tinfo/lib_termcap.c	2024-12-07 18:26:04.000000000 +0000
++++ ncurses-6.5-20241214/ncurses/tinfo/lib_termcap.c	2024-12-15 00:12:19.000000000 +0000
+@@ -49,7 +49,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_termcap.c,v 1.91 2024/12/07 18:26:04 tom Exp $")
++MODULE_ID("$Id: lib_termcap.c,v 1.92 2024/12/15 00:12:19 tom Exp $")
+ 
+ NCURSES_EXPORT_VAR(char *) UP = NULL;
+ NCURSES_EXPORT_VAR(char *) BC = NULL;
+@@ -95,7 +95,7 @@
+     int n;
+     bool found_cache = FALSE;
+ #ifdef USE_TERM_DRIVER
+-    TERMINAL *termp = 0;
++    TERMINAL *termp = NULL;
+ #endif
+ 
+     START_TRACE();
+@@ -104,7 +104,7 @@
+     TINFO_SETUP_TERM(&termp, name, STDOUT_FILENO, &rc, TRUE);
+ 
+ #ifdef USE_TERM_DRIVER
+-    if (termp == 0 ||
++    if (termp == NULL ||
+ 	!((TERMINAL_CONTROL_BLOCK *) termp)->drv->isTerminfo)
+ 	returnCode(rc);
+ #endif
+Index: ncurses/tinfo/lib_ttyflags.c
+Prereq:  1.37 
+--- ncurses-6.5-20241207+/ncurses/tinfo/lib_ttyflags.c	2024-12-07 21:24:18.000000000 +0000
++++ ncurses-6.5-20241214/ncurses/tinfo/lib_ttyflags.c	2024-12-15 00:12:19.000000000 +0000
+@@ -42,7 +42,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_ttyflags.c,v 1.37 2024/12/07 21:24:18 tom Exp $")
++MODULE_ID("$Id: lib_ttyflags.c,v 1.38 2024/12/15 00:12:19 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ NCURSES_SP_NAME(_nc_get_tty_mode) (NCURSES_SP_DCLx TTY * buf)
+@@ -55,7 +55,7 @@
+     } else {
+ 
+ #ifdef USE_TERM_DRIVER
+-	if (SP_PARM != 0) {
++	if (SP_PARM != NULL) {
+ 	    result = CallDriver_2(SP_PARM, td_sgmode, FALSE, buf);
+ 	} else {
+ 	    result = ERR;
+Index: ncurses/tinfo/tinfo_driver.c
+Prereq:  1.76 
+--- ncurses-6.5-20241207+/ncurses/tinfo/tinfo_driver.c	2024-08-31 10:46:01.000000000 +0000
++++ ncurses-6.5-20241214/ncurses/tinfo/tinfo_driver.c	2024-12-15 00:23:20.000000000 +0000
+@@ -52,7 +52,7 @@
+ # endif
+ #endif
+ 
+-MODULE_ID("$Id: tinfo_driver.c,v 1.76 2024/08/31 10:46:01 Rafael.Kitover Exp $")
++MODULE_ID("$Id: tinfo_driver.c,v 1.77 2024/12/15 00:23:20 tom Exp $")
+ 
+ /*
+  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
+@@ -215,7 +215,7 @@
+      * _nc_setupscreen().  Do it now anyway, so we can initialize the
+      * baudrate.
+      */
+-    if (sp == 0 && NC_ISATTY(termp->Filedes)) {
++    if (sp == NULL && NC_ISATTY(termp->Filedes)) {
+ 	get_baudrate(termp);
+     }
+ #if NCURSES_EXT_NUMBERS
+@@ -323,7 +323,7 @@
+     AssertTCB();
+     SetSP();
+ 
+-    if (sp != 0 && orig_pair && orig_colors && (initialize_pair != 0)) {
++    if (sp != NULL && orig_pair && orig_colors && (initialize_pair != NULL)) {
+ #if NCURSES_EXT_FUNCS
+ 	sp->_default_color = isDefaultColor(fg) || isDefaultColor(bg);
+ 	sp->_has_sgr_39_49 = (NCURSES_SP_NAME(tigetflag) (NCURSES_SP_ARGx
+@@ -331,7 +331,7 @@
+ 			      == TRUE);
+ 	sp->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : fg;
+ 	sp->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : bg;
+-	if (sp->_color_pairs != 0) {
++	if (sp->_color_pairs != NULL) {
+ 	    bool save = sp->_default_color;
+ 	    sp->_default_color = TRUE;
+ 	    NCURSES_SP_NAME(init_pair) (NCURSES_SP_ARGx
+@@ -391,7 +391,7 @@
+     AssertTCB();
+     SetSP();
+ 
+-    if (orig_pair != 0) {
++    if (orig_pair != NULL) {
+ 	NCURSES_PUTP2("orig_pair", orig_pair);
+ 	result = TRUE;
+     }
+@@ -407,7 +407,7 @@
+     AssertTCB();
+     SetSP();
+ 
+-    if (orig_colors != 0) {
++    if (orig_colors != NULL) {
+ 	NCURSES_PUTP2("orig_colors", orig_colors);
+ 	result = TRUE;
+     }
+@@ -470,7 +470,7 @@
+ 		errno = 0;
+ 		do {
+ 		    if (ioctl(termp->Filedes, IOCTL_WINSIZE, &size) >= 0) {
+-			*linep = ((sp != 0 && sp->_filtered)
++			*linep = ((sp != NULL && sp->_filtered)
+ 				  ? 1
+ 				  : WINSIZE_ROWS(size));
+ 			*colp = WINSIZE_COLS(size);
+@@ -489,7 +489,7 @@
+ 		/*
+ 		 * If environment variables are used, update them.
+ 		 */
+-		if ((sp == 0 || !sp->_filtered) && _nc_getenv_num("LINES") > 0) {
++		if ((sp == NULL || !sp->_filtered) && _nc_getenv_num("LINES") > 0) {
+ 		    _nc_setenv_num("LINES", *linep);
+ 		}
+ 		if (_nc_getenv_num("COLUMNS") > 0) {
+@@ -676,7 +676,7 @@
+ {
+ }
+ 
+-#  define SGR0_TEST(mode) (mode != 0) && (exit_attribute_mode == 0 || strcmp(mode, exit_attribute_mode))
++#  define SGR0_TEST(mode) (mode != NULL) && (exit_attribute_mode == NULL || strcmp(mode, exit_attribute_mode))
+ 
+ static void
+ drv_screen_init(SCREEN *sp)
+@@ -791,7 +791,7 @@
+ default_fg(SCREEN *sp)
+ {
+ #if NCURSES_EXT_FUNCS
+-    return (sp != 0) ? sp->_default_fg : COLOR_WHITE;
++    return (sp != NULL) ? sp->_default_fg : COLOR_WHITE;
+ #else
+     return COLOR_WHITE;
+ #endif
+@@ -801,7 +801,7 @@
+ default_bg(SCREEN *sp)
+ {
+ #if NCURSES_EXT_FUNCS
+-    return sp != 0 ? sp->_default_bg : COLOR_BLACK;
++    return sp != NULL ? sp->_default_bg : COLOR_BLACK;
+ #else
+     return COLOR_BLACK;
+ #endif
+@@ -833,7 +833,7 @@
+     int old_fg, old_bg;
+ 
+     AssertTCB();
+-    if (sp == 0)
++    if (sp == NULL)
+ 	return;
+ 
+     if (pair < 0 || pair >= COLOR_PAIRS) {
+@@ -844,13 +844,13 @@
+ 	    NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
+ 				    TIPARM_1(set_color_pair, pair), 1, outc);
+ 	    return;
+-	} else if (sp != 0) {
++	} else if (sp != NULL) {
+ 	    _nc_pair_content(SP_PARM, pair, &fg, &bg);
+ 	}
+     }
+ 
+     if (old_pair >= 0
+-	&& sp != 0
++	&& sp != NULL
+ 	&& _nc_pair_content(SP_PARM, old_pair, &old_fg, &old_bg) != ERR) {
+ 	if ((isDefaultColor(fg) && !isDefaultColor(old_fg))
+ 	    || (isDefaultColor(bg) && !isDefaultColor(old_bg))) {
+@@ -921,10 +921,10 @@
+     SetSP();
+ 
+     /* we know how to recognize mouse events under "xterm" */
+-    if (sp != 0) {
++    if (sp != NULL) {
+ 	if (NonEmpty(key_mouse)) {
+ 	    init_xterm_mouse(sp);
+-	} else if (strstr(SP_TERMTYPE term_names, "xterm") != 0) {
++	} else if (strstr(SP_TERMTYPE term_names, "xterm") != NULL) {
+ 	    if (_nc_add_to_try(&(sp->_keytry), xterm_kmous, KEY_MOUSE) == OK)
+ 		init_xterm_mouse(sp);
+ 	}
+@@ -1091,7 +1091,7 @@
+      *
+      * test/blue.c uses this feature.
+      */
+-#define PCH_KLUDGE(a,b) (a != 0 && b != 0 && !strcmp(a,b))
++#define PCH_KLUDGE(a,b) (a != NULL && b != NULL && !strcmp(a,b))
+     if (PCH_KLUDGE(enter_pc_charset_mode, enter_alt_charset_mode) &&
+ 	PCH_KLUDGE(exit_pc_charset_mode, exit_alt_charset_mode)) {
+ 	size_t i;
+@@ -1099,7 +1099,7 @@
+ 	    if (real_map[i] == 0) {
+ 		real_map[i] = (chtype) i;
+ 		if (real_map != fake_map) {
+-		    if (sp != 0)
++		    if (sp != NULL)
+ 			sp->_screen_acs_map[i] = TRUE;
+ 		}
+ 	    }
+@@ -1118,7 +1118,7 @@
+ 		   (int) i,
+ 		   _tracechar(UChar(acs_chars[i])),
+ 		   _tracechtype(real_map[UChar(acs_chars[i])])));
+-		if (sp != 0) {
++		if (sp != NULL) {
+ 		    sp->_screen_acs_map[UChar(acs_chars[i])] = TRUE;
+ 		}
+ 	    }
+@@ -1163,7 +1163,7 @@
+     bool support_cookies = USE_XMC_SUPPORT;
+     TERMINAL_CONTROL_BLOCK *TCB = (TERMINAL_CONTROL_BLOCK *) (sp->_term);
+ 
+-    if (sp == 0 || !ENSURE_TINFO(sp))
++    if (sp == NULL || !ENSURE_TINFO(sp))
+ 	return;
+ 
+ #if USE_XMC_SUPPORT
+@@ -1172,7 +1172,7 @@
+      * in the environment, reset the support-flag.
+      */
+     if (magic_cookie_glitch >= 0) {
+-	if (getenv("NCURSES_NO_MAGIC_COOKIE") != 0) {
++	if (getenv("NCURSES_NO_MAGIC_COOKIE") != NULL) {
+ 	    support_cookies = FALSE;
+ 	}
+     }
+@@ -1313,7 +1313,7 @@
+ #elif defined(EXP_WIN32_DRIVER)
+     Sleep((DWORD) ms);
+ #else
+-    _nc_timed_wait(0, 0, ms, (int *) 0 EVENTLIST_2nd(0));
++    _nc_timed_wait(NULL, 0, ms, (int *) 0 EVENTLIST_2nd(NULL));
+ #endif
+     return OK;
+ }
+@@ -1380,7 +1380,7 @@
+ 	unsigned ch = (unsigned) c;
+ 	if (flag) {
+ 	    while ((s = _nc_expand_try(sp->_key_ok,
+-				       ch, &count, (size_t) 0)) != 0) {
++				       ch, &count, (size_t) 0)) != NULL) {
+ 		if (_nc_remove_key(&(sp->_key_ok), ch)) {
+ 		    code = _nc_add_to_try(&(sp->_keytry), s, ch);
+ 		    free(s);
+@@ -1393,7 +1393,7 @@
+ 	    }
+ 	} else {
+ 	    while ((s = _nc_expand_try(sp->_keytry,
+-				       ch, &count, (size_t) 0)) != 0) {
++				       ch, &count, (size_t) 0)) != NULL) {
+ 		if (_nc_remove_key(&(sp->_keytry), ch)) {
+ 		    code = _nc_add_to_try(&(sp->_key_ok), s, ch);
+ 		    free(s);
+@@ -1420,7 +1420,7 @@
+ 
+     T((T_CALLED("tinfo:drv_cursorSet(%p,%d)"), (void *) SP_PARM, vis));
+ 
+-    if (SP_PARM != 0 && IsTermInfo(SP_PARM)) {
++    if (SP_PARM != NULL && IsTermInfo(SP_PARM)) {
+ 	switch (vis) {
+ 	case 2:
+ 	    code = NCURSES_PUTP2_FLUSH("cursor_visible", cursor_visible);
+Index: ncurses/tty/lib_mvcur.c
+Prereq:  1.162 
+--- ncurses-6.5-20241207+/ncurses/tty/lib_mvcur.c	2024-12-07 20:06:49.000000000 +0000
++++ ncurses-6.5-20241214/ncurses/tty/lib_mvcur.c	2024-12-15 00:04:06.000000000 +0000
+@@ -160,7 +160,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_mvcur.c,v 1.162 2024/12/07 20:06:49 tom Exp $")
++MODULE_ID("$Id: lib_mvcur.c,v 1.163 2024/12/15 00:04:06 tom Exp $")
+ 
+ #define WANT_CHAR(sp, y, x) NewScreen(sp)->_line[y].text[x]	/* desired state */
+ 
+@@ -1106,7 +1106,7 @@
+ 			ynew, xnew,
+ 			NCURSES_SP_NAME(_nc_outch),
+ 			TRUE);
+-    if ((SP_PARM != 0) && (SP_PARM->_endwin == ewInitial))
++    if ((SP_PARM != NULL) && (SP_PARM->_endwin == ewInitial))
+ 	NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
+     NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
+     return rc;
+Index: ncurses/tty/lib_tstp.c
+Prereq:  1.55 
+--- ncurses-6.5-20241207+/ncurses/tty/lib_tstp.c	2024-12-07 20:06:49.000000000 +0000
++++ ncurses-6.5-20241214/ncurses/tty/lib_tstp.c	2024-12-15 02:01:17.000000000 +0000
+@@ -43,7 +43,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_tstp.c,v 1.55 2024/12/07 20:06:49 tom Exp $")
++MODULE_ID("$Id: lib_tstp.c,v 1.57 2024/12/15 02:01:17 tom Exp $")
+ 
+ #if defined(SIGTSTP) && (HAVE_SIGACTION || HAVE_SIGVEC)
+ #define USE_SIGTSTP 1
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20241207+/package/debian-mingw/changelog	2024-12-07 11:51:44.000000000 +0000
++++ ncurses-6.5-20241214/package/debian-mingw/changelog	2024-12-14 11:34:56.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241207) unstable; urgency=low
++ncurses6td (6.5+20241214) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 07 Dec 2024 06:51:44 -0500
++ -- Thomas E. Dickey   Sat, 14 Dec 2024 06:34:56 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20241207+/package/debian-mingw64/changelog	2024-12-07 11:51:44.000000000 +0000
++++ ncurses-6.5-20241214/package/debian-mingw64/changelog	2024-12-14 11:34:56.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241207) unstable; urgency=low
++ncurses6td (6.5+20241214) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 07 Dec 2024 06:51:44 -0500
++ -- Thomas E. Dickey   Sat, 14 Dec 2024 06:34:56 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20241207+/package/debian/changelog	2024-12-07 11:51:44.000000000 +0000
++++ ncurses-6.5-20241214/package/debian/changelog	2024-12-14 11:34:56.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241207) unstable; urgency=low
++ncurses6td (6.5+20241214) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 07 Dec 2024 06:51:44 -0500
++ -- Thomas E. Dickey   Sat, 14 Dec 2024 06:34:56 -0500
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.679 
+--- ncurses-6.5-20241207+/package/mingw-ncurses.nsi	2024-12-07 11:51:44.000000000 +0000
++++ ncurses-6.5-20241214/package/mingw-ncurses.nsi	2024-12-14 11:34:56.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.679 2024/12/07 11:51:44 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.680 2024/12/14 11:34:56 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "1207"
++!define VERSION_MMDD  "1214"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20241207+/package/mingw-ncurses.spec	2024-12-07 11:51:44.000000000 +0000
++++ ncurses-6.5-20241214/package/mingw-ncurses.spec	2024-12-14 11:34:56.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20241207
++Release: 20241214
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20241207+/package/ncurses.spec	2024-12-07 11:51:44.000000000 +0000
++++ ncurses-6.5-20241214/package/ncurses.spec	2024-12-14 11:34:56.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20241207
++Release: 20241214
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20241207+/package/ncursest.spec	2024-12-07 11:51:44.000000000 +0000
++++ ncurses-6.5-20241214/package/ncursest.spec	2024-12-14 11:34:56.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20241207
++Release: 20241214
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/packages/ncurses/6.5/ncurses-6.5-20241221.patch b/packages/ncurses/6.5/ncurses-6.5-20241221.patch
new file mode 100644
index 0000000000..531508c8bf
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20241221.patch
@@ -0,0 +1,891 @@
+# ncurses 6.5 - patch 20241221 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20241221.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Dec 22 01:11:31 UTC 2024
+# ------------------------------------------------------------------------------
+# Ada95/aclocal.m4                 |   18 ++++----
+# Ada95/configure                  |    8 +--
+# NEWS                             |   11 ++++-
+# VERSION                          |    2 
+# aclocal.m4                       |   10 ++--
+# c++/cursesw.h                    |    7 ---
+# configure                        |    2 
+# dist.mk                          |    4 -
+# form/form.priv.h                 |    5 +-
+# form/fty_int.c                   |    6 +-
+# form/fty_num.c                   |    6 +-
+# ncurses/base/MKlib_gen.sh        |    3 -
+# ncurses/tinfo/MKfallback.sh      |    4 -
+# ncurses/tinfo/lib_data.c         |    4 -
+# ncurses/tinfo/trim_sgr0.c        |   75 +++++++++++++++++++++++++++++++++++--
+# ncurses/tinfo/write_entry.c      |    8 +--
+# ncurses/trace/lib_tracebits.c    |    6 +-
+# ncurses/tty/lib_tstp.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                  |    4 -
+# test/aclocal.m4                  |   10 ++--
+# test/configure                   |    4 -
+# test/foldkeys.c                  |    4 -
+# test/padview.c                   |    5 +-
+# 30 files changed, 156 insertions(+), 78 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/aclocal.m4
+Prereq:  1.222 
+--- ncurses-6.5-20241214+/Ada95/aclocal.m4	2024-11-09 23:14:10.000000000 +0000
++++ ncurses-6.5-20241221/Ada95/aclocal.m4	2024-12-21 15:29:41.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: aclocal.m4,v 1.222 2024/11/09 23:14:10 tom Exp $
++dnl $Id: aclocal.m4,v 1.223 2024/12/21 15:29:41 tom Exp $
+ dnl Macros used in NCURSES Ada95 auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -477,7 +477,7 @@
+ AC_SUBST(ARFLAGS)
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_BUILD_CC version: 13 updated: 2024/06/22 13:42:22
++dnl CF_BUILD_CC version: 14 updated: 2024/12/14 11:58:01
+ dnl -----------
+ dnl If we're cross-compiling, allow the user to override the tools and their
+ dnl options.  The configure script is oriented toward identifying the host
+@@ -555,7 +555,7 @@
+ 	AC_TRY_RUN([#include 
+ 		int main(int argc, char *argv[])
+ 		{
+-			${cf_cv_main_return:-return}(argc < 0 || argv == 0 || argv[0] == 0);
++			${cf_cv_main_return:-return}(argc < 0 || argv == (void*)0 || argv[0] == (void*)0);
+ 		}
+ 	],
+ 		cf_ok_build_cc=yes,
+@@ -901,7 +901,7 @@
+ fi
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CONST_X_STRING version: 8 updated: 2023/12/01 17:22:50
++dnl CF_CONST_X_STRING version: 9 updated: 2024/12/04 03:49:57
+ dnl -----------------
+ dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
+ dnl character-strings.
+@@ -928,7 +928,7 @@
+ 
+ AC_TRY_COMPILE(
+ [
+-#include 
++$ac_includes_default
+ #include 
+ ],
+ [String foo = malloc(1); free((void*)foo)],[
+@@ -939,7 +939,7 @@
+ #undef  _CONST_X_STRING
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+ #undef  XTSTRINGDEFINES	/* X11R5 and later */
+-#include 
++$ac_includes_default
+ #include 
+ 		],[String foo = malloc(1); *foo = 0],[
+ 			cf_cv_const_x_string=no
+@@ -1508,7 +1508,7 @@
+ CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_GCC_WARNINGS version: 41 updated: 2021/01/01 16:53:59
++dnl CF_GCC_WARNINGS version: 43 updated: 2024/12/21 08:44:12
+ dnl ---------------
+ dnl Check if the compiler supports useful warning options.  There's a few that
+ dnl we don't use, simply because they're too noisy:
+@@ -4013,7 +4013,7 @@
+ done
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_SHARED_OPTS version: 111 updated: 2024/03/29 20:08:49
++dnl CF_SHARED_OPTS version: 112 updated: 2024/12/14 16:09:34
+ dnl --------------
+ dnl --------------
+ dnl Attempt to determine the appropriate CC/LD options for creating a shared
+@@ -4529,7 +4529,7 @@
+ int main(int argc, char *argv[[]])
+ {
+ 	printf("hello\\n");
+-	return (argv[[argc-1]] == 0) ;
++	return (argv[[argc-1]] == NULL) ;
+ }
+ EOF
+ 		cf_save_CFLAGS="$CFLAGS"
+Index: Ada95/configure
+--- ncurses-6.5-20241214+/Ada95/configure	2024-11-09 23:14:34.000000000 +0000
++++ ncurses-6.5-20241221/Ada95/configure	2024-12-21 15:30:09.000000000 +0000
+@@ -4743,7 +4743,7 @@
+ #include 
+ 		int main(int argc, char *argv[])
+ 		{
+-			${cf_cv_main_return:-return}(argc < 0 || argv == 0 || argv[0] == 0);
++			${cf_cv_main_return:-return}(argc < 0 || argv == (void*)0 || argv[0] == (void*)0);
+ 		}
+ 
+ _ACEOF
+@@ -12772,7 +12772,7 @@
+ int main(int argc, char *argv[])
+ {
+ 	printf("hello\\n");
+-	return (argv[argc-1] == 0) ;
++	return (argv[argc-1] == NULL) ;
+ }
+ EOF
+ 		cf_save_CFLAGS="$CFLAGS"
+@@ -16299,7 +16299,7 @@
+ #line 16299 "configure"
+ #include "confdefs.h"
+ 
+-#include 
++$ac_includes_default
+ #include 
+ 
+ int
+@@ -16336,7 +16336,7 @@
+ #undef  _CONST_X_STRING
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+ #undef  XTSTRINGDEFINES	/* X11R5 and later */
+-#include 
++$ac_includes_default
+ #include 
+ 
+ int
+Index: NEWS
+Prereq:  1.4212 
+--- ncurses-6.5-20241214+/NEWS	2024-12-14 20:03:39.000000000 +0000
++++ ncurses-6.5-20241221/NEWS	2024-12-21 20:43:26.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4212 2024/12/14 20:03:39 tom Exp $
++-- $Id: NEWS,v 1.4216 2024/12/21 20:43:26 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,10 +46,17 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20241221
++	+ modify ncurses/tinfo/MKfallback.sh to work with MacOS sed, which
++	  lacks BSD-style \< and \>
++	+ trim padding from sgr expresion used in trim_sgr0, to avoid copying
++	  the padding into the resulting sgr0 (report by Rajeev Pillai).
++	+ strict compiler-warning fixes for upcoming gcc15
++
+ 20241214
+ 	+ avoid redefining bool in curses.h if the platform already supports
+ 	  that type (cf: 20241123).
+-	+ move include  from etip.h.in to cursesw.hh, to work around
++	+ move include  from etip.h.in to cursesw.h, to work around
+ 	  breakage in Apple's port of ncurses.
+ 	+ strict compiler-warning fixes for upcoming gcc15
+ 
+Index: VERSION
+--- ncurses-6.5-20241214+/VERSION	2024-12-14 11:34:56.000000000 +0000
++++ ncurses-6.5-20241221/VERSION	2024-12-21 10:55:02.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20241214
++5:0:10	6.5	20241221
+Index: aclocal.m4
+Prereq:  1.1096 
+--- ncurses-6.5-20241214+/aclocal.m4	2024-12-14 21:33:29.000000000 +0000
++++ ncurses-6.5-20241221/aclocal.m4	2024-12-21 13:44:45.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1096 2024/12/14 21:33:29 tom Exp $
++dnl $Id: aclocal.m4,v 1.1097 2024/12/21 13:44:45 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -3115,7 +3115,7 @@
+ CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_GCC_WARNINGS version: 42 updated: 2024/12/14 09:09:41
++dnl CF_GCC_WARNINGS version: 43 updated: 2024/12/21 08:44:12
+ dnl ---------------
+ dnl Check if the compiler supports useful warning options.  There's a few that
+ dnl we don't use, simply because they're too noisy:
+@@ -3141,7 +3141,7 @@
+ if test "x$have_x" = xyes; then CF_CONST_X_STRING fi
+ cat > "conftest.$ac_ext" < conftest.$ac_ext <
+-}
++#include 
+ 
+ #if defined(BUILDING_NCURSES_CXX)
+ # define NCURSES_CXX_IMPEXP NCURSES_EXPORT_GENERAL_EXPORT
+@@ -50,7 +48,6 @@
+ #define NCURSES_CXX_EXPORT_VAR(type) NCURSES_CXX_IMPEXP type
+ 
+ #include 
+-#include 
+ 
+ /* SCO 3.2v4 curses.h includes term.h, which defines lines as a macro.
+    Undefine it here, because NCursesWindow uses lines as a method.  */
+Index: configure
+--- ncurses-6.5-20241214+/configure	2024-12-15 02:03:09.000000000 +0000
++++ ncurses-6.5-20241221/configure	2024-12-21 15:24:20.000000000 +0000
+@@ -17892,7 +17892,7 @@
+  fi
+ cat > "conftest.$ac_ext" < MAX_DIGITS ? MAX_DIGITS : ((n) > 0 ? (n) : 0))
++
+ extern FORM_EXPORT(TypeArgument *) _nc_Make_Argument (const FIELDTYPE*, va_list*, int*);
+ extern FORM_EXPORT(TypeArgument *) _nc_Copy_Argument (const FIELDTYPE*, const TypeArgument*, int*);
+ extern FORM_EXPORT(void) _nc_Free_Argument (const FIELDTYPE*, TypeArgument*);
+Index: form/fty_int.c
+Prereq:  1.35 
+--- ncurses-6.5-20241214+/form/fty_int.c	2024-12-07 21:58:32.000000000 +0000
++++ ncurses-6.5-20241221/form/fty_int.c	2024-12-21 17:14:36.000000000 +0000
+@@ -35,7 +35,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fty_int.c,v 1.35 2024/12/07 21:58:32 tom Exp $")
++MODULE_ID("$Id: fty_int.c,v 1.36 2024/12/21 17:14:36 tom Exp $")
+ 
+ #if USE_WIDEC_SUPPORT
+ #define isDigit(c) (iswdigit((wint_t)(c)) || isdigit(UChar(c)))
+@@ -235,10 +235,10 @@
+ 	    }
+ 	  if (result)
+ 	    {
+-	      char buf[100];
++	      char buf[MAX_DIGITS + 3];
+ 
+ 	      _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf))
+-			  "%.*ld", (prec > 0 ? prec : 0), val);
++			  "%.*ld", MaxDigits(prec), val);
+ 	      set_field_buffer(field, 0, buf);
+ 	    }
+ 	}
+Index: form/fty_num.c
+Prereq:  1.39 
+--- ncurses-6.5-20241214+/form/fty_num.c	2024-12-07 21:58:32.000000000 +0000
++++ ncurses-6.5-20241221/form/fty_num.c	2024-12-21 17:16:09.000000000 +0000
+@@ -35,7 +35,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: fty_num.c,v 1.39 2024/12/07 21:58:32 tom Exp $")
++MODULE_ID("$Id: fty_num.c,v 1.40 2024/12/21 17:16:09 tom Exp $")
+ 
+ #if HAVE_LOCALE_H
+ #include 
+@@ -273,10 +273,10 @@
+ 	    }
+ 	  if (result)
+ 	    {
+-	      char buf[64];
++	      char buf[MAX_DIGITS * 6];
+ 
+ 	      _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf))
+-			  "%.*f", (prec > 0 ? prec : 0), val);
++			  "%.*f", MaxDigits(prec), val);
+ 	      set_field_buffer(field, 0, buf);
+ 	    }
+ 	}
+Index: ncurses/base/MKlib_gen.sh
+Prereq:  1.75 
+--- ncurses-6.5-20241214+/ncurses/base/MKlib_gen.sh	2024-12-07 21:50:24.000000000 +0000
++++ ncurses-6.5-20241221/ncurses/base/MKlib_gen.sh	2024-12-21 16:51:25.000000000 +0000
+@@ -2,7 +2,7 @@
+ #
+ # MKlib_gen.sh -- generate sources from curses.h macro definitions
+ #
+-# ($Id: MKlib_gen.sh,v 1.75 2024/12/07 21:50:24 tom Exp $)
++# ($Id: MKlib_gen.sh,v 1.76 2024/12/21 16:51:25 tom Exp $)
+ #
+ ##############################################################################
+ # Copyright 2018-2022,2024 Thomas E. Dickey                                  #
+@@ -191,6 +191,7 @@
+ 	s/\(((\)0\([ ]*!=[ ]*(const void\)/\1NULL\2/g
+ 	/returnCode(wborder_set/s,0,NULL,g
+ 	/returnWin/s,0,NULL,
++	/_parent/s,0,NULL,
+ EOF
+ else
+ cat >$ED4 </NCURSES_INT2/g'
++		"$infocmp_path" -E "$x" | sed -e 's/[ 	]short[ 	]/ NCURSES_INT2 /g'
+ 	done
+ 
+ 	cat <
+ 
+-MODULE_ID("$Id: lib_data.c,v 1.92 2024/12/15 01:28:56 tom Exp $")
++MODULE_ID("$Id: lib_data.c,v 1.93 2024/12/21 20:27:36 tom Exp $")
+ 
+ /*
+  * OS/2's native linker complains if we don't initialize public data when
+@@ -188,7 +188,7 @@
+     0,				/* nested_tracef */
+     0,				/* use_pthreads */
+ #if USE_PTHREADS_EINTR
+-    0,				/* read_thread */
++    (pthread_t)	0,		/* read_thread */
+ #endif
+ #endif
+ #if USE_WIDEC_SUPPORT
+Index: ncurses/tinfo/trim_sgr0.c
+Prereq:  1.26 
+--- ncurses-6.5-20241214+/ncurses/tinfo/trim_sgr0.c	2024-12-07 21:02:59.000000000 +0000
++++ ncurses-6.5-20241221/ncurses/tinfo/trim_sgr0.c	2024-12-21 20:15:26.000000000 +0000
+@@ -37,11 +37,77 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: trim_sgr0.c,v 1.26 2024/12/07 21:02:59 tom Exp $")
++MODULE_ID("$Id: trim_sgr0.c,v 1.27 2024/12/21 20:15:26 tom Exp $")
+ 
+ #undef CUR
+ #define CUR tp->
+ 
++/*
++ * Skip a padding token, e.g., "<5>", "<5.1>", "<5/>", "<5*>", or "<5/>".
++ * If the pattern does not match, return null.
++ */
++static char *
++skip_padding(char *value)
++{
++    char *result = NULL;
++    if (*value++ == '$' && *value++ == '<') {
++	int ch;
++	int state = 0;		/* 1=integer, 2=decimal, 3=fraction */
++	while ((ch = UChar(*value++)) != '\0') {
++	    if (ch == '*' || ch == '/') {
++		if (!state)
++		    break;
++	    } else if (ch == '>') {
++		if (state)
++		    result = value;
++		break;
++	    } else if (ch == '.') {
++		if (state < 2) {
++		    state = 2;
++		} else {
++		    break;	/* a single decimal point is allowed */
++		}
++	    } else if (isdigit(ch)) {
++		if (state < 2) {
++		    state = 1;
++		} else if (state == 2) {
++		    state = 3;
++		} else {
++		    break;	/* only a single digit after decimal point */
++		}
++	    } else {
++		break;
++	    }
++	}
++    }
++    return result;
++}
++
++static void
++strip_padding(char *value)
++{
++    char *s = value;
++    char ch;
++
++    while ((ch = *s) != '\0') {
++	if (ch == '\\') {
++	    if (*++s == '\0')
++		break;
++	    ++s;
++	} else {
++	    char *d = NULL;
++	    if (ch == '$')
++		d = skip_padding(s);
++	    if (d != NULL) {
++		char *t = s;
++		while ((*t++ = *d++) != '\0') ;
++	    } else {
++		++s;
++	    }
++	}
++    }
++}
++
+ static char *
+ set_attribute_9(const TERMTYPE2 *tp, int flag)
+ {
+@@ -49,10 +115,13 @@
+     char *result;
+ 
+     value = TIPARM_9(set_attributes, 0, 0, 0, 0, 0, 0, 0, 0, flag);
+-    if (PRESENT(value))
++    if (PRESENT(value)) {
+ 	result = strdup(value);
+-    else
++	if (result != NULL)
++	    strip_padding(result);
++    } else {
+ 	result = NULL;
++    }
+     return result;
+ }
+ 
+Index: ncurses/tinfo/write_entry.c
+Prereq:  1.138 
+--- ncurses-6.5-20241214+/ncurses/tinfo/write_entry.c	2024-12-07 21:13:36.000000000 +0000
++++ ncurses-6.5-20241221/ncurses/tinfo/write_entry.c	2024-12-21 16:42:33.000000000 +0000
+@@ -42,7 +42,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: write_entry.c,v 1.138 2024/12/07 21:13:36 tom Exp $")
++MODULE_ID("$Id: write_entry.c,v 1.139 2024/12/21 16:42:33 tom Exp $")
+ 
+ #if 1
+ #define TRACE_OUT(p) DEBUG(2, p)
+@@ -132,10 +132,10 @@
+     const char *s = NULL;
+ 
+     if (code == 0 || (s = (strchr) (dirnames, code)) == NULL) {
+-	_nc_err_abort("Illegal terminfo subdirectory \"" LEAF_FMT "\"", code);
++	_nc_err_abort("Illegal terminfo subdirectory \"" LEAF_FMT "\"", UChar(code));
+     } else if (!verified[s - dirnames]) {
+ 	char dir[sizeof(LEAF_FMT)];
+-	_nc_SPRINTF(dir, _nc_SLIMIT(sizeof(dir)) LEAF_FMT, code);
++	_nc_SPRINTF(dir, _nc_SLIMIT(sizeof(dir)) LEAF_FMT, UChar(code));
+ 	if (make_db_root(dir) < 0) {
+ 	    _nc_err_abort("%s/%s: (errno %d) %s",
+ 			  _nc_tic_dir(NULL),
+@@ -495,7 +495,7 @@
+ 
+ 	check_writeable(ptr[0]);
+ 	_nc_SPRINTF(linkname, _nc_SLIMIT(sizeof(linkname))
+-		    LEAF_FMT "/%.*s", ptr[0],
++		    LEAF_FMT "/%.*s", UChar(ptr[0]),
+ 		    (int) sizeof(linkname) - (2 + LEAF_LEN), ptr);
+ 
+ 	if (strcmp(filename, linkname) == 0) {
+Index: ncurses/trace/lib_tracebits.c
+Prereq:  1.32 
+--- ncurses-6.5-20241214+/ncurses/trace/lib_tracebits.c	2024-12-07 21:24:18.000000000 +0000
++++ ncurses-6.5-20241221/ncurses/trace/lib_tracebits.c	2024-12-21 16:39:29.000000000 +0000
+@@ -35,7 +35,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_tracebits.c,v 1.32 2024/12/07 21:24:18 tom Exp $")
++MODULE_ID("$Id: lib_tracebits.c,v 1.33 2024/12/21 16:39:29 tom Exp $")
+ 
+ #if HAVE_SYS_TERMIO_H
+ #include 		/* needed for ISC */
+@@ -79,14 +79,14 @@
+ #endif
+ 
+ typedef struct {
+-    unsigned int val;
++    unsigned long val;
+     const char name[BITNAMELEN];
+ } BITNAMES;
+ 
+ #define TRACE_BUF_SIZE(num) (_nc_globals.tracebuf_ptr[num].size)
+ 
+ static void
+-lookup_bits(char *buf, const BITNAMES * table, const char *label, unsigned int val)
++lookup_bits(char *buf, const BITNAMES * table, const char *label, unsigned long val)
+ {
+     const BITNAMES *sp;
+ 
+Index: ncurses/tty/lib_tstp.c
+Prereq:  1.57 
+--- ncurses-6.5-20241214+/ncurses/tty/lib_tstp.c	2024-12-15 02:01:17.000000000 +0000
++++ ncurses-6.5-20241221/ncurses/tty/lib_tstp.c	2024-12-21 18:43:50.000000000 +0000
+@@ -43,7 +43,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_tstp.c,v 1.57 2024/12/15 02:01:17 tom Exp $")
++MODULE_ID("$Id: lib_tstp.c,v 1.58 2024/12/21 18:43:50 tom Exp $")
+ 
+ #if defined(SIGTSTP) && (HAVE_SIGACTION || HAVE_SIGVEC)
+ #define USE_SIGTSTP 1
+@@ -294,7 +294,7 @@
+ #  endif
+ 	    _nc_globals.read_thread = pthread_self();
+     } else {
+-	_nc_globals.read_thread = 0;
++	_nc_globals.read_thread = (pthread_t) 0;
+     }
+     _nc_unlock_global(curses);
+ }
+@@ -310,7 +310,7 @@
+     if (_nc_globals.read_thread) {
+ 	if (!pthread_equal(pthread_self(), _nc_globals.read_thread))
+ 	    pthread_kill(_nc_globals.read_thread, SIGWINCH);
+-	_nc_globals.read_thread = 0;
++	_nc_globals.read_thread = (pthread_t) 0;
+     }
+ # endif
+ }
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20241214+/package/debian-mingw/changelog	2024-12-14 11:34:56.000000000 +0000
++++ ncurses-6.5-20241221/package/debian-mingw/changelog	2024-12-21 10:55:02.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241214) unstable; urgency=low
++ncurses6td (6.5+20241221) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 14 Dec 2024 06:34:56 -0500
++ -- Thomas E. Dickey   Sat, 21 Dec 2024 05:50:45 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20241214+/package/debian-mingw64/changelog	2024-12-14 11:34:56.000000000 +0000
++++ ncurses-6.5-20241221/package/debian-mingw64/changelog	2024-12-21 10:55:02.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241214) unstable; urgency=low
++ncurses6td (6.5+20241221) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 14 Dec 2024 06:34:56 -0500
++ -- Thomas E. Dickey   Sat, 21 Dec 2024 05:50:45 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20241214+/package/debian/changelog	2024-12-14 11:34:56.000000000 +0000
++++ ncurses-6.5-20241221/package/debian/changelog	2024-12-21 10:55:02.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241214) unstable; urgency=low
++ncurses6td (6.5+20241221) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 14 Dec 2024 06:34:56 -0500
++ -- Thomas E. Dickey   Sat, 21 Dec 2024 05:50:45 -0500
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.680 
+--- ncurses-6.5-20241214+/package/mingw-ncurses.nsi	2024-12-14 11:34:56.000000000 +0000
++++ ncurses-6.5-20241221/package/mingw-ncurses.nsi	2024-12-21 10:55:02.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.680 2024/12/14 11:34:56 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.681 2024/12/21 10:55:02 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "1214"
++!define VERSION_MMDD  "1221"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20241214+/package/mingw-ncurses.spec	2024-12-14 11:34:56.000000000 +0000
++++ ncurses-6.5-20241221/package/mingw-ncurses.spec	2024-12-21 10:55:02.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20241214
++Release: 20241221
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20241214+/package/ncurses.spec	2024-12-14 11:34:56.000000000 +0000
++++ ncurses-6.5-20241221/package/ncurses.spec	2024-12-21 10:55:02.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20241214
++Release: 20241221
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20241214+/package/ncursest.spec	2024-12-14 11:34:56.000000000 +0000
++++ ncurses-6.5-20241221/package/ncursest.spec	2024-12-21 10:55:02.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20241214
++Release: 20241221
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/infocmp.c
+Prereq:  1.170 
+--- ncurses-6.5-20241214+/progs/infocmp.c	2024-12-07 22:10:45.000000000 +0000
++++ ncurses-6.5-20241221/progs/infocmp.c	2024-12-21 17:02:07.000000000 +0000
+@@ -43,7 +43,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: infocmp.c,v 1.170 2024/12/07 22:10:45 tom Exp $")
++MODULE_ID("$Id: infocmp.c,v 1.171 2024/12/21 17:02:07 tom Exp $")
+ 
+ #ifndef ACTUAL_TIC
+ #define ACTUAL_TIC "tic"
+@@ -1347,7 +1347,7 @@
+ #define TP_LIMIT	((MAX_STRING - 6) - (size_t)(tp - buf))
+ 	    *tp++ = '"';
+ 	    for (sp = term->Strings[n];
+-		 *sp != 0 && TP_LIMIT > 2;
++		 *sp != 0 && TP_LIMIT > 5;
+ 		 sp++) {
+ 		if (isascii(UChar(*sp))
+ 		    && isprint(UChar(*sp))
+Index: test/aclocal.m4
+Prereq:  1.230 
+--- ncurses-6.5-20241214+/test/aclocal.m4	2024-11-30 19:43:11.000000000 +0000
++++ ncurses-6.5-20241221/test/aclocal.m4	2024-12-21 15:24:55.000000000 +0000
+@@ -27,7 +27,7 @@
+ dnl authorization.                                                           *
+ dnl***************************************************************************
+ dnl
+-dnl $Id: aclocal.m4,v 1.230 2024/11/30 19:43:11 tom Exp $
++dnl $Id: aclocal.m4,v 1.231 2024/12/21 15:24:55 tom Exp $
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+@@ -697,7 +697,7 @@
+ fi
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CONST_X_STRING version: 8 updated: 2023/12/01 17:22:50
++dnl CF_CONST_X_STRING version: 9 updated: 2024/12/04 03:49:57
+ dnl -----------------
+ dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
+ dnl character-strings.
+@@ -724,7 +724,7 @@
+ 
+ AC_TRY_COMPILE(
+ [
+-#include 
++$ac_includes_default
+ #include 
+ ],
+ [String foo = malloc(1); free((void*)foo)],[
+@@ -735,7 +735,7 @@
+ #undef  _CONST_X_STRING
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+ #undef  XTSTRINGDEFINES	/* X11R5 and later */
+-#include 
++$ac_includes_default
+ #include 
+ 		],[String foo = malloc(1); *foo = 0],[
+ 			cf_cv_const_x_string=no
+@@ -1895,7 +1895,7 @@
+ CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_GCC_WARNINGS version: 41 updated: 2021/01/01 16:53:59
++dnl CF_GCC_WARNINGS version: 43 updated: 2024/12/21 08:44:12
+ dnl ---------------
+ dnl Check if the compiler supports useful warning options.  There's a few that
+ dnl we don't use, simply because they're too noisy:
+Index: test/configure
+--- ncurses-6.5-20241214+/test/configure	2024-11-30 19:43:38.000000000 +0000
++++ ncurses-6.5-20241221/test/configure	2024-12-21 15:25:20.000000000 +0000
+@@ -22909,7 +22909,7 @@
+ #line 22909 "configure"
+ #include "confdefs.h"
+ 
+-#include 
++$ac_includes_default
+ #include 
+ 
+ int
+@@ -22946,7 +22946,7 @@
+ #undef  _CONST_X_STRING
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+ #undef  XTSTRINGDEFINES	/* X11R5 and later */
+-#include 
++$ac_includes_default
+ #include 
+ 
+ int
+Index: test/foldkeys.c
+Prereq:  1.13 
+--- ncurses-6.5-20241214+/test/foldkeys.c	2024-12-07 23:03:07.000000000 +0000
++++ ncurses-6.5-20241221/test/foldkeys.c	2024-12-21 17:25:16.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey, 2006
+  *
+- * $Id: foldkeys.c,v 1.13 2024/12/07 23:03:07 tom Exp $
++ * $Id: foldkeys.c,v 1.14 2024/12/21 17:25:16 tom Exp $
+  *
+  * Demonstrate a method for altering key definitions at runtime.
+  *
+@@ -156,7 +156,7 @@
+ 		      final) == 3
+ 	    && *final != ';'
+ 	    && (need = strlen(info[j].value)) != 0
+-	    && (value = strdup(info[j].value)) != NULL) {
++	    && (value = malloc(need + 8)) != NULL) {
+ 	    (void) need;	/* _nc_SLIMIT is normally nothing  */
+ 	    _nc_SPRINTF(value, _nc_SLIMIT(need) "\033[%d%c", first, *final);
+ 	    for (k = 0; k < info_len; ++k) {
+Index: test/padview.c
+Prereq:  1.27 
+--- ncurses-6.5-20241214+/test/padview.c	2024-12-07 22:40:19.000000000 +0000
++++ ncurses-6.5-20241221/test/padview.c	2024-12-21 17:34:13.000000000 +0000
+@@ -29,7 +29,7 @@
+ /*
+  * clone of view.c, using pads
+  *
+- * $Id: padview.c,v 1.27 2024/12/07 22:40:19 tom Exp $
++ * $Id: padview.c,v 1.28 2024/12/21 17:34:13 tom Exp $
+  */
+ 
+ #include 
+@@ -88,8 +88,9 @@
+     wattrset(stdscr, COLOR_PAIR(my_pair));
+     clear();
+ 
++    i = (int) (sizeof(temp) - strlen(tag) - 8);
+     _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
+-		"view %.*s", (int) strlen(tag), tag);
++		"view %.*s", i, tag);
+     i = (int) strlen(temp);
+     _nc_SPRINTF(temp + i, _nc_SLIMIT(sizeof(temp) - (size_t) i)
+ 		" %.*s", (int) sizeof(temp) - i - 2, fname);
diff --git a/packages/ncurses/6.5/ncurses-6.5-20241228.patch b/packages/ncurses/6.5/ncurses-6.5-20241228.patch
new file mode 100644
index 0000000000..1d03cbb216
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20241228.patch
@@ -0,0 +1,19459 @@
+# ncurses 6.5 - patch 20241228 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20241228.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Dec 29 01:42:13 UTC 2024
+# ------------------------------------------------------------------------------
+# INSTALL                                    |   41 
+# NEWS                                       |   11 
+# VERSION                                    |    2 
+# aclocal.m4                                 |   11 
+# configure                                  | 2526 +++++++++++++--------------
+# configure.in                               |    5 
+# dist.mk                                    |    4 
+# doc/html/man/curs_add_wch.3x.html          |   22 
+# doc/html/man/curs_add_wchstr.3x.html       |   12 
+# doc/html/man/curs_addch.3x.html            |  143 -
+# doc/html/man/curs_addchstr.3x.html         |   12 
+# doc/html/man/curs_addstr.3x.html           |   12 
+# doc/html/man/curs_addwstr.3x.html          |   12 
+# doc/html/man/curs_attr.3x.html             |   16 
+# doc/html/man/curs_bkgd.3x.html             |   83 
+# doc/html/man/curs_bkgrnd.3x.html           |   56 
+# doc/html/man/curs_color.3x.html            |   14 
+# doc/html/man/curs_delch.3x.html            |   10 
+# doc/html/man/curs_deleteln.3x.html         |   10 
+# doc/html/man/curs_get_wch.3x.html          |   14 
+# doc/html/man/curs_get_wstr.3x.html         |   12 
+# doc/html/man/curs_getch.3x.html            |   14 
+# doc/html/man/curs_getstr.3x.html           |   12 
+# doc/html/man/curs_in_wch.3x.html           |   10 
+# doc/html/man/curs_inch.3x.html             |   10 
+# doc/html/man/curs_inchstr.3x.html          |   10 
+# doc/html/man/curs_initscr.3x.html          |   10 
+# doc/html/man/curs_inopts.3x.html           |   24 
+# doc/html/man/curs_ins_wch.3x.html          |   10 
+# doc/html/man/curs_ins_wstr.3x.html         |   12 
+# doc/html/man/curs_insch.3x.html            |   10 
+# doc/html/man/curs_insstr.3x.html           |   12 
+# doc/html/man/curs_instr.3x.html            |   12 
+# doc/html/man/curs_inwstr.3x.html           |   12 
+# doc/html/man/curs_mouse.3x.html            |   24 
+# doc/html/man/curs_move.3x.html             |   10 
+# doc/html/man/curs_opaque.3x.html           |   10 
+# doc/html/man/curs_pad.3x.html              |   10 
+# doc/html/man/curs_scr_dump.3x.html         |   31 
+# doc/html/man/curs_slk.3x.html              |   12 
+# doc/html/man/curs_termattrs.3x.html        |   10 
+# doc/html/man/curs_termcap.3x.html          |   44 
+# doc/html/man/curs_terminfo.3x.html         |  384 ++--
+# doc/html/man/curs_touch.3x.html            |   10 
+# doc/html/man/curs_trace.3x.html            |   12 
+# doc/html/man/curs_util.3x.html             |   77 
+# doc/html/man/curs_window.3x.html           |   10 
+# doc/html/man/define_key.3x.html            |   12 
+# doc/html/man/form.3x.html                  |   12 
+# doc/html/man/form_field.3x.html            |   14 
+# doc/html/man/form_field_buffer.3x.html     |   10 
+# doc/html/man/form_field_new.3x.html        |   10 
+# doc/html/man/form_field_userptr.3x.html    |   10 
+# doc/html/man/form_field_validation.3x.html |   10 
+# doc/html/man/form_fieldtype.3x.html        |   10 
+# doc/html/man/form_hook.3x.html             |   18 
+# doc/html/man/form_new.3x.html              |   12 
+# doc/html/man/form_page.3x.html             |   10 
+# doc/html/man/form_requestname.3x.html      |   10 
+# doc/html/man/form_userptr.3x.html          |   10 
+# doc/html/man/form_win.3x.html              |   14 
+# doc/html/man/infocmp.1m.html               |  116 -
+# doc/html/man/keybound.3x.html              |   10 
+# doc/html/man/menu.3x.html                  |   12 
+# doc/html/man/menu_hook.3x.html             |   18 
+# doc/html/man/menu_items.3x.html            |   14 
+# doc/html/man/menu_mark.3x.html             |   16 
+# doc/html/man/menu_new.3x.html              |   12 
+# doc/html/man/menu_pattern.3x.html          |   12 
+# doc/html/man/menu_requestname.3x.html      |   10 
+# doc/html/man/menu_spacing.3x.html          |   10 
+# doc/html/man/menu_userptr.3x.html          |   10 
+# doc/html/man/menu_win.3x.html              |   14 
+# doc/html/man/mitem_current.3x.html         |   12 
+# doc/html/man/mitem_name.3x.html            |   10 
+# doc/html/man/mitem_new.3x.html             |   10 
+# doc/html/man/mitem_userptr.3x.html         |   10 
+# doc/html/man/ncurses.3x.html               |   16 
+# doc/html/man/panel.3x.html                 |   12 
+# doc/html/man/resizeterm.3x.html            |   12 
+# doc/html/man/term_variables.3x.html        |  121 -
+# doc/html/man/terminfo.5.html               |    6 
+# doc/html/man/tput.1.html                   |   10 
+# doc/html/man/tset.1.html                   |   10 
+# doc/html/man/wresize.3x.html               |   33 
+# include/MKterm.h.awk.in                    |   14 
+# include/curses.h.in                        |    4 
+# man/curs_add_wch.3x                        |   19 
+# man/curs_add_wchstr.3x                     |    8 
+# man/curs_addch.3x                          |   16 
+# man/curs_addchstr.3x                       |    8 
+# man/curs_addstr.3x                         |    8 
+# man/curs_addwstr.3x                        |    8 
+# man/curs_attr.3x                           |   14 
+# man/curs_bkgd.3x                           |  165 +
+# man/curs_bkgrnd.3x                         |  103 -
+# man/curs_color.3x                          |   11 
+# man/curs_delch.3x                          |    6 
+# man/curs_deleteln.3x                       |    6 
+# man/curs_get_wch.3x                        |    8 
+# man/curs_get_wstr.3x                       |   12 
+# man/curs_getch.3x                          |   10 
+# man/curs_getstr.3x                         |   10 
+# man/curs_in_wch.3x                         |    6 
+# man/curs_inch.3x                           |    6 
+# man/curs_inchstr.3x                        |    8 
+# man/curs_initscr.3x                        |    7 
+# man/curs_inopts.3x                         |   18 
+# man/curs_ins_wch.3x                        |    6 
+# man/curs_ins_wstr.3x                       |    8 
+# man/curs_insch.3x                          |    6 
+# man/curs_insstr.3x                         |    8 
+# man/curs_instr.3x                          |    8 
+# man/curs_inwstr.3x                         |    8 
+# man/curs_mouse.3x                          |   26 
+# man/curs_move.3x                           |    6 
+# man/curs_opaque.3x                         |    8 
+# man/curs_pad.3x                            |    6 
+# man/curs_scr_dump.3x                       |   53 
+# man/curs_slk.3x                            |   11 
+# man/curs_termattrs.3x                      |    8 
+# man/curs_termcap.3x                        |   72 
+# man/curs_terminfo.3x                       |  446 ++--
+# man/curs_touch.3x                          |    7 
+# man/curs_trace.3x                          |   10 
+# man/curs_util.3x                           |   16 
+# man/curs_window.3x                         |    8 
+# man/define_key.3x                          |    8 
+# man/form.3x                                |   12 
+# man/form_field.3x                          |   15 
+# man/form_field_buffer.3x                   |    8 
+# man/form_field_new.3x                      |    7 
+# man/form_field_userptr.3x                  |    7 
+# man/form_field_validation.3x               |    8 
+# man/form_fieldtype.3x                      |    8 
+# man/form_hook.3x                           |   27 
+# man/form_new.3x                            |   11 
+# man/form_page.3x                           |    8 
+# man/form_requestname.3x                    |    8 
+# man/form_userptr.3x                        |    7 
+# man/form_win.3x                            |   16 
+# man/infocmp.1m                             |  180 +
+# man/keybound.3x                            |    6 
+# man/man_db.renames.in                      |    3 
+# man/manhtml.aliases                        |    3 
+# man/manlinks.sed                           |   43 
+# man/menu.3x                                |   12 
+# man/menu_hook.3x                           |   28 
+# man/menu_items.3x                          |   13 
+# man/menu_mark.3x                           |   17 
+# man/menu_new.3x                            |   11 
+# man/menu_pattern.3x                        |    9 
+# man/menu_requestname.3x                    |    8 
+# man/menu_spacing.3x                        |    8 
+# man/menu_userptr.3x                        |    7 
+# man/menu_win.3x                            |   16 
+# man/mitem_current.3x                       |   10 
+# man/mitem_name.3x                          |    7 
+# man/mitem_new.3x                           |    8 
+# man/mitem_userptr.3x                       |    7 
+# man/ncurses.3x                             |    8 
+# man/panel.3x                               |   20 
+# man/resizeterm.3x                          |   13 
+# man/term_variables.3x                      |  228 +-
+# man/terminfo.tail                          |    9 
+# man/tput.1                                 |    6 
+# man/tset.1                                 |    6 
+# man/wresize.3x                             |   12 
+# misc/terminfo.src                          |  288 ++-
+# 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 
+# 176 files changed, 3730 insertions(+), 3132 deletions(-)
+# ------------------------------------------------------------------------------
+Index: INSTALL
+Prereq:  1.257 
+--- ncurses-6.5-20241221+/INSTALL	2024-08-10 17:43:39.000000000 +0000
++++ ncurses-6.5-20241228/INSTALL	2024-12-28 21:37:40.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: INSTALL,v 1.257 2024/08/10 17:43:39 tom Exp $
++-- $Id: INSTALL,v 1.258 2024/12/28 21:37:40 Branden.Robinson Exp $
+ ---------------------------------------------------------------------
+              How to install Ncurses/Terminfo on your system
+ ---------------------------------------------------------------------
+@@ -709,7 +709,7 @@
+ 	Use rpath option when generating shared libraries, and (with some
+ 	restrictions) when linking the corresponding programs.  This originally
+ 	(in 1997) applied mainly to systems using the GNU linker (read the
+-	manpage).
++	man page).
+ 
+ 	More recently it is useful for systems that require special treatment
+ 	shared libraries in "unusual" locations.  The "system" libraries reside
+@@ -1103,34 +1103,35 @@
+ 		./configure --enable-static
+ 
+     --with-manpage-aliases
+-	Tell the configure script you wish to create entries in the
+-	man-directory for aliases to manpages which list them, e.g., the
+-	functions in the panel manpage.  This is the default.  You can disable
+-	it if your man program does this.  You can also disable
+-	--with-manpage-symlinks to install files containing a ".so" command
+-	rather than symbolic links.
++	Create files in subdirectories of the installation "man" directory that
++	alias the man pages documenting them.  For example, the "beep" man page
++	also documents the function "flash".  This is the default.  You can
++	disable this procedure if your system's makewhatis(8) or mandb(8)
++	program indexes the directory to which the pages are installed.  If you
++	disable man page symlinks by specifying "--without-manpage-symlinks",
++	the alias pages are created as stubs containing ".so" *roff requests.
+ 
+     --with-manpage-format=XXX
+ 	Tell the configure script how you would like to install man-pages.  The
+-	option value must be one of these:  gzip, compress, BSDI, normal,
+-	formatted.  If you do not give this option, the configure script
++	option value must be one of these: "gzip", "compress", "BSDI", "normal",
++	"formatted".  If you do not specify this option, the configure script
+ 	attempts to determine which is the case.
+ 
+     --with-manpage-renames=XXX
+-	Tell the configure script that you wish to rename the manpages while
+-	installing.  Currently the only distribution which does this is Debian.
++	Tell the configure script that you wish to rename the man pages when
++	installing them.  Debian and distributions descended from it do this.
+ 	The option value specifies the name of a file that lists the renamed
+-	files, e.g., $srcdir/man/man_db.renames
++	files, e.g., "$srcdir/man/man_db.renames".
+ 
+     --with-manpage-symlinks
+ 	Tell the configure script that you wish to make symbolic links in the
+ 	man-directory for aliases to the man-pages.  This is the default, but
+-	can be disabled for systems that provide this automatically.  Doing
+-	this on systems that do not support symbolic links will result in
+-	copying the man-page for each alias.
++	can be disabled for systems that provide this service automatically.
++	Doing this on systems that do not support symbolic links creates a copy
++	of the target man page for each alias.
+ 
+     --with-manpage-tbl
+-	Tell the configure script that you wish to preprocess the manpages
++	Tell the configure script that you wish to preprocess the man pages
+ 	by running them through tbl to generate tables understandable by
+ 	nroff.
+ 
+@@ -1397,10 +1398,10 @@
+ 
+     --without-curses-h
+ 	Don't install the ncurses header with the name "curses.h".  Rather,
+-	install as "ncurses.h" and modify the installed headers and manpages
++	install as "ncurses.h" and modify the installed headers and man pages
+ 	accordingly.
+ 
+-	Likewise, do not install an alias "curses" for the ncurses manpage.
++	Likewise, do not install an alias "curses" for the ncurses man page.
+ 
+     --without-cxx
+ 	XSI curses declares "bool" as part of the interface.  C++ also declares
+@@ -1423,7 +1424,7 @@
+ 	Do not use dlsym() to load GPM dynamically.
+ 
+     --without-manpages
+-	Tell the configure script to suppress the install of ncurses' manpages.
++	Tell the configure script to suppress the install of ncurses' man pages.
+ 
+     --without-progs
+ 	Tell the configure script to suppress the build of ncurses' application
+Index: NEWS
+Prereq:  1.4216 
+--- ncurses-6.5-20241221+/NEWS	2024-12-21 20:43:26.000000000 +0000
++++ ncurses-6.5-20241228/NEWS	2024-12-29 00:59:43.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4216 2024/12/21 20:43:26 tom Exp $
++-- $Id: NEWS,v 1.4220 2024/12/29 00:59:43 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.
+ 
++20241228
++	+ correct conditional-compile for a case when the C compiler does not
++	  have a bool type.
++	+ add ghostty -TD
++	> patches by Branden Robinson:
++	+ add comments to generated term.h to hint the configure options used
++	+ use same subdir-convention for term.h, in configure script
++	+ improve formatting/style of manpages
++
+ 20241221
+ 	+ modify ncurses/tinfo/MKfallback.sh to work with MacOS sed, which
+ 	  lacks BSD-style \< and \>
+Index: VERSION
+--- ncurses-6.5-20241221+/VERSION	2024-12-21 10:55:02.000000000 +0000
++++ ncurses-6.5-20241228/VERSION	2024-12-28 11:24:50.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20241221
++5:0:10	6.5	20241228
+Index: aclocal.m4
+Prereq:  1.1097 
+--- ncurses-6.5-20241221+/aclocal.m4	2024-12-21 13:44:45.000000000 +0000
++++ ncurses-6.5-20241228/aclocal.m4	2024-12-28 21:40:09.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1097 2024/12/21 13:44:45 tom Exp $
++dnl $Id: aclocal.m4,v 1.1099 2024/12/28 21:40:09 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -6036,7 +6036,7 @@
+ AC_MSG_RESULT($MANPAGE_TBL)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_MAN_PAGES version: 59 updated: 2024/03/30 08:27:40
++dnl CF_MAN_PAGES version: 60 updated: 2024/12/28 16:38:35
+ 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
+@@ -6213,14 +6213,17 @@
+ 
+ if test "$with_overwrite" != yes ; then
+ cat >>$cf_edit_man <\$TMP.out
++	sed -e "/\\#[    ]*include/s,\$TMP.out
+ 	mv \$TMP.out \$TMP
+ CF_EOF
+ fi
+ 
+ if test "$with_curses_h" != yes ; then
+ cat >>$cf_edit_man <\$TMP.out
++	sed -e "/\\#[    ]*include/s,curses.h,ncurses.h," \
++	  < \$TMP >\$TMP.out
+ 	mv \$TMP.out \$TMP
+ CF_EOF
+ fi
+Index: configure
+--- ncurses-6.5-20241221+/configure	2024-12-21 15:24:20.000000000 +0000
++++ ncurses-6.5-20241228/configure	2024-12-29 01:01:41.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.788 .
++# From configure.in Revision: 1.789 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20240618.
+ #
+@@ -15662,14 +15662,17 @@
+ 
+ if test "$with_overwrite" != yes ; then
+ cat >>$cf_edit_man <\$TMP.out
++	sed -e "/\\#[    ]*include/s,\$TMP.out
+ 	mv \$TMP.out \$TMP
+ CF_EOF
+ fi
+ 
+ if test "$with_curses_h" != yes ; then
+ cat >>$cf_edit_man <\$TMP.out
++	sed -e "/\\#[    ]*include/s,curses.h,ncurses.h," \
++	  < \$TMP >\$TMP.out
+ 	mv \$TMP.out \$TMP
+ CF_EOF
+ fi
+@@ -15813,7 +15816,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15816: checking if you want to build with function extensions" >&5
++echo "$as_me:15819: 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.
+@@ -15823,7 +15826,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:15826: result: $with_ext_funcs" >&5
++echo "$as_me:15829: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -15880,7 +15883,7 @@
+ 	GENERATED_EXT_FUNCS=
+ fi
+ 
+-echo "$as_me:15883: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:15886: 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.
+@@ -15890,7 +15893,7 @@
+ else
+   with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:15893: result: $with_sp_funcs" >&5
++echo "$as_me:15896: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ 	NCURSES_SP_FUNCS=1
+@@ -15909,7 +15912,7 @@
+ 	GENERATED_SP_FUNCS=
+ fi
+ 
+-echo "$as_me:15912: checking if you want to build with terminal-driver" >&5
++echo "$as_me:15915: 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.
+@@ -15919,7 +15922,7 @@
+ else
+   with_term_driver=no
+ fi;
+-echo "$as_me:15922: result: $with_term_driver" >&5
++echo "$as_me:15925: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+ 
+@@ -15928,19 +15931,19 @@
+ EOF
+ 
+ 	if test "x$with_termlib" != xno ; then
+-		{ { echo "$as_me:15931: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:15934: 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:15936: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:15939: 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:15943: checking for extended use of const keyword" >&5
++echo "$as_me:15946: 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.
+@@ -15950,7 +15953,7 @@
+ else
+   with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:15953: result: $with_ext_const" >&5
++echo "$as_me:15956: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -15958,7 +15961,7 @@
+ fi
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:15961: checking if you want to use extended colors" >&5
++echo "$as_me:15964: 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.
+@@ -15968,12 +15971,12 @@
+ else
+   with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:15971: result: $with_ext_colors" >&5
++echo "$as_me:15974: 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:15976: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:15979: 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)
+@@ -15984,7 +15987,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:15987: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:15990: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16012,7 +16015,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:16015: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:16018: 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.
+@@ -16022,7 +16025,7 @@
+ else
+   with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:16025: result: $with_ext_mouse" >&5
++echo "$as_me:16028: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ if test "x$with_ext_mouse" = xyes ; then
+ 
+@@ -16032,7 +16035,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16035: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16038: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16049,7 +16052,7 @@
+ fi
+ 
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:16052: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:16055: 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.
+@@ -16059,7 +16062,7 @@
+ else
+   with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:16062: result: $with_ext_putwin" >&5
++echo "$as_me:16065: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+ 
+@@ -16069,7 +16072,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16072: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:16075: 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.
+@@ -16079,7 +16082,7 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:16082: result: $with_no_padding" >&5
++echo "$as_me:16085: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16087,7 +16090,7 @@
+ EOF
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:16090: checking if you want SIGWINCH handler" >&5
++echo "$as_me:16093: 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.
+@@ -16097,7 +16100,7 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:16100: result: $with_sigwinch" >&5
++echo "$as_me:16103: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ if test "x$with_sigwinch" = xyes
+ then
+@@ -16112,7 +16115,7 @@
+ fi
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:16115: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:16118: 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.
+@@ -16122,7 +16125,7 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:16125: result: $with_tcap_names" >&5
++echo "$as_me:16128: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ if test "x$with_tcap_names" = xyes; then
+@@ -16136,7 +16139,7 @@
+ 
+ ##############################################################################
+ 
+-echo "$as_me:16139: checking if you want to link with the pthread library" >&5
++echo "$as_me:16142: 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.
+@@ -16146,27 +16149,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:16149: result: $with_pthread" >&5
++echo "$as_me:16152: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:16153: checking for pthread.h" >&5
++	echo "$as_me:16156: 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 16159 "configure"
++#line 16162 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16163: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16166: \"$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:16169: \$? = $ac_status" >&5
++  echo "$as_me:16172: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16185,7 +16188,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16188: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:16191: 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
+ 
+@@ -16195,7 +16198,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:16198: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:16201: 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"
+ 
+@@ -16216,7 +16219,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16219 "configure"
++#line 16222 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16233,16 +16236,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16236: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16239: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16239: \$? = $ac_status" >&5
++  echo "$as_me:16242: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16242: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16245: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16245: \$? = $ac_status" >&5
++  echo "$as_me:16248: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -16252,7 +16255,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:16255: result: $with_pthread" >&5
++	    echo "$as_me:16258: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -16280,7 +16283,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:16283: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:16286: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -16290,13 +16293,13 @@
+ fi
+ 
+ if test "x$with_pthread" != xno; then
+-	echo "$as_me:16293: checking for pthread_kill" >&5
++	echo "$as_me:16296: 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 16299 "configure"
++#line 16302 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16327,16 +16330,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16330: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16333: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16333: \$? = $ac_status" >&5
++  echo "$as_me:16336: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16336: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16339: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16339: \$? = $ac_status" >&5
++  echo "$as_me:16342: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_pthread_kill=yes
+ else
+@@ -16346,11 +16349,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16349: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:16352: 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:16353: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:16356: 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.
+@@ -16360,7 +16363,7 @@
+ else
+   use_pthreads_eintr=no
+ fi;
+-		echo "$as_me:16363: result: $use_pthreads_eintr" >&5
++		echo "$as_me:16366: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ 		if test "x$use_pthreads_eintr" = xyes ; then
+ 
+@@ -16371,7 +16374,7 @@
+ 		fi
+ fi
+ 
+-	echo "$as_me:16374: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:16377: 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.
+@@ -16381,18 +16384,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-	echo "$as_me:16384: result: $use_weak_symbols" >&5
++	echo "$as_me:16387: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ 	if test "x$use_weak_symbols" = xyes ; then
+ 
+-echo "$as_me:16388: checking if $CC supports weak symbols" >&5
++echo "$as_me:16391: 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 16395 "configure"
++#line 16398 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16418,16 +16421,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16421: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16424: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16424: \$? = $ac_status" >&5
++  echo "$as_me:16427: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16427: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16430: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16430: \$? = $ac_status" >&5
++  echo "$as_me:16433: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -16438,7 +16441,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16441: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:16444: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ 	else
+@@ -16488,7 +16491,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:16491: checking if you want reentrant code" >&5
++echo "$as_me:16494: 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.
+@@ -16498,7 +16501,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:16501: result: $with_reentrant" >&5
++echo "$as_me:16504: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -16587,7 +16590,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16590: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16593: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16599,7 +16602,7 @@
+ 	NCURSES_SIZE_T=$cf_dft_ordinate_type
+ fi
+ 
+-echo "$as_me:16602: checking whether curses library structures should be opaque" >&5
++echo "$as_me:16605: checking whether curses library structures should be opaque" >&5
+ echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
+@@ -16621,16 +16624,16 @@
+ 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16624: result: $enable_opaque_curses" >&5
++echo "$as_me:16627: 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:16629: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:16632: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:16633: checking whether form library structures should be opaque" >&5
++echo "$as_me:16636: checking whether form library structures should be opaque" >&5
+ echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-form or --disable-opaque-form was given.
+@@ -16647,10 +16650,10 @@
+ 	enable_opaque_form=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16650: result: $enable_opaque_form" >&5
++echo "$as_me:16653: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+ 
+-echo "$as_me:16653: checking whether menu library structures should be opaque" >&5
++echo "$as_me:16656: checking whether menu library structures should be opaque" >&5
+ echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
+@@ -16667,10 +16670,10 @@
+ 	enable_opaque_menu=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16670: result: $enable_opaque_menu" >&5
++echo "$as_me:16673: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+ 
+-echo "$as_me:16673: checking whether panel library structures should be opaque" >&5
++echo "$as_me:16676: checking whether panel library structures should be opaque" >&5
+ echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
+@@ -16687,7 +16690,7 @@
+ 	enable_opaque_panel=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16690: result: $enable_opaque_panel" >&5
++echo "$as_me:16693: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+ 
+ NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -16697,7 +16700,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:16700: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:16703: 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.
+@@ -16707,7 +16710,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:16710: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:16713: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -16720,7 +16723,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:16723: checking if you want all development code" >&5
++echo "$as_me:16726: 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.
+@@ -16730,11 +16733,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:16733: result: $with_develop" >&5
++echo "$as_me:16736: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###   use option --enable-check-size to detect screensize with CPR
+-echo "$as_me:16737: checking if you want to check screensize of serial terminals" >&5
++echo "$as_me:16740: checking if you want to check screensize of serial terminals" >&5
+ echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
+ 
+ # Check whether --enable-check-size or --disable-check-size was given.
+@@ -16744,7 +16747,7 @@
+ else
+   enable_check_size=$with_develop
+ fi;
+-echo "$as_me:16747: result: $enable_check_size" >&5
++echo "$as_me:16750: result: $enable_check_size" >&5
+ echo "${ECHO_T}$enable_check_size" >&6
+ test "x$enable_check_size" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16752,7 +16755,7 @@
+ EOF
+ 
+ ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
+-echo "$as_me:16755: checking if you want hard-tabs code" >&5
++echo "$as_me:16758: 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.
+@@ -16762,7 +16765,7 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:16765: result: $enable_hard_tabs" >&5
++echo "$as_me:16768: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16770,7 +16773,7 @@
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:16773: checking if you want limited support for xmc" >&5
++echo "$as_me:16776: 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.
+@@ -16780,7 +16783,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:16783: result: $enable_xmc_glitch" >&5
++echo "$as_me:16786: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16790,7 +16793,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:16793: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:16796: 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.
+@@ -16800,7 +16803,7 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:16803: result: $with_assumed_color" >&5
++echo "$as_me:16806: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16808,7 +16811,7 @@
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:16811: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:16814: 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.
+@@ -16818,7 +16821,7 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:16821: result: $with_hashmap" >&5
++echo "$as_me:16824: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16826,7 +16829,7 @@
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:16829: checking if you want colorfgbg code" >&5
++echo "$as_me:16832: 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.
+@@ -16836,7 +16839,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:16839: result: $with_colorfgbg" >&5
++echo "$as_me:16842: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16844,7 +16847,7 @@
+ EOF
+ 
+ ###   use option --enable-fvisibility to turn on use of gcc-specific feature
+-echo "$as_me:16847: checking if you want to use gcc -fvisibility option" >&5
++echo "$as_me:16850: 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.
+@@ -16854,14 +16857,14 @@
+ else
+   cf_with_fvisibility=no
+ fi;
+-echo "$as_me:16857: result: $cf_with_fvisibility" >&5
++echo "$as_me:16860: 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:16864: checking if $CC -fvisibility=hidden option works" >&5
++echo "$as_me:16867: 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
+@@ -16870,7 +16873,7 @@
+     cf_save_cflags="$CFLAGS"
+     CFLAGS="$CFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16873 "configure"
++#line 16876 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16886,16 +16889,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16889: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16892: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16892: \$? = $ac_status" >&5
++  echo "$as_me:16895: \$? = $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:16898: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16898: \$? = $ac_status" >&5
++  echo "$as_me:16901: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden=yes
+ else
+@@ -16907,7 +16910,7 @@
+     CFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16910: result: $cf_cv_fvisibility_hidden" >&5
++echo "$as_me:16913: result: $cf_cv_fvisibility_hidden" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
+ 
+ 	if test "x$cf_cv_fvisibility_hidden" = xyes
+@@ -17022,7 +17025,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:17025: checking if $CXX -fvisibility=hidden option works" >&5
++echo "$as_me:17028: 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
+@@ -17031,7 +17034,7 @@
+     cf_save_cflags="$CXXFLAGS"
+     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17034 "configure"
++#line 17037 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -17047,16 +17050,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17050: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17053: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17053: \$? = $ac_status" >&5
++  echo "$as_me:17056: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17056: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17059: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17059: \$? = $ac_status" >&5
++  echo "$as_me:17062: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden2=yes
+ else
+@@ -17068,7 +17071,7 @@
+     CXXFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:17071: result: $cf_cv_fvisibility_hidden2" >&5
++echo "$as_me:17074: result: $cf_cv_fvisibility_hidden2" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
+ 
+ 		if test "x$cf_cv_fvisibility_hidden2" = xyes
+@@ -17191,7 +17194,7 @@
+ fi
+ 
+ ###   use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:17194: checking if you want interop bindings" >&5
++echo "$as_me:17197: 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.
+@@ -17201,13 +17204,13 @@
+ else
+   with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:17204: result: $with_exp_interop" >&5
++echo "$as_me:17207: 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:17210: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:17213: 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.
+@@ -17217,13 +17220,13 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:17220: result: $with_safe_sprintf" >&5
++echo "$as_me:17223: 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:17226: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:17229: 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.
+@@ -17233,7 +17236,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:17236: result: $with_scroll_hints" >&5
++echo "$as_me:17239: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -17242,7 +17245,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17245: checking if you want wgetch-events code" >&5
++echo "$as_me:17248: 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.
+@@ -17252,7 +17255,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:17255: result: $with_wgetch_events" >&5
++echo "$as_me:17258: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ if test "x$with_wgetch_events" = xyes ; then
+ 
+@@ -17267,7 +17270,7 @@
+ 
+ case "$cf_cv_system_name" in
+ (*mingw32*|*mingw64*|*-msvc*)
+-	echo "$as_me:17270: checking if you want experimental-Windows driver" >&5
++	echo "$as_me:17273: 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.
+@@ -17277,7 +17280,7 @@
+ else
+   with_exp_win32=no
+ fi;
+-	echo "$as_me:17280: result: $with_exp_win32" >&5
++	echo "$as_me:17283: result: $with_exp_win32" >&5
+ echo "${ECHO_T}$with_exp_win32" >&6
+ 	if test "x$with_exp_win32" = xyes
+ 	then
+@@ -17303,7 +17306,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:17306: checking if you want to see long compiling messages" >&5
++echo "$as_me:17309: 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.
+@@ -17337,7 +17340,7 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:17340: result: $enableval" >&5
++echo "$as_me:17343: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ if test "x$enable_echo" = xyes; then
+@@ -17350,7 +17353,7 @@
+ 
+ # --disable-stripping is used for debugging
+ 
+-echo "$as_me:17353: checking if you want to install stripped executables" >&5
++echo "$as_me:17356: 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.
+@@ -17367,7 +17370,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:17370: result: $enable_stripping" >&5
++echo "$as_me:17373: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -17378,7 +17381,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:17381: checking if install accepts -p option" >&5
++echo "$as_me:17384: 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
+@@ -17409,10 +17412,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:17412: result: $cf_cv_install_p" >&5
++echo "$as_me:17415: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:17415: checking if install needs to be told about ownership" >&5
++echo "$as_me:17418: 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)
+@@ -17423,7 +17426,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17426: result: $with_install_o" >&5
++echo "$as_me:17429: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -17434,7 +17437,7 @@
+ 
+ if test -n "$INSTALL_OPT_S"
+ then
+-	echo "$as_me:17437: checking if you want to specify strip-program" >&5
++	echo "$as_me:17440: checking if you want to specify strip-program" >&5
+ echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
+ 
+ # Check whether --with-strip-program or --without-strip-program was given.
+@@ -17444,11 +17447,11 @@
+ else
+   with_strip_program=no
+ fi;
+-	echo "$as_me:17447: result: $with_strip_program" >&5
++	echo "$as_me:17450: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ 	if test "$with_strip_program" != no
+ 	then
+-		echo "$as_me:17451: checking if strip-program is supported with this installer" >&5
++		echo "$as_me:17454: checking if strip-program is supported with this installer" >&5
+ echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
+ 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
+ 		check_install_strip=no
+@@ -17469,11 +17472,11 @@
+ 				done
+ 			fi
+ 		fi
+-		echo "$as_me:17472: result: $check_install_strip" >&5
++		echo "$as_me:17475: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ 		case "$check_install_strip" in
+ 		(no)
+-			{ echo "$as_me:17476: WARNING: $cf_install_program does not support strip program option" >&5
++			{ echo "$as_me:17479: WARNING: $cf_install_program does not support strip program option" >&5
+ echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
+ 			with_strip_program=no
+ 			;;
+@@ -17488,7 +17491,7 @@
+ 			chmod +x "$INSTALL"
+ 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
+ 
+-echo "${as_me:-configure}:17491: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:17494: testing created $INSTALL ..." 1>&5
+ 
+ 			;;
+ 		(option)
+@@ -17514,7 +17517,7 @@
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+ 
+-echo "$as_me:17517: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:17520: 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.
+@@ -17531,17 +17534,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:17534: result: $enable_stdnoreturn" >&5
++echo "$as_me:17537: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:17538: checking for C11 _Noreturn feature" >&5
++echo "$as_me:17541: 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 17544 "configure"
++#line 17547 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17557,16 +17560,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17560: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17563: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17563: \$? = $ac_status" >&5
++  echo "$as_me:17566: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17566: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17569: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17569: \$? = $ac_status" >&5
++  echo "$as_me:17572: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -17577,7 +17580,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17580: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:17583: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -17633,16 +17636,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17636: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17639: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17641: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17644: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17645: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17648: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17681,16 +17684,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17684: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17687: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17689: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17692: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17693: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17696: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17729,23 +17732,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17732: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17735: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17737: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17740: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17741: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17744: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:17748: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:17751: 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.
+@@ -17762,7 +17765,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:17765: result: $enable_warnings" >&5
++echo "$as_me:17768: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -17786,7 +17789,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17789 "configure"
++#line 17792 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17801,26 +17804,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17804: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17807: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17807: \$? = $ac_status" >&5
++  echo "$as_me:17810: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17810: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17813: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17813: \$? = $ac_status" >&5
++  echo "$as_me:17816: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:17816: checking for X11/Xt const-feature" >&5
++echo "$as_me:17819: 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 17823 "configure"
++#line 17826 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -17838,16 +17841,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17841: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17844: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17844: \$? = $ac_status" >&5
++  echo "$as_me:17847: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17847: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17850: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17850: \$? = $ac_status" >&5
++  echo "$as_me:17853: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -17862,7 +17865,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17865: result: $cf_cv_const_x_string" >&5
++echo "$as_me:17868: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -17891,7 +17894,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:17913: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -17923,12 +17926,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17926: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17929: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17929: \$? = $ac_status" >&5
++  echo "$as_me:17932: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17931: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17934: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -17936,7 +17939,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:17939: checking for $CC warning options..." >&5
++	{ echo "$as_me:17942: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -17959,12 +17962,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:17962: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17965: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17965: \$? = $ac_status" >&5
++  echo "$as_me:17968: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17967: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17970: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -17972,7 +17975,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17975: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17978: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17982,7 +17985,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17985: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17988: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -18015,10 +18018,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:18018: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:18021: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -18068,12 +18071,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:18071: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18074: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18074: \$? = $ac_status" >&5
++  echo "$as_me:18077: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18076: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:18079: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -18145,12 +18148,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:18148: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:18151: 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 18153 "configure"
++#line 18156 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18167,16 +18170,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18170: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18173: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18173: \$? = $ac_status" >&5
++  echo "$as_me:18176: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18176: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18179: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18179: \$? = $ac_status" >&5
++  echo "$as_me:18182: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -18187,7 +18190,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:18190: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:18193: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -18196,11 +18199,11 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:18199: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:18202: 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 18203 "configure"
++#line 18206 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18217,16 +18220,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18220: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18223: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18223: \$? = $ac_status" >&5
++  echo "$as_me:18226: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18226: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18229: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18229: \$? = $ac_status" >&5
++  echo "$as_me:18232: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_CPLUSPLUS=yes
+ 
+@@ -18236,7 +18239,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:18239: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:18242: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -18245,30 +18248,30 @@
+ if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:18248: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:18251: 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:18255: checking version of $CC" >&5
++	echo "$as_me:18258: 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:18259: result: $CLANG_VERSION" >&5
++	echo "$as_me:18262: 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:18266: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:18269: 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 18271 "configure"
++#line 18274 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -18282,16 +18285,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18285: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18288: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18288: \$? = $ac_status" >&5
++  echo "$as_me:18291: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18291: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18294: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18294: \$? = $ac_status" >&5
++  echo "$as_me:18297: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -18302,13 +18305,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:18305: result: $cf_clang_optok" >&5
++		echo "$as_me:18308: 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}:18311: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:18314: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -18325,7 +18328,7 @@
+ ac_main_return="return"
+ 
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:18349: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -18360,12 +18363,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:18363: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18366: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18366: \$? = $ac_status" >&5
++  echo "$as_me:18369: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18368: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18371: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -18374,7 +18377,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:18377: checking for $CXX warning options..." >&5
++	{ echo "$as_me:18380: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -18404,16 +18407,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:18407: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18410: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18410: \$? = $ac_status" >&5
++  echo "$as_me:18413: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18412: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18415: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:18416: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18419: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -18431,7 +18434,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:18434: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:18437: 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.
+@@ -18441,7 +18444,7 @@
+ else
+   enable_string_hacks=no
+ fi;
+-echo "$as_me:18444: result: $enable_string_hacks" >&5
++echo "$as_me:18447: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+ 
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -18450,15 +18453,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:18453: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:18456: 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:18455: checking for strlcat" >&5
++	echo "$as_me:18458: 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 18461 "configure"
++#line 18464 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18489,16 +18492,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18492: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18495: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18495: \$? = $ac_status" >&5
++  echo "$as_me:18498: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18498: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18501: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18501: \$? = $ac_status" >&5
++  echo "$as_me:18504: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -18508,7 +18511,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18511: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:18514: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+ 
+@@ -18518,7 +18521,7 @@
+ 
+ else
+ 
+-		echo "$as_me:18521: checking for strlcat in -lbsd" >&5
++		echo "$as_me:18524: 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
+@@ -18526,7 +18529,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18529 "configure"
++#line 18532 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18545,16 +18548,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18548: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18551: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18551: \$? = $ac_status" >&5
++  echo "$as_me:18554: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18554: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18557: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18557: \$? = $ac_status" >&5
++  echo "$as_me:18560: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -18565,7 +18568,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18568: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:18571: 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
+ 
+@@ -18588,23 +18591,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18591: checking for $ac_header" >&5
++echo "$as_me:18594: 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 18597 "configure"
++#line 18600 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18601: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18604: \"$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:18607: \$? = $ac_status" >&5
++  echo "$as_me:18610: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18623,7 +18626,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18626: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18629: 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:18650: 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 18653 "configure"
++#line 18656 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18681,16 +18684,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18684: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18687: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18687: \$? = $ac_status" >&5
++  echo "$as_me:18690: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18690: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18693: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18693: \$? = $ac_status" >&5
++  echo "$as_me:18696: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -18700,7 +18703,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18703: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:18706: 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:18719: 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.
+@@ -18723,7 +18726,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:18726: result: $with_assertions" >&5
++echo "$as_me:18729: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -18739,7 +18742,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:18742: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:18745: 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.
+@@ -18761,7 +18764,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:18764: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:18767: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18875,23 +18878,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:18878: checking for dmalloc.h" >&5
++	echo "$as_me:18881: 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 18884 "configure"
++#line 18887 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:18888: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18891: \"$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:18894: \$? = $ac_status" >&5
++  echo "$as_me:18897: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18910,11 +18913,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18913: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:18916: 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:18917: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:18920: 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
+@@ -18922,7 +18925,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18925 "configure"
++#line 18928 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18941,16 +18944,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18944: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18947: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18947: \$? = $ac_status" >&5
++  echo "$as_me:18950: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18950: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18953: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18953: \$? = $ac_status" >&5
++  echo "$as_me:18956: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -18961,7 +18964,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18964: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:18967: 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:18982: 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.
+@@ -18998,7 +19001,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:19001: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:19004: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19112,23 +19115,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:19115: checking for dbmalloc.h" >&5
++	echo "$as_me:19118: 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 19121 "configure"
++#line 19124 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:19125: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:19128: \"$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:19131: \$? = $ac_status" >&5
++  echo "$as_me:19134: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19147,11 +19150,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:19150: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:19153: 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:19154: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:19157: 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
+@@ -19159,7 +19162,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19162 "configure"
++#line 19165 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19178,16 +19181,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19181: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19184: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19184: \$? = $ac_status" >&5
++  echo "$as_me:19187: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19187: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19190: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19190: \$? = $ac_status" >&5
++  echo "$as_me:19193: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -19198,7 +19201,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19201: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:19204: 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:19219: 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.
+@@ -19235,7 +19238,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:19238: result: ${with_valgrind:-no}" >&5
++echo "$as_me:19241: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19348,7 +19351,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19351: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:19354: 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.
+@@ -19359,7 +19362,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:19362: result: $with_no_leaks" >&5
++echo "$as_me:19365: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -19411,7 +19414,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19414: checking whether to add trace feature to all models" >&5
++echo "$as_me:19417: 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.
+@@ -19421,7 +19424,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:19424: result: $cf_with_trace" >&5
++echo "$as_me:19427: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -19441,7 +19444,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:19444: checking if we want to use GNAT projects" >&5
++echo "$as_me:19447: 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.
+@@ -19458,7 +19461,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:19461: result: $enable_gnat_projects" >&5
++echo "$as_me:19464: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -19471,14 +19474,14 @@
+ 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+ 	fi
+ 
+-echo "$as_me:19474: checking if ssp library is needed" >&5
++echo "$as_me:19477: 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 19481 "configure"
++#line 19484 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19495,16 +19498,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19498: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19501: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19501: \$? = $ac_status" >&5
++  echo "$as_me:19504: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19504: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19507: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19507: \$? = $ac_status" >&5
++  echo "$as_me:19510: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -19514,7 +19517,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19517 "configure"
++#line 19520 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19531,16 +19534,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19534: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19537: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19537: \$? = $ac_status" >&5
++  echo "$as_me:19540: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19540: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19543: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19543: \$? = $ac_status" >&5
++  echo "$as_me:19546: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -19554,7 +19557,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19557: result: $cf_cv_need_libssp" >&5
++echo "$as_me:19560: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -19583,14 +19586,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19586: checking if -lm needed for math functions" >&5
++echo "$as_me:19589: 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 19593 "configure"
++#line 19596 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19606,16 +19609,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19609: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19612: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19612: \$? = $ac_status" >&5
++  echo "$as_me:19615: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19615: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19618: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19618: \$? = $ac_status" >&5
++  echo "$as_me:19621: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -19625,7 +19628,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19628: result: $cf_cv_need_libm" >&5
++echo "$as_me:19631: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ 
+ if test "$cf_cv_need_libm" = yes
+@@ -19633,14 +19636,14 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lm"
+-	echo "$as_me:19636: checking if -lm is available for math functions" >&5
++	echo "$as_me:19639: checking if -lm is available for math functions" >&5
+ echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
+ if test "${cf_cv_have_libm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19643 "configure"
++#line 19646 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19656,16 +19659,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19659: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19662: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19662: \$? = $ac_status" >&5
++  echo "$as_me:19665: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19665: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19668: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19668: \$? = $ac_status" >&5
++  echo "$as_me:19671: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_libm=yes
+ else
+@@ -19675,7 +19678,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19678: result: $cf_cv_have_libm" >&5
++echo "$as_me:19681: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ 	LIBS="$cf_save_LIBS"
+ 
+@@ -19697,13 +19700,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:19700: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:19703: 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 19706 "configure"
++#line 19709 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -19719,16 +19722,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19722: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19725: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19725: \$? = $ac_status" >&5
++  echo "$as_me:19728: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19728: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19731: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19731: \$? = $ac_status" >&5
++  echo "$as_me:19734: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -19738,7 +19741,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19741: result: $ac_cv_header_time" >&5
++echo "$as_me:19744: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -19753,7 +19756,7 @@
+ case "$host_os" in
+ (mingw*)
+ 	# -lsystre -ltre -lintl -liconv
+-	echo "$as_me:19756: checking for regcomp in -lsystre" >&5
++	echo "$as_me:19759: 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
+@@ -19761,7 +19764,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsystre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19764 "configure"
++#line 19767 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19780,16 +19783,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19783: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19786: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19786: \$? = $ac_status" >&5
++  echo "$as_me:19789: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19789: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19792: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19792: \$? = $ac_status" >&5
++  echo "$as_me:19795: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_systre_regcomp=yes
+ else
+@@ -19800,11 +19803,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19803: result: $ac_cv_lib_systre_regcomp" >&5
++echo "$as_me:19806: 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:19807: checking for libiconv_open in -liconv" >&5
++		echo "$as_me:19810: 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
+@@ -19812,7 +19815,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19815 "configure"
++#line 19818 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19831,16 +19834,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19834: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19837: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19837: \$? = $ac_status" >&5
++  echo "$as_me:19840: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19840: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19843: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19843: \$? = $ac_status" >&5
++  echo "$as_me:19846: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_iconv_libiconv_open=yes
+ else
+@@ -19851,7 +19854,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19854: result: $ac_cv_lib_iconv_libiconv_open" >&5
++echo "$as_me:19857: 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
+ 
+@@ -19873,7 +19876,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19876: checking for libintl_gettext in -lintl" >&5
++		echo "$as_me:19879: 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
+@@ -19881,7 +19884,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19884 "configure"
++#line 19887 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19900,16 +19903,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19903: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19906: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19906: \$? = $ac_status" >&5
++  echo "$as_me:19909: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19909: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19912: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19912: \$? = $ac_status" >&5
++  echo "$as_me:19915: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_intl_libintl_gettext=yes
+ else
+@@ -19920,7 +19923,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19923: result: $ac_cv_lib_intl_libintl_gettext" >&5
++echo "$as_me:19926: 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
+ 
+@@ -19942,7 +19945,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19945: checking for tre_regcomp in -ltre" >&5
++		echo "$as_me:19948: 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
+@@ -19950,7 +19953,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19953 "configure"
++#line 19956 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19969,16 +19972,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19972: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19975: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19975: \$? = $ac_status" >&5
++  echo "$as_me:19978: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19978: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19981: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19981: \$? = $ac_status" >&5
++  echo "$as_me:19984: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_tre_tre_regcomp=yes
+ else
+@@ -19989,7 +19992,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19992: result: $ac_cv_lib_tre_tre_regcomp" >&5
++echo "$as_me:19995: 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
+ 
+@@ -20031,7 +20034,7 @@
+ 
+ else
+ 
+-		echo "$as_me:20034: checking for regcomp in -lgnurx" >&5
++		echo "$as_me:20037: 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
+@@ -20039,7 +20042,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgnurx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20042 "configure"
++#line 20045 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20058,16 +20061,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20061: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20064: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20064: \$? = $ac_status" >&5
++  echo "$as_me:20067: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20067: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20070: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20070: \$? = $ac_status" >&5
++  echo "$as_me:20073: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gnurx_regcomp=yes
+ else
+@@ -20078,7 +20081,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20081: result: $ac_cv_lib_gnurx_regcomp" >&5
++echo "$as_me:20084: 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
+ 
+@@ -20106,13 +20109,13 @@
+ 	;;
+ (*)
+ 	cf_regex_libs="regex re"
+-	echo "$as_me:20109: checking for regcomp" >&5
++	echo "$as_me:20112: 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 20115 "configure"
++#line 20118 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20143,16 +20146,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20146: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20149: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20149: \$? = $ac_status" >&5
++  echo "$as_me:20152: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20152: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20155: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20155: \$? = $ac_status" >&5
++  echo "$as_me:20158: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -20162,7 +20165,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20165: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:20168: 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
+@@ -20171,7 +20174,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:20174: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:20177: 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
+@@ -20179,7 +20182,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20182 "configure"
++#line 20185 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20198,16 +20201,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20201: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20204: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20204: \$? = $ac_status" >&5
++  echo "$as_me:20207: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20207: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20210: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20210: \$? = $ac_status" >&5
++  echo "$as_me:20213: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -20218,7 +20221,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20221: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:20224: 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
+ 
+@@ -20250,13 +20253,13 @@
+ esac
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:20253: checking for compile" >&5
++	echo "$as_me:20256: 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 20259 "configure"
++#line 20262 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20287,16 +20290,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20290: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20293: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20293: \$? = $ac_status" >&5
++  echo "$as_me:20296: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20296: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20299: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20299: \$? = $ac_status" >&5
++  echo "$as_me:20302: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -20306,13 +20309,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20309: result: $ac_cv_func_compile" >&5
++echo "$as_me:20312: 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:20315: checking for compile in -lgen" >&5
++		echo "$as_me:20318: 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
+@@ -20320,7 +20323,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20323 "configure"
++#line 20326 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20339,16 +20342,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20342: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20345: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20345: \$? = $ac_status" >&5
++  echo "$as_me:20348: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20348: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20351: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20351: \$? = $ac_status" >&5
++  echo "$as_me:20354: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -20359,7 +20362,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20362: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:20365: 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
+ 
+@@ -20387,11 +20390,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:20390: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:20393: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:20394: checking for regular-expression headers" >&5
++echo "$as_me:20397: 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
+@@ -20403,7 +20406,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20406 "configure"
++#line 20409 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -20420,16 +20423,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20423: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20426: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20426: \$? = $ac_status" >&5
++  echo "$as_me:20429: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20429: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20432: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20432: \$? = $ac_status" >&5
++  echo "$as_me:20435: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20446,7 +20449,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20449 "configure"
++#line 20452 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -20467,16 +20470,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20470: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20473: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20473: \$? = $ac_status" >&5
++  echo "$as_me:20476: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20476: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20479: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20479: \$? = $ac_status" >&5
++  echo "$as_me:20482: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20492,11 +20495,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:20495: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:20498: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case "$cf_cv_regex_hdrs" in
+-	(no)		{ echo "$as_me:20499: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:20502: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -20534,23 +20537,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20537: checking for $ac_header" >&5
++echo "$as_me:20540: 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 20543 "configure"
++#line 20546 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20547: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20550: \"$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:20553: \$? = $ac_status" >&5
++  echo "$as_me:20556: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20569,7 +20572,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20572: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20575: 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:20588: 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 20591 "configure"
++#line 20594 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20595: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20598: \"$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:20601: \$? = $ac_status" >&5
++  echo "$as_me:20604: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20617,7 +20620,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20620: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20623: 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:20633: 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
+@@ -20637,7 +20640,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20640 "configure"
++#line 20643 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20650,16 +20653,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20653: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20656: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20656: \$? = $ac_status" >&5
++  echo "$as_me:20659: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20659: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20662: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20662: \$? = $ac_status" >&5
++  echo "$as_me:20665: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -20671,7 +20674,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20674: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20677: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -20688,14 +20691,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20691: checking if external environ is declared" >&5
++echo "$as_me:20694: 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 20698 "configure"
++#line 20701 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -20708,16 +20711,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20711: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20714: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20714: \$? = $ac_status" >&5
++  echo "$as_me:20717: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20717: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20720: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20720: \$? = $ac_status" >&5
++  echo "$as_me:20723: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_environ=yes
+ else
+@@ -20728,7 +20731,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20731: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20734: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+ 
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20743,14 +20746,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:20746: checking if external environ exists" >&5
++echo "$as_me:20749: 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 20753 "configure"
++#line 20756 "configure"
+ #include "confdefs.h"
+ 
+ #undef environ
+@@ -20765,16 +20768,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20768: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20771: \"$ac_link\"") >&5
+   (eval $ac_link) 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_exeext"'
+-  { (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
+   cf_cv_have_environ=yes
+ else
+@@ -20785,7 +20788,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20788: result: $cf_cv_have_environ" >&5
++echo "$as_me:20791: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+ 
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20798,13 +20801,13 @@
+ 
+ fi
+ 
+-echo "$as_me:20801: checking for getenv" >&5
++echo "$as_me:20804: 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 20807 "configure"
++#line 20810 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20835,16 +20838,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20838: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20841: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20841: \$? = $ac_status" >&5
++  echo "$as_me:20844: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20844: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20847: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20847: \$? = $ac_status" >&5
++  echo "$as_me:20850: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_getenv=yes
+ else
+@@ -20854,19 +20857,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20857: result: $ac_cv_func_getenv" >&5
++echo "$as_me:20860: 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:20863: checking for $ac_func" >&5
++echo "$as_me:20866: 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 20869 "configure"
++#line 20872 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20897,16 +20900,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20900: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20903: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20903: \$? = $ac_status" >&5
++  echo "$as_me:20906: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20906: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20909: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20909: \$? = $ac_status" >&5
++  echo "$as_me:20912: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -20916,7 +20919,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20919: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:20922: 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:20932: 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
+@@ -20936,7 +20939,7 @@
+   cf_cv_consistent_getenv=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20939 "configure"
++#line 20942 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21041,15 +21044,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21044: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21047: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21047: \$? = $ac_status" >&5
++  echo "$as_me:21050: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21049: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21052: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21052: \$? = $ac_status" >&5
++  echo "$as_me:21055: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_consistent_getenv=yes
+ else
+@@ -21062,7 +21065,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:21065: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:21068: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+ 
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -21077,18 +21080,18 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ 	test "x$cf_with_trace" = xyes
+ then
+-	{ echo "$as_me:21080: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++	{ echo "$as_me:21083: 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:21084: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:21087: 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 21091 "configure"
++#line 21094 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21108,16 +21111,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21111: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21114: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21114: \$? = $ac_status" >&5
++  echo "$as_me:21117: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21117: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21120: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21120: \$? = $ac_status" >&5
++  echo "$as_me:21123: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -21129,7 +21132,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21132: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:21135: 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
+@@ -21144,13 +21147,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:21147: checking for an ANSI C-conforming const" >&5
++echo "$as_me:21150: 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 21153 "configure"
++#line 21156 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21212,16 +21215,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21215: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21218: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21218: \$? = $ac_status" >&5
++  echo "$as_me:21221: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21221: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21224: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21224: \$? = $ac_status" >&5
++  echo "$as_me:21227: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -21231,7 +21234,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21234: result: $ac_cv_c_const" >&5
++echo "$as_me:21237: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -21241,7 +21244,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21244: checking for inline" >&5
++echo "$as_me:21247: 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
+@@ -21249,7 +21252,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21252 "configure"
++#line 21255 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo (void) {return 0; }
+@@ -21258,16 +21261,16 @@
+ 
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21261: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21264: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21264: \$? = $ac_status" >&5
++  echo "$as_me:21267: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21267: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21270: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21270: \$? = $ac_status" >&5
++  echo "$as_me:21273: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -21278,7 +21281,7 @@
+ done
+ 
+ fi
+-echo "$as_me:21281: result: $ac_cv_c_inline" >&5
++echo "$as_me:21284: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -21304,7 +21307,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:21307: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:21310: 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
+@@ -21313,7 +21316,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21316 "configure"
++#line 21319 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -21325,16 +21328,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21328: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21331: \"$ac_compile\"") >&5
+   (eval $ac_compile) 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_objext"'
+-  { (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_gcc_inline=yes
+ else
+@@ -21346,7 +21349,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:21349: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:21352: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -21452,7 +21455,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:21455: checking for signal global datatype" >&5
++echo "$as_me:21458: 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
+@@ -21464,7 +21467,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21467 "configure"
++#line 21470 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21488,16 +21491,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21491: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21494: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21494: \$? = $ac_status" >&5
++  echo "$as_me:21497: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21497: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21500: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21500: \$? = $ac_status" >&5
++  echo "$as_me:21503: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21511,7 +21514,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21514: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21517: 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:21526: 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
+@@ -21530,7 +21533,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21533 "configure"
++#line 21536 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21565,15 +21568,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21568: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21571: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21571: \$? = $ac_status" >&5
++  echo "$as_me:21574: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21573: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21576: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21576: \$? = $ac_status" >&5
++  echo "$as_me:21579: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21588,7 +21591,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21591: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21594: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:21606: 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 21610 "configure"
++#line 21613 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21619,16 +21622,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21622: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21625: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21625: \$? = $ac_status" >&5
++  echo "$as_me:21628: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21628: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21631: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21631: \$? = $ac_status" >&5
++  echo "$as_me:21634: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -21640,7 +21643,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21643: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21646: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -21656,14 +21659,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:21659: checking if external errno is declared" >&5
++echo "$as_me:21662: 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 21666 "configure"
++#line 21669 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21677,16 +21680,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21680: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21683: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21683: \$? = $ac_status" >&5
++  echo "$as_me:21686: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21686: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21689: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21689: \$? = $ac_status" >&5
++  echo "$as_me:21692: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -21697,7 +21700,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21700: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21703: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21712,14 +21715,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:21715: checking if external errno exists" >&5
++echo "$as_me:21718: 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 21722 "configure"
++#line 21725 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -21734,16 +21737,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21737: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21740: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21740: \$? = $ac_status" >&5
++  echo "$as_me:21743: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21743: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21746: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21746: \$? = $ac_status" >&5
++  echo "$as_me:21749: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -21754,7 +21757,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21757: result: $cf_cv_have_errno" >&5
++echo "$as_me:21760: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21767,7 +21770,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21770: checking if data-only library module links" >&5
++echo "$as_me:21773: 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
+@@ -21775,20 +21778,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:21784: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21784: \$? = $ac_status" >&5
++  echo "$as_me:21787: \$? = $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:21811: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21811: \$? = $ac_status" >&5
++  echo "$as_me:21814: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -21821,7 +21824,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21824 "configure"
++#line 21827 "configure"
+ #include "confdefs.h"
+ 
+ 	extern int testfunc(void);
+@@ -21832,15 +21835,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21835: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21838: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21838: \$? = $ac_status" >&5
++  echo "$as_me:21841: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21840: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21843: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21843: \$? = $ac_status" >&5
++  echo "$as_me:21846: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -21855,7 +21858,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21858: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21861: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21870,13 +21873,13 @@
+ ###	Checks for library functions.
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:21873: checking for clock_gettime" >&5
++echo "$as_me:21876: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21879 "configure"
++#line 21882 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21907,16 +21910,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21910: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21913: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21913: \$? = $ac_status" >&5
++  echo "$as_me:21916: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21916: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21919: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21919: \$? = $ac_status" >&5
++  echo "$as_me:21922: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -21926,12 +21929,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21929: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:21932: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:21934: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:21937: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21939,7 +21942,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21942 "configure"
++#line 21945 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21958,16 +21961,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21961: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21964: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21964: \$? = $ac_status" >&5
++  echo "$as_me:21967: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21967: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21970: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21970: \$? = $ac_status" >&5
++  echo "$as_me:21973: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -21978,7 +21981,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21981: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:21984: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -21990,14 +21993,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:21993: checking if clock_gettime links" >&5
++echo "$as_me:21996: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22000 "configure"
++#line 22003 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22015,16 +22018,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22018: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22021: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22021: \$? = $ac_status" >&5
++  echo "$as_me:22024: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22024: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22027: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22027: \$? = $ac_status" >&5
++  echo "$as_me:22030: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -22035,7 +22038,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22038: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:22041: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -22049,13 +22052,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:22052: checking for gettimeofday" >&5
++echo "$as_me:22055: 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 22058 "configure"
++#line 22061 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22086,16 +22089,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22089: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22092: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22092: \$? = $ac_status" >&5
++  echo "$as_me:22095: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22095: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22098: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22098: \$? = $ac_status" >&5
++  echo "$as_me:22101: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -22105,7 +22108,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22108: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:22111: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -22115,7 +22118,7 @@
+ 
+ else
+ 
+-echo "$as_me:22118: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:22121: 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
+@@ -22123,7 +22126,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22126 "configure"
++#line 22129 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22142,16 +22145,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22145: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22148: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22148: \$? = $ac_status" >&5
++  echo "$as_me:22151: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22151: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22154: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22154: \$? = $ac_status" >&5
++  echo "$as_me:22157: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -22162,7 +22165,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22165: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:22168: 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
+ 
+@@ -22221,13 +22224,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:22224: checking for $ac_func" >&5
++echo "$as_me:22227: 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 22230 "configure"
++#line 22233 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22258,16 +22261,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22261: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22264: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22264: \$? = $ac_status" >&5
++  echo "$as_me:22267: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22267: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22270: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22270: \$? = $ac_status" >&5
++  echo "$as_me:22273: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -22277,7 +22280,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22280: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:22283: 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:22293: 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 22297 "configure"
++#line 22300 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22309,16 +22312,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22312: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22315: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22315: \$? = $ac_status" >&5
++  echo "$as_me:22318: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22318: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22321: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22321: \$? = $ac_status" >&5
++  echo "$as_me:22324: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_PATH_TTYS=yes
+ else
+@@ -22328,7 +22331,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22331: result: $cf_cv_PATH_TTYS" >&5
++echo "$as_me:22334: result: $cf_cv_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
+ 
+ if test $cf_cv_PATH_TTYS = no
+@@ -22350,7 +22353,7 @@
+ 
+ if test $cf_cv_PATH_TTYS != no
+ then
+-	echo "$as_me:22353: checking if _PATH_TTYS file exists" >&5
++	echo "$as_me:22356: 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
+@@ -22360,7 +22363,7 @@
+   cf_cv_have_PATH_TTYS=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22363 "configure"
++#line 22366 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22373,15 +22376,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22376: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22379: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22379: \$? = $ac_status" >&5
++  echo "$as_me:22382: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22381: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22384: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22384: \$? = $ac_status" >&5
++  echo "$as_me:22387: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_PATH_TTYS=yes
+ else
+@@ -22393,7 +22396,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22396: result: $cf_cv_have_PATH_TTYS" >&5
++echo "$as_me:22399: 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
+@@ -22405,14 +22408,14 @@
+ #define HAVE_PATH_TTYS 1
+ EOF
+ 
+-	echo "$as_me:22408: checking for getttynam" >&5
++	echo "$as_me:22411: 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 22415 "configure"
++#line 22418 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22424,16 +22427,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22427: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22430: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22430: \$? = $ac_status" >&5
++  echo "$as_me:22433: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22433: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22436: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22436: \$? = $ac_status" >&5
++  echo "$as_me:22439: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_getttynam=yes
+ else
+@@ -22443,7 +22446,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22446: result: $cf_cv_func_getttynam" >&5
++echo "$as_me:22449: 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
+@@ -22453,7 +22456,7 @@
+ 
+ if test "x$ac_cv_func_getopt" = xno && \
+    test "x$cf_with_progs$cf_with_tests" != xnono; then
+-	{ { echo "$as_me:22456: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:22459: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -22462,7 +22465,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:22465: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:22468: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -22475,14 +22478,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:22478: checking for terminal-capability database functions" >&5
++echo "$as_me:22481: 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 22485 "configure"
++#line 22488 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22502,16 +22505,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22505: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22508: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22508: \$? = $ac_status" >&5
++  echo "$as_me:22511: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22511: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22514: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22514: \$? = $ac_status" >&5
++  echo "$as_me:22517: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -22522,7 +22525,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22525: result: $cf_cv_cgetent" >&5
++echo "$as_me:22528: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -22532,14 +22535,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:22535: checking if cgetent uses const parameter" >&5
++echo "$as_me:22538: 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 22542 "configure"
++#line 22545 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -22562,16 +22565,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22565: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22568: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22568: \$? = $ac_status" >&5
++  echo "$as_me:22571: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22571: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22574: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22574: \$? = $ac_status" >&5
++  echo "$as_me:22577: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -22582,7 +22585,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22585: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:22588: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -22596,14 +22599,14 @@
+ 
+ fi
+ 
+-echo "$as_me:22599: checking for isascii" >&5
++echo "$as_me:22602: 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 22606 "configure"
++#line 22609 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22615,16 +22618,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22618: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22621: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22621: \$? = $ac_status" >&5
++  echo "$as_me:22624: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22624: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22627: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22627: \$? = $ac_status" >&5
++  echo "$as_me:22630: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -22635,7 +22638,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22638: result: $cf_cv_have_isascii" >&5
++echo "$as_me:22641: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -22643,10 +22646,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:22646: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:22649: 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 22649 "configure"
++#line 22652 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22660,16 +22663,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22663: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22666: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22666: \$? = $ac_status" >&5
++  echo "$as_me:22669: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22669: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22672: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22672: \$? = $ac_status" >&5
++  echo "$as_me:22675: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=no
+ else
+@@ -22677,7 +22680,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22680 "configure"
++#line 22683 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22692,16 +22695,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22695: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22698: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22698: \$? = $ac_status" >&5
++  echo "$as_me:22701: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22701: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22704: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22704: \$? = $ac_status" >&5
++  echo "$as_me:22707: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=yes
+ 
+@@ -22717,11 +22720,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:22720: result: $sigact_bad" >&5
++echo "$as_me:22723: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:22724: checking if nanosleep really works" >&5
++echo "$as_me:22727: 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
+@@ -22731,7 +22734,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22734 "configure"
++#line 22737 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22757,15 +22760,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22760: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22763: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22763: \$? = $ac_status" >&5
++  echo "$as_me:22766: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22765: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22768: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22768: \$? = $ac_status" >&5
++  echo "$as_me:22771: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -22777,7 +22780,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22780: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:22783: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -22794,23 +22797,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22797: checking for $ac_header" >&5
++echo "$as_me:22800: 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 22803 "configure"
++#line 22806 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22807: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22810: \"$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:22813: \$? = $ac_status" >&5
++  echo "$as_me:22816: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22829,7 +22832,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22832: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22835: 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:22852: 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 22852 "configure"
++#line 22855 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22861,16 +22864,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22864: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22867: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22867: \$? = $ac_status" >&5
++  echo "$as_me:22870: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22870: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22873: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22873: \$? = $ac_status" >&5
++  echo "$as_me:22876: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=no
+ else
+@@ -22878,7 +22881,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22881 "configure"
++#line 22884 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22892,16 +22895,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22895: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22898: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22898: \$? = $ac_status" >&5
++  echo "$as_me:22901: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22901: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22904: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22904: \$? = $ac_status" >&5
++  echo "$as_me:22907: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=unknown
+ else
+@@ -22917,19 +22920,19 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:22920: result: $termios_bad" >&5
++	echo "$as_me:22923: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:22925: checking for tcgetattr" >&5
++echo "$as_me:22928: 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 22932 "configure"
++#line 22935 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22957,16 +22960,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22960: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22963: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22963: \$? = $ac_status" >&5
++  echo "$as_me:22966: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22966: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22969: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22969: \$? = $ac_status" >&5
++  echo "$as_me:22972: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -22976,21 +22979,21 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22979: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:22982: 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:22986: checking for vsscanf function or workaround" >&5
++echo "$as_me:22989: 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 22993 "configure"
++#line 22996 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23016,16 +23019,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23019: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23022: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23022: \$? = $ac_status" >&5
++  echo "$as_me:23025: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23025: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23028: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23028: \$? = $ac_status" >&5
++  echo "$as_me:23031: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -23033,7 +23036,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23036 "configure"
++#line 23039 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23055,16 +23058,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23058: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23061: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23061: \$? = $ac_status" >&5
++  echo "$as_me:23064: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23064: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23067: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23067: \$? = $ac_status" >&5
++  echo "$as_me:23070: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -23072,7 +23075,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23075 "configure"
++#line 23078 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23094,16 +23097,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23097: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23100: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23100: \$? = $ac_status" >&5
++  echo "$as_me:23103: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23103: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23106: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23106: \$? = $ac_status" >&5
++  echo "$as_me:23109: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -23118,7 +23121,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23121: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:23124: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case "$cf_cv_func_vsscanf" in
+@@ -23144,23 +23147,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:23147: checking for $ac_header" >&5
++echo "$as_me:23150: 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 23153 "configure"
++#line 23156 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23157: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23160: \"$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:23163: \$? = $ac_status" >&5
++  echo "$as_me:23166: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23179,7 +23182,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23182: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23185: 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:23195: 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
+@@ -23200,7 +23203,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23203 "configure"
++#line 23206 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23235,15 +23238,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23238: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23241: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23241: \$? = $ac_status" >&5
++  echo "$as_me:23244: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23243: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23246: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23246: \$? = $ac_status" >&5
++  echo "$as_me:23249: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -23258,16 +23261,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:23261: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:23264: 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:23264: checking for mkstemp" >&5
++	echo "$as_me:23267: 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 23270 "configure"
++#line 23273 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23298,16 +23301,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23301: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23304: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23304: \$? = $ac_status" >&5
++  echo "$as_me:23307: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23307: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23310: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23310: \$? = $ac_status" >&5
++  echo "$as_me:23313: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -23317,7 +23320,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23320: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:23323: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -23338,21 +23341,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:23341: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:23344: 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:23344: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:23347: 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:23350: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:23353: 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 23355 "configure"
++#line 23358 "configure"
+ #include "confdefs.h"
+ #include 
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -23369,15 +23372,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23372: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23375: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23375: \$? = $ac_status" >&5
++  echo "$as_me:23378: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23377: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23380: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23380: \$? = $ac_status" >&5
++  echo "$as_me:23383: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -23390,7 +23393,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:23393: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:23396: 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
+ 
+@@ -23401,13 +23404,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:23404: checking for intptr_t" >&5
++echo "$as_me:23407: 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 23410 "configure"
++#line 23413 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23422,16 +23425,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23425: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23428: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23428: \$? = $ac_status" >&5
++  echo "$as_me:23431: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23431: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23434: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23434: \$? = $ac_status" >&5
++  echo "$as_me:23437: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -23441,7 +23444,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23444: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:23447: 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
+   :
+@@ -23453,13 +23456,13 @@
+ 
+ fi
+ 
+-echo "$as_me:23456: checking for ssize_t" >&5
++echo "$as_me:23459: 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 23462 "configure"
++#line 23465 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23474,16 +23477,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23477: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23480: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23480: \$? = $ac_status" >&5
++  echo "$as_me:23483: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23483: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23486: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23486: \$? = $ac_status" >&5
++  echo "$as_me:23489: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -23493,7 +23496,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23496: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:23499: 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
+   :
+@@ -23505,14 +23508,14 @@
+ 
+ fi
+ 
+-echo "$as_me:23508: checking for type sigaction_t" >&5
++echo "$as_me:23511: 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 23515 "configure"
++#line 23518 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23525,16 +23528,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23528: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23531: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23531: \$? = $ac_status" >&5
++  echo "$as_me:23534: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23534: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23537: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23537: \$? = $ac_status" >&5
++  echo "$as_me:23540: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -23545,14 +23548,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:23548: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:23551: 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:23555: checking declaration of size-change" >&5
++echo "$as_me:23558: 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
+@@ -23573,7 +23576,7 @@
+ 
+ 	fi
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23576 "configure"
++#line 23579 "configure"
+ #include "confdefs.h"
+ #include 
+ #ifdef HAVE_TERMIOS_H
+@@ -23623,16 +23626,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23626: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23629: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23629: \$? = $ac_status" >&5
++  echo "$as_me:23632: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23632: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23635: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23635: \$? = $ac_status" >&5
++  echo "$as_me:23638: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -23651,7 +23654,7 @@
+ done
+ 
+ fi
+-echo "$as_me:23654: result: $cf_cv_sizechange" >&5
++echo "$as_me:23657: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -23669,13 +23672,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:23672: checking for memmove" >&5
++echo "$as_me:23675: 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 23678 "configure"
++#line 23681 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23706,16 +23709,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23709: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23712: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23712: \$? = $ac_status" >&5
++  echo "$as_me:23715: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23715: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23718: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23718: \$? = $ac_status" >&5
++  echo "$as_me:23721: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -23725,19 +23728,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23728: result: $ac_cv_func_memmove" >&5
++echo "$as_me:23731: 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:23734: checking for bcopy" >&5
++echo "$as_me:23737: 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 23740 "configure"
++#line 23743 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23768,16 +23771,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23771: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23774: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23774: \$? = $ac_status" >&5
++  echo "$as_me:23777: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23777: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23780: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23780: \$? = $ac_status" >&5
++  echo "$as_me:23783: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -23787,11 +23790,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23790: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:23793: 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:23794: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:23797: 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
+@@ -23801,7 +23804,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23804 "configure"
++#line 23807 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23817,15 +23820,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23820: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23823: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23823: \$? = $ac_status" >&5
++  echo "$as_me:23826: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23825: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23828: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23828: \$? = $ac_status" >&5
++  echo "$as_me:23831: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -23838,7 +23841,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:23841: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:23844: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -23865,13 +23868,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23868: checking for $ac_func" >&5
++echo "$as_me:23871: 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 23874 "configure"
++#line 23877 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23902,16 +23905,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23905: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23908: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23908: \$? = $ac_status" >&5
++  echo "$as_me:23911: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23911: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23914: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23914: \$? = $ac_status" >&5
++  echo "$as_me:23917: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23921,7 +23924,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23924: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23927: 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:23937: 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
+@@ -23941,7 +23944,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23944 "configure"
++#line 23947 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23994,15 +23997,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23997: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24000: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24000: \$? = $ac_status" >&5
++  echo "$as_me:24003: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24002: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24005: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24005: \$? = $ac_status" >&5
++  echo "$as_me:24008: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -24014,21 +24017,21 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24017: result: $cf_cv_working_poll" >&5
++echo "$as_me:24020: 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:24024: checking if MB_LEN_MAX is usable" >&5
++echo "$as_me:24027: checking if MB_LEN_MAX is usable" >&5
+ echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
+ if test "${cf_cv_mb_len_max+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24031 "configure"
++#line 24034 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24048,16 +24051,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24051: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24054: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24054: \$? = $ac_status" >&5
++  echo "$as_me:24057: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24057: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24060: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24060: \$? = $ac_status" >&5
++  echo "$as_me:24063: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mb_len_max=yes
+ else
+@@ -24067,7 +24070,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24070: result: $cf_cv_mb_len_max" >&5
++echo "$as_me:24073: result: $cf_cv_mb_len_max" >&5
+ echo "${ECHO_T}$cf_cv_mb_len_max" >&6
+ if test "$cf_cv_mb_len_max" = yes
+ then
+@@ -24077,18 +24080,18 @@
+ EOF
+ 
+ else
+-	{ echo "$as_me:24080: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
++	{ echo "$as_me:24083: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+ echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
+ fi
+ 
+-echo "$as_me:24084: checking for va_copy" >&5
++echo "$as_me:24087: 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 24091 "configure"
++#line 24094 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24105,16 +24108,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24108: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24111: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24111: \$? = $ac_status" >&5
++  echo "$as_me:24114: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24114: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24117: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24117: \$? = $ac_status" >&5
++  echo "$as_me:24120: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -24124,7 +24127,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24127: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:24130: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -24136,14 +24139,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:24139: checking for __va_copy" >&5
++echo "$as_me:24142: 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 24146 "configure"
++#line 24149 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24160,16 +24163,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24163: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24166: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24166: \$? = $ac_status" >&5
++  echo "$as_me:24169: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24169: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24172: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24172: \$? = $ac_status" >&5
++  echo "$as_me:24175: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -24179,7 +24182,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24182: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:24185: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -24191,14 +24194,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:24194: checking for __builtin_va_copy" >&5
++echo "$as_me:24197: 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 24201 "configure"
++#line 24204 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24215,16 +24218,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24218: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24221: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24221: \$? = $ac_status" >&5
++  echo "$as_me:24224: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24224: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24227: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24227: \$? = $ac_status" >&5
++  echo "$as_me:24230: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -24234,7 +24237,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24237: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:24240: 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 &&
+@@ -24252,14 +24255,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:24255: checking if we can simply copy va_list" >&5
++	echo "$as_me:24258: 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 24262 "configure"
++#line 24265 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24276,16 +24279,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24279: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24282: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24282: \$? = $ac_status" >&5
++  echo "$as_me:24285: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24285: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24288: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24288: \$? = $ac_status" >&5
++  echo "$as_me:24291: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -24295,19 +24298,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24298: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:24301: 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:24303: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:24306: 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 24310 "configure"
++#line 24313 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24324,16 +24327,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24327: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24330: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24330: \$? = $ac_status" >&5
++  echo "$as_me:24333: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24333: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24336: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24336: \$? = $ac_status" >&5
++  echo "$as_me:24339: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -24343,7 +24346,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24346: result: $cf_cv_array_va_list" >&5
++echo "$as_me:24349: 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
+@@ -24354,13 +24357,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:24357: checking for pid_t" >&5
++echo "$as_me:24360: 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 24363 "configure"
++#line 24366 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24375,16 +24378,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24378: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24381: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24381: \$? = $ac_status" >&5
++  echo "$as_me:24384: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24384: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24387: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24387: \$? = $ac_status" >&5
++  echo "$as_me:24390: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -24394,7 +24397,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24397: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:24400: 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
+   :
+@@ -24409,23 +24412,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:24412: checking for $ac_header" >&5
++echo "$as_me:24415: 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 24418 "configure"
++#line 24421 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:24422: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:24425: \"$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:24428: \$? = $ac_status" >&5
++  echo "$as_me:24431: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -24444,7 +24447,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24447: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:24450: 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:24463: 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 24466 "configure"
++#line 24469 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -24494,16 +24497,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24497: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24500: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24500: \$? = $ac_status" >&5
++  echo "$as_me:24503: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24503: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24506: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24506: \$? = $ac_status" >&5
++  echo "$as_me:24509: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -24513,7 +24516,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24516: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:24519: 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:24531: 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
+@@ -24548,15 +24551,15 @@
+       }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24551: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24554: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24554: \$? = $ac_status" >&5
++  echo "$as_me:24557: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24556: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24559: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24559: \$? = $ac_status" >&5
++  echo "$as_me:24562: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -24568,7 +24571,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24571: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:24574: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -24582,12 +24585,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:24585: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24588: 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:24590: checking for working vfork" >&5
++  echo "$as_me:24593: 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
+@@ -24596,7 +24599,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24599 "configure"
++#line 24602 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include 
+@@ -24689,15 +24692,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24692: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24695: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24695: \$? = $ac_status" >&5
++  echo "$as_me:24698: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24697: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24700: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24700: \$? = $ac_status" >&5
++  echo "$as_me:24703: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -24709,13 +24712,13 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24712: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:24715: 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:24718: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24721: 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
+ 
+@@ -24740,7 +24743,7 @@
+ 
+ fi
+ 
+-echo "$as_me:24743: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:24746: 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
+@@ -24750,7 +24753,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24753 "configure"
++#line 24756 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24785,15 +24788,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24788: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24791: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24791: \$? = $ac_status" >&5
++  echo "$as_me:24794: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24793: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24796: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24796: \$? = $ac_status" >&5
++  echo "$as_me:24799: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fopen_bin_r=yes
+ else
+@@ -24806,20 +24809,20 @@
+ fi
+ 
+ fi
+-echo "$as_me:24809: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:24812: 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
+ #define USE_FOPEN_BIN_R 1
+ EOF
+ 
+-	echo "$as_me:24816: checking for cc_t" >&5
++	echo "$as_me:24819: checking for cc_t" >&5
+ echo $ECHO_N "checking for cc_t... $ECHO_C" >&6
+ if test "${ac_cv_type_cc_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24822 "configure"
++#line 24825 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24837,16 +24840,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24840: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24843: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24843: \$? = $ac_status" >&5
++  echo "$as_me:24846: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24846: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24849: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24849: \$? = $ac_status" >&5
++  echo "$as_me:24852: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_cc_t=yes
+ else
+@@ -24856,7 +24859,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24859: result: $ac_cv_type_cc_t" >&5
++echo "$as_me:24862: result: $ac_cv_type_cc_t" >&5
+ echo "${ECHO_T}$ac_cv_type_cc_t" >&6
+ if test "$ac_cv_type_cc_t" = yes; then
+ 
+@@ -24866,13 +24869,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:24869: checking for speed_t" >&5
++	echo "$as_me:24872: checking for speed_t" >&5
+ echo $ECHO_N "checking for speed_t... $ECHO_C" >&6
+ if test "${ac_cv_type_speed_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24875 "configure"
++#line 24878 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24890,16 +24893,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24893: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24896: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24896: \$? = $ac_status" >&5
++  echo "$as_me:24899: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24899: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24902: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24902: \$? = $ac_status" >&5
++  echo "$as_me:24905: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_speed_t=yes
+ else
+@@ -24909,7 +24912,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24912: result: $ac_cv_type_speed_t" >&5
++echo "$as_me:24915: result: $ac_cv_type_speed_t" >&5
+ echo "${ECHO_T}$ac_cv_type_speed_t" >&6
+ if test "$ac_cv_type_speed_t" = yes; then
+ 
+@@ -24919,13 +24922,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:24922: checking for tcflag_t" >&5
++	echo "$as_me:24925: checking for tcflag_t" >&5
+ echo $ECHO_N "checking for tcflag_t... $ECHO_C" >&6
+ if test "${ac_cv_type_tcflag_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24928 "configure"
++#line 24931 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24943,16 +24946,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24946: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24949: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24949: \$? = $ac_status" >&5
++  echo "$as_me:24952: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24952: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24955: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24955: \$? = $ac_status" >&5
++  echo "$as_me:24958: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_tcflag_t=yes
+ else
+@@ -24962,7 +24965,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24965: result: $ac_cv_type_tcflag_t" >&5
++echo "$as_me:24968: result: $ac_cv_type_tcflag_t" >&5
+ echo "${ECHO_T}$ac_cv_type_tcflag_t" >&6
+ if test "$ac_cv_type_tcflag_t" = yes; then
+ 
+@@ -24972,13 +24975,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:24975: checking for sigset_t" >&5
++	echo "$as_me:24978: checking for sigset_t" >&5
+ echo $ECHO_N "checking for sigset_t... $ECHO_C" >&6
+ if test "${ac_cv_type_sigset_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24981 "configure"
++#line 24984 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24996,16 +24999,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24999: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25002: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25002: \$? = $ac_status" >&5
++  echo "$as_me:25005: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25005: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25008: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25008: \$? = $ac_status" >&5
++  echo "$as_me:25011: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_sigset_t=yes
+ else
+@@ -25015,7 +25018,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:25018: result: $ac_cv_type_sigset_t" >&5
++echo "$as_me:25021: result: $ac_cv_type_sigset_t" >&5
+ echo "${ECHO_T}$ac_cv_type_sigset_t" >&6
+ if test "$ac_cv_type_sigset_t" = yes; then
+ 
+@@ -25027,7 +25030,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:25030: checking for openpty in -lutil" >&5
++echo "$as_me:25033: 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
+@@ -25035,7 +25038,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25038 "configure"
++#line 25041 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -25054,16 +25057,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25057: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25060: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25060: \$? = $ac_status" >&5
++  echo "$as_me:25063: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25063: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25066: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25066: \$? = $ac_status" >&5
++  echo "$as_me:25069: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -25074,7 +25077,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:25077: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:25080: 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
+@@ -25082,7 +25085,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:25085: checking for openpty header" >&5
++echo "$as_me:25088: 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
+@@ -25109,7 +25112,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25112 "configure"
++#line 25115 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -25127,16 +25130,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25130: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25133: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25133: \$? = $ac_status" >&5
++  echo "$as_me:25136: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25136: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25139: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25139: \$? = $ac_status" >&5
++  echo "$as_me:25142: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -25154,7 +25157,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:25157: result: $cf_cv_func_openpty" >&5
++echo "$as_me:25160: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -25227,7 +25230,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25230 "configure"
++#line 25233 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -25239,16 +25242,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25242: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25245: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25245: \$? = $ac_status" >&5
++  echo "$as_me:25248: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25248: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25251: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25251: \$? = $ac_status" >&5
++  echo "$as_me:25254: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25265,7 +25268,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}:25268: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25271: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25301,7 +25304,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}:25304: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25307: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25312,7 +25315,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:25315: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:25318: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -25384,7 +25387,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25387 "configure"
++#line 25390 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -25396,16 +25399,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25399: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25402: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25402: \$? = $ac_status" >&5
++  echo "$as_me:25405: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25405: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25408: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25408: \$? = $ac_status" >&5
++  echo "$as_me:25411: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25422,7 +25425,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}:25425: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25428: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25502,7 +25505,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}:25505: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25508: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25519,23 +25522,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:25522: checking for db.h" >&5
++echo "$as_me:25525: 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 25528 "configure"
++#line 25531 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:25532: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25535: \"$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:25538: \$? = $ac_status" >&5
++  echo "$as_me:25541: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -25554,11 +25557,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25557: result: $ac_cv_header_db_h" >&5
++echo "$as_me:25560: 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:25561: checking for version of db" >&5
++echo "$as_me:25564: 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
+@@ -25569,10 +25572,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:25572: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:25575: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25575 "configure"
++#line 25578 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25602,16 +25605,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25605: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25608: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25608: \$? = $ac_status" >&5
++  echo "$as_me:25611: \$? = $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:25614: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25614: \$? = $ac_status" >&5
++  echo "$as_me:25617: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -25625,16 +25628,16 @@
+ done
+ 
+ fi
+-echo "$as_me:25628: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:25631: 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:25632: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:25635: 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:25637: checking for db libraries" >&5
++echo "$as_me:25640: 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
+@@ -25664,10 +25667,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:25667: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:25670: testing checking for library $cf_db_libs ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25670 "configure"
++#line 25673 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25722,16 +25725,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25725: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25728: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25728: \$? = $ac_status" >&5
++  echo "$as_me:25731: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25731: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25734: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25734: \$? = $ac_status" >&5
++  echo "$as_me:25737: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -25751,11 +25754,11 @@
+ done
+ 
+ fi
+-echo "$as_me:25754: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:25757: 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:25758: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:25761: 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
+@@ -25781,7 +25784,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:25784: error: Cannot find db.h" >&5
++	{ { echo "$as_me:25787: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -25796,7 +25799,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:25799: checking if we should include stdbool.h" >&5
++echo "$as_me:25802: 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
+@@ -25804,7 +25807,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25807 "configure"
++#line 25810 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -25816,23 +25819,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25819: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25822: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25822: \$? = $ac_status" >&5
++  echo "$as_me:25825: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25825: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25828: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25828: \$? = $ac_status" >&5
++  echo "$as_me:25831: \$? = $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 25835 "configure"
++#line 25838 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -25848,16 +25851,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25851: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25854: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25854: \$? = $ac_status" >&5
++  echo "$as_me:25857: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25857: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25860: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25860: \$? = $ac_status" >&5
++  echo "$as_me:25863: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -25871,13 +25874,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:25874: result: yes" >&5
++then	echo "$as_me:25877: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25876: result: no" >&5
++else	echo "$as_me:25879: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:25880: checking for builtin bool type" >&5
++echo "$as_me:25883: 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
+@@ -25885,7 +25888,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25888 "configure"
++#line 25891 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25900,16 +25903,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25903: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25906: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25906: \$? = $ac_status" >&5
++  echo "$as_me:25909: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25909: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25912: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25912: \$? = $ac_status" >&5
++  echo "$as_me:25915: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -25922,9 +25925,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:25925: result: yes" >&5
++then	echo "$as_me:25928: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25927: result: no" >&5
++else	echo "$as_me:25930: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -25941,10 +25944,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:25944: checking if we already have C++ library" >&5
++	echo "$as_me:25947: 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 25947 "configure"
++#line 25950 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -25958,16 +25961,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25961: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25964: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25964: \$? = $ac_status" >&5
++  echo "$as_me:25967: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25967: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25970: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25970: \$? = $ac_status" >&5
++  echo "$as_me:25973: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -25976,7 +25979,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-	echo "$as_me:25979: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:25982: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -25995,7 +25998,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:25998: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:26001: 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
+@@ -26021,7 +26024,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26024 "configure"
++#line 26027 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -26035,16 +26038,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26038: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26041: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26041: \$? = $ac_status" >&5
++  echo "$as_me:26044: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26044: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26047: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26047: \$? = $ac_status" >&5
++  echo "$as_me:26050: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -26056,7 +26059,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:26059: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:26062: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -26078,7 +26081,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:26081: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:26084: 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
+@@ -26093,15 +26096,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:26096: \"$ac_try\"") >&5
++if { (eval echo "$as_me:26099: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26099: \$? = $ac_status" >&5
++  echo "$as_me:26102: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:26101: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:26104: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26104: \$? = $ac_status" >&5
++  echo "$as_me:26107: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -26112,10 +26115,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+-  echo "$as_me:26115: result: yes" >&5
++  echo "$as_me:26118: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:26118: result: no" >&5
++  echo "$as_me:26121: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -26135,7 +26138,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:26138: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:26141: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -26156,7 +26159,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26159 "configure"
++#line 26162 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -26170,16 +26173,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26173: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26176: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26176: \$? = $ac_status" >&5
++  echo "$as_me:26179: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26179: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26182: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26182: \$? = $ac_status" >&5
++  echo "$as_me:26185: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -26216,7 +26219,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26219 "configure"
++#line 26222 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26230,16 +26233,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26233: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26236: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26236: \$? = $ac_status" >&5
++  echo "$as_me:26239: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26239: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26242: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26242: \$? = $ac_status" >&5
++  echo "$as_me:26245: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -26272,7 +26275,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	LIBS="$cf_save"
+-	echo "$as_me:26275: result: $cf_cxx_library" >&5
++	echo "$as_me:26278: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -26288,7 +26291,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:26291: checking how to run the C++ preprocessor" >&5
++echo "$as_me:26294: 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
+@@ -26305,18 +26308,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 26308 "configure"
++#line 26311 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26313: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26316: \"$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:26319: \$? = $ac_status" >&5
++  echo "$as_me:26322: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26339,17 +26342,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26342 "configure"
++#line 26345 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26346: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26349: \"$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:26352: \$? = $ac_status" >&5
++  echo "$as_me:26355: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26386,7 +26389,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:26389: result: $CXXCPP" >&5
++echo "$as_me:26392: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -26396,18 +26399,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 26399 "configure"
++#line 26402 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26404: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26407: \"$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:26410: \$? = $ac_status" >&5
++  echo "$as_me:26413: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26430,17 +26433,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26433 "configure"
++#line 26436 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26437: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26440: \"$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:26443: \$? = $ac_status" >&5
++  echo "$as_me:26446: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26468,7 +26471,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:26471: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:26474: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -26483,23 +26486,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:26486: checking for $ac_header" >&5
++echo "$as_me:26489: 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 26492 "configure"
++#line 26495 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26496: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26499: \"$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:26502: \$? = $ac_status" >&5
++  echo "$as_me:26505: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26518,7 +26521,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26521: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26524: 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:26537: 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 26540 "configure"
++#line 26543 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26544: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26547: \"$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:26550: \$? = $ac_status" >&5
++  echo "$as_me:26553: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26566,7 +26569,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26569: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26572: 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:26583: 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 26583 "configure"
++#line 26586 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26597,16 +26600,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26600: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26603: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26603: \$? = $ac_status" >&5
++  echo "$as_me:26606: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26606: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26609: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26609: \$? = $ac_status" >&5
++  echo "$as_me:26612: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -26615,7 +26618,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:26618: result: $cf_iostream_namespace" >&5
++	echo "$as_me:26621: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -26626,7 +26629,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:26629: checking if we should include stdbool.h" >&5
++echo "$as_me:26632: 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
+@@ -26634,7 +26637,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26637 "configure"
++#line 26640 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -26646,23 +26649,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26649: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26652: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26652: \$? = $ac_status" >&5
++  echo "$as_me:26655: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26655: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26658: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26658: \$? = $ac_status" >&5
++  echo "$as_me:26661: \$? = $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 26665 "configure"
++#line 26668 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -26678,16 +26681,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26681: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26684: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26684: \$? = $ac_status" >&5
++  echo "$as_me:26687: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26687: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26690: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26690: \$? = $ac_status" >&5
++  echo "$as_me:26693: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -26701,13 +26704,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:26704: result: yes" >&5
++then	echo "$as_me:26707: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:26706: result: no" >&5
++else	echo "$as_me:26709: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:26710: checking for builtin bool type" >&5
++echo "$as_me:26713: 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
+@@ -26715,7 +26718,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26718 "configure"
++#line 26721 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26730,16 +26733,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26733: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26736: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26736: \$? = $ac_status" >&5
++  echo "$as_me:26739: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26739: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26742: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26742: \$? = $ac_status" >&5
++  echo "$as_me:26745: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -26752,19 +26755,19 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:26755: result: yes" >&5
++then	echo "$as_me:26758: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:26757: result: no" >&5
++else	echo "$as_me:26760: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:26761: checking for bool" >&5
++echo "$as_me:26764: 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 26767 "configure"
++#line 26770 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26799,16 +26802,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26802: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26805: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26805: \$? = $ac_status" >&5
++  echo "$as_me:26808: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26808: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26811: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26811: \$? = $ac_status" >&5
++  echo "$as_me:26814: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -26818,10 +26821,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26821: result: $ac_cv_type_bool" >&5
++echo "$as_me:26824: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:26824: checking size of bool" >&5
++echo "$as_me:26827: 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
+@@ -26830,7 +26833,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26833 "configure"
++#line 26836 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26862,21 +26865,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26865: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26868: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26868: \$? = $ac_status" >&5
++  echo "$as_me:26871: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26871: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26874: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26874: \$? = $ac_status" >&5
++  echo "$as_me:26877: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26879 "configure"
++#line 26882 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26908,16 +26911,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26911: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26914: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26914: \$? = $ac_status" >&5
++  echo "$as_me:26917: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26917: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26920: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26920: \$? = $ac_status" >&5
++  echo "$as_me:26923: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -26933,7 +26936,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26936 "configure"
++#line 26939 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26965,16 +26968,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26968: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26971: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26971: \$? = $ac_status" >&5
++  echo "$as_me:26974: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26974: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26977: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26977: \$? = $ac_status" >&5
++  echo "$as_me:26980: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -26990,7 +26993,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 26993 "configure"
++#line 26996 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27022,16 +27025,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27025: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27028: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27028: \$? = $ac_status" >&5
++  echo "$as_me:27031: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27031: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27034: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27034: \$? = $ac_status" >&5
++  echo "$as_me:27037: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27044,12 +27047,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27047: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27050: 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 27052 "configure"
++#line 27055 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27085,15 +27088,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27088: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27091: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27091: \$? = $ac_status" >&5
++  echo "$as_me:27094: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27093: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27096: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27096: \$? = $ac_status" >&5
++  echo "$as_me:27099: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27109,13 +27112,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27112: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27115: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27121: 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
+@@ -27134,7 +27137,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27137 "configure"
++#line 27140 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27175,15 +27178,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27178: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27181: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27181: \$? = $ac_status" >&5
++  echo "$as_me:27184: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27183: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27186: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27186: \$? = $ac_status" >&5
++  echo "$as_me:27189: \$? = $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
+@@ -27200,19 +27203,19 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:27203: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:27206: 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:27210: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:27213: 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:27215: checking for special defines needed for etip.h" >&5
++echo "$as_me:27218: 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"
+@@ -27230,7 +27233,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 27233 "configure"
++#line 27236 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -27244,16 +27247,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27247: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27250: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27250: \$? = $ac_status" >&5
++  echo "$as_me:27253: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27253: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27256: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27256: \$? = $ac_status" >&5
++  echo "$as_me:27259: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:27280: result: ${cf_result:-(none)}" >&5
+ echo "${ECHO_T}${cf_result:-(none)}" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27282: checking if $CXX accepts override keyword" >&5
++echo "$as_me:27285: checking if $CXX accepts override keyword" >&5
+ echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
+ if test "${cf_cv_cpp_override+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27296,7 +27299,7 @@
+   cf_cv_cpp_override=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27299 "configure"
++#line 27302 "configure"
+ #include "confdefs.h"
+ 
+ class base
+@@ -27315,15 +27318,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27318: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27321: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27321: \$? = $ac_status" >&5
++  echo "$as_me:27324: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27323: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27326: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27326: \$? = $ac_status" >&5
++  echo "$as_me:27329: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_override=yes
+ else
+@@ -27342,7 +27345,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27345: result: $cf_cv_cpp_override" >&5
++echo "$as_me:27348: result: $cf_cv_cpp_override" >&5
+ echo "${ECHO_T}$cf_cv_cpp_override" >&6
+ fi
+ test "$cf_cv_cpp_override" = yes &&
+@@ -27351,7 +27354,7 @@
+ EOF
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27354: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:27357: 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
+@@ -27368,7 +27371,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27371 "configure"
++#line 27374 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -27387,15 +27390,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27390: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27393: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27393: \$? = $ac_status" >&5
++  echo "$as_me:27396: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27395: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27398: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27398: \$? = $ac_status" >&5
++  echo "$as_me:27401: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -27414,7 +27417,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27417: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:27420: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -27424,7 +27427,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:27427: checking if $CXX accepts static_cast" >&5
++echo "$as_me:27430: 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
+@@ -27438,7 +27441,7 @@
+ ac_main_return="return"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27441 "configure"
++#line 27444 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -27482,16 +27485,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27485: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27488: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27488: \$? = $ac_status" >&5
++  echo "$as_me:27491: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27491: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27494: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27494: \$? = $ac_status" >&5
++  echo "$as_me:27497: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -27509,7 +27512,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27512: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:27515: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -27557,13 +27560,13 @@
+ 		cf_cv_header_stdbool_h=0
+ 	else
+ 
+-echo "$as_me:27560: checking for bool" >&5
++echo "$as_me:27563: 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 27566 "configure"
++#line 27569 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27598,16 +27601,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27601: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27604: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27604: \$? = $ac_status" >&5
++  echo "$as_me:27607: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27607: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27610: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27610: \$? = $ac_status" >&5
++  echo "$as_me:27613: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -27617,10 +27620,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27620: result: $ac_cv_type_bool" >&5
++echo "$as_me:27623: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:27623: checking size of bool" >&5
++echo "$as_me:27626: 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
+@@ -27629,7 +27632,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27632 "configure"
++#line 27635 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27661,21 +27664,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27664: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27667: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27667: \$? = $ac_status" >&5
++  echo "$as_me:27670: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27670: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27673: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27673: \$? = $ac_status" >&5
++  echo "$as_me:27676: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27678 "configure"
++#line 27681 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27707,16 +27710,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27710: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27713: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27713: \$? = $ac_status" >&5
++  echo "$as_me:27716: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27716: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27719: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27719: \$? = $ac_status" >&5
++  echo "$as_me:27722: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -27732,7 +27735,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27735 "configure"
++#line 27738 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27764,16 +27767,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27767: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27770: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27770: \$? = $ac_status" >&5
++  echo "$as_me:27773: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27773: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27776: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27776: \$? = $ac_status" >&5
++  echo "$as_me:27779: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27789,7 +27792,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 27792 "configure"
++#line 27795 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27821,16 +27824,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27824: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27827: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27827: \$? = $ac_status" >&5
++  echo "$as_me:27830: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27830: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27833: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27833: \$? = $ac_status" >&5
++  echo "$as_me:27836: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27843,12 +27846,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27846: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27849: 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 27851 "configure"
++#line 27854 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27884,15 +27887,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27887: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27890: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27890: \$? = $ac_status" >&5
++  echo "$as_me:27893: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27892: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27895: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27895: \$? = $ac_status" >&5
++  echo "$as_me:27898: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27908,13 +27911,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27911: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27914: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27920: 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
+@@ -27933,7 +27936,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27936 "configure"
++#line 27939 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27974,15 +27977,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27977: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27980: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27980: \$? = $ac_status" >&5
++  echo "$as_me:27983: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27982: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27985: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27985: \$? = $ac_status" >&5
++  echo "$as_me:27988: \$? = $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
+@@ -27999,14 +28002,14 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:28002: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:28005: 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:28009: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:28012: 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
+@@ -28037,7 +28040,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:28040: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:28043: 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
+@@ -28048,7 +28051,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:28051: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:28054: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -28065,10 +28068,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:28068: result: $ADAFLAGS" >&5
++	echo "$as_me:28071: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:28071: checking if GNATPREP supports -T option" >&5
++echo "$as_me:28074: 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
+@@ -28078,11 +28081,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:28081: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:28084: 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:28085: checking if GNAT supports generics" >&5
++echo "$as_me:28088: 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])
+@@ -28092,7 +28095,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:28095: result: $cf_gnat_generics" >&5
++echo "$as_me:28098: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -28104,7 +28107,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:28107: checking if GNAT supports SIGINT" >&5
++echo "$as_me:28110: 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
+@@ -28152,7 +28155,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:28155: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:28158: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -28165,7 +28168,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:28168: checking if GNAT supports project files" >&5
++echo "$as_me:28171: 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]*)
+@@ -28228,15 +28231,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:28231: result: $cf_gnat_projects" >&5
++echo "$as_me:28234: 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:28237: checking if GNAT supports libraries" >&5
++	echo "$as_me:28240: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:28239: result: $cf_gnat_libraries" >&5
++	echo "$as_me:28242: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -28256,7 +28259,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:28259: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:28262: 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
+@@ -28268,7 +28271,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:28271: checking for Ada95 compiler" >&5
++echo "$as_me:28274: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -28279,12 +28282,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:28282: result: $cf_ada_compiler" >&5
++echo "$as_me:28285: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:28287: checking for Ada95 include directory" >&5
++echo "$as_me:28290: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -28318,7 +28321,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28321: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28324: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28327,10 +28330,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:28330: result: $ADA_INCLUDE" >&5
++echo "$as_me:28333: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:28333: checking for Ada95 object directory" >&5
++echo "$as_me:28336: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -28364,7 +28367,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28367: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28370: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28373,10 +28376,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:28376: result: $ADA_OBJECTS" >&5
++echo "$as_me:28379: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:28379: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:28382: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -28397,11 +28400,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:28400: result: $with_ada_sharedlib" >&5
++echo "$as_me:28403: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+-	{ echo "$as_me:28404: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++	{ echo "$as_me:28407: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+ 
+@@ -28419,7 +28422,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:28422: checking for Ada95 curses library name" >&5
++echo "$as_me:28425: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -28435,7 +28438,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28438: result: $ADA_LIBNAME" >&5
++echo "$as_me:28441: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -28446,13 +28449,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:28449: checking for wchar_t" >&5
++	echo "$as_me:28452: 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 28455 "configure"
++#line 28458 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28467,16 +28470,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28470: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28473: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28473: \$? = $ac_status" >&5
++  echo "$as_me:28476: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28476: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28479: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28479: \$? = $ac_status" >&5
++  echo "$as_me:28482: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -28486,10 +28489,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:28489: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:28492: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:28492: checking size of wchar_t" >&5
++echo "$as_me:28495: 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
+@@ -28498,7 +28501,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28501 "configure"
++#line 28504 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28510,21 +28513,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28513: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28516: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28516: \$? = $ac_status" >&5
++  echo "$as_me:28519: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28519: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28522: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28522: \$? = $ac_status" >&5
++  echo "$as_me:28525: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28527 "configure"
++#line 28530 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28536,16 +28539,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28539: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28542: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28542: \$? = $ac_status" >&5
++  echo "$as_me:28545: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28545: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28548: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28548: \$? = $ac_status" >&5
++  echo "$as_me:28551: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -28561,7 +28564,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28564 "configure"
++#line 28567 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28573,16 +28576,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28576: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28579: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28579: \$? = $ac_status" >&5
++  echo "$as_me:28582: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28582: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28585: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28585: \$? = $ac_status" >&5
++  echo "$as_me:28588: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -28598,7 +28601,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 28601 "configure"
++#line 28604 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28610,16 +28613,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28613: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28616: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28616: \$? = $ac_status" >&5
++  echo "$as_me:28619: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28619: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28622: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28622: \$? = $ac_status" >&5
++  echo "$as_me:28625: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -28632,12 +28635,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:28635: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:28638: 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 28640 "configure"
++#line 28643 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28653,15 +28656,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:28656: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28659: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28659: \$? = $ac_status" >&5
++  echo "$as_me:28662: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:28661: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28664: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28664: \$? = $ac_status" >&5
++  echo "$as_me:28667: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -28677,7 +28680,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:28680: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:28683: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&6
+ 
+-echo "${as_me:-configure}:28693: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:28696: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -28708,7 +28711,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:28711: checking for library subsets" >&5
++echo "$as_me:28714: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -28762,7 +28765,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:28765: result: $LIB_SUBSETS" >&5
++echo "$as_me:28768: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -28793,7 +28796,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:28796: checking default library suffix" >&5
++echo "$as_me:28799: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28804,10 +28807,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:28807: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:28810: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:28810: checking default library-dependency suffix" >&5
++echo "$as_me:28813: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -28890,10 +28893,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:28893: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28896: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:28896: checking default object directory" >&5
++echo "$as_me:28899: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28909,11 +28912,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:28912: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28915: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28916: checking c++ library-dependency suffix" >&5
++echo "$as_me:28919: 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++)
+@@ -29006,7 +29009,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:29009: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:29012: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -29182,19 +29185,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:29185: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:29188: 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:29194: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:29197: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:29197: \$? = $ac_status" >&5
++  echo "$as_me:29200: \$? = $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
+@@ -29205,10 +29208,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 29208 "configure"
++#line 29211 "configure"
+ #include "confdefs.h"
+ 
+-#line 29211 "configure"
++#line 29214 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -29223,16 +29226,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:29226: \"$ac_link\"") >&5
++if { (eval echo "$as_me:29229: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:29229: \$? = $ac_status" >&5
++  echo "$as_me:29232: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:29232: \"$ac_try\"") >&5
++  { (eval echo "$as_me:29235: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:29235: \$? = $ac_status" >&5
++  echo "$as_me:29238: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -29255,7 +29258,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:29258: result: $cf_ldflags_static" >&5
++	echo "$as_me:29261: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test "$cf_ldflags_static" != yes
+@@ -29271,7 +29274,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29274: checking where we will install curses.h" >&5
++echo "$as_me:29277: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -29281,7 +29284,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:29284: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:29287: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -29289,7 +29292,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:29292: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:29295: 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
+@@ -29314,7 +29317,7 @@
+ 
+ # pkgsrc uses these
+ 
+-echo "$as_me:29317: checking for desired basename for form library" >&5
++echo "$as_me:29320: 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.
+@@ -29334,10 +29337,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29337: result: $FORM_NAME" >&5
++echo "$as_me:29340: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:29340: checking for desired basename for menu library" >&5
++echo "$as_me:29343: 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.
+@@ -29357,10 +29360,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29360: result: $MENU_NAME" >&5
++echo "$as_me:29363: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:29363: checking for desired basename for panel library" >&5
++echo "$as_me:29366: 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.
+@@ -29380,10 +29383,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29383: result: $PANEL_NAME" >&5
++echo "$as_me:29386: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:29386: checking for desired basename for cxx library" >&5
++echo "$as_me:29389: 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.
+@@ -29403,13 +29406,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29406: result: $CXX_NAME" >&5
++echo "$as_me:29409: 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:29412: checking for src modules" >&5
++echo "$as_me:29415: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -29468,7 +29471,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:29471: result: $cf_cv_src_modules" >&5
++echo "$as_me:29474: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -29629,7 +29632,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:29632: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:29635: 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//'`
+@@ -29640,7 +29643,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:29643: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
++echo "$as_me:29646: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -29656,7 +29659,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:29659: result: $PKG_CFLAGS" >&5
++echo "$as_me:29662: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ case "$cf_cv_system_name" in
+@@ -29728,7 +29731,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
+ 
+-echo "${as_me:-configure}:29731: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
++echo "${as_me:-configure}:29734: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+ 
+ fi
+ 
+@@ -29755,7 +29758,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:29758: checking for linker search path" >&5
++echo "$as_me:29761: 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
+@@ -29803,7 +29806,7 @@
+ 			cf_pathlist="$cf_pathlist /lib /usr/lib"
+ 			;;
+ 		(*)
+-			{ echo "$as_me:29806: WARNING: problem with Solaris architecture" >&5
++			{ echo "$as_me:29809: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ 			;;
+ 		esac
+@@ -29844,7 +29847,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:29847: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29850: 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'`
+@@ -29930,7 +29933,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29933: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29936: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -30111,7 +30114,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:30114: error: ambiguous option: $1
++    { { echo "$as_me:30117: 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;}
+@@ -30130,7 +30133,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:30133: error: unrecognized option: $1
++  -*) { { echo "$as_me:30136: 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;}
+@@ -30262,7 +30265,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:30265: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:30268: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -30578,6 +30581,7 @@
+ s,@HAVE_VSSCANF@,$HAVE_VSSCANF,;t t
+ s,@TEST_LIBS@,$TEST_LIBS,;t t
+ s,@TEST_LIBS2@,$TEST_LIBS2,;t t
++s,@cf_cv_cc_bool_type@,$cf_cv_cc_bool_type,;t t
+ s,@CXXCPP@,$CXXCPP,;t t
+ s,@CXXLDFLAGS@,$CXXLDFLAGS,;t t
+ s,@CXX_AR@,$CXX_AR,;t t
+@@ -30787,7 +30791,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:30790: creating $ac_file" >&5
++    { echo "$as_me:30794: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -30805,7 +30809,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30808: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30812: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -30818,7 +30822,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30821: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30825: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30834,7 +30838,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:30837: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:30841: 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;}
+@@ -30843,7 +30847,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:30846: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:30850: 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;}
+@@ -30888,7 +30892,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:30891: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:30895: 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;}
+@@ -30899,7 +30903,7 @@
+     $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:30902: WARNING: Some variables may not be substituted:
++      { echo "$as_me:30906: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30948,7 +30952,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:30951: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:30955: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -30959,7 +30963,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30962: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30966: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -30972,7 +30976,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30975: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30979: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -31030,7 +31034,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:31033: $ac_file is unchanged" >&5
++      { echo "$as_me:31037: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -31417,7 +31421,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}:31420: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:31424: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: configure.in
+Prereq:  1.788 
+--- ncurses-6.5-20241221+/configure.in	2024-12-14 21:14:32.000000000 +0000
++++ ncurses-6.5-20241228/configure.in	2024-12-29 00:50:56.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.788 2024/12/14 21:14:32 tom Exp $
++dnl $Id: configure.in,v 1.789 2024/12/29 00:50:56 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.788 $)
++AC_REVISION($Revision: 1.789 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -1901,6 +1901,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ CF_BOOL_DECL(cf_cv_cc_bool_type)
++AC_SUBST(cf_cv_cc_bool_type)
+ 
+ # Check for C++ compiler characteristics (and ensure that it's there!)
+ if test -n "$CXX" ; then
+Index: dist.mk
+Prereq:  1.1646 
+--- ncurses-6.5-20241221+/dist.mk	2024-12-21 10:55:02.000000000 +0000
++++ ncurses-6.5-20241228/dist.mk	2024-12-28 11:24:50.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1646 2024/12/21 10:55:02 tom Exp $
++# $Id: dist.mk,v 1.1647 2024/12/28 11:24: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 = 5
+-NCURSES_PATCH = 20241221
++NCURSES_PATCH = 20241228
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/curs_add_wch.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_add_wch.3x.html	2024-07-27 23:11:30.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_add_wch.3x.html	2024-12-28 21:43:55.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_add_wch.3x,v 1.71 2024/07/27 20:05:18 tom Exp @
++  * @Id: curs_add_wch.3x,v 1.74 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_add_wch 3x 2024-07-27 ncurses 6.5 Library calls
++curs_add_wch 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                      curs_add_wch 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                                      
++
                                                                                                                                                      curs_add_wch 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                      
+ 
                                                                                                                                                      + curs_add_wch(3x)                 Library calls                curs_add_wch(3x)
+ 
+@@ -120,7 +120,11 @@
+        itself, but its wunctrl(3x) representation.
+ 
+        A cchar_t can be copied from  place  to  place  using  win_wch(3x)  and
+-       wadd_wch.
++       wadd_wch.   See  curs_attr(3x)  for values of predefined constants that
++       can be usefully "or"ed with  characters.   A  complex  character  whose
++       character  component  is  a  wide  space,  and  whose only attribute is
++       WA_NORMAL, is a  blank  character,  and  therefore  combines  with  the
++       background character; see curs_bkgrnd(3x).
+ 
+ 
+ 
                                                                                                                                                      wecho_wchar
                                                                                                                                                      +@@ -175,11 +179,11 @@
+        WACS_S7         0x23bc    -         r      scan line 7
+        WACS_S9         0x23bd    _         s      scan line 9
+        WACS_STERLING   0x00a3    f         }      pound-sterling symbol
++
+        WACS_TTEE       0x252c    +         w      top tee
+        WACS_UARROW     0x2191    ^         -      arrow pointing up
+        WACS_ULCORNER   0x250c    +         l      upper left-hand corner
+        WACS_URCORNER   0x2510    +         k      upper right-hand corner
+-
+        WACS_VLINE      0x2502    |         x      vertical line
+ 
+        The wide-character configuration of ncurses also  defines  symbols  for
+@@ -233,7 +237,7 @@
+        These functions return OK on success and ERR on failure.   In  ncurses,
+        wadd_wch returns ERR if
+ 
+-       o   win is NULL,
++       o   win is NULL,
+ 
+        o   wrapping  to  a new line is impossible because scrollok(3x) has not
+            been called on win when writing to its  bottom  right  location  is
+@@ -359,12 +363,12 @@
+        its non-wide-character configuration.
+ 
+        curses(3x),   curs_addwstr(3x),   curs_add_wchstr(3x),   curs_attr(3x),
+-       curs_clear(3x),  curs_getcchar(3x), curs_outopts(3x), curs_refresh(3x),
+-       curs_variables(3x), putwc(3)
++       curs_bkgrnd(3x),  curs_clear(3x),  curs_getcchar(3x), curs_outopts(3x),
++       curs_refresh(3x), curs_variables(3x), putwc(3)
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                  curs_add_wch(3x)
++ncurses 6.5                       2024-12-28                  curs_add_wch(3x)
+ 
                                                                                                                                                      
+ 
                                                                                                                                                      
+ 
                                                                                                                                                        
+Index: doc/html/man/curs_add_wchstr.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_add_wchstr.3x.html	2024-07-27 23:11:31.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_add_wchstr.3x.html	2024-12-28 21:43:55.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_add_wchstr.3x,v 1.44 2024/07/27 20:05:18 tom Exp @
++  * @Id: curs_add_wchstr.3x,v 1.46 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_add_wchstr 3x 2024-07-27 ncurses 6.5 Library calls
++curs_add_wchstr 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                        curs_add_wchstr 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                                        
++
                                                                                                                                                        curs_add_wchstr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                        
+ 
                                                                                                                                                        + curs_add_wchstr(3x)              Library calls             curs_add_wchstr(3x)
+ 
+@@ -95,9 +95,9 @@
+ 
+        In ncurses, they return ERR if
+ 
+-       o   win is NULL or
++       o   win is NULL or
+ 
+-       o   wchstr is NULL.
++       o   wchstr is NULL.
+ 
+        Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+@@ -130,7 +130,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27               curs_add_wchstr(3x)
++ncurses 6.5                       2024-12-28               curs_add_wchstr(3x)
+ 
                                                                                                                                                        
+ 
                                                                                                                                                        
+ 
                                                                                                                                                          
+Index: doc/html/man/curs_addch.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_addch.3x.html	2024-09-21 18:35:26.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_addch.3x.html	2024-12-28 21:43:55.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addch.3x,v 1.100 2024/09/21 18:03:23 tom Exp @
++  * @Id: curs_addch.3x,v 1.103 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addch 3x 2024-09-21 ncurses 6.5 Library calls
++curs_addch 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                          curs_addch 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                          
++
                                                                                                                                                          curs_addch 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                          
+ 
                                                                                                                                                          + curs_addch(3x)                   Library calls                  curs_addch(3x)
+ 
+@@ -105,28 +105,31 @@
+        The  object or expression ch may contain attributes and/or a color pair
+        identifier.  (A  chtype  can  be  copied  from  place  to  place  using
+        winch(3x)  and  waddch.)   See  curs_attr(3x)  for values of predefined
+-       constants that can be usefully "or"ed with characters.
++       constants that can be usefully "or"ed  with  characters.   A  ch  whose
++       character  component  is a space, and whose only attribute is A_NORMAL,
++       is a blank  character,  and  therefore  combines  with  the  background
++       character; see curs_bkgd(3x).
+ 
+ 
+ 
                                                                                                                                                          wechochar
                                                                                                                                                          +-       echochar and wechochar are equivalent to calling (w)addch  followed  by
+-       (w)refresh.   curses  interprets  these  functions  as  a  hint  to its
+-       optimizer that only a single character cell  in  the  window  is  being
+-       altered  between  refreshes; for non-control characters, a considerable
++       echochar  and  wechochar are equivalent to calling (w)addch followed by
++       (w)refresh.  curses  interprets  these  functions  as  a  hint  to  its
++       optimizer  that  only  a  single  character cell in the window is being
++       altered between refreshes; for non-control characters,  a  considerable
+        performance gain may be enjoyed by employing them.
+ 
+ 
+ 
                                                                                                                                                          Forms-Drawing Characters
                                                                                                                                                          +-       curses defines macros starting with ACS_ that can be used  with  waddch
+-       to  write  line-drawing  and  other  special  characters to the screen.
+-       ncurses terms these forms-drawing characters.  The ACS  default  listed
+-       below  is  used  if  the  acs_chars (acsc) terminfo capability does not
+-       define a terminal-specific replacement for it, or if the  terminal  and
+-       locale  configuration  requires  Unicode to access these characters but
++       curses  defines  macros starting with ACS_ that can be used with waddch
++       to write line-drawing and  other  special  characters  to  the  screen.
++       ncurses  terms  these forms-drawing characters.  The ACS default listed
++       below is used if the acs_chars  (acsc)  terminfo  capability  does  not
++       define  a  terminal-specific replacement for it, or if the terminal and
++       locale configuration requires Unicode to access  these  characters  but
+        the  library  is  unable  to  use  Unicode.   The  "acsc  char"  column
+        corresponds to how the characters are specified in the acs_chars (acsc)
+        string capability, and the characters in it may appear on the screen if
+-       the  terminal type's database entry incorrectly advertises ACS support.
++       the terminal type's database entry incorrectly advertises ACS  support.
+        The name "ACS" originates in the Alternate Character Set feature of the
+        DEC VT100 terminal.
+ 
+@@ -172,26 +175,26 @@
+ 
+        In ncurses, waddch returns ERR if
+ 
+-       o   win is NULL,
++       o   win is NULL,
+ 
+-       o   wrapping  to  a new line is impossible because scrollok(3x) has not
+-           been called on win when a write to its  bottom  right  location  is
++       o   wrapping to a new line is impossible because scrollok(3x)  has  not
++           been  called  on  win  when a write to its bottom right location is
+            attempted, or
+ 
+-       o   it  is  not  possible  to  add  a  complete character at the cursor
++       o   it is not possible to  add  a  complete  character  at  the  cursor
+            position.
+ 
+        The last may be due to different causes:
+ 
+-       o   conversion of a wide character to a  multibyte  character  sequence
++       o   conversion  of  a  wide character to a multibyte character sequence
+            can fail, or
+ 
+-       o   at  least one of the bytes resulting from wide character conversion
+-           to a multibyte character sequence cannot be added  to  the  window.
+-           See  section  "PORTABILITY"  below regarding the use of waddch with
++       o   at least one of the bytes resulting from wide character  conversion
++           to  a  multibyte  character sequence cannot be added to the window.
++           See section "PORTABILITY" below regarding the use  of  waddch  with
+            wide characters.
+ 
+-       Functions prefixed with "mv" first perform cursor movement and fail  if
++       Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+@@ -202,7 +205,7 @@
+ 
                                                                                                                                                          EXTENSIONS
                                                                                                                                                          + 
+ 
                                                                                                                                                          TABSIZE
                                                                                                                                                          +-       SVr4  and  other versions of curses implement the TABSIZE variable, but
++       SVr4 and other versions of curses implement the TABSIZE  variable,  but
+        X/Open Curses does not specify it; see curs_variables(3x).
+ 
+ 
+@@ -210,90 +213,90 @@
+        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
++       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+        error conditions for them.
+ 
+-       SVr4 curses describes a successful return value  only  as  "an  integer
++       SVr4  curses  describes  a  successful return value only as "an integer
+        value other than ERR".
+ 
+-       The  defaults specified for forms-drawing characters apply in the POSIX
++       The defaults specified for forms-drawing characters apply in the  POSIX
+        locale.
+ 
+ 
+ 
                                                                                                                                                          ACS Symbols
                                                                                                                                                          +-       X/Open Curses states that the  ACS_  definitions  are  char  constants.
++       X/Open  Curses  states  that  the  ACS_ definitions are char constants.
+        Some implementations are problematic.
+ 
+-       o   Solaris  curses, for example, defines the ACS symbols as constants;
++       o   Solaris curses, for example, defines the ACS symbols as  constants;
+            others define them as elements of an array.
+ 
+-           This implementation uses an array, acs_map,  as  did  SVr4  curses.
++           This  implementation  uses  an  array, acs_map, as did SVr4 curses.
+            NetBSD also uses an array, actually named _acs_char, with a #define
+            for compatibility.
+ 
+-       o   HP-UX curses equates some of the  ACS_  symbols  to  the  analogous
+-           WACS_  symbols  as  if  the  ACS_ symbols were wide characters (see
+-           curs_add_wch(3x)).  The  misdefined  symbols  are  the  arrows  and
++       o   HP-UX  curses  equates  some  of  the ACS_ symbols to the analogous
++           WACS_ symbols as if the ACS_  symbols  were  wide  characters  (see
++           curs_add_wch(3x)).   The  misdefined  symbols  are  the  arrows and
+            others that are not used for line drawing.
+ 
+-       o   X/Open  Curses  (Issues  2 through 7) has a typographical error for
+-           the ACS_LANTERN symbol, equating  its  "VT100+  Character"  to  "I"
+-           (capital  I),  while  the  header  files  for SVr4 curses and other
++       o   X/Open Curses (Issues 2 through 7) has a  typographical  error  for
++           the  ACS_LANTERN  symbol,  equating  its  "VT100+ Character" to "I"
++           (capital I), while the header  files  for  SVr4  curses  and  other
+            implementations use "i" (small i).
+ 
+-           None of the terminal descriptions on Unix platforms  use  uppercase
+-           I,  except  for  Solaris  (in  its  terminfo  entry  for screen(1),
+-           apparently based on the X/Open documentation around 1995).  On  the
+-           other  hand,  its gs6300 (AT&T PC6300 with EMOTS Terminal Emulator)
++           None  of  the terminal descriptions on Unix platforms use uppercase
++           I, except  for  Solaris  (in  its  terminfo  entry  for  screen(1),
++           apparently  based on the X/Open documentation around 1995).  On the
++           other hand, its gs6300 (AT&T PC6300 with EMOTS  Terminal  Emulator)
+            description uses lowercase i.
+ 
+-       Some ACS  symbols  (ACS_S3,  ACS_S7,  ACS_LEQUAL,  ACS_GEQUAL,  ACS_PI,
+-       ACS_NEQUAL,  and  ACS_STERLING)  were  not  documented  in any publicly
+-       released System V.  However, many publicly available  terminfo  entries
+-       include  acsc  capabilities in which their key characters (pryz{|}) are
+-       embedded, and a second-hand list of their  character  descriptions  has
+-       come  to light.  The ncurses developers invented ACS-prefixed names for
++       Some  ACS  symbols  (ACS_S3,  ACS_S7,  ACS_LEQUAL,  ACS_GEQUAL, ACS_PI,
++       ACS_NEQUAL, and ACS_STERLING)  were  not  documented  in  any  publicly
++       released  System V.   However, many publicly available terminfo entries
++       include acsc capabilities in which their key characters  (pryz{|})  are
++       embedded,  and  a  second-hand list of their character descriptions has
++       come to light.  The ncurses developers invented ACS-prefixed names  for
+        them.
+ 
+        The displayed values of ACS_ constants depend on
+ 
+        o   the  ncurses  ABI--for  example,  wide-character  versus  non-wide-
+-           character  configurations  (the  former  is  capable  of displaying
++           character configurations  (the  former  is  capable  of  displaying
+            Unicode while the latter is not), and
+ 
+        o   whether the locale uses UTF-8 encoding.
+ 
+-       In certain cases, the  terminal  is  unable  to  display  forms-drawing
+-       characters   except   by   using  UTF-8;  see  the  discussion  of  the
++       In  certain  cases,  the  terminal  is  unable to display forms-drawing
++       characters  except  by  using  UTF-8;  see  the   discussion   of   the
+        NCURSES_NO_UTF8_ACS environment variable in ncurses(3x).
+ 
+ 
+ 
                                                                                                                                                          Character Set
                                                                                                                                                          +-       X/Open Curses assumes that the parameter passed to  waddch  contains  a
+-       single  character.   That  character may have been more than eight bits
+-       wide in an SVr3 or SVr4 implementation, but X/Open  Curses  leaves  the
+-       width  of  a non-wide character code unspecified.  The standard further
+-       does not specify the internal structure of a chtype, though the use  of
+-       bit  operations  to  combine  the  character code with attributes and a
++       X/Open  Curses  assumes  that the parameter passed to waddch contains a
++       single character.  That character may have been more  than  eight  bits
++       wide  in  an  SVr3 or SVr4 implementation, but X/Open Curses leaves the
++       width of a non-wide character code unspecified.  The  standard  further
++       does  not specify the internal structure of a chtype, though the use of
++       bit operations to combine the character  code  with  attributes  and  a
+        color pair identifier into a chtype for passage to waddch is common.  A
+        portable application uses only the macros discussed in curs_attr(3x) to
+        manipulate a chtype.
+ 
+        In ncurses, chtype holds an eight-bit character, but the library allows
+-       a  multibyte  character sequence to be passed via a succession of calls
+-       to waddch.  Other implementations  do  not;  a  waddch  call  transmits
+-       exactly  one  character,  which  may  be rendered in one or more screen
+-       locations depending  on  whether  it  is  printable  (see  unctrl(3x)).
+-       Depending  on  the  locale,  ncurses  inspects  the byte passed in each
+-       waddch call and checks whether the latest call  continues  a  multibyte
+-       character.    When  a  character  is  complete,  ncurses  displays  the
+-       character  and  advances  the  cursor.   If  the  calling   application
++       a multibyte character sequence to be passed via a succession  of  calls
++       to  waddch.   Other  implementations  do  not;  a waddch call transmits
++       exactly one character, which may be rendered  in  one  or  more  screen
++       locations  depending  on  whether  it  is  printable  (see unctrl(3x)).
++       Depending on the locale, ncurses  inspects  the  byte  passed  in  each
++       waddch  call  and  checks whether the latest call continues a multibyte
++       character.   When  a  character  is  complete,  ncurses  displays   the
++       character   and  advances  the  cursor.   If  the  calling  application
+        interrupts the succession of bytes in a multibyte character sequence by
+-       changing the current  location--for  example,  with  wmove(3x)--ncurses
++       changing  the  current  location--for  example, with wmove(3x)--ncurses
+        discards the incomplete character.
+ 
+        For  portability  to  other  implementations,  do  not  rely  upon  the
+-       foregoing behavior.  Check whether a character can be represented as  a
++       foregoing  behavior.  Check whether a character can be represented as a
+        single byte in the current locale.
+ 
+        o   If it can, call either waddch or wadd_wch.
+@@ -308,16 +311,16 @@
+ 
+ 
+ 
                                                                                                                                                          SEE ALSO
                                                                                                                                                          +-       curs_add_wch(3x)  describes comparable functions of the ncurses library
++       curs_add_wch(3x) describes comparable functions of the ncurses  library
+        in its wide-character configuration (ncursesw).
+ 
+        curses(3x),    curs_addchstr(3x),    curs_addstr(3x),    curs_attr(3x),
+-       curs_clear(3x),   curs_inch(3x),   curs_outopts(3x),  curs_refresh(3x),
+-       curs_variables(3x), putchar(3)
++       curs_bkgd(3x),   curs_clear(3x),    curs_inch(3x),    curs_outopts(3x),
++       curs_refresh(3x), curs_variables(3x), putchar(3)
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-21                    curs_addch(3x)
++ncurses 6.5                       2024-12-28                    curs_addch(3x)
+ 
                                                                                                                                                          
+ 
                                                                                                                                                          
+ 
                                                                                                                                                            
+Index: doc/html/man/curs_addchstr.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_addchstr.3x.html	2024-07-27 23:11:31.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_addchstr.3x.html	2024-12-28 21:43:55.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addchstr.3x,v 1.50 2024/07/27 20:05:41 tom Exp @
++  * @Id: curs_addchstr.3x,v 1.52 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addchstr 3x 2024-07-27 ncurses 6.5 Library calls
++curs_addchstr 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                            curs_addchstr 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                                            
++
                                                                                                                                                            curs_addchstr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                            
+ 
                                                                                                                                                            + curs_addchstr(3x)                Library calls               curs_addchstr(3x)
+ 
+@@ -91,9 +91,9 @@
+ 
+        In ncurses, they return ERR if
+ 
+-       o   win is NULL or
++       o   win is NULL or
+ 
+-       o   chstr is NULL.
++       o   chstr is NULL.
+ 
+        Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+@@ -120,7 +120,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                 curs_addchstr(3x)
++ncurses 6.5                       2024-12-28                 curs_addchstr(3x)
+ 
                                                                                                                                                            
+ 
                                                                                                                                                            
+ 
                                                                                                                                                              
+Index: doc/html/man/curs_addstr.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_addstr.3x.html	2024-07-27 23:11:31.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_addstr.3x.html	2024-12-28 21:43:55.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addstr.3x,v 1.55 2024/07/27 19:48:04 tom Exp @
++  * @Id: curs_addstr.3x,v 1.57 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addstr 3x 2024-07-27 ncurses 6.5 Library calls
++curs_addstr 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                              curs_addstr 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                                              
++
                                                                                                                                                              curs_addstr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                              
+ 
                                                                                                                                                              + curs_addstr(3x)                  Library calls                 curs_addstr(3x)
+ 
+@@ -80,9 +80,9 @@
+ 
+        In ncurses, they return ERR if
+ 
+-       o   win is NULL,
++       o   win is NULL,
+ 
+-       o   str is NULL, or
++       o   str is NULL, or
+ 
+        o   an internal waddch(3x) call returns ERR.
+ 
+@@ -115,7 +115,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                   curs_addstr(3x)
++ncurses 6.5                       2024-12-28                   curs_addstr(3x)
+ 
                                                                                                                                                              
+ 
                                                                                                                                                              
+ 
                                                                                                                                                                
+Index: doc/html/man/curs_addwstr.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_addwstr.3x.html	2024-07-27 23:11:31.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_addwstr.3x.html	2024-12-28 21:43:55.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addwstr.3x,v 1.45 2024/07/27 20:05:18 tom Exp @
++  * @Id: curs_addwstr.3x,v 1.47 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addwstr 3x 2024-07-27 ncurses 6.5 Library calls
++curs_addwstr 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                curs_addwstr 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                                                
++
                                                                                                                                                                curs_addwstr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                
+ 
                                                                                                                                                                + curs_addwstr(3x)                 Library calls                curs_addwstr(3x)
+ 
+@@ -84,9 +84,9 @@
+ 
+        In ncurses, they return ERR if
+ 
+-       o   win is NULL,
++       o   win is NULL,
+ 
+-       o   wstr is NULL, or
++       o   wstr is NULL, or
+ 
+        o   an internal wadd_wch(3x) call returns ERR.
+ 
+@@ -116,7 +116,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                  curs_addwstr(3x)
++ncurses 6.5                       2024-12-28                  curs_addwstr(3x)
+ 
                                                                                                                                                                
+ 
                                                                                                                                                                
+ 
                                                                                                                                                                  
+Index: doc/html/man/curs_attr.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_attr.3x.html	2024-09-22 18:37:10.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_attr.3x.html	2024-12-28 21:43:55.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_attr.3x,v 1.113 2024/09/21 23:39:04 tom Exp @
++  * @Id: curs_attr.3x,v 1.115 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_attr 3x 2024-09-21 ncurses 6.5 Library calls
++curs_attr 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                  curs_attr 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                                  
++
                                                                                                                                                                  curs_attr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                  
+ 
                                                                                                                                                                  + curs_attr(3x)                    Library calls                   curs_attr(3x)
+ 
+@@ -245,11 +245,11 @@
+ 
                                                                                                                                                                  RETURN VALUE
                                                                                                                                                                  +        These functions return OK on success and ERR on failure.
+ 
+-       In ncurses, they return ERR if win is NULL.
++       In ncurses, they return ERR if win is NULL.
+ 
+        wcolor_set returns ERR if pair is outside the range 0..COLOR_PAIRS-1.
+ 
+-       wattr_get does not fail if its attrs or pair parameter is NULL.
++       wattr_get does not fail if its attrs or pair parameter is NULL.
+ 
+        Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+@@ -278,7 +278,7 @@
+ 
+        Each  of  the functions added by XSI Curses has a parameter opts, which
+        X/Open Curses  still  (after  more  than  twenty  years)  documents  as
+-       reserved  for  future  use,  saying  that  it  should  be  NULL.   This
++       reserved  for  future  use,  saying  that  it  should  be  NULL.   This
+        implementation uses that parameter in ABI 6  for  the  functions  which
+        have a color pair parameter to support extended color pairs:
+ 
+@@ -292,7 +292,7 @@
+            standard pointer to short parameter.
+ 
+        o   For functions which turn attributes off, e.g., wattr_off, the  opts
+-           parameter is ignored except except to check that it is NULL.
++           parameter is ignored except except to check that it is NULL.
+ 
+ 
+ 
                                                                                                                                                                  PORTABILITY
                                                                                                                                                                  +@@ -497,7 +497,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-21                     curs_attr(3x)
++ncurses 6.5                       2024-12-28                     curs_attr(3x)
+ 
                                                                                                                                                                  
+ 
                                                                                                                                                                  
+ 
                                                                                                                                                                    
+Index: doc/html/man/curs_bkgd.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_bkgd.3x.html	2024-09-22 18:37:10.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_bkgd.3x.html	2024-12-28 21:43:55.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_bkgd.3x,v 1.64 2024/09/22 18:16:03 tom Exp @
++  * @Id: curs_bkgd.3x,v 1.67 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_bkgd 3x 2024-09-22 ncurses 6.5 Library calls
++curs_bkgd 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                    curs_bkgd 3x 2024-09-22 ncurses 6.5 Library calls
                                                                                                                                                                    
++
                                                                                                                                                                    curs_bkgd 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                    
+ 
                                                                                                                                                                    + curs_bkgd(3x)                    Library calls                   curs_bkgd(3x)
+ 
+@@ -71,21 +71,21 @@
+ 
+        When  erasing  parts  of  the  screen,  curses fills the cells with the
+        background character.  curses also  uses  the  window  background  when
+-       writing characters to the screen:
++       writing characters to the screen.
+ 
+-       o   The attribute part of the background is combined with all non-blank
+-           characters that are written into the window, as with the waddch(3x)
+-           and winsch(3x) families of functions.
++       o   The  attribute  part  of the background combines with all non-blank
++           characters written into the window,  as  with  the  waddch(3x)  and
++           winsch(3x) families of functions.
+ 
+-       o   Both  the  character  and  attribute  parts  of  the background are
+-           combined with blank characters that are written into the window.
++       o   Both  the  character  and attribute parts of the background combine
++           with blank characters that are written into the window.
+ 
+        The background becomes a property of the character and  moves  with  it
+        through any scrolling and insert/delete line/character operations.
+ 
+-       To  the  extent possible on a given terminal, the attribute part of the
+-       background is displayed as the graphic rendition of the  character  put
+-       on the screen.
++       To  the  extent  possible  on  a  given  terminal,  curses displays the
++       attributes of the background as the graphic rendition of the  character
++       put on the screen.
+ 
+ 
+ 
                                                                                                                                                                    bkgd, wbkgd
                                                                                                                                                                    +@@ -100,15 +100,15 @@
+            new background character.
+ 
+        ncurses  updates  the rendition of each character cell by comparing the
+-       character, non-color attributes, and colors.  The  library  applies  to
+-       following  procedure  to  each cell in the window, whether or not it is
+-       blank.
++       character, non-color attributes, and color pair selection.  The library
++       applies  the following procedure to each cell in the window, whether or
++       not it is blank.
+ 
+        o   ncurses first compares  the  cell's  character  to  the  previously
+            specified  background  character; if they match, ncurses writes the
+            new background character to the cell.
+ 
+-       o   ncurses then checks if the cell uses color, that is, its color pair
++       o   ncurses then checks if the cell uses color; that is, its color pair
+            value  is  nonzero.   If not, it simply replaces the attributes and
+            color  pair  in  the  cell  with  those  from  the  new  background
+            character.
+@@ -125,9 +125,9 @@
+            the current background, and then adding  attributes  from  the  new
+            background.
+ 
+-       If the new background's character is nonspacing, ncurses reuses the old
+-       background character, except for one special  case:  ncurses  treats  a
+-       background character value of zero (0) as a space.
++       If  the  new  background's character is nonspacing, ncurses retains the
++       existing background character, except for  one  special  case:  ncurses
++       treats a background character value of zero (0) as a space.
+ 
+        If  the  terminal  does  not  support  color,  or if color has not been
+        initialized with start_color(3x), ncurses ignores  the  new  background
+@@ -141,19 +141,21 @@
+ 
+ 
+ 
                                                                                                                                                                    getbkgd
                                                                                                                                                                    +-       getbkgd  obtains  the given window's background character and attribute
+-       combination.
++       getbkgd  returns  the  given window's background character, attributes,
++       and color pair as a chtype.
+ 
+ 
+ 
                                                                                                                                                                    RETURN VALUE
                                                                                                                                                                    +-       Functions returning an int return OK on success.  bkgd returns  ERR  if
+-       the  library has not been initialized.  wbkgd and getbkgd return ERR if
+-       a WINDOW pointer argument is null.
++       bkgdset and wbkgdset do not return a value
+ 
+-       bkgdset and wbkgdset do not return a value.
++       Functions returning an int return ERR upon failure and OK upon success.
++       In ncurses, failure occurs if
+ 
+-       getbkgd  returns  a  window's  background   character   and   attribute
+-       combination.
++       o   if the library has not been initialized, or
++
++       o   if win is NULL.
++
++       getbkgd's return value is as described above.
+ 
+ 
+ 
                                                                                                                                                                    NOTES
                                                                                                                                                                    +@@ -164,28 +166,32 @@
+ 
+        X/Open Curses mentions that the character part of the  background  must
+        be  a  single-byte  value.  ncurses, like SVr4 curses, checks to ensure
+-       that, and will reuse the old background character if the check fails.
++       that, and retains the existing background character if the check fails.
+ 
+ 
+ 
                                                                                                                                                                    PORTABILITY
                                                                                                                                                                    +-       X/Open Curses, Issue 4 describes these functions.   It  specifies  that
+-       bkgd,  wbkgd,  and  getbkgd  return  ERR on failure (in the case of the
+-       last,  this  value  is  cast  to  chtype),  but  describes  no  failure
+-       conditions.
++       X/Open Curses, Issue 4 describes these functions.   It  indicates  that
++       bkgd,  wbkgd,  and  getbkgd  return  ERR on failure (in the case of the
++       last, this value is cast to chtype), but specifies no error  conditions
++       for them.
+ 
+-       The  SVr4.0  manual  says  that bkgd and wbkgd may return OK "or a non-
++       SVr4  documentation  says  that  bkgd  and  wbkgd  return OK "or a non-
+        negative integer if immedok is set", which refers to the  return  value
+-       from  wrefresh(3x),  used  to implement the immediate repainting.  SVr4
+-       curses's wrefresh returns the  number  of  characters  written  to  the
+-       screen during the refresh.  ncurses does not do that.
++       from  wrefresh(),  used  to  implement  the immediate repainting.  SVr4
++       curses's wrefresh returns the  number  of  characters  written  to  the
++       screen during the refresh; that of ncurses does not.
+ 
+        Neither  X/Open  Curses  nor  the  SVr4  manual  pages  detail  how the
+-       rendition of characters on  the  screen  updates  when  bkgd  or  wbkgd
++       rendition of characters on  the  screen  updates  when  bkgd  or  wbkgd
+        changes  the background character.  ncurses, like SVr4 curses, does not
+        (in  its  non-wide  configuration)  store  the  background  and  window
+        attribute contributions to each character cell separately.
+ 
+ 
++
                                                                                                                                                                    HISTORY
                                                                                                                                                                    ++       SVr3.1 (1987) introduced these functions.
++
++
+ 
                                                                                                                                                                    SEE ALSO
                                                                                                                                                                    +        curs_bkgrnd(3x)  describes  the  corresponding  functions  in  the wide
+        configuration of ncurses.
+@@ -194,7 +200,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-22                     curs_bkgd(3x)
++ncurses 6.5                       2024-12-28                     curs_bkgd(3x)
+ 
                                                                                                                                                                    
+ 
                                                                                                                                                                    
+ 
+ 
                                                                                                                                                                    
+Index: doc/html/man/curs_bkgrnd.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_bkgrnd.3x.html	2024-09-22 18:37:10.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_bkgrnd.3x.html	2024-12-28 21:43:55.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_bkgrnd.3x,v 1.46 2024/09/22 18:23:50 tom Exp @
++  * @Id: curs_bkgrnd.3x,v 1.49 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_bkgrnd 3x 2024-09-22 ncurses 6.5 Library calls
++curs_bkgrnd 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                    curs_bkgrnd 3x 2024-09-22 ncurses 6.5 Library calls
                                                                                                                                                                    
++
                                                                                                                                                                    curs_bkgrnd 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                    
+ 
                                                                                                                                                                    + curs_bkgrnd(3x)                  Library calls                 curs_bkgrnd(3x)
+ 
+@@ -67,26 +67,26 @@
+ 
                                                                                                                                                                    DESCRIPTION
                                                                                                                                                                    +        Every curses window has a background property.  In the  library's  wide
+        configuration,  this  property  is  a  cchar_t  which combines a set of
+-       attributes  with  the  background  character  (see  curs_attr(3x))  The
++       attributes with the  background  character  (see  curs_attr(3x)).   The
+        background character is a spacing character.
+ 
+        When  erasing  parts  of  the  screen,  curses fills the cells with the
+        background character.  curses also  uses  the  window  background  when
+-       writing characters to the screen:
++       writing characters to the screen.
+ 
+-       o   The attribute part of the background is combined with all non-blank
+-           characters  that  are  written  into  the  window,  as   with   the
+-           wadd_wch(3x) and wins_wch(3x) families of functions.
++       o   The  attribute  part  of the background combines with all non-blank
++           characters written into the window, as with  the  wadd_wch(3x)  and
++           wins_wch(3x) families of functions.
+ 
+-       o   Both  the  character  and  attribute  parts  of  the background are
+-           combined with blank characters that are written into the window.
++       o   Both  the  character  and attribute parts of the background combine
++           with blank characters that are written into the window.
+ 
+        The background becomes a property of the character and  moves  with  it
+        through any scrolling and insert/delete line/character operations.
+ 
+-       To  the  extent possible on a given terminal, the attribute part of the
+-       background is displayed as the graphic rendition of the  character  put
+-       on the screen.
++       To  the  extent  possible  on  a  given  terminal,  curses displays the
++       attributes of the background as the graphic rendition of the  character
++       put on the screen.
+ 
+ 
+ 
                                                                                                                                                                    bkgrnd, wbkgrnd
                                                                                                                                                                    +@@ -101,15 +101,15 @@
+            new background character.
+ 
+        ncurses  updates  the rendition of each character cell by comparing the
+-       character, non-color attributes, and colors.  The  library  applies  to
+-       following  procedure  to  each cell in the window, whether or not it is
+-       blank.
++       character, non-color attributes, and color pair selection.  The library
++       applies  to  following procedure to each cell in the window, whether or
++       not it is blank.
+ 
+        o   ncurses first compares  the  cell's  character  to  the  previously
+            specified  background  character; if they match, ncurses writes the
+            new background character to the cell.
+ 
+-       o   ncurses then checks if the cell uses color, that is, its color pair
++       o   ncurses then checks if the cell uses color; that is, its color pair
+            value  is  nonzero.   If not, it simply replaces the attributes and
+            color  pair  in  the  cell  with  those  from  the  new  background
+            character.
+@@ -142,9 +142,9 @@
+ 
+ 
+ 
                                                                                                                                                                    getbkgrnd, wgetbkgrnd
                                                                                                                                                                    +-       The  getbkgrnd and wgetbkgrnd functions obtain the background character
+-       and attribute pair of stdscr or the specified window and store  it  via
+-       the wch pointer.
++       getbkgrnd  and  wgetbkgrnd  respectively  obtain  stdscr's or the given
++       window's background character, attributes, and color pair, and store it
++       in their wch argument.
+ 
+ 
+ 
                                                                                                                                                                    RETURN VALUE
                                                                                                                                                                    +@@ -153,9 +153,9 @@
+        The  other  functions  return ERR upon failure and OK upon success.  In
+        ncurses, failure occurs if
+ 
+-       o   a WINDOW pointer win is null, or
++       o   win is NULL, or
+ 
+-       o   a cchar_t pointer wch is null.
++       o   wch is NULL.
+ 
+ 
+ 
                                                                                                                                                                    NOTES
                                                                                                                                                                    +@@ -171,18 +171,23 @@
+        error conditions for them.
+ 
+        X/Open Curses does not provide details of how the rendition is updated.
+-       This implementation follows the approach used in SVr4 curses.
++       ncurses follows the approach used in SVr4 curses's  non-wide  functions
++       for manipulating the window background.
++
++
++
                                                                                                                                                                    HISTORY
                                                                                                                                                                    ++       These functions were initially specified by X/Open Curses, Issue 4.
+ 
+ 
+ 
                                                                                                                                                                    SEE ALSO
                                                                                                                                                                    +-       curs_bkgd(3x) describes the corresponding  functions  in  the  non-wide
++       curs_bkgd(3x)  describes  the  corresponding  functions in the non-wide
+        configuration of ncurses.
+ 
+        curses(3x), curs_add_wch(3x), curs_attr(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-22                   curs_bkgrnd(3x)
++ncurses 6.5                       2024-12-28                   curs_bkgrnd(3x)
+ 
                                                                                                                                                                    
+ 
                                                                                                                                                                    
+ 
+ 
                                                                                                                                                                    
+Index: doc/html/man/curs_color.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_color.3x.html	2024-05-25 22:33:41.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_color.3x.html	2024-12-28 21:43:55.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_color.3x,v 1.102 2024/05/25 20:10:58 tom Exp @
++  * @Id: curs_color.3x,v 1.104 2024/12/28 21:18:35 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_color 3x 2024-05-25 ncurses 6.5 Library calls
++curs_color 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                    curs_color 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                                                                    
++
                                                                                                                                                                    curs_color 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                    
+ 
                                                                                                                                                                    + curs_color(3x)                   Library calls                  curs_color(3x)
+ 
+@@ -503,10 +503,10 @@
+ 
+        Other implementations of curses had different limits:
+ 
+-       o   PCCurses (1987-1990) provided for only eight (8) colors.
++       o   PCCurses (1987-1990) provided for only eight (8) colors.
+ 
+-       o   PDCurses  (1992-present)  inherited  the  8-color  limitation  from
+-           PCCurses, but changed this to 256 in version 2.5 (2001), along with
++       o   PDCurses  (1992-present)  inherited  the  8-color  limitation  from
++           PCCurses, but changed this to 256 in version 2.5 (2001), along with
+            changing chtype from 16-bits to 32-bits.
+ 
+        o   X/Open Curses (1992-present) added a new structure cchar_t to store
+@@ -539,7 +539,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                    curs_color(3x)
++ncurses 6.5                       2024-12-28                    curs_color(3x)
+ 
                                                                                                                                                                    
+ 
                                                                                                                                                                    
+ 
                                                                                                                                                                      
+Index: doc/html/man/curs_delch.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_delch.3x.html	2024-09-22 18:37:10.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_delch.3x.html	2024-12-28 21:43:55.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_delch.3x,v 1.39 2024/09/21 23:43:41 tom Exp @
++  * @Id: curs_delch.3x,v 1.41 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_delch 3x 2024-09-21 ncurses 6.5 Library calls
++curs_delch 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                      curs_delch 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                                      
++
                                                                                                                                                                      curs_delch 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                      
+ 
                                                                                                                                                                      + curs_delch(3x)                   Library calls                  curs_delch(3x)
+ 
+@@ -73,7 +73,7 @@
+ 
                                                                                                                                                                      RETURN VALUE
                                                                                                                                                                      +        These functions return OK on success and ERR on failure.
+ 
+-       In ncurses, they return ERR if win is NULL.
++       In ncurses, they return ERR if win is NULL.
+ 
+        Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+@@ -103,7 +103,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-21                    curs_delch(3x)
++ncurses 6.5                       2024-12-28                    curs_delch(3x)
+ 
                                                                                                                                                                      
+ 
                                                                                                                                                                      
+ 
                                                                                                                                                                        
+Index: doc/html/man/curs_deleteln.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_deleteln.3x.html	2024-09-22 18:37:10.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_deleteln.3x.html	2024-12-28 21:43:55.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_deleteln.3x,v 1.41 2024/09/22 18:35:00 tom Exp @
++  * @Id: curs_deleteln.3x,v 1.43 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_deleteln 3x 2024-09-22 ncurses 6.5 Library calls
++curs_deleteln 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                        curs_deleteln 3x 2024-09-22 ncurses 6.5 Library calls
                                                                                                                                                                        
++
                                                                                                                                                                        curs_deleteln 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                        
+ 
                                                                                                                                                                        + curs_deleteln(3x)                Library calls               curs_deleteln(3x)
+ 
+@@ -85,7 +85,7 @@
+ 
                                                                                                                                                                        RETURN VALUE
                                                                                                                                                                        +        These functions return OK on success and ERR on failure.
+ 
+-       In ncurses, they fail if win is NULL.
++       In ncurses, they fail if win is NULL.
+ 
+ 
+ 
                                                                                                                                                                        NOTES
                                                                                                                                                                        +@@ -115,7 +115,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-22                 curs_deleteln(3x)
++ncurses 6.5                       2024-12-28                 curs_deleteln(3x)
+ 
                                                                                                                                                                        
+ 
                                                                                                                                                                        
+ 
                                                                                                                                                                          
+Index: doc/html/man/curs_get_wch.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_get_wch.3x.html	2024-09-14 20:23:26.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_get_wch.3x.html	2024-12-28 21:43:55.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_get_wch.3x,v 1.47 2024/09/14 20:06:50 tom Exp @
++  * @Id: curs_get_wch.3x,v 1.50 2024/12/28 21:27:26 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_get_wch 3x 2024-09-14 ncurses 6.5 Library calls
++curs_get_wch 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                          curs_get_wch 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                                                          
++
                                                                                                                                                                          curs_get_wch 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                          
+ 
                                                                                                                                                                          + curs_get_wch(3x)                 Library calls                curs_get_wch(3x)
+ 
+@@ -83,8 +83,8 @@
+        until  the  terminal  has  input.   If cbreak(3x) has been called, this
+        happens after one character is read.  If nocbreak(3x) or noraw(3x)  has
+        been  called,  it  occurs  when the next newline is read.  (Because the
+-       terminal's normal or "cooked" mode is line-buffered, multiple  wget_wch
+-       calls   may   then   be  necessary  to  empty  the  input  queue.)   If
++       terminal's  canonical  or  "cooked"  mode  is  line-buffered,  multiple
++       wget_wch  calls  may  then  be necessary to empty the input queue.)  If
+        halfdelay(3x) has been called, curses waits until input is available or
+        the specified delay elapses.
+ 
+@@ -123,7 +123,7 @@
+        o   execution  was  interrupted by a signal, in which case errno is set
+            to EINTR.
+ 
+-       Functions taking a WINDOW pointer argument fail if the pointer is NULL.
++       Functions taking a WINDOW pointer argument fail if the pointer is NULL.
+ 
+        Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+@@ -172,7 +172,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-14                  curs_get_wch(3x)
++ncurses 6.5                       2024-12-28                  curs_get_wch(3x)
+ 
                                                                                                                                                                          
+ 
                                                                                                                                                                          
+ 
                                                                                                                                                                            
+Index: doc/html/man/curs_get_wstr.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_get_wstr.3x.html	2024-06-22 22:55:07.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_get_wstr.3x.html	2024-12-28 21:43:55.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_get_wstr.3x,v 1.54 2024/06/22 21:34:19 tom Exp @
++  * @Id: curs_get_wstr.3x,v 1.56 2024/12/28 21:18:35 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_get_wstr 3x 2024-06-22 ncurses 6.5 Library calls
++curs_get_wstr 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                            curs_get_wstr 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                                                                                            
++
                                                                                                                                                                            curs_get_wstr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                            
+ 
                                                                                                                                                                            + curs_get_wstr(3x)                Library calls               curs_get_wstr(3x)
+ 
+@@ -174,8 +174,8 @@
+        o   For  analogy  with  wgetnstr,  ncurses  6.2  uses a limit (based on
+            LINE_MAX).
+ 
+-       o   Some other implementations (such as Solaris xcurses) do  the  same,
+-           while others (PDCurses) do not allow this.
++       o   Some other implementations (such as Solaris xcurses) do  the  same,
++           while others (PDCurses) do not allow this.
+ 
+        o   NetBSD  7 curses imitates ncurses 6.1 in this regard, treating a -1
+            as an indefinite number of characters.
+@@ -189,7 +189,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-22                 curs_get_wstr(3x)
++ncurses 6.5                       2024-12-28                 curs_get_wstr(3x)
+ 
                                                                                                                                                                            
+ 
                                                                                                                                                                            
+ 
                                                                                                                                                                              
+Index: doc/html/man/curs_getch.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_getch.3x.html	2024-09-14 20:23:26.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_getch.3x.html	2024-12-28 21:43:55.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_getch.3x,v 1.101 2024/09/14 20:06:50 tom Exp @
++  * @Id: curs_getch.3x,v 1.104 2024/12/28 21:27:26 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_getch 3x 2024-09-14 ncurses 6.5 Library calls
++curs_getch 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                              curs_getch 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                                                              
++
                                                                                                                                                                              curs_getch 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                              
+ 
                                                                                                                                                                              + curs_getch(3x)                   Library calls                  curs_getch(3x)
+ 
+@@ -86,7 +86,7 @@
+        until the terminal has input.  If  cbreak(3x)  has  been  called,  this
+        happens  after one character is read.  If nocbreak(3x) or noraw(3x) has
+        been called, it occurs when the next newline  is  read.   (Because  the
+-       terminal's  normal  or  "cooked" mode is line-buffered, multiple wgetch
++       terminal's canonical or "cooked" mode is line-buffered, multiple wgetch
+        calls  may  then  be  necessary  to  empty  the   input   queue.)    If
+        halfdelay(3x) has been called, curses waits until input is available or
+        the specified delay elapses.
+@@ -315,7 +315,7 @@
+ 
+        has_key returns TRUE or FALSE.
+ 
+-       Functions taking a WINDOW pointer argument fail if the pointer is NULL.
++       Functions taking a WINDOW pointer argument fail if the pointer is NULL.
+ 
+        Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+@@ -352,7 +352,7 @@
+        o   It usually produces a control code for carriage return (^M) or line
+            feed (^J).
+ 
+-       o   Depending on the terminal mode  (raw,  cbreak,  or  "cooked"),  and
++       o   Depending on the terminal mode (raw,  cbreak,  or  canonical),  and
+            whether  nl(3x)  or  nonl(3x)  has  been  called, wgetch may return
+            either a carriage return or line feed upon an Enter or  Return  key
+            stroke.
+@@ -428,7 +428,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-14                    curs_getch(3x)
++ncurses 6.5                       2024-12-28                    curs_getch(3x)
+ 
                                                                                                                                                                              
+ 
                                                                                                                                                                              
+ 
                                                                                                                                                                                
+Index: doc/html/man/curs_getstr.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_getstr.3x.html	2024-06-22 23:04:43.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_getstr.3x.html	2024-12-28 21:43:55.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_getstr.3x,v 1.67 2024/06/22 22:20:56 tom Exp @
++  * @Id: curs_getstr.3x,v 1.71 2024/12/28 21:27:26 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_getstr 3x 2024-06-22 ncurses 6.5 Library calls
++curs_getstr 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                curs_getstr 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                                                                                                
++
                                                                                                                                                                                curs_getstr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                
+ 
                                                                                                                                                                                + curs_getstr(3x)                  Library calls                 curs_getstr(3x)
+ 
+@@ -112,7 +112,7 @@
+ 
+        In ncurses, they return ERR if
+ 
+-       o   win is NULL, or
++       o   win is NULL, or
+ 
+        o   if an internal wgetch call fails.
+ 
+@@ -133,7 +133,7 @@
+        While wgetnstr is conceptually a series of calls  to  wgetch,  it  also
+        temporarily  changes  properties  of the curses screen to permit simple
+        editing of the input buffer.  It saves  the  screen's  state  and  then
+-       calls  nl(3x)  and,  if  the  screen  was  in  normal  ("cooked") mode,
++       calls  nl(3x)  and,  if  the  screen  was in canonical ("cooked") mode,
+        cbreak(3x).  Before returning, it  restores  the  saved  screen  state.
+        Other   implementations  differ  in  detail,  affecting  which  control
+        characters they can accept in the  buffer;  see  section  "PORTABILITY"
+@@ -258,7 +258,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-22                   curs_getstr(3x)
++ncurses 6.5                       2024-12-28                   curs_getstr(3x)
+ 
                                                                                                                                                                                
+ 
                                                                                                                                                                                
+ 
                                                                                                                                                                                  
+Index: doc/html/man/curs_in_wch.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_in_wch.3x.html	2024-07-27 23:11:31.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_in_wch.3x.html	2024-12-28 21:43:55.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_in_wch.3x,v 1.35 2024/07/27 20:06:49 tom Exp @
++  * @Id: curs_in_wch.3x,v 1.37 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_in_wch 3x 2024-07-27 ncurses 6.5 Library calls
++curs_in_wch 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                  curs_in_wch 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                                                                  
++
                                                                                                                                                                                  curs_in_wch 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                  
+ 
                                                                                                                                                                                  + curs_in_wch(3x)                  Library calls                 curs_in_wch(3x)
+ 
+@@ -70,7 +70,7 @@
+ 
                                                                                                                                                                                  RETURN VALUE
                                                                                                                                                                                  +        These functions return OK on success and ERR on failure.
+ 
+-       In ncurses, they return ERR if win is NULL.
++       In ncurses, they return ERR if win is NULL.
+ 
+        Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+@@ -106,7 +106,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                   curs_in_wch(3x)
++ncurses 6.5                       2024-12-28                   curs_in_wch(3x)
+ 
                                                                                                                                                                                  
+ 
                                                                                                                                                                                  
+ 
                                                                                                                                                                                    
+Index: doc/html/man/curs_inch.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_inch.3x.html	2024-07-27 23:11:31.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_inch.3x.html	2024-12-28 21:43:56.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inch.3x,v 1.62 2024/07/27 19:58:17 tom Exp @
++  * @Id: curs_inch.3x,v 1.64 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inch 3x 2024-07-27 ncurses 6.5 Library calls
++curs_inch 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                    curs_inch 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                                                                    
++
                                                                                                                                                                                    curs_inch 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                    
+ 
                                                                                                                                                                                    + curs_inch(3x)                    Library calls                   curs_inch(3x)
+ 
+@@ -70,7 +70,7 @@
+ 
                                                                                                                                                                                    RETURN VALUE
                                                                                                                                                                                    +        These functions return OK on success and ERR on failure.
+ 
+-       In ncurses, they return return ERR if win is NULL.
++       In ncurses, they return return ERR if win is NULL.
+ 
+        Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+@@ -118,7 +118,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                     curs_inch(3x)
++ncurses 6.5                       2024-12-28                     curs_inch(3x)
+ 
                                                                                                                                                                                    
+ 
                                                                                                                                                                                    
+ 
                                                                                                                                                                                      
+Index: doc/html/man/curs_inchstr.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_inchstr.3x.html	2024-05-25 22:33:42.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_inchstr.3x.html	2024-12-28 21:43:56.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inchstr.3x,v 1.47 2024/05/25 20:10:58 tom Exp @
++  * @Id: curs_inchstr.3x,v 1.49 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inchstr 3x 2024-05-25 ncurses 6.5 Library calls
++curs_inchstr 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                      curs_inchstr 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                                                                                      
++
                                                                                                                                                                                      curs_inchstr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                      
+ 
                                                                                                                                                                                      + curs_inchstr(3x)                 Library calls                curs_inchstr(3x)
+ 
+@@ -66,7 +66,7 @@
+ 
+ 
+ 
                                                                                                                                                                                      DESCRIPTION
                                                                                                                                                                                      +-       These routines return a NULL-terminated  array  of  chtype  quantities,
++       These routines return a NULL-terminated  array  of  chtype  quantities,
+        starting  at the current cursor position in the named window and ending
+        at the right margin of the window.
+ 
+@@ -120,7 +120,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                  curs_inchstr(3x)
++ncurses 6.5                       2024-12-28                  curs_inchstr(3x)
+ 
                                                                                                                                                                                      
+ 
                                                                                                                                                                                      
+ 
                                                                                                                                                                                        
+Index: doc/html/man/curs_initscr.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_initscr.3x.html	2024-09-21 18:35:26.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_initscr.3x.html	2024-12-28 21:43:56.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_initscr.3x,v 1.79 2024/09/21 17:59:36 tom Exp @
++  * @Id: curs_initscr.3x,v 1.81 2024/12/28 21:18:35 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_initscr 3x 2024-09-21 ncurses 6.5 Library calls
++curs_initscr 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                        curs_initscr 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                                                        
++
                                                                                                                                                                                        curs_initscr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                        
+ 
                                                                                                                                                                                        + curs_initscr(3x)                 Library calls                curs_initscr(3x)
+ 
+@@ -227,7 +227,7 @@
+            windows  for  each  screen,  using that information to delete those
+            windows when delscreen is called.
+ 
+-       o   NetBSD copied this feature of ncurses in  2001.   PDCurses  follows
++       o   NetBSD copied this feature of ncurses in  2001.   PDCurses  follows
+            the SVr4 model, deleting only the standard WINDOW structures.
+ 
+ 
+@@ -319,7 +319,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-21                  curs_initscr(3x)
++ncurses 6.5                       2024-12-28                  curs_initscr(3x)
+ 
                                                                                                                                                                                        
+ 
                                                                                                                                                                                        
+ 
                                                                                                                                                                                          
+Index: doc/html/man/curs_inopts.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_inopts.3x.html	2024-09-21 18:35:26.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_inopts.3x.html	2024-12-28 21:43:56.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inopts.3x,v 1.79 2024/09/21 18:05:49 tom Exp @
++  * @Id: curs_inopts.3x,v 1.82 2024/12/28 21:27:26 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inopts 3x 2024-09-21 ncurses 6.5 Library calls
++curs_inopts 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                          curs_inopts 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                                                          
++
                                                                                                                                                                                          curs_inopts 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                          
+ 
                                                                                                                                                                                          + curs_inopts(3x)                  Library calls                 curs_inopts(3x)
+ 
+@@ -114,7 +114,7 @@
+        buffering and erase and kill character processing (the interrupt, quit,
+        suspend,  and  flow  control  characters  are  unaffected)  and   makes
+        characters  typed  by  the  user  immediately available to the program.
+-       nocbreak restores the terminal's normal ("cooked") line discipline.
++       nocbreak restores the terminal's canonical ("cooked") line discipline.
+ 
+        The state of the terminal is unknown to a curses  application  when  it
+        starts; therefore, a program should call cbreak or nocbreak explicitly.
+@@ -179,7 +179,7 @@
+        character code for a line feed in cbreak or raw modes  depends  on  the
+        configuration  of  the  terminal driver; see termios(3).  nl configures
+        the terminal to perform this translation.  nonl disables it.  Under its
+-       normal   ("cooked")   line   discipline,  the  terminal  driver  always
++       canonical  ("cooked")  line  discipline,  the  terminal  driver  always
+        translates carriage returns to line feeds.
+ 
+ 
+@@ -202,7 +202,7 @@
+ 
                                                                                                                                                                                          qiflush, noqiflush
                                                                                                                                                                                          +        qiflush and noqiflush configure the terminal driver's treatment of  its
+        input and output queues when it handles the interrupt, suspend, or quit
+-       characters under the normal ("cooked") or cbreak  line  disciplines  on
++       characters under the canonical ("cooked") or cbreak line disciplines on
+        POSIX  systems; see termios(3).  The default behavior is inherited from
+        the terminal driver settings.  Calling qiflush configures the  terminal
+        to  flush  the  queues  when  any  of  these  events occurs, giving the
+@@ -223,7 +223,7 @@
+        generating a signal or  acting  on  I/O  flow.   The  behavior  of  the
+        terminal's   "Break"   key   (if   any)   depends  on  terminal  driver
+        configuration parameters that curses does not handle.   noraw  restores
+-       the terminal's normal ("cooked") line discipline.
++       the terminal's canonical ("cooked") line discipline.
+ 
+ 
+ 
                                                                                                                                                                                          timeout, wtimeout
                                                                                                                                                                                          +@@ -258,7 +258,7 @@
+ 
+        o   the terminal is not initialized or
+ 
+-       o   win is NULL (except  for  intrflush  and  meta,  which  ignore  its
++       o   win is NULL (except  for  intrflush  and  meta,  which  ignore  its
+            value).
+ 
+        Further, halfdelay returns ERR if delay is outside the range 1..255.
+@@ -272,8 +272,8 @@
+        noqiflush, qiflush, timeout, and wtimeout may be implemented as macros.
+ 
+        noraw  and  nocbreak follow historical practice in that they attempt to
+-       restore the terminal's normal ("cooked") line discipline from  raw  and
+-       cbreak,  respectively.   Mixing  raw/noraw  calls  with cbreak/nocbreak
++       restore the terminal's canonical ("cooked") line  discipline  from  raw
++       and  cbreak, respectively.  Mixing raw/noraw calls with cbreak/nocbreak
+        calls leads to terminal driver control states that are hard to  predict
+        or understand; doing so is not recommended.
+ 
+@@ -313,7 +313,7 @@
+        the  screen.  BSD curses did not, but its raw function turned it off as
+        a side effect.  For best portability, call echo  or  noecho  explicitly
+        just  after initialization, even if your program retains the terminal's
+-       normal ("cooked") line discipline.
++       canonical ("cooked") line discipline.
+ 
+        X/Open Curses is ambiguous regarding whether  raw  should  disable  the
+        carriage  return and line feed translation feature controlled by nl and
+@@ -382,7 +382,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-21                   curs_inopts(3x)
++ncurses 6.5                       2024-12-28                   curs_inopts(3x)
+ 
                                                                                                                                                                                          
+ 
                                                                                                                                                                                          
+ 
                                                                                                                                                                                            
+Index: doc/html/man/curs_ins_wch.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_ins_wch.3x.html	2024-07-27 23:11:31.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_ins_wch.3x.html	2024-12-28 21:43:56.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_ins_wch.3x,v 1.34 2024/07/27 20:05:18 tom Exp @
++  * @Id: curs_ins_wch.3x,v 1.36 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_ins_wch 3x 2024-07-27 ncurses 6.5 Library calls
++curs_ins_wch 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                            curs_ins_wch 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                                                                            
++
                                                                                                                                                                                            curs_ins_wch 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                            
+ 
                                                                                                                                                                                            + curs_ins_wch(3x)                 Library calls                curs_ins_wch(3x)
+ 
+@@ -71,7 +71,7 @@
+ 
                                                                                                                                                                                            RETURN VALUE
                                                                                                                                                                                            +        These functions return OK on success and ERR on failure.
+ 
+-       Functions taking a WINDOW pointer argument fail if the pointer is NULL.
++       Functions taking a WINDOW pointer argument fail if the pointer is NULL.
+ 
+        Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+@@ -108,7 +108,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                  curs_ins_wch(3x)
++ncurses 6.5                       2024-12-28                  curs_ins_wch(3x)
+ 
                                                                                                                                                                                            
+ 
                                                                                                                                                                                            
+ 
                                                                                                                                                                                              
+Index: doc/html/man/curs_ins_wstr.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_ins_wstr.3x.html	2024-09-14 20:23:26.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_ins_wstr.3x.html	2024-12-28 21:43:56.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_ins_wstr.3x,v 1.46 2024/09/14 20:06:50 tom Exp @
++  * @Id: curs_ins_wstr.3x,v 1.48 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_ins_wstr 3x 2024-09-14 ncurses 6.5 Library calls
++curs_ins_wstr 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                              curs_ins_wstr 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                                                                              
++
                                                                                                                                                                                              curs_ins_wstr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                              
+ 
                                                                                                                                                                                              + curs_ins_wstr(3x)                Library calls               curs_ins_wstr(3x)
+ 
+@@ -84,9 +84,9 @@
+ 
+        In ncurses, they return ERR if
+ 
+-       o   win is NULL,
++       o   win is NULL,
+ 
+-       o   wstr is NULL,
++       o   wstr is NULL,
+ 
+        o   the first wide character in wstr is a non-spacing character, or
+ 
+@@ -131,7 +131,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-14                 curs_ins_wstr(3x)
++ncurses 6.5                       2024-12-28                 curs_ins_wstr(3x)
+ 
                                                                                                                                                                                              
+ 
                                                                                                                                                                                              
+ 
                                                                                                                                                                                                
+Index: doc/html/man/curs_insch.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_insch.3x.html	2024-07-27 23:11:31.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_insch.3x.html	2024-12-28 21:43:56.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_insch.3x,v 1.42 2024/07/27 20:08:25 tom Exp @
++  * @Id: curs_insch.3x,v 1.44 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_insch 3x 2024-07-27 ncurses 6.5 Library calls
++curs_insch 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                curs_insch 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                                                                                
++
                                                                                                                                                                                                curs_insch 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                
+ 
                                                                                                                                                                                                + curs_insch(3x)                   Library calls                  curs_insch(3x)
+ 
+@@ -70,7 +70,7 @@
+ 
                                                                                                                                                                                                RETURN VALUE
                                                                                                                                                                                                +        These functions return OK on success and ERR on failure.
+ 
+-       Functions taking a WINDOW pointer argument fail if the pointer is NULL.
++       Functions taking a WINDOW pointer argument fail if the pointer is NULL.
+ 
+        Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+@@ -102,7 +102,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                    curs_insch(3x)
++ncurses 6.5                       2024-12-28                    curs_insch(3x)
+ 
                                                                                                                                                                                                
+ 
                                                                                                                                                                                                
+ 
                                                                                                                                                                                                  
+Index: doc/html/man/curs_insstr.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_insstr.3x.html	2024-07-27 23:11:31.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_insstr.3x.html	2024-12-28 21:43:56.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_insstr.3x,v 1.57 2024/07/27 20:07:59 tom Exp @
++  * @Id: curs_insstr.3x,v 1.59 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_insstr 3x 2024-07-27 ncurses 6.5 Library calls
++curs_insstr 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                  curs_insstr 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                                                                                  
++
                                                                                                                                                                                                  curs_insstr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                  + curs_insstr(3x)                  Library calls                 curs_insstr(3x)
+ 
+@@ -82,9 +82,9 @@
+ 
+        In ncurses, they return ERR if
+ 
+-       o   win is NULL,
++       o   win is NULL,
+ 
+-       o   str is NULL, or
++       o   str is NULL, or
+ 
+        o   an internal winsch(3x) call returns ERR.
+ 
+@@ -125,7 +125,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                   curs_insstr(3x)
++ncurses 6.5                       2024-12-28                   curs_insstr(3x)
+ 
                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                    
+Index: doc/html/man/curs_instr.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_instr.3x.html	2024-09-14 20:23:26.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_instr.3x.html	2024-12-28 21:43:56.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_instr.3x,v 1.59 2024/09/14 20:06:50 tom Exp @
++  * @Id: curs_instr.3x,v 1.61 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_instr 3x 2024-09-14 ncurses 6.5 Library calls
++curs_instr 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                    curs_instr 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                                                                                    
++
                                                                                                                                                                                                    curs_instr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                    + curs_instr(3x)                   Library calls                  curs_instr(3x)
+ 
+@@ -81,9 +81,9 @@
+ 
+        In ncurses, they return ERR if
+ 
+-       o   win is NULL or
++       o   win is NULL or
+ 
+-       o   str is NULL.
++       o   str is NULL.
+ 
+        Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+@@ -138,7 +138,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-14                    curs_instr(3x)
++ncurses 6.5                       2024-12-28                    curs_instr(3x)
+ 
                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                      
+Index: doc/html/man/curs_inwstr.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_inwstr.3x.html	2024-09-14 20:23:26.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_inwstr.3x.html	2024-12-28 21:43:56.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inwstr.3x,v 1.47 2024/09/14 20:06:50 tom Exp @
++  * @Id: curs_inwstr.3x,v 1.49 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inwstr 3x 2024-09-14 ncurses 6.5 Library calls
++curs_inwstr 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                      curs_inwstr 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                                                                                      
++
                                                                                                                                                                                                      curs_inwstr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                      + curs_inwstr(3x)                  Library calls                 curs_inwstr(3x)
+ 
+@@ -85,9 +85,9 @@
+ 
+        In ncurses, these functions return ERR if
+ 
+-       o   win is NULL or
++       o   win is NULL or
+ 
+-       o   wstr is NULL.
++       o   wstr is NULL.
+ 
+        Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+@@ -135,7 +135,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-14                   curs_inwstr(3x)
++ncurses 6.5                       2024-12-28                   curs_inwstr(3x)
+ 
                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                        
+Index: doc/html/man/curs_mouse.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_mouse.3x.html	2024-05-25 22:33:42.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_mouse.3x.html	2024-12-28 21:43:56.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_mouse.3x,v 1.103 2024/05/25 20:10:58 tom Exp @
++  * @Id: curs_mouse.3x,v 1.106 2024/12/28 21:27:26 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_mouse 3x 2024-05-25 ncurses 6.5 Library calls
++curs_mouse 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                        curs_mouse 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                                                                                                        
++
                                                                                                                                                                                                        curs_mouse 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                        + curs_mouse(3x)                   Library calls                  curs_mouse(3x)
+ 
+@@ -89,10 +89,10 @@
+        The has_mouse function returns  TRUE  if  the  mouse  driver  has  been
+        successfully initialized, and FALSE otherwise.
+ 
+-       Mouse  events  are  ignored  when input is in cooked mode, and cause an
+-       error beep when cooked mode  is  being  simulated  in  a  window  by  a
+-       function  such  as  getstr  that  expects  a  linefeed  for  input-loop
+-       termination.
++       Mouse  events  are  ignored when input is in canonical ("cooked") mode,
++       and cause an error beep when canonical mode is  being  simulated  in  a
++       window  by a function such as getstr that expects a linefeed for input-
++       loop termination.
+ 
+ 
+ 
                                                                                                                                                                                                        mousemask
                                                                                                                                                                                                        +@@ -106,7 +106,7 @@
+            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
++       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 mouse mask may turn off the mouse
+@@ -201,7 +201,7 @@
+            through  the  pointers.   If  the  conversion  was  successful, the
+            function returns TRUE.
+ 
+-           If one of the parameters was NULL or the location is not inside the
++           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
+@@ -209,7 +209,7 @@
+            coordinates  if  the  window win encloses this point.  In this case
+            the function returns TRUE.
+ 
+-           If one of the parameters is NULL or the point  is  not  inside  the
++           If one of the parameters is NULL or the point  is  not  inside  the
+            window, FALSE is returned.
+ 
+        The   referenced   coordinates  are  only  replaced  by  the  converted
+@@ -369,7 +369,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                        BUGS
                                                                                                                                                                                                        +-       Mouse events from xterm are not ignored in cooked  mode  if  they  have
++       Mouse events from xterm are not ignored in canonical mode if they  have
+        been  enabled  by  mousemask.  Instead, the xterm mouse report sequence
+        appears in the string read.
+ 
+@@ -394,7 +394,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                    curs_mouse(3x)
++ncurses 6.5                       2024-12-28                    curs_mouse(3x)
+ 
                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                          
+Index: doc/html/man/curs_move.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_move.3x.html	2024-09-21 18:35:27.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_move.3x.html	2024-12-28 21:43:56.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_move.3x,v 1.46 2024/09/21 18:03:44 tom Exp @
++  * @Id: curs_move.3x,v 1.48 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_move 3x 2024-09-21 ncurses 6.5 Library calls
++curs_move 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                          curs_move 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                                                                          
++
                                                                                                                                                                                                          curs_move 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                          + curs_move(3x)                    Library calls                   curs_move(3x)
+ 
+@@ -70,7 +70,7 @@
+ 
+        They fail if the position (y, x) is outside the window boundaries.
+ 
+-       In ncurses, wmove fails if win is NULL.
++       In ncurses, wmove fails if win is NULL.
+ 
+ 
+ 
                                                                                                                                                                                                          NOTES
                                                                                                                                                                                                          +@@ -93,7 +93,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-21                     curs_move(3x)
++ncurses 6.5                       2024-12-28                     curs_move(3x)
+ 
                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                            
+Index: doc/html/man/curs_opaque.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_opaque.3x.html	2024-04-27 18:38:46.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_opaque.3x.html	2024-12-28 21:43:56.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_opaque.3x,v 1.43 2024/03/16 15:35:01 tom Exp @
++  * @Id: curs_opaque.3x,v 1.45 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_opaque 3x 2024-03-16 ncurses 6.5 Library calls
++curs_opaque 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                            curs_opaque 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                            
++
                                                                                                                                                                                                            curs_opaque 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                            + curs_opaque(3x)                  Library calls                 curs_opaque(3x)
+ 
+@@ -124,7 +124,7 @@
+               returns the delay timeout set by wtimeout(3x).
+ 
+        wgetparent
+-              returns the parent WINDOW pointer for subwindows,  or  NULL  for
++              returns the parent WINDOW pointer for subwindows,  or  NULL  for
+               windows having no parent.
+ 
+        wgetscrreg
+@@ -155,7 +155,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                   curs_opaque(3x)
++ncurses 6.5                       2024-12-28                   curs_opaque(3x)
+ 
                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                              
+Index: doc/html/man/curs_pad.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_pad.3x.html	2024-07-27 23:11:32.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_pad.3x.html	2024-12-28 21:43:56.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_pad.3x,v 1.67 2024/07/27 19:55:45 tom Exp @
++  * @Id: curs_pad.3x,v 1.69 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_pad 3x 2024-07-27 ncurses 6.5 Library calls
++curs_pad 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                              curs_pad 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                                                                                              
++
                                                                                                                                                                                                              curs_pad 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                              + curs_pad(3x)                     Library calls                    curs_pad(3x)
+ 
+@@ -133,7 +133,7 @@
+        specifies only "an integer  value  other  than  ERR")  upon  successful
+        completion.
+ 
+-       Functions  that  return pointers return NULL on error, and set errno to
++       Functions  that  return pointers return NULL on error, and set errno to
+        ENOMEM.
+ 
+        In this implementation
+@@ -228,7 +228,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                      curs_pad(3x)
++ncurses 6.5                       2024-12-28                      curs_pad(3x)
+ 
                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                
+Index: doc/html/man/curs_scr_dump.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_scr_dump.3x.html	2024-09-21 18:35:27.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_scr_dump.3x.html	2024-12-28 21:43:56.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_scr_dump.3x,v 1.49 2024/09/21 09:30:22 tom Exp @
++  * @Id: curs_scr_dump.3x,v 1.51 2024/12/28 21:19:39 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_scr_dump 3x 2024-09-21 ncurses 6.5 Library calls
++curs_scr_dump 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                curs_scr_dump 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                                                                                
++
                                                                                                                                                                                                                curs_scr_dump 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                + curs_scr_dump(3x)                Library calls               curs_scr_dump(3x)
+ 
+@@ -135,25 +135,24 @@
+ 
+        SVr4 omitted the const qualifiers.
+ 
+-       SVr4 documentation describes scr_init such that the dump data  is  also
++       SVr4 documentation describes scr_init such that the dump data  is  also
+        considered  invalid  "if the time-stamp of the tty is old" but does not
+        define "old".
+ 
+-       As of 2024, PDCurses provides these functions.  NetBSD curses does  not
+-       provide these functions, although it provides getwin.
++       As of 2024, PDCurses provides these functions.  NetBSD curses does not.
+ 
+-       Other  implementations  of curses store the window in binary form.  One
+-       drawback to binary form is that this makes the dump dependent upon  the
+-       curses  library's  internal  data  structures.   Rather  than  do that,
+-       ncurses stores the dump in textual form, allowing more flexible use  of
+-       the  data.   For  instance,  SVr4  curses scr_restore requires that the
+-       dumped window have the same dimensions as the restored window.  ncurses
+-       uses wresize to adjust the restored window size.
++       Other implementations of curses store the window in binary form,  which
++       makes  the  dump  dependent  upon  the  curses  library's internal data
++       structures.  ncurses avoids  this  drawback  by  storing  the  dump  in
++       textual  form,  allowing  more flexible use of the data.  For instance,
++       the scr_restore of SVr4 curses requires that the dumped window have the
++       same  dimensions  as the restored window.  ncurses uses its wresize(3x)
++       extension to adjust the restored window size.
+ 
+ 
+ 
                                                                                                                                                                                                                HISTORY
                                                                                                                                                                                                                +-       SVr3  (1987)  introduced  scr_dump,  scr_init, and scr_restore.  SVr3.1
+-       added scr_set.
++       SVr3 (1987) introduced scr_dump,  scr_init,  and  scr_restore.   SVr3.1
++       added scr_set.
+ 
+ 
+ 
                                                                                                                                                                                                                SEE ALSO
                                                                                                                                                                                                                +@@ -162,7 +161,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-21                 curs_scr_dump(3x)
++ncurses 6.5                       2024-12-28                 curs_scr_dump(3x)
+ 
                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                  
+Index: doc/html/man/curs_slk.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_slk.3x.html	2024-06-22 22:55:08.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_slk.3x.html	2024-12-28 21:43:56.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_slk.3x,v 1.75 2024/06/22 21:25:23 tom Exp @
++  * @Id: curs_slk.3x,v 1.78 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_slk 3x 2024-06-22 ncurses 6.5 Library calls
++curs_slk 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                  curs_slk 3x 2024-06-22 ncurses 6.5 Library calls
                                                                                                                                                                                                                  
++
                                                                                                                                                                                                                  curs_slk 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                  + curs_slk(3x)                     Library calls                    curs_slk(3x)
+ 
+@@ -197,7 +197,7 @@
+                returns ERR if the format parameter is outside the range 0..3.
+ 
+           slk_label
+-               returns NULL on error.
++               returns NULL on error.
+ 
+           slk_set
+                returns  ERR  if  the  terminal  or  the  softkeys   were   not
+@@ -268,7 +268,7 @@
+            If there are more than 16 elements, slk_start returns ERR.
+ 
+        o   The  format  codes  2  and  3 for slk_init were added by ncurses in
+-           1996.  PDCurses 2.4 added this feature in 2001.
++           1996.  PDCurses 2.4 added this feature in 2001.
+ 
+        The function slk_attr was added by ncurses in 1996.
+ 
+@@ -312,7 +312,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-22                      curs_slk(3x)
++ncurses 6.5                       2024-12-28                      curs_slk(3x)
+ 
                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                    
+Index: doc/html/man/curs_termattrs.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_termattrs.3x.html	2024-05-11 21:39:57.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_termattrs.3x.html	2024-12-28 21:43:56.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_termattrs.3x,v 1.42 2024/05/11 20:39:53 tom Exp @
++  * @Id: curs_termattrs.3x,v 1.44 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_termattrs 3x 2024-05-11 ncurses 6.5 Library calls
++curs_termattrs 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                    curs_termattrs 3x 2024-05-11 ncurses 6.5 Library calls
                                                                                                                                                                                                                    
++
                                                                                                                                                                                                                    curs_termattrs 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                    + curs_termattrs(3x)               Library calls              curs_termattrs(3x)
+ 
+@@ -127,7 +127,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                    RETURN VALUE
                                                                                                                                                                                                                    +-       longname and termname return NULL on error.
++       longname and termname return NULL on error.
+ 
+        Routines  that  return  an integer return ERR upon failure and OK (SVr4
+        only specifies "an integer  value  other  than  ERR")  upon  successful
+@@ -149,7 +149,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-11                curs_termattrs(3x)
++ncurses 6.5                       2024-12-28                curs_termattrs(3x)
+ 
                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                      
+Index: doc/html/man/curs_termcap.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_termcap.3x.html	2024-09-21 18:35:27.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_termcap.3x.html	2024-12-28 21:43:56.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_termcap.3x,v 1.91 2024/09/21 18:00:03 tom Exp @
++  * @Id: curs_termcap.3x,v 1.95 2024/12/28 21:28:49 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_termcap 3x 2024-09-21 ncurses 6.5 Library calls
++curs_termcap 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                      curs_termcap 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                                                                                      
++
                                                                                                                                                                                                                      curs_termcap 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                      + curs_termcap(3x)                 Library calls                curs_termcap(3x)
+ 
+@@ -60,12 +60,12 @@
+        char * BC;
+        short ospeed;
+ 
+-       int tgetent(char *bp, const char *name);
+-       int tgetflag(const char *id);
+-       int tgetnum(const char *id);
+-       char *tgetstr(const char *id, char **area);
+-       char *tgoto(const char *cap, int col, int row);
+-       int tputs(const char *str, int affcnt, int (*putc)(int));
++       int tgetent(char * bp, const char * name);
++       int tgetflag(const char * id);
++       int tgetnum(const char * id);
++       char * tgetstr(const char * id, char ** area);
++       char * tgoto(const char * cap, int col, int row);
++       int tputs(const char * str, int affcnt, int (* putc)(int));
+ 
+ 
+ 
                                                                                                                                                                                                                      DESCRIPTION
                                                                                                                                                                                                                      +@@ -80,13 +80,13 @@
+        tgetent loads the terminal database entry for name; see term(7).   This
+        must be done before calling any of the other functions.  It returns
+ 
+-          1    on success,
++          1    on success,
+ 
+-          0    if there is no such entry (or if the matching entry describes a
++          0    if there is no such entry (or if the matching entry describes a
+                generic terminal, having  too  little  information  for  curses
+                applications to run), and
+ 
+-          -1   if the terminfo database could not be found.
++          -1   if the terminfo database could not be found.
+ 
+        This implementation differs from those of historical termcap libraries.
+ 
+@@ -110,15 +110,15 @@
+ 
+        tgetnum obtains the numeric entry for id, or -1 if it is not available.
+ 
+-       tgetstr  returns  the  string  entry  for  id,  or  NULL  if  it is not
++       tgetstr  returns  the  string  entry  for  id,  or  NULL  if  it is not
+        available.   Use  tputs  to  output  the  string  returned.   The  area
+        parameter is used as follows.
+ 
+           o   It is assumed to be the address of a pointer to a buffer managed
+               by the calling application.
+ 
+-          o   However, ncurses checks to ensure that area  is  not  NULL,  and
+-              also  that  the resulting buffer pointer is not NULL.  If either
++          o   However, ncurses checks to ensure that area  is  not  NULL,  and
++              also  that  the resulting buffer pointer is not NULL.  If either
+               check fails, area is ignored.
+ 
+           o   If the checks succeed, ncurses also copies the return  value  to
+@@ -167,11 +167,11 @@
+ 
+ 
+ 
                                                                                                                                                                                                                      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 by delay_output(3x).  BC is used by
+-       tgoto emulation.  The variable ospeed is set by ncurses using a system-
+-       specific encoding to indicate the terminal's data rate.
++       tgetent sets the variables PC, UP, and BC 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 by delay_output(3x).  BC  is  used  by
++       tgoto emulation.  ncurses assigns the variable ospeed a system-specific
++       value to encode the terminal's data rate.
+ 
+ 
+ 
                                                                                                                                                                                                                      Releasing Memory
                                                                                                                                                                                                                      +@@ -198,7 +198,7 @@
+        The return values of  tgetent,  tgetflag,  tgetname,  and  tgetstr  are
+        documented above.
+ 
+-       tgoto returns NULL on error.  Error conditions include:
++       tgoto returns NULL on error.  Error conditions include:
+ 
+        o   uninitialized state (tgetent was not called successfully),
+ 
+@@ -371,7 +371,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-21                  curs_termcap(3x)
++ncurses 6.5                       2024-12-28                  curs_termcap(3x)
+ 
                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                        
+Index: doc/html/man/curs_terminfo.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_terminfo.3x.html	2024-09-14 20:23:27.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_terminfo.3x.html	2024-12-28 21:54:09.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_terminfo.3x,v 1.144 2024/09/14 20:06:50 tom Exp @
++  * @Id: curs_terminfo.3x,v 1.151 2024/12/28 21:32:56 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls
++curs_terminfo 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                        curs_terminfo 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                                                                                                        
++
                                                                                                                                                                                                                        curs_terminfo 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                        + curs_terminfo(3x)                Library calls               curs_terminfo(3x)
+ 
+@@ -57,7 +57,7 @@
+        #include <curses.h>
+        #include <term.h>
+ 
+-       TERMINAL *cur_term;
++       TERMINAL * cur_term;
+ 
+        const char * const boolnames[];
+        const char * const boolcodes[];
+@@ -69,35 +69,38 @@
+        const char * const strcodes[];
+        const char * const strfnames[];
+ 
+-       int setupterm(const char *term, int filedes, int *errret);
+-       TERMINAL *set_curterm(TERMINAL *nterm);
+-       int del_curterm(TERMINAL *oterm);
+-       int restartterm(const char *term, int filedes, int *errret);
++       int setupterm(const char * term, int filedes, int * errret);
++       TERMINAL * set_curterm(TERMINAL * nterm);
++       int del_curterm(TERMINAL * oterm);
++       int restartterm(const char * term, int filedes,
++             int * errret);
+ 
+-       char *tparm(const char *str, ...);
++       char * tparm(const char * str, ...);
+             /* or */
+-       char *tparm(const char *str, long p1 ... long p9);
++       char * tparm(const char * str, long p1 ... long p9);
+ 
+-       int tputs(const char *str, int affcnt, int (*putc)(int));
+-       int putp(const char *str);
++       int tputs(const char * str, int affcnt, int (* putc)(int));
++       int putp(const char * str);
+ 
+-       int vidputs(chtype attrs, int (*putc)(int));
++       int vidputs(chtype attrs, int (* putc)(int));
+        int vidattr(chtype attrs);
+-       int vid_puts(attr_t attrs, short pair, void *opts, int (*putc)(int));
+-       int vid_attr(attr_t attrs, short pair, void *opts);
++       int vid_puts(attr_t attrs, short pair, void * opts,
++             int (* putc)(int));
++       int vid_attr(attr_t attrs, short pair, void * opts);
++
++       int tigetflag(const char * cap-code);
++       int tigetnum(const char * cap-code);
++       char * tigetstr(const char * cap-code);
+ 
+-       int tigetflag(const char *cap-code);
+-       int tigetnum(const char *cap-code);
+-       char *tigetstr(const char *cap-code);
+-
+-       char *tiparm(const char *str, ...);
++       char * tiparm(const char * str, ...);
+ 
+        /* extensions */
+-       char *tiparm_s(int expected, int mask, const char *str, ...);
+-       int tiscan_s(int *expected, int *mask, const char *str);
++       char * tiparm_s(int expected, int mask,
++             const char * str, ...);
++       int tiscan_s(int * expected, int * mask, const char * str);
+ 
+        /* deprecated */
+-       int setterm(const char *term);
++       int setterm(const char * term);
+ 
+ 
+ 
                                                                                                                                                                                                                        DESCRIPTION
                                                                                                                                                                                                                        +@@ -116,78 +119,66 @@
+ 
+ 
+ 
                                                                                                                                                                                                                        Initialization
                                                                                                                                                                                                                        +-       Initially, setupterm should be called.  The high-level curses functions
+-       initscr  and  newterm call setupterm to initialize the low-level set of
+-       terminal-dependent variables listed in term_variables(3x).
+-
+-       Applications can use the terminal  capabilities  either  directly  (via
+-       header  definitions),  or  by  special  functions.   The  header  files
+-       curses.h and term.h should be included  (in  that  order)  to  get  the
+-       definitions for these strings, numbers, and flags.
+-
+-       The  terminfo  variables lines and columns are initialized by setupterm
+-       as follows.
+-
+-       o   If use_env(FALSE) has been called, values  for  lines  and  columns
+-           specified in terminfo are used.
+-
+-       o   Otherwise,  if  the  environment variables LINES and COLUMNS 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 lines and columns specified in the terminfo database are
+-           used.
+-
+-       Parameterized strings should be passed  through  tparm  to  instantiate
+-       them.   All  terminfo strings (including the output of tparm) should be
+-       sent to the terminal device with tputs or putp.  Call  reset_shell_mode
+-       to restore the terminal modes before exiting; see curs_kernel(3x).
++       Call setupterm from  your  application  to  have  terminfo  manage  the
++       terminal   device;   this  action  initializes  the  terminal-dependent
++       variables listed in term_variables(3x).  (A curses application  calling
++       initscr(3x) or newterm(3x) achieves the same result.)  Applications can
++       use the terminal capabilities either directly,  by  object  definitions
++       corresponding to capability names and codes (see term_variables(3x)) or
++       by calling the functions documented here.   setupterm  initializes  the
++       terminfo variables lines and columns as described in use_env(3x).
++
++       Pass   parameterized   string   capability   values  through  tparm  to
++       instantiate them.  All terminfo strings (including the output of tparm)
++       should  be  sent  to  the  terminal  device  with  tputs or putp.  Call
++       reset_shell_mode(3x) to restore the terminal modes before exiting.   (A
++       curses application calling endwin(3x) achieves the same result.)
+ 
+-       Programs that use cursor addressing should
++       Programs that use cursor addressing should emit certain capabilities at
++       specific times.  Specifically, output
+ 
+-       o   output enter_ca_mode upon startup and
++       o   enter_ca_mode upon startup, and
+ 
+-       o   output exit_ca_mode before exiting.
++       o   exit_ca_mode before exiting.
+ 
+        Programs that execute shell subprocesses should
+ 
+-       o   call  reset_shell_mode  and output exit_ca_mode before the shell is
+-           called and
++       o   call reset_shell_mode(3x) and output exit_ca_mode before the  shell
++           is called, and
+ 
+-       o   output enter_ca_mode and call reset_prog_mode after returning  from
+-           the shell.
++       o   output  enter_ca_mode  and call reset_prog_mode(3x) after returning
++           from the shell.
+ 
+-       setupterm  reads  in  the  terminfo database, initializing the terminfo
+-       structures, but does not set up the  output  virtualization  structures
++       setupterm reads in the terminfo  database,  initializing  the  terminfo
++       structures,  but  does  not set up the output virtualization structures
+        used by curses.  Its parameters follow.
+ 
+           term is the terminal type, a character string.  If term is null, the
+                environment variable TERM is read.
+ 
+           filedes
+-               is the file descriptor used for getting  and  setting  terminal
++               is  the  file  descriptor used for getting and setting terminal
+                I/O modes.
+ 
+-               Higher-level  applications  use  newterm(3x)  to initialize the
+-               terminal, passing an output stream rather  than  a  descriptor.
+-               In   curses,  the  two  are  the  same  because  newterm  calls
+-               setupterm, passing the file descriptor derived from its  output
++               Higher-level applications use  newterm(3x)  to  initialize  the
++               terminal,  passing  an  output stream rather than a descriptor.
++               In  curses,  the  two  are  the  same  because  newterm   calls
++               setupterm,  passing the file descriptor derived from its output
+                stream parameter.
+ 
+           errret
+-               points  to  an  optional  location where an error status can be
+-               returned to the caller.  If errret is not null, then  setupterm
+-               returns  OK  or  ERR  and  stores a status value in the integer
+-               pointed to by errret.  A  return  value  of  OK  combined  with
++               points to an optional location where an  error  status  can  be
++               returned  to the caller.  If errret is not null, then setupterm
++               returns OK or ERR and stores a  status  value  in  the  integer
++               pointed  to  by  errret.   A  return  value of OK combined with
+                status of 1 in errret is normal.
+ 
+                If ERR is returned, examine errret:
+ 
+-               1    means  that  the  terminal is hardcopy, and cannot be used
+-                    for curses applications.
+-
+-                    setupterm determines if the entry is a  hardcopy  type  by
+-                    checking the hardcopy (hc) capability.
++               1    means  that  the  terminal  is  a  hard-copy  type  (lacks
++                    destructive  backspace),  and  cannot  be  used for curses
++                    applications.   The  library  determines  this   fact   by
++                    checking the terminal type's hardcopy (hc) capability.
+ 
+                0    means  that the terminal could not be found, or that it is
+                     a generic type, having too little information  for  curses
+@@ -201,9 +192,9 @@
+                If errret is null, setupterm  reports  an  error  message  upon
+                finding an error and exits.  Thus, the simplest call is:
+ 
+-                      setupterm((char *)0, 1, (int *)0);
++                      setupterm((char *) NULL, 1, (int *) NULL);
+ 
+-               which uses all the defaults and sends the output to stdout.
++               which uses all the defaults and sends the output to stdout.
+ 
+ 
+ 
                                                                                                                                                                                                                        The Terminal State
                                                                                                                                                                                                                        +@@ -222,8 +213,8 @@
+        numeric, and string capabilities use the values from nterm.  It returns
+        the old value of cur_term.
+ 
+-       del_curterm frees the memory pointed to by oterm, making  it  available
+-       for  further  use.  If oterm is the same as cur_term, references to any
++       del_curterm frees the memory pointed to by oterm, making  it  available
++       for  further  use.  If oterm is the same as cur_term, references to any
+        of the terminfo Boolean, numeric, and  string  capabilities  thereafter
+        may refer to invalid memory locations until setupterm is called again.
+ 
+@@ -275,10 +266,10 @@
+ 
+ 
+ 
                                                                                                                                                                                                                        Output Functions
                                                                                                                                                                                                                        +-       String  capabilities  can  contain  padding  information,  a time delay
+-       (accommodating performance limitations of hardware terminals) expressed
+-       as $<n>, where n is a nonnegative integral count of milliseconds.  If n
+-       exceeds 30,000 (thirty seconds), it is capped at that value.
++       String  capabilities  can  contain padding, a time delay (accommodating
++       performance limitations of hardware terminals) expressed as $<n>, where
++       n is a nonnegative integral count of milliseconds.  If n exceeds 30,000
++       (thirty seconds), it is capped at that value.
+ 
+        tputs interprets time-delay information in the string str  and  outputs
+        it, executing the delays:
+@@ -296,7 +287,7 @@
+            function.
+ 
+        putp calls "tputs(str, 1, putchar)".  The output of putp always goes to
+-       stdout, rather than the filedes specified in setupterm.
++       stdout, rather than the filedes specified in setupterm.
+ 
+        vidputs displays the string on the terminal in the video attribute mode
+        attrs, which is any combination of the attributes listed in curses(3x).
+@@ -327,8 +318,8 @@
+ 
                                                                                                                                                                                                                        Terminal Capability Functions
                                                                                                                                                                                                                        +        tigetflag,  tigetnum,  and  tigetstr return the value of the capability
+        corresponding to the terminfo cap-code, such as xenl, passed  to  them.
+-       The  cap-code for each capability is given in the table column entitled
+-       cap-code code in the capabilities section of terminfo(5).
++       The  cap-code  for each capability is given in the table column of that
++       name in the "Predefined Capabilities" section of terminfo(5).
+ 
+        These functions return special values to denote errors.
+ 
+@@ -349,7 +340,7 @@
+        (char *)-1
+               if cap-code is not a string capability, or
+ 
+-       0      if it is canceled or absent from the terminal description.
++       NULL   if it is canceled or absent from the terminal description.
+ 
+ 
+ 
                                                                                                                                                                                                                        Terminal Capability Names
                                                                                                                                                                                                                        +@@ -372,9 +363,7 @@
+        Each successful call to setupterm allocates memory to hold the terminal
+        description.   As  a  side  effect,  it  sets cur_term to point to this
+        memory.  If an application calls
+-
+               del_curterm(cur_term);
+-
+        the memory will be freed.
+ 
+        The formatting functions tparm and tiparm extend the storage  allocated
+@@ -406,7 +395,7 @@
+ 
+        setupterm
+             fails  if  it cannot allocate enough memory, or create the initial
+-            windows (stdscr, curscr, and newscr) Other  error  conditions  are
++            windows (stdscr, curscr, and newscr).  Other error conditions  are
+             documented above.
+ 
+        tparm
+@@ -438,29 +427,34 @@
+ 
+ 
+ 
                                                                                                                                                                                                                        PORTABILITY
                                                                                                                                                                                                                        +-       setterm is not described by X/Open and must be considered non-portable.
++       setterm is not described by X/Open and must be considered non-portable.
+        All other functions are as described by X/Open.
+ 
+ 
++
                                                                                                                                                                                                                        Header Files
                                                                                                                                                                                                                        ++       On  legacy curses systems, include curses.h and term.h in that order to
++       get the definitions for these strings, numbers, and flags.
++
++
+ 
                                                                                                                                                                                                                        Compatibility Macros
                                                                                                                                                                                                                        +-       This  implementation  provides  a  few  macros  for  compatibility with
+-       systems before  SVr4  (see  section  "HISTORY"  below).   They  include
+-       Bcrmode,  Bfixterm,  Bgettmode,  Bnocrmode,  Bresetterm, Bsaveterm, and
+-       Bsetterm.
+-
+-       In SVr4, these are found in  curses.h,  but  except  for  setterm,  are
+-       likewise macros.  The one function, setterm, is mentioned in the manual
+-       page.  It further notes that setterm was replaced by setupterm, stating
++       This implementation  provides  a  few  macros  for  compatibility  with
++       systems  before  SVr4  (see  section  "HISTORY"  below).   They include
++       Bcrmode, Bfixterm, Bgettmode, Bnocrmode,  Bresetterm,  Bsaveterm,  and"
++       Bsetterm.   ncurses  implements each of these symbols as macros for BSD
++       curses compatibility.
++
++       In SVr4, these are found in  curses.h,  but  except  for  setterm,  are
++       likewise macros.  The one function, setterm, is mentioned in the manual
++       page.  It further notes that setterm was replaced by setupterm, stating
+        that the call
+-              setupterm(term, 1, (int *)0)
+-
+-       provides  the  same  functionality  as  setterm(term), discouraging the
+-       latter for new programs.  ncurses implements each of these  symbols  as
+-       macros for BSD curses compatibility.
++              setupterm(term, 1, (int *)0)
++       provides the same functionality as
++              setterm(term)
++       and discouraging the latter for new programs.
+ 
+ 
+ 
                                                                                                                                                                                                                        Legacy Data
                                                                                                                                                                                                                        +-       setupterm  copies  the terminal name to the array ttytype.  This is not
++       setupterm  copies  the terminal name to the array ttytype.  This is not
+        part of X/Open Curses, but is assumed by some applications.
+ 
+        Other implementions may not declare the capability name  arrays.   Some
+@@ -473,17 +467,17 @@
+ 
+ 
                                                                                                                                                                                                                        Output Buffering
                                                                                                                                                                                                                        +        Older  versions  of  ncurses assumed that the file descriptor passed to
+-       setupterm from initscr or newterm uses buffered I/O, and would write to
++       setupterm from initscr or newterm uses buffered I/O, and would write to
+        the  corresponding  stream.   In  addition  to  the limitation that the
+        terminal was  left  in  block-buffered  mode  on  exit  (like  System V
+        curses),  it  was  problematic because ncurses did not allow a reliable
+        way to clean up on receiving SIGTSTP.
+ 
+-       The current version (ncurses6) uses output buffers managed directly  by
+-       ncurses.  Some of the low-level functions described in this manual page
+-       write to the standard output.  They are  not  signal-safe.   The  high-
+-       level functions in ncurses employ alternate versions of these functions
+-       using the more reliable buffering scheme.
++       ncurses 6.x uses output buffers managed directly by ncurses.   Some  of
++       the  low-level  functions  described  in  this manual page write to the
++       standard output.  They are not signal-safe.  The  high-level  functions
++       in  ncurses employ alternate versions of these functions using the more
++       reliable buffering scheme.
+ 
+ 
+ 
                                                                                                                                                                                                                        Function Prototypes
                                                                                                                                                                                                                        +@@ -494,16 +488,16 @@
+        o   X/Open Curses uses const  less  effectively  than  a  later  design
+            might,  sometimes applying it needlessly to values that are already
+            constant, and in most cases overlooking  parameters  that  normally
+-           would  use  const.  Passing const-qualified parameters to functions
+-           that do not  declare  them  const  may  prevent  the  program  from
+-           compiling.    On   the   other  hand,  "writable  strings"  are  an
+-           obsolescent feature.
++           would  benefit  from  const.  Passing const-qualified parameters to
++           functions that do not declare them const may  prevent  the  program
++           from  compiling.   On  the  other  hand,  "writable strings" are an
++           obsolescent C language feature.
+ 
+            As an extension, this implementation can be  configured  to  change
+            the  function prototypes to use the const keyword.  The ncurses ABI
+            6 enables this feature by default.
+ 
+-       o   X/Open Curses prototypes tparm with a fixed number  of  parameters,
++       o   X/Open Curses prototypes tparm with a fixed number  of  parameters,
+            rather than a variable argument list.
+ 
+            This  implementation  uses  a  variable  argument  list, but can be
+@@ -512,25 +506,25 @@
+            for this purpose.
+ 
+            In response to review comments by Thomas E. Dickey,  X/Open  Curses
+-           Issue 7 proposed the tiparm function in mid-2009.
++           Issue 7 proposed the tiparm function in mid-2009.
+ 
+-           While  tiparm is always provided in ncurses, the older form is only
+-           available as a build-time configuration option.  If  not  specially
+-           configured, tparm is the same as tiparm.
++           While  tiparm  is  always  provided  in  ncurses, the older form is
++           available only  as  a  build-time  configuration  option.   If  not
++           specially configured, tparm is the same as tiparm.
+ 
+-       Both forms of tparm have drawbacks:
++       Both forms of tparm have drawbacks.
+ 
+-       o   Most of the calls to tparm use only one or two parameters.  Passing
++       o   Most  calls  to  tparm require only one or two parameters.  Passing
+            nine on each call is awkward.
+ 
+            Using long for the numeric parameter type is a workaround  to  make
+-           the  parameter  use  the  same  amount of stack as a pointer.  That
+-           approach dates back to the mid-1980s, before  C  was  standardized.
+-           Since  then,  there is a standard (and pointers are not required to
+-           fit in a long).
++           the  parameter  use  the  same amount of stack memory as a pointer.
++           That approach dates to the mid-1980s, before  C  was  standardized.
++           Since  ANSI C (1989), C language standards do not require a pointer
++           to fit in a long).
+ 
+        o   Providing the right number of parameters for  a  variadic  function
+-           such  as  tiparm  can  be  a  problem,  in  particular  for  string
++           such  as  tiparm  can  be  a  problem,  in  particular  for  string
+            parameters.  However, only a few terminfo capabilities  use  string
+            parameters  (for  instance, the ones used for programmable function
+            keys).
+@@ -538,129 +532,130 @@
+            The ncurses library checks usage of these capabilities, and returns
+            ERR  if the capability mishandles string parameters.  But it cannot
+            check if a calling program provides strings in the right places for
+-           the tparm calls.
++           the tparm calls.
+ 
+-           The  tput(1)  program  checks  its use of these capabilities with a
+-           table, so that it calls tparm correctly.
++           ncurses's  tput(1)  checks  its  use  of  these capabilities with a
++           table, so that it calls tparm correctly.
+ 
+    Special TERM treatment
+-       If configured to use the terminal driver, as with the MinGW port,
++       If ncurses is configured to use the terminal driver, as with the  MinGW
++       port,
+ 
+-       o   setupterm interprets a missing/empty TERM variable as  the  special
++       o   setupterm  interprets  a missing/empty TERM variable as the special
+            value "unknown".
+ 
+            SVr4 curses uses the special value "dumb".
+ 
+-           The  difference  between  the  two  is  that  the  former  uses the
+-           generic_type (gn) terminfo capability, while the latter  does  not.
++           The difference  between  the  two  is  that  the  former  uses  the
++           generic_type  (gn)  terminfo capability, while the latter does not.
+            A generic terminal is unsuitable for full-screen applications.
+ 
+-       o   setupterm  allows explicit use of the the windows console driver by
+-           checking if $TERM is set to "#win32con" or an abbreviation of  that
+-           string.
++       o   setupterm allows explicit use  of  the  Microsoft  Windows  console
++           driver  by  checking  whether the TERM environment variable has the
++           value "#win32con" or an abbreviation of that string.
+ 
+ 
+ 
                                                                                                                                                                                                                        Other Portability Issues
                                                                                                                                                                                                                        +-       In  SVr4,  set_curterm  returns  an  int, OK or ERR.  We have chosen to
++       In SVr4, set_curterm returns an int, OK or  ERR.   We  have  chosen  to
+        implement the X/Open Curses semantics.
+ 
+-       In SVr4, the third argument of tputs has the type "int (*putc)(char)".
++       In SVr4, the third argument of tputs has the type "int (*)(char)".
+ 
+-       At least one implementation of X/Open Curses (Solaris) returns a  value
+-       other  than OK or ERR from tputs.  It instead returns the length of the
+-       string, and does no error checking.
++       At  least one implementation of X/Open Curses (Solaris xcurses) returns
++       a value other than OK or ERR from tputs.  It instead returns the length
++       of the string, and does no error checking.
+ 
+ 
+ 
                                                                                                                                                                                                                        HISTORY
                                                                                                                                                                                                                        +-       SVr2 (1984) introduced the terminfo feature.   Its  programming  manual
++       SVr2  (1984)  introduced  the terminfo feature.  Its programming manual
+        mentioned the following low-level functions.
+ 
+        Function    Description
+        ------------------------------------------------------------------------
+-       fixterm     restore terminal to "in curses" state
+-       gettmode    establish current terminal modes
+-       mvcur       low level cursor motion
+-       putp        use tputs to send characters via putchar
+-       resetterm   set terminal modes to "out of curses" state
+-       resetty     reset terminal flags to stored value
+-       saveterm    save current modes as "in curses" state
+-       savetty     store current terminal flags
+-       setterm     establish terminal with given type
+-       setupterm   establish terminal with given type
+-       tparm       interpolate parameters into string capability
+-       tputs       apply padding information to a string
+-       vidattr     like vidputs, but output through putchar
+-       vidputs     write string to terminal, applying specified attributes
++       fixterm     restore terminal to "in curses" state
++       gettmode    establish current terminal modes
++       mvcur       low level cursor motion
++       putp        use tputs to send characters via putchar
++       resetterm   set terminal modes to "out of curses" state
++       resetty     reset terminal flags to stored value
++       saveterm    save current modes as "in curses" state
++       savetty     store current terminal flags
++       setterm     establish terminal with given type
++       setupterm   establish terminal with given type
++       tparm       interpolate parameters into string capability
++       tputs       apply padding information to a string
++       vidattr     like vidputs, but output through putchar
++       vidputs     write string to terminal, applying specified attributes
+ 
+-       The  programming  manual  also mentioned functions provided for termcap
++       The programming manual also mentioned functions  provided  for  termcap
+        compatibility (commenting that they "may go away at a later date").
+ 
+        Function   Description
+        ------------------------------------------------------------------------
+-       tgetent    look up termcap entry for given name
+-       tgetflag   get Boolean entry for given id
+-       tgetnum    get numeric entry for given id
+-       tgetstr    get string entry for given id
+-       tgoto      apply parameters to given capability
+-       tputs      write characters via a function parameter, applying padding
+-
+-       Early terminfo programs obtained capability values  from  the  TERMINAL
+-       structure initialized by setupterm.
+-
+-       SVr3   (1987)   extended  terminfo  by  adding  functions  to  retrieve
+-       capability values (like the termcap interface), and reusing  tgoto  and
+-       tputs.
++       tgetent    look up termcap entry for given name
++       tgetflag   get Boolean entry for given id
++       tgetnum    get numeric entry for given id
++       tgetstr    get string entry for given id
++       tgoto      apply parameters to given capability
++       tputs      write characters via a function parameter, applying padding
++
++       Early  terminfo  programs  obtained capability values from the TERMINAL
++       structure initialized by setupterm.
++
++       SVr3  (1987)  extended  terminfo  by  adding  functions   to   retrieve
++       capability  values  (like the termcap interface), and reusing tgoto and
++       tputs.
+ 
+        Function    Description
+        ------------------------------------------------------------------------
+-       tigetflag   get Boolean entry for given id
+-       tigetnum    get numeric entry for given id
+-       tigetstr    get string entry for given id
++       tigetflag   get Boolean entry for given id
++       tigetnum    get numeric entry for given id
++       tigetstr    get string entry for given id
+ 
+-       SVr3  also  replaced several of the SVr2 terminfo functions that had no
++       SVr3 also replaced several of the SVr2 terminfo functions that  had  no
+        counterpart in the termcap interface, documenting them as obsolete.
+ 
+        Function    Replaced by
+        ------------------------------------------------------------------------
+-       crmode      cbreak
+-       fixterm     reset_prog_mode
+-       gettmode    n/a
+-       nocrmode    nocbreak
+-       resetterm   reset_shell_mode
+-       saveterm    def_prog_mode
+-       setterm     setupterm
+-
+-       SVr3 kept the mvcur, vidattr, and vidputs functions, along  with  putp,
+-       tparm,  and  tputs.   The latter were needed to support padding, and to
+-       handle capabilities accessed by functions such as vidattr  (which  used
+-       more than the two parameters supported by tgoto).
++       crmode      cbreak
++       fixterm     reset_prog_mode
++       gettmode    n/a
++       nocrmode    nocbreak
++       resetterm   reset_shell_mode
++       saveterm    def_prog_mode
++       setterm     setupterm
++
++       SVr3  kept  the mvcur, vidattr, and vidputs functions, along with putp,
++       tparm, and tputs.  The latter were needed to support  padding,  and  to
++       handle  capabilities  accessed by functions such as vidattr (which used
++       more than the two parameters supported by tgoto).
+ 
+-       SVr3   introduced   the   functions   for  switching  between  terminal
+-       descriptions;  for  example,  set_curterm.   Some   changes   reflected
++       SVr3  introduced  the  functions   for   switching   between   terminal
++       descriptions;   for   example,  set_curterm.   Some  changes  reflected
+        incremental improvements to the SVr2 library.
+ 
+-       o   The  TERMINAL  type  definition  was introduced in SVr3.01, for the
++       o   The TERMINAL type definition was introduced  in  SVr3.01,  for  the
+            term structure provided in SVr2.
+ 
+-       o   Various global variables such as boolnames were  mentioned  in  the
+-           programming  manual  at  this  point, though the variables had been
++       o   Various  global  variables  such as boolnames were mentioned in the
++           programming manual at this point, though  the  variables  had  been
+            provided in SVr2.
+ 
+-       SVr4 (1989) added the vid_attr and vid_puts functions.
++       SVr4 (1989) added the vid_attr and vid_puts functions.
+ 
+-       Other low-level functions are declared in the curses  header  files  of
+-       Unix  systems,  but  none are documented.  Those noted as "obsolete" by
++       Other  low-level  functions  are declared in the curses header files of
++       Unix systems, but none are documented.  Those noted  as  "obsolete"  by
+        SVr3 remained in use by System V's vi(1) editor.
+ 
+ 
+ 
                                                                                                                                                                                                                        SEE ALSO
                                                                                                                                                                                                                        +        curses(3x),   curs_initscr(3x),   curs_kernel(3x),   curs_memleaks(3x),
+-       curs_termcap(3x),   curs_variables(3x),   putc(3),  term_variables(3x),
++       curs_termcap(3x),  curs_variables(3x),   putc(3),   term_variables(3x),
+        terminfo(5)
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-14                 curs_terminfo(3x)
++ncurses 6.5                       2024-12-28                 curs_terminfo(3x)
+ 
                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                          
+@@ -682,6 +677,7 @@
+ 
                                                                                                                                                                                                                        • EXTENSIONS
                                                                                                                                                                                                                          • 
+ 
                                                                                                                                                                                                                        • PORTABILITY
+ 
                                                                                                                                                                                                                            
++
                                                                                                                                                                                                                          • Header Files
                                                                                                                                                                                                                            • 
+ 
                                                                                                                                                                                                                          • Compatibility Macros
                                                                                                                                                                                                                            • 
+ 
                                                                                                                                                                                                                          • Legacy Data
                                                                                                                                                                                                                            • 
+ 
                                                                                                                                                                                                                          • Output Buffering
                                                                                                                                                                                                                            • 
+Index: doc/html/man/curs_touch.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_touch.3x.html	2024-07-27 23:11:32.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_touch.3x.html	2024-12-28 21:43:56.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_touch.3x,v 1.51 2024/07/27 19:55:45 tom Exp @
++  * @Id: curs_touch.3x,v 1.53 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_touch 3x 2024-07-27 ncurses 6.5 Library calls
++curs_touch 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                            curs_touch 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                                                                                                            
++
                                                                                                                                                                                                                            curs_touch 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                            + curs_touch(3x)                   Library calls                  curs_touch(3x)
+ 
+@@ -121,7 +121,7 @@
+        These functions were introduced by SVr4.   The  Solaris  curses  header
+        file, for instance, defines both an actual function and macro for each.
+        The macros give the same result as the actual functions.   SVr4  curses
+-       does  not check the window parameter win to ensure that it is not NULL;
++       does  not check the window parameter win to ensure that it is not NULL;
+        otherwise this implementation behaves the same as SVr4.
+ 
+        X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+@@ -133,7 +133,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                    curs_touch(3x)
++ncurses 6.5                       2024-12-28                    curs_touch(3x)
+ 
                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                              
+Index: doc/html/man/curs_trace.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_trace.3x.html	2024-04-27 18:38:47.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_trace.3x.html	2024-12-28 21:43:56.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_trace.3x,v 1.50 2024/04/20 21:24:19 tom Exp @
++  * @Id: curs_trace.3x,v 1.52 2024/12/28 21:18:35 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_trace 3x 2024-04-20 ncurses 6.5 Library calls
++curs_trace 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                              curs_trace 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                                                                                                                                              
++
                                                                                                                                                                                                                              curs_trace 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                              + curs_trace(3x)                   Library calls                  curs_trace(3x)
+ 
+@@ -230,11 +230,11 @@
+ 
+            The SVr4 tracing feature is undocumented.
+ 
+-       o   PDCurses  provides  traceon  and  traceoff,  which  (like SVr4) are
++       o   PDCurses  provides  traceon  and  traceoff,  which  (like SVr4) are
+            always available, and enable tracing to the "trace" file only  when
+            a debug-library is built.
+ 
+-           PDCurses  has  a  short description of these functions, with a note
++           PDCurses  has  a  short description of these functions, with a note
+            that they are not present in X/Open Curses, ncurses or NetBSD.   It
+            does  not  mention  SVr4,  but the functions' inclusion in a header
+            file section labeled "Quasi-standard" hints at the origin.
+@@ -261,7 +261,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                    curs_trace(3x)
++ncurses 6.5                       2024-12-28                    curs_trace(3x)
+ 
                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                
+Index: doc/html/man/curs_util.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_util.3x.html	2024-09-21 18:35:27.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_util.3x.html	2024-12-28 21:54:09.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_util.3x,v 1.118 2024/09/21 09:30:22 tom Exp @
++  * @Id: curs_util.3x,v 1.122 2024/12/28 21:51:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_util 3x 2024-09-21 ncurses 6.5 Library calls
++curs_util 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                curs_util 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                                                                                                
++
                                                                                                                                                                                                                                curs_util 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                + curs_util(3x)                    Library calls                   curs_util(3x)
+ 
+@@ -251,7 +251,7 @@
+        failure  and OK (SVr4 specifies only "an integer value other than ERR")
+        upon successful completion.
+ 
+-       Routines that return pointers return NULL on error.
++       Routines that return pointers return NULL on error.
+ 
+        In this implementation
+ 
+@@ -316,32 +316,33 @@
+            in the 4.3BSD curses sources.
+ 
+        o   Most implementations simply dump the binary WINDOW structure to the
+-           file.   These  include SVr4 curses, NetBSD and PDCurses, as well as
+-           older ncurses versions.  This implementation (as well as the X/Open
+-           variant of Solaris curses, dated 1995) uses textual dumps.
++           file.   These  include SVr4 curses, NetBSD curses, and PDCurses, as
++           well as older ncurses versions.  This implementation  (as  well  as
++           the  X/Open  variant  of  Solaris  curses, dated 1995) uses textual
++           dumps.
+ 
+-           The  implementations  that use binary dumps use block-I/O (write(2)
++           The implementations that use binary dumps use  block-I/O  (write(2)
+            and read(2) functions).  Those that use textual dumps use buffered-
+            I/O.  A few applications may happen to write extra data in the file
+-           using these functions.  Doing that can  run  into  problems  mixing
+-           block-  and  buffered-I/O.  This implementation reduces the problem
+-           on writes by flushing the output.  However,  reading  from  a  file
++           using  these  functions.   Doing  that can run into problems mixing
++           block- and buffered-I/O.  This implementation reduces  the  problem
++           on  writes  by  flushing  the output.  However, reading from a file
+            written using mixed schemes may not be successful.
+ 
+ 
+ 
                                                                                                                                                                                                                                unctrl, wunctrl
                                                                                                                                                                                                                                +-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+-       error conditions for them.  It states  that  unctrl  and  wunctrl  will
+-       return  a null pointer if unsuccessful.  This implementation checks for
++       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
++       error  conditions  for  them.   It  states that unctrl and wunctrl will
++       return a null pointer if unsuccessful.  This implementation checks  for
+        three cases:
+ 
+-       o   the parameter is a 7-bit US-ASCII code.   This  is  the  case  that
++       o   the  parameter  is  a  7-bit  US-ASCII code.  This is the case that
+            X/Open Curses documented.
+ 
+        o   the parameter is in the range 128-159, i.e., a C1 control code.  If
+-           use_legacy_coding(3x) has been called with a  2  parameter,  unctrl
+-           returns  the  parameter,  i.e.,  a  one-character  string  with the
+-           parameter as the first  character.   Otherwise,  it  returns  "~@",
++           use_legacy_coding(3x)  has  been  called with a 2 parameter, unctrl
++           returns the  parameter,  i.e.,  a  one-character  string  with  the
++           parameter  as  the  first  character.   Otherwise, it returns "~@",
+            "~A", etc., analogous to "^@", "^A", C0 controls.
+ 
+            X/Open Curses does not document whether unctrl can be called before
+@@ -352,33 +353,33 @@
+            pointer.
+ 
+        The strings returned by unctrl in this implementation are determined at
+-       compile  time,  showing C1 controls from the upper-128 codes with a "~"
+-       prefix  rather  than  "^".   Other   implementations   have   different
+-       conventions.    For  example,  they  may  show  both  sets  of  control
+-       characters with "^", and strip the parameter to 7 bits.   Or  they  may
+-       ignore  C1  controls and treat all of the upper-128 codes as printable.
+-       This implementation uses 8 bits but  does  not  modify  the  string  to
+-       reflect  locale.   The use_legacy_coding(3x) function allows the caller
++       compile time, showing C1 controls from the upper-128 codes with  a  "~"
++       prefix   rather   than   "^".   Other  implementations  have  different
++       conventions.   For  example,  they  may  show  both  sets  of   control
++       characters  with  "^",  and strip the parameter to 7 bits.  Or they may
++       ignore C1 controls and treat all of the upper-128 codes  as  printable.
++       This  implementation  uses  8  bits  but  does not modify the string to
++       reflect locale.  The use_legacy_coding(3x) function allows  the  caller
+        to change the output of unctrl.
+ 
+-       Likewise, the meta(3x) function allows the caller to change the  output
+-       of  keyname,  i.e.,  it  determines  whether to use the "M-" prefix for
+-       "meta"   keys   (codes   in   the   range   128    to    255).     Both
+-       use_legacy_coding(3x)   and  meta(3x)  succeed  only  after  curses  is
+-       initialized.  X/Open Curses does not document the  treatment  of  codes
++       Likewise,  the meta(3x) function allows the caller to change the output
++       of keyname, i.e., it determines whether to  use  the  "M-"  prefix  for
++       "meta"    keys    (codes    in   the   range   128   to   255).    Both
++       use_legacy_coding(3x)  and  meta(3x)  succeed  only  after  curses   is
++       initialized.   X/Open  Curses  does not document the treatment of codes
+        128 to 159.  When treating them as "meta" keys (or if keyname is called
+-       before  initializing  curses),  this  implementation  returns   strings
++       before   initializing  curses),  this  implementation  returns  strings
+        "M-^@", "M-^A", etc.
+ 
+        X/Open Curses documents unctrl as declared in <unctrl.h>, which ncurses
+-       does.  However, ncurses' <curses.h> includes <unctrl.h>,  matching  the
++       does.   However,  ncurses' <curses.h> includes <unctrl.h>, matching the
+        behavior of SVr4 curses.  Other implementations may not do that.
+ 
+ 
+ 
                                                                                                                                                                                                                                use_env, use_tioctl
                                                                                                                                                                                                                                +-       If  ncurses  is  configured  to provide the sp-functions extension, the
+-       state of use_env and use_tioctl may be  updated  before  creating  each
+-       screen  rather  than  once  only  (curs_sp_funcs(3x)).  This feature of
++       If ncurses is configured to provide  the  sp-functions  extension,  the
++       state  of  use_env  and  use_tioctl may be updated before creating each
++       screen rather than once  only  (curs_sp_funcs(3x)).   This  feature  of
+        use_env is not provided by other implementations of curses.
+ 
+ 
+@@ -387,8 +388,8 @@
+ 
+        SVr2 (1984) introduced delay_output, flushinp, and keyname.
+ 
+-       SVr3 (1987) added filter.  Later that year, SVr3.1 brought  getwin  and
+-       putwin,  reading  and writing window dumps with fread(3) and fwrite(3),
++       SVr3  (1987)  added filter.  Later that year, SVr3.1 brought getwin and
++       putwin, reading and writing window dumps with fread(3)  and  fwrite(3),
+        respectively.
+ 
+        SVr4 (1989) supplied use_env.
+@@ -405,7 +406,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-21                     curs_util(3x)
++ncurses 6.5                       2024-12-28                     curs_util(3x)
+ 
                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                  
+Index: doc/html/man/curs_window.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/curs_window.3x.html	2024-09-14 20:23:27.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/curs_window.3x.html	2024-12-28 21:54:09.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_window.3x,v 1.54 2024/09/14 20:06:50 tom Exp @
++  * @Id: curs_window.3x,v 1.57 2024/12/28 21:51:45 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_window 3x 2024-09-14 ncurses 6.5 Library calls
++curs_window 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                  curs_window 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                                                                                                                  
++
                                                                                                                                                                                                                                  curs_window 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                  + curs_window(3x)                  Library calls                 curs_window(3x)
+ 
+@@ -162,7 +162,7 @@
+        OK  (SVr4  only  specifies  "an  integer  value  other  than ERR") upon
+        successful completion.
+ 
+-       Routines that return pointers return NULL on error.
++       Routines that return pointers return NULL on error.
+ 
+        X/Open defines no error conditions.  In this implementation
+ 
+@@ -248,7 +248,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-14                   curs_window(3x)
++ncurses 6.5                       2024-12-28                   curs_window(3x)
+ 
                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                    
+Index: doc/html/man/define_key.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/define_key.3x.html	2024-07-27 23:11:32.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/define_key.3x.html	2024-12-28 21:43:57.000000000 +0000
+@@ -28,19 +28,19 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey 1997
+-  * @Id: define_key.3x,v 1.50 2024/07/27 19:43:41 tom Exp @
++  * @Id: define_key.3x,v 1.52 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-define_key 3x 2024-07-27 ncurses 6.5 Library calls
++define_key 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                    define_key 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                                                                                                                    
++
                                                                                                                                                                                                                                    define_key 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                                    + define_key(3x)                   Library calls                  define_key(3x)
+ 
+@@ -65,7 +65,7 @@
+        binding  as  it  does  those  in  the  terminfo  database entry for the
+        terminal type.
+ 
+-       A definition of  NULL  removes  any  existing  binding  from  key-code.
++       A definition of  NULL  removes  any  existing  binding  from  key-code.
+        Similarly,  a  non-positive  key-code  removes  an existing binding for
+        definition, if any.
+ 
+@@ -73,7 +73,7 @@
+ 
                                                                                                                                                                                                                                    RETURN VALUE
                                                                                                                                                                                                                                    +        define_key returns ERR if
+ 
+-       o   definition is NULL and key-code is nonpositive, or
++       o   definition is NULL and key-code is nonpositive, or
+ 
+        o   insufficient memory is available to bind definition to key-code.
+ 
+@@ -100,7 +100,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                    define_key(3x)
++ncurses 6.5                       2024-12-28                    define_key(3x)
+ 
                                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                                      
+Index: doc/html/man/form.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/form.3x.html	2024-05-25 22:33:43.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/form.3x.html	2024-12-28 21:43:57.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: form.3x,v 1.56 2024/05/25 20:52:38 tom Exp @
++  * @Id: form.3x,v 1.58 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-form 3x 2024-05-25 ncurses 6.5 Library calls
++form 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                      form 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                                                                                                                                      
++
                                                                                                                                                                                                                                      form 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                                      + form(3x)                         Library calls                        form(3x)
+ 
+@@ -78,7 +78,7 @@
+ 
                                                                                                                                                                                                                                      Current Default Values for Field Attributes
                                                                                                                                                                                                                                      +        The  form  library maintains a default value for field attributes.  You
+        can get or  set  this  default  by  calling  the  appropriate  set_  or
+-       retrieval  routine  with  a  NULL field pointer.  Changing this default
++       retrieval  routine  with  a  NULL field pointer.  Changing this default
+        with a set_ function affects  future  field  creations,  but  does  not
+        change the rendering of fields already created.
+ 
+@@ -169,7 +169,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                      RETURN VALUE
                                                                                                                                                                                                                                      +-       Routines  that  return  pointers return NULL on error, and set errno to
++       Routines  that  return  pointers return NULL on error, and set errno to
+        the  corresponding  error-code  returned  by  functions  returning   an
+        integer.   Routines  that return an integer return one of the following
+        error codes:
+@@ -245,7 +245,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                          form(3x)
++ncurses 6.5                       2024-12-28                          form(3x)
+ 
                                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                                        
+Index: doc/html/man/form_field.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/form_field.3x.html	2024-04-27 18:38:47.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/form_field.3x.html	2024-12-28 21:43:57.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: form_field.3x,v 1.34 2024/03/16 15:35:01 tom Exp @
++  * @Id: form_field.3x,v 1.36 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-form_field 3x 2024-03-16 ncurses 6.5 Library calls
++form_field 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                        form_field 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                        
++
                                                                                                                                                                                                                                        form_field 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                                        + form_field(3x)                   Library calls                  form_field(3x)
+ 
+@@ -62,7 +62,7 @@
+ 
+ 
                                                                                                                                                                                                                                        DESCRIPTION
                                                                                                                                                                                                                                        +        The  function  set_form_fields  changes  the field pointer array of the
+-       given form.  The array must be terminated by a NULL.
++       given form.  The array must be terminated by a NULL.
+ 
+        The function form_fields returns the field array of the given form.
+ 
+@@ -73,10 +73,10 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                        RETURN VALUE
                                                                                                                                                                                                                                        +-       The  function  form_fields  returns  a pointer (which may be NULL).  It
++       The  function  form_fields  returns  a pointer (which may be NULL).  It
+        does not set errno.
+ 
+-       The function field_count returns ERR if the form parameter is NULL.
++       The function field_count returns ERR if the form parameter is NULL.
+ 
+        The  functions  set_form_fields  and  move_field  return  one  of   the
+        following codes on error:
+@@ -114,7 +114,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                    form_field(3x)
++ncurses 6.5                       2024-12-28                    form_field(3x)
+ 
                                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                                          
+Index: doc/html/man/form_field_buffer.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/form_field_buffer.3x.html	2024-04-27 18:38:47.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/form_field_buffer.3x.html	2024-12-28 21:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: form_field_buffer.3x,v 1.45 2024/03/16 15:35:01 tom Exp @
++  * @Id: form_field_buffer.3x,v 1.47 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-form_field_buffer 3x 2024-03-16 ncurses 6.5 Library calls
++form_field_buffer 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                          form_field_buffer 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                          
++
                                                                                                                                                                                                                                          form_field_buffer 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                                          + form_field_buffer(3x)            Library calls           form_field_buffer(3x)
+ 
+@@ -104,7 +104,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                          RETURN VALUE
                                                                                                                                                                                                                                          +-       The field_buffer  function  returns  NULL  on  error.   It  sets  errno
++       The field_buffer  function  returns  NULL  on  error.   It  sets  errno
+        according to their success:
+ 
+        E_OK The routine succeeded.
+@@ -152,7 +152,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16             form_field_buffer(3x)
++ncurses 6.5                       2024-12-28             form_field_buffer(3x)
+ 
                                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                                            
+Index: doc/html/man/form_field_new.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/form_field_new.3x.html	2024-04-27 18:38:47.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/form_field_new.3x.html	2024-12-28 21:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: form_field_new.3x,v 1.41 2024/03/16 15:35:01 tom Exp @
++  * @Id: form_field_new.3x,v 1.43 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-form_field_new 3x 2024-03-16 ncurses 6.5 Library calls
++form_field_new 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                            form_field_new 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                            
++
                                                                                                                                                                                                                                            form_field_new 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                                            + form_field_new(3x)               Library calls              form_field_new(3x)
+ 
+@@ -81,7 +81,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                            RETURN VALUE
                                                                                                                                                                                                                                            +-       The functions new_field, dup_field, link_field return  NULL  on  error.
++       The functions new_field, dup_field, link_field return  NULL  on  error.
+        They set errno according to their success:
+ 
+        E_OK The routine succeeded.
+@@ -122,7 +122,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                form_field_new(3x)
++ncurses 6.5                       2024-12-28                form_field_new(3x)
+ 
                                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                                              
+Index: doc/html/man/form_field_userptr.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/form_field_userptr.3x.html	2024-04-27 18:38:47.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/form_field_userptr.3x.html	2024-12-28 21:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: form_field_userptr.3x,v 1.30 2024/03/16 15:35:01 tom Exp @
++  * @Id: form_field_userptr.3x,v 1.32 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-form_field_userptr 3x 2024-03-16 ncurses 6.5 Library calls
++form_field_userptr 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                              form_field_userptr 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                              
++
                                                                                                                                                                                                                                              form_field_userptr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                              + form_field_userptr(3x)           Library calls          form_field_userptr(3x)
+ 
+@@ -65,7 +65,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                              RETURN VALUE
                                                                                                                                                                                                                                              +-       The function field_userptr returns a pointer (which may be  NULL).   It
++       The function field_userptr returns a pointer (which may be  NULL).   It
+        does not set errno.
+ 
+        The function set_field_userptr returns E_OK (success).
+@@ -89,7 +89,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16            form_field_userptr(3x)
++ncurses 6.5                       2024-12-28            form_field_userptr(3x)
+ 
                                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                                
+Index: doc/html/man/form_field_validation.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/form_field_validation.3x.html	2024-04-27 18:38:47.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/form_field_validation.3x.html	2024-12-28 21:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: form_field_validation.3x,v 1.53 2024/03/16 15:35:01 tom Exp @
++  * @Id: form_field_validation.3x,v 1.55 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-form_field_validation 3x 2024-03-16 ncurses 6.5 Library calls
++form_field_validation 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                form_field_validation 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                
++
                                                                                                                                                                                                                                                form_field_validation 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                                + form_field_validation(3x)        Library calls       form_field_validation(3x)
+ 
+@@ -197,7 +197,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                RETURN VALUE
                                                                                                                                                                                                                                                +-       The functions field_type and  field_arg  return  NULL  on  error.   The
++       The functions field_type and  field_arg  return  NULL  on  error.   The
+        function set_field_type returns one of the following:
+ 
+        E_OK The routine succeeded.
+@@ -221,7 +221,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16         form_field_validation(3x)
++ncurses 6.5                       2024-12-28         form_field_validation(3x)
+ 
                                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                                  
+Index: doc/html/man/form_fieldtype.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/form_fieldtype.3x.html	2024-04-27 18:38:48.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/form_fieldtype.3x.html	2024-12-28 21:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: form_fieldtype.3x,v 1.46 2024/03/16 15:35:01 tom Exp @
++  * @Id: form_fieldtype.3x,v 1.48 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-form_fieldtype 3x 2024-03-16 ncurses 6.5 Library calls
++form_fieldtype 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                  form_fieldtype 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                  
++
                                                                                                                                                                                                                                                  form_fieldtype 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                                  + form_fieldtype(3x)               Library calls              form_fieldtype(3x)
+ 
+@@ -118,7 +118,7 @@
+             Frees an argument-block structure.
+ 
+        You must supply the make_arg function.  The other two are optional: you
+-       may  supply NULL for them.  In this case, the form library assumes that
++       may  supply NULL for them.  In this case, the form library assumes that
+        make_arg does not allocate memory but simply loads the argument into  a
+        single scalar value.
+ 
+@@ -183,7 +183,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                form_fieldtype(3x)
++ncurses 6.5                       2024-12-28                form_fieldtype(3x)
+ 
                                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                                    
+Index: doc/html/man/form_hook.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/form_hook.3x.html	2024-04-27 18:38:48.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/form_hook.3x.html	2024-12-28 21:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: form_hook.3x,v 1.37 2024/03/16 15:35:01 tom Exp @
++  * @Id: form_hook.3x,v 1.39 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-form_hook 3x 2024-03-16 ncurses 6.5 Library calls
++form_hook 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                    form_hook 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                    
++
                                                                                                                                                                                                                                                    form_hook 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                                                    + form_hook(3x)                    Library calls                   form_hook(3x)
+ 
+@@ -78,7 +78,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                    field_init
                                                                                                                                                                                                                                                    +-       returns the current field init hook, if any (NULL if there is  no  such
++       returns the current field init hook, if any (NULL if there is  no  such
+        hook).
+ 
+ 
+@@ -88,7 +88,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                    field_term
                                                                                                                                                                                                                                                    +-       returns the current field term hook, if any (NULL if there is  no  such
++       returns the current field term hook, if any (NULL if there is  no  such
+        hook).
+ 
+ 
+@@ -98,7 +98,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                    form_init
                                                                                                                                                                                                                                                    +-       returns the current form init hook, if any (NULL if there  is  no  such
++       returns the current form init hook, if any (NULL if there  is  no  such
+        hook).
+ 
+ 
+@@ -108,12 +108,12 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                    form_term
                                                                                                                                                                                                                                                    +-       returns the current form term hook, if any (NULL if there  is  no  such
++       returns the current form term hook, if any (NULL if there  is  no  such
+        hook).
+ 
+ 
+ 
                                                                                                                                                                                                                                                    RETURN VALUE
                                                                                                                                                                                                                                                    +-       Routines  that  return  pointers  return NULL on error.  Other routines
++       Routines  that  return  pointers  return NULL on error.  Other routines
+        return one of the following:
+ 
+        E_OK The routine succeeded.
+@@ -137,7 +137,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                     form_hook(3x)
++ncurses 6.5                       2024-12-28                     form_hook(3x)
+ 
                                                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                                                      
+Index: doc/html/man/form_new.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/form_new.3x.html	2024-04-27 18:38:48.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/form_new.3x.html	2024-12-28 21:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: form_new.3x,v 1.32 2024/03/16 15:35:01 tom Exp @
++  * @Id: form_new.3x,v 1.34 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-form_new 3x 2024-03-16 ncurses 6.5 Library calls
++form_new 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                      form_new 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                      
++
                                                                                                                                                                                                                                                      form_new 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                                                      + form_new(3x)                     Library calls                    form_new(3x)
+ 
+@@ -59,14 +59,14 @@
+ 
+ 
                                                                                                                                                                                                                                                      DESCRIPTION
                                                                                                                                                                                                                                                      +        The function new_form creates a new form connected to a specified field
+-       pointer array (which must be NULL-terminated).
++       pointer array (which must be NULL-terminated).
+ 
+        The function free_form disconnects form from its field array and  frees
+        the storage allocated for the form.
+ 
+ 
+ 
                                                                                                                                                                                                                                                      RETURN VALUE
                                                                                                                                                                                                                                                      +-       The  function  new_form returns NULL on error.  It sets errno according
++       The  function  new_form returns NULL on error.  It sets errno according
+        to the function's success:
+ 
+        E_OK The routine succeeded.
+@@ -106,7 +106,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                      form_new(3x)
++ncurses 6.5                       2024-12-28                      form_new(3x)
+ 
                                                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                                                        
+Index: doc/html/man/form_page.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/form_page.3x.html	2024-04-27 18:38:48.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/form_page.3x.html	2024-12-28 21:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: form_page.3x,v 1.37 2024/03/16 15:35:01 tom Exp @
++  * @Id: form_page.3x,v 1.39 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-form_page 3x 2024-03-16 ncurses 6.5 Library calls
++form_page 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                        form_page 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                        
++
                                                                                                                                                                                                                                                        form_page 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                                                        + form_page(3x)                    Library calls                   form_page(3x)
+ 
+@@ -70,7 +70,7 @@
+ 
+        The function unfocus_current_field removes the focus from  the  current
+        field  of  the  form.  In such state, inquiries via current_field shall
+-       return a NULL pointer.
++       return a NULL pointer.
+ 
+        The function set_form_page sets the form's page number (goes to page  n
+        of the form).
+@@ -120,7 +120,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                     form_page(3x)
++ncurses 6.5                       2024-12-28                     form_page(3x)
+ 
                                                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                                                          
+Index: doc/html/man/form_requestname.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/form_requestname.3x.html	2024-04-27 18:38:48.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/form_requestname.3x.html	2024-12-28 21:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: form_requestname.3x,v 1.35 2024/03/16 15:35:01 tom Exp @
++  * @Id: form_requestname.3x,v 1.37 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-form_requestname 3x 2024-03-16 ncurses 6.5 Library calls
++form_requestname 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                          form_requestname 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                          
++
                                                                                                                                                                                                                                                          form_requestname 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                                                          + form_requestname(3x)             Library calls            form_requestname(3x)
+ 
+@@ -66,7 +66,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                          RETURN VALUE
                                                                                                                                                                                                                                                          +-       form_request_name   returns   NULL   on   error   and   sets  errno  to
++       form_request_name   returns   NULL   on   error   and   sets  errno  to
+        E_BAD_ARGUMENT.
+ 
+        form_request_by_name returns E_NO_MATCH on  error.   It  does  not  set
+@@ -89,7 +89,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16              form_requestname(3x)
++ncurses 6.5                       2024-12-28              form_requestname(3x)
+ 
                                                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                                                            
+Index: doc/html/man/form_userptr.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/form_userptr.3x.html	2024-04-27 18:38:48.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/form_userptr.3x.html	2024-12-28 21:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: form_userptr.3x,v 1.36 2024/03/16 15:35:01 tom Exp @
++  * @Id: form_userptr.3x,v 1.38 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-form_userptr 3x 2024-03-16 ncurses 6.5 Library calls
++form_userptr 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                            form_userptr 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                            
++
                                                                                                                                                                                                                                                            form_userptr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                                                            + form_userptr(3x)                 Library calls                form_userptr(3x)
+ 
+@@ -65,7 +65,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                            RETURN VALUE
                                                                                                                                                                                                                                                            +-       The function form_userptr returns a pointer (which may  be  NULL).   It
++       The function form_userptr returns a pointer (which may  be  NULL).   It
+        does not set errno.
+ 
+        The function set_form_userptr returns E_OK (success).
+@@ -89,7 +89,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                  form_userptr(3x)
++ncurses 6.5                       2024-12-28                  form_userptr(3x)
+ 
                                                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                                                              
+Index: doc/html/man/form_win.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/form_win.3x.html	2024-04-27 18:38:48.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/form_win.3x.html	2024-12-28 21:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: form_win.3x,v 1.35 2024/03/16 15:35:01 tom Exp @
++  * @Id: form_win.3x,v 1.37 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-form_win 3x 2024-03-16 ncurses 6.5 Library calls
++form_win 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                              form_win 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                              
++
                                                                                                                                                                                                                                                              form_win 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                                              + form_win(3x)                     Library calls                    form_win(3x)
+ 
+@@ -72,8 +72,8 @@
+        necessary to set either window; by default, the driver code uses stdscr
+        for both.
+ 
+-       In the set_ functions, window argument of NULL is treated as though  it
+-       were stsdcr.  A form argument of NULL is treated as a request to change
++       In the set_ functions, window argument of NULL is treated as though  it
++       were stsdcr.  A form argument of NULL is treated as a request to change
+        the system default form window or subwindow.
+ 
+        The function scale_form returns  the  minimum  size  required  for  the
+@@ -81,7 +81,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                              RETURN VALUE
                                                                                                                                                                                                                                                              +-       Routines  that  return  pointers  return  NULL on error.  Routines that
++       Routines  that  return  pointers  return  NULL on error.  Routines that
+        return an integer return one of the following error codes:
+ 
+        E_OK The routine succeeded.
+@@ -114,7 +114,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                      form_win(3x)
++ncurses 6.5                       2024-12-28                      form_win(3x)
+ 
                                                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                                                
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.5-20241221+/doc/html/man/infocmp.1m.html	2024-09-21 18:35:28.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/infocmp.1m.html	2024-12-28 21:43:57.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: infocmp.1m,v 1.114 2024/09/21 18:04:29 tom Exp @
++  * @Id: infocmp.1m,v 1.117 2024/12/28 21:36:19 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-infocmp 1m 2024-09-21 ncurses 6.5 User commands
++infocmp 1m 2024-12-28 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                infocmp 1m 2024-09-21 ncurses 6.5 User commands
                                                                                                                                                                                                                                                                
++
                                                                                                                                                                                                                                                                infocmp 1m 2024-12-28 ncurses 6.5 User commands
                                                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                                                + infocmp(1m)                      User commands                     infocmp(1m)
+ 
+@@ -58,60 +58,22 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                                DESCRIPTION
                                                                                                                                                                                                                                                                +-       infocmp  can  be  used  to  compare  a binary terminfo entry with other
+-       terminfo entries, rewrite a terminfo description to take  advantage  of
+-       the  use=  terminfo field, or print out a terminfo description from the
+-       binary file (term) 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.
++       infocmp  reports  a  human-readable  terminal  type  description from a
++       compiled entry in the terminfo database  in  a  variety  of  selectable
++       formats,  compares such entries to each other, and rewrites an entry to
++       replace  "use"  expressions  with  the  content  of  other  entries  by
++       reference.   A  terminfo  entry  entry  comprises a list of one or more
++       terminal type identifiers, a human-readable description of the terminal
++       type,  and  a  list  of  terminal  capabilities  that  characterize its
++       programming interface.  In all  cases,  the  program  reports  Boolean-
++       valued  capabilities  first, followed by numeric ones, and then string-
++       valued capabilities.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                Default Options
                                                                                                                                                                                                                                                                +-       If no  options  are  specified  and  zero  or  one  terminal-types  are
+-       specified,  the  -I option will be assumed.  If more than one terminal-
+-       type is specified, the -d option will be assumed.
+-
+-
+-
                                                                                                                                                                                                                                                                Comparison Options [-d] [-c] [-n]
                                                                                                                                                                                                                                                                +-       infocmp  compares  the  terminfo  description  of  the  first  terminal
+-       terminal-type  with  each  of the descriptions given by the entries for
+-       the other terminal's terminal-types.  If a capability  is  defined  for
+-       only  one  of  the terminals, the value returned depends on the type of
+-       the capability:
+-
+-       o   F for missing Boolean variables
+-
+-       o   NULL for missing integer or string variables
+-
+-       Use the -q option to show the distinction between absent  and  canceled
+-       capabilities.
+-
+-       These  options  produce a list which you can use to compare two or more
+-       terminal descriptions:
+-
+-       -d   produces a list of each capability that is different  between  two
+-            entries.   Each  item  in  the list shows ":" after the capability
+-            name, followed by the capability values, separated by a comma.
+-
+-       -c   produces a list of each capability that is common between  two  or
+-            more entries.  Missing capabilities are ignored.  Each item in the
+-            list  shows  "="  after  the  capability  name,  followed  by  the
+-            capability value.
+-
+-            The  -u  option  provides  a  related  output,  showing  the first
+-            terminal description rewritten to use the  second  as  a  building
+-            block via the "use=" clause.
+-
+-       -n   produces  a  list  of each capability that is in none of the given
+-            entries.  Each item in the list shows "!"  before  the  capability
+-            name.
+-
+-            Normally only the conventional capabilities are shown.  Use the -x
+-            option to add the BSD-compatibility capabilities  (names  prefixed
+-            with "OT").
+-
+-            If  no  terminal-types  are  given,  infocmp  uses the environment
+-            variable TERM for each of the terminal-types.
++       If  no  options  are  specified  and  zero  or  one  terminal-types  is
++       specified,  infocmp  assumes  the  -I  option.   If  more  than  one is
++       specified, the program assumes the -d option.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                Source Listing Options [-I] [-L] [-C] [-r]
                                                                                                                                                                                                                                                                +@@ -177,6 +139,46 @@
+                  %p2...%p1                  %r        hpgeneric
+ 
+ 
++
                                                                                                                                                                                                                                                                Entry Comparison Options [-d] [-c] [-n]
                                                                                                                                                                                                                                                                ++       Given -c, -d, or -n, infocmp compares the terminfo description  of  the
++       first  specified  terminal-type  with  those  of each of the subsequent
++       operands.  If fewer terminal-types than required are specified, infocmp
++       uses the environment variable TERM in their place.
++
++       If  a  capability  is  defined  for  only  one terminal type, the value
++       reported depends on the capability's type:
++
++       o   F for missing Boolean variables
++
++       o   NULL for missing integer or string variables
++
++       The -c and -d options  report  string  capability  values  between  "'"
++       characters.   Use  the  -q  option  to  distinguish absent and canceled
++       capabilities; see terminfo(5).
++
++       The comparison option selects the form of report.
++
++       -d   lists each capability that  differs  between  two  entries.   Each
++            capability  name is followed by ":" and comma-separated capability
++            values, then a period.
++
++       -c   lists each capability that two entries have  in  common.   infocmp
++            ignores  capabilities  missing from either entry.  Each capability
++            name is followed by "=", a space, and the capability value, then a
++            period.
++
++            If  the  -u  option  is  further  specified,  infocmp rewrites the
++            description of the first type employing "use=" syntax to  use  the
++            second as a building block.
++
++       -n   lists  capabilities  that  are in none of the given entries.  Each
++            capability name is preceded by "!"  and followed by a period.
++
++            Normally only conventional capabilities are  shown.   Use  the  -x
++            option  to add BSD-compatibility capabilities (names prefixed with
++            "OT").
++
++
+ 
                                                                                                                                                                                                                                                                Use= Option [-u]
                                                                                                                                                                                                                                                                +        The -u option produces a  terminfo  source  description  of  the  first
+        terminal terminal-type which is relative to the sum of the descriptions
+@@ -315,8 +317,8 @@
+                       DECSTR        soft reset (VT320)
+                       S7C1T         7-bit controls (VT220)
+                       -----------------------------------------
+-
+                       ISO DEC G0    enable DEC graphics for G0
++
+                       ISO UK G0     enable UK chars for G0
+                       ISO US G0     enable US chars for G0
+                       ISO DEC G1    enable DEC graphics for G1
+@@ -529,7 +531,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-21                       infocmp(1m)
++ncurses 6.5                       2024-12-28                       infocmp(1m)
+ 
                                                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                                                  
+@@ -538,8 +540,8 @@
+ 
                                                                                                                                                                                                                                                                • DESCRIPTION
+ 
+Index: doc/html/man/keybound.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/keybound.3x.html	2024-06-08 23:29:41.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/keybound.3x.html	2024-12-28 21:43:57.000000000 +0000
+@@ -28,19 +28,19 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey 1999
+-  * @Id: keybound.3x,v 1.40 2024/06/08 23:25:57 tom Exp @
++  * @Id: keybound.3x,v 1.42 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-keybound 3x 2024-06-08 ncurses 6.5 Library calls
++keybound 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                  keybound 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                  
++
                                                                                                                                                                                                                                                                  keybound 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                                                  + keybound(3x)                     Library calls                    keybound(3x)
+ 
+@@ -72,7 +72,7 @@
+ 
                                                                                                                                                                                                                                                                  RETURN VALUE
                                                                                                                                                                                                                                                                  +        If key-code corresponds to a function key defined by the application or
+        the terminal type in use, keybound allocates and returns a string  that
+-       must be freed by the application.  keybound returns NULL if key-code is
++       must be freed by the application.  keybound returns NULL if key-code is
+        not positive or if it does not correspond to a key code definition.
+ 
+ 
+@@ -94,7 +94,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                      keybound(3x)
++ncurses 6.5                       2024-12-28                      keybound(3x)
+ 
                                                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                                                    
+Index: doc/html/man/menu.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/menu.3x.html	2024-05-25 22:33:44.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/menu.3x.html	2024-12-28 21:43:57.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: menu.3x,v 1.47 2024/05/25 20:52:38 tom Exp @
++  * @Id: menu.3x,v 1.49 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-menu 3x 2024-05-25 ncurses 6.5 Library calls
++menu 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                    menu 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                    
++
                                                                                                                                                                                                                                                                    menu 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                                                                    + menu(3x)                         Library calls                        menu(3x)
+ 
+@@ -71,7 +71,7 @@
+ 
                                                                                                                                                                                                                                                                    Current Default Values for Item Attributes
                                                                                                                                                                                                                                                                    +        The menu library maintains a default value for  item  attributes.   You
+        can  get  or  set  this default by calling the appropriate get_ or set_
+-       routine with a NULL item pointer.  Changing this default  with  a  set_
++       routine with a NULL item pointer.  Changing this default  with  a  set_
+        function  affects  future  item  creations,  but  does  not  change the
+        rendering of items already created.
+ 
+@@ -150,7 +150,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                                    RETURN VALUE
                                                                                                                                                                                                                                                                    +-       Routines  that  return  pointers  return  NULL on error.  Routines that
++       Routines  that  return  pointers  return  NULL on error.  Routines that
+        return an integer return one of the following error codes:
+ 
+        E_OK The routine succeeded.
+@@ -220,7 +220,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                          menu(3x)
++ncurses 6.5                       2024-12-28                          menu(3x)
+ 
                                                                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                                                                      
+Index: doc/html/man/menu_hook.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/menu_hook.3x.html	2024-04-27 18:38:48.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/menu_hook.3x.html	2024-12-28 21:43:58.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: menu_hook.3x,v 1.32 2024/03/16 15:35:01 tom Exp @
++  * @Id: menu_hook.3x,v 1.34 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-menu_hook 3x 2024-03-16 ncurses 6.5 Library calls
++menu_hook 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                      menu_hook 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                      
++
                                                                                                                                                                                                                                                                      menu_hook 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                                                                      + menu_hook(3x)                    Library calls                   menu_hook(3x)
+ 
+@@ -73,27 +73,27 @@
+ 
+        The  function  set_item_init sets a hook to be called at menu-post time
+        and each time the selected item changes (after the change).   item_init
+-       returns  the  current  item init hook, if any (NULL if there is no such
++       returns  the  current  item init hook, if any (NULL if there is no such
+        hook).
+ 
+        The function set_item_term sets a hook to be called at menu-unpost time
+        and each time the selected item changes (before the change).  item_term
+-       returns the current item term hook, if any (NULL if there  is  no  such
++       returns the current item term hook, if any (NULL if there  is  no  such
+        hook).
+ 
+        The  function  set_menu_init sets a hook to be called at menu-post time
+        and just after the top row on the  menu  changes  once  it  is  posted.
+-       menu_init  returns the current menu init hook, if any (NULL if there is
++       menu_init  returns the current menu init hook, if any (NULL if there is
+        no such hook).
+ 
+        The function set_menu_term sets a hook to be called at menu-unpost time
+        and  just  before  the  top  row on the menu changes once it is posted.
+-       menu_term returns the current menu term hook, if any (NULL if there  is
++       menu_term returns the current menu term hook, if any (NULL if there  is
+        no such hook).
+ 
+ 
+ 
                                                                                                                                                                                                                                                                      RETURN VALUE
                                                                                                                                                                                                                                                                      +-       Routines  that  return  pointers  return NULL on error.  Other routines
++       Routines  that  return  pointers  return NULL on error.  Other routines
+        return one of the following:
+ 
+        E_OK The routine succeeded.
+@@ -117,7 +117,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                     menu_hook(3x)
++ncurses 6.5                       2024-12-28                     menu_hook(3x)
+ 
                                                                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                                                                        
+Index: doc/html/man/menu_items.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/menu_items.3x.html	2024-04-27 18:38:48.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/menu_items.3x.html	2024-12-28 21:43:58.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: menu_items.3x,v 1.34 2024/03/16 15:35:01 tom Exp @
++  * @Id: menu_items.3x,v 1.36 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-menu_items 3x 2024-03-16 ncurses 6.5 Library calls
++menu_items 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                        menu_items 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                        
++
                                                                                                                                                                                                                                                                        menu_items 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                                                                        + menu_items(3x)                   Library calls                  menu_items(3x)
+ 
+@@ -61,7 +61,7 @@
+ 
+ 
                                                                                                                                                                                                                                                                        DESCRIPTION
                                                                                                                                                                                                                                                                        +        The function set_menu_items changes the item pointer array of the given
+-       menu.  The array must be terminated by a NULL.
++       menu.  The array must be terminated by a NULL.
+ 
+        The function menu_items returns the item array of the given menu.
+ 
+@@ -69,11 +69,11 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                                        RETURN VALUE
                                                                                                                                                                                                                                                                        +-       The function menu_items returns a pointer (which may be NULL).  It does
++       The function menu_items returns a pointer (which may be NULL).  It does
+        not set errno.
+ 
+        The function item_count returns ERR (the general  curses  error  return
+-       value) if its menu parameter is NULL.
++       value) if its menu parameter is NULL .
+ 
+        The  function  set_menu_items  returns  one  of  the following codes on
+        error:
+@@ -111,7 +111,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                    menu_items(3x)
++ncurses 6.5                       2024-12-28                    menu_items(3x)
+ 
                                                                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                                                                          
+Index: doc/html/man/menu_mark.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/menu_mark.3x.html	2024-04-27 18:38:48.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/menu_mark.3x.html	2024-12-28 21:43:58.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: menu_mark.3x,v 1.35 2024/03/16 15:35:01 tom Exp @
++  * @Id: menu_mark.3x,v 1.37 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-menu_mark 3x 2024-03-16 ncurses 6.5 Library calls
++menu_mark 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                          menu_mark 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                          
++
                                                                                                                                                                                                                                                                          menu_mark 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                                                                          + menu_mark(3x)                    Library calls                   menu_mark(3x)
+ 
+@@ -67,15 +67,15 @@
+        string.   Note  that  changing the length of the mark string for a menu
+        while the menu is posted is likely to produce unhelpful behavior.
+ 
+-       The default string is "-" (a dash).  Calling set_menu_mark with a  non-
+-       NULL menu argument will change this default.
++       The default string is "-" (a dash).  Calling set_menu_mark with a  non-
++       NULL menu argument will change this default.
+ 
+-       The function menu_mark returns the menu's mark string (or NULL if there
++       The function menu_mark returns the menu's mark string (or NULL if there
+        is none).
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          RETURN VALUE
                                                                                                                                                                                                                                                                          +-       The function menu_mark returns a pointer (which may be NULL).  It  does
++       The function menu_mark returns a pointer (which may be NULL).  It  does
+        not set errno.
+ 
+        The function set_menu_mark may return the following error codes:
+@@ -104,7 +104,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                     menu_mark(3x)
++ncurses 6.5                       2024-12-28                     menu_mark(3x)
+ 
                                                                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                                                                            
+Index: doc/html/man/menu_new.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/menu_new.3x.html	2024-04-27 18:38:48.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/menu_new.3x.html	2024-12-28 21:43:58.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: menu_new.3x,v 1.35 2024/03/16 15:35:01 tom Exp @
++  * @Id: menu_new.3x,v 1.37 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-menu_new 3x 2024-03-16 ncurses 6.5 Library calls
++menu_new 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                            menu_new 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                            
++
                                                                                                                                                                                                                                                                            menu_new 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                                                                            + menu_new(3x)                     Library calls                    menu_new(3x)
+ 
+@@ -59,14 +59,14 @@
+ 
+ 
                                                                                                                                                                                                                                                                            DESCRIPTION
                                                                                                                                                                                                                                                                            +        The  function new_menu creates a new menu connected to a specified item
+-       pointer array (which must be NULL-terminated).
++       pointer array (which must be NULL-terminated).
+ 
+        The function free_menu disconnects menu from its item array  and  frees
+        the storage allocated for the menu.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                            RETURN VALUE
                                                                                                                                                                                                                                                                            +-       The  function  new_menu returns NULL on error.  It sets errno according
++       The  function  new_menu returns NULL on error.  It sets errno according
+        to the function's failure:
+ 
+        E_NOT_CONNECTED
+@@ -104,7 +104,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                      menu_new(3x)
++ncurses 6.5                       2024-12-28                      menu_new(3x)
+ 
                                                                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                                                                              
+Index: doc/html/man/menu_pattern.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/menu_pattern.3x.html	2024-04-27 18:38:48.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/menu_pattern.3x.html	2024-12-28 21:43:58.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: menu_pattern.3x,v 1.38 2024/03/16 15:35:01 tom Exp @
++  * @Id: menu_pattern.3x,v 1.40 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-menu_pattern 3x 2024-03-16 ncurses 6.5 Library calls
++menu_pattern 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                              menu_pattern 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                              
++
                                                                                                                                                                                                                                                                              menu_pattern 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                                                              + menu_pattern(3x)                 Library calls                menu_pattern(3x)
+ 
+@@ -70,8 +70,8 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                                              RETURN VALUE
                                                                                                                                                                                                                                                                              +-       The  function menu_pattern returns a pointer, which is NULL if the menu
+-       parameter is NULL.  Otherwise, it is a pointer to  a  string  which  is
++       The  function menu_pattern returns a pointer, which is NULL if the menu
++       parameter is NULL.  Otherwise, it is a pointer to  a  string  which  is
+        empty if no pattern has been set.  It does not set errno.
+ 
+        The function set_menu_pattern may return the following error codes:
+@@ -109,7 +109,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                  menu_pattern(3x)
++ncurses 6.5                       2024-12-28                  menu_pattern(3x)
+ 
                                                                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                                                                
+Index: doc/html/man/menu_requestname.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/menu_requestname.3x.html	2024-04-27 18:38:48.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/menu_requestname.3x.html	2024-12-28 21:43:58.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: menu_requestname.3x,v 1.33 2024/03/16 15:35:01 tom Exp @
++  * @Id: menu_requestname.3x,v 1.35 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-menu_requestname 3x 2024-03-16 ncurses 6.5 Library calls
++menu_requestname 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                                menu_requestname 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                                
++
                                                                                                                                                                                                                                                                                menu_requestname 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                                                                + menu_requestname(3x)             Library calls            menu_requestname(3x)
+ 
+@@ -67,7 +67,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                                                RETURN VALUE
                                                                                                                                                                                                                                                                                +-       menu_request_name   returns   NULL   on   error   and   sets  errno  to
++       menu_request_name   returns   NULL   on   error   and   sets  errno  to
+        E_BAD_ARGUMENT.
+        menu_request_by_name returns E_NO_MATCH on  error.   It  does  not  set
+        errno.
+@@ -89,7 +89,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16              menu_requestname(3x)
++ncurses 6.5                       2024-12-28              menu_requestname(3x)
+ 
                                                                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                                                                  
+Index: doc/html/man/menu_spacing.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/menu_spacing.3x.html	2024-04-27 18:38:48.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/menu_spacing.3x.html	2024-12-28 21:43:58.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: menu_spacing.3x,v 1.37 2024/03/16 15:35:01 tom Exp @
++  * @Id: menu_spacing.3x,v 1.39 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-menu_spacing 3x 2024-03-16 ncurses 6.5 Library calls
++menu_spacing 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                                  menu_spacing 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                                  
++
                                                                                                                                                                                                                                                                                  menu_spacing 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                                                                  + menu_spacing(3x)                 Library calls                menu_spacing(3x)
+ 
+@@ -87,7 +87,7 @@
+               values resets them to the default, which is 1 for all of them.
+ 
+        The function menu_spacing returns the spacing information for the menu.
+-       If  a  pointer  is  NULL,  the  corresponding information is simply not
++       If  a  pointer  is  NULL,  the  corresponding information is simply not
+        returned.
+ 
+ 
+@@ -113,7 +113,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                  menu_spacing(3x)
++ncurses 6.5                       2024-12-28                  menu_spacing(3x)
+ 
                                                                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                                                                    
+Index: doc/html/man/menu_userptr.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/menu_userptr.3x.html	2024-04-27 18:38:48.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/menu_userptr.3x.html	2024-12-28 21:43:58.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: menu_userptr.3x,v 1.33 2024/03/16 15:35:01 tom Exp @
++  * @Id: menu_userptr.3x,v 1.35 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-menu_userptr 3x 2024-03-16 ncurses 6.5 Library calls
++menu_userptr 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                                    menu_userptr 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                                    
++
                                                                                                                                                                                                                                                                                    menu_userptr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                                                                                    + menu_userptr(3x)                 Library calls                menu_userptr(3x)
+ 
+@@ -65,7 +65,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                                                    RETURN VALUE
                                                                                                                                                                                                                                                                                    +-       menu_userptr returns a pointer (which may be NULL).  It  does  not  set
++       menu_userptr returns a pointer (which may be NULL).  It  does  not  set
+        errno.
+ 
+        set_menu_userptr returns E_OK (success).
+@@ -89,7 +89,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                  menu_userptr(3x)
++ncurses 6.5                       2024-12-28                  menu_userptr(3x)
+ 
                                                                                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                                                                                      
+Index: doc/html/man/menu_win.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/menu_win.3x.html	2024-04-27 18:38:48.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/menu_win.3x.html	2024-12-28 21:43:58.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: menu_win.3x,v 1.32 2024/03/16 15:35:01 tom Exp @
++  * @Id: menu_win.3x,v 1.34 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-menu_win 3x 2024-03-16 ncurses 6.5 Library calls
++menu_win 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                                      menu_win 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                                      
++
                                                                                                                                                                                                                                                                                      menu_win 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                                                                                      + menu_win(3x)                     Library calls                    menu_win(3x)
+ 
+@@ -72,8 +72,8 @@
+        necessary to set either window; by default, the driver code uses stdscr
+        for both.
+ 
+-       In the set_ functions, window argument of NULL is treated as though  it
+-       were stsdcr.  A menu argument of NULL is treated as a request to change
++       In the set_ functions, window argument of NULL is treated as though  it
++       were stsdcr.  A menu argument of NULL is treated as a request to change
+        the system default menu window or subwindow.
+ 
+        The function scale_menu returns  the  minimum  size  required  for  the
+@@ -81,7 +81,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                                                      RETURN VALUE
                                                                                                                                                                                                                                                                                      +-       Routines  that  return  pointers  return  NULL on error.  Routines that
++       Routines  that  return  pointers  return  NULL on error.  Routines that
+        return an integer return one of the following error codes:
+ 
+        E_OK The routine succeeded.
+@@ -114,7 +114,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                      menu_win(3x)
++ncurses 6.5                       2024-12-28                      menu_win(3x)
+ 
                                                                                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                                                                                        
+Index: doc/html/man/mitem_current.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/mitem_current.3x.html	2024-04-27 18:38:48.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/mitem_current.3x.html	2024-12-28 21:43:58.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: mitem_current.3x,v 1.37 2024/03/16 15:35:01 tom Exp @
++  * @Id: mitem_current.3x,v 1.39 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-mitem_current 3x 2024-03-16 ncurses 6.5 Library calls
++mitem_current 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                                        mitem_current 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                                        
++
                                                                                                                                                                                                                                                                                        mitem_current 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                                                                                        + mitem_current(3x)                Library calls               mitem_current(3x)
+ 
+@@ -78,11 +78,11 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                                                        RETURN VALUE
                                                                                                                                                                                                                                                                                        +-       current_item returns a pointer (which may be NULL).  It  does  not  set
++       current_item returns a pointer (which may be NULL).  It  does  not  set
+        errno.
+ 
+        top_row  and  item_index return ERR (the general curses error value) if
+-       their menu parameter is NULL.
++       their menu parameter is NULL.
+ 
+        set_current_item and set_top_row return one of the following:
+ 
+@@ -119,7 +119,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                 mitem_current(3x)
++ncurses 6.5                       2024-12-28                 mitem_current(3x)
+ 
                                                                                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                                                                                          
+Index: doc/html/man/mitem_name.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/mitem_name.3x.html	2024-04-27 18:38:48.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/mitem_name.3x.html	2024-12-28 21:43:58.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: mitem_name.3x,v 1.31 2024/03/16 15:35:01 tom Exp @
++  * @Id: mitem_name.3x,v 1.33 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-mitem_name 3x 2024-03-16 ncurses 6.5 Library calls
++mitem_name 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                                          mitem_name 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                                          
++
                                                                                                                                                                                                                                                                                          mitem_name 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                                                                                          + mitem_name(3x)                   Library calls                  mitem_name(3x)
+ 
+@@ -64,7 +64,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                                                          RETURN VALUE
                                                                                                                                                                                                                                                                                          +-       These routines return a pointer (which may be NULL).  They do  not  set
++       These routines return a pointer (which may be NULL).  They do  not  set
+        errno.
+ 
+ 
+@@ -83,7 +83,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                    mitem_name(3x)
++ncurses 6.5                       2024-12-28                    mitem_name(3x)
+ 
                                                                                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                                                                                            
+Index: doc/html/man/mitem_new.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/mitem_new.3x.html	2024-04-27 18:38:48.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/mitem_new.3x.html	2024-12-28 21:43:58.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: mitem_new.3x,v 1.36 2024/03/16 15:35:01 tom Exp @
++  * @Id: mitem_new.3x,v 1.38 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-mitem_new 3x 2024-03-16 ncurses 6.5 Library calls
++mitem_new 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                                            mitem_new 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                                            
++
                                                                                                                                                                                                                                                                                            mitem_new 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                                                                                            + mitem_new(3x)                    Library calls                   mitem_new(3x)
+ 
+@@ -69,7 +69,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                                                            RETURN VALUE
                                                                                                                                                                                                                                                                                            +-       The  function  new_item returns NULL on error.  It sets errno according
++       The  function  new_item returns NULL on error.  It sets errno according
+        to the function's failure:
+ 
+        E_BAD_ARGUMENT
+@@ -107,7 +107,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                     mitem_new(3x)
++ncurses 6.5                       2024-12-28                     mitem_new(3x)
+ 
                                                                                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                                                                                              
+Index: doc/html/man/mitem_userptr.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/mitem_userptr.3x.html	2024-04-27 18:38:49.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/mitem_userptr.3x.html	2024-12-28 21:43:58.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: mitem_userptr.3x,v 1.34 2024/03/16 15:35:01 tom Exp @
++  * @Id: mitem_userptr.3x,v 1.36 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-mitem_userptr 3x 2024-03-16 ncurses 6.5 Library calls
++mitem_userptr 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                                              mitem_userptr 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                                              
++
                                                                                                                                                                                                                                                                                              mitem_userptr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                                                                              + mitem_userptr(3x)                Library calls               mitem_userptr(3x)
+ 
+@@ -65,7 +65,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                                                              RETURN VALUE
                                                                                                                                                                                                                                                                                              +-       The function item_userptr returns a pointer (possibly NULL).   It  does
++       The function item_userptr returns a pointer (possibly NULL).   It  does
+        not set errno.
+ 
+        The set_item_userptr always returns E_OK (success).
+@@ -89,7 +89,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                 mitem_userptr(3x)
++ncurses 6.5                       2024-12-28                 mitem_userptr(3x)
+ 
                                                                                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                                                                                
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/ncurses.3x.html	2024-09-21 18:35:29.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/ncurses.3x.html	2024-12-28 21:43:58.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: ncurses.3x,v 1.233 2024/09/21 18:02:58 tom Exp @
++  * @Id: ncurses.3x,v 1.236 2024/12/28 21:27:26 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-ncurses 3x 2024-09-21 ncurses 6.5 Library calls
++ncurses 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                                                ncurses 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                                                
++
                                                                                                                                                                                                                                                                                                ncurses 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                                                                                + ncurses(3x)                      Library calls                     ncurses(3x)
+ 
+@@ -61,7 +61,7 @@
+        displays  with  output  optimized  to minimize screen updates.  ncurses
+        replaces the curses libraries from System V Release 4 Unix ("SVr4") and
+        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
+-       document describes ncurses version 6.5 (patch 20240921).
++       document describes ncurses version 6.5 (patch 20241228).
+ 
+        ncurses permits control of the terminal screen's contents;  abstraction
+        and  subdivision thereof with windows and pads; acquisition of keyboard
+@@ -143,8 +143,8 @@
+        and represents all or part  of  its  display  with  WINDOW  structures.
+        Distinct  properties apply to each; for example, the line discipline of
+        a typical Unix terminal driver is in one of three modes:  raw,  cbreak,
+-       or  normal ("cooked").  In curses, the line discipline is a property of
+-       the screen, applying identically to all windows associated with it.
++       or  canonical ("cooked").  In curses, the line discipline is a property
++       of the screen, applying identically to all windows associated with it.
+ 
+        A window is a rectangular grid of character cells,  addressed  by  line
+        and column coordinates (y, x), with the upper left corner as (0, 0).  A
+@@ -813,7 +813,7 @@
+ 
                                                                                                                                                                                                                                                                                                RETURN VALUE
                                                                                                                                                                                                                                                                                                +        Unless  otherwise  noted,  functions  that  return  integers return the
+        constants OK on success and ERR  on  failure;  see  curs_variables(3x).
+-       Functions  that  return  pointers  return  NULL on failure.  Typically,
++       Functions  that  return  pointers  return  NULL on failure.  Typically,
+        ncurses treats a null pointer passed  as  a  function  parameter  as  a
+        failure.   Functions  prefixed  with "mv" first perform cursor movement
+        and fail if the position (y, x) is outside the window boundaries.
+@@ -1498,7 +1498,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-21                       ncurses(3x)
++ncurses 6.5                       2024-12-28                       ncurses(3x)
+ 
                                                                                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                                                                                  
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/panel.3x.html	2024-05-25 22:33:44.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/panel.3x.html	2024-12-28 21:43:58.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: panel.3x,v 1.65 2024/05/25 21:14:41 tom Exp @
++  * @Id: panel.3x,v 1.68 2024/12/28 21:26:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-panel 3x 2024-05-25 ncurses 6.5 Library calls
++panel 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                                                  panel 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                                                  
++
                                                                                                                                                                                                                                                                                                  panel 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                                                                                  + panel(3x)                        Library calls                       panel(3x)
+ 
+@@ -193,7 +193,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                                                                  RETURN VALUE
                                                                                                                                                                                                                                                                                                  +-       Each routine that returns a pointer returns NULL if  an  error  occurs.
++       Each routine that returns a pointer returns NULL if  an  error  occurs.
+        Each  routine  that  returns  an  int  value  returns OK if it executes
+        successfully and ERR if not.
+ 
+@@ -236,7 +236,7 @@
+            library.
+ 
+        o   ncurses (since version 0.6 in 1993) and PDCurses (since version 2.2
+-           in  1995) provide a panel library whose common ancestor is a public
++           in  1995) provide a panel library whose common ancestor is a public
+            domain implementation by Warren Tucker published  in  u386mon  2.20
+            (1990).
+ 
+@@ -266,7 +266,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                         panel(3x)
++ncurses 6.5                       2024-12-28                         panel(3x)
+ 
                                                                                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                                                                                    
+Index: doc/html/man/resizeterm.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/resizeterm.3x.html	2024-04-27 18:38:49.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/resizeterm.3x.html	2024-12-28 21:43:58.000000000 +0000
+@@ -28,19 +28,19 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey 1996-on
+-  * @Id: resizeterm.3x,v 1.56 2024/03/16 15:35:01 tom Exp @
++  * @Id: resizeterm.3x,v 1.58 2024/12/28 21:18:35 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-resizeterm 3x 2024-03-16 ncurses 6.5 Library calls
++resizeterm 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                                                    resizeterm 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                                                    
++
                                                                                                                                                                                                                                                                                                    resizeterm 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                                                                                                    + resizeterm(3x)                   Library calls                  resizeterm(3x)
+ 
+@@ -178,8 +178,8 @@
+ 
+        Doing that clears the screen and is visually distracting.
+ 
+-       This  extension  of ncurses was introduced in mid-1995.  It was adopted
+-       in NetBSD curses (2001) and PDCurses (2003).
++       ncurses  introduced  this extension in mid-1995.  NetBSD curses adopted
++       it in 2001 and PDCurses in 2003.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                                                    AUTHORS
                                                                                                                                                                                                                                                                                                    +@@ -192,7 +192,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                    resizeterm(3x)
++ncurses 6.5                       2024-12-28                    resizeterm(3x)
+ 
                                                                                                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                                                                                                      
+Index: doc/html/man/term_variables.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/term_variables.3x.html	2024-04-27 18:38:49.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/term_variables.3x.html	2024-12-28 21:43:58.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: term_variables.3x,v 1.36 2024/03/16 15:35:01 tom Exp @
++  * @Id: term_variables.3x,v 1.40 2024/12/28 21:35:10 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-term_variables 3x 2024-03-16 ncurses 6.5 Library calls
++term_variables 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                                                      term_variables 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                                                      
++
                                                                                                                                                                                                                                                                                                      term_variables 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                                                                                                      + term_variables(3x)               Library calls              term_variables(3x)
+ 
+@@ -78,97 +78,96 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                                                                      DESCRIPTION
                                                                                                                                                                                                                                                                                                      +-       This  page  summarizes  variables provided by the curses library's low-
+-       level terminfo interface.  A more complete description is given in  the
++       This  page summarizes variables provided by the curses library's lower-
++       level terminfo interface.  Locate a more complete  description  in  the
+        curs_terminfo(3x) manual page.
+ 
+-       Depending  on  the  configuration,  these  may  be actual variables, or
+-       macros  (see  curs_threads(3x))  which  provide  read-only  access   to
+-       curses's  state.   In  either  case,  applications should treat them as
+-       read-only to avoid confusing the library.
++       Depending  on  ncurses's  build-time configuration, these may be actual
++       variables, or macros  (see  curs_threads(3x))  that  provide  read-only
++       access  to  curses's  state.  In either case, applications should treat
++       them as read-only to avoid confusing the library.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                                                      Alternate Character Set Mapping
                                                                                                                                                                                                                                                                                                      +-       After initializing the curses or terminfo interfaces, the acs_map array
++       After initializing the curses or terminfo interfaces, the acs_map array
+        holds  information  used to translate cells with the A_ALTCHARSET video
+        attribute into line-drawing characters.
+ 
+        The encoding of the information in this array has changed periodically.
+        Application  developers  need  only know that it is used for the "ACS_"
+-       constants in <curses.h>.
++       constants in curses.h.
+ 
+-       The comparable  data  for  the  wide-character  library  is  a  private
+-       variable.
++       The comparable data for the wide-character library are not  exposed  as
++       symbols in the API.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                                                      Current Terminal Data
                                                                                                                                                                                                                                                                                                      +-       After  initializing  the  curses  or  terminfo interfaces, the cur_term
+-       contains data describing the current terminal.  This variable  is  also
+-       set as a side-effect of set_term(3x) and delscreen(3x).
++       After initializing the curses or terminfo interfaces, cur_term contains
++       data describing the current terminal.  It is also updated  as  a  side-
++       effect of set_term(3x) and delscreen(3x).
+ 
+        It  is  possible  to  save  a value of cur_term for subsequent use as a
+-       parameter to set_term, for switching between  screens.   Alternatively,
+-       one can save the return value from newterm or setupterm(3x) to reuse in
+-       set_term.
++       parameter   to   set_term(3x)   for    switching    between    screens.
++       Alternatively,  one  can  save  the  return  value  from newterm(3x) or
++       setupterm(3x) to reuse in set_term(3x).
+ 
+ 
+ 
                                                                                                                                                                                                                                                                                                      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
+-       applications, although the hash-tables used by the terminfo and termcap
+-       functions are not available.
+-
+-       The long terminfo capability names use a  "f"  (eff)  in  their  names:
+-       boolfnames, numfnames, and strfnames.
+-
+-       These  are  the  short  names  for  terminfo  capabilities:  boolnames,
+-       numnames, and strnames.
+-
+-       These are  the  corresponding  names  used  for  termcap  descriptions:
+-       boolcodes, numcodes, and strcodes.
++       short  names  of  terminfo  capabilities,  as well as the corresponding
++       names  for  termcap  capabilities.   These  are  available   to   other
++       applications,  though  the hash tables used by the terminfo and termcap
++       functions are not.
++
++       terminfo stores capability names in arrays with an "f" (eff)  in  their
++       names:  boolfnames,  numfnames,  and  strfnames.  It stores the briefer
++       capability codes in arrays without the "f":  boolnames,  numnames,  and
++       strnames.   The  corresponding  termcap  capability codes are stored in
++       boolcodes, numcodes, and strcodes.  terminfo(5) catalogs these.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                                                      Terminal Type
                                                                                                                                                                                                                                                                                                      +        A terminal description begins with one or more terminal names separated
+-       by "|" (vertical bars).  On initialization of the  curses  or  terminfo
+-       interfaces,  setupterm(3x)  copies  the  terminal  names  to  the array
++       by  "|"  (vertical  bars).  On initialization of the curses or terminfo
++       interfaces,  setupterm(3x)  copies  the  terminal  name  to  the  array
+        ttytype.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                                                      terminfo Names
                                                                                                                                                                                                                                                                                                      +-       In addition to the variables, <term.h> also defines a symbol  for  each
+-       terminfo  capability  long name.  These are in terms of the symbol CUR,
+-       which is defined
+-
+-       #define CUR ((TERMTYPE *)(cur_term))->
+-
+-       These  symbols  provide  a  faster   method   of   accessing   terminfo
+-       capabilities than using tigetstr(3x), etc.
+-
+-       The  actual definition of CUR depends upon the implementation, but each
+-       terminfo library provides these long names defined to  point  into  the
+-       current terminal description loaded into memory.
+-
+-
+-
                                                                                                                                                                                                                                                                                                      NOTES
                                                                                                                                                                                                                                                                                                      +-       The  low-level  terminfo  interface is initialized using setupterm(3x).
+-       The upper-level curses interface uses the low-level terminfo interface,
+-       internally.
++       In  addition  to  the  variables, term.h also defines a symbol for each
++       terminfo capability name.  These are in terms of the symbol CUR,  which
++       is defined
++
++              #define CUR ((TERMTYPE *)(cur_term))->
++
++       These   symbols   provide   a   faster  method  of  accessing  terminfo
++       capabilities than using, for example, tigetstr(3x).
++
++       The definition of CUR is implementation-dependent,  but  each  terminfo
++       library  defines these names to point into the in-memory description of
++       the  current  terminal.   For  example,  in  ncurses,  the  expressions
++       tigetstr("key_dc") and "CUR Strings[59]" are equivalent.
++
++
++
                                                                                                                                                                                                                                                                                                      terminfo and curses
                                                                                                                                                                                                                                                                                                      ++       setupterm(3x)  initializes  the  lower-level  terminfo  interface.  The
++       higher-level curses interface uses the terminfo  interface  internally;
++       the symbol SP bridges the curses SCREEN type with the terminfo TERMINAL
++       type.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                                                      PORTABILITY
                                                                                                                                                                                                                                                                                                      +-       X/Open Curses does not describe any of these except for cur_term.  (The
+-       inclusion  of  cur_term  appears  to  be  an  oversight,  since   other
+-       comparable low-level information is omitted by X/Open).
++       X/Open Curses does  not  describe  any  of  these  symbols  except  for
++       cur_term.  (The inclusion of cur_term appears to be an oversight, since
++       other comparable low-level information is omitted by X/Open.)
+ 
+-       Other    implementations   may   have   comparable   variables.    Some
++       Other   implementations   may   have   comparable   variables.     Some
+        implementations provide the variables in their libraries, but omit them
+        from the header files.
+ 
+-       All  implementations  which provide terminfo interfaces add definitions
+-       as described in the Terminfo Names section.  Most, but  not  all,  base
+-       the definition upon the cur_term variable.
++       All implementations that provide terminfo interfaces add definitions as
++       described  in  the  "terminfo Names" section above.  Most, but not all,
++       base the definition upon the cur_term variable.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                                                      SEE ALSO
                                                                                                                                                                                                                                                                                                      +@@ -176,7 +175,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                term_variables(3x)
++ncurses 6.5                       2024-12-28                term_variables(3x)
+ 
                                                                                                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                                                                                                      
+ 
+ 
+-
                                                                                                                                                                                                                                                                                                    • NOTES
                                                                                                                                                                                                                                                                                                      • 
+ 
                                                                                                                                                                                                                                                                                                    • PORTABILITY
                                                                                                                                                                                                                                                                                                      • 
+ 
                                                                                                                                                                                                                                                                                                    • SEE ALSO
                                                                                                                                                                                                                                                                                                      • 
+ 
                                                                                                                                                                                                                                                                                                    
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.5-20241221+/doc/html/man/terminfo.5.html	2024-09-21 18:35:29.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/terminfo.5.html	2024-12-28 21:43:58.000000000 +0000
+@@ -71,7 +71,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This document describes ncurses version 6.5 (patch 20240921).
++       This document describes ncurses version 6.5 (patch 20241228).
+ 
+ 
+ 
                                                                                                                                                    terminfo Entry Syntax
                                                                                                                                                    +@@ -1382,8 +1382,8 @@
+        with  terminfo  set tty modes so that tabs are never expanded, so \t is
+        safe to send.  This turns out to be essential for the Ann Arbor 4080.)
+ 
+-       A final example is the LSI ADM-3a, which uses line and column offset by
+-       a blank character, thus
++       A final example is the LSI ADM-3A, which uses line and column offset by
++       a space, thus
+               cup=\E=%p1%' '%+%c%p2%' '%+%c
+ 
+        After  sending "\E=", this pushes the first parameter, pushes the ASCII
+Index: doc/html/man/tput.1.html
+--- ncurses-6.5-20241221+/doc/html/man/tput.1.html	2024-09-14 20:23:29.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/tput.1.html	2024-12-28 21:43:58.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tput.1,v 1.120 2024/09/14 20:06:50 tom Exp @
++  * @Id: tput.1,v 1.122 2024/12/28 21:27:26 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-tput 1 2024-09-14 ncurses 6.5 User commands
++tput 1 2024-12-28 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                    tput 1 2024-09-14 ncurses 6.5 User commands
                                                                                                                                                    
++
                                                                                                                                                    tput 1 2024-12-28 ncurses 6.5 User commands
                                                                                                                                                    
+ 
                                                                                                                                                    + tput(1)                          User commands                         tput(1)
+ 
+@@ -166,7 +166,7 @@
+ 
+                   (1)  tput sets the the terminal modes to a "sane" state,
+ 
+-                       o   enabling cooked and echo modes,
++                       o   enabling canonical ("cooked") and echo modes,
+ 
+                        o   disabling cbreak and raw modes,
+ 
+@@ -559,7 +559,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-14                           tput(1)
++ncurses 6.5                       2024-12-28                           tput(1)
+ 
                                                                                                                                                    
+ 
                                                                                                                                                    
+ 
                                                                                                                                                      
+Index: doc/html/man/tset.1.html
+--- ncurses-6.5-20241221+/doc/html/man/tset.1.html	2024-06-08 23:12:52.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/tset.1.html	2024-12-28 21:43:58.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tset.1,v 1.88 2024/06/08 20:51:12 tom Exp @
++  * @Id: tset.1,v 1.90 2024/12/28 21:27:26 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-tset 1 2024-06-08 ncurses 6.5 User commands
++tset 1 2024-12-28 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                      tset 1 2024-06-08 ncurses 6.5 User commands
                                                                                                                                                      
++
                                                                                                                                                      tset 1 2024-12-28 ncurses 6.5 User commands
                                                                                                                                                      
+ 
                                                                                                                                                      + tset(1)                          User commands                         tset(1)
+ 
+@@ -128,7 +128,7 @@
+ 
                                                                                                                                                      reset -- reinitialization
                                                                                                                                                      +        When invoked as reset, tset sets the terminal modes to "sane" values:
+ 
+-       o   sets cooked and echo modes,
++       o   sets canonical ("cooked") and echo modes,
+ 
+        o   turns off cbreak and raw modes,
+ 
+@@ -395,7 +395,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                           tset(1)
++ncurses 6.5                       2024-12-28                           tset(1)
+ 
                                                                                                                                                      
+ 
                                                                                                                                                      
+ 
                                                                                                                                                        
+Index: doc/html/man/wresize.3x.html
+--- ncurses-6.5-20241221+/doc/html/man/wresize.3x.html	2024-09-22 18:37:13.000000000 +0000
++++ ncurses-6.5-20241228/doc/html/man/wresize.3x.html	2024-12-28 21:43:59.000000000 +0000
+@@ -28,19 +28,19 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey 1996
+-  * @Id: wresize.3x,v 1.42 2024/09/21 23:48:27 tom Exp @
++  * @Id: wresize.3x,v 1.44 2024/12/28 21:16:46 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-wresize 3x 2024-09-21 ncurses 6.5 Library calls
++wresize 3x 2024-12-28 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                        wresize 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                        
++
                                                                                                                                                        wresize 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                        
+ 
                                                                                                                                                        + wresize(3x)                      Library calls                     wresize(3x)
+ 
+@@ -60,28 +60,27 @@
+ 
                                                                                                                                                        DESCRIPTION
                                                                                                                                                        +        wresize,  an  ncurses  extension  to  the  curses  library, reallocates
+        storage for win, adjusting its dimensions to  lines  and  columns.   If
+-       either dimension is larger than its current value, ncurses the expanded
+-       part of the window is filled with blanks merged with current background
+-       rendition  (configured  by  wbkgdset(3x),  or  by  wide-character  API:
+-       wbkgrndset(3x)).
++       either  dimension  is  larger than its current value, ncurses fills the
++       expanded part of the window with the background character and rendition
++       configured by wbkgdset(3x) (wide-character API: wbkgrndset(3x)).
+ 
+ 
+ 
                                                                                                                                                        RETURN VALUE
                                                                                                                                                        +-       wresize returns OK on success and ERR on failure.  It fails  if  either
+-       lines  or  columns is less than or equal to zero, or if an error occurs
++       wresize  returns  OK on success and ERR on failure.  It fails if either
++       lines or columns is less than or equal to zero, or if an  error  occurs
+        while (re)allocating memory for win.
+ 
+ 
+ 
                                                                                                                                                        NOTES
                                                                                                                                                        +-       The only restriction placed on the values of lines and columns is  that
+-       they  be greater than zero.  They are not compared to the dimensions of
+-       the curses screen; this keeps the logic of resizeterm(3x) simple.   The
+-       caller  must  ensure  that  win's  dimensions  fit  within those of the
++       The  only restriction placed on the values of lines and columns is that
++       they be greater than zero.  They are not compared to the dimensions  of
++       the  curses screen; this keeps the logic of resizeterm(3x) simple.  The
++       caller must ensure that  win's  dimensions  fit  within  those  of  the
+        screen.
+ 
+ 
+ 
                                                                                                                                                        EXTENSIONS
                                                                                                                                                        +-       wresize is an ncurses(3x) extension, and is not found in  SVr4  curses,
++       wresize  is  an ncurses(3x) extension, and is not found in SVr4 curses,
+        4.4BSD curses, or any other previous curses implementation.
+ 
+ 
+@@ -89,14 +88,14 @@
+        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       NetBSD curses adopted wresize in 2001 (release 1.5.3), and PDCurses  in
++       NetBSD  curses adopted wresize in 2001 (release 1.5.3), and PDCurses in
+        2004 (version 2.7).
+ 
+        It is not possible to resize windows with SVr4 curses.
+ 
+ 
+ 
                                                                                                                                                        HISTORY
                                                                                                                                                        +-       Thomas  Dickey developed wresize as an extension to BSD curses in 1988,
++       Thomas Dickey developed wresize as an extension to BSD curses in  1988,
+        and brought it to ncurses in mid-1995.
+ 
+ 
+@@ -109,7 +108,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-21                       wresize(3x)
++ncurses 6.5                       2024-12-28                       wresize(3x)
+ 
                                                                                                                                                        
+ 
                                                                                                                                                        
+ 
                                                                                                                                                          
+Index: include/MKterm.h.awk.in
+Prereq:  1.85 
+--- ncurses-6.5-20241221+/include/MKterm.h.awk.in	2023-04-23 19:15:36.000000000 +0000
++++ ncurses-6.5-20241228/include/MKterm.h.awk.in	2024-12-28 21:42:15.000000000 +0000
+@@ -26,7 +26,7 @@
+ 	lcurl = "{";
+ 	rcurl = "}";
+ 	print  "/****************************************************************************"
+-	print  " * Copyright 2018-2021,2023 Thomas E. Dickey                                *"
++	print  " * Copyright 2018-2023,2024 Thomas E. Dickey                                *"
+ 	print  " * Copyright 1998-2013,2017 Free Software Foundation, Inc.                  *"
+ 	print  " *                                                                          *"
+ 	print  " * Permission is hereby granted, free of charge, to any person obtaining a  *"
+@@ -60,7 +60,7 @@
+ 	print  "/*    and: Thomas E. Dickey                        1995-on                  */"
+ 	print  "/****************************************************************************/"
+ 	print  ""
+-	print  "/* $Id: MKterm.h.awk.in,v 1.85 2023/04/23 19:15:36 tom Exp $ */"
++	print  "/* $Id: MKterm.h.awk.in,v 1.87 2024/12/28 21:42:15 tom Exp $ */"
+ 	print  ""
+ 	print  "/*"
+ 	print  "**	term.h -- Definition of struct term"
+@@ -86,6 +86,7 @@
+ 	print  ""
+ 	print  "typedef struct screen  SCREEN;"
+ 	print  ""
++	print  "/* configured with --enable-sp-funcs? */"
+ 	print  "#if @NCURSES_SP_FUNCS@"
+ 	print  "#undef  NCURSES_SP_FUNCS"
+ 	print  "#define NCURSES_SP_FUNCS @NCURSES_PATCH@"
+@@ -146,6 +147,7 @@
+ 	print  "#else /* !HAVE_TERMIO_H */"
+ 	print  ""
+ 	print  "#if (defined(_WIN32) || defined(_WIN64))"
++	print  "/* configured with --enable-exp-win32? */"
+ 	print  "#if @EXP_WIN32_DRIVER@"
+ 	print  "#include "
+ 	print  "#define TTY struct winconmode"
+@@ -166,6 +168,7 @@
+ 	print  "#ifdef TERMIOS"
+ 	print  "#define GET_TTY(fd, buf) tcgetattr(fd, buf)"
+ 	print  "#define SET_TTY(fd, buf) tcsetattr(fd, TCSADRAIN, buf)"
++	print  "/* configured with --enable-exp-win32? */"
+ 	print  "#elif @EXP_WIN32_DRIVER@ && (defined(_WIN32) || defined(_WIN64))"
+ 	print  "#define GET_TTY(fd, buf) _nc_console_getmode(_nc_console_fd2handle(fd),buf)"
+ 	print  "#define SET_TTY(fd, buf) _nc_console_setmode(_nc_console_fd2handle(fd),buf)"
+@@ -255,6 +258,7 @@
+ 	print  "TERMINAL;"
+ 	print  ""
+ 	if (@NCURSES_EXT_COLORS@) {
++	print  "/* configured with --enable-ext-colors */"
+ 	declare_termtype("int","2");
+ 	} else {
+ 	print  "#undef TERMTYPE2"
+@@ -268,9 +272,10 @@
+ 	print  ""
+ 	print  "#endif /* NCURSES_INTERNALS */"
+ 	print  ""
+-	print  ""
++	print  "/* configured with --enable-broken_linker and reentrancy disabled */"
+ 	print  "#if @BROKEN_LINKER@ && !@cf_cv_enable_reentrant@"
+ 	print  "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;"
++	print  "/* reentrancy enabled */"
+ 	print  "#elif @cf_cv_enable_reentrant@"
+ 	print  "NCURSES_WRAPPED_VAR(TERMINAL *, cur_term);"
+ 	print  "#define cur_term   NCURSES_PUBLIC_VAR(cur_term())"
+@@ -278,6 +283,7 @@
+ 	print  "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;"
+ 	print  "#endif"
+ 	print  ""
++	print  "/* configured with --enable-broken_linker or reentrancy enabled */"
+ 	print  "#if @BROKEN_LINKER@ || @cf_cv_enable_reentrant@"
+ 	print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolnames);"
+ 	print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolcodes);"
+@@ -348,6 +354,7 @@
+ 	print  "extern NCURSES_EXPORT(int) tigetflag (const char *);"
+ 	print  "extern NCURSES_EXPORT(int) tigetnum (const char *);"
+ 	print  ""
++	print  "/* configured without --disable-tparm-varargs? */"
+ 	print  "#if @NCURSES_TPARM_VARARGS@ /* NCURSES_TPARM_VARARGS */"
+ 	print  "extern NCURSES_EXPORT(char *) tparm (const char *, ...);	/* special */"
+ 	print  "#else"
+@@ -380,6 +387,7 @@
+ 	print  "extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tigetflag) (SCREEN*, const char *);"
+ 	print  "extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tigetnum) (SCREEN*, const char *);"
+ 	print  ""
++	print  "/* configured without --disable-tparm-varargs? */"
+ 	print  "#if @NCURSES_TPARM_VARARGS@ /* NCURSES_TPARM_VARARGS */"
+ 	print  "extern NCURSES_EXPORT(char *)  NCURSES_SP_NAME(tparm) (SCREEN*, const char *, ...);	/* special */"
+ 	print  "#else"
+Index: include/curses.h.in
+Prereq:  1.287 
+--- ncurses-6.5-20241221+/include/curses.h.in	2024-12-14 23:49:34.000000000 +0000
++++ ncurses-6.5-20241228/include/curses.h.in	2024-12-29 00:53:27.000000000 +0000
+@@ -33,7 +33,7 @@
+  *     and: Thomas E. Dickey                        1996-on                 *
+  ****************************************************************************/
+ 
+-/* $Id: curses.h.in,v 1.287 2024/12/14 23:49:34 tom Exp $ */
++/* $Id: curses.h.in,v 1.288 2024/12/29 00:53:27 tom Exp $ */
+ 
+ #ifndef __NCURSES_H
+ #define __NCURSES_H
+@@ -296,7 +296,7 @@
+ #include 
+ /* use whatever the C compiler decides bool really is */
+ #define NCURSES_BOOL bool
+-#elif !defined(__cplusplus) && !@cf_cv_builtin_bool@
++#elif !defined(__cplusplus) && !@cf_cv_cc_bool_type@
+ /* there is no predefined bool - use our own */
+ #undef bool
+ #define bool NCURSES_BOOL
+Index: man/curs_add_wch.3x
+Prereq:  1.71 
+--- ncurses-6.5-20241221+/man/curs_add_wch.3x	2024-07-27 20:05:18.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_add_wch.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_add_wch.3x,v 1.71 2024/07/27 20:05:18 tom Exp $
+-.TH curs_add_wch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_add_wch.3x,v 1.74 2024/12/28 21:26:21 tom Exp $
++.TH curs_add_wch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -96,7 +96,8 @@
+ If
+ .I wch
+ contains only non-spacing characters,
+-.\" XXX: see wadd_wch_literal (the beginning of the array may be nonspacing)
++.\" XXX: see wadd_wch_literal (the beginning of the array may be
++.\" nonspacing)
+ they are combined with the active complex character.
+ .I curses
+ ignores its attributes and color pair identifier,
+@@ -159,6 +160,15 @@
+ .I \%cchar_t
+ can be copied from place to place using \fB\%win_wch\fP(3X) and
+ .BR \%wadd_wch "."
++See \fB\%curs_attr\fP(3X) for values of predefined constants that can be
++usefully \*(``or\*(''ed with characters.
++A complex character whose character component is a wide space,
++and whose only attribute is
++.BR \%WA_NORMAL ,
++is a
++.IR "blank character" ","
++and therefore combines with the background character;
++see \fB\%curs_bkgrnd\fP(3X).
+ .SS wecho_wchar
+ .B \%echo_wchar
+ and
+@@ -384,7 +394,7 @@
+ .bP
+ .I win
+ is
+-.BR NULL ","
++.IR NULL ","
+ .bP
+ wrapping to a new line is impossible because \fB\%scrollok\fP(3X) has
+ not been called on
+@@ -555,6 +565,7 @@
+ \fB\%curs_addwstr\fP(3X),
+ \fB\%curs_add_wchstr\fP(3X),
+ \fB\%curs_attr\fP(3X),
++\fB\%curs_bkgrnd\fP(3X),
+ \fB\%curs_clear\fP(3X),
+ \fB\%curs_getcchar\fP(3X),
+ \fB\%curs_outopts\fP(3X),
+Index: man/curs_add_wchstr.3x
+Prereq:  1.44 
+--- ncurses-6.5-20241221+/man/curs_add_wchstr.3x	2024-07-27 20:05:18.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_add_wchstr.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_add_wchstr.3x,v 1.44 2024/07/27 20:05:18 tom Exp $
+-.TH curs_add_wchstr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_add_wchstr.3x,v 1.46 2024/12/28 21:26:21 tom Exp $
++.TH curs_add_wchstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -120,12 +120,12 @@
+ .bP
+ .I win
+ is
+-.B NULL
++.I NULL
+ or
+ .bP
+ .I wchstr
+ is
+-.BR NULL "."
++.IR NULL "."
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+Index: man/curs_addch.3x
+Prereq:  1.100 
+--- ncurses-6.5-20241221+/man/curs_addch.3x	2024-09-21 18:03:23.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_addch.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addch.3x,v 1.100 2024/09/21 18:03:23 tom Exp $
+-.TH curs_addch 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addch.3x,v 1.103 2024/12/28 21:26:21 tom Exp $
++.TH curs_addch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -140,6 +140,15 @@
+ .BR \%waddch .)
+ See \fB\%curs_attr\fP(3X) for values of predefined constants that can be
+ usefully \*(``or\*(''ed with characters.
++A
++.I ch
++whose character component is a space,
++and whose only attribute is
++.BR \%A_NORMAL ,
++is a
++.IR "blank character" ","
++and therefore combines with the background character;
++see \fB\%curs_bkgd\fP(3X).
+ .SS wechochar
+ .B \%echochar
+ and
+@@ -241,7 +250,7 @@
+ .bP
+ .I win
+ is
+-.BR NULL ","
++.IR NULL ","
+ .bP
+ wrapping to a new line is impossible because \fB\%scrollok\fP(3X) has
+ not been called on
+@@ -497,6 +506,7 @@
+ \fB\%curs_addchstr\fP(3X),
+ \fB\%curs_addstr\fP(3X),
+ \fB\%curs_attr\fP(3X),
++\fB\%curs_bkgd\fP(3X),
+ \fB\%curs_clear\fP(3X),
+ \fB\%curs_inch\fP(3X),
+ \fB\%curs_outopts\fP(3X),
+Index: man/curs_addchstr.3x
+Prereq:  1.50 
+--- ncurses-6.5-20241221+/man/curs_addchstr.3x	2024-07-27 20:05:41.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_addchstr.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addchstr.3x,v 1.50 2024/07/27 20:05:41 tom Exp $
+-.TH curs_addchstr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addchstr.3x,v 1.52 2024/12/28 21:26:21 tom Exp $
++.TH curs_addchstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -120,12 +120,12 @@
+ .bP
+ .I win
+ is
+-.B NULL
++.I NULL
+ or
+ .bP
+ .I chstr
+ is
+-.BR NULL "."
++.IR NULL "."
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+Index: man/curs_addstr.3x
+Prereq:  1.55 
+--- ncurses-6.5-20241221+/man/curs_addstr.3x	2024-07-27 19:48:04.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_addstr.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addstr.3x,v 1.55 2024/07/27 19:48:04 tom Exp $
+-.TH curs_addstr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addstr.3x,v 1.57 2024/12/28 21:26:21 tom Exp $
++.TH curs_addstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -107,11 +107,11 @@
+ .bP
+ .I win
+ is
+-.BR NULL ","
++.IR NULL ","
+ .bP
+ .I str
+ is
+-.BR NULL ","
++.IR NULL ","
+ or
+ .bP
+ an internal \fB\%waddch\fP(3X) call returns
+Index: man/curs_addwstr.3x
+Prereq:  1.45 
+--- ncurses-6.5-20241221+/man/curs_addwstr.3x	2024-07-27 20:05:18.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_addwstr.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addwstr.3x,v 1.45 2024/07/27 20:05:18 tom Exp $
+-.TH curs_addwstr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addwstr.3x,v 1.47 2024/12/28 21:26:21 tom Exp $
++.TH curs_addwstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -117,11 +117,11 @@
+ .bP
+ .I win
+ is
+-.BR NULL ","
++.IR NULL ","
+ .bP
+ .I wstr
+ is
+-.BR NULL ","
++.IR NULL ","
+ or
+ .bP
+ an internal \fB\%wadd_wch\fP(3X) call returns
+Index: man/curs_attr.3x
+Prereq:  1.113 
+--- ncurses-6.5-20241221+/man/curs_attr.3x	2024-09-21 23:39:04.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_attr.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_attr.3x,v 1.113 2024/09/21 23:39:04 tom Exp $
+-.TH curs_attr 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_attr.3x,v 1.115 2024/12/28 21:26:21 tom Exp $
++.TH curs_attr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -332,7 +332,7 @@
+ if
+ .I win
+ is
+-.BR NULL "."
++.IR NULL "."
+ .PP
+ .B \%wcolor_set
+ returns
+@@ -350,7 +350,7 @@
+ or
+ .I \%pair
+ parameter is
+-.BR NULL "."
++.IR NULL "."
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+@@ -390,7 +390,8 @@
+ .PP
+ Each of the functions added by XSI Curses has a parameter \fIopts\fP,
+ which X/Open Curses still (after more than twenty years) documents
+-as reserved for future use, saying that it should be \fBNULL\fP.
++as reserved for future use, saying that it should be
++.IR NULL "."
+ This implementation uses that parameter in ABI 6 for the functions which
+ have a color pair parameter to support \fIextended color pairs\fP:
+ .bP
+@@ -418,7 +419,8 @@
+ For functions which turn attributes off, e.g.,
+ \fBwattr_off\fP,
+ the \fIopts\fP parameter is ignored except
+-except to check that it is \fBNULL\fP.
++except to check that it is
++.IR NULL "."
+ .\" ---------------------------------------------------------------------------
+ .SH PORTABILITY
+ These functions are described in X/Open Curses, Issue 4.
+Index: man/curs_bkgd.3x
+Prereq:  1.64 
+--- ncurses-6.5-20241221+/man/curs_bkgd.3x	2024-09-22 18:16:03.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_bkgd.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_bkgd.3x,v 1.64 2024/09/22 18:16:03 tom Exp $
+-.TH curs_bkgd 3X 2024-09-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_bkgd.3x,v 1.67 2024/12/28 21:26:21 tom Exp $
++.TH curs_bkgd 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -79,25 +79,30 @@
+ .I curses
+ fills the cells with the background character.
+ .I curses
+-also uses the window background when writing characters to the screen:
++also uses the window background when writing characters to the screen.
+ .bP
+-The attribute part of the background is combined with all
+-non-blank characters that are written into the window,
++The attribute part of the background combines with all
++non-blank characters written into the window,
+ as with the \fB\%waddch\fP(3X) and \fB\%winsch\fP(3X) families of
+ functions.
+ .bP
+-Both the character and attribute parts of the background are combined with
++Both the character and attribute parts of the background combine with
+ blank characters that are written into the window.
+ .PP
+ The background becomes a property of the character and moves with it
+ through any scrolling and insert/delete line/character operations.
+ .PP
+ To the extent possible on a given terminal,
+-the attribute part of the background is displayed as the graphic
+-rendition of the character put on the screen.
++.I curses
++displays the attributes of the background
++as the graphic rendition of the character put on the screen.
+ .SS "bkgd, wbkgd"
+-\fB\%bkgd\fP and \fB\%wbkgd\fP set the background property of
+-\fB\%stdscr\fP or the specified window and then apply this setting to
++.B \%bkgd
++and
++.B \%wbkgd
++set the background property of
++.B \%stdscr
++or the specified window and then apply this setting to
+ every character cell in that window.
+ .bP
+ The rendition of every character in the window changes to the new
+@@ -109,8 +114,8 @@
+ .I \%ncurses
+ updates the rendition of each character cell by comparing the character,
+ non-color attributes,
+-and colors.
+-The library applies to following procedure to each cell in the window,
++and color pair selection.
++The library applies the following procedure to each cell in the window,
+ whether or not it is blank.
+ .bP
+ .I \%ncurses
+@@ -121,7 +126,7 @@
+ writes the new background character to the cell.
+ .bP
+ .I \%ncurses
+-then checks if the cell uses color,
++then checks if the cell uses color;
+ that is,
+ its color pair value is nonzero.
+ If not,
+@@ -146,7 +151,7 @@
+ .PP
+ If the new background's character is nonspacing,
+ .I \%ncurses
+-reuses the old background character,
++retains the existing background character,
+ except for one special case:
+ .I \%ncurses
+ treats a background character value of zero (0) as a space.
+@@ -156,77 +161,133 @@
+ .I \%ncurses
+ ignores the new background character's color attribute.
+ .SS "bkgdset, wbkgdset"
+-\fB\%bkgdset\fP and \fB\%wbkgdset\fP manipulate the background of
+-the applicable window,
+-without updating the character cells as \fB\%bkgd\fP and
+-\fB\%wbkgd\fP do;
++.B \%bkgdset
++and
++.B \%wbkgdset
++manipulate the background of the applicable window,
++without updating the character cells as
++.B \%bkgd
++and
++.B \%wbkgd
++do;
+ only future writes reflect the updated background.
+ .SS getbkgd
+-\fB\%getbkgd\fP obtains the given window's background character and
+-attribute combination.
++.B \%getbkgd
++returns the given window's background character,
++attributes,
++and color pair as a
++.IR \%chtype "."
+ .SH RETURN VALUE
+-Functions returning an \fIint\fP return \fBOK\fP on success.
+-\fB\%bkgd\fP returns \fBERR\fP if the library has not been initialized.
+-\fB\%wbkgd\fP and \fB\%getbkgd\fP return \fBERR\fP if a \fI\%WINDOW\fP
+-pointer argument is null.
++.B \%bkgdset
++and
++.B \%wbkgdset
++do not return a value
+ .PP
+-\fB\%bkgdset\fP and \fBwbkgdset\fP do not return a value.
++Functions returning an
++.I int
++return
++.B ERR
++upon failure and
++.B OK
++upon success.
++In
++.IR \%ncurses ","
++failure occurs if
++.bP
++if the library has not been initialized,
++or
++.bP
++if
++.I win
++is
++.IR NULL "."
+ .PP
+-\fB\%getbkgd\fP returns a window's background character and attribute
+-combination.
++.BR \%getbkgd 's
++return value is as described above.
+ .SH NOTES
+ Unusually,
+-there is no \fB\%wgetbkgd\fP function;
+-\fB\%getbkgd\fP behaves as one would expect \fB\%wgetbkgd\fP to,
+-accepting a \fI\%WINDOW\fP pointer argument.
++there is no
++.B \%wgetbkgd
++function;
++.B \%getbkgd
++behaves as one would expect
++.B \%wgetbkgd
++to,
++accepting a
++.I \%WINDOW
++pointer argument.
+ .PP
+-\fB\%bkgd\fP and
+-\fB\%bkgdset\fP
++.B \%bkgd
++and
++.B \%bkgdset
+ may be implemented as macros.
+ .PP
+ X/Open Curses mentions that the character part of the background must
+ be a single-byte value.
+-\fI\%ncurses\fP,
+-like SVr4 \fIcurses\fP,
++.IR \%ncurses ","
++like SVr4
++.IR curses ","
+ checks to ensure that,
+-and will reuse the old background character if the check fails.
++and retains the existing background character if the check fails.
+ .SH PORTABILITY
+ X/Open Curses,
+ Issue 4 describes these functions.
+-It specifies that
+-\fB\%bkgd\fP,
+-\fB\%wbkgd\fP,
++It indicates that
++.IR bkgd ","
++.IR wbkgd ","
+ and
+-\fB\%getbkgd\fP
+-return \fBERR\fP on failure
++.I getbkgd
++return
++.B ERR
++on failure
+ (in the case of the last,
+ this value is cast to
+ .IR \%chtype ),
+-but describes no failure conditions.
++but specifies no error conditions for them.
+ .PP
+-The SVr4.0 manual says that \fB\%bkgd\fP and \fB\%wbkgd\fP may return
+-\fBOK\fP
+-\*(``or a non-negative integer if \fB\%immedok\fP is set\*('',
+-which refers to the return value from \fB\%wrefresh\fP(3X),
++SVr4 documentation
++.\" SVID 4, vol. 3, p. 482
++says that
++.I \%bkgd
++and
++.I \%wbkgd
++return
++.B OK
++\*(``or a non-negative integer if
++.B \%immedok
++is set\*('',
++which refers to the return value from
++.IR \%wrefresh() ","
+ used to implement the immediate repainting.
+-SVr4 \fIcurses\fP's \fB\%wrefresh\fP returns the number of characters
+-written to the screen during the refresh.
+-\fI\%ncurses\fP does not do that.
++SVr4
++.IR curses 's
++.I \%wrefresh
++returns the number of characters
++written to the screen during the refresh;
++that of
++.I \%ncurses
++does not.
+ .PP
+ Neither X/Open Curses nor the SVr4 manual pages detail how the rendition
+-of characters on the screen updates when \fB\%bkgd\fP or \fB\%wbkgd\fP
++of characters on the screen updates when
++.I \%bkgd
++or
++.I \%wbkgd
+ changes the background character.
+-.IR \%ncurses ,
++.IR \%ncurses ","
+ like SVr4
+-.IR curses ,
++.IR curses ","
+ does not
+ (in its non-wide configuration)
+ store the background and window attribute contributions to each
+ character cell separately.
++.SH HISTORY
++SVr3.1 (1987)
++introduced these functions.
+ .SH SEE ALSO
+ \fB\%curs_bkgrnd\fP(3X) describes the corresponding functions in the
+ wide configuration of
+-.IR \%ncurses .
++.IR \%ncurses "."
+ .PP
+ \fB\%curses\fP(3X),
+ \fB\%curs_addch\fP(3X),
+Index: man/curs_bkgrnd.3x
+Prereq:  1.46 
+--- ncurses-6.5-20241221+/man/curs_bkgrnd.3x	2024-09-22 18:23:50.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_bkgrnd.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_bkgrnd.3x,v 1.46 2024/09/22 18:23:50 tom Exp $
+-.TH curs_bkgrnd 3X 2024-09-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_bkgrnd.3x,v 1.49 2024/12/28 21:26:21 tom Exp $
++.TH curs_bkgrnd 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -74,32 +74,37 @@
+ .I \%cchar_t
+ which combines a set of attributes with the
+ .I "background character"
+-(see \fB\%curs_attr\fP(3X))
++(see \fB\%curs_attr\fP(3X)).
+ The background character is a spacing character.
+ .PP
+ When erasing parts of the screen,
+ .I curses
+ fills the cells with the background character.
+ .I curses
+-also uses the window background when writing characters to the screen:
++also uses the window background when writing characters to the screen.
+ .bP
+-The attribute part of the background is combined with all
+-non-blank characters that are written into the window,
++The attribute part of the background combines with all
++non-blank characters written into the window,
+ as with the \fB\%wadd_wch\fP(3X) and \fB\%wins_wch\fP(3X) families of
+ functions.
+ .bP
+-Both the character and attribute parts of the background are combined with
++Both the character and attribute parts of the background combine with
+ blank characters that are written into the window.
+ .PP
+ The background becomes a property of the character and moves with it
+ through any scrolling and insert/delete line/character operations.
+ .PP
+ To the extent possible on a given terminal,
+-the attribute part of the background is displayed as the graphic
+-rendition of the character put on the screen.
++.I curses
++displays the attributes of the background
++as the graphic rendition of the character put on the screen.
+ .SS "bkgrnd, wbkgrnd"
+-\fB\%bkgrnd\fP and \fB\%wbkgrnd\fP set the background property of
+-\fB\%stdscr\fP or the specified window and then apply this setting to
++.B \%bkgrnd
++and
++.B \%wbkgrnd
++set the background property of
++.B \%stdscr
++or the specified window and then apply this setting to
+ every character cell in that window.
+ .bP
+ The rendition of every character in the window changes to the new
+@@ -111,7 +116,7 @@
+ .I \%ncurses
+ updates the rendition of each character cell by comparing the character,
+ non-color attributes,
+-and colors.
++and color pair selection.
+ The library applies to following procedure to each cell in the window,
+ whether or not it is blank.
+ .bP
+@@ -123,7 +128,7 @@
+ writes the new background character to the cell.
+ .bP
+ .I \%ncurses
+-then checks if the cell uses color,
++then checks if the cell uses color;
+ that is,
+ its color pair value is nonzero.
+ If not,
+@@ -158,19 +163,33 @@
+ .I \%ncurses
+ ignores the new background character's color attribute.
+ .SS "bkgrndset, wbkgrndset"
+-\fB\%bkgrndset\fP and \fB\%wbkgrndset\fP manipulate the background of
+-the applicable window,
+-without updating the character cells as \fB\%bkgrnd\fP and
+-\fB\%wbkgrnd\fP do;
++.B \%bkgrndset
++and
++.B \%wbkgrndset
++manipulate the background of the applicable window,
++without updating the character cells as
++.B \%bkgrnd
++and
++.B \%wbkgrnd
++do;
+ only future writes reflect the updated background.
+ .SS "getbkgrnd, wgetbkgrnd"
+-The \fB\%getbkgrnd\fP and \fB\%wgetbkgrnd\fP functions obtain the
+-background character and attribute pair of \fB\%stdscr\fP or the
+-specified window and store it via the
++.B \%getbkgrnd
++and
++.B \%wgetbkgrnd
++respectively obtain
++.BR \%stdscr 's
++or the given window's background character,
++attributes,
++and color pair,
++and store it in their
+ .I wch
+-pointer.
++argument.
+ .SH RETURN VALUE
+-\fBbkgrndset\fP and \fBwbkgrndset\fP do not return a value.
++.B \%bkgrndset
++and
++.B \%wbkgrndset
++do not return a value.
+ .PP
+ The other functions return
+ .B ERR
+@@ -178,29 +197,30 @@
+ .B OK
+ upon success.
+ In
+-.IR \%ncurses ,
++.IR \%ncurses ","
+ failure occurs if
+ .bP
+-a
+-.I \%WINDOW
+-pointer
+ .I win
+-is null, or
++is
++.IR NULL ","
++or
+ .bP
+-a
+-.I \%cchar_t
+-pointer
+ .I wch
+-is null.
++is
++.IR NULL "."
+ .SH NOTES
+-\fB\%bkgrnd\fP,
+-\fB\%bkgrndset\fP, and
+-\fB\%getbkgrnd\fP
++.BR \%bkgrnd ","
++.BR \%bkgrndset ","
++and
++.B \%getbkgrnd
+ may be implemented as macros.
+ .PP
+ Unlike their counterparts in the non-wide configuration of
+-.IR \%ncurses ,
+-\fB\%getbkgrnd\fP and \fB\%wgetbkgrnd\fP supply the background character
++.IR \%ncurses ","
++.B \%getbkgrnd
++and
++.B \%wgetbkgrnd
++supply the background character
+ and attribute in a modifiable
+ .I \%cchar_t
+ parameter,
+@@ -211,12 +231,17 @@
+ It specifies no error conditions for them.
+ .PP
+ X/Open Curses does not provide details of how the rendition is updated.
+-This implementation follows the approach used in SVr4
+-.IR curses .
++.I \%ncurses
++follows the approach used in SVr4
++.IR curses 's
++non-wide functions for manipulating the window background.
++.SH HISTORY
++These functions were initially specified by X/Open Curses,
++Issue 4.
+ .SH SEE ALSO
+ \fB\%curs_bkgd\fP(3X) describes the corresponding functions in the
+ non-wide configuration of
+-.IR \%ncurses .
++.IR \%ncurses "."
+ .PP
+ \fB\%curses\fP(3X),
+ \fB\%curs_add_wch\fP(3X),
+Index: man/curs_color.3x
+Prereq:  1.102 
+--- ncurses-6.5-20241221+/man/curs_color.3x	2024-05-25 20:10:58.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_color.3x	2024-12-28 21:18:35.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_color.3x,v 1.102 2024/05/25 20:10:58 tom Exp $
+-.TH curs_color 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_color.3x,v 1.104 2024/12/28 21:18:35 tom Exp $
++.TH curs_color 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -551,9 +551,12 @@
+ .PP
+ Other implementations of curses had different limits:
+ .bP
+-PCCurses (1987-1990) provided for only eight (8) colors.
++.I \%PCCurses
++(1987-1990) provided for only eight (8) colors.
+ .bP
+-PDCurses (1992-present) inherited the 8-color limitation from PCCurses,
++.I \%PDCurses
++(1992-present) inherited the 8-color limitation from
++.IR \%PCCurses ,
+ but changed this to 256 in version 2.5 (2001),
+ along with changing \fB\%chtype\fP from 16-bits to 32-bits.
+ .bP
+Index: man/curs_delch.3x
+Prereq:  1.39 
+--- ncurses-6.5-20241221+/man/curs_delch.3x	2024-09-21 23:43:41.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_delch.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_delch.3x,v 1.39 2024/09/21 23:43:41 tom Exp $
+-.TH curs_delch 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_delch.3x,v 1.41 2024/12/28 21:26:21 tom Exp $
++.TH curs_delch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -83,7 +83,7 @@
+ if
+ .I win
+ is
+-.BR NULL "."
++.IR NULL "."
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+Index: man/curs_deleteln.3x
+Prereq:  1.41 
+--- ncurses-6.5-20241221+/man/curs_deleteln.3x	2024-09-22 18:35:00.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_deleteln.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_deleteln.3x,v 1.41 2024/09/22 18:35:00 tom Exp $
+-.TH curs_deleteln 3X 2024-09-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_deleteln.3x,v 1.43 2024/12/28 21:26:21 tom Exp $
++.TH curs_deleteln 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -110,7 +110,7 @@
+ they fail if
+ .I win
+ is
+-.BR NULL "."
++.IR NULL "."
+ .SH NOTES
+ All of these functions except
+ .B \%winsdelln
+Index: man/curs_get_wch.3x
+Prereq:  1.47 
+--- ncurses-6.5-20241221+/man/curs_get_wch.3x	2024-09-14 20:06:50.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_get_wch.3x	2024-12-28 21:27:26.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_get_wch.3x,v 1.47 2024/09/14 20:06:50 tom Exp $
+-.TH curs_get_wch 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_get_wch.3x,v 1.50 2024/12/28 21:27:26 tom Exp $
++.TH curs_get_wch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -109,7 +109,7 @@
+ If \fB\%nocbreak\fP(3X) or \fB\%noraw\fP(3X)
+ has been called,
+ it occurs when the next newline is read.
+-(Because the terminal's normal or \*(``cooked\*('' mode
++(Because the terminal's canonical or \*(``cooked\*('' mode
+ is line-buffered,
+ multiple
+ .B \%wget_wch
+@@ -194,7 +194,7 @@
+ Functions taking a
+ .I \%WINDOW
+ pointer argument fail if the pointer is
+-.BR NULL "."
++.IR NULL "."
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+Index: man/curs_get_wstr.3x
+Prereq:  1.54 
+--- ncurses-6.5-20241221+/man/curs_get_wstr.3x	2024-06-22 21:34:19.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_get_wstr.3x	2024-12-28 21:18:35.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_get_wstr.3x,v 1.54 2024/06/22 21:34:19 tom Exp $
+-.TH curs_get_wstr 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_get_wstr.3x,v 1.56 2024/12/28 21:18:35 tom Exp $
++.TH curs_get_wstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -214,8 +214,12 @@
+ For analogy with \fBwgetnstr\fP,
+ \fI\%ncurses\fP 6.2 uses a limit (based on \fBLINE_MAX\fP).
+ .bP
+-Some other implementations (such as Solaris xcurses) do the same,
+-while others (PDCurses) do not allow this.
++Some other implementations (such as Solaris
++.IR xcurses )
++do the same,
++while others
++.RI \%( PDCurses )
++do not allow this.
+ .bP
+ NetBSD 7 curses imitates \fI\%ncurses\fP 6.1 in this regard,
+ treating a \fB\-1\fP as an indefinite number of characters.
+Index: man/curs_getch.3x
+Prereq:  1.101 
+--- ncurses-6.5-20241221+/man/curs_getch.3x	2024-09-14 20:06:50.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_getch.3x	2024-12-28 21:27:26.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getch.3x,v 1.101 2024/09/14 20:06:50 tom Exp $
+-.TH curs_getch 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_getch.3x,v 1.104 2024/12/28 21:27:26 tom Exp $
++.TH curs_getch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -109,7 +109,7 @@
+ If \fB\%nocbreak\fP(3X) or \fB\%noraw\fP(3X)
+ has been called,
+ it occurs when the next newline is read.
+-(Because the terminal's normal or \*(``cooked\*('' mode
++(Because the terminal's canonical or \*(``cooked\*('' mode
+ is line-buffered,
+ multiple
+ .B \%wgetch
+@@ -478,7 +478,7 @@
+ Functions taking a
+ .I \%WINDOW
+ pointer argument fail if the pointer is
+-.BR NULL "."
++.IR NULL "."
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+@@ -558,7 +558,7 @@
+ (raw,
+ cbreak,
+ or
+-\*(``cooked\*(''),
++canonical),
+ and whether \fB\%nl\fP(3X) or \fB\%nonl\fP(3X) has been called,
+ .B \%wgetch
+ may return either a carriage return or line feed upon an Enter or Return
+Index: man/curs_getstr.3x
+Prereq:  1.67 
+--- ncurses-6.5-20241221+/man/curs_getstr.3x	2024-06-22 22:20:56.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_getstr.3x	2024-12-28 21:27:26.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getstr.3x,v 1.67 2024/06/22 22:20:56 tom Exp $
+-.TH curs_getstr 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_getstr.3x,v 1.71 2024/12/28 21:27:26 tom Exp $
++.TH curs_getstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -158,7 +158,7 @@
+ .bP
+ .I win
+ is
+-.BR NULL ","
++.IR NULL ","
+ or
+ .bP
+ if an internal
+@@ -206,7 +206,7 @@
+ .I curses
+ screen to permit simple editing of the input buffer.
+ It saves the screen's state and then calls \fBnl\fP(3X) and,
+-if the screen was in normal (\*(``cooked\*('') mode,
++if the screen was in canonical (\*(``cooked\*('') mode,
+ \fB\%cbreak\fP(3X).
+ Before returning,
+ it restores the saved screen state.
+@@ -304,7 +304,7 @@
+ .bP
+ .I \%ncurses
+ 6.1 and
+-.I PDCurses
++.I \%PDCurses
+ do not count the null character toward the limit,
+ while Solaris and NetBSD
+ .I curses
+Index: man/curs_in_wch.3x
+Prereq:  1.35 
+--- ncurses-6.5-20241221+/man/curs_in_wch.3x	2024-07-27 20:06:49.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_in_wch.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_in_wch.3x,v 1.35 2024/07/27 20:06:49 tom Exp $
+-.TH curs_in_wch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_in_wch.3x,v 1.37 2024/12/28 21:26:21 tom Exp $
++.TH curs_in_wch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -80,7 +80,7 @@
+ if
+ .I win
+ is
+-.BR NULL "."
++.IR NULL "."
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+Index: man/curs_inch.3x
+Prereq:  1.62 
+--- ncurses-6.5-20241221+/man/curs_inch.3x	2024-07-27 19:58:17.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_inch.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inch.3x,v 1.62 2024/07/27 19:58:17 tom Exp $
+-.TH curs_inch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inch.3x,v 1.64 2024/12/28 21:26:21 tom Exp $
++.TH curs_inch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -87,7 +87,7 @@
+ if
+ .I win
+ is
+-.BR NULL "."
++.IR NULL "."
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+Index: man/curs_inchstr.3x
+Prereq:  1.47 
+--- ncurses-6.5-20241221+/man/curs_inchstr.3x	2024-05-25 20:10:58.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_inchstr.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inchstr.3x,v 1.47 2024/05/25 20:10:58 tom Exp $
+-.TH curs_inchstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inchstr.3x,v 1.49 2024/12/28 21:26:21 tom Exp $
++.TH curs_inchstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -69,7 +69,9 @@
+ \fBint mvwinchnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, chtype *\fIchstr\fP, int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
+-These routines return a NULL-terminated array of \fBchtype\fP quantities,
++These routines return a
++.IR 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.
+ .PP
+Index: man/curs_initscr.3x
+Prereq:  1.79 
+--- ncurses-6.5-20241221+/man/curs_initscr.3x	2024-09-21 17:59:36.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_initscr.3x	2024-12-28 21:18:35.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_initscr.3x,v 1.79 2024/09/21 17:59:36 tom Exp $
+-.TH curs_initscr 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_initscr.3x,v 1.81 2024/12/28 21:18:35 tom Exp $
++.TH curs_initscr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -363,7 +363,8 @@
+ called.
+ .bP
+ NetBSD copied this feature of \fI\%ncurses\fP in 2001.
+-PDCurses follows the SVr4 model,
++.I \%PDCurses
++follows the SVr4 model,
+ deleting only the standard \fI\%WINDOW\fP structures.
+ .SS "High-level versus Low-level"
+ Different implementations may disagree regarding the level of some functions.
+Index: man/curs_inopts.3x
+Prereq:  1.79 
+--- ncurses-6.5-20241221+/man/curs_inopts.3x	2024-09-21 18:05:49.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_inopts.3x	2024-12-28 21:27:26.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inopts.3x,v 1.79 2024/09/21 18:05:49 tom Exp $
+-.TH curs_inopts 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inopts.3x,v 1.82 2024/12/28 21:27:26 tom Exp $
++.TH curs_inopts 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -147,7 +147,7 @@
+ and makes characters typed by the user immediately available to the
+ program.
+ .B \%nocbreak
+-restores the terminal's normal (\*(``cooked\*('') line discipline.
++restores the terminal's canonical (\*(``cooked\*('') line discipline.
+ .PP
+ The state of the terminal is unknown to a
+ .I curses
+@@ -328,7 +328,7 @@
+ configures the terminal to perform this translation.
+ .B nonl
+ disables it.
+-Under its normal (\*(``cooked\*('') line discipline,
++Under its canonical (\*(``cooked\*('') line discipline,
+ the terminal driver always translates carriage returns to line feeds.
+ .\"
+ .SS nodelay
+@@ -365,7 +365,7 @@
+ configure the terminal driver's treatment of its input and output queues
+ when it handles the interrupt,
+ suspend,
+-or quit characters under the normal (\*(``cooked\*('')
++or quit characters under the canonical (\*(``cooked\*('')
+ or cbreak line disciplines on POSIX systems;
+ see \fI\%termios\fP(3).
+ The default behavior is inherited from the terminal driver settings.
+@@ -412,7 +412,7 @@
+ .I curses
+ does not handle.
+ .B \%noraw
+-restores the terminal's normal (\*(``cooked\*('') line discipline.
++restores the terminal's canonical (\*(``cooked\*('') line discipline.
+ .\"
+ .SS "timeout, wtimeout"
+ .B \%wtimeout
+@@ -515,7 +515,7 @@
+ .bP
+ .I win
+ is
+-.B NULL
++.I NULL
+ (except for
+ .B \%intrflush
+ and
+@@ -558,7 +558,7 @@
+ and
+ .B \%nocbreak
+ follow historical practice in that they attempt to restore
+-the terminal's normal (\*(``cooked\*('') line discipline
++the terminal's canonical (\*(``cooked\*('') line discipline
+ from raw and cbreak,
+ respectively.
+ Mixing
+@@ -642,7 +642,7 @@
+ or
+ .B \%noecho
+ explicitly just after initialization,
+-even if your program retains the terminal's normal (\*(``cooked\*('')
++even if your program retains the terminal's canonical (\*(``cooked\*('')
+ line discipline.
+ .PP
+ X/Open Curses is ambiguous regarding whether
+Index: man/curs_ins_wch.3x
+Prereq:  1.34 
+--- ncurses-6.5-20241221+/man/curs_ins_wch.3x	2024-07-27 20:05:18.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_ins_wch.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_ins_wch.3x,v 1.34 2024/07/27 20:05:18 tom Exp $
+-.TH curs_ins_wch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_ins_wch.3x,v 1.36 2024/12/28 21:26:21 tom Exp $
++.TH curs_ins_wch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -73,7 +73,7 @@
+ Functions taking a
+ .I \%WINDOW
+ pointer argument fail if the pointer is
+-.BR NULL .
++.IR NULL .
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+Index: man/curs_ins_wstr.3x
+Prereq:  1.46 
+--- ncurses-6.5-20241221+/man/curs_ins_wstr.3x	2024-09-14 20:06:50.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_ins_wstr.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_ins_wstr.3x,v 1.46 2024/09/14 20:06:50 tom Exp $
+-.TH curs_ins_wstr 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_ins_wstr.3x,v 1.48 2024/12/28 21:26:21 tom Exp $
++.TH curs_ins_wstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -119,11 +119,11 @@
+ .bP
+ .I win
+ is
+-.BR NULL ","
++.IR NULL ","
+ .bP
+ .I wstr
+ is
+-.BR NULL ","
++.IR NULL ","
+ .bP
+ the first wide character in
+ .I wstr
+Index: man/curs_insch.3x
+Prereq:  1.42 
+--- ncurses-6.5-20241221+/man/curs_insch.3x	2024-07-27 20:08:25.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_insch.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_insch.3x,v 1.42 2024/07/27 20:08:25 tom Exp $
+-.TH curs_insch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_insch.3x,v 1.44 2024/12/28 21:26:21 tom Exp $
++.TH curs_insch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -77,7 +77,7 @@
+ Functions taking a
+ .I \%WINDOW
+ pointer argument fail if the pointer is
+-.BR NULL .
++.IR NULL .
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+Index: man/curs_insstr.3x
+Prereq:  1.57 
+--- ncurses-6.5-20241221+/man/curs_insstr.3x	2024-07-27 20:07:59.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_insstr.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_insstr.3x,v 1.57 2024/07/27 20:07:59 tom Exp $
+-.TH curs_insstr 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_insstr.3x,v 1.59 2024/12/28 21:26:21 tom Exp $
++.TH curs_insstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -119,11 +119,11 @@
+ .bP
+ .I win
+ is
+-.BR NULL ","
++.IR NULL ","
+ .bP
+ .I str
+ is
+-.BR NULL ","
++.IR NULL ","
+ or
+ .bP
+ an internal \fBwinsch\fP(3X) call returns
+Index: man/curs_instr.3x
+Prereq:  1.59 
+--- ncurses-6.5-20241221+/man/curs_instr.3x	2024-09-14 20:06:50.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_instr.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_instr.3x,v 1.59 2024/09/14 20:06:50 tom Exp $
+-.TH curs_instr 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_instr.3x,v 1.61 2024/12/28 21:26:21 tom Exp $
++.TH curs_instr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -115,12 +115,12 @@
+ .bP
+ .I win
+ is
+-.B NULL
++.I NULL
+ or
+ .bP
+ .I str
+ is
+-.BR NULL "."
++.IR NULL "."
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+Index: man/curs_inwstr.3x
+Prereq:  1.47 
+--- ncurses-6.5-20241221+/man/curs_inwstr.3x	2024-09-14 20:06:50.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_inwstr.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inwstr.3x,v 1.47 2024/09/14 20:06:50 tom Exp $
+-.TH curs_inwstr 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inwstr.3x,v 1.49 2024/12/28 21:26:21 tom Exp $
++.TH curs_inwstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -129,12 +129,12 @@
+ .bP
+ .I win
+ is
+-.B NULL
++.I NULL
+ or
+ .bP
+ .I wstr
+ is
+-.BR NULL "."
++.IR NULL "."
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+Index: man/curs_mouse.3x
+Prereq:  1.103 
+--- ncurses-6.5-20241221+/man/curs_mouse.3x	2024-05-25 20:10:58.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_mouse.3x	2024-12-28 21:27:26.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_mouse.3x,v 1.103 2024/05/25 20:10:58 tom Exp $
+-.TH curs_mouse 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_mouse.3x,v 1.106 2024/12/28 21:27:26 tom Exp $
++.TH curs_mouse 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -93,10 +93,10 @@
+ has been successfully initialized,
+ and \fBFALSE\fP otherwise.
+ .PP
+-Mouse events are ignored when input is in cooked mode, and
+-cause an error beep when cooked mode is being simulated in a window by a
+-function such as \fB\%getstr\fP that expects a linefeed for input-loop
+-termination.
++Mouse events are ignored when input is in canonical (\*(``cooked\*('')
++mode, and cause an error beep when canonical mode is being simulated in
++a window by a function such as \fB\%getstr\fP that expects a linefeed
++for input-loop termination.
+ .SS mousemask
+ To make mouse events visible, use the \fB\%mousemask\fP function.
+ This sets the mouse events to be reported.
+@@ -109,7 +109,8 @@
+ or if the terminal does not support mouse-events,
+ this function returns 0.
+ .bP
+-If \fIoldmask\fP is non-\fBNULL\fP,
++If \fIoldmask\fP is
++.RI non- NULL ","
+ this function fills the indicated location with the previous value of the
+ current screen's mouse event mask.
+ .PP
+@@ -216,7 +217,9 @@
+ through the pointers.
+ If the conversion was successful, the function returns \fBTRUE\fP.
+ .IP
+-If one of the parameters was \fBNULL\fP or the location is
++If one of the parameters was
++.I NULL
++or the location is
+ not inside the window, \fBFALSE\fP is returned.
+ .bP
+ If \fIto_screen\fP is
+@@ -226,7 +229,9 @@
+ window \fIwin\fP encloses this point.
+ In this case the function returns \fBTRUE\fP.
+ .IP
+-If one of the parameters is \fBNULL\fP or the point is not inside the
++If one of the parameters is
++.I NULL
++or the point is not inside the
+ window, \fBFALSE\fP is returned.
+ .PP
+ The referenced coordinates
+@@ -483,7 +488,8 @@
+ .I \%xterm
+ are
+ .I not
+-ignored in cooked mode if they have been enabled by \fB\%mousemask\fP.
++ignored in canonical mode if they have been enabled by
++\fB\%mousemask\fP.
+ Instead,
+ the
+ .I \%xterm
+Index: man/curs_move.3x
+Prereq:  1.46 
+--- ncurses-6.5-20241221+/man/curs_move.3x	2024-09-21 18:03:44.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_move.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_move.3x,v 1.46 2024/09/21 18:03:44 tom Exp $
+-.TH curs_move 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_move.3x,v 1.48 2024/12/28 21:26:21 tom Exp $
++.TH curs_move 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -88,7 +88,7 @@
+ fails if
+ .I win
+ is
+-.BR NULL .
++.IR NULL .
+ .SH NOTES
+ .B \%move
+ may be implemented as a macro.
+Index: man/curs_opaque.3x
+Prereq:  1.43 
+--- ncurses-6.5-20241221+/man/curs_opaque.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_opaque.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_opaque.3x,v 1.43 2024/03/16 15:35:01 tom Exp $
+-.TH curs_opaque 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_opaque.3x,v 1.45 2024/12/28 21:26:21 tom Exp $
++.TH curs_opaque 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -136,7 +136,9 @@
+ .TP
+ \fBwgetparent\fP
+ returns the parent \fI\%WINDOW\fP pointer for subwindows,
+-or \fBNULL\fP for windows having no parent.
++or
++.I NULL
++for windows having no parent.
+ .TP
+ \fBwgetscrreg\fP
+ stores the the top and bottom rows for the scrolling margin set by
+Index: man/curs_pad.3x
+Prereq:  1.67 
+--- ncurses-6.5-20241221+/man/curs_pad.3x	2024-07-27 19:55:45.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_pad.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_pad.3x,v 1.67 2024/07/27 19:55:45 tom Exp $
+-.TH curs_pad 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_pad.3x,v 1.69 2024/12/28 21:26:21 tom Exp $
++.TH curs_pad 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -179,7 +179,7 @@
+ upon successful completion.
+ .PP
+ Functions that return pointers return
+-.B NULL
++.I NULL
+ on error,
+ and set
+ .I \%errno
+Index: man/curs_scr_dump.3x
+Prereq:  1.49 
+--- ncurses-6.5-20241221+/man/curs_scr_dump.3x	2024-09-21 09:30:22.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_scr_dump.3x	2024-12-28 21:19:39.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_scr_dump.3x,v 1.49 2024/09/21 09:30:22 tom Exp $
+-.TH curs_scr_dump 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_scr_dump.3x,v 1.51 2024/12/28 21:19:39 tom Exp $
++.TH curs_scr_dump 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -198,31 +198,48 @@
+ qualifiers.
+ .PP
+ SVr4 documentation describes
+-.B \%scr_init
++.I \%scr_init
+ such that the dump data is also considered invalid
+ \*(``if the time-stamp of the tty is old\*(''
+ but does not define \*(``old\*(''.
+ .PP
+-As of 2024, PDCurses provides these functions.
+-NetBSD curses does not provide these functions,
+-although it provides \fB\%getwin\fP.
+-.PP
+-Other implementations of curses store the window in binary form.
+-One drawback to binary form is that this makes the dump dependent upon
+-the curses library's internal data structures.
+-Rather than do that, ncurses stores the dump in textual form,
++As of 2024,
++.I \%PDCurses
++provides these functions.
++NetBSD
++.I curses
++does not.
++.PP
++Other implementations of
++.I curses
++store the window in binary form,
++which makes the dump dependent
++upon the
++.I curses
++library's internal data structures.
++.I \%ncurses
++avoids this drawback by storing the dump in textual form,
+ allowing more flexible use of the data.
+-For instance, SVr4 curses \fB\%scr_restore\fP requires that the
+-dumped window have the same dimensions as the restored window.
+-ncurses uses \fB\%wresize\fP to adjust the restored window size.
++For instance,
++the
++.I \%scr_restore
++of SVr4
++.I curses
++requires that the dumped window have the same dimensions
++as the restored window.
++.I \%ncurses
++uses its
++\fB\%wresize\fP(3X)
++extension
++to adjust the restored window size.
+ .SH HISTORY
+ SVr3 (1987) introduced
+-.BR \%scr_dump ","
+-.BR \%scr_init ","
++.IR \%scr_dump ","
++.IR \%scr_init ","
+ and
+-.BR \%scr_restore "."
++.IR \%scr_restore "."
+ SVr3.1 added
+-.BR \%scr_set "."
++.IR \%scr_set "."
+ .SH SEE ALSO
+ .na
+ \fB\%curses\fP(3X),
+Index: man/curs_slk.3x
+Prereq:  1.75 
+--- ncurses-6.5-20241221+/man/curs_slk.3x	2024-06-22 21:25:23.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_slk.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_slk.3x,v 1.75 2024/06/22 21:25:23 tom Exp $
+-.TH curs_slk 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_slk.3x,v 1.78 2024/12/28 21:26:21 tom Exp $
++.TH curs_slk 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -255,7 +255,9 @@
+ if the format parameter is outside the range 0..3.
+ .TP 5
+ \fBslk_label\fP
+-returns \fBNULL\fP on error.
++returns
++.I NULL
++on error.
+ .TP 5
+ \fBslk_set\fP
+ returns
+@@ -343,7 +345,8 @@
+ .bP
+ The format codes \fB2\fP and \fB3\fP for \fB\%slk_init\fP
+ were added by \fI\%ncurses\fP in 1996.
+-PDCurses 2.4 added this feature in 2001.
++.I \%PDCurses
++2.4 added this feature in 2001.
+ .PP
+ The function \fB\%slk_attr\fP was added by \fI\%ncurses\fP in 1996.
+ .PP
+Index: man/curs_termattrs.3x
+Prereq:  1.42 
+--- ncurses-6.5-20241221+/man/curs_termattrs.3x	2024-05-11 20:39:53.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_termattrs.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_termattrs.3x,v 1.42 2024/05/11 20:39:53 tom Exp $
+-.TH curs_termattrs 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_termattrs.3x,v 1.44 2024/12/28 21:26:21 tom Exp $
++.TH curs_termattrs 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%baudrate\fP,
+ \fB\%erasechar\fP,
+@@ -110,7 +110,9 @@
+ .SS termname
+ The \fBtermname\fP routine returns the terminal name used by \fBsetupterm\fP.
+ .SH RETURN VALUE
+-\fBlongname\fP and \fBtermname\fP return \fBNULL\fP on error.
++\fBlongname\fP and \fBtermname\fP return
++.I NULL
++on error.
+ .PP
+ 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
+Index: man/curs_termcap.3x
+Prereq:  1.91 
+--- ncurses-6.5-20241221+/man/curs_termcap.3x	2024-09-21 18:00:03.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_termcap.3x	2024-12-28 21:28:49.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_termcap.3x,v 1.91 2024/09/21 18:00:03 tom Exp $
+-.TH curs_termcap 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_termcap.3x,v 1.95 2024/12/28 21:28:49 tom Exp $
++.TH curs_termcap 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -115,12 +115,12 @@
+ \fBchar * BC;
+ \fB@NCURSES_OSPEED@ ospeed;
+ .PP
+-\fBint tgetent(char *\fIbp\fP, const char *\fIname\fP);
+-\fBint tgetflag(const char *\fIid\fP);
+-\fBint tgetnum(const char *\fIid\fP);
+-\fBchar *tgetstr(const char *\fIid\fP, char **\fIarea\fP);
+-\fBchar *tgoto(const char *\fIcap\fP, int \fIcol\fP, int \fIrow\fP);
+-\fBint tputs(const char *\fIstr\fP, int \fIaffcnt\fP, int (*\fIputc\fP)(int));
++\fBint tgetent(char * \fIbp\fP, const char * \fIname\fP);
++\fBint tgetflag(const char * \fIid\fP);
++\fBint tgetnum(const char * \fIid\fP);
++\fBchar * tgetstr(const char * \fIid\fP, char ** \fIarea\fP);
++\fBchar * tgoto(const char * \fIcap\fP, int \fIcol\fP, int \fIrow\fP);
++\fBint tputs(const char * \fIstr\fP, int \fIaffcnt\fP, int (* \fIputc\fP)(int));
+ .fi
+ .SH DESCRIPTION
+ .I \%ncurses
+@@ -138,10 +138,10 @@
+ It returns
+ .RS 3
+ .TP 5 \" "-1" + 2n + adjust for PDF
+-1
++.B 1
+ on success,
+ .TP
+-0
++.B 0
+ if there is no such entry
+ (or if the matching entry describes a generic terminal,
+ having too little information for
+@@ -149,8 +149,10 @@
+ applications to run),
+ and
+ .TP
+-\-1
+-if the \fI\%term\%info\fP database could not be found.
++.B \-1
++if the
++.I \%term\%info
++database could not be found.
+ .RE
+ .PP
+ This implementation differs from those of historical \fItermcap\fP
+@@ -185,7 +187,7 @@
+ .PP
+ \fB\%tgetstr\fP returns the string entry for \fIid\fP,
+ or
+-.B NULL
++.I NULL
+ if it is not available.
+ Use \fB\%tputs\fP to output the string returned.
+ The
+@@ -200,9 +202,9 @@
+ \fI\%ncurses\fP checks to ensure that
+ .I area
+ is not
+-.BR NULL ,
++.IR NULL ","
+ and also that the resulting buffer pointer is not
+-.BR NULL .
++.IR NULL "."
+ If either check fails,
+ .I area
+ is ignored.
+@@ -264,20 +266,32 @@
+ It can retrieve capabilities by either \fItermcap\fP or
+ \fI\%term\%info\fP code.
+ .SS "Global Variables"
+-The variables
+-\fBPC\fP,
+-\fBUP\fP and
+-\fBBC\fP
+-are set by \fB\%tgetent\fP to the \fI\%term\%info\fP entry's data for
+-\fB\%pad_char\fP,
+-\fB\%cursor_up\fP and
+-\fB\%backspace_if_not_bs\fP,
++.B \%tgetent
++sets the variables
++.BR PC ","
++.BR UP ","
++and
++.B BC
++to the
++.I \%term\%info
++entry's data for
++.BR \%pad_char ","
++.BR \%cursor_up ","
++and
++.BR \%backspace_if_not_bs ","
+ respectively.
+-\fBUP\fP is not used by \fI\%ncurses\fP.
+-\fBPC\fP is used by \fB\%delay_output\fP(3X).
+-\fBBC\fP is used by \fB\%tgoto\fP emulation.
+-The variable \fB\%ospeed\fP is set by \fI\%ncurses\fP using a
+-system-specific encoding to indicate the terminal's data rate.
++\fBUP\fP is not used by
++.IR \%ncurses "."
++.B PC
++is used by \fB\%delay_output\fP(3X).
++.B BC
++is used by
++.B \%tgoto
++emulation.
++.I \%ncurses
++assigns the variable
++.B \%ospeed
++a system-specific value to encode the terminal's data rate.
+ .SS "Releasing Memory"
+ The \fItermcap\fP functions provide no means of freeing memory,
+ because legacy \fItermcap\fP implementations used only the buffer
+@@ -318,7 +332,7 @@
+ are documented above.
+ .PP
+ \fB\%tgoto\fP returns
+-.B NULL
++.I NULL
+ on error.
+ Error conditions include:
+ .bP
+Index: man/curs_terminfo.3x
+Prereq:  1.144 
+--- ncurses-6.5-20241221+/man/curs_terminfo.3x	2024-09-14 20:06:50.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_terminfo.3x	2024-12-28 21:32:56.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_terminfo.3x,v 1.144 2024/09/14 20:06:50 tom Exp $
+-.TH curs_terminfo 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_terminfo.3x,v 1.151 2024/12/28 21:32:56 tom Exp $
++.TH curs_terminfo 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -70,7 +70,7 @@
+ \fB#include 
+ \fB#include 
+ .PP
+-\fBTERMINAL *cur_term;
++\fBTERMINAL * cur_term;
+ .PP
+ \fBconst char * const boolnames[];
+ \fBconst char * const boolcodes[];
+@@ -82,35 +82,38 @@
+ \fBconst char * const strcodes[];
+ \fBconst char * const strfnames[];
+ .PP
+-\fBint setupterm(const char *\fIterm\fP, int \fIfiledes\fP, int *\fIerrret\fP);
+-\fBTERMINAL *set_curterm(TERMINAL *\fInterm\fP);
+-\fBint del_curterm(TERMINAL *\fIoterm\fP);
+-\fBint restartterm(const char *\fIterm\fP, int \fIfiledes\fP, int *\fIerrret\fP);
++\fBint setupterm(const char * \fIterm\fP, int \fIfiledes\fP, int * \fIerrret\fP);
++\fBTERMINAL * set_curterm(TERMINAL * \fInterm\fP);
++\fBint del_curterm(TERMINAL * \fIoterm\fP);
++\fBint restartterm(const char * \fIterm\fP, int \fIfiledes\fP,
++      int * \fIerrret\fP);
+ .PP
+-\fBchar *tparm(const char *\fIstr\fP, \fR.\|.\|.\fP);
++\fBchar * tparm(const char * \fIstr\fP, \fR.\|.\|.\fP);
+ 	\fI/* or */
+-\fBchar *tparm(const char *\fIstr\fP, long \fIp1\fP \fR.\|.\|.\fP \fBlong\fP \fIp9\fP);
++\fBchar * tparm(const char * \fIstr\fP, long \fIp1\fP \fR.\|.\|.\fP \fBlong\fP \fIp9\fP);
+ .PP
+-\fBint tputs(const char *\fIstr\fP, int \fIaffcnt\fP, int (*\fIputc\fP)(int));
+-\fBint putp(const char *\fIstr\fP);
++\fBint tputs(const char * \fIstr\fP, int \fIaffcnt\fP, int (* \fIputc\fP)(int));
++\fBint putp(const char * \fIstr\fP);
+ .PP
+-\fBint vidputs(chtype \fIattrs\fP, int (*\fIputc\fP)(int));
++\fBint vidputs(chtype \fIattrs\fP, int (* \fIputc\fP)(int));
+ \fBint vidattr(chtype \fIattrs\fP);
+-\fBint vid_puts(attr_t \fIattrs\fP, short \fIpair\fP, void *\fIopts\fP, int (*\fIputc\fP)(int));
+-\fBint vid_attr(attr_t \fIattrs\fP, short \fIpair\fP, void *\fIopts\fP);
++\fBint vid_puts(attr_t \fIattrs\fP, short \fIpair\fP, void * \fIopts\fP,
++      int (* \fIputc\fP)(int));
++\fBint vid_attr(attr_t \fIattrs\fP, short \fIpair\fP, void * \fIopts\fP);
++.PP
++\fBint tigetflag(const char * \fIcap-code\fP);
++\fBint tigetnum(const char * \fIcap-code\fP);
++\fBchar * tigetstr(const char * \fIcap-code\fP);
+ .PP
+-\fBint tigetflag(const char *\fIcap-code\fP);
+-\fBint tigetnum(const char *\fIcap-code\fP);
+-\fBchar *tigetstr(const char *\fIcap-code\fP);
+-.PP
+-\fBchar *tiparm(const char *\fIstr\fP, \fR.\|.\|.\fP);
++\fBchar * tiparm(const char * \fIstr\fP, \fR.\|.\|.\fP);
+ .PP
+ \fI/* extensions */
+-\fBchar *tiparm_s(int \fIexpected\fP, int \fImask\fP, const char *\fIstr\fP, ...);
+-\fBint tiscan_s(int *\fIexpected\fP, int *\fImask\fP, const char *\fIstr\fP);
++\fBchar * tiparm_s(int \fIexpected\fP, int \fImask\fP,
++      const char * \fIstr\fP, .\|.\|.);
++\fBint tiscan_s(int * \fIexpected\fP, int * \fImask\fP, const char * \fIstr\fP);
+ .PP
+ \fI/* deprecated */
+-\fBint setterm(const char *\fIterm\fP);
++\fBint setterm(const char * \fIterm\fP);
+ .fi
+ .SH DESCRIPTION
+ These low-level functions must be called by programs that deal directly
+@@ -131,92 +134,75 @@
+ Capability string values have no associated encoding;
+ they are strings of 8-bit characters.
+ .SS Initialization
+-Initially,
+-\fB\%setupterm\fP should be called.
+-The high-level
+-.I curses
+-functions \fB\%initscr\fP and \fB\%newterm\fP call \fB\%setupterm\fP to
+-initialize the low-level set of terminal-dependent variables listed in
++Call
++.B \%setupterm
++from your application to have
++.I \%term\%info
++manage the terminal device;
++this action initializes the terminal-dependent variables listed in
+ \fB\%term_variables\fP(3X).
+-.PP
+-Applications can use the terminal capabilities either directly
+-(via header definitions),
+-or by special functions.
+-The header files
+-.I \%curses.h
+-and
+-.I \%term.h
+-should be included
+-(in that order)
+-to get the definitions for these strings,
+-numbers,
+-and flags.
+-.PP
+-The
++(A
++.I curses
++application calling \fB\%initscr\fP(3X) or \fB\%newterm\fP(3X) achieves
++the same result.)
++Applications can use the terminal capabilities either directly,
++by object definitions corresponding to capability names and codes
++(see \fB\%term_variables\fP(3X))
++or by calling the functions documented here.
++.B \%setupterm
++initializes the
+ .I \%term\%info
+ variables
+ .B \%lines
+ and
+ .B \%columns
+-are initialized by \fB\%setupterm\fP as follows.
+-.bP
+-If \fB\%use_env(FALSE)\fP has been called,
+-values for
+-.B \%lines
+-and
+-.B \%columns
+-specified in
+-.I \%term\%info
+-are used.
+-.bP
+-Otherwise,
+-if the environment variables
+-.I LINES
+-and
+-.I \%COLUMNS
+-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
+-.B \%lines
+-and
+-.B \%columns
+-specified in the
+-.I \%term\%info
+-database are used.
++as described in \fB\%use_env\fP(3X).
+ .PP
+-Parameterized strings should be passed through \fB\%tparm\fP to
+-instantiate them.
++Pass parameterized string capability values through
++.B \%tparm
++to instantiate them.
+ All
+ .I \%term\%info
+ strings
+-(including the output of \fB\%tparm\fP)
+-should be sent to the terminal device with \fB\%tputs\fP or
+-\fB\%putp\fP.
+-Call \fB\%reset_shell_mode\fP to restore the terminal modes before
+-exiting;
+-see \fB\%curs_kernel\fP(3X).
+-.PP
+-Programs that use
+-cursor addressing should
++(including the output of
++.BR \%tparm ")"
++should be sent to the terminal device with
++.B \%tputs
++or
++.BR \%putp "."
++Call
++\fB\%reset_shell_mode\fP(3X) to restore the terminal modes before
++exiting.
++(A
++.I curses
++application calling \fB\%endwin\fP(3X) achieves the same result.)
++.\" XXX: What should a "pure" terminfo application that wants to link
++.\" only with libtinfo, and not libcurses, do?
++.PP
++Programs that use cursor addressing should emit certain capabilities
++at specific times.
++Specifically,
++output
+ .bP
+-output \fB\%enter_ca_mode\fP upon startup and
++.B \%enter_ca_mode
++upon startup,
++and
+ .bP
+-output \fB\%exit_ca_mode\fP before exiting.
++.B \%exit_ca_mode
++before exiting.
+ .PP
+ Programs that execute shell subprocesses should
+ .bP
+-call \fB\%reset_shell_mode\fP and
+-output \fB\%exit_ca_mode\fP before the shell
+-is called and
++call \fB\%reset_shell_mode\fP(3X) and output
++.B \%exit_ca_mode
++before the shell is called,
++and
+ .bP
+-output \fB\%enter_ca_mode\fP and
+-call \fB\%reset_prog_mode\fP after returning from the shell.
++output
++.B \%enter_ca_mode
++and call \fB\%reset_prog_mode\fP(3X) after returning from the shell.
++.\" XXX: What should a "pure" terminfo application that wants to link
++.\" only with libtinfo, and not libcurses, do?
+ .PP
+ \fB\%setupterm\fP reads in the
+ .I \%term\%info
+@@ -259,7 +245,9 @@
+ If
+ .I errret
+ is not null,
+-then \fB\%setupterm\fP returns
++then
++.B \%setupterm
++returns
+ .B OK
+ or
+ .B ERR
+@@ -281,13 +269,12 @@
+ .RS
+ .TP 5
+ .B 1
+-means that the terminal is hardcopy,
++means that the terminal is a hard-copy type
++(lacks destructive backspace),
+ and cannot be used for
+ .I curses
+ applications.
+-.IP
+-\fB\%setupterm\fP determines if the entry is a hardcopy type by
+-checking the
++The library determines this fact by checking the terminal type's
+ .B \%hardcopy
+ .RB ( hc )
+ capability.
+@@ -299,8 +286,8 @@
+ .I curses
+ applications to run.
+ .IP
+-\fB\%setupterm\fP determines if the entry is a generic type by
+-checking the
++.B \%setupterm
++determines if the entry is a generic type by checking the
+ .B \%generic_type
+ .RB ( gn )
+ capability.
+@@ -314,19 +301,19 @@
+ If
+ .I errret
+ is null,
+-\fB\%setupterm\fP reports an error message upon finding an error and
+-exits.
++.B \%setupterm
++reports an error message upon finding an error and exits.
+ Thus,
+ the simplest call is:
+ .RS
+ .IP
+ .EX
+-setupterm((char *)0, 1, (int *)0);
++setupterm((char *) NULL, 1, (int *) NULL);
+ .EE
+ .RE
+ .IP
+ which uses all the defaults and sends the output to
+-.BR stdout .
++.IR stdout .
+ .RE
+ .\" ********************************************************************
+ .SS "The Terminal State"
+@@ -366,10 +353,10 @@
+ .PP
+ .B \%del_curterm
+ frees the memory pointed to by
+-.BR \%oterm ","
++.IR \%oterm ","
+ making it available for further use.
+ If
+-.B \%oterm
++.I \%oterm
+ is
+ the same as
+ .BR \%cur_term ","
+@@ -460,7 +447,8 @@
+ library would assume.
+ .\" ********************************************************************
+ .SS "Output Functions"
+-String capabilities can contain padding information,
++String capabilities can contain
++.IR padding ,
+ a time delay
+ (accommodating performance limitations of hardware terminals)
+ expressed as \fB$<\fIn\fB>\fR,
+@@ -504,7 +492,7 @@
+ .IB str ", 1, putchar)\c"
+ \*(''.
+ The output of \fB\%putp\fP always goes to
+-.BR stdout ,
++.IR stdout ,
+ rather than the
+ .I \%file\%des
+ specified in \fB\%setupterm\fP.
+@@ -577,9 +565,8 @@
+ passed to them.
+ The
+ .I cap-code
+-for each capability is given in the table column entitled
+-.I cap-code
+-code in the capabilities section of \fB\%terminfo\fP(5).
++for each capability is given in the table column of that name
++in the \*(``Predefined Capabilities\*('' section of \fB\%terminfo\fP(5).
+ .PP
+ These functions return special values to denote errors.
+ .PP
+@@ -613,7 +600,7 @@
+ is not a string capability,
+ or
+ .TP
+-.B 0
++.B NULL
+ if it is canceled or absent from the terminal description.
+ .\" ********************************************************************
+ .SS "Terminal Capability Names"
+@@ -644,11 +631,11 @@
+ As a side effect,
+ it sets \fB\%cur_term\fP to point to this memory.
+ If an application calls
+-.IP
++.RS
+ .EX
+ del_curterm(cur_term);
+ .EE
+-.PP
++.RE
+ the memory will be freed.
+ .PP
+ The formatting functions \fB\%tparm\fP and \fB\%tiparm\fP extend the
+@@ -703,7 +690,7 @@
+ .RB \%( stdscr ,
+ .BR \%curscr ,
+ and
+-.BR \%newscr )
++.BR \%newscr ).
+ Other error conditions are documented above.
+ .TP 5
+ .B tparm
+@@ -758,46 +745,69 @@
+ argument.
+ .\" ********************************************************************
+ .SH PORTABILITY
+-\fB\%setterm\fP is not described by X/Open and must be considered
+-non-portable.
++.I \%setterm
++is not described by X/Open and must be considered non-portable.
+ All other functions are as described by X/Open.
++.SS "Header Files"
++On legacy
++.I curses
++systems,
++include
++.I \%curses.h
++and
++.I \%term.h
++in that order
++to get the definitions for these strings,
++numbers,
++and flags.
+ .SS "Compatibility Macros"
+ This implementation provides a few macros for compatibility with systems
+ before SVr4
+ (see section \*(``HISTORY\*('' below).
+ They include
+-\fB\%Bcrmode\fP,
+-\fB\%Bfixterm\fP,
+-\fB\%Bgettmode\fP,
+-\fB\%Bnocrmode\fP,
+-\fB\%Bresetterm\fP,
+-\fB\%Bsaveterm\fP,
+-and
+-\fB\%Bsetterm\fP.
++.IR \%Bcrmode ","
++.IR \%Bfixterm ","
++.IR \%Bgettmode ","
++.IR \%Bnocrmode ","
++.IR \%Bresetterm ","
++.IR \%Bsaveterm ","
++and"
++.IR \%Bsetterm "."
++.I \%ncurses
++implements each of these symbols as macros for BSD
++.I curses
++compatibility.
+ .PP
+ In SVr4,
+ these are found in
+ .IR \%curses.h ,
+-but except for \fB\%setterm\fP,
++but except for
++.IR \%setterm ","
+ are likewise macros.
+ The one function,
+-\fB\%setterm\fP,
++.IR \%setterm ","
+ is mentioned in the manual page.
+-It further notes that \fB\%setterm\fP was replaced by \fB\%setupterm\fP,
++It further notes that
++.I \%setterm
++was replaced by
++.IR \%setupterm ","
+ stating that the call
+ .RS
+ .EX
+-setupterm(\fIterm\fP, 1, (int *)0)
++.BI setupterm( term ", 1, (int *)0)"
+ .EE
+ .RE
+-provides the same functionality as \fB\%setterm(\fIterm\fB)\fR,
+-discouraging the latter for new programs.
+-.I \%ncurses
+-implements each of these symbols as macros for BSD
+-.I curses
+-compatibility.
++provides the same functionality as
++.RS
++.EX
++.BI setterm( term )
++.EE
++.RE
++and discouraging the latter for new programs.
+ .SS "Legacy Data"
+-\fB\%setupterm\fP copies the terminal name to the array \fB\%ttytype\fP.
++.I \%setupterm
++copies the terminal name to the array
++.IR \%ttytype "."
+ This is not part of X/Open Curses,
+ but is assumed by some applications.
+ .PP
+@@ -810,9 +820,15 @@
+ .RB \%\*(`` "@TIC@ \-x" \*('',
+ are not stored in the arrays described here.
+ .SS "Output Buffering"
+-Older versions of \fI\%ncurses\fP assumed that the file descriptor
+-passed to \fB\%setupterm\fP from \fB\%initscr\fP or \fB\%newterm\fP uses
+-buffered I/O,
++Older versions of
++.I \%ncurses
++assumed that the file descriptor passed to
++.I \%setupterm
++from
++.I \%initscr
++or
++.I \%newterm
++uses buffered I/O,
+ and would write to the corresponding stream.
+ In addition to the limitation that the terminal was left in
+ block-buffered mode on exit
+@@ -823,7 +839,8 @@
+ did not allow a reliable way to clean up on receiving
+ .BR SIGTSTP .
+ .PP
+-The current version (ncurses6)
++.I \%ncurses
++.RI 6. x
+ uses output buffers managed directly by
+ .IR \%ncurses .
+ Some of the low-level functions described in this manual page write
+@@ -844,7 +861,8 @@
+ .I \%const
+ less effectively than a later design might,
+ sometimes applying it needlessly to values that are already constant,
+-and in most cases overlooking parameters that normally would use
++and in most cases overlooking parameters that normally would benefit
++from
+ .IR \%const .
+ Passing
+ .IR \%const -qualified
+@@ -852,7 +870,7 @@
+ .I \%const
+ may prevent the program from compiling.
+ On the other hand,
+-\*(``writable strings\*('' are an obsolescent feature.
++\*(``writable strings\*('' are an obsolescent C language feature.
+ .IP
+ As an extension,
+ this implementation can be configured to change the function prototypes
+@@ -863,8 +881,9 @@
+ .I \%ncurses
+ ABI 6 enables this feature by default.
+ .bP
+-X/Open Curses prototypes \fB\%tparm\fP with a fixed number of
+-parameters,
++X/Open Curses prototypes
++.I \%tparm
++with a fixed number of parameters,
+ rather than a variable argument list.
+ .IP
+ This implementation uses a variable argument list,
+@@ -873,31 +892,43 @@
+ zeroes are fine for this purpose.
+ .IP
+ In response to review comments by Thomas E. Dickey,
+-X/Open Curses Issue 7 proposed the \fB\%tiparm\fP function in mid-2009.
++X/Open Curses Issue 7 proposed the
++.I \%tiparm
++function in mid-2009.
+ .IP
+-While \fB\%tiparm\fP is always provided in \fI\%ncurses\fP,
+-the older form is only available as a build-time configuration option.
++While
++.I \%tiparm
++is always provided in
++.IR \%ncurses ","
++the older form is available only as a build-time configuration option.
+ If not specially configured,
+-\fB\%tparm\fP is the same as \fB\%tiparm\fP.
+-.PP
+-Both forms of \fB\%tparm\fP have drawbacks:
+-.bP
+-Most of the calls to \fB\%tparm\fP use only one or two parameters.
++.I \%tparm
++is the same as
++.IR \%tiparm "."
++.PP
++Both forms of
++.I \%tparm
++have drawbacks.
++.bP
++Most calls to
++.I \%tparm
++require only one or two parameters.
+ Passing nine on each call is awkward.
+ .IP
+ Using
+ .I long
+ for the numeric parameter type is a workaround to make the parameter use
+-the same amount of stack as a pointer.
+-That approach dates back to the mid-1980s,
++the same amount of stack memory as a pointer.
++That approach dates to the mid-1980s,
+ before C was standardized.
+-Since then,
+-there is a standard
+-(and pointers are not required to fit in a
++Since ANSI\ C (1989),
++C language standards do not require a pointer to fit in a
+ .IR long ).
+ .bP
+ Providing the right number of parameters for a variadic function
+-such as \fB\%tiparm\fP can be a problem,
++such as
++.I \%tiparm
++can be a problem,
+ in particular for string parameters.
+ However,
+ only a few
+@@ -906,23 +937,33 @@
+ (for instance,
+ the ones used for programmable function keys).
+ .IP
+-The \fI\%ncurses\fP library checks usage of these capabilities,
++The
++.I \%ncurses
++library checks usage of these capabilities,
+ and returns
+ .B ERR
+ if the capability mishandles string parameters.
+ But it cannot check if a calling program provides strings in the right
+-places for the \fB\%tparm\fP calls.
++places for the
++.I \%tparm
++calls.
+ .IP
+-The \fB\%@TPUT@\fR(1) program checks its use of these capabilities with
+-a table,
+-so that it calls \fB\%tparm\fP correctly.
++.IR \%ncurses 's
++\fB\%@TPUT@\fR(1) checks its use of these capabilities with a table,
++so that it calls
++.I \%tparm
++correctly.
+ .SS "Special \fITERM\fP treatment"
+-If configured to use the terminal driver,
++If
++.I \%ncurses
++is configured to use the terminal driver,
+ .\" XXX: as opposed to the Unix terminal driver, termio(s)?
+ as with the MinGW port,
+ .bP
+-\fB\%setupterm\fP interprets a missing/empty \fITERM\fP variable as the
+-special value \*(``unknown\*(''.
++.B \%setupterm
++interprets a missing/empty
++.I TERM
++variable as the special value \*(``unknown\*(''.
+ .IP
+ SVr4
+ .I curses
+@@ -936,9 +977,12 @@
+ while the latter does not.
+ A generic terminal is unsuitable for full-screen applications.
+ .bP
+-\fB\%setupterm\fP allows explicit use of the
+-the windows console driver by checking if \fB$TERM\fP is set to
+-\*(``#win32con\*('' or an abbreviation of that string.
++.B \%setupterm
++allows explicit use of the Microsoft Windows console driver by checking
++whether the
++.I TERM
++environment variable has the value \*(``#win32con\*(''
++or an abbreviation of that string.
+ .SS "Other Portability Issues"
+ In SVr4,
+ .I \%set_curterm
+@@ -953,10 +997,12 @@
+ the third argument of
+ .I \%tputs
+ has the type
+-.RB \*(`` "int (*putc)(char)" \*(''.
++.RB \*(`` "int (*)(char)" \*(''.
+ .PP
+-At least one implementation of X/Open Curses (Solaris) returns a value
+-other than
++At least one implementation of X/Open Curses
++(Solaris
++.IR \%xcurses ")"
++returns a value other than
+ .B OK
+ or
+ .B ERR
+@@ -973,13 +1019,13 @@
+ .PP
+ .TS
+ lB lB
+-lB lx.
++lI lx.
+ Function	Description
+ _
+ fixterm	restore terminal to \*(``in \fIcurses\fP\*('' state
+ gettmode	establish current terminal modes
+ mvcur	low level cursor motion
+-putp	use \fBtputs\fP to send characters via \fIputchar\fP
++putp	use \fItputs\fP to send characters via \fIputchar\fP
+ resetterm	set terminal modes to \*(``out of \fIcurses\fP\*(''\
+  state
+ resetty	reset terminal flags to stored value
+@@ -989,7 +1035,7 @@
+ setupterm	establish terminal with given type
+ tparm	interpolate parameters into string capability
+ tputs	apply padding information to a string
+-vidattr	like \fBvidputs\fP, but output through \fIputchar\fP
++vidattr	like \fIvidputs\fP, but output through \fIputchar\fP
+ vidputs	T{
+ write string to terminal, applying specified attributes
+ T}
+@@ -1003,7 +1049,7 @@
+ .PP
+ .TS
+ lB lB
+-lB lx.
++lI lx.
+ Function	Description
+ _
+ tgetent	look up \fItermcap\fP entry for given \fIname\fP
+@@ -1020,7 +1066,8 @@
+ .I \%term\%info
+ programs obtained capability values from the
+ .I \%TERMINAL
+-structure initialized by \fB\%setupterm\fP.
++structure initialized by
++.IR \%setupterm "."
+ .PP
+ SVr3 (1987) extended
+ .I \%term\%info
+@@ -1028,12 +1075,15 @@
+ (like the
+ .I termcap
+ interface),
+-and reusing \fB\%tgoto\fP and \fB\%tputs\fP.
++and reusing
++.I \%tgoto
++and
++.IR \%tputs "."
+ .PP
+ .ne 4v
+ .TS
+ lB lB
+-lB lx.
++lI lx.
+ Function	Description
+ _
+ tigetflag	get Boolean entry for given \fIid\fP
+@@ -1050,32 +1100,39 @@
+ .PP
+ .TS
+ lB lB
+-l  lx.
++lI lIx.
+ Function	Replaced by
+ _
+ crmode	cbreak
+ fixterm	reset_prog_mode
+-gettmode	\fIn/a\fP
++gettmode	\fRn/a\fP
+ nocrmode	nocbreak
+ resetterm	reset_shell_mode
+ saveterm	def_prog_mode
+ setterm	setupterm
+ .TE
+ .PP
+-SVr3 kept the \fB\%mvcur\fP,
+-\fB\%vidattr\fP,
+-and \fB\%vidputs\fP functions,
+-along with \fB\%putp\fP,
+-\fB\%tparm\fP,
+-and \fB\%tputs\fP.
++SVr3 kept the
++.IR \%mvcur ","
++.IR \%vidattr ","
++and
++.I \%vidputs
++functions,
++along with
++.IR \%putp ","
++.IR \%tparm ","
++and
++.IR \%tputs "."
+ The latter were needed to support padding,
+-and to handle capabilities accessed by functions such as \fB\%vidattr\fP
+-(which used more than the two parameters supported by \fB\%tgoto\fP).
++and to handle capabilities accessed by functions such as
++.I \%vidattr
++(which used more than the two parameters supported by
++.IR \%tgoto ")."
+ .PP
+ SVr3 introduced the functions for switching between terminal
+ descriptions;
+ for example,
+-\fB\%set_curterm\fP.
++.IR \%set_curterm "."
+ Some changes reflected incremental improvements to the SVr2 library.
+ .bP
+ The
+@@ -1085,11 +1142,16 @@
+ .I term
+ structure provided in SVr2.
+ .bP
+-Various global variables such as \fB\%boolnames\fP were mentioned
+-in the programming manual at this point,
++Various global variables such as
++.I \%boolnames
++were mentioned in the programming manual at this point,
+ though the variables had been provided in SVr2.
+ .PP
+-SVr4 (1989) added the \fB\%vid_attr\fP and \fB\%vid_puts\fP functions.
++SVr4 (1989) added the
++.I \%vid_attr
++and
++.I \%vid_puts
++functions.
+ .PP
+ Other low-level functions are declared in the
+ .I curses
+Index: man/curs_touch.3x
+Prereq:  1.51 
+--- ncurses-6.5-20241221+/man/curs_touch.3x	2024-07-27 19:55:45.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_touch.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_touch.3x,v 1.51 2024/07/27 19:55:45 tom Exp $
+-.TH curs_touch 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_touch.3x,v 1.53 2024/12/28 21:26:21 tom Exp $
++.TH curs_touch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%touchwin\fP,
+ \fB\%touchline\fP,
+@@ -114,7 +114,8 @@
+ for instance, defines both an actual function and macro for each.
+ The macros give the same result as the actual functions.
+ SVr4 \fIcurses\fP does not check the window parameter \fIwin\fP to ensure
+-that it is not \fBNULL\fP;
++that it is not
++.IR NULL ";"
+ otherwise this implementation behaves the same as SVr4.
+ .PP
+ X/Open Curses, Issue 4 describes these functions.
+Index: man/curs_trace.3x
+Prereq:  1.50 
+--- ncurses-6.5-20241221+/man/curs_trace.3x	2024-04-20 21:24:19.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_trace.3x	2024-12-28 21:18:35.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_trace.3x,v 1.50 2024/04/20 21:24:19 tom Exp $
+-.TH curs_trace 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_trace.3x,v 1.52 2024/12/28 21:18:35 tom Exp $
++.TH curs_trace 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -264,13 +264,15 @@
+ .IP
+ The SVr4 tracing feature is undocumented.
+ .bP
+-PDCurses provides \fBtraceon\fP and \fBtraceoff\fP,
++.I \%PDCurses
++provides \fBtraceon\fP and \fBtraceoff\fP,
+ which (like SVr4) are always available,
+ and enable tracing
+ to the \*(``trace\*('' file
+ only when a debug-library is built.
+ .IP
+-PDCurses has a short description of these functions,
++.I \%PDCurses
++has a short description of these functions,
+ with a note that they are not present in X/Open Curses,
+ \fI\%ncurses\fP or NetBSD.
+ It does not mention SVr4,
+Index: man/curs_util.3x
+Prereq:  1.118 
+--- ncurses-6.5-20241221+/man/curs_util.3x	2024-09-21 09:30:22.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_util.3x	2024-12-28 21:51:21.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_util.3x,v 1.118 2024/09/21 09:30:22 tom Exp $
+-.TH curs_util 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_util.3x,v 1.122 2024/12/28 21:51:21 tom Exp $
++.TH curs_util 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -308,7 +308,9 @@
+ (SVr4 specifies only "an integer value other than \fBERR\fP")
+ upon successful completion.
+ .PP
+-Routines that return pointers return \fBNULL\fP on error.
++Routines that return pointers return
++.I NULL
++on error.
+ .PP
+ In this implementation
+ .RS 3
+@@ -386,8 +388,12 @@
+ .bP
+ Most implementations simply dump the binary \fI\%WINDOW\fP structure
+ to the file.
+-These include SVr4 curses,
+-NetBSD and PDCurses,
++These include SVr4
++.IR curses ,
++NetBSD
++.IR curses ,
++and
++.IR \%PDCurses ,
+ as well as older \fI\%ncurses\fP versions.
+ This implementation
+ (as well as the X/Open variant of Solaris curses,
+Index: man/curs_window.3x
+Prereq:  1.54 
+--- ncurses-6.5-20241221+/man/curs_window.3x	2024-09-14 20:06:50.000000000 +0000
++++ ncurses-6.5-20241228/man/curs_window.3x	2024-12-28 21:51:45.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_window.3x,v 1.54 2024/09/14 20:06:50 tom Exp $
+-.TH curs_window 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_window.3x,v 1.57 2024/12/28 21:51:45 tom Exp $
++.TH curs_window 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%newwin\fP,
+ \fB\%delwin\fP,
+@@ -163,7 +163,9 @@
+ \fBOK\fP (SVr4 only specifies "an integer value other than \fBERR\fP") upon
+ successful completion.
+ .PP
+-Routines that return pointers return \fBNULL\fP on error.
++Routines that return pointers return
++.I NULL
++on error.
+ .PP
+ X/Open defines no error conditions.
+ In this implementation
+Index: man/define_key.3x
+Prereq:  1.50 
+--- ncurses-6.5-20241221+/man/define_key.3x	2024-07-27 19:43:41.000000000 +0000
++++ ncurses-6.5-20241228/man/define_key.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1997
+ .\"
+-.\" $Id: define_key.3x,v 1.50 2024/07/27 19:43:41 tom Exp $
+-.TH define_key 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: define_key.3x,v 1.52 2024/12/28 21:26:21 tom Exp $
++.TH define_key 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .
+ .de bP
+ .ie n  .IP \(bu 4
+@@ -71,7 +71,7 @@
+ A
+ .I definition
+ of
+-.B NULL
++.I NULL
+ removes any existing binding from
+ .IR key-code "."
+ Similarly,
+@@ -88,7 +88,7 @@
+ .bP
+ .I definition
+ is
+-.B NULL
++.I NULL
+ and
+ .I key-code
+ is nonpositive,
+Index: man/form.3x
+Prereq:  1.56 
+--- ncurses-6.5-20241221+/man/form.3x	2024-05-25 20:52:38.000000000 +0000
++++ ncurses-6.5-20241228/man/form.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form.3x,v 1.56 2024/05/25 20:52:38 tom Exp $
+-.TH form 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: form.3x,v 1.58 2024/12/28 21:26:21 tom Exp $
++.TH form 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -79,7 +79,9 @@
+ You
+ can get or set this default by calling the appropriate \fBset_\fP
+ or retrieval
+-routine with a \fBNULL\fP field pointer.
++routine with a
++.I NULL
++field pointer.
+ Changing this default with a
+ \fBset_\fP function affects future field creations, but does not change the
+ rendering of fields already created.
+@@ -173,7 +175,9 @@
+ unpost_form	\fBform_post\fP(3X)
+ .TE
+ .SH RETURN VALUE
+-Routines that return pointers return \fBNULL\fP on error,
++Routines that return pointers return
++.I NULL
++on error,
+ and set \fBerrno\fP to the corresponding error-code returned by functions
+ returning an integer.
+ Routines that return
+Index: man/form_field.3x
+Prereq:  1.34 
+--- ncurses-6.5-20241221+/man/form_field.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/form_field.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field.3x,v 1.34 2024/03/16 15:35:01 tom Exp $
+-.TH form_field 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: form_field.3x,v 1.36 2024/12/28 21:26:21 tom Exp $
++.TH form_field 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fBform_field\fP \-
+ make and break connections between fields and forms
+@@ -44,7 +44,8 @@
+ .fi
+ .SH DESCRIPTION
+ 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.
++the given \fIform\fP.  The array must be terminated by a
++.IR NULL "."
+ .PP
+ The function \fBform_fields\fP returns the field array of the given form.
+ .PP
+@@ -53,11 +54,13 @@
+ 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\fP returns a pointer (which may be \fBNULL\fP).
++The function \fBform_fields\fP returns a pointer (which may be
++.IR NULL ")."
+ It does not set \fBerrno\fP.
+ .PP
+-The function \fBfield_count\fP returns \fBERR\fP if the \fIform\fP parameter
+-is \fBNULL\fP.
++The function \fBfield_count\fP returns \fBERR\fP if the \fIform\fP
++parameter is
++.IR NULL "."
+ .PP
+ The functions \fBset_form_fields\fP and \fBmove_field\fP return one of
+ the following codes on error:
+Index: man/form_field_buffer.3x
+Prereq:  1.45 
+--- ncurses-6.5-20241221+/man/form_field_buffer.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/form_field_buffer.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_buffer.3x,v 1.45 2024/03/16 15:35:01 tom Exp $
+-.TH form_field_buffer 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: form_field_buffer.3x,v 1.47 2024/12/28 21:26:21 tom Exp $
++.TH form_field_buffer 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -104,7 +104,9 @@
+ 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\fP function returns NULL on error.
++The \fBfield_buffer\fP function returns
++.I NULL
++on error.
+ It sets \fBerrno\fP according to their success:
+ .TP 5
+ .B E_OK
+Index: man/form_field_new.3x
+Prereq:  1.41 
+--- ncurses-6.5-20241221+/man/form_field_new.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/form_field_new.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_new.3x,v 1.41 2024/03/16 15:35:01 tom Exp $
+-.TH form_field_new 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: form_field_new.3x,v 1.43 2024/12/28 21:26:21 tom Exp $
++.TH form_field_new 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fBnew_field\fP,
+ \fBdup_field\fP,
+@@ -66,7 +66,8 @@
+ The function \fBfree_field\fP de-allocates storage associated with a field.
+ .SH RETURN VALUE
+ The functions \fBnew_field\fP, \fBdup_field\fP, \fBlink_field\fP return
+-\fBNULL\fP on error.
++.I NULL
++on error.
+ They set \fBerrno\fP according to their success:
+ .TP 5
+ .B E_OK
+Index: man/form_field_userptr.3x
+Prereq:  1.30 
+--- ncurses-6.5-20241221+/man/form_field_userptr.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/form_field_userptr.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_userptr.3x,v 1.30 2024/03/16 15:35:01 tom Exp $
+-.TH form_field_userptr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: form_field_userptr.3x,v 1.32 2024/12/28 21:26:21 tom Exp $
++.TH form_field_userptr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fBset_field_userptr\fP,
+ \fBfield_userptr\fP \-
+@@ -46,7 +46,8 @@
+ These functions get and set
+ that field.
+ .SH RETURN VALUE
+-The function \fBfield_userptr\fP returns a pointer (which may be \fBNULL\fP).
++The function \fBfield_userptr\fP returns a pointer (which may be
++.IR NULL ")."
+ It does not set \fBerrno\fP.
+ .PP
+ The function \fBset_field_userptr\fP returns \fBE_OK\fP (success).
+Index: man/form_field_validation.3x
+Prereq:  1.53 
+--- ncurses-6.5-20241221+/man/form_field_validation.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/form_field_validation.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_validation.3x,v 1.53 2024/03/16 15:35:01 tom Exp $
+-.TH form_field_validation 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: form_field_validation.3x,v 1.55 2024/12/28 21:26:21 tom Exp $
++.TH form_field_validation 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -187,7 +187,9 @@
+ This is an \fI\%ncurses\fP extension;
+ this field type may not be available in other curses implementations.
+ .SH RETURN VALUE
+-The functions \fBfield_type\fP and \fBfield_arg\fP return \fBNULL\fP on error.
++The functions \fBfield_type\fP and \fBfield_arg\fP return
++.I NULL
++on error.
+ The function \fBset_field_type\fP returns one of the following:
+ .TP 5
+ .B E_OK
+Index: man/form_fieldtype.3x
+Prereq:  1.46 
+--- ncurses-6.5-20241221+/man/form_fieldtype.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/form_fieldtype.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_fieldtype.3x,v 1.46 2024/03/16 15:35:01 tom Exp $
+-.TH form_fieldtype 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: form_fieldtype.3x,v 1.48 2024/12/28 21:26:21 tom Exp $
++.TH form_fieldtype 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .de bP
+ .ie n  .IP \(bu 4
+ .el    .IP \(bu 2
+@@ -102,7 +102,9 @@
+ Frees an argument-block structure.
+ .PP
+ You must supply the \fImake_arg\fP function.
+-The other two are optional: you may supply NULL for them.
++The other two are optional: you may supply
++.I NULL
++for them.
+ In this case, the form library assumes
+ that \fImake_arg\fP does not allocate memory but simply loads the
+ argument into a single scalar value.
+Index: man/form_hook.3x
+Prereq:  1.37 
+--- ncurses-6.5-20241221+/man/form_hook.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/form_hook.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_hook.3x,v 1.37 2024/03/16 15:35:01 tom Exp $
+-.TH form_hook 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: form_hook.3x,v 1.39 2024/12/28 21:26:21 tom Exp $
++.TH form_hook 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fBform_hook\fP \-
+ set hooks for automatic invocation by applications
+@@ -55,28 +55,35 @@
+ sets a hook to be called at form-post time
+ and each time the selected field changes (after the change).
+ .SS field_init
+-returns the current field init hook, if any (\fBNULL\fP if there is no such
+-hook).
++returns the current field init hook, if any
++.RI ( NULL
++if there is no such hook).
+ .SS set_field_term
+ sets a hook to be called at form-unpost time
+ and each time the selected field changes (before the change).
+ .SS field_term
+-returns the current field term hook, if any (\fBNULL\fP if there is no such
+-hook).
++returns the current field term hook, if any
++.RI ( NULL
++if there is no such hook).
+ .SS set_form_init
+ sets a hook to be called at form-post time and
+ just after a page change once it is posted.
+ .SS form_init
+ returns the current form init hook,
+-if any (\fBNULL\fP if there is no such hook).
++if any
++.RI ( NULL
++if there is no such hook).
+ .SS set_form_term
+ sets a hook to be called at form-unpost time
+ and just before a page change once it is posted.
+ .SS form_term
+-returns the current form term hook, if any (\fBNULL\fP if there is no such
+-hook).
++returns the current form term hook, if any
++.RI ( NULL
++if there is no such hook).
+ .SH RETURN VALUE
+-Routines that return pointers return \fBNULL\fP on error.
++Routines that return pointers return
++.I NULL
++on error.
+ Other routines
+ return one of the following:
+ .TP 5
+Index: man/form_new.3x
+Prereq:  1.32 
+--- ncurses-6.5-20241221+/man/form_new.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/form_new.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_new.3x,v 1.32 2024/03/16 15:35:01 tom Exp $
+-.TH form_new 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: form_new.3x,v 1.34 2024/12/28 21:26:21 tom Exp $
++.TH form_new 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fBnew_form\fP,
+ \fBfree_form\fP \-
+@@ -42,12 +42,15 @@
+ .fi
+ .SH DESCRIPTION
+ The function \fBnew_form\fP creates a new form connected to a specified field
+-pointer array (which must be \fBNULL\fP-terminated).
++pointer array (which must be
++.IR NULL -terminated).
+ .PP
+ 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\fP returns \fBNULL\fP on error.
++The function \fBnew_form\fP returns
++.I NULL
++on error.
+ It sets \fBerrno\fP according to the function's success:
+ .TP 5
+ .B E_OK
+Index: man/form_page.3x
+Prereq:  1.37 
+--- ncurses-6.5-20241221+/man/form_page.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/form_page.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_page.3x,v 1.37 2024/03/16 15:35:01 tom Exp $
+-.TH form_page 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: form_page.3x,v 1.39 2024/12/28 21:26:21 tom Exp $
++.TH form_page 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fBform_page\fP \-
+ set and get form page number
+@@ -52,7 +52,9 @@
+ .PP
+ The function \fBunfocus_current_field\fP removes the focus from the current
+ field of the form.
+-In such state, inquiries via \fBcurrent_field\fP shall return a NULL pointer.
++In such state, inquiries via \fBcurrent_field\fP shall return a
++.I NULL
++pointer.
+ .PP
+ The function \fBset_form_page\fP sets the form's page number (goes to page
+ \fIn\fP of the form).
+Index: man/form_requestname.3x
+Prereq:  1.35 
+--- ncurses-6.5-20241221+/man/form_requestname.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/form_requestname.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_requestname.3x,v 1.35 2024/03/16 15:35:01 tom Exp $
+-.TH form_requestname 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: form_requestname.3x,v 1.37 2024/12/28 21:26:21 tom Exp $
++.TH form_requestname 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fBform_request_by_name\fP,
+ \fBform_request_name\fP \-
+@@ -47,7 +47,9 @@
+ with the given name and returns its request code.
+ Otherwise E_NO_MATCH is returned.
+ .SH RETURN VALUE
+-\fBform_request_name\fP returns \fBNULL\fP on error and sets \fBerrno\fP
++\fBform_request_name\fP returns
++.I NULL
++on error and sets \fBerrno\fP
+ to \fBE_BAD_ARGUMENT\fP.
+ .PP
+ \fBform_request_by_name\fP returns \fBE_NO_MATCH\fP on error.
+Index: man/form_userptr.3x
+Prereq:  1.36 
+--- ncurses-6.5-20241221+/man/form_userptr.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/form_userptr.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_userptr.3x,v 1.36 2024/03/16 15:35:01 tom Exp $
+-.TH form_userptr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: form_userptr.3x,v 1.38 2024/12/28 21:26:21 tom Exp $
++.TH form_userptr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fBset_form_userptr\fP,
+ \fBform_userptr\fP \-
+@@ -45,7 +45,8 @@
+ 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\fP returns a pointer (which may be \fBNULL\fP).
++The function \fBform_userptr\fP returns a pointer (which may be
++.IR NULL ")."
+ It does not set \fBerrno\fP.
+ .PP
+ The function \fBset_form_userptr\fP returns \fBE_OK\fP (success).
+Index: man/form_win.3x
+Prereq:  1.35 
+--- ncurses-6.5-20241221+/man/form_win.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/form_win.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_win.3x,v 1.35 2024/03/16 15:35:01 tom Exp $
+-.TH form_win 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: form_win.3x,v 1.37 2024/12/28 21:26:21 tom Exp $
++.TH form_win 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fBform_win\fP \-
+ make and break form window and subwindow associations
+@@ -54,14 +54,20 @@
+ It is not necessary to set
+ either window; by default, the driver code uses \fBstdscr\fP for both.
+ .PP
+-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
++In the \fBset_\fP functions, window argument of
++.I NULL
++is treated as though
++it were \fBstsdcr\fP.  A form argument of
++.I NULL
++is treated as a request
+ to change the system default form window or subwindow.
+ .PP
+ 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\fP on error.
++Routines that return pointers return
++.I NULL
++on error.
+ Routines that return
+ an integer return one of the following error codes:
+ .TP 5
+Index: man/infocmp.1m
+Prereq:  1.114 
+--- ncurses-6.5-20241221+/man/infocmp.1m	2024-09-21 18:04:29.000000000 +0000
++++ ncurses-6.5-20241228/man/infocmp.1m	2024-12-28 21:36:19.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: infocmp.1m,v 1.114 2024/09/21 18:04:29 tom Exp $
+-.TH @INFOCMP@ 1M 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: infocmp.1m,v 1.117 2024/12/28 21:36:19 tom Exp $
++.TH @INFOCMP@ 1M 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -100,65 +100,41 @@
+ .RI [ \%terminal\%-type
+ \&.\|.\|.\& ]
+ .SH DESCRIPTION
+-\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.
++.B @INFOCMP@
++reports a human-readable terminal type description
++from a compiled entry in the
++.I \%term\%info
++database in a variety of selectable formats,
++compares such entries to each other,
++and rewrites an entry to replace
++.RB \*(`` use \*(''
++expressions with the content of other entries by reference.
++A
++.I "\%term\%info entry"
++entry comprises
++a list of one or more terminal type identifiers,
++a human-readable description of the terminal type,
++and a list of terminal
++.I capabilities
++that characterize its programming interface.
++In all cases,
++the program reports
++Boolean-valued capabilities first,
++followed by numeric ones,
++and then string-valued capabilities.
+ .SS "Default Options"
+-If no options are specified and zero or one \fIterminal-types\fP are
+-specified,
+-the
+-\fB\-I\fP option will be assumed.
+-If more than one \fIterminal-type\fP is specified,
+-the \fB\-d\fP option will be assumed.
+-.SS "Comparison Options [\-d] [\-c] [\-n]"
+-\fB@INFOCMP@\fP compares the \fBterminfo\fP description of the first terminal
+-\fIterminal-type\fP with each of the descriptions given by the entries
+-for the other terminal's \fIterminal-types\fP.
+-If a capability is defined for only one of the
+-terminals, the value returned depends on the type of the capability:
+-.bP
+-\fBF\fP for missing Boolean variables
+-.bP
+-\fBNULL\fP for missing integer or string variables
+-.PP
+-Use the \fB\-q\fP option to show the distinction between
+-\fIabsent\fP and \fIcanceled\fP capabilities.
+-.PP
+-These options produce a list which you can use to compare two
+-or more terminal descriptions:
+-.TP 5
+-\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\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\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\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
+-Normally only the conventional capabilities are shown.
+-Use the \fB\-x\fP option to add the BSD-compatibility
+-capabilities (names prefixed with \*(``OT\*('').
+-.IP
+-If no \fIterminal-types\fP are given,
+-\fB@INFOCMP@\fP uses the environment variable \fITERM\fP
+-for each of the \fIterminal-types\fP.
++If no options are specified and zero or one
++.I terminal-types
++is specified,
++.B @INFOCMP@
++assumes the
++.B \-I
++option.
++If more than one is specified,
++the program
++assumes the
++.B \-d
++option.
+ .SS "Source Listing Options [\-I] [\-L] [\-C] [\-r]"
+ The \fB\-I\fP, \fB\-L\fP, and \fB\-C\fP options will produce
+ a source listing for each terminal named.
+@@ -245,6 +221,90 @@
+ .\" hpgeneric cup
+ %p2\fR\|.\|.\|.\|\fP%p1	%r	hpgeneric
+ .TE
++.SS "Entry Comparison Options [-d] [-c] [-n]"
++Given
++.BR \-c ,
++.BR \-d ,
++or
++.BR \-n ,
++.B @INFOCMP@
++compares the
++.I \%term\%info
++description of the first specified
++.I terminal-type
++with those of each of the subsequent operands.
++If fewer
++.I terminal-types
++than required are specified,
++.B @INFOCMP@
++uses the environment variable
++.I TERM
++in their place.
++.PP
++If a capability is defined for only one terminal type,
++the value reported depends on the capability's type:
++.bP
++.B F
++for missing Boolean variables
++.bP
++.B NULL
++for missing integer or string variables
++.PP
++The
++.B \-c
++and
++.B \-d
++options report string capability values
++between \*(``\*'\*('' characters.
++Use the
++.B \-q
++option to distinguish
++.I absent
++and
++.I canceled
++capabilities;
++see \fB\%terminfo\fP(5).
++.PP
++The comparison option selects the form of report.
++.TP 5
++.B \-d
++lists each capability that
++.I differs
++between two entries.
++Each capability name is followed by \*(``:\*(''
++and comma-separated capability values,
++then a period.
++.TP
++.B \-c
++lists each capability that two entries have in
++.IR common "."
++.B @INFOCMP@
++ignores capabilities missing from either entry.
++Each capability name is followed by \*(``=\*('',
++a space,
++and the capability value,
++then a period.
++.IP
++If the
++.B \-u
++option is further specified,
++.B @INFOCMP@
++rewrites the description of the first type
++employing \*(``use=\*('' syntax
++to use the second as a building block.
++.TP
++.B \-n
++lists capabilities that are in
++.I none
++of the given entries.
++Each capability name is preceded by \*(``!\*(''
++and followed by a period.
++.IP
++Normally only conventional capabilities are shown.
++Use the
++.B \-x
++option to add BSD-compatibility capabilities
++(names prefixed with \*(``OT\*('').
+ .SS "Use= Option [\-u]"
+ The \fB\-u\fP option produces a \fBterminfo\fP source description of the first
+ terminal \fIterminal-type\fP which is relative to the sum of the
+Index: man/keybound.3x
+Prereq:  1.40 
+--- ncurses-6.5-20241221+/man/keybound.3x	2024-06-08 23:25:57.000000000 +0000
++++ ncurses-6.5-20241228/man/keybound.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1999
+ .\"
+-.\" $Id: keybound.3x,v 1.40 2024/06/08 23:25:57 tom Exp $
+-.TH keybound 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: keybound.3x,v 1.42 2024/12/28 21:26:21 tom Exp $
++.TH keybound 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%keybound\fP \-
+ get definition of a \fIcurses\fP function key code
+@@ -78,7 +78,7 @@
+ that must be freed by the application.
+ .B \%keybound
+ returns
+-.B NULL
++.I NULL
+ if
+ .I key-code
+ is not positive
+Index: man/man_db.renames.in
+Prereq:  1.78 
+--- ncurses-6.5-20241221+/man/man_db.renames.in	2024-07-20 20:55:37.000000000 +0000
++++ ncurses-6.5-20241228/man/man_db.renames.in	2024-12-28 21:30:24.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: man_db.renames.in,v 1.78 2024/07/20 20:55:37 tom Exp $
++# $Id: man_db.renames.in,v 1.79 2024/12/28 21:30:24 Branden.Robinson Exp $
+ # Manual-page renamings for the man_db program
+ #
+ # Files:
+@@ -242,6 +242,7 @@
+ putwin.3x			putwin.3ncurses
+ raw.3x				raw.3ncurses
+ refresh.3x			refresh.3ncurses
++reset_prog_mode.3x		reset_prog_mode.3ncurses
+ reset_shell_mode.3x		reset_shell_mode.3ncurses
+ restartterm.3x			restartterm.3ncurses
+ ripoffline.3x			ripoffline.3ncurses
+Index: man/manhtml.aliases
+Prereq:  1.41 
+--- ncurses-6.5-20241221+/man/manhtml.aliases	2024-06-22 23:03:10.000000000 +0000
++++ ncurses-6.5-20241228/man/manhtml.aliases	2024-12-28 21:50:30.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: manhtml.aliases,v 1.41 2024/06/22 23:03:10 tom Exp $
++# $Id: manhtml.aliases,v 1.42 2024/12/28 21:50:30 tom Exp $
+ #***************************************************************************
+ # Copyright 2019-2023,2024 Thomas E. Dickey                                *
+ # Copyright 2013,2017 Free Software Foundation, Inc.                       *
+@@ -92,6 +92,7 @@
+ putwin(3X)		curs_util(3X)
+ raw(3X)			curs_inopts(3X)
+ refresh(3X)		curs_refresh(3X)
++reset_prog_mode(3X)	curs_kernel(3X)
+ reset_shell_mode(3X)	curs_kernel(3X)
+ restartterm(3X)		curs_terminfo(3X)
+ ripoffline(3X)		curs_kernel(3X)
+Index: man/manlinks.sed
+Prereq:  1.22 
+--- ncurses-6.5-20241221+/man/manlinks.sed	2024-09-14 23:49:39.000000000 +0000
++++ ncurses-6.5-20241228/man/manlinks.sed	2024-12-28 21:36:50.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: manlinks.sed,v 1.22 2024/09/14 23:49:39 tom Exp $
++# $Id: manlinks.sed,v 1.23 2024/12/28 21:36:50 Branden.Robinson Exp $
+ ##############################################################################
+ # Copyright 2020-2023,2024 Thomas E. Dickey                                  #
+ # Copyright 2000-2003,2008 Free Software Foundation, Inc.                    #
+@@ -31,9 +31,6 @@
+ # listed in the "NAME" section, i.e., the names that we would like to use
+ # as aliases for the manpage -T.Dickey
+ #
+-# workaround for manpages without a SYNOPSIS
+-s/^\.\\"SH/.SH/
+-#
+ # eliminate formatting controls that get in the way
+ /^'\\"/d
+ /\.\\"/d
+@@ -75,42 +72,8 @@
+ /g
+ }
+ #
+-# in ".SH SYNOPSIS"
+-# For readability, the NAME section may not contain all function names, but we
+-# still want to make aliases for those.  Do this by extracting names from the
+-# list of function prototypes in the synopsis.
+-#
+-# Remove any line that does not contain a '(', since we only want functions. 
+-# then strip off return-type of each function.
+-#
+-# Finally, remove the parameter list, which begins with a '('.
+-/^\.SH_(SYNOPSIS/,/^\.SH_(DESCRIPTION/{
+-/^\.ti/d
+-/^[^(]*$/d
+-# reduce
+-#	.B "int add_wch( const cchar_t *\fIwch\fB );"
+-# to
+-#	add_wch( const cchar_t *\fIwch\fB );"
+-s/^\([^ (]* [^ (]* [*]*\)//g
+-s/^\([^ (]* [*]*\)//g
+-# trim blanks in case we have
+-#	void (*) (FORM *) field_init(const FORM *form);
+-s/) (/)(/g
+-# reduce stuff like
+-#	void (*)(FORM *) field_init(const FORM *form);
+-# to
+-#	field_init(const FORM *form);
+-s/^\(([^)]*)\)\(([^)]*)\)*[ ]*//g
+-# rename marker temporarily
+-s/\.SH_(/.SH_/
+-# kill lines with ");", and trim off beginning of argument list.
+-s/[()].*//
+-# rename marker back
+-s/\.SH_/.SH_(/
+-}
+-#
+-# delete ".SH DESCRIPTION" and following lines
+-/^\.SH_(DESCRIPTION/,${
++# delete remainder of document
++/^\.SH_([^N]/,${
+ d
+ }
+ #
+Index: man/menu.3x
+Prereq:  1.47 
+--- ncurses-6.5-20241221+/man/menu.3x	2024-05-25 20:52:38.000000000 +0000
++++ ncurses-6.5-20241228/man/menu.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu.3x,v 1.47 2024/05/25 20:52:38 tom Exp $
+-.TH menu 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: menu.3x,v 1.49 2024/12/28 21:26:21 tom Exp $
++.TH menu 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -70,7 +70,9 @@
+ The \fBmenu\fP library maintains a default value for item attributes.
+ You can
+ get or set this default by calling the appropriate \fBget_\fP or \fBset_\fP
+-routine with a \fBNULL\fP item pointer.
++routine with a
++.I NULL
++item pointer.
+ Changing this default with a
+ \fBset_\fP function affects future item creations, but does not change the
+ rendering of items already created.
+@@ -150,7 +152,9 @@
+ unpost_menu	\fBmenu_post\fP(3X)
+ .TE
+ .SH RETURN VALUE
+-Routines that return pointers return \fBNULL\fP on error.
++Routines that return pointers return
++.I NULL
++on error.
+ Routines that return
+ an integer return one of the following error codes:
+ .TP 5
+Index: man/menu_hook.3x
+Prereq:  1.32 
+--- ncurses-6.5-20241221+/man/menu_hook.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/menu_hook.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_hook.3x,v 1.32 2024/03/16 15:35:01 tom Exp $
+-.TH menu_hook 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: menu_hook.3x,v 1.34 2024/12/28 21:26:21 tom Exp $
++.TH menu_hook 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fBmenu_hook\fP \-
+ set hooks for automatic invocation by applications
+@@ -55,27 +55,33 @@
+ 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\fP
+-returns the current item init hook, if any (\fBNULL\fP if there is no such
+-hook).
++returns the current item init hook, if any
++.RI ( NULL
++if there is no such hook).
+ .PP
+ 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\fP
+-returns the current item term hook, if any (\fBNULL\fP if there is no such
+-hook).
++returns the current item term hook, if any
++.RI ( NULL
++if there is no such hook).
+ .PP
+ 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\fP
+-returns the current menu init hook, if any (\fBNULL\fP if there is no such
+-hook).
++returns the current menu init hook, if any
++.RI ( NULL
++if there is no such hook).
+ .PP
+ 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\fP returns the current menu term hook, if any (\fBNULL\fP if there
+-is no such hook).
++\fBmenu_term\fP returns the current menu term hook, if any
++.RI ( NULL
++if there is no such hook).
+ .SH RETURN VALUE
+-Routines that return pointers return \fBNULL\fP on error.
++Routines that return pointers return
++.I NULL
++on error.
+ Other routines
+ return one of the following:
+ .TP 5
+Index: man/menu_items.3x
+Prereq:  1.34 
+--- ncurses-6.5-20241221+/man/menu_items.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/menu_items.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_items.3x,v 1.34 2024/03/16 15:35:01 tom Exp $
+-.TH menu_items 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: menu_items.3x,v 1.36 2024/12/28 21:26:21 tom Exp $
++.TH menu_items 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fBset_menu_items\fP,
+ \fBmenu_items\fP,
+@@ -44,17 +44,20 @@
+ .fi
+ .SH DESCRIPTION
+ 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.
++\fImenu\fP.  The array must be terminated by a
++.IR NULL "."
+ .PP
+ The function \fBmenu_items\fP returns the item array of the given menu.
+ .PP
+ The function \fBitem_count\fP returns the count of items in \fImenu\fP.
+ .SH RETURN VALUE
+-The function \fBmenu_items\fP returns a pointer (which may be \fBNULL\fP).
++The function \fBmenu_items\fP returns a pointer (which may be
++.IR NULL ")."
+ It does not set \fBerrno\fP.
+ .PP
+ The function \fBitem_count\fP returns \fBERR\fP (the general \fBcurses\fP error
+-return value) if its \fImenu\fP parameter is \fBNULL\fP.
++return value) if its \fImenu\fP parameter is
++.I NULL "."
+ .PP
+ The function \fBset_menu_items\fP returns one of the following codes on error:
+ .TP 5
+Index: man/menu_mark.3x
+Prereq:  1.35 
+--- ncurses-6.5-20241221+/man/menu_mark.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/menu_mark.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_mark.3x,v 1.35 2024/03/16 15:35:01 tom Exp $
+-.TH menu_mark 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: menu_mark.3x,v 1.37 2024/12/28 21:26:21 tom Exp $
++.TH menu_mark 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fBset_menu_mark\fP,
+ \fBmenu_mark\fP \-
+@@ -51,13 +51,16 @@
+ menu is posted is likely to produce unhelpful behavior.
+ .PP
+ The default string is "\-" (a dash).
+-Calling \fBset_menu_mark\fP with
+-a non-\fBNULL\fP menu argument will change this default.
++Calling \fBset_menu_mark\fP with a
++.IR non- NULL
++menu argument will change this default.
+ .PP
+-The function \fBmenu_mark\fP returns the menu's mark string (or \fBNULL\fP if
+-there is none).
++The function \fBmenu_mark\fP returns the menu's mark string (or
++.I NULL
++if there is none).
+ .SH RETURN VALUE
+-The function \fBmenu_mark\fP returns a pointer (which may be \fBNULL\fP).
++The function \fBmenu_mark\fP returns a pointer (which may be
++.IR NULL ")."
+ It does not set \fBerrno\fP.
+ .PP
+ The function \fBset_menu_mark\fP may return the following error codes:
+Index: man/menu_new.3x
+Prereq:  1.35 
+--- ncurses-6.5-20241221+/man/menu_new.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/menu_new.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_new.3x,v 1.35 2024/03/16 15:35:01 tom Exp $
+-.TH menu_new 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: menu_new.3x,v 1.37 2024/12/28 21:26:21 tom Exp $
++.TH menu_new 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fBnew_menu\fP,
+ \fBfree_menu\fP \-
+@@ -42,12 +42,15 @@
+ .fi
+ .SH DESCRIPTION
+ The function \fBnew_menu\fP creates a new menu connected to a specified item
+-pointer array (which must be \fBNULL\fP-terminated).
++pointer array (which must be
++.IR NULL -terminated).
+ .PP
+ 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\fP returns \fBNULL\fP on error.
++The function \fBnew_menu\fP returns
++.I NULL
++on error.
+ It sets \fBerrno\fP according to the function's failure:
+ .TP 5
+ .B E_NOT_CONNECTED
+Index: man/menu_pattern.3x
+Prereq:  1.38 
+--- ncurses-6.5-20241221+/man/menu_pattern.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/menu_pattern.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_pattern.3x,v 1.38 2024/03/16 15:35:01 tom Exp $
+-.TH menu_pattern 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: menu_pattern.3x,v 1.40 2024/12/28 21:26:21 tom Exp $
++.TH menu_pattern 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fBset_menu_pattern\fP,
+ \fBmenu_pattern\fP \-
+@@ -55,7 +55,10 @@
+ \fImenu\fP.
+ .SH RETURN VALUE
+ The function \fBmenu_pattern\fP returns a pointer,
+-which is \fBNULL\fP if the \fImenu\fP parameter is \fBNULL\fP.
++which is
++.I NULL
++if the \fImenu\fP parameter is
++.IR NULL "."
+ Otherwise, it is a pointer to a string which is empty
+ if no pattern has been set.
+ It does not set \fBerrno\fP.
+Index: man/menu_requestname.3x
+Prereq:  1.33 
+--- ncurses-6.5-20241221+/man/menu_requestname.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/menu_requestname.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_requestname.3x,v 1.33 2024/03/16 15:35:01 tom Exp $
+-.TH menu_requestname 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: menu_requestname.3x,v 1.35 2024/12/28 21:26:21 tom Exp $
++.TH menu_requestname 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fBmenu_request_by_name\fP,
+ \fBmenu_request_name\fP \-
+@@ -48,7 +48,9 @@
+ with the given name and returns its request code.
+ Otherwise E_NO_MATCH is returned.
+ .SH RETURN VALUE
+-\fBmenu_request_name\fP returns \fBNULL\fP on error
++\fBmenu_request_name\fP returns
++.I NULL
++on error
+ and sets \fBerrno\fP to \fBE_BAD_ARGUMENT\fP.
+ .br
+ \fBmenu_request_by_name\fP returns \fBE_NO_MATCH\fP on error.
+Index: man/menu_spacing.3x
+Prereq:  1.37 
+--- ncurses-6.5-20241221+/man/menu_spacing.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/menu_spacing.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_spacing.3x,v 1.37 2024/03/16 15:35:01 tom Exp $
+-.TH menu_spacing 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: menu_spacing.3x,v 1.39 2024/12/28 21:26:21 tom Exp $
++.TH menu_spacing 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fBset_menu_spacing\fP,
+ \fBmenu_spacing\fP \-
+@@ -73,7 +73,9 @@
+ which is 1 for all of them.
+ .PP
+ The function \fBmenu_spacing\fP returns the spacing information for the menu.
+-If a pointer is NULL, the corresponding information is simply not returned.
++If a pointer is
++.IR NULL ","
++the corresponding information is simply not returned.
+ .SH RETURN VALUE
+ Both routines return \fBE_OK\fP on success.
+ \fBset_menu_spacing\fP may return
+Index: man/menu_userptr.3x
+Prereq:  1.33 
+--- ncurses-6.5-20241221+/man/menu_userptr.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/menu_userptr.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_userptr.3x,v 1.33 2024/03/16 15:35:01 tom Exp $
+-.TH menu_userptr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: menu_userptr.3x,v 1.35 2024/12/28 21:26:21 tom Exp $
++.TH menu_userptr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fBset_menu_userptr\fP,
+ \fBmenu_userptr\fP \-
+@@ -45,7 +45,8 @@
+ 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\fP returns a pointer (which may be \fBNULL\fP).
++\fBmenu_userptr\fP returns a pointer (which may be
++.IR NULL ")."
+ It does not set \fBerrno\fP.
+ .PP
+ \fBset_menu_userptr\fP returns \fBE_OK\fP (success).
+Index: man/menu_win.3x
+Prereq:  1.32 
+--- ncurses-6.5-20241221+/man/menu_win.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/menu_win.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_win.3x,v 1.32 2024/03/16 15:35:01 tom Exp $
+-.TH menu_win 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: menu_win.3x,v 1.34 2024/12/28 21:26:21 tom Exp $
++.TH menu_win 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fBmenu_win\fP \-
+ make and break menu window and subwindow associations
+@@ -54,14 +54,20 @@
+ It is not necessary to set
+ either window; by default, the driver code uses \fBstdscr\fP for both.
+ .PP
+-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
++In the \fBset_\fP functions, window argument of
++.I NULL
++is treated as though
++it were \fBstsdcr\fP.  A menu argument of
++.I NULL
++is treated as a request
+ to change the system default menu window or subwindow.
+ .PP
+ 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\fP on error.
++Routines that return pointers return
++.I NULL
++on error.
+ Routines that return
+ an integer return one of the following error codes:
+ .TP 5
+Index: man/mitem_current.3x
+Prereq:  1.37 
+--- ncurses-6.5-20241221+/man/mitem_current.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/mitem_current.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: mitem_current.3x,v 1.37 2024/03/16 15:35:01 tom Exp $
+-.TH mitem_current 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: mitem_current.3x,v 1.39 2024/12/28 21:26:21 tom Exp $
++.TH mitem_current 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fBmitem_current\fP \-
+ set and get current_menu_item
+@@ -61,11 +61,13 @@
+ 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\fP returns a pointer (which may be \fBNULL\fP).
++\fBcurrent_item\fP returns a pointer (which may be
++.IR NULL ")."
+ It does not set \fBerrno\fP.
+ .PP
+ \fBtop_row\fP and \fBitem_index\fP return \fBERR\fP (the general \fBcurses\fP
+-error value) if their \fImenu\fP parameter is \fBNULL\fP.
++error value) if their \fImenu\fP parameter is
++.IR NULL "."
+ .PP
+ \fBset_current_item\fP and \fBset_top_row\fP return one of the following:
+ .TP 5
+Index: man/mitem_name.3x
+Prereq:  1.31 
+--- ncurses-6.5-20241221+/man/mitem_name.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/mitem_name.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: mitem_name.3x,v 1.31 2024/03/16 15:35:01 tom Exp $
+-.TH mitem_name 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: mitem_name.3x,v 1.33 2024/12/28 21:26:21 tom Exp $
++.TH mitem_name 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fBitem_name\fP,
+ \fBitem_description\fP \-
+@@ -46,7 +46,8 @@
+ 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\fP).
++These routines return a pointer (which may be
++.IR NULL ")."
+ They do not set \fBerrno\fP.
+ .SH PORTABILITY
+ These routines emulate the System V menu library.
+Index: man/mitem_new.3x
+Prereq:  1.36 
+--- ncurses-6.5-20241221+/man/mitem_new.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/mitem_new.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: mitem_new.3x,v 1.36 2024/03/16 15:35:01 tom Exp $
+-.TH mitem_new 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: mitem_new.3x,v 1.38 2024/12/28 21:26:21 tom Exp $
++.TH mitem_new 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fBnew_item\fP,
+ \fBfree_item\fP \-
+@@ -55,7 +55,9 @@
+ 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\fP returns \fBNULL\fP on error.
++The function \fBnew_item\fP returns
++.I NULL
++on error.
+ It sets \fBerrno\fP according to the function's failure:
+ .TP 5
+ .B E_BAD_ARGUMENT
+Index: man/mitem_userptr.3x
+Prereq:  1.34 
+--- ncurses-6.5-20241221+/man/mitem_userptr.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/mitem_userptr.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: mitem_userptr.3x,v 1.34 2024/03/16 15:35:01 tom Exp $
+-.TH mitem_userptr 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: mitem_userptr.3x,v 1.36 2024/12/28 21:26:21 tom Exp $
++.TH mitem_userptr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fBset_item_userptr\fP,
+ \fBitem_userptr\fP \-
+@@ -46,7 +46,8 @@
+ These functions get and set
+ that field.
+ .SH RETURN VALUE
+-The function \fBitem_userptr\fP returns a pointer (possibly \fBNULL\fP).
++The function \fBitem_userptr\fP returns a pointer (possibly
++.IR NULL ")."
+ It does not set \fBerrno\fP.
+ .PP
+ The \fBset_item_userptr\fP always returns \fBE_OK\fP (success).
+Index: man/ncurses.3x
+Prereq:  1.233 
+--- ncurses-6.5-20241221+/man/ncurses.3x	2024-09-21 18:02:58.000000000 +0000
++++ ncurses-6.5-20241228/man/ncurses.3x	2024-12-28 21:27:26.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: ncurses.3x,v 1.233 2024/09/21 18:02:58 tom Exp $
+-.TH ncurses 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: ncurses.3x,v 1.236 2024/12/28 21:27:26 tom Exp $
++.TH ncurses 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -243,7 +243,7 @@
+ is in one of three modes:
+ raw,
+ \%cbreak,
+-or normal (\*(``cooked\*('').
++or canonical (\*(``cooked\*('').
+ In
+ .IR curses ","
+ the line discipline is a property of the screen,
+@@ -1099,7 +1099,7 @@
+ on failure;
+ see \fB\%curs_variables\fP(3X).
+ Functions that return pointers return
+-.B NULL
++.I NULL
+ on failure.
+ Typically,
+ .I \%ncurses
+Index: man/panel.3x
+Prereq:  1.65 
+--- ncurses-6.5-20241221+/man/panel.3x	2024-05-25 21:14:41.000000000 +0000
++++ ncurses-6.5-20241228/man/panel.3x	2024-12-28 21:26:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: panel.3x,v 1.65 2024/05/25 21:14:41 tom Exp $
+-.TH panel 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: panel.3x,v 1.68 2024/12/28 21:26:21 tom Exp $
++.TH panel 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -215,8 +215,9 @@
+ but \fB\%doupdate\fP is the function responsible for updating
+ the physical screen.
+ .SH "RETURN VALUE"
+-Each routine that returns a pointer returns \fBNULL\fP if an error
+-occurs.
++Each routine that returns a pointer returns
++.I NULL
++if an error occurs.
+ Each routine that returns an int value returns \fBOK\fP if it
+ executes successfully and \fBERR\fP if not.
+ .PP
+@@ -263,9 +264,14 @@
+ such as Solaris,
+ provide this library.
+ .bP
+-\fI\%ncurses\fP (since version 0.6 in 1993)
+-and \fIPDCurses\fP (since version 2.2 in 1995)
+-provide a panel library whose common ancestor
++.I \%ncurses
++(since version 0.6 in 1993)
++and
++.I \%PDCurses
++(since version 2.2 in 1995)
++provide a
++.I panel
++library whose common ancestor
+ is a public domain implementation by Warren Tucker
+ published in \fIu386mon\fP 2.20 (1990).
+ .IP
+Index: man/resizeterm.3x
+Prereq:  1.56 
+--- ncurses-6.5-20241221+/man/resizeterm.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/resizeterm.3x	2024-12-28 21:18:35.000000000 +0000
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1996-on
+ .\"
+-.\" $Id: resizeterm.3x,v 1.56 2024/03/16 15:35:01 tom Exp $
+-.TH resizeterm 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: resizeterm.3x,v 1.58 2024/12/28 21:18:35 tom Exp $
++.TH resizeterm 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .de bP
+ .ie n  .IP \(bu 4
+ .el    .IP \(bu 2
+@@ -170,8 +170,13 @@
+ .PP
+ Doing that clears the screen and is visually distracting.
+ .PP
+-This extension of \fI\%ncurses\fP was introduced in mid-1995.
+-It was adopted in NetBSD \fIcurses\fP (2001) and PDCurses (2003).
++.I \%ncurses
++introduced this extension in mid-1995.
++NetBSD
++.I curses
++adopted it in 2001 and
++.I \%PDCurses
++in 2003.
+ .SH AUTHORS
+ Thomas Dickey (from an equivalent function written in 1988 for BSD \fIcurses\fP)
+ .SH SEE ALSO
+Index: man/term_variables.3x
+Prereq:  1.36 
+--- ncurses-6.5-20241221+/man/term_variables.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20241228/man/term_variables.3x	2024-12-28 21:35:10.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: term_variables.3x,v 1.36 2024/03/16 15:35:01 tom Exp $
+-.TH term_variables 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: term_variables.3x,v 1.40 2024/12/28 21:35:10 tom Exp $
++.TH term_variables 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -81,99 +81,193 @@
+ \fBNCURSES_CONST char * const strnames[];
+ .fi
+ .SH DESCRIPTION
+-This page summarizes variables provided by the \fBcurses\fP library's
+-low-level terminfo interface.
+-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\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.
++This page summarizes variables provided by the
++.I curses
++library's lower-level
++.I \%term\%info
++interface.
++Locate a more complete description in the \fBcurs_terminfo\fP(3X) manual
++page.
++.PP
++Depending on
++.IR \%ncurses 's
++build-time configuration,
++these may be actual variables,
++or macros
++(see \fBcurs_threads\fP(3X))
++that provide read-only access to
++.IR curses 's
++state.
++In either case,
++applications should treat them as read-only to avoid confusing the
++library.
+ .SS "Alternate Character Set Mapping"
+-After initializing the curses or terminfo interfaces,
+-the \fBacs_map\fP array holds information used to translate cells
+-with the \fBA_ALTCHARSET\fP video attribute into line-drawing characters.
++After initializing the
++.I curses
++or
++.I \%term\%info
++interfaces,
++the
++.B acs_map
++array holds information used to translate cells with the
++.B \%A_ALTCHARSET
++video attribute into line-drawing characters.
+ .PP
+ The encoding of the information in this array has changed periodically.
+-Application developers need only know that it is used for the \*(``ACS_\*(''
+-constants in .
++Application developers need only know that it is used for the
++\*(``ACS_\*('' constants in
++.IR \%curses.h "."
+ .PP
+-The comparable data for the wide-character library is a private variable.
++The comparable data for the wide-character library are not exposed as
++symbols in the API.
+ .SS "Current Terminal Data"
+-After initializing the curses or terminfo interfaces,
+-the \fBcur_term\fP contains data describing the current terminal.
+-This variable is also set as a side-effect of \fBset_term\fP(3X)
+-and \fBdelscreen\fP(3X).
+-.PP
+-It is possible to save a value of \fBcur_term\fP for subsequent
+-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.
++After initializing the
++.I curses
++or
++.I \%term\%info
++interfaces,
++.B cur_term
++contains data describing the current terminal.
++It is also updated as a side-effect of \fBset_term\fP(3X) and
++\fBdelscreen\fP(3X).
++.PP
++It is possible to save a value of
++.B cur_term
++for subsequent use as a parameter to \fBset_term\fP(3X)
++for switching between screens.
++Alternatively,
++one can save the return value from \fBnewterm\fP(3X) or
++\fBsetupterm\fP(3X) to reuse in \fBset_term\fP(3X).
+ .SS "\fIterminfo\fP 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.
++the long and short names of
++.I \%term\%info
++capabilities,
++as well as the corresponding names for
++.I termcap
++capabilities.
+ These are available to other applications,
+-although the hash-tables used by
+-the terminfo and termcap functions are not available.
+-.PP
+-The long terminfo capability names use a \*(``f\*('' (eff) in their names:
+-\fBboolfnames\fP,
+-\fBnumfnames\fP, and
+-\fBstrfnames\fP.
+-.PP
+-These are the short names for terminfo capabilities:
+-\fBboolnames\fP,
+-\fBnumnames\fP, and
+-\fBstrnames\fP.
+-.PP
+-These are the corresponding names used for termcap descriptions:
+-\fBboolcodes\fP,
+-\fBnumcodes\fP, and
+-\fBstrcodes\fP.
++though the hash tables used by the
++.I \%term\%info
++and
++.I termcap
++functions are not.
++.PP
++.I \%term\%info
++stores capability names in arrays with an \*(``f\*('' (eff) in their
++names:
++.BR \%boolfnames ","
++.BR \%numfnames ","
++and
++.BR \%strfnames "."
++It stores the briefer capability codes in arrays without the
++\*(``f\*('':
++.BR \%boolnames ","
++.BR \%numnames ","
++and
++.BR \%strnames "."
++The corresponding
++.I termcap
++capability codes are stored in
++.BR \%boolcodes ","
++.BR \%numcodes ","
++and
++.BR \%strcodes "."
++\fB\%terminfo\fP(5) catalogs these.
+ .\"
+ .SS "Terminal Type"
+ A terminal description begins with one or more terminal names
+ separated by \*(``|\*('' (vertical bars).
+-On initialization of the curses or terminfo interfaces,
+-\fBsetupterm\fP(3X) copies the terminal names to the array \fBttytype\fP.
++On initialization of the
++.I curses
++or
++.I \%term\%info
++interfaces,
++\fBsetupterm\fP(3X) copies the terminal name to the array
++.BR ttytype "."
+ .\"
+ .SS "\fIterminfo\fP Names"
+-In addition to the variables, \fB\fP also defines a symbol for each
+-terminfo capability \fIlong name\fP.
+-These are in terms of the symbol \fBCUR\fP,
++In addition to the variables,
++.I term.h
++also defines a symbol for each
++.I \%term\%info
++capability name.
++These are in terms of the symbol
++.BR CUR ","
+ which is defined
+ .PP
++.RS
+ .EX
+ #define CUR ((TERMTYPE *)(cur_term))\->
+ .EE
++.RE
+ .PP
+-These symbols provide a faster method of accessing terminfo capabilities
+-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
+-into the current terminal description loaded into memory.
++These symbols provide a faster method of accessing
++.I \%term\%info
++capabilities than using,
++for example,
++\fBtigetstr\fP(3X).
++.PP
++The definition of
++.B CUR
++is implementation-dependent,
++but each
++.I \%term\%info
++library defines these names to point
++into the in-memory description of the current terminal.
++For example,
++in
++.IR \%ncurses ","
++the expressions
++.B tigetstr("key_dc")
++and
++\*(``\c \" `` string not reliable in a macro call on DWB/Heirloom nroffs
++.B "CUR Strings[59]\c"
++\*('' \" '' string not reliable in a macro call on DWB/Heirloom nroffs
++are equivalent.
+ .\"
+-.SH NOTES
+-The low-level terminfo interface is initialized using
+-\fB\%setupterm\fP(3X).
+-The upper-level curses interface uses the low-level terminfo interface,
+-internally.
++.SS "\fIterminfo\fP and \fIcurses"
++\fB\%setupterm\fP(3X) initializes the lower-level
++.I \%term\%info
++interface.
++The higher-level
++.I curses
++interface uses the
++.I \%term\%info
++interface internally;
++the symbol
++.B SP
++bridges the
++.I curses
++.I SCREEN
++type with the
++.I \%term\%info
++.I TERMINAL
++type.
+ .\"
+ .SH PORTABILITY
+-X/Open Curses does not describe any of these except for \fBcur_term\fP.
+-(The inclusion of \fBcur_term\fP appears to be an oversight,
+-since other comparable low-level information is omitted by X/Open).
++X/Open Curses does not describe any of these symbols except for
++.IR \%cur_term "."
++(The inclusion of
++.I \%cur_term
++appears to be an oversight,
++since other comparable low-level information is omitted by X/Open.)
+ .PP
+ Other implementations may have comparable variables.
+ Some implementations provide the variables in their libraries,
+ but omit them from the header files.
+ .PP
+-All implementations which provide terminfo interfaces add definitions
+-as described in the \fBTerminfo Names\fP section.
+-Most, but not all, base the definition upon the \fBcur_term\fP variable.
++All implementations that provide
++.I \%term\%info
++interfaces add definitions
++as described in the
++.RI \*(`` terminfo
++Names\*('' section above.
++Most,
++but not all,
++base the definition upon the
++.I \%cur_term
++variable.
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_terminfo\fP(3X),
+Index: man/terminfo.tail
+Prereq:  1.153 
+--- ncurses-6.5-20241221+/man/terminfo.tail	2024-09-21 17:54:42.000000000 +0000
++++ ncurses-6.5-20241228/man/terminfo.tail	2024-12-28 21:21:36.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: terminfo.tail,v 1.153 2024/09/21 17:54:42 Branden.Robinson Exp $
++.\" $Id: terminfo.tail,v 1.154 2024/12/28 21:21:36 Branden.Robinson Exp $
+ .ps +1
+ .SS "User-Defined Capabilities"
+ .
+@@ -632,10 +632,13 @@
+ tabs are never expanded, so \et is safe to send.
+ This turns out to be essential for the Ann Arbor 4080.)
+ .PP
+-A final example is the \s-1LSI ADM\s0-3a, which uses line and column
+-offset by a blank character, thus
++A final example is the LSI ADM-3A,
++which uses line and column offset by a space,
++thus
+ .RS
++.EX
+ cup=\eE=%p1%\*' \*'%+%c%p2%\*' \*'%+%c
++.EE
+ .RE
+ .PP
+ After sending \*(``\eE=\*('', this pushes the first parameter, pushes the
+Index: man/tput.1
+Prereq:  1.120 
+--- ncurses-6.5-20241221+/man/tput.1	2024-09-14 20:06:50.000000000 +0000
++++ ncurses-6.5-20241228/man/tput.1	2024-12-28 21:27:26.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tput.1,v 1.120 2024/09/14 20:06:50 tom Exp $
+-.TH @TPUT@ 1 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: tput.1,v 1.122 2024/12/28 21:27:26 tom Exp $
++.TH @TPUT@ 1 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -216,7 +216,7 @@
+ \fB\%@TPUT@\fP sets the the terminal modes to a \*(``sane\*('' state,
+ .RS
+ .bP
+-enabling cooked and echo modes,
++enabling canonical (\*(``cooked\*('') and echo modes,
+ .bP
+ disabling cbreak and raw modes,
+ .bP
+Index: man/tset.1
+Prereq:  1.88 
+--- ncurses-6.5-20241221+/man/tset.1	2024-06-08 20:51:12.000000000 +0000
++++ ncurses-6.5-20241228/man/tset.1	2024-12-28 21:27:26.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tset.1,v 1.88 2024/06/08 20:51:12 tom Exp $
+-.TH @TSET@ 1 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: tset.1,v 1.90 2024/12/28 21:27:26 tom Exp $
++.TH @TSET@ 1 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -135,7 +135,7 @@
+ When invoked as \fB@RESET@\fP, \fB@TSET@\fP sets the terminal
+ modes to \*(``sane\*('' values:
+ .bP
+-sets cooked and echo modes,
++sets canonical (\*(``cooked\*('') and echo modes,
+ .bP
+ turns off cbreak and raw modes,
+ .bP
+Index: man/wresize.3x
+Prereq:  1.42 
+--- ncurses-6.5-20241221+/man/wresize.3x	2024-09-21 23:48:27.000000000 +0000
++++ ncurses-6.5-20241228/man/wresize.3x	2024-12-28 21:16:46.000000000 +0000
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1996
+ .\"
+-.\" $Id: wresize.3x,v 1.42 2024/09/21 23:48:27 tom Exp $
+-.TH wresize 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: wresize.3x,v 1.44 2024/12/28 21:16:46 tom Exp $
++.TH wresize 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%wresize\fP \-
+ resize a \fIcurses\fR window
+@@ -55,10 +55,10 @@
+ .IR columns "."
+ If either dimension is larger than its current value,
+ .I \%ncurses
+-the expanded part of the window is filled with blanks merged with
+-current background rendition
+-(configured by \fB\%wbkgdset\fP(3X),
+-or by wide-character API: \fB\%wbkgrndset\fP(3X)).
++fills the expanded part of the window
++with the background character and rendition configured by
++\fB\%wbkgdset\fP(3X)
++(wide-character API: \fB\%wbkgrndset\fP(3X)).
+ .SH RETURN VALUE
+ .B \%wresize
+ returns
+Index: misc/terminfo.src
+--- ncurses-6.5-20241221+/misc/terminfo.src	2024-11-02 20:48:46.000000000 +0000
++++ ncurses-6.5-20241228/misc/terminfo.src	2024-12-28 20:42:05.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.1157 $
+-#	$Date: 2024/11/02 20:48:46 $
++#	$Revision: 1.1160 $
++#	$Date: 2024/12/28 20:42:05 $
+ #
+ # 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
+@@ -579,10 +579,9 @@
+ pcansi-m|pcansi-mono|ibm-pc terminal programs claiming to be ANSI (mono mode),
+ 	OTbs, am, mir, msgr,
+ 	cols#80, lines#24,
+-	bel=^G, cr=\r, cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M,
+-	home=\E[H, ht=^I, il1=\E[L, ind=\n, use=ansi+arrows,
+-	use=ansi+erase, use=ansi+inittabs, use=ansi+local1,
+-	use=klone+sgr-dumb,
++	bel=^G, cr=\r, dch1=\E[P, dl1=\E[M, il1=\E[L, ind=\n,
++	use=ansi+arrows, use=ansi+cup, use=ansi+erase,
++	use=ansi+inittabs, use=ansi+local1, use=klone+sgr-dumb,
+ 
+ pcansi-25-m|pcansi25m|ibm-pc terminal programs with 25 lines (mono mode),
+ 	lines#25, use=pcansi-m,
+@@ -1150,8 +1149,7 @@
+ 	am, bce, ccc, eo, eslok, hs, mir, msgr, xenl, xon,
+ 	it#8, ncv#18,
+ 	bel=^G, civis=\E[?25l, cnorm=\E[?25h, cr=\r, cub1=^H,
+-	cud1=\n, cup=\E[%i%p1%d;%p2%dH, dim=\E[2m,
+-	dsl=\E[?H\E[?E, el1=\E[1K, fsl=\E[?F, home=\E[H,
++	cud1=\n, dim=\E[2m, dsl=\E[?H\E[?E, el1=\E[1K, fsl=\E[?F,
+ 	hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n,
+ 	initc=\E]P%p1%x%p2%02x%p3%02x%p4%02x, kb2=\E[G, kbs=^?,
+ 	kf1=\E[[A, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
+@@ -1165,9 +1163,9 @@
+ 	    %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
+ 	sgr0=\E[0;10m, tbc=\E[3g, tsl=\E[?T, u8=\E[?6c,
+ 	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
+-	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+-	use=ansi+local, use=ansi+sgrbold, use=ecma+sgr,
+-	use=klone+color, use=vt220+pcedit,
++	use=ansi+cup, use=ansi+enq, use=ansi+erase, use=ansi+idc,
++	use=ansi+idl, use=ansi+local, use=ansi+sgrbold,
++	use=ecma+sgr, use=klone+color, use=vt220+pcedit,
+ 
+ # release: 0.4.7 2005/05
+ #
+@@ -3858,15 +3856,15 @@
+ xnuppc+basic|Darwin PowerPC console basic capabilities,
+ 	am, bce, mir, xenl, NQ,
+ 	it#8,
+-	bold=\E[1m, cr=\r, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+-	dsl=\E]2;\007, el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ind=\n,
+-	kbs=^?, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+-	rev=\E[7m, ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>,
++	bold=\E[1m, cr=\r, dsl=\E]2;\007, el1=\E[1K, ht=^I, hts=\EH,
++	ind=\n, kbs=^?, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
++	kcuu1=\EOA, rev=\E[7m, ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>,
+ 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m,
+ 	sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, tbc=\E[3g,
+-	use=ansi+csr, use=ansi+erase, use=ansi+local,
+-	use=ansi+sgrso, use=ansi+sgrul, use=vt100+keypad,
++	use=ansi+csr, use=ansi+cup, use=ansi+erase,
++	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
++	use=vt100+keypad,
+ 
+ xnuppc+c|Darwin PowerPC console ANSI color support,
+ 	ncv#32, use=klone+color,
+@@ -4907,9 +4905,7 @@
+ 	cols#80, it#8, lines#24,
+ 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP,
+-	dch1=\E[P, ed=\E[J, el=\E[K, enacs=\E)0, home=\E[H, ht=^I,
+-	hts=\EH, ind=\n,
++	dch=\E[%p1%dP, dch1=\E[P, enacs=\E)0, ht=^I, hts=\EH, ind=\n,
+ 	is2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8,
+ 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\E[11~,
+ 	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
+@@ -4920,9 +4916,10 @@
+ 	rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l, rmkx=\E[?1l\E>,
+ 	rs2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8,
+ 	sgr0=\E[m, smacs=^N, smir=\E[4h, smkx=\E[?1h\E=, tbc=\E[3g,
+-	use=xterm+alt47, use=ansi+csr, use=ansi+idl,
+-	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
+-	use=vt220+vtedit, use=xterm+kbs, use=vt100+enq,
++	use=xterm+alt47, use=ansi+csr, use=ansi+cup,
++	use=ansi+erase, use=ansi+idl, use=ansi+local,
++	use=ansi+sgrso, use=ansi+sgrul, use=vt220+vtedit,
++	use=xterm+kbs, use=vt100+enq,
+ 
+ xterm-old|antique xterm version,
+ 	use=xterm-r6,
+@@ -8179,11 +8176,10 @@
+ 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
+ 	    %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
+ 	sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=,
+-	u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?%[;0123456789]c,
+-	u9=\E[c, Smol=\E[53m, Smulx=\E[4:%p1%dm,
++	Smol=\E[53m, Smulx=\E[4:%p1%dm,
+ 	xr=\EP>\\|WezTerm\\([1-9][0-9-]+\\)\E\\\\,
+ 	use=ansi+apparrows, use=ansi+csr, use=ansi+cup,
+-	use=ansi+erase, use=ansi+idc, use=ansi+idl,
++	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+ 	use=ansi+inittabs, use=ansi+local, use=ansi+rca2,
+ 	use=ansi+rep, use=ansi+sgrdim, use=bracketed+paste,
+ 	use=ecma+index, use=ecma+italics, use=ecma+strikeout,
+@@ -8273,6 +8269,131 @@
+ contour-direct|Contour terminal with direct colors,
+ 	use=xterm+direct, use=contour,
+ 
++#### Ghostty
++# https://github.com/ghostty-org/ghostty
++#
++# Its readme and manpage begin with a lot of hype, concluding with
++#
++#	While aiming for this ambitious goal, our first step is to make Ghostty
++#	one of the best fully standards compliant terminal emulator, remaining
++#	compatible with all existing shells and software while supporting all
++#	of the latest terminal innovations in the ecosystem.  You can use
++#	Ghostty as a drop-in replacement for your existing terminal emulator.
++#
++# However, it uses xterm as a standard:
++#
++#	We believe Ghostty is one of the most compliant terminal emulators
++#	available.  Terminal behavior is partially a de jure standard (i.e. 
++#	[ECMA-48](https://ecma-international.org/publications-and-standards/stand>
++#	but mostly a de facto standard as defined by popular terminal emulators
++#	worldwide.  Ghostty takes the approach that our behavior is defined by
++#	(1) standards, if available, (2) xterm, if the feature exists, (3)
++#	other popular terminals, in that order.  This defines what the Ghostty
++#	project views as a "standard."
++#
++# while xterm uses ECMA-48 and DEC 070 along with related documentation such as
++# the DEC terminal reference manuals.  xterm's documentation does not attempt
++# to duplicate those sources of information, so that developers should rely
++# upon both xterm's documentation and the published standards.
++#
++# Comments in ghostty's source code and commits demonstrate that the developers
++# study xterm's source code closer than xterm's documentation.  The quote above
++# is the only mention of ECMA-48.
++#
++# ghostty 1.0.0 tested with Arch Linux:
++# -------------
++# tack:
++# - does not implement blinking text
++# - does not implement meta mode (kmm).
++# - implements VT100-style alternate character set
++# - testing video-attributes unexpectedly clears the display before acsc
++# - italics and strike-out work
++# - function-keys mostly match; however because this client (unlike X11
++#   clients) does not work with a remote display, some (such as control/alt key
++#   combinations, and the shifted editing keys) are untestable because
++# - numeric keypad does not send VT100-style escapes
++# wraptest:
++# - matches xterm
++# vttest:
++# - ghostty hangs in more than one menu, making it impossible to test more than
++#   a small part of the program.  In particular, these are untestable:
++#	1. Test of cursor movements 
++#	2. Test of screen features
++#	4. Test of double-sized characters
++# - ghostty has tabs (imitating gnome-terminal); when closing a tab with a
++#   running process (e.g., a hung vttest), ghostty does not prompt about the 
++#   process to be killed.
++# - identifies as a "VT220 with color":
++#	<27> [ ? 6 2 ; 2 2 c
++# - although claiming to be a VT220, it does not support NRCS.  Actually, it
++#   fails the VT100 character set test as well.  This is a complete failure:
++#	3. Test of character sets
++# - it does not hang in this menu entry:
++#	8. Test of VT102 features (Insert/Delete Char/Line)
++#   although because it does not implement double-sized characters, most of
++#   that test counts as a failure.
++# - implements VT220 DECTCEM and ECH, but not SRM or DECSCA
++# - implements VT420 left/right margins
++# - does not implement VT420 rectangle operations
++# - does not implement 8-bit controls
++# - does implement ISO-6429 cursor-movement
++# - supports BCE partially: ED/EL work, but not ECH and indexing.
++# - does not support blinking text
++# - responds to XTVERSION
++# - responds to DECRPM controls, though many are "unknown"
++# - does not respond to most DECRQSS except for SGR, DECSCUSR, DECSTBM
++# - implements most of xterm mouse protocol except for
++#   - Mouse Highlight Tracking
++#   - DEC Locator Events
++# - some window reporting works:
++#   14 - size of text area in pixels
++#   16 - size of character in pixels
++#   18 - size of window in chars
++#   21 - report window label
++# - window-modifying does not work
++# - cursor position is incorrect after switching to/from alternate screen
++#
++# The developers set "Tc" in their terminal description to hint that it
++# supports direct-colors, but the feature did not work with this version -TD
++ghostty|Ghostty terminal emulator,
++	am, bce, km, mc5i, mir, msgr, npc, xenl, AX, XT,
++	cols#80, lines#24, pairs#0x7fff,
++	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
++	     yzz{{||}}~~,
++	bel=^G, bold=\E[1m, clear=\E[H\E[2J,
++	cnorm=\E[?12l\E[?25h, cr=\r, cub1=^H, cud1=\n,
++	cvvis=\E[?12;25h, dim=\E[2m, ech=\E[%p1%dX, el1=\E[1K,
++	flash=\E[?5h$<100/>\E[?5l, ind=\n, invis=\E[8m, kbs=^?,
++	kcbt=\E[Z, kend=\EOF, kent=\EOM, kf13=\E[1;2P,
++	kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S, kf25=\E[1;5P,
++	kf26=\E[1;5Q, kf27=\E[1;5R, kf28=\E[1;5S, kf37=\E[1;6P,
++	kf38=\E[1;6Q, kf39=\E[1;6R, kf40=\E[1;6S, kf49=\E[1;3P,
++	kf50=\E[1;3Q, kf51=\E[1;3R, kf52=\E[1;3S, kf61=\E[1;4P,
++	kf62=\E[1;4Q, kf63=\E[1;4R, op=\E[39;49m, rev=\E[7m,
++	ri=\EM, rmam=\E[?7l, rmcup=\E[?1049l, rmkx=\E[?1l\E>,
++	rmso=\E[27m, rmul=\E[24m, rs1=\E]\E\\\Ec,
++	setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;
++	      5;%p1%d%;m,
++	setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5
++	      ;%p1%d%;m,
++	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
++	    %t;7%;%?%p5%t;2%;%?%p7%t;8%;m,
++	sgr0=\E(B\E[m, smam=\E[?7h, smcup=\E[?1049h,
++	smkx=\E[?1h\E=, E3=\E[3J, Ms=\E]52;%p1%s;%p2%s\007,
++	Se=\E[2 q, Smulx=\E[4:%p1%dm, Ss=\E[%p1%d q,
++	xr=\EP>\\|ghostty [!-z]+\E\\, use=ansi+apparrows,
++	use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+erase,
++	use=ansi+idc, use=ansi+idl, use=ansi+inittabs,
++	use=ansi+local, use=ansi+local1, use=ansi+rca2,
++	use=ansi+rep, use=ansi+sgrso, use=ansi+sgrul,
++	use=ansi+tabs, use=ecma+index, use=ecma+italics,
++	use=ecma+strikeout, use=report+version, use=vt220+cvis,
++	use=xterm+256color2, use=xterm+acs,
++	use=xterm+alt+title, use=bracketed+paste,
++	use=kitty+setal, use=vt420+lrmm, use=xterm+focus,
++	use=xterm+pce2, use=xterm+pcc2, use=xterm+pcf0,
++	use=xterm+sm+1006, use=xterm+sl-twm,
++
+ ######## UNIX VIRTUAL TERMINALS, VIRTUAL CONSOLES, AND TELNET CLIENTS
+ #
+ 
+@@ -8940,9 +9061,8 @@
+ 	home=\EH, use=elks-glasstty,
+ 
+ elks-ansi|ELKS ANSI console,
+-	clear=\E[H\E[2J, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A,
+-	el=\E[K, home=\E[H, use=ansi+local1, use=ansi+sgrso,
+-	use=elks-glasstty,
++	clear=\E[H\E[2J, el=\E[K, use=ansi+cup, use=ansi+local1,
++	use=ansi+sgrso, use=elks-glasstty,
+ 
+ # As a matter of fact, ELKS 0.0.83 on PCs defaults to ANSI emulation
+ # instead of VT52, but the "elks" entry still refers to the latter.
+@@ -9462,8 +9582,7 @@
+ cygwin|ANSI emulation for Cygwin,
+ 	am, hs, mir, msgr, xon,
+ 	colors#8, it#8, pairs#64,
+-	bel=^G, bold=\E[1m, cr=\r, cub=\E[%p1%dD, cub1=^H,
+-	cup=\E[%i%p1%d;%p2%dH, el1=\E[1K, fsl=^G, home=\E[H, ht=^I,
++	bel=^G, bold=\E[1m, cr=\r, cub1=^H, el1=\E[1K, fsl=^G, ht=^I,
+ 	ind=\n, invis=\E[8m, kb2=\E[G, kf1=\E[[A, 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~,
+@@ -9475,10 +9594,10 @@
+ 	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p6%t;1%;%?%p7
+ 	    %t;8%;%?%p9%t;11%;m,
+ 	sgr0=\E[0;10m, smpch=\E[11m, smso=\E[7m, smul=\E[4m,
+-	tsl=\E];, use=ansi+arrows, use=ansi+erase, use=ansi+idc,
+-	use=ansi+idl, use=ansi+local, use=ansi+rca2,
+-	use=vt220+pcedit, use=vt102+enq, use=klone+acs,
+-	use=xterm+alt47,
++	tsl=\E];, use=ansi+arrows, use=ansi+cup, use=ansi+erase,
++	use=ansi+idc, use=ansi+idl, use=ansi+local,
++	use=ansi+rca2, use=vt220+pcedit, use=vt102+enq,
++	use=klone+acs, use=xterm+alt47,
+ 
+ # I've supplied this so that you can help test new values and add other
+ # features.  Cheers, earnie_boyd@yahoo.com.
+@@ -9488,20 +9607,20 @@
+ # this list, but DOES cause problems so it has been removed
+ cygwinDBG|Debug Version for Cygwin,
+ 	am, eo, mir, msgr, xon,
+-	cols#80, lines#24, ncv#3,
+-	bel=^G, cr=\r, cup=\E[%i%p1%d;%p2%dH, dim=\E[2m, el1=\E[1K,
+-	flash=\E[?5h$<200/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
+-	ind=\n, kNXT=\E[6$, kPRV=\E[5$, kb2=\E[G, kcbt=\E[Z,
+-	kf1=\E[[A, 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=\E[[B,
+-	kf20=\E[34~, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~,
+-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kspd=^Z,
+-	nel=\r\n, op=\E[39;49m, rc=\E8, ri=\EM, rs1=\Ec\E]R, sc=\E7,
++	cols#80, lines#24,
++	bel=^G, cr=\r, dim=\E[2m, el1=\E[1K,
++	flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG, ind=\n,
++	kNXT=\E[6$, kPRV=\E[5$, kb2=\E[G, kcbt=\E[Z, kf1=\E[[A,
++	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=\E[[B, kf20=\E[34~,
++	kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~,
++	kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kspd=^Z, nel=\r\n,
++	op=\E[39;49m, rc=\E8, ri=\EM, rs1=\Ec\E]R, sc=\E7,
+ 	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
+ 	    %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%;m,
+ 	sgr0=\E[0;10m, vpa=\E[%i%p1%dd, use=ansi+arrows,
+-	use=ansi+erase, use=ansi+idc, use=ansi+idl,
++	use=ansi+cup, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+ 	use=ansi+inittabs, use=ansi+local, use=ansi+sgrbold,
+ 	use=klone+acs, use=klone+color, use=vt220+pcedit,
+ 	use=vt220+cvis, use=vt102+enq,
+@@ -14021,9 +14140,8 @@
+ 	cols#80, it#8, lh#2, lines#24, lw#8, nlab#8, wsl#80,
+ 	acsc=++\,\,--..00``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyz
+ 	     z{{||}}~~,
+-	bel=^G, bold=\E[2;7m, cr=\r, cub1=^H, cuf1=\E[C,
+-	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dim=\E[2m, dl1=\E[M,
+-	fsl=\E8, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, ind=\n,
++	bel=^G, bold=\E[2;7m, cr=\r, cub1=^H, dch1=\E[P, dim=\E[2m,
++	dl1=\E[M, fsl=\E8, ht=^I, ich1=\E[@, il1=\E[L, ind=\n,
+ 	is1=\E[?3l\E)0,
+ 	is3=\E[1;03q\s\s\sf1\s\s\s\s\s\s\s\s\s\s\s\EOP\E[2;03q\s\s
+ 	    \sf2\s\s\s\s\s\s\s\s\s\s\s\EOQ\E[3;03q\s\s\sf3\s\s\s\s
+@@ -14042,8 +14160,8 @@
+ 	sgr=\E[0%?%p1%p5%|%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
+ 	    %|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, tsl=\E7\E[25;%p1%{1}%+%dH,
+-	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
+-	use=ansi+local1, use=ansi+sgrbold,
++	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
++	use=ansi+erase, use=ansi+local1, use=ansi+sgrbold,
+ 
+ att4410v1-w|att5410v1-w|tty5410v1-w|AT&T 4410/5410 132 columns - version 1,
+ 	cols#132, wsl#132,
+@@ -15409,10 +15527,9 @@
+ 	OTbs, am, km, mc5i, mir, xon,
+ 	cols#80,
+ 	bel=^G, clear=\E[H\E[J$<156>, cr=\r, cub1=^H, cud1=^K,
+-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, ed=\E[J,
+-	el=\E[K$<5>, home=\E[H, hpa=\E[%p1%{1}%+%dG,
+-	ich=\E[%p1%d@$<4*>, ich1=\E[@$<4>, il1=\E[L$<3>, ind=^K,
+-	is1=\E[m\E7\E[H\E9\E8,
++	dch=\E[%p1%dP, dch1=\E[P, ed=\E[J, el=\E[K$<5>,
++	hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@$<4*>, ich1=\E[@$<4>,
++	il1=\E[L$<3>, ind=^K, is1=\E[m\E7\E[H\E9\E8,
+ 	is3=\E[1Q\E[>20;30l\EP`+x~M\E\\, kcbt=\E[Z, kclr=\E[J,
+ 	kdch1=\E[P, kdl1=\E[M, kf1=\EOA, kf10=\EOJ, kf11=\EOK,
+ 	kf12=\EOL, kf13=\EOM, kf14=\EON, kf15=\EOO, kf16=\EOP,
+@@ -15423,15 +15540,12 @@
+ 	mc5=\E[v, mc5p=\E[%p1%dv, rc=\E8,
+ 	rmkx=\EP`>y~[[J`8xy~[[A`4xy~[[D`6xy~[[C`2xy~[[B\E
+ 	     \\,
+-	rmm=\E[>52l, sc=\E7,
+-	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;
+-	    %;%?%p7%t8;%;m,
+-	sgr0=\E[m,
++	rmm=\E[>52l, sc=\E7, sgr0=\E[m,
+ 	smkx=\EP`>z~[[J`8xz~[[A`4xz~[[D`6xz~[[C`2xz~[[B\E
+ 	     \\,
+ 	smm=\E[>52h, vpa=\E[%p1%{1}%+%dd, use=ansi+arrows,
+-	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+-	use=ansi+rep, use=ansi+sgrbold,
++	use=ansi+cup, use=ansi+idl, use=ansi+inittabs,
++	use=ansi+local, use=ansi+rep, use=ansi+sgrbold,
+ 
+ aaa+rv|Ann Arbor Ambassador in reverse video,
+ 	blink=\E[5;7m, bold=\E[1;7m, invis=\E[7;8m,
+@@ -20052,17 +20166,16 @@
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, civis=\ER, clear=^L,
+ 	cnorm=\ES, cr=\r, csr=\EU%p1%{32}%+%c%p2%{32}%+%c,
+-	cub1=^H, cud1=\E[B, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
+-	dch1=\EM, dl=\E[%p1%dM, dl1=\EL, ed=\E[J, el=\E[K, fsl=\r,
+-	home=\E[H, ht=^I, ich=\E[%p1%d@, ich1=\EO, il=\E[%p1%dL,
++	cub1=^H, dch=\E[%p1%dP, dch1=\EM, dl=\E[%p1%dM, dl1=\EL,
++	fsl=\r, ht=^I, ich=\E[%p1%d@, ich1=\EO, il=\E[%p1%dL,
+ 	il1=\EN, ind=\n, indn=\E[%p1%dB, is2=\E[U 7\E[24;1H,
+ 	khome=\E[H, rc=\EX, rev=\E[7m,
+ 	rf=/usr/share/tabset/vt100, ri=\EI, rin=\E[%p1%dA,
+ 	rmacs=\Ed, rmam=\E[?7l,
+ 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\EW,
+ 	sgr0=\E[m, smacs=\EF, smam=\E[?7m, tsl=\E], uc=\EPB,
+-	use=ansi+apparrows, use=ansi+local, use=ansi+sgrso,
+-	use=ansi+sgrul,
++	use=ansi+apparrows, use=ansi+cup, use=ansi+erase,
++	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
+ 
+ #### Tandem
+ #
+@@ -20782,18 +20895,16 @@
+ 	cols#80, it#8, lines#24,
+ 	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
+ 	     \263,
+-	bel=^G, clear=\Ec, cr=\r, cup=\E[%i%p1%d;%p2%dH,
+-	ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H,
+-	hpa=\E[%i%p1%dG, ind=\E[S\E[B, indn=\E[%p1%dS\E[%p1%dB,
+-	invis=\E[30;40m, kcbt=^], kdch1=^?, kend=\E[Y, kf1=\240,
+-	kf10=\251, kf2=\241, kf3=\242, kf4=\243, kf5=\244, kf6=\245,
+-	kf7=\246, kf8=\247, kf9=\250, kich1=\E[^H, knp=\E[U,
+-	kpp=\E[V, ll=\E[24;1H, nel=\r, rev=\E[7m, ri=\E[T\E[A,
+-	rin=\E[%p1%dT\E[%p1%dA,
++	bel=^G, clear=\Ec, cr=\r, ech=\E[%p1%dX, hpa=\E[%i%p1%dG,
++	ind=\E[S\E[B, indn=\E[%p1%dS\E[%p1%dB, invis=\E[30;40m,
++	kcbt=^], kdch1=^?, kend=\E[Y, kf1=\240, kf10=\251, kf2=\241,
++	kf3=\242, kf4=\243, kf5=\244, kf6=\245, kf7=\246, kf8=\247,
++	kf9=\250, kich1=\E[^H, knp=\E[U, kpp=\E[V, ll=\E[24;1H,
++	nel=\r, ri=\E[T\E[A, rin=\E[%p1%dT\E[%p1%dA,
+ 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
+ 	    %;%?%p7%t30;40%;m,
+-	sgr0=\E[m, use=ansi+arrows, use=ansi+local,
+-	use=ansi+sgrbold,
++	sgr0=\E[m, use=ansi+arrows, use=ansi+cup, use=ansi+erase,
++	use=ansi+local, use=ansi+sgrbold,
+ 
+ #### Apple II
+ #
+@@ -23116,13 +23227,12 @@
+ 	am, mir,
+ 	cols#80, it#8, lines#24,
+ 	clear=\E[H\E[2J, cnorm=\Ez56;2;0;0z\Ez73z\Ez4;1;1z,
+-	cr=\r, cub1=^H, cud=\E[%p1%dB, cup=\E[%i%p1%d;%p2%dH,
+-	cvvis=\Ez4;2;1z\Ez56;2;80;24z, dch1=\E[P, ed=\E[J,
+-	el=\E[K, home=\E[H, ht=^I, ind=\ED, kf1=\EOP, kf2=\EOQ,
+-	kf3=\EOR, kf4=\EOS, nel=\r\ED, rc=\E8, ri=\EM, rmdc=\E[4l,
+-	rmir=\E[4l, sc=\E7, sgr0=\E[m, smdc=\E[4h, smir=\E[4h,
+-	use=ansi+arrows, use=ansi+idl, use=ansi+local,
+-	use=ansi+sgrso,
++	cr=\r, cub1=^H, cvvis=\Ez4;2;1z\Ez56;2;80;24z, dch1=\E[P,
++	ht=^I, ind=\ED, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
++	nel=\r\ED, rc=\E8, ri=\EM, rmdc=\E[4l, rmir=\E[4l, sc=\E7,
++	sgr0=\E[m, smdc=\E[4h, smir=\E[4h, use=ansi+arrows,
++	use=ansi+cup, use=ansi+erase, use=ansi+idl,
++	use=ansi+local, use=ansi+sgrso,
+ 
+ graphos-30|graphos III with 30 lines,
+ 	lines#30,
+@@ -23324,9 +23434,8 @@
+ hirez100|Selanar HiREZ-100,
+ 	OTbs, OTpt, mir, msgr, xon,
+ 	OTkn#4, cols#80, it#8, lines#48, vt#3,
+-	acsc=, bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub=\E[%p1%dD,
+-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, cuu1=\EM,
+-	dch=\E[%p1%dP, dch1=\E[P, home=\E[H, ht=^I, hts=\EH,
++	acsc=, bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H,
++	cud1=\n, cuu1=\EM, dch=\E[%p1%dP, dch1=\E[P, ht=^I, hts=\EH,
+ 	is2=\E<\E)0, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
+ 	kcuu1=\EOA, kf0=\EOP, kf1=\EOQ, kf2=\EOR, kf3=\EOS, lf0=PF1,
+ 	lf1=PF2, lf2=PF3, lf3=PF4, ll=\E[48H, mc0=\E[i,
+@@ -23335,8 +23444,8 @@
+ 	rs1=\030\E2\E<\E[4i\E[?4i\E[12h\E[2;4;20l\E[?0;7h\E[?1;3;6;1
+ 	    9l\E[r\E[m\E(B\017\E)0\E>,
+ 	sc=\E7, sgr0=\E[m, smacs=^N, smkx=\E[?1h\E=, tbc=\E[3g,
+-	use=ansi+erase, use=ansi+idl, use=ansi+local,
+-	use=ansi+sgrso, use=ansi+sgrul,
++	use=ansi+cup, use=ansi+erase, use=ansi+idl,
++	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
+ 
+ hirez100-w|Selanar HiREZ-100 in 132-column mode,
+ 	cols#132, use=hirez100,
+@@ -27730,4 +27839,7 @@
+ # 2024-11-02
+ #	+ add extended-keys for djgpp 2.05 -TD
+ #
++# 2024-12-28
++#	+ add ghostty -TD
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20241221+/package/debian-mingw/changelog	2024-12-21 10:55:02.000000000 +0000
++++ ncurses-6.5-20241228/package/debian-mingw/changelog	2024-12-28 11:24:50.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241221) unstable; urgency=low
++ncurses6td (6.5+20241228) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 21 Dec 2024 05:50:45 -0500
++ -- Thomas E. Dickey   Sat, 28 Dec 2024 06:24:50 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20241221+/package/debian-mingw64/changelog	2024-12-21 10:55:02.000000000 +0000
++++ ncurses-6.5-20241228/package/debian-mingw64/changelog	2024-12-28 11:24:50.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241221) unstable; urgency=low
++ncurses6td (6.5+20241228) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 21 Dec 2024 05:50:45 -0500
++ -- Thomas E. Dickey   Sat, 28 Dec 2024 06:24:50 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20241221+/package/debian/changelog	2024-12-21 10:55:02.000000000 +0000
++++ ncurses-6.5-20241228/package/debian/changelog	2024-12-28 11:24:50.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241221) unstable; urgency=low
++ncurses6td (6.5+20241228) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 21 Dec 2024 05:50:45 -0500
++ -- Thomas E. Dickey   Sat, 28 Dec 2024 06:24:50 -0500
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.681 
+--- ncurses-6.5-20241221+/package/mingw-ncurses.nsi	2024-12-21 10:55:02.000000000 +0000
++++ ncurses-6.5-20241228/package/mingw-ncurses.nsi	2024-12-28 11:24:50.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.681 2024/12/21 10:55:02 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.682 2024/12/28 11:24:50 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "1221"
++!define VERSION_MMDD  "1228"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20241221+/package/mingw-ncurses.spec	2024-12-21 10:55:02.000000000 +0000
++++ ncurses-6.5-20241228/package/mingw-ncurses.spec	2024-12-28 11:24:50.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20241221
++Release: 20241228
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20241221+/package/ncurses.spec	2024-12-21 10:55:02.000000000 +0000
++++ ncurses-6.5-20241228/package/ncurses.spec	2024-12-28 11:24:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20241221
++Release: 20241228
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20241221+/package/ncursest.spec	2024-12-21 10:55:02.000000000 +0000
++++ ncurses-6.5-20241228/package/ncursest.spec	2024-12-28 11:24:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20241221
++Release: 20241228
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250104.patch b/packages/ncurses/6.5/ncurses-6.5-20250104.patch
new file mode 100644
index 0000000000..4876cf30f2
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250104.patch
@@ -0,0 +1,2275 @@
+# ncurses 6.5 - patch 20250104 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250104.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Jan  5 01:21:57 UTC 2025
+# ------------------------------------------------------------------------------
+# Ada95/package/debian/copyright        |    4 
+# COPYING                               |    4 
+# NEWS                                  |   14 
+# VERSION                               |    2 
+# dist.mk                               |    6 
+# include/nc_tparm.h                    |    5 
+# man/manlinks.sed                      |   43 +
+# misc/terminfo.src                     |  832 +++++++++++++-------------------
+# ncurses/base/MKlib_gen.sh             |   10 
+# package/debian-mingw/changelog        |    4 
+# package/debian-mingw/copyright        |    4 
+# package/debian-mingw64/changelog      |    4 
+# package/debian-mingw64/copyright      |    4 
+# package/debian/changelog              |    4 
+# package/debian/copyright              |    4 
+# package/mingw-ncurses.nsi             |    6 
+# package/mingw-ncurses.spec            |    2 
+# package/ncurses.spec                  |    2 
+# package/ncursest.spec                 |    2 
+# progs/tput.c                          |  136 ++---
+# test/package/debian-mingw/copyright   |    4 
+# test/package/debian-mingw64/copyright |    4 
+# test/package/debian/copyright         |    4 
+# 23 files changed, 527 insertions(+), 577 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/package/debian/copyright
+--- ncurses-6.5-20241228+/Ada95/package/debian/copyright	2024-01-05 21:16:17.000000000 +0000
++++ ncurses-6.5-20250104/Ada95/package/debian/copyright	2025-01-04 10:55:52.000000000 +0000
+@@ -4,12 +4,12 @@
+ 
+ -------------------------------------------------------------------------------
+ Files: *
+-Copyright: 2017-2023,2024 by Thomas E. Dickey
++Copyright: 2017-2024,2025 by Thomas E. Dickey
+ Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+ License: X11
+ 
+ Files: aclocal.m4 package
+-Copyright: 2010-2023,2024 by Thomas E. Dickey
++Copyright: 2010-2024,2025 by Thomas E. Dickey
+ License: X11
+ 
+     Permission is hereby granted, free of charge, to any person obtaining a
+Index: COPYING
+Prereq:  1.13 
+--- ncurses-6.5-20241228+/COPYING	2024-01-05 21:13:17.000000000 +0000
++++ ncurses-6.5-20250104/COPYING	2025-01-04 10:53:46.000000000 +0000
+@@ -1,4 +1,4 @@
+-Copyright 2018-2023,2024 Thomas E. Dickey
++Copyright 2018-2024,2025 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.13 2024/01/05 21:13:17 tom Exp $
++-- $Id: COPYING,v 1.14 2025/01/04 10:53:46 tom Exp $
+Index: NEWS
+Prereq:  1.4220 
+--- ncurses-6.5-20241228+/NEWS	2024-12-29 00:59:43.000000000 +0000
++++ ncurses-6.5-20250104/NEWS	2025-01-05 00:18:47.000000000 +0000
+@@ -1,5 +1,5 @@
+ -------------------------------------------------------------------------------
+--- Copyright 2018-2023,2024 Thomas E. Dickey                                 --
++-- Copyright 2018-2024,2025 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.4220 2024/12/29 00:59:43 tom Exp $
++-- $Id: NEWS,v 1.4226 2025/01/05 00:18:47 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.
+ 
++20250104
++	+ modify tput to warn about capabilities which expect parameters where
++	  none are given; also repair the feature where multiple capabilities
++	  can be handled on a single line.
++	+ cleanup use-clauses -TD
++	+ add linux+lockeys, xterm+r5+lockeys, xterm+r5+fkeys -TD
++	+ add vt220+ufkeys, vt220+sfkeys
++	+ revert man/manlinks.sed change, which loses aliases (cf: 20241228).
++	+ modify MKlib_gen.c to allow for Solaris's definition of NULL as 0L
++
+ 20241228
+ 	+ correct conditional-compile for a case when the C compiler does not
+ 	  have a bool type.
+Index: VERSION
+--- ncurses-6.5-20241228+/VERSION	2024-12-28 11:24:50.000000000 +0000
++++ ncurses-6.5-20250104/VERSION	2025-01-04 09:55:25.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20241228
++5:0:10	6.5	20250104
+Index: dist.mk
+Prereq:  1.1647 
+--- ncurses-6.5-20241228+/dist.mk	2024-12-28 11:24:50.000000000 +0000
++++ ncurses-6.5-20250104/dist.mk	2025-01-04 09:55:25.000000000 +0000
+@@ -1,5 +1,5 @@
+ ##############################################################################
+-# Copyright 2018-2023,2024 Thomas E. Dickey                                  #
++# Copyright 2018-2024,2025 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.1647 2024/12/28 11:24:50 tom Exp $
++# $Id: dist.mk,v 1.1649 2025/01/04 09:55:25 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 = 5
+-NCURSES_PATCH = 20241228
++NCURSES_PATCH = 20250104
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: include/nc_tparm.h
+Prereq:  1.12 
+--- ncurses-6.5-20241228+/include/nc_tparm.h	2023-04-16 17:57:28.000000000 +0000
++++ ncurses-6.5-20250104/include/nc_tparm.h	2025-01-04 23:42:30.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2025 Thomas E. Dickey                                *
+  * Copyright 2006-2012,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -31,7 +31,7 @@
+  *  Author: Thomas E. Dickey                        2006                    *
+  ****************************************************************************/
+ 
+-/* $Id: nc_tparm.h,v 1.12 2023/04/16 17:57:28 tom Exp $ */
++/* $Id: nc_tparm.h,v 1.13 2025/01/04 23:42:30 tom Exp $ */
+ 
+ #ifndef NC_TPARM_included
+ #define NC_TPARM_included 1
+@@ -88,6 +88,7 @@
+ #define TIPARM_7(s,a,b,c,d,e,f,g) _nc_tiparm(7,s,a,b,c,d,e,f,g)
+ #define TIPARM_8(s,a,b,c,d,e,f,g,h) _nc_tiparm(8,s,a,b,c,d,e,f,g,h)
+ #define TIPARM_9(s,a,b,c,d,e,f,g,h,i) _nc_tiparm(9,s,a,b,c,d,e,f,g,h,i)
++#define TIPARM_N(N,s,a,b,c,d,e,f,g,h,i) _nc_tiparm(N,s,a,b,c,d,e,f,g,h,i)
+ #endif
+ 
+ #endif /* NC_TPARM_included */
+Index: man/manlinks.sed
+Prereq:  1.23 
+--- ncurses-6.5-20241228+/man/manlinks.sed	2024-12-28 21:36:50.000000000 +0000
++++ ncurses-6.5-20250104/man/manlinks.sed	2024-12-29 11:34:59.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: manlinks.sed,v 1.23 2024/12/28 21:36:50 Branden.Robinson Exp $
++# $Id: manlinks.sed,v 1.24 2024/12/29 11:34:59 tom Exp $
+ ##############################################################################
+ # Copyright 2020-2023,2024 Thomas E. Dickey                                  #
+ # Copyright 2000-2003,2008 Free Software Foundation, Inc.                    #
+@@ -31,6 +31,9 @@
+ # listed in the "NAME" section, i.e., the names that we would like to use
+ # as aliases for the manpage -T.Dickey
+ #
++# workaround for manpages without a SYNOPSIS
++s/^\.\\"SH/.SH/
++#
+ # eliminate formatting controls that get in the way
+ /^'\\"/d
+ /\.\\"/d
+@@ -72,8 +75,42 @@
+ /g
+ }
+ #
+-# delete remainder of document
+-/^\.SH_([^N]/,${
++# in ".SH SYNOPSIS"
++# For readability, the NAME section may not contain all function names, but we
++# still want to make aliases for those.  Do this by extracting names from the
++# list of function prototypes in the synopsis.
++#
++# Remove any line that does not contain a '(', since we only want functions. 
++# then strip off return-type of each function.
++#
++# Finally, remove the parameter list, which begins with a '('.
++/^\.SH_(SYNOPSIS/,/^\.SH_(DESCRIPTION/{
++/^\.ti/d
++/^[^(]*$/d
++# reduce
++#	.B "int add_wch( const cchar_t *\fIwch\fB );"
++# to
++#	add_wch( const cchar_t *\fIwch\fB );"
++s/^\([^ (]* [^ (]* [*]*\)//g
++s/^\([^ (]* [*]*\)//g
++# trim blanks in case we have
++#	void (*) (FORM *) field_init(const FORM *form);
++s/) (/)(/g
++# reduce stuff like
++#	void (*)(FORM *) field_init(const FORM *form);
++# to
++#	field_init(const FORM *form);
++s/^\(([^)]*)\)\(([^)]*)\)*[ ]*//g
++# rename marker temporarily
++s/\.SH_(/.SH_/
++# kill lines with ");", and trim off beginning of argument list.
++s/[()].*//
++# rename marker back
++s/\.SH_/.SH_(/
++}
++#
++# delete ".SH DESCRIPTION" and following lines
++/^\.SH_(DESCRIPTION/,${
+ d
+ }
+ #
+Index: misc/terminfo.src
+--- ncurses-6.5-20241228+/misc/terminfo.src	2024-12-28 20:42:05.000000000 +0000
++++ ncurses-6.5-20250104/misc/terminfo.src	2025-01-04 21:02:11.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.1160 $
+-#	$Date: 2024/12/28 20:42:05 $
++#	$Revision: 1.1163 $
++#	$Date: 2025/01/04 21:02:11 $
+ #
+ # 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
+@@ -927,8 +927,7 @@
+ 	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
+ 	cup=\E[%i%p1%d;%p2%dH, ech=\E[%p1%dX, el1=\E[1K,
+ 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n,
+-	kf1=\E[11~, kf10=\E[20~, kf11=\E[21~, kf12=\E[22~,
+-	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[16~,
++	kf10=\E[20~, kf11=\E[21~, kf12=\E[22~, kf6=\E[16~,
+ 	kf7=\E[17~, kf8=\E[18~, kf9=\E[19~, khome=\E[1~, kspd=^Z,
+ 	nel=\r\n, op=\E[m, rev=\E[7m, ri=\EM, rmkx=\E[?4l, rmso=\E[m,
+ 	rmul=\E[24m, rs1=\Ec, setb=\E[%p1%{40}%+%cm,
+@@ -937,6 +936,7 @@
+ 	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
+ 	use=ansi+erase, use=ansi+idc, use=ansi+idl,
+ 	use=ansi+local, use=klone+color, use=vt220+pcedit,
++	use=xterm+r5+fkeys,
+ 
+ #### Linux consoles
+ #
+@@ -975,25 +975,29 @@
+ 	bel=^G, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
+ 	dim=\E[2m, ech=\E[%p1%dX, el1=\E[1K,
+ 	flash=\E[?5h$<200/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
+-	ht=^I, hts=\EH, ind=\n, kb2=\E[G, kbs=^?, kcbt=\E[Z, kf1=\E[[A,
+-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\E[[B,
+-	kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~,
+-	kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kmous=\E[M, kspd=^Z,
+-	nel=\r\n, ri=\EM, rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m,
+-	rs1=\Ec\E]R,
++	ht=^I, hts=\EH, ind=\n, kb2=\E[G, kbs=^?, kcbt=\E[Z,
++	khome=\E[1~, kmous=\E[M, kspd=^Z, nel=\r\n, ri=\EM,
++	rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]R,
+ 	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
+ 	    %t;2%;%?%p6%t;1%;%?%p9%t;11%;m,
+ 	smam=\E[?7h, tbc=\E[3g, vpa=\E[%i%p1%dd, use=ansi+arrows,
+ 	use=ansi+csr, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+ 	use=ansi+local, use=vt220+pcedit, use=vt102+enq,
+-	use=klone+sgr, use=ecma+color, use=linux+sfkeys,
++	use=klone+sgr, use=ecma+color, use=linux+lockeys,
++	use=linux+sfkeys, use=vt220+ufkeys,
++
++# VT220 uses F1-F5 for "local" manipulation, normally not sending anything to
++# the host.  Rather than adapt the numbering scheme used by xterm, Linux used
++# this arrangement which doubles the "[", making it inconsistent with most
++# terminals having function-keys in the same format as control sequences -TD
++linux+lockeys|Linux "local" keys in vt220 scheme,
++	kf1=\E[[A, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E,
+ 
+ linux+decid|ncurses extension for Linux console DECID,
+ 	u8=\E[?6c, use=decid+cpr,
+ 
+ linux+sfkeys|shifted function-keys for Linux console,
+-	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
+-	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf20=\E[34~,
++	use=vt220+sfkeys,
+ 
+ linux-m|Linux console no color,
+ 	colors@, pairs@,
+@@ -1146,26 +1150,23 @@
+ #
+ # Note: The status-line support is buggy (dsl does not work).
+ kon|kon2|Kanji ON Linux console,
+-	am, bce, ccc, eo, eslok, hs, mir, msgr, xenl, xon,
++	am, bce, ccc, eo, mir, msgr, xenl, xon,
+ 	it#8, ncv#18,
+ 	bel=^G, civis=\E[?25l, cnorm=\E[?25h, cr=\r, cub1=^H,
+ 	cud1=\n, dim=\E[2m, dsl=\E[?H\E[?E, el1=\E[1K, fsl=\E[?F,
+-	hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n,
++	ht=^I, hts=\EH, ind=\n,
+ 	initc=\E]P%p1%x%p2%02x%p3%02x%p4%02x, kb2=\E[G, kbs=^?,
+-	kf1=\E[[A, 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=\E[[B,
+-	kf20=\E[34~, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~,
+-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kspd=^Z,
+-	nel=\r\n, op=\E[37;40m, ri=\EM, rmso=\E[27m, rmul=\E[24m,
+-	rs1=\Ec,
++	khome=\E[1~, kspd=^Z, nel=\r\n, ri=\EM, rmso=\E[27m,
++	rmul=\E[24m, rs1=\Ec,
+ 	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
+ 	    %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
+ 	sgr0=\E[0;10m, tbc=\E[3g, tsl=\E[?T, u8=\E[?6c,
+-	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
+-	use=ansi+cup, use=ansi+enq, use=ansi+erase, use=ansi+idc,
+-	use=ansi+idl, use=ansi+local, use=ansi+sgrbold,
+-	use=ecma+sgr, use=klone+color, use=vt220+pcedit,
++	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
++	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
++	use=ansi+local, use=ansi+sgrbold, use=ansi+rca2,
++	use=dec+sl, use=ecma+sgr, use=klone+color,
++	use=linux+lockeys, use=linux+sfkeys, use=vt220+ufkeys,
++	use=vt220+pcedit,
+ 
+ # release: 0.4.7 2005/05
+ #
+@@ -1237,16 +1238,12 @@
+ 	acsc=aajjkkllmmqqttuuxx, bold=\E[1m, clear=\E[H\E[2J,
+ 	cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, ed=\E[J,
+ 	el=\E[K, home=\E[H, ind=\n, kb2=\E[G, kbs=^?, kcbt=\E[Z,
+-	kf1=\E[[A, 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=\E[[B,
+-	kf20=\E[34~, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~,
+-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~,
+-	kmous=\E[M, kspd=^Z, nel=\r\n, op=\E[49m\E[39m, rev=\E[7m,
+-	ri=\EM, rmacs=^O, rmso=\E[27m, rmul=\E[24m,
+-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[0m, smacs=^N,
+-	smso=\E[7m, smul=\E[4m, use=ansi+arrows,
+-	use=vt220+pcedit, use=vt220+cvis,
++	khome=\E[1~, kmous=\E[M, kspd=^Z, nel=\r\n,
++	op=\E[49m\E[39m, rev=\E[7m, ri=\EM, rmacs=^O, rmso=\E[27m,
++	rmul=\E[24m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
++	sgr0=\E[0m, smacs=^N, smso=\E[7m, smul=\E[4m,
++	use=ansi+arrows, use=linux+lockeys, use=linux+sfkeys,
++	use=vt220+pcedit, use=vt220+cvis, use=vt220+ufkeys,
+ 
+ #### Mach
+ #
+@@ -1327,14 +1324,10 @@
+ 	bel=^G, cbt=\E[Z, clear=\Ec, cr=\r, cub1=^H, cvvis=\E[34l,
+ 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX,
+ 	el1=\E[1K, flash=\Eg, ht=^I, ich=\E[%p1%d@, ind=\E[S,
+-	kb2=\E[G, kbs=^?, kcbt=\E[Z, 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, kf20=\E[34~, kf3=\EOR, kf4=\EOS,
+-	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+-	khome=\E[1~, kmous=\E[M, kspd=^Z, nel=\r\n, op=\E[39;49m,
+-	ri=\E[T, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
+-	rs1=\EM\E[?1000l,
++	kb2=\E[G, kbs=^?, kcbt=\E[Z, kf1=\EOP, kf2=\EOQ, kf3=\EOR,
++	kf4=\EOS, khome=\E[1~, kmous=\E[M, kspd=^Z, nel=\r\n,
++	op=\E[39;49m, ri=\E[T, rmir=\E[4l, rmso=\E[27m,
++	rmul=\E[24m, rs1=\EM\E[?1000l,
+ 	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;
+ 	    2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
+ 	smir=\E[4h, grbom=\E[>1l, gsbom=\E[>1h,
+@@ -1342,7 +1335,8 @@
+ 	use=ansi+erase, use=ansi+idl, use=ansi+local,
+ 	use=ansi+rca2, use=ansi+sgrbold, use=vt220+pcedit,
+ 	use=ecma+index, use=ecma+italics, use=klone+acs,
+-	use=klone+color, use=vt220+cvis,
++	use=klone+color, use=linux+sfkeys, use=xterm+r5+fkeys,
++	use=vt220+cvis,
+ 
+ #### QNX
+ #
+@@ -1674,14 +1668,10 @@
+ #		CSI ? 5 h Reverse Video (DECSCNM).
+ #
+ pccon+keys|OpenBSD PC keyboard keys,
+-	kbs=^?, kend=\E[8~, kent=\r, kf1=\E[11~, 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=\E[12~, kf20=\E[34~, kf21=\E[35~,
+-	kf22=\E[36~, kf23=\E[37~, kf24=\E[38~, kf3=\E[13~,
+-	kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
+-	kf9=\E[20~, khome=\E[7~, krfr=^R, use=ansi+arrows,
+-	use=vt220+pcedit,
++	kbs=^?, kend=\E[8~, kent=\r, kf21=\E[35~, kf22=\E[36~,
++	kf23=\E[37~, kf24=\E[38~, khome=\E[7~, krfr=^R,
++	use=ansi+arrows, use=vt220+pcedit, use=vt220+sfkeys,
++	use=xterm+r5+fkeys,
+ pccon+sgr+acs0|sgr and simple ASCII pseudographics for OpenBSD PC console,
+ 	acsc=+>\,<-\^.v0#`+a:f\\h#i#j+k+l+m+n+o~p-q-r-s_t+u+v+w+x|y#
+ 	     z#{*|!}#~o,
+@@ -1806,11 +1796,9 @@
+ 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~,
+-	kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
+-	kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf5=\E[17~,
++	kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[17~,
+ 	kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, kf9=\E[21~, use=pcvtXX,
+-	use=ecma+color,
++	use=ecma+color, use=vt220+sfkeys,
+ 
+ # Terminfo entries to enable the use of the ncurses library in colour on a
+ # NetBSD-arm32 console (only tested on a RiscPC).
+@@ -1884,10 +1872,9 @@
+ wsvt25|NetBSD wscons in 25 line DEC VT220 mode,
+ 	bce,
+ 	colors#8, lines#25, pairs#64,
+-	is2=\E[r\E[25;1H, kdch1=\E[3~, kend=\E[8~, kf1=\E[11~,
+-	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
+-	khome=\E[7~, op=\E[m, rs1=\Ec, setab=\E[4%p1%dm,
+-	setaf=\E[3%p1%dm, use=vt220,
++	is2=\E[r\E[25;1H, kdch1=\E[3~, kend=\E[8~, khome=\E[7~,
++	op=\E[m, rs1=\Ec, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
++	use=xterm+r5+lockeys, use=vt220,
+ 
+ wsvt25m|NetBSD wscons in 25 line DEC VT220 mode with Meta,
+ 	km, use=wsvt25,
+@@ -2198,10 +2185,8 @@
+ 	use=ansi+tabs, use=klone+color,
+ 
+ teken-vt+fkeys|teken's xterm special keys,
+-	kend=\E[F, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
+-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~, kf6=\E[17~,
+-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[H,
+-	use=vt220+pcedit,
++	kend=\E[F, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
++	khome=\E[H, use=vt220+pcedit, use=xterm+r5+fkeys,
+ 
+ teken-sc+fkeys|teken's syscons special keys,
+ 	kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W,
+@@ -2708,20 +2693,19 @@
+ 	enacs=\E)0, flash=\E[?5h$<200/>\E[?5l, ht=^I, hts=\EH,
+ 	ich=\E[%p1%d@, if=/usr/share/tabset/vt100, ind=\ED,
+ 	is2=\E[?7h\E[>\E[?1l\E F\E[?4l, kbs=^H, kcub1=\E[D,
+-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf10=\E[21~,
+-	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
+-	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\EOQ,
+-	kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf6=\E[17~, kf7=\E[18~,
+-	kf8=\E[19~, kf9=\E[20~, khlp=\E[28~, krdo=\E[29~, lf1=pf1,
+-	lf2=pf2, lf3=pf3, lf4=pf4, nel=\EE, rev=\E[7m, ri=\EM,
+-	rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, rmso=\E[27m,
+-	rmul=\E[24m, rs1=\E[?3l,
++	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf13=\E[25~,
++	kf14=\E[26~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
++	kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS, khlp=\E[28~,
++	krdo=\E[29~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, nel=\EE,
++	rev=\E[7m, ri=\EM, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l,
++	rmso=\E[27m, rmul=\E[24m, rs1=\E[?3l,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
+ 	    %p9%t\E(0%e\E(B%;$<2>,
+ 	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=ansi+csr,
+ 	use=ansi+cup, use=ansi+pp, use=ansi+enq, use=ansi+erase,
+ 	use=ansi+idl, use=ansi+local, use=vt220+vtedit,
++	use=vt220+ufkeys,
+ 
+ vt220|vt200|DEC VT220,
+ 	use=vt220+cvis, use=vt220-base,
+@@ -2766,10 +2750,17 @@
+ # See vt220 for an alternate mapping.
+ #
+ 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,
++	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf5@, kf6=\E[17~,
++	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, use=vt220+sfkeys,
++	use=vt220-old,
++
++# These are often mapped to unshifted/shifted keys on PC-keyboards -TD
++vt220+ufkeys|first 8 function-keys for VT220,
++	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf5@, kf6=\E[17~,
++	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
++vt220+sfkeys|second 8 function-keys for VT220,
++	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
++	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf20=\E[34~,
+ 
+ vt220-nam|v200-nam|VT220 in VT100 mode with no auto margins,
+ 	am@,
+@@ -2836,27 +2827,23 @@
+ 	cols#80, lines#24, wsl#80,
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
+-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
+-	dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
+-	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\ED,
++	cub1=^H, cud1=\n, dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX,
++	el1=\E[1K, ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\ED,
+ 	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H,
+-	kbs=^?, kdch1=\E[3~, kel=\E[4~, 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~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
+-	kf9=\E[20~, khome=\E[1~, kich1=\E[2~, knp=\E[6~, knxt=^I,
+-	kpp=\E[5~, kprv=\E[Z, kslt=\E[4~, nel=\EE, rev=\E[7m,
++	kbs=^?, kdch1=\E[3~, kel=\E[4~, kf12=\E[24~, khome=\E[1~,
++	kich1=\E[2~, knp=\E[6~, knxt=^I, kpp=\E[5~, kprv=\E[Z,
++	kslt=\E[4~, nel=\EE, rev=\E[7m,
+ 	rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B,
+-	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m,
+-	rmul=\E[m,
++	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>,
+ 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
+ 	    %p9%t\E(0%e\E(B%;$<2>,
+ 	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
+-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+-	use=ansi+apparrows, use=ansi+csr, use=ansi+enq,
+-	use=ansi+idl, use=ansi+local, use=dec+pp, use=vt220+cvis,
+-	use=vt220+keypad, use=dec+sl,
++	smkx=\E[?1h\E=, tbc=\E[3g, use=ansi+apparrows,
++	use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+erase,
++	use=ansi+idl, use=ansi+local, use=ansi+sgrso,
++	use=ansi+sgrul, use=dec+pp, use=dec+sl, use=vt220+cvis,
++	use=vt220+keypad, use=vt220+sfkeys, use=vt220+ufkeys,
+ 
+ vt320-nam|vt300-nam|DEC VT320 7 bit terminal with no am to make SAS happy,
+ 	am@,
+@@ -3015,24 +3002,24 @@
+ # application has to know it.
+ #
+ vt420pc|DEC VT420 w/PC keyboard,
+-	kdch1=^?, kend=\E[4~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
++	kdch1=^?, kend=\E[4~, kf10=\E[21~, kf11=\E[23~,
+ 	kf12=\E[24~, kf13=\E[11;2~, kf14=\E[12;2~, kf15=\E[13;2~,
+ 	kf16=\E[14;2~, kf17=\E[15;2~, kf18=\E[17;2~,
+-	kf19=\E[18;2~, kf2=\E[12~, kf20=\E[19;2~, kf21=\E[20;2~,
++	kf19=\E[18;2~, kf20=\E[19;2~, kf21=\E[20;2~,
+ 	kf22=\E[21;2~, kf23=\E[23;2~, kf24=\E[24;2~, kf25=\E[23~,
+ 	kf26=\E[24~, kf27=\E[25~, kf28=\E[26~, kf29=\E[28~,
+-	kf3=\E[13~, kf30=\E[29~, kf31=\E[31~, kf32=\E[32~,
+-	kf33=\E[33~, kf34=\E[34~, kf35=\E[35~, kf36=\E[36~,
+-	kf37=\E[23;2~, kf38=\E[24;2~, kf39=\E[25;2~, kf4=\E[14~,
+-	kf40=\E[26;2~, kf41=\E[28;2~, kf42=\E[29;2~,
+-	kf43=\E[31;2~, kf44=\E[32;2~, kf45=\E[33;2~,
+-	kf46=\E[34;2~, kf47=\E[35;2~, kf48=\E[36;2~, kf5=\E[15~,
+-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[H,
++	kf30=\E[29~, kf31=\E[31~, kf32=\E[32~, kf33=\E[33~,
++	kf34=\E[34~, kf35=\E[35~, kf36=\E[36~, kf37=\E[23;2~,
++	kf38=\E[24;2~, kf39=\E[25;2~, kf40=\E[26;2~,
++	kf41=\E[28;2~, kf42=\E[29;2~, kf43=\E[31;2~,
++	kf44=\E[32;2~, kf45=\E[33;2~, kf46=\E[34;2~,
++	kf47=\E[35;2~, kf48=\E[36;2~, kf6=\E[17~, kf7=\E[18~,
++	kf8=\E[19~, kf9=\E[20~, khome=\E[H,
+ 	pctrm=USR_TERM:vt420pcdos:,
+ 	pfx=\EP1;1|%?%{16}%p1%>%t%{0}%e%{21}%p1%>%t%{1}%e%{25}%p1%>
+ 	    %t%{2}%e%{27}%p1%>%t%{3}%e%{30}%p1%>%t%{4}%e%{5}%;%p1%+
+ 	    %d/%p2%s\E\\,
+-	use=vt420,
++	use=xterm+r5+lockeys, use=vt420,
+ 
+ vt420pcdos|DEC VT420 w/PC for DOS Merge,
+ 	lines#25,
+@@ -3043,12 +3030,8 @@
+ 	sgr0=\E[m, smsc=\E[?1;2r\E[34h, use=vt420pc,
+ 
+ vt420f|DEC VT420 with VT kbd; VT400 mode; F1-F5 used as Fkeys,
+-	kdch1=^?, kf1=\E[11~, 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=\E[12~, kf20=\E[34~, kf3=\E[13~, kf4=\E[14~,
+-	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+-	khome=\E[H, lf1=\EOP, lf2=\EOQ, lf3=\EOR, lf4=\EOS,
++	kdch1=^?, kf10=\E[21~, khome=\E[H, lf1=\EOP, lf2=\EOQ,
++	lf3=\EOR, lf4=\EOS, use=vt220+sfkeys, use=xterm+r5+fkeys,
+ 	use=vt420,
+ 
+ vt510|DEC VT510,
+@@ -3456,13 +3439,11 @@
+ nsterm-16color|AppKit Terminal.app v240.2+ with Mac OS X version 10.5,
+ 	bw@, mir, npc,
+ 	flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG,
+-	kdch1=\E[3~, kend=\E[F, 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[22~, kf19=\E[33~,
+-	kf20=\E[34~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
+-	kf8=\E[19~, kf9=\E[20~, khome=\E[H, knp=\E[6~, kpp=\E[5~,
+-	vpa=\E[%i%p1%dd, kLFT5=\E[5D, kRIT5=\E[5C, use=ansi+idc,
+-	use=xterm+alt47, use=nsterm-c-s-acs, use=vt220+cvis,
++	kdch1=\E[3~, kend=\E[F, kf18=\E[22~, kf5=\E[15~,
++	khome=\E[H, knp=\E[6~, kpp=\E[5~, vpa=\E[%i%p1%dd,
++	kLFT5=\E[5D, kRIT5=\E[5C, use=ansi+idc, use=vt220+cvis,
++	use=vt220+sfkeys, use=vt220+ufkeys, use=xterm+alt47,
++	use=nsterm-c-s-acs,
+ 
+ # The versions of Terminal.app in Mac OS X version 10.3.x seem to have
+ # the background color erase feature. The newer version 240.2 in Mac OS X
+@@ -3636,9 +3617,7 @@
+ 	cup=\E[%i%p1%d;%p2%dH, el1=\E[1K,
+ 	flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG,
+ 	kLFT=\E[1;2D, kRIT=\E[1;2C, kbs=^?, kcbt=\E[Z, kdch1=\E[3~,
+-	kend=\EOF, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
+-	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+-	knp=\E[6~, kpp=\E[5~, op=\E[0m, rev=\E[7m, ri=\EM,
++	kend=\EOF, knp=\E[6~, kpp=\E[5~, op=\E[0m, rev=\E[7m, ri=\EM,
+ 	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?
+ 	    %p9%t\016%e\017%;,
+@@ -3647,8 +3626,9 @@
+ 	kHOM5=\E[1;5H, use=ansi+apparrows, use=ansi+csr,
+ 	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+ 	use=ansi+local, use=vt100+4bsd, use=vt100+keypad,
+-	use=vt100+pfkeys, use=xterm+alt47, use=xterm+sl-twm,
+-	use=xterm+x11mouse, use=xterm+256setaf, use=vt220+cvis,
++	use=vt100+pfkeys, use=xterm+r5+fkeys, use=xterm+alt47,
++	use=xterm+sl-twm, use=xterm+x11mouse,
++	use=xterm+256setaf, use=vt220+cvis,
+ 
+ # iTerm2
+ #
+@@ -4276,11 +4256,7 @@
+ 	use=putty+fnkeys+esc,
+ 
+ putty+fnkeys+esc|ESC[n~ fn-keys for PuTTY,
+-	kf1=\E[11~, 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=\E[12~,
+-	kf20=\E[34~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
+-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
++	use=vt220+sfkeys, use=xterm+r5+fkeys,
+ 
+ putty+fnkeys+linux|Linux fn-keys for PuTTY,
+ 	kf1=\E[[A, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E,
+@@ -4435,16 +4411,14 @@
+ 	blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cuf1=\E[C,
+ 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP,
+ 	dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
+-	flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG, kf1=\E[11~,
+-	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=\E[12~, kf20=\E[34~,
+-	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
+-	kf8=\E[19~, kf9=\E[20~, op=\E[100m, rev=\E[7m, ri=\EM,
+-	rmso=\E[27m, rmul=\E[24m, sgr0=\E[0m\017, smso=\E[7m,
+-	smul=\E[4m, vpa=\E[%i%p1%dd, use=ansi+idl,
+-	use=vt220+vtedit, use=vt100+enq, use=klone+color,
+-	use=vt100, use=vt220+cvis,
++	flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG,
++	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf6=\E[17~,
++	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, op=\E[100m, rev=\E[7m,
++	ri=\EM, rmso=\E[27m, rmul=\E[24m, sgr0=\E[0m\017,
++	smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd,
++	use=xterm+r5+lockeys, use=ansi+idl, use=vt220+vtedit,
++	use=vt100+enq, use=klone+color, use=vt100,
++	use=vt220+cvis, use=vt220+sfkeys,
+ 
+ # Version 4.59 has regular VT100 line-drawing (so it is no longer necessary
+ # to choose a Windows OEM font).
+@@ -4882,18 +4856,23 @@
+ 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+ 	cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+ 	hts=\EH, ind=\n, kdl1=\E[31~, kel=\E[8~, kf0=\EOq,
+-	kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
+-	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~,
+-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~,
+-	kil1=\E[30~, kmous=\E[M, rev=\E[7m, ri=\EM, rmkx=\E[?1l\E>,
+-	rmso=\E[m, rmul=\E[m,
++	khome=\E[1~, kil1=\E[30~, kmous=\E[M, rev=\E[7m, ri=\EM,
++	rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+ 	rs2=\E>\E[?1;3;4;5;6l\E[4l\E[?7h\E[m\E[r\E[2J\E[H,
+ 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
+ 	    %;m,
+ 	sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+ 	tbc=\E[3g, use=xterm+kbs, use=ansi+apparrows,
+ 	use=ansi+csr, use=ansi+idc, use=ansi+idl, use=ansi+local,
+-	use=vt220+pcedit, use=vt100+enq,
++	use=vt220+pcedit, use=vt100+enq, use=xterm+r5+fkeys,
++
++# X11R5 used function-keys based on, but different from VT220, assigning keys
++# F1-R5 (unlike VT220), and limiting to F12 (perhaps influenced by other
++# keyboards).
++xterm+r5+fkeys|VT220-like function keys in X11R5 xterm,
++	use=xterm+r5+lockeys, use=vt220+ufkeys,
++xterm+r5+lockeys|XTerm "local" keys in vt220 scheme,
++	kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
+ 
+ # Compatible with the R6 xterm
+ # (from XFree86 3.2 distribution,  and  added,  removed)
+@@ -4907,19 +4886,16 @@
+ 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+ 	dch=\E[%p1%dP, dch1=\E[P, enacs=\E)0, ht=^I, hts=\EH, ind=\n,
+ 	is2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8,
+-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\E[11~,
+-	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=\E[12~, kf20=\E[34~,
+-	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
+-	kf8=\E[19~, kf9=\E[20~, kmous=\E[M, meml=\El, memu=\Em,
+-	rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l, rmkx=\E[?1l\E>,
++	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kmous=\E[M,
++	meml=\El, memu=\Em, rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l,
++	rmkx=\E[?1l\E>,
+ 	rs2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8,
+ 	sgr0=\E[m, smacs=^N, smir=\E[4h, smkx=\E[?1h\E=, tbc=\E[3g,
+ 	use=xterm+alt47, use=ansi+csr, use=ansi+cup,
+ 	use=ansi+erase, use=ansi+idl, use=ansi+local,
+ 	use=ansi+sgrso, use=ansi+sgrul, use=vt220+vtedit,
+-	use=xterm+kbs, use=vt100+enq,
++	use=xterm+kbs, use=vt100+enq, use=vt220+sfkeys,
++	use=xterm+r5+fkeys,
+ 
+ xterm-old|antique xterm version,
+ 	use=xterm-r6,
+@@ -4943,14 +4919,10 @@
+ 	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l,
+ 	home=\E[H, hpa=\E[%i%p1%dG, ind=\n,
+ 	is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>,
+-	kbeg=\EOE, kbs=^?, kdch1=^?, kend=\EOF, kf1=\E[11~,
+-	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=\E[12~, kf20=\E[34~,
+-	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
+-	kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~, kmous=\E[M, kslt=\E[4~,
+-	meml=\El, memu=\Em, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l,
+-	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=^O,
++	kbeg=\EOE, kbs=^?, kdch1=^?, kend=\EOF, kfnd=\E[1~,
++	kmous=\E[M, kslt=\E[4~, meml=\El, memu=\Em, rev=\E[7m,
++	ri=\EM, rmacs=^O, rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m,
++	rmul=\E[24m, rs1=^O,
+ 	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>,
+ 	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
+ 	     %=%t3%e%p1%d%;m,
+@@ -4963,8 +4935,8 @@
+ 	use=ansi+apparrows, use=ansi+csr, use=ansi+idc,
+ 	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+ 	use=xterm+alt47, use=xterm+kbs, use=vt100+enq,
+-	use=ecma+color, use=vt220+cvis, use=vt220+keypad,
+-	use=vt220+pcedit,
++	use=xterm+r5+fkeys, use=ecma+color, use=vt220+cvis,
++	use=vt220+keypad, use=vt220+pcedit, use=vt220+sfkeys,
+ 
+ # This is the stock xterm entry supplied with XFree86 3.3, which uses VT100
+ # codes for F1-F4 except while in VT220 mode.
+@@ -5095,17 +5067,13 @@
+ # kf21 control f1       = \E[42~
+ # kf31 shift control f1 = \E[52~
+ xterm+nopcfkeys|fragment without PC-style fkeys,
+-	kf1=\E[11~, 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=\E[12~,
+-	kf20=\E[34~, kf21=\E[42~, kf22=\E[43~, kf23=\E[44~,
+-	kf24=\E[45~, kf25=\E[46~, kf26=\E[47~, kf27=\E[48~,
+-	kf28=\E[49~, kf29=\E[50~, kf3=\E[13~, kf30=\E[51~,
+-	kf31=\E[52~, kf32=\E[53~, kf33=\E[54~, kf34=\E[55~,
+-	kf35=\E[56~, kf36=\E[57~, kf37=\E[58~, kf38=\E[59~,
+-	kf39=\E[60~, kf4=\E[14~, kf40=\E[61~, kf41=\E[62~,
+-	kf42=\E[63~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
+-	kf8=\E[19~, kf9=\E[20~,
++	kf21=\E[42~, kf22=\E[43~, kf23=\E[44~, kf24=\E[45~,
++	kf25=\E[46~, kf26=\E[47~, kf27=\E[48~, kf28=\E[49~,
++	kf29=\E[50~, kf30=\E[51~, kf31=\E[52~, kf32=\E[53~,
++	kf33=\E[54~, kf34=\E[55~, kf35=\E[56~, kf36=\E[57~,
++	kf37=\E[58~, kf38=\E[59~, kf39=\E[60~, kf40=\E[61~,
++	kf41=\E[62~, kf42=\E[63~, use=vt220+sfkeys,
++	use=xterm+r5+fkeys,
+ 
+ vt100+noapp|fragment with cursor keys in normal mode,
+ 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+@@ -5250,8 +5218,7 @@
+ 	use=xterm+pc+edit, use=vt220+pcedit,
+ 
+ xterm+decedit|fragment for vt220 6-key editing-keypad,
+-	kdch1=\E[3~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
+-	use=xterm+vt+edit,
++	use=vt220+vtedit, use=xterm+vt+edit,
+ 
+ xterm+pc+edit|fragment for pc-style editing keypad,
+ 	kend=\E[4~, khome=\E[1~,
+@@ -5699,14 +5666,11 @@
+ #
+ xterm-vt220|xterm emulating VT220,
+ 	npc,
+-	kcbt=\E[Z, kend=\E[4~, 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=\E[15~, kf6=\E[17~, kf7=\E[18~,
+-	kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kmous=\E[M, nel=\EE,
++	kcbt=\E[Z, kend=\E[4~, khome=\E[1~, kmous=\E[M, nel=\EE,
+ 	use=xterm+app, use=xterm+edit, use=vt220+keypad,
+ 	use=ecma+italics, use=ecma+index, use=ansi+rep,
+-	use=ecma+strikeout, use=xterm+focus, use=xterm+sm+1006,
++	use=ecma+strikeout, use=vt220+sfkeys,
++	use=xterm+r5+fkeys, use=xterm+focus, use=xterm+sm+1006,
+ 	use=xterm+tmux, use=xterm+keypad, use=xterm-basic,
+ 
+ xterm-vt52|xterm emulating DEC VT52,
+@@ -6090,20 +6054,18 @@
+ 	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, ed=\E[J,
+ 	el=\E[K, el1=\E[1K, enacs=\E(B\E)0, home=\E[H, ht=^I,
+ 	ich=\E[%p1%d@, ind=\n, is1=\E[r\E[m\E[?7h\E[?4;6l\E[4l,
+-	kend=\E[8~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
+-	kf12=\E[24~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
+-	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+-	khome=\E[7~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~,
+-	rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l,
+-	rmcup=\E>\E[?41;1r, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
++	kend=\E[8~, khome=\E[7~, kich1=\E[2~, kmous=\E[M,
++	knp=\E[6~, kpp=\E[5~, rev=\E[7m, ri=\EM, rmacs=^O,
++	rmam=\E[?7l, rmcup=\E>\E[?41;1r, rmir=\E[4l, rmso=\E[27m,
++	rmul=\E[24m,
+ 	rs1=\E(B\017\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E<,
+ 	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[0m\017, smacs=^N, smam=\E[?7h,
+ 	smcup=\E[?1;41s\E[?1;41h\E=, smir=\E[4h, smso=\E[7m,
+-	smul=\E[4m, use=ansi+apparrows, use=ansi+csr,
+-	use=ansi+idl, use=ansi+local, use=decid+cpr,
+-	use=ecma+color, use=vt220+keypad,
++	smul=\E[4m, use=xterm+r5+fkeys, use=ansi+apparrows,
++	use=ansi+csr, use=ansi+idl, use=ansi+local,
++	use=decid+cpr, use=ecma+color, use=vt220+keypad,
+ 
+ # The IRAF source has a terminfo using "xterm-r5", but line-drawing does not
+ # work in that case.  This entry uses xterm+acs, to work around that problem.
+@@ -6620,11 +6582,10 @@
+ # 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,
+-	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~, kf5=\E[15~,
+-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[H,
+-	use=konsole-base,
++	kend=\E[F, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13@,
++	kf14@, kf15@, kf16@, kf17@, kf18@, kf19@, kf20@, kf6=\E[17~,
++	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[H,
++	use=xterm+r5+lockeys, use=konsole-base,
+ 
+ # 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
+@@ -7271,21 +7232,17 @@
+ 	dim=\E[2m, ech=\E[%p1%dX, enacs=\E(B\E)0, home=\E[H,
+ 	hpa=\E[%i%p1%d`, ht=^I, ich1=, ind=\E[S, is2=\E)0\E[r\017,
+ 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+-	kf1=\E[11~, 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=\E[12~,
+-	kf20=\E[34~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
+-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, nel=\EE,
+-	op=\E[0m, ri=\E[T, rmacs=^O, rmam=\E[?7l, rmkx=\E[?1l\E>,
+-	rmso=\E[27m, rmul=\E[24m, setab=\E[4%p1%dm,
+-	setaf=\E[3%p1%dm,
++	nel=\EE, op=\E[0m, ri=\E[T, rmacs=^O, rmam=\E[?7l,
++	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
++	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
+ 	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=,
+ 	vpa=\E[%i%p1%dd, use=ansi+cpr, use=ansi+csr,
+ 	use=ansi+erase, use=ansi+idc1, use=ansi+idl,
+ 	use=ansi+local, use=ansi+sgrbold, use=vt220+vtedit,
+-	use=ecma+index, use=vt220+cvis,
++	use=ecma+index, use=vt220+cvis, use=vt220+sfkeys,
++	use=xterm+r5+fkeys,
+ 
+ #### VWM
+ # http://vwm.sourceforge.net/
+@@ -7300,9 +7257,7 @@
+ 	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
+ 	cvvis=\E[?25h, dim=\E[2m, home=\E[H, il1=\E[L, ind=\n,
+ 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+-	kdch1=\E[3~, kend=\E[4~, kf1=\E[[A, kf10=\E[21~,
+-	kf11=\E[22~, kf12=\E[23~, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D,
+-	kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
++	kdch1=\E[3~, kend=\E[4~, kf11=\E[22~, kf12=\E[23~,
+ 	khome=\E[1~, knp=\E[6~, kpp=\E[5~, rmacs=\E[10m,
+ 	rmam=\E[?7l, rs1=\E[H\E[J\E[m\Ec, setab=\E[4%p1%dm,
+ 	setaf=\E[3%p1%dm,
+@@ -7310,7 +7265,8 @@
+ 	    %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
+ 	sgr0=\E[0;10m, smacs=\E[11m, smam=\E[?7h, smso=\E[3m,
+ 	smul=\E[4m, use=ansi+erase, use=ansi+local, use=ansi+sgr,
+-	use=vt220+cvis, use=xterm+alt1049,
++	use=linux+lockeys, use=vt220+cvis, use=vt220+ufkeys,
++	use=xterm+alt1049,
+ 
+ #### MGR
+ #
+@@ -7341,10 +7297,8 @@
+ 	kopn=\E[198z, kpp=\E[216z, kund=\E[195z, use=mgr,
+ mgr-linux|Mgr window with Linux keyboard,
+ 	ka1=\E[H, ka3=\E[5~, kb2=\E[G, kc1=\E[Y, kc3=\E[6~,
+-	kdch1=\E[3~, kend=\E[4~, kf0=\E[[J, kf1=\E[[A, kf10=\E[21~,
+-	kf11=\E[23~, kf12=\E[24~, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D,
+-	kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+-	khome=\E[1~, knp=\E[6~, kpp=\E[5~, use=mgr,
++	kdch1=\E[3~, kend=\E[4~, kf0=\E[[J, khome=\E[1~, knp=\E[6~,
++	kpp=\E[5~, use=linux+lockeys, use=vt220+ufkeys, use=mgr,
+ 
+ #### SIMPLETERM
+ # st.suckless.org
+@@ -7479,16 +7433,15 @@
+ 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+ 	dch1=\E[P, ed=\E[J, el=\E[K, home=\E[H, hpa=\E[%i%p1%dG,
+ 	ht=^I, ich=\E[%p1%d@, ind=\n, kbs=^?, kdch1=\E[3~,
+-	kend=\E[4~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~,
+-	kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~,
+-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
++	kend=\E[4~, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+ 	khome=\E[1~, knp=\E[6~, kpp=\E[5~, rev=\E[7m, rmso=\E[m,
+ 	rmul=\E[m,
+ 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
+ 	    %t;7%;m,
+ 	sgr0=\E[0m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
+ 	use=ansi+csr, use=ansi+idl, use=vt220+cvis,
+-	use=ecma+index, use=klone+color, use=xterm+acs,
++	use=ecma+index, use=klone+color, use=xterm+r5+fkeys,
++	use=xterm+acs,
+ 
+ st-16color|stterm-16color|simpleterm with 16-colors,
+ 	use=ibm+16color, use=st,
+@@ -7585,20 +7538,20 @@
+ 	flash=^G, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n,
+ 	is1=\E[?47l\E=\E[?1l,
+ 	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^?,
+-	kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
+-	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
+-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~, kf6=\E[17~,
+-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~, rev=\E[7m,
+-	ri=\EM, rmacs=\E(B, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
+-	rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, s0ds=\E(B, s1ds=\E(0,
++	kf1=\EOP, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
++	kf16=\E[29~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, khome=\E[1~,
++	rev=\E[7m, ri=\EM, rmacs=\E(B, rmir=\E[4l, rmso=\E[27m,
++	rmul=\E[24m, rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>,
++	s0ds=\E(B, s1ds=\E(0,
+ 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p5%t;2%;%?%p1%p3%|%t;7
+ 	    %;m%?%p9%t\E(0%e\E(B%;,
+ 	sgr0=\E[m\E(B, smacs=\E(0, smir=\E[4h, smso=\E[7m,
+ 	smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=ansi+arrows,
+ 	use=ansi+csr, use=ansi+enq, use=ansi+idl, use=ansi+local,
+-	use=vt220+pcedit, use=ecma+italics, use=ecma+index,
++	use=bracketed+paste, use=ecma+italics, use=ecma+index,
++	use=vt220+cvis, use=vt220+pcedit, use=xterm+r5+fkeys,
+ 	use=xterm+256setaf, use=xterm+sl-twm,
+-	use=xterm+alt1049, use=vt220+cvis, use=bracketed+paste,
++	use=xterm+alt1049,
+ 
+ #### TERMINOLOGY
+ # https://www.enlightenment.org/about-terminology
+@@ -8166,17 +8119,16 @@
+ # + reports window size, none of the other window reports
+ wezterm|Wez's Terminal Emulator,
+ 	am, bce, km, mir, msgr, npc, xenl,
+-	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n, ech=\E[%p1%dX,
+ 	el1=\E[1K, flash=\E[?5h$<100/>\E[?5l, ind=\n,
+ 	is2=\E[!p\E[?3;4l\E[4l\E>, kbs=^?, kcbt=\E[Z, kend=\EOF,
+-	op=\E[39;49m, ri=\EM, rmacs=\E(B, rmam=\E[?7l,
+-	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
+-	rs1=\Ec\E]104\007, rs2=\E[!p\E[?3;4l\E[4l\E>,
++	op=\E[39;49m, ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>,
++	rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]104\007,
++	rs2=\E[!p\E[?3;4l\E[4l\E>,
+ 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
+ 	    %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
+-	sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=,
+-	Smol=\E[53m, Smulx=\E[4:%p1%dm,
++	sgr0=\E(B\E[m, smam=\E[?7h, smkx=\E[?1h\E=, Smol=\E[53m,
++	Smulx=\E[4:%p1%dm,
+ 	xr=\EP>\\|WezTerm\\([1-9][0-9-]+\\)\E\\\\,
+ 	use=ansi+apparrows, use=ansi+csr, use=ansi+cup,
+ 	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+@@ -8184,10 +8136,10 @@
+ 	use=ansi+rep, use=ansi+sgrdim, use=bracketed+paste,
+ 	use=ecma+index, use=ecma+italics, use=ecma+strikeout,
+ 	use=report+version, use=vt220+cvis,
+-	use=xterm+256color2, use=xterm+alt+title,
+-	use=xterm+focus, use=xterm+pcc2, use=xterm+pce2,
+-	use=xterm+pcf2, use=xterm+sl-alt, use=xterm+sm+1006,
+-	use=xterm+tmux,
++	use=xterm+256color2, use=xterm+acs,
++	use=xterm+alt+title, use=xterm+focus, use=xterm+pcc2,
++	use=xterm+pce2, use=xterm+pcf2, use=xterm+sl-alt,
++	use=xterm+sm+1006, use=xterm+tmux,
+ 
+ #### Contour
+ # https://github.com/contour-terminal/contour
+@@ -8364,12 +8316,7 @@
+ 	cnorm=\E[?12l\E[?25h, cr=\r, cub1=^H, cud1=\n,
+ 	cvvis=\E[?12;25h, dim=\E[2m, ech=\E[%p1%dX, el1=\E[1K,
+ 	flash=\E[?5h$<100/>\E[?5l, ind=\n, invis=\E[8m, kbs=^?,
+-	kcbt=\E[Z, kend=\EOF, kent=\EOM, kf13=\E[1;2P,
+-	kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S, kf25=\E[1;5P,
+-	kf26=\E[1;5Q, kf27=\E[1;5R, kf28=\E[1;5S, kf37=\E[1;6P,
+-	kf38=\E[1;6Q, kf39=\E[1;6R, kf40=\E[1;6S, kf49=\E[1;3P,
+-	kf50=\E[1;3Q, kf51=\E[1;3R, kf52=\E[1;3S, kf61=\E[1;4P,
+-	kf62=\E[1;4Q, kf63=\E[1;4R, op=\E[39;49m, rev=\E[7m,
++	kcbt=\E[Z, kend=\EOF, kent=\EOM, op=\E[39;49m, rev=\E[7m,
+ 	ri=\EM, rmam=\E[?7l, rmcup=\E[?1049l, rmkx=\E[?1l\E>,
+ 	rmso=\E[27m, rmul=\E[24m, rs1=\E]\E\\\Ec,
+ 	setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;
+@@ -8391,7 +8338,7 @@
+ 	use=xterm+256color2, use=xterm+acs,
+ 	use=xterm+alt+title, use=bracketed+paste,
+ 	use=kitty+setal, use=vt420+lrmm, use=xterm+focus,
+-	use=xterm+pce2, use=xterm+pcc2, use=xterm+pcf0,
++	use=xterm+pce2, use=xterm+pcc2, use=xterm+pcf2,
+ 	use=xterm+sm+1006, use=xterm+sl-twm,
+ 
+ ######## UNIX VIRTUAL TERMINALS, VIRTUAL CONSOLES, AND TELNET CLIENTS
+@@ -8547,9 +8494,7 @@
+ 	cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, cvvis=\E[34l,
+ 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, el1=\E[1K, flash=\Eg,
+ 	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, indn=\E[%p1%dS, is2=\E)0,
+-	kbs=^?, kcbt=\E[Z, kf1=\EOP, kf10=\E[21~, kf11=\E[23~,
+-	kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~,
+-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
++	kbs=^?, kcbt=\E[Z, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+ 	khome=\E[1~, kmous=\E[M, nel=\EE, rev=\E[7m, ri=\EM,
+ 	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[23m, rmul=\E[24m,
+ 	rs2=\Ec\E[?1000l\E[?25h,
+@@ -8561,6 +8506,7 @@
+ 	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+ 	use=xterm+kbs, use=vt220+pcedit, use=xterm+alt1049,
+ 	use=ecma+color, use=vt100+enq, use=vt100+4bsd,
++	use=xterm+r5+fkeys,
+ 
+ screen|VT 100/ANSI X3.64 virtual terminal,
+ 	use=screen4,
+@@ -8915,14 +8861,9 @@
+ 	kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d,
+ 	kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, ka1=\EOw, ka3=\EOy,
+ 	kb2=\EOu, kbs=^?, kc1=\EOq, kc3=\EOs, kcbt=\E[Z, kel=\E[8\^,
+-	kend=\E[8~, kent=\EOM, kf0=\E[21~, kf1=\E[11~, 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=\E[12~, kf20=\E[34~, kf21=\E[23$,
+-	kf22=\E[24$, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
+-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+-	khome=\E[7~, kind=\E[a, kmous=\E[M, kri=\E[b, rev=\E[7m,
+-	ri=\EM, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
++	kend=\E[8~, kent=\EOM, kf0=\E[21~, kf21=\E[23$,
++	kf22=\E[24$, khome=\E[7~, kind=\E[a, kmous=\E[M, kri=\E[b,
++	rev=\E[7m, ri=\EM, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
+ 	rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
+ 	rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?
+ 	    25h,
+@@ -8933,7 +8874,8 @@
+ 	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
+ 	use=ansi+idl, use=ansi+local, use=xterm+alt47,
+ 	use=vt220+vtedit, use=vt220+cvis, use=ecma+color,
+-	use=ecma+italics, use=vt100+4bsd,
++	use=ecma+italics, use=vt100+4bsd, use=vt220+sfkeys,
++	use=xterm+r5+fkeys,
+ 
+ dvtm-256color|dynamic virtual terminal manager with 256 colors,
+ 	colors#0x100, pairs#0x10000,
+@@ -9021,10 +8963,9 @@
+ #
+ 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,
+-	kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf6=\E[17~, kf7=\E[18~,
+-	kf8=\E[19~, kf9=\E[20~, use=ncsa,
++	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf2=\EOQ, kf3=\EOR,
++	kf4=\EOS, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
++	use=ncsa, use=vt220+sfkeys,
+ 
+ #### Pilot Pro Palm-Top
+ #
+@@ -9174,9 +9115,8 @@
+ sun-12|Sun 12-line window,
+ 	cols#80, lines#12, use=sun,
+ sun-1|Sun 1-line window for sysline,
+-	eslok, hs,
+-	cols#80, lines#1,
+-	dsl=^L, fsl=\E[K, tsl=\r, use=sun,
++	lines#1,
++	dsl=^L, fsl=\E[K, tsl=\r, use=sun, use=dec+sl,
+ sun-e|sun-nic|sune|Sun Microsystems Workstation without insert character,
+ 	ich1@, rmir@, smir@, use=sun,
+ sun-c|sun-cmd|Sun Microsystems Workstation console with scrollable history,
+@@ -9429,12 +9369,11 @@
+ 	tsl=\E[1$}\E[;%df, use=dec+sl, use=vt220-base,
+ # (news517-w: this had :TY=sjis:. --esr)
+ 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$},
++	OTi2=\E[2$~\n, dsl=\E[1$~,
+ 	is2=\E7\E[r\E8\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h,
+ 	rs2=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h,
+-	tsl=\E[1$}\E[;%df, use=vt220-base,
++	tsl=\E[1$}\E[;%df, use=dec+sl, use=vt220-base,
+ 
+ #### Common Desktop Environment
+ #
+@@ -9451,11 +9390,6 @@
+ 	flash=\E[?5h$<200>\E[?5l, home=\E[H, ht=^I, hts=\EH,
+ 	ich=\E[%p1%d@, ind=\ED, is2=\E F\E>\E[?1l\E[?7h\E[?45l,
+ 	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+-	kf1=\E[11~, 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=\E[12~,
+-	kf20=\E[34~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
+-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+ 	khlp=\E[28~, nel=\EE, ri=\EM, rmacs=^O, rmam=\E[?7l,
+ 	rmir=\E[4l, rmso=\E[22;27m, rmul=\E[24m,
+ 	sgr=\E[0%?%p1%t;2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
+@@ -9463,8 +9397,9 @@
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
+ 	smso=\E[2;7m, smul=\E[4m, tbc=\E[3g, use=ansi+csr,
+ 	use=ansi+erase, use=ansi+idl, use=ansi+local,
+-	use=ansi+sgr, use=decid+cpr, use=vt220+vtedit,
+-	use=vt220+cvis, use=ecma+color,
++	use=ansi+sgr, use=decid+cpr, use=ecma+color,
++	use=vt220+cvis, use=vt220+sfkeys, use=vt220+vtedit,
++	use=xterm+r5+fkeys,
+ 
+ ######## Non-Unix Consoles
+ #
+@@ -9583,21 +9518,18 @@
+ 	am, hs, mir, msgr, xon,
+ 	colors#8, it#8, pairs#64,
+ 	bel=^G, bold=\E[1m, cr=\r, cub1=^H, el1=\E[1K, fsl=^G, ht=^I,
+-	ind=\n, invis=\E[8m, kb2=\E[G, kf1=\E[[A, 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=\E[[B, kf20=\E[34~, kf3=\E[[C, kf4=\E[[D,
+-	kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+-	khome=\E[1~, kspd=^Z, nel=\r\n, op=\E[39;49m, rc=\E8,
+-	rev=\E[7m, ri=\EM, rmpch=\E[10m, rmso=\E[27m, rmul=\E[24m,
+-	rs1=\Ec\E]R, sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
++	ind=\n, invis=\E[8m, kb2=\E[G, khome=\E[1~, kspd=^Z,
++	nel=\r\n, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
++	rmpch=\E[10m, rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]R,
++	sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+ 	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p6%t;1%;%?%p7
+ 	    %t;8%;%?%p9%t;11%;m,
+ 	sgr0=\E[0;10m, smpch=\E[11m, smso=\E[7m, smul=\E[4m,
+ 	tsl=\E];, use=ansi+arrows, use=ansi+cup, use=ansi+erase,
+ 	use=ansi+idc, use=ansi+idl, use=ansi+local,
+ 	use=ansi+rca2, use=vt220+pcedit, use=vt102+enq,
+-	use=klone+acs, use=xterm+alt47,
++	use=klone+acs, use=linux+lockeys, use=vt220+sfkeys,
++	use=vt220+ufkeys, use=xterm+alt47,
+ 
+ # I've supplied this so that you can help test new values and add other
+ # features.  Cheers, earnie_boyd@yahoo.com.
+@@ -9610,20 +9542,17 @@
+ 	cols#80, lines#24,
+ 	bel=^G, cr=\r, dim=\E[2m, el1=\E[1K,
+ 	flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG, ind=\n,
+-	kNXT=\E[6$, kPRV=\E[5$, kb2=\E[G, kcbt=\E[Z, kf1=\E[[A,
+-	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=\E[[B, kf20=\E[34~,
+-	kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~,
+-	kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kspd=^Z, nel=\r\n,
+-	op=\E[39;49m, rc=\E8, ri=\EM, rs1=\Ec\E]R, sc=\E7,
++	kNXT=\E[6$, kPRV=\E[5$, kb2=\E[G, kcbt=\E[Z, khome=\E[1~,
++	kspd=^Z, nel=\r\n, op=\E[39;49m, rc=\E8, ri=\EM, rs1=\Ec\E]R,
++	sc=\E7,
+ 	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
+ 	    %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%;m,
+ 	sgr0=\E[0;10m, vpa=\E[%i%p1%dd, use=ansi+arrows,
+ 	use=ansi+cup, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+ 	use=ansi+inittabs, use=ansi+local, use=ansi+sgrbold,
+-	use=klone+acs, use=klone+color, use=vt220+pcedit,
+-	use=vt220+cvis, use=vt102+enq,
++	use=klone+acs, use=klone+color, use=linux+lockeys,
++	use=vt102+enq, use=vt220+pcedit, use=vt220+cvis,
++	use=vt220+sfkeys, use=vt220+ufkeys,
+ 
+ #### DJGPP
+ 
+@@ -9757,38 +9686,35 @@
+ 	     \331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v
+ 	     \301w\302x\263y\363z\362{\343|\330}\234~\376,
+ 	bel=^G, bold=\E[1m, cbt=\E[Z, civis=\E[1v, cnorm=\E[v, cr=\r,
+-	cub1=^H, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[2v,
+-	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, el1=\E[1K,
+-	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@,
+-	ich1=\E[@, ind=\E[S, kf1=\E[[A, kf10=\E[21~, kf11=\E[23~,
+-	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[27~,
++	cub1=^H, cvvis=\E[2v, dch=\E[%p1%dP, dch1=\E[P,
++	ech=\E[%p1%dX, el1=\E[1K, ht=^I, ich=\E[%p1%d@, ich1=\E[@,
++	ind=\E[S, kf13=\E[25~, kf14=\E[26~, kf15=\E[27~,
+ 	kf16=\E[28~, kf17=\E[29~, kf18=\E[30~, kf19=\E[31~,
+-	kf2=\E[[B, kf20=\E[32~, kf21=\E[33~, kf22=\E[34~,
+-	kf23=\E[35~, kf24=\E[36~, kf25=\E[47~, kf26=\E[48~,
+-	kf27=\E[49~, kf28=\E[50~, kf29=\E[51~, kf3=\E[[C,
+-	kf30=\E[52~, kf31=\E[53~, kf32=\E[54~, kf33=\E[55~,
+-	kf34=\E[56~, kf35=\E[57~, kf36=\E[58~, kf37=\E[59~,
+-	kf38=\E[60~, kf39=\E[61~, kf4=\E[[D, kf40=\E[62~,
+-	kf41=\E[63~, kf42=\E[64~, kf43=\E[65~, kf44=\E[66~,
+-	kf45=\E[67~, kf46=\E[68~, kf48=\E[80~, kf5=\E[[E,
+-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+-	khome=\E[1~, nel=\r\n, op=\E[37;40m, ri=\E[T, rmso=\E[m,
++	kf20=\E[32~, kf21=\E[33~, kf22=\E[34~, kf23=\E[35~,
++	kf24=\E[36~, kf25=\E[47~, kf26=\E[48~, kf27=\E[49~,
++	kf28=\E[50~, kf29=\E[51~, kf30=\E[52~, kf31=\E[53~,
++	kf32=\E[54~, kf33=\E[55~, kf34=\E[56~, kf35=\E[57~,
++	kf36=\E[58~, kf37=\E[59~, kf38=\E[60~, kf39=\E[61~,
++	kf40=\E[62~, kf41=\E[63~, kf42=\E[64~, kf43=\E[65~,
++	kf44=\E[66~, kf45=\E[67~, kf46=\E[68~, kf48=\E[80~,
++	kf6=\E[17~, khome=\E[1~, nel=\r\n, op=\E[37;40m, ri=\E[T,
+ 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+ 	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%e;25%;%?
+ 	    %p6%t;1%;%?%p7%t;8%;m,
+-	sgr0=\E[m, smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd,
+-	alt_A=\E[82~, alt_B=\E[82~, alt_C=\E[83~, alt_D=\E[84~,
+-	alt_E=\E[85~, alt_F=\E[86~, alt_G=\E[87~, alt_H=\E[88~,
+-	alt_I=\E[89~, alt_J=\E[90~, alt_K=\E[91~, alt_L=\E[92~,
+-	alt_M=\E[93~, alt_N=\E[94~, alt_O=\E[95~, alt_P=\E[96~,
+-	alt_Q=\E[97~, alt_R=\E[98~, alt_S=\E[99~, alt_T=\E[100~,
+-	alt_U=\E[101~, alt_V=\E[102~, alt_W=\E[103~,
+-	alt_X=\E[104~, alt_Y=\E[105~, alt_Z=\E[106~, kDC5=\E[43~,
+-	kDN5=\E[38~, kEND5=\E[44~, kHOM5=\E[41~, kIC5=\E[42~,
+-	kLFT5=\E[39~, kNXT5=\E[46~, kPRV5=\E[45~, kRIT5=\E[40~,
+-	kUP5=\E[37~, use=ansi+arrows, use=ansi+erase,
+-	use=ansi+idl, use=ansi+local, use=ansi+sgr,
+-	use=vt220+pcedit, use=ecma+index,
++	sgr0=\E[m, smul=\E[4m, alt_A=\E[82~, alt_B=\E[82~,
++	alt_C=\E[83~, alt_D=\E[84~, alt_E=\E[85~, alt_F=\E[86~,
++	alt_G=\E[87~, alt_H=\E[88~, alt_I=\E[89~, alt_J=\E[90~,
++	alt_K=\E[91~, alt_L=\E[92~, alt_M=\E[93~, alt_N=\E[94~,
++	alt_O=\E[95~, alt_P=\E[96~, alt_Q=\E[97~, alt_R=\E[98~,
++	alt_S=\E[99~, alt_T=\E[100~, alt_U=\E[101~,
++	alt_V=\E[102~, alt_W=\E[103~, alt_X=\E[104~,
++	alt_Y=\E[105~, alt_Z=\E[106~, kDC5=\E[43~, kDN5=\E[38~,
++	kEND5=\E[44~, kHOM5=\E[41~, kIC5=\E[42~, kLFT5=\E[39~,
++	kNXT5=\E[46~, kPRV5=\E[45~, kRIT5=\E[40~, kUP5=\E[37~,
++	use=ansi+arrows, use=ansi+cup, use=ansi+erase,
++	use=ansi+idl, use=ansi+local, use=ansi+rca2,
++	use=ansi+sgr, use=ansi+sgrso, use=ecma+index,
++	use=linux+lockeys, use=vt220+pcedit, use=vt220+ufkeys,
+ 
+ djgpp203|entry for DJGPP 2.03,
+ 	OTbs, am,
+@@ -9804,13 +9730,12 @@
+ 	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[2v, dch=\E[%p1%dP,
+ 	dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+ 	ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, invis=\E[8m,
+-	kf0=\E[21~, kf1=\E[[A, kf10=\E[21~, kf2=\E[[B, kf3=\E[[C,
+-	kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
+-	kf9=\E[20~, khome=\E[1~, kll=\E[4~, nel=\r\n, rev=\E[7m,
+-	ri=\E[T, rmso=\E[m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+-	sgr0=\E[m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
+-	use=ansi+idl, use=ansi+local, use=vt220+pcedit,
+-	use=ecma+index,
++	kf0=\E[21~, kf10=\E[21~, kf6=\E[17~, kf7=\E[18~,
++	kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kll=\E[4~, nel=\r\n,
++	rev=\E[7m, ri=\E[T, rmso=\E[m, setab=\E[4%p1%dm,
++	setaf=\E[3%p1%dm, sgr0=\E[m, smso=\E[7m, smul=\E[4m,
++	use=ansi+arrows, use=ansi+idl, use=ansi+local,
++	use=linux+lockeys, use=vt220+pcedit, use=ecma+index,
+ 
+ #### U/Win
+ 
+@@ -12962,13 +12887,12 @@
+ 	is2=\E7\E[1r\E8\E[2;3;4;13;20;34;39;36l\E[12;16;34h\E[?1;3;4
+ 	    ;5;10;18l\E[?7;8;25h\E>\E[?5W\E(B\017\E[4i,
+ 	kbs=^H, kcbt=\E[z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
+-	kcuu1=\EOA, kf1=\EOP, kf10=\E[21~, kf11=\E[23~,
+-	kf12=\E[24~, kf17=\E[K, kf18=\E[31~, kf19=\E[32~, kf2=\EOQ,
+-	kf20=\E[33~, kf21=\E[34~, kf22=\E[35~, kf23=\E[1~,
+-	kf24=\E[2~, kf3=\EOR, kf4=\EOS, kf5=\E[M, kf6=\E[17~,
+-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, ll=\E[24E, mc0=\E[?19h,
+-	nel=\EE, prot=\E[1"q, ri=\EM, rmacs=^O, rmam=\E[?7l,
+-	rmir=\E[4l, rmkx=\E[?1l, rmso=\E[27m, rmul=\E[24m,
++	kcuu1=\EOA, kf1=\EOP, kf17=\E[K, kf18=\E[31~, kf19=\E[32~,
++	kf2=\EOQ, kf20=\E[33~, kf21=\E[34~, kf22=\E[35~,
++	kf23=\E[1~, kf24=\E[2~, kf3=\EOR, kf4=\EOS, kf5=\E[M,
++	ll=\E[24E, mc0=\E[?19h, nel=\EE, prot=\E[1"q, ri=\EM,
++	rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l,
++	rmso=\E[27m, rmul=\E[24m,
+ 	rs2=\E[61"p\E[40h\E[?6l\E[1r\E[2;3;4;13;20;34;39;36l\E[12;16
+ 	    ;34h\E[?1;3;4;5;10;18l\E[?7;8;25h\E>\E[?5W\E(B\017\E[24E
+ 	    \E[4i,
+@@ -12976,7 +12900,7 @@
+ 	    %p5%t;2%;%?%p7%t;8%;m\E[%?%p8%t1%;"q%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017\E["q, smacs=^N, smam=\E[?7h, smir=\E[4h,
+ 	smkx=\E[?1h, vpa=\E[%i%p1%dd, use=ansi+csr, use=ansi+idl,
+-	use=ansi+pp, use=ansi+sgrbold,
++	use=ansi+pp, use=ansi+sgrbold, use=vt220+ufkeys,
+ 
+ #   This is the american terminal. Here tabs work fine.
+ # From: Francesco Potorti` , 24 Aug 1998
+@@ -13143,16 +13067,13 @@
+ 	il=\E[%p1%dL$<2*>, il1=\E[L$<2>, ind=\n$<2>, ip=$<1>,
+ 	is1=\E[2;4;20;30l\E[?1;10l\E[12h\E[?7;8;25h,
+ 	is2=\E>\E(B\E)0\017, is3=\E[m, kdl1=\E[M, kel=\E[K,
+-	kf1=\E[?5i, 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=\E[?3i,
+-	kf20=\E[34~, kf21=\E[35~, kf3=\E[2i, kf4=\E[@, kf5=\E[M,
+-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~,
+-	khlp=\E[28~, kich1=\E[@, kil1=\E[L, knp=\E[6~, kpp=\E[5~,
+-	kprt=\E[?5i, kslt=\E[4~, mc0=\E[0i, rc=\E8, rev=\E[1t\E[7m,
+-	ri=\EM$<2>, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmkx=\E>,
+-	rmso=\E[m, rmul=\E[m, rs1=\E[13l\E[3l\E!p,
+-	rs2=\E[35h\E[?3l$<80>, rs3=\E[?5l, sc=\E7,
++	kf1=\E[?5i, kf2=\E[?3i, kf21=\E[35~, kf3=\E[2i, kf4=\E[@,
++	kf5=\E[M, kfnd=\E[1~, khlp=\E[28~, kich1=\E[@, kil1=\E[L,
++	knp=\E[6~, kpp=\E[5~, kprt=\E[?5i, kslt=\E[4~, mc0=\E[0i,
++	rc=\E8, rev=\E[1t\E[7m, ri=\EM$<2>, rmacs=^O, rmam=\E[?7l,
++	rmir=\E[4l, rmkx=\E>, rmso=\E[m, rmul=\E[m,
++	rs1=\E[13l\E[3l\E!p, rs2=\E[35h\E[?3l$<80>, rs3=\E[?5l,
++	sc=\E7,
+ 	sgr=%?%p5%t\E[0t%;%?%p3%p1%|%t\E[1t%;%?%p2%t\E[2t%;%?%p4%t
+ 	    \E[3t%;%?%p1%p2%p3%p4%p5%|%|%|%|%t\E[7m%e\E[m%;%?%p9%t
+ 	    \016%e\017%;,
+@@ -13160,7 +13081,8 @@
+ 	smkx=\E[?1l\E[?7h\E=, smso=\E[1t\E[7m, smul=\E[2t\E[4m,
+ 	tsl=\E[>\,\001, use=ansi+arrows, use=ansi+local,
+ 	use=ansi+pp, use=ansi+tabs, use=decid+cpr,
+-	use=vt220+cvis, use=vt220+keypad,
++	use=vt220+cvis, use=vt220+keypad, use=vt220+sfkeys,
++	use=vt220+ufkeys,
+ #
+ #	This terminal description uses the non-hidden attribute mode
+ #	(with magic cookie).
+@@ -13209,13 +13131,9 @@
+ 	ht=\011$<1>, ich=\E[%p1%d@$<4*>, il=\E[%p1%dL$<5*>,
+ 	il1=\E[L$<5>, ind=\n$<3>, ip=$<3>, is1=\E[62;1"p\E[?5W,
+ 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h$<16>,
+-	is3=\E>\E(B\E)0\017\E[m, 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~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
+-	kf9=\E[20~, khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2,
+-	lf3=PF3, lf4=PF4, mc0=\E[0i, ri=\EM$<3>, rmam=\E[?7l,
+-	rmir=\E[4l, rmkx=\E>, rs1=\E[13l\E[3l\E!p,
++	is3=\E>\E(B\E)0\017\E[m, khlp=\E[28~, khome=\E[26~,
++	lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i, ri=\EM$<3>,
++	rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, rs1=\E[13l\E[3l\E!p,
+ 	rs2=\E[35h\E[?3l$<70>, rs3=\E[?5l,
+ 	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?
+ 	    %p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+@@ -13224,7 +13142,7 @@
+ 	use=ansi+csr, use=ansi+inittabs, use=ansi+local,
+ 	use=ansi+pp, use=ansi+sgrbold, use=decid+cpr,
+ 	use=vt100+4bsd, use=vt220+vtedit, use=vt220+cvis,
+-	use=vt220+keypad,
++	use=vt220+keypad, use=vt220+sfkeys, use=vt220+ufkeys,
+ #
+ #	Wyse 85 with visual bell.
+ wy85-vb|wyse85-vb|Wyse 85 with visible bell,
+@@ -13304,14 +13222,10 @@
+ 	hpa=\E[%i%p1%d`, ich=\E[%p1%d@$<2>, il=\E[%p1%dL$<3*>,
+ 	il1=\E[L$<3>, ind=\n$<2>, ip=$<4>, is1=\E[?5W,
+ 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h,
+-	is3=\E>\E(B\E)0\017\E[m, kcbt=\E[Z, 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~, kf6=\E[17~, kf7=\E[18~,
+-	kf8=\E[19~, kf9=\E[20~, khlp=\E[28~, khome=\E[26~, lf1=PF1,
+-	lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i, rc=\E8, ri=\EM$<2>,
+-	rmam=\E[?7l, rmcup=\E[ R, rmir=\E[4l, rmkx=\E>,
+-	rmso=\E[27m, rmul=\E[24m,
++	is3=\E>\E(B\E)0\017\E[m, kcbt=\E[Z, khlp=\E[28~,
++	khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i,
++	rc=\E8, ri=\EM$<2>, rmam=\E[?7l, rmcup=\E[ R, rmir=\E[4l,
++	rmkx=\E>, rmso=\E[27m, rmul=\E[24m,
+ 	rs1=\E[13l\E[3l\E\\\E[63;1"p\E[!p, rs2=\E[35h\E[?3l,
+ 	rs3=\E[?5l\E[47h\E[40l\E[r, sc=\E7,
+ 	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?
+@@ -13321,6 +13235,7 @@
+ 	use=ansi+arrows, use=ansi+inittabs, use=ansi+local,
+ 	use=ansi+pp, use=ansi+sgrbold, use=decid+cpr,
+ 	use=vt100+4bsd, use=vt220+vtedit, use=vt220+keypad,
++	use=vt220+sfkeys, use=vt220+ufkeys,
+ #
+ #	Wyse 185 with 24 data lines and top status (terminal status)
+ wy185-24|wyse185-24|Wyse 185 with 24 data lines,
+@@ -13509,30 +13424,25 @@
+ #
+ wy370|wyse370|wy370-101k|Wyse 370 with 101 key keyboard,
+ 	kcbt=\E[Z, kdch1=\EOQ, kdl1=\EOQ, kent=\EOM, kf1=\E[?4i,
+-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
+-	kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf2=\E[?3i,
+-	kf3=\E[2i, kf4=\E[@, kf5=\E[M, kf6=\E[17~, kf7=\E[18~,
+-	kf8=\E[19~, kf9=\E[20~, kich1=\EOP, kil1=\EOP, knp=\E[U,
+-	kpp=\E[V, use=ansi+arrows, use=wy370-nk,
++	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
++	kf2=\E[?3i, kf3=\E[2i, kf4=\E[@, kf5=\E[M, kich1=\EOP,
++	kil1=\EOP, knp=\E[U, kpp=\E[V, use=ansi+arrows,
++	use=vt220+ufkeys, use=wy370-nk,
+ #
+ #	Function key set for the VT-320 (and wy85) compatible keyboard
+ #
+ wy370-105k|Wyse 370 with 105 key keyboard,
+-	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~, kf6=\E[17~,
+-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~,
+-	khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3,
+-	lf4=PF4, use=ansi+arrows, use=vt220+vtedit, use=wy370-nk,
+-	use=vt220+keypad,
++	kfnd=\E[1~, khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2,
++	lf3=PF3, lf4=PF4, use=ansi+arrows, use=vt220+vtedit,
++	use=wy370-nk, use=vt220+keypad, use=vt220+sfkeys,
++	use=vt220+ufkeys,
+ #
+ #	Function key set for the PC compatible keyboard
+ #
+ wy370-EPC|Wyse 370 with 102 key keyboard,
+-	kcbt=\E[Z, kend=\E[1~, kent=\EOM, kf1=\EOP, kf10=\E[21~,
+-	kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+-	kf5=\E[M, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+-	kich1=\E[2~, knp=\E[U, kpp=\E[V, use=ansi+arrows,
++	kcbt=\E[Z, kend=\E[1~, kent=\EOM, kf1=\EOP, kf2=\EOQ,
++	kf3=\EOR, kf4=\EOS, kf5=\E[M, kich1=\E[2~, knp=\E[U,
++	kpp=\E[V, use=ansi+arrows, use=vt220+ufkeys,
+ 	use=wy370-nk,
+ #
+ #	Wyse 370 with visual bell.
+@@ -13639,14 +13549,11 @@
+ 	ind=\n$<2>, ip=$<4>, is1=\E[?5W,
+ 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25;67h,
+ 	is3=\E>\E(B\E)0\017\E[m, kcbt=\E[Z, ked=\E[1~, kel=\E[4~,
+-	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~, kf6=\E[17~,
+-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khlp=\E[28~,
+-	khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i,
+-	ri=\EM$<2>, rmacs=^O, rmam=\E[?7l, rmcup=\E[ R, rmir=\E[4l,
+-	rmul=\E[24m, rs1=\E[13l\E[3l\E\\\E[63;1"p\E[!p,
+-	rs2=\E[35h\E[?3l, rs3=\E[?5l\E[47h\E[40l\E[r,
++	khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3,
++	lf4=PF4, mc0=\E[0i, ri=\EM$<2>, rmacs=^O, rmam=\E[?7l,
++	rmcup=\E[ R, rmir=\E[4l, rmul=\E[24m,
++	rs1=\E[13l\E[3l\E\\\E[63;1"p\E[!p, rs2=\E[35h\E[?3l,
++	rs3=\E[?5l\E[47h\E[40l\E[r,
+ 	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?
+ 	    %p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h,
+@@ -13655,6 +13562,7 @@
+ 	use=ansi+arrows, use=ansi+csr, use=ansi+local,
+ 	use=ansi+pp, use=ansi+sgrbold, use=ansi+tabs,
+ 	use=decid+cpr, use=vt220+vtedit, use=vt220+keypad,
++	use=vt220+sfkeys, use=vt220+ufkeys,
+ #
+ #       Wyse 520 with 24 data lines and status (terminal status)
+ wy520-24|wyse520-24|Wyse 520 with 24 data lines,
+@@ -13687,9 +13595,8 @@
+ #                  to CTRL-C: stty intr '^c') for it to work since the
+ #                  Delete key sends 7FH.
+ wy520-epc|wyse520-epc|Wyse 520 with EPC keyboard,
+-	kdch1=^?, kel=\E[4~, kend=\E[4~, kf0=\E[21~, kf1=\E[11~,
+-	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, khome=\E[H,
+-	use=wy520,
++	kdch1=^?, kel=\E[4~, kend=\E[4~, kf0=\E[21~, khome=\E[H,
++	use=xterm+r5+fkeys, use=wy520,
+ #
+ #       Wyse 520 with 24 data lines and status (terminal status)
+ #       with EPC keyboard.
+@@ -15596,13 +15503,12 @@
+ 	rmcup=\E[60;0;0;28p\E[28;1H\E[K,
+ 	smcup=\E[H\E[J$<156>\E[28;0;0;28p, use=aaa+unk,
+ aaa-30-s|aaa-s|Ann Arbor Ambassador/30 lines w/status,
+-	eslok, hs,
+ 	lines#29,
+ 	dsl=\E7\E[60;0;0;30p\E[1;1H\E[K\E[H\E8\r\n\E[K,
+-	fsl=\E[>51l, is2=\r\n\E[A\E7\E[60;1;0;30p\E8,
++	is2=\r\n\E[A\E7\E[60;1;0;30p\E8,
+ 	rmcup=\E[60;1;0;30p\E[29;1H\E[K,
+ 	smcup=\E[H\E[J$<156>\E[30;1;0;30p\E[30;1H\E[K,
+-	tsl=\E[>51h\E[1;%p1%dH\E[2K, use=aaa+unk,
++	use=aaa+unk, use=guru+s,
+ aaa-30-s-rv|aaa-s-rv|Ann Arbor Ambassador/30 lines+status+reverse video,
+ 	use=aaa+rv, use=aaa-30-s,
+ aaa-s-ctxt|aaa-30-s-ctxt|Ann Arbor Ambassador/30 lines+status+save context,
+@@ -16843,14 +16749,13 @@
+ 	use=dg+color8,
+ 
+ dgmode+color8|Color info for Data General D220/D230C terminals in DG mode,
+-	bce,
+-	colors#8, ncv#16, pairs#64,
+ 	op=\036Ad\036Bd,
+ 	setab=\036B%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|
+ 	      %;%{48}%+%c,
+ 	setaf=\036A%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%|
+ 	      %;%{48}%+%c,
+ 	setb=\036B%p1%{48}%+%c, setf=\036A%p1%{48}%+%c,
++	use=dg+color8,
+ 
+ dgmode+color|Color info for Data General D470C terminals in DG mode,
+ 	colors#16, pairs#0x100,
+@@ -16861,8 +16766,6 @@
+ 	use=dgmode+color8,
+ 
+ dgunix+ccc|Configurable color info for DG D430C terminals in DG-UNIX mode,
+-	bce, ccc,
+-	colors#52, ncv#53, pairs#26,
+ 	initp=\036RG0%p1%02X%p2%{255}%*%{1000}%/%02X%p3%{255}%*
+ 	      %{1000}%/%02X%p4%{255}%*%{1000}%/%02X%p5%{255}%*
+ 	      %{1000}%/%02X%p6%{255}%*%{1000}%/%02X%p7%{255}%*
+@@ -16870,7 +16773,7 @@
+ 	oc=\036RG01A00FF00000000\036RG01B00000000FF00
+ 	   \036RG01C007F00000000\036RG01D000000007F00,
+ 	op=\036RF4831A\036RF2E31B\036RF1D31C\036RF3F31D,
+-	scp=\036RG2%p1%02X,
++	scp=\036RG2%p1%02X, use=dg+ccc,
+ 
+ # Colors are in the order:  normal, reverse, dim, dim + reverse.
+ dg+ccc|Configurable color info for DG D430C terminals in DG mode,
+@@ -19128,13 +19031,10 @@
+ 	cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+ 	dsl=\E[%}\024, ech=\E[%p1%dX, ed=\E[J$<10>, el=\E[K,
+ 	fsl=^T, home=\E[H, hpa=\E[%i%p1%d`, ind=\n,
+-	is2=\E[&p\E[<12l\E F, kclr=^L, kf1=\E[11~, kf10=\E[21~,
+-	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
++	is2=\E[&p\E[<12l\E F, kclr=^L, kf13=\E[25~, kf14=\E[26~,
+ 	kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
+-	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~,
+-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, nel=\r\n, prot=\E[32%{,
+-	rc=\E[%z, rep=\E[%p2%db%p1%c, rev=\E[7m, ri=\E[L,
+-	rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
++	nel=\r\n, prot=\E[32%{, rc=\E[%z, rep=\E[%p2%db%p1%c,
++	rev=\E[7m, ri=\E[L, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
+ 	rs2=\E[&p\E[<12l\E\sF\E[3g\E[9;17;25;33;41;49;57;65;73
+ 	    \sN,
+ 	sc=\E[%y,
+@@ -19143,7 +19043,7 @@
+ 	sgr0=\E[0m\017, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+ 	tsl=\E[%i%p1%d%%}, vpa=\E[%i%p1%dd, use=ansi+arrows,
+ 	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+-	use=ansi+pp,
++	use=ansi+pp, use=xterm+r5+fkeys,
+ 
+ # p9-w: Prism-9 in 132 column mode
+ # --------------------------------
+@@ -19561,17 +19461,13 @@
+ 	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,
+-	kf0=\EOy, 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~,
+-	kf21=\E[31~, kf22=\E[32~, kf23=\E[33~, kf24=\E[34~,
+-	kf25=\E[35~, kf26=\E[1~, kf27=\E[2~, kf28=\E[3~,
+-	kf29=\E[4~, kf30=\E[5~, kf31=\E[6~, kf32=\E[7~, kf33=\E[8~,
+-	kf34=\E[9~, kf35=\E[10~, kf5=\E[M, kf6=\E[17~, kf7=\E[18~,
+-	kf8=\E[19~, kf9=\E[20~, khlp=\E[28~, krdo=\E[29~, mc0=\E[i,
+-	mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8, ri=\EM$<5>,
+-	rmacs=\017$<20>, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>,
+-	rmso=\E[27m, rmul=\E[24m,
++	kf0=\EOy, kf21=\E[31~, kf22=\E[32~, kf23=\E[33~,
++	kf24=\E[34~, kf25=\E[35~, kf26=\E[1~, kf27=\E[2~,
++	kf28=\E[3~, kf29=\E[4~, kf30=\E[5~, kf31=\E[6~, kf32=\E[7~,
++	kf33=\E[8~, kf34=\E[9~, kf35=\E[10~, kf5=\E[M, khlp=\E[28~,
++	krdo=\E[29~, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8,
++	ri=\EM$<5>, rmacs=\017$<20>, rmam=\E[?7l, rmir=\E[4l,
++	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
+ 	rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<
+ 	    200>,
+ 	sc=\E7,
+@@ -19581,7 +19477,7 @@
+ 	smir=\E[4h, smkx=\E[?1h\E=, tbc=\E[3g,
+ 	vpa=\E[%p1%dd$<40>, use=ansi+sgrbold, use=decid+cpr,
+ 	use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad,
+-	use=ncr260vt+sl,
++	use=ncr260vt+sl, use=vt220+sfkeys, use=vt220+ufkeys,
+ 
+ ncr260vt200wan|NCR 2900/260 VT200 wide mode ANSI keyboard,
+ 	cols#132,
+@@ -19619,17 +19515,13 @@
+ 	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,
+-	kf0=\EOy, 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~,
+-	kf21=\E[31~, kf22=\E[32~, kf23=\E[33~, kf24=\E[34~,
+-	kf25=\E[35~, kf26=\E[1~, kf27=\E[2~, kf28=\E[3~,
+-	kf29=\E[4~, kf30=\E[5~, kf31=\E[6~, kf32=\E[7~, kf33=\E[8~,
+-	kf34=\E[9~, kf35=\E[10~, kf5=\E[M, kf6=\E[17~, kf7=\E[18~,
+-	kf8=\E[19~, kf9=\E[20~, khlp=\E[28~, krdo=\E[29~, mc0=\E[i,
+-	mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8, ri=\EM$<5>,
+-	rmacs=\017$<20>, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>,
+-	rmso=\E[27m, rmul=\E[24m,
++	kf0=\EOy, kf21=\E[31~, kf22=\E[32~, kf23=\E[33~,
++	kf24=\E[34~, kf25=\E[35~, kf26=\E[1~, kf27=\E[2~,
++	kf28=\E[3~, kf29=\E[4~, kf30=\E[5~, kf31=\E[6~, kf32=\E[7~,
++	kf33=\E[8~, kf34=\E[9~, kf35=\E[10~, kf5=\E[M, khlp=\E[28~,
++	krdo=\E[29~, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8,
++	ri=\EM$<5>, rmacs=\017$<20>, rmam=\E[?7l, rmir=\E[4l,
++	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
+ 	rs2=\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>,
+ 	sc=\E7,
+@@ -19639,7 +19531,7 @@
+ 	smir=\E[4h, smkx=\E[?1h\E=, tbc=\E[3g,
+ 	vpa=\E[%p1%dd$<40>, use=ansi+sgrbold, use=decid+cpr,
+ 	use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad,
+-	use=ncr260vt+sl,
++	use=ncr260vt+sl, use=vt220+sfkeys, use=vt220+ufkeys,
+ 
+ ncr260vt300wan|NCR 2900/260 VT300 wide mode ANSI keyboard,
+ 	cols#132,
+@@ -21374,24 +21266,22 @@
+ # See
+ #	https://web.archive.org/web/20120703021949/http://www.minix3.org/manpages/html4/console.html
+ minix|minix console (v3),
+-	NQ,
+ 	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j
+ 	     \331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v
+ 	     \301w\302x\263y\363z\362{\343|\330}\234~\376,
+-	kdch1=^?, kend=\E[Y, kf0=\E[21~, kf1=\E[11~, kf10=\E[21~,
++	kdch1=^?, kend=\E[Y, kf0=\E[21~, kf10=\E[21~,
+ 	kf11=\E[11;2~, kf12=\E[12;2~, kf13=\E[13;2~,
+ 	kf14=\E[14;2~, kf15=\E[15;2~, kf16=\E[17;2~,
+-	kf17=\E[18;2~, kf18=\E[19;2~, kf19=\E[20;2~, kf2=\E[12~,
++	kf17=\E[18;2~, kf18=\E[19;2~, kf19=\E[20;2~,
+ 	kf20=\E[21;2~, kf21=\E[11;5~, kf22=\E[12;5~,
+ 	kf23=\E[13;5~, kf24=\E[14;5~, kf25=\E[15;5~,
+ 	kf26=\E[17;5~, kf27=\E[18;5~, kf28=\E[19;5~,
+-	kf29=\E[20;5~, kf3=\E[13~, kf30=\E[21;5~, kf31=\E[11;6~,
++	kf29=\E[20;5~, kf30=\E[21;5~, kf31=\E[11;6~,
+ 	kf32=\E[12;6~, kf33=\E[13;6~, kf34=\E[14;6~,
+ 	kf35=\E[15;6~, kf36=\E[17;6~, kf37=\E[18;6~,
+-	kf38=\E[19;6~, kf39=\E[20;6~, kf4=\E[14~, kf40=\E[21;6~,
+-	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+-	kich1=\E[@, knp=\E[U, kpp=\E[V, lf0@, lf1@, lf2@, lf3@, lf4@, lf5@,
+-	use=minix-3.0,
++	kf38=\E[19;6~, kf39=\E[20;6~, kf40=\E[21;6~, kich1=\E[@,
++	knp=\E[U, kpp=\E[V, lf0@, lf1@, lf2@, lf3@, lf4@, lf5@,
++	use=xterm+r5+fkeys, use=minix-3.0,
+ 
+ minix-3.0|minix console (v3.0),
+ 	use=ecma+color, use=minix-1.7,
+@@ -21778,7 +21668,7 @@
+ # From: Alexandre Montaron, 29 Sep 2016
+ 
+ linux-m1|Linux Minitel 1 "like" Couleurs,
+-	am, bw@, ccc, mir, msgr, xenl,
++	am, ccc, mir, msgr, xenl,
+ 	it#8, ncv#16,
+ 	acsc=a\261f\370g\361h\260j\274k\273l\311m\310n\316q\315t
+ 	     \314u\271v\312w\313x\272y\363z\362{\343|\252~\372,
+@@ -21790,19 +21680,15 @@
+ 	      %{255}%&%02X,
+ 	is2=\E]R\E]P3FFFF80\E[?8c, ka1=\EOw, ka3=\EOy, kb2=\E[G,
+ 	kbs=^?, kc1=\EOq, kc3=\EOs, kcbt=\E^I, kclr=\E\r,
+-	kdl1=\E\E[A, kent=\EOM, kf1=\E[[A, 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=\E[[B, kf20=\E[34~, kf3=\E[[C, kf4=\E[[D,
+-	kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+-	khome=\E[1~, kil1=\E\E[B, kmous=\E[M, nel=\EE,
+-	oc=\E]R\E]P3FFFF80, op=\E[39;49m, rev=\E[7m, ri=\EM,
+-	rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmpch=\E[10m,
+-	rmso=\E[27m, rs1=\Ec, rs3=\E[37;40m\E[8], sgr0=\E[m,
+-	smacs=^N, smam=\E[?7h, smir=\E[4h, smpch=\E[11m,
+-	smso=\E[7m, tbc=\E[3g, vpa=\E[%i%p1%dd, .VN=\E[?5l,
+-	.VR=\E[?5h, .am@, .ich=\E[%p1%d@, .ich1=\E[@, .ll=\E[99H,
+-	.rmcup=, .rmul=\E[24m, .smcup=\E]R\E]P3FFFF80\E[?8c,
++	kdl1=\E\E[A, kent=\EOM, kf2=\E[[B, khome=\E[1~,
++	kil1=\E\E[B, kmous=\E[M, nel=\EE, oc=\E]R\E]P3FFFF80,
++	op=\E[39;49m, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l,
++	rmir=\E[4l, rmpch=\E[10m, rmso=\E[27m, rs1=\Ec,
++	rs3=\E[37;40m\E[8], sgr0=\E[m, smacs=^N, smam=\E[?7h,
++	smir=\E[4h, smpch=\E[11m, smso=\E[7m, tbc=\E[3g,
++	vpa=\E[%i%p1%dd, .VN=\E[?5l, .VR=\E[?5h, .am@,
++	.ich=\E[%p1%d@, .ich1=\E[@, .ll=\E[99H, .rmcup=,
++	.rmul=\E[24m, .smcup=\E]R\E]P3FFFF80\E[?8c,
+ 	.smul=\E[4m,
+ 	E3=\E[99H\E[2J\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
+ 	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
+@@ -21814,8 +21700,9 @@
+ 	   \n\n\n\n\n\n\n\n\n\n,
+ 	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
+ 	use=ansi+erase, use=ansi+idl, use=ansi+local1,
+-	use=klone+color, use=vt220+pcedit, use=vt220+cvis,
+-	use=linux+decid,
++	use=klone+color, use=linux+decid, use=linux+lockeys,
++	use=vt220+pcedit, use=vt220+cvis, use=vt220+sfkeys,
++	use=vt220+ufkeys,
+ 
+ # 1. Using double-shapes for VT100 graphical chars (eg: mc).
+ # 2. Native brown color corrected to good yellow color.
+@@ -21872,9 +21759,7 @@
+ 
+ screen.linux-m1|Linux m1 specific for screen,
+ 	ncv@,
+-	kclr=\E\r, kdl1=\E\E[A, kf13=\E[25~, kf14=\E[26~,
+-	kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
+-	kf19=\E[33~, kf20=\E[34~, kil1=\E\E[B, rmul@, smul@,
++	kclr=\E\r, kdl1=\E\E[A, kil1=\E\E[B, rmul@, smul@,
+ 	u8=\E[?1;2c,
+ 	E3=\E[99H\E[2J\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
+ 	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
+@@ -21885,6 +21770,7 @@
+ 	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
+ 	   \n\n\n\n\n\n\n\n\n\n,
+ 	use=decid+cpr, use=xterm+x11mouse, use=screen,
++	use=vt220+sfkeys,
+ 
+ screen.linux-m1b|Linux m1b specific for screen,
+ 	colors@, pairs@,
+@@ -21898,24 +21784,24 @@
+ # Putty :
+ 
+ putty-m1|Putty Minitel 1 "like" Couleurs,
+-	dim@, kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
+-	kf5=\E[15~, rmul=\E[24m, smul=\E[4m, .E3=\E[300S,
+-	use=xterm+alt47, use=putty+screen, use=xterm+sl-twm,
+-	use=ecma+index, use=linux-m1,
++	dim@, rmul=\E[24m, smul=\E[4m, .E3=\E[300S,
++	use=xterm+r5+lockeys, use=xterm+alt47,
++	use=putty+screen, use=xterm+sl-twm, use=ecma+index,
++	use=linux-m1,
+ 
+ putty-m1b|Putty Minitel 1B "like" Monochrome (Gris/Blanc/Noir),
+-	dim@, kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
+-	kf5=\E[15~, rmul=\E[24m, smul=\E[4m, .E3=\E[300S,
+-	use=xterm+alt47, use=putty+screen, use=xterm+sl-twm,
+-	use=ecma+index, use=linux-m1b,
++	dim@, rmul=\E[24m, smul=\E[4m, .E3=\E[300S,
++	use=xterm+r5+lockeys, use=xterm+alt47,
++	use=putty+screen, use=xterm+sl-twm, use=ecma+index,
++	use=linux-m1b,
+ 
+ putty-m2|Putty Minitel 2 "like" Couleurs (Vert/Blanc/Noir),
+ 	acsc=``aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{
+ 	     {||}}~~,
+-	dim@, kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
+-	kf5=\E[15~, rmul=\E[24m, smul=\E[4m, .E3=\E[300S,
+-	use=xterm+alt47, use=putty+screen, use=xterm+sl-twm,
+-	use=ecma+index, use=linux-m2,
++	dim@, rmul=\E[24m, smul=\E[4m, .E3=\E[300S,
++	use=xterm+r5+lockeys, use=xterm+alt47,
++	use=putty+screen, use=xterm+sl-twm, use=ecma+index,
++	use=linux-m2,
+ 
+ putty+screen|PuTTY with screen resizing extensions (building-block),
+ 	.WS=\E[8;%p1%d;%p2%dt, Z0=\E[?3h, Z1=\E[?3l,
+@@ -22176,7 +22062,7 @@
+ # This entry covers the following terminals:
+ # dku7102, tws2102, and tws models 2105 to 2112
+ tws-generic|dku7102|Bull Questar tws terminals,
+-	am, eslok, hs, mir, msgr, xenl, xhp@, xon,
++	am, mir, msgr, xenl, xhp@, xon,
+ 	cols#80, lines#24, wsl#80,
+ 	acsc=``aaffggj)k\,l&m#n/ooppq*rrsst'u-v+w.x%yyzz{{||}}~~,
+ 	bel=^G, blink=\E[0;5m, civis=\E[1r, clear=\E[2J,
+@@ -22200,7 +22086,7 @@
+ 	smir=\E[4h, smso=\E[0;7m, smul=\E[0;4m,
+ 	tsl=\EPY99:98\E\\\E[0;98v\E[2;7m, use=ansi+arrows,
+ 	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
+-	use=ansi+local, use=ansi+sgrdim,
++	use=ansi+local, use=ansi+sgrdim, use=dec+sl,
+ 
+ tws2102-sna|dku7102-sna|Bull Questar tws2102 for SNA,
+ 	dsl=\E[0;98v\E[2J\E[v, fsl=\E[v, is3=\Eb, tsl=\E[0;98v,
+@@ -22306,15 +22192,12 @@
+ 	is2=\E[?2h\E[?3l\E[?5l\E[?7h\E[?8h\E>\E[?1l\E\sF\E[?42l\E[?4
+ 	    l,
+ 	is3=\E[0$}\E[?25h\E[2l\E[H\E[J, ka1=\EOw, ka3=\EOy,
+-	kb2=\EOu, kc1=\EOq, kc3=\EOs, 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, kf20=\E[34~, kf3=\EOR, kf4=\EOS,
+-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+-	khlp=\E[28~, krdo=\E[29~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4,
+-	nel=\EE, rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l,
+-	rmcup=\E[?7h, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
+-	rmul=\E[24m, rs1=\E[!p, rs2=\E[?3l, s0ds=\E(B, s1ds=\E(0,
++	kb2=\EOu, kc1=\EOq, kc3=\EOs, kf1=\EOP, kf2=\EOQ, kf3=\EOR,
++	kf4=\EOS, khlp=\E[28~, krdo=\E[29~, lf1=pf1, lf2=pf2,
++	lf3=pf3, lf4=pf4, nel=\EE, rev=\E[7m, ri=\EM, rmacs=\E(B,
++	rmam=\E[?7l, rmcup=\E[?7h, rmir=\E[4l, rmkx=\E[?1l\E>,
++	rmso=\E[27m, rmul=\E[24m, rs1=\E[!p, rs2=\E[?3l, s0ds=\E(B,
++	s1ds=\E(0,
+ 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
+ 	    %;m%?%p9%t\E(0%e\E(B%;,
+ 	sgr0=\E[0m\E(B, smacs=\E(0, smam=\E[?7h,
+@@ -22322,7 +22205,7 @@
+ 	smul=\E[4m, tsl=\E[1$}\E[2$~, use=ansi+enq, use=ansi+csr,
+ 	use=ansi+erase, use=ansi+idl, use=ansi+local,
+ 	use=ansi+pp, use=dec+sl, use=vt100+4bsd, use=vt220+cvis,
+-	use=vt220+vtedit,
++	use=vt220+vtedit, use=vt220+sfkeys, use=vt220+ufkeys,
+ 
+ bq300-rv|Bull VT320 reverse 80 columns,
+ 	flash=\E[?5l$<50>\E[?5h,
+@@ -27842,4 +27725,9 @@
+ # 2024-12-28
+ #	+ add ghostty -TD
+ #
++# 2025-01-04
++#	+ cleanup use-clauses -TD
++#	+ add linux+lockeys, xterm+r5+lockeys, xterm+r5+fkeys -TD
++#	+ add vt220+ufkeys, vt220+sfkeys
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: ncurses/base/MKlib_gen.sh
+Prereq:  1.76 
+--- ncurses-6.5-20241228+/ncurses/base/MKlib_gen.sh	2024-12-21 16:51:25.000000000 +0000
++++ ncurses-6.5-20250104/ncurses/base/MKlib_gen.sh	2024-12-29 10:49:59.000000000 +0000
+@@ -2,7 +2,7 @@
+ #
+ # MKlib_gen.sh -- generate sources from curses.h macro definitions
+ #
+-# ($Id: MKlib_gen.sh,v 1.76 2024/12/21 16:51:25 tom Exp $)
++# ($Id: MKlib_gen.sh,v 1.77 2024/12/29 10:49:59 tom Exp $)
+ #
+ ##############################################################################
+ # Copyright 2018-2022,2024 Thomas E. Dickey                                  #
+@@ -188,10 +188,10 @@
+ cat >$ED4 <$ED4 <  Sat, 28 Dec 2024 06:24:50 -0500
++ -- Thomas E. Dickey   Sun, 29 Dec 2024 04:55:25 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw/copyright
+--- ncurses-6.5-20241228+/package/debian-mingw/copyright	2024-01-05 21:15:12.000000000 +0000
++++ ncurses-6.5-20250104/package/debian-mingw/copyright	2025-01-04 10:55:16.000000000 +0000
+@@ -5,12 +5,12 @@
+ 
+ -------------------------------------------------------------------------------
+ Files: *
+-Copyright: 2017-2023,2024 by Thomas E. Dickey
++Copyright: 2017-2024,2025 by Thomas E. Dickey
+ Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+ License: X11
+ 
+ Files: aclocal.m4 package
+-Copyright: 1996-2023,2024 by Thomas E. Dickey
++Copyright: 1996-2024,2025 by Thomas E. Dickey
+ License: X11
+ 
+ Files: doc/html/NCURSES-Programming-HOWTO.html
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20241228+/package/debian-mingw64/changelog	2024-12-28 11:24:50.000000000 +0000
++++ ncurses-6.5-20250104/package/debian-mingw64/changelog	2025-01-04 09:55:25.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241228) unstable; urgency=low
++ncurses6td (6.5+20250104) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 28 Dec 2024 06:24:50 -0500
++ -- Thomas E. Dickey   Sun, 29 Dec 2024 04:55:25 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/copyright
+--- ncurses-6.5-20241228+/package/debian-mingw64/copyright	2024-01-05 21:15:37.000000000 +0000
++++ ncurses-6.5-20250104/package/debian-mingw64/copyright	2025-01-04 10:55:34.000000000 +0000
+@@ -5,12 +5,12 @@
+ 
+ -------------------------------------------------------------------------------
+ Files: *
+-Copyright: 2017-2023,2024 by Thomas E. Dickey
++Copyright: 2017-2024,2025 by Thomas E. Dickey
+ Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+ License: X11
+ 
+ Files: aclocal.m4 package
+-Copyright: 1996-2023,2024 by Thomas E. Dickey
++Copyright: 1996-2024,2025 by Thomas E. Dickey
+ License: X11
+ 
+ Files: doc/html/NCURSES-Programming-HOWTO.html
+Index: package/debian/changelog
+--- ncurses-6.5-20241228+/package/debian/changelog	2024-12-28 11:24:50.000000000 +0000
++++ ncurses-6.5-20250104/package/debian/changelog	2025-01-04 09:55:25.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20241228) unstable; urgency=low
++ncurses6td (6.5+20250104) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 28 Dec 2024 06:24:50 -0500
++ -- Thomas E. Dickey   Sun, 29 Dec 2024 04:55:25 -0500
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/debian/copyright
+--- ncurses-6.5-20241228+/package/debian/copyright	2024-01-05 21:14:42.000000000 +0000
++++ ncurses-6.5-20250104/package/debian/copyright	2025-01-04 10:54:57.000000000 +0000
+@@ -5,12 +5,12 @@
+ 
+ -------------------------------------------------------------------------------
+ Files: *
+-Copyright: 2017-2023,2024 by Thomas E. Dickey
++Copyright: 2017-2024,2025 by Thomas E. Dickey
+ Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+ License: X11
+ 
+ Files: aclocal.m4 package
+-Copyright: 1996-2023,2024 by Thomas E. Dickey
++Copyright: 1996-2024,2025 by Thomas E. Dickey
+ License: X11
+ 
+ Files: doc/html/NCURSES-Programming-HOWTO.html
+Index: package/mingw-ncurses.nsi
+Prereq:  1.682 
+--- ncurses-6.5-20241228+/package/mingw-ncurses.nsi	2024-12-28 11:24:50.000000000 +0000
++++ ncurses-6.5-20250104/package/mingw-ncurses.nsi	2025-01-04 09:55:25.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.682 2024/12/28 11:24:50 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.683 2025/01/04 09:55:25 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -9,8 +9,8 @@
+ 
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+-!define VERSION_YYYY  "2024"
+-!define VERSION_MMDD  "1228"
++!define VERSION_YYYY  "2025"
++!define VERSION_MMDD  "0104"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20241228+/package/mingw-ncurses.spec	2024-12-28 11:24:50.000000000 +0000
++++ ncurses-6.5-20250104/package/mingw-ncurses.spec	2025-01-04 09:55:25.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20241228
++Release: 20250104
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20241228+/package/ncurses.spec	2024-12-28 11:24:50.000000000 +0000
++++ ncurses-6.5-20250104/package/ncurses.spec	2025-01-04 09:55:25.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20241228
++Release: 20250104
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20241228+/package/ncursest.spec	2024-12-28 11:24:50.000000000 +0000
++++ ncurses-6.5-20250104/package/ncursest.spec	2025-01-04 09:55:25.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20241228
++Release: 20250104
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/tput.c
+Prereq:  1.107 
+--- ncurses-6.5-20241228+/progs/tput.c	2024-12-07 22:12:53.000000000 +0000
++++ ncurses-6.5-20250104/progs/tput.c	2025-01-05 00:10:46.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 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.107 2024/12/07 22:12:53 tom Exp $")
++MODULE_ID("$Id: tput.c,v 1.109 2025/01/05 00:10:46 tom Exp $")
+ 
+ #define PUTS(s)		fputs(s, stdout)
+ 
+@@ -239,54 +239,71 @@
+ #endif
+ 	quit(ErrCapName, "unknown terminfo capability '%s'", name);
+     } else if (VALID_STRING(s)) {
+-	if (argc > 1) {
+-	    int k;
+-	    int narg;
+-	    int analyzed;
+-	    int provided;
+-	    int popcount;
+-	    long numbers[1 + NUM_PARM];
+-	    char *strings[1 + NUM_PARM];
+-	    char *p_is_s[NUM_PARM];
+-	    TParams paramType;
+-
+-	    /* Nasty hack time. The tparm function needs to see numeric
+-	     * parameters as numbers, not as pointers to their string
+-	     * representations
+-	     */
+-
+-	    for (k = 1; (k < argc) && (k <= NUM_PARM); k++) {
+-		char *tmp = NULL;
+-		strings[k] = argv[k];
+-		numbers[k] = strtol(argv[k], &tmp, 0);
+-		if (tmp == NULL || *tmp != 0)
+-		    numbers[k] = 0;
+-	    }
+-	    for (k = argc; k <= NUM_PARM; k++) {
+-		numbers[k] = 0;
+-		strings[k] = NULL;
+-	    }
++	TParams paramType;
++	long numbers[1 + NUM_PARM];
++	char *strings[1 + NUM_PARM];
++	char *p_is_s[NUM_PARM];
++	int k;
++	int narg;
++	int analyzed = 0;
++	int provided = 0;
++	int popcount = 0;
+ 
+-	    paramType = tparm_type(name);
++	paramType = tparm_type(name);
+ #if NCURSES_XNAMES
+-	    /*
+-	     * If the capability is an extended one, analyze the string.
+-	     */
+-	    if (paramType == Numbers) {
+-		struct name_table_entry const *entry_ptr;
+-		entry_ptr = _nc_find_type_entry(name, STRING, FALSE);
+-		if (entry_ptr == NULL) {
+-		    paramType = Other;
+-		}
++	/*
++	 * If the capability is an extended one, analyze the string.
++	 */
++	if (paramType == Numbers) {
++	    struct name_table_entry const *entry_ptr;
++	    entry_ptr = _nc_find_type_entry(name, STRING, FALSE);
++	    if (entry_ptr == NULL) {
++		paramType = Other;
+ 	    }
++	}
+ #endif
++	/* Nasty hack time.  The tparm function needs to see numeric parameters
++	 * as numbers, not as pointers to their string representations
++	 */
++	for (k = 1; (k < argc) && (k <= NUM_PARM); k++) {
++	    char *tmp = NULL;
++	    strings[k] = argv[k];
++	    numbers[k] = strtol(argv[k], &tmp, 0);
++	    if (tmp == NULL || *tmp != 0)
++		numbers[k] = 0;
++	}
++	for (k = argc; k <= NUM_PARM; k++) {
++	    numbers[k] = 0;
++	    strings[k] = NULL;
++	}
++
++	switch (paramType) {
++	case Str:
++	    analyzed = 1;
++	    break;
++	case Str_Str:
++	    analyzed = 2;
++	    break;
++	case Num_Str:
++	    analyzed = 2;
++	    break;
++	case Num_Str_Str:
++	    analyzed = 3;
++	    break;
++	case Numbers:
++	case Other:
++	    analyzed = _nc_tparm_analyze(NULL, s, p_is_s, &popcount);
++	    break;
++	}
++	if (analyzed < popcount) {
++	    analyzed = popcount;
++	}
+ 
+-	    popcount = 0;
++	if (argc > 1) {
+ 	    _nc_reset_tparm(NULL);
+ 	    /*
+ 	     * Count the number of numeric parameters which are provided.
+ 	     */
+-	    provided = 0;
+ 	    for (narg = 1; narg < argc; ++narg) {
+ 		char *ending = NULL;
+ 		long check = strtol(argv[narg], &ending, 0);
+@@ -297,13 +314,11 @@
+ 	    switch (paramType) {
+ 	    case Str:
+ 		s = TPARM_1(s, strings[1]);
+-		analyzed = 1;
+ 		if (provided == 0 && argc >= 1)
+ 		    provided++;
+ 		break;
+ 	    case Str_Str:
+ 		s = TPARM_2(s, strings[1], strings[2]);
+-		analyzed = 2;
+ 		if (provided == 0 && argc >= 1)
+ 		    provided++;
+ 		if (provided == 1 && argc >= 2)
+@@ -311,22 +326,19 @@
+ 		break;
+ 	    case Num_Str:
+ 		s = TPARM_2(s, numbers[1], strings[2]);
+-		analyzed = 2;
+ 		if (provided == 1 && argc >= 2)
+ 		    provided++;
+ 		break;
+ 	    case Num_Str_Str:
+ 		s = TPARM_3(s, numbers[1], strings[2], strings[3]);
+-		analyzed = 3;
+ 		if (provided == 1 && argc >= 2)
+ 		    provided++;
+ 		if (provided == 2 && argc >= 3)
+ 		    provided++;
+ 		break;
+ 	    case Numbers:
+-		analyzed = _nc_tparm_analyze(NULL, s, p_is_s, &popcount);
+ #define myParam(n) numbers[n]
+-		s = TIPARM_9(s,
++		s = TIPARM_N(analyzed, s,
+ 			     myParam(1),
+ 			     myParam(2),
+ 			     myParam(3),
+@@ -341,24 +353,20 @@
+ 	    case Other:
+ 		/* FALLTHRU */
+ 	    default:
+-		analyzed = _nc_tparm_analyze(NULL, s, p_is_s, &popcount);
+ #define myParam(n) (p_is_s[n - 1] != NULL ? ((TPARM_ARG) strings[n]) : numbers[n])
+-		s = TPARM_9(s,
+-			    myParam(1),
+-			    myParam(2),
+-			    myParam(3),
+-			    myParam(4),
+-			    myParam(5),
+-			    myParam(6),
+-			    myParam(7),
+-			    myParam(8),
+-			    myParam(9));
++		s = TIPARM_N(analyzed, s,
++			     myParam(1),
++			     myParam(2),
++			     myParam(3),
++			     myParam(4),
++			     myParam(5),
++			     myParam(6),
++			     myParam(7),
++			     myParam(8),
++			     myParam(9));
+ #undef myParam
+ 		break;
+ 	    }
+-	    if (analyzed < popcount) {
+-		analyzed = popcount;
+-	    }
+ 	    if (opt_v && (analyzed != provided)) {
+ 		fprintf(stderr, "%s: %s parameters for \"%s\"\n",
+ 			_nc_progname,
+@@ -366,6 +374,12 @@
+ 			argv[0]);
+ 	    }
+ 	    *used += provided;
++	} else {
++	    if (opt_v) {
++		fprintf(stderr, "%s: missing parameters for \"%s\"\n",
++			_nc_progname,
++			argv[0]);
++	    }
+ 	}
+ 
+ 	/* use putp() in order to perform padding */
+Index: test/package/debian-mingw/copyright
+--- ncurses-6.5-20241228+/test/package/debian-mingw/copyright	2024-01-05 21:17:19.000000000 +0000
++++ ncurses-6.5-20250104/test/package/debian-mingw/copyright	2025-01-04 10:56:36.000000000 +0000
+@@ -4,12 +4,12 @@
+ 
+ -------------------------------------------------------------------------------
+ Files: *
+-Copyright: 2017-2023,2024 Thomas E. Dickey
++Copyright: 2017-2024,2025 Thomas E. Dickey
+ Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+ License: X11
+ 
+ Files: aclocal.m4 package
+-Copyright: 2003-2023,2024 by Thomas E. Dickey
++Copyright: 2003-2024,2025 by Thomas E. Dickey
+ License: X11
+ 
+     Permission is hereby granted, free of charge, to any person obtaining a
+Index: test/package/debian-mingw64/copyright
+--- ncurses-6.5-20241228+/test/package/debian-mingw64/copyright	2024-01-05 21:17:53.000000000 +0000
++++ ncurses-6.5-20250104/test/package/debian-mingw64/copyright	2025-01-04 10:56:53.000000000 +0000
+@@ -4,12 +4,12 @@
+ 
+ -------------------------------------------------------------------------------
+ Files: *
+-Copyright: 2017-2023,2024 Thomas E. Dickey
++Copyright: 2017-2024,2025 Thomas E. Dickey
+ Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+ License: X11
+ 
+ Files: aclocal.m4 package
+-Copyright: 2003-2023,2024 by Thomas E. Dickey
++Copyright: 2003-2024,2025 by Thomas E. Dickey
+ License: X11
+ 
+     Permission is hereby granted, free of charge, to any person obtaining a
+Index: test/package/debian/copyright
+--- ncurses-6.5-20241228+/test/package/debian/copyright	2024-01-05 21:16:50.000000000 +0000
++++ ncurses-6.5-20250104/test/package/debian/copyright	2025-01-04 10:56:09.000000000 +0000
+@@ -4,12 +4,12 @@
+ 
+ -------------------------------------------------------------------------------
+ Files: *
+-Copyright: 2017-2023,2024 Thomas E. Dickey
++Copyright: 2017-2024,2025 Thomas E. Dickey
+ Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+ License: X11
+ 
+ Files: aclocal.m4 package
+-Copyright: 2003-2023,2024 by Thomas E. Dickey
++Copyright: 2003-2024,2025 by Thomas E. Dickey
+ License: X11
+ 
+     Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250111.patch b/packages/ncurses/6.5/ncurses-6.5-20250111.patch
new file mode 100644
index 0000000000..9dd2f4f962
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250111.patch
@@ -0,0 +1,1400 @@
+# ncurses 6.5 - patch 20250111 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250111.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Jan 12 01:47:24 UTC 2025
+# ------------------------------------------------------------------------------
+# NEWS                             |    8 +++++++-
+# VERSION                          |    2 +-
+# dist.mk                          |    4 ++--
+# include/curses.wide              |    4 ++--
+# include/term_entry.h             |    9 +++++----
+# ncurses/base/lib_screen.c        |    8 ++++----
+# ncurses/base/lib_set_term.c      |   10 +++++-----
+# ncurses/curses.priv.h            |    6 +++---
+# ncurses/tinfo/alloc_entry.c      |    6 +++---
+# ncurses/tinfo/comp_parse.c       |   33 ++++++++++++++++++++++++++++-----
+# ncurses/tinfo/db_iterator.c      |    8 ++++----
+# ncurses/tinfo/hashed_db.c        |   18 +++++++++---------
+# ncurses/tinfo/lib_termname.c     |    6 +++---
+# ncurses/tinfo/lib_tgoto.c        |   18 +++++++++---------
+# ncurses/tinfo/lib_tputs.c        |    6 +++---
+# ncurses/tinfo/name_match.c       |    6 +++---
+# ncurses/tinfo/parse_entry.c      |   11 ++++++++---
+# ncurses/tinfo/read_entry.c       |    8 ++++----
+# ncurses/tinfo/read_termcap.c     |   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 +-
+# progs/tic.c                      |    6 +++---
+# progs/toe.c                      |   14 +++++++-------
+# progs/tput.c                     |    4 ++--
+# test/demo_altkeys.c              |   12 +++++++-----
+# test/demo_termcap.c              |   11 +++++++----
+# test/demo_terminfo.c             |   11 +++++++----
+# test/dup_field.c                 |   10 ++++++----
+# test/edit_field.c                |   10 ++++++----
+# test/foldkeys.c                  |    6 ++++--
+# test/move_field.c                |   10 ++++++----
+# test/movewindow.c                |   16 ++++++++++------
+# test/test_sgr.c                  |   11 +++++++----
+# 38 files changed, 204 insertions(+), 146 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4226 
+--- ncurses-6.5-20250104+/NEWS	2025-01-05 00:18:47.000000000 +0000
++++ ncurses-6.5-20250111/NEWS	2025-01-11 21:55:20.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4226 2025/01/05 00:18:47 tom Exp $
++-- $Id: NEWS,v 1.4229 2025/01/11 21:55: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.
+ 
++20250111
++	+ add check for infinite loop in tic's use-resolution.
++	+ increase limit on use-clauses from 32 to 40, warn but allow entries
++	  which exceed the old limit.
++	+ add some null-pointer checks after mallocs in test-programs.
++
+ 20250104
+ 	+ modify tput to warn about capabilities which expect parameters where
+ 	  none are given; also repair the feature where multiple capabilities
+Index: VERSION
+--- ncurses-6.5-20250104+/VERSION	2025-01-04 09:55:25.000000000 +0000
++++ ncurses-6.5-20250111/VERSION	2025-01-11 12:30:15.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250104
++5:0:10	6.5	20250111
+Index: dist.mk
+Prereq:  1.1649 
+--- ncurses-6.5-20250104+/dist.mk	2025-01-04 09:55:25.000000000 +0000
++++ ncurses-6.5-20250111/dist.mk	2025-01-11 12:30:15.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1649 2025/01/04 09:55:25 tom Exp $
++# $Id: dist.mk,v 1.1650 2025/01/11 12:30: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 = 5
+-NCURSES_PATCH = 20250104
++NCURSES_PATCH = 20250111
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: include/curses.wide
+Prereq:  1.51 
+--- ncurses-6.5-20250104+/include/curses.wide	2021-05-22 20:28:29.000000000 +0000
++++ ncurses-6.5-20250111/include/curses.wide	2025-01-12 00:39:32.000000000 +0000
+@@ -1,4 +1,4 @@
+-/* $Id: curses.wide,v 1.51 2021/05/22 20:28:29 tom Exp $ */
++/* $Id: curses.wide,v 1.52 2025/01/12 00:39:32 tom Exp $ */
+ /*
+  * vile:cmode:
+  * This file is part of ncurses, designed to be appended after curses.h.in
+@@ -240,7 +240,7 @@
+ #define bkgrnd(c)			wbkgrnd(stdscr,(c))
+ #define bkgrndset(c)			wbkgrndset(stdscr,(c))
+ #define border_set(l,r,t,b,tl,tr,bl,br) wborder_set(stdscr,(l),(r),(t),(b),tl,tr,bl,br)
+-#define box_set(w,v,h)			wborder_set((w),(v),(v),(h),(h),0,0,0,0)
++#define box_set(w,v,h)			wborder_set((w),(v),(v),(h),(h),NULL,NULL,NULL,NULL)
+ #define echo_wchar(c)			wecho_wchar(stdscr,(c))
+ #define get_wch(c)			wget_wch(stdscr,(c))
+ #define get_wstr(t)			wget_wstr(stdscr,(t))
+Index: include/term_entry.h
+Prereq:  1.64 
+--- ncurses-6.5-20250104+/include/term_entry.h	2023-04-22 13:37:14.000000000 +0000
++++ ncurses-6.5-20250111/include/term_entry.h	2025-01-11 20:37:28.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -33,7 +33,7 @@
+  *     and: Thomas E. Dickey                        1998-on                 *
+  ****************************************************************************/
+ 
+-/* $Id: term_entry.h,v 1.64 2023/04/22 13:37:14 tom Exp $ */
++/* $Id: term_entry.h,v 1.65 2025/01/11 20:37:28 tom Exp $ */
+ 
+ /*
+  *	term_entry.h -- interface to entry-manipulation code
+@@ -108,7 +108,8 @@
+ 	dbdLAST
+ } DBDIRS;
+ 
+-#define MAX_USES	32
++#define WARN_MAX_USES	32
++#define HARD_MAX_USES	40
+ #define MAX_CROSSLINKS	16
+ 
+ typedef struct entry ENTRY;
+@@ -122,7 +123,7 @@
+ struct entry {
+ 	TERMTYPE2 tterm;
+ 	unsigned nuses;
+-	ENTRY_USES uses[MAX_USES];
++	ENTRY_USES uses[HARD_MAX_USES];
+ 	int ncrosslinks;
+ 	ENTRY *crosslinks[MAX_CROSSLINKS];
+ 	long cstart;
+Index: ncurses/base/lib_screen.c
+Prereq:  1.110 
+--- ncurses-6.5-20250104+/ncurses/base/lib_screen.c	2024-12-07 17:46:49.000000000 +0000
++++ ncurses-6.5-20250111/ncurses/base/lib_screen.c	2025-01-12 00:31:03.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -42,7 +42,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_screen.c,v 1.110 2024/12/07 17:46:49 tom Exp $")
++MODULE_ID("$Id: lib_screen.c,v 1.112 2025/01/12 00:31:03 tom Exp $")
+ 
+ #define MAX_SIZE 0x3fff		/* 16k is big enough for a window or pad */
+ 
+@@ -58,7 +58,7 @@
+ #define ARG_SLIMIT(name)	/* nothing */
+ #endif
+ 
+-#define CUR_SLIMIT _nc_SLIMIT(limit - (size_t) (target - base))
++#define CUR_SLIMIT _nc_SLIMIT(limit - (size_t) (target + 1 - base))
+ #define TOP_SLIMIT _nc_SLIMIT(sizeof(buffer))
+ 
+ /*
+@@ -917,7 +917,7 @@
+      * ncurses is compiled with wide-character support, and also may depend
+      * on the version of ncurses, e.g., if the WINDOW structure is extended.
+      */
+-    if (win != 0) {
++    if (win != NULL) {
+ 	size_t len = (size_t) (win->_maxx + 1);
+ 	int y;
+ 
+Index: ncurses/base/lib_set_term.c
+Prereq:  1.191 
+--- ncurses-6.5-20250104+/ncurses/base/lib_set_term.c	2024-12-15 00:04:13.000000000 +0000
++++ ncurses-6.5-20250111/ncurses/base/lib_set_term.c	2025-01-12 00:41:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -57,7 +57,7 @@
+ #undef CUR
+ #define CUR SP_TERMTYPE
+ 
+-MODULE_ID("$Id: lib_set_term.c,v 1.191 2024/12/15 00:04:13 tom Exp $")
++MODULE_ID("$Id: lib_set_term.c,v 1.192 2025/01/12 00:41:56 tom Exp $")
+ 
+ #ifdef USE_TERM_DRIVER
+ #define MaxColors      InfoOf(sp).maxcolors
+@@ -362,8 +362,8 @@
+     }
+ #else
+     if (!_nc_alloc_screen()
+-	|| ((SP->_acs_map = typeCalloc(chtype, ACS_LEN)) == 0)
+-	|| ((SP->_screen_acs_map = typeCalloc(bool, ACS_LEN)) == 0)) {
++	|| ((SP->_acs_map = typeCalloc(chtype, ACS_LEN)) == NULL)
++	|| ((SP->_screen_acs_map = typeCalloc(bool, ACS_LEN)) == NULL)) {
+ 	returnCode(ERR);
+     }
+ 
+@@ -373,7 +373,7 @@
+     sp->_next_screen = _nc_screen_chain;
+     _nc_screen_chain = sp;
+ 
+-    if ((sp->_current_attr = typeCalloc(NCURSES_CH_T, 1)) == 0) {
++    if ((sp->_current_attr = typeCalloc(NCURSES_CH_T, 1)) == NULL) {
+ 	returnCode(ERR);
+     }
+ #endif
+Index: ncurses/curses.priv.h
+Prereq:  1.698 
+--- ncurses-6.5-20250104+/ncurses/curses.priv.h	2024-12-15 00:04:23.000000000 +0000
++++ ncurses-6.5-20250111/ncurses/curses.priv.h	2025-01-12 00:41:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -35,7 +35,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: curses.priv.h,v 1.698 2024/12/15 00:04:23 tom Exp $
++ * $Id: curses.priv.h,v 1.699 2025/01/12 00:41:56 tom Exp $
+  *
+  *	curses.priv.h
+  *
+@@ -2329,7 +2329,7 @@
+ /* current screen is private data; avoid possible linking conflicts too */
+ extern NCURSES_EXPORT_VAR(SCREEN *) SP;
+ #define CURRENT_SCREEN SP
+-#define _nc_alloc_screen()      ((SP = _nc_alloc_screen_sp()) != 0)
++#define _nc_alloc_screen()      ((SP = _nc_alloc_screen_sp()) != NULL)
+ #define _nc_set_screen(sp)      SP = sp
+ #endif
+ 
+Index: ncurses/tinfo/alloc_entry.c
+Prereq:  1.81 
+--- ncurses-6.5-20250104+/ncurses/tinfo/alloc_entry.c	2024-12-07 21:12:53.000000000 +0000
++++ ncurses-6.5-20250111/ncurses/tinfo/alloc_entry.c	2025-01-11 20:37:19.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 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.81 2024/12/07 21:12:53 tom Exp $")
++MODULE_ID("$Id: alloc_entry.c,v 1.82 2025/01/11 20:37:19 tom Exp $")
+ 
+ #define ABSENT_OFFSET    -1
+ #define CANCELLED_OFFSET -2
+@@ -140,7 +140,7 @@
+ /* copy the string parts to allocated storage, preserving pointers to it */
+ {
+     int offsets[MAX_ENTRY_SIZE / sizeof(short)];
+-    int useoffsets[MAX_USES];
++    int useoffsets[HARD_MAX_USES];
+     unsigned i, n;
+     unsigned nuses;
+     TERMTYPE2 *tp;
+Index: ncurses/tinfo/comp_parse.c
+Prereq:  1.136 
+--- ncurses-6.5-20250104+/ncurses/tinfo/comp_parse.c	2024-12-07 21:12:53.000000000 +0000
++++ ncurses-6.5-20250111/ncurses/tinfo/comp_parse.c	2025-01-12 00:36:01.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2016,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: comp_parse.c,v 1.136 2024/12/07 21:12:53 tom Exp $")
++MODULE_ID("$Id: comp_parse.c,v 1.138 2025/01/12 00:36:01 tom Exp $")
+ 
+ static void sanity_check2(TERMTYPE2 *, bool);
+ NCURSES_IMPEXP void (NCURSES_API *_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2;
+@@ -99,7 +99,7 @@
+ {
+     char *bar = strchr(name, '|');
+ 
+-    if (bar != 0 && (bar - name) == 2)
++    if (bar != NULL && (bar - name) == 2)
+ 	name = bar + 1;
+ 
+     return name;
+@@ -538,12 +538,18 @@
+      */
+     if (fullresolve) {
+ 	do {
++	    bool attempts;
++	    bool progress;
+ 	    ENTRY merged;
+ 
++	    attempts = FALSE;
++	    progress = FALSE;
+ 	    keepgoing = FALSE;
+ 
+ 	    for_entry_list(qp) {
+ 		if (qp->nuses > 0) {
++		    attempts = TRUE;
++
+ 		    DEBUG(2, ("%s: attempting merge of %d entries",
+ 			      _nc_first_name(qp->tterm.term_names),
+ 			      qp->nuses));
+@@ -599,16 +605,33 @@
+ #endif
+ 		    qp->tterm = merged.tterm;
+ 		    _nc_wrap_entry(qp, TRUE);
++		    progress = TRUE;
+ 
+ 		    /*
+-		     * We know every entry is resolvable because name resolution
+-		     * didn't bomb.  So go back for another pass.
++		     * Every entry should be resolvable because name resolution
++		     * did not fail.  Continue if we have just made a change,
++		     * or another entry may be changeable.
+ 		     */
+ 		    /* FALLTHRU */
+ 		  incomplete:
+ 		    keepgoing = TRUE;
+ 		}
+ 	    }
++
++	    /*
++	     * If we went all the way through the list without making any
++	     * changes, while there were remaining use-linkages, something went
++	     * wrong.  Give up.
++	     */
++	    if (!progress && attempts) {
++		for_entry_list(qp) {
++		    for (i = 0; i < qp->nuses; ++i) {
++			_nc_warning("problem with use=%s", qp->uses[i].name);
++		    }
++		}
++		_nc_warning("merge failed, infinite loop");
++		return FALSE;
++	    }
+ 	} while
+ 	    (keepgoing);
+ 
+Index: ncurses/tinfo/db_iterator.c
+Prereq:  1.52 
+--- ncurses-6.5-20250104+/ncurses/tinfo/db_iterator.c	2024-12-07 18:23:25.000000000 +0000
++++ ncurses-6.5-20250111/ncurses/tinfo/db_iterator.c	2025-01-12 00:41:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2006-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -44,7 +44,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: db_iterator.c,v 1.52 2024/12/07 18:23:25 tom Exp $")
++MODULE_ID("$Id: db_iterator.c,v 1.53 2025/01/12 00:41:56 tom Exp $")
+ 
+ #define HaveTicDirectory _nc_globals.have_tic_directory
+ #define KeepTicDirectory _nc_globals.keep_tic_directory
+@@ -335,9 +335,9 @@
+ #if NCURSES_USE_TERMCAP
+ 	    values[dbdEnvOnce2] = cache_getenv("TERMCAP", dbdEnvOnce2);
+ 	    /* only use $TERMCAP if it is an absolute path */
+-	    if (values[dbdEnvOnce2] != 0
++	    if (values[dbdEnvOnce2] != NULL
+ 		&& *values[dbdEnvOnce2] != '/') {
+-		values[dbdEnvOnce2] = 0;
++		values[dbdEnvOnce2] = NULL;
+ 	    }
+ 	    values[dbdEnvList2] = cache_getenv("TERMPATH", dbdEnvList2);
+ #endif /* NCURSES_USE_TERMCAP */
+Index: ncurses/tinfo/hashed_db.c
+Prereq:  1.21 
+--- ncurses-6.5-20250104+/ncurses/tinfo/hashed_db.c	2024-11-30 21:16:41.000000000 +0000
++++ ncurses-6.5-20250111/ncurses/tinfo/hashed_db.c	2025-01-11 23:52:18.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2006-2011,2013 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -37,7 +37,7 @@
+ 
+ #if USE_HASHED_DB
+ 
+-MODULE_ID("$Id: hashed_db.c,v 1.21 2024/11/30 21:16:41 tom Exp $")
++MODULE_ID("$Id: hashed_db.c,v 1.22 2025/01/11 23:52:18 tom Exp $")
+ 
+ #if HASHED_DB_API >= 2
+ static DBC *cursor;
+@@ -55,7 +55,7 @@
+ static void
+ cleanup(void)
+ {
+-    while (connections != 0) {
++    while (connections != NULL) {
+ 	_nc_db_close(connections->db);
+     }
+ }
+@@ -63,10 +63,10 @@
+ static DB *
+ find_connection(const char *path, bool modify)
+ {
+-    DB *result = 0;
++    DB *result = NULL;
+     MYCONN *p;
+ 
+-    for (p = connections; p != 0; p = p->next) {
++    for (p = connections; p != NULL; p = p->next) {
+ 	if (!strcmp(p->path, path) && p->modify == modify) {
+ 	    result = p->db;
+ 	    break;
+@@ -81,9 +81,9 @@
+ {
+     MYCONN *p, *q;
+ 
+-    for (p = connections, q = 0; p != 0; q = p, p = p->next) {
++    for (p = connections, q = NULL; p != NULL; q = p, p = p->next) {
+ 	if (p->db == db) {
+-	    if (q != 0)
++	    if (q != NULL)
+ 		q->next = p->next;
+ 	    else
+ 		connections = p->next;
+@@ -124,7 +124,7 @@
+     DB *result = NULL;
+     int code;
+ 
+-    if (connections == 0)
++    if (connections == NULL)
+ 	atexit(cleanup);
+ 
+     if ((result = find_connection(path, modify)) == NULL) {
+@@ -165,7 +165,7 @@
+ 			     modify ? (O_CREAT | O_RDWR) : O_RDONLY,
+ 			     0644,
+ 			     DB_HASH,
+-			     NULL)) == 0) {
++			     NULL)) == NULL) {
+ 	    code = errno;
+ 	} else {
+ 	    code = 0;
+Index: ncurses/tinfo/lib_termname.c
+Prereq:  1.14 
+--- ncurses-6.5-20250104+/ncurses/tinfo/lib_termname.c	2024-12-07 20:05:27.000000000 +0000
++++ ncurses-6.5-20250111/ncurses/tinfo/lib_termname.c	2025-01-12 00:41:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2024 Thomas E. Dickey                                     *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2003,2009 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,7 +29,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_termname.c,v 1.14 2024/12/07 20:05:27 tom Exp $")
++MODULE_ID("$Id: lib_termname.c,v 1.15 2025/01/12 00:41:56 tom Exp $")
+ 
+ NCURSES_EXPORT(char *)
+ NCURSES_SP_NAME(termname) (NCURSES_SP_DCL0)
+@@ -43,7 +43,7 @@
+ 	name = TerminalOf(SP_PARM)->_termname;
+     }
+ #else
+-    if (cur_term != 0)
++    if (cur_term != NULL)
+ 	name = cur_term->_termname;
+ #endif
+ 
+Index: ncurses/tinfo/lib_tgoto.c
+Prereq:  1.23 
+--- ncurses-6.5-20250104+/ncurses/tinfo/lib_tgoto.c	2023-04-16 17:19:40.000000000 +0000
++++ ncurses-6.5-20250111/ncurses/tinfo/lib_tgoto.c	2025-01-12 00:41:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2025 Thomas E. Dickey                                *
+  * Copyright 2000-2008,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -36,7 +36,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: lib_tgoto.c,v 1.23 2023/04/16 17:19:40 tom Exp $")
++MODULE_ID("$Id: lib_tgoto.c,v 1.24 2025/01/12 00:41:56 tom Exp $")
+ 
+ #if !PURE_TERMINFO
+ static bool
+@@ -44,7 +44,7 @@
+ {
+     bool result = TRUE;
+ 
+-    if (string == 0 || *string == '\0') {
++    if (string == NULL || *string == '\0') {
+ 	result = FALSE;		/* tparm() handles empty strings */
+     } else {
+ 	while ((*string != '\0') && result) {
+@@ -89,13 +89,13 @@
+     while (*string != 0) {
+ 	if ((used + need) > length) {
+ 	    length += (used + need);
+-	    if ((result = typeRealloc(char, length, result)) == 0) {
++	    if ((result = typeRealloc(char, length, result)) == NULL) {
+ 		length = 0;
+ 		break;
+ 	    }
+ 	}
+ 	if (*string == '%') {
+-	    const char *fmt = 0;
++	    const char *fmt = NULL;
+ 
+ 	    switch (*++string) {
+ 	    case '\0':
+@@ -122,7 +122,7 @@
+ 		 * and \r, but I don't see that it could work -TD
+ 		 */
+ 		if (*value == 0) {
+-		    if (BC != 0) {
++		    if (BC != NULL) {
+ 			*value += 1;
+ 			need_BC = TRUE;
+ 		    } else {
+@@ -166,11 +166,11 @@
+ 		*value -= 2 * (*value % 16);
+ 		break;
+ 	    }
+-	    if (fmt != 0) {
++	    if (fmt != NULL) {
+ 		_nc_SPRINTF(result + used, _nc_SLIMIT(length - used)
+ 			    fmt, *value++);
+ 		used += strlen(result + used);
+-		fmt = 0;
++		fmt = NULL;
+ 	    }
+ 	    if (value - param > 2) {
+ 		value = param + 2;
+@@ -181,7 +181,7 @@
+ 	}
+ 	string++;
+     }
+-    if (result != 0) {
++    if (result != NULL) {
+ 	if (need_BC) {
+ 	    _nc_STRCPY(result + used, BC, length - used);
+ 	    used += strlen(BC);
+Index: ncurses/tinfo/lib_tputs.c
+Prereq:  1.115 
+--- ncurses-6.5-20250104+/ncurses/tinfo/lib_tputs.c	2024-12-07 21:04:53.000000000 +0000
++++ ncurses-6.5-20250111/ncurses/tinfo/lib_tputs.c	2025-01-12 00:41:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -52,7 +52,7 @@
+ #include 		/* ospeed */
+ #include 
+ 
+-MODULE_ID("$Id: lib_tputs.c,v 1.115 2024/12/07 21:04:53 tom Exp $")
++MODULE_ID("$Id: lib_tputs.c,v 1.116 2025/01/12 00:41:56 tom Exp $")
+ 
+ NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
+ NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */
+@@ -319,7 +319,7 @@
+ #if NCURSES_SP_FUNCS
+ 	       (SP_PARM != NULL && SP_PARM->_term == NULL)
+ #else
+-	       cur_term == 0
++	       cur_term == NULL
+ #endif
+ 	    ) {
+ 	    always_delay = FALSE;
+Index: ncurses/tinfo/name_match.c
+Prereq:  1.26 
+--- ncurses-6.5-20250104+/ncurses/tinfo/name_match.c	2024-12-07 21:24:18.000000000 +0000
++++ ncurses-6.5-20250111/ncurses/tinfo/name_match.c	2025-01-12 00:41:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2024 Thomas E. Dickey                                     *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2013,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -34,7 +34,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: name_match.c,v 1.26 2024/12/07 21:24:18 tom Exp $")
++MODULE_ID("$Id: name_match.c,v 1.27 2025/01/12 00:41:56 tom Exp $")
+ 
+ #define FirstName _nc_globals.first_name
+ 
+@@ -44,7 +44,7 @@
+ {
+     if ((_nc_syntax == SYN_TERMCAP) && _nc_user_definable) {
+ 	const char *bar = strchr(name, '|');
+-	if (bar != 0 && (bar - name) == 2)
++	if (bar != NULL && (bar - name) == 2)
+ 	    name = bar + 1;
+     }
+     return name;
+Index: ncurses/tinfo/parse_entry.c
+Prereq:  1.112 
+--- ncurses-6.5-20250104+/ncurses/tinfo/parse_entry.c	2024-12-07 21:13:36.000000000 +0000
++++ ncurses-6.5-20250111/ncurses/tinfo/parse_entry.c	2025-01-11 20:19:34.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -48,7 +48,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: parse_entry.c,v 1.112 2024/12/07 21:13:36 tom Exp $")
++MODULE_ID("$Id: parse_entry.c,v 1.113 2025/01/11 20:19:34 tom Exp $")
+ 
+ #ifdef LINT
+ static short const parametrized[] =
+@@ -379,10 +379,15 @@
+ 		_nc_warning("invalid name for use-clause \"%s\"",
+ 			    _nc_curr_token.tk_valstring);
+ 		continue;
+-	    } else if (entryp->nuses >= MAX_USES) {
++	    } else if (entryp->nuses >= HARD_MAX_USES) {
+ 		_nc_warning("too many use-clauses, ignored \"%s\"",
+ 			    _nc_curr_token.tk_valstring);
+ 		continue;
++	    } else if (entryp->nuses >= WARN_MAX_USES) {
++		_nc_warning("possibly too many use-clauses (%d vs %d), \"%s\"",
++			    entryp->nuses,
++			    WARN_MAX_USES,
++			    _nc_curr_token.tk_valstring);
+ 	    }
+ 	    if ((saved = _nc_save_str(_nc_curr_token.tk_valstring)) != NULL) {
+ 		entryp->uses[entryp->nuses].name = saved;
+Index: ncurses/tinfo/read_entry.c
+Prereq:  1.174 
+--- ncurses-6.5-20250104+/ncurses/tinfo/read_entry.c	2024-12-07 21:02:00.000000000 +0000
++++ ncurses-6.5-20250111/ncurses/tinfo/read_entry.c	2025-01-11 23:52:18.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -42,7 +42,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: read_entry.c,v 1.174 2024/12/07 21:02:00 tom Exp $")
++MODULE_ID("$Id: read_entry.c,v 1.175 2025/01/11 23:52:18 tom Exp $")
+ 
+ #define MyNumber(n) (short) LOW_MSB(n)
+ 
+@@ -797,13 +797,13 @@
+     } else
+ #if USE_HASHED_DB
+ 	if (make_db_filename(filename, limit, path)
+-	    && (capdbp = _nc_db_open(filename, FALSE)) != 0) {
++	    && (capdbp = _nc_db_open(filename, FALSE)) != NULL) {
+ 
+ 	DBT key, data;
+ 	int reccnt = 0;
+ 	char *save = strdup(name);
+ 
+-	if (save == 0)
++	if (save == NULL)
+ 	    returnDB(code);
+ 
+ 	memset(&key, 0, sizeof(key));
+Index: ncurses/tinfo/read_termcap.c
+Prereq:  1.104 
+--- ncurses-6.5-20250104+/ncurses/tinfo/read_termcap.c	2023-06-24 21:53:16.000000000 +0000
++++ ncurses-6.5-20250111/ncurses/tinfo/read_termcap.c	2025-01-12 00:42:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2021,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -57,7 +57,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: read_termcap.c,v 1.104 2023/06/24 21:53:16 tom Exp $")
++MODULE_ID("$Id: read_termcap.c,v 1.105 2025/01/12 00:42:58 tom Exp $")
+ 
+ #if !PURE_TERMINFO
+ 
+@@ -72,7 +72,7 @@
+ {
+     const char *result;
+ 
+-    if (!use_terminfo_vars() || (result = getenv("TERMPATH")) == 0)
++    if (!use_terminfo_vars() || (result = getenv("TERMPATH")) == NULL)
+ 	result = TERMPATH;
+     TR(TRACE_DATABASE, ("TERMPATH is %s", result));
+     return result;
+@@ -720,7 +720,7 @@
+     int ch;
+     bool found = FALSE;
+     char *s, *base;
+-    char *tok = 0;
++    char *tok = NULL;
+ 
+     *endp = TRUE;
+     for (s = base = *srcp; *s != '\0';) {
+@@ -749,7 +749,7 @@
+     }
+ 
+     /* malformed entry may end without a ':' */
+-    if (tok == 0 && found) {
++    if (tok == NULL && found) {
+ 	tok = base;
+     }
+ 
+@@ -768,7 +768,7 @@
+ 	    continue;
+ 	}
+ 	if (--len == 0) {
+-	    dst = 0;
++	    dst = NULL;
+ 	    break;
+ 	}
+ 	*dst++ = (char) ch;
+@@ -813,13 +813,13 @@
+     if (cp == NULL) {
+ 	_nc_safe_strcpy(&desc, get_termpath());
+     } else if (!_nc_is_abs_path(cp)) {	/* TERMCAP holds an entry */
+-	if ((termpath = get_termpath()) != 0) {
++	if ((termpath = get_termpath()) != NULL) {
+ 	    _nc_safe_strcat(&desc, termpath);
+ 	} else {
+ 	    char temp[PBUFSIZ];
+ 	    temp[0] = 0;
+-	    if ((home = getenv("HOME")) != 0 && *home != '\0'
+-		&& strchr(home, ' ') == 0
++	    if ((home = getenv("HOME")) != NULL && *home != '\0'
++		&& strchr(home, ' ') == NULL
+ 		&& strlen(home) < sizeof(temp) - 10) {	/* setup path */
+ 		_nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
+ 			    "%s/", home);	/* $HOME first */
+@@ -850,7 +850,7 @@
+ 	    }
+ 	}
+     }
+-    *fname = 0;			/* mark end of vector */
++    *fname = NULL;		/* mark end of vector */
+ #if !HAVE_BSD_CGETENT
+     (void) _nc_cgetset(0);
+ #endif
+@@ -875,7 +875,7 @@
+ 
+ 	pd = bp;
+ 	ps = dummy;
+-	while (!endflag && (tok = get_tc_token(&ps, &endflag)) != 0) {
++	while (!endflag && (tok = get_tc_token(&ps, &endflag)) != NULL) {
+ 	    bool ignore = FALSE;
+ 
+ 	    for (n = 1; n < count; n++) {
+@@ -889,7 +889,7 @@
+ 	    if (ignore != TRUE) {
+ 		list[count++] = tok;
+ 		pd = copy_tc_token(pd, tok, (size_t) (TBUFSIZ - (2 + pd - bp)));
+-		if (pd == 0) {
++		if (pd == NULL) {
+ 		    i = -1;
+ 		    break;
+ 		}
+@@ -901,7 +901,7 @@
+ 
+     FreeIfNeeded(dummy);
+     FreeIfNeeded(the_source);
+-    the_source = 0;
++    the_source = NULL;
+ 
+     /* This is not related to the BSD cgetent(), but to fake up a suitable
+      * filename for ncurses' error reporting.  (If we are not using BSD
+@@ -917,7 +917,7 @@
+ 	if (_nc_access(temp, R_OK) == 0) {
+ 	    _nc_safe_strcpy(&desc, pathvec[i]);
+ 	}
+-	if ((the_source = strdup(temp)) != 0)
++	if ((the_source = strdup(temp)) != NULL)
+ 	    *sourcename = the_source;
+ #else
+ 	if ((the_source = strdup(pathvec[i])) != 0)
+@@ -966,7 +966,7 @@
+ #endif
+ #if USE_GETCAP
+     char *p, tc[TBUFSIZ];
+-    char *tc_buf = 0;
++    char *tc_buf = NULL;
+ #define MY_SIZE sizeof(tc) - 1
+     int status;
+     static char *source;
+@@ -982,7 +982,7 @@
+ 	return TGETENT_NO;
+     }
+ 
+-    if (use_terminfo_vars() && (p = getenv("TERMCAP")) != 0
++    if (use_terminfo_vars() && (p = getenv("TERMCAP")) != NULL
+ 	&& !_nc_is_abs_path(p) && _nc_name_match(p, tn, "|:")) {
+ 	/* TERMCAP holds a termcap entry */
+ 	tc_buf = strdup(p);
+@@ -996,7 +996,7 @@
+ 	_nc_set_source(source);
+ 	tc_buf = tc;
+     }
+-    if (tc_buf == 0)
++    if (tc_buf == NULL)
+ 	return (TGETENT_ERR);
+     _nc_read_entry_source((FILE *) 0, tc_buf, FALSE, TRUE, NULLHOOK);
+     if (tc_buf != tc)
+@@ -1144,7 +1144,7 @@
+ 	free(copied);
+ #endif /* USE_GETCAP */
+ 
+-    if (_nc_head == 0)
++    if (_nc_head == NULL)
+ 	return (TGETENT_ERR);
+ 
+     /* resolve all use references */
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250104+/package/debian-mingw/changelog	2025-01-04 09:55:25.000000000 +0000
++++ ncurses-6.5-20250111/package/debian-mingw/changelog	2025-01-11 12:30:15.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250104) unstable; urgency=low
++ncurses6td (6.5+20250111) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 29 Dec 2024 04:55:25 -0500
++ -- Thomas E. Dickey   Sat, 11 Jan 2025 07:30:15 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250104+/package/debian-mingw64/changelog	2025-01-04 09:55:25.000000000 +0000
++++ ncurses-6.5-20250111/package/debian-mingw64/changelog	2025-01-11 12:30:15.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250104) unstable; urgency=low
++ncurses6td (6.5+20250111) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 29 Dec 2024 04:55:25 -0500
++ -- Thomas E. Dickey   Sat, 11 Jan 2025 07:30:15 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250104+/package/debian/changelog	2025-01-04 09:55:25.000000000 +0000
++++ ncurses-6.5-20250111/package/debian/changelog	2025-01-11 12:30:15.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250104) unstable; urgency=low
++ncurses6td (6.5+20250111) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 29 Dec 2024 04:55:25 -0500
++ -- Thomas E. Dickey   Sat, 11 Jan 2025 07:30:15 -0500
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.683 
+--- ncurses-6.5-20250104+/package/mingw-ncurses.nsi	2025-01-04 09:55:25.000000000 +0000
++++ ncurses-6.5-20250111/package/mingw-ncurses.nsi	2025-01-11 12:30:15.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.683 2025/01/04 09:55:25 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.684 2025/01/11 12:30:15 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0104"
++!define VERSION_MMDD  "0111"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250104+/package/mingw-ncurses.spec	2025-01-04 09:55:25.000000000 +0000
++++ ncurses-6.5-20250111/package/mingw-ncurses.spec	2025-01-11 12:30:15.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250104
++Release: 20250111
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20250104+/package/ncurses.spec	2025-01-04 09:55:25.000000000 +0000
++++ ncurses-6.5-20250111/package/ncurses.spec	2025-01-11 12:30:15.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250104
++Release: 20250111
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20250104+/package/ncursest.spec	2025-01-04 09:55:25.000000000 +0000
++++ ncurses-6.5-20250111/package/ncursest.spec	2025-01-11 12:30:15.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250104
++Release: 20250111
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/tic.c
+Prereq:  1.331 
+--- ncurses-6.5-20250104+/progs/tic.c	2024-12-07 23:19:49.000000000 +0000
++++ ncurses-6.5-20250111/progs/tic.c	2025-01-11 23:52:18.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -49,7 +49,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: tic.c,v 1.331 2024/12/07 23:19:49 tom Exp $")
++MODULE_ID("$Id: tic.c,v 1.332 2025/01/11 23:52:18 tom Exp $")
+ 
+ #define STDIN_NAME ""
+ 
+@@ -601,7 +601,7 @@
+ 	    || access(result, R_OK | W_OK) != 0) {
+ 	    DEBUG(1, ("...not a writable file"));
+ 	    free(result);
+-	    result = 0;
++	    result = NULL;
+ 	}
+ #else
+ 	if (!S_ISDIR(sb.st_mode)
+Index: progs/toe.c
+Prereq:  1.92 
+--- ncurses-6.5-20250104+/progs/toe.c	2024-12-07 22:12:53.000000000 +0000
++++ ncurses-6.5-20250111/progs/toe.c	2025-01-12 00:36:48.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2013,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -45,7 +45,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: toe.c,v 1.92 2024/12/07 22:12:53 tom Exp $")
++MODULE_ID("$Id: toe.c,v 1.94 2025/01/12 00:36:48 tom Exp $")
+ 
+ #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, ".."))
+ 
+@@ -374,10 +374,10 @@
+ 
+     memset(&data, 0, sizeof(data));
+     data.term_names = strmalloc(buffer);
+-    while ((next = strtok(list, "|")) != 0) {
++    while ((next = strtok(list, "|")) != NULL) {
+ 	if (next != last)
+ 	    hook(db_index, db_limit, next, &data);
+-	list = 0;
++	list = NULL;
+     }
+     free(data.term_names);
+ }
+@@ -502,7 +502,7 @@
+ 		(void) printf("#\n#%s:\n#\n", eargv[i]);
+ 
+ 	    if (make_db_name(filename, eargv[i], sizeof(filename))) {
+-		if ((capdbp = _nc_db_open(filename, FALSE)) != 0) {
++		if ((capdbp = _nc_db_open(filename, FALSE)) != NULL) {
+ 		    DBT key, data;
+ 		    int code;
+ 
+@@ -536,13 +536,13 @@
+ #if HAVE_BSD_CGETENT
+ 	{
+ 	    CGETENT_CONST char *db_array[2];
+-	    char *buffer = 0;
++	    char *buffer = NULL;
+ 
+ 	    if (verbosity)
+ 		(void) printf("#\n#%s:\n#\n", eargv[i]);
+ 
+ 	    db_array[0] = eargv[i];
+-	    db_array[1] = 0;
++	    db_array[1] = NULL;
+ 
+ 	    if (cgetfirst(&buffer, db_array) > 0) {
+ 		if (is_termcap(buffer)) {
+Index: progs/tput.c
+Prereq:  1.109 
+--- ncurses-6.5-20250104+/progs/tput.c	2025-01-05 00:10:46.000000000 +0000
++++ ncurses-6.5-20250111/progs/tput.c	2025-01-12 00:36:15.000000000 +0000
+@@ -47,7 +47,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: tput.c,v 1.109 2025/01/05 00:10:46 tom Exp $")
++MODULE_ID("$Id: tput.c,v 1.110 2025/01/12 00:36:15 tom Exp $")
+ 
+ #define PUTS(s)		fputs(s, stdout)
+ 
+@@ -219,7 +219,7 @@
+ 	    const struct name_table_entry *np;
+ 
+ 	    termcap = TRUE;
+-	    if ((np = _nc_find_entry(name, _nc_get_hash_table(termcap))) != 0) {
++	    if ((np = _nc_find_entry(name, _nc_get_hash_table(termcap))) != NULL) {
+ 		switch (np->nte_type) {
+ 		case BOOLEAN:
+ 		    name = boolnames[np->nte_index];
+Index: test/demo_altkeys.c
+Prereq:  1.18 
+--- ncurses-6.5-20250104+/test/demo_altkeys.c	2024-12-07 23:02:27.000000000 +0000
++++ ncurses-6.5-20250111/test/demo_altkeys.c	2025-01-11 14:54:49.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2005-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_altkeys.c,v 1.18 2024/12/07 23:02:27 tom Exp $
++ * $Id: demo_altkeys.c,v 1.19 2025/01/11 14:54:49 tom Exp $
+  *
+  * Demonstrate the define_key() function.
+  * Thomas Dickey - 2005/10/22
+@@ -138,9 +138,11 @@
+ 	if ((value = keybound(n, 0)) != NULL) {
+ 	    size_t need = strlen(value) + 2;
+ 	    char *temp = typeMalloc(char, need);
+-	    _nc_SPRINTF(temp, _nc_SLIMIT(need) "\033%s", value);
+-	    define_key(temp, n + MY_KEYS);
+-	    free(temp);
++	    if (temp != NULL) {
++		_nc_SPRINTF(temp, _nc_SLIMIT(need) "\033%s", value);
++		define_key(temp, n + MY_KEYS);
++		free(temp);
++	    }
+ 	    free(value);
+ 	}
+     }
+Index: test/demo_termcap.c
+Prereq:  1.73 
+--- ncurses-6.5-20250104+/test/demo_termcap.c	2024-12-07 22:27:13.000000000 +0000
++++ ncurses-6.5-20250111/test/demo_termcap.c	2025-01-11 14:54:49.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2005-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: demo_termcap.c,v 1.73 2024/12/07 22:27:13 tom Exp $
++ * $Id: demo_termcap.c,v 1.74 2025/01/11 14:54:49 tom Exp $
+  *
+  * A simple demo of the termcap interface.
+  */
+@@ -107,9 +107,12 @@
+ static char *
+ make_dbitem(const char *const p, const char *const q)
+ {
+-    size_t need = strlen(e_opt) + 2 + (size_t) (p - q);
++    size_t diff = (size_t) (p - q);
++    size_t need = strlen(e_opt) + 2 + diff;
+     char *result = malloc(need);
+-    _nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) (p - q), q);
++    if (result != NULL) {
++	_nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) diff, q);
++    }
+     return result;
+ }
+ 
+Index: test/demo_terminfo.c
+Prereq:  1.62 
+--- ncurses-6.5-20250104+/test/demo_terminfo.c	2024-12-07 22:27:13.000000000 +0000
++++ ncurses-6.5-20250111/test/demo_terminfo.c	2025-01-11 14:54:49.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2009-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: demo_terminfo.c,v 1.62 2024/12/07 22:27:13 tom Exp $
++ * $Id: demo_terminfo.c,v 1.63 2025/01/11 14:54:49 tom Exp $
+  *
+  * A simple demo of the terminfo interface.
+  */
+@@ -98,9 +98,12 @@
+ static char *
+ make_dbitem(const char *const p, const char *const q)
+ {
+-    size_t need = strlen(e_opt) + 2 + (size_t) (p - q);
++    size_t diff = (size_t) (p - q);
++    size_t need = strlen(e_opt) + 2 + diff;
+     char *result = malloc(need);
+-    _nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) (p - q), q);
++    if (result != NULL) {
++	_nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) diff, q);
++    }
+     return result;
+ }
+ 
+Index: test/dup_field.c
+Prereq:  1.12 
+--- ncurses-6.5-20250104+/test/dup_field.c	2024-12-07 22:32:11.000000000 +0000
++++ ncurses-6.5-20250111/test/dup_field.c	2025-01-11 14:54:49.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: dup_field.c,v 1.12 2024/12/07 22:32:11 tom Exp $
++ * $Id: dup_field.c,v 1.13 2025/01/11 14:54:49 tom Exp $
+  *
+  * Demonstrate dup_field().
+  */
+@@ -96,8 +96,10 @@
+ 	    name = commands[n].help;
+ 	need = 5 + strlen(code) + strlen(name);
+ 	msg = typeMalloc(char, need);
+-	_nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name);
+-	msgs[used++] = msg;
++	if (msg != NULL) {
++	    _nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name);
++	    msgs[used++] = msg;
++	}
+     }
+     msgs[used++] =
+ 	strdup("Arrow keys move within a field as you would expect.");
+Index: test/edit_field.c
+Prereq:  1.33 
+--- ncurses-6.5-20250104+/test/edit_field.c	2024-12-07 22:22:51.000000000 +0000
++++ ncurses-6.5-20250111/test/edit_field.c	2025-01-11 14:54:49.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2003-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: edit_field.c,v 1.33 2024/12/07 22:22:51 tom Exp $
++ * $Id: edit_field.c,v 1.34 2025/01/11 14:54:49 tom Exp $
+  *
+  * A wrapper for form_driver() which keeps track of the user's editing changes
+  * for each field, and makes the resulting length available as a
+@@ -193,8 +193,10 @@
+ 	    name = commands[n].help;
+ 	need = 5 + strlen(code) + strlen(name);
+ 	msg = typeMalloc(char, need);
+-	_nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name);
+-	msgs[used++] = msg;
++	if (msg != NULL) {
++	    _nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name);
++	    msgs[used++] = msg;
++	}
+     }
+     msgs[used++] =
+ 	strdup("Arrow keys move within a field as you would expect.");
+Index: test/foldkeys.c
+Prereq:  1.14 
+--- ncurses-6.5-20250104+/test/foldkeys.c	2024-12-21 17:25:16.000000000 +0000
++++ ncurses-6.5-20250111/test/foldkeys.c	2025-01-11 14:54:49.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2006-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey, 2006
+  *
+- * $Id: foldkeys.c,v 1.14 2024/12/21 17:25:16 tom Exp $
++ * $Id: foldkeys.c,v 1.15 2025/01/11 14:54:49 tom Exp $
+  *
+  * Demonstrate a method for altering key definitions at runtime.
+  *
+@@ -155,6 +155,8 @@
+ 		      &second,
+ 		      final) == 3
+ 	    && *final != ';'
++	    && first >= 0
++	    && first < 1024
+ 	    && (need = strlen(info[j].value)) != 0
+ 	    && (value = malloc(need + 8)) != NULL) {
+ 	    (void) need;	/* _nc_SLIMIT is normally nothing  */
+Index: test/move_field.c
+Prereq:  1.20 
+--- ncurses-6.5-20250104+/test/move_field.c	2024-12-07 22:33:32.000000000 +0000
++++ ncurses-6.5-20250111/test/move_field.c	2025-01-11 14:54:49.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: move_field.c,v 1.20 2024/12/07 22:33:32 tom Exp $
++ * $Id: move_field.c,v 1.21 2025/01/11 14:54:49 tom Exp $
+  *
+  * Demonstrate move_field().
+  */
+@@ -96,8 +96,10 @@
+ 	    name = commands[n].help;
+ 	need = 5 + strlen(code) + strlen(name);
+ 	msg = typeMalloc(char, need);
+-	_nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name);
+-	msgs[used++] = msg;
++	if (msg != NULL) {
++	    _nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name);
++	    msgs[used++] = msg;
++	}
+     }
+     msgs[used++] =
+ 	strdup("Arrow keys move within a field as you would expect.");
+Index: test/movewindow.c
+Prereq:  1.57 
+--- ncurses-6.5-20250104+/test/movewindow.c	2024-12-07 22:33:32.000000000 +0000
++++ ncurses-6.5-20250111/test/movewindow.c	2025-01-11 14:54:49.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 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.57 2024/12/07 22:33:32 tom Exp $
++ * $Id: movewindow.c,v 1.58 2025/01/11 14:54:49 tom Exp $
+  *
+  * Demonstrate move functions for windows and derived windows from the curses
+  * library.
+@@ -658,12 +658,16 @@
+ 
+     char **msgs = typeCalloc(char *, SIZEOF(help) + 1);
+     size_t n;
++    size_t used;
+ 
+-    for (n = 0; n < SIZEOF(help); ++n) {
++    for (n = used = 0; n < SIZEOF(help); ++n) {
+ 	size_t need = (21 + strlen(help[n].msg));
+-	msgs[n] = typeMalloc(char, need);
+-	_nc_SPRINTF(msgs[n], _nc_SLIMIT(need)
+-		    "%-20s%s", keyname(help[n].key), help[n].msg);
++	char *msg = typeMalloc(char, need);
++	if (msg != NULL) {
++	    _nc_SPRINTF(msg, _nc_SLIMIT(need)
++			"%-20s%s", keyname(help[n].key), help[n].msg);
++	    msgs[used++] = msg;
++	}
+     }
+     popup_msg2(current, msgs);
+     for (n = 0; n < SIZEOF(help); ++n) {
+Index: test/test_sgr.c
+Prereq:  1.26 
+--- ncurses-6.5-20250104+/test/test_sgr.c	2024-12-07 22:48:21.000000000 +0000
++++ ncurses-6.5-20250111/test/test_sgr.c	2025-01-11 14:54:49.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2015-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: test_sgr.c,v 1.26 2024/12/07 22:48:21 tom Exp $
++ * $Id: test_sgr.c,v 1.27 2025/01/11 14:54:49 tom Exp $
+  *
+  * A simple demo of the sgr/sgr0 terminal capabilities.
+  */
+@@ -63,9 +63,12 @@
+ static char *
+ make_dbitem(const char *const p, const char *const q)
+ {
+-    size_t need = strlen(e_opt) + 2 + (size_t) (p - q);
++    size_t diff = (size_t) (p - q);
++    size_t need = strlen(e_opt) + 2 + diff;
+     char *result = malloc(need);
+-    _nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) (p - q), q);
++    if (result != NULL) {
++	_nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) diff, q);
++    }
+     return result;
+ }
+ 
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250118.patch b/packages/ncurses/6.5/ncurses-6.5-20250118.patch
new file mode 100644
index 0000000000..cd48ec931e
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250118.patch
@@ -0,0 +1,58562 @@
+# ncurses 6.5 - patch 20250118 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250118.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Jan 19 01:57:00 UTC 2025
+# ------------------------------------------------------------------------------
+# Ada95/aclocal.m4                           |  207 +
+# Ada95/configure                            | 3214 +++++++++++-----
+# NEWS                                       |   14 
+# VERSION                                    |    2 
+# aclocal.m4                                 |   42 
+# configure                                  | 5116 +++++++++++++--------------
+# configure.in                               |    8 
+# dist.mk                                    |    4 
+# doc/html/man/captoinfo.1m.html             |   12 
+# doc/html/man/clear.1.html                  |   12 
+# doc/html/man/curs_add_wch.3x.html          |  127 
+# doc/html/man/curs_add_wchstr.3x.html       |   46 
+# doc/html/man/curs_addch.3x.html            |   96 
+# doc/html/man/curs_addchstr.3x.html         |   23 
+# doc/html/man/curs_addstr.3x.html           |   36 
+# doc/html/man/curs_addwstr.3x.html          |   38 
+# doc/html/man/curs_attr.3x.html             |  288 -
+# doc/html/man/curs_beep.3x.html             |   14 
+# doc/html/man/curs_bkgd.3x.html             |  117 
+# doc/html/man/curs_bkgrnd.3x.html           |  131 
+# doc/html/man/curs_border.3x.html           |   28 
+# doc/html/man/curs_border_set.3x.html       |   16 
+# doc/html/man/curs_clear.3x.html            |   37 
+# doc/html/man/curs_color.3x.html            |  400 +-
+# doc/html/man/curs_delch.3x.html            |   20 
+# doc/html/man/curs_deleteln.3x.html         |   18 
+# doc/html/man/curs_extend.3x.html           |   14 
+# doc/html/man/curs_get_wch.3x.html          |   72 
+# doc/html/man/curs_get_wstr.3x.html         |  198 -
+# doc/html/man/curs_getcchar.3x.html         |  202 -
+# doc/html/man/curs_getch.3x.html            |   65 
+# doc/html/man/curs_getstr.3x.html           |  142 
+# doc/html/man/curs_getyx.3x.html            |   34 
+# doc/html/man/curs_in_wch.3x.html           |   22 
+# doc/html/man/curs_in_wchstr.3x.html        |   39 
+# doc/html/man/curs_inch.3x.html             |   14 
+# doc/html/man/curs_inchstr.3x.html          |   33 
+# doc/html/man/curs_initscr.3x.html          |   16 
+# doc/html/man/curs_inopts.3x.html           |   52 
+# doc/html/man/curs_ins_wch.3x.html          |   24 
+# doc/html/man/curs_ins_wstr.3x.html         |   47 
+# doc/html/man/curs_insch.3x.html            |   16 
+# doc/html/man/curs_insstr.3x.html           |   41 
+# doc/html/man/curs_instr.3x.html            |   35 
+# doc/html/man/curs_inwstr.3x.html           |   63 
+# doc/html/man/curs_kernel.3x.html           |   33 
+# doc/html/man/curs_mouse.3x.html            |  284 -
+# doc/html/man/curs_move.3x.html             |   17 
+# doc/html/man/curs_opaque.3x.html           |   26 
+# doc/html/man/curs_outopts.3x.html          |   35 
+# doc/html/man/curs_overlay.3x.html          |   37 
+# doc/html/man/curs_pad.3x.html              |  133 
+# doc/html/man/curs_printw.3x.html           |   22 
+# doc/html/man/curs_refresh.3x.html          |   31 
+# doc/html/man/curs_scanw.3x.html            |   26 
+# doc/html/man/curs_scr_dump.3x.html         |   14 
+# doc/html/man/curs_scroll.3x.html           |   18 
+# doc/html/man/curs_slk.3x.html              |   60 
+# doc/html/man/curs_sp_funcs.3x.html         |   12 
+# doc/html/man/curs_termattrs.3x.html        |  113 
+# doc/html/man/curs_termcap.3x.html          |  121 
+# doc/html/man/curs_terminfo.3x.html         |  318 -
+# doc/html/man/curs_touch.3x.html            |   48 
+# doc/html/man/curs_trace.3x.html            |   14 
+# doc/html/man/curs_util.3x.html             |  313 -
+# doc/html/man/curs_variables.3x.html        |  112 
+# doc/html/man/curs_window.3x.html           |  110 
+# doc/html/man/form_field_opts.3x.html       |   12 
+# doc/html/man/form_field_validation.3x.html |   10 
+# doc/html/man/form_fieldtype.3x.html        |   12 
+# doc/html/man/form_opts.3x.html             |   12 
+# doc/html/man/infocmp.1m.html               |   14 
+# doc/html/man/infotocap.1m.html             |   12 
+# doc/html/man/menu_opts.3x.html             |   12 
+# doc/html/man/mitem_opts.3x.html            |   12 
+# doc/html/man/ncurses.3x.html               |  702 +--
+# doc/html/man/new_pair.3x.html              |   16 
+# doc/html/man/scr_dump.5.html               |   12 
+# doc/html/man/tabs.1.html                   |   10 
+# doc/html/man/terminfo.5.html               |  921 ++--
+# doc/html/man/tic.1m.html                   |   12 
+# doc/html/man/tput.1.html                   |  221 -
+# doc/html/man/tset.1.html                   |   12 
+# doc/html/man/wresize.3x.html               |   12 
+# include/curses.wide                        |    5 
+# man/captoinfo.1m                           |    9 
+# man/clear.1                                |   10 
+# man/curs_add_wch.3x                        |   50 
+# man/curs_add_wchstr.3x                     |   29 
+# man/curs_addch.3x                          |   43 
+# man/curs_addchstr.3x                       |   19 
+# man/curs_addstr.3x                         |   29 
+# man/curs_addwstr.3x                        |   38 
+# man/curs_attr.3x                           |  314 +
+# man/curs_beep.3x                           |    9 
+# man/curs_bkgd.3x                           |  113 
+# man/curs_bkgrnd.3x                         |   89 
+# man/curs_border.3x                         |   36 
+# man/curs_border_set.3x                     |   26 
+# man/curs_clear.3x                          |   42 
+# man/curs_color.3x                          |  415 +-
+# man/curs_delch.3x                          |   17 
+# man/curs_deleteln.3x                       |   15 
+# man/curs_extend.3x                         |   14 
+# man/curs_get_wch.3x                        |   52 
+# man/curs_get_wstr.3x                       |  396 +-
+# man/curs_getcchar.3x                       |  409 +-
+# man/curs_getch.3x                          |   30 
+# man/curs_getstr.3x                         |  164 
+# man/curs_getyx.3x                          |   54 
+# man/curs_in_wch.3x                         |   17 
+# man/curs_in_wchstr.3x                      |   42 
+# man/curs_inch.3x                           |    9 
+# man/curs_inchstr.3x                        |   46 
+# man/curs_initscr.3x                        |   13 
+# man/curs_inopts.3x                         |   47 
+# man/curs_ins_wch.3x                        |   21 
+# man/curs_ins_wstr.3x                       |   50 
+# man/curs_insch.3x                          |   15 
+# man/curs_insstr.3x                         |   53 
+# man/curs_instr.3x                          |   31 
+# man/curs_inwstr.3x                         |   44 
+# man/curs_kernel.3x                         |   14 
+# man/curs_mouse.3x                          |  514 +-
+# man/curs_move.3x                           |   16 
+# man/curs_opaque.3x                         |   27 
+# man/curs_outopts.3x                        |   53 
+# man/curs_overlay.3x                        |   52 
+# man/curs_pad.3x                            |  208 -
+# man/curs_printw.3x                         |   18 
+# man/curs_refresh.3x                        |   20 
+# man/curs_scanw.3x                          |   19 
+# man/curs_scr_dump.3x                       |    9 
+# man/curs_scroll.3x                         |   16 
+# man/curs_slk.3x                            |   45 
+# man/curs_sp_funcs.3x                       |    8 
+# man/curs_termattrs.3x                      |  191 -
+# man/curs_termcap.3x                        |  126 
+# man/curs_terminfo.3x                       |  198 -
+# man/curs_touch.3x                          |   64 
+# man/curs_trace.3x                          |    8 
+# man/curs_util.3x                           |  162 
+# man/curs_variables.3x                      |   90 
+# man/curs_window.3x                         |  184 
+# man/form_field_opts.3x                     |   20 
+# man/form_field_validation.3x               |    8 
+# man/form_fieldtype.3x                      |   19 
+# man/form_opts.3x                           |   20 
+# man/infocmp.1m                             |   10 
+# man/infotocap.1m                           |    9 
+# man/man_db.renames.in                      |    8 
+# man/manhtml.aliases                        |    6 
+# man/menu_opts.3x                           |   20 
+# man/mitem_opts.3x                          |   20 
+# man/ncurses.3x                             |   15 
+# man/new_pair.3x                            |   12 
+# man/scr_dump.5                             |    8 
+# man/tabs.1                                 |   12 
+# man/terminfo.tail                          |   13 
+# man/tic.1m                                 |   10 
+# man/tput.1                                 |  239 -
+# man/tset.1                                 |   12 
+# man/wresize.3x                             |    8 
+# ncurses/base/lib_color.c                   |    6 
+# ncurses/base/lib_dft_fgbg.c                |    6 
+# ncurses/base/lib_getstr.c                  |    8 
+# ncurses/base/lib_mouse.c                   |    8 
+# ncurses/curses.priv.h                      |    8 
+# ncurses/tinfo/captoinfo.c                  |    6 
+# ncurses/tinfo/lib_setup.c                  |    6 
+# ncurses/tinfo/lib_tparm.c                  |   12 
+# ncurses/tinfo/tinfo_driver.c               |    8 
+# ncurses/tty/hardscroll.c                   |    6 
+# ncurses/tty/hashmap.c                      |    6 
+# ncurses/tty/lib_mvcur.c                    |   12 
+# ncurses/widechar/lib_add_wch.c             |    6 
+# ncurses/widechar/lib_inwstr.c              |   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 
+# progs/clear_cmd.c                          |    6 
+# test/aclocal.m4                            |   38 
+# test/configure                             | 2687 +++++++-------
+# test/parse_rgb.h                           |   10 
+# test/test.priv.h                           |   10 
+# test/test_mouse.c                          |    6 
+# 190 files changed, 13358 insertions(+), 9973 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/aclocal.m4
+Prereq:  1.223 
+--- ncurses-6.5-20250111+/Ada95/aclocal.m4	2024-12-21 15:29:41.000000000 +0000
++++ ncurses-6.5-20250118/Ada95/aclocal.m4	2025-01-11 00:55:54.000000000 +0000
+@@ -1,5 +1,5 @@
+ dnl***************************************************************************
+-dnl Copyright 2018-2023,2024 Thomas E. Dickey                                *
++dnl Copyright 2018-2024,2025 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.223 2024/12/21 15:29:41 tom Exp $
++dnl $Id: aclocal.m4,v 1.226 2025/01/11 00:55:54 tom Exp $
+ dnl Macros used in NCURSES Ada95 auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -962,6 +962,52 @@
+ ])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_CURSES_CONFIG version: 2 updated: 2006/10/29 11:06:27
++dnl ----------------
++dnl Tie together the configure-script macros for curses.  It may be ncurses,
++dnl but unless asked, we do not make a special search for ncurses.  However,
++dnl still check for the ncurses version number, for use in other macros.
++AC_DEFUN([CF_CURSES_CONFIG],
++[
++CF_CURSES_CPPFLAGS
++CF_NCURSES_VERSION
++CF_CURSES_LIBS
++])dnl
++dnl ---------------------------------------------------------------------------
++dnl CF_CURSES_CPPFLAGS version: 14 updated: 2021/01/02 09:31:20
++dnl ------------------
++dnl Look for the curses headers.
++AC_DEFUN([CF_CURSES_CPPFLAGS],[
++
++AC_CACHE_CHECK(for extra include directories,cf_cv_curses_incdir,[
++cf_cv_curses_incdir=no
++case "$host_os" in
++(hpux10.*)
++	if test "x$cf_cv_screen" = "xcurses_colr"
++	then
++		test -d /usr/include/curses_colr && \
++		cf_cv_curses_incdir="-I/usr/include/curses_colr"
++	fi
++	;;
++(sunos3*|sunos4*)
++	if test "x$cf_cv_screen" = "xcurses_5lib"
++	then
++		test -d /usr/5lib && \
++		test -d /usr/5include && \
++		cf_cv_curses_incdir="-I/usr/5include"
++	fi
++	;;
++esac
++])
++if test "$cf_cv_curses_incdir" != no
++then
++	CF_APPEND_TEXT(CPPFLAGS,$cf_cv_curses_incdir)
++fi
++
++CF_CURSES_HEADER
++CF_TERM_HEADER
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_CURSES_HEADER version: 6 updated: 2022/12/02 20:06:52
+ dnl ----------------
+ dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
+@@ -989,6 +1035,136 @@
+ AC_CHECK_HEADERS($cf_cv_ncurses_header)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_CURSES_LIBS version: 45 updated: 2022/12/02 20:06:52
++dnl --------------
++dnl Look for the curses libraries.  Older curses implementations may require
++dnl termcap/termlib to be linked as well.  Call CF_CURSES_CPPFLAGS first.
++AC_DEFUN([CF_CURSES_LIBS],[
++
++AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
++AC_MSG_CHECKING(if we have identified curses libraries)
++AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
++	[initscr(); endwin()],
++	cf_result=yes,
++	cf_result=no)
++AC_MSG_RESULT($cf_result)
++
++if test "$cf_result" = no ; then
++case "$host_os" in
++(freebsd*)
++	AC_CHECK_LIB(mytinfo,tgoto,[CF_ADD_LIBS(-lmytinfo)])
++	;;
++(hpux10.*)
++	# Looking at HPUX 10.20, the Hcurses library is the oldest (1997), cur_colr
++	# next (1998), and xcurses "newer" (2000).  There is no header file for
++	# Hcurses; the subdirectory curses_colr has the headers (curses.h and
++	# term.h) for cur_colr
++	if test "x$cf_cv_screen" = "xcurses_colr"
++	then
++		AC_CHECK_LIB(cur_colr,initscr,[
++			CF_ADD_LIBS(-lcur_colr)
++			ac_cv_func_initscr=yes
++			],[
++		AC_CHECK_LIB(Hcurses,initscr,[
++			# HP's header uses __HP_CURSES, but user claims _HP_CURSES.
++			CF_ADD_LIBS(-lHcurses)
++			CF_APPEND_TEXT(CPPFLAGS,-D__HP_CURSES -D_HP_CURSES)
++			ac_cv_func_initscr=yes
++			])])
++	fi
++	;;
++(linux*)
++	case `arch 2>/dev/null` in
++	(x86_64)
++		if test -d /lib64
++		then
++			CF_ADD_LIBDIR(/lib64)
++		else
++			CF_ADD_LIBDIR(/lib)
++		fi
++		;;
++	(*)
++		CF_ADD_LIBDIR(/lib)
++		;;
++	esac
++	;;
++(sunos3*|sunos4*)
++	if test "x$cf_cv_screen" = "xcurses_5lib"
++	then
++		if test -d /usr/5lib ; then
++			CF_ADD_LIBDIR(/usr/5lib)
++			CF_ADD_LIBS(-lcurses -ltermcap)
++		fi
++	fi
++	ac_cv_func_initscr=yes
++	;;
++esac
++
++if test ".$ac_cv_func_initscr" != .yes ; then
++	cf_save_LIBS="$LIBS"
++
++	if test ".${cf_cv_ncurses_version:-no}" != .no
++	then
++		cf_check_list="ncurses curses cursesX"
++	else
++		cf_check_list="cursesX curses ncurses"
++	fi
++
++	# Check for library containing tgoto.  Do this before curses library
++	# because it may be needed to link the test-case for initscr.
++	if test "x$cf_term_lib" = x
++	then
++		AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[
++			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
++			do
++				AC_CHECK_LIB($cf_term_lib,tgoto,[
++					: "${cf_nculib_root:=$cf_term_lib}"
++					break
++				])
++			done
++		])
++	fi
++
++	# Check for library containing initscr
++	test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS"
++	if test "x$cf_curs_lib" = x
++	then
++		for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
++		do
++			LIBS="-l$cf_curs_lib $cf_save_LIBS"
++			if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
++				AC_MSG_CHECKING(if we can link with $cf_curs_lib library)
++				AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
++					[initscr()],
++					[cf_result=yes],
++					[cf_result=no])
++				AC_MSG_RESULT($cf_result)
++				test "$cf_result" = yes && break
++			elif test "$cf_curs_lib" = "$cf_term_lib" ; then
++				cf_result=no
++			elif test "$cf_term_lib" != predefined ; then
++				AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries)
++				AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
++					[initscr(); endwin();],
++					[cf_result=no],
++					[
++					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
++					AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
++						[initscr()],
++						[cf_result=yes],
++						[cf_result=error])
++					])
++				AC_MSG_RESULT($cf_result)
++				test "$cf_result" != error && break
++			fi
++		done
++	fi
++	test "$cf_curs_lib" = unknown && AC_MSG_ERROR(no curses library found)
++fi
++fi
++
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_DIRNAME version: 5 updated: 2020/12/31 20:19:42
+ dnl ----------
+ dnl "dirname" is not portable, so we fake it with a shell script.
+@@ -3073,7 +3249,7 @@
+ 	,[$1=no])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_NCURSES_CONFIG version: 28 updated: 2021/08/28 15:20:37
++dnl CF_NCURSES_CONFIG version: 29 updated: 2025/01/10 19:55:54
+ dnl -----------------
+ dnl Tie together the configure-script macros for ncurses, preferring these in
+ dnl order:
+@@ -3134,6 +3310,7 @@
+ 			;;
+ 		esac
+ 
++		CF_REQUIRE_PKG($cf_ncuconfig_root)
+ 		CF_APPEND_CFLAGS($cf_pkg_cflags)
+ 		CF_ADD_LIBS($cf_pkg_libs)
+ 
+@@ -3977,6 +4154,30 @@
+ $1=`echo "$2" | sed -e 's/-l$3[[ 	]]//g' -e 's/-l$3[$]//'`
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_REQUIRE_PKG version: 1 updated: 2025/01/10 19:55:54
++dnl --------------
++dnl Update $REQUIRE_PKG, which lists the known required packages for this
++dnl program.
++dnl
++dnl $1 = package(s) to require, e.g., in the generated ".pc" file
++define([CF_REQUIRE_PKG],
++[
++for cf_required in $1
++do
++	# check for duplicates
++	for cf_require_pkg in $REQUIRE_PKG
++	do
++		if test "$cf_required" = "$cf_require_pkg"
++		then
++			cf_required=
++			break
++		fi
++	done
++	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
++done
++AC_SUBST(REQUIRE_PKG)
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_RESTORE_XTRA_FLAGS version: 1 updated: 2020/01/11 16:47:45
+ dnl ---------------------
+ dnl Restore flags saved in CF_SAVE_XTRA_FLAGS
+Index: Ada95/configure
+--- ncurses-6.5-20250111+/Ada95/configure	2024-12-21 15:30:09.000000000 +0000
++++ ncurses-6.5-20250118/Ada95/configure	2025-01-11 00:55:54.000000000 +0000
+@@ -5207,6 +5207,20 @@
+ 			;;
+ 		esac
+ 
++for cf_required in $cf_ncuconfig_root
++do
++	# check for duplicates
++	for cf_require_pkg in $REQUIRE_PKG
++	do
++		if test "$cf_required" = "$cf_require_pkg"
++		then
++			cf_required=
++			break
++		fi
++	done
++	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
++done
++
+ for cf_add_cflags in $cf_pkg_cflags
+ do
+ 	case "x$cf_add_cflags" in
+@@ -5350,7 +5364,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5353 "configure"
++#line 5367 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5362,37 +5376,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:5365: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5379: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5368: \$? = $ac_status" >&5
++  echo "$as_me:5382: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:5371: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5385: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5374: \$? = $ac_status" >&5
++  echo "$as_me:5388: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5380 "configure"
++#line 5394 "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:5387: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5401: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5390: \$? = $ac_status" >&5
++  echo "$as_me:5404: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:5392: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5406: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5395: \$? = $ac_status" >&5
++  echo "$as_me:5409: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -5409,7 +5423,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:5412: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:5426: 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"
+@@ -5425,7 +5439,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:5428: checking for terminfo header" >&5
++echo "$as_me:5442: 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
+@@ -5443,7 +5457,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5446 "configure"
++#line 5460 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -5458,16 +5472,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5461: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5475: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5464: \$? = $ac_status" >&5
++  echo "$as_me:5478: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5467: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5481: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5470: \$? = $ac_status" >&5
++  echo "$as_me:5484: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -5483,7 +5497,7 @@
+ done
+ 
+ fi
+-echo "$as_me:5486: result: $cf_cv_term_header" >&5
++echo "$as_me:5500: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -5518,7 +5532,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:5521: result: no" >&5
++		echo "$as_me:5535: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -5534,7 +5548,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:5537: checking for $ac_word" >&5
++echo "$as_me:5551: 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
+@@ -5549,7 +5563,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:5552: found $ac_dir/$ac_word" >&5
++echo "$as_me:5566: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5557,10 +5571,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:5560: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:5574: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:5563: result: no" >&5
++  echo "$as_me:5577: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5573,7 +5587,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:5576: checking for $ac_word" >&5
++echo "$as_me:5590: 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
+@@ -5588,7 +5602,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:5591: found $ac_dir/$ac_word" >&5
++echo "$as_me:5605: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5596,10 +5610,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:5599: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:5613: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:5602: result: no" >&5
++  echo "$as_me:5616: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5756,7 +5770,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:5759: checking if we have identified curses headers" >&5
++echo "$as_me:5773: 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
+@@ -5768,7 +5782,7 @@
+ 	curses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5771 "configure"
++#line 5785 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -5780,16 +5794,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5783: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5797: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5786: \$? = $ac_status" >&5
++  echo "$as_me:5800: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5789: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5803: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5792: \$? = $ac_status" >&5
++  echo "$as_me:5806: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -5800,11 +5814,11 @@
+ done
+ 
+ fi
+-echo "$as_me:5803: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:5817: 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:5807: error: No curses header-files found" >&5
++	{ { echo "$as_me:5821: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -5814,23 +5828,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:5817: checking for $ac_header" >&5
++echo "$as_me:5831: 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 5823 "configure"
++#line 5837 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:5827: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:5841: \"$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:5833: \$? = $ac_status" >&5
++  echo "$as_me:5847: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -5849,7 +5863,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:5852: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:5866: 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 5908 "configure"
++#line 5922 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5917,16 +5931,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5920: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5934: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5923: \$? = $ac_status" >&5
++  echo "$as_me:5937: \$? = $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:5940: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5929: \$? = $ac_status" >&5
++  echo "$as_me:5943: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5943,7 +5957,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}:5946: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5960: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -5962,7 +5976,7 @@
+ 
+ }
+ 
+-echo "$as_me:5965: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:5979: 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
+@@ -5974,7 +5988,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5977 "configure"
++#line 5991 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -5998,16 +6012,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6001: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6015: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6004: \$? = $ac_status" >&5
++  echo "$as_me:6018: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6007: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6021: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6010: \$? = $ac_status" >&5
++  echo "$as_me:6024: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -6022,14 +6036,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:6025: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:6039: 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:6032: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:6046: 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
+@@ -6150,7 +6164,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6153 "configure"
++#line 6167 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6162,16 +6176,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6165: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6179: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6168: \$? = $ac_status" >&5
++  echo "$as_me:6182: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6171: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6185: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6174: \$? = $ac_status" >&5
++  echo "$as_me:6188: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6188,7 +6202,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}:6191: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6205: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -6211,7 +6225,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6214 "configure"
++#line 6228 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -6235,16 +6249,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6238: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6252: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6241: \$? = $ac_status" >&5
++  echo "$as_me:6255: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6244: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6258: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6247: \$? = $ac_status" >&5
++  echo "$as_me:6261: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -6265,12 +6279,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6268: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6282: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:6273: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:6287: 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%/[^/]*$%%'`
+@@ -6306,7 +6320,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6309 "configure"
++#line 6323 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6318,16 +6332,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6321: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6335: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6324: \$? = $ac_status" >&5
++  echo "$as_me:6338: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6327: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6341: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6330: \$? = $ac_status" >&5
++  echo "$as_me:6344: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6344,7 +6358,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}:6347: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6361: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -6392,7 +6406,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:6395: checking for terminfo header" >&5
++echo "$as_me:6409: 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
+@@ -6410,7 +6424,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6413 "configure"
++#line 6427 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -6425,16 +6439,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6428: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6442: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6431: \$? = $ac_status" >&5
++  echo "$as_me:6445: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6434: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6448: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6437: \$? = $ac_status" >&5
++  echo "$as_me:6451: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -6450,7 +6464,7 @@
+ done
+ 
+ fi
+-echo "$as_me:6453: result: $cf_cv_term_header" >&5
++echo "$as_me:6467: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -6488,7 +6502,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:6491: checking for ncurses version" >&5
++echo "$as_me:6505: 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
+@@ -6514,10 +6528,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:6517: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:6531: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6520: \$? = $ac_status" >&5
++  echo "$as_me:6534: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -6527,7 +6541,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6530 "configure"
++#line 6544 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -6554,15 +6568,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6557: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6571: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6560: \$? = $ac_status" >&5
++  echo "$as_me:6574: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:6562: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6576: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6565: \$? = $ac_status" >&5
++  echo "$as_me:6579: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -6576,7 +6590,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:6579: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:6593: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -6589,7 +6603,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:6592: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:6606: 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
+@@ -6597,7 +6611,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6600 "configure"
++#line 6614 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6616,16 +6630,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6619: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6633: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6622: \$? = $ac_status" >&5
++  echo "$as_me:6636: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6625: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6639: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6628: \$? = $ac_status" >&5
++  echo "$as_me:6642: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -6636,10 +6650,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6639: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:6653: 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:6642: checking for initscr in -lgpm" >&5
++  echo "$as_me:6656: 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
+@@ -6647,7 +6661,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6650 "configure"
++#line 6664 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6666,16 +6680,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6669: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6683: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6672: \$? = $ac_status" >&5
++  echo "$as_me:6686: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6675: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6689: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6678: \$? = $ac_status" >&5
++  echo "$as_me:6692: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -6686,7 +6700,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6689: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:6703: 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"
+@@ -6701,7 +6715,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:6704: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:6718: 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
+@@ -6709,7 +6723,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6712 "configure"
++#line 6726 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6728,16 +6742,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6731: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6745: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6734: \$? = $ac_status" >&5
++  echo "$as_me:6748: \$? = $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:6751: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6740: \$? = $ac_status" >&5
++  echo "$as_me:6754: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -6748,7 +6762,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6751: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:6765: 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"
+@@ -6797,13 +6811,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:6800: checking for initscr" >&5
++	echo "$as_me:6814: 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 6806 "configure"
++#line 6820 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -6834,16 +6848,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6837: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6851: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6840: \$? = $ac_status" >&5
++  echo "$as_me:6854: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6843: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6857: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6846: \$? = $ac_status" >&5
++  echo "$as_me:6860: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -6853,18 +6867,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6856: result: $ac_cv_func_initscr" >&5
++echo "$as_me:6870: 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:6863: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:6877: 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 6867 "configure"
++#line 6881 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6876,25 +6890,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6879: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6893: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6882: \$? = $ac_status" >&5
++  echo "$as_me:6896: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6885: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6899: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6888: \$? = $ac_status" >&5
++  echo "$as_me:6902: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:6890: result: yes" >&5
++  echo "$as_me:6904: 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:6897: result: no" >&5
++echo "$as_me:6911: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -6962,11 +6976,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:6965: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:6979: 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 6969 "configure"
++#line 6983 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6978,25 +6992,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6981: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6995: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6984: \$? = $ac_status" >&5
++  echo "$as_me:6998: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6987: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7001: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6990: \$? = $ac_status" >&5
++  echo "$as_me:7004: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:6992: result: yes" >&5
++  echo "$as_me:7006: 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:6999: result: no" >&5
++echo "$as_me:7013: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -7011,7 +7025,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:7014: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:7028: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7019,7 +7033,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:7022: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:7036: 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
+@@ -7029,7 +7043,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7032 "configure"
++#line 7046 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7041,23 +7055,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7044: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7058: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7047: \$? = $ac_status" >&5
++  echo "$as_me:7061: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7050: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7064: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7053: \$? = $ac_status" >&5
++  echo "$as_me:7067: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:7055: result: yes" >&5
++  echo "$as_me:7069: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:7060: result: no" >&5
++echo "$as_me:7074: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -7075,7 +7089,7 @@
+ 	NCURSES_CONFIG=none
+ fi
+ 
+-echo "$as_me:7078: checking for specified curses library type" >&5
++echo "$as_me:7092: checking for specified curses library type" >&5
+ echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
+ 
+ # Check whether --with-screen or --without-screen was given.
+@@ -7088,30 +7102,1037 @@
+ 
+ case $cf_cv_screen in
+ (curses|curses_*)
+-	CF_CURSES_CONFIG
++
++echo "$as_me:7106: checking for extra include directories" >&5
++echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
++if test "${cf_cv_curses_incdir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++cf_cv_curses_incdir=no
++case "$host_os" in
++(hpux10.*)
++	if test "x$cf_cv_screen" = "xcurses_colr"
++	then
++		test -d /usr/include/curses_colr && \
++		cf_cv_curses_incdir="-I/usr/include/curses_colr"
++	fi
++	;;
++(sunos3*|sunos4*)
++	if test "x$cf_cv_screen" = "xcurses_5lib"
++	then
++		test -d /usr/5lib && \
++		test -d /usr/5include && \
++		cf_cv_curses_incdir="-I/usr/5include"
++	fi
++	;;
++esac
++
++fi
++echo "$as_me:7132: result: $cf_cv_curses_incdir" >&5
++echo "${ECHO_T}$cf_cv_curses_incdir" >&6
++if test "$cf_cv_curses_incdir" != no
++then
++
++	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
++	CPPFLAGS="${CPPFLAGS}$cf_cv_curses_incdir"
++
++fi
++
++echo "$as_me:7142: 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
++else
++
++cf_cv_ncurses_header=none
++for cf_header in \
++	ncurses.h  \
++	curses.h  ncurses/ncurses.h ncurses/curses.h
++do
++cat >"conftest.$ac_ext" <<_ACEOF
++#line 7154 "configure"
++#include "confdefs.h"
++#include <${cf_header}>
++int
++main (void)
++{
++initscr(); endwin()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f "conftest.$ac_objext"
++if { (eval echo "$as_me:7166: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:7169: \$? = $ac_status" >&5
++  (exit "$ac_status"); } &&
++         { ac_try='test -s "conftest.$ac_objext"'
++  { (eval echo "$as_me:7172: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:7175: \$? = $ac_status" >&5
++  (exit "$ac_status"); }; }; then
++  cf_cv_ncurses_header=$cf_header; break
++else
++  echo "$as_me: failed program was:" >&5
++cat "conftest.$ac_ext" >&5
++fi
++rm -f "conftest.$ac_objext" "conftest.$ac_ext"
++done
++
++fi
++echo "$as_me:7186: 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:7190: error: No curses header-files found" >&5
++echo "$as_me: error: No curses header-files found" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++# cheat, to get the right #define's for HAVE_NCURSES_H, etc.
++
++for ac_header in $cf_cv_ncurses_header
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++echo "$as_me:7200: 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 7206 "configure"
++#include "confdefs.h"
++#include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:7210: \"$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:7216: \$? = $ac_status" >&5
++  (exit "$ac_status"); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  eval "$as_ac_Header=yes"
++else
++  echo "$as_me: failed program was:" >&5
++  cat "conftest.$ac_ext" >&5
++  eval "$as_ac_Header=no"
++fi
++rm -f conftest.err "conftest.$ac_ext"
++fi
++echo "$as_me:7235: 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 $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
++else
++
++case "${cf_cv_ncurses_header}" in
++(*/ncurses.h|*/ncursesw.h)
++	cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
++	;;
++(*)
++	cf_term_header=term.h
++	;;
++esac
++
++for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
++do
++cat >"conftest.$ac_ext" <<_ACEOF
++#line 7263 "configure"
++#include "confdefs.h"
++#include 
++#include <${cf_cv_ncurses_header:-curses.h}>
++#include <$cf_test>
++
++int
++main (void)
++{
++int x = auto_left_margin; (void)x
++  ;
++  return 0;
++}
++_ACEOF
++rm -f "conftest.$ac_objext"
++if { (eval echo "$as_me:7278: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:7281: \$? = $ac_status" >&5
++  (exit "$ac_status"); } &&
++         { ac_try='test -s "conftest.$ac_objext"'
++  { (eval echo "$as_me:7284: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:7287: \$? = $ac_status" >&5
++  (exit "$ac_status"); }; }; then
++
++	cf_cv_term_header="$cf_test"
++else
++  echo "$as_me: failed program was:" >&5
++cat "conftest.$ac_ext" >&5
++
++	cf_cv_term_header=unknown
++
++fi
++rm -f "conftest.$ac_objext" "conftest.$ac_ext"
++	test "$cf_cv_term_header" != unknown && break
++done
++
++fi
++echo "$as_me:7303: result: $cf_cv_term_header" >&5
++echo "${ECHO_T}$cf_cv_term_header" >&6
++
++# Set definitions to allow ifdef'ing to accommodate subdirectories
++
++case "$cf_cv_term_header" in
++(*term.h)
++
++cat >>confdefs.h <<\EOF
++#define HAVE_TERM_H 1
++EOF
++
++	;;
++esac
++
++case "$cf_cv_term_header" in
++(ncurses/term.h)
++
++cat >>confdefs.h <<\EOF
++#define HAVE_NCURSES_TERM_H 1
++EOF
++
++	;;
++(ncursesw/term.h)
++
++cat >>confdefs.h <<\EOF
++#define HAVE_NCURSESW_TERM_H 1
++EOF
++
++	;;
++esac
++
++echo "$as_me:7335: 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
++else
++
++	cf_cv_ncurses_version=no
++	cf_tempfile=out$$
++	rm -f "$cf_tempfile"
++	if test "$cross_compiling" = yes; then
++
++	# This will not work if the preprocessor splits the line after the
++	# Autoconf token.  The 'unproto' program does that.
++	cat > "conftest.$ac_ext" <
++#undef Autoconf
++#ifdef NCURSES_VERSION
++Autoconf NCURSES_VERSION
++#else
++#ifdef __NCURSES_H
++Autoconf "old"
++#endif
++;
++#endif
++EOF
++	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
++	{ (eval echo "$as_me:7361: \"$cf_try\"") >&5
++  (eval $cf_try) 2>&5
++  ac_status=$?
++  echo "$as_me:7364: \$? = $ac_status" >&5
++  (exit "$ac_status"); }
++	if test -f conftest.out ; then
++		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
++		test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
++		rm -f conftest.out
++	fi
++
++else
++  cat >"conftest.$ac_ext" <<_ACEOF
++#line 7374 "configure"
++#include "confdefs.h"
++
++$ac_includes_default
++
++#include <${cf_cv_ncurses_header:-curses.h}>
++
++int main(void)
++{
++	FILE *fp = fopen("$cf_tempfile", "w");
++#ifdef NCURSES_VERSION
++# ifdef NCURSES_VERSION_PATCH
++	fprintf(fp, "%s.%d\\n", NCURSES_VERSION, NCURSES_VERSION_PATCH);
++# else
++	fprintf(fp, "%s\\n", NCURSES_VERSION);
++# endif
++#else
++# ifdef __NCURSES_H
++	fprintf(fp, "old\\n");
++# else
++	#error expected ncurses header to define __NCURSES_H
++# endif
++#endif
++	${cf_cv_main_return:-return}(0);
++}
++_ACEOF
++rm -f "conftest$ac_exeext"
++if { (eval echo "$as_me:7401: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:7404: \$? = $ac_status" >&5
++  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
++  { (eval echo "$as_me:7406: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:7409: \$? = $ac_status" >&5
++  (exit "$ac_status"); }; }; then
++
++	cf_cv_ncurses_version=`cat $cf_tempfile`
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++cat "conftest.$ac_ext" >&5
++fi
++rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
++fi
++	rm -f "$cf_tempfile"
++
++fi
++echo "$as_me:7423: result: $cf_cv_ncurses_version" >&5
++echo "${ECHO_T}$cf_cv_ncurses_version" >&6
++test "$cf_cv_ncurses_version" = no ||
++cat >>confdefs.h <<\EOF
++#define NCURSES 1
++EOF
++
++echo "$as_me:7430: checking if we have identified curses libraries" >&5
++echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
++cat >"conftest.$ac_ext" <<_ACEOF
++#line 7433 "configure"
++#include "confdefs.h"
++#include <${cf_cv_ncurses_header:-curses.h}>
++int
++main (void)
++{
++initscr(); endwin()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f "conftest.$ac_objext" "conftest$ac_exeext"
++if { (eval echo "$as_me:7445: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:7448: \$? = $ac_status" >&5
++  (exit "$ac_status"); } &&
++         { ac_try='test -s "conftest$ac_exeext"'
++  { (eval echo "$as_me:7451: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:7454: \$? = $ac_status" >&5
++  (exit "$ac_status"); }; }; then
++  cf_result=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat "conftest.$ac_ext" >&5
++cf_result=no
++fi
++rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
++echo "$as_me:7463: result: $cf_result" >&5
++echo "${ECHO_T}$cf_result" >&6
++
++if test "$cf_result" = no ; then
++case "$host_os" in
++(freebsd*)
++	echo "$as_me:7469: 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
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lmytinfo  $LIBS"
++cat >"conftest.$ac_ext" <<_ACEOF
++#line 7477 "configure"
++#include "confdefs.h"
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char tgoto (void);
++int
++main (void)
++{
++tgoto ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f "conftest.$ac_objext" "conftest$ac_exeext"
++if { (eval echo "$as_me:7496: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:7499: \$? = $ac_status" >&5
++  (exit "$ac_status"); } &&
++         { ac_try='test -s "conftest$ac_exeext"'
++  { (eval echo "$as_me:7502: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:7505: \$? = $ac_status" >&5
++  (exit "$ac_status"); }; }; then
++  ac_cv_lib_mytinfo_tgoto=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat "conftest.$ac_ext" >&5
++ac_cv_lib_mytinfo_tgoto=no
++fi
++rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:7516: 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_add_libs="$LIBS"
++# reverse order
++cf_add_0lib=
++for cf_add_1lib in -lmytinfo; 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
++
++	;;
++(hpux10.*)
++	# Looking at HPUX 10.20, the Hcurses library is the oldest (1997), cur_colr
++	# next (1998), and xcurses "newer" (2000).  There is no header file for
++	# Hcurses; the subdirectory curses_colr has the headers (curses.h and
++	# term.h) for cur_colr
++	if test "x$cf_cv_screen" = "xcurses_colr"
++	then
++		echo "$as_me:7546: checking for initscr in -lcur_colr" >&5
++echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
++if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lcur_colr  $LIBS"
++cat >"conftest.$ac_ext" <<_ACEOF
++#line 7554 "configure"
++#include "confdefs.h"
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char initscr (void);
++int
++main (void)
++{
++initscr ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f "conftest.$ac_objext" "conftest$ac_exeext"
++if { (eval echo "$as_me:7573: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:7576: \$? = $ac_status" >&5
++  (exit "$ac_status"); } &&
++         { ac_try='test -s "conftest$ac_exeext"'
++  { (eval echo "$as_me:7579: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:7582: \$? = $ac_status" >&5
++  (exit "$ac_status"); }; }; then
++  ac_cv_lib_cur_colr_initscr=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat "conftest.$ac_ext" >&5
++ac_cv_lib_cur_colr_initscr=no
++fi
++rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:7593: result: $ac_cv_lib_cur_colr_initscr" >&5
++echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
++if test "$ac_cv_lib_cur_colr_initscr" = yes; then
++
++cf_add_libs="$LIBS"
++# reverse order
++cf_add_0lib=
++for cf_add_1lib in -lcur_colr; 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"
++
++			ac_cv_func_initscr=yes
++
++else
++
++		echo "$as_me:7617: checking for initscr in -lHcurses" >&5
++echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
++if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lHcurses  $LIBS"
++cat >"conftest.$ac_ext" <<_ACEOF
++#line 7625 "configure"
++#include "confdefs.h"
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char initscr (void);
++int
++main (void)
++{
++initscr ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f "conftest.$ac_objext" "conftest$ac_exeext"
++if { (eval echo "$as_me:7644: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:7647: \$? = $ac_status" >&5
++  (exit "$ac_status"); } &&
++         { ac_try='test -s "conftest$ac_exeext"'
++  { (eval echo "$as_me:7650: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:7653: \$? = $ac_status" >&5
++  (exit "$ac_status"); }; }; then
++  ac_cv_lib_Hcurses_initscr=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat "conftest.$ac_ext" >&5
++ac_cv_lib_Hcurses_initscr=no
++fi
++rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:7664: result: $ac_cv_lib_Hcurses_initscr" >&5
++echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
++if test "$ac_cv_lib_Hcurses_initscr" = yes; then
++
++			# HP's header uses __HP_CURSES, but user claims _HP_CURSES.
++
++cf_add_libs="$LIBS"
++# reverse order
++cf_add_0lib=
++for cf_add_1lib in -lHcurses; 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"
++
++	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
++	CPPFLAGS="${CPPFLAGS}-D__HP_CURSES -D_HP_CURSES"
++
++			ac_cv_func_initscr=yes
++
++fi
++
++fi
++
++	fi
++	;;
++(linux*)
++	case `arch 2>/dev/null` in
++	(x86_64)
++		if test -d /lib64
++		then
++
++if test -n "/lib64" ; then
++	for cf_add_libdir in /lib64
++	do
++		if test "$cf_add_libdir" = /usr/lib ; then
++			:
++		elif test -d "$cf_add_libdir"
++		then
++			cf_have_libdir=no
++			if test -n "$LDFLAGS$LIBS" ; then
++				# a loop is needed to ensure we can add subdirs of existing dirs
++				for cf_test_libdir in $LDFLAGS $LIBS ; do
++					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
++						cf_have_libdir=yes; break
++					fi
++				done
++			fi
++			if test "$cf_have_libdir" = no ; then
++				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
++
++echo "${as_me:-configure}:7722: testing adding $cf_add_libdir to library-path ..." 1>&5
++
++				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
++			fi
++		fi
++	done
++fi
++
++		else
++
++if test -n "/lib" ; then
++	for cf_add_libdir in /lib
++	do
++		if test "$cf_add_libdir" = /usr/lib ; then
++			:
++		elif test -d "$cf_add_libdir"
++		then
++			cf_have_libdir=no
++			if test -n "$LDFLAGS$LIBS" ; then
++				# a loop is needed to ensure we can add subdirs of existing dirs
++				for cf_test_libdir in $LDFLAGS $LIBS ; do
++					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
++						cf_have_libdir=yes; break
++					fi
++				done
++			fi
++			if test "$cf_have_libdir" = no ; then
++				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
++
++echo "${as_me:-configure}:7751: testing adding $cf_add_libdir to library-path ..." 1>&5
++
++				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
++			fi
++		fi
++	done
++fi
++
++		fi
++		;;
++	(*)
++
++if test -n "/lib" ; then
++	for cf_add_libdir in /lib
++	do
++		if test "$cf_add_libdir" = /usr/lib ; then
++			:
++		elif test -d "$cf_add_libdir"
++		then
++			cf_have_libdir=no
++			if test -n "$LDFLAGS$LIBS" ; then
++				# a loop is needed to ensure we can add subdirs of existing dirs
++				for cf_test_libdir in $LDFLAGS $LIBS ; do
++					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
++						cf_have_libdir=yes; break
++					fi
++				done
++			fi
++			if test "$cf_have_libdir" = no ; then
++				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
++
++echo "${as_me:-configure}:7782: testing adding $cf_add_libdir to library-path ..." 1>&5
++
++				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
++			fi
++		fi
++	done
++fi
++
++		;;
++	esac
++	;;
++(sunos3*|sunos4*)
++	if test "x$cf_cv_screen" = "xcurses_5lib"
++	then
++		if test -d /usr/5lib ; then
++
++if test -n "/usr/5lib" ; then
++	for cf_add_libdir in /usr/5lib
++	do
++		if test "$cf_add_libdir" = /usr/lib ; then
++			:
++		elif test -d "$cf_add_libdir"
++		then
++			cf_have_libdir=no
++			if test -n "$LDFLAGS$LIBS" ; then
++				# a loop is needed to ensure we can add subdirs of existing dirs
++				for cf_test_libdir in $LDFLAGS $LIBS ; do
++					if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
++						cf_have_libdir=yes; break
++					fi
++				done
++			fi
++			if test "$cf_have_libdir" = no ; then
++				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
++
++echo "${as_me:-configure}:7817: testing adding $cf_add_libdir to library-path ..." 1>&5
++
++				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
++			fi
++		fi
++	done
++fi
++
++cf_add_libs="$LIBS"
++# reverse order
++cf_add_0lib=
++for cf_add_1lib in -lcurses -ltermcap; 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
++	fi
++	ac_cv_func_initscr=yes
++	;;
++esac
++
++if test ".$ac_cv_func_initscr" != .yes ; then
++	cf_save_LIBS="$LIBS"
++
++	if test ".${cf_cv_ncurses_version:-no}" != .no
++	then
++		cf_check_list="ncurses curses cursesX"
++	else
++		cf_check_list="cursesX curses ncurses"
++	fi
++
++	# Check for library containing tgoto.  Do this before curses library
++	# because it may be needed to link the test-case for initscr.
++	if test "x$cf_term_lib" = x
++	then
++		echo "$as_me:7861: checking for tgoto" >&5
++echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
++if test "${ac_cv_func_tgoto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >"conftest.$ac_ext" <<_ACEOF
++#line 7867 "configure"
++#include "confdefs.h"
++#define tgoto autoconf_temporary
++#include 	/* least-intrusive standard header which defines gcc2 __stub macros */
++#undef tgoto
++
++#ifdef __cplusplus
++extern "C"
++#endif
++
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char tgoto (void);
++
++int
++main (void)
++{
++
++/* The GNU C library defines stubs for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_tgoto) || defined (__stub___tgoto)
++#error found stub for tgoto
++#endif
++
++	return tgoto ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f "conftest.$ac_objext" "conftest$ac_exeext"
++if { (eval echo "$as_me:7898: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:7901: \$? = $ac_status" >&5
++  (exit "$ac_status"); } &&
++         { ac_try='test -s "conftest$ac_exeext"'
++  { (eval echo "$as_me:7904: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:7907: \$? = $ac_status" >&5
++  (exit "$ac_status"); }; }; then
++  ac_cv_func_tgoto=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat "conftest.$ac_ext" >&5
++ac_cv_func_tgoto=no
++fi
++rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
++fi
++echo "$as_me:7917: result: $ac_cv_func_tgoto" >&5
++echo "${ECHO_T}$ac_cv_func_tgoto" >&6
++if test "$ac_cv_func_tgoto" = yes; then
++  cf_term_lib=predefined
++else
++
++			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
++			do
++				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
++echo "$as_me:7926: checking for tgoto in -l$cf_term_lib" >&5
++echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Lib+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-l$cf_term_lib  $LIBS"
++cat >"conftest.$ac_ext" <<_ACEOF
++#line 7934 "configure"
++#include "confdefs.h"
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char tgoto (void);
++int
++main (void)
++{
++tgoto ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f "conftest.$ac_objext" "conftest$ac_exeext"
++if { (eval echo "$as_me:7953: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:7956: \$? = $ac_status" >&5
++  (exit "$ac_status"); } &&
++         { ac_try='test -s "conftest$ac_exeext"'
++  { (eval echo "$as_me:7959: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:7962: \$? = $ac_status" >&5
++  (exit "$ac_status"); }; }; then
++  eval "$as_ac_Lib=yes"
++else
++  echo "$as_me: failed program was:" >&5
++cat "conftest.$ac_ext" >&5
++eval "$as_ac_Lib=no"
++fi
++rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:7973: 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
++
++					: "${cf_nculib_root:=$cf_term_lib}"
++					break
++
++fi
++
++			done
++
++fi
++
++	fi
++
++	# Check for library containing initscr
++	test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS"
++	if test "x$cf_curs_lib" = x
++	then
++		for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
++		do
++			LIBS="-l$cf_curs_lib $cf_save_LIBS"
++			if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
++				echo "$as_me:7996: checking if we can link with $cf_curs_lib library" >&5
++echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
++				cat >"conftest.$ac_ext" <<_ACEOF
++#line 7999 "configure"
++#include "confdefs.h"
++#include <${cf_cv_ncurses_header:-curses.h}>
++int
++main (void)
++{
++initscr()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f "conftest.$ac_objext" "conftest$ac_exeext"
++if { (eval echo "$as_me:8011: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:8014: \$? = $ac_status" >&5
++  (exit "$ac_status"); } &&
++         { ac_try='test -s "conftest$ac_exeext"'
++  { (eval echo "$as_me:8017: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:8020: \$? = $ac_status" >&5
++  (exit "$ac_status"); }; }; then
++  cf_result=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat "conftest.$ac_ext" >&5
++cf_result=no
++fi
++rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
++				echo "$as_me:8029: result: $cf_result" >&5
++echo "${ECHO_T}$cf_result" >&6
++				test "$cf_result" = yes && break
++			elif test "$cf_curs_lib" = "$cf_term_lib" ; then
++				cf_result=no
++			elif test "$cf_term_lib" != predefined ; then
++				echo "$as_me:8035: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
++echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
++				cat >"conftest.$ac_ext" <<_ACEOF
++#line 8038 "configure"
++#include "confdefs.h"
++#include <${cf_cv_ncurses_header:-curses.h}>
++int
++main (void)
++{
++initscr(); endwin();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f "conftest.$ac_objext" "conftest$ac_exeext"
++if { (eval echo "$as_me:8050: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:8053: \$? = $ac_status" >&5
++  (exit "$ac_status"); } &&
++         { ac_try='test -s "conftest$ac_exeext"'
++  { (eval echo "$as_me:8056: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:8059: \$? = $ac_status" >&5
++  (exit "$ac_status"); }; }; then
++  cf_result=no
++else
++  echo "$as_me: failed program was:" >&5
++cat "conftest.$ac_ext" >&5
++
++					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
++					cat >"conftest.$ac_ext" <<_ACEOF
++#line 8068 "configure"
++#include "confdefs.h"
++#include <${cf_cv_ncurses_header:-curses.h}>
++int
++main (void)
++{
++initscr()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f "conftest.$ac_objext" "conftest$ac_exeext"
++if { (eval echo "$as_me:8080: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:8083: \$? = $ac_status" >&5
++  (exit "$ac_status"); } &&
++         { ac_try='test -s "conftest$ac_exeext"'
++  { (eval echo "$as_me:8086: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:8089: \$? = $ac_status" >&5
++  (exit "$ac_status"); }; }; then
++  cf_result=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat "conftest.$ac_ext" >&5
++cf_result=error
++fi
++rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
++
++fi
++rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
++				echo "$as_me:8101: result: $cf_result" >&5
++echo "${ECHO_T}$cf_result" >&6
++				test "$cf_result" != error && break
++			fi
++		done
++	fi
++	test "$cf_curs_lib" = unknown && { { echo "$as_me:8107: error: no curses library found" >&5
++echo "$as_me: error: no curses library found" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++fi
++
+ 	;;
+ (ncursesw*)
+ 
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7098: checking for $ac_header" >&5
++echo "$as_me:8119: 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 7104 "configure"
++#line 8125 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7108: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8129: \"$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:7114: \$? = $ac_status" >&5
++  echo "$as_me:8135: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7130,7 +8151,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7133: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8154: 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:8164: 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
+@@ -7148,7 +8169,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7151 "configure"
++#line 8172 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -7165,16 +8186,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7168: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8189: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7171: \$? = $ac_status" >&5
++  echo "$as_me:8192: \$? = $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:8195: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7177: \$? = $ac_status" >&5
++  echo "$as_me:8198: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -7186,12 +8207,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:7189: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8210: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7194 "configure"
++#line 8215 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7204,16 +8225,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7207: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8228: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7210: \$? = $ac_status" >&5
++  echo "$as_me:8231: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7213: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8234: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7216: \$? = $ac_status" >&5
++  echo "$as_me:8237: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -7227,7 +8248,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7230 "configure"
++#line 8251 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7240,16 +8261,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7243: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8264: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7246: \$? = $ac_status" >&5
++  echo "$as_me:8267: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7249: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8270: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7252: \$? = $ac_status" >&5
++  echo "$as_me:8273: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -7266,9 +8287,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:7269: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:8290: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:7271: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8292: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -7359,7 +8380,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}:7362: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8383: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -7367,7 +8388,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7370 "configure"
++#line 8391 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7380,21 +8401,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7383: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8404: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7386: \$? = $ac_status" >&5
++  echo "$as_me:8407: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7389: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8410: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7392: \$? = $ac_status" >&5
++  echo "$as_me:8413: \$? = $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}:7397: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8418: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -7412,7 +8433,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:7415: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8436: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -7487,13 +8508,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}:7490: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8511: 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 7496 "configure"
++#line 8517 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7506,21 +8527,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7509: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8530: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7512: \$? = $ac_status" >&5
++  echo "$as_me:8533: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7515: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8536: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7518: \$? = $ac_status" >&5
++  echo "$as_me:8539: \$? = $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}:7523: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8544: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -7562,7 +8583,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7565: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:8586: 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
+@@ -7600,7 +8621,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7603 "configure"
++#line 8624 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7612,16 +8633,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7615: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8636: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7618: \$? = $ac_status" >&5
++  echo "$as_me:8639: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7621: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8642: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7624: \$? = $ac_status" >&5
++  echo "$as_me:8645: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -7638,7 +8659,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}:7641: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8662: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -7674,7 +8695,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}:7677: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:8698: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7704,13 +8725,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:7707: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:8728: 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:7710: result: yes" >&5
++		echo "$as_me:8731: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:7713: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:8734: 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
+ 
+@@ -7843,7 +8864,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7846 "configure"
++#line 8867 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7855,37 +8876,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7858: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8879: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7861: \$? = $ac_status" >&5
++  echo "$as_me:8882: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7864: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8885: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7867: \$? = $ac_status" >&5
++  echo "$as_me:8888: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7873 "configure"
++#line 8894 "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:7880: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8901: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7883: \$? = $ac_status" >&5
++  echo "$as_me:8904: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:7885: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8906: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7888: \$? = $ac_status" >&5
++  echo "$as_me:8909: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -7916,6 +8937,20 @@
+ 			;;
+ 		esac
+ 
++for cf_required in $cf_ncuconfig_root
++do
++	# check for duplicates
++	for cf_require_pkg in $REQUIRE_PKG
++	do
++		if test "$cf_required" = "$cf_require_pkg"
++		then
++			cf_required=
++			break
++		fi
++	done
++	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
++done
++
+ for cf_add_cflags in $cf_pkg_cflags
+ do
+ 	case "x$cf_add_cflags" in
+@@ -8059,7 +9094,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8062 "configure"
++#line 9097 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8071,37 +9106,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8074: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9109: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8077: \$? = $ac_status" >&5
++  echo "$as_me:9112: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8080: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9115: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8083: \$? = $ac_status" >&5
++  echo "$as_me:9118: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8089 "configure"
++#line 9124 "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:8096: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9131: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8099: \$? = $ac_status" >&5
++  echo "$as_me:9134: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:8101: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9136: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8104: \$? = $ac_status" >&5
++  echo "$as_me:9139: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -8118,7 +9153,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:8121: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:9156: 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"
+@@ -8134,7 +9169,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:8137: checking for terminfo header" >&5
++echo "$as_me:9172: 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
+@@ -8152,7 +9187,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8155 "configure"
++#line 9190 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8167,16 +9202,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8170: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9205: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8173: \$? = $ac_status" >&5
++  echo "$as_me:9208: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8176: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9211: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8179: \$? = $ac_status" >&5
++  echo "$as_me:9214: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -8192,7 +9227,7 @@
+ done
+ 
+ fi
+-echo "$as_me:8195: result: $cf_cv_term_header" >&5
++echo "$as_me:9230: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -8227,7 +9262,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:8230: result: no" >&5
++		echo "$as_me:9265: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -8243,7 +9278,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:8246: checking for $ac_word" >&5
++echo "$as_me:9281: 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
+@@ -8258,7 +9293,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:8261: found $ac_dir/$ac_word" >&5
++echo "$as_me:9296: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8266,10 +9301,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:8269: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:9304: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:8272: result: no" >&5
++  echo "$as_me:9307: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8282,7 +9317,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:8285: checking for $ac_word" >&5
++echo "$as_me:9320: 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
+@@ -8297,7 +9332,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:8300: found $ac_dir/$ac_word" >&5
++echo "$as_me:9335: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8305,10 +9340,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:8308: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:9343: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:8311: result: no" >&5
++  echo "$as_me:9346: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8465,7 +9500,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:8468: checking if we have identified curses headers" >&5
++echo "$as_me:9503: 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
+@@ -8477,7 +9512,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8480 "configure"
++#line 9515 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -8489,16 +9524,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8492: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9527: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8495: \$? = $ac_status" >&5
++  echo "$as_me:9530: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8498: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9533: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8501: \$? = $ac_status" >&5
++  echo "$as_me:9536: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -8509,11 +9544,11 @@
+ done
+ 
+ fi
+-echo "$as_me:8512: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:9547: 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:8516: error: No curses header-files found" >&5
++	{ { echo "$as_me:9551: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8523,23 +9558,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:8526: checking for $ac_header" >&5
++echo "$as_me:9561: 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 8532 "configure"
++#line 9567 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8536: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:9571: \"$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:8542: \$? = $ac_status" >&5
++  echo "$as_me:9577: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8558,7 +9593,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8561: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:9596: 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 8617 "configure"
++#line 9652 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8626,16 +9661,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8629: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9664: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8632: \$? = $ac_status" >&5
++  echo "$as_me:9667: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8635: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9670: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8638: \$? = $ac_status" >&5
++  echo "$as_me:9673: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -8652,7 +9687,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}:8655: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9690: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8671,7 +9706,7 @@
+ 
+ }
+ 
+-echo "$as_me:8674: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:9709: 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
+@@ -8683,7 +9718,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8686 "configure"
++#line 9721 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -8707,16 +9742,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8710: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9745: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8713: \$? = $ac_status" >&5
++  echo "$as_me:9748: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8716: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9751: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8719: \$? = $ac_status" >&5
++  echo "$as_me:9754: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -8731,14 +9766,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:8734: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:9769: 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:8741: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:9776: 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
+@@ -8859,7 +9894,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8862 "configure"
++#line 9897 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8871,16 +9906,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8874: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9909: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8877: \$? = $ac_status" >&5
++  echo "$as_me:9912: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8880: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9915: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8883: \$? = $ac_status" >&5
++  echo "$as_me:9918: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -8897,7 +9932,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}:8900: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9935: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8920,7 +9955,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8923 "configure"
++#line 9958 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -8944,16 +9979,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8947: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9982: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8950: \$? = $ac_status" >&5
++  echo "$as_me:9985: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8953: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9988: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8956: \$? = $ac_status" >&5
++  echo "$as_me:9991: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -8974,12 +10009,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8977: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10012: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:8982: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:10017: 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%/[^/]*$%%'`
+@@ -9015,7 +10050,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9018 "configure"
++#line 10053 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9027,16 +10062,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9030: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10065: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9033: \$? = $ac_status" >&5
++  echo "$as_me:10068: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9036: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10071: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9039: \$? = $ac_status" >&5
++  echo "$as_me:10074: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9053,7 +10088,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}:9056: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10091: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9101,7 +10136,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9104: checking for terminfo header" >&5
++echo "$as_me:10139: 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
+@@ -9119,7 +10154,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9122 "configure"
++#line 10157 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9134,16 +10169,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9137: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10172: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9140: \$? = $ac_status" >&5
++  echo "$as_me:10175: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9143: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10178: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9146: \$? = $ac_status" >&5
++  echo "$as_me:10181: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -9159,7 +10194,7 @@
+ done
+ 
+ fi
+-echo "$as_me:9162: result: $cf_cv_term_header" >&5
++echo "$as_me:10197: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9197,7 +10232,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:9200: checking for ncurses version" >&5
++echo "$as_me:10235: 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
+@@ -9223,10 +10258,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:9226: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:10261: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9229: \$? = $ac_status" >&5
++  echo "$as_me:10264: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -9236,7 +10271,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9239 "configure"
++#line 10274 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -9263,15 +10298,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9266: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10301: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9269: \$? = $ac_status" >&5
++  echo "$as_me:10304: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9271: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10306: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9274: \$? = $ac_status" >&5
++  echo "$as_me:10309: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -9285,7 +10320,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:9288: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:10323: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -9298,7 +10333,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:9301: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:10336: 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
+@@ -9306,7 +10341,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9309 "configure"
++#line 10344 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9325,16 +10360,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9328: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10363: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9331: \$? = $ac_status" >&5
++  echo "$as_me:10366: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9334: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10369: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9337: \$? = $ac_status" >&5
++  echo "$as_me:10372: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -9345,10 +10380,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9348: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:10383: 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:9351: checking for initscr in -lgpm" >&5
++  echo "$as_me:10386: 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
+@@ -9356,7 +10391,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9359 "configure"
++#line 10394 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9375,16 +10410,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9378: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10413: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9381: \$? = $ac_status" >&5
++  echo "$as_me:10416: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9384: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10419: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9387: \$? = $ac_status" >&5
++  echo "$as_me:10422: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -9395,7 +10430,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9398: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:10433: 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"
+@@ -9410,7 +10445,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:9413: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:10448: 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
+@@ -9418,7 +10453,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9421 "configure"
++#line 10456 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9437,16 +10472,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9440: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10475: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9443: \$? = $ac_status" >&5
++  echo "$as_me:10478: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9446: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10481: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9449: \$? = $ac_status" >&5
++  echo "$as_me:10484: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -9457,7 +10492,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9460: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:10495: 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"
+@@ -9506,13 +10541,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:9509: checking for initscr" >&5
++	echo "$as_me:10544: 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 9515 "configure"
++#line 10550 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9543,16 +10578,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9546: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10581: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9549: \$? = $ac_status" >&5
++  echo "$as_me:10584: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9552: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10587: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9555: \$? = $ac_status" >&5
++  echo "$as_me:10590: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -9562,18 +10597,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:9565: result: $ac_cv_func_initscr" >&5
++echo "$as_me:10600: 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:9572: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:10607: 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 9576 "configure"
++#line 10611 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9585,25 +10620,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9588: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10623: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9591: \$? = $ac_status" >&5
++  echo "$as_me:10626: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9594: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10629: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9597: \$? = $ac_status" >&5
++  echo "$as_me:10632: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:9599: result: yes" >&5
++  echo "$as_me:10634: 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:9606: result: no" >&5
++echo "$as_me:10641: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -9671,11 +10706,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:9674: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:10709: 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 9678 "configure"
++#line 10713 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9687,25 +10722,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9690: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10725: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9693: \$? = $ac_status" >&5
++  echo "$as_me:10728: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9696: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10731: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9699: \$? = $ac_status" >&5
++  echo "$as_me:10734: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:9701: result: yes" >&5
++  echo "$as_me:10736: 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:9708: result: no" >&5
++echo "$as_me:10743: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -9720,7 +10755,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:9723: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:10758: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -9728,7 +10763,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:9731: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:10766: 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
+@@ -9738,7 +10773,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9741 "configure"
++#line 10776 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9750,23 +10785,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9753: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10788: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9756: \$? = $ac_status" >&5
++  echo "$as_me:10791: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9759: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10794: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9762: \$? = $ac_status" >&5
++  echo "$as_me:10797: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:9764: result: yes" >&5
++  echo "$as_me:10799: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:9769: result: no" >&5
++echo "$as_me:10804: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -9791,13 +10826,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:9794: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:10829: 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:9797: result: yes" >&5
++		echo "$as_me:10832: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:9800: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:10835: 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
+ 
+@@ -9930,7 +10965,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9933 "configure"
++#line 10968 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9942,37 +10977,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9945: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10980: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9948: \$? = $ac_status" >&5
++  echo "$as_me:10983: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9951: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10986: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9954: \$? = $ac_status" >&5
++  echo "$as_me:10989: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9960 "configure"
++#line 10995 "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:9967: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11002: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9970: \$? = $ac_status" >&5
++  echo "$as_me:11005: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9972: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11007: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9975: \$? = $ac_status" >&5
++  echo "$as_me:11010: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -10003,6 +11038,20 @@
+ 			;;
+ 		esac
+ 
++for cf_required in $cf_ncuconfig_root
++do
++	# check for duplicates
++	for cf_require_pkg in $REQUIRE_PKG
++	do
++		if test "$cf_required" = "$cf_require_pkg"
++		then
++			cf_required=
++			break
++		fi
++	done
++	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
++done
++
+ for cf_add_cflags in $cf_pkg_cflags
+ do
+ 	case "x$cf_add_cflags" in
+@@ -10146,7 +11195,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10149 "configure"
++#line 11198 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10158,37 +11207,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10161: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11210: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10164: \$? = $ac_status" >&5
++  echo "$as_me:11213: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10167: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11216: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10170: \$? = $ac_status" >&5
++  echo "$as_me:11219: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10176 "configure"
++#line 11225 "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:10183: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11232: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10186: \$? = $ac_status" >&5
++  echo "$as_me:11235: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10188: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11237: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10191: \$? = $ac_status" >&5
++  echo "$as_me:11240: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -10205,7 +11254,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:10208: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:11257: 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"
+@@ -10221,7 +11270,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:10224: checking for terminfo header" >&5
++echo "$as_me:11273: 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
+@@ -10239,7 +11288,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10242 "configure"
++#line 11291 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -10254,16 +11303,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10257: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11306: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10260: \$? = $ac_status" >&5
++  echo "$as_me:11309: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10263: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11312: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10266: \$? = $ac_status" >&5
++  echo "$as_me:11315: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -10279,7 +11328,7 @@
+ done
+ 
+ fi
+-echo "$as_me:10282: result: $cf_cv_term_header" >&5
++echo "$as_me:11331: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10314,7 +11363,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:10317: result: no" >&5
++		echo "$as_me:11366: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -10330,7 +11379,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:10333: checking for $ac_word" >&5
++echo "$as_me:11382: 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
+@@ -10345,7 +11394,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:10348: found $ac_dir/$ac_word" >&5
++echo "$as_me:11397: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -10353,10 +11402,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:10356: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:11405: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:10359: result: no" >&5
++  echo "$as_me:11408: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -10369,7 +11418,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:10372: checking for $ac_word" >&5
++echo "$as_me:11421: 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
+@@ -10384,7 +11433,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:10387: found $ac_dir/$ac_word" >&5
++echo "$as_me:11436: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -10392,10 +11441,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:10395: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:11444: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:10398: result: no" >&5
++  echo "$as_me:11447: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -10552,7 +11601,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:10555: checking if we have identified curses headers" >&5
++echo "$as_me:11604: 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
+@@ -10564,7 +11613,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10567 "configure"
++#line 11616 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -10576,16 +11625,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10579: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11628: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10582: \$? = $ac_status" >&5
++  echo "$as_me:11631: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10585: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11634: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10588: \$? = $ac_status" >&5
++  echo "$as_me:11637: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -10596,11 +11645,11 @@
+ done
+ 
+ fi
+-echo "$as_me:10599: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:11648: 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:10603: error: No curses header-files found" >&5
++	{ { echo "$as_me:11652: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -10610,23 +11659,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:10613: checking for $ac_header" >&5
++echo "$as_me:11662: 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 10619 "configure"
++#line 11668 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10623: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:11672: \"$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:10629: \$? = $ac_status" >&5
++  echo "$as_me:11678: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10645,7 +11694,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:10648: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:11697: 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 10704 "configure"
++#line 11753 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10713,16 +11762,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10716: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11765: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10719: \$? = $ac_status" >&5
++  echo "$as_me:11768: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10722: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11771: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10725: \$? = $ac_status" >&5
++  echo "$as_me:11774: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10739,7 +11788,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}:10742: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11791: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10758,7 +11807,7 @@
+ 
+ }
+ 
+-echo "$as_me:10761: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:11810: 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
+@@ -10770,7 +11819,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10773 "configure"
++#line 11822 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -10794,16 +11843,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10797: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11846: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10800: \$? = $ac_status" >&5
++  echo "$as_me:11849: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10803: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11852: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10806: \$? = $ac_status" >&5
++  echo "$as_me:11855: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -10818,14 +11867,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:10821: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:11870: 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:10828: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:11877: 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
+@@ -10946,7 +11995,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10949 "configure"
++#line 11998 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10958,16 +12007,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10961: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12010: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10964: \$? = $ac_status" >&5
++  echo "$as_me:12013: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10967: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12016: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10970: \$? = $ac_status" >&5
++  echo "$as_me:12019: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10984,7 +12033,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}:10987: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:12036: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -11007,7 +12056,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11010 "configure"
++#line 12059 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -11031,16 +12080,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11034: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12083: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11037: \$? = $ac_status" >&5
++  echo "$as_me:12086: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11040: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12089: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11043: \$? = $ac_status" >&5
++  echo "$as_me:12092: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -11061,12 +12110,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11064: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:12113: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:11069: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:12118: 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%/[^/]*$%%'`
+@@ -11102,7 +12151,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11105 "configure"
++#line 12154 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11114,16 +12163,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11117: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12166: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11120: \$? = $ac_status" >&5
++  echo "$as_me:12169: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11123: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12172: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11126: \$? = $ac_status" >&5
++  echo "$as_me:12175: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11140,7 +12189,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}:11143: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:12192: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -11188,7 +12237,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:11191: checking for terminfo header" >&5
++echo "$as_me:12240: 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
+@@ -11206,7 +12255,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11209 "configure"
++#line 12258 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -11221,16 +12270,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11224: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12273: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11227: \$? = $ac_status" >&5
++  echo "$as_me:12276: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11230: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12279: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11233: \$? = $ac_status" >&5
++  echo "$as_me:12282: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -11246,7 +12295,7 @@
+ done
+ 
+ fi
+-echo "$as_me:11249: result: $cf_cv_term_header" >&5
++echo "$as_me:12298: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -11284,7 +12333,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:11287: checking for ncurses version" >&5
++echo "$as_me:12336: 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
+@@ -11310,10 +12359,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:11313: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:12362: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11316: \$? = $ac_status" >&5
++  echo "$as_me:12365: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -11323,7 +12372,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11326 "configure"
++#line 12375 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11350,15 +12399,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:11353: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12402: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11356: \$? = $ac_status" >&5
++  echo "$as_me:12405: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:11358: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12407: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11361: \$? = $ac_status" >&5
++  echo "$as_me:12410: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -11372,7 +12421,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:11375: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:12424: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -11385,7 +12434,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:11388: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:12437: 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
+@@ -11393,7 +12442,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11396 "configure"
++#line 12445 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11412,16 +12461,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11415: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12464: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11418: \$? = $ac_status" >&5
++  echo "$as_me:12467: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11421: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12470: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11424: \$? = $ac_status" >&5
++  echo "$as_me:12473: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -11432,10 +12481,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11435: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:12484: 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:11438: checking for initscr in -lgpm" >&5
++  echo "$as_me:12487: 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
+@@ -11443,7 +12492,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11446 "configure"
++#line 12495 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11462,16 +12511,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11465: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12514: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11468: \$? = $ac_status" >&5
++  echo "$as_me:12517: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11471: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12520: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11474: \$? = $ac_status" >&5
++  echo "$as_me:12523: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -11482,7 +12531,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11485: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:12534: 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"
+@@ -11497,7 +12546,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:11500: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:12549: 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
+@@ -11505,7 +12554,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11508 "configure"
++#line 12557 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11524,16 +12573,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11527: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12576: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11530: \$? = $ac_status" >&5
++  echo "$as_me:12579: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11533: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12582: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11536: \$? = $ac_status" >&5
++  echo "$as_me:12585: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -11544,7 +12593,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11547: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:12596: 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"
+@@ -11593,13 +12642,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:11596: checking for initscr" >&5
++	echo "$as_me:12645: 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 11602 "configure"
++#line 12651 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -11630,16 +12679,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11633: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12682: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11636: \$? = $ac_status" >&5
++  echo "$as_me:12685: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11639: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12688: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11642: \$? = $ac_status" >&5
++  echo "$as_me:12691: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -11649,18 +12698,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:11652: result: $ac_cv_func_initscr" >&5
++echo "$as_me:12701: 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:11659: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:12708: 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 11663 "configure"
++#line 12712 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11672,25 +12721,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11675: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12724: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11678: \$? = $ac_status" >&5
++  echo "$as_me:12727: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11681: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12730: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11684: \$? = $ac_status" >&5
++  echo "$as_me:12733: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:11686: result: yes" >&5
++  echo "$as_me:12735: 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:11693: result: no" >&5
++echo "$as_me:12742: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -11758,11 +12807,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:11761: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:12810: 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 11765 "configure"
++#line 12814 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11774,25 +12823,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11777: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12826: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11780: \$? = $ac_status" >&5
++  echo "$as_me:12829: \$? = $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:12832: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11786: \$? = $ac_status" >&5
++  echo "$as_me:12835: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:11788: result: yes" >&5
++  echo "$as_me:12837: 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:11795: result: no" >&5
++echo "$as_me:12844: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -11807,7 +12856,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:11810: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:12859: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -11815,7 +12864,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:11818: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:12867: 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
+@@ -11825,7 +12874,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11828 "configure"
++#line 12877 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11837,23 +12886,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11840: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12889: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11843: \$? = $ac_status" >&5
++  echo "$as_me:12892: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11846: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12895: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11849: \$? = $ac_status" >&5
++  echo "$as_me:12898: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:11851: result: yes" >&5
++  echo "$as_me:12900: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:11856: result: no" >&5
++echo "$as_me:12905: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -11873,7 +12922,7 @@
+ 
+ 	;;
+ (*)
+-	{ { echo "$as_me:11876: error: unexpected screen-value: $cf_cv_screen" >&5
++	{ { echo "$as_me:12925: error: unexpected screen-value: $cf_cv_screen" >&5
+ echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -11912,10 +12961,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:11915: \"$cf_try\"") >&5
++		{ (eval echo "$as_me:12964: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11918: \$? = $ac_status" >&5
++  echo "$as_me:12967: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 		if test -f conftest.out ; then
+ 			cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ 	][ 	]*//" conftest.out`
+@@ -11933,17 +12982,17 @@
+ 
+ cf_cv_timestamp=`date`
+ 
+-echo "$as_me:11936: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
++echo "$as_me:12985: 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:11939: checking if KEY_RESIZE is supported" >&5
++echo "$as_me:12988: checking if KEY_RESIZE is supported" >&5
+ echo $ECHO_N "checking if KEY_RESIZE is supported... $ECHO_C" >&6
+ if test "${cf_cv_curses_resizes+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11946 "configure"
++#line 12995 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11955,16 +13004,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11958: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13007: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11961: \$? = $ac_status" >&5
++  echo "$as_me:13010: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11964: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13013: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11967: \$? = $ac_status" >&5
++  echo "$as_me:13016: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_resizes=yes
+ else
+@@ -11974,12 +13023,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:11977: result: $cf_cv_curses_resizes" >&5
++echo "$as_me:13026: result: $cf_cv_curses_resizes" >&5
+ echo "${ECHO_T}$cf_cv_curses_resizes" >&6
+ cf_cv_enable_sigwinch=0
+ test "$cf_cv_curses_resizes" = yes && cf_cv_enable_sigwinch=1
+ 
+-echo "$as_me:11982: checking if you want to have a library-prefix" >&5
++echo "$as_me:13031: 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.
+@@ -11989,7 +13038,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:11992: result: $with_lib_prefix" >&5
++echo "$as_me:13041: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test "$with_lib_prefix" = auto
+@@ -12027,7 +13076,7 @@
+ 	test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
+ fi
+ 
+-echo "$as_me:12030: checking for default loader flags" >&5
++echo "$as_me:13079: 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=''   ;;
+@@ -12035,13 +13084,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:12038: result: $LD_MODEL" >&5
++echo "$as_me:13087: 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:12044: checking for an rpath option" >&5
++	echo "$as_me:13093: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -12072,12 +13121,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:12075: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:13124: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:12080: checking if we need a space after rpath option" >&5
++		echo "$as_me:13129: 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"
+ 
+@@ -12098,7 +13147,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12101 "configure"
++#line 13150 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12110,16 +13159,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12113: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13162: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12116: \$? = $ac_status" >&5
++  echo "$as_me:13165: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12119: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13168: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12122: \$? = $ac_status" >&5
++  echo "$as_me:13171: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -12129,7 +13178,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:12132: result: $cf_rpath_space" >&5
++		echo "$as_me:13181: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -12151,7 +13200,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:12154: checking whether to use release or ABI version in shared library file names" >&5
++	echo "$as_me:13203: checking whether to use release or ABI version in shared library file names" >&5
+ echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
+ 
+ # Check whether --with-shlib-version or --without-shlib-version was given.
+@@ -12166,9 +13215,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:12169: result: $withval" >&5
++		echo "$as_me:13218: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:12171: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:13220: 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; }; }
+ 		;;
+@@ -12177,7 +13226,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:12180: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:13229: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -12200,14 +13249,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:12203: checking which $CC option to use" >&5
++		echo "$as_me:13252: 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 12210 "configure"
++#line 13259 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12219,16 +13268,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12222: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13271: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12225: \$? = $ac_status" >&5
++  echo "$as_me:13274: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12228: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13277: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12231: \$? = $ac_status" >&5
++  echo "$as_me:13280: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -12237,7 +13286,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		done
+-		echo "$as_me:12240: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:13289: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -12308,7 +13357,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:12311: checking if ld -search_paths_first works" >&5
++		echo "$as_me:13360: 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
+@@ -12317,7 +13366,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12320 "configure"
++#line 13369 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12329,16 +13378,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12332: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13381: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12335: \$? = $ac_status" >&5
++  echo "$as_me:13384: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12338: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13387: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12341: \$? = $ac_status" >&5
++  echo "$as_me:13390: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -12349,7 +13398,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:12352: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:13401: 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"
+@@ -12699,7 +13748,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12702 "configure"
++#line 13751 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12711,16 +13760,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12714: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13763: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12717: \$? = $ac_status" >&5
++  echo "$as_me:13766: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12720: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13769: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12723: \$? = $ac_status" >&5
++  echo "$as_me:13772: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -12757,7 +13806,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:12760: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:13809: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -12767,7 +13816,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <
+ int main(int argc, char *argv[])
+ {
+@@ -12779,18 +13828,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:12782: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:13831: 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:12784: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:13833: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12787: \$? = $ac_status" >&5
++  echo "$as_me:13836: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-				echo "$as_me:12789: result: yes" >&5
++				echo "$as_me:13838: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:12793: result: no" >&5
++				echo "$as_me:13842: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -12805,17 +13854,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:12808: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:13857: 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}:12812: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:13861: 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:12818: checking if you want to link sample programs with rpath option" >&5
++	echo "$as_me:13867: 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.
+@@ -12825,7 +13874,7 @@
+ else
+   with_rpath_link=yes
+ fi;
+-	echo "$as_me:12828: result: $with_rpath_link" >&5
++	echo "$as_me:13877: result: $with_rpath_link" >&5
+ echo "${ECHO_T}$with_rpath_link" >&6
+ 	if test "$with_rpath_link" = no
+ 	then
+@@ -12838,7 +13887,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:12841: checking if you want broken-linker support code" >&5
++echo "$as_me:13890: 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.
+@@ -12848,7 +13897,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:12851: result: $with_broken_linker" >&5
++echo "$as_me:13900: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : "${BROKEN_LINKER:=0}"
+@@ -12863,14 +13912,14 @@
+ 
+ # Check to define _XOPEN_SOURCE "automatically"
+ 
+-echo "$as_me:12866: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:13915: 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 12873 "configure"
++#line 13922 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12889,16 +13938,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12892: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13941: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12895: \$? = $ac_status" >&5
++  echo "$as_me:13944: \$? = $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:13947: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12901: \$? = $ac_status" >&5
++  echo "$as_me:13950: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -12909,7 +13958,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12912: result: $cf_cv_posix_visible" >&5
++echo "$as_me:13961: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -12951,14 +14000,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:12954: checking if this is the GNU C library" >&5
++echo "$as_me:14003: 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 12961 "configure"
++#line 14010 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12977,16 +14026,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12980: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14029: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12983: \$? = $ac_status" >&5
++  echo "$as_me:14032: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12986: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14035: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12989: \$? = $ac_status" >&5
++  echo "$as_me:14038: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -12997,7 +14046,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13000: result: $cf_cv_gnu_library" >&5
++echo "$as_me:14049: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -13005,7 +14054,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:13008: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:14057: 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
+@@ -13017,7 +14066,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13020 "configure"
++#line 14069 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13036,16 +14085,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13039: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14088: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13042: \$? = $ac_status" >&5
++  echo "$as_me:14091: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13045: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14094: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13048: \$? = $ac_status" >&5
++  echo "$as_me:14097: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -13057,12 +14106,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:13060: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:14109: 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:13065: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:14114: 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
+@@ -13167,7 +14216,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13170 "configure"
++#line 14219 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -13187,16 +14236,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13190: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14239: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13193: \$? = $ac_status" >&5
++  echo "$as_me:14242: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13196: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14245: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13199: \$? = $ac_status" >&5
++  echo "$as_me:14248: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -13207,7 +14256,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13210: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:14259: 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
+@@ -13216,14 +14265,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:13219: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:14268: 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 13226 "configure"
++#line 14275 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13238,16 +14287,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13241: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14290: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13244: \$? = $ac_status" >&5
++  echo "$as_me:14293: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13247: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14296: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13250: \$? = $ac_status" >&5
++  echo "$as_me:14299: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -13354,7 +14403,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13357 "configure"
++#line 14406 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13369,16 +14418,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13372: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14421: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13375: \$? = $ac_status" >&5
++  echo "$as_me:14424: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13378: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14427: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13381: \$? = $ac_status" >&5
++  echo "$as_me:14430: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -13393,12 +14442,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13396: result: $cf_cv_gnu_source" >&5
++echo "$as_me:14445: 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:13401: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:14450: 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
+@@ -13408,7 +14457,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13411 "configure"
++#line 14460 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13423,16 +14472,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13426: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14475: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13429: \$? = $ac_status" >&5
++  echo "$as_me:14478: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13432: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14481: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13435: \$? = $ac_status" >&5
++  echo "$as_me:14484: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -13443,7 +14492,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13446: result: $cf_cv_default_source" >&5
++echo "$as_me:14495: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -13483,16 +14532,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:14535: 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}:14541: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13495 "configure"
++#line 14544 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13507,16 +14556,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13510: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14559: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13513: \$? = $ac_status" >&5
++  echo "$as_me:14562: \$? = $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:14565: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13519: \$? = $ac_status" >&5
++  echo "$as_me:14568: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -13537,7 +14586,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13540 "configure"
++#line 14589 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13552,16 +14601,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13555: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14604: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13558: \$? = $ac_status" >&5
++  echo "$as_me:14607: \$? = $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:14610: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13564: \$? = $ac_status" >&5
++  echo "$as_me:14613: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13572,7 +14621,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}:14624: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -13580,10 +14629,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}:14632: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13586 "configure"
++#line 14635 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13598,16 +14647,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13601: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14650: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13604: \$? = $ac_status" >&5
++  echo "$as_me:14653: \$? = $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:14656: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13610: \$? = $ac_status" >&5
++  echo "$as_me:14659: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13623,7 +14672,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13626: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:14675: 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
+@@ -13740,7 +14789,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:13743: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:14792: 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
+@@ -13772,14 +14821,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:13775: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:14824: 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 13782 "configure"
++#line 14831 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13797,16 +14846,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13800: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14849: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13803: \$? = $ac_status" >&5
++  echo "$as_me:14852: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13806: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14855: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13809: \$? = $ac_status" >&5
++  echo "$as_me:14858: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -13818,7 +14867,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13821 "configure"
++#line 14870 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13836,16 +14885,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13839: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14888: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13842: \$? = $ac_status" >&5
++  echo "$as_me:14891: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13845: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14894: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13848: \$? = $ac_status" >&5
++  echo "$as_me:14897: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -13860,7 +14909,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13863: result: $cf_cv_xopen_source" >&5
++echo "$as_me:14912: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -14020,16 +15069,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:14023: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:15072: 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}:14029: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:15078: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14032 "configure"
++#line 15081 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14044,16 +15093,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14047: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15096: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14050: \$? = $ac_status" >&5
++  echo "$as_me:15099: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14053: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15102: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14056: \$? = $ac_status" >&5
++  echo "$as_me:15105: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -14074,7 +15123,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14077 "configure"
++#line 15126 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14089,16 +15138,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14092: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15141: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14095: \$? = $ac_status" >&5
++  echo "$as_me:15144: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14098: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15147: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14101: \$? = $ac_status" >&5
++  echo "$as_me:15150: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -14109,7 +15158,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:14112: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:15161: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -14117,10 +15166,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:14120: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:15169: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14123 "configure"
++#line 15172 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14135,16 +15184,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14138: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15187: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14141: \$? = $ac_status" >&5
++  echo "$as_me:15190: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14144: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15193: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14147: \$? = $ac_status" >&5
++  echo "$as_me:15196: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -14160,7 +15209,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14163: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:15212: 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
+@@ -14273,10 +15322,10 @@
+ 	if test "$cf_cv_xopen_source" = no ; then
+ 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+ 
+-echo "${as_me:-configure}:14276: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:15325: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14279 "configure"
++#line 15328 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14294,23 +15343,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14297: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15346: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14300: \$? = $ac_status" >&5
++  echo "$as_me:15349: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14303: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15352: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14306: \$? = $ac_status" >&5
++  echo "$as_me:15355: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-			{ echo "$as_me:14313: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++			{ echo "$as_me:15362: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ 			CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -14333,7 +15382,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}:14336: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15385: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -14345,7 +15394,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}:14348: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:15397: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -14433,7 +15482,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:14436: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:15485: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -14443,7 +15492,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:14446: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:15495: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -14453,7 +15502,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}:14456: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:15505: 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"
+@@ -14465,10 +15514,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:14468: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:15517: 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 14471 "configure"
++#line 15520 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14483,16 +15532,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14486: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15535: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14489: \$? = $ac_status" >&5
++  echo "$as_me:15538: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14492: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15541: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14495: \$? = $ac_status" >&5
++  echo "$as_me:15544: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -14501,12 +15550,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:14504: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:15553: 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 14509 "configure"
++#line 15558 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14521,16 +15570,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14524: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15573: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14527: \$? = $ac_status" >&5
++  echo "$as_me:15576: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14530: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15579: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14533: \$? = $ac_status" >&5
++  echo "$as_me:15582: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -14541,19 +15590,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:14544: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:15593: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:14549: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:15598: 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 14556 "configure"
++#line 15605 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14571,16 +15620,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14574: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15623: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14577: \$? = $ac_status" >&5
++  echo "$as_me:15626: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14580: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15629: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14583: \$? = $ac_status" >&5
++  echo "$as_me:15632: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -14592,7 +15641,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14595 "configure"
++#line 15644 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14610,16 +15659,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14613: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15662: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14616: \$? = $ac_status" >&5
++  echo "$as_me:15665: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14619: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15668: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14622: \$? = $ac_status" >&5
++  echo "$as_me:15671: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -14634,7 +15683,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14637: result: $cf_cv_xopen_source" >&5
++echo "$as_me:15686: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -14781,13 +15830,13 @@
+ fi
+ fi # cf_cv_posix_visible
+ 
+-echo "$as_me:14784: checking for ANSI C header files" >&5
++echo "$as_me:15833: 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 14790 "configure"
++#line 15839 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -14795,13 +15844,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:14798: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:15847: \"$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:14804: \$? = $ac_status" >&5
++  echo "$as_me:15853: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14823,7 +15872,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 14826 "configure"
++#line 15875 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -14841,7 +15890,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 14844 "configure"
++#line 15893 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -14862,7 +15911,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14865 "configure"
++#line 15914 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -14888,15 +15937,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:14891: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15940: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14894: \$? = $ac_status" >&5
++  echo "$as_me:15943: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:14896: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15945: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14899: \$? = $ac_status" >&5
++  echo "$as_me:15948: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -14909,7 +15958,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:14912: result: $ac_cv_header_stdc" >&5
++echo "$as_me:15961: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -14925,28 +15974,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:14928: checking for $ac_header" >&5
++echo "$as_me:15977: 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 14934 "configure"
++#line 15983 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14940: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15989: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14943: \$? = $ac_status" >&5
++  echo "$as_me:15992: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14946: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15995: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14949: \$? = $ac_status" >&5
++  echo "$as_me:15998: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -14956,7 +16005,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14959: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:16008: 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:16018: checking whether exit is declared" >&5
+ echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
+ if test "${ac_cv_have_decl_exit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14975 "configure"
++#line 16024 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14987,16 +16036,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14990: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16039: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14993: \$? = $ac_status" >&5
++  echo "$as_me:16042: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14996: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16045: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14999: \$? = $ac_status" >&5
++  echo "$as_me:16048: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_have_decl_exit=yes
+ else
+@@ -15006,7 +16055,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15009: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:16058: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+ 
+ # Check whether --enable-largefile or --disable-largefile was given.
+@@ -15016,7 +16065,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:15019: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:16068: 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
+@@ -15028,7 +16077,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 15031 "configure"
++#line 16080 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15048,16 +16097,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15051: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16100: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15054: \$? = $ac_status" >&5
++  echo "$as_me:16103: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15057: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16106: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15060: \$? = $ac_status" >&5
++  echo "$as_me:16109: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -15067,16 +16116,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15070: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16119: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15073: \$? = $ac_status" >&5
++  echo "$as_me:16122: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15076: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16125: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15079: \$? = $ac_status" >&5
++  echo "$as_me:16128: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -15090,13 +16139,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:15093: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:16142: 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:15099: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:16148: 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
+@@ -15104,7 +16153,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15107 "configure"
++#line 16156 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15124,16 +16173,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15127: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16176: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15130: \$? = $ac_status" >&5
++  echo "$as_me:16179: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15133: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16182: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15136: \$? = $ac_status" >&5
++  echo "$as_me:16185: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -15142,7 +16191,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15145 "configure"
++#line 16194 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -15163,16 +16212,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15166: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16215: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15169: \$? = $ac_status" >&5
++  echo "$as_me:16218: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15172: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16221: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15175: \$? = $ac_status" >&5
++  echo "$as_me:16224: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -15183,7 +16232,7 @@
+   break
+ done
+ fi
+-echo "$as_me:15186: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:16235: 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
+ 
+@@ -15193,7 +16242,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:15196: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:16245: 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
+@@ -15201,7 +16250,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15204 "configure"
++#line 16253 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15221,16 +16270,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15224: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16273: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15227: \$? = $ac_status" >&5
++  echo "$as_me:16276: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15230: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16279: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15233: \$? = $ac_status" >&5
++  echo "$as_me:16282: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -15239,7 +16288,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15242 "configure"
++#line 16291 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -15260,16 +16309,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15263: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16312: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15266: \$? = $ac_status" >&5
++  echo "$as_me:16315: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15269: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16318: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15272: \$? = $ac_status" >&5
++  echo "$as_me:16321: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -15280,7 +16329,7 @@
+   break
+ done
+ fi
+-echo "$as_me:15283: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:16332: 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
+ 
+@@ -15293,7 +16342,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:15296: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:16345: 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
+@@ -15301,7 +16350,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15304 "configure"
++#line 16353 "configure"
+ #include "confdefs.h"
+ #include 
+     #include 
+@@ -15316,16 +16365,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15319: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16368: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15322: \$? = $ac_status" >&5
++  echo "$as_me:16371: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15325: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16374: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15328: \$? = $ac_status" >&5
++  echo "$as_me:16377: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -15334,7 +16383,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15337 "configure"
++#line 16386 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -15350,16 +16399,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15353: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16402: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15356: \$? = $ac_status" >&5
++  echo "$as_me:16405: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15359: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16408: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15362: \$? = $ac_status" >&5
++  echo "$as_me:16411: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -15370,7 +16419,7 @@
+   break
+ done
+ fi
+-echo "$as_me:15373: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:16422: 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
+ 
+@@ -15384,13 +16433,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:15387: checking for fseeko" >&5
++echo "$as_me:16436: 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 15393 "configure"
++#line 16442 "configure"
+ #include "confdefs.h"
+ #include 
+                              #include 
+@@ -15404,16 +16453,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15407: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16456: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15410: \$? = $ac_status" >&5
++  echo "$as_me:16459: \$? = $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:16462: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15416: \$? = $ac_status" >&5
++  echo "$as_me:16465: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -15423,7 +16472,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15426: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:16475: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -15462,14 +16511,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:15465: checking whether to use struct dirent64" >&5
++	echo "$as_me:16514: 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 15472 "configure"
++#line 16521 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -15496,16 +16545,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15499: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16548: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15502: \$? = $ac_status" >&5
++  echo "$as_me:16551: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15505: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16554: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15508: \$? = $ac_status" >&5
++  echo "$as_me:16557: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -15516,7 +16565,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15519: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:16568: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -15526,7 +16575,7 @@
+ 	fi
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:15529: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:16578: 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.
+@@ -15536,7 +16585,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:15539: result: $with_rcs_ids" >&5
++echo "$as_me:16588: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "$with_rcs_ids" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -15546,7 +16595,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15549: checking if you want to build with function extensions" >&5
++echo "$as_me:16598: 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.
+@@ -15556,7 +16605,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:15559: result: $with_ext_funcs" >&5
++echo "$as_me:16608: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "$with_ext_funcs" = yes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -15574,7 +16623,7 @@
+ fi
+ 
+ ###   use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:15577: checking for extended use of const keyword" >&5
++echo "$as_me:16626: 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.
+@@ -15584,7 +16633,7 @@
+ else
+   with_ext_const=no
+ fi;
+-echo "$as_me:15587: result: $with_ext_const" >&5
++echo "$as_me:16636: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "$with_ext_const" = yes ; then
+@@ -15594,7 +16643,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:15597: checking if you want all development code" >&5
++echo "$as_me:16646: 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.
+@@ -15604,7 +16653,7 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:15607: result: $with_develop" >&5
++echo "$as_me:16656: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###############################################################################
+@@ -15613,7 +16662,7 @@
+ # This is still experimental (20080329), but should ultimately be moved to
+ # the script-block --with-normal, etc.
+ 
+-echo "$as_me:15616: checking if you want to link with the pthread library" >&5
++echo "$as_me:16665: 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.
+@@ -15623,27 +16672,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:15626: result: $with_pthread" >&5
++echo "$as_me:16675: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:15630: checking for pthread.h" >&5
++	echo "$as_me:16679: 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 15636 "configure"
++#line 16685 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:15640: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16689: \"$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:15646: \$? = $ac_status" >&5
++  echo "$as_me:16695: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15662,7 +16711,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:15665: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:16714: 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
+ 
+@@ -15672,7 +16721,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:15675: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:16724: 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"
+ 
+@@ -15693,7 +16742,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15696 "configure"
++#line 16745 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15710,16 +16759,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15713: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16762: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15716: \$? = $ac_status" >&5
++  echo "$as_me:16765: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15719: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16768: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15722: \$? = $ac_status" >&5
++  echo "$as_me:16771: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -15729,7 +16778,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:15732: result: $with_pthread" >&5
++	    echo "$as_me:16781: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -15757,7 +16806,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:15760: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:16809: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -15766,7 +16815,7 @@
+ 
+ fi
+ 
+-echo "$as_me:15769: checking if you want to use weak-symbols for pthreads" >&5
++echo "$as_me:16818: 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.
+@@ -15776,18 +16825,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-echo "$as_me:15779: result: $use_weak_symbols" >&5
++echo "$as_me:16828: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ if test "$use_weak_symbols" = yes ; then
+ 
+-echo "$as_me:15783: checking if $CC supports weak symbols" >&5
++echo "$as_me:16832: 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 15790 "configure"
++#line 16839 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15813,16 +16862,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15816: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16865: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15819: \$? = $ac_status" >&5
++  echo "$as_me:16868: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15822: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16871: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15825: \$? = $ac_status" >&5
++  echo "$as_me:16874: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -15833,7 +16882,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15836: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:16885: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ else
+@@ -15862,13 +16911,13 @@
+ fi
+ 
+ # OpenSUSE is installing ncurses6, using reentrant option.
+-echo "$as_me:15865: checking for _nc_TABSIZE" >&5
++echo "$as_me:16914: 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 15871 "configure"
++#line 16920 "configure"
+ #include "confdefs.h"
+ #define _nc_TABSIZE autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15899,16 +16948,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15902: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16951: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15905: \$? = $ac_status" >&5
++  echo "$as_me:16954: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15908: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16957: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15911: \$? = $ac_status" >&5
++  echo "$as_me:16960: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func__nc_TABSIZE=yes
+ else
+@@ -15918,7 +16967,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15921: result: $ac_cv_func__nc_TABSIZE" >&5
++echo "$as_me:16970: 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
+@@ -15930,7 +16979,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:15933: checking if you want experimental reentrant code" >&5
++echo "$as_me:16982: 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.
+@@ -15940,7 +16989,7 @@
+ else
+   with_reentrant=$assume_reentrant
+ fi;
+-echo "$as_me:15943: result: $with_reentrant" >&5
++echo "$as_me:16992: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "$with_reentrant" = yes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -15963,7 +17012,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:15966: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:17015: 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.
+@@ -15973,7 +17022,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:15976: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:17025: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -15987,7 +17036,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:15990: checking if you want to see long compiling messages" >&5
++echo "$as_me:17039: 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.
+@@ -16021,10 +17070,10 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:16024: result: $enableval" >&5
++echo "$as_me:17073: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+-echo "$as_me:16027: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:17076: 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.
+@@ -16041,17 +17090,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:16044: result: $enable_stdnoreturn" >&5
++echo "$as_me:17093: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:16048: checking for C11 _Noreturn feature" >&5
++echo "$as_me:17097: 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 16054 "configure"
++#line 17103 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -16067,16 +17116,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16070: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17119: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16073: \$? = $ac_status" >&5
++  echo "$as_me:17122: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16076: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17125: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16079: \$? = $ac_status" >&5
++  echo "$as_me:17128: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -16087,7 +17136,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16090: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:17139: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -16143,16 +17192,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16146: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17195: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16151: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17200: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16155: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17204: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -16191,16 +17240,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16194: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17243: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16199: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17248: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16203: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17252: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -16239,23 +17288,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16242: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17291: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16247: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17296: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16251: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17300: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:16258: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:17307: 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.
+@@ -16272,7 +17321,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:16275: result: $enable_warnings" >&5
++echo "$as_me:17324: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -16296,7 +17345,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16299 "configure"
++#line 17348 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -16311,26 +17360,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16314: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17363: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16317: \$? = $ac_status" >&5
++  echo "$as_me:17366: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16320: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17369: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16323: \$? = $ac_status" >&5
++  echo "$as_me:17372: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:16326: checking for X11/Xt const-feature" >&5
++echo "$as_me:17375: 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 16333 "configure"
++#line 17382 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -16348,16 +17397,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16351: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17400: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16354: \$? = $ac_status" >&5
++  echo "$as_me:17403: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16357: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17406: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16360: \$? = $ac_status" >&5
++  echo "$as_me:17409: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -16372,7 +17421,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16375: result: $cf_cv_const_x_string" >&5
++echo "$as_me:17424: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -16401,7 +17450,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:17469: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -16433,12 +17482,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:16436: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17485: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16439: \$? = $ac_status" >&5
++  echo "$as_me:17488: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:16441: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17490: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -16446,7 +17495,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:16449: checking for $CC warning options..." >&5
++	{ echo "$as_me:17498: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -16469,12 +17518,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:16472: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17521: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16475: \$? = $ac_status" >&5
++  echo "$as_me:17524: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:16477: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17526: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -16482,7 +17531,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:16485: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17534: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -16492,7 +17541,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:16495: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17544: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -16525,10 +17574,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:16528: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:17577: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -16578,12 +17627,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:16581: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17630: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16584: \$? = $ac_status" >&5
++  echo "$as_me:17633: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:16586: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:17635: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -16651,7 +17700,7 @@
+ fi
+ 
+ ###	use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:16654: checking if you want to enable runtime assertions" >&5
++echo "$as_me:17703: 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.
+@@ -16661,7 +17710,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:16664: result: $with_assertions" >&5
++echo "$as_me:17713: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -16714,7 +17763,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16717: checking whether to add trace feature to all models" >&5
++echo "$as_me:17766: 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.
+@@ -16724,7 +17773,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:16727: result: $cf_with_trace" >&5
++echo "$as_me:17776: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "$cf_with_trace" = yes ; then
+@@ -16738,7 +17787,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:16741: checking if we want to use GNAT projects" >&5
++echo "$as_me:17790: 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.
+@@ -16755,21 +17804,21 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:16758: result: $enable_gnat_projects" >&5
++echo "$as_me:17807: 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:16765: checking if ssp library is needed" >&5
++echo "$as_me:17814: 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 16772 "configure"
++#line 17821 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16786,16 +17835,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16789: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17838: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16792: \$? = $ac_status" >&5
++  echo "$as_me:17841: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16795: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17844: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16798: \$? = $ac_status" >&5
++  echo "$as_me:17847: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -16805,7 +17854,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16808 "configure"
++#line 17857 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16822,16 +17871,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16825: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17874: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16828: \$? = $ac_status" >&5
++  echo "$as_me:17877: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16831: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17880: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16834: \$? = $ac_status" >&5
++  echo "$as_me:17883: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -16845,7 +17894,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16848: result: $cf_cv_need_libssp" >&5
++echo "$as_me:17897: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -16873,13 +17922,13 @@
+ (*)
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:16876: checking for clock_gettime" >&5
++echo "$as_me:17925: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16882 "configure"
++#line 17931 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16910,16 +17959,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16913: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17962: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16916: \$? = $ac_status" >&5
++  echo "$as_me:17965: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16919: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17968: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16922: \$? = $ac_status" >&5
++  echo "$as_me:17971: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -16929,12 +17978,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16932: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:17981: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:16937: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:17986: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16942,7 +17991,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16945 "configure"
++#line 17994 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16961,16 +18010,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16964: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18013: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16967: \$? = $ac_status" >&5
++  echo "$as_me:18016: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16970: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18019: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16973: \$? = $ac_status" >&5
++  echo "$as_me:18022: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -16981,7 +18030,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16984: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:18033: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -16993,14 +18042,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:16996: checking if clock_gettime links" >&5
++echo "$as_me:18045: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17003 "configure"
++#line 18052 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17018,16 +18067,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17021: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18070: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17024: \$? = $ac_status" >&5
++  echo "$as_me:18073: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17027: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18076: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17030: \$? = $ac_status" >&5
++  echo "$as_me:18079: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -17038,7 +18087,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17041: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:18090: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -17052,13 +18101,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:17055: checking for gettimeofday" >&5
++echo "$as_me:18104: 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 17061 "configure"
++#line 18110 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17089,16 +18138,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17092: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18141: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17095: \$? = $ac_status" >&5
++  echo "$as_me:18144: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17098: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18147: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17101: \$? = $ac_status" >&5
++  echo "$as_me:18150: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -17108,7 +18157,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17111: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:18160: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -17118,7 +18167,7 @@
+ 
+ else
+ 
+-echo "$as_me:17121: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:18170: 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
+@@ -17126,7 +18175,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17129 "configure"
++#line 18178 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17145,16 +18194,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17148: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18197: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17151: \$? = $ac_status" >&5
++  echo "$as_me:18200: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17154: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18203: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17157: \$? = $ac_status" >&5
++  echo "$as_me:18206: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -17165,7 +18214,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17168: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:18217: 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
+ 
+@@ -17198,13 +18247,13 @@
+ esac
+ 
+ ###	Checks for header files.
+-echo "$as_me:17201: checking for signed char" >&5
++echo "$as_me:18250: 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 17207 "configure"
++#line 18256 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17219,16 +18268,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17222: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18271: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17225: \$? = $ac_status" >&5
++  echo "$as_me:18274: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17228: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18277: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17231: \$? = $ac_status" >&5
++  echo "$as_me:18280: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -17238,10 +18287,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17241: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:18290: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:17244: checking size of signed char" >&5
++echo "$as_me:18293: 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
+@@ -17250,7 +18299,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17253 "configure"
++#line 18302 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17262,21 +18311,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17265: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18314: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17268: \$? = $ac_status" >&5
++  echo "$as_me:18317: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17271: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18320: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17274: \$? = $ac_status" >&5
++  echo "$as_me:18323: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17279 "configure"
++#line 18328 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17288,16 +18337,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17291: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18340: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17294: \$? = $ac_status" >&5
++  echo "$as_me:18343: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17297: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18346: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17300: \$? = $ac_status" >&5
++  echo "$as_me:18349: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -17313,7 +18362,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17316 "configure"
++#line 18365 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17325,16 +18374,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17328: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18377: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17331: \$? = $ac_status" >&5
++  echo "$as_me:18380: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17334: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18383: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17337: \$? = $ac_status" >&5
++  echo "$as_me:18386: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -17350,7 +18399,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 17353 "configure"
++#line 18402 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17362,16 +18411,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17365: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18414: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17368: \$? = $ac_status" >&5
++  echo "$as_me:18417: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17371: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18420: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17374: \$? = $ac_status" >&5
++  echo "$as_me:18423: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -17384,12 +18433,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:17387: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:18436: 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 17392 "configure"
++#line 18441 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -17405,15 +18454,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17408: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18457: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17411: \$? = $ac_status" >&5
++  echo "$as_me:18460: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17413: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18462: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17416: \$? = $ac_status" >&5
++  echo "$as_me:18465: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -17429,7 +18478,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:17432: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:18481: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:18490: 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 17447 "configure"
++#line 18496 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -17459,16 +18508,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17462: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18511: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17465: \$? = $ac_status" >&5
++  echo "$as_me:18514: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17468: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18517: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17471: \$? = $ac_status" >&5
++  echo "$as_me:18520: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -17478,7 +18527,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17481: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18530: 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:18543: 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
+@@ -17499,7 +18548,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17502 "configure"
++#line 18551 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17518,16 +18567,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17521: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18570: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17524: \$? = $ac_status" >&5
++  echo "$as_me:18573: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17527: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18576: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17530: \$? = $ac_status" >&5
++  echo "$as_me:18579: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -17538,14 +18587,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17541: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:18590: 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:17548: checking for opendir in -lx" >&5
++  echo "$as_me:18597: 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
+@@ -17553,7 +18602,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17556 "configure"
++#line 18605 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17572,16 +18621,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17575: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18624: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17578: \$? = $ac_status" >&5
++  echo "$as_me:18627: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17581: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18630: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17584: \$? = $ac_status" >&5
++  echo "$as_me:18633: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -17592,7 +18641,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17595: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:18644: 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"
+@@ -17600,13 +18649,13 @@
+ 
+ fi
+ 
+-echo "$as_me:17603: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:18652: 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 17609 "configure"
++#line 18658 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -17622,16 +18671,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17625: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18674: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17628: \$? = $ac_status" >&5
++  echo "$as_me:18677: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17631: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18680: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17634: \$? = $ac_status" >&5
++  echo "$as_me:18683: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -17641,7 +18690,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17644: result: $ac_cv_header_time" >&5
++echo "$as_me:18693: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -17659,13 +18708,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:17662: checking for an ANSI C-conforming const" >&5
++echo "$as_me:18711: 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 17668 "configure"
++#line 18717 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17727,16 +18776,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17730: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18779: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17733: \$? = $ac_status" >&5
++  echo "$as_me:18782: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17736: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18785: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17739: \$? = $ac_status" >&5
++  echo "$as_me:18788: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -17746,7 +18795,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17749: result: $ac_cv_c_const" >&5
++echo "$as_me:18798: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -17758,7 +18807,7 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:17761: checking if data-only library module links" >&5
++echo "$as_me:18810: 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
+@@ -17766,20 +18815,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:18821: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17775: \$? = $ac_status" >&5
++  echo "$as_me:18824: \$? = $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:18848: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17802: \$? = $ac_status" >&5
++  echo "$as_me:18851: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -17812,7 +18861,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17815 "configure"
++#line 18864 "configure"
+ #include "confdefs.h"
+ 
+ 	extern int testfunc(void);
+@@ -17823,15 +18872,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17826: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18875: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17829: \$? = $ac_status" >&5
++  echo "$as_me:18878: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17831: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18880: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17834: \$? = $ac_status" >&5
++  echo "$as_me:18883: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -17846,7 +18895,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17849: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:18898: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -17865,23 +18914,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17868: checking for $ac_header" >&5
++echo "$as_me:18917: 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 17874 "configure"
++#line 18923 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17878: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18927: \"$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:17884: \$? = $ac_status" >&5
++  echo "$as_me:18933: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17900,7 +18949,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17903: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18952: 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:18962: 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
+@@ -17921,7 +18970,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17924 "configure"
++#line 18973 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17956,15 +19005,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17959: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19008: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17962: \$? = $ac_status" >&5
++  echo "$as_me:19011: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17964: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19013: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17967: \$? = $ac_status" >&5
++  echo "$as_me:19016: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -17979,16 +19028,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:17982: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:19031: 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:17985: checking for mkstemp" >&5
++	echo "$as_me:19034: 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 17991 "configure"
++#line 19040 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18019,16 +19068,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18022: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19071: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18025: \$? = $ac_status" >&5
++  echo "$as_me:19074: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18028: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19077: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18031: \$? = $ac_status" >&5
++  echo "$as_me:19080: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -18038,7 +19087,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18041: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:19090: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -18059,7 +19108,7 @@
+ if test "$cf_with_ada" != "no" ; then
+ 	if test	"$cf_cv_prog_gnat_correct" = yes; then
+ 
+-	echo "$as_me:18062: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:19111: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -18076,10 +19125,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:18079: result: $ADAFLAGS" >&5
++	echo "$as_me:19128: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:18082: checking if GNATPREP supports -T option" >&5
++echo "$as_me:19131: 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
+@@ -18089,11 +19138,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:18092: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:19141: 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:18096: checking if GNAT supports generics" >&5
++echo "$as_me:19145: 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])
+@@ -18103,7 +19152,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:18106: result: $cf_gnat_generics" >&5
++echo "$as_me:19155: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -18115,7 +19164,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:18118: checking if GNAT supports SIGINT" >&5
++echo "$as_me:19167: 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
+@@ -18163,7 +19212,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:18166: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:19215: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -18176,7 +19225,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:18179: checking if GNAT supports project files" >&5
++echo "$as_me:19228: 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]*)
+@@ -18239,15 +19288,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:18242: result: $cf_gnat_projects" >&5
++echo "$as_me:19291: 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:18248: checking if GNAT supports libraries" >&5
++	echo "$as_me:19297: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:18250: result: $cf_gnat_libraries" >&5
++	echo "$as_me:19299: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -18267,7 +19316,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:18270: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:19319: 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
+@@ -18279,7 +19328,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:18282: checking for Ada95 compiler" >&5
++echo "$as_me:19331: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -18290,12 +19339,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:18293: result: $cf_ada_compiler" >&5
++echo "$as_me:19342: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 		cf_ada_package=terminal_interface
+ 
+-echo "$as_me:18298: checking for Ada95 include directory" >&5
++echo "$as_me:19347: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -18329,7 +19378,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:18332: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:19381: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -18338,10 +19387,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:18341: result: $ADA_INCLUDE" >&5
++echo "$as_me:19390: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:18344: checking for Ada95 object directory" >&5
++echo "$as_me:19393: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -18375,7 +19424,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:18378: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:19427: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -18384,10 +19433,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:18387: result: $ADA_OBJECTS" >&5
++echo "$as_me:19436: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:18390: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:19439: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -18408,11 +19457,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:18411: result: $with_ada_sharedlib" >&5
++echo "$as_me:19460: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+-	{ echo "$as_me:18415: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++	{ echo "$as_me:19464: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+ 
+@@ -18430,7 +19479,7 @@
+ 
+ 		# allow the Ada binding to be renamed
+ 
+-echo "$as_me:18433: checking for Ada95 curses library name" >&5
++echo "$as_me:19482: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -18446,16 +19495,16 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18449: result: $ADA_LIBNAME" >&5
++echo "$as_me:19498: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 	else
+-		{ { echo "$as_me:18453: error: No usable Ada compiler found" >&5
++		{ { echo "$as_me:19502: 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:18458: error: The Ada compiler is needed for this package" >&5
++	{ { echo "$as_me:19507: 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
+@@ -18495,7 +19544,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:18498: checking default library suffix" >&5
++echo "$as_me:19547: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -18506,10 +19555,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:18509: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:19558: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:18512: checking default library-dependency suffix" >&5
++echo "$as_me:19561: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -18592,10 +19641,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:18595: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:19644: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:18598: checking default object directory" >&5
++echo "$as_me:19647: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -18611,7 +19660,7 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:18614: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:19663: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ ### Set up low-level terminfo dependencies for makefiles.
+@@ -18753,7 +19802,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:18756: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:19805: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -18934,7 +19983,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:18937: error: ambiguous option: $1
++    { { echo "$as_me:19986: 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;}
+@@ -18953,7 +20002,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:18956: error: unrecognized option: $1
++  -*) { { echo "$as_me:20005: 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;}
+@@ -19028,7 +20077,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:19031: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:20080: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -19184,6 +20233,7 @@
+ s,@BUILD_OBJEXT@,$BUILD_OBJEXT,;t t
+ s,@DFT_LWR_MODEL@,$DFT_LWR_MODEL,;t t
+ s,@DFT_UPR_MODEL@,$DFT_UPR_MODEL,;t t
++s,@REQUIRE_PKG@,$REQUIRE_PKG,;t t
+ s,@NCURSES_CONFIG@,$NCURSES_CONFIG,;t t
+ s,@ac_ct_NCURSES_CONFIG@,$ac_ct_NCURSES_CONFIG,;t t
+ s,@cf_cv_screen@,$cf_cv_screen,;t t
+@@ -19395,7 +20445,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:19398: creating $ac_file" >&5
++    { echo "$as_me:20448: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -19413,7 +20463,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:19416: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:20466: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -19426,7 +20476,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:19429: error: cannot find input file: $f" >&5
++           { { echo "$as_me:20479: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -19442,7 +20492,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:19445: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:20495: 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;}
+@@ -19451,7 +20501,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:19454: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:20504: 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;}
+@@ -19496,7 +20546,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:19499: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:20549: 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;}
+@@ -19507,7 +20557,7 @@
+     $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:19510: WARNING: Some variables may not be substituted:
++      { echo "$as_me:20560: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -19556,7 +20606,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:19559: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:20609: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -19567,7 +20617,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:19570: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:20620: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -19580,7 +20630,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:19583: error: cannot find input file: $f" >&5
++           { { echo "$as_me:20633: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -19638,7 +20688,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:19641: $ac_file is unchanged" >&5
++      { echo "$as_me:20691: $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.4229 
+--- ncurses-6.5-20250111+/NEWS	2025-01-11 21:55:20.000000000 +0000
++++ ncurses-6.5-20250118/NEWS	2025-01-19 01:24:13.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4229 2025/01/11 21:55:20 tom Exp $
++-- $Id: NEWS,v 1.4233 2025/01/19 01:24:13 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,18 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20250118
++	+ improve pattern used for configure --with-xterm-kbs option (report by
++	  Mingyu Wang)
++	+ update configure macros, from work on cdk and dialog.
++	+ change a parameter name in curs_sp_funcs.3x, for consistency (patch
++	  by "WHR").
++	> patches by Branden Robinson:
++	+ improve formatting/style of manpages
++	+ change winwstr() to a generated function, using the macro definition,
++	  moving its handling of negative length parameter into winnwstr().
++	+ correct actual-function name in a few trace calls.
++
+ 20250111
+ 	+ add check for infinite loop in tic's use-resolution.
+ 	+ increase limit on use-clauses from 32 to 40, warn but allow entries
+Index: VERSION
+--- ncurses-6.5-20250111+/VERSION	2025-01-11 12:30:15.000000000 +0000
++++ ncurses-6.5-20250118/VERSION	2025-01-18 11:23:10.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250111
++5:0:10	6.5	20250118
+Index: aclocal.m4
+Prereq:  1.1099 
+--- ncurses-6.5-20250111+/aclocal.m4	2024-12-28 21:40:09.000000000 +0000
++++ ncurses-6.5-20250118/aclocal.m4	2025-01-15 22:07:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ dnl***************************************************************************
+-dnl Copyright 2018-2023,2024 Thomas E. Dickey                                *
++dnl Copyright 2018-2024,2025 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.1099 2024/12/28 21:40:09 tom Exp $
++dnl $Id: aclocal.m4,v 1.1100 2025/01/15 22:07:11 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -7372,6 +7372,30 @@
+ $1=`echo "$2" | sed -e 's/-l$3[[ 	]]//g' -e 's/-l$3[$]//'`
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_REQUIRE_PKG version: 1 updated: 2025/01/10 19:55:54
++dnl --------------
++dnl Update $REQUIRE_PKG, which lists the known required packages for this
++dnl program.
++dnl
++dnl $1 = package(s) to require, e.g., in the generated ".pc" file
++define([CF_REQUIRE_PKG],
++[
++for cf_required in $1
++do
++	# check for duplicates
++	for cf_require_pkg in $REQUIRE_PKG
++	do
++		if test "$cf_required" = "$cf_require_pkg"
++		then
++			cf_required=
++			break
++		fi
++	done
++	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
++done
++AC_SUBST(REQUIRE_PKG)
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_RESTORE_XTRA_FLAGS version: 1 updated: 2020/01/11 16:47:45
+ dnl ---------------------
+ dnl Restore flags saved in CF_SAVE_XTRA_FLAGS
+@@ -8622,7 +8646,7 @@
+ AC_SUBST(top_builddir)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_TRY_PKG_CONFIG version: 6 updated: 2020/12/31 10:54:15
++dnl CF_TRY_PKG_CONFIG version: 7 updated: 2025/01/10 19:55:54
+ dnl -----------------
+ dnl This is a simple wrapper to use for pkg-config, for libraries which may be
+ dnl available in that form.
+@@ -8639,6 +8663,7 @@
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$1" 2>/dev/null`"
+ 	CF_VERBOSE(package $1 CFLAGS: $cf_pkgconfig_incs)
+ 	CF_VERBOSE(package $1 LIBS: $cf_pkgconfig_libs)
++	CF_REQUIRE_PKG($1)
+ 	CF_ADD_CFLAGS($cf_pkgconfig_incs)
+ 	CF_ADD_LIBS($cf_pkgconfig_libs)
+ 	ifelse([$2],,:,[$2])
+@@ -8890,7 +8915,7 @@
+ CF_MSG_LOG([$1])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_VERSION_INFO version: 9 updated: 2024/06/12 04:04:13
++dnl CF_VERSION_INFO version: 10 updated: 2025/01/10 19:55:54
+ dnl ---------------
+ dnl Define several useful symbols derived from the VERSION file.  A separate
+ dnl file is preferred to embedding the version numbers in various scripts.
+@@ -8968,8 +8993,10 @@
+ dnl if a package name is given, define its corresponding version info.  We
+ dnl need the package name to ensure that the defined symbols are unique.
+ ifelse($1,,,[
++	PROGRAM=$1
+ 	PACKAGE=ifelse($2,,$1,$2)
+ 	AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE",[Define to the package-name])
++	AC_SUBST(PROGRAM)
+ 	AC_SUBST(PACKAGE)
+ 	AH_TEMPLATE([AS_TR_CPP($1[_VERSION])],[version of package])
+ 	AC_DEFINE_UNQUOTED(AS_TR_CPP($1[_VERSION]),"${VERSION_MAJOR}.${VERSION_MINOR}")
+@@ -10016,7 +10043,7 @@
+ 	[USE_VALGRIND])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_WITH_VERSIONED_SYMS version: 14 updated: 2024/08/03 12:34:02
++dnl CF_WITH_VERSIONED_SYMS version: 15 updated: 2025/01/15 17:07:11
+ dnl ----------------------
+ dnl Use this when building shared library with ELF, to markup symbols with the
+ dnl version identifier from the given input file.  Generally that identifier is
+@@ -10028,6 +10055,9 @@
+ AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_REQUIRE([CF_GLOB_FULLPATH])dnl
+ 
++if test "$with_libtool" = "yes" ; then
++	:
++elif test "$with_shared" = "yes" ; then
+ AC_MSG_CHECKING(if versioned-symbols file should be used)
+ AC_ARG_WITH(versioned-syms,
+ 	[[  --with-versioned-syms[=MAP-FILE] version ELF shared library symbols per MAP-FILE]],
+@@ -10151,6 +10181,8 @@
+ 		rm -f conftest.*
+ 	fi
+ fi
++
++fi
+ AC_SUBST(RESULTING_SYMS)
+ AC_SUBST(VERSIONED_SYMS)
+ AC_SUBST(WILDCARD_SYMS)
+Index: configure
+--- ncurses-6.5-20250111+/configure	2024-12-29 01:01:41.000000000 +0000
++++ ncurses-6.5-20250118/configure	2025-01-18 11:26:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.789 .
++# From configure.in Revision: 1.790 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20240618.
+ #
+@@ -1368,6 +1368,7 @@
+ 
+ echo "${as_me:-configure}:1369: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
+ 
++	PROGRAM=NCURSES
+ 	PACKAGE=ncurses
+ 
+ cat >>confdefs.h <&5
++  { echo "$as_me:1391: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
+ echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;}
+  cf_cv_rel_version=$withval
+ fi;
+@@ -1401,13 +1402,13 @@
+   (0)
+  	;;
+   (*)
+-	{ { echo "$as_me:1404: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
++	{ { echo "$as_me:1405: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
+ echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;}
+    { (exit 1); exit 1; }; }
+  	;;
+   esac
+ else
+-  { { echo "$as_me:1410: error: Release major-version value is empty" >&5
++  { { echo "$as_me:1411: error: Release major-version value is empty" >&5
+ echo "$as_me: error: Release major-version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1417,13 +1418,13 @@
+   (0)
+  	;;
+   (*)
+-	{ { echo "$as_me:1420: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
++	{ { echo "$as_me:1421: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
+ echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;}
+    { (exit 1); exit 1; }; }
+  	;;
+   esac
+ else
+-  { { echo "$as_me:1426: error: Release minor-version value is empty" >&5
++  { { echo "$as_me:1427: error: Release minor-version value is empty" >&5
+ echo "$as_me: error: Release minor-version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1436,7 +1437,7 @@
+ 
+ 	if test "x$cf_cv_abi_version" != "x$withval"
+ 	then
+-		{ echo "$as_me:1439: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
++		{ echo "$as_me:1440: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
+ echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
+ 		case "$cf_cv_rel_version" in
+ 		(5.*)
+@@ -1455,13 +1456,13 @@
+   (0)
+  	;;
+   (*)
+-	{ { echo "$as_me:1458: error: ABI version is not a number: $cf_cv_abi_version" >&5
++	{ { echo "$as_me:1459: error: ABI version is not a number: $cf_cv_abi_version" >&5
+ echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;}
+    { (exit 1); exit 1; }; }
+  	;;
+   esac
+ else
+-  { { echo "$as_me:1464: error: ABI version value is empty" >&5
++  { { echo "$as_me:1465: error: ABI version value is empty" >&5
+ echo "$as_me: error: ABI version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1494,7 +1495,7 @@
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:1497: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++  { { echo "$as_me:1498: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+ echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1504,11 +1505,11 @@
+ 
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+-  { { echo "$as_me:1507: error: cannot run $ac_config_sub" >&5
++  { { echo "$as_me:1508: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:1511: checking build system type" >&5
++echo "$as_me:1512: checking build system type" >&5
+ echo $ECHO_N "checking build system type... $ECHO_C" >&6
+ if test "${ac_cv_build+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1517,23 +1518,23 @@
+ test -z "$ac_cv_build_alias" &&
+   ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+-  { { echo "$as_me:1520: error: cannot guess build type; you must specify one" >&5
++  { { echo "$as_me:1521: error: cannot guess build type; you must specify one" >&5
+ echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+    { (exit 1); exit 1; }; }
+ ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` ||
+-  { { echo "$as_me:1524: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++  { { echo "$as_me:1525: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1529: result: $ac_cv_build" >&5
++echo "$as_me:1530: result: $ac_cv_build" >&5
+ echo "${ECHO_T}$ac_cv_build" >&6
+ build=$ac_cv_build
+ build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+-echo "$as_me:1536: checking host system type" >&5
++echo "$as_me:1537: checking host system type" >&5
+ echo $ECHO_N "checking host system type... $ECHO_C" >&6
+ if test "${ac_cv_host+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1542,12 +1543,12 @@
+ test -z "$ac_cv_host_alias" &&
+   ac_cv_host_alias=$ac_cv_build_alias
+ ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` ||
+-  { { echo "$as_me:1545: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++  { { echo "$as_me:1546: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1550: result: $ac_cv_host" >&5
++echo "$as_me:1551: result: $ac_cv_host" >&5
+ echo "${ECHO_T}$ac_cv_host" >&6
+ host=$ac_cv_host
+ host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1555,7 +1556,7 @@
+ host_os=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+ if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
+-	echo "$as_me:1558: checking target system type" >&5
++	echo "$as_me:1559: checking target system type" >&5
+ echo $ECHO_N "checking target system type... $ECHO_C" >&6
+ if test "${ac_cv_target+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1564,12 +1565,12 @@
+ test "x$ac_cv_target_alias" = "x" &&
+   ac_cv_target_alias=$ac_cv_host_alias
+ ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` ||
+-  { { echo "$as_me:1567: error: $ac_config_sub $ac_cv_target_alias failed" >&5
++  { { echo "$as_me:1568: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1572: result: $ac_cv_target" >&5
++echo "$as_me:1573: result: $ac_cv_target" >&5
+ echo "${ECHO_T}$ac_cv_target" >&6
+ target=$ac_cv_target
+ target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1601,13 +1602,13 @@
+ fi
+ 
+ test -z "$system_name" && system_name="$cf_cv_system_name"
+-test -n "$cf_cv_system_name" && echo "$as_me:1604: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1605: result: Configuring for $cf_cv_system_name" >&5
+ echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
+ 
+ if test ".$system_name" != ".$cf_cv_system_name" ; then
+-	echo "$as_me:1608: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++	echo "$as_me:1609: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+ echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
+-	{ { echo "$as_me:1610: error: \"Please remove config.cache and try again.\"" >&5
++	{ { echo "$as_me:1611: error: \"Please remove config.cache and try again.\"" >&5
+ echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1615,7 +1616,7 @@
+ # Check whether --with-system-type or --without-system-type was given.
+ if test "${with_system_type+set}" = set; then
+   withval="$with_system_type"
+-  { echo "$as_me:1618: WARNING: overriding system type to $withval" >&5
++  { echo "$as_me:1619: WARNING: overriding system type to $withval" >&5
+ echo "$as_me: WARNING: overriding system type to $withval" >&2;}
+ 	cf_cv_system_name=$withval
+ 	host_os=$withval
+@@ -1626,7 +1627,7 @@
+ cf_user_CFLAGS="$CFLAGS"
+ 
+ ###	Default install-location
+-echo "$as_me:1629: checking for fgrep" >&5
++echo "$as_me:1630: checking for fgrep" >&5
+ echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
+ if test "${ac_cv_path_FGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1638,7 +1639,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:1641: checking for $ac_word" >&5
++echo "$as_me:1642: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_FGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1655,7 +1656,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_FGREP="$ac_dir/$ac_word"
+-   echo "$as_me:1658: found $ac_dir/$ac_word" >&5
++   echo "$as_me:1659: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -1666,10 +1667,10 @@
+ FGREP=$ac_cv_path_FGREP
+ 
+ if test -n "$FGREP"; then
+-  echo "$as_me:1669: result: $FGREP" >&5
++  echo "$as_me:1670: result: $FGREP" >&5
+ echo "${ECHO_T}$FGREP" >&6
+ else
+-  echo "$as_me:1672: result: no" >&5
++  echo "$as_me:1673: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1677,16 +1678,16 @@
+ done
+ test -n "$FGREP" || FGREP=": "
+ 
+-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1680: error: cannot find workable fgrep" >&5
++     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1681: error: cannot find workable fgrep" >&5
+ echo "$as_me: error: cannot find workable fgrep" >&2;}
+    { (exit 1); exit 1; }; }
+    fi
+ fi
+-echo "$as_me:1685: result: $ac_cv_path_FGREP" >&5
++echo "$as_me:1686: result: $ac_cv_path_FGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_FGREP" >&6
+  FGREP="$ac_cv_path_FGREP"
+ 
+-echo "$as_me:1689: checking for prefix" >&5
++echo "$as_me:1690: checking for prefix" >&5
+ echo $ECHO_N "checking for prefix... $ECHO_C" >&6
+ if test "x$prefix" = "xNONE" ; then
+ 	case "$cf_cv_system_name" in
+@@ -1698,11 +1699,11 @@
+ 		;;
+ 	esac
+ fi
+-echo "$as_me:1701: result: $prefix" >&5
++echo "$as_me:1702: result: $prefix" >&5
+ echo "${ECHO_T}$prefix" >&6
+ 
+ if test "x$prefix" = "xNONE" ; then
+-echo "$as_me:1705: checking for default include-directory" >&5
++echo "$as_me:1706: checking for default include-directory" >&5
+ echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
+ test -n "$verbose" && echo 1>&6
+ for cf_symbol in \
+@@ -1725,7 +1726,7 @@
+ 	fi
+ 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
+ done
+-echo "$as_me:1728: result: $includedir" >&5
++echo "$as_me:1729: result: $includedir" >&5
+ echo "${ECHO_T}$includedir" >&6
+ fi
+ 
+@@ -1790,20 +1791,20 @@
+   (0)
+  	;;
+   (*)
+-	{ { echo "$as_me:1793: error: ABI altered is not a number: $withval" >&5
++	{ { echo "$as_me:1794: error: ABI altered is not a number: $withval" >&5
+ echo "$as_me: error: ABI altered is not a number: $withval" >&2;}
+    { (exit 1); exit 1; }; }
+  	;;
+   esac
+ else
+-  { { echo "$as_me:1799: error: ABI altered value is empty" >&5
++  { { echo "$as_me:1800: error: ABI altered value is empty" >&5
+ echo "$as_me: error: ABI altered value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ 	if test "$cf_cv_abi_version" != "$withval"
+ 	then
+-		{ echo "$as_me:1806: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
++		{ echo "$as_me:1807: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
+ echo "$as_me: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&2;}
+ 		cf_cv_abi_version=$withval
+ 	fi
+@@ -1833,7 +1834,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:1836: checking for $ac_word" >&5
++echo "$as_me:1837: 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
+@@ -1850,7 +1851,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:1853: found $ac_dir/$ac_word" >&5
++   echo "$as_me:1854: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -1862,10 +1863,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+ 
+ if test -n "$cf_TEMP_gnat"; then
+-  echo "$as_me:1865: result: $cf_TEMP_gnat" >&5
++  echo "$as_me:1866: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+-  echo "$as_me:1868: result: no" >&5
++  echo "$as_me:1869: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1875,7 +1876,7 @@
+ 		unset cf_cv_gnat_version
+ 		unset cf_TEMP_gnat
+ 
+-echo "$as_me:1878: checking for $cf_prog_gnat version" >&5
++echo "$as_me:1879: 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
+@@ -1886,7 +1887,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:1889: result: $cf_cv_gnat_version" >&5
++echo "$as_me:1890: 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
+@@ -1915,7 +1916,7 @@
+ 			cd conftest.src
+ 			for cf_gprconfig in Ada C
+ 			do
+-				echo "$as_me:1918: checking for gprconfig name for $cf_gprconfig" >&5
++				echo "$as_me:1919: 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
+@@ -1934,10 +1935,10 @@
+ 				if test -n "$cf_gprconfig_value"
+ 				then
+ 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+-					echo "$as_me:1937: result: $cf_gprconfig_value" >&5
++					echo "$as_me:1938: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ 				else
+-					echo "$as_me:1940: result: missing" >&5
++					echo "$as_me:1941: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ 					cf_ada_config="#"
+ 					break
+@@ -1950,7 +1951,7 @@
+ 	if test "x$cf_ada_config" != "x#"
+ 	then
+ 
+-echo "$as_me:1953: checking for gnat version" >&5
++echo "$as_me:1954: 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
+@@ -1961,7 +1962,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:1964: result: $cf_cv_gnat_version" >&5
++echo "$as_me:1965: 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
+ 
+@@ -1970,7 +1971,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ echo "$as_me:1973: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:1974: 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
+ 	;;
+@@ -1978,7 +1979,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:1981: checking for $ac_word" >&5
++echo "$as_me:1982: 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
+@@ -1993,7 +1994,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:1996: found $ac_dir/$ac_word" >&5
++echo "$as_me:1997: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2002,20 +2003,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:2005: result: $M4_exists" >&5
++  echo "$as_me:2006: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:2008: result: no" >&5
++  echo "$as_me:2009: 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:2014: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++			{ echo "$as_me:2015: 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:2018: checking if GNAT works" >&5
++			echo "$as_me:2019: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf ./conftest* ./*~conftest*
+@@ -2043,7 +2044,7 @@
+ fi
+ rm -rf ./conftest* ./*~conftest*
+ 
+-			echo "$as_me:2046: result: $cf_cv_prog_gnat_correct" >&5
++			echo "$as_me:2047: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 		fi
+ 	else
+@@ -2059,7 +2060,7 @@
+ 		# Here is a workaround.
+ 		# Extract the first word of "gnatgcc", so it can be a program name with args.
+ set dummy gnatgcc; ac_word=$2
+-echo "$as_me:2062: checking for $ac_word" >&5
++echo "$as_me:2063: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_cf_cv_path_gnatgcc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2076,7 +2077,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_cf_cv_path_gnatgcc="$ac_dir/$ac_word"
+-   echo "$as_me:2079: found $ac_dir/$ac_word" >&5
++   echo "$as_me:2080: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -2088,16 +2089,16 @@
+ cf_cv_path_gnatgcc=$ac_cv_path_cf_cv_path_gnatgcc
+ 
+ if test -n "$cf_cv_path_gnatgcc"; then
+-  echo "$as_me:2091: result: $cf_cv_path_gnatgcc" >&5
++  echo "$as_me:2092: result: $cf_cv_path_gnatgcc" >&5
+ echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
+ else
+-  echo "$as_me:2094: result: no" >&5
++  echo "$as_me:2095: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 		if test "$cf_cv_path_gnatgcc" != no
+ 		then
+-			echo "$as_me:2100: checking for improvement" >&5
++			echo "$as_me:2101: checking for improvement" >&5
+ echo $ECHO_N "checking for improvement... $ECHO_C" >&6
+ 			cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null`
+ 			case "x$cf_file_gnatgcc" in
+@@ -2108,7 +2109,7 @@
+ 				cf_cv_path_gnatgcc=no
+ 				;;
+ 			esac
+-			echo "$as_me:2111: result: $cf_cv_path_gnatgcc" >&5
++			echo "$as_me:2112: result: $cf_cv_path_gnatgcc" >&5
+ echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
+ 			test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc
+ 			cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc"
+@@ -2133,7 +2134,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:2136: checking for $ac_word" >&5
++echo "$as_me:2137: 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
+@@ -2148,7 +2149,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:2151: found $ac_dir/$ac_word" >&5
++echo "$as_me:2152: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2156,10 +2157,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:2159: result: $CC" >&5
++  echo "$as_me:2160: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:2162: result: no" >&5
++  echo "$as_me:2163: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2172,7 +2173,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:2175: checking for $ac_word" >&5
++echo "$as_me:2176: 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
+@@ -2187,7 +2188,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:2190: found $ac_dir/$ac_word" >&5
++echo "$as_me:2191: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2195,10 +2196,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:2198: result: $ac_ct_CC" >&5
++  echo "$as_me:2199: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:2201: result: no" >&5
++  echo "$as_me:2202: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2208,32 +2209,32 @@
+   CC=$ac_ct_CC
+ fi
+ 
+-test -z "$CC" && { { echo "$as_me:2211: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:2212: 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:2216:" \
++echo "$as_me:2217:" \
+      "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo "$2"`
+-{ (eval echo "$as_me:2219: \"$ac_compiler --version &5\"") >&5
++{ (eval echo "$as_me:2220: \"$ac_compiler --version &5\"") >&5
+   (eval $ac_compiler --version &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2222: \$? = $ac_status" >&5
++  echo "$as_me:2223: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:2224: \"$ac_compiler -v &5\"") >&5
++{ (eval echo "$as_me:2225: \"$ac_compiler -v &5\"") >&5
+   (eval $ac_compiler -v &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2227: \$? = $ac_status" >&5
++  echo "$as_me:2228: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:2229: \"$ac_compiler -V &5\"") >&5
++{ (eval echo "$as_me:2230: \"$ac_compiler -V &5\"") >&5
+   (eval $ac_compiler -V &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2232: \$? = $ac_status" >&5
++  echo "$as_me:2233: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2236 "configure"
++#line 2237 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2249,13 +2250,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:2252: checking for C compiler default output" >&5
++echo "$as_me:2253: 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:2255: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:2256: \"$ac_link_default\"") >&5
+   (eval $ac_link_default) 2>&5
+   ac_status=$?
+-  echo "$as_me:2258: \$? = $ac_status" >&5
++  echo "$as_me:2259: \$? = $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
+@@ -2278,34 +2279,34 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:2281: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:2282: 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:2287: result: $ac_file" >&5
++echo "$as_me:2288: 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:2292: checking whether the C compiler works" >&5
++echo "$as_me:2293: 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:2298: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2299: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2301: \$? = $ac_status" >&5
++  echo "$as_me:2302: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+-	{ { echo "$as_me:2308: error: cannot run C compiled programs.
++	{ { echo "$as_me:2309: 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;}
+@@ -2313,24 +2314,24 @@
+     fi
+   fi
+ fi
+-echo "$as_me:2316: result: yes" >&5
++echo "$as_me:2317: 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:2323: checking whether we are cross compiling" >&5
++echo "$as_me:2324: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:2325: result: $cross_compiling" >&5
++echo "$as_me:2326: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+ 
+-echo "$as_me:2328: checking for executable suffix" >&5
++echo "$as_me:2329: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:2330: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2331: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2333: \$? = $ac_status" >&5
++  echo "$as_me:2334: \$? = $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
+@@ -2346,25 +2347,25 @@
+   esac
+ done
+ else
+-  { { echo "$as_me:2349: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:2350: 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:2355: result: $ac_cv_exeext" >&5
++echo "$as_me:2356: 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:2361: checking for object suffix" >&5
++echo "$as_me:2362: 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 2367 "configure"
++#line 2368 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2376,10 +2377,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:2379: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2380: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2382: \$? = $ac_status" >&5
++  echo "$as_me:2383: \$? = $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
+@@ -2391,24 +2392,24 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:2394: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:2395: 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:2401: result: $ac_cv_objext" >&5
++echo "$as_me:2402: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:2405: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:2406: 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 2411 "configure"
++#line 2412 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2423,16 +2424,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2426: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2427: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2429: \$? = $ac_status" >&5
++  echo "$as_me:2430: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2432: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2433: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2435: \$? = $ac_status" >&5
++  echo "$as_me:2436: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -2444,19 +2445,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:2447: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:2448: 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:2453: checking whether $CC accepts -g" >&5
++echo "$as_me:2454: 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 2459 "configure"
++#line 2460 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2468,16 +2469,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2471: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2472: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2474: \$? = $ac_status" >&5
++  echo "$as_me:2475: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2477: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2478: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2480: \$? = $ac_status" >&5
++  echo "$as_me:2481: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cc_g=yes
+ else
+@@ -2487,7 +2488,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:2490: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:2491: 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
+@@ -2514,16 +2515,16 @@
+ #endif
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2517: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2518: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2520: \$? = $ac_status" >&5
++  echo "$as_me:2521: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2523: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2524: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2526: \$? = $ac_status" >&5
++  echo "$as_me:2527: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   for ac_declaration in \
+    ''\
+@@ -2535,7 +2536,7 @@
+    'void exit (int);'
+ do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2538 "configure"
++#line 2539 "configure"
+ #include "confdefs.h"
+ #include 
+ $ac_declaration
+@@ -2548,16 +2549,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2551: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2552: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2554: \$? = $ac_status" >&5
++  echo "$as_me:2555: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2557: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2558: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2560: \$? = $ac_status" >&5
++  echo "$as_me:2561: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -2567,7 +2568,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2570 "configure"
++#line 2571 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -2579,16 +2580,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2582: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2583: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2585: \$? = $ac_status" >&5
++  echo "$as_me:2586: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2588: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2589: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2591: \$? = $ac_status" >&5
++  echo "$as_me:2592: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -2618,11 +2619,11 @@
+ 
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+-	echo "$as_me:2621: checking version of $CC" >&5
++	echo "$as_me:2622: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+-	echo "$as_me:2625: result: $GCC_VERSION" >&5
++	echo "$as_me:2626: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+ 
+@@ -2631,12 +2632,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:2634: checking if this is really Intel C compiler" >&5
++		echo "$as_me:2635: 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 2639 "configure"
++#line 2640 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2653,16 +2654,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2656: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2657: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2659: \$? = $ac_status" >&5
++  echo "$as_me:2660: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2662: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2663: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2665: \$? = $ac_status" >&5
++  echo "$as_me:2666: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -2673,7 +2674,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:2676: result: $INTEL_COMPILER" >&5
++		echo "$as_me:2677: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ 		;;
+ 	esac
+@@ -2682,11 +2683,11 @@
+ CLANG_COMPILER=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:2685: checking if this is really Clang C compiler" >&5
++	echo "$as_me:2686: 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 2689 "configure"
++#line 2690 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2703,16 +2704,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2706: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2707: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2709: \$? = $ac_status" >&5
++  echo "$as_me:2710: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2712: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2713: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2715: \$? = $ac_status" >&5
++  echo "$as_me:2716: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_COMPILER=yes
+ 
+@@ -2722,7 +2723,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:2725: result: $CLANG_COMPILER" >&5
++	echo "$as_me:2726: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+ 
+@@ -2731,30 +2732,30 @@
+ if test "x$CLANG_COMPILER" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:2734: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:2735: 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:2741: checking version of $CC" >&5
++	echo "$as_me:2742: 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:2745: result: $CLANG_VERSION" >&5
++	echo "$as_me:2746: 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:2752: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:2753: 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 2757 "configure"
++#line 2758 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -2768,16 +2769,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:2771: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2772: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2774: \$? = $ac_status" >&5
++  echo "$as_me:2775: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:2777: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2778: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2780: \$? = $ac_status" >&5
++  echo "$as_me:2781: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -2788,13 +2789,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:2791: result: $cf_clang_optok" >&5
++		echo "$as_me:2792: 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}:2797: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:2798: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -2803,7 +2804,7 @@
+ 	done
+ fi
+ 
+-echo "$as_me:2806: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:2807: 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
+@@ -2811,7 +2812,7 @@
+   ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2814 "configure"
++#line 2815 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -2858,16 +2859,16 @@
+ do
+   CC="$ac_save_CC $ac_arg"
+   rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2861: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2862: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2864: \$? = $ac_status" >&5
++  echo "$as_me:2865: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2867: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2868: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2870: \$? = $ac_status" >&5
++  echo "$as_me:2871: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -2884,10 +2885,10 @@
+ 
+ case "x$ac_cv_prog_cc_stdc" in
+   x|xno)
+-    echo "$as_me:2887: result: none needed" >&5
++    echo "$as_me:2888: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+   *)
+-    echo "$as_me:2890: result: $ac_cv_prog_cc_stdc" >&5
++    echo "$as_me:2891: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+     CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+@@ -2895,13 +2896,13 @@
+ # This should have been defined by AC_PROG_CC
+ : "${CC:=cc}"
+ 
+-echo "$as_me:2898: checking \$CFLAGS variable" >&5
++echo "$as_me:2899: checking \$CFLAGS variable" >&5
+ echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
+ case "x$CFLAGS" in
+ (*-[IUD]*)
+-	echo "$as_me:2902: result: broken" >&5
++	echo "$as_me:2903: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2904: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
++	{ echo "$as_me:2905: 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=
+@@ -3009,18 +3010,18 @@
+ 	done
+ 	;;
+ (*)
+-	echo "$as_me:3012: result: ok" >&5
++	echo "$as_me:3013: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+ 
+-echo "$as_me:3017: checking \$CC variable" >&5
++echo "$as_me:3018: checking \$CC variable" >&5
+ echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+ case "$CC" in
+ (*[\ \	]-*)
+-	echo "$as_me:3021: result: broken" >&5
++	echo "$as_me:3022: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:3023: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++	{ echo "$as_me:3024: 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/[ ]*[ ]-[^ ].*//'`
+@@ -3137,19 +3138,19 @@
+ 	done
+ 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
+ 
+-echo "${as_me:-configure}:3140: testing resulting CC: '$CC' ..." 1>&5
++echo "${as_me:-configure}:3141: testing resulting CC: '$CC' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:3144: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
++echo "${as_me:-configure}:3145: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:3148: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
++echo "${as_me:-configure}:3149: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+ 
+ 	;;
+ (*)
+-	echo "$as_me:3152: result: ok" >&5
++	echo "$as_me:3153: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+@@ -3163,7 +3164,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:3166: checking how to run the C preprocessor" >&5
++echo "$as_me:3167: 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
+@@ -3184,18 +3185,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 3187 "configure"
++#line 3188 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:3192: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3193: \"$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:3198: \$? = $ac_status" >&5
++  echo "$as_me:3199: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3218,17 +3219,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3221 "configure"
++#line 3222 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:3225: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3226: \"$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:3231: \$? = $ac_status" >&5
++  echo "$as_me:3232: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3265,7 +3266,7 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:3268: result: $CPP" >&5
++echo "$as_me:3269: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -3275,18 +3276,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 3278 "configure"
++#line 3279 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:3283: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3284: \"$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:3289: \$? = $ac_status" >&5
++  echo "$as_me:3290: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3309,17 +3310,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3312 "configure"
++#line 3313 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:3316: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3317: \"$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:3322: \$? = $ac_status" >&5
++  echo "$as_me:3323: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3347,7 +3348,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:3350: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:3351: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -3360,14 +3361,14 @@
+ ac_main_return="return"
+ 
+ if test $ac_cv_c_compiler_gnu = yes; then
+-    echo "$as_me:3363: checking whether $CC needs -traditional" >&5
++    echo "$as_me:3364: 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 3370 "configure"
++#line 3371 "configure"
+ #include "confdefs.h"
+ #include 
+ int Autoconf = TIOCGETP;
+@@ -3382,7 +3383,7 @@
+ 
+   if test $ac_cv_prog_gcc_traditional = no; then
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3385 "configure"
++#line 3386 "configure"
+ #include "confdefs.h"
+ #include 
+ int Autoconf = TCGETA;
+@@ -3395,14 +3396,14 @@
+ 
+   fi
+ fi
+-echo "$as_me:3398: result: $ac_cv_prog_gcc_traditional" >&5
++echo "$as_me:3399: 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:3405: checking whether $CC understands -c and -o together" >&5
++echo "$as_me:3406: 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
+@@ -3417,15 +3418,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:3420: \"$ac_try\"") >&5
++if { (eval echo "$as_me:3421: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3423: \$? = $ac_status" >&5
++  echo "$as_me:3424: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:3425: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:3426: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3428: \$? = $ac_status" >&5
++  echo "$as_me:3429: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CC_c_o=yes
+@@ -3436,10 +3437,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CC_c_o" = yes; then
+-  echo "$as_me:3439: result: yes" >&5
++  echo "$as_me:3440: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:3442: result: no" >&5
++  echo "$as_me:3443: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3453,7 +3454,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:3456: checking for $ac_word" >&5
++echo "$as_me:3457: 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
+@@ -3470,7 +3471,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:3473: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3474: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3481,10 +3482,10 @@
+ LDCONFIG=$ac_cv_path_LDCONFIG
+ 
+ if test -n "$LDCONFIG"; then
+-  echo "$as_me:3484: result: $LDCONFIG" >&5
++  echo "$as_me:3485: result: $LDCONFIG" >&5
+ echo "${ECHO_T}$LDCONFIG" >&6
+ else
+-  echo "$as_me:3487: result: no" >&5
++  echo "$as_me:3488: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3492,7 +3493,7 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:3495: checking if you want to ensure bool is consistent with C++" >&5
++echo "$as_me:3496: 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.
+@@ -3502,7 +3503,7 @@
+ else
+   cf_with_cxx=yes
+ fi;
+-echo "$as_me:3505: result: $cf_with_cxx" >&5
++echo "$as_me:3506: result: $cf_with_cxx" >&5
+ echo "${ECHO_T}$cf_with_cxx" >&6
+ if test "X$cf_with_cxx" = Xno ; then
+ 	CXX=""
+@@ -3520,7 +3521,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:3523: checking for $ac_word" >&5
++echo "$as_me:3524: 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
+@@ -3535,7 +3536,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:3538: found $ac_dir/$ac_word" >&5
++echo "$as_me:3539: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3543,10 +3544,10 @@
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+-  echo "$as_me:3546: result: $CXX" >&5
++  echo "$as_me:3547: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$as_me:3549: result: no" >&5
++  echo "$as_me:3550: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3559,7 +3560,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:3562: checking for $ac_word" >&5
++echo "$as_me:3563: 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
+@@ -3574,7 +3575,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:3577: found $ac_dir/$ac_word" >&5
++echo "$as_me:3578: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3582,10 +3583,10 @@
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+-  echo "$as_me:3585: result: $ac_ct_CXX" >&5
++  echo "$as_me:3586: result: $ac_ct_CXX" >&5
+ echo "${ECHO_T}$ac_ct_CXX" >&6
+ else
+-  echo "$as_me:3588: result: no" >&5
++  echo "$as_me:3589: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3597,32 +3598,32 @@
+ fi
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:3600:" \
++echo "$as_me:3601:" \
+      "checking for C++ compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:3603: \"$ac_compiler --version &5\"") >&5
++{ (eval echo "$as_me:3604: \"$ac_compiler --version &5\"") >&5
+   (eval $ac_compiler --version &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:3606: \$? = $ac_status" >&5
++  echo "$as_me:3607: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:3608: \"$ac_compiler -v &5\"") >&5
++{ (eval echo "$as_me:3609: \"$ac_compiler -v &5\"") >&5
+   (eval $ac_compiler -v &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:3611: \$? = $ac_status" >&5
++  echo "$as_me:3612: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:3613: \"$ac_compiler -V &5\"") >&5
++{ (eval echo "$as_me:3614: \"$ac_compiler -V &5\"") >&5
+   (eval $ac_compiler -V &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:3616: \$? = $ac_status" >&5
++  echo "$as_me:3617: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 
+-echo "$as_me:3619: checking whether we are using the GNU C++ compiler" >&5
++echo "$as_me:3620: 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 3625 "configure"
++#line 3626 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3637,16 +3638,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3640: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3641: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3643: \$? = $ac_status" >&5
++  echo "$as_me:3644: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3646: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3647: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3649: \$? = $ac_status" >&5
++  echo "$as_me:3650: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -3658,19 +3659,19 @@
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:3661: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "$as_me:3662: 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:3667: checking whether $CXX accepts -g" >&5
++echo "$as_me:3668: 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 3673 "configure"
++#line 3674 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3682,16 +3683,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3685: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3686: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3688: \$? = $ac_status" >&5
++  echo "$as_me:3689: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3691: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3692: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3694: \$? = $ac_status" >&5
++  echo "$as_me:3695: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cxx_g=yes
+ else
+@@ -3701,7 +3702,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3704: result: $ac_cv_prog_cxx_g" >&5
++echo "$as_me:3705: 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
+@@ -3728,7 +3729,7 @@
+    'void exit (int);'
+ do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3731 "configure"
++#line 3732 "configure"
+ #include "confdefs.h"
+ #include 
+ $ac_declaration
+@@ -3741,16 +3742,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3744: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3745: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3747: \$? = $ac_status" >&5
++  echo "$as_me:3748: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3750: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3751: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3753: \$? = $ac_status" >&5
++  echo "$as_me:3754: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -3760,7 +3761,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3763 "configure"
++#line 3764 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -3772,16 +3773,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3775: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3776: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3778: \$? = $ac_status" >&5
++  echo "$as_me:3779: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3781: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3782: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3784: \$? = $ac_status" >&5
++  echo "$as_me:3785: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -3815,7 +3816,7 @@
+ 	then
+ 		# Several of the C++ configurations do not work, particularly when
+ 		# cross-compiling (20140913 -TD)
+-		echo "$as_me:3818: checking if $CXX works" >&5
++		echo "$as_me:3819: checking if $CXX works" >&5
+ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
+ 
+ 		save_CPPFLAGS="$CPPFLAGS"
+@@ -3823,7 +3824,7 @@
+ 		CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3826 "configure"
++#line 3827 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -3840,16 +3841,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3843: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3844: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3846: \$? = $ac_status" >&5
++  echo "$as_me:3847: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3849: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3850: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3852: \$? = $ac_status" >&5
++  echo "$as_me:3853: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_works=yes
+ else
+@@ -3860,11 +3861,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CPPFLAGS="$save_CPPFLAGS"
+ 
+-		echo "$as_me:3863: result: $cf_cxx_works" >&5
++		echo "$as_me:3864: result: $cf_cxx_works" >&5
+ echo "${ECHO_T}$cf_cxx_works" >&6
+ 		if test "x$cf_cxx_works" = xno
+ 		then
+-			{ echo "$as_me:3867: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
++			{ echo "$as_me:3868: 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
+@@ -3880,7 +3881,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:3883: checking for $ac_word" >&5
++echo "$as_me:3884: 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
+@@ -3897,7 +3898,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:3900: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3901: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3908,17 +3909,17 @@
+ CXX=$ac_cv_path_CXX
+ 
+ if test -n "$CXX"; then
+-  echo "$as_me:3911: result: $CXX" >&5
++  echo "$as_me:3912: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$as_me:3914: result: no" >&5
++  echo "$as_me:3915: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 	fi
+ 	case "x$CXX" in
+ 	(x|xg++)
+-		{ echo "$as_me:3921: WARNING: You don't have any C++ compiler, too bad" >&5
++		{ echo "$as_me:3922: 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="";
+ 		;;
+@@ -3927,7 +3928,7 @@
+ 
+ GXX_VERSION=none
+ if test "$GXX" = yes; then
+-	echo "$as_me:3930: checking version of ${CXX:-g++}" >&5
++	echo "$as_me:3931: checking version of ${CXX:-g++}" >&5
+ echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
+ 	GXX_VERSION="`${CXX:-g++} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	if test -z "$GXX_VERSION"
+@@ -3935,7 +3936,7 @@
+ 		GXX_VERSION=unknown
+ 		GXX=no
+ 	fi
+-	echo "$as_me:3938: result: $GXX_VERSION" >&5
++	echo "$as_me:3939: result: $GXX_VERSION" >&5
+ echo "${ECHO_T}$GXX_VERSION" >&6
+ fi
+ 
+@@ -3943,12 +3944,12 @@
+ ([1-9][0-9].*)
+ 	;;
+ (1.*|2.[0-6]*)
+-	{ echo "$as_me:3946: WARNING: templates do not work" >&5
++	{ echo "$as_me:3947: WARNING: templates do not work" >&5
+ echo "$as_me: WARNING: templates do not work" >&2;}
+ 	;;
+ esac
+ 
+-echo "$as_me:3951: checking if you want to build C++ binding and demo" >&5
++echo "$as_me:3952: 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.
+@@ -3958,15 +3959,15 @@
+ else
+   cf_with_cxx_binding=$cf_with_cxx
+ fi;
+-echo "$as_me:3961: result: $cf_with_cxx_binding" >&5
++echo "$as_me:3962: result: $cf_with_cxx_binding" >&5
+ echo "${ECHO_T}$cf_with_cxx_binding" >&6
+ 
+-echo "$as_me:3964: checking if you want to build with Ada" >&5
++echo "$as_me:3965: 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:3966: result: $cf_with_ada" >&5
++echo "$as_me:3967: result: $cf_with_ada" >&5
+ echo "${ECHO_T}$cf_with_ada" >&6
+ 
+-echo "$as_me:3969: checking if you want to install terminal database" >&5
++echo "$as_me:3970: 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.
+@@ -3976,10 +3977,10 @@
+ else
+   cf_with_db_install=yes
+ fi;
+-echo "$as_me:3979: result: $cf_with_db_install" >&5
++echo "$as_me:3980: result: $cf_with_db_install" >&5
+ echo "${ECHO_T}$cf_with_db_install" >&6
+ 
+-echo "$as_me:3982: checking if you want to install manpages" >&5
++echo "$as_me:3983: 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.
+@@ -3989,10 +3990,10 @@
+ else
+   cf_with_manpages=yes
+ fi;
+-echo "$as_me:3992: result: $cf_with_manpages" >&5
++echo "$as_me:3993: result: $cf_with_manpages" >&5
+ echo "${ECHO_T}$cf_with_manpages" >&6
+ 
+-echo "$as_me:3995: checking if you want to build programs such as tic" >&5
++echo "$as_me:3996: 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.
+@@ -4002,10 +4003,10 @@
+ else
+   cf_with_progs=yes
+ fi;
+-echo "$as_me:4005: result: $cf_with_progs" >&5
++echo "$as_me:4006: result: $cf_with_progs" >&5
+ echo "${ECHO_T}$cf_with_progs" >&6
+ 
+-echo "$as_me:4008: checking if you want to build test-programs" >&5
++echo "$as_me:4009: 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.
+@@ -4015,10 +4016,10 @@
+ else
+   cf_with_tests=yes
+ fi;
+-echo "$as_me:4018: result: $cf_with_tests" >&5
++echo "$as_me:4019: result: $cf_with_tests" >&5
+ echo "${ECHO_T}$cf_with_tests" >&6
+ 
+-echo "$as_me:4021: checking if you wish to install curses.h" >&5
++echo "$as_me:4022: 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.
+@@ -4028,7 +4029,7 @@
+ else
+   with_curses_h=yes
+ fi;
+-echo "$as_me:4031: result: $with_curses_h" >&5
++echo "$as_me:4032: result: $with_curses_h" >&5
+ echo "${ECHO_T}$with_curses_h" >&6
+ 
+ modules_to_build="ncurses"
+@@ -4052,7 +4053,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:4055: checking for $ac_word" >&5
++echo "$as_me:4056: 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
+@@ -4067,7 +4068,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+-echo "$as_me:4070: found $ac_dir/$ac_word" >&5
++echo "$as_me:4071: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4075,17 +4076,17 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "$as_me:4078: result: $AWK" >&5
++  echo "$as_me:4079: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+-  echo "$as_me:4081: result: no" >&5
++  echo "$as_me:4082: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   test -n "$AWK" && break
+ done
+ 
+-test -z "$AWK" && { { echo "$as_me:4088: error: No awk program found" >&5
++test -z "$AWK" && { { echo "$as_me:4089: error: No awk program found" >&5
+ echo "$as_me: error: No awk program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -4112,7 +4113,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:4115: checking for a BSD compatible install" >&5
++echo "$as_me:4116: 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
+@@ -4161,7 +4162,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:4164: result: $INSTALL" >&5
++echo "$as_me:4165: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -4186,7 +4187,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:4189: checking for $ac_word" >&5
++echo "$as_me:4190: 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
+@@ -4201,7 +4202,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LINT="$ac_prog"
+-echo "$as_me:4204: found $ac_dir/$ac_word" >&5
++echo "$as_me:4205: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4209,10 +4210,10 @@
+ fi
+ LINT=$ac_cv_prog_LINT
+ if test -n "$LINT"; then
+-  echo "$as_me:4212: result: $LINT" >&5
++  echo "$as_me:4213: result: $LINT" >&5
+ echo "${ECHO_T}$LINT" >&6
+ else
+-  echo "$as_me:4215: result: no" >&5
++  echo "$as_me:4216: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4228,18 +4229,18 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:4231: checking whether ln -s works" >&5
++echo "$as_me:4232: 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:4235: result: yes" >&5
++  echo "$as_me:4236: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:4238: result: no, using $LN_S" >&5
++  echo "$as_me:4239: result: no, using $LN_S" >&5
+ echo "${ECHO_T}no, using $LN_S" >&6
+ fi
+ 
+-echo "$as_me:4242: checking if $LN_S -f options work" >&5
++echo "$as_me:4243: 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
+@@ -4251,12 +4252,12 @@
+ 	cf_prog_ln_sf=no
+ fi
+ rm -f conf$$.dst conf$$src
+-echo "$as_me:4254: result: $cf_prog_ln_sf" >&5
++echo "$as_me:4255: 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:4259: checking for long file names" >&5
++echo "$as_me:4260: 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
+@@ -4295,7 +4296,7 @@
+   rm -rf "$ac_xdir" 2>/dev/null
+ done
+ fi
+-echo "$as_me:4298: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:4299: 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
+ 
+@@ -4314,7 +4315,7 @@
+   withval="$with_config_suffix"
+   case "x$withval" in
+ 	(xyes|xno)
+-		{ echo "$as_me:4317: WARNING: expected a value for config-suffix option" >&5
++		{ echo "$as_me:4318: 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"
+@@ -4324,7 +4325,7 @@
+ 
+ # If we find pkg-config, check if we should install the ".pc" files.
+ 
+-echo "$as_me:4327: checking if you want to use pkg-config" >&5
++echo "$as_me:4328: 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.
+@@ -4334,7 +4335,7 @@
+ else
+   cf_pkg_config=yes
+ fi;
+-echo "$as_me:4337: result: $cf_pkg_config" >&5
++echo "$as_me:4338: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+ 
+ case "$cf_pkg_config" in
+@@ -4346,7 +4347,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:4349: checking for $ac_word" >&5
++echo "$as_me:4350: 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
+@@ -4363,7 +4364,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:4366: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4367: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -4374,10 +4375,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:4377: result: $PKG_CONFIG" >&5
++  echo "$as_me:4378: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+-  echo "$as_me:4380: result: no" >&5
++  echo "$as_me:4381: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4386,7 +4387,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:4389: checking for $ac_word" >&5
++echo "$as_me:4390: 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
+@@ -4403,7 +4404,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:4406: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4407: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -4415,10 +4416,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ 
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  echo "$as_me:4418: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:4419: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+-  echo "$as_me:4421: result: no" >&5
++  echo "$as_me:4422: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4459,24 +4460,24 @@
+ 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4462: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++	{ { echo "$as_me:4463: 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:4469: WARNING: pkg-config is not installed" >&5
++	{ echo "$as_me:4470: 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:4475: checking for pkg-config library directory" >&5
++	echo "$as_me:4476: checking for pkg-config library directory" >&5
+ echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
+ 	;;
+ (*)
+-	echo "$as_me:4479: checking for $PKG_CONFIG library directory" >&5
++	echo "$as_me:4480: checking for $PKG_CONFIG library directory" >&5
+ echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
+ 	;;
+ esac
+@@ -4503,7 +4504,7 @@
+ case "x$cf_search_path" in
+ (xlibdir)
+ 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+-	echo "$as_me:4506: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:4507: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+@@ -4514,16 +4515,16 @@
+ 	;;
+ (x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	PKG_CONFIG_LIBDIR="$cf_search_path"
+-	echo "$as_me:4517: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:4518: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+ (xyes|xauto)
+-	echo "$as_me:4522: result: auto" >&5
++	echo "$as_me:4523: 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:4526: checking for search-list" >&5
++	echo "$as_me:4527: checking for search-list" >&5
+ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+ 	if test "x$PKG_CONFIG" != xnone
+ 	then
+@@ -4558,11 +4559,11 @@
+ "`
+ 	fi
+ 
+-	echo "$as_me:4561: result: $cf_search_path" >&5
++	echo "$as_me:4562: result: $cf_search_path" >&5
+ echo "${ECHO_T}$cf_search_path" >&6
+ 	;;
+ (*)
+-	{ { echo "$as_me:4565: error: Unexpected option value: $cf_search_path" >&5
++	{ { echo "$as_me:4566: error: Unexpected option value: $cf_search_path" >&5
+ echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -4570,7 +4571,7 @@
+ 
+ if test -n "$cf_search_path"
+ then
+-	echo "$as_me:4573: checking for first directory" >&5
++	echo "$as_me:4574: 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
+@@ -4581,7 +4582,7 @@
+ 			break
+ 		fi
+ 	done
+-	echo "$as_me:4584: result: $cf_pkg_config_path" >&5
++	echo "$as_me:4585: result: $cf_pkg_config_path" >&5
+ echo "${ECHO_T}$cf_pkg_config_path" >&6
+ 
+ 	if test "x$cf_pkg_config_path" != xnone ; then
+@@ -4591,7 +4592,7 @@
+ 
+ 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+ 	then
+-		echo "$as_me:4594: checking for workaround" >&5
++		echo "$as_me:4595: checking for workaround" >&5
+ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+ 		if test "$prefix" = "NONE" ; then
+ 			cf_prefix="$ac_default_prefix"
+@@ -4614,17 +4615,17 @@
+ 			esac
+ 		done
+ 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+-		echo "$as_me:4617: result: $PKG_CONFIG_LIBDIR" >&5
++		echo "$as_me:4618: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	fi
+ fi
+ 
+ if test "x$PKG_CONFIG" != xnone
+ then
+-	echo "$as_me:4624: checking if we should install .pc files for $PKG_CONFIG" >&5
++	echo "$as_me:4625: 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:4627: checking if we should install .pc files" >&5
++	echo "$as_me:4628: checking if we should install .pc files" >&5
+ echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
+ fi
+ 
+@@ -4635,7 +4636,7 @@
+ else
+   enable_pc_files=no
+ fi;
+-echo "$as_me:4638: result: $enable_pc_files" >&5
++echo "$as_me:4639: result: $enable_pc_files" >&5
+ echo "${ECHO_T}$enable_pc_files" >&6
+ 
+ if test "x$enable_pc_files" != xno
+@@ -4643,7 +4644,7 @@
+ 	MAKE_PC_FILES=
+ 	case "x$PKG_CONFIG_LIBDIR" in
+ 	(xno|xnone|xyes|x)
+-		{ echo "$as_me:4646: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
++		{ echo "$as_me:4647: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+ echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
+ 		;;
+ 	(*)
+@@ -4672,7 +4673,7 @@
+ 	cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4675: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
++	{ { echo "$as_me:4676: 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; }; }
+ 	;;
+@@ -4686,7 +4687,7 @@
+ 
+ if test -z "$MAKE_PC_FILES"
+ then
+-	echo "$as_me:4689: checking for suffix to add to pkg-config files" >&5
++	echo "$as_me:4690: checking for suffix to add to pkg-config files" >&5
+ echo $ECHO_N "checking for suffix to add to pkg-config files... $ECHO_C" >&6
+ 
+ # Check whether --with-pc-suffix or --without-pc-suffix was given.
+@@ -4701,13 +4702,13 @@
+ 	esac
+ fi;
+ 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
+-	echo "$as_me:4704: result: $PC_MODULE_SUFFIX" >&5
++	echo "$as_me:4705: result: $PC_MODULE_SUFFIX" >&5
+ echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
+ 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
+ 
+ fi
+ 
+-echo "$as_me:4710: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:4711: 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.
+@@ -4717,11 +4718,11 @@
+ else
+   enable_mixedcase=auto
+ fi;
+-echo "$as_me:4720: result: $enable_mixedcase" >&5
++echo "$as_me:4721: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+ 
+-echo "$as_me:4724: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:4725: 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
+@@ -4748,7 +4749,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:4751: result: $cf_cv_mixedcase" >&5
++echo "$as_me:4752: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -4767,7 +4768,7 @@
+ fi
+ 
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:4770: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:4771: 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
+@@ -4787,16 +4788,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:4790: result: yes" >&5
++  echo "$as_me:4791: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:4794: result: no" >&5
++  echo "$as_me:4795: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+-echo "$as_me:4799: checking for \".PHONY\" make-support" >&5
++echo "$as_me:4800: 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
+@@ -4851,7 +4852,7 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:4854: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:4855: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+@@ -4862,7 +4863,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:4865: checking for $ac_word" >&5
++echo "$as_me:4866: 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
+@@ -4877,7 +4878,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:4880: found $ac_dir/$ac_word" >&5
++echo "$as_me:4881: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4885,10 +4886,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:4888: result: $CTAGS" >&5
++  echo "$as_me:4889: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:4891: result: no" >&5
++  echo "$as_me:4892: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4899,7 +4900,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:4902: checking for $ac_word" >&5
++echo "$as_me:4903: 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
+@@ -4914,7 +4915,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:4917: found $ac_dir/$ac_word" >&5
++echo "$as_me:4918: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4922,10 +4923,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:4925: result: $ETAGS" >&5
++  echo "$as_me:4926: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:4928: result: no" >&5
++  echo "$as_me:4929: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4934,7 +4935,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:4937: checking for $ac_word" >&5
++echo "$as_me:4938: 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
+@@ -4949,7 +4950,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:4952: found $ac_dir/$ac_word" >&5
++echo "$as_me:4953: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4958,17 +4959,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:4961: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:4962: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:4964: result: no" >&5
++  echo "$as_me:4965: 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:4971: checking for $ac_word" >&5
++echo "$as_me:4972: 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
+@@ -4983,7 +4984,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:4986: found $ac_dir/$ac_word" >&5
++echo "$as_me:4987: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4992,10 +4993,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:4995: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:4996: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:4998: result: no" >&5
++  echo "$as_me:4999: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5015,7 +5016,7 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:5018: checking for makeflags variable" >&5
++echo "$as_me:5019: 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
+@@ -5045,7 +5046,7 @@
+ 			;;
+ 		(*)
+ 
+-echo "${as_me:-configure}:5048: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:5049: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -5053,13 +5054,13 @@
+ 	rm -f cf_makeflags.tmp
+ 
+ fi
+-echo "$as_me:5056: result: $cf_cv_makeflags" >&5
++echo "$as_me:5057: 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:5062: checking for $ac_word" >&5
++echo "$as_me:5063: 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
+@@ -5074,7 +5075,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:5077: found $ac_dir/$ac_word" >&5
++echo "$as_me:5078: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5082,10 +5083,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:5085: result: $RANLIB" >&5
++  echo "$as_me:5086: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:5088: result: no" >&5
++  echo "$as_me:5089: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5094,7 +5095,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:5097: checking for $ac_word" >&5
++echo "$as_me:5098: 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
+@@ -5109,7 +5110,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:5112: found $ac_dir/$ac_word" >&5
++echo "$as_me:5113: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5118,10 +5119,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:5121: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:5122: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:5124: result: no" >&5
++  echo "$as_me:5125: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5133,7 +5134,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:5136: checking for $ac_word" >&5
++echo "$as_me:5137: 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
+@@ -5148,7 +5149,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:5151: found $ac_dir/$ac_word" >&5
++echo "$as_me:5152: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5156,10 +5157,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:5159: result: $LD" >&5
++  echo "$as_me:5160: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:5162: result: no" >&5
++  echo "$as_me:5163: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5168,7 +5169,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:5171: 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_ac_ct_LD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5183,7 +5184,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:5186: found $ac_dir/$ac_word" >&5
++echo "$as_me:5187: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5192,10 +5193,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:5195: result: $ac_ct_LD" >&5
++  echo "$as_me:5196: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:5198: result: no" >&5
++  echo "$as_me:5199: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5207,7 +5208,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:5210: 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_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5222,7 +5223,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:5225: found $ac_dir/$ac_word" >&5
++echo "$as_me:5226: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5230,10 +5231,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:5233: result: $AR" >&5
++  echo "$as_me:5234: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:5236: result: no" >&5
++  echo "$as_me:5237: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5242,7 +5243,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:5245: checking for $ac_word" >&5
++echo "$as_me:5246: 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
+@@ -5257,7 +5258,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:5260: found $ac_dir/$ac_word" >&5
++echo "$as_me:5261: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5266,10 +5267,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:5269: result: $ac_ct_AR" >&5
++  echo "$as_me:5270: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:5272: result: no" >&5
++  echo "$as_me:5273: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5281,7 +5282,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:5284: checking for $ac_word" >&5
++echo "$as_me:5285: 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
+@@ -5296,7 +5297,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:5299: found $ac_dir/$ac_word" >&5
++echo "$as_me:5300: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5304,10 +5305,10 @@
+ fi
+ NM=$ac_cv_prog_NM
+ if test -n "$NM"; then
+-  echo "$as_me:5307: result: $NM" >&5
++  echo "$as_me:5308: result: $NM" >&5
+ echo "${ECHO_T}$NM" >&6
+ else
+-  echo "$as_me:5310: result: no" >&5
++  echo "$as_me:5311: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5316,7 +5317,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:5319: checking for $ac_word" >&5
++echo "$as_me:5320: 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
+@@ -5331,7 +5332,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:5334: found $ac_dir/$ac_word" >&5
++echo "$as_me:5335: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5340,10 +5341,10 @@
+ fi
+ ac_ct_NM=$ac_cv_prog_ac_ct_NM
+ if test -n "$ac_ct_NM"; then
+-  echo "$as_me:5343: result: $ac_ct_NM" >&5
++  echo "$as_me:5344: result: $ac_ct_NM" >&5
+ echo "${ECHO_T}$ac_ct_NM" >&6
+ else
+-  echo "$as_me:5346: result: no" >&5
++  echo "$as_me:5347: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5355,7 +5356,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:5358: checking for $ac_word" >&5
++echo "$as_me:5359: 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
+@@ -5370,7 +5371,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:5373: found $ac_dir/$ac_word" >&5
++echo "$as_me:5374: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5378,10 +5379,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:5381: result: $AR" >&5
++  echo "$as_me:5382: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:5384: result: no" >&5
++  echo "$as_me:5385: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5390,7 +5391,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:5393: checking for $ac_word" >&5
++echo "$as_me:5394: 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
+@@ -5405,7 +5406,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:5408: found $ac_dir/$ac_word" >&5
++echo "$as_me:5409: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5414,10 +5415,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:5417: result: $ac_ct_AR" >&5
++  echo "$as_me:5418: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:5420: result: no" >&5
++  echo "$as_me:5421: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5426,7 +5427,7 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-echo "$as_me:5429: checking for options to update archives" >&5
++echo "$as_me:5430: 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
+@@ -5463,13 +5464,13 @@
+ 			rm -f conftest.a
+ 
+ 			cat >"conftest.$ac_ext" <&5
++			if { (eval echo "$as_me:5470: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5472: \$? = $ac_status" >&5
++  echo "$as_me:5473: \$? = $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
+@@ -5480,7 +5481,7 @@
+ 			else
+ 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-echo "${as_me:-configure}:5483: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:5484: testing cannot compile test-program ..." 1>&5
+ 
+ 				break
+ 			fi
+@@ -5490,7 +5491,7 @@
+ 	esac
+ 
+ fi
+-echo "$as_me:5493: result: $cf_cv_ar_flags" >&5
++echo "$as_me:5494: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+ if test -n "$ARFLAGS" ; then
+@@ -5501,7 +5502,7 @@
+ 	ARFLAGS=$cf_cv_ar_flags
+ fi
+ 
+-echo "$as_me:5504: checking for an installation directory prefix" >&5
++echo "$as_me:5505: checking for an installation directory prefix" >&5
+ echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-install-prefix or --without-install-prefix was given.
+@@ -5514,10 +5515,10 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:5517: result: ${DESTDIR:-(none)}" >&5
++echo "$as_me:5518: result: ${DESTDIR:-(none)}" >&5
+ echo "${ECHO_T}${DESTDIR:-(none)}" >&6
+ 
+-echo "$as_me:5520: checking if installation directory prefix should be merged" >&5
++echo "$as_me:5521: checking if installation directory prefix should be merged" >&5
+ echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6
+ 
+ # Check whether --enable-install-prefix or --disable-install-prefix was given.
+@@ -5534,7 +5535,7 @@
+ 	cf_install_prefix=no
+ 
+ fi;
+-echo "$as_me:5537: result: $cf_install_prefix" >&5
++echo "$as_me:5538: result: $cf_install_prefix" >&5
+ echo "${ECHO_T}$cf_install_prefix" >&6
+ 
+ if test "$cf_install_prefix" = yes ; then
+@@ -5575,7 +5576,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:5579: 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
+@@ -5590,7 +5591,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:5593: found $ac_dir/$ac_word" >&5
++echo "$as_me:5594: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5598,10 +5599,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:5601: result: $BUILD_CC" >&5
++  echo "$as_me:5602: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:5604: result: no" >&5
++  echo "$as_me:5605: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5610,12 +5611,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+ 
+ fi;
+-	echo "$as_me:5613: checking for native build C compiler" >&5
++	echo "$as_me:5614: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:5615: result: $BUILD_CC" >&5
++	echo "$as_me:5616: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:5618: checking for native build C preprocessor" >&5
++	echo "$as_me:5619: 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.
+@@ -5625,10 +5626,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:5628: result: $BUILD_CPP" >&5
++	echo "$as_me:5629: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:5631: checking for native build C flags" >&5
++	echo "$as_me:5632: 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.
+@@ -5636,10 +5637,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:5639: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:5640: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:5642: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:5643: 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.
+@@ -5647,10 +5648,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:5650: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:5651: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:5653: checking for native build linker-flags" >&5
++	echo "$as_me:5654: 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.
+@@ -5658,10 +5659,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:5661: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:5662: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:5664: checking for native build linker-libraries" >&5
++	echo "$as_me:5665: 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.
+@@ -5669,7 +5670,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:5672: result: $BUILD_LIBS" >&5
++	echo "$as_me:5673: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -5678,7 +5679,7 @@
+ 
+ 	: ${BUILD_CC:='${CC}'}
+ 
+-	echo "$as_me:5681: checking if the build-compiler \"$BUILD_CC\" works" >&5
++	echo "$as_me:5682: checking if the build-compiler \"$BUILD_CC\" works" >&5
+ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
+ 
+ 	cf_save_crossed=$cross_compiling
+@@ -5692,7 +5693,7 @@
+   cf_ok_build_cc=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5695 "configure"
++#line 5696 "configure"
+ #include "confdefs.h"
+ #include 
+ 		int main(int argc, char *argv[])
+@@ -5702,15 +5703,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:5705: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5706: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5708: \$? = $ac_status" >&5
++  echo "$as_me:5709: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:5710: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5711: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5713: \$? = $ac_status" >&5
++  echo "$as_me:5714: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_ok_build_cc=yes
+ else
+@@ -5725,12 +5726,12 @@
+ 	cross_compiling=$cf_save_crossed
+ 	ac_link=$cf_save_ac_link
+ 
+-	echo "$as_me:5728: result: $cf_ok_build_cc" >&5
++	echo "$as_me:5729: result: $cf_ok_build_cc" >&5
+ echo "${ECHO_T}$cf_ok_build_cc" >&6
+ 
+ 	if test "$cf_ok_build_cc" != yes
+ 	then
+-		{ { echo "$as_me:5733: error: Cross-build requires two compilers.
++		{ { echo "$as_me:5734: 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;}
+@@ -5755,7 +5756,7 @@
+ ### shared, for example.
+ cf_list_models=""
+ 
+-echo "$as_me:5758: checking if libtool -version-number should be used" >&5
++echo "$as_me:5759: 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.
+@@ -5772,7 +5773,7 @@
+ 	cf_libtool_version=yes
+ 
+ fi;
+-echo "$as_me:5775: result: $cf_libtool_version" >&5
++echo "$as_me:5776: result: $cf_libtool_version" >&5
+ echo "${ECHO_T}$cf_libtool_version" >&6
+ 
+ if test "$cf_libtool_version" = yes ; then
+@@ -5781,25 +5782,25 @@
+ 	LIBTOOL_VERSION="-version-info"
+ 	case "x$VERSION" in
+ 	(x)
+-		{ echo "$as_me:5784: WARNING: VERSION was not set" >&5
++		{ echo "$as_me:5785: 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}:5791: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5792: 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}:5798: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5799: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:5802: WARNING: unexpected VERSION value: $VERSION" >&5
++		{ echo "$as_me:5803: WARNING: unexpected VERSION value: $VERSION" >&5
+ echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
+ 		;;
+ 	esac
+@@ -5821,7 +5822,7 @@
+ LIB_INSTALL=
+ LIB_UNINSTALL=
+ 
+-echo "$as_me:5824: checking if you want to build libraries with libtool" >&5
++echo "$as_me:5825: 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.
+@@ -5831,7 +5832,7 @@
+ else
+   with_libtool=no
+ fi;
+-echo "$as_me:5834: result: $with_libtool" >&5
++echo "$as_me:5835: result: $with_libtool" >&5
+ echo "${ECHO_T}$with_libtool" >&6
+ if test "$with_libtool" != "no"; then
+ 
+@@ -5860,7 +5861,7 @@
+ 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:5863: error: expected a pathname, not \"$with_libtool\"" >&5
++	{ { echo "$as_me:5864: error: expected a pathname, not \"$with_libtool\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -5873,7 +5874,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:5876: checking for $ac_word" >&5
++echo "$as_me:5877: 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
+@@ -5888,7 +5889,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:5891: found $ac_dir/$ac_word" >&5
++echo "$as_me:5892: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5896,10 +5897,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5899: result: $LIBTOOL" >&5
++  echo "$as_me:5900: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5902: result: no" >&5
++  echo "$as_me:5903: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5912,7 +5913,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:5915: checking for $ac_word" >&5
++echo "$as_me:5916: 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
+@@ -5927,7 +5928,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:5930: found $ac_dir/$ac_word" >&5
++echo "$as_me:5931: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5935,10 +5936,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:5938: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:5939: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:5941: result: no" >&5
++  echo "$as_me:5942: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5969,7 +5970,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:5972: checking for $ac_word" >&5
++echo "$as_me:5973: 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
+@@ -5984,7 +5985,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:5987: found $ac_dir/$ac_word" >&5
++echo "$as_me:5988: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5992,10 +5993,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5995: result: $LIBTOOL" >&5
++  echo "$as_me:5996: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5998: result: no" >&5
++  echo "$as_me:5999: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6008,7 +6009,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:6011: checking for $ac_word" >&5
++echo "$as_me:6012: 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
+@@ -6023,7 +6024,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:6026: found $ac_dir/$ac_word" >&5
++echo "$as_me:6027: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -6031,10 +6032,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:6034: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:6035: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:6037: result: no" >&5
++  echo "$as_me:6038: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6056,7 +6057,7 @@
+ 		fi
+ 	fi
+ 	if test -z "$LIBTOOL" ; then
+-		{ { echo "$as_me:6059: error: Cannot find libtool" >&5
++		{ { echo "$as_me:6060: error: Cannot find libtool" >&5
+ echo "$as_me: error: Cannot find libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -6072,7 +6073,7 @@
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+ then
+-	echo "$as_me:6075: checking version of $LIBTOOL" >&5
++	echo "$as_me:6076: checking version of $LIBTOOL" >&5
+ echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+@@ -6083,7 +6084,7 @@
+ fi
+ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+ 
+-	echo "$as_me:6086: result: $cf_cv_libtool_version" >&5
++	echo "$as_me:6087: result: $cf_cv_libtool_version" >&5
+ echo "${ECHO_T}$cf_cv_libtool_version" >&6
+ 
+ 	if test -n "$cf_cv_libtool_version"
+@@ -6093,19 +6094,19 @@
+ 		(*...GNU-libtool...*)
+ 			;;
+ 		(*)
+-			{ { echo "$as_me:6096: error: This is not GNU libtool" >&5
++			{ { echo "$as_me:6097: 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:6102: error: No version found for $LIBTOOL" >&5
++		{ { echo "$as_me:6103: 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:6108: error: GNU libtool has not been found" >&5
++	{ { echo "$as_me:6109: error: GNU libtool has not been found" >&5
+ echo "$as_me: error: GNU libtool has not been found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6141,7 +6142,7 @@
+ 
+ else
+ 
+-echo "$as_me:6144: checking if you want to build shared libraries" >&5
++echo "$as_me:6145: 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.
+@@ -6151,11 +6152,11 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:6154: result: $with_shared" >&5
++echo "$as_me:6155: 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:6158: checking if you want to build static libraries" >&5
++echo "$as_me:6159: 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.
+@@ -6165,11 +6166,11 @@
+ else
+   with_normal=yes
+ fi;
+-echo "$as_me:6168: result: $with_normal" >&5
++echo "$as_me:6169: 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:6172: checking if you want to build debug libraries" >&5
++echo "$as_me:6173: 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.
+@@ -6179,11 +6180,11 @@
+ else
+   with_debug=yes
+ fi;
+-echo "$as_me:6182: result: $with_debug" >&5
++echo "$as_me:6183: 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:6186: checking if you want to build profiling libraries" >&5
++echo "$as_me:6187: 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.
+@@ -6193,7 +6194,7 @@
+ else
+   with_profile=no
+ fi;
+-echo "$as_me:6196: result: $with_profile" >&5
++echo "$as_me:6197: result: $with_profile" >&5
+ echo "${ECHO_T}$with_profile" >&6
+ test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
+ 
+@@ -6201,7 +6202,7 @@
+ 
+ if test "X$cf_with_cxx_binding" != Xno; then
+ if test "x$with_shared" = "xyes"; then
+-echo "$as_me:6204: checking if you want to build C++ shared libraries" >&5
++echo "$as_me:6205: 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.
+@@ -6211,26 +6212,26 @@
+ else
+   with_shared_cxx=no
+ fi;
+-echo "$as_me:6214: result: $with_shared_cxx" >&5
++echo "$as_me:6215: result: $with_shared_cxx" >&5
+ echo "${ECHO_T}$with_shared_cxx" >&6
+ fi
+ fi
+ 
+ ###############################################################################
+ 
+-echo "$as_me:6221: checking for specified models" >&5
++echo "$as_me:6222: 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:6225: result: $cf_list_models" >&5
++echo "$as_me:6226: 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:6230: checking for default model" >&5
++echo "$as_me:6231: 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:6233: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:6234: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+ 
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+@@ -6244,7 +6245,7 @@
+ LIB_DIR=../lib
+ LIB_2ND=../../lib
+ 
+-echo "$as_me:6247: checking if you want to have a library-prefix" >&5
++echo "$as_me:6248: 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.
+@@ -6254,7 +6255,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:6257: result: $with_lib_prefix" >&5
++echo "$as_me:6258: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test "$with_lib_prefix" = auto
+@@ -6285,24 +6286,24 @@
+ 
+ LIB_SUFFIX=
+ 
+-	echo "$as_me:6288: checking for PATH separator" >&5
++	echo "$as_me:6289: 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:6295: result: $PATH_SEPARATOR" >&5
++	echo "$as_me:6296: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+ 
+ # headers needed for checks...
+-echo "$as_me:6299: checking for ANSI C header files" >&5
++echo "$as_me:6300: 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 6305 "configure"
++#line 6306 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -6310,13 +6311,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:6313: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:6314: \"$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:6319: \$? = $ac_status" >&5
++  echo "$as_me:6320: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6338,7 +6339,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 6341 "configure"
++#line 6342 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6356,7 +6357,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 6359 "configure"
++#line 6360 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6377,7 +6378,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6380 "configure"
++#line 6381 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -6403,15 +6404,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6406: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6407: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6409: \$? = $ac_status" >&5
++  echo "$as_me:6410: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:6411: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6412: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6414: \$? = $ac_status" >&5
++  echo "$as_me:6415: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6424,7 +6425,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:6427: result: $ac_cv_header_stdc" >&5
++echo "$as_me:6428: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -6440,28 +6441,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6443: checking for $ac_header" >&5
++echo "$as_me:6444: 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 6449 "configure"
++#line 6450 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6455: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6456: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6458: \$? = $ac_status" >&5
++  echo "$as_me:6459: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6461: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6462: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6464: \$? = $ac_status" >&5
++  echo "$as_me:6465: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -6471,7 +6472,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6474: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6475: 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:6485: checking whether exit is declared" >&5
+ echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
+ if test "${ac_cv_have_decl_exit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6490 "configure"
++#line 6491 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -6502,16 +6503,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6505: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6506: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6508: \$? = $ac_status" >&5
++  echo "$as_me:6509: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6511: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6512: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6514: \$? = $ac_status" >&5
++  echo "$as_me:6515: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_have_decl_exit=yes
+ else
+@@ -6521,19 +6522,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6524: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:6525: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+ 
+ 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:6530: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:6531: 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 6536 "configure"
++#line 6537 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -6548,16 +6549,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6551: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6552: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6554: \$? = $ac_status" >&5
++  echo "$as_me:6555: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6557: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6558: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6560: \$? = $ac_status" >&5
++  echo "$as_me:6561: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -6567,7 +6568,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6570: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6571: 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:6584: 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
+@@ -6588,7 +6589,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6591 "configure"
++#line 6592 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6607,16 +6608,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6610: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6611: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6613: \$? = $ac_status" >&5
++  echo "$as_me:6614: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6616: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6617: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6619: \$? = $ac_status" >&5
++  echo "$as_me:6620: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -6627,14 +6628,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6630: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:6631: 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:6637: checking for opendir in -lx" >&5
++  echo "$as_me:6638: 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
+@@ -6642,7 +6643,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6645 "configure"
++#line 6646 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6661,16 +6662,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6664: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6665: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6667: \$? = $ac_status" >&5
++  echo "$as_me:6668: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6670: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6671: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6673: \$? = $ac_status" >&5
++  echo "$as_me:6674: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -6681,7 +6682,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6684: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:6685: 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"
+@@ -6691,7 +6692,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:6694: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:6695: 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.
+@@ -6701,10 +6702,10 @@
+ else
+   with_termlib=no
+ fi;
+-echo "$as_me:6704: result: $with_termlib" >&5
++echo "$as_me:6705: result: $with_termlib" >&5
+ echo "${ECHO_T}$with_termlib" >&6
+ 
+-echo "$as_me:6707: checking if you want to build a separate tic library" >&5
++echo "$as_me:6708: 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.
+@@ -6714,7 +6715,7 @@
+ else
+   with_ticlib=no
+ fi;
+-echo "$as_me:6717: result: $with_ticlib" >&5
++echo "$as_me:6718: result: $with_ticlib" >&5
+ echo "${ECHO_T}$with_ticlib" >&6
+ 
+ if test X"$CC_G_OPT" = X"" ; then
+@@ -6727,7 +6728,7 @@
+ 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
+ fi
+ 
+-echo "$as_me:6730: checking for default loader flags" >&5
++echo "$as_me:6731: 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=''   ;;
+@@ -6736,13 +6737,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:6739: result: ${LD_MODEL:-(none)}" >&5
++echo "$as_me:6740: result: ${LD_MODEL:-(none)}" >&5
+ echo "${ECHO_T}${LD_MODEL:-(none)}" >&6
+ 
+ case "$DFT_LWR_MODEL" in
+ (shared)
+ 
+-echo "$as_me:6745: checking if rpath option should be used" >&5
++echo "$as_me:6746: 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.
+@@ -6752,10 +6753,10 @@
+ else
+   cf_cv_enable_rpath=no
+ fi;
+-echo "$as_me:6755: result: $cf_cv_enable_rpath" >&5
++echo "$as_me:6756: result: $cf_cv_enable_rpath" >&5
+ echo "${ECHO_T}$cf_cv_enable_rpath" >&6
+ 
+-echo "$as_me:6758: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:6759: 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.
+@@ -6765,7 +6766,7 @@
+ else
+   cf_cv_do_relink=yes
+ fi;
+-echo "$as_me:6768: result: $cf_cv_do_relink" >&5
++echo "$as_me:6769: result: $cf_cv_do_relink" >&5
+ echo "${ECHO_T}$cf_cv_do_relink" >&6
+ 	;;
+ esac
+@@ -6776,7 +6777,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:6779: checking for an rpath option" >&5
++	echo "$as_me:6780: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -6807,12 +6808,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:6810: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:6811: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:6815: checking if we need a space after rpath option" >&5
++		echo "$as_me:6816: 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"
+ 
+@@ -6833,7 +6834,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6836 "configure"
++#line 6837 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -6845,16 +6846,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6848: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6849: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6851: \$? = $ac_status" >&5
++  echo "$as_me:6852: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6854: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6855: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6857: \$? = $ac_status" >&5
++  echo "$as_me:6858: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -6864,7 +6865,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:6867: result: $cf_rpath_space" >&5
++		echo "$as_me:6868: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -6886,7 +6887,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:6889: checking whether to use release or ABI version in shared library file names" >&5
++	echo "$as_me:6890: checking whether to use release or ABI version in shared library file names" >&5
+ echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
+ 
+ # Check whether --with-shlib-version or --without-shlib-version was given.
+@@ -6901,9 +6902,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:6904: result: $withval" >&5
++		echo "$as_me:6905: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:6906: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:6907: 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; }; }
+ 		;;
+@@ -6912,7 +6913,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:6915: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:6916: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -6935,14 +6936,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:6938: checking which $CC option to use" >&5
++		echo "$as_me:6939: 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 6945 "configure"
++#line 6946 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6954,16 +6955,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6957: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6958: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6960: \$? = $ac_status" >&5
++  echo "$as_me:6961: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6963: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6964: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6966: \$? = $ac_status" >&5
++  echo "$as_me:6967: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -6972,7 +6973,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		done
+-		echo "$as_me:6975: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:6976: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -7043,7 +7044,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:7046: checking if ld -search_paths_first works" >&5
++		echo "$as_me:7047: 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
+@@ -7052,7 +7053,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7055 "configure"
++#line 7056 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -7064,16 +7065,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7067: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7068: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7070: \$? = $ac_status" >&5
++  echo "$as_me:7071: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7073: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7074: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7076: \$? = $ac_status" >&5
++  echo "$as_me:7077: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -7084,7 +7085,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:7087: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:7088: 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"
+@@ -7434,7 +7435,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7437 "configure"
++#line 7438 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7446,16 +7447,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7449: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7450: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7452: \$? = $ac_status" >&5
++  echo "$as_me:7453: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7455: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7456: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7458: \$? = $ac_status" >&5
++  echo "$as_me:7459: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -7492,7 +7493,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:7495: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:7496: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -7502,7 +7503,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <
+ int main(int argc, char *argv[])
+ {
+@@ -7514,18 +7515,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:7517: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:7518: 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:7519: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:7520: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7522: \$? = $ac_status" >&5
++  echo "$as_me:7523: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-				echo "$as_me:7524: result: yes" >&5
++				echo "$as_me:7525: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:7528: result: no" >&5
++				echo "$as_me:7529: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -7540,17 +7541,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:7543: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:7544: 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}:7547: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7548: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ for model in $cf_list_models ; do
+ 	case "$model" in
+ 	(libtool)
+ 
+-echo "$as_me:7553: checking for additional libtool options" >&5
++echo "$as_me:7554: 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.
+@@ -7560,7 +7561,7 @@
+ else
+   with_libtool_opts=no
+ fi;
+-echo "$as_me:7563: result: $with_libtool_opts" >&5
++echo "$as_me:7564: result: $with_libtool_opts" >&5
+ echo "${ECHO_T}$with_libtool_opts" >&6
+ 
+ case .$with_libtool_opts in
+@@ -7571,7 +7572,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:7574: checking if exported-symbols file should be used" >&5
++echo "$as_me:7575: 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.
+@@ -7586,7 +7587,7 @@
+ 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
+ 
+ fi
+-echo "$as_me:7589: result: $with_export_syms" >&5
++echo "$as_me:7590: result: $with_export_syms" >&5
+ echo "${ECHO_T}$with_export_syms" >&6
+ if test "x$with_export_syms" != xno
+ then
+@@ -7597,15 +7598,15 @@
+ 		;;
+ 	(shared)
+ 		if test "$CC_SHARED_OPTS" = "unknown"; then
+-			{ { echo "$as_me:7600: error: Shared libraries are not supported in this version" >&5
++			{ { echo "$as_me:7601: 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:7605: checking if current CFLAGS link properly" >&5
++		echo "$as_me:7606: 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 7608 "configure"
++#line 7609 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7617,16 +7618,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7620: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7621: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7623: \$? = $ac_status" >&5
++  echo "$as_me:7624: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7626: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7627: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7629: \$? = $ac_status" >&5
++  echo "$as_me:7630: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cflags_work=yes
+ else
+@@ -7635,18 +7636,21 @@
+ cf_cflags_work=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:7638: result: $cf_cflags_work" >&5
++		echo "$as_me:7639: 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}:7644: testing try to work around by appending shared-options ..." 1>&5
++echo "${as_me:-configure}:7645: testing try to work around by appending shared-options ..." 1>&5
+ 
+ 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
+ 		fi
+ 
+-echo "$as_me:7649: checking if versioned-symbols file should be used" >&5
++if test "$with_libtool" = "yes" ; then
++	:
++elif test "$with_shared" = "yes" ; then
++echo "$as_me:7653: 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.
+@@ -7664,18 +7668,18 @@
+ (xno)
+ 	;;
+ (x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+-	test -f "$with_versioned_syms" || { { echo "$as_me:7667: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:7671: 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:7672: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:7676: 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:7678: result: $with_versioned_syms" >&5
++echo "$as_me:7682: result: $with_versioned_syms" >&5
+ echo "${ECHO_T}$with_versioned_syms" >&6
+ 
+ RESULTING_SYMS=
+@@ -7691,7 +7695,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}:7694: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7698: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*-dy\ *)
+@@ -7699,11 +7703,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}:7702: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7706: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:7706: WARNING: this system does not support versioned-symbols" >&5
++		{ echo "$as_me:7710: WARNING: this system does not support versioned-symbols" >&5
+ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
+ 		;;
+ 	esac
+@@ -7715,7 +7719,7 @@
+ 	# symbols.
+ 	if test "x$VERSIONED_SYMS" != "x"
+ 	then
+-		echo "$as_me:7718: checking if wildcards can be used to selectively omit symbols" >&5
++		echo "$as_me:7722: 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
+ 
+@@ -7752,7 +7756,7 @@
+ } submodule_1.0;
+ EOF
+ 		cat >conftest.$ac_ext <&5
++		echo "$as_me:7790: result: $WILDCARD_SYMS" >&5
+ echo "${ECHO_T}$WILDCARD_SYMS" >&6
+ 		rm -f conftest.*
+ 	fi
+ fi
+ 
++fi
++
+ 		;;
+ 	esac
+ done
+@@ -7796,7 +7802,7 @@
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+ 
+-echo "$as_me:7799: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:7805: 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.
+@@ -7806,27 +7812,27 @@
+ else
+   with_gpm=maybe
+ fi;
+-echo "$as_me:7809: result: $with_gpm" >&5
++echo "$as_me:7815: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7813: checking for gpm.h" >&5
++	echo "$as_me:7819: 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 7819 "configure"
++#line 7825 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:7823: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7829: \"$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:7829: \$? = $ac_status" >&5
++  echo "$as_me:7835: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7845,7 +7851,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7848: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:7854: 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
+ 
+@@ -7856,7 +7862,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}:7859: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:7865: testing assuming we really have GPM library ..." 1>&5
+ 
+ cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+@@ -7864,7 +7870,7 @@
+ 
+ 			with_gpm=yes
+ 		else
+-			echo "$as_me:7867: checking for Gpm_Open in -lgpm" >&5
++			echo "$as_me:7873: 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
+@@ -7872,7 +7878,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7875 "configure"
++#line 7881 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7891,16 +7897,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7894: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7900: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7897: \$? = $ac_status" >&5
++  echo "$as_me:7903: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7900: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7906: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7903: \$? = $ac_status" >&5
++  echo "$as_me:7909: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -7911,18 +7917,18 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7914: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:7920: 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:7921: WARNING: Cannot link with GPM library" >&5
++					{ echo "$as_me:7927: WARNING: Cannot link with GPM library" >&5
+ echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
+ 					with_gpm=no
+ 				else
+-					{ { echo "$as_me:7925: error: Cannot link with GPM library" >&5
++					{ { echo "$as_me:7931: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+    { (exit 1); exit 1; }; }
+ 				fi
+@@ -7933,7 +7939,7 @@
+ 
+ else
+ 
+-		test "$with_gpm" != maybe && { echo "$as_me:7936: WARNING: Cannot find GPM header" >&5
++		test "$with_gpm" != maybe && { echo "$as_me:7942: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ 		with_gpm=no
+ 
+@@ -7942,7 +7948,7 @@
+ fi
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7945: checking if you want to load GPM dynamically" >&5
++	echo "$as_me:7951: 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.
+@@ -7952,18 +7958,18 @@
+ else
+   with_dlsym=yes
+ fi;
+-	echo "$as_me:7955: result: $with_dlsym" >&5
++	echo "$as_me:7961: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ 	if test "x$with_dlsym" = xyes ; then
+ 
+ cf_have_dlsym=no
+-echo "$as_me:7960: checking for dlsym" >&5
++echo "$as_me:7966: 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 7966 "configure"
++#line 7972 "configure"
+ #include "confdefs.h"
+ #define dlsym autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7994,16 +8000,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7997: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8003: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8000: \$? = $ac_status" >&5
++  echo "$as_me:8006: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8003: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8009: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8006: \$? = $ac_status" >&5
++  echo "$as_me:8012: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_dlsym=yes
+ else
+@@ -8013,14 +8019,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8016: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:8022: 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:8023: checking for dlsym in -ldl" >&5
++echo "$as_me:8029: 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
+@@ -8028,7 +8034,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8031 "configure"
++#line 8037 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8047,16 +8053,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8050: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8056: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8053: \$? = $ac_status" >&5
++  echo "$as_me:8059: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8056: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8062: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8059: \$? = $ac_status" >&5
++  echo "$as_me:8065: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dl_dlsym=yes
+ else
+@@ -8067,7 +8073,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8070: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:8076: 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
+ 
+@@ -8096,10 +8102,10 @@
+ LIBS="$cf_add_libs"
+  }
+ 
+-	echo "$as_me:8099: checking whether able to link to dl*() functions" >&5
++	echo "$as_me:8105: 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 8102 "configure"
++#line 8108 "configure"
+ #include "confdefs.h"
+ 
+ 	#include 
+@@ -8120,16 +8126,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8123: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8129: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8126: \$? = $ac_status" >&5
++  echo "$as_me:8132: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8129: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8135: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8132: \$? = $ac_status" >&5
++  echo "$as_me:8138: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ cat >>confdefs.h <<\EOF
+@@ -8140,15 +8146,15 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-		{ { echo "$as_me:8143: error: Cannot link test program for libdl" >&5
++		{ { echo "$as_me:8149: 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:8148: result: ok" >&5
++	echo "$as_me:8154: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+-	{ { echo "$as_me:8151: error: Cannot find dlsym function" >&5
++	{ { echo "$as_me:8157: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8156,12 +8162,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}:8159: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:8165: testing assuming soname for gpm is $with_gpm ..." 1>&5
+ 
+ 			cf_cv_gpm_soname="$with_gpm"
+ 		else
+ 
+-echo "$as_me:8164: checking for soname of gpm library" >&5
++echo "$as_me:8170: 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
+@@ -8195,15 +8201,15 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-	if { (eval echo "$as_me:8198: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:8204: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8201: \$? = $ac_status" >&5
++  echo "$as_me:8207: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:8203: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:8209: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8206: \$? = $ac_status" >&5
++  echo "$as_me:8212: \$? = $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
+@@ -8214,7 +8220,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:8217: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:8223: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+ 
+ 		fi
+@@ -8282,7 +8288,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+ 
+-echo "$as_me:8285: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:8291: 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
+@@ -8290,7 +8296,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8293 "configure"
++#line 8299 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8309,16 +8315,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8312: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8318: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8315: \$? = $ac_status" >&5
++  echo "$as_me:8321: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8318: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8324: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8321: \$? = $ac_status" >&5
++  echo "$as_me:8327: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -8329,11 +8335,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8332: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:8338: 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:8336: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:8342: 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
+@@ -8357,15 +8363,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:8360: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:8366: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8363: \$? = $ac_status" >&5
++  echo "$as_me:8369: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:8365: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:8371: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8368: \$? = $ac_status" >&5
++  echo "$as_me:8374: \$? = $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
+@@ -8377,11 +8383,11 @@
+ fi
+ 
+ fi
+-echo "$as_me:8380: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:8386: 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:8384: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++	{ echo "$as_me:8390: 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
+ 
+@@ -8389,7 +8395,7 @@
+ 
+ fi
+ 
+-echo "$as_me:8392: checking if you want to use PCRE2 for regular-expressions" >&5
++echo "$as_me:8398: 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.
+@@ -8398,7 +8404,7 @@
+ 
+ fi;
+ test -z "$with_pcre2" && with_pcre2=no
+-echo "$as_me:8401: result: $with_pcre2" >&5
++echo "$as_me:8407: result: $with_pcre2" >&5
+ echo "${ECHO_T}$with_pcre2" >&6
+ 
+ if test "x$with_pcre2" != xno ; then
+@@ -8409,17 +8415,31 @@
+ 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}:8412: testing found package $cf_with_pcre2 ..." 1>&5
++echo "${as_me:-configure}:8418: 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}:8418: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:8424: 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}:8422: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:8428: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
++
++for cf_required in $cf_with_pcre2
++do
++	# check for duplicates
++	for cf_require_pkg in $REQUIRE_PKG
++	do
++		if test "$cf_required" = "$cf_require_pkg"
++		then
++			cf_required=
++			break
++		fi
++	done
++	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
++done
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -8543,7 +8563,7 @@
+ fi
+ 
+ 	done
+-	cf_with_pcre2_ok=yes || { { echo "$as_me:8546: error: Cannot find PCRE2 library" >&5
++	cf_with_pcre2_ok=yes || { { echo "$as_me:8566: error: Cannot find PCRE2 library" >&5
+ echo "$as_me: error: Cannot find PCRE2 library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -8556,7 +8576,7 @@
+ 	(*pcre2-posix*|*pcreposix*)
+ 		;;
+ 	(*)
+-		echo "$as_me:8559: checking for regcomp in -lpcre2-posix" >&5
++		echo "$as_me:8579: 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
+@@ -8564,7 +8584,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcre2-posix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8567 "configure"
++#line 8587 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8583,16 +8603,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8586: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8606: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8589: \$? = $ac_status" >&5
++  echo "$as_me:8609: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8592: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8612: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8595: \$? = $ac_status" >&5
++  echo "$as_me:8615: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcre2_posix_regcomp=yes
+ else
+@@ -8603,7 +8623,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8606: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
++echo "$as_me:8626: 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
+ 
+@@ -8624,7 +8644,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  echo "$as_me:8627: checking for regcomp in -lpcreposix" >&5
++  echo "$as_me:8647: 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
+@@ -8632,7 +8652,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcreposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8635 "configure"
++#line 8655 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8651,16 +8671,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8654: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8674: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8657: \$? = $ac_status" >&5
++  echo "$as_me:8677: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8660: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8680: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8663: \$? = $ac_status" >&5
++  echo "$as_me:8683: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcreposix_regcomp=yes
+ else
+@@ -8671,7 +8691,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8674: result: $ac_cv_lib_pcreposix_regcomp" >&5
++echo "$as_me:8694: 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
+ 
+@@ -8692,7 +8712,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  { { echo "$as_me:8695: error: Cannot find PCRE2 POSIX library" >&5
++  { { echo "$as_me:8715: error: Cannot find PCRE2 POSIX library" >&5
+ echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8707,23 +8727,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:8710: checking for $ac_header" >&5
++echo "$as_me:8730: 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 8716 "configure"
++#line 8736 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8720: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8740: \"$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:8726: \$? = $ac_status" >&5
++  echo "$as_me:8746: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8742,7 +8762,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8745: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8765: 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:8778: 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 8764 "configure"
++#line 8784 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -8792,16 +8812,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8795: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8815: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8798: \$? = $ac_status" >&5
++  echo "$as_me:8818: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8801: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8821: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8804: \$? = $ac_status" >&5
++  echo "$as_me:8824: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -8811,7 +8831,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8814: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:8834: 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:8828: checking if you want to use sysmouse" >&5
++echo "$as_me:8848: 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.
+@@ -8837,7 +8857,7 @@
+ fi;
+ 	if test "$cf_with_sysmouse" != no ; then
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8840 "configure"
++#line 8860 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8860,16 +8880,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8863: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8883: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8866: \$? = $ac_status" >&5
++  echo "$as_me:8886: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8869: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8889: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8872: \$? = $ac_status" >&5
++  echo "$as_me:8892: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_with_sysmouse=yes
+ else
+@@ -8879,7 +8899,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	fi
+-echo "$as_me:8882: result: $cf_with_sysmouse" >&5
++echo "$as_me:8902: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -8889,7 +8909,7 @@
+ fi
+ 
+ # pretend that ncurses==ncursesw==ncursest
+-echo "$as_me:8892: checking if you want to disable library suffixes" >&5
++echo "$as_me:8912: 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.
+@@ -8906,13 +8926,13 @@
+ 	disable_lib_suffixes=no
+ 
+ fi;
+-echo "$as_me:8909: result: $disable_lib_suffixes" >&5
++echo "$as_me:8929: 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:8915: checking if rpath-hack should be disabled" >&5
++echo "$as_me:8935: 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.
+@@ -8930,22 +8950,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:8933: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:8953: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:8938: checking for updated LDFLAGS" >&5
++echo "$as_me:8958: 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:8941: result: maybe" >&5
++	echo "$as_me:8961: 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:8948: checking for $ac_word" >&5
++echo "$as_me:8968: 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
+@@ -8960,7 +8980,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:8963: found $ac_dir/$ac_word" >&5
++echo "$as_me:8983: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8968,10 +8988,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:8971: result: $cf_ldd_prog" >&5
++  echo "$as_me:8991: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:8974: result: no" >&5
++  echo "$as_me:8994: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8985,7 +9005,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8988 "configure"
++#line 9008 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8997,16 +9017,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9000: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9020: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9003: \$? = $ac_status" >&5
++  echo "$as_me:9023: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9006: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9026: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9009: \$? = $ac_status" >&5
++  echo "$as_me:9029: \$? = $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`
+@@ -9034,7 +9054,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:9037: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:9057: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -9046,11 +9066,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9049: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9069: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9053: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9073: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -9087,7 +9107,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:9090: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9110: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -9100,11 +9120,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9103: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9123: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:9107: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9127: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -9141,7 +9161,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:9144: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9164: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -9154,14 +9174,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:9157: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9177: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9161: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9181: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:9164: result: no" >&5
++	echo "$as_me:9184: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9175,7 +9195,7 @@
+ EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
+ if test -n "$EXTRA_PKG_LDFLAGS"
+ then
+-	echo "$as_me:9178: checking if you want to disable extra LDFLAGS for package-scripts" >&5
++	echo "$as_me:9198: 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.
+@@ -9192,7 +9212,7 @@
+ 	disable_pkg_ldflags=no
+ 
+ fi;
+-	echo "$as_me:9195: result: $disable_pkg_ldflags" >&5
++	echo "$as_me:9215: result: $disable_pkg_ldflags" >&5
+ echo "${ECHO_T}$disable_pkg_ldflags" >&6
+ 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
+ fi
+@@ -9200,7 +9220,7 @@
+ ###############################################################################
+ 
+ ###	use option --with-extra-suffix to append suffix to headers and libraries
+-echo "$as_me:9203: checking for extra suffix to append to header/library paths" >&5
++echo "$as_me:9223: checking for extra suffix to append to header/library paths" >&5
+ echo $ECHO_N "checking for extra suffix to append to header/library paths... $ECHO_C" >&6
+ EXTRA_SUFFIX=
+ 
+@@ -9219,11 +9239,11 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:9222: result: ${EXTRA_SUFFIX:-(none)}" >&5
++echo "$as_me:9242: result: ${EXTRA_SUFFIX:-(none)}" >&5
+ echo "${ECHO_T}${EXTRA_SUFFIX:-(none)}" >&6
+ 
+ ###	use option --disable-overwrite to leave out the link to -lcurses
+-echo "$as_me:9226: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:9246: 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.
+@@ -9233,10 +9253,10 @@
+ else
+   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:9236: result: $with_overwrite" >&5
++echo "$as_me:9256: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+ 
+-echo "$as_me:9239: checking if external terminfo-database is used" >&5
++echo "$as_me:9259: 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.
+@@ -9246,7 +9266,7 @@
+ else
+   use_database=yes
+ fi;
+-echo "$as_me:9249: result: $use_database" >&5
++echo "$as_me:9269: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+ 
+ case "$host_os" in
+@@ -9262,7 +9282,7 @@
+ if test "$use_database" != no ; then
+ 	NCURSES_USE_DATABASE=1
+ 
+-	echo "$as_me:9265: checking which terminfo source-file will be installed" >&5
++	echo "$as_me:9285: 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.
+@@ -9270,10 +9290,10 @@
+   withval="$with_database"
+   TERMINFO_SRC=$withval
+ fi;
+-	echo "$as_me:9273: result: $TERMINFO_SRC" >&5
++	echo "$as_me:9293: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+ 
+-	echo "$as_me:9276: checking whether to use hashed database instead of directory/tree" >&5
++	echo "$as_me:9296: 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.
+@@ -9283,13 +9303,13 @@
+ else
+   with_hashed_db=no
+ fi;
+-	echo "$as_me:9286: result: $with_hashed_db" >&5
++	echo "$as_me:9306: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ 	with_hashed_db=no
+ fi
+ 
+-echo "$as_me:9292: checking for list of fallback terminal descriptions" >&5
++echo "$as_me:9312: checking for list of fallback terminal descriptions" >&5
+ echo $ECHO_N "checking for list of fallback terminal descriptions... $ECHO_C" >&6
+ 
+ # Check whether --with-fallbacks or --without-fallbacks was given.
+@@ -9299,7 +9319,7 @@
+ else
+   with_fallback=
+ fi;
+-echo "$as_me:9302: result: ${with_fallback:-(none)}" >&5
++echo "$as_me:9322: result: ${with_fallback:-(none)}" >&5
+ echo "${ECHO_T}${with_fallback:-(none)}" >&6
+ 
+ case ".$with_fallback" in
+@@ -9307,7 +9327,7 @@
+ 	FALLBACK_LIST=
+ 	;;
+ (.yes)
+-	{ echo "$as_me:9310: WARNING: expected a list of terminal descriptions" >&5
++	{ echo "$as_me:9330: WARNING: expected a list of terminal descriptions" >&5
+ echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
+ 	;;
+ (*)
+@@ -9323,7 +9343,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:9326: checking for $ac_word" >&5
++echo "$as_me:9346: 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
+@@ -9338,7 +9358,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:9341: found $ac_dir/$ac_word" >&5
++echo "$as_me:9361: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9346,10 +9366,10 @@
+ fi
+ TIC=$ac_cv_prog_TIC
+ if test -n "$TIC"; then
+-  echo "$as_me:9349: result: $TIC" >&5
++  echo "$as_me:9369: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:9352: result: no" >&5
++  echo "$as_me:9372: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9358,7 +9378,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:9361: checking for $ac_word" >&5
++echo "$as_me:9381: 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
+@@ -9373,7 +9393,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:9376: found $ac_dir/$ac_word" >&5
++echo "$as_me:9396: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9381,10 +9401,10 @@
+ fi
+ ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
+ if test -n "$ac_ct_TIC"; then
+-  echo "$as_me:9384: result: $ac_ct_TIC" >&5
++  echo "$as_me:9404: result: $ac_ct_TIC" >&5
+ echo "${ECHO_T}$ac_ct_TIC" >&6
+ else
+-  echo "$as_me:9387: result: no" >&5
++  echo "$as_me:9407: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9396,7 +9416,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:9399: checking for $ac_word" >&5
++echo "$as_me:9419: 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
+@@ -9411,7 +9431,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:9414: found $ac_dir/$ac_word" >&5
++echo "$as_me:9434: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9419,10 +9439,10 @@
+ fi
+ INFOCMP=$ac_cv_prog_INFOCMP
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:9422: result: $INFOCMP" >&5
++  echo "$as_me:9442: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:9425: result: no" >&5
++  echo "$as_me:9445: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9431,7 +9451,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:9434: checking for $ac_word" >&5
++echo "$as_me:9454: 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
+@@ -9446,7 +9466,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:9449: found $ac_dir/$ac_word" >&5
++echo "$as_me:9469: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9454,10 +9474,10 @@
+ fi
+ ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
+ if test -n "$ac_ct_INFOCMP"; then
+-  echo "$as_me:9457: result: $ac_ct_INFOCMP" >&5
++  echo "$as_me:9477: result: $ac_ct_INFOCMP" >&5
+ echo "${ECHO_T}$ac_ct_INFOCMP" >&6
+ else
+-  echo "$as_me:9460: result: no" >&5
++  echo "$as_me:9480: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9472,10 +9492,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:9475: checking for tic program for fallbacks" >&5
++  echo "$as_me:9495: checking for tic program for fallbacks" >&5
+ echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
+ 		TIC=$withval
+-		echo "$as_me:9478: result: $TIC" >&5
++		echo "$as_me:9498: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -9501,7 +9521,7 @@
+ 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9504: error: expected a pathname, not \"$TIC\"" >&5
++	{ { echo "$as_me:9524: error: expected a pathname, not \"$TIC\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9514,7 +9534,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:9517: checking for $ac_word" >&5
++echo "$as_me:9537: 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
+@@ -9531,7 +9551,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:9534: found $ac_dir/$ac_word" >&5
++   echo "$as_me:9554: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -9542,10 +9562,10 @@
+ TIC=$ac_cv_path_TIC
+ 
+ if test -n "$TIC"; then
+-  echo "$as_me:9545: result: $TIC" >&5
++  echo "$as_me:9565: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:9548: result: no" >&5
++  echo "$as_me:9568: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9602,7 +9622,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:9605: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9625: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:9640: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -9626,10 +9646,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:9629: checking for infocmp program for fallbacks" >&5
++  echo "$as_me:9649: checking for infocmp program for fallbacks" >&5
+ echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
+ 		INFOCMP=$withval
+-		echo "$as_me:9632: result: $INFOCMP" >&5
++		echo "$as_me:9652: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -9655,7 +9675,7 @@
+ 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9658: error: expected a pathname, not \"$INFOCMP\"" >&5
++	{ { echo "$as_me:9678: error: expected a pathname, not \"$INFOCMP\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9668,7 +9688,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:9671: checking for $ac_word" >&5
++echo "$as_me:9691: 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
+@@ -9685,7 +9705,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:9688: found $ac_dir/$ac_word" >&5
++   echo "$as_me:9708: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -9696,10 +9716,10 @@
+ INFOCMP=$ac_cv_path_INFOCMP
+ 
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:9699: result: $INFOCMP" >&5
++  echo "$as_me:9719: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:9702: result: no" >&5
++  echo "$as_me:9722: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9756,7 +9776,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:9759: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9779: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:9794: WARNING: no infocmp program found for fallbacks" >&5
+ echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -9781,7 +9801,7 @@
+ 	test -z "$INFOCMP" && FALLBACK_LIST=
+ 	if test -z "$FALLBACK_LIST"
+ 	then
+-		{ echo "$as_me:9784: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
++		{ echo "$as_me:9804: 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
+@@ -9789,7 +9809,7 @@
+ USE_FALLBACKS=
+ test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
+ 
+-echo "$as_me:9792: checking if you want modern xterm or antique" >&5
++echo "$as_me:9812: 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.
+@@ -9803,12 +9823,12 @@
+ (no) with_xterm_new=xterm-old;;
+ (*)	 with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:9806: result: $with_xterm_new" >&5
++echo "$as_me:9826: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+ 
+ case $host_os in
+-(*linux-gnu|*cygwin|*mingw32|*msys)
++(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc|linux*musl)
+ 	want_xterm_kbs=DEL
+ 	;;
+ (*)
+@@ -9816,7 +9836,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9819: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:9839: 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.
+@@ -9840,13 +9860,13 @@
+ 	with_xterm_kbs=$withval
+ 	;;
+ esac
+-echo "$as_me:9843: result: $with_xterm_kbs" >&5
++echo "$as_me:9863: result: $with_xterm_kbs" >&5
+ echo "${ECHO_T}$with_xterm_kbs" >&6
+ XTERM_KBS=$with_xterm_kbs
+ 
+ if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
+ then
+-	{ echo "$as_me:9849: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
++	{ echo "$as_me:9869: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
+ echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;}
+ fi
+ 
+@@ -9856,7 +9876,7 @@
+ 	MAKE_TERMINFO="#"
+ else
+ 
+-echo "$as_me:9859: checking for list of terminfo directories" >&5
++echo "$as_me:9879: 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.
+@@ -9894,7 +9914,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9897: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:9917: 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; }; }
+ 	;;
+@@ -9917,7 +9937,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9920: result: $TERMINFO_DIRS" >&5
++echo "$as_me:9940: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <&5
++	{ echo "$as_me:9949: 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:9935: checking for default terminfo directory" >&5
++echo "$as_me:9955: 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.
+@@ -9966,7 +9986,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9969: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:9989: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9975,7 +9995,7 @@
+ fi
+ eval TERMINFO="$withval"
+ 
+-echo "$as_me:9978: result: $TERMINFO" >&5
++echo "$as_me:9998: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:10009: 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.
+@@ -9998,7 +10018,7 @@
+   with_big_core=no
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10001 "configure"
++#line 10021 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10012,15 +10032,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10015: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10035: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10018: \$? = $ac_status" >&5
++  echo "$as_me:10038: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10040: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10023: \$? = $ac_status" >&5
++  echo "$as_me:10043: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_big_core=yes
+ else
+@@ -10032,7 +10052,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi;
+-echo "$as_me:10035: result: $with_big_core" >&5
++echo "$as_me:10055: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10042,7 +10062,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:10045: checking if big-strings option selected" >&5
++echo "$as_me:10065: 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.
+@@ -10066,14 +10086,14 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:10069: result: $with_big_strings" >&5
++echo "$as_me:10089: 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:10076: checking if you want termcap-fallback support" >&5
++echo "$as_me:10096: 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.
+@@ -10083,14 +10103,14 @@
+ else
+   with_termcap=no
+ fi;
+-echo "$as_me:10086: result: $with_termcap" >&5
++echo "$as_me:10106: 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:10093: error: You have disabled the database w/o specifying fallbacks" >&5
++			{ { echo "$as_me:10113: 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
+@@ -10103,13 +10123,13 @@
+ else
+ 
+ 	if test "$with_ticlib" != no ; then
+-		{ { echo "$as_me:10106: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++		{ { echo "$as_me:10126: 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:10112: checking for list of termcap files" >&5
++	echo "$as_me:10132: 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.
+@@ -10147,7 +10167,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:10150: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:10170: 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; }; }
+ 	;;
+@@ -10170,7 +10190,7 @@
+ 	;;
+ esac
+ 
+-	echo "$as_me:10173: result: $TERMPATH" >&5
++	echo "$as_me:10193: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ 	test -n "$TERMPATH" &&
+ cat >>confdefs.h <&5
++	echo "$as_me:10201: 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.
+@@ -10188,14 +10208,14 @@
+ else
+   with_getcap=no
+ fi;
+-	echo "$as_me:10191: result: $with_getcap" >&5
++	echo "$as_me:10211: 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:10198: checking if translated termcaps will be cached in ~/.terminfo" >&5
++	echo "$as_me:10218: 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.
+@@ -10205,7 +10225,7 @@
+ else
+   with_getcap_cache=no
+ fi;
+-	echo "$as_me:10208: result: $with_getcap_cache" >&5
++	echo "$as_me:10228: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ 	test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10215,7 +10235,7 @@
+ fi
+ 
+ ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:10218: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:10238: 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.
+@@ -10225,14 +10245,14 @@
+ else
+   with_home_terminfo=yes
+ fi;
+-echo "$as_me:10228: result: $with_home_terminfo" >&5
++echo "$as_me:10248: 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:10235: checking if you want to permit root to use ncurses environment variables" >&5
++echo "$as_me:10255: 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.
+@@ -10242,14 +10262,14 @@
+ else
+   with_root_environ=yes
+ fi;
+-echo "$as_me:10245: result: $with_root_environ" >&5
++echo "$as_me:10265: 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:10252: checking if you want to permit setuid programs to access all files" >&5
++echo "$as_me:10272: 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-access or --disable-root-access was given.
+@@ -10259,14 +10279,14 @@
+ else
+   with_root_access=yes
+ fi;
+-echo "$as_me:10262: result: $with_root_access" >&5
++echo "$as_me:10282: result: $with_root_access" >&5
+ echo "${ECHO_T}$with_root_access" >&6
+ test "x$with_root_access" = xyes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_ROOT_ACCESS 1
+ EOF
+ 
+-echo "$as_me:10269: checking if you want to permit setuid use of ncurses environment variables" >&5
++echo "$as_me:10289: checking if you want to permit setuid use of ncurses environment variables" >&5
+ echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
+ 
+ # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
+@@ -10276,7 +10296,7 @@
+ else
+   with_setuid_environ=$with_root_environ
+ fi;
+-echo "$as_me:10279: result: $with_setuid_environ" >&5
++echo "$as_me:10299: result: $with_setuid_environ" >&5
+ echo "${ECHO_T}$with_setuid_environ" >&6
+ test "x$with_setuid_environ" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10291,23 +10311,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:10294: checking for $ac_header" >&5
++echo "$as_me:10314: 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 10300 "configure"
++#line 10320 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10304: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:10324: \"$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:10310: \$? = $ac_status" >&5
++  echo "$as_me:10330: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10326,7 +10346,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:10329: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:10349: 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:10364: 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 10350 "configure"
++#line 10370 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10378,16 +10398,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10381: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10401: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10384: \$? = $ac_status" >&5
++  echo "$as_me:10404: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10387: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10407: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10390: \$? = $ac_status" >&5
++  echo "$as_me:10410: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -10397,7 +10417,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10400: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10420: 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:10437: 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 10423 "configure"
++#line 10443 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10451,16 +10471,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10454: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10474: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10457: \$? = $ac_status" >&5
++  echo "$as_me:10477: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10460: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10480: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10463: \$? = $ac_status" >&5
++  echo "$as_me:10483: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -10470,7 +10490,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10473: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10493: 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:10504: 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
+@@ -10494,7 +10514,7 @@
+ 			eval 'ac_cv_func_'$cf_func'=error'
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10497 "configure"
++#line 10517 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -10528,15 +10548,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10531: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10551: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10534: \$? = $ac_status" >&5
++  echo "$as_me:10554: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10536: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10556: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10539: \$? = $ac_status" >&5
++  echo "$as_me:10559: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -10554,7 +10574,7 @@
+ 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+ 
+ fi
+-echo "$as_me:10557: result: $cf_cv_link_funcs" >&5
++echo "$as_me:10577: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ 	test "$ac_cv_func_link"    = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -10574,7 +10594,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:10577: checking if tic should use symbolic links" >&5
++	echo "$as_me:10597: 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.
+@@ -10584,21 +10604,21 @@
+ else
+   with_symlinks=no
+ fi;
+-	echo "$as_me:10587: result: $with_symlinks" >&5
++	echo "$as_me:10607: 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:10594: checking if tic should use hard links" >&5
++	echo "$as_me:10614: 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:10601: result: $with_links" >&5
++	echo "$as_me:10621: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+ 
+@@ -10614,7 +10634,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:10617: checking if you want broken-linker support code" >&5
++echo "$as_me:10637: 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.
+@@ -10624,7 +10644,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:10627: result: $with_broken_linker" >&5
++echo "$as_me:10647: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : "${BROKEN_LINKER:=0}"
+@@ -10638,7 +10658,7 @@
+ fi
+ 
+ ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:10641: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:10661: 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.
+@@ -10648,7 +10668,7 @@
+ else
+   with_bsdpad=no
+ fi;
+-echo "$as_me:10651: result: $with_bsdpad" >&5
++echo "$as_me:10671: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10667,14 +10687,14 @@
+ # Check to define _XOPEN_SOURCE "automatically"
+ CPPFLAGS_before_XOPEN="$CPPFLAGS"
+ 
+-echo "$as_me:10670: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:10690: 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 10677 "configure"
++#line 10697 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10693,16 +10713,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10696: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10716: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10699: \$? = $ac_status" >&5
++  echo "$as_me:10719: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10702: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10722: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10705: \$? = $ac_status" >&5
++  echo "$as_me:10725: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -10713,7 +10733,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10716: result: $cf_cv_posix_visible" >&5
++echo "$as_me:10736: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -10755,14 +10775,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:10758: checking if this is the GNU C library" >&5
++echo "$as_me:10778: 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 10765 "configure"
++#line 10785 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10781,16 +10801,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10784: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10804: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10787: \$? = $ac_status" >&5
++  echo "$as_me:10807: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10790: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10810: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10793: \$? = $ac_status" >&5
++  echo "$as_me:10813: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -10801,7 +10821,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10804: result: $cf_cv_gnu_library" >&5
++echo "$as_me:10824: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -10809,7 +10829,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:10812: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:10832: 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
+@@ -10821,7 +10841,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10824 "configure"
++#line 10844 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10840,16 +10860,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10843: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10863: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10846: \$? = $ac_status" >&5
++  echo "$as_me:10866: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10849: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10869: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10852: \$? = $ac_status" >&5
++  echo "$as_me:10872: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -10861,12 +10881,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:10864: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:10884: 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:10869: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:10889: 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
+@@ -10971,7 +10991,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10974 "configure"
++#line 10994 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -10991,16 +11011,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10994: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11014: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10997: \$? = $ac_status" >&5
++  echo "$as_me:11017: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11000: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11020: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11003: \$? = $ac_status" >&5
++  echo "$as_me:11023: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -11011,7 +11031,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11014: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:11034: 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
+@@ -11020,14 +11040,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:11023: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:11043: 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 11030 "configure"
++#line 11050 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11042,16 +11062,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11045: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11065: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11048: \$? = $ac_status" >&5
++  echo "$as_me:11068: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11051: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11071: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11054: \$? = $ac_status" >&5
++  echo "$as_me:11074: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -11158,7 +11178,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11161 "configure"
++#line 11181 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11173,16 +11193,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11176: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11196: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11179: \$? = $ac_status" >&5
++  echo "$as_me:11199: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11182: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11202: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11185: \$? = $ac_status" >&5
++  echo "$as_me:11205: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -11197,12 +11217,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11200: result: $cf_cv_gnu_source" >&5
++echo "$as_me:11220: 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:11205: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:11225: 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
+@@ -11212,7 +11232,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11215 "configure"
++#line 11235 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11227,16 +11247,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11230: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11250: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11233: \$? = $ac_status" >&5
++  echo "$as_me:11253: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11236: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11256: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11239: \$? = $ac_status" >&5
++  echo "$as_me:11259: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -11247,7 +11267,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11250: result: $cf_cv_default_source" >&5
++echo "$as_me:11270: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -11287,16 +11307,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:11290: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11310: 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}:11296: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11316: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11299 "configure"
++#line 11319 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11311,16 +11331,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11314: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11334: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11317: \$? = $ac_status" >&5
++  echo "$as_me:11337: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11320: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11340: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11323: \$? = $ac_status" >&5
++  echo "$as_me:11343: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11341,7 +11361,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11344 "configure"
++#line 11364 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11356,16 +11376,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11359: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11379: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11362: \$? = $ac_status" >&5
++  echo "$as_me:11382: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11365: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11385: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11368: \$? = $ac_status" >&5
++  echo "$as_me:11388: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11376,7 +11396,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11379: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11399: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11384,10 +11404,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11387: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11407: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11390 "configure"
++#line 11410 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11402,16 +11422,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11405: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11425: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11408: \$? = $ac_status" >&5
++  echo "$as_me:11428: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11411: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11431: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11414: \$? = $ac_status" >&5
++  echo "$as_me:11434: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11427,7 +11447,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11430: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11450: 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
+@@ -11544,7 +11564,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:11547: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:11567: 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
+@@ -11576,14 +11596,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:11579: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:11599: 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 11586 "configure"
++#line 11606 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11601,16 +11621,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11604: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11624: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11607: \$? = $ac_status" >&5
++  echo "$as_me:11627: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11610: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11630: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11613: \$? = $ac_status" >&5
++  echo "$as_me:11633: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11622,7 +11642,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11625 "configure"
++#line 11645 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11640,16 +11660,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11643: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11663: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11646: \$? = $ac_status" >&5
++  echo "$as_me:11666: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11649: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11669: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11652: \$? = $ac_status" >&5
++  echo "$as_me:11672: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11664,7 +11684,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11667: result: $cf_cv_xopen_source" >&5
++echo "$as_me:11687: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -11824,16 +11844,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:11827: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11847: 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}:11833: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11853: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11836 "configure"
++#line 11856 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11848,16 +11868,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11851: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11871: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11854: \$? = $ac_status" >&5
++  echo "$as_me:11874: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11857: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11877: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11860: \$? = $ac_status" >&5
++  echo "$as_me:11880: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11878,7 +11898,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11881 "configure"
++#line 11901 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11893,16 +11913,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11896: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11916: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11899: \$? = $ac_status" >&5
++  echo "$as_me:11919: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11902: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11922: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11905: \$? = $ac_status" >&5
++  echo "$as_me:11925: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11913,7 +11933,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11916: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11936: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11921,10 +11941,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11924: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11944: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11927 "configure"
++#line 11947 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11939,16 +11959,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11942: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11962: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11945: \$? = $ac_status" >&5
++  echo "$as_me:11965: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11948: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11968: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11951: \$? = $ac_status" >&5
++  echo "$as_me:11971: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11964,7 +11984,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11967: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11987: 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
+@@ -12077,10 +12097,10 @@
+ 	if test "$cf_cv_xopen_source" = no ; then
+ 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+ 
+-echo "${as_me:-configure}:12080: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:12100: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12083 "configure"
++#line 12103 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12098,23 +12118,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12101: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12121: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12104: \$? = $ac_status" >&5
++  echo "$as_me:12124: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12107: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12127: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12110: \$? = $ac_status" >&5
++  echo "$as_me:12130: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-			{ echo "$as_me:12117: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++			{ echo "$as_me:12137: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ 			CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -12137,7 +12157,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}:12140: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12160: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -12149,7 +12169,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}:12152: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:12172: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -12237,7 +12257,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:12240: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:12260: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -12247,7 +12267,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:12250: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:12270: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -12257,7 +12277,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}:12260: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:12280: 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"
+@@ -12269,10 +12289,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:12272: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:12292: 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 12275 "configure"
++#line 12295 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12287,16 +12307,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12290: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12310: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12293: \$? = $ac_status" >&5
++  echo "$as_me:12313: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12296: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12316: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12299: \$? = $ac_status" >&5
++  echo "$as_me:12319: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -12305,12 +12325,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:12308: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:12328: 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 12313 "configure"
++#line 12333 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12325,16 +12345,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12328: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12348: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12331: \$? = $ac_status" >&5
++  echo "$as_me:12351: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12334: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12354: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12337: \$? = $ac_status" >&5
++  echo "$as_me:12357: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -12345,19 +12365,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:12348: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:12368: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:12353: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:12373: 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 12360 "configure"
++#line 12380 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12375,16 +12395,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12378: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12398: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12381: \$? = $ac_status" >&5
++  echo "$as_me:12401: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12384: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12404: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12387: \$? = $ac_status" >&5
++  echo "$as_me:12407: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12396,7 +12416,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12399 "configure"
++#line 12419 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12414,16 +12434,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12417: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12437: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12420: \$? = $ac_status" >&5
++  echo "$as_me:12440: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12423: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12443: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12426: \$? = $ac_status" >&5
++  echo "$as_me:12446: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12438,7 +12458,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12441: result: $cf_cv_xopen_source" >&5
++echo "$as_me:12461: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -12589,14 +12609,14 @@
+ 
+ # Work around breakage on OS X
+ 
+-echo "$as_me:12592: checking if SIGWINCH is defined" >&5
++echo "$as_me:12612: 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 12599 "configure"
++#line 12619 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12611,23 +12631,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12614: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12634: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12617: \$? = $ac_status" >&5
++  echo "$as_me:12637: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12620: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12640: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12623: \$? = $ac_status" >&5
++  echo "$as_me:12643: \$? = $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 12630 "configure"
++#line 12650 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -12645,16 +12665,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12648: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12668: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12651: \$? = $ac_status" >&5
++  echo "$as_me:12671: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12654: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12674: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12657: \$? = $ac_status" >&5
++  echo "$as_me:12677: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -12668,11 +12688,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12671: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:12691: 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:12675: checking for actual SIGWINCH definition" >&5
++echo "$as_me:12695: 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
+@@ -12683,7 +12703,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12686 "configure"
++#line 12706 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -12705,16 +12725,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12708: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12728: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12711: \$? = $ac_status" >&5
++  echo "$as_me:12731: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12714: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12734: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12717: \$? = $ac_status" >&5
++  echo "$as_me:12737: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -12728,7 +12748,7 @@
+ done
+ 
+ fi
+-echo "$as_me:12731: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:12751: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -12738,13 +12758,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:12741: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:12761: 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 12747 "configure"
++#line 12767 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12758,16 +12778,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12761: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12781: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12764: \$? = $ac_status" >&5
++  echo "$as_me:12784: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12767: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12787: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12770: \$? = $ac_status" >&5
++  echo "$as_me:12790: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -12778,7 +12798,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12781: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:12801: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test "$am_cv_langinfo_codeset" = yes; then
+ 
+@@ -12792,7 +12812,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+ 
+-echo "$as_me:12795: checking if you want wide-character code" >&5
++echo "$as_me:12815: 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.
+@@ -12802,7 +12822,7 @@
+ else
+   with_widec=$cf_dft_widec
+ fi;
+-echo "$as_me:12805: result: $with_widec" >&5
++echo "$as_me:12825: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ 
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -12824,7 +12844,7 @@
+ 	(*_XOPEN_SOURCE=*)
+ 		;;
+ 	(*)
+-		{ echo "$as_me:12827: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
++		{ echo "$as_me:12847: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
+ 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
+ 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
+@@ -12837,23 +12857,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:12840: checking for $ac_header" >&5
++echo "$as_me:12860: 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 12846 "configure"
++#line 12866 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:12850: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12870: \"$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:12856: \$? = $ac_status" >&5
++  echo "$as_me:12876: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12872,7 +12892,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:12875: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:12895: 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:12905: 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 12892 "configure"
++#line 12912 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12911,16 +12931,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12914: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12934: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12917: \$? = $ac_status" >&5
++  echo "$as_me:12937: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12920: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12940: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12923: \$? = $ac_status" >&5
++  echo "$as_me:12943: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_h_okay=yes
+ else
+@@ -12930,16 +12950,16 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12933: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:12953: 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:12939: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:12959: 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 12942 "configure"
++#line 12962 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12955,16 +12975,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12958: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12978: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12961: \$? = $ac_status" >&5
++  echo "$as_me:12981: \$? = $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:12984: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12967: \$? = $ac_status" >&5
++  echo "$as_me:12987: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=no
+ else
+@@ -12973,16 +12993,16 @@
+ cf_result=yes
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:12976: result: $cf_result" >&5
++echo "$as_me:12996: 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:12982: checking checking for compatible value versus " >&5
++	echo "$as_me:13002: 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 12985 "configure"
++#line 13005 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12998,16 +13018,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13001: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13021: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13004: \$? = $ac_status" >&5
++  echo "$as_me:13024: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13007: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13027: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13010: \$? = $ac_status" >&5
++  echo "$as_me:13030: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -13016,7 +13036,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:13019: result: $cf_result" >&5
++	echo "$as_me:13039: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = no ; then
+ 		# perhaps we can override it - try...
+@@ -13026,7 +13046,7 @@
+ 
+ fi
+ 
+-echo "$as_me:13029: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:13049: 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
+@@ -13097,7 +13117,7 @@
+   cf_cv_wcwidth_graphics=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13100 "configure"
++#line 13120 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13142,15 +13162,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:13145: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13165: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13148: \$? = $ac_status" >&5
++  echo "$as_me:13168: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:13150: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13170: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13153: \$? = $ac_status" >&5
++  echo "$as_me:13173: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wcwidth_graphics=yes
+ else
+@@ -13163,7 +13183,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:13166: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:13186: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+ 
+ 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -13174,13 +13194,13 @@
+ for ac_func in putwc btowc wctob wmemchr 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:13177: checking for $ac_func" >&5
++echo "$as_me:13197: 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 13183 "configure"
++#line 13203 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13211,16 +13231,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13214: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13234: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13217: \$? = $ac_status" >&5
++  echo "$as_me:13237: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13220: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13240: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13223: \$? = $ac_status" >&5
++  echo "$as_me:13243: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -13230,7 +13250,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13233: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:13253: 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:13268: 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 13254 "configure"
++#line 13274 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13258: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:13278: \"$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:13264: \$? = $ac_status" >&5
++  echo "$as_me:13284: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13280,7 +13300,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:13283: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:13303: 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:13313: 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
+@@ -13298,7 +13318,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13301 "configure"
++#line 13321 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13315,16 +13335,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13318: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13338: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13321: \$? = $ac_status" >&5
++  echo "$as_me:13341: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13324: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13344: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13327: \$? = $ac_status" >&5
++  echo "$as_me:13347: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -13336,12 +13356,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:13339: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13359: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13344 "configure"
++#line 13364 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13354,16 +13374,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13357: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13377: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13360: \$? = $ac_status" >&5
++  echo "$as_me:13380: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13363: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13383: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13366: \$? = $ac_status" >&5
++  echo "$as_me:13386: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -13377,7 +13397,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13380 "configure"
++#line 13400 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13390,16 +13410,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13393: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13413: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13396: \$? = $ac_status" >&5
++  echo "$as_me:13416: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13399: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13419: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13402: \$? = $ac_status" >&5
++  echo "$as_me:13422: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -13416,9 +13436,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:13419: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:13439: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:13421: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13441: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13509,7 +13529,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}:13512: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13532: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -13517,7 +13537,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13520 "configure"
++#line 13540 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13530,21 +13550,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13533: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13553: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13536: \$? = $ac_status" >&5
++  echo "$as_me:13556: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13539: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13559: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13542: \$? = $ac_status" >&5
++  echo "$as_me:13562: \$? = $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}:13547: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13567: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13562,7 +13582,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:13565: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13585: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -13637,13 +13657,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}:13640: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13660: 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 13646 "configure"
++#line 13666 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13656,21 +13676,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13659: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13679: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13662: \$? = $ac_status" >&5
++  echo "$as_me:13682: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13665: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13685: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13668: \$? = $ac_status" >&5
++  echo "$as_me:13688: \$? = $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}:13673: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13693: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -13712,7 +13732,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13715: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:13735: 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
+@@ -13750,7 +13770,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13753 "configure"
++#line 13773 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13762,16 +13782,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13765: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13785: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13768: \$? = $ac_status" >&5
++  echo "$as_me:13788: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13771: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13791: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13774: \$? = $ac_status" >&5
++  echo "$as_me:13794: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13788,7 +13808,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}:13791: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:13811: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -13824,7 +13844,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}:13827: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:13847: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -13856,14 +13876,14 @@
+ 	fi
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:13859: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:13879: 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 13866 "configure"
++#line 13886 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13881,23 +13901,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13884: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13904: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13887: \$? = $ac_status" >&5
++  echo "$as_me:13907: \$? = $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:13910: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13893: \$? = $ac_status" >&5
++  echo "$as_me:13913: \$? = $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 13900 "configure"
++#line 13920 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13916,16 +13936,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13919: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13939: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13922: \$? = $ac_status" >&5
++  echo "$as_me:13942: \$? = $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:13945: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13928: \$? = $ac_status" >&5
++  echo "$as_me:13948: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -13937,7 +13957,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13940: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:13960: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -13955,14 +13975,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:13958: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:13978: 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 13965 "configure"
++#line 13985 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13980,23 +14000,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13983: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14003: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13986: \$? = $ac_status" >&5
++  echo "$as_me:14006: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13989: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14009: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13992: \$? = $ac_status" >&5
++  echo "$as_me:14012: \$? = $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 13999 "configure"
++#line 14019 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14015,16 +14035,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14018: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14038: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14021: \$? = $ac_status" >&5
++  echo "$as_me:14041: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14024: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14044: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14027: \$? = $ac_status" >&5
++  echo "$as_me:14047: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -14036,7 +14056,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14039: result: $cf_cv_wchar_t" >&5
++echo "$as_me:14059: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -14059,14 +14079,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:14062: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:14082: 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 14069 "configure"
++#line 14089 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14084,23 +14104,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14087: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14107: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14090: \$? = $ac_status" >&5
++  echo "$as_me:14110: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14093: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14113: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14096: \$? = $ac_status" >&5
++  echo "$as_me:14116: \$? = $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 14103 "configure"
++#line 14123 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14119,16 +14139,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14122: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14142: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14125: \$? = $ac_status" >&5
++  echo "$as_me:14145: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14128: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14148: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14131: \$? = $ac_status" >&5
++  echo "$as_me:14151: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -14140,7 +14160,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14143: result: $cf_cv_wint_t" >&5
++echo "$as_me:14163: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -14172,7 +14192,7 @@
+ fi
+ 
+ ###   use option --disable-lp64 to allow long chtype
+-echo "$as_me:14175: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:14195: 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.
+@@ -14182,7 +14202,7 @@
+ else
+   with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:14185: result: $with_lp64" >&5
++echo "$as_me:14205: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+ 
+ if test "x$with_lp64" = xyes ; then
+@@ -14198,7 +14218,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:14201: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:14221: 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
+@@ -14210,7 +14230,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 14213 "configure"
++#line 14233 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14230,16 +14250,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14233: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14253: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14236: \$? = $ac_status" >&5
++  echo "$as_me:14256: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14239: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14259: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14242: \$? = $ac_status" >&5
++  echo "$as_me:14262: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14249,16 +14269,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14252: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14272: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14255: \$? = $ac_status" >&5
++  echo "$as_me:14275: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14258: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14278: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14261: \$? = $ac_status" >&5
++  echo "$as_me:14281: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -14272,13 +14292,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:14275: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:14295: 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:14281: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:14301: 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
+@@ -14286,7 +14306,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14289 "configure"
++#line 14309 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14306,16 +14326,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14309: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14329: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14312: \$? = $ac_status" >&5
++  echo "$as_me:14332: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14315: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14335: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14318: \$? = $ac_status" >&5
++  echo "$as_me:14338: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14324,7 +14344,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14327 "configure"
++#line 14347 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -14345,16 +14365,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14348: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14368: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14351: \$? = $ac_status" >&5
++  echo "$as_me:14371: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14354: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14374: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14357: \$? = $ac_status" >&5
++  echo "$as_me:14377: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -14365,7 +14385,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14368: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:14388: 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
+ 
+@@ -14375,7 +14395,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:14378: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:14398: 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
+@@ -14383,7 +14403,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14386 "configure"
++#line 14406 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14403,16 +14423,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14406: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14426: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14409: \$? = $ac_status" >&5
++  echo "$as_me:14429: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14412: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14432: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14415: \$? = $ac_status" >&5
++  echo "$as_me:14435: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14421,7 +14441,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14424 "configure"
++#line 14444 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -14442,16 +14462,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14445: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14465: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14448: \$? = $ac_status" >&5
++  echo "$as_me:14468: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14451: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14471: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14454: \$? = $ac_status" >&5
++  echo "$as_me:14474: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -14462,7 +14482,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14465: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:14485: 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
+ 
+@@ -14475,7 +14495,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:14478: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:14498: 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
+@@ -14483,7 +14503,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14486 "configure"
++#line 14506 "configure"
+ #include "confdefs.h"
+ #include 
+     #include 
+@@ -14498,16 +14518,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14501: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14521: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14504: \$? = $ac_status" >&5
++  echo "$as_me:14524: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14507: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14527: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14510: \$? = $ac_status" >&5
++  echo "$as_me:14530: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14516,7 +14536,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14519 "configure"
++#line 14539 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -14532,16 +14552,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14535: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14555: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14538: \$? = $ac_status" >&5
++  echo "$as_me:14558: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14541: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14561: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14544: \$? = $ac_status" >&5
++  echo "$as_me:14564: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -14552,7 +14572,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14555: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:14575: 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
+ 
+@@ -14566,13 +14586,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:14569: checking for fseeko" >&5
++echo "$as_me:14589: 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 14575 "configure"
++#line 14595 "configure"
+ #include "confdefs.h"
+ #include 
+                              #include 
+@@ -14586,16 +14606,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14589: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14609: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14592: \$? = $ac_status" >&5
++  echo "$as_me:14612: \$? = $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:14615: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14598: \$? = $ac_status" >&5
++  echo "$as_me:14618: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -14605,7 +14625,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:14628: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -14644,14 +14664,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:14647: checking whether to use struct dirent64" >&5
++	echo "$as_me:14667: 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 14674 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -14678,16 +14698,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14681: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14701: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14684: \$? = $ac_status" >&5
++  echo "$as_me:14704: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14687: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14707: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14690: \$? = $ac_status" >&5
++  echo "$as_me:14710: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -14698,7 +14718,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14701: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:14721: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -14708,7 +14728,7 @@
+ 	fi
+ 
+ ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:14711: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:14731: 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.
+@@ -14718,14 +14738,14 @@
+ else
+   with_tparm_varargs=yes
+ fi;
+-echo "$as_me:14721: result: $with_tparm_varargs" >&5
++echo "$as_me:14741: 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:14728: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:14748: 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.
+@@ -14735,14 +14755,14 @@
+ else
+   with_tic_depends=yes
+ fi;
+-echo "$as_me:14738: result: $with_tic_depends" >&5
++echo "$as_me:14758: 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:14745: checking if you want to enable wattr* macros" >&5
++echo "$as_me:14765: 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.
+@@ -14754,15 +14774,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ 	NCURSES_WATTR_MACROS=0
+-	echo "$as_me:14757: result: no" >&5
++	echo "$as_me:14777: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ else
+ 	NCURSES_WATTR_MACROS=1
+-	echo "$as_me:14761: result: yes" >&5
++	echo "$as_me:14781: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ fi
+ 
+-echo "$as_me:14765: checking for X11 rgb file" >&5
++echo "$as_me:14785: 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.
+@@ -14824,7 +14844,7 @@
+ 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:14827: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:14847: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14832,7 +14852,7 @@
+ 
+ fi
+ 
+-echo "$as_me:14835: result: $RGB_PATH" >&5
++echo "$as_me:14855: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:14870: 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.
+@@ -14857,17 +14877,17 @@
+ else
+   NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:14860: result: $NCURSES_BOOL" >&5
++echo "$as_me:14880: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ case x$NCURSES_BOOL in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14864: error: expected a type name for bool" >&5
++	{ { echo "$as_me:14884: error: expected a type name for bool" >&5
+ echo "$as_me: error: expected a type name for bool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+-echo "$as_me:14870: checking for alternate terminal capabilities file" >&5
++echo "$as_me:14890: 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.
+@@ -14879,16 +14899,16 @@
+ fi;
+ if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
+ then
+-	{ echo "$as_me:14882: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
++	{ echo "$as_me:14902: 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:14886: result: $TERMINFO_CAPS" >&5
++echo "$as_me:14906: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+ 
+ ###   use option --with-chtype to override chtype's type
+ 
+-echo "$as_me:14891: checking for type of chtype" >&5
++echo "$as_me:14911: 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.
+@@ -14898,11 +14918,11 @@
+ else
+   NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:14901: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:14921: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ case x$NCURSES_CHTYPE in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14905: error: expected a type name for chtype" >&5
++	{ { echo "$as_me:14925: error: expected a type name for chtype" >&5
+ echo "$as_me: error: expected a type name for chtype" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14910,7 +14930,7 @@
+ 
+ ###   use option --with-ospeed to override ospeed's type
+ 
+-echo "$as_me:14913: checking for type of ospeed" >&5
++echo "$as_me:14933: 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.
+@@ -14920,11 +14940,11 @@
+ else
+   NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:14923: result: $NCURSES_OSPEED" >&5
++echo "$as_me:14943: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ case x$NCURSES_OSPEED in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14927: error: expected a type name for ospeed" >&5
++	{ { echo "$as_me:14947: error: expected a type name for ospeed" >&5
+ echo "$as_me: error: expected a type name for ospeed" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14932,7 +14952,7 @@
+ 
+ ###   use option --with-mmask-t to override mmask_t's type
+ 
+-echo "$as_me:14935: checking for type of mmask-t" >&5
++echo "$as_me:14955: 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.
+@@ -14942,18 +14962,18 @@
+ else
+   NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:14945: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:14965: result: $NCURSES_MMASK_T" >&5
+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+ case x$NCURSES_MMASK_T in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14949: error: expected a type name for mmask-t" >&5
++	{ { echo "$as_me:14969: error: expected a type name for mmask-t" >&5
+ echo "$as_me: error: expected a type name for mmask-t" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ ###   use option --with-ccharw-max to override CCHARW_MAX size
+-echo "$as_me:14956: checking for size CCHARW_MAX" >&5
++echo "$as_me:14976: 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.
+@@ -14963,16 +14983,16 @@
+ else
+   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
+ fi;
+-echo "$as_me:14966: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:14986: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+ 
+-echo "$as_me:14969: checking for signed char" >&5
++echo "$as_me:14989: 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 14975 "configure"
++#line 14995 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14987,16 +15007,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14990: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15010: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14993: \$? = $ac_status" >&5
++  echo "$as_me:15013: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14996: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15016: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14999: \$? = $ac_status" >&5
++  echo "$as_me:15019: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -15006,10 +15026,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15009: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:15029: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:15012: checking size of signed char" >&5
++echo "$as_me:15032: 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
+@@ -15018,7 +15038,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15021 "configure"
++#line 15041 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15030,21 +15050,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15033: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15053: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15036: \$? = $ac_status" >&5
++  echo "$as_me:15056: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15039: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15059: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15042: \$? = $ac_status" >&5
++  echo "$as_me:15062: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15047 "configure"
++#line 15067 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15056,16 +15076,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15059: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15079: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15062: \$? = $ac_status" >&5
++  echo "$as_me:15082: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15065: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15085: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15068: \$? = $ac_status" >&5
++  echo "$as_me:15088: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -15081,7 +15101,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15084 "configure"
++#line 15104 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15093,16 +15113,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15096: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15116: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15099: \$? = $ac_status" >&5
++  echo "$as_me:15119: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15102: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15122: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15105: \$? = $ac_status" >&5
++  echo "$as_me:15125: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -15118,7 +15138,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 15121 "configure"
++#line 15141 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15130,16 +15150,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15133: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15153: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15136: \$? = $ac_status" >&5
++  echo "$as_me:15156: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15139: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15159: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15142: \$? = $ac_status" >&5
++  echo "$as_me:15162: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -15152,12 +15172,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:15155: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:15175: 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 15160 "configure"
++#line 15180 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15173,15 +15193,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:15176: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15196: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15179: \$? = $ac_status" >&5
++  echo "$as_me:15199: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:15181: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15201: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15184: \$? = $ac_status" >&5
++  echo "$as_me:15204: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -15197,7 +15217,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:15200: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:15220: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:15231: checking whether to use signed chars for Boolean array in term.h" >&5
+ echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
+ 
+ # Check whether --enable-signed-char or --disable-signed-char was given.
+@@ -15218,13 +15238,13 @@
+ else
+   with_signed_char=$cf_dft_signed_char
+ fi;
+-echo "$as_me:15221: result: $with_signed_char" >&5
++echo "$as_me:15241: 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:15227: checking for type of tparm-arg" >&5
++echo "$as_me:15247: checking for type of tparm-arg" >&5
+ echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6
+ 
+ # Check whether --with-tparm-arg or --without-tparm-arg was given.
+@@ -15234,18 +15254,18 @@
+ else
+   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:15237: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:15257: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+ case x$NCURSES_TPARM_ARG in
+ (x|xyes|xno)
+-	{ { echo "$as_me:15241: error: expected a type name for tparm-arg" >&5
++	{ { echo "$as_me:15261: error: expected a type name for tparm-arg" >&5
+ echo "$as_me: error: expected a type name for tparm-arg" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:15248: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:15268: 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.
+@@ -15255,7 +15275,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:15258: result: $with_rcs_ids" >&5
++echo "$as_me:15278: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15264,7 +15284,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:15267: checking format of man-pages" >&5
++echo "$as_me:15287: 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.
+@@ -15355,10 +15375,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:15358: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:15378: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+-	{ echo "$as_me:15361: WARNING: Unexpected manpage-format $cf_unknown" >&5
++	{ echo "$as_me:15381: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+ 
+@@ -15399,7 +15419,7 @@
+ esac
+ done
+ 
+-echo "$as_me:15402: checking for manpage renaming" >&5
++echo "$as_me:15422: 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.
+@@ -15428,15 +15448,15 @@
+ elif test "$MANPAGE_RENAMES" = no ; then
+ 	:
+ elif test ! -f "$MANPAGE_RENAMES" ; then
+-	{ { echo "$as_me:15431: error: not a filename: $MANPAGE_RENAMES" >&5
++	{ { echo "$as_me:15451: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-echo "$as_me:15436: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:15456: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+ 
+-echo "$as_me:15439: checking if manpage aliases will be installed" >&5
++echo "$as_me:15459: 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.
+@@ -15447,7 +15467,7 @@
+   MANPAGE_ALIASES=yes
+ fi;
+ 
+-echo "$as_me:15450: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:15470: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+ 
+ case "x$LN_S" in
+@@ -15461,7 +15481,7 @@
+ 
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:15464: checking if manpage symlinks should be used" >&5
++echo "$as_me:15484: 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.
+@@ -15474,17 +15494,17 @@
+ 
+ if test "$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+-	{ echo "$as_me:15477: WARNING: cannot make symlinks" >&5
++	{ echo "$as_me:15497: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ 	MANPAGE_SYMLINKS=no
+ fi
+ fi
+ 
+-echo "$as_me:15483: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:15503: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+ 
+-echo "$as_me:15487: checking for manpage tbl" >&5
++echo "$as_me:15507: 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.
+@@ -15495,7 +15515,7 @@
+   MANPAGE_TBL=no
+ fi;
+ 
+-echo "$as_me:15498: result: $MANPAGE_TBL" >&5
++echo "$as_me:15518: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+ 
+ if test "$prefix" = "NONE" ; then
+@@ -15816,7 +15836,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15819: checking if you want to build with function extensions" >&5
++echo "$as_me:15839: 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.
+@@ -15826,7 +15846,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:15829: result: $with_ext_funcs" >&5
++echo "$as_me:15849: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -15883,7 +15903,7 @@
+ 	GENERATED_EXT_FUNCS=
+ fi
+ 
+-echo "$as_me:15886: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:15906: 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.
+@@ -15893,7 +15913,7 @@
+ else
+   with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:15896: result: $with_sp_funcs" >&5
++echo "$as_me:15916: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ 	NCURSES_SP_FUNCS=1
+@@ -15912,7 +15932,7 @@
+ 	GENERATED_SP_FUNCS=
+ fi
+ 
+-echo "$as_me:15915: checking if you want to build with terminal-driver" >&5
++echo "$as_me:15935: 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.
+@@ -15922,7 +15942,7 @@
+ else
+   with_term_driver=no
+ fi;
+-echo "$as_me:15925: result: $with_term_driver" >&5
++echo "$as_me:15945: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+ 
+@@ -15931,19 +15951,19 @@
+ EOF
+ 
+ 	if test "x$with_termlib" != xno ; then
+-		{ { echo "$as_me:15934: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:15954: 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:15939: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:15959: 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:15946: checking for extended use of const keyword" >&5
++echo "$as_me:15966: 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.
+@@ -15953,7 +15973,7 @@
+ else
+   with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:15956: result: $with_ext_const" >&5
++echo "$as_me:15976: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -15961,7 +15981,7 @@
+ fi
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:15964: checking if you want to use extended colors" >&5
++echo "$as_me:15984: 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.
+@@ -15971,12 +15991,12 @@
+ else
+   with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:15974: result: $with_ext_colors" >&5
++echo "$as_me:15994: 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:15979: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:15999: 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)
+@@ -15987,7 +16007,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:15990: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16010: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16015,7 +16035,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:16018: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:16038: 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.
+@@ -16025,7 +16045,7 @@
+ else
+   with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:16028: result: $with_ext_mouse" >&5
++echo "$as_me:16048: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ if test "x$with_ext_mouse" = xyes ; then
+ 
+@@ -16035,7 +16055,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16038: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16058: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16052,7 +16072,7 @@
+ fi
+ 
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:16055: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:16075: 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.
+@@ -16062,7 +16082,7 @@
+ else
+   with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:16065: result: $with_ext_putwin" >&5
++echo "$as_me:16085: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+ 
+@@ -16072,7 +16092,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16075: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:16095: 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.
+@@ -16082,7 +16102,7 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:16085: result: $with_no_padding" >&5
++echo "$as_me:16105: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16090,7 +16110,7 @@
+ EOF
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:16093: checking if you want SIGWINCH handler" >&5
++echo "$as_me:16113: 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.
+@@ -16100,7 +16120,7 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:16103: result: $with_sigwinch" >&5
++echo "$as_me:16123: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ if test "x$with_sigwinch" = xyes
+ then
+@@ -16115,7 +16135,7 @@
+ fi
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:16118: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:16138: 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.
+@@ -16125,7 +16145,7 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:16128: result: $with_tcap_names" >&5
++echo "$as_me:16148: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ if test "x$with_tcap_names" = xyes; then
+@@ -16139,7 +16159,7 @@
+ 
+ ##############################################################################
+ 
+-echo "$as_me:16142: checking if you want to link with the pthread library" >&5
++echo "$as_me:16162: 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.
+@@ -16149,27 +16169,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:16152: result: $with_pthread" >&5
++echo "$as_me:16172: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:16156: checking for pthread.h" >&5
++	echo "$as_me:16176: 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 16162 "configure"
++#line 16182 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16166: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16186: \"$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:16172: \$? = $ac_status" >&5
++  echo "$as_me:16192: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16188,7 +16208,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16191: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:16211: 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
+ 
+@@ -16198,7 +16218,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:16201: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:16221: 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"
+ 
+@@ -16219,7 +16239,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16222 "configure"
++#line 16242 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16236,16 +16256,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16239: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16259: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16242: \$? = $ac_status" >&5
++  echo "$as_me:16262: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16245: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16265: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16248: \$? = $ac_status" >&5
++  echo "$as_me:16268: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -16255,7 +16275,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:16258: result: $with_pthread" >&5
++	    echo "$as_me:16278: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -16283,7 +16303,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:16286: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:16306: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -16293,13 +16313,13 @@
+ fi
+ 
+ if test "x$with_pthread" != xno; then
+-	echo "$as_me:16296: checking for pthread_kill" >&5
++	echo "$as_me:16316: 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 16302 "configure"
++#line 16322 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16330,16 +16350,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16333: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16353: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16336: \$? = $ac_status" >&5
++  echo "$as_me:16356: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16339: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16359: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16342: \$? = $ac_status" >&5
++  echo "$as_me:16362: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_pthread_kill=yes
+ else
+@@ -16349,11 +16369,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16352: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:16372: 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:16356: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:16376: 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.
+@@ -16363,7 +16383,7 @@
+ else
+   use_pthreads_eintr=no
+ fi;
+-		echo "$as_me:16366: result: $use_pthreads_eintr" >&5
++		echo "$as_me:16386: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ 		if test "x$use_pthreads_eintr" = xyes ; then
+ 
+@@ -16374,7 +16394,7 @@
+ 		fi
+ fi
+ 
+-	echo "$as_me:16377: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:16397: 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.
+@@ -16384,18 +16404,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-	echo "$as_me:16387: result: $use_weak_symbols" >&5
++	echo "$as_me:16407: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ 	if test "x$use_weak_symbols" = xyes ; then
+ 
+-echo "$as_me:16391: checking if $CC supports weak symbols" >&5
++echo "$as_me:16411: 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 16398 "configure"
++#line 16418 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16421,16 +16441,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16424: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16444: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16427: \$? = $ac_status" >&5
++  echo "$as_me:16447: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16430: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16450: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16433: \$? = $ac_status" >&5
++  echo "$as_me:16453: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -16441,7 +16461,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16444: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:16464: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ 	else
+@@ -16491,7 +16511,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:16494: checking if you want reentrant code" >&5
++echo "$as_me:16514: 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.
+@@ -16501,7 +16521,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:16504: result: $with_reentrant" >&5
++echo "$as_me:16524: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -16590,7 +16610,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16593: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16613: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16602,7 +16622,7 @@
+ 	NCURSES_SIZE_T=$cf_dft_ordinate_type
+ fi
+ 
+-echo "$as_me:16605: checking whether curses library structures should be opaque" >&5
++echo "$as_me:16625: checking whether curses library structures should be opaque" >&5
+ echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
+@@ -16624,16 +16644,16 @@
+ 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16627: result: $enable_opaque_curses" >&5
++echo "$as_me:16647: 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:16632: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:16652: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:16636: checking whether form library structures should be opaque" >&5
++echo "$as_me:16656: checking whether form library structures should be opaque" >&5
+ echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-form or --disable-opaque-form was given.
+@@ -16650,10 +16670,10 @@
+ 	enable_opaque_form=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16653: result: $enable_opaque_form" >&5
++echo "$as_me:16673: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+ 
+-echo "$as_me:16656: checking whether menu library structures should be opaque" >&5
++echo "$as_me:16676: checking whether menu library structures should be opaque" >&5
+ echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
+@@ -16670,10 +16690,10 @@
+ 	enable_opaque_menu=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16673: result: $enable_opaque_menu" >&5
++echo "$as_me:16693: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+ 
+-echo "$as_me:16676: checking whether panel library structures should be opaque" >&5
++echo "$as_me:16696: checking whether panel library structures should be opaque" >&5
+ echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
+@@ -16690,7 +16710,7 @@
+ 	enable_opaque_panel=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16693: result: $enable_opaque_panel" >&5
++echo "$as_me:16713: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+ 
+ NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -16700,7 +16720,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:16703: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:16723: 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.
+@@ -16710,7 +16730,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:16713: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:16733: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -16723,7 +16743,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:16726: checking if you want all development code" >&5
++echo "$as_me:16746: 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.
+@@ -16733,11 +16753,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:16736: result: $with_develop" >&5
++echo "$as_me:16756: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###   use option --enable-check-size to detect screensize with CPR
+-echo "$as_me:16740: checking if you want to check screensize of serial terminals" >&5
++echo "$as_me:16760: checking if you want to check screensize of serial terminals" >&5
+ echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
+ 
+ # Check whether --enable-check-size or --disable-check-size was given.
+@@ -16747,7 +16767,7 @@
+ else
+   enable_check_size=$with_develop
+ fi;
+-echo "$as_me:16750: result: $enable_check_size" >&5
++echo "$as_me:16770: result: $enable_check_size" >&5
+ echo "${ECHO_T}$enable_check_size" >&6
+ test "x$enable_check_size" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16755,7 +16775,7 @@
+ EOF
+ 
+ ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
+-echo "$as_me:16758: checking if you want hard-tabs code" >&5
++echo "$as_me:16778: 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.
+@@ -16765,7 +16785,7 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:16768: result: $enable_hard_tabs" >&5
++echo "$as_me:16788: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16773,7 +16793,7 @@
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:16776: checking if you want limited support for xmc" >&5
++echo "$as_me:16796: 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.
+@@ -16783,7 +16803,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:16786: result: $enable_xmc_glitch" >&5
++echo "$as_me:16806: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16793,7 +16813,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:16796: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:16816: 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.
+@@ -16803,7 +16823,7 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:16806: result: $with_assumed_color" >&5
++echo "$as_me:16826: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16811,7 +16831,7 @@
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:16814: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:16834: 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.
+@@ -16821,7 +16841,7 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:16824: result: $with_hashmap" >&5
++echo "$as_me:16844: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16829,7 +16849,7 @@
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:16832: checking if you want colorfgbg code" >&5
++echo "$as_me:16852: 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.
+@@ -16839,7 +16859,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:16842: result: $with_colorfgbg" >&5
++echo "$as_me:16862: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16847,7 +16867,7 @@
+ EOF
+ 
+ ###   use option --enable-fvisibility to turn on use of gcc-specific feature
+-echo "$as_me:16850: checking if you want to use gcc -fvisibility option" >&5
++echo "$as_me:16870: 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.
+@@ -16857,14 +16877,14 @@
+ else
+   cf_with_fvisibility=no
+ fi;
+-echo "$as_me:16860: result: $cf_with_fvisibility" >&5
++echo "$as_me:16880: 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:16867: checking if $CC -fvisibility=hidden option works" >&5
++echo "$as_me:16887: 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
+@@ -16873,7 +16893,7 @@
+     cf_save_cflags="$CFLAGS"
+     CFLAGS="$CFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16876 "configure"
++#line 16896 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16889,16 +16909,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16892: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16912: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16895: \$? = $ac_status" >&5
++  echo "$as_me:16915: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16898: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16918: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16901: \$? = $ac_status" >&5
++  echo "$as_me:16921: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden=yes
+ else
+@@ -16910,7 +16930,7 @@
+     CFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16913: result: $cf_cv_fvisibility_hidden" >&5
++echo "$as_me:16933: result: $cf_cv_fvisibility_hidden" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
+ 
+ 	if test "x$cf_cv_fvisibility_hidden" = xyes
+@@ -17025,7 +17045,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:17028: checking if $CXX -fvisibility=hidden option works" >&5
++echo "$as_me:17048: 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
+@@ -17034,7 +17054,7 @@
+     cf_save_cflags="$CXXFLAGS"
+     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17037 "configure"
++#line 17057 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -17050,16 +17070,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17053: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17073: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17056: \$? = $ac_status" >&5
++  echo "$as_me:17076: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17059: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17079: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17062: \$? = $ac_status" >&5
++  echo "$as_me:17082: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden2=yes
+ else
+@@ -17071,7 +17091,7 @@
+     CXXFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:17074: result: $cf_cv_fvisibility_hidden2" >&5
++echo "$as_me:17094: result: $cf_cv_fvisibility_hidden2" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
+ 
+ 		if test "x$cf_cv_fvisibility_hidden2" = xyes
+@@ -17194,7 +17214,7 @@
+ fi
+ 
+ ###   use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:17197: checking if you want interop bindings" >&5
++echo "$as_me:17217: 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.
+@@ -17204,13 +17224,13 @@
+ else
+   with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:17207: result: $with_exp_interop" >&5
++echo "$as_me:17227: 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:17213: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:17233: 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.
+@@ -17220,13 +17240,13 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:17223: result: $with_safe_sprintf" >&5
++echo "$as_me:17243: 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:17229: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:17249: 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.
+@@ -17236,7 +17256,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:17239: result: $with_scroll_hints" >&5
++echo "$as_me:17259: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -17245,7 +17265,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17248: checking if you want wgetch-events code" >&5
++echo "$as_me:17268: 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.
+@@ -17255,7 +17275,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:17258: result: $with_wgetch_events" >&5
++echo "$as_me:17278: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ if test "x$with_wgetch_events" = xyes ; then
+ 
+@@ -17270,7 +17290,7 @@
+ 
+ case "$cf_cv_system_name" in
+ (*mingw32*|*mingw64*|*-msvc*)
+-	echo "$as_me:17273: checking if you want experimental-Windows driver" >&5
++	echo "$as_me:17293: 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.
+@@ -17280,7 +17300,7 @@
+ else
+   with_exp_win32=no
+ fi;
+-	echo "$as_me:17283: result: $with_exp_win32" >&5
++	echo "$as_me:17303: result: $with_exp_win32" >&5
+ echo "${ECHO_T}$with_exp_win32" >&6
+ 	if test "x$with_exp_win32" = xyes
+ 	then
+@@ -17306,7 +17326,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:17309: checking if you want to see long compiling messages" >&5
++echo "$as_me:17329: 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.
+@@ -17340,7 +17360,7 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:17343: result: $enableval" >&5
++echo "$as_me:17363: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ if test "x$enable_echo" = xyes; then
+@@ -17353,7 +17373,7 @@
+ 
+ # --disable-stripping is used for debugging
+ 
+-echo "$as_me:17356: checking if you want to install stripped executables" >&5
++echo "$as_me:17376: 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.
+@@ -17370,7 +17390,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:17373: result: $enable_stripping" >&5
++echo "$as_me:17393: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -17381,7 +17401,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:17384: checking if install accepts -p option" >&5
++echo "$as_me:17404: 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
+@@ -17412,10 +17432,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:17415: result: $cf_cv_install_p" >&5
++echo "$as_me:17435: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:17418: checking if install needs to be told about ownership" >&5
++echo "$as_me:17438: 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)
+@@ -17426,7 +17446,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17429: result: $with_install_o" >&5
++echo "$as_me:17449: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -17437,7 +17457,7 @@
+ 
+ if test -n "$INSTALL_OPT_S"
+ then
+-	echo "$as_me:17440: checking if you want to specify strip-program" >&5
++	echo "$as_me:17460: checking if you want to specify strip-program" >&5
+ echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
+ 
+ # Check whether --with-strip-program or --without-strip-program was given.
+@@ -17447,11 +17467,11 @@
+ else
+   with_strip_program=no
+ fi;
+-	echo "$as_me:17450: result: $with_strip_program" >&5
++	echo "$as_me:17470: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ 	if test "$with_strip_program" != no
+ 	then
+-		echo "$as_me:17454: checking if strip-program is supported with this installer" >&5
++		echo "$as_me:17474: checking if strip-program is supported with this installer" >&5
+ echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
+ 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
+ 		check_install_strip=no
+@@ -17472,11 +17492,11 @@
+ 				done
+ 			fi
+ 		fi
+-		echo "$as_me:17475: result: $check_install_strip" >&5
++		echo "$as_me:17495: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ 		case "$check_install_strip" in
+ 		(no)
+-			{ echo "$as_me:17479: WARNING: $cf_install_program does not support strip program option" >&5
++			{ echo "$as_me:17499: WARNING: $cf_install_program does not support strip program option" >&5
+ echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
+ 			with_strip_program=no
+ 			;;
+@@ -17491,7 +17511,7 @@
+ 			chmod +x "$INSTALL"
+ 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
+ 
+-echo "${as_me:-configure}:17494: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:17514: testing created $INSTALL ..." 1>&5
+ 
+ 			;;
+ 		(option)
+@@ -17517,7 +17537,7 @@
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+ 
+-echo "$as_me:17520: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:17540: 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.
+@@ -17534,17 +17554,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:17537: result: $enable_stdnoreturn" >&5
++echo "$as_me:17557: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:17541: checking for C11 _Noreturn feature" >&5
++echo "$as_me:17561: 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 17547 "configure"
++#line 17567 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17560,16 +17580,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17563: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17583: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17566: \$? = $ac_status" >&5
++  echo "$as_me:17586: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17569: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17589: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17572: \$? = $ac_status" >&5
++  echo "$as_me:17592: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -17580,7 +17600,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17583: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:17603: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -17636,16 +17656,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17639: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17659: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17644: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17664: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17648: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17668: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17684,16 +17704,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17687: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17707: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17692: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17712: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17696: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17716: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17732,23 +17752,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17735: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17755: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17740: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17760: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17744: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17764: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:17751: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:17771: 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.
+@@ -17765,7 +17785,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:17768: result: $enable_warnings" >&5
++echo "$as_me:17788: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -17789,7 +17809,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17792 "configure"
++#line 17812 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17804,26 +17824,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17807: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17827: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17810: \$? = $ac_status" >&5
++  echo "$as_me:17830: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17813: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17833: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17816: \$? = $ac_status" >&5
++  echo "$as_me:17836: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:17819: checking for X11/Xt const-feature" >&5
++echo "$as_me:17839: 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 17826 "configure"
++#line 17846 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -17841,16 +17861,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17844: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17864: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17847: \$? = $ac_status" >&5
++  echo "$as_me:17867: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17850: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17870: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17853: \$? = $ac_status" >&5
++  echo "$as_me:17873: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -17865,7 +17885,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17868: result: $cf_cv_const_x_string" >&5
++echo "$as_me:17888: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -17894,7 +17914,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:17933: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -17926,12 +17946,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17929: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17949: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17932: \$? = $ac_status" >&5
++  echo "$as_me:17952: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17934: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17954: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -17939,7 +17959,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:17942: checking for $CC warning options..." >&5
++	{ echo "$as_me:17962: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -17962,12 +17982,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:17965: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17985: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17968: \$? = $ac_status" >&5
++  echo "$as_me:17988: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17970: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17990: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -17975,7 +17995,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17978: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17998: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17985,7 +18005,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17988: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:18008: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -18018,10 +18038,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:18021: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:18041: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -18071,12 +18091,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:18074: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18094: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18077: \$? = $ac_status" >&5
++  echo "$as_me:18097: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18079: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:18099: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -18148,12 +18168,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:18151: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:18171: 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 18156 "configure"
++#line 18176 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18170,16 +18190,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18173: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18193: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18176: \$? = $ac_status" >&5
++  echo "$as_me:18196: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18179: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18199: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18182: \$? = $ac_status" >&5
++  echo "$as_me:18202: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -18190,7 +18210,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:18193: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:18213: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -18199,11 +18219,11 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:18202: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:18222: 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 18206 "configure"
++#line 18226 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18220,16 +18240,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18223: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18243: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18226: \$? = $ac_status" >&5
++  echo "$as_me:18246: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18229: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18249: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18232: \$? = $ac_status" >&5
++  echo "$as_me:18252: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_CPLUSPLUS=yes
+ 
+@@ -18239,7 +18259,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:18242: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:18262: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -18248,30 +18268,30 @@
+ if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:18251: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:18271: 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:18258: checking version of $CC" >&5
++	echo "$as_me:18278: 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:18262: result: $CLANG_VERSION" >&5
++	echo "$as_me:18282: 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:18269: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:18289: 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 18274 "configure"
++#line 18294 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -18285,16 +18305,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18288: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18308: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18291: \$? = $ac_status" >&5
++  echo "$as_me:18311: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18294: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18314: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18297: \$? = $ac_status" >&5
++  echo "$as_me:18317: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -18305,13 +18325,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:18308: result: $cf_clang_optok" >&5
++		echo "$as_me:18328: 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}:18314: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:18334: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -18328,7 +18348,7 @@
+ ac_main_return="return"
+ 
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:18369: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -18363,12 +18383,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:18366: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18386: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18369: \$? = $ac_status" >&5
++  echo "$as_me:18389: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18371: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18391: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -18377,7 +18397,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:18380: checking for $CXX warning options..." >&5
++	{ echo "$as_me:18400: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -18407,16 +18427,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:18410: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18430: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18413: \$? = $ac_status" >&5
++  echo "$as_me:18433: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18415: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18435: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:18419: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18439: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -18434,7 +18454,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:18437: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:18457: 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.
+@@ -18444,7 +18464,7 @@
+ else
+   enable_string_hacks=no
+ fi;
+-echo "$as_me:18447: result: $enable_string_hacks" >&5
++echo "$as_me:18467: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+ 
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -18453,15 +18473,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:18456: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:18476: 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:18458: checking for strlcat" >&5
++	echo "$as_me:18478: 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 18464 "configure"
++#line 18484 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18492,16 +18512,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18495: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18515: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18498: \$? = $ac_status" >&5
++  echo "$as_me:18518: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18501: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18521: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18504: \$? = $ac_status" >&5
++  echo "$as_me:18524: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -18511,7 +18531,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18514: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:18534: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+ 
+@@ -18521,7 +18541,7 @@
+ 
+ else
+ 
+-		echo "$as_me:18524: checking for strlcat in -lbsd" >&5
++		echo "$as_me:18544: 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
+@@ -18529,7 +18549,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18532 "configure"
++#line 18552 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18548,16 +18568,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18551: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18571: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18554: \$? = $ac_status" >&5
++  echo "$as_me:18574: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18557: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18577: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18560: \$? = $ac_status" >&5
++  echo "$as_me:18580: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -18568,7 +18588,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18571: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:18591: 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
+ 
+@@ -18591,23 +18611,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18594: checking for $ac_header" >&5
++echo "$as_me:18614: 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 18600 "configure"
++#line 18620 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18604: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18624: \"$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:18610: \$? = $ac_status" >&5
++  echo "$as_me:18630: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18626,7 +18646,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18629: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18649: 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:18670: 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 18656 "configure"
++#line 18676 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18684,16 +18704,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18687: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18707: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18690: \$? = $ac_status" >&5
++  echo "$as_me:18710: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18693: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18713: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18696: \$? = $ac_status" >&5
++  echo "$as_me:18716: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -18703,7 +18723,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18706: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:18726: 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:18739: 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.
+@@ -18726,7 +18746,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:18729: result: $with_assertions" >&5
++echo "$as_me:18749: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -18742,7 +18762,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:18745: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:18765: 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.
+@@ -18764,7 +18784,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:18767: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:18787: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18878,23 +18898,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:18881: checking for dmalloc.h" >&5
++	echo "$as_me:18901: 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 18887 "configure"
++#line 18907 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:18891: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18911: \"$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:18897: \$? = $ac_status" >&5
++  echo "$as_me:18917: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18913,11 +18933,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18916: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:18936: 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:18920: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:18940: 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
+@@ -18925,7 +18945,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18928 "configure"
++#line 18948 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18944,16 +18964,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18947: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18967: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18950: \$? = $ac_status" >&5
++  echo "$as_me:18970: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18953: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18973: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18956: \$? = $ac_status" >&5
++  echo "$as_me:18976: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -18964,7 +18984,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18967: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:18987: 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:19002: 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.
+@@ -19001,7 +19021,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:19004: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:19024: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19115,23 +19135,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:19118: checking for dbmalloc.h" >&5
++	echo "$as_me:19138: 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 19124 "configure"
++#line 19144 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:19128: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:19148: \"$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:19134: \$? = $ac_status" >&5
++  echo "$as_me:19154: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19150,11 +19170,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:19153: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:19173: 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:19157: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:19177: 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
+@@ -19162,7 +19182,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19165 "configure"
++#line 19185 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19181,16 +19201,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19184: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19204: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19187: \$? = $ac_status" >&5
++  echo "$as_me:19207: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19190: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19210: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19193: \$? = $ac_status" >&5
++  echo "$as_me:19213: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -19201,7 +19221,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19204: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:19224: 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:19239: 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.
+@@ -19238,7 +19258,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:19241: result: ${with_valgrind:-no}" >&5
++echo "$as_me:19261: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19351,7 +19371,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19354: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:19374: 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.
+@@ -19362,7 +19382,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:19365: result: $with_no_leaks" >&5
++echo "$as_me:19385: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -19414,7 +19434,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19417: checking whether to add trace feature to all models" >&5
++echo "$as_me:19437: 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.
+@@ -19424,7 +19444,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:19427: result: $cf_with_trace" >&5
++echo "$as_me:19447: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -19444,7 +19464,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:19447: checking if we want to use GNAT projects" >&5
++echo "$as_me:19467: 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.
+@@ -19461,7 +19481,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:19464: result: $enable_gnat_projects" >&5
++echo "$as_me:19484: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -19474,14 +19494,14 @@
+ 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+ 	fi
+ 
+-echo "$as_me:19477: checking if ssp library is needed" >&5
++echo "$as_me:19497: 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 19484 "configure"
++#line 19504 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19498,16 +19518,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19501: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19521: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19504: \$? = $ac_status" >&5
++  echo "$as_me:19524: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19507: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19527: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19510: \$? = $ac_status" >&5
++  echo "$as_me:19530: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -19517,7 +19537,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19520 "configure"
++#line 19540 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19534,16 +19554,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19537: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19557: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19540: \$? = $ac_status" >&5
++  echo "$as_me:19560: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19543: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19563: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19546: \$? = $ac_status" >&5
++  echo "$as_me:19566: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -19557,7 +19577,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19560: result: $cf_cv_need_libssp" >&5
++echo "$as_me:19580: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -19586,14 +19606,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19589: checking if -lm needed for math functions" >&5
++echo "$as_me:19609: 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 19596 "configure"
++#line 19616 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19609,16 +19629,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19612: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19632: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19615: \$? = $ac_status" >&5
++  echo "$as_me:19635: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19618: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19638: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19621: \$? = $ac_status" >&5
++  echo "$as_me:19641: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -19628,7 +19648,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19631: result: $cf_cv_need_libm" >&5
++echo "$as_me:19651: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ 
+ if test "$cf_cv_need_libm" = yes
+@@ -19636,14 +19656,14 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lm"
+-	echo "$as_me:19639: checking if -lm is available for math functions" >&5
++	echo "$as_me:19659: checking if -lm is available for math functions" >&5
+ echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
+ if test "${cf_cv_have_libm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19646 "configure"
++#line 19666 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19659,16 +19679,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19662: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19682: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19665: \$? = $ac_status" >&5
++  echo "$as_me:19685: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19668: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19688: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19671: \$? = $ac_status" >&5
++  echo "$as_me:19691: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_libm=yes
+ else
+@@ -19678,7 +19698,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19681: result: $cf_cv_have_libm" >&5
++echo "$as_me:19701: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ 	LIBS="$cf_save_LIBS"
+ 
+@@ -19700,13 +19720,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:19703: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:19723: 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 19709 "configure"
++#line 19729 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -19722,16 +19742,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19725: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19745: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19728: \$? = $ac_status" >&5
++  echo "$as_me:19748: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19731: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19751: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19734: \$? = $ac_status" >&5
++  echo "$as_me:19754: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -19741,7 +19761,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19744: result: $ac_cv_header_time" >&5
++echo "$as_me:19764: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -19756,7 +19776,7 @@
+ case "$host_os" in
+ (mingw*)
+ 	# -lsystre -ltre -lintl -liconv
+-	echo "$as_me:19759: checking for regcomp in -lsystre" >&5
++	echo "$as_me:19779: 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
+@@ -19764,7 +19784,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsystre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19767 "configure"
++#line 19787 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19783,16 +19803,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19786: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19806: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19789: \$? = $ac_status" >&5
++  echo "$as_me:19809: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19792: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19812: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19795: \$? = $ac_status" >&5
++  echo "$as_me:19815: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_systre_regcomp=yes
+ else
+@@ -19803,11 +19823,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19806: result: $ac_cv_lib_systre_regcomp" >&5
++echo "$as_me:19826: 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:19810: checking for libiconv_open in -liconv" >&5
++		echo "$as_me:19830: 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
+@@ -19815,7 +19835,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19818 "configure"
++#line 19838 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19834,16 +19854,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19837: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19857: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19840: \$? = $ac_status" >&5
++  echo "$as_me:19860: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19843: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19863: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19846: \$? = $ac_status" >&5
++  echo "$as_me:19866: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_iconv_libiconv_open=yes
+ else
+@@ -19854,7 +19874,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19857: result: $ac_cv_lib_iconv_libiconv_open" >&5
++echo "$as_me:19877: 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
+ 
+@@ -19876,7 +19896,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19879: checking for libintl_gettext in -lintl" >&5
++		echo "$as_me:19899: 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
+@@ -19884,7 +19904,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19887 "configure"
++#line 19907 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19903,16 +19923,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19906: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19926: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19909: \$? = $ac_status" >&5
++  echo "$as_me:19929: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19912: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19932: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19915: \$? = $ac_status" >&5
++  echo "$as_me:19935: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_intl_libintl_gettext=yes
+ else
+@@ -19923,7 +19943,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19926: result: $ac_cv_lib_intl_libintl_gettext" >&5
++echo "$as_me:19946: 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
+ 
+@@ -19945,7 +19965,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19948: checking for tre_regcomp in -ltre" >&5
++		echo "$as_me:19968: 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
+@@ -19953,7 +19973,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19956 "configure"
++#line 19976 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19972,16 +19992,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19975: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19995: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19978: \$? = $ac_status" >&5
++  echo "$as_me:19998: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19981: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20001: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19984: \$? = $ac_status" >&5
++  echo "$as_me:20004: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_tre_tre_regcomp=yes
+ else
+@@ -19992,7 +20012,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19995: result: $ac_cv_lib_tre_tre_regcomp" >&5
++echo "$as_me:20015: 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
+ 
+@@ -20034,7 +20054,7 @@
+ 
+ else
+ 
+-		echo "$as_me:20037: checking for regcomp in -lgnurx" >&5
++		echo "$as_me:20057: 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
+@@ -20042,7 +20062,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgnurx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20045 "configure"
++#line 20065 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20061,16 +20081,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20064: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20084: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20067: \$? = $ac_status" >&5
++  echo "$as_me:20087: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20070: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20090: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20073: \$? = $ac_status" >&5
++  echo "$as_me:20093: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gnurx_regcomp=yes
+ else
+@@ -20081,7 +20101,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20084: result: $ac_cv_lib_gnurx_regcomp" >&5
++echo "$as_me:20104: 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
+ 
+@@ -20109,13 +20129,13 @@
+ 	;;
+ (*)
+ 	cf_regex_libs="regex re"
+-	echo "$as_me:20112: checking for regcomp" >&5
++	echo "$as_me:20132: 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 20118 "configure"
++#line 20138 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20146,16 +20166,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20149: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20169: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20152: \$? = $ac_status" >&5
++  echo "$as_me:20172: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20155: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20175: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20158: \$? = $ac_status" >&5
++  echo "$as_me:20178: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -20165,7 +20185,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20168: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:20188: 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
+@@ -20174,7 +20194,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:20177: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:20197: 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
+@@ -20182,7 +20202,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20185 "configure"
++#line 20205 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20201,16 +20221,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20204: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20224: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20207: \$? = $ac_status" >&5
++  echo "$as_me:20227: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20210: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20230: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20213: \$? = $ac_status" >&5
++  echo "$as_me:20233: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -20221,7 +20241,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20224: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:20244: 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
+ 
+@@ -20253,13 +20273,13 @@
+ esac
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:20256: checking for compile" >&5
++	echo "$as_me:20276: 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 20262 "configure"
++#line 20282 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20290,16 +20310,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20293: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20313: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20296: \$? = $ac_status" >&5
++  echo "$as_me:20316: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20299: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20319: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20302: \$? = $ac_status" >&5
++  echo "$as_me:20322: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -20309,13 +20329,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20312: result: $ac_cv_func_compile" >&5
++echo "$as_me:20332: 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:20318: checking for compile in -lgen" >&5
++		echo "$as_me:20338: 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
+@@ -20323,7 +20343,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20326 "configure"
++#line 20346 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20342,16 +20362,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20345: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20365: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20348: \$? = $ac_status" >&5
++  echo "$as_me:20368: \$? = $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:20371: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20354: \$? = $ac_status" >&5
++  echo "$as_me:20374: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -20362,7 +20382,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20365: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:20385: 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
+ 
+@@ -20390,11 +20410,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:20393: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:20413: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:20397: checking for regular-expression headers" >&5
++echo "$as_me:20417: 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
+@@ -20406,7 +20426,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20409 "configure"
++#line 20429 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -20423,16 +20443,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20426: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20446: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20429: \$? = $ac_status" >&5
++  echo "$as_me:20449: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20432: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20452: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20435: \$? = $ac_status" >&5
++  echo "$as_me:20455: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20449,7 +20469,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20452 "configure"
++#line 20472 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -20470,16 +20490,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20473: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20493: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20476: \$? = $ac_status" >&5
++  echo "$as_me:20496: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20479: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20499: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20482: \$? = $ac_status" >&5
++  echo "$as_me:20502: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20495,11 +20515,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:20498: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:20518: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case "$cf_cv_regex_hdrs" in
+-	(no)		{ echo "$as_me:20502: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:20522: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -20537,23 +20557,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20540: checking for $ac_header" >&5
++echo "$as_me:20560: 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 20546 "configure"
++#line 20566 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20550: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20570: \"$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:20556: \$? = $ac_status" >&5
++  echo "$as_me:20576: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20572,7 +20592,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20575: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20595: 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:20608: 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 20594 "configure"
++#line 20614 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20598: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20618: \"$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:20604: \$? = $ac_status" >&5
++  echo "$as_me:20624: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20620,7 +20640,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20623: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20643: 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:20653: 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
+@@ -20640,7 +20660,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20643 "configure"
++#line 20663 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20653,16 +20673,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20656: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20676: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20659: \$? = $ac_status" >&5
++  echo "$as_me:20679: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20662: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20682: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20665: \$? = $ac_status" >&5
++  echo "$as_me:20685: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -20674,7 +20694,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20677: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20697: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -20691,14 +20711,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20694: checking if external environ is declared" >&5
++echo "$as_me:20714: 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 20701 "configure"
++#line 20721 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -20711,16 +20731,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20714: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20734: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20717: \$? = $ac_status" >&5
++  echo "$as_me:20737: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20720: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20740: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20723: \$? = $ac_status" >&5
++  echo "$as_me:20743: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_environ=yes
+ else
+@@ -20731,7 +20751,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20734: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20754: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+ 
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20746,14 +20766,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:20749: checking if external environ exists" >&5
++echo "$as_me:20769: 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 20756 "configure"
++#line 20776 "configure"
+ #include "confdefs.h"
+ 
+ #undef environ
+@@ -20768,16 +20788,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20771: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20791: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20774: \$? = $ac_status" >&5
++  echo "$as_me:20794: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20777: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20797: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20780: \$? = $ac_status" >&5
++  echo "$as_me:20800: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_environ=yes
+ else
+@@ -20788,7 +20808,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20791: result: $cf_cv_have_environ" >&5
++echo "$as_me:20811: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+ 
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20801,13 +20821,13 @@
+ 
+ fi
+ 
+-echo "$as_me:20804: checking for getenv" >&5
++echo "$as_me:20824: 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 20810 "configure"
++#line 20830 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20838,16 +20858,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20841: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20861: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20844: \$? = $ac_status" >&5
++  echo "$as_me:20864: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20847: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20867: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20850: \$? = $ac_status" >&5
++  echo "$as_me:20870: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_getenv=yes
+ else
+@@ -20857,19 +20877,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20860: result: $ac_cv_func_getenv" >&5
++echo "$as_me:20880: 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:20866: checking for $ac_func" >&5
++echo "$as_me:20886: 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 20872 "configure"
++#line 20892 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20900,16 +20920,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20903: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20923: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20906: \$? = $ac_status" >&5
++  echo "$as_me:20926: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20909: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20929: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20912: \$? = $ac_status" >&5
++  echo "$as_me:20932: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -20919,7 +20939,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20922: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:20942: 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:20952: 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
+@@ -20939,7 +20959,7 @@
+   cf_cv_consistent_getenv=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20942 "configure"
++#line 20962 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21044,15 +21064,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21047: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21067: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21050: \$? = $ac_status" >&5
++  echo "$as_me:21070: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21052: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21072: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21055: \$? = $ac_status" >&5
++  echo "$as_me:21075: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_consistent_getenv=yes
+ else
+@@ -21065,7 +21085,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:21068: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:21088: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+ 
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -21080,18 +21100,18 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ 	test "x$cf_with_trace" = xyes
+ then
+-	{ echo "$as_me:21083: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++	{ echo "$as_me:21103: 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:21087: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:21107: 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 21094 "configure"
++#line 21114 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21111,16 +21131,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21114: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21134: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21117: \$? = $ac_status" >&5
++  echo "$as_me:21137: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21120: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21140: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21123: \$? = $ac_status" >&5
++  echo "$as_me:21143: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -21132,7 +21152,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21135: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:21155: 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
+@@ -21147,13 +21167,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:21150: checking for an ANSI C-conforming const" >&5
++echo "$as_me:21170: 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 21156 "configure"
++#line 21176 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21215,16 +21235,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21218: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21238: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21221: \$? = $ac_status" >&5
++  echo "$as_me:21241: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21224: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21244: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21227: \$? = $ac_status" >&5
++  echo "$as_me:21247: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -21234,7 +21254,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21237: result: $ac_cv_c_const" >&5
++echo "$as_me:21257: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -21244,7 +21264,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21247: checking for inline" >&5
++echo "$as_me:21267: 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
+@@ -21252,7 +21272,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21255 "configure"
++#line 21275 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo (void) {return 0; }
+@@ -21261,16 +21281,16 @@
+ 
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21264: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21284: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21267: \$? = $ac_status" >&5
++  echo "$as_me:21287: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21270: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21290: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21273: \$? = $ac_status" >&5
++  echo "$as_me:21293: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -21281,7 +21301,7 @@
+ done
+ 
+ fi
+-echo "$as_me:21284: result: $ac_cv_c_inline" >&5
++echo "$as_me:21304: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -21307,7 +21327,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:21310: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:21330: 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
+@@ -21316,7 +21336,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21319 "configure"
++#line 21339 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -21328,16 +21348,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21331: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21351: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21334: \$? = $ac_status" >&5
++  echo "$as_me:21354: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21337: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21357: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21340: \$? = $ac_status" >&5
++  echo "$as_me:21360: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -21349,7 +21369,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:21352: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:21372: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -21455,7 +21475,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:21458: checking for signal global datatype" >&5
++echo "$as_me:21478: 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
+@@ -21467,7 +21487,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21470 "configure"
++#line 21490 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21491,16 +21511,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21494: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21514: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21497: \$? = $ac_status" >&5
++  echo "$as_me:21517: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21500: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21520: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21503: \$? = $ac_status" >&5
++  echo "$as_me:21523: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21514,7 +21534,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21517: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21537: 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:21546: 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
+@@ -21533,7 +21553,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21536 "configure"
++#line 21556 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21568,15 +21588,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21571: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21591: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21574: \$? = $ac_status" >&5
++  echo "$as_me:21594: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21576: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21596: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21579: \$? = $ac_status" >&5
++  echo "$as_me:21599: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21591,7 +21611,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21594: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21614: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:21626: 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 21613 "configure"
++#line 21633 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21622,16 +21642,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21625: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21645: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21628: \$? = $ac_status" >&5
++  echo "$as_me:21648: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21631: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21651: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21634: \$? = $ac_status" >&5
++  echo "$as_me:21654: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -21643,7 +21663,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21646: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21666: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -21659,14 +21679,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:21662: checking if external errno is declared" >&5
++echo "$as_me:21682: 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 21669 "configure"
++#line 21689 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21680,16 +21700,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21683: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21703: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21686: \$? = $ac_status" >&5
++  echo "$as_me:21706: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21689: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21709: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21692: \$? = $ac_status" >&5
++  echo "$as_me:21712: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -21700,7 +21720,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21703: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21723: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21715,14 +21735,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:21718: checking if external errno exists" >&5
++echo "$as_me:21738: 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 21725 "configure"
++#line 21745 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -21737,16 +21757,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21740: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21760: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21743: \$? = $ac_status" >&5
++  echo "$as_me:21763: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21746: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21766: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21749: \$? = $ac_status" >&5
++  echo "$as_me:21769: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -21757,7 +21777,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21760: result: $cf_cv_have_errno" >&5
++echo "$as_me:21780: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21770,7 +21790,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21773: checking if data-only library module links" >&5
++echo "$as_me:21793: 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
+@@ -21778,20 +21798,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:21804: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21787: \$? = $ac_status" >&5
++  echo "$as_me:21807: \$? = $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:21831: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21814: \$? = $ac_status" >&5
++  echo "$as_me:21834: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -21824,7 +21844,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21827 "configure"
++#line 21847 "configure"
+ #include "confdefs.h"
+ 
+ 	extern int testfunc(void);
+@@ -21835,15 +21855,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21838: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21858: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21841: \$? = $ac_status" >&5
++  echo "$as_me:21861: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21843: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21863: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21846: \$? = $ac_status" >&5
++  echo "$as_me:21866: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -21858,7 +21878,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21861: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21881: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21873,13 +21893,13 @@
+ ###	Checks for library functions.
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:21876: checking for clock_gettime" >&5
++echo "$as_me:21896: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21882 "configure"
++#line 21902 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21910,16 +21930,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21913: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21933: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21916: \$? = $ac_status" >&5
++  echo "$as_me:21936: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21919: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21939: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21922: \$? = $ac_status" >&5
++  echo "$as_me:21942: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -21929,12 +21949,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21932: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:21952: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:21937: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:21957: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21942,7 +21962,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21945 "configure"
++#line 21965 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21961,16 +21981,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21964: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21984: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21967: \$? = $ac_status" >&5
++  echo "$as_me:21987: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21970: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21990: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21973: \$? = $ac_status" >&5
++  echo "$as_me:21993: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -21981,7 +22001,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21984: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:22004: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -21993,14 +22013,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:21996: checking if clock_gettime links" >&5
++echo "$as_me:22016: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22003 "configure"
++#line 22023 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22018,16 +22038,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22021: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22041: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22024: \$? = $ac_status" >&5
++  echo "$as_me:22044: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22027: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22047: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22030: \$? = $ac_status" >&5
++  echo "$as_me:22050: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -22038,7 +22058,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22041: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:22061: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -22052,13 +22072,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:22055: checking for gettimeofday" >&5
++echo "$as_me:22075: 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 22061 "configure"
++#line 22081 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22089,16 +22109,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22092: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22112: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22095: \$? = $ac_status" >&5
++  echo "$as_me:22115: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22098: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22118: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22101: \$? = $ac_status" >&5
++  echo "$as_me:22121: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -22108,7 +22128,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22111: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:22131: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -22118,7 +22138,7 @@
+ 
+ else
+ 
+-echo "$as_me:22121: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:22141: 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
+@@ -22126,7 +22146,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22129 "configure"
++#line 22149 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22145,16 +22165,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22148: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22168: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22151: \$? = $ac_status" >&5
++  echo "$as_me:22171: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22154: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22174: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22157: \$? = $ac_status" >&5
++  echo "$as_me:22177: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -22165,7 +22185,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22168: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:22188: 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
+ 
+@@ -22224,13 +22244,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:22227: checking for $ac_func" >&5
++echo "$as_me:22247: 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 22233 "configure"
++#line 22253 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22261,16 +22281,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22264: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22284: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22267: \$? = $ac_status" >&5
++  echo "$as_me:22287: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22270: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22290: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22273: \$? = $ac_status" >&5
++  echo "$as_me:22293: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -22280,7 +22300,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22283: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:22303: 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:22313: 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 22300 "configure"
++#line 22320 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22312,16 +22332,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22315: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22335: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22318: \$? = $ac_status" >&5
++  echo "$as_me:22338: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22321: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22341: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22324: \$? = $ac_status" >&5
++  echo "$as_me:22344: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_PATH_TTYS=yes
+ else
+@@ -22331,7 +22351,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22334: result: $cf_cv_PATH_TTYS" >&5
++echo "$as_me:22354: result: $cf_cv_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
+ 
+ if test $cf_cv_PATH_TTYS = no
+@@ -22353,7 +22373,7 @@
+ 
+ if test $cf_cv_PATH_TTYS != no
+ then
+-	echo "$as_me:22356: checking if _PATH_TTYS file exists" >&5
++	echo "$as_me:22376: 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
+@@ -22363,7 +22383,7 @@
+   cf_cv_have_PATH_TTYS=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22366 "configure"
++#line 22386 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22376,15 +22396,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22379: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22399: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22382: \$? = $ac_status" >&5
++  echo "$as_me:22402: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22384: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22404: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22387: \$? = $ac_status" >&5
++  echo "$as_me:22407: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_PATH_TTYS=yes
+ else
+@@ -22396,7 +22416,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22399: result: $cf_cv_have_PATH_TTYS" >&5
++echo "$as_me:22419: 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
+@@ -22408,14 +22428,14 @@
+ #define HAVE_PATH_TTYS 1
+ EOF
+ 
+-	echo "$as_me:22411: checking for getttynam" >&5
++	echo "$as_me:22431: 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 22418 "configure"
++#line 22438 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22427,16 +22447,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22430: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22450: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22433: \$? = $ac_status" >&5
++  echo "$as_me:22453: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22436: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22456: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22439: \$? = $ac_status" >&5
++  echo "$as_me:22459: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_getttynam=yes
+ else
+@@ -22446,7 +22466,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22449: result: $cf_cv_func_getttynam" >&5
++echo "$as_me:22469: 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
+@@ -22456,7 +22476,7 @@
+ 
+ if test "x$ac_cv_func_getopt" = xno && \
+    test "x$cf_with_progs$cf_with_tests" != xnono; then
+-	{ { echo "$as_me:22459: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:22479: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -22465,7 +22485,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:22468: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:22488: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -22478,14 +22498,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:22481: checking for terminal-capability database functions" >&5
++echo "$as_me:22501: 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 22488 "configure"
++#line 22508 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22505,16 +22525,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22508: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22528: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22511: \$? = $ac_status" >&5
++  echo "$as_me:22531: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22514: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22534: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22517: \$? = $ac_status" >&5
++  echo "$as_me:22537: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -22525,7 +22545,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22528: result: $cf_cv_cgetent" >&5
++echo "$as_me:22548: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -22535,14 +22555,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:22538: checking if cgetent uses const parameter" >&5
++echo "$as_me:22558: 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 22545 "configure"
++#line 22565 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -22565,16 +22585,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22568: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22588: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22571: \$? = $ac_status" >&5
++  echo "$as_me:22591: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22574: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22594: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22577: \$? = $ac_status" >&5
++  echo "$as_me:22597: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -22585,7 +22605,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22588: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:22608: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -22599,14 +22619,14 @@
+ 
+ fi
+ 
+-echo "$as_me:22602: checking for isascii" >&5
++echo "$as_me:22622: 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 22609 "configure"
++#line 22629 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22618,16 +22638,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22621: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22641: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22624: \$? = $ac_status" >&5
++  echo "$as_me:22644: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22627: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22647: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22630: \$? = $ac_status" >&5
++  echo "$as_me:22650: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -22638,7 +22658,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22641: result: $cf_cv_have_isascii" >&5
++echo "$as_me:22661: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -22646,10 +22666,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:22649: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:22669: 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 22652 "configure"
++#line 22672 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22663,16 +22683,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22666: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22686: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22669: \$? = $ac_status" >&5
++  echo "$as_me:22689: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22672: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22692: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22675: \$? = $ac_status" >&5
++  echo "$as_me:22695: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=no
+ else
+@@ -22680,7 +22700,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22683 "configure"
++#line 22703 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22695,16 +22715,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22698: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22718: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22701: \$? = $ac_status" >&5
++  echo "$as_me:22721: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22704: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22724: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22707: \$? = $ac_status" >&5
++  echo "$as_me:22727: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=yes
+ 
+@@ -22720,11 +22740,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:22723: result: $sigact_bad" >&5
++echo "$as_me:22743: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:22727: checking if nanosleep really works" >&5
++echo "$as_me:22747: 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
+@@ -22734,7 +22754,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22737 "configure"
++#line 22757 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22760,15 +22780,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22763: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22783: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22766: \$? = $ac_status" >&5
++  echo "$as_me:22786: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22768: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22788: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22771: \$? = $ac_status" >&5
++  echo "$as_me:22791: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -22780,7 +22800,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22783: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:22803: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -22797,23 +22817,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22800: checking for $ac_header" >&5
++echo "$as_me:22820: 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 22806 "configure"
++#line 22826 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22810: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22830: \"$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:22816: \$? = $ac_status" >&5
++  echo "$as_me:22836: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22832,7 +22852,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22835: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22855: 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:22872: 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 22855 "configure"
++#line 22875 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22864,16 +22884,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22867: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22887: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22870: \$? = $ac_status" >&5
++  echo "$as_me:22890: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22873: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22893: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22876: \$? = $ac_status" >&5
++  echo "$as_me:22896: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=no
+ else
+@@ -22881,7 +22901,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22884 "configure"
++#line 22904 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22895,16 +22915,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22898: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22918: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22901: \$? = $ac_status" >&5
++  echo "$as_me:22921: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22904: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22924: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22907: \$? = $ac_status" >&5
++  echo "$as_me:22927: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=unknown
+ else
+@@ -22920,19 +22940,19 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:22923: result: $termios_bad" >&5
++	echo "$as_me:22943: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:22928: checking for tcgetattr" >&5
++echo "$as_me:22948: 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 22935 "configure"
++#line 22955 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22960,16 +22980,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22963: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22983: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22966: \$? = $ac_status" >&5
++  echo "$as_me:22986: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22969: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22989: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22972: \$? = $ac_status" >&5
++  echo "$as_me:22992: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -22979,21 +22999,21 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22982: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:23002: 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:22989: checking for vsscanf function or workaround" >&5
++echo "$as_me:23009: 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 22996 "configure"
++#line 23016 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23019,16 +23039,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23022: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23042: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23025: \$? = $ac_status" >&5
++  echo "$as_me:23045: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23028: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23048: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23031: \$? = $ac_status" >&5
++  echo "$as_me:23051: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -23036,7 +23056,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23039 "configure"
++#line 23059 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23058,16 +23078,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23061: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23081: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23064: \$? = $ac_status" >&5
++  echo "$as_me:23084: \$? = $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:23087: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23070: \$? = $ac_status" >&5
++  echo "$as_me:23090: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -23075,7 +23095,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23078 "configure"
++#line 23098 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23097,16 +23117,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23100: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23120: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23103: \$? = $ac_status" >&5
++  echo "$as_me:23123: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23106: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23126: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23109: \$? = $ac_status" >&5
++  echo "$as_me:23129: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -23121,7 +23141,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23124: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:23144: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case "$cf_cv_func_vsscanf" in
+@@ -23147,23 +23167,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:23150: checking for $ac_header" >&5
++echo "$as_me:23170: 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 23156 "configure"
++#line 23176 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23160: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23180: \"$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:23166: \$? = $ac_status" >&5
++  echo "$as_me:23186: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23182,7 +23202,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23185: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23205: 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:23215: 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
+@@ -23203,7 +23223,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23206 "configure"
++#line 23226 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23238,15 +23258,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23241: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23261: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23244: \$? = $ac_status" >&5
++  echo "$as_me:23264: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23246: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23266: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23249: \$? = $ac_status" >&5
++  echo "$as_me:23269: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -23261,16 +23281,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:23264: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:23284: 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:23267: checking for mkstemp" >&5
++	echo "$as_me:23287: 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 23273 "configure"
++#line 23293 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23301,16 +23321,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23304: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23324: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23307: \$? = $ac_status" >&5
++  echo "$as_me:23327: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23310: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23330: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23313: \$? = $ac_status" >&5
++  echo "$as_me:23333: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -23320,7 +23340,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23323: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:23343: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -23341,21 +23361,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:23344: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:23364: 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:23347: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:23367: 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:23353: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:23373: 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 23358 "configure"
++#line 23378 "configure"
+ #include "confdefs.h"
+ #include 
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -23372,15 +23392,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23375: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23395: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23378: \$? = $ac_status" >&5
++  echo "$as_me:23398: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23380: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23400: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23383: \$? = $ac_status" >&5
++  echo "$as_me:23403: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -23393,7 +23413,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:23396: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:23416: 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
+ 
+@@ -23404,13 +23424,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:23407: checking for intptr_t" >&5
++echo "$as_me:23427: 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 23413 "configure"
++#line 23433 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23425,16 +23445,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23428: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23448: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23431: \$? = $ac_status" >&5
++  echo "$as_me:23451: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23434: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23454: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23437: \$? = $ac_status" >&5
++  echo "$as_me:23457: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -23444,7 +23464,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23447: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:23467: 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
+   :
+@@ -23456,13 +23476,13 @@
+ 
+ fi
+ 
+-echo "$as_me:23459: checking for ssize_t" >&5
++echo "$as_me:23479: 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 23465 "configure"
++#line 23485 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23477,16 +23497,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23480: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23500: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23483: \$? = $ac_status" >&5
++  echo "$as_me:23503: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23486: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23506: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23489: \$? = $ac_status" >&5
++  echo "$as_me:23509: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -23496,7 +23516,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23499: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:23519: 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
+   :
+@@ -23508,14 +23528,14 @@
+ 
+ fi
+ 
+-echo "$as_me:23511: checking for type sigaction_t" >&5
++echo "$as_me:23531: 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 23518 "configure"
++#line 23538 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23528,16 +23548,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23531: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23551: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23534: \$? = $ac_status" >&5
++  echo "$as_me:23554: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23537: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23557: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23540: \$? = $ac_status" >&5
++  echo "$as_me:23560: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -23548,14 +23568,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:23551: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:23571: 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:23558: checking declaration of size-change" >&5
++echo "$as_me:23578: 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
+@@ -23576,7 +23596,7 @@
+ 
+ 	fi
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23579 "configure"
++#line 23599 "configure"
+ #include "confdefs.h"
+ #include 
+ #ifdef HAVE_TERMIOS_H
+@@ -23626,16 +23646,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23629: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23649: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23632: \$? = $ac_status" >&5
++  echo "$as_me:23652: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23635: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23655: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23638: \$? = $ac_status" >&5
++  echo "$as_me:23658: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -23654,7 +23674,7 @@
+ done
+ 
+ fi
+-echo "$as_me:23657: result: $cf_cv_sizechange" >&5
++echo "$as_me:23677: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -23672,13 +23692,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:23675: checking for memmove" >&5
++echo "$as_me:23695: 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 23681 "configure"
++#line 23701 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23709,16 +23729,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23712: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23732: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23715: \$? = $ac_status" >&5
++  echo "$as_me:23735: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23718: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23738: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23721: \$? = $ac_status" >&5
++  echo "$as_me:23741: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -23728,19 +23748,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23731: result: $ac_cv_func_memmove" >&5
++echo "$as_me:23751: 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:23737: checking for bcopy" >&5
++echo "$as_me:23757: 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 23743 "configure"
++#line 23763 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23771,16 +23791,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23774: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23794: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23777: \$? = $ac_status" >&5
++  echo "$as_me:23797: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23780: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23800: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23783: \$? = $ac_status" >&5
++  echo "$as_me:23803: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -23790,11 +23810,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23793: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:23813: 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:23797: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:23817: 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
+@@ -23804,7 +23824,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23807 "configure"
++#line 23827 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23820,15 +23840,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23823: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23843: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23826: \$? = $ac_status" >&5
++  echo "$as_me:23846: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23828: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23848: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23831: \$? = $ac_status" >&5
++  echo "$as_me:23851: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -23841,7 +23861,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:23844: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:23864: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -23868,13 +23888,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23871: checking for $ac_func" >&5
++echo "$as_me:23891: 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 23877 "configure"
++#line 23897 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23905,16 +23925,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23908: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23928: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23911: \$? = $ac_status" >&5
++  echo "$as_me:23931: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23914: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23934: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23917: \$? = $ac_status" >&5
++  echo "$as_me:23937: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23924,7 +23944,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23927: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23947: 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:23957: 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
+@@ -23944,7 +23964,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23947 "configure"
++#line 23967 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23997,15 +24017,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24000: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24020: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24003: \$? = $ac_status" >&5
++  echo "$as_me:24023: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24005: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24025: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24008: \$? = $ac_status" >&5
++  echo "$as_me:24028: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -24017,21 +24037,21 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24020: result: $cf_cv_working_poll" >&5
++echo "$as_me:24040: 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:24027: checking if MB_LEN_MAX is usable" >&5
++echo "$as_me:24047: checking if MB_LEN_MAX is usable" >&5
+ echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
+ if test "${cf_cv_mb_len_max+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24034 "configure"
++#line 24054 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24051,16 +24071,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24054: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24074: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24057: \$? = $ac_status" >&5
++  echo "$as_me:24077: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24060: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24080: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24063: \$? = $ac_status" >&5
++  echo "$as_me:24083: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mb_len_max=yes
+ else
+@@ -24070,7 +24090,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24073: result: $cf_cv_mb_len_max" >&5
++echo "$as_me:24093: result: $cf_cv_mb_len_max" >&5
+ echo "${ECHO_T}$cf_cv_mb_len_max" >&6
+ if test "$cf_cv_mb_len_max" = yes
+ then
+@@ -24080,18 +24100,18 @@
+ EOF
+ 
+ else
+-	{ echo "$as_me:24083: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
++	{ echo "$as_me:24103: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+ echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
+ fi
+ 
+-echo "$as_me:24087: checking for va_copy" >&5
++echo "$as_me:24107: 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 24094 "configure"
++#line 24114 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24108,16 +24128,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24111: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24131: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24114: \$? = $ac_status" >&5
++  echo "$as_me:24134: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24117: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24137: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24120: \$? = $ac_status" >&5
++  echo "$as_me:24140: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -24127,7 +24147,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24130: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:24150: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -24139,14 +24159,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:24142: checking for __va_copy" >&5
++echo "$as_me:24162: 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 24149 "configure"
++#line 24169 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24163,16 +24183,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24166: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24186: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24169: \$? = $ac_status" >&5
++  echo "$as_me:24189: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24172: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24192: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24175: \$? = $ac_status" >&5
++  echo "$as_me:24195: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -24182,7 +24202,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24185: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:24205: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -24194,14 +24214,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:24197: checking for __builtin_va_copy" >&5
++echo "$as_me:24217: 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 24204 "configure"
++#line 24224 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24218,16 +24238,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24221: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24241: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24224: \$? = $ac_status" >&5
++  echo "$as_me:24244: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24227: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24247: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24230: \$? = $ac_status" >&5
++  echo "$as_me:24250: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -24237,7 +24257,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24240: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:24260: 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 &&
+@@ -24255,14 +24275,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:24258: checking if we can simply copy va_list" >&5
++	echo "$as_me:24278: 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 24265 "configure"
++#line 24285 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24279,16 +24299,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24282: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24302: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24285: \$? = $ac_status" >&5
++  echo "$as_me:24305: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24288: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24308: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24291: \$? = $ac_status" >&5
++  echo "$as_me:24311: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -24298,19 +24318,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24301: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:24321: 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:24306: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:24326: 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 24313 "configure"
++#line 24333 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24327,16 +24347,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24330: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24350: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24333: \$? = $ac_status" >&5
++  echo "$as_me:24353: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24336: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24356: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24339: \$? = $ac_status" >&5
++  echo "$as_me:24359: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -24346,7 +24366,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24349: result: $cf_cv_array_va_list" >&5
++echo "$as_me:24369: 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
+@@ -24357,13 +24377,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:24360: checking for pid_t" >&5
++echo "$as_me:24380: 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 24366 "configure"
++#line 24386 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24378,16 +24398,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24381: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24401: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24384: \$? = $ac_status" >&5
++  echo "$as_me:24404: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24387: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24407: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24390: \$? = $ac_status" >&5
++  echo "$as_me:24410: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -24397,7 +24417,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24400: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:24420: 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
+   :
+@@ -24412,23 +24432,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:24415: checking for $ac_header" >&5
++echo "$as_me:24435: 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 24421 "configure"
++#line 24441 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:24425: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:24445: \"$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:24431: \$? = $ac_status" >&5
++  echo "$as_me:24451: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -24447,7 +24467,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24450: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:24470: 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:24483: 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 24469 "configure"
++#line 24489 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -24497,16 +24517,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24500: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24520: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24503: \$? = $ac_status" >&5
++  echo "$as_me:24523: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24506: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24526: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24509: \$? = $ac_status" >&5
++  echo "$as_me:24529: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -24516,7 +24536,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24519: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:24539: 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:24551: 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
+@@ -24551,15 +24571,15 @@
+       }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24554: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24574: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24557: \$? = $ac_status" >&5
++  echo "$as_me:24577: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24559: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24579: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24562: \$? = $ac_status" >&5
++  echo "$as_me:24582: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -24571,7 +24591,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24574: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:24594: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -24585,12 +24605,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:24588: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24608: 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:24593: checking for working vfork" >&5
++  echo "$as_me:24613: 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
+@@ -24599,7 +24619,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24602 "configure"
++#line 24622 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include 
+@@ -24692,15 +24712,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24695: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24715: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24698: \$? = $ac_status" >&5
++  echo "$as_me:24718: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24700: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24720: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24703: \$? = $ac_status" >&5
++  echo "$as_me:24723: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -24712,13 +24732,13 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24715: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:24735: 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:24721: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24741: 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
+ 
+@@ -24743,7 +24763,7 @@
+ 
+ fi
+ 
+-echo "$as_me:24746: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:24766: 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
+@@ -24753,7 +24773,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24756 "configure"
++#line 24776 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24788,15 +24808,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24791: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24811: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24794: \$? = $ac_status" >&5
++  echo "$as_me:24814: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24796: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24816: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24799: \$? = $ac_status" >&5
++  echo "$as_me:24819: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fopen_bin_r=yes
+ else
+@@ -24809,20 +24829,20 @@
+ fi
+ 
+ fi
+-echo "$as_me:24812: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:24832: 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
+ #define USE_FOPEN_BIN_R 1
+ EOF
+ 
+-	echo "$as_me:24819: checking for cc_t" >&5
++	echo "$as_me:24839: checking for cc_t" >&5
+ echo $ECHO_N "checking for cc_t... $ECHO_C" >&6
+ if test "${ac_cv_type_cc_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24825 "configure"
++#line 24845 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24840,16 +24860,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24843: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24863: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24846: \$? = $ac_status" >&5
++  echo "$as_me:24866: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24849: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24869: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24852: \$? = $ac_status" >&5
++  echo "$as_me:24872: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_cc_t=yes
+ else
+@@ -24859,7 +24879,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24862: result: $ac_cv_type_cc_t" >&5
++echo "$as_me:24882: result: $ac_cv_type_cc_t" >&5
+ echo "${ECHO_T}$ac_cv_type_cc_t" >&6
+ if test "$ac_cv_type_cc_t" = yes; then
+ 
+@@ -24869,13 +24889,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:24872: checking for speed_t" >&5
++	echo "$as_me:24892: checking for speed_t" >&5
+ echo $ECHO_N "checking for speed_t... $ECHO_C" >&6
+ if test "${ac_cv_type_speed_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24878 "configure"
++#line 24898 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24893,16 +24913,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24896: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24916: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24899: \$? = $ac_status" >&5
++  echo "$as_me:24919: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24902: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24922: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24905: \$? = $ac_status" >&5
++  echo "$as_me:24925: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_speed_t=yes
+ else
+@@ -24912,7 +24932,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24915: result: $ac_cv_type_speed_t" >&5
++echo "$as_me:24935: result: $ac_cv_type_speed_t" >&5
+ echo "${ECHO_T}$ac_cv_type_speed_t" >&6
+ if test "$ac_cv_type_speed_t" = yes; then
+ 
+@@ -24922,13 +24942,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:24925: checking for tcflag_t" >&5
++	echo "$as_me:24945: checking for tcflag_t" >&5
+ echo $ECHO_N "checking for tcflag_t... $ECHO_C" >&6
+ if test "${ac_cv_type_tcflag_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24931 "configure"
++#line 24951 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24946,16 +24966,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24949: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24969: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24952: \$? = $ac_status" >&5
++  echo "$as_me:24972: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24955: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24975: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24958: \$? = $ac_status" >&5
++  echo "$as_me:24978: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_tcflag_t=yes
+ else
+@@ -24965,7 +24985,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24968: result: $ac_cv_type_tcflag_t" >&5
++echo "$as_me:24988: result: $ac_cv_type_tcflag_t" >&5
+ echo "${ECHO_T}$ac_cv_type_tcflag_t" >&6
+ if test "$ac_cv_type_tcflag_t" = yes; then
+ 
+@@ -24975,13 +24995,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:24978: checking for sigset_t" >&5
++	echo "$as_me:24998: checking for sigset_t" >&5
+ echo $ECHO_N "checking for sigset_t... $ECHO_C" >&6
+ if test "${ac_cv_type_sigset_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24984 "configure"
++#line 25004 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24999,16 +25019,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25002: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25022: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25005: \$? = $ac_status" >&5
++  echo "$as_me:25025: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25008: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25028: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25011: \$? = $ac_status" >&5
++  echo "$as_me:25031: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_sigset_t=yes
+ else
+@@ -25018,7 +25038,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:25021: result: $ac_cv_type_sigset_t" >&5
++echo "$as_me:25041: result: $ac_cv_type_sigset_t" >&5
+ echo "${ECHO_T}$ac_cv_type_sigset_t" >&6
+ if test "$ac_cv_type_sigset_t" = yes; then
+ 
+@@ -25030,7 +25050,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:25033: checking for openpty in -lutil" >&5
++echo "$as_me:25053: 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
+@@ -25038,7 +25058,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25041 "configure"
++#line 25061 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -25057,16 +25077,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25060: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25080: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25063: \$? = $ac_status" >&5
++  echo "$as_me:25083: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25066: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25086: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25069: \$? = $ac_status" >&5
++  echo "$as_me:25089: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -25077,7 +25097,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:25080: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:25100: 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
+@@ -25085,7 +25105,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:25088: checking for openpty header" >&5
++echo "$as_me:25108: 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
+@@ -25112,7 +25132,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25115 "configure"
++#line 25135 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -25130,16 +25150,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25133: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25153: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25136: \$? = $ac_status" >&5
++  echo "$as_me:25156: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25139: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25159: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25142: \$? = $ac_status" >&5
++  echo "$as_me:25162: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -25157,7 +25177,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:25160: result: $cf_cv_func_openpty" >&5
++echo "$as_me:25180: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -25230,7 +25250,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25233 "configure"
++#line 25253 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -25242,16 +25262,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25245: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25265: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25248: \$? = $ac_status" >&5
++  echo "$as_me:25268: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25251: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25271: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25254: \$? = $ac_status" >&5
++  echo "$as_me:25274: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25268,7 +25288,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}:25271: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25291: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25304,7 +25324,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}:25307: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25327: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25315,7 +25335,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:25318: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:25338: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -25387,7 +25407,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25390 "configure"
++#line 25410 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -25399,16 +25419,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25402: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25422: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25405: \$? = $ac_status" >&5
++  echo "$as_me:25425: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25408: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25428: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25411: \$? = $ac_status" >&5
++  echo "$as_me:25431: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25425,7 +25445,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}:25428: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25448: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25505,7 +25525,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}:25508: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25528: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25522,23 +25542,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:25525: checking for db.h" >&5
++echo "$as_me:25545: 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 25531 "configure"
++#line 25551 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:25535: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25555: \"$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:25541: \$? = $ac_status" >&5
++  echo "$as_me:25561: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -25557,11 +25577,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25560: result: $ac_cv_header_db_h" >&5
++echo "$as_me:25580: 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:25564: checking for version of db" >&5
++echo "$as_me:25584: 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
+@@ -25572,10 +25592,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:25575: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:25595: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25578 "configure"
++#line 25598 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25605,16 +25625,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25608: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25628: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25611: \$? = $ac_status" >&5
++  echo "$as_me:25631: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25614: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25634: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25617: \$? = $ac_status" >&5
++  echo "$as_me:25637: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -25628,16 +25648,16 @@
+ done
+ 
+ fi
+-echo "$as_me:25631: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:25651: 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:25635: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:25655: 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:25640: checking for db libraries" >&5
++echo "$as_me:25660: 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
+@@ -25667,10 +25687,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:25670: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:25690: testing checking for library $cf_db_libs ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25673 "configure"
++#line 25693 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25725,16 +25745,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25728: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25748: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25731: \$? = $ac_status" >&5
++  echo "$as_me:25751: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25734: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25754: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25737: \$? = $ac_status" >&5
++  echo "$as_me:25757: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -25754,11 +25774,11 @@
+ done
+ 
+ fi
+-echo "$as_me:25757: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:25777: 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:25761: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:25781: 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
+@@ -25784,7 +25804,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:25787: error: Cannot find db.h" >&5
++	{ { echo "$as_me:25807: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -25799,7 +25819,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:25802: checking if we should include stdbool.h" >&5
++echo "$as_me:25822: 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
+@@ -25807,7 +25827,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25810 "configure"
++#line 25830 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -25819,23 +25839,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25822: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25842: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25825: \$? = $ac_status" >&5
++  echo "$as_me:25845: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25828: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25848: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25831: \$? = $ac_status" >&5
++  echo "$as_me:25851: \$? = $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 25838 "configure"
++#line 25858 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -25851,16 +25871,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25854: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25874: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25857: \$? = $ac_status" >&5
++  echo "$as_me:25877: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25860: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25880: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25863: \$? = $ac_status" >&5
++  echo "$as_me:25883: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -25874,13 +25894,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:25877: result: yes" >&5
++then	echo "$as_me:25897: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25879: result: no" >&5
++else	echo "$as_me:25899: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:25883: checking for builtin bool type" >&5
++echo "$as_me:25903: 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
+@@ -25888,7 +25908,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25891 "configure"
++#line 25911 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25903,16 +25923,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25906: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25926: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25909: \$? = $ac_status" >&5
++  echo "$as_me:25929: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25912: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25932: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25915: \$? = $ac_status" >&5
++  echo "$as_me:25935: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -25925,9 +25945,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:25928: result: yes" >&5
++then	echo "$as_me:25948: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25930: result: no" >&5
++else	echo "$as_me:25950: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -25944,10 +25964,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:25947: checking if we already have C++ library" >&5
++	echo "$as_me:25967: 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 25950 "configure"
++#line 25970 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -25961,16 +25981,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25964: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25984: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25967: \$? = $ac_status" >&5
++  echo "$as_me:25987: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25970: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25990: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25973: \$? = $ac_status" >&5
++  echo "$as_me:25993: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -25979,7 +25999,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-	echo "$as_me:25982: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:26002: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -25998,7 +26018,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:26001: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:26021: 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
+@@ -26024,7 +26044,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26027 "configure"
++#line 26047 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -26038,16 +26058,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26041: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26061: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26044: \$? = $ac_status" >&5
++  echo "$as_me:26064: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26047: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26067: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26050: \$? = $ac_status" >&5
++  echo "$as_me:26070: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -26059,7 +26079,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:26062: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:26082: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -26081,7 +26101,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:26084: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:26104: 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
+@@ -26096,15 +26116,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:26099: \"$ac_try\"") >&5
++if { (eval echo "$as_me:26119: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26102: \$? = $ac_status" >&5
++  echo "$as_me:26122: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:26104: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:26124: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26107: \$? = $ac_status" >&5
++  echo "$as_me:26127: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -26115,10 +26135,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+-  echo "$as_me:26118: result: yes" >&5
++  echo "$as_me:26138: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:26121: result: no" >&5
++  echo "$as_me:26141: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -26138,7 +26158,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:26141: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:26161: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -26159,7 +26179,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26162 "configure"
++#line 26182 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -26173,16 +26193,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26176: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26196: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26179: \$? = $ac_status" >&5
++  echo "$as_me:26199: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26182: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26202: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26185: \$? = $ac_status" >&5
++  echo "$as_me:26205: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -26219,7 +26239,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26222 "configure"
++#line 26242 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26233,16 +26253,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26236: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26256: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26239: \$? = $ac_status" >&5
++  echo "$as_me:26259: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26242: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26262: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26245: \$? = $ac_status" >&5
++  echo "$as_me:26265: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -26275,7 +26295,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	LIBS="$cf_save"
+-	echo "$as_me:26278: result: $cf_cxx_library" >&5
++	echo "$as_me:26298: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -26291,7 +26311,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:26294: checking how to run the C++ preprocessor" >&5
++echo "$as_me:26314: 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
+@@ -26308,18 +26328,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 26311 "configure"
++#line 26331 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26316: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26336: \"$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:26322: \$? = $ac_status" >&5
++  echo "$as_me:26342: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26342,17 +26362,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26345 "configure"
++#line 26365 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26349: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26369: \"$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:26355: \$? = $ac_status" >&5
++  echo "$as_me:26375: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26389,7 +26409,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:26392: result: $CXXCPP" >&5
++echo "$as_me:26412: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -26399,18 +26419,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 26402 "configure"
++#line 26422 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26407: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26427: \"$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:26413: \$? = $ac_status" >&5
++  echo "$as_me:26433: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26433,17 +26453,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26436 "configure"
++#line 26456 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26440: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26460: \"$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:26446: \$? = $ac_status" >&5
++  echo "$as_me:26466: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26471,7 +26491,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:26474: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:26494: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -26486,23 +26506,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:26489: checking for $ac_header" >&5
++echo "$as_me:26509: 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 26495 "configure"
++#line 26515 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26499: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26519: \"$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:26505: \$? = $ac_status" >&5
++  echo "$as_me:26525: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26521,7 +26541,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26524: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26544: 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:26557: 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 26543 "configure"
++#line 26563 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26547: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26567: \"$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:26553: \$? = $ac_status" >&5
++  echo "$as_me:26573: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26569,7 +26589,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26572: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26592: 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:26603: 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 26586 "configure"
++#line 26606 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26600,16 +26620,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26603: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26623: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26606: \$? = $ac_status" >&5
++  echo "$as_me:26626: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26609: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26629: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26612: \$? = $ac_status" >&5
++  echo "$as_me:26632: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -26618,7 +26638,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:26621: result: $cf_iostream_namespace" >&5
++	echo "$as_me:26641: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -26629,7 +26649,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:26632: checking if we should include stdbool.h" >&5
++echo "$as_me:26652: 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
+@@ -26637,7 +26657,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26640 "configure"
++#line 26660 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -26649,23 +26669,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26652: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26672: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26655: \$? = $ac_status" >&5
++  echo "$as_me:26675: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26658: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26678: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26661: \$? = $ac_status" >&5
++  echo "$as_me:26681: \$? = $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 26668 "configure"
++#line 26688 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -26681,16 +26701,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26684: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26704: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26687: \$? = $ac_status" >&5
++  echo "$as_me:26707: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26690: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26710: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26693: \$? = $ac_status" >&5
++  echo "$as_me:26713: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -26704,13 +26724,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:26707: result: yes" >&5
++then	echo "$as_me:26727: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:26709: result: no" >&5
++else	echo "$as_me:26729: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:26713: checking for builtin bool type" >&5
++echo "$as_me:26733: 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
+@@ -26718,7 +26738,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26721 "configure"
++#line 26741 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26733,16 +26753,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26736: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26756: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26739: \$? = $ac_status" >&5
++  echo "$as_me:26759: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26742: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26762: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26745: \$? = $ac_status" >&5
++  echo "$as_me:26765: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -26755,19 +26775,19 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:26758: result: yes" >&5
++then	echo "$as_me:26778: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:26760: result: no" >&5
++else	echo "$as_me:26780: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:26764: checking for bool" >&5
++echo "$as_me:26784: 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 26770 "configure"
++#line 26790 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26802,16 +26822,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26805: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26825: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26808: \$? = $ac_status" >&5
++  echo "$as_me:26828: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26811: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26831: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26814: \$? = $ac_status" >&5
++  echo "$as_me:26834: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -26821,10 +26841,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26824: result: $ac_cv_type_bool" >&5
++echo "$as_me:26844: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:26827: checking size of bool" >&5
++echo "$as_me:26847: 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
+@@ -26833,7 +26853,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26836 "configure"
++#line 26856 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26865,21 +26885,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26868: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26888: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26871: \$? = $ac_status" >&5
++  echo "$as_me:26891: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26874: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26894: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26877: \$? = $ac_status" >&5
++  echo "$as_me:26897: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26882 "configure"
++#line 26902 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26911,16 +26931,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26914: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26934: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26917: \$? = $ac_status" >&5
++  echo "$as_me:26937: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26920: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26940: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26923: \$? = $ac_status" >&5
++  echo "$as_me:26943: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -26936,7 +26956,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26939 "configure"
++#line 26959 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26968,16 +26988,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26971: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26991: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26974: \$? = $ac_status" >&5
++  echo "$as_me:26994: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26977: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26997: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26980: \$? = $ac_status" >&5
++  echo "$as_me:27000: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -26993,7 +27013,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 26996 "configure"
++#line 27016 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27025,16 +27045,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27028: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27048: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27031: \$? = $ac_status" >&5
++  echo "$as_me:27051: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27034: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27054: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27037: \$? = $ac_status" >&5
++  echo "$as_me:27057: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27047,12 +27067,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27050: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27070: 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 27055 "configure"
++#line 27075 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27088,15 +27108,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27091: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27111: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27094: \$? = $ac_status" >&5
++  echo "$as_me:27114: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27096: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27116: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27099: \$? = $ac_status" >&5
++  echo "$as_me:27119: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27112,13 +27132,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27115: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27135: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27141: 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
+@@ -27137,7 +27157,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27140 "configure"
++#line 27160 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27178,15 +27198,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27181: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27201: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27184: \$? = $ac_status" >&5
++  echo "$as_me:27204: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27186: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27206: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27189: \$? = $ac_status" >&5
++  echo "$as_me:27209: \$? = $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
+@@ -27203,19 +27223,19 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:27206: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:27226: 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:27213: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:27233: 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:27218: checking for special defines needed for etip.h" >&5
++echo "$as_me:27238: 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"
+@@ -27233,7 +27253,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 27236 "configure"
++#line 27256 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -27247,16 +27267,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27250: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27270: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27253: \$? = $ac_status" >&5
++  echo "$as_me:27273: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27256: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27276: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27259: \$? = $ac_status" >&5
++  echo "$as_me:27279: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:27300: result: ${cf_result:-(none)}" >&5
+ echo "${ECHO_T}${cf_result:-(none)}" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27285: checking if $CXX accepts override keyword" >&5
++echo "$as_me:27305: checking if $CXX accepts override keyword" >&5
+ echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
+ if test "${cf_cv_cpp_override+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27299,7 +27319,7 @@
+   cf_cv_cpp_override=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27302 "configure"
++#line 27322 "configure"
+ #include "confdefs.h"
+ 
+ class base
+@@ -27318,15 +27338,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27321: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27341: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27324: \$? = $ac_status" >&5
++  echo "$as_me:27344: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27326: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27346: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27329: \$? = $ac_status" >&5
++  echo "$as_me:27349: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_override=yes
+ else
+@@ -27345,7 +27365,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27348: result: $cf_cv_cpp_override" >&5
++echo "$as_me:27368: result: $cf_cv_cpp_override" >&5
+ echo "${ECHO_T}$cf_cv_cpp_override" >&6
+ fi
+ test "$cf_cv_cpp_override" = yes &&
+@@ -27354,7 +27374,7 @@
+ EOF
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27357: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:27377: 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
+@@ -27371,7 +27391,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27374 "configure"
++#line 27394 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -27390,15 +27410,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27393: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27413: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27396: \$? = $ac_status" >&5
++  echo "$as_me:27416: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27398: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27418: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27401: \$? = $ac_status" >&5
++  echo "$as_me:27421: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -27417,7 +27437,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27420: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:27440: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -27427,7 +27447,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:27430: checking if $CXX accepts static_cast" >&5
++echo "$as_me:27450: 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
+@@ -27441,7 +27461,7 @@
+ ac_main_return="return"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27444 "configure"
++#line 27464 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -27485,16 +27505,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27488: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27508: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27491: \$? = $ac_status" >&5
++  echo "$as_me:27511: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27494: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27514: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27497: \$? = $ac_status" >&5
++  echo "$as_me:27517: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -27512,7 +27532,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27515: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:27535: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -27560,13 +27580,13 @@
+ 		cf_cv_header_stdbool_h=0
+ 	else
+ 
+-echo "$as_me:27563: checking for bool" >&5
++echo "$as_me:27583: 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 27569 "configure"
++#line 27589 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27601,16 +27621,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27604: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27624: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27607: \$? = $ac_status" >&5
++  echo "$as_me:27627: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27610: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27630: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27613: \$? = $ac_status" >&5
++  echo "$as_me:27633: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -27620,10 +27640,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27623: result: $ac_cv_type_bool" >&5
++echo "$as_me:27643: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:27626: checking size of bool" >&5
++echo "$as_me:27646: 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
+@@ -27632,7 +27652,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27635 "configure"
++#line 27655 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27664,21 +27684,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27667: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27687: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27670: \$? = $ac_status" >&5
++  echo "$as_me:27690: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27673: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27693: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27676: \$? = $ac_status" >&5
++  echo "$as_me:27696: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27681 "configure"
++#line 27701 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27710,16 +27730,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27713: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27733: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27716: \$? = $ac_status" >&5
++  echo "$as_me:27736: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27719: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27739: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27722: \$? = $ac_status" >&5
++  echo "$as_me:27742: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -27735,7 +27755,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27738 "configure"
++#line 27758 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27767,16 +27787,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27770: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27790: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27773: \$? = $ac_status" >&5
++  echo "$as_me:27793: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27776: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27796: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27779: \$? = $ac_status" >&5
++  echo "$as_me:27799: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27792,7 +27812,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 27795 "configure"
++#line 27815 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27824,16 +27844,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27827: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27847: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27830: \$? = $ac_status" >&5
++  echo "$as_me:27850: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27833: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27853: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27836: \$? = $ac_status" >&5
++  echo "$as_me:27856: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27846,12 +27866,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27849: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27869: 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 27854 "configure"
++#line 27874 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27887,15 +27907,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27890: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27910: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27893: \$? = $ac_status" >&5
++  echo "$as_me:27913: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27895: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27915: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27898: \$? = $ac_status" >&5
++  echo "$as_me:27918: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27911,13 +27931,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27914: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27934: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27940: 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
+@@ -27936,7 +27956,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27939 "configure"
++#line 27959 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27977,15 +27997,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27980: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28000: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27983: \$? = $ac_status" >&5
++  echo "$as_me:28003: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27985: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28005: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27988: \$? = $ac_status" >&5
++  echo "$as_me:28008: \$? = $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
+@@ -28002,14 +28022,14 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:28005: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:28025: 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:28012: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:28032: 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
+@@ -28040,7 +28060,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:28043: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:28063: 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
+@@ -28051,7 +28071,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:28054: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:28074: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -28068,10 +28088,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:28071: result: $ADAFLAGS" >&5
++	echo "$as_me:28091: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:28074: checking if GNATPREP supports -T option" >&5
++echo "$as_me:28094: 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
+@@ -28081,11 +28101,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:28084: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:28104: 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:28088: checking if GNAT supports generics" >&5
++echo "$as_me:28108: 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])
+@@ -28095,7 +28115,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:28098: result: $cf_gnat_generics" >&5
++echo "$as_me:28118: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -28107,7 +28127,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:28110: checking if GNAT supports SIGINT" >&5
++echo "$as_me:28130: 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
+@@ -28155,7 +28175,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:28158: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:28178: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -28168,7 +28188,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:28171: checking if GNAT supports project files" >&5
++echo "$as_me:28191: 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]*)
+@@ -28231,15 +28251,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:28234: result: $cf_gnat_projects" >&5
++echo "$as_me:28254: 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:28240: checking if GNAT supports libraries" >&5
++	echo "$as_me:28260: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:28242: result: $cf_gnat_libraries" >&5
++	echo "$as_me:28262: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -28259,7 +28279,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:28262: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:28282: 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
+@@ -28271,7 +28291,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:28274: checking for Ada95 compiler" >&5
++echo "$as_me:28294: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -28282,12 +28302,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:28285: result: $cf_ada_compiler" >&5
++echo "$as_me:28305: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:28290: checking for Ada95 include directory" >&5
++echo "$as_me:28310: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -28321,7 +28341,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28324: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28344: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28330,10 +28350,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:28333: result: $ADA_INCLUDE" >&5
++echo "$as_me:28353: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:28336: checking for Ada95 object directory" >&5
++echo "$as_me:28356: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -28367,7 +28387,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28370: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28390: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28376,10 +28396,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:28379: result: $ADA_OBJECTS" >&5
++echo "$as_me:28399: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:28382: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:28402: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -28400,11 +28420,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:28403: result: $with_ada_sharedlib" >&5
++echo "$as_me:28423: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+-	{ echo "$as_me:28407: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++	{ echo "$as_me:28427: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+ 
+@@ -28422,7 +28442,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:28425: checking for Ada95 curses library name" >&5
++echo "$as_me:28445: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -28438,7 +28458,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28441: result: $ADA_LIBNAME" >&5
++echo "$as_me:28461: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -28449,13 +28469,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:28452: checking for wchar_t" >&5
++	echo "$as_me:28472: 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 28458 "configure"
++#line 28478 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28470,16 +28490,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28473: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28493: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28476: \$? = $ac_status" >&5
++  echo "$as_me:28496: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28479: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28499: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28482: \$? = $ac_status" >&5
++  echo "$as_me:28502: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -28489,10 +28509,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:28492: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:28512: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:28495: checking size of wchar_t" >&5
++echo "$as_me:28515: 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
+@@ -28501,7 +28521,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28504 "configure"
++#line 28524 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28513,21 +28533,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28516: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28536: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28519: \$? = $ac_status" >&5
++  echo "$as_me:28539: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28522: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28542: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28525: \$? = $ac_status" >&5
++  echo "$as_me:28545: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28530 "configure"
++#line 28550 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28539,16 +28559,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28542: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28562: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28545: \$? = $ac_status" >&5
++  echo "$as_me:28565: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28548: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28568: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28551: \$? = $ac_status" >&5
++  echo "$as_me:28571: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -28564,7 +28584,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28567 "configure"
++#line 28587 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28576,16 +28596,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28579: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28599: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28582: \$? = $ac_status" >&5
++  echo "$as_me:28602: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28585: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28605: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28588: \$? = $ac_status" >&5
++  echo "$as_me:28608: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -28601,7 +28621,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 28604 "configure"
++#line 28624 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28613,16 +28633,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28616: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28636: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28619: \$? = $ac_status" >&5
++  echo "$as_me:28639: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28622: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28642: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28625: \$? = $ac_status" >&5
++  echo "$as_me:28645: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -28635,12 +28655,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:28638: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:28658: 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 28643 "configure"
++#line 28663 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28656,15 +28676,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:28659: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28679: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28662: \$? = $ac_status" >&5
++  echo "$as_me:28682: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:28664: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28684: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28667: \$? = $ac_status" >&5
++  echo "$as_me:28687: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -28680,7 +28700,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:28683: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:28703: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&6
+ 
+-echo "${as_me:-configure}:28696: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:28716: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -28711,7 +28731,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:28714: checking for library subsets" >&5
++echo "$as_me:28734: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -28765,7 +28785,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:28768: result: $LIB_SUBSETS" >&5
++echo "$as_me:28788: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -28796,7 +28816,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:28799: checking default library suffix" >&5
++echo "$as_me:28819: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28807,10 +28827,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:28810: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:28830: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:28813: checking default library-dependency suffix" >&5
++echo "$as_me:28833: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -28893,10 +28913,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:28896: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28916: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:28899: checking default object directory" >&5
++echo "$as_me:28919: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28912,11 +28932,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:28915: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28935: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28919: checking c++ library-dependency suffix" >&5
++echo "$as_me:28939: 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++)
+@@ -29009,7 +29029,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:29012: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:29032: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -29185,19 +29205,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:29188: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:29208: 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:29197: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:29217: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:29200: \$? = $ac_status" >&5
++  echo "$as_me:29220: \$? = $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
+@@ -29208,10 +29228,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 29211 "configure"
++#line 29231 "configure"
+ #include "confdefs.h"
+ 
+-#line 29214 "configure"
++#line 29234 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -29226,16 +29246,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:29229: \"$ac_link\"") >&5
++if { (eval echo "$as_me:29249: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:29232: \$? = $ac_status" >&5
++  echo "$as_me:29252: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:29235: \"$ac_try\"") >&5
++  { (eval echo "$as_me:29255: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:29238: \$? = $ac_status" >&5
++  echo "$as_me:29258: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -29258,7 +29278,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:29261: result: $cf_ldflags_static" >&5
++	echo "$as_me:29281: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test "$cf_ldflags_static" != yes
+@@ -29274,7 +29294,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29277: checking where we will install curses.h" >&5
++echo "$as_me:29297: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -29284,7 +29304,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:29287: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:29307: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -29292,7 +29312,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:29295: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:29315: 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
+@@ -29317,7 +29337,7 @@
+ 
+ # pkgsrc uses these
+ 
+-echo "$as_me:29320: checking for desired basename for form library" >&5
++echo "$as_me:29340: 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.
+@@ -29337,10 +29357,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29340: result: $FORM_NAME" >&5
++echo "$as_me:29360: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:29343: checking for desired basename for menu library" >&5
++echo "$as_me:29363: 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.
+@@ -29360,10 +29380,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29363: result: $MENU_NAME" >&5
++echo "$as_me:29383: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:29366: checking for desired basename for panel library" >&5
++echo "$as_me:29386: 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.
+@@ -29383,10 +29403,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29386: result: $PANEL_NAME" >&5
++echo "$as_me:29406: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:29389: checking for desired basename for cxx library" >&5
++echo "$as_me:29409: 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.
+@@ -29406,13 +29426,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29409: result: $CXX_NAME" >&5
++echo "$as_me:29429: 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:29415: checking for src modules" >&5
++echo "$as_me:29435: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -29471,7 +29491,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:29474: result: $cf_cv_src_modules" >&5
++echo "$as_me:29494: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -29632,7 +29652,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:29635: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:29655: 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//'`
+@@ -29643,7 +29663,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:29646: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
++echo "$as_me:29666: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -29659,7 +29679,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:29662: result: $PKG_CFLAGS" >&5
++echo "$as_me:29682: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ case "$cf_cv_system_name" in
+@@ -29731,7 +29751,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
+ 
+-echo "${as_me:-configure}:29734: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
++echo "${as_me:-configure}:29754: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+ 
+ fi
+ 
+@@ -29758,7 +29778,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:29761: checking for linker search path" >&5
++echo "$as_me:29781: 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
+@@ -29806,7 +29826,7 @@
+ 			cf_pathlist="$cf_pathlist /lib /usr/lib"
+ 			;;
+ 		(*)
+-			{ echo "$as_me:29809: WARNING: problem with Solaris architecture" >&5
++			{ echo "$as_me:29829: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ 			;;
+ 		esac
+@@ -29847,7 +29867,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:29850: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29870: 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'`
+@@ -29933,7 +29953,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29936: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29956: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -30114,7 +30134,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:30117: error: ambiguous option: $1
++    { { echo "$as_me:30137: 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;}
+@@ -30133,7 +30153,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:30136: error: unrecognized option: $1
++  -*) { { echo "$as_me:30156: 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;}
+@@ -30265,7 +30285,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:30268: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:30288: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -30365,6 +30385,7 @@
+ s,@VERSION_MAJOR@,$VERSION_MAJOR,;t t
+ s,@VERSION_MINOR@,$VERSION_MINOR,;t t
+ s,@VERSION_PATCH@,$VERSION_PATCH,;t t
++s,@PROGRAM@,$PROGRAM,;t t
+ s,@PACKAGE@,$PACKAGE,;t t
+ s,@build@,$build,;t t
+ s,@build_cpu@,$build_cpu,;t t
+@@ -30486,6 +30507,7 @@
+ s,@RESULTING_SYMS@,$RESULTING_SYMS,;t t
+ s,@VERSIONED_SYMS@,$VERSIONED_SYMS,;t t
+ s,@WILDCARD_SYMS@,$WILDCARD_SYMS,;t t
++s,@REQUIRE_PKG@,$REQUIRE_PKG,;t t
+ s,@cf_ldd_prog@,$cf_ldd_prog,;t t
+ s,@EXTRA_PKG_LDFLAGS@,$EXTRA_PKG_LDFLAGS,;t t
+ s,@EXTRA_SUFFIX@,$EXTRA_SUFFIX,;t t
+@@ -30791,7 +30813,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:30794: creating $ac_file" >&5
++    { echo "$as_me:30816: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -30809,7 +30831,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30812: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30834: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -30822,7 +30844,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30825: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30847: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30838,7 +30860,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:30841: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:30863: 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;}
+@@ -30847,7 +30869,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:30850: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:30872: 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;}
+@@ -30892,7 +30914,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:30895: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:30917: 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;}
+@@ -30903,7 +30925,7 @@
+     $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:30906: WARNING: Some variables may not be substituted:
++      { echo "$as_me:30928: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30952,7 +30974,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:30955: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:30977: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -30963,7 +30985,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30966: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30988: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -30976,7 +30998,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30979: error: cannot find input file: $f" >&5
++           { { echo "$as_me:31001: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -31034,7 +31056,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:31037: $ac_file is unchanged" >&5
++      { echo "$as_me:31059: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -31421,7 +31443,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}:31424: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:31446: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: configure.in
+Prereq:  1.789 
+--- ncurses-6.5-20250111+/configure.in	2024-12-29 00:50:56.000000000 +0000
++++ ncurses-6.5-20250118/configure.in	2025-01-18 11:20:02.000000000 +0000
+@@ -1,5 +1,5 @@
+ dnl***************************************************************************
+-dnl Copyright 2018-2023,2024 Thomas E. Dickey                                *
++dnl Copyright 2018-2024,2025 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.789 2024/12/29 00:50:56 tom Exp $
++dnl $Id: configure.in,v 1.790 2025/01/18 11:20:02 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.789 $)
++AC_REVISION($Revision: 1.790 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -659,7 +659,7 @@
+ AC_SUBST(WHICH_XTERM)
+ 
+ case $host_os in
+-(*linux-gnu|*cygwin|*mingw32|*msys)
++(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc|linux*musl)
+ 	want_xterm_kbs=DEL
+ 	;;
+ (*)
+Index: dist.mk
+Prereq:  1.1650 
+--- ncurses-6.5-20250111+/dist.mk	2025-01-11 12:30:15.000000000 +0000
++++ ncurses-6.5-20250118/dist.mk	2025-01-18 11:23:10.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1650 2025/01/11 12:30:15 tom Exp $
++# $Id: dist.mk,v 1.1651 2025/01/18 11:23:10 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 = 5
+-NCURSES_PATCH = 20250111
++NCURSES_PATCH = 20250118
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.5-20250111+/doc/html/man/captoinfo.1m.html	2024-09-14 20:23:25.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/captoinfo.1m.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-captoinfo 1m 2024-09-13 ncurses 6.5 User commands
++captoinfo 1m 2025-01-18 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                          captoinfo 1m 2024-09-13 ncurses 6.5 User commands
                                                                                                                                                          
++
                                                                                                                                                          captoinfo 1m 2025-01-18 ncurses 6.5 User commands
                                                                                                                                                          
+ 
                                                                                                                                                          + captoinfo(1m)                    User commands                   captoinfo(1m)
+ 
+@@ -173,7 +173,7 @@
+ 
+ 
+ 
                                                                                                                                                          PORTABILITY
                                                                                                                                                          +-       X/Open  Curses,  Issue  7  (2009) describes tic briefly, but omits this
++       X/Open  Curses  Issue 7  (2009)  describes  tic briefly, but omits this
+        program.
+ 
+        SVr4 systems provide captoinfo as a separate application from tic.  Its
+@@ -193,7 +193,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-13                     captoinfo(1m)
++ncurses 6.5                       2025-01-18                     captoinfo(1m)
+ 
                                                                                                                                                          
+ 
                                                                                                                                                          
+ 
                                                                                                                                                            
+Index: doc/html/man/clear.1.html
+--- ncurses-6.5-20250111+/doc/html/man/clear.1.html	2024-04-27 18:38:45.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/clear.1.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-clear 1 2024-03-16 ncurses 6.5 User commands
++clear 1 2025-01-18 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                            clear 1 2024-03-16 ncurses 6.5 User commands
                                                                                                                                                            
++
                                                                                                                                                            clear 1 2025-01-18 ncurses 6.5 User commands
                                                                                                                                                            
+ 
                                                                                                                                                            + clear(1)                         User commands                        clear(1)
+ 
+@@ -84,7 +84,7 @@
+ 
+ 
+ 
                                                                                                                                                            PORTABILITY
                                                                                                                                                            +-       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 clear.
+ 
+        The  latter documents tput, which could be used to replace this utility
+@@ -148,7 +148,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                          clear(1)
++ncurses 6.5                       2025-01-18                          clear(1)
+ 
                                                                                                                                                            
+ 
                                                                                                                                                            
+ 
                                                                                                                                                              
+Index: doc/html/man/curs_add_wch.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_add_wch.3x.html	2024-12-28 21:43:55.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_add_wch.3x.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_add_wch 3x 2024-12-28 ncurses 6.5 Library calls
++curs_add_wch 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                              curs_add_wch 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                              
++
                                                                                                                                                              curs_add_wch 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                              
+ 
                                                                                                                                                              + curs_add_wch(3x)                 Library calls                curs_add_wch(3x)
+ 
+@@ -67,10 +67,12 @@
+ 
                                                                                                                                                              DESCRIPTION
                                                                                                                                                              + 
+ 
                                                                                                                                                              wadd_wch
                                                                                                                                                              +-       wadd_wch writes the complex character wch to the window win,  then  may
+-       advance  the  cursor  position, analogously to the standard C library's
+-       putwchar(3).  ncurses(3x) describes the variants of this function.
++       wadd_wch writes the curses complex character wch  to  the  window  win,
++       then  may  advance  the  cursor position, analogously to the standard C
++       library's putwchar(3).  ncurses(3x)  describes  the  variants  of  this
++       function.
+ 
++       Construct  a curses complex character from a wchar_t with setcchar(3x).
+        Much behavior depends on whether the wide characters in wch are spacing
+        or non-spacing; see subsection "Complex Characters" below.
+ 
+@@ -121,7 +123,7 @@
+ 
+        A cchar_t can be copied from  place  to  place  using  win_wch(3x)  and
+        wadd_wch.   See  curs_attr(3x)  for values of predefined constants that
+-       can be usefully "or"ed with  characters.   A  complex  character  whose
++       can be usefully "or"ed with characters.  A complex character whose only
+        character  component  is  a  wide  space,  and  whose only attribute is
+        WA_NORMAL, is a  blank  character,  and  therefore  combines  with  the
+        background character; see curs_bkgrnd(3x).
+@@ -129,20 +131,20 @@
+ 
+ 
                                                                                                                                                              wecho_wchar
                                                                                                                                                              +        echo_wchar   and  wecho_wchar  are  equivalent  to  calling  (w)add_wch
+-       followed by (w)refresh.  curses interprets these functions  as  a  hint
+-       that only a single (complex) character is being output; for non-control
+-       characters, a considerable performance gain may be enjoyed by employing
+-       them.
++       followed by (w)refresh on  stdscr  or  the  specified  window.   curses
++       interprets  these  functions  as  a  hint  that only a single (complex)
++       character is being output; for non-control characters,  a  considerable
++       performance gain may be enjoyed by employing them.
+ 
+ 
+ 
                                                                                                                                                              Forms-Drawing Characters
                                                                                                                                                              +        curses  defines  macros  starting  with  WACS_  that  can  be used with
+-       wadd_wch to write line-drawing and  other  special  characters  to  the
+-       screen.  ncurses terms these forms-drawing characters.  The ACS default
+-       listed below is used if the acs_chars (acsc) terminfo  capability  does
+-       not  define  a terminal-specific replacement for it, or if the terminal
+-       and locale configuration requires Unicode to  access  these  characters
+-       but  the  library  is  unable  to  use Unicode.  The "acsc char" column
++       wadd_wch to  write  line-drawing  and  other  symbols  to  the  screen.
++       ncurses  terms  these forms-drawing characters.  The ACS default listed
++       below is used if the acs_chars  (acsc)  terminfo  capability  does  not
++       define  a  terminal-specific replacement for it, or if the terminal and
++       locale configuration requires Unicode to access  these  characters  but
++       the  library  is  unable  to  use  Unicode.   The  "acsc  char"  column
+        corresponds to how the characters are specified in the acs_chars (acsc)
+        string capability, and the characters in it may appear on the screen if
+        the terminal type's database entry incorrectly advertises ACS  support.
+@@ -234,89 +236,93 @@
+ 
+ 
+ 
                                                                                                                                                              RETURN VALUE
                                                                                                                                                              +-       These functions return OK on success and ERR on failure.   In  ncurses,
+-       wadd_wch returns ERR if
++       These functions return OK on success and ERR on failure.
++
++       In ncurses, wadd_wch and wecho_wchar return ERR if
++
++       o   the curses screen has not been initialized,
+ 
+        o   win is NULL,
+ 
+-       o   wrapping  to  a new line is impossible because scrollok(3x) has not
+-           been called on win when writing to its  bottom  right  location  is
++       o   wrapping to a new line is impossible because scrollok(3x)  has  not
++           been  called  on  win  when writing to its bottom right location is
+            attempted, or
+ 
+-       o   it  is  not  possible  to  add  a  complete character at the cursor
++       o   it is not possible to  add  a  complete  character  at  the  cursor
+            position.
+ 
+-       Functions prefixed with "mv" first perform cursor movement and fail  if
++       Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                              NOTES
                                                                                                                                                              +-       add_wch,  mvadd_wch,  mvwadd_wch,  and echo_wchar may be implemented as
++       add_wch, mvadd_wch, mvwadd_wch, and echo_wchar may  be  implemented  as
+        macros.
+ 
+ 
+ 
                                                                                                                                                              EXTENSIONS
                                                                                                                                                              + 
+ 
                                                                                                                                                              TABSIZE
                                                                                                                                                              +-       The TABSIZE variable is implemented  in  SVr4  and  other  versions  of
++       The  TABSIZE  variable  is  implemented  in  SVr4 and other versions of
+        curses, but is not specified by X/Open Curses (see curs_variables(3x)).
+ 
+ 
+ 
                                                                                                                                                              PORTABILITY
                                                                                                                                                              +-       These  functions are described in X/Open Curses, Issue 4.  It specifies
++       These functions are described in X/Open Curses Issue 4.   It  specifies
+        no error conditions for them.
+ 
+-       The defaults specified for forms-drawing characters apply in the  POSIX
+-       locale.   X/Open Curses makes it clear that the WACS_ symbols should be
+-       defined as a pointer to  cchar_t  data,  e.g.,  in  the  discussion  of
++       The  defaults specified for forms-drawing characters apply in the POSIX
++       locale.  X/Open Curses makes it clear that the WACS_ symbols should  be
++       defined  as  a  pointer  to  cchar_t  data,  e.g., in the discussion of
+        border_set.  A few implementations are problematic:
+ 
+        o   NetBSD curses defines the symbols as a wchar_t within a cchar_t.
+ 
+-       o   HP-UX  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
++       o   HP-UX 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.
+ 
+-       X/Open Curses does not specify  symbols  for  thick-  or  double-lines.
++       X/Open  Curses  does  not  specify  symbols for thick- or double-lines.
+        SVr4 curses implementations defined their line-drawing symbols in terms
+-       of intermediate symbols.  This implementation  extends  those  symbols,
++       of  intermediate  symbols.   This implementation extends those symbols,
+        providing new definitions which are not in the SVr4 implementations.
+ 
+-       Not  all  Unicode-capable  terminals  provide  support  for VT100-style
+-       alternate character  sets  (i.e.,  the  acsc  capability),  with  their
+-       corresponding  line-drawing  characters.  X/Open Curses did not address
+-       the  aspect  of  integrating  Unicode  with  line-drawing   characters.
+-       Existing  implementations of Unix curses (AIX, HP-UX, Solaris) use only
++       Not all  Unicode-capable  terminals  provide  support  for  VT100-style
++       alternate  character  sets  (i.e.,  the  acsc  capability),  with their
++       corresponding line-drawing characters.  X/Open Curses did  not  address
++       the   aspect  of  integrating  Unicode  with  line-drawing  characters.
++       Existing implementations of Unix curses (AIX, HP-UX, Solaris) use  only
+        the acsc character-mapping to provide this feature.  As a result, those
+        implementations  can  only  use  single-byte  line-drawing  characters.
+-       ncurses 5.3 (2002) provided a table of Unicode values  to  solve  these
++       ncurses  5.3  (2002)  provided a table of Unicode values to solve these
+        problems.  NetBSD curses incorporated that table in 2010.
+ 
+-       In  this  implementation,  the  Unicode  values are used instead of the
++       In this implementation, the Unicode values  are  used  instead  of  the
+        terminal description's acsc mapping as discussed in ncurses(3x) for the
+-       environment  variable  NCURSES_NO_UTF8_ACS.   In contrast, for the same
++       environment variable NCURSES_NO_UTF8_ACS.  In contrast,  for  the  same
+        cases, the line-drawing characters described in addch(3x) will use only
+        the ASCII default values.
+ 
+-       Having  Unicode available does not solve all of the problems with line-
++       Having Unicode available does not solve all of the problems with  line-
+        drawing for curses:
+ 
+-       o   The closest Unicode equivalents to the VT100 graphics  S1,  S3,  S7
+-           and  S9 frequently are not displayed at the regular intervals which
++       o   The  closest  Unicode  equivalents to the VT100 graphics S1, S3, S7
++           and S9 frequently are not displayed at the regular intervals  which
+            the terminal used.
+ 
+-       o   The lantern is a special case.  It originated with  the  AT&T  4410
+-           terminal  in the early 1980s.  There is no accessible documentation
++       o   The  lantern  is  a special case.  It originated with the AT&T 4410
++           terminal in the early 1980s.  There is no accessible  documentation
+            depicting the lantern symbol on the AT&T terminal.
+ 
+            Lacking documentation, most readers assume that a storm lantern was
+            intended.  But there are several possibilities, all with problems.
+ 
+-           Unicode  6.0  (2010)  does provide two lantern symbols: U+1F383 and
+-           U+1F3EE.  Those were not available  in  2002,  and  are  irrelevant
+-           since  they  lie  outside the BMP and as a result are not generally
+-           available in terminals.  They are not storm lanterns, in any case.
++           Unicode 6.0 (2010) does provide two lantern  symbols:  U+1F383  and
++           U+1F3EE.   Those  were  not  available  in 2002, and are irrelevant
++           since they lie outside the Basic Multilingual Plane and as a result
++           are unavailable on many terminals.  They are not storm lanterns, in
++           any case.
+ 
+            Most storm lanterns have a tapering glass chimney (to guard against
+            tipping); some have a wire grid protecting the chimney.
+@@ -350,12 +356,13 @@
+ 
+ 
+ 
                                                                                                                                                              HISTORY
                                                                                                                                                              +-       These functions were initially specified by  X/Open  Curses,  Issue  4.
+-       The   System V   Interface  Definition,  Version  4  (1995),  specified
+-       functions named waddwch and wechowchar (and the usual variants).  These
+-       were later additions to SVr4.x, not appearing in the first SVr4 (1989).
+-       They differed from X/Open's later wadd_wch and wecho_wchar in that they
+-       each took an argument of type wchar_t instead of cchar_t.
++       These functions were  initially  specified  by  X/Open  Curses  Issue 4
++       (1995).   The  System V Interface Definition Version 4 of the same year
++       specified  functions  named  waddwch  and  wechowchar  (and  the  usual
++       variants).   These were later additions to SVr4.x, not appearing in the
++       first SVr4 (1989).  They differed  from  X/Open's  later  wadd_wch  and
++       wecho_wchar  in that they each took an argument of type wchar_t instead
++       of cchar_t.
+ 
+ 
+ 
                                                                                                                                                              SEE ALSO
                                                                                                                                                              +@@ -363,12 +370,12 @@
+        its non-wide-character configuration.
+ 
+        curses(3x),   curs_addwstr(3x),   curs_add_wchstr(3x),   curs_attr(3x),
+-       curs_bkgrnd(3x),  curs_clear(3x),  curs_getcchar(3x), curs_outopts(3x),
++       curs_bkgrnd(3x), curs_clear(3x),  curs_getcchar(3x),  curs_outopts(3x),
+        curs_refresh(3x), curs_variables(3x), putwc(3)
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                  curs_add_wch(3x)
++ncurses 6.5                       2025-01-18                  curs_add_wch(3x)
+ 
                                                                                                                                                              
+ 
                                                                                                                                                              
+ 
                                                                                                                                                                
+Index: doc/html/man/curs_add_wchstr.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_add_wchstr.3x.html	2024-12-28 21:43:55.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_add_wchstr.3x.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_add_wchstr 3x 2024-12-28 ncurses 6.5 Library calls
++curs_add_wchstr 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                curs_add_wchstr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                
++
                                                                                                                                                                curs_add_wchstr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                
+ 
                                                                                                                                                                + curs_add_wchstr(3x)              Library calls             curs_add_wchstr(3x)
+ 
+@@ -58,22 +58,26 @@
+        int add_wchstr(const cchar_t * wchstr);
+        int wadd_wchstr(WINDOW *  win, const cchar_t * wchstr);
+        int mvadd_wchstr(int y, int x, const cchar_t * wchstr);
+-       int mvwadd_wchstr(WINDOW * win, int y, int x, const cchar_t * wchstr);
++       int mvwadd_wchstr(WINDOW * win, int y, int x,
++             const cchar_t * wchstr);
+ 
+        int add_wchnstr(const cchar_t * wchstr, int n);
+-       int wadd_wchnstr(WINDOW *  win, const cchar_t * wchstr, int n);
+-       int mvadd_wchnstr(int y, int x, const cchar_t * wchstr, int n);
+-       int mvwadd_wchnstr(WINDOW * win, int y, int x, const cchar_t * wchstr, int n);
++       int wadd_wchnstr(WINDOW *  win, const cchar_t * wchstr,
++             int n);
++       int mvadd_wchnstr(int y, int x, const cchar_t * wchstr,
++             int n);
++       int mvwadd_wchnstr(WINDOW * win, int y, int x,
++             const cchar_t * wchstr, int n);
+ 
+ 
+ 
                                                                                                                                                                DESCRIPTION
                                                                                                                                                                +        wadd_wchstr  copies  the  string  of  complex  characters wchstr to the
+        window win.  A null complex character  terminates  the  string.   If  a
+        complex  character  does  not  completely  fit  at the end of the line,
+-       curses fills the remaining columns  with  the  window  background;  see
+-       bkgrnd(3x).    wadd_wchnstr  does  the  same,  but  copies  at  most  n
+-       characters, or as many as possible if n is -1.   ncurses(3x)  describes
+-       the variants of these functions.
++       curses  fills  its  remaining  cells  with  the   window's   background
++       character;  see  bkgrnd(3x).  wadd_wchnstr does the same, but copies at
++       most n characters, or as many as possible  if  n  is  -1.   ncurses(3x)
++       describes the variants of these functions.
+ 
+        Because  these  functions do not call wadd_wch(3x) internally, they are
+        faster than waddwstr(3x) and waddnwstr(3x).  On the other hand, they
+@@ -109,17 +113,17 @@
+ 
+ 
+ 
                                                                                                                                                                PORTABILITY
                                                                                                                                                                +-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+-       error conditions for them.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+ 
+ 
                                                                                                                                                                HISTORY
                                                                                                                                                                +-       These functions were initially specified by  X/Open  Curses,  Issue  4.
+-       The   System V   Interface  Definition,  Version  4  (1995),  specified
+-       functions named waddwchstr and waddwchnstr (and  the  usual  variants).
+-       These  were  later additions to SVr4.x, not appearing in the first SVr4
+-       (1989).  They differed from X/Open's later wadd_wchstr and wadd_wchnstr
+-       in that they each took an argument of type wchar_t instead of cchar_t.
++       These functions were initially specified by X/Open Curses Issue 4.  The
++       System V  Interface  Definition  Version 4  (1995), specified functions
++       named waddwchstr and waddwchnstr (and the usual variants).  These  were
++       later  additions  to  SVr4.x,  not  appearing in the first SVr4 (1989).
++       They differed from X/Open's later wadd_wchstr and wadd_wchnstr in  that
++       they each took an argument of type wchar_t instead of cchar_t.
+ 
+ 
+ 
                                                                                                                                                                SEE ALSO
                                                                                                                                                                +@@ -130,7 +134,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28               curs_add_wchstr(3x)
++ncurses 6.5                       2025-01-18               curs_add_wchstr(3x)
+ 
                                                                                                                                                                
+ 
                                                                                                                                                                
+ 
                                                                                                                                                                  
+Index: doc/html/man/curs_addch.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_addch.3x.html	2024-12-28 21:43:55.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_addch.3x.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_addch 3x 2024-12-28 ncurses 6.5 Library calls
++curs_addch 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                  curs_addch 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                  
++
                                                                                                                                                                  curs_addch 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                  
+ 
                                                                                                                                                                  + curs_addch(3x)                   Library calls                  curs_addch(3x)
+ 
+@@ -71,67 +71,73 @@
+        the   cursor   position,   analogously  to  the  standard  C  library's
+        putchar(3).  ncurses(3x) describes the variants of this function.
+ 
++       Construct a curses character from a  char  by  assignment.   Subsection
++       "Video  Attributes"  of  attron(3x)  describes  how  to  manipulate its
++       attributes and color pair.  (A color  pair  selection  is  not  honored
++       unless initialized; see start_color(3x).)
++
+        If advancement occurs at the right margin,
+ 
+-       o   the cursor automatically wraps to the beginning of the  next  line,
++       o   the  cursor  automatically wraps to the beginning of the next line,
+            then,
+ 
+-       o   if   it  was  at  the  bottom  of  the  scrolling  region,  and  if
+-           scrollok(3x) is enabled for win, the scrolling  region  scrolls  up
++       o   if  it  was  at  the  bottom  of  the  scrolling  region,  and   if
++           scrollok(3x)  is  enabled  for win, the scrolling region scrolls up
+            one line.
+ 
+-       If  ch  is  a backspace, carriage return, line feed, or tab, the cursor
++       If ch is a backspace, carriage return, line feed, or  tab,  the  cursor
+        moves appropriately within the window.
+ 
+-       o   Backspace moves the cursor one character left; at the  left  margin
++       o   Backspace  moves  the cursor one character left; at the left margin
+            of a window, it does nothing.
+ 
+-       o   Carriage  return  moves  the  cursor to the left margin on the same
++       o   Carriage return moves the cursor to the left  margin  on  the  same
+            line of the window.
+ 
+-       o   Line feed does a clrtoeol(3x), then advances as if from  the  right
++       o   Line  feed  does a clrtoeol(3x), then advances as if from the right
+            margin.
+ 
+-       o   Tab  advances the cursor to the next tab stop (possibly on the next
+-           line); these are placed at every eighth column by  default.   Alter
+-           the    tab    interval    with    the    TABSIZE   extension;   see
++       o   Tab advances the cursor to the next tab stop (possibly on the  next
++           line);  these  are placed at every eighth column by default.  Alter
++           the   tab   interval    with    the    TABSIZE    extension;    see
+            curs_variables(3x).
+ 
+-       If ch is any other nonprintable character, it  is  drawn  in  printable
++       If  ch  is  any  other nonprintable character, it is drawn in printable
+        form using the same convention as unctrl(3x).  Calling winch(3x) on the
+-       location of a nonprintable character  does  not  return  the  character
++       location  of  a  nonprintable  character  does not return the character
+        itself, but its unctrl(3x) representation.
+ 
+-       The  object or expression ch may contain attributes and/or a color pair
+-       identifier.  (A  chtype  can  be  copied  from  place  to  place  using
+-       winch(3x)  and  waddch.)   See  curs_attr(3x)  for values of predefined
+-       constants that can be usefully "or"ed  with  characters.   A  ch  whose
+-       character  component  is a space, and whose only attribute is A_NORMAL,
+-       is a blank  character,  and  therefore  combines  with  the  background
++       The object or expression ch may contain attributes and/or a color  pair
++       identifier.   (A  chtype  can  be  copied  from  place  to  place using
++       winch(3x) and waddch.)  See  curs_attr(3x)  for  values  of  predefined
++       constants  that  can  be  usefully  "or"ed with characters.  A ch whose
++       character component is a space, and whose only attribute  is  A_NORMAL,
++       is  a  blank  character,  and  therefore  combines  with the background
+        character; see curs_bkgd(3x).
+ 
+ 
+ 
                                                                                                                                                                  wechochar
                                                                                                                                                                  +-       echochar  and  wechochar are equivalent to calling (w)addch followed by
+-       (w)refresh.  curses  interprets  these  functions  as  a  hint  to  its
+-       optimizer  that  only  a  single  character cell in the window is being
+-       altered between refreshes; for non-control characters,  a  considerable
+-       performance gain may be enjoyed by employing them.
++       echochar and wechochar are equivalent to calling (w)addch  followed  by
++       (w)refresh  on stdscr or the specified window.  curses interprets these
++       functions as a hint to its optimizer that only a single character  cell
++       in  the  window  is  being  altered  between refreshes; for non-control
++       characters, a considerable performance gain may be enjoyed by employing
++       them.
+ 
+ 
+ 
                                                                                                                                                                  Forms-Drawing Characters
                                                                                                                                                                  +        curses  defines  macros starting with ACS_ that can be used with waddch
+-       to write line-drawing and  other  special  characters  to  the  screen.
+-       ncurses  terms  these forms-drawing characters.  The ACS default listed
+-       below is used if the acs_chars  (acsc)  terminfo  capability  does  not
+-       define  a  terminal-specific replacement for it, or if the terminal and
+-       locale configuration requires Unicode to access  these  characters  but
+-       the  library  is  unable  to  use  Unicode.   The  "acsc  char"  column
+-       corresponds to how the characters are specified in the acs_chars (acsc)
+-       string capability, and the characters in it may appear on the screen if
+-       the terminal type's database entry incorrectly advertises ACS  support.
+-       The name "ACS" originates in the Alternate Character Set feature of the
+-       DEC VT100 terminal.
++       to write line-drawing and other symbols to the screen.   ncurses  terms
++       these  forms-drawing  characters.  The ACS default listed below is used
++       if the acs_chars (acsc) terminfo capability does not define a terminal-
++       specific   replacement   for   it,   or  if  the  terminal  and  locale
++       configuration requires Unicode  to  access  these  characters  but  the
++       library  is  unable to use Unicode.  The "acsc char" column corresponds
++       to how the characters are specified  in  the  acs_chars  (acsc)  string
++       capability,  and  the  characters in it may appear on the screen if the
++       terminal type's database entry incorrectly advertises ACS support.  The
++       name "ACS" originates in the Alternate Character Set feature of the DEC
++       VT100 terminal.
+ 
+                       ACS       acsc
+        Symbol         Default   char   Glyph Name
+@@ -173,7 +179,9 @@
+ 
                                                                                                                                                                  RETURN VALUE
                                                                                                                                                                  +        These functions return OK on success and ERR on failure.
+ 
+-       In ncurses, waddch returns ERR if
++       In ncurses, waddch and wechochar return ERR if
++
++       o   the curses screen has not been initialized,
+ 
+        o   win is NULL,
+ 
+@@ -213,11 +221,11 @@
+        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+-       error conditions for them.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+-       SVr4  curses  describes  a  successful return value only as "an integer
+-       value other than ERR".
++       SVr4  describes  a  successful  return  value only as "an integer value
++       other than ERR".
+ 
+        The defaults specified for forms-drawing characters apply in the  POSIX
+        locale.
+@@ -320,7 +328,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                    curs_addch(3x)
++ncurses 6.5                       2025-01-18                    curs_addch(3x)
+ 
                                                                                                                                                                  
+ 
                                                                                                                                                                  
+ 
                                                                                                                                                                    
+Index: doc/html/man/curs_addchstr.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_addchstr.3x.html	2024-12-28 21:43:55.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_addchstr.3x.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_addchstr 3x 2024-12-28 ncurses 6.5 Library calls
++curs_addchstr 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                    curs_addchstr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                    
++
                                                                                                                                                                    curs_addchstr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                    
+ 
                                                                                                                                                                    + curs_addchstr(3x)                Library calls               curs_addchstr(3x)
+ 
+@@ -57,12 +57,14 @@
+        int addchstr(const chtype * chstr);
+        int waddchstr(WINDOW * win, const chtype * chstr);
+        int mvaddchstr(int y, int x, const chtype * chstr);
+-       int mvwaddchstr(WINDOW * win, int y, int x, const chtype * chstr);
++       int mvwaddchstr(WINDOW * win, int y, int x,
++             const chtype * chstr);
+ 
+        int addchnstr(const chtype * chstr, int n);
+        int waddchnstr(WINDOW * win, const chtype * chstr, int n);
+        int mvaddchnstr(int y, int x, const chtype * chstr, int n);
+-       int mvwaddchnstr(WINDOW * win, int y, int x, const chtype * chstr, int n);
++       int mvwaddchnstr(WINDOW * win, int y, int x,
++             const chtype * chstr, int n);
+ 
+ 
+ 
                                                                                                                                                                    DESCRIPTION
                                                                                                                                                                    +@@ -104,8 +106,11 @@
+ 
+ 
+ 
                                                                                                                                                                    PORTABILITY
                                                                                                                                                                    +-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+-       error conditions for them.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
++
++       SVr4  describes  a  successful  return  value only as "an integer value
++       other than ERR".
+ 
+ 
+ 
                                                                                                                                                                    HISTORY
                                                                                                                                                                    +@@ -120,7 +125,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                 curs_addchstr(3x)
++ncurses 6.5                       2025-01-18                 curs_addchstr(3x)
+ 
                                                                                                                                                                    
+ 
                                                                                                                                                                    
+ 
                                                                                                                                                                      
+Index: doc/html/man/curs_addstr.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_addstr.3x.html	2024-12-28 21:43:55.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_addstr.3x.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_addstr 3x 2024-12-28 ncurses 6.5 Library calls
++curs_addstr 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                      curs_addstr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                      
++
                                                                                                                                                                      curs_addstr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                      
+ 
                                                                                                                                                                      + curs_addstr(3x)                  Library calls                 curs_addstr(3x)
+ 
+@@ -62,17 +62,16 @@
+        int addnstr(const char * str, int n);
+        int waddnstr(WINDOW * win, const char * str, int n);
+        int mvaddnstr(int y, int x, const char * str, int n);
+-       int mvwaddnstr(WINDOW * win, int y, int x, const char * str, int n);
++       int mvwaddnstr(WINDOW * win, int y, int x, const char * str,
++             int n);
+ 
+ 
+ 
                                                                                                                                                                      DESCRIPTION
                                                                                                                                                                      +        waddstr writes the characters of the (null-terminated)  string  str  to
+-       the window win, as if by calling waddch(3x) for each char in str.
+-
+-       waddnstr  is  similar,  but  writes  at most n characters.  If n is -1,
+-       waddnstr writes the entire string.
+-
+-       ncurses(3x) describes the variants of these functions.
++       the  window  win,  as  if  by  calling waddch(3x) for each char in str.
++       waddnstr is similar, but writes at most n  characters.   If  n  is  -1,
++       waddnstr  writes the entire string.  ncurses(3x) describes the variants
++       of these functions.
+ 
+ 
+ 
                                                                                                                                                                      RETURN VALUE
                                                                                                                                                                      +@@ -91,16 +90,19 @@
+ 
+ 
+ 
                                                                                                                                                                      NOTES
                                                                                                                                                                      +-       All of these functions except waddnstr may be macros.
++       All of these functions except waddnstr may be implemented as macros.
+ 
+ 
+ 
                                                                                                                                                                      PORTABILITY
                                                                                                                                                                      +-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+-       error conditions for them.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
++
++       SVr4 describes a successful return value  only  as  "an  integer  value
++       other than ERR".
+ 
+ 
+ 
                                                                                                                                                                      HISTORY
                                                                                                                                                                      +-       4BSD (1980) curses introduced waddstr  along  with  its  variants,  the
++       4BSD  (1980)  curses  introduced  waddstr  along with its variants, the
+        latter defined as macros.
+ 
+        SVr3.1 (1987) added waddnstr (and its variants) redefining waddstr as a
+@@ -108,14 +110,14 @@
+ 
+ 
+ 
                                                                                                                                                                      SEE ALSO
                                                                                                                                                                      +-       curs_addwstr(3x) describes comparable functions of the ncurses  library
++       curs_addwstr(3x)  describes comparable functions of the ncurses library
+        in its wide-character configuration (ncursesw).
+ 
+        curses(3x), curs_addch(3x), curs_addchstr(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                   curs_addstr(3x)
++ncurses 6.5                       2025-01-18                   curs_addstr(3x)
+ 
                                                                                                                                                                      
+ 
                                                                                                                                                                      
+ 
                                                                                                                                                                        
+Index: doc/html/man/curs_addwstr.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_addwstr.3x.html	2024-12-28 21:43:55.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_addwstr.3x.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_addwstr 3x 2024-12-28 ncurses 6.5 Library calls
++curs_addwstr 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                        curs_addwstr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                        
++
                                                                                                                                                                        curs_addwstr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                        
+ 
                                                                                                                                                                        + curs_addwstr(3x)                 Library calls                curs_addwstr(3x)
+ 
+@@ -58,12 +58,14 @@
+        int addwstr(const wchar_t * wstr);
+        int waddwstr(WINDOW * win, const wchar_t * wstr);
+        int mvaddwstr(int y, int x, const wchar_t * wstr);
+-       int mvwaddwstr(WINDOW * win, int y, int x, const wchar_t * wstr);
++       int mvwaddwstr(WINDOW * win, int y, int x,
++             const wchar_t * wstr);
+ 
+        int addnwstr(const wchar_t * wstr, int n);
+        int waddnwstr(WINDOW * win, const wchar_t * wstr, int n);
+        int mvaddnwstr(int y, int x, const wchar_t * wstr, int n);
+-       int mvwaddnwstr(WINDOW * win, int y, int x, const wchar_t * wstr, int n);
++       int mvwaddnwstr(WINDOW * win, int y, int x,
++             const wchar_t * wstr, int n);
+ 
+ 
+ 
                                                                                                                                                                        DESCRIPTION
                                                                                                                                                                        +@@ -71,11 +73,8 @@
+        character string wstr to the  window  win,  as  if  by  constructing  a
+        cchar_t  for  each  wchar_t in wstr, then calling wadd_wch(3x) with the
+        resulting cchar_t.  curses processes spacing and non-spacing characters
+-       in wstr one at a time.
+-
+-       waddnwstr  is  similar,  but writes at most n wide characters.  If n is
+-       -1, waddnwstr writes the entire wide string.
+-
++       in wstr one at a time.  waddnwstr is similar, but writes at most n wide
++       characters.  If n is -1,  waddnwstr  writes  the  entire  wide  string.
+        ncurses(3x) describes the variants of these functions.
+ 
+ 
+@@ -90,7 +89,7 @@
+ 
+        o   an internal wadd_wch(3x) call returns ERR.
+ 
+-       Functions prefixed with "mv" first perform cursor movement and fail  if
++       Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+@@ -99,13 +98,18 @@
+ 
+ 
+ 
                                                                                                                                                                        PORTABILITY
                                                                                                                                                                        +-       X/Open Curses, Issue 4 describes these functions.
++       X/Open Curses Issue 4 describes these functions.
++
++       SVr4 describes a successful return value  only  as  "an  integer  value
++       other than ERR".
+ 
+ 
+ 
                                                                                                                                                                        HISTORY
                                                                                                                                                                        +-       The System V Interface Definition, Version 4 (1995), specified waddwstr
+-       and waddnwstr (and the usual variants).  These were later additions  to
+-       SVr4.x, not appearing in the first SVr4 (1989).
++       These  functions  were  initially  specified  by  X/Open Curses Issue 4
++       (1995).  The System V Interface Definition Version 4 of the  same  year
++       specified  functions  named  waddwstr  and  waddnwstr  (and  the  usual
++       variants).  These were later additions to SVr4.x, not appearing in  the
++       first SVr4 (1989).
+ 
+ 
+ 
                                                                                                                                                                        SEE ALSO
                                                                                                                                                                        +@@ -116,7 +120,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                  curs_addwstr(3x)
++ncurses 6.5                       2025-01-18                  curs_addwstr(3x)
+ 
                                                                                                                                                                        
+ 
                                                                                                                                                                        
+ 
                                                                                                                                                                          
+Index: doc/html/man/curs_attr.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_attr.3x.html	2024-12-28 21:43:55.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_attr.3x.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_attr 3x 2024-12-28 ncurses 6.5 Library calls
++curs_attr 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                          curs_attr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                          
++
                                                                                                                                                                          curs_attr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                          
+ 
                                                                                                                                                                          + curs_attr(3x)                    Library calls                   curs_attr(3x)
+ 
+@@ -121,93 +121,94 @@
+        Use wattr_get to retrieve attributes for the given window.
+ 
+        Use attr_on and wattr_on to turn on  window  attributes,  i.e.,  values
+-       OR'd  together  in  attr,  without  affecting  other  attributes.   Use
+-       attr_off and wattr_off to turn off window attributes, again values OR'd
+-       together in attr, without affecting other attributes.
++       logically "or"-ed together in attr, without affecting other attributes.
++       Use attr_off and wattr_off to turn off window attributes, again  values
++       logically "or"-ed together in attr, without affecting other attributes.
+ 
+ 
+ 
                                                                                                                                                                          Legacy Window Attributes
                                                                                                                                                                          +        The  X/Open  window attribute routines which set or get, turn on or off
+-       are extensions of older routines which assume that color pairs are OR'd
+-       into  the attribute parameter.  These newer routines use similar names,
+-       because X/Open simply added an underscore (_) for the newer names.
++       are extensions of older routines which  assume  that  color  pairs  are
++       logically  "or"-ed  into the attribute parameter.  These newer routines
++       use similar names, because X/Open simply added an  underscore  (_)  for
++       the newer names.
+ 
+        The int datatype used in the legacy routines is treated as if it is the
+-       same  size  as  chtype  (used by addch(3x)).  It holds the common video
+-       attributes (such as bold, reverse), as well as a few  bits  for  color.
+-       Those  bits  correspond  to  the  A_COLOR symbol.  The COLOR_PAIR macro
+-       provides a value which can be OR'd into the attribute  parameter.   For
+-       example,  as  long as that value fits into the A_COLOR mask, then these
+-       calls produce similar results:
++       same size as chtype (used by addch(3x)).  It  holds  the  common  video
++       attributes  (such  as  bold, reverse), as well as a few bits for color.
++       Those bits correspond to the  A_COLOR  symbol.   The  COLOR_PAIR  macro
++       provides  a  value  which  can  be logically "or"-ed into the attribute
++       parameter.  For example, as long as that value fits  into  the  A_COLOR
++       mask, then these calls produce similar results:
+ 
+            attrset(A_BOLD | COLOR_PAIR(pair));
+            attr_set(A_BOLD, pair, NULL);
+ 
+        However, if the value does not fit, then the COLOR_PAIR macro uses only
+-       the  bits  that fit.  For example, because in ncurses A_COLOR has eight
++       the bits that fit.  For example, because in ncurses A_COLOR  has  eight
+        (8) bits, then COLOR_PAIR(259) is 4 (i.e., 259 is 4 more than the limit
+        255).
+ 
+-       The  PAIR_NUMBER  macro extracts a pair number from an int (or chtype).
+-       For example, the input and output values in these statements  would  be
++       The PAIR_NUMBER macro extracts a pair number from an int  (or  chtype).
++       For  example,  the input and output values in these statements would be
+        the same:
+ 
+            int value = A_BOLD | COLOR_PAIR(input);
+            int output = PAIR_NUMBER(value);
+ 
+-       The  attrset routine is a legacy feature predating SVr4 curses but kept
+-       in X/Open Curses  for  the  same  reason  that  SVr4  curses  kept  it:
++       The attrset routine is a legacy feature predating SVr4 curses but  kept
++       in  X/Open  Curses  for  the  same  reason  that  SVr4  curses kept it:
+        compatibility.
+ 
+-       The  remaining  attr*  functions operate exactly like the corresponding
+-       attr_* functions, except that they take arguments of  type  int  rather
++       The remaining attr* functions operate exactly  like  the  corresponding
++       attr_*  functions,  except  that they take arguments of type int rather
+        than attr_t.
+ 
+-       There  is  no  corresponding attrget function as such in X/Open Curses,
++       There is no corresponding attrget function as such  in  X/Open  Curses,
+        although ncurses provides getattrs (see curs_legacy(3x)).
+ 
+ 
+ 
                                                                                                                                                                          Change Character Rendition
                                                                                                                                                                          +        The  routine  chgat  changes  the  attributes  of  a  given  number  of
+-       characters  starting at the current cursor location of stdscr.  It does
++       characters starting at the current cursor location of stdscr.  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  wchgat
+-       function  generalizes  this to any window; the mvwchgat function does a
++       of -1 or greater than  the  remaining  window  width  means  to  change
++       attributes  all  the  way  to  the end of the current line.  The wchgat
++       function generalizes this to any window; the mvwchgat function  does  a
+        cursor move before acting.
+ 
+-       In these functions, the color pair argument is a color pair  index  (as
++       In  these  functions, the color pair argument is a color pair index (as
+        in the first argument of init_pair, see curs_color(3x)).
+ 
+ 
+ 
                                                                                                                                                                          Change Window Color
                                                                                                                                                                          +        The routine color_set sets the current color of the given window to the
+-       foreground/background  combination  described   by   the   color   pair
++       foreground/background   combination   described   by   the  color  pair
+        parameter.
+ 
+ 
+ 
                                                                                                                                                                          Standout
                                                                                                                                                                          +-       The  routine  standout  is the same as attron(A_STANDOUT).  The routine
+-       standend is the same as attrset(A_NORMAL) or attrset(0),  that  is,  it
++       The routine standout is the same as  attron(A_STANDOUT).   The  routine
++       standend  is  the  same as attrset(A_NORMAL) or attrset(0), that is, it
+        turns off all attributes.
+ 
+        X/Open Curses does not mark these "restricted", because
+ 
+        o   they have well established legacy use, and
+ 
+-       o   there  is  no  ambiguity  about  the  way  the  attributes might be
++       o   there is no  ambiguity  about  the  way  the  attributes  might  be
+            combined with a color pair.
+ 
+ 
+ 
                                                                                                                                                                          Video Attributes
                                                                                                                                                                          +-       The following video attributes, defined in <curses.h>, can be passed to
+-       the  routines attron, attroff, and attrset, or OR'd with the characters
+-       passed to addch (see curs_addch(3x)).
++       The  following  video attributes, defined in curses.h, can be passed to
++       attron, attroff, attrset, and logically "or"-ed with characters  passed
++       to addch(3x).
+ 
+               Name           Description
+               -----------------------------------------------------------------
+               A_NORMAL       Normal display (no highlight)
+-              A_STANDOUT     Best highlighting mode of the terminal
++              A_STANDOUT     Best highlighting mode available
+               A_UNDERLINE    Underlining
+               A_REVERSE      Reverse video
+               A_BLINK        Blinking
+@@ -217,15 +218,12 @@
+               A_INVIS        Invisible or blank mode
+               A_ALTCHARSET   Alternate character set
+               A_ITALIC       Italics (non-X/Open extension)
+-              A_CHARTEXT     Bit-mask to extract a character
+-              A_COLOR        Bit-mask to extract a color (legacy routines)
++              A_ATTRIBUTES   Mask to extract character code
++              A_CHARTEXT     Mask to extract atributes
++              A_COLOR        Mask to extract color pair identifier
+ 
+-       You can thus use A_CHARTEXT to extract the  character  from  a  chtype,
+-       A_ATTRIBUTES  to  obtain  its rendering attributes, and A_COLOR to find
+-       the color pair it uses.
+-
+-       These video attributes are supported by attr_on and  related  functions
+-       (which also support the attributes recognized by attron, etc.):
++       attr_on,  attr_off,  and  attr_set support the foregoing as well as the
++       following additional attributes.
+ 
+               Name            Description
+               -----------------------------------------------------------------
+@@ -236,11 +234,6 @@
+               WA_TOP          Top highlight
+               WA_VERTICAL     Vertical highlight
+ 
+-       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 1.
+-
+ 
+ 
                                                                                                                                                                          RETURN VALUE
                                                                                                                                                                          +        These functions return OK on success and ERR on failure.
+@@ -256,16 +249,18 @@
+ 
+ 
+ 
                                                                                                                                                                          NOTES
                                                                                                                                                                          +-       These functions may be macros:
+-
+-              attroff,  wattroff, attron, wattron, attrset, wattrset, standend
+-              and standout.
+-
+-       Color pair values can only be OR'd with attributes if the  pair  number
+-       is less than 256.  The alternate functions such as color_set can pass a
+-       color pair value directly.  However, ncurses ABI 4 and 5 simply OR this
+-       value  within  the  alternate functions.  You must use ncurses ABI 6 to
+-       support more than 256 color pairs.
++       attr_on,  attr_off,  attr_set, wattr_set, chgat, mvchgat, mvwchgat, and
++       color_set are  part  of  ncurses's  wide-character  API,  and  are  not
++       available in its non-wide configuration.
++
++       attron,  wattron,  attroff,  wattroff, attrset, wattrset, standout, and
++       standend may be implemented as macros.
++
++       Color pair values be logically "or"-ed  with  attributes  if  the  pair
++       number is less than 256.  The alternate functions such as color_set can
++       pass a color pair value directly.  However, ncurses ABI 4 and 5  simply
++       logically "or" this value within the alternate functions.  You must use
++       ncurses ABI 6 to support more than 256 color pairs.
+ 
+ 
+ 
                                                                                                                                                                          EXTENSIONS
                                                                                                                                                                          +@@ -296,22 +291,25 @@
+ 
+ 
+ 
                                                                                                                                                                          PORTABILITY
                                                                                                                                                                          +-       These  functions are described in X/Open Curses, Issue 4.  It specifies
++       These  functions  are described in X/Open Curses Issue 4.  It specifies
+        no error conditions for them.
+ 
+        The standard defined the dedicated type for highlights,  attr_t,  which
+        was  not defined in SVr4 curses.  The functions taking attr_t arguments
+        were not supported under SVr4.
+ 
++       SVr4 describes the functions not taking attr_t  or  pair  arguments  as
++       always returning 1.
++
+        Very old versions of this library did not force an update of the screen
+-       when  changing  the  attributes.   Use  touchwin to force the screen to
++       when changing the attributes.  Use touchwin  to  force  the  screen  to
+        match the updated attributes.
+ 
+-       X/Open  Curses  states   that   whether   the   traditional   functions
+-       attron/attroff/attrset  can  manipulate  attributes other than A_BLINK,
+-       A_BOLD, A_DIM, A_REVERSE, A_STANDOUT, or A_UNDERLINE is  "unspecified".
+-       Under  this  implementation  as  well  as  SVr4 curses, these functions
+-       correctly manipulate all other highlights (specifically,  A_ALTCHARSET,
++       X/Open   Curses   states   that   whether   the  traditional  functions
++       attron/attroff/attrset can manipulate attributes  other  than  A_BLINK,
++       A_BOLD,  A_DIM, A_REVERSE, A_STANDOUT, or A_UNDERLINE is "unspecified".
++       Under this implementation as  well  as  SVr4  curses,  these  functions
++       correctly  manipulate all other highlights (specifically, A_ALTCHARSET,
+        A_PROTECT, and A_INVIS).
+ 
+        X/Open Curses added these entry points:
+@@ -319,7 +317,7 @@
+               attr_get,  attr_on,  attr_off,  attr_set,  wattr_on,  wattr_off,
+               wattr_get, wattr_set
+ 
+-       The new functions are intended to work with a new series  of  highlight
++       The  new  functions are intended to work with a new series of highlight
+        macros prefixed with WA_.  The older macros have direct counterparts in
+        the newer set of names:
+ 
+@@ -332,94 +330,91 @@
+               WA_BLINK        Blinking
+               WA_DIM          Half bright
+               WA_BOLD         Extra bright or bold
+-
+               WA_ALTCHARSET   Alternate character set
+ 
+-       X/Open Curses does not assign values to  these  symbols,  nor  does  it
+-       state  whether or not they are related to the similarly-named A_NORMAL,
++       X/Open  Curses  does  not  assign  values to these symbols, nor does it
++       state whether or not they are related to the similarly-named  A_NORMAL,
+        etc.:
+ 
+-       o   X/Open Curses specifies that each  pair  of  corresponding  A_  and
+-           WA_-using   functions   operates   on  the  same  current-highlight
++       o   X/Open  Curses  specifies  that  each  pair of corresponding A_ and
++           WA_-using  functions  operates  on   the   same   current-highlight
+            information.
+ 
+-       o   However, in some  implementations,  those  symbols  have  unrelated
++       o   However,  in  some  implementations,  those  symbols have unrelated
+            values.
+ 
+            For example, the Solaris xpg4 (X/Open) curses declares attr_t to be
+-           an unsigned short integer (16-bits), while  chtype  is  a  unsigned
++           an  unsigned  short  integer  (16-bits), while chtype is a unsigned
+            integer (32-bits).  The WA_ symbols in this case are different from
+-           the A_ symbols because they are used for a smaller  datatype  which
++           the  A_  symbols because they are used for a smaller datatype which
+            does not represent A_CHARTEXT or A_COLOR.
+ 
+            In this implementation (as in many others), the values happen to be
+-           the same because it simplifies copying information  between  chtype
++           the  same  because it simplifies copying information between chtype
+            and cchar_t variables.
+ 
+-       o   Because  ncurses's  attr_t  can  hold  a color pair (in the A_COLOR
+-           field), a call to wattr_on, wattr_off, or wattr_set may  alter  the
+-           window's  color.   If  the  color pair information in the attribute
++       o   Because ncurses's attr_t can hold a  color  pair  (in  the  A_COLOR
++           field),  a  call to wattr_on, wattr_off, or wattr_set may alter the
++           window's color.  If the color pair  information  in  the  attribute
+            parameter is zero, no change is made to the window's color.
+ 
+            This is consistent with SVr4 curses; X/Open Curses does not specify
+            this.
+ 
+-       The  X/Open  Curses  extended  conformance  level  adds  new highlights
+-       A_HORIZONTAL,  A_LEFT,   A_LOW,   A_RIGHT,   A_TOP,   A_VERTICAL   (and
+-       corresponding  WA_  macros  for  each).   As  of  August 2013, no known
++       The X/Open  Curses  extended  conformance  level  adds  new  highlights
++       A_HORIZONTAL,   A_LEFT,   A_LOW,   A_RIGHT,   A_TOP,   A_VERTICAL  (and
++       corresponding WA_ macros for  each).   As  of  August  2013,  no  known
+        terminal provides these highlights (i.e., via the sgr1 capability).
+ 
+ 
+ 
                                                                                                                                                                          HISTORY
                                                                                                                                                                          +-       X/Open Curses is largely based  on  SVr4  curses,  adding  support  for
+-       "wide-characters"  (not  specific  to  Unicode).   Some  of  the X/Open
+-       differences from SVr4 curses address the way video  attributes  can  be
+-       applied  to wide-characters.  But aside from that, attrset and attr_set
+-       are similar.  SVr4 curses provided the basic features for  manipulating
+-       video  attributes.  However, earlier versions of curses provided a part
+-       of these features.
+-
+-       As seen in 2.8BSD, curses assumed 7-bit characters,  using  the  eighth
+-       bit  of  a byte to represent the standout feature (often implemented as
+-       bold and/or reverse video).  The BSD curses library provided  functions
+-       standout  and  standend which were carried along into X/Open Curses due
+-       to their pervasive use in legacy applications.
+-
+-       Some  terminals  in  the  1980s  could  support  a  variety  of   video
+-       attributes,  although  the  BSD  curses  library  could do nothing with
+-       those.  System V  (1983)  provided  an  improved  curses  library.   It
+-       defined  the A_ symbols for use by applications to manipulate the other
+-       attributes.  There are few useful references for the chronology.
+-
+-       Goodheart's book UNIX Curses Explained (1991)  describes  SVr3  (1987),
+-       commenting on several functions:
+-
+-       o   the  attron,  attroff, attrset functions (and most of the functions
+-           found in SVr4 but not in BSD curses) were introduced by System V,
+-
+-       o   the alternate character set feature with A_ALTCHARSET was added  in
+-           SVr2 and improved in SVr3 (by adding acs_map[]),
+-
+-       o   start_color  and  related color-functions were introduced by System
+-           V.3.2,
+-
+-       o   pads, soft-keys were added in SVr3, and
+-
+-       Goodheart did not mention the background character or the cchar_t type.
+-       Those  are respectively SVr3.1 and X/Open features.  He did mention the
+-       A_ constants, but did not indicate their values.  Those  were  not  the
+-       same in different systems, even for those marked as System V.
+-
+-       Different  Unix  systems  used  different  sizes  for the bit-fields in
+-       chtype for characters and colors, and took into account  the  different
+-       integer sizes (32-bit versus 64-bit).
+-
+-       This  table  showing  the number of bits for A_COLOR and A_CHARTEXT was
+-       gleaned from the curses header files for various operating systems  and
+-       architectures.   The inferred architecture and notes reflect the format
+-       and size of the  defined  constants  as  well  as  clues  such  as  the
+-       alternate  character  set implementation.  A 32-bit library can be used
+-       on a 64-bit system, but not necessarily the reverse.
++       4BSD  (1980)  curses used a char to represent each cell of the terminal
++       screen.  It assumed 7-bit character codes, employing the eighth bit  of
++       a  byte  to  represent  a standout attribute (often implemented as bold
++       and/or reverse video).  It introduced  standout,  standend,  wstandout,
++       and   wstandend  functions  to  manipulate  this  bit.   Despite  their
++       inflexibility, they carried over into System V  curses  and  ultimately
++       X/Open Curses due to their pervasive use in legacy applications.  While
++       some 1980s terminals supported  a  variety  of  video  attributes,  BSD
++       curses could do nothing with them.
++
++       SVr2  (1984) provided an improved curses library, introducing chtype to
++       create the abstract notion of a curses character; this was  by  default
++       an  unsigned  short,  with a provision for compile-time redefinition to
++       other integral types (a freedom not necessarily available to  users  of
++       shared  libraries,  and  in any event a source license was necessary to
++       exercise  it).   It  added  the  functions  attron,  attroff,  attrset,
++       wattron, wattroff, and wattrset, and defined the A_ macros listed above
++       (except for A_ITALIC and A_COLOR) for use by applications to manipulate
++       other  attributes.  The values of these macros were not necessarily the
++       same in different systems, even among those certified as System V.
++
++       SVr3.2 (1988) added the A_COLOR macro along with a  color  system;  see
++       curs_color(3x).
++
++       X/Open  Curses is largely based on SVr4 curses, but recognized that the
++       wchar_t type of ISO C95 was intended to house only a  single  character
++       code,  not  a  sequence  of  codes combining with a base character, let
++       alone could it reliably offer room for a color pair  identifier  and  a
++       set  of  attribute bits with a potential for further growth -- thus the
++       standard invented the curses  complex  character  type  cchar_t  and  a
++       separate  type  attr_t  for  storage  of attribute bits.  The new types
++       brought  along  several  new  functions  to   manipulate   them,   some
++       corresponding  to  existing  chtype-based functions (attr_on, attr_off,
++       attr_set, wattr_on, wattr_off, and wattr_set), and some new (color_set,
++       wcolor_set, chgat, wchgat, mvchgat, and mvwchgat).
++
++       Different  Unix systems used differently sized bit fields in chtype for
++       the character code and the color pair identifier, and took into account
++       platforms' different integer sizes (32- versus 64-bit).
++
++       The  following  table  showing  the  number  of  bits  for  A_COLOR and
++       A_CHARTEXT was  gleaned  from  the  curses  header  files  for  various
++       operating  systems  and  architectures.   The inferred architecture and
++       notes reflect the format and size of the defined constants as  well  as
++       clues  such  as  the  alternate character set implementation.  A 32-bit
++       library can be used  on  a  64-bit  system,  but  not  necessarily  the
++       converse.
+ 
+                                      Bits
+        Year  System        Arch   Color  Char  Notes
+@@ -434,21 +429,21 @@
+        1996  AIX 4.2       32     7      16    X/Open curses
+        1996  OSF/1 r4      32     6      16    X/Open curses
+        1997  HP-UX 11.00   32     6      8     X/Open curses
+-       2000  U/Win         32/64  7/31   16    uses chtype
++       2000  UWIN          32/64  7/31   16    uses chtype
+ 
+        Notes:
+ 
+           Regarding HP-UX,
+ 
+-          o   HP-UX 10.20 (1996) added support for 64-bit  PA-RISC  processors
++          o   HP-UX  10.20  (1996) added support for 64-bit PA-RISC processors
+               in 1996.
+ 
+-          o   HP-UX  10.30 (1997) marked "curses_colr" obsolete.  That version
++          o   HP-UX 10.30 (1997) marked "curses_colr" obsolete.  That  version
+               of curses was dropped with HP-UX 11.30 in 2006.
+ 
+           Regarding OSF/1 (and Tru64),
+ 
+-          o   These used 64-bit hardware.   Like  ncurses,  the  OSF/1  curses
++          o   These  used  64-bit  hardware.   Like  ncurses, the OSF/1 curses
+               interface is not customized for 32-bit and 64-bit versions.
+ 
+           o   Unlike  other  systems  which  evolved  from  AT&T  code,  OSF/1
+@@ -458,37 +453,38 @@
+ 
+           o   The initial release of Solaris was in 1992.
+ 
+-          o   The xpg4 (X/Open) Curses was developed by MKS from 1990 to 1995.
+-              Sun's copyright began in 1996.
++          o   Its   XPG4   (X/Open   Curses-conforming)  xcurses  library  was
++              developed by Mortice Kern Systems  from  1990  to  1995.   Sun's
++              copyright began in 1996.
+ 
+           o   Sun updated the X/Open Curses interface after 64-bit support was
+               introduced  in  1997,  but  did  not  modify  the  SVr4   curses
+               interface.
+ 
+-          Regarding U/Win,
++          Regarding UWIN,
+ 
+           o   Development  of  the  curses  library  began in 1991, stopped in
+               2000.
+ 
+           o   Color support was added in 1998.
+ 
+-          o   The library uses only chtype (no cchar_t).
++          o   The library uses only chtype (not cchar_t).
+ 
+        Once X/Open Curses was adopted in the mid-1990s, the  constraint  of  a
+        32-bit interface with many colors and wide-characters for chtype became
+        a moot point.  The cchar_t structure (whose size and  members  are  not
+        specified in X/Open Curses) could be extended as needed.
+ 
+-       Other interfaces are rarely used now:
++       Other interfaces are rarely used now.
+ 
+        o   BSD  curses was improved slightly in 1993/1994 using Keith Bostic's
+            modification to make the library 8-bit clean for nvi(1).  He  moved
+-           standout attribute to a structure member.
++           the standout attribute to a structure member.  The resulting 4.4BSD
++           curses was replaced by ncurses over the next ten years.
+ 
+-           The  resulting  4.4BSD curses was replaced by ncurses over the next
+-           ten years.
++       o   UWIN has been defunct since 2012.
+ 
+-       o   U/Win is rarely used now.
++       ncurses 6.0 (2015) added the A_ITALIC macro.
+ 
+ 
+ 
                                                                                                                                                                          SEE ALSO
                                                                                                                                                                          +@@ -497,7 +493,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                     curs_attr(3x)
++ncurses 6.5                       2025-01-18                     curs_attr(3x)
+ 
                                                                                                                                                                          
+ 
                                                                                                                                                                          
+ 
                                                                                                                                                                            
+Index: doc/html/man/curs_beep.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_beep.3x.html	2024-07-20 22:19:03.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_beep.3x.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_beep 3x 2024-07-20 ncurses 6.5 Library calls
++curs_beep 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                            curs_beep 3x 2024-07-20 ncurses 6.5 Library calls
                                                                                                                                                                            
++
                                                                                                                                                                            curs_beep 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                            
+ 
                                                                                                                                                                            + curs_beep(3x)                    Library calls                   curs_beep(3x)
+ 
+@@ -82,8 +82,8 @@
+ 
+ 
+ 
                                                                                                                                                                            PORTABILITY
                                                                                                                                                                            +-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+-       error conditions for them.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+        On SVr4 curses, they always return OK, and X/Open Curses specifies them
+        as doing so.
+@@ -98,7 +98,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-20                     curs_beep(3x)
++ncurses 6.5                       2025-01-18                     curs_beep(3x)
+ 
                                                                                                                                                                            
+ 
                                                                                                                                                                            
+ 
                                                                                                                                                                              
+Index: doc/html/man/curs_bkgd.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_bkgd.3x.html	2024-12-28 21:43:55.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_bkgd.3x.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_bkgd 3x 2024-12-28 ncurses 6.5 Library calls
++curs_bkgd 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                              curs_bkgd 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                              
++
                                                                                                                                                                              curs_bkgd 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                              
+ 
                                                                                                                                                                              + curs_bkgd(3x)                    Library calls                   curs_bkgd(3x)
+ 
+@@ -64,28 +64,28 @@
+ 
+ 
+ 
                                                                                                                                                                              DESCRIPTION
                                                                                                                                                                              +-       Every curses window has a background property.  In the  library's  non-
+-       wide  configuration,  this property is a chtype which combines a set of
+-       attributes with the  background  character  (see  curs_attr(3x)).   The
+-       background character is a spacing character.
+-
+-       When  erasing  parts  of  the  screen,  curses fills the cells with the
+-       background character.  curses also  uses  the  window  background  when
+-       writing characters to the screen.
+-
+-       o   The  attribute  part  of the background combines with all non-blank
+-           characters written into the window,  as  with  the  waddch(3x)  and
+-           winsch(3x) families of functions.
+-
+-       o   Both  the  character  and attribute parts of the background combine
+-           with blank characters that are written into the window.
+-
+-       The background becomes a property of the character and  moves  with  it
+-       through any scrolling and insert/delete line/character operations.
+-
+-       To  the  extent  possible  on  a  given  terminal,  curses displays the
+-       attributes of the background as the graphic rendition of the  character
+-       put on the screen.
++       Every curses  window  has  a  background  character  property:  in  the
++       library's  non-wide  configuration,  it  is a curses character (chtype)
++       that combines a set of attributes (and, if colors are enabled, a  color
++       pair  identifier)  with  a  character  code.  When erasing (parts of) a
++       window, curses replaces the erased cells with the background character.
++
++       curses also uses the background character when writing characters to  a
++       populated window.
++
++       o   The  attribute  part  of the background character combines with all
++           non-blank character cells  in  the  window,  as  populated  by  the
++           waddch(3x)  and  winsch(3x)  families  of functions (and those that
++           call them).
++
++       o   Both the character code and attributes of the background  character
++           combine with blank character cells in the window.
++
++       The  background character's set of attributes becomes a property of the
++       character cell and move with it through any scrolling and insert/delete
++       line/character  operations.   To  the  extent  possible on the terminal
++       type, curses displays the attributes of the background character as the
++       graphic rendition of a character cell on the display.
+ 
+ 
+ 
                                                                                                                                                                              bkgd, wbkgd
                                                                                                                                                                              +@@ -108,9 +108,9 @@
+            specified  background  character; if they match, ncurses writes the
+            new background character to the cell.
+ 
+-       o   ncurses then checks if the cell uses color; that is, its color pair
+-           value  is  nonzero.   If not, it simply replaces the attributes and
+-           color  pair  in  the  cell  with  those  from  the  new  background
++       o   ncurses then checks whether the cell uses color; that is, its color
++           pair  value  is nonzero.  If not, it simply replaces the attributes
++           and color pair in the cell  with  those  from  the  new  background
+            character.
+ 
+        o   If  the  cell  uses color, and its background color matches that of
+@@ -125,65 +125,66 @@
+            the current background, and then adding  attributes  from  the  new
+            background.
+ 
+-       If  the  new  background's character is nonspacing, ncurses retains the
+-       existing background character, except for  one  special  case:  ncurses
+-       treats a background character value of zero (0) as a space.
+-
+-       If  the  terminal  does  not  support  color,  or if color has not been
+-       initialized with start_color(3x), ncurses ignores  the  new  background
+-       character's color attribute.
++       If the new background's character is non-spacing (for example, if it is
++       a  control  character),  ncurses  retains   the   existing   background
++       character,  except  for  one  special case: ncurses treats a background
++       character code of zero (0) as a space.
++
++       If the terminal does not support  color,  or  if  color  has  not  been
++       initialized  with  start_color(3x),  ncurses ignores the new background
++       character's color pair selection.
+ 
+ 
+ 
                                                                                                                                                                              bkgdset, wbkgdset
                                                                                                                                                                              +-       bkgdset  and  wbkgdset  manipulate  the  background  of  the applicable
++       bkgdset and  wbkgdset  manipulate  the  background  of  the  applicable
+        window, without updating the character cells as bkgd and wbkgd do; only
+        future writes reflect the updated background.
+ 
+ 
+ 
                                                                                                                                                                              getbkgd
                                                                                                                                                                              +-       getbkgd  returns  the  given window's background character, attributes,
++       getbkgd returns the given window's  background  character,  attributes,
+        and color pair as a chtype.
+ 
+ 
+ 
                                                                                                                                                                              RETURN VALUE
                                                                                                                                                                              +-       bkgdset and wbkgdset do not return a value
++       bkgdset and wbkgdset do not return a value.
+ 
+        Functions returning an int return ERR upon failure and OK upon success.
+        In ncurses, failure occurs if
+ 
+-       o   if the library has not been initialized, or
++       o   the curses screen has not been initialized, or
+ 
+-       o   if win is NULL.
++       o   win is NULL.
+ 
+        getbkgd's return value is as described above.
+ 
+ 
+ 
                                                                                                                                                                              NOTES
                                                                                                                                                                              +-       Unusually,  there is no wgetbkgd function; getbkgd behaves as one would
++       Unusually, there is no wgetbkgd function; getbkgd behaves as one  would
+        expect wgetbkgd to, accepting a WINDOW pointer argument.
+ 
+        bkgd and bkgdset may be implemented as macros.
+ 
+-       X/Open Curses mentions that the character part of the  background  must
+-       be  a  single-byte  value.  ncurses, like SVr4 curses, checks to ensure
+-       that, and retains the existing background character if the check fails.
++       X/Open  Curses  mentions that the character part of the background must
++       be a single-byte value.  ncurses, like SVr4 curses,  checks  to  ensure
++       that  it is, and retains the existing background character if the check
++       fails.
+ 
+ 
+ 
                                                                                                                                                                              PORTABILITY
                                                                                                                                                                              +-       X/Open Curses, Issue 4 describes these functions.   It  indicates  that
+-       bkgd,  wbkgd,  and  getbkgd  return  ERR on failure (in the case of the
++       X/Open Curses Issue 4 describes these  functions.   It  indicates  that
++       bkgd,  wbkgd,  and  getbkgd  return  ERR on failure (in the case of the
+        last, this value is cast to chtype), but specifies no error  conditions
+        for them.
+ 
+-       SVr4  documentation  says  that  bkgd  and  wbkgd  return OK "or a non-
+-       negative integer if immedok is set", which refers to the  return  value
+-       from  wrefresh(),  used  to  implement  the immediate repainting.  SVr4
+-       curses's wrefresh returns the  number  of  characters  written  to  the
+-       screen during the refresh; that of ncurses does not.
+-
+-       Neither  X/Open  Curses  nor  the  SVr4  manual  pages  detail  how the
+-       rendition of characters on  the  screen  updates  when  bkgd  or  wbkgd
+-       changes  the background character.  ncurses, like SVr4 curses, does not
++       SVr4  documentation  says  that  bkgd  and  wbkgd  return OK "or a non-
++       negative integer if immedok() is set", referring to  the  return  value
++       from  wrefresh,  which in SVr4 returns a count of characters written to
++       the window if its immedok property is set; in ncurses, it does not.
++
++       Neither X/Open  Curses  nor  the  SVr4  manual  pages  detail  how  the
++       rendition  of  characters  in  the  window  updates  when bkgd or wbkgd
++       changes the background character.  ncurses, like SVr4 curses, does  not
+        (in  its  non-wide  configuration)  store  the  background  and  window
+        attribute contributions to each character cell separately.
+ 
+@@ -193,14 +194,14 @@
+ 
+ 
+ 
                                                                                                                                                                              SEE ALSO
                                                                                                                                                                              +-       curs_bkgrnd(3x)  describes  the  corresponding  functions  in  the wide
++       curs_bkgrnd(3x) describes  the  corresponding  functions  in  the  wide
+        configuration of ncurses.
+ 
+        curses(3x), curs_addch(3x), curs_attr(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                     curs_bkgd(3x)
++ncurses 6.5                       2025-01-18                     curs_bkgd(3x)
+ 
                                                                                                                                                                              
+ 
                                                                                                                                                                              
+ 
                                                                                                                                                                                
+Index: doc/html/man/curs_bkgrnd.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_bkgrnd.3x.html	2024-12-28 21:43:55.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_bkgrnd.3x.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_bkgrnd 3x 2024-12-28 ncurses 6.5 Library calls
++curs_bkgrnd 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                curs_bkgrnd 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                
++
                                                                                                                                                                                curs_bkgrnd 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                
+ 
                                                                                                                                                                                + curs_bkgrnd(3x)                  Library calls                 curs_bkgrnd(3x)
+ 
+@@ -65,84 +65,85 @@
+ 
+ 
+ 
                                                                                                                                                                                DESCRIPTION
                                                                                                                                                                                +-       Every curses window has a background property.  In the  library's  wide
+-       configuration,  this  property  is  a  cchar_t  which combines a set of
+-       attributes with the  background  character  (see  curs_attr(3x)).   The
+-       background character is a spacing character.
+-
+-       When  erasing  parts  of  the  screen,  curses fills the cells with the
+-       background character.  curses also  uses  the  window  background  when
+-       writing characters to the screen.
+-
+-       o   The  attribute  part  of the background combines with all non-blank
+-           characters written into the window, as with  the  wadd_wch(3x)  and
+-           wins_wch(3x) families of functions.
+-
+-       o   Both  the  character  and attribute parts of the background combine
+-           with blank characters that are written into the window.
+-
+-       The background becomes a property of the character and  moves  with  it
+-       through any scrolling and insert/delete line/character operations.
+-
+-       To  the  extent  possible  on  a  given  terminal,  curses displays the
+-       attributes of the background as the graphic rendition of the  character
+-       put on the screen.
++       Every curses  window  has  a  background  character  property:  in  the
++       library's   wide  configuration,  it  is  a  curses  complex  character
++       (cchar_t) that combines  a  set  of  attributes  (and,  if  colors  are
++       enabled,  a color pair identifier) with a character code.  When erasing
++       (parts of)  a  window,  curses  replaces  the  erased  cells  with  the
++       background character.
++
++       curses  also uses the background character when writing characters to a
++       populated window.
++
++       o   The attribute part of the background character  combines  with  all
++           non-blank  character  cells  in  the  window,  as  populated by the
++           wadd_wch(3x) and wins_wch(3x) families of functions (and those that
++           call them).
++
++       o   Both  the character code and attributes of the background character
++           combine with blank character cells in the window.
++
++       The background character's set of attributes becomes a property of  the
++       character cell and move with it through any scrolling and insert/delete
++       line/character operations.  To the  extent  possible  on  the  terminal
++       type, curses displays the attributes of the background character as the
++       graphic rendition of a character cell on the display.
+ 
+ 
+ 
                                                                                                                                                                                bkgrnd, wbkgrnd
                                                                                                                                                                                +-       bkgrnd  and  wbkgrnd  set  the  background  property  of  stdscr or the
++       bkgrnd and wbkgrnd  set  the  background  property  of  stdscr  or  the
+        specified window and then apply this setting to every character cell in
+        that window.
+ 
+-       o   The  rendition  of every character in the window changes to the new
++       o   The rendition of every character in the window changes to  the  new
+            background rendition.
+ 
+        o   Wherever the former background character appears, it changes to the
+            new background character.
+ 
+-       ncurses  updates  the rendition of each character cell by comparing the
++       ncurses updates the rendition of each character cell by  comparing  the
+        character, non-color attributes, and color pair selection.  The library
+-       applies  to  following procedure to each cell in the window, whether or
++       applies to following procedure to each cell in the window,  whether  or
+        not it is blank.
+ 
+-       o   ncurses first compares  the  cell's  character  to  the  previously
+-           specified  background  character; if they match, ncurses writes the
++       o   ncurses  first  compares  the  cell's  character  to the previously
++           specified background character; if they match, ncurses  writes  the
+            new background character to the cell.
+ 
+-       o   ncurses then checks if the cell uses color; that is, its color pair
+-           value  is  nonzero.   If not, it simply replaces the attributes and
+-           color  pair  in  the  cell  with  those  from  the  new  background
++       o   ncurses then checks whether the cell uses color; that is, its color
++           pair value is nonzero.  If not, it simply replaces  the  attributes
++           and  color  pair  in  the  cell  with those from the new background
+            character.
+ 
+-       o   If  the  cell  uses color, and its background color matches that of
+-           the current window background, ncurses removes attributes that  may
+-           have  come  from the current background and adds those from the new
+-           background.  It finishes by setting the cell's  background  to  use
++       o   If the cell uses color, and its background color  matches  that  of
++           the  current window background, ncurses removes attributes that may
++           have come from the current background and adds those from  the  new
++           background.   It  finishes  by setting the cell's background to use
+            the new window background color.
+ 
+-       o   If  the  cell  uses  color, and its background color does not match
+-           that of the current window background,  ncurses  updates  only  the
+-           non-color  attributes, first removing those that may have come from
+-           the current background, and then adding  attributes  from  the  new
++       o   If the cell uses color, and its background  color  does  not  match
++           that  of  the  current  window background, ncurses updates only the
++           non-color attributes, first removing those that may have come  from
++           the  current  background,  and  then adding attributes from the new
+            background.
+ 
+-       If the new background's character is nonspacing, ncurses reuses the old
+-       background character, except for one special  case:  ncurses  treats  a
+-       background character value of zero (0) as a space.
+-
+-       If  the  terminal  does  not  support  color,  or if color has not been
+-       initialized with start_color(3x), ncurses ignores  the  new  background
+-       character's color attribute.
++       If the new background's character is non-spacing,  ncurses  reuses  the
++       old background character, except for one special case: ncurses treats a
++       background character code of zero (0) as a space.
++
++       If the terminal does not support  color,  or  if  color  has  not  been
++       initialized  with  start_color(3x),  ncurses ignores the new background
++       character's color pair selection.
+ 
+ 
+ 
                                                                                                                                                                                bkgrndset, wbkgrndset
                                                                                                                                                                                +-       bkgrndset  and  wbkgrndset  manipulate the background of the applicable
+-       window, without updating the character cells as bkgrnd and wbkgrnd  do;
++       bkgrndset and wbkgrndset manipulate the background  of  the  applicable
++       window,  without updating the character cells as bkgrnd and wbkgrnd do;
+        only future writes reflect the updated background.
+ 
+ 
+ 
                                                                                                                                                                                getbkgrnd, wgetbkgrnd
                                                                                                                                                                                +-       getbkgrnd  and  wgetbkgrnd  respectively  obtain  stdscr's or the given
++       getbkgrnd and wgetbkgrnd respectively  obtain  stdscr's  or  the  given
+        window's background character, attributes, and color pair, and store it
+        in their wch argument.
+ 
+@@ -150,8 +151,10 @@
+ 
                                                                                                                                                                                RETURN VALUE
                                                                                                                                                                                +        bkgrndset and wbkgrndset do not return a value.
+ 
+-       The  other  functions  return ERR upon failure and OK upon success.  In
+-       ncurses, failure occurs if
++       Functions returning an int return ERR upon failure and OK upon success.
++       In ncurses, failure occurs if
++
++       o   the curses screen has not been initialized,
+ 
+        o   win is NULL, or
+ 
+@@ -161,33 +164,33 @@
+ 
                                                                                                                                                                                NOTES
                                                                                                                                                                                +        bkgrnd, bkgrndset, and getbkgrnd may be implemented as macros.
+ 
+-       Unlike their counterparts in the  non-wide  configuration  of  ncurses,
+-       getbkgrnd  and wgetbkgrnd supply the background character and attribute
+-       in a modifiable cchar_t parameter, not as the return value.
++       Unlike  their  counterparts  in  the non-wide configuration of ncurses,
++       getbkgrnd and wgetbkgrnd store the background character in a modifiable
++       cchar_t parameter, rather than supplying it as the return value.
+ 
+ 
+ 
                                                                                                                                                                                PORTABILITY
                                                                                                                                                                                +-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+-       error conditions for them.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+        X/Open Curses does not provide details of how the rendition is updated.
+-       ncurses follows the approach used in SVr4 curses's  non-wide  functions
++       ncurses  follows  the approach used in SVr4 curses's non-wide functions
+        for manipulating the window background.
+ 
+ 
+ 
                                                                                                                                                                                HISTORY
                                                                                                                                                                                +-       These functions were initially specified by X/Open Curses, Issue 4.
++       These functions were initially specified by X/Open Curses Issue 4.
+ 
+ 
+ 
                                                                                                                                                                                SEE ALSO
                                                                                                                                                                                +-       curs_bkgd(3x)  describes  the  corresponding  functions in the non-wide
++       curs_bkgd(3x) describes the corresponding  functions  in  the  non-wide
+        configuration of ncurses.
+ 
+        curses(3x), curs_add_wch(3x), curs_attr(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                   curs_bkgrnd(3x)
++ncurses 6.5                       2025-01-18                   curs_bkgrnd(3x)
+ 
                                                                                                                                                                                
+ 
                                                                                                                                                                                
+ 
                                                                                                                                                                                  
+Index: doc/html/man/curs_border.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_border.3x.html	2024-07-27 23:11:31.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_border.3x.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_border 3x 2024-07-27 ncurses 6.5 Library calls
++curs_border 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                  curs_border 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                                                                  
++
                                                                                                                                                                                  curs_border 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                  
+ 
                                                                                                                                                                                  + curs_border(3x)                  Library calls                 curs_border(3x)
+ 
+@@ -115,33 +115,37 @@
+ 
+ 
+ 
                                                                                                                                                                                  RETURN VALUE
                                                                                                                                                                                  +-       All  routines return the integer OK.  The SVr4.0 manual says "or a non-
+-       negative integer if immedok is set", but this appears to be an error.
++       All routines return the integer OK.
+ 
+        This implementation returns ERR if the window pointer is null.
+ 
+-       Functions prefixed with "mv" first perform cursor movement and fail  if
++       Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                                                  NOTES
                                                                                                                                                                                  +-       The  borders  generated  by these functions are inside borders (this is
+-       also true of SVr4 curses, though the fact is not documented).
++       border and box may be implemented as macros.
+ 
+-       Note that border and box may be macros.
++       The borders generated by these functions are inside  borders  (this  is
++       also true of SVr4 curses, though the fact is not documented).
+ 
+ 
+ 
                                                                                                                                                                                  PORTABILITY
                                                                                                                                                                                  +-       These functions are described in X/Open Curses, Issue 4.  It  specifies
++       These  functions  are described in X/Open Curses Issue 4.  It specifies
+        no error conditions for them.
+ 
++       SVr4 documentation says that these  functions  return  OK  "or  a  non-
++       negative  integer  if  immedok() is set", referring to the return value
++       from wrefresh, which in SVr4 returns a count of characters  written  to
++       the window if its immedok property is set; in ncurses, it does not.
++
+ 
+ 
                                                                                                                                                                                  SEE ALSO
                                                                                                                                                                                  +        curses(3x), curs_outopts(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                   curs_border(3x)
++ncurses 6.5                       2025-01-18                   curs_border(3x)
+ 
                                                                                                                                                                                  
+ 
                                                                                                                                                                                  
+ 
                                                                                                                                                                                    
+Index: doc/html/man/curs_border_set.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_border_set.3x.html	2024-05-25 22:33:41.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_border_set.3x.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_border_set 3x 2024-05-25 ncurses 6.5 Library calls
++curs_border_set 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                    curs_border_set 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                                                                                    
++
                                                                                                                                                                                    curs_border_set 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                    
+ 
                                                                                                                                                                                    + curs_border_set(3x)              Library calls             curs_border_set(3x)
+ 
+@@ -151,12 +151,12 @@
+ 
+ 
+ 
                                                                                                                                                                                    NOTES
                                                                                                                                                                                    +-       Note   that   border_set,    hline_set,    mvhline_set,    mvvline_set,
+-       mvwhline_set, mvwvline_set, and vline_set may be macros.
++       border_set,   hline_set,   mvhline_set,   mvvline_set,    mvwhline_set,
++       mvwvline_set, and vline_set may be implemented as macros.
+ 
+ 
+ 
                                                                                                                                                                                    PORTABILITY
                                                                                                                                                                                    +-       These functions are described in X/Open Curses, Issue 4.
++       These functions are described in X/Open Curses Issue 4.
+ 
+ 
+ 
                                                                                                                                                                                    SEE ALSO
                                                                                                                                                                                    +@@ -164,7 +164,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25               curs_border_set(3x)
++ncurses 6.5                       2025-01-18               curs_border_set(3x)
+ 
                                                                                                                                                                                    
+ 
                                                                                                                                                                                    
+ 
                                                                                                                                                                                      
+Index: doc/html/man/curs_clear.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_clear.3x.html	2024-05-25 22:33:41.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_clear.3x.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_clear 3x 2024-05-25 ncurses 6.5 Library calls
++curs_clear 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                      curs_clear 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                                                                                      
++
                                                                                                                                                                                      curs_clear 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                      
+ 
                                                                                                                                                                                      + curs_clear(3x)                   Library calls                  curs_clear(3x)
+ 
+@@ -98,7 +98,7 @@
+ 
                                                                                                                                                                                      RETURN VALUE
                                                                                                                                                                                      +        All routines return the integer OK on success and ERR on failure.
+ 
+-       X/Open defines no error conditions.  In this implementation,
++       In this implementation,
+ 
+        o   functions using a window pointer parameter return ERR if it is null
+ 
+@@ -106,29 +106,30 @@
+ 
+ 
+ 
                                                                                                                                                                                      NOTES
                                                                                                                                                                                      +-       Note that erase, werase, clear, wclear, clrtobot, and clrtoeol  may  be
+-       macros.
++       erase, werase, clear, wclear, clrtobot, and clrtoeol may be implemented
++       as macros.
+ 
+ 
+ 
                                                                                                                                                                                      PORTABILITY
                                                                                                                                                                                      +-       These functions are described in X/Open Curses, Issue 4.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+-       The  SVr4.0  manual  says  that these functions could return "or a non-
+-       negative integer if immedok is set", referring to the  return-value  of
+-       wrefresh.  In that implementation, wrefresh would return a count of the
+-       number of characters written to the terminal.
++       SVr4 documentation says that these  functions  return  OK  "or  a  non-
++       negative  integer  if  immedok() is set", referring to the return value
++       from wrefresh, which in SVr4 returns a count of characters  written  to
++       the window if its immedok property is set; in ncurses, it does not.
+ 
+-       Some historic curses implementations had, as an  undocumented  feature,
++       Some  historic  curses implementations had, as an undocumented feature,
+        the  ability  to  do  the  equivalent  of  clearok(...,  1)  by  saying
+        touchwin(stdscr) or clear(stdscr).  This will not work under ncurses.
+ 
+-       This implementation, and others  such  as  Solaris,  sets  the  current
+-       position  to 0,0 after erasing via werase and wclear.  That fact is not
+-       documented  in  other  implementations,  and  may  not   be   true   of
++       This  implementation,  and  others  such  as  Solaris, sets the current
++       position to 0,0 after erasing via werase and wclear.  That fact is  not
++       documented   in   other   implementations,  and  may  not  be  true  of
+        implementations which were not derived from SVr4 source.
+ 
+        Not obvious from the description, most implementations clear the screen
+-       after wclear even for a subwindow or derived window.   If  you  do  not
++       after  wclear  even  for  a subwindow or derived window.  If you do not
+        want to clear the screen during the next wrefresh, use werase instead.
+ 
+ 
+@@ -137,7 +138,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                    curs_clear(3x)
++ncurses 6.5                       2025-01-18                    curs_clear(3x)
+ 
                                                                                                                                                                                      
+ 
                                                                                                                                                                                      
+ 
                                                                                                                                                                                        
+Index: doc/html/man/curs_color.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_color.3x.html	2024-12-28 21:43:55.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_color.3x.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_color 3x 2024-12-28 ncurses 6.5 Library calls
++curs_color 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                        curs_color 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                        
++
                                                                                                                                                                                        curs_color 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                        
+ 
                                                                                                                                                                                        + curs_color(3x)                   Library calls                  curs_color(3x)
+ 
+@@ -52,7 +52,7 @@
+        extended_color_content,    extended_pair_content,    reset_color_pairs,
+        COLOR_PAIR, PAIR_NUMBER, COLORS, COLOR_PAIRS,  COLOR_BLACK,  COLOR_RED,
+        COLOR_GREEN,   COLOR_YELLOW,   COLOR_BLUE,  COLOR_MAGENTA,  COLOR_CYAN,
+-       COLOR_WHITE - manipulate terminal colors with curses
++       COLOR_WHITE, A_COLOR - manipulate terminal colors with curses
+ 
+ 
+ 
                                                                                                                                                                                        SYNOPSIS
                                                                                                                                                                                        +@@ -82,8 +82,18 @@
+        /* extension */
+        void reset_color_pairs(void);
+ 
++       /* macros */
+        int COLOR_PAIR(int n);
+        PAIR_NUMBER(int attr);
++       COLOR_BLACK
++       COLOR_RED
++       COLOR_GREEN
++       COLOR_YELLOW
++       COLOR_BLUE
++       COLOR_MAGENTA
++       COLOR_CYAN
++       COLOR_WHITE
++       A_COLOR
+ 
+ 
+ 
                                                                                                                                                                                        DESCRIPTION
                                                                                                                                                                                        +@@ -165,372 +175,378 @@
+        Some terminals support more than the eight (8)  "ANSI"  colors.   There
+        are no standard names for those additional colors.
+ 
++       A_COLOR  is  a  bit  mask  that extracts a color pair identifier from a
++       chtype.
++
+ 
+ 
                                                                                                                                                                                        VARIABLES
                                                                                                                                                                                        + 
+ 
                                                                                                                                                                                        COLORS
                                                                                                                                                                                        +-       is  initialized  by  start_color  to  the  maximum number of colors the
++       is initialized by start_color to  the  maximum  number  of  colors  the
+        terminal can support.
+ 
+ 
+ 
                                                                                                                                                                                        COLOR_PAIRS
                                                                                                                                                                                        +-       is initialized by start_color to the maximum number of color pairs  the
++       is  initialized by start_color to the maximum number of color pairs the
+        terminal can support.  Often, its value is the product COLORS x COLORS,
+        but this is not always true.
+ 
+-       o   A few terminals use the HLS color space  (see  start_color  below),
++       o   A  few  terminals  use the HLS color space (see start_color below),
+            ignoring this rule; and
+ 
+-       o   terminals  supporting  a  large number of colors are limited to the
++       o   terminals supporting a large number of colors are  limited  to  the
+            number of color pairs that a signed short value can represent.
+ 
+ 
+ 
                                                                                                                                                                                        FUNCTIONS
                                                                                                                                                                                        + 
+ 
                                                                                                                                                                                        start_color
                                                                                                                                                                                        +-       The start_color 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
++       The  start_color  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 initscr.  start_color does this:
+ 
+-       o   It   initializes  two  global  variables,  COLORS  and  COLOR_PAIRS
++       o   It  initializes  two  global  variables,  COLORS  and   COLOR_PAIRS
+            (respectively defining the maximum number of colors and color pairs
+            the terminal can support).
+ 
+-       o   It  initializes  the special color pair 0 to the default foreground
++       o   It initializes the special color pair 0 to the  default  foreground
+            and background colors.  No other color pairs are initialized.
+ 
+-       o   It restores the colors on the terminal to the values they had  when
++       o   It  restores the colors on the terminal to the values they had when
+            the terminal was just turned on.
+ 
+-       o   If  the  terminal supports the initc (initialize_color) capability,
+-           start_color initializes its internal table  representing  the  red,
++       o   If the terminal supports the initc  (initialize_color)  capability,
++           start_color  initializes  its  internal table representing the red,
+            green, and blue components of the color palette.
+ 
+            The components depend on whether the terminal uses CGA (aka "ANSI")
+-           or HLS (i.e.,  the  hls  (hue_lightness_saturation)  capability  is
+-           set).   The  table  is  initialized  first  for  eight basic colors
+-           (black, red, green, yellow, blue, magenta, cyan, and white),  using
++           or  HLS  (i.e.,  the  hls  (hue_lightness_saturation) capability is
++           set).  The table  is  initialized  first  for  eight  basic  colors
++           (black,  red, green, yellow, blue, magenta, cyan, and white), using
+            weights that depend upon the CGA/HLS choice.  For "ANSI" colors the
+-           weights are 680 or 0 depending on whether  the  corresponding  red,
+-           green,  or  blue component is used or not.  That permits using 1000
+-           to represent bold/bright colors.  After the  initial  eight  colors
+-           (if  the  terminal  supports more than eight colors) the components
+-           are initialized using the same pattern, but with weights  of  1000.
++           weights  are  680  or 0 depending on whether the corresponding red,
++           green, or blue component is used or not.  That permits  using  1000
++           to  represent  bold/bright  colors.  After the initial eight colors
++           (if the terminal supports more than eight  colors)  the  components
++           are  initialized  using the same pattern, but with weights of 1000.
+            SVr4 uses a similar scheme, but uses 1000 for the components of the
+            initial eight colors.
+ 
+            start_color does not attempt to set the terminal's color palette to
+-           match  its  built-in  table.   An application may use init_color to
++           match its built-in table.  An application  may  use  init_color  to
+            alter the internal table along with the terminal's color.
+ 
+-       These limits apply to color values and  color  pairs.   Values  outside
++       These  limits  apply  to  color values and color pairs.  Values outside
+        these limits are not valid, and may result in a runtime error:
+ 
+-       o   COLORS   corresponds   to   the   terminal   database's  max_colors
++       o   COLORS  corresponds   to   the   terminal   database's   max_colors
+            capability, (see terminfo(5)).
+ 
+-       o   color values are expected  to  be  in  the  range  0  to  COLORS-1,
++       o   color  values  are  expected  to  be  in  the  range 0 to COLORS-1,
+            inclusive (including 0 and COLORS-1).
+ 
+-       o   a  special  color value -1 is used in certain extended functions to
++       o   a special color value -1 is used in certain extended  functions  to
+            denote the default color (see use_default_colors(3x)).
+ 
+-       o   COLOR_PAIRS  corresponds  to  the  terminal  database's   max_pairs
++       o   COLOR_PAIRS   corresponds  to  the  terminal  database's  max_pairs
+            capability, (see terminfo(5)).
+ 
+-       o   valid  color  pair  values  are  in  the  range 1 to COLOR_PAIRS-1,
++       o   valid color pair values  are  in  the  range  1  to  COLOR_PAIRS-1,
+            inclusive.
+ 
+        o   color pair 0 is special; it denotes "no color".
+ 
+-           Color pair 0 is assumed to be  white  on  black,  but  is  actually
+-           whatever  the  terminal implements before color is initialized.  It
++           Color  pair  0  is  assumed  to  be white on black, but is actually
++           whatever the terminal implements before color is  initialized.   It
+            cannot be modified by the application.
+ 
+ 
+ 
                                                                                                                                                                                        has_colors
                                                                                                                                                                                        +-       The has_colors routine requires no arguments.  It returns TRUE  if  the
+-       terminal  can  manipulate  colors;  otherwise,  it returns FALSE.  This
+-       routine  facilitates  writing   terminal-independent   programs.    For
++       The  has_colors  routine requires no arguments.  It returns TRUE if the
++       terminal can manipulate colors;  otherwise,  it  returns  FALSE.   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.
+ 
+ 
+ 
                                                                                                                                                                                        can_change_color
                                                                                                                                                                                        +        The can_change_color routine requires no arguments.  It returns TRUE if
+-       the  terminal  supports colors and can change their definitions; other,
+-       it  returns  FALSE.   This  routine   facilitates   writing   terminal-
++       the terminal supports colors and can change their  definitions;  other,
++       it   returns   FALSE.    This  routine  facilitates  writing  terminal-
+        independent programs.
+ 
+ 
+ 
                                                                                                                                                                                        init_pair
                                                                                                                                                                                        +        The init_pair routine changes the definition of a color pair.  It takes
+-       three arguments: the number of  the  color  pair  to  be  changed,  the
++       three  arguments:  the  number  of  the  color  pair to be changed, the
+        foreground color number, and the background color number.  For portable
+        applications:
+ 
+-       o   The first argument must be a valid color pair  value.   If  default
+-           colors  are  used  (see  use_default_colors(3x)) the upper limit is
+-           adjusted to allow for extra pairs which  use  a  default  color  in
++       o   The  first  argument  must be a valid color pair value.  If default
++           colors are used (see use_default_colors(3x))  the  upper  limit  is
++           adjusted  to  allow  for  extra  pairs which use a default color in
+            foreground and/or background.
+ 
+        o   The second and third arguments must be valid color values.
+ 
+-       If  the  color pair was previously initialized, the screen is refreshed
+-       and all  occurrences  of  that  color  pair  are  changed  to  the  new
++       If the color pair was previously initialized, the screen  is  refreshed
++       and  all  occurrences  of  that  color  pair  are  changed  to  the new
+        definition.
+ 
+-       As  an  extension,  ncurses  allows  you  to  set  color pair 0 via the
+-       assume_default_colors(3x) routine, or to specify  the  use  of  default
++       As an extension, ncurses allows  you  to  set  color  pair  0  via  the
++       assume_default_colors(3x)  routine,  or  to  specify the use of default
+        colors (color number -1) if you first invoke the use_default_colors(3x)
+        routine.
+ 
+ 
+ 
                                                                                                                                                                                        init_extended_pair
                                                                                                                                                                                        +-       Because init_pair uses signed shorts for its  parameters,  that  limits
++       Because  init_pair  uses  signed shorts for its parameters, that limits
+        color  pairs  and  color-values  to  32767  on  modern  hardware.   The
+-       extension init_extended_pair uses ints for the color  pair  and  color-
++       extension  init_extended_pair  uses  ints for the color pair and color-
+        value, allowing a larger number of colors to be supported.
+ 
+ 
+ 
                                                                                                                                                                                        init_color
                                                                                                                                                                                        +-       The  init_color  routine  changes  the definition of a color.  It takes
++       The init_color 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).
+ 
+-       o   The  first argument must be a valid color value; default colors are
+-           not allowed here.  (See the section Colors for  the  default  color
++       o   The first argument must be a valid color value; default colors  are
++           not  allowed  here.   (See the section Colors for the default color
+            index.)
+ 
+-       o   Each  of  the  last  three arguments must be a value in the range 0
++       o   Each of the last three arguments must be a value  in  the  range  0
+            through 1000.
+ 
+-       When init_color is used, all occurrences of that color  on  the  screen
++       When  init_color  is  used, all occurrences of that color on the screen
+        immediately change to the new definition.
+ 
+ 
+ 
                                                                                                                                                                                        init_extended_color
                                                                                                                                                                                        +-       Because  init_color  uses signed shorts for its parameters, that limits
+-       color-values and their red, green, and  blue  components  to  32767  on
+-       modern  hardware.   The extension init_extended_color uses ints for the
+-       color value and for  setting  the  red,  green,  and  blue  components,
++       Because init_color uses signed shorts for its parameters,  that  limits
++       color-values  and  their  red,  green,  and blue components to 32767 on
++       modern hardware.  The extension init_extended_color uses ints  for  the
++       color  value  and  for  setting  the  red,  green, and blue components,
+        allowing a larger number of colors to be supported.
+ 
+ 
+ 
                                                                                                                                                                                        color_content
                                                                                                                                                                                        +        The color_content 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 shorts for
+-       storing the information about the  amounts  of  red,  green,  and  blue
++       of  the  red, green, and blue (RGB) components in a color.  It requires
++       four arguments: the color number, and three  addresses  of  shorts  for
++       storing  the  information  about  the  amounts  of red, green, and blue
+        components in the given color.
+ 
+-       o   The  first  argument  must  be a valid color value, i.e., 0 through
++       o   The first argument must be a valid color  value,  i.e.,  0  through
+            COLORS-1, inclusive.
+ 
+-       o   The values that are stored at the addresses pointed to by the  last
+-           three  arguments  are  in  the  range 0 (no component) through 1000
++       o   The  values that are stored at the addresses pointed to by the last
++           three arguments are in the range  0  (no  component)  through  1000
+            (maximum amount of component), inclusive.
+ 
+ 
+ 
                                                                                                                                                                                        extended_color_content
                                                                                                                                                                                        +-       Because color_content uses  signed  shorts  for  its  parameters,  that
+-       limits  color-values and their red, green, and blue components to 32767
++       Because  color_content  uses  signed  shorts  for  its parameters, that
++       limits color-values and their red, green, and blue components to  32767
+        on modern hardware.  The extension extended_color_content uses ints for
+-       the  color value and for returning the red, green, and blue components,
++       the color value and for returning the red, green, and blue  components,
+        allowing a larger number of colors to be supported.
+ 
+ 
+ 
                                                                                                                                                                                        pair_content
                                                                                                                                                                                        +-       The pair_content routine allows programmers to find out what  colors  a
+-       given  color  pair consists of.  It requires three arguments: the color
++       The  pair_content  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 shorts for storing the foreground and
+        the background color numbers.
+ 
+-       o   The  first argument must be a valid color value, i.e., in the range
++       o   The first argument must be a valid color value, i.e., in the  range
+            1 through COLOR_PAIRS-1, inclusive.
+ 
+-       o   The values that are stored at  the  addresses  pointed  to  by  the
+-           second  and  third  arguments  are  in  the range 0 through COLORS,
++       o   The  values  that  are  stored  at  the addresses pointed to by the
++           second and third arguments are  in  the  range  0  through  COLORS,
+            inclusive.
+ 
+ 
+ 
                                                                                                                                                                                        extended_pair_content
                                                                                                                                                                                        +        Because pair_content uses signed shorts for its parameters, that limits
+        color pair and color-values to 32767 on modern hardware.  The extension
+-       extended_pair_content uses ints for the color pair  and  for  returning
+-       the  foreground  and  background  colors,  allowing  a larger number of
++       extended_pair_content  uses  ints  for the color pair and for returning
++       the foreground and background  colors,  allowing  a  larger  number  of
+        colors to be supported.
+ 
+ 
+ 
                                                                                                                                                                                        reset_color_pairs
                                                                                                                                                                                        +-       The extension reset_color_pairs tells ncurses to  discard  all  of  the
+-       color  pair  information which was set with init_pair.  It also touches
+-       the current- and standard-screens, allowing an  application  to  switch
++       The  extension  reset_color_pairs  tells  ncurses to discard all of the
++       color pair information which was set with init_pair.  It  also  touches
++       the  current-  and  standard-screens, allowing an application to switch
+        color palettes rapidly.
+ 
+ 
+ 
                                                                                                                                                                                        COLOR_PAIR
                                                                                                                                                                                        +        COLOR_PAIR(n) 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 attr_set (which pass
+-       the color  pair  as  a  separate  parameter)  rather  than  the  legacy
++       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 attr_set  (which  pass
++       the  color  pair  as  a  separate  parameter)  rather  than  the legacy
+        functions such as attrset.
+ 
+ 
+ 
                                                                                                                                                                                        PAIR_NUMBER
                                                                                                                                                                                        +-       PAIR_NUMBER(attr)   extracts   the  color  information  from  its  attr
+-       parameter and returns it as a color pair  number;  it  is  the  inverse
++       PAIR_NUMBER(attr)  extracts  the  color  information  from   its   attr
++       parameter  and  returns  it  as  a color pair number; it is the inverse
+        operation of COLOR_PAIR.
+ 
+ 
+ 
                                                                                                                                                                                        RETURN VALUE
                                                                                                                                                                                        +-       The routines can_change_color and has_colors return TRUE or FALSE.
++       can_change_color and  has_colors  return  TRUE  or  FALSE.   The  other
++       functions return OK on success and ERR on failure.
+ 
+-       All  other routines return the integer ERR upon failure and an OK (SVr4
+-       specifies only "an integer  value  other  than  ERR")  upon  successful
+-       completion.
++       In   ncurses,  functions  returning  an  int  recognize  several  error
++       conditions.
+ 
+-       X/Open  defines  no  error  conditions.   SVr4 does document some error
+-       conditions which apply in general:
++       o   All return  ERR  if  the  screen  has  not  been  initialized;  see
++           initscr(3x) or newterm(3x).
+ 
+-       o   This implementation will return ERR on attempts to use color values
+-           outside  the  range  0  to  COLORS-1 (except for the default colors
+-           extension),  or  use  color  pairs   outside   the   range   0   to
+-           COLOR_PAIRS-1.
++       o   All  except  start_color  return  ERR  if  start_color has not been
++           called, or itself returned ERR.
+ 
+-           Color values used in init_color must be in the range 0 to 1000.
++       o   start_color returns ERR if it cannot allocate memory for its  color
++           pair table.
+ 
+-           An  error  is  returned  from all functions if the terminal has not
+-           been initialized.
++       o   init_color  returns  ERR  if  the  terminal  type  does not support
++           assignable color values; that is, if the  initialize_color  (initc)
++           capability is absent from its description.
+ 
+-           An error is returned from secondary functions such as init_pair  if
+-           start_color was not called.
++       o   init_color  returns  ERR if any of its r, g, b arguments is outside
++           the range 0-1000 inclusive.
+ 
+-       o   SVr4   does  much  the  same,  except  that  it  returns  ERR  from
+-           pair_content if the pair was not initialized using  init_pairs  and
+-           it  returns ERR from color_content if the terminal does not support
+-           changing colors.
++       o   init_pair,  init_color,  init_extended_pair,   init_extended_color,
++           color_content,     pair_content,     extended_color_content,    and
++           extended_pair_content return ERR on attempts to use
+ 
+-           This implementation does not return ERR for either case.
++           o   color identifiers outside the range 0-COLORS-1  inclusive,  the
++               default colors extension notwithstanding, or
+ 
+-       Specific functions make additional checks:
++           o   color  pairs  identifiers  outside  the  range  0-COLOR_PAIRS-1
++               inclusive.
+ 
+-          init_color
+-               returns ERR if the terminal  does  not  support  this  feature,
+-               e.g.,  if  the  initialize_color  capability is absent from the
+-               terminal description.
+ 
+-          start_color
+-               returns an error if the color table cannot be allocated.
++
                                                                                                                                                                                        NOTES
                                                                                                                                                                                        ++       In ncurses, init_pair accepts negative foreground and background  color
++       arguments  to  support  its  use_default_colors(3x) extension, but only
++       after the latter function has been called.
+ 
++       The assumption that COLOR_BLACK is the  terminal's  default  background
++       color  can  be  overridden  using  ncurses's  assume_default_colors(3x)
++       extension.
+ 
+-
                                                                                                                                                                                        NOTES
                                                                                                                                                                                        +-       In the ncurses implementation, there is  a  separate  color  activation
+-       flag,  color  palette,  color  pairs  table,  and associated COLORS and
+-       COLOR_PAIRS counts for  each  screen;  the  start_color  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.
+-
+-       Setting  an  implicit  background  color  via a color pair affects only
+-       character cells that a character write  operation  explicitly  touches.
+-       To  change the background color used when parts of a window are blanked
++       In ncurses, each pointer passed to color_content and  pair_content  can
++       be  null,  in  which  case  the  library  ignores  it,  permitting  the
++       application to disregard unnecessary information.
++
++       In ncurses, each screen has a color  activation  flag,  color  palette,
++       color pair table, and associated COLORS and COLOR_PAIRS values for each
++       screen; start_color affects only the  current  screen.   The  SVr4  and
++       X/Open  Curses  interface  was  not  really designed with this in mind;
++       historical implementations may use a single shared color palette.
++
++       Setting an implicit background color via  a  color  pair  affects  only
++       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 curs_bkgd(3x).
+ 
+-       Several caveats apply on older x86 machines  (e.g.,  i386,  i486)  with
+-       VGA-compatible graphics:
++       Several  caveats  apply  to IBM PC-compatible machines of the 80486 era
++       and earlier with CGA/EGA/VGA video.
+ 
+-       o   COLOR_YELLOW  is  actually  brown.  To get yellow, use COLOR_YELLOW
+-           combined with the A_BOLD attribute.
++       o   COLOR_YELLOW  is  actually   brown.    To   get   yellow,   combine
++           COLOR_YELLOW with the A_BOLD attribute.
+ 
+-       o   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 (such as the Paradise and compatibles)  do  the  wrong
+-           thing  when  you try to set a bright "yellow" background (you get a
+-           blinking yellow foreground instead).
++       o   The  A_BLINK attribute should in theory make the background bright.
++           This often fails to work, and even VGA  controllers  for  which  it
++           mostly  works,  such as those from Paradise and compatibles, do the
++           wrong thing when you try to set a bright "yellow" background -- you
++           get a blinking yellow foreground instead.
+ 
+-       o   Color RGB values are not settable.
++       o   Color  RGB  values  are  not configurable on these devices (in text
++           mode).
+ 
+ 
+ 
                                                                                                                                                                                        EXTENSIONS
                                                                                                                                                                                        +-       The functions marked as extensions were designed for  ncurses(3x),  and
+-       are  not  found  in  SVr4  curses, 4.4BSD curses, or any other previous
+-       curses implementation.
++       The functions marked as extensions originated in ncurses, and  are  not
++       found  in  SVr4  curses,  4.4BSD  curses,  or any other previous curses
++       implementation.
+ 
+ 
+ 
                                                                                                                                                                                        PORTABILITY
                                                                                                                                                                                        +        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       This  implementation  satisfies  X/Open  Curses's  minimum maximums for
+-       COLORS and COLOR_PAIRS.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+-       The  init_pair  routine  accepts  negative  values  of  foreground  and
+-       background  color  to support the use_default_colors(3x) extension, but
+-       only if that routine has been first invoked.
++       ncurses satisfies X/Open  Curses's  minimum  maximums  for  COLORS  and
++       COLOR_PAIRS.
+ 
+-       The assumption that COLOR_BLACK is the default background color for all
+-       terminals   can   be   modified   using  the  assume_default_colors(3x)
+-       extension.
+-
+-       This implementation checks the pointers, e.g., for the values  returned
+-       by  color_content  and  pair_content,  and will treat those as optional
+-       parameters when null.
+-
+-       X/Open Curses does not specify a limit for the  number  of  colors  and
+-       color pairs which a terminal can support.  However, in its use of short
+-       for the parameters, it carries over SVr4's  implementation  detail  for
+-       the compiled terminfo database, which uses signed 16-bit numbers.  This
+-       implementation provides extended versions of those functions which  use
+-       short  parameters, allowing applications to use larger color- and pair-
+-       numbers.
+-
+-       The reset_color_pairs function is an extension of ncurses.
++       X/Open  Curses  does  not  specify a limit for the number of colors and
++       color pairs which a terminal can support.  However, in its use of short
++       for  the  parameters,  it carries over SVr4's implementation detail for
++       the compiled terminfo  database,  which  uses  signed  16-bit  numbers.
++       ncurses  provides  extended  versions  of  the  functions  using  short
++       parameters,  allowing  applications  to  use  larger  color  and   pair
++       identifiers.
++
++       SVr4  curses returns ERR from pair_content if its pair argument was not
++       initialized using init_pairs, and from color_content  if  the  terminal
++       does not support changing colors.  ncurses does neither.
+ 
+ 
+ 
                                                                                                                                                                                        HISTORY
                                                                                                                                                                                        +-       SVr3.2 introduced color support to curses in 1987.
+-
+-       SVr4 made internal changes, e.g., moving  the  storage  for  the  color
+-       state  from  SP  (the  SCREEN  structure)  to  cur_term  (the  TERMINAL
+-       structure), but provided the same set of library functions.
+-
+-       SVr4 curses limits the number of color pairs  to  64,  reserving  color
+-       pair  zero  (0)  as the terminal's initial uncolored state.  This limit
+-       arises because the color pair information is a bitfield in  the  chtype
+-       data type (denoted by A_COLOR).
++       SVr3.2  (1987)  introduced color support with all of the symbols in the
++       synopsis above except those marked as extensions.   It  reserved  color
++       pair  0  as  the terminal's initial, "uncolored" state, and limited the
++       number of possible color pairs to 64, because the color pair datum  was
++       encoded in six bits of a chtype.
++
++       SVr4  made  only  internal changes, such as moving the storage of color
++       state from the SCREEN structure (pointed to  by  SP)  to  the  TERMINAL
++       structure (pointed to by cur_term).
+ 
+-       Other implementations of curses had different limits:
++       Other  curses  implementations impose different limits on the number of
++       colors and color pairs.
+ 
+-       o   PCCurses (1987-1990) provided for only eight (8) colors.
++       o   PCCurses (1987-1990) provided for  only  8  colors  (and  therefore
++           required at most 8x8 = 64 color pairs).
+ 
+        o   PDCurses  (1992-present)  inherited  the  8-color  limitation  from
+-           PCCurses, but changed this to 256 in version 2.5 (2001), along with
+-           changing chtype from 16-bits to 32-bits.
++           PCCurses, but changed this  to  256  in  version  2.5  (2001),  and
++           widened its chtype from 16 to 32 bits.
+ 
+-       o   X/Open Curses (1992-present) added a new structure cchar_t to store
+-           the character, attributes and color pair values, allowing increased
+-           range  of  color  pairs.   Both color pairs and color-values used a
+-           signed short, limiting values to 15 bits.
+-
+-       o   ncurses (1992-present)  uses  eight  bits  for  A_COLOR  in  chtype
+-           values.
+-
+-           Version  5.3  provided  a wide-character interface (2002), but left
+-           color pairs as part of the attributes-field.
+-
+-           Since version 6 (2015), ncurses uses a separate int for color pairs
+-           in the cchar_t values.  When those color pair values fit in 8 bits,
+-           ncurses allows color pairs to  be  manipulated  via  the  functions
+-           using chtype values.
+-
+-       o   NetBSD  curses  used  6  bits  from  2000  (when  colors were first
+-           supported) until 2004.  At that point, NetBSD  changed  to  use  10
+-           bits.   As  of  2021,  that size is unchanged.  Like ncurses before
+-           version 6, the NetBSD color  pair  information  is  stored  in  the
+-           attributes  field of cchar_t, limiting the number of color pairs by
+-           the size of the bitfield.
++       o   X/Open  Curses  (1992-present)  specified  a  new  structure  type,
++           cchar_t, to store the character code, attribute  flags,  and  color
++           pair  identifier,  allowing  an increased range of color pairs.  It
++           specifies a short as  storing  identifiers  for  colors  and  color
++           pairs,  limiting  portable  values  to 15 bits; negative values are
++           invalid in System V.
++
++       o   ncurses (1992-present), in its non-wide configuration, uses 8  bits
++           of chtype for the color pair identifier.
++
++           Version  5.3 (2002) offered a wide-character interface, but encoded
++           the color pair identifier with attributes in the character type.
++
++           Since version 6 (2015), ncurses uses a separate int for  the  color
++           pair  identifier  in  a cchar_t, introducing extension functions to
++           manage the wider type.  When a color pair value  fits  in  8  bits,
++           ncurses permits color pair data to be manipulated via the functions
++           taking chtype arguments, even  when  a  curses  window  uses  wide-
++           character cells.
++
++       o   NetBSD  curses  used 6 bits for the color pair identifier from 2000
++           (when it first added color support) until  2004.   At  that  point,
++           NetBSD  widened  the  color  pair  identifier to use 9 bits.  As of
++           2025, that size is unchanged.  Like ncurses before version  6,  the
++           NetBSD  color  pair  datum  is  stored  in  the attributes field of
++           cchar_t, limiting the number of color pairs.
+ 
+ 
+ 
                                                                                                                                                                                        SEE ALSO
                                                                                                                                                                                        +@@ -539,7 +555,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                    curs_color(3x)
++ncurses 6.5                       2025-01-18                    curs_color(3x)
+ 
                                                                                                                                                                                        
+ 
                                                                                                                                                                                        
+ 
                                                                                                                                                                                          
+Index: doc/html/man/curs_delch.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_delch.3x.html	2024-12-28 21:43:55.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_delch.3x.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_delch 3x 2024-12-28 ncurses 6.5 Library calls
++curs_delch 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                          curs_delch 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                          
++
                                                                                                                                                                                          curs_delch 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                          
+ 
                                                                                                                                                                                          + curs_delch(3x)                   Library calls                  curs_delch(3x)
+ 
+@@ -87,15 +87,15 @@
+ 
+ 
+ 
                                                                                                                                                                                          PORTABILITY
                                                                                                                                                                                          +-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+-       error conditions for them.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+-       SVr4  curses  describes  a  successful return value only as "an integer
+-       value other than ERR".
++       SVr4  describes  a  successful  return  value only as "an integer value
++       other than ERR".
+ 
+ 
+ 
                                                                                                                                                                                          HISTORY
                                                                                                                                                                                          +-       SVr2 (1984) introduced delch.
++       SVr2 (1984) introduced wdelch.
+ 
+ 
+ 
                                                                                                                                                                                          SEE ALSO
                                                                                                                                                                                          +@@ -103,7 +103,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                    curs_delch(3x)
++ncurses 6.5                       2025-01-18                    curs_delch(3x)
+ 
                                                                                                                                                                                          
+ 
                                                                                                                                                                                          
+ 
                                                                                                                                                                                            
+Index: doc/html/man/curs_deleteln.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_deleteln.3x.html	2024-12-28 21:43:55.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_deleteln.3x.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_deleteln 3x 2024-12-28 ncurses 6.5 Library calls
++curs_deleteln 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                            curs_deleteln 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                            
++
                                                                                                                                                                                            curs_deleteln 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                            
+ 
                                                                                                                                                                                            + curs_deleteln(3x)                Library calls               curs_deleteln(3x)
+ 
+@@ -97,11 +97,11 @@
+ 
+ 
+ 
                                                                                                                                                                                            PORTABILITY
                                                                                                                                                                                            +-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+-       error conditions for them.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+-       SVr4  curses  describes  a  successful return value only as "an integer
+-       value other than ERR".
++       SVr4  describes  a  successful  return  value only as "an integer value
++       other than ERR".
+ 
+ 
+ 
                                                                                                                                                                                            HISTORY
                                                                                                                                                                                            +@@ -115,7 +115,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                 curs_deleteln(3x)
++ncurses 6.5                       2025-01-18                 curs_deleteln(3x)
+ 
                                                                                                                                                                                            
+ 
                                                                                                                                                                                            
+ 
                                                                                                                                                                                              
+Index: doc/html/man/curs_extend.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_extend.3x.html	2024-09-14 20:23:26.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_extend.3x.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_extend 3x 2024-09-14 ncurses 6.5 Library calls
++curs_extend 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                              curs_extend 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                                                                              
++
                                                                                                                                                                                              curs_extend 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                              
+ 
                                                                                                                                                                                              + curs_extend(3x)                  Library calls                 curs_extend(3x)
+ 
+@@ -94,8 +94,8 @@
+ 
+ 
+ 
                                                                                                                                                                                              EXTENSIONS
                                                                                                                                                                                              +-       These functions are ncurses(3x) extensions, and are not found  in  SVr4
+-       curses, 4.4BSD curses, or any other previous curses implementation.
++       These functions are ncurses extensions,  and  are  not  found  in  SVr4
++       curses, 4.4BSD curses, or any other previous curses implementation.
+ 
+ 
+ 
                                                                                                                                                                                              PORTABILITY
                                                                                                                                                                                              +@@ -116,7 +116,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-14                   curs_extend(3x)
++ncurses 6.5                       2025-01-18                   curs_extend(3x)
+ 
                                                                                                                                                                                              
+ 
                                                                                                                                                                                              
+ 
                                                                                                                                                                                                
+Index: doc/html/man/curs_get_wch.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_get_wch.3x.html	2024-12-28 21:43:55.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_get_wch.3x.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_get_wch 3x 2024-12-28 ncurses 6.5 Library calls
++curs_get_wch 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                curs_get_wch 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                
++
                                                                                                                                                                                                curs_get_wch 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                
+ 
                                                                                                                                                                                                + curs_get_wch(3x)                 Library calls                curs_get_wch(3x)
+ 
+@@ -80,13 +80,13 @@
+ 
+        If  no input is pending, then if the no-delay flag is set in the window
+        (see nodelay(3x)), the function returns ERR;  otherwise,  curses  waits
+-       until  the  terminal  has  input.   If cbreak(3x) has been called, this
+-       happens after one character is read.  If nocbreak(3x) or noraw(3x)  has
+-       been  called,  it  occurs  when the next newline is read.  (Because the
+-       terminal's  canonical  or  "cooked"  mode  is  line-buffered,  multiple
+-       wget_wch  calls  may  then  be necessary to empty the input queue.)  If
+-       halfdelay(3x) has been called, curses waits until input is available or
+-       the specified delay elapses.
++       until  the  terminal  has  input.   If  cbreak(3x)  or raw(3x) has been
++       called, this happens after one character is read.  If  nocbreak(3x)  or
++       noraw(3x)  has  been  called,  it occurs when the next newline is read.
++       (Because the terminal's canonical or "cooked"  mode  is  line-buffered,
++       multiple  wget_wch  calls  may  then  be  necessary  to empty the input
++       queue.)  If halfdelay(3x) has been called, curses waits until input  is
++       available or the specified delay elapses.
+ 
+        If echo(3x) has been called, and the window is not a pad, curses writes
+        the wide character from the input queue to the window  (at  the  cursor
+@@ -105,27 +105,28 @@
+            wrefresh(3x), curses calls wrefresh on it.
+ 
+        If  the wide character is a carriage return and nl(3x) has been called,
+-       wgetch stores the the wide character code for line feed in wch instead.
++       wget_wch stores the the wide  character  code  for  line  feed  in  wch
++       instead.
+ 
+ 
+ 
                                                                                                                                                                                                Ungetting Characters
                                                                                                                                                                                                +-       unget_wch places wc into the input queue to be retrieved  by  the  next
+-       call  to  wget_wch.  A single input queue serves all windows associated
+-       with the terminal.
++       unget_wch  places  wc  into the input queue to be retrieved by the next
++       call to wget_wch.  A single input queue serves all  windows  associated
++       with the screen.
+ 
+ 
+ 
                                                                                                                                                                                                RETURN VALUE
                                                                                                                                                                                                +-       wget_wch returns OK when it reads a wide character,  KEY_CODE_YES  when
++       wget_wch  returns  OK when it reads a wide character, KEY_CODE_YES when
+        it reads a function key code, and ERR on failure.  wget_wch fails if
+ 
+        o   its timeout expires without any data arriving, or
+ 
+-       o   execution  was  interrupted by a signal, in which case errno is set
+-           to EINTR.
++       o   execution was interrupted by a signal, in which case errno  is  set
++           to EINTR.
+ 
+        Functions taking a WINDOW pointer argument fail if the pointer is NULL.
+ 
+-       Functions prefixed with "mv" first perform cursor movement and fail  if
++       Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+        unget_wch returns OK on success and ERR if there is no more room in the
+@@ -138,13 +139,13 @@
+        All of these functions except wget_wch and unget_wch may be implemented
+        as macros.
+ 
+-       Unlike  wgetch(3x),  wget_wch  and  its variants store the value of the
+-       input character in an additional wch parameter instead  of  the  return
++       Unlike wgetch(3x), wget_wch and its variants store  the  value  of  the
++       input  character  in  an additional wch parameter instead of the return
+        value.
+ 
+-       Unlike  ungetch,  unget_wch  cannot distinguish function key codes from
+-       conventional  character  codes.   An  application  can  overcome   this
+-       limitation  by pushing function key codes with ungetch and subsequently
++       Unlike ungetch, unget_wch cannot distinguish function  key  codes  from
++       conventional   character  codes.   An  application  can  overcome  this
++       limitation by pushing function key codes with ungetch and  subsequently
+        checking the return value of wget_wch for a match with KEY_CODE_YES.
+ 
+ 
+@@ -156,23 +157,35 @@
+        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+-       error conditions for them.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+-       See the "PORTABILITY" section of wgetch(3x) regarding  the  interaction
++       See  the  "PORTABILITY" section of wgetch(3x) regarding the interaction
+        of wget_wch with signal handlers.
+ 
+ 
++
                                                                                                                                                                                                HISTORY
                                                                                                                                                                                                ++       These functions were  initially  specified  by  X/Open  Curses  Issue 4
++       (1995).   The  System V Interface Definition Version 4 of the same year
++       specified  functions  named  wgetwch  (with  the  usual  variants)  and
++       ungetwch.   These  were later additions to SVr4.x, not appearing in the
++       first SVr4 (1989).   They  differ  from  X/Open's  later  wget_wch  and
++       unget_wch in that wgetwch takes no wch argument, but returns the (wide)
++       key code as an int (with no provision for  distinguishing  a  character
++       code  from  a  function  key  code); and ungetwch takes a non-const int
++       argument.
++
++
+ 
                                                                                                                                                                                                SEE ALSO
                                                                                                                                                                                                +        curs_getch(3x) describes comparable functions of the ncurses library in
+        its non-wide-character configuration.
+ 
+-       curses(3x),    curs_add_wch(3x),    curs_inopts(3x),     curs_move(3x),
++       curses(3x),     curs_add_wch(3x),    curs_inopts(3x),    curs_move(3x),
+        curs_refresh(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                  curs_get_wch(3x)
++ncurses 6.5                       2025-01-18                  curs_get_wch(3x)
+ 
                                                                                                                                                                                                
+ 
                                                                                                                                                                                                
+ 
+ 
                                                                                                                                                                                                
+Index: doc/html/man/curs_get_wstr.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_get_wstr.3x.html	2024-12-28 21:43:55.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_get_wstr.3x.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_get_wstr 3x 2024-12-28 ncurses 6.5 Library calls
++curs_get_wstr 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                curs_get_wstr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                
++
                                                                                                                                                                                                curs_get_wstr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                
+ 
                                                                                                                                                                                                + curs_get_wstr(3x)                Library calls               curs_get_wstr(3x)
+ 
+@@ -48,7 +48,7 @@
+ 
+ 
                                                                                                                                                                                                NAME
                                                                                                                                                                                                +        get_wstr,  getn_wstr,  wget_wstr,  wgetn_wstr, mvget_wstr, mvgetn_wstr,
+-       mvwget_wstr, mvwgetn_wstr - get a wide-character string from  a  curses
++       mvwget_wstr, mvwgetn_wstr - read a wide-character string from a  curses
+        terminal keyboard
+ 
+ 
+@@ -63,122 +63,155 @@
+        int getn_wstr(wint_t * wstr, int n);
+        int wgetn_wstr(WINDOW * win, wint_t * wstr, int n);
+        int mvgetn_wstr(int y, int x, wint_t * wstr, int n);
+-       int mvwgetn_wstr(WINDOW * win, int y, int x, wint_t * wstr, int n);
++       int mvwgetn_wstr(WINDOW * win, int y, int x, wint_t * wstr,
++             int n);
+ 
+ 
+ 
                                                                                                                                                                                                DESCRIPTION
                                                                                                                                                                                                +-       The  function  wgetn_wstr  is  equivalent  to  a  series  of  calls  to
+-       wget_wch(3x) until a newline or carriage return terminates the series:
++       wget_wstr  populates  a user-supplied wide-character string buffer wstr
++       by repeatedly calling wget_wch(3x) with the win argument until  a  line
++       feed or carriage return character is input.  The function
+ 
+-       o   The terminating character is not included in the returned string.
++       o   does not copy the terminating character to wstr;
+ 
+-       o   An end-of-file condition is represented  by  WEOF,  as  defined  in
+-           <wchar.h>.
++       o   populates  wstr with WEOF (as defined in wchar.h) if an end-of-file
++           condition occurs on the input;
+ 
+-       o   In  all  instances,  the  end of the string is terminated by a null
+-           wchar_t.
++       o   always terminates the string with a null wide character (after  any
++           WEOF);
+ 
+-       o   The function stores the result in the area pointed to by  the  wstr
+-           parameter.
++       o   interprets   the   screen's   erase   and   kill   characters  (see
++           erasechar(3x) and killchar(3x));
+ 
+-       o   The function reads at most n characters, thus preventing a possible
+-           overflow of the input buffer.
++       o   recognizes function keys only if  the  screen's  keypad  option  is
++           enabled (see keypad(3x));
+ 
+-           Any attempt to enter more characters (other  than  the  terminating
+-           newline or carriage return) causes a beep.
++       o   treats the function keys KEY_LEFT and KEY_BACKSPACE the same as the
++           erase character; and
+ 
+-           Function keys also cause a beep and are ignored.
++       o   discards function key inputs other than those treated as the  erase
++           character, calling beep(3x).
+ 
+-       The user's erase and kill characters are interpreted:
++       The  erase  character  replaces  the character at the end of the buffer
++       with a null wide character, while the kill character does the same  for
++       the entire buffer.
+ 
+-       o   The  erase  character (e.g., ^H) erases the character at the end of
+-           the buffer, moving the cursor to the left.
++       If  the  screen's  echo  option  is  enabled  (see echo(3x)), wget_wstr
++       updates win with wadd_wch(3x).  Further,
+ 
+-           If keypad mode is on for the window, KEY_LEFT and KEY_BACKSPACE are
+-           both considered equivalent to the user's erase character.
++       o   the erase character and its function key synonyms move  the  cursor
++           to the left, and
+ 
+-       o   The kill character (e.g., ^U) erases the entire buffer, leaving the
+-           cursor at the beginning of the buffer.
++       o   the  kill character returns the cursor to where it was located when
++           wget_wstr was called.
+ 
+-       Characters input are echoed only if echo  is  currently  on.   In  that
+-       case,  backspace  is  echoed  as  deletion  of  the  previous character
+-       (typically a left motion).
++       wgetn_wstr is similar, but reads at most n wide characters, aiding  the
++       application  to  avoid overrunning the buffer to which wstr points.  An
++       attempt  to  input  more  than  n  wide  characters  (other  than   the
++       terminating line feed or carriage return) is ignored with a beep.  If n
++       is negative, wgetn_wstr reads  up  to  LINE_MAX  wide  characters  (see
++       sysconf(3)).
+ 
+-       The getn_wstr, mvgetn_wstr, mvwgetn_wstr, and wgetn_wstr functions  are
+-       identical  to  the  get_wstr,  mvget_wstr,  mvwget_wstr,  and wget_wstr
+-       functions, respectively, except that the *n_* versions read at  most  n
+-       characters,  letting  the  application  prevent  overflow  of the input
+-       buffer.
++       ncurses(3x) describes the variants of these functions.
+ 
+ 
+ 
                                                                                                                                                                                                RETURN VALUE
                                                                                                                                                                                                +-       All  of  these  functions  return  the  integer  OK   upon   successful
+-       completion.  If unsuccessful, they return ERR.
++       These functions return OK on success and ERR on failure.
+ 
+-       X/Open defines no error conditions.
++       In ncurses, they return ERR if
+ 
+-       In this implementation, these functions return ERR
++       o   win is NULL, or
+ 
+-       o   if the window pointer is null,
+-
+-       o   if its timeout expires without having any data, or
+-
+-       o   if the associated call to wget_wch failed.
++       o   if an internal wget_wch(3x) call fails.
+ 
+        Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                                                                NOTES
                                                                                                                                                                                                +-       Any of these functions other than wgetn_wstr may be macros.
+-
+-       Using get_wstr, mvget_wstr, mvwget_wstr, or wget_wstr to  read  a  line
+-       that  overflows  the array pointed to by wstr causes undefined results.
+-       The  use  of  getn_wstr,  mvgetn_wstr,  mvwgetn_wstr,  or   wgetn_wstr,
+-       respectively, is recommended.
++       All of these functions except wgetn_wstr may be implemented as macros.
+ 
+-       These  functions  cannot  return KEY_ values because there is no way to
+-       distinguish a KEY_ value from a valid wchar_t value.
++       Reading input that overruns  the  buffer  pointed  to  by  wstr  causes
++       undefined   results.    Use   the  n-infixed  functions,  and  allocate
++       sufficient storage for wstr -- at least n+1 times sizeof(wchar_t).
++
++       These functions cannot store a KEY_ value in wstr because there  is  no
++       way to distinguish it from a valid wchar_t value.
++
++       While  these  functions  conceptually  implement  a  series of calls to
++       wget_wch, they also temporarily change properties of the curses  screen
++       to  permit simple editing of the input buffer.  Each function saves the
++       screen's state, calls nl(3x), and,  if  the  screen  was  in  canonical
++       ("cooked")  mode,  cbreak(3x).  Before returning, it restores the saved
++       screen state.  Other implementations differ in detail, affecting  which
++       control   characters  they  can  accept  in  the  buffer;  see  section
++       "PORTABILITY" below.
++
++       Unlike getstr(3x) and related  functions  of  ncurses's  non-wide  API,
++       these functions do not return KEY_RESIZE if a SIGWINCH event interrupts
++       the function.
++
++
++
                                                                                                                                                                                                EXTENSIONS
                                                                                                                                                                                                ++       getn_wstr,  wgetn_wstr,  mvgetn_wstr,  and  mvwgetn_wstr's  handing  of
++       negative n values is an ncurses extension.
+ 
+ 
+ 
                                                                                                                                                                                                PORTABILITY
                                                                                                                                                                                                +-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+-       error conditions for them.
++       Applications employing ncurses extensions should condition their use on
++       the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       This  implementation  returns  ERR if the window pointer is null, or if
+-       the lower-level wget_wch call returns an ERR.  In the latter  case,  an
+-       ERR  return  without other data is treated as an end-of-file condition,
+-       and the returned array contains a WEOF followed by a null wchar_t.
+-
+-       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.
+-
+-       X/Open  Curses,  Issue  7  (2009)  is  unclear  regarding  whether  the
+-       terminating null wchar_t value is counted in the  length  parameter  n.
+-       X/Open  Curses,  Issue  7  revised  the  corresponding  description  of
+-       wgetnstr  to  address  this  issue.   The  unrevised   description   of
+-       wget_nwstr  can  be interpreted either way.  This implementation counts
+-       the terminator in the length.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
++
++       Issue 4  documented these functions as passing an array of wchar_t, but
++       that was an error, conflicting  with  the  following  language  in  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.
++
++       get_wch  can  return a negative value (WEOF), but wchar_t is a unsigned
++       type.  All of the  vendors  implement  these  functions  using  wint_t,
++       following the Issue 7 standard.
++
++       X/Open  Curses  Issue 7  is  unclear  whether the terminating null wide
++       character counts  toward  the  length  paramter  n.   A  similar  issue
++       affected   wgetnstr   in   Issue 4,  Version 2;  Issue 7  revised  that
++       function's  description  to  address  the  issue,  but  not   that   of
++       wget_nwstr, leaving it ambiguous.  ncurses counts the terminator in the
++       length.
+ 
+        X/Open Curses does  not  specify  what  happens  if  the  length  n  is
+        negative.
+ 
+-       o   For  analogy  with  wgetnstr,  ncurses  6.2  uses a limit (based on
+-           LINE_MAX).
++       o   For  consistency  with  wgetnstr, ncurses 6.2 uses a limit based on
++           LINE_MAX.
+ 
+        o   Some other implementations (such as Solaris xcurses) do  the  same,
+-           while others (PDCurses) do not allow this.
++           while others (PDCurses) do not permit a negative n.
++
++       o   NetBSD 7  curses  imitates  ncurses  6.1  and  earlier,  treating a
++           negative n as an unbounded count of wide characters.
++
++       Implementations vary in their handling of input control characters.
+ 
+-       o   NetBSD  7 curses imitates ncurses 6.1 in this regard, treating a -1
+-           as an indefinite number of characters.
++       o   While they may enable the screen's echo option, some do not take it
++           out  of  raw  mode,  and  may  take  cbreak  mode into account when
++           deciding whether to handle echoing within wgetn_wstr or to rely  on
++           it as a side effect of calling wget_wch.
++
++           Since  1995,  ncurses has provided handlers for SIGINTR and SIGQUIT
++           events, which are typically generated at the keyboard with  ^C  and
++           ^\ respectively.  In cbreak mode, those handlers catch a signal and
++           stop  the  program,  whereas  other  implementations  write   those
++           characters into the buffer.
++
++       o   Starting  with ncurses 6.3 (2021), wgetn_wstr preserves raw mode if
++           the screen was already in that state, allowing  one  to  enter  the
++           characters  the  terminal  interprets  as interrupt and quit events
++           into the buffer, for consistency with SVr4 curses's wgetnstr.
+ 
+ 
+ 
                                                                                                                                                                                                SEE ALSO
                                                                                                                                                                                                +@@ -189,7 +222,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                 curs_get_wstr(3x)
++ncurses 6.5                       2025-01-18                 curs_get_wstr(3x)
+ 
                                                                                                                                                                                                
+ 
                                                                                                                                                                                                
+ 
+Index: doc/html/man/curs_getcchar.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_getcchar.3x.html	2024-04-27 18:38:46.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_getcchar.3x.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_getcchar 3x 2024-04-20 ncurses 6.5 Library calls
++curs_getcchar 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                curs_getcchar 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                                                                                                                
++
                                                                                                                                                                                                curs_getcchar 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                
+ 
                                                                                                                                                                                                + curs_getcchar(3x)                Library calls               curs_getcchar(3x)
+ 
+@@ -54,141 +54,152 @@
+ 
                                                                                                                                                                                                SYNOPSIS
                                                                                                                                                                                                +        #include <curses.h>
+ 
+-       int getcchar(
+-               const cchar_t *wch,
+-               wchar_t *wc,
+-               attr_t *attrs,
+-               short *color_pair,
+-               void *opts );
+-
+-       int setcchar(
+-               cchar_t *wch,
+-               const wchar_t *wc,
+-               const attr_t attrs,
+-               short color_pair,
+-               const void *opts );
++       int gettchar(const cchar_t * wch, wchar_t * wc,
++             attr_t * attrs, short * pair, void * opts);
++       int settchar(cchar_t * wch, const wchar_t * wc,
++             const attr_t attrs, short pair, const void * opts);
+ 
+ 
+ 
                                                                                                                                                                                                DESCRIPTION
                                                                                                                                                                                                ++       The curses complex character data type  cchar_t  is  a  structure  type
++       comprising  a  wide-character  string, a set of attributes, and a color
++       pair identifier.  The cchar_t structure is opaque; do  not  attempt  to
++       access  its  members  directly.   The  library  provides  functions  to
++       manipulate this type.
+ 
+-
                                                                                                                                                                                                getcchar
                                                                                                                                                                                                +-       The getcchar function gets a wide-character string and rendition from a
+-       cchar_t argument.  When wc is not a null pointer, the getcchar function
+-       does the following:
+-
+-       o   Extracts information from a cchar_t value wch
+ 
+-       o   Stores the character attributes in the location pointed to by attrs
++
                                                                                                                                                                                                getcchar
                                                                                                                                                                                                ++       getcchar destructures a cchar_t into its components.
+ 
+-       o   Stores the color pair in the location pointed to by color_pair
++       If wc is not a null pointer, getcchar:
+ 
+-       o   Stores the wide-character string,  characters  referenced  by  wch,
+-           into the array pointed to by wc.
++       o   stores the wide-character string in the  curses  complex  character
++           wch into wc;
+ 
+-       When wc is a null pointer, the getcchar function does the following:
++       o   stores the attributes in attrs; and
+ 
+-       o   Obtains the number of wide characters pointed to by wch
++       o   stores the color pair identifier in pair.
+ 
+-       o   Does not change the data referenced by attrs or color_pair
++       If wc is a null pointer, getcchar counts the wchar_t wide characters in
++       wch, returns that value, and leaves attrs and pair unchanged.
+ 
+ 
+ 
                                                                                                                                                                                                setcchar
                                                                                                                                                                                                +-       The  setcchar  function  initializes  the location pointed to by wch by
+-       using:
++       setcchar constructs a curses complex character wch from the  components
++       wc,  attrs, and pair.  The wide-character string wch must be terminated
++       with a null wide character L'\0' and must contain at most  one  spacing
++       character,  which,  if present, must be the first wide character in the
++       string.
++
++       Up  to  CCHARW_MAX - 1   non-spacing   characters   may   follow   (see
++       curs_variables(3x)).    ncurses   ignores  any  additional  non-spacing
++       characters.
+ 
+-       o   The character attributes in attrs
++       The string may contain a single control  character  instead.   In  that
++       case, no non-spacing characters are allowed.
+ 
+-       o   The color pair in color_pair
+ 
+-       o   The wide-character string pointed to by wc.   The  string  must  be
+-           L'\0' terminated, contain at most one spacing character, which must
+-           be the first.
++
                                                                                                                                                                                                RETURN VALUE
                                                                                                                                                                                                ++       If getcchar is passed a null pointer as its wc argument, it returns the
++       number of wide characters for a given wch that it would  store  in  wc,
++       counting  a  trailing null wide character.  If getcchar is not passed a
++       null pointer as its wc argument, it returns OK on success  and  ERR  on
++       failure.
+ 
+-           Up to CCHARW_MAX-1 non-spacing characters may  follow.   Additional
+-           non-spacing characters are ignored.
++       In  ncurses,  getcchar  returns  ERR  if either attrs or pair is a null
++       pointer and wc is not.
+ 
+-           The string may contain a single control character instead.  In that
+-           case, no non-spacing characters are allowed.
++       setcchar returns OK on success and ERR on failure.
+ 
++       In ncurses, setcchar returns ERR if
+ 
+-
                                                                                                                                                                                                RETURN VALUE
                                                                                                                                                                                                +-       When wc is  a  null  pointer,  getcchar  returns  the  number  of  wide
+-       characters referenced by wch, including one for a trailing null.
++       o   wch is a null pointer,
+ 
+-       When  wc  is  not  a  null pointer, getcchar returns OK upon successful
+-       completion, and ERR otherwise.
++       o   wc starts with a (wide) control character and  contains  any  other
++           wide characters, or
+ 
+-       Upon successful completion, setcchar returns OK.  Otherwise, it returns
+-       ERR.
++       o   pair has a negative value.
+ 
+ 
+ 
                                                                                                                                                                                                NOTES
                                                                                                                                                                                                +-       The wch argument may be a value generated by a call to setcchar or by a
+-       function that has a cchar_t output argument.  If wch is constructed  by
+-       any other means, the effect is unspecified.
++       wch may be a value stored by setcchar or another curses function with a
++       writable cchar_t argument.  If wch is constructed by any  other  means,
++       the library's behavior is unspecified.
+ 
+ 
+ 
                                                                                                                                                                                                EXTENSIONS
                                                                                                                                                                                                +        X/Open  Curses  documents the opts argument as reserved for future use,
+-       saying that it must be null.  This implementation uses  that  parameter
+-       in ABI 6 for the functions which have a color pair parameter to support
+-       extended color pairs:
+-
+-       o   For  functions  which modify the color, e.g., setcchar, if opts  is
+-           set it is treated as a pointer to int, and used to  set  the  color
+-           pair instead of the short pair parameter.
+-
+-       o   For functions which retrieve the color, e.g., getcchar, if opts  is
+-           set it is treated as a pointer to int, and  used  to  retrieve  the
+-           color pair as an int value,  in  addition  retrieving  it  via  the
+-           standard pointer to short parameter.
++       saying that it must be a null pointer.  The ncurses 6 ABI uses it  with
++       functions  that  have  a color pair parameter to support extended color
++       pairs.
++
++       o   In functions that assign colors, such as setcchar, if opts is not a
++           null pointer, ncurses treats it as a pointer to int, and interprets
++           it instead of the short pair parameter as a color pair identifier.
++
++       o   In functions that retrieve colors, such as getcchar, if opts is not
++           a  null  pointer, ncurses treats it as a pointer to int, and stores
++           the retrieved color pair identifier there as well as in  the  short
++           pair   parameter   (which   may   therefore   undergo  a  narrowing
++           conversion).
+ 
+ 
+ 
                                                                                                                                                                                                PORTABILITY
                                                                                                                                                                                                +-       The  CCHARW_MAX  symbol is specific to ncurses.  X/Open Curses does not
+-       provide details for the layout of the cchar_t structure.  It tells what
+-       data are stored in it:
++       Applications employing ncurses extensions should condition their use on
++       the visibility of the NCURSES_VERSION preprocessor macro.
++
++       These  functions  are described in X/Open Curses Issue 4.  It specifies
++       no error conditions for them.
++
++       X/Open Curses does not detail the  layout  of  the  cchar_t  structure,
++       describing only its minimal required contents:
+ 
+-       o   a spacing character (wchar_t, i.e., 32-bits).
++       o   a spacing wide character (wchar_t),
+ 
+-       o   non-spacing characters (again, wchar_t's).
++       o   at least five non-spacing wide characters (wchar_t; see below),
+ 
+-       o   attributes  (at  least  16 bits, inferred from the various ACS- and
+-           WACS-flags).
++       o   attributes  (at  least  15  bits' worth, inferred from the count of
++           specified WA_ constants),
+ 
+-       o   color pair (at least 16 bits,  inferred  from  the  unsigned  short
+-           type).
++       o   a color pair identifier (at least 16 bits, inferred from the  short
++           type used to encode it).
+ 
+-       The non-spacing characters are optional, in the sense that zero or more
+-       may be stored in a cchar_t.  XOpen/Curses specifies a limit:
++       Non-spacing characters are optional, in the sense that zero or more may
++       be stored in a cchar_t.  XOpen/Curses specifies a limit:
+ 
+            Implementations may limit the number of non-spacing characters that
+            can  be  associated with a spacing character, provided any limit is
+            at least 5.
+ 
+-       The Unix implementations at the time follow that limit:
++       Then-contemporary Unix implementations adhered to that limit.
+ 
+-       o   AIX 4 and OSF1 4 use the same declaration with an array of  5  non-
+-           spacing characters z and a single spacing character c.
++       o   AIX 4 and OSF/1 4 used the same declaration with a  single  spacing
++           wide character c and an array of 5 non-spacing wide characters z.
+ 
+-       o   HP-UX 10  uses  an  opaque  structure with 28 bytes, which is large
+-           enough for the 6 wchar_t values.
++       o   HP-UX 10  used  an opaque structure of 28 bytes, large enough for 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
+-       due to a misreading of the  AIX 4  header  files,  because  the  X/Open
+-       Curses  document  was  not generally available at that time.  Later (in
+-       2002), this detail was  overlooked  when  beginning  to  implement  the
+-       functions using the structure.
+-
+-       In  practice, even four non-spacing characters may seem enough.  X/Open
+-       Curses documents possible uses for  non-spacing  characters,  including
+-       using  them  for ligatures between characters (a feature apparently not
+-       supported by any curses implementation).  Unicode does  not  limit  the
+-       (analogous) number of combining characters, so some applications may be
+-       affected.
++       o   Solaris xcurses uses a single array of 6 wchar_t values.
++
++       ncurses defined its cchar_t in 1995 using 5 as the total of spacing and
++       non-spacing  characters  (CCHARW_MAX).   That  was  probably  due  to a
++       misreading of  the  AIX 4  header  files,  because  the  X/Open  Curses
++       document  was  not  generally available at that time.  Later (in 2002),
++       this detail was overlooked when work began to implement  the  functions
++       using the structure.
++
++       In  practice,  a  mere  four  non-spacing characters may seem adequate.
++       X/Open  Curses   documents   possible   applications   of   non-spacing
++       characters,  including their use as ligatures (a feature apparently not
++       supported by any curses implementation).  Unicode does  not  limit  the
++       (analogous)  number of combining characters in a grapheme cluster; some
++       applications may be affected.  ncurses can be compiled with a different
++       CCHARW_MAX value; doing so alters the library's ABI.
++
++
++
                                                                                                                                                                                                HISTORY
                                                                                                                                                                                                ++       These  functions  were  initially  specified  by  X/Open Curses Issue 4
++       (1995).
+ 
+ 
+ 
                                                                                                                                                                                                SEE ALSO
                                                                                                                                                                                                +@@ -196,7 +207,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                 curs_getcchar(3x)
++ncurses 6.5                       2025-01-18                 curs_getcchar(3x)
+ 
                                                                                                                                                                                                
+ 
                                                                                                                                                                                                
+ 
+ 
                                                                                                                                                                                                
+Index: doc/html/man/curs_getch.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_getch.3x.html	2024-12-28 21:43:55.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_getch.3x.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_getch 3x 2024-12-28 ncurses 6.5 Library calls
++curs_getch 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                curs_getch 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                
++
                                                                                                                                                                                                curs_getch 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                
+ 
                                                                                                                                                                                                + curs_getch(3x)                   Library calls                  curs_getch(3x)
+ 
+@@ -83,13 +83,13 @@
+ 
+        If no input is pending, then if the no-delay flag is set in the  window
+        (see  nodelay(3x)),  the  function returns ERR; otherwise, curses waits
+-       until the terminal has input.  If  cbreak(3x)  has  been  called,  this
+-       happens  after one character is read.  If nocbreak(3x) or noraw(3x) has
+-       been called, it occurs when the next newline  is  read.   (Because  the
+-       terminal's canonical or "cooked" mode is line-buffered, multiple wgetch
+-       calls  may  then  be  necessary  to  empty  the   input   queue.)    If
+-       halfdelay(3x) has been called, curses waits until input is available or
+-       the specified delay elapses.
++       until the terminal has  input.   If  cbreak(3x)  or  raw(3x)  has  been
++       called,  this  happens after one character is read.  If nocbreak(3x) or
++       noraw(3x) has been called, it occurs when the  next  newline  is  read.
++       (Because  the  terminal's  canonical or "cooked" mode is line-buffered,
++       multiple wgetch calls may then be necessary to empty the input  queue.)
++       If halfdelay(3x) has been called, curses waits until input is available
++       or the specified delay elapses.
+ 
+        If echo(3x) has been called, and the window is not a pad, curses writes
+        the returned character c to the window (at the cursor position) per the
+@@ -155,7 +155,7 @@
+ 
                                                                                                                                                                                                Ungetting Characters
                                                                                                                                                                                                +        ungetch places c into the input queue to be returned by the  next  call
+        to wgetch.  A single input queue serves all windows associated with the
+-       terminal.
++       screen.
+ 
+ 
+ 
                                                                                                                                                                                                Predefined Key Codes
                                                                                                                                                                                                +@@ -307,8 +307,8 @@
+ 
+        o   its timeout expires without any data arriving, or
+ 
+-       o   execution  was  interrupted by a signal, in which case errno is set
+-           to EINTR.
++       o   execution  was  interrupted by a signal, in which case errno is set
++           to EINTR.
+ 
+        ungetch returns OK on success and ERR on  failure.   ungetch  fails  if
+        there is no more room in the input queue.
+@@ -377,7 +377,7 @@
+        function key character sequence from a series of key strokes  beginning
+        with ESC typed by the user; see curs_variables(3x).
+ 
+-       has_key  was  designed  for  ncurses,  and is not found in SVr4 curses,
++       has_key  is  an  ncurses  extension,  and  is not found in SVr4 curses,
+        4.4BSD curses, or any other previous curses implementation.
+ 
+ 
+@@ -385,50 +385,53 @@
+        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       Except  as  noted in section "EXTENSIONS" above, X/Open Curses, Issue 4
++       Except  as  noted  in section "EXTENSIONS" above, X/Open Curses Issue 4
+        describes these functions.  It specifies no error conditions for them.
+ 
++       SVr4 describes a successful return value  only  as  "an  integer  value
++       other than ERR".
++
+        wgetch reads only single-byte characters.
+ 
+-       The echo behavior of these functions on  input  of  KEY_  or  backspace
++       The  echo  behavior  of  these  functions on input of KEY_ or backspace
+        characters is not documented in SVr4 curses.
+ 
+-       The  behavior  of  wgetch  in  the  presence  of signal handlers is not
+-       documented in SVr4 curses and is  unspecified  by  X/Open  Curses.   In
+-       historical  curses  implementations, it varied depending on whether the
+-       operating system's dispatch of a signal  to  a  handler  interrupted  a
++       The behavior of wgetch in  the  presence  of  signal  handlers  is  not
++       documented  in  SVr4  curses  and  is unspecified by X/Open Curses.  In
++       historical curses implementations, it varied depending on  whether  the
++       operating  system's  dispatch  of  a  signal to a handler interrupted a
+        read(2) call in progress, and also (in some implementations) whether an
+-       input timeout or non-blocking mode had been  set.   A  portable  curses
+-       application  prepares  for  two  cases:  (a)  signal  receipt  does not
++       input  timeout  or  non-blocking  mode had been set.  A portable curses
++       application prepares  for  two  cases:  (a)  signal  receipt  does  not
+        interrupt wgetch; or (b) signal receipt interrupts wgetch and causes it
+        to return ERR with errno set to EINTR.
+ 
+        KEY_MOUSE is mentioned in X/Open Curses, along with a few related term-
+-       info capabilities, but no higher-level functions use the feature.   The
++       info  capabilities, but no higher-level functions use the feature.  The
+        implementation in ncurses is an extension.
+ 
+-       KEY_RESIZE  and  has_key  are extensions first implemented for ncurses.
++       KEY_RESIZE and has_key are extensions first  implemented  for  ncurses.
+        By  2022,  PDCurses  and  NetBSD  curses  had  added  them  along  with
+        KEY_MOUSE.
+ 
+ 
+ 
                                                                                                                                                                                                SEE ALSO
                                                                                                                                                                                                +-       ECMA-6  "7-bit  coded  Character  Set" <https://ecma-international.org/
++       ECMA-6 "7-bit  coded  Character  Set"  <https://ecma-international.org/
+        publications-and-standards/standards/ecma-6/>
+ 
+-       ECMA-48  "Control  Functions  for  Coded  Character   Sets"   <https://
++       ECMA-48   "Control   Functions  for  Coded  Character  Sets"  <https://
+        ecma-international.org/publications-and-standards/standards/ecma-48/>
+ 
+-       curs_get_wch(3x)  describes comparable functions of the ncurses library
++       curs_get_wch(3x) describes comparable functions of the ncurses  library
+        in its wide-character configuration (ncursesw).
+ 
+-       curses(3x),    curs_addch(3x),     curs_inopts(3x),     curs_mouse(3x),
+-       curs_move(3x),  curs_outopts(3x), curs_refresh(3x), curs_variables(3x),
++       curses(3x),     curs_addch(3x),     curs_inopts(3x),    curs_mouse(3x),
++       curs_move(3x), curs_outopts(3x), curs_refresh(3x),  curs_variables(3x),
+        resizeterm(3x), ascii(7)
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                    curs_getch(3x)
++ncurses 6.5                       2025-01-18                    curs_getch(3x)
+ 
                                                                                                                                                                                                
+ 
                                                                                                                                                                                                
+ 
                                                                                                                                                                                                  
+Index: doc/html/man/curs_getstr.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_getstr.3x.html	2024-12-28 21:43:55.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_getstr.3x.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_getstr 3x 2024-12-28 ncurses 6.5 Library calls
++curs_getstr 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                  curs_getstr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                  
++
                                                                                                                                                                                                  curs_getstr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                  + curs_getstr(3x)                  Library calls                 curs_getstr(3x)
+ 
+@@ -48,7 +48,7 @@
+ 
+ 
                                                                                                                                                                                                  NAME
                                                                                                                                                                                                  +        getstr,  getnstr,  wgetstr,  wgetnstr,  mvgetstr, mvgetnstr, mvwgetstr,
+-       mvwgetnstr - accept character strings from curses terminal keyboard
++       mvwgetnstr - read a character string from curses terminal keyboard
+ 
+ 
+ 
                                                                                                                                                                                                  SYNOPSIS
                                                                                                                                                                                                  +@@ -62,7 +62,8 @@
+        int getnstr(char * str, int n);
+        int wgetnstr(WINDOW * win, char * str, int n);
+        int mvgetnstr(int y, int x, char * str, int n);
+-       int mvwgetnstr(WINDOW * win, int y, int x, char * str, int n);
++       int mvwgetnstr(WINDOW * win, int y, int x, char * str,
++             int n);
+ 
+ 
+ 
                                                                                                                                                                                                  DESCRIPTION
                                                                                                                                                                                                  +@@ -91,7 +92,7 @@
+        entire buffer.
+ 
+        If the screen's echo option is enabled (see echo(3x)), wgetstr  updates
+-       win with wechochar(3x).  Further,
++       win with waddch(3x).  Further,
+ 
+        o   the  erase  character and its function key synonyms move the cursor
+            to the left, and
+@@ -102,7 +103,8 @@
+        wgetnstr  is  similar,  but  reads  at  most  n  characters, aiding the
+        application to avoid overrunning the buffer to which  str  points.   An
+        attempt  to  input  more  than n characters (other than the terminating
+-       line feed or carriage return) is ignored with a beep.
++       line feed or carriage  return)  is  ignored  with  a  beep.   If  n  is
++       negative, wgetn_wstr reads up to LINE_MAX characters (see sysconf(3)).
+ 
+        ncurses(3x) describes the variants of these functions.
+ 
+@@ -114,33 +116,36 @@
+ 
+        o   win is NULL, or
+ 
+-       o   if an internal wgetch call fails.
++       o   if an internal wgetch(3x) call fails.
+ 
+-       Further, in ncurses, these functions return KEY_RESIZE  if  a  SIGWINCH
++       Further,  in  ncurses,  these functions return KEY_RESIZE if a SIGWINCH
+        event interrupts the function.
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
++       Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                                                                  NOTES
                                                                                                                                                                                                  +        All of these functions except wgetnstr may be implemented as macros.
+ 
+-       Use of getstr, mvgetstr, mvwgetstr,  or  wgetstr  to  read  input  that
+-       overruns  the  buffer  pointed to by str causes undefined results.  Use
+-       their n-infixed counterpart functions instead.
+-
+-       While wgetnstr is conceptually a series of calls  to  wgetch,  it  also
+-       temporarily  changes  properties  of the curses screen to permit simple
+-       editing of the input buffer.  It saves  the  screen's  state  and  then
+-       calls  nl(3x)  and,  if  the  screen  was in canonical ("cooked") mode,
+-       cbreak(3x).  Before returning, it  restores  the  saved  screen  state.
+-       Other   implementations  differ  in  detail,  affecting  which  control
+-       characters they can accept in the  buffer;  see  section  "PORTABILITY"
+-       below.
++       Reading  input  that  overruns  the  buffer  pointed  to  by str causes
++       undefined  results.   Use  the  n-infixed   functions,   and   allocate
++       sufficient storage for str -- at least n+1 times sizeof(char).
++
++       While  these  functions  conceptually  implement  a  series of calls to
++       wgetch, they also temporarily change properties of the curses screen to
++       permit  simple  editing  of  the input buffer.  Each function saves the
++       screen's state, calls nl(3x), and,  if  the  screen  was  in  canonical
++       ("cooked")  mode,  cbreak(3x).  Before returning, it restores the saved
++       screen state.  Other implementations differ in detail, affecting  which
++       control   characters  they  can  accept  in  the  buffer;  see  section
++       "PORTABILITY" below.
+ 
+ 
+ 
                                                                                                                                                                                                  EXTENSIONS
                                                                                                                                                                                                  ++       getnstr, wgetnstr, mvgetnstr, and mvwgetnstr's handing  of  negative  n
++       values is an ncurses extension.
++
+        The return value KEY_RESIZE is an ncurses extension.
+ 
+ 
+@@ -155,8 +160,8 @@
+        any complete characters".   In  ncurses,  however,  wgetch  reads  only
+        single-byte characters, so this scenario does not arise.
+ 
+-       SVr4  curses  describes  a  successful return value only as "an integer
+-       value other than ERR".
++       SVr4  describes  a  successful  return  value only as "an integer value
++       other than ERR".
+ 
+        SVr3 and early SVr4 curses  implementations  did  not  reject  function
+        keys; the SVr4 documentation asserted that, like the screen's erase and
+@@ -168,14 +173,16 @@
+        without  further  detail.   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 code's
+-       KEY_ constant value.  (The same language, unchanged except for styling,
+-       survived into X/Open Curses Issue 4, but disappeared from Issue 7.)
+-
+-       X/Open  Curses Issue 5 (2007) stated that these functions "read at most
+-       n bytes" but did not  state  whether  the  terminating  null  character
+-       counted  toward  that limit.  X/Open Curses Issue 7 (2009) changed that
+-       to say they "read at most n-1 bytes" to allow for the terminating  null
+-       character.  As of 2018, some implementations count it, some do not.
++       KEY_ constant value.  (The same language, unchanged except for styling,
++       survived  into  X/Open  Curses  Issue 4, Version 2 but disappeared from
++       Issue 7.)
++
++       A draft of X/Open Curses Issue 5 (which never saw final release) stated
++       that  these  functions "read at most n bytes" but did not state whether
++       the terminating null  character  counted  toward  that  limit.   X/Open
++       Curses  Issue 7  changed  that  to say they "read at most n-1 bytes" to
++       allow  for  the  terminating  null  character.   As   of   2018,   some
++       implementations count it, some do not.
+ 
+        o   ncurses 6.1 and PDCurses do not count the null character toward the
+            limit, while Solaris and NetBSD curses do.
+@@ -185,58 +192,59 @@
+            wide wgetnstr does not consistently count a null  character  toward
+            the limit.
+ 
+-       In SVr4 curses, a negative n tells wgetnstr to assume that the caller's
+-       buffer is large enough to hold the result; that is, the  function  then
+-       acts  like  wgetstr.   X/Open Curses does not mention this behavior (or
+-       anything  related  to  nonpositive  n  values),  however  most   curses
+-       libraries  implement  it.  Most implementations nevertheless enforce an
+-       upper limit on the count of bytes they write to the destination  buffer
+-       str.
++       X/Open  Curses  does  not  specify  what  happens  if  the  length n is
++       negative.
++
++       o   ncurses 6.2 uses LINE_MAX  or  a  larger  (system-dependent)  value
++           provided  by  sysconf(3).   If  neither  LINE_MAX  nor  sysconf  is
++           available, ncurses  uses  the  POSIX  minimum  value  for  LINE_MAX
++           (2048).   In  either  case,  it reserves a byte for the terminating
++           null character.
++
++       o   In SVr4 curses, a negative n tells  wgetnstr  to  assume  that  the
++           caller's  buffer  is  large enough to hold the result; that is, the
++           function then acts like wgetstr.  X/Open Curses  does  not  mention
++           this  behavior  (or  anything  related  to  nonpositive  n values),
++           however most curses libraries implement it.   Most  implementations
++           nevertheless  enforce  an  upper  limit  on the count of bytes they
++           write to the destination buffer str.
+ 
+-       o   BSD   curses   lacked  wgetnstr,  and  its  wgetstr  wrote  to  str
++       o   BSD  curses  lacked  wgetnstr,  and  its  wgetstr  wrote   to   str
+            unboundedly, as did that in SVr2.
+ 
+-       o   PDCurses, and SVr3.1, SVr4, and Solaris curses limit both functions
+-           to  writing  256  bytes.  Other System V-based platforms likely use
+-           the same limit.
++       o   PDCurses,  and  SVr3  and  later,  and  Solaris  curses  limit both
++           functions to writing 256  bytes.   Other  System V-based  platforms
++           likely use the same limit.
+ 
+-       o   Solaris xcurses limits the write to LINE_MAX bytes.
++       o   Solaris   xcurses   limits   the   write  to  LINE_MAX  bytes  (see
++           sysconf(3)).
+ 
+        o   NetBSD 7 curses imposes no particular limit on the  length  of  the
+            write,  but does validate n to ensure that it is greater than zero.
+            A comment in NetBSD's source  code  asserts  that  SUSv2  specifies
+            this.
+ 
+-       o   ncurses  prior  to 6.2 (2020) imposes no limit on the length of the
+-           write, and treats wgetnstr's n parameter as SVr4 curses does.
+-
+-       o   ncurses 6.2 uses LINE_MAX  or  a  larger  (system-dependent)  value
+-           provided  by  sysconf(3).   If  neither  LINE_MAX  nor  sysconf  is
+-           available, ncurses  uses  the  POSIX  minimum  value  for  LINE_MAX
+-           (2048).   In  either  case,  it reserves a byte for the terminating
+-           null character.
+-
+        Implementations vary in their handling of input control characters.
+ 
+        o   While they may enable the screen's echo option, some do not take it
+-           out  of  raw  mode,  and  may  take  cbreak  mode into account when
++           out of raw mode,  and  may  take  cbreak  mode  into  account  when
+            deciding whether to handle echoing within wgetnstr or to rely on it
+            as a side effect of calling wgetch.
+ 
+-       o   Originally,  ncurses, like its progenitor pcurses, had its wgetnstr
+-           call noraw and cbreak before accepting input.  That may  have  been
+-           done  to  make  function keys work; it is not necessary with modern
++       o   Originally, ncurses, like its progenitor pcurses, had its  wgetnstr
++           call  noraw  and cbreak before accepting input.  That may have been
++           done to make function keys work; it is not  necessary  with  modern
+            ncurses.
+ 
+-           Since 1995, ncurses has provided handlers for SIGINTR  and  SIGQUIT
+-           events,  which  are typically generated at the keyboard with ^C and
++           Since  1995,  ncurses has provided handlers for SIGINTR and SIGQUIT
++           events, which are typically generated at the keyboard with  ^C  and
+            ^\ respectively.  In cbreak mode, those handlers catch a signal and
+-           stop   the  program,  whereas  other  implementations  write  those
++           stop  the  program,  whereas  other  implementations  write   those
+            characters into the buffer.
+ 
+-       o   Starting with ncurses 6.3 (2021), wgetnstr preserves  raw  mode  if
+-           the  screen  was  already  in that state, allowing one to enter the
+-           characters the terminal interprets as  interrupt  and  quit  events
++       o   Starting  with  ncurses  6.3 (2021), wgetnstr preserves raw mode if
++           the screen was already in that state, allowing  one  to  enter  the
++           characters  the  terminal  interprets  as interrupt and quit events
+            into the buffer, for better compatibility with SVr4 curses.
+ 
+ 
+@@ -245,7 +253,7 @@
+ 
+        SVr3.1 (1987) added wgetnstr, but none of its variants.
+ 
+-       X/Open  Curses  Issue  4  (1995)  specified  getnstr,  mvwgetnstr,  and
++       X/Open  Curses  Issue 4  (1995)  specified  getnstr,  mvwgetnstr,   and
+        mvgetnstr.
+ 
+ 
+@@ -253,12 +261,12 @@
+        curs_get_wstr(3x) describes comparable functions of the ncurses library
+        in its wide-character configuration (ncursesw).
+ 
+-       curses(3x),     curs_addch(3x),     curs_getch(3x),    curs_inopts(3x),
++       curses(3x),    curs_addch(3x),     curs_getch(3x),     curs_inopts(3x),
+        curs_termattrs(3x),
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                   curs_getstr(3x)
++ncurses 6.5                       2025-01-18                   curs_getstr(3x)
+ 
                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                    
+Index: doc/html/man/curs_getyx.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_getyx.3x.html	2024-06-08 23:12:48.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_getyx.3x.html	2025-01-19 00:54:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_getyx 3x 2024-06-08 ncurses 6.5 Library calls
++curs_getyx 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                    curs_getyx 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                                                                                                    
++
                                                                                                                                                                                                    curs_getyx 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                    + curs_getyx(3x)                   Library calls                  curs_getyx(3x)
+ 
+@@ -85,11 +85,11 @@
+ 
+ 
+ 
                                                                                                                                                                                                    PORTABILITY
                                                                                                                                                                                                    +-       These macros are described in X/Open Curses, Issue 4.
++       These macros are described in X/Open Curses Issue 4.
+ 
+-       ncurses  also  provides  functions  getbegx, getbegy, getcurx, getcury,
+-       getmaxx, getmaxy, getparx, and getpary  for  compatibility  with  older
+-       versions of curses; see curs_legacy(3x).
++       ncurses  also  provides  functions  getbegy, getbegx, getcury, getcurx,
++       getmaxy, getmaxx, getpary, and getparx for compatibility with  System V
++       curses that were not standardized; see curs_legacy(3x).
+ 
+        Although X/Open Curses does not address the issue, many implementations
+        expose members of the WINDOW structure containing values  corresponding
+@@ -98,10 +98,17 @@
+        access to its members).
+ 
+        Besides the problem of opaque structures, the data stored in like-named
+-       members  may  not  have  values   of   the   same   meaning   different
+-       implementations.    For   example,   the  values  of  WINDOW._maxx  and
+-       WINDOW._maxy in ncurses have long  differed  by  one  from  some  other
+-       implementations.  The getmaxyx macro hides this difference.
++       members may not have  values  of  the  same  meaning  across  different
++       implementations.    For   example,   the  values  of  WINDOW._maxx  and
++       WINDOW._maxy in ncurses have long  differed  by  one  from  some  other
++       implementations.  The getmaxyx macro hides this difference.
++
++
++
                                                                                                                                                                                                    HISTORY
                                                                                                                                                                                                    ++       4BSD (1980) curses introduced getyx.
++
++       SVr3  (1987)  added  getbegyx  and  getmaxyx.   SVr3.1  later that year
++       supplied getparyx.
+ 
+ 
+ 
                                                                                                                                                                                                    SEE ALSO
                                                                                                                                                                                                    +@@ -109,7 +116,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                    curs_getyx(3x)
++ncurses 6.5                       2025-01-18                    curs_getyx(3x)
+ 
                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                    
+ 
+ 
                                                                                                                                                                                                    
+Index: doc/html/man/curs_in_wch.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_in_wch.3x.html	2024-12-28 21:43:55.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_in_wch.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_in_wch 3x 2024-12-28 ncurses 6.5 Library calls
++curs_in_wch 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                    curs_in_wch 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                    
++
                                                                                                                                                                                                    curs_in_wch 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                    + curs_in_wch(3x)                  Library calls                 curs_in_wch(3x)
+ 
+@@ -85,15 +85,15 @@
+ 
+ 
+ 
                                                                                                                                                                                                    PORTABILITY
                                                                                                                                                                                                    +-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+-       error conditions for them.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+ 
+ 
                                                                                                                                                                                                    HISTORY
                                                                                                                                                                                                    +-       These  functions  were  initially  specified by X/Open Curses, Issue 4.
+-       The System V  Interface  Definition,  Version  4  (1995),  specified  a
+-       function  named  winwch  (and  the  usual  variants).  This was a later
+-       addition to SVr4.x,  not  appearing  in  the  first  SVr4  (1989).   It
++       These  functions  were  initially  specified  by  X/Open Curses Issue 4
++       (1995).  The System V Interface Definition Version 4 of the  same  year
++       specified a function named winwch (and the usual variants).  This was a
++       later addition to SVr4.x, not appearing in the first SVr4  (1989).   It
+        differed  from  X/Open's  later  win_wch in that it returned a value of
+        type chtype instead of cchar_t.
+ 
+@@ -106,7 +106,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                   curs_in_wch(3x)
++ncurses 6.5                       2025-01-18                   curs_in_wch(3x)
+ 
                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                      
+Index: doc/html/man/curs_in_wchstr.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_in_wchstr.3x.html	2024-05-25 22:33:42.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_in_wchstr.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_in_wchstr 3x 2024-05-25 ncurses 6.5 Library calls
++curs_in_wchstr 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                      curs_in_wchstr 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                                                                                                      
++
                                                                                                                                                                                                      curs_in_wchstr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                      + curs_in_wchstr(3x)               Library calls              curs_in_wchstr(3x)
+ 
+@@ -76,7 +76,7 @@
+        cchar_t.   Transfer  stops  at  the  end of the current line, or when n
+        characters have been stored at the location referenced by wchstr.
+ 
+-       Constants defined in <curses.h> can be used with the  &  (logical  AND)
++       Constants defined in <curses.h> can be used with the & (logical  "and")
+        operator  to  extract  the  character  or  the attribute alone from any
+        position in the wchstr [see getcchar(3x)].
+ 
+@@ -85,29 +85,37 @@
+        Upon successful completion, these functions return OK.  Otherwise, they
+        return ERR.
+ 
+-       X/Open Curses defines no error conditions.  This implementation returns
+-       ERR
++       ncurses returns ERR
+ 
+        o   if the win parameter is null or
+ 
+        o   if the wchstr parameter is null.
+ 
+-       Functions prefixed with "mv" first perform cursor movement and fail  if
++       Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                                                                      NOTES
                                                                                                                                                                                                      +-       All routines except win_wchnstr may be macros.
++       All of these functions except win_wchnstr may be implemented as macros.
+ 
+-       Reading  a  line  that  overflows  the  array pointed to by wchstr with
+-       in_wchstr, mvin_wchstr, mvwin_wchstr  or  win_wchstr  causes  undefined
+-       results.     Therefore,    the   use   of   in_wchnstr,   mvin_wchnstr,
++       Reading a line that overflows the  array  pointed  to  by  wchstr  with
++       in_wchstr,  mvin_wchstr,  mvwin_wchstr  or  win_wchstr causes undefined
++       results.    Therefore,   the   use   of    in_wchnstr,    mvin_wchnstr,
+        mvwin_wchnstr, or win_wchnstr is recommended.
+ 
+ 
+ 
                                                                                                                                                                                                      PORTABILITY
                                                                                                                                                                                                      +-       X/Open Curses defines no error conditions.  This implementation  checks
+-       for null pointers, returning ERR in that case.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
++
++
++
                                                                                                                                                                                                      HISTORY
                                                                                                                                                                                                      ++       These functions were  initially  specified  by  X/Open  Curses  Issue 4
++       (1995).   The  System V Interface Definition Version 4 of the same year
++       specified a function named winwchstr (and the  usual  variants).   This
++       was a later addition to SVr4.x, not appearing in the first SVr4 (1989).
++       It differed from X/Open's later win_wchstr in that it took an  argument
++       of type pointer-to-chtype instead of pointer-tocchar_t.
+ 
+ 
+ 
                                                                                                                                                                                                      SEE ALSO
                                                                                                                                                                                                      +@@ -118,7 +126,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                curs_in_wchstr(3x)
++ncurses 6.5                       2025-01-18                curs_in_wchstr(3x)
+ 
                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                      
+ 
+ 
                                                                                                                                                                                                      
+Index: doc/html/man/curs_inch.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_inch.3x.html	2024-12-28 21:43:56.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_inch.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_inch 3x 2024-12-28 ncurses 6.5 Library calls
++curs_inch 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                      curs_inch 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                      
++
                                                                                                                                                                                                      curs_inch 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                      + curs_inch(3x)                    Library calls                   curs_inch(3x)
+ 
+@@ -87,8 +87,8 @@
+ 
+ 
+ 
                                                                                                                                                                                                      PORTABILITY
                                                                                                                                                                                                      +-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+-       error conditions for them.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+ 
+ 
                                                                                                                                                                                                      HISTORY
                                                                                                                                                                                                      +@@ -118,7 +118,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                     curs_inch(3x)
++ncurses 6.5                       2025-01-18                     curs_inch(3x)
+ 
                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                        
+Index: doc/html/man/curs_inchstr.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_inchstr.3x.html	2024-12-28 21:43:56.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_inchstr.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_inchstr 3x 2024-12-28 ncurses 6.5 Library calls
++curs_inchstr 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                        curs_inchstr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                        
++
                                                                                                                                                                                                        curs_inchstr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                        + curs_inchstr(3x)                 Library calls                curs_inchstr(3x)
+ 
+@@ -75,7 +75,7 @@
+        (chtype)0).  Transfer stops at the end of the current line, or  when  n
+        characters have been stored at the location referenced by chstr.
+ 
+-       Constants  defined  in  <curses.h> can be used with the & (logical AND)
++       Constants  defined in <curses.h> can be used with the & (logical "and")
+        operator to extract the character  or  the  attribute  alone  from  any
+        position in the chstr [see curs_inch(3x)].
+ 
+@@ -97,11 +97,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                        NOTES
                                                                                                                                                                                                        +-       All routines except winchnstr 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 document the meaning of the return value.
++       All of these functions except winchnstr may be implemented as macros.
+ 
+        Reading  a  line  that  overflows  the  array  pointed to by chstr with
+        inchstr, mvinchstr, mvwinchstr or winchstr  causes  undefined  results.
+@@ -110,9 +106,18 @@
+ 
+ 
+ 
                                                                                                                                                                                                        PORTABILITY
                                                                                                                                                                                                        +-       These functions are described in X/Open Curses, Issue 4.  It is no more
+-       specific  than  the  SVr4  documentation  on  the  trailing 0.  It does
+-       specify that the successful return of the functions is OK.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions  for  them.   It  characterizes  the strings stored by these
++       functions as containing "at most n elements" from a  window,  but  does
++       not  specify  whether  the  string  stored  by these functions is null-
++       terminated.
++
++       SVr4 does not document whether it null-terminates the string it  stores
++       in chstr, and does not document whether a trailing null chracter counts
++       toward the length limit n.
++
++       SVr4 describes a successful return value  only  as  "an  integer  value
++       other than ERR".
+ 
+ 
+ 
                                                                                                                                                                                                        SEE ALSO
                                                                                                                                                                                                        +@@ -120,7 +125,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                  curs_inchstr(3x)
++ncurses 6.5                       2025-01-18                  curs_inchstr(3x)
+ 
                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                          
+Index: doc/html/man/curs_initscr.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_initscr.3x.html	2024-12-28 21:43:56.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_initscr.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_initscr 3x 2024-12-28 ncurses 6.5 Library calls
++curs_initscr 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                          curs_initscr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                          
++
                                                                                                                                                                                                          curs_initscr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                          + curs_initscr(3x)                 Library calls                curs_initscr(3x)
+ 
+@@ -191,8 +191,8 @@
+ 
+ 
+ 
                                                                                                                                                                                                          PORTABILITY
                                                                                                                                                                                                          +-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+-       error conditions for them.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+ 
+ 
                                                                                                                                                                                                          Differences
                                                                                                                                                                                                          +@@ -247,7 +247,7 @@
+            modes,  e.g.,  def_shell_mode(3x),  def_prog_mode(3x).  SVr4 curses
+            uses the descriptor in SCREEN.
+ 
+-   Unset TERM Variable
++   Unset TERM Variable
+        If the TERM variable is  missing  or  empty,  initscr  uses  the  value
+        "unknown",  which  normally  corresponds  to  a terminal entry with the
+        generic (gn) capability.  Generic entries are detected by setupterm(3x)
+@@ -319,7 +319,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                  curs_initscr(3x)
++ncurses 6.5                       2025-01-18                  curs_initscr(3x)
+ 
                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                            
+Index: doc/html/man/curs_inopts.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_inopts.3x.html	2024-12-28 21:43:56.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_inopts.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_inopts 3x 2024-12-28 ncurses 6.5 Library calls
++curs_inopts 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                            curs_inopts 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                            
++
                                                                                                                                                                                                            curs_inopts 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                            + curs_inopts(3x)                  Library calls                 curs_inopts(3x)
+ 
+@@ -137,10 +137,10 @@
+ 
                                                                                                                                                                                                            halfdelay
                                                                                                                                                                                                            +        halfdelay  configures  half-delay mode, which is similar to cbreak mode
+        in that characters typed by the user are immediately available  to  the
+-       program.   However,  after  blocking  for  tenths tenths of seconds, an
+-       input character reading function returns ERR if no  input  is  pending.
+-       The  value  of tenths must be between 1 and 255.  Use nocbreak to leave
+-       half-delay mode.
++       program.   However,  after  blocking for tenths tenth-seconds, an input
++       character reading function returns ERR if no  input  is  pending.   The
++       value of tenths must be between 1 and 255.  Use nocbreak to leave half-
++       delay mode.
+ 
+ 
+ 
                                                                                                                                                                                                            intrflush
                                                                                                                                                                                                            +@@ -211,8 +211,8 @@
+        such flushing, but might frustrate impatient users on slow  connections
+        if  a curses update of the screen is in progress when the event occurs;
+        see typeahead below for a mitigation of this problem.  You may want  to
+-       call noqiflush in a signal handler if you want output to continue after
+-       the handler exits as though the interrupt had not occurred.
++       call  noqiflush  in  a  signal handler if, after the handler exits, you
++       want output to continue as though the interrupt had not occurred.
+ 
+ 
+ 
                                                                                                                                                                                                            raw, noraw
                                                                                                                                                                                                            +@@ -256,14 +256,15 @@
+ 
+        In ncurses, the functions in the previous paragraph return ERR if
+ 
+-       o   the terminal is not initialized or
++       o   the library's TERMINAL  structure  for  the  device  has  not  been
++           initialized with initscr(3x), newterm(3x), or setupterm(3x), or
+ 
+-       o   win is NULL (except  for  intrflush  and  meta,  which  ignore  its
+-           value).
++       o   win is a null pointer (except with intrflush and meta, which ignore
++           its value).
+ 
+        Further, halfdelay returns ERR if delay is outside the range 1..255.
+ 
+-       See  section  "EXTENSIONS"  below  for  the return values of is_cbreak,
++       See section "EXTENSIONS" below for  the  return  values  of  is_cbreak,
+        is_echo, is_nl, and is_raw.
+ 
+ 
+@@ -271,15 +272,15 @@
+        echo, noecho, halfdelay, intrflush, meta, nl, nonl, nodelay, notimeout,
+        noqiflush, qiflush, timeout, and wtimeout may be implemented as macros.
+ 
+-       noraw  and  nocbreak follow historical practice in that they attempt to
+-       restore the terminal's canonical ("cooked") line  discipline  from  raw
+-       and  cbreak, respectively.  Mixing raw/noraw calls with cbreak/nocbreak
+-       calls leads to terminal driver control states that are hard to  predict
++       noraw and nocbreak follow historical practice in that they  attempt  to
++       restore  the  terminal's  canonical ("cooked") line discipline from raw
++       and cbreak, respectively.  Mixing raw/noraw calls with  cbreak/nocbreak
++       calls  leads to terminal driver control states that are hard to predict
+        or understand; doing so is not recommended.
+ 
+ 
+ 
                                                                                                                                                                                                            EXTENSIONS
                                                                                                                                                                                                            +-       ncurses  provides  four  "is_" functions corresponding to cbreak, echo,
++       ncurses provides four "is_" functions corresponding  to  cbreak,  echo,
+        nl, and raw, permitting their states to be queried by the application.
+ 
+                             Query       Set      Reset
+@@ -293,20 +294,21 @@
+ 
+        1    if the option is set,
+ 
+-       0    if the option is reset, or
++       0    if the option is unset, or
+ 
+-       -1   if the library is not initialized.
++       -1   if  the  library's  TERMINAL structure for the device has not been
++            initialized.
+ 
+ 
+ 
                                                                                                                                                                                                            PORTABILITY
                                                                                                                                                                                                            +        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       Except  as  noted in section "EXTENSIONS" above, X/Open Curses, Issue 4
++       Except  as  noted  in section "EXTENSIONS" above, X/Open Curses Issue 4
+        describes these functions.  It specifies no error conditions for them.
+ 
+-       SVr4 curses describes a successful return value  only  as  "an  integer
+-       value other than ERR".
++       SVr4 describes a successful return value  only  as  "an  integer  value
++       other than ERR".
+ 
+        ncurses  follows  X/Open Curses and the historical practice of System V
+        curses, clearing the terminal driver's "echo"  flag  when  initializing
+@@ -382,7 +384,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                   curs_inopts(3x)
++ncurses 6.5                       2025-01-18                   curs_inopts(3x)
+ 
                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                              
+Index: doc/html/man/curs_ins_wch.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_ins_wch.3x.html	2024-12-28 21:43:56.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_ins_wch.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_ins_wch 3x 2024-12-28 ncurses 6.5 Library calls
++curs_ins_wch 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                              curs_ins_wch 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                              
++
                                                                                                                                                                                                              curs_ins_wch 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                              + curs_ins_wch(3x)                 Library calls                curs_ins_wch(3x)
+ 
+@@ -85,17 +85,15 @@
+ 
+ 
+ 
                                                                                                                                                                                                              PORTABILITY
                                                                                                                                                                                                              +-       X/Open Curses, Issue 4 describes these functions.
+-
+-       SVr4 describes successful return values only as "an integer value other
+-       than ERR".
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+ 
+ 
                                                                                                                                                                                                              HISTORY
                                                                                                                                                                                                              +-       These  functions  were  initially  specified by X/Open Curses, Issue 4.
+-       The System V  Interface  Definition,  Version  4  (1995),  specified  a
+-       function  named  winswch  (and  the  usual variants).  This was a later
+-       addition to SVr4.x,  not  appearing  in  the  first  SVr4  (1989).   It
++       These  functions  were  initially  specified  by  X/Open Curses Issue 4
++       (1995).  The System V Interface Definition Version 4 of the  same  year
++       specified  a function named winswch (and the usual variants).  This was
++       a later addition to SVr4.x, not appearing in the first SVr4 (1989).  It
+        differed  from  X/Open's  later wins_wch in that it took an argument of
+        type chtype instead of cchar_t.
+ 
+@@ -108,7 +106,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                  curs_ins_wch(3x)
++ncurses 6.5                       2025-01-18                  curs_ins_wch(3x)
+ 
                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                
+Index: doc/html/man/curs_ins_wstr.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_ins_wstr.3x.html	2024-12-28 21:43:56.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_ins_wstr.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_ins_wstr 3x 2024-12-28 ncurses 6.5 Library calls
++curs_ins_wstr 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                curs_ins_wstr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                
++
                                                                                                                                                                                                                curs_ins_wstr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                + curs_ins_wstr(3x)                Library calls               curs_ins_wstr(3x)
+ 
+@@ -58,12 +58,14 @@
+        int ins_wstr(const wchar_t * wstr);
+        int wins_wstr(WINDOW * win, const wchar_t * wstr);
+        int mvins_wstr(int y, int x, const wchar_t * wstr);
+-       int mvwins_wstr(WINDOW * win, int y, int x, const wchar_t * wstr);
++       int mvwins_wstr(WINDOW * win, int y, int x,
++             const wchar_t * wstr);
+ 
+        int ins_nwstr(const wchar_t * wstr, int n);
+        int wins_nwstr(WINDOW * win, const wchar_t * wstr, int n);
+        int mvins_nwstr(int y, int x, const wchar_t * wstr, int n);
+-       int mvwins_nwstr(WINDOW * win, int y, int x, const wchar_t * wstr, int n);
++       int mvwins_nwstr(WINDOW * win, int y, int x,
++             const wchar_t * wstr, int n);
+ 
+ 
+ 
                                                                                                                                                                                                                DESCRIPTION
                                                                                                                                                                                                                +@@ -75,8 +77,8 @@
+        next line to write the next wchar_t in wstr.  The cursor position  does
+        not change (after moving to (y, x), if specified).  wins_nwstr does the
+        same, but inserts at most n characters, or as many as possible  (up  to
+-       the end of the line) if n is -1.  ncurses(3x) describes the variants of
+-       these functions.
++       the  end  of  the  line)  if  n is negative.  ncurses(3x) describes the
++       variants of these functions.
+ 
+ 
+ 
                                                                                                                                                                                                                RETURN VALUE
                                                                                                                                                                                                                +@@ -100,25 +102,33 @@
+        All of these functions except wins_nwstr may be implemented as macros.
+ 
+ 
++
                                                                                                                                                                                                                EXTENSIONS
                                                                                                                                                                                                                ++       ins_nwstr,  wins_nwstr,  mvins_nwstr,  and mvwins_nwstr's acceptance of
++       negative n values is an ncurses extension.
++
++
+ 
                                                                                                                                                                                                                PORTABILITY
                                                                                                                                                                                                                +-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+-       error conditions for them.
++       Applications employing ncurses extensions should condition their use on
++       the visibility of the NCURSES_VERSION preprocessor macro.
++
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+        X/Open Curses does not specify what happens if a non-spacing  character
+        follows a control character.
+ 
+-       Issue  4 states that the entire string is inserted if n is less than 1.
++       Issue 4  states that the entire string is inserted if n is less than 1.
+        This is probably an  error,  because  it  is  inconsistent  with  other
+-       functions  such  as  waddwstr(3x), and differs from the SVr4 curses and
+-       Solaris xcurses implementations.  Nevertheless,  Issue  7  retains  the
++       functions  such  as  waddwstr,  and  differs  from  the SVr4 curses and
++       Solaris xcurses implementations.   Nevertheless,  Issue 7  retains  the
+        language.
+ 
+ 
+ 
                                                                                                                                                                                                                HISTORY
                                                                                                                                                                                                                +-       These  functions  were  initially  specified by X/Open Curses, Issue 4.
+-       The  System V  Interface  Definition,  Version  4   (1995),   specified
+-       functions named winswstr and winsnwstr (and the usual variants).  These
+-       were later additions to SVr4.x, not appearing in the first SVr4 (1989).
++       These functions were initially specified by X/Open Curses Issue 4.  The
++       System V Interface Definition  Version 4  (1995),  specified  functions
++       named  winswstr  and  winsnwstr  (and  the usual variants).  These were
++       later additions to SVr4.x, not appearing  in  the  first  SVr4  (1989).
+        They  differ from X/Open's later wins_wstr and wins_nwstr in that their
+        wstr parameters are not const-qualified.
+ 
+@@ -131,7 +141,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                 curs_ins_wstr(3x)
++ncurses 6.5                       2025-01-18                 curs_ins_wstr(3x)
+ 
                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                  
+@@ -140,6 +150,7 @@
+ 
                                                                                                                                                                                                                • DESCRIPTION
                                                                                                                                                                                                                  • 
+ 
                                                                                                                                                                                                                • RETURN VALUE
                                                                                                                                                                                                                  • 
+ 
                                                                                                                                                                                                                • NOTES
                                                                                                                                                                                                                  • 
++
                                                                                                                                                                                                                • EXTENSIONS
                                                                                                                                                                                                                  • 
+ 
                                                                                                                                                                                                                • PORTABILITY
                                                                                                                                                                                                                  • 
+ 
                                                                                                                                                                                                                • HISTORY
                                                                                                                                                                                                                  • 
+ 
                                                                                                                                                                                                                • SEE ALSO
                                                                                                                                                                                                                  • 
+Index: doc/html/man/curs_insch.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_insch.3x.html	2024-12-28 21:43:56.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_insch.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_insch 3x 2024-12-28 ncurses 6.5 Library calls
++curs_insch 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                  curs_insch 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                  
++
                                                                                                                                                                                                                  curs_insch 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                  + curs_insch(3x)                   Library calls                  curs_insch(3x)
+ 
+@@ -84,10 +84,10 @@
+ 
+ 
+ 
                                                                                                                                                                                                                  PORTABILITY
                                                                                                                                                                                                                  +-       X/Open Curses, Issue 4 describes these functions.
++       X/Open Curses Issue 4 describes these functions.
+ 
+-       SVr4  curses  describes  a  successful return value only as "an integer
+-       value other than ERR".
++       SVr4  describes  a  successful  return  value only as "an integer value
++       other than ERR".
+ 
+ 
+ 
                                                                                                                                                                                                                  HISTORY
                                                                                                                                                                                                                  +@@ -102,7 +102,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                    curs_insch(3x)
++ncurses 6.5                       2025-01-18                    curs_insch(3x)
+ 
                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                    
+Index: doc/html/man/curs_insstr.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_insstr.3x.html	2024-12-28 21:43:56.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_insstr.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_insstr 3x 2024-12-28 ncurses 6.5 Library calls
++curs_insstr 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                    curs_insstr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                    
++
                                                                                                                                                                                                                    curs_insstr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                    + curs_insstr(3x)                  Library calls                 curs_insstr(3x)
+ 
+@@ -62,7 +62,8 @@
+        int insnstr(const char * str, int n);
+        int winsnstr(WINDOW * win, const char * str, int n);
+        int mvinsnstr(int y, int x, const char * str, int n);
+-       int mvwinsnstr(WINDOW * win, int y, int x, const char * str, int n);
++       int mvwinsnstr(WINDOW * win, int y, int x, const char * str,
++             int n);
+ 
+ 
+ 
                                                                                                                                                                                                                    DESCRIPTION
                                                                                                                                                                                                                    +@@ -74,7 +75,8 @@
+        write the next char in str.  The cursor position does not change (after
+        moving to (y, x), if specified).  insnstr does the same, but inserts at
+        most  n  characters, or as many as possible (up to the end of the line)
+-       if n is -1.  ncurses(3x) describes the variants of these functions.
++       if  n  is  negative.   ncurses(3x)  describes  the  variants  of  these
++       functions.
+ 
+ 
+ 
                                                                                                                                                                                                                    RETURN VALUE
                                                                                                                                                                                                                    +@@ -88,7 +90,7 @@
+ 
+        o   an internal winsch(3x) call returns ERR.
+ 
+-       Functions prefixed with "mv" first perform cursor movement and fail  if
++       Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+@@ -96,11 +98,22 @@
+        All of these functions except winsnstr may be implemented as macros.
+ 
+ 
++
                                                                                                                                                                                                                    EXTENSIONS
                                                                                                                                                                                                                    ++       insnstr, winsnstr, mvinsnstr, and mvwinsnstr's acceptance of negative n
++       values is an ncurses extension.
++
++
+ 
                                                                                                                                                                                                                    PORTABILITY
                                                                                                                                                                                                                    +-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+-       error conditions for them.
++       Applications employing ncurses extensions should condition their use on
++       the visibility of the NCURSES_VERSION preprocessor macro.
++
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
++
++       SVr4  describes  a  successful  return  value only as "an integer value
++       other than ERR".
+ 
+-       Issue 4 distinguished insnstr and winsnstr  from  the  other  functions
++       Issue 4 distinguished insnstr and winsnstr  from  the  other  functions
+        documented  above  by stating they "do not perform wrapping".  This was
+        probably an error, since it makes this group of functions inconsistent.
+        No  implementation  of curses documents this inconsistency, and Issue 7
+@@ -108,9 +121,8 @@
+ 
+        Issue 4 states that the entire string is inserted if n is less than  1.
+        This  is  probably  an  error,  because  it  is inconsistent with other
+-       functions such as waddstr(3x), and differs from  the  SVr4  curses  and
+-       Solaris  xcurses  implementations.   Nevertheless,  Issue 7 retains the
+-       language.
++       functions such as waddstr, and differs from the SVr4 curses and Solaris
++       xcurses implementations.  Nevertheless, Issue 7 retains the language.
+ 
+ 
+ 
                                                                                                                                                                                                                    HISTORY
                                                                                                                                                                                                                    +@@ -125,7 +137,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                   curs_insstr(3x)
++ncurses 6.5                       2025-01-18                   curs_insstr(3x)
+ 
                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                      
+@@ -134,6 +146,7 @@
+ 
                                                                                                                                                                                                                    • DESCRIPTION
                                                                                                                                                                                                                      • 
+ 
                                                                                                                                                                                                                    • RETURN VALUE
                                                                                                                                                                                                                      • 
+ 
                                                                                                                                                                                                                    • NOTES
                                                                                                                                                                                                                      • 
++
                                                                                                                                                                                                                    • EXTENSIONS
                                                                                                                                                                                                                      • 
+ 
                                                                                                                                                                                                                    • PORTABILITY
                                                                                                                                                                                                                      • 
+ 
                                                                                                                                                                                                                    • HISTORY
                                                                                                                                                                                                                      • 
+ 
                                                                                                                                                                                                                    • SEE ALSO
                                                                                                                                                                                                                      • 
+Index: doc/html/man/curs_instr.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_instr.3x.html	2024-12-28 21:43:56.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_instr.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_instr 3x 2024-12-28 ncurses 6.5 Library calls
++curs_instr 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                      curs_instr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                      
++
                                                                                                                                                                                                                      curs_instr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                      + curs_instr(3x)                   Library calls                  curs_instr(3x)
+ 
+@@ -62,7 +62,8 @@
+        int innstr(char * str, int n);
+        int winnstr(WINDOW * win, char * str, int n);
+        int mvinnstr(int y, int x, char * str, int n);
+-       int mvwinnstr(WINDOW * win, int y, int x, char * str, int n);
++       int mvwinnstr(WINDOW * win, int y, int x, char * str,
++             int n);
+ 
+ 
+ 
                                                                                                                                                                                                                      DESCRIPTION
                                                                                                                                                                                                                      +@@ -70,9 +71,9 @@
+        cursor  and  stopping  at  the  end  of the line, and stores it in str,
+        terminating it with a null character and omitting  any  attributes  and
+        color  pair  identifier  that  curses  associates  with each character.
+-       winnstr does the same, but copies at most n characters from win.  An  n
+-       of  -1  implies  no limit; winnstr then works like winstr.  ncurses(3x)
+-       describes the variants of these functions.
++       winnstr does the same, but copies at most n  characters  from  win.   A
++       negative   n   implies  no  limit;  winnstr  then  works  like  winstr.
++       ncurses(3x) describes the variants of these functions.
+ 
+ 
+ 
                                                                                                                                                                                                                      RETURN VALUE
                                                                                                                                                                                                                      +@@ -98,16 +99,16 @@
+ 
+ 
+ 
                                                                                                                                                                                                                      EXTENSIONS
                                                                                                                                                                                                                      +-       innstr, winnstr, mvinnstr, and mvwinnstr's treatment of -1 as  a  valid
+-       value of n is an ncurses extension.
++       innstr, winnstr, mvinnstr, and mvwinnstr's  acceptance  of  negative  n
++       values is an ncurses extension.
+ 
+ 
+ 
                                                                                                                                                                                                                      PORTABILITY
                                                                                                                                                                                                                      +        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+-       error conditions for them.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+        X/Open  Curses  Issues  4 and 7 both state that instr, winstr, mvinstr,
+        and mvwinstr return OK rather than a character count.  This  is  likely
+@@ -121,9 +122,11 @@
+ 
+        o   ncurses retains compatibility with System V curses behavior.
+ 
+-       SVr4  documents no return values apart from OK and ERR for any of these
+-       functions.  SVr4 does not document whether n counts the null terminator
+-       that these functions write to str.
++       SVr4  describes  a  successful  return  value only as "an integer value
++       other than ERR".
++
++       SVr4 does not document whether n counts the null terminator that  these
++       functions write to str.
+ 
+ 
+ 
                                                                                                                                                                                                                      HISTORY
                                                                                                                                                                                                                      +@@ -138,7 +141,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                    curs_instr(3x)
++ncurses 6.5                       2025-01-18                    curs_instr(3x)
+ 
                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                        
+Index: doc/html/man/curs_inwstr.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_inwstr.3x.html	2024-12-28 21:43:56.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_inwstr.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_inwstr 3x 2024-12-28 ncurses 6.5 Library calls
++curs_inwstr 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                        curs_inwstr 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                        
++
                                                                                                                                                                                                                        curs_inwstr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                        + curs_inwstr(3x)                  Library calls                 curs_inwstr(3x)
+ 
+@@ -62,7 +62,8 @@
+        int innwstr(wchar_t * wstr, int n);
+        int winnwstr(WINDOW * win, wchar_t * wstr, int n);
+        int mvinnwstr(int y, int x, wchar_t * wstr, int n);
+-       int mvwinnwstr(WINDOW * win, int y, int x, wchar_t * wstr, int n);
++       int mvwinnwstr(WINDOW * win, int y, int x, wchar_t * wstr,
++             int n);
+ 
+ 
+ 
                                                                                                                                                                                                                        DESCRIPTION
                                                                                                                                                                                                                        +@@ -71,16 +72,17 @@
+        it in wstr, terminating it with a wide null character and omitting  any
+        attributes  and  color pair identifier that curses associates with each
+        character.   winnwstr  does  the  same,  but  copies  at  most  n  wide
+-       characters  from win.  An n of -1 implies no limit; winnwstr then works
+-       like winwstr.  ncurses(3x) describes the variants of these functions.
++       characters  from  win.   A  negative  n implies no limit; winnwstr then
++       works like  winwstr.   ncurses(3x)  describes  the  variants  of  these
++       functions.
+ 
+ 
+ 
                                                                                                                                                                                                                        RETURN VALUE
                                                                                                                                                                                                                        +-       On successful operation, these  functions  return  the  count  of  wide
+-       characters  copied  from  win  to  wstr.  They return ERR upon failure.
+-       innwstr, winnwstr,  mvinnwstr,  and  mvwinnwstr  return  ERR  if  n  is
++       On  successful  operation,  these  functions  return  the count of wide
++       characters copied from win to wstr.   They  return  ERR  upon  failure.
++       innwstr,  winnwstr,  mvinnwstr,  and  mvwinnwstr  return  ERR  if  n is
+        insufficiently  large  to  store  a  complete  wide  character  string.
+-       (Recall that a curses  complex  character  can  contain  multiple  wide
++       (Recall  that  a  curses  complex  character  can contain multiple wide
+        characters, some of which may be non-spacing.)
+ 
+        In ncurses, these functions return ERR if
+@@ -89,44 +91,54 @@
+ 
+        o   wstr is NULL.
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
++       Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                                                                                        NOTES
                                                                                                                                                                                                                        +        All of these functions except winnwstr may be implemented as macros.
+ 
+-       Reading a line that overflows the array pointed to by str with  inwstr,
+-       winwstr,  mvinwstr,  or  mvwinwstr  causes  undefined  results.  Use of
++       Reading  a line that overflows the array pointed to by str with inwstr,
++       winwstr, mvinwstr, or  mvwinwstr  causes  undefined  results.   Use  of
+        innwstr, winnwstr, mvinnwstr, and mvwinnwstr is recommended instead.
+ 
+ 
+ 
                                                                                                                                                                                                                        EXTENSIONS
                                                                                                                                                                                                                        +-       innwstr, winnwstr, mvinnwstr, and mvwinnwstr's treatment  of  -1  as  a
+-       valid value of n is an ncurses extension.
++       innwstr, winnwstr, mvinnwstr, and mvwinnwstr's acceptance of negative n
++       values is an ncurses extension.
+ 
+ 
+ 
                                                                                                                                                                                                                        PORTABILITY
                                                                                                                                                                                                                        +        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+-       error conditions for them.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+-       Notwithstanding  the foregoing, X/Open Curses Issues 4 and 7 both state
+-       that innwstr, winnwstr, mvinnwstr, and mvwinnwstr "fail  ...  [i]f  the
++       Notwithstanding the foregoing, X/Open Curses Issues 4 and 7 both  state
++       that  innwstr,  winnwstr,  mvinnwstr, and mvwinnwstr "fail ... [i]f the
+        array  is  not  large  enough  to  contain  any  complete  characters".
+-       Strictly interpreted, this means  that  a  caller  of  these  functions
++       Strictly  interpreted,  this  means  that  a  caller of these functions
+        cannot use their return values to detect truncation of a wide-character
+-       string copied from more  than  one  character  cell  in  win.   ncurses
++       string  copied  from  more  than  one  character  cell in win.  ncurses
+        reports any truncation with ERR.
+ 
+-       X/Open  Curses  specifies  inwstr,  winwstr, mvinwstr, and mvwinwstr as
+-       returning OK rather than a (wide) character count,  unlike  their  non-
++       X/Open Curses specifies inwstr, winwstr,  mvinwstr,  and  mvwinwstr  as
++       returning  OK  rather  than a (wide) character count, unlike their non-
+        wide  counterparts  instr,  winstr,  mvinstr,  and  mvwinstr.   ncurses
+        regards this inconsistency as an error in the standard.
+ 
+ 
++
                                                                                                                                                                                                                        HISTORY
                                                                                                                                                                                                                        ++       The  System V Interface Definition, Version 4 (1995), specified winwstr
++       and winnwstr (and the usual variants).  These were later  additions  to
++       SVr4.x,  not  appearing  in  the  first  SVr4  (1989).   Their synopses
++       described each function as taking an argument of  type  pointer-to-char
++       instead  of  pointer-to-wchar_t,  despite describing them as "returning
++       the string of wchar_t in str".  Presumably this was  an  error  in  the
++       System V Interface Definition.
++
++
+ 
                                                                                                                                                                                                                        SEE ALSO
                                                                                                                                                                                                                        +        curs_instr(3x) describes comparable functions of the ncurses library in
+        its non-wide-character configuration.
+@@ -135,7 +147,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                   curs_inwstr(3x)
++ncurses 6.5                       2025-01-18                   curs_inwstr(3x)
+ 
                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                        
+ 
+ 
                                                                                                                                                                                                                        
+Index: doc/html/man/curs_kernel.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_kernel.3x.html	2024-09-21 18:35:27.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_kernel.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_kernel 3x 2024-09-21 ncurses 6.5 Library calls
++curs_kernel 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                        curs_kernel 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                                                                                        
++
                                                                                                                                                                                                                        curs_kernel 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                        + curs_kernel(3x)                  Library calls                 curs_kernel(3x)
+ 
+@@ -232,27 +232,30 @@
+        error conditions for them, except as described for curs_set in  section
+        "RETURN VALUE" above.
+ 
+-       Older  SVr4  man  pages  warn  that  the  return  value of curs_set "is
+-       currently incorrect".  This implementation gets it right, but  counting
++       The  System V  Interface Definition, Version 4 (1995), specified all of
++       these functions except curs_set as returning OK.
++
++       Older SVr4 man pages  warn  that  the  return  value  of  curs_set  "is
++       currently  incorrect".  This implementation gets it right, but counting
+        on its correctness anywhere else may be unwise.
+ 
+-       X/Open  Curses specifies ripoffline as returning OK with no possibility
+-       of failure ("[c]alls to ripoffline above this limit [five  lines]  have
++       X/Open Curses specifies ripoffline as returning OK with no  possibility
++       of  failure  ("[c]alls to ripoffline above this limit [five lines] have
+        no effect but report success").
+ 
+        X/Open Curses notes:
+ 
+               After use of mvcur(), the model Curses maintains of the state of
+-              the terminal might not match the actual state of  the  terminal.
+-              An  application  should  touch  and  refresh  the  window before
++              the  terminal  might not match the actual state of the terminal.
++              An application  should  touch  and  refresh  the  window  before
+               resuming conventional use of Curses.
+ 
+-       Both ncurses and SVr4 curses implement mvcur using  the  SCREEN  object
+-       allocated  in  either initscr(3x) or newterm(3x).  X/Open Curses states
+-       that the old location must be given for mvcur to accommodate  terminals
++       Both  ncurses  and  SVr4 curses implement mvcur using the SCREEN object
++       allocated in either initscr(3x) or newterm(3x).  X/Open  Curses  states
++       that  the old location must be given for mvcur to accommodate terminals
+        that lack absolute cursor positioning.
+ 
+-       If  interrupted  by  a  signal,  ncurses restarts napms.  That, and the
++       If interrupted by a signal, ncurses  restarts  napms.   That,  and  the
+        limitation to 30 seconds, differ from other implementations.
+ 
+ 
+@@ -262,7 +265,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-21                   curs_kernel(3x)
++ncurses 6.5                       2025-01-18                   curs_kernel(3x)
+ 
                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                          
+Index: doc/html/man/curs_mouse.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_mouse.3x.html	2024-12-28 21:43:56.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_mouse.3x.html	2025-01-19 01:14:35.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_mouse 3x 2024-12-28 ncurses 6.5 Library calls
++curs_mouse 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                          curs_mouse 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                          
++
                                                                                                                                                                                                                          curs_mouse 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                          + curs_mouse(3x)                   Library calls                  curs_mouse(3x)
+ 
+@@ -49,73 +49,87 @@
+ 
+ 
                                                                                                                                                                                                                          NAME
                                                                                                                                                                                                                          +        has_mouse,  getmouse,  ungetmouse,  mousemask,  wenclose,  mouse_trafo,
+-       wmouse_trafo, mouseinterval - get mouse events in curses
++       wmouse_trafo, mouseinterval, mmask_t, MEVENT  -  get  mouse  events  in
++       ncurses
+ 
+ 
+ 
                                                                                                                                                                                                                          SYNOPSIS
                                                                                                                                                                                                                          +        #include <curses.h>
+ 
++       /* data types */
+        typedef unsigned long mmask_t;
+ 
+        typedef struct {
+-           short id;         /* ID to distinguish multiple devices */
+-           int x, y, z;      /* event coordinates */
+-           mmask_t bstate;   /* button state bits */
++           short id;       /* ID to distinguish multiple devices */
++           int x, y, z;    /* event coordinates */
++           mmask_t bstate; /* button state bits */
+        } MEVENT;
+ 
++       /* functions */
+        bool has_mouse(void);
+ 
+-       mmask_t mousemask(mmask_t newmask, mmask_t *oldmask);
++       mmask_t mousemask(mmask_t new-mask, mmask_t * old-mask);
+ 
+-       int getmouse(MEVENT *event);
+-       int ungetmouse(MEVENT *event);
++       int getmouse(MEVENT * event);
++       int ungetmouse(MEVENT * event);
+ 
+-       bool wenclose(const WINDOW *win, int y, int x);
++       bool wenclose(const WINDOW * win, int y, int x);
+ 
+-       bool mouse_trafo(int* pY, int* pX, bool to_screen);
+-       bool wmouse_trafo(const WINDOW* win,
+-                         int* pY, int* pX, bool to_screen);
++       bool mouse_trafo(int * pY, int * pX, bool to-screen);
++       bool wmouse_trafo(const WINDOW * win,
++             int * pY, int * pX, bool to-screen);
+ 
+        int mouseinterval(int erval);
+ 
+ 
+ 
                                                                                                                                                                                                                          DESCRIPTION
                                                                                                                                                                                                                          +-       These functions provide an interface to mouse events from  ncurses(3x).
+-       Mouse  events  are  represented  by  KEY_MOUSE pseudo-key values in the
+-       wgetch(3x) input stream.
++       ncurses  provides  an  interface to the mouse or other pointing device.
++       An application can register its interest in such  events;  the  library
++       then  exposes  the availability of a mouse event via an input character
++       reading function: this is wgetch(3x) in the non-wide  character  curses
++       API  and wget_wch(3x) in the wide character API.  A queue distinct from
++       that used for keyboard events accumulates the details of mouse  events.
++       The  input  character  reading  function reports the KEY_MOUSE key code
++       when a mouse event is available for collection.  A single  mouse  event
++       queue serves all windows associated with the screen.
++
++       The  MEVENT structure describes a mouse event.  Its y and x coordinates
++       are screen-, not window-, relative.  The bstate member has exactly  one
++       bit set indicating the event type.
++
++       ncurses  ignores  mouse  events  when  input is in canonical ("cooked")
++       mode, and produces an error beep when canonical mode is simulated in  a
++       window  by  a  function  such  as getstr(3x) that expects a linefeed to
++       terminate its input loop.
+ 
+ 
+ 
                                                                                                                                                                                                                          has_mouse
                                                                                                                                                                                                                          +-       The has_mouse function returns  TRUE  if  the  mouse  driver  has  been
+-       successfully initialized, and FALSE otherwise.
+-
+-       Mouse  events  are  ignored when input is in canonical ("cooked") mode,
+-       and cause an error beep when canonical mode is  being  simulated  in  a
+-       window  by a function such as getstr that expects a linefeed for input-
+-       loop termination.
++       The terminal type  or  operating  system  interface  must  support  the
++       encoding  of  mouse  events.  has_mouse returns TRUE if ncurses's mouse
++       driver initialized successfully, and FALSE otherwise.
+ 
+ 
+ 
                                                                                                                                                                                                                          mousemask
                                                                                                                                                                                                                          +-       To make mouse events visible, use the mousemask  function.   This  sets
+-       the  mouse  events  to  be  reported.   By default, no mouse events are
+-       reported.
++       Use mousemask to select the varieties of mouse event  your  application
++       wishes to receive.  By default, ncurses reports no mouse events.
+ 
+-       o   The function returns an updated copy of newmask to  indicate  which
++       o   The  function  returns an updated copy of new-mask indicating 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.
++           If the screen is not initialized, or the  terminal  interface  does
++           report mouse events, mousemask 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.
++       o   If  old-mask  is  not a null pointer, mousemask stores the previous
++           value of the screen's mouse event mask there.
+ 
+-       As  a  side  effect,  setting  a zero mouse mask may turn off the mouse
+-       pointer; setting a nonzero mask may turn it on.  Whether  this  happens
+-       is device-dependent.
++       As a side effect, setting a zero mouse mask  may  turn  off  the  mouse
++       cursor; setting a nonzero mask may turn it on.  Whether this happens is
++       device-dependent.
+ 
+ 
+ 
                                                                                                                                                                                                                          Mouse Events
                                                                                                                                                                                                                          +-       Here are the mouse event type masks which may be defined:
++       Several mouse  event  types  may  be  selected;  construct  a  mask  by
++       logically "or"-ing their values.
+ 
+        Name                     Description
+        ------------------------------------------------------------------------
+@@ -149,9 +163,11 @@
+        BUTTON5_DOUBLE_CLICKED   mouse button 5 double clicked
+        BUTTON5_TRIPLE_CLICKED   mouse button 5 triple clicked
+        ------------------------------------------------------------------------
+-       BUTTON_SHIFT             shift was down during button state change
+-       BUTTON_CTRL              control was down during button state change
+-       BUTTON_ALT               alt was down during button state change
++       BUTTON_SHIFT             a  shift  key  was  down  during  button state
++                                change
++       BUTTON_CTRL              a control key was  down  during  button  state
++                                change
++       BUTTON_ALT               an alt key was down during button state change
+        ALL_MOUSE_EVENTS         report all button state changes
+        REPORT_MOUSE_POSITION    report mouse movement
+        ------------------------------------------------------------------------
+@@ -159,87 +175,76 @@
+ 
+ 
                                                                                                                                                                                                                          getmouse
                                                                                                                                                                                                                          +        Once a class of mouse events has been made visible in a window, calling
+-       the wgetch function on that window may return KEY_MOUSE as an indicator
+-       that a mouse event has been queued.  To read the event data and pop the
+-       event off the queue, call getmouse.  This function will return OK if  a
+-       mouse  event  is  actually  visible in the given window, ERR otherwise.
+-       When getmouse returns OK, 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
+-       indicate the event type.  The corresponding data in the queue is marked
+-       invalid.  A subsequent call to getmouse will retrieve  the  next  older
+-       item from the queue.
++       the  input  character  reading  function  on  that  window  may  return
++       KEY_MOUSE  as an indicator that a mouse event is enqueued.  To read the
++       event data and pop the  event  off  the  queue,  call  getmouse,  which
++       returns  OK  if  a  mouse  event is visible in the given window and ERR
++       otherwise.  When getmouse returns OK, it deposits data  describing  the
++       mouse  event  in  the  event pointer you supply.  A subsequent getmouse
++       call retrieves the next older event from the queue.
+ 
+ 
+ 
                                                                                                                                                                                                                          ungetmouse
                                                                                                                                                                                                                          +-       The  ungetmouse  function  behaves analogously to ungetch.  It pushes a
+-       KEY_MOUSE event onto the input queue, and associates  with  that  event
+-       the given state data and screen-relative character-cell coordinates.
++       ungetmouse behaves analogously to ungetch(3x).  It pushes  a  KEY_MOUSE
++       event  onto  the  screen's  input queue, and event onto the mouse event
++       queue.
+ 
+ 
+ 
                                                                                                                                                                                                                          wenclose
                                                                                                                                                                                                                          +-       The  wenclose  function  tests  whether a given pair of screen-relative
+-       character-cell coordinates is enclosed by  a  given  window,  returning
+-       TRUE  if  it is and FALSE otherwise.  It is useful for determining what
+-       subset of the screen windows enclose the location of a mouse event.
+-
+-       If the parameter is  a  pad,  wenclose  uses  the  most  recent  screen
+-       coordinates used for this pad in prefresh(3x) or pnoutrefresh(3x).
++       wenclose returns TRUE if the pair of screen-relative coordinates (y, x)
++       is  enclosed by the given window win, and FALSE otherwise.  If win is a
++       pad, wenclose uses its most recent screen coordinates as specified in a
++       prefresh(3x) or pnoutrefresh(3x) call.
++
++       wenclose  is useful for determining what subset of the screen's windows
++       encloses the location of a mouse event; it is otherwise independent  of
++       the ncurses mouse API.
+ 
+ 
+ 
                                                                                                                                                                                                                          wmouse_trafo
                                                                                                                                                                                                                          +-       The  wmouse_trafo  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 screen coordinates due to the mechanism to  reserve
+-       lines  on  top  or  bottom  of  the  screen for other purposes (see the
+-       ripoffline(3x) and slk_init(3x) calls, for example).
+-
+-       o   If the parameter to_screen  is  TRUE,  the  pointers  pY,  pX  must
+-           reference  the  coordinates  of  a  location inside the window win.
+-           They are converted  to  stdscr-relative  coordinates  and  returned
+-           through  the  pointers.   If  the  conversion  was  successful, the
+-           function returns TRUE.
+-
+-           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
+-           stdscr-relative coordinates.  They are converted to window-relative
+-           coordinates  if  the  window win encloses this point.  In this case
+-           the function returns TRUE.
+-
+-           If one of the parameters is NULL or the point  is  not  inside  the
+-           window, FALSE is returned.
+-
+-       The   referenced   coordinates  are  only  replaced  by  the  converted
+-       coordinates if the transformation was successful.
++       wmouse_trafo  transforms the given pair of coordinate pointers (pY, pX)
++       from a win-relative basis to a screen-relative one or  vice  versa,  as
++       to-screen  is TRUE or FALSE, respectively.  stdscr-relative coordinates
++       are  not  always  identical  to  screen  coordinates:  curses  supports
++       reservation  of  screen  lines  at  the  top  and/or  bottom  for other
++       purposes; see ripoffline(3x) and slk_init(3x).
++
++       If to-screen is TRUE and the pointers (pY,  pX)  reference  coordinates
++       inside win, ncurses updates their values to stdscr-relative coordinates
++       and returns TRUE.  If either pY or pX is a null pointer, or (pY, pX) is
++       not inside win, wmouse_trafo returns FALSE.
++
++       If  to-screen  is FALSE and the pointers (pY, pX) reference coordinates
++       inside stdscr, ncurses updates their values to win-relative coordinates
++       and returns TRUE.  If either pY or pX is a null pointer, or (pY, pX) is
++       not inside stdscr, wmouse_trafo returns FALSE.
+ 
+ 
+ 
                                                                                                                                                                                                                          mouse_trafo
                                                                                                                                                                                                                          +-       The mouse_trafo function performs the same translation as wmouse_trafo,
+-       using stdscr for win.
++       mouse_trafo applies the wmouse_trafo  translation  to  stdscr.   If  no
++       screen  lines  are  reserved by ripoffline(3x) or slk_init(3x), this is
++       the identity transformation.
+ 
+ 
+ 
                                                                                                                                                                                                                          mouseinterval
                                                                                                                                                                                                                          +-       The  mouseinterval  function sets the maximum time (in thousandths of a
+-       second) that can elapse between press and release events for them to be
+-       resolved  as  a click.  An application might interpret button press and
+-       release events separated by more than the mouse  interval  as  a  "long
+-       press", or, with motion, as a "drag".
++       mouseinterval sets the maximum time (in thousandths of a  second)  that
++       can  elapse between press and release events for them to be resolved as
++       a click.  An application  might  interpret  button  press  and  release
++       events separated by more than the mouse interval as a "long press", or,
++       with motion, as a "drag".
+ 
+        Calling  mouseinterval(0)  disables  click  resolution.   When  ncurses
+-       detects a mouse event, it awaits further  input  activity  up  to  this
+-       interval,  and  then  checks  for a subsequent mouse event which can be
+-       combined with the first event.  If the timeout  expires  without  input
+-       activity  (which  would  happen  with  a  zero interval), then no click
+-       resolution will occur.
++       detects  a  mouse  event,  it  awaits further input activity up to this
++       interval, and then checks for a subsequent mouse  event  which  can  be
++       combined  with  the  first event.  If the timeout expires without input
++       activity (which would happen with  a  zero  interval),  then  no  click
++       resolution occurs.
+ 
+-       This   function   returns   the   previous   interval    value.     Use
++       This    function    returns   the   previous   interval   value.    Use
+        mouseinterval(-1) to obtain the interval without altering it.
+ 
+        The  mouse  interval  is  set  to  one  sixth  of  a  second  when  the
+-       corresponding  screen  is  initialized,   e.g.,   in   initscr(3x)   or
++       corresponding   screen   is   initialized,   e.g.,  in  initscr(3x)  or
+        setupterm(3x).
+ 
+ 
+@@ -255,24 +260,24 @@
+ 
+        o   the mask of reportable events is zero,
+ 
+-       o   a mouse event was detected that does not match the mask,
++       o   a mouse event was detected that does not match the mask, or
+ 
+-       o   or if no more events remain in the queue.
++       o   no more events remain in the queue.
+ 
+        ungetmouse returns ERR if the event queue is full.
+ 
+        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).
+ 
+ 
+ 
                                                                                                                                                                                                                          NOTES
                                                                                                                                                                                                                          +-       The  order  of  the  MEVENT  structure  members  is   not   guaranteed.
++       The   order   of  the  MEVENT  structure  members  is  not  guaranteed.
+        Additional fields may be added to the structure in the future.
+ 
+-       Under  ncurses, these calls are implemented using either xterm's built-
++       Under ncurses, these calls are implemented using either xterm's  built-
+        in mouse-tracking API or platform-specific drivers including
+ 
+           o   Alessandro Rubini's gpm server
+@@ -281,21 +286,26 @@
+ 
+           o   OS/2 EMX
+ 
+-       If you are using an unsupported configuration, mouse events will not be
+-       visible to ncurses (and the mousemask function will always return 0).
++       If  you  are  using  an unsupported configuration, mouse events are not
++       visible to ncurses (and the mousemask function always returns 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
+-       mode 1000 of xterm:
++       If the  terminal  type  possesses  the  (nonstandard)  terminfo  string
++       capability  XM,  ncurses's xterm mouse driver uses it when initializing
++       the terminal for mouse operation.  The default, if  XM  is  not  found,
++       corresponds to private mode 1000 of xterm.
+ 
+           \E[?1000%?%p1%{1}%=%th%el%;
+ 
+-       The mouse driver also recognizes a newer xterm private mode 1006, e.g.,
++       ncurses also recognizes xterm's newer private mode 1006.
+ 
+           \E[?1006;1000%?%p1%{1}%=%th%el%;
+ 
+-       The z member in the event structure  is  not  presently  used.   It  is
++       The  id  member  of the mouse event structure is not presently used; no
++       terminal type or operating system interface supports  reporting  events
++       from  distinguishable  pointing  devices.  If you synthesize an MEVENT,
++       use an id of 0.
++
++       The z member of the mouse event structure is not presently used.  It is
+        intended  for  use with touch screens (which may be pressure-sensitive)
+        or with 3D-mice/trackballs/power gloves.
+ 
+@@ -306,10 +316,10 @@
+ 
+ 
+ 
                                                                                                                                                                                                                          EXTENSIONS
                                                                                                                                                                                                                          +-       These  functions  were  designed  for ncurses(3x), and are not found in
+-       SVr4  curses,   4.4BSD   curses,   or   any   other   previous   curses
+-       implementation.   (SVr4 curses did have a getmouse function, which took
+-       no argument and returned a different type.)
++       These  functions  are  ncurses  extensions,  and  are not found in SVr4
++       curses, 4.4BSD curses, or any  other  previous  curses  implementation.
++       (SVr4  curses  did have a getmouse function, which took no argument and
++       returned an unsigned long.)
+ 
+ 
+ 
                                                                                                                                                                                                                          PORTABILITY
                                                                                                                                                                                                                          +@@ -320,12 +330,14 @@
+        "ALTERNATE CONFIGURATIONS" of ncurses(3x).  The following values may be
+        specified.
+ 
+-          1  has definitions for reserved events.  The mask uses 28 bits.
++          1  has definitions for reserved events.  The mask uses 28 bits.
+ 
+-          2  adds  definitions  for  button  5,  removes  the  definitions for
++          2  adds  definitions  for  button  5,  removes  the  definitions for
+              reserved events.  The mask uses 29 bits.
+ 
+-       SVr4 curses had support for the mouse in a variant of xterm(1).  It  is
++
++
                                                                                                                                                                                                                          HISTORY
                                                                                                                                                                                                                          ++       SVr4 (1989) added mouse support to its  variant  of  xterm(1).   It  is
+        mentioned in a few places, with little supporting documentation.
+ 
+        o   Its  "libcurses"  manual  page  lists  functions  for  this feature
+@@ -350,11 +362,11 @@
+        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
+-           capability.
++           For  instance,  the  SVr4  curses library used the get_mouse (getm)
++           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
++           (reqmp) capability.
+ 
+            Those  features  required a terminal program that had been modified
+            to work with SVr4 curses.  They were not part of the X Consortium's
+@@ -375,17 +387,18 @@
+ 
+        An ncurses window must enable keypad(3x)  to  correctly  receive  mouse
+        event  reports  from  xterm  since they are encoded like function keys.
+-       Set the terminal's terminfo capability kmous to "\E[M"  (the  beginning
+-       of  the  response  from xterm for mouse clicks).  Other values of kmous
+-       are permitted under the same assumption, that  is,  the  report  begins
+-       with that sequence.
++       Set the terminal's terminfo capability key_mouse (kmous) to "\E[M" (the
++       beginning  of  the response from xterm for mouse clicks).  Other values
++       of key_mouse are permitted under the  same  assumption,  that  is,  the
++       report begins with that sequence.
+ 
+        Because there are no standard response sequences that serve to identify
+        terminals supporting the xterm mouse protocol, ncurses assumes that  if
+-       kmous is defined in the terminal description, or if the terminal type's
+-       primary name or aliases contain the string "xterm", then  the  terminal
+-       may send mouse events.  The kmous capability is checked first, allowing
+-       use of newer xterm mouse protocols, such as its private mode 1006.
++       key_mouse  (kmous)  is  defined  in the terminal description, or if the
++       terminal type's primary name or aliases  contain  the  string  "xterm",
++       then the terminal may send mouse events.  ncurses checks the kmous cap-
++       code first, allowing use of newer xterm mouse protocols,  such  as  its
++       private mode 1006.
+ 
+ 
+ 
                                                                                                                                                                                                                          SEE ALSO
                                                                                                                                                                                                                          +@@ -394,7 +407,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                    curs_mouse(3x)
++ncurses 6.5                       2025-01-18                    curs_mouse(3x)
+ 
                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                          
+ 
+Index: doc/html/man/curs_move.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_move.3x.html	2024-12-28 21:43:56.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_move.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_move 3x 2024-12-28 ncurses 6.5 Library calls
++curs_move 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                          curs_move 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                          
++
                                                                                                                                                                                                                          curs_move 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                          + curs_move(3x)                    Library calls                   curs_move(3x)
+ 
+@@ -78,10 +78,11 @@
+ 
+ 
+ 
                                                                                                                                                                                                                          PORTABILITY
                                                                                                                                                                                                                          +-       X/Open Curses, Issue 4 describes these functions.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+-       SVr4  curses  describes  a  successful return value only as "an integer
+-       value other than ERR".
++       SVr4 describes a successful return value  only  as  "an  integer  value
++       other than ERR".
+ 
+ 
+ 
                                                                                                                                                                                                                          HISTORY
                                                                                                                                                                                                                          +@@ -93,7 +94,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                     curs_move(3x)
++ncurses 6.5                       2025-01-18                     curs_move(3x)
+ 
                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                            
+Index: doc/html/man/curs_opaque.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_opaque.3x.html	2024-12-28 21:43:56.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_opaque.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_opaque 3x 2024-12-28 ncurses 6.5 Library calls
++curs_opaque 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                            curs_opaque 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                            
++
                                                                                                                                                                                                                            curs_opaque 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                            + curs_opaque(3x)                  Library calls                 curs_opaque(3x)
+ 
+@@ -142,20 +142,25 @@
+        function documented in this page.
+ 
+ 
++
                                                                                                                                                                                                                            EXTENSIONS
                                                                                                                                                                                                                            ++       These functions originated with ncurses.
++
++
+ 
                                                                                                                                                                                                                            PORTABILITY
                                                                                                                                                                                                                            +-       These routines are specific to ncurses.  They  were  not  supported  on
+-       Version 7, BSD or System V implementations.  It is recommended that any
+-       code   depending   on   ncurses   extensions   be   conditioned   using
+-       NCURSES_VERSION.
++       Applications employing ncurses extensions should condition their use on
++       the visibility of the NCURSES_VERSION preprocessor macro.
++
++       NetBSD   curses  since  10.1  (2024)  supports  wgetscr_reg.   It  also
++       implements getscr_reg, operating on stdscr.
+ 
+ 
+ 
                                                                                                                                                                                                                            SEE ALSO
                                                                                                                                                                                                                            +-       curses(3x),    curs_inopts(3x),   curs_outopts(3x),   curs_threads(3x),
++       curses(3x),   curs_inopts(3x),   curs_outopts(3x),    curs_threads(3x),
+        curs_window(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                   curs_opaque(3x)
++ncurses 6.5                       2025-01-18                   curs_opaque(3x)
+ 
                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                            
+ 
+Index: doc/html/man/curs_outopts.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_outopts.3x.html	2024-09-14 20:23:26.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_outopts.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_outopts 3x 2024-09-14 ncurses 6.5 Library calls
++curs_outopts 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                            curs_outopts 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                                                                                                            
++
                                                                                                                                                                                                                            curs_outopts 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                            + curs_outopts(3x)                 Library calls                curs_outopts(3x)
+ 
+@@ -158,7 +158,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                            NOTES
                                                                                                                                                                                                                            +-       Note that clearok, leaveok,  scrollok,  idcok,  and  setscrreg  may  be
++       clearok, leaveok, scrollok, idcok, and setscrreg may be implemented  as
+        macros.
+ 
+        The  immedok  routine  is  useful for windows that are used as terminal
+@@ -166,36 +166,41 @@
+ 
+ 
+ 
                                                                                                                                                                                                                            PORTABILITY
                                                                                                                                                                                                                            +-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+-       error conditions for them.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+        Some  historic  curses implementations, as an undocumented feature, did
+        the  equivalent  of  "clearok(...,   1)"   when   touchwin(stdstr)   or
+        clear(stdstr) were used.  This trick does not work with ncurses.
+ 
+-       Early  System V  curses  implementations  specified  that with scrollok
++       Early  System V  curses  implementations  specified  that with scrollok
+        enabled, any window modification triggering  a  scroll  also  forced  a
+        physical  refresh.   X/Open  Curses  does not require this, and ncurses
+-       avoids  doing  so  to  better  optimize   vertical   motions   upon   a
+-       wrefresh(3x).
++       avoids doing so to better optimize vertical motions upon a wrefresh.
+ 
+        X/Open Curses does not mention that the cursor should be made invisible
+-       as a side-effect of leaveok.  SVr4 curses documentation notes this, but
++       as a side-effect of leaveok.  SVr4 curses documentation notes this, but
+        the code neglects it.  Use curs_set(3x) to make the cursor invisible.
+ 
+ 
+ 
                                                                                                                                                                                                                            HISTORY
                                                                                                                                                                                                                            +-       ncurses  formerly  treated nl(3x) and nonl(3x) as both input and output
+-       options, but no longer; see curs_inopts(3x).
++       4BSD (1980) curses introduced clearok, leaveok, and scrollok.
++
++       SVr2 (1984) supplied idlok, setscrreg, and wsetscrreg.
++
++       SVr3.1 (1987) implemented idcok and immedok.
++
++       ncurses formerly treated nl and nonl as both input and output  options,
++       but no longer; see curs_inopts(3x).
+ 
+ 
+ 
                                                                                                                                                                                                                            SEE ALSO
                                                                                                                                                                                                                            +-       curses(3x),    curs_addch(3x),    curs_clear(3x),     curs_initscr(3x),
++       curses(3x),     curs_addch(3x),    curs_clear(3x),    curs_initscr(3x),
+        curs_refresh(3x), curs_scroll(3x), curs_variables(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-14                  curs_outopts(3x)
++ncurses 6.5                       2025-01-18                  curs_outopts(3x)
+ 
                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                              
+Index: doc/html/man/curs_overlay.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_overlay.3x.html	2024-05-25 22:33:42.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_overlay.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_overlay 3x 2024-05-25 ncurses 6.5 Library calls
++curs_overlay 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                              curs_overlay 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                                                                                                                              
++
                                                                                                                                                                                                                              curs_overlay 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                              + curs_overlay(3x)                 Library calls                curs_overlay(3x)
+ 
+@@ -81,24 +81,27 @@
+ 
+ 
+ 
                                                                                                                                                                                                                              RETURN VALUE
                                                                                                                                                                                                                              +-       These  routines  return  the  integer  ERR upon failure and an OK (SVr4
+-       specifies only "an integer  value  other  than  ERR")  upon  successful
+-       completion.
+-
+-       X/Open  defines  no error conditions.  In this implementation, copywin,
+-       overlay and overwrite return ERR if either of the window  pointers  are
+-       null, or if some part of the window would be placed off-screen.
++       These functions return OK on success and ERR on failure.
++
++       In ncurses, they return ERR if
++
++       o   either of the window pointers are null, or
++
++       o   any part of the window would be placed off-screen.
+ 
+ 
+ 
                                                                                                                                                                                                                              NOTES
                                                                                                                                                                                                                              +-       Note that overlay and overwrite may be macros.
++       overlay and overwrite may be implemented as macros.
+ 
+ 
+ 
                                                                                                                                                                                                                              PORTABILITY
                                                                                                                                                                                                                              +-       These  functions  are  described  in X/Open Curses, Issue 4, which adds
+-       const qualifiers to the arguments.  It further specifies their behavior
+-       in  the  presence  of  characters  with  multibyte  renditions (not yet
+-       supported in this implementation).
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.  It adds const qualifiers to  the  arguments.   It
++       further  specifies  their  behavior  in the presence of characters with
++       multibyte renditions (not yet supported in this implementation).
++
++       SVr4 describes a successful return value  only  as  "an  integer  value
++       other than ERR".
+ 
+ 
+ 
                                                                                                                                                                                                                              SEE ALSO
                                                                                                                                                                                                                              +@@ -106,7 +109,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                  curs_overlay(3x)
++ncurses 6.5                       2025-01-18                  curs_overlay(3x)
+ 
                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                
+Index: doc/html/man/curs_pad.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_pad.3x.html	2024-12-28 21:43:56.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_pad.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_pad 3x 2024-12-28 ncurses 6.5 Library calls
++curs_pad 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                curs_pad 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                
++
                                                                                                                                                                                                                                curs_pad 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                + curs_pad(3x)                     Library calls                    curs_pad(3x)
+ 
+@@ -129,106 +129,118 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                RETURN VALUE
                                                                                                                                                                                                                                +-       Functions  that  return an integer return ERR upon failure and OK (SVr4
+-       specifies only "an integer  value  other  than  ERR")  upon  successful
+-       completion.
++       Functions  that  return  an integer return ERR upon failure and OK upon
++       successful completion.
+ 
+-       Functions  that  return pointers return NULL on error, and set errno to
++       Functions that return pointers return NULL on error, and set  errno  to
+        ENOMEM.
+ 
+        In this implementation
+ 
+           prefresh and pnoutrefresh
+-               return ERR if the window pointer is null, or if the  window  is
+-               not  really  a pad or if the area to refresh extends off-screen
++               return  ERR  if the window pointer is null, or if the window is
++               not really a pad or if the area to refresh  extends  off-screen
+                or if the minimum coordinates are greater than the maximum.
+ 
+           pechochar
+-               returns ERR if  the  window  is  not  really  a  pad,  and  the
++               returns  ERR  if  the  window  is  not  really  a  pad, and the
+                associated call to wechochar returns ERR.
+ 
+           pecho_wchar
+-               returns  ERR  if  the  window  is  not  really  a  pad, and the
++               returns ERR if  the  window  is  not  really  a  pad,  and  the
+                associated call to wecho_wchar returns ERR.
+ 
+ 
+ 
                                                                                                                                                                                                                                NOTES
                                                                                                                                                                                                                                +-       pechochar may be a macro.
+-
++       pechochar may be implemented as a macro.
+ 
+-
                                                                                                                                                                                                                                PORTABILITY
                                                                                                                                                                                                                                +-       BSD curses has no pad feature.
+-
+-       SVr2  curses  (1986)  provided  the  newpad  and   related   functions,
+-       documenting  them  in  a  single  line each.  SVr3 (1987) provided more
+-       extensive documentation.
+-
+-       The documentation does not explain the term pad.  However,  the  Apollo
+-       Aegis workstation operating system supported a graphical pad feature:
++       curses  documentation  is  traditionally  averse to motivating the term
++       "pad".  The Apollo Aegis  workstation  operating  system  (circa  1981)
++       supported a graphical pad feature.
+ 
+        o   These  graphical  pads  could  be  much  larger than the computer's
+            display.
+ 
+        o   The read-only output from a  command  could  be  scrolled  back  to
+-           inspect, and select text from the pad.
++           inspect and select text from the pad.
+ 
+        The two uses may be related.
+ 
+-       X/Open  Curses,  Issue 4 describes these functions, without significant
+-       change from the SVr3 documentation.  It specifies no  error  conditions
+-       for  them.  The behavior of subpad if the parent window is not a pad is
+-       undocumented, and is not checked by the vendor Unix implementations:
+-
+-       o   SVr4 curses sets a flag in the WINDOW  structure  in  newpad  which
+-           tells if the window is a pad.
+-
+-           However,  it  uses this information only in waddch (to decide if it
+-           should call wrefresh) and wscrl (to avoid  scrolling  a  pad),  and
+-           does  not  check  in  wrefresh  to ensure that the pad is refreshed
+-           properly.
+-
+-       o   Solaris xcurses checks whether a window is a pad  in  wnoutrefresh,
+-           returning ERR in that case.
+-
+-           However,  it only sets the flag for subwindows if the parent window
+-           is a pad.  Its newpad  function  does  not  set  this  information.
+-           Consequently, the check will never fail.
+-
+-           It  makes no comparable check in pnoutrefresh, though interestingly
+-           enough, a comment in the source code states  that  the  lack  of  a
+-           check was an MKS extension.
+-
+-       o   NetBSD  7 curses sets a flag in the WINDOW structure for newpad and
+-           subpad,  using  this  to  help   with   the   distinction   between
+-           wnoutrefresh and pnoutrefresh.
++
++
                                                                                                                                                                                                                                PORTABILITY
                                                                                                                                                                                                                                ++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
++
++       SVr4 describes a successful return value  only  as  "an  integer  value
++       other than ERR".
++
++       The  behavior  of  subpad  if  the  parent  window  is  not  a  pad  is
++       undocumented, and is not checked by the vendor Unix implementations.
++
++       o   SVr4 curses's newpad sets a flag in the WINDOW structure indicating
++           that the window is a pad.
++
++           However,  it  uses this information only in waddch (to decide if it
++           should call wrefresh) and wscrl (to avoid  scrolling  a  pad);  its
++           wrefresh  does  not  check  it  to  ensure  that  a pad is properly
++           updated.
++
++       o   Solaris  xcurses  checks  whether  a  window  is  a  pad   in   its
++           wnoutrefresh, returning ERR in that case.
++
++           However,  it  sets the flag on subwindows only if the parent window
++           is a pad.  Its newpad does not set this information.  Consequently,
++           the check never fails.
++
++           It   makes   no   comparable   check   in  pnoutrefresh  --  though
++           interestingly enough, a comment in the source code states that  the
++           lack of a check was an MKS extension.
++
++       o   NetBSD 7  curses sets a flag in the WINDOW structure for newpad and
++           subpad, aiding  itself  to  distinguish  between  wnoutrefresh  and
++           pnoutrefresh.
+ 
+            It  does  not  check for the case where a subwindow is created in a
+-           pad using subwin or derwin.
++           pad using subwin or derwin.
+ 
+-           The dupwin function returns a regular  window  when  duplicating  a
+-           pad.   Likewise,  getwin always returns a window, even if the saved
++           Its dupwin  returns  a  regular  window  when  duplicating  a  pad.
++           Likewise,  its  getwin  always  returns a window, even if the saved
+            data was from a pad.
+ 
+-       This implementation
++       ncurses:
+ 
+-       o   sets a flag in the WINDOW structure for newpad and subpad,
++       o   sets a flag in the WINDOW structure for newpad and subpad,
+ 
+-       o   allows a subwin or derwin call to succeed having a  pad  parent  by
++       o   allows a subwin or derwin call to succeed having a  pad  parent  by
+            forcing the subwindow to be a pad,
+ 
+-       o   checks  in  both  wnoutrefresh and pnoutrefresh to ensure that pads
++       o   checks  in  both  wnoutrefresh and pnoutrefresh to ensure that pads
+            and windows are handled distinctly, and
+ 
+-       o   ensures  that  dupwin  and  getwin  treat   pads   versus   windows
++       o   ensures  that  dupwin  and  getwin  treat   pads   versus   windows
+            consistently.
+ 
+ 
++
                                                                                                                                                                                                                                HISTORY
                                                                                                                                                                                                                                ++       SVr2  (1984) introduced newpad, prefresh, and pnoutrefresh, documenting
++       them in a single line each.
++
++       SVr3 (1987) added subpad and pechochar,  and  provided  more  extensive
++       documentation.
++
++       The  System V  Interface  Definition,  Version  4  (1995),  specified a
++       function named pechowchar.  This was a later addition  to  SVr4.x,  not
++       appearing  in  the  first  SVr4 (1989).  It differs from X/Open's later
++       pecho_wchar in that its wstr  parameter  was  a  chtype  instead  of  a
++       wchar_t, and was not const-qualified.
++
++
+ 
                                                                                                                                                                                                                                SEE ALSO
                                                                                                                                                                                                                                +        curses(3x), curs_addch(3x), curs_refresh(3x), curs_touch(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                      curs_pad(3x)
++ncurses 6.5                       2025-01-18                      curs_pad(3x)
+ 
                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                
+ 
+ 
                                                                                                                                                                                                                                
+Index: doc/html/man/curs_printw.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_printw.3x.html	2024-04-27 18:38:47.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_printw.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_printw 3x 2024-04-20 ncurses 6.5 Library calls
++curs_printw 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                curs_printw 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                                                                                                                                                
++
                                                                                                                                                                                                                                curs_printw 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                + curs_printw(3x)                  Library calls                 curs_printw(3x)
+ 
+@@ -95,19 +95,19 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                PORTABILITY
                                                                                                                                                                                                                                +-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+-       error conditions for them.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+        ncurses defines vw_printw and vwprintw identically  to  support  legacy
+        applications.  However, the latter is obsolete.
+ 
+-       o   X/Open  Curses,  Issue  4  Version  2  (1996),  marked  vwprintw as
++       o   X/Open   Curses   Issue 4  Version 2  (1996),  marked  vwprintw  as
+            requiring varargs.h and "TO BE WITHDRAWN", and specified  vw_printw
+            using the stdarg.h interface.
+ 
+-       o   X/Open  Curses,  Issue  5,  Draft 2 (December 2007) marked vwprintw
++       o   X/Open  Curses  Issue 5,  Draft  2  (December 2007) marked vwprintw
+            (along with vwscanw and the termcap interface) as withdrawn.  After
+-           incorporating  review  comments, this became X/Open Curses, Issue 7
++           incorporating  review  comments,  this became X/Open Curses Issue 7
+            (2009).
+ 
+        o   ncurses provides vwprintw, but marks it as deprecated.
+@@ -138,7 +138,7 @@
+        SVr4  (1989)  introduced  no new variations of printw, but provided for
+        using either varargs.h or stdarg.h to define the va_list type.
+ 
+-       X/Open Curses, Issue 4 (1995), defined vw_printw to  replace  vwprintw,
++       X/Open Curses Issue 4 (1995), defined vw_printw  to  replace  vwprintw,
+        stating that its va_list type is defined in stdarg.h.
+ 
+ 
+@@ -147,7 +147,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                   curs_printw(3x)
++ncurses 6.5                       2025-01-18                   curs_printw(3x)
+ 
                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                  
+Index: doc/html/man/curs_refresh.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_refresh.3x.html	2024-09-14 20:23:26.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_refresh.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_refresh 3x 2024-09-14 ncurses 6.5 Library calls
++curs_refresh 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                  curs_refresh 3x 2024-09-14 ncurses 6.5 Library calls
                                                                                                                                                                                                                                  
++
                                                                                                                                                                                                                                  curs_refresh 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                  + curs_refresh(3x)                 Library calls                curs_refresh(3x)
+ 
+@@ -123,9 +123,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                  RETURN VALUE
                                                                                                                                                                                                                                  +-       These  routines  return  the  integer  ERR  upon  failure  and OK (SVr4
+-       specifies only "an integer  value  other  than  ERR")  upon  successful
+-       completion.
++       These routines return the integer ERR upon failure and OK
+ 
+        In this implementation
+ 
+@@ -138,19 +136,22 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                  NOTES
                                                                                                                                                                                                                                  +-       Note that refresh and redrawwin may be macros.
++       refresh and redrawwin may be implemented as macros.
+ 
+ 
+ 
                                                                                                                                                                                                                                  PORTABILITY
                                                                                                                                                                                                                                  +-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+-       error conditions for them.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+-       Whether  wnoutrefresh  copies to the virtual screen the entire contents
++       SVr4  describes  a  successful  return  value only as "an integer value
++       other than ERR".
++
++       Whether wnoutrefresh 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
++       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 touchwin
+-       before the wnoutrefresh  call  to  guarantee  an  entire-contents  copy
++       before  the  wnoutrefresh  call  to  guarantee  an entire-contents copy
+        anywhere.
+ 
+ 
+@@ -159,7 +160,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-14                  curs_refresh(3x)
++ncurses 6.5                       2025-01-18                  curs_refresh(3x)
+ 
                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                    
+Index: doc/html/man/curs_scanw.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_scanw.3x.html	2024-04-27 18:38:47.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_scanw.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_scanw 3x 2024-04-20 ncurses 6.5 Library calls
++curs_scanw 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                    curs_scanw 3x 2024-04-20 ncurses 6.5 Library calls
                                                                                                                                                                                                                                    
++
                                                                                                                                                                                                                                    curs_scanw 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                                    + curs_scanw(3x)                   Library calls                  curs_scanw(3x)
+ 
+@@ -100,19 +100,19 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                    PORTABILITY
                                                                                                                                                                                                                                    +-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+-       error conditions for them.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+        ncurses  defines  vw_scanw  and  vwscanw  identically to support legacy
+        applications.  However, the latter is obsolete.
+ 
+-       o   X/Open  Curses,  Issue  4  Version  2  (1996),  marked  vwscanw  as
+-           requiring  varargs.h  and "TO BE WITHDRAWN", and specified vw_scanw
+-           using the stdarg.h interface.
++       o   X/Open Curses Issue 4 Version 2 (1996), marked vwscanw as requiring
++           varargs.h  and  "TO BE WITHDRAWN", and specified vw_scanw using the
++           stdarg.h interface.
+ 
+-       o   X/Open Curses, Issue 5, Draft  2  (December  2007)  marked  vwscanw
++       o   X/Open Curses Issue 5,  Draft  2  (December  2007)  marked  vwscanw
+            (along with vwscanw and the termcap interface) as withdrawn.  After
+-           incorporating review comments, this became X/Open Curses,  Issue  7
++           incorporating review comments, this became  X/Open  Curses  Issue 7
+            (2009).
+ 
+        o   ncurses provides vwscanw, but marks it as deprecated.
+@@ -170,7 +170,7 @@
+        SVr4  (1989)  introduced  no  new variations of scanw, but provided for
+        using either varargs.h or stdarg.h to define the va_list type.
+ 
+-       X/Open Curses, Issue 4 (1995), defined  vw_scanw  to  replace  vwscanw,
++       X/Open Curses Issue 4 (1995),  defined  vw_scanw  to  replace  vwscanw,
+        stating that its va_list type is defined in stdarg.h.
+ 
+ 
+@@ -179,7 +179,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20                    curs_scanw(3x)
++ncurses 6.5                       2025-01-18                    curs_scanw(3x)
+ 
                                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                                      
+Index: doc/html/man/curs_scr_dump.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_scr_dump.3x.html	2024-12-28 21:43:56.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_scr_dump.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_scr_dump 3x 2024-12-28 ncurses 6.5 Library calls
++curs_scr_dump 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                      curs_scr_dump 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                      
++
                                                                                                                                                                                                                                      curs_scr_dump 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                                      + curs_scr_dump(3x)                Library calls               curs_scr_dump(3x)
+ 
+@@ -130,8 +130,8 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                      PORTABILITY
                                                                                                                                                                                                                                      +-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+-       error conditions for them.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+        SVr4 omitted the const qualifiers.
+ 
+@@ -161,7 +161,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                 curs_scr_dump(3x)
++ncurses 6.5                       2025-01-18                 curs_scr_dump(3x)
+ 
                                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                                        
+Index: doc/html/man/curs_scroll.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_scroll.3x.html	2024-09-22 18:37:11.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_scroll.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_scroll 3x 2024-09-22 ncurses 6.5 Library calls
++curs_scroll 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                        curs_scroll 3x 2024-09-22 ncurses 6.5 Library calls
                                                                                                                                                                                                                                        
++
                                                                                                                                                                                                                                        curs_scroll 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                                        + curs_scroll(3x)                  Library calls                 curs_scroll(3x)
+ 
+@@ -95,11 +95,11 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                        PORTABILITY
                                                                                                                                                                                                                                        +-       X/Open Curses, Issue 4 describes these functions.  It defines no  error
+-       conditions.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+-       SVr4  specifies  only "an integer value other than ERR" as a successful
+-       return value.
++       SVr4  describes  a  successful  return  value only as "an integer value
++       other than ERR".
+ 
+        SVr4  indicates  that  the   optimization   of   physically   scrolling
+        immediately  if  the scroll region is the entire screen "is" performed,
+@@ -117,7 +117,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-22                   curs_scroll(3x)
++ncurses 6.5                       2025-01-18                   curs_scroll(3x)
+ 
                                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                                          
+Index: doc/html/man/curs_slk.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_slk.3x.html	2024-12-28 21:43:56.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_slk.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_slk 3x 2024-12-28 ncurses 6.5 Library calls
++curs_slk 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                          curs_slk 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                          
++
                                                                                                                                                                                                                                          curs_slk 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                                          + curs_slk(3x)                     Library calls                    curs_slk(3x)
+ 
+@@ -163,34 +163,31 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                          RETURN VALUE
                                                                                                                                                                                                                                          +-       Routines  that  return  an integer return ERR upon failure and OK (SVr4
+-       specifies only "an integer  value  other  than  ERR")  upon  successful
+-       completion.
++       Functions  that  return  integers  return  ERR upon failure and OK upon
++       success.
+ 
+-       X/Open Curses defines no error conditions.
+-
+-       In this implementation
++       In ncurses,
+ 
+           slk_attr
+                returns the attribute used for the soft keys.
+ 
+-          slk_attroff,  slk_attron,  slk_clear,  slk_noutrefresh, slk_refresh,
++          slk_attroff, slk_attron,  slk_clear,  slk_noutrefresh,  slk_refresh,
+           slk_touch
+-               return  ERR  if  the  terminal  or  the   softkeys   were   not
++               return   ERR   if   the  terminal  or  the  softkeys  were  not
+                initialized.
+ 
+           slk_attrset
+-               returns   ERR   if  the  terminal  or  the  softkeys  were  not
++               returns  ERR  if  the  terminal  or  the  softkeys   were   not
+                initialized.
+ 
+           slk_attr_set
+-               returns  ERR  if  the  terminal  or  the  softkeys   were   not
+-               initialized,   or   the   color   pair  is  outside  the  range
++               returns   ERR   if  the  terminal  or  the  softkeys  were  not
++               initialized,  or  the  color  pair   is   outside   the   range
+                0..COLOR_PAIRS-1.
+ 
+           slk_color
+-               returns  ERR  if  the  terminal  or  the  softkeys   were   not
+-               initialized,   or   the   color   pair  is  outside  the  range
++               returns   ERR   if  the  terminal  or  the  softkeys  were  not
++               initialized,  or  the  color  pair   is   outside   the   range
+                0..COLOR_PAIRS-1.
+ 
+           slk_init
+@@ -200,31 +197,34 @@
+                returns NULL on error.
+ 
+           slk_set
+-               returns  ERR  if  the  terminal  or  the  softkeys   were   not
+-               initialized,  or  the  labnum parameter is outside the range of
+-               label counts, or if the format parameter is outside  the  range
++               returns   ERR   if  the  terminal  or  the  softkeys  were  not
++               initialized, or the labnum parameter is outside  the  range  of
++               label  counts,  or if the format parameter is outside the range
+                0..2, or if memory for the labels cannot be allocated.
+ 
+ 
+ 
                                                                                                                                                                                                                                          NOTES
                                                                                                                                                                                                                                          +-       Most  applications  would  use  slk_noutrefresh  because  a wrefresh is
++       Most applications would  use  slk_noutrefresh  because  a  wrefresh  is
+        likely to follow soon.
+ 
+ 
+ 
                                                                                                                                                                                                                                          EXTENSIONS
                                                                                                                                                                                                                                          +-       X/Open Curses documents the opts argument as reserved for  future  use,
+-       saying  that  it must be null.  This implementation uses that parameter
+-       in ABI 6 for the functions which have a color pair parameter to support
+-       extended color pairs.
++       X/Open  Curses  documents the opts argument as reserved for future use,
++       saying that it must be a null pointer.  The ncurses 6 ABI uses  it  for
++       the  functions  that  accept a color pair parameter to support extended
++       color pairs.
+ 
+-       For  functions  which  modify the color, e.g., slk_attr_set, if opts is
+-       set it is treated as a pointer to int, and used to set the  color  pair
++       For functions which modify the color, e.g., slk_attr_set,  if  opts  is
++       set  it  is treated as a pointer to int, and used to set the color pair
+        instead of the short pair parameter.
+ 
+ 
+ 
                                                                                                                                                                                                                                          PORTABILITY
                                                                                                                                                                                                                                          +-       X/Open Curses, Issue 4 describes these functions, with some differences
+-       from SVr4 curses:
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
++
++       SVr4  describes  a  successful  return  value only as "an integer value
++       other than ERR".
+ 
+        o   X/Open  added  functions  like  the   SVr4   attribute-manipulation
+            functions  slk_attron,  slk_attroff, and slk_attrset, but which use
+@@ -312,7 +312,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                      curs_slk(3x)
++ncurses 6.5                       2025-01-18                      curs_slk(3x)
+ 
                                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                                            
+Index: doc/html/man/curs_sp_funcs.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_sp_funcs.3x.html	2024-05-11 21:39:57.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_sp_funcs.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_sp_funcs 3x 2024-05-11 ncurses 6.5 Library calls
++curs_sp_funcs 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                            curs_sp_funcs 3x 2024-05-11 ncurses 6.5 Library calls
                                                                                                                                                                                                                                            
++
                                                                                                                                                                                                                                            curs_sp_funcs 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                                            + curs_sp_funcs(3x)                Library calls               curs_sp_funcs(3x)
+ 
+@@ -117,7 +117,7 @@
+        int napms_sp(SCREEN* sp, int ms);
+        WINDOW* newpad_sp(SCREEN* sp, int nrows, int ncols);
+        SCREEN* new_prescr(void);
+-       SCREEN* newterm_sp(SCREEN* sp, const char *type, FILE *outfd, FILE *infd);
++       SCREEN* newterm_sp(SCREEN* sp, const char *type, FILE *outf, FILE *infd);
+ 
+        WINDOW* newwin_sp(SCREEN* sp, int nlines, int ncols, int begin_y, int begin_x);
+        int nl_sp(SCREEN* sp);
+@@ -294,7 +294,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-11                 curs_sp_funcs(3x)
++ncurses 6.5                       2025-01-18                 curs_sp_funcs(3x)
+ 
                                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                                              
+Index: doc/html/man/curs_termattrs.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_termattrs.3x.html	2024-12-28 21:43:56.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_termattrs.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_termattrs 3x 2024-12-28 ncurses 6.5 Library calls
++curs_termattrs 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                              curs_termattrs 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                              
++
                                                                                                                                                                                                                                              curs_termattrs 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                              + curs_termattrs(3x)               Library calls              curs_termattrs(3x)
+ 
+@@ -57,91 +57,107 @@
+ 
+        int baudrate(void);
+        char erasechar(void);
+-       int erasewchar(wchar_t *wc);
++       int erasewchar(wchar_t * wc);
+        bool has_ic(void);
+        bool has_il(void);
+        char killchar(void);
+-       int killwchar(wchar_t *wc);
+-       char *longname(void);
++       int killwchar(wchar_t * wc);
++       char * longname(void);
+        attr_t term_attrs(void);
+        chtype termattrs(void);
+-       char *termname(void);
++       char * termname(void);
+ 
+ 
+ 
                                                                                                                                                                                                                                              DESCRIPTION
                                                                                                                                                                                                                                              + 
+ 
                                                                                                                                                                                                                                              baudrate
                                                                                                                                                                                                                                              +-       The  baudrate  routine  returns  the output speed of the terminal.  The
+-       number returned is in bits per second, for  example  9600,  and  is  an
+-       integer.
++       baudrate  returns  the  line  speed  of  the terminal, an integer value
++       measured in bits per second, for example 9600.
+ 
+ 
+ 
                                                                                                                                                                                                                                              erasechar, erasewchar
                                                                                                                                                                                                                                              +-       The erasechar routine returns the user's current erase character.
++       erasechar returns the terminal's erase character.
+ 
+-       The  erasewchar  routine  stores  the  current  erase  character in the
+-       location referenced by wc.  If no erase character has been defined, the
+-       routine fails and the location referenced by wc is not changed.
++       erasewchar stores the erase character in the location referenced by wc.
++       If  no  erase  character  has  been  defined, it fails and the location
++       referenced by wc is not changed.
+ 
+ 
+ 
                                                                                                                                                                                                                                              has_ic, has_il
                                                                                                                                                                                                                                              +-       The  has_ic  routine  is  true  if the terminal has insert- and delete-
+-       character capabilities.
++       has_ic returns TRUE if the terminal has  insert-  and  delete-character
++       capabilities.
+ 
+-       The has_il 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 scrollok(3x).
++       has_il  returns  TRUE  if  the  terminal  has  insert-  and delete-line
++       capabilities, or can simulate them using scrolling regions.   It  might
++       be   used   to  determine  whether  it  would  be  appropriate  to  use
++       scrollok(3x) to turn on scrolling.
+ 
+ 
+ 
                                                                                                                                                                                                                                              killchar, killwchar
                                                                                                                                                                                                                                              +-       The killchar routine returns the user's current line kill character.
++       killchar returns the terminal's line kill character.
+ 
+-       The  killwchar  routine  stores  the current line-kill character in the
+-       location referenced by wc.  If no line-kill character has been defined,
+-       the routine fails and the location referenced by wc is not changed.
++       killwchar stores the line-kill character in the location referenced  by
++       wc.   If  no  line-kill  character  has  been defined, it fails and the
++       location referenced by wc is not changed.
+ 
+ 
+ 
                                                                                                                                                                                                                                              longname
                                                                                                                                                                                                                                              +-       The  longname  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 initscr or newterm.  The area is overwritten by  each  call  to
+-       newterm  and  is not restored by set_term, so the value should be saved
+-       between calls to newterm if longname is going to be used with  multiple
+-       terminals.
++       longname returns a pointer  to  static  storage  containing  a  verbose
++       description  of  the  terminal  being  managed  by curses.  The maximum
++       length of a verbose description is  128  characters.   The  storage  is
++       populated  only  after  initscr(3x)  or  newterm(3x)  is  called.  This
++       storage is overwritten by each call to  newterm  and  not  restored  by
++       set_term(3x),  so its contents should be saved between calls to initscr
++       or newterm if longname is to be used with multiple terminals.
+ 
+ 
+ 
                                                                                                                                                                                                                                              termattrs, term_attrs
                                                                                                                                                                                                                                              +-       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
+-       curses program needs  complete  control  over  the  appearance  of  the
+-       screen.
++       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.  termattrs and term_attrs return 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.
+ 
+ 
+ 
                                                                                                                                                                                                                                              termname
                                                                                                                                                                                                                                              +-       The termname routine returns the terminal name used by setupterm.
++       termname returns the terminal name used by setupterm(3x).
+ 
+ 
+ 
                                                                                                                                                                                                                                              RETURN VALUE
                                                                                                                                                                                                                                              +        longname and termname return NULL on error.
+ 
+-       Routines  that  return  an integer return ERR upon failure and OK (SVr4
+-       only specifies "an integer  value  other  than  ERR")  upon  successful
+-       completion.
++       Functions  that  return  an integer return ERR upon failure and OK upon
++       success.
+ 
+ 
+ 
                                                                                                                                                                                                                                              NOTES
                                                                                                                                                                                                                                              +-       Note that termattrs may be a macro.
++       erasewchar, killwchar, and  term_attrs  are  part  of  ncurses's  wide-
++       character API, and are not available in its non-wide configuration.
++
++       termattrs may be implemented as a macro.
+ 
+ 
+ 
                                                                                                                                                                                                                                              PORTABILITY
                                                                                                                                                                                                                                              +-       X/Open  Curses,  Issue  4  describes  these  functions.  It changes the
+-       return type of termattrs to the new  type  attr_t.   Most  versions  of
+-       curses truncate the result returned by termname to 14 characters.
++       X/Open Curses Issue 4 describes these functions.
++
++       SVr4  describes  a  successful  return  value only as "an integer value
++       other than ERR".
++
++       Most versions of curses truncate the string returned by termname to  14
++       characters.
++
++
++
                                                                                                                                                                                                                                              HISTORY
                                                                                                                                                                                                                                              ++       4BSD (1980) introduced longname.
++
++       SVr2 (1984) added baudrate, erasechar, killchar, has_ic, and has_il.
++
++       SVr3  (1987)  furnished  termname.   SVr3.1  later  that  year supplied
++       termattrs.
++
++       X/Open Curses  Issue 4  (1995)  specified  erasewchar,  killwchar,  and
++       term_attrs.
+ 
+ 
+ 
                                                                                                                                                                                                                                              SEE ALSO
                                                                                                                                                                                                                                              +@@ -149,7 +165,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                curs_termattrs(3x)
++ncurses 6.5                       2025-01-18                curs_termattrs(3x)
+ 
                                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                              
+ 
+ 
                                                                                                                                                                                                                                              
+Index: doc/html/man/curs_termcap.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_termcap.3x.html	2024-12-28 21:43:56.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_termcap.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_termcap 3x 2024-12-28 ncurses 6.5 Library calls
++curs_termcap 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                              curs_termcap 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                              
++
                                                                                                                                                                                                                                              curs_termcap 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                              + curs_termcap(3x)                 Library calls                curs_termcap(3x)
+ 
+@@ -63,7 +63,7 @@
+        int tgetent(char * bp, const char * name);
+        int tgetflag(const char * id);
+        int tgetnum(const char * id);
+-       char * tgetstr(const char * id, char ** area);
++       char * tgetstr(const char * id, char ** sbuf);
+        char * tgoto(const char * cap, int col, int row);
+        int tputs(const char * str, int affcnt, int (* putc)(int));
+ 
+@@ -90,18 +90,18 @@
+ 
+        This implementation differs from those of historical termcap libraries.
+ 
+-          o   ncurses  ignores  the  buffer  pointer  bp,  as do other termcap
+-              implementations conforming to  portions  of  X/Open  Curses  now
+-              withdrawn.   The  BSD  termcap library would store a copy of the
+-              terminal  type  description  in  the  area  referenced  by  this
+-              pointer.  terminfo stores terminal type descriptions in compiled
+-              form, which is not the same thing.
+-
+-          o   The meanings of the  return  values  differ.   The  BSD  termcap
+-              library  does  not  check  whether the terminal type description
+-              includes the generic (gn) capability, nor whether  the  terminal
+-              type  description  supports  an  addressable  cursor, a property
+-              essential for any curses implementation to operate.
++       o   ncurses  ignores  the  buffer  pointer  bp,  as  do  other  termcap
++           implementations  conforming  to  portions  of  X/Open  Curses   now
++           withdrawn.   The  BSD  termcap  library  would  store a copy of the
++           terminal type description in the buffer referenced by this pointer.
++           terminfo  stores terminal type descriptions in compiled form, which
++           is not the same thing.
++
++       o   The meanings of the return values differ.  The BSD termcap  library
++           does  not  check whether the terminal type description includes the
++           generic (gn) capability, nor whether the terminal type  description
++           supports an addressable cursor, a property essential for any curses
++           implementation to operate.
+ 
+ 
+ 
                                                                                                                                                                                                                                              Retrieving Capability Values
                                                                                                                                                                                                                                              +@@ -111,22 +111,22 @@
+        tgetnum obtains the numeric entry for id, or -1 if it is not available.
+ 
+        tgetstr  returns  the  string  entry  for  id,  or  NULL  if  it is not
+-       available.   Use  tputs  to  output  the  string  returned.   The  area
++       available.   Use  tputs  to  output  the  string  returned.   The  sbuf
+        parameter is used as follows.
+ 
+-          o   It is assumed to be the address of a pointer to a buffer managed
+-              by the calling application.
++       o   It is assumed to be the address of a pointer to a buffer managed by
++           the calling application.
+ 
+-          o   However, ncurses checks to ensure that area  is  not  NULL,  and
+-              also  that  the resulting buffer pointer is not NULL.  If either
+-              check fails, area is ignored.
+-
+-          o   If the checks succeed, ncurses also copies the return  value  to
+-              the  buffer  pointed to by area, and the library updates area to
+-              point past the null character terminating this value.
++       o   However, ncurses checks to ensure that sbuf is not NULL,  and  that
++           the  pointer  obtained  by dereferencing sbuf is also not NULL.  If
++           either check fails, ncurses ignores sbuf.
++
++       o   If the checks succeed, ncurses also copies the return value to  the
++           buffer  pointed  to  by sbuf, and the library updates sbuf to point
++           past the null character terminating this value.
+ 
+-          o   The return value itself is  an  address  in  the  terminal  type
+-              description loaded into memory.
++       o   The return  value  itself  is  an  address  in  the  terminal  type
++           description loaded into memory.
+ 
+ 
+ 
                                                                                                                                                                                                                                              Applying String Capabilities
                                                                                                                                                                                                                                              +@@ -168,34 +168,35 @@
+ 
+ 
                                                                                                                                                                                                                                              Global Variables
                                                                                                                                                                                                                                              +        tgetent sets the variables PC, UP, and BC 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 by delay_output(3x).  BC  is  used  by
+-       tgoto emulation.  ncurses assigns the variable ospeed a system-specific
+-       value to encode the terminal's data rate.
++       for  pad_char  (pad), cursor_up (cuu1), and backspace_if_not_bs (OTbs),
++       respectively.    ncurses   does    not    employ    cuu1    internally.
++       delay_output(3x)  uses  pad,  while  tgoto  emulation uses the obsolete
++       termcap capability bs,  represented  in  ncurses  terminfo  as  "OTbs".
++       ncurses  assigns  the variable ospeed a system-specific value to encode
++       the terminal's data rate.
+ 
+ 
+ 
                                                                                                                                                                                                                                              Releasing Memory
                                                                                                                                                                                                                                              +        The termcap functions provide  no  means  of  freeing  memory,  because
+-       legacy  termcap  implementations used only the buffer areas provided by
+-       the caller via tgetent and tgetstr.  Those buffers are unused in  term-
+-       info.
++       legacy  termcap  implementations  used only the storage provided by the
++       caller via tgetent and tgetstr.  Those buffers are unused in terminfo.
+ 
+-       By  contrast,  terminfo  allocates  memory.   It  uses setupterm(3x) to
+-       obtain the data  used  by  tgetent  and  the  functions  that  retrieve
++       By contrast, terminfo  allocates  memory.   It  uses  setupterm(3x)  to
++       obtain  the  data  used  by  tgetent  and  the  functions that retrieve
+        capability values.  One could use
+               del_curterm(cur_term);
+-       to  free  this  memory,  but  there  is an additional complication with
++       to free this memory, but  there  is  an  additional  complication  with
+        ncurses.  It uses a fixed-size pool of storage locations, one per value
+        of the terminal name parameter given to tgetent.  The screen(1) program
+        relies upon this arrangement to improve its performance.
+ 
+-       An application that uses only the termcap  functions,  not  the  higher
+-       level  curses  API,  could  release  the  memory using del_curterm(3x),
++       An  application  that  uses only the termcap functions, not the higher-
++       level curses API,  could  release  the  memory  using  del_curterm(3x),
+        because the pool is freed using other functions; see curs_memleaks(3x).
+ 
+ 
+ 
                                                                                                                                                                                                                                              RETURN VALUE
                                                                                                                                                                                                                                              +-       The return values of  tgetent,  tgetflag,  tgetname,  and  tgetstr  are
++       The  return  values  of  tgetent,  tgetflag,  tgetname, and tgetstr are
+        documented above.
+ 
+        tgoto returns NULL on error.  Error conditions include:
+@@ -206,7 +207,7 @@
+ 
+        o   cap referring to a canceled capability,
+ 
+-       o   cap  being  a  capability  with  string-valued  parameters (a term-
++       o   cap being a  capability  with  string-valued  parameters  (a  term-
+            info-only feature), and
+ 
+        o   cap being a capability with more than two parameters.
+@@ -215,37 +216,32 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                              NOTES
                                                                                                                                                                                                                                              +-       ncurses compares only the first two characters of the id  parameter  of
++       ncurses  compares  only the first two characters of the id parameter of
+        tgetflag, tgetnum, and tgetstr to the capability names in the database.
+ 
+ 
+ 
                                                                                                                                                                                                                                              PORTABILITY
                                                                                                                                                                                                                                              +-       These  functions  are  no  longer standardized (and the variables never
+-       were); ncurses provides them  to  support  legacy  applications.   They
+-       should not be used in new programs.
++       These functions are no longer standardized  (and  the  variables  never
++       were);  see  section "HISTORY" below.  ncurses provides them to support
++       legacy applications; they should not be used in new programs.
+ 
+-
+-
                                                                                                                                                                                                                                              Standards
                                                                                                                                                                                                                                              +-       o   X/Open   Curses,   Issue  4,  Version  2  (1996),  describes  these
+-           functions, marking them as "TO BE WITHDRAWN".
+-
+-       o   X/Open Curses, Issue 7 (2009) withdrew the termcap interface (along
+-           with the vwprintw and vwscanw functions).
++       SVr4 describes a successful return value  only  as  "an  integer  value
++       other than ERR".
+ 
+        Neither  X/Open  Curses  nor  the  SVr4 man pages documented the return
+        values of tgetent correctly, though all three shown here were  in  fact
+        returned  ever  since  SVr1.   In particular, an omission in the X/Open
+        Curses specification has  been  misinterpreted  to  mean  that  tgetent
+-       returns  OK  or  ERR.   Because  the  purpose  of these functions is to
++       returns  OK  or  ERR.   Because  the  purpose  of these functions is to
+        provide compatibility with the termcap library, that  is  a  defect  in
+-       X/Open Curses, Issue 4, Version 2 rather than in ncurses.
++       X/Open Curses Issue 4 Version 2 rather than in ncurses.
+ 
+-   Compatibility with BSD termcap
++   Compatibility with BSD termcap
+        ncurses  provides  externally  visible  variables  to  support  certain
+        termcap  applications.   However,  their  correct   usage   is   poorly
+        documented; for example, it is unclear when reading and writing them is
+        meaningful.  In particular, some applications are reported  to  declare
+-       and/or modify ospeed.
++       and/or modify ospeed.
+ 
+        The  constraint  that only the first two characters of the id parameter
+        are looked  up  in  the  terminal  database  escapes  many  application
+@@ -328,6 +324,12 @@
+        two  of  the four implementations thus differ, and programs that intend
+        to work with all termcap library interfaces must account for that fact.
+ 
++       X/Open Curses Issue 4, Version 2  (1996),  describes  these  functions,
++       marking them as "TO BE WITHDRAWN".
++
++       X/Open Curses Issue 7 (2009) withdrew the termcap interface (along with
++       the vwprintw and vwscanw functions).
++
+ 
+ 
                                                                                                                                                                                                                                              BUGS
                                                                                                                                                                                                                                              +        If  you  call  tgetstr  to  fetch  column_address  (ch)  or  any  other
+@@ -371,7 +373,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                  curs_termcap(3x)
++ncurses 6.5                       2025-01-18                  curs_termcap(3x)
+ 
                                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                                
+@@ -390,7 +392,6 @@
+ 
                                                                                                                                                                                                                                              • NOTES
                                                                                                                                                                                                                                                • 
+ 
                                                                                                                                                                                                                                              • PORTABILITY
+ 
+ 
                                                                                                                                                                                                                                                • 
+Index: doc/html/man/curs_terminfo.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_terminfo.3x.html	2024-12-28 21:54:09.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_terminfo.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_terminfo 3x 2024-12-28 ncurses 6.5 Library calls
++curs_terminfo 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                curs_terminfo 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                
++
                                                                                                                                                                                                                                                curs_terminfo 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                                + curs_terminfo(3x)                Library calls               curs_terminfo(3x)
+ 
+@@ -104,34 +104,35 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                DESCRIPTION
                                                                                                                                                                                                                                                +-       These low-level functions must be called by programs that deal directly
+-       with the terminfo database to  handle  certain  terminal  capabilities,
+-       such as programming function keys.  For all other functionality, curses
+-       functions are more suitable and their use is recommended.
++       These  lower-level  functions  of the curses standard must be called by
++       programs that deal  directly  with  the  terminfo  database  to  handle
++       certain  terminal capabilities, such as programming function keys.  For
++       all other functionality, curses functions are more suitable  and  their
++       use is recommended.
+ 
+-       None of these functions use  (or  are  aware  of)  multibyte  character
++       None  of  these  functions  use  (or  are aware of) multibyte character
+        strings such as UTF-8.
+ 
+        o   Capability names and codes use the POSIX portable character set.
+ 
+-       o   Capability  string  values  have  no  associated encoding; they are
++       o   Capability string values have  no  associated  encoding;  they  are
+            strings of 8-bit characters.
+ 
+ 
+ 
                                                                                                                                                                                                                                                Initialization
                                                                                                                                                                                                                                                +-       Call setupterm from  your  application  to  have  terminfo  manage  the
+-       terminal   device;   this  action  initializes  the  terminal-dependent
+-       variables listed in term_variables(3x).  (A curses application  calling
++       Call  setupterm  from  your  application  to  have  terminfo manage the
++       terminal  device;  this  action  initializes   the   terminal-dependent
++       variables  listed in term_variables(3x).  (A curses application calling
+        initscr(3x) or newterm(3x) achieves the same result.)  Applications can
+-       use the terminal capabilities either directly,  by  object  definitions
++       use  the  terminal  capabilities either directly, by object definitions
+        corresponding to capability names and codes (see term_variables(3x)) or
+-       by calling the functions documented here.   setupterm  initializes  the
++       by  calling  the  functions documented here.  setupterm initializes the
+        terminfo variables lines and columns as described in use_env(3x).
+ 
+-       Pass   parameterized   string   capability   values  through  tparm  to
++       Pass  parameterized  string  capability   values   through   tparm   to
+        instantiate them.  All terminfo strings (including the output of tparm)
+-       should  be  sent  to  the  terminal  device  with  tputs or putp.  Call
+-       reset_shell_mode(3x) to restore the terminal modes before exiting.   (A
++       should be sent to  the  terminal  device  with  tputs  or  putp.   Call
++       reset_shell_mode(3x)  to restore the terminal modes before exiting.  (A
+        curses application calling endwin(3x) achieves the same result.)
+ 
+        Programs that use cursor addressing should emit certain capabilities at
+@@ -143,53 +144,53 @@
+ 
+        Programs that execute shell subprocesses should
+ 
+-       o   call reset_shell_mode(3x) and output exit_ca_mode before the  shell
++       o   call  reset_shell_mode(3x) and output exit_ca_mode before the shell
+            is called, and
+ 
+-       o   output  enter_ca_mode  and call reset_prog_mode(3x) after returning
++       o   output enter_ca_mode and call reset_prog_mode(3x)  after  returning
+            from the shell.
+ 
+-       setupterm reads in the terminfo  database,  initializing  the  terminfo
+-       structures,  but  does  not set up the output virtualization structures
++       setupterm  reads  in  the  terminfo database, initializing the terminfo
++       structures, but does not set up the  output  virtualization  structures
+        used by curses.  Its parameters follow.
+ 
+           term is the terminal type, a character string.  If term is null, the
+                environment variable TERM is read.
+ 
+           filedes
+-               is  the  file  descriptor used for getting and setting terminal
++               is the file descriptor used for getting  and  setting  terminal
+                I/O modes.
+ 
+-               Higher-level applications use  newterm(3x)  to  initialize  the
+-               terminal,  passing  an  output stream rather than a descriptor.
+-               In  curses,  the  two  are  the  same  because  newterm   calls
+-               setupterm,  passing the file descriptor derived from its output
++               Higher-level  applications  use  newterm(3x)  to initialize the
++               terminal, passing an output stream rather  than  a  descriptor.
++               In   curses,  the  two  are  the  same  because  newterm  calls
++               setupterm, passing the file descriptor derived from its  output
+                stream parameter.
+ 
+           errret
+-               points to an optional location where an  error  status  can  be
+-               returned  to the caller.  If errret is not null, then setupterm
+-               returns OK or ERR and stores a  status  value  in  the  integer
+-               pointed  to  by  errret.   A  return  value of OK combined with
++               points  to  an  optional  location where an error status can be
++               returned to the caller.  If errret is not null, then  setupterm
++               returns  OK  or  ERR  and  stores a status value in the integer
++               pointed to by errret.  A  return  value  of  OK  combined  with
+                status of 1 in errret is normal.
+ 
+-               If ERR is returned, examine errret:
++               If ERR is returned, examine errret.
+ 
+                1    means  that  the  terminal  is  a  hard-copy  type  (lacks
+-                    destructive  backspace),  and  cannot  be  used for curses
+-                    applications.   The  library  determines  this   fact   by
++                    destructive backspace), and  cannot  be  used  for  curses
++                    applications.    The   library  determines  this  fact  by
+                     checking the terminal type's hardcopy (hc) capability.
+ 
+-               0    means  that the terminal could not be found, or that it is
+-                    a generic type, having too little information  for  curses
++               0    means that the terminal could not be found, or that it  is
++                    a  generic  type, having too little information for curses
+                     applications to run.
+ 
+-                    setupterm  determines  if  the  entry is a generic type by
++                    setupterm determines if the entry is  a  generic  type  by
+                     checking the generic_type (gn) capability.
+ 
+                -1   means that the terminfo database could not be found.
+ 
+-               If errret is null, setupterm  reports  an  error  message  upon
++               If  errret  is  null,  setupterm  reports an error message upon
+                finding an error and exits.  Thus, the simplest call is:
+ 
+                       setupterm((char *) NULL, 1, (int *) NULL);
+@@ -198,83 +199,83 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                The Terminal State
                                                                                                                                                                                                                                                +-       setupterm  stores  its  information  about  the  terminal in a TERMINAL
++       setupterm stores its information  about  the  terminal  in  a  TERMINAL
+        structure pointed to by the global variable cur_term.  If it detects an
+        error,  or  decides  that  the  terminal  is  unsuitable  (hardcopy  or
+-       generic), it  discards  this  information,  making  it  unavailable  to
++       generic),  it  discards  this  information,  making  it  unavailable to
+        applications.
+ 
+        If setupterm is called repeatedly for the same terminal type, it reuses
+-       the information.   It  maintains  only  one  copy  of  a  given  type's
+-       capabilities  in  memory.   If  called  for  different types, setupterm
++       the  information.   It  maintains  only  one  copy  of  a  given type's
++       capabilities in memory.   If  called  for  different  types,  setupterm
+        allocates new storage for each set of terminal capabilities.
+ 
+        set_curterm sets cur_term to nterm, making all of the terminfo Boolean,
+        numeric, and string capabilities use the values from nterm.  It returns
+        the old value of cur_term.
+ 
+-       del_curterm frees the memory pointed to by oterm, making  it  available
+-       for  further  use.  If oterm is the same as cur_term, references to any
+-       of the terminfo Boolean, numeric, and  string  capabilities  thereafter
++       del_curterm  frees  the memory pointed to by oterm, making it available
++       for further use.  If oterm is the same as cur_term, references  to  any
++       of  the  terminfo  Boolean, numeric, and string capabilities thereafter
+        may refer to invalid memory locations until setupterm is called again.
+ 
+-       restartterm  is  similar  to  setupterm,  but is intended for use after
+-       restoring program  memory  to  a  previous  state  (for  example,  when
+-       reloading  an  application  that  has  been suspended from one terminal
++       restartterm is similar to setupterm, but  is  intended  for  use  after
++       restoring  program  memory  to  a  previous  state  (for  example, when
++       reloading an application that has  been  suspended  from  one  terminal
+        session and restored in another).  restartterm assumes that the display
+        dimensions and the input and output options are the same as when memory
+-       was  saved,  but  the  terminal  type  and  line  speed   may   differ.
+-       Accordingly,   restartterm   saves   relevant   terminal  state,  calls
++       was   saved,   but  the  terminal  type  and  line  speed  may  differ.
++       Accordingly,  restartterm  saves   relevant   terminal   state,   calls
+        setupterm, then restores that state.
+ 
+ 
+ 
                                                                                                                                                                                                                                                Formatting Output
                                                                                                                                                                                                                                                +-       tparm instantiates the string str with parameters  pi.   A  pointer  is
++       tparm  instantiates  the  string  str with parameters pi.  A pointer is
+        returned to the result of str with the parameters applied.  Application
+        developers should keep in mind these quirks of the interface:
+ 
+-       o   Although tparm's actual parameters may be integers or strings,  the
++       o   Although  tparm's actual parameters may be integers or strings, the
+            prototype expects long (integer) values.
+ 
+-       o   Aside  from  the  set_attributes  (sgr)  capability,  most terminal
++       o   Aside from  the  set_attributes  (sgr)  capability,  most  terminal
+            capabilities require no more than one or two parameters.
+ 
+-       o   Padding information is ignored  by  tparm;  it  is  interpreted  by
++       o   Padding  information  is  ignored  by  tparm;  it is interpreted by
+            tputs.
+ 
+-       o   The  capability  string  is  null-terminated.   Use "\200" where an
++       o   The capability string is  null-terminated.   Use  "\200"  where  an
+            ASCII NUL is needed in the output.
+ 
+-       tiparm is a newer form of tparm  which  uses  stdarg.h  rather  than  a
+-       fixed-parameter  list.   Its  numeric  parameters  are ints rather than
++       tiparm  is  a  newer  form  of  tparm which uses stdarg.h rather than a
++       fixed-parameter list.  Its numeric  parameters  are  ints  rather  than
+        longs.
+ 
+-       Both tparm and tiparm assume that  the  application  passes  parameters
+-       consistent  with the terminal description.  Two extensions are provided
++       Both  tparm  and  tiparm  assume that the application passes parameters
++       consistent with the terminal description.  Two extensions are  provided
+        as alternatives to deal with untrusted data.
+ 
+-       o   tiparm_s is an extension which is a safer formatting function  than
++       o   tiparm_s  is an extension which is a safer formatting function than
+            tparm or tiparm, because it allows the developer to tell the curses
+-           library how many parameters to expect in the  parameter  list,  and
++           library  how  many  parameters to expect in the parameter list, and
+            which may be string parameters.
+ 
+-           The  mask  parameter has one bit set for each of the parameters (up
++           The mask parameter has one bit set for each of the  parameters  (up
+            to 9) passed as char pointers rather than numbers.
+ 
+-       o   The  extension  tiscan_s  allows  the  application  to  inspect   a
++       o   The   extension  tiscan_s  allows  the  application  to  inspect  a
+            formatting capability to see what the curses library would assume.
+ 
+ 
+ 
                                                                                                                                                                                                                                                Output Functions
                                                                                                                                                                                                                                                +-       String  capabilities  can  contain padding, a time delay (accommodating
++       String capabilities can contain padding, a  time  delay  (accommodating
+        performance limitations of hardware terminals) expressed as $<n>, where
+        n is a nonnegative integral count of milliseconds.  If n exceeds 30,000
+        (thirty seconds), it is capped at that value.
+ 
+-       tputs interprets time-delay information in the string str  and  outputs
++       tputs  interprets  time-delay information in the string str and outputs
+        it, executing the delays:
+ 
+-       o   The  str parameter must be a terminfo string variable or the return
++       o   The str parameter must be a terminfo string variable or the  return
+            value of tparm or tiparm.
+ 
+        o   affcnt is the number of lines affected, or 1 if not applicable.
+@@ -282,8 +283,8 @@
+        o   putc is a putchar-like function to which the characters are passed,
+            one at a time.
+ 
+-           If  tputs  processes  a  time-delay,  it  uses the delay_output(3x)
+-           function, routing any resulting  padding  characters  through  this
++           If tputs processes  a  time-delay,  it  uses  the  delay_output(3x)
++           function,  routing  any  resulting  padding characters through this
+            function.
+ 
+        putp calls "tputs(str, 1, putchar)".  The output of putp always goes to
+@@ -295,30 +296,30 @@
+ 
+        vidattr is like vidputs, except that it outputs through putchar(3).
+ 
+-       vid_attr and vid_puts correspond to vidattr and vidputs,  respectively.
+-       They  use multiple parameters to represent the character attributes and
++       vid_attr  and vid_puts correspond to vidattr and vidputs, respectively.
++       They use multiple parameters to represent the character attributes  and
+        color; namely,
+ 
+        o   attrs, of type attr_t, for the attributes and
+ 
+        o   pair, of type short, for the color pair number.
+ 
+-       Use the attribute constants  prefixed  with  "WA_"  with  vid_attr  and
++       Use  the  attribute  constants  prefixed  with  "WA_" with vid_attr and
+        vid_puts.
+ 
+-       X/Open  Curses  reserves  the opts argument for future use, saying that
+-       applications must provide a null pointer for  that  argument;  but  see
++       X/Open Curses reserves the opts argument for future  use,  saying  that
++       applications  must  provide  a  null pointer for that argument; but see
+        section "EXTENSIONS" below.
+ 
+-       While  putp is a low-level function that does not use high-level curses
+-       state, ncurses declares it in curses.h because System V did  this  (see
+-       section "HISTORY" below).
++       While putp is a lower-level function that  does  not  use  higher-level
++       curses  state,  ncurses declares it in curses.h because System V did so
++       (see section "HISTORY" below).
+ 
+ 
+ 
                                                                                                                                                                                                                                                Terminal Capability Functions
                                                                                                                                                                                                                                                +-       tigetflag,  tigetnum,  and  tigetstr return the value of the capability
+-       corresponding to the terminfo cap-code, such as xenl, passed  to  them.
+-       The  cap-code  for each capability is given in the table column of that
++       tigetflag, tigetnum, and tigetstr return the value  of  the  capability
++       corresponding  to  the terminfo cap-code, such as xenl, passed to them.
++       The cap-code for each capability is given in the table column  of  that
+        name in the "Predefined Capabilities" section of terminfo(5).
+ 
+        These functions return special values to denote errors.
+@@ -361,29 +362,32 @@
+ 
+ 
                                                                                                                                                                                                                                                Releasing Memory
                                                                                                                                                                                                                                                +        Each successful call to setupterm allocates memory to hold the terminal
+-       description.   As  a  side  effect,  it  sets cur_term to point to this
++       description.  As a side effect, it  sets  cur_term  to  point  to  this
+        memory.  If an application calls
+               del_curterm(cur_term);
+        the memory will be freed.
+ 
+-       The formatting functions tparm and tiparm extend the storage  allocated
++       The  formatting functions tparm and tiparm extend the storage allocated
+        by setupterm as follows.
+ 
+-       o   They  add  the  "static"  terminfo variables [a-z].  Before ncurses
++       o   They add the "static" terminfo  variables  [a-z].   Before  ncurses
+            6.3, those were shared by all screens.  With ncurses 6.3, those are
+            allocated per screen.  See terminfo(5).
+ 
+-       o   To  improve performance, ncurses 6.3 caches the result of analyzing
+-           terminfo strings for their parameter types.  That is  stored  as  a
++       o   To improve performance, ncurses 6.3 caches the result of  analyzing
++           terminfo  strings  for  their parameter types.  That is stored as a
+            binary tree referenced from the TERMINAL structure.
+ 
+        The higher-level initscr and newterm functions use setupterm.  Normally
+-       they do not free this memory, but it is possible to do that  using  the
++       they  do  not free this memory, but it is possible to do that using the
+        delscreen(3x) function.
+ 
+ 
+ 
                                                                                                                                                                                                                                                RETURN VALUE
                                                                                                                                                                                                                                                +-       X/Open Curses defines no failure conditions.  In ncurses,
++       Functions that return integers return ERR  upon  failure  and  OK  upon
++       success.
++
++       In ncurses,
+ 
+        del_curtem
+             fails if its terminal parameter is null.
+@@ -418,8 +422,8 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                EXTENSIONS
                                                                                                                                                                                                                                                +-       The  functions  marked as extensions were designed for ncurses, and are
+-       not found in SVr4 curses, 4.4BSD curses, or any other  previous  curses
++       The  functions  marked as extensions originated in ncurses, and are not
++       found in SVr4 curses, 4.4BSD  curses,  or  any  other  previous  curses
+        implementation.
+ 
+        ncurses  allows  opts  to be a pointer to int, which overrides the pair
+@@ -427,35 +431,38 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                PORTABILITY
                                                                                                                                                                                                                                                +-       setterm is not described by X/Open and must be considered non-portable.
+-       All other functions are as described by X/Open.
++       Except for setterm, X/Open Curses Issue 4  describes  these  functions.
++       It specifies no error conditions for them.
++
++       SVr4 describes a successful return value except where "otherwise noted"
++       as "an integer value other than ERR".
+ 
+ 
+ 
                                                                                                                                                                                                                                                Header Files
                                                                                                                                                                                                                                                +-       On  legacy curses systems, include curses.h and term.h in that order to
+-       get the definitions for these strings, numbers, and flags.
++       On legacy curses systems, include curses.h and term.h in that order  to
++       make   visible  the  definitions  of  the  string  arrays  storing  the
++       capability names and codes.
+ 
+ 
+ 
                                                                                                                                                                                                                                                Compatibility Macros
                                                                                                                                                                                                                                                +-       This implementation  provides  a  few  macros  for  compatibility  with
+-       systems  before  SVr4  (see  section  "HISTORY"  below).   They include
+-       Bcrmode, Bfixterm, Bgettmode, Bnocrmode,  Bresetterm,  Bsaveterm,  and"
+-       Bsetterm.   ncurses  implements each of these symbols as macros for BSD
+-       curses compatibility.
++       ncurses implements a few macros for early System V curses compatibility
++       (see section "HISTORY" below).  They include crmode, fixterm, gettmode,
++       nocrmode, resetterm, saveterm, and setterm.
+ 
+        In SVr4, these are found in  curses.h,  but  except  for  setterm,  are
+        likewise macros.  The one function, setterm, is mentioned in the manual
+        page.  It further notes that setterm was replaced by setupterm, stating
+        that the call
+-              setupterm(term, 1, (int *)0)
++              setupterm(term, 1, (int *)0)
++
+        provides the same functionality as
+-              setterm(term)
++              setterm(term)
+        and discouraging the latter for new programs.
+ 
+ 
+ 
                                                                                                                                                                                                                                                Legacy Data
                                                                                                                                                                                                                                                +-       setupterm  copies  the terminal name to the array ttytype.  This is not
+-       part of X/Open Curses, but is assumed by some applications.
++       setupterm copies the terminal name to the array ttytype.  This behavior
++       is not specified by X/Open Curses, but is assumed by some applications.
+ 
+        Other implementions may not declare the capability name  arrays.   Some
+        provide  them  without  declaring them.  X/Open Curses does not specify
+@@ -467,17 +474,17 @@
+ 
+ 
                                                                                                                                                                                                                                                Output Buffering
                                                                                                                                                                                                                                                +        Older  versions  of  ncurses assumed that the file descriptor passed to
+-       setupterm from initscr or newterm uses buffered I/O, and would write to
+-       the  corresponding  stream.   In  addition  to  the limitation that the
++       setupterm from initscr or newterm used buffered I/O, and wrote  to  the
++       corresponding  stdio  stream.   In  addition to the limitation that the
+        terminal was  left  in  block-buffered  mode  on  exit  (like  System V
+        curses),  it  was  problematic because ncurses did not allow a reliable
+-       way to clean up on receiving SIGTSTP.
++       way to clean up on receiving SIGTSTP.
+ 
+-       ncurses 6.x uses output buffers managed directly by ncurses.   Some  of
+-       the  low-level  functions  described  in  this manual page write to the
+-       standard output.  They are not signal-safe.  The  high-level  functions
+-       in  ncurses employ alternate versions of these functions using the more
+-       reliable buffering scheme.
++       ncurses 6.x uses output  buffers  managed  directly  by  ncurses.   The
++       lower-level  functions described here that write to the terminal device
++       do so via the standard output stream; they thus  are  not  signal-safe.
++       The  higher-level  functions  in  ncurses  employ alternate versions of
++       these functions using a more reliable buffering scheme.
+ 
+ 
+ 
                                                                                                                                                                                                                                                Function Prototypes
                                                                                                                                                                                                                                                +@@ -493,81 +500,80 @@
+            from  compiling.   On  the  other  hand,  "writable strings" are an
+            obsolescent C language feature.
+ 
+-           As an extension, this implementation can be  configured  to  change
+-           the  function prototypes to use the const keyword.  The ncurses ABI
+-           6 enables this feature by default.
++           As an extension, ncurses can be configured to change  the  function
++           prototypes  to  use  the  const keyword.  The ncurses ABI 6 enables
++           this feature by default.
+ 
+        o   X/Open Curses prototypes tparm with a fixed number  of  parameters,
+            rather than a variable argument list.
+ 
+-           This  implementation  uses  a  variable  argument  list, but can be
+-           configured to use the fixed-parameter list.  Portable  applications
+-           should  provide  nine  parameters after the format; zeroes are fine
+-           for this purpose.
++           ncurses uses a variable argument list, but can be configured to use
++           the fixed-parameter list.   Portable  applications  should  provide
++           nine parameters after the format; zeroes are fine for this purpose.
+ 
+-           In response to review comments by Thomas E. Dickey,  X/Open  Curses
++           In  response  to review comments by Thomas E. Dickey, X/Open Curses
+            Issue 7 proposed the tiparm function in mid-2009.
+ 
+-           While  tiparm  is  always  provided  in  ncurses, the older form is
+-           available only  as  a  build-time  configuration  option.   If  not
++           While tiparm is always provided  in  ncurses,  the  older  form  is
++           available  only  as  a  build-time  configuration  option.   If not
+            specially configured, tparm is the same as tiparm.
+ 
+        Both forms of tparm have drawbacks.
+ 
+-       o   Most  calls  to  tparm require only one or two parameters.  Passing
++       o   Most calls to tparm require only one or  two  parameters.   Passing
+            nine on each call is awkward.
+ 
+-           Using long for the numeric parameter type is a workaround  to  make
+-           the  parameter  use  the  same amount of stack memory as a pointer.
+-           That approach dates to the mid-1980s, before  C  was  standardized.
+-           Since  ANSI C (1989), C language standards do not require a pointer
++           Using  long  for the numeric parameter type is a workaround to make
++           the parameter use the same amount of stack  memory  as  a  pointer.
++           That  approach  dates  to the mid-1980s, before C was standardized.
++           Since ANSI C (1989), C language standards do not require a  pointer
+            to fit in a long).
+ 
+-       o   Providing the right number of parameters for  a  variadic  function
++       o   Providing  the  right  number of parameters for a variadic function
+            such  as  tiparm  can  be  a  problem,  in  particular  for  string
+-           parameters.  However, only a few terminfo capabilities  use  string
+-           parameters  (for  instance, the ones used for programmable function
++           parameters.   However,  only a few terminfo capabilities use string
++           parameters (for instance, the ones used for  programmable  function
+            keys).
+ 
+            The ncurses library checks usage of these capabilities, and returns
+-           ERR  if the capability mishandles string parameters.  But it cannot
++           ERR if the capability mishandles string parameters.  But it  cannot
+            check if a calling program provides strings in the right places for
+            the tparm calls.
+ 
+-           ncurses's  tput(1)  checks  its  use  of  these capabilities with a
++           ncurses's tput(1) checks its  use  of  these  capabilities  with  a
+            table, so that it calls tparm correctly.
+ 
+    Special TERM treatment
+-       If ncurses is configured to use the terminal driver, as with the  MinGW
++       If  ncurses is configured to use the terminal driver, as with the MinGW
+        port,
+ 
+-       o   setupterm  interprets  a missing/empty TERM variable as the special
++       o   setupterm interprets a missing/empty TERM variable as  the  special
+            value "unknown".
+ 
+            SVr4 curses uses the special value "dumb".
+ 
+-           The difference  between  the  two  is  that  the  former  uses  the
+-           generic_type  (gn)  terminfo capability, while the latter does not.
++           The  difference  between  the  two  is  that  the  former  uses the
++           generic_type (gn) terminfo capability, while the latter  does  not.
+            A generic terminal is unsuitable for full-screen applications.
+ 
+-       o   setupterm allows explicit use  of  the  Microsoft  Windows  console
+-           driver  by  checking  whether the TERM environment variable has the
++       o   setupterm  allows  explicit  use  of  the Microsoft Windows console
++           driver by checking whether the TERM environment  variable  has  the
+            value "#win32con" or an abbreviation of that string.
+ 
+ 
+ 
                                                                                                                                                                                                                                                Other Portability Issues
                                                                                                                                                                                                                                                +-       In SVr4, set_curterm returns an int, OK or  ERR.   We  have  chosen  to
++       In  SVr4,  set_curterm  returns  an  int, OK or ERR.  We have chosen to
+        implement the X/Open Curses semantics.
+ 
+        In SVr4, the third argument of tputs has the type "int (*)(char)".
+ 
+-       At  least one implementation of X/Open Curses (Solaris xcurses) returns
+-       a value other than OK or ERR from tputs.  It instead returns the length
++       At least one implementation of X/Open Curses (Solaris xcurses)  returns
++       a value other than OK or ERR from tputs.  It instead returns the length
+        of the string, and does no error checking.
+ 
+ 
+ 
                                                                                                                                                                                                                                                HISTORY
                                                                                                                                                                                                                                                +-       SVr2  (1984)  introduced  the terminfo feature.  Its programming manual
++       SVr2 (1984) introduced the terminfo feature.   Its  programming  manual
+        mentioned the following low-level functions.
+ 
+        Function    Description
+@@ -587,7 +593,7 @@
+        vidattr     like vidputs, but output through putchar
+        vidputs     write string to terminal, applying specified attributes
+ 
+-       The programming manual also mentioned functions  provided  for  termcap
++       The  programming  manual  also mentioned functions provided for termcap
+        compatibility (commenting that they "may go away at a later date").
+ 
+        Function   Description
+@@ -599,11 +605,11 @@
+        tgoto      apply parameters to given capability
+        tputs      write characters via a function parameter, applying padding
+ 
+-       Early  terminfo  programs  obtained capability values from the TERMINAL
++       Early terminfo programs obtained capability values  from  the  TERMINAL
+        structure initialized by setupterm.
+ 
+-       SVr3  (1987)  extended  terminfo  by  adding  functions   to   retrieve
+-       capability  values  (like the termcap interface), and reusing tgoto and
++       SVr3   (1987)   extended  terminfo  by  adding  functions  to  retrieve
++       capability values (like the termcap interface), and reusing  tgoto  and
+        tputs.
+ 
+        Function    Description
+@@ -612,7 +618,7 @@
+        tigetnum    get numeric entry for given id
+        tigetstr    get string entry for given id
+ 
+-       SVr3 also replaced several of the SVr2 terminfo functions that  had  no
++       SVr3  also  replaced several of the SVr2 terminfo functions that had no
+        counterpart in the termcap interface, documenting them as obsolete.
+ 
+        Function    Replaced by
+@@ -625,37 +631,37 @@
+        saveterm    def_prog_mode
+        setterm     setupterm
+ 
+-       SVr3  kept  the mvcur, vidattr, and vidputs functions, along with putp,
+-       tparm, and tputs.  The latter were needed to support  padding,  and  to
+-       handle  capabilities  accessed by functions such as vidattr (which used
++       SVr3 kept the mvcur, vidattr, and vidputs functions, along  with  putp,
++       tparm,  and  tputs.   The latter were needed to support padding, and to
++       handle capabilities accessed by functions such as vidattr  (which  used
+        more than the two parameters supported by tgoto).
+ 
+-       SVr3  introduced  the  functions   for   switching   between   terminal
+-       descriptions;   for   example,  set_curterm.   Some  changes  reflected
++       SVr3   introduced   the   functions   for  switching  between  terminal
++       descriptions;  for  example,  set_curterm.   Some   changes   reflected
+        incremental improvements to the SVr2 library.
+ 
+-       o   The TERMINAL type definition was introduced  in  SVr3.01,  for  the
++       o   The  TERMINAL  type  definition  was introduced in SVr3.01, for the
+            term structure provided in SVr2.
+ 
+-       o   Various  global  variables  such as boolnames were mentioned in the
+-           programming manual at this point, though  the  variables  had  been
++       o   Various global variables such as boolnames were  mentioned  in  the
++           programming  manual  at  this  point, though the variables had been
+            provided in SVr2.
+ 
+        SVr4 (1989) added the vid_attr and vid_puts functions.
+ 
+-       Other  low-level  functions  are declared in the curses header files of
+-       Unix systems, but none are documented.  Those noted  as  "obsolete"  by
++       Other low-level functions are declared in the curses  header  files  of
++       Unix  systems,  but  none are documented.  Those noted as "obsolete" by
+        SVr3 remained in use by System V's vi(1) editor.
+ 
+ 
+ 
                                                                                                                                                                                                                                                SEE ALSO
                                                                                                                                                                                                                                                +        curses(3x),   curs_initscr(3x),   curs_kernel(3x),   curs_memleaks(3x),
+-       curs_termcap(3x),  curs_variables(3x),   putc(3),   term_variables(3x),
++       curs_termcap(3x),   curs_variables(3x),   putc(3),  term_variables(3x),
+        terminfo(5)
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                 curs_terminfo(3x)
++ncurses 6.5                       2025-01-18                 curs_terminfo(3x)
+ 
                                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                                  
+Index: doc/html/man/curs_touch.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_touch.3x.html	2024-12-28 21:43:56.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_touch.3x.html	2025-01-19 00:54:59.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_touch 3x 2024-12-28 ncurses 6.5 Library calls
++curs_touch 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                  curs_touch 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                  
++
                                                                                                                                                                                                                                                  curs_touch 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                                  + curs_touch(3x)                   Library calls                  curs_touch(3x)
+ 
+@@ -89,43 +89,48 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                  RETURN VALUE
                                                                                                                                                                                                                                                  +-       All  routines  return the integer ERR upon failure and an integer value
+-       other than ERR upon successful completion, unless  otherwise  noted  in
+-       the preceding routine descriptions.
++       Functions  returning  integers  return  ERR  upon  failure  and OK upon
++       success.
+ 
+-       In this implementation
++       In ncurses,
+ 
+           is_linetouched
+-               returns  ERR  if  the  window  pointer  is null, or if the line
++               returns ERR if the window pointer  is  null,  or  if  the  line
+                number is outside the window boundaries.
+ 
+                The constant ERR is distinct from TRUE and FALSE, which are the
+-               normal  return  values  of this function.  Because the function
++               normal return values of this function.   Because  the  function
+                returns a bool, returning ERR (which is neither TRUE nor FALSE)
+                may not be supported by the compiler.
+ 
+-               To  provide  error-checking  and also match the X/Open function
++               To provide error-checking and also match  the  X/Open  function
+                prototype, the ERR is provided by a macro named is_linetouched.
+                The actual function returns FALSE when it detects an error.
+ 
+           wtouchln
+-               returns  ERR  if  the  window  pointer  is null, or if the line
++               returns ERR if the window pointer  is  null,  or  if  the  line
+                number is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                                                                                                                  NOTES
                                                                                                                                                                                                                                                  +-       All of these routines except wtouchln may be macros.
++       All of these functions except wtouchln may be implemented as macros.
+ 
+ 
+ 
                                                                                                                                                                                                                                                  PORTABILITY
                                                                                                                                                                                                                                                  +-       These functions were introduced by SVr4.   The  Solaris  curses  header
+-       file, for instance, defines both an actual function and macro for each.
+-       The macros give the same result as the actual functions.   SVr4  curses
+-       does  not check the window parameter win to ensure that it is not NULL;
+-       otherwise this implementation behaves the same as SVr4.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+-       error conditions for them.
++       SVr4 describes a successful return value except where "otherwise noted"
++       as "an integer value other than ERR".
++
++       SVr4 does not check win to ensure that it is not a null pointer.
++
++
++
                                                                                                                                                                                                                                                  HISTORY
                                                                                                                                                                                                                                                  ++       SVr2 (1984) introduced touchwin,
++
++       SVr3   (1987)   added  touchline.   SVr3.1  later  that  year  supplied
++       is_linetouched, is_wintouched, untouchwin, and wtouchln.
+ 
+ 
+ 
                                                                                                                                                                                                                                                  SEE ALSO
                                                                                                                                                                                                                                                  +@@ -133,7 +138,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                    curs_touch(3x)
++ncurses 6.5                       2025-01-18                    curs_touch(3x)
+ 
                                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                                  
+ 
+ 
                                                                                                                                                                                                                                                  
+Index: doc/html/man/curs_trace.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_trace.3x.html	2024-12-28 21:43:56.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_trace.3x.html	2025-01-19 00:55:00.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_trace 3x 2024-12-28 ncurses 6.5 Library calls
++curs_trace 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                  curs_trace 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                  
++
                                                                                                                                                                                                                                                  curs_trace 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                                  + curs_trace(3x)                   Library calls                  curs_trace(3x)
+ 
+@@ -121,8 +121,8 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                  Trace Parameter
                                                                                                                                                                                                                                                  +-       The trace parameter is  formed  by  OR'ing  values  from  the  list  of
+-       TRACE_xxx definitions in <curses.h>.  These include:
++       The trace parameter is formed by logically  "or"-ing  values  from  the
++       list of TRACE_xxx definitions in <curses.h>.  These include:
+ 
+        TRACE_DISABLE
+             turn off tracing by passing a zero parameter.
+@@ -261,7 +261,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                    curs_trace(3x)
++ncurses 6.5                       2025-01-18                    curs_trace(3x)
+ 
                                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                                    
+Index: doc/html/man/curs_util.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_util.3x.html	2024-12-28 21:54:09.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_util.3x.html	2025-01-19 00:55:00.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_util 3x 2024-12-28 ncurses 6.5 Library calls
++curs_util 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                    curs_util 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                    
++
                                                                                                                                                                                                                                                    curs_util 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                                                    + curs_util(3x)                    Library calls                   curs_util(3x)
+ 
+@@ -56,72 +56,82 @@
+ 
                                                                                                                                                                                                                                                    SYNOPSIS
                                                                                                                                                                                                                                                    +        #include <curses.h>
+ 
+-       const char *unctrl(chtype ch);
+-       wchar_t *wunctrl(cchar_t *wch);
++       const char * unctrl(chtype ch);
++       wchar_t * wunctrl(cchar_t * wch);
+ 
+-       const char *keyname(int c);
+-       const char *key_name(wchar_t wc);
++       const char * keyname(int c);
++       const char * key_name(wchar_t wc);
+ 
+        void filter(void);
++       /* extension */
++       void nofilter(void);
+ 
+        void use_env(bool bf);
++       /* extension */
++       void use_tioctl(bool bf);
+ 
+-       int putwin(WINDOW *win, FILE *filep);
+-       WINDOW *getwin(FILE *filep);
++       int putwin(WINDOW * win, FILE * filep);
++       WINDOW * getwin(FILE * filep);
+ 
+        int delay_output(int ms);
+-       int flushinp(void);
+ 
+-       /* extensions */
+-       void nofilter(void);
+-       void use_tioctl(bool bf);
++       int flushinp(void);
+ 
+ 
+ 
                                                                                                                                                                                                                                                    DESCRIPTION
                                                                                                                                                                                                                                                    + 
+-
                                                                                                                                                                                                                                                    unctrl
                                                                                                                                                                                                                                                    +-       The   unctrl   routine  returns  a  character  string  as  a  printable
+-       representation of the character ch:
++
                                                                                                                                                                                                                                                    unctrl, wunctrl
                                                                                                                                                                                                                                                    ++       unctrl   returns   a   null-terminated   character   string   printably
++       representing the curses character ch,  often  one  that  originated  in
++       keyboard input; see getch(3x).
+ 
+-       o   Printable characters are displayed  as  themselves,  e.g.,  a  one-
+-           character string containing the key.
++       o   Printable   characters  represent  themselves  as  a  one-character
++           string.
+ 
+-       o   Control characters are displayed in the ^X notation.
++       o   Control characters are expressed in ^X notation,  where  X  is  the
++           printable  symbol  of  the  control  code's  value  plus  32 in the
++           ISO 646/"ASCII" character set.
+ 
+-       o   Printing characters are displayed as is.
++       o   DEL (character code 127) is represented as ^?.
+ 
+-       o   DEL (character 127) is displayed as ^?.
++       o   A character code greater than 127 is  represented  in  one  of  two
++           ways.
+ 
+-       o   Values  above 128 are either meta characters (if the screen has not
+-           been initialized, or if  meta(3x)  has  been  called  with  a  TRUE
+-           parameter),  shown  in  the  M-X  notation,  or  are  displayed  as
+-           themselves.  In the latter case, the values may not  be  printable;
+-           this follows the X/Open specification.
++           If  the  screen  has  not  been initialized or is in meta mode (see
++           meta(3x)), it  is  expressed  in  M-X  notation,  where  X  is  the
++           representation of the code's value minus 128, as described above.
+ 
+-       The  corresponding  wunctrl  returns  a  printable  representation of a
+-       complex character wch.
++           If the screen is not in meta mode, the character code is assumed to
++           represent itself.  It nevertheless may not be  printable;  this  is
++           the case for character codes 128-159 in ISO 8859 encodings.
+ 
+-       In both unctrl and wunctrl the attributes and color associated with the
+-       character parameter are ignored.
++           ncurses's   use_legacy_coding(3x)   function   configures  unctrl's
++           handling of these character codes.
++
++       wunctrl  returns  a  null-terminated  wide-character  string  printably
++       representing the curses complex character wch.
++
++       Both  functions  ignore the atributes and color pair selection of their
++       argument.
+ 
+ 
+ 
                                                                                                                                                                                                                                                    keyname, key_name
                                                                                                                                                                                                                                                    +        The keyname routine returns a character string corresponding to the key
+        c.  Key codes are different from character codes.
+ 
+-       o   Key codes below 256  are  characters.   They  are  displayed  using
++       o   Key  codes  below  256  are  characters.   They are displayed using
+            unctrl.
+ 
+-       o   Values  above 256 may be the codes for function keys.  The function
++       o   Values above 256 may be the codes for function keys.  The  function
+            key name is displayed.
+ 
+-       o   Otherwise (if there is no corresponding name and the key is  not  a
+-           character)  the  function returns null, to denote an error.  X/Open
+-           also  lists   an   "UNKNOWN   KEY"   return   value,   which   some
++       o   Otherwise  (if  there is no corresponding name and the key is not a
++           character) the function returns null, to denote an  error.   X/Open
++           also   lists   an   "UNKNOWN   KEY"   return   value,   which  some
+            implementations return rather than null.
+ 
+-       The   corresponding  key_name  returns  a  multibyte  character  string
+-       corresponding to  the  wide-character  value  wc.   The  two  functions
++       The  corresponding  key_name  returns  a  multibyte  character   string
++       corresponding  to  the  wide-character  value  wc.   The  two functions
+        (keyname and key_name) do not return the same set of strings:
+ 
+        o   keyname returns null where key_name would display a meta character.
+@@ -130,7 +140,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                    filter, nofilter
                                                                                                                                                                                                                                                    +-       The  filter  routine, if used, must be called before initscr or newterm
++       The filter routine, if used, must be called before initscr  or  newterm
+        are called.  Calling filter causes these changes in initialization:
+ 
+        o   LINES is set to 1;
+@@ -142,30 +152,30 @@
+ 
+        o   and the home string is set to the value of cr.
+ 
+-       The  nofilter  routine  cancels  the effect of a preceding filter call.
+-       That allows the caller to initialize a screen on  a  different  device,
+-       using  a  different  value of $TERM.  The limitation arises because the
++       The nofilter routine cancels the effect of  a  preceding  filter  call.
++       That  allows  the  caller to initialize a screen on a different device,
++       using a different value of $TERM.  The limitation  arises  because  the
+        filter routine modifies the in-memory copy of the terminal information.
+ 
+ 
+ 
                                                                                                                                                                                                                                                    use_env
                                                                                                                                                                                                                                                    +-       The use_env routine, if  used,  should  be  called  before  initscr  or
+-       newterm  are  called  (because  those  compute  the  screen  size).  It
+-       modifies the way ncurses treats environment variables when  determining
++       The  use_env  routine,  if  used,  should  be  called before initscr or
++       newterm are  called  (because  those  compute  the  screen  size).   It
++       modifies  the way ncurses treats environment variables when determining
+        the screen size.
+ 
+-       o   Normally  ncurses  looks  first  at  the  terminal database for the
++       o   Normally ncurses looks first  at  the  terminal  database  for  the
+            screen size.
+ 
+-           If use_env was called with  FALSE  for  parameter,  it  stops  here
++           If  use_env  was  called  with  FALSE  for parameter, it stops here
+            unless use_tioctl was also called with TRUE for parameter.
+ 
+-       o   Then  it  asks  for the screen size via operating system calls.  If
++       o   Then it asks for the screen size via operating  system  calls.   If
+            successful, it overrides the values from the terminal database.
+ 
+-       o   Finally (unless use_env was called with FALSE  parameter),  ncurses
+-           examines  the LINES or COLUMNS environment variables, using a value
+-           in those to override the  results  from  the  operating  system  or
++       o   Finally  (unless  use_env was called with FALSE parameter), ncurses
++           examines the LINES or COLUMNS environment variables, using a  value
++           in  those  to  override  the  results  from the operating system or
+            terminal database.
+ 
+            curses also updates the screen size in response to SIGWINCH, unless
+@@ -173,176 +183,184 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                    use_tioctl
                                                                                                                                                                                                                                                    +-       The use_tioctl routine, if used, should be  called  before  initscr  or
+-       newterm  are  called  (because  those  compute the screen size).  After
+-       use_tioctl is called with TRUE as an  argument,  ncurses  modifies  the
++       The  use_tioctl  routine,  if  used, should be called before initscr or
++       newterm are called (because those  compute  the  screen  size).   After
++       use_tioctl  is  called  with  TRUE as an argument, ncurses modifies the
+        last step in its computation of screen size as follows:
+ 
+-       o   checks  if the LINES and COLUMNS environment variables are set to a
+-           number greater than zero.
++       o   checks whether the LINES and COLUMNS environment variables are  set
++           to a number greater than zero.
+ 
+-       o   for each, ncurses updates the  corresponding  environment  variable
+-           with  the  value  that it has obtained via operating system call or
++       o   for  each,  ncurses  updates the corresponding environment variable
++           with the value that it has obtained via operating  system  call  or
+            from the terminal database.
+ 
+-       o   ncurses re-fetches the value of the environment variables  so  that
++       o   ncurses  re-fetches  the value of the environment variables so that
+            it is still the environment variables that set the screen size.
+ 
+        The use_env and use_tioctl routines combine as follows.
+ 
+               use_env   use_tioctl   Summary
+               -----------------------------------------------------------------
+-              TRUE      FALSE        ncurses   uses   operating  system  calls
+-                                     unless overridden  by  LINES  or  COLUMNS
++              TRUE      FALSE        ncurses  uses  operating   system   calls
++                                     unless  overridden  by  LINES  or COLUMNS
+                                      environment variables; default.
+-              TRUE      TRUE         ncurses  updates  LINES and COLUMNS based
++              TRUE      TRUE         ncurses updates LINES and  COLUMNS  based
+                                      on operating system calls.
+-              FALSE     TRUE         ncurses ignores LINES and COLUMNS,  using
++              FALSE     TRUE         ncurses  ignores LINES and COLUMNS, using
+                                      operating system calls to obtain size.
+ 
+ 
+ 
                                                                                                                                                                                                                                                    putwin, getwin
                                                                                                                                                                                                                                                    +-       The  putwin routine writes all data associated with window (or pad) win
+-       into the file to which filep points.  This  information  can  be  later
++       The putwin routine writes all data associated with window (or pad)  win
++       into  the  file  to  which filep points.  This information can be later
+        retrieved using the getwin function.
+ 
+-       The  getwin  routine  reads  window  related data stored in the file by
+-       putwin.  The routine then creates and initializes a  new  window  using
+-       that  data.   It  returns a pointer to the new window.  There are a few
++       The getwin routine reads window related data  stored  in  the  file  by
++       putwin.   The  routine  then creates and initializes a new window using
++       that data.  It returns a pointer to the new window.  There  are  a  few
+        caveats:
+ 
+-       o   the data written is  a  copy  of  the  WINDOW  structure,  and  its
+-           associated  character  cells.  The format differs between the wide-
+-           character (ncursesw) and non-wide  (ncurses)  libraries.   You  can
++       o   the  data  written  is  a  copy  of  the  WINDOW structure, and its
++           associated character cells.  The format differs between  the  wide-
++           character  (ncursesw)  and  non-wide  (ncurses) libraries.  You can
+            transfer data between the two, however.
+ 
+-       o   the  retrieved  window  is always created as a top-level window (or
++       o   the retrieved window is always created as a  top-level  window  (or
+            pad), rather than a subwindow.
+ 
+-       o   the window's character cells contain the color pair value, but  not
+-           the  actual  color  numbers.   If cells in the retrieved window use
+-           color pairs that have not been created  in  the  application  using
++       o   the  window's character cells contain the color pair value, but not
++           the actual color numbers.  If cells in  the  retrieved  window  use
++           color  pairs  that  have  not been created in the application using
+            init_pair, they will not be colored when the window is refreshed.
+ 
+ 
+ 
                                                                                                                                                                                                                                                    delay_output
                                                                                                                                                                                                                                                    +-       The  delay_output  routine  inserts  an ms millisecond pause in output.
+-       Employ this function judiciously when  terminal  output  uses  padding,
+-       because  ncurses  transmits  null  characters  (consuming  CPU  and I/O
+-       resources) instead of  sleeping  and  requesting  resumption  from  the
++       The delay_output routine inserts an ms  millisecond  pause  in  output.
++       Employ  this  function  judiciously  when terminal output uses padding,
++       because ncurses  transmits  null  characters  (consuming  CPU  and  I/O
++       resources)  instead  of  sleeping  and  requesting  resumption from the
+        operating system.  Padding is used unless:
+ 
+        o   the terminal description has npc (no_pad_char) capability, or
+ 
+        o   the environment variable NCURSES_NO_PADDING is set.
+ 
+-       If  padding is not in use, ncurses uses napms to perform the delay.  If
+-       the value of ms exceeds 30,000 (thirty seconds), it is capped  at  that
++       If padding is not in use, ncurses uses napms to perform the delay.   If
++       the  value  of ms exceeds 30,000 (thirty seconds), it is capped at that
+        value.
+ 
+ 
+ 
                                                                                                                                                                                                                                                    flushinp
                                                                                                                                                                                                                                                    +-       The  flushinp  routine throws away any typeahead that has been typed by
++       The flushinp routine throws away any typeahead that has been  typed  by
+        the user and has not yet been read by the program.
+ 
+ 
+ 
                                                                                                                                                                                                                                                    RETURN VALUE
                                                                                                                                                                                                                                                    +-       Except for flushinp, routines that return an integer  return  ERR  upon
+-       failure  and OK (SVr4 specifies only "an integer value other than ERR")
+-       upon successful completion.
++       Except  for  flushinp,  functions  that return integers return ERR upon
++       failure and OK upon success.
++
++       Functions that return pointers return NULL on error.
+ 
+-       Routines that return pointers return NULL on error.
++       In ncurses,
+ 
+-       In this implementation
++       o   flushinp returns ERR if the terminal was not initialized, and
+ 
+-          flushinp
+-               returns ERR if the terminal was not initialized.
++       o   putwin returns ERR if its associated write(2) calls return ERR.
+ 
+-          putwin
+-               returns ERR if the associated write(2) calls return ERR.
++
++
                                                                                                                                                                                                                                                    NOTES
                                                                                                                                                                                                                                                    ++       wunctrl is part of ncurses's wide-character API, and is  not  available
++       in its non-wide configuration.
+ 
+ 
+ 
                                                                                                                                                                                                                                                    PORTABILITY
                                                                                                                                                                                                                                                    ++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
++
++       SVr4 describes a successful return value  only  as  "an  integer  value
++       other than ERR".
++
+ 
+ 
                                                                                                                                                                                                                                                    filter
                                                                                                                                                                                                                                                    +-       The SVr4 documentation describes the  action  of  filter  only  in  the
+-       vaguest  terms.   The  description  here  is adapted from X/Open Curses
++       The  SVr4  documentation  describes  the  action  of filter only in the
++       vaguest terms.  The description here  is  adapted  from  X/Open  Curses
+        (which erroneously fails to describe the disabling of cuu).
+ 
+ 
+ 
                                                                                                                                                                                                                                                    delay_output padding
                                                                                                                                                                                                                                                    +-       The limitation to 30 seconds and the use of  napms  differ  from  other
++       The  limitation  to  30  seconds and the use of napms differ from other
+        implementations.
+ 
+        o   SVr4 curses does not delay if no padding character is available.
+ 
+-       o   NetBSD  curses  uses  napms when no padding character is available,
+-           but does not take  timing  into  account  when  using  the  padding
++       o   NetBSD curses uses napms when no padding  character  is  available,
++           but  does  not  take  timing  into  account  when using the padding
+            character.
+ 
+        Neither limits the delay.
+ 
+ 
+ 
                                                                                                                                                                                                                                                    keyname
                                                                                                                                                                                                                                                    +-       The  keyname  function  may  return  the  names  of user-defined string
+-       capabilities that are defined in the terminfo entry via the  -x  option
+-       of  tic.   This  implementation  automatically  assigns at run-time key
++       The keyname function  may  return  the  names  of  user-defined  string
++       capabilities  that  are defined in the terminfo entry via the -x option
++       of tic.  This implementation  automatically  assigns  at  run-time  key
+        codes to user-defined strings that begin with "k".  The key codes start
+-       at  KEY_MAX,  but are not guaranteed to be the same value for different
+-       runs  because  user-defined  codes  are  merged   from   all   terminal
+-       descriptions   that   have  been  loaded.   The  use_extended_names(3x)
+-       function controls  whether  this  data  is  loaded  when  the  terminal
++       at KEY_MAX, but are not guaranteed to be the same value  for  different
++       runs   because   user-defined   codes  are  merged  from  all  terminal
++       descriptions  that  have  been  loaded.    The   use_extended_names(3x)
++       function  controls  whether  this  data  is  loaded  when  the terminal
+        description is read by the library.
+ 
+ 
+ 
                                                                                                                                                                                                                                                    nofilter, use_tioctl
                                                                                                                                                                                                                                                    +-       The  nofilter  and  use_tioctl  routines are specific to ncurses.  They
+-       were not supported on Version 7, BSD or System V  implementations.   It
+-       is  recommended  that  any  code  depending  on  ncurses  extensions be
++       The nofilter and use_tioctl routines are  specific  to  ncurses.   They
++       were  not  supported on Version 7, BSD or System V implementations.  It
++       is recommended  that  any  code  depending  on  ncurses  extensions  be
+        conditioned using NCURSES_VERSION.
+ 
+ 
+ 
                                                                                                                                                                                                                                                    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
+-           implementation-specific  format.  Although the format is an obvious
++       o   The   files   written   and   read   by   these  functions  use  an
++           implementation-specific format.  Although the format is an  obvious
+            target for standardization, it has been overlooked.
+ 
+-           Interestingly enough, according to the copyright dates  in  Solaris
+-           source,  the  functions (along with scr_init, etc.) originated with
++           Interestingly  enough,  according to the copyright dates in Solaris
++           source, the functions (along with scr_init, etc.)  originated  with
+            the University of California, Berkeley (in 1982) and were later (in
+-           1988)  incorporated  into SVr4.  Oddly, there are no such functions
++           1988) incorporated into SVr4.  Oddly, there are no  such  functions
+            in the 4.3BSD curses sources.
+ 
+        o   Most implementations simply dump the binary WINDOW structure to the
+-           file.   These  include SVr4 curses, NetBSD curses, and PDCurses, as
+-           well as older ncurses versions.  This implementation  (as  well  as
+-           the  X/Open  variant  of  Solaris  curses, dated 1995) uses textual
++           file.  These include SVr4 curses, NetBSD curses, and  PDCurses,  as
++           well  as  older  ncurses versions.  This implementation (as well as
++           the X/Open variant of Solaris  curses,  dated  1995)  uses  textual
+            dumps.
+ 
+-           The implementations that use binary dumps use  block-I/O  (write(2)
++           The  implementations  that use binary dumps use block-I/O (write(2)
+            and read(2) functions).  Those that use textual dumps use buffered-
+            I/O.  A few applications may happen to write extra data in the file
+-           using  these  functions.   Doing  that can run into problems mixing
+-           block- and buffered-I/O.  This implementation reduces  the  problem
+-           on  writes  by  flushing  the output.  However, reading from a file
++           using these functions.  Doing that can  run  into  problems  mixing
++           block-  and  buffered-I/O.  This implementation reduces the problem
++           on writes by flushing the output.  However,  reading  from  a  file
+            written using mixed schemes may not be successful.
+ 
+ 
+ 
                                                                                                                                                                                                                                                    unctrl, wunctrl
                                                                                                                                                                                                                                                    +-       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+-       error  conditions  for  them.   It  states that unctrl and wunctrl will
+-       return a null pointer if unsuccessful.  This implementation checks  for
+-       three cases:
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.  It states that unctrl and wunctrl will  return  a
++       null  pointer  if  unsuccessful.   This implementation checks for three
++       cases:
+ 
+-       o   the  parameter  is  a  7-bit  US-ASCII code.  This is the case that
++       o   the parameter is a 7-bit US-ASCII code.   This  is  the  case  that
+            X/Open Curses documented.
+ 
+        o   the parameter is in the range 128-159, i.e., a C1 control code.  If
+-           use_legacy_coding(3x)  has  been  called with a 2 parameter, unctrl
+-           returns the  parameter,  i.e.,  a  one-character  string  with  the
+-           parameter  as  the  first  character.   Otherwise, it returns "~@",
++           use_legacy_coding(3x) has been called with a  2  parameter,  unctrl
++           returns  the  parameter,  i.e.,  a  one-character  string  with the
++           parameter as the first  character.   Otherwise,  it  returns  "~@",
+            "~A", etc., analogous to "^@", "^A", C0 controls.
+ 
+            X/Open Curses does not document whether unctrl can be called before
+@@ -353,33 +371,33 @@
+            pointer.
+ 
+        The strings returned by unctrl in this implementation are determined at
+-       compile time, showing C1 controls from the upper-128 codes with  a  "~"
+-       prefix   rather   than   "^".   Other  implementations  have  different
+-       conventions.   For  example,  they  may  show  both  sets  of   control
+-       characters  with  "^",  and strip the parameter to 7 bits.  Or they may
+-       ignore C1 controls and treat all of the upper-128 codes  as  printable.
+-       This  implementation  uses  8  bits  but  does not modify the string to
+-       reflect locale.  The use_legacy_coding(3x) function allows  the  caller
++       compile  time,  showing C1 controls from the upper-128 codes with a "~"
++       prefix  rather  than  "^".   Other   implementations   have   different
++       conventions.    For  example,  they  may  show  both  sets  of  control
++       characters with "^", and strip the parameter to 7 bits.   Or  they  may
++       ignore  C1  controls and treat all of the upper-128 codes as printable.
++       This implementation uses 8 bits but  does  not  modify  the  string  to
++       reflect  locale.   The use_legacy_coding(3x) function allows the caller
+        to change the output of unctrl.
+ 
+-       Likewise,  the meta(3x) function allows the caller to change the output
+-       of keyname, i.e., it determines whether to  use  the  "M-"  prefix  for
+-       "meta"    keys    (codes    in   the   range   128   to   255).    Both
+-       use_legacy_coding(3x)  and  meta(3x)  succeed  only  after  curses   is
+-       initialized.   X/Open  Curses  does not document the treatment of codes
++       Likewise, the meta(3x) function allows the caller to change the  output
++       of  keyname,  i.e.,  it  determines  whether to use the "M-" prefix for
++       "meta"   keys   (codes   in   the   range   128    to    255).     Both
++       use_legacy_coding(3x)   and  meta(3x)  succeed  only  after  curses  is
++       initialized.  X/Open Curses does not document the  treatment  of  codes
+        128 to 159.  When treating them as "meta" keys (or if keyname is called
+-       before   initializing  curses),  this  implementation  returns  strings
++       before  initializing  curses),  this  implementation  returns   strings
+        "M-^@", "M-^A", etc.
+ 
+        X/Open Curses documents unctrl as declared in <unctrl.h>, which ncurses
+-       does.   However,  ncurses' <curses.h> includes <unctrl.h>, matching the
++       does.  However, ncurses' <curses.h> includes <unctrl.h>,  matching  the
+        behavior of SVr4 curses.  Other implementations may not do that.
+ 
+ 
+ 
                                                                                                                                                                                                                                                    use_env, use_tioctl
                                                                                                                                                                                                                                                    +-       If ncurses is configured to provide  the  sp-functions  extension,  the
+-       state  of  use_env  and  use_tioctl may be updated before creating each
+-       screen rather than once  only  (curs_sp_funcs(3x)).   This  feature  of
++       If  ncurses  is  configured  to provide the sp-functions extension, the
++       state of use_env and use_tioctl may be  updated  before  creating  each
++       screen  rather  than  once  only  (curs_sp_funcs(3x)).  This feature of
+        use_env is not provided by other implementations of curses.
+ 
+ 
+@@ -388,8 +406,8 @@
+ 
+        SVr2 (1984) introduced delay_output, flushinp, and keyname.
+ 
+-       SVr3  (1987)  added filter.  Later that year, SVr3.1 brought getwin and
+-       putwin, reading and writing window dumps with fread(3)  and  fwrite(3),
++       SVr3 (1987) added filter.  Later that year, SVr3.1 brought  getwin  and
++       putwin,  reading  and writing window dumps with fread(3) and fwrite(3),
+        respectively.
+ 
+        SVr4 (1989) supplied use_env.
+@@ -406,7 +424,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                     curs_util(3x)
++ncurses 6.5                       2025-01-18                     curs_util(3x)
+ 
                                                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                                                      
+@@ -414,7 +432,7 @@
+ 
                                                                                                                                                                                                                                                    • SYNOPSIS
                                                                                                                                                                                                                                                      • 
+ 
                                                                                                                                                                                                                                                    • DESCRIPTION
+ 
+ 
                                                                                                                                                                                                                                                      • 
+ 
                                                                                                                                                                                                                                                    • RETURN VALUE
                                                                                                                                                                                                                                                      • 
++
                                                                                                                                                                                                                                                    • NOTES
                                                                                                                                                                                                                                                      • 
+ 
                                                                                                                                                                                                                                                    • PORTABILITY
+ 
                                                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                                                      • filter
                                                                                                                                                                                                                                                        • 
+Index: doc/html/man/curs_variables.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_variables.3x.html	2024-09-21 18:35:27.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_variables.3x.html	2025-01-19 00:55:00.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_variables 3x 2024-09-21 ncurses 6.5 Library calls
++curs_variables 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                        curs_variables 3x 2024-09-21 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                        
++
                                                                                                                                                                                                                                                        curs_variables 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                                                        + curs_variables(3x)               Library calls              curs_variables(3x)
+ 
+@@ -48,8 +48,8 @@
+ 
+ 
                                                                                                                                                                                                                                                        NAME
                                                                                                                                                                                                                                                        +        bool,  chtype,  cchar_t,  attr_t, SCREEN, WINDOW, TRUE, FALSE, ERR, OK,
+-       curscr, newscr, stdscr, COLORS,  COLOR_PAIRS,  COLS,  LINES,  ESCDELAY,
+-       TABSIZE - curses data types, constants, and global variables
++       CCHARW_MAX, curscr, newscr, stdscr, COLORS, COLOR_PAIRS,  COLS,  LINES,
++       ESCDELAY, TABSIZE - curses data types, constants, and global variables
+ 
+ 
+ 
                                                                                                                                                                                                                                                        SYNOPSIS
                                                                                                                                                                                                                                                        +@@ -70,6 +70,9 @@
+        const /* ... */ ERR;
+        const /* ... */ OK;
+ 
++       /* extension */
++       const /* ... */ CCHARW_MAX;
++
+        /* variables */
+        int COLORS;
+        int COLOR_PAIRS;
+@@ -107,6 +110,12 @@
+        values indicating failure and success, respectively.
+ 
+ 
++
                                                                                                                                                                                                                                                        CCHARW_MAX
                                                                                                                                                                                                                                                        ++       This integral value, an ncurses extension, contains the maximum  number
++       of  wchar_t  wide  characters  that  can  be stored in a curses complex
++       character cchar_t.
++
++
+ 
                                                                                                                                                                                                                                                        PREDEFINED TYPES
                                                                                                                                                                                                                                                        + 
+ 
                                                                                                                                                                                                                                                        bool
                                                                                                                                                                                                                                                        +@@ -147,22 +156,24 @@
+ 
+ 
                                                                                                                                                                                                                                                        VARIABLES
                                                                                                                                                                                                                                                        + 
+-
                                                                                                                                                                                                                                                        curscr, stdscr, newscr
                                                                                                                                                                                                                                                        +-       The library records updates to the terminal screen in  a  window  named
+-       curscr.   This  object  is  referred  to  as  the  "physical screen" in
++
                                                                                                                                                                                                                                                        curscr, newscr, stdscr
                                                                                                                                                                                                                                                        ++       When a curses application calls initscr(3x) or newterm(3x), the library
++       creates  a  window  named  stdscr that is the same size as the terminal
++       screen and is the implicit window used by functions that interact  with
++       a  window  but  do  not  take  a parameter identifying one; many curses
++       functions use it.  An application need not use stdscr; it might  prefer
++       to tile the display into multiple windows instead.
++
++       The  library  records  updates to the terminal screen in a window named
++       curscr.  This object  is  referred  to  as  the  "physical  screen"  in
+        curs_refresh(3x) and curs_outopts(3x).
+ 
+-       ncurses collects pending updates to the terminal  screen  in  a  window
+-       named  newscr.   This  object is referred to as the "virtual screen" in
+-       the curs_kernel(3x), curs_refresh(3x), and curs_outopts(3x).  When  the
+-       screen  is  refreshed, curses determines a minimal set of updates using
++       ncurses  collects  pending  updates  to the terminal screen in a window
++       named newscr.  This object is referred to as the  "virtual  screen"  in
++       the  curs_kernel(3x), curs_refresh(3x), and curs_outopts(3x).  When the
++       screen is refreshed, curses determines a minimal set of  updates  using
+        the terminal's capabilities to make curscr look like newscr.
+ 
+-       Once curses is initialized, it creates a window named  stdscr.   It  is
+-       the  same size as the terminal screen and is the default window used by
+-       routines that do not take a parameter  identifying  one.   Many  curses
+-       functions use this window.
+-
+ 
+ 
                                                                                                                                                                                                                                                        COLORS
                                                                                                                                                                                                                                                        +        Once  curses  is  initialized,  COLORS  contains  the  number of colors
+@@ -201,45 +212,54 @@
+        Either initscr(3x) or newterm(3x) initializes curses.
+ 
+        If  ncurses  is  configured  to  provide  separate  curses  and   tinfo
+-       libraries, most of these variables reside in the former.
++       libraries,  most  of these symbols reside in the former.  The bool data
++       type is used by both.
++
++
++
                                                                                                                                                                                                                                                        EXTENSIONS
                                                                                                                                                                                                                                                        ++       The CCHARW_MAX constant, and ESCDELAY, TABSIZE, and  newscr  variables,
++       are extensions, the first of these originating in ncurses.
+ 
+ 
+ 
                                                                                                                                                                                                                                                        PORTABILITY
                                                                                                                                                                                                                                                        +-       The  X/Open  Curses  standard  documents all of the foregoing types and
+-       symbols except for newscr, TABSIZE, and ESCDELAY.
++       Applications employing ncurses extensions should condition their use on
++       the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       X/Open Curses describes curscr only as "an  internal  data  structure";
+-       SVr4   gave  more  details,  noting  its  use  "for  certain  low-level
+-       operations like clearing and redrawing a  screen  containing  garbage".
++       The X/Open Curses standard documents all of  the  foregoing  types  and
++       symbols except for CCHARW_MAX, newscr, TABSIZE, and ESCDELAY.
++
++       X/Open  Curses  describes  curscr only as "an internal data structure";
++       SVr4  gave  more  details,  noting  its  use  "for  certain   low-level
++       operations  like  clearing  and redrawing a screen containing garbage".
+        Neither specified its interaction with the rest of the interface beyond
+        use as an argument to clearok(3x) and wrefresh(3x).
+ 
+-       newscr is a feature of SVr4 curses.  When refreshing the screen, it  is
+-       used  as  a  working area for combining the standard window stdscr with
+-       any others the application may have created with newwin(3x).  When  the
++       newscr  is a feature of SVr4 curses.  When refreshing the screen, it is
++       used as a working area for combining the standard  window  stdscr  with
++       any  others the application may have created with newwin(3x).  When the
+        update of newscr is complete, curses modifies curscr to match newscr.
+ 
+        TABSIZE is a feature of SVr4 curses.
+ 
+-       o   SVr4   initially  sets  TABSIZE  from  the  terminal  description's
+-           init_tabs  capability.   After  that,  it   can   be   altered   by
++       o   SVr4  initially  sets  TABSIZE  from  the  terminal   description's
++           init_tabs   capability.    After   that,   it  can  be  altered  by
+            applications using SVr4 curses.
+ 
+-       o   SVr4  curses  uses  the value of TABSIZE to compute the position of
+-           tab stops when updating both the virtual screen with addch(3x)  and
++       o   SVr4 curses uses the value of TABSIZE to compute  the  position  of
++           tab  stops when updating both the virtual screen with addch(3x) and
+            the physical screen with mvcur(3x).
+ 
+-       o   ncurses  uses  the  value  of  TABSIZE  only  to update the virtual
++       o   ncurses uses the value  of  TABSIZE  only  to  update  the  virtual
+            screen.   It  uses  the  terminal  description's  "it"  (init_tabs)
+-           capability  for  computing hardware tabs (that is, tab stops on the
++           capability for computing hardware tabs (that is, tab stops  on  the
+            physical screen).
+ 
+-       o   Other implementations differ.  For instance, NetBSD  curses  allows
+-           TABSIZE  to  be  set through an environment variable.  ncurses does
++       o   Other  implementations  differ.  For instance, NetBSD curses allows
++           TABSIZE to be set through an environment  variable.   ncurses  does
+            not.
+ 
+            NetBSD curses does not support hardware tabs; it uses the init_tabs
+-           capability  and  the TABSIZE variable only for updating the virtual
++           capability and the TABSIZE variable only for updating  the  virtual
+            screen.
+ 
+        ESCDELAY is a feature of AIX curses.
+@@ -248,25 +268,27 @@
+ 
+        o   The default value for AIX's ESCDELAY equals 0.1 seconds.
+ 
+-       o   AIX also enforces a limit of 10,000 seconds for  ESCDELAY;  ncurses
++       o   AIX  also  enforces a limit of 10,000 seconds for ESCDELAY; ncurses
+            does not enforce any upper limit.
+ 
+-       ncurses  has  long  used ESCDELAY with units of milliseconds, making it
+-       impossible to be completely compatible with  AIX.   Consequently,  most
+-       users  have  decided  either to override the value, or to rely upon its
++       ncurses has long used ESCDELAY with units of  milliseconds,  making  it
++       impossible  to  be  completely compatible with AIX.  Consequently, most
++       users have decided either to override the value, or to  rely  upon  its
+        default.
+ 
+ 
+ 
                                                                                                                                                                                                                                                        SEE ALSO
                                                                                                                                                                                                                                                        +-       [UAX #29] "Unicode  Standard  Annex  #29:  Unicode  Text  Segmentation"
++       [UAX  #29]  "Unicode  Standard  Annex  #29:  Unicode Text Segmentation"
+        <https://unicode.org/reports/tr29/>
+ 
+-       curses(3x),    curs_color(3x),    curs_opaque(3x),   curs_terminfo(3x),
++       getcchar(3x) further discusses CCHARW_MAX.
++
++       curses(3x),   curs_color(3x),    curs_opaque(3x),    curs_terminfo(3x),
+        curs_threads(3x), term_variables(3x), terminfo(5)
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-21                curs_variables(3x)
++ncurses 6.5                       2025-01-18                curs_variables(3x)
+ 
                                                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                                                        
+ 
+Index: doc/html/man/curs_window.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/curs_window.3x.html	2024-12-28 21:54:09.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/curs_window.3x.html	2025-01-19 00:55:00.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_window 3x 2024-12-28 ncurses 6.5 Library calls
++curs_window 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                        curs_window 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                        
++
                                                                                                                                                                                                                                                        curs_window 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                                                        + curs_window(3x)                  Library calls                 curs_window(3x)
+ 
+@@ -158,66 +158,60 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                        RETURN VALUE
                                                                                                                                                                                                                                                        +-       Routines that return an integer return the integer ERR upon failure and
+-       OK  (SVr4  only  specifies  "an  integer  value  other  than ERR") upon
+-       successful completion.
+-
+-       Routines that return pointers return NULL on error.
+-
+-       X/Open defines no error conditions.  In this implementation
+-
+-       delwin
+-            returns ERR if the window pointer is null, or if the window is the
+-            parent of another window.
+-
+-       derwin
+-            returns ERR if the parent window pointer is null, or if any of its
+-            ordinates or dimensions is negative, or if  the  resulting  window
+-            does not fit inside the parent window.
+-
+-       dupwin
+-            returns ERR if the window pointer is null.
+-
+-            This  implementation  also maintains a list of windows, and checks
+-            that the  pointer  passed  to  delwin  is  one  that  it  created,
+-            returning an error if it was not..
+-
+-       mvderwin
+-            returns  ERR if the window pointer is null, or if some part of the
+-            window would be placed off-screen.
+-
+-       mvwin
+-            returns ERR if the window pointer is null, or  if  the  window  is
+-            really  a  pad, or if some part of the window would be placed off-
+-            screen.
+-
+-       newwin
+-            will fail if either of its beginning ordinates is negative, or  if
+-            either the number of lines or columns is negative.
+-
+-       syncok
+-            returns ERR if the window pointer is null.
+-
+-       subwin
+-            returns ERR if the parent window pointer is null, or if any of its
+-            ordinates or dimensions is negative, or if  the  resulting  window
+-            does not fit inside the parent window.
+-
+-       The  functions  which return a window pointer may also fail if there is
+-       insufficient memory for its data structures.  Any  of  these  functions
+-       will fail if the screen has not been initialized, i.e., with initscr or
+-       newterm.
++       Functions that return integers return ERR  upon  failure  and  OK  upon
++       success.
++
++       Functions that return pointers return NULL on error.
++
++       ncurses defines several error conditions.
++
++       o   delwin returns ERR if win is a null pointer, or if it is the parent
++           of another window.
++
++           ncurses maintains a list of windows, and checks  that  the  pointer
++           passed  to  delwin  is one that it created, returning ERR if it was
++           not.
++
++       o   derwin returns ERR if orig is a null pointer,  or  if  any  of  the
++           ordinate  or  dimension  arguments is negative, or if the resulting
++           window does not fit inside the parent window.
++
++       o   dupwin returns ERR if win is a null pointer.
++
++       o   mvderwin returns ERR if win is a null pointer, or if  any  part  of
++           the window would be placed off-screen.
++
++       o   mvwin  returns ERR if win is a null pointer, if win is a pad, or if
++           any part of the window would be placed off-screen.
++
++       o   newwin returns ERR if any of its arguments is negative.
++
++       o   subwin returns ERR if orig is a null pointer,  or  if  any  of  the
++           ordinate  or  dimension  arguments is negative, or if the resulting
++           window does not fit inside the parent window.
++
++       o   syncok returns ERR if win is a null pointer.
++
++       Functions that return a window pointer fail if  memory  allocation  for
++       their data structures fails.
++
++       All of these functions fail if the screen has not been initialized; see
++       initscr(3x) or newterm(3x).
+ 
+ 
+ 
                                                                                                                                                                                                                                                        NOTES
                                                                                                                                                                                                                                                        +-       If many small changes are made to the window, the wsyncup option  could
+-       degrade performance.
++       syncok may be implemented as a macro.
+ 
+-       Note that syncok may be a macro.
++       Calling syncup on a window and making many small changes  to  it  could
++       degrade performance.
+ 
+ 
+ 
                                                                                                                                                                                                                                                        PORTABILITY
                                                                                                                                                                                                                                                        +-       X/Open Curses, Issue 4 describes these functions.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for delwin, derwin, dupwin, newwin, mvderwin, or syncok.
++
++       For functions returning integers  (except  delwin),  SVr4  describes  a
++       successful return value only as "an integer value other than ERR".
+ 
+        Regarding delwin, X/Open Curses states that
+ 
+@@ -248,7 +242,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                   curs_window(3x)
++ncurses 6.5                       2025-01-18                   curs_window(3x)
+ 
                                                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                                                          
+Index: doc/html/man/form_field_opts.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/form_field_opts.3x.html	2024-04-27 18:38:47.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/form_field_opts.3x.html	2025-01-19 00:55:00.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-form_field_opts 3x 2024-03-16 ncurses 6.5 Library calls
++form_field_opts 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                          form_field_opts 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                          
++
                                                                                                                                                                                                                                                          form_field_opts 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                                                          + form_field_opts(3x)              Library calls             form_field_opts(3x)
+ 
+@@ -63,7 +63,7 @@
+ 
+ 
                                                                                                                                                                                                                                                          DESCRIPTION
                                                                                                                                                                                                                                                          +        The function set_field_opts sets all  the  given  field's  option  bits
+-       (field option bits may be logically-OR'ed together).
++       (field option bits may be logically "or"-ed together).
+ 
+        The  function  field_opts_on turns on the given option bits, and leaves
+        others alone.
+@@ -164,7 +164,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16               form_field_opts(3x)
++ncurses 6.5                       2025-01-18               form_field_opts(3x)
+ 
                                                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                                                            
+Index: doc/html/man/form_field_validation.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/form_field_validation.3x.html	2024-12-28 21:43:57.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/form_field_validation.3x.html	2025-01-19 00:55:00.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-form_field_validation 3x 2024-12-28 ncurses 6.5 Library calls
++form_field_validation 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                            form_field_validation 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                            
++
                                                                                                                                                                                                                                                            form_field_validation 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                                                            + form_field_validation(3x)        Library calls       form_field_validation(3x)
+ 
+@@ -221,7 +221,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28         form_field_validation(3x)
++ncurses 6.5                       2025-01-18         form_field_validation(3x)
+ 
                                                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                                                              
+Index: doc/html/man/form_fieldtype.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/form_fieldtype.3x.html	2024-12-28 21:43:57.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/form_fieldtype.3x.html	2025-01-19 00:55:00.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-form_fieldtype 3x 2024-12-28 ncurses 6.5 Library calls
++form_fieldtype 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                              form_fieldtype 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                              
++
                                                                                                                                                                                                                                                              form_fieldtype 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                                              + form_fieldtype(3x)               Library calls              form_fieldtype(3x)
+ 
+@@ -136,7 +136,7 @@
+ 
+ 
                                                                                                                                                                                                                                                              link_fieldtype
                                                                                                                                                                                                                                                              +        The function link_fieldtype creates a new field type from the two given
+-       types.  They are connected by an logical 'OR'.
++       types.  They are connected by a logical "or".
+ 
+ 
+ 
                                                                                                                                                                                                                                                              RETURN VALUE
                                                                                                                                                                                                                                                              +@@ -183,7 +183,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                form_fieldtype(3x)
++ncurses 6.5                       2025-01-18                form_fieldtype(3x)
+ 
                                                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                                                
+Index: doc/html/man/form_opts.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/form_opts.3x.html	2024-04-27 18:38:48.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/form_opts.3x.html	2025-01-19 00:55:00.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-form_opts 3x 2024-03-16 ncurses 6.5 Library calls
++form_opts 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                form_opts 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                
++
                                                                                                                                                                                                                                                                form_opts 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                                                + form_opts(3x)                    Library calls                   form_opts(3x)
+ 
+@@ -63,7 +63,7 @@
+ 
+ 
                                                                                                                                                                                                                                                                DESCRIPTION
                                                                                                                                                                                                                                                                +        The function set_form_opts sets all the given form's option bits  (form
+-       option bits may be logically-OR'ed together).
++       option bits may be logically "or"-ed together).
+ 
+        The  function  form_opts_on  turns on the given option bits, and leaves
+        others alone.
+@@ -108,7 +108,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                     form_opts(3x)
++ncurses 6.5                       2025-01-18                     form_opts(3x)
+ 
                                                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                                                  
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.5-20250111+/doc/html/man/infocmp.1m.html	2024-12-28 21:43:57.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/infocmp.1m.html	2025-01-19 00:55:00.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-infocmp 1m 2024-12-28 ncurses 6.5 User commands
++infocmp 1m 2025-01-18 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                  infocmp 1m 2024-12-28 ncurses 6.5 User commands
                                                                                                                                                                                                                                                                  
++
                                                                                                                                                                                                                                                                  infocmp 1m 2025-01-18 ncurses 6.5 User commands
                                                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                                                  + infocmp(1m)                      User commands                     infocmp(1m)
+ 
+@@ -218,7 +218,7 @@
+        are superfluous.  infocmp will flag any other terminal-type use= fields
+        that were not needed.
+ 
+-   Changing Databases [-A directory] [-B directory]
++   Changing Databases [-A directory] [-B directory]
+        Like  other  ncurses  utilities,  infocmp  looks   for   the   terminal
+        descriptions   in  several  places.   You  can  use  the  TERMINFO  and
+        TERMINFO_DIRS environment variables to override the compiled-in default
+@@ -475,7 +475,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                                  PORTABILITY
                                                                                                                                                                                                                                                                  +-       X/Open  Curses,  Issue 7 (2009) specifies infocmp.  It does not mention
++       X/Open  Curses  Issue 7  (2009) specifies infocmp.  It does not mention
+        options for producing descriptions in termcap format.
+ 
+        SVr4  infocmp  does  not  distinguish  between  absent   and   canceled
+@@ -531,7 +531,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                       infocmp(1m)
++ncurses 6.5                       2025-01-18                       infocmp(1m)
+ 
                                                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                                                                    
+Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.5-20250111+/doc/html/man/infotocap.1m.html	2024-07-27 23:11:33.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/infotocap.1m.html	2025-01-19 00:55:00.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-infotocap 1m 2024-07-27 ncurses 6.5 User commands
++infotocap 1m 2025-01-18 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                    infotocap 1m 2024-07-27 ncurses 6.5 User commands
                                                                                                                                                                                                                                                                    
++
                                                                                                                                                                                                                                                                    infotocap 1m 2025-01-18 ncurses 6.5 User commands
                                                                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                                                                    + infotocap(1m)                    User commands                   infotocap(1m)
+ 
+@@ -76,7 +76,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                                    PORTABILITY
                                                                                                                                                                                                                                                                    +-       None  of  X/Open  Curses, Issue 7 (2009), SVr4, or NetBSD document this
++       None  of  X/Open  Curses  Issue 7 (2009), SVr4, or NetBSD document this
+        application.
+ 
+ 
+@@ -90,7 +90,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                     infotocap(1m)
++ncurses 6.5                       2025-01-18                     infotocap(1m)
+ 
                                                                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                                                                      
+Index: doc/html/man/menu_opts.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/menu_opts.3x.html	2024-04-27 18:38:48.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/menu_opts.3x.html	2025-01-19 00:55:01.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-menu_opts 3x 2024-03-16 ncurses 6.5 Library calls
++menu_opts 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                      menu_opts 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                      
++
                                                                                                                                                                                                                                                                      menu_opts 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                                                                      + menu_opts(3x)                    Library calls                   menu_opts(3x)
+ 
+@@ -63,7 +63,7 @@
+ 
+ 
                                                                                                                                                                                                                                                                      DESCRIPTION
                                                                                                                                                                                                                                                                      +        The function set_menu_opts sets all the given menu's option bits  (menu
+-       option bits may be logically-OR'ed together).
++       option bits may be logically "or"-ed together).
+ 
+        The  function  menu_opts_on  turns on the given option bits, and leaves
+        others alone.
+@@ -128,7 +128,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                     menu_opts(3x)
++ncurses 6.5                       2025-01-18                     menu_opts(3x)
+ 
                                                                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                                                                        
+Index: doc/html/man/mitem_opts.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/mitem_opts.3x.html	2024-04-27 18:38:49.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/mitem_opts.3x.html	2025-01-19 00:55:01.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-mitem_opts 3x 2024-03-16 ncurses 6.5 Library calls
++mitem_opts 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                        mitem_opts 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                        
++
                                                                                                                                                                                                                                                                        mitem_opts 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                                                                        + mitem_opts(3x)                   Library calls                  mitem_opts(3x)
+ 
+@@ -63,7 +63,7 @@
+ 
+ 
                                                                                                                                                                                                                                                                        DESCRIPTION
                                                                                                                                                                                                                                                                        +        The function set_item_opts sets all the given item's option bits  (menu
+-       option bits may be logically-OR'ed together).
++       option bits may be logically "or"-ed together).
+ 
+        The  function  item_opts_on  turns on the given option bits, and leaves
+        others alone.
+@@ -102,7 +102,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                    mitem_opts(3x)
++ncurses 6.5                       2025-01-18                    mitem_opts(3x)
+ 
                                                                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                                                                          
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/ncurses.3x.html	2024-12-28 21:43:58.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/ncurses.3x.html	2025-01-19 00:55:01.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-ncurses 3x 2024-12-28 ncurses 6.5 Library calls
++ncurses 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                          ncurses 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                          
++
                                                                                                                                                                                                                                                                          ncurses 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                                                                          + ncurses(3x)                      Library calls                     ncurses(3x)
+ 
+@@ -61,7 +61,7 @@
+        displays  with  output  optimized  to minimize screen updates.  ncurses
+        replaces the curses libraries from System V Release 4 Unix ("SVr4") and
+        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
+-       document describes ncurses version 6.5 (patch 20241228).
++       document describes ncurses version 6.5 (patch 20250118).
+ 
+        ncurses permits control of the terminal screen's contents;  abstraction
+        and  subdivision thereof with windows and pads; acquisition of keyboard
+@@ -214,128 +214,130 @@
+        If  the  environment  variables  LINES  and  COLUMNS are set, or if the
+        curses program is executing in a graphical windowing  environment,  the
+        information  obtained  thence  overrides that obtained by terminfo.  An
+-       ncurses extension supports resizable terminals; see wresize(3x).
++       ncurses   extension   supports   resizable   terminal   displays;   see
++       wresize(3x).
+ 
+-       If the environment variable  TERMINFO  is  defined,  a  curses  program
+-       checks  first  for  a  terminal  type  description  in  the location it
+-       identifies.  TERMINFO is useful for  developing  type  descriptions  or
++       If  the  environment  variable  TERMINFO  is  defined, a curses program
++       checks first for  a  terminal  type  description  in  the  location  it
++       identifies.   TERMINFO  is  useful  for developing type descriptions or
+        when write permission to /usr/share/terminfo is not available.
+ 
+        See section "ENVIRONMENT" below.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          Naming Conventions
                                                                                                                                                                                                                                                                          +-       curses  offers  many  functions in variant forms using a regular set of
+-       alternatives to the name of an elemental one.  Those prefixed with  "w"
+-       require  a  WINDOW  pointer  argument;  those  with a "mv" prefix first
++       curses offers many functions in variant forms using a  regular  set  of
++       alternatives  to the name of an elemental one.  Those prefixed with "w"
++       require a WINDOW pointer argument;  those  with  a  "mv"  prefix  first
+        perform cursor movement using wmove(3x); a "mvw" prefix indicates both.
+-       The  "w"  function  is typically the elemental one; the removal of this
++       The "w" function is typically the elemental one; the  removal  of  this
+        prefix usually indicates operation on stdscr.
+ 
+        Four functions prefixed with "p" require a pad argument; see below.
+ 
+-       In function synopses, ncurses man pages apply the  following  names  to
++       In  function  synopses,  ncurses man pages apply the following names to
+        parameters.  We introduce the character types in the next subsection.
+ 
+-                       bf    a bool (TRUE or FALSE)
+-                       c     a char or int
+-                       ch    a chtype
+-                       wc    a wchar_t or wint_t
+-                       wch   a cchar_t
+-                       win   pointer to a WINDOW
+-                       pad   pointer to a WINDOW that is a pad
++                bf     a bool (TRUE or FALSE)
++                c      a char or int
++                ch     a chtype
++                wc     a wchar_t or wint_t
++                wch    a cchar_t
++                win    pointer to a WINDOW
++                pad    pointer to a WINDOW that is a pad
++                pair   a foreground/background color pair identifier
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          Wide and Non-wide Character Configurations
                                                                                                                                                                                                                                                                          +-       This   man   page  primarily  surveys  functions  that  appear  in  any
++       This  man  page  primarily  surveys  functions  that  appear   in   any
+        configuration of the library.  There are two common configurations; see
+        section "ALTERNATE CONFIGURATIONS" below.
+ 
+        ncurses   is the library in its "non-wide" configuration, handling only
+-                 eight-bit characters.  It stores a  character  combined  with
+-                 attributes  and  a  color  pair identifier in a chtype datum,
++                 eight-bit  characters.   It  stores a character combined with
++                 attributes and a color pair identifier  in  a  chtype  datum,
+                  which  is  often  an  alias  of  int.   A  string  of  curses
+-                 characters  is  similar  to  a C char string; a chtype string
++                 characters is similar to a C char  string;  a  chtype  string
+                  ends with an integral 0, the null curses character.
+ 
+                  Attributes and a color pair identifier (with no corresponding
+-                 character)  can  be  stored  in variables of chtype or attr_t
+-                 type.  In either case, they are accessed via an integral  bit
++                 character) can be stored in variables  of  chtype  or  attr_t
++                 type.   In either case, they are accessed via an integral bit
+                  mask.
+ 
+-                 Each  cell  of a WINDOW is stored as a chtype.  X/Open Curses
+-                 does not specify the sizes of the  character  code  or  color
+-                 pair  identifier,  nor  the  quantity  of  attribute bits, in
+-                 chtype; these  are  implementation-dependent.   ncurses  uses
+-                 eight  bits for the character code.  An application requiring
+-                 a wider character type, for instance  to  represent  Unicode,
++                 Each cell of a WINDOW is stored as a chtype.   X/Open  Curses
++                 does  not  specify  the  sizes of the character code or color
++                 pair identifier, nor  the  quantity  of  attribute  bits,  in
++                 chtype;  these  are  implementation-dependent.   ncurses uses
++                 eight bits for the character code.  An application  requiring
++                 a  wider  character  type, for instance to represent Unicode,
+                  should use the wide-character API.
+ 
+-       ncursesw  is  the  library  in  its "wide" configuration, which handles
++       ncursesw  is the library in its  "wide"  configuration,  which  handles
+                  character encodings requiring a larger data type than char (a
+                  byte-sized  type)  can  represent.   It  provides  additional
+                  functions that complement those in the non-wide library where
+-                 the  size of the underlying character type is significant.  A
+-                 somewhat regular naming convention relates many of  the  wide
+-                 variants  to  their  non-wide  counterparts; where a non-wide
+-                 function name contains "ch" or "str", prefix it with "_w"  to
+-                 obtain  the  wide  counterpart.   For example, waddch becomes
++                 the size of the underlying character type is significant.   A
++                 somewhat  regular  naming convention relates many of the wide
++                 variants to their non-wide  counterparts;  where  a  non-wide
++                 function  name contains "ch" or "str", prefix it with "_w" to
++                 obtain the wide counterpart.   For  example,  waddch  becomes
+                  wadd_wch.  Another exception is ins_nwstr (and its variants),
+-                 spelled  thus  instead  of "insn_wstr".  (Exceptions that add
++                 spelled thus instead of "insn_wstr".   (Exceptions  that  add
+                  only "w" comprise addwstr, inwstr, and their variants.)
+ 
+-                 This convention is inapplicable  to  some  non-wide  function
++                 This  convention  is  inapplicable  to some non-wide function
+                  names,  so  other  transformations  are  used  for  the  wide
+                  configuration:  the  window  background  management  function
+-                 "bkgd"   becomes  "bkgrnd";  the  window  border-drawing  and
+-                 -clearing functions are suffixed with "_set";  and  character
+-                 attribute   manipulation   functions   like  "attron"  become
++                 "bkgd"  becomes  "bkgrnd";  the  window  border-drawing   and
++                 -clearing  functions  are suffixed with "_set"; and character
++                 attribute  manipulation  functions   like   "attron"   become
+                  "attr_on".
+ 
+                  cchar_t  is a curses complex character and corresponds to the
+-                          non-wide  configuration's chtype.  It is a structure
+-                          type  because  it  requires  more  storage  than   a
+-                          standard  scalar  type offers.  A character code may
+-                          not be representable as a char,  and  moreover  more
++                          non-wide configuration's chtype.  It is a  structure
++                          type   because  it  requires  more  storage  than  a
++                          standard scalar type offers.  A character  code  may
++                          not  be  representable  as a char, and moreover more
+                           than one character may occupy a cell (as with accent
+-                          marks and other diacritics).  Each character  is  of
++                          marks  and  other diacritics).  Each character is of
+                           type  wchar_t;  a  complex  character  contains  one
+                           spacing  character  and  zero  or  more  non-spacing
+-                          characters   (see   below).   A  string  of  complex
+-                          characters ends with a cchar_t whose wchar_t  member
+-                          is  the null wide character.  Attributes and a color
++                          characters  (see  below).   A  string   of   complex
++                          characters  ends with a cchar_t whose wchar_t member
++                          is the null wide character.  Attributes and a  color
+                           pair identifier are stored in separate fields of the
+                           structure,  not  combined  into  an  integer  as  in
+                           chtype.
+ 
+-                 Each cell of a WINDOW is stored as a  cchar_t.   setcchar(3x)
++                 Each  cell  of a WINDOW is stored as a cchar_t.  setcchar(3x)
+                  and getcchar(3x) store and retrieve cchar_t data.
+ 
+-                 The  wide  library  API  of ncurses depends on two data types
++                 The wide library API of ncurses depends  on  two  data  types
+                  standardized by ISO C95.
+ 
+-                 wchar_t  stores a wide character.  Like chtype, it may be  an
+-                          alias  of int.  Depending on the character encoding,
+-                          a wide character may be  spacing,  meaning  that  it
+-                          occupies  a  character  cell by itself and typically
+-                          accompanies  cursor  advancement,  or   non-spacing,
+-                          meaning  that it occupies the same cell as a spacing
+-                          character, is often regarded as a "modifier" of  the
+-                          base  glyph  with  which  it combines, and typically
++                 wchar_t  stores  a wide character.  Like chtype, it may be an
++                          alias of int.  Depending on the character  encoding,
++                          a  wide  character  may  be spacing, meaning that it
++                          occupies a character cell by  itself  and  typically
++                          accompanies   cursor  advancement,  or  non-spacing,
++                          meaning that it occupies the same cell as a  spacing
++                          character,  is often regarded as a "modifier" of the
++                          base glyph with which  it  combines,  and  typically
+                           does not advance the cursor.
+ 
+-                 wint_t   can  store  a  wchar_t   or   the   constant   WEOF,
+-                          analogously  to the int-sized character manipulation
++                 wint_t   can   store   a   wchar_t   or  the  constant  WEOF,
++                          analogously to the int-sized character  manipulation
+                           functions of ISO C and its constant EOF.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          Function Name Index
                                                                                                                                                                                                                                                                          +        The following table lists the curses functions provided in the non-wide
+-       and  wide  APIs  and  the  corresponding  man pages that describe them.
+-       Those flagged with  "*"  are  ncurses-specific,  neither  described  by
++       and wide APIs and the  corresponding  man  pages  that  describe  them.
++       Those  flagged  with  "*"  are  ncurses-specific,  neither described by
+        X/Open Curses nor present in SVr4.
+ 
+-                    curses Function Name     Man Page
++                    curses Function Name     Man Page
+                     ---------------------------------------------
+                     COLOR_PAIR               curs_color(3x)
+                     PAIR_NUMBER              curs_color(3x)
+@@ -383,9 +385,9 @@
+                     curses_version           curs_extend(3x)*
+                     def_prog_mode            curs_kernel(3x)
+                     def_shell_mode           curs_kernel(3x)
++
+                     define_key               define_key(3x)*
+                     del_curterm              curs_terminfo(3x)
+-
+                     delay_output             curs_util(3x)
+                     delch                    curs_delch(3x)
+                     deleteln                 curs_deleteln(3x)
+@@ -450,9 +452,9 @@
+                     immedok                  curs_outopts(3x)
+                     in_wch                   curs_in_wch(3x)
+                     in_wchnstr               curs_in_wchstr(3x)
++
+                     in_wchstr                curs_in_wchstr(3x)
+                     inch                     curs_inch(3x)
+-
+                     inchnstr                 curs_inchstr(3x)
+                     inchstr                  curs_inchstr(3x)
+                     init_color               curs_color(3x)
+@@ -517,9 +519,9 @@
+                     mvaddchstr               curs_addchstr(3x)
+                     mvaddnstr                curs_addstr(3x)
+                     mvaddnwstr               curs_addwstr(3x)
++
+                     mvaddstr                 curs_addstr(3x)
+                     mvaddwstr                curs_addwstr(3x)
+-
+                     mvchgat                  curs_attr(3x)
+                     mvcur                    curs_kernel(3x)
+                     mvdelch                  curs_delch(3x)
+@@ -584,9 +586,9 @@
+                     mvwins_nwstr             curs_ins_wstr(3x)
+                     mvwins_wch               curs_ins_wch(3x)
+                     mvwins_wstr              curs_ins_wstr(3x)
++
+                     mvwinsch                 curs_insch(3x)
+                     mvwinsnstr               curs_insstr(3x)
+-
+                     mvwinsstr                curs_insstr(3x)
+                     mvwinstr                 curs_instr(3x)
+                     mvwinwstr                curs_inwstr(3x)
+@@ -651,9 +653,9 @@
+                     slk_attr_on              curs_slk(3x)
+                     slk_attr_set             curs_slk(3x)
+                     slk_attroff              curs_slk(3x)
++
+                     slk_attron               curs_slk(3x)
+                     slk_attrset              curs_slk(3x)
+-
+                     slk_clear                curs_slk(3x)
+                     slk_color                curs_slk(3x)
+                     slk_init                 curs_slk(3x)
+@@ -718,9 +720,9 @@
+                     wadd_wchnstr             curs_add_wchstr(3x)
+                     wadd_wchstr              curs_add_wchstr(3x)
+                     waddch                   curs_addch(3x)
++
+                     waddchnstr               curs_addchstr(3x)
+                     waddchstr                curs_addchstr(3x)
+-
+                     waddnstr                 curs_addstr(3x)
+                     waddnwstr                curs_addwstr(3x)
+                     waddstr                  curs_addstr(3x)
+@@ -785,9 +787,9 @@
+                     wnoutrefresh             curs_refresh(3x)
+                     wprintw                  curs_printw(3x)
+                     wredrawln                curs_refresh(3x)
++
+                     wrefresh                 curs_refresh(3x)
+                     wresize                  wresize(3x)*
+-
+                     wscanw                   curs_scanw(3x)
+                     wscrl                    curs_scroll(3x)
+                     wsetscrreg               curs_outopts(3x)
+@@ -801,43 +803,43 @@
+                     wvline                   curs_border(3x)
+                     wvline_set               curs_border_set(3x)
+ 
+-       ncurses's    screen-pointer   extension   adds   additional   functions
+-       corresponding to many of the above, each  with  an  "_sp"  suffix;  see
++       ncurses's   screen-pointer   extension   adds   additional    functions
++       corresponding  to  many  of  the  above, each with an "_sp" suffix; see
+        curs_sp_funcs(3x).
+ 
+-       The  availability  of  some  extensions is configurable when ncurses is
+-       compiled; see  sections  "ALTERNATE  CONFIGURATIONS"  and  "EXTENSIONS"
++       The availability of some extensions is  configurable  when  ncurses  is
++       compiled;  see  sections  "ALTERNATE  CONFIGURATIONS"  and "EXTENSIONS"
+        below.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          RETURN VALUE
                                                                                                                                                                                                                                                                          +-       Unless  otherwise  noted,  functions  that  return  integers return the
+-       constants OK on success and ERR  on  failure;  see  curs_variables(3x).
+-       Functions  that  return  pointers  return  NULL on failure.  Typically,
+-       ncurses treats a null pointer passed  as  a  function  parameter  as  a
+-       failure.   Functions  prefixed  with "mv" first perform cursor movement
++       Unless otherwise noted,  functions  that  return  integers  return  the
++       constants  OK  on  success  and ERR on failure; see curs_variables(3x).
++       Functions that return pointers  return  NULL  on  failure.   Typically,
++       ncurses  treats  a  null  pointer  passed  as a function parameter as a
++       failure.  Functions prefixed with "mv" first  perform  cursor  movement
+        and fail if the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          ENVIRONMENT
                                                                                                                                                                                                                                                                          +-       The following  symbols  from  the  process  environment  customize  the
+-       runtime   behavior   of  ncurses  applications.   The  library  may  be
+-       configured  to  disregard  the   variables   TERMINFO,   TERMINFO_DIRS,
+-       TERMPATH,  and  HOME,  if  the  user  is  the  superuser (root), or the
++       The  following  symbols  from  the  process  environment  customize the
++       runtime  behavior  of  ncurses  applications.   The  library   may   be
++       configured   to   disregard   the  variables  TERMINFO,  TERMINFO_DIRS,
++       TERMPATH, and HOME, if  the  user  is  the  superuser  (root),  or  the
+        application uses setuid(2) or setgid(2).
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          BAUDRATE
                                                                                                                                                                                                                                                                          +-       The debugging library checks this variable  when  the  application  has
+-       redirected  output to a file.  ncurses interprets its integral value as
+-       the terminal's line speed in bits per second.  If that value is  absent
+-       or  invalid,  ncurses  uses  9600.   This  feature allows developers to
+-       construct repeatable test cases that  take  into  account  optimization
++       The  debugging  library  checks  this variable when the application has
++       redirected output to a file.  ncurses interprets its integral value  as
++       the  terminal's line speed in bits per second.  If that value is absent
++       or invalid, ncurses uses  9600.   This  feature  allows  developers  to
++       construct  repeatable  test  cases  that take into account optimization
+        decisions that depend on the terminal's line speed.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          CC (command character)
                                                                                                                                                                                                                                                                          +-       When  set,  the  command_character  (cmdch)  capability value of loaded
++       When set, the command_character  (cmdch)  capability  value  of  loaded
+        terminfo entries changes to the value of this variable.  Very few term-
+        info entries provide this feature.
+ 
+@@ -848,192 +850,192 @@
+ 
+ 
                                                                                                                                                                                                                                                                          COLUMNS
                                                                                                                                                                                                                                                                          +        This  variable  specifies  the  width  of  the  screen  in  characters.
+-       Applications running in a windowing environment  usually  are  able  to
+-       obtain  the  width  of the window in which they are executing.  ncurses
+-       enforces an upper limit of 512 when reading the value.  If  COLUMNS  is
+-       not  defined  and  the terminal's screen size is not available from the
+-       terminal driver, ncurses uses the size specified by the columns  (cols)
+-       capability  of  the  terminal type's entry in the terminfo database, if
++       Applications  running  in  a  windowing environment usually are able to
++       obtain the width of the window in which they  are  executing.   ncurses
++       enforces  an  upper limit of 512 when reading the value.  If COLUMNS is
++       not defined and the terminal's screen size is not  available  from  the
++       terminal  driver, ncurses uses the size specified by the columns (cols)
++       capability of the terminal type's entry in the  terminfo  database,  if
+        any.
+ 
+-       It is important that your application  use  the  correct  screen  size.
+-       Automatic   detection   thereof  is  not  always  possible  because  an
+-       application may  be  running  on  a  host  that  does  not  honor  NAWS
+-       (Negotiations  About  Window  Size)  or as a different user ID than the
+-       owner of the  terminal  device  file.   Setting  COLUMNS  and/or  LINES
+-       overrides  the  library's  use  of  the  screen  size obtained from the
++       It  is  important  that  your  application use the correct screen size.
++       Automatic  detection  thereof  is  not  always  possible   because   an
++       application  may  be  running  on  a  host  that  does  not  honor NAWS
++       (Negotiations About Window Size) or as a different  user  ID  than  the
++       owner  of  the  terminal  device  file.   Setting  COLUMNS and/or LINES
++       overrides the library's use  of  the  screen  size  obtained  from  the
+        operating system.
+ 
+-       The COLUMNS and LINES variables may be specified  independently.   This
+-       property  is  useful  to circumvent misfeatures of legacy terminal type
+-       descriptions; xterm(1)  descriptions  specifying  65  lines  were  once
+-       notorious.    For   best  results,  avoid  specifying  cols  and  lines
++       The  COLUMNS  and LINES variables may be specified independently.  This
++       property is useful to circumvent misfeatures of  legacy  terminal  type
++       descriptions;  xterm(1)  descriptions  specifying  65  lines  were once
++       notorious.   For  best  results,  avoid  specifying  cols   and   lines
+        capability codes in terminfo descriptions of terminal emulators.
+ 
+-       use_env(3x) can disable use of the process environment  in  determining
+-       the  screen size.  use_tioctl(3x) can update COLUMNS and LINES to match
++       use_env(3x)  can  disable use of the process environment in determining
++       the screen size.  use_tioctl(3x) can update COLUMNS and LINES to  match
+        the screen size obtained from system calls or the terminal database.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          ESCDELAY
                                                                                                                                                                                                                                                                          +-       For curses to distinguish the ESC character  resulting  from  a  user's
+-       press  of  the  "Escape"  key on the input device from one beginning an
++       For  curses  to  distinguish  the ESC character resulting from a user's
++       press of the "Escape" key on the input device  from  one  beginning  an
+        escape sequence (as commonly produced by function keys), it waits after
+-       receiving  the  escape  character  to  see  if  further  characters are
+-       available on the input  stream  within  a  short  interval.   A  global
+-       variable  ESCDELAY  stores  this interval in milliseconds.  The default
++       receiving the  escape  character  to  see  if  further  characters  are
++       available  on  the  input  stream  within  a  short interval.  A global
++       variable ESCDELAY stores this interval in  milliseconds.   The  default
+        value of 1000 (one second) is adequate for most uses.  This environment
+-       variable  overrides  it;  ncurses enforces an upper limit of 30,000 (30
++       variable overrides it; ncurses enforces an upper limit  of  30,000  (30
+        seconds) when reading the value.
+ 
+-       The most common instance where you may wish to change this value is  to
++       The  most common instance where you may wish to change this value is to
+        work with a remote host over a slow communication channel.  If the host
+-       running a curses application does not  receive  the  characters  of  an
+-       escape  sequence  in a timely manner, the library can interpret them as
++       running  a  curses  application  does  not receive the characters of an
++       escape sequence in a timely manner, the library can interpret  them  as
+        multiple key stroke events.
+ 
+        xterm(1) mouse events are a form of escape sequence; therefore, if your
+-       application  makes  heavy  use  of  multiple-clicking,  you may wish to
+-       lengthen the default value because the delay applies to  the  composite
++       application makes heavy use  of  multiple-clicking,  you  may  wish  to
++       lengthen  the  default value because the delay applies to the composite
+        multi-click event as well as the individual clicks.
+ 
+-       Portable  applications should not rely upon the presence of ESCDELAY in
+-       either form, but setting  the  environment  variable  rather  than  the
++       Portable applications should not rely upon the presence of ESCDELAY  in
++       either  form,  but  setting  the  environment  variable rather than the
+        global variable does not create problems when compiling an application.
+ 
+-       If  keypad(3x)  is  disabled  for  the curses window receiving input, a
++       If keypad(3x) is disabled for the  curses  window  receiving  input,  a
+        program must disambiguate escape sequences itself.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          HOME
                                                                                                                                                                                                                                                                          +-       ncurses may read and write auxiliary terminal descriptions in  .termcap
++       ncurses  may read and write auxiliary terminal descriptions in .termcap
+        and .terminfo files in the user's home directory.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          LINES
                                                                                                                                                                                                                                                                          +-       This  counterpart  to  COLUMNS  specifies  the  height of the screen in
+-       characters.  The corresponding terminfo capability and code  is  lines.
++       This counterpart to COLUMNS specifies  the  height  of  the  screen  in
++       characters.   The  corresponding terminfo capability and code is lines.
+        See the description of the COLUMNS variable above.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          MOUSE_BUTTONS_123
                                                                                                                                                                                                                                                                          +-       (OS/2  EMX  port only) OS/2 numbers a three-button mouse inconsistently
+-       with other platforms, such that 1 is the left button, 2 the right,  and
+-       3  the  middle.   This  variable customizes the mouse button numbering.
+-       Its value must be three digits 1-3 in any order.  By  default,  ncurses
++       (OS/2 EMX port only) OS/2 numbers a three-button  mouse  inconsistently
++       with  other platforms, such that 1 is the left button, 2 the right, and
++       3 the middle.  This variable customizes  the  mouse  button  numbering.
++       Its  value  must be three digits 1-3 in any order.  By default, ncurses
+        assumes a numbering of "132".
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          NCURSES_ASSUMED_COLORS
                                                                                                                                                                                                                                                                          +-       If  set,  this  variable  overrides  the  ncurses library's compiled-in
+-       assumption that the terminal's default colors are white on  black;  see
+-       default_colors(3x).   Set  the  foreground  and background color values
+-       with this environment variable  by  assigning  it  two  integer  values
++       If set, this  variable  overrides  the  ncurses  library's  compiled-in
++       assumption  that  the terminal's default colors are white on black; see
++       default_colors(3x).  Set the foreground  and  background  color  values
++       with  this  environment  variable  by  assigning  it two integer values
+        separated  by  a  comma,  indicating  foregound  and  background  color
+        numbers, respectively.
+ 
+-       For example, to tell ncurses not to assume anything about  the  colors,
+-       use  a  value  of  "-1,-1".   To make the default color scheme green on
+-       black, use "2,0".  ncurses accepts integral values from -1  up  to  the
++       For  example,  to tell ncurses not to assume anything about the colors,
++       use a value of "-1,-1".  To make the  default  color  scheme  green  on
++       black,  use  "2,0".   ncurses accepts integral values from -1 up to the
+        value of the terminfo max_colors (colors) capability.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          NCURSES_CONSOLE2
                                                                                                                                                                                                                                                                          +-       (MinGW   port  only)  The  Console2  program  defectively  handles  the
+-       Microsoft Console  API  call  CreateConsoleScreenBuffer.   Applications
+-       that  use it will hang.  However, it is possible to simulate the action
+-       of this call by mapping coordinates, explicitly  saving  and  restoring
+-       the  original  screen contents.  Setting the environment variable NCGDB
++       (MinGW  port  only)  The  Console2  program  defectively  handles   the
++       Microsoft  Console  API  call  CreateConsoleScreenBuffer.  Applications
++       that use it will hang.  However, it is possible to simulate the  action
++       of  this  call  by mapping coordinates, explicitly saving and restoring
++       the original screen contents.  Setting the environment  variable  NCGDB
+        has the same effect.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          NCURSES_GPM_TERMS
                                                                                                                                                                                                                                                                          +-       (Linux only) When ncurses is configured to use the GPM interface,  this
+-       variable  may  list  one  or  more  terminal  type  names, delimited by
+-       vertical bars (|) or colons (:), against which the TERM  variable  (see
+-       below)  is  matched.   An empty value disables the GPM interface, using
+-       ncurses's built-in support for xterm(1) mouse  protocols  instead.   If
+-       the  variable  is absent, ncurses attempts to open GPM if TERM contains
++       (Linux  only) When ncurses is configured to use the GPM interface, this
++       variable may list  one  or  more  terminal  type  names,  delimited  by
++       vertical  bars  (|) or colons (:), against which the TERM variable (see
++       below) is matched.  An empty value disables the  GPM  interface,  using
++       ncurses's  built-in  support  for xterm(1) mouse protocols instead.  If
++       the variable is absent, ncurses attempts to open GPM if  TERM  contains
+        "linux".
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          NCURSES_NO_HARD_TABS
                                                                                                                                                                                                                                                                          +-       ncurses may use tab characters in  cursor  movement  optimization.   In
+-       some  cases,  your  terminal  driver may not handle them properly.  Set
++       ncurses  may  use  tab  characters in cursor movement optimization.  In
++       some cases, your terminal driver may not  handle  them  properly.   Set
+        this environment variable to any value to disable the feature.  You can
+        also adjust your stty(1) settings to avoid the problem.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          NCURSES_NO_MAGIC_COOKIE
                                                                                                                                                                                                                                                                          +-       Many  terminals  store  video  attributes  as a property of a character
+-       cell, as curses does.  Historically, some  recorded  changes  in  video
+-       attributes  as  data  that  logically  occupies  character cells on the
+-       display, switching attributes on or off, similarly to tags in a  markup
+-       language;  these  are  termed "magic cookies", and must be subsequently
+-       overprinted.  If the terminfo entry for your  terminal  type  does  not
++       Many terminals store video attributes as  a  property  of  a  character
++       cell,  as  curses  does.   Historically, some recorded changes in video
++       attributes as data that  logically  occupies  character  cells  on  the
++       display,  switching attributes on or off, similarly to tags in a markup
++       language; these are termed "magic cookies", and  must  be  subsequently
++       overprinted.   If  the  terminfo  entry for your terminal type does not
+        adequately describe its handling of magic cookies, set this variable to
+        any value to instruct ncurses to disable attributes entirely.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          NCURSES_NO_PADDING
                                                                                                                                                                                                                                                                          +        Most  terminal  type  descriptions  in  the  terminfo  database  detail
+-       hardware   devices.   Many  people  use  curses-based  applications  in
+-       terminal emulator programs that run in a windowing environment.   These
+-       programs  can  duplicate  all  of  the important features of a hardware
+-       terminal, but often lack their limitations.  Chief among  these  absent
++       hardware  devices.   Many  people  use  curses-based  applications   in
++       terminal  emulator programs that run in a windowing environment.  These
++       programs can duplicate all of the  important  features  of  a  hardware
++       terminal,  but  often lack their limitations.  Chief among these absent
+        drawbacks is the problem of data flow management; that is, limiting the
+-       speed of communication to what the hardware  could  handle.   Unless  a
+-       hardware  terminal  is  interfaced  into a terminal concentrator (which
+-       does flow control), an application must manage flow itself  to  prevent
++       speed  of  communication  to  what the hardware could handle.  Unless a
++       hardware terminal is interfaced into  a  terminal  concentrator  (which
++       does  flow  control), an application must manage flow itself to prevent
+        overruns and data loss.
+ 
+-       A  solution  that  comes  at  no hardware cost is for an application to
+-       pause after directing a  terminal  to  execute  an  operation  that  it
+-       performs  slowly,  such  as  clearing  the display.  Many terminal type
+-       descriptions, including that for the VT100, embed delay  specifications
+-       in  capabilities.   You  may  wish  to  use these terminal descriptions
+-       without paying the performance penalty.  Set NCURSES_NO_PADDING to  any
+-       value  to disable all but mandatory padding.  Mandatory padding is used
++       A solution that comes at no hardware cost  is  for  an  application  to
++       pause  after  directing  a  terminal  to  execute  an operation that it
++       performs slowly, such as clearing  the  display.   Many  terminal  type
++       descriptions,  including that for the VT100, embed delay specifications
++       in capabilities.  You may  wish  to  use  these  terminal  descriptions
++       without  paying the performance penalty.  Set NCURSES_NO_PADDING to any
++       value to disable all but mandatory padding.  Mandatory padding is  used
+        by such terminal capabilities as flash_screen (flash).
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          NCURSES_NO_SETBUF
                                                                                                                                                                                                                                                                          +-       (Obsolete) Prior to internal changes developed in ncurses 5.9  (patches
+-       20120825  through 20130126), the library used setbuf(3) to enable fully
+-       buffered output when initializing the terminal.  This was done,  as  in
+-       SVr4  curses,  to  increase performance.  For testing purposes, both of
+-       ncurses and of certain applications, this feature  was  made  optional.
+-       Setting  this  variable  disabled  output buffering, leaving the output
++       (Obsolete)  Prior to internal changes developed in ncurses 5.9 (patches
++       20120825 through 20130126), the library used setbuf(3) to enable  fully
++       buffered  output  when initializing the terminal.  This was done, as in
++       SVr4 curses, to increase performance.  For testing  purposes,  both  of
++       ncurses  and  of  certain applications, this feature was made optional.
++       Setting this variable disabled output  buffering,  leaving  the  output
+        stream in the original (usually line-buffered) mode.
+ 
+-       Nowadays, ncurses performs its own buffering and does not require  this
+-       workaround;  it  does  not  modify the buffering of the standard output
+-       stream.  This approach makes signal handling, as for  interrupts,  more
+-       robust.   A  drawback  is  that  certain  unconventional programs mixed
+-       stdio(3) calls with ncurses calls and (usually) got the  behavior  they
+-       expected.   This  is  no longer the case; ncurses does not write to the
++       Nowadays,  ncurses performs its own buffering and does not require this
++       workaround; it does not modify the buffering  of  the  standard  output
++       stream.   This  approach makes signal handling, as for interrupts, more
++       robust.  A drawback  is  that  certain  unconventional  programs  mixed
++       stdio(3)  calls  with ncurses calls and (usually) got the behavior they
++       expected.  This is no longer the case; ncurses does not  write  to  the
+        standard output file descriptor through a stdio-buffered stream.
+ 
+-       As a special case, low-level API calls such as putp(3x) still  use  the
+-       standard  output stream.  High-level curses calls such as printw(3x) do
++       As  a  special case, low-level API calls such as putp(3x) still use the
++       standard output stream.  High-level curses calls such as printw(3x)  do
+        not.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          NCURSES_NO_UTF8_ACS
                                                                                                                                                                                                                                                                          +-       At initialization, ncurses inspects the TERM environment  variable  for
+-       special   cases   where   VT100   forms-drawing   characters  (and  the
+-       corresponding alternate character set terminfo capabilities) are  known
++       At  initialization,  ncurses inspects the TERM environment variable for
++       special  cases  where   VT100   forms-drawing   characters   (and   the
++       corresponding  alternate character set terminfo capabilities) are known
+        to  be  unsupported  by  terminal  types  that  otherwise  claim  VT100
+        compatibility.  Specifically, when running in a UTF-8 locale, the Linux
+-       virtual  console device and the GNU screen(1) program ignore them.  Set
++       virtual console device and the GNU screen(1) program ignore them.   Set
+        this  variable  to  a  nonzero  value  to  instruct  ncurses  that  the
+        terminal's ACS support is broken; the library then outputs Unicode code
+        points that correspond to the forms-drawing characters.  Set it to zero
+        (or a non-integer) to disable the special check for terminal type names
+-       matching "linux" or "screen", directing ncurses to assume that the  ACS
++       matching  "linux" or "screen", directing ncurses to assume that the ACS
+        feature works if the terminal type description advertises it.
+ 
+-       As  an  alternative  to  use  of  this  variable, ncurses checks for an
++       As an alternative to use  of  this  variable,  ncurses  checks  for  an
+        extended terminfo numeric capability U8 that can be compiled using "tic
+        -x".  Examples follow.
+ 
+@@ -1046,62 +1048,62 @@
+           xterm-utf8|xterm relying on UTF-8 line-graphics,
+                   U8#1, use=xterm,
+ 
+-       The  two-character name "U8" was chosen to permit its use via ncurses's
++       The two-character name "U8" was chosen to permit its use via  ncurses's
+        termcap interface.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          NCURSES_TRACE
                                                                                                                                                                                                                                                                          +-       At initialization, ncurses (in its debugging configuration) checks  for
+-       this  variable's  presence.   If  defined  with  an integral value, the
++       At  initialization, ncurses (in its debugging configuration) checks for
++       this variable's presence.  If  defined  with  an  integral  value,  the
+        library calls curses_trace(3x) with that value as the argument.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          TERM
                                                                                                                                                                                                                                                                          +-       The TERM variable denotes the terminal type.  Each is distinct,  though
+-       many  are  similar.   It  is commonly set by terminal emulators to help
+-       applications find a  workable  terminal  description.   Some  choose  a
+-       popular  approximation  such as "ansi", "vt100", or "xterm" rather than
+-       an exact fit to their capabilities.  Not infrequently,  an  application
+-       will  have  problems  with that approach; for example, a key stroke may
+-       not operate  correctly,  or  produce  no  effect  but  seeming  garbage
++       The  TERM variable denotes the terminal type.  Each is distinct, though
++       many are similar.  It is commonly set by  terminal  emulators  to  help
++       applications  find  a  workable  terminal  description.   Some choose a
++       popular approximation such as "ansi", "vt100", or "xterm"  rather  than
++       an  exact  fit to their capabilities.  Not infrequently, an application
++       will have problems with that approach; for example, a  key  stroke  may
++       not  operate  correctly,  or  produce  no  effect  but  seeming garbage
+        characters on the screen.
+ 
+-       Setting  TERM  has  no effect on hardware operation; it affects the way
+-       applications communicate with the terminal.   Likewise,  as  a  general
+-       rule  (xterm(1)  being a rare exception), terminal emulators that allow
++       Setting TERM has no effect on hardware operation; it  affects  the  way
++       applications  communicate  with  the  terminal.  Likewise, as a general
++       rule (xterm(1) being a rare exception), terminal emulators  that  allow
+        you to specify TERM as a parameter or configuration value do not change
+        their behavior to match that setting.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          TERMCAP
                                                                                                                                                                                                                                                                          +        If ncurses is configured with termcap support, it checks for a terminal
+-       type description in termcap format if one in  terminfo  format  is  not
+-       available.   Setting  this variable directs ncurses to ignore the usual
+-       termcap database location, /etc/termcap; see TERMPATH  below.   TERMCAP
+-       should  contain  either  a terminal description (with newlines stripped
+-       out), or a file name indicating where the information required  by  the
++       type  description  in  termcap  format if one in terminfo format is not
++       available.  Setting this variable directs ncurses to ignore  the  usual
++       termcap  database  location, /etc/termcap; see TERMPATH below.  TERMCAP
++       should contain either a terminal description  (with  newlines  stripped
++       out),  or  a file name indicating where the information required by the
+        TERM environment variable is stored.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          TERMINFO
                                                                                                                                                                                                                                                                          +-       ncurses  can  be configured to read terminal type description databases
+-       in various locations using different formats.  This variable  overrides
++       ncurses can be configured to read terminal type  description  databases
++       in  various locations using different formats.  This variable overrides
+        the default location.
+ 
+-       o   Descriptions  in terminfo format are normally stored in a directory
++       o   Descriptions in terminfo format are normally stored in a  directory
+            tree using subdirectories named for the common first letters of the
+            terminal types named therein.  This is the scheme used in System V.
+ 
+        o   If ncurses is configured to use hashed databases, then TERMINFO may
+-           name its location,  such  as  /usr/share/terminfo.db,  rather  than
++           name  its  location,  such  as  /usr/share/terminfo.db, rather than
+            /usr/share/terminfo/.
+ 
+-       The  hashed  database  uses less disk space and is a little faster than
++       The hashed database uses less disk space and is a  little  faster  than
+        the directory tree.  However, some applications assume the existence of
+        the directory tree, and read it directly rather than using the terminfo
+        API.
+ 
+-       o   If ncurses is configured with termcap support,  this  variable  may
++       o   If  ncurses  is  configured with termcap support, this variable may
+            contain the location of a termcap file.
+ 
+        o   If the value of TERMINFO begins with "hex:" or "b64:", ncurses uses
+@@ -1111,10 +1113,10 @@
+                   TERMINFO=$(infocmp -0 -Q2 -q)
+                   export TERMINFO
+ 
+-           The  compiled  description  is  used  only if it corresponds to the
++           The compiled description is used only  if  it  corresponds  to  the
+            terminal type identified by TERM.
+ 
+-       Setting TERMINFO is the simplest, but  not  the  only,  way  to  direct
++       Setting  TERMINFO  is  the  simplest,  but  not the only, way to direct
+        ncurses to a terminal database.  The search path is as follows.
+ 
+        o   the last terminal database to which the running ncurses application
+@@ -1132,16 +1134,16 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          TERMINFO_DIRS
                                                                                                                                                                                                                                                                          +-       This variable specifies a list of locations, akin  to  PATH,  in  which
+-       ncurses  searches  for  the  terminal  type  descriptions  described by
+-       TERMINFO above.  The list items are separated by  colons  on  Unix  and
+-       semicolons  on  OS/2  EMX.   System V  terminfo  lacks  a corresponding
++       This  variable  specifies  a  list of locations, akin to PATH, in which
++       ncurses searches  for  the  terminal  type  descriptions  described  by
++       TERMINFO  above.   The  list  items are separated by colons on Unix and
++       semicolons on  OS/2  EMX.   System V  terminfo  lacks  a  corresponding
+        feature; TERMINFO_DIRS is an ncurses extension.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          TERMPATH
                                                                                                                                                                                                                                                                          +        If TERMCAP does not hold a terminal type description or file name, then
+-       ncurses  checks  the contents of TERMPATH, a list of locations, akin to
++       ncurses checks the contents of TERMPATH, a list of locations,  akin  to
+        PATH, in which it searches for termcap terminal type descriptions.  The
+        list items are separated by colons on Unix and semicolons on OS/2 EMX.
+ 
+@@ -1151,9 +1153,9 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          ALTERNATE CONFIGURATIONS
                                                                                                                                                                                                                                                                          +-       Many  different  ncurses configurations are possible, determined by the
+-       options given to the configure script when building the  library.   Run
+-       the  script  with  the  --help option to peruse them all.  A few are of
++       Many different ncurses configurations are possible, determined  by  the
++       options  given  to the configure script when building the library.  Run
++       the script with the --help option to peruse them all.   A  few  are  of
+        particular significance to the application developer employing ncurses.
+ 
+        --disable-overwrite
+@@ -1162,24 +1164,24 @@
+ 
+                 #include <curses.h>
+ 
+-            This  option  is used to avoid file name conflicts between ncurses
+-            and an existing curses installation on the system.  If ncurses  is
+-            installed  disabling  overwrite,  it  puts  its  header files in a
++            This option is used to avoid file name conflicts  between  ncurses
++            and  an existing curses installation on the system.  If ncurses is
++            installed disabling overwrite, it  puts  its  header  files  in  a
+             subdirectory.  Here is an example.
+ 
+                 #include <ncurses/curses.h>
+ 
+-            Installation also omits a  symbolic  link  that  would  cause  the
+-            compiler's  -lcurses  option  to  link  object  files with ncurses
++            Installation  also  omits  a  symbolic  link  that would cause the
++            compiler's -lcurses option  to  link  object  files  with  ncurses
+             instead of the system curses library.
+ 
+-            The directory used by this configuration of ncurses  is  shown  in
++            The  directory  used  by this configuration of ncurses is shown in
+             section "SYNOPSIS" above.
+ 
+        --enable-widec
+-            The   configure   script   renames   the   library   and  (if  the
+-            --disable-overwrite option is used) puts the  header  files  in  a
+-            different  subdirectory.   All  of  the  library  names have a "w"
++            The  configure  script   renames   the   library   and   (if   the
++            --disable-overwrite  option  is  used)  puts the header files in a
++            different subdirectory.  All of  the  library  names  have  a  "w"
+             appended to them, i.e., instead of
+ 
+                 -lncurses
+@@ -1188,62 +1190,62 @@
+ 
+                 -lncursesw
+ 
+-            You must also enable the wide-character  features  in  the  header
+-            file  when  compiling  for  the  wide-character library to use the
+-            extended (wide-character) functions.   The  symbol  which  enables
+-            these features has changed since X/Open Curses, Issue 4:
++            You  must  also  enable  the wide-character features in the header
++            file when compiling for the  wide-character  library  to  use  the
++            extended  (wide-character)  functions.   The  symbol which enables
++            these features has changed since X/Open Curses Issue 4:
+ 
+-            o   Originally,  the  wide-character  feature  required the symbol
++            o   Originally, the wide-character  feature  required  the  symbol
+                 _XOPEN_SOURCE_EXTENDED  but  that  was  only  valid  for  XPG4
+                 (1996).
+ 
+-            o   Later,  that was deemed conflicting with _XOPEN_SOURCE defined
++            o   Later, that was deemed conflicting with _XOPEN_SOURCE  defined
+                 to 500.
+ 
+-            o   As of mid-2018, none of the features  in  this  implementation
+-                require  a  _XOPEN_SOURCE  feature greater than 600.  However,
+-                X/Open Curses, Issue 7 (2009) recommends defining it to 700.
+-
+-            o   Alternatively,  you  can  enable  the  feature   by   defining
+-                NCURSES_WIDECHAR  with  the caveat that some other header file
+-                than curses.h may require a specific value  for  _XOPEN_SOURCE
++            o   As  of  mid-2018,  none of the features in this implementation
++                require a _XOPEN_SOURCE feature greater  than  600.   However,
++                X/Open Curses Issue 7 (2009) recommends defining it to 700.
++
++            o   Alternatively,   you   can  enable  the  feature  by  defining
++                NCURSES_WIDECHAR with the caveat that some other  header  file
++                than  curses.h  may require a specific value for _XOPEN_SOURCE
+                 (or a system-specific symbol).
+ 
+-            The  curses.h header file installed for the wide-character library
+-            is designed to be compatible with the non-wide  library's  header.
+-            Only  the  size  of the WINDOW structure differs; few applications
++            The curses.h header file installed for the wide-character  library
++            is  designed  to be compatible with the non-wide library's header.
++            Only the size of the WINDOW structure  differs;  few  applications
+             require more than pointers to WINDOWs.
+ 
+             If  the  headers  are  installed  allowing  overwrite,  the  wide-
+-            character  library's  headers  should  be installed last, to allow
++            character library's headers should be  installed  last,  to  allow
+             applications to be built using either library from the same set of
+             headers.
+ 
+        --with-pthread
+-            The  configure  script  renames  the  library.  All of the library
+-            names have a "t"  appended  to  them  (before  any  "w"  added  by
++            The configure script renames the  library.   All  of  the  library
++            names  have  a  "t"  appended  to  them  (before  any "w" added by
+             --enable-widec).
+ 
+             The global variables such as LINES are replaced by macros to allow
+             read-only access.  At the same time, setter-functions are provided
+-            to  set  these  values.   Some applications (very few) may require
++            to set these values.  Some applications  (very  few)  may  require
+             changes to work with this convention.
+ 
+        --with-shared
+        --with-normal
+        --with-debug
+        --with-profile
+-            The shared and normal  (static)  library  names  differ  by  their
+-            suffixes,  e.g.,  libncurses.so  and  libncurses.a.  The debug and
+-            profiling libraries add a "_g"  and  a  "_p"  to  the  root  names
++            The  shared  and  normal  (static)  library  names differ by their
++            suffixes, e.g., libncurses.so and  libncurses.a.   The  debug  and
++            profiling  libraries  add  a  "_g"  and  a  "_p" to the root names
+             respectively, e.g., libncurses_g.a and libncurses_p.a.
+ 
+        --with-termlib
+-            Low-level  functions  which do not depend upon whether the library
++            Low-level functions which do not depend upon whether  the  library
+             supports wide-characters, are provided in the tinfo library.
+ 
+-            By doing this, it is possible to share the tinfo  library  between
+-            wide/normal  configurations  as  well  as  reduce  the size of the
++            By  doing  this, it is possible to share the tinfo library between
++            wide/normal configurations as well  as  reduce  the  size  of  the
+             library when only low-level functions are needed.
+ 
+             Those functions are described in these pages:
+@@ -1263,8 +1265,8 @@
+             o   curs_util(3x) - miscellaneous curses utility routines
+ 
+        --with-trace
+-            The trace function normally resides in the debug library,  but  it
+-            is  sometimes  useful  to  configure  this  in the shared library.
++            The  trace  function normally resides in the debug library, but it
++            is sometimes useful to  configure  this  in  the  shared  library.
+             Configure scripts should check for the function's existence rather
+             than assuming it is always in the debug library.
+ 
+@@ -1278,213 +1280,213 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          NOTES
                                                                                                                                                                                                                                                                          +-       X/Open  Curses permits most functions it specifies to be made available
++       X/Open Curses permits most functions it specifies to be made  available
+        as macros as well.  ncurses does so
+ 
+        o   for functions that return values via their parameters,
+ 
+        o   to support obsolete features,
+ 
+-       o   to reuse functions (for example, those that move the cursor  before
++       o   to  reuse functions (for example, those that move the cursor before
+            another operation), and
+ 
+        o   in a few special cases.
+ 
+-       If  the  standard  output  file  descriptor  of  an  ncurses program is
+-       redirected to something that is not  a  terminal  device,  the  library
+-       writes  screen updates to the standard error file descriptor.  This was
++       If the standard  output  file  descriptor  of  an  ncurses  program  is
++       redirected  to  something  that  is  not a terminal device, the library
++       writes screen updates to the standard error file descriptor.  This  was
+        an undocumented feature of SVr3 curses.
+ 
+-       See subsection  "Header  Files"  below  regarding  symbols  exposed  by
++       See  subsection  "Header  Files"  below  regarding  symbols  exposed by
+        inclusion of curses.h.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          EXTENSIONS
                                                                                                                                                                                                                                                                          +-       ncurses  enables  an  application  to  capture  mouse events on certain
++       ncurses enables an application  to  capture  mouse  events  on  certain
+        terminals, including xterm(1); see curs_mouse(3x).
+ 
+-       ncurses provides a means of responding to window  resizing  events,  as
+-       when  running in a GUI terminal emulator application such as xterm; see
++       ncurses  provides  a  means of responding to window resizing events, as
++       when running in a GUI terminal emulator application such as xterm;  see
+        resizeterm(3x) and wresize(3x).
+ 
+        ncurses allows an application to query the terminal for the presence of
+        a wide variety of special keys; see has_key(3x).
+ 
+        ncurses extends the fixed set of function key capabilities specified by
+-       X/Open  Curses  by  allowing  the  application  programmer  to   define
+-       additional  key events at runtime; see define_key(3x), key_defined(3x),
++       X/Open   Curses  by  allowing  the  application  programmer  to  define
++       additional key events at runtime; see define_key(3x),  key_defined(3x),
+        keybound(3x), and keyok(3x).
+ 
+-       ncurses  can  exploit  the  capabilities  of   terminals   implementing
+-       ISO 6429/ECMA-48   SGR 39   and   SGR 49   sequences,  which  allow  an
+-       application to reset  the  terminal  to  its  original  foreground  and
+-       background  colors.  From a user's perspective, the application is able
+-       to draw colored text on a background whose color is set  independently,
++       ncurses   can   exploit  the  capabilities  of  terminals  implementing
++       ISO 6429/ECMA-48  SGR 39  and  SGR 49   sequences,   which   allow   an
++       application  to  reset  the  terminal  to  its  original foreground and
++       background colors.  From a user's perspective, the application is  able
++       to  draw colored text on a background whose color is set independently,
+        providing better control over color contrasts.  See default_colors(3x).
+ 
+-       An  ncurses  application  can  eschew  knowledge  of  SCREEN and WINDOW
+-       structure  internals,  instead  using  accessor   functions   such   as
++       An ncurses application  can  eschew  knowledge  of  SCREEN  and  WINDOW
++       structure   internals,   instead   using  accessor  functions  such  as
+        is_cbreak(3x) and is_scrollok(3x).
+ 
+-       ncurses  enables  an  application  to  direct  its  output to a printer
++       ncurses enables an application  to  direct  its  output  to  a  printer
+        attached to the terminal device; see curs_print(3x).
+ 
+-       ncurses offers slk_attr(3x) as a counterpart of attr_get(3x) for  soft-
+-       label  key lines, and extended_slk_color(3x) as a form of slk_color(3x)
+-       that can gather color  information  from  them  when  many  colors  are
++       ncurses  offers slk_attr(3x) as a counterpart of attr_get(3x) for soft-
++       label key lines, and extended_slk_color(3x) as a form of  slk_color(3x)
++       that  can  gather  color  information  from  them  when many colors are
+        supported.
+ 
+-       ncurses    permits   modification   of   unctrl(3x)'s   behavior;   see
++       ncurses   permits   modification   of   unctrl(3x)'s   behavior;    see
+        use_legacy_coding(3x).
+ 
+-       Rudimentary support for multi-threaded applications may  be  available;
++       Rudimentary  support  for multi-threaded applications may be available;
+        see curs_threads(3x).
+ 
+-       Functions  that ease the management of multiple screens can be exposed;
++       Functions that ease the management of multiple screens can be  exposed;
+        see curs_sp_funcs(3x).
+ 
+-       To aid applications to debug their  memory  usage,  ncurses  optionally
+-       offers  functions  to  more  aggressively  free  memory  it dynamically
++       To  aid  applications  to  debug their memory usage, ncurses optionally
++       offers functions  to  more  aggressively  free  memory  it  dynamically
+        allocates itself; see curs_memleaks(3x).
+ 
+-       The library facilitates auditing and troubleshooting of  its  behavior;
++       The  library  facilitates auditing and troubleshooting of its behavior;
+        see curs_trace(3x).
+ 
+-       Compiling  ncurses  with the option -DUSE_GETCAP causes it to fall back
+-       to reading /etc/termcap if the terminal setup code cannot find a  term-
++       Compiling ncurses with the option -DUSE_GETCAP causes it to  fall  back
++       to  reading /etc/termcap if the terminal setup code cannot find a term-
+        info  entry  corresponding  to  TERM.   Use  of  this  feature  is  not
+-       recommended, as it essentially includes an entire termcap  compiler  in
+-       the  ncurses  startup  code,  at a cost in memory usage and application
++       recommended,  as  it essentially includes an entire termcap compiler in
++       the ncurses startup code, at a cost in  memory  usage  and  application
+        launch latency.
+ 
+-       PDCurses  and  NetBSD  curses  incorporate  some  ncurses   extensions.
++       PDCurses   and  NetBSD  curses  incorporate  some  ncurses  extensions.
+        Individual man pages indicate where this is the case.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          PORTABILITY
                                                                                                                                                                                                                                                                          +        X/Open Curses defines two levels of conformance, "base" and "enhanced".
+        The latter includes several additional features, such as wide-character
+-       and  color support.  ncurses intends base-level conformance with X/Open
+-       Curses, and supports all features of  its  enhanced  level  except  the
++       and color support.  ncurses intends base-level conformance with  X/Open
++       Curses,  and  supports  all  features  of its enhanced level except the
+        untic utility.
+ 
+-       Differences  between  X/Open  Curses  and ncurses are documented in the
++       Differences between X/Open Curses and ncurses  are  documented  in  the
+        "PORTABILITY" sections of applicable man pages.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          Error Checking
                                                                                                                                                                                                                                                                          +-       In many cases, X/Open Curses is vague about error conditions,  omitting
++       In  many cases, X/Open Curses is vague about error conditions, omitting
+        some of the SVr4 documentation.
+ 
+-       Unlike  other  implementations, ncurses checks pointer parameters, such
+-       as those to WINDOW structures, to ensure that they are not null.   This
+-       is  done  primarily  to  guard  against programmer error.  The standard
++       Unlike other implementations, ncurses checks pointer  parameters,  such
++       as  those to WINDOW structures, to ensure that they are not null.  This
++       is done primarily to guard  against  programmer  error.   The  standard
+        interface does not provide a way for the library to tell an application
+-       which  of several possible errors occurred.  An application that relies
+-       on ncurses to check its function parameters  for  validity  limits  its
++       which of several possible errors occurred.  An application that  relies
++       on  ncurses  to  check  its function parameters for validity limits its
+        portability and robustness.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          Padding Differences
                                                                                                                                                                                                                                                                          +-       In  historical  curses implementations, delays embedded in the terminfo
+-       capabilities carriage_return (cr),  scroll_forward  (ind),  cursor_left
++       In historical curses implementations, delays embedded in  the  terminfo
++       capabilities  carriage_return  (cr),  scroll_forward (ind), cursor_left
+        (cub1), form_feed (ff), and tab (ht) activated corresponding delay bits
+-       in the Unix terminal driver.  ncurses performs all padding  by  sending
+-       NUL  bytes  to the device.  This method is slightly more expensive, but
+-       narrows  the  interface  to   the   Unix   kernel   significantly   and
++       in  the  Unix terminal driver.  ncurses performs all padding by sending
++       NUL bytes to the device.  This method is slightly more  expensive,  but
++       narrows   the   interface   to   the   Unix  kernel  significantly  and
+        correspondingly increases the package's portability.
+ 
+ 
+ 
                                                                                                                                                                                                                                                                          Header Files
                                                                                                                                                                                                                                                                          +-       The  header  file curses.h itself includes the header files stdio.h and
++       The header file curses.h itself includes the header files  stdio.h  and
+        unctrl.h.
+ 
+        X/Open Curses has more to say,
+ 
+-           The inclusion of curses.h may make visible  all  symbols  from  the
++           The  inclusion  of  curses.h  may make visible all symbols from the
+            headers stdio.h, term.h, termios.h, and wchar.h.
+ 
+        but does not finish the story.  A more complete account follows.
+ 
+        o   The first curses, in 4BSD, provided a curses.h file.
+ 
+-           BSD  curses  code  included  curses.h and unctrl.h from an internal
++           BSD curses code included curses.h and  unctrl.h  from  an  internal
+            header file curses.ext, where "ext" abbreviated "externs".
+ 
+-           The implementations of printw and scanw used undocumented  internal
+-           functions  of  the  standard I/O library (_doprnt and _doscan), but
++           The  implementations of printw and scanw used undocumented internal
++           functions of the standard I/O library (_doprnt  and  _doscan),  but
+            nothing in curses.h itself relied upon stdio.h.
+ 
+-       o   SVr2 curses added newterm, which relies upon  stdio.h  because  its
++       o   SVr2  curses  added  newterm, which relies upon stdio.h because its
+            function prototype employs the FILE type.
+ 
+            SVr4 curses added putwin and getwin, which also use stdio.h.
+ 
+            X/Open Curses specifies all three of these functions.
+ 
+-           SVr4  curses  and  X/Open  Curses  do  not require the developer to
+-           include stdio.h before curses.h.  Both document use  of  curses  as
++           SVr4 curses and X/Open Curses  do  not  require  the  developer  to
++           include  stdio.h  before  curses.h.  Both document use of curses as
+            requiring only curses.h.
+ 
+            As a result, standard curses.h always includes stdio.h.
+ 
+-       o   X/Open  Curses  and  SVr4  curses  are inconsistent with respect to
++       o   X/Open Curses and SVr4 curses  are  inconsistent  with  respect  to
+            unctrl.h.
+ 
+-           As noted in curs_util(3x), ncurses includes unctrl.h from  curses.h
++           As  noted in curs_util(3x), ncurses includes unctrl.h from curses.h
+            (as SVr4 does).
+ 
+-       o   X/Open  Curses's  comments  about term.h and termios.h may refer to
++       o   X/Open Curses's comments about term.h and termios.h  may  refer  to
+            HP-UX and AIX.
+ 
+-           HP-UX curses includes term.h from curses.h to declare setupterm  in
++           HP-UX  curses includes term.h from curses.h to declare setupterm in
+            curses.h, but ncurses and Solaris curses do not.
+ 
+-           AIX  curses  includes  term.h  and  termios.h.   Again, ncurses and
++           AIX curses includes  term.h  and  termios.h.   Again,  ncurses  and
+            Solaris curses do not.
+ 
+-       o   X/Open Curses says that curses.h may include term.h, but  does  not
++       o   X/Open  Curses  says that curses.h may include term.h, but does not
+            require it to do so.
+ 
+-           Some  programs  use functions declared in both curses.h and term.h,
+-           and must include both header files in the same  module.   Very  old
+-           versions  of  AIX  curses  required  inclusion  of  curses.h before
++           Some programs use functions declared in both curses.h  and  term.h,
++           and  must  include  both header files in the same module.  Very old
++           versions of  AIX  curses  required  inclusion  of  curses.h  before
+            term.h.
+ 
+-           The header files supplied by ncurses include the  standard  library
+-           headers  required  for  its  declarations,  so ncurses's own header
+-           files can be included in any order.  For portability  even  to  old
++           The  header  files supplied by ncurses include the standard library
++           headers required for its  declarations,  so  ncurses's  own  header
++           files  can  be  included in any order.  For portability even to old
+            AIX systems, include curses.h before term.h.
+ 
+-       o   X/Open  Curses  says  "may make visible" because including a header
+-           file does not necessarily make visible all of  the  symbols  in  it
++       o   X/Open Curses says "may make visible" because  including  a  header
++           file  does  not  necessarily  make visible all of the symbols in it
+            (consider #ifdef and similar).
+ 
+-           For  instance, ncurses's curses.h may include wchar.h if the proper
+-           symbol is defined, and if ncurses is configured for  wide-character
+-           support.   If  wchar.h is included, its symbols may be made visible
++           For instance, ncurses's curses.h may include wchar.h if the  proper
++           symbol  is defined, and if ncurses is configured for wide-character
++           support.  If wchar.h is included, its symbols may be  made  visible
+            depending on the value of the _XOPEN_SOURCE feature test macro.
+ 
+        o   X/Open Curses mandates an application's inclusion of one standard C
+-           library  header  in  a  special  case:  stdarg.h before curses.h to
+-           prototype the functions vw_printw and  vw_scanw  (as  well  as  the
+-           obsolete  vwprintw  and  vwscanw).   Each of these takes a variadic
++           library header in a  special  case:  stdarg.h  before  curses.h  to
++           prototype  the  functions  vw_printw  and  vw_scanw (as well as the
++           obsolete vwprintw and vwscanw).  Each of  these  takes  a  variadic
+            argument list, a va_list parameter, like that of printf(3).
+ 
+-           SVr3 curses introduced  the  two  obsolete  functions,  and  X/Open
+-           Curses  the  others.   In  between,  SVr4  curses  provided for the
+-           possibility that an application might include either  varargs.h  or
+-           stdarg.h.   These  represented  contrasting  approaches to handling
+-           variadic argument lists.  The older interface,  varargs.h,  used  a
+-           pointer  to char for variadic functions' va_list parameter.  Later,
+-           the list acquired its own standard data type, va_list,  defined  in
+-           stdarg.h,  empowering the compiler to check the types of a function
+-           call's actual parameters against the formal ones  declared  in  its
++           SVr3  curses  introduced  the  two  obsolete  functions, and X/Open
++           Curses the others.   In  between,  SVr4  curses  provided  for  the
++           possibility  that  an application might include either varargs.h or
++           stdarg.h.  These represented  contrasting  approaches  to  handling
++           variadic  argument  lists.   The older interface, varargs.h, used a
++           pointer to char for variadic functions' va_list parameter.   Later,
++           the  list  acquired its own standard data type, va_list, defined in
++           stdarg.h, empowering the compiler to check the types of a  function
++           call's  actual  parameters  against the formal ones declared in its
+            prototype.
+ 
+-           No   conforming   implementations   of  X/Open  Curses  require  an
++           No  conforming  implementations  of  X/Open   Curses   require   an
+            application to include stdarg.h before curses.h because they either
+-           have  allowed  for  a  special type, or, like ncurses, they include
++           have allowed for a special type, or,  like  ncurses,  they  include
+            stdarg.h themselves to provide a portable interface.
+ 
+ 
+@@ -1498,7 +1500,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                       ncurses(3x)
++ncurses 6.5                       2025-01-18                       ncurses(3x)
+ 
                                                                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                                                                            
+Index: doc/html/man/new_pair.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/new_pair.3x.html	2024-04-27 18:38:49.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/new_pair.3x.html	2025-01-19 00:55:01.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-new_pair 3x 2024-03-16 ncurses 6.5 Library calls
++new_pair 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                            new_pair 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                            
++
                                                                                                                                                                                                                                                                            new_pair 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                                                                            + new_pair(3x)                     Library calls                    new_pair(3x)
+ 
+@@ -107,7 +107,7 @@
+ 
+ 
                                                                                                                                                                                                                                                                            alloc_pair
                                                                                                                                                                                                                                                                            +        The   alloc_pair   function   accepts  parameters  for  foreground  and
+-       background color, and checks  if  that  color  combination  is  already
++       background color, and checks whether that color combination is  already
+        associated with a color pair.
+ 
+        o   If  the combination already exists, alloc_pair returns the existing
+@@ -128,8 +128,8 @@
+ 
+ 
                                                                                                                                                                                                                                                                            find_pair
                                                                                                                                                                                                                                                                            +        The find_pair function accepts parameters for foreground and background
+-       color,  and checks if that color combination is already associated with
+-       a color pair, returning the pair  number  if  it  has  been  allocated.
++       color,  and checks whether that color combination is already associated
++       with a color pair, returning the pair number if it has been  allocated.
+        Otherwise it returns -1.
+ 
+ 
+@@ -165,7 +165,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                      new_pair(3x)
++ncurses 6.5                       2025-01-18                      new_pair(3x)
+ 
                                                                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                                                                              
+Index: doc/html/man/scr_dump.5.html
+--- ncurses-6.5-20250111+/doc/html/man/scr_dump.5.html	2024-04-27 18:38:49.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/scr_dump.5.html	2025-01-19 00:55:01.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-scr_dump 5 2024-03-23 ncurses 6.5 File formats
++scr_dump 5 2025-01-18 ncurses 6.5 File formats
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                              scr_dump 5 2024-03-23 ncurses 6.5 File formats
                                                                                                                                                                                                                                                                              
++
                                                                                                                                                                                                                                                                              scr_dump 5 2025-01-18 ncurses 6.5 File formats
                                                                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                                                              + scr_dump(5)                      File formats                      scr_dump(5)
+ 
+@@ -130,7 +130,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                                                                              X/Open Curses
                                                                                                                                                                                                                                                                              +-       X/Open Curses, Issue 7 specifies little.  It  says  (boldface  emphasis
++       X/Open Curses Issue 7 specifies little.   It  says  (boldface  emphasis
+        added)
+ 
+           "[t]he  getwin()  function  reads  window-related data stored in the
+@@ -390,7 +390,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-23                       scr_dump(5)
++ncurses 6.5                       2025-01-18                       scr_dump(5)
+ 
                                                                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                                                                                
+Index: doc/html/man/tabs.1.html
+--- ncurses-6.5-20250111+/doc/html/man/tabs.1.html	2024-09-21 18:35:29.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/tabs.1.html	2025-01-19 00:55:01.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-tabs 1 2024-09-21 ncurses 6.5 User commands
++tabs 1 2025-01-18 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                                                                                tabs 1 2024-09-21 ncurses 6.5 User commands
                                                                                                                                                                                                                                                                                
++
                                                                                                                                                                                                                                                                                tabs 1 2025-01-18 ncurses 6.5 User commands
                                                                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                                                                + tabs(1)                          User commands                         tabs(1)
+ 
+@@ -257,7 +257,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-21                           tabs(1)
++ncurses 6.5                       2025-01-18                           tabs(1)
+ 
                                                                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                                                                                  
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.5-20250111+/doc/html/man/terminfo.5.html	2024-12-28 21:43:58.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/terminfo.5.html	2025-01-19 00:55:01.000000000 +0000
+@@ -71,7 +71,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This document describes ncurses version 6.5 (patch 20241228).
++       This document describes ncurses version 6.5 (patch 20250118).
+ 
+ 
+ 
                                                                                                                                                    terminfo Entry Syntax
                                                                                                                                                    +@@ -1055,8 +1055,8 @@
+        X/Open Curses does not say what "appropriate x" might be.  In practice,
+        that is a printable ASCII graphic character.  The special case "^?"  is
+        interpreted  as  DEL (127).  In all other cases, the character value is
+-       AND'd with 0x1f, mapping to ASCII control codes in the range 0  through
+-       31.
++       logically "and"-ed with 0x1f, mapping to ASCII  control  codes  in  the
++       range 0 through 31.
+ 
+        Other escapes include
+ 
+@@ -1332,13 +1332,14 @@
+             arithmetic (%m is mod): push(pop() op pop())
+ 
+        %&, %|, %^
+-            bit operations (AND, OR and exclusive-OR): push(pop() op pop())
++            bit  operations  ("and",  "or"  and exclusive "or"): push(pop() op
++            pop())
+ 
+        %=, %>, %<
+             logical operations: push(pop() op pop())
+ 
+        %A, %O
+-            logical AND and OR operations (for conditionals)
++            logical "and" and "or" operations (for conditionals)
+ 
+        %!, %~
+             unary operations (logical and bit complement): push(op pop())
+@@ -1347,8 +1348,8 @@
+ 
+        %? expr %t thenpart %e elsepart %;
+             This forms an if-then-else.  The %e elsepart is optional.  Usually
+-            the %? expr part pushes a value onto the stack,  and  %t  pops  it
+-            from  the  stack,  testing if it is nonzero (true).  If it is zero
++            the  %?  expr  part  pushes a value onto the stack, and %t pops it
++            from the stack, testing if it is nonzero (true).  If  it  is  zero
+             (false), control passes to the %e (else) part.
+ 
+             It is possible to form else-if's a la Algol 68:
+@@ -1356,18 +1357,18 @@
+ 
+             where ci are conditions, bi are bodies.
+ 
+-            Use the -f option of tic or infocmp to see the  structure  of  if-
++            Use  the  -f  option of tic or infocmp to see the structure of if-
+             then-else's.  Some strings, e.g., sgr can be very complicated when
+-            written on one line.  The -f option splits the string  into  lines
++            written  on  one line.  The -f option splits the string into lines
+             with the parts indented.
+ 
+-       Binary  operations  are  in postfix form with the operands in the usual
+-       order.  That is, to get x-5 one  would  use  "%gx%{5}%-".   %P  and  %g
++       Binary operations are in postfix form with the operands  in  the  usual
++       order.   That  is,  to  get  x-5  one would use "%gx%{5}%-".  %P and %g
+        variables are persistent across escape-string evaluations.
+ 
+        Consider the HP2645, which, to get to line 3 and column 12, needs to be
+-       sent \E&a12c03Y padded for 6 milliseconds.  The order of the lines  and
+-       columns  is  inverted here, and the lines and column are printed as two
++       sent  \E&a12c03Y padded for 6 milliseconds.  The order of the lines and
++       columns is inverted here, and the lines and column are printed  as  two
+        digits.  The corresponding terminal description is expressed thus:
+               cup=\E&a%p2%dc%p1%dY$<6>,
+ 
+@@ -1375,65 +1376,65 @@
+        a ^T, with the line and column simply encoded in binary,
+               cup=^T%p1%c%p2%c
+ 
+-       Terminals  which  use  "%c"  need  to  be  able to backspace the cursor
+-       (cub1), and to move the cursor up one line on the screen (cuu1).   This
++       Terminals which use "%c" need  to  be  able  to  backspace  the  cursor
++       (cub1),  and to move the cursor up one line on the screen (cuu1).  This
+        is necessary because it is not always safe to transmit \n ^D and \r, as
+-       the system may change or discard them.  (The library  routines  dealing
+-       with  terminfo  set tty modes so that tabs are never expanded, so \t is
++       the  system  may change or discard them.  (The library routines dealing
++       with terminfo set tty modes so that tabs are never expanded, so  \t  is
+        safe to send.  This turns out to be essential for the Ann Arbor 4080.)
+ 
+        A final example is the LSI ADM-3A, which uses line and column offset by
+        a space, thus
+               cup=\E=%p1%' '%+%c%p2%' '%+%c
+ 
+-       After  sending "\E=", this pushes the first parameter, pushes the ASCII
+-       value for a space (32), adds them (pushing the  sum  on  the  stack  in
+-       place  of  the  two  previous  values)  and  outputs  that  value  as a
+-       character.  Then the same is  done  for  the  second  parameter.   More
++       After sending "\E=", this pushes the first parameter, pushes the  ASCII
++       value  for  a  space  (32),  adds them (pushing the sum on the stack in
++       place of  the  two  previous  values)  and  outputs  that  value  as  a
++       character.   Then  the  same  is  done  for the second parameter.  More
+        complex arithmetic is possible using the stack.
+ 
+ 
+ 
                                                                                                                                                    Cursor Motions
                                                                                                                                                    +-       If  the  terminal has a fast way to home the cursor (to very upper left
+-       corner of screen) then this can be given as home; similarly a fast  way
+-       of  getting  to the lower left-hand corner can be given as ll; this may
++       If the terminal has a fast way to home the cursor (to very  upper  left
++       corner  of screen) then this can be given as home; similarly a fast way
++       of getting to the lower left-hand corner can be given as ll;  this  may
+        involve going up with cuu1 from the home position, but a program should
+        never do this itself (unless ll 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.  (Thus, the  \EH  sequence  on  HP
++       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.  (Thus, the \EH sequence on HP
+        terminals cannot be used for home.)
+ 
+-       If  the  terminal  has line or column absolute cursor addressing, these
+-       can be given as single parameter capabilities hpa (horizontal  position
+-       absolute)  and  vpa  (vertical position absolute).  Sometimes these are
+-       shorter than the more general  two  parameter  sequence  (as  with  the
+-       hp2645)   and  can  be  used  in  preference  to  cup.   If  there  are
+-       parameterized local motions (e.g., move n spaces to  the  right)  these
+-       can  be  given  as  cud,  cub,  cuf,  and  cuu  with a single parameter
+-       indicating how many spaces to move.  These are primarily useful if  the
++       If the terminal has line or column absolute  cursor  addressing,  these
++       can  be given as single parameter capabilities hpa (horizontal position
++       absolute) and vpa (vertical position absolute).   Sometimes  these  are
++       shorter  than  the  more  general  two  parameter sequence (as with the
++       hp2645)  and  can  be  used  in  preference  to  cup.   If  there   are
++       parameterized  local  motions  (e.g., move n spaces to the right) these
++       can be given as  cud,  cub,  cuf,  and  cuu  with  a  single  parameter
++       indicating  how many spaces to move.  These are primarily useful if the
+        terminal does not have cup, such as the TEKTRONIX 4025.
+ 
+-       If  the  terminal  needs to be in a special mode when running a program
++       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 smcup and rmcup.  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 relative
+-       cursor addressing, a one screen-sized window must  be  fixed  into  the
++       be given as smcup and rmcup.  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  relative
++       cursor  addressing,  a  one  screen-sized window must be fixed into the
+        terminal for cursor addressing to work properly.  This is also used for
+-       the TEKTRONIX 4025, where smcup sets the command character  to  be  the
+-       one  used  by  terminfo.   If  the  smcup sequence will not restore the
+-       screen after an rmcup  sequence  is  output  (to  the  state  prior  to
++       the  TEKTRONIX  4025,  where smcup sets the command character to be the
++       one used by terminfo.  If the  smcup  sequence  will  not  restore  the
++       screen  after  an  rmcup  sequence  is  output  (to  the state prior to
+        outputting rmcup), specify nrrmc.
+ 
+ 
+ 
                                                                                                                                                    Margins
                                                                                                                                                    +-       SVr4  (and  X/Open Curses) list several string capabilities for setting
+-       margins.  Two were intended for use with  terminals,  and  another  six
++       SVr4 (and X/Open Curses) list several string capabilities  for  setting
++       margins.   Two  were  intended  for use with terminals, and another six
+        were intended for use with printers.
+ 
+        o   The two terminal capabilities assume that the terminal may have the
+-           capability of setting the left and/or right margin at  the  current
++           capability  of  setting the left and/or right margin at the current
+            cursor column position.
+ 
+        o   The printer capabilities assume that the printer may have two types
+@@ -1442,31 +1443,31 @@
+            o   the ability to set a top and/or bottom margin using the current
+                line position, and
+ 
+-           o   parameterized  capabilities  for setting the top, bottom, left,
++           o   parameterized capabilities for setting the top,  bottom,  left,
+                right margins given the number of lines or columns.
+ 
+-       In practice, the categorization into "terminal" and  "printer"  is  not
++       In  practice,  the  categorization into "terminal" and "printer" is not
+        suitable:
+ 
+-       o   The  AT&T  SVr4  terminal  database  uses smgl four times, for AT&T
++       o   The AT&T SVr4 terminal database uses  smgl  four  times,  for  AT&T
+            hardware.
+ 
+-           Three of the four are printers.   They  lack  the  ability  to  set
++           Three  of  the  four  are  printers.   They lack the ability to set
+            left/right margins by specifying the column.
+ 
+-       o   Other  (non-AT&T) terminals may support margins but using different
++       o   Other (non-AT&T) terminals may support margins but using  different
+            assumptions from AT&T.
+ 
+-           For instance, the DEC VT420 supports left/right margins,  but  only
++           For  instance,  the DEC VT420 supports left/right margins, but only
+            using a column parameter.  As an added complication, the VT420 uses
+-           two settings to fully enable left/right margins (left/right  margin
+-           mode,  and  origin  mode).   The  former enables the margins, which
+-           causes printed text to wrap  within  margins,  but  the  latter  is
++           two  settings to fully enable left/right margins (left/right margin
++           mode, and origin mode).  The  former  enables  the  margins,  which
++           causes  printed  text  to  wrap  within  margins, but the latter is
+            needed to prevent cursor-addressing outside those margins.
+ 
+-       o   Both  DEC  VT420  left/right  margins are set with a single control
++       o   Both DEC VT420 left/right margins are set  with  a  single  control
+            sequence.  If either is omitted, the corresponding margin is set to
+-           the  left  or  right  edge  of the display (rather than leaving the
++           the left or right edge of the  display  (rather  than  leaving  the
+            margin unmodified).
+ 
+        These are the margin-related capabilities:
+@@ -1484,231 +1485,231 @@
+                  smglr   Set both left and right margins to L and R
+                  smgtb   Set both top and bottom margins to T and B
+ 
+-       When writing an application that uses these  string  capabilities,  the
+-       pairs  should be first checked to see if each capability in the pair is
++       When  writing  an  application that uses these string capabilities, the
++       pairs should be first checked to see if each capability in the pair  is
+        set or only one is set:
+ 
+-       o   If both smglp and smgrp  are  set,  each  is  used  with  a  single
+-           argument,  N,  that  gives  the column number of the left and right
++       o   If  both  smglp  and  smgrp  are  set,  each  is used with a single
++           argument, N, that gives the column number of  the  left  and  right
+            margin, respectively.
+ 
+-       o   If both smgtp and smgbp are set, each is used to set  the  top  and
++       o   If  both  smgtp  and smgbp are set, each is used to set the top and
+            bottom margin, respectively:
+ 
+            o   smgtp is used with a single argument, N, the line number of the
+                top margin.
+ 
+-           o   smgbp is used with two arguments, N and M, that give  the  line
++           o   smgbp  is  used with two arguments, N and M, that give the line
+                number of the bottom margin, the first counting from the top of
+-               the page  and  the  second  counting  from  the  bottom.   This
+-               accommodates  the two styles of specifying the bottom margin in
++               the  page  and  the  second  counting  from  the  bottom.  This
++               accommodates the two styles of specifying the bottom margin  in
+                different manufacturers' printers.
+ 
+-           When designing a terminfo entry for a printer that has  a  settable
+-           bottom  margin,  only  the first or second argument should be used,
++           When  designing  a terminfo entry for a printer that has a settable
++           bottom margin, only the first or second argument  should  be  used,
+            depending on the printer.  When developing an application that uses
+            smgbp to set the bottom margin, both arguments must be given.
+ 
+        Conversely, when only one capability in the pair is set:
+ 
+-       o   If  only  one  of  smglp and smgrp is set, then it is used with two
++       o   If only one of smglp and smgrp is set, then it  is  used  with  two
+            arguments, the column number of the left and right margins, in that
+            order.
+ 
+-       o   Likewise,  if  only  one of smgtp and smgbp is set, then it is used
+-           with two arguments that give the top and bottom  margins,  in  that
++       o   Likewise, if only one of smgtp and smgbp is set, then  it  is  used
++           with  two  arguments  that give the top and bottom margins, in that
+            order, counting from the top of the page.
+ 
+            When designing a terminfo entry for a printer that requires setting
+-           both left and right or top and bottom margins simultaneously,  only
+-           one  capability  in  the  pairs  smglp and smgrp or smgtp and smgbp
++           both  left and right or top and bottom margins simultaneously, only
++           one capability in the pairs smglp and  smgrp  or  smgtp  and  smgbp
+            should be defined, leaving the other unset.
+ 
+-       Except for very old terminal descriptions, e.g.,  those  developed  for
+-       SVr4,  the  scheme  just  described  should be considered obsolete.  An
++       Except  for  very  old terminal descriptions, e.g., those developed for
++       SVr4, the scheme just described  should  be  considered  obsolete.   An
+        improved set of capabilities was added late in the SVr4 releases (smglr
+-       and  smgtb),  which  explicitly  use  two  parameters  for  setting the
++       and smgtb),  which  explicitly  use  two  parameters  for  setting  the
+        left/right or top/bottom margins.
+ 
+        When setting margins, the line- and column-values are zero-based.
+ 
+-       The mgc string capability should  be  defined.   Applications  such  as
++       The  mgc  string  capability  should  be defined.  Applications such as
+        tabs(1) rely upon this to reset all margins.
+ 
+ 
+ 
                                                                                                                                                    Area Clears
                                                                                                                                                    +-       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  el.   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  el1.  If the terminal can clear from the current position to
+-       the end of the display, then this should be given as ed.   Ed  is  only
++       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 el.  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 el1.  If the terminal can clear from the current  position  to
++       the  end  of  the display, then this should be given as ed.  Ed 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  ed  is  not
++       a  request  to  delete  a  large  number  of lines, if a true ed is not
+        available.)
+ 
+ 
+ 
                                                                                                                                                    Insert/Delete Line and Vertical Motions
                                                                                                                                                    +-       If  the  terminal  can  open a new blank line before the line where the
+-       cursor is, this should be given as il1; 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 dl1; this is done only from the first
++       If the terminal can open a new blank line before  the  line  where  the
++       cursor  is,  this  should  be  given as il1; 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 dl1; this is done only from the  first
+        position on the line to be deleted.  Versions of il1 and dl1 which take
+        a single parameter and insert or delete that many lines can be given as
+        il and dl.
+ 
+-       If the terminal has a settable scrolling region (like  the  vt100)  the
+-       command  to  set  this  can be described with the csr capability, which
++       If  the  terminal  has a settable scrolling region (like the vt100) the
++       command to set this can be described with  the  csr  capability,  which
+        takes two parameters: the top and bottom lines of the scrolling region.
+        The cursor position is, alas, undefined after using this command.
+ 
+-       It  is possible to get the effect of insert or delete line using csr on
+-       a properly chosen region; the sc  and  rc  (save  and  restore  cursor)
++       It is possible to get the effect of insert or delete line using csr  on
++       a  properly  chosen  region;  the  sc  and 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  ncurses(3x)  library
+-       does   this   synthesis   automatically,   so   you  need  not  compose
++       string  does  not  move the cursor.  (Note that the ncurses(3x) library
++       does  this  synthesis  automatically,   so   you   need   not   compose
+        insert/delete strings for an entry with csr).
+ 
+-       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  series,  which   however   also   has
++       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  series,  which  however  also  has
+        insert/delete).
+ 
+-       Inserting  lines  at  the  top or bottom of the screen can also be done
+-       using ri or ind on many terminals without a  true  insert/delete  line,
++       Inserting lines at the top or bottom of the screen  can  also  be  done
++       using  ri  or  ind on many terminals without a true insert/delete line,
+        and is often faster even on terminals with those features.
+ 
+-       The  Boolean  non_dest_scroll_region  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 ri followed by dl1 or ind.  If the data scrolled
+-       off the bottom of the region by the ri re-appears,  then  scrolling  is
++       The Boolean non_dest_scroll_region 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 ri followed by dl1 or ind.  If the data  scrolled
++       off  the  bottom  of the region by the ri re-appears, then scrolling is
+        non-destructive.  System V and X/Open Curses expect that ind, ri, indn,
+        and  rin  will  simulate  destructive  scrolling;  their  documentation
+-       cautions  you  not  to  define  csr  unless  this is true.  This curses
+-       implementation is more  liberal  and  will  do  explicit  erases  after
++       cautions you not to define  csr  unless  this  is  true.   This  curses
++       implementation  is  more  liberal  and  will  do  explicit erases after
+        scrolling if ndsrc is defined.
+ 
+-       If  the  terminal has the ability to define a window as part of memory,
+-       which all commands affect, it should  be  given  as  the  parameterized
+-       string  wind.  The four parameters are the starting and ending lines in
++       If the terminal has the ability to define a window as part  of  memory,
++       which  all  commands  affect,  it  should be given as the parameterized
++       string wind.  The four parameters are the starting and ending lines  in
+        memory and the starting and ending columns in memory, in that order.
+ 
+        If the terminal can retain display memory above, then the da capability
+-       should  be  given;  if  display  memory  can be retained below, then db
+-       should be given.  These indicate that deleting a line or scrolling  may
+-       bring  non-blank lines up from below or that scrolling back with ri may
++       should be given; if display memory  can  be  retained  below,  then  db
++       should  be given.  These indicate that deleting a line or scrolling may
++       bring non-blank lines up from below or that scrolling back with ri  may
+        bring down non-blank lines.
+ 
+ 
+ 
                                                                                                                                                    Insert/Delete Character
                                                                                                                                                    +-       There are two basic kinds of  intelligent  terminals  with  respect  to
+-       insert/delete  character  which  can  be described using terminfo.  The
+-       most  common  insert/delete  character  operations  affect   only   the
+-       characters  on the current line and shift characters off the end of the
+-       line rigidly.  Other terminals, such as the Concept 100 and the  Perkin
+-       Elmer  Owl,  make a distinction between typed and untyped blanks on the
+-       screen, shifting upon an insert or delete only to an untyped  blank  on
+-       the  screen  which  is  either  eliminated,  or expanded to two untyped
++       There  are  two  basic  kinds  of intelligent terminals with respect to
++       insert/delete character which can be  described  using  terminfo.   The
++       most   common   insert/delete  character  operations  affect  only  the
++       characters on the current line and shift characters off the end of  the
++       line  rigidly.  Other terminals, such as the Concept 100 and the Perkin
++       Elmer Owl, make a distinction between typed and untyped blanks  on  the
++       screen,  shifting  upon an insert or delete only to an untyped blank on
++       the screen which is either  eliminated,  or  expanded  to  two  untyped
+        blanks.
+ 
+-       You can determine the kind of terminal you have by clearing the  screen
+-       and  then  typing  text separated by cursor motions.  Type "abc    def"
+-       using local cursor motions (not  spaces)  between  the  "abc"  and  the
+-       "def".   Then position the cursor before the "abc" and put the terminal
+-       in insert mode.  If typing characters causes the rest of  the  line  to
+-       shift  rigidly  and  characters to fall off the end, then your terminal
+-       does not distinguish between blanks  and  untyped  positions.   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 in, which
++       You  can determine the kind of terminal you have by clearing the screen
++       and then typing text separated by cursor  motions.   Type  "abc    def"
++       using  local  cursor  motions  (not  spaces)  between the "abc" and the
++       "def".  Then position the cursor before the "abc" and put the  terminal
++       in  insert  mode.   If typing characters causes the rest of the line to
++       shift rigidly and characters to fall off the end,  then  your  terminal
++       does  not  distinguish  between  blanks  and untyped positions.  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  in,  which
+        stands for "insert null".
+ 
+-       While these are two logically  separate  attributes  (one  line  versus
+-       multi-line  insert  mode,  and  special treatment of untyped spaces) we
+-       have seen no terminals whose insert mode cannot be described  with  the
++       While  these  are  two  logically  separate attributes (one line versus
++       multi-line insert mode, and special treatment  of  untyped  spaces)  we
++       have  seen  no terminals whose insert mode cannot be described with the
+        single attribute.
+ 
+-       Terminfo  can  describe  both  terminals which have an insert mode, and
+-       terminals which send a simple sequence to open a blank position on  the
++       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 smir the sequence to get into insert mode.  Give
+-       as rmir the sequence to leave  insert  mode.   Now  give  as  ich1  any
+-       sequence  needed  to  be  sent  just before sending the character to be
+-       inserted.  Most terminals with a true insert mode will not  give  ich1;
+-       terminals  which  send a sequence to open a screen position should give
++       as  rmir  the  sequence  to  leave  insert  mode.  Now give as ich1 any
++       sequence needed to be sent just before  sending  the  character  to  be
++       inserted.   Most  terminals with a true insert mode will not give ich1;
++       terminals which send a sequence to open a screen position  should  give
+        it here.
+ 
+-       If your terminal has both, insert mode is usually preferable  to  ich1.
+-       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  ich  sequences do not require previous smir, and most smir insert
+-       modes do not require ich1 before each character.   Therefore,  the  new
+-       curses  actually  assumes this is the case and uses either rmir/smir or
+-       ich/ich1 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,
++       If  your  terminal has both, insert mode is usually preferable to ich1.
++       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 ich sequences do not require previous smir, and most  smir  insert
++       modes  do  not  require ich1 before each character.  Therefore, the new
++       curses actually assumes this is the case and uses either  rmir/smir  or
++       ich/ich1  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 rmir/smir sequences in ich1.
+ 
+        If post insert padding is needed, give this as a number of milliseconds
+-       in  ip (a string option).  Any other sequence which may need to be sent
++       in ip (a string option).  Any other sequence which may need to be  sent
+        after an insert of a single character may also be given in ip.  If your
+-       terminal  needs  both  to be placed into an "insert mode" and a special
+-       code to precede each inserted character, then both smir/rmir  and  ich1
+-       can  be  given,  and  both  will be used.  The ich capability, with one
++       terminal needs both to be placed into an "insert mode"  and  a  special
++       code  to  precede each inserted character, then both smir/rmir and ich1
++       can be given, and both will be used.   The  ich  capability,  with  one
+        parameter, n, will repeat the effects of ich1 n times.
+ 
+-       If padding is necessary between characters typed while  not  in  insert
++       If  padding  is  necessary between characters typed while not in insert
+        mode, give this as a number of milliseconds padding in rmp.
+ 
+-       It  is  occasionally  necessary  to move around while in insert mode 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 mir to  speed  up  inserting  in  this
+-       case.   Omitting  mir  will affect only speed.  Some terminals (notably
+-       Datamedia's) must not have mir because of the  way  their  insert  mode
++       It is occasionally necessary to move around while  in  insert  mode  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 mir to speed up inserting in this
++       case.  Omitting mir will affect only speed.   Some  terminals  (notably
++       Datamedia's)  must  not  have  mir because of the way their insert mode
+        works.
+ 
+-       Finally,  you  can  specify dch1 to delete a single character, dch with
++       Finally, you can specify dch1 to delete a single  character,  dch  with
+        one parameter, n, to delete ncharacters, and delete mode by giving smdc
+-       and  rmdc to enter and exit delete mode (any mode the terminal needs to
++       and rmdc to enter and exit delete mode (any mode the terminal needs  to
+        be placed in for dch1 to work).
+ 
+-       A command to erase n characters  (equivalent  to  outputting  n  blanks
++       A  command  to  erase  n  characters (equivalent to outputting n blanks
+        without moving the cursor) can be given as ech with one parameter.
+ 
+ 
+ 
                                                                                                                                                    Highlighting, Underlining, and Visible Bells
                                                                                                                                                    +        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  standout  mode,  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 smso and rmso, 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
++       be  represented  in  a number of different ways.  You should choose one
++       display form as standout mode,  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 smso and rmso,  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
+        xmc should be given to tell how many spaces are left.
+ 
+        Codes to begin underlining and end underlining can be given as smul and
+        rmul respectively.  If the terminal has a code to underline the current
+-       character and move the cursor one space  to  the  right,  such  as  the
++       character  and  move  the  cursor  one  space to the right, such as the
+        Microterm Mime, this can be given as uc.
+ 
+-       Other  capabilities  to  enter various highlighting modes include blink
+-       (blinking) bold (bold or extra bright) dim (dim or  half-bright)  invis
+-       (blanking  or invisible text) prot (protected) rev (reverse video) sgr0
+-       (turn off all attribute modes) smacs  (enter  alternate  character  set
++       Other capabilities to enter various highlighting  modes  include  blink
++       (blinking)  bold  (bold or extra bright) dim (dim or half-bright) invis
++       (blanking or invisible text) prot (protected) rev (reverse video)  sgr0
++       (turn  off  all  attribute  modes) smacs (enter alternate character set
+        mode) and rmacs (exit alternate character set mode).  Turning on any of
+        these modes singly may or may not turn off other modes.
+ 
+-       If there is a sequence to set arbitrary  combinations  of  modes,  this
+-       should  be  given  as  sgr (set attributes), taking 9 parameters.  Each
++       If  there  is  a  sequence to set arbitrary combinations of modes, this
++       should be given as sgr (set attributes),  taking  9  parameters.   Each
+        parameter is either zero (0) or nonzero, as the corresponding attribute
+-       is  on  or  off.   The 9 parameters are, in order: standout, underline,
+-       reverse, blink, dim, bold, blank,  protect,  alternate  character  set.
++       is on or off.  The 9 parameters are,  in  order:  standout,  underline,
++       reverse,  blink,  dim,  bold,  blank, protect, alternate character set.
+        Not  all  modes  need  be  supported  by  sgr,  only  those  for  which
+        corresponding separate attribute commands exist.
+ 
+@@ -1727,17 +1728,17 @@
+                    p8                protect      not used
+                    p9                altcharset   ^O (off) ^N (on)
+ 
+-       We begin each escape sequence by turning off any existing modes,  since
+-       there  is  no quick way to determine whether they are active.  Standout
+-       is set up to be  the  combination  of  reverse  and  bold.   The  vt220
+-       terminal  has  a  protect  mode,  though it is not commonly used in sgr
+-       because it protects characters on the screen from the host's  erasures.
+-       The  altcharset  mode  also is different in that it is either ^O or ^N,
+-       depending on whether it is off or on.  If all modes are turned on,  the
++       We  begin each escape sequence by turning off any existing modes, since
++       there is no quick way to determine whether they are  active.   Standout
++       is  set  up  to  be  the  combination  of  reverse and bold.  The vt220
++       terminal has a protect mode, though it is  not  commonly  used  in  sgr
++       because  it protects characters on the screen from the host's erasures.
++       The altcharset mode also is different in that it is either  ^O  or  ^N,
++       depending  on whether it is off or on.  If all modes are turned on, the
+        resulting sequence is \E[0;1;4;5;7;8m^N.
+ 
+-       Some  sequences  are  common  to  different  modes.  For example, ;7 is
+-       output when either p1 or p3 is true, that is,  if  either  standout  or
++       Some sequences are common to  different  modes.   For  example,  ;7  is
++       output  when  either  p1  or p3 is true, that is, if either standout or
+        reverse modes are turned on.
+ 
+        Writing out the above sequences, along with their dependencies yields
+@@ -1758,54 +1759,54 @@
+            sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p4%t;5%;
+                %?%p1%p3%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 
+-       Remember  that  if  you specify sgr, you must also specify sgr0.  Also,
+-       some implementations rely on sgr  being  given  if  sgr0  is,  Not  all
++       Remember that if you specify sgr, you must also  specify  sgr0.   Also,
++       some  implementations  rely  on  sgr  being  given  if sgr0 is, Not all
+        terminfo  entries  necessarily  have  an  sgr  string,  however.   Many
+-       terminfo entries are derived from termcap entries  which  have  no  sgr
++       terminfo  entries  are  derived  from termcap entries which have no sgr
+        string.  The only drawback to adding an sgr string is that termcap also
+        assumes that sgr0 does not exit alternate character set mode.
+ 
+-       Terminals  with  the  "magic  cookie"  glitch  (xmc)  deposit   special
+-       "cookies"  when  they  receive mode-setting sequences, which affect the
+-       display algorithm rather than having extra  bits  for  each  character.
+-       Some  terminals, such as the HP 2621, automatically leave standout mode
+-       when they move to a new line or  the  cursor  is  addressed.   Programs
+-       using  standout mode should exit standout mode before moving the cursor
+-       or sending a newline, unless the msgr capability, asserting that it  is
++       Terminals   with  the  "magic  cookie"  glitch  (xmc)  deposit  special
++       "cookies" when they receive mode-setting sequences,  which  affect  the
++       display  algorithm  rather  than  having extra bits for each character.
++       Some terminals, such as the HP 2621, automatically leave standout  mode
++       when  they  move  to  a  new line or the cursor is addressed.  Programs
++       using standout mode should exit standout mode before moving the  cursor
++       or  sending a newline, unless the msgr capability, asserting that it is
+        safe to move in standout mode, is present.
+ 
+-       If  the  terminal has a way of flashing the screen to indicate an error
+-       quietly (a bell replacement) then this can be given as flash;  it  must
++       If the terminal has a way of flashing the screen to indicate  an  error
++       quietly  (a  bell replacement) then this can be given as flash; it must
+        not move the cursor.
+ 
+-       If  the cursor needs to be made more visible than normal when it is not
++       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  easier  to  find block or blinking underline) give this sequence as
++       an easier to find block or blinking underline) give  this  sequence  as
+        cvvis.  If there is a way to make the cursor completely invisible, give
+-       that  as  civis.  The capability cnorm should be given which undoes the
++       that as civis.  The capability cnorm should be given which  undoes  the
+        effects of both of these modes.
+ 
+-       If your terminal correctly generates  underlined  characters  (with  no
+-       special  codes  needed)  even  though  it does not overstrike, then you
+-       should give the capability ul.  If  a  character  overstriking  another
+-       leaves  both  characters  on the screen, specify the capability os.  If
++       If  your  terminal  correctly  generates underlined characters (with no
++       special codes needed) even though it  does  not  overstrike,  then  you
++       should  give  the  capability  ul.  If a character overstriking another
++       leaves both characters on the screen, specify the  capability  os.   If
+        overstrikes are erasable with a blank, then this should be indicated by
+        giving eo.
+ 
+ 
+ 
                                                                                                                                                    Keypad and Function Keys
                                                                                                                                                    +-       If  the  terminal  has  a keypad that transmits codes when the keys are
+-       pressed, this information can be given.  Note that it is  not  possible
++       If the terminal has a keypad that transmits codes  when  the  keys  are
++       pressed,  this  information can be given.  Note that it is not possible
+        to handle 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 smkx and rmkx.
++       for  example, to the unshifted HP 2621 keys).  If the keypad can be set
++       to transmit or not  transmit,  give  these  codes  as  smkx  and  rmkx.
+        Otherwise the keypad is assumed to always transmit.
+ 
+-       The codes sent by the left arrow, right arrow, up  arrow,  down  arrow,
+-       and  home  keys  can  be given as kcub1, kcuf1, kcuu1, kcud1, and khome
++       The  codes  sent  by the left arrow, right arrow, up arrow, down arrow,
++       and home keys can be given as kcub1, kcuf1,  kcuu1,  kcud1,  and  khome
+        respectively.  If there are function keys such as f0, f1, ..., f10, the
+-       codes  they  send  can  be given as kf0, kf1, ..., kf10.  If these keys
+-       have labels other than the default f0 through f10, the  labels  can  be
++       codes they send can be given as kf0, kf1, ...,  kf10.   If  these  keys
++       have  labels  other  than the default f0 through f10, the labels can be
+        given as lf0, lf1, ..., lf10.
+ 
+        The codes transmitted by certain other special keys can be given:
+@@ -1844,64 +1845,64 @@
+ 
+        o   khts (set a tab stop in this column).
+ 
+-       In  addition,  if  the  keypad has a 3 by 3 array of keys including the
+-       four arrow keys, the other five keys can be given  as  ka1,  ka3,  kb2,
+-       kc1,  and  kc3.   These  keys  are  useful when the effects of a 3 by 3
++       In addition, if the keypad has a 3 by 3 array  of  keys  including  the
++       four  arrow  keys,  the  other five keys can be given as ka1, ka3, kb2,
++       kc1, and kc3.  These keys are useful when the  effects  of  a  3  by  3
+        directional pad are needed.
+ 
+        Strings to program function keys can be given as pfkey, pfloc, and pfx.
+-       A  string to program screen labels should be specified as pln.  Each of
+-       these strings takes two parameters: the function key number to  program
++       A string to program screen labels should be specified as pln.  Each  of
++       these  strings takes two parameters: the function key number to program
+        (from 0 to 10) and the string to program it with.  Function key numbers
+-       out of this range may program undefined keys in  a  terminal  dependent
+-       manner.   The  difference between the capabilities is that pfkey causes
+-       pressing the given key to be the same as  the  user  typing  the  given
+-       string;  pfloc  causes  the  string  to  be executed by the terminal in
++       out  of  this  range may program undefined keys in a terminal dependent
++       manner.  The difference between the capabilities is that  pfkey  causes
++       pressing  the  given  key  to  be the same as the user typing the given
++       string; pfloc causes the string to  be  executed  by  the  terminal  in
+        local; and pfx causes the string to be transmitted to the computer.
+ 
+-       The capabilities nlab, lw and lh  define  the  number  of  programmable
+-       screen  labels  and  their  width and height.  If there are commands to
+-       turn the labels on and off, give  them  in  smln  and  rmln.   smln  is
+-       normally  output  after one or more pln sequences to make sure that the
++       The  capabilities  nlab,  lw  and  lh define the number of programmable
++       screen labels and their width and height.  If  there  are  commands  to
++       turn  the  labels  on  and  off,  give  them in smln and rmln.  smln is
++       normally output after one or more pln sequences to make sure  that  the
+        change becomes visible.
+ 
+ 
+ 
                                                                                                                                                    Tabs and Initialization
                                                                                                                                                    +        A few capabilities are used only for tabs:
+ 
+-       o   If the terminal has hardware tabs, the command to  advance  to  the
++       o   If  the  terminal  has hardware tabs, the command to advance to the
+            next tab stop can be given as ht (usually control/I).
+ 
+        o   A "back-tab" command which moves leftward to the preceding tab stop
+            can be given as cbt.
+ 
+-           By convention, if the teletype modes indicate that tabs  are  being
+-           expanded  by  the  computer rather than being sent to the terminal,
+-           programs should not use ht or cbt even if they are  present,  since
++           By  convention,  if the teletype modes indicate that tabs are being
++           expanded by the computer rather than being sent  to  the  terminal,
++           programs  should  not use ht or cbt even if they are present, since
+            the user may not have the tab stops properly set.
+ 
+-       o   If  the  terminal has hardware tabs which are initially set every n
++       o   If the terminal has hardware tabs which are initially set  every  n
+            spaces when the terminal is powered up, the numeric parameter it is
+            given, showing the number of spaces the tabs are set to.
+ 
+            The it capability is normally used by the tset command to determine
+-           whether to set the mode for hardware tab expansion, and whether  to
++           whether  to set the mode for hardware tab expansion, and whether to
+            set the tab stops.  If the terminal has tab stops that can be saved
+-           in non-volatile memory, the terminfo description  can  assume  that
++           in  non-volatile  memory,  the terminfo description can assume that
+            they are properly set.
+ 
+        Other capabilities include
+ 
+        o   is1, is2, and is3, initialization strings for the terminal,
+ 
+-       o   iprog,  the  path  name  of  a  program to be run to initialize the
++       o   iprog, the path name of a program  to  be  run  to  initialize  the
+            terminal,
+ 
+        o   and if, the name of a file containing long initialization strings.
+ 
+-       These strings are expected to set the terminal  into  modes  consistent
+-       with  the  rest of the terminfo description.  They are normally sent to
+-       the terminal, by the init option of the tput  program,  each  time  the
++       These  strings  are  expected to set the terminal into modes consistent
++       with the rest of the terminfo description.  They are normally  sent  to
++       the  terminal,  by  the  init option of the tput program, each time the
+        user logs in.  They will be printed in the following order:
+ 
+               run the program
+@@ -1925,34 +1926,34 @@
+               and finally output
+                      is3.
+ 
+-       Most  initialization  is  done with is2.  Special terminal modes can be
+-       set up without duplicating strings by putting the common  sequences  in
++       Most initialization is done with is2.  Special terminal  modes  can  be
++       set  up  without duplicating strings by putting the common sequences in
+        is2 and special cases in is1 and is3.
+ 
+-       A  set  of  sequences  that  does a harder reset from a totally unknown
++       A set of sequences that does a harder  reset  from  a  totally  unknown
+        state can be given as rs1, rs2, rf and rs3, analogous to is1 , is2 , if
+-       and  is3  respectively.   These  strings  are output by reset option of
+-       tput, or by the reset program (an alias of tset), which  is  used  when
++       and is3 respectively.  These strings are  output  by  reset  option  of
++       tput,  or  by  the reset program (an alias of tset), which is used when
+        the terminal gets into a wedged state.  Commands are normally placed in
+        rs1, rs2 rs3 and rf only if they produce annoying effects on the screen
+        and are not necessary when logging in.  For example, the command to set
+-       the vt100 into 80-column mode would normally be part  of  is2,  but  it
+-       causes  an  annoying  glitch  of  the screen and is not normally needed
++       the  vt100  into  80-column  mode would normally be part of is2, but it
++       causes an annoying glitch of the screen  and  is  not  normally  needed
+        since the terminal is usually already in 80-column mode.
+ 
+-       The reset program writes strings including iprog,  etc.,  in  the  same
+-       order  as  the  init program, using rs1, etc., instead of is1, etc.  If
+-       any of rs1, rs2, rs3, or rf reset capability strings are  missing,  the
+-       reset   program   falls  back  upon  the  corresponding  initialization
++       The  reset  program  writes  strings including iprog, etc., in the same
++       order as the init program, using rs1, etc., instead of  is1,  etc.   If
++       any  of  rs1, rs2, rs3, or rf reset capability strings are missing, the
++       reset  program  falls  back  upon  the   corresponding   initialization
+        capability string.
+ 
+-       If there are commands to set and clear tab stops, they can be given  as
++       If  there are commands to set and clear tab stops, they can be given as
+        tbc (clear all tab stops) and hts (set a tab stop in the current column
+-       of every line).  If a more complex sequence is needed to set  the  tabs
++       of  every  line).  If a more complex sequence is needed to set the tabs
+        than can be described by this, the sequence can be placed in is2 or if.
+ 
+-       The  tput  reset  command uses the same capability strings as the reset
+-       command, although the two programs (tput and reset)  provide  different
++       The tput reset command uses the same capability strings  as  the  reset
++       command,  although  the two programs (tput and reset) provide different
+        command-line options.
+ 
+        In  practice,  these  terminfo  capabilities  are  not  often  used  in
+@@ -1961,78 +1962,78 @@
+        o   Almost all hardware terminals (at least those which supported tabs)
+            initialized those to every eight columns:
+ 
+-           The  only  exception  was  the  AT&T 2300 series, which set tabs to
++           The only exception was the AT&T 2300  series,  which  set  tabs  to
+            every five columns.
+ 
+-       o   In particular, developers  of  the  hardware  terminals  which  are
+-           commonly  used  as  models  for  modern terminal emulators provided
++       o   In  particular,  developers  of  the  hardware  terminals which are
++           commonly used as models  for  modern  terminal  emulators  provided
+            documentation demonstrating that eight columns were the standard.
+ 
+        o   Because of this, the terminal initialization programs tput and tset
+-           use   the  tbc  (clear_all_tabs)  and  hts  (set_tab)  capabilities
+-           directly only when the it (init_tabs) capability is set to a  value
++           use  the  tbc  (clear_all_tabs)  and  hts  (set_tab)   capabilities
++           directly  only when the it (init_tabs) capability is set to a value
+            other than eight.
+ 
+ 
+ 
                                                                                                                                                    Delays and Padding
                                                                                                                                                    +-       Many  older  and slower terminals do not support either XON/XOFF or DTR
+-       handshaking, including hard copy terminals and some very  archaic  CRTs
+-       (including,  for  example,  DEC  VT100s).   These  may  require padding
++       Many older and slower terminals do not support either XON/XOFF  or  DTR
++       handshaking,  including  hard copy terminals and some very archaic CRTs
++       (including, for  example,  DEC  VT100s).   These  may  require  padding
+        characters after certain cursor motions and screen changes.
+ 
+        If the terminal uses xon/xoff handshaking for flow control (that is, it
+-       automatically  emits  ^S  back  to  the host when its input buffers are
+-       close to full), set xon.  This capability suppresses  the  emission  of
+-       padding.   You  can  also  set  it  for  memory-mapped  console devices
++       automatically emits ^S back to the host  when  its  input  buffers  are
++       close  to  full),  set xon.  This capability suppresses the emission of
++       padding.  You  can  also  set  it  for  memory-mapped  console  devices
+        effectively that do not have a speed limit.  Padding information should
+-       still  be  included  so  that  routines can make better decisions about
++       still be included so that routines  can  make  better  decisions  about
+        relative costs, but actual pad characters will not be transmitted.
+ 
+        If pb (padding baud rate) is given, padding is suppressed at baud rates
+-       below  the  value  of  pb.  If the entry has no padding baud rate, then
++       below the value of pb.  If the entry has no  padding  baud  rate,  then
+        whether padding is emitted or not is completely controlled by xon.
+ 
+-       If the terminal requires other than a null (zero) character as  a  pad,
+-       then  this  can  be  given as pad.  Only the first character of the pad
++       If  the  terminal requires other than a null (zero) character as a pad,
++       then this can be given as pad.  Only the first  character  of  the  pad
+        string is used.
+ 
+ 
+ 
                                                                                                                                                    Status Lines
                                                                                                                                                    +-       Some terminals have an extra "status line" which is not  normally  used
++       Some  terminals  have an extra "status line" which is not normally used
+        by software (and thus not counted in the terminal's lines capability).
+ 
+-       The  simplest case is a status line which is cursor-addressable but not
++       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
++       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 hs capability.
+ 
+-       Some  terminals  with status lines need special sequences to access the
+-       status line.  These may be expressed as a string with single  parameter
+-       tsl  which takes the cursor to a given zero-origin column on the status
+-       line.  The  capability  fsl  must  return  to  the  main-screen  cursor
++       Some terminals with status lines need special sequences to  access  the
++       status  line.  These may be expressed as a string with single parameter
++       tsl which takes the cursor to a given zero-origin column on the  status
++       line.   The  capability  fsl  must  return  to  the  main-screen cursor
+        positions before the last tsl.  You may need to embed the string values
+-       of sc (save  cursor)  and  rc  (restore  cursor)  in  tsl  and  fsl  to
++       of  sc  (save  cursor)  and  rc  (restore  cursor)  in  tsl  and fsl to
+        accomplish this.
+ 
+-       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
++       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 wsl.
+ 
+        A command to erase or blank the status line may be specified as dsl.
+ 
+-       The  Boolean  capability  eslok  specifies that escape sequences, tabs,
++       The Boolean capability eslok specifies  that  escape  sequences,  tabs,
+        etc., work ordinarily in the status line.
+ 
+-       The ncurses implementation does not yet use any of these  capabilities.
++       The  ncurses implementation does not yet use any of these capabilities.
+        They are documented here in case they ever become important.
+ 
+ 
+ 
                                                                                                                                                    Line Graphics
                                                                                                                                                    +-       Many  terminals have alternate character sets useful for forms-drawing.
+-       Terminfo and curses 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
++       Many terminals have alternate character sets useful for  forms-drawing.
++       Terminfo  and  curses  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
+        acsc capability.
+ 
+                           acsc
+@@ -2049,8 +2050,8 @@
+        ACS_PLMINUS   0x67      g      #  plus/minus
+        ACS_BOARD     0x68      h      #  board of squares
+        ACS_LANTERN   0x69      i      #  lantern symbol
+-       ACS_LRCORNER  0x6a      j      +  lower right corner
+ 
++       ACS_LRCORNER  0x6a      j      +  lower right corner
+        ACS_URCORNER  0x6b      k      +  upper right corner
+        ACS_ULCORNER  0x6c      l      +  upper left corner
+        ACS_LLCORNER  0x6d      m      +  lower left corner
+@@ -2074,34 +2075,34 @@
+ 
+        A few notes apply to the table itself:
+ 
+-       o   X/Open  Curses  incorrectly  states that the mapping for lantern is
+-           uppercase "I" although Unix implementations use the  lowercase  "i"
++       o   X/Open Curses incorrectly states that the mapping  for  lantern  is
++           uppercase  "I"  although Unix implementations use the lowercase "i"
+            mapping.
+ 
+-       o   The  DEC  VT100  implemented graphics using the alternate character
+-           set feature, temporarily switching modes and sending characters  in
+-           the  range  0x60  (96)  to 0x7e (126) (the acsc Value column in the
++       o   The DEC VT100 implemented graphics using  the  alternate  character
++           set  feature, temporarily switching modes and sending characters in
++           the range 0x60 (96) to 0x7e (126) (the acsc  Value  column  in  the
+            table).
+ 
+        o   The AT&T terminal added graphics characters outside that range.
+ 
+-           Some of the characters within the range do  not  match  the  VT100;
+-           presumably  they  were  used in the AT&T terminal: board of squares
+-           replaces the VT100 newline symbol, while  lantern  symbol  replaces
++           Some  of  the  characters  within the range do not match the VT100;
++           presumably they were used in the AT&T terminal:  board  of  squares
++           replaces  the  VT100  newline symbol, while lantern symbol replaces
+            the VT100 vertical tab symbol.  The other VT100 symbols for control
+-           characters (horizontal tab, carriage return and line-feed) are  not
++           characters  (horizontal tab, carriage return and line-feed) are not
+            (re)used in curses.
+ 
+-       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  smacs/rmacs  switches) will be rendered as the
++       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 smacs/rmacs 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.
+ 
+ 
+ 
                                                                                                                                                    Color Handling
                                                                                                                                                    +-       The  curses  library  functions init_pair and init_color manipulate the
+-       color  pairs  and  color  values  discussed  in   this   section   (see
++       The curses library functions init_pair and  init_color  manipulate  the
++       color   pairs   and   color  values  discussed  in  this  section  (see
+        curs_color(3x) for details on these and related functions).
+ 
+        Most color terminals are either "Tektronix-like" or "HP-like":
+@@ -2110,45 +2111,45 @@
+            is usually 8), and can set character-cell foreground and background
+            colors independently, mixing them into N * N color pairs.
+ 
+-       o   On  HP-like  terminals,  the  user  must  set  each  color  pair up
+-           separately  (foreground  and  background  are   not   independently
+-           settable).   Up  to  M color pairs may be set up from 2*M different
++       o   On HP-like  terminals,  the  user  must  set  each  color  pair  up
++           separately   (foreground   and  background  are  not  independently
++           settable).  Up to M color pairs may be set up  from  2*M  different
+            colors.  ANSI-compatible terminals are Tektronix-like.
+ 
+        Some basic color capabilities are independent of the color method.  The
+-       numeric  capabilities  colors  and pairs specify the maximum numbers of
+-       colors and color pairs that can be displayed  simultaneously.   The  op
++       numeric capabilities colors and pairs specify the  maximum  numbers  of
++       colors  and  color  pairs that can be displayed simultaneously.  The op
+        (original pair) string resets foreground and background colors to their
+-       default values for the terminal.  The oc 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;
++       default  values  for  the terminal.  The oc 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 bce.
+ 
+-       While the  curses  library  works  with  color  pairs  (reflecting  the
+-       inability  of  some  devices  to  set  foreground and background colors
+-       independently), there  are  separate  capabilities  for  setting  these
++       While  the  curses  library  works  with  color  pairs  (reflecting the
++       inability of some devices  to  set  foreground  and  background  colors
++       independently),  there  are  separate  capabilities  for  setting these
+        features:
+ 
+-       o   To   change  the  current  foreground  or  background  color  on  a
+-           Tektronix-type terminal, use setaf (set ANSI foreground) and  setab
+-           (set  ANSI  background)  or  setf  (set  foreground)  and setb (set
++       o   To  change  the  current  foreground  or  background  color  on   a
++           Tektronix-type  terminal, use setaf (set ANSI foreground) and setab
++           (set ANSI background)  or  setf  (set  foreground)  and  setb  (set
+            background).  These take one parameter, the color number.  The SVr4
+-           documentation  describes only setaf/setab; the XPG4 draft says that
+-           "If the terminal supports ANSI escape sequences to  set  background
+-           and   foreground,   they  should  be  coded  as  setaf  and  setab,
++           documentation describes only setaf/setab; the XPG4 draft says  that
++           "If  the  terminal supports ANSI escape sequences to set background
++           and  foreground,  they  should  be  coded  as  setaf   and   setab,
+            respectively.
+ 
+-       o   If the terminal supports other escape sequences to  set  background
+-           and   foreground,   they   should   be  coded  as  setf  and  setb,
+-           respectively.  The vidputs and the refresh(3x)  functions  use  the
++       o   If  the  terminal supports other escape sequences to set background
++           and  foreground,  they  should  be  coded   as   setf   and   setb,
++           respectively.   The  vidputs  and the refresh(3x) functions use the
+            setaf and setab capabilities if they are defined.
+ 
+-       The  setaf/setab  and  setf/setb  capabilities  take  a  single numeric
++       The setaf/setab  and  setf/setb  capabilities  take  a  single  numeric
+        argument each.  Argument values 0-7 of setaf/setab are portably defined
+-       as  follows (the middle column is the symbolic #define available in the
+-       header for the curses or ncurses libraries).  The terminal hardware  is
+-       free  to  map  these  as  it  likes, but the RGB values indicate normal
++       as follows (the middle column is the symbolic #define available in  the
++       header  for the curses or ncurses libraries).  The terminal hardware is
++       free to map these as it likes,  but  the  RGB  values  indicate  normal
+        locations in color space.
+ 
+                     Color      #define       Value        RGB
+@@ -2176,32 +2177,32 @@
+                    yellow    COLOR_YELLOW      6     max, max, 0
+                    white     COLOR_WHITE       7     max, max, max
+ 
+-       It  is  important  to  not  confuse the two sets of color capabilities;
++       It is important to not confuse the  two  sets  of  color  capabilities;
+        otherwise red/blue will be interchanged on the display.
+ 
+-       On an HP-like terminal, use scp with a color pair number  parameter  to
++       On  an  HP-like terminal, use scp with a color pair number parameter to
+        set which color pair is current.
+ 
+        Some terminals allow the color values to be modified:
+ 
+-       o   On  a Tektronix-like terminal, the capability ccc may be present to
+-           indicate that colors can be modified.  If so, the initc  capability
++       o   On a Tektronix-like terminal, the capability ccc may be present  to
++           indicate  that colors can be modified.  If so, the initc capability
+            will take a color number (0 to colors - 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
++           which  describe the color.  These three parameters default to being
++           interpreted as RGB (Red,  Green,  Blue)  values.   If  the  Boolean
+            capability hls is present, they are instead as HLS (Hue, Lightness,
+            Saturation) indices.  The ranges are terminal-dependent.
+ 
+-       o   On  an HP-like terminal, initp may give a capability for changing a
+-           color pair value.  It will take  seven  parameters;  a  color  pair
+-           number  (0  to  max_pairs  -  1),  and two triples describing first
+-           background and then foreground colors.  These  parameters  must  be
+-           (Red,  Green,  Blue)  or  (Hue, Lightness, Saturation) depending on
++       o   On an HP-like terminal, initp may give a capability for changing  a
++           color  pair  value.   It  will  take seven parameters; a color pair
++           number (0 to max_pairs -  1),  and  two  triples  describing  first
++           background  and  then  foreground colors.  These parameters must be
++           (Red, Green, Blue) or (Hue,  Lightness,  Saturation)  depending  on
+            hls.
+ 
+-       On some color terminals,  colors  collide  with  highlights.   You  can
+-       register  these collisions with the ncv capability.  This is a bit mask
+-       of  attributes  not  to  be  used  when  colors   are   enabled.    The
++       On  some  color  terminals,  colors  collide  with highlights.  You can
++       register these collisions with the ncv capability.  This is a bit  mask
++       of   attributes   not   to  be  used  when  colors  are  enabled.   The
+        correspondence with the attributes understood by curses is as follows:
+ 
+                          Attribute     Bit   Decimal   Set by
+@@ -2223,118 +2224,118 @@
+                         A_VERTICAL     14     16384    sgr1
+                         A_ITALIC       15     32768    sitm
+ 
+-       For  example, on many IBM PC consoles, the underline attribute collides
+-       with the foreground color blue and is  not  available  in  color  mode.
++       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 ncv capability of 2.
+ 
+-       SVr4  curses does nothing with ncv, ncurses recognizes it and optimizes
++       SVr4 curses does nothing with ncv, ncurses recognizes it and  optimizes
+        the output in favor of colors.
+ 
+ 
+ 
                                                                                                                                                    Miscellaneous
                                                                                                                                                    +-       If the terminal requires other than a null (zero) character as  a  pad,
+-       then  this  can  be  given as pad.  Only the first character of the pad
++       If  the  terminal requires other than a null (zero) character as a pad,
++       then this 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 PC variable;
+-       though the application may set this value to  something  other  than  a
+-       null,  ncurses will test npc first and use napms if the terminal has no
++       npc.  Note that ncurses implements the termcap-compatible PC  variable;
++       though  the  application  may  set this value to something other than a
++       null, ncurses will test npc first and use napms if the terminal has  no
+        pad character.
+ 
+-       If the terminal can move up or down half a line, this can be  indicated
+-       with  hu  (half-line  up)  and  hd (half-line down).  This is primarily
+-       useful for superscripts and subscripts on hard-copy  terminals.   If  a
++       If  the terminal can move up or down half a line, this can be indicated
++       with hu (half-line up) and hd  (half-line  down).   This  is  primarily
++       useful  for  superscripts  and subscripts on hard-copy terminals.  If a
+        hard-copy terminal can eject to the next page (form feed), give this as
+        ff (usually control/L).
+ 
+-       If there is a command to repeat a given character  a  given  number  of
+-       times   (to   save  time  transmitting  a  large  number  of  identical
+-       characters) this can be indicated with the  parameterized  string  rep.
+-       The  first  parameter is the character to be repeated and the second is
++       If  there  is  a  command to repeat a given character a given number of
++       times  (to  save  time  transmitting  a  large  number   of   identical
++       characters)  this  can  be indicated with the parameterized string rep.
++       The first parameter is the character to be repeated and the  second  is
+        the number of times to repeat it.  Thus, tparm(repeat_char, 'x', 10) is
+        the same as "xxxxxxxxxx".
+ 
+        If the terminal has a settable command character, such as the TEKTRONIX
+-       4025, this can be indicated with cmdch.  A prototype command  character
+-       is  chosen  which is used in all capabilities.  This character is given
+-       in the cmdch capability to identify it.  The  following  convention  is
++       4025,  this can be indicated with cmdch.  A prototype command character
++       is chosen which is used in all capabilities.  This character  is  given
++       in  the  cmdch  capability to identify it.  The following convention is
+        supported on some Unix systems: The environment is to be searched for a
+-       CC variable, and if found, all occurrences of the  prototype  character
++       CC  variable,  and if found, all occurrences of the prototype character
+        are replaced with the character in the environment variable.
+ 
+-       Terminal  descriptions  that  do not represent a specific kind of known
+-       terminal, such as switch, dialup, patch, and  network,  should  include
+-       the  gn (generic) capability so that programs can complain that they do
+-       not know how to talk to the terminal.  (This capability does not  apply
+-       to  virtual  terminal  descriptions  for which the escape sequences are
++       Terminal descriptions that do not represent a specific  kind  of  known
++       terminal,  such  as  switch, dialup, patch, and network, should include
++       the gn (generic) capability so that programs can complain that they  do
++       not  know how to talk to the terminal.  (This capability does not apply
++       to virtual terminal descriptions for which  the  escape  sequences  are
+        known.)
+ 
+        If the terminal has a "meta key" which acts as a shift key, setting the
+-       8th  bit  of any character transmitted, this fact can be indicated with
+-       km.  Otherwise, software will assume that the 8th bit is parity and  it
+-       will  usually be cleared.  If strings exist to turn this "meta mode" on
++       8th bit of any character transmitted, this fact can be  indicated  with
++       km.   Otherwise, software will assume that the 8th bit is parity and it
++       will usually be cleared.  If strings exist to turn this "meta mode"  on
+        and off, they can be given as smm and rmm.
+ 
+        If the terminal has more lines of memory than will fit on the screen at
+-       once,  the number of lines of memory can be indicated with lm.  A value
++       once, the number of lines of memory can be indicated with lm.  A  value
+        of lm#0 indicates that the number of lines is not fixed, but that there
+        is still more memory than fits on the screen.
+ 
+-       If  the terminal is one of those supported by the Unix virtual terminal
++       If the terminal is one of those supported by the Unix virtual  terminal
+        protocol, the terminal number can be given as vt.
+ 
+-       Media copy strings which control an auxiliary printer connected to  the
+-       terminal  can  be  given as mc0: print the contents of the screen, mc4:
+-       turn off the printer, and mc5: turn on the printer.  When  the  printer
+-       is  on,  all text sent to the terminal will be sent to the printer.  It
+-       is undefined whether the text is also displayed on the terminal  screen
+-       when  the  printer  is  on.   A variation mc5p takes one parameter, and
+-       leaves the printer on for as  many  characters  as  the  value  of  the
++       Media  copy strings which control an auxiliary printer connected to the
++       terminal can be given as mc0: print the contents of  the  screen,  mc4:
++       turn  off  the printer, and mc5: turn on the printer.  When the printer
++       is on, all text sent to the terminal will be sent to the  printer.   It
++       is  undefined whether the text is also displayed on the terminal screen
++       when the printer is on.  A variation  mc5p  takes  one  parameter,  and
++       leaves  the  printer  on  for  as  many  characters as the value of the
+        parameter, then turns the printer off.  The parameter should not exceed
+-       255.  All text, including mc4, is transparently passed to  the  printer
++       255.   All  text, including mc4, is transparently passed to the printer
+        while an mc5p is in effect.
+ 
+ 
+ 
                                                                                                                                                    Glitches and Brain Damage
                                                                                                                                                    +-       Hazeltine  terminals, which do not allow "~" characters to be displayed
++       Hazeltine terminals, which do not allow "~" characters to be  displayed
+        should indicate hz.
+ 
+-       Terminals which ignore a line-feed immediately after an am  wrap,  such
++       Terminals  which  ignore a line-feed immediately after an am wrap, such
+        as the Concept and vt100, should indicate xenl.
+ 
+-       If  el  is  required  to get rid of standout (instead of merely writing
++       If el is required to get rid of standout  (instead  of  merely  writing
+        normal text on top of it), xhp should be given.
+ 
+        Teleray terminals, where tabs turn all characters moved over to blanks,
+-       should  indicate  xt (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 the cursor on top of a  "magic  cookie",  that  to
+-       erase  standout  mode  it is instead necessary to use delete and insert
++       should indicate xt (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  the  cursor on top of a "magic cookie", that to
++       erase standout mode it is instead necessary to use  delete  and  insert
+        line.  The ncurses implementation ignores this glitch.
+ 
+-       The Beehive Superbee, which is unable to correctly transmit the  escape
+-       or  control/C  characters,  has xsb, indicating that the f1 key is used
+-       for escape and f2 for control/C.  (Only  certain  Superbees  have  this
+-       problem,  depending on the ROM.)  Note that in older terminfo versions,
++       The  Beehive Superbee, which is unable to correctly transmit the escape
++       or control/C characters, has xsb, indicating that the f1  key  is  used
++       for  escape  and  f2  for control/C.  (Only certain Superbees have this
++       problem, depending on the ROM.)  Note that in older terminfo  versions,
+        this capability was called "beehive_glitch"; it is now "no_esc_ctl_c".
+ 
+-       Other specific terminal  problems  may  be  corrected  by  adding  more
++       Other  specific  terminal  problems  may  be  corrected  by adding more
+        capabilities of the form xx.
+ 
+ 
+ 
                                                                                                                                                    Pitfalls of Long Entries
                                                                                                                                                    +-       Long  terminfo  entries are unlikely to be a problem; to date, no entry
+-       has  even  approached  terminfo's   4096-byte   string-table   maximum.
+-       Unfortunately,  the termcap translations are much more strictly limited
++       Long terminfo entries are unlikely to be a problem; to date,  no  entry
++       has   even   approached   terminfo's  4096-byte  string-table  maximum.
++       Unfortunately, the termcap translations are much more strictly  limited
+        (to 1023 bytes), thus termcap translations of long terminfo entries can
+        cause problems.
+ 
+-       The  man  pages  for  4.3BSD and older versions of tgetent instruct the
+-       user to allocate a 1024-byte buffer for the termcap entry.   The  entry
+-       gets  null-terminated by the termcap library, so that makes the maximum
+-       safe length for a termcap entry 1k-1 (1023) bytes.  Depending  on  what
+-       the  application  and the termcap library being used does, and where in
+-       the termcap file the terminal type that tgetent is  searching  for  is,
++       The man pages for 4.3BSD and older versions  of  tgetent  instruct  the
++       user  to  allocate a 1024-byte buffer for the termcap entry.  The entry
++       gets null-terminated by the termcap library, so that makes the  maximum
++       safe  length  for a termcap entry 1k-1 (1023) bytes.  Depending on what
++       the application and the termcap library being used does, and  where  in
++       the  termcap  file  the terminal type that tgetent is searching for is,
+        several bad things can happen:
+ 
+        o   some termcap libraries print a warning message,
+@@ -2348,15 +2349,15 @@
+        Some application programs allocate more than the recommended 1K for the
+        termcap entry; others do not.
+ 
+-       Each termcap entry has two important sizes associated with  it:  before
+-       "tc"  expansion, and after "tc" expansion.  "tc" is the capability that
++       Each  termcap  entry has two important sizes associated with it: before
++       "tc" expansion, and after "tc" expansion.  "tc" is the capability  that
+        tacks on another termcap entry to the end of the current one, to add on
+        its capabilities.  If a termcap entry does not use the "tc" capability,
+        then of course the two lengths are the same.
+ 
+-       The "before tc expansion" length is the most important one, because  it
+-       affects  more than just users of that particular terminal.  This is the
+-       length of the entry as it exists in /etc/termcap, minus the  backslash-
++       The  "before tc expansion" length is the most important one, because it
++       affects more than just users of that particular terminal.  This is  the
++       length  of the entry as it exists in /etc/termcap, minus the backslash-
+        newline pairs, which tgetent strips out while reading it.  Some termcap
+        libraries strip off the final newline, too (GNU termcap does not).  Now
+        suppose:
+@@ -2365,39 +2366,39 @@
+ 
+        o   and the application has only allocated a 1k buffer,
+ 
+-       o   and  the termcap library (like the one in BSD/OS 1.1 and GNU) reads
+-           the whole entry into the buffer, no matter what its length, to  see
++       o   and the termcap library (like the one in BSD/OS 1.1 and GNU)  reads
++           the  whole entry into the buffer, no matter what its length, to see
+            if it is the entry it wants,
+ 
+-       o   and  tgetent  is  searching  for a terminal type that either is the
+-           long entry, appears in the termcap file after the  long  entry,  or
+-           does  not  appear in the file at all (so that tgetent has to search
++       o   and tgetent is searching for a terminal type  that  either  is  the
++           long  entry,  appears  in the termcap file after the long entry, or
++           does not appear in the file at all (so that tgetent has  to  search
+            the whole termcap file).
+ 
+-       Then tgetent will overwrite memory, perhaps  its  stack,  and  probably
+-       core   dump   the  program.   Programs  like  telnet  are  particularly
+-       vulnerable; modern telnets pass along values  like  the  terminal  type
+-       automatically.   The  results  are almost as undesirable with a termcap
+-       library, like SunOS 4.1.3 and Ultrix 4.4, that prints warning  messages
+-       when  it  reads  an  overly  long  termcap entry.  If a termcap library
+-       truncates long entries, like OSF/1 3.0, it is immune to dying here  but
++       Then  tgetent  will  overwrite  memory, perhaps its stack, and probably
++       core  dump  the  program.   Programs  like  telnet   are   particularly
++       vulnerable;  modern  telnets  pass  along values like the terminal type
++       automatically.  The results are almost as undesirable  with  a  termcap
++       library,  like SunOS 4.1.3 and Ultrix 4.4, that prints warning messages
++       when it reads an overly long  termcap  entry.   If  a  termcap  library
++       truncates  long entries, like OSF/1 3.0, it is immune to dying here but
+        will return incorrect data for the terminal.
+ 
+-       The  "after  tc  expansion"  length  will  have a similar effect to the
++       The "after tc expansion" length will  have  a  similar  effect  to  the
+        above, but only for people who actually set TERM to that terminal type,
+-       since  tgetent  only  does "tc" expansion once it is found the terminal
++       since tgetent only does "tc" expansion once it is  found  the  terminal
+        type it was looking for, not while searching.
+ 
+-       In summary, a termcap entry that is longer than 1023 bytes  can  cause,
+-       on  various  combinations of termcap libraries and applications, a core
+-       dump, warnings, or incorrect operation.  If it is too long even  before
+-       "tc"  expansion,  it will have this effect even for users of some other
+-       terminal types and users whose TERM variable does not  have  a  termcap
++       In  summary,  a termcap entry that is longer than 1023 bytes can cause,
++       on various combinations of termcap libraries and applications,  a  core
++       dump,  warnings, or incorrect operation.  If it is too long even before
++       "tc" expansion, it will have this effect even for users of  some  other
++       terminal  types  and  users whose TERM variable does not have a termcap
+        entry.
+ 
+-       When  in  -C (translate to termcap) mode, the ncurses implementation of
+-       tic(1m) issues warning messages when the pre-tc  length  of  a  termcap
+-       translation  is  too  long.  The -c (check) option also checks resolved
++       When in -C (translate to termcap) mode, the ncurses  implementation  of
++       tic(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.
+ 
+ 
+@@ -2407,70 +2408,70 @@
+ 
+ 
+ 
                                                                                                                                                    EXTENSIONS
                                                                                                                                                    +-       Searching   for   terminal   descriptions   in   $HOME/.terminfo    and
++       Searching    for   terminal   descriptions   in   $HOME/.terminfo   and
+        TERMINFO_DIRS is not supported by older implementations.
+ 
+-       Some  SVr4  curses  implementations,  and  all previous to SVr4, do not
++       Some SVr4 curses implementations, and all  previous  to  SVr4,  do  not
+        interpret the %A and %O operators in parameter strings.
+ 
+-       SVr4/XPG4 do not specify whether msgr 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
+-       ncurses  implementation  ignores  msgr in ALTCHARSET mode.  This raises
++       SVr4/XPG4  do  not  specify  whether msgr 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
++       ncurses implementation ignores msgr in ALTCHARSET  mode.   This  raises
+        the  possibility  that  an  XPG4  implementation  making  the  opposite
+-       interpretation  may need terminfo entries made for ncurses to have msgr
++       interpretation may need terminfo entries made for ncurses to have  msgr
+        turned off.
+ 
+        The ncurses library handles insert-character and insert-character modes
+-       in  a  slightly  non-standard way to get better update efficiency.  See
++       in a slightly non-standard way to get better  update  efficiency.   See
+        the Insert/Delete Character subsection above.
+ 
+-       The parameter substitutions for set_clock  and  display_clock  are  not
+-       documented  in  SVr4  or  X/Open  Curses.   They  are  deduced from the
++       The  parameter  substitutions  for  set_clock and display_clock are not
++       documented in SVr4  or  X/Open  Curses.   They  are  deduced  from  the
+        documentation for the AT&T 505 terminal.
+ 
+-       Be careful assigning the kmous capability.  The ncurses  library  wants
+-       to  interpret  it as KEY_MOUSE, for use by terminals and emulators like
+-       xterm that can return mouse-tracking information in the  keyboard-input
++       Be  careful  assigning the kmous capability.  The ncurses library wants
++       to interpret it as KEY_MOUSE, for use by terminals and  emulators  like
++       xterm  that can return mouse-tracking information in the keyboard-input
+        stream.
+ 
+-       X/Open  Curses  does  not  mention italics.  Portable applications must
+-       assume that  numeric  capabilities  are  signed  16-bit  values.   This
+-       includes  the  no_color_video  (ncv)  capability.  The 32768 mask value
+-       used for italics with ncv can be confused with an  absent  or  canceled
+-       ncv.   If  italics  should work with colors, then the ncv value must be
++       X/Open Curses does not mention  italics.   Portable  applications  must
++       assume  that  numeric  capabilities  are  signed  16-bit  values.  This
++       includes the no_color_video (ncv) capability.   The  32768  mask  value
++       used  for  italics  with ncv can be confused with an absent or canceled
++       ncv.  If italics should work with colors, then the ncv  value  must  be
+        specified, even if it is zero.
+ 
+-       Different commercial ports of terminfo  and  curses  support  different
+-       subsets  of  X/Open  Curses  and  (in some cases) different extensions.
+-       Here is a summary,  accurate  as  of  October  1995,  after  which  the
++       Different  commercial  ports  of  terminfo and curses support different
++       subsets of X/Open Curses and  (in  some  cases)  different  extensions.
++       Here  is  a  summary,  accurate  as  of  October  1995, after which the
+        commercial Unix market contracted and lost diversity.
+ 
+        o   SVr4, Solaris, and ncurses support all SVr4 capabilities.
+ 
+-       o   IRIX  supports  the  SVr4  set  and  adds one undocumented extended
++       o   IRIX supports the SVr4  set  and  adds  one  undocumented  extended
+            string capability (set_pglen).
+ 
+-       o   SVr1  and  Ultrix  support  a   restricted   subset   of   terminfo
+-           capabilities.   The  Booleans  end with xon_xoff; the numerics with
++       o   SVr1   and   Ultrix   support   a  restricted  subset  of  terminfo
++           capabilities.  The Booleans end with xon_xoff;  the  numerics  with
+            width_status_line; and the strings with prtr_non.
+ 
+-       o   HP/UX  supports  the  SVr1  subset,  plus  the  SVr[234]   numerics
+-           num_labels,   label_height,  label_width,  plus  function  keys  11
+-           through 63, plus plab_norm, label_on, and label_off, plus a  number
++       o   HP/UX   supports  the  SVr1  subset,  plus  the  SVr[234]  numerics
++           num_labels,  label_height,  label_width,  plus  function  keys   11
++           through  63, plus plab_norm, label_on, and label_off, plus a number
+            of incompatible string table extensions.
+ 
+-       o   AIX  supports  the  SVr1  subset, plus function keys 11 through 63,
++       o   AIX supports the SVr1 subset, plus function  keys  11  through  63,
+            plus a number of incompatible string table extensions.
+ 
+        o   OSF/1 supports both the SVr4 set and the AIX extensions.
+ 
+ 
+ 
                                                                                                                                                    PORTABILITY
                                                                                                                                                    +-       Do not count on  compiled  (binary)  terminfo  entries  being  portable
+-       between  commercial  Unix  systems.   At  least  two implementations of
++       Do  not  count  on  compiled  (binary)  terminfo entries being portable
++       between commercial Unix  systems.   At  least  two  implementations  of
+        terminfo (those of HP-UX and AIX) diverged from those of other System V
+-       Unices  after  SVr1,  adding extension capabilities to the string table
++       Unices after SVr1, adding extension capabilities to  the  string  table
+        that (in the binary format) collide with subsequent System V and X/Open
+        Curses extensions.
+ 
+@@ -2481,8 +2482,8 @@
+ 
+ 
+ 
                                                                                                                                                    SEE ALSO
                                                                                                                                                    +-       infocmp(1m),    tabs(1),    tic(1m),    curses(3x),     curs_color(3x),
+-       curs_terminfo(3x),  curs_variables(3x),  printf(3), term_variables(3x),
++       infocmp(1m),     tabs(1),    tic(1m),    curses(3x),    curs_color(3x),
++       curs_terminfo(3x), curs_variables(3x),  printf(3),  term_variables(3x),
+        term(5), user_caps(5)
+ 
+ 
+Index: doc/html/man/tic.1m.html
+--- ncurses-6.5-20250111+/doc/html/man/tic.1m.html	2024-09-14 20:23:29.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/tic.1m.html	2025-01-19 00:55:02.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-tic 1m 2024-09-14 ncurses 6.5 User commands
++tic 1m 2025-01-18 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                    tic 1m 2024-09-14 ncurses 6.5 User commands
                                                                                                                                                    
++
                                                                                                                                                    tic 1m 2025-01-18 ncurses 6.5 User commands
                                                                                                                                                    
+ 
                                                                                                                                                    + tic(1m)                          User commands                         tic(1m)
+ 
+@@ -397,7 +397,7 @@
+ 
+ 
+ 
                                                                                                                                                    PORTABILITY
                                                                                                                                                    +-       X/Open  Curses, Issue 7 (2009) provides a brief description of tic.  It
++       X/Open  Curses  Issue 7 (2009) provides a brief description of tic.  It
+        lists one option: -c.  The omission of -v is  unexpected.   The  change
+        history  states  that the description is derived from Tru64.  According
+        to its manual pages, that system also supported the -v option.
+@@ -482,7 +482,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-09-14                           tic(1m)
++ncurses 6.5                       2025-01-18                           tic(1m)
+ 
                                                                                                                                                    
+ 
                                                                                                                                                    
+ 
                                                                                                                                                      
+Index: doc/html/man/tput.1.html
+--- ncurses-6.5-20250111+/doc/html/man/tput.1.html	2024-12-28 21:43:58.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/tput.1.html	2025-01-19 00:55:02.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-tput 1 2024-12-28 ncurses 6.5 User commands
++tput 1 2025-01-18 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                      tput 1 2024-12-28 ncurses 6.5 User commands
                                                                                                                                                      
++
                                                                                                                                                      tput 1 2025-01-18 ncurses 6.5 User commands
                                                                                                                                                      
+ 
                                                                                                                                                      + tput(1)                          User commands                         tput(1)
+ 
+@@ -91,7 +91,7 @@
+                 defined, without a trailing newline.
+ 
+        Before  using  a value returned on the standard output, the application
+-       should test tput's exit status to be sure it is 0;  see  section  "EXIT
++       should test tput 's exit status to be sure it is 0; see  section  "EXIT
+        STATUS" below.
+ 
+ 
+@@ -172,7 +172,7 @@
+ 
+                        o   enabling newline translation, and
+ 
+-                       o   setting  any  unset  special  characters  to  their
++                       o   setting  any  special  input  characters  to  their
+                            default values.
+ 
+                   (2)  If any reset capabilities are defined for the  terminal
+@@ -209,7 +209,7 @@
+        operand.  For example, executing a link named reset that points to tput
+        has the same effect as "tput reset".
+ 
+-       This feature was introduced by ncurses 5.2 in 2000.  It is rarely used:
++       This feature was introduced by ncurses 5.2 in 2000.  It is rarely used.
+ 
+        clear  is a separate program, which is both smaller and more frequently
+               executed.
+@@ -290,10 +290,15 @@
+ 
+ 
+ 
                                                                                                                                                      ENVIRONMENT
                                                                                                                                                      +-       tput reads one environment variable.
++       tput reads up to three environment variables if the -T  option  is  not
++       specified.
+ 
+-       TERM    denotes the terminal type.  Each  terminal  type  is  distinct,
+-               though many are similar.  The -T option overrides its value.
++       COLUMNS  specifies the width of the screen in characters.
++
++       LINES    specifies the height of the screen in characters.
++
++       TERM     denotes  the  terminal  type.  Each terminal type is distinct,
++                though many are similar.
+ 
+ 
+ 
                                                                                                                                                      FILES
                                                                                                                                                      +@@ -305,192 +310,192 @@
+ 
+ 
+ 
                                                                                                                                                      PORTABILITY
                                                                                                                                                      +-       Over  time  ncurses  tput  has  differed  from  that of System V in two
++       Over time ncurses tput has  differed  from  that  of  System V  in  two
+        important respects, one now mostly historical.
+ 
+-       o   "tput cap-code" writes to the standard output, which need not be  a
+-           terminal  device.   However,  the operands that manipulate terminal
++       o   "tput  cap-code" writes to the standard output, which need not be a
++           terminal device.  However, the operands  that  manipulate  terminal
+            modes might not use the standard output.
+ 
+-           System V tput's init and reset  operands  use  logic  from  4.1cBSD
+-           tset,  manipulating  terminal  modes.   It  checks  the  same  file
+-           descriptors (and /dev/tty) for association with a  terminal  device
+-           as  ncurses  now does, and if none are, finally assumes a 1200 baud
++           System V  tput's  init  and  reset  operands use logic from 4.1cBSD
++           tset,  manipulating  terminal  modes.   It  checks  the  same  file
++           descriptors  (and  /dev/tty) for association with a terminal device
++           as ncurses now does, and if none are, finally assumes a  1200  baud
+            terminal.  When updating terminal modes, it ignores errors.
+ 
+-           Until ncurses 6.1 (see  section  "HISTORY"  below),  tput  did  not
++           Until  ncurses  6.1  (see  section  "HISTORY"  below), tput did not
+            modify  terminal  modes.   It  now  employs  a  scheme  similar  to
+            System V, using functions shared with tset (and ultimately based on
+-           4.4BSD  tset).  If it is not able to open a terminal (for instance,
++           4.4BSD tset).  If it is not able to open a terminal (for  instance,
+            when run by cron(1)), tput exits with an error status.
+ 
+-       o   System V tput assumes that  the  type  of  a  cap-code  operand  is
+-           numeric  if all the characters of its value are decimal numbers; if
++       o   System V  tput  assumes  that  the  type  of  a cap-code operand is
++           numeric if all the characters of its value are decimal numbers;  if
+            they are not, it treats cap-code as a string capability.
+ 
+            Most implementations that provide support for cap-code operands use
+-           the  tparm(3x)  function  to  expand its parameters.  That function
+-           expects a mixture of numeric and string parameters, requiring  tput
++           the tparm(3x) function to expand  its  parameters.   That  function
++           expects  a mixture of numeric and string parameters, requiring tput
+            to know which type to use.
+ 
+-           ncurses  tput uses a table to determine the parameter types for the
+-           standard cap-code operands, and an  internal  function  to  analyze
++           ncurses tput uses a table to determine the parameter types for  the
++           standard  cap-code  operands,  and  an internal function to analyze
+            nonstandard cap-code operands.
+ 
+-           While  more reliable than System V's utility, a portability problem
+-           is introduced by this analysis.  An OpenBSD developer  adapted  the
+-           internal  library  function  from ncurses to port NetBSD's termcap-
+-           based tput to terminfo, and modified it to interpret multiple  cap-
+-           codes  (and parameters) on the command line.  Portable applications
+-           should not rely upon this feature; ncurses  offers  it  to  support
++           While more reliable than System V's utility, a portability  problem
++           is  introduced  by this analysis.  An OpenBSD developer adapted the
++           internal library function from ncurses to  port  NetBSD's  termcap-
++           based  tput to terminfo, and modified it to interpret multiple cap-
++           codes (and parameters) on the command line.  Portable  applications
++           should  not  rely  upon  this feature; ncurses offers it to support
+            applications written specifically for OpenBSD.
+ 
+-       This  implementation,  unlike others, accepts both termcap and terminfo
+-       cap-codes if termcap support is compiled in.  In  that  case,  however,
++       This implementation, unlike others, accepts both termcap  and  terminfo
++       cap-codes  if  termcap  support is compiled in.  In that case, however,
+        the predefined termcap and terminfo codes have two ambiguities; ncurses
+        assumes the terminfo code.
+ 
+-       o   The cap-code dl means delete_line to termcap  but  parm_delete_line
++       o   The  cap-code  dl means delete_line to termcap but parm_delete_line
+            to terminfo.  termcap uses the code DL for parm_delete_line.  term-
+            info uses the code dl1 for delete_line.
+ 
+-       o   The cap-code ed means exit_delete_mode to termcap  but  clr_eos  to
++       o   The  cap-code  ed  means exit_delete_mode to termcap but clr_eos to
+            terminfo.  termcap uses the code cd for clr_eos.  terminfo uses the
+            code rmdc for exit_delete_mode.
+ 
+-       The  longname  operand,  -S  option,  and  the   parameter-substitution
+-       features  used in the cup example below, were not supported in AT&T/USL
++       The   longname  operand,  -S  option,  and  the  parameter-substitution
++       features used in the cup example below, were not supported in  AT&T/USL
+        curses before SVr4 (1989).  Later, 4.3BSD-Reno (1990) added support for
+        longname,  and  in  1994,  NetBSD  added  support  for  the  parameter-
+        substitution features.
+ 
+-       IEEE  Std  1003.1/The  Open   Group   Base   Specifications   Issue   7
+-       (POSIX.1-2008)  documents  only the clear, init, and reset operands.  A
++       IEEE   Std   1003.1/The   Open   Group   Base   Specifications  Issue 7
++       (POSIX.1-2008) documents only the clear, init, and reset  operands.   A
+        few observations of interest arise from that selection.
+ 
+        o   ncurses supports clear as it does any other standard cap-code.  The
+-           others   (init   and   longname)  do  not  correspond  to  terminal
++           others  (init  and  longname)  do  not   correspond   to   terminal
+            capabilities.
+ 
+-       o   The tput on SVr4-based systems such as Solaris, IRIX64, and  HP-UX,
++       o   The  tput on SVr4-based systems such as Solaris, IRIX64, and HP-UX,
+            as well as others such as AIX and Tru64, also support standard cap-
+            code operands.
+ 
+        o   A few platforms such as FreeBSD recognize termcap codes rather than
+-           terminfo capability codes in their respective tput commands.  Since
+-           2010, NetBSD's tput uses terminfo codes.   Before  that,  it  (like
++           terminfo capability codes in their respective tput commands.  Since
++           2010,  NetBSD's  tput  uses  terminfo codes.  Before that, it (like
+            FreeBSD) recognized termcap codes.
+ 
+-           Beginning  in  2021, FreeBSD uses ncurses tput, configured for both
++           Beginning in 2021, FreeBSD uses ncurses tput, configured  for  both
+            terminfo (tested first) and termcap (as a fallback).
+ 
+        Because (apparently) all certified Unix systems support the full set of
+-       capability  codes,  the  reason  for  documenting only a few may not be
++       capability codes, the reason for documenting only  a  few  may  not  be
+        apparent.
+ 
+        o   X/Open Curses Issue 7 documents tput differently, with cap-code and
+            the other features used in this implementation.
+ 
+-       o   That  is,  there  are  two standards for tput: POSIX (a subset) and
+-           X/Open Curses (the full implementation).  POSIX documents a  subset
+-           to  avoid  the  complication  of  including  X/Open  Curses and the
++       o   That is, there are two standards for tput:  POSIX  (a  subset)  and
++           X/Open  Curses (the full implementation).  POSIX documents a subset
++           to avoid the  complication  of  including  X/Open  Curses  and  the
+            terminal capability database.
+ 
+-       o   While it is certainly possible to  write  a  tput  program  without
+-           using  curses,  no  system  with a curses implementation provides a
+-           tput utility that does not also support standard cap-codes.
++       o   While  it  is  certainly  possible  to write a tput program without
++           using curses, no system with a  curses  implementation  provides  a
++           tput utility that does not also support standard cap-codes.
+ 
+-       X/Open  Curses  Issue  7  (2009)  is  the  first  version  to  document
++       X/Open   Curses  Issue 7  (2009)  is  the  first  version  to  document
+        utilities.  However that part of X/Open Curses does not follow existing
+        practice (that is, System V curses behavior).
+ 
+-       o   It assigns exit status 4 to "invalid operand", which may  have  the
+-           same  meaning  as  "unknown  capability".  For instance, the source
++       o   It  assigns  exit status 4 to "invalid operand", which may have the
++           same meaning as "unknown capability".   For  instance,  the  source
+            code for Solaris xcurses uses the term "invalid" in this case.
+ 
+-       o   It assigns exit status 255  to  a  numeric  variable  that  is  not
++       o   It  assigns  exit  status  255  to  a  numeric variable that is not
+            specified in the terminfo database.  That likely is a documentation
+-           error, mistaking  the  "-1"  written  to  the  standard  output  to
++           error,  mistaking  the  "-1"  written  to  the  standard  output to
+            indicate an absent or canceled numeric capability for an (unsigned)
+            exit status.
+ 
+        The various System V implementations (AIX, HP-UX, Solaris) use the same
+        exit statuses as ncurses.
+ 
+-       NetBSD  curses  documents  exit  statuses  that  correspond  to neither
++       NetBSD curses  documents  exit  statuses  that  correspond  to  neither
+        ncurses nor X/Open Curses.
+ 
+ 
+ 
                                                                                                                                                      HISTORY
                                                                                                                                                      +-       Bill Joy wrote a tput command during development  of  4BSD  in  October
+-       1980.   This  initial version only cleared the screen, and did not ship
++       Bill  Joy  wrote  a  tput command during development of 4BSD in October
++       1980.  This initial version only cleared the screen, and did  not  ship
+        with official distributions.
+ 
+-       System V developed a different tput command.
++       System V developed a different tput command.
+ 
+-       o   SVr2 (1984) provided a rudimentary tput that checked the  parameter
+-           against  each  predefined capability and returned the corresponding
+-           value.   This  version  of  tput  did   not   use   tparm(3x)   for
++       o   SVr2  (1984) provided a rudimentary tput that checked the parameter
++           against each predefined capability and returned  the  corresponding
++           value.    This   version   of   tput  did  not  use  tparm(3x)  for
+            parameterized capabilities.
+ 
+-       o   SVr3  (1987)  replaced  that  with  a  more extensive program whose
+-           support for init and reset operands (more than  half  the  program)
+-           incorporated the reset feature of BSD tset written by Eric Allman.
++       o   SVr3 (1987) replaced that  with  a  more  extensive  program  whose
++           support  for  init  and reset operands (more than half the program)
++           incorporated the reset feature of BSD tset written by Eric Allman.
+ 
+-       o   SVr4  (1989)  added  color  initialization by using the orig_colors
++       o   SVr4 (1989) added color initialization  by  using  the  orig_colors
+            (oc) and orig_pair (op) capabilities in its init logic.
+ 
+-       Keith Bostic refactored BSD tput for shipment in  4.3BSD-Tahoe  (1988),
+-       then  replaced  it  the  next  year  with a new implementation based on
+-       System V tput.  Bostic's version  similarly  accepted  some  parameters
+-       named  for  terminfo  (pseudo-)capabilities: clear, init, longname, and
+-       reset.  However, because he had only  termcap  available,  it  accepted
+-       termcap  codes for other capabilities.  Also, Bostic's BSD tput did not
+-       modify the terminal modes as the earlier BSD tset had done.
+-
+-       At the same time, Bostic added a shell script named "clear"  that  used
+-       tput  to  clear the screen.  Both of these appeared in 4.4BSD, becoming
+-       the "modern" BSD implementation of tput.
+-
+-       The origin of ncurses tput lies outside both System V and BSD, in  Ross
+-       Ridge's  mytinfo  package,  published  on comp.sources.unix in December
+-       1992.  Ridge's program made more  sophisticated  use  of  the  terminal
+-       capabilities than the BSD program.  Eric Raymond used that tput program
+-       (and other parts of mytinfo) in ncurses in  June  1995.   Incorporating
+-       the  portions dealing with terminal capabilities almost without change,
+-       Raymond made improvements  to  the  way  command-line  parameters  were
++       Keith  Bostic  refactored BSD tput for shipment in 4.3BSD-Tahoe (1988),
++       then replaced it the next year  with  a  new  implementation  based  on
++       System V  tput.   Bostic's  version  similarly accepted some parameters
++       named for terminfo (pseudo-)capabilities: clear,  init,  longname,  and
++       reset.   However,  because  he  had only termcap available, it accepted
++       termcap codes for other capabilities.  Also, Bostic's BSD tput did  not
++       modify the terminal modes as the earlier BSD tset had done.
++
++       At  the  same time, Bostic added a shell script named "clear" that used
++       tput to clear the screen.  Both of these appeared in  4.4BSD,  becoming
++       the "modern" BSD implementation of tput.
++
++       The  origin of ncurses tput lies outside both System V and BSD, in Ross
++       Ridge's mytinfo package, published  on  comp.sources.unix  in  December
++       1992.   Ridge's  program  made  more  sophisticated use of the terminal
++       capabilities than the BSD program.  Eric Raymond used that tput program
++       (and  other  parts  of mytinfo) in ncurses in June 1995.  Incorporating
++       the portions dealing with terminal capabilities almost without  change,
++       Raymond  made  improvements  to  the  way  command-line parameters were
+        handled.
+ 
+        Before ncurses 6.1 (2018), its tset and tput utilities differed.
+ 
+-       o   tset  was  more effective, resetting the terminal modes and special
+-           characters.
++       o   tset was more effective, resetting the terminal's modes and special
++           input characters.
+ 
+-       o   On the other hand, tset's repertoire of terminal  capabilities  for
++       o   On  the  other hand, tset's repertoire of terminal capabilities for
+            resetting the terminal was more limited; it had only equivalents of
+-           reset_1string (rs1), reset_2string (rs2), and reset_file (rf),  and
++           reset_1string  (rs1), reset_2string (rs2), and reset_file (rf), and
+            not the tab stop and margin update features of tput.
+ 
+-       The reset program is traditionally an alias for tset due to its ability
+-       to reset terminal modes and special characters.
++       The reset program is traditionally an alias for tset due to its ability
++       to reset the terminal's modes and special input characters.
+ 
+-       As of ncurses 6.1,  the  "reset"  features  of  the  two  programs  are
++       As  of  ncurses  6.1,  the  "reset"  features  of  the two programs are
+        (mostly) the same.  Two minor differences remain.
+ 
+-       o   When  issuing  a  reset, the tset program checks whether the device
+-           appears to be a pseudoterminal (as might  be  used  by  a  terminal
++       o   When issuing a reset, the tset program checks  whether  the  device
++           appears  to  be  a  pseudoterminal  (as might be used by a terminal
+            emulator program), and, if it does not, waits one second in case it
+            is communicating with a hardware terminal.
+ 
+-       o   The two programs  write  the  terminal  initialization  strings  to
+-           different  streams;  that  is, standard error for tset and standard
++       o   The  two  programs  write  the  terminal  initialization strings to
++           different streams; that is, standard error for  tset  and  standard
+            output for tput.
+ 
+ 
+ 
                                                                                                                                                      EXAMPLES
                                                                                                                                                      +        tput init
+               Initialize the terminal according to the type of terminal in the
+-              TERM  environment  variable.   If  the  system does not reliably
++              TERM environment variable.  If  the  system  does  not  reliably
+               initialize the terminal upon login, this command can be included
+               in $HOME/.profile after exporting the TERM environment variable.
+ 
+@@ -502,11 +507,11 @@
+               Set cursor to normal visibility.
+ 
+        tput home
+-              Move the cursor to line 0, column 0: the upper  left  corner  of
++              Move  the  cursor  to line 0, column 0: the upper left corner of
+               the screen, usually known as the "home" cursor position.
+ 
+        tput clear
+-              Clear  the  screen: write the clear_screen capability's value to
++              Clear the screen: write the clear_screen capability's  value  to
+               the standard output stream.
+ 
+        tput cols
+@@ -516,29 +521,29 @@
+               Report the number of columns used by an ADM-3A terminal.
+ 
+        strong=`tput smso` normal=`tput rmso`
+-              Set shell variables to capability values: strong and normal,  to
+-              begin  and  end,  respectively, stand-out mode for the terminal.
++              Set  shell variables to capability values: strong and normal, to
++              begin and end, respectively, stand-out mode  for  the  terminal.
+               One might use these to present a prompt.
+ 
+                      printf "${strong}Username:${normal} "
+ 
+        tput hc
+-              Indicate via exit status whether the terminal  is  a  hard  copy
++              Indicate  via  exit  status  whether the terminal is a hard copy
+               device.
+ 
+        tput cup 23 4
+               Move the cursor to line 23, column 4.
+ 
+        tput cup
+-              Report  the  value  of the cursor_address (cup) capability (used
++              Report the value of the cursor_address  (cup)  capability  (used
+               for cursor movement), with no parameters substituted.
+ 
+        tput longname
+-              Report the terminfo database's description of the terminal  type
++              Report  the terminfo database's description of the terminal type
+               specified in the TERM environment variable.
+ 
+        tput -S
+-              Process  multiple capabilities.  The -S option can be profitably
++              Process multiple capabilities.  The -S option can be  profitably
+               used with a shell "here document".
+ 
+               $ tput -S <<!
+@@ -547,7 +552,7 @@
+               > bold
+               > !
+ 
+-              The foregoing clears the screen, moves the  cursor  to  position
++              The  foregoing  clears  the screen, moves the cursor to position
+               (10, 10) and turns on bold (extra bright) mode.
+ 
+        tput clear cup 10 10 bold
+@@ -559,7 +564,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                           tput(1)
++ncurses 6.5                       2025-01-18                           tput(1)
+ 
                                                                                                                                                      
+ 
                                                                                                                                                      
+ 
                                                                                                                                                        
+Index: doc/html/man/tset.1.html
+--- ncurses-6.5-20250111+/doc/html/man/tset.1.html	2024-12-28 21:43:58.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/tset.1.html	2025-01-19 00:55:02.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-tset 1 2024-12-28 ncurses 6.5 User commands
++tset 1 2025-01-18 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                        tset 1 2024-12-28 ncurses 6.5 User commands
                                                                                                                                                        
++
                                                                                                                                                        tset 1 2025-01-18 ncurses 6.5 User commands
                                                                                                                                                        
+ 
                                                                                                                                                        + tset(1)                          User commands                         tset(1)
+ 
+@@ -134,7 +134,7 @@
+ 
+        o   turns on newline translation and
+ 
+-       o   resets any unset special characters to their default values
++       o   resets special input characters to their default values
+ 
+        before doing the terminal initialization described above.  Also, rather
+        than using the terminal initialization strings, it  uses  the  terminal
+@@ -395,7 +395,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                           tset(1)
++ncurses 6.5                       2025-01-18                           tset(1)
+ 
                                                                                                                                                        
+ 
                                                                                                                                                        
+ 
                                                                                                                                                          
+Index: doc/html/man/wresize.3x.html
+--- ncurses-6.5-20250111+/doc/html/man/wresize.3x.html	2024-12-28 21:43:59.000000000 +0000
++++ ncurses-6.5-20250118/doc/html/man/wresize.3x.html	2025-01-19 00:55:02.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-wresize 3x 2024-12-28 ncurses 6.5 Library calls
++wresize 3x 2025-01-18 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                          wresize 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                          
++
                                                                                                                                                          wresize 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                          
+ 
                                                                                                                                                          + wresize(3x)                      Library calls                     wresize(3x)
+ 
+@@ -61,7 +61,7 @@
+        wresize,  an  ncurses  extension  to  the  curses  library, reallocates
+        storage for win, adjusting its dimensions to  lines  and  columns.   If
+        either  dimension  is  larger than its current value, ncurses fills the
+-       expanded part of the window with the background character and rendition
++       expanded part of the window with the window's background  character  as
+        configured by wbkgdset(3x) (wide-character API: wbkgrndset(3x)).
+ 
+ 
+@@ -108,7 +108,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                       wresize(3x)
++ncurses 6.5                       2025-01-18                       wresize(3x)
+ 
                                                                                                                                                          
+ 
                                                                                                                                                          
+ 
                                                                                                                                                            
+Index: include/curses.wide
+Prereq:  1.52 
+--- ncurses-6.5-20250111+/include/curses.wide	2025-01-12 00:39:32.000000000 +0000
++++ ncurses-6.5-20250118/include/curses.wide	2025-01-18 21:08:32.000000000 +0000
+@@ -1,4 +1,4 @@
+-/* $Id: curses.wide,v 1.52 2025/01/12 00:39:32 tom Exp $ */
++/* $Id: curses.wide,v 1.53 2025/01/18 21:08:32 Branden.Robinson Exp $ */
+ /*
+  * vile:cmode:
+  * This file is part of ncurses, designed to be appended after curses.h.in
+@@ -213,7 +213,7 @@
+ extern NCURSES_EXPORT(int) wins_nwstr (WINDOW *, const wchar_t *, int);	/* implemented */
+ extern NCURSES_EXPORT(int) wins_wch (WINDOW *, const cchar_t *);	/* implemented */
+ extern NCURSES_EXPORT(int) wins_wstr (WINDOW *, const wchar_t *);	/* generated:WIDEC */
+-extern NCURSES_EXPORT(int) winwstr (WINDOW *, wchar_t *);		/* implemented */
++extern NCURSES_EXPORT(int) winwstr (WINDOW *, wchar_t *);		/* generated:WIDEC */
+ extern NCURSES_EXPORT(wchar_t*) wunctrl (cchar_t *);			/* implemented */
+ extern NCURSES_EXPORT(int) wvline_set (WINDOW *, const cchar_t *, int);	/* implemented */
+ 
+@@ -261,6 +261,7 @@
+ #define wget_wstr(w,t)			wgetn_wstr((w),(t),-1)
+ #define win_wchstr(w,c)			win_wchnstr((w),(c),-1)
+ #define wins_wstr(w,t)			wins_nwstr((w),(t),-1)
++#define winwstr(w,c)			winnwstr((w),(c),-1)
+ 
+ #if !NCURSES_OPAQUE
+ #define wgetbkgrnd(win,wch)		(NCURSES_OK_ADDR(wch) ? ((win) ? (*(wch) = (win)->_bkgrnd) : *(wch), OK) : ERR)
+Index: man/captoinfo.1m
+Prereq:  1.65 
+--- ncurses-6.5-20250111+/man/captoinfo.1m	2024-09-14 00:39:51.000000000 +0000
++++ ncurses-6.5-20250118/man/captoinfo.1m	2025-01-19 00:49:39.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: captoinfo.1m,v 1.65 2024/09/14 00:39:51 tom Exp $
+-.TH @CAPTOINFO@ 1M 2024-09-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: captoinfo.1m,v 1.69 2025/01/19 00:49:39 tom Exp $
++.TH @CAPTOINFO@ 1M 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -206,8 +206,7 @@
+ .I /etc/termcap
+ default \fI\%termcap\fP terminal capability database
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 7 (2009) describes \fBtic\fP briefly,
++X/Open Curses Issue\ 7 (2009) describes \fBtic\fP briefly,
+ but omits this program.
+ .PP
+ SVr4 systems provide \fB\%captoinfo\fP as a separate application from
+Index: man/clear.1
+Prereq:  1.48 
+--- ncurses-6.5-20250111+/man/clear.1	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20250118/man/clear.1	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: clear.1,v 1.48 2024/03/16 15:35:01 tom Exp $
+-.TH @CLEAR@ 1 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: clear.1,v 1.51 2025/01/19 00:49:39 tom Exp $
++.TH @CLEAR@ 1 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -91,8 +91,8 @@
+ .B \-x
+ prevents \fB\%@CLEAR@\fP from attempting to clear the scrollback buffer.
+ .SH PORTABILITY
+-Neither IEEE Std 1003.1/The Open Group Base Specifications Issue 7
+-(POSIX.1-2008) nor X/Open Curses Issue 7 documents \fB\%@CLEAR@\fP.
++Neither IEEE Std 1003.1/The Open Group Base Specifications Issue\ 7
++(POSIX.1-2008) nor X/Open Curses Issue\ 7 documents \fB\%@CLEAR@\fP.
+ .PP
+ The latter documents \fBtput\fP,
+ which could be used to replace this utility either via a shell script or
+Index: man/curs_add_wch.3x
+Prereq:  1.74 
+--- ncurses-6.5-20250111+/man/curs_add_wch.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_add_wch.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2001-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_add_wch.3x,v 1.74 2024/12/28 21:26:21 tom Exp $
+-.TH curs_add_wch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_add_wch.3x,v 1.88 2025/01/19 00:49:39 tom Exp $
++.TH curs_add_wch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -68,7 +68,9 @@
+ .SH DESCRIPTION
+ .SS wadd_wch
+ .B \%wadd_wch
+-writes the complex character
++writes the
++.I curses
++complex character
+ .I wch
+ to the window
+ .IR win ","
+@@ -76,6 +78,12 @@
+ analogously to the standard C library's \fI\%putwchar\fP(3).
+ \fB\%ncurses\fP(3X) describes the variants of this function.
+ .PP
++Construct a
++.I curses
++complex character
++from a
++.I wchar_t
++with \fB\%setcchar\fP(3X).
+ Much behavior depends on whether the wide characters in
+ .I wch
+ are spacing or non-spacing;
+@@ -162,7 +170,7 @@
+ .BR \%wadd_wch "."
+ See \fB\%curs_attr\fP(3X) for values of predefined constants that can be
+ usefully \*(``or\*(''ed with characters.
+-A complex character whose character component is a wide space,
++A complex character whose only character component is a wide space,
+ and whose only attribute is
+ .BR \%WA_NORMAL ,
+ is a
+@@ -176,7 +184,10 @@
+ are equivalent to calling
+ .RB \%( w ) add_wch
+ followed by
+-.RB \%( w ) refresh .
++.RB \%( w ) refresh
++on
++.B \%stdscr
++or the specified window.
+ .I curses
+ interprets these functions as a hint that only a single (complex)
+ character is being output;
+@@ -190,7 +201,7 @@
+ .B \%WACS_
+ that can be used with
+ .B \%wadd_wch
+-to write line-drawing and other special characters to the screen.
++to write line-drawing and other symbols to the screen.
+ .I \%ncurses
+ terms these
+ .I "forms-drawing characters."
+@@ -385,13 +396,20 @@
+ on success and
+ .B ERR
+ on failure.
++.PP
+ In
+ .IR \%ncurses ,
+ .B \%wadd_wch
+-returns
++and
++.B \%wecho_wchar
++return
+ .B ERR
+ if
+ .bP
++the
++.I curses
++screen has not been initialized,
++.bP
+ .I win
+ is
+ .IR NULL ","
+@@ -425,7 +443,7 @@
+ but is not specified by X/Open Curses
+ (see \fBcurs_variables\fP(3X)).
+ .SH PORTABILITY
+-These functions are described in X/Open Curses, Issue 4.
++These functions are described in X/Open Curses Issue\ 4.
+ It specifies no error conditions for them.
+ .PP
+ The defaults specified for forms-drawing characters apply in the POSIX
+@@ -486,9 +504,9 @@
+ But there are several possibilities, all with problems.
+ .IP
+ Unicode 6.0 (2010) does provide two lantern symbols: U+1F383 and U+1F3EE.
+-Those were not available in 2002, and are irrelevant since
+-they lie outside the BMP and as a result are not generally available
+-in terminals.
++Those were not available in 2002,
++and are irrelevant since they lie outside the Basic Multilingual Plane
++and as a result are unavailable on many terminals.
+ They are not storm lanterns, in any case.
+ .IP
+ Most \fIstorm lanterns\fP have a tapering glass chimney
+@@ -535,10 +553,10 @@
+ .I \%ncurses
+ adds the non-spacing character to the active complex character.
+ .SH HISTORY
+-These functions were initially specified by X/Open Curses,
+-Issue 4.
+-The System\ V Interface Definition,
+-Version 4 (1995),
++These functions were initially specified by X/Open Curses Issue\ 4
++(1995).
++The System\ V Interface Definition Version\ 4
++of the same year
+ specified functions named
+ .I \%waddwch
+ and
+Index: man/curs_add_wchstr.3x
+Prereq:  1.46 
+--- ncurses-6.5-20250111+/man/curs_add_wchstr.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_add_wchstr.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_add_wchstr.3x,v 1.46 2024/12/28 21:26:21 tom Exp $
+-.TH curs_add_wchstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_add_wchstr.3x,v 1.52 2025/01/19 00:49:39 tom Exp $
++.TH curs_add_wchstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -61,12 +61,16 @@
+ \fBint add_wchstr(const cchar_t * \fIwchstr\fP);
+ \fBint wadd_wchstr(WINDOW *  \fIwin\fP, const cchar_t * \fIwchstr\fP);
+ \fBint mvadd_wchstr(int \fIy\fP, int \fIx\fP, const cchar_t * \fIwchstr\fP);
+-\fBint mvwadd_wchstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t * \fIwchstr\fP);
++\fBint mvwadd_wchstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP,
++      const cchar_t * \fIwchstr\fP);
+ .PP
+ \fBint add_wchnstr(const cchar_t * \fIwchstr\fP, int \fIn\fP);
+-\fBint wadd_wchnstr(WINDOW *  \fIwin\fP, const cchar_t * \fIwchstr\fP, int \fIn\fP);
+-\fBint mvadd_wchnstr(int \fIy\fP, int \fIx\fP, const cchar_t * \fIwchstr\fP, int \fIn\fP);
+-\fBint mvwadd_wchnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t * \fIwchstr\fP, int \fIn\fP);
++\fBint wadd_wchnstr(WINDOW *  \fIwin\fP, const cchar_t * \fIwchstr\fP,
++      int \fIn\fP);
++\fBint mvadd_wchnstr(int \fIy\fP, int \fIx\fP, const cchar_t * \fIwchstr\fP,
++      int \fIn\fP);
++\fBint mvwadd_wchnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP,
++      const cchar_t * \fIwchstr\fP, int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
+ .B \%wadd_wchstr
+@@ -77,7 +81,7 @@
+ A null complex character terminates the string.
+ If a complex character does not completely fit at the end of the line,
+ .I curses
+-fills the remaining columns with the window background;
++fills its remaining cells with the window's background character;
+ see \fB\%bkgrnd\fP(3X).
+ .B \%wadd_wchnstr
+ does the same,
+@@ -137,14 +141,11 @@
+ .B \%wadd_wchnstr
+ may be implemented as macros.
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+ .SH HISTORY
+-These functions were initially specified by X/Open Curses,
+-Issue 4.
+-The System\ V Interface Definition,
+-Version 4 (1995),
++These functions were initially specified by X/Open Curses Issue\ 4.
++The System\ V Interface Definition Version\ 4 (1995),
+ specified functions named
+ .I \%waddwchstr
+ and
+Index: man/curs_addch.3x
+Prereq:  1.103 
+--- ncurses-6.5-20250111+/man/curs_addch.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_addch.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addch.3x,v 1.103 2024/12/28 21:26:21 tom Exp $
+-.TH curs_addch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addch.3x,v 1.113 2025/01/19 00:49:39 tom Exp $
++.TH curs_addch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -84,6 +84,17 @@
+ analogously to the standard C library's \fI\%putchar\fP(3).
+ \fB\%ncurses\fP(3X) describes the variants of this function.
+ .PP
++Construct a
++.I curses
++character
++from a
++.I char
++by assignment.
++Subsection \*(``Video Attributes\*('' of \fB\%attron\fP(3X) describes
++how to manipulate its attributes and color pair.
++(A color pair selection is not honored unless initialized;
++see \fB\%start_color\fP(3X).)
++.PP
+ If advancement occurs at the right margin,
+ .bP
+ the cursor automatically wraps to the beginning of the next line,
+@@ -156,7 +167,10 @@
+ are equivalent to calling
+ .RB \%( w ) addch
+ followed by
+-.RB \%( w ) refresh .
++.RB \%( w ) refresh
++on
++.B \%stdscr
++or the specified window.
+ .I curses
+ interprets these functions as a hint to its optimizer
+ that only a single character cell in the window
+@@ -171,7 +185,7 @@
+ .B \%ACS_
+ that can be used with
+ .B \%waddch
+-to write line-drawing and other special characters to the screen.
++to write line-drawing and other symbols to the screen.
+ .I \%ncurses
+ terms these
+ .I "forms-drawing characters."
+@@ -244,10 +258,16 @@
+ In
+ .IR \%ncurses ,
+ .B \%waddch
+-returns
++and
++.B \%wechochar
++return
+ .B ERR
+ if
+ .bP
++the
++.I curses
++screen has not been initialized,
++.bP
+ .I win
+ is
+ .IR NULL ","
+@@ -300,15 +320,12 @@
+ .B \%NCURSES_VERSION
+ preprocessor macro.
+ .PP
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+ .PP
+-SVr4
+-.I curses
+-describes a successful return value only as
++SVr4 describes a successful return value only as
+ \*(``an integer value other than
+-.BR ERR \*(''.
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 472
+ .PP
+ The defaults specified for forms-drawing characters apply in the POSIX
+ locale.
+@@ -351,7 +368,7 @@
+ line drawing.
+ .bP
+ X/Open Curses
+-(Issues 2 through 7)
++(Issues\ 2 through 7)
+ has a typographical error
+ for the
+ .B \%ACS_LANTERN
+Index: man/curs_addchstr.3x
+Prereq:  1.52 
+--- ncurses-6.5-20250111+/man/curs_addchstr.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_addchstr.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2012,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addchstr.3x,v 1.52 2024/12/28 21:26:21 tom Exp $
+-.TH curs_addchstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addchstr.3x,v 1.58 2025/01/19 00:49:39 tom Exp $
++.TH curs_addchstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -61,12 +61,14 @@
+ \fBint addchstr(const chtype * \fIchstr\fP);
+ \fBint waddchstr(WINDOW * \fIwin\fP, const chtype * \fIchstr\fP);
+ \fBint mvaddchstr(int \fIy\fP, int \fIx\fP, const chtype * \fIchstr\fP);
+-\fBint mvwaddchstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype * \fIchstr\fP);
++\fBint mvwaddchstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP,
++      const chtype * \fIchstr\fP);
+ .PP
+ \fBint addchnstr(const chtype * \fIchstr\fP, int \fIn\fP);
+ \fBint waddchnstr(WINDOW * \fIwin\fP, const chtype * \fIchstr\fP, int \fIn\fP);
+ \fBint mvaddchnstr(int \fIy\fP, int \fIx\fP, const chtype * \fIchstr\fP, int \fIn\fP);
+-\fBint mvwaddchnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype * \fIchstr\fP, int \fIn\fP);
++\fBint mvwaddchnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP,
++      const chtype * \fIchstr\fP, int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
+ .B \%waddchstr
+@@ -137,9 +139,12 @@
+ .B \%waddchnstr
+ may be implemented as macros.
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
++.PP
++SVr4 describes a successful return value only as
++\*(``an integer value other than
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 473
+ .SH HISTORY
+ SVr3.1 (1987)
+ introduced
+Index: man/curs_addstr.3x
+Prereq:  1.57 
+--- ncurses-6.5-20250111+/man/curs_addstr.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_addstr.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2012,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addstr.3x,v 1.57 2024/12/28 21:26:21 tom Exp $
+-.TH curs_addstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addstr.3x,v 1.65 2025/01/19 00:49:39 tom Exp $
++.TH curs_addstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -66,10 +66,11 @@
+ \fBint addnstr(const char * \fIstr\fP, int \fIn\fP);
+ \fBint waddnstr(WINDOW * \fIwin\fP, const char * \fIstr\fP, int \fIn\fP);
+ \fBint mvaddnstr(int \fIy\fP, int \fIx\fP, const char * \fIstr\fP, int \fIn\fP);
+-\fBint mvwaddnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const char * \fIstr\fP, int \fIn\fP);
++\fBint mvwaddnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const char * \fIstr\fP,
++      int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
+-.B waddstr
++.B \%waddstr
+ writes the characters of the (null-terminated) string
+ .I str
+ to the window
+@@ -78,8 +79,7 @@
+ .I char
+ in
+ .IR str .
+-.PP
+-.B waddnstr
++.B \%waddnstr
+ is similar,
+ but writes at most
+ .I n
+@@ -87,10 +87,8 @@
+ If
+ .I n
+ is \-1,
+-.B
+-.B waddnstr
++.B \%waddnstr
+ writes the entire string.
+-.PP
+ \fB\%ncurses\fP(3X) describes the variants of these functions.
+ .SH RETURN VALUE
+ These functions return
+@@ -123,11 +121,16 @@
+ .IR x )
+ is outside the window boundaries.
+ .SH NOTES
+-All of these functions except \fBwaddnstr\fP may be macros.
++All of these functions except
++.B \%waddnstr
++may be implemented as macros.
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
++.PP
++SVr4 describes a successful return value only as
++\*(``an integer value other than
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 474
+ .SH HISTORY
+ 4BSD (1980)
+ .I curses
+Index: man/curs_addwstr.3x
+Prereq:  1.47 
+--- ncurses-6.5-20250111+/man/curs_addwstr.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_addwstr.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addwstr.3x,v 1.47 2024/12/28 21:26:21 tom Exp $
+-.TH curs_addwstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addwstr.3x,v 1.56 2025/01/19 00:49:39 tom Exp $
++.TH curs_addwstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -61,15 +61,17 @@
+ \fBint addwstr(const wchar_t * \fIwstr\fP);
+ \fBint waddwstr(WINDOW * \fIwin\fP, const wchar_t * \fIwstr\fP);
+ \fBint mvaddwstr(int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP);
+-\fBint mvwaddwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP);
++\fBint mvwaddwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP,
++      const wchar_t * \fIwstr\fP);
+ .PP
+ \fBint addnwstr(const wchar_t * \fIwstr\fP, int \fIn\fP);
+ \fBint waddnwstr(WINDOW * \fIwin\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
+ \fBint mvaddnwstr(int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
+-\fBint mvwaddnwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
++\fBint mvwaddnwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP,
++      const wchar_t * \fIwstr\fP, int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
+-.B waddwstr
++.B \%waddwstr
+ writes the characters of the (wide-null-terminated) wide-character
+ string
+ .I wstr
+@@ -88,8 +90,7 @@
+ processes spacing and non-spacing characters in
+ .I wstr
+ one at a time.
+-.PP
+-.B waddnwstr
++.B \%waddnwstr
+ is similar,
+ but writes at most
+ .I n
+@@ -97,10 +98,8 @@
+ If
+ .I n
+ is \-1,
+-.B
+-.B waddnwstr
++.B \%waddnwstr
+ writes the entire wide string.
+-.PP
+ \fB\%ncurses\fP(3X) describes the variants of these functions.
+ .SH RETURN VALUE
+ These functions return
+@@ -134,15 +133,20 @@
+ is outside the window boundaries.
+ .SH NOTES
+ All of these functions except
+-.B waddnwstr
++.B \%waddnwstr
+ may be implemented as macros.
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
++.PP
++SVr4 describes a successful return value only as
++\*(``an integer value other than
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 478
+ .SH HISTORY
+-The System\ V Interface Definition,
+-Version 4 (1995),
+-specified
++These functions were initially specified by X/Open Curses Issue\ 4
++(1995).
++The System\ V Interface Definition Version\ 4
++of the same year
++specified functions named
+ .I \%waddwstr
+ and
+ .I \%waddnwstr
+Index: man/curs_attr.3x
+Prereq:  1.115 
+--- ncurses-6.5-20250111+/man/curs_attr.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_attr.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_attr.3x,v 1.115 2024/12/28 21:26:21 tom Exp $
+-.TH curs_attr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_attr.3x,v 1.127 2025/01/19 00:49:39 tom Exp $
++.TH curs_attr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -142,17 +142,18 @@
+ Use \fBwattr_get\fP to retrieve attributes for the given window.
+ .PP
+ Use \fBattr_on\fP and \fBwattr_on\fP to turn on window attributes, i.e.,
+-values OR'd together in \fIattr\fP,
++values logically \*(``or\*(''-ed together in \fIattr\fP,
+ without affecting other attributes.
+ Use \fBattr_off\fP and \fBwattr_off\fP to turn off window attributes,
+-again values OR'd together in \fIattr\fP,
++again values logically \*(``or\*(''-ed together in \fIattr\fP,
+ without affecting other attributes.
+ .\" ---------------------------------------------------------------------------
+ .SS "Legacy Window Attributes"
+ The X/Open window attribute routines which \fIset\fP or \fIget\fP,
+ turn \fIon\fP or \fIoff\fP
+ are extensions of older routines
+-which assume that color pairs are OR'd into the attribute parameter.
++which assume that color pairs are logically \*(``or\*(''-ed
++into the attribute parameter.
+ These newer routines use similar names, because
+ X/Open simply added an underscore (\fB_\fP) for the newer names.
+ .PP
+@@ -165,8 +166,8 @@
+ It holds the common video attributes (such as bold, reverse),
+ as well as a few bits for color.
+ Those bits correspond to the \fBA_COLOR\fP symbol.
+-The \fBCOLOR_PAIR\fP macro provides a value which can be OR'd into
+-the attribute parameter.
++The \fBCOLOR_PAIR\fP macro provides a value which can be
++logically \*(``or\*(''-ed into the attribute parameter.
+ For example,
+ as long as that value fits into the \fBA_COLOR\fP mask,
+ then these calls produce similar results:
+@@ -255,11 +256,18 @@
+ might be combined with a color pair.
+ .\" ---------------------------------------------------------------------------
+ .SS "Video Attributes"
+-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)).
++The following video attributes,
++defined in
++.IR \%curses.h ","
++can be passed to
++.BR \%attron ","
++.BR \%attroff ","
++.BR \%attrset ","
++and
++logically \*(``or\*(''-ed with characters passed to \fBaddch\fP(3X).
+ .PP
+-.ne 15
++.if t .ne 15
++.if n .ne 16
+ .RS
+ .TS
+ Lb Lb
+@@ -267,9 +275,7 @@
+ Name	Description
+ _
+ A_NORMAL	Normal display (no highlight)
+-A_STANDOUT	T{
+-Best highlighting mode of the terminal
+-T}
++A_STANDOUT	Best highlighting mode available
+ A_UNDERLINE	Underlining
+ A_REVERSE	Reverse video
+ A_BLINK	Blinking
+@@ -279,26 +285,20 @@
+ A_INVIS	Invisible or blank mode
+ A_ALTCHARSET	Alternate character set
+ A_ITALIC	Italics (non-X/Open extension)
+-A_CHARTEXT	Bit-mask to extract a character
+-A_COLOR	T{
+-Bit-mask to extract a color (legacy routines)
+-T}
++A_ATTRIBUTES	Mask to extract character code
++A_CHARTEXT	Mask to extract atributes
++A_COLOR	Mask to extract color pair identifier
+ .TE
+ .RE
+ .PP
+-You can thus use
+-.B \%A_CHARTEXT
+-to extract the character from a
+-.IR chtype ","
+-.B \%A_ATTRIBUTES
+-to obtain its rendering attributes,
++.BR \%attr_on ","
++.BR \%attr_off ","
+ and
+-.B \%A_COLOR
+-to find the color pair it uses.
+-.PP
+-These video attributes are supported by \fBattr_on\fP and related functions
+-(which also support the attributes recognized by \fBattron\fP, etc.):
++.B \%attr_set
++support the foregoing as well as the following additional attributes.
+ .PP
++.if t .ne 7
++.if n .ne 8
+ .RS
+ .TS
+ Lb Lb
+@@ -313,10 +313,6 @@
+ WA_VERTICAL	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\fP.
+ .\" ---------------------------------------------------------------------------
+ .SH RETURN VALUE
+ These functions return
+@@ -359,20 +355,38 @@
+ is outside the window boundaries.
+ .\" ---------------------------------------------------------------------------
+ .SH NOTES
+-These functions may be macros:
+-.sp
+-.RS
+-\fBattroff\fP, \fBwattroff\fP, \fBattron\fP, \fBwattron\fP,
+-\fBattrset\fP, \fBwattrset\fP, \fBstandend\fP and \fBstandout\fP.
+-.RE
++.BR \%attr_on ","
++.BR \%attr_off ","
++.BR \%attr_set ","
++.BR \%wattr_set ","
++.BR \%chgat ","
++.BR \%mvchgat ","
++.BR \%mvwchgat ","
++and
++.B \%color_set
++are part of
++.IR \%ncurses "'s"
++wide-character API,
++and are not available in its non-wide configuration.
++.PP
++.BR \%attron ","
++.BR \%wattron ","
++.BR \%attroff ","
++.BR \%wattroff ","
++.BR \%attrset ","
++.BR \%wattrset ","
++.BR \%standout ","
++and
++.B \%standend
++may be implemented as macros.
+ .PP
+-Color pair values can only be OR'd with attributes if the pair
+-number is less than 256.
++Color pair values be logically \*(``or\*(''-ed with attributes
++if the pair number is less than 256.
+ The alternate functions such as \fBcolor_set\fP can pass a color pair
+ value directly.
+ However,
+ .I \%ncurses
+-ABI 4 and 5 simply OR this value
++ABI 4 and 5 simply logically \*(``or\*('' this value
+ within the alternate functions.
+ You must use
+ .I \%ncurses
+@@ -423,7 +437,7 @@
+ .IR NULL "."
+ .\" ---------------------------------------------------------------------------
+ .SH PORTABILITY
+-These functions are described in X/Open Curses, Issue 4.
++These functions are described in X/Open Curses Issue\ 4.
+ It specifies no error conditions for them.
+ .PP
+ The standard defined the dedicated type for highlights,
+@@ -434,6 +448,13 @@
+ .I \%attr_t
+ arguments were not supported under SVr4.
+ .PP
++SVr4 describes the functions not taking
++.I \%attr_t
++or
++.I pair
++arguments as always returning
++.BR 1 "." \" Courier roman in source; SVID 4, vol. 3, p. 480
++.PP
+ Very old versions of this library did not force an update of the screen
+ when changing the attributes.
+ Use \fBtouchwin\fP to force the screen to match the updated attributes.
+@@ -534,84 +555,125 @@
+ (i.e., via the \fBsgr1\fP capability).
+ .\" ---------------------------------------------------------------------------
+ .SH HISTORY
+-X/Open Curses is largely based on SVr4
+-.IR curses ","
+-adding support for \*(``wide-characters\*('' (not specific to Unicode).
+-Some of the X/Open differences from SVr4
+-.I curses
+-address the way
+-video attributes can be applied to wide-characters.
+-But aside from that, \fBattrset\fP and \fBattr_set\fP are similar.
+-SVr4
++4BSD (1980)
+ .I curses
+-provided the basic features for manipulating video attributes.
+-However, earlier versions of
++used a
++.I char
++to represent each cell of the terminal screen.
++It assumed 7-bit character codes,
++employing the eighth bit of a byte to represent a
++.I \%standout
++attribute
++(often implemented as bold and/or reverse video).
++It introduced
++.IR \%standout ","
++.IR \%standend ","
++.IR \%wstandout ","
++and
++.I \%wstandend
++functions to manipulate this bit.
++Despite their inflexibility,
++they carried over into System\ V
++.I curses
++and ultimately X/Open Curses
++due to their pervasive use in legacy applications.
++While some 1980s terminals supported a variety of video attributes,
++BSD
+ .I curses
+-provided a part of these features.
++could do nothing with them.
+ .PP
+-As seen in 2.8BSD,
++SVr2 (1984) provided an improved
+ .I curses
+-assumed 7-bit characters,
+-using the eighth bit of a byte to represent the \fIstandout\fP
+-feature (often implemented as bold and/or reverse video).
+-The BSD
++library,
++introducing
++.I \%chtype
++to create the abstract notion of a
+ .I curses
+-library provided functions \fBstandout\fP and \fBstandend\fP
+-which were carried along into X/Open Curses due to their pervasive use
+-in legacy applications.
++character;
++this was by default an
++.IR "unsigned short" ","
++with a provision for compile-time redefinition to other integral types
++(a freedom not necessarily available to users of shared libraries,
++and in any event a source license was necessary to exercise it).
++It added the functions
++.IR \%attron ","
++.IR \%attroff ","
++.IR \%attrset ","
++.IR \%wattron ","
++.IR \%wattroff ","
++and
++.IR \%wattrset ","
++and defined the
++.I A_
++macros listed above
++(except for
++.I \%A_ITALIC
++and
++.IR \%A_COLOR ")"
++for use by applications to manipulate other attributes.
++The values of these macros
++were not necessarily the same in different systems,
++even among those certified as System\ V.
++.PP
++SVr3.2 (1988)
++added the
++.I \%A_COLOR
++macro along with a color system;
++see \fBcurs_color\fP(3X).
+ .PP
+-Some terminals in the 1980s could support a variety of video attributes,
+-although the BSD
+-.I curses
+-library could do nothing with those.
+-System V (1983) provided an improved
++X/Open Curses is largely based on SVr4
++.IR curses ","
++but recognized that the
++.I \%wchar_t
++type of ISO C95 was intended to house only a single character code,
++not a sequence of codes combining with a base character,
++let alone could it reliably offer room for a color pair identifier
++and a set of attribute bits with a potential for further growth \(em
++thus the standard invented the
+ .I curses
+-library.
+-It defined the \fBA_\fP symbols for use by applications to manipulate the
+-other attributes.
+-There are few useful references for the chronology.
+-.PP
+-Goodheart's book
+-\fIUNIX Curses Explained\fP (1991) describes SVr3 (1987),
+-commenting on several functions:
+-.bP
+-the \fBattron\fP, \fBattroff\fP, \fBattrset\fP functions
+-(and most of the functions found in SVr4 but not in BSD
+-.IR curses ")"
+-were
+-introduced by System V,
+-.bP
+-the alternate character set feature with \fBA_ALTCHARSET\fP was
+-added in SVr2 and improved in SVr3 (by adding \fBacs_map[]\fP),
+-.bP
+-\fBstart_color\fP and related color-functions were introduced by System V.3.2,
+-.bP
+-pads, soft-keys were added in SVr3, and
+-.PP
+-Goodheart did not mention the background character or the
++complex character type
+ .I \%cchar_t
+-type.
+-Those are respectively SVr3.1 and X/Open features.
+-He did mention the \fBA_\fP constants, but did not indicate their values.
+-Those were not the same in different systems,
+-even for those marked as System V.
++and a separate type
++.I \%attr_t
++for storage of attribute bits.
++The new types brought along several new functions to manipulate them,
++some corresponding to existing
++.IR chtype -based
++functions
++.RI \%( attr_on ,
++.IR \%attr_off ","
++.IR \%attr_set ","
++.IR \%wattr_on ","
++.IR \%wattr_off ","
++and
++.IR \%wattr_set "),"
++and some new
++.RI \%( color_set ,
++.IR \%wcolor_set ","
++.IR \%chgat ","
++.IR \%wchgat ","
++.IR \%mvchgat ","
++and
++.IR \%mvwchgat ")."
+ .PP
+-Different Unix systems used different sizes for the bit-fields in
++Different Unix systems used differently sized bit fields in
+ .I \%chtype
+-for \fIcharacters\fP and \fIcolors\fP, and took into account the different
+-integer sizes (32-bit versus 64-bit).
++for the character code and the color pair identifier,
++and took into account platforms' different integer sizes
++(32- versus 64-bit).
+ .PP
+-This table showing the number of bits for \fBA_COLOR\fP
+-and \fBA_CHARTEXT\fP
++The following table showing the number of bits for
++.I \%A_COLOR
++and
++.I \%A_CHARTEXT
+ was gleaned from the
+ .I curses
+-header files for
+-various operating systems and architectures.
+-The inferred architecture and notes reflect
+-the format and size of the defined constants
++header files for various operating systems and architectures.
++The inferred architecture and notes
++reflect the format and size of the defined constants
+ as well as clues such as the alternate character set implementation.
+ A 32-bit library can be used on a 64-bit system,
+-but not necessarily the reverse.
++but not necessarily the converse.
+ .PP
+ .TS
+ Lb  Lb Lb  Cb  S   Lb
+@@ -630,7 +692,7 @@
+ 1996	AIX 4.2	32	7	16	X/Open \fIcurses\fP
+ 1996	OSF/1 r4	32	6	16	X/Open \fIcurses\fP
+ 1997	HP-UX 11.00	32	6	8	X/Open \fIcurses\fP
+-2000	U/Win	32/64	7/31	16	uses \fIchtype\fP
++2000	UWIN	32/64	7/31	16	uses \fIchtype\fP
+ .TE
+ .PP
+ Notes:
+@@ -662,7 +724,10 @@
+ .bP
+ The initial release of Solaris was in 1992.
+ .bP
+-The \fIxpg4\fP (X/Open) Curses was developed by MKS from 1990 to 1995.
++Its XPG4
++(X/Open Curses-conforming)
++.I xcurses
++library was developed by Mortice Kern Systems from 1990 to 1995.
+ Sun's copyright began in 1996.
+ .bP
+ Sun updated the X/Open Curses interface
+@@ -671,7 +736,7 @@
+ .I curses
+ interface.
+ .PP
+-Regarding U/Win,
++Regarding UWIN,
+ .bP
+ Development of the
+ .I curses
+@@ -681,7 +746,7 @@
+ .bP
+ The library uses only
+ .I \%chtype
+-(no
++(not
+ .IR \%cchar_t ")."
+ .RE
+ .PP
+@@ -691,23 +756,32 @@
+ became a moot point.
+ The
+ .I \%cchar_t
+-structure (whose size and
+-members are not specified in X/Open Curses) could be extended as needed.
++structure
++(whose size and members are not specified in X/Open Curses)
++could be extended as needed.
+ .PP
+-Other interfaces are rarely used now:
++Other interfaces are rarely used now.
+ .bP
+ BSD
+ .I curses
+ was improved slightly in 1993/1994 using Keith Bostic's
+-modification to make the library 8-bit clean for \fBnvi\fP(1).
+-He moved \fIstandout\fP attribute to a structure member.
+-.IP
++modification to make the library 8-bit clean for \fInvi\fP(1).
++He moved the
++.I \%standout
++attribute to a structure member.
+ The resulting 4.4BSD
+ .I curses
+-was replaced by \fI\%ncurses\fP over the
+-next ten years.
++was replaced by
++.I \%ncurses
++over the next ten years.
+ .bP
+-U/Win is rarely used now.
++UWIN has been defunct since 2012.
++.PP
++.I \%ncurses
++6.0 (2015)
++added the
++.I A_ITALIC
++macro.
+ .\" ---------------------------------------------------------------------------
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+Index: man/curs_beep.3x
+Prereq:  1.35 
+--- ncurses-6.5-20250111+/man/curs_beep.3x	2024-07-20 20:54:51.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_beep.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2005,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_beep.3x,v 1.35 2024/07/20 20:54:51 tom Exp $
+-.TH curs_beep 3X 2024-07-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_beep.3x,v 1.39 2025/01/19 00:49:39 tom Exp $
++.TH curs_beep 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%beep\fP,
+ \fB\%flash\fP \-
+@@ -91,8 +91,7 @@
+ these functions can return
+ .BR ERR "."
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+ .PP
+ On SVr4
+Index: man/curs_bkgd.3x
+Prereq:  1.67 
+--- ncurses-6.5-20250111+/man/curs_bkgd.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_bkgd.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_bkgd.3x,v 1.67 2024/12/28 21:26:21 tom Exp $
+-.TH curs_bkgd 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_bkgd.3x,v 1.74 2025/01/19 00:49:39 tom Exp $
++.TH curs_bkgd 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -66,36 +66,46 @@
+ .SH DESCRIPTION
+ Every
+ .I curses
+-window has a background property.
+-In the library's non-wide configuration,
+-this property is a
+-.I \%chtype
+-which combines a set of attributes with the
++window has a
+ .I "background character"
+-(see \fB\%curs_attr\fP(3X)).
+-The background character is a spacing character.
+-.PP
+-When erasing parts of the screen,
++property:
++in the library's non-wide configuration,
++it is a
++.I curses
++character
++.RI \%( chtype )
++that combines a set of attributes
++(and,
++if colors are enabled,
++a color pair identifier)
++with a character code.
++When erasing
++(parts of)
++a window,
+ .I curses
+-fills the cells with the background character.
++replaces the erased cells with the background character.
++.PP
+ .I curses
+-also uses the window background when writing characters to the screen.
++also uses the background character when writing characters to a
++populated window.
+ .bP
+-The attribute part of the background combines with all
+-non-blank characters written into the window,
+-as with the \fB\%waddch\fP(3X) and \fB\%winsch\fP(3X) families of
+-functions.
++The attribute part of the background character combines with all
++non-blank character cells in the window,
++as populated by the \fB\%waddch\fP(3X) and \fB\%winsch\fP(3X)
++families of functions
++(and those that call them).
+ .bP
+-Both the character and attribute parts of the background combine with
+-blank characters that are written into the window.
++Both the character code and attributes of the background character
++combine with blank character cells in the window.
+ .PP
+-The background becomes a property of the character and moves with it
+-through any scrolling and insert/delete line/character operations.
+-.PP
+-To the extent possible on a given terminal,
++The background character's set of attributes becomes a property
++of the character cell
++and move with it through any scrolling
++and insert/delete line/character operations.
++To the extent possible on the terminal type,
+ .I curses
+-displays the attributes of the background
+-as the graphic rendition of the character put on the screen.
++displays the attributes of the background character
++as the graphic rendition of a character cell on the display.
+ .SS "bkgd, wbkgd"
+ .B \%bkgd
+ and
+@@ -126,7 +136,7 @@
+ writes the new background character to the cell.
+ .bP
+ .I \%ncurses
+-then checks if the cell uses color;
++then checks whether the cell uses color;
+ that is,
+ its color pair value is nonzero.
+ If not,
+@@ -149,17 +159,19 @@
+ first removing those that may have come from the current background,
+ and then adding attributes from the new background.
+ .PP
+-If the new background's character is nonspacing,
++If the new background's character is non-spacing
++(for example,
++if it is a control character),
+ .I \%ncurses
+ retains the existing background character,
+ except for one special case:
+ .I \%ncurses
+-treats a background character value of zero (0) as a space.
++treats a background character code of zero (0) as a space.
+ .PP
+ If the terminal does not support color,
+ or if color has not been initialized with \fB\%start_color\fP(3X),
+ .I \%ncurses
+-ignores the new background character's color attribute.
++ignores the new background character's color pair selection.
+ .SS "bkgdset, wbkgdset"
+ .B \%bkgdset
+ and
+@@ -181,7 +193,7 @@
+ .B \%bkgdset
+ and
+ .B \%wbkgdset
+-do not return a value
++do not return a value.
+ .PP
+ Functions returning an
+ .I int
+@@ -194,10 +206,11 @@
+ .IR \%ncurses ","
+ failure occurs if
+ .bP
+-if the library has not been initialized,
++the
++.I curses
++screen has not been initialized,
+ or
+ .bP
+-if
+ .I win
+ is
+ .IR NULL "."
+@@ -227,18 +240,17 @@
+ .IR \%ncurses ","
+ like SVr4
+ .IR curses ","
+-checks to ensure that,
++checks to ensure that it is,
+ and retains the existing background character if the check fails.
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It indicates that
+ .IR bkgd ","
+ .IR wbkgd ","
+ and
+ .I getbkgd
+ return
+-.B ERR
++.I ERR
+ on failure
+ (in the case of the last,
+ this value is cast to
+@@ -252,24 +264,23 @@
+ and
+ .I \%wbkgd
+ return
+-.B OK
++.I OK
+ \*(``or a non-negative integer if
+-.B \%immedok
++.I \%immedok() \" Courier roman in source
+ is set\*('',
+-which refers to the return value from
+-.IR \%wrefresh() ","
+-used to implement the immediate repainting.
+-SVr4
+-.IR curses 's
+-.I \%wrefresh
+-returns the number of characters
+-written to the screen during the refresh;
+-that of
+-.I \%ncurses
+-does not.
++referring to the return value from
++.IR \%wrefresh ","
++which in SVr4 returns a count of characters
++written to the window if its
++.I \%immedok
++property is set;
++.\" ...though its wrefresh() man page says nothing about immedok()...
++in
++.IR \%ncurses ","
++it does not.
+ .PP
+ Neither X/Open Curses nor the SVr4 manual pages detail how the rendition
+-of characters on the screen updates when
++of characters in the window updates when
+ .I \%bkgd
+ or
+ .I \%wbkgd
+Index: man/curs_bkgrnd.3x
+Prereq:  1.49 
+--- ncurses-6.5-20250111+/man/curs_bkgrnd.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_bkgrnd.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2002-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_bkgrnd.3x,v 1.49 2024/12/28 21:26:21 tom Exp $
+-.TH curs_bkgrnd 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_bkgrnd.3x,v 1.55 2025/01/19 00:49:39 tom Exp $
++.TH curs_bkgrnd 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -68,36 +68,46 @@
+ .SH DESCRIPTION
+ Every
+ .I curses
+-window has a background property.
+-In the library's wide configuration,
+-this property is a
+-.I \%cchar_t
+-which combines a set of attributes with the
++window has a
+ .I "background character"
+-(see \fB\%curs_attr\fP(3X)).
+-The background character is a spacing character.
+-.PP
+-When erasing parts of the screen,
++property:
++in the library's wide configuration,
++it is a
+ .I curses
+-fills the cells with the background character.
++complex character
++.RI \%( cchar_t )
++that combines a set of attributes
++(and,
++if colors are enabled,
++a color pair identifier)
++with a character code.
++When erasing
++(parts of)
++a window,
++.I curses
++replaces the erased cells with the background character.
++.PP
+ .I curses
+-also uses the window background when writing characters to the screen.
++also uses the background character when writing characters to a
++populated window.
+ .bP
+-The attribute part of the background combines with all
+-non-blank characters written into the window,
+-as with the \fB\%wadd_wch\fP(3X) and \fB\%wins_wch\fP(3X) families of
+-functions.
++The attribute part of the background character combines with all
++non-blank character cells in the window,
++as populated by the \fB\%wadd_wch\fP(3X) and \fB\%wins_wch\fP(3X)
++families of functions
++(and those that call them).
+ .bP
+-Both the character and attribute parts of the background combine with
+-blank characters that are written into the window.
++Both the character code and attributes of the background character
++combine with blank character cells in the window.
+ .PP
+-The background becomes a property of the character and moves with it
+-through any scrolling and insert/delete line/character operations.
+-.PP
+-To the extent possible on a given terminal,
++The background character's set of attributes becomes a property
++of the character cell
++and move with it through any scrolling
++and insert/delete line/character operations.
++To the extent possible on the terminal type,
+ .I curses
+-displays the attributes of the background
+-as the graphic rendition of the character put on the screen.
++displays the attributes of the background character
++as the graphic rendition of a character cell on the display.
+ .SS "bkgrnd, wbkgrnd"
+ .B \%bkgrnd
+ and
+@@ -128,7 +138,7 @@
+ writes the new background character to the cell.
+ .bP
+ .I \%ncurses
+-then checks if the cell uses color;
++then checks whether the cell uses color;
+ that is,
+ its color pair value is nonzero.
+ If not,
+@@ -151,17 +161,17 @@
+ first removing those that may have come from the current background,
+ and then adding attributes from the new background.
+ .PP
+-If the new background's character is nonspacing,
++If the new background's character is non-spacing,
+ .I \%ncurses
+ reuses the old background character,
+ except for one special case:
+ .I \%ncurses
+-treats a background character value of zero (0) as a space.
++treats a background character code of zero (0) as a space.
+ .PP
+ If the terminal does not support color,
+ or if color has not been initialized with \fB\%start_color\fP(3X),
+ .I \%ncurses
+-ignores the new background character's color attribute.
++ignores the new background character's color pair selection.
+ .SS "bkgrndset, wbkgrndset"
+ .B \%bkgrndset
+ and
+@@ -191,7 +201,9 @@
+ .B \%wbkgrndset
+ do not return a value.
+ .PP
+-The other functions return
++Functions returning an
++.I int
++return
+ .B ERR
+ upon failure and
+ .B OK
+@@ -200,6 +212,10 @@
+ .IR \%ncurses ","
+ failure occurs if
+ .bP
++the
++.I curses
++screen has not been initialized,
++.bP
+ .I win
+ is
+ .IR NULL ","
+@@ -220,14 +236,12 @@
+ .B \%getbkgrnd
+ and
+ .B \%wgetbkgrnd
+-supply the background character
+-and attribute in a modifiable
++store the background character in a modifiable
+ .I \%cchar_t
+ parameter,
+-not as the return value.
++rather than supplying it as the return value.
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+ .PP
+ X/Open Curses does not provide details of how the rendition is updated.
+@@ -236,8 +250,7 @@
+ .IR curses 's
+ non-wide functions for manipulating the window background.
+ .SH HISTORY
+-These functions were initially specified by X/Open Curses,
+-Issue 4.
++These functions were initially specified by X/Open Curses Issue\ 4.
+ .SH SEE ALSO
+ \fB\%curs_bkgd\fP(3X) describes the corresponding functions in the
+ non-wide configuration of
+Index: man/curs_border.3x
+Prereq:  1.53 
+--- ncurses-6.5-20250111+/man/curs_border.3x	2024-07-27 19:55:45.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_border.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_border.3x,v 1.53 2024/07/27 19:55:45 tom Exp $
+-.TH curs_border 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_border.3x,v 1.60 2025/01/19 00:49:39 tom Exp $
++.TH curs_border 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -137,9 +137,6 @@
+ long, or as many as fit into the window.
+ .SH RETURN VALUE
+ All routines return the integer \fBOK\fP.
+-The SVr4.0 manual says
+-\*(``or a non-negative integer if \fB\%immedok\fP is set\*('',
+-but this appears to be an error.
+ .PP
+ This implementation returns
+ .B ERR
+@@ -151,13 +148,34 @@
+ .IR x )
+ is outside the window boundaries.
+ .SH NOTES
++.B \%border
++and
++.B \%box
++may be implemented as macros.
++.PP
+ 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\fP and \fBbox\fP may be macros.
+ .SH PORTABILITY
+-These functions are described in X/Open Curses, Issue 4.
++These functions are described in X/Open Curses Issue\ 4.
+ It specifies no error conditions for them.
++.PP
++SVr4 documentation
++.\" SVID 4, vol. 3, p. 483
++says that these functions return
++.I OK
++\*(``or a non-negative integer if
++.I \%immedok() \" Courier roman in source
++is set\*('',
++referring to the return value from
++.IR \%wrefresh ","
++which in SVr4 returns a count of characters
++written to the window if its
++.I \%immedok
++property is set;
++.\" ...though its wrefresh() man page says nothing about immedok()...
++in
++.IR \%ncurses ","
++it does not.
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_outopts\fP(3X)
+Index: man/curs_border_set.3x
+Prereq:  1.38 
+--- ncurses-6.5-20250111+/man/curs_border_set.3x	2024-05-25 20:10:58.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_border_set.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2002-2011,2012 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_border_set.3x,v 1.38 2024/05/25 20:10:58 tom Exp $
+-.TH curs_border_set 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_border_set.3x,v 1.43 2025/01/19 00:49:39 tom Exp $
++.TH curs_border_set 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -187,17 +187,17 @@
+ .IR x )
+ is outside the window boundaries.
+ .SH NOTES
+-Note that
+-\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 \%border_set ","
++.BR \%hline_set ","
++.BR \%mvhline_set ","
++.BR \%mvvline_set ","
++.BR \%mvwhline_set ","
++.BR \%mvwvline_set ","
++and
++.B \%vline_set
++may be implemented as macros.
+ .SH PORTABILITY
+-These functions are described in X/Open Curses, Issue 4.
++These functions are described in X/Open Curses Issue\ 4.
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_add_wch\fP(3X),
+Index: man/curs_clear.3x
+Prereq:  1.50 
+--- ncurses-6.5-20250111+/man/curs_clear.3x	2024-05-25 20:10:58.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_clear.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_clear.3x,v 1.50 2024/05/25 20:10:58 tom Exp $
+-.TH curs_clear 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_clear.3x,v 1.58 2025/01/19 00:49:39 tom Exp $
++.TH curs_clear 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -93,7 +93,6 @@
+ .SH RETURN VALUE
+ All routines return the integer \fBOK\fP on success and \fBERR\fP on failure.
+ .PP
+-X/Open defines no error conditions.
+ In this implementation,
+ .bP
+ functions using a window pointer parameter return
+@@ -103,16 +102,35 @@
+ \fBwclrtoeol\fP returns an error
+ if the cursor position is about to wrap.
+ .SH NOTES
+-Note that \fBerase\fP, \fBwerase\fP, \fBclear\fP, \fBwclear\fP,
+-\fBclrtobot\fP, and \fBclrtoeol\fP may be macros.
++.BR \%erase ","
++.BR \%werase ","
++.BR \%clear ","
++.BR \%wclear ","
++.BR \%clrtobot ","
++and
++.B \%clrtoeol
++may be implemented as macros.
+ .SH PORTABILITY
+-These functions are described in X/Open Curses, Issue 4.
++X/Open Curses Issue\ 4 describes these functions.
++It specifies no error conditions for them.
+ .PP
+-The SVr4.0 manual says that these functions could return
+-\*(``or a non-negative integer if \fB\%immedok\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.
++SVr4 documentation
++.\" SVID 4, vol. 3, p. 485
++says that these functions return
++.I OK
++\*(``or a non-negative integer if
++.I \%immedok() \" Courier roman in source
++is set\*('',
++referring to the return value from
++.IR \%wrefresh ","
++which in SVr4 returns a count of characters
++written to the window if its
++.I \%immedok
++property is set;
++.\" ...though its wrefresh() man page says nothing about immedok()...
++in
++.IR \%ncurses ","
++it does not.
+ .PP
+ Some historic curses implementations had, as an undocumented feature, the
+ ability to do the equivalent of \fBclearok(..., 1)\fP by saying
+Index: man/curs_color.3x
+Prereq:  1.104 
+--- ncurses-6.5-20250111+/man/curs_color.3x	2024-12-28 21:18:35.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_color.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_color.3x,v 1.104 2024/12/28 21:18:35 tom Exp $
+-.TH curs_color 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_color.3x,v 1.113 2025/01/19 00:49:39 tom Exp $
++.TH curs_color 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -69,7 +69,8 @@
+ \fB\%COLOR_BLUE\fP,
+ \fB\%COLOR_MAGENTA\fP,
+ \fB\%COLOR_CYAN\fP,
+-\fB\%COLOR_WHITE\fP \-
++\fB\%COLOR_WHITE\fP,
++\fB\%A_COLOR\fP \-
+ manipulate terminal colors with \fIcurses\fR
+ .SH SYNOPSIS
+ .nf
+@@ -99,8 +100,18 @@
+ \fI/* extension */
+ \fBvoid reset_color_pairs(void);
+ .PP
++\fI/* macros */
+ \fBint COLOR_PAIR(int \fIn\fP);
+ \fBPAIR_NUMBER(int \fIattr\fP);
++\fBCOLOR_BLACK
++\fBCOLOR_RED
++\fBCOLOR_GREEN
++\fBCOLOR_YELLOW
++\fBCOLOR_BLUE
++\fBCOLOR_MAGENTA
++\fBCOLOR_CYAN
++\fBCOLOR_WHITE
++\fBA_COLOR
+ .fi
+ .SH DESCRIPTION
+ .SS Overview
+@@ -200,6 +211,10 @@
+ .PP
+ Some terminals support more than the eight (8) \*(``ANSI\*('' colors.
+ There are no standard names for those additional colors.
++.PP
++.B \%A_COLOR
++is a bit mask that extracts a color pair identifier from a
++.IR \%chtype "."
+ .SH VARIABLES
+ .SS COLORS
+ is initialized by \fB\%start_color\fP to the maximum number of colors
+@@ -418,89 +433,170 @@
+ \fIattr\fP parameter and returns it as a color pair number;
+ it is the inverse operation of \fB\%COLOR_PAIR\fP.
+ .SH RETURN VALUE
+-The routines \fB\%can_change_color\fP and \fB\%has_colors\fP return \fBTRUE\fP
+-or \fBFALSE\fP.
+-.PP
+-All other 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.
+-SVr4 does document some error conditions which apply in general:
+-.bP
+-This implementation will return \fBERR\fP on attempts to
+-use color values outside the range \fB0\fP to \fB\%COLORS\fP\-1
+-(except for the default colors extension),
+-or use color pairs outside the range \fB0\fP to \fB\%COLOR_PAIRS\-1\fP.
+-.IP
+-Color values used in \fB\%init_color\fP must be
+-in the range \fB0\fP to \fB1000\fP.
+-.IP
+-An error is returned from all functions
+-if the terminal has not been initialized.
+-.IP
+-An error is returned from secondary functions such as \fB\%init_pair\fP
+-if \fB\%start_color\fP was not called.
+-.bP
+-SVr4 does much the same, except that
+-it returns \fBERR\fP from \fB\%pair_content\fP if the pair was not initialized
+-using \fB\%init_pairs\fP
++.B \%can_change_color
+ and
+-it returns \fBERR\fP from \fB\%color_content\fP
+-if the terminal does not support changing colors.
+-.IP
+-This implementation does not return \fBERR\fP for either case.
++.B \%has_colors
++return
++.B TRUE
++or
++.BR FALSE "."
++The other functions return
++.B OK
++on success and
++.B ERR
++on failure.
+ .PP
+-Specific functions make additional checks:
+-.RS 3
+-.TP 5
+-\fB\%init_color\fP
++In
++.IR \%ncurses ","
++functions returning an
++.I int
++recognize several error conditions.
++.bP
++All return
++.B ERR
++if the screen has not been initialized;
++see \fBinitscr\fP(3X) or \fBnewterm\fP(3X).
++.bP
++All except
++.B \%start_color
++return
++.B ERR
++if
++.B \%start_color
++has not been called,
++or itself returned
++.BR ERR "."
++.bP
++.B \%start_color
+ returns
+ .B ERR
+-if the terminal does not support
+-this feature, e.g., if the \fB\%initialize_color\fP capability is absent
+-from the terminal description.
+-.TP 5
+-\fB\%start_color\fP
+-returns an error if the color table cannot be allocated.
++if it cannot allocate memory for its color pair table.
++.bP
++.B \%init_color
++returns
++.B ERR
++if the terminal type does not support assignable color values;
++that is,
++if the
++.B \%initialize_color
++.RB ( initc )
++capability is absent from its description.
++.bP
++.B \%init_color
++returns
++.B ERR
++if any of its
++.IR r ","
++.IR g ","
++.I b
++arguments is outside the range 0-1000 inclusive.
++.bP
++.BR \%init_pair ","
++.BR \%init_color ","
++.BR \%init_extended_pair ","
++.BR \%init_extended_color ","
++.BR \%color_content ","
++.BR \%pair_content ","
++.BR \%extended_color_content ","
++and
++.B \%extended_pair_content
++return
++.B ERR
++on attempts to use
++.RS
++.bP
++color identifiers outside the range
++.RB \%0- COLORS \-1
++inclusive,
++the default colors extension notwithstanding,
++or
++.bP
++color pairs identifiers outside the range
++.RB \%0- COLOR_PAIRS \-1
++inclusive.
+ .RE
+ .SH NOTES
+-In the \fI\%ncurses\fP implementation,
+-there is a separate color activation flag,
+-color palette, color pairs table,
+-and associated \fB\%COLORS\fP and \fB\%COLOR_PAIRS\fP counts
+-for each screen; the \fB\%start_color\fP function only affects the current
+-screen.
+-The SVr4/XSI interface is not really designed with this in mind, and
++In
++.IR \%ncurses ","
++.B \%init_pair
++accepts negative foreground and background color arguments
++to support its \fB\%use_default_colors\fP(3X) extension,
++but only after the latter function has been called.
++.PP
++The assumption that
++.B \%COLOR_BLACK
++is the terminal's default background color can be overridden using
++.IR \%ncurses 's
++\fB\%assume_default_colors\fP(3X) extension.
++.PP
++In
++.IR \%ncurses ","
++each pointer passed to
++.B \%color_content
++and
++.B \%pair_content
++can be null,
++in which case the library ignores it,
++permitting the application to disregard unnecessary information.
++.PP
++In
++.IR \%ncurses ","
++each screen has a
++color activation flag,
++color palette,
++color pair table,
++and associated
++.B \%COLORS
++and
++.B \%COLOR_PAIRS
++values for each screen;
++.B \%start_color
++affects only the current screen.
++The SVr4 and X/Open Curses interface was not really designed
++with this in mind;
+ historical implementations may use a single shared color palette.
+ .PP
+ Setting an implicit background color via a color pair affects only
+ 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 \fB\%curs_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\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
+-(such as the
+-Paradise and compatibles) do the wrong thing when you try to set a bright
+-\*(``yellow\*('' background (you get a blinking yellow foreground instead).
++To change the background color used
++when parts of a window are blanked by erasing or scrolling operations,
++see \fB\%curs_bkgd\fP(3X).
++.PP
++Several caveats apply to IBM PC-compatible machines
++of the 80486 era and earlier
++with CGA/EGA/VGA video.
++.bP
++.B \%COLOR_YELLOW
++is actually brown.
++To get yellow,
++combine
++.B \%COLOR_YELLOW
++with the
++.B \%A_BOLD
++attribute.
++.bP
++The
++.B \%A_BLINK
++attribute should in theory make the background bright.
++This often fails to work,
++and even VGA controllers for which it mostly works,
++such as those from Paradise and compatibles,
++do the wrong thing
++when you try to set a bright \*(``yellow\*('' background \(em
++you get a blinking yellow foreground instead.
+ .bP
+-Color RGB values are not settable.
++Color RGB values are not configurable on these devices
++(in text mode).
+ .SH EXTENSIONS
+-The functions marked as extensions were designed for
+-\fB\%ncurses\fP(3X),
++The functions marked as extensions originated in
++.IR \%ncurses ","
+ and are not found in SVr4
+ .IR curses ,
+ 4.4BSD
+ .IR curses ,
+-or any other previous curses implementation.
++or any other previous
++.I curses
++implementation.
+ .SH PORTABILITY
+ Applications employing
+ .I \%ncurses
+@@ -508,84 +604,147 @@
+ .B \%NCURSES_VERSION
+ preprocessor macro.
+ .PP
+-This implementation satisfies X/Open Curses's minimum maximums
+-for \fB\%COLORS\fP and \fB\%COLOR_PAIRS\fP.
++X/Open Curses Issue\ 4 describes these functions.
++It specifies no error conditions for them.
+ .PP
+-The \fB\%init_pair\fP routine accepts negative values of foreground
+-and background color to support the \fB\%use_default_colors\fP(3X) extension,
+-but only if that routine has been first invoked.
+-.PP
+-The assumption that \fB\%COLOR_BLACK\fP is the default
+-background color for all terminals can be modified using the
+-\fB\%assume_default_colors\fP(3X) extension.
+-.PP
+-This implementation checks the pointers,
+-e.g., for the values returned by
+-\fB\%color_content\fP and \fB\%pair_content\fP,
+-and will treat those as optional parameters when null.
++.I \%ncurses
++satisfies X/Open Curses's minimum maximums for
++.I \%COLORS
++and
++.IR \%COLOR_PAIRS "."
+ .PP
+ X/Open Curses does not specify a limit for the number of colors and
+ color pairs which a terminal can support.
+-However, in its use of \fBshort\fP for the parameters,
++However,
++in its use of
++.I short
++for the parameters,
+ it carries over SVr4's implementation detail for the compiled
+-terminfo database, which uses signed 16-bit numbers.
+-This implementation provides extended versions of those functions
+-which use \fBshort\fP parameters,
+-allowing applications to use larger color- and pair-numbers.
++.I \%term\%info
++database,
++which uses signed 16-bit numbers.
++.I \%ncurses
++provides extended versions of the functions using
++.I short
++parameters,
++allowing applications to use larger color and pair identifiers.
+ .PP
+-The \fB\%reset_color_pairs\fP function is an extension of
+-\fI\%ncurses\fP.
++SVr4
++.I curses
++returns
++.I ERR
++from
++.I \%pair_content
++if its
++.I pair
++argument
++was not initialized using
++.IR \%init_pairs ,
++and from
++.I \%color_content
++if the terminal does not support changing colors.
++.I \%ncurses
++does neither.
+ .SH HISTORY
+-SVr3.2 introduced color support to curses in 1987.
++SVr3.2 (1987) introduced color support with all of the symbols in the
++synopsis above except those marked as extensions.
++It reserved color pair 0 as the terminal's initial,
++\*(``uncolored\*('' state,
++.\" "we assume that color 0 is always a default background.", SVr3.2
++.\" usr/src/lib/libcurses/screen/start_col.c
++and limited the number of possible color pairs to 64,
++because the color pair datum was encoded in six bits of a
++.IR \%chtype "."
++.PP
++SVr4 made only internal changes,
++such as moving the storage of color state
++from the
++.I SCREEN
++structure
++(pointed to by
++.IR SP )
++to the
++.I \%TERMINAL
++structure
++(pointed to by
++.IR \%cur_term ")."
+ .PP
+-SVr4 made internal changes,
+-e.g., moving the storage for the color state
+-from \fBSP\fP (the \fISCREEN\fP structure)
+-to \fB\%cur_term\fP (the \fI\%TERMINAL\fP structure),
+-but provided the same set of library functions.
+-.PP
+-SVr4 curses limits the number of color pairs to 64,
+-reserving color pair zero (0) as the terminal's initial uncolored state.
+-This limit arises because the color pair information is a bitfield
+-in the \fB\%chtype\fP data type (denoted by \fB\%A_COLOR\fP).
+-.PP
+-Other implementations of curses had different limits:
++Other
++.I curses
++implementations impose different limits on the number of colors and
++color pairs.
+ .bP
+ .I \%PCCurses
+-(1987-1990) provided for only eight (8) colors.
++(1987-1990) provided for only 8 colors
++(and therefore required at most 8\(mu8 = 64 color pairs).
+ .bP
+ .I \%PDCurses
+ (1992-present) inherited the 8-color limitation from
+ .IR \%PCCurses ,
+ but changed this to 256 in version 2.5 (2001),
+-along with changing \fB\%chtype\fP from 16-bits to 32-bits.
++and widened its
++.I \%chtype
++from 16 to 32 bits.
+ .bP
+ X/Open Curses (1992-present)
+-added a new structure \fB\%cchar_t\fP to store the character,
+-attributes and color pair values, allowing increased range of color pairs.
+-Both color pairs and color-values used a signed \fBshort\fP,
+-limiting values to 15 bits.
++specified a new structure type,
++.IR \%cchar_t ","
++to store the character code,
++attribute flags,
++and color pair identifier,
++allowing an increased range of color pairs.
++It specifies a
++.I short
++as storing identifiers for colors and color pairs,
++limiting portable values to 15 bits;
++negative values are invalid in System\ V.
+ .bP
+-\fI\%ncurses\fP (1992-present) uses eight bits
+-for \fB\%A_COLOR\fP in \fB\%chtype\fP values.
++.I \%ncurses
++(1992-present),
++in its non-wide configuration,
++uses 8 bits of
++.I \%chtype
++for the color pair identifier.
+ .IP
+-Version 5.3 provided a wide-character interface (2002),
+-but left color pairs as part of the attributes-field.
++Version 5.3 (2002) offered a wide-character interface,
++but encoded the color pair identifier with attributes
++in the character type.
+ .IP
+ Since version 6 (2015),
+-ncurses uses a separate \fBint\fP for color pairs in the \fB\%cchar_t\fP values.
+-When those color pair values fit in 8 bits,
+-ncurses allows color pairs to be manipulated
+-via the functions using \fB\%chtype\fP values.
+-.bP
+-NetBSD curses used 6 bits from
+-2000 (when colors were first supported) until 2004.
+-At that point, NetBSD changed to use 10 bits.
+-As of 2021, that size is unchanged.
+-Like \fI\%ncurses\fP before version 6,
+-the NetBSD color pair information is stored in
+-the attributes field of \fB\%cchar_t\fP, limiting the number of color pairs
+-by the size of the bitfield.
++.I \%ncurses
++uses a separate
++.I int
++for the color pair identifier in a
++.IR \%cchar_t ","
++introducing extension functions to manage the wider type.
++When a color pair value fits in 8 bits,
++.I \%ncurses
++permits color pair data to be manipulated
++via the functions taking
++.I \%chtype
++arguments,
++even when a
++.I curses
++window uses wide-character cells.
++.bP
++NetBSD
++.I curses
++used 6 bits for the color pair identifier from 2000
++(when it first added color support)
++until 2004.
++At that point,
++NetBSD widened the color pair identifier to use 9 bits.
++As of 2025,
++that size is unchanged.
++.\" http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libcurses/curses.h?rev=1.133
++.\" indicates a mask of 0x03fe0000.
++Like
++.I \%ncurses
++before version 6,
++the NetBSD color pair datum is stored in
++the attributes field of
++.IR \%cchar_t ","
++limiting the number of color pairs.
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_attr\fP(3X),
+Index: man/curs_delch.3x
+Prereq:  1.41 
+--- ncurses-6.5-20250111+/man/curs_delch.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_delch.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_delch.3x,v 1.41 2024/12/28 21:26:21 tom Exp $
+-.TH curs_delch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_delch.3x,v 1.47 2025/01/19 00:49:39 tom Exp $
++.TH curs_delch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -103,17 +103,14 @@
+ capability
+ is not necessarily employed.
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+ .PP
+-SVr4
+-.I curses
+-describes a successful return value only as
++SVr4 describes a successful return value only as
+ \*(``an integer value other than
+-.BR ERR \*(''.
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 489
+ .SH HISTORY
+ SVr2 (1984) introduced
+-.IR \%delch "."
++.IR \%wdelch "."
+ .SH SEE ALSO
+ \fB\%curses\fP(3X)
+Index: man/curs_deleteln.3x
+Prereq:  1.43 
+--- ncurses-6.5-20250111+/man/curs_deleteln.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_deleteln.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_deleteln.3x,v 1.43 2024/12/28 21:26:21 tom Exp $
+-.TH curs_deleteln 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_deleteln.3x,v 1.48 2025/01/19 00:49:39 tom Exp $
++.TH curs_deleteln 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -124,15 +124,12 @@
+ does not use them;
+ see \fB\%idlok\fP(3X).
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+ .PP
+-SVr4
+-.I curses
+-describes a successful return value only as
++SVr4 describes a successful return value only as
+ \*(``an integer value other than
+-.BR ERR \*(''.
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 490
+ .SH HISTORY
+ 4BSD (1980)
+ .I curses
+Index: man/curs_extend.3x
+Prereq:  1.51 
+--- ncurses-6.5-20250111+/man/curs_extend.3x	2024-09-14 20:06:50.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_extend.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1999-2010,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1999-on
+ .\"
+-.\" $Id: curs_extend.3x,v 1.51 2024/09/14 20:06:50 tom Exp $
+-.TH curs_extend 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_extend.3x,v 1.54 2025/01/19 00:49:39 tom Exp $
++.TH curs_extend 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -96,12 +96,16 @@
+ corresponds to statically allocated memory;
+ do not attempt to \fIfree\fP(3) it.
+ .SH EXTENSIONS
+-These functions are \fB\%ncurses\fP(3X) extensions,
++These functions are
++.I \%ncurses
++extensions,
+ and are not found in SVr4
+ .IR curses ,
+ 4.4BSD
+ .IR curses ,
+-or any other previous curses implementation.
++or any other previous
++.I curses
++implementation.
+ .SH PORTABILITY
+ Applications employing
+ .I \%ncurses
+Index: man/curs_get_wch.3x
+Prereq:  1.50 
+--- ncurses-6.5-20250111+/man/curs_get_wch.3x	2024-12-28 21:27:26.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_get_wch.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2002-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_get_wch.3x,v 1.50 2024/12/28 21:27:26 tom Exp $
+-.TH curs_get_wch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_get_wch.3x,v 1.59 2025/01/19 00:49:39 tom Exp $
++.TH curs_get_wch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -103,7 +103,7 @@
+ otherwise,
+ .I curses
+ waits until the terminal has input.
+-If \fB\%cbreak\fP(3X)
++If \fB\%cbreak\fP(3X) or \fB\%raw\fP(3X)
+ has been called,
+ this happens after one character is read.
+ If \fB\%nocbreak\fP(3X) or \fB\%noraw\fP(3X)
+@@ -158,7 +158,7 @@
+ .PP
+ If the wide character
+ is a carriage return and \fBnl\fP(3X) has been called,
+-.B \%wgetch
++.B \%wget_wch
+ stores the the wide character code for line feed in
+ .I wch
+ instead.
+@@ -168,7 +168,7 @@
+ .I wc
+ into the input queue to be retrieved by the next call to
+ .BR \%wget_wch "."
+-A single input queue serves all windows associated with the terminal.
++A single input queue serves all windows associated with the screen.
+ .SH RETURN VALUE
+ .B \%wget_wch
+ returns
+@@ -187,9 +187,9 @@
+ .bP
+ execution was interrupted by a signal,
+ in which case
+-.B \%errno
++.I \%errno
+ is set to
+-.BR \%EINTR "."
++.IR \%EINTR "."
+ .PP
+ Functions taking a
+ .I \%WINDOW
+@@ -243,14 +243,46 @@
+ .B \%NCURSES_VERSION
+ preprocessor macro.
+ .PP
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+ .PP
+ See the \*(``PORTABILITY\*('' section of \fB\%wgetch\fP(3X) regarding
+ the interaction of
+ .B \%wget_wch
+ with signal handlers.
++.SH HISTORY
++These functions were initially specified by X/Open Curses Issue\ 4
++(1995).
++The System\ V Interface Definition Version\ 4
++of the same year
++specified functions named
++.I \%wgetwch
++(with the usual variants)
++and
++.IR \%ungetwch "."
++.\" SVID 4, vol 3., pp. 496-499
++These were later additions to
++.RI SVr4. x ,
++not appearing in the first SVr4 (1989).
++They differ from X/Open's later
++.I \%wget_wch
++and
++.I \%unget_wch
++in that
++.I \%wgetwch
++takes no
++.I wch
++argument,
++but returns the (wide) key code as an
++.I int
++(with no provision for distinguishing a character code
++from a function key code);
++and
++.I \%ungetwch
++takes a
++.RI non- const
++.I int
++argument.
+ .SH SEE ALSO
+ \fB\%curs_getch\fP(3X) describes comparable functions of the
+ .I \%ncurses
+Index: man/curs_get_wstr.3x
+Prereq:  1.56 
+--- ncurses-6.5-20250111+/man/curs_get_wstr.3x	2024-12-28 21:18:35.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_get_wstr.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,17 +27,19 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_get_wstr.3x,v 1.56 2024/12/28 21:18:35 tom Exp $
+-.TH curs_get_wstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_get_wstr.3x,v 1.64 2025/01/19 00:49:39 tom Exp $
++.TH curs_get_wstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
++.ds ^  \(ha
+ .\}
+ .el \{\
+ .ie t .ds `` ``
+ .el   .ds `` ""
+ .ie t .ds '' ''
+ .el   .ds '' ""
++.ds       ^  ^
+ .\}
+ .
+ .de bP
+@@ -53,7 +55,7 @@
+ \fB\%mvgetn_wstr\fP,
+ \fB\%mvwget_wstr\fP,
+ \fB\%mvwgetn_wstr\fP \-
+-get a wide-character string from a \fIcurses\fR terminal keyboard
++read a wide-character string from a \fIcurses\fR terminal keyboard
+ .SH SYNOPSIS
+ .nf
+ \fB#include 
+@@ -66,87 +68,116 @@
+ \fBint getn_wstr(wint_t * \fIwstr\fP, int \fIn\fP);
+ \fBint wgetn_wstr(WINDOW * \fIwin\fP, wint_t * \fIwstr\fP, int \fIn\fP);
+ \fBint mvgetn_wstr(int \fIy\fP, int \fIx\fP, wint_t * \fIwstr\fP, int \fIn\fP);
+-\fBint mvwgetn_wstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t * \fIwstr\fP, int \fIn\fP);
++\fBint mvwgetn_wstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t * \fIwstr\fP,
++      int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
++.B \%wget_wstr
++populates a user-supplied wide-character string buffer
++.I wstr
++by repeatedly calling \fBwget_wch\fP(3X)
++with the
++.I win
++argument
++until a line feed or carriage return character is input.
+ The function
+-\fBwgetn_wstr\fP
+-is equivalent to a series of calls to
+-\fBwget_wch\fP(3X)
+-until a newline or carriage return terminates the series:
+ .bP
+-The terminating character is not included in the returned string.
++does not copy the terminating character to
++.IR wstr ";"
+ .bP
+-An end-of-file condition is represented by \fBWEOF\fP,
+-as defined in \fB\fP.
+-.bP
+-In all instances, the end of the string is terminated
+-by a null \fBwchar_t\fP.
+-.bP
+-The function stores the result in the area pointed to
+-by the \fIwstr\fP parameter.
+-.bP
+-The function reads at most \fIn\fP characters,
+-thus preventing a possible overflow of the input buffer.
+-.IP
+-Any attempt to enter more characters
+-(other than the terminating newline or carriage return)
+-causes a beep.
+-.IP
+-Function keys also cause a beep and are ignored.
++populates
++.I wstr
++with
++.I WEOF
++(as defined in
++.IR \%wchar.h )
++if an end-of-file condition occurs on the input;
++.bP
++always terminates the string with a null wide character
++(after any
++.IR WEOF );
++.bP
++interprets the screen's erase and kill characters
++(see \fB\%erasechar\fP(3X) and \fB\%killchar\fP(3X));
++.bP
++recognizes function keys only if the screen's keypad option is enabled
++(see \fB\%keypad\fP(3X));
++.bP
++treats the function keys
++.B \%KEY_LEFT
++and
++.B \%KEY_BACKSPACE
++the same as the erase character;
++and
++.bP
++discards function key inputs other than those treated as the erase
++character,
++calling \fBbeep\fP(3X).
++.PP
++The erase character replaces the character at the end of the buffer with
++a null wide character,
++while the kill character does the same for the entire buffer.
++.PP
++If the screen's echo option is enabled
++(see \fBecho\fP(3X)),
++.B \%wget_wstr
++updates
++.I win
++with \fB\%wadd_wch\fP(3X).
++Further,
++.bP
++the erase character
++and its function key synonyms
++move the cursor to the left,
++and
++.bP
++the kill character returns the cursor to where it was located when
++.B \%wget_wstr
++was called.
++.PP
++.B \%wgetn_wstr
++is similar,
++but reads at most
++.I n
++wide characters,
++aiding the application to avoid overrunning the buffer to which
++.I wstr
++points.
++An attempt to input more than
++.I n
++wide characters
++(other than the terminating line feed or carriage return)
++is ignored with a beep.
++If
++.I n
++is negative,
++.B \%wgetn_wstr
++reads up to
++.I LINE_MAX
++wide characters
++(see
++.IR sysconf (3)).
+ .PP
+-The user's \fIerase\fP and \fIkill\fP characters are interpreted:
+-.bP
+-The \fIerase\fP character (e.g., \fB^H\fP) erases the character
+-at the end of the buffer, moving the cursor to the left.
+-.IP
+-If \fIkeypad\fP mode is on for the window,
+-\fBKEY_LEFT\fP and \fBKEY_BACKSPACE\fP
+-are both considered equivalent to the user's \fIerase\fP 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\fP is currently on.
+-In that case,
+-backspace is echoed as deletion of the previous character
+-(typically a left motion).
+-.PP
+-The
+-\fBgetn_wstr\fP,
+-\fBmvgetn_wstr\fP,
+-\fBmvwgetn_wstr\fP, and
+-\fBwgetn_wstr\fP
+-functions are identical
+-to the
+-\fBget_wstr\fP,
+-\fBmvget_wstr\fP,
+-\fBmvwget_wstr\fP, and
+-\fBwget_wstr\fP
+-functions, respectively,
+-except that the
+-\fB*n_*\fP
+-versions read at most
+-\fIn\fP
+-characters, letting the application prevent overflow of the
+-input buffer.
++\fB\%ncurses\fP(3X) describes the variants of these functions.
+ .SH RETURN VALUE
+-All of these functions return the integer \fBOK\fP upon successful completion.
+-If unsuccessful, they return \fBERR\fP.
+-.PP
+-X/Open defines no error conditions.
++These functions return
++.B OK
++on success and
++.B ERR
++on failure.
+ .PP
+-In this implementation,
+-these functions return
++In
++.IR \%ncurses ","
++they return
+ .B ERR
++if
+ .bP
+-if the window pointer is null,
++.I win
++is
++.IR NULL ","
++or
+ .bP
+-if its timeout expires without having any data, or
+-.bP
+-if the associated call to
+-\fBwget_wch\fP
+-failed.
++if an internal \fB\%wget_wch\fP(3X) call fails.
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+@@ -154,75 +185,184 @@
+ .IR x )
+ is outside the window boundaries.
+ .SH NOTES
+-Any of these functions other than
+-\fBwgetn_wstr\fP
+-may be macros.
+-.PP
+-Using
+-\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\fP
+-causes undefined
+-results.
+-The use of
+-\fBgetn_wstr\fP,
+-\fBmvgetn_wstr\fP,
+-\fBmvwgetn_wstr\fP, or
+-\fBwgetn_wstr\fP,
+-respectively, is recommended.
+-.PP
+-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.
++All of these functions except
++.B \%wgetn_wstr
++may be implemented as macros.
++.PP
++Reading input that overruns the buffer pointed to by
++.I wstr
++causes undefined results.
++Use the
++.BR n -infixed
++functions,
++and allocate sufficient storage for
++.I wstr
++\(em at least
++.IR n +1
++times
++.BR sizeof(wchar_t) "."
++.PP
++These functions cannot store a
++.B KEY_
++value in
++.I wstr
++because there is no way to distinguish it
++from a valid
++.I \%wchar_t
++value.
++.PP
++While these functions conceptually implement
++a series of calls to
++.BR \%wget_wch ","
++they also temporarily change properties of the
++.I curses
++screen to permit simple editing of the input buffer.
++Each function saves the screen's state,
++calls \fBnl\fP(3X),
++and,
++if the screen was in canonical (\*(``cooked\*('') mode,
++\fB\%cbreak\fP(3X).
++Before returning,
++it restores the saved screen state.
++Other implementations differ in detail,
++affecting which control characters they can accept in the buffer;
++see section \*(``PORTABILITY\*('' below.
++.PP
++Unlike \fBgetstr\fP(3X) and related functions of
++.IR \%ncurses 's
++non-wide API,
++these functions do not return
++.B \%KEY_RESIZE
++if a
++.I \%SIGWINCH
++event interrupts the function.
++.SH EXTENSIONS
++.BR \%getn_wstr ","
++.BR \%wgetn_wstr ","
++.BR \%mvgetn_wstr ","
++and
++.BR \%mvwgetn_wstr "'s"
++handing of negative
++.I n
++values is an
++.I \%ncurses
++extension.
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions.
+-It specifies no error conditions for them.
++Applications employing
++.I \%ncurses
++extensions should condition their use on the visibility of the
++.B \%NCURSES_VERSION
++preprocessor macro.
+ .PP
+-This implementation returns \fBERR\fP if the window pointer is null,
+-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\fP followed by a null \fBwchar_t\fP.
++X/Open Curses Issue\ 4 describes these functions.
++It specifies no error conditions for them.
+ .PP
+-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:
++Issue\ 4 documented these functions as passing an array of
++.IR wchar_t ","
++but that was an error,
++conflicting with the following language in the standard.
+ .RS
+ .PP
+-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.
++The effect of
++.IR \%get_wstr "()"
++is as though a series of calls to
++.IR \%get_wch "()"
++were made,
++until a newline character,
++end-of-line character,
++or end-of-file character is processed.
++.\" X/Open Curses Issue 4, Version 2, p. 96.
+ .RE
+ .PP
+-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\fP, following the standard.
+-.PP
+-X/Open Curses, Issue 7 (2009) is unclear regarding whether
+-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.
+-The unrevised description of \fBwget_nwstr\fP can be interpreted either way.
+-This implementation counts the terminator in the length.
++.I \%get_wch
++can return a negative value
++.RI ( WEOF ),
++but
++.I \%wchar_t
++is a unsigned type.
++All of the vendors implement these functions using
++.IR \%wint_t ","
++following the Issue\ 7 standard.
++.PP
++X/Open Curses Issue\ 7 is unclear whether the terminating null wide character
++counts toward the length paramter
++.IR n "."
++A similar issue affected
++.I \%wgetnstr
++in Issue\ 4,
++Version\ 2;
++Issue\ 7 revised that function's description to address the issue,
++but not that of
++.IR \%wget_nwstr ","
++leaving it ambiguous.
++.I \%ncurses
++counts the terminator in the length.
+ .PP
+-X/Open Curses does not specify what happens if the length \fIn\fP is negative.
++X/Open Curses does not specify what happens if the length
++.I n
++is negative.
+ .bP
+-For analogy with \fBwgetnstr\fP,
+-\fI\%ncurses\fP 6.2 uses a limit (based on \fBLINE_MAX\fP).
++For consistency with
++.IR \%wgetnstr ","
++.I \%ncurses
++6.2 uses a limit based on
++.IR LINE_MAX "."
+ .bP
+-Some other implementations (such as Solaris
++Some other implementations
++(such as Solaris
+ .IR xcurses )
+ do the same,
+ while others
+ .RI \%( PDCurses )
+-do not allow this.
++do not permit a negative
++.IR n "."
+ .bP
+-NetBSD 7 curses imitates \fI\%ncurses\fP 6.1 in this regard,
+-treating a \fB\-1\fP as an indefinite number of characters.
++NetBSD\ 7
++.I curses
++imitates
++.I \%ncurses
++6.1 and earlier,
++treating a negative
++.I n
++as an unbounded count of wide characters.
++.PP
++Implementations vary in their handling of input control characters.
++.bP
++While they may enable the screen's echo option,
++some do not take it out of raw mode,
++and may take cbreak mode into account
++when deciding whether to handle echoing within
++.I \%wgetn_wstr
++or to rely on it as a side effect of calling
++.IR \%wget_wch "."
++.IP
++Since 1995,
++.I \%ncurses
++has provided handlers for
++.I SIGINTR
++and
++.I SIGQUIT
++events,
++which are typically generated at the keyboard with
++.B \*^C
++and
++.B \*^\e
++respectively.
++In cbreak mode,
++those handlers catch a signal and stop the program,
++whereas other implementations write those characters into the buffer.
++.bP
++Starting with
++.I \%ncurses
++6.3 (2021),
++.I \%wgetn_wstr
++preserves raw mode if the screen was already in that state,
++allowing one to enter the characters the terminal interprets
++as interrupt and quit events
++into the buffer,
++for consistency with SVr4
++.IR curses 's
++.IR \%wgetnstr .
+ .SH SEE ALSO
+ \fB\%curs_getstr\fP(3X) describes comparable functions of the
+ .I \%ncurses
+Index: man/curs_getcchar.3x
+Prereq:  1.49 
+--- ncurses-6.5-20250111+/man/curs_getcchar.3x	2024-04-20 18:55:09.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_getcchar.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2001-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,16 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getcchar.3x,v 1.49 2024/04/20 18:55:09 tom Exp $
+-.TH curs_getcchar 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_getcchar.3x,v 1.53 2025/01/19 00:49:39 tom Exp $
++.TH curs_getcchar 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.ie \n(.g \{\
++.ds ' \(aq
++.\}
++.el \{\
++.ie t .ds ' \(aq
++.el   .ds ' '
++.\}
++.
+ .de bP
+ .ie n  .IP \(bu 4
+ .el    .IP \(bu 2
+@@ -41,146 +49,303 @@
+ .nf
+ \fB#include 
+ .PP
+-\fBint getcchar(
+-.B "        const cchar_t *\fIwch\fP,"
+-.B "        wchar_t *\fIwc\fP,"
+-.B "        attr_t *\fIattrs\fP,"
+-.B "        short *\fIcolor_pair\fP,"
+-.B "        void *\fIopts\fP );"
+-.PP
+-.B "int setcchar("
+-.B "        cchar_t *\fIwch\fP,"
+-.B "        const wchar_t *\fIwc\fP,"
+-.B "        const attr_t \fIattrs\fP,"
+-.B "        short \fIcolor_pair\fP,"
+-.B "        const void *\fIopts\fP );"
++\fBint gettchar(const cchar_t * \fIwch\fP, wchar_t * \fIwc\fP,
++      attr_t * \fIattrs\fP, short * \fIpair\fP, void * \fIopts\fP);
++\fBint settchar(cchar_t * \fIwch\fP, const wchar_t * \fIwc\fP,
++      const attr_t \fIattrs\fP, short \fIpair\fP, const void * \fIopts\fP);
+ .fi
+ .SH DESCRIPTION
++The
++.I curses
++complex character data type
++.I \%cchar_t
++is a structure type comprising
++a wide-character string,
++a set of attributes,
++and
++a color pair identifier.
++The
++.I \%cchar_t
++structure is opaque;
++do not attempt to access its members directly.
++The library provides functions to manipulate this type.
+ .SS getcchar
+-The \fBgetcchar\fP function gets a wide-character string
+-and rendition from a \fBcchar_t\fP argument.
+-When \fIwc\fP is not a null pointer,
+-the \fBgetcchar\fP function does the following:
+-.bP
+-Extracts information from a \fBcchar_t\fP value \fIwch\fP
+-.bP
+-Stores the character attributes in the location pointed to by \fIattrs\fP
+-.bP
+-Stores the color pair in the location pointed to by \fIcolor_pair\fP
+-.bP
+-Stores the wide-character string,
+-characters referenced by \fIwch\fP, into the array pointed to by \fIwc\fP.
++.B \%getcchar
++destructures a
++.I \%cchar_t
++into its components.
+ .PP
+-When
+-\fIwc\fP
+-is a null pointer, the
+-\fBgetcchar\fP
+-function does the following:
++If
++.I wc
++is not a null pointer,
++.BR \%getcchar :
++.bP
++stores the wide-character string in the
++.I curses
++complex character
++.I wch
++into
++.IR wc ;
++.bP
++stores the attributes in
++.IR attrs ;
++and
+ .bP
+-Obtains the number of wide characters pointed to by \fIwch\fP
+-.bP
+-Does not change the data referenced by
+-\fIattrs\fP
+-or
+-\fIcolor_pair\fP
++stores the color pair identifier in
++.IR pair .
++.PP
++If
++.I wc
++is a null pointer,
++.B \%getcchar
++counts the
++.I \%wchar_t
++wide characters in
++.IR wch ,
++returns that value,
++and leaves
++.I attrs
++and
++.I pair
++unchanged.
+ .SS setcchar
+-The \fBsetcchar\fP function initializes the location pointed to by \fIwch\fP
+-by using:
+-.bP
+-The character attributes in
+-\fIattrs\fP
+-.bP
+-The color pair in
+-\fIcolor_pair\fP
+-.bP
+-The wide-character string pointed to by \fIwc\fP.
+-The string must be L'\e0' terminated,
+-contain at most one spacing character,
+-which must be the first.
+-.IP
+-Up to \fBCCHARW_MAX\fP\-1 non-spacing characters may follow.
+-Additional non-spacing characters are ignored.
+-.IP
++.B \%setcchar
++constructs a
++.I curses
++complex character
++.I wch
++from the components
++.IR wc ,
++.IR attrs ,
++and
++.IR pair .
++The wide-character string
++.I wch
++must be terminated with a null wide character
++.B L\*'\e0\*'
++and must contain at most one spacing character,
++which,
++if present,
++must be the first wide character in the string.
++.PP
++Up to
++.BR \%CCHARW_MAX\  \-\ 1
++non-spacing characters may follow
++(see \fB\%curs_variables\fP(3X)).
++.I \%ncurses
++ignores any additional non-spacing characters.
++.PP
+ The string may contain a single control character instead.
+-In that case, no non-spacing characters are allowed.
++In that case,
++no non-spacing characters are allowed.
+ .SH RETURN VALUE
+-When \fIwc\fP is a null pointer,
+-\fBgetcchar\fP returns the number of wide characters referenced by
+-\fIwch\fP,
+-including one for a trailing null.
+-.PP
+-When \fIwc\fP is not a null pointer,
+-\fBgetcchar\fP returns \fBOK\fP upon successful completion,
+-and \fBERR\fP otherwise.
++If
++.B \%getcchar
++is passed a null pointer as its
++.I wc
++argument,
++it returns the number of wide characters for a given
++.I wch
++that it would store in
++.IR wc ","
++counting a trailing null wide character.
++If
++.B \%getcchar
++is not passed a null pointer as its
++.I wc
++argument,
++it returns
++.B OK
++on success and
++.B ERR
++on failure.
++.PP
++In
++.IR \%ncurses ,
++.B \%getcchar
++returns
++.B ERR
++if either
++.I attrs
++or
++.I pair
++is a null pointer and
++.I wc
++is not.
++.PP
++.B \%setcchar
++returns
++.B OK
++on success and
++.B ERR
++on failure.
+ .PP
+-Upon successful completion, \fBsetcchar\fP returns \fBOK\fP.
+-Otherwise, it returns \fBERR\fP.
++In
++.IR \%ncurses ,
++.B \%setcchar
++returns
++.B ERR
++if
++.bP
++.I wch
++is a null pointer,
++.bP
++.I wc
++starts with a (wide) control character
++and contains any other wide characters,
++or
++.bP
++.I pair
++has a negative value.
+ .SH NOTES
+-The \fIwch\fP argument may be a value generated by a call to
+-\fBsetcchar\fP or by a function that has a \fBcchar_t\fP output argument.
+-If \fIwch\fP is constructed by any other means, the effect is unspecified.
++.I wch
++may be a value stored by
++.B \%setcchar
++or another
++.I curses
++function with a writable
++.I \%cchar_t
++argument.
++If
++.I wch
++is constructed by any other means,
++the library's behavior is unspecified.
+ .SH EXTENSIONS
+-X/Open Curses documents the \fIopts\fP argument as reserved for future use,
+-saying that it must be null.
+-This implementation
+-uses that parameter in ABI 6 for the functions which have a color pair
+-parameter to support extended color pairs:
+-.bP
+-For  functions  which modify the color, e.g., \fBsetcchar\fP,
+-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.
+-.bP
+-For functions which retrieve the color, e.g., \fBgetcchar\fP,
+-if \fIopts\fP is set it is treated as a pointer to \fBint\fP,
+-and  used  to  retrieve  the color pair as an \fBint\fP value,
+-in addition retrieving it via the standard pointer to \fBshort\fP parameter.
++X/Open Curses documents the
++.I opts
++argument as reserved for future use,
++saying that it must be a null pointer.
++The
++.IR \%ncurses \ 6
++ABI uses it with functions that have a color pair parameter
++to support extended color pairs.
++.bP
++In functions that assign colors,
++such as
++.BR \%setcchar ","
++if
++.I opts
++is not a null pointer,
++.I \%ncurses
++treats it as a pointer to
++.IR int ","
++and interprets it instead of the
++.I short
++.I pair
++parameter as a color pair identifier.
++.bP
++In functions that retrieve colors,
++such as
++.BR \%getcchar ","
++if
++.I opts
++is not a null pointer,
++.I \%ncurses
++treats it as a pointer to
++.IR int ","
++and stores the retrieved color pair identifier there
++as well as in the
++.I short
++.I pair
++parameter
++(which may therefore undergo a narrowing conversion).
+ .SH PORTABILITY
+-The \fBCCHARW_MAX\fP symbol is specific to \fI\%ncurses\fP.
+-X/Open Curses does not provide details for the layout of the \fBcchar_t\fP
+-structure.
+-It tells what data are stored in it:
+-.bP
+-a spacing character (\fBwchar_t\fP, i.e., 32-bits).
+-.bP
+-non-spacing characters (again, \fBwchar_t\fP's).
+-.bP
+-attributes (at least 16 bits, inferred from the various ACS- and WACS-flags).
+-.bP
+-color pair (at least 16 bits, inferred from the \fBunsigned short\fP type).
++Applications employing
++.I \%ncurses
++extensions should condition their use on the visibility of the
++.B \%NCURSES_VERSION
++preprocessor macro.
++.PP
++These functions are described in X/Open Curses Issue\ 4.
++It specifies no error conditions for them.
++.PP
++X/Open Curses does not detail the layout of the
++.I \%cchar_t
++structure,
++describing only its minimal required contents:
++.bP
++a spacing wide character
++.RI \%( wchar_t ),
++.bP
++at least five non-spacing wide characters
++.RI \%( wchar_t ;
++see below),
++.bP
++attributes
++(at least 15 bits' worth,
++inferred from the count of specified
++.B WA_
++constants),
++.\" See X/Open Curses Issue 7, p. 307.
++.bP
++a color pair identifier
++(at least 16 bits,
++inferred from the
++.I short
++type used to encode it).
+ .PP
+-The non-spacing characters are optional,
+-in the sense that zero or more may be stored in a \fBcchar_t\fP.
++Non-spacing characters are optional,
++in the sense that zero or more may be stored in a
++.IR \%cchar_t "."
+ XOpen/Curses specifies a limit:
+ .RS 4
+ .PP
+-Implementations may limit the number of non-spacing characters that can be
+-associated with a spacing character, provided any limit is at least 5.
++Implementations may limit the number of non-spacing characters that can
++be associated with a spacing character,
++provided any limit is at least 5.
+ .RE
+ .PP
+-The Unix implementations at the time follow that limit:
++Then-contemporary Unix implementations adhered to that limit.
+ .bP
+-AIX\ 4 and OSF1\ 4 use the same declaration with an array of 5 non-spacing
+-characters \fIz\fP and a single spacing character \fIc\fP.
+-.bP
+-HP-UX\ 10 uses an opaque structure with 28 bytes,
+-which is large enough for the 6 \fBwchar_t\fP values.
+-.bP
+-Solaris \fIxpg4\fP curses uses a single array of 6 \fBwchar_t\fP values.
++AIX\ 4 and OSF/1\ 4 used the same declaration with
++a single spacing wide character
++.I c
++and an array of 5 non-spacing wide characters
++.IR z "."
++.bP
++HP-UX\ 10 used an opaque structure of 28 bytes,
++large enough for 6
++.I \%wchar_t
++values.
++.bP
++Solaris
++.I xcurses
++uses a single array of 6
++.I \%wchar_t
++values.
+ .PP
+-This implementation's \fBcchar_t\fP was defined in 1995
+-using \fB5\fP for the total of spacing and non-spacing characters
+-(\fBCCHARW_MAX\fP).
++.I \%ncurses
++defined its
++.I \%cchar_t
++in 1995 using 5 as the
++.I total
++of spacing and non-spacing characters
++.RB \%( CCHARW_MAX ).
+ That was probably due to a misreading of the AIX\ 4 header files,
+-because the X/Open Curses document was not generally available at that time.
+-Later (in 2002), this detail was overlooked when beginning to implement
+-the functions using the structure.
+-.PP
+-In practice, even four non-spacing characters may seem enough.
+-X/Open Curses documents possible uses for non-spacing characters,
+-including using them for ligatures between characters
+-(a feature apparently not supported by any curses implementation).
+-Unicode does not limit the (analogous) number of combining characters,
+-so some applications may be affected.
++because the X/Open Curses document
++was not generally available at that time.
++Later (in 2002),
++this detail was overlooked when work began to implement the functions
++using the structure.
++.PP
++In practice,
++a mere four non-spacing characters may seem adequate.
++X/Open Curses documents possible applications of non-spacing characters,
++including their use as ligatures
++(a feature apparently not supported by any
++.I curses
++implementation).
++Unicode does not limit the (analogous) number of combining characters
++in a grapheme cluster;
++some applications may be affected.
++.I \%ncurses
++can be compiled with a different
++.B CCHARW_MAX
++value;
++doing so alters the library's ABI.
++.SH HISTORY
++These functions were initially specified by X/Open Curses Issue\ 4
++(1995).
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_attr\fP(3X),
+Index: man/curs_getch.3x
+Prereq:  1.104 
+--- ncurses-6.5-20250111+/man/curs_getch.3x	2024-12-28 21:27:26.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_getch.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getch.3x,v 1.104 2024/12/28 21:27:26 tom Exp $
+-.TH curs_getch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_getch.3x,v 1.114 2025/01/19 00:49:39 tom Exp $
++.TH curs_getch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -103,7 +103,7 @@
+ otherwise,
+ .I curses
+ waits until the terminal has input.
+-If \fB\%cbreak\fP(3X)
++If \fB\%cbreak\fP(3X) or \fB\%raw\fP(3X)
+ has been called,
+ this happens after one character is read.
+ If \fB\%nocbreak\fP(3X) or \fB\%noraw\fP(3X)
+@@ -258,7 +258,7 @@
+ .I c
+ into the input queue to be returned by the next call to
+ .BR \%wgetch "."
+-A single input queue serves all windows associated with the terminal.
++A single input queue serves all windows associated with the screen.
+ .SS "Predefined Key Codes"
+ The header file
+ .I \%curses.h
+@@ -456,9 +456,9 @@
+ .bP
+ execution was interrupted by a signal,
+ in which case
+-.B \%errno
++.I \%errno
+ is set to
+-.BR \%EINTR "."
++.IR \%EINTR "."
+ .PP
+ .B \%ungetch
+ returns
+@@ -604,6 +604,10 @@
+ for 1 \(<=
+ .I n
+ \(<= 12.
++.\" Other numeric keypad keys from the DEC VT220 (specifically, the
++.\" LK201 commonly used with it) and IBM PC/AT keyboards -- the comma
++.\" (DEC); plus, star, and slash (PC); and zero, dot, and minus (both)
++.\" have no standard key capability codes.
+ .SH EXTENSIONS
+ In
+ .IR \%ncurses ","
+@@ -619,8 +623,9 @@
+ \fB\%curs_variables\fP(3X).
+ .PP
+ .B \%has_key
+-was designed for
+-.IR \%ncurses ","
++is an
++.I \%ncurses
++extension,
+ and is not found in SVr4
+ .IR curses ","
+ 4.4BSD
+@@ -636,10 +641,13 @@
+ preprocessor macro.
+ .PP
+ Except as noted in section \*(``EXTENSIONS\*('' above,
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+ .PP
++SVr4 describes a successful return value only as
++\*(``an integer value other than
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 494
++.PP
+ .B \%wgetch
+ reads only single-byte characters.
+ .PP
+Index: man/curs_getstr.3x
+Prereq:  1.71 
+--- ncurses-6.5-20250111+/man/curs_getstr.3x	2024-12-28 21:27:26.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_getstr.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getstr.3x,v 1.71 2024/12/28 21:27:26 tom Exp $
+-.TH curs_getstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_getstr.3x,v 1.80 2025/01/19 00:49:39 tom Exp $
++.TH curs_getstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -55,7 +55,7 @@
+ \fB\%mvgetnstr\fP,
+ \fB\%mvwgetstr\fP,
+ \fB\%mvwgetnstr\fP \-
+-accept character strings from \fIcurses\fR terminal keyboard
++read a character string from \fIcurses\fR terminal keyboard
+ .SH SYNOPSIS
+ .nf
+ \fB#include 
+@@ -68,7 +68,8 @@
+ \fBint getnstr(char * \fIstr\fP, int \fIn\fP);
+ \fBint wgetnstr(WINDOW * \fIwin\fP, char * \fIstr\fP, int \fIn\fP);
+ \fBint mvgetnstr(int \fIy\fP, int \fIx\fP, char * \fIstr\fP, int \fIn\fP);
+-\fBint mvwgetnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, char * \fIstr\fP, int \fIn\fP);
++\fBint mvwgetnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, char * \fIstr\fP,
++      int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
+ .B \%wgetstr
+@@ -116,7 +117,7 @@
+ .B \%wgetstr
+ updates
+ .I win
+-with \fB\%wechochar\fP(3X).
++with \fB\%waddch\fP(3X).
+ Further,
+ .bP
+ the erase character
+@@ -141,6 +142,15 @@
+ characters
+ (other than the terminating line feed or carriage return)
+ is ignored with a beep.
++If
++.I n
++is negative,
++.B \%wgetn_wstr
++reads up to
++.I LINE_MAX
++characters
++(see
++.IR sysconf (3)).
+ .PP
+ \fB\%ncurses\fP(3X) describes the variants of these functions.
+ .SH RETURN VALUE
+@@ -161,9 +171,7 @@
+ .IR NULL ","
+ or
+ .bP
+-if an internal
+-.B \%wgetch
+-call fails.
++if an internal \fB\%wgetch\fP(3X) call fails.
+ .PP
+ Further,
+ in
+@@ -171,7 +179,7 @@
+ these functions return
+ .B \%KEY_RESIZE
+ if a
+-.B \%SIGWINCH
++.I \%SIGWINCH
+ event interrupts the function.
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+@@ -184,28 +192,28 @@
+ .B \%wgetnstr
+ may be implemented as macros.
+ .PP
+-Use of
+-.BR \%getstr ","
+-.BR \%mvgetstr ","
+-.BR \%mvwgetstr ","
+-or
+-.B \%wgetstr
+-to read input that
+-overruns the buffer pointed to by
++Reading input that overruns the buffer pointed to by
+ .I str
+ causes undefined results.
+-Use their
++Use the
+ .BR n -infixed
+-counterpart functions instead.
++functions,
++and allocate sufficient storage for
++.I str
++\(em at least
++.IR n +1
++times
++.BR sizeof(char) "."
+ .PP
+-While
+-.B \%wgetnstr
+-is conceptually a series of calls to
++While these functions conceptually implement
++a series of calls to
+ .BR \%wgetch ","
+-it also temporarily changes properties of the
++they also temporarily change properties of the
+ .I curses
+ screen to permit simple editing of the input buffer.
+-It saves the screen's state and then calls \fBnl\fP(3X) and,
++Each function saves the screen's state,
++calls \fBnl\fP(3X),
++and,
+ if the screen was in canonical (\*(``cooked\*('') mode,
+ \fB\%cbreak\fP(3X).
+ Before returning,
+@@ -214,6 +222,17 @@
+ affecting which control characters they can accept in the buffer;
+ see section \*(``PORTABILITY\*('' below.
+ .SH EXTENSIONS
++.BR \%getnstr ","
++.BR \%wgetnstr ","
++.BR \%mvgetnstr ","
++and
++.BR \%mvwgetnstr "'s"
++handing of negative
++.I n
++values is an
++.I \%ncurses
++extension.
++.PP
+ The return value
+ .B \%KEY_RESIZE
+ is an
+@@ -226,7 +245,7 @@
+ .B \%NCURSES_VERSION
+ preprocessor macro.
+ .PP
+-X/Open Curses Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them,
+ but indicates that
+ .I \%wgetnstr
+@@ -247,11 +266,9 @@
+ .\" You can pass ncurses wgetnstr n=0 and it will beep at you with each
+ .\" key stroke.
+ .PP
+-SVr4
+-.I curses
+-describes a successful return value only as
++SVr4 describes a successful return value only as
+ \*(``an integer value other than
+-.BR ERR \*(''.
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 495
+ .PP
+ SVr3 and early SVr4
+ .I curses
+@@ -267,7 +284,7 @@
+ \*(``home\*('' key,
+ \*(``clear\*('' key,
+ .IR etc. )
+-.\" SVID 4, Volume 3, p. 495
++.\" SVID 4, vol. 3, p. 495
+ .RE
+ .PP
+ without further detail.
+@@ -280,20 +297,23 @@
+ being,
+ in fact,
+ the low-order eight bits of the key code's
+-.B KEY_
++.I KEY_
+ constant value.
+ (The same language,
+ unchanged except for styling,
+-survived into X/Open Curses Issue 4, \" p. 94 (PDF 114)
+-but disappeared from Issue 7.) \" p. 105 (PDF 119)
+-.PP
+-X/Open Curses Issue 5 (2007) stated that these functions
++survived into X/Open Curses Issue\ 4,
++Version\ 2 \" p. 94 (PDF 114)
++but disappeared from Issue\ 7.) \" p. 105 (PDF 119)
++.PP
++A draft of X/Open Curses Issue\ 5
++(which never saw final release)
++stated that these functions
+ \*(``read at most
+ .I n
+ bytes\*(''
+ but did not state whether the terminating null character
+ counted toward that limit.
+-X/Open Curses Issue 7 (2009) changed that to say they
++X/Open Curses Issue\ 7 changed that to say they
+ \*(``read at most
+ .IR n \-1
+ bytes\*(''
+@@ -320,6 +340,27 @@
+ .I \%wgetnstr
+ does not consistently count a null character toward the limit.
+ .PP
++X/Open Curses does not specify what happens if the length
++.I n
++is negative.
++.bP
++.I \%ncurses
++6.2 uses
++.I LINE_MAX
++or a larger (system-dependent) value
++provided by \fI\%sysconf\fP(3).
++If neither
++.I LINE_MAX
++nor
++.I \%sysconf
++is available,
++.I \%ncurses
++uses the POSIX minimum value for
++.I LINE_MAX
++(2048). \" _POSIX2_LINE_MAX
++In either case,
++it reserves a byte for the terminating null character.
++.bP
+ In SVr4
+ .IR curses ","
+ a negative
+@@ -361,22 +402,24 @@
+ .bP
+ .IR PDCurses ","
+ and
+-SVr3.1,
+-SVr4,
++SVr3 and later,
++.\" https://github.com/ryanwoodsmall/oldsysv/blob/master/\
++.\"   sysvr3/301/usr/src/lib/libcurses/screen/getstr.c#L21
++.\"   sysvr3/31/usr/src/lib/libcurses/screen/wgetstr.c#L10
++.\"   sysvr4/svr4/lib/xlibcurses/screen/wgetstr.c#L12
+ and
+ Solaris
+ .I curses
+ limit both functions to writing 256 bytes.
+ Other System\ V-based platforms likely use the same limit.
+-.\" https://github.com/ryanwoodsmall/oldsysv/blob/master/\
+-.\"   sysvr3/31/usr/src/lib/libcurses/screen/wgetstr.c#L10
+-.\"   sysvr4/svr4/lib/xlibcurses/screen/wgetstr.c#L12
+ .bP
+ Solaris
+ .I xcurses
+ limits the write to
+-.B LINE_MAX
+-bytes.
++.I LINE_MAX
++bytes
++(see
++.IR sysconf (3)).
+ .bP
+ NetBSD 7
+ .I curses
+@@ -385,33 +428,6 @@
+ .I n
+ to ensure that it is greater than zero.
+ A comment in NetBSD's source code asserts that SUSv2 specifies this.
+-.bP
+-.I \%ncurses
+-prior to 6.2 (2020)
+-imposes no limit on the length of the write,
+-and treats
+-.IR wgetnstr 's
+-.I n
+-parameter as SVr4
+-.I curses
+-does.
+-.bP
+-.I \%ncurses
+-6.2 uses
+-.B LINE_MAX
+-or a larger (system-dependent) value
+-provided by \fI\%sysconf\fP(3).
+-If neither
+-.B LINE_MAX
+-nor
+-.I \%sysconf
+-is available,
+-.I \%ncurses
+-uses the POSIX minimum value for
+-.B LINE_MAX
+-(2048). \" _POSIX2_LINE_MAX
+-In either case,
+-it reserves a byte for the terminating null character.
+ .PP
+ Implementations vary in their handling of input control characters.
+ .bP
+@@ -441,9 +457,9 @@
+ Since 1995,
+ .I \%ncurses
+ has provided handlers for
+-.B SIGINTR
++.I SIGINTR
+ and
+-.B SIGQUIT
++.I SIGQUIT
+ events,
+ which are typically generated at the keyboard with
+ .B \*^C
+@@ -476,7 +492,7 @@
+ .IR \%wgetnstr ","
+ but none of its variants.
+ .PP
+-X/Open Curses Issue 4 (1995) specified
++X/Open Curses Issue\ 4 (1995) specified
+ .IR \%getnstr ","
+ .IR \%mvwgetnstr ","
+ and
+Index: man/curs_getyx.3x
+Prereq:  1.47 
+--- ncurses-6.5-20250111+/man/curs_getyx.3x	2024-06-08 20:42:50.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_getyx.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2020-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2020-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getyx.3x,v 1.47 2024/06/08 20:42:50 tom Exp $
+-.TH curs_getyx 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_getyx.3x,v 1.53 2025/01/19 00:49:39 tom Exp $
++.TH curs_getyx 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -109,22 +109,23 @@
+ and
+ .IR x "."
+ .SH PORTABILITY
+-These macros are described in X/Open Curses,
+-Issue 4.
++These macros are described in X/Open Curses Issue\ 4.
+ .PP
+ .I \%ncurses
+ also provides functions
+-.BR \%getbegx ","
+-.BR \%getbegy ","
+-.BR \%getcurx ","
+-.BR \%getcury ","
+-.BR \%getmaxx ","
+-.BR \%getmaxy ","
+-.BR \%getparx ","
+-and
+-.B \%getpary
+-for compatibility with older versions of
+-.IR curses ";"
++.IR \%getbegy ","
++.IR \%getbegx ","
++.IR \%getcury ","
++.IR \%getcurx ","
++.IR \%getmaxy ","
++.IR \%getmaxx ","
++.IR \%getpary ","
++and
++.I \%getparx
++for compatibility with System\ V
++.I curses
++that were not standardized;
++.\" even by SVID 4
+ see \fB\%curs_legacy\fP(3X).
+ .PP
+ Although X/Open Curses does not address the issue,
+@@ -140,20 +141,33 @@
+ .PP
+ Besides the problem of opaque structures,
+ the data stored in like-named members may not have values of the same
+-meaning different implementations.
++meaning across different implementations.
+ For example,
+ the values of
+-.B \%WINDOW._maxx
++.I \%WINDOW._maxx
+ and
+-.B \%WINDOW._maxy
++.I \%WINDOW._maxy
+ in
+ .I \%ncurses
+ have long
+ .\" (at least since its initial release, 1.8.1)
+ differed by one from some other implementations.
+ The
+-.B \%getmaxyx
++.I \%getmaxyx
+ macro hides this difference.
++.SH HISTORY
++4BSD (1980)
++.I curses
++introduced
++.IR \%getyx "."
++.PP
++SVr3 (1987)
++added
++.I \%getbegyx
++and
++.IR \%getmaxyx "."
++SVr3.1 later that year supplied
++.IR \%getparyx "."
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_legacy\fP(3X),
+Index: man/curs_in_wch.3x
+Prereq:  1.37 
+--- ncurses-6.5-20250111+/man/curs_in_wch.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_in_wch.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2002-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_in_wch.3x,v 1.37 2024/12/28 21:26:21 tom Exp $
+-.TH curs_in_wch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_in_wch.3x,v 1.42 2025/01/19 00:49:39 tom Exp $
++.TH curs_in_wch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -101,14 +101,13 @@
+ .I wch
+ parameter instead of the return value.
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+ .SH HISTORY
+-These functions were initially specified by X/Open Curses,
+-Issue 4.
+-The System\ V Interface Definition,
+-Version 4 (1995),
++These functions were initially specified by X/Open Curses Issue\ 4
++(1995).
++The System\ V Interface Definition Version\ 4
++of the same year
+ specified a function named
+ .I \%winwch
+ (and the usual variants).
+Index: man/curs_in_wchstr.3x
+Prereq:  1.41 
+--- ncurses-6.5-20250111+/man/curs_in_wchstr.3x	2024-05-25 20:10:58.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_in_wchstr.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_in_wchstr.3x,v 1.41 2024/05/25 20:10:58 tom Exp $
+-.TH curs_in_wchstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_in_wchstr.3x,v 1.46 2025/01/19 00:49:39 tom Exp $
++.TH curs_in_wchstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -79,8 +79,9 @@
+ Transfer stops at the end of the current line, or when \fIn\fP characters have
+ been stored at the location referenced by \fIwchstr\fP.
+ .PP
+-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
++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 \fIwchstr\fP [see \fBgetcchar\fP(3X)].
+ .SH RETURN VALUE
+ Upon successful completion, these functions return
+@@ -88,8 +89,8 @@
+ Otherwise, they return
+ \fBERR\fP.
+ .PP
+-X/Open Curses defines no error conditions.
+-This implementation returns
++.I \%ncurses
++returns
+ .B ERR
+ .bP
+ if the \fIwin\fP parameter is null or
+@@ -102,7 +103,9 @@
+ .IR x )
+ is outside the window boundaries.
+ .SH NOTES
+-All routines except \fBwin_wchnstr\fP may be macros.
++All of these functions except
++.B \%win_wchnstr
++may be implemented as macros.
+ .PP
+ Reading a line that overflows the array pointed to by
+ \fIwchstr\fP
+@@ -120,9 +123,26 @@
+ \fBwin_wchnstr\fP
+ is recommended.
+ .SH PORTABILITY
+-X/Open Curses defines no error conditions.
+-This implementation checks for null pointers,
+-returning \fBERR\fP in that case.
++X/Open Curses Issue\ 4 describes these functions.
++It specifies no error conditions for them.
++.SH HISTORY
++These functions were initially specified by X/Open Curses Issue\ 4
++(1995).
++The System\ V Interface Definition Version\ 4
++of the same year
++specified a function named
++.I \%winwchstr
++(and the usual variants).
++.\" SVID 4, vol 3., p. 515
++This was a later addition to
++.RI SVr4. x ,
++not appearing in the first SVr4 (1989).
++It differed from X/Open's later
++.I \%win_wchstr
++in that it took an argument of type
++.RI pointer-to- chtype
++instead of
++.RI pointer-to cchar_t .
+ .SH SEE ALSO
+ \fB\%curs_inchstr\fP(3X) describes comparable functions of the
+ .I \%ncurses
+Index: man/curs_inch.3x
+Prereq:  1.64 
+--- ncurses-6.5-20250111+/man/curs_inch.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_inch.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inch.3x,v 1.64 2024/12/28 21:26:21 tom Exp $
+-.TH curs_inch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inch.3x,v 1.68 2025/01/19 00:49:39 tom Exp $
++.TH curs_inch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -110,8 +110,7 @@
+ They instead extract only the low-order eight bits of the character code
+ from the cell.
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+ .SH HISTORY
+ The original
+Index: man/curs_inchstr.3x
+Prereq:  1.49 
+--- ncurses-6.5-20250111+/man/curs_inchstr.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_inchstr.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inchstr.3x,v 1.49 2024/12/28 21:26:21 tom Exp $
+-.TH curs_inchstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inchstr.3x,v 1.56 2025/01/19 00:49:39 tom Exp $
++.TH curs_inchstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -81,8 +81,9 @@
+ Transfer stops at the end of the current line, or when \fIn\fP characters have
+ been stored at the location referenced by \fIchstr\fP.
+ .PP
+-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
++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\fP [see \fBcurs_inch\fP(3X)].
+ .SH RETURN VALUE
+ All routines return the integer \fBERR\fP upon failure and an integer value
+@@ -103,12 +104,9 @@
+ .IR x )
+ is outside the window boundaries.
+ .SH NOTES
+-All routines except \fBwinchnstr\fP may be macros.
+-.PP
+-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
+-document the meaning of the return value.
++All of these functions except
++.B \%winchnstr
++may be implemented as macros.
+ .PP
+ Reading a line that overflows the array pointed to by
+ \fIchstr\fP
+@@ -126,11 +124,27 @@
+ \fBwinchnstr\fP
+ is recommended.
+ .SH PORTABILITY
+-These functions are described in X/Open Curses, Issue 4.
+-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\fP.
++X/Open Curses Issue\ 4 describes these functions.
++It specifies no error conditions for them.
++It characterizes the strings stored by these functions as containing
++\*(``at most
++.I n
++elements\*('' from a window,
++.\" X/Open Issue 4, Version 2, p. 113, PDF p. 133
++.\" Issue 7 doesn't change this wording at all.
++but does not specify whether the string stored by these functions is
++null-terminated.
++.PP
++SVr4 does not document whether it null-terminates the string it stores
++in
++.IR chstr ","
++and does not document whether a trailing null chracter counts toward the
++length limit
++.IR n "."
++.PP
++SVr4 describes a successful return value only as
++\*(``an integer value other than
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 503
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_inch\fP(3X),
+Index: man/curs_initscr.3x
+Prereq:  1.81 
+--- ncurses-6.5-20250111+/man/curs_initscr.3x	2024-12-28 21:18:35.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_initscr.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_initscr.3x,v 1.81 2024/12/28 21:18:35 tom Exp $
+-.TH curs_initscr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_initscr.3x,v 1.86 2025/01/19 00:49:39 tom Exp $
++.TH curs_initscr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -321,8 +321,7 @@
+ .B \%set_term
+ does not fail.
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+ .SS Differences
+ X/Open Curses specifies that portable applications must not
+@@ -393,7 +392,7 @@
+ \fB\%def_shell_mode\fP(3X),
+ \fB\%def_prog_mode\fP(3X).
+ SVr4 curses uses the descriptor in \fISCREEN\fP.
+-.SS "Unset \f(BITERM\fP Variable"
++.SS "Unset \fITERM\fP Variable"
+ If the \fITERM\fP variable is missing or empty, \fB\%initscr\fP uses the
+ value \*(``unknown\*('',
+ which normally corresponds to a terminal entry with the
+@@ -405,7 +404,7 @@
+ Other implementations may handle
+ a missing/empty \fITERM\fP variable differently.
+ .SS "Signal Handlers"
+-Quoting from X/Open Curses Issue 7, section 3.1.1:
++Quoting from X/Open Curses Issue\ 7, section 3.1.1:
+ .RS 5
+ .PP
+ Curses implementations may provide for special handling of the
+Index: man/curs_inopts.3x
+Prereq:  1.82 
+--- ncurses-6.5-20250111+/man/curs_inopts.3x	2024-12-28 21:27:26.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_inopts.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inopts.3x,v 1.82 2024/12/28 21:27:26 tom Exp $
+-.TH curs_inopts 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inopts.3x,v 1.89 2025/01/19 00:49:39 tom Exp $
++.TH curs_inopts 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -213,7 +213,7 @@
+ However,
+ after blocking for
+ .I tenths
+-tenths of seconds,
++tenth-seconds,
+ an input character reading function returns
+ .B ERR
+ if no input is pending.
+@@ -386,9 +386,9 @@
+ below for a mitigation of this problem.
+ You may want to call
+ .B \%noqiflush
+-in a signal handler
+-if you want output to continue
+-after the handler exits
++in a signal handler if,
++after the handler exits,
++you want output to continue
+ as though the interrupt had not occurred.
+ .\"
+ .SS "raw, noraw"
+@@ -511,12 +511,18 @@
+ .B ERR
+ if
+ .bP
+-the terminal is not initialized or
++the library's
++.I \%TERMINAL
++structure for the device has not been initialized with
++\fB\%initscr\fP(3X),
++\fB\%newterm\fP(3X),
++or
++\fB\%setupterm\fP(3X),
++or
+ .bP
+ .I win
+-is
+-.I NULL
+-(except for
++is a null pointer
++(except with
+ .B \%intrflush
+ and
+ .BR meta ","
+@@ -597,11 +603,13 @@
+ if the option is set,
+ .TP
+ .B 0
+-if the option is reset,
++if the option is unset,
+ or
+ .TP
+ .B \-1
+-if the library is not initialized.
++if the library's
++.I \%TERMINAL
++structure for the device has not been initialized.
+ .SH PORTABILITY
+ Applications employing
+ .I \%ncurses
+@@ -610,15 +618,16 @@
+ preprocessor macro.
+ .PP
+ Except as noted in section \*(``EXTENSIONS\*('' above,
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+ .PP
+-SVr4
+-.I curses
+-describes a successful return value only as
++SVr4 describes a successful return value only as
+ \*(``an integer value other than
+-.BR ERR \*(''.
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 508
++.\" It continues "unless otherwise noted in the preceding routine
++.\" descriptions", but no notes otherwise are present; the man page
++.\" discusses getch()'s return value repeatedly, but never those of the
++.\" functions the page ostensibly documents.
+ .PP
+ .I \%ncurses
+ follows X/Open Curses
+Index: man/curs_ins_wch.3x
+Prereq:  1.36 
+--- ncurses-6.5-20250111+/man/curs_ins_wch.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_ins_wch.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2002-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_ins_wch.3x,v 1.36 2024/12/28 21:26:21 tom Exp $
+-.TH curs_ins_wch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_ins_wch.3x,v 1.43 2025/01/19 00:49:39 tom Exp $
++.TH curs_ins_wch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -93,16 +93,13 @@
+ capability
+ is not necessarily employed.
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions.
+-.PP
+-SVr4 describes successful return values only as
+-\*(``an integer value other than \fBERR\fP\*(''.
++X/Open Curses Issue\ 4 describes these functions.
++It specifies no error conditions for them.
+ .SH HISTORY
+-These functions were initially specified by X/Open Curses,
+-Issue 4.
+-The System\ V Interface Definition,
+-Version 4 (1995),
++These functions were initially specified by X/Open Curses Issue\ 4
++(1995).
++The System\ V Interface Definition Version\ 4
++of the same year
+ specified a function named
+ .I \%winswch
+ (and the usual variants).
+Index: man/curs_ins_wstr.3x
+Prereq:  1.48 
+--- ncurses-6.5-20250111+/man/curs_ins_wstr.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_ins_wstr.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_ins_wstr.3x,v 1.48 2024/12/28 21:26:21 tom Exp $
+-.TH curs_ins_wstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_ins_wstr.3x,v 1.56 2025/01/19 00:49:39 tom Exp $
++.TH curs_ins_wstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -61,12 +61,14 @@
+ \fBint ins_wstr(const wchar_t * \fIwstr\fP);
+ \fBint wins_wstr(WINDOW * \fIwin\fP, const wchar_t * \fIwstr\fP);
+ \fBint mvins_wstr(int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP);
+-\fBint mvwins_wstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP);
++\fBint mvwins_wstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP,
++      const wchar_t * \fIwstr\fP);
+ .PP
+ \fBint ins_nwstr(const wchar_t * \fIwstr\fP, int \fIn\fP);
+ \fBint wins_nwstr(WINDOW * \fIwin\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
+ \fBint mvins_nwstr(int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
+-\fBint mvwins_nwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const wchar_t * \fIwstr\fP, int \fIn\fP);
++\fBint mvwins_nwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP,
++      const wchar_t * \fIwstr\fP, int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
+ .B \%wins_wstr
+@@ -89,7 +91,7 @@
+ .IR wstr "."
+ The cursor position does not change
+ (after moving to
+-.RI ( y ","
++.RI ( y ,
+ .IR x "),"
+ if specified).
+ .B \%wins_nwstr
+@@ -101,8 +103,7 @@
+ (up to the end of the line)
+ if
+ .I n
+-is
+-.BR \-1 "."
++is negative.
+ \fB\%ncurses\fP(3X) describes the variants of these functions.
+ .SH RETURN VALUE
+ These functions return
+@@ -142,33 +143,48 @@
+ All of these functions except
+ .B \%wins_nwstr
+ may be implemented as macros.
++.SH EXTENSIONS
++.BR \%ins_nwstr ","
++.BR \%wins_nwstr ","
++.BR \%mvins_nwstr ","
++and
++.BR \%mvwins_nwstr "'s"
++acceptance of negative
++.I n
++values is an
++.I \%ncurses
++extension.
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions.
++Applications employing
++.I \%ncurses
++extensions should condition their use on the visibility of the
++.B \%NCURSES_VERSION
++preprocessor macro.
++.PP
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+ .PP
+ X/Open Curses does not specify what happens
+ if a non-spacing character follows a control character.
+ .PP
+-Issue 4 states that the entire string is inserted if
++Issue\ 4 states that the entire string is inserted if
+ .I n
+ is less than 1.
+ This is probably an error,
+ .\" ...copied from SVID 4, which made the same error; see p. 513.
+ because it is inconsistent with other functions
+-such as \fB\%waddwstr\fP(3X),
++such as
++.IR \%waddwstr ","
+ and differs from the SVr4
+ .I curses
+ and Solaris
+ .I xcurses
+ implementations.
+ Nevertheless,
+-Issue 7 retains the language.
++Issue\ 7 retains the language.
+ .SH HISTORY
+-These functions were initially specified by X/Open Curses,
+-Issue 4.
+-The System\ V Interface Definition,
+-Version 4 (1995),
++These functions were initially specified by X/Open Curses Issue 4.
++The System\ V Interface Definition Version\ 4 (1995),
+ specified functions named
+ .I \%winswstr
+ and
+Index: man/curs_insch.3x
+Prereq:  1.44 
+--- ncurses-6.5-20250111+/man/curs_insch.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_insch.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_insch.3x,v 1.44 2024/12/28 21:26:21 tom Exp $
+-.TH curs_insch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_insch.3x,v 1.49 2025/01/19 00:49:39 tom Exp $
++.TH curs_insch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -97,14 +97,11 @@
+ capability
+ is not necessarily employed.
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ .PP
+-SVr4
+-.I curses
+-describes a successful return value only as
++SVr4 describes a successful return value only as
+ \*(``an integer value other than
+-.BR ERR \*(''.
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 509
+ .SH HISTORY
+ SVr2 (1984) introduced
+ .IR \%winsch "."
+Index: man/curs_insstr.3x
+Prereq:  1.59 
+--- ncurses-6.5-20250111+/man/curs_insstr.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_insstr.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_insstr.3x,v 1.59 2024/12/28 21:26:21 tom Exp $
+-.TH curs_insstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_insstr.3x,v 1.68 2025/01/19 00:49:39 tom Exp $
++.TH curs_insstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -66,7 +66,8 @@
+ \fBint insnstr(const char * \fIstr\fP, int \fIn\fP);
+ \fBint winsnstr(WINDOW * \fIwin\fP, const char * \fIstr\fP, int \fIn\fP);
+ \fBint mvinsnstr(int \fIy\fP, int \fIx\fP, const char * \fIstr\fP, int \fIn\fP);
+-\fBint mvwinsnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const char * \fIstr\fP, int \fIn\fP);
++\fBint mvwinsnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const char * \fIstr\fP,
++      int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
+ .B \%winsstr
+@@ -89,7 +90,7 @@
+ .IR str "."
+ The cursor position does not change
+ (after moving to
+-.RI ( y ","
++.RI ( y ,
+ .IR x "),"
+ if specified).
+ .B \%insnstr
+@@ -101,8 +102,7 @@
+ (up to the end of the line)
+ if
+ .I n
+-is
+-.BR \-1 "."
++is negative.
+ \fB\%ncurses\fP(3X) describes the variants of these functions.
+ .SH RETURN VALUE
+ These functions return
+@@ -138,15 +138,35 @@
+ All of these functions except
+ .B \%winsnstr
+ may be implemented as macros.
++.SH EXTENSIONS
++.BR \%insnstr ","
++.BR \%winsnstr ","
++.BR \%mvinsnstr ","
++and
++.BR \%mvwinsnstr "'s"
++acceptance of negative
++.I n
++values is an
++.I \%ncurses
++extension.
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions.
++Applications employing
++.I \%ncurses
++extensions should condition their use on the visibility of the
++.B \%NCURSES_VERSION
++preprocessor macro.
++.PP
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+ .PP
+-Issue 4 distinguished
+-.B \%insnstr
++SVr4 describes a successful return value only as
++\*(``an integer value other than
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 510
++.PP
++Issue\ 4 distinguished
++.I \%insnstr
+ and
+-.B \%winsnstr
++.I \%winsnstr
+ from the other functions documented above
+ by stating they \*(``do not perform wrapping\*(''.
+ This was probably an error,
+@@ -154,22 +174,23 @@
+ No implementation of
+ .I curses
+ documents this inconsistency,
+-and Issue 7 removed it.
++and Issue\ 7 removed it.
+ .PP
+-Issue 4 states that the entire string is inserted if
++Issue\ 4 states that the entire string is inserted if
+ .I n
+ is less than 1.
+ This is probably an error,
+ .\" ...copied from SVID 4, which made the same error; see p. 510.
+ because it is inconsistent with other functions
+-such as \fB\%waddstr\fP(3X),
++such as
++.IR \%waddstr ","
+ and differs from the SVr4
+ .I curses
+ and Solaris
+ .I xcurses
+ implementations.
+ Nevertheless,
+-Issue 7 retains the language.
++Issue\ 7 retains the language.
+ .SH HISTORY
+ SVr3.1 (1987)
+ introduced
+Index: man/curs_instr.3x
+Prereq:  1.61 
+--- ncurses-6.5-20250111+/man/curs_instr.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_instr.3x	2025-01-19 00:49:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_instr.3x,v 1.61 2024/12/28 21:26:21 tom Exp $
+-.TH curs_instr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_instr.3x,v 1.68 2025/01/19 00:49:39 tom Exp $
++.TH curs_instr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -66,7 +66,8 @@
+ \fBint innstr(char * \fIstr\fP, int \fIn\fP);
+ \fBint winnstr(WINDOW * \fIwin\fP, char * \fIstr\fP, int \fIn\fP);
+ \fBint mvinnstr(int \fIy\fP, int \fIx\fP, char * \fIstr\fP, int \fIn\fP);
+-\fBint mvwinnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, char * \fIstr\fP, int \fIn\fP);
++\fBint mvwinnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, char * \fIstr\fP,
++      int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
+ .B \%winstr
+@@ -89,10 +90,8 @@
+ .I n
+ characters from
+ .IR win "."
+-An
++A negative
+ .I n
+-of
+-.B \-1
+ implies no limit;
+ .B \%winnstr
+ then works like
+@@ -154,11 +153,9 @@
+ .BR \%mvinnstr ","
+ and
+ .BR \%mvwinnstr "'s"
+-treatment of
+-.B \-1
+-as a valid value of
++acceptance of negative
+ .I n
+-is an
++values is an
+ .I \%ncurses
+ extension.
+ .SH PORTABILITY
+@@ -168,8 +165,7 @@
+ .B \%NCURSES_VERSION
+ preprocessor macro.
+ .PP
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+ .PP
+ X/Open Curses Issues 4 and 7 both state that
+@@ -199,11 +195,10 @@
+ .I curses
+ behavior.
+ .PP
+-SVr4 documents no return values apart from
+-.B OK
+-and
+-.B ERR
+-for any of these functions.
++SVr4 describes a successful return value only as
++\*(``an integer value other than
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 503
++.PP
+ SVr4 does not
+ document whether
+ .I n
+Index: man/curs_inwstr.3x
+Prereq:  1.49 
+--- ncurses-6.5-20250111+/man/curs_inwstr.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_inwstr.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inwstr.3x,v 1.49 2024/12/28 21:26:21 tom Exp $
+-.TH curs_inwstr 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inwstr.3x,v 1.56 2025/01/19 00:51:10 tom Exp $
++.TH curs_inwstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -65,7 +65,8 @@
+ \fBint innwstr(wchar_t * \fIwstr\fP, int \fIn\fP);
+ \fBint winnwstr(WINDOW * \fIwin\fP, wchar_t * \fIwstr\fP, int \fIn\fP);
+ \fBint mvinnwstr(int \fIy\fP, int \fIx\fP, wchar_t * \fIwstr\fP, int \fIn\fP);
+-\fBint mvwinnwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t * \fIwstr\fP, int \fIn\fP);
++\fBint mvwinnwstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t * \fIwstr\fP,
++      int \fIn\fP);
+ .fi
+ .SH DESCRIPTION
+ .B \%winwstr
+@@ -88,10 +89,8 @@
+ .I n
+ wide characters from
+ .IR win "."
+-An
++A negative
+ .I n
+-of
+-.B \-1
+ implies no limit;
+ .B \%winnwstr
+ then works like
+@@ -168,11 +167,9 @@
+ .BR \%mvinnwstr ","
+ and
+ .BR \%mvwinnwstr "'s"
+-treatment of
+-.B \-1
+-as a valid value of
++acceptance of negative
+ .I n
+-is an
++values is an
+ .I \%ncurses
+ extension.
+ .SH PORTABILITY
+@@ -182,8 +179,7 @@
+ .B \%NCURSES_VERSION
+ preprocessor macro.
+ .PP
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+ .PP
+ Notwithstanding the foregoing,
+@@ -221,6 +217,28 @@
+ .BR \%mvwinstr "."
+ .I \%ncurses
+ regards this inconsistency as an error in the standard.
++.SH HISTORY
++The System\ V Interface Definition,
++Version 4 (1995),
++specified
++.I \%winwstr
++and
++.I \%winnwstr
++(and the usual variants).
++.\" SVID 4, vol 3., p. 516
++These were later additions to
++.RI SVr4. x ,
++not appearing in the first SVr4 (1989).
++Their synopses described each function as taking
++an argument of type
++.RI pointer-to- char
++instead of
++.RI pointer-to- wchar_t ,
++despite describing them as \*(``returning the string of
++.I \%wchar_t
++in
++.IR str "\*(''."
++Presumably this was an error in the System\ V Interface Definition.
+ .SH SEE ALSO
+ \fB\%curs_instr\fP(3X) describes comparable functions of the
+ .I \%ncurses
+Index: man/curs_kernel.3x
+Prereq:  1.72 
+--- ncurses-6.5-20250111+/man/curs_kernel.3x	2024-09-21 18:05:20.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_kernel.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_kernel.3x,v 1.72 2024/09/21 18:05:20 tom Exp $
+-.TH curs_kernel 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_kernel.3x,v 1.75 2025/01/19 00:51:10 tom Exp $
++.TH curs_kernel 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -365,6 +365,14 @@
+ .I \%curs_set
+ in section \*(``RETURN VALUE\*('' above.
+ .PP
++The System\ V Interface Definition,
++Version 4 (1995),
++specified all of these functions except
++.I \%curs_set
++as returning
++.IR OK "."
++.\" SVID 4, vol 3., p. 518
++.PP
+ Older SVr4 man pages warn that the return value of
+ .B \%curs_set
+ \*(``is currently incorrect\*(''.
+Index: man/curs_mouse.3x
+Prereq:  1.106 
+--- ncurses-6.5-20250111+/man/curs_mouse.3x	2024-12-28 21:27:26.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_mouse.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_mouse.3x,v 1.106 2024/12/28 21:27:26 tom Exp $
+-.TH curs_mouse 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_mouse.3x,v 1.117 2025/01/19 00:51:10 tom Exp $
++.TH curs_mouse 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -53,72 +53,120 @@
+ \fB\%wenclose\fP,
+ \fB\%mouse_trafo\fP,
+ \fB\%wmouse_trafo\fP,
+-\fB\%mouseinterval\fP \-
+-get mouse events in \fIcurses\fR
++\fB\%mouseinterval\fP,
++\fB\%mmask_t\fP,
++\fB\%MEVENT\fP \-
++get mouse events in \fIncurses\fR
+ .SH SYNOPSIS
+ .nf
+ \fB#include 
+ .PP
++\fI/* data types */
+ \fBtypedef unsigned long mmask_t;
+ .PP
+ \fBtypedef struct {
+-\fB    short id;         \fI/* ID to distinguish multiple devices */
+-\fB    int x, y, z;      \fI/* event coordinates */
+-\fB    mmask_t bstate;   \fI/* button state bits */
++\fB    short id;       \fI/* ID to distinguish multiple devices */
++\fB    int x, y, z;    \fI/* event coordinates */
++\fB    mmask_t bstate; \fI/* button state bits */
+ \fB} MEVENT;
+ .PP
++\fI/* functions */
+ \fBbool has_mouse(void);
+ .PP
+-\fBmmask_t mousemask(mmask_t \fInewmask\fP, mmask_t *\fIoldmask\fP);
++\fBmmask_t mousemask(mmask_t \fInew-mask\fP, mmask_t * \fIold-mask\fP);
+ .PP
+-\fBint getmouse(MEVENT *\fIevent\fP);
+-\fBint ungetmouse(MEVENT *\fIevent\fP);
++\fBint getmouse(MEVENT * \fIevent\fP);
++\fBint ungetmouse(MEVENT * \fIevent\fP);
+ .PP
+-\fBbool wenclose(const WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP);
++\fBbool wenclose(const WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP);
+ .PP
+-\fBbool mouse_trafo(int* \fIpY\fP, int* \fIpX\fP, bool \fIto_screen\fP);
+-\fBbool wmouse_trafo(const WINDOW* \fIwin\fP,
+-.ti +18n \" "bool wmouse_trafo("
+-\fBint* \fIpY\fB, int* \fIpX\fB, bool \fIto_screen\fB);
++\fBbool mouse_trafo(int * \fIpY\fP, int * \fIpX\fP, bool \fIto-screen\fP);
++\fBbool wmouse_trafo(const WINDOW * \fIwin\fP,
++      \fBint * \fIpY\fB, int * \fIpX\fB, bool \fIto-screen\fB);
+ .PP
+ \fBint mouseinterval(int \fIerval\fB);\fR
+ .fi
+ .SH DESCRIPTION
+-These functions provide an interface to mouse events from
+-\fB\%ncurses\fP(3X).
+-Mouse events are represented by \fB\%KEY_MOUSE\fP
+-pseudo-key values in the \fB\%wgetch\fP(3X) input stream.
++.I \%ncurses
++provides an interface to the mouse or other pointing device.
++An application can register its interest in such events;
++the library then exposes the availability of a mouse event via an
++.IR "input character reading function" ":"
++this is \fB\%wgetch\fP(3X) in the non-wide character
++.I curses
++API and \fB\%wget_wch\fP(3X) in the wide character API.
++A queue distinct from that used for keyboard events
++accumulates the details of mouse events.
++The input character reading function
++reports the
++.B \%KEY_MOUSE
++key code when a mouse event is available for collection.
++A single mouse event queue serves all windows
++associated with the screen.
++.PP
++The
++.I \%MEVENT
++structure describes a mouse event.
++Its
++.I y
++and
++.I x
++coordinates are screen-,
++not window-,
++relative.
++The
++.I \%bstate
++member has exactly one bit set indicating the event type.
++.PP
++.I \%ncurses
++ignores mouse events when input is in canonical (\*(``cooked\*('') mode,
++and produces an error beep when canonical mode is simulated in a window
++by a function such as \fB\%getstr\fP(3X) that expects a linefeed to
++terminate its input loop.
+ .SS has_mouse
+-The \fB\%has_mouse\fP function returns \fBTRUE\fP if the mouse driver
+-has been successfully initialized,
+-and \fBFALSE\fP otherwise.
+-.PP
+-Mouse events are ignored when input is in canonical (\*(``cooked\*('')
+-mode, and cause an error beep when canonical mode is being simulated in
+-a window by a function such as \fB\%getstr\fP that expects a linefeed
+-for input-loop termination.
++The terminal type or operating system interface
++must support the encoding of mouse events.
++.B \%has_mouse
++returns
++.B TRUE
++if
++.IR \%ncurses 's
++mouse driver initialized successfully,
++and
++.B FALSE
++otherwise.
+ .SS mousemask
+-To make mouse events visible, use the \fB\%mousemask\fP function.
+-This sets the mouse events to be reported.
+-By default, no mouse events are reported.
++Use
++.B \%mousemask
++to select the varieties of mouse event your application wishes to
++receive.
++By default,
++.I \%ncurses
++reports no mouse events.
+ .bP
+-The function returns an updated copy of \fInewmask\fP
+-to indicate which of the specified mouse events can be reported.
++The function returns an updated copy of
++.I new-mask
++indicating 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
+-.RI non- NULL ","
+-this function fills the indicated location with the previous value of the
+-current screen's mouse event mask.
++If the screen is not initialized,
++or the terminal interface does report mouse events,
++.B \%mousemask
++returns 0.
++.bP
++If
++.I old-mask
++is not a null pointer,
++.B \%mousemask
++stores the previous value
++of the screen's mouse event mask there.
+ .PP
+-As a side effect, setting a zero mouse mask may turn off the mouse pointer;
++As a side effect,
++setting a zero mouse mask may turn off the mouse cursor;
+ setting a nonzero mask may turn it on.
+ Whether this happens is device-dependent.
+ .SS "Mouse Events"
+-Here are the mouse event type masks which may be defined:
++Several mouse event types may be selected;
++construct a mask by logically \*(``or\*(''-ing their values.
+ .PP
+ .TS
+ Lb Lb
+@@ -156,13 +204,13 @@
+ BUTTON5_TRIPLE_CLICKED	mouse button 5 triple clicked
+ _
+ BUTTON_SHIFT	T{
+-shift was down during button state change
++a shift key was down during button state change
+ T}
+ BUTTON_CTRL	T{
+-control was down during button state change
++a control key was down during button state change
+ T}
+ BUTTON_ALT	T{
+-alt was down during button state change
++an alt key was down during button state change
+ T}
+ ALL_MOUSE_EVENTS	report all button state changes
+ REPORT_MOUSE_POSITION	report mouse movement
+@@ -170,79 +218,150 @@
+ .TE
+ .SS getmouse
+ Once a class of mouse events has been made visible in a window,
+-calling the \fB\%wgetch\fP function on that window may return
+-\fB\%KEY_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
+-\fB\%getmouse\fP.
+-This function will return \fBOK\fP if a mouse event
+-is actually visible in the given window, \fBERR\fP otherwise.
+-When \fB\%getmouse\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
+-indicate the event type.
+-The corresponding data in the queue is marked invalid.
+-A subsequent call to \fB\%getmouse\fP will retrieve the next older
+-item from the queue.
++calling the input character reading function on that window may return
++.B \%KEY_MOUSE
++as an indicator that a mouse event is enqueued.
++To read the event data and pop the event off the queue,
++call
++.BR \%getmouse ","
++which returns
++.B OK
++if a mouse event is visible in the given window
++and
++.B ERR
++otherwise.
++When
++.B \%getmouse
++returns
++.BR OK ","
++it deposits data describing the mouse event in the
++.I event
++pointer you supply.
++A subsequent
++.B \%getmouse
++call retrieves the next older event from the queue.
+ .SS ungetmouse
+-The \fB\%ungetmouse\fP function behaves analogously to \fB\%ungetch\fP.
+-It pushes
+-a \fB\%KEY_MOUSE\fP event onto the input queue, and associates with that event
+-the given state data and screen-relative character-cell coordinates.
++.B \%ungetmouse
++behaves analogously to \fB\%ungetch\fP(3X).
++It pushes a
++.B \%KEY_MOUSE
++event onto the screen's input queue,
++and
++.I event
++onto the mouse event queue.
+ .SS wenclose
+-The \fB\%wenclose\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.
+-.PP
+-If the parameter is a pad,
+-\fB\%wenclose\fP uses the most recent screen coordinates used for
+-this pad in
+-\fB\%prefresh\fP(3X) or
+-\fB\%pnoutrefresh\fP(3X).
++.B \%wenclose
++returns
++.B TRUE
++if the pair of screen-relative coordinates
++.RI ( y ,
++.IR x ")"
++is enclosed by the given window
++.IR win ","
++and
++.B FALSE
++otherwise.
++If
++.I win
++is a pad,
++.B \%wenclose
++uses its most recent screen coordinates as specified in
++a \fB\%prefresh\fP(3X) or \fB\%pnoutrefresh\fP(3X) call.
++.PP
++.B \%wenclose
++is useful for determining what subset of the screen's windows
++encloses the location of a mouse event;
++it is otherwise independent of the
++.I \%ncurses
++mouse API.
+ .SS wmouse_trafo
+-The \fB\%wmouse_trafo\fP function transforms a given pair of coordinates
+-from \fB\%stdscr\fP-relative coordinates
+-to coordinates relative to the given window or vice versa.
+-The resulting \fB\%stdscr\fP-relative coordinates are not always
+-identical to screen coordinates due to the mechanism to reserve
+-lines on top or bottom of the screen for other purposes
+-(see the \fB\%ripoffline\fP(3X) and \fB\%slk_init\fP(3X) calls, for example).
+-.bP
+-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 \fB\%stdscr\fP-relative coordinates and returned
+-through the pointers.
+-If the conversion was successful, the function returns \fBTRUE\fP.
+-.IP
+-If one of the parameters was
+-.I NULL
+-or the location is
+-not inside the window, \fBFALSE\fP is returned.
+-.bP
+-If \fIto_screen\fP is
+-\fBFALSE\fP, the pointers \fIpY, pX\fP must reference
+-\fB\%stdscr\fP-relative coordinates.
+-They are converted to window-relative coordinates if the
+-window \fIwin\fP encloses this point.
+-In this case the function returns \fBTRUE\fP.
+-.IP
+-If one of the parameters is
+-.I NULL
+-or the point is not inside the
+-window, \fBFALSE\fP is returned.
+-.PP
+-The referenced coordinates
+-are only replaced by the converted coordinates if the transformation was
+-successful.
++.B \%wmouse_trafo
++transforms the given pair of coordinate pointers
++.RI ( pY ,
++.IR pX ")"
++from a
++.IR win -relative
++basis to a screen-relative one or
++.IR "vice versa" ","
++as
++.I to-screen
++is
++.B TRUE
++or
++.BR FALSE ","
++respectively.
++.BR \%stdscr -relative
++coordinates are not always identical to screen coordinates:
++.I curses
++supports reservation of screen lines at the top and/or bottom
++for other purposes;
++see \fB\%ripoffline\fP(3X) and \fB\%slk_init\fP(3X).
++.PP
++If
++.I to-screen is
++.B TRUE
++and the pointers
++.RI ( pY ,
++.IR pX ")"
++reference coordinates inside
++.IR win ","
++.I \%ncurses
++updates their values to
++.BR \%stdscr -relative
++coordinates and returns
++.BR TRUE "."
++If either
++.I pY
++or
++.I pX
++is a null pointer,
++or
++.RI ( pY ,
++.IR pX ")"
++is not inside
++.IR win ","
++.B \%wmouse_trafo
++returns
++.BR FALSE "."
++.PP
++If
++.I to-screen is
++.B FALSE
++and the pointers
++.RI ( pY ,
++.IR pX ")"
++reference coordinates inside
++.BR stdscr ","
++.I \%ncurses
++updates their values to
++.IR win -relative
++coordinates and returns
++.BR TRUE "."
++If either
++.I pY
++or
++.I pX
++is a null pointer,
++or
++.RI ( pY ,
++.IR pX ")"
++is not inside
++.BR stdscr ","
++.B \%wmouse_trafo
++returns
++.BR FALSE "."
+ .SS mouse_trafo
+-The \fB\%mouse_trafo\fP function performs the same translation
+-as \fB\%wmouse_trafo\fP,
+-using \fB\%stdscr\fP for \fIwin\fP.
++.B \%mouse_trafo
++applies the
++.B \%wmouse_trafo
++translation to
++.BR \%stdscr "."
++If no screen lines are reserved by \fB\%ripoffline\fP(3X) or
++\fB\%slk_init\fP(3X),
++this is the identity transformation.
+ .SS mouseinterval
+-The \fB\%mouseinterval\fP function sets the maximum time
++.B \%mouseinterval
++sets the maximum time
+ (in thousandths of a second)
+ that can elapse between press and release events for them to
+ be resolved as a
+@@ -253,7 +372,9 @@
+ with motion,
+ as a \*(``drag\*(''.
+ .PP
+-Calling \fB\%mouseinterval(0)\fP disables click resolution.
++Calling
++.B \%mouseinterval(0)
++disables click resolution.
+ When
+ .I \%ncurses
+ detects a mouse event,
+@@ -262,48 +383,65 @@
+ with the first event.
+ If the timeout expires without input activity
+ (which would happen with a zero interval),
+-then no click resolution will occur.
++then no click resolution occurs.
+ .PP
+ This function returns the previous interval value.
+-Use \fB\%mouseinterval(\-1)\fP to obtain the interval without altering it.
++Use
++.B \%mouseinterval(\-1)
++to obtain the interval without altering it.
+ .PP
+ The mouse interval is set to one sixth of a second
+ when the corresponding screen is initialized,
+ e.g., in \fBinitscr\fP(3X) or \fBsetupterm\fP(3X).
+ .SH RETURN VALUE
+-\fB\%has_mouse\fP,
+-\fB\%wenclose\fP,
+-\fB\%mouse_trafo\fP,
++.BR \%has_mouse ","
++.BR \%wenclose ","
++.BR \%mouse_trafo ","
+ and
+-\fB\%wmouse_trafo\fP
+-return \fBTRUE\fP or \fBFALSE\fP as noted above.
++.B \%wmouse_trafo
++return
++.B TRUE
++or
++.B FALSE
++as noted above.
+ .PP
+-\fB\%getmouse\fP and \fB\%ungetmouse\fP
+-return \fBERR\fP upon failure and \fBOK\fP upon success.
++.B \%getmouse
++and
++.B \%ungetmouse
++return
++.B ERR
++upon failure and
++.B OK
++upon success.
+ .PP
+-\fB\%getmouse\fP fails if:
++.B \%getmouse
++fails if:
+ .bP
+ no mouse driver was initialized,
+ .bP
+ the mask of reportable events is zero,
+ .bP
+ a mouse event was detected that does not match the mask,
++or
+ .bP
+-or if no more events remain in the queue.
++no more events remain in the queue.
+ .PP
+-\fB\%ungetmouse\fP returns
++.B \%ungetmouse
++returns
+ .B ERR
+ if the event queue is full.
+ .PP
+-\fB\%mousemask\fP
++.B \%mousemask
+ returns the mask of reportable events.
+ .PP
+-\fB\%mouseinterval\fP
++.B \%mouseinterval
+ returns the previous interval value, unless
+ the terminal was not initialized.
+ In that case, it returns the maximum interval value (166).
+ .SH NOTES
+-The order of the \fB\%MEVENT\fP structure members is not guaranteed.
++The order of the
++.B \%MEVENT
++structure members is not guaranteed.
+ Additional fields may be added to the structure in the future.
+ .PP
+ Under
+@@ -322,41 +460,66 @@
+ .RE
+ .PP
+ If you are using an unsupported configuration,
+-mouse events will not be visible to
+-\fI\%ncurses\fP (and the \fB\%mousemask\fP function will always
+-return \fB0\fP).
++mouse events are not visible to
++.I \%ncurses
++(and the
++.B \%mousemask
++function always returns
++.BR 0 ")."
+ .PP
+-If the
++If the terminal type possesses the (nonstandard)
+ .I \%term\%info
+-entry contains a \fBXM\fP string,
+-this is used in the
++string capability
++.BR XM ","
++.IR \%ncurses "'s"
+ .I \%xterm
+-mouse driver to control the
+-way the terminal is initialized for mouse operation.
+-The default, if \fBXM\fP is not found,
++mouse driver uses it when initializing the terminal for mouse operation.
++The default,
++if
++.B XM
++is not found,
+ corresponds to private mode 1000 of
+-.I \%xterm:
++.IR \%xterm "."
+ .PP
+ .RS 3
++.EX
+ \eE[?1000%?%p1%{1}%=%th%el%;
++.EE
+ .RE
+ .PP
+-The mouse driver also recognizes a newer
+-.I \%xterm
+-private mode 1006,
+-e.g.,
++.I \%ncurses
++also recognizes
++.IR \%xterm 's
++newer private mode 1006.
+ .PP
+ .RS 3
++.EX
+ \eE[?1006;1000%?%p1%{1}%=%th%el%;
++.EE
+ .RE
+ .PP
+-The \fIz\fP member in the event structure is not presently used.
++The
++.I id
++member of the mouse event structure is not presently used;
++no terminal type or operating system interface supports reporting events
++from distinguishable pointing devices.
++If you synthesize an
++.IR \%MEVENT ","
++use an
++.I id
++of 0.
++.PP
++The
++.I z
++member of the mouse event structure is not presently used.
+ It is intended
+ for use with touch screens (which may be pressure-sensitive) or with
+ 3D-mice/trackballs/power gloves.
+ .PP
+-The \fB\%ALL_MOUSE_EVENTS\fP class does not
+-include \fB\%REPORT_MOUSE_POSITION\fP.
++The
++.B \%ALL_MOUSE_EVENTS
++class does not include
++.BR \%REPORT_MOUSE_POSITION "."
+ They are distinct.
+ For example,
+ in
+@@ -364,19 +527,23 @@
+ wheel/scrolling mice send position reports as a sequence of
+ presses of buttons 4 or 5 without matching button-releases.
+ .SH EXTENSIONS
+-These functions were designed for
+-\fB\%ncurses\fP(3X),
++These functions are
++.I \%ncurses
++extensions,
+ and are not found in SVr4
+ .IR curses ,
+ 4.4BSD
+ .IR curses ,
+-or any other previous curses implementation.
++or any other previous
++.I curses
++implementation.
+ (SVr4
+ .I curses
+ did have a
+ .I \%getmouse
+ function,
+-which took no argument and returned a different type.)
++which took no argument and returned an
++.IR "unsigned long" ".)"
+ .SH PORTABILITY
+ Applications employing the
+ .I \%ncurses
+@@ -392,24 +559,23 @@
+ The following values may be specified.
+ .RS 3
+ .TP 3
+-1
++.B 1
+ has definitions for reserved events.
+ The mask uses 28 bits.
+ .TP 3
+-2
++.B 2
+ adds definitions for button 5,
+ removes the definitions for reserved events.
+ The mask uses 29 bits.
+ .RE
+-.PP
+-SVr4
+-.I curses
+-had support for the mouse in a variant of \fI\%xterm\fP(1).
++.SH HISTORY
++SVr4 (1989) added mouse support to its variant of \fI\%xterm\fP(1).
+ It is mentioned in a few places,
+ with little supporting documentation.
+ .bP
+ Its \*(``libcurses\*('' manual page lists functions for this feature
+-prototyped in \fI\%curses.h\fP.
++prototyped in
++.IR \%curses.h "."
+ .PP
+ .RS 8
+ .EX
+@@ -424,6 +590,7 @@
+ .RE
+ .bP
+ Its \*(``terminfo\*('' manual page lists capabilities for the feature.
++.PP
+ .\" These don't appear in in the SVID 4th edition, Volume 3,
+ .\" terminfo(TI_ENV) man page.  They can be found in, e.g., the "z/OS
+ .\" V1R1.0 C Curses" book, Chapter 17, pp. 179-186 (PDF 213-220).
+@@ -456,11 +623,17 @@
+ For instance,
+ the SVr4
+ .I curses
+-library used the \fB\%get_mouse\fP capability to tell the terminal which
++library used the
++.B \%get_mouse
++.RB ( getm )
++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 \fB\%req_mouse_pos\fP capability.
++where the mouse was using the
++.B \%req_mouse_pos
++.RB ( reqmp )
++capability.
+ .IP
+ Those features required a terminal program that had been modified
+ to work with SVr4
+@@ -489,7 +662,7 @@
+ are
+ .I not
+ ignored in canonical mode if they have been enabled by
+-\fB\%mousemask\fP.
++.BR \%mousemask "."
+ Instead,
+ the
+ .I \%xterm
+@@ -503,11 +676,16 @@
+ since they are encoded like function keys.
+ Set the terminal's
+ .I \%term\%info
+-capability \fB\%kmous\fP to \*(``\eE[M\*(''
++capability
++.B \%key_mouse
++.RB ( \%kmous )
++to \*(``\eE[M\*(''
+ (the beginning of the response from
+ .I \%xterm
+ for mouse clicks).
+-Other values of \fB\%kmous\fP are permitted under the same assumption,
++Other values of
++.B \%key_mouse
++are permitted under the same assumption,
+ that is,
+ the report begins with that sequence.
+ .PP
+@@ -516,11 +694,17 @@
+ .I \%xterm
+ mouse protocol,
+ .I \%ncurses
+-assumes that if \fB\%kmous\fP is defined in the terminal description,
++assumes that if
++.B \%key_mouse
++.RB ( \%kmous )
++is defined in the terminal description,
+ or if the terminal type's primary name or aliases contain the string
+ \%\*(``xterm\*('',
+ then the terminal may send mouse events.
+-The \fB\%kmous\fP capability is checked first,
++.I \%ncurses
++checks the
++.B \%kmous
++cap-code first,
+ allowing use of newer
+ .I \%xterm
+ mouse protocols,
+Index: man/curs_move.3x
+Prereq:  1.48 
+--- ncurses-6.5-20250111+/man/curs_move.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_move.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_move.3x,v 1.48 2024/12/28 21:26:21 tom Exp $
+-.TH curs_move 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_move.3x,v 1.54 2025/01/19 00:51:10 tom Exp $
++.TH curs_move 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -93,14 +93,12 @@
+ .B \%move
+ may be implemented as a macro.
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
++It specifies no error conditions for them.
+ .PP
+-SVr4
+-.I curses
+-describes a successful return value only as
++SVr4 describes a successful return value only as
+ \*(``an integer value other than
+-.BR ERR \*(''.
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 503
+ .SH HISTORY
+ 4BSD (1980)
+ .I curses
+Index: man/curs_opaque.3x
+Prereq:  1.45 
+--- ncurses-6.5-20250111+/man/curs_opaque.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_opaque.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2020-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2020-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2007-2014,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_opaque.3x,v 1.45 2024/12/28 21:26:21 tom Exp $
+-.TH curs_opaque 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_opaque.3x,v 1.48 2025/01/19 00:51:10 tom Exp $
++.TH curs_opaque 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -150,11 +150,24 @@
+ .SH NOTES
+ \fI\%ncurses\fP provides both a C function and a preprocessor macro for
+ each function documented in this page.
++.SH EXTENSIONS
++These functions originated with
++.IR \%ncurses "."
+ .SH PORTABILITY
+-These routines are specific to \fI\%ncurses\fP.
+-They were not supported on Version 7, BSD or System V implementations.
+-It is recommended that any code depending on \fI\%ncurses\fP extensions
+-be conditioned using \fB\%NCURSES_VERSION\fP.
++Applications employing
++.I \%ncurses
++extensions should condition their use on the visibility of the
++.B \%NCURSES_VERSION
++preprocessor macro.
++.PP
++NetBSD
++.I curses
++since 10.1 (2024) supports
++.IR \%wgetscr_reg "."
++It also implements
++.IR \%getscr_reg ","
++operating on
++.IR \%stdscr "."
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_inopts\fP(3X),
+Index: man/curs_outopts.3x
+Prereq:  1.71 
+--- ncurses-6.5-20250111+/man/curs_outopts.3x	2024-09-14 20:06:50.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_outopts.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_outopts.3x,v 1.71 2024/09/14 20:06:50 tom Exp $
+-.TH curs_outopts 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_outopts.3x,v 1.78 2025/01/19 00:51:10 tom Exp $
++.TH curs_outopts 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -167,18 +167,18 @@
+ if the scrolling region limits extend outside the
+ window boundaries.
+ .SH NOTES
+-Note that
+-\fBclearok\fP,
+-\fBleaveok\fP,
+-\fBscrollok\fP,
+-\fBidcok\fP, and
+-\fBsetscrreg\fP may be macros.
++.BR \%clearok ","
++.BR \%leaveok ","
++.BR \%scrollok ","
++.BR \%idcok ","
++and
++.B \%setscrreg
++may be implemented as macros.
+ .PP
+ The \fBimmedok\fP routine is useful for windows that are used as terminal
+ emulators.
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+ .PP
+ Some historic
+@@ -198,7 +198,7 @@
+ Early System\ V
+ .I curses
+ implementations specified that with
+-.B \%scrollok
++.I \%scrollok
+ enabled,
+ any window modification triggering a scroll
+ also forced a physical refresh.
+@@ -206,19 +206,42 @@
+ and
+ .I \%ncurses
+ avoids doing so to better optimize vertical motions upon a
+-\fB\%wrefresh\fP(3X).
++.IR \%wrefresh "."
+ .PP
+ X/Open Curses does not mention that the cursor should be
+ made invisible as a side-effect of
+-.BR \%leaveok .
++.IR \%leaveok "."
+ SVr4
+ .I curses
+ documentation notes this,
+ but the code neglects it.
+ Use \fB\%curs_set\fP(3X) to make the cursor invisible.
+ .SH HISTORY
++4BSD (1980)
++.I curses
++introduced
++.IR \%clearok ","
++.IR \%leaveok ","
++and
++.IR \%scrollok "."
++.PP
++SVr2 (1984) supplied
++.IR \%idlok ","
++.IR \%setscrreg ","
++and
++.IR \%wsetscrreg "."
++.PP
++SVr3.1 (1987) implemented
++.I \%idcok
++and
++.IR \%immedok "."
++.PP
+ .I \%ncurses
+-formerly treated \fBnl\fP(3X) and \fBnonl\fP(3X) as both input
++formerly treated
++.I nl
++and
++.I nonl
++as both input
+ .I and
+ output options,
+ but no longer;
+Index: man/curs_overlay.3x
+Prereq:  1.45 
+--- ncurses-6.5-20250111+/man/curs_overlay.3x	2024-05-25 20:10:58.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_overlay.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2020-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2020-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2013,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_overlay.3x,v 1.45 2024/05/25 20:10:58 tom Exp $
+-.TH curs_overlay 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_overlay.3x,v 1.55 2025/01/19 00:51:10 tom Exp $
++.TH curs_overlay 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -40,6 +40,10 @@
+ .el   .ds '' ""
+ .\}
+ .
++.de bP
++.ie n  .IP \(bu 4
++.el    .IP \(bu 2
++..
+ .SH NAME
+ \fB\%overlay\fP,
+ \fB\%overwrite\fP,
+@@ -74,25 +78,41 @@
+ then copying is non-destructive,
+ as in \fBoverlay\fP.
+ .SH RETURN VALUE
+-These 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.
++These functions return
++.B OK
++on success and
++.B ERR
++on failure.
+ .PP
+-X/Open defines no error conditions.
+-In this implementation,
+-\fBcopywin\fP,
+-\fBoverlay\fP and \fBoverwrite\fP return
++In
++.IR \%ncurses ,
++they return
+ .B ERR
+-if either of the window pointers are null, or
+-if some part of the window would be placed off-screen.
++if
++.bP
++either of the window pointers are null,
++or
++.bP
++any part of the window would be placed off-screen.
+ .SH NOTES
+-Note that \fBoverlay\fP and \fBoverwrite\fP may be macros.
++.B \%overlay
++and
++.B \%overwrite
++may be implemented as macros.
+ .SH PORTABILITY
+-These functions are described in X/Open Curses, Issue 4,
+-which adds \fI\%const\fP qualifiers to the arguments.
++X/Open Curses Issue\ 4 describes these functions.
++It specifies no error conditions for them.
++It adds
++.I \%const
++qualifiers to the arguments.
++. \" TODO: migrate to HISTORY section
+ It further specifies their behavior in the presence of characters
+ with multibyte renditions (not yet supported in this implementation).
++.\" XXX: stale?  ncurses is fine with multibyte characters now, no?
++.PP
++SVr4 describes a successful return value only as
++\*(``an integer value other than
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 522
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_pad\fP(3X),
+Index: man/curs_pad.3x
+Prereq:  1.69 
+--- ncurses-6.5-20250111+/man/curs_pad.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_pad.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_pad.3x,v 1.69 2024/12/28 21:26:21 tom Exp $
+-.TH curs_pad 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_pad.3x,v 1.79 2025/01/19 00:51:10 tom Exp $
++.TH curs_pad 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -173,9 +173,6 @@
+ .B ERR
+ upon failure and
+ .B OK
+-(SVr4 specifies only
+-\*(``an integer value other than
+-.BR ERR \*('')
+ upon successful completion.
+ .PP
+ Functions that return pointers return
+@@ -217,84 +214,163 @@
+ .RE
+ .SH NOTES
+ .B \%pechochar
+-may be a macro.
+-.SH PORTABILITY
+-BSD
+-.I curses
+-has no
+-.I pad
+-feature.
++may be implemented as a macro.
+ .PP
+-SVr2 \fIcurses\fP (1986) provided the \fB\%newpad\fP and related functions,
+-documenting them in a single line each.
+-SVr3 (1987) provided more extensive documentation.
+-.PP
+-The documentation does not explain the term \fIpad\fP.
+-However, the Apollo \fIAegis\fP workstation operating system
+-supported a graphical \fIpad\fP feature:
++.I curses
++documentation is traditionally averse to motivating the term
++\*(``pad\*(''.
++The Apollo Aegis workstation operating system
++.RI ( circa
++1981)
++supported a graphical pad feature.
+ .bP
+ These graphical pads could be much larger than the computer's display.
+ .bP
+-The read-only output from a command could be scrolled back to inspect,
++The read-only output from a command could be scrolled back to inspect
+ and select text from the pad.
+ .PP
+ The two uses may be related.
+-.PP
+-X/Open Curses, Issue 4 describes these functions,
+-without significant change from the SVr3 documentation.
++.SH PORTABILITY
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+-The behavior of \fB\%subpad\fP if the parent window is not
+-a pad is undocumented,
+-and is not checked by the vendor Unix implementations:
+-.bP
+-SVr4 \fIcurses\fP sets a flag in the \fI\%WINDOW\fP structure in
+-\fB\%newpad\fP which tells if the window is a \fIpad\fP.
++.PP
++SVr4 describes a successful return value only as
++\*(``an integer value other than
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 524
++.PP
++The behavior of
++.I \%subpad
++if the parent window is not a pad is undocumented,
++and is not checked by the vendor Unix implementations.
++.bP
++SVr4
++.IR curses 's
++.I \%newpad
++sets a flag in the
++.I \%WINDOW
++structure indicating that the window is a pad.
+ .IP
+-However, it uses this information only in
+-\fB\%waddch\fP (to decide if it should call \fB\%wrefresh\fP) and
+-\fB\%wscrl\fP (to avoid scrolling a pad),
+-and does not check in \fB\%wrefresh\fP to ensure that the pad
+-is refreshed properly.
+-.bP
+-Solaris \fI\%xcurses\fP checks whether a window is a pad in
+-\fB\%wnoutrefresh\fP,
+-returning \fBERR\fP in that case.
++However,
++it uses this information only in
++.I \%waddch
++(to decide if it should call
++.IR \%wrefresh ")"
++and
++.I \%wscrl
++(to avoid scrolling a pad);
++its
++.I \%wrefresh
++does not check it to ensure that a pad is properly updated.
++.bP
++Solaris
++.I \%xcurses
++checks whether a window is a pad in its
++.IR \%wnoutrefresh ","
++returning
++.I ERR
++in that case.
+ .IP
+ However,
+-it only sets the flag for subwindows if the parent window is a pad.
+-Its \fB\%newpad\fP function does not set this information.
+-Consequently, the check will never fail.
++it sets the flag on subwindows only if the parent window is a pad.
++Its
++.I \%newpad
++does not set this information.
++Consequently,
++the check never fails.
+ .IP
+-It makes no comparable check in \fB\%pnoutrefresh\fP,
+-though interestingly enough, a comment in the source code
+-states that the lack of a check was an MKS extension.
+-.bP
+-NetBSD 7 \fIcurses\fP
+-sets a flag in the \fI\%WINDOW\fP structure
+-for \fB\%newpad\fP and \fB\%subpad\fP,
+-using this to help with the distinction between \fB\%wnoutrefresh\fP
+-and \fB\%pnoutrefresh\fP.
++It makes no comparable check in
++.I \%pnoutrefresh
++\(em though interestingly enough,
++a comment in the source code states that the lack of a check
++was an MKS extension.
++.bP
++NetBSD\ 7
++.I curses
++sets a flag in the
++.I \%WINDOW
++structure for
++.I \%newpad
++and
++.IR \%subpad ","
++aiding itself to distinguish between
++.I \%wnoutrefresh
++and
++.IR \%pnoutrefresh "."
+ .IP
+ It does not check for the case where a subwindow is created in
+-a pad using \fB\%subwin\fP or \fB\%derwin\fP.
++a pad using
++.I \%subwin
++or
++.IR \%derwin "."
+ .IP
+-The \fB\%dupwin\fP function returns a regular window when duplicating a pad.
+-Likewise, \fB\%getwin\fP always returns a window, even if the saved
+-data was from a pad.
+-.PP
+-This implementation
+-.bP
+-sets a flag in the \fI\%WINDOW\fP structure
+-for \fB\%newpad\fP and \fB\%subpad\fP,
++Its
++.I \%dupwin
++returns a regular window when duplicating a pad.
++Likewise,
++its
++.I \%getwin
++always returns a window,
++even if the saved data was from a pad.
++.PP
++.IR \%ncurses ":"
++.bP
++sets a flag in the
++.I \%WINDOW
++structure for
++.I \%newpad
++and
++.IR \%subpad ","
+ .bP
+-allows a \fB\%subwin\fP or \fB\%derwin\fP call to succeed having a pad parent by
+-forcing the subwindow to be a pad,
++allows a
++.I \%subwin
++or
++.I \%derwin
++call to succeed having a pad parent
++by forcing the subwindow to be a pad,
+ .bP
+-checks in both \fB\%wnoutrefresh\fP and \fB\%pnoutrefresh\fP to ensure
+-that pads and windows are handled distinctly, and
++checks in both
++.I \%wnoutrefresh
++and
++.I \%pnoutrefresh
++to ensure that pads and windows are handled distinctly,
++and
+ .bP
+-ensures that \fB\%dupwin\fP and \fB\%getwin\fP treat
+-pads versus windows consistently.
++ensures that
++.I \%dupwin
++and
++.I \%getwin
++treat pads versus windows consistently.
++.SH HISTORY
++SVr2 (1984) introduced
++.IR \%newpad ","
++.IR \%prefresh ","
++and
++.IR \%pnoutrefresh ","
++documenting them in a single line each.
++.PP
++SVr3 (1987) added
++.I \%subpad
++and
++.IR \%pechochar ","
++and provided more extensive documentation.
++.PP
++The System\ V Interface Definition,
++Version 4 (1995),
++specified a function named
++.IR \%pechowchar "."
++This was a later addition to
++.RI SVr4. x ,
++not appearing in the first SVr4 (1989).
++It differs from X/Open's later
++.I \%pecho_wchar
++in that its
++.I wstr
++parameter was a
++.I \%chtype
++instead of a
++.IR \%wchar_t ","
++and was not
++.IR const "-qualified."
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_addch\fP(3X),
+Index: man/curs_printw.3x
+Prereq:  1.53 
+--- ncurses-6.5-20250111+/man/curs_printw.3x	2024-04-20 19:18:18.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_printw.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_printw.3x,v 1.53 2024/04/20 19:18:18 tom Exp $
+-.TH curs_printw 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_printw.3x,v 1.57 2025/01/19 00:51:10 tom Exp $
++.TH curs_printw 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -118,8 +118,7 @@
+ window,
+ consider using \fI\%swprintf\fP(3) and \fB\%waddwstr\fP(3X) or similar.
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+ .PP
+ .I \%ncurses
+@@ -128,18 +127,17 @@
+ However,
+ the latter is obsolete.
+ .bP
+-X/Open Curses,
+-Issue 4 Version 2 (1996),
++X/Open Curses Issue\ 4 Version\ 2 (1996),
+ marked \fB\%vwprintw\fP as requiring \fI\%varargs.h\fP and
+ \*(``TO BE WITHDRAWN\*('',
+ and specified \fB\%vw_printw\fP using the \fI\%stdarg.h\fP interface.
+ .bP
+-X/Open Curses, Issue 5, Draft 2
++X/Open Curses Issue\ 5, Draft 2
+ (December 2007) marked \fBvwprintw\fP (along with
+ \fBvwscanw\fP and the \fItermcap\fP interface) as withdrawn.
+ After incorporating review comments,
+ this became
+-X/Open Curses, Issue 7 (2009).
++X/Open Curses Issue\ 7 (2009).
+ .bP
+ .I \%ncurses
+ provides \fB\%vwprintw\fP,
+@@ -194,7 +192,7 @@
+ define the \fI\%va_list\fP type.
+ .\" either header declares "va_list", but only one can be used
+ .PP
+-X/Open Curses, Issue 4 (1995),
++X/Open Curses Issue\ 4 (1995),
+ defined \fB\%vw_printw\fP to replace \fB\%vwprintw\fP,
+ stating that its \fI\%va_list\fP type is defined in \fI\%stdarg.h\fP.
+ .SH SEE ALSO
+Index: man/curs_refresh.3x
+Prereq:  1.52 
+--- ncurses-6.5-20250111+/man/curs_refresh.3x	2024-09-14 20:06:50.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_refresh.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_refresh.3x,v 1.52 2024/09/14 20:06:50 tom Exp $
+-.TH curs_refresh 3X 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_refresh.3x,v 1.58 2025/01/19 00:51:10 tom Exp $
++.TH curs_refresh 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -129,9 +129,6 @@
+ The routine \fBredrawwin\fP touches the entire window.
+ .SH RETURN VALUE
+ These routines return the integer \fBERR\fP upon failure and \fBOK\fP
+-(SVr4 specifies only
+-\*(``an integer value other than \fBERR\fP\*('')
+-upon successful completion.
+ .PP
+ In this implementation
+ .RS 3
+@@ -149,11 +146,18 @@
+ .BR ERR "."
+ .RE
+ .SH NOTES
+-Note that \fBrefresh\fP and \fBredrawwin\fP may be macros.
++.B \%refresh
++and
++.B \%redrawwin
++may be implemented as macros.
+ .SH PORTABILITY
+-X/Open Curses, Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+ .PP
++SVr4 describes a successful return value only as
++\*(``an integer value other than
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 527
++.PP
+ 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).
+Index: man/curs_scanw.3x
+Prereq:  1.53 
+--- ncurses-6.5-20250111+/man/curs_scanw.3x	2024-04-20 19:18:18.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_scanw.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_scanw.3x,v 1.53 2024/04/20 19:18:18 tom Exp $
+-.TH curs_scanw 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_scanw.3x,v 1.57 2025/01/19 00:51:10 tom Exp $
++.TH curs_scanw 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -126,8 +126,7 @@
+ implements \fI\%vsscanf\fP(3) internally if it is unavailable when the
+ library is configured.
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+ .PP
+ .I \%ncurses
+@@ -136,19 +135,17 @@
+ However,
+ the latter is obsolete.
+ .bP
+-X/Open Curses,
+-Issue 4 Version 2 (1996),
++X/Open Curses Issue\ 4 Version\ 2 (1996),
+ marked \fB\%vwscanw\fP as requiring \fI\%varargs.h\fP and
+ \*(``TO BE WITHDRAWN\*('',
+ and specified \fB\%vw_scanw\fP using the \fI\%stdarg.h\fP interface.
+ .bP
+-X/Open Curses,
+-Issue 5,
++X/Open Curses Issue\ 5,
+ Draft 2 (December 2007) marked \fB\%vwscanw\fP (along with
+ \fB\%vwscanw\fP and the \fItermcap\fP interface) as withdrawn.
+ After incorporating review comments,
+ this became
+-X/Open Curses, Issue 7 (2009).
++X/Open Curses Issue\ 7 (2009).
+ .bP
+ .I \%ncurses
+ provides \fB\%vwscanw\fP,
+@@ -244,7 +241,7 @@
+ define the \fI\%va_list\fP type.
+ .\" either header declares "va_list", but only one can be used
+ .PP
+-X/Open Curses, Issue 4 (1995),
++X/Open Curses Issue\ 4 (1995),
+ defined \fI\%vw_scanw\fP to replace \fI\%vwscanw\fP,
+ stating that its \fI\%va_list\fP type is defined in \fI\%stdarg.h\fP.
+ .SH SEE ALSO
+Index: man/curs_scr_dump.3x
+Prereq:  1.51 
+--- ncurses-6.5-20250111+/man/curs_scr_dump.3x	2024-12-28 21:19:39.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_scr_dump.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_scr_dump.3x,v 1.51 2024/12/28 21:19:39 tom Exp $
+-.TH curs_scr_dump 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_scr_dump.3x,v 1.55 2025/01/19 00:51:10 tom Exp $
++.TH curs_scr_dump 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -186,8 +186,7 @@
+ .B \%scr_set
+ may be implemented as macros.
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+ .\" Unusually, SVID 4 explicitly indicated "OK" as a possible return
+ .\" value, rather than the "integer other than ERR" refrain (p. 529).
+Index: man/curs_scroll.3x
+Prereq:  1.49 
+--- ncurses-6.5-20250111+/man/curs_scroll.3x	2024-09-22 14:08:11.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_scroll.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_scroll.3x,v 1.49 2024/09/22 14:08:11 tom Exp $
+-.TH curs_scroll 3X 2024-09-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_scroll.3x,v 1.55 2025/01/19 00:51:10 tom Exp $
++.TH curs_scroll 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -138,14 +138,12 @@
+ .I \%WINDOW
+ pointer argument.
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions.
+-It defines no error conditions.
++X/Open Curses Issue\ 4 describes these functions.
++It specifies no error conditions for them.
+ .PP
+-SVr4 specifies only
++SVr4 describes a successful return value only as
+ \*(``an integer value other than
+-.BR ERR \*(''
+-as a successful return value.
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 531
+ .PP
+ SVr4 indicates that the optimization of physically scrolling immediately
+ if the scroll region is the entire screen \*(``is\*('' performed,
+Index: man/curs_slk.3x
+Prereq:  1.78 
+--- ncurses-6.5-20250111+/man/curs_slk.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_slk.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_slk.3x,v 1.78 2024/12/28 21:26:21 tom Exp $
+-.TH curs_slk 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_slk.3x,v 1.85 2025/01/19 00:51:10 tom Exp $
++.TH curs_slk 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -213,15 +213,14 @@
+ \fB\%extended_slk_color\fP,
+ which accepts an \fIint\fP value of at least 32 bits.
+ .SH RETURN VALUE
+-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
+-X/Open Curses defines no error conditions.
++Functions that return integers return
++.B ERR
++upon failure and
++.B OK
++upon success.
+ .PP
+-In this implementation
++In
++.IR \%ncurses ","
+ .RS 3
+ .TP 5
+ \fBslk_attr\fP
+@@ -271,12 +270,15 @@
+ Most applications would use \fB\%slk_noutrefresh\fP because a
+ \fB\%wrefresh\fP is likely to follow soon.
+ .SH EXTENSIONS
+-X/Open Curses documents the \fIopts\fP argument
+-as reserved for future use,
+-saying that it must be null.
+-This implementation
+-uses that parameter in ABI 6 for the functions which have a color pair
+-parameter to support extended color pairs.
++X/Open Curses documents the
++.I opts
++argument as reserved for future use,
++saying that it must be a null pointer.
++The
++.IR \%ncurses\  6
++ABI uses it
++for the functions that accept a color pair parameter
++to support extended color pairs.
+ .PP
+ For functions which modify the color,
+ e.g.,
+@@ -285,9 +287,12 @@
+ and used to set the color pair instead of the \fIshort\fP pair
+ parameter.
+ .SH PORTABILITY
+-X/Open Curses,
+-Issue 4 describes these functions,
+-with some differences from SVr4 \fIcurses\fP:
++X/Open Curses Issue\ 4 describes these functions.
++It specifies no error conditions for them.
++.PP
++SVr4 describes a successful return value only as
++\*(``an integer value other than
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 533
+ .bP
+ X/Open added functions like the SVr4 attribute-manipulation functions
+ \fB\%slk_attron\fP,
+Index: man/curs_sp_funcs.3x
+Prereq:  1.51 
+--- ncurses-6.5-20250111+/man/curs_sp_funcs.3x	2024-05-11 20:39:53.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_sp_funcs.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2010-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_sp_funcs.3x,v 1.51 2024/05/11 20:39:53 tom Exp $
+-.TH curs_sp_funcs 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_sp_funcs.3x,v 1.54 2025/01/19 00:51:10 tom Exp $
++.TH curs_sp_funcs 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -110,7 +110,7 @@
+ \fBint napms_sp(SCREEN* \fIsp\fP, int \fIms\fP);
+ \fBWINDOW* newpad_sp(SCREEN* \fIsp\fP, int \fInrows\fP, int \fIncols\fP);
+ \fBSCREEN* new_prescr(void);
+-\fBSCREEN* newterm_sp(SCREEN* \fIsp\fP, const char *\fItype\fP, FILE *\fIoutfd\fP, FILE *\fIinfd\fP);
++\fBSCREEN* newterm_sp(SCREEN* \fIsp\fP, const char *\fItype\fP, FILE *\fIoutf\fP, FILE *\fIinfd\fP);
+ .PP
+ \fBWINDOW* newwin_sp(SCREEN* \fIsp\fP, int \fInlines\fP, int \fIncols\fP, int \fIbegin_y\fP, int \fIbegin_x\fP);
+ \fBint nl_sp(SCREEN* \fIsp\fP);
+Index: man/curs_termattrs.3x
+Prereq:  1.44 
+--- ncurses-6.5-20250111+/man/curs_termattrs.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_termattrs.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,18 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_termattrs.3x,v 1.44 2024/12/28 21:26:21 tom Exp $
+-.TH curs_termattrs 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_termattrs.3x,v 1.57 2025/01/19 00:51:10 tom Exp $
++.TH curs_termattrs 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.ie \n(.g \{\
++.ds `` \(lq
++.ds '' \(rq
++.\}
++.el \{\
++.ie t .ds `` ``
++.el   .ds `` ""
++.ie t .ds '' ''
++.el   .ds '' ""
++.\}
+ .SH NAME
+ \fB\%baudrate\fP,
+ \fB\%erasechar\fP,
+@@ -48,83 +58,158 @@
+ .PP
+ \fBint baudrate(void);
+ \fBchar erasechar(void);
+-\fBint erasewchar(wchar_t *\fIwc\fP);
++\fBint erasewchar(wchar_t * \fIwc\fP);
+ \fBbool has_ic(void);
+ \fBbool has_il(void);
+ \fBchar killchar(void);
+-\fBint killwchar(wchar_t *\fIwc\fP);
+-\fBchar *longname(void);
++\fBint killwchar(wchar_t * \fIwc\fP);
++\fBchar * longname(void);
+ \fBattr_t term_attrs(void);
+ \fBchtype termattrs(void);
+-\fBchar *termname(void);
++\fBchar * termname(void);
+ .fi
+ .SH DESCRIPTION
+ .SS baudrate
+-The \fBbaudrate\fP routine returns the output speed of the terminal.
+-The
+-number returned is in bits per second, for example \fB9600\fP, and is an
+-integer.
++.B \%baudrate
++returns the line speed of the terminal,
++an integer value measured in bits per second,
++for example
++.BR 9600 "."
+ .SS "erasechar, erasewchar"
+-The \fBerasechar\fP routine returns the user's current erase character.
++.B \%erasechar
++returns the terminal's erase character.
+ .PP
+-The \fBerasewchar\fP routine stores the current erase character
+-in the location referenced by \fIwc\fP.
+-If no erase character has been defined, the routine fails
+-and the location referenced by \fIwc\fP is not changed.
++.B \%erasewchar
++stores the erase character in the location referenced by
++.IR wc "."
++If no erase character has been defined,
++it fails and the location referenced by
++.I wc
++is not changed.
+ .SS "has_ic, has_il"
+-The \fBhas_ic\fP routine is true if the terminal has insert- and delete-
+-character capabilities.
++.B \%has_ic
++returns
++.B TRUE
++if the terminal has insert- and delete-character capabilities.
+ .PP
+-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\fP(3X).
++.B \%has_il
++returns
++.B TRUE
++if the terminal has insert- and delete-line capabilities,
++or can simulate them using scrolling regions.
++It might be used to determine whether it would be appropriate
++to use \fBscrollok\fP(3X) to turn on scrolling.
+ .SS "killchar, killwchar"
+-The \fBkillchar\fP routine returns the user's current line kill character.
++.B \%killchar
++returns the terminal's line kill character.
+ .PP
+-The \fBkillwchar\fP routine stores the current line-kill character
+-in the location referenced by \fIwc\fP.
++.B \%killwchar
++stores the line-kill character in the location referenced by
++.IR wc "."
+ If no line-kill character has been defined,
+-the routine fails and the location referenced by \fIwc\fP is not changed.
++it fails and the location referenced by
++.I wc
++is not changed.
+ .SS longname
+-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\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.
++.B \%longname
++returns a pointer to static storage
++containing a verbose description of the terminal being managed by
++.IR curses "."
++The maximum length of a verbose description is 128 characters.
++The storage is populated only after \fBinitscr\fP(3X) or
++\fBnewterm\fP(3X) is called.
++This storage is overwritten by each call to
++.B \%newterm
++and not restored by \fBset_term\fP(3X),
++so its contents should be saved between calls to
++.B \%initscr
++or
++.B \%newterm
++if
++.B \%longname
++is to be used with multiple terminals.
+ .SS "termattrs, term_attrs"
+ If a given terminal does not support a video attribute that an
+-application program is trying to use, \fBcurses\fP may substitute a
++application program is trying to use,
++.I curses
++may substitute a
+ different video attribute for it.
+-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
++.B \%termattrs
++and
++.B \%term_attrs
++return a logical \*(``or\*('' of all video attributes supported by the
++terminal using
++.B A_
++and
++.B WA_
++constants respectively.
++This information is useful when a
++.I curses
++program
+ needs complete control over the appearance of the screen.
+ .SS termname
+-The \fBtermname\fP routine returns the terminal name used by \fBsetupterm\fP.
++.B \%termname
++returns the terminal name used by \fBsetupterm\fP(3X).
+ .SH RETURN VALUE
+-\fBlongname\fP and \fBtermname\fP return
++.B \%longname
++and
++.B \%termname
++return
+ .I NULL
+ on error.
+ .PP
+-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.
++Functions that return an integer return
++.B ERR
++upon failure and
++.B OK
++upon success.
+ .SH NOTES
+-Note that \fBtermattrs\fP may be a macro.
++.BR \%erasewchar ","
++.BR \%killwchar ","
++and
++.B \%term_attrs
++are part of
++.IR \%ncurses "'s"
++wide-character API,
++and are not available in its non-wide configuration.
++.PP
++.B \%termattrs
++may be implemented as a macro.
+ .SH PORTABILITY
+-X/Open Curses, Issue 4 describes these functions.
+-It changes the
+-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.
++X/Open Curses Issue\ 4 describes these functions.
++.PP
++SVr4 describes a successful return value only as
++\*(``an integer value other than
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 535
++.PP
++Most versions of
++.I curses
++truncate the string returned by
++.I \%termname
++to 14 characters.
++.SH HISTORY
++4BSD (1980) introduced
++.IR \%longname "."
++.PP
++SVr2 (1984) added
++.IR \%baudrate ","
++.IR \%erasechar ","
++.IR \%killchar ","
++.IR \%has_ic ","
++and
++.IR \%has_il "."
++.PP
++SVr3 (1987) furnished
++.IR \%termname "."
++SVr3.1 later that year supplied
++.IR \%termattrs "."
++.PP
++X/Open Curses Issue\ 4 (1995)
++specified
++.IR \%erasewchar ","
++.IR \%killwchar ","
++and
++.IR \%term_attrs "."
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_initscr\fP(3X),
+Index: man/curs_termcap.3x
+Prereq:  1.95 
+--- ncurses-6.5-20250111+/man/curs_termcap.3x	2024-12-28 21:28:49.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_termcap.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_termcap.3x,v 1.95 2024/12/28 21:28:49 tom Exp $
+-.TH curs_termcap 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_termcap.3x,v 1.103 2025/01/19 00:51:10 tom Exp $
++.TH curs_termcap 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -118,7 +118,7 @@
+ \fBint tgetent(char * \fIbp\fP, const char * \fIname\fP);
+ \fBint tgetflag(const char * \fIid\fP);
+ \fBint tgetnum(const char * \fIid\fP);
+-\fBchar * tgetstr(const char * \fIid\fP, char ** \fIarea\fP);
++\fBchar * tgetstr(const char * \fIid\fP, char ** \fIsbuf\fP);
+ \fBchar * tgoto(const char * \fIcap\fP, int \fIcol\fP, int \fIrow\fP);
+ \fBint tputs(const char * \fIstr\fP, int \fIaffcnt\fP, int (* \fIputc\fP)(int));
+ .fi
+@@ -157,14 +157,13 @@
+ .PP
+ This implementation differs from those of historical \fItermcap\fP
+ libraries.
+-.RS 3
+ .bP
+ .I \%ncurses
+ ignores the buffer pointer \fIbp\fP,
+ as do other \fItermcap\fP implementations conforming to portions of
+ X/Open Curses now withdrawn.
+ The BSD \fItermcap\fP library would store a copy of the terminal type
+-description in the area referenced by this pointer.
++description in the buffer referenced by this pointer.
+ \fI\%term\%info\fP stores terminal type descriptions in compiled form,
+ which is not the same thing.
+ .bP
+@@ -177,7 +176,6 @@
+ nor whether the terminal type description supports an addressable
+ cursor,
+ a property essential for any \fIcurses\fP implementation to operate.
+-.RE
+ .SS "Retrieving Capability Values"
+ \fB\%tgetflag\fP reports the Boolean entry for \fIid\fP,
+ or zero if it is not available.
+@@ -191,34 +189,36 @@
+ if it is not available.
+ Use \fB\%tputs\fP to output the string returned.
+ The
+-.I area
++.I sbuf
+ parameter is used as follows.
+-.RS 3
+ .bP
+ It is assumed to be the address of a pointer to a buffer managed by the
+ calling application.
+ .bP
+ However,
+-\fI\%ncurses\fP checks to ensure that
+-.I area
++.I \%ncurses
++checks to ensure that
++.I sbuf
+ is not
+ .IR NULL ","
+-and also that the resulting buffer pointer is not
++and that the pointer obtained by dereferencing
++.I sbuf
++is also not
+ .IR NULL "."
+ If either check fails,
+-.I area
+-is ignored.
++.I \%ncurses
++ignores
++.IR sbuf .
+ .bP
+ If the checks succeed,
+ \fI\%ncurses\fP also copies the return value to the buffer pointed to by
+-\fIarea\fP,
++\fIsbuf\fP,
+ and the library updates
+-.I area
++.I sbuf
+ to point past the null character terminating this value.
+ .bP
+ The return value itself is an address in the terminal type description
+ loaded into memory.
+-.RE
+ .SS "Applying String Capabilities"
+ String capabilities can be parameterized;
+ see subsection \*(``Parameterized Strings\*('' in  \fB\%terminfo\fP(5).
+@@ -275,27 +275,39 @@
+ to the
+ .I \%term\%info
+ entry's data for
+-.BR \%pad_char ","
+-.BR \%cursor_up ","
++.B \%pad_char
++.RB ( pad ),
++.B \%cursor_up
++.RB ( cuu1 ),
+ and
+-.BR \%backspace_if_not_bs ","
++.B \%backspace_if_not_bs
++.RB ( OTbs ),
+ respectively.
+-\fBUP\fP is not used by
+-.IR \%ncurses "."
+-.B PC
+-is used by \fB\%delay_output\fP(3X).
+-.B BC
+-is used by
++.I \%ncurses
++does not employ
++.B cuu1
++internally.
++\fB\%delay_output\fP(3X)
++uses
++.BR pad ","
++while
+ .B \%tgoto
+-emulation.
++emulation uses the obsolete
++.I termcap
++capability
++.BR bs ","
++represented in
++.I \%ncurses
++.I \%term\%info
++as \*(``OTbs\*(''.
+ .I \%ncurses
+ assigns the variable
+ .B \%ospeed
+ a system-specific value to encode the terminal's data rate.
+ .SS "Releasing Memory"
+ The \fItermcap\fP functions provide no means of freeing memory,
+-because legacy \fItermcap\fP implementations used only the buffer
+-areas provided by the caller via \fB\%tgetent\fP and \fB\%tgetstr\fP.
++because legacy \fItermcap\fP implementations used only the storage
++provided by the caller via \fB\%tgetent\fP and \fB\%tgetstr\fP.
+ Those buffers are unused in \fI\%term\%info\fP.
+ .PP
+ By contrast,
+@@ -316,7 +328,7 @@
+ performance.
+ .PP
+ An application that uses only the \fItermcap\fP functions,
+-not the higher level
++not the higher-level
+ .I \%curses
+ API,
+ could release the memory using \fB\%del_curterm\fP(3X),
+@@ -364,27 +376,14 @@
+ .SH PORTABILITY
+ These functions are no longer standardized
+ (and the variables never were);
++see section \*(``HISTORY\*('' below.
+ .I \%ncurses
+-provides them to support legacy applications.
+-They should not be used in new programs.
+-.SS Standards
+-.bP
+-X/Open Curses,
+-Issue 4,
+-Version 2 (1996),
+-describes these functions,
+-marking them as
+-\*(``TO BE WITHDRAWN\*(''.
+-.bP
+-X/Open Curses,
+-Issue 7 (2009) withdrew the
+-.I termcap
+-interface
+-(along with the
+-.I \%vwprintw
+-and
+-.I \%vwscanw
+-functions).
++provides them to support legacy applications;
++they should not be used in new programs.
++.PP
++SVr4 describes a successful return value only as
++\*(``an integer value other than
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 536
+ .PP
+ Neither X/Open Curses nor the SVr4 man pages documented the return
+ values of
+@@ -396,19 +395,17 @@
+ to mean that
+ .I \%tgetent
+ returns
+-.B OK
++.I OK
+ or
+-.BR ERR "."
++.IR ERR "."
+ Because the purpose of these functions is to provide compatibility with
+ the
+ .I termcap
+ library,
+-that is a defect in X/Open Curses,
+-Issue 4,
+-Version 2
++that is a defect in X/Open Curses Issue\ 4 Version\ 2
+ rather than in
+ .IR \%ncurses "."
+-.SS "Compatibility with BSD \f(BItermcap\fP"
++.SS "Compatibility with BSD \fItermcap\fP"
+ .I \%ncurses
+ provides externally visible variables to support certain
+ .I termcap
+@@ -419,7 +416,7 @@
+ it is unclear when reading and writing them is meaningful.
+ In particular,
+ some applications are reported to declare and/or modify
+-.BR \%ospeed "."
++.IR \%ospeed "."
+ .PP
+ The constraint that only the first two characters of the
+ .I id
+@@ -640,6 +637,21 @@
+ and programs that intend to work with all
+ .I termcap
+ library interfaces must account for that fact.
++.PP
++X/Open Curses Issue\ 4,
++Version\ 2 (1996),
++describes these functions,
++marking them as
++\*(``TO BE WITHDRAWN\*(''.
++.PP
++X/Open Curses Issue\ 7 (2009) withdrew the
++.I termcap
++interface
++(along with the
++.I \%vwprintw
++and
++.I \%vwscanw
++functions).
+ .SH BUGS
+ If you call \fB\%tgetstr\fP to fetch
+ .B \%column_address
+Index: man/curs_terminfo.3x
+Prereq:  1.151 
+--- ncurses-6.5-20250111+/man/curs_terminfo.3x	2024-12-28 21:32:56.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_terminfo.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_terminfo.3x,v 1.151 2024/12/28 21:32:56 tom Exp $
+-.TH curs_terminfo 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_terminfo.3x,v 1.160 2025/01/19 00:51:10 tom Exp $
++.TH curs_terminfo 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -116,7 +116,9 @@
+ \fBint setterm(const char * \fIterm\fP);
+ .fi
+ .SH DESCRIPTION
+-These low-level functions must be called by programs that deal directly
++These lower-level functions of the
++.I curses
++standard must be called by programs that deal directly
+ with the
+ .I \%term\%info
+ database to handle certain terminal capabilities,
+@@ -211,7 +213,7 @@
+ .I \%term\%info
+ structures,
+ but does not set up the output virtualization structures used by
+-.IR curses .
++.IR curses "."
+ Its parameters follow.
+ .RS 3
+ .TP 5
+@@ -233,9 +235,9 @@
+ passing an output
+ .I stream
+ rather than a
+-.IR descriptor .
++.IR descriptor "."
+ In
+-.IR curses ,
++.IR curses ","
+ the two are the same because \fB\%newterm\fP calls \fB\%setupterm\fP,
+ passing the file descriptor derived from its output stream parameter.
+ .TP 5
+@@ -252,7 +254,7 @@
+ or
+ .B ERR
+ and stores a status value in the integer pointed to by
+-.IR errret .
++.IR errret "."
+ A return value of
+ .B OK
+ combined with status of
+@@ -265,7 +267,7 @@
+ .B ERR
+ is returned,
+ examine
+-.I errret:
++.IR errret "."
+ .RS
+ .TP 5
+ .B 1
+@@ -313,7 +315,7 @@
+ .RE
+ .IP
+ which uses all the defaults and sends the output to
+-.IR stdout .
++.IR stdout "."
+ .RE
+ .\" ********************************************************************
+ .SS "The Terminal State"
+@@ -392,7 +394,7 @@
+ \fB\%tparm\fP instantiates the string
+ .I str
+ with parameters
+-.IR pi .
++.IR pi "."
+ A pointer is returned to the result of
+ .I str
+ with the parameters applied.
+@@ -448,7 +450,7 @@
+ .\" ********************************************************************
+ .SS "Output Functions"
+ String capabilities can contain
+-.IR padding ,
++.IR padding ","
+ a time delay
+ (accommodating performance limitations of hardware terminals)
+ expressed as \fB$<\fIn\fB>\fR,
+@@ -492,19 +494,19 @@
+ .IB str ", 1, putchar)\c"
+ \*(''.
+ The output of \fB\%putp\fP always goes to
+-.IR stdout ,
++.IR stdout ","
+ rather than the
+ .I \%file\%des
+ specified in \fB\%setupterm\fP.
+ .PP
+ \fB\%vidputs\fP displays the string on the terminal in the video
+ attribute mode
+-.IR attrs ,
++.IR attrs ","
+ which is any combination of the attributes listed in \fB\%curses\fP(3X).
+ The characters are passed to the
+ .IR \%putchar -like
+ function
+-.IR putc .
++.IR putc "."
+ .PP
+ \fB\%vidattr\fP is like \fB\%vidputs\fP,
+ except that it outputs through \fI\%putchar\fP(3).
+@@ -515,20 +517,20 @@
+ correspond to
+ .B \%vidattr
+ and
+-.BR \%vidputs ,
++.BR \%vidputs ","
+ respectively.
+ They use multiple parameters to represent the character attributes and
+ color;
+ namely,
+ .bP
+-.IR \%attrs ,
++.IR \%attrs ","
+ of type
+-.IR \%attr_t ,
++.IR \%attr_t ","
+ for the attributes and
+ .bP
+-.IR pair ,
++.IR pair ","
+ of type
+-.IR short ,
++.IR short ","
+ for the color pair number.
+ .PP
+ Use the attribute constants prefixed with
+@@ -536,7 +538,7 @@
+ with
+ .B \%vid_attr
+ and
+-.BR \%vid_puts .
++.BR \%vid_puts "."
+ .PP
+ X/Open Curses reserves the
+ .I opts
+@@ -544,24 +546,29 @@
+ saying that applications must provide a null pointer for that argument;
+ but see section \*(``EXTENSIONS\*('' below.
+ .PP
+-While \fB\%putp\fP is a low-level function that does not use high-level
++While
++.B \%putp
++is a lower-level function
++that does not use higher-level
+ .I curses
+ state,
+ .I \%ncurses
+ declares it in
+ .I \%curses.h
+-because System\ V did this
++because System\ V did so
+ (see section \*(``HISTORY\*('' below).
+ .\" ********************************************************************
+ .SS "Terminal Capability Functions"
+-\fB\%tigetflag\fP,
+-\fB\%tigetnum\fP,
+-and \fB\%tigetstr\fP return the value of the capability corresponding to
++.BR \%tigetflag ","
++.BR \%tigetnum ","
++and
++.B \%tigetstr
++return the value of the capability corresponding to
+ the
+ .I \%term\%info
+-.IR cap-code ,
++.IR cap-code ","
+ such as
+-.BR xenl ,
++.BR xenl ","
+ passed to them.
+ The
+ .I cap-code
+@@ -570,7 +577,8 @@
+ .PP
+ These functions return special values to denote errors.
+ .PP
+-\fB\%tigetflag\fP returns
++.B \%tigetflag
++returns
+ .TP
+ .B \-1
+ if
+@@ -581,7 +589,8 @@
+ .B 0
+ if it is canceled or absent from the terminal description.
+ .PP
+-\fB\%tigetnum\fP returns
++.B \%tigetnum
++returns
+ .TP
+ .B \-2
+ if
+@@ -592,7 +601,8 @@
+ .B \-1
+ if it is canceled or absent from the terminal description.
+ .PP
+-\fB\%tigetstr\fP returns
++.B \%tigetstr
++returns
+ .TP
+ .B "(char *)\-1"
+ if
+@@ -669,9 +679,14 @@
+ but it is possible to do that using the \fB\%delscreen\fP(3X) function.
+ .\" ********************************************************************
+ .SH RETURN VALUE
+-X/Open Curses defines no failure conditions.
++Functions that return integers return
++.B ERR
++upon failure and
++.B OK
++upon success.
++.PP
+ In
+-.IR \%ncurses ,
++.IR \%ncurses ","
+ .TP 5
+ .B del_curtem
+ fails if its terminal parameter is null.
+@@ -688,9 +703,9 @@
+ fails if it cannot allocate enough memory,
+ or create the initial windows
+ .RB \%( stdscr ,
+-.BR \%curscr ,
++.BR \%curscr ","
+ and
+-.BR \%newscr ).
++.BR \%newscr ")."
+ Other error conditions are documented above.
+ .TP 5
+ .B tparm
+@@ -724,12 +739,12 @@
+ is also provided in the non-wide-character configuration.
+ .\" ********************************************************************
+ .SH EXTENSIONS
+-The functions marked as extensions were designed for
+-.IR \%ncurses ,
++The functions marked as extensions originated in
++.IR \%ncurses ","
+ and are not found in SVr4
+-.IR curses ,
++.IR curses ","
+ 4.4BSD
+-.IR curses ,
++.IR curses ","
+ or any other previous
+ .I curses
+ implementation.
+@@ -738,16 +753,23 @@
+ allows
+ .I opts
+ to be a pointer to
+-.IR int ,
++.IR int ","
+ which overrides the
+ .I pair
+ .RI ( short )
+ argument.
+ .\" ********************************************************************
+ .SH PORTABILITY
+-.I \%setterm
+-is not described by X/Open and must be considered non-portable.
+-All other functions are as described by X/Open.
++Except for
++.IR \%setterm ","
++X/Open Curses Issue\ 4 describes these functions.
++It specifies no error conditions for them.
++.PP
++SVr4 describes a successful return value
++except where \*(``otherwise noted\*(''
++as
++\*(``an integer value other than
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 539
+ .SS "Header Files"
+ On legacy
+ .I curses
+@@ -757,30 +779,27 @@
+ and
+ .I \%term.h
+ in that order
+-to get the definitions for these strings,
+-numbers,
+-and flags.
++to make visible the definitions of the string arrays
++storing the capability names and codes.
+ .SS "Compatibility Macros"
+-This implementation provides a few macros for compatibility with systems
+-before SVr4
+-(see section \*(``HISTORY\*('' below).
+-They include
+-.IR \%Bcrmode ","
+-.IR \%Bfixterm ","
+-.IR \%Bgettmode ","
+-.IR \%Bnocrmode ","
+-.IR \%Bresetterm ","
+-.IR \%Bsaveterm ","
+-and"
+-.IR \%Bsetterm "."
+ .I \%ncurses
+-implements each of these symbols as macros for BSD
++implements a few macros for early System\ V
+ .I curses
+-compatibility.
++compatibility
++(see section \*(``HISTORY\*('' below).
++They include
++.IR \%crmode ","
++.IR \%fixterm ","
++.IR \%gettmode ","
++.IR \%nocrmode ","
++.IR \%resetterm ","
++.IR \%saveterm ","
++and
++.IR \%setterm "."
+ .PP
+ In SVr4,
+ these are found in
+-.IR \%curses.h ,
++.IR \%curses.h ","
+ but except for
+ .IR \%setterm ","
+ are likewise macros.
+@@ -794,13 +813,13 @@
+ stating that the call
+ .RS
+ .EX
+-.BI setupterm( term ", 1, (int *)0)"
++.RI setupterm( term ", 1, (int *)0)"
+ .EE
+ .RE
+ provides the same functionality as
+ .RS
+ .EX
+-.BI setterm( term )
++.RI setterm( term )
+ .EE
+ .RE
+ and discouraging the latter for new programs.
+@@ -808,7 +827,7 @@
+ .I \%setupterm
+ copies the terminal name to the array
+ .IR \%ttytype "."
+-This is not part of X/Open Curses,
++This behavior is not specified by X/Open Curses,
+ but is assumed by some applications.
+ .PP
+ Other implementions may not declare the capability name arrays.
+@@ -828,28 +847,31 @@
+ .I \%initscr
+ or
+ .I \%newterm
+-uses buffered I/O,
+-and would write to the corresponding stream.
++used buffered I/O,
++and wrote to the corresponding
++.I stdio
++stream.
+ In addition to the limitation that the terminal was left in
+ block-buffered mode on exit
+ (like System\ V
+-.IR curses ),
++.IR curses "),"
+ it was problematic because
+ .I \%ncurses
+ did not allow a reliable way to clean up on receiving
+-.BR SIGTSTP .
++.IR SIGTSTP "."
+ .PP
+ .I \%ncurses
+ .RI 6. x
+ uses output buffers managed directly by
+-.IR \%ncurses .
+-Some of the low-level functions described in this manual page write
+-to the standard output.
+-They are not signal-safe.
+-The high-level functions in
++.IR \%ncurses "."
++The lower-level functions described here
++that write to the terminal device
++do so via the standard output stream;
++they thus are not signal-safe.
++The higher-level functions in
+ .I \%ncurses
+-employ alternate versions of these functions using the more reliable
+-buffering scheme.
++employ alternate versions of these functions
++using a more reliable buffering scheme.
+ .SS "Function Prototypes"
+ The X/Open Curses prototypes are based on the SVr4
+ .I curses
+@@ -863,7 +885,7 @@
+ sometimes applying it needlessly to values that are already constant,
+ and in most cases overlooking parameters that normally would benefit
+ from
+-.IR \%const .
++.IR \%const "."
+ Passing
+ .IR \%const -qualified
+ parameters to functions that do not declare them
+@@ -873,7 +895,8 @@
+ \*(``writable strings\*('' are an obsolescent C language feature.
+ .IP
+ As an extension,
+-this implementation can be configured to change the function prototypes
++.I \%ncurses
++can be configured to change the function prototypes
+ to use the
+ .I \%const
+ keyword.
+@@ -886,13 +909,14 @@
+ with a fixed number of parameters,
+ rather than a variable argument list.
+ .IP
+-This implementation uses a variable argument list,
++.I \%ncurses
++uses a variable argument list,
+ but can be configured to use the fixed-parameter list.
+ Portable applications should provide nine parameters after the format;
+ zeroes are fine for this purpose.
+ .IP
+ In response to review comments by Thomas E. Dickey,
+-X/Open Curses Issue 7 proposed the
++X/Open Curses Issue\ 7 proposed the
+ .I \%tiparm
+ function in mid-2009.
+ .IP
+@@ -923,7 +947,7 @@
+ before C was standardized.
+ Since ANSI\ C (1989),
+ C language standards do not require a pointer to fit in a
+-.IR long ).
++.IR long ")."
+ .bP
+ Providing the right number of parameters for a variadic function
+ such as
+@@ -941,7 +965,7 @@
+ .I \%ncurses
+ library checks usage of these capabilities,
+ and returns
+-.B ERR
++.I ERR
+ if the capability mishandles string parameters.
+ But it cannot check if a calling program provides strings in the right
+ places for the
+@@ -960,7 +984,7 @@
+ .\" XXX: as opposed to the Unix terminal driver, termio(s)?
+ as with the MinGW port,
+ .bP
+-.B \%setupterm
++.I \%setupterm
+ interprets a missing/empty
+ .I TERM
+ variable as the special value \*(``unknown\*(''.
+@@ -977,7 +1001,7 @@
+ while the latter does not.
+ A generic terminal is unsuitable for full-screen applications.
+ .bP
+-.B \%setupterm
++.I \%setupterm
+ allows explicit use of the Microsoft Windows console driver by checking
+ whether the
+ .I TERM
+@@ -988,9 +1012,9 @@
+ .I \%set_curterm
+ returns an
+ .IR int ","
+-.B OK
++.I OK
+ or
+-.BR ERR "."
++.IR ERR "."
+ We have chosen to implement the X/Open Curses semantics.
+ .PP
+ In SVr4,
+@@ -1003,9 +1027,9 @@
+ (Solaris
+ .IR \%xcurses ")"
+ returns a value other than
+-.B OK
++.I OK
+ or
+-.B ERR
++.I ERR
+ from
+ .IR \%tputs "."
+ It instead returns the length of the string,
+Index: man/curs_touch.3x
+Prereq:  1.53 
+--- ncurses-6.5-20250111+/man/curs_touch.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_touch.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,18 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_touch.3x,v 1.53 2024/12/28 21:26:21 tom Exp $
+-.TH curs_touch 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_touch.3x,v 1.63 2025/01/19 00:51:10 tom Exp $
++.TH curs_touch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.ie \n(.g \{\
++.ds `` \(lq
++.ds '' \(rq
++.\}
++.el \{\
++.ie t .ds `` ``
++.el   .ds `` ""
++.ie t .ds '' ''
++.el   .ds '' ""
++.\}
+ .SH NAME
+ \fB\%touchwin\fP,
+ \fB\%touchline\fP,
+@@ -77,11 +87,14 @@
+ addition, \fB\%is_linetouched\fP returns \fBERR\fP if \fIline\fP is not
+ valid for the given window.
+ .SH RETURN VALUE
+-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.
++Functions returning integers return
++.B ERR
++upon failure and
++.B OK
++upon success.
+ .PP
+-In this implementation
++In
++.IR \%ncurses ","
+ .RS 3
+ .TP 5
+ \fBis_linetouched\fP
+@@ -107,19 +120,34 @@
+ if the line number is outside the window boundaries.
+ .RE
+ .SH NOTES
+-All of these routines except \fB\%wtouchln\fP may be macros.
++All of these functions except
++.B \%wtouchln
++may be implemented as macros.
+ .SH PORTABILITY
+-These functions were introduced by SVr4.
+-The Solaris \fIcurses\fP header file,
+-for instance, defines both an actual function and macro for each.
+-The macros give the same result as the actual functions.
+-SVr4 \fIcurses\fP does not check the window parameter \fIwin\fP to ensure
+-that it is not
+-.IR NULL ";"
+-otherwise this implementation behaves the same as SVr4.
+-.PP
+-X/Open Curses, Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
++.PP
++SVr4 describes a successful return value
++except where \*(``otherwise noted\*(''
++as
++\*(``an integer value other than
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 540
++.PP
++SVr4 does not check
++.I win
++to ensure that it is not a null pointer.
++.SH HISTORY
++SVr2 (1984) introduced
++.IR \%touchwin ","
++.PP
++SVr3 (1987) added
++.IR \%touchline "."
++SVr3.1 later that year supplied
++.IR \%is_linetouched ","
++.IR \%is_wintouched ","
++.IR \%untouchwin ","
++and
++.IR \%wtouchln "."
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_refresh\fP(3X),
+Index: man/curs_trace.3x
+Prereq:  1.52 
+--- ncurses-6.5-20250111+/man/curs_trace.3x	2024-12-28 21:18:35.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_trace.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2000-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_trace.3x,v 1.52 2024/12/28 21:18:35 tom Exp $
+-.TH curs_trace 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_trace.3x,v 1.55 2025/01/19 00:51:10 tom Exp $
++.TH curs_trace 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -139,7 +139,7 @@
+ .bP
+ If tracing is not available, \fBcurses_trace\fP returns zero (0).
+ .SS "Trace Parameter"
+-The trace parameter is formed by OR'ing
++The trace parameter is formed by logically \*(``or\*(''-ing
+ values from the list of \fBTRACE_\fIxxx\fR definitions in \fB\fR.
+ These include:
+ .TP 5
+Index: man/curs_util.3x
+Prereq:  1.122 
+--- ncurses-6.5-20250111+/man/curs_util.3x	2024-12-28 21:51:21.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_util.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,17 +28,21 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_util.3x,v 1.122 2024/12/28 21:51:21 tom Exp $
+-.TH curs_util 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_util.3x,v 1.134 2025/01/19 00:51:10 tom Exp $
++.TH curs_util 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
++.ds ^  \(ha
++.ds ~  \(ti
+ .\}
+ .el \{\
+ .ie t .ds `` ``
+ .el   .ds `` ""
+ .ie t .ds '' ''
+ .el   .ds '' ""
++.ds       ^  ^
++.ds       ~  ~
+ .\}
+ .
+ .de bP
+@@ -63,58 +67,83 @@
+ .nf
+ \fB#include 
+ .PP
+-\fBconst char *unctrl(chtype \fIch\fP);
+-\fBwchar_t *wunctrl(cchar_t *\fIwch\fP);
++\fBconst char * unctrl(chtype \fIch\fP);
++\fBwchar_t * wunctrl(cchar_t * \fIwch\fP);
+ .PP
+-\fBconst char *keyname(int \fIc\fP);
+-\fBconst char *key_name(wchar_t \fIwc\fP);
++\fBconst char * keyname(int \fIc\fP);
++\fBconst char * key_name(wchar_t \fIwc\fP);
+ .PP
+ \fBvoid filter(void);
++\fI/* extension */
++\fBvoid nofilter(void);
+ .PP
+ \fBvoid use_env(bool \fIbf\fP);
++\fI/* extension */
++\fBvoid use_tioctl(bool \fIbf\fP);
+ .PP
+-\fBint putwin(WINDOW *\fIwin\fP, FILE *\fIfilep\fP);
+-\fBWINDOW *getwin(FILE *\fIfilep\fP);
++\fBint putwin(WINDOW * \fIwin\fP, FILE * \fIfilep\fP);
++\fBWINDOW * getwin(FILE * \fIfilep\fP);
+ .PP
+ \fBint delay_output(int \fIms\fP);
+-\fBint flushinp(void);
+ .PP
+-\fI/* extensions */
+-\fBvoid nofilter(void);
+-\fBvoid use_tioctl(bool \fIbf\fP);
++\fBint flushinp(void);
+ .fi
+ .SH DESCRIPTION
+-.SS unctrl
+-The \fBunctrl\fP routine returns a character string as a printable
+-representation of the character \fIch\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^\fIX\fR notation.
+-.bP
+-Printing characters are displayed as is.
++.SS "unctrl, wunctrl"
++.B unctrl
++returns a null-terminated character string printably representing the
++.I curses
++character
++.IR ch ,
++often one that originated in keyboard input;
++see \fBgetch\fP(3X).
++.bP
++Printable characters represent themselves as a one-character string.
++.bP
++Control characters are expressed in
++.BI \*^ X
++notation,
++where
++.I X
++is the printable symbol of the control code's value plus 32
++in the ISO\ 646/\*(``ASCII\*('' character set.
+ .bP
+ DEL
+-(character 127)
+-is displayed as \fB^?\fP.
++(character code 127)
++is represented as
++.BR \*^? .
+ .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\-\fIX\fR notation,
+-or are displayed as themselves.
+-In the latter case,
+-the values may not be printable;
+-this follows the X/Open specification.
+-.PP
+-The corresponding \fBwunctrl\fP returns a printable representation of
+-a complex character \fIwch\fP.
+-.PP
+-In both \fBunctrl\fP and \fBwunctrl\fP the attributes
+-and color associated
+-with the character parameter are ignored.
++A character code greater than 127 is represented in one of two ways.
++.IP
++If the screen has not been initialized or is in meta mode
++(see \fBmeta\fP(3X)),
++it is expressed in
++.BI M- X
++notation,
++where X
++is the representation of the code's value minus 128,
++as described above.
++.IP
++If the screen is not in meta mode,
++the character code is assumed to represent itself.
++It nevertheless may not be printable;
++this is the case for character codes 128-159 in ISO\ 8859 encodings.
++.IP
++.IR \%ncurses 's
++\fB\%use_legacy_coding\fP(3X)
++function configures
++.BR \%unctrl 's
++handling of these character codes.
++.PP
++.B \%wunctrl
++returns a null-terminated wide-character string printably representing
++the
++.I curses
++complex character
++.IR wch .
++.PP
++Both functions ignore the atributes and color pair selection
++of their argument.
+ .SS "keyname, key_name"
+ The \fBkeyname\fP routine returns a character string
+ corresponding to the key \fIc\fP.
+@@ -213,7 +242,7 @@
+ \fI\%ncurses\fP modifies the last step in its computation
+ of screen size as follows:
+ .bP
+-checks if the \fILINES\fP and \fI\%COLUMNS\fP environment variables
++checks whether the \fILINES\fP and \fI\%COLUMNS\fP environment variables
+ are set to a number greater than zero.
+ .bP
+ for each,
+@@ -302,31 +331,45 @@
+ that has been typed by the user
+ and has not yet been read by the program.
+ .SH RETURN VALUE
+-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.
++Except for
++.BR \%flushinp ","
++functions that return integers return
++.B ERR
++upon failure and
++.B OK
++upon success.
+ .PP
+-Routines that return pointers return
++Functions that return pointers return
+ .I NULL
+ on error.
+ .PP
+-In this implementation
+-.RS 3
+-.TP 5
+-\fBflushinp\fP
++In
++.IR \%ncurses ","
++.bP
++.B \%flushinp
+ returns
+ .B ERR
+-if the terminal was not initialized.
+-.TP 5
+-\fBputwin\fP
++if the terminal was not initialized,
++and
++.bP
++.B \%putwin
+ returns
+ .B ERR
+-if the associated \fIwrite\fP(2) calls return
++if its associated \fIwrite\fP(2) calls return
+ .BR ERR "."
+-.RE
++.SH NOTES
++.B \%wunctrl
++is part of
++.IR \%ncurses "'s"
++wide-character API,
++and is not available in its non-wide configuration.
+ .SH PORTABILITY
++X/Open Curses Issue\ 4 describes these functions.
++It specifies no error conditions for them.
++.PP
++SVr4 describes a successful return value only as
++\*(``an integer value other than
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 542
+ .SS filter
+ The SVr4 documentation describes the action of \fBfilter\fP
+ only in the vaguest terms.
+@@ -411,8 +454,7 @@
+ However,
+ reading from a file written using mixed schemes may not be successful.
+ .SS "unctrl, wunctrl"
+-X/Open Curses,
+-Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+ It states that \fBunctrl\fP and \fBwunctrl\fP will return a null pointer
+ if unsuccessful.
+@@ -518,7 +560,7 @@
+ SVr4 (1989) supplied
+ .IR \%use_env "."
+ .PP
+-X/Open Curses Issue 4 (1995) specified
++X/Open Curses Issue\ 4 (1995) specified
+ .I \%key_name
+ and
+ .IR \%wunctrl "."
+Index: man/curs_variables.3x
+Prereq:  1.53 
+--- ncurses-6.5-20250111+/man/curs_variables.3x	2024-09-21 18:01:56.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_variables.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2010-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_variables.3x,v 1.53 2024/09/21 18:01:56 tom Exp $
+-.TH curs_variables 3X 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_variables.3x,v 1.58 2025/01/19 00:51:10 tom Exp $
++.TH curs_variables 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -104,6 +104,7 @@
+ \fB\%FALSE\fP,
+ \fB\%ERR\fP,
+ \fB\%OK\fP,
++\fB\%CCHARW_MAX\fP,
+ \fB\%curscr\fP,
+ \fB\%newscr\fP,
+ \fB\%stdscr\fP,
+@@ -133,6 +134,9 @@
+ \fBconst \fI/*\fP .\|.\|. \fI*/\fP ERR;
+ \fBconst \fI/*\fP .\|.\|. \fI*/\fP OK;
+ .PP
++\fI/* extension */
++\fBconst \fI/*\fP .\|.\|. \fI*/\fP CCHARW_MAX;
++.PP
+ \fI/* variables */
+ \fBint COLORS;
+ \fBint COLOR_PAIRS;
+@@ -159,7 +163,7 @@
+ In either case,
+ applications should treat them as read-only to avoid
+ confusing the library.
+-.SH "CONSTANTS"
++.SH CONSTANTS
+ .SS "TRUE, FALSE"
+ The \fIcurses\fP library defines \fBTRUE\fP and \fBFALSE\fP
+ to represent the values of the Boolean data type.
+@@ -167,9 +171,20 @@
+ \fIcurses\fP and \fIterminfo\fP routines frequently return these
+ constant integral values indicating failure and success,
+ respectively.
++.SS CCHARW_MAX
++This integral value,
++an
++.I \%ncurses
++extension,
++contains the maximum number of
++.I \%wchar_t
++wide characters that can be stored in a
++.I curses
++complex character
++.IR \%cchar_t "."
+ .SH "PREDEFINED TYPES"
+ .SS "\fIbool\fP"
+-X/Open Issue 4 \fIcurses\fP (1996) preceded the ISO C99 and ISO C++98
++X/Open Issue\ 4 \fIcurses\fP (1996) preceded the ISO C99 and ISO C++98
+ standards,
+ each of which also defined a Boolean data type.
+ The \fIcurses\fP library requires an integral type \fIbool\fP.
+@@ -218,7 +233,24 @@
+ structure type;
+ see subsection \*(``Overview\*('' of \fB\%ncurses\fP(3X).
+ .SH "VARIABLES"
+-.SS "curscr, stdscr, newscr"
++.SS "curscr, newscr, stdscr"
++When a
++.I curses
++application calls
++\fB\%initscr\fP(3X) or \fB\%newterm\fP(3X),
++the library creates a window named
++.B \%stdscr
++that is the same size as the terminal screen
++and is the implicit window used by functions
++that interact with a window
++but do not take a parameter identifying one;
++many
++.I curses
++functions use it.
++An application need not use
++.BR \%stdscr ";"
++it might prefer to tile the display into multiple windows instead.
++.PP
+ The library records updates to the terminal screen in a window named
+ \fB\%curscr\fP.
+ This object is referred to as the \*(``physical screen\*('' in
+@@ -235,12 +267,6 @@
+ When the screen is refreshed,
+ \fIcurses\fP determines a minimal set of updates using the terminal's
+ capabilities to make \fB\%curscr\fP look like \fB\%newscr\fP.
+-.PP
+-Once \fIcurses\fP is initialized,
+-it creates a window named \fB\%stdscr\fP.
+-It is the same size as the terminal screen and is the default window
+-used by routines that do not take a parameter identifying one.
+-Many \fIcurses\fP functions use this window.
+ .SS COLORS
+ Once \fIcurses\fP is initialized,
+ \fB\%COLORS\fP
+@@ -291,12 +317,40 @@
+ and
+ .I \%tinfo
+ libraries,
+-most of these variables reside in the former.
++most of these symbols reside in the former.
++The
++.B bool
++data type
++is used by both.
++.SH EXTENSIONS
++The
++.B \%CCHARW_MAX
++constant,
++and
++.BR \%ESCDELAY ","
++.BR \%TABSIZE ","
++and
++.B \%newscr
++variables,
++are
++extensions,
++the first of these originating in
++.\" Solaris xcurses calls it M_CCHAR_MAX.
++.IR \%ncurses "."
+ .SH PORTABILITY
++Applications employing
++.I \%ncurses
++extensions should condition their use on the visibility of the
++.B \%NCURSES_VERSION
++preprocessor macro.
++.PP
+ The X/Open Curses standard documents all of the foregoing types and
+-symbols except for \fB\%newscr\fP,
+-\fB\%TABSIZE\fP,
+-and \fB\%ESCDELAY\fP.
++symbols except for
++.BR \%CCHARW_MAX ","
++.BR \%newscr ","
++.BR \%TABSIZE ","
++and
++.BR \%ESCDELAY "."
+ .PP
+ X/Open Curses describes \fB\%curscr\fP only as \*(``an internal data
+ structure\*('';
+@@ -366,6 +420,10 @@
+ Segmentation\*(''
+ .UE
+ .PP
++\fB\%getcchar\fP(3X)
++further discusses
++.BR \%CCHARW_MAX "."
++.PP
+ \fB\%curses\fP(3X),
+ \fB\%curs_color\fP(3X),
+ \fB\%curs_opaque\fP(3X),
+Index: man/curs_window.3x
+Prereq:  1.57 
+--- ncurses-6.5-20250111+/man/curs_window.3x	2024-12-28 21:51:45.000000000 +0000
++++ ncurses-6.5-20250118/man/curs_window.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2020-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2020-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,23 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_window.3x,v 1.57 2024/12/28 21:51:45 tom Exp $
+-.TH curs_window 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_window.3x,v 1.64 2025/01/19 00:51:10 tom Exp $
++.TH curs_window 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.ie \n(.g \{\
++.ds `` \(lq
++.ds '' \(rq
++.\}
++.el \{\
++.ie t .ds `` ``
++.el   .ds `` ""
++.ie t .ds '' ''
++.el   .ds '' ""
++.\}
++.
++.de bP
++.ie n  .IP \(bu 4
++.el    .IP \(bu 2
++..
+ .SH NAME
+ \fB\%newwin\fP,
+ \fB\%delwin\fP,
+@@ -159,79 +174,122 @@
+ 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\fP upon failure and
+-\fBOK\fP (SVr4 only specifies "an integer value other than \fBERR\fP") upon
+-successful completion.
++Functions that return integers return
++.B ERR
++upon failure and
++.B OK
++upon success.
+ .PP
+-Routines that return pointers return
++Functions that return pointers return
+ .I NULL
+ on error.
+ .PP
+-X/Open defines no error conditions.
+-In this implementation
+-.TP 5
+-\fBdelwin\fP
++.I \%ncurses
++defines several error conditions.
++.bP
++.B \%delwin
+ returns
+ .B ERR
+-if the window pointer is null, or
+-if the window is the parent of another window.
+-.TP 5
+-\fBderwin\fP
++if
++.I win
++is a null pointer,
++or if it is the parent of another window.
++.IP
++.I \%ncurses
++maintains a list of windows,
++and checks that the pointer passed to
++.B \%delwin
++is one that it created,
++returning
++.B ERR
++if it was not.
++.bP
++.B \%derwin
+ returns
+ .B ERR
+-if the parent window pointer is null, or
+-if any of its ordinates or dimensions is negative, or
+-if the resulting window does not fit inside the parent window.
+-.TP 5
+-\fBdupwin\fP
++if
++.I orig
++is a null pointer,
++or if any of the ordinate or dimension arguments is negative,
++or if the resulting window does not fit inside the parent window.
++.bP
++.B \%dupwin
+ returns
+ .B ERR
+-if the window pointer is null.
+-.IP
+-This implementation also maintains a list of windows,
+-and checks that the pointer passed to \fBdelwin\fP is one that
+-it created, returning an error if it was not..
+-.TP 5
+-\fBmvderwin\fP
+-returns
+-.B ERR
+-if the window pointer is null, or
+-if some part of the window would be placed off-screen.
+-.TP 5
+-\fBmvwin\fP
+-returns
+-.B ERR
+-if the window pointer is null, or
+-if the window is really a pad, or
+-if some part of the window would be placed off-screen.
+-.TP 5
+-\fBnewwin\fP
+-will fail if either of its beginning ordinates is negative, or
+-if either the number of lines or columns is negative.
+-.TP 5
+-\fBsyncok\fP
+-returns
+-.B ERR
+-if the window pointer is null.
+-.TP 5
+-\fBsubwin\fP
+-returns
+-.B ERR
+-if the parent window pointer is null, or
+-if any of its ordinates or dimensions is negative, or
+-if the resulting window does not fit inside the parent window.
+-.PP
+-The functions which return a window pointer
+-may also fail if there is insufficient memory for its data structures.
+-Any of these functions will fail if the screen has not been initialized,
+-i.e., with \fBinitscr\fP or \fBnewterm\fP.
++if
++.I win
++is a null pointer.
++.bP
++.B \%mvderwin
++returns
++.B ERR
++if
++.I win
++is a null pointer,
++or if any part of the window would be placed off-screen.
++.bP
++.B \%mvwin
++returns
++.B ERR
++if
++.I win
++is a null pointer,
++if
++.I win
++is a pad,
++or if any part of the window would be placed off-screen.
++.bP
++.B \%newwin
++returns
++.B ERR
++if any of its arguments is negative.
++.bP
++.B \%subwin
++returns
++.B ERR
++if
++.I orig
++is a null pointer,
++or if any of the ordinate or dimension arguments is negative,
++or if the resulting window does not fit inside the parent window.
++.bP
++.B \%syncok
++returns
++.B ERR
++if
++.I win
++is a null pointer.
++.PP
++Functions that return a window pointer fail if memory allocation
++for their data structures fails.
++.PP
++All of these functions fail if the screen has not been initialized;
++see \fBinitscr\fP(3X) or \fBnewterm\fP(3X).
+ .SH NOTES
+-If many small changes are made to the window, the \fBwsyncup\fP option could
+-degrade performance.
++.B \%syncok
++may be implemented as a macro.
+ .PP
+-Note that \fBsyncok\fP may be a macro.
++Calling
++.B \%syncup
++on a window and making many small changes to it
++could degrade performance.
+ .SH PORTABILITY
+-X/Open Curses, Issue 4 describes these functions.
++X/Open Curses Issue\ 4 describes these functions.
++It specifies no error conditions for
++.IR \%delwin ","
++.IR \%derwin ","
++.IR \%dupwin ","
++.IR \%newwin ","
++.IR \%mvderwin ","
++or
++.IR \%syncok "."
++.PP
++For functions returning integers
++(except
++.IR \%delwin "),"
++SVr4 describes a successful return value only as
++\*(``an integer value other than
++.IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 544
+ .PP
+ Regarding
+ .IR \%delwin ","
+Index: man/form_field_opts.3x
+Prereq:  1.44 
+--- ncurses-6.5-20250111+/man/form_field_opts.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20250118/man/form_field_opts.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2014,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,18 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_opts.3x,v 1.44 2024/03/16 15:35:01 tom Exp $
+-.TH form_field_opts 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: form_field_opts.3x,v 1.47 2025/01/19 00:51:10 tom Exp $
++.TH form_field_opts 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.ie \n(.g \{\
++.ds `` \(lq
++.ds '' \(rq
++.\}
++.el \{\
++.ie t .ds `` ``
++.el   .ds `` ""
++.ie t .ds '' ''
++.el   .ds '' ""
++.\}
+ .SH NAME
+ \fBset_field_opts\fP,
+ \fBfield_opts_on\fP,
+@@ -46,8 +56,8 @@
+ \fBint field_opts_off(FIELD *\fIfield\fP, Field_Options \fIopts\fP);
+ .fi
+ .SH DESCRIPTION
+-The function \fBset_field_opts\fP sets all the given field's option bits (field
+-option bits may be logically-OR'ed together).
++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\fP turns on the given option bits, and leaves
+ others alone.
+Index: man/form_field_validation.3x
+Prereq:  1.55 
+--- ncurses-6.5-20250111+/man/form_field_validation.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/form_field_validation.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_validation.3x,v 1.55 2024/12/28 21:26:21 tom Exp $
+-.TH form_field_validation 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: form_field_validation.3x,v 1.58 2025/01/19 00:51:10 tom Exp $
++.TH form_field_validation 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -174,7 +174,7 @@
+ or "^ *[0\-9]* *$" which is good for
+ leading and trailing spaces around the digits.
+ .SS TYPE_IPV4
+-An Internet Protocol Version 4 address.
++An Internet Protocol Version\ 4 address.
+ Required parameter:
+ .bP
+ none
+Index: man/form_fieldtype.3x
+Prereq:  1.48 
+--- ncurses-6.5-20250111+/man/form_fieldtype.3x	2024-12-28 21:26:21.000000000 +0000
++++ ncurses-6.5-20250118/man/form_fieldtype.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,19 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_fieldtype.3x,v 1.48 2024/12/28 21:26:21 tom Exp $
+-.TH form_fieldtype 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: form_fieldtype.3x,v 1.51 2025/01/19 00:51:10 tom Exp $
++.TH form_fieldtype 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.ie \n(.g \{\
++.ds `` \(lq
++.ds '' \(rq
++.\}
++.el \{\
++.ie t .ds `` ``
++.el   .ds `` ""
++.ie t .ds '' ''
++.el   .ds '' ""
++.\}
++.
+ .de bP
+ .ie n  .IP \(bu 4
+ .el    .IP \(bu 2
+@@ -121,7 +132,7 @@
+ .SS link_fieldtype
+ The function \fBlink_fieldtype\fP creates
+ a new field type from the two given types.
+-They are connected by an logical 'OR'.
++They are connected by a logical \*(``or\*(''.
+ .SH RETURN VALUE
+ The pointer-valued routines return NULL on error.
+ They set \fBerrno\fP according to their success:
+Index: man/form_opts.3x
+Prereq:  1.34 
+--- ncurses-6.5-20250111+/man/form_opts.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20250118/man/form_opts.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,18 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_opts.3x,v 1.34 2024/03/16 15:35:01 tom Exp $
+-.TH form_opts 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: form_opts.3x,v 1.37 2025/01/19 00:51:10 tom Exp $
++.TH form_opts 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.ie \n(.g \{\
++.ds `` \(lq
++.ds '' \(rq
++.\}
++.el \{\
++.ie t .ds `` ``
++.el   .ds `` ""
++.ie t .ds '' ''
++.el   .ds '' ""
++.\}
+ .SH NAME
+ \fBset_form_opts\fP,
+ \fBform_opts_on\fP,
+@@ -46,8 +56,8 @@
+ \fBint form_opts_off(FORM *\fIform\fP, Field_Options \fIopts\fP);
+ .fi
+ .SH DESCRIPTION
+-The function \fBset_form_opts\fP sets all the given form's option bits (form
+-option bits may be logically-OR'ed together).
++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\fP turns on the given option bits, and leaves
+ others alone.
+Index: man/infocmp.1m
+Prereq:  1.117 
+--- ncurses-6.5-20250111+/man/infocmp.1m	2024-12-28 21:36:19.000000000 +0000
++++ ncurses-6.5-20250118/man/infocmp.1m	2025-01-19 00:51:10.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: infocmp.1m,v 1.117 2024/12/28 21:36:19 tom Exp $
+-.TH @INFOCMP@ 1M 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: infocmp.1m,v 1.122 2025/01/19 00:51:10 tom Exp $
++.TH @INFOCMP@ 1M 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -352,7 +352,7 @@
+ superfluous.
+ \fB@INFOCMP@\fP will flag any other \fIterminal-type use=\fP fields that
+ were not needed.
+-.SS "Changing Databases [\-A \f(BIdirectory\fP] [\-B \f(BIdirectory\fP]"
++.SS "Changing Databases [\-A \fIdirectory\fP] [\-B \fIdirectory\fP]"
+ Like other \fI\%ncurses\fP utilities,
+ \fB@INFOCMP@\fP looks for the terminal descriptions in several places.
+ You can use the \fI\%TERMINFO\fP and \fI\%TERMINFO_DIRS\fP environment
+@@ -686,7 +686,7 @@
+ .I \%ncurses
+ extensions.
+ .SH PORTABILITY
+-X/Open Curses, Issue 7 (2009) specifies
++X/Open Curses Issue\ 7 (2009) specifies
+ .IR \%infocmp "."
+ It does not mention options for producing descriptions in
+ .I \%term\%cap
+Index: man/infotocap.1m
+Prereq:  1.44 
+--- ncurses-6.5-20250111+/man/infotocap.1m	2024-07-27 19:43:16.000000000 +0000
++++ ncurses-6.5-20250118/man/infotocap.1m	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1999-2010,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: infotocap.1m,v 1.44 2024/07/27 19:43:16 tom Exp $
+-.TH @INFOTOCAP@ 1M 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: infotocap.1m,v 1.48 2025/01/19 00:51:10 tom Exp $
++.TH @INFOTOCAP@ 1M 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -80,8 +80,7 @@
+ .I @TERMINFO@
+ compiled terminal description database
+ .SH PORTABILITY
+-None of X/Open Curses,
+-Issue 7 (2009),
++None of X/Open Curses Issue\ 7 (2009),
+ SVr4,
+ or NetBSD document this application.
+ .SH AUTHORS
+Index: man/man_db.renames.in
+Prereq:  1.79 
+--- ncurses-6.5-20250111+/man/man_db.renames.in	2024-12-28 21:30:24.000000000 +0000
++++ ncurses-6.5-20250118/man/man_db.renames.in	2025-01-19 01:00:28.000000000 +0000
+@@ -1,5 +1,5 @@
+ ##############################################################################
+-# Copyright 2019-2023,2024 Thomas E. Dickey                                  #
++# Copyright 2019-2024,2025 Thomas E. Dickey                                  #
+ # Copyright 1998-2015,2017 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: man_db.renames.in,v 1.79 2024/12/28 21:30:24 Branden.Robinson Exp $
++# $Id: man_db.renames.in,v 1.83 2025/01/19 01:00:28 tom Exp $
+ # Manual-page renamings for the man_db program
+ #
+ # Files:
+@@ -205,6 +205,7 @@
+ getattr.3x			getattr.3ncurses
+ getcchar.3x			getcchar.3ncurses
+ getch.3x			getch.3ncurses
++getstr.3x			getstr.3ncurses
+ getwin.3x			getwin.3ncurses
+ getyx.3x			getyx.3ncurses
+ halfdelay.3x			halfdelay.3ncurses
+@@ -238,7 +239,7 @@
+ pnoutrefresh.3x			pnoutrefresh.3ncurses
+ prefresh.3x			prefresh.3ncurses
+ printw.3x			printw.3ncurses
+-putp.3x			putp.3ncurses
++putp.3x				putp.3ncurses
+ putwin.3x			putwin.3ncurses
+ raw.3x				raw.3ncurses
+ refresh.3x			refresh.3ncurses
+@@ -267,6 +268,7 @@
+ tputs.3x			tputs.3ncurses
+ trace.3x			trace.3ncurses
+ unctrl.3x			unctrl.3ncurses
++ungetch.3x			ungetch.3ncurses
+ use_default_colors.3x		use_default_colors.3ncurses
+ use_env.3x			use_env.3ncurses
+ use_extended_names.3x		use_extended_names.3ncurses
+Index: man/manhtml.aliases
+Prereq:  1.42 
+--- ncurses-6.5-20250111+/man/manhtml.aliases	2024-12-28 21:50:30.000000000 +0000
++++ ncurses-6.5-20250118/man/manhtml.aliases	2025-01-19 01:13:04.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: manhtml.aliases,v 1.42 2024/12/28 21:50:30 tom Exp $
++# $Id: manhtml.aliases,v 1.46 2025/01/19 01:13:04 tom Exp $
+ #***************************************************************************
+-# Copyright 2019-2023,2024 Thomas E. Dickey                                *
++# Copyright 2019-2024,2025 Thomas E. Dickey                                *
+ # Copyright 2013,2017 Free Software Foundation, Inc.                       *
+ #                                                                          *
+ # Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -60,6 +60,7 @@
+ get_wch(3X)		curs_get_wch(3X)
+ getcchar(3X)		curs_getcchar(3X)
+ getch(3X)		curs_getch(3X)
++getstr(3X)		curs_getstr(3X)
+ getwin(3X)		curs_util(3X)
+ getyx(3X)		curs_getyx(3X)
+ halfdelay(3X)		curs_inopts(3X)
+@@ -113,6 +114,7 @@
+ touchwin(3X)		curs_touch(3X)
+ tparm(3X)		curs_terminfo(3X)
+ tputs(3X)		curs_terminfo(3X)
++ungetch(3X)		curs_util(3X)
+ use_default_colors(3X)	default_colors(3X)
+ use_env(3X)		curs_util(3X)
+ use_extended_names(3X)	curs_extend(3X)
+Index: man/menu_opts.3x
+Prereq:  1.35 
+--- ncurses-6.5-20250111+/man/menu_opts.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20250118/man/menu_opts.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,18 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_opts.3x,v 1.35 2024/03/16 15:35:01 tom Exp $
+-.TH menu_opts 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: menu_opts.3x,v 1.38 2025/01/19 00:51:10 tom Exp $
++.TH menu_opts 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.ie \n(.g \{\
++.ds `` \(lq
++.ds '' \(rq
++.\}
++.el \{\
++.ie t .ds `` ``
++.el   .ds `` ""
++.ie t .ds '' ''
++.el   .ds '' ""
++.\}
+ .SH NAME
+ \fBset_menu_opts\fP,
+ \fBmenu_opts_on\fP,
+@@ -46,8 +56,8 @@
+ \fBint menu_opts_off(MENU *\fImenu\fP, Menu_Options \fIopts\fP);
+ .fi
+ .SH DESCRIPTION
+-The function \fBset_menu_opts\fP sets all the given menu's option bits (menu
+-option bits may be logically-OR'ed together).
++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\fP turns on the given option bits, and leaves
+ others alone.
+Index: man/mitem_opts.3x
+Prereq:  1.33 
+--- ncurses-6.5-20250111+/man/mitem_opts.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20250118/man/mitem_opts.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,18 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: mitem_opts.3x,v 1.33 2024/03/16 15:35:01 tom Exp $
+-.TH mitem_opts 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: mitem_opts.3x,v 1.36 2025/01/19 00:51:10 tom Exp $
++.TH mitem_opts 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.ie \n(.g \{\
++.ds `` \(lq
++.ds '' \(rq
++.\}
++.el \{\
++.ie t .ds `` ``
++.el   .ds `` ""
++.ie t .ds '' ''
++.el   .ds '' ""
++.\}
+ .SH NAME
+ \fBset_item_opts\fP,
+ \fBitem_opts_on\fP,
+@@ -46,8 +56,8 @@
+ \fBint item_opts_off(ITEM *\fIitem\fP, Item_Options \fIopts\fP);
+ .fi
+ .SH DESCRIPTION
+-The function \fBset_item_opts\fP sets all the given item's option bits (menu
+-option bits may be logically-OR'ed together).
++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\fP turns on the given option bits, and leaves
+ others alone.
+Index: man/ncurses.3x
+Prereq:  1.236 
+--- ncurses-6.5-20250111+/man/ncurses.3x	2024-12-28 21:27:26.000000000 +0000
++++ ncurses-6.5-20250118/man/ncurses.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: ncurses.3x,v 1.236 2024/12/28 21:27:26 tom Exp $
+-.TH ncurses 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: ncurses.3x,v 1.243 2025/01/19 00:51:10 tom Exp $
++.TH ncurses 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -392,7 +392,7 @@
+ .IR \%term\%info .
+ An
+ .I \%ncurses
+-extension supports resizable terminals;
++extension supports resizable terminal displays;
+ see \fB\%wresize\fP(3X).
+ .PP
+ If the environment variable
+@@ -442,6 +442,7 @@
+ wch	a \fIcchar_t\fP
+ win	pointer to a \fIWINDOW\fP
+ pad	pointer to a \fIWINDOW\fP that is a pad
++pair	a foreground/background color pair identifier
+ .TE
+ .SS "Wide and Non-wide Character Configurations"
+ This man page primarily surveys functions that appear in any
+@@ -619,7 +620,7 @@
+ .TS
+ center tab(/);
+ l l .
+-\f(BIcurses\fP Function Name/Man Page
++\fIcurses\fP Function Name/Man Page
+ _
+ COLOR_PAIR/\fBcurs_color\fP(3X)
+ PAIR_NUMBER/\fBcurs_color\fP(3X)
+@@ -1807,7 +1808,7 @@
+ when compiling for the wide-character library
+ to use the extended (wide-character) functions.
+ The symbol which enables these features has changed
+-since X/Open Curses, Issue 4:
++since X/Open Curses Issue\ 4:
+ .bP
+ Originally, the wide-character feature required the symbol
+ \fB_XOPEN_SOURCE_EXTENDED\fP
+@@ -1818,7 +1819,7 @@
+ As of mid-2018,
+ none of the features in this implementation require a \fB_XOPEN_SOURCE\fP
+ feature greater than 600.
+-However, X/Open Curses, Issue 7 (2009) recommends defining it to 700.
++However, X/Open Curses Issue\ 7 (2009) recommends defining it to 700.
+ .bP
+ Alternatively, you can enable the feature by defining \fBNCURSES_WIDECHAR\fP
+ with the caveat that some other header file than \fBcurses.h\fP
+Index: man/new_pair.3x
+Prereq:  1.46 
+--- ncurses-6.5-20250111+/man/new_pair.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20250118/man/new_pair.3x	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2017 Free Software Foundation, Inc.                            *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey
+ .\"
+-.\" $Id: new_pair.3x,v 1.46 2024/03/16 15:35:01 tom Exp $
+-.TH new_pair 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: new_pair.3x,v 1.49 2025/01/19 00:51:10 tom Exp $
++.TH new_pair 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -115,7 +115,8 @@
+ .SS alloc_pair
+ The \fBalloc_pair\fP function accepts parameters for
+ foreground and background color, and
+-checks if that color combination is already associated with a color pair.
++checks whether that color combination
++is already associated with a color pair.
+ .bP
+ If the combination already exists,
+ \fBalloc_pair\fP returns the existing pair.
+@@ -135,7 +136,8 @@
+ .SS find_pair
+ The \fBfind_pair\fP function accepts parameters for
+ foreground and background color, and
+-checks if that color combination is already associated with a color pair,
++checks whether that color combination
++is already associated with a color pair,
+ returning the pair number if it has been allocated.
+ Otherwise it returns \-1.
+ .SS free_pair
+Index: man/scr_dump.5
+Prereq:  1.46 
+--- ncurses-6.5-20250111+/man/scr_dump.5	2024-03-23 20:42:29.000000000 +0000
++++ ncurses-6.5-20250118/man/scr_dump.5	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2017 Free Software Foundation, Inc.                            *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: scr_dump.5,v 1.46 2024/03/23 20:42:29 tom Exp $
+-.TH scr_dump 5 2024-03-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
++.\" $Id: scr_dump.5,v 1.50 2025/01/19 00:51:10 tom Exp $
++.TH scr_dump 5 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -135,7 +135,7 @@
+ screen dumps.
+ A brief survey of the existing implementations follows.
+ .SS "X/Open Curses"
+-X/Open Curses, Issue 7 specifies little.
++X/Open Curses Issue\ 7 specifies little.
+ It says
+ (boldface emphasis added)
+ .RS 3
+Index: man/tabs.1
+Prereq:  1.65 
+--- ncurses-6.5-20250111+/man/tabs.1	2024-09-21 18:04:07.000000000 +0000
++++ ncurses-6.5-20250118/man/tabs.1	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tabs.1,v 1.65 2024/09/21 18:04:07 tom Exp $
+-.TH @TABS@ 1 2024-09-21 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: tabs.1,v 1.68 2025/01/19 00:51:10 tom Exp $
++.TH @TABS@ 1 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -301,9 +301,9 @@
+ .PP
+ The
+ .B +m
+-option was documented in the POSIX Base Specifications Issue 5
++option was documented in the POSIX Base Specifications Issue\ 5
+ (Unix98, 1997),
+-then omitted in Issue 6
++then omitted in Issue\ 6
+ (Unix03, 2004)
+ without express motivation,
+ though an introductory comment
+@@ -331,7 +331,7 @@
+ attempts to set tab stops up to the right margin
+ if the list thereof is sufficiently long.
+ .PP
+-The \*(``Rationale\*('' section of the Issue 6
++The \*(``Rationale\*('' section of the Issue\ 6
+ .I tabs
+ reference page
+ .\" https://pubs.opengroup.org/onlinepubs/009604499/utilities/tabs.html
+Index: man/terminfo.tail
+Prereq:  1.154 
+--- ncurses-6.5-20250111+/man/terminfo.tail	2024-12-28 21:21:36.000000000 +0000
++++ ncurses-6.5-20250118/man/terminfo.tail	2025-01-19 00:51:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 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: terminfo.tail,v 1.154 2024/12/28 21:21:36 Branden.Robinson Exp $
++.\" $Id: terminfo.tail,v 1.156 2025/01/19 00:51:10 tom Exp $
+ .ps +1
+ .SS "User-Defined Capabilities"
+ .
+@@ -186,7 +186,8 @@
+ X/Open Curses does not say what \*(``appropriate \fIx\fP\*('' might be.
+ In practice, that is a printable ASCII graphic character.
+ The special case \*(``\*^?\*('' is interpreted as DEL (127).
+-In all other cases, the character value is AND'd with 0x1f,
++In all other cases,
++the character value is logically \*(``and\*(''-ed with 0x1f,
+ mapping to ASCII control codes in the range 0 through 31.
+ .PP
+ Other escapes include
+@@ -569,13 +570,15 @@
+ arithmetic (%m is \fImod\fP): \fIpush(pop() op pop())\fP
+ .TP
+ \fB%&\fP, \fB%|\fP, \fB%\*^\fP
+-bit operations (AND, OR and exclusive-OR): \fIpush(pop() op pop())\fP
++bit operations
++(\*(``and\*('', \*(``or\*('' and exclusive \*(``or\*(''):
++\fIpush(pop() op pop())\fP
+ .TP
+ \fB%=\fP, \fB%>\fP, \fB%<\fP
+ logical operations: \fIpush(pop() op pop())\fP
+ .TP
+ \fB%A\fP, \fB%O\fP
+-logical AND and OR operations (for conditionals)
++logical \*(``and\*('' and \*(``or\*('' operations (for conditionals)
+ .TP
+ \fB%!\fP, \fB%\*~\fP
+ unary operations (logical and bit complement): \fIpush(op pop())\fP
+Index: man/tic.1m
+Prereq:  1.113 
+--- ncurses-6.5-20250111+/man/tic.1m	2024-09-14 20:06:50.000000000 +0000
++++ ncurses-6.5-20250118/man/tic.1m	2025-01-19 00:51:54.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tic.1m,v 1.113 2024/09/14 20:06:50 tom Exp $
+-.TH @TIC@ 1M 2024-09-14 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: tic.1m,v 1.117 2025/01/19 00:51:54 tom Exp $
++.TH @TIC@ 1M 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -520,13 +520,13 @@
+ \fI$HOME/.terminfo\fP database unless \fI\%TERMINFO\fP is explicitly set
+ to it.
+ .SH PORTABILITY
+-X/Open Curses, Issue 7 (2009) provides a brief description of \fBtic\fP.
++X/Open Curses Issue\ 7 (2009) provides a brief description of \fBtic\fP.
+ It lists one option: \fB\-c\fP.
+ The omission of \fB\-v\fP is unexpected.
+ The change history states that the description is derived from Tru64.
+ According to its manual pages, that system also supported the \fB\-v\fP option.
+ .PP
+-Shortly after Issue 7 was released, Tru64 was discontinued.
++Shortly after Issue\ 7 was released, Tru64 was discontinued.
+ As of 2019, the surviving implementations of \fBtic\fP
+ are SVr4 (AIX, HP-UX and Solaris),
+ \fI\%ncurses\fP
+Index: man/tput.1
+Prereq:  1.122 
+--- ncurses-6.5-20250111+/man/tput.1	2024-12-28 21:27:26.000000000 +0000
++++ ncurses-6.5-20250118/man/tput.1	2025-01-19 00:51:54.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tput.1,v 1.122 2024/12/28 21:27:26 tom Exp $
+-.TH @TPUT@ 1 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: tput.1,v 1.130 2025/01/19 00:51:54 tom Exp $
++.TH @TPUT@ 1 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -64,7 +64,8 @@
+ .PP
+ \fB@TPUT@\fP [\fB\-v\fP] \fB\-V\fP
+ .SH DESCRIPTION
+-\fB\%@TPUT@\fP uses the
++.B \%@TPUT@
++uses the
+ .I \%term\%info
+ library and database to make terminal-specific capabilities and
+ information available to the shell,
+@@ -84,7 +85,8 @@
+ the result depends upon the capability's type.
+ .TP 9 \" "Boolean" + 2n
+ Boolean
+-\fB\%@TPUT@\fP sets its exit status to
++.B \%@TPUT@
++sets its exit status to
+ .B 0
+ if the terminal possesses
+ .IR cap-code ,
+@@ -93,7 +95,8 @@
+ if it does not.
+ .TP
+ numeric
+-\fB\%@TPUT@\fP writes
++.B \%@TPUT@
++writes
+ .IR cap-code 's
+ decimal value to the standard output stream if defined
+ .RB ( \-1
+@@ -101,13 +104,16 @@
+ followed by a newline.
+ .TP
+ string
+-\fB\%@TPUT@\fP writes
++.B \%@TPUT@
++writes
+ .IR cap-code 's
+ value to the standard output stream if defined,
+ without a trailing newline.
+ .PP
+ Before using a value returned on the standard output,
+-the application should test \fB\%@TPUT@\fP's exit status
++the application should test
++.B \%@TPUT@ "'s"
++exit status
+ to be sure it is 0;
+ see section \*(``EXIT STATUS\*('' below.
+ .SS Operands
+@@ -116,7 +122,8 @@
+ .IR cap-code ,
+ a capability code from the terminal database,
+ or a parameter thereto.
+-Three others are specially recognized by \fB\%@TPUT@\fP:
++Three others are specially recognized by
++.BR \%@TPUT@ ":"
+ .BR init ,
+ .BR \%reset ,
+ and
+@@ -131,18 +138,23 @@
+ If
+ .I cap-code
+ is of string type and takes parameters,
+-\fB\%@TPUT@\fP interprets arguments following
++.B \%@TPUT@
++interprets arguments following
+ .I cap-code
+ as the parameters,
+ up to the (fixed) quantity the capability requires.
+ .IP
+ Most parameters are numeric.
+ Only a few terminal capabilities require string parameters;
+-\fB\%@TPUT@\fP uses a table to decide which to pass as strings.
+-Normally \fB\%@TPUT@\fP uses \fB\%tparm\fP(3X) to perform the
++.B \%@TPUT@
++uses a table to decide which to pass as strings.
++Normally
++.B \%@TPUT@
++uses \fB\%tparm\fP(3X) to perform the
+ substitution.
+ If no parameters are given for the capability,
+-\fB\%@TPUT@\fP writes the string without performing the substitution.
++.B \%@TPUT@
++writes the string without performing the substitution.
+ .TP
+ .B init
+ initializes the terminal.
+@@ -152,7 +164,8 @@
+ .RS
+ .TP 5
+ (1)
+-\fB\%@TPUT@\fP retrieves the terminal's mode settings.
++.B \%@TPUT@
++retrieves the terminal's mode settings.
+ It successively tests the file descriptors corresponding to
+ .RS
+ .bP
+@@ -168,15 +181,18 @@
+ .IP
+ to obtain terminal settings.
+ Having retrieved them,
+-\fB\%@TPUT@\fP remembers which descriptor to use for further updates.
++.B \%@TPUT@
++remembers which descriptor to use for further updates.
+ .TP
+ (2)
+ If the terminal dimensions cannot be obtained from the operating system,
+ but the environment or terminal type database entry describes them,
+-\fB\%@TPUT@\fP updates the operating system's notion of them.
++.B \%@TPUT@
++updates the operating system's notion of them.
+ .TP
+ (3)
+-\fB\%@TPUT@\fP updates the terminal modes.
++.B \%@TPUT@
++updates the terminal modes.
+ .RS
+ .bP
+ Any delays specified in the entry
+@@ -198,10 +214,12 @@
+ detailed in subsection \*(``Tabs and Initialization\*('' of
+ \fB\%terminfo\fP(5),
+ are present,
+-\fB\%@TPUT@\fP writes them to the standard output stream.
++.B \%@TPUT@
++writes them to the standard output stream.
+ .TP
+ (5)
+-\fB\%@TPUT@\fP flushes the standard output stream.
++.B \%@TPUT@
++flushes the standard output stream.
+ .RE
+ .IP
+ If an entry lacks the information needed for an activity above,
+@@ -213,7 +231,8 @@
+ .RS
+ .TP 5
+ (1)
+-\fB\%@TPUT@\fP sets the the terminal modes to a \*(``sane\*('' state,
++.B \%@TPUT@
++sets the the terminal modes to a \*(``sane\*('' state,
+ .RS
+ .bP
+ enabling canonical (\*(``cooked\*('') and echo modes,
+@@ -223,14 +242,16 @@
+ enabling newline translation,
+ and
+ .bP
+-setting any unset special characters to their default values.
++setting any special input characters to their default values.
+ .RE
+ .TP 5
+ (2)
+ If any reset capabilities are defined for the terminal type,
+-\fB\%@TPUT@\fP writes them to the output stream.
++.B \%@TPUT@
++writes them to the output stream.
+ Otherwise,
+-\fB\%@TPUT@\fP uses any defined initialization capabilities.
++.B \%@TPUT@
++uses any defined initialization capabilities.
+ Reset capabilities are detailed in subsection
+ \*(``Tabs and Initialization\*('' of \fB\%terminfo\fP(5).
+ .RE
+@@ -253,7 +274,8 @@
+ .IP
+ If the terminal database is present and an entry for the user's terminal
+ type exists,
+-\fB\%@TPUT@\fP reports its description to the standard output stream,
++.B \%@TPUT@
++reports its description to the standard output stream,
+ without a trailing newline.
+ See \fB\%terminfo\fP(5).
+ .PP
+@@ -265,9 +287,11 @@
+ to a file will capture only part of their actions.
+ Changes to the terminal modes are not affected by file descriptor
+ redirection,
+-since the terminal modes are altered via \fB\%ioctl\fP(2).
++since the terminal modes are altered via \fI\%ioctl\fP(2).
+ .SS Aliases
+-If \fB\%@TPUT@\fP is invoked via link with any of the names
++If
++.B \%@TPUT@
++is invoked via link with any of the names
+ .BR clear ,
+ .BR init ,
+ or
+@@ -277,13 +301,15 @@
+ For example,
+ executing a link named
+ .B \%reset
+-that points to \fB\%@TPUT@\fP has the same effect as
++that points to
++.B \%@TPUT@
++has the same effect as
+ .RB \%\*(`` "@TPUT@ \%reset" \*(''.
+ .PP
+ This feature was introduced by
+ .I \%ncurses
+ 5.2 in 2000.
+-It is rarely used:
++It is rarely used.
+ .TP
+ .B \%clear
+ is a separate program,
+@@ -300,7 +326,8 @@
+ Besides the pseudo-capabilities
+ (such as
+ .BR init ),
+-\fB\%@TPUT@\fP treats the
++.B \%@TPUT@
++treats the
+ .B lines
+ and
+ .B cols
+@@ -309,7 +336,8 @@
+ it may call \fB\%setupterm\fP(3X) to obtain the terminal size.
+ .bP
+ First,
+-\fB\%@TPUT@\fP attempts to obtain these capabilities from the terminal
++.B \%@TPUT@
++attempts to obtain these capabilities from the terminal
+ database.
+ This generally fails for terminal emulators,
+ which lack a fixed window size and thus omit the capabilities.
+@@ -329,7 +357,8 @@
+ If the
+ .B \-T
+ option is given,
+-\fB\%@TPUT@\fP ignores the environment variables by calling
++.B \%@TPUT@
++ignores the environment variables by calling
+ .BR \%use_tioctl(TRUE) ,
+ relying upon the operating system
+ (or,
+@@ -338,8 +367,11 @@
+ .SH OPTIONS
+ .TP 9n \" "-T type" + 2n
+ .B \-S
+-retrieves more than one capability per invocation of \fB\%@TPUT@\fP.
+-The capabilities must be passed to \fB\%@TPUT@\fP from the standard
++retrieves more than one capability per invocation of
++.BR \%@TPUT@ "."
++The capabilities must be passed to
++.B \%@TPUT@
++from the standard
+ input stream instead of from the command line
+ (see section \*(``EXAMPLES\*('' below).
+ Only one
+@@ -355,7 +387,8 @@
+ (see section \*(``EXIT STATUS\*('' below).
+ .IP
+ Some capabilities use string parameters rather than numeric ones.
+-\fB\%@TPUT@\fP employs a built-in table and the presence of parameters
++.B \%@TPUT@
++employs a built-in table and the presence of parameters
+ in its input to decide how to interpret them,
+ and whether to use \fB\%tparm\fP(3X).
+ .TP
+@@ -374,13 +407,16 @@
+ are also ignored.
+ .TP
+ .B \-v
+-causes \fB\%@TPUT@\fP to operate verbosely,
++causes
++.B \%@TPUT@
++to operate verbosely,
+ reporting warnings.
+ .TP
+ .B \-V
+ reports the version of
+ .I \%ncurses
+-associated with \fB\%@TPUT@\fP,
++associated with
++.BR \%@TPUT@ ","
+ and exits with a successful status.
+ .TP
+ .B \-x
+@@ -389,7 +425,9 @@
+ from attempting to clear the scrollback buffer.
+ .SH EXIT STATUS
+ Normally,
+-one should interpret \fB\%@TPUT@\fP's exit statuses as follows.
++one should interpret
++.BR \%@TPUT@ "'s"
++exit statuses as follows.
+ .PP
+ .if n .ne 3
+ .if t .ne 2
+@@ -423,15 +461,22 @@
+ 4	some operands not interpreted
+ .TE
+ .SH ENVIRONMENT
+-\fB@TPUT@\fP reads one environment variable.
+-.TP 8n \" "TERM" + 2n + adjustment for PDF
++.B \%@TPUT@
++reads up to three environment variables
++if the
++.B \-T
++option is not specified.
++.TP 9n \" "COLUMNS" + 2n
++.I COLUMNS
++specifies the width of the screen in characters.
++.TP
++.I LINES
++specifies the height of the screen in characters.
++.TP
+ .I TERM
+ denotes the terminal type.
+ Each terminal type is distinct,
+ though many are similar.
+-The
+-.B \-T
+-option overrides its value.
+ .SH FILES
+ .TP
+ .I @DATADIR@/tabset
+@@ -442,11 +487,11 @@
+ .SH PORTABILITY
+ Over time
+ .I \%ncurses
+-\fB\%@TPUT@\fP
++.B \%@TPUT@
+ has differed from that of System\ V in two important respects,
+ one now mostly historical.
+ .bP
+-\%\*(``\fB@TPUT@\fP
++.RB \%\*(`` @TPUT@
+ .IR cap-code \*(''
+ writes to the standard output,
+ which need not be a terminal device.
+@@ -455,12 +500,12 @@
+ output.
+ .IP
+ System\ V
+-.BR tput 's
++.IR tput 's
+ .B init
+ and
+ .B \%reset
+ operands use logic from 4.1cBSD
+-.BR tset ,
++.IR tset ,
+ manipulating terminal modes.
+ It checks the same file descriptors
+ (and
+@@ -477,18 +522,21 @@
+ .I \%ncurses
+ 6.1
+ (see section \*(``HISTORY\*('' below),
+-\fB\%@TPUT@\fP did not modify terminal modes.
++.B \%@TPUT@
++did not modify terminal modes.
+ It now employs a scheme similar to System\ V,
+-using functions shared with \fB\%@TSET@\fP
++using functions shared with
++.B \%@TSET@
+ (and ultimately based on 4.4BSD
+-.BR tset ).
++.IR tset ).
+ If it is not able to open a terminal
+ (for instance,
+ when run by \fIcron\fP(1)),
+-\fB\%@TPUT@\fP exits with an error status.
++.B \%@TPUT@
++exits with an error status.
+ .bP
+ System\ V
+-.B tput
++.I tput
+ assumes that the type of a
+ .I cap-code
+ operand is numeric if all the characters of its value are decimal
+@@ -502,10 +550,12 @@
+ .I cap-code
+ operands use the \fB\%tparm\fP(3X) function to expand its parameters.
+ That function expects a mixture of numeric and string parameters,
+-requiring \fB\%@TPUT@\fP to know which type to use.
++requiring
++.B \%@TPUT@
++to know which type to use.
+ .IP
+ .I \%ncurses
+-\fB\%@TPUT@\fP
++.B \%@TPUT@
+ uses a table to determine the parameter types for
+ the standard
+ .I cap-code
+@@ -520,7 +570,7 @@
+ .I \%ncurses
+ to port NetBSD's
+ .IR termcap -based
+-.B tput
++.I tput
+ to
+ .IR \%term\%info ,
+ and modified it to interpret multiple
+@@ -617,7 +667,7 @@
+ and in 1994,
+ NetBSD added support for the parameter-substitution features.
+ .PP
+-IEEE Std 1003.1/The Open Group Base Specifications Issue 7
++IEEE Std 1003.1/The Open Group Base Specifications Issue\ 7
+ (POSIX.1-2008)
+ documents only the
+ .BR clear ,
+@@ -639,7 +689,7 @@
+ do not correspond to terminal capabilities.
+ .bP
+ The
+-.B tput
++.I tput
+ on SVr4-based systems such as Solaris,
+ IRIX64,
+ and HP-UX,
+@@ -653,11 +703,11 @@
+ codes rather than
+ .I \%term\%info
+ capability codes in their respective
+-.B tput
++.I tput
+ commands.
+ Since 2010,
+ NetBSD's
+-.B tput
++.I tput
+ uses
+ .I \%term\%info
+ codes.
+@@ -684,7 +734,7 @@
+ Unix systems support the full set of capability codes,
+ the reason for documenting only a few may not be apparent.
+ .bP
+-X/Open Curses Issue 7 documents
++X/Open Curses Issue\ 7 documents
+ .B tput
+ differently,
+ with
+@@ -693,23 +743,23 @@
+ .bP
+ That is,
+ there are two standards for
+-.BR tput :
++.IR tput :
+ POSIX (a subset) and X/Open Curses (the full implementation).
+ POSIX documents a subset to avoid the complication of including
+ X/Open Curses and the terminal capability database.
+ .bP
+ While it is certainly possible to write a
+-.B tput
++.I tput
+ program without using
+ .IR curses ,
+ no system with a
+ .I curses
+ implementation provides a
+-.B tput
++.I tput
+ utility that does not also support standard
+ .IR cap-codes .
+ .PP
+-X/Open Curses Issue 7 (2009) is the first version to document utilities.
++X/Open Curses Issue\ 7 (2009) is the first version to document utilities.
+ However that part of X/Open Curses does not follow existing practice
+ (that is,
+ System\ V
+@@ -746,7 +796,7 @@
+ nor X/Open Curses.
+ .SH HISTORY
+ Bill Joy wrote a
+-.B tput
++.I tput
+ command during development of 4BSD in October 1980.
+ This initial version only cleared the screen,
+ and did not ship with official distributions.
+@@ -756,15 +806,15 @@
+ .\" See Spinellis's "unix-history-repo" on GitHub.
+ .PP
+ System\ V developed a different
+-.B tput
++.I tput
+ command.
+ .bP
+ SVr2 (1984) provided a rudimentary
+-.B tput
++.I tput
+ that checked the parameter against each
+ predefined capability and returned the corresponding value.
+ This version of
+-.B tput
++.I tput
+ did not use \fB\%tparm\fP(3X) for parameterized capabilities.
+ .bP
+ SVr3 (1987) replaced that
+@@ -780,7 +830,7 @@
+ incorporated the
+ .B \%reset
+ feature of BSD
+-.B tset
++.I tset
+ written by Eric Allman.
+ .bP
+ SVr4 (1989) added color initialization by using the
+@@ -794,11 +844,11 @@
+ logic.
+ .PP
+ Keith Bostic refactored BSD
+-.B tput
++.I tput
+ for shipment in 4.3BSD-Tahoe (1988),
+ then replaced it the next year with a new implementation based on
+ System\ V
+-.BR tput .
++.IR tput .
+ Bostic's version similarly accepted some parameters named for
+ .I \%term\%info
+ (pseudo-)capabilities:
+@@ -816,22 +866,23 @@
+ codes for other capabilities.
+ Also,
+ Bostic's BSD
+-.B tput
++.I tput
+ did not modify the terminal modes as the earlier BSD
+-.B tset
++.I tset
+ had done.
+ .PP
+ At the same time,
+ Bostic added a shell script named \*(``clear\*('' that used
+-.B tput
++.I tput
+ to clear the screen.
+ Both of these appeared in 4.4BSD,
+ becoming the \*(``modern\*('' BSD implementation of
+-.BR tput .
++.IR tput .
+ .PP
+ The origin of
+ .I \%ncurses
+-\fB\%@TPUT@\fP lies outside both System\ V and BSD,
++.B \%@TPUT@
++lies outside both System\ V and BSD,
+ in Ross Ridge's
+ .I \%mytinfo
+ package,
+@@ -841,7 +892,7 @@
+ Ridge's program made more sophisticated use of the terminal capabilities
+ than the BSD program.
+ Eric Raymond used that
+-.B tput
++.I tput
+ program
+ (and other parts of
+ .IR \%mytinfo )
+@@ -856,13 +907,19 @@
+ Before
+ .I \%ncurses
+ 6.1 (2018),
+-its \fB\%@TSET@\fP and \fB\%@TPUT@\fP utilities differed.
++its
++.B \%@TSET@
++and
++.B \%@TPUT@
++utilities differed.
+ .bP
+-\fB\%@TSET@\fP was more effective,
+-resetting the terminal modes and special characters.
++.B \%@TSET@
++was more effective,
++resetting the terminal's modes and special input characters.
+ .bP
+ On the other hand,
+-\fB\%@TSET@\fP's repertoire of terminal capabilities for resetting the
++.BR \%@TSET@ "'s"
++repertoire of terminal capabilities for resetting the
+ terminal was more limited;
+ it had only equivalents of
+ .B \%reset_1string
+@@ -872,12 +929,15 @@
+ and
+ .B \%reset_file
+ .RB ( rf ),
+-and not the tab stop and margin update features of \fB\%@TPUT@\fP.
++and not the tab stop and margin update features of
++.BR \%@TPUT@ "."
+ .PP
+ The
+-.B \%reset
+-program is traditionally an alias for \fB\%@TSET@\fP due to its ability
+-to reset terminal modes and special characters.
++.I \%reset
++program is traditionally an alias for
++.B \%@TSET@
++due to its ability
++to reset the terminal's modes and special input characters.
+ .PP
+ As of
+ .I \%ncurses
+@@ -886,7 +946,9 @@
+ Two minor differences remain.
+ .bP
+ When issuing a reset,
+-the \fB\%@TSET@\fP program
++the
++.B \%@TSET@
++program
+ checks whether the device appears to be a pseudoterminal
+ (as might be used by a terminal emulator program),
+ and,
+@@ -896,8 +958,11 @@
+ The two programs write the terminal initialization strings
+ to different streams;
+ that is,
+-standard error for \fB\%@TSET@\fP and
+-standard output for \fB\%@TPUT@\fP.
++standard error for
++.B \%@TSET@
++and
++standard output for
++.BR \%@TPUT@ "."
+ .SH EXAMPLES
+ .TP
+ .B "@TPUT@ init"
+Index: man/tset.1
+Prereq:  1.90 
+--- ncurses-6.5-20250111+/man/tset.1	2024-12-28 21:27:26.000000000 +0000
++++ ncurses-6.5-20250118/man/tset.1	2025-01-19 00:51:54.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tset.1,v 1.90 2024/12/28 21:27:26 tom Exp $
+-.TH @TSET@ 1 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: tset.1,v 1.94 2025/01/19 00:51:54 tom Exp $
++.TH @TSET@ 1 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -141,7 +141,7 @@
+ .bP
+ turns on newline translation and
+ .bP
+-resets any unset special characters to their default values
++resets special input characters to their default values
+ .PP
+ before
+ doing the terminal initialization described above.
+@@ -319,9 +319,9 @@
+ .I @TERMINFO@
+ compiled terminal description database directory
+ .SH PORTABILITY
+-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 \fB@TSET@\fP or \fB@RESET@\fP.
++X/Open Curses Issue\ 7 documents \fB@TSET@\fP or \fB@RESET@\fP.
+ .PP
+ The AT&T \fBtput\fP utility (AIX, HP-UX, Solaris)
+ incorporated the terminal-mode manipulation as well as termcap-based features
+Index: man/wresize.3x
+Prereq:  1.44 
+--- ncurses-6.5-20250111+/man/wresize.3x	2024-12-28 21:16:46.000000000 +0000
++++ ncurses-6.5-20250118/man/wresize.3x	2025-01-19 00:51:54.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1996
+ .\"
+-.\" $Id: wresize.3x,v 1.44 2024/12/28 21:16:46 tom Exp $
+-.TH wresize 3X 2024-12-28 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: wresize.3x,v 1.47 2025/01/19 00:51:54 tom Exp $
++.TH wresize 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%wresize\fP \-
+ resize a \fIcurses\fR window
+@@ -56,7 +56,7 @@
+ If either dimension is larger than its current value,
+ .I \%ncurses
+ fills the expanded part of the window
+-with the background character and rendition configured by
++with the window's background character as configured by
+ \fB\%wbkgdset\fP(3X)
+ (wide-character API: \fB\%wbkgrndset\fP(3X)).
+ .SH RETURN VALUE
+Index: ncurses/base/lib_color.c
+Prereq:  1.154 
+--- ncurses-6.5-20250111+/ncurses/base/lib_color.c	2024-12-14 23:49:54.000000000 +0000
++++ ncurses-6.5-20250118/ncurses/base/lib_color.c	2025-01-18 14:47:35.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -49,7 +49,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_color.c,v 1.154 2024/12/14 23:49:54 tom Exp $")
++MODULE_ID("$Id: lib_color.c,v 1.155 2025/01/18 14:47:35 tom Exp $")
+ 
+ #ifdef USE_TERM_DRIVER
+ #define CanChange      InfoOf(SP_PARM).canchange
+@@ -248,7 +248,7 @@
+ static bool
+ init_direct_colors(NCURSES_SP_DCL0)
+ {
+-    static NCURSES_CONST char name[] = "RGB";
++    static NCURSES_CONST char name[] = UserCap(RGB);
+ 
+     rgb_bits_t *result = &(SP_PARM->_direct_color);
+ 
+Index: ncurses/base/lib_dft_fgbg.c
+Prereq:  1.32 
+--- ncurses-6.5-20250111+/ncurses/base/lib_dft_fgbg.c	2024-12-07 20:00:48.000000000 +0000
++++ ncurses-6.5-20250118/ncurses/base/lib_dft_fgbg.c	2025-01-18 14:47:35.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2021,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -38,7 +38,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_dft_fgbg.c,v 1.32 2024/12/07 20:00:48 tom Exp $")
++MODULE_ID("$Id: lib_dft_fgbg.c,v 1.33 2025/01/18 14:47:35 tom Exp $")
+ 
+ /*
+  * Modify the behavior of color-pair 0 so that the library doesn't assume that
+@@ -76,7 +76,7 @@
+ 	if ((orig_pair || orig_colors) && !initialize_pair) {
+ 
+ 	    SP_PARM->_default_color = isDefaultColor(fg) || isDefaultColor(bg);
+-	    SP_PARM->_has_sgr_39_49 = (tigetflag("AX") == TRUE);
++	    SP_PARM->_has_sgr_39_49 = (tigetflag(UserCap(AX)) == TRUE);
+ 	    SP_PARM->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : fg;
+ 	    SP_PARM->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : bg;
+ 	    if (SP_PARM->_color_pairs != NULL) {
+Index: ncurses/base/lib_getstr.c
+Prereq:  1.40 
+--- ncurses-6.5-20250111+/ncurses/base/lib_getstr.c	2024-07-27 19:22:23.000000000 +0000
++++ ncurses-6.5-20250118/ncurses/base/lib_getstr.c	2025-01-19 00:51:54.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2011,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -42,7 +42,7 @@
+ #define NEED_KEY_EVENT
+ #include 
+ 
+-MODULE_ID("$Id: lib_getstr.c,v 1.40 2024/07/27 19:22:23 tom Exp $")
++MODULE_ID("$Id: lib_getstr.c,v 1.42 2025/01/19 00:51:54 tom Exp $")
+ 
+ /*
+  * This wipes out the last character, no matter whether it was a tab, control
+@@ -85,7 +85,7 @@
+     int ch;
+     int y, x;
+ 
+-    T((T_CALLED("wgetnstr(%p,%p,%d)"), (void *) win, (void *) str, maxlen));
++    T((T_CALLED("wgetnstr_events(%p,%p,%d)"), (void *) win, (void *) str, maxlen));
+ 
+     if (!win || !str)
+ 	returnCode(ERR);
+@@ -195,7 +195,7 @@
+     if (ch == ERR)
+ 	returnCode(ch);
+ 
+-    T(("wgetnstr returns %s", _nc_visbuf(oldstr)));
++    T(("wgetnstr_events returns %s", _nc_visbuf(oldstr)));
+ 
+ #ifdef KEY_EVENT
+     if (ch == KEY_EVENT)
+Index: ncurses/base/lib_mouse.c
+Prereq:  1.203 
+--- ncurses-6.5-20250111+/ncurses/base/lib_mouse.c	2024-12-07 17:40:33.000000000 +0000
++++ ncurses-6.5-20250118/ncurses/base/lib_mouse.c	2025-01-18 15:01:47.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 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.203 2024/12/07 17:40:33 tom Exp $")
++MODULE_ID("$Id: lib_mouse.c,v 1.205 2025/01/18 15:01:47 tom Exp $")
+ 
+ #include 
+ 
+@@ -388,7 +388,7 @@
+ {
+     sp->_mouse_type = M_XTERM;
+     sp->_mouse_format = MF_X10;
+-    sp->_mouse_xtermcap = tigetstr("XM");
++    sp->_mouse_xtermcap = tigetstr(UserCap(XM));
+     if (VALID_STRING(sp->_mouse_xtermcap)) {
+ 	char *code = strstr(sp->_mouse_xtermcap, "[?");
+ 	if (code != NULL) {
+@@ -417,7 +417,7 @@
+ 	    }
+ 	}
+     } else {
+-	int code = tigetnum("XM");
++	int code = tigetnum(UserCap(XM));
+ 	switch (code) {
+ #ifdef EXP_XTERM_1005
+ 	case 1005:
+Index: ncurses/curses.priv.h
+Prereq:  1.699 
+--- ncurses-6.5-20250111+/ncurses/curses.priv.h	2025-01-12 00:41:56.000000000 +0000
++++ ncurses-6.5-20250118/ncurses/curses.priv.h	2025-01-18 14:41:58.000000000 +0000
+@@ -35,7 +35,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: curses.priv.h,v 1.699 2025/01/12 00:41:56 tom Exp $
++ * $Id: curses.priv.h,v 1.700 2025/01/18 14:41:58 tom Exp $
+  *
+  *	curses.priv.h
+  *
+@@ -368,6 +368,12 @@
+ #define VT_ACSC "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~"
+ 
+ /*
++ * To make them easier to find, user-defined capabilities used within ncurses
++ * should be tagged with this macro:
++ */
++#define UserCap(name) #name
++
++/*
+  * Structure for palette tables
+  */
+ 
+Index: ncurses/tinfo/captoinfo.c
+Prereq:  1.105 
+--- ncurses-6.5-20250111+/ncurses/tinfo/captoinfo.c	2024-12-07 21:12:53.000000000 +0000
++++ ncurses-6.5-20250118/ncurses/tinfo/captoinfo.c	2025-01-12 10:51:43.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2021,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -98,7 +98,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: captoinfo.c,v 1.105 2024/12/07 21:12:53 tom Exp $")
++MODULE_ID("$Id: captoinfo.c,v 1.106 2025/01/12 10:51:43 tom Exp $")
+ 
+ #if 0
+ #define DEBUG_THIS(p) DEBUG(9, p)
+@@ -1028,7 +1028,7 @@
+ 	char buf[BUFSIZ];
+ 
+ 	++curr_line;
+-	if (fgets(buf, sizeof(buf), stdin) == 0)
++	if (fgets(buf, sizeof(buf), stdin) == NULL)
+ 	    break;
+ 	buf[strlen(buf) - 1] = '\0';
+ 	_nc_set_source(buf);
+Index: ncurses/tinfo/lib_setup.c
+Prereq:  1.248 
+--- ncurses-6.5-20250111+/ncurses/tinfo/lib_setup.c	2024-12-15 00:12:19.000000000 +0000
++++ ncurses-6.5-20250118/ncurses/tinfo/lib_setup.c	2025-01-18 14:47:35.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -49,7 +49,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: lib_setup.c,v 1.248 2024/12/15 00:12:19 tom Exp $")
++MODULE_ID("$Id: lib_setup.c,v 1.249 2025/01/18 14:47:35 tom Exp $")
+ 
+ /****************************************************************************
+  *
+@@ -797,7 +797,7 @@
+     T((T_CALLED("_nc_locale_breaks_acs:%d"), result));
+     if (getenv(env_name) != NULL) {
+ 	result = _nc_getenv_num(env_name);
+-    } else if ((value = tigetnum("U8")) >= 0) {
++    } else if ((value = tigetnum(UserCap(U8))) >= 0) {
+ 	result = value;		/* use extension feature */
+     } else if ((env = getenv("TERM")) != NULL) {
+ 	if (strstr(env, "linux")) {
+Index: ncurses/tinfo/lib_tparm.c
+Prereq:  1.155 
+--- ncurses-6.5-20250111+/ncurses/tinfo/lib_tparm.c	2024-12-07 18:26:59.000000000 +0000
++++ ncurses-6.5-20250118/ncurses/tinfo/lib_tparm.c	2025-01-18 14:47:35.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -53,7 +53,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: lib_tparm.c,v 1.155 2024/12/07 18:26:59 tom Exp $")
++MODULE_ID("$Id: lib_tparm.c,v 1.156 2025/01/18 14:47:35 tom Exp $")
+ 
+ /*
+  *	char *
+@@ -1128,11 +1128,11 @@
+ 	else {
+ 	    const char *check;
+ 
+-	    check = tigetstr("Cs");
++	    check = tigetstr(UserCap(Cs));
+ 	    if (CHECK_CAP(check))
+ 		want_type = 1;	/* style #1 */
+ 
+-	    check = tigetstr("Ms");
++	    check = tigetstr(UserCap(Ms));
+ 	    if (CHECK_CAP(check))
+ 		want_type = 3;	/* storage unit #1, content #2 */
+ 	}
+@@ -1356,11 +1356,11 @@
+ 	    else {
+ 		const char *check;
+ 
+-		check = tigetstr("xm");
++		check = tigetstr(UserCap(xm));
+ 		if (CHECK_CAP(check)) {
+ 		    needed = 3;
+ 		}
+-		check = tigetstr("S0");
++		check = tigetstr(UserCap(S0));
+ 		if (CHECK_CAP(check)) {
+ 		    needed = 0;	/* used in screen-base */
+ 		}
+Index: ncurses/tinfo/tinfo_driver.c
+Prereq:  1.77 
+--- ncurses-6.5-20250111+/ncurses/tinfo/tinfo_driver.c	2024-12-15 00:23:20.000000000 +0000
++++ ncurses-6.5-20250118/ncurses/tinfo/tinfo_driver.c	2025-01-18 14:47:35.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -52,7 +52,7 @@
+ # endif
+ #endif
+ 
+-MODULE_ID("$Id: tinfo_driver.c,v 1.77 2024/12/15 00:23:20 tom Exp $")
++MODULE_ID("$Id: tinfo_driver.c,v 1.78 2025/01/18 14:47:35 tom Exp $")
+ 
+ /*
+  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
+@@ -327,7 +327,7 @@
+ #if NCURSES_EXT_FUNCS
+ 	sp->_default_color = isDefaultColor(fg) || isDefaultColor(bg);
+ 	sp->_has_sgr_39_49 = (NCURSES_SP_NAME(tigetflag) (NCURSES_SP_ARGx
+-							  "AX")
++							  UserCap(AX))
+ 			      == TRUE);
+ 	sp->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : fg;
+ 	sp->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : bg;
+@@ -907,7 +907,7 @@
+ init_xterm_mouse(SCREEN *sp)
+ {
+     sp->_mouse_type = M_XTERM;
+-    sp->_mouse_xtermcap = NCURSES_SP_NAME(tigetstr) (NCURSES_SP_ARGx "XM");
++    sp->_mouse_xtermcap = NCURSES_SP_NAME(tigetstr) (NCURSES_SP_ARGx UserCap(XM));
+     if (!VALID_STRING(sp->_mouse_xtermcap))
+ 	sp->_mouse_xtermcap = "\033[?1000%?%p1%{1}%=%th%el%;";
+ }
+Index: ncurses/tty/hardscroll.c
+Prereq:  1.59 
+--- ncurses-6.5-20250111+/ncurses/tty/hardscroll.c	2024-12-07 20:06:49.000000000 +0000
++++ ncurses-6.5-20250118/ncurses/tty/hardscroll.c	2025-01-12 10:51:43.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -148,7 +148,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: hardscroll.c,v 1.59 2024/12/07 20:06:49 tom Exp $")
++MODULE_ID("$Id: hardscroll.c,v 1.60 2025/01/12 10:51:43 tom Exp $")
+ 
+ #if defined(SCROLLDEBUG) || defined(HASHDEBUG)
+ 
+@@ -371,7 +371,7 @@
+ 	do {
+ 	    oldnums[n++] = atoi(st);
+ 	} while
+-	    ((st = strtok((char *) NULL, " ")) != 0);
++	    ((st = strtok((char *) NULL, " ")) != NULL);
+ 
+ 	/* display it */
+ 	(void) fputs("Initial input:\n", stderr);
+Index: ncurses/tty/hashmap.c
+Prereq:  1.73 
+--- ncurses-6.5-20250111+/ncurses/tty/hashmap.c	2024-12-07 17:18:07.000000000 +0000
++++ ncurses-6.5-20250118/ncurses/tty/hashmap.c	2025-01-12 10:51:43.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -74,7 +74,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: hashmap.c,v 1.73 2024/12/07 17:18:07 tom Exp $")
++MODULE_ID("$Id: hashmap.c,v 1.74 2025/01/12 10:51:43 tom Exp $")
+ 
+ #ifdef HASHDEBUG
+ 
+@@ -532,7 +532,7 @@
+ 	    do {
+ 		oldnums[n++] = atoi(st);
+ 	    } while
+-		((st = strtok((char *) NULL, " ")) != 0);
++		((st = strtok((char *) NULL, " ")) != NULL);
+ 	    break;
+ 
+ 	case 'n':		/* use following letters as text of new lines */
+Index: ncurses/tty/lib_mvcur.c
+Prereq:  1.163 
+--- ncurses-6.5-20250111+/ncurses/tty/lib_mvcur.c	2024-12-15 00:04:06.000000000 +0000
++++ ncurses-6.5-20250118/ncurses/tty/lib_mvcur.c	2025-01-12 10:51:43.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -160,7 +160,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_mvcur.c,v 1.163 2024/12/15 00:04:06 tom Exp $")
++MODULE_ID("$Id: lib_mvcur.c,v 1.164 2025/01/12 10:51:43 tom Exp $")
+ 
+ #define WANT_CHAR(sp, y, x) NewScreen(sp)->_line[y].text[x]	/* desired state */
+ 
+@@ -948,8 +948,8 @@
+   nonlocal:
+ #if defined(MAIN) || defined(NCURSES_TEST)
+     gettimeofday(&after, NULL);
+-    diff = after.tv_usec - before.tv_usec
+-	+ (after.tv_sec - before.tv_sec) * 1000000;
++    diff = (float) (after.tv_usec - before.tv_usec
++		    + (after.tv_sec - before.tv_sec) * 1000000);
+     if (!profiling)
+ 	(void) fprintf(stderr,
+ 		       "onscreen: %d microsec, %f 28.8Kbps char-equivalents\n",
+@@ -1227,7 +1227,7 @@
+ 
+ 	if (fputs("> ", stdout) == EOF)
+ 	    break;
+-	if (fgets(buf, sizeof(buf), stdin) == 0)
++	if (fgets(buf, sizeof(buf), stdin) == NULL)
+ 	    break;
+ 
+ #define PUTS(s)   (void) puts(s)
+@@ -1307,7 +1307,7 @@
+ 	} else if (buf[0] == 'i') {
+ 	    dump_init(NULL, F_TERMINFO, S_TERMINFO,
+ 		      FALSE, 70, 0, 0, FALSE, FALSE, 0);
+-	    dump_entry(&TerminalType(cur_term), FALSE, TRUE, 0, 0);
++	    dump_entry(&TerminalType(cur_term), FALSE, TRUE, 0, NULL);
+ 	    putchar('\n');
+ 	} else if (buf[0] == 'o') {
+ 	    if (_nc_optimize_enable & OPTIMIZE_MVCUR) {
+Index: ncurses/widechar/lib_add_wch.c
+Prereq:  1.20 
+--- ncurses-6.5-20250111+/ncurses/widechar/lib_add_wch.c	2024-12-07 18:00:11.000000000 +0000
++++ ncurses-6.5-20250118/ncurses/widechar/lib_add_wch.c	2025-01-19 00:51:54.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2004-2011,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -40,7 +40,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: lib_add_wch.c,v 1.20 2024/12/07 18:00:11 tom Exp $")
++MODULE_ID("$Id: lib_add_wch.c,v 1.22 2025/01/19 00:51:54 tom Exp $")
+ 
+ /* clone/adapt lib_addch.c */
+ static const cchar_t blankchar = NewChar(BLANK_TEXT);
+@@ -434,7 +434,7 @@
+ {
+     int code = ERR;
+ 
+-    TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_CALLED("wechochar(%p, %s)"),
++    TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_CALLED("wecho_wchar(%p, %s)"),
+ 				      (void *) win,
+ 				      _tracecchar_t(wch)));
+ 
+Index: ncurses/widechar/lib_inwstr.c
+Prereq:  1.12 
+--- ncurses-6.5-20250111+/ncurses/widechar/lib_inwstr.c	2024-12-07 18:03:14.000000000 +0000
++++ ncurses-6.5-20250118/ncurses/widechar/lib_inwstr.c	2025-01-19 00:51:54.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2024 Thomas E. Dickey                                     *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2002-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -34,13 +34,13 @@
+ /*
+ **	lib_inwstr.c
+ **
+-**	The routines winnwstr() and winwstr().
++**	The routine winnwstr().
+ **
+ */
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_inwstr.c,v 1.12 2024/12/07 18:03:14 tom Exp $")
++MODULE_ID("$Id: lib_inwstr.c,v 1.14 2025/01/19 00:51:54 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ winnwstr(WINDOW *win, wchar_t *wstr, int n)
+@@ -57,6 +57,9 @@
+ 
+ 	    getyx(win, row, col);
+ 
++	    if (n < 0)
++		n = CCHARW_MAX * (win->_maxx - win->_curx + 1);
++
+ 	    text = win->_line[row].text;
+ 	    while (count < n && !done && count != ERR) {
+ 
+@@ -92,16 +95,3 @@
+     }
+     returnCode(count);
+ }
+-
+-NCURSES_EXPORT(int)
+-winwstr(WINDOW *win, wchar_t *wstr)
+-{
+-    int result = ERR;
+-
+-    T((T_CALLED("winwstr(%p,%p)"), (void *) win, (void *) wstr));
+-    if (win != NULL) {
+-	result = winnwstr(win, wstr,
+-			  CCHARW_MAX * (win->_maxx - win->_curx + 1));
+-    }
+-    returnCode(result);
+-}
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250111+/package/debian-mingw/changelog	2025-01-11 12:30:15.000000000 +0000
++++ ncurses-6.5-20250118/package/debian-mingw/changelog	2025-01-12 11:23:10.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250111) unstable; urgency=low
++ncurses6td (6.5+20250118) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 11 Jan 2025 07:30:15 -0500
++ -- Thomas E. Dickey   Sun, 12 Jan 2025 06:23:10 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250111+/package/debian-mingw64/changelog	2025-01-11 12:30:15.000000000 +0000
++++ ncurses-6.5-20250118/package/debian-mingw64/changelog	2025-01-12 11:23:10.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250111) unstable; urgency=low
++ncurses6td (6.5+20250118) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 11 Jan 2025 07:30:15 -0500
++ -- Thomas E. Dickey   Sun, 12 Jan 2025 06:23:10 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250111+/package/debian/changelog	2025-01-11 12:30:15.000000000 +0000
++++ ncurses-6.5-20250118/package/debian/changelog	2025-01-12 11:23:10.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250111) unstable; urgency=low
++ncurses6td (6.5+20250118) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 11 Jan 2025 07:30:15 -0500
++ -- Thomas E. Dickey   Sun, 12 Jan 2025 06:23:10 -0500
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.684 
+--- ncurses-6.5-20250111+/package/mingw-ncurses.nsi	2025-01-11 12:30:15.000000000 +0000
++++ ncurses-6.5-20250118/package/mingw-ncurses.nsi	2025-01-12 11:23:10.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.684 2025/01/11 12:30:15 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.685 2025/01/12 11:23:10 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0111"
++!define VERSION_MMDD  "0118"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250111+/package/mingw-ncurses.spec	2025-01-11 12:30:15.000000000 +0000
++++ ncurses-6.5-20250118/package/mingw-ncurses.spec	2025-01-12 11:23:10.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250111
++Release: 20250118
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20250111+/package/ncurses.spec	2025-01-11 12:30:15.000000000 +0000
++++ ncurses-6.5-20250118/package/ncurses.spec	2025-01-12 11:23:10.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250111
++Release: 20250118
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20250111+/package/ncursest.spec	2025-01-11 12:30:15.000000000 +0000
++++ ncurses-6.5-20250118/package/ncursest.spec	2025-01-12 11:23:10.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250111
++Release: 20250118
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/clear_cmd.c
+Prereq:  1.5 
+--- ncurses-6.5-20250111+/progs/clear_cmd.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20250118/progs/clear_cmd.c	2025-01-18 14:51:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018,2020 Thomas E. Dickey                                     *
++ * Copyright 2018,2020,2025 Thomas E. Dickey                                *
+  * Copyright 2016,2017 Free Software Foundation, Inc.                       *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -38,7 +38,7 @@
+ #define USE_LIBTINFO
+ #include 
+ 
+-MODULE_ID("$Id: clear_cmd.c,v 1.5 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: clear_cmd.c,v 1.6 2025/01/18 14:51:58 tom Exp $")
+ 
+ static int
+ putch(int c)
+@@ -52,7 +52,7 @@
+     int retval = tputs(clear_screen, lines > 0 ? lines : 1, putch);
+     if (!legacy) {
+ 	/* Clear the scrollback buffer if possible. */
+-	char *E3 = tigetstr("E3");
++	char *E3 = tigetstr(UserCap(E3));
+ 	if (E3)
+ 	    (void) tputs(E3, lines > 0 ? lines : 1, putch);
+     }
+Index: test/aclocal.m4
+Prereq:  1.231 
+--- ncurses-6.5-20250111+/test/aclocal.m4	2024-12-21 15:24:55.000000000 +0000
++++ ncurses-6.5-20250118/test/aclocal.m4	2025-01-12 18:41:15.000000000 +0000
+@@ -1,5 +1,5 @@
+ dnl***************************************************************************
+-dnl Copyright 2018-2023,2024 Thomas E. Dickey                                *
++dnl Copyright 2018-2024,2025 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.231 2024/12/21 15:24:55 tom Exp $
++dnl $Id: aclocal.m4,v 1.232 2025/01/12 18:41:15 tom Exp $
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+@@ -2788,7 +2788,7 @@
+ 	,[$1=no])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_NCURSES_CONFIG version: 28 updated: 2021/08/28 15:20:37
++dnl CF_NCURSES_CONFIG version: 29 updated: 2025/01/10 19:55:54
+ dnl -----------------
+ dnl Tie together the configure-script macros for ncurses, preferring these in
+ dnl order:
+@@ -2849,6 +2849,7 @@
+ 			;;
+ 		esac
+ 
++		CF_REQUIRE_PKG($cf_ncuconfig_root)
+ 		CF_APPEND_CFLAGS($cf_pkg_cflags)
+ 		CF_ADD_LIBS($cf_pkg_libs)
+ 
+@@ -3648,6 +3649,30 @@
+ 		-e 's/-[[UD]]'"$3"'\(=[[^ 	]]*\)\?[$]//g'`
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_REQUIRE_PKG version: 1 updated: 2025/01/10 19:55:54
++dnl --------------
++dnl Update $REQUIRE_PKG, which lists the known required packages for this
++dnl program.
++dnl
++dnl $1 = package(s) to require, e.g., in the generated ".pc" file
++define([CF_REQUIRE_PKG],
++[
++for cf_required in $1
++do
++	# check for duplicates
++	for cf_require_pkg in $REQUIRE_PKG
++	do
++		if test "$cf_required" = "$cf_require_pkg"
++		then
++			cf_required=
++			break
++		fi
++	done
++	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
++done
++AC_SUBST(REQUIRE_PKG)
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_RESTORE_XTRA_FLAGS version: 1 updated: 2020/01/11 16:47:45
+ dnl ---------------------
+ dnl Restore flags saved in CF_SAVE_XTRA_FLAGS
+@@ -4060,7 +4085,7 @@
+ 	done
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_TRY_PKG_CONFIG version: 6 updated: 2020/12/31 10:54:15
++dnl CF_TRY_PKG_CONFIG version: 7 updated: 2025/01/10 19:55:54
+ dnl -----------------
+ dnl This is a simple wrapper to use for pkg-config, for libraries which may be
+ dnl available in that form.
+@@ -4077,6 +4102,7 @@
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$1" 2>/dev/null`"
+ 	CF_VERBOSE(package $1 CFLAGS: $cf_pkgconfig_incs)
+ 	CF_VERBOSE(package $1 LIBS: $cf_pkgconfig_libs)
++	CF_REQUIRE_PKG($1)
+ 	CF_ADD_CFLAGS($cf_pkgconfig_incs)
+ 	CF_ADD_LIBS($cf_pkgconfig_libs)
+ 	ifelse([$2],,:,[$2])
+@@ -4293,7 +4319,7 @@
+ AC_SUBST($1)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_WITH_NCURSES_ETC version: 6 updated: 2023/01/16 10:10:06
++dnl CF_WITH_NCURSES_ETC version: 7 updated: 2025/01/12 13:41:15
+ dnl -------------------
+ dnl Use this macro for programs which use any variant of "curses", e.g.,
+ dnl "ncurses", and "PDCurses".  Programs that can use curses and some unrelated
+@@ -4344,7 +4370,7 @@
+ (ncurses*)
+ 	CF_NCURSES_CONFIG($cf_cv_screen)
+ 	;;
+-(pdcurses)
++(pdcurses*)
+ 	CF_PDCURSES_X11
+ 	;;
+ (*)
+Index: test/configure
+--- ncurses-6.5-20250111+/test/configure	2024-12-21 15:25:20.000000000 +0000
++++ ncurses-6.5-20250118/test/configure	2025-01-12 18:41:15.000000000 +0000
+@@ -8816,6 +8816,20 @@
+ 			;;
+ 		esac
+ 
++for cf_required in $cf_ncuconfig_root
++do
++	# check for duplicates
++	for cf_require_pkg in $REQUIRE_PKG
++	do
++		if test "$cf_required" = "$cf_require_pkg"
++		then
++			cf_required=
++			break
++		fi
++	done
++	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
++done
++
+ for cf_add_cflags in $cf_pkg_cflags
+ do
+ 	case "x$cf_add_cflags" in
+@@ -8959,7 +8973,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8962 "configure"
++#line 8976 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8971,37 +8985,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8974: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8988: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8977: \$? = $ac_status" >&5
++  echo "$as_me:8991: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8980: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8994: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8983: \$? = $ac_status" >&5
++  echo "$as_me:8997: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8989 "configure"
++#line 9003 "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:8996: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9010: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8999: \$? = $ac_status" >&5
++  echo "$as_me:9013: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9001: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9015: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9004: \$? = $ac_status" >&5
++  echo "$as_me:9018: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -9018,7 +9032,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:9021: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:9035: 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"
+@@ -9034,7 +9048,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:9037: checking for terminfo header" >&5
++echo "$as_me:9051: 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
+@@ -9052,7 +9066,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9055 "configure"
++#line 9069 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9067,16 +9081,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9070: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9084: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9073: \$? = $ac_status" >&5
++  echo "$as_me:9087: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9076: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9090: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9079: \$? = $ac_status" >&5
++  echo "$as_me:9093: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -9092,7 +9106,7 @@
+ done
+ 
+ fi
+-echo "$as_me:9095: result: $cf_cv_term_header" >&5
++echo "$as_me:9109: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9127,7 +9141,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:9130: result: no" >&5
++		echo "$as_me:9144: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -9143,7 +9157,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:9146: checking for $ac_word" >&5
++echo "$as_me:9160: 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
+@@ -9158,7 +9172,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:9161: found $ac_dir/$ac_word" >&5
++echo "$as_me:9175: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9166,10 +9180,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:9169: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:9183: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:9172: result: no" >&5
++  echo "$as_me:9186: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9182,7 +9196,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:9185: checking for $ac_word" >&5
++echo "$as_me:9199: 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
+@@ -9197,7 +9211,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:9200: found $ac_dir/$ac_word" >&5
++echo "$as_me:9214: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9205,10 +9219,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:9208: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:9222: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:9211: result: no" >&5
++  echo "$as_me:9225: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9365,7 +9379,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:9368: checking if we have identified curses headers" >&5
++echo "$as_me:9382: 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
+@@ -9377,7 +9391,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9380 "configure"
++#line 9394 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -9389,16 +9403,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9392: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9406: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9395: \$? = $ac_status" >&5
++  echo "$as_me:9409: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9398: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9412: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9401: \$? = $ac_status" >&5
++  echo "$as_me:9415: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -9409,11 +9423,11 @@
+ done
+ 
+ fi
+-echo "$as_me:9412: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:9426: 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:9416: error: No curses header-files found" >&5
++	{ { echo "$as_me:9430: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -9423,23 +9437,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:9426: checking for $ac_header" >&5
++echo "$as_me:9440: 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 9432 "configure"
++#line 9446 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:9436: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:9450: \"$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:9442: \$? = $ac_status" >&5
++  echo "$as_me:9456: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9458,7 +9472,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:9461: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:9475: 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 9517 "configure"
++#line 9531 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9526,16 +9540,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9529: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9543: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9532: \$? = $ac_status" >&5
++  echo "$as_me:9546: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9535: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9549: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9538: \$? = $ac_status" >&5
++  echo "$as_me:9552: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9552,7 +9566,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}:9555: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9569: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9571,7 +9585,7 @@
+ 
+ }
+ 
+-echo "$as_me:9574: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:9588: 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
+@@ -9583,7 +9597,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9586 "configure"
++#line 9600 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -9607,16 +9621,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9610: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9624: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9613: \$? = $ac_status" >&5
++  echo "$as_me:9627: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9616: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9630: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9619: \$? = $ac_status" >&5
++  echo "$as_me:9633: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -9631,14 +9645,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:9634: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:9648: 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:9641: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:9655: 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
+@@ -9759,7 +9773,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9762 "configure"
++#line 9776 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9771,16 +9785,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9774: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9788: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9777: \$? = $ac_status" >&5
++  echo "$as_me:9791: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9780: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9794: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9783: \$? = $ac_status" >&5
++  echo "$as_me:9797: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9797,7 +9811,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}:9800: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9814: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9820,7 +9834,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9823 "configure"
++#line 9837 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -9844,16 +9858,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9847: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9861: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9850: \$? = $ac_status" >&5
++  echo "$as_me:9864: \$? = $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:9867: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9856: \$? = $ac_status" >&5
++  echo "$as_me:9870: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -9874,12 +9888,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9877: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9891: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:9882: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:9896: 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%/[^/]*$%%'`
+@@ -9915,7 +9929,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9918 "configure"
++#line 9932 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9927,16 +9941,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9930: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9944: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9933: \$? = $ac_status" >&5
++  echo "$as_me:9947: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9936: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9950: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9939: \$? = $ac_status" >&5
++  echo "$as_me:9953: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9953,7 +9967,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}:9956: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9970: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10001,7 +10015,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:10004: checking for terminfo header" >&5
++echo "$as_me:10018: 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
+@@ -10019,7 +10033,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10022 "configure"
++#line 10036 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -10034,16 +10048,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10037: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10051: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10040: \$? = $ac_status" >&5
++  echo "$as_me:10054: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10043: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10057: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10046: \$? = $ac_status" >&5
++  echo "$as_me:10060: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -10059,7 +10073,7 @@
+ done
+ 
+ fi
+-echo "$as_me:10062: result: $cf_cv_term_header" >&5
++echo "$as_me:10076: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10097,7 +10111,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:10100: checking for ncurses version" >&5
++echo "$as_me:10114: 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
+@@ -10123,10 +10137,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:10126: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:10140: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10129: \$? = $ac_status" >&5
++  echo "$as_me:10143: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -10136,7 +10150,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10139 "configure"
++#line 10153 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -10163,15 +10177,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10166: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10180: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10169: \$? = $ac_status" >&5
++  echo "$as_me:10183: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10171: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10185: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10174: \$? = $ac_status" >&5
++  echo "$as_me:10188: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -10185,7 +10199,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:10188: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:10202: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -10198,7 +10212,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:10201: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:10215: 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
+@@ -10206,7 +10220,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10209 "configure"
++#line 10223 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10225,16 +10239,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10228: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10242: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10231: \$? = $ac_status" >&5
++  echo "$as_me:10245: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10234: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10248: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10237: \$? = $ac_status" >&5
++  echo "$as_me:10251: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -10245,10 +10259,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10248: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:10262: 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:10251: checking for initscr in -lgpm" >&5
++  echo "$as_me:10265: 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
+@@ -10256,7 +10270,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10259 "configure"
++#line 10273 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10275,16 +10289,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10278: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10292: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10281: \$? = $ac_status" >&5
++  echo "$as_me:10295: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10284: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10298: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10287: \$? = $ac_status" >&5
++  echo "$as_me:10301: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -10295,7 +10309,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10298: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:10312: 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"
+@@ -10310,7 +10324,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:10313: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:10327: 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
+@@ -10318,7 +10332,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10321 "configure"
++#line 10335 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10337,16 +10351,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10340: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10354: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10343: \$? = $ac_status" >&5
++  echo "$as_me:10357: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10346: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10360: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10349: \$? = $ac_status" >&5
++  echo "$as_me:10363: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -10357,7 +10371,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10360: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:10374: 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"
+@@ -10406,13 +10420,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:10409: checking for initscr" >&5
++	echo "$as_me:10423: 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 10415 "configure"
++#line 10429 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10443,16 +10457,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10446: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10460: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10449: \$? = $ac_status" >&5
++  echo "$as_me:10463: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10452: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10466: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10455: \$? = $ac_status" >&5
++  echo "$as_me:10469: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -10462,18 +10476,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10465: result: $ac_cv_func_initscr" >&5
++echo "$as_me:10479: 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:10472: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:10486: 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 10476 "configure"
++#line 10490 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10485,25 +10499,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10488: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10502: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10491: \$? = $ac_status" >&5
++  echo "$as_me:10505: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10494: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10508: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10497: \$? = $ac_status" >&5
++  echo "$as_me:10511: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:10499: result: yes" >&5
++  echo "$as_me:10513: 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:10506: result: no" >&5
++echo "$as_me:10520: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -10571,11 +10585,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:10574: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:10588: 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 10578 "configure"
++#line 10592 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10587,25 +10601,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10590: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10604: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10593: \$? = $ac_status" >&5
++  echo "$as_me:10607: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10596: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10610: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10599: \$? = $ac_status" >&5
++  echo "$as_me:10613: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:10601: result: yes" >&5
++  echo "$as_me:10615: 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:10608: result: no" >&5
++echo "$as_me:10622: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -10620,7 +10634,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:10623: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:10637: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -10628,7 +10642,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:10631: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:10645: 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
+@@ -10638,7 +10652,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10641 "configure"
++#line 10655 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10650,23 +10664,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10653: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10667: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10656: \$? = $ac_status" >&5
++  echo "$as_me:10670: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10659: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10673: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10662: \$? = $ac_status" >&5
++  echo "$as_me:10676: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:10664: result: yes" >&5
++  echo "$as_me:10678: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:10669: result: no" >&5
++echo "$as_me:10683: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -10691,13 +10705,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:10694: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:10708: 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:10697: result: yes" >&5
++		echo "$as_me:10711: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:10700: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:10714: 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
+ 
+@@ -10830,7 +10844,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10833 "configure"
++#line 10847 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10842,37 +10856,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10845: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10859: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10848: \$? = $ac_status" >&5
++  echo "$as_me:10862: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10851: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10865: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10854: \$? = $ac_status" >&5
++  echo "$as_me:10868: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10860 "configure"
++#line 10874 "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:10867: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10881: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10870: \$? = $ac_status" >&5
++  echo "$as_me:10884: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10872: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10886: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10875: \$? = $ac_status" >&5
++  echo "$as_me:10889: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -10903,6 +10917,20 @@
+ 			;;
+ 		esac
+ 
++for cf_required in $cf_ncuconfig_root
++do
++	# check for duplicates
++	for cf_require_pkg in $REQUIRE_PKG
++	do
++		if test "$cf_required" = "$cf_require_pkg"
++		then
++			cf_required=
++			break
++		fi
++	done
++	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
++done
++
+ for cf_add_cflags in $cf_pkg_cflags
+ do
+ 	case "x$cf_add_cflags" in
+@@ -11046,7 +11074,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11049 "configure"
++#line 11077 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11058,37 +11086,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11061: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11089: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11064: \$? = $ac_status" >&5
++  echo "$as_me:11092: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11067: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11095: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11070: \$? = $ac_status" >&5
++  echo "$as_me:11098: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11076 "configure"
++#line 11104 "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:11083: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11111: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11086: \$? = $ac_status" >&5
++  echo "$as_me:11114: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:11088: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11116: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11091: \$? = $ac_status" >&5
++  echo "$as_me:11119: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -11105,7 +11133,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:11108: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:11136: 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"
+@@ -11121,7 +11149,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:11124: checking for terminfo header" >&5
++echo "$as_me:11152: 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
+@@ -11139,7 +11167,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11142 "configure"
++#line 11170 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -11154,16 +11182,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11157: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11185: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11160: \$? = $ac_status" >&5
++  echo "$as_me:11188: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11163: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11191: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11166: \$? = $ac_status" >&5
++  echo "$as_me:11194: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -11179,7 +11207,7 @@
+ done
+ 
+ fi
+-echo "$as_me:11182: result: $cf_cv_term_header" >&5
++echo "$as_me:11210: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -11214,7 +11242,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:11217: result: no" >&5
++		echo "$as_me:11245: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -11230,7 +11258,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:11233: checking for $ac_word" >&5
++echo "$as_me:11261: 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
+@@ -11245,7 +11273,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:11248: found $ac_dir/$ac_word" >&5
++echo "$as_me:11276: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -11253,10 +11281,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:11256: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:11284: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:11259: result: no" >&5
++  echo "$as_me:11287: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -11269,7 +11297,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:11272: checking for $ac_word" >&5
++echo "$as_me:11300: 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
+@@ -11284,7 +11312,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:11287: found $ac_dir/$ac_word" >&5
++echo "$as_me:11315: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -11292,10 +11320,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:11295: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:11323: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:11298: result: no" >&5
++  echo "$as_me:11326: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -11452,7 +11480,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:11455: checking if we have identified curses headers" >&5
++echo "$as_me:11483: 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
+@@ -11464,7 +11492,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11467 "configure"
++#line 11495 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -11476,16 +11504,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11479: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11507: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11482: \$? = $ac_status" >&5
++  echo "$as_me:11510: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11485: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11513: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11488: \$? = $ac_status" >&5
++  echo "$as_me:11516: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -11496,11 +11524,11 @@
+ done
+ 
+ fi
+-echo "$as_me:11499: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:11527: 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:11503: error: No curses header-files found" >&5
++	{ { echo "$as_me:11531: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -11510,23 +11538,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:11513: checking for $ac_header" >&5
++echo "$as_me:11541: 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 11519 "configure"
++#line 11547 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:11523: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:11551: \"$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:11529: \$? = $ac_status" >&5
++  echo "$as_me:11557: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11545,7 +11573,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:11548: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:11576: 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 11604 "configure"
++#line 11632 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11613,16 +11641,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11616: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11644: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11619: \$? = $ac_status" >&5
++  echo "$as_me:11647: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11622: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11650: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11625: \$? = $ac_status" >&5
++  echo "$as_me:11653: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11639,7 +11667,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}:11642: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11670: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -11658,7 +11686,7 @@
+ 
+ }
+ 
+-echo "$as_me:11661: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:11689: 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
+@@ -11670,7 +11698,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11673 "configure"
++#line 11701 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -11694,16 +11722,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11697: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11725: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11700: \$? = $ac_status" >&5
++  echo "$as_me:11728: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11703: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11731: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11706: \$? = $ac_status" >&5
++  echo "$as_me:11734: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -11718,14 +11746,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:11721: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:11749: 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:11728: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:11756: 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
+@@ -11846,7 +11874,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11849 "configure"
++#line 11877 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11858,16 +11886,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11861: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11889: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11864: \$? = $ac_status" >&5
++  echo "$as_me:11892: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11867: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11895: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11870: \$? = $ac_status" >&5
++  echo "$as_me:11898: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11884,7 +11912,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}:11887: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11915: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -11907,7 +11935,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11910 "configure"
++#line 11938 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -11931,16 +11959,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11934: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11962: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11937: \$? = $ac_status" >&5
++  echo "$as_me:11965: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11940: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11968: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11943: \$? = $ac_status" >&5
++  echo "$as_me:11971: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -11961,12 +11989,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11964: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11992: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:11969: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:11997: 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%/[^/]*$%%'`
+@@ -12002,7 +12030,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12005 "configure"
++#line 12033 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12014,16 +12042,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12017: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12045: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12020: \$? = $ac_status" >&5
++  echo "$as_me:12048: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12023: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12051: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12026: \$? = $ac_status" >&5
++  echo "$as_me:12054: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -12040,7 +12068,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}:12043: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:12071: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -12088,7 +12116,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:12091: checking for terminfo header" >&5
++echo "$as_me:12119: 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
+@@ -12106,7 +12134,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12109 "configure"
++#line 12137 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -12121,16 +12149,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12124: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12152: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12127: \$? = $ac_status" >&5
++  echo "$as_me:12155: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12130: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12158: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12133: \$? = $ac_status" >&5
++  echo "$as_me:12161: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -12146,7 +12174,7 @@
+ done
+ 
+ fi
+-echo "$as_me:12149: result: $cf_cv_term_header" >&5
++echo "$as_me:12177: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -12184,7 +12212,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:12187: checking for ncurses version" >&5
++echo "$as_me:12215: 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
+@@ -12210,10 +12238,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:12213: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:12241: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12216: \$? = $ac_status" >&5
++  echo "$as_me:12244: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -12223,7 +12251,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12226 "configure"
++#line 12254 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12250,15 +12278,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:12253: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12281: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12256: \$? = $ac_status" >&5
++  echo "$as_me:12284: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:12258: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12286: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12261: \$? = $ac_status" >&5
++  echo "$as_me:12289: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -12272,7 +12300,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:12275: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:12303: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -12285,7 +12313,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:12288: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:12316: 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
+@@ -12293,7 +12321,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12296 "configure"
++#line 12324 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12312,16 +12340,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12315: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12343: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12318: \$? = $ac_status" >&5
++  echo "$as_me:12346: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12321: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12349: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12324: \$? = $ac_status" >&5
++  echo "$as_me:12352: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -12332,10 +12360,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12335: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:12363: 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:12338: checking for initscr in -lgpm" >&5
++  echo "$as_me:12366: 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
+@@ -12343,7 +12371,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12346 "configure"
++#line 12374 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12362,16 +12390,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12365: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12393: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12368: \$? = $ac_status" >&5
++  echo "$as_me:12396: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12371: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12399: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12374: \$? = $ac_status" >&5
++  echo "$as_me:12402: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -12382,7 +12410,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12385: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:12413: 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"
+@@ -12397,7 +12425,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:12400: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:12428: 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
+@@ -12405,7 +12433,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12408 "configure"
++#line 12436 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12424,16 +12452,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12427: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12455: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12430: \$? = $ac_status" >&5
++  echo "$as_me:12458: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12433: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12461: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12436: \$? = $ac_status" >&5
++  echo "$as_me:12464: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -12444,7 +12472,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12447: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:12475: 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"
+@@ -12493,13 +12521,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:12496: checking for initscr" >&5
++	echo "$as_me:12524: 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 12502 "configure"
++#line 12530 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12530,16 +12558,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12533: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12561: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12536: \$? = $ac_status" >&5
++  echo "$as_me:12564: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12539: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12567: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12542: \$? = $ac_status" >&5
++  echo "$as_me:12570: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -12549,18 +12577,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12552: result: $ac_cv_func_initscr" >&5
++echo "$as_me:12580: 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:12559: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:12587: 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 12563 "configure"
++#line 12591 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12572,25 +12600,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12575: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12603: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12578: \$? = $ac_status" >&5
++  echo "$as_me:12606: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12581: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12609: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12584: \$? = $ac_status" >&5
++  echo "$as_me:12612: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:12586: result: yes" >&5
++  echo "$as_me:12614: 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:12593: result: no" >&5
++echo "$as_me:12621: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -12658,11 +12686,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:12661: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:12689: 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 12665 "configure"
++#line 12693 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12674,25 +12702,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12677: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12705: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12680: \$? = $ac_status" >&5
++  echo "$as_me:12708: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12683: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12711: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12686: \$? = $ac_status" >&5
++  echo "$as_me:12714: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:12688: result: yes" >&5
++  echo "$as_me:12716: 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:12695: result: no" >&5
++echo "$as_me:12723: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -12707,7 +12735,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:12710: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:12738: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -12715,7 +12743,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:12718: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:12746: 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
+@@ -12725,7 +12753,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12728 "configure"
++#line 12756 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12737,23 +12765,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12740: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12768: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12743: \$? = $ac_status" >&5
++  echo "$as_me:12771: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12746: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12774: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12749: \$? = $ac_status" >&5
++  echo "$as_me:12777: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:12751: result: yes" >&5
++  echo "$as_me:12779: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:12756: result: no" >&5
++echo "$as_me:12784: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -12772,8 +12800,8 @@
+ fi
+ 
+ 	;;
+-(pdcurses)
+-	echo "$as_me:12776: checking for X" >&5
++(pdcurses*)
++	echo "$as_me:12804: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
+ # Check whether --with-x or --without-x was given.
+@@ -12877,17 +12905,17 @@
+   # Guess where to find include files, by looking for Intrinsic.h.
+   # First, try using that file with no special directory specified.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12880 "configure"
++#line 12908 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:12884: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12912: \"$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:12890: \$? = $ac_status" >&5
++  echo "$as_me:12918: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12920,7 +12948,7 @@
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12923 "configure"
++#line 12951 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12932,16 +12960,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12935: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12963: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12938: \$? = $ac_status" >&5
++  echo "$as_me:12966: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12941: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12969: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12944: \$? = $ac_status" >&5
++  echo "$as_me:12972: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -12979,7 +13007,7 @@
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:12982: result: $have_x" >&5
++  echo "$as_me:13010: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+   no_x=yes
+ else
+@@ -12989,7 +13017,7 @@
+   # Update the cache value to reflect the command line values.
+   ac_cv_have_x="have_x=yes \
+ 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  echo "$as_me:12992: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "$as_me:13020: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+@@ -13016,11 +13044,11 @@
+     # others require no space.  Words are not sufficient . . . .
+     case `(uname -sr) 2>/dev/null` in
+     "SunOS 5"*)
+-      echo "$as_me:13019: checking whether -R must be followed by a space" >&5
++      echo "$as_me:13047: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+       cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13023 "configure"
++#line 13051 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -13032,16 +13060,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13035: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13063: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13038: \$? = $ac_status" >&5
++  echo "$as_me:13066: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13041: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13069: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13044: \$? = $ac_status" >&5
++  echo "$as_me:13072: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_nospace=yes
+ else
+@@ -13051,13 +13079,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+       if test $ac_R_nospace = yes; then
+-	echo "$as_me:13054: result: no" >&5
++	echo "$as_me:13082: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	X_LIBS="$X_LIBS -R$x_libraries"
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13060 "configure"
++#line 13088 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -13069,16 +13097,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13072: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13100: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13075: \$? = $ac_status" >&5
++  echo "$as_me:13103: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13078: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13106: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13081: \$? = $ac_status" >&5
++  echo "$as_me:13109: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_space=yes
+ else
+@@ -13088,11 +13116,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	if test $ac_R_space = yes; then
+-	  echo "$as_me:13091: result: yes" >&5
++	  echo "$as_me:13119: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ 	else
+-	  echo "$as_me:13095: result: neither works" >&5
++	  echo "$as_me:13123: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ 	fi
+       fi
+@@ -13112,7 +13140,7 @@
+     # the Alpha needs dnet_stub (dnet does not exist).
+     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13115 "configure"
++#line 13143 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13131,22 +13159,22 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13134: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13162: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13137: \$? = $ac_status" >&5
++  echo "$as_me:13165: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13140: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13168: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13143: \$? = $ac_status" >&5
++  echo "$as_me:13171: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:13149: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:13177: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13154,7 +13182,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13157 "configure"
++#line 13185 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13173,16 +13201,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13176: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13204: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13179: \$? = $ac_status" >&5
++  echo "$as_me:13207: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13182: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13210: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13185: \$? = $ac_status" >&5
++  echo "$as_me:13213: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -13193,14 +13221,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13196: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:13224: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      echo "$as_me:13203: checking for dnet_ntoa in -ldnet_stub" >&5
++      echo "$as_me:13231: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13208,7 +13236,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13211 "configure"
++#line 13239 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13227,16 +13255,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13230: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13258: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13233: \$? = $ac_status" >&5
++  echo "$as_me:13261: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13236: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13264: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13239: \$? = $ac_status" >&5
++  echo "$as_me:13267: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -13247,7 +13275,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13250: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:13278: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -13266,13 +13294,13 @@
+     # on Irix 5.2, according to T.E. Dickey.
+     # The functions gethostbyname, getservbyname, and inet_addr are
+     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+-    echo "$as_me:13269: checking for gethostbyname" >&5
++    echo "$as_me:13297: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13275 "configure"
++#line 13303 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13303,16 +13331,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13306: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13334: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13309: \$? = $ac_status" >&5
++  echo "$as_me:13337: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13312: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13340: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13315: \$? = $ac_status" >&5
++  echo "$as_me:13343: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gethostbyname=yes
+ else
+@@ -13322,11 +13350,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13325: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:13353: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+-      echo "$as_me:13329: checking for gethostbyname in -lnsl" >&5
++      echo "$as_me:13357: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13334,7 +13362,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13337 "configure"
++#line 13365 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13353,16 +13381,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13356: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13384: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13359: \$? = $ac_status" >&5
++  echo "$as_me:13387: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13362: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13390: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13365: \$? = $ac_status" >&5
++  echo "$as_me:13393: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -13373,14 +13401,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13376: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:13404: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test "$ac_cv_lib_nsl_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+-        echo "$as_me:13383: checking for gethostbyname in -lbsd" >&5
++        echo "$as_me:13411: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13388,7 +13416,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13391 "configure"
++#line 13419 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13407,16 +13435,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13410: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13438: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13413: \$? = $ac_status" >&5
++  echo "$as_me:13441: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13416: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13444: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13419: \$? = $ac_status" >&5
++  echo "$as_me:13447: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -13427,7 +13455,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13430: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:13458: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test "$ac_cv_lib_bsd_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -13443,13 +13471,13 @@
+     # variants that don't use the nameserver (or something).  -lsocket
+     # must be given before -lnsl if both are needed.  We assume that
+     # if connect needs -lnsl, so does gethostbyname.
+-    echo "$as_me:13446: checking for connect" >&5
++    echo "$as_me:13474: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13452 "configure"
++#line 13480 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13480,16 +13508,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13483: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13511: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13486: \$? = $ac_status" >&5
++  echo "$as_me:13514: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13489: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13517: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13492: \$? = $ac_status" >&5
++  echo "$as_me:13520: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_connect=yes
+ else
+@@ -13499,11 +13527,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13502: result: $ac_cv_func_connect" >&5
++echo "$as_me:13530: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+ 
+     if test $ac_cv_func_connect = no; then
+-      echo "$as_me:13506: checking for connect in -lsocket" >&5
++      echo "$as_me:13534: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13511,7 +13539,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13514 "configure"
++#line 13542 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13530,16 +13558,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13533: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13561: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13536: \$? = $ac_status" >&5
++  echo "$as_me:13564: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13539: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13567: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13542: \$? = $ac_status" >&5
++  echo "$as_me:13570: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_socket_connect=yes
+ else
+@@ -13550,7 +13578,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13553: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:13581: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test "$ac_cv_lib_socket_connect" = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -13559,13 +13587,13 @@
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    echo "$as_me:13562: checking for remove" >&5
++    echo "$as_me:13590: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13568 "configure"
++#line 13596 "configure"
+ #include "confdefs.h"
+ #define remove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13596,16 +13624,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13599: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13627: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13602: \$? = $ac_status" >&5
++  echo "$as_me:13630: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13605: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13633: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13608: \$? = $ac_status" >&5
++  echo "$as_me:13636: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_remove=yes
+ else
+@@ -13615,11 +13643,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13618: result: $ac_cv_func_remove" >&5
++echo "$as_me:13646: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+ 
+     if test $ac_cv_func_remove = no; then
+-      echo "$as_me:13622: checking for remove in -lposix" >&5
++      echo "$as_me:13650: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13627,7 +13655,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13630 "configure"
++#line 13658 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13646,16 +13674,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13649: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13677: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13652: \$? = $ac_status" >&5
++  echo "$as_me:13680: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13655: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13683: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13658: \$? = $ac_status" >&5
++  echo "$as_me:13686: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_posix_remove=yes
+ else
+@@ -13666,7 +13694,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13669: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:13697: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test "$ac_cv_lib_posix_remove" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -13675,13 +13703,13 @@
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    echo "$as_me:13678: checking for shmat" >&5
++    echo "$as_me:13706: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13684 "configure"
++#line 13712 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13712,16 +13740,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13715: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13743: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13718: \$? = $ac_status" >&5
++  echo "$as_me:13746: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13721: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13749: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13724: \$? = $ac_status" >&5
++  echo "$as_me:13752: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_shmat=yes
+ else
+@@ -13731,11 +13759,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13734: result: $ac_cv_func_shmat" >&5
++echo "$as_me:13762: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+ 
+     if test $ac_cv_func_shmat = no; then
+-      echo "$as_me:13738: checking for shmat in -lipc" >&5
++      echo "$as_me:13766: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13743,7 +13771,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13746 "configure"
++#line 13774 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13762,16 +13790,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13765: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13793: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13768: \$? = $ac_status" >&5
++  echo "$as_me:13796: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13771: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13799: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13774: \$? = $ac_status" >&5
++  echo "$as_me:13802: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+@@ -13782,7 +13810,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13785: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:13813: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test "$ac_cv_lib_ipc_shmat" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -13800,7 +13828,7 @@
+   # These have to be linked with before -lX11, unlike the other
+   # libraries we check for below, so use a different variable.
+   # John Interrante, Karl Berry
+-  echo "$as_me:13803: checking for IceConnectionNumber in -lICE" >&5
++  echo "$as_me:13831: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13808,7 +13836,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13811 "configure"
++#line 13839 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -13827,16 +13855,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13830: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13858: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13833: \$? = $ac_status" >&5
++  echo "$as_me:13861: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13836: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13864: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13839: \$? = $ac_status" >&5
++  echo "$as_me:13867: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -13847,7 +13875,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:13850: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:13878: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -13859,7 +13887,7 @@
+ 
+ cf_x_athena=${cf_x_athena:-Xaw}
+ 
+-echo "$as_me:13862: checking if you want to link with Xaw 3d library" >&5
++echo "$as_me:13890: checking if you want to link with Xaw 3d library" >&5
+ echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
+ withval=
+ 
+@@ -13870,14 +13898,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=Xaw3d
+-	echo "$as_me:13873: result: yes" >&5
++	echo "$as_me:13901: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:13876: result: no" >&5
++	echo "$as_me:13904: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:13880: checking if you want to link with Xaw 3d xft library" >&5
++echo "$as_me:13908: checking if you want to link with Xaw 3d xft library" >&5
+ echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
+ withval=
+ 
+@@ -13888,14 +13916,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=Xaw3dxft
+-	echo "$as_me:13891: result: yes" >&5
++	echo "$as_me:13919: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:13894: result: no" >&5
++	echo "$as_me:13922: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:13898: checking if you want to link with neXT Athena library" >&5
++echo "$as_me:13926: checking if you want to link with neXT Athena library" >&5
+ echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
+ withval=
+ 
+@@ -13906,14 +13934,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=neXtaw
+-	echo "$as_me:13909: result: yes" >&5
++	echo "$as_me:13937: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:13912: result: no" >&5
++	echo "$as_me:13940: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:13916: checking if you want to link with Athena-Plus library" >&5
++echo "$as_me:13944: checking if you want to link with Athena-Plus library" >&5
+ echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
+ withval=
+ 
+@@ -13924,10 +13952,10 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=XawPlus
+-	echo "$as_me:13927: result: yes" >&5
++	echo "$as_me:13955: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:13930: result: no" >&5
++	echo "$as_me:13958: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -13947,17 +13975,31 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_athena_pkg"; then
+ 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
+ 
+-echo "${as_me:-configure}:13950: testing found package $cf_athena_pkg ..." 1>&5
++echo "${as_me:-configure}:13978: testing found package $cf_athena_pkg ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_athena_pkg" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_athena_pkg" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:13956: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:13984: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:13960: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:13988: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
++
++for cf_required in $cf_athena_pkg
++do
++	# check for duplicates
++	for cf_require_pkg in $REQUIRE_PKG
++	do
++		if test "$cf_required" = "$cf_require_pkg"
++		then
++			cf_required=
++			break
++		fi
++	done
++	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
++done
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14088,20 +14130,20 @@
+ 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
+ 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14091: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:14133: testing ..trimmed $LIBS ..." 1>&5
+ 
+ 			;;
+ 		esac
+ 	done
+ 
+-echo "$as_me:14097: checking for usable $cf_x_athena/Xmu package" >&5
++echo "$as_me:14139: checking for usable $cf_x_athena/Xmu package" >&5
+ echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
+ if test "${cf_cv_xaw_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14104 "configure"
++#line 14146 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14119,16 +14161,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14122: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14164: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14125: \$? = $ac_status" >&5
++  echo "$as_me:14167: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14128: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14170: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14131: \$? = $ac_status" >&5
++  echo "$as_me:14173: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xaw_compat=yes
+ else
+@@ -14138,7 +14180,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14141: result: $cf_cv_xaw_compat" >&5
++echo "$as_me:14183: result: $cf_cv_xaw_compat" >&5
+ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
+ 
+ 			if test "$cf_cv_xaw_compat" = no
+@@ -14150,7 +14192,7 @@
+ 				(*)
+ 					test -n "$verbose" && echo "	work around broken package" 1>&6
+ 
+-echo "${as_me:-configure}:14153: testing work around broken package ..." 1>&5
++echo "${as_me:-configure}:14195: testing work around broken package ..." 1>&5
+ 
+ 					cf_save_xmu="$LIBS"
+ 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
+@@ -14158,17 +14200,31 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
+ 	test -n "$verbose" && echo "	found package xmu" 1>&6
+ 
+-echo "${as_me:-configure}:14161: testing found package xmu ..." 1>&5
++echo "${as_me:-configure}:14203: testing found package xmu ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xmu" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xmu" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14167: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14209: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xmu LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14171: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14213: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
++
++for cf_required in xmu
++do
++	# check for duplicates
++	for cf_require_pkg in $REQUIRE_PKG
++	do
++		if test "$cf_required" = "$cf_require_pkg"
++		then
++			cf_required=
++			break
++		fi
++	done
++	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
++done
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14288,12 +14344,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14291: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14347: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14296: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:14352: testing ...after  $LIBS ..." 1>&5
+ 
+ else
+ 	cf_pkgconfig_incs=
+@@ -14301,12 +14357,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14304: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14360: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14309: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:14365: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -14317,7 +14373,7 @@
+ 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
+ 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:14320: testing ..trimmed $LIBS ..." 1>&5
++echo "${as_me:-configure}:14376: testing ..trimmed $LIBS ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -14342,17 +14398,31 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
+ 	test -n "$verbose" && echo "	found package Xext" 1>&6
+ 
+-echo "${as_me:-configure}:14345: testing found package Xext ..." 1>&5
++echo "${as_me:-configure}:14401: testing found package Xext ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "Xext" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "Xext" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14351: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14407: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package Xext LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14355: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14411: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
++
++for cf_required in Xext
++do
++	# check for duplicates
++	for cf_require_pkg in $REQUIRE_PKG
++	do
++		if test "$cf_required" = "$cf_require_pkg"
++		then
++			cf_required=
++			break
++		fi
++	done
++	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
++done
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14473,7 +14543,7 @@
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+ 
+-	echo "$as_me:14476: checking for XextCreateExtension in -lXext" >&5
++	echo "$as_me:14546: checking for XextCreateExtension in -lXext" >&5
+ echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14481,7 +14551,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXext  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14484 "configure"
++#line 14554 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14500,16 +14570,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14503: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14573: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14506: \$? = $ac_status" >&5
++  echo "$as_me:14576: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14509: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14579: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14512: \$? = $ac_status" >&5
++  echo "$as_me:14582: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_Xext_XextCreateExtension=yes
+ else
+@@ -14520,7 +14590,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14523: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
++echo "$as_me:14593: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
+ if test "$ac_cv_lib_Xext_XextCreateExtension" = yes; then
+ 
+@@ -14556,17 +14626,31 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
+ 	test -n "$verbose" && echo "	found package x11" 1>&6
+ 
+-echo "${as_me:-configure}:14559: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:14629: testing found package x11 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "x11" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14565: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14635: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14569: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14639: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++
++for cf_required in x11
++do
++	# check for duplicates
++	for cf_require_pkg in $REQUIRE_PKG
++	do
++		if test "$cf_required" = "$cf_require_pkg"
++		then
++			cf_required=
++			break
++		fi
++	done
++	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
++done
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14686,24 +14770,38 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:14689: WARNING: unable to find X11 library" >&5
++	{ echo "$as_me:14773: WARNING: unable to find X11 library" >&5
+ echo "$as_me: WARNING: unable to find X11 library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then
+ 	test -n "$verbose" && echo "	found package ice" 1>&6
+ 
+-echo "${as_me:-configure}:14696: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:14780: testing found package ice ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "ice" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14702: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14786: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14706: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14790: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++
++for cf_required in ice
++do
++	# check for duplicates
++	for cf_require_pkg in $REQUIRE_PKG
++	do
++		if test "$cf_required" = "$cf_require_pkg"
++		then
++			cf_required=
++			break
++		fi
++	done
++	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
++done
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14823,24 +14921,38 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:14826: WARNING: unable to find ICE library" >&5
++	{ echo "$as_me:14924: WARNING: unable to find ICE library" >&5
+ echo "$as_me: WARNING: unable to find ICE library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
+ 	test -n "$verbose" && echo "	found package sm" 1>&6
+ 
+-echo "${as_me:-configure}:14833: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:14931: testing found package sm ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "sm" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14839: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14937: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14843: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14941: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++
++for cf_required in sm
++do
++	# check for duplicates
++	for cf_require_pkg in $REQUIRE_PKG
++	do
++		if test "$cf_required" = "$cf_require_pkg"
++		then
++			cf_required=
++			break
++		fi
++	done
++	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
++done
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -14960,24 +15072,38 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:14963: WARNING: unable to find SM library" >&5
++	{ echo "$as_me:15075: WARNING: unable to find SM library" >&5
+ echo "$as_me: WARNING: unable to find SM library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
+ 	test -n "$verbose" && echo "	found package xt" 1>&6
+ 
+-echo "${as_me:-configure}:14970: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:15082: testing found package xt ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xt" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14976: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15088: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14980: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15092: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++
++for cf_required in xt
++do
++	# check for duplicates
++	for cf_require_pkg in $REQUIRE_PKG
++	do
++		if test "$cf_required" = "$cf_require_pkg"
++		then
++			cf_required=
++			break
++		fi
++	done
++	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
++done
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15097,7 +15223,7 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:15100: WARNING: unable to find Xt library" >&5
++	{ echo "$as_me:15226: WARNING: unable to find Xt library" >&5
+ echo "$as_me: WARNING: unable to find Xt library" >&2;}
+ fi
+ 
+@@ -15110,17 +15236,31 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
+ 	test -n "$verbose" && echo "	found package xt" 1>&6
+ 
+-echo "${as_me:-configure}:15113: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:15239: testing found package xt ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xt" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15119: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15245: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15123: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15249: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++
++for cf_required in xt
++do
++	# check for duplicates
++	for cf_require_pkg in $REQUIRE_PKG
++	do
++		if test "$cf_required" = "$cf_require_pkg"
++		then
++			cf_required=
++			break
++		fi
++	done
++	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
++done
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15241,14 +15381,14 @@
+ 		;;
+ 	(*)
+ # we have an "xt" package, but it may omit Xt's dependency on X11
+-echo "$as_me:15244: checking for usable X dependency" >&5
++echo "$as_me:15384: checking for usable X dependency" >&5
+ echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
+ if test "${cf_cv_xt_x11_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15251 "configure"
++#line 15391 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -15268,16 +15408,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15271: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15411: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15274: \$? = $ac_status" >&5
++  echo "$as_me:15414: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15277: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15417: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15280: \$? = $ac_status" >&5
++  echo "$as_me:15420: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xt_x11_compat=yes
+ else
+@@ -15287,30 +15427,44 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15290: result: $cf_cv_xt_x11_compat" >&5
++echo "$as_me:15430: result: $cf_cv_xt_x11_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
+ 		if test "$cf_cv_xt_x11_compat" = no
+ 		then
+ 			test -n "$verbose" && echo "	work around broken X11 dependency" 1>&6
+ 
+-echo "${as_me:-configure}:15296: testing work around broken X11 dependency ..." 1>&5
++echo "${as_me:-configure}:15436: testing work around broken X11 dependency ..." 1>&5
+ 
+ 			# 2010/11/19 - good enough until a working Xt on Xcb is delivered.
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
+ 	test -n "$verbose" && echo "	found package x11" 1>&6
+ 
+-echo "${as_me:-configure}:15303: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:15443: testing found package x11 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "x11" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15309: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15449: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15313: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15453: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++
++for cf_required in x11
++do
++	# check for duplicates
++	for cf_require_pkg in $REQUIRE_PKG
++	do
++		if test "$cf_required" = "$cf_require_pkg"
++		then
++			cf_required=
++			break
++		fi
++	done
++	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
++done
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15433,12 +15587,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:15436: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:15590: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:15441: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:15595: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -15446,14 +15600,14 @@
+ 		;;
+ 	esac
+ 
+-echo "$as_me:15449: checking for usable X Toolkit package" >&5
++echo "$as_me:15603: checking for usable X Toolkit package" >&5
+ echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
+ if test "${cf_cv_xt_ice_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15456 "configure"
++#line 15610 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -15469,16 +15623,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15472: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15626: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15475: \$? = $ac_status" >&5
++  echo "$as_me:15629: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15478: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15632: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15481: \$? = $ac_status" >&5
++  echo "$as_me:15635: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xt_ice_compat=yes
+ else
+@@ -15488,7 +15642,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15491: result: $cf_cv_xt_ice_compat" >&5
++echo "$as_me:15645: result: $cf_cv_xt_ice_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
+ 
+ 	if test "$cf_cv_xt_ice_compat" = no
+@@ -15502,22 +15656,36 @@
+ 			(*)
+ 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
+ 
+-echo "${as_me:-configure}:15505: testing work around broken ICE dependency ..." 1>&5
++echo "${as_me:-configure}:15659: testing work around broken ICE dependency ..." 1>&5
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then
+ 	test -n "$verbose" && echo "	found package ice" 1>&6
+ 
+-echo "${as_me:-configure}:15510: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:15664: testing found package ice ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "ice" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15516: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15670: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15520: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15674: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++
++for cf_required in ice
++do
++	# check for duplicates
++	for cf_require_pkg in $REQUIRE_PKG
++	do
++		if test "$cf_required" = "$cf_require_pkg"
++		then
++			cf_required=
++			break
++		fi
++	done
++	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
++done
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15636,17 +15804,31 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
+ 	test -n "$verbose" && echo "	found package sm" 1>&6
+ 
+-echo "${as_me:-configure}:15639: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:15807: testing found package sm ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "sm" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15645: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15813: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15649: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15817: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++
++for cf_required in sm
++do
++	# check for duplicates
++	for cf_require_pkg in $REQUIRE_PKG
++	do
++		if test "$cf_required" = "$cf_require_pkg"
++		then
++			cf_required=
++			break
++		fi
++	done
++	test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required"
++done
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -15775,12 +15957,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:15778: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:15960: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:15783: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:15965: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -15800,7 +15982,7 @@
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15803: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15985: testing checking additions to CFLAGS ..." 1>&5
+ 
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -15885,7 +16067,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:15888: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:16070: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -15895,7 +16077,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:15898: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:16080: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -15905,7 +16087,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}:15908: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:16090: 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"
+@@ -15914,7 +16096,7 @@
+ 
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15917 "configure"
++#line 16099 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -15926,16 +16108,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15929: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16111: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15932: \$? = $ac_status" >&5
++  echo "$as_me:16114: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15935: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16117: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15938: \$? = $ac_status" >&5
++  echo "$as_me:16120: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -15943,12 +16125,12 @@
+ cat "conftest.$ac_ext" >&5
+ test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15946: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16128: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+ 
+ 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
+ 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15951: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16133: testing but keeping change to \$CPPFLAGS ..." 1>&5
+ 
+ 	 fi
+ 	 CFLAGS="$cf_check_cflags"
+@@ -15956,13 +16138,13 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+ 
+-	echo "$as_me:15959: checking for XOpenDisplay" >&5
++	echo "$as_me:16141: checking for XOpenDisplay" >&5
+ echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
+ if test "${ac_cv_func_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15965 "configure"
++#line 16147 "configure"
+ #include "confdefs.h"
+ #define XOpenDisplay autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15993,16 +16175,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15996: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16178: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15999: \$? = $ac_status" >&5
++  echo "$as_me:16181: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16002: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16184: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16005: \$? = $ac_status" >&5
++  echo "$as_me:16187: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_XOpenDisplay=yes
+ else
+@@ -16012,13 +16194,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16015: result: $ac_cv_func_XOpenDisplay" >&5
++echo "$as_me:16197: result: $ac_cv_func_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
+ if test "$ac_cv_func_XOpenDisplay" = yes; then
+   :
+ else
+ 
+-	echo "$as_me:16021: checking for XOpenDisplay in -lX11" >&5
++	echo "$as_me:16203: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16026,7 +16208,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16029 "configure"
++#line 16211 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16045,16 +16227,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16048: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16230: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16051: \$? = $ac_status" >&5
++  echo "$as_me:16233: \$? = $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:16236: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16057: \$? = $ac_status" >&5
++  echo "$as_me:16239: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -16065,7 +16247,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16068: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:16250: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then
+ 
+@@ -16089,13 +16271,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:16092: checking for XtAppInitialize" >&5
++	echo "$as_me:16274: checking for XtAppInitialize" >&5
+ echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
+ if test "${ac_cv_func_XtAppInitialize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16098 "configure"
++#line 16280 "configure"
+ #include "confdefs.h"
+ #define XtAppInitialize autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16126,16 +16308,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16129: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16311: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16132: \$? = $ac_status" >&5
++  echo "$as_me:16314: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16135: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16317: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16138: \$? = $ac_status" >&5
++  echo "$as_me:16320: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_XtAppInitialize=yes
+ else
+@@ -16145,13 +16327,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16148: result: $ac_cv_func_XtAppInitialize" >&5
++echo "$as_me:16330: result: $ac_cv_func_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
+ if test "$ac_cv_func_XtAppInitialize" = yes; then
+   :
+ else
+ 
+-	echo "$as_me:16154: checking for XtAppInitialize in -lXt" >&5
++	echo "$as_me:16336: checking for XtAppInitialize in -lXt" >&5
+ echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16159,7 +16341,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16162 "configure"
++#line 16344 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16178,16 +16360,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16181: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16363: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16184: \$? = $ac_status" >&5
++  echo "$as_me:16366: \$? = $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:16369: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16190: \$? = $ac_status" >&5
++  echo "$as_me:16372: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_Xt_XtAppInitialize=yes
+ else
+@@ -16198,7 +16380,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16201: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
++echo "$as_me:16383: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
+ if test "$ac_cv_lib_Xt_XtAppInitialize" = yes; then
+ 
+@@ -16215,7 +16397,7 @@
+ fi
+ 
+ if test "$cf_have_X_LIBS" = no ; then
+-	{ echo "$as_me:16218: WARNING: Unable to successfully link X Toolkit library (-lXt) with
++	{ echo "$as_me:16400: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+ test program.  You will have to check and add the proper libraries by hand
+ to makefile." >&5
+ echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+@@ -16256,14 +16438,14 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
+ 
+-			echo "$as_me:16259: checking for $cf_test in $cf_path" >&5
++			echo "$as_me:16441: checking for $cf_test in $cf_path" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
+ 		else
+-			echo "$as_me:16262: checking for $cf_test" >&5
++			echo "$as_me:16444: checking for $cf_test" >&5
+ echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
+ 		fi
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16266 "configure"
++#line 16448 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16277,16 +16459,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16280: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16462: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16283: \$? = $ac_status" >&5
++  echo "$as_me:16465: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16286: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16468: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16289: \$? = $ac_status" >&5
++  echo "$as_me:16471: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -16295,7 +16477,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-		echo "$as_me:16298: result: $cf_result" >&5
++		echo "$as_me:16480: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
+@@ -16311,7 +16493,7 @@
+ done
+ 
+ if test -z "$cf_x_athena_inc" ; then
+-	{ echo "$as_me:16314: WARNING: Unable to find Athena header files" >&5
++	{ echo "$as_me:16496: WARNING: Unable to find Athena header files" >&5
+ echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
+ elif test "$cf_x_athena_inc" != default ; then
+ 
+@@ -16376,10 +16558,10 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-		echo "$as_me:16379: checking for $cf_test in $cf_libs" >&5
++		echo "$as_me:16561: checking for $cf_test in $cf_libs" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16382 "configure"
++#line 16564 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -16396,16 +16578,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16399: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16581: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16402: \$? = $ac_status" >&5
++  echo "$as_me:16584: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16405: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16587: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16408: \$? = $ac_status" >&5
++  echo "$as_me:16590: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -16414,7 +16596,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:16417: result: $cf_result" >&5
++		echo "$as_me:16599: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
+@@ -16431,7 +16613,7 @@
+ done
+ 
+ if test -z "$cf_x_athena_lib" ; then
+-	{ { echo "$as_me:16434: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
++	{ { echo "$as_me:16616: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+ echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -16465,7 +16647,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:16468: checking for $ac_word" >&5
++echo "$as_me:16650: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16480,7 +16662,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:16483: found $ac_dir/$ac_word" >&5
++echo "$as_me:16665: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -16488,10 +16670,10 @@
+ fi
+ XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
+ if test -n "$XCURSES_CONFIG"; then
+-  echo "$as_me:16491: result: $XCURSES_CONFIG" >&5
++  echo "$as_me:16673: result: $XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$XCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:16494: result: no" >&5
++  echo "$as_me:16676: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -16504,7 +16686,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:16507: checking for $ac_word" >&5
++echo "$as_me:16689: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16519,7 +16701,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
+-echo "$as_me:16522: found $ac_dir/$ac_word" >&5
++echo "$as_me:16704: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -16527,10 +16709,10 @@
+ fi
+ ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
+ if test -n "$ac_ct_XCURSES_CONFIG"; then
+-  echo "$as_me:16530: result: $ac_ct_XCURSES_CONFIG" >&5
++  echo "$as_me:16712: result: $ac_ct_XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:16533: result: no" >&5
++  echo "$as_me:16715: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -16665,7 +16847,7 @@
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16668: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16850: testing checking additions to CFLAGS ..." 1>&5
+ 
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -16750,7 +16932,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:16753: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:16935: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -16760,7 +16942,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:16763: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:16945: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -16770,7 +16952,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}:16773: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:16955: 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"
+@@ -16779,7 +16961,7 @@
+ 
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16782 "configure"
++#line 16964 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -16791,16 +16973,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16794: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16976: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16797: \$? = $ac_status" >&5
++  echo "$as_me:16979: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16800: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16982: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16803: \$? = $ac_status" >&5
++  echo "$as_me:16985: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -16808,12 +16990,12 @@
+ cat "conftest.$ac_ext" >&5
+ test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16811: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16993: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+ 
+ 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
+ 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16816: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16998: testing but keeping change to \$CPPFLAGS ..." 1>&5
+ 
+ 	 fi
+ 	 CFLAGS="$cf_check_cflags"
+@@ -16821,7 +17003,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:16824: checking for XOpenDisplay in -lX11" >&5
++echo "$as_me:17006: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16829,7 +17011,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16832 "configure"
++#line 17014 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16848,16 +17030,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16851: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17033: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16854: \$? = $ac_status" >&5
++  echo "$as_me:17036: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16857: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17039: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16860: \$? = $ac_status" >&5
++  echo "$as_me:17042: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -16868,7 +17050,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16871: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:17053: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then
+ 
+@@ -16890,7 +17072,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16893: checking for XCurses library" >&5
++echo "$as_me:17075: checking for XCurses library" >&5
+ echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
+ if test "${cf_cv_lib_XCurses+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16913,7 +17095,7 @@
+ LIBS="$cf_add_libs"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16916 "configure"
++#line 17098 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16928,16 +17110,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16931: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17113: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16934: \$? = $ac_status" >&5
++  echo "$as_me:17116: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16937: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17119: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16940: \$? = $ac_status" >&5
++  echo "$as_me:17122: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_lib_XCurses=yes
+ else
+@@ -16948,7 +17130,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16951: result: $cf_cv_lib_XCurses" >&5
++echo "$as_me:17133: result: $cf_cv_lib_XCurses" >&5
+ echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
+ 
+ fi
+@@ -16963,23 +17145,23 @@
+ #define XCURSES 1
+ EOF
+ 
+-	echo "$as_me:16966: checking for xcurses.h" >&5
++	echo "$as_me:17148: checking for xcurses.h" >&5
+ echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
+ if test "${ac_cv_header_xcurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16972 "configure"
++#line 17154 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16976: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:17158: \"$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:16982: \$? = $ac_status" >&5
++  echo "$as_me:17164: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16998,7 +17180,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17001: result: $ac_cv_header_xcurses_h" >&5
++echo "$as_me:17183: result: $ac_cv_header_xcurses_h" >&5
+ echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
+ if test "$ac_cv_header_xcurses_h" = yes; then
+ 
+@@ -17009,26 +17191,26 @@
+ fi
+ 
+ else
+-	{ { echo "$as_me:17012: error: Cannot link with XCurses" >&5
++	{ { echo "$as_me:17194: error: Cannot link with XCurses" >&5
+ echo "$as_me: error: Cannot link with XCurses" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ 	;;
+ (*)
+-	{ { echo "$as_me:17019: error: unexpected screen-value: $cf_cv_screen" >&5
++	{ { echo "$as_me:17201: error: unexpected screen-value: $cf_cv_screen" >&5
+ echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+-echo "$as_me:17025: checking for _nc_init_pthreads" >&5
++echo "$as_me:17207: checking for _nc_init_pthreads" >&5
+ echo $ECHO_N "checking for _nc_init_pthreads... $ECHO_C" >&6
+ if test "${ac_cv_func__nc_init_pthreads+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17031 "configure"
++#line 17213 "configure"
+ #include "confdefs.h"
+ #define _nc_init_pthreads autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17059,16 +17241,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17062: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17244: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17065: \$? = $ac_status" >&5
++  echo "$as_me:17247: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17068: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17250: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17071: \$? = $ac_status" >&5
++  echo "$as_me:17253: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func__nc_init_pthreads=yes
+ else
+@@ -17078,7 +17260,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17081: result: $ac_cv_func__nc_init_pthreads" >&5
++echo "$as_me:17263: result: $ac_cv_func__nc_init_pthreads" >&5
+ echo "${ECHO_T}$ac_cv_func__nc_init_pthreads" >&6
+ if test "$ac_cv_func__nc_init_pthreads" = yes; then
+   cf_cv_ncurses_pthreads=yes
+@@ -17113,7 +17295,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17116: checking for X11 rgb file" >&5
++echo "$as_me:17298: 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.
+@@ -17175,7 +17357,7 @@
+ 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:17178: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:17360: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -17183,7 +17365,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17186: result: $RGB_PATH" >&5
++echo "$as_me:17368: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:17409: 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.
+@@ -17244,10 +17426,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17247: result: $FORM_NAME" >&5
++echo "$as_me:17429: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:17250: checking for desired basename for menu library" >&5
++echo "$as_me:17432: 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.
+@@ -17267,10 +17449,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17270: result: $MENU_NAME" >&5
++echo "$as_me:17452: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:17273: checking for desired basename for panel library" >&5
++echo "$as_me:17455: 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.
+@@ -17290,10 +17472,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17293: result: $PANEL_NAME" >&5
++echo "$as_me:17475: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:17296: checking if you want to check for panel functions" >&5
++echo "$as_me:17478: checking if you want to check for panel functions" >&5
+ echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-panel or --disable-panel was given.
+@@ -17310,7 +17492,7 @@
+ 	cf_enable_panel=$cf_default_panel
+ 
+ fi;
+-echo "$as_me:17313: result: $cf_enable_panel" >&5
++echo "$as_me:17495: result: $cf_enable_panel" >&5
+ echo "${ECHO_T}$cf_enable_panel" >&6
+ if test $cf_enable_panel = yes
+ then
+@@ -17321,13 +17503,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:17324: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
++	echo "$as_me:17506: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists "$PANEL_NAME$cf_cv_libtype" ; then
+-		echo "$as_me:17327: result: yes" >&5
++		echo "$as_me:17509: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:17330: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
++		echo "$as_me:17512: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CFLAGS="$CFLAGS"
+@@ -17477,7 +17659,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17480 "configure"
++#line 17662 "configure"
+ #include "confdefs.h"
+ #include <$PANEL_NAME.h>
+ int
+@@ -17489,37 +17671,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17492: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17674: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17495: \$? = $ac_status" >&5
++  echo "$as_me:17677: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17498: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17680: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17501: \$? = $ac_status" >&5
++  echo "$as_me:17683: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17507 "configure"
++#line 17689 "configure"
+ #include "confdefs.h"
+ #include <$PANEL_NAME.h>
+ 				int main(void)
+ 				{ (void) new_panel ( 0 ); return 0; }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17514: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17696: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17517: \$? = $ac_status" >&5
++  echo "$as_me:17699: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17519: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17701: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17522: \$? = $ac_status" >&5
++  echo "$as_me:17704: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -17536,7 +17718,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:17539: result: $cf_have_curses_lib" >&5
++		echo "$as_me:17721: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" = "yes"
+@@ -17557,7 +17739,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh`
+-echo "$as_me:17560: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
++echo "$as_me:17742: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17565,7 +17747,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$PANEL_NAME$cf_cv_libtype  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17568 "configure"
++#line 17750 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17584,16 +17766,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17587: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17769: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17590: \$? = $ac_status" >&5
++  echo "$as_me:17772: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17593: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17775: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17596: \$? = $ac_status" >&5
++  echo "$as_me:17778: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -17604,7 +17786,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17607: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:17789: 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
+ 
+@@ -17637,7 +17819,7 @@
+ 	cf_curses_headers="$cf_curses_headers panel.h"
+ fi
+ 
+-echo "$as_me:17640: checking if you want to check for menu functions" >&5
++echo "$as_me:17822: checking if you want to check for menu functions" >&5
+ echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-menu or --disable-menu was given.
+@@ -17654,7 +17836,7 @@
+ 	cf_enable_menu=$cf_default_menu
+ 
+ fi;
+-echo "$as_me:17657: result: $cf_enable_menu" >&5
++echo "$as_me:17839: result: $cf_enable_menu" >&5
+ echo "${ECHO_T}$cf_enable_menu" >&6
+ if test $cf_enable_menu = yes
+ then
+@@ -17663,14 +17845,14 @@
+ 		;;
+ 	(curses*)
+ 
+-echo "$as_me:17666: checking for NetBSD menu.h" >&5
++echo "$as_me:17848: checking for NetBSD menu.h" >&5
+ echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_menu_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17673 "configure"
++#line 17855 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -17688,16 +17870,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17691: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17873: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17694: \$? = $ac_status" >&5
++  echo "$as_me:17876: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17697: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17879: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17700: \$? = $ac_status" >&5
++  echo "$as_me:17882: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_netbsd_menu_h=yes
+ 
+@@ -17709,7 +17891,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17712: result: $cf_cv_netbsd_menu_h" >&5
++echo "$as_me:17894: result: $cf_cv_netbsd_menu_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
+ 
+ test "$cf_cv_netbsd_menu_h" = yes &&
+@@ -17726,13 +17908,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:17729: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
++	echo "$as_me:17911: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists "$MENU_NAME$cf_cv_libtype" ; then
+-		echo "$as_me:17732: result: yes" >&5
++		echo "$as_me:17914: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:17735: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
++		echo "$as_me:17917: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CFLAGS="$CFLAGS"
+@@ -17882,7 +18064,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17885 "configure"
++#line 18067 "configure"
+ #include "confdefs.h"
+ #include <$MENU_NAME.h>
+ int
+@@ -17894,37 +18076,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17897: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18079: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17900: \$? = $ac_status" >&5
++  echo "$as_me:18082: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17903: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18085: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17906: \$? = $ac_status" >&5
++  echo "$as_me:18088: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17912 "configure"
++#line 18094 "configure"
+ #include "confdefs.h"
+ #include <$MENU_NAME.h>
+ 				int main(void)
+ 				{ (void) menu_driver ( 0,0 ); return 0; }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17919: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18101: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17922: \$? = $ac_status" >&5
++  echo "$as_me:18104: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17924: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18106: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17927: \$? = $ac_status" >&5
++  echo "$as_me:18109: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -17941,7 +18123,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:17944: result: $cf_have_curses_lib" >&5
++		echo "$as_me:18126: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" = "yes"
+@@ -17962,7 +18144,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh`
+-echo "$as_me:17965: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
++echo "$as_me:18147: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17970,7 +18152,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$MENU_NAME$cf_cv_libtype  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17973 "configure"
++#line 18155 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17989,16 +18171,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17992: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18174: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17995: \$? = $ac_status" >&5
++  echo "$as_me:18177: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17998: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18180: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18001: \$? = $ac_status" >&5
++  echo "$as_me:18183: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -18009,7 +18191,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18012: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:18194: 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
+ 
+@@ -18042,7 +18224,7 @@
+ 	cf_curses_headers="$cf_curses_headers menu.h"
+ fi
+ 
+-echo "$as_me:18045: checking if you want to check for form functions" >&5
++echo "$as_me:18227: checking if you want to check for form functions" >&5
+ echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-form or --disable-form was given.
+@@ -18059,7 +18241,7 @@
+ 	cf_enable_form=$cf_default_form
+ 
+ fi;
+-echo "$as_me:18062: result: $cf_enable_form" >&5
++echo "$as_me:18244: result: $cf_enable_form" >&5
+ echo "${ECHO_T}$cf_enable_form" >&6
+ if test $cf_enable_form = yes
+ then
+@@ -18068,14 +18250,14 @@
+ 		;;
+ 	(curses*)
+ 
+-echo "$as_me:18071: checking for NetBSD form.h" >&5
++echo "$as_me:18253: checking for NetBSD form.h" >&5
+ echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_form_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18078 "configure"
++#line 18260 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18094,16 +18276,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18097: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18279: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18100: \$? = $ac_status" >&5
++  echo "$as_me:18282: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18103: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18285: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18106: \$? = $ac_status" >&5
++  echo "$as_me:18288: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_netbsd_form_h=yes
+ 
+@@ -18115,7 +18297,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:18118: result: $cf_cv_netbsd_form_h" >&5
++echo "$as_me:18300: result: $cf_cv_netbsd_form_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
+ 
+ test "$cf_cv_netbsd_form_h" = yes &&
+@@ -18132,13 +18314,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:18135: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
++	echo "$as_me:18317: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists "$FORM_NAME$cf_cv_libtype" ; then
+-		echo "$as_me:18138: result: yes" >&5
++		echo "$as_me:18320: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:18141: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
++		echo "$as_me:18323: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CFLAGS="$CFLAGS"
+@@ -18288,7 +18470,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18291 "configure"
++#line 18473 "configure"
+ #include "confdefs.h"
+ #include <$FORM_NAME.h>
+ int
+@@ -18300,37 +18482,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18303: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18485: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18306: \$? = $ac_status" >&5
++  echo "$as_me:18488: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18309: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18491: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18312: \$? = $ac_status" >&5
++  echo "$as_me:18494: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18318 "configure"
++#line 18500 "configure"
+ #include "confdefs.h"
+ #include <$FORM_NAME.h>
+ 				int main(void)
+ 				{ (void) form_driver ( 0,0 ); return 0; }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:18325: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18507: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18328: \$? = $ac_status" >&5
++  echo "$as_me:18510: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:18330: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18512: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18333: \$? = $ac_status" >&5
++  echo "$as_me:18515: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -18347,7 +18529,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:18350: result: $cf_have_curses_lib" >&5
++		echo "$as_me:18532: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" = "yes"
+@@ -18368,7 +18550,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh`
+-echo "$as_me:18371: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
++echo "$as_me:18553: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18376,7 +18558,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$FORM_NAME$cf_cv_libtype  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18379 "configure"
++#line 18561 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18395,16 +18577,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18398: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18580: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18401: \$? = $ac_status" >&5
++  echo "$as_me:18583: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18404: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18586: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18407: \$? = $ac_status" >&5
++  echo "$as_me:18589: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -18415,7 +18597,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18418: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:18600: 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
+ 
+@@ -18453,23 +18635,23 @@
+ for ac_header in $cf_curses_headers
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18456: checking for $ac_header" >&5
++echo "$as_me:18638: 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 18462 "configure"
++#line 18644 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18466: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18648: \"$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:18472: \$? = $ac_status" >&5
++  echo "$as_me:18654: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18488,7 +18670,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18491: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18673: 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:18683: 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 18507 "configure"
++#line 18689 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -18520,16 +18702,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18523: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18705: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18526: \$? = $ac_status" >&5
++  echo "$as_me:18708: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18529: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18711: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18532: \$? = $ac_status" >&5
++  echo "$as_me:18714: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -18539,7 +18721,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18542: result: $ac_cv_header_time" >&5
++echo "$as_me:18724: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -18560,23 +18742,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18563: checking for $ac_header" >&5
++echo "$as_me:18745: 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 18569 "configure"
++#line 18751 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18573: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18755: \"$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:18579: \$? = $ac_status" >&5
++  echo "$as_me:18761: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18595,7 +18777,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18598: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18780: 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:18793: 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 18617 "configure"
++#line 18799 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18621: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18803: \"$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:18627: \$? = $ac_status" >&5
++  echo "$as_me:18809: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18643,7 +18825,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18646: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18828: 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:18838: 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
+@@ -18663,7 +18845,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18666 "configure"
++#line 18848 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -18676,16 +18858,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18679: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18861: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18682: \$? = $ac_status" >&5
++  echo "$as_me:18864: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18685: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18867: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18688: \$? = $ac_status" >&5
++  echo "$as_me:18870: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -18697,7 +18879,7 @@
+ done
+ 
+ fi
+-echo "$as_me:18700: result: $cf_cv_getopt_header" >&5
++echo "$as_me:18882: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -18715,13 +18897,13 @@
+ fi
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:18718: checking for clock_gettime" >&5
++echo "$as_me:18900: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18724 "configure"
++#line 18906 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18752,16 +18934,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18755: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18937: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18758: \$? = $ac_status" >&5
++  echo "$as_me:18940: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18761: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18943: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18764: \$? = $ac_status" >&5
++  echo "$as_me:18946: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -18771,12 +18953,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18774: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:18956: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:18779: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:18961: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18784,7 +18966,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18787 "configure"
++#line 18969 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18803,16 +18985,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18806: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18988: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18809: \$? = $ac_status" >&5
++  echo "$as_me:18991: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18812: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18994: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18815: \$? = $ac_status" >&5
++  echo "$as_me:18997: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -18823,7 +19005,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18826: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:19008: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -18835,14 +19017,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:18838: checking if clock_gettime links" >&5
++echo "$as_me:19020: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18845 "configure"
++#line 19027 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -18860,16 +19042,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18863: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19045: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18866: \$? = $ac_status" >&5
++  echo "$as_me:19048: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18869: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19051: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18872: \$? = $ac_status" >&5
++  echo "$as_me:19054: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -18880,7 +19062,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:18883: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:19065: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -18894,13 +19076,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:18897: checking for gettimeofday" >&5
++echo "$as_me:19079: 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 18903 "configure"
++#line 19085 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18931,16 +19113,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18934: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19116: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18937: \$? = $ac_status" >&5
++  echo "$as_me:19119: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18940: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19122: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18943: \$? = $ac_status" >&5
++  echo "$as_me:19125: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -18950,7 +19132,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18953: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:19135: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -18960,7 +19142,7 @@
+ 
+ else
+ 
+-echo "$as_me:18963: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:19145: 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
+@@ -18968,7 +19150,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18971 "configure"
++#line 19153 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18987,16 +19169,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18990: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19172: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18993: \$? = $ac_status" >&5
++  echo "$as_me:19175: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18996: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19178: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18999: \$? = $ac_status" >&5
++  echo "$as_me:19181: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -19007,7 +19189,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19010: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:19192: 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
+ 
+@@ -19045,13 +19227,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:19048: checking for $ac_func" >&5
++echo "$as_me:19230: 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 19054 "configure"
++#line 19236 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19082,16 +19264,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19085: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19267: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19088: \$? = $ac_status" >&5
++  echo "$as_me:19270: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19091: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19273: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19094: \$? = $ac_status" >&5
++  echo "$as_me:19276: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -19101,7 +19283,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19104: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:19286: 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:19297: checking if we can use termcap.h" >&5
+ echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
+ if test "${cf_cv_have_termcap_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19122 "configure"
++#line 19304 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19140,16 +19322,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19143: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19325: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19146: \$? = $ac_status" >&5
++  echo "$as_me:19328: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19149: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19331: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19152: \$? = $ac_status" >&5
++  echo "$as_me:19334: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_termcap_h=yes
+ else
+@@ -19159,7 +19341,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19162: result: $cf_cv_have_termcap_h" >&5
++echo "$as_me:19344: result: $cf_cv_have_termcap_h" >&5
+ echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
+ if test "x$cf_cv_have_termcap_h" = xyes
+ then
+@@ -19169,14 +19351,14 @@
+ EOF
+ 
+ else
+-echo "$as_me:19172: checking if we can use ncurses/termcap.h" >&5
++echo "$as_me:19354: checking if we can use ncurses/termcap.h" >&5
+ echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
+ if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19179 "configure"
++#line 19361 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19197,16 +19379,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19200: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19382: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19203: \$? = $ac_status" >&5
++  echo "$as_me:19385: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19206: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19388: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19209: \$? = $ac_status" >&5
++  echo "$as_me:19391: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_ncurses_termcap_h=yes
+ else
+@@ -19216,7 +19398,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19219: result: $cf_cv_have_ncurses_termcap_h" >&5
++echo "$as_me:19401: result: $cf_cv_have_ncurses_termcap_h" >&5
+ echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
+ test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -19226,7 +19408,7 @@
+ fi
+ 
+ if test "x$ac_cv_func_getopt" = xno; then
+-	{ { echo "$as_me:19229: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:19411: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -19245,13 +19427,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:19248: checking for $ac_func" >&5
++echo "$as_me:19430: 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 19254 "configure"
++#line 19436 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19282,16 +19464,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19285: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19467: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19288: \$? = $ac_status" >&5
++  echo "$as_me:19470: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19291: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19473: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19294: \$? = $ac_status" >&5
++  echo "$as_me:19476: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -19301,7 +19483,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19304: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:19486: 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:19498: checking definition to turn on extended curses functions" >&5
+ echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
+ if test "${cf_cv_need_xopen_extension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19321,7 +19503,7 @@
+ 
+ cf_cv_need_xopen_extension=unknown
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19324 "configure"
++#line 19506 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -19354,16 +19536,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19357: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19539: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19360: \$? = $ac_status" >&5
++  echo "$as_me:19542: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19363: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19545: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19366: \$? = $ac_status" >&5
++  echo "$as_me:19548: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_xopen_extension=none
+ else
+@@ -19373,7 +19555,7 @@
+ 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19376 "configure"
++#line 19558 "configure"
+ #include "confdefs.h"
+ 
+ #define $cf_try_xopen_extension 1
+@@ -19399,16 +19581,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19402: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19584: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19405: \$? = $ac_status" >&5
++  echo "$as_me:19587: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19408: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19590: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19411: \$? = $ac_status" >&5
++  echo "$as_me:19593: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
+ else
+@@ -19422,7 +19604,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:19425: result: $cf_cv_need_xopen_extension" >&5
++echo "$as_me:19607: result: $cf_cv_need_xopen_extension" >&5
+ echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
+ 
+ case "$cf_cv_need_xopen_extension" in
+@@ -19434,7 +19616,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19437: checking for term.h" >&5
++echo "$as_me:19619: checking for term.h" >&5
+ echo $ECHO_N "checking for term.h... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19455,7 +19637,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19458 "configure"
++#line 19640 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19469,16 +19651,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19472: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19654: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19475: \$? = $ac_status" >&5
++  echo "$as_me:19657: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19478: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19660: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19481: \$? = $ac_status" >&5
++  echo "$as_me:19663: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_term_header=$cf_header
+ 	 break
+@@ -19497,7 +19679,7 @@
+ 	for cf_header in ncurses/term.h ncursesw/term.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19500 "configure"
++#line 19682 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19515,16 +19697,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19518: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19700: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19521: \$? = $ac_status" >&5
++  echo "$as_me:19703: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19524: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19706: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19527: \$? = $ac_status" >&5
++  echo "$as_me:19709: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_term_header=$cf_header
+ 			 break
+@@ -19539,7 +19721,7 @@
+ esac
+ 
+ fi
+-echo "$as_me:19542: result: $cf_cv_term_header" >&5
++echo "$as_me:19724: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ case "$cf_cv_term_header" in
+@@ -19566,7 +19748,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19569: checking for unctrl.h" >&5
++echo "$as_me:19751: checking for unctrl.h" >&5
+ echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
+ if test "${cf_cv_unctrl_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19587,7 +19769,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19590 "configure"
++#line 19772 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19601,16 +19783,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19604: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19786: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19607: \$? = $ac_status" >&5
++  echo "$as_me:19789: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19610: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19792: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19613: \$? = $ac_status" >&5
++  echo "$as_me:19795: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unctrl_header=$cf_header
+ 	 break
+@@ -19623,12 +19805,12 @@
+ done
+ 
+ fi
+-echo "$as_me:19626: result: $cf_cv_unctrl_header" >&5
++echo "$as_me:19808: result: $cf_cv_unctrl_header" >&5
+ echo "${ECHO_T}$cf_cv_unctrl_header" >&6
+ 
+ case "$cf_cv_unctrl_header" in
+ (no)
+-	{ echo "$as_me:19631: WARNING: unctrl.h header not found" >&5
++	{ echo "$as_me:19813: WARNING: unctrl.h header not found" >&5
+ echo "$as_me: WARNING: unctrl.h header not found" >&2;}
+ 	;;
+ esac
+@@ -19726,10 +19908,10 @@
+ 
+ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 
+-	echo "$as_me:19729: checking for ${cf_func}" >&5
++	echo "$as_me:19911: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:19732: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:19914: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19738,7 +19920,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19741 "configure"
++#line 19923 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -19771,16 +19953,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19774: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19956: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19777: \$? = $ac_status" >&5
++  echo "$as_me:19959: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19780: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19962: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19783: \$? = $ac_status" >&5
++  echo "$as_me:19965: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -19796,7 +19978,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:19799: result: $cf_result" >&5
++	echo "$as_me:19981: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" != no; then
+ 		cat >>confdefs.h <&5
++	echo "$as_me:19996: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:19817: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:19999: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19823,7 +20005,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19826 "configure"
++#line 20008 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -19856,16 +20038,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19859: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20041: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19862: \$? = $ac_status" >&5
++  echo "$as_me:20044: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19865: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20047: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19868: \$? = $ac_status" >&5
++  echo "$as_me:20050: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -19881,7 +20063,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:19884: result: $cf_result" >&5
++	echo "$as_me:20066: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" != no; then
+ 		cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF
+-#line 19908 "configure"
++#line 20090 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19925,21 +20107,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19928: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20110: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19931: \$? = $ac_status" >&5
++  echo "$as_me:20113: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19934: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20116: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19937: \$? = $ac_status" >&5
++  echo "$as_me:20119: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
+ 
+-echo "${as_me:-configure}:19942: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
++echo "${as_me:-configure}:20124: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+ 
+ 		cat >>confdefs.h <&5
++echo "$as_me:20144: checking for ncurses extended functions" >&5
+ echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19969 "configure"
++#line 20151 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19981,16 +20163,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19984: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20166: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19987: \$? = $ac_status" >&5
++  echo "$as_me:20169: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19990: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20172: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19993: \$? = $ac_status" >&5
++  echo "$as_me:20175: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_ext_funcs=defined
+ else
+@@ -19998,7 +20180,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20001 "configure"
++#line 20183 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20023,16 +20205,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20026: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20208: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20029: \$? = $ac_status" >&5
++  echo "$as_me:20211: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20032: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20214: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20035: \$? = $ac_status" >&5
++  echo "$as_me:20217: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_ext_funcs=yes
+ else
+@@ -20046,7 +20228,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20049: result: $cf_cv_ncurses_ext_funcs" >&5
++echo "$as_me:20231: result: $cf_cv_ncurses_ext_funcs" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
+ test "$cf_cv_ncurses_ext_funcs" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -20060,11 +20242,11 @@
+ 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
+ 	then
+ 		cf_define_xpg5=no
+-		echo "$as_me:20063: checking if _XPG5 should be defined to enable wide-characters" >&5
++		echo "$as_me:20245: checking if _XPG5 should be defined to enable wide-characters" >&5
+ echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20067 "configure"
++#line 20249 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20077,16 +20259,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20080: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20262: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20083: \$? = $ac_status" >&5
++  echo "$as_me:20265: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20086: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20268: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20089: \$? = $ac_status" >&5
++  echo "$as_me:20271: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -20095,7 +20277,7 @@
+ cf_save_cppflags="$CPPFLAGS"
+ 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20098 "configure"
++#line 20280 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20108,16 +20290,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20111: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20293: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20114: \$? = $ac_status" >&5
++  echo "$as_me:20296: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20117: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20299: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20120: \$? = $ac_status" >&5
++  echo "$as_me:20302: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_define_xpg5=yes
+ else
+@@ -20128,7 +20310,7 @@
+ 			 CPPFLAGS="$cf_save_cppflags"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-		echo "$as_me:20131: result: $cf_define_xpg5" >&5
++		echo "$as_me:20313: result: $cf_define_xpg5" >&5
+ echo "${ECHO_T}$cf_define_xpg5" >&6
+ 
+ 		if test "$cf_define_xpg5" = yes
+@@ -20137,14 +20319,14 @@
+ 		fi
+ 	fi
+ 
+-	echo "$as_me:20140: checking for wide-character functions" >&5
++	echo "$as_me:20322: checking for wide-character functions" >&5
+ echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
+ if test "${cf_cv_widechar_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20147 "configure"
++#line 20329 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20161,16 +20343,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20164: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20346: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20167: \$? = $ac_status" >&5
++  echo "$as_me:20349: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20170: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20352: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20173: \$? = $ac_status" >&5
++  echo "$as_me:20355: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_widechar_funcs=yes
+ else
+@@ -20181,7 +20363,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20184: result: $cf_cv_widechar_funcs" >&5
++echo "$as_me:20366: result: $cf_cv_widechar_funcs" >&5
+ echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
+ 	if test "$cf_cv_widechar_funcs" != no ; then
+ 
+@@ -20202,14 +20384,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20205: checking if $cf_cv_screen library uses pthreads" >&5
++echo "$as_me:20387: checking if $cf_cv_screen library uses pthreads" >&5
+ echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
+ if test "${cf_cv_use_pthreads+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20212 "configure"
++#line 20394 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20227,16 +20409,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20230: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20412: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20233: \$? = $ac_status" >&5
++  echo "$as_me:20415: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20236: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20418: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20239: \$? = $ac_status" >&5
++  echo "$as_me:20421: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_use_pthreads=yes
+ else
+@@ -20247,21 +20429,21 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20250: result: $cf_cv_use_pthreads" >&5
++echo "$as_me:20432: result: $cf_cv_use_pthreads" >&5
+ echo "${ECHO_T}$cf_cv_use_pthreads" >&6
+ test $cf_cv_use_pthreads = yes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_PTHREADS 1
+ EOF
+ 
+-echo "$as_me:20257: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:20439: 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 20264 "configure"
++#line 20446 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20281,16 +20463,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20284: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20466: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20287: \$? = $ac_status" >&5
++  echo "$as_me:20469: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20290: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20472: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20293: \$? = $ac_status" >&5
++  echo "$as_me:20475: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -20302,7 +20484,7 @@
+ 
+ fi
+ 
+-echo "$as_me:20305: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:20487: 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
+@@ -20311,7 +20493,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:20314: checking for openpty in -lutil" >&5
++echo "$as_me:20496: 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
+@@ -20319,7 +20501,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20322 "configure"
++#line 20504 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20338,16 +20520,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20341: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20523: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20344: \$? = $ac_status" >&5
++  echo "$as_me:20526: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20347: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20529: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20350: \$? = $ac_status" >&5
++  echo "$as_me:20532: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -20358,7 +20540,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20361: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:20543: 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
+@@ -20366,7 +20548,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:20369: checking for openpty header" >&5
++echo "$as_me:20551: 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
+@@ -20393,7 +20575,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20396 "configure"
++#line 20578 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20411,16 +20593,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20414: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20596: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20417: \$? = $ac_status" >&5
++  echo "$as_me:20599: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20420: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20602: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20423: \$? = $ac_status" >&5
++  echo "$as_me:20605: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -20438,7 +20620,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:20441: result: $cf_cv_func_openpty" >&5
++echo "$as_me:20623: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -20472,7 +20654,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:20475: checking for function curses_version" >&5
++echo "$as_me:20657: checking for function curses_version" >&5
+ echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
+ if test "${cf_cv_func_curses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20482,7 +20664,7 @@
+   cf_cv_func_curses_version=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20485 "configure"
++#line 20667 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -20498,15 +20680,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:20501: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20683: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20504: \$? = $ac_status" >&5
++  echo "$as_me:20686: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:20506: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20688: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20509: \$? = $ac_status" >&5
++  echo "$as_me:20691: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_curses_version=yes
+ 
+@@ -20521,14 +20703,14 @@
+ fi
+ rm -f core
+ fi
+-echo "$as_me:20524: result: $cf_cv_func_curses_version" >&5
++echo "$as_me:20706: result: $cf_cv_func_curses_version" >&5
+ echo "${ECHO_T}$cf_cv_func_curses_version" >&6
+ test "$cf_cv_func_curses_version" = yes &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_CURSES_VERSION 1
+ EOF
+ 
+-echo "$as_me:20531: checking for alternate character set array" >&5
++echo "$as_me:20713: checking for alternate character set array" >&5
+ echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_acs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20538,7 +20720,7 @@
+ for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20541 "configure"
++#line 20723 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20554,16 +20736,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20557: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20739: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20560: \$? = $ac_status" >&5
++  echo "$as_me:20742: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20563: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20745: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20566: \$? = $ac_status" >&5
++  echo "$as_me:20748: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_acs_map=$name; break
+ else
+@@ -20574,7 +20756,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20577: result: $cf_cv_curses_acs_map" >&5
++echo "$as_me:20759: result: $cf_cv_curses_acs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
+ 
+ test "$cf_cv_curses_acs_map" != unknown &&
+@@ -20584,7 +20766,7 @@
+ 
+ if test "$cf_enable_widec" = yes; then
+ 
+-echo "$as_me:20587: checking for wide alternate character set array" >&5
++echo "$as_me:20769: checking for wide alternate character set array" >&5
+ echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20594,7 +20776,7 @@
+ 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20597 "configure"
++#line 20779 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20610,16 +20792,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20613: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20795: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20616: \$? = $ac_status" >&5
++  echo "$as_me:20798: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20619: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20801: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20622: \$? = $ac_status" >&5
++  echo "$as_me:20804: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_wacs_map=$name
+ 	 break
+@@ -20630,7 +20812,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	done
+ fi
+-echo "$as_me:20633: result: $cf_cv_curses_wacs_map" >&5
++echo "$as_me:20815: result: $cf_cv_curses_wacs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
+ 
+ test "$cf_cv_curses_wacs_map" != unknown &&
+@@ -20638,7 +20820,7 @@
+ #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
+ EOF
+ 
+-echo "$as_me:20641: checking for wide alternate character constants" >&5
++echo "$as_me:20823: checking for wide alternate character constants" >&5
+ echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_symbols+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20648,7 +20830,7 @@
+ if test "$cf_cv_curses_wacs_map" != unknown
+ then
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20651 "configure"
++#line 20833 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20665,16 +20847,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20668: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20850: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20671: \$? = $ac_status" >&5
++  echo "$as_me:20853: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20674: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20856: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20677: \$? = $ac_status" >&5
++  echo "$as_me:20859: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -20684,7 +20866,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ else
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20687 "configure"
++#line 20869 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20700,16 +20882,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20703: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20885: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20706: \$? = $ac_status" >&5
++  echo "$as_me:20888: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20709: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20891: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20712: \$? = $ac_status" >&5
++  echo "$as_me:20894: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -20720,7 +20902,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:20723: result: $cf_cv_curses_wacs_symbols" >&5
++echo "$as_me:20905: result: $cf_cv_curses_wacs_symbols" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
+ 
+ test "$cf_cv_curses_wacs_symbols" != no &&
+@@ -20730,10 +20912,10 @@
+ 
+ fi
+ 
+-echo "$as_me:20733: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:20915: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20736 "configure"
++#line 20918 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20751,16 +20933,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20754: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20936: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20757: \$? = $ac_status" >&5
++  echo "$as_me:20939: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20760: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20942: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20763: \$? = $ac_status" >&5
++  echo "$as_me:20945: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -20769,7 +20951,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:20772: result: $cf_result" >&5
++echo "$as_me:20954: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -20790,14 +20972,14 @@
+ if test "$cf_enable_widec" = yes; then
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:20793: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:20975: 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 20800 "configure"
++#line 20982 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20815,23 +20997,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20818: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21000: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20821: \$? = $ac_status" >&5
++  echo "$as_me:21003: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20824: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21006: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20827: \$? = $ac_status" >&5
++  echo "$as_me:21009: \$? = $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 20834 "configure"
++#line 21016 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20850,16 +21032,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20853: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21035: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20856: \$? = $ac_status" >&5
++  echo "$as_me:21038: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20859: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21041: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20862: \$? = $ac_status" >&5
++  echo "$as_me:21044: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -20871,7 +21053,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20874: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:21056: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -20894,14 +21076,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:20897: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:21079: 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 20904 "configure"
++#line 21086 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20919,23 +21101,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20922: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21104: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20925: \$? = $ac_status" >&5
++  echo "$as_me:21107: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20928: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21110: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20931: \$? = $ac_status" >&5
++  echo "$as_me:21113: \$? = $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 20938 "configure"
++#line 21120 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20954,16 +21136,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20957: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21139: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20960: \$? = $ac_status" >&5
++  echo "$as_me:21142: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20963: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21145: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20966: \$? = $ac_status" >&5
++  echo "$as_me:21148: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -20975,7 +21157,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20978: result: $cf_cv_wchar_t" >&5
++echo "$as_me:21160: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -20998,14 +21180,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:21001: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:21183: 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 21008 "configure"
++#line 21190 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21023,23 +21205,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21026: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21208: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21029: \$? = $ac_status" >&5
++  echo "$as_me:21211: \$? = $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:21214: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21035: \$? = $ac_status" >&5
++  echo "$as_me:21217: \$? = $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 21042 "configure"
++#line 21224 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21058,16 +21240,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21061: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21243: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21064: \$? = $ac_status" >&5
++  echo "$as_me:21246: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21067: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21249: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21070: \$? = $ac_status" >&5
++  echo "$as_me:21252: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -21079,7 +21261,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21082: result: $cf_cv_wint_t" >&5
++echo "$as_me:21264: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -21103,10 +21285,10 @@
+ 
+ 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
+ 
+-echo "$as_me:21106: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21288: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21109 "configure"
++#line 21291 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21124,16 +21306,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21127: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21309: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21130: \$? = $ac_status" >&5
++  echo "$as_me:21312: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21133: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21315: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21136: \$? = $ac_status" >&5
++  echo "$as_me:21318: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21142,7 +21324,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21145: result: $cf_result" >&5
++echo "$as_me:21327: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -21164,10 +21346,10 @@
+ 
+ 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
+ 
+-echo "$as_me:21167: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21349: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21170 "configure"
++#line 21352 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21185,16 +21367,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21188: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21370: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21191: \$? = $ac_status" >&5
++  echo "$as_me:21373: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21194: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21376: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21197: \$? = $ac_status" >&5
++  echo "$as_me:21379: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21203,7 +21385,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21206: result: $cf_result" >&5
++echo "$as_me:21388: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -21225,10 +21407,10 @@
+ 
+ 	if test "$NCURSES_OK_WINT_T" = 0 ; then
+ 
+-echo "$as_me:21228: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21410: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21231 "configure"
++#line 21413 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21246,16 +21428,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21249: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21431: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21252: \$? = $ac_status" >&5
++  echo "$as_me:21434: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21255: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21437: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21258: \$? = $ac_status" >&5
++  echo "$as_me:21440: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21264,7 +21446,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21267: result: $cf_result" >&5
++echo "$as_me:21449: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -21293,11 +21475,11 @@
+ boolfnames \
+ ttytype
+ do
+-echo "$as_me:21296: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21478: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21300 "configure"
++#line 21482 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -21330,16 +21512,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21333: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21515: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21336: \$? = $ac_status" >&5
++  echo "$as_me:21518: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21339: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21521: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21342: \$? = $ac_status" >&5
++  echo "$as_me:21524: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ 
+@@ -21349,7 +21531,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21352: result: $cf_result" >&5
++echo "$as_me:21534: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test "$cf_result" = yes ; then
+@@ -21361,14 +21543,14 @@
+ EOF
+ 
+ else
+-	echo "$as_me:21364: checking for data $cf_data in library" >&5
++	echo "$as_me:21546: checking for data $cf_data in library" >&5
+ echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6
+ 	# BSD linkers insist on making weak linkage, but resolve at runtime.
+ 	if test "$cross_compiling" = yes; then
+ 
+ 	# cross-compiling
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21371 "configure"
++#line 21553 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -21407,16 +21589,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21410: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21592: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21413: \$? = $ac_status" >&5
++  echo "$as_me:21595: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21416: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21598: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21419: \$? = $ac_status" >&5
++  echo "$as_me:21601: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21428,7 +21610,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21431 "configure"
++#line 21613 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -21460,15 +21642,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21463: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21645: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21466: \$? = $ac_status" >&5
++  echo "$as_me:21648: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21468: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21650: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21471: \$? = $ac_status" >&5
++  echo "$as_me:21653: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ 
+@@ -21480,7 +21662,7 @@
+ fi
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-	echo "$as_me:21483: result: $cf_result" >&5
++	echo "$as_me:21665: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = yes ; then
+ 
+@@ -21497,7 +21679,7 @@
+ 
+ if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
+ then
+-	echo "$as_me:21500: checking for X" >&5
++	echo "$as_me:21682: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
+ # Check whether --with-x or --without-x was given.
+@@ -21601,17 +21783,17 @@
+   # Guess where to find include files, by looking for Intrinsic.h.
+   # First, try using that file with no special directory specified.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21604 "configure"
++#line 21786 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:21608: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:21790: \"$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:21614: \$? = $ac_status" >&5
++  echo "$as_me:21796: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -21644,7 +21826,7 @@
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21647 "configure"
++#line 21829 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -21656,16 +21838,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21659: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21841: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21662: \$? = $ac_status" >&5
++  echo "$as_me:21844: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21665: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21847: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21668: \$? = $ac_status" >&5
++  echo "$as_me:21850: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -21703,7 +21885,7 @@
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:21706: result: $have_x" >&5
++  echo "$as_me:21888: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+   no_x=yes
+ else
+@@ -21713,7 +21895,7 @@
+   # Update the cache value to reflect the command line values.
+   ac_cv_have_x="have_x=yes \
+ 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  echo "$as_me:21716: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "$as_me:21898: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+@@ -21740,11 +21922,11 @@
+     # others require no space.  Words are not sufficient . . . .
+     case `(uname -sr) 2>/dev/null` in
+     "SunOS 5"*)
+-      echo "$as_me:21743: checking whether -R must be followed by a space" >&5
++      echo "$as_me:21925: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+       cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21747 "configure"
++#line 21929 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21756,16 +21938,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21759: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21941: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21762: \$? = $ac_status" >&5
++  echo "$as_me:21944: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21765: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21947: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21768: \$? = $ac_status" >&5
++  echo "$as_me:21950: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_nospace=yes
+ else
+@@ -21775,13 +21957,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+       if test $ac_R_nospace = yes; then
+-	echo "$as_me:21778: result: no" >&5
++	echo "$as_me:21960: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	X_LIBS="$X_LIBS -R$x_libraries"
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21784 "configure"
++#line 21966 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21793,16 +21975,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21796: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21978: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21799: \$? = $ac_status" >&5
++  echo "$as_me:21981: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21802: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21984: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21805: \$? = $ac_status" >&5
++  echo "$as_me:21987: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_space=yes
+ else
+@@ -21812,11 +21994,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	if test $ac_R_space = yes; then
+-	  echo "$as_me:21815: result: yes" >&5
++	  echo "$as_me:21997: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ 	else
+-	  echo "$as_me:21819: result: neither works" >&5
++	  echo "$as_me:22001: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ 	fi
+       fi
+@@ -21836,7 +22018,7 @@
+     # the Alpha needs dnet_stub (dnet does not exist).
+     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21839 "configure"
++#line 22021 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21855,22 +22037,22 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21858: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22040: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21861: \$? = $ac_status" >&5
++  echo "$as_me:22043: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21864: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22046: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21867: \$? = $ac_status" >&5
++  echo "$as_me:22049: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:21873: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:22055: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21878,7 +22060,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21881 "configure"
++#line 22063 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21897,16 +22079,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21900: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22082: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21903: \$? = $ac_status" >&5
++  echo "$as_me:22085: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21906: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22088: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21909: \$? = $ac_status" >&5
++  echo "$as_me:22091: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -21917,14 +22099,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21920: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:22102: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      echo "$as_me:21927: checking for dnet_ntoa in -ldnet_stub" >&5
++      echo "$as_me:22109: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21932,7 +22114,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21935 "configure"
++#line 22117 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21951,16 +22133,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21954: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22136: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21957: \$? = $ac_status" >&5
++  echo "$as_me:22139: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21960: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22142: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21963: \$? = $ac_status" >&5
++  echo "$as_me:22145: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -21971,7 +22153,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:21974: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:22156: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -21990,13 +22172,13 @@
+     # on Irix 5.2, according to T.E. Dickey.
+     # The functions gethostbyname, getservbyname, and inet_addr are
+     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+-    echo "$as_me:21993: checking for gethostbyname" >&5
++    echo "$as_me:22175: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21999 "configure"
++#line 22181 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22027,16 +22209,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22030: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22212: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22033: \$? = $ac_status" >&5
++  echo "$as_me:22215: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22036: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22218: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22039: \$? = $ac_status" >&5
++  echo "$as_me:22221: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gethostbyname=yes
+ else
+@@ -22046,11 +22228,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22049: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:22231: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+-      echo "$as_me:22053: checking for gethostbyname in -lnsl" >&5
++      echo "$as_me:22235: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22058,7 +22240,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22061 "configure"
++#line 22243 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22077,16 +22259,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22080: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22262: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22083: \$? = $ac_status" >&5
++  echo "$as_me:22265: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22086: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22268: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22089: \$? = $ac_status" >&5
++  echo "$as_me:22271: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -22097,14 +22279,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22100: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:22282: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test "$ac_cv_lib_nsl_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+-        echo "$as_me:22107: checking for gethostbyname in -lbsd" >&5
++        echo "$as_me:22289: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22112,7 +22294,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22115 "configure"
++#line 22297 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22131,16 +22313,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22134: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22316: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22137: \$? = $ac_status" >&5
++  echo "$as_me:22319: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22140: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22322: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22143: \$? = $ac_status" >&5
++  echo "$as_me:22325: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -22151,7 +22333,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22154: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:22336: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test "$ac_cv_lib_bsd_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -22167,13 +22349,13 @@
+     # variants that don't use the nameserver (or something).  -lsocket
+     # must be given before -lnsl if both are needed.  We assume that
+     # if connect needs -lnsl, so does gethostbyname.
+-    echo "$as_me:22170: checking for connect" >&5
++    echo "$as_me:22352: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22176 "configure"
++#line 22358 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22204,16 +22386,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22207: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22389: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22210: \$? = $ac_status" >&5
++  echo "$as_me:22392: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22213: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22395: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22216: \$? = $ac_status" >&5
++  echo "$as_me:22398: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_connect=yes
+ else
+@@ -22223,11 +22405,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22226: result: $ac_cv_func_connect" >&5
++echo "$as_me:22408: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+ 
+     if test $ac_cv_func_connect = no; then
+-      echo "$as_me:22230: checking for connect in -lsocket" >&5
++      echo "$as_me:22412: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22235,7 +22417,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22238 "configure"
++#line 22420 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22254,16 +22436,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22257: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22439: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22260: \$? = $ac_status" >&5
++  echo "$as_me:22442: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22263: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22445: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22266: \$? = $ac_status" >&5
++  echo "$as_me:22448: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_socket_connect=yes
+ else
+@@ -22274,7 +22456,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22277: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:22459: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test "$ac_cv_lib_socket_connect" = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -22283,13 +22465,13 @@
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    echo "$as_me:22286: checking for remove" >&5
++    echo "$as_me:22468: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22292 "configure"
++#line 22474 "configure"
+ #include "confdefs.h"
+ #define remove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22320,16 +22502,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22323: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22505: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22326: \$? = $ac_status" >&5
++  echo "$as_me:22508: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22329: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22511: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22332: \$? = $ac_status" >&5
++  echo "$as_me:22514: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_remove=yes
+ else
+@@ -22339,11 +22521,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22342: result: $ac_cv_func_remove" >&5
++echo "$as_me:22524: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+ 
+     if test $ac_cv_func_remove = no; then
+-      echo "$as_me:22346: checking for remove in -lposix" >&5
++      echo "$as_me:22528: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22351,7 +22533,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22354 "configure"
++#line 22536 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22370,16 +22552,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22373: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22555: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22376: \$? = $ac_status" >&5
++  echo "$as_me:22558: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22379: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22561: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22382: \$? = $ac_status" >&5
++  echo "$as_me:22564: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_posix_remove=yes
+ else
+@@ -22390,7 +22572,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22393: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:22575: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test "$ac_cv_lib_posix_remove" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -22399,13 +22581,13 @@
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    echo "$as_me:22402: checking for shmat" >&5
++    echo "$as_me:22584: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22408 "configure"
++#line 22590 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22436,16 +22618,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22439: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22621: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22442: \$? = $ac_status" >&5
++  echo "$as_me:22624: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22445: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22627: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22448: \$? = $ac_status" >&5
++  echo "$as_me:22630: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_shmat=yes
+ else
+@@ -22455,11 +22637,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22458: result: $ac_cv_func_shmat" >&5
++echo "$as_me:22640: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+ 
+     if test $ac_cv_func_shmat = no; then
+-      echo "$as_me:22462: checking for shmat in -lipc" >&5
++      echo "$as_me:22644: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22467,7 +22649,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22470 "configure"
++#line 22652 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22486,16 +22668,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22489: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22671: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22492: \$? = $ac_status" >&5
++  echo "$as_me:22674: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22495: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22677: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22498: \$? = $ac_status" >&5
++  echo "$as_me:22680: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+@@ -22506,7 +22688,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22509: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:22691: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test "$ac_cv_lib_ipc_shmat" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -22524,7 +22706,7 @@
+   # These have to be linked with before -lX11, unlike the other
+   # libraries we check for below, so use a different variable.
+   # John Interrante, Karl Berry
+-  echo "$as_me:22527: checking for IceConnectionNumber in -lICE" >&5
++  echo "$as_me:22709: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22532,7 +22714,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22535 "configure"
++#line 22717 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22551,16 +22733,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22554: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22736: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22557: \$? = $ac_status" >&5
++  echo "$as_me:22739: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22560: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22742: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22563: \$? = $ac_status" >&5
++  echo "$as_me:22745: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -22571,7 +22753,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22574: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:22756: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -22618,16 +22800,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22621: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22803: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22626: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22808: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22630: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22812: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -22666,16 +22848,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22669: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:22851: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22674: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:22856: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22678: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22860: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -22714,23 +22896,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22717: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:22899: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22722: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:22904: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22726: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22908: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:22733: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:22915: 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.
+@@ -22747,7 +22929,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:22750: result: $enable_warnings" >&5
++echo "$as_me:22932: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -22770,10 +22952,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:22773: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:22955: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -22823,12 +23005,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:22826: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:23008: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22829: \$? = $ac_status" >&5
++  echo "$as_me:23011: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:22831: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:23013: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -22906,7 +23088,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22909 "configure"
++#line 23091 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22921,26 +23103,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22924: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23106: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22927: \$? = $ac_status" >&5
++  echo "$as_me:23109: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22930: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23112: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22933: \$? = $ac_status" >&5
++  echo "$as_me:23115: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:22936: checking for X11/Xt const-feature" >&5
++echo "$as_me:23118: 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 22943 "configure"
++#line 23125 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -22958,16 +23140,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22961: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23143: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22964: \$? = $ac_status" >&5
++  echo "$as_me:23146: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22967: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23149: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22970: \$? = $ac_status" >&5
++  echo "$as_me:23152: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -22982,7 +23164,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22985: result: $cf_cv_const_x_string" >&5
++echo "$as_me:23167: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -23011,7 +23193,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:23212: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -23043,12 +23225,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:23046: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:23228: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23049: \$? = $ac_status" >&5
++  echo "$as_me:23231: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:23051: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:23233: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -23056,7 +23238,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:23059: checking for $CC warning options..." >&5
++	{ echo "$as_me:23241: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -23079,12 +23261,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:23082: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:23264: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23085: \$? = $ac_status" >&5
++  echo "$as_me:23267: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:23087: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:23269: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -23092,7 +23274,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:23095: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:23277: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -23102,7 +23284,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:23105: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:23287: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -23119,7 +23301,7 @@
+ 
+ fi
+ 
+-echo "$as_me:23122: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:23304: 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.
+@@ -23141,7 +23323,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:23144: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:23326: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -23255,23 +23437,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:23258: checking for dmalloc.h" >&5
++	echo "$as_me:23440: 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 23264 "configure"
++#line 23446 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:23268: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23450: \"$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:23274: \$? = $ac_status" >&5
++  echo "$as_me:23456: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23290,11 +23472,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23293: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:23475: 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:23297: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:23479: 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
+@@ -23302,7 +23484,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23305 "configure"
++#line 23487 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -23321,16 +23503,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23324: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23506: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23327: \$? = $ac_status" >&5
++  echo "$as_me:23509: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23330: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23512: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23333: \$? = $ac_status" >&5
++  echo "$as_me:23515: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -23341,7 +23523,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23344: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:23526: 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:23541: 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.
+@@ -23378,7 +23560,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:23381: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:23563: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -23492,23 +23674,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:23495: checking for dbmalloc.h" >&5
++	echo "$as_me:23677: 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 23501 "configure"
++#line 23683 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:23505: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23687: \"$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:23511: \$? = $ac_status" >&5
++  echo "$as_me:23693: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23527,11 +23709,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23530: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:23712: 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:23534: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:23716: 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
+@@ -23539,7 +23721,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23542 "configure"
++#line 23724 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -23558,16 +23740,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23561: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23743: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23564: \$? = $ac_status" >&5
++  echo "$as_me:23746: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23567: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23749: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23570: \$? = $ac_status" >&5
++  echo "$as_me:23752: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -23578,7 +23760,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23581: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:23763: 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:23778: 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.
+@@ -23615,7 +23797,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:23618: result: ${with_valgrind:-no}" >&5
++echo "$as_me:23800: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -23728,7 +23910,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:23731: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:23913: 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.
+@@ -23739,7 +23921,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:23742: result: $with_no_leaks" >&5
++echo "$as_me:23924: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -23757,7 +23939,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:23760: checking for an rpath option" >&5
++	echo "$as_me:23942: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -23788,12 +23970,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:23791: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:23973: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:23796: checking if we need a space after rpath option" >&5
++		echo "$as_me:23978: 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"
+ 
+@@ -23814,7 +23996,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23817 "configure"
++#line 23999 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -23826,16 +24008,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23829: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24011: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23832: \$? = $ac_status" >&5
++  echo "$as_me:24014: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23835: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24017: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23838: \$? = $ac_status" >&5
++  echo "$as_me:24020: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -23845,14 +24027,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:23848: result: $cf_rpath_space" >&5
++		echo "$as_me:24030: 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:23855: checking if rpath-hack should be disabled" >&5
++echo "$as_me:24037: 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.
+@@ -23870,22 +24052,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:23873: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:24055: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:23878: checking for updated LDFLAGS" >&5
++echo "$as_me:24060: 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:23881: result: maybe" >&5
++	echo "$as_me:24063: 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:23888: checking for $ac_word" >&5
++echo "$as_me:24070: 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
+@@ -23900,7 +24082,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:23903: found $ac_dir/$ac_word" >&5
++echo "$as_me:24085: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -23908,10 +24090,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:23911: result: $cf_ldd_prog" >&5
++  echo "$as_me:24093: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:23914: result: no" >&5
++  echo "$as_me:24096: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -23925,7 +24107,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23928 "configure"
++#line 24110 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -23937,16 +24119,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23940: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24122: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23943: \$? = $ac_status" >&5
++  echo "$as_me:24125: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23946: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24128: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23949: \$? = $ac_status" >&5
++  echo "$as_me:24131: \$? = $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`
+@@ -23974,7 +24156,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:23977: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:24159: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -23986,11 +24168,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23989: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:24171: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23993: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:24175: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -24027,7 +24209,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:24030: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:24212: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -24040,11 +24222,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:24043: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:24225: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:24047: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:24229: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -24081,7 +24263,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:24084: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:24266: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -24094,14 +24276,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:24097: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:24279: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:24101: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:24283: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:24104: result: no" >&5
++	echo "$as_me:24286: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -24191,7 +24373,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:24194: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:24376: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -24372,7 +24554,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:24375: error: ambiguous option: $1
++    { { echo "$as_me:24557: 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;}
+@@ -24391,7 +24573,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:24394: error: unrecognized option: $1
++  -*) { { echo "$as_me:24576: 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;}
+@@ -24441,7 +24623,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:24444: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:24626: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -24608,6 +24790,7 @@
+ s,@DESTDIR@,$DESTDIR,;t t
+ s,@MERGE_PREFIX@,$MERGE_PREFIX,;t t
+ s,@NCURSES_WRAP_PREFIX@,$NCURSES_WRAP_PREFIX,;t t
++s,@REQUIRE_PKG@,$REQUIRE_PKG,;t t
+ s,@NCURSES_CONFIG@,$NCURSES_CONFIG,;t t
+ s,@ac_ct_NCURSES_CONFIG@,$ac_ct_NCURSES_CONFIG,;t t
+ s,@X_CFLAGS@,$X_CFLAGS,;t t
+@@ -24757,7 +24940,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:24760: creating $ac_file" >&5
++    { echo "$as_me:24943: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -24775,7 +24958,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:24778: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:24961: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -24788,7 +24971,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:24791: error: cannot find input file: $f" >&5
++           { { echo "$as_me:24974: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -24804,7 +24987,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:24807: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:24990: 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;}
+@@ -24813,7 +24996,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:24816: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:24999: 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;}
+@@ -24858,7 +25041,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:24861: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:25044: 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;}
+@@ -24869,7 +25052,7 @@
+     $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:24872: WARNING: Some variables may not be substituted:
++      { echo "$as_me:25055: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -24918,7 +25101,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:24921: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:25104: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -24929,7 +25112,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:24932: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:25115: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -24942,7 +25125,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:24945: error: cannot find input file: $f" >&5
++           { { echo "$as_me:25128: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -25000,7 +25183,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:25003: $ac_file is unchanged" >&5
++      { echo "$as_me:25186: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+Index: test/parse_rgb.h
+Prereq:  1.6 
+--- ncurses-6.5-20250111+/test/parse_rgb.h	2024-10-05 19:26:24.000000000 +0000
++++ ncurses-6.5-20250118/test/parse_rgb.h	2025-01-18 15:03:33.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: parse_rgb.h,v 1.6 2024/10/05 19:26:24 tom Exp $
++ * $Id: parse_rgb.h,v 1.7 2025/01/18 15:03:33 tom Exp $
+  *
+  * Sample implementation of ncurses RGB extension from user_caps(5).
+  */
+@@ -58,13 +58,13 @@
+ 	    ;
+ 	}
+ 
+-	if (tigetflag("RGB") > 0) {
++	if (tigetflag(UserCap(RGB)) > 0) {
+ 	    result = OK;
+ 	    r = g = b = (max_bits + 2) / 3;
+-	} else if ((bits = tigetnum("RGB")) > 0) {
++	} else if ((bits = tigetnum(UserCap(RGB))) > 0) {
+ 	    result = OK;
+ 	    r = g = b = bits;
+-	} else if ((data = tigetstr("RGB")) != ABSENT_STRING
++	} else if ((data = tigetstr(UserCap(RGB))) != ABSENT_STRING
+ 		   && data != CANCELLED_STRING
+ 		   && sscanf(data, "%d/%d/%d%c", &r, &g, &b, &ch) == 3) {
+ 	    result = OK;
+Index: test/test.priv.h
+Prereq:  1.220 
+--- ncurses-6.5-20250111+/test/test.priv.h	2024-10-05 19:01:00.000000000 +0000
++++ ncurses-6.5-20250118/test/test.priv.h	2025-01-18 15:07:25.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /****************************************************************************
+  *  Author: Thomas E. Dickey                    1996-on                     *
+  ****************************************************************************/
+-/* $Id: test.priv.h,v 1.220 2024/10/05 19:01:00 tom Exp $ */
++/* $Id: test.priv.h,v 1.221 2025/01/18 15:07:25 tom Exp $ */
+ 
+ #ifndef __TEST_PRIV_H
+ #define __TEST_PRIV_H 1
+@@ -853,6 +853,12 @@
+ #endif
+ 
+ /*
++ * To make them easier to find, user-defined capabilities used within ncurses
++ * should be tagged with this macro:
++ */
++#define UserCap(name) #name
++
++/*
+  * X/Open Curses does not define the arrays of terminfo/termcap names as SVr4
+  * curses did, and some implementations provide them anyway, but undeclared.
+  */
+Index: test/test_mouse.c
+Prereq:  1.35 
+--- ncurses-6.5-20250111+/test/test_mouse.c	2024-11-30 18:46:48.000000000 +0000
++++ ncurses-6.5-20250118/test/test_mouse.c	2025-01-18 15:03:25.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2022-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2022-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2022 Leonid S. Usov                *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -22,7 +22,7 @@
+  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+  ****************************************************************************/
+ /*
+- * $Id: test_mouse.c,v 1.35 2024/11/30 18:46:48 tom Exp $
++ * $Id: test_mouse.c,v 1.36 2025/01/18 15:03:25 tom Exp $
+  *
+  * Author: Leonid S Usov
+  *
+@@ -44,7 +44,7 @@
+ 
+     newterm(NULL, stdout, stdin);
+     raw();
+-    xtermcap = tigetstr("XM");
++    xtermcap = tigetstr(UserCap(XM));
+     if (!VALID_STRING(xtermcap)) {
+ 	fprintf(stderr, "couldn't get XM terminfo");
+ 	return;
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250125.patch b/packages/ncurses/6.5/ncurses-6.5-20250125.patch
new file mode 100644
index 0000000000..cb142b9621
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250125.patch
@@ -0,0 +1,1785 @@
+# ncurses 6.5 - patch 20250125 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250125.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Jan 26 00:34:44 UTC 2025
+# ------------------------------------------------------------------------------
+# Ada95/gen/gen.c                                          |    6 
+# Ada95/samples/sample-explanation.adb_p                   |    8 
+# Ada95/src/terminal_interface-curses-forms.adb            |    8 
+# Ada95/src/terminal_interface-curses-menus.adb            |    8 
+# Ada95/src/terminal_interface-curses-panels-user_data.adb |    4 
+# NEWS                                                     |    6 
+# VERSION                                                  |    2 
+# c++/cursesapp.cc                                         |   22 +-
+# c++/cursesf.cc                                           |  129 +++++++------
+# c++/cursesf.h                                            |   42 ++--
+# c++/cursesm.cc                                           |  112 ++++++-----
+# c++/cursesm.h                                            |   42 ++--
+# c++/cursesp.cc                                           |    8 
+# c++/cursesp.h                                            |   16 -
+# c++/cursespad.cc                                         |   22 +-
+# c++/cursesw.cc                                           |   42 ++--
+# c++/cursesw.h                                            |    6 
+# c++/demo.cc                                              |   20 +-
+# c++/etip.h.in                                            |   20 +-
+# dist.mk                                                  |    4 
+# ncurses/base/lib_mouse.c                                 |   24 +-
+# ncurses/base/lib_set_term.c                              |    6 
+# ncurses/tty/lib_twait.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 
+# 30 files changed, 307 insertions(+), 278 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/gen/gen.c
+Prereq:  1.79 
+--- ncurses-6.5-20250118+/Ada95/gen/gen.c	2024-01-19 13:41:45.000000000 +0000
++++ ncurses-6.5-20250125/Ada95/gen/gen.c	2025-01-24 20:39:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2021,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 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.79 2024/01/19 13:41:45 tom Exp $
++    $Id: gen.c,v 1.80 2025/01/24 20:39:23 tom Exp $
+   --------------------------------------------------------------------------*/
+ /*
+   This program prints on its standard output the source for the
+@@ -189,7 +189,7 @@
+ int
+ main(int argc, const char *argv[])
+ {
+-  FILE *fp = 0;
++  FILE *fp = NULL;
+   const int x = 0x12345678;
+ 
+   little_endian = (*((const char *)&x) == 0x78);
+Index: Ada95/samples/sample-explanation.adb_p
+--- ncurses-6.5-20250118+/Ada95/samples/sample-explanation.adb_p	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20250125/Ada95/samples/sample-explanation.adb_p	2025-01-24 20:39:23.000000000 +0000
+@@ -7,7 +7,7 @@
+ --                                 B O D Y                                  --
+ --                                                                          --
+ ------------------------------------------------------------------------------
+--- Copyright 2019,2020 Thomas E. Dickey                                     --
++-- Copyright 2019-2020,2025 Thomas E. Dickey                                --
+ --                                                                          --
+ -- Permission is hereby granted, free of charge, to any person obtaining a  --
+ -- copy of this software and associated documentation files (the            --
+@@ -35,8 +35,8 @@
+ ------------------------------------------------------------------------------
+ --  Author:  Juergen Pfeifer, 1996
+ --  Version Control
+---  $Revision: 1.5 $
+---  $Date: 2020/02/02 23:34:34 $
++--  $Revision: 1.6 $
++--  $Date: 2025/01/24 20:39:23 $
+ --  Binding Version 01.00
+ ------------------------------------------------------------------------------
+ --  Poor mans help system. This scans a sequential file for key lines and
+@@ -136,7 +136,7 @@
+          H : Help_Line_Access := Top_Line;
+       begin
+          if Top_Line /= null then
+-            for L in 0 .. (Height - 1) loop
++            for L in 0 .. Height - 1 loop
+                Add (W, L, 0, H.all.Line.all);
+                exit when H.all.Next = null;
+                H := H.all.Next;
+Index: Ada95/src/terminal_interface-curses-forms.adb
+--- ncurses-6.5-20250118+/Ada95/src/terminal_interface-curses-forms.adb	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20250125/Ada95/src/terminal_interface-curses-forms.adb	2025-01-24 20:39:23.000000000 +0000
+@@ -7,7 +7,7 @@
+ --                                 B O D Y                                  --
+ --                                                                          --
+ ------------------------------------------------------------------------------
+--- Copyright 2020 Thomas E. Dickey                                          --
++-- Copyright 2020,2025 Thomas E. Dickey                                     --
+ -- Copyright 1999-2011,2014 Free Software Foundation, Inc.                  --
+ --                                                                          --
+ -- Permission is hereby granted, free of charge, to any person obtaining a  --
+@@ -36,8 +36,8 @@
+ ------------------------------------------------------------------------------
+ --  Author:  Juergen Pfeifer, 1996
+ --  Version Control:
+---  $Revision: 1.33 $
+---  $Date: 2020/02/02 23:34:34 $
++--  $Revision: 1.34 $
++--  $Date: 2025/01/24 20:39:23 $
+ --  Binding Version 01.00
+ ------------------------------------------------------------------------------
+ with Ada.Unchecked_Deallocation;
+@@ -1006,7 +1006,7 @@
+         (Field_Array, Field_Array_Access);
+    begin
+       if FA /= null and then Free_Fields then
+-         for I in FA'First .. (FA'Last - 1) loop
++         for I in FA'First .. FA'Last - 1 loop
+             if FA.all (I) /= Null_Field then
+                Delete (FA.all (I));
+             end if;
+Index: Ada95/src/terminal_interface-curses-menus.adb
+--- ncurses-6.5-20250118+/Ada95/src/terminal_interface-curses-menus.adb	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20250125/Ada95/src/terminal_interface-curses-menus.adb	2025-01-24 20:39:23.000000000 +0000
+@@ -7,7 +7,7 @@
+ --                                 B O D Y                                  --
+ --                                                                          --
+ ------------------------------------------------------------------------------
+--- Copyright 2018,2020 Thomas E. Dickey                                     --
++-- Copyright 2018-2020,2025 Thomas E. Dickey                                --
+ -- Copyright 1999-2011,2014 Free Software Foundation, Inc.                  --
+ --                                                                          --
+ -- Permission is hereby granted, free of charge, to any person obtaining a  --
+@@ -36,8 +36,8 @@
+ ------------------------------------------------------------------------------
+ --  Author:  Juergen Pfeifer, 1996
+ --  Version Control:
+---  $Revision: 1.34 $
+---  $Date: 2020/02/02 23:34:34 $
++--  $Revision: 1.35 $
++--  $Date: 2025/01/24 20:39:23 $
+ --  Binding Version 01.00
+ ------------------------------------------------------------------------------
+ with Ada.Unchecked_Deallocation;
+@@ -878,7 +878,7 @@
+         (Item_Array, Item_Array_Access);
+    begin
+       if IA /= null and then Free_Items then
+-         for I in IA'First .. (IA'Last - 1) loop
++         for I in IA'First .. IA'Last - 1 loop
+             if IA.all (I) /= Null_Item then
+                Delete (IA.all (I));
+             end if;
+Index: Ada95/src/terminal_interface-curses-panels-user_data.adb
+--- ncurses-6.5-20250118+/Ada95/src/terminal_interface-curses-panels-user_data.adb	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20250125/Ada95/src/terminal_interface-curses-panels-user_data.adb	2025-01-24 20:39:23.000000000 +0000
+@@ -7,7 +7,7 @@
+ --                                 B O D Y                                  --
+ --                                                                          --
+ ------------------------------------------------------------------------------
+--- Copyright 2020 Thomas E. Dickey                                          --
++-- Copyright 2020,2025 Thomas E. Dickey                                     --
+ -- Copyright 1999-2003,2009 Free Software Foundation, Inc.                  --
+ --                                                                          --
+ -- Permission is hereby granted, free of charge, to any person obtaining a  --
+@@ -36,7 +36,7 @@
+ ------------------------------------------------------------------------------
+ --  Author:  Juergen Pfeifer, 1996
+ --  Version Control:
+---  $Revision: 1.13 $
++--  $Revision: 1.14 $
+ --  Binding Version 01.00
+ ------------------------------------------------------------------------------
+ with Interfaces.C;
+Index: NEWS
+Prereq:  1.4233 
+--- ncurses-6.5-20250118+/NEWS	2025-01-19 01:24:13.000000000 +0000
++++ ncurses-6.5-20250125/NEWS	2025-01-25 21:30:09.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4233 2025/01/19 01:24:13 tom Exp $
++-- $Id: NEWS,v 1.4236 2025/01/25 21:30:09 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.
+ 
++20250125
++	+ improve error-handling in c++ binding (report by Mingjie Shen).
++	+ strict compiler-warning fixes for upcoming gcc15
++
+ 20250118
+ 	+ improve pattern used for configure --with-xterm-kbs option (report by
+ 	  Mingyu Wang)
+Index: VERSION
+--- ncurses-6.5-20250118+/VERSION	2025-01-18 11:23:10.000000000 +0000
++++ ncurses-6.5-20250125/VERSION	2025-01-25 10:34:16.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250118
++5:0:10	6.5	20250125
+Index: c++/cursesapp.cc
+Prereq:  1.18 
+--- ncurses-6.5-20250118+/c++/cursesapp.cc	2020-07-18 19:57:11.000000000 +0000
++++ ncurses-6.5-20250125/c++/cursesapp.cc	2025-01-25 21:20:17.000000000 +0000
+@@ -1,6 +1,6 @@
+ // * this is for making emacs happy: -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright 2019,2020 Thomas E. Dickey                                     *
++ * Copyright 2019-2020,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2007,2008 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -36,7 +36,7 @@
+ #include "internal.h"
+ #include "cursesapp.h"
+ 
+-MODULE_ID("$Id: cursesapp.cc,v 1.18 2020/07/18 19:57:11 anonymous.maarten Exp $")
++MODULE_ID("$Id: cursesapp.cc,v 1.19 2025/01/25 21:20:17 tom Exp $")
+ 
+ void
+ NCursesApplication::init(bool bColors)
+@@ -65,9 +65,9 @@
+   Root_Window->bkgd(' '|window_backgrounds());
+ }
+ 
+-NCursesApplication* NCursesApplication::theApp = 0;
+-NCursesWindow* NCursesApplication::titleWindow = 0;
+-NCursesApplication::SLK_Link* NCursesApplication::slk_stack = 0;
++NCursesApplication* NCursesApplication::theApp = NULL;
++NCursesWindow* NCursesApplication::titleWindow = NULL;
++NCursesApplication::SLK_Link* NCursesApplication::slk_stack = NULL;
+ 
+ 
+ NCursesWindow *&NCursesApplication::getTitleWindow() {
+@@ -79,7 +79,7 @@
+   Soft_Label_Key_Set* S;
+ 
+   delete titleWindow;
+-  titleWindow = 0;
++  titleWindow = NULL;
+ 
+   while( (S=top()) ) {
+     pop();
+@@ -87,7 +87,7 @@
+   }
+ 
+   delete Root_Window;
+-  Root_Window = 0;
++  Root_Window = NULL;
+ 
+   ::endwin();
+ }
+@@ -105,7 +105,7 @@
+ void NCursesApplication::push(Soft_Label_Key_Set& S)
+ {
+   SLK_Link* L = new SLK_Link;
+-  assert(L != 0);
++  assert(L != NULL);
+   L->prev = slk_stack;
+   L->SLKs = &S;
+   slk_stack = L;
+@@ -121,7 +121,7 @@
+     delete L;
+     if (Root_Window) {
+       Soft_Label_Key_Set* xx = top();
+-      if (xx != 0)
++      if (xx != NULL)
+         xx->show();
+     }
+   }
+@@ -139,7 +139,7 @@
+ int NCursesApplication::operator()(void)
+ {
+   bool bColors = b_Colors;
+-  Soft_Label_Key_Set* S = 0;
++  Soft_Label_Key_Set* S = NULL;
+ 
+   int ts = titlesize();
+   if (ts>0)
+@@ -147,7 +147,7 @@
+   Soft_Label_Key_Set::Label_Layout fmt = useSLKs();
+   if (fmt!=Soft_Label_Key_Set::None) {
+     S = new Soft_Label_Key_Set(fmt);
+-    assert(S != 0);
++    assert(S != NULL);
+     init_labels(*S);
+   }
+ 
+Index: c++/cursesf.cc
+Prereq:  1.27 
+--- ncurses-6.5-20250118+/c++/cursesf.cc	2024-10-05 22:47:12.000000000 +0000
++++ ncurses-6.5-20250125/c++/cursesf.cc	2025-01-25 21:20:17.000000000 +0000
+@@ -1,6 +1,6 @@
+ // * this is for making emacs happy: -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright 2019-2021,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2005,2011 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -36,7 +36,7 @@
+ #include "cursesf.h"
+ #include "cursesapp.h"
+ 
+-MODULE_ID("$Id: cursesf.cc,v 1.27 2024/10/05 22:47:12 tom Exp $")
++MODULE_ID("$Id: cursesf.cc,v 1.28 2025/01/25 21:20:17 tom Exp $")
+ 
+ NCursesFormField::~NCursesFormField () THROWS(NCursesException)
+ {
+@@ -50,28 +50,34 @@
+ FIELD**
+ NCursesForm::mapFields(NCursesFormField* nfields[])
+ {
+-  int fieldCount = 0,lcv;
++  int fieldCount = 0, lcv;
+   FIELD** old_fields;
+ 
+-  assert(nfields != 0);
++  assert(nfields != NULL);
+ 
+   for (lcv=0; nfields[lcv]->field; ++lcv)
+     ++fieldCount;
+ 
+-  FIELD** fields = new FIELD*[fieldCount + 1];
++  try {
++    FIELD** fields = new FIELD*[fieldCount + 1];
+ 
+-  for (lcv=0;nfields[lcv]->field;++lcv) {
+-    fields[lcv] = nfields[lcv]->field;
+-  }
+-  fields[lcv] = NULL;
++    for (lcv=0;nfields[lcv]->field;++lcv) {
++      fields[lcv] = nfields[lcv]->field;
++    }
++    fields[lcv] = NULL;
+ 
+-  my_fields = nfields;
++    my_fields = nfields;
+ 
+-  if (form && (old_fields = ::form_fields(form))) {
+-    ::set_form_fields(form, static_cast(0));
+-    delete[] old_fields;
++    if (form && (old_fields = ::form_fields(form))) {
++      ::set_form_fields(form, static_cast(0));
++      delete[] old_fields;
++    }
++    return fields;
+   }
+-  return fields;
++  catch (std::bad_alloc const&) {
++    OnError (E_SYSTEM_ERROR);
++  }
++  return NULL;
+ }
+ 
+ void NCursesForm::setDefaultAttributes()
+@@ -108,46 +114,51 @@
+ 		      bool with_frame,
+ 		      bool autoDelete_Fields)
+ {
+-  int mrows, mcols;
++  try {
++    int mrows, mcols;
+ 
+-  keypad(TRUE);
+-  meta(TRUE);
++    keypad(TRUE);
++    meta(TRUE);
+ 
+-  b_framed = with_frame;
+-  b_autoDelete = autoDelete_Fields;
++    b_framed = with_frame;
++    b_autoDelete = autoDelete_Fields;
+ 
+-  form = static_cast(0);
+-  form = ::new_form(mapFields(nfields));
+-  if (!form)
+-    OnError (E_SYSTEM_ERROR);
+-
+-  UserHook* hook = new UserHook;
+-  hook->m_user   = NULL;
+-  hook->m_back   = this;
+-  hook->m_owner  = form;
+-  ::set_form_userptr(form, reinterpret_cast(hook));
+-
+-  ::set_form_init  (form, _nc_xx_frm_init);
+-  ::set_form_term  (form, _nc_xx_frm_term);
+-  ::set_field_init (form, _nc_xx_fld_init);
+-  ::set_field_term (form, _nc_xx_fld_term);
+-
+-  scale(mrows, mcols);
+-  ::set_form_win(form, w);
+-
+-  if (with_frame) {
+-    if ((mrows > height()-2) || (mcols > width()-2))
+-      OnError(E_NO_ROOM);
+-    sub = new NCursesWindow(*this,mrows,mcols,1,1,'r');
+-    ::set_form_sub(form, sub->w);
+-    b_sub_owner = TRUE;
++    form = static_cast(0);
++    form = ::new_form(mapFields(nfields));
++    if (!form)
++      OnError (E_SYSTEM_ERROR);
++
++    UserHook* hook = new UserHook;
++    hook->m_user   = NULL;
++    hook->m_back   = this;
++    hook->m_owner  = form;
++    ::set_form_userptr(form, reinterpret_cast(hook));
++
++    ::set_form_init  (form, _nc_xx_frm_init);
++    ::set_form_term  (form, _nc_xx_frm_term);
++    ::set_field_init (form, _nc_xx_fld_init);
++    ::set_field_term (form, _nc_xx_fld_term);
++
++    scale(mrows, mcols);
++    ::set_form_win(form, w);
++
++    if (with_frame) {
++      if ((mrows > height()-2) || (mcols > width()-2))
++        OnError(E_NO_ROOM);
++      sub = new NCursesWindow(*this,mrows,mcols,1,1,'r');
++      ::set_form_sub(form, sub->w);
++      b_sub_owner = TRUE;
++    }
++    else {
++      sub = static_cast(NULL);
++      b_sub_owner = FALSE;
++    }
++    options_on(O_NL_OVERLOAD);
++    setDefaultAttributes();
+   }
+-  else {
+-    sub = static_cast(0);
+-    b_sub_owner = FALSE;
++  catch (std::bad_alloc const&) {
++    OnError (E_SYSTEM_ERROR);
+   }
+-  options_on(O_NL_OVERLOAD);
+-  setDefaultAttributes();
+ }
+ 
+ NCursesForm::~NCursesForm() THROWS(NCursesException)
+@@ -156,13 +167,13 @@
+   delete hook;
+   if (b_sub_owner) {
+     delete sub;
+-    ::set_form_sub(form, static_cast(0));
++    ::set_form_sub(form, static_cast(NULL));
+   }
+   if (form) {
+     FIELD** fields = ::form_fields(form);
+     int cnt = count();
+ 
+-    OnError(::set_form_fields(form, static_cast(0)));
++    OnError(::set_form_fields(form, static_cast(NULL)));
+ 
+     if (b_autoDelete) {
+       if (cnt>0) {
+@@ -381,19 +392,19 @@
+ {
+   (void) f;
+   NCursesFormField* F = reinterpret_cast(const_cast(u));
+-  assert(F != 0);
++  assert(F != NULL);
+   UserDefinedFieldType* udf = reinterpret_cast(F->fieldtype());
+-  assert(udf != 0);
++  assert(udf != NULL);
+   return udf->field_check(*F);
+ }
+ 
+ bool _nc_xx_fld_ccheck(int c, const void *u)
+ {
+   NCursesFormField* F = reinterpret_cast(const_cast(u));
+-  assert(F != 0);
++  assert(F != NULL);
+   UserDefinedFieldType* udf =
+     reinterpret_cast(F->fieldtype());
+-  assert(udf != 0);
++  assert(udf != NULL);
+   return udf->char_check(c);
+ }
+ 
+@@ -423,10 +434,10 @@
+ {
+   (void) f;
+   NCursesFormField* F = reinterpret_cast(const_cast(u));
+-  assert(F != 0);
++  assert(F != NULL);
+   UserDefinedFieldType_With_Choice* udf =
+     reinterpret_cast(F->fieldtype());
+-  assert(udf != 0);
++  assert(udf != NULL);
+   return udf->next(*F);
+ }
+ 
+@@ -434,10 +445,10 @@
+ {
+   (void) f;
+   NCursesFormField* F = reinterpret_cast(const_cast(u));
+-  assert(F != 0);
++  assert(F != NULL);
+   UserDefinedFieldType_With_Choice* udf =
+     reinterpret_cast(F->fieldtype());
+-  assert(udf != 0);
++  assert(udf != NULL);
+   return udf->previous(*F);
+ }
+ 
+Index: c++/cursesf.h
+Prereq:  1.40 
+--- ncurses-6.5-20250118+/c++/cursesf.h	2024-10-05 22:47:12.000000000 +0000
++++ ncurses-6.5-20250125/c++/cursesf.h	2025-01-25 21:20:17.000000000 +0000
+@@ -1,7 +1,7 @@
+ // * This makes emacs happy -*-Mode: C++;-*-
+ // vile:cppmode
+ /****************************************************************************
+- * Copyright 2019-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2014 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -33,7 +33,7 @@
+  *   Author: Juergen Pfeifer, 1997                                          *
+  ****************************************************************************/
+ 
+-// $Id: cursesf.h,v 1.40 2024/10/05 22:47:12 tom Exp $
++// $Id: cursesf.h,v 1.41 2025/01/25 21:20:17 tom Exp $
+ 
+ #ifndef NCURSES_CURSESF_H_incl
+ #define NCURSES_CURSESF_H_incl 1
+@@ -78,7 +78,7 @@
+ 
+ public:
+   NCursesFieldType()
+-    : fieldtype(STATIC_CAST(FIELDTYPE*)(0))
++    : fieldtype(STATIC_CAST(FIELDTYPE*)(NULL))
+   {
+   }
+ 
+@@ -119,8 +119,8 @@
+ public:
+   // Create a 'Null' field. Can be used to delimit a field list
+   NCursesFormField()
+-    : field(STATIC_CAST(FIELD*)(0)),
+-      ftype(STATIC_CAST(NCursesFieldType*)(0))
++    : field(STATIC_CAST(FIELD*)(NULL)),
++      ftype(STATIC_CAST(NCursesFieldType*)(NULL))
+   {
+   }
+ 
+@@ -131,8 +131,8 @@
+ 		    int first_col = 0,
+ 		    int offscreen_rows = 0,
+ 		    int additional_buffers = 0)
+-    : field(0),
+-      ftype(STATIC_CAST(NCursesFieldType*)(0))
++    : field(NULL),
++      ftype(STATIC_CAST(NCursesFieldType*)(NULL))
+   {
+       field = ::new_field(rows, ncols, first_row, first_col,
+ 			  offscreen_rows, additional_buffers);
+@@ -363,7 +363,7 @@
+   // Get the backward pointer to the C++ object from a FORM
+   static inline NCursesForm* getHook(const FORM *f) {
+     UserHook* hook = reinterpret_cast(::form_userptr(f));
+-    assert(hook != 0 && hook->m_owner==f);
++    assert(hook != NULL && hook->m_owner==f);
+     return const_cast(hook->m_back);
+   }
+ 
+@@ -379,13 +379,13 @@
+   // internal routines
+   inline void set_user(void *user) {
+     UserHook* uptr = reinterpret_cast(::form_userptr (form));
+-    assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==form);
++    assert (uptr != NULL && uptr->m_back==this && uptr->m_owner==form);
+     uptr->m_user = user;
+   }
+ 
+   inline void *get_user() {
+     const UserHook* uptr = reinterpret_cast(::form_userptr (form));
+-    assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==form);
++    assert (uptr != NULL && uptr->m_back==this && uptr->m_owner==form);
+     return uptr->m_user;
+   }
+ 
+@@ -408,12 +408,12 @@
+ 	       int  begin_y = 0,
+ 	       int  begin_x = 0)
+     : NCursesPanel(nlines, ncols, begin_y, begin_x),
+-      form (STATIC_CAST(FORM*)(0)),
+-      sub(0),
++      form (STATIC_CAST(FORM*)(NULL)),
++      sub(NULL),
+       b_sub_owner(0),
+       b_framed(0),
+       b_autoDelete(0),
+-      my_fields(0)
++      my_fields(NULL)
+   {
+   }
+ 
+@@ -423,12 +423,12 @@
+ 	       bool with_frame=FALSE,	      // reserve space for a frame?
+ 	       bool autoDelete_Fields=FALSE)  // do automatic cleanup?
+     : NCursesPanel(),
+-      form(0),
+-      sub(0),
++      form(NULL),
++      sub(NULL),
+       b_sub_owner(0),
+       b_framed(0),
+       b_autoDelete(0),
+-      my_fields(0)
++      my_fields(NULL)
+   {
+     InitForm(Fields, with_frame, autoDelete_Fields);
+   }
+@@ -442,12 +442,12 @@
+ 	       bool with_frame=FALSE,	     // reserve space for a frame?
+ 	       bool autoDelete_Fields=FALSE) // do automatic cleanup?
+     : NCursesPanel(nlines, ncols, begin_y, begin_x),
+-      form(0),
+-      sub(0),
++      form(NULL),
++      sub(NULL),
+       b_sub_owner(0),
+       b_framed(0),
+       b_autoDelete(0),
+-      my_fields(0)
++      my_fields(NULL)
+   {
+       InitForm(Fields, with_frame, autoDelete_Fields);
+   }
+@@ -681,7 +681,7 @@
+ 
+ public:
+   NCursesUserForm (NCursesFormField* Fields[],
+-		   const T* p_UserData = STATIC_CAST(T*)(0),
++		   const T* p_UserData = STATIC_CAST(T*)(NULL),
+ 		   bool with_frame=FALSE,
+ 		   bool autoDelete_Fields=FALSE)
+     : NCursesForm (Fields, with_frame, autoDelete_Fields) {
+@@ -694,7 +694,7 @@
+ 		   int ncols,
+ 		   int begin_y = 0,
+ 		   int begin_x = 0,
+-		   const T* p_UserData = STATIC_CAST(T*)(0),
++		   const T* p_UserData = STATIC_CAST(T*)(NULL),
+ 		   bool with_frame=FALSE,
+ 		   bool autoDelete_Fields=FALSE)
+     : NCursesForm (Fields, nlines, ncols, begin_y, begin_x,
+Index: c++/cursesm.cc
+Prereq:  1.28 
+--- ncurses-6.5-20250118+/c++/cursesm.cc	2024-10-05 22:47:12.000000000 +0000
++++ ncurses-6.5-20250125/c++/cursesm.cc	2025-01-25 21:20:17.000000000 +0000
+@@ -1,6 +1,6 @@
+ // * this is for making emacs happy: -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright 2019-2021,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2011,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -36,7 +36,7 @@
+ #include "cursesm.h"
+ #include "cursesapp.h"
+ 
+-MODULE_ID("$Id: cursesm.cc,v 1.28 2024/10/05 22:47:12 tom Exp $")
++MODULE_ID("$Id: cursesm.cc,v 1.29 2025/01/25 21:20:17 tom Exp $")
+ 
+ NCursesMenuItem::~NCursesMenuItem() THROWS(NCursesException)
+ {
+@@ -100,23 +100,28 @@
+ ITEM**
+ NCursesMenu::mapItems(NCursesMenuItem* nitems[])
+ {
+-  int itemCount = 0,lcv;
++  try {
++    int itemCount = 0,lcv;
+ 
+-  for (lcv=0; nitems[lcv]->item; ++lcv)
+-    ++itemCount;
++    for (lcv=0; nitems[lcv]->item; ++lcv)
++      ++itemCount;
+ 
+-  ITEM** itemArray = new ITEM*[itemCount + 1];
++    ITEM** itemArray = new ITEM*[itemCount + 1];
+ 
+-  for (lcv=0;nitems[lcv]->item;++lcv) {
+-    itemArray[lcv] = nitems[lcv]->item;
+-  }
+-  itemArray[lcv] = NULL;
++    for (lcv=0;nitems[lcv]->item;++lcv) {
++      itemArray[lcv] = nitems[lcv]->item;
++    }
++    itemArray[lcv] = NULL;
+ 
+-  my_items = nitems;
++    my_items = nitems;
+ 
+-  if (menu)
+-    delete[] ::menu_items(menu);
+-  return itemArray;
++    if (menu)
++      delete[] ::menu_items(menu);
++    return itemArray;
++  }
++  catch (std::bad_alloc const&) {
++  }
++  return NULL;
+ }
+ 
+ void
+@@ -124,45 +129,50 @@
+ 		      bool with_frame,
+ 		      bool autoDelete_Items)
+ {
+-  int mrows, mcols;
+-
+-  keypad(TRUE);
+-  meta(TRUE);
++  try {
++    int mrows, mcols;
+ 
+-  b_framed = with_frame;
+-  b_autoDelete = autoDelete_Items;
++    keypad(TRUE);
++    meta(TRUE);
+ 
+-  menu = static_cast(0);
+-  menu = ::new_menu(mapItems(nitems));
+-  if (!menu)
+-    OnError (E_SYSTEM_ERROR);
++    b_framed = with_frame;
++    b_autoDelete = autoDelete_Items;
+ 
+-  UserHook* hook = new UserHook;
+-  hook->m_user   = NULL;
+-  hook->m_back   = this;
+-  hook->m_owner  = menu;
+-  ::set_menu_userptr(menu, static_cast(hook));
+-
+-  ::set_menu_init (menu, _nc_xx_mnu_init);
+-  ::set_menu_term (menu, _nc_xx_mnu_term);
+-  ::set_item_init (menu, _nc_xx_itm_init);
+-  ::set_item_term (menu, _nc_xx_itm_term);
+-
+-  scale(mrows, mcols);
+-  ::set_menu_win(menu, w);
+-
+-  if (with_frame) {
+-    if ((mrows > height()-2) || (mcols > width()-2))
+-      OnError(E_NO_ROOM);
+-    sub = new NCursesWindow(*this,mrows,mcols,1,1,'r');
+-    ::set_menu_sub(menu, sub->w);
+-    b_sub_owner = TRUE;
++    menu = static_cast(NULL);
++    menu = ::new_menu(mapItems(nitems));
++    if (!menu)
++      OnError (E_SYSTEM_ERROR);
++
++    UserHook* hook = new UserHook;
++    hook->m_user   = NULL;
++    hook->m_back   = this;
++    hook->m_owner  = menu;
++    ::set_menu_userptr(menu, static_cast(hook));
++
++    ::set_menu_init (menu, _nc_xx_mnu_init);
++    ::set_menu_term (menu, _nc_xx_mnu_term);
++    ::set_item_init (menu, _nc_xx_itm_init);
++    ::set_item_term (menu, _nc_xx_itm_term);
++
++    scale(mrows, mcols);
++    ::set_menu_win(menu, w);
++
++    if (with_frame) {
++      if ((mrows > height()-2) || (mcols > width()-2))
++        OnError(E_NO_ROOM);
++      sub = new NCursesWindow(*this,mrows,mcols,1,1,'r');
++      ::set_menu_sub(menu, sub->w);
++      b_sub_owner = TRUE;
++    }
++    else {
++      sub = static_cast(NULL);
++      b_sub_owner = FALSE;
++    }
++    setDefaultAttributes();
+   }
+-  else {
+-    sub = static_cast(0);
+-    b_sub_owner = FALSE;
++  catch (std::bad_alloc const&) {
++    OnError (E_SYSTEM_ERROR);
+   }
+-  setDefaultAttributes();
+ }
+ 
+ void
+@@ -181,14 +191,14 @@
+   UserHook* hook = reinterpret_cast(::menu_userptr(menu));
+   delete hook;
+   if (b_sub_owner) {
+-    ::set_menu_sub(menu, static_cast(0));
++    ::set_menu_sub(menu, static_cast(NULL));
+     delete sub;
+   }
+   if (menu) {
+     ITEM** itms = ::menu_items(menu);
+     int cnt = count();
+ 
+-    OnError(::set_menu_items(menu, static_cast(0)));
++    OnError(::set_menu_items(menu, static_cast(NULL)));
+ 
+     if (b_autoDelete) {
+       if (cnt>0) {
+@@ -322,7 +332,7 @@
+       if (drvCmnd == CMD_ACTION) {
+ 	if (options() & O_ONEVALUE) {
+ 	  NCursesMenuItem* itm = current_item();
+-	  assert(itm != 0);
++	  assert(itm != NULL);
+ 	  if (itm->options() & O_SELECTABLE)
+ 	    {
+ 	      b_action = itm->action();
+Index: c++/cursesm.h
+Prereq:  1.36 
+--- ncurses-6.5-20250118+/c++/cursesm.h	2024-10-05 22:47:12.000000000 +0000
++++ ncurses-6.5-20250125/c++/cursesm.h	2025-01-25 21:20:17.000000000 +0000
+@@ -1,6 +1,6 @@
+ // * This makes emacs happy -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright 2019-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2014 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -32,7 +32,7 @@
+  *   Author: Juergen Pfeifer, 1997                                          *
+  ****************************************************************************/
+ 
+-// $Id: cursesm.h,v 1.36 2024/10/05 22:47:12 tom Exp $
++// $Id: cursesm.h,v 1.37 2025/01/25 21:20:17 tom Exp $
+ 
+ #ifndef NCURSES_CURSESM_H_incl
+ #define NCURSES_CURSESM_H_incl 1
+@@ -62,9 +62,9 @@
+ public:
+   NCursesMenuItem (const char* p_name     = NULL,
+ 		   const char* p_descript = NULL)
+-    : item(0)
++    : item(NULL)
+   {
+-    item = p_name ? ::new_item (p_name, p_descript) : STATIC_CAST(ITEM*)(0);
++    item = p_name ? ::new_item (p_name, p_descript) : STATIC_CAST(ITEM*)(NULL);
+     if (p_name && !item)
+       OnError (E_SYSTEM_ERROR);
+   }
+@@ -81,7 +81,7 @@
+   }
+ 
+   NCursesMenuItem(const NCursesMenuItem& rhs)
+-    : item(0)
++    : item(NULL)
+   {
+     (void) rhs;
+   }
+@@ -176,7 +176,7 @@
+ 
+   NCursesMenuCallbackItem(const NCursesMenuCallbackItem& rhs)
+     : NCursesMenuItem(rhs),
+-      p_fct(0)
++      p_fct(NULL)
+   {
+   }
+ 
+@@ -224,7 +224,7 @@
+   // Get the backward pointer to the C++ object from a MENU
+   static inline NCursesMenu* getHook(const MENU *m) {
+     UserHook* hook = STATIC_CAST(UserHook*)(::menu_userptr(m));
+-    assert(hook != 0 && hook->m_owner==m);
++    assert(hook != NULL && hook->m_owner==m);
+     return const_cast(hook->m_back);
+   }
+ 
+@@ -240,13 +240,13 @@
+   // internal routines
+   inline void set_user(void *user) {
+     UserHook* uptr = STATIC_CAST(UserHook*)(::menu_userptr (menu));
+-    assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==menu);
++    assert (uptr != NULL && uptr->m_back==this && uptr->m_owner==menu);
+     uptr->m_user = user;
+   }
+ 
+   inline void *get_user() {
+     const UserHook* uptr = STATIC_CAST(UserHook*)(::menu_userptr (menu));
+-    assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==menu);
++    assert (uptr != NULL && uptr->m_back==this && uptr->m_owner==menu);
+     return uptr->m_user;
+   }
+ 
+@@ -270,11 +270,11 @@
+ 	       int  begin_x = 0)
+     : NCursesPanel(nlines,ncols,begin_y,begin_x),
+       menu (STATIC_CAST(MENU*)(0)),
+-      sub(0),
++      sub(NULL),
+       b_sub_owner(0),
+       b_framed(0),
+       b_autoDelete(0),
+-      my_items(0)
++      my_items(NULL)
+   {
+   }
+ 
+@@ -284,12 +284,12 @@
+ 	       bool with_frame=FALSE,        // Reserve space for a frame?
+ 	       bool autoDelete_Items=FALSE)  // Autocleanup of Items?
+     : NCursesPanel(),
+-      menu(0),
+-      sub(0),
++      menu(NULL),
++      sub(NULL),
+       b_sub_owner(0),
+       b_framed(0),
+       b_autoDelete(0),
+-      my_items(0)
++      my_items(NULL)
+   {
+       InitMenu(Items, with_frame, autoDelete_Items);
+   }
+@@ -303,12 +303,12 @@
+ 	       bool with_frame=FALSE,        // Reserve space for a frame?
+ 	       bool autoDelete_Items=FALSE)  // Autocleanup of Items?
+     : NCursesPanel(nlines, ncols, begin_y, begin_x),
+-      menu(0),
+-      sub(0),
++      menu(NULL),
++      sub(NULL),
+       b_sub_owner(0),
+       b_framed(0),
+       b_autoDelete(0),
+-      my_items(0)
++      my_items(NULL)
+   {
+       InitMenu(Items, with_frame, autoDelete_Items);
+   }
+@@ -601,7 +601,7 @@
+ public:
+   NCursesUserItem (const char* p_name,
+ 		   const char* p_descript = NULL,
+-		   const T* p_UserData    = STATIC_CAST(T*)(0))
++		   const T* p_UserData    = STATIC_CAST(T*)(NULL))
+     : NCursesMenuItem (p_name, p_descript) {
+       if (item)
+ 	OnError (::set_item_userptr (item, const_cast(reinterpret_cast(p_UserData))));
+@@ -630,7 +630,7 @@
+ 		   int  ncols,
+ 		   int  begin_y = 0,
+ 		   int  begin_x = 0,
+-		   const T* p_UserData = STATIC_CAST(T*)(0))
++		   const T* p_UserData = STATIC_CAST(T*)(NULL))
+     : NCursesMenu(nlines,ncols,begin_y,begin_x) {
+       if (menu)
+ 	set_user (const_cast(reinterpret_cast(p_UserData)));
+@@ -638,7 +638,7 @@
+ 
+ public:
+   NCursesUserMenu (NCursesMenuItem* Items[],
+-		   const T* p_UserData = STATIC_CAST(T*)(0),
++		   const T* p_UserData = STATIC_CAST(T*)(NULL),
+ 		   bool with_frame=FALSE,
+ 		   bool autoDelete_Items=FALSE)
+     : NCursesMenu (Items, with_frame, autoDelete_Items) {
+@@ -651,7 +651,7 @@
+ 		   int ncols,
+ 		   int begin_y = 0,
+ 		   int begin_x = 0,
+-		   const T* p_UserData = STATIC_CAST(T*)(0),
++		   const T* p_UserData = STATIC_CAST(T*)(NULL),
+ 		   bool with_frame=FALSE)
+     : NCursesMenu (Items, nlines, ncols, begin_y, begin_x, with_frame) {
+       if (menu)
+Index: c++/cursesp.cc
+Prereq:  1.28 
+--- ncurses-6.5-20250118+/c++/cursesp.cc	2024-10-05 22:47:12.000000000 +0000
++++ ncurses-6.5-20250125/c++/cursesp.cc	2025-01-25 21:20:17.000000000 +0000
+@@ -1,6 +1,6 @@
+ // * this is for making emacs happy: -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright 2019-2020,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2003,2005 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -35,9 +35,9 @@
+ #include "internal.h"
+ #include "cursesp.h"
+ 
+-MODULE_ID("$Id: cursesp.cc,v 1.28 2024/10/05 22:47:12 tom Exp $")
++MODULE_ID("$Id: cursesp.cc,v 1.29 2025/01/25 21:20:17 tom Exp $")
+ 
+-NCursesPanel* NCursesPanel::dummy = static_cast(0);
++NCursesPanel* NCursesPanel::dummy = static_cast(NULL);
+ 
+ void NCursesPanel::init()
+ {
+@@ -55,7 +55,7 @@
+ NCursesPanel::~NCursesPanel() THROWS(NCursesException)
+ {
+   UserHook* hook = UserPointer();
+-  assert(hook != 0 && hook->m_back==this && hook->m_owner==p);
++  assert(hook != NULL && hook->m_back==this && hook->m_owner==p);
+   delete hook;
+   ::del_panel(p);
+   ::update_panels();
+Index: c++/cursesp.h
+Prereq:  1.36 
+--- ncurses-6.5-20250118+/c++/cursesp.h	2022-08-20 20:52:15.000000000 +0000
++++ ncurses-6.5-20250125/c++/cursesp.h	2025-01-25 21:20:17.000000000 +0000
+@@ -1,7 +1,7 @@
+ // * This makes emacs happy -*-Mode: C++;-*-
+ // vile:cppmode
+ /****************************************************************************
+- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
++ * Copyright 2019-2022,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2014 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -36,7 +36,7 @@
+ #ifndef NCURSES_CURSESP_H_incl
+ #define NCURSES_CURSESP_H_incl 1
+ 
+-// $Id: cursesp.h,v 1.36 2022/08/20 20:52:15 tom Exp $
++// $Id: cursesp.h,v 1.37 2025/01/25 21:20:17 tom Exp $
+ 
+ #include 
+ 
+@@ -73,7 +73,7 @@
+   void set_user(void *user)
+   {
+     UserHook* uptr = UserPointer();
+-    if (uptr != 0 && uptr->m_back==this && uptr->m_owner==p) {
++    if (uptr != NULL && uptr->m_back==this && uptr->m_owner==p) {
+       uptr->m_user = user;
+     }
+   }
+@@ -82,8 +82,8 @@
+   void *get_user()
+   {
+     UserHook* uptr = UserPointer();
+-    void *result = 0;
+-    if (uptr != 0 && uptr->m_back==this && uptr->m_owner==p)
++    void *result = NULL;
++    if (uptr != NULL && uptr->m_back==this && uptr->m_owner==p)
+       result = uptr->m_user;
+     return result;
+   }
+@@ -104,14 +104,14 @@
+ 	       int ncols,
+ 	       int begin_y = 0,
+ 	       int begin_x = 0)
+-    : NCursesWindow(nlines,ncols,begin_y,begin_x), p(0)
++    : NCursesWindow(nlines,ncols,begin_y,begin_x), p(NULL)
+   {
+     init();
+   }
+   // Create a panel with this size starting at the requested position.
+ 
+   NCursesPanel()
+-    : NCursesWindow(::stdscr), p(0)
++    : NCursesWindow(::stdscr), p(NULL)
+   {
+     init();
+   }
+@@ -244,7 +244,7 @@
+   // This creates an user panel of the requested size with associated
+   // user data pointed to by p_UserData.
+ 
+-  explicit NCursesUserPanel(const T* p_UserData = STATIC_CAST(T*)(0)) : NCursesPanel()
++  explicit NCursesUserPanel(const T* p_UserData = STATIC_CAST(T*)(NULL)) : NCursesPanel()
+   {
+     if (p)
+       set_user(const_cast(reinterpret_cast(p_UserData)));
+Index: c++/cursespad.cc
+Prereq:  1.19 
+--- ncurses-6.5-20250118+/c++/cursespad.cc	2024-10-05 22:47:12.000000000 +0000
++++ ncurses-6.5-20250125/c++/cursespad.cc	2025-01-25 21:21:05.000000000 +0000
+@@ -1,6 +1,6 @@
+ // * this is for making emacs happy: -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright 2020,2024 Thomas E. Dickey                                     *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1999-2012,2013 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -36,17 +36,17 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: cursespad.cc,v 1.19 2024/10/05 22:47:12 tom Exp $")
++MODULE_ID("$Id: cursespad.cc,v 1.20 2025/01/25 21:21:05 tom Exp $")
+ 
+ NCursesPad::NCursesPad(int nlines, int ncols)
+   : NCursesWindow(),
+-    viewWin(static_cast(0)),
+-    viewSub(static_cast(0)),
++    viewWin(static_cast(NULL)),
++    viewSub(static_cast(NULL)),
+     h_gridsize(0), v_gridsize(0),
+     min_row(0), min_col(0)
+ {
+   w = ::newpad(nlines, ncols);
+-  if (static_cast(0) == w) {
++  if (static_cast(NULL) == w) {
+     count--;
+     err_handler("Cannot construct window");
+   }
+@@ -85,7 +85,7 @@
+ {
+   NCursesWindow* W = Win();
+ 
+-  if (static_cast(0) != W) {
++  if (static_cast(NULL) != W) {
+     int Width  = W->width();
+     int Height = W->height();
+ 
+@@ -170,7 +170,7 @@
+ int NCursesPad::refresh()
+ {
+   int res = noutrefresh();
+-  if (res==OK && (static_cast(0) != viewWin)) {
++  if (res==OK && (static_cast(NULL) != viewWin)) {
+     res = (viewWin->refresh());
+   }
+   return(res);
+@@ -180,7 +180,7 @@
+ {
+   int res = OK;
+   NCursesWindow* W = Win();
+-  if (static_cast(0) != W) {
++  if (static_cast(NULL) != W) {
+     int high = W->maxy();
+     int wide = W->maxx();
+     res = copywin(*W, min_row, min_col,
+@@ -210,9 +210,9 @@
+ 
+ void NCursesPad::setSubWindow(NCursesWindow& sub)
+ {
+-  if (static_cast(0) == viewWin)
++  if (static_cast(NULL) == viewWin)
+     err_handler("Pad has no viewport");
+-  assert(viewWin != 0);
++  assert(viewWin != NULL);
+   if (!viewWin->isDescendant(sub))
+     THROW(new NCursesException("NCursesFramePad", E_SYSTEM_ERROR));
+   viewSub = ⊂
+@@ -224,7 +224,7 @@
+   const NCursesWindow* W = Win();
+   NCursesWindow* W2 = getWindow();
+ 
+-  if ((static_cast(0) != W) && (static_cast(0) != W2)) {
++  if ((static_cast(NULL) != W) && (static_cast(NULL) != W2)) {
+     int Width  = W->width();
+     int Height = W->height();
+     int i, row, col, h_len, v_len;
+Index: c++/cursesw.cc
+Prereq:  1.56 
+--- ncurses-6.5-20250118+/c++/cursesw.cc	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20250125/c++/cursesw.cc	2025-01-25 21:21:05.000000000 +0000
+@@ -1,6 +1,6 @@
+ // * this is for making emacs happy: -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright 2019,2020 Thomas E. Dickey                                     *
++ * Copyright 2019-2020,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2014 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -43,7 +43,7 @@
+ #include "internal.h"
+ #include "cursesw.h"
+ 
+-MODULE_ID("$Id: cursesw.cc,v 1.56 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: cursesw.cc,v 1.57 2025/01/25 21:21:05 tom Exp $")
+ 
+ #define COLORS_NEED_INITIALIZATION  -1
+ #define COLORS_NOT_INITIALIZED       0
+@@ -188,27 +188,27 @@
+ }
+ 
+ NCursesWindow::NCursesWindow()
+-  : w(0), alloced(FALSE), par(0), subwins(0), sib(0)
++  : w(NULL), alloced(FALSE), par(NULL), subwins(NULL), sib(NULL)
+ {
+     constructing();
+ 
+-    w = static_cast(0);
++    w = static_cast(NULL);
+ }
+ 
+ NCursesWindow::NCursesWindow(int nlines, int ncols, int begin_y, int begin_x)
+-  : w(0), alloced(TRUE), par(0), subwins(0), sib(0)
++  : w(NULL), alloced(TRUE), par(NULL), subwins(NULL), sib(NULL)
+ {
+     constructing();
+ 
+     w = ::newwin(nlines, ncols, begin_y, begin_x);
+-    if (w == 0) {
++    if (w == NULL) {
+ 	err_handler("Cannot construct window");
+     }
+     set_keyboard();
+ }
+ 
+ NCursesWindow::NCursesWindow(WINDOW* window)
+-  : w(0), alloced(FALSE), par(0), subwins(0), sib(0)
++  : w(NULL), alloced(FALSE), par(NULL), subwins(NULL), sib(NULL)
+ {
+     constructing();
+ 
+@@ -223,7 +223,7 @@
+ 
+ NCursesWindow::NCursesWindow(NCursesWindow& win, int ny, int nx,
+ 			     int begin_y, int begin_x, char absrel)
+-  : w(0), alloced(TRUE), par(0), subwins(0), sib(0)
++  : w(NULL), alloced(TRUE), par(NULL), subwins(NULL), sib(NULL)
+ {
+     constructing();
+     if (absrel == 'a') {	// absolute origin
+@@ -234,7 +234,7 @@
+     // Link this window into its parent's list of subwindows.
+     // We use derwin(), since this also works for pads.
+     w = ::derwin(win.w, ny, nx, begin_y, begin_x);
+-    if (w == 0) {
++    if (w == NULL) {
+ 	err_handler("Cannot construct subwindow");
+     }
+ 
+@@ -245,20 +245,20 @@
+ 
+ NCursesWindow::NCursesWindow(NCursesWindow& win,
+ 				bool do_box NCURSES_PARAM_INIT(TRUE))
+-  : w(0), alloced(TRUE), par(0), subwins(0), sib(0)
++  : w(NULL), alloced(TRUE), par(NULL), subwins(NULL), sib(NULL)
+ {
+     constructing();
+     int myHeight = win.height();
+     int myWidth  = win.width();
+     w = :: derwin(win.w, myHeight - 2, myWidth - 2, 1, 1);
+-    if (w == 0) {
++    if (w == NULL) {
+ 	err_handler("Cannot construct subwindow");
+     }
+ 
+     par = &win;
+     sib = win.subwins;
+     win.subwins = this;
+-    subwins = 0;
++    subwins = NULL;
+ 
+     if (do_box) {
+ 	win.box();
+@@ -283,7 +283,7 @@
+ static RIPOFFINIT* prip = R_INIT;
+ 
+ NCursesWindow::NCursesWindow(WINDOW *win, int ncols)
+-  : w(0), alloced(FALSE), par(0), subwins(0), sib(0)
++  : w(NULL), alloced(FALSE), par(NULL), subwins(NULL), sib(NULL)
+ {
+     (void) ncols;
+     initialize();
+@@ -331,12 +331,12 @@
+ {
+     NCursesWindow* p = subwins;
+ 
+-    subwins = 0;
+-    while (p != 0) {
++    subwins = NULL;
++    while (p != NULL) {
+ 	NCursesWindow* q = p->sib;
+ 	p->kill_subwindows();
+ 	if (p->alloced) {
+-	    if (p->w != 0)
++	    if (p->w != NULL)
+ 		::delwin(p->w);
+ 	}
+ 	delete p;
+@@ -349,13 +349,13 @@
+ {
+     kill_subwindows();
+ 
+-    if (par != 0) {
++    if (par != NULL) {
+ 	// Remove this window from the parent's list of subwindows.
+ 	NCursesWindow * next = par->subwins;
+-	NCursesWindow * prev = 0;
+-	while (next != 0) {
++	NCursesWindow * prev = NULL;
++	while (next != NULL) {
+ 	    if (next == this) {
+-		if (prev != 0) {
++		if (prev != NULL) {
+ 		    prev->sib = next->sib;
+ 		} else {
+ 		    par->subwins = next->sib;
+@@ -367,7 +367,7 @@
+ 	}
+     }
+ 
+-    if (alloced && w != 0)
++    if (alloced && w != NULL)
+ 	::delwin(w);
+ 
+     if (alloced) {
+Index: c++/cursesw.h
+Prereq:  1.61 
+--- ncurses-6.5-20250118+/c++/cursesw.h	2024-12-15 16:06:49.000000000 +0000
++++ ncurses-6.5-20250125/c++/cursesw.h	2025-01-25 21:21:05.000000000 +0000
+@@ -1,7 +1,7 @@
+ // * This makes emacs happy -*-Mode: C++;-*-
+ // vile:cppmode
+ /****************************************************************************
+- * Copyright 2019-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -32,7 +32,7 @@
+ #ifndef NCURSES_CURSESW_H_incl
+ #define NCURSES_CURSESW_H_incl 1
+ 
+-// $Id: cursesw.h,v 1.61 2024/12/15 16:06:49 tom Exp $
++// $Id: cursesw.h,v 1.62 2025/01/25 21:21:05 tom Exp $
+ 
+ #include 
+ 
+@@ -1439,7 +1439,7 @@
+ 
+   NCursesWindow* Win(void) const {
+     // Get the window into which the pad should be copied (if any)
+-    return (viewSub?viewSub:(viewWin?viewWin:0));
++    return (viewSub?viewSub:(viewWin?viewWin:NULL));
+   }
+ 
+   NCursesWindow* getWindow(void) const {
+Index: c++/demo.cc
+Prereq:  1.52 
+--- ncurses-6.5-20250118+/c++/demo.cc	2023-08-26 19:14:14.000000000 +0000
++++ ncurses-6.5-20250125/c++/demo.cc	2025-01-25 21:21:05.000000000 +0000
+@@ -1,6 +1,6 @@
+ // * This makes emacs happy -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright 2018-2021,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -36,7 +36,7 @@
+  *   Demo code for NCursesMenu and NCursesForm written by
+  *   Juergen Pfeifer
+  *
+- * $Id: demo.cc,v 1.52 2023/08/26 19:14:14 tom Exp $
++ * $Id: demo.cc,v 1.53 2025/01/25 21:21:05 tom Exp $
+  */
+ 
+ #include "internal.h"
+@@ -174,7 +174,7 @@
+ public:
+   MyAction (const char* p_name,
+             const T* p_UserData)
+-    : NCursesUserItem(p_name, static_cast(0), p_UserData)
++    : NCursesUserItem(p_name, static_cast(NULL), p_UserData)
+   {}
+ 
+   virtual ~MyAction() THROWS(NCursesException) {}
+@@ -244,10 +244,10 @@
+ public:
+   TestForm()
+     : NCursesForm(13, 51, (lines() - 15)/2, (cols() - 53)/2),
+-      F(0),
+-      mft(0),
+-      ift(0),
+-      eft(0)
++      F(NULL),
++      mft(NULL),
++      ift(NULL),
++      eft(NULL)
+   {
+ 
+     F     = new NCursesFormField*[10];
+@@ -289,7 +289,7 @@
+   }
+ 
+   TestForm(const TestForm& rhs)
+-    : NCursesForm(rhs), F(0), mft(0), ift(0), eft(0)
++    : NCursesForm(rhs), F(NULL), mft(NULL), ift(NULL), eft(NULL)
+   {
+   }
+ 
+@@ -438,7 +438,7 @@
+ public:
+   MyMenu ()
+     : NCursesMenu (n_items+2, 8, (lines()-10)/2, (cols()-10)/2),
+-      P(0), I(0), u(0)
++      P(NULL), I(NULL), u(NULL)
+   {
+     u = new UserData(1);
+     I = new NCursesMenuItem*[1+n_items];
+@@ -467,7 +467,7 @@
+   }
+ 
+   MyMenu(const MyMenu& rhs)
+-    : NCursesMenu(rhs), P(0), I(0), u(0)
++    : NCursesMenu(rhs), P(NULL), I(NULL), u(NULL)
+   {
+   }
+ 
+Index: c++/etip.h.in
+Prereq:  1.51 
+--- ncurses-6.5-20250118+/c++/etip.h.in	2024-12-14 19:08:16.000000000 +0000
++++ ncurses-6.5-20250125/c++/etip.h.in	2025-01-25 22:19:42.000000000 +0000
+@@ -1,6 +1,6 @@
+ // * This makes emacs happy -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright 2018-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -32,7 +32,7 @@
+  *   Author: Juergen Pfeifer, 1997                                          *
+  ****************************************************************************/
+ 
+-// $Id: etip.h.in,v 1.51 2024/12/14 19:08:16 tom Exp $
++// $Id: etip.h.in,v 1.53 2025/01/25 22:19:42 tom Exp $
+ 
+ #ifndef NCURSES_ETIP_H_incl
+ #define NCURSES_ETIP_H_incl 1
+@@ -94,6 +94,8 @@
+ #  endif
+ #endif
+ 
++#include 
++
+ #if defined(__GNUG__)
+ #  if HAVE_BUILTIN_H || HAVE_GXX_BUILTIN_H || HAVE_GPP_BUILTIN_H
+ #    if ETIP_NEEDS_MATH_H
+@@ -114,6 +116,8 @@
+ #    endif
+ #    undef exception
+ #  endif
++#elif defined __CLANG
++#  include 
+ #elif defined (__SUNPRO_CC)
+ #  include 
+ #endif
+@@ -206,7 +210,7 @@
+ 
+   NCursesPanelException (const char *msg, int err) :
+     NCursesException (msg, err),
+-    p (0)
++    p (NULL)
+     {};
+ 
+   NCursesPanelException (const NCursesPanel* panel,
+@@ -218,7 +222,7 @@
+ 
+   explicit NCursesPanelException (int err) :
+     NCursesException ("panel library error", err),
+-    p (0)
++    p (NULL)
+     {};
+ 
+   NCursesPanelException (const NCursesPanel* panel,
+@@ -257,7 +261,7 @@
+ 
+   NCursesMenuException (const char *msg, int err) :
+     NCursesException (msg, err),
+-    m (0)
++    m (NULL)
+     {};
+ 
+   NCursesMenuException (const NCursesMenu* menu,
+@@ -269,7 +273,7 @@
+ 
+   explicit NCursesMenuException (int err) :
+     NCursesException ("menu library error", err),
+-    m (0)
++    m (NULL)
+     {};
+ 
+   NCursesMenuException (const NCursesMenu* menu,
+@@ -308,7 +312,7 @@
+ 
+   NCursesFormException (const char *msg, int err) :
+     NCursesException (msg, err),
+-    f (0)
++    f (NULL)
+     {};
+ 
+   NCursesFormException (const NCursesForm* form,
+@@ -320,7 +324,7 @@
+ 
+   explicit NCursesFormException (int err) :
+     NCursesException ("form library error", err),
+-    f (0)
++    f (NULL)
+     {};
+ 
+   NCursesFormException (const NCursesForm* form,
+Index: dist.mk
+Prereq:  1.1651 
+--- ncurses-6.5-20250118+/dist.mk	2025-01-18 11:23:10.000000000 +0000
++++ ncurses-6.5-20250125/dist.mk	2025-01-25 10:34:16.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1651 2025/01/18 11:23:10 tom Exp $
++# $Id: dist.mk,v 1.1652 2025/01/25 10:34:16 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 = 5
+-NCURSES_PATCH = 20250118
++NCURSES_PATCH = 20250125
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: ncurses/base/lib_mouse.c
+Prereq:  1.205 
+--- ncurses-6.5-20250118+/ncurses/base/lib_mouse.c	2025-01-18 15:01:47.000000000 +0000
++++ ncurses-6.5-20250125/ncurses/base/lib_mouse.c	2025-01-22 23:13:51.000000000 +0000
+@@ -85,7 +85,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_mouse.c,v 1.205 2025/01/18 15:01:47 tom Exp $")
++MODULE_ID("$Id: lib_mouse.c,v 1.206 2025/01/22 23:13:51 tom Exp $")
+ 
+ #include 
+ 
+@@ -483,8 +483,8 @@
+     if (NC_ISATTY(fileno(stdout))) {
+ 	const char *list = getenv("NCURSES_GPM_TERMS");
+ 	const char *env = getenv("TERM");
+-	if (list != 0) {
+-	    if (env != 0) {
++	if (list != NULL) {
++	    if (env != NULL) {
+ 		result = _nc_name_match(list, env, "|:") ? TRUE : FALSE;
+ 	    }
+ 	} else {
+@@ -495,7 +495,7 @@
+ 	     * capability.  Perhaps that works for someone.  If so, they can
+ 	     * set the environment variable (above).
+ 	     */
+-	    if (env != 0 && strstr(env, "linux") != 0) {
++	    if (env != NULL && strstr(env, "linux") != NULL) {
+ 		result = TRUE;
+ 	    }
+ 	}
+@@ -507,7 +507,7 @@
+ static void
+ unload_gpm_library(SCREEN *sp)
+ {
+-    if (sp->_dlopen_gpm != 0) {
++    if (sp->_dlopen_gpm != NULL) {
+ 	T(("unload GPM library"));
+ 	sp->_mouse_gpm_loaded = FALSE;
+ 	sp->_mouse_fd = -1;
+@@ -522,25 +522,25 @@
+     /*
+      * If we already had a successful dlopen, reuse it.
+      */
+-    if (sp->_dlopen_gpm != 0) {
++    if (sp->_dlopen_gpm != NULL) {
+ 	sp->_mouse_gpm_found = TRUE;
+ 	sp->_mouse_gpm_loaded = TRUE;
+-    } else if ((sp->_dlopen_gpm = dlopen(LIBGPM_SONAME, my_RTLD)) != 0) {
++    } else if ((sp->_dlopen_gpm = dlopen(LIBGPM_SONAME, my_RTLD)) != NULL) {
+ #if (defined(__GNUC__) && (__GNUC__ >= 5)) || defined(__clang__)
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wpedantic"
+ #endif
+-	if (GET_DLSYM(gpm_fd) == 0 ||
+-	    GET_DLSYM(Gpm_Open) == 0 ||
+-	    GET_DLSYM(Gpm_Close) == 0 ||
+-	    GET_DLSYM(Gpm_GetEvent) == 0) {
++	if (GET_DLSYM(gpm_fd) == NULL ||
++	    GET_DLSYM(Gpm_Open) == NULL ||
++	    GET_DLSYM(Gpm_Close) == NULL ||
++	    GET_DLSYM(Gpm_GetEvent) == NULL) {
+ #if (defined(__GNUC__) && (__GNUC__ >= 5)) || defined(__clang__)
+ #pragma GCC diagnostic pop
+ #endif
+ 	    T(("GPM initialization failed: %s", dlerror()));
+ 	    unload_gpm_library(sp);
+ 	    dlclose(sp->_dlopen_gpm);
+-	    sp->_dlopen_gpm = 0;
++	    sp->_dlopen_gpm = NULL;
+ 	} else {
+ 	    sp->_mouse_gpm_found = TRUE;
+ 	    sp->_mouse_gpm_loaded = TRUE;
+Index: ncurses/base/lib_set_term.c
+Prereq:  1.192 
+--- ncurses-6.5-20250118+/ncurses/base/lib_set_term.c	2025-01-12 00:41:56.000000000 +0000
++++ ncurses-6.5-20250125/ncurses/base/lib_set_term.c	2025-01-22 23:13:27.000000000 +0000
+@@ -57,7 +57,7 @@
+ #undef CUR
+ #define CUR SP_TERMTYPE
+ 
+-MODULE_ID("$Id: lib_set_term.c,v 1.192 2025/01/12 00:41:56 tom Exp $")
++MODULE_ID("$Id: lib_set_term.c,v 1.193 2025/01/22 23:13:27 tom Exp $")
+ 
+ #ifdef USE_TERM_DRIVER
+ #define MaxColors      InfoOf(sp).maxcolors
+@@ -217,9 +217,9 @@
+ 	}
+ #if USE_GPM_SUPPORT
+ #ifdef HAVE_LIBDL
+-	if (sp->_dlopen_gpm != 0) {
++	if (sp->_dlopen_gpm != NULL) {
+ 	    dlclose(sp->_dlopen_gpm);
+-	    sp->_dlopen_gpm = 0;
++	    sp->_dlopen_gpm = NULL;
+ 	}
+ #endif
+ #endif /* USE_GPM_SUPPORT */
+Index: ncurses/tty/lib_twait.c
+Prereq:  1.83 
+--- ncurses-6.5-20250118+/ncurses/tty/lib_twait.c	2024-12-07 21:02:00.000000000 +0000
++++ ncurses-6.5-20250125/ncurses/tty/lib_twait.c	2025-01-24 20:39:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -76,7 +76,7 @@
+ #endif
+ #undef CUR
+ 
+-MODULE_ID("$Id: lib_twait.c,v 1.83 2024/12/07 21:02:00 tom Exp $")
++MODULE_ID("$Id: lib_twait.c,v 1.84 2025/01/24 20:39:23 tom Exp $")
+ 
+ /*
+  * Returns an elapsed time, in milliseconds (if possible).
+@@ -242,7 +242,7 @@
+     if ((mode & TW_EVENT) && evl) {
+ 	if (fds == fd_list)
+ 	    fds = typeMalloc(struct pollfd, MIN_FDS + evl->count);
+-	if (fds == 0)
++	if (fds == NULL)
+ 	    return TW_NONE;
+     }
+ #endif
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250118+/package/debian-mingw/changelog	2025-01-12 11:23:10.000000000 +0000
++++ ncurses-6.5-20250125/package/debian-mingw/changelog	2025-01-24 20:34:16.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250118) unstable; urgency=low
++ncurses6td (6.5+20250125) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 12 Jan 2025 06:23:10 -0500
++ -- Thomas E. Dickey   Fri, 24 Jan 2025 15:34:16 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250118+/package/debian-mingw64/changelog	2025-01-12 11:23:10.000000000 +0000
++++ ncurses-6.5-20250125/package/debian-mingw64/changelog	2025-01-24 20:34:16.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250118) unstable; urgency=low
++ncurses6td (6.5+20250125) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 12 Jan 2025 06:23:10 -0500
++ -- Thomas E. Dickey   Fri, 24 Jan 2025 15:34:16 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250118+/package/debian/changelog	2025-01-12 11:23:10.000000000 +0000
++++ ncurses-6.5-20250125/package/debian/changelog	2025-01-24 20:34:16.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250118) unstable; urgency=low
++ncurses6td (6.5+20250125) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 12 Jan 2025 06:23:10 -0500
++ -- Thomas E. Dickey   Fri, 24 Jan 2025 15:34:16 -0500
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.685 
+--- ncurses-6.5-20250118+/package/mingw-ncurses.nsi	2025-01-12 11:23:10.000000000 +0000
++++ ncurses-6.5-20250125/package/mingw-ncurses.nsi	2025-01-24 20:34:16.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.685 2025/01/12 11:23:10 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.686 2025/01/24 20:34:16 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0118"
++!define VERSION_MMDD  "0125"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250118+/package/mingw-ncurses.spec	2025-01-12 11:23:10.000000000 +0000
++++ ncurses-6.5-20250125/package/mingw-ncurses.spec	2025-01-24 20:34:16.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250118
++Release: 20250125
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20250118+/package/ncurses.spec	2025-01-12 11:23:10.000000000 +0000
++++ ncurses-6.5-20250125/package/ncurses.spec	2025-01-24 20:34:16.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250118
++Release: 20250125
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20250118+/package/ncursest.spec	2025-01-12 11:23:10.000000000 +0000
++++ ncurses-6.5-20250125/package/ncursest.spec	2025-01-24 20:34:16.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250118
++Release: 20250125
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250201.patch b/packages/ncurses/6.5/ncurses-6.5-20250201.patch
new file mode 100644
index 0000000000..fae6650783
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250201.patch
@@ -0,0 +1,9780 @@
+# ncurses 6.5 - patch 20250201 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250201.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Feb  2 01:33:22 UTC 2025
+# ------------------------------------------------------------------------------
+# NEWS                                                             |   11 
+# VERSION                                                          |    2 
+# aclocal.m4                                                       |   14 
+# c++/edit_cfg.sh                                                  |    6 
+# c++/etip.h.in                                                    |   14 
+# configure                                                        |  702 ++++------
+# configure.in                                                     |    6 
+# dist.mk                                                          |    4 
+# doc/html/ada/funcs/T.htm                                         |    2 
+# doc/html/ada/terminal_interface-curses-forms__adb.htm            |    8 
+# doc/html/ada/terminal_interface-curses-menus__adb.htm            |    8 
+# doc/html/ada/terminal_interface-curses-panels-user_data__adb.htm |    4 
+# doc/html/man/curs_add_wch.3x.html                                |  314 ++--
+# doc/html/man/curs_add_wchstr.3x.html                             |   20 
+# doc/html/man/curs_addch.3x.html                                  |  122 +
+# doc/html/man/curs_addchstr.3x.html                               |   10 
+# doc/html/man/curs_addstr.3x.html                                 |   12 
+# doc/html/man/curs_addwstr.3x.html                                |   19 
+# doc/html/man/curs_attr.3x.html                                   |   46 
+# doc/html/man/curs_beep.3x.html                                   |   12 
+# doc/html/man/curs_bkgrnd.3x.html                                 |   10 
+# doc/html/man/curs_border.3x.html                                 |   84 -
+# doc/html/man/curs_border_set.3x.html                             |   81 -
+# doc/html/man/curs_deleteln.3x.html                               |   12 
+# doc/html/man/curs_get_wch.3x.html                                |   44 
+# doc/html/man/curs_get_wstr.3x.html                               |   21 
+# doc/html/man/curs_getcchar.3x.html                               |   13 
+# doc/html/man/curs_getch.3x.html                                  |  103 -
+# doc/html/man/curs_getstr.3x.html                                 |   22 
+# doc/html/man/curs_getyx.3x.html                                  |   10 
+# doc/html/man/curs_in_wch.3x.html                                 |   16 
+# doc/html/man/curs_in_wchstr.3x.html                              |   20 
+# doc/html/man/curs_initscr.3x.html                                |  186 +-
+# doc/html/man/curs_inopts.3x.html                                 |  138 +
+# doc/html/man/curs_ins_wch.3x.html                                |   25 
+# doc/html/man/curs_ins_wstr.3x.html                               |   10 
+# doc/html/man/curs_insch.3x.html                                  |   19 
+# doc/html/man/curs_insstr.3x.html                                 |   14 
+# doc/html/man/curs_instr.3x.html                                  |   13 
+# doc/html/man/curs_move.3x.html                                   |   10 
+# doc/html/man/curs_outopts.3x.html                                |   10 
+# doc/html/man/curs_scroll.3x.html                                 |   50 
+# doc/html/man/curs_sp_funcs.3x.html                               |  292 ++--
+# doc/html/man/curs_termattrs.3x.html                              |   10 
+# doc/html/man/curs_termcap.3x.html                                |    8 
+# doc/html/man/curs_util.3x.html                                   |   18 
+# doc/html/man/curs_window.3x.html                                 |    8 
+# doc/html/man/ncurses.3x.html                                     |    2 
+# doc/html/man/terminfo.5.html                                     |    2 
+# man/curs_add_wch.3x                                              |  358 +++--
+# man/curs_add_wchstr.3x                                           |    9 
+# man/curs_addch.3x                                                |  180 +-
+# man/curs_addchstr.3x                                             |    9 
+# man/curs_addstr.3x                                               |    5 
+# man/curs_addwstr.3x                                              |    7 
+# man/curs_attr.3x                                                 |   23 
+# man/curs_beep.3x                                                 |   11 
+# man/curs_bkgrnd.3x                                               |    6 
+# man/curs_border.3x                                               |  212 ++-
+# man/curs_border_set.3x                                           |   76 -
+# man/curs_deleteln.3x                                             |   11 
+# man/curs_get_wch.3x                                              |   17 
+# man/curs_get_wstr.3x                                             |   28 
+# man/curs_getcchar.3x                                             |    9 
+# man/curs_getch.3x                                                |   33 
+# man/curs_getstr.3x                                               |   15 
+# man/curs_getyx.3x                                                |    5 
+# man/curs_in_wch.3x                                               |    7 
+# man/curs_in_wchstr.3x                                            |    7 
+# man/curs_initscr.3x                                              |  312 +++-
+# man/curs_inopts.3x                                               |   51 
+# man/curs_ins_wch.3x                                              |   12 
+# man/curs_ins_wstr.3x                                             |    6 
+# man/curs_insch.3x                                                |    9 
+# man/curs_insstr.3x                                               |   11 
+# man/curs_instr.3x                                                |    7 
+# man/curs_move.3x                                                 |    8 
+# man/curs_outopts.3x                                              |   11 
+# man/curs_scroll.3x                                               |   76 -
+# man/curs_sp_funcs.3x                                             |  288 ++--
+# man/curs_termattrs.3x                                            |   16 
+# man/curs_termcap.3x                                              |    7 
+# man/curs_util.3x                                                 |   17 
+# man/curs_window.3x                                               |   18 
+# man/man_db.renames.in                                            |    3 
+# man/manhtml.aliases                                              |    3 
+# ncurses/base/MKlib_gen.sh                                        |   24 
+# ncurses/tty/lib_mvcur.c                                          |    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 
+# 95 files changed, 2593 insertions(+), 1931 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4236 
+--- ncurses-6.5-20250125+/NEWS	2025-01-25 21:30:09.000000000 +0000
++++ ncurses-6.5-20250201/NEWS	2025-02-02 00:30:12.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4236 2025/01/25 21:30:09 tom Exp $
++-- $Id: NEWS,v 1.4239 2025/02/02 00:30:12 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.
+ 
++20250201
++	+ add  to the possible headers declaring the C++ std::bad_alloc
++	  (report by Carl Hansen).
++	+ modify check for stdbool.h to be more conservative in case the
++	  headers are used with a compiler other than that which was used to
++	  configure (Redhat #2342514).
++	+ improve MKlib_gen.sh handling of "bool" type, for building link_test
++	+ improve formatting/style of manpages (patches by Branden Robinson).
++
+ 20250125
+ 	+ improve error-handling in c++ binding (report by Mingjie Shen).
+ 	+ strict compiler-warning fixes for upcoming gcc15
+Index: VERSION
+--- ncurses-6.5-20250125+/VERSION	2025-01-25 10:34:16.000000000 +0000
++++ ncurses-6.5-20250201/VERSION	2025-02-01 10:35:49.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250125
++5:0:10	6.5	20250201
+Index: aclocal.m4
+Prereq:  1.1100 
+--- ncurses-6.5-20250125+/aclocal.m4	2025-01-15 22:07:11.000000000 +0000
++++ ncurses-6.5-20250201/aclocal.m4	2025-02-02 00:10:44.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1100 2025/01/15 22:07:11 tom Exp $
++dnl $Id: aclocal.m4,v 1.1101 2025/02/02 00:10:44 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -600,7 +600,7 @@
+ dnl ---------------------------------------------------------------------------
+ dnl CF_BOOL_DECL version: 9 updated: 2023/12/03 09:21:34
+ dnl ------------
+-dnl Test if 'bool' is a builtin type in the configured C++ compiler.  Some
++dnl Test if 'bool' is a builtin type in the configured C/C++ compiler.  Some
+ dnl older compilers (e.g., gcc 2.5.8) don't support 'bool' directly; gcc
+ dnl 2.6.3 does, in anticipation of the ANSI C++ standard.
+ dnl
+@@ -613,14 +613,13 @@
+ AC_MSG_CHECKING(if we should include stdbool.h)
+ 
+ AC_CACHE_VAL(cf_cv_header_stdbool_h,[
+-	AC_TRY_COMPILE([],[bool foo = false; (void)foo],
+-		[cf_cv_header_stdbool_h=0],
+-		[AC_TRY_COMPILE([
++	AC_TRY_COMPILE([
+ #ifndef __BEOS__
+ #include 
+ #endif
+ ],[bool foo = false; (void)foo],
+-			[cf_cv_header_stdbool_h=1],
++		[cf_cv_header_stdbool_h=1],
++		[AC_TRY_COMPILE([],[bool foo = false; (void)foo],
+ 			[cf_cv_header_stdbool_h=0])])])
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+@@ -636,8 +635,7 @@
+ #include 
+ ],[bool x = false; (void)x],
+ 		[ifelse($1,,cf_cv_builtin_bool,[$1])=1],
+-		[ifelse($1,,cf_cv_builtin_bool,[$1])=0])
+-	])
++		[ifelse($1,,cf_cv_builtin_bool,[$1])=0])])
+ 
+ if test "$ifelse($1,,cf_cv_builtin_bool,[$1])" = 1
+ then	AC_MSG_RESULT(yes)
+Index: c++/edit_cfg.sh
+Prereq:  1.19 
+--- ncurses-6.5-20250125+/c++/edit_cfg.sh	2022-07-16 18:00:59.000000000 +0000
++++ ncurses-6.5-20250201/c++/edit_cfg.sh	2025-02-02 00:38:39.000000000 +0000
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+-# $Id: edit_cfg.sh,v 1.19 2022/07/16 18:00:59 tom Exp $
++# $Id: edit_cfg.sh,v 1.20 2025/02/02 00:38:39 tom Exp $
+ ##############################################################################
+-# Copyright 2020,2022 Thomas E. Dickey                                       #
++# Copyright 2020-2022,2025 Thomas E. Dickey                                  #
+ # Copyright 1998-2007,2008 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -46,7 +46,9 @@
+ 	HAVE_BUILTIN_H \
+ 	HAVE_GPP_BUILTIN_H \
+ 	HAVE_GXX_BUILTIN_H \
++	HAVE_EXCEPTION \
+ 	HAVE_IOSTREAM \
++	HAVE_NEW \
+ 	HAVE_TYPEINFO \
+ 	HAVE_VALUES_H \
+ 	IOSTREAM_NAMESPACE
+Index: c++/etip.h.in
+Prereq:  1.53 
+--- ncurses-6.5-20250125+/c++/etip.h.in	2025-01-25 22:19:42.000000000 +0000
++++ ncurses-6.5-20250201/c++/etip.h.in	2025-02-02 00:20:44.000000000 +0000
+@@ -32,7 +32,7 @@
+  *   Author: Juergen Pfeifer, 1997                                          *
+  ****************************************************************************/
+ 
+-// $Id: etip.h.in,v 1.53 2025/01/25 22:19:42 tom Exp $
++// $Id: etip.h.in,v 1.54 2025/02/02 00:20:44 tom Exp $
+ 
+ #ifndef NCURSES_ETIP_H_incl
+ #define NCURSES_ETIP_H_incl 1
+@@ -42,6 +42,10 @@
+ #define HAVE_BUILTIN_H 0
+ #endif
+ 
++#ifndef HAVE_EXCEPTION
++#define HAVE_EXCEPTION 0
++#endif
++
+ #ifndef HAVE_GXX_BUILTIN_H
+ #define HAVE_GXX_BUILTIN_H 0
+ #endif
+@@ -54,6 +58,10 @@
+ #define HAVE_IOSTREAM 0
+ #endif
+ 
++#ifndef HAVE_NEW
++#define HAVE_NEW 0
++#endif
++
+ #ifndef HAVE_TYPEINFO
+ #define HAVE_TYPEINFO 0
+ #endif
+@@ -116,8 +124,10 @@
+ #    endif
+ #    undef exception
+ #  endif
+-#elif defined __CLANG
++#elif HAVE_EXCEPTION
+ #  include 
++#elif HAVE_NEW
++#  include 
+ #elif defined (__SUNPRO_CC)
+ #  include 
+ #endif
+Index: configure
+--- ncurses-6.5-20250125+/configure	2025-01-18 11:26:09.000000000 +0000
++++ ncurses-6.5-20250201/configure	2025-02-02 00:38:02.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.790 .
++# From configure.in Revision: 1.791 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20240618.
+ #
+@@ -25830,6 +25830,10 @@
+ #line 25830 "configure"
+ #include "confdefs.h"
+ 
++#ifndef __BEOS__
++#include 
++#endif
++
+ int
+ main (void)
+ {
+@@ -25839,29 +25843,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25842: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25846: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25845: \$? = $ac_status" >&5
++  echo "$as_me:25849: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25848: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25852: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25851: \$? = $ac_status" >&5
++  echo "$as_me:25855: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  cf_cv_header_stdbool_h=0
++  cf_cv_header_stdbool_h=1
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25858 "configure"
++#line 25862 "configure"
+ #include "confdefs.h"
+ 
+-#ifndef __BEOS__
+-#include 
+-#endif
+-
+ int
+ main (void)
+ {
+@@ -25882,11 +25882,10 @@
+   ac_status=$?
+   echo "$as_me:25883: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  cf_cv_header_stdbool_h=1
++  cf_cv_header_stdbool_h=0
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-cf_cv_header_stdbool_h=0
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+@@ -25894,13 +25893,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:25897: result: yes" >&5
++then	echo "$as_me:25896: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25899: result: no" >&5
++else	echo "$as_me:25898: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:25903: checking for builtin bool type" >&5
++echo "$as_me:25902: 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
+@@ -25908,7 +25907,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25911 "configure"
++#line 25910 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25923,16 +25922,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25926: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25925: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25929: \$? = $ac_status" >&5
++  echo "$as_me:25928: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25932: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25931: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25935: \$? = $ac_status" >&5
++  echo "$as_me:25934: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -25941,13 +25940,12 @@
+ cf_cv_cc_bool_type=0
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:25948: result: yes" >&5
++then	echo "$as_me:25946: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25950: result: no" >&5
++else	echo "$as_me:25948: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -25964,10 +25962,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:25967: checking if we already have C++ library" >&5
++	echo "$as_me:25965: 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 25970 "configure"
++#line 25968 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -25981,16 +25979,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25984: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25982: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25987: \$? = $ac_status" >&5
++  echo "$as_me:25985: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25990: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25988: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25993: \$? = $ac_status" >&5
++  echo "$as_me:25991: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -25999,7 +25997,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-	echo "$as_me:26002: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:26000: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -26018,7 +26016,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:26021: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:26019: 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
+@@ -26044,7 +26042,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26047 "configure"
++#line 26045 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -26058,16 +26056,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26061: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26059: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26064: \$? = $ac_status" >&5
++  echo "$as_me:26062: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26067: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26065: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26070: \$? = $ac_status" >&5
++  echo "$as_me:26068: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -26079,7 +26077,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:26082: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:26080: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -26101,7 +26099,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:26104: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:26102: 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
+@@ -26116,15 +26114,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:26119: \"$ac_try\"") >&5
++if { (eval echo "$as_me:26117: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26122: \$? = $ac_status" >&5
++  echo "$as_me:26120: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:26124: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:26122: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26127: \$? = $ac_status" >&5
++  echo "$as_me:26125: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -26135,10 +26133,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+-  echo "$as_me:26138: result: yes" >&5
++  echo "$as_me:26136: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:26141: result: no" >&5
++  echo "$as_me:26139: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -26158,7 +26156,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:26161: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:26159: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -26179,7 +26177,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26182 "configure"
++#line 26180 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -26193,16 +26191,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26196: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26194: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26199: \$? = $ac_status" >&5
++  echo "$as_me:26197: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26202: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26200: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26205: \$? = $ac_status" >&5
++  echo "$as_me:26203: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -26239,7 +26237,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26242 "configure"
++#line 26240 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26253,16 +26251,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26256: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26254: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26259: \$? = $ac_status" >&5
++  echo "$as_me:26257: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26262: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26260: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26265: \$? = $ac_status" >&5
++  echo "$as_me:26263: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -26295,7 +26293,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	LIBS="$cf_save"
+-	echo "$as_me:26298: result: $cf_cxx_library" >&5
++	echo "$as_me:26296: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -26311,7 +26309,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:26314: checking how to run the C++ preprocessor" >&5
++echo "$as_me:26312: 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
+@@ -26328,18 +26326,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 26331 "configure"
++#line 26329 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26336: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26334: \"$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:26342: \$? = $ac_status" >&5
++  echo "$as_me:26340: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26362,17 +26360,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26365 "configure"
++#line 26363 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26369: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26367: \"$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:26375: \$? = $ac_status" >&5
++  echo "$as_me:26373: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26409,7 +26407,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:26412: result: $CXXCPP" >&5
++echo "$as_me:26410: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -26419,18 +26417,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 26422 "configure"
++#line 26420 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26427: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26425: \"$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:26433: \$? = $ac_status" >&5
++  echo "$as_me:26431: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26453,17 +26451,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26456 "configure"
++#line 26454 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26460: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26458: \"$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:26466: \$? = $ac_status" >&5
++  echo "$as_me:26464: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26491,7 +26489,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:26494: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:26492: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -26503,26 +26501,26 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+ 
+-for ac_header in typeinfo
++for ac_header in new exception typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:26509: checking for $ac_header" >&5
++echo "$as_me:26507: 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 26515 "configure"
++#line 26513 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26519: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26517: \"$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:26525: \$? = $ac_status" >&5
++  echo "$as_me:26523: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26541,7 +26539,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26544: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26542: 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:26555: 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 26563 "configure"
++#line 26561 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26567: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26565: \"$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:26573: \$? = $ac_status" >&5
++  echo "$as_me:26571: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26589,7 +26587,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26592: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26590: 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:26601: 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 26606 "configure"
++#line 26604 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26620,16 +26618,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26623: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26621: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26626: \$? = $ac_status" >&5
++  echo "$as_me:26624: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26629: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26627: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26632: \$? = $ac_status" >&5
++  echo "$as_me:26630: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -26638,7 +26636,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:26641: result: $cf_iostream_namespace" >&5
++	echo "$as_me:26639: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -26649,7 +26647,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:26652: checking if we should include stdbool.h" >&5
++echo "$as_me:26650: 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
+@@ -26657,9 +26655,13 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26660 "configure"
++#line 26658 "configure"
+ #include "confdefs.h"
+ 
++#ifndef __BEOS__
++#include 
++#endif
++
+ int
+ main (void)
+ {
+@@ -26669,29 +26671,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26672: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26674: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26675: \$? = $ac_status" >&5
++  echo "$as_me:26677: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26678: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26680: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26681: \$? = $ac_status" >&5
++  echo "$as_me:26683: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  cf_cv_header_stdbool_h=0
++  cf_cv_header_stdbool_h=1
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26688 "configure"
++#line 26690 "configure"
+ #include "confdefs.h"
+ 
+-#ifndef __BEOS__
+-#include 
+-#endif
+-
+ int
+ main (void)
+ {
+@@ -26701,22 +26699,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26704: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26702: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26707: \$? = $ac_status" >&5
++  echo "$as_me:26705: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26710: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26708: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26713: \$? = $ac_status" >&5
++  echo "$as_me:26711: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  cf_cv_header_stdbool_h=1
++  cf_cv_header_stdbool_h=0
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-cf_cv_header_stdbool_h=0
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+@@ -26724,13 +26721,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:26727: result: yes" >&5
++then	echo "$as_me:26724: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:26729: result: no" >&5
++else	echo "$as_me:26726: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:26733: checking for builtin bool type" >&5
++echo "$as_me:26730: 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
+@@ -26738,7 +26735,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26741 "configure"
++#line 26738 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26753,16 +26750,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26756: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26753: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26759: \$? = $ac_status" >&5
++  echo "$as_me:26756: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26762: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26759: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26765: \$? = $ac_status" >&5
++  echo "$as_me:26762: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -26771,23 +26768,22 @@
+ cf_cv_builtin_bool=0
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:26778: result: yes" >&5
++then	echo "$as_me:26774: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:26780: result: no" >&5
++else	echo "$as_me:26776: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:26784: checking for bool" >&5
++echo "$as_me:26780: 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 26790 "configure"
++#line 26786 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26822,16 +26818,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26825: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26821: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26828: \$? = $ac_status" >&5
++  echo "$as_me:26824: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26831: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26827: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26834: \$? = $ac_status" >&5
++  echo "$as_me:26830: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -26841,10 +26837,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26844: result: $ac_cv_type_bool" >&5
++echo "$as_me:26840: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:26847: checking size of bool" >&5
++echo "$as_me:26843: 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
+@@ -26853,7 +26849,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26856 "configure"
++#line 26852 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26885,21 +26881,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26888: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26884: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26891: \$? = $ac_status" >&5
++  echo "$as_me:26887: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26894: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26890: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26897: \$? = $ac_status" >&5
++  echo "$as_me:26893: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26902 "configure"
++#line 26898 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26931,16 +26927,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26934: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26930: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26937: \$? = $ac_status" >&5
++  echo "$as_me:26933: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26940: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26936: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26943: \$? = $ac_status" >&5
++  echo "$as_me:26939: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -26956,7 +26952,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26959 "configure"
++#line 26955 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26988,16 +26984,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26991: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26987: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26994: \$? = $ac_status" >&5
++  echo "$as_me:26990: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26997: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26993: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27000: \$? = $ac_status" >&5
++  echo "$as_me:26996: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27013,7 +27009,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 27016 "configure"
++#line 27012 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27045,16 +27041,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27048: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27044: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27051: \$? = $ac_status" >&5
++  echo "$as_me:27047: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27054: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27050: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27057: \$? = $ac_status" >&5
++  echo "$as_me:27053: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27067,12 +27063,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27070: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27066: 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 27075 "configure"
++#line 27071 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27108,15 +27104,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27111: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27107: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27114: \$? = $ac_status" >&5
++  echo "$as_me:27110: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27116: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27112: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27119: \$? = $ac_status" >&5
++  echo "$as_me:27115: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27132,13 +27128,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27135: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27131: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27137: 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
+@@ -27157,7 +27153,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27160 "configure"
++#line 27156 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27198,15 +27194,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27201: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27197: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27204: \$? = $ac_status" >&5
++  echo "$as_me:27200: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27206: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27202: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27209: \$? = $ac_status" >&5
++  echo "$as_me:27205: \$? = $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
+@@ -27223,19 +27219,19 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:27226: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:27222: 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:27233: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:27229: 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:27238: checking for special defines needed for etip.h" >&5
++echo "$as_me:27234: 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"
+@@ -27253,7 +27249,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 27256 "configure"
++#line 27252 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -27267,16 +27263,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27270: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27266: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27273: \$? = $ac_status" >&5
++  echo "$as_me:27269: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27276: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27272: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27279: \$? = $ac_status" >&5
++  echo "$as_me:27275: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:27296: result: ${cf_result:-(none)}" >&5
+ echo "${ECHO_T}${cf_result:-(none)}" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27305: checking if $CXX accepts override keyword" >&5
++echo "$as_me:27301: checking if $CXX accepts override keyword" >&5
+ echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
+ if test "${cf_cv_cpp_override+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27319,7 +27315,7 @@
+   cf_cv_cpp_override=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27322 "configure"
++#line 27318 "configure"
+ #include "confdefs.h"
+ 
+ class base
+@@ -27338,15 +27334,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27341: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27337: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27344: \$? = $ac_status" >&5
++  echo "$as_me:27340: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27346: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27342: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27349: \$? = $ac_status" >&5
++  echo "$as_me:27345: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_override=yes
+ else
+@@ -27365,7 +27361,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27368: result: $cf_cv_cpp_override" >&5
++echo "$as_me:27364: result: $cf_cv_cpp_override" >&5
+ echo "${ECHO_T}$cf_cv_cpp_override" >&6
+ fi
+ test "$cf_cv_cpp_override" = yes &&
+@@ -27374,7 +27370,7 @@
+ EOF
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27377: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:27373: 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
+@@ -27391,7 +27387,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27394 "configure"
++#line 27390 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -27410,15 +27406,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27413: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27409: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27416: \$? = $ac_status" >&5
++  echo "$as_me:27412: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27418: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27414: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27421: \$? = $ac_status" >&5
++  echo "$as_me:27417: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -27437,7 +27433,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27440: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:27436: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -27447,7 +27443,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:27450: checking if $CXX accepts static_cast" >&5
++echo "$as_me:27446: 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
+@@ -27461,7 +27457,7 @@
+ ac_main_return="return"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27464 "configure"
++#line 27460 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -27505,16 +27501,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27508: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27504: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27511: \$? = $ac_status" >&5
++  echo "$as_me:27507: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27514: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27510: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27517: \$? = $ac_status" >&5
++  echo "$as_me:27513: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -27532,7 +27528,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27535: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:27531: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -27580,13 +27576,13 @@
+ 		cf_cv_header_stdbool_h=0
+ 	else
+ 
+-echo "$as_me:27583: checking for bool" >&5
++echo "$as_me:27579: 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 27589 "configure"
++#line 27585 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27621,16 +27617,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27624: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27620: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27627: \$? = $ac_status" >&5
++  echo "$as_me:27623: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27630: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27626: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27633: \$? = $ac_status" >&5
++  echo "$as_me:27629: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -27640,10 +27636,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27643: result: $ac_cv_type_bool" >&5
++echo "$as_me:27639: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:27646: checking size of bool" >&5
++echo "$as_me:27642: 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
+@@ -27652,7 +27648,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27655 "configure"
++#line 27651 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27684,21 +27680,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27687: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27683: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27690: \$? = $ac_status" >&5
++  echo "$as_me:27686: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27693: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27689: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27696: \$? = $ac_status" >&5
++  echo "$as_me:27692: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27701 "configure"
++#line 27697 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27730,16 +27726,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27733: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27729: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27736: \$? = $ac_status" >&5
++  echo "$as_me:27732: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27739: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27735: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27742: \$? = $ac_status" >&5
++  echo "$as_me:27738: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -27755,7 +27751,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27758 "configure"
++#line 27754 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27787,16 +27783,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27790: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27786: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27793: \$? = $ac_status" >&5
++  echo "$as_me:27789: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27796: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27792: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27799: \$? = $ac_status" >&5
++  echo "$as_me:27795: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27812,7 +27808,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 27815 "configure"
++#line 27811 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27844,16 +27840,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27847: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27843: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27850: \$? = $ac_status" >&5
++  echo "$as_me:27846: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27853: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27849: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27856: \$? = $ac_status" >&5
++  echo "$as_me:27852: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27866,12 +27862,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27869: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27865: 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 27874 "configure"
++#line 27870 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27907,15 +27903,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27910: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27906: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27913: \$? = $ac_status" >&5
++  echo "$as_me:27909: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27915: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27911: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27918: \$? = $ac_status" >&5
++  echo "$as_me:27914: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27931,13 +27927,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27934: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27930: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27936: 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
+@@ -27956,7 +27952,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27959 "configure"
++#line 27955 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27997,15 +27993,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:28000: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27996: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28003: \$? = $ac_status" >&5
++  echo "$as_me:27999: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:28005: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28001: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28008: \$? = $ac_status" >&5
++  echo "$as_me:28004: \$? = $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
+@@ -28022,14 +28018,14 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:28025: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:28021: 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:28032: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:28028: 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
+@@ -28060,7 +28056,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:28063: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:28059: 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
+@@ -28071,7 +28067,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:28074: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:28070: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -28088,10 +28084,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:28091: result: $ADAFLAGS" >&5
++	echo "$as_me:28087: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:28094: checking if GNATPREP supports -T option" >&5
++echo "$as_me:28090: 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
+@@ -28101,11 +28097,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:28104: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:28100: 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:28108: checking if GNAT supports generics" >&5
++echo "$as_me:28104: 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])
+@@ -28115,7 +28111,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:28118: result: $cf_gnat_generics" >&5
++echo "$as_me:28114: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -28127,7 +28123,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:28130: checking if GNAT supports SIGINT" >&5
++echo "$as_me:28126: 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
+@@ -28175,7 +28171,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:28178: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:28174: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -28188,7 +28184,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:28191: checking if GNAT supports project files" >&5
++echo "$as_me:28187: 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]*)
+@@ -28251,15 +28247,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:28254: result: $cf_gnat_projects" >&5
++echo "$as_me:28250: 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:28260: checking if GNAT supports libraries" >&5
++	echo "$as_me:28256: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:28262: result: $cf_gnat_libraries" >&5
++	echo "$as_me:28258: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -28279,7 +28275,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:28282: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:28278: 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
+@@ -28291,7 +28287,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:28294: checking for Ada95 compiler" >&5
++echo "$as_me:28290: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -28302,12 +28298,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:28305: result: $cf_ada_compiler" >&5
++echo "$as_me:28301: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:28310: checking for Ada95 include directory" >&5
++echo "$as_me:28306: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -28341,7 +28337,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28344: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28340: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28350,10 +28346,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:28353: result: $ADA_INCLUDE" >&5
++echo "$as_me:28349: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:28356: checking for Ada95 object directory" >&5
++echo "$as_me:28352: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -28387,7 +28383,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28390: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28386: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28396,10 +28392,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:28399: result: $ADA_OBJECTS" >&5
++echo "$as_me:28395: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:28402: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:28398: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -28420,11 +28416,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:28423: result: $with_ada_sharedlib" >&5
++echo "$as_me:28419: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+-	{ echo "$as_me:28427: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++	{ echo "$as_me:28423: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+ 
+@@ -28442,7 +28438,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:28445: checking for Ada95 curses library name" >&5
++echo "$as_me:28441: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -28458,7 +28454,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28461: result: $ADA_LIBNAME" >&5
++echo "$as_me:28457: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -28469,13 +28465,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:28472: checking for wchar_t" >&5
++	echo "$as_me:28468: 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 28478 "configure"
++#line 28474 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28490,16 +28486,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28493: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28489: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28496: \$? = $ac_status" >&5
++  echo "$as_me:28492: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28499: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28495: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28502: \$? = $ac_status" >&5
++  echo "$as_me:28498: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -28509,10 +28505,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:28512: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:28508: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:28515: checking size of wchar_t" >&5
++echo "$as_me:28511: 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
+@@ -28521,7 +28517,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28524 "configure"
++#line 28520 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28533,21 +28529,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28536: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28532: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28539: \$? = $ac_status" >&5
++  echo "$as_me:28535: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28542: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28538: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28545: \$? = $ac_status" >&5
++  echo "$as_me:28541: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28550 "configure"
++#line 28546 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28559,16 +28555,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28562: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28558: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28565: \$? = $ac_status" >&5
++  echo "$as_me:28561: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28568: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28564: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28571: \$? = $ac_status" >&5
++  echo "$as_me:28567: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -28584,7 +28580,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28587 "configure"
++#line 28583 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28596,16 +28592,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28599: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28595: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28602: \$? = $ac_status" >&5
++  echo "$as_me:28598: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28605: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28601: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28608: \$? = $ac_status" >&5
++  echo "$as_me:28604: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -28621,7 +28617,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 28624 "configure"
++#line 28620 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28633,16 +28629,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28636: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28632: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28639: \$? = $ac_status" >&5
++  echo "$as_me:28635: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28642: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28638: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28645: \$? = $ac_status" >&5
++  echo "$as_me:28641: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -28655,12 +28651,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:28658: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:28654: 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 28663 "configure"
++#line 28659 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28676,15 +28672,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:28679: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28675: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28682: \$? = $ac_status" >&5
++  echo "$as_me:28678: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:28684: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28680: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28687: \$? = $ac_status" >&5
++  echo "$as_me:28683: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -28700,7 +28696,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:28703: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:28699: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&6
+ 
+-echo "${as_me:-configure}:28716: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:28712: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -28731,7 +28727,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:28734: checking for library subsets" >&5
++echo "$as_me:28730: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -28785,7 +28781,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:28788: result: $LIB_SUBSETS" >&5
++echo "$as_me:28784: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -28816,7 +28812,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:28819: checking default library suffix" >&5
++echo "$as_me:28815: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28827,10 +28823,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:28830: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:28826: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:28833: checking default library-dependency suffix" >&5
++echo "$as_me:28829: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -28913,10 +28909,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:28916: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28912: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:28919: checking default object directory" >&5
++echo "$as_me:28915: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28932,11 +28928,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:28935: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28931: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28939: checking c++ library-dependency suffix" >&5
++echo "$as_me:28935: 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++)
+@@ -29029,7 +29025,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:29032: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:29028: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -29205,19 +29201,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:29208: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:29204: 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:29217: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:29213: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:29220: \$? = $ac_status" >&5
++  echo "$as_me:29216: \$? = $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
+@@ -29228,10 +29224,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 29231 "configure"
++#line 29227 "configure"
+ #include "confdefs.h"
+ 
+-#line 29234 "configure"
++#line 29230 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -29246,16 +29242,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:29249: \"$ac_link\"") >&5
++if { (eval echo "$as_me:29245: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:29252: \$? = $ac_status" >&5
++  echo "$as_me:29248: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:29255: \"$ac_try\"") >&5
++  { (eval echo "$as_me:29251: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:29258: \$? = $ac_status" >&5
++  echo "$as_me:29254: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -29278,7 +29274,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:29281: result: $cf_ldflags_static" >&5
++	echo "$as_me:29277: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test "$cf_ldflags_static" != yes
+@@ -29294,7 +29290,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29297: checking where we will install curses.h" >&5
++echo "$as_me:29293: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -29304,7 +29300,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:29307: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:29303: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -29312,7 +29308,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:29315: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:29311: 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
+@@ -29337,7 +29333,7 @@
+ 
+ # pkgsrc uses these
+ 
+-echo "$as_me:29340: checking for desired basename for form library" >&5
++echo "$as_me:29336: 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.
+@@ -29357,10 +29353,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29360: result: $FORM_NAME" >&5
++echo "$as_me:29356: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:29363: checking for desired basename for menu library" >&5
++echo "$as_me:29359: 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.
+@@ -29380,10 +29376,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29383: result: $MENU_NAME" >&5
++echo "$as_me:29379: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:29386: checking for desired basename for panel library" >&5
++echo "$as_me:29382: 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.
+@@ -29403,10 +29399,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29406: result: $PANEL_NAME" >&5
++echo "$as_me:29402: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:29409: checking for desired basename for cxx library" >&5
++echo "$as_me:29405: 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.
+@@ -29426,13 +29422,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29429: result: $CXX_NAME" >&5
++echo "$as_me:29425: 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:29435: checking for src modules" >&5
++echo "$as_me:29431: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -29491,7 +29487,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:29494: result: $cf_cv_src_modules" >&5
++echo "$as_me:29490: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -29652,7 +29648,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:29655: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:29651: 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//'`
+@@ -29663,7 +29659,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:29666: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
++echo "$as_me:29662: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -29679,7 +29675,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:29682: result: $PKG_CFLAGS" >&5
++echo "$as_me:29678: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ case "$cf_cv_system_name" in
+@@ -29751,7 +29747,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
+ 
+-echo "${as_me:-configure}:29754: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
++echo "${as_me:-configure}:29750: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+ 
+ fi
+ 
+@@ -29778,7 +29774,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:29781: checking for linker search path" >&5
++echo "$as_me:29777: 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
+@@ -29826,7 +29822,7 @@
+ 			cf_pathlist="$cf_pathlist /lib /usr/lib"
+ 			;;
+ 		(*)
+-			{ echo "$as_me:29829: WARNING: problem with Solaris architecture" >&5
++			{ echo "$as_me:29825: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ 			;;
+ 		esac
+@@ -29867,7 +29863,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:29870: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29866: 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'`
+@@ -29953,7 +29949,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29956: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29952: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -30134,7 +30130,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:30137: error: ambiguous option: $1
++    { { echo "$as_me:30133: 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;}
+@@ -30153,7 +30149,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:30156: error: unrecognized option: $1
++  -*) { { echo "$as_me:30152: 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;}
+@@ -30285,7 +30281,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:30288: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:30284: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -30813,7 +30809,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:30816: creating $ac_file" >&5
++    { echo "$as_me:30812: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -30831,7 +30827,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30834: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30830: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -30844,7 +30840,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30847: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30843: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30860,7 +30856,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:30863: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:30859: 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;}
+@@ -30869,7 +30865,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:30872: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:30868: 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;}
+@@ -30914,7 +30910,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:30917: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:30913: 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;}
+@@ -30925,7 +30921,7 @@
+     $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:30928: WARNING: Some variables may not be substituted:
++      { echo "$as_me:30924: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30974,7 +30970,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:30977: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:30973: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -30985,7 +30981,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30988: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30984: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -30998,7 +30994,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:31001: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30997: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -31056,7 +31052,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:31059: $ac_file is unchanged" >&5
++      { echo "$as_me:31055: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -31443,7 +31439,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}:31446: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:31442: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: configure.in
+Prereq:  1.790 
+--- ncurses-6.5-20250125+/configure.in	2025-01-18 11:20:02.000000000 +0000
++++ ncurses-6.5-20250201/configure.in	2025-02-02 00:16:32.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.790 2025/01/18 11:20:02 tom Exp $
++dnl $Id: configure.in,v 1.791 2025/02/02 00:16:32 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.790 $)
++AC_REVISION($Revision: 1.791 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -1921,7 +1921,7 @@
+ 		;;
+ 	esac
+ 
+-	AC_CHECK_HEADERS(typeinfo)
++	AC_CHECK_HEADERS(new exception typeinfo)
+ 	CF_CXX_IOSTREAM_NAMESPACE
+ 	CF_BOOL_DECL
+ 	CF_BOOL_SIZE
+Index: dist.mk
+Prereq:  1.1652 
+--- ncurses-6.5-20250125+/dist.mk	2025-01-25 10:34:16.000000000 +0000
++++ ncurses-6.5-20250201/dist.mk	2025-02-01 10:35:49.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1652 2025/01/25 10:34:16 tom Exp $
++# $Id: dist.mk,v 1.1653 2025/02/01 10:35:49 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 = 5
+-NCURSES_PATCH = 20250125
++NCURSES_PATCH = 20250201
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/ada/funcs/T.htm
+--- ncurses-6.5-20250125+/doc/html/ada/funcs/T.htm	2023-10-21 17:10:27.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/ada/funcs/T.htm	2025-02-02 00:44:01.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/terminal_interface-curses-forms__adb.htm
+--- ncurses-6.5-20250125+/doc/html/ada/terminal_interface-curses-forms__adb.htm	2022-01-15 20:50:51.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/ada/terminal_interface-curses-forms__adb.htm	2025-02-02 00:44:01.000000000 +0000
+@@ -24,7 +24,7 @@
+ --                                 B O D Y                                  --
+ --                                                                          --
+ ------------------------------------------------------------------------------
+--- Copyright 2020 Thomas E. Dickey                                          --
++-- Copyright 2020,2025 Thomas E. Dickey                                     --
+ -- Copyright 1999-2011,2014 Free Software Foundation, Inc.                  --
+ --                                                                          --
+ -- Permission is hereby granted, free of charge, to any person obtaining a  --
+@@ -53,8 +53,8 @@
+ ------------------------------------------------------------------------------
+ --  Author:  Juergen Pfeifer, 1996
+ --  Version Control:
+---  @Revision: 1.33 @
+---  @Date: 2020/02/02 23:34:34 @
++--  @Revision: 1.34 @
++--  @Date: 2025/01/24 20:39:23 @
+ --  Binding Version 01.00
+ ------------------------------------------------------------------------------
+ with Ada.Unchecked_Deallocation;
+@@ -1023,7 +1023,7 @@
+         (Field_Array, Field_Array_Access);
+    begin
+       if FA /= null and then Free_Fields then
+-         for I in FA'First .. (FA'Last - 1) loop
++         for I in FA'First .. FA'Last - 1 loop
+             if FA.all (I) /= Null_Field then
+                Delete (FA.all (I));
+             end if;
+Index: doc/html/ada/terminal_interface-curses-menus__adb.htm
+--- ncurses-6.5-20250125+/doc/html/ada/terminal_interface-curses-menus__adb.htm	2022-01-15 20:50:51.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/ada/terminal_interface-curses-menus__adb.htm	2025-02-02 00:44:01.000000000 +0000
+@@ -24,7 +24,7 @@
+ --                                 B O D Y                                  --
+ --                                                                          --
+ ------------------------------------------------------------------------------
+--- Copyright 2018,2020 Thomas E. Dickey                                     --
++-- Copyright 2018-2020,2025 Thomas E. Dickey                                --
+ -- Copyright 1999-2011,2014 Free Software Foundation, Inc.                  --
+ --                                                                          --
+ -- Permission is hereby granted, free of charge, to any person obtaining a  --
+@@ -53,8 +53,8 @@
+ ------------------------------------------------------------------------------
+ --  Author:  Juergen Pfeifer, 1996
+ --  Version Control:
+---  @Revision: 1.34 @
+---  @Date: 2020/02/02 23:34:34 @
++--  @Revision: 1.35 @
++--  @Date: 2025/01/24 20:39:23 @
+ --  Binding Version 01.00
+ ------------------------------------------------------------------------------
+ with Ada.Unchecked_Deallocation;
+@@ -895,7 +895,7 @@
+         (Item_Array, Item_Array_Access);
+    begin
+       if IA /= null and then Free_Items then
+-         for I in IA'First .. (IA'Last - 1) loop
++         for I in IA'First .. IA'Last - 1 loop
+             if IA.all (I) /= Null_Item then
+                Delete (IA.all (I));
+             end if;
+Index: doc/html/ada/terminal_interface-curses-panels-user_data__adb.htm
+--- ncurses-6.5-20250125+/doc/html/ada/terminal_interface-curses-panels-user_data__adb.htm	2022-01-15 20:50:51.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/ada/terminal_interface-curses-panels-user_data__adb.htm	2025-02-02 00:44:01.000000000 +0000
+@@ -24,7 +24,7 @@
+ --                                 B O D Y                                  --
+ --                                                                          --
+ ------------------------------------------------------------------------------
+--- Copyright 2020 Thomas E. Dickey                                          --
++-- Copyright 2020,2025 Thomas E. Dickey                                     --
+ -- Copyright 1999-2003,2009 Free Software Foundation, Inc.                  --
+ --                                                                          --
+ -- Permission is hereby granted, free of charge, to any person obtaining a  --
+@@ -53,7 +53,7 @@
+ ------------------------------------------------------------------------------
+ --  Author:  Juergen Pfeifer, 1996
+ --  Version Control:
+---  @Revision: 1.13 @
++--  @Revision: 1.14 @
+ --  Binding Version 01.00
+ ------------------------------------------------------------------------------
+ with Interfaces.C;
+Index: doc/html/man/curs_add_wch.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_add_wch.3x.html	2025-01-19 00:54:58.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_add_wch.3x.html	2025-02-02 00:43:56.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_add_wch.3x,v 1.88 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_add_wch.3x,v 1.102 2025/02/01 23:54:03 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_add_wch 3x 2025-01-18 ncurses 6.5 Library calls
++curs_add_wch 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                            curs_add_wch 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                            
++
                                                                                                                                                            curs_add_wch 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                            
+ 
                                                                                                                                                            + curs_add_wch(3x)                 Library calls                curs_add_wch(3x)
+ 
+@@ -58,11 +58,71 @@
+        int add_wch(const cchar_t *wch);
+        int wadd_wch(WINDOW *win, const cchar_t *wch);
+        int mvadd_wch(int y, int x, const cchar_t *wch);
+-       int mvwadd_wch(WINDOW *win, int y, int x, const cchar_t *wch);
++       int mvwadd_wch(WINDOW *win, int y, int x,
++             const cchar_t *wch);
+ 
+        int echo_wchar(const cchar_t *wch);
+        int wecho_wchar(WINDOW *win, const cchar_t *wch);
+ 
++       /* (integer) constants */
++       /* ... */ WACS_BLOCK;
++       /* ... */ WACS_BOARD;
++       /* ... */ WACS_BTEE;
++       /* ... */ WACS_BULLET;
++       /* ... */ WACS_CKBOARD;
++       /* ... */ WACS_DARROW;
++       /* ... */ WACS_DEGREE;
++       /* ... */ WACS_DIAMOND;
++       /* ... */ WACS_HLINE;
++       /* ... */ WACS_LANTERN;
++       /* ... */ WACS_LARROW;
++       /* ... */ WACS_LLCORNER;
++       /* ... */ WACS_LRCORNER;
++       /* ... */ WACS_LTEE;
++       /* ... */ WACS_PLMINUS;
++       /* ... */ WACS_PLUS;
++       /* ... */ WACS_RARROW;
++       /* ... */ WACS_RTEE;
++       /* ... */ WACS_S1;
++       /* ... */ WACS_S9;
++       /* ... */ WACS_TTEE;
++       /* ... */ WACS_UARROW;
++       /* ... */ WACS_ULCORNER;
++       /* ... */ WACS_URCORNER;
++       /* ... */ WACS_VLINE;
++       /* extensions */
++       /* ... */ WACS_GEQUAL;
++       /* ... */ WACS_LEQUAL;
++       /* ... */ WACS_NEQUAL;
++       /* ... */ WACS_PI;
++       /* ... */ WACS_S3;
++       /* ... */ WACS_S7;
++       /* ... */ WACS_STERLING;
++       /* extensions for thick lines */
++       /* ... */ WACS_T_BTEE;
++       /* ... */ WACS_T_HLINE;
++       /* ... */ WACS_T_LLCORNER;
++       /* ... */ WACS_T_LRCORNER;
++       /* ... */ WACS_T_LTEE;
++       /* ... */ WACS_T_PLUS;
++       /* ... */ WACS_T_RTEE;
++       /* ... */ WACS_T_TTEE;
++       /* ... */ WACS_T_ULCORNER;
++       /* ... */ WACS_T_URCORNER;
++       /* ... */ WACS_T_VLINE;
++       /* extensions for double lines */
++       /* ... */ WACS_D_BTEE;
++       /* ... */ WACS_D_HLINE;
++       /* ... */ WACS_D_LLCORNER;
++       /* ... */ WACS_D_LRCORNER;
++       /* ... */ WACS_D_LTEE;
++       /* ... */ WACS_D_PLUS;
++       /* ... */ WACS_D_RTEE;
++       /* ... */ WACS_D_TTEE;
++       /* ... */ WACS_D_ULCORNER;
++       /* ... */ WACS_D_URCORNER;
++       /* ... */ WACS_D_VLINE;
++
+ 
+ 
                                                                                                                                                            DESCRIPTION
                                                                                                                                                            + 
+@@ -154,74 +214,74 @@
+                        Unicode   ACS       acsc
+        Symbol          Default   Default   char   Glyph Name
+        ------------------------------------------------------------------------
+-       WACS_BLOCK      0x25ae    #         0      solid square block
+-       WACS_BOARD      0x2592    #         h      board of squares
+-       WACS_BTEE       0x2534    +         v      bottom tee
+-       WACS_BULLET     0x00b7    o         ~      bullet
+-       WACS_CKBOARD    0x2592    :         a      checker board (stipple)
+-       WACS_DARROW     0x2193    v         .      arrow pointing down
+-       WACS_DEGREE     0x00b0    '         f      degree symbol
+-       WACS_DIAMOND    0x25c6    +         `      diamond
+-       WACS_GEQUAL     0x2265    >         >      greater-than-or-equal-to
+-       WACS_HLINE      0x2500    -         q      horizontal line
+-       WACS_LANTERN    0x2603    #         i      lantern symbol
+-       WACS_LARROW     0x2190    <         ,      arrow pointing left
+-       WACS_LEQUAL     0x2264    <         y      less-than-or-equal-to
+-       WACS_LLCORNER   0x2514    +         m      lower left-hand corner
+-       WACS_LRCORNER   0x2518    +         j      lower right-hand corner
+-       WACS_LTEE       0x2524    +         t      left tee
+-       WACS_NEQUAL     0x2260    !         |      not-equal
+-       WACS_PI         0x03c0    *         {      greek pi
+-       WACS_PLMINUS    0x00b1    #         g      plus/minus
+-       WACS_PLUS       0x253c    +         n      plus
+-       WACS_RARROW     0x2192    >         +      arrow pointing right
+-       WACS_RTEE       0x251c    +         u      right tee
+-       WACS_S1         0x23ba    -         o      scan line 1
+-       WACS_S3         0x23bb    -         p      scan line 3
+-       WACS_S7         0x23bc    -         r      scan line 7
+-       WACS_S9         0x23bd    _         s      scan line 9
+-       WACS_STERLING   0x00a3    f         }      pound-sterling symbol
+-
+-       WACS_TTEE       0x252c    +         w      top tee
+-       WACS_UARROW     0x2191    ^         -      arrow pointing up
+-       WACS_ULCORNER   0x250c    +         l      upper left-hand corner
+-       WACS_URCORNER   0x2510    +         k      upper right-hand corner
+-       WACS_VLINE      0x2502    |         x      vertical line
++       WACS_BLOCK      U+25ae    #         0      solid square block
++       WACS_BOARD      U+2592    #         h      board of squares
++       WACS_BTEE       U+2534    +         v      bottom tee
++       WACS_BULLET     U+00b7    o         ~      bullet
++       WACS_CKBOARD    U+2592    :         a      checker board (stipple)
++       WACS_DARROW     U+2193    v         .      arrow pointing down
++       WACS_DEGREE     U+00b0    '         f      degree symbol
++       WACS_DIAMOND    U+25c6    +         `      diamond
++       WACS_GEQUAL     U+2265    >         >      greater-than-or-equal-to
++       WACS_HLINE      U+2500    -         q      horizontal line
++       WACS_LANTERN    U+2603    #         i      lantern symbol
++       WACS_LARROW     U+2190    <         ,      arrow pointing left
++       WACS_LEQUAL     U+2264    <         y      less-than-or-equal-to
++       WACS_LLCORNER   U+2514    +         m      lower left-hand corner
++       WACS_LRCORNER   U+2518    +         j      lower right-hand corner
++       WACS_LTEE       U+2524    +         t      left tee
++       WACS_NEQUAL     U+2260    !         |      not-equal
++       WACS_PI         U+03c0    *         {      greek pi
++       WACS_PLMINUS    U+00b1    #         g      plus/minus
++       WACS_PLUS       U+253c    +         n      plus
++       WACS_RARROW     U+2192    >         +      arrow pointing right
++       WACS_RTEE       U+251c    +         u      right tee
++       WACS_S1         U+23ba    -         o      scan line 1
++       WACS_S3         U+23bb    -         p      scan line 3
++       WACS_S7         U+23bc    -         r      scan line 7
++       WACS_S9         U+23bd    _         s      scan line 9
++       WACS_STERLING   U+00a3    f         }      pound-sterling symbol
++       WACS_TTEE       U+252c    +         w      top tee
++       WACS_UARROW     U+2191    ^         -      arrow pointing up
++       WACS_ULCORNER   U+250c    +         l      upper left-hand corner
++       WACS_URCORNER   U+2510    +         k      upper right-hand corner
++
++       WACS_VLINE      U+2502    |         x      vertical line
+ 
+-       The wide-character configuration of ncurses also  defines  symbols  for
+-       thick lines (acsc "J" to "V"):
++       The ncurses wide API also defines symbols for  thick  lines  (acsc  "J"
++       through "N", "T" through "X", and "Q"):
+ 
+                          Unicode   ASCII     acsc
+        ACS Name          Default   Default   Char   Glyph Name
+        ------------------------------------------------------------------------
+-       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
+-       WACS_T_LRCORNER   0x251b    +         J      thick lower right corner
+-       WACS_T_LTEE       0x252b    +         T      thick tee pointing right
+-       WACS_T_PLUS       0x254b    +         N      thick large plus
+-       WACS_T_RTEE       0x2523    +         U      thick tee pointing left
+-       WACS_T_TTEE       0x2533    +         W      thick tee pointing down
+-       WACS_T_ULCORNER   0x250f    +         L      thick upper left corner
+-       WACS_T_URCORNER   0x2513    +         K      thick upper right corner
+-       WACS_T_VLINE      0x2503    |         X      thick vertical line
++       WACS_T_BTEE       U+253b    +         V      thick tee pointing up
++       WACS_T_HLINE      U+2501    -         Q      thick horizontal line
++       WACS_T_LLCORNER   U+2517    +         M      thick lower left corner
++       WACS_T_LRCORNER   U+251b    +         J      thick lower right corner
++       WACS_T_LTEE       U+252b    +         T      thick tee pointing right
++       WACS_T_PLUS       U+254b    +         N      thick large plus
++       WACS_T_RTEE       U+2523    +         U      thick tee pointing left
++       WACS_T_TTEE       U+2533    +         W      thick tee pointing down
++       WACS_T_ULCORNER   U+250f    +         L      thick upper left corner
++       WACS_T_URCORNER   U+2513    +         K      thick upper right corner
++       WACS_T_VLINE      U+2503    |         X      thick vertical line
+ 
+-       and for double-lines (acsc "A" to "I"):
++       and for double lines (acsc "A" through "I", plus "R" and "Y"):
+ 
+                          Unicode   ASCII     acsc
+        ACS Name          Default   Default   Char   Glyph Name
+        ------------------------------------------------------------------------
+-       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
+-       WACS_D_LRCORNER   0x255d    +         A      double lower right corner
+-       WACS_D_LTEE       0x2560    +         F      double tee pointing right
+-       WACS_D_PLUS       0x256c    +         E      double large plus
+-       WACS_D_RTEE       0x2563    +         G      double tee pointing left
+-       WACS_D_TTEE       0x2566    +         I      double tee pointing down
+-       WACS_D_ULCORNER   0x2554    +         C      double upper left corner
+-       WACS_D_URCORNER   0x2557    +         B      double upper right corner
+-       WACS_D_VLINE      0x2551    |         Y      double vertical line
++       WACS_D_BTEE       U+2569    +         H      double tee pointing up
++       WACS_D_HLINE      U+2550    -         R      double horizontal line
++       WACS_D_LLCORNER   U+255a    +         D      double lower left corner
++       WACS_D_LRCORNER   U+255d    +         A      double lower right corner
++       WACS_D_LTEE       U+2560    +         F      double tee pointing right
++       WACS_D_PLUS       U+256c    +         E      double large plus
++       WACS_D_RTEE       U+2563    +         G      double tee pointing left
++       WACS_D_TTEE       U+2566    +         I      double tee pointing down
++       WACS_D_ULCORNER   U+2554    +         C      double upper left corner
++       WACS_D_URCORNER   U+2557    +         B      double upper right corner
++       WACS_D_VLINE      U+2551    |         Y      double vertical line
+ 
+        Unicode's  descriptions  for  these  characters  differs  slightly from
+        ncurses, by introducing the term "light"  (along  with  less  important
+@@ -242,84 +302,91 @@
+ 
+        o   the curses screen has not been initialized,
+ 
+-       o   win is NULL,
++       o   (for functions taking a WINDOW pointer  argument)  win  is  a  null
++           pointer,
+ 
+-       o   wrapping to a new line is impossible because scrollok(3x)  has  not
+-           been  called  on  win  when writing to its bottom right location is
+-           attempted, or
++       o   wrapping  to  a new line is impossible because scrollok(3x) has not
++           been called on win (or stdscr, as applicable) when writing  to  its
++           bottom right location is attempted, or
+ 
+-       o   it is not possible to  add  a  complete  character  at  the  cursor
++       o   it  is  not  possible  to  add  a  complete character at the cursor
+            position.
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
++       Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                            NOTES
                                                                                                                                                            +-       add_wch, mvadd_wch, mvwadd_wch, and echo_wchar may  be  implemented  as
++       add_wch,  mvadd_wch,  mvwadd_wch,  and echo_wchar may be implemented as
+        macros.
+ 
+ 
+ 
                                                                                                                                                            EXTENSIONS
                                                                                                                                                            +-
+-
                                                                                                                                                            TABSIZE
                                                                                                                                                            +-       The  TABSIZE  variable  is  implemented  in  SVr4 and other versions of
+-       curses, but is not specified by X/Open Curses (see curs_variables(3x)).
++       The  symbols  (WACS_S3,  WACS_S7,  WACS_LEQUAL,  WACS_GEQUAL,  WACS_PI,
++       WACS_NEQUAL,  and  WACS_STERLING)  are  not  standard.   However,  many
++       publicly  available   terminfo   entries   include   acs_chars   (acsc)
++       capabilities  in which their key characters (pryz{|}) are embedded, and
++       a second-hand list of their character descriptions has come  to  light.
++       The ncurses developers invented WACS-prefixed names for them.
+ 
+ 
+ 
                                                                                                                                                            PORTABILITY
                                                                                                                                                            ++       Applications employing ncurses extensions should condition their use on
++       the visibility of the NCURSES_VERSION preprocessor macro.
++
+        These functions are described in X/Open Curses Issue 4.   It  specifies
+        no error conditions for them.
+ 
+        The  defaults specified for forms-drawing characters apply in the POSIX
+        locale.  X/Open Curses makes it clear that the WACS_ symbols should  be
+-       defined  as  a  pointer  to  cchar_t  data,  e.g., in the discussion of
+-       border_set.  A few implementations are problematic:
++       defined  as  a  pointer  to  cchar_t  data,  e.g., in the discussion of
++       border_set.  A few implementations are problematic:
+ 
+-       o   NetBSD curses defines the symbols as a wchar_t within a cchar_t.
++       o   NetBSD curses defines the symbols as a wchar_t within a cchar_t.
+ 
+-       o   HP-UX curses equates some of the  ACS_  symbols  to  the  analogous
+-           WACS_  symbols  as  if  the ACS_ symbols were wide characters.  The
++       o   HP-UX 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.
+ 
+        X/Open  Curses  does  not  specify  symbols for thick- or double-lines.
+-       SVr4 curses implementations defined their line-drawing symbols in terms
+-       of  intermediate  symbols.   This implementation extends those symbols,
+-       providing new definitions which are not in the SVr4 implementations.
++       SVr4 curses implementations defined their line-drawing symbols in terms
++       of  intermediate symbols.  ncurses extends those symbols, providing new
++       definitions not found in SVr4 implementations.
+ 
+        Not all  Unicode-capable  terminals  provide  support  for  VT100-style
+-       alternate  character  sets  (i.e.,  the  acsc  capability),  with their
+-       corresponding line-drawing characters.  X/Open Curses did  not  address
+-       the   aspect  of  integrating  Unicode  with  line-drawing  characters.
+-       Existing implementations of Unix curses (AIX, HP-UX, Solaris) use  only
+-       the acsc character-mapping to provide this feature.  As a result, those
+-       implementations  can  only  use  single-byte  line-drawing  characters.
+-       ncurses  5.3  (2002)  provided a table of Unicode values to solve these
+-       problems.  NetBSD curses incorporated that table in 2010.
+-
+-       In this implementation, the Unicode values  are  used  instead  of  the
+-       terminal description's acsc mapping as discussed in ncurses(3x) for the
+-       environment variable NCURSES_NO_UTF8_ACS.  In contrast,  for  the  same
+-       cases, the line-drawing characters described in addch(3x) will use only
+-       the ASCII default values.
++       alternate character sets (i.e., the acsc_chars (acsc) capability), with
++       their corresponding line-drawing characters.   X/Open  Curses  did  not
++       address the aspect of integrating Unicode with line-drawing characters.
++       Existing implementations of System V curses (AIX, HP-UX,  Solaris)  use
++       only  the  acsc_chars (acsc) character-mapping to provide this feature.
++       As a result, those  implementations  can  use  only  single-byte  line-
++       drawing  characters.   ncurses  5.3  (2002) provided a table of Unicode
++       values to solve these problems.  NetBSD curses incorporated that  table
++       in 2010.
++
++       ncurses   uses   the  Unicode  values  instead  of  the  terminal  type
++       description's acsc_chars (acsc) mapping as discussed in ncurses(3x) for
++       the  environment  variable  NCURSES_NO_UTF8_ACS.   In contrast, for the
++       same cases, the line-drawing characters described in addch(3x) will use
++       only the ASCII default values.
+ 
+-       Having Unicode available does not solve all of the problems with  line-
+-       drawing for curses:
++       Having  Unicode available does not solve all of the problems with line-
++       drawing for curses:
+ 
+-       o   The  closest  Unicode  equivalents to the VT100 graphics S1, S3, S7
+-           and S9 frequently are not displayed at the regular intervals  which
++       o   The closest Unicode equivalents to the VT100 graphics S1,  S3,  S7,
++           and  S9 frequently are not displayed at the regular intervals which
+            the terminal used.
+ 
+-       o   The  lantern  is  a special case.  It originated with the AT&T 4410
+-           terminal in the early 1980s.  There is no accessible  documentation
++       o   The lantern is a special case.  It originated with  the  AT&T  4410
++           terminal  in the early 1980s.  There is no accessible documentation
+            depicting the lantern symbol on the AT&T terminal.
+ 
+            Lacking documentation, most readers assume that a storm lantern was
+            intended.  But there are several possibilities, all with problems.
+ 
+-           Unicode 6.0 (2010) does provide two lantern  symbols:  U+1F383  and
+-           U+1F3EE.   Those  were  not  available  in 2002, and are irrelevant
++           Unicode  6.0  (2010)  does provide two lantern symbols: U+1F383 and
++           U+1F3EE.  Those were not available  in  2002,  and  are  irrelevant
+            since they lie outside the Basic Multilingual Plane and as a result
+            are unavailable on many terminals.  They are not storm lanterns, in
+            any case.
+@@ -327,20 +394,20 @@
+            Most storm lanterns have a tapering glass chimney (to guard against
+            tipping); some have a wire grid protecting the chimney.
+ 
+-           For  the  tapering  appearance,   U+2603 was adequate.  In use on a
++           For the tapering appearance,  U+2603 was adequate.   In  use  on  a
+            terminal, no one can tell what the image represents.  Unicode calls
+            it a snowman.
+ 
+            Others have suggested these alternatives: <section> U+00A7 (section
+-           mark), <Theta> U+0398 (theta), <Phi> U+03A6 (phi),  <delta>  U+03B4
++           mark),  <Theta>  U+0398 (theta), <Phi> U+03A6 (phi), <delta> U+03B4
+            (delta),  U+2327 (x in a rectangle),  U+256C (forms double vertical
+            and horizontal), and  U+2612 (ballot box with x).
+ 
+ 
+ 
                                                                                                                                                            Complex Characters
                                                                                                                                                            +-       The complex character  type  cchar_t  can  store  more  than  one  wide
+-       character  (wchar_t).  X/Open Curses does not mention this possibility,
+-       specifying behavior only  where  wch  is  a  single  character,  either
++       The  complex  character  type  cchar_t  can  store  more  than one wide
++       character (wchar_t).  X/Open Curses does not mention this  possibility,
++       specifying  behavior  only  where  wch  is  a  single character, either
+        spacing or non-spacing.
+ 
+        ncurses assumes that wch is constructed using setcchar(3x), and in turn
+@@ -351,18 +418,25 @@
+ 
+        o   holds one non-spacing character.
+ 
+-       In  the  latter  case,  ncurses  adds  the non-spacing character to the
++       In the latter case, ncurses  adds  the  non-spacing  character  to  the
+        active complex character.
+ 
+ 
+ 
                                                                                                                                                            HISTORY
                                                                                                                                                            +-       These functions were  initially  specified  by  X/Open  Curses  Issue 4
+-       (1995).   The  System V Interface Definition Version 4 of the same year
+-       specified  functions  named  waddwch  and  wechowchar  (and  the  usual
+-       variants).   These were later additions to SVr4.x, not appearing in the
+-       first SVr4 (1989).  They differed  from  X/Open's  later  wadd_wch  and
+-       wecho_wchar  in that they each took an argument of type wchar_t instead
+-       of cchar_t.
++       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
++       System V  Interface  Definition  (SVID)  Version 4  of  the  same  year
++       specified  functions named waddwch (and the usual variants), echowchar,
++       and wechowchar.  These were later additions to SVr4.x, not appearing in
++       the  first SVr4 (1989).  They differed from X/Open's later wadd_wch and
++       wecho_wchar in that they each took an argument of type wchar_t  instead
++       of cchar_t.  SVID defined no  WACS_ symbols.
++
++       X/Open  Curses  Issue 4  also  defined  many  of  the  WACS_ constants,
++       excepting  WACS_GEQUAL,  WACS_LEQUAL,  WACS_NEQUAL,  WACS_PI,  WACS_S3,
++       WACS_S7,  and  WACS_STERLING;  and  those  for drawing thick and double
++       lines.
++
++       ncurses 5.3 (2002) furnished the remaining WACS_ constants.
+ 
+ 
+ 
                                                                                                                                                            SEE ALSO
                                                                                                                                                            +@@ -375,7 +449,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                  curs_add_wch(3x)
++ncurses 6.5                       2025-02-01                  curs_add_wch(3x)
+ 
                                                                                                                                                            
+ 
                                                                                                                                                            
+ 
                                                                                                                                                              
+@@ -390,11 +464,7 @@
+ 
+ 
                                                                                                                                                            • RETURN VALUE
                                                                                                                                                              • 
+ 
                                                                                                                                                            • NOTES
                                                                                                                                                              • 
+-
                                                                                                                                                            • EXTENSIONS
+-
+-
                                                                                                                                                              • 
++
                                                                                                                                                            • EXTENSIONS
                                                                                                                                                              • 
+ 
                                                                                                                                                            • PORTABILITY
+ 
                                                                                                                                                                
+ 
                                                                                                                                                              • Complex Characters
                                                                                                                                                                • 
+Index: doc/html/man/curs_add_wchstr.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_add_wchstr.3x.html	2025-01-19 00:54:58.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_add_wchstr.3x.html	2025-02-02 00:43:56.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_add_wchstr.3x,v 1.52 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_add_wchstr.3x,v 1.55 2025/02/01 22:57:57 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_add_wchstr 3x 2025-01-18 ncurses 6.5 Library calls
++curs_add_wchstr 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                curs_add_wchstr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                
++
                                                                                                                                                                curs_add_wchstr 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                
+ 
                                                                                                                                                                + curs_add_wchstr(3x)              Library calls             curs_add_wchstr(3x)
+ 
+@@ -118,12 +118,12 @@
+ 
+ 
+ 
                                                                                                                                                                HISTORY
                                                                                                                                                                +-       These functions were initially specified by X/Open Curses Issue 4.  The
+-       System V  Interface  Definition  Version 4  (1995), specified functions
+-       named waddwchstr and waddwchnstr (and the usual variants).  These  were
+-       later  additions  to  SVr4.x,  not  appearing in the first SVr4 (1989).
+-       They differed from X/Open's later wadd_wchstr and wadd_wchnstr in  that
+-       they each took an argument of type wchar_t instead of cchar_t.
++       X/Open Curses Issue 4 (1995) initially specified these functions.   The
++       System V  Interface  Definition  Version 4  of  the same year specified
++       functions named waddwchstr and waddwchnstr (and  the  usual  variants).
++       These  were  later additions to SVr4.x, not appearing in the first SVr4
++       (1989).  They differed from X/Open's later wadd_wchstr and wadd_wchnstr
++       in that they each took an argument of type wchar_t instead of cchar_t.
+ 
+ 
+ 
                                                                                                                                                                SEE ALSO
                                                                                                                                                                +@@ -134,7 +134,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18               curs_add_wchstr(3x)
++ncurses 6.5                       2025-02-01               curs_add_wchstr(3x)
+ 
                                                                                                                                                                
+ 
                                                                                                                                                                
+ 
                                                                                                                                                                  
+Index: doc/html/man/curs_addch.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_addch.3x.html	2025-01-19 00:54:58.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_addch.3x.html	2025-02-02 00:43:57.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addch.3x,v 1.113 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_addch.3x,v 1.122 2025/02/01 23:54:03 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addch 3x 2025-01-18 ncurses 6.5 Library calls
++curs_addch 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                  curs_addch 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                  
++
                                                                                                                                                                  curs_addch 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                  
+ 
                                                                                                                                                                  + curs_addch(3x)                   Library calls                  curs_addch(3x)
+ 
+@@ -63,6 +63,41 @@
+        int echochar(const chtype ch);
+        int wechochar(WINDOW *win, const chtype ch);
+ 
++       /* (integer) constants */
++       /* ... */ ACS_BLOCK;
++       /* ... */ ACS_BOARD;
++       /* ... */ ACS_BTEE;
++       /* ... */ ACS_BULLET;
++       /* ... */ ACS_CKBOARD;
++       /* ... */ ACS_DARROW;
++       /* ... */ ACS_DEGREE;
++       /* ... */ ACS_DIAMOND;
++       /* ... */ ACS_HLINE;
++       /* ... */ ACS_LANTERN;
++       /* ... */ ACS_LARROW;
++       /* ... */ ACS_LLCORNER;
++       /* ... */ ACS_LRCORNER;
++       /* ... */ ACS_LTEE;
++       /* ... */ ACS_PLMINUS;
++       /* ... */ ACS_PLUS;
++       /* ... */ ACS_RARROW;
++       /* ... */ ACS_RTEE;
++       /* ... */ ACS_S1;
++       /* ... */ ACS_S9;
++       /* ... */ ACS_TTEE;
++       /* ... */ ACS_UARROW;
++       /* ... */ ACS_ULCORNER;
++       /* ... */ ACS_URCORNER;
++       /* ... */ ACS_VLINE;
++       /* extensions */
++       /* ... */ ACS_GEQUAL;
++       /* ... */ ACS_LEQUAL;
++       /* ... */ ACS_NEQUAL;
++       /* ... */ ACS_PI;
++       /* ... */ ACS_S3;
++       /* ... */ ACS_S7;
++       /* ... */ ACS_STERLING;
++
+ 
+ 
                                                                                                                                                                  DESCRIPTION
                                                                                                                                                                  + 
+@@ -144,6 +179,7 @@
+        ------------------------------------------------------------------------
+        ACS_BLOCK      #         0      solid square block
+        ACS_BOARD      #         h      board of squares
++
+        ACS_BTEE       +         v      bottom tee
+        ACS_BULLET     o         ~      bullet
+        ACS_CKBOARD    :         a      checker board (stipple)
+@@ -183,26 +219,27 @@
+ 
+        o   the curses screen has not been initialized,
+ 
+-       o   win is NULL,
++       o   (for functions taking a WINDOW pointer  argument)  win  is  a  null
++           pointer,
+ 
+-       o   wrapping to a new line is impossible because scrollok(3x)  has  not
+-           been  called  on  win  when a write to its bottom right location is
+-           attempted, or
++       o   wrapping  to  a new line is impossible because scrollok(3x) has not
++           been called on win (or stdscr, as applicable) when a write  to  its
++           bottom right location is attempted, or
+ 
+-       o   it is not possible to  add  a  complete  character  at  the  cursor
++       o   it  is  not  possible  to  add  a  complete character at the cursor
+            position.
+ 
+        The last may be due to different causes:
+ 
+-       o   conversion  of  a  wide character to a multibyte character sequence
++       o   conversion of a wide character to a  multibyte  character  sequence
+            can fail, or
+ 
+-       o   at least one of the bytes resulting from wide character  conversion
+-           to  a  multibyte  character sequence cannot be added to the window.
+-           See section "PORTABILITY" below regarding the use  of  waddch  with
++       o   at  least one of the bytes resulting from wide character conversion
++           to a multibyte character sequence cannot be added  to  the  window.
++           See  section  "PORTABILITY"  below regarding the use of waddch with
+            wide characters.
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
++       Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+@@ -211,10 +248,13 @@
+ 
+ 
+ 
                                                                                                                                                                  EXTENSIONS
                                                                                                                                                                  +-
+-
                                                                                                                                                                  TABSIZE
                                                                                                                                                                  +-       SVr4 and other versions of curses implement the TABSIZE  variable,  but
+-       X/Open Curses does not specify it; see curs_variables(3x).
++       The   symbols   (ACS_S3,   ACS_S7,   ACS_LEQUAL,   ACS_GEQUAL,  ACS_PI,
++       ACS_NEQUAL, and ACS_STERLING)  were  not  documented  in  any  publicly
++       released  System V  and  are  not  standard.   However,  many  publicly
++       available terminfo entries include  acs_chars  (acsc)  capabilities  in
++       which  their  key  characters (pryz{|}) are embedded, and a second-hand
++       list of their character descriptions has come to  light.   The  ncurses
++       developers invented ACS-prefixed names for them.
+ 
+ 
+ 
                                                                                                                                                                  PORTABILITY
                                                                                                                                                                  +@@ -232,23 +272,23 @@
+ 
+ 
+ 
                                                                                                                                                                  ACS Symbols
                                                                                                                                                                  +-       X/Open  Curses  states  that  the  ACS_ definitions are char constants.
++       X/Open  Curses  states  that  the  ACS_ definitions are char constants.
+        Some implementations are problematic.
+ 
+        o   Solaris curses, for example, defines the ACS symbols as  constants;
+            others define them as elements of an array.
+ 
+-           This  implementation  uses  an  array, acs_map, as did SVr4 curses.
+-           NetBSD also uses an array, actually named _acs_char, with a #define
+-           for compatibility.
++           SVr4  used  an array, acs_map, as does ncurses.  NetBSD curses also
++           uses an array, actually  named  _acs_char,  with  a  "#define"  for
++           compatibility.
+ 
+-       o   HP-UX  curses  equates  some  of  the ACS_ symbols to the analogous
+-           WACS_ symbols as if the ACS_  symbols  were  wide  characters  (see
++       o   HP-UX  curses  equates  some  of  the ACS_ symbols to the analogous
++           WACS_ symbols as if the ACS_  symbols  were  wide  characters  (see
+            curs_add_wch(3x)).   The  misdefined  symbols  are  the  arrows and
+            others that are not used for line drawing.
+ 
+        o   X/Open Curses (Issues 2 through 7) has a  typographical  error  for
+-           the  ACS_LANTERN  symbol,  equating  its  "VT100+ Character" to "I"
++           the  ACS_LANTERN  symbol,  equating  its  "VT100+ Character" to "I"
+            (capital I), while the header  files  for  SVr4  curses  and  other
+            implementations use "i" (small i).
+ 
+@@ -258,15 +298,7 @@
+            other hand, its gs6300 (AT&T PC6300 with EMOTS  Terminal  Emulator)
+            description uses lowercase i.
+ 
+-       Some  ACS  symbols  (ACS_S3,  ACS_S7,  ACS_LEQUAL,  ACS_GEQUAL, ACS_PI,
+-       ACS_NEQUAL, and ACS_STERLING)  were  not  documented  in  any  publicly
+-       released  System V.   However, many publicly available terminfo entries
+-       include acsc capabilities in which their key characters  (pryz{|})  are
+-       embedded,  and  a  second-hand list of their character descriptions has
+-       come to light.  The ncurses developers invented ACS-prefixed names  for
+-       them.
+-
+-       The displayed values of ACS_ constants depend on
++       The displayed values of ACS_ constants depend on
+ 
+        o   the  ncurses  ABI--for  example,  wide-character  versus  non-wide-
+            character configurations  (the  former  is  capable  of  displaying
+@@ -280,23 +312,23 @@
+ 
+ 
+ 
                                                                                                                                                                  Character Set
                                                                                                                                                                  +-       X/Open  Curses  assumes  that the parameter passed to waddch contains a
++       X/Open  Curses  assumes  that the parameter passed to waddch contains a
+        single character.  That character may have been more  than  eight  bits
+        wide  in  an  SVr3 or SVr4 implementation, but X/Open Curses leaves the
+        width of a non-wide character code unspecified.  The  standard  further
+        does  not specify the internal structure of a chtype, though the use of
+        bit operations to combine the character  code  with  attributes  and  a
+-       color pair identifier into a chtype for passage to waddch is common.  A
++       color pair identifier into a chtype for passage to waddch is common.  A
+        portable application uses only the macros discussed in curs_attr(3x) to
+        manipulate a chtype.
+ 
+        In ncurses, chtype holds an eight-bit character, but the library allows
+        a multibyte character sequence to be passed via a succession  of  calls
+-       to  waddch.   Other  implementations  do  not;  a waddch call transmits
++       to  waddch.   Other  implementations  do  not;  a waddch call transmits
+        exactly one character, which may be rendered  in  one  or  more  screen
+        locations  depending  on  whether  it  is  printable  (see unctrl(3x)).
+        Depending on the locale, ncurses  inspects  the  byte  passed  in  each
+-       waddch  call  and  checks whether the latest call continues a multibyte
++       waddch  call  and  checks whether the latest call continues a multibyte
+        character.   When  a  character  is  complete,  ncurses  displays   the
+        character   and  advances  the  cursor.   If  the  calling  application
+        interrupts the succession of bytes in a multibyte character sequence by
+@@ -313,9 +345,13 @@
+ 
+ 
+ 
                                                                                                                                                                  HISTORY
                                                                                                                                                                  +-       4BSD (1980) curses introduced waddch.
++       4BSD (1980) introduced waddch and its variants.
+ 
+-       SVr3 (1987) added wechochar.
++       SVr3 (1987) added the echochar and wechochar functions and most of  the
++       ACS_  constants, except for ACS_GEQUAL, ACS_LEQUAL, ACS_NEQUAL, ACS_PI,
++       ACS_S3, ACS_S7, and ACS_STERLING.
++
++       ncurses 1.9.6 (1995) furnished the remaining ACS_ constants.
+ 
+ 
+ 
                                                                                                                                                                  SEE ALSO
                                                                                                                                                                  +@@ -328,7 +364,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                    curs_addch(3x)
++ncurses 6.5                       2025-02-01                    curs_addch(3x)
+ 
                                                                                                                                                                  
+ 
                                                                                                                                                                  
+ 
                                                                                                                                                                    
+@@ -343,11 +379,7 @@
+ 
+ 
                                                                                                                                                                  • RETURN VALUE
                                                                                                                                                                    • 
+ 
                                                                                                                                                                  • NOTES
                                                                                                                                                                    • 
+-
                                                                                                                                                                  • EXTENSIONS
+-
+-
                                                                                                                                                                    • 
++
                                                                                                                                                                  • EXTENSIONS
                                                                                                                                                                    • 
+ 
                                                                                                                                                                  • PORTABILITY
+ 
                                                                                                                                                                      
+ 
                                                                                                                                                                    • ACS Symbols
                                                                                                                                                                      • 
+Index: doc/html/man/curs_addchstr.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_addchstr.3x.html	2025-01-19 00:54:58.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_addchstr.3x.html	2025-02-02 00:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addchstr.3x,v 1.58 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_addchstr.3x,v 1.60 2025/02/01 22:50:42 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addchstr 3x 2025-01-18 ncurses 6.5 Library calls
++curs_addchstr 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                      curs_addchstr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                      
++
                                                                                                                                                                      curs_addchstr 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                      
+ 
                                                                                                                                                                      + curs_addchstr(3x)                Library calls               curs_addchstr(3x)
+ 
+@@ -114,7 +114,7 @@
+ 
+ 
+ 
                                                                                                                                                                      HISTORY
                                                                                                                                                                      +-       SVr3.1 (1987) introduced waddchstr and waddchnstr.
++       SVr3.1 (1987) introduced these functions.
+ 
+ 
+ 
                                                                                                                                                                      SEE ALSO
                                                                                                                                                                      +@@ -125,7 +125,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                 curs_addchstr(3x)
++ncurses 6.5                       2025-02-01                 curs_addchstr(3x)
+ 
                                                                                                                                                                      
+ 
                                                                                                                                                                      
+ 
                                                                                                                                                                        
+Index: doc/html/man/curs_addstr.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_addstr.3x.html	2025-01-19 00:54:58.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_addstr.3x.html	2025-02-02 00:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addstr.3x,v 1.65 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_addstr.3x,v 1.67 2025/02/01 22:48:11 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addstr 3x 2025-01-18 ncurses 6.5 Library calls
++curs_addstr 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                        curs_addstr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                        
++
                                                                                                                                                                        curs_addstr 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                        
+ 
                                                                                                                                                                        + curs_addstr(3x)                  Library calls                 curs_addstr(3x)
+ 
+@@ -102,8 +102,8 @@
+ 
+ 
+ 
                                                                                                                                                                        HISTORY
                                                                                                                                                                        +-       4BSD  (1980)  curses  introduced  waddstr  along with its variants, the
+-       latter defined as macros.
++       4BSD  (1980)  introduced  waddstr  along  with its variants, the latter
++       defined as macros.
+ 
+        SVr3.1 (1987) added waddnstr (and its variants) redefining waddstr as a
+        macro wrapping it.
+@@ -117,7 +117,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                   curs_addstr(3x)
++ncurses 6.5                       2025-02-01                   curs_addstr(3x)
+ 
                                                                                                                                                                        
+ 
                                                                                                                                                                        
+ 
                                                                                                                                                                          
+Index: doc/html/man/curs_addwstr.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_addwstr.3x.html	2025-01-19 00:54:58.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_addwstr.3x.html	2025-02-02 00:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addwstr.3x,v 1.56 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_addwstr.3x,v 1.58 2025/02/01 22:54:32 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addwstr 3x 2025-01-18 ncurses 6.5 Library calls
++curs_addwstr 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                          curs_addwstr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                          
++
                                                                                                                                                                          curs_addwstr 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                          
+ 
                                                                                                                                                                          + curs_addwstr(3x)                 Library calls                curs_addwstr(3x)
+ 
+@@ -105,22 +105,21 @@
+ 
+ 
+ 
                                                                                                                                                                          HISTORY
                                                                                                                                                                          +-       These  functions  were  initially  specified  by  X/Open Curses Issue 4
+-       (1995).  The System V Interface Definition Version 4 of the  same  year
+-       specified  functions  named  waddwstr  and  waddnwstr  (and  the  usual
+-       variants).  These were later additions to SVr4.x, not appearing in  the
+-       first SVr4 (1989).
++       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
++       System V Interface Definition Version 4  of  the  same  year  specified
++       functions named waddwstr and waddnwstr (and the usual variants).  These
++       were later additions to SVr4.x, not appearing in the first SVr4 (1989).
+ 
+ 
+ 
                                                                                                                                                                          SEE ALSO
                                                                                                                                                                          +-       curs_addstr(3x)  describes  comparable functions of the ncurses library
++       curs_addstr(3x) describes comparable functions of the  ncurses  library
+        in its non-wide-character configuration.
+ 
+        curses(3x), curs_add_wch(3x), curs_add_wchstr(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                  curs_addwstr(3x)
++ncurses 6.5                       2025-02-01                  curs_addwstr(3x)
+ 
                                                                                                                                                                          
+ 
                                                                                                                                                                          
+ 
                                                                                                                                                                            
+Index: doc/html/man/curs_attr.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_attr.3x.html	2025-01-19 00:54:58.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_attr.3x.html	2025-02-02 00:43:57.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_attr.3x,v 1.127 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_attr.3x,v 1.133 2025/02/01 23:59:36 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_attr 3x 2025-01-18 ncurses 6.5 Library calls
++curs_attr 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                            curs_attr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                            
++
                                                                                                                                                                            curs_attr 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                            
+ 
                                                                                                                                                                            + curs_attr(3x)                    Library calls                   curs_attr(3x)
+ 
+@@ -249,14 +249,14 @@
+ 
+ 
+ 
                                                                                                                                                                            NOTES
                                                                                                                                                                            +-       attr_on,  attr_off,  attr_set, wattr_set, chgat, mvchgat, mvwchgat, and
+-       color_set are  part  of  ncurses's  wide-character  API,  and  are  not
+-       available in its non-wide configuration.
++       attr_on,  attr_off,  attr_set,  wattr_set,  chgat,  mvchgat,  mvwchgat,
++       wchgat, and color_set are part of ncurses's wide-character API, and are
++       not available in its non-wide configuration.
+ 
+        attron,  wattron,  attroff,  wattroff, attrset, wattrset, standout, and
+        standend may be implemented as macros.
+ 
+-       Color pair values be logically "or"-ed  with  attributes  if  the  pair
++       Color pair values may be logically "or"-ed with attributes if the  pair
+        number is less than 256.  The alternate functions such as color_set can
+        pass a color pair value directly.  However, ncurses ABI 4 and 5  simply
+        logically "or" this value within the alternate functions.  You must use
+@@ -368,11 +368,11 @@
+ 
+ 
+ 
                                                                                                                                                                            HISTORY
                                                                                                                                                                            +-       4BSD  (1980)  curses used a char to represent each cell of the terminal
+-       screen.  It assumed 7-bit character codes, employing the eighth bit  of
+-       a  byte  to  represent  a standout attribute (often implemented as bold
+-       and/or reverse video).  It introduced  standout,  standend,  wstandout,
+-       and   wstandend  functions  to  manipulate  this  bit.   Despite  their
++       4BSD  (1980) used a char to represent each cell of the terminal screen.
++       It assumed 7-bit character codes, employing the eighth bit of a byte to
++       represent  a  standout  attribute  (often  implemented  as  bold and/or
++       reverse video).   It  introduced  standout,  standend,  wstandout,  and
++       wstandend   functions   to   manipulate   this   bit.    Despite  their
+        inflexibility, they carried over into System V  curses  and  ultimately
+        X/Open Curses due to their pervasive use in legacy applications.  While
+        some 1980s terminals supported  a  variety  of  video  attributes,  BSD
+@@ -392,17 +392,17 @@
+        SVr3.2 (1988) added the A_COLOR macro along with a  color  system;  see
+        curs_color(3x).
+ 
+-       X/Open  Curses is largely based on SVr4 curses, but recognized that the
+-       wchar_t type of ISO C95 was intended to house only a  single  character
+-       code,  not  a  sequence  of  codes combining with a base character, let
+-       alone could it reliably offer room for a color pair  identifier  and  a
+-       set  of  attribute bits with a potential for further growth -- thus the
+-       standard invented the curses  complex  character  type  cchar_t  and  a
+-       separate  type  attr_t  for  storage  of attribute bits.  The new types
+-       brought  along  several  new  functions  to   manipulate   them,   some
++       X/Open  Curses  Issue 4  (1995)  is  largely  based on SVr4 curses, but
++       recognized that the wchar_t type of ISO C95 was intended to house  only
++       a  single character code, not a sequence of codes combining with a base
++       character, let alone could it reliably offer  room  for  a  color  pair
++       identifier  and  a  set  of attribute bits with a potential for further
++       growth -- thus the standard invented the curses complex character  type
++       cchar_t  and a separate type attr_t for storage of attribute bits.  The
++       new types brought along several new functions to manipulate them,  some
+        corresponding  to  existing  chtype-based functions (attr_on, attr_off,
+-       attr_set, wattr_on, wattr_off, and wattr_set), and some new (color_set,
+-       wcolor_set, chgat, wchgat, mvchgat, and mvwchgat).
++       attr_set, wattr_on, wattr_off, and wattr_set), and some new (chgat  and
++       its variants, color_set, and wcolor_set).
+ 
+        Different  Unix systems used differently sized bit fields in chtype for
+        the character code and the color pair identifier, and took into account
+@@ -493,7 +493,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                     curs_attr(3x)
++ncurses 6.5                       2025-02-01                     curs_attr(3x)
+ 
                                                                                                                                                                            
+ 
                                                                                                                                                                            
+ 
                                                                                                                                                                              
+Index: doc/html/man/curs_beep.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_beep.3x.html	2025-01-19 00:54:58.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_beep.3x.html	2025-02-02 00:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_beep.3x,v 1.39 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_beep.3x,v 1.42 2025/02/01 23:46:11 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_beep 3x 2025-01-18 ncurses 6.5 Library calls
++curs_beep 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                              curs_beep 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                              
++
                                                                                                                                                                              curs_beep 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                              
+ 
                                                                                                                                                                              + curs_beep(3x)                    Library calls                   curs_beep(3x)
+ 
+@@ -85,12 +85,12 @@
+        X/Open Curses Issue 4 describes these functions.  It specifies no error
+        conditions for them.
+ 
+-       On SVr4 curses, they always return OK, and X/Open Curses specifies them
++       On SVr4 curses, they always return OK, and X/Open Curses specifies them
+        as doing so.
+ 
+ 
+ 
                                                                                                                                                                              HISTORY
                                                                                                                                                                              +-       beep and flash appeared in SVr2 (1984).
++       SVr2 (1984) introduced beep and flash.
+ 
+ 
+ 
                                                                                                                                                                              SEE ALSO
                                                                                                                                                                              +@@ -98,7 +98,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                     curs_beep(3x)
++ncurses 6.5                       2025-02-01                     curs_beep(3x)
+ 
                                                                                                                                                                              
+ 
                                                                                                                                                                              
+ 
                                                                                                                                                                                
+Index: doc/html/man/curs_bkgrnd.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_bkgrnd.3x.html	2025-01-19 00:54:58.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_bkgrnd.3x.html	2025-02-02 00:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_bkgrnd.3x,v 1.55 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_bkgrnd.3x,v 1.57 2025/02/01 22:54:32 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_bkgrnd 3x 2025-01-18 ncurses 6.5 Library calls
++curs_bkgrnd 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                curs_bkgrnd 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                
++
                                                                                                                                                                                curs_bkgrnd 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                
+ 
                                                                                                                                                                                + curs_bkgrnd(3x)                  Library calls                 curs_bkgrnd(3x)
+ 
+@@ -179,7 +179,7 @@
+ 
+ 
+ 
                                                                                                                                                                                HISTORY
                                                                                                                                                                                +-       These functions were initially specified by X/Open Curses Issue 4.
++       X/Open Curses Issue 4 (1995) initially specified these functions.
+ 
+ 
+ 
                                                                                                                                                                                SEE ALSO
                                                                                                                                                                                +@@ -190,7 +190,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                   curs_bkgrnd(3x)
++ncurses 6.5                       2025-02-01                   curs_bkgrnd(3x)
+ 
                                                                                                                                                                                
+ 
                                                                                                                                                                                
+ 
                                                                                                                                                                                  
+Index: doc/html/man/curs_border.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_border.3x.html	2025-01-19 00:54:58.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_border.3x.html	2025-02-02 00:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_border.3x,v 1.60 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_border.3x,v 1.63 2025/02/02 00:00:33 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_border 3x 2025-01-18 ncurses 6.5 Library calls
++curs_border 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                  curs_border 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                  
++
                                                                                                                                                                                  curs_border 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                  
+ 
                                                                                                                                                                                  + curs_border(3x)                  Library calls                 curs_border(3x)
+ 
+@@ -56,29 +56,28 @@
+        #include <curses.h>
+ 
+        int border(chtype ls, chtype rs, chtype ts, chtype bs,
+-                  chtype tl, chtype tr, chtype bl, chtype br);
++             chtype tl, chtype tr, chtype bl, chtype br);
+        int wborder(WINDOW *win, chtype ls, chtype rs,
+-                   chtype ts, chtype bs, chtype tl, chtype tr,
+-                   chtype bl, chtype br);
++             chtype ts, chtype bs, chtype tl, chtype tr,
++             chtype bl, chtype br);
+ 
+        int box(WINDOW *win, chtype verch, chtype horch);
+ 
+        int hline(chtype ch, int n);
+        int whline(WINDOW *win, chtype ch, int n);
+-       int vline(chtype ch, int n);
+-       int wvline(WINDOW *win, chtype ch, int n);
+-
+        int mvhline(int y, int x, chtype ch, int n);
+        int mvwhline(WINDOW *win, int y, int x, chtype ch, int n);
++
++       int vline(chtype ch, int n);
++       int wvline(WINDOW *win, chtype ch, int n);
+        int mvvline(int y, int x, chtype ch, int n);
+        int mvwvline(WINDOW *win, int y, int x, chtype ch, int n);
+ 
+ 
+ 
                                                                                                                                                                                  DESCRIPTION
                                                                                                                                                                                  +-       The  border,  wborder and box routines draw a box around the edges of a
+-       window.  Other than the window,  each  argument  is  a  character  with
+-       attributes:
+-
++       wborder  and  border draw a box at the edges of the specified window or
++       stdscr, respectively.  Each chtype argument corresponds to a  geometric
++       component of the border as follows:
+               ls - left side,
+               rs - right side,
+               ts - top side,
+@@ -88,46 +87,49 @@
+               bl - bottom left-hand corner, and
+               br - bottom right-hand corner.
+ 
+-       If  any  of  these  arguments  is  zero, then the corresponding default
+-       values (defined in curses.h) are used instead:
+-
++       If  any chtype argument is 0, then curses uses forms-drawing characters
++       (see addch(3x)) in the following correspondence:
+               ACS_VLINE,
+               ACS_VLINE,
+               ACS_HLINE,
+               ACS_HLINE,
+               ACS_ULCORNER,
+               ACS_URCORNER,
+-              ACS_LLCORNER,
++              ACS_LLCORNER, and
+               ACS_LRCORNER.
+ 
+-       box(win,  verch,  horch)  is  a  shorthand  for  the  following   call:
+-       wborder(win, verch, verch, horch, horch, 0, 0, 0, 0).
++       box(win, verch, horch) is shorthand for "wborder(win, verch, horch,  0,
++       0, 0, 0)".
+ 
+-       The  hline  and whline functions draw a horizontal (left to right) line
+-       using ch starting at the current cursor position in  the  window.   The
+-       current  cursor  position  is  not  changed.   The  line  is  at most n
+-       characters long, or as many as fit into the window.
+-
+-       The vline and wvline functions draw a vertical  (top  to  bottom)  line
+-       using  ch  starting  at the current cursor position in the window.  The
+-       current cursor position  is  not  changed.   The  line  is  at  most  n
+-       characters long, or as many as fit into the window.
++       whline  draws  a horizontal line of ch from left to right, and wvline a
++       vertical one from top to bottom, stopping once n characters  have  been
++       drawn  or  upon  reaching  the boundary of win.  These functions do not
++       update the cursor position (beyond any motion directed  by  their  "mv"
++       variants).  ncurses(3x) describes the variants of these functions.
+ 
+ 
+ 
                                                                                                                                                                                  RETURN VALUE
                                                                                                                                                                                  +-       All routines return the integer OK.
++       These functions return OK on success and ERR on failure.
+ 
+-       This implementation returns ERR if the window pointer is null.
++       In ncurses,
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
++       o   these functions fail if the screen is not initialized; and
++
++       o   functions  taking  a  WINDOW pointer argument fail if win is a null
++           pointer.
++
++       Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                                                  NOTES
                                                                                                                                                                                  +-       border and box may be implemented as macros.
++       Unusually,  there  is no wbox function; box behaves as one would expect
++       wbox to, accepting a WINDOW pointer argument.
+ 
+-       The borders generated by these functions are inside  borders  (this  is
+-       also true of SVr4 curses, though the fact is not documented).
++       border, box, hline, mvhline, mvwhline, vline, mvvline, and mvwvline may
++       be implemented as macros.
++
++       Borders drawn by these functions are interior borders.
+ 
+ 
+ 
                                                                                                                                                                                  PORTABILITY
                                                                                                                                                                                  +@@ -139,13 +141,24 @@
+        from wrefresh, which in SVr4 returns a count of characters  written  to
+        the window if its immedok property is set; in ncurses, it does not.
+ 
++       BSD curses drew boxes with horch in every character cell of the top and
++       bottom lines of the window, whereas SVr3.1 and  later  curses,  because
++       its box wrapped wborder, used the default corner characters.
++
++
++
                                                                                                                                                                                  HISTORY
                                                                                                                                                                                  ++       4BSD (1980) introduced box, defining it as a function.
++
++       SVr3.1  (1987)  added  whline and wvline and their variants, as well as
++       border and wborder, redefining box as a macro wrapping the latter.
++
+ 
+ 
                                                                                                                                                                                  SEE ALSO
                                                                                                                                                                                  +        curses(3x), curs_outopts(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                   curs_border(3x)
++ncurses 6.5                       2025-02-01                   curs_border(3x)
+ 
                                                                                                                                                                                  
+ 
                                                                                                                                                                                  
+ 
+ 
                                                                                                                                                                                  
+Index: doc/html/man/curs_border_set.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_border_set.3x.html	2025-01-19 00:54:58.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_border_set.3x.html	2025-02-02 00:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_border_set.3x,v 1.43 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_border_set.3x,v 1.48 2025/02/02 00:04:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_border_set 3x 2025-01-18 ncurses 6.5 Library calls
++curs_border_set 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                  curs_border_set 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                  
++
                                                                                                                                                                                  curs_border_set 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                  
+ 
                                                                                                                                                                                  + curs_border_set(3x)              Library calls             curs_border_set(3x)
+ 
+@@ -55,45 +55,32 @@
+ 
                                                                                                                                                                                  SYNOPSIS
                                                                                                                                                                                  +        #include <curses.h>
+ 
+-       int border_set(
+-          const cchar_t *ls, const cchar_t *rs,
+-          const cchar_t *ts, const cchar_t *bs,
+-          const cchar_t *tl, const cchar_t *tr,
+-          const cchar_t *bl, const cchar_t *br);
+-       int wborder_set(
+-          WINDOW *win,
+-          const cchar_t *ls, const cchar_t *rs,
+-          const cchar_t *ts, const cchar_t *bs,
+-          const cchar_t *tl, const cchar_t *tr,
+-          const cchar_t *bl, const cchar_t *br);
+-       int box_set(
+-          WINDOW *win,
+-          const cchar_t *verch,
+-          const cchar_t *horch);
+-       int hline_set(
+-          const cchar_t *wch, int n);
+-       int whline_set(
+-          WINDOW *win,
+-          const cchar_t *wch, int n);
+-       int mvhline_set(
+-          int y, int x,
+-          const cchar_t *wch, int n);
+-       int mvwhline_set(
+-          WINDOW *win,
+-          int y, int x,
+-          const cchar_t *wch, int n);
+-       int vline_set(
+-          const cchar_t *wch, int n);
+-       int wvline_set(
+-          WINDOW *win,
+-          const cchar_t *wch, int n);
+-       int mvvline_set(
+-          int y, int x,
+-          const cchar_t *wch, int n);
+-       int mvwvline_set(
+-          WINDOW *win,
+-          int y, int x,
+-          const cchar_t *wch, int n);
++       int border_set(const cchar_t *ls, const cchar_t *rs,
++             const cchar_t *ts, const cchar_t *bs,
++             const cchar_t *tl, const cchar_t *tr,
++             const cchar_t *bl, const cchar_t *br);
++       int wborder_set(WINDOW *win,
++             const cchar_t *ls, const cchar_t *rs,
++             const cchar_t *ts, const cchar_t *bs,
++             const cchar_t *tl, const cchar_t *tr,
++             const cchar_t *bl, const cchar_t *br);
++
++       int box_set(WINDOW *win, const cchar_t *verch,
++             const cchar_t *horch);
++
++       int hline_set(const cchar_t *wch, int n);
++       int whline_set(WINDOW *win, const cchar_t *wch, int n);
++       int mvhline_set(int y, int x, const cchar_t *wch,
++             int n);
++       int mvwhline_set(WINDOW *win, int y, int x,
++             const cchar_t *wch, int n);
++
++       int vline_set(const cchar_t *wch, int n);
++       int wvline_set(WINDOW *win, const cchar_t *wch, int n);
++       int mvvline_set(int y, int x, const cchar_t *wch,
++             int n);
++       int mvwvline_set(WINDOW *win, int y, int x,
++             const cchar_t *wch, int n);
+ 
+ 
+ 
                                                                                                                                                                                  DESCRIPTION
                                                                                                                                                                                  +@@ -156,7 +143,12 @@
+ 
+ 
+ 
                                                                                                                                                                                  PORTABILITY
                                                                                                                                                                                  +-       These functions are described in X/Open Curses Issue 4.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
++
++
++
                                                                                                                                                                                  HISTORY
                                                                                                                                                                                  ++       X/Open Curses Issue 4 (1995) initially specified these functions.
+ 
+ 
+ 
                                                                                                                                                                                  SEE ALSO
                                                                                                                                                                                  +@@ -164,7 +156,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18               curs_border_set(3x)
++ncurses 6.5                       2025-02-01               curs_border_set(3x)
+ 
                                                                                                                                                                                  
+ 
                                                                                                                                                                                  
+ 
+ 
                                                                                                                                                                                  
+Index: doc/html/man/curs_deleteln.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_deleteln.3x.html	2025-01-19 00:54:58.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_deleteln.3x.html	2025-02-02 00:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_deleteln.3x,v 1.48 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_deleteln.3x,v 1.51 2025/02/01 22:49:56 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_deleteln 3x 2025-01-18 ncurses 6.5 Library calls
++curs_deleteln 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                  curs_deleteln 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                  
++
                                                                                                                                                                                  curs_deleteln 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                  
+ 
                                                                                                                                                                                  + curs_deleteln(3x)                Library calls               curs_deleteln(3x)
+ 
+@@ -105,9 +105,9 @@
+ 
+ 
+ 
                                                                                                                                                                                  HISTORY
                                                                                                                                                                                  +-       4BSD (1980) curses introduced wdeleteln and winsertln.
++       4BSD (1980) introduced deleteln, wdeleteln, insertln, and winsertln.
+ 
+-       SVr3.1 (1987) added winsdelln.
++       SVr3.1 (1987) added insdelln and winsdelln.
+ 
+ 
+ 
                                                                                                                                                                                  SEE ALSO
                                                                                                                                                                                  +@@ -115,7 +115,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                 curs_deleteln(3x)
++ncurses 6.5                       2025-02-01                 curs_deleteln(3x)
+ 
                                                                                                                                                                                  
+ 
                                                                                                                                                                                  
+ 
                                                                                                                                                                                    
+Index: doc/html/man/curs_get_wch.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_get_wch.3x.html	2025-01-19 00:54:58.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_get_wch.3x.html	2025-02-02 00:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_get_wch.3x,v 1.59 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_get_wch.3x,v 1.64 2025/02/02 00:01:24 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_get_wch 3x 2025-01-18 ncurses 6.5 Library calls
++curs_get_wch 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                    curs_get_wch 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                    
++
                                                                                                                                                                                    curs_get_wch 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                    
+ 
                                                                                                                                                                                    + curs_get_wch(3x)                 Library calls                curs_get_wch(3x)
+ 
+@@ -124,9 +124,10 @@
+        o   execution was interrupted by a signal, in which case errno  is  set
+            to EINTR.
+ 
+-       Functions taking a WINDOW pointer argument fail if the pointer is NULL.
++       Functions  taking  a  WINDOW  pointer  argument  fail  if win is a null
++       pointer.
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
++       Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+        unget_wch returns OK on success and ERR if there is no more room in the
+@@ -139,13 +140,13 @@
+        All of these functions except wget_wch and unget_wch may be implemented
+        as macros.
+ 
+-       Unlike wgetch(3x), wget_wch and its variants store  the  value  of  the
+-       input  character  in  an additional wch parameter instead of the return
++       Unlike  wgetch(3x),  wget_wch  and  its variants store the value of the
++       input character in an additional wch parameter instead  of  the  return
+        value.
+ 
+-       Unlike ungetch, unget_wch cannot distinguish function  key  codes  from
+-       conventional   character  codes.   An  application  can  overcome  this
+-       limitation by pushing function key codes with ungetch and  subsequently
++       Unlike  ungetch,  unget_wch  cannot distinguish function key codes from
++       conventional  character  codes.   An  application  can  overcome   this
++       limitation  by pushing function key codes with ungetch and subsequently
+        checking the return value of wget_wch for a match with KEY_CODE_YES.
+ 
+ 
+@@ -160,20 +161,19 @@
+        X/Open Curses Issue 4 describes these functions.  It specifies no error
+        conditions for them.
+ 
+-       See  the  "PORTABILITY" section of wgetch(3x) regarding the interaction
+-       of wget_wch with signal handlers.
++       See the "PORTABILITY" section of wgetch(3x) regarding  the  interaction
++       of wget_wch with signal handlers.
+ 
+ 
+ 
                                                                                                                                                                                    HISTORY
                                                                                                                                                                                    +-       These functions were  initially  specified  by  X/Open  Curses  Issue 4
+-       (1995).   The  System V Interface Definition Version 4 of the same year
+-       specified  functions  named  wgetwch  (with  the  usual  variants)  and
+-       ungetwch.   These  were later additions to SVr4.x, not appearing in the
+-       first SVr4 (1989).   They  differ  from  X/Open's  later  wget_wch  and
+-       unget_wch in that wgetwch takes no wch argument, but returns the (wide)
+-       key code as an int (with no provision for  distinguishing  a  character
+-       code  from  a  function  key  code); and ungetwch takes a non-const int
+-       argument.
++       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
++       System V Interface Definition Version 4  of  the  same  year  specified
++       functions named wgetwch (with its variants) ungetwch.  These were later
++       additions to SVr4.x, not appearing in  the  first  SVr4  (1989).   They
++       differ from X/Open's later wget_wch and unget_wch in that wgetwch takes
++       no wch argument, but returns the (wide) key code as  an  int  (with  no
++       provision  for  distinguishing  a  character  code  from a function key
++       code); and ungetwch takes a non-const int argument.
+ 
+ 
+ 
                                                                                                                                                                                    SEE ALSO
                                                                                                                                                                                    +@@ -185,7 +185,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                  curs_get_wch(3x)
++ncurses 6.5                       2025-02-01                  curs_get_wch(3x)
+ 
                                                                                                                                                                                    
+ 
                                                                                                                                                                                    
+ 
                                                                                                                                                                                      
+Index: doc/html/man/curs_get_wstr.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_get_wstr.3x.html	2025-01-19 00:54:58.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_get_wstr.3x.html	2025-02-02 00:59:49.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_get_wstr.3x,v 1.64 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_get_wstr.3x,v 1.68 2025/02/01 22:54:32 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_get_wstr 3x 2025-01-18 ncurses 6.5 Library calls
++curs_get_wstr 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                      curs_get_wstr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                      
++
                                                                                                                                                                                      curs_get_wstr 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                      
+ 
                                                                                                                                                                                      + curs_get_wstr(3x)                Library calls               curs_get_wstr(3x)
+ 
+@@ -81,7 +81,7 @@
+            WEOF);
+ 
+        o   interprets   the   screen's   erase   and   kill   characters  (see
+-           erasechar(3x) and killchar(3x));
++           erasewchar(3x) and killwchar(3x));
+ 
+        o   recognizes function keys only if  the  screen's  keypad  option  is
+            enabled (see keypad(3x));
+@@ -214,6 +214,16 @@
+            into the buffer, for consistency with SVr4 curses's wgetnstr.
+ 
+ 
++
                                                                                                                                                                                      HISTORY
                                                                                                                                                                                      ++       X/Open Curses Issue 4 (1995) initially specified these functions.   The
++       System V  Interface  Definition  Version 4  of  the same year specified
++       functions named wgetwstr and wgetnwstr (and the usual variants).  These
++       were later additions to SVr4.x, not appearing in the first SVr4 (1989).
++       Except in name, their declarations did not differ from  X/Open's  later
++       wget_wstr  and wgetn_wstr until X/Open Curses Issue 7 (2009) eventually
++       changed the type of the buffer argument to a pointer to wint_t.
++
++
+ 
                                                                                                                                                                                      SEE ALSO
                                                                                                                                                                                      +        curs_getstr(3x) describes comparable functions of the  ncurses  library
+        in its non-wide-character configuration.
+@@ -222,7 +232,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                 curs_get_wstr(3x)
++ncurses 6.5                       2025-02-01                 curs_get_wstr(3x)
+ 
                                                                                                                                                                                      
+ 
                                                                                                                                                                                      
+ 
+ 
                                                                                                                                                                                      
+Index: doc/html/man/curs_getcchar.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_getcchar.3x.html	2025-01-19 00:54:58.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_getcchar.3x.html	2025-02-02 00:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_getcchar.3x,v 1.53 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_getcchar.3x,v 1.56 2025/02/01 23:46:11 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_getcchar 3x 2025-01-18 ncurses 6.5 Library calls
++curs_getcchar 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                      curs_getcchar 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                      
++
                                                                                                                                                                                      curs_getcchar 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                      
+ 
                                                                                                                                                                                      + curs_getcchar(3x)                Library calls               curs_getcchar(3x)
+ 
+@@ -159,7 +159,7 @@
+        o   at least five non-spacing wide characters (wchar_t; see below),
+ 
+        o   attributes  (at  least  15  bits' worth, inferred from the count of
+-           specified WA_ constants),
++           specified WA_ constants),
+ 
+        o   a color pair identifier (at least 16 bits, inferred from the  short
+            type used to encode it).
+@@ -198,8 +198,7 @@
+ 
+ 
+ 
                                                                                                                                                                                      HISTORY
                                                                                                                                                                                      +-       These  functions  were  initially  specified  by  X/Open Curses Issue 4
+-       (1995).
++       X/Open Curses Issue 4 (1995) initially specified these functions.
+ 
+ 
+ 
                                                                                                                                                                                      SEE ALSO
                                                                                                                                                                                      +@@ -207,7 +206,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                 curs_getcchar(3x)
++ncurses 6.5                       2025-02-01                 curs_getcchar(3x)
+ 
                                                                                                                                                                                      
+ 
                                                                                                                                                                                      
+ 
                                                                                                                                                                                        
+Index: doc/html/man/curs_getch.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_getch.3x.html	2025-01-19 00:54:58.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_getch.3x.html	2025-02-02 00:43:57.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_getch.3x,v 1.114 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_getch.3x,v 1.117 2025/02/02 00:00:59 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_getch 3x 2025-01-18 ncurses 6.5 Library calls
++curs_getch 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                        curs_getch 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                        
++
                                                                                                                                                                                        curs_getch 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                        
+ 
                                                                                                                                                                                        + curs_getch(3x)                   Library calls                  curs_getch(3x)
+ 
+@@ -315,69 +315,70 @@
+ 
+        has_key returns TRUE or FALSE.
+ 
+-       Functions taking a WINDOW pointer argument fail if the pointer is NULL.
++       Functions  taking  a  WINDOW  pointer  argument  fail  if win is a null
++       pointer.
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
++       Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                                                        NOTES
                                                                                                                                                                                        +        getch, mvgetch, and mvwgetch may be implemented as macros.
+ 
+-       curses discourages assignment of the ESC key to a discrete function  by
++       curses  discourages assignment of the ESC key to a discrete function by
+        the programmer because the library requires a delay while it awaits the
+        potential remainder of a terminal escape sequence.
+ 
+-       Some key strokes are indistinguishable  from  control  characters;  for
+-       example,  KEY_ENTER may be the same as ^M, and KEY_BACKSPACE may be the
+-       same as ^H or ^?.  Consult the terminfo entry for the terminal type  to
+-       determine  whether  this  is  the  case;  see  infocmp(1).  Some curses
++       Some  key  strokes  are  indistinguishable from control characters; for
++       example, KEY_ENTER may be the same as ^M, and KEY_BACKSPACE may be  the
++       same  as ^H or ^?.  Consult the terminfo entry for the terminal type to
++       determine whether this  is  the  case;  see  infocmp(1).   Some  curses
+        implementations, including ncurses, honor the terminfo key definitions;
+        others treat such control characters specially.
+ 
+-       curses  distinguishes  the  Enter  keys  in  the alphabetic and numeric
+-       keypad sections of a keyboard because (most) terminals  do.   KEY_ENTER
+-       refers  to the key on the numeric keypad and, like other function keys,
++       curses distinguishes the Enter  keys  in  the  alphabetic  and  numeric
++       keypad  sections  of a keyboard because (most) terminals do.  KEY_ENTER
++       refers to the key on the numeric keypad and, like other function  keys,
+        is reliably recognized only if the window's keypad mode is enabled.
+ 
+-       o   The terminfo key_enter (kent) capability  describes  the  character
+-           (sequence)  sent  by  the  Enter  key  of  a terminal's numeric (or
++       o   The  terminfo  key_enter  (kent) capability describes the character
++           (sequence) sent by the  Enter  key  of  a  terminal's  numeric  (or
+            similar) keypad.
+ 
+        o   "Enter or send" is X/Open Curses's description of this key.
+ 
+-       curses treats the Enter or Return key in the alphabetic section of  the
++       curses  treats the Enter or Return key in the alphabetic section of the
+        keyboard differently.
+ 
+        o   It usually produces a control code for carriage return (^M) or line
+            feed (^J).
+ 
+-       o   Depending on the terminal mode (raw,  cbreak,  or  canonical),  and
+-           whether  nl(3x)  or  nonl(3x)  has  been  called, wgetch may return
+-           either a carriage return or line feed upon an Enter or  Return  key
++       o   Depending  on  the  terminal  mode (raw, cbreak, or canonical), and
++           whether nl(3x) or nonl(3x)  has  been  called,  wgetch  may  return
++           either  a  carriage return or line feed upon an Enter or Return key
+            stroke.
+ 
+-       Use  of  wgetch with echo(3x) and neither cbreak(3x) nor raw(3x) is not
++       Use of wgetch with echo(3x) and neither cbreak(3x) nor raw(3x)  is  not
+        well-defined.
+ 
+-       Historically, the list of key code macros above was influenced  by  the
+-       keyboard  of  the AT&T 7300 (also known variously as the "3B1", "Safari
+-       4", and "UNIX PC"), a 1985 machine  rich  in  function  keys.   Today's
+-       computer  keyboards are based on that of the IBM PC/AT and tend to have
++       Historically,  the  list of key code macros above was influenced by the
++       keyboard of the AT&T 7300 (also known variously as the  "3B1",  "Safari
++       4",  and  "UNIX  PC"),  a  1985 machine rich in function keys.  Today's
++       computer keyboards are based on that of the IBM PC/AT and tend to  have
+        fewer.  A curses application can expect such a keyboard to transmit key
+-       codes   KEY_UP,   KEY_DOWN,  KEY_LEFT,  KEY_RIGHT,  KEY_HOME,  KEY_END,
+-       KEY_PPAGE (Page Up), KEY_NPAGE (Page  Down),  KEY_IC  (Insert),  KEY_DC
++       codes  KEY_UP,  KEY_DOWN,  KEY_LEFT,  KEY_RIGHT,   KEY_HOME,   KEY_END,
++       KEY_PPAGE  (Page  Up),  KEY_NPAGE  (Page Down), KEY_IC (Insert), KEY_DC
+        (Delete), KEY_A1, KEY_A3, KEY_B2, KEY_C1, KEY_C3, and KEY_F(n) for 1 <=
+        n <= 12.
+ 
+ 
+ 
                                                                                                                                                                                        EXTENSIONS
                                                                                                                                                                                        +        In ncurses, when a window's "no time-out" mode is not set, the ESCDELAY
+-       variable  configures  the  duration of the timer used to disambiguate a
+-       function key character sequence from a series of key strokes  beginning
++       variable configures the duration of the timer used  to  disambiguate  a
++       function  key character sequence from a series of key strokes beginning
+        with ESC typed by the user; see curs_variables(3x).
+ 
+-       has_key  is  an  ncurses  extension,  and  is not found in SVr4 curses,
++       has_key is an ncurses extension, and  is  not  found  in  SVr4  curses,
+        4.4BSD curses, or any other previous curses implementation.
+ 
+ 
+@@ -385,53 +386,53 @@
+        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       Except  as  noted  in section "EXTENSIONS" above, X/Open Curses Issue 4
++       Except as noted in section "EXTENSIONS" above,  X/Open  Curses  Issue 4
+        describes these functions.  It specifies no error conditions for them.
+ 
+-       SVr4 describes a successful return value  only  as  "an  integer  value
++       SVr4  describes  a  successful  return  value only as "an integer value
+        other than ERR".
+ 
+-       wgetch reads only single-byte characters.
++       wgetch reads only single-byte characters.
+ 
+-       The  echo  behavior  of  these  functions on input of KEY_ or backspace
++       The echo behavior of these functions on  input  of  KEY_  or  backspace
+        characters is not documented in SVr4 curses.
+ 
+-       The behavior of wgetch in  the  presence  of  signal  handlers  is  not
+-       documented  in  SVr4  curses  and  is unspecified by X/Open Curses.  In
+-       historical curses implementations, it varied depending on  whether  the
+-       operating  system's  dispatch  of  a  signal to a handler interrupted a
++       The  behavior  of  wgetch  in  the  presence  of signal handlers is not
++       documented in SVr4 curses and is  unspecified  by  X/Open  Curses.   In
++       historical  curses  implementations, it varied depending on whether the
++       operating system's dispatch of a signal  to  a  handler  interrupted  a
+        read(2) call in progress, and also (in some implementations) whether an
+-       input  timeout  or  non-blocking  mode had been set.  A portable curses
+-       application prepares  for  two  cases:  (a)  signal  receipt  does  not
+-       interrupt wgetch; or (b) signal receipt interrupts wgetch and causes it
+-       to return ERR with errno set to EINTR.
++       input timeout or non-blocking mode had been  set.   A  portable  curses
++       application  prepares  for  two  cases:  (a)  signal  receipt  does not
++       interrupt wgetch; or (b) signal receipt interrupts wgetch and causes it
++       to return ERR with errno set to EINTR.
+ 
+-       KEY_MOUSE is mentioned in X/Open Curses, along with a few related term-
+-       info  capabilities, but no higher-level functions use the feature.  The
++       KEY_MOUSE is mentioned in X/Open Curses, along with a few related term-
++       info capabilities, but no higher-level functions use the feature.   The
+        implementation in ncurses is an extension.
+ 
+-       KEY_RESIZE and has_key are extensions first  implemented  for  ncurses.
++       KEY_RESIZE  and  has_key  are extensions first implemented for ncurses.
+        By  2022,  PDCurses  and  NetBSD  curses  had  added  them  along  with
+-       KEY_MOUSE.
++       KEY_MOUSE.
+ 
+ 
+ 
                                                                                                                                                                                        SEE ALSO
                                                                                                                                                                                        +-       ECMA-6 "7-bit  coded  Character  Set"  <https://ecma-international.org/
++       ECMA-6  "7-bit  coded  Character  Set" <https://ecma-international.org/
+        publications-and-standards/standards/ecma-6/>
+ 
+-       ECMA-48   "Control   Functions  for  Coded  Character  Sets"  <https://
++       ECMA-48  "Control  Functions  for  Coded  Character   Sets"   <https://
+        ecma-international.org/publications-and-standards/standards/ecma-48/>
+ 
+-       curs_get_wch(3x) describes comparable functions of the ncurses  library
++       curs_get_wch(3x)  describes comparable functions of the ncurses library
+        in its wide-character configuration (ncursesw).
+ 
+-       curses(3x),     curs_addch(3x),     curs_inopts(3x),    curs_mouse(3x),
+-       curs_move(3x), curs_outopts(3x), curs_refresh(3x),  curs_variables(3x),
++       curses(3x),    curs_addch(3x),     curs_inopts(3x),     curs_mouse(3x),
++       curs_move(3x),  curs_outopts(3x), curs_refresh(3x), curs_variables(3x),
+        resizeterm(3x), ascii(7)
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                    curs_getch(3x)
++ncurses 6.5                       2025-02-01                    curs_getch(3x)
+ 
                                                                                                                                                                                        
+ 
                                                                                                                                                                                        
+ 
                                                                                                                                                                                          
+Index: doc/html/man/curs_getstr.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_getstr.3x.html	2025-01-19 00:54:58.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_getstr.3x.html	2025-02-02 00:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_getstr.3x,v 1.80 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_getstr.3x,v 1.85 2025/02/01 22:49:13 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_getstr 3x 2025-01-18 ncurses 6.5 Library calls
++curs_getstr 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                          curs_getstr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                          
++
                                                                                                                                                                                          curs_getstr 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                          
+ 
                                                                                                                                                                                          + curs_getstr(3x)                  Library calls                 curs_getstr(3x)
+ 
+@@ -170,10 +170,10 @@
+               interpreted, as well as any special keys (such as function keys,
+               "home" key, "clear" key, etc.)
+ 
+-       without  further  detail.   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 code's
+-       KEY_ constant value.  (The same language, unchanged except for styling,
++       without  further  detail.   It lied.  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 code's KEY_
++       constant value.  (The same  language,  unchanged  except  for  styling,
+        survived  into  X/Open  Curses  Issue 4, Version 2 but disappeared from
+        Issue 7.)
+ 
+@@ -249,12 +249,12 @@
+ 
+ 
+ 
                                                                                                                                                                                          HISTORY
                                                                                                                                                                                          +-       4BSD (1980) curses introduced wgetstr along with its variants.
++       4BSD (1980) introduced wgetstr along with its variants.
+ 
+        SVr3.1 (1987) added wgetnstr, but none of its variants.
+ 
+-       X/Open  Curses  Issue 4  (1995)  specified  getnstr,  mvwgetnstr,   and
+-       mvgetnstr.
++       X/Open  Curses  Issue 4  (1995)  specified  getnstr,   mvgetnstr,   and
++       mvwgetnstr.
+ 
+ 
+ 
                                                                                                                                                                                          SEE ALSO
                                                                                                                                                                                          +@@ -266,7 +266,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                   curs_getstr(3x)
++ncurses 6.5                       2025-02-01                   curs_getstr(3x)
+ 
                                                                                                                                                                                          
+ 
                                                                                                                                                                                          
+ 
                                                                                                                                                                                            
+Index: doc/html/man/curs_getyx.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_getyx.3x.html	2025-01-19 00:54:58.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_getyx.3x.html	2025-02-02 00:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_getyx.3x,v 1.53 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_getyx.3x,v 1.55 2025/02/01 22:48:11 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_getyx 3x 2025-01-18 ncurses 6.5 Library calls
++curs_getyx 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                            curs_getyx 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                            
++
                                                                                                                                                                                            curs_getyx 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                            
+ 
                                                                                                                                                                                            + curs_getyx(3x)                   Library calls                  curs_getyx(3x)
+ 
+@@ -105,7 +105,7 @@
+ 
+ 
+ 
                                                                                                                                                                                            HISTORY
                                                                                                                                                                                            +-       4BSD (1980) curses introduced getyx.
++       4BSD (1980) introduced getyx.
+ 
+        SVr3  (1987)  added  getbegyx  and  getmaxyx.   SVr3.1  later that year
+        supplied getparyx.
+@@ -116,7 +116,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                    curs_getyx(3x)
++ncurses 6.5                       2025-02-01                    curs_getyx(3x)
+ 
                                                                                                                                                                                            
+ 
                                                                                                                                                                                            
+ 
                                                                                                                                                                                              
+Index: doc/html/man/curs_in_wch.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_in_wch.3x.html	2025-01-19 00:54:59.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_in_wch.3x.html	2025-02-02 00:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_in_wch.3x,v 1.42 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_in_wch.3x,v 1.44 2025/02/01 22:54:32 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_in_wch 3x 2025-01-18 ncurses 6.5 Library calls
++curs_in_wch 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                              curs_in_wch 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                              
++
                                                                                                                                                                                              curs_in_wch 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                              
+ 
                                                                                                                                                                                              + curs_in_wch(3x)                  Library calls                 curs_in_wch(3x)
+ 
+@@ -90,10 +90,10 @@
+ 
+ 
+ 
                                                                                                                                                                                              HISTORY
                                                                                                                                                                                              +-       These  functions  were  initially  specified  by  X/Open Curses Issue 4
+-       (1995).  The System V Interface Definition Version 4 of the  same  year
+-       specified a function named winwch (and the usual variants).  This was a
+-       later addition to SVr4.x, not appearing in the first SVr4  (1989).   It
++       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
++       System V Interface Definition Version 4 of the same  year  specified  a
++       function  named  winwch  (and  the  usual  variants).  This was a later
++       addition to SVr4.x,  not  appearing  in  the  first  SVr4  (1989).   It
+        differed  from  X/Open's  later  win_wch in that it returned a value of
+        type chtype instead of cchar_t.
+ 
+@@ -106,7 +106,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                   curs_in_wch(3x)
++ncurses 6.5                       2025-02-01                   curs_in_wch(3x)
+ 
                                                                                                                                                                                              
+ 
                                                                                                                                                                                              
+ 
                                                                                                                                                                                                
+Index: doc/html/man/curs_in_wchstr.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_in_wchstr.3x.html	2025-01-19 00:54:59.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_in_wchstr.3x.html	2025-02-02 00:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_in_wchstr.3x,v 1.46 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_in_wchstr.3x,v 1.48 2025/02/01 22:54:32 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_in_wchstr 3x 2025-01-18 ncurses 6.5 Library calls
++curs_in_wchstr 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                curs_in_wchstr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                
++
                                                                                                                                                                                                curs_in_wchstr 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                                
+ 
                                                                                                                                                                                                + curs_in_wchstr(3x)               Library calls              curs_in_wchstr(3x)
+ 
+@@ -110,12 +110,12 @@
+ 
+ 
+ 
                                                                                                                                                                                                HISTORY
                                                                                                                                                                                                +-       These functions were  initially  specified  by  X/Open  Curses  Issue 4
+-       (1995).   The  System V Interface Definition Version 4 of the same year
+-       specified a function named winwchstr (and the  usual  variants).   This
+-       was a later addition to SVr4.x, not appearing in the first SVr4 (1989).
+-       It differed from X/Open's later win_wchstr in that it took an  argument
+-       of type pointer-to-chtype instead of pointer-tocchar_t.
++       X/Open Curses Issue 4 (1995) initially specified these functions.   The
++       System V  Interface  Definition  Version 4 of the same year specified a
++       function named winwchstr (and the usual variants).  This  was  a  later
++       addition  to  SVr4.x,  not  appearing  in  the  first  SVr4 (1989).  It
++       differed from X/Open's later win_wchstr in that it took an argument  of
++       type pointer-to-chtype instead of pointer-tocchar_t.
+ 
+ 
+ 
                                                                                                                                                                                                SEE ALSO
                                                                                                                                                                                                +@@ -126,7 +126,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                curs_in_wchstr(3x)
++ncurses 6.5                       2025-02-01                curs_in_wchstr(3x)
+ 
                                                                                                                                                                                                
+ 
                                                                                                                                                                                                
+ 
                                                                                                                                                                                                  
+Index: doc/html/man/curs_initscr.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_initscr.3x.html	2025-01-19 00:54:59.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_initscr.3x.html	2025-02-02 00:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_initscr.3x,v 1.86 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_initscr.3x,v 1.92 2025/02/02 00:01:55 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_initscr 3x 2025-01-18 ncurses 6.5 Library calls
++curs_initscr 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                  curs_initscr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                  
++
                                                                                                                                                                                                  curs_initscr 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                  + curs_initscr(3x)                 Library calls                curs_initscr(3x)
+ 
+@@ -143,7 +143,7 @@
+ 
+        o   restores terminal modes (see reset_shell_mode(3x)).
+ 
+-       Calling refresh(3x) or doupdate(3x) after  a  temporary  escape  causes
++       Calling refresh(3x) or doupdate(3x) after a temporary suspension causes
+        curses to resume managing the terminal.
+ 
+ 
+@@ -187,7 +187,56 @@
+            and stdscr.
+ 
+        Functions  that  return  pointers  return  NULL  on error.  In ncurses,
+-       set_term does not fail.
++       set_term does not fail, and initscr exits the application  if  it  does
++       not operate successfully.
++
++
++
                                                                                                                                                                                                  NOTES
                                                                                                                                                                                                  ++       ncurses  establishes signal handlers when a function that initializes a
++       SCREEN, either initscr or newterm, is first called.  Applications  that
++       wish  to  handle  the  following signals themselves should set up their
++       corresponding handlers after initializing the screen.
++
++       SIGINT ncurses's handler attempts to  clean  up  the  screen  on  exit.
++              Although it usually works as expected, there are limitations.
++
++              o   Walking the SCREEN list is unsafe, since all list management
++                  is done without any signal blocking.
++
++              o   When an application has been built with the _REENTRANT macro
++                  defined  (and  corresponding  system support), set_term uses
++                  functions that could deadlock or misbehave in other ways.
++
++              o   endwin calls other functions, many of which use stdio(3)  or
++                  other library functions that are clearly unsafe.
++
++       SIGTERM
++              ncurses  uses  the  same  handler  as  for SIGINT, with the same
++              limitations.  It is not mentioned in X/Open Curses, but is  more
++              suitable  for  this  purpose  than  SIGQUIT  (which  is  used in
++              debugging).
++
++       SIGTSTP
++              ncurses's handler manages the  terminal-generated  stop  signal,
++              used  in  job  control.   When  resuming  the  process,  ncurses
++              discards  pending  input  with  flushinp(3x)  and  repaints  the
++              screen,  assuming  that it has been completely altered.  It also
++              updates the saved terminal modes with def_shell_mode(3x).
++
++       SIGWINCH
++              ncurses  handles  changes  to  the  terminal's  window  size,  a
++              phenomenon  ignored  in  standardization  efforts.   It  sets  a
++              (signal-safe) variable that is later tested  by  wgetch(3x)  and
++              wget_wch(3x).
++
++              o   wgetch returns the key code KEY_RESIZE.
++
++              o   wget_wch  returns KEY_CODE_YES and sets its wch parameter to
++                  KEY_RESIZE.
++
++              At the same time, ncurses calls  resizeterm(3x)  to  adjust  the
++              standard  screen  stdscr,  and  update  global variables such as
++              LINES and COLS.
+ 
+ 
+ 
                                                                                                                                                                                                  PORTABILITY
                                                                                                                                                                                                  +@@ -197,120 +246,80 @@
+ 
+ 
                                                                                                                                                                                                  Differences
                                                                                                                                                                                                  +        X/Open  Curses  specifies  that  portable  applications  must  not call
+-       initscr more than once:
++       initscr more than once.
+ 
+-       o   The portable way to use initscr is once only, using refresh(3x)  to
+-           restore the screen after endwin.
++       o   The portable way to use initscr is  once  only,  using  refresh  to
++           restore the screen after endwin.
+ 
+-       o   This implementation allows using initscr after endwin.
++       o   ncurses permits use of initscr after endwin.
+ 
+-       Old versions of curses, e.g., BSD 4.4, would return a null pointer from
+-       initscr when an error is detected, rather than exiting.  It is safe but
+-       redundant to check the return value of initscr in X/Open Curses.
++       initscr  in  BSD,  from  its inception (1980) through the Net/2 release
++       (1991) returned ERR cast to a WINDOW pointer when detecting  an  error.
++       4.4BSD  (1995)  instead  returned  a  null pointer.  Neither exited the
++       application.  It is safe but redundant to check  the  return  value  of
++       initscr in X/Open Curses.
+ 
+-       Calling  endwin  does not dispose of the memory allocated in initscr or
+-       newterm.  Deleting a SCREEN provides a way to do this:
++       Calling  endwin  does not dispose of the memory allocated by initscr or
++       newterm.  Deleting a SCREEN provides a way to do this.
+ 
+-       o   X/Open Curses does not say what happens to WINDOWs  when  delscreen
++       o   X/Open Curses does not say what happens to WINDOWs  when  delscreen
+            "frees  storage  associated  with  the  SCREEN"  nor  does the SVr4
+-           documentation help, adding that it should be called after endwin if
++           documentation help, adding that it should be called after endwin if
+            a SCREEN is no longer needed.
+ 
+-       o   However,  WINDOWs are implicitly associated with a SCREEN.  so that
+-           it is reasonable to expect delscreen to deal with these.
++       o   However,  WINDOWs are implicitly associated with a SCREEN, so it is
++           reasonable to expect delscreen to dispose of them.
++
++       o   SVr4 deletes the standard WINDOW structures stdscr  and  curscr  as
++           well as a work area newscr.  It ignores other windows.
+ 
+-       o   SVr4 curses deletes  the  standard  WINDOW  structures  stdscr  and
+-           curscr  as  well  as a work area newscr.  SVr4 curses ignores other
+-           windows.
+-
+-       o   Since version 4.0 (1996), ncurses has  maintained  a  list  of  all
+-           windows  for  each  screen,  using that information to delete those
+-           windows when delscreen is called.
++       o   Since  version  4.0  (1996),  ncurses  has maintained a list of all
++           windows for each screen, using that  information  to  delete  those
++           windows when delscreen is called.
+ 
+-       o   NetBSD copied this feature of ncurses in  2001.   PDCurses  follows
++       o   NetBSD  copied  this  feature of ncurses in 2001.  PDCurses follows
+            the SVr4 model, deleting only the standard WINDOW structures.
+ 
+ 
+ 
                                                                                                                                                                                                  High-level versus Low-level
                                                                                                                                                                                                  +-       Different  implementations  may  disagree  regarding  the level of some
+-       functions.  For example, SCREEN  (returned  by  newterm)  and  TERMINAL
+-       (returned  by  setupterm(3x))  hold  file  descriptors  for  the output
+-       stream.  If an application switches screens using set_term, or switches
++       Different implementations may disagree  regarding  the  level  of  some
++       functions.   For  example,  SCREEN  (returned  by newterm) and TERMINAL
++       (returned by  setupterm(3x))  hold  file  descriptors  for  the  output
++       stream.  If an application switches screens using set_term, or switches
+        terminals using set_curterm(3x), applications which use the output file
+-       descriptor can have different behavior  depending  on  which  structure
++       descriptor  can  have  different  behavior depending on which structure
+        holds the corresponding descriptor.
+ 
+-       o   NetBSD's   baudrate  function  uses  the  descriptor  in  TERMINAL.
+-           ncurses and SVr4 curses use the descriptor in SCREEN.
++       o   NetBSD's  baudrate  function  uses  the  descriptor  in   TERMINAL.
++           ncurses and SVr4 use the descriptor in SCREEN.
+ 
+-       o   NetBSD and ncurses use the descriptor in TERMINAL for terminal  I/O
+-           modes,  e.g.,  def_shell_mode(3x),  def_prog_mode(3x).  SVr4 curses
+-           uses the descriptor in SCREEN.
++       o   NetBSD  and ncurses use the descriptor in TERMINAL for terminal I/O
++           modes, e.g., def_shell_mode(3x), def_prog_mode(3x).  SVr4 uses  the
++           descriptor in SCREEN.
+ 
+    Unset TERM Variable
+-       If the TERM variable is  missing  or  empty,  initscr  uses  the  value
+-       "unknown",  which  normally  corresponds  to  a terminal entry with the
++       If  the  TERM  variable  is  missing  or  empty, initscr uses the value
++       "unknown", which normally corresponds to  a  terminal  entry  with  the
+        generic (gn) capability.  Generic entries are detected by setupterm(3x)
+-       and  cannot  be  used for full-screen operation.  Other implementations
++       and cannot be used for full-screen  operation.   Other  implementations
+        may handle a missing/empty TERM variable differently.
+ 
+ 
+ 
                                                                                                                                                                                                  Signal Handlers
                                                                                                                                                                                                  +-       Quoting from X/Open Curses Issue 7, section 3.1.1:
++       Quoting X/Open Curses Issue 7, section 3.1.1:
+ 
+-            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...
++            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...
+ 
+-            Any special handling for these signals may remain  in  effect  for
++            Any  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.
+ 
+-            None of the Curses functions are required to be safe with  respect
++            None  of the Curses functions are required to be safe with respect
+             to signals...
+ 
+-       This  implementation establishes signal handlers during initialization,
+-       e.g., initscr or newterm.  Applications which must handle these signals
+-       should  set  up  the  corresponding  handlers  after  initializing  the
+-       library:
+-
+-       SIGINT
+-            The handler attempts to clean up the screen on exit.  Although  it
+-            usually works as expected, there are limitations:
+-
+-            o   Walking  the  SCREEN list is unsafe, since all list management
+-                is done without any signal blocking.
+-
+-            o   On systems which  have  REENTRANT  turned  on,  set_term  uses
+-                functions which could deadlock or misbehave in other ways.
+-
+-            o   endwin  calls  other  functions, many of which use stdio(3) or
+-                other library functions which are clearly unsafe.
+-
+-       SIGTERM
+-            This uses the same handler as SIGINT, with the  same  limitations.
+-            It  is  not  mentioned  in X/Open Curses, but is more suitable for
+-            this purpose than SIGQUIT (which is used in debugging).
+-
+-       SIGTSTP
+-            This handles the stop signal, used in job control.  When  resuming
+-            the  process,  this  implementation  discards  pending  input with
+-            flushinp(3x), and repaints the screen assuming that  it  has  been
+-            completely altered.  It also updates the saved terminal modes with
+-            def_shell_mode(3x).
+-
+-       SIGWINCH
+-            This handles the window-size changes which  were  ignored  in  the
+-            standardization   efforts.    The  handler  sets  a  (signal-safe)
+-            variable that is later tested by wgetch(3x) and wget_wch(3x).
+-
+-            o   wgetch returns the key code KEY_RESIZE.
+-
+-            o   wget_wch returns KEY_CODE_YES and sets its  wch  parameter  to
+-                KEY_RESIZE.
+-
+-            At  the same time, ncurses calls resizeterm to adjust the standard
+-            screen stdscr, and update other data such as LINES and COLS.
++       Section "NOTES" above discusses ncurses's signal handlers.
+ 
+ 
+ 
                                                                                                                                                                                                  SEE ALSO
                                                                                                                                                                                                  +@@ -319,7 +328,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                  curs_initscr(3x)
++ncurses 6.5                       2025-02-01                  curs_initscr(3x)
+ 
                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                    
+@@ -336,6 +345,7 @@
+ 
                                                                                                                                                                                                  
+ 
+ 
                                                                                                                                                                                                • RETURN VALUE
                                                                                                                                                                                                  • 
++
                                                                                                                                                                                                • NOTES
                                                                                                                                                                                                  • 
+ 
                                                                                                                                                                                                • PORTABILITY
+ 
                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                  • Differences
                                                                                                                                                                                                    • 
+Index: doc/html/man/curs_inopts.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_inopts.3x.html	2025-01-19 00:54:59.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_inopts.3x.html	2025-02-02 00:43:57.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inopts.3x,v 1.89 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_inopts.3x,v 1.93 2025/02/02 00:02:25 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inopts 3x 2025-01-18 ncurses 6.5 Library calls
++curs_inopts 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                    curs_inopts 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                    
++
                                                                                                                                                                                                    curs_inopts 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                    + curs_inopts(3x)                  Library calls                 curs_inopts(3x)
+ 
+@@ -93,11 +93,11 @@
+ 
+ 
                                                                                                                                                                                                    DESCRIPTION
                                                                                                                                                                                                    +        curses offers configurable  parameters  permitting  an  application  to
+-       control  the  handling  of  input  from the terminal.  Some are global,
+-       applying to all windows; others apply only to a specific  window.   The
+-       library  does not automatically apply such parameters to new or derived
+-       windows; an application must configure  each  window  for  the  desired
+-       behavior.
++       control  the  handling of input from the terminal.  Some, such as those
++       affecting the terminal's mode or line discipline, are global,  applying
++       to  all  windows;  others apply only to a specific window.  The library
++       does not automatically apply such parameters to new or derived windows;
++       an application must configure each window for the desired behavior.
+ 
+        Some  descriptions  below  make reference to an input character reading
+        function: this is wgetch(3x) in the non-wide character curses  API  and
+@@ -110,109 +110,113 @@
+ 
                                                                                                                                                                                                    cbreak, nocbreak
                                                                                                                                                                                                    +        Normally, the terminal driver buffers typed characters, not  delivering
+        them  to  an application until a line feed or carriage return is typed.
+-       cbreak configures the terminal in  cbreak  mode,  which  disables  line
+-       buffering and erase and kill character processing (the interrupt, quit,
+-       suspend,  and  flow  control  characters  are  unaffected)  and   makes
+-       characters  typed  by  the  user  immediately available to the program.
+-       nocbreak restores the terminal's canonical ("cooked") line discipline.
++       This canonical ("cooked") line discipline also supports  software  flow
++       control,  simple  line editing functions (character and word erase, and
++       whole-line erasure or "kill"), and job control.  cbreak configures  the
++       terminal  in  cbreak  mode, which disables line buffering and erase and
++       kill character processing -- the interrupt,  quit,  suspend,  and  flow
++       control  characters are unaffected -- and makes characters typed by the
++       user immediately available to the program.  nocbreak restores canonical
++       ("cooked") mode.
+ 
+-       The state of the terminal is unknown to a curses  application  when  it
++       The  state  of  the terminal is unknown to a curses application when it
+        starts; therefore, a program should call cbreak or nocbreak explicitly.
+        Most interactive programs using curses set cbreak mode.  Calling cbreak
+-       overrides  raw.   The man page for the input character reading function
++       overrides raw.  The man page for the input character  reading  function
+        discusses how cbreak and nocbreak interact with echo and noecho.
+ 
+ 
+ 
                                                                                                                                                                                                    echo, noecho
                                                                                                                                                                                                    +-       echo and noecho determine whether characters  typed  by  the  user  are
++       echo  and  noecho  determine  whether  characters typed by the user are
+        written to the curses window by the input character reading function as
+-       they are typed.  curses  always  disables  the  terminal  driver's  own
++       they  are  typed.   curses  always  disables  the terminal driver's own
+        echoing.  By default, a curses screen's echo option is set.  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 call
++       controlled area of the screen, or not to echo  at  all,  so  they  call
+        noecho.   The  man  page  for  the  input  character  reading  function
+        discusses how echo and noecho interact with cbreak and nocbreak.
+ 
+ 
+ 
                                                                                                                                                                                                    halfdelay
                                                                                                                                                                                                    +-       halfdelay  configures  half-delay mode, which is similar to cbreak mode
+-       in that characters typed by the user are immediately available  to  the
+-       program.   However,  after  blocking for tenths tenth-seconds, an input
+-       character reading function returns ERR if no  input  is  pending.   The
++       halfdelay configures half-delay mode, which is similar to  cbreak  mode
++       in  that  characters typed by the user are immediately available to the
++       program.  However, after blocking for tenths  tenth-seconds,  an  input
++       character  reading  function  returns  ERR if no input is pending.  The
+        value of tenths must be between 1 and 255.  Use nocbreak to leave half-
+        delay mode.
+ 
+ 
+ 
                                                                                                                                                                                                    intrflush
                                                                                                                                                                                                    +-       intrflush calls qiflush (see below) if bf is TRUE, and noqiflush if  bf
++       intrflush  calls qiflush (see below) if bf is TRUE, and noqiflush if bf
+        is FALSE.  It ignores its win argument.
+ 
+ 
+ 
                                                                                                                                                                                                    keypad
                                                                                                                                                                                                    +-       keypad  enables  recognition of a terminal's function keys.  If enabled
+-       (bf is TRUE), the input character  reading  function  returns  a  value
+-       representing  the  function key, such as KEY_LEFT.  (Wide-character API
+-       users: wget_wch(3x) returns KEY_CODE_YES to indicate  the  availability
+-       of  a  function  key  code  in  its wch parameter.)  If disabled (bf is
+-       FALSE), curses does not treat function keys specially and  the  program
++       keypad enables recognition of a terminal's function keys.   If  enabled
++       (bf  is  TRUE),  the  input  character reading function returns a value
++       representing the function key, such as KEY_LEFT.   (Wide-character  API
++       users:  wget_wch(3x)  returns KEY_CODE_YES to indicate the availability
++       of a function key code in its  wch  parameter.)   If  disabled  (bf  is
++       FALSE),  curses  does not treat function keys specially and the program
+        has to interpret escape sequences itself.  If the terminal's keypad can
+-       be turned on (made to transmit) and off (made to work locally),  keypad
+-       configures  it  consistently  with  the  bf  parameter.   By default, a
++       be  turned on (made to transmit) and off (made to work locally), keypad
++       configures it consistently  with  the  bf  parameter.   By  default,  a
+        window's keypad mode is off.
+ 
+ 
+ 
                                                                                                                                                                                                    meta
                                                                                                                                                                                                    +-       Initially, whether the terminal returns 7- or 8-bit character codes  on
+-       input  depends  on  the  configuration of the terminal driver; on POSIX
+-       systems, see  termios(3).   To  force  8  bits  to  be  returned,  call
+-       meta(...,  TRUE);  this is equivalent, on POSIX systems, to setting the
+-       CS8 flag on the terminal.   To  force  7  bits  to  be  returned,  call
+-       meta(...,  FALSE); this is equivalent, on POSIX systems, to setting the
+-       CS7 flag on the terminal.  The window argument, win, is always ignored.
+-       If  the  terminfo  string capabilities meta_on (smm) and meta_off (rmm)
+-       are defined for the terminal type, enabling meta mode sends smm to  the
++       Initially,  whether the terminal returns 7- or 8-bit character codes on
++       input depends on the configuration of the  terminal  driver;  on  POSIX
++       systems,  see  termios(3).   To  force  8  bits  to  be  returned, call
++       meta(..., TRUE); this is equivalent, on POSIX systems, to  setting  the
++       CS8  flag  on  the  terminal.   To  force  7  bits to be returned, call
++       meta(..., FALSE); this is equivalent, on POSIX systems, to setting  the
++       CS7  flag on the terminal.  curses ignores the window argument win.  If
++       the terminfo string capabilities meta_on (smm) and meta_off  (rmm)  are
++       defined  for  the  terminal  type,  enabling meta mode sends smm to the
+        terminal and disabling it sends rmm to the terminal.
+ 
+ 
+ 
                                                                                                                                                                                                    nl, nonl
                                                                                                                                                                                                    +-       Initially,  whether  the  terminal  reports a carriage return using the
+-       character code for a line feed in cbreak or raw modes  depends  on  the
+-       configuration  of  the  terminal driver; see termios(3).  nl configures
++       Initially, whether the terminal reports a  carriage  return  using  the
++       character  code  for  a line feed in cbreak or raw modes depends on the
++       configuration of the terminal driver; see  termios(3).   nl  configures
+        the terminal to perform this translation.  nonl disables it.  Under its
+        canonical  ("cooked")  line  discipline,  the  terminal  driver  always
+        translates carriage returns to line feeds.
+ 
+ 
+ 
                                                                                                                                                                                                    nodelay
                                                                                                                                                                                                    +-       nodelay configures the input character  reading  function  to  be  non-
+-       blocking  for  window  win.  If no input is ready, the reading function
+-       returns ERR.  If disabled (bf is FALSE), the reading function does  not
++       nodelay  configures  the  input  character  reading function to be non-
++       blocking for window win.  If no input is ready,  the  reading  function
++       returns  ERR.  If disabled (bf is FALSE), the reading function does not
+        return until it has input.
+ 
+ 
+ 
                                                                                                                                                                                                    notimeout
                                                                                                                                                                                                    +-       When  the  input  character reading function reads an ESC character, it
+-       sets a timer while waiting  for  the  next  character.   notimeout(win,
+-       TRUE)   disables  this  timer.   The  purpose  of  the  timeout  is  to
+-       distinguish sequences produced by a function key from those typed by  a
+-       user.   To configure the timeout rather than disabling it, see wtimeout
++       When the input character reading function reads an  ESC  character,  it
++       sets  a  timer  while  waiting  for the next character.  notimeout(win,
++       TRUE)  disables  this  timer.   The  purpose  of  the  timeout  is   to
++       distinguish  sequences produced by a function key from those typed by a
++       user.  To configure the timeout rather than disabling it, see  wtimeout
+        below.
+ 
+ 
+ 
                                                                                                                                                                                                    qiflush, noqiflush
                                                                                                                                                                                                    +-       qiflush and noqiflush configure the terminal driver's treatment of  its
++       qiflush  and noqiflush configure the terminal driver's treatment of its
+        input and output queues when it handles the interrupt, suspend, or quit
+        characters under the canonical ("cooked") or cbreak line disciplines on
+-       POSIX  systems; see termios(3).  The default behavior is inherited from
+-       the terminal driver settings.  Calling qiflush configures the  terminal
+-       to  flush  the  queues  when  any  of  these  events occurs, giving the
+-       impression of faster response to user input, but making  the  library's
+-       model  of  the  screen  contents incorrect.  Calling noqiflush prevents
+-       such flushing, but might frustrate impatient users on slow  connections
+-       if  a curses update of the screen is in progress when the event occurs;
+-       see typeahead below for a mitigation of this problem.  You may want  to
+-       call  noqiflush  in  a  signal handler if, after the handler exits, you
+-       want output to continue as though the interrupt had not occurred.
++       POSIX systems; see termios(3).  The default behavior is inherited  from
++       the  terminal driver settings.  Calling qiflush configures the terminal
++       to flush the queues (discarding  their  contents)  when  any  of  these
++       events  occurs, giving the impression of faster response to user input,
++       but making the  library's  model  of  the  screen  contents  incorrect.
++       Calling noqiflush prevents such flushing, but might frustrate impatient
++       users on slow connections if a  curses  update  of  the  screen  is  in
++       progress when the event occurs; see typeahead below for a mitigation of
++       this problem.  You may want to call noqiflush in a signal  handler  if,
++       after  the  handler  exits,  you  want output to continue as though the
++       interrupt had not occurred.
+ 
+ 
+ 
                                                                                                                                                                                                    raw, noraw
                                                                                                                                                                                                    +@@ -229,8 +233,8 @@
+ 
                                                                                                                                                                                                    timeout, wtimeout
                                                                                                                                                                                                    +        wtimeout  configures  whether a curses input character reading function
+        called on window win uses blocking or non-blocking reads.  If delay  is
+-       negative,  a blocking read is used, waiting indefinitely for input.  If
+-       delay is zero, a non-blocking read is used; an input character  reading
++       negative,  curses uses a blocking read, waiting indefinitely for input.
++       If delay is zero, the read is non-blocking; an input character  reading
+        function  returns ERR if no input is pending.  If delay is positive, an
+        input character reading function blocks  for  delay  milliseconds,  and
+        returns  ERR  if the delay elapses and there is still no input pending.
+@@ -350,11 +354,11 @@
+        key code to be reported.  In  ncurses,  extended  capabilities  can  be
+        interpreted  as key definitions.  These are loaded after the predefined
+        keys, and if a capability's value is the same as  a  previously  loaded
+-       key definition, the later definition is the one used.
++       key definition, the library uses the later definition.
+ 
+ 
+ 
                                                                                                                                                                                                    HISTORY
                                                                                                                                                                                                    +-       4BSD curses (1980) introduced echo, noecho, nl, nonl, raw, and noraw.
++       4BSD (1980) introduced echo, noecho, nl, nonl, raw, and noraw.
+ 
+        SVr2 (1984) featured a new terminal driver, extending the curses API to
+        support it with cbreak, nocbreak, intrflush, keypad, meta, nodelay, and
+@@ -384,7 +388,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                   curs_inopts(3x)
++ncurses 6.5                       2025-02-01                   curs_inopts(3x)
+ 
                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                      
+Index: doc/html/man/curs_ins_wch.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_ins_wch.3x.html	2025-01-19 00:54:59.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_ins_wch.3x.html	2025-02-02 00:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_ins_wch.3x,v 1.43 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_ins_wch.3x,v 1.46 2025/02/02 00:00:59 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_ins_wch 3x 2025-01-18 ncurses 6.5 Library calls
++curs_ins_wch 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                      curs_ins_wch 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                      
++
                                                                                                                                                                                                      curs_ins_wch 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                      + curs_ins_wch(3x)                 Library calls                curs_ins_wch(3x)
+ 
+@@ -71,16 +71,17 @@
+ 
                                                                                                                                                                                                      RETURN VALUE
                                                                                                                                                                                                      +        These functions return OK on success and ERR on failure.
+ 
+-       Functions taking a WINDOW pointer argument fail if the pointer is NULL.
++       Functions taking a WINDOW pointer  argument  fail  if  win  is  a  null
++       pointer.
+ 
+-       Functions prefixed with "mv" first perform cursor movement and fail  if
++       Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                                                                      NOTES
                                                                                                                                                                                                      +        ins_wch, mvins_wch, and mvwins_wch may be implemented as macros.
+ 
+-       A  terminal's  insert_character  (ich1)  capability  is not necessarily
++       A terminal's insert_character  (ich1)  capability  is  not  necessarily
+        employed.
+ 
+ 
+@@ -90,11 +91,11 @@
+ 
+ 
+ 
                                                                                                                                                                                                      HISTORY
                                                                                                                                                                                                      +-       These  functions  were  initially  specified  by  X/Open Curses Issue 4
+-       (1995).  The System V Interface Definition Version 4 of the  same  year
+-       specified  a function named winswch (and the usual variants).  This was
+-       a later addition to SVr4.x, not appearing in the first SVr4 (1989).  It
+-       differed  from  X/Open's  later wins_wch in that it took an argument of
++       X/Open Curses Issue 4 (1995) initially specified these functions.   The
++       System V  Interface  Definition  Version 4 of the same year specified a
++       function named winswch (and the usual  variants).   This  was  a  later
++       addition  to  SVr4.x,  not  appearing  in  the  first  SVr4 (1989).  It
++       differed from X/Open's later wins_wch in that it took  an  argument  of
+        type chtype instead of cchar_t.
+ 
+ 
+@@ -106,7 +107,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                  curs_ins_wch(3x)
++ncurses 6.5                       2025-02-01                  curs_ins_wch(3x)
+ 
                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                        
+Index: doc/html/man/curs_ins_wstr.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_ins_wstr.3x.html	2025-01-19 00:54:59.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_ins_wstr.3x.html	2025-02-02 00:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_ins_wstr.3x,v 1.56 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_ins_wstr.3x,v 1.58 2025/02/01 22:54:32 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_ins_wstr 3x 2025-01-18 ncurses 6.5 Library calls
++curs_ins_wstr 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                        curs_ins_wstr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                        
++
                                                                                                                                                                                                        curs_ins_wstr 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                        + curs_ins_wstr(3x)                Library calls               curs_ins_wstr(3x)
+ 
+@@ -125,7 +125,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                        HISTORY
                                                                                                                                                                                                        +-       These functions were initially specified by X/Open Curses Issue 4.  The
++       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
+        System V Interface Definition  Version 4  (1995),  specified  functions
+        named  winswstr  and  winsnwstr  (and  the usual variants).  These were
+        later additions to SVr4.x, not appearing  in  the  first  SVr4  (1989).
+@@ -141,7 +141,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                 curs_ins_wstr(3x)
++ncurses 6.5                       2025-02-01                 curs_ins_wstr(3x)
+ 
                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                          
+Index: doc/html/man/curs_insch.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_insch.3x.html	2025-01-19 00:54:59.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_insch.3x.html	2025-02-02 00:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_insch.3x,v 1.49 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_insch.3x,v 1.51 2025/02/02 00:00:59 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_insch 3x 2025-01-18 ncurses 6.5 Library calls
++curs_insch 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                          curs_insch 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                          
++
                                                                                                                                                                                                          curs_insch 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                          + curs_insch(3x)                   Library calls                  curs_insch(3x)
+ 
+@@ -70,23 +70,24 @@
+ 
                                                                                                                                                                                                          RETURN VALUE
                                                                                                                                                                                                          +        These functions return OK on success and ERR on failure.
+ 
+-       Functions taking a WINDOW pointer argument fail if the pointer is NULL.
++       Functions  taking  a  WINDOW  pointer  argument  fail  if win is a null
++       pointer.
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
++       Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                                                                          NOTES
                                                                                                                                                                                                          +        insch, mvinsch, and mvwinsch may be implemented as macros.
+ 
+-       A terminal's insert_character  (ich1)  capability  is  not  necessarily
++       A  terminal's  insert_character  (ich1)  capability  is not necessarily
+        employed.
+ 
+ 
+ 
                                                                                                                                                                                                          PORTABILITY
                                                                                                                                                                                                          +        X/Open Curses Issue 4 describes these functions.
+ 
+-       SVr4  describes  a  successful  return  value only as "an integer value
++       SVr4 describes a successful return value  only  as  "an  integer  value
+        other than ERR".
+ 
+ 
+@@ -95,14 +96,14 @@
+ 
+ 
+ 
                                                                                                                                                                                                          SEE ALSO
                                                                                                                                                                                                          +-       curs_ins_wch(3x) describes comparable functions in  the  wide-character
++       curs_ins_wch(3x)  describes  comparable functions in the wide-character
+        curses configuration.
+ 
+        curses(3x), terminfo(5)
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                    curs_insch(3x)
++ncurses 6.5                       2025-02-01                    curs_insch(3x)
+ 
                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                            
+Index: doc/html/man/curs_insstr.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_insstr.3x.html	2025-01-19 00:54:59.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_insstr.3x.html	2025-02-02 00:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_insstr.3x,v 1.68 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_insstr.3x,v 1.70 2025/02/01 22:53:03 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_insstr 3x 2025-01-18 ncurses 6.5 Library calls
++curs_insstr 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                            curs_insstr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                            
++
                                                                                                                                                                                                            curs_insstr 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                            + curs_insstr(3x)                  Library calls                 curs_insstr(3x)
+ 
+@@ -116,8 +116,8 @@
+        Issue 4 distinguished insnstr and winsnstr  from  the  other  functions
+        documented  above  by stating they "do not perform wrapping".  This was
+        probably an error, since it makes this group of functions inconsistent.
+-       No  implementation  of curses documents this inconsistency, and Issue 7
+-       removed it.
++       No  implementation  of curses manifests this inconsistency, and Issue 7
++       removed the claim.
+ 
+        Issue 4 states that the entire string is inserted if n is less than  1.
+        This  is  probably  an  error,  because  it  is inconsistent with other
+@@ -126,7 +126,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                            HISTORY
                                                                                                                                                                                                            +-       SVr3.1 (1987) introduced winsstr and winsnstr.
++       SVr3.1 (1987) introduced winsstr and winsnstr and their variants.
+ 
+ 
+ 
                                                                                                                                                                                                            SEE ALSO
                                                                                                                                                                                                            +@@ -137,7 +137,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                   curs_insstr(3x)
++ncurses 6.5                       2025-02-01                   curs_insstr(3x)
+ 
                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                              
+Index: doc/html/man/curs_instr.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_instr.3x.html	2025-01-19 00:54:59.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_instr.3x.html	2025-02-02 00:43:57.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_instr.3x,v 1.68 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_instr.3x,v 1.70 2025/02/01 22:54:06 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_instr 3x 2025-01-18 ncurses 6.5 Library calls
++curs_instr 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                              curs_instr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                              
++
                                                                                                                                                                                                              curs_instr 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                              + curs_instr(3x)                   Library calls                  curs_instr(3x)
+ 
+@@ -130,18 +130,19 @@
+ 
+ 
+ 
                                                                                                                                                                                                              HISTORY
                                                                                                                                                                                                              +-       SVr3.1 (1987) introduced these functions.
++       SVr3.1  (1987)  introduced these functions.  winstr, winnstr, and their
++       variants.
+ 
+ 
+ 
                                                                                                                                                                                                              SEE ALSO
                                                                                                                                                                                                              +-       curs_inwstr(3x)  describes  comparable functions of the ncurses library
++       curs_inwstr(3x) describes comparable functions of the  ncurses  library
+        in its wide-character configuration (ncursesw).
+ 
+        curses(3x), curs_inch(3x), curs_inchstr(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                    curs_instr(3x)
++ncurses 6.5                       2025-02-01                    curs_instr(3x)
+ 
                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                
+Index: doc/html/man/curs_move.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_move.3x.html	2025-01-19 00:54:59.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_move.3x.html	2025-02-02 00:43:58.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_move.3x,v 1.54 2025/01/19 00:51:10 tom Exp @
++  * @Id: curs_move.3x,v 1.57 2025/02/01 22:50:42 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_move 3x 2025-01-18 ncurses 6.5 Library calls
++curs_move 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                curs_move 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                
++
                                                                                                                                                                                                                curs_move 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                + curs_move(3x)                    Library calls                   curs_move(3x)
+ 
+@@ -86,7 +86,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                HISTORY
                                                                                                                                                                                                                +-       4BSD (1980) curses introduced wmove.
++       4BSD (1980) introduced these functions.
+ 
+ 
+ 
                                                                                                                                                                                                                SEE ALSO
                                                                                                                                                                                                                +@@ -94,7 +94,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                     curs_move(3x)
++ncurses 6.5                       2025-02-01                     curs_move(3x)
+ 
                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                
+ 
                                                                                                                                                                                                                  
+Index: doc/html/man/curs_outopts.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_outopts.3x.html	2025-01-19 00:54:59.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_outopts.3x.html	2025-02-02 00:43:58.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_outopts.3x,v 1.78 2025/01/19 00:51:10 tom Exp @
++  * @Id: curs_outopts.3x,v 1.81 2025/02/01 22:49:13 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_outopts 3x 2025-01-18 ncurses 6.5 Library calls
++curs_outopts 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                  curs_outopts 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                  
++
                                                                                                                                                                                                                  curs_outopts 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                  + curs_outopts(3x)                 Library calls                curs_outopts(3x)
+ 
+@@ -184,7 +184,7 @@
+ 
+ 
+ 
                                                                                                                                                                                                                  HISTORY
                                                                                                                                                                                                                  +-       4BSD (1980) curses introduced clearok, leaveok, and scrollok.
++       4BSD (1980) introduced clearok, leaveok, and scrollok.
+ 
+        SVr2 (1984) supplied idlok, setscrreg, and wsetscrreg.
+ 
+@@ -200,7 +200,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                  curs_outopts(3x)
++ncurses 6.5                       2025-02-01                  curs_outopts(3x)
+ 
                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                                    
+Index: doc/html/man/curs_scroll.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_scroll.3x.html	2025-01-19 00:54:59.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_scroll.3x.html	2025-02-02 00:43:58.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_scroll.3x,v 1.55 2025/01/19 00:51:10 tom Exp @
++  * @Id: curs_scroll.3x,v 1.57 2025/02/02 00:02:49 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_scroll 3x 2025-01-18 ncurses 6.5 Library calls
++curs_scroll 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                    curs_scroll 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                    
++
                                                                                                                                                                                                                    curs_scroll 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                    + curs_scroll(3x)                  Library calls                 curs_scroll(3x)
+ 
+@@ -61,34 +61,38 @@
+ 
+ 
                                                                                                                                                                                                                    DESCRIPTION
                                                                                                                                                                                                                    +        scroll  scrolls  the  given window up one line.  That is, every visible
+-       line we might number i becomes line i-1.  The text of the top  line  in
+-       the  window  disappears  and  the  bottom  line  is  populated with the
+-       background  character;  see   bkgd(3x)   (wide-character   API   users:
+-       bkgrnd(3x)).  As an optimization, if the scrolling region of the window
+-       is the entire screen, the physical screen may be scrolled at  the  same
+-       time; see curscr(3x).
+-
+-       scrl and wscrl scrolls the specified window win up or down per the sign
+-       of n.
++       line we might number i becomes line i-1.  wscrl  and  scrl  scroll  the
++       specified window or stdscr, respectively, up or down per the sign of n.
+ 
+        o   For positive n, line i+n becomes i (scrolling up);
+ 
+-       o   for negative n, line i-n becomes i (scrolling  down).   ncurses(3x)
+-           describes the scrl variant of this function.
++       o   for negative n, line i-n becomes i (scrolling down).
++
++       A  line  that  scrolls  beyond the window boundaries disappears; curses
++       populates a  new  one  emerging  at  the  opposite  boundary  with  the
++       background   character;   see   bkgd(3x)   (wide-character  API  users:
++       bkgrnd(3x)).  As an optimization, if the scrolling region of the window
++       is  the  entire screen, the physical screen may be scrolled at the same
++       time; see curscr(3x).
+ 
+-       The  cursor does not move.  These functions perform no operation unless
++       The cursor does not move.  These functions perform no operation  unless
+        scrolling is enabled for the window via scrollok(3x).
+ 
+ 
+ 
                                                                                                                                                                                                                    RETURN VALUE
                                                                                                                                                                                                                    +        These functions return ERR upon failure and OK upon success.
+ 
+-       ncurses returns ERR if scrolling is not  enabled  in  the  window,  for
+-       example with scrollok(3x), or if the WINDOW pointer is null.
++       In ncurses, they return ERR if
++
++       o   the curses screen has not been initialized,
++
++       o   win is a null pointer, or
++
++       o   scrolling is not enabled in the window (as by scrollok(3x)).
+ 
+ 
+ 
                                                                                                                                                                                                                    NOTES
                                                                                                                                                                                                                    +-       scrl and wscrl may be implemented as macros.
++       scroll and scrl may be implemented as macros.
+ 
+        Unusually,  there  is  no wscroll function; scroll behaves as one would
+        expect wscroll to, accepting a WINDOW pointer argument.
+@@ -112,12 +116,19 @@
+        character.  In ncurses, they do not.
+ 
+ 
++
                                                                                                                                                                                                                    HISTORY
                                                                                                                                                                                                                    ++       4BSD (1980) introduced scroll, defining it as a function.
++
++       SVr3.1 (1987) added scrl  and  wscrl,  redefining  scroll  as  a  macro
++       wrapping the latter.
++
++
+ 
                                                                                                                                                                                                                    SEE ALSO
                                                                                                                                                                                                                    +        curses(3x), curs_outopts(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                   curs_scroll(3x)
++ncurses 6.5                       2025-02-01                   curs_scroll(3x)
+ 
                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                    
+ 
+ 
                                                                                                                                                                                                                    
+Index: doc/html/man/curs_sp_funcs.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_sp_funcs.3x.html	2025-01-19 00:54:59.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_sp_funcs.3x.html	2025-02-02 00:43:58.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_sp_funcs.3x,v 1.54 2025/01/19 00:51:10 tom Exp @
++  * @Id: curs_sp_funcs.3x,v 1.57 2025/02/01 22:47:44 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_sp_funcs 3x 2025-01-18 ncurses 6.5 Library calls
++curs_sp_funcs 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                    curs_sp_funcs 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                    
++
                                                                                                                                                                                                                    curs_sp_funcs 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                    + curs_sp_funcs(3x)                Library calls               curs_sp_funcs(3x)
+ 
+@@ -53,169 +53,169 @@
+ 
                                                                                                                                                                                                                    SYNOPSIS
                                                                                                                                                                                                                    +        #include <curses.h>
+ 
+-       int alloc_pair_sp(SCREEN* sp, int fg, int bg);
+-       int assume_default_colors_sp(SCREEN* sp, int fg, int bg);
+-       int baudrate_sp(SCREEN* sp);
+-       int beep_sp(SCREEN* sp);
+-       bool can_change_color_sp(SCREEN* sp);
+-       int cbreak_sp(SCREEN* sp);
+-       int color_content_sp(SCREEN* sp, short color, short* r, short* g, short* b);
+-       int curs_set_sp(SCREEN* sp, int visibility);
+-       int def_prog_mode_sp(SCREEN* sp);
+-       int def_shell_mode_sp(SCREEN* sp);
+-
+-       int define_key_sp(SCREEN* sp, const char * definition, int keycode);
+-       int delay_output_sp(SCREEN* sp, int ms);
+-       int doupdate_sp(SCREEN* sp);
+-       int echo_sp(SCREEN* sp);
+-       int endwin_sp(SCREEN* sp);
+-       char erasechar_sp(SCREEN* sp);
+-       int erasewchar_sp(SCREEN* sp, wchar_t *wc);
++       int alloc_pair_sp(SCREEN * sp, int fg, int bg);
++       int assume_default_colors_sp(SCREEN * sp, int fg, int bg);
++       int baudrate_sp(SCREEN * sp);
++       int beep_sp(SCREEN * sp);
++       bool can_change_color_sp(SCREEN * sp);
++       int cbreak_sp(SCREEN * sp);
++       int color_content_sp(SCREEN * sp, short color, short * r, short * g, short * b);
++       int curs_set_sp(SCREEN * sp, int visibility);
++       int def_prog_mode_sp(SCREEN * sp);
++       int def_shell_mode_sp(SCREEN * sp);
++
++       int define_key_sp(SCREEN * sp, const char * definition, int keycode);
++       int delay_output_sp(SCREEN * sp, int ms);
++       int doupdate_sp(SCREEN * sp);
++       int echo_sp(SCREEN * sp);
++       int endwin_sp(SCREEN * sp);
++       char erasechar_sp(SCREEN * sp);
++       int erasewchar_sp(SCREEN * sp, wchar_t *wc);
+        int extended_color_content_sp(SCREEN * sp, int color, int * r, int * g, int * b);
+-       int extended_pair_content_sp(SCREEN* sp, int pair, int * fg, int * bg);
+-       int extended_slk_color_sp(SCREEN* sp, int pair);
++       int extended_pair_content_sp(SCREEN * sp, int pair, int * fg, int * bg);
++       int extended_slk_color_sp(SCREEN * sp, int pair);
+ 
+-       void filter_sp(SCREEN* sp);
+-       int find_pair_sp(SCREEN* sp, int fg, int bg);
+-       int flash_sp(SCREEN* sp);
+-       int flushinp_sp(SCREEN* sp);
+-       int free_pair_sp(SCREEN* sp, int pair);
+-       int get_escdelay_sp(SCREEN* sp);
+-       int getmouse_sp(SCREEN* sp, MEVENT* event);
+-       WINDOW* getwin_sp(SCREEN* sp, FILE* filep);
+-       int halfdelay_sp(SCREEN* sp, int tenths);
+-       bool has_colors_sp(SCREEN* sp);
+-
+-       bool has_ic_sp(SCREEN* sp);
+-       bool has_il_sp(SCREEN* sp);
+-       int has_key_sp(SCREEN* sp, int c);
+-       bool has_mouse_sp(SCREEN* sp);
+-       int init_color_sp(SCREEN* sp, short color, short r, short g, short b);
+-       int init_extended_color_sp(SCREEN* sp, int color, int r, int g, int b);
+-       int init_extended_pair_sp(SCREEN* sp, int pair, int fg, int bg);
+-       int init_pair_sp(SCREEN* sp, short pair, short fg, short bg);
+-       int intrflush_sp(SCREEN* sp, WINDOW* win, bool bf);
+-       int is_cbreak_sp(SCREEN* sp);
+-
+-       int is_echo_sp(SCREEN* sp);
+-       int is_nl_sp(SCREEN* sp);
+-       int is_raw_sp(SCREEN* sp);
+-       bool is_term_resized_sp(SCREEN* sp, int lines, int columns);
+-       bool isendwin_sp(SCREEN* sp);
+-       int key_defined_sp(SCREEN* sp, const char *definition);
+-       char* keybound_sp(SCREEN* sp, int keycode, int count);
+-       NCURSES_CONST char* keyname_sp(SCREEN* sp, int c);
+-       int keyok_sp(SCREEN* sp, int keycode, bool enable);
+-       char killchar_sp(SCREEN* sp);
+-
+-       int killwchar_sp(SCREEN* sp, wchar_t *wc);
+-       char* longname_sp(SCREEN* sp);
+-       int mcprint_sp(SCREEN* sp, char *data, int len);
+-       int mouseinterval_sp(SCREEN* sp, int erval);
+-       mmask_t mousemask_sp(SCREEN* sp, mmask_t newmask, mmask_t *oldmask);
+-       int mvcur_sp(SCREEN* sp, int oldrow, int oldcol, int newrow, int newcol);
+-       int napms_sp(SCREEN* sp, int ms);
+-       WINDOW* newpad_sp(SCREEN* sp, int nrows, int ncols);
+-       SCREEN* new_prescr(void);
+-       SCREEN* newterm_sp(SCREEN* sp, const char *type, FILE *outf, FILE *infd);
+-
+-       WINDOW* newwin_sp(SCREEN* sp, int nlines, int ncols, int begin_y, int begin_x);
+-       int nl_sp(SCREEN* sp);
+-       int nocbreak_sp(SCREEN* sp);
+-       int noecho_sp(SCREEN* sp);
+-       void nofilter_sp(SCREEN* sp);
+-       int nonl_sp(SCREEN* sp);
+-       void noqiflush_sp(SCREEN* sp);
+-       int noraw_sp(SCREEN* sp);
+-       int pair_content_sp(SCREEN* sp, short pair, short* fg, short* bg);
+-       void qiflush_sp(SCREEN* sp);
+-
+-       int raw_sp(SCREEN* sp);
+-       void reset_color_pairs_sp(SCREEN* sp);
+-       int reset_prog_mode_sp(SCREEN* sp);
+-       int reset_shell_mode_sp(SCREEN* sp);
+-       int resetty_sp(SCREEN* sp);
+-       int resize_term_sp(SCREEN* sp, int lines, int columns);
+-       int resizeterm_sp(SCREEN* sp, int lines, int columns);
+-       int ripoffline_sp(SCREEN* sp, int line, int (*init)(WINDOW* win, int fmt));
+-       int savetty_sp(SCREEN* sp);
+-       int scr_init_sp(SCREEN* sp, const char *filename);
+-
+-       int scr_restore_sp(SCREEN* sp, const char *filename);
+-       int scr_set_sp(SCREEN* sp, const char *filename);
+-       int set_escdelay_sp(SCREEN* sp, int ms);
+-       int set_tabsize_sp(SCREEN* sp, int cols);
+-       int slk_attrset_sp(SCREEN* sp, const chtype a);
+-       int slk_attr_set_sp(SCREEN* sp, const attr_t attrs, short pair, void*opts);
+-       int slk_attroff_sp(SCREEN* sp, const chtype a);
+-       int slk_attron_sp(SCREEN* sp, const chtype a);
+-       attr_t slk_attr_sp(SCREEN* sp);
+-       int slk_clear_sp(SCREEN* sp);
+-
+-       int slk_color_sp(SCREEN* sp, short pair);
+-       int slk_init_sp(SCREEN* sp, int fmt);
+-       char* slk_label_sp(SCREEN* sp, int labnum);
+-       int slk_noutrefresh_sp(SCREEN* sp);
+-       int slk_refresh_sp(SCREEN* sp);
+-       int slk_restore_sp(SCREEN* sp);
+-       int slk_set_sp(SCREEN* sp, int labnum, const char * label, int fmt);
+-       int slk_touch_sp(SCREEN* sp);
+-       int start_color_sp(SCREEN* sp);
+-       attr_t term_attrs_sp(SCREEN* sp);
+-
+-       chtype termattrs_sp(SCREEN* sp);
+-       char* termname_sp(SCREEN* sp);
+-       int typeahead_sp(SCREEN* sp, int fd);
+-       int unget_wch_sp(SCREEN* sp, const wchar_t wc);
+-       int ungetch_sp(SCREEN* sp, int c);
+-       int ungetmouse_sp(SCREEN* sp, MEVENT* event);
+-       int use_default_colors_sp(SCREEN* sp);
+-       void use_env_sp(SCREEN* sp, bool bf);
+-       int use_legacy_coding_sp(SCREEN* sp, int level);
++       void filter_sp(SCREEN * sp);
++       int find_pair_sp(SCREEN * sp, int fg, int bg);
++       int flash_sp(SCREEN * sp);
++       int flushinp_sp(SCREEN * sp);
++       int free_pair_sp(SCREEN * sp, int pair);
++       int get_escdelay_sp(SCREEN * sp);
++       int getmouse_sp(SCREEN * sp, MEVENT * event);
++       WINDOW * getwin_sp(SCREEN * sp, FILE * filep);
++       int halfdelay_sp(SCREEN * sp, int tenths);
++       bool has_colors_sp(SCREEN * sp);
++
++       bool has_ic_sp(SCREEN * sp);
++       bool has_il_sp(SCREEN * sp);
++       int has_key_sp(SCREEN * sp, int c);
++       bool has_mouse_sp(SCREEN * sp);
++       int init_color_sp(SCREEN * sp, short color, short r, short g, short b);
++       int init_extended_color_sp(SCREEN * sp, int color, int r, int g, int b);
++       int init_extended_pair_sp(SCREEN * sp, int pair, int fg, int bg);
++       int init_pair_sp(SCREEN * sp, short pair, short fg, short bg);
++       int intrflush_sp(SCREEN * sp, WINDOW * win, bool bf);
++       int is_cbreak_sp(SCREEN * sp);
++
++       int is_echo_sp(SCREEN * sp);
++       int is_nl_sp(SCREEN * sp);
++       int is_raw_sp(SCREEN * sp);
++       bool is_term_resized_sp(SCREEN * sp, int lines, int columns);
++       bool isendwin_sp(SCREEN * sp);
++       int key_defined_sp(SCREEN * sp, const char *definition);
++       char * keybound_sp(SCREEN * sp, int keycode, int count);
++       NCURSES_CONST char * keyname_sp(SCREEN * sp, int c);
++       int keyok_sp(SCREEN * sp, int keycode, bool enable);
++       char killchar_sp(SCREEN * sp);
++
++       int killwchar_sp(SCREEN * sp, wchar_t *wc);
++       char * longname_sp(SCREEN * sp);
++       int mcprint_sp(SCREEN * sp, char *data, int len);
++       int mouseinterval_sp(SCREEN * sp, int erval);
++       mmask_t mousemask_sp(SCREEN * sp, mmask_t newmask, mmask_t *oldmask);
++       int mvcur_sp(SCREEN * sp, int oldrow, int oldcol, int newrow, int newcol);
++       int napms_sp(SCREEN * sp, int ms);
++       WINDOW * newpad_sp(SCREEN * sp, int nrows, int ncols);
++       SCREEN * new_prescr(void);
++       SCREEN * newterm_sp(SCREEN * sp, const char *type, FILE *outf, FILE *inf);
++
++       WINDOW * newwin_sp(SCREEN * sp, int nlines, int ncols, int begin_y, int begin_x);
++       int nl_sp(SCREEN * sp);
++       int nocbreak_sp(SCREEN * sp);
++       int noecho_sp(SCREEN * sp);
++       void nofilter_sp(SCREEN * sp);
++       int nonl_sp(SCREEN * sp);
++       void noqiflush_sp(SCREEN * sp);
++       int noraw_sp(SCREEN * sp);
++       int pair_content_sp(SCREEN * sp, short pair, short * fg, short * bg);
++       void qiflush_sp(SCREEN * sp);
++
++       int raw_sp(SCREEN * sp);
++       void reset_color_pairs_sp(SCREEN * sp);
++       int reset_prog_mode_sp(SCREEN * sp);
++       int reset_shell_mode_sp(SCREEN * sp);
++       int resetty_sp(SCREEN * sp);
++       int resize_term_sp(SCREEN * sp, int lines, int columns);
++       int resizeterm_sp(SCREEN * sp, int lines, int columns);
++       int ripoffline_sp(SCREEN * sp, int line, int (*init)(WINDOW * win, int fmt));
++       int savetty_sp(SCREEN * sp);
++       int scr_init_sp(SCREEN * sp, const char *filename);
++
++       int scr_restore_sp(SCREEN * sp, const char *filename);
++       int scr_set_sp(SCREEN * sp, const char *filename);
++       int set_escdelay_sp(SCREEN * sp, int ms);
++       int set_tabsize_sp(SCREEN * sp, int cols);
++       int slk_attrset_sp(SCREEN * sp, const chtype a);
++       int slk_attr_set_sp(SCREEN * sp, const attr_t attrs, short pair, void *opts);
++       int slk_attroff_sp(SCREEN * sp, const chtype a);
++       int slk_attron_sp(SCREEN * sp, const chtype a);
++       attr_t slk_attr_sp(SCREEN * sp);
++       int slk_clear_sp(SCREEN * sp);
++
++       int slk_color_sp(SCREEN * sp, short pair);
++       int slk_init_sp(SCREEN * sp, int fmt);
++       char * slk_label_sp(SCREEN * sp, int labnum);
++       int slk_noutrefresh_sp(SCREEN * sp);
++       int slk_refresh_sp(SCREEN * sp);
++       int slk_restore_sp(SCREEN * sp);
++       int slk_set_sp(SCREEN * sp, int labnum, const char * label, int fmt);
++       int slk_touch_sp(SCREEN * sp);
++       int start_color_sp(SCREEN * sp);
++       attr_t term_attrs_sp(SCREEN * sp);
++
++       chtype termattrs_sp(SCREEN * sp);
++       char * termname_sp(SCREEN * sp);
++       int typeahead_sp(SCREEN * sp, int fd);
++       int unget_wch_sp(SCREEN * sp, const wchar_t wc);
++       int ungetch_sp(SCREEN * sp, int c);
++       int ungetmouse_sp(SCREEN * sp, MEVENT * event);
++       int use_default_colors_sp(SCREEN * sp);
++       void use_env_sp(SCREEN * sp, bool bf);
++       int use_legacy_coding_sp(SCREEN * sp, int level);
+        void use_tioctl_sp(SCREEN *sp, bool bf);
+ 
+-       int vid_attr_sp(SCREEN* sp, attr_t attrs, short pair, void * opts);
+-       int vid_puts_sp(SCREEN* sp, attr_t attrs, short pair, void * opts, NCURSES_SP_OUTC putc);
+-       int vidattr_sp(SCREEN* sp, chtype attrs);
+-       int vidputs_sp(SCREEN* sp, chtype attrs, NCURSES_SP_OUTC putc);
+-       wchar_t* wunctrl_sp(SCREEN* sp, cchar_t *wch);
++       int vid_attr_sp(SCREEN * sp, attr_t attrs, short pair, void * opts);
++       int vid_puts_sp(SCREEN * sp, attr_t attrs, short pair, void * opts, NCURSES_SP_OUTC putc);
++       int vidattr_sp(SCREEN * sp, chtype attrs);
++       int vidputs_sp(SCREEN * sp, chtype attrs, NCURSES_SP_OUTC putc);
++       wchar_t * wunctrl_sp(SCREEN * sp, cchar_t *wch);
+ 
+        #include <form.h>
+ 
+-       FORM* new_form_sp(SCREEN* sp, FIELD **fields);
++       FORM * new_form_sp(SCREEN * sp, FIELD **fields);
+ 
+        #include <menu.h>
+ 
+-       MENU* new_menu_sp(SCREEN* sp, ITEM **items);
++       MENU * new_menu_sp(SCREEN * sp, ITEM **items);
+ 
+        #include <panel.h>
+ 
+-       PANEL* ceiling_panel(SCREEN* sp);
+-       PANEL* ground_panel(SCREEN* sp);
+-       void update_panels_sp(SCREEN* sp);
++       PANEL * ceiling_panel(SCREEN * sp);
++       PANEL * ground_panel(SCREEN * sp);
++       void update_panels_sp(SCREEN * sp);
+ 
+        #include <term.h>
+ 
+-       int del_curterm_sp(SCREEN* sp, TERMINAL *oterm);
+-       int putp_sp(SCREEN* sp, const char *str);
+-       int restartterm_sp(SCREEN* sp, NCURSES_CONST char*term, int filedes, int *errret);
+-       TERMINAL* set_curterm_sp(SCREEN* sp, TERMINAL*nterm);
+-       int tgetent_sp(SCREEN* sp, char *bp, const char *name);
+-       int tgetflag_sp(SCREEN* sp, const char *capname);
+-       int tgetnum_sp(SCREEN* sp, const char *capname);
+-       char* tgetstr_sp(SCREEN* sp, const char *capname, char **area);
+-       char* tgoto_sp(SCREEN* sp, const char *capname, int col, int row);
+-       int tigetflag_sp(SCREEN* sp, const char *capname);
++       int del_curterm_sp(SCREEN * sp, TERMINAL *oterm);
++       int putp_sp(SCREEN * sp, const char *str);
++       int restartterm_sp(SCREEN * sp, NCURSES_CONST char *term, int filedes, int *errret);
++       TERMINAL * set_curterm_sp(SCREEN * sp, TERMINAL *nterm);
++       int tgetent_sp(SCREEN * sp, char *bp, const char *name);
++       int tgetflag_sp(SCREEN * sp, const char *capname);
++       int tgetnum_sp(SCREEN * sp, const char *capname);
++       char * tgetstr_sp(SCREEN * sp, const char *capname, char **area);
++       char * tgoto_sp(SCREEN * sp, const char *capname, int col, int row);
++       int tigetflag_sp(SCREEN * sp, const char *capname);
+ 
+-       int tigetnum_sp(SCREEN* sp, const char *capname);
+-       char* tigetstr_sp(SCREEN* sp, const char *capname);
++       int tigetnum_sp(SCREEN * sp, const char *capname);
++       char * tigetstr_sp(SCREEN * sp, const char *capname);
+        /* tparm_sp may use 9 long parameters rather than being variadic */
+-       char* tparm_sp(SCREEN* sp, const char *str, ...);
+-       int tputs_sp(SCREEN* sp, const char *str, int affcnt, NCURSES_SP_OUTC putc);
++       char * tparm_sp(SCREEN * sp, const char *str, ...);
++       int tputs_sp(SCREEN * sp, const char *str, int affcnt, NCURSES_SP_OUTC putc);
+ 
+        #include <unctrl.h>
+ 
+-       NCURSES_CONST char* unctrl_sp(SCREEN* sp, chtype ch);
++       NCURSES_CONST char * unctrl_sp(SCREEN * sp, chtype ch);
+ 
+ 
+ 
                                                                                                                                                                                                                    DESCRIPTION
                                                                                                                                                                                                                    +@@ -294,7 +294,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                 curs_sp_funcs(3x)
++ncurses 6.5                       2025-02-01                 curs_sp_funcs(3x)
+ 
                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                                      
+Index: doc/html/man/curs_termattrs.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_termattrs.3x.html	2025-01-19 00:54:59.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_termattrs.3x.html	2025-02-02 00:43:58.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_termattrs.3x,v 1.57 2025/01/19 00:51:10 tom Exp @
++  * @Id: curs_termattrs.3x,v 1.59 2025/02/01 22:49:13 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_termattrs 3x 2025-01-18 ncurses 6.5 Library calls
++curs_termattrs 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                      curs_termattrs 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                      
++
                                                                                                                                                                                                                      curs_termattrs 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                      + curs_termattrs(3x)               Library calls              curs_termattrs(3x)
+ 
+@@ -153,7 +153,7 @@
+ 
+        SVr2 (1984) added baudrate, erasechar, killchar, has_ic, and has_il.
+ 
+-       SVr3  (1987)  furnished  termname.   SVr3.1  later  that  year supplied
++       SVr3  (1987)  supplied  termname.   Later  that  year,  SVr3.1  brought
+        termattrs.
+ 
+        X/Open Curses  Issue 4  (1995)  specified  erasewchar,  killwchar,  and
+@@ -165,7 +165,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                curs_termattrs(3x)
++ncurses 6.5                       2025-02-01                curs_termattrs(3x)
+ 
                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                                        
+Index: doc/html/man/curs_termcap.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_termcap.3x.html	2025-01-19 00:54:59.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_termcap.3x.html	2025-02-02 00:43:58.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_termcap.3x,v 1.103 2025/01/19 00:51:10 tom Exp @
++  * @Id: curs_termcap.3x,v 1.105 2025/02/01 22:49:13 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_termcap 3x 2025-01-18 ncurses 6.5 Library calls
++curs_termcap 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                        curs_termcap 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                        
++
                                                                                                                                                                                                                        curs_termcap 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                        + curs_termcap(3x)                 Library calls                curs_termcap(3x)
+ 
+@@ -373,7 +373,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                  curs_termcap(3x)
++ncurses 6.5                       2025-02-01                  curs_termcap(3x)
+ 
                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                                          
+Index: doc/html/man/curs_util.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_util.3x.html	2025-01-19 00:55:00.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_util.3x.html	2025-02-02 00:43:58.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_util.3x,v 1.134 2025/01/19 00:51:10 tom Exp @
++  * @Id: curs_util.3x,v 1.136 2025/02/01 22:49:13 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_util 3x 2025-01-18 ncurses 6.5 Library calls
++curs_util 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                          curs_util 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                          
++
                                                                                                                                                                                                                          curs_util 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                          + curs_util(3x)                    Library calls                   curs_util(3x)
+ 
+@@ -402,13 +402,13 @@
+ 
+ 
+ 
                                                                                                                                                                                                                          HISTORY
                                                                                                                                                                                                                          +-       4BSD (1980) defined unctrl (as a macro, in unctrl.h).
++       4BSD (1980) introduced unctrl, defining it as a macro in unctrl.h.
+ 
+-       SVr2 (1984) introduced delay_output, flushinp, and keyname.
++       SVr2 (1984) added delay_output, flushinp, and keyname.
+ 
+-       SVr3 (1987) added filter.  Later that year, SVr3.1 brought  getwin  and
+-       putwin,  reading  and writing window dumps with fread(3) and fwrite(3),
+-       respectively.
++       SVr3 (1987) supplied filter.  Later that year,  SVr3.1  brought  getwin
++       and  putwin,  reading  and  writing  window  dumps  with  fread(3)  and
++       fwrite(3), respectively.
+ 
+        SVr4 (1989) supplied use_env.
+ 
+@@ -424,7 +424,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                     curs_util(3x)
++ncurses 6.5                       2025-02-01                     curs_util(3x)
+ 
                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                                            
+Index: doc/html/man/curs_window.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/curs_window.3x.html	2025-01-19 00:55:00.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/curs_window.3x.html	2025-02-02 00:43:58.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_window.3x,v 1.64 2025/01/19 00:51:10 tom Exp @
++  * @Id: curs_window.3x,v 1.66 2025/02/02 00:04:58 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_window 3x 2025-01-18 ncurses 6.5 Library calls
++curs_window 3x 2025-02-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                                            curs_window 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                                            
++
                                                                                                                                                                                                                            curs_window 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                            + curs_window(3x)                  Library calls                 curs_window(3x)
+ 
+@@ -242,7 +242,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                   curs_window(3x)
++ncurses 6.5                       2025-02-01                   curs_window(3x)
+ 
                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                                              
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.5-20250125+/doc/html/man/ncurses.3x.html	2025-01-19 00:55:01.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/ncurses.3x.html	2025-02-02 00:44:00.000000000 +0000
+@@ -61,7 +61,7 @@
+        displays  with  output  optimized  to minimize screen updates.  ncurses
+        replaces the curses libraries from System V Release 4 Unix ("SVr4") and
+        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
+-       document describes ncurses version 6.5 (patch 20250118).
++       document describes ncurses version 6.5 (patch 20250201).
+ 
+        ncurses permits control of the terminal screen's contents;  abstraction
+        and  subdivision thereof with windows and pads; acquisition of keyboard
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.5-20250125+/doc/html/man/terminfo.5.html	2025-01-19 00:55:01.000000000 +0000
++++ ncurses-6.5-20250201/doc/html/man/terminfo.5.html	2025-02-02 00:44:00.000000000 +0000
+@@ -71,7 +71,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This document describes ncurses version 6.5 (patch 20250118).
++       This document describes ncurses version 6.5 (patch 20250201).
+ 
+ 
+ 
                                                                                                                                                    terminfo Entry Syntax
                                                                                                                                                    +Index: man/curs_add_wch.3x
+Prereq:  1.88 
+--- ncurses-6.5-20250125+/man/curs_add_wch.3x	2025-01-19 00:49:39.000000000 +0000
++++ ncurses-6.5-20250201/man/curs_add_wch.3x	2025-02-01 23:54:03.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_add_wch.3x,v 1.88 2025/01/19 00:49:39 tom Exp $
+-.TH curs_add_wch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_add_wch.3x,v 1.102 2025/02/01 23:54:03 tom Exp $
++.TH curs_add_wch 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -60,10 +60,70 @@
+ \fBint add_wch(const cchar_t *\fIwch\fP);
+ \fBint wadd_wch(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fP);
+ \fBint mvadd_wch(int \fIy\fP, int \fIx\fP, const cchar_t *\fIwch\fP);
+-\fBint mvwadd_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t *\fIwch\fP);
++\fBint mvwadd_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP,
++      const cchar_t *\fIwch\fP);
+ .PP
+ \fBint echo_wchar(const cchar_t *\fIwch\fP);
+ \fBint wecho_wchar(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fP);
++.PP
++\fI/* (integer) constants */\fP
++/*\fI .\|.\|. */ \fBWACS_BLOCK;\fR
++/*\fI .\|.\|. */ \fBWACS_BOARD;\fR
++/*\fI .\|.\|. */ \fBWACS_BTEE;\fR
++/*\fI .\|.\|. */ \fBWACS_BULLET;\fR
++/*\fI .\|.\|. */ \fBWACS_CKBOARD;\fR
++/*\fI .\|.\|. */ \fBWACS_DARROW;\fR
++/*\fI .\|.\|. */ \fBWACS_DEGREE;\fR
++/*\fI .\|.\|. */ \fBWACS_DIAMOND;\fR
++/*\fI .\|.\|. */ \fBWACS_HLINE;\fR
++/*\fI .\|.\|. */ \fBWACS_LANTERN;\fR
++/*\fI .\|.\|. */ \fBWACS_LARROW;\fR
++/*\fI .\|.\|. */ \fBWACS_LLCORNER;\fR
++/*\fI .\|.\|. */ \fBWACS_LRCORNER;\fR
++/*\fI .\|.\|. */ \fBWACS_LTEE;\fR
++/*\fI .\|.\|. */ \fBWACS_PLMINUS;\fR
++/*\fI .\|.\|. */ \fBWACS_PLUS;\fR
++/*\fI .\|.\|. */ \fBWACS_RARROW;\fR
++/*\fI .\|.\|. */ \fBWACS_RTEE;\fR
++/*\fI .\|.\|. */ \fBWACS_S1;\fR
++/*\fI .\|.\|. */ \fBWACS_S9;\fR
++/*\fI .\|.\|. */ \fBWACS_TTEE;\fR
++/*\fI .\|.\|. */ \fBWACS_UARROW;\fR
++/*\fI .\|.\|. */ \fBWACS_ULCORNER;\fR
++/*\fI .\|.\|. */ \fBWACS_URCORNER;\fR
++/*\fI .\|.\|. */ \fBWACS_VLINE;\fR
++\fI/* extensions */\fP
++/*\fI .\|.\|. */ \fBWACS_GEQUAL;\fR
++/*\fI .\|.\|. */ \fBWACS_LEQUAL;\fR
++/*\fI .\|.\|. */ \fBWACS_NEQUAL;\fR
++/*\fI .\|.\|. */ \fBWACS_PI;\fR
++/*\fI .\|.\|. */ \fBWACS_S3;\fR
++/*\fI .\|.\|. */ \fBWACS_S7;\fR
++/*\fI .\|.\|. */ \fBWACS_STERLING;\fR
++\fI/* extensions for thick lines */\fP
++/*\fI .\|.\|. */ \fBWACS_T_BTEE;\fR
++/*\fI .\|.\|. */ \fBWACS_T_HLINE;\fR
++/*\fI .\|.\|. */ \fBWACS_T_LLCORNER;\fR
++/*\fI .\|.\|. */ \fBWACS_T_LRCORNER;\fR
++/*\fI .\|.\|. */ \fBWACS_T_LTEE;\fR
++/*\fI .\|.\|. */ \fBWACS_T_PLUS;\fR
++/*\fI .\|.\|. */ \fBWACS_T_RTEE;\fR
++/*\fI .\|.\|. */ \fBWACS_T_TTEE;\fR
++/*\fI .\|.\|. */ \fBWACS_T_ULCORNER;\fR
++/*\fI .\|.\|. */ \fBWACS_T_URCORNER;\fR
++/*\fI .\|.\|. */ \fBWACS_T_VLINE;\fR
++\fI/* extensions for double lines */\fP
++/*\fI .\|.\|. */ \fBWACS_D_BTEE;\fR
++/*\fI .\|.\|. */ \fBWACS_D_HLINE;\fR
++/*\fI .\|.\|. */ \fBWACS_D_LLCORNER;\fR
++/*\fI .\|.\|. */ \fBWACS_D_LRCORNER;\fR
++/*\fI .\|.\|. */ \fBWACS_D_LTEE;\fR
++/*\fI .\|.\|. */ \fBWACS_D_PLUS;\fR
++/*\fI .\|.\|. */ \fBWACS_D_RTEE;\fR
++/*\fI .\|.\|. */ \fBWACS_D_TTEE;\fR
++/*\fI .\|.\|. */ \fBWACS_D_ULCORNER;\fR
++/*\fI .\|.\|. */ \fBWACS_D_URCORNER;\fR
++/*\fI .\|.\|. */ \fBWACS_D_VLINE;\fR
+ .fi
+ .SH DESCRIPTION
+ .SS wadd_wch
+@@ -231,68 +291,76 @@
+ \&	Unicode	ACS	acsc	\&
+ Symbol	Default	Default	char	Glyph Name
+ _
+-WACS_BLOCK	0x25ae	#	0	T{
++WACS_BLOCK	U+25ae	#	0	T{
+ solid square block
+ T}
+-WACS_BOARD	0x2592	#	h	board of squares
+-WACS_BTEE	0x2534	+	v	bottom tee
+-WACS_BULLET	0x00b7	o	~	bullet
+-WACS_CKBOARD	0x2592	:	a	T{
++WACS_BOARD	U+2592	#	h	board of squares
++WACS_BTEE	U+2534	+	v	bottom tee
++WACS_BULLET	U+00b7	o	~	bullet
++WACS_CKBOARD	U+2592	:	a	T{
+ checker board (stipple)
+ T}
+-WACS_DARROW	0x2193	v	.	T{
++WACS_DARROW	U+2193	v	.	T{
+ arrow pointing down
+ T}
+-WACS_DEGREE	0x00b0	'	f	degree symbol
+-WACS_DIAMOND	0x25c6	+	\(ga	diamond
+-WACS_GEQUAL	0x2265	>	>	T{
++WACS_DEGREE	U+00b0	'	f	degree symbol
++WACS_DIAMOND	U+25c6	+	\(ga	diamond
++WACS_GEQUAL	U+2265	>	>	T{
++.if n .na \" avoid adjustment warning from groff
+ greater-than-or-equal-to
+ T}
+-WACS_HLINE	0x2500	\-	q	horizontal line
+-WACS_LANTERN	0x2603	#	i	lantern symbol
+-WACS_LARROW	0x2190	<	,	T{
++WACS_HLINE	U+2500	\-	q	horizontal line
++WACS_LANTERN	U+2603	#	i	lantern symbol
++WACS_LARROW	U+2190	<	,	T{
+ arrow pointing left
+ T}
+-WACS_LEQUAL	0x2264	<	y	T{
++WACS_LEQUAL	U+2264	<	y	T{
++.if n .na \" avoid adjustment warning from groff
+ less-than-or-equal-to
+ T}
+-WACS_LLCORNER	0x2514	+	m	T{
++WACS_LLCORNER	U+2514	+	m	T{
+ lower left-hand corner
+ T}
+-WACS_LRCORNER	0x2518	+	j	T{
++WACS_LRCORNER	U+2518	+	j	T{
+ lower right-hand corner
+ T}
+-WACS_LTEE	0x2524	+	t	left tee
+-WACS_NEQUAL	0x2260	!	|	not-equal
+-WACS_PI	0x03c0	*	{	greek pi
+-WACS_PLMINUS	0x00b1	#	g	plus/minus
+-WACS_PLUS	0x253c	+	n	plus
+-WACS_RARROW	0x2192	>	+	T{
++WACS_LTEE	U+2524	+	t	left tee
++WACS_NEQUAL	U+2260	!	|	not-equal
++WACS_PI	U+03c0	*	{	greek pi
++WACS_PLMINUS	U+00b1	#	g	plus/minus
++WACS_PLUS	U+253c	+	n	plus
++WACS_RARROW	U+2192	>	+	T{
+ arrow pointing right
+ T}
+-WACS_RTEE	0x251c	+	u	right tee
+-WACS_S1	0x23ba	\-	o	scan line 1
+-WACS_S3	0x23bb	\-	p	scan line 3
+-WACS_S7	0x23bc	\-	r	scan line 7
+-WACS_S9	0x23bd	\&_	s	scan line 9
+-WACS_STERLING	0x00a3	f	}	T{
++WACS_RTEE	U+251c	+	u	right tee
++WACS_S1	U+23ba	\-	o	scan line 1
++WACS_S3	U+23bb	\-	p	scan line 3
++WACS_S7	U+23bc	\-	r	scan line 7
++WACS_S9	U+23bd	\&_	s	scan line 9
++WACS_STERLING	U+00a3	f	}	T{
++.if n .na \" avoid adjustment warning from groff
+ pound-sterling symbol
+ T}
+-WACS_TTEE	0x252c	+	w	top tee
+-WACS_UARROW	0x2191 	^	\-	T{
++WACS_TTEE	U+252c	+	w	top tee
++WACS_UARROW	U+2191 	^	\-	T{
+ arrow pointing up
+ T}
+-WACS_ULCORNER	0x250c	+	l	T{
++WACS_ULCORNER	U+250c	+	l	T{
+ upper left-hand corner
+ T}
+-WACS_URCORNER	0x2510	+	k	T{
++WACS_URCORNER	U+2510	+	k	T{
+ upper right-hand corner
+ T}
+-WACS_VLINE	0x2502	|	x	vertical line
++WACS_VLINE	U+2502	|	x	vertical line
+ .TE
+ .PP
+-The wide-character configuration of \fI\%ncurses\fP also defines symbols
+-for thick lines (\fBacsc\fP \*(``J\*('' to \*(``V\*(''):
++The
++.I \%ncurses
++wide API also defines symbols for thick lines
++.RB \%( acsc
++\*(``J\*('' through \*(``N\*('',
++\*(``T\*('' through \*(``X\*('',
++and \*(``Q\*(''):
+ .PP
+ .TS
+ Lb Lb Lb Lb Lb
+@@ -301,42 +369,45 @@
+ \&	Unicode	ASCII	acsc	\&
+ ACS Name	Default	Default	Char	Glyph Name
+ _
+-WACS_T_BTEE	0x253b	+	V	T{
++WACS_T_BTEE	U+253b	+	V	T{
+ thick tee pointing up
+ T}
+-WACS_T_HLINE	0x2501	-	Q	T{
++WACS_T_HLINE	U+2501	-	Q	T{
+ thick horizontal line
+ T}
+-WACS_T_LLCORNER	0x2517	+	M	T{
++WACS_T_LLCORNER	U+2517	+	M	T{
+ thick lower left corner
+ T}
+-WACS_T_LRCORNER	0x251b	+	J	T{
++WACS_T_LRCORNER	U+251b	+	J	T{
+ thick lower right corner
+ T}
+-WACS_T_LTEE	0x252b	+	T	T{
++WACS_T_LTEE	U+252b	+	T	T{
+ thick tee pointing right
+ T}
+-WACS_T_PLUS	0x254b	+	N	T{
++WACS_T_PLUS	U+254b	+	N	T{
+ thick large plus
+ T}
+-WACS_T_RTEE	0x2523	+	U	T{
++WACS_T_RTEE	U+2523	+	U	T{
+ thick tee pointing left
+ T}
+-WACS_T_TTEE	0x2533	+	W	T{
++WACS_T_TTEE	U+2533	+	W	T{
+ thick tee pointing down
+ T}
+-WACS_T_ULCORNER	0x250f	+	L	T{
++WACS_T_ULCORNER	U+250f	+	L	T{
+ thick upper left corner
+ T}
+-WACS_T_URCORNER	0x2513	+	K	T{
++WACS_T_URCORNER	U+2513	+	K	T{
+ thick upper right corner
+ T}
+-WACS_T_VLINE	0x2503	|	X	T{
++WACS_T_VLINE	U+2503	|	X	T{
+ thick vertical line
+ T}
+ .TE
+ .PP
+-and for double-lines (\fBacsc\fP \*(``A\*('' to \*(``I\*(''):
++and for double lines
++.RB \%( acsc
++\*(``A\*('' through \*(``I\*('',
++plus \*(``R\*('' and \*(``Y\*(''):
+ .PP
+ .TS
+ Lb Lb Lb Lb Lb
+@@ -345,37 +416,37 @@
+ \&	Unicode	ASCII	acsc	\&
+ ACS Name	Default	Default	Char	Glyph Name
+ _
+-WACS_D_BTEE	0x2569	+	H	T{
++WACS_D_BTEE	U+2569	+	H	T{
+ double tee pointing up
+ T}
+-WACS_D_HLINE	0x2550	-	R	T{
++WACS_D_HLINE	U+2550	-	R	T{
+ double horizontal line
+ T}
+-WACS_D_LLCORNER	0x255a	+	D	T{
++WACS_D_LLCORNER	U+255a	+	D	T{
+ double lower left corner
+ T}
+-WACS_D_LRCORNER	0x255d	+	A	T{
++WACS_D_LRCORNER	U+255d	+	A	T{
+ double lower right corner
+ T}
+-WACS_D_LTEE	0x2560	+	F	T{
++WACS_D_LTEE	U+2560	+	F	T{
+ double tee pointing right
+ T}
+-WACS_D_PLUS	0x256c	+	E	T{
++WACS_D_PLUS	U+256c	+	E	T{
+ double large plus
+ T}
+-WACS_D_RTEE	0x2563	+	G	T{
++WACS_D_RTEE	U+2563	+	G	T{
+ double tee pointing left
+ T}
+-WACS_D_TTEE	0x2566	+	I	T{
++WACS_D_TTEE	U+2566	+	I	T{
+ double tee pointing down
+ T}
+-WACS_D_ULCORNER	0x2554	+	C	T{
++WACS_D_ULCORNER	U+2554	+	C	T{
+ double upper left corner
+ T}
+-WACS_D_URCORNER	0x2557	+	B	T{
++WACS_D_URCORNER	U+2557	+	B	T{
+ double upper right corner
+ T}
+-WACS_D_VLINE	0x2551	|	Y	T{
++WACS_D_VLINE	U+2551	|	Y	T{
+ double vertical line
+ T}
+ .TE
+@@ -410,13 +481,18 @@
+ .I curses
+ screen has not been initialized,
+ .bP
++(for functions taking a
++.I \%WINDOW
++pointer argument)
+ .I win
+-is
+-.IR NULL ","
++is a null pointer,
+ .bP
+ wrapping to a new line is impossible because \fB\%scrollok\fP(3X) has
+ not been called on
+ .I win
++(or
++.BR stdscr ","
++as applicable)
+ when writing to its bottom right location is attempted,
+ or
+ .bP
+@@ -435,71 +511,136 @@
+ .B echo_wchar
+ may be implemented as macros.
+ .SH EXTENSIONS
+-.SS TABSIZE
++The symbols
++.RI \%( WACS_S3 ","
++.IR \%WACS_S7 ","
++.IR \%WACS_LEQUAL ","
++.IR \%WACS_GEQUAL ","
++.IR \%WACS_PI ","
++.IR \%WACS_NEQUAL ","
++and
++.IR \%WACS_STERLING ")"
++are not standard.
++However,
++many publicly available
++.I \%term\%info
++entries include
++.I \%acs_chars
++.RB \%( acsc )
++capabilities in which their key characters
++.RB ( pryz{|} )
++are embedded,
++and a second-hand list of their character descriptions has come to
++light.
+ The
+-.B TABSIZE
+-variable is implemented in SVr4 and other versions of
+-.IR curses ,
+-but is not specified by X/Open Curses
+-(see \fBcurs_variables\fP(3X)).
++.I \%ncurses
++developers invented WACS-prefixed names for them.
++.\" in v5_2_20020209
+ .SH PORTABILITY
++Applications employing
++.I \%ncurses
++extensions should condition their use on the visibility of the
++.B \%NCURSES_VERSION
++preprocessor macro.
++.PP
+ These functions are described in X/Open Curses Issue\ 4.
+ It specifies no error conditions for them.
+ .PP
+ The defaults specified for forms-drawing characters apply in the POSIX
+ locale.
+ 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\fP.
++a pointer to
++.I \%cchar_t
++data, e.g., in the discussion of
++.IR \%border_set "."
+ A few implementations are problematic:
+ .bP
+-NetBSD curses defines the symbols as a \fBwchar_t\fP within a \fBcchar_t\fP.
++NetBSD
++.I curses
++defines the symbols as a
++.I \%wchar_t
++within a
++.IR \%cchar_t "."
+ .bP
+-HP-UX curses equates some of the \fBACS_\fP symbols
+-to the analogous \fBWACS_\fP symbols as if the \fBACS_\fP symbols were
++HP-UX
++.I curses
++equates some of the
++.I \%ACS_
++symbols to the analogous
++.I \%WACS_
++symbols as if the
++.I \%ACS_
++symbols were
+ wide characters.
+ The misdefined symbols are the arrows
+ and other symbols which are not used for line-drawing.
+ .PP
+ X/Open Curses does not specify symbols for thick- or double-lines.
+-SVr4 curses implementations defined their line-drawing symbols in
+-terms of intermediate symbols.
+-This implementation extends those symbols, providing new definitions
+-which are not in the SVr4 implementations.
++SVr4
++.I curses
++implementations defined their line-drawing symbols
++in terms of intermediate symbols.
++.I \%ncurses
++extends those symbols,
++providing new definitions not found in SVr4 implementations.
+ .PP
+ Not all Unicode-capable terminals provide support for VT100-style
+-alternate character sets (i.e., the \fBacsc\fP capability),
++alternate character sets (i.e., the
++.I \%acsc_chars
++.RB ( acsc )
++capability),
+ with their corresponding line-drawing characters.
+ X/Open Curses did not address the aspect of integrating Unicode with
+ line-drawing characters.
+-Existing implementations of Unix curses (AIX, HP-UX, Solaris)
+-use only the \fBacsc\fP character-mapping to provide this feature.
+-As a result, those implementations can only use single-byte line-drawing
+-characters.
+-\fI\%ncurses\fP 5.3 (2002) provided a table of Unicode values to solve
++Existing implementations of System\ V
++.I curses
++(AIX, HP-UX, Solaris)
++use only the
++.I \%acsc_chars
++.RB ( acsc )
++character-mapping to provide this feature.
++As a result,
++those implementations can use only single-byte line-drawing characters.
++.I \%ncurses
++5.3 (2002) provided a table of Unicode values to solve
+ these problems.
+-NetBSD curses incorporated that table in 2010.
++NetBSD
++.I curses
++incorporated that table in 2010.
+ .PP
+-In this implementation, the Unicode values are used instead of the
+-terminal description's \fBacsc\fP mapping as discussed in
++.I \%ncurses
++uses the Unicode values instead of the terminal type description's
++.I \%acsc_chars
++.RB ( acsc )
++mapping as discussed in
+ \fB\%ncurses\fP(3X) for the environment variable
+-\fINCURSES_NO_UTF8_ACS\fP.
++.IR \%NCURSES_NO_UTF8_ACS "."
+ In contrast, for the same cases, the line-drawing characters
+ described in \fB\%addch\fP(3X) will use only the ASCII default values.
+ .PP
+ Having Unicode available does not solve all of the problems with
+-line-drawing for curses:
++line-drawing for
++.IR curses ":"
+ .bP
+ The closest Unicode equivalents to the
+-VT100 graphics \fIS1\fP, \fIS3\fP, \fIS7\fP and \fIS9\fP
++VT100 graphics
++.IR S1 ","
++.IR S3 ","
++.IR S7 ","
++and
++.I S9
+ frequently are not displayed at
+ the regular intervals which the terminal used.
+ .bP
+-The \fIlantern\fP is a special case.
++The
++.I lantern
++is a special case.
+ It originated with the AT&T 4410 terminal in the early 1980s.
+ There is no accessible documentation depicting the lantern symbol
+ on the AT&T terminal.
+ .IP
+-Lacking documentation, most readers assume that a \fIstorm lantern\fP
++Lacking documentation, most readers assume that a
++.I "storm lantern"
+ was intended.
+ But there are several possibilities, all with problems.
+ .IP
+@@ -509,7 +650,9 @@
+ and as a result are unavailable on many terminals.
+ They are not storm lanterns, in any case.
+ .IP
+-Most \fIstorm lanterns\fP have a tapering glass chimney
++Most
++.I "storm lanterns"
++have a tapering glass chimney
+ (to guard against tipping);
+ some have a wire grid protecting the chimney.
+ .IP
+@@ -553,15 +696,15 @@
+ .I \%ncurses
+ adds the non-spacing character to the active complex character.
+ .SH HISTORY
+-These functions were initially specified by X/Open Curses Issue\ 4
+-(1995).
+-The System\ V Interface Definition Version\ 4
++X/Open Curses Issue\ 4 (1995) initially specified these functions.
++The System\ V Interface Definition (SVID) Version\ 4
+ of the same year
+ specified functions named
+ .I \%waddwch
++(and the usual variants),
++.IR \%echowchar ","
+ and
+-.I \%wechowchar
+-(and the usual variants).
++.IR \%wechowchar "."
+ .\" SVID 4, vol 3., p. 475
+ These were later additions to
+ .RI SVr4. x ,
+@@ -574,6 +717,29 @@
+ .I \%wchar_t
+ instead of
+ .IR \%cchar_t "."
++SVID defined no
++.I \% WACS_
++symbols.
++.PP
++X/Open Curses Issue\ 4 also defined many of the
++.I WACS_
++constants,
++excepting
++.IR \%WACS_GEQUAL ","
++.IR \%WACS_LEQUAL ","
++.IR \%WACS_NEQUAL ","
++.IR \%WACS_PI ","
++.IR \%WACS_S3 ","
++.IR \%WACS_S7 ","
++and
++.IR \%WACS_STERLING ";"
++and those for drawing thick and double lines.
++.PP
++.I \%ncurses
++5.3 (2002)
++furnished the remaining
++.I WACS_
++constants.
+ .SH SEE ALSO
+ \fB\%curs_addch\fP(3X) describes comparable functions of the
+ .I \%ncurses
+Index: man/curs_add_wchstr.3x
+Prereq:  1.52 
+--- ncurses-6.5-20250125+/man/curs_add_wchstr.3x	2025-01-19 00:49:39.000000000 +0000
++++ ncurses-6.5-20250201/man/curs_add_wchstr.3x	2025-02-01 22:57:57.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_add_wchstr.3x,v 1.52 2025/01/19 00:49:39 tom Exp $
+-.TH curs_add_wchstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_add_wchstr.3x,v 1.55 2025/02/01 22:57:57 tom Exp $
++.TH curs_add_wchstr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -144,8 +144,9 @@
+ X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+ .SH HISTORY
+-These functions were initially specified by X/Open Curses Issue\ 4.
+-The System\ V Interface Definition Version\ 4 (1995),
++X/Open Curses Issue\ 4 (1995) initially specified these functions.
++The System\ V Interface Definition Version\ 4
++of the same year
+ specified functions named
+ .I \%waddwchstr
+ and
+Index: man/curs_addch.3x
+Prereq:  1.113 
+--- ncurses-6.5-20250125+/man/curs_addch.3x	2025-01-19 00:49:39.000000000 +0000
++++ ncurses-6.5-20250201/man/curs_addch.3x	2025-02-01 23:54:03.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addch.3x,v 1.113 2025/01/19 00:49:39 tom Exp $
+-.TH curs_addch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addch.3x,v 1.122 2025/02/01 23:54:03 tom Exp $
++.TH curs_addch 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -70,6 +70,41 @@
+ .PP
+ \fBint echochar(const chtype \fIch\fP);
+ \fBint wechochar(WINDOW *\fIwin\fP, const chtype \fIch\fP);
++.PP
++\fI/* (integer) constants */\fP
++/*\fI .\|.\|. */ \fBACS_BLOCK;\fR
++/*\fI .\|.\|. */ \fBACS_BOARD;\fR
++/*\fI .\|.\|. */ \fBACS_BTEE;\fR
++/*\fI .\|.\|. */ \fBACS_BULLET;\fR
++/*\fI .\|.\|. */ \fBACS_CKBOARD;\fR
++/*\fI .\|.\|. */ \fBACS_DARROW;\fR
++/*\fI .\|.\|. */ \fBACS_DEGREE;\fR
++/*\fI .\|.\|. */ \fBACS_DIAMOND;\fR
++/*\fI .\|.\|. */ \fBACS_HLINE;\fR
++/*\fI .\|.\|. */ \fBACS_LANTERN;\fR
++/*\fI .\|.\|. */ \fBACS_LARROW;\fR
++/*\fI .\|.\|. */ \fBACS_LLCORNER;\fR
++/*\fI .\|.\|. */ \fBACS_LRCORNER;\fR
++/*\fI .\|.\|. */ \fBACS_LTEE;\fR
++/*\fI .\|.\|. */ \fBACS_PLMINUS;\fR
++/*\fI .\|.\|. */ \fBACS_PLUS;\fR
++/*\fI .\|.\|. */ \fBACS_RARROW;\fR
++/*\fI .\|.\|. */ \fBACS_RTEE;\fR
++/*\fI .\|.\|. */ \fBACS_S1;\fR
++/*\fI .\|.\|. */ \fBACS_S9;\fR
++/*\fI .\|.\|. */ \fBACS_TTEE;\fR
++/*\fI .\|.\|. */ \fBACS_UARROW;\fR
++/*\fI .\|.\|. */ \fBACS_ULCORNER;\fR
++/*\fI .\|.\|. */ \fBACS_URCORNER;\fR
++/*\fI .\|.\|. */ \fBACS_VLINE;\fR
++\fI/* extensions */\fP
++/*\fI .\|.\|. */ \fBACS_GEQUAL;\fR
++/*\fI .\|.\|. */ \fBACS_LEQUAL;\fR
++/*\fI .\|.\|. */ \fBACS_NEQUAL;\fR
++/*\fI .\|.\|. */ \fBACS_PI;\fR
++/*\fI .\|.\|. */ \fBACS_S3;\fR
++/*\fI .\|.\|. */ \fBACS_S7;\fR
++/*\fI .\|.\|. */ \fBACS_STERLING;\fR
+ .fi
+ .SH DESCRIPTION
+ .SS waddch
+@@ -268,13 +303,18 @@
+ .I curses
+ screen has not been initialized,
+ .bP
++(for functions taking a
++.I \%WINDOW
++pointer argument)
+ .I win
+-is
+-.IR NULL ","
++is a null pointer,
+ .bP
+ wrapping to a new line is impossible because \fB\%scrollok\fP(3X) has
+ not been called on
+ .I win
++(or
++.BR stdscr ","
++as applicable)
+ when a write to its bottom right location is attempted,
+ or
+ .bP
+@@ -305,14 +345,35 @@
+ .B \%echochar
+ may be implemented as macros.
+ .SH EXTENSIONS
+-.SS TABSIZE
+-SVr4 and other versions of
+-.I curses
+-implement the
+-.B \%TABSIZE
+-variable,
+-but X/Open Curses does not specify it;
+-see \fB\%curs_variables\fP(3X).
++The symbols
++.RI \%( ACS_S3 ","
++.IR \%ACS_S7 ","
++.IR \%ACS_LEQUAL ","
++.IR \%ACS_GEQUAL ","
++.IR \%ACS_PI ","
++.IR \%ACS_NEQUAL ","
++and
++.IR \%ACS_STERLING ")"
++were not documented in any publicly released System\ V
++.\" And did not exist yet as late as SVr4.
++.\" https://github.com/ryanwoodsmall/oldsysv/blob/master/\
++.\"   sysvr4/svr4/lib/xlibcurses/screen/curses.ed
++and are not standard.
++However,
++many publicly available
++.I \%term\%info
++entries include
++.I \%acs_chars
++.RB \%( acsc )
++capabilities in which their key characters
++.RB ( pryz{|} )
++are embedded,
++and a second-hand list of their character descriptions has come to
++light.
++The
++.I \%ncurses
++developers invented ACS-prefixed names for them.
++.\" in v1_9_5_950928_e227
+ .SH PORTABILITY
+ Applications employing
+ .I \%ncurses
+@@ -331,7 +392,7 @@
+ locale.
+ .SS "ACS Symbols"
+ X/Open Curses states that the
+-.B \%ACS_
++.I \%ACS_
+ definitions are
+ .I char
+ constants.
+@@ -343,25 +404,25 @@
+ defines the ACS symbols as constants;
+ others define them as elements of an array.
+ .IP
+-This implementation uses an array,
+-.BR \%acs_map ,
+-as did SVr4
+-.IR curses .
+-NetBSD also uses an array,
++SVr4 used an array,
++.IR \%acs_map ,
++as does
++.IR \%ncurses "."
++NetBSD
++.I curses
++also uses an array,
+ actually named
+-.BR \%_acs_char ,
+-with a
+-.B \%#define
+-for compatibility.
++.IR \%_acs_char ,
++with a \%\*(``#define\*('' for compatibility.
+ .bP
+ HP-UX
+ .I curses
+ equates some of the
+-.B \%ACS_
++.I \%ACS_
+ symbols to the analogous
+-.B \%WACS_
++.I \%WACS_
+ symbols as if the
+-.B \%ACS_
++.I \%ACS_
+ symbols were wide characters
+ (see \fB\%curs_add_wch\fP(3X)).
+ The misdefined symbols are the arrows and others that are not used for
+@@ -371,7 +432,7 @@
+ (Issues\ 2 through 7)
+ has a typographical error
+ for the
+-.B \%ACS_LANTERN
++.I \%ACS_LANTERN
+ symbol, equating its \*(``VT100+ Character\*('' to \*(``I\*(''
+ (capital I),
+ while the header files for SVr4
+@@ -391,37 +452,10 @@
+ (AT&T PC6300 with EMOTS Terminal Emulator)
+ description uses lowercase i.
+ .PP
+-Some ACS symbols
+-.RB \%( ACS_S3 ,
+-.BR \%ACS_S7 ,
+-.BR \%ACS_LEQUAL ,
+-.BR \%ACS_GEQUAL ,
+-.BR \%ACS_PI ,
+-.BR \%ACS_NEQUAL ,
+-and
+-.BR \%ACS_STERLING )
+-were not documented in any publicly released System\ V.
+-.\" And did not exist yet as late as SVr4.
+-.\" https://github.com/ryanwoodsmall/oldsysv/blob/master/\
+-.\"   sysvr4/svr4/lib/xlibcurses/screen/curses.ed
+-However,
+-many publicly available
+-.I \%term\%info
+-entries include
+-.B \%acsc
+-capabilities in which their key characters
+-.RB ( pryz{|} )
+-are embedded,
+-and a second-hand list of their character descriptions has come to
+-light.
+-The
+-.I \%ncurses
+-developers invented ACS-prefixed names for them.
+-.PP
+ The
+ .I displayed
+ values of
+-.B \%ACS_
++.I \%ACS_
+ constants depend on
+ .bP
+ the
+@@ -442,7 +476,7 @@
+ environment variable in \fB\%ncurses\fP(3X).
+ .SS "Character Set"
+ X/Open Curses assumes that the parameter passed to
+-.B \%waddch
++.I \%waddch
+ contains a single character.
+ That character may have been more than eight bits wide in an SVr3 or
+ SVr4 implementation,
+@@ -454,7 +488,7 @@
+ attributes and a color pair identifier into a
+ .I \%chtype
+ for passage to
+-.B \%waddch
++.I \%waddch
+ is common.
+ A portable application uses only the macros discussed in
+ \fB\%curs_attr\fP(3X) to manipulate a
+@@ -466,10 +500,10 @@
+ holds an eight-bit character,
+ but the library allows a multibyte character sequence to be passed via a
+ succession of calls to
+-.BR \%waddch "."
++.IR \%waddch "."
+ Other implementations do not;
+ a
+-.B \%waddch
++.I \%waddch
+ call transmits exactly one character,
+ which may be rendered in one or more screen locations depending on
+ whether it is printable
+@@ -477,7 +511,7 @@
+ Depending on the locale,
+ .I \%ncurses
+ inspects the byte passed in each
+-.B \%waddch
++.I \%waddch
+ call and checks whether the latest call continues a multibyte character.
+ When a character is
+ .IR complete ","
+@@ -506,13 +540,33 @@
+ .IR \%wadd_wch "."
+ .SH HISTORY
+ 4BSD (1980)
+-.I curses
+ introduced
+-.IR \%waddch "."
++.I \%waddch
++and its variants.
+ .PP
+ SVr3 (1987)
+-added
+-.IR \%wechochar "."
++added the
++.I \%echochar
++and
++.I \%wechochar
++functions and most of the
++.I ACS_
++constants,
++except for
++.IR \%ACS_GEQUAL ","
++.IR \%ACS_LEQUAL ","
++.IR \%ACS_NEQUAL ","
++.IR \%ACS_PI ","
++.IR \%ACS_S3 ","
++.IR \%ACS_S7 ","
++and
++.IR \%ACS_STERLING "."
++.PP
++.I \%ncurses
++1.9.6 (1995)
++furnished the remaining
++.I ACS_
++constants.
+ .SH SEE ALSO
+ \fB\%curs_add_wch\fP(3X) describes comparable functions of the
+ .I \%ncurses
+Index: man/curs_addchstr.3x
+Prereq:  1.58 
+--- ncurses-6.5-20250125+/man/curs_addchstr.3x	2025-01-19 00:49:39.000000000 +0000
++++ ncurses-6.5-20250201/man/curs_addchstr.3x	2025-02-01 22:50:42.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addchstr.3x,v 1.58 2025/01/19 00:49:39 tom Exp $
+-.TH curs_addchstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addchstr.3x,v 1.60 2025/02/01 22:50:42 tom Exp $
++.TH curs_addchstr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -147,10 +147,7 @@
+ .IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 473
+ .SH HISTORY
+ SVr3.1 (1987)
+-introduced
+-.I \%waddchstr
+-and
+-.IR \%waddchnstr "."
++introduced these functions.
+ .SH SEE ALSO
+ \fB\%curs_add_wchstr\fP(3X) describes comparable functions of the
+ .I \%ncurses
+Index: man/curs_addstr.3x
+Prereq:  1.65 
+--- ncurses-6.5-20250125+/man/curs_addstr.3x	2025-01-19 00:49:39.000000000 +0000
++++ ncurses-6.5-20250201/man/curs_addstr.3x	2025-02-01 22:48:11.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addstr.3x,v 1.65 2025/01/19 00:49:39 tom Exp $
+-.TH curs_addstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addstr.3x,v 1.67 2025/02/01 22:48:11 tom Exp $
++.TH curs_addstr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -133,7 +133,6 @@
+ .IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 474
+ .SH HISTORY
+ 4BSD (1980)
+-.I curses
+ introduced
+ .I \%waddstr
+ along with its variants,
+Index: man/curs_addwstr.3x
+Prereq:  1.56 
+--- ncurses-6.5-20250125+/man/curs_addwstr.3x	2025-01-19 00:49:39.000000000 +0000
++++ ncurses-6.5-20250201/man/curs_addwstr.3x	2025-02-01 22:54:32.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addwstr.3x,v 1.56 2025/01/19 00:49:39 tom Exp $
+-.TH curs_addwstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addwstr.3x,v 1.58 2025/02/01 22:54:32 tom Exp $
++.TH curs_addwstr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -142,8 +142,7 @@
+ \*(``an integer value other than
+ .IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 478
+ .SH HISTORY
+-These functions were initially specified by X/Open Curses Issue\ 4
+-(1995).
++X/Open Curses Issue\ 4 (1995) initially specified these functions.
+ The System\ V Interface Definition Version\ 4
+ of the same year
+ specified functions named
+Index: man/curs_attr.3x
+Prereq:  1.127 
+--- ncurses-6.5-20250125+/man/curs_attr.3x	2025-01-19 00:49:39.000000000 +0000
++++ ncurses-6.5-20250201/man/curs_attr.3x	2025-02-01 23:59:36.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_attr.3x,v 1.127 2025/01/19 00:49:39 tom Exp $
+-.TH curs_attr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_attr.3x,v 1.133 2025/02/01 23:59:36 tom Exp $
++.TH curs_attr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -362,6 +362,7 @@
+ .BR \%chgat ","
+ .BR \%mvchgat ","
+ .BR \%mvwchgat ","
++.BR \%wchgat ","
+ and
+ .B \%color_set
+ are part of
+@@ -380,7 +381,7 @@
+ .B \%standend
+ may be implemented as macros.
+ .PP
+-Color pair values be logically \*(``or\*(''-ed with attributes
++Color pair values may be logically \*(``or\*(''-ed with attributes
+ if the pair number is less than 256.
+ The alternate functions such as \fBcolor_set\fP can pass a color pair
+ value directly.
+@@ -556,7 +557,6 @@
+ .\" ---------------------------------------------------------------------------
+ .SH HISTORY
+ 4BSD (1980)
+-.I curses
+ used a
+ .I char
+ to represent each cell of the terminal screen.
+@@ -582,7 +582,8 @@
+ .I curses
+ could do nothing with them.
+ .PP
+-SVr2 (1984) provided an improved
++SVr2 (1984)
++provided an improved
+ .I curses
+ library,
+ introducing
+@@ -621,7 +622,7 @@
+ macro along with a color system;
+ see \fBcurs_color\fP(3X).
+ .PP
+-X/Open Curses is largely based on SVr4
++X/Open Curses Issue\ 4 (1995) is largely based on SVr4
+ .IR curses ","
+ but recognized that the
+ .I \%wchar_t
+@@ -648,13 +649,11 @@
+ and
+ .IR \%wattr_set "),"
+ and some new
+-.RI \%( color_set ,
+-.IR \%wcolor_set ","
+-.IR \%chgat ","
+-.IR \%wchgat ","
+-.IR \%mvchgat ","
++.RI \%( chgat
++and its variants,
++.IR \%color_set ","
+ and
+-.IR \%mvwchgat ")."
++.IR \%wcolor_set ")."
+ .PP
+ Different Unix systems used differently sized bit fields in
+ .I \%chtype
+Index: man/curs_beep.3x
+Prereq:  1.39 
+--- ncurses-6.5-20250125+/man/curs_beep.3x	2025-01-19 00:49:39.000000000 +0000
++++ ncurses-6.5-20250201/man/curs_beep.3x	2025-02-01 23:46:11.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_beep.3x,v 1.39 2025/01/19 00:49:39 tom Exp $
+-.TH curs_beep 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_beep.3x,v 1.42 2025/02/01 23:46:11 tom Exp $
++.TH curs_beep 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%beep\fP,
+ \fB\%flash\fP \-
+@@ -97,13 +97,14 @@
+ On SVr4
+ .IR curses ","
+ they always return
+-.BR OK ","
++.IR OK ","
+ and X/Open Curses specifies them as doing so.
+ .SH HISTORY
++SVr2 (1984)
++introduced
+ .I beep
+ and
+-.I flash
+-appeared in SVr2 (1984).
++.IR flash "."
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%terminfo\fP(5)
+Index: man/curs_bkgrnd.3x
+Prereq:  1.55 
+--- ncurses-6.5-20250125+/man/curs_bkgrnd.3x	2025-01-19 00:49:39.000000000 +0000
++++ ncurses-6.5-20250201/man/curs_bkgrnd.3x	2025-02-01 22:54:32.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_bkgrnd.3x,v 1.55 2025/01/19 00:49:39 tom Exp $
+-.TH curs_bkgrnd 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_bkgrnd.3x,v 1.57 2025/02/01 22:54:32 tom Exp $
++.TH curs_bkgrnd 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -250,7 +250,7 @@
+ .IR curses 's
+ non-wide functions for manipulating the window background.
+ .SH HISTORY
+-These functions were initially specified by X/Open Curses Issue\ 4.
++X/Open Curses Issue\ 4 (1995) initially specified these functions.
+ .SH SEE ALSO
+ \fB\%curs_bkgd\fP(3X) describes the corresponding functions in the
+ non-wide configuration of
+Index: man/curs_border.3x
+Prereq:  1.60 
+--- ncurses-6.5-20250125+/man/curs_border.3x	2025-01-19 00:49:39.000000000 +0000
++++ ncurses-6.5-20250201/man/curs_border.3x	2025-02-02 00:00:33.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_border.3x,v 1.60 2025/01/19 00:49:39 tom Exp $
+-.TH curs_border 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_border.3x,v 1.63 2025/02/02 00:00:33 tom Exp $
++.TH curs_border 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -39,6 +39,11 @@
+ .ie t .ds '' ''
+ .el   .ds '' ""
+ .\}
++.
++.de bP
++.ie n  .IP \(bu 4
++.el    .IP \(bu 2
++..
+ .SH NAME
+ \fB\%border\fP,
+ \fB\%wborder\fP,
+@@ -57,90 +62,129 @@
+ \fB#include 
+ .PP
+ \fBint border(chtype \fIls\fP, chtype \fIrs\fP, chtype \fIts\fP, chtype \fIbs\fP,
+-           \fBchtype \fItl\fB, chtype \fItr\fB, chtype \fIbl\fB, chtype \fIbr\fB);\fR
++      \fBchtype \fItl\fB, chtype \fItr\fB, chtype \fIbl\fB, chtype \fIbr\fB);\fR
+ \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
++      \fBchtype \fIts\fB, chtype \fIbs\fB, chtype \fItl\fB, chtype \fItr\fB,\fR
++      \fBchtype \fIbl\fB, chtype \fIbr\fB);\fR
+ .PP
+ \fBint box(WINDOW *\fIwin\fB, chtype \fIverch\fB, chtype \fIhorch\fB);\fR
+ .PP
+ \fBint hline(chtype \fIch\fB, int \fIn\fB);\fR
+ \fBint whline(WINDOW *\fIwin\fB, chtype \fIch\fB, int \fIn\fB);\fR
+-\fBint vline(chtype \fIch\fB, int \fIn\fB);\fR
+-\fBint wvline(WINDOW *\fIwin\fB, chtype \fIch\fB, int \fIn\fB);\fR
+-.PP
+ \fBint mvhline(int \fIy\fB, int \fIx\fB, chtype \fIch\fB, int \fIn\fB);\fR
+ \fBint mvwhline(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, chtype \fIch\fB, int \fIn\fB);\fR
++.PP
++\fBint vline(chtype \fIch\fB, int \fIn\fB);\fR
++\fBint wvline(WINDOW *\fIwin\fB, chtype \fIch\fB, int \fIn\fB);\fR
+ \fBint mvvline(int \fIy\fB, int \fIx\fB, chtype \fIch\fB, int \fIn\fB);\fR
+ \fBint mvwvline(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, chtype \fIch\fB, int \fIn\fB);\fR
+ .fi
+ .SH DESCRIPTION
+-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
++.B \%wborder
++and
++.B \%border
++draw a box at the edges of the specified window or
++.BR \%stdscr ","
++respectively.
++Each
++.I \%chtype
++argument corresponds to a geometric component of the border as follows:
+ .RS
+-\fIls\fP \- left side,
++.I ls
++\- left side,
+ .br
+-\fIrs\fP \- right side,
++.I rs
++\- right side,
+ .br
+-\fIts\fP \- top side,
++.I ts
++\- top side,
+ .br
+-\fIbs\fP \- bottom side,
++.I bs
++\- bottom side,
+ .br
+-\fItl\fP \- top left-hand corner,
++.I tl
++\- top left-hand corner,
+ .br
+-\fItr\fP \- top right-hand corner,
++.I tr
++\- top right-hand corner,
+ .br
+-\fIbl\fP \- bottom left-hand corner, and
++.I bl
++\- bottom left-hand corner, and
+ .br
+-\fIbr\fP \- bottom right-hand corner.
++.I br
++\- bottom right-hand corner.
+ .RE
+ .PP
+-If any of these arguments is zero, then the corresponding
+-default values (defined in \fBcurses.h\fP) are used instead:
+-.sp
++If any
++.I \%chtype
++argument is
++.BR 0 ","
++then
++.I curses
++uses forms-drawing characters
++(see \fBaddch\fP(3X))
++in the following correspondence:
+ .RS
+-\fBACS_VLINE\fP,
++.BR \%ACS_VLINE ","
+ .br
+-\fBACS_VLINE\fP,
++.BR \%ACS_VLINE ","
+ .br
+-\fBACS_HLINE\fP,
++.BR \%ACS_HLINE ","
+ .br
+-\fBACS_HLINE\fP,
++.BR \%ACS_HLINE ","
+ .br
+-\fBACS_ULCORNER\fP,
++.BR \%ACS_ULCORNER ","
+ .br
+-\fBACS_URCORNER\fP,
++.BR \%ACS_URCORNER ","
+ .br
+-\fBACS_LLCORNER\fP,
++.BR \%ACS_LLCORNER ","
++and
+ .br
+-\fBACS_LRCORNER\fP.
++.BR \%ACS_LRCORNER "."
+ .RE
+ .PP
+-\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.
+-The
+-current cursor position is not changed.
+-The line is at most \fIn\fP characters
+-long, or as many as fit into the window.
+-.PP
+-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\fP characters
+-long, or as many as fit into the window.
++.BI \%box( win ","
++.IB verch ,
++.IB horch )
++is shorthand for
++.RB \%\*(`` wborder(\c
++.IB win ,
++.IB verch ,
++.IB horch ,
++.BR "0, 0, 0, 0)" "\*(''."
++.PP
++.B \%whline
++draws a horizontal line of
++.I ch
++from left to right,
++and
++.B \%wvline
++a vertical one from top to bottom,
++stopping once
++.I n
++characters have been drawn or upon reaching the boundary of
++.IR win "."
++These functions do not update the cursor position
++(beyond any motion directed by their \*(``mv\*('' variants).
++\fB\%ncurses\fP(3X) describes the variants of these functions.
+ .SH RETURN VALUE
+-All routines return the integer \fBOK\fP.
+-.PP
+-This implementation returns
++These functions return
++.B OK
++on success and
+ .B ERR
+-if the window pointer is null.
++on failure.
++.PP
++In
++.IR \%ncurses ","
++.bP
++these functions fail if the screen is not initialized;
++and
++.bP
++functions taking a
++.I \%WINDOW
++pointer argument fail if
++.I win
++is a null pointer.
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+@@ -148,13 +192,33 @@
+ .IR x )
+ is outside the window boundaries.
+ .SH NOTES
+-.B \%border
+-and
++Unusually,
++there is no
++.B \%wbox
++function;
+ .B \%box
++behaves as one would expect
++.B \%wbox
++to,
++accepting a
++.I \%WINDOW
++pointer argument.
++.PP
++.BR \%border ","
++.BR \%box ","
++.BR \%hline ","
++.BR \%mvhline ","
++.BR \%mvwhline ","
++.BR \%vline ","
++.BR \%mvvline ","
++and
++.B \%mvwvline
+ may be implemented as macros.
+ .PP
+-The borders generated by these functions are \fIinside\fP borders (this
+-is also true of SVr4 curses, though the fact is not documented).
++Borders drawn by these functions are
++.I interior
++borders.
++.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/src/lib/libcurses/box.c
+ .SH PORTABILITY
+ These functions are described in X/Open Curses Issue\ 4.
+ It specifies no error conditions for them.
+@@ -176,6 +240,42 @@
+ in
+ .IR \%ncurses ","
+ it does not.
++.PP
++BSD
++.I curses
++drew boxes with
++.I horch
++in
++.I every
++character cell of the top and bottom lines of the window,
++whereas SVr3.1 and later
++.IR curses ","
++because its
++.I box
++wrapped
++.IR wborder ","
++used the default corner characters.
++.\" https://github.com/ryanwoodsmall/oldsysv/blob/master/sysvr3/31/\
++.\"   usr/src/lib/libcurses/screen/curses.ed#L454
++.SH HISTORY
++4BSD (1980)
++introduced
++.IR box ","
++defining it as a function.
++.PP
++SVr3.1 (1987)
++added
++.I \%whline
++and
++.I \%wvline
++and their variants,
++as well as
++.I \%border
++and
++.IR \%wborder ","
++redefining
++.I \%box
++as a macro wrapping the latter.
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_outopts\fP(3X)
+Index: man/curs_border_set.3x
+Prereq:  1.43 
+--- ncurses-6.5-20250125+/man/curs_border_set.3x	2025-01-19 00:49:39.000000000 +0000
++++ ncurses-6.5-20250201/man/curs_border_set.3x	2025-02-02 00:04:21.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_border_set.3x,v 1.43 2025/01/19 00:49:39 tom Exp $
+-.TH curs_border_set 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_border_set.3x,v 1.48 2025/02/02 00:04:21 tom Exp $
++.TH curs_border_set 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -56,46 +56,33 @@
+ .nf
+ \fB#include 
+ .PP
+-\fBint border_set(
+-   \fBconst cchar_t *\fIls\fB, const cchar_t *\fIrs\fP,
+-   \fBconst cchar_t *\fIts\fB, const cchar_t *\fIbs\fP,
+-   \fBconst cchar_t *\fItl\fB, const cchar_t *\fItr\fP,
+-   \fBconst cchar_t *\fIbl\fB, const cchar_t *\fIbr\fB);\fR
+-.br
+-\fBint wborder_set(\fP
+-   \fBWINDOW *\fIwin\fP,
+-   \fBconst cchar_t *\fIls\fB, const cchar_t *\fIrs\fP,
+-   \fBconst cchar_t *\fIts\fB, const cchar_t *\fIbs\fP,
+-   \fBconst cchar_t *\fItl\fB, const cchar_t *\fItr\fP,
+-   \fBconst cchar_t *\fIbl\fB, const cchar_t *\fIbr\fB);\fR
+-\fBint box_set(\fP
+-   \fBWINDOW *\fIwin\fP,
+-   \fBconst cchar_t *\fIverch\fP,
+-   \fBconst cchar_t *\fIhorch\fB);\fR
+-\fBint hline_set(\fP
+-   \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
+-\fBint whline_set(\fP
+-   \fBWINDOW *\fIwin\fP,
+-   \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
+-\fBint mvhline_set(\fP
+-   \fBint \fIy\fB, int \fIx\fP,
+-   \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
+-\fBint mvwhline_set(\fP
+-   \fBWINDOW *\fIwin\fP,
+-   \fBint \fIy\fB, int \fIx\fP,
+-   \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
+-\fBint vline_set(\fP
+-   \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
+-\fBint wvline_set(\fP
+-   \fBWINDOW *\fIwin\fP,
+-   \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
+-\fBint mvvline_set(\fP
+-   \fBint \fIy\fB, int \fIx\fP,
+-   \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
+-\fBint mvwvline_set(\fP
+-   \fBWINDOW *\fIwin\fP,
+-   \fBint \fIy\fB, int \fIx\fP,
+-   \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
++\fBint border_set(const cchar_t *\fIls\fB, const cchar_t *\fIrs\fP,
++      \fBconst cchar_t *\fIts\fB, const cchar_t *\fIbs\fP,
++      \fBconst cchar_t *\fItl\fB, const cchar_t *\fItr\fP,
++      \fBconst cchar_t *\fIbl\fB, const cchar_t *\fIbr\fB);\fR
++.br
++\fBint wborder_set(\fBWINDOW *\fIwin\fP,
++      \fBconst cchar_t *\fIls\fB, const cchar_t *\fIrs\fP,
++      \fBconst cchar_t *\fIts\fB, const cchar_t *\fIbs\fP,
++      \fBconst cchar_t *\fItl\fB, const cchar_t *\fItr\fP,
++      \fBconst cchar_t *\fIbl\fB, const cchar_t *\fIbr\fB);\fR
++.PP
++\fBint box_set(\fBWINDOW *\fIwin\fP, \fBconst cchar_t *\fIverch\fP,
++      \fBconst cchar_t *\fIhorch\fB);\fR
++.PP
++\fBint hline_set(const cchar_t *\fIwch\fB, int \fIn\fB);\fR
++\fBint whline_set(WINDOW *\fIwin\fP, \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
++\fBint mvhline_set(int \fIy\fB, int \fIx\fP, \fBconst cchar_t *\fIwch\fB,\fR
++      \fBint \fIn\fB);\fR
++\fBint mvwhline_set(WINDOW *\fIwin\fP, \fBint \fIy\fB, int \fIx\fP,
++      \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
++.PP
++\fBint vline_set(const cchar_t *\fIwch\fB, int \fIn\fB);\fR
++\fBint wvline_set(WINDOW *\fIwin\fP, \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
++\fBint mvvline_set(int \fIy\fB, int \fIx\fP, \fBconst cchar_t *\fIwch\fB,\fR
++      \fBint \fIn\fB);\fR
++\fBint mvwvline_set(WINDOW *\fIwin\fP, \fBint \fIy\fB, int \fIx\fP,
++      \fBconst cchar_t *\fIwch\fB, int \fIn\fB);\fR
+ .fi
+ .SH DESCRIPTION
+ The
+@@ -197,7 +184,10 @@
+ .B \%vline_set
+ may be implemented as macros.
+ .SH PORTABILITY
+-These functions are described in X/Open Curses Issue\ 4.
++X/Open Curses Issue\ 4 describes these functions.
++It specifies no error conditions for them.
++.SH HISTORY
++X/Open Curses Issue\ 4 (1995) initially specified these functions.
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_add_wch\fP(3X),
+Index: man/curs_deleteln.3x
+Prereq:  1.48 
+--- ncurses-6.5-20250125+/man/curs_deleteln.3x	2025-01-19 00:49:39.000000000 +0000
++++ ncurses-6.5-20250201/man/curs_deleteln.3x	2025-02-01 22:49:56.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_deleteln.3x,v 1.48 2025/01/19 00:49:39 tom Exp $
+-.TH curs_deleteln 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_deleteln.3x,v 1.51 2025/02/01 22:49:56 tom Exp $
++.TH curs_deleteln 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -132,14 +132,17 @@
+ .IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 490
+ .SH HISTORY
+ 4BSD (1980)
+-.I curses
+ introduced
+-.I \%wdeleteln
++.IR \%deleteln ","
++.IR \%wdeleteln ","
++.IR \%insertln ","
+ and
+ .IR \%winsertln "."
+ .PP
+ SVr3.1 (1987)
+ added
++.I \%insdelln
++and
+ .IR \%winsdelln "."
+ .SH SEE ALSO
+ \fB\%curses\fP(3X)
+Index: man/curs_get_wch.3x
+Prereq:  1.59 
+--- ncurses-6.5-20250125+/man/curs_get_wch.3x	2025-01-19 00:49:39.000000000 +0000
++++ ncurses-6.5-20250201/man/curs_get_wch.3x	2025-02-02 00:01:24.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_get_wch.3x,v 1.59 2025/01/19 00:49:39 tom Exp $
+-.TH curs_get_wch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_get_wch.3x,v 1.64 2025/02/02 00:01:24 tom Exp $
++.TH curs_get_wch 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -193,8 +193,9 @@
+ .PP
+ Functions taking a
+ .I \%WINDOW
+-pointer argument fail if the pointer is
+-.IR NULL "."
++pointer argument fail if
++.I win
++is a null pointer.
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+@@ -248,17 +249,15 @@
+ .PP
+ See the \*(``PORTABILITY\*('' section of \fB\%wgetch\fP(3X) regarding
+ the interaction of
+-.B \%wget_wch
++.I \%wget_wch
+ with signal handlers.
+ .SH HISTORY
+-These functions were initially specified by X/Open Curses Issue\ 4
+-(1995).
++X/Open Curses Issue\ 4 (1995) initially specified these functions.
+ The System\ V Interface Definition Version\ 4
+ of the same year
+ specified functions named
+ .I \%wgetwch
+-(with the usual variants)
+-and
++(with its variants)
+ .IR \%ungetwch "."
+ .\" SVID 4, vol 3., pp. 496-499
+ These were later additions to
+Index: man/curs_get_wstr.3x
+Prereq:  1.64 
+--- ncurses-6.5-20250125+/man/curs_get_wstr.3x	2025-01-19 00:49:39.000000000 +0000
++++ ncurses-6.5-20250201/man/curs_get_wstr.3x	2025-02-01 22:54:32.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_get_wstr.3x,v 1.64 2025/01/19 00:49:39 tom Exp $
+-.TH curs_get_wstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_get_wstr.3x,v 1.68 2025/02/01 22:54:32 tom Exp $
++.TH curs_get_wstr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -98,7 +98,7 @@
+ .IR WEOF );
+ .bP
+ interprets the screen's erase and kill characters
+-(see \fB\%erasechar\fP(3X) and \fB\%killchar\fP(3X));
++(see \fB\%erasewchar\fP(3X) and \fB\%killwchar\fP(3X));
+ .bP
+ recognizes function keys only if the screen's keypad option is enabled
+ (see \fB\%keypad\fP(3X));
+@@ -363,6 +363,28 @@
+ for consistency with SVr4
+ .IR curses 's
+ .IR \%wgetnstr .
++.SH HISTORY
++X/Open Curses Issue\ 4 (1995) initially specified these functions.
++The System\ V Interface Definition Version\ 4
++of the same year
++specified functions named
++.I \%wgetwstr
++and
++.I \%wgetnwstr
++(and the usual variants).
++.\" SVID 4, vol 3., p. 500
++These were later additions to
++.RI SVr4. x ,
++not appearing in the first SVr4 (1989).
++Except in name,
++their declarations did not differ from X/Open's later
++.I \%wget_wstr
++and
++.I \%wgetn_wstr
++until
++X/Open Curses Issue 7 (2009)
++eventually changed the type of the buffer argument to a pointer to
++.IR \%wint_t "."
+ .SH SEE ALSO
+ \fB\%curs_getstr\fP(3X) describes comparable functions of the
+ .I \%ncurses
+Index: man/curs_getcchar.3x
+Prereq:  1.53 
+--- ncurses-6.5-20250125+/man/curs_getcchar.3x	2025-01-19 00:49:39.000000000 +0000
++++ ncurses-6.5-20250201/man/curs_getcchar.3x	2025-02-01 23:46:11.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getcchar.3x,v 1.53 2025/01/19 00:49:39 tom Exp $
+-.TH curs_getcchar 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_getcchar.3x,v 1.56 2025/02/01 23:46:11 tom Exp $
++.TH curs_getcchar 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds ' \(aq
+ .\}
+@@ -274,7 +274,7 @@
+ attributes
+ (at least 15 bits' worth,
+ inferred from the count of specified
+-.B WA_
++.I WA_
+ constants),
+ .\" See X/Open Curses Issue 7, p. 307.
+ .bP
+@@ -344,8 +344,7 @@
+ value;
+ doing so alters the library's ABI.
+ .SH HISTORY
+-These functions were initially specified by X/Open Curses Issue\ 4
+-(1995).
++X/Open Curses Issue\ 4 (1995) initially specified these functions.
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_attr\fP(3X),
+Index: man/curs_getch.3x
+Prereq:  1.114 
+--- ncurses-6.5-20250125+/man/curs_getch.3x	2025-01-19 00:49:39.000000000 +0000
++++ ncurses-6.5-20250201/man/curs_getch.3x	2025-02-02 00:00:59.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getch.3x,v 1.114 2025/01/19 00:49:39 tom Exp $
+-.TH curs_getch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_getch.3x,v 1.117 2025/02/02 00:00:59 tom Exp $
++.TH curs_getch 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -477,8 +477,9 @@
+ .PP
+ Functions taking a
+ .I \%WINDOW
+-pointer argument fail if the pointer is
+-.IR NULL "."
++pointer argument fail if
++.I win
++is a null pointer.
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+@@ -648,16 +649,16 @@
+ \*(``an integer value other than
+ .IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 494
+ .PP
+-.B \%wgetch
++.I \%wgetch
+ reads only single-byte characters.
+ .PP
+ The echo behavior of these functions on input of
+-.B KEY_
++.I KEY_
+ or backspace characters is not documented in SVr4
+ .IR curses "."
+ .PP
+ The behavior of
+-.B \%wgetch
++.I \%wgetch
+ in the presence of signal handlers is not documented in SVr4
+ .I curses
+ and is unspecified by X/Open Curses.
+@@ -673,18 +674,18 @@
+ .I curses
+ application prepares for two cases:
+ (a) signal receipt does not interrupt
+-.BR \%wgetch ";"
++.IR \%wgetch ";"
+ or
+ (b) signal receipt interrupts
+-.B \%wgetch
++.I \%wgetch
+ and causes it to return
+-.B ERR
++.I ERR
+ with
+-.B \%errno
++.I \%errno
+ set to
+-.BR \%EINTR "."
++.IR \%EINTR "."
+ .PP
+-.B \%KEY_MOUSE
++.I \%KEY_MOUSE
+ is mentioned in X/Open Curses,
+ along with a few related
+ .I \%term\%info
+@@ -694,9 +695,9 @@
+ .I \%ncurses
+ is an extension.
+ .PP
+-.B \%KEY_RESIZE
++.I \%KEY_RESIZE
+ and
+-.B \%has_key
++.I \%has_key
+ are extensions first implemented for
+ .IR \%ncurses "."
+ By 2022,
+@@ -707,7 +708,7 @@
+ .I curses
+ .\" https://web.archive.org/web/20200923185647/https://man.netbsd.org/curses_input.3
+ had added them along with
+-.BR \%KEY_MOUSE "."
++.IR \%KEY_MOUSE "."
+ .SH SEE ALSO
+ ECMA-6 \*(``7-bit coded Character Set\*(''
+ \%
+ .PP
+-\fBint alloc_pair_sp(SCREEN* \fIsp\fP, int \fIfg\fP, int \fIbg\fP);
+-\fBint assume_default_colors_sp(SCREEN* \fIsp\fP, int \fIfg\fP, int \fIbg\fP);
+-\fBint baudrate_sp(SCREEN* \fIsp\fP);
+-\fBint beep_sp(SCREEN* \fIsp\fP);
+-\fBbool can_change_color_sp(SCREEN* \fIsp\fP);
+-\fBint cbreak_sp(SCREEN* \fIsp\fP);
+-\fBint color_content_sp(SCREEN* \fIsp\fP, short \fIcolor\fP, short* \fIr\fP, short* \fIg\fP, short* \fIb\fP);
+-\fBint curs_set_sp(SCREEN* \fIsp\fP, int \fIvisibility\fP);
+-\fBint def_prog_mode_sp(SCREEN* \fIsp\fP);
+-\fBint def_shell_mode_sp(SCREEN* \fIsp\fP);
+-.PP
+-\fBint define_key_sp(SCREEN* \fIsp\fP, const char * \fIdefinition\fP, int \fIkeycode\fP);
+-\fBint delay_output_sp(SCREEN* \fIsp\fP, int \fIms\fP);
+-\fBint doupdate_sp(SCREEN* \fIsp\fP);
+-\fBint echo_sp(SCREEN* \fIsp\fP);
+-\fBint endwin_sp(SCREEN* \fIsp\fP);
+-\fBchar erasechar_sp(SCREEN* \fIsp\fP);
+-\fBint erasewchar_sp(SCREEN* \fIsp\fP, wchar_t *\fIwc\fP);
++\fBint alloc_pair_sp(SCREEN * \fIsp\fP, int \fIfg\fP, int \fIbg\fP);
++\fBint assume_default_colors_sp(SCREEN * \fIsp\fP, int \fIfg\fP, int \fIbg\fP);
++\fBint baudrate_sp(SCREEN * \fIsp\fP);
++\fBint beep_sp(SCREEN * \fIsp\fP);
++\fBbool can_change_color_sp(SCREEN * \fIsp\fP);
++\fBint cbreak_sp(SCREEN * \fIsp\fP);
++\fBint color_content_sp(SCREEN * \fIsp\fP, short \fIcolor\fP, short * \fIr\fP, short * \fIg\fP, short * \fIb\fP);
++\fBint curs_set_sp(SCREEN * \fIsp\fP, int \fIvisibility\fP);
++\fBint def_prog_mode_sp(SCREEN * \fIsp\fP);
++\fBint def_shell_mode_sp(SCREEN * \fIsp\fP);
++.PP
++\fBint define_key_sp(SCREEN * \fIsp\fP, const char * \fIdefinition\fP, int \fIkeycode\fP);
++\fBint delay_output_sp(SCREEN * \fIsp\fP, int \fIms\fP);
++\fBint doupdate_sp(SCREEN * \fIsp\fP);
++\fBint echo_sp(SCREEN * \fIsp\fP);
++\fBint endwin_sp(SCREEN * \fIsp\fP);
++\fBchar erasechar_sp(SCREEN * \fIsp\fP);
++\fBint erasewchar_sp(SCREEN * \fIsp\fP, wchar_t *\fIwc\fP);
+ \fBint extended_color_content_sp(SCREEN * \fIsp\fP, int \fIcolor\fP, int * \fIr\fP, int * \fIg\fP, int * \fIb\fP);
+-\fBint extended_pair_content_sp(SCREEN* \fIsp\fP, int \fIpair\fP, int * \fIfg\fP, int * \fIbg\fP);
+-\fBint extended_slk_color_sp(SCREEN* \fIsp\fP, int \fIpair\fP);
++\fBint extended_pair_content_sp(SCREEN * \fIsp\fP, int \fIpair\fP, int * \fIfg\fP, int * \fIbg\fP);
++\fBint extended_slk_color_sp(SCREEN * \fIsp\fP, int \fIpair\fP);
+ .PP
+-\fBvoid filter_sp(SCREEN* \fIsp\fP);
+-\fBint find_pair_sp(SCREEN* \fIsp\fP, int \fIfg\fP, int \fIbg\fP);
+-\fBint flash_sp(SCREEN* \fIsp\fP);
+-\fBint flushinp_sp(SCREEN* \fIsp\fP);
+-\fBint free_pair_sp(SCREEN* \fIsp\fP, int \fIpair\fP);
+-\fBint get_escdelay_sp(SCREEN* \fIsp\fP);
+-\fBint getmouse_sp(SCREEN* \fIsp\fP, MEVENT* \fIevent\fP);
+-\fBWINDOW* getwin_sp(SCREEN* \fIsp\fP, FILE* \fIfilep\fP);
+-\fBint halfdelay_sp(SCREEN* \fIsp\fP, int \fItenths\fP);
+-\fBbool has_colors_sp(SCREEN* \fIsp\fP);
+-.PP
+-\fBbool has_ic_sp(SCREEN* \fIsp\fP);
+-\fBbool has_il_sp(SCREEN* \fIsp\fP);
+-\fBint has_key_sp(SCREEN* \fIsp\fP, int \fIc\fP);
+-\fBbool has_mouse_sp(SCREEN* \fIsp\fP);
+-\fBint init_color_sp(SCREEN* \fIsp\fP, short \fIcolor\fP, short \fIr\fP, short \fIg\fP, short \fIb\fP);
+-\fBint init_extended_color_sp(SCREEN* \fIsp\fP, int \fIcolor\fP, int \fIr\fP, int \fIg\fP, int \fIb\fP);
+-\fBint init_extended_pair_sp(SCREEN* \fIsp\fP, int \fIpair\fP, int \fIfg\fP, int \fIbg\fP);
+-\fBint init_pair_sp(SCREEN* \fIsp\fP, short \fIpair\fP, short \fIfg\fP, short \fIbg\fP);
+-\fBint intrflush_sp(SCREEN* \fIsp\fP, WINDOW* \fIwin\fP, bool \fIbf\fP);
+-\fBint is_cbreak_sp(SCREEN* \fIsp\fP);
+-.PP
+-\fBint is_echo_sp(SCREEN* \fIsp\fP);
+-\fBint is_nl_sp(SCREEN* \fIsp\fP);
+-\fBint is_raw_sp(SCREEN* \fIsp\fP);
+-\fBbool is_term_resized_sp(SCREEN* \fIsp\fP, int \fIlines\fP, int \fIcolumns\fP);
+-\fBbool isendwin_sp(SCREEN* \fIsp\fP);
+-\fBint key_defined_sp(SCREEN* \fIsp\fP, const char *\fIdefinition\fP);
+-\fBchar* keybound_sp(SCREEN* \fIsp\fP, int \fIkeycode\fP, int \fIcount\fP);
+-\fBNCURSES_CONST char* keyname_sp(SCREEN* \fIsp\fP, int \fIc\fP);
+-\fBint keyok_sp(SCREEN* \fIsp\fP, int \fIkeycode\fP, bool \fIenable\fP);
+-\fBchar killchar_sp(SCREEN* \fIsp\fP);
+-.PP
+-\fBint killwchar_sp(SCREEN* \fIsp\fP, wchar_t *\fIwc\fP);
+-\fBchar* longname_sp(SCREEN* \fIsp\fP);
+-\fBint mcprint_sp(SCREEN* \fIsp\fP, char *\fIdata\fP, int \fIlen\fP);
+-\fBint mouseinterval_sp(SCREEN* \fIsp\fP, int \fIerval\fP);
+-\fBmmask_t mousemask_sp(SCREEN* \fIsp\fP, mmask_t \fInewmask\fP, mmask_t *\fIoldmask\fP);
+-\fBint mvcur_sp(SCREEN* \fIsp\fP, int \fIoldrow\fP, int \fIoldcol\fP, int \fInewrow\fP, int \fInewcol\fP);
+-\fBint napms_sp(SCREEN* \fIsp\fP, int \fIms\fP);
+-\fBWINDOW* newpad_sp(SCREEN* \fIsp\fP, int \fInrows\fP, int \fIncols\fP);
+-\fBSCREEN* new_prescr(void);
+-\fBSCREEN* newterm_sp(SCREEN* \fIsp\fP, const char *\fItype\fP, FILE *\fIoutf\fP, FILE *\fIinfd\fP);
+-.PP
+-\fBWINDOW* newwin_sp(SCREEN* \fIsp\fP, int \fInlines\fP, int \fIncols\fP, int \fIbegin_y\fP, int \fIbegin_x\fP);
+-\fBint nl_sp(SCREEN* \fIsp\fP);
+-\fBint nocbreak_sp(SCREEN* \fIsp\fP);
+-\fBint noecho_sp(SCREEN* \fIsp\fP);
+-\fBvoid nofilter_sp(SCREEN* \fIsp\fP);
+-\fBint nonl_sp(SCREEN* \fIsp\fP);
+-\fBvoid noqiflush_sp(SCREEN* \fIsp\fP);
+-\fBint noraw_sp(SCREEN* \fIsp\fP);
+-\fBint pair_content_sp(SCREEN* \fIsp\fP, short \fIpair\fP, short* \fIfg\fP, short* \fIbg\fP);
+-\fBvoid qiflush_sp(SCREEN* \fIsp\fP);
+-.PP
+-\fBint raw_sp(SCREEN* \fIsp\fP);
+-\fBvoid reset_color_pairs_sp(SCREEN* \fIsp\fP);
+-\fBint reset_prog_mode_sp(SCREEN* \fIsp\fP);
+-\fBint reset_shell_mode_sp(SCREEN* \fIsp\fP);
+-\fBint resetty_sp(SCREEN* \fIsp\fP);
+-\fBint resize_term_sp(SCREEN* \fIsp\fP, int \fIlines\fP, int \fIcolumns\fP);
+-\fBint resizeterm_sp(SCREEN* \fIsp\fP, int \fIlines\fP, int \fIcolumns\fP);
+-\fBint ripoffline_sp(SCREEN* \fIsp\fP, int \fIline\fP, int (*\fIinit\fP)(WINDOW* \fIwin\fP, int \fIfmt\fP));
+-\fBint savetty_sp(SCREEN* \fIsp\fP);
+-\fBint scr_init_sp(SCREEN* \fIsp\fP, const char *\fIfilename\fP);
+-.PP
+-\fBint scr_restore_sp(SCREEN* \fIsp\fP, const char *\fIfilename\fP);
+-\fBint scr_set_sp(SCREEN* \fIsp\fP, const char *\fIfilename\fP);
+-\fBint set_escdelay_sp(SCREEN* \fIsp\fP, int \fIms\fP);
+-\fBint set_tabsize_sp(SCREEN* \fIsp\fP, int \fIcols\fP);
+-\fBint slk_attrset_sp(SCREEN* \fIsp\fP, const chtype \fIa\fP);
+-\fBint slk_attr_set_sp(SCREEN* \fIsp\fP, const attr_t \fIattrs\fP, short \fIpair\fP, void*\fIopts\fP);
+-\fBint slk_attroff_sp(SCREEN* \fIsp\fP, const chtype \fIa\fP);
+-\fBint slk_attron_sp(SCREEN* \fIsp\fP, const chtype \fIa\fP);
+-\fBattr_t slk_attr_sp(SCREEN* \fIsp\fP);
+-\fBint slk_clear_sp(SCREEN* \fIsp\fP);
+-.PP
+-\fBint slk_color_sp(SCREEN* \fIsp\fP, short \fIpair\fP);
+-\fBint slk_init_sp(SCREEN* \fIsp\fP, int \fIfmt\fP);
+-\fBchar* slk_label_sp(SCREEN* \fIsp\fP, int \fIlabnum\fP);
+-\fBint slk_noutrefresh_sp(SCREEN* \fIsp\fP);
+-\fBint slk_refresh_sp(SCREEN* \fIsp\fP);
+-\fBint slk_restore_sp(SCREEN* \fIsp\fP);
+-\fBint slk_set_sp(SCREEN* \fIsp\fP, int \fIlabnum\fP, const char * \fIlabel\fP, int \fIfmt\fP);
+-\fBint slk_touch_sp(SCREEN* \fIsp\fP);
+-\fBint start_color_sp(SCREEN* \fIsp\fP);
+-\fBattr_t term_attrs_sp(SCREEN* \fIsp\fP);
+-.PP
+-\fBchtype termattrs_sp(SCREEN* \fIsp\fP);
+-\fBchar* termname_sp(SCREEN* \fIsp\fP);
+-\fBint typeahead_sp(SCREEN* \fIsp\fP, int \fIfd\fP);
+-\fBint unget_wch_sp(SCREEN* \fIsp\fP, const wchar_t \fIwc\fP);
+-\fBint ungetch_sp(SCREEN* \fIsp\fP, int \fIc\fP);
+-\fBint ungetmouse_sp(SCREEN* \fIsp\fP, MEVENT* \fIevent\fP);
+-\fBint use_default_colors_sp(SCREEN* \fIsp\fP);
+-\fBvoid use_env_sp(SCREEN* \fIsp\fP, bool \fIbf\fP);
+-\fBint use_legacy_coding_sp(SCREEN* \fIsp\fP, int \fIlevel\fP);
++\fBvoid filter_sp(SCREEN * \fIsp\fP);
++\fBint find_pair_sp(SCREEN * \fIsp\fP, int \fIfg\fP, int \fIbg\fP);
++\fBint flash_sp(SCREEN * \fIsp\fP);
++\fBint flushinp_sp(SCREEN * \fIsp\fP);
++\fBint free_pair_sp(SCREEN * \fIsp\fP, int \fIpair\fP);
++\fBint get_escdelay_sp(SCREEN * \fIsp\fP);
++\fBint getmouse_sp(SCREEN * \fIsp\fP, MEVENT * \fIevent\fP);
++\fBWINDOW * getwin_sp(SCREEN * \fIsp\fP, FILE * \fIfilep\fP);
++\fBint halfdelay_sp(SCREEN * \fIsp\fP, int \fItenths\fP);
++\fBbool has_colors_sp(SCREEN * \fIsp\fP);
++.PP
++\fBbool has_ic_sp(SCREEN * \fIsp\fP);
++\fBbool has_il_sp(SCREEN * \fIsp\fP);
++\fBint has_key_sp(SCREEN * \fIsp\fP, int \fIc\fP);
++\fBbool has_mouse_sp(SCREEN * \fIsp\fP);
++\fBint init_color_sp(SCREEN * \fIsp\fP, short \fIcolor\fP, short \fIr\fP, short \fIg\fP, short \fIb\fP);
++\fBint init_extended_color_sp(SCREEN * \fIsp\fP, int \fIcolor\fP, int \fIr\fP, int \fIg\fP, int \fIb\fP);
++\fBint init_extended_pair_sp(SCREEN * \fIsp\fP, int \fIpair\fP, int \fIfg\fP, int \fIbg\fP);
++\fBint init_pair_sp(SCREEN * \fIsp\fP, short \fIpair\fP, short \fIfg\fP, short \fIbg\fP);
++\fBint intrflush_sp(SCREEN * \fIsp\fP, WINDOW * \fIwin\fP, bool \fIbf\fP);
++\fBint is_cbreak_sp(SCREEN * \fIsp\fP);
++.PP
++\fBint is_echo_sp(SCREEN * \fIsp\fP);
++\fBint is_nl_sp(SCREEN * \fIsp\fP);
++\fBint is_raw_sp(SCREEN * \fIsp\fP);
++\fBbool is_term_resized_sp(SCREEN * \fIsp\fP, int \fIlines\fP, int \fIcolumns\fP);
++\fBbool isendwin_sp(SCREEN * \fIsp\fP);
++\fBint key_defined_sp(SCREEN * \fIsp\fP, const char *\fIdefinition\fP);
++\fBchar * keybound_sp(SCREEN * \fIsp\fP, int \fIkeycode\fP, int \fIcount\fP);
++\fBNCURSES_CONST char * keyname_sp(SCREEN * \fIsp\fP, int \fIc\fP);
++\fBint keyok_sp(SCREEN * \fIsp\fP, int \fIkeycode\fP, bool \fIenable\fP);
++\fBchar killchar_sp(SCREEN * \fIsp\fP);
++.PP
++\fBint killwchar_sp(SCREEN * \fIsp\fP, wchar_t *\fIwc\fP);
++\fBchar * longname_sp(SCREEN * \fIsp\fP);
++\fBint mcprint_sp(SCREEN * \fIsp\fP, char *\fIdata\fP, int \fIlen\fP);
++\fBint mouseinterval_sp(SCREEN * \fIsp\fP, int \fIerval\fP);
++\fBmmask_t mousemask_sp(SCREEN * \fIsp\fP, mmask_t \fInewmask\fP, mmask_t *\fIoldmask\fP);
++\fBint mvcur_sp(SCREEN * \fIsp\fP, int \fIoldrow\fP, int \fIoldcol\fP, int \fInewrow\fP, int \fInewcol\fP);
++\fBint napms_sp(SCREEN * \fIsp\fP, int \fIms\fP);
++\fBWINDOW * newpad_sp(SCREEN * \fIsp\fP, int \fInrows\fP, int \fIncols\fP);
++\fBSCREEN * new_prescr(void);
++\fBSCREEN * newterm_sp(SCREEN * \fIsp\fP, const char *\fItype\fP, FILE *\fIoutf\fP, FILE *\fIinf\fP);
++.PP
++\fBWINDOW * newwin_sp(SCREEN * \fIsp\fP, int \fInlines\fP, int \fIncols\fP, int \fIbegin_y\fP, int \fIbegin_x\fP);
++\fBint nl_sp(SCREEN * \fIsp\fP);
++\fBint nocbreak_sp(SCREEN * \fIsp\fP);
++\fBint noecho_sp(SCREEN * \fIsp\fP);
++\fBvoid nofilter_sp(SCREEN * \fIsp\fP);
++\fBint nonl_sp(SCREEN * \fIsp\fP);
++\fBvoid noqiflush_sp(SCREEN * \fIsp\fP);
++\fBint noraw_sp(SCREEN * \fIsp\fP);
++\fBint pair_content_sp(SCREEN * \fIsp\fP, short \fIpair\fP, short * \fIfg\fP, short * \fIbg\fP);
++\fBvoid qiflush_sp(SCREEN * \fIsp\fP);
++.PP
++\fBint raw_sp(SCREEN * \fIsp\fP);
++\fBvoid reset_color_pairs_sp(SCREEN * \fIsp\fP);
++\fBint reset_prog_mode_sp(SCREEN * \fIsp\fP);
++\fBint reset_shell_mode_sp(SCREEN * \fIsp\fP);
++\fBint resetty_sp(SCREEN * \fIsp\fP);
++\fBint resize_term_sp(SCREEN * \fIsp\fP, int \fIlines\fP, int \fIcolumns\fP);
++\fBint resizeterm_sp(SCREEN * \fIsp\fP, int \fIlines\fP, int \fIcolumns\fP);
++\fBint ripoffline_sp(SCREEN * \fIsp\fP, int \fIline\fP, int (*\fIinit\fP)(WINDOW * \fIwin\fP, int \fIfmt\fP));
++\fBint savetty_sp(SCREEN * \fIsp\fP);
++\fBint scr_init_sp(SCREEN * \fIsp\fP, const char *\fIfilename\fP);
++.PP
++\fBint scr_restore_sp(SCREEN * \fIsp\fP, const char *\fIfilename\fP);
++\fBint scr_set_sp(SCREEN * \fIsp\fP, const char *\fIfilename\fP);
++\fBint set_escdelay_sp(SCREEN * \fIsp\fP, int \fIms\fP);
++\fBint set_tabsize_sp(SCREEN * \fIsp\fP, int \fIcols\fP);
++\fBint slk_attrset_sp(SCREEN * \fIsp\fP, const chtype \fIa\fP);
++\fBint slk_attr_set_sp(SCREEN * \fIsp\fP, const attr_t \fIattrs\fP, short \fIpair\fP, void *\fIopts\fP);
++\fBint slk_attroff_sp(SCREEN * \fIsp\fP, const chtype \fIa\fP);
++\fBint slk_attron_sp(SCREEN * \fIsp\fP, const chtype \fIa\fP);
++\fBattr_t slk_attr_sp(SCREEN * \fIsp\fP);
++\fBint slk_clear_sp(SCREEN * \fIsp\fP);
++.PP
++\fBint slk_color_sp(SCREEN * \fIsp\fP, short \fIpair\fP);
++\fBint slk_init_sp(SCREEN * \fIsp\fP, int \fIfmt\fP);
++\fBchar * slk_label_sp(SCREEN * \fIsp\fP, int \fIlabnum\fP);
++\fBint slk_noutrefresh_sp(SCREEN * \fIsp\fP);
++\fBint slk_refresh_sp(SCREEN * \fIsp\fP);
++\fBint slk_restore_sp(SCREEN * \fIsp\fP);
++\fBint slk_set_sp(SCREEN * \fIsp\fP, int \fIlabnum\fP, const char * \fIlabel\fP, int \fIfmt\fP);
++\fBint slk_touch_sp(SCREEN * \fIsp\fP);
++\fBint start_color_sp(SCREEN * \fIsp\fP);
++\fBattr_t term_attrs_sp(SCREEN * \fIsp\fP);
++.PP
++\fBchtype termattrs_sp(SCREEN * \fIsp\fP);
++\fBchar * termname_sp(SCREEN * \fIsp\fP);
++\fBint typeahead_sp(SCREEN * \fIsp\fP, int \fIfd\fP);
++\fBint unget_wch_sp(SCREEN * \fIsp\fP, const wchar_t \fIwc\fP);
++\fBint ungetch_sp(SCREEN * \fIsp\fP, int \fIc\fP);
++\fBint ungetmouse_sp(SCREEN * \fIsp\fP, MEVENT * \fIevent\fP);
++\fBint use_default_colors_sp(SCREEN * \fIsp\fP);
++\fBvoid use_env_sp(SCREEN * \fIsp\fP, bool \fIbf\fP);
++\fBint use_legacy_coding_sp(SCREEN * \fIsp\fP, int \fIlevel\fP);
+ \fBvoid use_tioctl_sp(SCREEN *\fIsp\fP, bool \fIbf\fP);
+ .PP
+-\fBint vid_attr_sp(SCREEN* \fIsp\fP, attr_t \fIattrs\fP, short \fIpair\fP, void * \fIopts\fP);
+-\fBint vid_puts_sp(SCREEN* \fIsp\fP, attr_t \fIattrs\fP, short \fIpair\fP, void * \fIopts\fP, NCURSES_SP_OUTC \fIputc\fP);
+-\fBint vidattr_sp(SCREEN* \fIsp\fP, chtype \fIattrs\fP);
+-\fBint vidputs_sp(SCREEN* \fIsp\fP, chtype \fIattrs\fP, NCURSES_SP_OUTC \fIputc\fP);
+-\fBwchar_t* wunctrl_sp(SCREEN* \fIsp\fP, cchar_t *\fIwch\fP);
++\fBint vid_attr_sp(SCREEN * \fIsp\fP, attr_t \fIattrs\fP, short \fIpair\fP, void * \fIopts\fP);
++\fBint vid_puts_sp(SCREEN * \fIsp\fP, attr_t \fIattrs\fP, short \fIpair\fP, void * \fIopts\fP, NCURSES_SP_OUTC \fIputc\fP);
++\fBint vidattr_sp(SCREEN * \fIsp\fP, chtype \fIattrs\fP);
++\fBint vidputs_sp(SCREEN * \fIsp\fP, chtype \fIattrs\fP, NCURSES_SP_OUTC \fIputc\fP);
++\fBwchar_t * wunctrl_sp(SCREEN * \fIsp\fP, cchar_t *\fIwch\fP);
+ .PP
+ \fB#include 
+ .PP
+-\fBFORM* new_form_sp(SCREEN* \fIsp\fP, FIELD **\fIfields\fP);
++\fBFORM * new_form_sp(SCREEN * \fIsp\fP, FIELD **\fIfields\fP);
+ .PP
+ \fB#include 
+ .PP
+-\fBMENU* new_menu_sp(SCREEN* \fIsp\fP, ITEM **\fIitems\fP);
++\fBMENU * new_menu_sp(SCREEN * \fIsp\fP, ITEM **\fIitems\fP);
+ .PP
+ \fB#include 
+ .PP
+-\fBPANEL* ceiling_panel(SCREEN* \fIsp\fP);
+-\fBPANEL* ground_panel(SCREEN* \fIsp\fP);
+-\fBvoid update_panels_sp(SCREEN* \fIsp\fP);
++\fBPANEL * ceiling_panel(SCREEN * \fIsp\fP);
++\fBPANEL * ground_panel(SCREEN * \fIsp\fP);
++\fBvoid update_panels_sp(SCREEN * \fIsp\fP);
+ .PP
+ \fB#include 
+ .PP
+-\fBint del_curterm_sp(SCREEN* \fIsp\fP, TERMINAL *\fIoterm\fP);
+-\fBint putp_sp(SCREEN* \fIsp\fP, const char *\fIstr\fP);
+-\fBint restartterm_sp(SCREEN* \fIsp\fP, NCURSES_CONST char*\fIterm\fP, int \fIfiledes\fP, int *\fIerrret\fP);
+-\fBTERMINAL* set_curterm_sp(SCREEN* \fIsp\fP, TERMINAL*\fInterm\fP);
+-\fBint tgetent_sp(SCREEN* \fIsp\fP, char *\fIbp\fP, const char *\fIname\fP);
+-\fBint tgetflag_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP);
+-\fBint tgetnum_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP);
+-\fBchar* tgetstr_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP, char **\fIarea\fP);
+-\fBchar* tgoto_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP, int \fIcol\fP, int \fIrow\fP);
+-\fBint tigetflag_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP);
++\fBint del_curterm_sp(SCREEN * \fIsp\fP, TERMINAL *\fIoterm\fP);
++\fBint putp_sp(SCREEN * \fIsp\fP, const char *\fIstr\fP);
++\fBint restartterm_sp(SCREEN * \fIsp\fP, NCURSES_CONST char *\fIterm\fP, int \fIfiledes\fP, int *\fIerrret\fP);
++\fBTERMINAL * set_curterm_sp(SCREEN * \fIsp\fP, TERMINAL *\fInterm\fP);
++\fBint tgetent_sp(SCREEN * \fIsp\fP, char *\fIbp\fP, const char *\fIname\fP);
++\fBint tgetflag_sp(SCREEN * \fIsp\fP, const char *\fIcapname\fP);
++\fBint tgetnum_sp(SCREEN * \fIsp\fP, const char *\fIcapname\fP);
++\fBchar * tgetstr_sp(SCREEN * \fIsp\fP, const char *\fIcapname\fP, char **\fIarea\fP);
++\fBchar * tgoto_sp(SCREEN * \fIsp\fP, const char *\fIcapname\fP, int \fIcol\fP, int \fIrow\fP);
++\fBint tigetflag_sp(SCREEN * \fIsp\fP, const char *\fIcapname\fP);
+ .PP
+-\fBint tigetnum_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP);
+-\fBchar* tigetstr_sp(SCREEN* \fIsp\fP, const char *\fIcapname\fP);
++\fBint tigetnum_sp(SCREEN * \fIsp\fP, const char *\fIcapname\fP);
++\fBchar * tigetstr_sp(SCREEN * \fIsp\fP, const char *\fIcapname\fP);
+ \fI/* tparm_sp may use 9 long parameters rather than being variadic */
+-\fBchar* tparm_sp(SCREEN* \fIsp\fP, const char *\fIstr\fP, ...);
+-\fBint tputs_sp(SCREEN* \fIsp\fP, const char *\fIstr\fP, int \fIaffcnt\fP, NCURSES_SP_OUTC \fIputc\fP);
++\fBchar * tparm_sp(SCREEN * \fIsp\fP, const char *\fIstr\fP, ...);
++\fBint tputs_sp(SCREEN * \fIsp\fP, const char *\fIstr\fP, int \fIaffcnt\fP, NCURSES_SP_OUTC \fIputc\fP);
+ .PP
+ \fB#include 
+ .PP
+-\fBNCURSES_CONST char* unctrl_sp(SCREEN* \fIsp\fP, chtype \fIch\fP);
++\fBNCURSES_CONST char * unctrl_sp(SCREEN * \fIsp\fP, chtype \fIch\fP);
+ .fi
+ .SH DESCRIPTION
+ This implementation can be configured to provide a set of functions which
+Index: man/curs_termattrs.3x
+Prereq:  1.57 
+--- ncurses-6.5-20250125+/man/curs_termattrs.3x	2025-01-19 00:51:10.000000000 +0000
++++ ncurses-6.5-20250201/man/curs_termattrs.3x	2025-02-01 22:49:13.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_termattrs.3x,v 1.57 2025/01/19 00:51:10 tom Exp $
+-.TH curs_termattrs 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_termattrs.3x,v 1.59 2025/02/01 22:49:13 tom Exp $
++.TH curs_termattrs 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -188,10 +188,12 @@
+ .I \%termname
+ to 14 characters.
+ .SH HISTORY
+-4BSD (1980) introduced
++4BSD (1980)
++introduced
+ .IR \%longname "."
+ .PP
+-SVr2 (1984) added
++SVr2 (1984)
++added
+ .IR \%baudrate ","
+ .IR \%erasechar ","
+ .IR \%killchar ","
+@@ -199,9 +201,11 @@
+ and
+ .IR \%has_il "."
+ .PP
+-SVr3 (1987) furnished
++SVr3 (1987)
++supplied
+ .IR \%termname "."
+-SVr3.1 later that year supplied
++Later that year,
++SVr3.1 brought
+ .IR \%termattrs "."
+ .PP
+ X/Open Curses Issue\ 4 (1995)
+Index: man/curs_termcap.3x
+Prereq:  1.103 
+--- ncurses-6.5-20250125+/man/curs_termcap.3x	2025-01-19 00:51:10.000000000 +0000
++++ ncurses-6.5-20250201/man/curs_termcap.3x	2025-02-01 22:49:13.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_termcap.3x,v 1.103 2025/01/19 00:51:10 tom Exp $
+-.TH curs_termcap 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_termcap.3x,v 1.105 2025/02/01 22:49:13 tom Exp $
++.TH curs_termcap 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -509,8 +509,7 @@
+ .\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/man/man3/\
+ .\"   termlib.3
+ .PP
+-4BSD
+-(November 1980)
++4BSD (November 1980)
+ renamed
+ .I termlib
+ to
+Index: man/curs_util.3x
+Prereq:  1.134 
+--- ncurses-6.5-20250125+/man/curs_util.3x	2025-01-19 00:51:10.000000000 +0000
++++ ncurses-6.5-20250201/man/curs_util.3x	2025-02-01 22:49:13.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_util.3x,v 1.134 2025/01/19 00:51:10 tom Exp $
+-.TH curs_util 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_util.3x,v 1.136 2025/02/01 22:49:13 tom Exp $
++.TH curs_util 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -534,19 +534,20 @@
+ is not provided by other implementations of curses.
+ .SH HISTORY
+ 4BSD (1980)
+-defined
+-.I \%unctrl
+-(as a macro,
++introduced
++.IR \%unctrl ","
++defining it as a macro
+ in
+-.IR \%unctrl.h ")."
++.IR \%unctrl.h "."
+ .PP
+-SVr2 (1984) introduced
++SVr2 (1984)
++added
+ .IR \%delay_output ","
+ .IR \%flushinp ","
+ and
+ .IR \%keyname "."
+ .PP
+-SVr3 (1987) added
++SVr3 (1987) supplied
+ .IR \%filter "."
+ Later that year,
+ SVr3.1 brought
+Index: man/curs_window.3x
+Prereq:  1.64 
+--- ncurses-6.5-20250125+/man/curs_window.3x	2025-01-19 00:51:10.000000000 +0000
++++ ncurses-6.5-20250201/man/curs_window.3x	2025-02-02 00:04:58.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_window.3x,v 1.64 2025/01/19 00:51:10 tom Exp $
+-.TH curs_window 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_window.3x,v 1.66 2025/02/02 00:04:58 tom Exp $
++.TH curs_window 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -61,17 +61,17 @@
+ .nf
+ \fB#include 
+ .PP
+-\fBWINDOW * newwin(
+-	int \fInlines\fP, int \fIncols\fP,
+-	int \fIbegin_y\fP, int \fIbegin_x\fP);
++\fBWINDOW * newwin(\fR
++	\fBint \fInlines\fP, int \fIncols\fP,
++	\fBint \fIbegin_y\fP, int \fIbegin_x\fP);
+ \fBint delwin(WINDOW * \fIwin\fP);
+ \fBint mvwin(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP);
+ \fBWINDOW * subwin(WINDOW * \fIorig\fP,
+-	int \fInlines\fP, int \fIncols\fP,
+-	int \fIbegin_y\fP, int \fIbegin_x\fP);
++	\fBint \fInlines\fP, int \fIncols\fP,
++	\fBint \fIbegin_y\fP, int \fIbegin_x\fP);
+ \fBWINDOW * derwin(WINDOW * \fIorig\fP,
+-	int \fInlines\fP, int \fIncols\fP,
+-	int \fIbegin_y\fP, int \fIbegin_x\fP);
++	\fBint \fInlines\fP, int \fIncols\fP,
++	\fBint \fIbegin_y\fP, int \fIbegin_x\fP);
+ \fBint mvderwin(WINDOW * \fIwin\fP, int \fIpar_y\fP, int \fIpar_x\fP);
+ \fBWINDOW * dupwin(WINDOW * \fIwin\fP);
+ \fBvoid wsyncup(WINDOW * \fIwin\fP);
+Index: man/man_db.renames.in
+Prereq:  1.83 
+--- ncurses-6.5-20250125+/man/man_db.renames.in	2025-01-19 01:00:28.000000000 +0000
++++ ncurses-6.5-20250201/man/man_db.renames.in	2025-02-01 22:46:00.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: man_db.renames.in,v 1.83 2025/01/19 01:00:28 tom Exp $
++# $Id: man_db.renames.in,v 1.84 2025/02/01 22:46:00 Branden.Robinson Exp $
+ # Manual-page renamings for the man_db program
+ #
+ # Files:
+@@ -221,6 +221,7 @@
+ keyname.3x			keyname.3ncurses
+ keypad.3x			keypad.3ncurses
+ killchar.3x			killchar.3ncurses
++killwchar.3x			killwchar.3ncurses
+ leaveok.3x			leaveok.3ncurses
+ longname.3x			longname.3ncurses
+ meta.3x				meta.3ncurses
+Index: man/manhtml.aliases
+Prereq:  1.46 
+--- ncurses-6.5-20250125+/man/manhtml.aliases	2025-01-19 01:13:04.000000000 +0000
++++ ncurses-6.5-20250201/man/manhtml.aliases	2025-02-02 00:58:13.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: manhtml.aliases,v 1.46 2025/01/19 01:13:04 tom Exp $
++# $Id: manhtml.aliases,v 1.47 2025/02/02 00:58:13 tom Exp $
+ #***************************************************************************
+ # Copyright 2019-2024,2025 Thomas E. Dickey                                *
+ # Copyright 2013,2017 Free Software Foundation, Inc.                       *
+@@ -73,6 +73,7 @@
+ is_cbreak(3X)		curs_inopts(3X)
+ is_scrollok(3X)		curs_opaque(3X)
+ killchar(3X)		curs_termattrs(3X)
++killwchar(3X)		curs_termattrs(3X)
+ keyname(3X)		curs_util(3X)
+ keypad(3X)		curs_inopts(3X)
+ longname(3X)		curs_termattrs(3X)
+Index: ncurses/base/MKlib_gen.sh
+Prereq:  1.77 
+--- ncurses-6.5-20250125+/ncurses/base/MKlib_gen.sh	2024-12-29 10:49:59.000000000 +0000
++++ ncurses-6.5-20250201/ncurses/base/MKlib_gen.sh	2025-02-01 22:09:10.000000000 +0000
+@@ -2,10 +2,10 @@
+ #
+ # MKlib_gen.sh -- generate sources from curses.h macro definitions
+ #
+-# ($Id: MKlib_gen.sh,v 1.77 2024/12/29 10:49:59 tom Exp $)
++# ($Id: MKlib_gen.sh,v 1.78 2025/02/01 22:09:10 tom Exp $)
+ #
+ ##############################################################################
+-# Copyright 2018-2022,2024 Thomas E. Dickey                                  #
++# Copyright 2018-2024,2025 Thomas E. Dickey                                  #
+ # Copyright 1998-2016,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -203,6 +203,8 @@
+ 	s/^\(.*\) \(.*\) (\(.*\))\$/\1 call_\2 (\3)/
+ 	}
+ s/\([^_]\)NCURSES_SP_NAME___\([a-zA-Z][a-zA-Z_]*\)/\1NCURSES_SP_NAME(\2)/g
++/call_NCURSES_SP_NAME/s,(0,(NULL,
++/call\(_NCURSES_SP_NAME\)\?_*\(delscreen\|ripoffline\|set_term\|vidputs\|vid_puts\)/s,0),NULL),
+ EOF
+ fi
+ 
+@@ -443,6 +445,7 @@
+ 		print " */"
+ 		print "#define NCURSES_ATTR_T int"
+ 		print "#include "
++		print "#include "
+ 		print ""
+ 		print "#undef NCURSES_NOMACROS	/* _this_ file uses macros */"
+ 		print "#define NCURSES_NOMACROS 1"
+@@ -480,15 +483,30 @@
+ 					sub(/^[0-9a-zA-Z_]+ /,"",value);
+ 					sub(/^[*][ \t]*/,"",value);
+ 					gsub("struct[ \t]*[0-9a-zA-Z_]+[ \t]*[*]","",value);
++					arg_l = index(value, "(");
++					arg_r = index(value, ")");
++					if ( arg_l > 0 && arg_r > arg_l + 1 ) {
++						args = substr(value, arg_l + 1, arg_r - arg_l - 1);
++						gsub(/[0-9a-zA-Z_]+[ \t]*[*][ \t]*[0-9a-zA-Z_]+/,"NULL",args);
++						gsub(/ (bool|int|short|attr_t|chtype|wchar_t|NCURSES_BOOL|NCURSES_OUTC|NCURSES_OUTC_sp|va_list) /," ",args);
++						value = substr(value,0,arg_l) args substr(value,arg_r);
++					}
+ 					gsub(/[0-9a-zA-Z_]+[ \t]*[*][ \t]*/,"",value);
+ 					gsub(/ (const) /," ",value);
+-					gsub(/ (int|short|attr_t|chtype|wchar_t|NCURSES_BOOL|NCURSES_OUTC|NCURSES_OUTC_sp|va_list) /," ",value);
++					gsub(/ (bool|int|short|attr_t|chtype|wchar_t|NCURSES_BOOL|NCURSES_OUTC|NCURSES_OUTC_sp|va_list) /," ",value);
+ 					gsub(/ void /,"",value);
+ 					sub(/^/,"call_",value);
+ 					gsub(/ (a[0-9]|z) /, " 0 ", value);
+ 					gsub(/ int[ \t]*[(][^)]+[)][(][^)]+[)]/, "0", value);
++					if ( index(value, "call_NCURSES_SP_NAME") > 0 ) {
++						sub("0","NULL", value);
++					}
+ 					printf "    case %d: %s; break;\n", casenum++, value;
+ 				} else {
++					if ( index(value, "call_NCURSES_SP_NAME") > 0 ) {
++						printf "/* FIXME %s */\n", value;
++						sub("0","NULL", value);
++					}
+ 					print value;
+ 				}
+ 			}
+Index: ncurses/tty/lib_mvcur.c
+Prereq:  1.164 
+--- ncurses-6.5-20250125+/ncurses/tty/lib_mvcur.c	2025-01-12 10:51:43.000000000 +0000
++++ ncurses-6.5-20250201/ncurses/tty/lib_mvcur.c	2025-02-01 21:53:19.000000000 +0000
+@@ -160,7 +160,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_mvcur.c,v 1.164 2025/01/12 10:51:43 tom Exp $")
++MODULE_ID("$Id: lib_mvcur.c,v 1.165 2025/02/01 21:53:19 tom Exp $")
+ 
+ #define WANT_CHAR(sp, y, x) NewScreen(sp)->_line[y].text[x]	/* desired state */
+ 
+@@ -1338,7 +1338,7 @@
+ 	 * is winning.
+ 	 */
+ 	else if (sscanf(buf, "t %d", &n) == 1) {
+-	    float cumtime = 0.0, perchar;
++	    double cumtime = 0.0, perchar;
+ 	    int speeds[] =
+ 	    {2400, 9600, 14400, 19200, 28800, 38400, 0};
+ 
+@@ -1384,14 +1384,14 @@
+ 		 * transmission both. Transmission time is an estimate
+ 		 * assuming 9 bits/char, 8 bits + 1 stop bit.
+ 		 */
+-		float totalest = cumtime + xmits * 9 * 1e6 / speeds[i];
++		double totalest = cumtime + (double) xmits * 9 * 1e6 / speeds[i];
+ 
+ 		/*
+ 		 * Per-character optimization overhead in character transmits
+ 		 * at the current speed.  Round this to the nearest integer
+ 		 * to figure COMPUTE_OVERHEAD for the speed.
+ 		 */
+-		float overhead = speeds[i] * perchar / 1e6;
++		double overhead = speeds[i] * perchar / 1e6;
+ 
+ 		(void)
+ 		    printf("%6d bps: %3.2f char-xmits overhead; total estimated time %15.2f\n",
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250125+/package/debian-mingw/changelog	2025-01-24 20:34:16.000000000 +0000
++++ ncurses-6.5-20250201/package/debian-mingw/changelog	2025-01-31 21:35:49.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250125) unstable; urgency=low
++ncurses6td (6.5+20250201) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Fri, 24 Jan 2025 15:34:16 -0500
++ -- Thomas E. Dickey   Fri, 31 Jan 2025 16:35:49 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250125+/package/debian-mingw64/changelog	2025-01-24 20:34:16.000000000 +0000
++++ ncurses-6.5-20250201/package/debian-mingw64/changelog	2025-01-31 21:35:49.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250125) unstable; urgency=low
++ncurses6td (6.5+20250201) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Fri, 24 Jan 2025 15:34:16 -0500
++ -- Thomas E. Dickey   Fri, 31 Jan 2025 16:35:49 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250125+/package/debian/changelog	2025-01-24 20:34:16.000000000 +0000
++++ ncurses-6.5-20250201/package/debian/changelog	2025-01-31 21:35:49.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250125) unstable; urgency=low
++ncurses6td (6.5+20250201) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Fri, 24 Jan 2025 15:34:16 -0500
++ -- Thomas E. Dickey   Fri, 31 Jan 2025 16:35:49 -0500
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.686 
+--- ncurses-6.5-20250125+/package/mingw-ncurses.nsi	2025-01-24 20:34:16.000000000 +0000
++++ ncurses-6.5-20250201/package/mingw-ncurses.nsi	2025-01-31 21:35:49.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.686 2025/01/24 20:34:16 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.687 2025/01/31 21:35:49 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0125"
++!define VERSION_MMDD  "0201"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250125+/package/mingw-ncurses.spec	2025-01-24 20:34:16.000000000 +0000
++++ ncurses-6.5-20250201/package/mingw-ncurses.spec	2025-01-31 21:35:49.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250125
++Release: 20250201
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20250125+/package/ncurses.spec	2025-01-24 20:34:16.000000000 +0000
++++ ncurses-6.5-20250201/package/ncurses.spec	2025-01-31 21:35:49.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250125
++Release: 20250201
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20250125+/package/ncursest.spec	2025-01-24 20:34:16.000000000 +0000
++++ ncurses-6.5-20250201/package/ncursest.spec	2025-01-31 21:35:49.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250125
++Release: 20250201
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250208.patch b/packages/ncurses/6.5/ncurses-6.5-20250208.patch
new file mode 100644
index 0000000000..38d47341d6
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250208.patch
@@ -0,0 +1,763 @@
+# ncurses 6.5 - patch 20250208 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250208.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Feb  9 00:55:56 UTC 2025
+# ------------------------------------------------------------------------------
+# NEWS                             |    9 ++-
+# VERSION                          |    2 
+# c++/etip.h.in                    |   13 ++--
+# dist.mk                          |    4 -
+# misc/terminfo.src                |  108 +++++++++++++++++++++++++++++--------
+# ncurses/base/lib_mouse.c         |    8 +-
+# ncurses/base/lib_set_term.c      |    9 ++-
+# 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               |   10 +--
+# test/ditto.c                     |    8 +-
+# test/filter.c                    |    6 +-
+# test/redraw.c                    |    6 +-
+# test/test_opaque.c               |   34 ++++++++---
+# 19 files changed, 167 insertions(+), 72 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4239 
+--- ncurses-6.5-20250201+/NEWS	2025-02-02 00:30:12.000000000 +0000
++++ ncurses-6.5-20250208/NEWS	2025-02-08 23:54:37.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4239 2025/02/02 00:30:12 tom Exp $
++-- $Id: NEWS,v 1.4242 2025/02/08 23:54:37 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.
+ 
++20250208
++	+ change etip.h.in to include either/both of  and ,
++	  needed for another old BSD.
++	+ update st (report by Alexander Kashpir) -TD
++	+ add note for ghostty 1.1.0 -TD
++	+ fix a few issues found with coverity.
++
+ 20250201
+ 	+ add  to the possible headers declaring the C++ std::bad_alloc
+ 	  (report by Carl Hansen).
+Index: VERSION
+--- ncurses-6.5-20250201+/VERSION	2025-02-01 10:35:49.000000000 +0000
++++ ncurses-6.5-20250208/VERSION	2025-02-08 11:01:51.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250201
++5:0:10	6.5	20250208
+Index: c++/etip.h.in
+Prereq:  1.54 
+--- ncurses-6.5-20250201+/c++/etip.h.in	2025-02-02 00:20:44.000000000 +0000
++++ ncurses-6.5-20250208/c++/etip.h.in	2025-02-08 23:39:52.000000000 +0000
+@@ -32,7 +32,7 @@
+  *   Author: Juergen Pfeifer, 1997                                          *
+  ****************************************************************************/
+ 
+-// $Id: etip.h.in,v 1.54 2025/02/02 00:20:44 tom Exp $
++// $Id: etip.h.in,v 1.55 2025/02/08 23:39:52 tom Exp $
+ 
+ #ifndef NCURSES_ETIP_H_incl
+ #define NCURSES_ETIP_H_incl 1
+@@ -124,14 +124,17 @@
+ #    endif
+ #    undef exception
+ #  endif
+-#elif HAVE_EXCEPTION
+-#  include 
+-#elif HAVE_NEW
+-#  include 
+ #elif defined (__SUNPRO_CC)
+ #  include 
+ #endif
+ 
++#if HAVE_EXCEPTION
++# include 
++#endif
++#if HAVE_NEW
++# include 
++#endif
++
+ // This used to include , but Apple's configuration as of 2024
+ // provides only a broken version of ncurses's header, which interferes
+ // with the configure script.
+Index: dist.mk
+Prereq:  1.1653 
+--- ncurses-6.5-20250201+/dist.mk	2025-02-01 10:35:49.000000000 +0000
++++ ncurses-6.5-20250208/dist.mk	2025-02-08 11:01:51.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1653 2025/02/01 10:35:49 tom Exp $
++# $Id: dist.mk,v 1.1654 2025/02/08 11:01:51 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 = 5
+-NCURSES_PATCH = 20250201
++NCURSES_PATCH = 20250208
+ 
+ # 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.5-20250201+/misc/terminfo.src	2025-01-04 21:02:11.000000000 +0000
++++ ncurses-6.5-20250208/misc/terminfo.src	2025-02-08 21:27:07.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.1163 $
+-#	$Date: 2025/01/04 21:02:11 $
++#	$Revision: 1.1170 $
++#	$Date: 2025/02/08 21:27:07 $
+ #
+ # 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
+@@ -635,7 +635,7 @@
+ #	Parameter default value: Ps = 0
+ #	With a parameter value not equal to 0, DA is used to identify the
+ #	device which sends the DA.  The parameter value is a device type
+-#	identification code according to a register which is to be established. 
++#	identification code according to a register which is to be established.
+ #	If the parameter value is 0, DA is used to request an identifying DA
+ #	from a device.
+ #
+@@ -3209,7 +3209,7 @@
+ #   my faulty memory, and the following online sources and references:
+ #
+ # [1] "Three Scotts and a Duane" by Simson L. Garfinkel
+-# http://www.nextcomputers.org/NeXTfiles/Articles/NeXTWORLD/93.8/93.8.Dec.Community1.html
++# https://web.archive.org/web/20121019083801/http://www.nextcomputers.org/NeXTfiles/Articles/NeXTWORLD/93.8/93.8.Dec.Community1.html
+ #
+ # [2] NeXTSTEP entry from Wikipedia, the free encyclopedia
+ # https://secure.wikimedia.org/wikipedia/en/wiki/Nextstep
+@@ -3642,7 +3642,7 @@
+ # NOTES:
+ # with esctest:
+ #	365 tests passed, 196 known bugs, 2 tests fail intermittently
+-#	the known bugs include several of the cursor-movement tests 
++#	the known bugs include several of the cursor-movement tests
+ #	the ED, EL tests include those failing intermittently
+ #	DECCOLM, DECERA, DECSED, DECSERA and SPA do not work
+ #	most of the DECRPM, DECRQSS reports fail
+@@ -4023,7 +4023,7 @@
+ #	TN3270, TVI910, TVI925, Wyse 50/60, and ANSI.
+ # Changes:
+ #	Added ANSI sc/rc and REP in 2019/12/17
+-#	Added TVI910/ TVI925 in 2019/11/20	
++#	Added TVI910/ TVI925 in 2019/11/20
+ #
+ # Default:
+ #	Emulate "Xterm", using "ANSI with 256color"
+@@ -4088,8 +4088,8 @@
+ #	TERM=xterm
+ #
+ # vttest:
+-#	DA1: \E[?62;1;2;6;7;8;9;15;22c (VT200 with DRCS, UDK, NRCS) 
+-#	DA2: \E[>1;10;0c 
++#	DA1: \E[?62;1;2;6;7;8;9;15;22c (VT200 with DRCS, UDK, NRCS)
++#	DA2: \E[>1;10;0c
+ #	However:
+ #	+ NRCS tests do not work
+ #	+ DECUDK test fails
+@@ -5706,7 +5706,7 @@
+ # 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 
++# 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
+@@ -6029,7 +6029,7 @@
+ #	http://nion.modprobe.de/blog/archives/569-colored-manpages.html
+ #	(blog posting by Nico Golde, June 24 2007)
+ # archive:
+-#	https://web-beta.archive.org/web/20070921042430/http://nion.modprobe.de/mostlike.txt
++#	https://web.archive.org/web/20070921042430/http://nion.modprobe.de/mostlike.txt
+ # The comment hints where it started, but there are differences:
+ #	Reconstructed via infocmp from file: /usr/share/terminfo/x/xterm-pcolor
+ mostlike|manpages with color looking like most,
+@@ -6858,7 +6858,6 @@
+ 	use=vt220+vtedit, use=xterm+nopcfkeys,
+ 
+ # rxvt was originally "xvt", first announced in April 1993:
+-#	http://www.krsaborio.net/linux-desktops/research/1993/0416.html
+ #------------------------------------------------------------------------------
+ # Article: 567 of comp.os.linux.announce
+ # Path: pavo.csi.cam.ac.uk!warwick!uknet!pipex!uunet!zaphod.mps.ohio-state.edu!
+@@ -7060,7 +7059,7 @@
+ # This article does not cover the HP 46020A keyboard that is used by the Model
+ # 217 and 237 computers.  For information on this keyboard read the article,
+ # "The Series 300 ITE as System Console" found in the manual, HP-UX Concepts
+-# and Tutorials, Vol.  7. 
++# and Tutorials, Vol.  7.
+ #
+ # Possibly:
+ # http://bitsavers.trailing-edge.com/pdf/hp/9000_hpux/1986/97089-90042_198608_HP-UX_Concepts_and_Tutorials.pdf
+@@ -7304,7 +7303,27 @@
+ # st.suckless.org
+ 
+ st|stterm|aka simpleterm,
+-	use=st-0.8,
++	use=st-0.8.5,
++
++# Reviewed 0.9.2 (Debian testing package "stterm"):
++# Inspected source, saw nothing to change in terminfo.
++#
++# Reviewed 0.8.5 (Debian stable package "stterm"):
++# In tack,
++#	sends nothing for control- and alt-modifiers to function-keys
++#	does not support application-mode for numeric keypad
++# In vttest,
++#	identifies as a VT102
++#	SRM, DECTCEM and ECH work, but not DECSCA
++#	incomplete DECSCUSR, shapes work but no blinking cursor
++#	SD and SL work, but not SL or SR
++#	supports normal, button-event and any-event mouse
++#	focus events are unreliable
++# Other:
++#	supports xterm OSC 12, but not 112, so Cs applies but not Cr
++#	OSC allows ST \E\\ in addition to \007
++st-0.8.5|simpleterm 0.8.5,
++	Cs=\E]12;%p1%s\007, use=ansi+rep, use=st-0.8,
+ 
+ # Reviewed 0.8.2:
+ # In tack,
+@@ -7922,7 +7941,7 @@
+ #	otherwise few reports, except cursor-position and mouse and some dtterm
+ #	VT520 cursor-movement works, except for left/right margins
+ #	supports xterm/DECSCUSR, though default case in vttest does not blink
+-#		Send: <27> [ 0 <32> q 
++#		Send: <27> [ 0 <32> q
+ #		Text: The cursor should be a blinking rectangle
+ #	partial support for xterm mouse any-event mode and button-event mode:
+ #	+ does not report focus-in/focus-out
+@@ -8235,7 +8254,7 @@
+ # However, it uses xterm as a standard:
+ #
+ #	We believe Ghostty is one of the most compliant terminal emulators
+-#	available.  Terminal behavior is partially a de jure standard (i.e. 
++#	available.  Terminal behavior is partially a de jure standard (i.e.
+ #	[ECMA-48](https://ecma-international.org/publications-and-standards/stand>
+ #	but mostly a de facto standard as defined by popular terminal emulators
+ #	worldwide.  Ghostty takes the approach that our behavior is defined by
+@@ -8252,6 +8271,45 @@
+ # study xterm's source code closer than xterm's documentation.  The quote above
+ # is the only mention of ECMA-48.
+ #
++# ghostty 1.1.0 tested with Arch Linux:
++# -------------
++# The issue with vttest is repaired.  Other issues remain.  The reader may not
++# have noticed, but the ghostty developers disallow direct bug reports.
++# Quoting the developers:
++#
++#	https://github.com/ghostty-org/ghostty/issues/3558
++#	Users are not allowed to create Issues directly in this repository - we
++#	ask that you create a Discussion first.
++#	...
++#	Any Discussion which clearly identifies a problem in Ghostty and can be
++#	confirmed or reproduced will be converted to an Issue by a maintainer,
++#	so as a user finding a valid problem you don't do any extra work
++#	anyway.  Thank you.
++#
++# As a direct consequence, details and attribution in those "Discussion" notes
++# may be omitted, as in this instance.
++#
++# https://web.archive.org/web/20250124124041/https://github.com/ghostty-org/ghostty/issues/2542
++# ghostty #2542 Publish ghostty terminfo to ncurses terminal database
++# Opened October 30, 2024, this terminal description is mentioned December 31.
++#
++# https://web.archive.org/web/20250115170223/https://github.com/ghostty-org/ghostty/issues/4523
++# ghostty #4523 Renderers (Metal and OpenGL) should clip terminal if terminal
++#		grid size mismatches physical window
++# Opened January 3, 2025, with a note
++#	The only known way to trigger this is DECCOLM, so it's low priority
++#	since almost nothing uses this.  But notably vtetest uses this and it
++#	makes it appear like we perform much worse than we do.
++#
++# Issue #4523 does not mention the bug report (nor, as in some other instances
++# refer obliquely to a discussion on "Discord").  vttest sends a DECCOLM to
++# ensure that the screen is not in 132-column mode.  That is the case for the
++# testing reported.  If ghostty were implementing DECCOLM correctly, it would
++# not have decided that the screensize changed.  The fix in #4523 is a
++# workaround masking other potential issues.
++#
++# By the way, that should be "vttest" (there is no such program as "vtetest").
++#
+ # ghostty 1.0.0 tested with Arch Linux:
+ # -------------
+ # tack:
+@@ -8269,11 +8327,11 @@
+ # vttest:
+ # - ghostty hangs in more than one menu, making it impossible to test more than
+ #   a small part of the program.  In particular, these are untestable:
+-#	1. Test of cursor movements 
++#	1. Test of cursor movements
+ #	2. Test of screen features
+ #	4. Test of double-sized characters
+ # - ghostty has tabs (imitating gnome-terminal); when closing a tab with a
+-#   running process (e.g., a hung vttest), ghostty does not prompt about the 
++#   running process (e.g., a hung vttest), ghostty does not prompt about the
+ #   process to be killed.
+ # - identifies as a "VT220 with color":
+ #	<27> [ ? 6 2 ; 2 2 c
+@@ -9083,8 +9141,8 @@
+ # incomplete manual page.  Presumably the intent was to document features of
+ # shelltool not in wscons:
+ #
+-#    https://manpages.ubuntu.com/manpages/bionic/en/man1/shelltool.1.html
+-#    https://manpages.ubuntu.com/manpages/bionic/en/man1/cmdtool.1.html
++#    https://web.archive.org/web/20230608051050/manpages.ubuntu.com/manpages/bionic/en/man1/shelltool.1.html
++#    https://web.archive.org/web/20220520165933/manpages.ubuntu.com/manpages/bionic/en/man1/cmdtool.1.html
+ #
+ # The wscons manual page and the XView source show that it had no feature that
+ # could be used in ncurses u6/u7/u8/u9 extensions.  Interesting, the XView
+@@ -17946,7 +18004,7 @@
+ #
+ # They're now (1998) a subsidiary of General Electric, operating under the
+ # marque "GEC-Marconi Hazeltine" and doing military avionics.  Web page
+-# at .
++# at .
+ #
+ 
+ # Since  is blank, when you want to erase something you
+@@ -23465,8 +23523,8 @@
+ # https://ub.fnwi.uva.nl/computermuseum/tab13215g.html
+ #	This monochrome graphics terminal of TAB Products, California, is a DEC
+ #	VT52/VT100/VT132 compatible alphanumeric terminal (TAB 132/15),
+-#	factory-fitted with additional hardware for Tektronix 4010 emulation. 
+-#	Also the terminal understands a selection of Tektronix 4027 commands. 
++#	factory-fitted with additional hardware for Tektronix 4010 emulation.
++#	Also the terminal understands a selection of Tektronix 4027 commands.
+ tab132|tab|tab132-15|tab 132/15,
+ 	da, db,
+ 	OTdN@, lm#96,
+@@ -27730,4 +27788,10 @@
+ #	+ add linux+lockeys, xterm+r5+lockeys, xterm+r5+fkeys -TD
+ #	+ add vt220+ufkeys, vt220+sfkeys
+ #
++# 2025-02-03
++#	+ add note for ghostty 1.1.0 -TD
++#
++# 2025-02-08
++#	+ update st (report by Alexander Kashpir) -TD
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: ncurses/base/lib_mouse.c
+Prereq:  1.206 
+--- ncurses-6.5-20250201+/ncurses/base/lib_mouse.c	2025-01-22 23:13:51.000000000 +0000
++++ ncurses-6.5-20250208/ncurses/base/lib_mouse.c	2025-02-08 12:16:37.000000000 +0000
+@@ -85,7 +85,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_mouse.c,v 1.206 2025/01/22 23:13:51 tom Exp $")
++MODULE_ID("$Id: lib_mouse.c,v 1.207 2025/02/08 12:16:37 tom Exp $")
+ 
+ #include 
+ 
+@@ -1114,7 +1114,7 @@
+ 			    sp->_ifd,
+ #endif
+ 			    kbuf + grabbed, (size_t) (MAX_KBUF - (int) grabbed));
+-	if (res == -1)
++	if (res < 0)
+ 	    break;
+     }
+     _nc_set_read_thread(FALSE);
+@@ -1162,7 +1162,7 @@
+ 			    sp->_ifd,
+ #endif
+ 			    (kbuf + grabbed), (size_t) 1);
+-	if (res == -1)
++	if (res < 0)
+ 	    break;
+ 	grabbed += (size_t) res;
+ 	if (grabbed > 1) {
+@@ -1240,7 +1240,7 @@
+ 			    sp->_ifd,
+ #endif
+ 			    (kbuf + grabbed), (size_t) 1);
+-	if (res == -1)
++	if (res < 0)
+ 	    break;
+ 	if ((grabbed + MAX_KBUF) >= (int) sizeof(kbuf)) {
+ 	    result->nerror++;
+Index: ncurses/base/lib_set_term.c
+Prereq:  1.193 
+--- ncurses-6.5-20250201+/ncurses/base/lib_set_term.c	2025-01-22 23:13:27.000000000 +0000
++++ ncurses-6.5-20250208/ncurses/base/lib_set_term.c	2025-02-08 15:54:53.000000000 +0000
+@@ -57,7 +57,7 @@
+ #undef CUR
+ #define CUR SP_TERMTYPE
+ 
+-MODULE_ID("$Id: lib_set_term.c,v 1.193 2025/01/22 23:13:27 tom Exp $")
++MODULE_ID("$Id: lib_set_term.c,v 1.195 2025/02/08 15:54:53 tom Exp $")
+ 
+ #ifdef USE_TERM_DRIVER
+ #define MaxColors      InfoOf(sp).maxcolors
+@@ -331,10 +331,13 @@
+     T((T_CALLED("_nc_setupscreen(%d, %d, %p, %d, %d)"),
+        slines, scolumns, (void *) output, filtered, slk_format));
+ 
+-    assert(CURRENT_SCREEN == 0);	/* has been reset in newterm() ! */
++    /* CURRENT_SCREE is reset in newterm() */
++    if (CURRENT_SCREEN != NULL || slines <= 0 || scolumns <= 0)
++	returnCode(ERR);
+ 
+ #if NCURSES_SP_FUNCS
+-    assert(spp != 0);
++    if (spp == NULL)
++	returnCode(ERR);
+     sp = *spp;
+ 
+     if (!sp) {
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250201+/package/debian-mingw/changelog	2025-01-31 21:35:49.000000000 +0000
++++ ncurses-6.5-20250208/package/debian-mingw/changelog	2025-02-08 11:01:51.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250201) unstable; urgency=low
++ncurses6td (6.5+20250208) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Fri, 31 Jan 2025 16:35:49 -0500
++ -- Thomas E. Dickey   Sat, 08 Feb 2025 06:01:51 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250201+/package/debian-mingw64/changelog	2025-01-31 21:35:49.000000000 +0000
++++ ncurses-6.5-20250208/package/debian-mingw64/changelog	2025-02-08 11:01:51.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250201) unstable; urgency=low
++ncurses6td (6.5+20250208) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Fri, 31 Jan 2025 16:35:49 -0500
++ -- Thomas E. Dickey   Sat, 08 Feb 2025 06:01:51 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250201+/package/debian/changelog	2025-01-31 21:35:49.000000000 +0000
++++ ncurses-6.5-20250208/package/debian/changelog	2025-02-08 11:01:51.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250201) unstable; urgency=low
++ncurses6td (6.5+20250208) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Fri, 31 Jan 2025 16:35:49 -0500
++ -- Thomas E. Dickey   Sat, 08 Feb 2025 06:01:51 -0500
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.687 
+--- ncurses-6.5-20250201+/package/mingw-ncurses.nsi	2025-01-31 21:35:49.000000000 +0000
++++ ncurses-6.5-20250208/package/mingw-ncurses.nsi	2025-02-08 11:01:51.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.687 2025/01/31 21:35:49 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.688 2025/02/08 11:01:51 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0201"
++!define VERSION_MMDD  "0208"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250201+/package/mingw-ncurses.spec	2025-01-31 21:35:49.000000000 +0000
++++ ncurses-6.5-20250208/package/mingw-ncurses.spec	2025-02-08 11:01:51.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250201
++Release: 20250208
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20250201+/package/ncurses.spec	2025-01-31 21:35:49.000000000 +0000
++++ ncurses-6.5-20250208/package/ncurses.spec	2025-02-08 11:01:51.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250201
++Release: 20250208
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20250201+/package/ncursest.spec	2025-01-31 21:35:49.000000000 +0000
++++ ncurses-6.5-20250208/package/ncursest.spec	2025-02-08 11:01:51.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250201
++Release: 20250208
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/dump_entry.c
+Prereq:  1.198 
+--- ncurses-6.5-20250201+/progs/dump_entry.c	2024-12-07 22:06:39.000000000 +0000
++++ ncurses-6.5-20250208/progs/dump_entry.c	2025-02-08 21:53:40.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 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.198 2024/12/07 22:06:39 tom Exp $")
++MODULE_ID("$Id: dump_entry.c,v 1.199 2025/02/08 21:53:40 tom Exp $")
+ 
+ #define DISCARD(string) string = ABSENT_STRING
+ #define PRINTF (void) printf
+@@ -1209,10 +1209,10 @@
+     } else if (tversion == V_AIX) {
+ 	if (VALID_STRING(acs_chars)) {
+ 	    bool box_ok = TRUE;
+-	    const char *acstrans = "lqkxjmwuvtn";
++	    static const char acstrans[] = "lqkxjmwuvtn";
+ 	    const char *cp;
+ 	    const char *sp;
+-	    char *tp, boxchars[11];
++	    char *tp, boxchars[sizeof(acstrans)];
+ 
+ 	    tp = boxchars;
+ 	    for (cp = acstrans; *cp; cp++) {
+@@ -1224,7 +1224,7 @@
+ 		    break;
+ 		}
+ 	    }
+-	    tp[0] = '\0';
++	    *tp = '\0';
+ 
+ 	    if (box_ok) {
+ 		char *tmp = _nc_tic_expand(boxchars,
+Index: test/ditto.c
+Prereq:  1.60 
+--- ncurses-6.5-20250201+/test/ditto.c	2024-12-07 23:02:27.000000000 +0000
++++ ncurses-6.5-20250208/test/ditto.c	2025-02-09 00:18:00.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey (1998-on)
+  *
+- * $Id: ditto.c,v 1.60 2024/12/07 23:02:27 tom Exp $
++ * $Id: ditto.c,v 1.61 2025/02/09 00:18:00 tom Exp $
+  *
+  * The program illustrates how to set up multiple screens from a single
+  * program.
+@@ -192,7 +192,7 @@
+ 	failed(path);
+     printf("opened %s\n", path);
+ #endif
+-    assert(fp != 0);
++    assert(fp != NULL);
+     return fp;
+ }
+ 
+@@ -432,7 +432,7 @@
+     if ((data = typeCalloc(DITTO, (size_t) argc)) == NULL)
+ 	failed("calloc data");
+ 
+-    assert(data != 0);
++    assert(data != NULL);
+ 
+     for (j = 0; j < argc; j++) {
+ 	open_screen(&data[j], argv, argc, j);
+Index: test/filter.c
+Prereq:  1.41 
+--- ncurses-6.5-20250201+/test/filter.c	2024-12-07 22:40:19.000000000 +0000
++++ ncurses-6.5-20250208/test/filter.c	2025-02-08 13:06:10.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author:  Thomas E. Dickey 1998
+  *
+- * $Id: filter.c,v 1.41 2024/12/07 22:40:19 tom Exp $
++ * $Id: filter.c,v 1.42 2025/02/08 13:06:10 tom Exp $
+  *
+  * An example of the 'filter()' function in ncurses, this program prompts
+  * for commands and executes them (like a command shell).  It illustrates
+@@ -123,7 +123,7 @@
+ 	    if (first) {
+ 		getyx(stdscr, y, x);
+ 		first = FALSE;
+-	    } else {
++	    } else if (limit > 0) {
+ 		int left = 0;
+ 
+ 		/*
+Index: test/redraw.c
+Prereq:  1.19 
+--- ncurses-6.5-20250201+/test/redraw.c	2024-12-07 22:46:42.000000000 +0000
++++ ncurses-6.5-20250208/test/redraw.c	2025-02-09 00:18:18.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2006-2012,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: redraw.c,v 1.19 2024/12/07 22:46:42 tom Exp $
++ * $Id: redraw.c,v 1.20 2025/02/09 00:18:18 tom Exp $
+  *
+  * Demonstrate the redrawwin() and wredrawln() functions.
+  * Thomas Dickey - 2006/11/4
+@@ -85,7 +85,7 @@
+     int max_y, max_x;
+     int beg_y, beg_x;
+ 
+-    assert(win != 0);
++    assert(win != NULL);
+ 
+     scrollok(win, TRUE);
+     keypad(win, TRUE);
+Index: test/test_opaque.c
+Prereq:  1.18 
+--- ncurses-6.5-20250201+/test/test_opaque.c	2024-12-07 22:46:42.000000000 +0000
++++ ncurses-6.5-20250208/test/test_opaque.c	2025-02-08 13:03:06.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2007-2008,2009 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_opaque.c,v 1.18 2024/12/07 22:46:42 tom Exp $
++ * $Id: test_opaque.c,v 1.19 2025/02/08 13:03:06 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -157,15 +157,33 @@
+ }
+ 
+ static int
++height_of(const WINDOW *win)
++{
++    int result = getmaxy(win);
++    if (result <= 0)
++	result = 1;
++    return result;
++}
++
++static int
++width_of(const WINDOW *win)
++{
++    int result = getmaxx(win);
++    if (result <= 0)
++	result = 1;
++    return result;
++}
++
++static int
+ status_y(const WINDOW *stswin, int cell)
+ {
+-    return (cell % getmaxy(stswin));
++    return (cell % height_of(stswin));
+ }
+ 
+ static int
+ status_x(const WINDOW *stswin, int cell)
+ {
+-    return (15 * (cell / getmaxy(stswin)));
++    return (15 * (cell / height_of(stswin)));
+ }
+ 
+ static void
+@@ -289,8 +307,8 @@
+ 	wnoutrefresh(txtbox);
+ 
+ 	txtwin = derwin(txtbox,
+-			getmaxy(txtbox) - 2,
+-			getmaxx(txtbox) - 2,
++			height_of(txtbox) - 2,
++			width_of(txtbox) - 2,
+ 			1, 1);
+ 	base_y = 0;
+     } else {
+@@ -365,7 +383,7 @@
+ 		break;
+ 	    case KEY_DOWN:
+ 	    case 'j':
+-		if (txt_y < getmaxy(txtwin) - 1)
++		if (txt_y < height_of(txtwin) - 1)
+ 		    txt_y++;
+ 		else
+ 		    beep();
+@@ -386,7 +404,7 @@
+ 		break;
+ 	    case KEY_RIGHT:
+ 	    case 'l':
+-		if (txt_x < getmaxx(txtwin) - 1)
++		if (txt_x < width_of(txtwin) - 1)
+ 		    txt_x++;
+ 		else
+ 		    beep();
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250215.patch b/packages/ncurses/6.5/ncurses-6.5-20250215.patch
new file mode 100644
index 0000000000..3cbe47f462
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250215.patch
@@ -0,0 +1,15834 @@
+# ncurses 6.5 - patch 20250215 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250215.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Feb 16 01:13:59 UTC 2025
+# ------------------------------------------------------------------------------
+# NEWS                                       |   12 
+# VERSION                                    |    2 
+# aclocal.m4                                 |   12 
+# configure                                  | 3904 +++++++++++++--------------
+# dist.mk                                    |    4 
+# doc/html/man/curs_attr.3x.html             |   12 
+# doc/html/man/curs_bkgrnd.3x.html           |    8 
+# doc/html/man/curs_get_wch.3x.html          |   47 
+# doc/html/man/curs_get_wstr.3x.html         |   10 
+# doc/html/man/curs_getch.3x.html            |   12 
+# doc/html/man/curs_inch.3x.html             |   10 
+# doc/html/man/curs_inchstr.3x.html          |   12 
+# doc/html/man/curs_kernel.3x.html           |   12 
+# doc/html/man/curs_legacy.3x.html           |   10 
+# doc/html/man/curs_mouse.3x.html            |    8 
+# doc/html/man/curs_opaque.3x.html           |   12 
+# doc/html/man/curs_print.3x.html            |   10 
+# doc/html/man/curs_terminfo.3x.html         |   10 
+# doc/html/man/curs_threads.3x.html          |   12 
+# doc/html/man/curs_util.3x.html             |   10 
+# doc/html/man/form_field_validation.3x.html |   10 
+# doc/html/man/infocmp.1m.html               |   10 
+# doc/html/man/ncurses.3x.html               |    2 
+# doc/html/man/tabs.1.html                   |   10 
+# doc/html/man/terminfo.5.html               |    2 
+# doc/html/man/toe.1m.html                   |   12 
+# doc/html/man/tput.1.html                   |   10 
+# include/Caps.uwin                          |    6 
+# man/curs_attr.3x                           |    9 
+# man/curs_bkgrnd.3x                         |   15 
+# man/curs_get_wch.3x                        |    6 
+# man/curs_get_wstr.3x                       |    6 
+# man/curs_getch.3x                          |    6 
+# man/curs_inch.3x                           |    5 
+# man/curs_inchstr.3x                        |    6 
+# man/curs_kernel.3x                         |    6 
+# man/curs_legacy.3x                         |   17 
+# man/curs_mouse.3x                          |    6 
+# man/curs_opaque.3x                         |    6 
+# man/curs_print.3x                          |   16 
+# man/curs_terminfo.3x                       |    6 
+# man/curs_threads.3x                        |    8 
+# man/curs_util.3x                           |   24 
+# man/form_field_validation.3x               |    6 
+# man/infocmp.1m                             |    6 
+# man/tabs.1                                 |    6 
+# man/toe.1m                                 |    8 
+# man/tput.1                                 |    6 
+# misc/magic                                 |    9 
+# misc/terminfo.src                          |   19 
+# ncurses/base/lib_chgat.c                   |    7 
+# ncurses/base/lib_mouse.c                   |    4 
+# ncurses/base/lib_set_term.c                |   10 
+# ncurses/tinfo/captoinfo.c                  |   54 
+# ncurses/tinfo/lib_tparm.c                  |    6 
+# ncurses/tinfo/lib_win32con.c               |    6 
+# ncurses/trace/varargs.c                    |   30 
+# ncurses/tty/hardscroll.c                   |    4 
+# ncurses/tty/lib_tstp.c                     |    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 
+# test/newdemo.c                             |    4 
+# test/tclock.c                              |    4 
+# test/test_tparm.c                          |    6 
+# 69 files changed, 2271 insertions(+), 2287 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4242 
+--- ncurses-6.5-20250208+/NEWS	2025-02-08 23:54:37.000000000 +0000
++++ ncurses-6.5-20250215/NEWS	2025-02-16 00:19:24.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4242 2025/02/08 23:54:37 tom Exp $
++-- $Id: NEWS,v 1.4245 2025/02/16 00:19:24 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.
+ 
++20250215
++	+ add gzip option for suppressing filename/timestamp information to an
++	  overlooked case (cf: 20240330).
++	+ correct spelling errors found with codespell.
++	+ fix some typos in manpages (report by Sven Joachim)
++	+ amend change to lib_set_term.c to work with thread configuration
++	  (report by Rajeev Pillai, cf: 20250208).
++
+ 20250208
+ 	+ change etip.h.in to include either/both of  and ,
+ 	  needed for another old BSD.
+@@ -106,7 +114,7 @@
+ 20241221
+ 	+ modify ncurses/tinfo/MKfallback.sh to work with MacOS sed, which
+ 	  lacks BSD-style \< and \>
+-	+ trim padding from sgr expresion used in trim_sgr0, to avoid copying
++	+ trim padding from sgr expression used in trim_sgr0, to avoid copying
+ 	  the padding into the resulting sgr0 (report by Rajeev Pillai).
+ 	+ strict compiler-warning fixes for upcoming gcc15
+ 
+Index: VERSION
+--- ncurses-6.5-20250208+/VERSION	2025-02-08 11:01:51.000000000 +0000
++++ ncurses-6.5-20250215/VERSION	2025-02-15 12:35:22.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250208
++5:0:10	6.5	20250215
+Index: aclocal.m4
+Prereq:  1.1101 
+--- ncurses-6.5-20250208+/aclocal.m4	2025-02-02 00:10:44.000000000 +0000
++++ ncurses-6.5-20250215/aclocal.m4	2025-02-16 00:15:17.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1101 2025/02/02 00:10:44 tom Exp $
++dnl $Id: aclocal.m4,v 1.1102 2025/02/16 00:15:17 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -598,7 +598,7 @@
+ 	esac
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_BOOL_DECL version: 9 updated: 2023/12/03 09:21:34
++dnl CF_BOOL_DECL version: 10 updated: 2025/02/01 19:31:51
+ dnl ------------
+ dnl Test if 'bool' is a builtin type in the configured C/C++ compiler.  Some
+ dnl older compilers (e.g., gcc 2.5.8) don't support 'bool' directly; gcc
+@@ -6034,7 +6034,7 @@
+ AC_MSG_RESULT($MANPAGE_TBL)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_MAN_PAGES version: 60 updated: 2024/12/28 16:38:35
++dnl CF_MAN_PAGES version: 61 updated: 2025/02/15 19:13:25
+ 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
+@@ -6236,7 +6236,7 @@
+ if test -n "$cf_manpage_compress" ; then
+ cat >>$cf_edit_man <&5
+ 
++		LIB_CREATE="$MK_SHARED_LIB"
+ 		;;
+ 	(*-dy\ *)
+ 		VERSIONED_SYMS="-Wl,-M,\${RESULTING_SYMS}"
+ 		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}:7706: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7707: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
++		LIB_CREATE="$MK_SHARED_LIB"
+ 		;;
+ 	(*)
+-		{ echo "$as_me:7710: WARNING: this system does not support versioned-symbols" >&5
++		{ echo "$as_me:7712: WARNING: this system does not support versioned-symbols" >&5
+ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
+ 		;;
+ 	esac
+@@ -7719,7 +7721,7 @@
+ 	# symbols.
+ 	if test "x$VERSIONED_SYMS" != "x"
+ 	then
+-		echo "$as_me:7722: checking if wildcards can be used to selectively omit symbols" >&5
++		echo "$as_me:7724: 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
+ 
+@@ -7756,7 +7758,7 @@
+ } submodule_1.0;
+ EOF
+ 		cat >conftest.$ac_ext <&5
++		echo "$as_me:7792: result: $WILDCARD_SYMS" >&5
+ echo "${ECHO_T}$WILDCARD_SYMS" >&6
+ 		rm -f conftest.*
+ 	fi
+@@ -7802,7 +7804,7 @@
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+ 
+-echo "$as_me:7805: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:7807: 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.
+@@ -7812,27 +7814,27 @@
+ else
+   with_gpm=maybe
+ fi;
+-echo "$as_me:7815: result: $with_gpm" >&5
++echo "$as_me:7817: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7819: checking for gpm.h" >&5
++	echo "$as_me:7821: 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 7825 "configure"
++#line 7827 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:7829: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7831: \"$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:7835: \$? = $ac_status" >&5
++  echo "$as_me:7837: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7851,7 +7853,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7854: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:7856: 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
+ 
+@@ -7862,7 +7864,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}:7865: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:7867: testing assuming we really have GPM library ..." 1>&5
+ 
+ cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+@@ -7870,7 +7872,7 @@
+ 
+ 			with_gpm=yes
+ 		else
+-			echo "$as_me:7873: checking for Gpm_Open in -lgpm" >&5
++			echo "$as_me:7875: 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
+@@ -7878,7 +7880,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7881 "configure"
++#line 7883 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7897,16 +7899,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7900: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7902: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7903: \$? = $ac_status" >&5
++  echo "$as_me:7905: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7906: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7908: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7909: \$? = $ac_status" >&5
++  echo "$as_me:7911: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -7917,18 +7919,18 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7920: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:7922: 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:7927: WARNING: Cannot link with GPM library" >&5
++					{ echo "$as_me:7929: WARNING: Cannot link with GPM library" >&5
+ echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
+ 					with_gpm=no
+ 				else
+-					{ { echo "$as_me:7931: error: Cannot link with GPM library" >&5
++					{ { echo "$as_me:7933: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+    { (exit 1); exit 1; }; }
+ 				fi
+@@ -7939,7 +7941,7 @@
+ 
+ else
+ 
+-		test "$with_gpm" != maybe && { echo "$as_me:7942: WARNING: Cannot find GPM header" >&5
++		test "$with_gpm" != maybe && { echo "$as_me:7944: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ 		with_gpm=no
+ 
+@@ -7948,7 +7950,7 @@
+ fi
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7951: checking if you want to load GPM dynamically" >&5
++	echo "$as_me:7953: 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.
+@@ -7958,18 +7960,18 @@
+ else
+   with_dlsym=yes
+ fi;
+-	echo "$as_me:7961: result: $with_dlsym" >&5
++	echo "$as_me:7963: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ 	if test "x$with_dlsym" = xyes ; then
+ 
+ cf_have_dlsym=no
+-echo "$as_me:7966: checking for dlsym" >&5
++echo "$as_me:7968: 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 7972 "configure"
++#line 7974 "configure"
+ #include "confdefs.h"
+ #define dlsym autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -8000,16 +8002,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8003: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8005: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8006: \$? = $ac_status" >&5
++  echo "$as_me:8008: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8009: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8011: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8012: \$? = $ac_status" >&5
++  echo "$as_me:8014: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_dlsym=yes
+ else
+@@ -8019,14 +8021,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8022: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:8024: 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:8029: checking for dlsym in -ldl" >&5
++echo "$as_me:8031: 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
+@@ -8034,7 +8036,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8037 "configure"
++#line 8039 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8053,16 +8055,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8056: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8058: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8059: \$? = $ac_status" >&5
++  echo "$as_me:8061: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8062: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8064: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8065: \$? = $ac_status" >&5
++  echo "$as_me:8067: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dl_dlsym=yes
+ else
+@@ -8073,7 +8075,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8076: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:8078: 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
+ 
+@@ -8102,10 +8104,10 @@
+ LIBS="$cf_add_libs"
+  }
+ 
+-	echo "$as_me:8105: checking whether able to link to dl*() functions" >&5
++	echo "$as_me:8107: 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 8108 "configure"
++#line 8110 "configure"
+ #include "confdefs.h"
+ 
+ 	#include 
+@@ -8126,16 +8128,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8129: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8131: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8132: \$? = $ac_status" >&5
++  echo "$as_me:8134: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8135: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8137: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8138: \$? = $ac_status" >&5
++  echo "$as_me:8140: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ cat >>confdefs.h <<\EOF
+@@ -8146,15 +8148,15 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-		{ { echo "$as_me:8149: error: Cannot link test program for libdl" >&5
++		{ { echo "$as_me:8151: 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:8154: result: ok" >&5
++	echo "$as_me:8156: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+-	{ { echo "$as_me:8157: error: Cannot find dlsym function" >&5
++	{ { echo "$as_me:8159: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8162,12 +8164,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}:8165: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:8167: testing assuming soname for gpm is $with_gpm ..." 1>&5
+ 
+ 			cf_cv_gpm_soname="$with_gpm"
+ 		else
+ 
+-echo "$as_me:8170: checking for soname of gpm library" >&5
++echo "$as_me:8172: 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
+@@ -8201,15 +8203,15 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-	if { (eval echo "$as_me:8204: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:8206: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8207: \$? = $ac_status" >&5
++  echo "$as_me:8209: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:8209: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:8211: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8212: \$? = $ac_status" >&5
++  echo "$as_me:8214: \$? = $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
+@@ -8220,7 +8222,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:8223: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:8225: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+ 
+ 		fi
+@@ -8288,7 +8290,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+ 
+-echo "$as_me:8291: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:8293: 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
+@@ -8296,7 +8298,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8299 "configure"
++#line 8301 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8315,16 +8317,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8318: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8320: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8321: \$? = $ac_status" >&5
++  echo "$as_me:8323: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8324: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8326: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8327: \$? = $ac_status" >&5
++  echo "$as_me:8329: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -8335,11 +8337,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8338: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:8340: 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:8342: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:8344: 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
+@@ -8363,15 +8365,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:8366: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:8368: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8369: \$? = $ac_status" >&5
++  echo "$as_me:8371: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:8371: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:8373: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8374: \$? = $ac_status" >&5
++  echo "$as_me:8376: \$? = $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
+@@ -8383,11 +8385,11 @@
+ fi
+ 
+ fi
+-echo "$as_me:8386: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:8388: 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:8390: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++	{ echo "$as_me:8392: 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
+ 
+@@ -8395,7 +8397,7 @@
+ 
+ fi
+ 
+-echo "$as_me:8398: checking if you want to use PCRE2 for regular-expressions" >&5
++echo "$as_me:8400: 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.
+@@ -8404,7 +8406,7 @@
+ 
+ fi;
+ test -z "$with_pcre2" && with_pcre2=no
+-echo "$as_me:8407: result: $with_pcre2" >&5
++echo "$as_me:8409: result: $with_pcre2" >&5
+ echo "${ECHO_T}$with_pcre2" >&6
+ 
+ if test "x$with_pcre2" != xno ; then
+@@ -8415,17 +8417,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}:8418: testing found package $cf_with_pcre2 ..." 1>&5
++echo "${as_me:-configure}:8420: 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}:8424: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:8426: 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}:8428: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:8430: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ for cf_required in $cf_with_pcre2
+ do
+@@ -8563,7 +8565,7 @@
+ fi
+ 
+ 	done
+-	cf_with_pcre2_ok=yes || { { echo "$as_me:8566: error: Cannot find PCRE2 library" >&5
++	cf_with_pcre2_ok=yes || { { echo "$as_me:8568: error: Cannot find PCRE2 library" >&5
+ echo "$as_me: error: Cannot find PCRE2 library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -8576,7 +8578,7 @@
+ 	(*pcre2-posix*|*pcreposix*)
+ 		;;
+ 	(*)
+-		echo "$as_me:8579: checking for regcomp in -lpcre2-posix" >&5
++		echo "$as_me:8581: 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
+@@ -8584,7 +8586,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcre2-posix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8587 "configure"
++#line 8589 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8603,16 +8605,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8606: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8608: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8609: \$? = $ac_status" >&5
++  echo "$as_me:8611: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8612: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8614: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8615: \$? = $ac_status" >&5
++  echo "$as_me:8617: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcre2_posix_regcomp=yes
+ else
+@@ -8623,7 +8625,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8626: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
++echo "$as_me:8628: 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
+ 
+@@ -8644,7 +8646,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  echo "$as_me:8647: checking for regcomp in -lpcreposix" >&5
++  echo "$as_me:8649: 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
+@@ -8652,7 +8654,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcreposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8655 "configure"
++#line 8657 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8671,16 +8673,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8674: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8676: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8677: \$? = $ac_status" >&5
++  echo "$as_me:8679: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8680: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8682: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8683: \$? = $ac_status" >&5
++  echo "$as_me:8685: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcreposix_regcomp=yes
+ else
+@@ -8691,7 +8693,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8694: result: $ac_cv_lib_pcreposix_regcomp" >&5
++echo "$as_me:8696: 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
+ 
+@@ -8712,7 +8714,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  { { echo "$as_me:8715: error: Cannot find PCRE2 POSIX library" >&5
++  { { echo "$as_me:8717: error: Cannot find PCRE2 POSIX library" >&5
+ echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8727,23 +8729,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:8730: checking for $ac_header" >&5
++echo "$as_me:8732: 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 8736 "configure"
++#line 8738 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8740: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8742: \"$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:8746: \$? = $ac_status" >&5
++  echo "$as_me:8748: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8762,7 +8764,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8765: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8767: 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:8780: 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 8784 "configure"
++#line 8786 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -8812,16 +8814,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8815: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8817: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8818: \$? = $ac_status" >&5
++  echo "$as_me:8820: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8821: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8823: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8824: \$? = $ac_status" >&5
++  echo "$as_me:8826: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -8831,7 +8833,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8834: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:8836: 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:8848: checking if you want to use sysmouse" >&5
++echo "$as_me:8850: 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.
+@@ -8857,7 +8859,7 @@
+ fi;
+ 	if test "$cf_with_sysmouse" != no ; then
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8860 "configure"
++#line 8862 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8880,16 +8882,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8883: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8885: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8886: \$? = $ac_status" >&5
++  echo "$as_me:8888: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8889: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8891: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8892: \$? = $ac_status" >&5
++  echo "$as_me:8894: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_with_sysmouse=yes
+ else
+@@ -8899,7 +8901,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	fi
+-echo "$as_me:8902: result: $cf_with_sysmouse" >&5
++echo "$as_me:8904: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -8909,7 +8911,7 @@
+ fi
+ 
+ # pretend that ncurses==ncursesw==ncursest
+-echo "$as_me:8912: checking if you want to disable library suffixes" >&5
++echo "$as_me:8914: 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.
+@@ -8926,13 +8928,13 @@
+ 	disable_lib_suffixes=no
+ 
+ fi;
+-echo "$as_me:8929: result: $disable_lib_suffixes" >&5
++echo "$as_me:8931: 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:8935: checking if rpath-hack should be disabled" >&5
++echo "$as_me:8937: 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.
+@@ -8950,22 +8952,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:8953: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:8955: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:8958: checking for updated LDFLAGS" >&5
++echo "$as_me:8960: 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:8961: result: maybe" >&5
++	echo "$as_me:8963: 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:8968: checking for $ac_word" >&5
++echo "$as_me:8970: 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
+@@ -8980,7 +8982,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:8983: found $ac_dir/$ac_word" >&5
++echo "$as_me:8985: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8988,10 +8990,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:8991: result: $cf_ldd_prog" >&5
++  echo "$as_me:8993: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:8994: result: no" >&5
++  echo "$as_me:8996: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9005,7 +9007,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9008 "configure"
++#line 9010 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9017,16 +9019,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9020: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9022: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9023: \$? = $ac_status" >&5
++  echo "$as_me:9025: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9026: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9028: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9029: \$? = $ac_status" >&5
++  echo "$as_me:9031: \$? = $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`
+@@ -9054,7 +9056,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:9057: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:9059: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -9066,11 +9068,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9069: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9071: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9073: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9075: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -9107,7 +9109,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:9110: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9112: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -9120,11 +9122,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9123: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9125: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:9127: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9129: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -9161,7 +9163,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:9164: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9166: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -9174,14 +9176,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:9177: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9179: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9181: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9183: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:9184: result: no" >&5
++	echo "$as_me:9186: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9195,7 +9197,7 @@
+ EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
+ if test -n "$EXTRA_PKG_LDFLAGS"
+ then
+-	echo "$as_me:9198: checking if you want to disable extra LDFLAGS for package-scripts" >&5
++	echo "$as_me:9200: 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.
+@@ -9212,7 +9214,7 @@
+ 	disable_pkg_ldflags=no
+ 
+ fi;
+-	echo "$as_me:9215: result: $disable_pkg_ldflags" >&5
++	echo "$as_me:9217: result: $disable_pkg_ldflags" >&5
+ echo "${ECHO_T}$disable_pkg_ldflags" >&6
+ 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
+ fi
+@@ -9220,7 +9222,7 @@
+ ###############################################################################
+ 
+ ###	use option --with-extra-suffix to append suffix to headers and libraries
+-echo "$as_me:9223: checking for extra suffix to append to header/library paths" >&5
++echo "$as_me:9225: checking for extra suffix to append to header/library paths" >&5
+ echo $ECHO_N "checking for extra suffix to append to header/library paths... $ECHO_C" >&6
+ EXTRA_SUFFIX=
+ 
+@@ -9239,11 +9241,11 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:9242: result: ${EXTRA_SUFFIX:-(none)}" >&5
++echo "$as_me:9244: result: ${EXTRA_SUFFIX:-(none)}" >&5
+ echo "${ECHO_T}${EXTRA_SUFFIX:-(none)}" >&6
+ 
+ ###	use option --disable-overwrite to leave out the link to -lcurses
+-echo "$as_me:9246: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:9248: 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.
+@@ -9253,10 +9255,10 @@
+ else
+   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:9256: result: $with_overwrite" >&5
++echo "$as_me:9258: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+ 
+-echo "$as_me:9259: checking if external terminfo-database is used" >&5
++echo "$as_me:9261: 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.
+@@ -9266,7 +9268,7 @@
+ else
+   use_database=yes
+ fi;
+-echo "$as_me:9269: result: $use_database" >&5
++echo "$as_me:9271: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+ 
+ case "$host_os" in
+@@ -9282,7 +9284,7 @@
+ if test "$use_database" != no ; then
+ 	NCURSES_USE_DATABASE=1
+ 
+-	echo "$as_me:9285: checking which terminfo source-file will be installed" >&5
++	echo "$as_me:9287: 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.
+@@ -9290,10 +9292,10 @@
+   withval="$with_database"
+   TERMINFO_SRC=$withval
+ fi;
+-	echo "$as_me:9293: result: $TERMINFO_SRC" >&5
++	echo "$as_me:9295: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+ 
+-	echo "$as_me:9296: checking whether to use hashed database instead of directory/tree" >&5
++	echo "$as_me:9298: 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.
+@@ -9303,13 +9305,13 @@
+ else
+   with_hashed_db=no
+ fi;
+-	echo "$as_me:9306: result: $with_hashed_db" >&5
++	echo "$as_me:9308: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ 	with_hashed_db=no
+ fi
+ 
+-echo "$as_me:9312: checking for list of fallback terminal descriptions" >&5
++echo "$as_me:9314: checking for list of fallback terminal descriptions" >&5
+ echo $ECHO_N "checking for list of fallback terminal descriptions... $ECHO_C" >&6
+ 
+ # Check whether --with-fallbacks or --without-fallbacks was given.
+@@ -9319,7 +9321,7 @@
+ else
+   with_fallback=
+ fi;
+-echo "$as_me:9322: result: ${with_fallback:-(none)}" >&5
++echo "$as_me:9324: result: ${with_fallback:-(none)}" >&5
+ echo "${ECHO_T}${with_fallback:-(none)}" >&6
+ 
+ case ".$with_fallback" in
+@@ -9327,7 +9329,7 @@
+ 	FALLBACK_LIST=
+ 	;;
+ (.yes)
+-	{ echo "$as_me:9330: WARNING: expected a list of terminal descriptions" >&5
++	{ echo "$as_me:9332: WARNING: expected a list of terminal descriptions" >&5
+ echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
+ 	;;
+ (*)
+@@ -9343,7 +9345,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:9346: checking for $ac_word" >&5
++echo "$as_me:9348: 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
+@@ -9358,7 +9360,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:9361: found $ac_dir/$ac_word" >&5
++echo "$as_me:9363: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9366,10 +9368,10 @@
+ fi
+ TIC=$ac_cv_prog_TIC
+ if test -n "$TIC"; then
+-  echo "$as_me:9369: result: $TIC" >&5
++  echo "$as_me:9371: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:9372: result: no" >&5
++  echo "$as_me:9374: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9378,7 +9380,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:9381: checking for $ac_word" >&5
++echo "$as_me:9383: 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
+@@ -9393,7 +9395,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:9396: found $ac_dir/$ac_word" >&5
++echo "$as_me:9398: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9401,10 +9403,10 @@
+ fi
+ ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
+ if test -n "$ac_ct_TIC"; then
+-  echo "$as_me:9404: result: $ac_ct_TIC" >&5
++  echo "$as_me:9406: result: $ac_ct_TIC" >&5
+ echo "${ECHO_T}$ac_ct_TIC" >&6
+ else
+-  echo "$as_me:9407: result: no" >&5
++  echo "$as_me:9409: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9416,7 +9418,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:9419: checking for $ac_word" >&5
++echo "$as_me:9421: 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
+@@ -9431,7 +9433,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:9434: found $ac_dir/$ac_word" >&5
++echo "$as_me:9436: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9439,10 +9441,10 @@
+ fi
+ INFOCMP=$ac_cv_prog_INFOCMP
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:9442: result: $INFOCMP" >&5
++  echo "$as_me:9444: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:9445: result: no" >&5
++  echo "$as_me:9447: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9451,7 +9453,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:9454: checking for $ac_word" >&5
++echo "$as_me:9456: 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
+@@ -9466,7 +9468,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:9469: found $ac_dir/$ac_word" >&5
++echo "$as_me:9471: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9474,10 +9476,10 @@
+ fi
+ ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
+ if test -n "$ac_ct_INFOCMP"; then
+-  echo "$as_me:9477: result: $ac_ct_INFOCMP" >&5
++  echo "$as_me:9479: result: $ac_ct_INFOCMP" >&5
+ echo "${ECHO_T}$ac_ct_INFOCMP" >&6
+ else
+-  echo "$as_me:9480: result: no" >&5
++  echo "$as_me:9482: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9492,10 +9494,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:9495: checking for tic program for fallbacks" >&5
++  echo "$as_me:9497: checking for tic program for fallbacks" >&5
+ echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
+ 		TIC=$withval
+-		echo "$as_me:9498: result: $TIC" >&5
++		echo "$as_me:9500: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -9521,7 +9523,7 @@
+ 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9524: error: expected a pathname, not \"$TIC\"" >&5
++	{ { echo "$as_me:9526: error: expected a pathname, not \"$TIC\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9534,7 +9536,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:9537: checking for $ac_word" >&5
++echo "$as_me:9539: 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
+@@ -9551,7 +9553,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:9554: found $ac_dir/$ac_word" >&5
++   echo "$as_me:9556: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -9562,10 +9564,10 @@
+ TIC=$ac_cv_path_TIC
+ 
+ if test -n "$TIC"; then
+-  echo "$as_me:9565: result: $TIC" >&5
++  echo "$as_me:9567: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:9568: result: no" >&5
++  echo "$as_me:9570: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9622,7 +9624,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:9625: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9627: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:9642: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -9646,10 +9648,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:9649: checking for infocmp program for fallbacks" >&5
++  echo "$as_me:9651: checking for infocmp program for fallbacks" >&5
+ echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
+ 		INFOCMP=$withval
+-		echo "$as_me:9652: result: $INFOCMP" >&5
++		echo "$as_me:9654: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -9675,7 +9677,7 @@
+ 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9678: error: expected a pathname, not \"$INFOCMP\"" >&5
++	{ { echo "$as_me:9680: error: expected a pathname, not \"$INFOCMP\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9688,7 +9690,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:9691: checking for $ac_word" >&5
++echo "$as_me:9693: 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
+@@ -9705,7 +9707,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:9708: found $ac_dir/$ac_word" >&5
++   echo "$as_me:9710: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -9716,10 +9718,10 @@
+ INFOCMP=$ac_cv_path_INFOCMP
+ 
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:9719: result: $INFOCMP" >&5
++  echo "$as_me:9721: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:9722: result: no" >&5
++  echo "$as_me:9724: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9776,7 +9778,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:9779: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9781: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:9796: WARNING: no infocmp program found for fallbacks" >&5
+ echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -9801,7 +9803,7 @@
+ 	test -z "$INFOCMP" && FALLBACK_LIST=
+ 	if test -z "$FALLBACK_LIST"
+ 	then
+-		{ echo "$as_me:9804: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
++		{ echo "$as_me:9806: 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
+@@ -9809,7 +9811,7 @@
+ USE_FALLBACKS=
+ test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
+ 
+-echo "$as_me:9812: checking if you want modern xterm or antique" >&5
++echo "$as_me:9814: 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.
+@@ -9823,7 +9825,7 @@
+ (no) with_xterm_new=xterm-old;;
+ (*)	 with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:9826: result: $with_xterm_new" >&5
++echo "$as_me:9828: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+ 
+@@ -9836,7 +9838,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9839: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:9841: 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.
+@@ -9860,13 +9862,13 @@
+ 	with_xterm_kbs=$withval
+ 	;;
+ esac
+-echo "$as_me:9863: result: $with_xterm_kbs" >&5
++echo "$as_me:9865: result: $with_xterm_kbs" >&5
+ echo "${ECHO_T}$with_xterm_kbs" >&6
+ XTERM_KBS=$with_xterm_kbs
+ 
+ if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
+ then
+-	{ echo "$as_me:9869: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
++	{ echo "$as_me:9871: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
+ echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;}
+ fi
+ 
+@@ -9876,7 +9878,7 @@
+ 	MAKE_TERMINFO="#"
+ else
+ 
+-echo "$as_me:9879: checking for list of terminfo directories" >&5
++echo "$as_me:9881: 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.
+@@ -9914,7 +9916,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9917: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:9919: 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; }; }
+ 	;;
+@@ -9937,7 +9939,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9940: result: $TERMINFO_DIRS" >&5
++echo "$as_me:9942: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <&5
++	{ echo "$as_me:9951: 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:9955: checking for default terminfo directory" >&5
++echo "$as_me:9957: 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.
+@@ -9986,7 +9988,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9989: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:9991: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9995,7 +9997,7 @@
+ fi
+ eval TERMINFO="$withval"
+ 
+-echo "$as_me:9998: result: $TERMINFO" >&5
++echo "$as_me:10000: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:10011: 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.
+@@ -10018,7 +10020,7 @@
+   with_big_core=no
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10021 "configure"
++#line 10023 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10032,15 +10034,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10035: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10037: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10038: \$? = $ac_status" >&5
++  echo "$as_me:10040: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10040: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10042: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10043: \$? = $ac_status" >&5
++  echo "$as_me:10045: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_big_core=yes
+ else
+@@ -10052,7 +10054,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi;
+-echo "$as_me:10055: result: $with_big_core" >&5
++echo "$as_me:10057: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10062,7 +10064,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:10065: checking if big-strings option selected" >&5
++echo "$as_me:10067: 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.
+@@ -10086,14 +10088,14 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:10089: result: $with_big_strings" >&5
++echo "$as_me:10091: 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:10096: checking if you want termcap-fallback support" >&5
++echo "$as_me:10098: 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.
+@@ -10103,14 +10105,14 @@
+ else
+   with_termcap=no
+ fi;
+-echo "$as_me:10106: result: $with_termcap" >&5
++echo "$as_me:10108: 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:10113: error: You have disabled the database w/o specifying fallbacks" >&5
++			{ { echo "$as_me:10115: 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
+@@ -10123,13 +10125,13 @@
+ else
+ 
+ 	if test "$with_ticlib" != no ; then
+-		{ { echo "$as_me:10126: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++		{ { echo "$as_me:10128: 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:10132: checking for list of termcap files" >&5
++	echo "$as_me:10134: 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.
+@@ -10167,7 +10169,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:10170: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:10172: 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; }; }
+ 	;;
+@@ -10190,7 +10192,7 @@
+ 	;;
+ esac
+ 
+-	echo "$as_me:10193: result: $TERMPATH" >&5
++	echo "$as_me:10195: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ 	test -n "$TERMPATH" &&
+ cat >>confdefs.h <&5
++	echo "$as_me:10203: 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.
+@@ -10208,14 +10210,14 @@
+ else
+   with_getcap=no
+ fi;
+-	echo "$as_me:10211: result: $with_getcap" >&5
++	echo "$as_me:10213: 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:10218: checking if translated termcaps will be cached in ~/.terminfo" >&5
++	echo "$as_me:10220: 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.
+@@ -10225,7 +10227,7 @@
+ else
+   with_getcap_cache=no
+ fi;
+-	echo "$as_me:10228: result: $with_getcap_cache" >&5
++	echo "$as_me:10230: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ 	test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10235,7 +10237,7 @@
+ fi
+ 
+ ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:10238: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:10240: 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.
+@@ -10245,14 +10247,14 @@
+ else
+   with_home_terminfo=yes
+ fi;
+-echo "$as_me:10248: result: $with_home_terminfo" >&5
++echo "$as_me:10250: 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:10255: checking if you want to permit root to use ncurses environment variables" >&5
++echo "$as_me:10257: 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.
+@@ -10262,14 +10264,14 @@
+ else
+   with_root_environ=yes
+ fi;
+-echo "$as_me:10265: result: $with_root_environ" >&5
++echo "$as_me:10267: 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:10272: checking if you want to permit setuid programs to access all files" >&5
++echo "$as_me:10274: 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-access or --disable-root-access was given.
+@@ -10279,14 +10281,14 @@
+ else
+   with_root_access=yes
+ fi;
+-echo "$as_me:10282: result: $with_root_access" >&5
++echo "$as_me:10284: result: $with_root_access" >&5
+ echo "${ECHO_T}$with_root_access" >&6
+ test "x$with_root_access" = xyes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_ROOT_ACCESS 1
+ EOF
+ 
+-echo "$as_me:10289: checking if you want to permit setuid use of ncurses environment variables" >&5
++echo "$as_me:10291: checking if you want to permit setuid use of ncurses environment variables" >&5
+ echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
+ 
+ # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
+@@ -10296,7 +10298,7 @@
+ else
+   with_setuid_environ=$with_root_environ
+ fi;
+-echo "$as_me:10299: result: $with_setuid_environ" >&5
++echo "$as_me:10301: result: $with_setuid_environ" >&5
+ echo "${ECHO_T}$with_setuid_environ" >&6
+ test "x$with_setuid_environ" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10311,23 +10313,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:10314: checking for $ac_header" >&5
++echo "$as_me:10316: 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 10320 "configure"
++#line 10322 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10324: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:10326: \"$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:10330: \$? = $ac_status" >&5
++  echo "$as_me:10332: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10346,7 +10348,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:10349: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:10351: 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:10366: 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 10370 "configure"
++#line 10372 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10398,16 +10400,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10401: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10403: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10404: \$? = $ac_status" >&5
++  echo "$as_me:10406: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10407: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10409: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10410: \$? = $ac_status" >&5
++  echo "$as_me:10412: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -10417,7 +10419,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10420: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10422: 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:10439: 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 10443 "configure"
++#line 10445 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10471,16 +10473,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10474: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10476: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10477: \$? = $ac_status" >&5
++  echo "$as_me:10479: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10480: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10482: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10483: \$? = $ac_status" >&5
++  echo "$as_me:10485: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -10490,7 +10492,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10493: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10495: 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:10506: 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
+@@ -10514,7 +10516,7 @@
+ 			eval 'ac_cv_func_'$cf_func'=error'
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10517 "configure"
++#line 10519 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -10548,15 +10550,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10551: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10553: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10554: \$? = $ac_status" >&5
++  echo "$as_me:10556: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10556: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10558: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10559: \$? = $ac_status" >&5
++  echo "$as_me:10561: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -10574,7 +10576,7 @@
+ 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+ 
+ fi
+-echo "$as_me:10577: result: $cf_cv_link_funcs" >&5
++echo "$as_me:10579: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ 	test "$ac_cv_func_link"    = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -10594,7 +10596,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:10597: checking if tic should use symbolic links" >&5
++	echo "$as_me:10599: 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.
+@@ -10604,21 +10606,21 @@
+ else
+   with_symlinks=no
+ fi;
+-	echo "$as_me:10607: result: $with_symlinks" >&5
++	echo "$as_me:10609: 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:10614: checking if tic should use hard links" >&5
++	echo "$as_me:10616: 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:10621: result: $with_links" >&5
++	echo "$as_me:10623: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+ 
+@@ -10634,7 +10636,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:10637: checking if you want broken-linker support code" >&5
++echo "$as_me:10639: 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.
+@@ -10644,7 +10646,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:10647: result: $with_broken_linker" >&5
++echo "$as_me:10649: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : "${BROKEN_LINKER:=0}"
+@@ -10658,7 +10660,7 @@
+ fi
+ 
+ ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:10661: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:10663: 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.
+@@ -10668,7 +10670,7 @@
+ else
+   with_bsdpad=no
+ fi;
+-echo "$as_me:10671: result: $with_bsdpad" >&5
++echo "$as_me:10673: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10687,14 +10689,14 @@
+ # Check to define _XOPEN_SOURCE "automatically"
+ CPPFLAGS_before_XOPEN="$CPPFLAGS"
+ 
+-echo "$as_me:10690: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:10692: 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 10697 "configure"
++#line 10699 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10713,16 +10715,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10716: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10718: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10719: \$? = $ac_status" >&5
++  echo "$as_me:10721: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10722: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10724: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10725: \$? = $ac_status" >&5
++  echo "$as_me:10727: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -10733,7 +10735,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10736: result: $cf_cv_posix_visible" >&5
++echo "$as_me:10738: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -10775,14 +10777,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:10778: checking if this is the GNU C library" >&5
++echo "$as_me:10780: 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 10785 "configure"
++#line 10787 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10801,16 +10803,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10804: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10806: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10807: \$? = $ac_status" >&5
++  echo "$as_me:10809: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10810: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10812: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10813: \$? = $ac_status" >&5
++  echo "$as_me:10815: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -10821,7 +10823,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10824: result: $cf_cv_gnu_library" >&5
++echo "$as_me:10826: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -10829,7 +10831,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:10832: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:10834: 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
+@@ -10841,7 +10843,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10844 "configure"
++#line 10846 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10860,16 +10862,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10863: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10865: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10866: \$? = $ac_status" >&5
++  echo "$as_me:10868: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10869: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10871: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10872: \$? = $ac_status" >&5
++  echo "$as_me:10874: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -10881,12 +10883,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:10884: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:10886: 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:10889: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:10891: 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
+@@ -10991,7 +10993,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10994 "configure"
++#line 10996 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -11011,16 +11013,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11014: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11016: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11017: \$? = $ac_status" >&5
++  echo "$as_me:11019: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11022: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11023: \$? = $ac_status" >&5
++  echo "$as_me:11025: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -11031,7 +11033,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11034: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:11036: 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
+@@ -11040,14 +11042,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:11043: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:11045: 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 11050 "configure"
++#line 11052 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11062,16 +11064,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11065: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11067: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11068: \$? = $ac_status" >&5
++  echo "$as_me:11070: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11071: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11073: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11074: \$? = $ac_status" >&5
++  echo "$as_me:11076: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -11178,7 +11180,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11181 "configure"
++#line 11183 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11193,16 +11195,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11196: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11198: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11199: \$? = $ac_status" >&5
++  echo "$as_me:11201: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11202: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11204: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11205: \$? = $ac_status" >&5
++  echo "$as_me:11207: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -11217,12 +11219,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11220: result: $cf_cv_gnu_source" >&5
++echo "$as_me:11222: 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:11225: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:11227: 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
+@@ -11232,7 +11234,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11235 "configure"
++#line 11237 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11247,16 +11249,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11250: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11252: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11253: \$? = $ac_status" >&5
++  echo "$as_me:11255: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11256: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11258: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11259: \$? = $ac_status" >&5
++  echo "$as_me:11261: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -11267,7 +11269,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11270: result: $cf_cv_default_source" >&5
++echo "$as_me:11272: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -11307,16 +11309,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:11310: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11312: 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}:11316: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11318: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11319 "configure"
++#line 11321 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11331,16 +11333,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11334: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11336: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11337: \$? = $ac_status" >&5
++  echo "$as_me:11339: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11340: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11342: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11343: \$? = $ac_status" >&5
++  echo "$as_me:11345: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11361,7 +11363,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11364 "configure"
++#line 11366 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11376,16 +11378,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11379: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11381: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11382: \$? = $ac_status" >&5
++  echo "$as_me:11384: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11385: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11387: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11388: \$? = $ac_status" >&5
++  echo "$as_me:11390: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11396,7 +11398,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11399: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11401: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11404,10 +11406,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11407: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11409: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11410 "configure"
++#line 11412 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11422,16 +11424,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11425: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11427: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11428: \$? = $ac_status" >&5
++  echo "$as_me:11430: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11431: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11433: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11434: \$? = $ac_status" >&5
++  echo "$as_me:11436: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11447,7 +11449,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11450: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11452: 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
+@@ -11564,7 +11566,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:11567: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:11569: 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
+@@ -11596,14 +11598,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:11599: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:11601: 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 11606 "configure"
++#line 11608 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11621,16 +11623,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11624: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11626: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11627: \$? = $ac_status" >&5
++  echo "$as_me:11629: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11630: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11632: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11633: \$? = $ac_status" >&5
++  echo "$as_me:11635: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11642,7 +11644,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11645 "configure"
++#line 11647 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11660,16 +11662,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11663: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11665: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11666: \$? = $ac_status" >&5
++  echo "$as_me:11668: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11669: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11671: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11672: \$? = $ac_status" >&5
++  echo "$as_me:11674: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11684,7 +11686,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11687: result: $cf_cv_xopen_source" >&5
++echo "$as_me:11689: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -11844,16 +11846,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:11847: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11849: 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}:11853: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11855: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11856 "configure"
++#line 11858 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11868,16 +11870,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11871: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11873: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11874: \$? = $ac_status" >&5
++  echo "$as_me:11876: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11877: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11879: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11880: \$? = $ac_status" >&5
++  echo "$as_me:11882: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11898,7 +11900,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11901 "configure"
++#line 11903 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11913,16 +11915,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11916: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11918: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11919: \$? = $ac_status" >&5
++  echo "$as_me:11921: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11922: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11924: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11925: \$? = $ac_status" >&5
++  echo "$as_me:11927: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11933,7 +11935,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11936: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11938: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11941,10 +11943,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11944: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11946: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11947 "configure"
++#line 11949 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11959,16 +11961,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11962: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11964: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11965: \$? = $ac_status" >&5
++  echo "$as_me:11967: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11968: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11970: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11971: \$? = $ac_status" >&5
++  echo "$as_me:11973: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11984,7 +11986,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11987: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11989: 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
+@@ -12097,10 +12099,10 @@
+ 	if test "$cf_cv_xopen_source" = no ; then
+ 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+ 
+-echo "${as_me:-configure}:12100: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:12102: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12103 "configure"
++#line 12105 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12118,23 +12120,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12121: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12123: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12124: \$? = $ac_status" >&5
++  echo "$as_me:12126: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12127: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12129: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12130: \$? = $ac_status" >&5
++  echo "$as_me:12132: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-			{ echo "$as_me:12137: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++			{ echo "$as_me:12139: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ 			CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -12157,7 +12159,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}:12160: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12162: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -12169,7 +12171,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}:12172: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:12174: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -12257,7 +12259,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:12260: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:12262: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -12267,7 +12269,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:12270: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:12272: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -12277,7 +12279,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}:12280: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:12282: 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"
+@@ -12289,10 +12291,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:12292: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:12294: 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 12295 "configure"
++#line 12297 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12307,16 +12309,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12310: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12312: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12313: \$? = $ac_status" >&5
++  echo "$as_me:12315: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12316: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12318: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12319: \$? = $ac_status" >&5
++  echo "$as_me:12321: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -12325,12 +12327,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:12328: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:12330: 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 12333 "configure"
++#line 12335 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12345,16 +12347,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12348: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12350: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12351: \$? = $ac_status" >&5
++  echo "$as_me:12353: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12354: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12356: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12357: \$? = $ac_status" >&5
++  echo "$as_me:12359: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -12365,19 +12367,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:12368: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:12370: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:12373: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:12375: 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 12380 "configure"
++#line 12382 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12395,16 +12397,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12398: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12400: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12401: \$? = $ac_status" >&5
++  echo "$as_me:12403: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12404: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12406: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12407: \$? = $ac_status" >&5
++  echo "$as_me:12409: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12416,7 +12418,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12419 "configure"
++#line 12421 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12434,16 +12436,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12437: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12439: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12440: \$? = $ac_status" >&5
++  echo "$as_me:12442: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12443: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12445: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12446: \$? = $ac_status" >&5
++  echo "$as_me:12448: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12458,7 +12460,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12461: result: $cf_cv_xopen_source" >&5
++echo "$as_me:12463: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -12609,14 +12611,14 @@
+ 
+ # Work around breakage on OS X
+ 
+-echo "$as_me:12612: checking if SIGWINCH is defined" >&5
++echo "$as_me:12614: 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 12619 "configure"
++#line 12621 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12631,23 +12633,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12634: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12636: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12637: \$? = $ac_status" >&5
++  echo "$as_me:12639: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12640: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12642: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12643: \$? = $ac_status" >&5
++  echo "$as_me:12645: \$? = $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 12650 "configure"
++#line 12652 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -12665,16 +12667,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12668: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12670: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12671: \$? = $ac_status" >&5
++  echo "$as_me:12673: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12674: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12676: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12677: \$? = $ac_status" >&5
++  echo "$as_me:12679: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -12688,11 +12690,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12691: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:12693: 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:12695: checking for actual SIGWINCH definition" >&5
++echo "$as_me:12697: 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
+@@ -12703,7 +12705,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12706 "configure"
++#line 12708 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -12725,16 +12727,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12728: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12730: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12731: \$? = $ac_status" >&5
++  echo "$as_me:12733: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12734: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12736: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12737: \$? = $ac_status" >&5
++  echo "$as_me:12739: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -12748,7 +12750,7 @@
+ done
+ 
+ fi
+-echo "$as_me:12751: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:12753: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -12758,13 +12760,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:12761: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:12763: 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 12767 "configure"
++#line 12769 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12778,16 +12780,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12781: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12783: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12784: \$? = $ac_status" >&5
++  echo "$as_me:12786: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12787: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12789: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12790: \$? = $ac_status" >&5
++  echo "$as_me:12792: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -12798,7 +12800,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12801: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:12803: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test "$am_cv_langinfo_codeset" = yes; then
+ 
+@@ -12812,7 +12814,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+ 
+-echo "$as_me:12815: checking if you want wide-character code" >&5
++echo "$as_me:12817: 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.
+@@ -12822,7 +12824,7 @@
+ else
+   with_widec=$cf_dft_widec
+ fi;
+-echo "$as_me:12825: result: $with_widec" >&5
++echo "$as_me:12827: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ 
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -12844,7 +12846,7 @@
+ 	(*_XOPEN_SOURCE=*)
+ 		;;
+ 	(*)
+-		{ echo "$as_me:12847: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
++		{ echo "$as_me:12849: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
+ 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
+ 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
+@@ -12857,23 +12859,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:12860: checking for $ac_header" >&5
++echo "$as_me:12862: 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 12866 "configure"
++#line 12868 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:12870: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12872: \"$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:12876: \$? = $ac_status" >&5
++  echo "$as_me:12878: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12892,7 +12894,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:12895: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:12897: 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:12907: 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 12912 "configure"
++#line 12914 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12931,16 +12933,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12934: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12936: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12937: \$? = $ac_status" >&5
++  echo "$as_me:12939: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12940: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12942: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12943: \$? = $ac_status" >&5
++  echo "$as_me:12945: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_h_okay=yes
+ else
+@@ -12950,16 +12952,16 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12953: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:12955: 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:12959: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:12961: 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 12962 "configure"
++#line 12964 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12975,16 +12977,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12978: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12980: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12981: \$? = $ac_status" >&5
++  echo "$as_me:12983: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12984: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12986: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12987: \$? = $ac_status" >&5
++  echo "$as_me:12989: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=no
+ else
+@@ -12993,16 +12995,16 @@
+ cf_result=yes
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:12996: result: $cf_result" >&5
++echo "$as_me:12998: 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:13002: checking checking for compatible value versus " >&5
++	echo "$as_me:13004: 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 13005 "configure"
++#line 13007 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -13018,16 +13020,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13021: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13023: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13024: \$? = $ac_status" >&5
++  echo "$as_me:13026: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13027: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13029: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13030: \$? = $ac_status" >&5
++  echo "$as_me:13032: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -13036,7 +13038,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:13039: result: $cf_result" >&5
++	echo "$as_me:13041: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = no ; then
+ 		# perhaps we can override it - try...
+@@ -13046,7 +13048,7 @@
+ 
+ fi
+ 
+-echo "$as_me:13049: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:13051: 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
+@@ -13117,7 +13119,7 @@
+   cf_cv_wcwidth_graphics=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13120 "configure"
++#line 13122 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13162,15 +13164,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:13165: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13167: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13168: \$? = $ac_status" >&5
++  echo "$as_me:13170: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:13170: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13172: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13173: \$? = $ac_status" >&5
++  echo "$as_me:13175: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wcwidth_graphics=yes
+ else
+@@ -13183,7 +13185,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:13186: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:13188: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+ 
+ 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -13194,13 +13196,13 @@
+ for ac_func in putwc btowc wctob wmemchr 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:13197: checking for $ac_func" >&5
++echo "$as_me:13199: 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 13203 "configure"
++#line 13205 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13231,16 +13233,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13234: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13236: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13237: \$? = $ac_status" >&5
++  echo "$as_me:13239: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13240: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13242: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13243: \$? = $ac_status" >&5
++  echo "$as_me:13245: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -13250,7 +13252,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13253: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:13255: 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:13270: 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 13274 "configure"
++#line 13276 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13278: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:13280: \"$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:13284: \$? = $ac_status" >&5
++  echo "$as_me:13286: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13300,7 +13302,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:13303: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:13305: 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:13315: 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
+@@ -13318,7 +13320,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13321 "configure"
++#line 13323 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13335,16 +13337,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13338: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13340: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13341: \$? = $ac_status" >&5
++  echo "$as_me:13343: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13344: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13346: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13347: \$? = $ac_status" >&5
++  echo "$as_me:13349: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -13356,12 +13358,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:13359: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13361: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13364 "configure"
++#line 13366 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13374,16 +13376,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13377: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13379: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13380: \$? = $ac_status" >&5
++  echo "$as_me:13382: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13383: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13385: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13386: \$? = $ac_status" >&5
++  echo "$as_me:13388: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -13397,7 +13399,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13400 "configure"
++#line 13402 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13410,16 +13412,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13413: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13415: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13416: \$? = $ac_status" >&5
++  echo "$as_me:13418: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13419: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13421: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13422: \$? = $ac_status" >&5
++  echo "$as_me:13424: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -13436,9 +13438,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:13439: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:13441: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:13441: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13443: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13529,7 +13531,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}:13532: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13534: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -13537,7 +13539,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13540 "configure"
++#line 13542 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13550,21 +13552,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13553: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13555: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13556: \$? = $ac_status" >&5
++  echo "$as_me:13558: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13559: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13561: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13562: \$? = $ac_status" >&5
++  echo "$as_me:13564: \$? = $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}:13567: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13569: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13582,7 +13584,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:13585: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13587: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -13657,13 +13659,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}:13660: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13662: 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 13666 "configure"
++#line 13668 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13676,21 +13678,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13679: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13681: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13682: \$? = $ac_status" >&5
++  echo "$as_me:13684: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13685: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13687: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13688: \$? = $ac_status" >&5
++  echo "$as_me:13690: \$? = $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}:13693: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13695: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -13732,7 +13734,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13735: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:13737: 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
+@@ -13770,7 +13772,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13773 "configure"
++#line 13775 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13782,16 +13784,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13785: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13787: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13788: \$? = $ac_status" >&5
++  echo "$as_me:13790: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13791: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13793: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13794: \$? = $ac_status" >&5
++  echo "$as_me:13796: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13808,7 +13810,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}:13811: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:13813: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -13844,7 +13846,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}:13847: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:13849: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -13876,14 +13878,14 @@
+ 	fi
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:13879: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:13881: 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 13886 "configure"
++#line 13888 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13901,23 +13903,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13904: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13906: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13907: \$? = $ac_status" >&5
++  echo "$as_me:13909: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13910: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13912: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13913: \$? = $ac_status" >&5
++  echo "$as_me:13915: \$? = $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 13920 "configure"
++#line 13922 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13936,16 +13938,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13939: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13941: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13942: \$? = $ac_status" >&5
++  echo "$as_me:13944: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13945: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13947: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13948: \$? = $ac_status" >&5
++  echo "$as_me:13950: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -13957,7 +13959,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13960: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:13962: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -13975,14 +13977,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:13978: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:13980: 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 13985 "configure"
++#line 13987 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14000,23 +14002,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14003: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14005: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14006: \$? = $ac_status" >&5
++  echo "$as_me:14008: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14009: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14011: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14012: \$? = $ac_status" >&5
++  echo "$as_me:14014: \$? = $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 14019 "configure"
++#line 14021 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14035,16 +14037,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14038: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14040: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14041: \$? = $ac_status" >&5
++  echo "$as_me:14043: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14044: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14046: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14047: \$? = $ac_status" >&5
++  echo "$as_me:14049: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -14056,7 +14058,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14059: result: $cf_cv_wchar_t" >&5
++echo "$as_me:14061: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -14079,14 +14081,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:14082: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:14084: 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 14089 "configure"
++#line 14091 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14104,23 +14106,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14107: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14109: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14110: \$? = $ac_status" >&5
++  echo "$as_me:14112: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14113: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14115: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14116: \$? = $ac_status" >&5
++  echo "$as_me:14118: \$? = $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 14123 "configure"
++#line 14125 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14139,16 +14141,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14142: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14144: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14145: \$? = $ac_status" >&5
++  echo "$as_me:14147: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14148: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14150: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14151: \$? = $ac_status" >&5
++  echo "$as_me:14153: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -14160,7 +14162,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14163: result: $cf_cv_wint_t" >&5
++echo "$as_me:14165: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -14192,7 +14194,7 @@
+ fi
+ 
+ ###   use option --disable-lp64 to allow long chtype
+-echo "$as_me:14195: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:14197: 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.
+@@ -14202,7 +14204,7 @@
+ else
+   with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:14205: result: $with_lp64" >&5
++echo "$as_me:14207: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+ 
+ if test "x$with_lp64" = xyes ; then
+@@ -14218,7 +14220,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:14221: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:14223: 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
+@@ -14230,7 +14232,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 14233 "configure"
++#line 14235 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14250,16 +14252,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14253: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14255: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14256: \$? = $ac_status" >&5
++  echo "$as_me:14258: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14259: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14261: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14262: \$? = $ac_status" >&5
++  echo "$as_me:14264: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14269,16 +14271,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14272: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14274: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14275: \$? = $ac_status" >&5
++  echo "$as_me:14277: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14278: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14280: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14281: \$? = $ac_status" >&5
++  echo "$as_me:14283: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -14292,13 +14294,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:14295: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:14297: 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:14301: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:14303: 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
+@@ -14306,7 +14308,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14309 "configure"
++#line 14311 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14326,16 +14328,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14329: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14331: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14332: \$? = $ac_status" >&5
++  echo "$as_me:14334: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14335: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14337: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14338: \$? = $ac_status" >&5
++  echo "$as_me:14340: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14344,7 +14346,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14347 "configure"
++#line 14349 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -14365,16 +14367,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14368: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14370: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14371: \$? = $ac_status" >&5
++  echo "$as_me:14373: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14374: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14376: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14377: \$? = $ac_status" >&5
++  echo "$as_me:14379: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -14385,7 +14387,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14388: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:14390: 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
+ 
+@@ -14395,7 +14397,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:14398: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:14400: 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
+@@ -14403,7 +14405,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14406 "configure"
++#line 14408 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14423,16 +14425,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14426: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14428: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14429: \$? = $ac_status" >&5
++  echo "$as_me:14431: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14432: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14434: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14435: \$? = $ac_status" >&5
++  echo "$as_me:14437: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14441,7 +14443,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14444 "configure"
++#line 14446 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -14462,16 +14464,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14465: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14467: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14468: \$? = $ac_status" >&5
++  echo "$as_me:14470: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14471: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14473: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14474: \$? = $ac_status" >&5
++  echo "$as_me:14476: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -14482,7 +14484,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14485: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:14487: 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
+ 
+@@ -14495,7 +14497,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:14498: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:14500: 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
+@@ -14503,7 +14505,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14506 "configure"
++#line 14508 "configure"
+ #include "confdefs.h"
+ #include 
+     #include 
+@@ -14518,16 +14520,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14521: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14523: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14524: \$? = $ac_status" >&5
++  echo "$as_me:14526: \$? = $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:14529: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14530: \$? = $ac_status" >&5
++  echo "$as_me:14532: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14536,7 +14538,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14539 "configure"
++#line 14541 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -14552,16 +14554,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14555: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14557: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14558: \$? = $ac_status" >&5
++  echo "$as_me:14560: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14561: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14563: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14564: \$? = $ac_status" >&5
++  echo "$as_me:14566: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -14572,7 +14574,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14575: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:14577: 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
+ 
+@@ -14586,13 +14588,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:14589: checking for fseeko" >&5
++echo "$as_me:14591: 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 14595 "configure"
++#line 14597 "configure"
+ #include "confdefs.h"
+ #include 
+                              #include 
+@@ -14606,16 +14608,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14609: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14611: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14612: \$? = $ac_status" >&5
++  echo "$as_me:14614: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14615: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14617: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14618: \$? = $ac_status" >&5
++  echo "$as_me:14620: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -14625,7 +14627,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14628: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:14630: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -14664,14 +14666,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:14667: checking whether to use struct dirent64" >&5
++	echo "$as_me:14669: 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 14674 "configure"
++#line 14676 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -14698,16 +14700,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14701: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14703: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14704: \$? = $ac_status" >&5
++  echo "$as_me:14706: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14707: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14709: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14710: \$? = $ac_status" >&5
++  echo "$as_me:14712: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -14718,7 +14720,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14721: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:14723: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -14728,7 +14730,7 @@
+ 	fi
+ 
+ ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:14731: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:14733: 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.
+@@ -14738,14 +14740,14 @@
+ else
+   with_tparm_varargs=yes
+ fi;
+-echo "$as_me:14741: result: $with_tparm_varargs" >&5
++echo "$as_me:14743: 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:14748: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:14750: 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.
+@@ -14755,14 +14757,14 @@
+ else
+   with_tic_depends=yes
+ fi;
+-echo "$as_me:14758: result: $with_tic_depends" >&5
++echo "$as_me:14760: 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:14765: checking if you want to enable wattr* macros" >&5
++echo "$as_me:14767: 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.
+@@ -14774,15 +14776,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ 	NCURSES_WATTR_MACROS=0
+-	echo "$as_me:14777: result: no" >&5
++	echo "$as_me:14779: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ else
+ 	NCURSES_WATTR_MACROS=1
+-	echo "$as_me:14781: result: yes" >&5
++	echo "$as_me:14783: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ fi
+ 
+-echo "$as_me:14785: checking for X11 rgb file" >&5
++echo "$as_me:14787: 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.
+@@ -14844,7 +14846,7 @@
+ 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:14847: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:14849: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14852,7 +14854,7 @@
+ 
+ fi
+ 
+-echo "$as_me:14855: result: $RGB_PATH" >&5
++echo "$as_me:14857: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:14872: 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.
+@@ -14877,17 +14879,17 @@
+ else
+   NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:14880: result: $NCURSES_BOOL" >&5
++echo "$as_me:14882: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ case x$NCURSES_BOOL in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14884: error: expected a type name for bool" >&5
++	{ { echo "$as_me:14886: error: expected a type name for bool" >&5
+ echo "$as_me: error: expected a type name for bool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+-echo "$as_me:14890: checking for alternate terminal capabilities file" >&5
++echo "$as_me:14892: 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.
+@@ -14899,16 +14901,16 @@
+ fi;
+ if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
+ then
+-	{ echo "$as_me:14902: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
++	{ echo "$as_me:14904: 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:14906: result: $TERMINFO_CAPS" >&5
++echo "$as_me:14908: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+ 
+ ###   use option --with-chtype to override chtype's type
+ 
+-echo "$as_me:14911: checking for type of chtype" >&5
++echo "$as_me:14913: 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.
+@@ -14918,11 +14920,11 @@
+ else
+   NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:14921: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:14923: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ case x$NCURSES_CHTYPE in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14925: error: expected a type name for chtype" >&5
++	{ { echo "$as_me:14927: error: expected a type name for chtype" >&5
+ echo "$as_me: error: expected a type name for chtype" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14930,7 +14932,7 @@
+ 
+ ###   use option --with-ospeed to override ospeed's type
+ 
+-echo "$as_me:14933: checking for type of ospeed" >&5
++echo "$as_me:14935: 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.
+@@ -14940,11 +14942,11 @@
+ else
+   NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:14943: result: $NCURSES_OSPEED" >&5
++echo "$as_me:14945: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ case x$NCURSES_OSPEED in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14947: error: expected a type name for ospeed" >&5
++	{ { echo "$as_me:14949: error: expected a type name for ospeed" >&5
+ echo "$as_me: error: expected a type name for ospeed" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14952,7 +14954,7 @@
+ 
+ ###   use option --with-mmask-t to override mmask_t's type
+ 
+-echo "$as_me:14955: checking for type of mmask-t" >&5
++echo "$as_me:14957: 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.
+@@ -14962,18 +14964,18 @@
+ else
+   NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:14965: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:14967: result: $NCURSES_MMASK_T" >&5
+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+ case x$NCURSES_MMASK_T in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14969: error: expected a type name for mmask-t" >&5
++	{ { echo "$as_me:14971: error: expected a type name for mmask-t" >&5
+ echo "$as_me: error: expected a type name for mmask-t" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ ###   use option --with-ccharw-max to override CCHARW_MAX size
+-echo "$as_me:14976: checking for size CCHARW_MAX" >&5
++echo "$as_me:14978: 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.
+@@ -14983,16 +14985,16 @@
+ else
+   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
+ fi;
+-echo "$as_me:14986: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:14988: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+ 
+-echo "$as_me:14989: checking for signed char" >&5
++echo "$as_me:14991: 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 14995 "configure"
++#line 14997 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15007,16 +15009,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15010: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15012: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15013: \$? = $ac_status" >&5
++  echo "$as_me:15015: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15016: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15018: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15019: \$? = $ac_status" >&5
++  echo "$as_me:15021: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -15026,10 +15028,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15029: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:15031: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:15032: checking size of signed char" >&5
++echo "$as_me:15034: 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
+@@ -15038,7 +15040,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15041 "configure"
++#line 15043 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15050,21 +15052,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15053: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15055: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15056: \$? = $ac_status" >&5
++  echo "$as_me:15058: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15059: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15061: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15062: \$? = $ac_status" >&5
++  echo "$as_me:15064: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15067 "configure"
++#line 15069 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15076,16 +15078,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15079: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15081: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15082: \$? = $ac_status" >&5
++  echo "$as_me:15084: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15085: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15087: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15088: \$? = $ac_status" >&5
++  echo "$as_me:15090: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -15101,7 +15103,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15104 "configure"
++#line 15106 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15113,16 +15115,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15116: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15118: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15119: \$? = $ac_status" >&5
++  echo "$as_me:15121: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15122: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15124: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15125: \$? = $ac_status" >&5
++  echo "$as_me:15127: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -15138,7 +15140,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 15141 "configure"
++#line 15143 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15150,16 +15152,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15153: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15155: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15156: \$? = $ac_status" >&5
++  echo "$as_me:15158: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15159: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15161: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15162: \$? = $ac_status" >&5
++  echo "$as_me:15164: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -15172,12 +15174,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:15175: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:15177: 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 15180 "configure"
++#line 15182 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15193,15 +15195,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:15196: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15198: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15199: \$? = $ac_status" >&5
++  echo "$as_me:15201: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:15201: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15203: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15204: \$? = $ac_status" >&5
++  echo "$as_me:15206: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -15217,7 +15219,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:15220: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:15222: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:15233: checking whether to use signed chars for Boolean array in term.h" >&5
+ echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
+ 
+ # Check whether --enable-signed-char or --disable-signed-char was given.
+@@ -15238,13 +15240,13 @@
+ else
+   with_signed_char=$cf_dft_signed_char
+ fi;
+-echo "$as_me:15241: result: $with_signed_char" >&5
++echo "$as_me:15243: 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:15247: checking for type of tparm-arg" >&5
++echo "$as_me:15249: checking for type of tparm-arg" >&5
+ echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6
+ 
+ # Check whether --with-tparm-arg or --without-tparm-arg was given.
+@@ -15254,18 +15256,18 @@
+ else
+   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:15257: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:15259: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+ case x$NCURSES_TPARM_ARG in
+ (x|xyes|xno)
+-	{ { echo "$as_me:15261: error: expected a type name for tparm-arg" >&5
++	{ { echo "$as_me:15263: error: expected a type name for tparm-arg" >&5
+ echo "$as_me: error: expected a type name for tparm-arg" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:15268: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:15270: 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.
+@@ -15275,7 +15277,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:15278: result: $with_rcs_ids" >&5
++echo "$as_me:15280: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15284,7 +15286,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:15287: checking format of man-pages" >&5
++echo "$as_me:15289: 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.
+@@ -15375,10 +15377,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:15378: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:15380: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+-	{ echo "$as_me:15381: WARNING: Unexpected manpage-format $cf_unknown" >&5
++	{ echo "$as_me:15383: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+ 
+@@ -15419,7 +15421,7 @@
+ esac
+ done
+ 
+-echo "$as_me:15422: checking for manpage renaming" >&5
++echo "$as_me:15424: 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.
+@@ -15448,15 +15450,15 @@
+ elif test "$MANPAGE_RENAMES" = no ; then
+ 	:
+ elif test ! -f "$MANPAGE_RENAMES" ; then
+-	{ { echo "$as_me:15451: error: not a filename: $MANPAGE_RENAMES" >&5
++	{ { echo "$as_me:15453: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-echo "$as_me:15456: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:15458: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+ 
+-echo "$as_me:15459: checking if manpage aliases will be installed" >&5
++echo "$as_me:15461: 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.
+@@ -15467,7 +15469,7 @@
+   MANPAGE_ALIASES=yes
+ fi;
+ 
+-echo "$as_me:15470: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:15472: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+ 
+ case "x$LN_S" in
+@@ -15481,7 +15483,7 @@
+ 
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:15484: checking if manpage symlinks should be used" >&5
++echo "$as_me:15486: 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.
+@@ -15494,17 +15496,17 @@
+ 
+ if test "$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+-	{ echo "$as_me:15497: WARNING: cannot make symlinks" >&5
++	{ echo "$as_me:15499: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ 	MANPAGE_SYMLINKS=no
+ fi
+ fi
+ 
+-echo "$as_me:15503: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:15505: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+ 
+-echo "$as_me:15507: checking for manpage tbl" >&5
++echo "$as_me:15509: 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.
+@@ -15515,7 +15517,7 @@
+   MANPAGE_TBL=no
+ fi;
+ 
+-echo "$as_me:15518: result: $MANPAGE_TBL" >&5
++echo "$as_me:15520: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+ 
+ if test "$prefix" = "NONE" ; then
+@@ -15707,7 +15709,7 @@
+ if test -n "$cf_manpage_compress" ; then
+ cat >>$cf_edit_man <&5
++echo "$as_me:15841: 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.
+@@ -15846,7 +15848,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:15849: result: $with_ext_funcs" >&5
++echo "$as_me:15851: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -15903,7 +15905,7 @@
+ 	GENERATED_EXT_FUNCS=
+ fi
+ 
+-echo "$as_me:15906: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:15908: 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.
+@@ -15913,7 +15915,7 @@
+ else
+   with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:15916: result: $with_sp_funcs" >&5
++echo "$as_me:15918: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ 	NCURSES_SP_FUNCS=1
+@@ -15932,7 +15934,7 @@
+ 	GENERATED_SP_FUNCS=
+ fi
+ 
+-echo "$as_me:15935: checking if you want to build with terminal-driver" >&5
++echo "$as_me:15937: 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.
+@@ -15942,7 +15944,7 @@
+ else
+   with_term_driver=no
+ fi;
+-echo "$as_me:15945: result: $with_term_driver" >&5
++echo "$as_me:15947: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+ 
+@@ -15951,19 +15953,19 @@
+ EOF
+ 
+ 	if test "x$with_termlib" != xno ; then
+-		{ { echo "$as_me:15954: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:15956: 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:15959: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:15961: 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:15966: checking for extended use of const keyword" >&5
++echo "$as_me:15968: 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.
+@@ -15973,7 +15975,7 @@
+ else
+   with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:15976: result: $with_ext_const" >&5
++echo "$as_me:15978: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -15981,7 +15983,7 @@
+ fi
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:15984: checking if you want to use extended colors" >&5
++echo "$as_me:15986: 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.
+@@ -15991,12 +15993,12 @@
+ else
+   with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:15994: result: $with_ext_colors" >&5
++echo "$as_me:15996: 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:15999: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:16001: 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)
+@@ -16007,7 +16009,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16010: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16012: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16035,7 +16037,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:16038: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:16040: 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.
+@@ -16045,7 +16047,7 @@
+ else
+   with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:16048: result: $with_ext_mouse" >&5
++echo "$as_me:16050: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ if test "x$with_ext_mouse" = xyes ; then
+ 
+@@ -16055,7 +16057,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16058: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16060: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16072,7 +16074,7 @@
+ fi
+ 
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:16075: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:16077: 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.
+@@ -16082,7 +16084,7 @@
+ else
+   with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:16085: result: $with_ext_putwin" >&5
++echo "$as_me:16087: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+ 
+@@ -16092,7 +16094,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16095: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:16097: 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.
+@@ -16102,7 +16104,7 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:16105: result: $with_no_padding" >&5
++echo "$as_me:16107: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16110,7 +16112,7 @@
+ EOF
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:16113: checking if you want SIGWINCH handler" >&5
++echo "$as_me:16115: 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.
+@@ -16120,7 +16122,7 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:16123: result: $with_sigwinch" >&5
++echo "$as_me:16125: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ if test "x$with_sigwinch" = xyes
+ then
+@@ -16135,7 +16137,7 @@
+ fi
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:16138: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:16140: 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.
+@@ -16145,7 +16147,7 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:16148: result: $with_tcap_names" >&5
++echo "$as_me:16150: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ if test "x$with_tcap_names" = xyes; then
+@@ -16159,7 +16161,7 @@
+ 
+ ##############################################################################
+ 
+-echo "$as_me:16162: checking if you want to link with the pthread library" >&5
++echo "$as_me:16164: 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.
+@@ -16169,27 +16171,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:16172: result: $with_pthread" >&5
++echo "$as_me:16174: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:16176: checking for pthread.h" >&5
++	echo "$as_me:16178: 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 16182 "configure"
++#line 16184 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16186: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16188: \"$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:16192: \$? = $ac_status" >&5
++  echo "$as_me:16194: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16208,7 +16210,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16211: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:16213: 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
+ 
+@@ -16218,7 +16220,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:16221: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:16223: 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"
+ 
+@@ -16239,7 +16241,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16242 "configure"
++#line 16244 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16256,16 +16258,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16259: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16261: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16262: \$? = $ac_status" >&5
++  echo "$as_me:16264: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16265: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16267: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16268: \$? = $ac_status" >&5
++  echo "$as_me:16270: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -16275,7 +16277,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:16278: result: $with_pthread" >&5
++	    echo "$as_me:16280: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -16303,7 +16305,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:16306: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:16308: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -16313,13 +16315,13 @@
+ fi
+ 
+ if test "x$with_pthread" != xno; then
+-	echo "$as_me:16316: checking for pthread_kill" >&5
++	echo "$as_me:16318: 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 16322 "configure"
++#line 16324 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16350,16 +16352,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16353: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16355: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16356: \$? = $ac_status" >&5
++  echo "$as_me:16358: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16359: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16361: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16362: \$? = $ac_status" >&5
++  echo "$as_me:16364: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_pthread_kill=yes
+ else
+@@ -16369,11 +16371,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16372: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:16374: 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:16376: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:16378: 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.
+@@ -16383,7 +16385,7 @@
+ else
+   use_pthreads_eintr=no
+ fi;
+-		echo "$as_me:16386: result: $use_pthreads_eintr" >&5
++		echo "$as_me:16388: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ 		if test "x$use_pthreads_eintr" = xyes ; then
+ 
+@@ -16394,7 +16396,7 @@
+ 		fi
+ fi
+ 
+-	echo "$as_me:16397: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:16399: 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.
+@@ -16404,18 +16406,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-	echo "$as_me:16407: result: $use_weak_symbols" >&5
++	echo "$as_me:16409: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ 	if test "x$use_weak_symbols" = xyes ; then
+ 
+-echo "$as_me:16411: checking if $CC supports weak symbols" >&5
++echo "$as_me:16413: 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 16418 "configure"
++#line 16420 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16441,16 +16443,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16444: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16446: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16447: \$? = $ac_status" >&5
++  echo "$as_me:16449: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16450: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16452: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16453: \$? = $ac_status" >&5
++  echo "$as_me:16455: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -16461,7 +16463,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16464: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:16466: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ 	else
+@@ -16511,7 +16513,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:16514: checking if you want reentrant code" >&5
++echo "$as_me:16516: 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.
+@@ -16521,7 +16523,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:16524: result: $with_reentrant" >&5
++echo "$as_me:16526: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -16610,7 +16612,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16613: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16615: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16622,7 +16624,7 @@
+ 	NCURSES_SIZE_T=$cf_dft_ordinate_type
+ fi
+ 
+-echo "$as_me:16625: checking whether curses library structures should be opaque" >&5
++echo "$as_me:16627: checking whether curses library structures should be opaque" >&5
+ echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
+@@ -16644,16 +16646,16 @@
+ 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16647: result: $enable_opaque_curses" >&5
++echo "$as_me:16649: 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:16652: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:16654: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:16656: checking whether form library structures should be opaque" >&5
++echo "$as_me:16658: checking whether form library structures should be opaque" >&5
+ echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-form or --disable-opaque-form was given.
+@@ -16670,10 +16672,10 @@
+ 	enable_opaque_form=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16673: result: $enable_opaque_form" >&5
++echo "$as_me:16675: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+ 
+-echo "$as_me:16676: checking whether menu library structures should be opaque" >&5
++echo "$as_me:16678: checking whether menu library structures should be opaque" >&5
+ echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
+@@ -16690,10 +16692,10 @@
+ 	enable_opaque_menu=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16693: result: $enable_opaque_menu" >&5
++echo "$as_me:16695: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+ 
+-echo "$as_me:16696: checking whether panel library structures should be opaque" >&5
++echo "$as_me:16698: checking whether panel library structures should be opaque" >&5
+ echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
+@@ -16710,7 +16712,7 @@
+ 	enable_opaque_panel=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16713: result: $enable_opaque_panel" >&5
++echo "$as_me:16715: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+ 
+ NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -16720,7 +16722,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:16723: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:16725: 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.
+@@ -16730,7 +16732,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:16733: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:16735: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -16743,7 +16745,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:16746: checking if you want all development code" >&5
++echo "$as_me:16748: 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.
+@@ -16753,11 +16755,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:16756: result: $with_develop" >&5
++echo "$as_me:16758: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###   use option --enable-check-size to detect screensize with CPR
+-echo "$as_me:16760: checking if you want to check screensize of serial terminals" >&5
++echo "$as_me:16762: checking if you want to check screensize of serial terminals" >&5
+ echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
+ 
+ # Check whether --enable-check-size or --disable-check-size was given.
+@@ -16767,7 +16769,7 @@
+ else
+   enable_check_size=$with_develop
+ fi;
+-echo "$as_me:16770: result: $enable_check_size" >&5
++echo "$as_me:16772: result: $enable_check_size" >&5
+ echo "${ECHO_T}$enable_check_size" >&6
+ test "x$enable_check_size" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16775,7 +16777,7 @@
+ EOF
+ 
+ ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
+-echo "$as_me:16778: checking if you want hard-tabs code" >&5
++echo "$as_me:16780: 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.
+@@ -16785,7 +16787,7 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:16788: result: $enable_hard_tabs" >&5
++echo "$as_me:16790: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16793,7 +16795,7 @@
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:16796: checking if you want limited support for xmc" >&5
++echo "$as_me:16798: 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.
+@@ -16803,7 +16805,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:16806: result: $enable_xmc_glitch" >&5
++echo "$as_me:16808: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16813,7 +16815,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:16816: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:16818: 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.
+@@ -16823,7 +16825,7 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:16826: result: $with_assumed_color" >&5
++echo "$as_me:16828: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16831,7 +16833,7 @@
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:16834: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:16836: 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.
+@@ -16841,7 +16843,7 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:16844: result: $with_hashmap" >&5
++echo "$as_me:16846: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16849,7 +16851,7 @@
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:16852: checking if you want colorfgbg code" >&5
++echo "$as_me:16854: 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.
+@@ -16859,7 +16861,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:16862: result: $with_colorfgbg" >&5
++echo "$as_me:16864: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16867,7 +16869,7 @@
+ EOF
+ 
+ ###   use option --enable-fvisibility to turn on use of gcc-specific feature
+-echo "$as_me:16870: checking if you want to use gcc -fvisibility option" >&5
++echo "$as_me:16872: 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.
+@@ -16877,14 +16879,14 @@
+ else
+   cf_with_fvisibility=no
+ fi;
+-echo "$as_me:16880: result: $cf_with_fvisibility" >&5
++echo "$as_me:16882: 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:16887: checking if $CC -fvisibility=hidden option works" >&5
++echo "$as_me:16889: 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
+@@ -16893,7 +16895,7 @@
+     cf_save_cflags="$CFLAGS"
+     CFLAGS="$CFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16896 "configure"
++#line 16898 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16909,16 +16911,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16912: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16914: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16915: \$? = $ac_status" >&5
++  echo "$as_me:16917: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16918: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16920: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16921: \$? = $ac_status" >&5
++  echo "$as_me:16923: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden=yes
+ else
+@@ -16930,7 +16932,7 @@
+     CFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16933: result: $cf_cv_fvisibility_hidden" >&5
++echo "$as_me:16935: result: $cf_cv_fvisibility_hidden" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
+ 
+ 	if test "x$cf_cv_fvisibility_hidden" = xyes
+@@ -17045,7 +17047,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:17048: checking if $CXX -fvisibility=hidden option works" >&5
++echo "$as_me:17050: 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
+@@ -17054,7 +17056,7 @@
+     cf_save_cflags="$CXXFLAGS"
+     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17057 "configure"
++#line 17059 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -17070,16 +17072,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17073: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17075: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17076: \$? = $ac_status" >&5
++  echo "$as_me:17078: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17079: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17081: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17082: \$? = $ac_status" >&5
++  echo "$as_me:17084: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden2=yes
+ else
+@@ -17091,7 +17093,7 @@
+     CXXFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:17094: result: $cf_cv_fvisibility_hidden2" >&5
++echo "$as_me:17096: result: $cf_cv_fvisibility_hidden2" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
+ 
+ 		if test "x$cf_cv_fvisibility_hidden2" = xyes
+@@ -17214,7 +17216,7 @@
+ fi
+ 
+ ###   use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:17217: checking if you want interop bindings" >&5
++echo "$as_me:17219: 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.
+@@ -17224,13 +17226,13 @@
+ else
+   with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:17227: result: $with_exp_interop" >&5
++echo "$as_me:17229: 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:17233: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:17235: 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.
+@@ -17240,13 +17242,13 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:17243: result: $with_safe_sprintf" >&5
++echo "$as_me:17245: 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:17249: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:17251: 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.
+@@ -17256,7 +17258,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:17259: result: $with_scroll_hints" >&5
++echo "$as_me:17261: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -17265,7 +17267,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17268: checking if you want wgetch-events code" >&5
++echo "$as_me:17270: 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.
+@@ -17275,7 +17277,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:17278: result: $with_wgetch_events" >&5
++echo "$as_me:17280: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ if test "x$with_wgetch_events" = xyes ; then
+ 
+@@ -17290,7 +17292,7 @@
+ 
+ case "$cf_cv_system_name" in
+ (*mingw32*|*mingw64*|*-msvc*)
+-	echo "$as_me:17293: checking if you want experimental-Windows driver" >&5
++	echo "$as_me:17295: 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.
+@@ -17300,7 +17302,7 @@
+ else
+   with_exp_win32=no
+ fi;
+-	echo "$as_me:17303: result: $with_exp_win32" >&5
++	echo "$as_me:17305: result: $with_exp_win32" >&5
+ echo "${ECHO_T}$with_exp_win32" >&6
+ 	if test "x$with_exp_win32" = xyes
+ 	then
+@@ -17326,7 +17328,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:17329: checking if you want to see long compiling messages" >&5
++echo "$as_me:17331: 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.
+@@ -17360,7 +17362,7 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:17363: result: $enableval" >&5
++echo "$as_me:17365: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ if test "x$enable_echo" = xyes; then
+@@ -17373,7 +17375,7 @@
+ 
+ # --disable-stripping is used for debugging
+ 
+-echo "$as_me:17376: checking if you want to install stripped executables" >&5
++echo "$as_me:17378: 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.
+@@ -17390,7 +17392,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:17393: result: $enable_stripping" >&5
++echo "$as_me:17395: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -17401,7 +17403,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:17404: checking if install accepts -p option" >&5
++echo "$as_me:17406: 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
+@@ -17432,10 +17434,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:17435: result: $cf_cv_install_p" >&5
++echo "$as_me:17437: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:17438: checking if install needs to be told about ownership" >&5
++echo "$as_me:17440: 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)
+@@ -17446,7 +17448,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17449: result: $with_install_o" >&5
++echo "$as_me:17451: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -17457,7 +17459,7 @@
+ 
+ if test -n "$INSTALL_OPT_S"
+ then
+-	echo "$as_me:17460: checking if you want to specify strip-program" >&5
++	echo "$as_me:17462: checking if you want to specify strip-program" >&5
+ echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
+ 
+ # Check whether --with-strip-program or --without-strip-program was given.
+@@ -17467,11 +17469,11 @@
+ else
+   with_strip_program=no
+ fi;
+-	echo "$as_me:17470: result: $with_strip_program" >&5
++	echo "$as_me:17472: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ 	if test "$with_strip_program" != no
+ 	then
+-		echo "$as_me:17474: checking if strip-program is supported with this installer" >&5
++		echo "$as_me:17476: checking if strip-program is supported with this installer" >&5
+ echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
+ 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
+ 		check_install_strip=no
+@@ -17492,11 +17494,11 @@
+ 				done
+ 			fi
+ 		fi
+-		echo "$as_me:17495: result: $check_install_strip" >&5
++		echo "$as_me:17497: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ 		case "$check_install_strip" in
+ 		(no)
+-			{ echo "$as_me:17499: WARNING: $cf_install_program does not support strip program option" >&5
++			{ echo "$as_me:17501: WARNING: $cf_install_program does not support strip program option" >&5
+ echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
+ 			with_strip_program=no
+ 			;;
+@@ -17511,7 +17513,7 @@
+ 			chmod +x "$INSTALL"
+ 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
+ 
+-echo "${as_me:-configure}:17514: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:17516: testing created $INSTALL ..." 1>&5
+ 
+ 			;;
+ 		(option)
+@@ -17537,7 +17539,7 @@
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+ 
+-echo "$as_me:17540: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:17542: 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.
+@@ -17554,17 +17556,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:17557: result: $enable_stdnoreturn" >&5
++echo "$as_me:17559: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:17561: checking for C11 _Noreturn feature" >&5
++echo "$as_me:17563: 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 17567 "configure"
++#line 17569 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17580,16 +17582,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17583: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17585: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17586: \$? = $ac_status" >&5
++  echo "$as_me:17588: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17589: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17591: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17592: \$? = $ac_status" >&5
++  echo "$as_me:17594: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -17600,7 +17602,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17603: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:17605: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -17656,16 +17658,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17659: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17661: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17664: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17666: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17668: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17670: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17704,16 +17706,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17707: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17709: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17712: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17714: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17716: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17718: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17752,23 +17754,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17755: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17757: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17760: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17762: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17764: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17766: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:17771: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:17773: 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.
+@@ -17785,7 +17787,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:17788: result: $enable_warnings" >&5
++echo "$as_me:17790: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -17809,7 +17811,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17812 "configure"
++#line 17814 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17824,26 +17826,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17827: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17829: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17830: \$? = $ac_status" >&5
++  echo "$as_me:17832: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17833: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17835: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17836: \$? = $ac_status" >&5
++  echo "$as_me:17838: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:17839: checking for X11/Xt const-feature" >&5
++echo "$as_me:17841: 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 17846 "configure"
++#line 17848 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -17861,16 +17863,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17864: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17866: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17867: \$? = $ac_status" >&5
++  echo "$as_me:17869: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17870: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17872: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17873: \$? = $ac_status" >&5
++  echo "$as_me:17875: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -17885,7 +17887,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17888: result: $cf_cv_const_x_string" >&5
++echo "$as_me:17890: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -17914,7 +17916,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:17935: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -17946,12 +17948,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17949: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17951: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17952: \$? = $ac_status" >&5
++  echo "$as_me:17954: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17954: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17956: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -17959,7 +17961,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:17962: checking for $CC warning options..." >&5
++	{ echo "$as_me:17964: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -17982,12 +17984,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:17985: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17987: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17988: \$? = $ac_status" >&5
++  echo "$as_me:17990: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17990: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17992: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -17995,7 +17997,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17998: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:18000: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -18005,7 +18007,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:18008: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:18010: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -18038,10 +18040,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:18041: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:18043: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -18091,12 +18093,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:18094: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18096: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18097: \$? = $ac_status" >&5
++  echo "$as_me:18099: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18099: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:18101: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -18168,12 +18170,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:18171: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:18173: 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 18176 "configure"
++#line 18178 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18190,16 +18192,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18193: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18195: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18196: \$? = $ac_status" >&5
++  echo "$as_me:18198: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18199: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18201: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18202: \$? = $ac_status" >&5
++  echo "$as_me:18204: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -18210,7 +18212,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:18213: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:18215: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -18219,11 +18221,11 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:18222: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:18224: 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 18226 "configure"
++#line 18228 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18240,16 +18242,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18243: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18245: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18246: \$? = $ac_status" >&5
++  echo "$as_me:18248: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18249: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18251: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18252: \$? = $ac_status" >&5
++  echo "$as_me:18254: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_CPLUSPLUS=yes
+ 
+@@ -18259,7 +18261,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:18262: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:18264: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -18268,30 +18270,30 @@
+ if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:18271: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:18273: 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:18278: checking version of $CC" >&5
++	echo "$as_me:18280: 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:18282: result: $CLANG_VERSION" >&5
++	echo "$as_me:18284: 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:18289: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:18291: 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 18294 "configure"
++#line 18296 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -18305,16 +18307,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18308: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18310: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18311: \$? = $ac_status" >&5
++  echo "$as_me:18313: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18314: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18316: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18317: \$? = $ac_status" >&5
++  echo "$as_me:18319: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -18325,13 +18327,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:18328: result: $cf_clang_optok" >&5
++		echo "$as_me:18330: 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}:18334: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:18336: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -18348,7 +18350,7 @@
+ ac_main_return="return"
+ 
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:18371: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -18383,12 +18385,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:18386: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18388: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18389: \$? = $ac_status" >&5
++  echo "$as_me:18391: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18391: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18393: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -18397,7 +18399,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:18400: checking for $CXX warning options..." >&5
++	{ echo "$as_me:18402: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -18427,16 +18429,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:18430: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18432: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18433: \$? = $ac_status" >&5
++  echo "$as_me:18435: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18435: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18437: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:18439: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18441: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -18454,7 +18456,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:18457: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:18459: 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.
+@@ -18464,7 +18466,7 @@
+ else
+   enable_string_hacks=no
+ fi;
+-echo "$as_me:18467: result: $enable_string_hacks" >&5
++echo "$as_me:18469: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+ 
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -18473,15 +18475,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:18476: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:18478: 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:18478: checking for strlcat" >&5
++	echo "$as_me:18480: 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 18484 "configure"
++#line 18486 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18512,16 +18514,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18515: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18517: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18518: \$? = $ac_status" >&5
++  echo "$as_me:18520: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18521: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18523: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18524: \$? = $ac_status" >&5
++  echo "$as_me:18526: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -18531,7 +18533,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18534: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:18536: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+ 
+@@ -18541,7 +18543,7 @@
+ 
+ else
+ 
+-		echo "$as_me:18544: checking for strlcat in -lbsd" >&5
++		echo "$as_me:18546: 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
+@@ -18549,7 +18551,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18552 "configure"
++#line 18554 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18568,16 +18570,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18571: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18573: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18574: \$? = $ac_status" >&5
++  echo "$as_me:18576: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18577: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18579: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18580: \$? = $ac_status" >&5
++  echo "$as_me:18582: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -18588,7 +18590,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18591: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:18593: 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
+ 
+@@ -18611,23 +18613,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18614: checking for $ac_header" >&5
++echo "$as_me:18616: 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 18620 "configure"
++#line 18622 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18624: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18626: \"$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:18630: \$? = $ac_status" >&5
++  echo "$as_me:18632: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18646,7 +18648,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18649: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18651: 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:18672: 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 18676 "configure"
++#line 18678 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18704,16 +18706,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18707: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18709: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18710: \$? = $ac_status" >&5
++  echo "$as_me:18712: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18713: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18715: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18716: \$? = $ac_status" >&5
++  echo "$as_me:18718: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -18723,7 +18725,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18726: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:18728: 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:18741: 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.
+@@ -18746,7 +18748,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:18749: result: $with_assertions" >&5
++echo "$as_me:18751: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -18762,7 +18764,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:18765: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:18767: 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.
+@@ -18784,7 +18786,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:18787: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:18789: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18898,23 +18900,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:18901: checking for dmalloc.h" >&5
++	echo "$as_me:18903: 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 18907 "configure"
++#line 18909 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:18911: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18913: \"$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:18917: \$? = $ac_status" >&5
++  echo "$as_me:18919: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18933,11 +18935,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18936: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:18938: 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:18940: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:18942: 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
+@@ -18945,7 +18947,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18948 "configure"
++#line 18950 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18964,16 +18966,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18967: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18969: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18970: \$? = $ac_status" >&5
++  echo "$as_me:18972: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18973: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18975: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18976: \$? = $ac_status" >&5
++  echo "$as_me:18978: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -18984,7 +18986,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18987: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:18989: 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:19004: 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.
+@@ -19021,7 +19023,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:19024: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:19026: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19135,23 +19137,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:19138: checking for dbmalloc.h" >&5
++	echo "$as_me:19140: 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 19144 "configure"
++#line 19146 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:19148: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:19150: \"$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:19154: \$? = $ac_status" >&5
++  echo "$as_me:19156: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19170,11 +19172,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:19173: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:19175: 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:19177: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:19179: 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
+@@ -19182,7 +19184,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19185 "configure"
++#line 19187 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19201,16 +19203,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19204: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19206: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19207: \$? = $ac_status" >&5
++  echo "$as_me:19209: \$? = $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:19212: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19213: \$? = $ac_status" >&5
++  echo "$as_me:19215: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -19221,7 +19223,7 @@
+ 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_dbmalloc_debug_malloc" >&5
++echo "$as_me:19226: 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:19241: 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.
+@@ -19258,7 +19260,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:19261: result: ${with_valgrind:-no}" >&5
++echo "$as_me:19263: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19371,7 +19373,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19374: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:19376: 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.
+@@ -19382,7 +19384,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:19385: result: $with_no_leaks" >&5
++echo "$as_me:19387: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -19434,7 +19436,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19437: checking whether to add trace feature to all models" >&5
++echo "$as_me:19439: 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.
+@@ -19444,7 +19446,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:19447: result: $cf_with_trace" >&5
++echo "$as_me:19449: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -19464,7 +19466,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:19467: checking if we want to use GNAT projects" >&5
++echo "$as_me:19469: 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.
+@@ -19481,7 +19483,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:19484: result: $enable_gnat_projects" >&5
++echo "$as_me:19486: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -19494,14 +19496,14 @@
+ 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+ 	fi
+ 
+-echo "$as_me:19497: checking if ssp library is needed" >&5
++echo "$as_me:19499: 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 19504 "configure"
++#line 19506 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19518,16 +19520,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19521: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19523: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19524: \$? = $ac_status" >&5
++  echo "$as_me:19526: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19527: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19529: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19530: \$? = $ac_status" >&5
++  echo "$as_me:19532: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -19537,7 +19539,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19540 "configure"
++#line 19542 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19554,16 +19556,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19557: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19559: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19560: \$? = $ac_status" >&5
++  echo "$as_me:19562: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19563: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19565: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19566: \$? = $ac_status" >&5
++  echo "$as_me:19568: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -19577,7 +19579,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19580: result: $cf_cv_need_libssp" >&5
++echo "$as_me:19582: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -19606,14 +19608,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19609: checking if -lm needed for math functions" >&5
++echo "$as_me:19611: 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 19616 "configure"
++#line 19618 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19629,16 +19631,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19632: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19634: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19635: \$? = $ac_status" >&5
++  echo "$as_me:19637: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19638: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19640: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19641: \$? = $ac_status" >&5
++  echo "$as_me:19643: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -19648,7 +19650,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19651: result: $cf_cv_need_libm" >&5
++echo "$as_me:19653: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ 
+ if test "$cf_cv_need_libm" = yes
+@@ -19656,14 +19658,14 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lm"
+-	echo "$as_me:19659: checking if -lm is available for math functions" >&5
++	echo "$as_me:19661: checking if -lm is available for math functions" >&5
+ echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
+ if test "${cf_cv_have_libm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19666 "configure"
++#line 19668 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19679,16 +19681,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19682: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19684: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19685: \$? = $ac_status" >&5
++  echo "$as_me:19687: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19688: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19690: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19691: \$? = $ac_status" >&5
++  echo "$as_me:19693: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_libm=yes
+ else
+@@ -19698,7 +19700,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19701: result: $cf_cv_have_libm" >&5
++echo "$as_me:19703: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ 	LIBS="$cf_save_LIBS"
+ 
+@@ -19720,13 +19722,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:19723: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:19725: 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 19729 "configure"
++#line 19731 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -19742,16 +19744,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19745: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19747: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19748: \$? = $ac_status" >&5
++  echo "$as_me:19750: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19751: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19753: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19754: \$? = $ac_status" >&5
++  echo "$as_me:19756: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -19761,7 +19763,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19764: result: $ac_cv_header_time" >&5
++echo "$as_me:19766: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -19776,7 +19778,7 @@
+ case "$host_os" in
+ (mingw*)
+ 	# -lsystre -ltre -lintl -liconv
+-	echo "$as_me:19779: checking for regcomp in -lsystre" >&5
++	echo "$as_me:19781: 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
+@@ -19784,7 +19786,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsystre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19787 "configure"
++#line 19789 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19803,16 +19805,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19806: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19808: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19809: \$? = $ac_status" >&5
++  echo "$as_me:19811: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19812: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19814: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19815: \$? = $ac_status" >&5
++  echo "$as_me:19817: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_systre_regcomp=yes
+ else
+@@ -19823,11 +19825,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19826: result: $ac_cv_lib_systre_regcomp" >&5
++echo "$as_me:19828: 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:19830: checking for libiconv_open in -liconv" >&5
++		echo "$as_me:19832: 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
+@@ -19835,7 +19837,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19838 "configure"
++#line 19840 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19854,16 +19856,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19857: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19859: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19860: \$? = $ac_status" >&5
++  echo "$as_me:19862: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19863: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19865: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19866: \$? = $ac_status" >&5
++  echo "$as_me:19868: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_iconv_libiconv_open=yes
+ else
+@@ -19874,7 +19876,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19877: result: $ac_cv_lib_iconv_libiconv_open" >&5
++echo "$as_me:19879: 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
+ 
+@@ -19896,7 +19898,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19899: checking for libintl_gettext in -lintl" >&5
++		echo "$as_me:19901: 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
+@@ -19904,7 +19906,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19907 "configure"
++#line 19909 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19923,16 +19925,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19926: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19928: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19929: \$? = $ac_status" >&5
++  echo "$as_me:19931: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19932: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19934: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19935: \$? = $ac_status" >&5
++  echo "$as_me:19937: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_intl_libintl_gettext=yes
+ else
+@@ -19943,7 +19945,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19946: result: $ac_cv_lib_intl_libintl_gettext" >&5
++echo "$as_me:19948: 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
+ 
+@@ -19965,7 +19967,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19968: checking for tre_regcomp in -ltre" >&5
++		echo "$as_me:19970: 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
+@@ -19973,7 +19975,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19976 "configure"
++#line 19978 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19992,16 +19994,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19995: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19997: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19998: \$? = $ac_status" >&5
++  echo "$as_me:20000: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20001: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20003: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20004: \$? = $ac_status" >&5
++  echo "$as_me:20006: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_tre_tre_regcomp=yes
+ else
+@@ -20012,7 +20014,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20015: result: $ac_cv_lib_tre_tre_regcomp" >&5
++echo "$as_me:20017: 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
+ 
+@@ -20054,7 +20056,7 @@
+ 
+ else
+ 
+-		echo "$as_me:20057: checking for regcomp in -lgnurx" >&5
++		echo "$as_me:20059: 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
+@@ -20062,7 +20064,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgnurx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20065 "configure"
++#line 20067 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20081,16 +20083,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20084: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20086: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20087: \$? = $ac_status" >&5
++  echo "$as_me:20089: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20090: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20092: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20093: \$? = $ac_status" >&5
++  echo "$as_me:20095: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gnurx_regcomp=yes
+ else
+@@ -20101,7 +20103,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20104: result: $ac_cv_lib_gnurx_regcomp" >&5
++echo "$as_me:20106: 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
+ 
+@@ -20129,13 +20131,13 @@
+ 	;;
+ (*)
+ 	cf_regex_libs="regex re"
+-	echo "$as_me:20132: checking for regcomp" >&5
++	echo "$as_me:20134: 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 20138 "configure"
++#line 20140 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20166,16 +20168,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20169: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20171: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20172: \$? = $ac_status" >&5
++  echo "$as_me:20174: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20175: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20177: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20178: \$? = $ac_status" >&5
++  echo "$as_me:20180: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -20185,7 +20187,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20188: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:20190: 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
+@@ -20194,7 +20196,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:20197: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:20199: 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
+@@ -20202,7 +20204,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20205 "configure"
++#line 20207 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20221,16 +20223,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20224: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20226: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20227: \$? = $ac_status" >&5
++  echo "$as_me:20229: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20230: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20232: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20233: \$? = $ac_status" >&5
++  echo "$as_me:20235: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -20241,7 +20243,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20244: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:20246: 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
+ 
+@@ -20273,13 +20275,13 @@
+ esac
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:20276: checking for compile" >&5
++	echo "$as_me:20278: 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 20282 "configure"
++#line 20284 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20310,16 +20312,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20313: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20315: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20316: \$? = $ac_status" >&5
++  echo "$as_me:20318: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20319: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20321: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20322: \$? = $ac_status" >&5
++  echo "$as_me:20324: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -20329,13 +20331,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20332: result: $ac_cv_func_compile" >&5
++echo "$as_me:20334: 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:20338: checking for compile in -lgen" >&5
++		echo "$as_me:20340: 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
+@@ -20343,7 +20345,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20346 "configure"
++#line 20348 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20362,16 +20364,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20365: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20367: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20368: \$? = $ac_status" >&5
++  echo "$as_me:20370: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20371: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20373: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20374: \$? = $ac_status" >&5
++  echo "$as_me:20376: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -20382,7 +20384,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20385: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:20387: 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
+ 
+@@ -20410,11 +20412,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:20413: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:20415: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:20417: checking for regular-expression headers" >&5
++echo "$as_me:20419: 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
+@@ -20426,7 +20428,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20429 "configure"
++#line 20431 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -20443,16 +20445,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20446: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20448: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20449: \$? = $ac_status" >&5
++  echo "$as_me:20451: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20452: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20454: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20455: \$? = $ac_status" >&5
++  echo "$as_me:20457: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20469,7 +20471,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20472 "configure"
++#line 20474 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -20490,16 +20492,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20493: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20495: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20496: \$? = $ac_status" >&5
++  echo "$as_me:20498: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20499: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20501: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20502: \$? = $ac_status" >&5
++  echo "$as_me:20504: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20515,11 +20517,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:20518: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:20520: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case "$cf_cv_regex_hdrs" in
+-	(no)		{ echo "$as_me:20522: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:20524: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -20557,23 +20559,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20560: checking for $ac_header" >&5
++echo "$as_me:20562: 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 20566 "configure"
++#line 20568 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20570: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20572: \"$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:20576: \$? = $ac_status" >&5
++  echo "$as_me:20578: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20592,7 +20594,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20595: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20597: 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:20610: 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 20614 "configure"
++#line 20616 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20618: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20620: \"$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:20624: \$? = $ac_status" >&5
++  echo "$as_me:20626: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20640,7 +20642,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20643: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20645: 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:20655: 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
+@@ -20660,7 +20662,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20663 "configure"
++#line 20665 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20673,16 +20675,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20676: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20678: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20679: \$? = $ac_status" >&5
++  echo "$as_me:20681: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20682: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20684: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20685: \$? = $ac_status" >&5
++  echo "$as_me:20687: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -20694,7 +20696,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20697: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20699: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -20711,14 +20713,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20714: checking if external environ is declared" >&5
++echo "$as_me:20716: 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 20721 "configure"
++#line 20723 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -20731,16 +20733,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20734: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20736: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20737: \$? = $ac_status" >&5
++  echo "$as_me:20739: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20740: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20742: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20743: \$? = $ac_status" >&5
++  echo "$as_me:20745: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_environ=yes
+ else
+@@ -20751,7 +20753,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20754: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20756: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+ 
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20766,14 +20768,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:20769: checking if external environ exists" >&5
++echo "$as_me:20771: 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 20776 "configure"
++#line 20778 "configure"
+ #include "confdefs.h"
+ 
+ #undef environ
+@@ -20788,16 +20790,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20791: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20793: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20794: \$? = $ac_status" >&5
++  echo "$as_me:20796: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20797: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20799: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20800: \$? = $ac_status" >&5
++  echo "$as_me:20802: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_environ=yes
+ else
+@@ -20808,7 +20810,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20811: result: $cf_cv_have_environ" >&5
++echo "$as_me:20813: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+ 
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20821,13 +20823,13 @@
+ 
+ fi
+ 
+-echo "$as_me:20824: checking for getenv" >&5
++echo "$as_me:20826: 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 20830 "configure"
++#line 20832 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20858,16 +20860,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20861: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20863: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20864: \$? = $ac_status" >&5
++  echo "$as_me:20866: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20867: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20869: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20870: \$? = $ac_status" >&5
++  echo "$as_me:20872: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_getenv=yes
+ else
+@@ -20877,19 +20879,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20880: result: $ac_cv_func_getenv" >&5
++echo "$as_me:20882: 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:20886: checking for $ac_func" >&5
++echo "$as_me:20888: 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 20892 "configure"
++#line 20894 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20920,16 +20922,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20923: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20925: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20926: \$? = $ac_status" >&5
++  echo "$as_me:20928: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20929: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20931: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20932: \$? = $ac_status" >&5
++  echo "$as_me:20934: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -20939,7 +20941,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20942: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:20944: 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:20954: 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
+@@ -20959,7 +20961,7 @@
+   cf_cv_consistent_getenv=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20962 "configure"
++#line 20964 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21064,15 +21066,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21067: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21069: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21070: \$? = $ac_status" >&5
++  echo "$as_me:21072: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21072: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21074: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21075: \$? = $ac_status" >&5
++  echo "$as_me:21077: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_consistent_getenv=yes
+ else
+@@ -21085,7 +21087,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:21088: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:21090: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+ 
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -21100,18 +21102,18 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ 	test "x$cf_with_trace" = xyes
+ then
+-	{ echo "$as_me:21103: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++	{ echo "$as_me:21105: 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:21107: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:21109: 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 21114 "configure"
++#line 21116 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21131,16 +21133,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21134: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21136: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21137: \$? = $ac_status" >&5
++  echo "$as_me:21139: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21140: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21142: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21143: \$? = $ac_status" >&5
++  echo "$as_me:21145: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -21152,7 +21154,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21155: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:21157: 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
+@@ -21167,13 +21169,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:21170: checking for an ANSI C-conforming const" >&5
++echo "$as_me:21172: 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 21176 "configure"
++#line 21178 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21235,16 +21237,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21238: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21240: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21241: \$? = $ac_status" >&5
++  echo "$as_me:21243: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21244: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21246: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21247: \$? = $ac_status" >&5
++  echo "$as_me:21249: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -21254,7 +21256,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21257: result: $ac_cv_c_const" >&5
++echo "$as_me:21259: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -21264,7 +21266,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21267: checking for inline" >&5
++echo "$as_me:21269: 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
+@@ -21272,7 +21274,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21275 "configure"
++#line 21277 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo (void) {return 0; }
+@@ -21281,16 +21283,16 @@
+ 
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21284: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21286: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21287: \$? = $ac_status" >&5
++  echo "$as_me:21289: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21290: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21292: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21293: \$? = $ac_status" >&5
++  echo "$as_me:21295: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -21301,7 +21303,7 @@
+ done
+ 
+ fi
+-echo "$as_me:21304: result: $ac_cv_c_inline" >&5
++echo "$as_me:21306: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -21327,7 +21329,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:21330: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:21332: 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
+@@ -21336,7 +21338,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21339 "configure"
++#line 21341 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -21348,16 +21350,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21351: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21353: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21354: \$? = $ac_status" >&5
++  echo "$as_me:21356: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21357: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21359: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21360: \$? = $ac_status" >&5
++  echo "$as_me:21362: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -21369,7 +21371,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:21372: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:21374: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -21475,7 +21477,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:21478: checking for signal global datatype" >&5
++echo "$as_me:21480: 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
+@@ -21487,7 +21489,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21490 "configure"
++#line 21492 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21511,16 +21513,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21514: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21516: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21517: \$? = $ac_status" >&5
++  echo "$as_me:21519: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21520: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21522: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21523: \$? = $ac_status" >&5
++  echo "$as_me:21525: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21534,7 +21536,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21537: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21539: 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:21548: 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
+@@ -21553,7 +21555,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21556 "configure"
++#line 21558 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21588,15 +21590,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21591: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21593: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21594: \$? = $ac_status" >&5
++  echo "$as_me:21596: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21596: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21598: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21599: \$? = $ac_status" >&5
++  echo "$as_me:21601: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21611,7 +21613,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21614: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21616: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:21628: 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 21633 "configure"
++#line 21635 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21642,16 +21644,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21645: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21647: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21648: \$? = $ac_status" >&5
++  echo "$as_me:21650: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21651: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21653: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21654: \$? = $ac_status" >&5
++  echo "$as_me:21656: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -21663,7 +21665,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21666: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21668: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -21679,14 +21681,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:21682: checking if external errno is declared" >&5
++echo "$as_me:21684: 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 21689 "configure"
++#line 21691 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21700,16 +21702,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21703: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21705: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21706: \$? = $ac_status" >&5
++  echo "$as_me:21708: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21709: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21711: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21712: \$? = $ac_status" >&5
++  echo "$as_me:21714: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -21720,7 +21722,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21723: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21725: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21735,14 +21737,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:21738: checking if external errno exists" >&5
++echo "$as_me:21740: 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 21745 "configure"
++#line 21747 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -21757,16 +21759,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21760: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21762: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21763: \$? = $ac_status" >&5
++  echo "$as_me:21765: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21766: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21768: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21769: \$? = $ac_status" >&5
++  echo "$as_me:21771: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -21777,7 +21779,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21780: result: $cf_cv_have_errno" >&5
++echo "$as_me:21782: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21790,7 +21792,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21793: checking if data-only library module links" >&5
++echo "$as_me:21795: 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
+@@ -21798,20 +21800,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:21806: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21807: \$? = $ac_status" >&5
++  echo "$as_me:21809: \$? = $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:21833: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21834: \$? = $ac_status" >&5
++  echo "$as_me:21836: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -21844,7 +21846,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21847 "configure"
++#line 21849 "configure"
+ #include "confdefs.h"
+ 
+ 	extern int testfunc(void);
+@@ -21855,15 +21857,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21858: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21860: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21861: \$? = $ac_status" >&5
++  echo "$as_me:21863: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21863: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21865: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21866: \$? = $ac_status" >&5
++  echo "$as_me:21868: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -21878,7 +21880,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21881: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21883: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21893,13 +21895,13 @@
+ ###	Checks for library functions.
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:21896: checking for clock_gettime" >&5
++echo "$as_me:21898: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21902 "configure"
++#line 21904 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21930,16 +21932,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21933: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21935: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21936: \$? = $ac_status" >&5
++  echo "$as_me:21938: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21939: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21941: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21942: \$? = $ac_status" >&5
++  echo "$as_me:21944: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -21949,12 +21951,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21952: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:21954: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:21957: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:21959: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21962,7 +21964,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21965 "configure"
++#line 21967 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21981,16 +21983,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21984: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21986: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21987: \$? = $ac_status" >&5
++  echo "$as_me:21989: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21990: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21992: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21993: \$? = $ac_status" >&5
++  echo "$as_me:21995: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -22001,7 +22003,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22004: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:22006: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -22013,14 +22015,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:22016: checking if clock_gettime links" >&5
++echo "$as_me:22018: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22023 "configure"
++#line 22025 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22038,16 +22040,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22041: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22043: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22044: \$? = $ac_status" >&5
++  echo "$as_me:22046: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22047: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22049: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22050: \$? = $ac_status" >&5
++  echo "$as_me:22052: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -22058,7 +22060,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22061: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:22063: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -22072,13 +22074,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:22075: checking for gettimeofday" >&5
++echo "$as_me:22077: 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 22081 "configure"
++#line 22083 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22109,16 +22111,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22112: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22114: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22115: \$? = $ac_status" >&5
++  echo "$as_me:22117: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22118: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22120: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22121: \$? = $ac_status" >&5
++  echo "$as_me:22123: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -22128,7 +22130,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22131: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:22133: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -22138,7 +22140,7 @@
+ 
+ else
+ 
+-echo "$as_me:22141: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:22143: 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
+@@ -22146,7 +22148,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22149 "configure"
++#line 22151 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22165,16 +22167,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22168: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22170: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22171: \$? = $ac_status" >&5
++  echo "$as_me:22173: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22174: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22176: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22177: \$? = $ac_status" >&5
++  echo "$as_me:22179: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -22185,7 +22187,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22188: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:22190: 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
+ 
+@@ -22244,13 +22246,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:22247: checking for $ac_func" >&5
++echo "$as_me:22249: 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 22253 "configure"
++#line 22255 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22281,16 +22283,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22284: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22286: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22287: \$? = $ac_status" >&5
++  echo "$as_me:22289: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22290: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22292: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22293: \$? = $ac_status" >&5
++  echo "$as_me:22295: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -22300,7 +22302,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22303: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:22305: 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:22315: 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 22320 "configure"
++#line 22322 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22332,16 +22334,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22335: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22337: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22338: \$? = $ac_status" >&5
++  echo "$as_me:22340: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22341: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22343: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22344: \$? = $ac_status" >&5
++  echo "$as_me:22346: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_PATH_TTYS=yes
+ else
+@@ -22351,7 +22353,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22354: result: $cf_cv_PATH_TTYS" >&5
++echo "$as_me:22356: result: $cf_cv_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
+ 
+ if test $cf_cv_PATH_TTYS = no
+@@ -22373,7 +22375,7 @@
+ 
+ if test $cf_cv_PATH_TTYS != no
+ then
+-	echo "$as_me:22376: checking if _PATH_TTYS file exists" >&5
++	echo "$as_me:22378: 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
+@@ -22383,7 +22385,7 @@
+   cf_cv_have_PATH_TTYS=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22386 "configure"
++#line 22388 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22396,15 +22398,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22399: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22401: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22402: \$? = $ac_status" >&5
++  echo "$as_me:22404: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22404: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22406: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22407: \$? = $ac_status" >&5
++  echo "$as_me:22409: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_PATH_TTYS=yes
+ else
+@@ -22416,7 +22418,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22419: result: $cf_cv_have_PATH_TTYS" >&5
++echo "$as_me:22421: 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
+@@ -22428,14 +22430,14 @@
+ #define HAVE_PATH_TTYS 1
+ EOF
+ 
+-	echo "$as_me:22431: checking for getttynam" >&5
++	echo "$as_me:22433: 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 22438 "configure"
++#line 22440 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22447,16 +22449,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22450: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22452: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22453: \$? = $ac_status" >&5
++  echo "$as_me:22455: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22456: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22458: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22459: \$? = $ac_status" >&5
++  echo "$as_me:22461: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_getttynam=yes
+ else
+@@ -22466,7 +22468,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22469: result: $cf_cv_func_getttynam" >&5
++echo "$as_me:22471: 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
+@@ -22476,7 +22478,7 @@
+ 
+ if test "x$ac_cv_func_getopt" = xno && \
+    test "x$cf_with_progs$cf_with_tests" != xnono; then
+-	{ { echo "$as_me:22479: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:22481: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -22485,7 +22487,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:22488: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:22490: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -22498,14 +22500,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:22501: checking for terminal-capability database functions" >&5
++echo "$as_me:22503: 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 22508 "configure"
++#line 22510 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22525,16 +22527,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22528: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22530: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22531: \$? = $ac_status" >&5
++  echo "$as_me:22533: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22534: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22536: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22537: \$? = $ac_status" >&5
++  echo "$as_me:22539: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -22545,7 +22547,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22548: result: $cf_cv_cgetent" >&5
++echo "$as_me:22550: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -22555,14 +22557,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:22558: checking if cgetent uses const parameter" >&5
++echo "$as_me:22560: 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 22565 "configure"
++#line 22567 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -22585,16 +22587,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22588: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22590: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22591: \$? = $ac_status" >&5
++  echo "$as_me:22593: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22594: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22596: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22597: \$? = $ac_status" >&5
++  echo "$as_me:22599: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -22605,7 +22607,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22608: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:22610: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -22619,14 +22621,14 @@
+ 
+ fi
+ 
+-echo "$as_me:22622: checking for isascii" >&5
++echo "$as_me:22624: 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 22629 "configure"
++#line 22631 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22638,16 +22640,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22641: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22643: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22644: \$? = $ac_status" >&5
++  echo "$as_me:22646: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22647: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22649: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22650: \$? = $ac_status" >&5
++  echo "$as_me:22652: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -22658,7 +22660,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22661: result: $cf_cv_have_isascii" >&5
++echo "$as_me:22663: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -22666,10 +22668,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:22669: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:22671: 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 22672 "configure"
++#line 22674 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22683,16 +22685,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22686: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22688: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22689: \$? = $ac_status" >&5
++  echo "$as_me:22691: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22692: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22694: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22695: \$? = $ac_status" >&5
++  echo "$as_me:22697: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=no
+ else
+@@ -22700,7 +22702,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22703 "configure"
++#line 22705 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22715,16 +22717,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22718: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22720: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22721: \$? = $ac_status" >&5
++  echo "$as_me:22723: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22724: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22726: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22727: \$? = $ac_status" >&5
++  echo "$as_me:22729: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=yes
+ 
+@@ -22740,11 +22742,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:22743: result: $sigact_bad" >&5
++echo "$as_me:22745: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:22747: checking if nanosleep really works" >&5
++echo "$as_me:22749: 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
+@@ -22754,7 +22756,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22757 "configure"
++#line 22759 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22780,15 +22782,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22783: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22785: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22786: \$? = $ac_status" >&5
++  echo "$as_me:22788: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22788: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22790: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22791: \$? = $ac_status" >&5
++  echo "$as_me:22793: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -22800,7 +22802,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22803: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:22805: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -22817,23 +22819,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22820: checking for $ac_header" >&5
++echo "$as_me:22822: 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 22826 "configure"
++#line 22828 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22830: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22832: \"$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:22836: \$? = $ac_status" >&5
++  echo "$as_me:22838: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22852,7 +22854,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22855: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22857: 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:22874: 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 22875 "configure"
++#line 22877 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22884,16 +22886,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22887: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22889: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22890: \$? = $ac_status" >&5
++  echo "$as_me:22892: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22893: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22895: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22896: \$? = $ac_status" >&5
++  echo "$as_me:22898: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=no
+ else
+@@ -22901,7 +22903,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22904 "configure"
++#line 22906 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22915,16 +22917,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22918: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22920: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22921: \$? = $ac_status" >&5
++  echo "$as_me:22923: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22924: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22926: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22927: \$? = $ac_status" >&5
++  echo "$as_me:22929: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=unknown
+ else
+@@ -22940,19 +22942,19 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:22943: result: $termios_bad" >&5
++	echo "$as_me:22945: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:22948: checking for tcgetattr" >&5
++echo "$as_me:22950: 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 22955 "configure"
++#line 22957 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22980,16 +22982,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22983: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22985: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22986: \$? = $ac_status" >&5
++  echo "$as_me:22988: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22989: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22991: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22992: \$? = $ac_status" >&5
++  echo "$as_me:22994: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -22999,21 +23001,21 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23002: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:23004: 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:23009: checking for vsscanf function or workaround" >&5
++echo "$as_me:23011: 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 23016 "configure"
++#line 23018 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23039,16 +23041,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23042: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23044: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23045: \$? = $ac_status" >&5
++  echo "$as_me:23047: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23048: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23050: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23051: \$? = $ac_status" >&5
++  echo "$as_me:23053: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -23056,7 +23058,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23059 "configure"
++#line 23061 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23078,16 +23080,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23081: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23083: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23084: \$? = $ac_status" >&5
++  echo "$as_me:23086: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23087: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23089: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23090: \$? = $ac_status" >&5
++  echo "$as_me:23092: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -23095,7 +23097,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23098 "configure"
++#line 23100 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23117,16 +23119,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23120: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23122: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23123: \$? = $ac_status" >&5
++  echo "$as_me:23125: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23126: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23128: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23129: \$? = $ac_status" >&5
++  echo "$as_me:23131: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -23141,7 +23143,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23144: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:23146: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case "$cf_cv_func_vsscanf" in
+@@ -23167,23 +23169,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:23170: checking for $ac_header" >&5
++echo "$as_me:23172: 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 23176 "configure"
++#line 23178 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23180: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23182: \"$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:23186: \$? = $ac_status" >&5
++  echo "$as_me:23188: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23202,7 +23204,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23205: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23207: 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:23217: 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
+@@ -23223,7 +23225,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23226 "configure"
++#line 23228 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23258,15 +23260,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23261: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23263: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23264: \$? = $ac_status" >&5
++  echo "$as_me:23266: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23266: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23268: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23269: \$? = $ac_status" >&5
++  echo "$as_me:23271: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -23281,16 +23283,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:23284: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:23286: 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:23287: checking for mkstemp" >&5
++	echo "$as_me:23289: 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 23293 "configure"
++#line 23295 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23321,16 +23323,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23324: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23326: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23327: \$? = $ac_status" >&5
++  echo "$as_me:23329: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23330: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23332: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23333: \$? = $ac_status" >&5
++  echo "$as_me:23335: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -23340,7 +23342,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23343: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:23345: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -23361,21 +23363,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:23364: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:23366: 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:23367: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:23369: 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:23373: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:23375: 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 23378 "configure"
++#line 23380 "configure"
+ #include "confdefs.h"
+ #include 
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -23392,15 +23394,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23395: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23397: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23398: \$? = $ac_status" >&5
++  echo "$as_me:23400: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23400: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23402: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23403: \$? = $ac_status" >&5
++  echo "$as_me:23405: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -23413,7 +23415,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:23416: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:23418: 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
+ 
+@@ -23424,13 +23426,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:23427: checking for intptr_t" >&5
++echo "$as_me:23429: 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 23433 "configure"
++#line 23435 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23445,16 +23447,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23448: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23450: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23451: \$? = $ac_status" >&5
++  echo "$as_me:23453: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23454: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23456: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23457: \$? = $ac_status" >&5
++  echo "$as_me:23459: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -23464,7 +23466,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23467: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:23469: 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
+   :
+@@ -23476,13 +23478,13 @@
+ 
+ fi
+ 
+-echo "$as_me:23479: checking for ssize_t" >&5
++echo "$as_me:23481: 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 23485 "configure"
++#line 23487 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23497,16 +23499,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23500: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23502: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23503: \$? = $ac_status" >&5
++  echo "$as_me:23505: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23506: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23508: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23509: \$? = $ac_status" >&5
++  echo "$as_me:23511: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -23516,7 +23518,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23519: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:23521: 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
+   :
+@@ -23528,14 +23530,14 @@
+ 
+ fi
+ 
+-echo "$as_me:23531: checking for type sigaction_t" >&5
++echo "$as_me:23533: 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 23538 "configure"
++#line 23540 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23548,16 +23550,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23551: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23553: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23554: \$? = $ac_status" >&5
++  echo "$as_me:23556: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23557: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23559: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23560: \$? = $ac_status" >&5
++  echo "$as_me:23562: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -23568,14 +23570,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:23571: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:23573: 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:23578: checking declaration of size-change" >&5
++echo "$as_me:23580: 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
+@@ -23596,7 +23598,7 @@
+ 
+ 	fi
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23599 "configure"
++#line 23601 "configure"
+ #include "confdefs.h"
+ #include 
+ #ifdef HAVE_TERMIOS_H
+@@ -23646,16 +23648,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23649: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23651: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23652: \$? = $ac_status" >&5
++  echo "$as_me:23654: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23655: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23657: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23658: \$? = $ac_status" >&5
++  echo "$as_me:23660: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -23674,7 +23676,7 @@
+ done
+ 
+ fi
+-echo "$as_me:23677: result: $cf_cv_sizechange" >&5
++echo "$as_me:23679: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -23692,13 +23694,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:23695: checking for memmove" >&5
++echo "$as_me:23697: 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 23701 "configure"
++#line 23703 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23729,16 +23731,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23732: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23734: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23735: \$? = $ac_status" >&5
++  echo "$as_me:23737: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23738: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23740: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23741: \$? = $ac_status" >&5
++  echo "$as_me:23743: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -23748,19 +23750,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23751: result: $ac_cv_func_memmove" >&5
++echo "$as_me:23753: 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:23757: checking for bcopy" >&5
++echo "$as_me:23759: 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 23763 "configure"
++#line 23765 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23791,16 +23793,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23794: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23796: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23797: \$? = $ac_status" >&5
++  echo "$as_me:23799: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23800: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23802: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23803: \$? = $ac_status" >&5
++  echo "$as_me:23805: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -23810,11 +23812,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23813: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:23815: 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:23817: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:23819: 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
+@@ -23824,7 +23826,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23827 "configure"
++#line 23829 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23840,15 +23842,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23843: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23845: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23846: \$? = $ac_status" >&5
++  echo "$as_me:23848: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23848: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23850: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23851: \$? = $ac_status" >&5
++  echo "$as_me:23853: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -23861,7 +23863,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:23864: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:23866: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -23888,13 +23890,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23891: checking for $ac_func" >&5
++echo "$as_me:23893: 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 23897 "configure"
++#line 23899 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23925,16 +23927,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23928: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23930: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23931: \$? = $ac_status" >&5
++  echo "$as_me:23933: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23934: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23936: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23937: \$? = $ac_status" >&5
++  echo "$as_me:23939: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23944,7 +23946,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23947: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23949: 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:23959: 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
+@@ -23964,7 +23966,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23967 "configure"
++#line 23969 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24017,15 +24019,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24020: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24022: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24023: \$? = $ac_status" >&5
++  echo "$as_me:24025: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24025: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24027: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24028: \$? = $ac_status" >&5
++  echo "$as_me:24030: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -24037,21 +24039,21 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24040: result: $cf_cv_working_poll" >&5
++echo "$as_me:24042: 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:24047: checking if MB_LEN_MAX is usable" >&5
++echo "$as_me:24049: checking if MB_LEN_MAX is usable" >&5
+ echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
+ if test "${cf_cv_mb_len_max+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24054 "configure"
++#line 24056 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24071,16 +24073,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24074: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24076: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24077: \$? = $ac_status" >&5
++  echo "$as_me:24079: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24080: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24082: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24083: \$? = $ac_status" >&5
++  echo "$as_me:24085: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mb_len_max=yes
+ else
+@@ -24090,7 +24092,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24093: result: $cf_cv_mb_len_max" >&5
++echo "$as_me:24095: result: $cf_cv_mb_len_max" >&5
+ echo "${ECHO_T}$cf_cv_mb_len_max" >&6
+ if test "$cf_cv_mb_len_max" = yes
+ then
+@@ -24100,18 +24102,18 @@
+ EOF
+ 
+ else
+-	{ echo "$as_me:24103: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
++	{ echo "$as_me:24105: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+ echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
+ fi
+ 
+-echo "$as_me:24107: checking for va_copy" >&5
++echo "$as_me:24109: 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 24114 "configure"
++#line 24116 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24128,16 +24130,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24131: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24133: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24134: \$? = $ac_status" >&5
++  echo "$as_me:24136: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24137: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24139: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24140: \$? = $ac_status" >&5
++  echo "$as_me:24142: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -24147,7 +24149,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24150: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:24152: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -24159,14 +24161,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:24162: checking for __va_copy" >&5
++echo "$as_me:24164: 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 24169 "configure"
++#line 24171 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24183,16 +24185,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24186: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24188: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24189: \$? = $ac_status" >&5
++  echo "$as_me:24191: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24192: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24194: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24195: \$? = $ac_status" >&5
++  echo "$as_me:24197: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -24202,7 +24204,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24205: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:24207: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -24214,14 +24216,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:24217: checking for __builtin_va_copy" >&5
++echo "$as_me:24219: 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 24224 "configure"
++#line 24226 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24238,16 +24240,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24241: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24243: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24244: \$? = $ac_status" >&5
++  echo "$as_me:24246: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24247: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24249: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24250: \$? = $ac_status" >&5
++  echo "$as_me:24252: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -24257,7 +24259,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24260: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:24262: 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 &&
+@@ -24275,14 +24277,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:24278: checking if we can simply copy va_list" >&5
++	echo "$as_me:24280: 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 24285 "configure"
++#line 24287 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24299,16 +24301,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24302: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24304: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24305: \$? = $ac_status" >&5
++  echo "$as_me:24307: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24308: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24310: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24311: \$? = $ac_status" >&5
++  echo "$as_me:24313: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -24318,19 +24320,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24321: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:24323: 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:24326: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:24328: 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 24333 "configure"
++#line 24335 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24347,16 +24349,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24350: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24352: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24353: \$? = $ac_status" >&5
++  echo "$as_me:24355: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24356: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24358: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24359: \$? = $ac_status" >&5
++  echo "$as_me:24361: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -24366,7 +24368,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24369: result: $cf_cv_array_va_list" >&5
++echo "$as_me:24371: 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
+@@ -24377,13 +24379,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:24380: checking for pid_t" >&5
++echo "$as_me:24382: 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 24386 "configure"
++#line 24388 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24398,16 +24400,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24401: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24403: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24404: \$? = $ac_status" >&5
++  echo "$as_me:24406: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24407: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24409: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24410: \$? = $ac_status" >&5
++  echo "$as_me:24412: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -24417,7 +24419,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24420: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:24422: 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
+   :
+@@ -24432,23 +24434,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:24435: checking for $ac_header" >&5
++echo "$as_me:24437: 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 24441 "configure"
++#line 24443 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:24445: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:24447: \"$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:24451: \$? = $ac_status" >&5
++  echo "$as_me:24453: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -24467,7 +24469,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24470: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:24472: 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:24485: 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 24489 "configure"
++#line 24491 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -24517,16 +24519,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24520: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24522: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24523: \$? = $ac_status" >&5
++  echo "$as_me:24525: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24526: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24528: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24529: \$? = $ac_status" >&5
++  echo "$as_me:24531: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -24536,7 +24538,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24539: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:24541: 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:24553: 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
+@@ -24571,15 +24573,15 @@
+       }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24574: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24576: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24577: \$? = $ac_status" >&5
++  echo "$as_me:24579: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24579: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24581: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24582: \$? = $ac_status" >&5
++  echo "$as_me:24584: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -24591,7 +24593,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24594: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:24596: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -24605,12 +24607,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:24608: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24610: 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:24613: checking for working vfork" >&5
++  echo "$as_me:24615: 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
+@@ -24619,7 +24621,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24622 "configure"
++#line 24624 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include 
+@@ -24712,15 +24714,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24715: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24717: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24718: \$? = $ac_status" >&5
++  echo "$as_me:24720: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24720: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24722: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24723: \$? = $ac_status" >&5
++  echo "$as_me:24725: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -24732,13 +24734,13 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24735: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:24737: 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:24741: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24743: 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
+ 
+@@ -24763,7 +24765,7 @@
+ 
+ fi
+ 
+-echo "$as_me:24766: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:24768: 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
+@@ -24773,7 +24775,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24776 "configure"
++#line 24778 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24808,15 +24810,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24811: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24813: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24814: \$? = $ac_status" >&5
++  echo "$as_me:24816: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24816: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24818: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24819: \$? = $ac_status" >&5
++  echo "$as_me:24821: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fopen_bin_r=yes
+ else
+@@ -24829,20 +24831,20 @@
+ fi
+ 
+ fi
+-echo "$as_me:24832: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:24834: 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
+ #define USE_FOPEN_BIN_R 1
+ EOF
+ 
+-	echo "$as_me:24839: checking for cc_t" >&5
++	echo "$as_me:24841: checking for cc_t" >&5
+ echo $ECHO_N "checking for cc_t... $ECHO_C" >&6
+ if test "${ac_cv_type_cc_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24845 "configure"
++#line 24847 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24860,16 +24862,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24863: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24865: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24866: \$? = $ac_status" >&5
++  echo "$as_me:24868: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24869: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24871: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24872: \$? = $ac_status" >&5
++  echo "$as_me:24874: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_cc_t=yes
+ else
+@@ -24879,7 +24881,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24882: result: $ac_cv_type_cc_t" >&5
++echo "$as_me:24884: result: $ac_cv_type_cc_t" >&5
+ echo "${ECHO_T}$ac_cv_type_cc_t" >&6
+ if test "$ac_cv_type_cc_t" = yes; then
+ 
+@@ -24889,13 +24891,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:24892: checking for speed_t" >&5
++	echo "$as_me:24894: checking for speed_t" >&5
+ echo $ECHO_N "checking for speed_t... $ECHO_C" >&6
+ if test "${ac_cv_type_speed_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24898 "configure"
++#line 24900 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24913,16 +24915,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24916: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24918: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24919: \$? = $ac_status" >&5
++  echo "$as_me:24921: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24922: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24924: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24925: \$? = $ac_status" >&5
++  echo "$as_me:24927: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_speed_t=yes
+ else
+@@ -24932,7 +24934,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24935: result: $ac_cv_type_speed_t" >&5
++echo "$as_me:24937: result: $ac_cv_type_speed_t" >&5
+ echo "${ECHO_T}$ac_cv_type_speed_t" >&6
+ if test "$ac_cv_type_speed_t" = yes; then
+ 
+@@ -24942,13 +24944,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:24945: checking for tcflag_t" >&5
++	echo "$as_me:24947: checking for tcflag_t" >&5
+ echo $ECHO_N "checking for tcflag_t... $ECHO_C" >&6
+ if test "${ac_cv_type_tcflag_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24951 "configure"
++#line 24953 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24966,16 +24968,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24969: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24971: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24972: \$? = $ac_status" >&5
++  echo "$as_me:24974: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24975: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24977: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24978: \$? = $ac_status" >&5
++  echo "$as_me:24980: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_tcflag_t=yes
+ else
+@@ -24985,7 +24987,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24988: result: $ac_cv_type_tcflag_t" >&5
++echo "$as_me:24990: result: $ac_cv_type_tcflag_t" >&5
+ echo "${ECHO_T}$ac_cv_type_tcflag_t" >&6
+ if test "$ac_cv_type_tcflag_t" = yes; then
+ 
+@@ -24995,13 +24997,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:24998: checking for sigset_t" >&5
++	echo "$as_me:25000: checking for sigset_t" >&5
+ echo $ECHO_N "checking for sigset_t... $ECHO_C" >&6
+ if test "${ac_cv_type_sigset_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25004 "configure"
++#line 25006 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25019,16 +25021,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25022: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25024: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25025: \$? = $ac_status" >&5
++  echo "$as_me:25027: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25028: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25030: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25031: \$? = $ac_status" >&5
++  echo "$as_me:25033: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_sigset_t=yes
+ else
+@@ -25038,7 +25040,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:25041: result: $ac_cv_type_sigset_t" >&5
++echo "$as_me:25043: result: $ac_cv_type_sigset_t" >&5
+ echo "${ECHO_T}$ac_cv_type_sigset_t" >&6
+ if test "$ac_cv_type_sigset_t" = yes; then
+ 
+@@ -25050,7 +25052,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:25053: checking for openpty in -lutil" >&5
++echo "$as_me:25055: 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
+@@ -25058,7 +25060,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25061 "configure"
++#line 25063 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -25077,16 +25079,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25080: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25082: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25083: \$? = $ac_status" >&5
++  echo "$as_me:25085: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25086: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25088: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25089: \$? = $ac_status" >&5
++  echo "$as_me:25091: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -25097,7 +25099,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:25100: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:25102: 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
+@@ -25105,7 +25107,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:25108: checking for openpty header" >&5
++echo "$as_me:25110: 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
+@@ -25132,7 +25134,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25135 "configure"
++#line 25137 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -25150,16 +25152,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25153: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25155: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25156: \$? = $ac_status" >&5
++  echo "$as_me:25158: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25159: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25161: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25162: \$? = $ac_status" >&5
++  echo "$as_me:25164: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -25177,7 +25179,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:25180: result: $cf_cv_func_openpty" >&5
++echo "$as_me:25182: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -25250,7 +25252,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25253 "configure"
++#line 25255 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -25262,16 +25264,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25265: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25267: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25268: \$? = $ac_status" >&5
++  echo "$as_me:25270: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25271: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25273: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25274: \$? = $ac_status" >&5
++  echo "$as_me:25276: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25288,7 +25290,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}:25291: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25293: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25324,7 +25326,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}:25327: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25329: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25335,7 +25337,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:25338: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:25340: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -25407,7 +25409,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25410 "configure"
++#line 25412 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -25419,16 +25421,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25422: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25424: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25425: \$? = $ac_status" >&5
++  echo "$as_me:25427: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25428: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25430: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25431: \$? = $ac_status" >&5
++  echo "$as_me:25433: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25445,7 +25447,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}:25448: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25450: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25525,7 +25527,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}:25528: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25530: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25542,23 +25544,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:25545: checking for db.h" >&5
++echo "$as_me:25547: 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 25551 "configure"
++#line 25553 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:25555: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25557: \"$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:25561: \$? = $ac_status" >&5
++  echo "$as_me:25563: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -25577,11 +25579,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25580: result: $ac_cv_header_db_h" >&5
++echo "$as_me:25582: 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:25584: checking for version of db" >&5
++echo "$as_me:25586: 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
+@@ -25592,10 +25594,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:25595: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:25597: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25598 "configure"
++#line 25600 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25625,16 +25627,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25628: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25630: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25631: \$? = $ac_status" >&5
++  echo "$as_me:25633: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25634: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25636: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25637: \$? = $ac_status" >&5
++  echo "$as_me:25639: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -25648,16 +25650,16 @@
+ done
+ 
+ fi
+-echo "$as_me:25651: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:25653: 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:25655: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:25657: 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:25660: checking for db libraries" >&5
++echo "$as_me:25662: 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
+@@ -25687,10 +25689,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:25690: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:25692: testing checking for library $cf_db_libs ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25693 "configure"
++#line 25695 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25745,16 +25747,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25748: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25750: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25751: \$? = $ac_status" >&5
++  echo "$as_me:25753: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25754: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25756: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25757: \$? = $ac_status" >&5
++  echo "$as_me:25759: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -25774,11 +25776,11 @@
+ done
+ 
+ fi
+-echo "$as_me:25777: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:25779: 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:25781: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:25783: 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
+@@ -25804,7 +25806,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:25807: error: Cannot find db.h" >&5
++	{ { echo "$as_me:25809: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -25819,7 +25821,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:25822: checking if we should include stdbool.h" >&5
++echo "$as_me:25824: 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
+@@ -25827,7 +25829,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25830 "configure"
++#line 25832 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -25843,23 +25845,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25846: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25848: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25849: \$? = $ac_status" >&5
++  echo "$as_me:25851: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25852: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25854: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25855: \$? = $ac_status" >&5
++  echo "$as_me:25857: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25862 "configure"
++#line 25864 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -25871,16 +25873,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25874: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25876: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25877: \$? = $ac_status" >&5
++  echo "$as_me:25879: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25880: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25882: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25883: \$? = $ac_status" >&5
++  echo "$as_me:25885: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=0
+ else
+@@ -25893,13 +25895,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:25896: result: yes" >&5
++then	echo "$as_me:25898: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25898: result: no" >&5
++else	echo "$as_me:25900: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:25902: checking for builtin bool type" >&5
++echo "$as_me:25904: 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
+@@ -25907,7 +25909,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25910 "configure"
++#line 25912 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25922,16 +25924,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25925: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25927: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25928: \$? = $ac_status" >&5
++  echo "$as_me:25930: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25931: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25933: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25934: \$? = $ac_status" >&5
++  echo "$as_me:25936: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -25943,9 +25945,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:25946: result: yes" >&5
++then	echo "$as_me:25948: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25948: result: no" >&5
++else	echo "$as_me:25950: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -25962,10 +25964,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:25965: checking if we already have C++ library" >&5
++	echo "$as_me:25967: 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 25968 "configure"
++#line 25970 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -25979,16 +25981,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25982: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25984: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25985: \$? = $ac_status" >&5
++  echo "$as_me:25987: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25988: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25990: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25991: \$? = $ac_status" >&5
++  echo "$as_me:25993: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -25997,7 +25999,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-	echo "$as_me:26000: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:26002: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -26016,7 +26018,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:26019: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:26021: 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
+@@ -26042,7 +26044,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26045 "configure"
++#line 26047 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -26056,16 +26058,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26059: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26061: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26062: \$? = $ac_status" >&5
++  echo "$as_me:26064: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26065: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26067: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26068: \$? = $ac_status" >&5
++  echo "$as_me:26070: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -26077,7 +26079,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:26080: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:26082: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -26099,7 +26101,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:26102: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:26104: 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
+@@ -26114,15 +26116,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:26117: \"$ac_try\"") >&5
++if { (eval echo "$as_me:26119: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26120: \$? = $ac_status" >&5
++  echo "$as_me:26122: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:26122: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:26124: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26125: \$? = $ac_status" >&5
++  echo "$as_me:26127: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -26133,10 +26135,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+-  echo "$as_me:26136: result: yes" >&5
++  echo "$as_me:26138: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:26139: result: no" >&5
++  echo "$as_me:26141: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -26156,7 +26158,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:26159: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:26161: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -26177,7 +26179,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26180 "configure"
++#line 26182 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -26191,16 +26193,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26194: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26196: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26197: \$? = $ac_status" >&5
++  echo "$as_me:26199: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26200: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26202: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26203: \$? = $ac_status" >&5
++  echo "$as_me:26205: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -26237,7 +26239,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26240 "configure"
++#line 26242 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26251,16 +26253,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26254: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26256: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26257: \$? = $ac_status" >&5
++  echo "$as_me:26259: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26260: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26262: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26263: \$? = $ac_status" >&5
++  echo "$as_me:26265: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -26293,7 +26295,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	LIBS="$cf_save"
+-	echo "$as_me:26296: result: $cf_cxx_library" >&5
++	echo "$as_me:26298: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -26309,7 +26311,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:26312: checking how to run the C++ preprocessor" >&5
++echo "$as_me:26314: 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
+@@ -26326,18 +26328,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 26329 "configure"
++#line 26331 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26334: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26336: \"$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:26340: \$? = $ac_status" >&5
++  echo "$as_me:26342: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26360,17 +26362,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26363 "configure"
++#line 26365 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26367: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26369: \"$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:26373: \$? = $ac_status" >&5
++  echo "$as_me:26375: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26407,7 +26409,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:26410: result: $CXXCPP" >&5
++echo "$as_me:26412: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -26417,18 +26419,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 26420 "configure"
++#line 26422 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26425: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26427: \"$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:26431: \$? = $ac_status" >&5
++  echo "$as_me:26433: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26451,17 +26453,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26454 "configure"
++#line 26456 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26458: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26460: \"$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:26464: \$? = $ac_status" >&5
++  echo "$as_me:26466: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26489,7 +26491,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:26492: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:26494: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -26504,23 +26506,23 @@
+ for ac_header in new exception typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:26507: checking for $ac_header" >&5
++echo "$as_me:26509: 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 26513 "configure"
++#line 26515 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26517: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26519: \"$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:26523: \$? = $ac_status" >&5
++  echo "$as_me:26525: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26539,7 +26541,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26542: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26544: 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:26557: 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 26561 "configure"
++#line 26563 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26565: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26567: \"$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:26571: \$? = $ac_status" >&5
++  echo "$as_me:26573: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26587,7 +26589,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26590: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26592: 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:26603: 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 26604 "configure"
++#line 26606 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26618,16 +26620,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26621: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26623: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26624: \$? = $ac_status" >&5
++  echo "$as_me:26626: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26627: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26629: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26630: \$? = $ac_status" >&5
++  echo "$as_me:26632: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -26636,7 +26638,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:26639: result: $cf_iostream_namespace" >&5
++	echo "$as_me:26641: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -26647,7 +26649,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:26650: checking if we should include stdbool.h" >&5
++echo "$as_me:26652: 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
+@@ -26655,7 +26657,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26658 "configure"
++#line 26660 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -26671,23 +26673,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26674: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26676: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26677: \$? = $ac_status" >&5
++  echo "$as_me:26679: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26680: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26682: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26683: \$? = $ac_status" >&5
++  echo "$as_me:26685: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26690 "configure"
++#line 26692 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -26699,16 +26701,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26702: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26704: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26705: \$? = $ac_status" >&5
++  echo "$as_me:26707: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26708: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26710: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26711: \$? = $ac_status" >&5
++  echo "$as_me:26713: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=0
+ else
+@@ -26721,13 +26723,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:26724: result: yes" >&5
++then	echo "$as_me:26726: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:26726: result: no" >&5
++else	echo "$as_me:26728: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:26730: checking for builtin bool type" >&5
++echo "$as_me:26732: 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
+@@ -26735,7 +26737,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26738 "configure"
++#line 26740 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26750,16 +26752,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26753: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26755: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26756: \$? = $ac_status" >&5
++  echo "$as_me:26758: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26759: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26761: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26762: \$? = $ac_status" >&5
++  echo "$as_me:26764: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -26771,19 +26773,19 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:26774: result: yes" >&5
++then	echo "$as_me:26776: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:26776: result: no" >&5
++else	echo "$as_me:26778: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:26780: checking for bool" >&5
++echo "$as_me:26782: 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 26786 "configure"
++#line 26788 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26818,16 +26820,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26821: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26823: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26824: \$? = $ac_status" >&5
++  echo "$as_me:26826: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26827: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26829: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26830: \$? = $ac_status" >&5
++  echo "$as_me:26832: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -26837,10 +26839,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26840: result: $ac_cv_type_bool" >&5
++echo "$as_me:26842: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:26843: checking size of bool" >&5
++echo "$as_me:26845: 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
+@@ -26849,7 +26851,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26852 "configure"
++#line 26854 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26881,21 +26883,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26884: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26886: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26887: \$? = $ac_status" >&5
++  echo "$as_me:26889: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26890: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26892: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26893: \$? = $ac_status" >&5
++  echo "$as_me:26895: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26898 "configure"
++#line 26900 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26927,16 +26929,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26930: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26932: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26933: \$? = $ac_status" >&5
++  echo "$as_me:26935: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26936: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26938: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26939: \$? = $ac_status" >&5
++  echo "$as_me:26941: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -26952,7 +26954,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26955 "configure"
++#line 26957 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26984,16 +26986,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26987: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26989: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26990: \$? = $ac_status" >&5
++  echo "$as_me:26992: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26993: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26995: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26996: \$? = $ac_status" >&5
++  echo "$as_me:26998: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27009,7 +27011,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 27012 "configure"
++#line 27014 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27041,16 +27043,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27044: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27046: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27047: \$? = $ac_status" >&5
++  echo "$as_me:27049: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27050: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27052: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27053: \$? = $ac_status" >&5
++  echo "$as_me:27055: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27063,12 +27065,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27066: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27068: 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 27071 "configure"
++#line 27073 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27104,15 +27106,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27107: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27109: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27110: \$? = $ac_status" >&5
++  echo "$as_me:27112: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27112: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27114: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27115: \$? = $ac_status" >&5
++  echo "$as_me:27117: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27128,13 +27130,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27131: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27133: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27139: 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
+@@ -27153,7 +27155,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27156 "configure"
++#line 27158 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27194,15 +27196,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27197: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27199: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27200: \$? = $ac_status" >&5
++  echo "$as_me:27202: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27202: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27204: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27205: \$? = $ac_status" >&5
++  echo "$as_me:27207: \$? = $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
+@@ -27219,19 +27221,19 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:27222: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:27224: 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:27229: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:27231: 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:27234: checking for special defines needed for etip.h" >&5
++echo "$as_me:27236: 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"
+@@ -27249,7 +27251,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 27252 "configure"
++#line 27254 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -27263,16 +27265,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27266: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27268: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27269: \$? = $ac_status" >&5
++  echo "$as_me:27271: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27272: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27274: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27275: \$? = $ac_status" >&5
++  echo "$as_me:27277: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:27298: result: ${cf_result:-(none)}" >&5
+ echo "${ECHO_T}${cf_result:-(none)}" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27301: checking if $CXX accepts override keyword" >&5
++echo "$as_me:27303: checking if $CXX accepts override keyword" >&5
+ echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
+ if test "${cf_cv_cpp_override+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27315,7 +27317,7 @@
+   cf_cv_cpp_override=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27318 "configure"
++#line 27320 "configure"
+ #include "confdefs.h"
+ 
+ class base
+@@ -27334,15 +27336,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27337: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27339: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27340: \$? = $ac_status" >&5
++  echo "$as_me:27342: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27342: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27344: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27345: \$? = $ac_status" >&5
++  echo "$as_me:27347: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_override=yes
+ else
+@@ -27361,7 +27363,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27364: result: $cf_cv_cpp_override" >&5
++echo "$as_me:27366: result: $cf_cv_cpp_override" >&5
+ echo "${ECHO_T}$cf_cv_cpp_override" >&6
+ fi
+ test "$cf_cv_cpp_override" = yes &&
+@@ -27370,7 +27372,7 @@
+ EOF
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27373: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:27375: 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
+@@ -27387,7 +27389,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27390 "configure"
++#line 27392 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -27406,15 +27408,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27409: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27411: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27412: \$? = $ac_status" >&5
++  echo "$as_me:27414: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27414: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27416: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27417: \$? = $ac_status" >&5
++  echo "$as_me:27419: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -27433,7 +27435,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27436: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:27438: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -27443,7 +27445,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:27446: checking if $CXX accepts static_cast" >&5
++echo "$as_me:27448: 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
+@@ -27457,7 +27459,7 @@
+ ac_main_return="return"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27460 "configure"
++#line 27462 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -27501,16 +27503,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27504: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27506: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27507: \$? = $ac_status" >&5
++  echo "$as_me:27509: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27510: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27512: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27513: \$? = $ac_status" >&5
++  echo "$as_me:27515: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -27528,7 +27530,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27531: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:27533: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -27576,13 +27578,13 @@
+ 		cf_cv_header_stdbool_h=0
+ 	else
+ 
+-echo "$as_me:27579: checking for bool" >&5
++echo "$as_me:27581: 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 27585 "configure"
++#line 27587 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27617,16 +27619,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27620: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27622: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27623: \$? = $ac_status" >&5
++  echo "$as_me:27625: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27626: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27628: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27629: \$? = $ac_status" >&5
++  echo "$as_me:27631: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -27636,10 +27638,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27639: result: $ac_cv_type_bool" >&5
++echo "$as_me:27641: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:27642: checking size of bool" >&5
++echo "$as_me:27644: 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
+@@ -27648,7 +27650,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27651 "configure"
++#line 27653 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27680,21 +27682,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27683: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27685: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27686: \$? = $ac_status" >&5
++  echo "$as_me:27688: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27689: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27691: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27692: \$? = $ac_status" >&5
++  echo "$as_me:27694: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27697 "configure"
++#line 27699 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27726,16 +27728,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27729: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27731: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27732: \$? = $ac_status" >&5
++  echo "$as_me:27734: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27735: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27737: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27738: \$? = $ac_status" >&5
++  echo "$as_me:27740: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -27751,7 +27753,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27754 "configure"
++#line 27756 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27783,16 +27785,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27786: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27788: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27789: \$? = $ac_status" >&5
++  echo "$as_me:27791: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27792: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27794: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27795: \$? = $ac_status" >&5
++  echo "$as_me:27797: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27808,7 +27810,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 27811 "configure"
++#line 27813 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27840,16 +27842,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27843: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27845: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27846: \$? = $ac_status" >&5
++  echo "$as_me:27848: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27849: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27851: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27852: \$? = $ac_status" >&5
++  echo "$as_me:27854: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27862,12 +27864,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27865: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27867: 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 27870 "configure"
++#line 27872 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27903,15 +27905,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27906: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27908: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27909: \$? = $ac_status" >&5
++  echo "$as_me:27911: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27911: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27913: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27914: \$? = $ac_status" >&5
++  echo "$as_me:27916: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27927,13 +27929,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27930: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27932: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27938: 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
+@@ -27952,7 +27954,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27955 "configure"
++#line 27957 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27993,15 +27995,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27996: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27998: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27999: \$? = $ac_status" >&5
++  echo "$as_me:28001: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:28001: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28003: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28004: \$? = $ac_status" >&5
++  echo "$as_me:28006: \$? = $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
+@@ -28018,14 +28020,14 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:28021: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:28023: 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:28028: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:28030: 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
+@@ -28056,7 +28058,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:28059: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:28061: 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
+@@ -28067,7 +28069,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:28070: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:28072: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -28084,10 +28086,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:28087: result: $ADAFLAGS" >&5
++	echo "$as_me:28089: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:28090: checking if GNATPREP supports -T option" >&5
++echo "$as_me:28092: 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
+@@ -28097,11 +28099,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:28100: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:28102: 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:28104: checking if GNAT supports generics" >&5
++echo "$as_me:28106: 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])
+@@ -28111,7 +28113,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:28114: result: $cf_gnat_generics" >&5
++echo "$as_me:28116: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -28123,7 +28125,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:28126: checking if GNAT supports SIGINT" >&5
++echo "$as_me:28128: 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
+@@ -28171,7 +28173,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:28174: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:28176: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -28184,7 +28186,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:28187: checking if GNAT supports project files" >&5
++echo "$as_me:28189: 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]*)
+@@ -28247,15 +28249,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:28250: result: $cf_gnat_projects" >&5
++echo "$as_me:28252: 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:28256: checking if GNAT supports libraries" >&5
++	echo "$as_me:28258: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:28258: result: $cf_gnat_libraries" >&5
++	echo "$as_me:28260: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -28275,7 +28277,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:28278: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:28280: 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
+@@ -28287,7 +28289,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:28290: checking for Ada95 compiler" >&5
++echo "$as_me:28292: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -28298,12 +28300,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:28301: result: $cf_ada_compiler" >&5
++echo "$as_me:28303: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:28306: checking for Ada95 include directory" >&5
++echo "$as_me:28308: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -28337,7 +28339,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28340: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28342: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28346,10 +28348,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:28349: result: $ADA_INCLUDE" >&5
++echo "$as_me:28351: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:28352: checking for Ada95 object directory" >&5
++echo "$as_me:28354: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -28383,7 +28385,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28386: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28388: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28392,10 +28394,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:28395: result: $ADA_OBJECTS" >&5
++echo "$as_me:28397: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:28398: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:28400: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -28416,11 +28418,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:28419: result: $with_ada_sharedlib" >&5
++echo "$as_me:28421: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+-	{ echo "$as_me:28423: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++	{ echo "$as_me:28425: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+ 
+@@ -28438,7 +28440,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:28441: checking for Ada95 curses library name" >&5
++echo "$as_me:28443: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -28454,7 +28456,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28457: result: $ADA_LIBNAME" >&5
++echo "$as_me:28459: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -28465,13 +28467,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:28468: checking for wchar_t" >&5
++	echo "$as_me:28470: 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 28474 "configure"
++#line 28476 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28486,16 +28488,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28489: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28491: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28492: \$? = $ac_status" >&5
++  echo "$as_me:28494: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28495: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28497: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28498: \$? = $ac_status" >&5
++  echo "$as_me:28500: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -28505,10 +28507,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:28508: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:28510: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:28511: checking size of wchar_t" >&5
++echo "$as_me:28513: 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
+@@ -28517,7 +28519,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28520 "configure"
++#line 28522 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28529,21 +28531,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28532: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28534: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28535: \$? = $ac_status" >&5
++  echo "$as_me:28537: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28538: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28540: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28541: \$? = $ac_status" >&5
++  echo "$as_me:28543: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28546 "configure"
++#line 28548 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28555,16 +28557,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28558: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28560: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28561: \$? = $ac_status" >&5
++  echo "$as_me:28563: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28564: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28566: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28567: \$? = $ac_status" >&5
++  echo "$as_me:28569: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -28580,7 +28582,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28583 "configure"
++#line 28585 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28592,16 +28594,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28595: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28597: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28598: \$? = $ac_status" >&5
++  echo "$as_me:28600: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28601: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28603: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28604: \$? = $ac_status" >&5
++  echo "$as_me:28606: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -28617,7 +28619,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 28620 "configure"
++#line 28622 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28629,16 +28631,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28632: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28634: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28635: \$? = $ac_status" >&5
++  echo "$as_me:28637: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28638: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28640: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28641: \$? = $ac_status" >&5
++  echo "$as_me:28643: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -28651,12 +28653,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:28654: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:28656: 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 28659 "configure"
++#line 28661 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28672,15 +28674,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:28675: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28677: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28678: \$? = $ac_status" >&5
++  echo "$as_me:28680: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:28680: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28682: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28683: \$? = $ac_status" >&5
++  echo "$as_me:28685: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -28696,7 +28698,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:28699: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:28701: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&6
+ 
+-echo "${as_me:-configure}:28712: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:28714: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -28727,7 +28729,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:28730: checking for library subsets" >&5
++echo "$as_me:28732: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -28781,7 +28783,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:28784: result: $LIB_SUBSETS" >&5
++echo "$as_me:28786: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -28812,7 +28814,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:28815: checking default library suffix" >&5
++echo "$as_me:28817: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28823,10 +28825,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:28826: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:28828: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:28829: checking default library-dependency suffix" >&5
++echo "$as_me:28831: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -28909,10 +28911,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:28912: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28914: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:28915: checking default object directory" >&5
++echo "$as_me:28917: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28928,11 +28930,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:28931: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28933: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28935: checking c++ library-dependency suffix" >&5
++echo "$as_me:28937: 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++)
+@@ -29025,7 +29027,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:29028: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:29030: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -29201,19 +29203,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:29204: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:29206: 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:29213: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:29215: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:29216: \$? = $ac_status" >&5
++  echo "$as_me:29218: \$? = $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
+@@ -29224,10 +29226,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 29227 "configure"
++#line 29229 "configure"
+ #include "confdefs.h"
+ 
+-#line 29230 "configure"
++#line 29232 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -29242,16 +29244,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:29245: \"$ac_link\"") >&5
++if { (eval echo "$as_me:29247: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:29248: \$? = $ac_status" >&5
++  echo "$as_me:29250: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:29251: \"$ac_try\"") >&5
++  { (eval echo "$as_me:29253: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:29254: \$? = $ac_status" >&5
++  echo "$as_me:29256: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -29274,7 +29276,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:29277: result: $cf_ldflags_static" >&5
++	echo "$as_me:29279: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test "$cf_ldflags_static" != yes
+@@ -29290,7 +29292,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29293: checking where we will install curses.h" >&5
++echo "$as_me:29295: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -29300,7 +29302,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:29303: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:29305: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -29308,7 +29310,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:29311: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:29313: 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
+@@ -29333,7 +29335,7 @@
+ 
+ # pkgsrc uses these
+ 
+-echo "$as_me:29336: checking for desired basename for form library" >&5
++echo "$as_me:29338: 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.
+@@ -29353,10 +29355,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29356: result: $FORM_NAME" >&5
++echo "$as_me:29358: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:29359: checking for desired basename for menu library" >&5
++echo "$as_me:29361: 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.
+@@ -29376,10 +29378,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29379: result: $MENU_NAME" >&5
++echo "$as_me:29381: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:29382: checking for desired basename for panel library" >&5
++echo "$as_me:29384: 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.
+@@ -29399,10 +29401,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29402: result: $PANEL_NAME" >&5
++echo "$as_me:29404: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:29405: checking for desired basename for cxx library" >&5
++echo "$as_me:29407: 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.
+@@ -29422,13 +29424,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29425: result: $CXX_NAME" >&5
++echo "$as_me:29427: 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:29431: checking for src modules" >&5
++echo "$as_me:29433: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -29487,7 +29489,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:29490: result: $cf_cv_src_modules" >&5
++echo "$as_me:29492: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -29648,7 +29650,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:29651: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:29653: 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//'`
+@@ -29659,7 +29661,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:29662: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
++echo "$as_me:29664: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -29675,7 +29677,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:29678: result: $PKG_CFLAGS" >&5
++echo "$as_me:29680: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ case "$cf_cv_system_name" in
+@@ -29747,7 +29749,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
+ 
+-echo "${as_me:-configure}:29750: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
++echo "${as_me:-configure}:29752: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+ 
+ fi
+ 
+@@ -29774,7 +29776,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:29777: checking for linker search path" >&5
++echo "$as_me:29779: 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
+@@ -29822,7 +29824,7 @@
+ 			cf_pathlist="$cf_pathlist /lib /usr/lib"
+ 			;;
+ 		(*)
+-			{ echo "$as_me:29825: WARNING: problem with Solaris architecture" >&5
++			{ echo "$as_me:29827: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ 			;;
+ 		esac
+@@ -29863,7 +29865,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:29866: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29868: 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'`
+@@ -29949,7 +29951,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29952: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29954: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -30130,7 +30132,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:30133: error: ambiguous option: $1
++    { { echo "$as_me:30135: 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;}
+@@ -30149,7 +30151,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:30152: error: unrecognized option: $1
++  -*) { { echo "$as_me:30154: 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;}
+@@ -30281,7 +30283,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:30284: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:30286: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -30809,7 +30811,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:30812: creating $ac_file" >&5
++    { echo "$as_me:30814: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -30827,7 +30829,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30830: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30832: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -30840,7 +30842,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30843: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30845: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30856,7 +30858,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:30859: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:30861: 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;}
+@@ -30865,7 +30867,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:30868: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:30870: 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;}
+@@ -30910,7 +30912,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:30913: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:30915: 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;}
+@@ -30921,7 +30923,7 @@
+     $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:30924: WARNING: Some variables may not be substituted:
++      { echo "$as_me:30926: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30970,7 +30972,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:30973: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:30975: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -30981,7 +30983,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30984: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30986: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -30994,7 +30996,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30997: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30999: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -31052,7 +31054,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:31055: $ac_file is unchanged" >&5
++      { echo "$as_me:31057: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -31439,7 +31441,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}:31442: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:31444: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: dist.mk
+Prereq:  1.1654 
+--- ncurses-6.5-20250208+/dist.mk	2025-02-08 11:01:51.000000000 +0000
++++ ncurses-6.5-20250215/dist.mk	2025-02-15 12:35:22.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1654 2025/02/08 11:01:51 tom Exp $
++# $Id: dist.mk,v 1.1655 2025/02/15 12:35:22 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 = 5
+-NCURSES_PATCH = 20250208
++NCURSES_PATCH = 20250215
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/curs_attr.3x.html
+--- ncurses-6.5-20250208+/doc/html/man/curs_attr.3x.html	2025-02-02 00:43:57.000000000 +0000
++++ ncurses-6.5-20250215/doc/html/man/curs_attr.3x.html	2025-02-15 20:06:25.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_attr.3x,v 1.133 2025/02/01 23:59:36 tom Exp @
++  * @Id: curs_attr.3x,v 1.136 2025/02/15 19:35:37 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_attr 3x 2025-02-01 ncurses 6.5 Library calls
++curs_attr 3x 2025-02-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                    curs_attr 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                    
++
                                                                                                                                                    curs_attr 3x 2025-02-15 ncurses 6.5 Library calls
                                                                                                                                                    
+ 
                                                                                                                                                    + curs_attr(3x)                    Library calls                   curs_attr(3x)
+ 
+@@ -219,7 +219,7 @@
+               A_ALTCHARSET   Alternate character set
+               A_ITALIC       Italics (non-X/Open extension)
+               A_ATTRIBUTES   Mask to extract character code
+-              A_CHARTEXT     Mask to extract atributes
++              A_CHARTEXT     Mask to extract attributes
+               A_COLOR        Mask to extract color pair identifier
+ 
+        attr_on,  attr_off,  and  attr_set support the foregoing as well as the
+@@ -287,7 +287,7 @@
+            standard pointer to short parameter.
+ 
+        o   For functions which turn attributes off, e.g., wattr_off, the  opts
+-           parameter is ignored except except to check that it is NULL.
++           parameter is ignored except to check that it is NULL.
+ 
+ 
+ 
                                                                                                                                                    PORTABILITY
                                                                                                                                                    +@@ -493,7 +493,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-01                     curs_attr(3x)
++ncurses 6.5                       2025-02-15                     curs_attr(3x)
+ 
                                                                                                                                                    
+ 
                                                                                                                                                    
+ 
                                                                                                                                                      
+Index: doc/html/man/curs_bkgrnd.3x.html
+--- ncurses-6.5-20250208+/doc/html/man/curs_bkgrnd.3x.html	2025-02-02 00:43:57.000000000 +0000
++++ ncurses-6.5-20250215/doc/html/man/curs_bkgrnd.3x.html	2025-02-15 20:06:25.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_bkgrnd.3x,v 1.57 2025/02/01 22:54:32 tom Exp @
++  * @Id: curs_bkgrnd.3x,v 1.58 2025/02/15 18:40:23 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_bkgrnd 3x 2025-02-01 ncurses 6.5 Library calls
++curs_bkgrnd 3x 2025-02-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                      curs_bkgrnd 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                      
++
                                                                                                                                                      curs_bkgrnd 3x 2025-02-15 ncurses 6.5 Library calls
                                                                                                                                                      
+ 
                                                                                                                                                      + curs_bkgrnd(3x)                  Library calls                 curs_bkgrnd(3x)
+ 
+@@ -190,7 +190,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-01                   curs_bkgrnd(3x)
++ncurses 6.5                       2025-02-15                   curs_bkgrnd(3x)
+ 
                                                                                                                                                      
+ 
                                                                                                                                                      
+ 
                                                                                                                                                        
+Index: doc/html/man/curs_get_wch.3x.html
+--- ncurses-6.5-20250208+/doc/html/man/curs_get_wch.3x.html	2025-02-02 00:43:57.000000000 +0000
++++ ncurses-6.5-20250215/doc/html/man/curs_get_wch.3x.html	2025-02-15 20:06:26.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_get_wch.3x,v 1.64 2025/02/02 00:01:24 tom Exp @
++  * @Id: curs_get_wch.3x,v 1.66 2025/02/15 19:35:48 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_get_wch 3x 2025-02-01 ncurses 6.5 Library calls
++curs_get_wch 3x 2025-02-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                        curs_get_wch 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                        
++
                                                                                                                                                        curs_get_wch 3x 2025-02-15 ncurses 6.5 Library calls
                                                                                                                                                        
+ 
                                                                                                                                                        + curs_get_wch(3x)                 Library calls                curs_get_wch(3x)
+ 
+@@ -105,29 +105,28 @@
+            wrefresh(3x), curses calls wrefresh on it.
+ 
+        If  the wide character is a carriage return and nl(3x) has been called,
+-       wget_wch stores the the wide  character  code  for  line  feed  in  wch
+-       instead.
++       wget_wch stores the wide character code for line feed in wch instead.
+ 
+ 
+ 
                                                                                                                                                        Ungetting Characters
                                                                                                                                                        +-       unget_wch  places  wc  into the input queue to be retrieved by the next
+-       call to wget_wch.  A single input queue serves all  windows  associated
++       unget_wch places wc into the input queue to be retrieved  by  the  next
++       call  to  wget_wch.  A single input queue serves all windows associated
+        with the screen.
+ 
+ 
+ 
                                                                                                                                                        RETURN VALUE
                                                                                                                                                        +-       wget_wch  returns  OK when it reads a wide character, KEY_CODE_YES when
++       wget_wch returns OK when it reads a wide character,  KEY_CODE_YES  when
+        it reads a function key code, and ERR on failure.  wget_wch fails if
+ 
+        o   its timeout expires without any data arriving, or
+ 
+-       o   execution was interrupted by a signal, in which case errno  is  set
++       o   execution  was  interrupted by a signal, in which case errno is set
+            to EINTR.
+ 
+-       Functions  taking  a  WINDOW  pointer  argument  fail  if win is a null
++       Functions taking a WINDOW pointer  argument  fail  if  win  is  a  null
+        pointer.
+ 
+-       Functions prefixed with "mv" first perform cursor movement and fail  if
++       Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+        unget_wch returns OK on success and ERR if there is no more room in the
+@@ -140,13 +139,13 @@
+        All of these functions except wget_wch and unget_wch may be implemented
+        as macros.
+ 
+-       Unlike  wgetch(3x),  wget_wch  and  its variants store the value of the
+-       input character in an additional wch parameter instead  of  the  return
++       Unlike wgetch(3x), wget_wch and its variants store  the  value  of  the
++       input  character  in  an additional wch parameter instead of the return
+        value.
+ 
+-       Unlike  ungetch,  unget_wch  cannot distinguish function key codes from
+-       conventional  character  codes.   An  application  can  overcome   this
+-       limitation  by pushing function key codes with ungetch and subsequently
++       Unlike ungetch, unget_wch cannot distinguish function  key  codes  from
++       conventional   character  codes.   An  application  can  overcome  this
++       limitation by pushing function key codes with ungetch and  subsequently
+        checking the return value of wget_wch for a match with KEY_CODE_YES.
+ 
+ 
+@@ -161,18 +160,18 @@
+        X/Open Curses Issue 4 describes these functions.  It specifies no error
+        conditions for them.
+ 
+-       See the "PORTABILITY" section of wgetch(3x) regarding  the  interaction
++       See  the  "PORTABILITY" section of wgetch(3x) regarding the interaction
+        of wget_wch with signal handlers.
+ 
+ 
+ 
                                                                                                                                                        HISTORY
                                                                                                                                                        +-       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
+-       System V Interface Definition Version 4  of  the  same  year  specified
++       X/Open Curses Issue 4 (1995) initially specified these functions.   The
++       System V  Interface  Definition  Version 4  of  the same year specified
+        functions named wgetwch (with its variants) ungetwch.  These were later
+-       additions to SVr4.x, not appearing in  the  first  SVr4  (1989).   They
++       additions  to  SVr4.x,  not  appearing  in the first SVr4 (1989).  They
+        differ from X/Open's later wget_wch and unget_wch in that wgetwch takes
+-       no wch argument, but returns the (wide) key code as  an  int  (with  no
+-       provision  for  distinguishing  a  character  code  from a function key
++       no  wch  argument,  but  returns the (wide) key code as an int (with no
++       provision for distinguishing a  character  code  from  a  function  key
+        code); and ungetwch takes a non-const int argument.
+ 
+ 
+@@ -180,12 +179,12 @@
+        curs_getch(3x) describes comparable functions of the ncurses library in
+        its non-wide-character configuration.
+ 
+-       curses(3x),     curs_add_wch(3x),    curs_inopts(3x),    curs_move(3x),
++       curses(3x),    curs_add_wch(3x),    curs_inopts(3x),     curs_move(3x),
+        curs_refresh(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-01                  curs_get_wch(3x)
++ncurses 6.5                       2025-02-15                  curs_get_wch(3x)
+ 
                                                                                                                                                        
+ 
                                                                                                                                                        
+ 
                                                                                                                                                          
+Index: doc/html/man/curs_get_wstr.3x.html
+--- ncurses-6.5-20250208+/doc/html/man/curs_get_wstr.3x.html	2025-02-02 00:59:49.000000000 +0000
++++ ncurses-6.5-20250215/doc/html/man/curs_get_wstr.3x.html	2025-02-15 15:07:46.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_get_wstr.3x,v 1.68 2025/02/01 22:54:32 tom Exp @
++  * @Id: curs_get_wstr.3x,v 1.70 2025/02/15 14:55:47 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_get_wstr 3x 2025-02-01 ncurses 6.5 Library calls
++curs_get_wstr 3x 2025-02-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                          curs_get_wstr 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                          
++
                                                                                                                                                          curs_get_wstr 3x 2025-02-15 ncurses 6.5 Library calls
                                                                                                                                                          
+ 
                                                                                                                                                          + curs_get_wstr(3x)                Library calls               curs_get_wstr(3x)
+ 
+@@ -177,7 +177,7 @@
+        following the Issue 7 standard.
+ 
+        X/Open  Curses  Issue 7  is  unclear  whether the terminating null wide
+-       character counts  toward  the  length  paramter  n.   A  similar  issue
++       character counts toward  the  length  parameter  n.   A  similar  issue
+        affected   wgetnstr   in   Issue 4,  Version 2;  Issue 7  revised  that
+        function's  description  to  address  the  issue,  but  not   that   of
+        wget_nwstr, leaving it ambiguous.  ncurses counts the terminator in the
+@@ -232,7 +232,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-01                 curs_get_wstr(3x)
++ncurses 6.5                       2025-02-15                 curs_get_wstr(3x)
+ 
                                                                                                                                                          
+ 
                                                                                                                                                          
+ 
                                                                                                                                                            
+Index: doc/html/man/curs_getch.3x.html
+--- ncurses-6.5-20250208+/doc/html/man/curs_getch.3x.html	2025-02-02 00:43:57.000000000 +0000
++++ ncurses-6.5-20250215/doc/html/man/curs_getch.3x.html	2025-02-15 20:06:26.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_getch.3x,v 1.117 2025/02/02 00:00:59 tom Exp @
++  * @Id: curs_getch.3x,v 1.119 2025/02/15 19:35:55 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_getch 3x 2025-02-01 ncurses 6.5 Library calls
++curs_getch 3x 2025-02-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                            curs_getch 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                            
++
                                                                                                                                                            curs_getch 3x 2025-02-15 ncurses 6.5 Library calls
                                                                                                                                                            
+ 
                                                                                                                                                            + curs_getch(3x)                   Library calls                  curs_getch(3x)
+ 
+@@ -290,8 +290,8 @@
+        o   wgetch  returns KEY_MOUSE to indicate that a mouse event is pending
+            collection; see curs_mouse(3x).  Receipt of this  code  requires  a
+            window's  keypad  mode  to  be  enabled, because to interpret mouse
+-           input (as with with xterm(1)'s mouse protocol), ncurses  must  read
+-           an escape sequence, as with a function key.
++           input (as with xterm(1)'s mouse protocol),  ncurses  must  read  an
++           escape sequence, as with a function key.
+ 
+ 
+ 
                                                                                                                                                            Testing Key Codes
                                                                                                                                                            +@@ -432,7 +432,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-01                    curs_getch(3x)
++ncurses 6.5                       2025-02-15                    curs_getch(3x)
+ 
                                                                                                                                                            
+ 
                                                                                                                                                            
+ 
                                                                                                                                                              
+Index: doc/html/man/curs_inch.3x.html
+--- ncurses-6.5-20250208+/doc/html/man/curs_inch.3x.html	2025-01-19 00:54:59.000000000 +0000
++++ ncurses-6.5-20250215/doc/html/man/curs_inch.3x.html	2025-02-15 20:06:26.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inch.3x,v 1.68 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_inch.3x,v 1.70 2025/02/15 19:36:03 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inch 3x 2025-01-18 ncurses 6.5 Library calls
++curs_inch 3x 2025-02-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                              curs_inch 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                              
++
                                                                                                                                                              curs_inch 3x 2025-02-15 ncurses 6.5 Library calls
                                                                                                                                                              
+ 
                                                                                                                                                              + curs_inch(3x)                    Library calls                   curs_inch(3x)
+ 
+@@ -70,7 +70,7 @@
+ 
                                                                                                                                                              RETURN VALUE
                                                                                                                                                              +        These functions return OK on success and ERR on failure.
+ 
+-       In ncurses, they return return ERR if win is NULL.
++       In ncurses, they return ERR if win is NULL.
+ 
+        Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+@@ -118,7 +118,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                     curs_inch(3x)
++ncurses 6.5                       2025-02-15                     curs_inch(3x)
+ 
                                                                                                                                                              
+ 
                                                                                                                                                              
+ 
                                                                                                                                                                
+Index: doc/html/man/curs_inchstr.3x.html
+--- ncurses-6.5-20250208+/doc/html/man/curs_inchstr.3x.html	2025-01-19 00:54:59.000000000 +0000
++++ ncurses-6.5-20250215/doc/html/man/curs_inchstr.3x.html	2025-02-15 15:07:46.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inchstr.3x,v 1.56 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_inchstr.3x,v 1.58 2025/02/15 14:55:35 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inchstr 3x 2025-01-18 ncurses 6.5 Library calls
++curs_inchstr 3x 2025-02-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                curs_inchstr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                
++
                                                                                                                                                                curs_inchstr 3x 2025-02-15 ncurses 6.5 Library calls
                                                                                                                                                                
+ 
                                                                                                                                                                + curs_inchstr(3x)                 Library calls                curs_inchstr(3x)
+ 
+@@ -113,8 +113,8 @@
+        terminated.
+ 
+        SVr4 does not document whether it null-terminates the string it  stores
+-       in chstr, and does not document whether a trailing null chracter counts
+-       toward the length limit n.
++       in  chstr,  and  does  not  document  whether a trailing null character
++       counts toward the length limit n.
+ 
+        SVr4 describes a successful return value  only  as  "an  integer  value
+        other than ERR".
+@@ -125,7 +125,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                  curs_inchstr(3x)
++ncurses 6.5                       2025-02-15                  curs_inchstr(3x)
+ 
                                                                                                                                                                
+ 
                                                                                                                                                                
+ 
                                                                                                                                                                  
+Index: doc/html/man/curs_kernel.3x.html
+--- ncurses-6.5-20250208+/doc/html/man/curs_kernel.3x.html	2025-01-19 00:54:59.000000000 +0000
++++ ncurses-6.5-20250215/doc/html/man/curs_kernel.3x.html	2025-02-15 15:46:52.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_kernel.3x,v 1.75 2025/01/19 00:51:10 tom Exp @
++  * @Id: curs_kernel.3x,v 1.77 2025/02/15 15:13:55 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_kernel 3x 2025-01-18 ncurses 6.5 Library calls
++curs_kernel 3x 2025-02-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                  curs_kernel 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                  
++
                                                                                                                                                                  curs_kernel 3x 2025-02-15 ncurses 6.5 Library calls
                                                                                                                                                                  
+ 
                                                                                                                                                                  + curs_kernel(3x)                  Library calls                 curs_kernel(3x)
+ 
+@@ -205,8 +205,8 @@
+        unnecessary.
+ 
+        The  endwin  function of both ncurses and SVr4 curses calls curs_set if
+-       the latter has previously been called to set the cursor visiblility  to
+-       a  value  other than normal; that is, either invisible or very visible.
++       the latter has previously been called to set the cursor visibility to a
++       value  other  than  normal;  that is, either invisible or very visible.
+        There is no way for ncurses to determine the initial cursor  visibility
+        to restore it.
+ 
+@@ -265,7 +265,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                   curs_kernel(3x)
++ncurses 6.5                       2025-02-15                   curs_kernel(3x)
+ 
                                                                                                                                                                  
+ 
                                                                                                                                                                  
+ 
                                                                                                                                                                    
+Index: doc/html/man/curs_legacy.3x.html
+--- ncurses-6.5-20250208+/doc/html/man/curs_legacy.3x.html	2024-05-25 22:33:42.000000000 +0000
++++ ncurses-6.5-20250215/doc/html/man/curs_legacy.3x.html	2025-02-15 20:06:26.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_legacy 3x 2024-05-25 ncurses 6.5 Library calls
++curs_legacy 3x 2025-02-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                    curs_legacy 3x 2024-05-25 ncurses 6.5 Library calls
                                                                                                                                                                    
++
                                                                                                                                                                    curs_legacy 3x 2025-02-15 ncurses 6.5 Library calls
                                                                                                                                                                    
+ 
                                                                                                                                                                    + curs_legacy(3x)                  Library calls                 curs_legacy(3x)
+ 
+@@ -116,7 +116,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-25                   curs_legacy(3x)
++ncurses 6.5                       2025-02-15                   curs_legacy(3x)
+ 
                                                                                                                                                                    
+ 
                                                                                                                                                                    
+ 
                                                                                                                                                                      
+Index: doc/html/man/curs_mouse.3x.html
+--- ncurses-6.5-20250208+/doc/html/man/curs_mouse.3x.html	2025-01-19 01:14:35.000000000 +0000
++++ ncurses-6.5-20250215/doc/html/man/curs_mouse.3x.html	2025-02-15 20:06:26.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_mouse.3x,v 1.117 2025/01/19 00:51:10 tom Exp @
++  * @Id: curs_mouse.3x,v 1.119 2025/02/15 19:36:18 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_mouse 3x 2025-01-18 ncurses 6.5 Library calls
++curs_mouse 3x 2025-02-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                      curs_mouse 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                      
++
                                                                                                                                                                      curs_mouse 3x 2025-02-15 ncurses 6.5 Library calls
                                                                                                                                                                      
+ 
                                                                                                                                                                      + curs_mouse(3x)                   Library calls                  curs_mouse(3x)
+ 
+@@ -407,7 +407,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                    curs_mouse(3x)
++ncurses 6.5                       2025-02-15                    curs_mouse(3x)
+ 
                                                                                                                                                                      
+ 
                                                                                                                                                                      
+ 
                                                                                                                                                                        
+Index: doc/html/man/curs_opaque.3x.html
+--- ncurses-6.5-20250208+/doc/html/man/curs_opaque.3x.html	2025-01-19 00:54:59.000000000 +0000
++++ ncurses-6.5-20250215/doc/html/man/curs_opaque.3x.html	2025-02-15 20:06:26.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_opaque.3x,v 1.48 2025/01/19 00:51:10 tom Exp @
++  * @Id: curs_opaque.3x,v 1.50 2025/02/15 19:36:24 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_opaque 3x 2025-01-18 ncurses 6.5 Library calls
++curs_opaque 3x 2025-02-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                        curs_opaque 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                        
++
                                                                                                                                                                        curs_opaque 3x 2025-02-15 ncurses 6.5 Library calls
                                                                                                                                                                        
+ 
                                                                                                                                                                        + curs_opaque(3x)                  Library calls                 curs_opaque(3x)
+ 
+@@ -128,8 +128,8 @@
+               windows having no parent.
+ 
+        wgetscrreg
+-              stores  the the top and bottom rows for the scrolling margin set
+-              by wsetscrreg(3x) in the corresponding arguments, returning  ERR
++              stores  the  top and bottom rows for the scrolling margin set by
++              wsetscrreg(3x) in the  corresponding  arguments,  returning  ERR
+               upon failure and OK upon successful completion.
+ 
+ 
+@@ -160,7 +160,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                   curs_opaque(3x)
++ncurses 6.5                       2025-02-15                   curs_opaque(3x)
+ 
                                                                                                                                                                        
+ 
                                                                                                                                                                        
+ 
                                                                                                                                                                          
+Index: doc/html/man/curs_print.3x.html
+--- ncurses-6.5-20250208+/doc/html/man/curs_print.3x.html	2024-07-27 23:11:32.000000000 +0000
++++ ncurses-6.5-20250215/doc/html/man/curs_print.3x.html	2025-02-15 20:06:26.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_print 3x 2024-07-27 ncurses 6.5 Library calls
++curs_print 3x 2025-02-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                          curs_print 3x 2024-07-27 ncurses 6.5 Library calls
                                                                                                                                                                          
++
                                                                                                                                                                          curs_print 3x 2025-02-15 ncurses 6.5 Library calls
                                                                                                                                                                          
+ 
                                                                                                                                                                          + curs_print(3x)                   Library calls                  curs_print(3x)
+ 
+@@ -111,7 +111,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-07-27                    curs_print(3x)
++ncurses 6.5                       2025-02-15                    curs_print(3x)
+ 
                                                                                                                                                                          
+ 
                                                                                                                                                                          
+ 
                                                                                                                                                                            
+Index: doc/html/man/curs_terminfo.3x.html
+--- ncurses-6.5-20250208+/doc/html/man/curs_terminfo.3x.html	2025-01-19 00:54:59.000000000 +0000
++++ ncurses-6.5-20250215/doc/html/man/curs_terminfo.3x.html	2025-02-15 15:46:52.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_terminfo.3x,v 1.160 2025/01/19 00:51:10 tom Exp @
++  * @Id: curs_terminfo.3x,v 1.162 2025/02/15 15:24:18 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_terminfo 3x 2025-01-18 ncurses 6.5 Library calls
++curs_terminfo 3x 2025-02-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                            curs_terminfo 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                            
++
                                                                                                                                                                            curs_terminfo 3x 2025-02-15 ncurses 6.5 Library calls
                                                                                                                                                                            
+ 
                                                                                                                                                                            + curs_terminfo(3x)                Library calls               curs_terminfo(3x)
+ 
+@@ -464,7 +464,7 @@
+        setupterm copies the terminal name to the array ttytype.  This behavior
+        is not specified by X/Open Curses, but is assumed by some applications.
+ 
+-       Other implementions may not declare the capability name  arrays.   Some
++       Other implementations may not declare the capability name arrays.  Some
+        provide  them  without  declaring them.  X/Open Curses does not specify
+        them.
+ 
+@@ -661,7 +661,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                 curs_terminfo(3x)
++ncurses 6.5                       2025-02-15                 curs_terminfo(3x)
+ 
                                                                                                                                                                            
+ 
                                                                                                                                                                            
+ 
                                                                                                                                                                              
+Index: doc/html/man/curs_threads.3x.html
+--- ncurses-6.5-20250208+/doc/html/man/curs_threads.3x.html	2024-04-27 18:38:47.000000000 +0000
++++ ncurses-6.5-20250215/doc/html/man/curs_threads.3x.html	2025-02-15 20:06:27.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-curs_threads 3x 2024-03-16 ncurses 6.5 Library calls
++curs_threads 3x 2025-02-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                              curs_threads 3x 2024-03-16 ncurses 6.5 Library calls
                                                                                                                                                                              
++
                                                                                                                                                                              curs_threads 3x 2025-02-15 ncurses 6.5 Library calls
                                                                                                                                                                              
+ 
                                                                                                                                                                              + curs_threads(3x)                 Library calls                curs_threads(3x)
+ 
+@@ -84,7 +84,7 @@
+        members  of  the  WINDOW  structure  (see curs_opaque(3x)).  It further
+        makes functions of the common  global  variables  COLORS,  COLOR_PAIRS,
+        COLS,   ESCDELAY,   LINES,   TABSIZE,   curscr,  newscr,  and  ttytype,
+-       maintaining them as as read-only values in the SCREEN structure.
++       maintaining them as read-only values in the SCREEN structure.
+ 
+        Even this is not enough to make an  application  using  curses  thread-
+        safe.   We  would  expect  a multi-threaded application to have threads
+@@ -617,7 +617,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-03-16                  curs_threads(3x)
++ncurses 6.5                       2025-02-15                  curs_threads(3x)
+ 
                                                                                                                                                                              
+ 
                                                                                                                                                                              
+ 
                                                                                                                                                                                
+Index: doc/html/man/curs_util.3x.html
+--- ncurses-6.5-20250208+/doc/html/man/curs_util.3x.html	2025-02-02 00:43:58.000000000 +0000
++++ ncurses-6.5-20250215/doc/html/man/curs_util.3x.html	2025-02-15 20:06:27.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_util.3x,v 1.136 2025/02/01 22:49:13 tom Exp @
++  * @Id: curs_util.3x,v 1.139 2025/02/15 18:38:01 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_util 3x 2025-02-01 ncurses 6.5 Library calls
++curs_util 3x 2025-02-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                curs_util 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                
++
                                                                                                                                                                                curs_util 3x 2025-02-15 ncurses 6.5 Library calls
                                                                                                                                                                                
+ 
                                                                                                                                                                                + curs_util(3x)                    Library calls                   curs_util(3x)
+ 
+@@ -111,7 +111,7 @@
+        wunctrl  returns  a  null-terminated  wide-character  string  printably
+        representing the curses complex character wch.
+ 
+-       Both  functions  ignore the atributes and color pair selection of their
++       Both  functions ignore the attributes and color pair selection of their
+        argument.
+ 
+ 
+@@ -424,7 +424,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-01                     curs_util(3x)
++ncurses 6.5                       2025-02-15                     curs_util(3x)
+ 
                                                                                                                                                                                
+ 
                                                                                                                                                                                
+ 
                                                                                                                                                                                  
+Index: doc/html/man/form_field_validation.3x.html
+--- ncurses-6.5-20250208+/doc/html/man/form_field_validation.3x.html	2025-01-19 00:55:00.000000000 +0000
++++ ncurses-6.5-20250215/doc/html/man/form_field_validation.3x.html	2025-02-15 20:06:27.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: form_field_validation.3x,v 1.58 2025/01/19 00:51:10 tom Exp @
++  * @Id: form_field_validation.3x,v 1.60 2025/02/15 19:37:22 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-form_field_validation 3x 2025-01-18 ncurses 6.5 Library calls
++form_field_validation 3x 2025-02-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                  form_field_validation 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                  
++
                                                                                                                                                                                  form_field_validation 3x 2025-02-15 ncurses 6.5 Library calls
                                                                                                                                                                                  
+ 
                                                                                                                                                                                  + form_field_validation(3x)        Library calls       form_field_validation(3x)
+ 
+@@ -69,7 +69,7 @@
+ 
+ 
                                                                                                                                                                                  DESCRIPTION
                                                                                                                                                                                  +        By  default, no validation is done on form fields.  You can associate a
+-       form with with a field type, making the form library validate input.
++       form with a field type, making the form library validate input.
+ 
+ 
+ 
                                                                                                                                                                                  field_arg
                                                                                                                                                                                  +@@ -221,7 +221,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18         form_field_validation(3x)
++ncurses 6.5                       2025-02-15         form_field_validation(3x)
+ 
                                                                                                                                                                                  
+ 
                                                                                                                                                                                  
+ 
                                                                                                                                                                                    
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.5-20250208+/doc/html/man/infocmp.1m.html	2025-01-19 00:55:00.000000000 +0000
++++ ncurses-6.5-20250215/doc/html/man/infocmp.1m.html	2025-02-15 20:06:28.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: infocmp.1m,v 1.122 2025/01/19 00:51:10 tom Exp @
++  * @Id: infocmp.1m,v 1.124 2025/02/15 19:37:37 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-infocmp 1m 2025-01-18 ncurses 6.5 User commands
++infocmp 1m 2025-02-15 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                    infocmp 1m 2025-01-18 ncurses 6.5 User commands
                                                                                                                                                                                    
++
                                                                                                                                                                                    infocmp 1m 2025-02-15 ncurses 6.5 User commands
                                                                                                                                                                                    
+ 
                                                                                                                                                                                    + infocmp(1m)                      User commands                     infocmp(1m)
+ 
+@@ -483,7 +483,7 @@
+        -1 (its internal representation).  ncurses shows these  as  "NULL"  for
+        consistency with missing string capabilities.
+ 
+-       The  -r  option  of  ncurses infocmp uses SVr4's notion of of "termcap"
++       The  -r  option  of  ncurses  infocmp  uses  SVr4's notion of "termcap"
+        capabilities.  BSD curses had a more restricted set.  To see only those
+        present in 4.4BSD, use "-r -RBSD".
+ 
+@@ -531,7 +531,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                       infocmp(1m)
++ncurses 6.5                       2025-02-15                       infocmp(1m)
+ 
                                                                                                                                                                                    
+ 
                                                                                                                                                                                    
+ 
                                                                                                                                                                                      
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.5-20250208+/doc/html/man/ncurses.3x.html	2025-02-02 00:44:00.000000000 +0000
++++ ncurses-6.5-20250215/doc/html/man/ncurses.3x.html	2025-02-15 15:07:49.000000000 +0000
+@@ -61,7 +61,7 @@
+        displays  with  output  optimized  to minimize screen updates.  ncurses
+        replaces the curses libraries from System V Release 4 Unix ("SVr4") and
+        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
+-       document describes ncurses version 6.5 (patch 20250201).
++       document describes ncurses version 6.5 (patch 20250215).
+ 
+        ncurses permits control of the terminal screen's contents;  abstraction
+        and  subdivision thereof with windows and pads; acquisition of keyboard
+Index: doc/html/man/tabs.1.html
+--- ncurses-6.5-20250208+/doc/html/man/tabs.1.html	2025-01-19 00:55:01.000000000 +0000
++++ ncurses-6.5-20250215/doc/html/man/tabs.1.html	2025-02-15 15:07:49.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tabs.1,v 1.68 2025/01/19 00:51:10 tom Exp @
++  * @Id: tabs.1,v 1.70 2025/02/15 14:55:00 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-tabs 1 2025-01-18 ncurses 6.5 User commands
++tabs 1 2025-02-15 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                      tabs 1 2025-01-18 ncurses 6.5 User commands
                                                                                                                                                                                      
++
                                                                                                                                                                                      tabs 1 2025-02-15 ncurses 6.5 User commands
                                                                                                                                                                                      
+ 
                                                                                                                                                                                      + tabs(1)                          User commands                         tabs(1)
+ 
+@@ -248,7 +248,7 @@
+            setting arbitrary tab stops.
+ 
+        The  feature  described  in  subsection  "Explicit  Lists"  above   was
+-       implemented  in  PWB/Unix,  and  permitted  the setting of abitrary tab
++       implemented  in  PWB/Unix,  and  permitted the setting of arbitrary tab
+        stops nevertheless.
+ 
+ 
+@@ -257,7 +257,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                           tabs(1)
++ncurses 6.5                       2025-02-15                           tabs(1)
+ 
                                                                                                                                                                                      
+ 
                                                                                                                                                                                      
+ 
                                                                                                                                                                                        
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.5-20250208+/doc/html/man/terminfo.5.html	2025-02-02 00:44:00.000000000 +0000
++++ ncurses-6.5-20250215/doc/html/man/terminfo.5.html	2025-02-15 15:07:49.000000000 +0000
+@@ -71,7 +71,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This document describes ncurses version 6.5 (patch 20250201).
++       This document describes ncurses version 6.5 (patch 20250215).
+ 
+ 
+ 
                                                                                                                                                    terminfo Entry Syntax
                                                                                                                                                    +Index: doc/html/man/toe.1m.html
+--- ncurses-6.5-20250208+/doc/html/man/toe.1m.html	2024-05-11 21:39:59.000000000 +0000
++++ ncurses-6.5-20250215/doc/html/man/toe.1m.html	2025-02-15 20:06:29.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-toe 1m 2024-05-11 ncurses 6.5 User commands
++toe 1m 2025-02-15 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                    toe 1m 2024-05-11 ncurses 6.5 User commands
                                                                                                                                                    
++
                                                                                                                                                    toe 1m 2025-02-15 ncurses 6.5 User commands
                                                                                                                                                    
+ 
                                                                                                                                                    + toe(1m)                          User commands                         toe(1m)
+ 
+@@ -83,7 +83,7 @@
+                 Without   the  -s  option,  toe  does  not  attempt  to  merge
+                 duplicates in its report.
+ 
+-       -h       writes a heading naming each each directory as it is accessed.
++       -h       writes a heading naming each directory as it is accessed.
+ 
+        -s       sorts the output by the entry names.
+ 
+@@ -185,7 +185,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-05-11                           toe(1m)
++ncurses 6.5                       2025-02-15                           toe(1m)
+ 
                                                                                                                                                    
+ 
                                                                                                                                                    
+ 
                                                                                                                                                      
+Index: doc/html/man/tput.1.html
+--- ncurses-6.5-20250208+/doc/html/man/tput.1.html	2025-01-19 00:55:02.000000000 +0000
++++ ncurses-6.5-20250215/doc/html/man/tput.1.html	2025-02-15 20:06:29.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tput.1,v 1.130 2025/01/19 00:51:54 tom Exp @
++  * @Id: tput.1,v 1.132 2025/02/15 19:35:19 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-tput 1 2025-01-18 ncurses 6.5 User commands
++tput 1 2025-02-15 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                      tput 1 2025-01-18 ncurses 6.5 User commands
                                                                                                                                                      
++
                                                                                                                                                      tput 1 2025-02-15 ncurses 6.5 User commands
                                                                                                                                                      
+ 
                                                                                                                                                      + tput(1)                          User commands                         tput(1)
+ 
+@@ -164,7 +164,7 @@
+        reset      re-initializes  the  terminal.    A   reset   differs   from
+                   initialization in two ways.
+ 
+-                  (1)  tput sets the the terminal modes to a "sane" state,
++                  (1)  tput sets the terminal modes to a "sane" state,
+ 
+                        o   enabling canonical ("cooked") and echo modes,
+ 
+@@ -564,7 +564,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                           tput(1)
++ncurses 6.5                       2025-02-15                           tput(1)
+ 
                                                                                                                                                      
+ 
                                                                                                                                                      
+ 
                                                                                                                                                        
+Index: include/Caps.uwin
+Prereq:  1.23 
+--- ncurses-6.5-20250208+/include/Caps.uwin	2024-04-20 21:05:02.000000000 +0000
++++ ncurses-6.5-20250215/include/Caps.uwin	2025-02-15 15:42:46.000000000 +0000
+@@ -1,5 +1,5 @@
+ ##############################################################################
+-# Copyright 2019-2023,2024 Thomas E. Dickey                                  #
++# Copyright 2019-2024,2025 Thomas E. Dickey                                  #
+ # Copyright 2001-2015,2016 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -29,7 +29,7 @@
+ #
+ # Author: Thomas Dickey
+ #
+-# $Id: Caps.uwin,v 1.23 2024/04/20 21:05:02 tom Exp $
++# $Id: Caps.uwin,v 1.24 2025/02/15 15:42:46 tom Exp $
+ #
+ # This is an adaptation of ncurses' termcap/terminfo capability table, which
+ # is designed to align with U/Win's terminfo.
+@@ -304,7 +304,7 @@
+ label_width			lw	num	lw	-	-	-----	columns in each label
+ buttons				btns	num	BT	-	-	-----	number of buttons on mouse
+ #max_attributes			ma	num	ma	-	-	YBC--	maximum combined attributes terminal can handle
+-#maximum_windows		wnum	num	MW	-	-	-----	maximum number of defineable windows
++#maximum_windows		wnum	num	MW	-	-	-----	maximum number of definable windows
+ # These came in with SVr4's color support
+ max_colors			colors	num	Co	-	-	-----	maximum number of colors on screen
+ max_pairs			pairs	num	pa	-	-	-----	maximum number of color-pairs on the screen
+Index: man/curs_attr.3x
+Prereq:  1.133 
+--- ncurses-6.5-20250208+/man/curs_attr.3x	2025-02-01 23:59:36.000000000 +0000
++++ ncurses-6.5-20250215/man/curs_attr.3x	2025-02-15 19:35:37.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_attr.3x,v 1.133 2025/02/01 23:59:36 tom Exp $
+-.TH curs_attr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_attr.3x,v 1.136 2025/02/15 19:35:37 tom Exp $
++.TH curs_attr 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -286,7 +286,7 @@
+ A_ALTCHARSET	Alternate character set
+ A_ITALIC	Italics (non-X/Open extension)
+ A_ATTRIBUTES	Mask to extract character code
+-A_CHARTEXT	Mask to extract atributes
++A_CHARTEXT	Mask to extract attributes
+ A_COLOR	Mask to extract color pair identifier
+ .TE
+ .RE
+@@ -433,8 +433,7 @@
+ .bP
+ For functions which turn attributes off, e.g.,
+ \fBwattr_off\fP,
+-the \fIopts\fP parameter is ignored except
+-except to check that it is
++the \fIopts\fP parameter is ignored except to check that it is
+ .IR NULL "."
+ .\" ---------------------------------------------------------------------------
+ .SH PORTABILITY
+Index: man/curs_bkgrnd.3x
+Prereq:  1.57 
+--- ncurses-6.5-20250208+/man/curs_bkgrnd.3x	2025-02-01 22:54:32.000000000 +0000
++++ ncurses-6.5-20250215/man/curs_bkgrnd.3x	2025-02-15 18:40:23.000000000 +0000
+@@ -27,19 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_bkgrnd.3x,v 1.57 2025/02/01 22:54:32 tom Exp $
+-.TH curs_bkgrnd 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+-.ie \n(.g \{\
+-.ds `` \(lq
+-.ds '' \(rq
+-.\}
+-.el \{\
+-.ie t .ds `` ``
+-.el   .ds `` ""
+-.ie t .ds '' ''
+-.el   .ds '' ""
+-.\}
+-.
++.\" $Id: curs_bkgrnd.3x,v 1.58 2025/02/15 18:40:23 tom Exp $
++.TH curs_bkgrnd 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .de bP
+ .ie n  .IP \(bu 4
+ .el    .IP \(bu 2
+Index: man/curs_get_wch.3x
+Prereq:  1.64 
+--- ncurses-6.5-20250208+/man/curs_get_wch.3x	2025-02-02 00:01:24.000000000 +0000
++++ ncurses-6.5-20250215/man/curs_get_wch.3x	2025-02-15 19:35:48.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_get_wch.3x,v 1.64 2025/02/02 00:01:24 tom Exp $
+-.TH curs_get_wch 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_get_wch.3x,v 1.66 2025/02/15 19:35:48 tom Exp $
++.TH curs_get_wch 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -159,7 +159,7 @@
+ If the wide character
+ is a carriage return and \fBnl\fP(3X) has been called,
+ .B \%wget_wch
+-stores the the wide character code for line feed in
++stores the wide character code for line feed in
+ .I wch
+ instead.
+ .SS "Ungetting Characters"
+Index: man/curs_get_wstr.3x
+Prereq:  1.68 
+--- ncurses-6.5-20250208+/man/curs_get_wstr.3x	2025-02-01 22:54:32.000000000 +0000
++++ ncurses-6.5-20250215/man/curs_get_wstr.3x	2025-02-15 14:55:47.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_get_wstr.3x,v 1.68 2025/02/01 22:54:32 tom Exp $
+-.TH curs_get_wstr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_get_wstr.3x,v 1.70 2025/02/15 14:55:47 tom Exp $
++.TH curs_get_wstr 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -285,7 +285,7 @@
+ following the Issue\ 7 standard.
+ .PP
+ X/Open Curses Issue\ 7 is unclear whether the terminating null wide character
+-counts toward the length paramter
++counts toward the length parameter
+ .IR n "."
+ A similar issue affected
+ .I \%wgetnstr
+Index: man/curs_getch.3x
+Prereq:  1.117 
+--- ncurses-6.5-20250208+/man/curs_getch.3x	2025-02-02 00:00:59.000000000 +0000
++++ ncurses-6.5-20250215/man/curs_getch.3x	2025-02-15 19:35:55.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getch.3x,v 1.117 2025/02/02 00:00:59 tom Exp $
+-.TH curs_getch 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_getch.3x,v 1.119 2025/02/15 19:35:55 tom Exp $
++.TH curs_getch 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -425,7 +425,7 @@
+ see \fB\%curs_mouse\fP(3X).
+ Receipt of this code requires a window's keypad mode to be enabled,
+ because to interpret mouse input
+-(as with with \fI\%xterm\fP(1)'s mouse protocol),
++(as with \fI\%xterm\fP(1)'s mouse protocol),
+ .I \%ncurses
+ must read an escape sequence,
+ as with a function key.
+Index: man/curs_inch.3x
+Prereq:  1.68 
+--- ncurses-6.5-20250208+/man/curs_inch.3x	2025-01-19 00:49:39.000000000 +0000
++++ ncurses-6.5-20250215/man/curs_inch.3x	2025-02-15 19:36:03.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inch.3x,v 1.68 2025/01/19 00:49:39 tom Exp $
+-.TH curs_inch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inch.3x,v 1.70 2025/02/15 19:36:03 tom Exp $
++.TH curs_inch 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -82,7 +82,6 @@
+ In
+ .IR \%ncurses ","
+ they return
+-return
+ .B ERR
+ if
+ .I win
+Index: man/curs_inchstr.3x
+Prereq:  1.56 
+--- ncurses-6.5-20250208+/man/curs_inchstr.3x	2025-01-19 00:49:39.000000000 +0000
++++ ncurses-6.5-20250215/man/curs_inchstr.3x	2025-02-15 14:55:35.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inchstr.3x,v 1.56 2025/01/19 00:49:39 tom Exp $
+-.TH curs_inchstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inchstr.3x,v 1.58 2025/02/15 14:55:35 tom Exp $
++.TH curs_inchstr 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -138,7 +138,7 @@
+ SVr4 does not document whether it null-terminates the string it stores
+ in
+ .IR chstr ","
+-and does not document whether a trailing null chracter counts toward the
++and does not document whether a trailing null character counts toward the
+ length limit
+ .IR n "."
+ .PP
+Index: man/curs_kernel.3x
+Prereq:  1.75 
+--- ncurses-6.5-20250208+/man/curs_kernel.3x	2025-01-19 00:51:10.000000000 +0000
++++ ncurses-6.5-20250215/man/curs_kernel.3x	2025-02-15 15:13:55.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_kernel.3x,v 1.75 2025/01/19 00:51:10 tom Exp $
+-.TH curs_kernel 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_kernel.3x,v 1.77 2025/02/15 15:13:55 tom Exp $
++.TH curs_kernel 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -314,7 +314,7 @@
+ .I curses
+ calls
+ .B \%curs_set
+-if the latter has previously been called to set the cursor visiblility
++if the latter has previously been called to set the cursor visibility
+ to a value other than normal;
+ that is,
+ either
+Index: man/curs_legacy.3x
+Prereq:  1.34 
+--- ncurses-6.5-20250208+/man/curs_legacy.3x	2024-05-25 20:15:31.000000000 +0000
++++ ncurses-6.5-20250215/man/curs_legacy.3x	2025-02-15 18:43:02.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2007-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,19 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_legacy.3x,v 1.34 2024/05/25 20:15:31 tom Exp $
+-.TH curs_legacy 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+-.ie \n(.g \{\
+-.ds `` \(lq
+-.ds '' \(rq
+-.\}
+-.el \{\
+-.ie t .ds `` ``
+-.el   .ds `` ""
+-.ie t .ds '' ''
+-.el   .ds '' ""
+-.\}
+-.
++.\" $Id: curs_legacy.3x,v 1.36 2025/02/15 18:43:02 tom Exp $
++.TH curs_legacy 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .de bP
+ .ie n  .IP \(bu 4
+ .el    .IP \(bu 2
+Index: man/curs_mouse.3x
+Prereq:  1.117 
+--- ncurses-6.5-20250208+/man/curs_mouse.3x	2025-01-19 00:51:10.000000000 +0000
++++ ncurses-6.5-20250215/man/curs_mouse.3x	2025-02-15 19:36:18.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_mouse.3x,v 1.117 2025/01/19 00:51:10 tom Exp $
+-.TH curs_mouse 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_mouse.3x,v 1.119 2025/02/15 19:36:18 tom Exp $
++.TH curs_mouse 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -591,7 +591,7 @@
+ .bP
+ Its \*(``terminfo\*('' manual page lists capabilities for the feature.
+ .PP
+-.\" These don't appear in in the SVID 4th edition, Volume 3,
++.\" These don't appear in the SVID 4th edition, Volume 3,
+ .\" terminfo(TI_ENV) man page.  They can be found in, e.g., the "z/OS
+ .\" V1R1.0 C Curses" book, Chapter 17, pp. 179-186 (PDF 213-220).
+ .RS 8
+Index: man/curs_opaque.3x
+Prereq:  1.48 
+--- ncurses-6.5-20250208+/man/curs_opaque.3x	2025-01-19 00:51:10.000000000 +0000
++++ ncurses-6.5-20250215/man/curs_opaque.3x	2025-02-15 19:36:24.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_opaque.3x,v 1.48 2025/01/19 00:51:10 tom Exp $
+-.TH curs_opaque 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_opaque.3x,v 1.50 2025/02/15 19:36:24 tom Exp $
++.TH curs_opaque 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -141,7 +141,7 @@
+ for windows having no parent.
+ .TP
+ \fBwgetscrreg\fP
+-stores the the top and bottom rows for the scrolling margin set by
++stores the top and bottom rows for the scrolling margin set by
+ \fB\%wsetscrreg\fP(3X) in the corresponding arguments,
+ returning \fBERR\fP upon failure and \fBOK\fP upon successful
+ completion.
+Index: man/curs_print.3x
+Prereq:  1.40 
+--- ncurses-6.5-20250208+/man/curs_print.3x	2024-07-27 20:03:57.000000000 +0000
++++ ncurses-6.5-20250215/man/curs_print.3x	2025-02-15 18:42:34.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,18 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_print.3x,v 1.40 2024/07/27 20:03:57 tom Exp $
+-.TH curs_print 3X 2024-07-27 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+-.ie \n(.g \{\
+-.ds `` \(lq
+-.ds '' \(rq
+-.\}
+-.el \{\
+-.ie t .ds `` ``
+-.el   .ds `` ""
+-.ie t .ds '' ''
+-.el   .ds '' ""
+-.\}
++.\" $Id: curs_print.3x,v 1.41 2025/02/15 18:42:34 tom Exp $
++.TH curs_print 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%mcprint\fP \-
+ write binary data to printer using \fIterminfo\fR capabilities
+Index: man/curs_terminfo.3x
+Prereq:  1.160 
+--- ncurses-6.5-20250208+/man/curs_terminfo.3x	2025-01-19 00:51:10.000000000 +0000
++++ ncurses-6.5-20250215/man/curs_terminfo.3x	2025-02-15 15:24:18.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_terminfo.3x,v 1.160 2025/01/19 00:51:10 tom Exp $
+-.TH curs_terminfo 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_terminfo.3x,v 1.162 2025/02/15 15:24:18 tom Exp $
++.TH curs_terminfo 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -830,7 +830,7 @@
+ This behavior is not specified by X/Open Curses,
+ but is assumed by some applications.
+ .PP
+-Other implementions may not declare the capability name arrays.
++Other implementations may not declare the capability name arrays.
+ Some provide them without declaring them.
+ X/Open Curses does not specify them.
+ .PP
+Index: man/curs_threads.3x
+Prereq:  1.56 
+--- ncurses-6.5-20250208+/man/curs_threads.3x	2024-03-16 15:35:01.000000000 +0000
++++ ncurses-6.5-20250215/man/curs_threads.3x	2025-02-15 19:41:22.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2021-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2021-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2008-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_threads.3x,v 1.56 2024/03/16 15:35:01 tom Exp $
+-.TH curs_threads 3X 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_threads.3x,v 1.59 2025/02/15 19:41:22 tom Exp $
++.TH curs_threads 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -102,7 +102,7 @@
+ \fB\%newscr\fP,
+ and
+ \fB\%ttytype\fP,
+-maintaining them as as read-only values in the \fISCREEN\fP structure.
++maintaining them as read-only values in the \fISCREEN\fP structure.
+ .PP
+ Even this is not enough to make an application using \fIcurses\fP
+ thread-safe.
+Index: man/curs_util.3x
+Prereq:  1.136 
+--- ncurses-6.5-20250208+/man/curs_util.3x	2025-02-01 22:49:13.000000000 +0000
++++ ncurses-6.5-20250215/man/curs_util.3x	2025-02-15 18:38:01.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_util.3x,v 1.136 2025/02/01 22:49:13 tom Exp $
+-.TH curs_util 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_util.3x,v 1.139 2025/02/15 18:38:01 tom Exp $
++.TH curs_util 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -142,7 +142,7 @@
+ complex character
+ .IR wch .
+ .PP
+-Both functions ignore the atributes and color pair selection
++Both functions ignore the attributes and color pair selection
+ of their argument.
+ .SS "keyname, key_name"
+ The \fBkeyname\fP routine returns a character string
+@@ -472,17 +472,17 @@
+ a one-character string with
+ the parameter as the first character.
+ Otherwise,
+-it returns \*(``~@\*('',
+-\*(``~A\*('',
++it returns \*(``\*~@\*('',
++\*(``\*~A\*('',
+ etc.,
+-analogous to \*(``^@\*('',
+-\*(``^A\*('',
++analogous to \*(``\*^@\*('',
++\*(``\*^A\*('',
+ C0 controls.
+ .IP
+ X/Open Curses does not document whether \fBunctrl\fP can be called
+ before initializing curses.
+ This implementation permits that,
+-and returns the \*(``~@\*('',
++and returns the \*(``\*~@\*('',
+ etc.,
+ values in that case.
+ .bP
+@@ -492,10 +492,10 @@
+ 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 \*(``^\*(''.
++with a \*(``\*~\*('' prefix rather than \*(``\*^\*(''.
+ Other implementations have different conventions.
+ For example,
+-they may show both sets of control characters with \*(``^\*('',
++they may show both sets of control characters with \*(``\*^\*('',
+ and strip the parameter to 7 bits.
+ Or they may ignore C1 controls and treat all of the upper-128 codes as
+ printable.
+@@ -515,8 +515,8 @@
+ X/Open Curses does not document the treatment of codes 128 to 159.
+ When treating them as \*(``meta\*('' keys
+ (or if \fBkeyname\fP is called before initializing curses),
+-this implementation returns strings \*(``M\-^@\*('',
+-\*(``M\-^A\*('',
++this implementation returns strings \*(``M\-\*^@\*('',
++\*(``M\-\*^A\*('',
+ etc.
+ .PP
+ X/Open Curses documents \fBunctrl\fP as declared in \fB\fP,
+Index: man/form_field_validation.3x
+Prereq:  1.58 
+--- ncurses-6.5-20250208+/man/form_field_validation.3x	2025-01-19 00:51:10.000000000 +0000
++++ ncurses-6.5-20250215/man/form_field_validation.3x	2025-02-15 19:37:22.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_validation.3x,v 1.58 2025/01/19 00:51:10 tom Exp $
+-.TH form_field_validation 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: form_field_validation.3x,v 1.60 2025/02/15 19:37:22 tom Exp $
++.TH form_field_validation 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -66,7 +66,7 @@
+ .fi
+ .SH DESCRIPTION
+ By default, no validation is done on form fields.
+-You can associate a form with with a \fIfield type\fP,
++You can associate a form with a \fIfield type\fP,
+ making the form library validate input.
+ .SS field_arg
+ Returns a pointer to the field's argument block.
+Index: man/infocmp.1m
+Prereq:  1.122 
+--- ncurses-6.5-20250208+/man/infocmp.1m	2025-01-19 00:51:10.000000000 +0000
++++ ncurses-6.5-20250215/man/infocmp.1m	2025-02-15 19:37:37.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: infocmp.1m,v 1.122 2025/01/19 00:51:10 tom Exp $
+-.TH @INFOCMP@ 1M 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: infocmp.1m,v 1.124 2025/02/15 19:37:37 tom Exp $
++.TH @INFOCMP@ 1M 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -708,7 +708,7 @@
+ of
+ .I \%ncurses
+ .I \%infocmp
+-uses SVr4's notion of of \*(``termcap\*('' capabilities.
++uses SVr4's notion of \*(``termcap\*('' capabilities.
+ BSD
+ .I curses
+ had a more restricted set.
+Index: man/tabs.1
+Prereq:  1.68 
+--- ncurses-6.5-20250208+/man/tabs.1	2025-01-19 00:51:10.000000000 +0000
++++ ncurses-6.5-20250215/man/tabs.1	2025-02-15 14:55:00.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tabs.1,v 1.68 2025/01/19 00:51:10 tom Exp $
+-.TH @TABS@ 1 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: tabs.1,v 1.70 2025/02/15 14:55:00 tom Exp $
++.TH @TABS@ 1 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -352,7 +352,7 @@
+ The feature described in subsection \*(``Explicit Lists\*('' above was
+ implemented in PWB/Unix,
+ .\" see URL above
+-and permitted the setting of abitrary tab stops nevertheless.
++and permitted the setting of arbitrary tab stops nevertheless.
+ .SH SEE ALSO
+ \fB\%@INFOCMP@\fP(1M),
+ \fB\%@TSET@\fP(1),
+Index: man/toe.1m
+Prereq:  1.69 
+--- ncurses-6.5-20250208+/man/toe.1m	2024-05-11 20:39:53.000000000 +0000
++++ ncurses-6.5-20250215/man/toe.1m	2025-02-15 19:41:22.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: toe.1m,v 1.69 2024/05/11 20:39:53 tom Exp $
+-.TH @TOE@ 1M 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: toe.1m,v 1.72 2025/02/15 19:41:22 tom Exp $
++.TH @TOE@ 1M 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -98,7 +98,7 @@
+ \fB\%@TOE@\fP does not attempt to merge duplicates in its report.
+ .TP
+ .B \-h
+-writes a heading naming each each directory as it is accessed.
++writes a heading naming each directory as it is accessed.
+ .TP
+ .B \-s
+ sorts the output by the entry names.
+Index: man/tput.1
+Prereq:  1.130 
+--- ncurses-6.5-20250208+/man/tput.1	2025-01-19 00:51:54.000000000 +0000
++++ ncurses-6.5-20250215/man/tput.1	2025-02-15 19:35:19.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tput.1,v 1.130 2025/01/19 00:51:54 tom Exp $
+-.TH @TPUT@ 1 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: tput.1,v 1.132 2025/02/15 19:35:19 tom Exp $
++.TH @TPUT@ 1 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -232,7 +232,7 @@
+ .TP 5
+ (1)
+ .B \%@TPUT@
+-sets the the terminal modes to a \*(``sane\*('' state,
++sets the terminal modes to a \*(``sane\*('' state,
+ .RS
+ .bP
+ enabling canonical (\*(``cooked\*('') and echo modes,
+Index: misc/magic
+Prereq:  1.5 
+--- ncurses-6.5-20250208+/misc/magic	2023-09-23 23:37:26.000000000 +0000
++++ ncurses-6.5-20250215/misc/magic	2025-02-15 15:23:23.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: magic,v 1.5 2023/09/23 23:37:26 tom Exp $
++# $Id: magic,v 1.6 2025/02/15 15:23:23 tom Exp $
+ ##############################################################################
+-# Copyright 2020,2023 Thomas E. Dickey                                       #
++# Copyright 2020-2023,2025 Thomas E. Dickey                                  #
+ # Copyright 2015,2018 Free Software Foundation, Inc.                         #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -59,9 +59,8 @@
+ >>12	regex		\^[a-zA-Z0-9][a-zA-Z0-9.][^|]*	Compiled 32-bit terminfo entry "%-s"
+ !:mime	application/x-terminfo2
+ #
+-# While the compiled terminfo uses little-endian format irregardless of
+-# platform, System V screen dumps do not.  They came later, and that detail was
+-# overlooked.
++# While the compiled terminfo uses little-endian format regardless of platform,
++# System V screen dumps do not.  They came later; that detail was overlooked.
+ #
+ # AIX and HPUX use the SVr4 big-endian format
+ # Solaris uses the SVr3 formats (sparc and x86 differ endian-ness)
+Index: misc/terminfo.src
+--- ncurses-6.5-20250208+/misc/terminfo.src	2025-02-08 21:27:07.000000000 +0000
++++ ncurses-6.5-20250215/misc/terminfo.src	2025-02-15 20:03:55.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.1170 $
+-#	$Date: 2025/02/08 21:27:07 $
++#	$Revision: 1.1171 $
++#	$Date: 2025/02/15 20:03:55 $
+ #
+ # 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
+@@ -1143,7 +1143,7 @@
+ # of the functionality), but does not recognize as many control sequences.
+ # The program comes bundled with an old (circa 1998) copy of the Linux
+ # console terminfo.  It recognizes some non-ANSI/VT100 sequences such as
+-#	\E*	move cursor to home, as as \E[H
++#	\E*	move cursor to home, as \E[H
+ #	\E,X	same as \E(X
+ #	\EE	move cursor to beginning of row
+ #	\E[y,xf	same as \E[y,xH
+@@ -7669,7 +7669,7 @@
+ #	italics and crossed-out text work
+ #	no meta mode
+ # vttest -
+-#	DA1 says this is a VT420 with with 132 columns, NRCS, horizontal scrolling
++#	DA1 says this is a VT420 with 132 columns, NRCS, horizontal scrolling
+ #	DA2 says this is a VT510, version 33.7
+ #	NRCS does not work, program hangs in the locking shift test.
+ #	some of the VT420 rectangle operations work
+@@ -10130,7 +10130,7 @@
+ # Due to severe 2621 braindamage, the only way to get the arrow keys to
+ # transmit anything at all is to turn on the function key labels
+ # with , and even then the user has to hold down shift!
+-# The default 2621 turns off the labels except when it has to to
++# The default 2621 turns off the labels except when it has to, to
+ # enable the function keys. If your installation prefers labels
+ # on all the time, or off all the time (at the "expense" of the
+ # function keys), use 2621-nl or 2621-wl.
+@@ -16090,7 +16090,7 @@
+ # of the tab key to send an ESC.  The real ESC key is positioned way out
+ # in right field.
+ #
+-# The termcap won't work in 132 column mode due to the way it it moves the
++# The termcap won't work in 132 column mode due to the way it moves the
+ # cursor.  Termcap doesn't have the capability (as far as I could tell) to
+ # handle the 721 in 132 column mode.
+ #
+@@ -17699,7 +17699,7 @@
+ # code for the down cursor key. When kcud1 is defined in terminfo
+ # as ^V, the Control Character Quoting capability (^V in insert mode)
+ # is lost! It cannot be remapped in vi because it is necessary to enter
+-# a ^V to to quote the ^V that is being remapped!!!
++# a ^V to, to quote the ^V that is being remapped!!!
+ #
+ # f110/f200 users will have to decide whether
+ # to lose the down cursor key or the quoting capability. We will opt
+@@ -23585,7 +23585,7 @@
+ # "Teleray Arpa Special", officially designated as
+ # "Teleray Arpa network model 10" with "Special feature 720".
+ # This is the new (1981) fast microcode updating the older "arpa" proms
+-# (which gave meta-key and programmable-fxn keys).  720 is much much faster,
++# (which gave meta-key and programmable-fxn keys).  720 is much, much faster,
+ # converts the keypad to programmable function keys, and has other goodies.
+ # Standout mode is still broken (magic cookie, etc) so is suppressed as no
+ # programs handle such lossage properly.
+@@ -27794,4 +27794,7 @@
+ # 2025-02-08
+ #	+ update st (report by Alexander Kashpir) -TD
+ #
++# 2025-02-15
++#	+ minor fixes to comments (report by Sven Joachim) -TD
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: ncurses/base/lib_chgat.c
+Prereq:  1.13 
+--- ncurses-6.5-20250208+/ncurses/base/lib_chgat.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20250215/ncurses/base/lib_chgat.c	2025-02-15 20:53:36.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2015 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: lib_chgat.c,v 1.13 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: lib_chgat.c,v 1.14 2025/02/15 20:53:36 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ wchgat(WINDOW *win,
+@@ -62,7 +62,8 @@
+        color_pair));
+ 
+     set_extended_pair(opts, color_pair);
+-    if (win) {
++    if (win != NULL
++	&& color_pair >= 0) {
+ 	struct ldat *line = &(win->_line[win->_cury]);
+ 	int i;
+ 
+Index: ncurses/base/lib_mouse.c
+Prereq:  1.207 
+--- ncurses-6.5-20250208+/ncurses/base/lib_mouse.c	2025-02-08 12:16:37.000000000 +0000
++++ ncurses-6.5-20250215/ncurses/base/lib_mouse.c	2025-02-15 15:12:21.000000000 +0000
+@@ -44,7 +44,7 @@
+  *	sysmouse (FreeBSD)
+  *	special-purpose mouse interface for OS/2 EMX.
+  *
+- * Notes for implementors of new mouse-interface methods:
++ * Notes for implementers of new mouse-interface methods:
+  *
+  * The code is logically split into a lower level that accepts event reports
+  * in a device-dependent format and an upper level that parses mouse gestures
+@@ -85,7 +85,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_mouse.c,v 1.207 2025/02/08 12:16:37 tom Exp $")
++MODULE_ID("$Id: lib_mouse.c,v 1.208 2025/02/15 15:12:21 tom Exp $")
+ 
+ #include 
+ 
+Index: ncurses/base/lib_set_term.c
+Prereq:  1.195 
+--- ncurses-6.5-20250208+/ncurses/base/lib_set_term.c	2025-02-08 15:54:53.000000000 +0000
++++ ncurses-6.5-20250215/ncurses/base/lib_set_term.c	2025-02-15 12:55:53.000000000 +0000
+@@ -57,7 +57,7 @@
+ #undef CUR
+ #define CUR SP_TERMTYPE
+ 
+-MODULE_ID("$Id: lib_set_term.c,v 1.195 2025/02/08 15:54:53 tom Exp $")
++MODULE_ID("$Id: lib_set_term.c,v 1.196 2025/02/15 12:55:53 tom Exp $")
+ 
+ #ifdef USE_TERM_DRIVER
+ #define MaxColors      InfoOf(sp).maxcolors
+@@ -331,8 +331,8 @@
+     T((T_CALLED("_nc_setupscreen(%d, %d, %p, %d, %d)"),
+        slines, scolumns, (void *) output, filtered, slk_format));
+ 
+-    /* CURRENT_SCREE is reset in newterm() */
+-    if (CURRENT_SCREEN != NULL || slines <= 0 || scolumns <= 0)
++    /* CURRENT_SCREEN is reset in newterm() */
++    if (CURRENT_SCREEN)
+ 	returnCode(ERR);
+ 
+ #if NCURSES_SP_FUNCS
+@@ -392,6 +392,10 @@
+ #else
+     _nc_get_screensize(sp, &slines, &scolumns);
+ #endif
++    if (scolumns < 0)
++	scolumns = 0;
++    if (slines < 0)
++	slines = 0;
+     SET_LINES(slines);
+     SET_COLS(scolumns);
+ 
+Index: ncurses/tinfo/captoinfo.c
+Prereq:  1.106 
+--- ncurses-6.5-20250208+/ncurses/tinfo/captoinfo.c	2025-01-12 10:51:43.000000000 +0000
++++ ncurses-6.5-20250215/ncurses/tinfo/captoinfo.c	2025-02-15 15:31:16.000000000 +0000
+@@ -98,7 +98,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: captoinfo.c,v 1.106 2025/01/12 10:51:43 tom Exp $")
++MODULE_ID("$Id: captoinfo.c,v 1.107 2025/02/15 15:31:16 tom Exp $")
+ 
+ #if 0
+ #define DEBUG_THIS(p) DEBUG(9, p)
+@@ -247,24 +247,24 @@
+ }
+ 
+ static void
+-getparm(int parm, int n)
+-/* push n copies of param on the terminfo stack if not already there */
++getparam(int parameter, int n)
++/* push n copies of parameter on the terminfo stack if not already there */
+ {
+     int nn;
+ 
+     if (seenr) {
+-	if (parm == 1)
+-	    parm = 2;
+-	else if (parm == 2)
+-	    parm = 1;
++	if (parameter == 1)
++	    parameter = 2;
++	else if (parameter == 2)
++	    parameter = 1;
+     }
+ 
+     for (nn = 0; nn < n; ++nn) {
+ 	dp = save_string(dp, "%p");
+-	dp = save_char(dp, '0' + parm);
++	dp = save_char(dp, '0' + parameter);
+     }
+ 
+-    if (onstack == parm) {
++    if (onstack == parameter) {
+ 	if (n > 1) {
+ 	    _nc_warning("string may not be optimal");
+ 	    dp = save_string(dp, "%Pa");
+@@ -277,13 +277,13 @@
+     if (onstack != 0)
+ 	push();
+ 
+-    onstack = parm;
++    onstack = parameter;
+ 
+-    if (seenn && parm < 3) {
++    if (seenn && parameter < 3) {
+ 	dp = save_string(dp, "%{96}%^");
+     }
+ 
+-    if (seenm && parm < 3) {
++    if (seenm && parameter < 3) {
+ 	dp = save_string(dp, "%{127}%^");
+     }
+ }
+@@ -353,20 +353,20 @@
+ 		break;
+ 	    case '6':
+ 	    case 'B':
+-		getparm(param, 1);
++		getparam(param, 1);
+ 		dp = save_string(dp, "%{10}%/%{16}%*");
+-		getparm(param, 1);
++		getparam(param, 1);
+ 		dp = save_string(dp, "%{10}%m%+");
+ 		break;
+ 	    case '8':
+ 	    case 'D':
+-		getparm(param, 2);
++		getparam(param, 2);
+ 		dp = save_string(dp, "%{2}%*%-");
+ 		break;
+ 	    case '>':
+ 		/* %?%{x}%>%t%{y}%+%; */
+ 		if (s[0] && s[1]) {
+-		    getparm(param, 2);
++		    getparam(param, 2);
+ 		    dp = save_string(dp, "%?");
+ 		    s += cvtchar(s);
+ 		    dp = save_string(dp, "%>%t");
+@@ -385,9 +385,9 @@
+ 		    int l;
+ 		    l = 2;
+ 		    if (*s != '=')
+-			getparm(param, 1);
++			getparam(param, 1);
+ 		    if (s[1] == 'p') {
+-			getparm(param + s[2] - '@', 1);
++			getparam(param + s[2] - '@', 1);
+ 			if (param != onstack) {
+ 			    pop();
+ 			    param--;
+@@ -423,12 +423,12 @@
+ 		    s += l;
+ 		    break;
+ 		}
+-		getparm(param, 1);
++		getparam(param, 1);
+ 		s += cvtchar(s);
+ 		dp = save_string(dp, "%+");
+ 		break;
+ 	    case '+':
+-		getparm(param, 1);
++		getparam(param, 1);
+ 		s += cvtchar(s);
+ 		dp = save_string(dp, "%+%c");
+ 		pop();
+@@ -436,22 +436,22 @@
+ 	    case 's':
+ #ifdef WATERLOO
+ 		s += cvtchar(s);
+-		getparm(param, 1);
++		getparam(param, 1);
+ 		dp = save_string(dp, "%-");
+ #else
+-		getparm(param, 1);
++		getparam(param, 1);
+ 		dp = save_string(dp, "%s");
+ 		pop();
+ #endif /* WATERLOO */
+ 		break;
+ 	    case '-':
+ 		s += cvtchar(s);
+-		getparm(param, 1);
++		getparam(param, 1);
+ 		dp = save_string(dp, "%-%c");
+ 		pop();
+ 		break;
+ 	    case '.':
+-		getparm(param, 1);
++		getparam(param, 1);
+ 		dp = save_string(dp, "%c");
+ 		pop();
+ 		break;
+@@ -467,18 +467,18 @@
+ 		goto invalid;
+ 	    case '2':
+ 	      see02:
+-		getparm(param, 1);
++		getparam(param, 1);
+ 		dp = save_string(dp, "%2d");
+ 		pop();
+ 		break;
+ 	    case '3':
+ 	      see03:
+-		getparm(param, 1);
++		getparam(param, 1);
+ 		dp = save_string(dp, "%3d");
+ 		pop();
+ 		break;
+ 	    case 'd':
+-		getparm(param, 1);
++		getparam(param, 1);
+ 		dp = save_string(dp, "%d");
+ 		pop();
+ 		break;
+Index: ncurses/tinfo/lib_tparm.c
+Prereq:  1.156 
+--- ncurses-6.5-20250208+/ncurses/tinfo/lib_tparm.c	2025-01-18 14:47:35.000000000 +0000
++++ ncurses-6.5-20250215/ncurses/tinfo/lib_tparm.c	2025-02-15 15:20:16.000000000 +0000
+@@ -53,7 +53,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: lib_tparm.c,v 1.156 2025/01/18 14:47:35 tom Exp $")
++MODULE_ID("$Id: lib_tparm.c,v 1.157 2025/02/15 15:20:16 tom Exp $")
+ 
+ /*
+  *	char *
+@@ -87,7 +87,7 @@
+  *                     The ':' is used to avoid making %+ or %-
+  *                     patterns (see below).
+  *
+- *	     %p[1-9]   push ith parm
++ *	     %p[1-9]   push ith param
+  *	     %P[a-z]   set dynamic variable [a-z] to pop()
+  *	     %g[a-z]   get dynamic variable [a-z] and push it
+  *	     %P[A-Z]   set static variable [A-Z] to pop()
+@@ -102,7 +102,7 @@
+  *	     %= %> %<  logical operations: push(pop() op pop())
+  *	     %A %O     logical and & or operations for conditionals
+  *	     %! %~     unary operations push(op pop())
+- *	     %i        add 1 to first two parms (for ANSI terminals)
++ *	     %i        add 1 to first two params (for ANSI terminals)
+  *
+  *	     %? expr %t thenpart %e elsepart %;
+  *	               if-then-else, %e elsepart is optional.
+Index: ncurses/tinfo/lib_win32con.c
+Prereq:  1.16 
+--- ncurses-6.5-20250208+/ncurses/tinfo/lib_win32con.c	2024-10-19 21:06:11.000000000 +0000
++++ ncurses-6.5-20250215/ncurses/tinfo/lib_win32con.c	2025-02-15 15:43:26.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -38,7 +38,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_win32con.c,v 1.16 2024/10/19 21:06:11 tom Exp $")
++MODULE_ID("$Id: lib_win32con.c,v 1.17 2025/02/15 15:43:26 tom Exp $")
+ 
+ #if defined(_NC_WINDOWS)
+ 
+@@ -964,7 +964,7 @@
+ 			    continue;
+ 			    /* e.g., FOCUS_EVENT */
+ 			default:
+-			    T(("twait:event Tyoe %d", inp_rec.EventType));
++			    T(("twait:event Type %d", inp_rec.EventType));
+ 			    CONSUME();
+ 			    _nc_console_selectActiveHandle();
+ 			    continue;
+Index: ncurses/trace/varargs.c
+Prereq:  1.15 
+--- ncurses-6.5-20250208+/ncurses/trace/varargs.c	2024-12-07 18:00:11.000000000 +0000
++++ ncurses-6.5-20250215/ncurses/trace/varargs.c	2025-02-15 15:22:14.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2001-2008,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -35,7 +35,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: varargs.c,v 1.15 2024/12/07 18:00:11 tom Exp $")
++MODULE_ID("$Id: varargs.c,v 1.16 2025/02/15 15:22:14 tom Exp $")
+ 
+ #ifdef TRACE
+ 
+@@ -60,7 +60,7 @@
+ _nc_varargs(const char *fmt, va_list ap)
+ {
+     char buffer[BUFSIZ];
+-    const char *param;
++    const char *value;
+     int n;
+ 
+     if (fmt == NULL || *fmt == '\0')
+@@ -79,16 +79,16 @@
+ 	    int done = FALSE;
+ 	    int ival = 0;
+ 	    int type = 0;
+-	    ARGTYPE parm[MAX_PARMS];
+-	    int parms = 0;
++	    ARGTYPE param[MAX_PARMS];
++	    int params = 0;
+ 	    ARGTYPE used = atUnknown;
+ 
+ 	    while (*++fmt != '\0' && !done) {
+ 
+ 		if (*fmt == '*') {
+ 		    VA_INT(int);
+-		    if (parms < MAX_PARMS)
+-			parm[parms++] = atInteger;
++		    if (params < MAX_PARMS)
++			param[params++] = atInteger;
+ 		} else if (isalpha(UChar(*fmt))) {
+ 		    done = TRUE;
+ 		    switch (*fmt) {
+@@ -141,11 +141,11 @@
+ 		} else if (*fmt == '%') {
+ 		    done = TRUE;
+ 		}
+-		if (used != atUnknown && parms < MAX_PARMS) {
+-		    parm[parms++] = used;
+-		    for (n = 0; n < parms; ++n) {
+-			used = parm[n];
+-			param = buffer;
++		if (used != atUnknown && params < MAX_PARMS) {
++		    param[params++] = used;
++		    for (n = 0; n < params; ++n) {
++			used = param[n];
++			value = buffer;
+ 			switch (used) {
+ 			case atInteger:
+ 			    _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
+@@ -160,19 +160,19 @@
+ 					"%p", pval);
+ 			    break;
+ 			case atString:
+-			    param = _nc_visbuf2(1, sval);
++			    value = _nc_visbuf2(1, sval);
+ 			    break;
+ 			case atUnknown:
+ 			default:
+ 			    _nc_STRCPY(buffer, "?", sizeof(buffer));
+ 			    break;
+ 			}
+-			MyLength += strlen(param) + 2;
++			MyLength += strlen(value) + 2;
+ 			MyBuffer = typeRealloc(char, MyLength, MyBuffer);
+ 			if (MyBuffer != NULL) {
+ 			    _nc_SPRINTF(MyBuffer + strlen(MyBuffer),
+ 					_nc_SLIMIT(MyLength - strlen(MyBuffer))
+-					", %s", param);
++					", %s", value);
+ 			}
+ 		    }
+ 		}
+Index: ncurses/tty/hardscroll.c
+Prereq:  1.60 
+--- ncurses-6.5-20250208+/ncurses/tty/hardscroll.c	2025-01-12 10:51:43.000000000 +0000
++++ ncurses-6.5-20250215/ncurses/tty/hardscroll.c	2025-02-15 15:12:54.000000000 +0000
+@@ -107,7 +107,7 @@
+ 			THE ALGORITHM
+ 
+ The scrolling is done in two passes. The first pass is from top to bottom
+-scroling hunks UP. The second one is from bottom to top scrolling hunks DOWN.
++scrolling hunks UP. The second one is from bottom to top scrolling hunks DOWN.
+ Obviously enough, no lines to be scrolled will be destroyed. (lav)
+ 
+ HOW TO TEST THIS:
+@@ -148,7 +148,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: hardscroll.c,v 1.60 2025/01/12 10:51:43 tom Exp $")
++MODULE_ID("$Id: hardscroll.c,v 1.61 2025/02/15 15:12:54 tom Exp $")
+ 
+ #if defined(SCROLLDEBUG) || defined(HASHDEBUG)
+ 
+Index: ncurses/tty/lib_tstp.c
+Prereq:  1.58 
+--- ncurses-6.5-20250208+/ncurses/tty/lib_tstp.c	2024-12-21 18:43:50.000000000 +0000
++++ ncurses-6.5-20250215/ncurses/tty/lib_tstp.c	2025-02-15 14:52:13.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2014,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: lib_tstp.c,v 1.58 2024/12/21 18:43:50 tom Exp $")
++MODULE_ID("$Id: lib_tstp.c,v 1.59 2025/02/15 14:52:13 tom Exp $")
+ 
+ #if defined(SIGTSTP) && (HAVE_SIGACTION || HAVE_SIGVEC)
+ #define USE_SIGTSTP 1
+@@ -367,8 +367,8 @@
+ 	result = FALSE;
+     }
+ #endif
+-    T(("CatchIfDefault - will %scatch %s",
+-       result ? "" : "not ", signal_name(sig)));
++    T(("CatchIfDefault - will%s catch %s",
++       result ? "" : " not", signal_name(sig)));
+     return result;
+ }
+ 
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250208+/package/debian-mingw/changelog	2025-02-08 11:01:51.000000000 +0000
++++ ncurses-6.5-20250215/package/debian-mingw/changelog	2025-02-15 12:35:22.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250208) unstable; urgency=low
++ncurses6td (6.5+20250215) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 08 Feb 2025 06:01:51 -0500
++ -- Thomas E. Dickey   Sat, 15 Feb 2025 07:35:22 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250208+/package/debian-mingw64/changelog	2025-02-08 11:01:51.000000000 +0000
++++ ncurses-6.5-20250215/package/debian-mingw64/changelog	2025-02-15 12:35:22.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250208) unstable; urgency=low
++ncurses6td (6.5+20250215) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 08 Feb 2025 06:01:51 -0500
++ -- Thomas E. Dickey   Sat, 15 Feb 2025 07:35:22 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250208+/package/debian/changelog	2025-02-08 11:01:51.000000000 +0000
++++ ncurses-6.5-20250215/package/debian/changelog	2025-02-15 12:35:22.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250208) unstable; urgency=low
++ncurses6td (6.5+20250215) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 08 Feb 2025 06:01:51 -0500
++ -- Thomas E. Dickey   Sat, 15 Feb 2025 07:35:22 -0500
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.688 
+--- ncurses-6.5-20250208+/package/mingw-ncurses.nsi	2025-02-08 11:01:51.000000000 +0000
++++ ncurses-6.5-20250215/package/mingw-ncurses.nsi	2025-02-15 12:35:22.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.688 2025/02/08 11:01:51 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.689 2025/02/15 12:35:22 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0208"
++!define VERSION_MMDD  "0215"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250208+/package/mingw-ncurses.spec	2025-02-08 11:01:51.000000000 +0000
++++ ncurses-6.5-20250215/package/mingw-ncurses.spec	2025-02-15 12:35:22.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250208
++Release: 20250215
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20250208+/package/ncurses.spec	2025-02-08 11:01:51.000000000 +0000
++++ ncurses-6.5-20250215/package/ncurses.spec	2025-02-15 12:35:22.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250208
++Release: 20250215
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20250208+/package/ncursest.spec	2025-02-08 11:01:51.000000000 +0000
++++ ncurses-6.5-20250215/package/ncursest.spec	2025-02-15 12:35:22.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250208
++Release: 20250215
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/newdemo.c
+Prereq:  1.48 
+--- ncurses-6.5-20250208+/test/newdemo.c	2022-12-10 23:36:05.000000000 +0000
++++ ncurses-6.5-20250215/test/newdemo.c	2025-02-15 15:15:25.000000000 +0000
+@@ -2,7 +2,7 @@
+  *  newdemo.c	-	A demo program using PDCurses. The program illustrate
+  *  	 		the use of colours for text output.
+  *
+- * $Id: newdemo.c,v 1.48 2022/12/10 23:36:05 tom Exp $
++ * $Id: newdemo.c,v 1.49 2025/02/15 15:15:25 tom Exp $
+  */
+ 
+ #include 
+@@ -288,7 +288,7 @@
+ 	set_colors(win, 2, COLOR_RED, COLOR_RED);
+ 	box(win, ACS_VLINE, ACS_HLINE);
+ 	wrefresh(win);
+-	/* Do ramdom output of a character */
++	/* Do random output of a character */
+ 	use_colors(win, 1, A_NORMAL);
+ 	c = 'a';
+ 	for (i = 0; i < 5000; ++i) {
+Index: test/tclock.c
+Prereq:  1.50 
+--- ncurses-6.5-20250208+/test/tclock.c	2024-12-07 22:46:42.000000000 +0000
++++ ncurses-6.5-20250215/test/tclock.c	2025-02-15 15:15:36.000000000 +0000
+@@ -1,4 +1,4 @@
+-/* $Id: tclock.c,v 1.50 2024/12/07 22:46:42 tom Exp $ */
++/* $Id: tclock.c,v 1.51 2025/02/15 15:15:36 tom Exp $ */
+ 
+ #define NEED_TIME_H
+ #include 
+@@ -293,7 +293,7 @@
+ int
+ main(void)
+ {
+-    printf("This program requires the header math.h and trignometric functions\n");
++    printf("This program requires the header math.h and trigonometric functions\n");
+     ExitProgram(EXIT_FAILURE);
+ }
+ #endif
+Index: test/test_tparm.c
+Prereq:  1.43 
+--- ncurses-6.5-20250208+/test/test_tparm.c	2024-12-07 23:13:34.000000000 +0000
++++ ncurses-6.5-20250215/test/test_tparm.c	2025-02-15 15:42:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -29,7 +29,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: test_tparm.c,v 1.43 2024/12/07 23:13:34 tom Exp $
++ * $Id: test_tparm.c,v 1.44 2025/02/15 15:42:37 tom Exp $
+  *
+  * Exercise tparm/tiparm, either for all possible capabilities with fixed
+  * parameters, or one capability with specific combinations of parameters.
+@@ -634,7 +634,7 @@
+ 	    }
+ 
+ 	    if (v_opt) {
+-		printf("[%d:%d] %d paramerized cap%s * %ld test-case%s \"%s\"\n",
++		printf("[%d:%d] %d parameterized cap%s * %ld test-case%s \"%s\"\n",
+ 		       r_run + 1, r_opt,
+ 		       PLURAL(use_caps),
+ 		       PLURAL(use_parms),
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250216.patch b/packages/ncurses/6.5/ncurses-6.5-20250216.patch
new file mode 100644
index 0000000000..5b9e5f53c2
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250216.patch
@@ -0,0 +1,300 @@
+# ncurses 6.5 - patch 20250216 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250216.patch.gz
+# patch by Thomas E. Dickey 
+# created  Mon Feb 17 01:05:58 UTC 2025
+# ------------------------------------------------------------------------------
+# NEWS                             |    8 +++++++-
+# VERSION                          |    2 +-
+# dist.mk                          |    4 ++--
+# ncurses/base/lib_chgat.c         |    4 ++--
+# ncurses/tinfo/alloc_entry.c      |    8 +++++++-
+# ncurses/tinfo/alloc_ttype.c      |   23 ++++++++++++++---------
+# 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 +-
+# 13 files changed, 44 insertions(+), 27 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4245 
+--- ncurses-6.5-20250215+/NEWS	2025-02-16 00:19:24.000000000 +0000
++++ ncurses-6.5-20250216/NEWS	2025-02-16 23:54:33.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4245 2025/02/16 00:19:24 tom Exp $
++-- $Id: NEWS,v 1.4248 2025/02/16 23:54:33 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.
+ 
++20250216
++	+ add limit-checks in alloc_entry.c and alloc_ttype.c to avoid indexing
++	  errors when using infocmp to compare all capabilities when processing
++	  a malformed terminfo binary which has a valid header (testcase by
++	  "Ekkosun").
++
+ 20250215
+ 	+ add gzip option for suppressing filename/timestamp information to an
+ 	  overlooked case (cf: 20240330).
+Index: VERSION
+--- ncurses-6.5-20250215+/VERSION	2025-02-15 12:35:22.000000000 +0000
++++ ncurses-6.5-20250216/VERSION	2025-02-16 22:35:29.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250215
++5:0:10	6.5	20250216
+Index: dist.mk
+Prereq:  1.1655 
+--- ncurses-6.5-20250215+/dist.mk	2025-02-15 12:35:22.000000000 +0000
++++ ncurses-6.5-20250216/dist.mk	2025-02-16 22:35:29.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1655 2025/02/15 12:35:22 tom Exp $
++# $Id: dist.mk,v 1.1656 2025/02/16 22:35:29 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 = 5
+-NCURSES_PATCH = 20250215
++NCURSES_PATCH = 20250216
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: ncurses/base/lib_chgat.c
+Prereq:  1.14 
+--- ncurses-6.5-20250215+/ncurses/base/lib_chgat.c	2025-02-15 20:53:36.000000000 +0000
++++ ncurses-6.5-20250216/ncurses/base/lib_chgat.c	2025-02-15 20:53:36.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2015 Thomas E. Dickey                                     *
++ * Copyright 2020-2015,2025 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: lib_chgat.c,v 1.14 2025/02/15 20:53:36 tom Exp $")
++MODULE_ID("$Id: lib_chgat.c,v 1.15 2025/02/15 20:53:36 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ wchgat(WINDOW *win,
+Index: ncurses/tinfo/alloc_entry.c
+Prereq:  1.82 
+--- ncurses-6.5-20250215+/ncurses/tinfo/alloc_entry.c	2025-01-11 20:37:19.000000000 +0000
++++ ncurses-6.5-20250216/ncurses/tinfo/alloc_entry.c	2025-02-16 17:57:12.000000000 +0000
+@@ -48,7 +48,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: alloc_entry.c,v 1.82 2025/01/11 20:37:19 tom Exp $")
++MODULE_ID("$Id: alloc_entry.c,v 1.83 2025/02/16 17:57:12 tom Exp $")
+ 
+ #define ABSENT_OFFSET    -1
+ #define CANCELLED_OFFSET -2
+@@ -360,6 +360,8 @@
+     }
+ #endif
+     for_each_boolean(i, from) {
++	if (i >= NUM_BOOLEANS(to))
++	    break;
+ 	if (to->Booleans[i] != (NCURSES_SBOOL) CANCELLED_BOOLEAN) {
+ 	    int mergebool = from->Booleans[i];
+ 
+@@ -371,6 +373,8 @@
+     }
+ 
+     for_each_number(i, from) {
++	if (i >= NUM_NUMBERS(to))
++	    break;
+ 	if (to->Numbers[i] != CANCELLED_NUMERIC) {
+ 	    int mergenum = from->Numbers[i];
+ 
+@@ -387,6 +391,8 @@
+      * we ever want to deallocate entries.
+      */
+     for_each_string(i, from) {
++	if (i >= NUM_STRINGS(to))
++	    break;
+ 	if (to->Strings[i] != CANCELLED_STRING) {
+ 	    char *mergestring = from->Strings[i];
+ 
+Index: ncurses/tinfo/alloc_ttype.c
+Prereq:  1.53 
+--- ncurses-6.5-20250215+/ncurses/tinfo/alloc_ttype.c	2024-12-07 18:08:56.000000000 +0000
++++ ncurses-6.5-20250216/ncurses/tinfo/alloc_ttype.c	2025-02-16 18:31:37.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1999-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: alloc_ttype.c,v 1.53 2024/12/07 18:08:56 tom Exp $")
++MODULE_ID("$Id: alloc_ttype.c,v 1.55 2025/02/16 18:31:37 tom Exp $")
+ 
+ #if NCURSES_XNAMES
+ /*
+@@ -231,13 +231,15 @@
+ static int
+ _nc_find_ext_name(const TERMTYPE2 *tp, const char *name, int token_type)
+ {
+-    unsigned j;
+-    unsigned first = _nc_first_ext_name(tp, token_type);
+-    unsigned last = _nc_last_ext_name(tp, token_type);
++    if (name != NULL) {
++	unsigned j;
++	unsigned first = _nc_first_ext_name(tp, token_type);
++	unsigned last = _nc_last_ext_name(tp, token_type);
+ 
+-    for (j = first; j < last; j++) {
+-	if (!strcmp(name, tp->ext_Names[j])) {
+-	    return (int) j;
++	for (j = first; j < last; j++) {
++	    if (!strcmp(name, tp->ext_Names[j])) {
++		return (int) j;
++	    }
+ 	}
+     }
+     return -1;
+@@ -381,9 +383,12 @@
+ 	      NonNull(to->term_names),
+ 	      NonNull(from->term_names)));
+     for (j = first; j < last;) {
+-	char *name = to->ext_Names[j];
++	char *name;
+ 	int j_str = to->num_Strings - first - to->ext_Strings;
+ 
++	if ((j + j_str) > NUM_STRINGS(to))
++	    break;
++	name = to->ext_Names[j];
+ 	if (to->Strings[j + j_str] == CANCELLED_STRING) {
+ 	    if (_nc_find_ext_name(from, to->ext_Names[j], BOOLEAN) >= 0) {
+ 		if (_nc_del_ext_name(to, name, STRING)
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250215+/package/debian-mingw/changelog	2025-02-15 12:35:22.000000000 +0000
++++ ncurses-6.5-20250216/package/debian-mingw/changelog	2025-02-16 22:35:29.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250215) unstable; urgency=low
++ncurses6td (6.5+20250216) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 15 Feb 2025 07:35:22 -0500
++ -- Thomas E. Dickey   Sun, 16 Feb 2025 17:35:29 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250215+/package/debian-mingw64/changelog	2025-02-15 12:35:22.000000000 +0000
++++ ncurses-6.5-20250216/package/debian-mingw64/changelog	2025-02-16 22:35:29.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250215) unstable; urgency=low
++ncurses6td (6.5+20250216) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 15 Feb 2025 07:35:22 -0500
++ -- Thomas E. Dickey   Sun, 16 Feb 2025 17:35:29 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250215+/package/debian/changelog	2025-02-15 12:35:22.000000000 +0000
++++ ncurses-6.5-20250216/package/debian/changelog	2025-02-16 22:35:29.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250215) unstable; urgency=low
++ncurses6td (6.5+20250216) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 15 Feb 2025 07:35:22 -0500
++ -- Thomas E. Dickey   Sun, 16 Feb 2025 17:35:29 -0500
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.689 
+--- ncurses-6.5-20250215+/package/mingw-ncurses.nsi	2025-02-15 12:35:22.000000000 +0000
++++ ncurses-6.5-20250216/package/mingw-ncurses.nsi	2025-02-16 22:35:29.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.689 2025/02/15 12:35:22 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.690 2025/02/16 22:35:29 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0215"
++!define VERSION_MMDD  "0216"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250215+/package/mingw-ncurses.spec	2025-02-15 12:35:22.000000000 +0000
++++ ncurses-6.5-20250216/package/mingw-ncurses.spec	2025-02-16 22:35:29.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250215
++Release: 20250216
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20250215+/package/ncurses.spec	2025-02-15 12:35:22.000000000 +0000
++++ ncurses-6.5-20250216/package/ncurses.spec	2025-02-16 22:35:29.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250215
++Release: 20250216
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20250215+/package/ncursest.spec	2025-02-15 12:35:22.000000000 +0000
++++ ncurses-6.5-20250216/package/ncursest.spec	2025-02-16 22:35:29.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250215
++Release: 20250216
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250222.patch b/packages/ncurses/6.5/ncurses-6.5-20250222.patch
new file mode 100644
index 0000000000..fc70ef2b73
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250222.patch
@@ -0,0 +1,1333 @@
+# ncurses 6.5 - patch 20250222 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250222.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sat Feb 22 23:47:29 UTC 2025
+# ------------------------------------------------------------------------------
+# NEWS                             |    8 ++++++-
+# VERSION                          |    2 -
+# dist.mk                          |    4 +--
+# man/MKterminfo.sh                |   10 +++++---
+# man/infocmp.1m                   |    6 ++---
+# man/terminfo.tail                |    4 +--
+# ncurses/base/lib_addstr.c        |   12 +++++-----
+# ncurses/base/lib_driver.c        |    6 ++---
+# ncurses/base/lib_newterm.c       |   10 ++++----
+# ncurses/base/safe_sprintf.c      |   14 ++++++------
+# ncurses/base/vsscanf.c           |    8 +++----
+# ncurses/report_hashing.c         |    6 ++---
+# ncurses/tinfo/access.c           |   10 ++++----
+# ncurses/tinfo/captoinfo.c        |    4 +--
+# ncurses/tinfo/getenv_num.c       |    6 ++---
+# ncurses/tinfo/lib_data.c         |    6 ++---
+# ncurses/tinfo/lib_setup.c        |   12 +++++-----
+# ncurses/tinfo/obsolete.c         |   10 ++++----
+# ncurses/tinfo/parse_entry.c      |   14 ++++++------
+# ncurses/tinfo/read_termcap.c     |   42 ++++++++++++++++++-------------------
+# ncurses/tinfo/tinfo_driver.c     |   18 +++++++--------
+# ncurses/trace/lib_tracebits.c    |    8 +++----
+# ncurses/widechar/lib_ins_wch.c   |    7 ++----
+# ncurses/widechar/widechars.c     |    8 +++----
+# ncurses/win32con/win32_driver.c  |   18 +++++++--------
+# ncurses/win32con/win_driver.c    |   30 +++++++++++++-------------
+# 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 -
+# 33 files changed, 156 insertions(+), 149 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4248 
+--- ncurses-6.5-20250216+/NEWS	2025-02-16 23:54:33.000000000 +0000
++++ ncurses-6.5-20250222/NEWS	2025-02-20 09:09:47.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4248 2025/02/16 23:54:33 tom Exp $
++-- $Id: NEWS,v 1.4251 2025/02/20 09:09:47 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.
+ 
++20250222
++	+ modify treatment of "n" parameter for waddnstr, waddnwstr, and
++	  wins_nwstr to return OK when "n" is zero, for consistency with other
++	  implementations (report by Benjamin Barenblat, cf: 20231118).
++	+ formatting improvements for terminfo.5 (Debian #1096164).
++	
+ 20250216
+ 	+ add limit-checks in alloc_entry.c and alloc_ttype.c to avoid indexing
+ 	  errors when using infocmp to compare all capabilities when processing
+Index: VERSION
+--- ncurses-6.5-20250216+/VERSION	2025-02-16 22:35:29.000000000 +0000
++++ ncurses-6.5-20250222/VERSION	2025-02-22 09:14:10.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250216
++5:0:10	6.5	20250222
+Index: dist.mk
+Prereq:  1.1656 
+--- ncurses-6.5-20250216+/dist.mk	2025-02-16 22:35:29.000000000 +0000
++++ ncurses-6.5-20250222/dist.mk	2025-02-22 09:14:10.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1656 2025/02/16 22:35:29 tom Exp $
++# $Id: dist.mk,v 1.1657 2025/02/22 09:14:10 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 = 5
+-NCURSES_PATCH = 20250216
++NCURSES_PATCH = 20250222
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: man/MKterminfo.sh
+Prereq:  1.20 
+--- ncurses-6.5-20250216+/man/MKterminfo.sh	2024-01-13 20:37:40.000000000 +0000
++++ ncurses-6.5-20250222/man/MKterminfo.sh	2025-02-20 00:14:25.000000000 +0000
+@@ -1,10 +1,10 @@
+ #!/bin/sh
+-# $Id: MKterminfo.sh,v 1.20 2024/01/13 20:37:40 tom Exp $
++# $Id: MKterminfo.sh,v 1.21 2025/02/20 00:14:25 tom Exp $
+ #
+ # MKterminfo.sh -- generate terminfo.5 from Caps tabular data
+ #
+ #***************************************************************************
+-# Copyright 2018-2020,2022 Thomas E. Dickey                                *
++# Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ # Copyright 1998-2003,2017 Free Software Foundation, Inc.                  *
+ #                                                                          *
+ # Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -76,6 +76,9 @@
+ rm -f $sorted $temp $unsorted
+ 
+ cat $caps | sed -n "\
++/^#%.TS/i.na
++/^#%.TE/a\
++.ad
+ /%%-STOP-HERE-%%/q
+ /^#%center/s, expand,,
+ /^#%lw25/s, lw6 , lw7 ,
+@@ -84,7 +87,6 @@
+ s/[	][	]*/	/g
+ s/$/T}/
+ s/	[A-Z0-9_()\-][A-Z0-9_()\-]*	[0-9\-][0-9\-]*	[Y\-][B\-][C\-][G\-][EK\-]\**	/	T{\\
+-.ad l\
+ /
+ s/	bool	/	/p
+ s/	num	/	/p
+@@ -116,7 +118,7 @@
+ done <$unsorted
+ test $saved = yes && sort $temp >>$sorted
+ 
+-sed -e 's/^\.\.$//' $sorted | tr "\005\006" "\012\134"
++sed -e 's/^\.\.$//' $sorted | tr "\005\006" "\012\134" | sed -e '/^$/d'
+ 
+ sed	-e '/^center expand;/s, expand,,' \
+ 	-e '/^\.TS/,/^\\/s, lw[1-9][0-9]*\., l.,' \
+Index: man/infocmp.1m
+Prereq:  1.124 
+--- ncurses-6.5-20250216+/man/infocmp.1m	2025-02-15 19:37:37.000000000 +0000
++++ ncurses-6.5-20250222/man/infocmp.1m	2025-02-18 00:05:00.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: infocmp.1m,v 1.124 2025/02/15 19:37:37 tom Exp $
+-.TH @INFOCMP@ 1M 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: infocmp.1m,v 1.126 2025/02/18 00:05:00 tom Exp $
++.TH @INFOCMP@ 1M 2025-02-17 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -111,7 +111,7 @@
+ expressions with the content of other entries by reference.
+ A
+ .I "\%term\%info entry"
+-entry comprises
++comprises
+ a list of one or more terminal type identifiers,
+ a human-readable description of the terminal type,
+ and a list of terminal
+Index: man/terminfo.tail
+Prereq:  1.156 
+--- ncurses-6.5-20250216+/man/terminfo.tail	2025-01-19 00:51:10.000000000 +0000
++++ ncurses-6.5-20250222/man/terminfo.tail	2025-02-17 23:55:31.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: terminfo.tail,v 1.156 2025/01/19 00:51:10 tom Exp $
++.\" $Id: terminfo.tail,v 1.157 2025/02/17 23:55:31 tom Exp $
+ .ps +1
+ .SS "User-Defined Capabilities"
+ .
+@@ -1014,7 +1014,7 @@
+ with one parameter,
+ .IR n ,
+ to delete
+-.IR n "characters,"
++.IR n " characters,"
+ 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
+Index: ncurses/base/lib_addstr.c
+Prereq:  1.63 
+--- ncurses-6.5-20250216+/ncurses/base/lib_addstr.c	2024-12-07 20:00:48.000000000 +0000
++++ ncurses-6.5-20250222/ncurses/base/lib_addstr.c	2025-02-20 08:53:36.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -45,7 +45,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_addstr.c,v 1.63 2024/12/07 20:00:48 tom Exp $")
++MODULE_ID("$Id: lib_addstr.c,v 1.65 2025/02/20 08:53:36 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ waddnstr(WINDOW *win, const char *astr, int n)
+@@ -55,8 +55,8 @@
+ 
+     T((T_CALLED("waddnstr(%p,%s,%d)"), (void *) win, _nc_visbufn(astr, n), n));
+ 
+-    if (win && (str != NULL) && (n != 0)) {
+-	bool explicit = (n > 0);
++    if (win != NULL && str != NULL) {
++	bool explicit = (n >= 0);
+ 
+ 	TR(TRACE_VIRTPUT | TRACE_ATTRS,
+ 	   ("... current %s", _traceattr(WINDOW_ATTRS(win))));
+@@ -230,8 +230,8 @@
+ 
+     T((T_CALLED("waddnwstr(%p,%s,%d)"), (void *) win, _nc_viswbufn(str, n), n));
+ 
+-    if (win && (str != NULL) && (n != 0)) {
+-	bool explicit = (n > 0);
++    if (win != NULL && str != NULL) {
++	bool explicit = (n >= 0);
+ 
+ 	TR(TRACE_VIRTPUT | TRACE_ATTRS,
+ 	   ("... current %s", _traceattr(WINDOW_ATTRS(win))));
+Index: ncurses/base/lib_driver.c
+Prereq:  1.10 
+--- ncurses-6.5-20250216+/ncurses/base/lib_driver.c	2024-12-14 22:31:35.000000000 +0000
++++ ncurses-6.5-20250222/ncurses/base/lib_driver.c	2025-02-20 01:02:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2009-2012,2014 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -34,7 +34,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_driver.c,v 1.10 2024/12/14 22:31:35 tom Exp $")
++MODULE_ID("$Id: lib_driver.c,v 1.11 2025/02/20 01:02:09 tom Exp $")
+ 
+ #ifndef EXP_WIN32_DRIVER
+ typedef struct DriverEntry {
+@@ -61,7 +61,7 @@
+     T((T_CALLED("_nc_get_driver(%p, %s, %p)"),
+        (void *) TCB, NonNull(name), (void *) errret));
+ 
+-    assert(TCB != 0);
++    assert(TCB != NULL);
+ 
+     for (i = 0; i < SIZEOF(DriverTable); i++) {
+ 	res = DriverTable[i].driver;
+Index: ncurses/base/lib_newterm.c
+Prereq:  1.107 
+--- ncurses-6.5-20250216+/ncurses/base/lib_newterm.c	2024-12-07 17:41:36.000000000 +0000
++++ ncurses-6.5-20250222/ncurses/base/lib_newterm.c	2025-02-20 01:02:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -49,7 +49,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_newterm.c,v 1.107 2024/12/07 17:41:36 tom Exp $")
++MODULE_ID("$Id: lib_newterm.c,v 1.108 2025/02/20 01:02:09 tom Exp $")
+ 
+ #ifdef USE_TERM_DRIVER
+ #define NumLabels      InfoOf(SP_PARM).numlabels
+@@ -190,7 +190,7 @@
+        (void *) ifp));
+ 
+ #if NCURSES_SP_FUNCS
+-    assert(SP_PARM != 0);
++    assert(SP_PARM != NULL);
+     if (SP_PARM == NULL)
+ 	returnSP(SP_PARM);
+ #endif
+@@ -216,7 +216,7 @@
+ 
+ 	_nc_set_screen(NULL);
+ #ifdef USE_TERM_DRIVER
+-	assert(new_term != 0);
++	assert(new_term != NULL);
+ #endif
+ 
+ #if NCURSES_SP_FUNCS
+@@ -251,7 +251,7 @@
+ #elif !NCURSES_SP_FUNCS
+ 	    _nc_set_screen(CURRENT_SCREEN);
+ #endif
+-	    assert(SP_PARM != 0);
++	    assert(SP_PARM != NULL);
+ 	    cols = *(ptrCols(SP_PARM));
+ #ifdef USE_TERM_DRIVER
+ 	    _nc_set_screen(SP_PARM);
+Index: ncurses/base/safe_sprintf.c
+Prereq:  1.38 
+--- ncurses-6.5-20250216+/ncurses/base/safe_sprintf.c	2024-07-27 19:22:23.000000000 +0000
++++ ncurses-6.5-20250222/ncurses/base/safe_sprintf.c	2025-02-20 01:07:05.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2013 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -34,7 +34,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: safe_sprintf.c,v 1.38 2024/07/27 19:22:23 tom Exp $")
++MODULE_ID("$Id: safe_sprintf.c,v 1.39 2025/02/20 01:07:05 tom Exp $")
+ 
+ #if USE_SAFE_SPRINTF
+ 
+@@ -60,12 +60,12 @@
+     size_t fmt_len;
+     char fmt_arg[BUFSIZ];
+ 
+-    if (fmt == 0 || *fmt == '\0')
++    if (fmt == NULL || *fmt == '\0')
+ 	return 0;
+     fmt_len = strlen(fmt) + 1;
+-    if ((format = typeMalloc(char, fmt_len)) == 0)
++    if ((format = typeMalloc(char, fmt_len)) == NULL)
+ 	  return -1;
+-    if ((buffer = typeMalloc(char, length)) == 0) {
++    if ((buffer = typeMalloc(char, length)) == NULL) {
+ 	free(format);
+ 	return -1;
+     }
+@@ -114,7 +114,7 @@
+ 				_nc_SLIMIT(sizeof(fmt_arg))
+ 				"%d", ival);
+ 		    fmt_len += strlen(fmt_arg);
+-		    if ((format = _nc_doalloc(format, fmt_len)) == 0) {
++		    if ((format = _nc_doalloc(format, fmt_len)) == NULL) {
+ 			free(buffer);
+ 			return -1;
+ 		    }
+@@ -162,7 +162,7 @@
+ 			if (prec > (int) length) {
+ 			    length = length + (size_t) prec;
+ 			    buffer = typeRealloc(char, length, buffer);
+-			    if (buffer == 0) {
++			    if (buffer == NULL) {
+ 				free(format);
+ 				return -1;
+ 			    }
+Index: ncurses/base/vsscanf.c
+Prereq:  1.22 
+--- ncurses-6.5-20250216+/ncurses/base/vsscanf.c	2023-09-23 18:48:57.000000000 +0000
++++ ncurses-6.5-20250222/ncurses/base/vsscanf.c	2025-02-20 01:08:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2023 Thomas E. Dickey                                     *
++ * Copyright 2020-2023,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2004,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -39,7 +39,7 @@
+ 
+ #if !HAVE_VSSCANF
+ 
+-MODULE_ID("$Id: vsscanf.c,v 1.22 2023/09/23 18:48:57 tom Exp $")
++MODULE_ID("$Id: vsscanf.c,v 1.23 2025/02/20 01:08:11 tom Exp $")
+ 
+ #if !(HAVE_VFSCANF || HAVE__DOSCAN)
+ 
+@@ -215,7 +215,7 @@
+ 	int eaten;
+ 	void *pointer;
+ 
+-	if (my_fmt != 0) {
++	if (my_fmt != NULL) {
+ 	    /*
+ 	     * Split the original format into chunks, adding a "%n" to the end
+ 	     * of each (except of course if it used %n), and use that
+@@ -229,7 +229,7 @@
+ 		state = sUnknown;
+ 		chunk = cUnknown;
+ 		other = oUnknown;
+-		pointer = 0;
++		pointer = NULL;
+ 		for (n = 0; format[n] != 0 && state != sFinal; ++n) {
+ 		    my_fmt[n] = format[n];
+ 		    switch (state) {
+Index: ncurses/report_hashing.c
+Prereq:  1.3 
+--- ncurses-6.5-20250216+/ncurses/report_hashing.c	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20250222/ncurses/report_hashing.c	2025-02-20 01:02:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020 Thomas E. Dickey                                          *
++ * Copyright 2020,2025 Thomas E. Dickey                                     *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -33,7 +33,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: report_hashing.c,v 1.3 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: report_hashing.c,v 1.4 2025/02/20 01:02:09 tom Exp $")
+ 
+ static void
+ check_names(const char *name, NCURSES_CONST char *const *table, int termcap)
+@@ -46,7 +46,7 @@
+     printf("%s:\n", name);
+     for (n = 0; table[n] != NULL; ++n) {
+ 	entry_ptr = _nc_find_entry(table[n], hash_table);
+-	if (entry_ptr == 0) {
++	if (entry_ptr == NULL) {
+ 	    printf("  %s\n", table[n]);
+ 	    errs++;
+ 	}
+Index: ncurses/tinfo/access.c
+Prereq:  1.41 
+--- ncurses-6.5-20250216+/ncurses/tinfo/access.c	2024-12-07 18:05:04.000000000 +0000
++++ ncurses-6.5-20250222/ncurses/tinfo/access.c	2025-02-20 01:02:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2011,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -52,7 +52,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: access.c,v 1.41 2024/12/07 18:05:04 tom Exp $")
++MODULE_ID("$Id: access.c,v 1.42 2025/02/20 01:02:09 tom Exp $")
+ 
+ #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
+ 
+@@ -78,7 +78,7 @@
+     }
+ #endif
+ #if defined(PROG_EXT)
+-    if ((s = strrchr(result, '.')) != 0) {
++    if ((s = strrchr(result, '.')) != NULL) {
+ 	if (!strcmp(s, PROG_EXT))
+ 	    *s = '\0';
+     }
+@@ -94,7 +94,7 @@
+ _nc_is_abs_path(const char *path)
+ {
+ #if defined(__EMX__) || defined(__DJGPP__)
+-#define is_pathname(s) ((((s) != 0) && ((s)[0] == '/')) \
++#define is_pathname(s) ((((s) != NULL) && ((s)[0] == '/')) \
+ 		  || (((s)[0] != 0) && ((s)[1] == ':')))
+ #else
+ #define is_pathname(s) ((s) != NULL && (s)[0] == '/')
+@@ -110,7 +110,7 @@
+ {
+     const char *test = strrchr(path, '/');
+ #ifdef __EMX__
+-    if (test == 0)
++    if (test == NULL)
+ 	test = strrchr(path, '\\');
+ #endif
+     if (test == NULL)
+Index: ncurses/tinfo/captoinfo.c
+Prereq:  1.107 
+--- ncurses-6.5-20250216+/ncurses/tinfo/captoinfo.c	2025-02-15 15:31:16.000000000 +0000
++++ ncurses-6.5-20250222/ncurses/tinfo/captoinfo.c	2025-02-20 00:48:11.000000000 +0000
+@@ -98,7 +98,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: captoinfo.c,v 1.107 2025/02/15 15:31:16 tom Exp $")
++MODULE_ID("$Id: captoinfo.c,v 1.108 2025/02/20 00:48:11 tom Exp $")
+ 
+ #if 0
+ #define DEBUG_THIS(p) DEBUG(9, p)
+@@ -980,7 +980,7 @@
+ 	 * 'str' always points to the end of what was scanned in this step,
+ 	 * but that may not be the end of the string.
+ 	 */
+-	assert(str != 0);
++	assert(str != NULL);
+ 	if (str == NULL || *str == '\0')
+ 	    break;
+ 
+Index: ncurses/tinfo/getenv_num.c
+Prereq:  1.10 
+--- ncurses-6.5-20250216+/ncurses/tinfo/getenv_num.c	2024-12-07 18:14:49.000000000 +0000
++++ ncurses-6.5-20250222/ncurses/tinfo/getenv_num.c	2025-02-20 01:02:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2013 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -37,7 +37,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: getenv_num.c,v 1.10 2024/12/07 18:14:49 tom Exp $")
++MODULE_ID("$Id: getenv_num.c,v 1.11 2025/02/20 01:02:09 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ _nc_getenv_num(const char *name)
+@@ -67,7 +67,7 @@
+ #elif HAVE_PUTENV
+ 	char *s;
+ 	_nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) "%s=%d", name, value);
+-	if ((s = strdup(buffer)) != 0)
++	if ((s = strdup(buffer)) != NULL)
+ 	    putenv(s);
+ #else
+ #error expected setenv/putenv functions
+Index: ncurses/tinfo/lib_data.c
+Prereq:  1.93 
+--- ncurses-6.5-20250216+/ncurses/tinfo/lib_data.c	2024-12-21 20:27:36.000000000 +0000
++++ ncurses-6.5-20250222/ncurses/tinfo/lib_data.c	2025-02-20 01:02:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 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: lib_data.c,v 1.93 2024/12/21 20:27:36 tom Exp $")
++MODULE_ID("$Id: lib_data.c,v 1.94 2025/02/20 01:02:09 tom Exp $")
+ 
+ /*
+  * OS/2's native linker complains if we don't initialize public data when
+@@ -97,7 +97,7 @@
+ {
+     my_screen = _nc_alloc_screen_sp();
+     T(("_nc_alloc_screen_sp %p", my_screen));
+-    return (my_screen != 0);
++    return (my_screen != NULL);
+ }
+ 
+ NCURSES_EXPORT(void)
+Index: ncurses/tinfo/lib_setup.c
+Prereq:  1.249 
+--- ncurses-6.5-20250216+/ncurses/tinfo/lib_setup.c	2025-01-18 14:47:35.000000000 +0000
++++ ncurses-6.5-20250222/ncurses/tinfo/lib_setup.c	2025-02-20 01:31:35.000000000 +0000
+@@ -49,7 +49,7 @@
+ #include 
+ #endif
+ 
+-MODULE_ID("$Id: lib_setup.c,v 1.249 2025/01/18 14:47:35 tom Exp $")
++MODULE_ID("$Id: lib_setup.c,v 1.250 2025/02/20 01:31:35 tom Exp $")
+ 
+ /****************************************************************************
+  *
+@@ -120,7 +120,7 @@
+ 	}
+     }
+ #else
+-    if (cur_term != 0) {
++    if (cur_term != NULL) {
+ 	result = TerminalType(cur_term).term_names;
+     }
+ #endif
+@@ -468,7 +468,7 @@
+     TERMINAL_CONTROL_BLOCK *TCB;
+     int my_tabsize;
+ 
+-    assert(termp != 0 && linep != 0 && colp != 0);
++    assert(termp != NULL && linep != NULL && colp != NULL);
+     TCB = (TERMINAL_CONTROL_BLOCK *) termp;
+ 
+     my_tabsize = TCB->info.tabsize;
+@@ -627,7 +627,7 @@
+     int old_lines;
+     int old_cols;
+ 
+-    assert(sp != 0);
++    assert(sp != NULL);
+ 
+     CallDriver_2(sp, td_getsize, &old_lines, &old_cols);
+ 
+@@ -767,8 +767,8 @@
+ 	T(("_nc_unicode_locale(%s) ->%d", env, result));
+ #else
+ 	char *env = _nc_get_locale();
+-	if (env != 0) {
+-	    if (strstr(env, ".UTF-8") != 0) {
++	if (env != NULL) {
++	    if (strstr(env, ".UTF-8") != NULL) {
+ 		result = TRUE;
+ 		T(("_nc_unicode_locale(%s) ->%d", env, result));
+ 	    }
+Index: ncurses/tinfo/obsolete.c
+Prereq:  1.12 
+--- ncurses-6.5-20250216+/ncurses/tinfo/obsolete.c	2024-12-07 21:24:18.000000000 +0000
++++ ncurses-6.5-20250222/ncurses/tinfo/obsolete.c	2025-02-20 01:12:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2013-2014,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -37,7 +37,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: obsolete.c,v 1.12 2024/12/07 21:24:18 tom Exp $")
++MODULE_ID("$Id: obsolete.c,v 1.13 2025/02/20 01:12:11 tom Exp $")
+ 
+ /*
+  * Obsolete entrypoint retained for binary compatibility.
+@@ -64,11 +64,11 @@
+ NCURSES_EXPORT(char *)
+ _nc_strdup(const char *s)
+ {
+-    char *result = 0;
+-    if (s != 0) {
++    char *result = NULL;
++    if (s != NULL) {
+ 	size_t need = strlen(s);
+ 	result = malloc(need + 1);
+-	if (result != 0) {
++	if (result != NULL) {
+ 	    _nc_STRCPY(result, s, need);
+ 	}
+     }
+Index: ncurses/tinfo/parse_entry.c
+Prereq:  1.113 
+--- ncurses-6.5-20250216+/ncurses/tinfo/parse_entry.c	2025-01-11 20:19:34.000000000 +0000
++++ ncurses-6.5-20250222/ncurses/tinfo/parse_entry.c	2025-02-20 09:11:49.000000000 +0000
+@@ -48,7 +48,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: parse_entry.c,v 1.113 2025/01/11 20:19:34 tom Exp $")
++MODULE_ID("$Id: parse_entry.c,v 1.115 2025/02/20 09:11:49 tom Exp $")
+ 
+ #ifdef LINT
+ static short const parametrized[] =
+@@ -492,8 +492,8 @@
+ 		 */
+ 		if (!strcmp("ma", _nc_curr_token.tk_name)) {
+ 		    entry_ptr = _nc_find_type_entry("ma", NUMBER,
+-						    _nc_syntax != 0);
+-		    assert(entry_ptr != 0);
++						    _nc_syntax != SYN_TERMINFO);
++		    assert(entry_ptr != NULL);
+ 		}
+ 	    } else if (entry_ptr->nte_type != token_type) {
+ 		/*
+@@ -510,15 +510,15 @@
+ 		    && !strcmp("ma", _nc_curr_token.tk_name)) {
+ 		    /* tell max_attributes from arrow_key_map */
+ 		    entry_ptr = _nc_find_type_entry("ma", NUMBER,
+-						    _nc_syntax != 0);
+-		    assert(entry_ptr != 0);
++						    _nc_syntax != SYN_TERMINFO);
++		    assert(entry_ptr != NULL);
+ 
+ 		} else if (token_type == STRING
+ 			   && !strcmp("MT", _nc_curr_token.tk_name)) {
+ 		    /* map terminfo's string MT to MT */
+ 		    entry_ptr = _nc_find_type_entry("MT", STRING,
+-						    _nc_syntax != 0);
+-		    assert(entry_ptr != 0);
++						    _nc_syntax != SYN_TERMINFO);
++		    assert(entry_ptr != NULL);
+ 
+ 		} else if (token_type == BOOLEAN
+ 			   && entry_ptr->nte_type == STRING) {
+Index: ncurses/tinfo/read_termcap.c
+Prereq:  1.105 
+--- ncurses-6.5-20250216+/ncurses/tinfo/read_termcap.c	2025-01-12 00:42:58.000000000 +0000
++++ ncurses-6.5-20250222/ncurses/tinfo/read_termcap.c	2025-02-20 01:27:42.000000000 +0000
+@@ -57,7 +57,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: read_termcap.c,v 1.105 2025/01/12 00:42:58 tom Exp $")
++MODULE_ID("$Id: read_termcap.c,v 1.106 2025/02/20 01:27:42 tom Exp $")
+ 
+ #if !PURE_TERMINFO
+ 
+@@ -275,7 +275,7 @@
+ {
+     register char *r_end, *rp;
+     int myfd = FALSE;
+-    char *record = 0;
++    char *record = NULL;
+     int tc_not_resolved;
+     int current;
+     int lineno;
+@@ -291,7 +291,7 @@
+      * Check if we have a top record from cgetset().
+      */
+     if (depth == 0 && toprec != 0 && _nc_cgetmatch(toprec, name) == 0) {
+-	if ((record = DOALLOC(topreclen + BFRAG)) == 0) {
++	if ((record = DOALLOC(topreclen + BFRAG)) == NULL) {
+ 	    errno = ENOMEM;
+ 	    return (TC_SYS_ERR);
+ 	}
+@@ -305,7 +305,7 @@
+ 	/*
+ 	 * Allocate first chunk of memory.
+ 	 */
+-	if ((record = DOALLOC(BFRAG)) == 0) {
++	if ((record = DOALLOC(BFRAG)) == NULL) {
+ 	    errno = ENOMEM;
+ 	    return (TC_SYS_ERR);
+ 	}
+@@ -315,7 +315,7 @@
+ 	/*
+ 	 * Loop through database array until finding the record.
+ 	 */
+-	for (current = in_array; db_array[current] != 0; current++) {
++	for (current = in_array; db_array[current] != NULL; current++) {
+ 	    int eof = FALSE;
+ 
+ 	    /*
+@@ -408,7 +408,7 @@
+ 			    pos = (unsigned) (rp - record);
+ 			    newsize = (size_t) (r_end - record + BFRAG);
+ 			    record = DOALLOC(newsize);
+-			    if (record == 0) {
++			    if (record == NULL) {
+ 				if (myfd)
+ 				    (void) close(fd);
+ 				errno = ENOMEM;
+@@ -464,7 +464,7 @@
+ 	register int newilen;
+ 	unsigned ilen;
+ 	int diff, iret, tclen, oline;
+-	char *icap = 0, *scan, *tc, *tcstart, *tcend;
++	char *icap = NULL, *scan, *tc, *tcstart, *tcend;
+ 
+ 	/*
+ 	 * Loop invariants:
+@@ -477,7 +477,7 @@
+ 	scan = record;
+ 	tc_not_resolved = FALSE;
+ 	for (;;) {
+-	    if ((tc = _nc_cgetcap(scan, "tc", '=')) == 0) {
++	    if ((tc = _nc_cgetcap(scan, "tc", '=')) == NULL) {
+ 		break;
+ 	    }
+ 
+@@ -548,7 +548,7 @@
+ 		tcpos = (unsigned) (tcstart - record);
+ 		tcposend = (unsigned) (tcend - record);
+ 		record = DOALLOC(newsize);
+-		if (record == 0) {
++		if (record == NULL) {
+ 		    if (myfd)
+ 			(void) close(fd);
+ 		    free(icap);
+@@ -586,7 +586,7 @@
+ 	(void) close(fd);
+     *len = (unsigned) (rp - record - 1);	/* don't count NUL */
+     if (r_end > rp) {
+-	if ((record = DOALLOC((size_t) (rp - record))) == 0) {
++	if ((record = DOALLOC((size_t) (rp - record))) == NULL) {
+ 	    errno = ENOMEM;
+ 	    return (TC_SYS_ERR);
+ 	}
+@@ -920,7 +920,7 @@
+ 	if ((the_source = strdup(temp)) != NULL)
+ 	    *sourcename = the_source;
+ #else
+-	if ((the_source = strdup(pathvec[i])) != 0)
++        if ((the_source = strdup(pathvec[i])) != NULL)
+ 	    *sourcename = the_source;
+ #endif
+     }
+@@ -941,7 +941,7 @@
+ add_tc(char *termpaths[], char *path, int count)
+ {
+     char *save = strchr(path, NCURSES_PATHSEP);
+-    if (save != 0)
++    if (save != NULL)
+ 	*save = '\0';
+     if (count < MAXPATHS
+ 	&& _nc_access(path, R_OK) == 0) {
+@@ -949,7 +949,7 @@
+ 	TR(TRACE_DATABASE, ("Adding termpath %s", path));
+     }
+     termpaths[count] = 0;
+-    if (save != 0)
++    if (save != NULL)
+ 	*save = NCURSES_PATHSEP;
+     return count;
+ }
+@@ -1034,20 +1034,20 @@
+     int j, k;
+     bool use_buffer = FALSE;
+     bool normal = TRUE;
+-    char *tc_buf = 0;
++    char *tc_buf = NULL;
+     char pathbuf[PATH_MAX];
+-    char *copied = 0;
++    char *copied = NULL;
+     char *cp;
+     struct stat test_stat[MAXPATHS];
+ 
+-    termpaths[filecount] = 0;
+-    if (use_terminfo_vars() && (tc = getenv("TERMCAP")) != 0) {
++    termpaths[filecount] = NULL;
++    if (use_terminfo_vars() && (tc = getenv("TERMCAP")) != NULL) {
+ 	if (_nc_is_abs_path(tc)) {	/* interpret as a filename */
+ 	    ADD_TC(tc, 0);
+ 	    normal = FALSE;
+ 	} else if (_nc_name_match(tc, tn, "|:")) {	/* treat as a capability file */
+ 	    tc_buf = strdup(tc);
+-	    use_buffer = (tc_buf != 0);
++	    use_buffer = (tc_buf != NULL);
+ 	    normal = FALSE;
+ 	}
+     }
+@@ -1055,7 +1055,7 @@
+     if (normal) {		/* normal case */
+ 	char envhome[PATH_MAX], *h;
+ 
+-	if ((copied = strdup(get_termpath())) != 0) {
++	if ((copied = strdup(get_termpath())) != NULL) {
+ 	    for (cp = copied; *cp; cp++) {
+ 		if (*cp == NCURSES_PATHSEP)
+ 		    *cp = '\0';
+@@ -1140,7 +1140,7 @@
+ 	    }
+ 	}
+     }
+-    if (copied != 0)
++    if (copied != NULL)
+ 	free(copied);
+ #endif /* USE_GETCAP */
+ 
+@@ -1153,7 +1153,7 @@
+ 
+     /* find a terminal matching tn, if we can */
+ #if USE_GETCAP_CACHE
+-    if (getcwd(cwd_buf, sizeof(cwd_buf)) != 0) {
++    if (getcwd(cwd_buf, sizeof(cwd_buf)) != NULL) {
+ 	_nc_set_writedir((char *) 0);	/* note: this does a chdir */
+ #endif
+ 	for_entry_list(ep) {
+Index: ncurses/tinfo/tinfo_driver.c
+Prereq:  1.78 
+--- ncurses-6.5-20250216+/ncurses/tinfo/tinfo_driver.c	2025-01-18 14:47:35.000000000 +0000
++++ ncurses-6.5-20250222/ncurses/tinfo/tinfo_driver.c	2025-02-20 01:30:20.000000000 +0000
+@@ -52,7 +52,7 @@
+ # endif
+ #endif
+ 
+-MODULE_ID("$Id: tinfo_driver.c,v 1.78 2025/01/18 14:47:35 tom Exp $")
++MODULE_ID("$Id: tinfo_driver.c,v 1.79 2025/02/20 01:30:20 tom Exp $")
+ 
+ /*
+  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
+@@ -94,8 +94,8 @@
+ #endif
+ 
+ #define TCBMAGIC NCDRV_MAGIC(NCDRV_TINFO)
+-#define AssertTCB() assert(TCB!=0 && TCB->magic==TCBMAGIC)
+-#define SetSP() assert(TCB->csp!=0); sp = TCB->csp; (void) sp
++#define AssertTCB() assert(TCB != NULL && TCB->magic == TCBMAGIC)
++#define SetSP() assert(TCB->csp != NULL); sp = TCB->csp; (void) sp
+ 
+ /*
+  * This routine needs to do all the work to make curscr look
+@@ -163,7 +163,7 @@
+     START_TRACE();
+     T((T_CALLED("tinfo::drv_CanHandle(%p)"), (void *) TCB));
+ 
+-    assert(TCB != 0 && tname != 0);
++    assert(TCB != NULL && tname != NULL);
+     termp = (TERMINAL *) TCB;
+     sp = TCB->csp;
+     TCB->magic = TCBMAGIC;
+@@ -545,7 +545,7 @@
+ drv_getsize(TERMINAL_CONTROL_BLOCK * TCB, int *l, int *c)
+ {
+     AssertTCB();
+-    assert(l != 0 && c != 0);
++    assert(l != NULL && c != NULL);
+     *l = lines;
+     *c = columns;
+     return OK;
+@@ -1076,7 +1076,7 @@
+     SCREEN *sp = TCB->csp;
+ 
+     AssertTCB();
+-    assert(sp != 0);
++    assert(sp != NULL);
+     if (ena_acs != NULL) {
+ 	NCURSES_PUTP2("ena_acs", ena_acs);
+     }
+@@ -1516,12 +1516,12 @@
+     int code = ERR;
+     size_t i;
+     TERM_DRIVER *res = (TERM_DRIVER *) 0;
+-    TERM_DRIVER *use = 0;
++    TERM_DRIVER *use = NULL;
+ 
+     T((T_CALLED("_nc_get_driver(%p, %s, %p)"),
+        (void *) TCB, NonNull(name), (void *) errret));
+ 
+-    assert(TCB != 0);
++    assert(TCB != NULL);
+ 
+     for (i = 0; i < SIZEOF(DriverTable); i++) {
+ 	res = DriverTable[i].driver;
+@@ -1532,7 +1532,7 @@
+ 	       If on Windows td_CanHandle returned FALSE although the terminal
+ 	       name is empty, we default to ms-terminal as tinfo TERM type.
+ 	     */
+-	    if (name == 0 || *name == 0 || (strcmp(name, "unknown") == 0)) {
++	    if (name == NULL || *name == 0 || (strcmp(name, "unknown") == 0)) {
+ 		name = MS_TERMINAL;
+ 		T(("Set TERM=%s", name));
+ 	    }
+Index: ncurses/trace/lib_tracebits.c
+Prereq:  1.33 
+--- ncurses-6.5-20250216+/ncurses/trace/lib_tracebits.c	2024-12-21 16:39:29.000000000 +0000
++++ ncurses-6.5-20250222/ncurses/trace/lib_tracebits.c	2025-02-20 01:02:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2012,2015 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -35,7 +35,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_tracebits.c,v 1.33 2024/12/21 16:39:29 tom Exp $")
++MODULE_ID("$Id: lib_tracebits.c,v 1.34 2025/02/20 01:02:09 tom Exp $")
+ 
+ #if HAVE_SYS_TERMIO_H
+ #include 		/* needed for ISC */
+@@ -244,7 +244,7 @@
+     buf = _nc_trace_buf(0,
+ 			8 + sizeof(dwFlagsOut) +
+ 			8 + sizeof(dwFlagsIn));
+-    if (buf != 0) {
++    if (buf != NULL) {
+ 	lookup_bits(buf, dwFlagsIn, "dwIn", tty->dwFlagIn);
+ 	lookup_bits(buf, dwFlagsOut, "dwOut", tty->dwFlagOut);
+     }
+@@ -284,7 +284,7 @@
+ 
+     buf = _nc_trace_buf(0,
+ 			8 + sizeof(cflags));
+-    if (buf != 0) {
++    if (buf != NULL) {
+ 	if (tty->sg_flags & ALLCTRL) {
+ 	    lookup_bits(buf, cflags, "cflags", tty->sg_flags);
+ 	}
+Index: ncurses/widechar/lib_ins_wch.c
+Prereq:  1.31 
+--- ncurses-6.5-20250216+/ncurses/widechar/lib_ins_wch.c	2024-12-07 18:03:14.000000000 +0000
++++ ncurses-6.5-20250222/ncurses/widechar/lib_ins_wch.c	2025-02-20 01:02:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2002-2016,2017 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_ins_wch.c,v 1.31 2024/12/07 18:03:14 tom Exp $")
++MODULE_ID("$Id: lib_ins_wch.c,v 1.32 2025/02/20 01:02:09 tom Exp $")
+ 
+ /*
+  * Insert the given character, updating the current location to simplify
+@@ -109,8 +109,7 @@
+        (void *) win, _nc_viswbufn(wstr, n), n));
+ 
+     if (win != NULL
+-	&& wstr != NULL
+-	&& n != 0) {
++	&& wstr != NULL) {
+ 
+ 	if (n < 0) {
+ 	    n = INT_MAX;
+Index: ncurses/widechar/widechars.c
+Prereq:  1.10 
+--- ncurses-6.5-20250216+/ncurses/widechar/widechars.c	2024-08-31 15:55:27.000000000 +0000
++++ ncurses-6.5-20250222/ncurses/widechar/widechars.c	2025-02-20 01:02:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2012,2013 Free Software Foundation, Inc.                       *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -31,7 +31,7 @@
+ 
+ #if USE_WIDEC_SUPPORT
+ 
+-MODULE_ID("$Id: widechars.c,v 1.10 2024/08/31 15:55:27 tom Exp $")
++MODULE_ID("$Id: widechars.c,v 1.11 2025/02/20 01:02:09 tom Exp $")
+ 
+ #if defined(_NC_MINGW)
+ /*
+@@ -45,7 +45,7 @@
+     int count;
+     int try;
+ 
+-    if (s != 0 && n != 0) {
++    if (s != NULL && n != 0) {
+ 	/*
+ 	 * MultiByteToWideChar() can decide to return more than one
+ 	 * wide-character.  We want only one.  Ignore any trailing null, both
+@@ -96,7 +96,7 @@
+     int count;
+     wchar_t temp;
+ 
+-    if (s != 0 && n != 0) {
++    if (s != NULL && n != 0) {
+ 	count = _nc_mbtowc(&temp, s, n);
+ 	if (count == 1) {
+ 	    int check = WideCharToMultiByte(CP_UTF8,
+Index: ncurses/win32con/win32_driver.c
+Prereq:  1.4 
+--- ncurses-6.5-20250216+/ncurses/win32con/win32_driver.c	2023-09-16 16:29:24.000000000 +0000
++++ ncurses-6.5-20250222/ncurses/win32con/win32_driver.c	2025-02-20 01:15:57.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2023 Thomas E. Dickey                                *
++ * Copyright 2018-2023,2025 Thomas E. Dickey                                *
+  * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -48,18 +48,18 @@
+ 
+ #define CUR TerminalType(my_term).
+ 
+-MODULE_ID("$Id: win32_driver.c,v 1.4 2023/09/16 16:29:24 tom Exp $")
++MODULE_ID("$Id: win32_driver.c,v 1.5 2025/02/20 01:15:57 tom Exp $")
+ 
+ #define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE)
+ #define EXP_OPTIMIZE 0
+ 
+ static bool console_initialized = FALSE;
+ 
+-#define AssertTCB() assert(TCB != 0 && (TCB->magic == WINMAGIC))
++#define AssertTCB() assert(TCB != NULL && (TCB->magic == WINMAGIC))
+ #define validateConsoleHandle() (AssertTCB() , console_initialized ||\
+                                  (console_initialized=\
+                                   _nc_console_checkinit(TRUE,FALSE)))
+-#define SetSP() assert(TCB->csp != 0); sp = TCB->csp; (void) sp
++#define SetSP() assert(TCB->csp != NULL); sp = TCB->csp; (void) sp
+ #define AdjustY() (WINCONSOLE.buffered ?\
+                    0 : (int) WINCONSOLE.SBI.srWindow.Top)
+ #define RevAttr(attr) (WORD) (((attr) & 0xff00) |   \
+@@ -422,7 +422,7 @@
+ 	    };
+ 
+ 	    for (x = 0; x < Width; x++)
+-		setcchar(&empty[x], blank, 0, 0, 0);
++		setcchar(&empty[x], blank, 0, 0, NULL);
+ #else
+ 	    chtype *empty = TypeAlloca(chtype, Width);
+ 
+@@ -530,11 +530,11 @@
+ 
+     T((T_CALLED("win32con::wcon_CanHandle(%p)"), TCB));
+ 
+-    assert((TCB != 0) && (tname != 0));
++    assert((TCB != NULL) && (tname != NULL));
+ 
+     TCB->magic = WINMAGIC;
+ 
+-    if (tname == 0 || *tname == 0) {
++    if (tname == NULL || *tname == 0) {
+ 	if (!_nc_console_vt_supported())
+ 	    code = TRUE;
+     } else if (tname != 0 && *tname == '#') {
+@@ -551,7 +551,7 @@
+ 		|| (strncmp(tname + 1, "win32con", n) == 0))) {
+ 	    code = TRUE;
+ 	}
+-    } else if (tname != 0 && stricmp(tname, "unknown") == 0) {
++    } else if (tname != NULL && stricmp(tname, "unknown") == 0) {
+ 	code = TRUE;
+     }
+ 
+@@ -1059,7 +1059,7 @@
+ 	for (n = 0; n < SIZEOF(table); ++n) {
+ 	    real_map[table[n].acs_code] =
+ 		(chtype) table[n].use_code | A_ALTCHARSET;
+-	    if (sp != 0)
++	    if (sp != NULL)
+ 		sp->_screen_acs_map[table[n].acs_code] = TRUE;
+ 	}
+     }
+Index: ncurses/win32con/win_driver.c
+Prereq:  1.76 
+--- ncurses-6.5-20250216+/ncurses/win32con/win_driver.c	2024-11-28 00:17:49.000000000 +0000
++++ ncurses-6.5-20250222/ncurses/win32con/win_driver.c	2025-02-20 01:19:43.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -57,7 +57,7 @@
+ 
+ #define CONTROL_PRESSED (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)
+ 
+-MODULE_ID("$Id: win_driver.c,v 1.76 2024/11/28 00:17:49 tom Exp $")
++MODULE_ID("$Id: win_driver.c,v 1.77 2025/02/20 01:19:43 tom Exp $")
+ 
+ #define TypeAlloca(type,count) (type*) _alloca(sizeof(type) * (size_t) (count))
+ 
+@@ -70,8 +70,8 @@
+ static bool InitConsole(void);
+ static bool okConsoleHandle(TERMINAL_CONTROL_BLOCK *);
+ 
+-#define AssertTCB() assert(TCB != 0 && (TCB->magic == WINMAGIC))
+-#define SetSP()     assert(TCB->csp != 0); sp = TCB->csp; (void) sp
++#define AssertTCB() assert(TCB != NULL && (TCB->magic == WINMAGIC))
++#define SetSP()     assert(TCB->csp != NULL); sp = TCB->csp; (void) sp
+ 
+ #define GenMap(vKey,key) MAKELONG(key, vKey)
+ 
+@@ -519,7 +519,7 @@
+ 	    };
+ 
+ 	    for (x = 0; x < Width; x++)
+-		setcchar(&empty[x], blank, 0, 0, 0);
++		setcchar(&empty[x], blank, 0, 0, NULL);
+ #else
+ 	    chtype *empty = TypeAlloca(chtype, Width);
+ 
+@@ -629,13 +629,13 @@
+ 
+     T((T_CALLED("win32con::wcon_CanHandle(%p)"), TCB));
+ 
+-    assert((TCB != 0) && (tname != 0));
++    assert((TCB != NULL) && (tname != NULL));
+ 
+     TCB->magic = WINMAGIC;
+ 
+-    if (tname == 0 || *tname == 0)
++    if (tname == NULL || *tname == 0)
+ 	code = TRUE;
+-    else if (tname != 0 && *tname == '#') {
++    else if (tname != NULL && *tname == '#') {
+ 	/*
+ 	 * Use "#" (a character which cannot begin a terminal's name) to
+ 	 * select specific driver from the table.
+@@ -649,7 +649,7 @@
+ 		|| (strncmp(tname + 1, "win32con", n) == 0))) {
+ 	    code = TRUE;
+ 	}
+-    } else if (tname != 0 && stricmp(tname, "unknown") == 0) {
++    } else if (tname != NULL && stricmp(tname, "unknown") == 0) {
+ 	code = TRUE;
+     } else if (SysISATTY(TCB->term.Filedes)) {
+ 	code = TRUE;
+@@ -1173,7 +1173,7 @@
+ 
+     want = (size_t) (CON.save_size.X * CON.save_size.Y);
+ 
+-    if ((CON.save_screen = malloc(want * sizeof(CHAR_INFO))) != 0) {
++    if ((CON.save_screen = malloc(want * sizeof(CHAR_INFO))) != NULL) {
+ 	bufferCoord.X = (SHORT) (CON.window_only ? CON.SBI.srWindow.Left : 0);
+ 	bufferCoord.Y = (SHORT) (CON.window_only ? CON.SBI.srWindow.Top : 0);
+ 
+@@ -1449,7 +1449,7 @@
+ 
+ 	for (n = 0; n < SIZEOF(table); ++n) {
+ 	    real_map[table[n].acs_code] = (chtype) table[n].use_code | A_ALTCHARSET;
+-	    if (sp != 0)
++	    if (sp != NULL)
+ 		sp->_screen_acs_map[table[n].acs_code] = TRUE;
+ 	}
+     }
+@@ -2000,9 +2000,9 @@
+ 
+ #define TC_PROLOGUE(fd) \
+     SCREEN *sp;                                               \
+-    TERMINAL *term = 0;                                       \
++    TERMINAL *term = NULL;                                    \
+     int code = ERR;                                           \
+-    if (_nc_screen_chain == 0)                                \
++    if (_nc_screen_chain == NULL)                             \
+         return 0;                                             \
+     for (each_screen(sp)) {                                   \
+         if (sp->_term && (sp->_term->Filedes == fd)) {        \
+@@ -2010,7 +2010,7 @@
+             break;                                            \
+         }                                                     \
+     }                                                         \
+-    assert(term != 0)
++    assert(term != NULL)
+ 
+ int
+ _nc_mingw_tcsetattr(
+@@ -2269,7 +2269,7 @@
+ static bool
+ okConsoleHandle(TERMINAL_CONTROL_BLOCK * TCB)
+ {
+-    return ((TCB != 0) &&
++    return ((TCB != NULL) &&
+ 	    (TCB->magic == WINMAGIC) &&
+ 	    InitConsole());
+ }
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250216+/package/debian-mingw/changelog	2025-02-16 22:35:29.000000000 +0000
++++ ncurses-6.5-20250222/package/debian-mingw/changelog	2025-02-20 09:14:10.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250216) unstable; urgency=low
++ncurses6td (6.5+20250222) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 16 Feb 2025 17:35:29 -0500
++ -- Thomas E. Dickey   Thu, 20 Feb 2025 04:14:10 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250216+/package/debian-mingw64/changelog	2025-02-16 22:35:29.000000000 +0000
++++ ncurses-6.5-20250222/package/debian-mingw64/changelog	2025-02-20 09:14:10.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250216) unstable; urgency=low
++ncurses6td (6.5+20250222) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 16 Feb 2025 17:35:29 -0500
++ -- Thomas E. Dickey   Thu, 20 Feb 2025 04:14:10 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250216+/package/debian/changelog	2025-02-16 22:35:29.000000000 +0000
++++ ncurses-6.5-20250222/package/debian/changelog	2025-02-20 09:14:10.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250216) unstable; urgency=low
++ncurses6td (6.5+20250222) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 16 Feb 2025 17:35:29 -0500
++ -- Thomas E. Dickey   Thu, 20 Feb 2025 04:14:10 -0500
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.690 
+--- ncurses-6.5-20250216+/package/mingw-ncurses.nsi	2025-02-16 22:35:29.000000000 +0000
++++ ncurses-6.5-20250222/package/mingw-ncurses.nsi	2025-02-20 09:14:10.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.690 2025/02/16 22:35:29 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.691 2025/02/20 09:14:10 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0216"
++!define VERSION_MMDD  "0222"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250216+/package/mingw-ncurses.spec	2025-02-16 22:35:29.000000000 +0000
++++ ncurses-6.5-20250222/package/mingw-ncurses.spec	2025-02-20 09:14:10.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250216
++Release: 20250222
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20250216+/package/ncurses.spec	2025-02-16 22:35:29.000000000 +0000
++++ ncurses-6.5-20250222/package/ncurses.spec	2025-02-20 09:14:10.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250216
++Release: 20250222
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20250216+/package/ncursest.spec	2025-02-16 22:35:29.000000000 +0000
++++ ncurses-6.5-20250222/package/ncursest.spec	2025-02-20 09:14:10.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250216
++Release: 20250222
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250301.patch b/packages/ncurses/6.5/ncurses-6.5-20250301.patch
new file mode 100644
index 0000000000..15e55fe0f3
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250301.patch
@@ -0,0 +1,10334 @@
+# ncurses 6.5 - patch 20250301 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250301.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sat Mar  1 23:17:59 UTC 2025
+# ------------------------------------------------------------------------------
+# Ada95/aclocal.m4                   |    7 
+# NEWS                               |   15 
+# VERSION                            |    2 
+# aclocal.m4                         |   69 -
+# configure                          | 1884 ++++++++++++++++-------------------
+# configure.in                       |   23 
+# dist.mk                            |    4 
+# doc/html/man/curs_add_wch.3x.html  |   48 
+# doc/html/man/curs_addch.3x.html    |   50 
+# doc/html/man/curs_color.3x.html    |   38 
+# doc/html/man/curs_getcchar.3x.html |   12 
+# doc/html/man/curs_initscr.3x.html  |   40 
+# doc/html/man/curs_inopts.3x.html   |  137 +-
+# doc/html/man/curs_ins_wch.3x.html  |   46 
+# doc/html/man/curs_ins_wstr.3x.html |   12 
+# doc/html/man/curs_insch.3x.html    |   36 
+# doc/html/man/curs_instr.3x.html    |   42 
+# doc/html/man/curs_inwstr.3x.html   |   59 -
+# doc/html/man/curs_kernel.3x.html   |   42 
+# doc/html/man/curs_mouse.3x.html    |   29 
+# doc/html/man/curs_move.3x.html     |   14 
+# doc/html/man/curs_outopts.3x.html  |   70 -
+# doc/html/man/infocmp.1m.html       |   20 
+# doc/html/man/ncurses.3x.html       |   12 
+# doc/html/man/terminfo.5.html       |    8 
+# doc/html/man/tput.1.html           |   30 
+# include/curses.h.in                |    6 
+# include/nc_alloc.h                 |   25 
+# include/nc_win32.h                 |    6 
+# include/ncurses_defs               |    7 
+# man/MKterminfo.sh                  |    6 
+# man/curs_add_wch.3x                |   56 -
+# man/curs_addch.3x                  |   48 
+# man/curs_color.3x                  |   56 -
+# man/curs_getcchar.3x               |    8 
+# man/curs_initscr.3x                |   28 
+# man/curs_inopts.3x                 |   55 -
+# man/curs_ins_wch.3x                |   61 -
+# man/curs_ins_wstr.3x               |    6 
+# man/curs_insch.3x                  |   54 -
+# man/curs_instr.3x                  |   36 
+# man/curs_inwstr.3x                 |   51 
+# man/curs_kernel.3x                 |   72 -
+# man/curs_mouse.3x                  |   16 
+# man/curs_move.3x                   |   16 
+# man/curs_outopts.3x                |  198 ++-
+# man/make_sed.sh                    |    6 
+# man/manhtml.externs                |    6 
+# man/ncurses.3x                     |    6 
+# man/tput.1                         |   23 
+# misc/terminfo.src                  |   17 
+# ncurses/base/MKlib_gen.sh          |    5 
+# ncurses/curses.priv.h              |   18 
+# ncurses/tinfo/lib_win32con.c       |    5 
+# ncurses/tty/lib_twait.c            |    4 
+# ncurses/win32con/win32_driver.c    |   14 
+# ncurses/win32con/win_driver.c      |   30 
+# 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 
+# 64 files changed, 1993 insertions(+), 1723 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/aclocal.m4
+Prereq:  1.226 
+--- ncurses-6.5-20250222+/Ada95/aclocal.m4	2025-01-11 00:55:54.000000000 +0000
++++ ncurses-6.5-20250301/Ada95/aclocal.m4	2025-02-23 01:57:36.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: aclocal.m4,v 1.226 2025/01/11 00:55:54 tom Exp $
++dnl $Id: aclocal.m4,v 1.227 2025/02/23 01:57:36 tom Exp $
+ dnl Macros used in NCURSES Ada95 auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -3201,11 +3201,6 @@
+ AC_SUBST(cf_cv_rel_version)
+ AC_SUBST(cf_cv_abi_version)
+ 
+-dnl FIXME - not needed for Ada95
+-AC_SUBST(cf_cv_builtin_bool)
+-AC_SUBST(cf_cv_header_stdbool_h)
+-AC_SUBST(cf_cv_type_of_bool)dnl
+-
+ AC_CACHE_CHECK(if KEY_RESIZE is supported,cf_cv_curses_resizes,[
+ 	AC_TRY_COMPILE([#include <${cf_cv_ncurses_header:-curses.h}>],
+ 		[int key = KEY_RESIZE; (void)key],
+Index: NEWS
+Prereq:  1.4251 
+--- ncurses-6.5-20250222+/NEWS	2025-02-20 09:09:47.000000000 +0000
++++ ncurses-6.5-20250301/NEWS	2025-03-01 21:57:13.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4251 2025/02/20 09:09:47 tom Exp $
++-- $Id: NEWS,v 1.4257 2025/03/01 21:57:13 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,12 +46,21 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20250301
++	+ add color to vt525 (Branden Robinson)
++	+ add vt520-w and vt525-w (Branden Robinson)
++	+ improve formatting/style of manpages (patches by Branden Robinson).
++	+ improve configurability of alloca() as used in Windows ports.
++	+ fix some typos in manpages.
++	+ modify configure script checks for stdbool.h to fix build with older
++	  gcc version.
++
+ 20250222
+ 	+ modify treatment of "n" parameter for waddnstr, waddnwstr, and
+ 	  wins_nwstr to return OK when "n" is zero, for consistency with other
+ 	  implementations (report by Benjamin Barenblat, cf: 20231118).
+ 	+ formatting improvements for terminfo.5 (Debian #1096164).
+-	
++
+ 20250216
+ 	+ add limit-checks in alloc_entry.c and alloc_ttype.c to avoid indexing
+ 	  errors when using infocmp to compare all capabilities when processing
+@@ -185,7 +194,7 @@
+ 	+ improve filtering of -L options in misc/gen-pkgconfig.in and in
+ 	  misc/ncurses-config.in
+ 	+ add check in wresize() for out-of-range dimensions (report by Peter
+-	  Bierma). 
++	  Bierma).
+ 
+ 20240922
+ 	+ add a few null-pointer checks in ncurses
+Index: VERSION
+--- ncurses-6.5-20250222+/VERSION	2025-02-22 09:14:10.000000000 +0000
++++ ncurses-6.5-20250301/VERSION	2025-03-01 10:08:08.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250222
++5:0:10	6.5	20250301
+Index: aclocal.m4
+Prereq:  1.1102 
+--- ncurses-6.5-20250222+/aclocal.m4	2025-02-16 00:15:17.000000000 +0000
++++ ncurses-6.5-20250301/aclocal.m4	2025-02-23 01:49:45.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1102 2025/02/16 00:15:17 tom Exp $
++dnl $Id: aclocal.m4,v 1.1104 2025/02/23 01:49:45 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -598,52 +598,25 @@
+ 	esac
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_BOOL_DECL version: 10 updated: 2025/02/01 19:31:51
++dnl CF_BOOL_DECL version: 11 updated: 2025/02/22 20:49:45
+ dnl ------------
+ dnl Test if 'bool' is a builtin type in the configured C/C++ compiler.  Some
+ dnl older compilers (e.g., gcc 2.5.8) don't support 'bool' directly; gcc
+ dnl 2.6.3 does, in anticipation of the ANSI C++ standard.
+ dnl
+-dnl Treat the configuration-variable specially here, since we're directly
+-dnl substituting its value (i.e., 1/0).
+-dnl
+ dnl $1 is the shell variable to store the result in, if not $cv_cv_builtin_bool
+ AC_DEFUN([CF_BOOL_DECL],
+ [
+-AC_MSG_CHECKING(if we should include stdbool.h)
+-
+-AC_CACHE_VAL(cf_cv_header_stdbool_h,[
++AC_REQUIRE([CF_C99_STDBOOL_H])
++AC_CACHE_CHECK(for builtin bool type, ifelse($1,,cf_cv_builtin_bool,[$1]),[
+ 	AC_TRY_COMPILE([
+-#ifndef __BEOS__
+-#include 
+-#endif
+-],[bool foo = false; (void)foo],
+-		[cf_cv_header_stdbool_h=1],
+-		[AC_TRY_COMPILE([],[bool foo = false; (void)foo],
+-			[cf_cv_header_stdbool_h=0])])])
+-
+-if test "$cf_cv_header_stdbool_h" = 1
+-then	AC_MSG_RESULT(yes)
+-else	AC_MSG_RESULT(no)
+-fi
+-
+-AC_MSG_CHECKING([for builtin bool type])
+-
+-AC_CACHE_VAL(ifelse($1,,cf_cv_builtin_bool,[$1]),[
+-	AC_TRY_COMPILE([
+-#include 
+-#include 
++$ac_includes_default
+ ],[bool x = false; (void)x],
+-		[ifelse($1,,cf_cv_builtin_bool,[$1])=1],
+-		[ifelse($1,,cf_cv_builtin_bool,[$1])=0])])
+-
+-if test "$ifelse($1,,cf_cv_builtin_bool,[$1])" = 1
+-then	AC_MSG_RESULT(yes)
+-else	AC_MSG_RESULT(no)
+-fi
++		[ifelse($1,,cf_cv_builtin_bool,[$1])=yes],
++		[ifelse($1,,cf_cv_builtin_bool,[$1])=no])])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_BOOL_SIZE version: 21 updated: 2024/12/14 16:09:34
++dnl CF_BOOL_SIZE version: 22 updated: 2025/02/22 20:49:45
+ dnl ------------
+ dnl Test for the size of 'bool' in the configured C++ compiler (e.g., a type).
+ dnl Don't bother looking for bool.h, since it has been deprecated.
+@@ -652,6 +625,7 @@
+ dnl from .
+ AC_DEFUN([CF_BOOL_SIZE],
+ [
++AC_REQUIRE([CF_C99_STDBOOL_H])
+ AC_CHECK_SIZEOF(bool,,[
+ $ac_includes_default
+ 
+@@ -667,7 +641,7 @@
+ 
+ #else
+ 
+-#if $cf_cv_header_stdbool_h
++#if $USE_STDBOOL_H
+ #include 
+ #endif
+ 
+@@ -691,7 +665,7 @@
+ 
+ #else
+ 
+-#if $cf_cv_header_stdbool_h
++#if $USE_STDBOOL_H
+ #include 
+ #endif
+ 
+@@ -894,6 +868,27 @@
+ AC_SUBST(STDC_NORETURN)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_C99_STDBOOL_H version: 1 updated: 2025/02/22 20:49:45
++dnl ----------------
++dnl Check if we can compile using  and get a valid "bool" type.
++AC_DEFUN([CF_C99_STDBOOL_H],
++[
++AC_CACHE_CHECK(if we can include stdbool.h,cf_cv_header_stdbool_h,[
++	AC_TRY_COMPILE([
++$ac_includes_default
++#include 
++],[bool foo = false; (void)foo],
++		[cf_cv_header_stdbool_h=yes],
++		[AC_TRY_COMPILE([],[bool foo = false; (void)foo],
++			[cf_cv_header_stdbool_h=no])])])
++
++if test "$cf_cv_header_stdbool_h" = yes
++then	USE_STDBOOL_H=1
++else	USE_STDBOOL_H=0
++fi
++AC_SUBST(USE_STDBOOL_H)
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_CC_ENV_FLAGS version: 11 updated: 2023/02/20 11:15:46
+ dnl ---------------
+ dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
+Index: configure
+--- ncurses-6.5-20250222+/configure	2025-02-16 00:20:21.000000000 +0000
++++ ncurses-6.5-20250301/configure	2025-03-01 15:05:41.000000000 +0000
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.791 .
++# From configure.in Revision: 1.794 .
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by Autoconf 2.52.20240618.
++# Generated by Autoconf 2.52.20250126.
+ #
+ # Copyright 2003-2022,2023	Thomas E. Dickey
+ # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+@@ -954,7 +954,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.52.20240618.  Invocation command line was
++generated by GNU Autoconf 2.52.20250126.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -20541,10 +20541,12 @@
+ esac
+ 
+ for ac_header in \
++alloca.h \
+ fcntl.h \
+ getopt.h \
+ limits.h \
+ locale.h \
++malloc.h \
+ math.h \
+ poll.h \
+ sys/auxv.h \
+@@ -20559,23 +20561,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20562: checking for $ac_header" >&5
++echo "$as_me:20564: 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 20568 "configure"
++#line 20570 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20572: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20574: \"$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:20578: \$? = $ac_status" >&5
++  echo "$as_me:20580: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20594,7 +20596,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20597: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20599: 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:20612: 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 20616 "configure"
++#line 20618 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20620: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20622: \"$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:20626: \$? = $ac_status" >&5
++  echo "$as_me:20628: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20642,7 +20644,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20645: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20647: 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:20657: 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
+@@ -20662,7 +20664,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20665 "configure"
++#line 20667 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20675,16 +20677,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20678: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20680: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20681: \$? = $ac_status" >&5
++  echo "$as_me:20683: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20684: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20686: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20687: \$? = $ac_status" >&5
++  echo "$as_me:20689: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -20696,7 +20698,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20699: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20701: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -20713,14 +20715,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20716: checking if external environ is declared" >&5
++echo "$as_me:20718: 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 20723 "configure"
++#line 20725 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -20733,16 +20735,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20736: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20738: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20739: \$? = $ac_status" >&5
++  echo "$as_me:20741: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20742: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20744: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20745: \$? = $ac_status" >&5
++  echo "$as_me:20747: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_environ=yes
+ else
+@@ -20753,7 +20755,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20756: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20758: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+ 
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20768,14 +20770,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:20771: checking if external environ exists" >&5
++echo "$as_me:20773: 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 20778 "configure"
++#line 20780 "configure"
+ #include "confdefs.h"
+ 
+ #undef environ
+@@ -20790,16 +20792,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20793: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20795: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20796: \$? = $ac_status" >&5
++  echo "$as_me:20798: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20799: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20801: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20802: \$? = $ac_status" >&5
++  echo "$as_me:20804: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_environ=yes
+ else
+@@ -20810,7 +20812,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20813: result: $cf_cv_have_environ" >&5
++echo "$as_me:20815: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+ 
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20823,13 +20825,13 @@
+ 
+ fi
+ 
+-echo "$as_me:20826: checking for getenv" >&5
++echo "$as_me:20828: 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 20832 "configure"
++#line 20834 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20860,16 +20862,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20863: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20865: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20866: \$? = $ac_status" >&5
++  echo "$as_me:20868: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20869: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20871: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20872: \$? = $ac_status" >&5
++  echo "$as_me:20874: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_getenv=yes
+ else
+@@ -20879,19 +20881,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20882: result: $ac_cv_func_getenv" >&5
++echo "$as_me:20884: 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:20888: checking for $ac_func" >&5
++echo "$as_me:20890: 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 20894 "configure"
++#line 20896 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20922,16 +20924,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20925: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20927: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20928: \$? = $ac_status" >&5
++  echo "$as_me:20930: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20931: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20933: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20934: \$? = $ac_status" >&5
++  echo "$as_me:20936: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -20941,7 +20943,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20944: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:20946: 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:20956: 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
+@@ -20961,7 +20963,7 @@
+   cf_cv_consistent_getenv=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20964 "configure"
++#line 20966 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21066,15 +21068,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21069: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21071: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21072: \$? = $ac_status" >&5
++  echo "$as_me:21074: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21074: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21076: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21077: \$? = $ac_status" >&5
++  echo "$as_me:21079: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_consistent_getenv=yes
+ else
+@@ -21087,7 +21089,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:21090: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:21092: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+ 
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -21102,18 +21104,18 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ 	test "x$cf_with_trace" = xyes
+ then
+-	{ echo "$as_me:21105: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++	{ echo "$as_me:21107: 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:21109: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:21111: 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 21116 "configure"
++#line 21118 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21133,16 +21135,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21136: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21138: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21139: \$? = $ac_status" >&5
++  echo "$as_me:21141: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21142: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21144: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21145: \$? = $ac_status" >&5
++  echo "$as_me:21147: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -21154,7 +21156,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21157: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:21159: 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
+@@ -21169,13 +21171,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:21172: checking for an ANSI C-conforming const" >&5
++echo "$as_me:21174: 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 21178 "configure"
++#line 21180 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21185,13 +21187,13 @@
+ #ifndef __cplusplus
+   /* Ultrix mips cc rejects this.  */
+   typedef int charset[2];
+-  const charset x; (void)x;
++  const charset x;
+   /* SunOS 4.1.1 cc rejects this.  */
+   char const *const *ccp;
+   char **p;
+   /* NEC SVR4.0.2 mips cc rejects this.  */
+   struct point {int x, y;};
+-  static struct point const zero = {0,0}; (void)zero;
++  static struct point const zero = {0,0};
+   /* AIX XL C 1.02.0.0 rejects this.
+      It does not let you subtract one const X* pointer from another in
+      an arm of an if-expression whose if-part is not a constant
+@@ -21207,7 +21209,7 @@
+     char const *s = 0 ? (char *) 0 : (char const *) 0;
+ 
+     *t++ = 0;
+-	(void)s;
++	(void)s; (void)x; (void)zero;
+   }
+   { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+     int x[] = {25, 17};
+@@ -21237,16 +21239,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21240: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21242: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21243: \$? = $ac_status" >&5
++  echo "$as_me:21245: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21246: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21248: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21249: \$? = $ac_status" >&5
++  echo "$as_me:21251: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -21256,7 +21258,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21259: result: $ac_cv_c_const" >&5
++echo "$as_me:21261: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -21266,7 +21268,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21269: checking for inline" >&5
++echo "$as_me:21271: 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
+@@ -21274,7 +21276,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21277 "configure"
++#line 21279 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo (void) {return 0; }
+@@ -21283,16 +21285,16 @@
+ 
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21286: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21288: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21289: \$? = $ac_status" >&5
++  echo "$as_me:21291: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21292: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21294: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21295: \$? = $ac_status" >&5
++  echo "$as_me:21297: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -21303,7 +21305,7 @@
+ done
+ 
+ fi
+-echo "$as_me:21306: result: $ac_cv_c_inline" >&5
++echo "$as_me:21308: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -21329,7 +21331,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:21332: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:21334: 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
+@@ -21338,7 +21340,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21341 "configure"
++#line 21343 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -21350,16 +21352,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21353: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21355: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21356: \$? = $ac_status" >&5
++  echo "$as_me:21358: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21359: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21361: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21362: \$? = $ac_status" >&5
++  echo "$as_me:21364: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -21371,7 +21373,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:21374: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:21376: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -21477,7 +21479,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:21480: checking for signal global datatype" >&5
++echo "$as_me:21482: 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
+@@ -21489,7 +21491,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21492 "configure"
++#line 21494 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21513,16 +21515,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21516: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21518: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21519: \$? = $ac_status" >&5
++  echo "$as_me:21521: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21522: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21524: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21525: \$? = $ac_status" >&5
++  echo "$as_me:21527: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21536,7 +21538,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21539: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21541: 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:21550: 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
+@@ -21555,7 +21557,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21558 "configure"
++#line 21560 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21590,15 +21592,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21593: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21595: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21596: \$? = $ac_status" >&5
++  echo "$as_me:21598: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21598: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21600: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21601: \$? = $ac_status" >&5
++  echo "$as_me:21603: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21613,7 +21615,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21616: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21618: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:21630: 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 21635 "configure"
++#line 21637 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21644,16 +21646,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21647: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21649: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21650: \$? = $ac_status" >&5
++  echo "$as_me:21652: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21653: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21655: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21656: \$? = $ac_status" >&5
++  echo "$as_me:21658: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -21665,7 +21667,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21668: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21670: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -21681,14 +21683,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:21684: checking if external errno is declared" >&5
++echo "$as_me:21686: 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 21691 "configure"
++#line 21693 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21702,16 +21704,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21705: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21707: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21708: \$? = $ac_status" >&5
++  echo "$as_me:21710: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21711: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21713: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21714: \$? = $ac_status" >&5
++  echo "$as_me:21716: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -21722,7 +21724,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21725: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21727: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21737,14 +21739,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:21740: checking if external errno exists" >&5
++echo "$as_me:21742: 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 21747 "configure"
++#line 21749 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -21759,16 +21761,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21762: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21764: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21765: \$? = $ac_status" >&5
++  echo "$as_me:21767: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21768: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21770: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21771: \$? = $ac_status" >&5
++  echo "$as_me:21773: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -21779,7 +21781,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21782: result: $cf_cv_have_errno" >&5
++echo "$as_me:21784: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21792,7 +21794,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21795: checking if data-only library module links" >&5
++echo "$as_me:21797: 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
+@@ -21800,20 +21802,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:21808: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21809: \$? = $ac_status" >&5
++  echo "$as_me:21811: \$? = $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:21835: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21836: \$? = $ac_status" >&5
++  echo "$as_me:21838: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -21846,7 +21848,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21849 "configure"
++#line 21851 "configure"
+ #include "confdefs.h"
+ 
+ 	extern int testfunc(void);
+@@ -21857,15 +21859,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21860: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21862: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21863: \$? = $ac_status" >&5
++  echo "$as_me:21865: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21865: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21867: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21868: \$? = $ac_status" >&5
++  echo "$as_me:21870: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -21880,7 +21882,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21883: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21885: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21895,13 +21897,13 @@
+ ###	Checks for library functions.
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:21898: checking for clock_gettime" >&5
++echo "$as_me:21900: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21904 "configure"
++#line 21906 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21932,16 +21934,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21935: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21937: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21938: \$? = $ac_status" >&5
++  echo "$as_me:21940: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21941: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21943: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21944: \$? = $ac_status" >&5
++  echo "$as_me:21946: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -21951,12 +21953,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21954: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:21956: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:21959: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:21961: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21964,7 +21966,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21967 "configure"
++#line 21969 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21983,16 +21985,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21986: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21988: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21989: \$? = $ac_status" >&5
++  echo "$as_me:21991: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21992: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21994: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21995: \$? = $ac_status" >&5
++  echo "$as_me:21997: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -22003,7 +22005,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22006: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:22008: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -22015,14 +22017,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:22018: checking if clock_gettime links" >&5
++echo "$as_me:22020: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22025 "configure"
++#line 22027 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22040,16 +22042,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22043: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22045: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22046: \$? = $ac_status" >&5
++  echo "$as_me:22048: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22049: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22051: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22052: \$? = $ac_status" >&5
++  echo "$as_me:22054: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -22060,7 +22062,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22063: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:22065: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -22074,13 +22076,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:22077: checking for gettimeofday" >&5
++echo "$as_me:22079: 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 22083 "configure"
++#line 22085 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22111,16 +22113,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22114: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22116: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22117: \$? = $ac_status" >&5
++  echo "$as_me:22119: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22120: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22122: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22123: \$? = $ac_status" >&5
++  echo "$as_me:22125: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -22130,7 +22132,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22133: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:22135: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -22140,7 +22142,7 @@
+ 
+ else
+ 
+-echo "$as_me:22143: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:22145: 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
+@@ -22148,7 +22150,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22151 "configure"
++#line 22153 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22167,16 +22169,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22170: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22172: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22173: \$? = $ac_status" >&5
++  echo "$as_me:22175: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22176: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22178: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22179: \$? = $ac_status" >&5
++  echo "$as_me:22181: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -22187,7 +22189,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22190: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:22192: 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
+ 
+@@ -22246,13 +22248,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:22249: checking for $ac_func" >&5
++echo "$as_me:22251: 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 22255 "configure"
++#line 22257 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22283,16 +22285,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22286: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22288: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22289: \$? = $ac_status" >&5
++  echo "$as_me:22291: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22292: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22294: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22295: \$? = $ac_status" >&5
++  echo "$as_me:22297: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -22302,7 +22304,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22305: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:22307: 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:22317: 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 22322 "configure"
++#line 22324 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22334,16 +22336,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22337: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22339: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22340: \$? = $ac_status" >&5
++  echo "$as_me:22342: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22343: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22345: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22346: \$? = $ac_status" >&5
++  echo "$as_me:22348: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_PATH_TTYS=yes
+ else
+@@ -22353,7 +22355,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22356: result: $cf_cv_PATH_TTYS" >&5
++echo "$as_me:22358: result: $cf_cv_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
+ 
+ if test $cf_cv_PATH_TTYS = no
+@@ -22375,7 +22377,7 @@
+ 
+ if test $cf_cv_PATH_TTYS != no
+ then
+-	echo "$as_me:22378: checking if _PATH_TTYS file exists" >&5
++	echo "$as_me:22380: 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
+@@ -22385,7 +22387,7 @@
+   cf_cv_have_PATH_TTYS=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22388 "configure"
++#line 22390 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22398,15 +22400,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22401: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22403: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22404: \$? = $ac_status" >&5
++  echo "$as_me:22406: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22406: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22408: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22409: \$? = $ac_status" >&5
++  echo "$as_me:22411: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_PATH_TTYS=yes
+ else
+@@ -22418,7 +22420,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22421: result: $cf_cv_have_PATH_TTYS" >&5
++echo "$as_me:22423: 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
+@@ -22430,14 +22432,14 @@
+ #define HAVE_PATH_TTYS 1
+ EOF
+ 
+-	echo "$as_me:22433: checking for getttynam" >&5
++	echo "$as_me:22435: 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 22440 "configure"
++#line 22442 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22449,16 +22451,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22452: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22454: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22455: \$? = $ac_status" >&5
++  echo "$as_me:22457: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22458: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22460: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22461: \$? = $ac_status" >&5
++  echo "$as_me:22463: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_getttynam=yes
+ else
+@@ -22468,7 +22470,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22471: result: $cf_cv_func_getttynam" >&5
++echo "$as_me:22473: 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
+@@ -22478,7 +22480,7 @@
+ 
+ if test "x$ac_cv_func_getopt" = xno && \
+    test "x$cf_with_progs$cf_with_tests" != xnono; then
+-	{ { echo "$as_me:22481: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:22483: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -22487,7 +22489,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:22490: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:22492: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -22500,14 +22502,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:22503: checking for terminal-capability database functions" >&5
++echo "$as_me:22505: 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 22510 "configure"
++#line 22512 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22527,16 +22529,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22530: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22532: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22533: \$? = $ac_status" >&5
++  echo "$as_me:22535: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22536: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22538: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22539: \$? = $ac_status" >&5
++  echo "$as_me:22541: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -22547,7 +22549,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22550: result: $cf_cv_cgetent" >&5
++echo "$as_me:22552: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -22557,14 +22559,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:22560: checking if cgetent uses const parameter" >&5
++echo "$as_me:22562: 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 22567 "configure"
++#line 22569 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -22587,16 +22589,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22590: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22592: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22593: \$? = $ac_status" >&5
++  echo "$as_me:22595: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22596: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22598: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22599: \$? = $ac_status" >&5
++  echo "$as_me:22601: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -22607,7 +22609,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22610: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:22612: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -22621,14 +22623,14 @@
+ 
+ fi
+ 
+-echo "$as_me:22624: checking for isascii" >&5
++echo "$as_me:22626: 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 22631 "configure"
++#line 22633 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22640,16 +22642,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22643: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22645: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22646: \$? = $ac_status" >&5
++  echo "$as_me:22648: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22649: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22651: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22652: \$? = $ac_status" >&5
++  echo "$as_me:22654: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -22660,7 +22662,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22663: result: $cf_cv_have_isascii" >&5
++echo "$as_me:22665: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -22668,10 +22670,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:22671: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:22673: 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 22674 "configure"
++#line 22676 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22685,16 +22687,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22688: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22690: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22691: \$? = $ac_status" >&5
++  echo "$as_me:22693: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22694: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22696: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22697: \$? = $ac_status" >&5
++  echo "$as_me:22699: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=no
+ else
+@@ -22702,7 +22704,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22705 "configure"
++#line 22707 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22717,16 +22719,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22720: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22722: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22723: \$? = $ac_status" >&5
++  echo "$as_me:22725: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22726: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22728: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22729: \$? = $ac_status" >&5
++  echo "$as_me:22731: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=yes
+ 
+@@ -22742,11 +22744,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:22745: result: $sigact_bad" >&5
++echo "$as_me:22747: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:22749: checking if nanosleep really works" >&5
++echo "$as_me:22751: 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
+@@ -22756,7 +22758,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22759 "configure"
++#line 22761 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22782,15 +22784,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22785: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22787: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22788: \$? = $ac_status" >&5
++  echo "$as_me:22790: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22790: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22792: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22793: \$? = $ac_status" >&5
++  echo "$as_me:22795: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -22802,7 +22804,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22805: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:22807: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -22819,23 +22821,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22822: checking for $ac_header" >&5
++echo "$as_me:22824: 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 22828 "configure"
++#line 22830 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22832: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22834: \"$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:22838: \$? = $ac_status" >&5
++  echo "$as_me:22840: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22854,7 +22856,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22857: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22859: 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:22876: 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 22877 "configure"
++#line 22879 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22886,16 +22888,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22889: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22891: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22892: \$? = $ac_status" >&5
++  echo "$as_me:22894: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22895: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22897: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22898: \$? = $ac_status" >&5
++  echo "$as_me:22900: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=no
+ else
+@@ -22903,7 +22905,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22906 "configure"
++#line 22908 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22917,16 +22919,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22920: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22922: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22923: \$? = $ac_status" >&5
++  echo "$as_me:22925: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22926: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22928: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22929: \$? = $ac_status" >&5
++  echo "$as_me:22931: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=unknown
+ else
+@@ -22942,19 +22944,19 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:22945: result: $termios_bad" >&5
++	echo "$as_me:22947: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:22950: checking for tcgetattr" >&5
++echo "$as_me:22952: 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 22957 "configure"
++#line 22959 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22982,16 +22984,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22985: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22987: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22988: \$? = $ac_status" >&5
++  echo "$as_me:22990: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22991: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22993: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22994: \$? = $ac_status" >&5
++  echo "$as_me:22996: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -23001,21 +23003,21 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23004: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:23006: 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:23011: checking for vsscanf function or workaround" >&5
++echo "$as_me:23013: 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 23018 "configure"
++#line 23020 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23041,16 +23043,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23044: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23046: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23047: \$? = $ac_status" >&5
++  echo "$as_me:23049: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23050: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23052: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23053: \$? = $ac_status" >&5
++  echo "$as_me:23055: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -23058,7 +23060,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23061 "configure"
++#line 23063 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23080,16 +23082,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23083: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23085: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23086: \$? = $ac_status" >&5
++  echo "$as_me:23088: \$? = $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:23091: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23092: \$? = $ac_status" >&5
++  echo "$as_me:23094: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -23097,7 +23099,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23100 "configure"
++#line 23102 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23119,16 +23121,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23122: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23124: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23125: \$? = $ac_status" >&5
++  echo "$as_me:23127: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23128: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23130: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23131: \$? = $ac_status" >&5
++  echo "$as_me:23133: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -23143,7 +23145,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23146: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:23148: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case "$cf_cv_func_vsscanf" in
+@@ -23169,23 +23171,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:23172: checking for $ac_header" >&5
++echo "$as_me:23174: 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 23178 "configure"
++#line 23180 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23182: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23184: \"$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:23188: \$? = $ac_status" >&5
++  echo "$as_me:23190: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23204,7 +23206,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23207: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23209: 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:23219: 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
+@@ -23225,7 +23227,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23228 "configure"
++#line 23230 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23260,15 +23262,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23263: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23265: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23266: \$? = $ac_status" >&5
++  echo "$as_me:23268: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23268: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23270: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23271: \$? = $ac_status" >&5
++  echo "$as_me:23273: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -23283,16 +23285,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:23286: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:23288: 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:23289: checking for mkstemp" >&5
++	echo "$as_me:23291: 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 23295 "configure"
++#line 23297 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23323,16 +23325,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23326: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23328: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23329: \$? = $ac_status" >&5
++  echo "$as_me:23331: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23332: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23334: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23335: \$? = $ac_status" >&5
++  echo "$as_me:23337: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -23342,7 +23344,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23345: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:23347: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -23363,21 +23365,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:23366: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:23368: 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:23369: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:23371: 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:23375: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:23377: 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 23380 "configure"
++#line 23382 "configure"
+ #include "confdefs.h"
+ #include 
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -23394,15 +23396,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23397: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23399: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23400: \$? = $ac_status" >&5
++  echo "$as_me:23402: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23402: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23404: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23405: \$? = $ac_status" >&5
++  echo "$as_me:23407: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -23415,7 +23417,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:23418: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:23420: 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
+ 
+@@ -23426,13 +23428,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:23429: checking for intptr_t" >&5
++echo "$as_me:23431: 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 23435 "configure"
++#line 23437 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23447,16 +23449,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23450: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23452: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23453: \$? = $ac_status" >&5
++  echo "$as_me:23455: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23456: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23458: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23459: \$? = $ac_status" >&5
++  echo "$as_me:23461: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -23466,7 +23468,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23469: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:23471: 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
+   :
+@@ -23478,13 +23480,13 @@
+ 
+ fi
+ 
+-echo "$as_me:23481: checking for ssize_t" >&5
++echo "$as_me:23483: 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 23487 "configure"
++#line 23489 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23499,16 +23501,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23502: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23504: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23505: \$? = $ac_status" >&5
++  echo "$as_me:23507: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23508: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23510: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23511: \$? = $ac_status" >&5
++  echo "$as_me:23513: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -23518,7 +23520,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23521: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:23523: 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
+   :
+@@ -23530,14 +23532,14 @@
+ 
+ fi
+ 
+-echo "$as_me:23533: checking for type sigaction_t" >&5
++echo "$as_me:23535: 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 23540 "configure"
++#line 23542 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23550,16 +23552,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23553: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23555: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23556: \$? = $ac_status" >&5
++  echo "$as_me:23558: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23559: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23561: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23562: \$? = $ac_status" >&5
++  echo "$as_me:23564: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -23570,14 +23572,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:23573: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:23575: 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:23580: checking declaration of size-change" >&5
++echo "$as_me:23582: 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
+@@ -23598,7 +23600,7 @@
+ 
+ 	fi
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23601 "configure"
++#line 23603 "configure"
+ #include "confdefs.h"
+ #include 
+ #ifdef HAVE_TERMIOS_H
+@@ -23648,16 +23650,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23651: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23653: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23654: \$? = $ac_status" >&5
++  echo "$as_me:23656: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23657: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23659: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23660: \$? = $ac_status" >&5
++  echo "$as_me:23662: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -23676,7 +23678,7 @@
+ done
+ 
+ fi
+-echo "$as_me:23679: result: $cf_cv_sizechange" >&5
++echo "$as_me:23681: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -23694,13 +23696,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:23697: checking for memmove" >&5
++echo "$as_me:23699: 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 23703 "configure"
++#line 23705 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23731,16 +23733,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23734: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23736: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23737: \$? = $ac_status" >&5
++  echo "$as_me:23739: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23740: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23742: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23743: \$? = $ac_status" >&5
++  echo "$as_me:23745: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -23750,19 +23752,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23753: result: $ac_cv_func_memmove" >&5
++echo "$as_me:23755: 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:23759: checking for bcopy" >&5
++echo "$as_me:23761: 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 23765 "configure"
++#line 23767 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23793,16 +23795,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23796: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23798: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23799: \$? = $ac_status" >&5
++  echo "$as_me:23801: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23802: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23804: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23805: \$? = $ac_status" >&5
++  echo "$as_me:23807: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -23812,11 +23814,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23815: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:23817: 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:23819: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:23821: 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
+@@ -23826,7 +23828,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23829 "configure"
++#line 23831 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23842,15 +23844,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23845: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23847: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23848: \$? = $ac_status" >&5
++  echo "$as_me:23850: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23850: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23852: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23853: \$? = $ac_status" >&5
++  echo "$as_me:23855: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -23863,7 +23865,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:23866: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:23868: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -23890,13 +23892,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23893: checking for $ac_func" >&5
++echo "$as_me:23895: 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 23899 "configure"
++#line 23901 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23927,16 +23929,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23930: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23932: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23933: \$? = $ac_status" >&5
++  echo "$as_me:23935: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23936: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23938: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23939: \$? = $ac_status" >&5
++  echo "$as_me:23941: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23946,7 +23948,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23949: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23951: 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:23961: 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
+@@ -23966,7 +23968,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23969 "configure"
++#line 23971 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24019,15 +24021,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24022: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24024: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24025: \$? = $ac_status" >&5
++  echo "$as_me:24027: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24027: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24029: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24030: \$? = $ac_status" >&5
++  echo "$as_me:24032: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -24039,21 +24041,21 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24042: result: $cf_cv_working_poll" >&5
++echo "$as_me:24044: 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:24049: checking if MB_LEN_MAX is usable" >&5
++echo "$as_me:24051: checking if MB_LEN_MAX is usable" >&5
+ echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
+ if test "${cf_cv_mb_len_max+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24056 "configure"
++#line 24058 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24073,16 +24075,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24076: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24078: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24079: \$? = $ac_status" >&5
++  echo "$as_me:24081: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24082: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24084: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24085: \$? = $ac_status" >&5
++  echo "$as_me:24087: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mb_len_max=yes
+ else
+@@ -24092,7 +24094,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24095: result: $cf_cv_mb_len_max" >&5
++echo "$as_me:24097: result: $cf_cv_mb_len_max" >&5
+ echo "${ECHO_T}$cf_cv_mb_len_max" >&6
+ if test "$cf_cv_mb_len_max" = yes
+ then
+@@ -24102,18 +24104,18 @@
+ EOF
+ 
+ else
+-	{ echo "$as_me:24105: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
++	{ echo "$as_me:24107: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+ echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
+ fi
+ 
+-echo "$as_me:24109: checking for va_copy" >&5
++echo "$as_me:24111: 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 24116 "configure"
++#line 24118 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24130,16 +24132,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24133: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24135: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24136: \$? = $ac_status" >&5
++  echo "$as_me:24138: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24139: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24141: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24142: \$? = $ac_status" >&5
++  echo "$as_me:24144: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -24149,7 +24151,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24152: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:24154: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -24161,14 +24163,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:24164: checking for __va_copy" >&5
++echo "$as_me:24166: 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 24171 "configure"
++#line 24173 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24185,16 +24187,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24188: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24190: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24191: \$? = $ac_status" >&5
++  echo "$as_me:24193: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24194: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24196: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24197: \$? = $ac_status" >&5
++  echo "$as_me:24199: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -24204,7 +24206,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24207: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:24209: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -24216,14 +24218,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:24219: checking for __builtin_va_copy" >&5
++echo "$as_me:24221: 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 24226 "configure"
++#line 24228 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24240,16 +24242,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24243: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24245: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24246: \$? = $ac_status" >&5
++  echo "$as_me:24248: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24249: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24251: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24252: \$? = $ac_status" >&5
++  echo "$as_me:24254: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -24259,7 +24261,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24262: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:24264: 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 &&
+@@ -24277,14 +24279,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:24280: checking if we can simply copy va_list" >&5
++	echo "$as_me:24282: 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 24287 "configure"
++#line 24289 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24301,16 +24303,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24304: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24306: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24307: \$? = $ac_status" >&5
++  echo "$as_me:24309: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24310: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24312: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24313: \$? = $ac_status" >&5
++  echo "$as_me:24315: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -24320,19 +24322,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24323: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:24325: 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:24328: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:24330: 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 24335 "configure"
++#line 24337 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24349,16 +24351,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24352: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24354: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24355: \$? = $ac_status" >&5
++  echo "$as_me:24357: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24358: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24360: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24361: \$? = $ac_status" >&5
++  echo "$as_me:24363: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -24368,7 +24370,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24371: result: $cf_cv_array_va_list" >&5
++echo "$as_me:24373: 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
+@@ -24379,13 +24381,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:24382: checking for pid_t" >&5
++echo "$as_me:24384: 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 24388 "configure"
++#line 24390 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24400,16 +24402,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24403: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24405: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24406: \$? = $ac_status" >&5
++  echo "$as_me:24408: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24409: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24411: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24412: \$? = $ac_status" >&5
++  echo "$as_me:24414: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -24419,7 +24421,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24422: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:24424: 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
+   :
+@@ -24434,23 +24436,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:24437: checking for $ac_header" >&5
++echo "$as_me:24439: 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 24443 "configure"
++#line 24445 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:24447: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:24449: \"$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:24453: \$? = $ac_status" >&5
++  echo "$as_me:24455: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -24469,7 +24471,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24472: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:24474: 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:24487: 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 24491 "configure"
++#line 24493 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -24519,16 +24521,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24522: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24524: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24525: \$? = $ac_status" >&5
++  echo "$as_me:24527: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24528: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24530: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24531: \$? = $ac_status" >&5
++  echo "$as_me:24533: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -24538,7 +24540,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24541: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:24543: 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:24555: 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
+@@ -24573,15 +24575,15 @@
+       }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24576: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24578: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24579: \$? = $ac_status" >&5
++  echo "$as_me:24581: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24581: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24583: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24584: \$? = $ac_status" >&5
++  echo "$as_me:24586: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -24593,7 +24595,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24596: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:24598: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -24607,12 +24609,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:24610: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24612: 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:24615: checking for working vfork" >&5
++  echo "$as_me:24617: 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
+@@ -24621,7 +24623,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24624 "configure"
++#line 24626 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include 
+@@ -24714,15 +24716,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24717: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24719: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24720: \$? = $ac_status" >&5
++  echo "$as_me:24722: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24722: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24724: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24725: \$? = $ac_status" >&5
++  echo "$as_me:24727: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -24734,13 +24736,13 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24737: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:24739: 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:24743: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24745: 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
+ 
+@@ -24765,7 +24767,7 @@
+ 
+ fi
+ 
+-echo "$as_me:24768: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:24770: 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
+@@ -24775,7 +24777,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24778 "configure"
++#line 24780 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24810,15 +24812,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24813: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24815: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24816: \$? = $ac_status" >&5
++  echo "$as_me:24818: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24818: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24820: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24821: \$? = $ac_status" >&5
++  echo "$as_me:24823: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fopen_bin_r=yes
+ else
+@@ -24831,20 +24833,20 @@
+ fi
+ 
+ fi
+-echo "$as_me:24834: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:24836: 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
+ #define USE_FOPEN_BIN_R 1
+ EOF
+ 
+-	echo "$as_me:24841: checking for cc_t" >&5
++	echo "$as_me:24843: checking for cc_t" >&5
+ echo $ECHO_N "checking for cc_t... $ECHO_C" >&6
+ if test "${ac_cv_type_cc_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24847 "configure"
++#line 24849 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24862,16 +24864,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24865: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24867: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24868: \$? = $ac_status" >&5
++  echo "$as_me:24870: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24871: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24873: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24874: \$? = $ac_status" >&5
++  echo "$as_me:24876: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_cc_t=yes
+ else
+@@ -24881,7 +24883,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24884: result: $ac_cv_type_cc_t" >&5
++echo "$as_me:24886: result: $ac_cv_type_cc_t" >&5
+ echo "${ECHO_T}$ac_cv_type_cc_t" >&6
+ if test "$ac_cv_type_cc_t" = yes; then
+ 
+@@ -24891,13 +24893,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:24894: checking for speed_t" >&5
++	echo "$as_me:24896: checking for speed_t" >&5
+ echo $ECHO_N "checking for speed_t... $ECHO_C" >&6
+ if test "${ac_cv_type_speed_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24900 "configure"
++#line 24902 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24915,16 +24917,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24918: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24920: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24921: \$? = $ac_status" >&5
++  echo "$as_me:24923: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24924: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24926: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24927: \$? = $ac_status" >&5
++  echo "$as_me:24929: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_speed_t=yes
+ else
+@@ -24934,7 +24936,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24937: result: $ac_cv_type_speed_t" >&5
++echo "$as_me:24939: result: $ac_cv_type_speed_t" >&5
+ echo "${ECHO_T}$ac_cv_type_speed_t" >&6
+ if test "$ac_cv_type_speed_t" = yes; then
+ 
+@@ -24944,13 +24946,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:24947: checking for tcflag_t" >&5
++	echo "$as_me:24949: checking for tcflag_t" >&5
+ echo $ECHO_N "checking for tcflag_t... $ECHO_C" >&6
+ if test "${ac_cv_type_tcflag_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24953 "configure"
++#line 24955 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24968,16 +24970,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24971: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24973: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24974: \$? = $ac_status" >&5
++  echo "$as_me:24976: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24977: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24979: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24980: \$? = $ac_status" >&5
++  echo "$as_me:24982: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_tcflag_t=yes
+ else
+@@ -24987,7 +24989,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24990: result: $ac_cv_type_tcflag_t" >&5
++echo "$as_me:24992: result: $ac_cv_type_tcflag_t" >&5
+ echo "${ECHO_T}$ac_cv_type_tcflag_t" >&6
+ if test "$ac_cv_type_tcflag_t" = yes; then
+ 
+@@ -24997,13 +24999,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:25000: checking for sigset_t" >&5
++	echo "$as_me:25002: checking for sigset_t" >&5
+ echo $ECHO_N "checking for sigset_t... $ECHO_C" >&6
+ if test "${ac_cv_type_sigset_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25006 "configure"
++#line 25008 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25021,16 +25023,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25024: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25026: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25027: \$? = $ac_status" >&5
++  echo "$as_me:25029: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25030: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25032: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25033: \$? = $ac_status" >&5
++  echo "$as_me:25035: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_sigset_t=yes
+ else
+@@ -25040,7 +25042,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:25043: result: $ac_cv_type_sigset_t" >&5
++echo "$as_me:25045: result: $ac_cv_type_sigset_t" >&5
+ echo "${ECHO_T}$ac_cv_type_sigset_t" >&6
+ if test "$ac_cv_type_sigset_t" = yes; then
+ 
+@@ -25052,7 +25054,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:25055: checking for openpty in -lutil" >&5
++echo "$as_me:25057: 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
+@@ -25060,7 +25062,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25063 "configure"
++#line 25065 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -25079,16 +25081,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25082: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25084: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25085: \$? = $ac_status" >&5
++  echo "$as_me:25087: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25088: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25090: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25091: \$? = $ac_status" >&5
++  echo "$as_me:25093: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -25099,7 +25101,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:25102: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:25104: 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
+@@ -25107,7 +25109,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:25110: checking for openpty header" >&5
++echo "$as_me:25112: 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
+@@ -25134,7 +25136,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25137 "configure"
++#line 25139 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -25152,16 +25154,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25155: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25157: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25158: \$? = $ac_status" >&5
++  echo "$as_me:25160: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25161: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25163: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25164: \$? = $ac_status" >&5
++  echo "$as_me:25166: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -25179,7 +25181,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:25182: result: $cf_cv_func_openpty" >&5
++echo "$as_me:25184: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -25252,7 +25254,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25255 "configure"
++#line 25257 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -25264,16 +25266,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25267: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25269: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25270: \$? = $ac_status" >&5
++  echo "$as_me:25272: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25273: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25275: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25276: \$? = $ac_status" >&5
++  echo "$as_me:25278: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25290,7 +25292,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}:25293: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25295: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25326,7 +25328,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}:25329: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25331: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25337,7 +25339,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:25340: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:25342: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -25409,7 +25411,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25412 "configure"
++#line 25414 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -25421,16 +25423,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25424: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25426: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25427: \$? = $ac_status" >&5
++  echo "$as_me:25429: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25430: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25432: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25433: \$? = $ac_status" >&5
++  echo "$as_me:25435: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25447,7 +25449,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}:25450: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25452: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25527,7 +25529,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}:25530: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25532: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25544,23 +25546,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:25547: checking for db.h" >&5
++echo "$as_me:25549: 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 25553 "configure"
++#line 25555 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:25557: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25559: \"$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:25563: \$? = $ac_status" >&5
++  echo "$as_me:25565: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -25579,11 +25581,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25582: result: $ac_cv_header_db_h" >&5
++echo "$as_me:25584: 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:25586: checking for version of db" >&5
++echo "$as_me:25588: 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
+@@ -25594,10 +25596,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:25597: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:25599: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25600 "configure"
++#line 25602 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25627,16 +25629,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25630: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25632: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25633: \$? = $ac_status" >&5
++  echo "$as_me:25635: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25636: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25638: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25639: \$? = $ac_status" >&5
++  echo "$as_me:25641: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -25650,16 +25652,16 @@
+ done
+ 
+ fi
+-echo "$as_me:25653: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:25655: 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:25657: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:25659: 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:25662: checking for db libraries" >&5
++echo "$as_me:25664: 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
+@@ -25689,10 +25691,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:25692: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:25694: testing checking for library $cf_db_libs ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25695 "configure"
++#line 25697 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25747,16 +25749,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25750: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25752: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25753: \$? = $ac_status" >&5
++  echo "$as_me:25755: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25756: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25758: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25759: \$? = $ac_status" >&5
++  echo "$as_me:25761: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -25776,11 +25778,11 @@
+ done
+ 
+ fi
+-echo "$as_me:25779: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:25781: 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:25783: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:25785: 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
+@@ -25806,7 +25808,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:25809: error: Cannot find db.h" >&5
++	{ { echo "$as_me:25811: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -25821,20 +25823,18 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:25824: checking if we should include stdbool.h" >&5
+-echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
+-
++echo "$as_me:25826: checking if we can include stdbool.h" >&5
++echo $ECHO_N "checking if we can include stdbool.h... $ECHO_C" >&6
+ if test "${cf_cv_header_stdbool_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25832 "configure"
++#line 25833 "configure"
+ #include "confdefs.h"
+ 
+-#ifndef __BEOS__
++$ac_includes_default
+ #include 
+-#endif
+ 
+ int
+ main (void)
+@@ -25856,7 +25856,7 @@
+   ac_status=$?
+   echo "$as_me:25857: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  cf_cv_header_stdbool_h=1
++  cf_cv_header_stdbool_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+@@ -25884,7 +25884,7 @@
+   ac_status=$?
+   echo "$as_me:25885: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  cf_cv_header_stdbool_h=0
++  cf_cv_header_stdbool_h=no
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+@@ -25893,27 +25893,25 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
++echo "$as_me:25896: result: $cf_cv_header_stdbool_h" >&5
++echo "${ECHO_T}$cf_cv_header_stdbool_h" >&6
+ 
+-if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:25898: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25900: result: no" >&5
+-echo "${ECHO_T}no" >&6
++if test "$cf_cv_header_stdbool_h" = yes
++then	USE_STDBOOL_H=1
++else	USE_STDBOOL_H=0
+ fi
+ 
+ echo "$as_me:25904: 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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25912 "configure"
++#line 25911 "configure"
+ #include "confdefs.h"
+ 
+-#include 
+-#include 
++$ac_includes_default
+ 
+ int
+ main (void)
+@@ -25924,33 +25922,39 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25927: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25925: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25930: \$? = $ac_status" >&5
++  echo "$as_me:25928: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25933: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25931: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25936: \$? = $ac_status" >&5
++  echo "$as_me:25934: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  cf_cv_cc_bool_type=1
++  cf_cv_cc_bool_type=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-cf_cv_cc_bool_type=0
++cf_cv_cc_bool_type=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
++echo "$as_me:25944: result: $cf_cv_cc_bool_type" >&5
++echo "${ECHO_T}$cf_cv_cc_bool_type" >&6
+ 
+-if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:25948: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25950: result: no" >&5
+-echo "${ECHO_T}no" >&6
++if test "$cf_cv_cc_bool_type" = yes; then
++	USE_BUILTIN_BOOL=1
++else
++	USE_BUILTIN_BOOL=0
+ fi
+ 
++test "$cf_cv_header_stdbool_h" = yes &&
++cat >>confdefs.h <<\EOF
++#define USE_STDBOOL_H 1
++EOF
++
+ # Check for C++ compiler characteristics (and ensure that it's there!)
+ if test -n "$CXX" ; then
+ 	ac_ext=cc
+@@ -25964,10 +25968,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:25967: checking if we already have C++ library" >&5
++	echo "$as_me:25971: 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 25970 "configure"
++#line 25974 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -25981,16 +25985,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25984: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25988: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25987: \$? = $ac_status" >&5
++  echo "$as_me:25991: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25990: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25994: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25993: \$? = $ac_status" >&5
++  echo "$as_me:25997: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -25999,7 +26003,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-	echo "$as_me:26002: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:26006: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -26018,7 +26022,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:26021: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:26025: 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
+@@ -26044,7 +26048,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26047 "configure"
++#line 26051 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -26058,16 +26062,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26061: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26065: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26064: \$? = $ac_status" >&5
++  echo "$as_me:26068: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26067: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26071: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26070: \$? = $ac_status" >&5
++  echo "$as_me:26074: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -26079,7 +26083,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:26082: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:26086: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -26101,7 +26105,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:26104: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:26108: 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
+@@ -26116,15 +26120,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:26119: \"$ac_try\"") >&5
++if { (eval echo "$as_me:26123: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26122: \$? = $ac_status" >&5
++  echo "$as_me:26126: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:26124: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:26128: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26127: \$? = $ac_status" >&5
++  echo "$as_me:26131: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -26135,10 +26139,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+-  echo "$as_me:26138: result: yes" >&5
++  echo "$as_me:26142: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:26141: result: no" >&5
++  echo "$as_me:26145: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -26158,7 +26162,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:26161: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:26165: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -26179,7 +26183,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26182 "configure"
++#line 26186 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -26193,16 +26197,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26196: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26200: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26199: \$? = $ac_status" >&5
++  echo "$as_me:26203: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26202: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26206: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26205: \$? = $ac_status" >&5
++  echo "$as_me:26209: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -26239,7 +26243,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26242 "configure"
++#line 26246 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26253,16 +26257,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26256: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26260: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26259: \$? = $ac_status" >&5
++  echo "$as_me:26263: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26262: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26266: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26265: \$? = $ac_status" >&5
++  echo "$as_me:26269: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -26295,7 +26299,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	LIBS="$cf_save"
+-	echo "$as_me:26298: result: $cf_cxx_library" >&5
++	echo "$as_me:26302: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -26311,7 +26315,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:26314: checking how to run the C++ preprocessor" >&5
++echo "$as_me:26318: 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
+@@ -26328,18 +26332,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 26331 "configure"
++#line 26335 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26336: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26340: \"$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:26342: \$? = $ac_status" >&5
++  echo "$as_me:26346: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26362,17 +26366,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26365 "configure"
++#line 26369 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26369: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26373: \"$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:26375: \$? = $ac_status" >&5
++  echo "$as_me:26379: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26409,7 +26413,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:26412: result: $CXXCPP" >&5
++echo "$as_me:26416: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -26419,18 +26423,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 26422 "configure"
++#line 26426 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26427: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26431: \"$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:26433: \$? = $ac_status" >&5
++  echo "$as_me:26437: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26453,17 +26457,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26456 "configure"
++#line 26460 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26460: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26464: \"$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:26466: \$? = $ac_status" >&5
++  echo "$as_me:26470: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26491,7 +26495,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:26494: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:26498: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -26506,23 +26510,23 @@
+ for ac_header in new exception typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:26509: checking for $ac_header" >&5
++echo "$as_me:26513: 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 26515 "configure"
++#line 26519 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26519: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26523: \"$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:26525: \$? = $ac_status" >&5
++  echo "$as_me:26529: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26541,7 +26545,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26544: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26548: 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:26561: 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 26563 "configure"
++#line 26567 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26567: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26571: \"$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:26573: \$? = $ac_status" >&5
++  echo "$as_me:26577: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26589,7 +26593,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26592: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26596: 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:26607: 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 26606 "configure"
++#line 26610 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26620,16 +26624,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26623: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26627: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26626: \$? = $ac_status" >&5
++  echo "$as_me:26630: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26629: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26633: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26632: \$? = $ac_status" >&5
++  echo "$as_me:26636: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -26638,7 +26642,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:26641: result: $cf_iostream_namespace" >&5
++	echo "$as_me:26645: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -26649,99 +26653,17 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:26652: 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
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26660 "configure"
+-#include "confdefs.h"
+-
+-#ifndef __BEOS__
+-#include 
+-#endif
+-
+-int
+-main (void)
+-{
+-bool foo = false; (void)foo
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26676: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:26679: \$? = $ac_status" >&5
+-  (exit "$ac_status"); } &&
+-         { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26682: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:26685: \$? = $ac_status" >&5
+-  (exit "$ac_status"); }; }; then
+-  cf_cv_header_stdbool_h=1
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat "conftest.$ac_ext" >&5
+-cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26692 "configure"
+-#include "confdefs.h"
+-
+-int
+-main (void)
+-{
+-bool foo = false; (void)foo
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26704: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:26707: \$? = $ac_status" >&5
+-  (exit "$ac_status"); } &&
+-         { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26710: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:26713: \$? = $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
+-fi
+-rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-fi
+-rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-fi
+-
+-if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:26726: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:26728: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-echo "$as_me:26732: checking for builtin bool type" >&5
++echo "$as_me:26656: 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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26740 "configure"
++#line 26663 "configure"
+ #include "confdefs.h"
+ 
+-#include 
+-#include 
++$ac_includes_default
+ 
+ int
+ main (void)
+@@ -26752,40 +26674,35 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26755: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26677: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26758: \$? = $ac_status" >&5
++  echo "$as_me:26680: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26761: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26683: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26764: \$? = $ac_status" >&5
++  echo "$as_me:26686: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  cf_cv_builtin_bool=1
++  cf_cv_builtin_bool=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-cf_cv_builtin_bool=0
++cf_cv_builtin_bool=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
++echo "$as_me:26696: result: $cf_cv_builtin_bool" >&5
++echo "${ECHO_T}$cf_cv_builtin_bool" >&6
+ 
+-if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:26776: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:26778: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-echo "$as_me:26782: checking for bool" >&5
++echo "$as_me:26699: 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 26788 "configure"
++#line 26705 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26802,7 +26719,7 @@
+ 
+ #else
+ 
+-#if $cf_cv_header_stdbool_h
++#if $USE_STDBOOL_H
+ #include 
+ #endif
+ 
+@@ -26820,16 +26737,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26823: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26740: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26826: \$? = $ac_status" >&5
++  echo "$as_me:26743: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26829: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26746: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26832: \$? = $ac_status" >&5
++  echo "$as_me:26749: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -26839,10 +26756,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26842: result: $ac_cv_type_bool" >&5
++echo "$as_me:26759: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:26845: checking size of bool" >&5
++echo "$as_me:26762: 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
+@@ -26851,7 +26768,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26854 "configure"
++#line 26771 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26868,7 +26785,7 @@
+ 
+ #else
+ 
+-#if $cf_cv_header_stdbool_h
++#if $USE_STDBOOL_H
+ #include 
+ #endif
+ 
+@@ -26883,21 +26800,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26886: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26803: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26889: \$? = $ac_status" >&5
++  echo "$as_me:26806: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26892: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26809: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26895: \$? = $ac_status" >&5
++  echo "$as_me:26812: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26900 "configure"
++#line 26817 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26914,7 +26831,7 @@
+ 
+ #else
+ 
+-#if $cf_cv_header_stdbool_h
++#if $USE_STDBOOL_H
+ #include 
+ #endif
+ 
+@@ -26929,16 +26846,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26932: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26849: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26935: \$? = $ac_status" >&5
++  echo "$as_me:26852: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26938: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26855: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26941: \$? = $ac_status" >&5
++  echo "$as_me:26858: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -26954,7 +26871,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26957 "configure"
++#line 26874 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26971,7 +26888,7 @@
+ 
+ #else
+ 
+-#if $cf_cv_header_stdbool_h
++#if $USE_STDBOOL_H
+ #include 
+ #endif
+ 
+@@ -26986,16 +26903,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26989: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26906: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26992: \$? = $ac_status" >&5
++  echo "$as_me:26909: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26995: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26912: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26998: \$? = $ac_status" >&5
++  echo "$as_me:26915: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27011,7 +26928,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 27014 "configure"
++#line 26931 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27028,7 +26945,7 @@
+ 
+ #else
+ 
+-#if $cf_cv_header_stdbool_h
++#if $USE_STDBOOL_H
+ #include 
+ #endif
+ 
+@@ -27043,16 +26960,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27046: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26963: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27049: \$? = $ac_status" >&5
++  echo "$as_me:26966: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27052: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26969: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27055: \$? = $ac_status" >&5
++  echo "$as_me:26972: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27065,12 +26982,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27068: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:26985: 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 27073 "configure"
++#line 26990 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27087,7 +27004,7 @@
+ 
+ #else
+ 
+-#if $cf_cv_header_stdbool_h
++#if $USE_STDBOOL_H
+ #include 
+ #endif
+ 
+@@ -27106,15 +27023,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27109: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27026: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27112: \$? = $ac_status" >&5
++  echo "$as_me:27029: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27114: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27031: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27117: \$? = $ac_status" >&5
++  echo "$as_me:27034: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27130,13 +27047,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27133: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27050: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27056: 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
+@@ -27155,7 +27072,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27158 "configure"
++#line 27075 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27172,7 +27089,7 @@
+ 
+ #else
+ 
+-#if $cf_cv_header_stdbool_h
++#if $USE_STDBOOL_H
+ #include 
+ #endif
+ 
+@@ -27196,15 +27113,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27199: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27116: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27202: \$? = $ac_status" >&5
++  echo "$as_me:27119: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27204: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27121: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27207: \$? = $ac_status" >&5
++  echo "$as_me:27124: \$? = $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
+@@ -27221,19 +27138,19 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:27224: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:27141: 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:27231: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:27148: 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:27236: checking for special defines needed for etip.h" >&5
++echo "$as_me:27153: 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"
+@@ -27251,7 +27168,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 27254 "configure"
++#line 27171 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -27265,16 +27182,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27268: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27185: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27271: \$? = $ac_status" >&5
++  echo "$as_me:27188: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27274: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27191: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27277: \$? = $ac_status" >&5
++  echo "$as_me:27194: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:27215: result: ${cf_result:-(none)}" >&5
+ echo "${ECHO_T}${cf_result:-(none)}" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27303: checking if $CXX accepts override keyword" >&5
++echo "$as_me:27220: checking if $CXX accepts override keyword" >&5
+ echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
+ if test "${cf_cv_cpp_override+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27317,7 +27234,7 @@
+   cf_cv_cpp_override=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27320 "configure"
++#line 27237 "configure"
+ #include "confdefs.h"
+ 
+ class base
+@@ -27336,15 +27253,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27339: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27256: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27342: \$? = $ac_status" >&5
++  echo "$as_me:27259: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27344: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27261: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27347: \$? = $ac_status" >&5
++  echo "$as_me:27264: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_override=yes
+ else
+@@ -27363,7 +27280,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27366: result: $cf_cv_cpp_override" >&5
++echo "$as_me:27283: result: $cf_cv_cpp_override" >&5
+ echo "${ECHO_T}$cf_cv_cpp_override" >&6
+ fi
+ test "$cf_cv_cpp_override" = yes &&
+@@ -27372,7 +27289,7 @@
+ EOF
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27375: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:27292: 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
+@@ -27389,7 +27306,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27392 "configure"
++#line 27309 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -27408,15 +27325,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27411: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27328: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27414: \$? = $ac_status" >&5
++  echo "$as_me:27331: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27416: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27333: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27419: \$? = $ac_status" >&5
++  echo "$as_me:27336: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -27435,7 +27352,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27438: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:27355: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -27445,7 +27362,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:27448: checking if $CXX accepts static_cast" >&5
++echo "$as_me:27365: 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
+@@ -27459,7 +27376,7 @@
+ ac_main_return="return"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27462 "configure"
++#line 27379 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -27503,16 +27420,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27506: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27423: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27509: \$? = $ac_status" >&5
++  echo "$as_me:27426: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27512: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27429: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27515: \$? = $ac_status" >&5
++  echo "$as_me:27432: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -27530,7 +27447,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27533: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:27450: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -27562,7 +27479,7 @@
+ 
+ else
+ 	cf_cxx_library=no
+-	cf_cv_builtin_bool=1
++	cf_cv_builtin_bool=yes
+ 
+ 	# Just because we are not configuring against C++ right now does not
+ 	# mean that a user will not want to use C++.  Some distributors disable
+@@ -27575,16 +27492,16 @@
+ 
+ 	if test "$NCURSES_BOOL" != auto ; then
+ 		cf_cv_type_of_bool=$NCURSES_BOOL
+-		cf_cv_header_stdbool_h=0
++		USE_STDBOOL_H=0
+ 	else
+ 
+-echo "$as_me:27581: checking for bool" >&5
++echo "$as_me:27498: 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 27587 "configure"
++#line 27504 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27601,7 +27518,7 @@
+ 
+ #else
+ 
+-#if $cf_cv_header_stdbool_h
++#if $USE_STDBOOL_H
+ #include 
+ #endif
+ 
+@@ -27619,16 +27536,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27622: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27539: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27625: \$? = $ac_status" >&5
++  echo "$as_me:27542: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27628: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27545: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27631: \$? = $ac_status" >&5
++  echo "$as_me:27548: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -27638,10 +27555,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27641: result: $ac_cv_type_bool" >&5
++echo "$as_me:27558: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:27644: checking size of bool" >&5
++echo "$as_me:27561: 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
+@@ -27650,7 +27567,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27653 "configure"
++#line 27570 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27667,7 +27584,7 @@
+ 
+ #else
+ 
+-#if $cf_cv_header_stdbool_h
++#if $USE_STDBOOL_H
+ #include 
+ #endif
+ 
+@@ -27682,21 +27599,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27685: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27602: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27688: \$? = $ac_status" >&5
++  echo "$as_me:27605: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27691: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27608: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27694: \$? = $ac_status" >&5
++  echo "$as_me:27611: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27699 "configure"
++#line 27616 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27713,7 +27630,7 @@
+ 
+ #else
+ 
+-#if $cf_cv_header_stdbool_h
++#if $USE_STDBOOL_H
+ #include 
+ #endif
+ 
+@@ -27728,16 +27645,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27731: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27648: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27734: \$? = $ac_status" >&5
++  echo "$as_me:27651: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27737: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27654: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27740: \$? = $ac_status" >&5
++  echo "$as_me:27657: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -27753,7 +27670,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27756 "configure"
++#line 27673 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27770,7 +27687,7 @@
+ 
+ #else
+ 
+-#if $cf_cv_header_stdbool_h
++#if $USE_STDBOOL_H
+ #include 
+ #endif
+ 
+@@ -27785,16 +27702,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27788: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27705: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27791: \$? = $ac_status" >&5
++  echo "$as_me:27708: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27794: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27711: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27797: \$? = $ac_status" >&5
++  echo "$as_me:27714: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27810,7 +27727,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 27813 "configure"
++#line 27730 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27827,7 +27744,7 @@
+ 
+ #else
+ 
+-#if $cf_cv_header_stdbool_h
++#if $USE_STDBOOL_H
+ #include 
+ #endif
+ 
+@@ -27842,16 +27759,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27845: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27762: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27848: \$? = $ac_status" >&5
++  echo "$as_me:27765: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27851: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27768: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27854: \$? = $ac_status" >&5
++  echo "$as_me:27771: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27864,12 +27781,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27867: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27784: 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 27872 "configure"
++#line 27789 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27886,7 +27803,7 @@
+ 
+ #else
+ 
+-#if $cf_cv_header_stdbool_h
++#if $USE_STDBOOL_H
+ #include 
+ #endif
+ 
+@@ -27905,15 +27822,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27908: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27825: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27911: \$? = $ac_status" >&5
++  echo "$as_me:27828: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27913: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27830: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27916: \$? = $ac_status" >&5
++  echo "$as_me:27833: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27929,13 +27846,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27932: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27849: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27855: 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
+@@ -27954,7 +27871,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27957 "configure"
++#line 27874 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27971,7 +27888,7 @@
+ 
+ #else
+ 
+-#if $cf_cv_header_stdbool_h
++#if $USE_STDBOOL_H
+ #include 
+ #endif
+ 
+@@ -27995,15 +27912,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27998: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27915: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28001: \$? = $ac_status" >&5
++  echo "$as_me:27918: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:28003: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27920: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28006: \$? = $ac_status" >&5
++  echo "$as_me:27923: \$? = $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
+@@ -28020,14 +27937,14 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:28023: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:27940: 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:28030: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:27947: 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
+@@ -28041,11 +27958,11 @@
+ # specify the type of bool in a configure-script option and postpone
+ # integration with the C++ compiler provided that the types are compatible.
+ USE_CXX_BOOL=1
+-if test "$cf_cv_cc_bool_type" = 1
++if test "$USE_BUILTIN_BOOL" = 1
+ then
+ 	# oops: C has a bool.  Unlikely, but C++ could differ.
+ 	USE_CXX_BOOL=0
+-elif test "$cf_cv_builtin_bool" = 0
++elif test "$cf_cv_builtin_bool" = no
+ then
+ 	# C++ has no bool
+ 	USE_CXX_BOOL=0
+@@ -28058,7 +27975,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:28061: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:27978: 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
+@@ -28069,7 +27986,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:28072: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:27989: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -28086,10 +28003,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:28089: result: $ADAFLAGS" >&5
++	echo "$as_me:28006: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:28092: checking if GNATPREP supports -T option" >&5
++echo "$as_me:28009: 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
+@@ -28099,11 +28016,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:28102: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:28019: 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:28106: checking if GNAT supports generics" >&5
++echo "$as_me:28023: 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])
+@@ -28113,7 +28030,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:28116: result: $cf_gnat_generics" >&5
++echo "$as_me:28033: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -28125,7 +28042,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:28128: checking if GNAT supports SIGINT" >&5
++echo "$as_me:28045: 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
+@@ -28173,7 +28090,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:28176: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:28093: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -28186,7 +28103,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:28189: checking if GNAT supports project files" >&5
++echo "$as_me:28106: 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]*)
+@@ -28249,15 +28166,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:28252: result: $cf_gnat_projects" >&5
++echo "$as_me:28169: 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:28258: checking if GNAT supports libraries" >&5
++	echo "$as_me:28175: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:28260: result: $cf_gnat_libraries" >&5
++	echo "$as_me:28177: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -28277,7 +28194,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:28280: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:28197: 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
+@@ -28289,7 +28206,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:28292: checking for Ada95 compiler" >&5
++echo "$as_me:28209: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -28300,12 +28217,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:28303: result: $cf_ada_compiler" >&5
++echo "$as_me:28220: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:28308: checking for Ada95 include directory" >&5
++echo "$as_me:28225: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -28339,7 +28256,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28342: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28259: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28348,10 +28265,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:28351: result: $ADA_INCLUDE" >&5
++echo "$as_me:28268: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:28354: checking for Ada95 object directory" >&5
++echo "$as_me:28271: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -28385,7 +28302,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28388: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28305: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28394,10 +28311,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:28397: result: $ADA_OBJECTS" >&5
++echo "$as_me:28314: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:28400: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:28317: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -28418,11 +28335,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:28421: result: $with_ada_sharedlib" >&5
++echo "$as_me:28338: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+-	{ echo "$as_me:28425: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++	{ echo "$as_me:28342: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+ 
+@@ -28440,7 +28357,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:28443: checking for Ada95 curses library name" >&5
++echo "$as_me:28360: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -28456,7 +28373,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28459: result: $ADA_LIBNAME" >&5
++echo "$as_me:28376: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -28467,13 +28384,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:28470: checking for wchar_t" >&5
++	echo "$as_me:28387: 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 28476 "configure"
++#line 28393 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28488,16 +28405,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28491: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28408: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28494: \$? = $ac_status" >&5
++  echo "$as_me:28411: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28497: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28414: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28500: \$? = $ac_status" >&5
++  echo "$as_me:28417: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -28507,10 +28424,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:28510: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:28427: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:28513: checking size of wchar_t" >&5
++echo "$as_me:28430: 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
+@@ -28519,7 +28436,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28522 "configure"
++#line 28439 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28531,21 +28448,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28534: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28451: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28537: \$? = $ac_status" >&5
++  echo "$as_me:28454: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28540: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28457: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28543: \$? = $ac_status" >&5
++  echo "$as_me:28460: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28548 "configure"
++#line 28465 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28557,16 +28474,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28560: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28477: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28563: \$? = $ac_status" >&5
++  echo "$as_me:28480: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28566: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28483: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28569: \$? = $ac_status" >&5
++  echo "$as_me:28486: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -28582,7 +28499,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28585 "configure"
++#line 28502 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28594,16 +28511,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28597: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28514: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28600: \$? = $ac_status" >&5
++  echo "$as_me:28517: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28603: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28520: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28606: \$? = $ac_status" >&5
++  echo "$as_me:28523: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -28619,7 +28536,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 28622 "configure"
++#line 28539 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28631,16 +28548,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28634: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28551: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28637: \$? = $ac_status" >&5
++  echo "$as_me:28554: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28640: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28557: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28643: \$? = $ac_status" >&5
++  echo "$as_me:28560: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -28653,12 +28570,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:28656: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:28573: 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 28661 "configure"
++#line 28578 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28674,15 +28591,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:28677: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28594: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28680: \$? = $ac_status" >&5
++  echo "$as_me:28597: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:28682: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28599: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28685: \$? = $ac_status" >&5
++  echo "$as_me:28602: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -28698,7 +28615,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:28701: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:28618: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&6
+ 
+-echo "${as_me:-configure}:28714: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:28631: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -28729,7 +28646,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:28732: checking for library subsets" >&5
++echo "$as_me:28649: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -28783,7 +28700,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:28786: result: $LIB_SUBSETS" >&5
++echo "$as_me:28703: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -28814,7 +28731,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:28817: checking default library suffix" >&5
++echo "$as_me:28734: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28825,10 +28742,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:28828: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:28745: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:28831: checking default library-dependency suffix" >&5
++echo "$as_me:28748: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -28911,10 +28828,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:28914: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28831: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:28917: checking default object directory" >&5
++echo "$as_me:28834: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28930,11 +28847,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:28933: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28850: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28937: checking c++ library-dependency suffix" >&5
++echo "$as_me:28854: 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++)
+@@ -29027,7 +28944,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:29030: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:28947: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -29203,19 +29120,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:29206: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:29123: 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:29215: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:29132: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:29218: \$? = $ac_status" >&5
++  echo "$as_me:29135: \$? = $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
+@@ -29226,10 +29143,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 29229 "configure"
++#line 29146 "configure"
+ #include "confdefs.h"
+ 
+-#line 29232 "configure"
++#line 29149 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -29244,16 +29161,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:29247: \"$ac_link\"") >&5
++if { (eval echo "$as_me:29164: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:29250: \$? = $ac_status" >&5
++  echo "$as_me:29167: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:29253: \"$ac_try\"") >&5
++  { (eval echo "$as_me:29170: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:29256: \$? = $ac_status" >&5
++  echo "$as_me:29173: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -29276,7 +29193,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:29279: result: $cf_ldflags_static" >&5
++	echo "$as_me:29196: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test "$cf_ldflags_static" != yes
+@@ -29292,7 +29209,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29295: checking where we will install curses.h" >&5
++echo "$as_me:29212: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -29302,7 +29219,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:29305: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:29222: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -29310,7 +29227,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:29313: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:29230: 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
+@@ -29335,7 +29252,7 @@
+ 
+ # pkgsrc uses these
+ 
+-echo "$as_me:29338: checking for desired basename for form library" >&5
++echo "$as_me:29255: 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.
+@@ -29355,10 +29272,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29358: result: $FORM_NAME" >&5
++echo "$as_me:29275: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:29361: checking for desired basename for menu library" >&5
++echo "$as_me:29278: 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.
+@@ -29378,10 +29295,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29381: result: $MENU_NAME" >&5
++echo "$as_me:29298: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:29384: checking for desired basename for panel library" >&5
++echo "$as_me:29301: 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.
+@@ -29401,10 +29318,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29404: result: $PANEL_NAME" >&5
++echo "$as_me:29321: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:29407: checking for desired basename for cxx library" >&5
++echo "$as_me:29324: 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.
+@@ -29424,13 +29341,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29427: result: $CXX_NAME" >&5
++echo "$as_me:29344: 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:29433: checking for src modules" >&5
++echo "$as_me:29350: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -29489,7 +29406,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:29492: result: $cf_cv_src_modules" >&5
++echo "$as_me:29409: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -29650,7 +29567,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:29653: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:29570: 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//'`
+@@ -29661,7 +29578,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:29664: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
++echo "$as_me:29581: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -29677,7 +29594,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:29680: result: $PKG_CFLAGS" >&5
++echo "$as_me:29597: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ case "$cf_cv_system_name" in
+@@ -29749,7 +29666,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
+ 
+-echo "${as_me:-configure}:29752: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
++echo "${as_me:-configure}:29669: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+ 
+ fi
+ 
+@@ -29776,7 +29693,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:29779: checking for linker search path" >&5
++echo "$as_me:29696: 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
+@@ -29824,7 +29741,7 @@
+ 			cf_pathlist="$cf_pathlist /lib /usr/lib"
+ 			;;
+ 		(*)
+-			{ echo "$as_me:29827: WARNING: problem with Solaris architecture" >&5
++			{ echo "$as_me:29744: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ 			;;
+ 		esac
+@@ -29865,7 +29782,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:29868: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29785: 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'`
+@@ -29951,7 +29868,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29954: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29871: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -30087,7 +30004,7 @@
+ cat >>"$CONFIG_STATUS" <&5
+ echo "$as_me: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -30151,7 +30068,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:30154: error: unrecognized option: $1
++  -*) { { echo "$as_me:30071: 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;}
+@@ -30170,7 +30087,7 @@
+ ## Running config.status.  ##
+ ## ----------------------- ##
+ 
+-This file was extended by $as_me 2.52.20240618, executed with
++This file was extended by $as_me 2.52.20250126, executed with
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+   CONFIG_LINKS    = $CONFIG_LINKS
+@@ -30283,7 +30200,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:30286: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:30203: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -30601,7 +30518,8 @@
+ s,@HAVE_VSSCANF@,$HAVE_VSSCANF,;t t
+ s,@TEST_LIBS@,$TEST_LIBS,;t t
+ s,@TEST_LIBS2@,$TEST_LIBS2,;t t
+-s,@cf_cv_cc_bool_type@,$cf_cv_cc_bool_type,;t t
++s,@USE_STDBOOL_H@,$USE_STDBOOL_H,;t t
++s,@USE_BUILTIN_BOOL@,$USE_BUILTIN_BOOL,;t t
+ s,@CXXCPP@,$CXXCPP,;t t
+ s,@CXXLDFLAGS@,$CXXLDFLAGS,;t t
+ s,@CXX_AR@,$CXX_AR,;t t
+@@ -30811,7 +30729,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:30814: creating $ac_file" >&5
++    { echo "$as_me:30732: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -30829,7 +30747,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30832: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30750: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -30842,7 +30760,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30845: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30763: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30858,7 +30776,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:30861: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:30779: 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;}
+@@ -30867,7 +30785,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:30870: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:30788: 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;}
+@@ -30912,7 +30830,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:30915: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:30833: 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;}
+@@ -30923,7 +30841,7 @@
+     $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:30926: WARNING: Some variables may not be substituted:
++      { echo "$as_me:30844: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30972,7 +30890,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:30975: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:30893: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -30983,7 +30901,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30986: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30904: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -30996,7 +30914,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30999: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30917: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -31054,7 +30972,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:31057: $ac_file is unchanged" >&5
++      { echo "$as_me:30975: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -31441,7 +31359,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}:31444: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:31362: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: configure.in
+Prereq:  1.791 
+--- ncurses-6.5-20250222+/configure.in	2025-02-02 00:16:32.000000000 +0000
++++ ncurses-6.5-20250301/configure.in	2025-03-01 15:05:13.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.791 2025/02/02 00:16:32 tom Exp $
++dnl $Id: configure.in,v 1.794 2025/03/01 15:05:13 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.791 $)
++AC_REVISION($Revision: 1.794 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -1732,10 +1732,12 @@
+ 
+ dnl These are some other potentially nonportable headers.
+ AC_CHECK_HEADERS( \
++alloca.h \
+ fcntl.h \
+ getopt.h \
+ limits.h \
+ locale.h \
++malloc.h \
+ math.h \
+ poll.h \
+ sys/auxv.h \
+@@ -1901,7 +1903,14 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ CF_BOOL_DECL(cf_cv_cc_bool_type)
+-AC_SUBST(cf_cv_cc_bool_type)
++if test "$cf_cv_cc_bool_type" = yes; then
++	USE_BUILTIN_BOOL=1
++else
++	USE_BUILTIN_BOOL=0
++fi
++AC_SUBST(USE_BUILTIN_BOOL)
++
++test "$cf_cv_header_stdbool_h" = yes && AC_DEFINE(USE_STDBOOL_H,1,[Define to 1 if we can include stdbool.h])
+ 
+ # Check for C++ compiler characteristics (and ensure that it's there!)
+ if test -n "$CXX" ; then
+@@ -1932,7 +1941,7 @@
+ 	CF_CXX_AR_FLAGS
+ else
+ 	cf_cxx_library=no
+-	cf_cv_builtin_bool=1
++	cf_cv_builtin_bool=yes
+ 
+ 	# Just because we are not configuring against C++ right now does not
+ 	# mean that a user will not want to use C++.  Some distributors disable
+@@ -1945,7 +1954,7 @@
+ 
+ 	if test "$NCURSES_BOOL" != auto ; then
+ 		cf_cv_type_of_bool=$NCURSES_BOOL
+-		cf_cv_header_stdbool_h=0
++		USE_STDBOOL_H=0
+ 	else
+ 		CF_BOOL_SIZE
+ 	fi
+@@ -1958,11 +1967,11 @@
+ # specify the type of bool in a configure-script option and postpone
+ # integration with the C++ compiler provided that the types are compatible.
+ USE_CXX_BOOL=1
+-if test "$cf_cv_cc_bool_type" = 1
++if test "$USE_BUILTIN_BOOL" = 1
+ then
+ 	# oops: C has a bool.  Unlikely, but C++ could differ.
+ 	USE_CXX_BOOL=0
+-elif test "$cf_cv_builtin_bool" = 0
++elif test "$cf_cv_builtin_bool" = no
+ then
+ 	# C++ has no bool
+ 	USE_CXX_BOOL=0
+Index: dist.mk
+Prereq:  1.1657 
+--- ncurses-6.5-20250222+/dist.mk	2025-02-22 09:14:10.000000000 +0000
++++ ncurses-6.5-20250301/dist.mk	2025-03-01 10:08:08.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1657 2025/02/22 09:14:10 tom Exp $
++# $Id: dist.mk,v 1.1658 2025/03/01 10:08: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 = 5
+-NCURSES_PATCH = 20250222
++NCURSES_PATCH = 20250301
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/curs_add_wch.3x.html
+--- ncurses-6.5-20250222+/doc/html/man/curs_add_wch.3x.html	2025-02-02 00:43:56.000000000 +0000
++++ ncurses-6.5-20250301/doc/html/man/curs_add_wch.3x.html	2025-03-01 22:03:50.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_add_wch.3x,v 1.102 2025/02/01 23:54:03 tom Exp @
++  * @Id: curs_add_wch.3x,v 1.108 2025/03/01 21:16:45 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_add_wch 3x 2025-02-01 ncurses 6.5 Library calls
++curs_add_wch 3x 2025-03-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                        curs_add_wch 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                        
++
                                                                                                                                                        curs_add_wch 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                        
+ 
                                                                                                                                                        + curs_add_wch(3x)                 Library calls                curs_add_wch(3x)
+ 
+@@ -55,14 +55,14 @@
+ 
                                                                                                                                                        SYNOPSIS
                                                                                                                                                        +        #include <curses.h>
+ 
+-       int add_wch(const cchar_t *wch);
+-       int wadd_wch(WINDOW *win, const cchar_t *wch);
+-       int mvadd_wch(int y, int x, const cchar_t *wch);
+-       int mvwadd_wch(WINDOW *win, int y, int x,
+-             const cchar_t *wch);
++       int add_wch(const cchar_t * wch);
++       int wadd_wch(WINDOW * win, const cchar_t * wch);
++       int mvadd_wch(int y, int x, const cchar_t * wch);
++       int mvwadd_wch(WINDOW * win, int y, int x,
++             const cchar_t * wch);
+ 
+-       int echo_wchar(const cchar_t *wch);
+-       int wecho_wchar(WINDOW *win, const cchar_t *wch);
++       int echo_wchar(const cchar_t * wch);
++       int wecho_wchar(WINDOW * win, const cchar_t *wch);
+ 
+        /* (integer) constants */
+        /* ... */ WACS_BLOCK;
+@@ -150,14 +150,14 @@
+        until another spacing character is written to the window or the  cursor
+        is moved.
+ 
+-       If advancement occurs at the right margin,
+-
+-       o   the  cursor  automatically wraps to the beginning of the next line,
+-           then,
+-
+-       o   if  it  was  at  the  bottom  of  the  scrolling  region,  and   if
+-           scrollok(3x)  is  enabled  for win, the scrolling region scrolls up
+-           one line.
++       If  the  cursor  is  not  at  the  bottom  of  the scrolling region and
++       advancement occurs at the right margin, the cursor automatically  wraps
++       to the beginning of the next line.
++
++       If the cursor is at the bottom of the scrolling region when advancement
++       occurs at the right margin, and scrollok(3x) is enabled  for  win,  the
++       scrolling  region  scrolls  up  one  line.   Otherwise, advancement and
++       scrolling do not occur, and waddch returns ERR.
+ 
+        If wch is a backspace, carriage return, line feed, or tab,  the  cursor
+        moves appropriately within the window.
+@@ -202,8 +202,8 @@
+        wadd_wch to  write  line-drawing  and  other  symbols  to  the  screen.
+        ncurses  terms  these forms-drawing characters.  The ACS default listed
+        below is used if the acs_chars  (acsc)  terminfo  capability  does  not
+-       define  a  terminal-specific replacement for it, or if the terminal and
+-       locale configuration requires Unicode to access  these  characters  but
++       define  a terminal-specific replacement for it, or if the terminal type
++       and locale configuration require Unicode to access these characters but
+        the  library  is  unable  to  use  Unicode.   The  "acsc  char"  column
+        corresponds to how the characters are specified in the acs_chars (acsc)
+        string capability, and the characters in it may appear on the screen if
+@@ -298,7 +298,7 @@
+ 
                                                                                                                                                        RETURN VALUE
                                                                                                                                                        +        These functions return OK on success and ERR on failure.
+ 
+-       In ncurses, wadd_wch and wecho_wchar return ERR if
++       In ncurses, they return ERR if
+ 
+        o   the curses screen has not been initialized,
+ 
+@@ -322,8 +322,8 @@
+ 
+ 
+ 
                                                                                                                                                        EXTENSIONS
                                                                                                                                                        +-       The  symbols  (WACS_S3,  WACS_S7,  WACS_LEQUAL,  WACS_GEQUAL,  WACS_PI,
+-       WACS_NEQUAL,  and  WACS_STERLING)  are  not  standard.   However,  many
++       The  symbols  WACS_S3,  WACS_S7,  WACS_LEQUAL,  WACS_GEQUAL,   WACS_PI,
++       WACS_NEQUAL,   and  WACS_STERLING  are  not  standard.   However,  many
+        publicly  available   terminfo   entries   include   acs_chars   (acsc)
+        capabilities  in which their key characters (pryz{|}) are embedded, and
+        a second-hand list of their character descriptions has come  to  light.
+@@ -449,7 +449,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-01                  curs_add_wch(3x)
++ncurses 6.5                       2025-03-01                  curs_add_wch(3x)
+ 
                                                                                                                                                        
+ 
                                                                                                                                                        
+ 
                                                                                                                                                          
+Index: doc/html/man/curs_addch.3x.html
+--- ncurses-6.5-20250222+/doc/html/man/curs_addch.3x.html	2025-02-02 00:43:57.000000000 +0000
++++ ncurses-6.5-20250301/doc/html/man/curs_addch.3x.html	2025-03-01 22:03:50.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addch.3x,v 1.122 2025/02/01 23:54:03 tom Exp @
++  * @Id: curs_addch.3x,v 1.128 2025/03/01 21:16:45 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addch 3x 2025-02-01 ncurses 6.5 Library calls
++curs_addch 3x 2025-03-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                          curs_addch 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                          
++
                                                                                                                                                          curs_addch 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                          
+ 
                                                                                                                                                          + curs_addch(3x)                   Library calls                  curs_addch(3x)
+ 
+@@ -56,12 +56,12 @@
+        #include <curses.h>
+ 
+        int addch(const chtype ch);
+-       int waddch(WINDOW *win, const chtype ch);
++       int waddch(WINDOW * win, const chtype ch);
+        int mvaddch(int y, int x, const chtype ch);
+-       int mvwaddch(WINDOW *win, int y, int x, const chtype ch);
++       int mvwaddch(WINDOW * win, int y, int x, const chtype ch);
+ 
+        int echochar(const chtype ch);
+-       int wechochar(WINDOW *win, const chtype ch);
++       int wechochar(WINDOW * win, const chtype ch);
+ 
+        /* (integer) constants */
+        /* ... */ ACS_BLOCK;
+@@ -111,14 +111,14 @@
+        attributes and color pair.  (A color  pair  selection  is  not  honored
+        unless initialized; see start_color(3x).)
+ 
+-       If advancement occurs at the right margin,
+-
+-       o   the  cursor  automatically wraps to the beginning of the next line,
+-           then,
+-
+-       o   if  it  was  at  the  bottom  of  the  scrolling  region,  and   if
+-           scrollok(3x)  is  enabled  for win, the scrolling region scrolls up
+-           one line.
++       If  the  cursor  is  not  at  the  bottom  of  the scrolling region and
++       advancement occurs at the right margin, the cursor automatically  wraps
++       to the beginning of the next line.
++
++       If the cursor is at the bottom of the scrolling region when advancement
++       occurs at the right margin, and scrollok(3x) is enabled  for  win,  the
++       scrolling  region  scrolls  up  one  line.   Otherwise, advancement and
++       scrolling do not occur, and waddch returns ERR.
+ 
+        If ch is a backspace, carriage return, line feed, or  tab,  the  cursor
+        moves appropriately within the window.
+@@ -165,8 +165,8 @@
+        to write line-drawing and other symbols to the screen.   ncurses  terms
+        these  forms-drawing  characters.  The ACS default listed below is used
+        if the acs_chars (acsc) terminfo capability does not define a terminal-
+-       specific   replacement   for   it,   or  if  the  terminal  and  locale
+-       configuration requires Unicode  to  access  these  characters  but  the
++       specific  replacement  for  it,  or  if  the  terminal  type and locale
++       configuration require  Unicode  to  access  these  characters  but  the
+        library  is  unable to use Unicode.  The "acsc char" column corresponds
+        to how the characters are specified  in  the  acs_chars  (acsc)  string
+        capability,  and  the  characters in it may appear on the screen if the
+@@ -215,7 +215,7 @@
+ 
                                                                                                                                                          RETURN VALUE
                                                                                                                                                          +        These functions return OK on success and ERR on failure.
+ 
+-       In ncurses, waddch and wechochar return ERR if
++       In ncurses, they return ERR if
+ 
+        o   the curses screen has not been initialized,
+ 
+@@ -248,13 +248,13 @@
+ 
+ 
+ 
                                                                                                                                                          EXTENSIONS
                                                                                                                                                          +-       The   symbols   (ACS_S3,   ACS_S7,   ACS_LEQUAL,   ACS_GEQUAL,  ACS_PI,
+-       ACS_NEQUAL, and ACS_STERLING)  were  not  documented  in  any  publicly
+-       released  System V  and  are  not  standard.   However,  many  publicly
+-       available terminfo entries include  acs_chars  (acsc)  capabilities  in
+-       which  their  key  characters (pryz{|}) are embedded, and a second-hand
+-       list of their character descriptions has come to  light.   The  ncurses
+-       developers invented ACS-prefixed names for them.
++       The symbols ACS_S3, ACS_S7, ACS_LEQUAL, ACS_GEQUAL, ACS_PI, ACS_NEQUAL,
++       and ACS_STERLING were not documented in any publicly released  System V
++       and  are  not  standard.   However,  many  publicly  available terminfo
++       entries include  acs_chars  (acsc)  capabilities  in  which  their  key
++       characters  (pryz{|})  are  embedded,  and  a second-hand list of their
++       character descriptions has  come  to  light.   The  ncurses  developers
++       invented ACS-prefixed names for them.
+ 
+ 
+ 
                                                                                                                                                          PORTABILITY
                                                                                                                                                          +@@ -364,7 +364,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-01                    curs_addch(3x)
++ncurses 6.5                       2025-03-01                    curs_addch(3x)
+ 
                                                                                                                                                          
+ 
                                                                                                                                                          
+ 
                                                                                                                                                            
+Index: doc/html/man/curs_color.3x.html
+--- ncurses-6.5-20250222+/doc/html/man/curs_color.3x.html	2025-01-19 00:54:58.000000000 +0000
++++ ncurses-6.5-20250301/doc/html/man/curs_color.3x.html	2025-03-01 22:03:50.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_color.3x,v 1.113 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_color.3x,v 1.116 2025/03/01 21:17:37 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_color 3x 2025-01-18 ncurses 6.5 Library calls
++curs_color 3x 2025-03-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                            curs_color 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                            
++
                                                                                                                                                            curs_color 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                            
+ 
                                                                                                                                                            + curs_color(3x)                   Library calls                  curs_color(3x)
+ 
+@@ -263,11 +263,21 @@
+ 
+ 
+ 
                                                                                                                                                            has_colors
                                                                                                                                                            +-       The  has_colors  routine requires no arguments.  It returns TRUE if the
+-       terminal can manipulate colors;  otherwise,  it  returns  FALSE.   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.
++       has_colors returns TRUE if the terminal supports colors and FALSE if it
++       does not.   initscr(3x)  or  newterm(3x)  must  be  called  first,  but
++       start_color  need  not  be.   An  application  might call has_colors to
++       decide whether to use color or a video attribute like A_BOLD to  render
++       text.
++
++       Color  support  in  curses  requires that the terminal type description
++       support the capabilities max_colors (colors),  max_pairs  (pairs),  and
++       any of
++
++       o   set_foreground (setf) and set_background (setb);
++
++       o   set_a_foreground (setaf) and set_a_background (setab); or
++
++       o   set_color_pair (scp).
+ 
+ 
+ 
                                                                                                                                                            can_change_color
                                                                                                                                                            +@@ -427,7 +437,7 @@
+            o   color identifiers outside the range 0-COLORS-1  inclusive,  the
+                default colors extension notwithstanding, or
+ 
+-           o   color  pairs  identifiers  outside  the  range  0-COLOR_PAIRS-1
++           o   color   pair  identifiers  outside  the  range  0-COLOR_PAIRS-1
+                inclusive.
+ 
+ 
+@@ -445,10 +455,10 @@
+        application to disregard unnecessary information.
+ 
+        In ncurses, each screen has a color  activation  flag,  color  palette,
+-       color pair table, and associated COLORS and COLOR_PAIRS values for each
+-       screen; start_color affects only the  current  screen.   The  SVr4  and
+-       X/Open  Curses  interface  was  not  really designed with this in mind;
+-       historical implementations may use a single shared color palette.
++       color  pair  table,  and  associated  COLORS  and  COLOR_PAIRS  values;
++       start_color affects only the  current  screen.   The  SVr4  and  X/Open
++       Curses  interface was not really designed with this in mind; historical
++       implementations may use a single shared color palette.
+ 
+        Setting an implicit background color via  a  color  pair  affects  only
+        character  cells  that  a character write operation explicitly touches.
+@@ -555,7 +565,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                    curs_color(3x)
++ncurses 6.5                       2025-03-01                    curs_color(3x)
+ 
                                                                                                                                                            
+ 
                                                                                                                                                            
+ 
                                                                                                                                                              
+Index: doc/html/man/curs_getcchar.3x.html
+--- ncurses-6.5-20250222+/doc/html/man/curs_getcchar.3x.html	2025-02-02 00:43:57.000000000 +0000
++++ ncurses-6.5-20250301/doc/html/man/curs_getcchar.3x.html	2025-02-23 14:05:29.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_getcchar.3x,v 1.56 2025/02/01 23:46:11 tom Exp @
++  * @Id: curs_getcchar.3x,v 1.57 2025/02/23 13:48:31 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_getcchar 3x 2025-02-01 ncurses 6.5 Library calls
++curs_getcchar 3x 2025-02-23 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                              curs_getcchar 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                              
++
                                                                                                                                                              curs_getcchar 3x 2025-02-23 ncurses 6.5 Library calls
                                                                                                                                                              
+ 
                                                                                                                                                              + curs_getcchar(3x)                Library calls               curs_getcchar(3x)
+ 
+@@ -54,9 +54,9 @@
+ 
                                                                                                                                                              SYNOPSIS
                                                                                                                                                              +        #include <curses.h>
+ 
+-       int gettchar(const cchar_t * wch, wchar_t * wc,
++       int getcchar(const cchar_t * wch, wchar_t * wc,
+              attr_t * attrs, short * pair, void * opts);
+-       int settchar(cchar_t * wch, const wchar_t * wc,
++       int setcchar(cchar_t * wch, const wchar_t * wc,
+              const attr_t attrs, short pair, const void * opts);
+ 
+ 
+@@ -206,7 +206,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-01                 curs_getcchar(3x)
++ncurses 6.5                       2025-02-23                 curs_getcchar(3x)
+ 
                                                                                                                                                              
+ 
                                                                                                                                                              
+ 
                                                                                                                                                                
+Index: doc/html/man/curs_initscr.3x.html
+--- ncurses-6.5-20250222+/doc/html/man/curs_initscr.3x.html	2025-02-02 00:43:57.000000000 +0000
++++ ncurses-6.5-20250301/doc/html/man/curs_initscr.3x.html	2025-03-01 22:03:50.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_initscr.3x,v 1.92 2025/02/02 00:01:55 tom Exp @
++  * @Id: curs_initscr.3x,v 1.95 2025/03/01 21:21:41 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_initscr 3x 2025-02-01 ncurses 6.5 Library calls
++curs_initscr 3x 2025-03-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                curs_initscr 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                
++
                                                                                                                                                                curs_initscr 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                                
+ 
                                                                                                                                                                + curs_initscr(3x)                 Library calls                curs_initscr(3x)
+ 
+@@ -297,38 +297,47 @@
+            modes, e.g., def_shell_mode(3x), def_prog_mode(3x).  SVr4 uses  the
+            descriptor in SCREEN.
+ 
+-   Unset TERM Variable
+-       If  the  TERM  variable  is  missing  or  empty, initscr uses the value
+-       "unknown", which normally corresponds to  a  terminal  entry  with  the
+-       generic (gn) capability.  Generic entries are detected by setupterm(3x)
+-       and cannot be used for full-screen  operation.   Other  implementations
+-       may handle a missing/empty TERM variable differently.
++   Unset TERM Environment Variable
++       If  the  TERM  variable  is  not set in the environment or has an empty
++       value, initscr uses the value "unknown", which normally corresponds  to
++       a terminal entry with the generic (gn) capability.  Generic entries are
++       detected by setupterm(3x) and cannot be used for full-screen operation.
++       Other  implementations  may  handle  a  missing  or empty TERM variable
++       differently.
+ 
+ 
+ 
                                                                                                                                                                Signal Handlers
                                                                                                                                                                +        Quoting X/Open Curses Issue 7, section 3.1.1:
+ 
+-            Curses  implementations  may  provide  for special handling of the
+-            SIGINT, SIGQUIT, and  SIGTSTP  signals  if  their  disposition  is
++            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...
+ 
+-            Any  special  handling  for these signals may remain in effect for
++            Any 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.
+ 
+-            None  of the Curses functions are required to be safe with respect
++            None of the Curses functions are required to be safe with  respect
+             to signals...
+ 
+        Section "NOTES" above discusses ncurses's signal handlers.
+ 
+ 
++
                                                                                                                                                                HISTORY
                                                                                                                                                                ++       4BSD (1980) introduced initscr and endwin.
++
++       SVr2 (1984) added newterm and set_term.
++
++       SVr3.1 (1987) supplied delscreen and isendwin.
++
++
+ 
                                                                                                                                                                SEE ALSO
                                                                                                                                                                +-       curses(3x),    curs_kernel(3x),     curs_refresh(3x),     curs_slk(3x),
++       curses(3x),     curs_kernel(3x),     curs_refresh(3x),    curs_slk(3x),
+        curs_terminfo(3x), curs_util(3x), curs_variables(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-01                  curs_initscr(3x)
++ncurses 6.5                       2025-03-01                  curs_initscr(3x)
+ 
                                                                                                                                                                
+ 
                                                                                                                                                                
+ 
+ 
++
                                                                                                                                                              • HISTORY
                                                                                                                                                                • 
+ 
                                                                                                                                                              • SEE ALSO
                                                                                                                                                                • 
+ 
                                                                                                                                                              
+ 
                                                                                                                                                              
+Index: doc/html/man/curs_inopts.3x.html
+--- ncurses-6.5-20250222+/doc/html/man/curs_inopts.3x.html	2025-02-02 00:43:57.000000000 +0000
++++ ncurses-6.5-20250301/doc/html/man/curs_inopts.3x.html	2025-03-01 22:03:51.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inopts.3x,v 1.93 2025/02/02 00:02:25 tom Exp @
++  * @Id: curs_inopts.3x,v 1.96 2025/03/01 21:23:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inopts 3x 2025-02-01 ncurses 6.5 Library calls
++curs_inopts 3x 2025-03-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                              curs_inopts 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                              
++
                                                                                                                                                              curs_inopts 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                              
+ 
                                                                                                                                                              + curs_inopts(3x)                  Library calls                 curs_inopts(3x)
+ 
+@@ -216,7 +216,7 @@
+        progress when the event occurs; see typeahead below for a mitigation of
+        this problem.  You may want to call noqiflush in a signal  handler  if,
+        after  the  handler  exits,  you  want output to continue as though the
+-       interrupt had not occurred.
++       signal had not occurred.
+ 
+ 
+ 
                                                                                                                                                              raw, noraw
                                                                                                                                                              +@@ -242,25 +242,26 @@
+ 
+ 
+ 
                                                                                                                                                              typeahead
                                                                                                                                                              +-       Normally, a curses library checks the terminal for input while updating
+-       the  screen.   If  any is found, the update is postponed until the next
+-       wrefresh(3x) or doupdate(3x) call, allowing faster response to user key
+-       strokes.   The  library  tests the file descriptor corresponding to the
+-       FILE stream pointer passed to newterm(3x) (or stdin if initscr(3x)  was
+-       called),  for  pending  input.  typeahead instructs curses to test file
+-       descriptor fd instead.  An fd of -1 disables the check.
++       Normally, a curses library checks the terminal's input file  descriptor
++       for  pending input with poll(2) or select(2) while updating the screen;
++       if it finds any, it postpones output until  the  next  wrefresh(3x)  or
++       doupdate(3x)  call,  allowing faster response to user key strokes.  The
++       library tests the file descriptor  corresponding  to  the  FILE  stream
++       pointer passed to newterm(3x) (or stdin if initscr(3x) was called), for
++       pending input.  typeahead instructs curses to test file  descriptor  fd
++       instead.  An fd of -1 disables the check.
+ 
+ 
+ 
                                                                                                                                                              RETURN VALUE
                                                                                                                                                              +        timeout and wtimeout return no value.
+ 
+-       cbreak, nocbreak, echo, noecho,  halfdelay,  intrflush,  keypad,  meta,
+-       nodelay,  notimeout,  nl,  nonl, raw, noraw, and typeahead return OK on
++       cbreak,  nocbreak,  echo,  noecho,  halfdelay, intrflush, keypad, meta,
++       nodelay, notimeout, nl, nonl, raw, noraw, and typeahead  return  OK  on
+        success and ERR on failure.
+ 
+        In ncurses, the functions in the previous paragraph return ERR if
+ 
+-       o   the library's TERMINAL  structure  for  the  device  has  not  been
++       o   the  library's  TERMINAL  structure  for  the  device  has not been
+            initialized with initscr(3x), newterm(3x), or setupterm(3x), or
+ 
+        o   win is a null pointer (except with intrflush and meta, which ignore
+@@ -268,7 +269,7 @@
+ 
+        Further, halfdelay returns ERR if delay is outside the range 1..255.
+ 
+-       See section "EXTENSIONS" below for  the  return  values  of  is_cbreak,
++       See  section  "EXTENSIONS"  below  for  the return values of is_cbreak,
+        is_echo, is_nl, and is_raw.
+ 
+ 
+@@ -276,15 +277,27 @@
+        echo, noecho, halfdelay, intrflush, meta, nl, nonl, nodelay, notimeout,
+        noqiflush, qiflush, timeout, and wtimeout may be implemented as macros.
+ 
+-       noraw and nocbreak follow historical practice in that they  attempt  to
+-       restore  the  terminal's  canonical ("cooked") line discipline from raw
+-       and cbreak, respectively.  Mixing raw/noraw calls with  cbreak/nocbreak
+-       calls  leads to terminal driver control states that are hard to predict
++       noraw  and  nocbreak follow historical practice in that they attempt to
++       restore the terminal's canonical ("cooked") line  discipline  from  raw
++       and  cbreak, respectively.  Mixing raw/noraw calls with cbreak/nocbreak
++       calls leads to terminal driver control states that are hard to  predict
+        or understand; doing so is not recommended.
+ 
++       curses  documentation  uses  the  terms "delay" and "timeout" freely to
++       describe two related but distinct aspects of  input  handling,  at  the
++       risk   of  confusing  the  user.   The  functions  halfdelay,  nodelay,
++       notimeout, timeout,  and  wtimeout  all  configure  whether  the  input
++       character   reading  function  (getch(3x)  or  get_wch(3x))  waits  for
++       keyboard input, and for how long.  Only keypad configures whether  that
++       function  waits  for  further  input if the first character it reads is
++       ESC.  X/Open Curses affords no means of configuring the length of  this
++       second  delay, but an AIX and ncurses extension, ESCDELAY, is available
++       both as an environment variable and  a  global  symbol  permitting  the
++       application to do so; see ncurses(3x) and curs_variables(3x).
++
+ 
+ 
                                                                                                                                                              EXTENSIONS
                                                                                                                                                              +-       ncurses provides four "is_" functions corresponding  to  cbreak,  echo,
++       ncurses  provides  four  "is_" functions corresponding to cbreak, echo,
+        nl, and raw, permitting their states to be queried by the application.
+ 
+                             Query       Set      Reset
+@@ -300,7 +313,7 @@
+ 
+        0    if the option is unset, or
+ 
+-       -1   if  the  library's  TERMINAL structure for the device has not been
++       -1   if the library's TERMINAL structure for the device  has  not  been
+             initialized.
+ 
+ 
+@@ -308,52 +321,52 @@
+        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       Except  as  noted  in section "EXTENSIONS" above, X/Open Curses Issue 4
++       Except as noted in section "EXTENSIONS" above,  X/Open  Curses  Issue 4
+        describes these functions.  It specifies no error conditions for them.
+ 
+-       SVr4 describes a successful return value  only  as  "an  integer  value
++       SVr4  describes  a  successful  return  value only as "an integer value
+        other than ERR".
+ 
+-       ncurses  follows  X/Open Curses and the historical practice of System V
+-       curses, clearing the terminal driver's "echo"  flag  when  initializing
+-       the  screen.  BSD curses did not, but its raw function turned it off as
+-       a side effect.  For best portability, call echo  or  noecho  explicitly
+-       just  after initialization, even if your program retains the terminal's
++       ncurses follows X/Open Curses and the historical practice  of  System V
++       curses,  clearing  the  terminal driver's "echo" flag when initializing
++       the screen.  BSD curses did not, but its raw function turned it off  as
++       a  side  effect.   For best portability, call echo or noecho explicitly
++       just after initialization, even if your program retains the  terminal's
+        canonical ("cooked") line discipline.
+ 
+-       X/Open Curses is ambiguous regarding whether  raw  should  disable  the
+-       carriage  return and line feed translation feature controlled by nl and
+-       nonl.  BSD curses did turn off these translations; System V curses  did
+-       not.   ncurses  does so, on the assumption that a programmer requesting
+-       raw input wants a clean (ideally,  8-bit  clean)  connection  that  the
++       X/Open  Curses  is  ambiguous  regarding whether raw should disable the
++       carriage return and line feed translation feature controlled by nl  and
++       nonl.   BSD  curses  turned off these translations; System V curses did
++       not.  ncurses does so, on the assumption that a  programmer  requesting
++       raw  input  wants  a  clean  (ideally, 8-bit clean) connection that the
+        operating system will not alter.
+ 
+        When keypad is first enabled, ncurses loads the key definitions for the
+-       current terminal description.  If  the  terminal  description  includes
+-       extended  string  capabilities,  for example, by using the -x option of
++       current  terminal  type  description.   If  that  description  includes
++       extended string capabilities, for example, by using the  -x  option  of
+        tic(1), then ncurses also defines keys for the capabilities whose names
+-       begin  with  "k".  Corresponding key codes are generated and (depending
+-       on previous  loads  of  terminal  descriptions)  may  differ  from  one
+-       execution  of  a  program  to  the  next.   The generated key codes are
++       begin with "k".  Corresponding key codes are generated  and  (depending
++       on  previous  loads  of  terminal  descriptions)  may  differ  from one
++       execution of a program to  the  next.   The  generated  key  codes  are
+        recognized by keyname(3x), which then returns a name beginning with "k"
+-       denoting  the terminfo capability name rather than "K", used for curses
++       denoting the terminfo capability name rather than "K", used for  curses
+        key names.  On the other hand, an application can use define_key(3x) to
+-       bind  a  specific  key  to  a  string of the programmer's choice.  This
+-       feature  enables  an  application  to  check  for  its  presence   with
++       bind a specific key to a  string  of  the  programmer's  choice.   This
++       feature   enables  an  application  to  check  for  its  presence  with
+        tigetstr(3x), and reassign the key code to match its own needs.
+ 
+        Low-level applications can use tigetstr(3x) to obtain the definition of
+-       any string capability.  curses applications  use  the  input  character
++       any  string  capability.   curses  applications use the input character
+        reading function to obtain key codes from input and rely upon the order
+-       in which the string capabilities are loaded.  Multiple  key  capability
+-       strings  can  have  the  same  value,  but  the input character reading
+-       function can report only one key  code.   Most  curses  implementations
+-       (including  ncurses)  load  key definitions in the order they appear in
++       in  which  the string capabilities are loaded.  Multiple key capability
++       strings can have the  same  value,  but  the  input  character  reading
++       function  can  report  only  one key code.  Most curses implementations
++       (including ncurses) load key definitions in the order  they  appear  in
+        the strfnames array of string capability names; see term_variables(3x).
+-       The  last  capability read using a particular definition determines the
+-       key code to be reported.  In  ncurses,  extended  capabilities  can  be
+-       interpreted  as key definitions.  These are loaded after the predefined
+-       keys, and if a capability's value is the same as  a  previously  loaded
++       The last capability read using a particular definition  determines  the
++       key  code  to  be  reported.   In ncurses, extended capabilities can be
++       interpreted as key definitions.  These are loaded after the  predefined
++       keys,  and  if  a capability's value is the same as a previously loaded
+        key definition, the library uses the later definition.
+ 
+ 
+@@ -364,31 +377,31 @@
+        support it with cbreak, nocbreak, intrflush, keypad, meta, nodelay, and
+        typeahead.
+ 
+-       SVr3  (1987)  added  halfdelay,  notimeout,  and wtimeout.  qiflush and
+-       noqiflush appeared in SVr3.1 (1987), at which point intrflush became  a
+-       wrapper  for  either  of these functions, depending on the value of its
++       SVr3 (1987) added halfdelay,  notimeout,  and  wtimeout.   qiflush  and
++       noqiflush  appeared in SVr3.1 (1987), at which point intrflush became a
++       wrapper for either of these functions, depending on the  value  of  its
+        Boolean argument.  SVr3.1 also added timeout.
+ 
+        ncurses 6.5 (2024) introduced is_cbreak, is_echo, is_nl, and is_raw.
+ 
+-       Formerly, ncurses used  nl  and  nonl  to  control  the  conversion  of
+-       newlines  to  carriage  return/line  feed  on  output as well as input.
+-       X/Open Curses documents the use of  these  functions  only  for  input.
+-       This  difference arose from converting the pcurses source (1986), which
+-       used ioctl(2) calls and the sgttyb structure,  to  termios  (the  POSIX
+-       terminal  API).   In  the former, both input and output were controlled
++       Formerly,  ncurses  used  nl  and  nonl  to  control  the conversion of
++       newlines to carriage return/line feed  on  output  as  well  as  input.
++       X/Open  Curses  documents  the  use  of these functions only for input.
++       This difference arose from converting the pcurses source (1986),  which
++       used  ioctl(2)  calls  and  the sgttyb structure, to termios (the POSIX
++       terminal API).  In the former, both input and  output  were  controlled
+        via a single option "CRMOD", while the latter separates these features.
+-       Because  that  conversion  interferes with output optimization, ncurses
++       Because that conversion interferes with  output  optimization,  ncurses
+        6.2 (2020) amended nl and nonl to eliminate their effect on output.
+ 
+ 
+ 
                                                                                                                                                              SEE ALSO
                                                                                                                                                              +-       curses(3x),    curs_getch(3x),     curs_initscr(3x),     curs_util(3x),
++       curses(3x),     curs_getch(3x),     curs_initscr(3x),    curs_util(3x),
+        define_key(3x), termios(3), term_variables(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-01                   curs_inopts(3x)
++ncurses 6.5                       2025-03-01                   curs_inopts(3x)
+ 
                                                                                                                                                              
+ 
                                                                                                                                                              
+ 
                                                                                                                                                                
+Index: doc/html/man/curs_ins_wch.3x.html
+--- ncurses-6.5-20250222+/doc/html/man/curs_ins_wch.3x.html	2025-02-02 00:43:57.000000000 +0000
++++ ncurses-6.5-20250301/doc/html/man/curs_ins_wch.3x.html	2025-03-01 22:03:51.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_ins_wch.3x,v 1.46 2025/02/02 00:00:59 tom Exp @
++  * @Id: curs_ins_wch.3x,v 1.48 2025/03/01 21:25:47 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_ins_wch 3x 2025-02-01 ncurses 6.5 Library calls
++curs_ins_wch 3x 2025-03-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                curs_ins_wch 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                
++
                                                                                                                                                                curs_ins_wch 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                                
+ 
                                                                                                                                                                + curs_ins_wch(3x)                 Library calls                curs_ins_wch(3x)
+ 
+@@ -57,32 +57,38 @@
+        int ins_wch(const cchar_t * wch);
+        int wins_wch(WINDOW * win, const cchar_t * wch);
+        int mvins_wch(int y, int x, const cchar_t * wch);
+-       int mvwins_wch(WINDOW * win, int y, int x, const cchar_t * wch);
++       int mvwins_wch(WINDOW * win, int y, int x,
++             const cchar_t * wch);
+ 
+ 
+ 
                                                                                                                                                                DESCRIPTION
                                                                                                                                                                +-       These functions insert the curses complex character wch at  the  cursor
+-       in  the  specified window win (or stdscr).  The character previously at
+-       the cursor and any to its  right  move  one  cell  to  the  right;  the
+-       rightmost  character  on  the  line  is discarded.  The cursor does not
+-       advance.
++       wins_wch inserts  the  curses  complex  character  wch  at  the  cursor
++       position in the window win.  The character previously at the cursor and
++       any to its right move one cell to the  right;  the  formerly  rightmost
++       character  on the line is discarded.  Unlike add_wch(3x), wins_wch does
++       not advance the cursor.  ncurses(3x) describes  the  variants  of  this
++       function.
+ 
+ 
+ 
                                                                                                                                                                RETURN VALUE
                                                                                                                                                                +        These functions return OK on success and ERR on failure.
+ 
+-       Functions taking a WINDOW pointer  argument  fail  if  win  is  a  null
+-       pointer.
++       In ncurses, they return ERR if
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
++       o   the curses screen has not been initialized, and
++
++       o   (for  functions  taking  a  WINDOW  pointer argument) win is a null
++           pointer.
++
++       Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                                NOTES
                                                                                                                                                                +        ins_wch, mvins_wch, and mvwins_wch may be implemented as macros.
+ 
+-       A terminal's insert_character  (ich1)  capability  is  not  necessarily
+-       employed.
++       curses  does  not  necessarily  employ  the terminal's insert_character
++       (ich1) capability to achieve insertion.
+ 
+ 
+ 
                                                                                                                                                                PORTABILITY
                                                                                                                                                                +@@ -91,11 +97,11 @@
+ 
+ 
+ 
                                                                                                                                                                HISTORY
                                                                                                                                                                +-       X/Open Curses Issue 4 (1995) initially specified these functions.   The
+-       System V  Interface  Definition  Version 4 of the same year specified a
+-       function named winswch (and the usual  variants).   This  was  a  later
+-       addition  to  SVr4.x,  not  appearing  in  the  first  SVr4 (1989).  It
+-       differed from X/Open's later wins_wch in that it took  an  argument  of
++       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
++       System V Interface Definition Version 4 of the same  year  specified  a
++       function  named  winswch  (and  the  usual variants).  This was a later
++       addition to SVr4.x,  not  appearing  in  the  first  SVr4  (1989).   It
++       differed  from  X/Open's  later wins_wch in that it took an argument of
+        type chtype instead of cchar_t.
+ 
+ 
+@@ -107,7 +113,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-01                  curs_ins_wch(3x)
++ncurses 6.5                       2025-03-01                  curs_ins_wch(3x)
+ 
                                                                                                                                                                
+ 
                                                                                                                                                                
+ 
                                                                                                                                                                  
+Index: doc/html/man/curs_ins_wstr.3x.html
+--- ncurses-6.5-20250222+/doc/html/man/curs_ins_wstr.3x.html	2025-02-02 00:43:57.000000000 +0000
++++ ncurses-6.5-20250301/doc/html/man/curs_ins_wstr.3x.html	2025-03-01 22:03:51.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_ins_wstr.3x,v 1.58 2025/02/01 22:54:32 tom Exp @
++  * @Id: curs_ins_wstr.3x,v 1.60 2025/03/01 21:30:14 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_ins_wstr 3x 2025-02-01 ncurses 6.5 Library calls
++curs_ins_wstr 3x 2025-03-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                  curs_ins_wstr 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                  
++
                                                                                                                                                                  curs_ins_wstr 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                                  
+ 
                                                                                                                                                                  + curs_ins_wstr(3x)                Library calls               curs_ins_wstr(3x)
+ 
+@@ -76,8 +76,8 @@
+        be  lost.   wins_wstr  stops  inserting if it would have to wrap to the
+        next line to write the next wchar_t in wstr.  The cursor position  does
+        not change (after moving to (y, x), if specified).  wins_nwstr does the
+-       same, but inserts at most n characters, or as many as possible  (up  to
+-       the  end  of  the  line)  if  n is negative.  ncurses(3x) describes the
++       same, but inserts at most n wide characters, or as many as possible (up
++       to  the  end  of the line) if n is negative.  ncurses(3x) describes the
+        variants of these functions.
+ 
+ 
+@@ -141,7 +141,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-01                 curs_ins_wstr(3x)
++ncurses 6.5                       2025-03-01                 curs_ins_wstr(3x)
+ 
                                                                                                                                                                  
+ 
                                                                                                                                                                  
+ 
                                                                                                                                                                    
+Index: doc/html/man/curs_insch.3x.html
+--- ncurses-6.5-20250222+/doc/html/man/curs_insch.3x.html	2025-02-02 00:43:57.000000000 +0000
++++ ncurses-6.5-20250301/doc/html/man/curs_insch.3x.html	2025-03-01 22:03:51.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_insch.3x,v 1.51 2025/02/02 00:00:59 tom Exp @
++  * @Id: curs_insch.3x,v 1.54 2025/03/01 21:26:42 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_insch 3x 2025-02-01 ncurses 6.5 Library calls
++curs_insch 3x 2025-03-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                    curs_insch 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                    
++
                                                                                                                                                                    curs_insch 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                                    
+ 
                                                                                                                                                                    + curs_insch(3x)                   Library calls                  curs_insch(3x)
+ 
+@@ -61,38 +61,44 @@
+ 
+ 
+ 
                                                                                                                                                                    DESCRIPTION
                                                                                                                                                                    +-       These functions insert the curses character ch at  the  cursor  in  the
+-       specified  window  win  (or  stdscr).   The character previously at the
+-       cursor and any to its right move one cell to the right;  the  rightmost
+-       character on the line is discarded.  The cursor does not advance.
++       winsch inserts the curses character ch at the cursor  position  in  the
++       window  win.   The  character  previously  at the cursor and any to its
++       right move one cell to the right; the formerly rightmost  character  on
++       the  line  is discarded.  Unlike addch(3x), winsch does not advance the
++       cursor.  ncurses(3x) describes the variants of this function.
+ 
+ 
+ 
                                                                                                                                                                    RETURN VALUE
                                                                                                                                                                    +        These functions return OK on success and ERR on failure.
+ 
+-       Functions  taking  a  WINDOW  pointer  argument  fail  if win is a null
+-       pointer.
++       In ncurses, they return ERR if
+ 
+-       Functions prefixed with "mv" first perform cursor movement and fail  if
++       o   the curses screen has not been initialized, and
++
++       o   (for functions taking a WINDOW pointer  argument)  win  is  a  null
++           pointer.
++
++       Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                                    NOTES
                                                                                                                                                                    +        insch, mvinsch, and mvwinsch may be implemented as macros.
+ 
+-       A  terminal's  insert_character  (ich1)  capability  is not necessarily
+-       employed.
++       curses does not  necessarily  employ  the  terminal's  insert_character
++       (ich1) capability to achieve insertion.
+ 
+ 
+ 
                                                                                                                                                                    PORTABILITY
                                                                                                                                                                    +-       X/Open Curses Issue 4 describes these functions.
++       X/Open Curses Issue 4 describes these functions.  It specifies no error
++       conditions for them.
+ 
+        SVr4 describes a successful return value  only  as  "an  integer  value
+        other than ERR".
+ 
+ 
+ 
                                                                                                                                                                    HISTORY
                                                                                                                                                                    +-       SVr2 (1984) introduced winsch.
++       SVr2 (1984) introduced these functions.
+ 
+ 
+ 
                                                                                                                                                                    SEE ALSO
                                                                                                                                                                    +@@ -103,7 +109,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-01                    curs_insch(3x)
++ncurses 6.5                       2025-03-01                    curs_insch(3x)
+ 
                                                                                                                                                                    
+ 
                                                                                                                                                                    
+ 
                                                                                                                                                                      
+Index: doc/html/man/curs_instr.3x.html
+--- ncurses-6.5-20250222+/doc/html/man/curs_instr.3x.html	2025-02-02 00:43:57.000000000 +0000
++++ ncurses-6.5-20250301/doc/html/man/curs_instr.3x.html	2025-03-01 22:03:51.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_instr.3x,v 1.70 2025/02/01 22:54:06 tom Exp @
++  * @Id: curs_instr.3x,v 1.74 2025/03/01 21:29:42 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_instr 3x 2025-02-01 ncurses 6.5 Library calls
++curs_instr 3x 2025-03-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                      curs_instr 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                      
++
                                                                                                                                                                      curs_instr 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                                      
+ 
                                                                                                                                                                      + curs_instr(3x)                   Library calls                  curs_instr(3x)
+ 
+@@ -80,26 +80,29 @@
+        These functions return the count of characters copied from win to  str,
+        or ERR upon failure.
+ 
+-       In ncurses, they return ERR if
++       In ncurses, these functions return ERR if
+ 
+-       o   win is NULL or
++       o   the curses screen has not been initialized,
+ 
+-       o   str is NULL.
++       o   (for  functions  taking  a  WINDOW  pointer argument) win is a null
++           pointer, or
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
++       o   str is a null pointer.
++
++       Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                                      NOTES
                                                                                                                                                                      +        All of these functions except winnstr may be implemented as macros.
+ 
+-       Reading a line that overflows the array pointed to by str  with  instr,
+-       winstr,  mvinstr, or mvwinstr causes undefined results.  Use of innstr,
++       Reading  a  line that overflows the array pointed to by str with instr,
++       winstr, mvinstr, or mvwinstr causes undefined results.  Use of  innstr,
+        winnstr, mvinnstr, and mvwinnstr is recommended instead.
+ 
+ 
+ 
                                                                                                                                                                      EXTENSIONS
                                                                                                                                                                      +-       innstr, winnstr, mvinnstr, and mvwinnstr's  acceptance  of  negative  n
++       innstr,  winnstr,  mvinnstr,  and  mvwinnstr's acceptance of negative n
+        values is an ncurses extension.
+ 
+ 
+@@ -110,28 +113,27 @@
+        X/Open Curses Issue 4 describes these functions.  It specifies no error
+        conditions for them.
+ 
+-       X/Open  Curses  Issues  4 and 7 both state that instr, winstr, mvinstr,
+-       and mvwinstr return OK rather than a character count.  This  is  likely
++       X/Open Curses Issues 4 and 7 both state that  instr,  winstr,  mvinstr,
++       and  mvwinstr  return OK rather than a character count.  This is likely
+        an erratum.
+ 
+-       o   SVr3.1  and  SVr4  implemented  winstr as a wrapper around winnstr,
++       o   SVr3.1 and SVr4 implemented winstr as  a  wrapper  around  winnstr,
+            returning the latter's return value.  X/Open Curses's specification
+-           thus  may  have  been  an editorial solecism copied from System V's
+-           documentation (see below) by X/Open,  rather  than  an  intentional
++           thus may have been an editorial  solecism  copied  from  System V's
++           documentation  (see  below)  by  X/Open, rather than an intentional
+            change.
+ 
+        o   ncurses retains compatibility with System V curses behavior.
+ 
+-       SVr4  describes  a  successful  return  value only as "an integer value
++       SVr4 describes a successful return value  only  as  "an  integer  value
+        other than ERR".
+ 
+-       SVr4 does not document whether n counts the null terminator that  these
++       SVr4  does not document whether n counts the null terminator that these
+        functions write to str.
+ 
+ 
+ 
                                                                                                                                                                      HISTORY
                                                                                                                                                                      +-       SVr3.1  (1987)  introduced these functions.  winstr, winnstr, and their
+-       variants.
++       SVr3.1 (1987) introduced these functions.
+ 
+ 
+ 
                                                                                                                                                                      SEE ALSO
                                                                                                                                                                      +@@ -142,7 +144,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-01                    curs_instr(3x)
++ncurses 6.5                       2025-03-01                    curs_instr(3x)
+ 
                                                                                                                                                                      
+ 
                                                                                                                                                                      
+ 
                                                                                                                                                                        
+Index: doc/html/man/curs_inwstr.3x.html
+--- ncurses-6.5-20250222+/doc/html/man/curs_inwstr.3x.html	2025-01-19 00:54:59.000000000 +0000
++++ ncurses-6.5-20250301/doc/html/man/curs_inwstr.3x.html	2025-03-01 22:03:51.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inwstr.3x,v 1.56 2025/01/19 00:51:10 tom Exp @
++  * @Id: curs_inwstr.3x,v 1.60 2025/03/01 21:29:42 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inwstr 3x 2025-01-18 ncurses 6.5 Library calls
++curs_inwstr 3x 2025-03-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                        curs_inwstr 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                        
++
                                                                                                                                                                        curs_inwstr 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                                        
+ 
                                                                                                                                                                        + curs_inwstr(3x)                  Library calls                 curs_inwstr(3x)
+ 
+@@ -79,27 +79,30 @@
+ 
+ 
                                                                                                                                                                        RETURN VALUE
                                                                                                                                                                        +        On  successful  operation,  these  functions  return  the count of wide
+-       characters copied from win to wstr.   They  return  ERR  upon  failure.
+-       innwstr,  winnwstr,  mvinnwstr,  and  mvwinnwstr  return  ERR  if  n is
+-       insufficiently  large  to  store  a  complete  wide  character  string.
+-       (Recall  that  a  curses  complex  character  can contain multiple wide
+-       characters, some of which may be non-spacing.)
++       characters copied from win to wstr,  or  ERR  upon  failure.   innwstr,
++       winnwstr,  mvinnwstr,  and mvwinnwstr return ERR if n is insufficiently
++       large to store a complete wide character string.  (Recall that a curses
++       complex  character  can contain multiple wide characters, some of which
++       may be non-spacing.)
+ 
+        In ncurses, these functions return ERR if
+ 
+-       o   win is NULL or
++       o   the curses screen has not been initialized,
+ 
+-       o   wstr is NULL.
++       o   (for functions taking a WINDOW pointer  argument)  win  is  a  null
++           pointer, or
+ 
+-       Functions prefixed with "mv" first perform cursor movement and fail  if
++       o   wstr is a null pointer.
++
++       Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                                        NOTES
                                                                                                                                                                        +        All of these functions except winnwstr may be implemented as macros.
+ 
+-       Reading  a line that overflows the array pointed to by str with inwstr,
+-       winwstr, mvinwstr, or  mvwinwstr  causes  undefined  results.   Use  of
++       Reading a line that overflows the array pointed to by wstr with inwstr,
++       winwstr,  mvinwstr,  or  mvwinwstr  causes  undefined  results.  Use of
+        innwstr, winnwstr, mvinnwstr, and mvwinnwstr is recommended instead.
+ 
+ 
+@@ -115,27 +118,27 @@
+        X/Open Curses Issue 4 describes these functions.  It specifies no error
+        conditions for them.
+ 
+-       Notwithstanding the foregoing, X/Open Curses Issues 4 and 7 both  state
+-       that  innwstr,  winnwstr,  mvinnwstr, and mvwinnwstr "fail ... [i]f the
++       Notwithstanding  the foregoing, X/Open Curses Issues 4 and 7 both state
++       that innwstr, winnwstr, mvinnwstr, and mvwinnwstr "fail  ...  [i]f  the
+        array  is  not  large  enough  to  contain  any  complete  characters".
+-       Strictly  interpreted,  this  means  that  a  caller of these functions
++       Strictly interpreted, this means  that  a  caller  of  these  functions
+        cannot use their return values to detect truncation of a wide-character
+-       string  copied  from  more  than  one  character  cell in win.  ncurses
+-       reports any truncation with ERR.
++       string copied from more  than  one  character  cell  in  win.   ncurses
++       reports any truncation with ERR.
+ 
+-       X/Open Curses specifies inwstr, winwstr,  mvinwstr,  and  mvwinwstr  as
+-       returning  OK  rather  than a (wide) character count, unlike their non-
+-       wide  counterparts  instr,  winstr,  mvinstr,  and  mvwinstr.   ncurses
++       X/Open  Curses  specifies  inwstr,  winwstr, mvinwstr, and mvwinwstr as
++       returning OK rather than a (wide) character count,  unlike  their  non-
++       wide  counterparts  instr,  winstr,  mvinstr,  and  mvwinstr.   ncurses
+        regards this inconsistency as an error in the standard.
+ 
+ 
+ 
                                                                                                                                                                        HISTORY
                                                                                                                                                                        +-       The  System V Interface Definition, Version 4 (1995), specified winwstr
+-       and winnwstr (and the usual variants).  These were later  additions  to
+-       SVr4.x,  not  appearing  in  the  first  SVr4  (1989).   Their synopses
+-       described each function as taking an argument of  type  pointer-to-char
+-       instead  of  pointer-to-wchar_t,  despite describing them as "returning
+-       the string of wchar_t in str".  Presumably this was  an  error  in  the
++       The System V Interface Definition, Version 4 (1995), specified  winwstr
++       and  winnwstr  (and the usual variants).  These were later additions to
++       SVr4.x, not  appearing  in  the  first  SVr4  (1989).   Their  synopses
++       described  each  function as taking an argument of type pointer-to-char
++       instead of pointer-to-wchar_t, despite describing  them  as  "returning
++       the  string  of  wchar_t  in str".  Presumably this was an error in the
+        System V Interface Definition.
+ 
+ 
+@@ -147,7 +150,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                   curs_inwstr(3x)
++ncurses 6.5                       2025-03-01                   curs_inwstr(3x)
+ 
                                                                                                                                                                        
+ 
                                                                                                                                                                        
+ 
                                                                                                                                                                          
+Index: doc/html/man/curs_kernel.3x.html
+--- ncurses-6.5-20250222+/doc/html/man/curs_kernel.3x.html	2025-02-15 15:46:52.000000000 +0000
++++ ncurses-6.5-20250301/doc/html/man/curs_kernel.3x.html	2025-03-01 22:03:51.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_kernel.3x,v 1.77 2025/02/15 15:13:55 tom Exp @
++  * @Id: curs_kernel.3x,v 1.80 2025/03/01 21:31:35 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_kernel 3x 2025-02-15 ncurses 6.5 Library calls
++curs_kernel 3x 2025-03-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                          curs_kernel 3x 2025-02-15 ncurses 6.5 Library calls
                                                                                                                                                                          
++
                                                                                                                                                                          curs_kernel 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                                          
+ 
                                                                                                                                                                          + curs_kernel(3x)                  Library calls                 curs_kernel(3x)
+ 
+@@ -154,27 +154,29 @@
+ 
+ 
                                                                                                                                                                          ripoffline
                                                                                                                                                                          +        ripoffline provides access to the same facility that slk_init(3x)  uses
+-       to  reduce  the  size  of the screen.  ripoffline must be called before
+-       initscr or newterm is called, to prepare these initial actions:
++       to reduce the size of the screen.  The application must call ripoffline
++       before initscr(3x) or newterm(3x)  so  that  the  functions  prepare  a
++       stdscr of the correct size.
+ 
+-       o   If line is positive, a line is removed from the top of stdscr.
++       o   If  line  is  positive,  ripoffline  removes a line from the top of
++           stdscr.
+ 
+-       o   if line is negative, a line is removed from the bottom.
++       o   If line is negative, ripoffline removes a line from the  bottom  of
++           stdscr.
+ 
+-       When the resulting initialization is done inside initscr,  the  routine
+-       init (supplied by the user) is called with two arguments:
++       When initscr initializes curses, it calls the init function supplied to
++       ripoffline by the application with two arguments:
+ 
+-       o   a window pointer to the one-line window that has been allocated and
++       o   a pointer to the one-line WINDOW that it allocates, and
+ 
+        o   an integer with the number of columns in the window.
+ 
+-       Inside  this  initialization  routine,  the integer variables LINES and
+-       COLS (defined in <curses.h>) are not  guaranteed  to  be  accurate  and
+-       wrefresh  or  doupdate  must  not  be  called.  It is allowable to call
+-       wnoutrefresh during the initialization routine.
++       Inside this init function, the values of the  integer  variables  LINES
++       and COLS (see curs_variables(3x)) are not guaranteed to be reliable; it
++       must not call wrefresh(3x) or doupdate(3x).  A wnoutrefresh(3x) call is
++       permissible.
+ 
+-       ripoffline can be called up to five times  before  calling  initscr  or
+-       newterm.
++       ripoffline can be called up to five times before initscr or newterm.
+ 
+ 
+ 
                                                                                                                                                                          RETURN VALUE
                                                                                                                                                                          +@@ -235,11 +237,11 @@
+        The  System V  Interface Definition, Version 4 (1995), specified all of
+        these functions except curs_set as returning OK.
+ 
+-       Older SVr4 man pages  warn  that  the  return  value  of  curs_set  "is
++       Older SVr4 man pages  warn  that  the  return  value  of  curs_set  "is
+        currently  incorrect".  This implementation gets it right, but counting
+        on its correctness anywhere else may be unwise.
+ 
+-       X/Open Curses specifies ripoffline as returning OK with no  possibility
++       X/Open Curses specifies ripoffline as returning OK with no  possibility
+        of  failure  ("[c]alls to ripoffline above this limit [five lines] have
+        no effect but report success").
+ 
+@@ -250,7 +252,7 @@
+               An application  should  touch  and  refresh  the  window  before
+               resuming conventional use of Curses.
+ 
+-       Both  ncurses  and  SVr4 curses implement mvcur using the SCREEN object
++       Both  ncurses  and  SVr4 curses implement mvcur using the SCREEN object
+        allocated in either initscr(3x) or newterm(3x).  X/Open  Curses  states
+        that  the old location must be given for mvcur to accommodate terminals
+        that lack absolute cursor positioning.
+@@ -265,7 +267,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-15                   curs_kernel(3x)
++ncurses 6.5                       2025-03-01                   curs_kernel(3x)
+ 
                                                                                                                                                                          
+ 
                                                                                                                                                                          
+ 
                                                                                                                                                                            
+Index: doc/html/man/curs_mouse.3x.html
+--- ncurses-6.5-20250222+/doc/html/man/curs_mouse.3x.html	2025-02-15 20:06:26.000000000 +0000
++++ ncurses-6.5-20250301/doc/html/man/curs_mouse.3x.html	2025-03-01 22:03:51.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_mouse.3x,v 1.119 2025/02/15 19:36:18 tom Exp @
++  * @Id: curs_mouse.3x,v 1.123 2025/03/01 21:33:30 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_mouse 3x 2025-02-15 ncurses 6.5 Library calls
++curs_mouse 3x 2025-03-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                            curs_mouse 3x 2025-02-15 ncurses 6.5 Library calls
                                                                                                                                                                            
++
                                                                                                                                                                            curs_mouse 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                                            
+ 
                                                                                                                                                                            + curs_mouse(3x)                   Library calls                  curs_mouse(3x)
+ 
+@@ -117,7 +117,7 @@
+            of the specified mouse events can be reported.
+ 
+            If the screen is not initialized, or the  terminal  interface  does
+-           report mouse events, mousemask returns 0.
++           not report mouse events, mousemask returns 0.
+ 
+        o   If  old-mask  is  not a null pointer, mousemask stores the previous
+            value of the screen's mouse event mask there.
+@@ -381,23 +381,24 @@
+ 
+ 
+ 
                                                                                                                                                                            BUGS
                                                                                                                                                                            +-       Mouse events from xterm are not ignored in canonical mode if they  have
+-       been  enabled  by  mousemask.  Instead, the xterm mouse report sequence
+-       appears in the string read.
++       Mouse events from xterm are not ignored in canonical ("cooked") mode if
++       they  have  been enabled by mousemask.  Instead, the xterm mouse report
++       sequence appears in the string read.
+ 
+        An ncurses window must enable keypad(3x)  to  correctly  receive  mouse
+        event  reports  from  xterm  since they are encoded like function keys.
+        Set the terminal's terminfo capability key_mouse (kmous) to "\E[M" (the
+        beginning  of  the response from xterm for mouse clicks).  Other values
+-       of key_mouse are permitted under the  same  assumption,  that  is,  the
+-       report begins with that sequence.
++       of key_mouse are permitted under the same  assumption  --  that  is,  a
++       mouse  report  begins  with  the  value of the key_mouse (kmous) string
++       capability.
+ 
+        Because there are no standard response sequences that serve to identify
+-       terminals supporting the xterm mouse protocol, ncurses assumes that  if
+-       key_mouse  (kmous)  is  defined  in the terminal description, or if the
+-       terminal type's primary name or aliases  contain  the  string  "xterm",
++       terminals  supporting the xterm mouse protocol, ncurses assumes that if
++       key_mouse (kmous) is defined in the terminal  description,  or  if  the
++       terminal  type's  primary  name  or aliases contain the string "xterm",
+        then the terminal may send mouse events.  ncurses checks the kmous cap-
+-       code first, allowing use of newer xterm mouse protocols,  such  as  its
++       code  first,  allowing  use of newer xterm mouse protocols, such as its
+        private mode 1006.
+ 
+ 
+@@ -407,7 +408,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-15                    curs_mouse(3x)
++ncurses 6.5                       2025-03-01                    curs_mouse(3x)
+ 
                                                                                                                                                                            
+ 
                                                                                                                                                                            
+ 
                                                                                                                                                                              
+Index: doc/html/man/curs_move.3x.html
+--- ncurses-6.5-20250222+/doc/html/man/curs_move.3x.html	2025-02-02 00:43:58.000000000 +0000
++++ ncurses-6.5-20250301/doc/html/man/curs_move.3x.html	2025-03-01 22:03:51.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_move.3x,v 1.57 2025/02/01 22:50:42 tom Exp @
++  * @Id: curs_move.3x,v 1.59 2025/03/01 21:34:10 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_move 3x 2025-02-01 ncurses 6.5 Library calls
++curs_move 3x 2025-03-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                              curs_move 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                              
++
                                                                                                                                                                              curs_move 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                                              
+ 
                                                                                                                                                                              + curs_move(3x)                    Library calls                   curs_move(3x)
+ 
+@@ -61,8 +61,8 @@
+        wmove  relocates  the  cursor  associated with the curses window win to
+        line y and column  x.   The  terminal's  cursor  does  not  move  until
+        refresh(3x)  is  called.   The position (y, x) is relative to the upper
+-       left-hand  corner  of  the  window,  which  has   coordinates   (0, 0).
+-       ncurses(3x) describes the move variant of this function.
++       left-hand corner of the window, which  has  coordinates  (0, 0).   move
++       similarly moves the cursor in the stdscr window.
+ 
+ 
+ 
                                                                                                                                                                              RETURN VALUE
                                                                                                                                                                              +@@ -86,7 +86,7 @@
+ 
+ 
+ 
                                                                                                                                                                              HISTORY
                                                                                                                                                                              +-       4BSD (1980) introduced these functions.
++       4BSD (1980) introduced move and wmove.
+ 
+ 
+ 
                                                                                                                                                                              SEE ALSO
                                                                                                                                                                              +@@ -94,7 +94,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-01                     curs_move(3x)
++ncurses 6.5                       2025-03-01                     curs_move(3x)
+ 
                                                                                                                                                                              
+ 
                                                                                                                                                                              
+ 
                                                                                                                                                                                
+Index: doc/html/man/curs_outopts.3x.html
+--- ncurses-6.5-20250222+/doc/html/man/curs_outopts.3x.html	2025-02-02 00:43:58.000000000 +0000
++++ ncurses-6.5-20250301/doc/html/man/curs_outopts.3x.html	2025-03-01 22:03:51.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_outopts.3x,v 1.81 2025/02/01 22:49:13 tom Exp @
++  * @Id: curs_outopts.3x,v 1.89 2025/03/01 21:42:22 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_outopts 3x 2025-02-01 ncurses 6.5 Library calls
++curs_outopts 3x 2025-03-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                curs_outopts 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                
++
                                                                                                                                                                                curs_outopts 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                                                
+ 
                                                                                                                                                                                + curs_outopts(3x)                 Library calls                curs_outopts(3x)
+ 
+@@ -54,56 +54,54 @@
+ 
                                                                                                                                                                                SYNOPSIS
                                                                                                                                                                                +        #include <curses.h>
+ 
+-       int clearok(WINDOW *win, bool bf);
+-       void idcok(WINDOW *win, bool bf);
+-       int idlok(WINDOW *win, bool bf);
+-       void immedok(WINDOW *win, bool bf);
+-       int leaveok(WINDOW *win, bool bf);
+-       int scrollok(WINDOW *win, bool bf);
++       int clearok(WINDOW * win, bool bf);
++       void idcok(WINDOW * win, bool bf);
++       int idlok(WINDOW * win, bool bf);
++       void immedok(WINDOW * win, bool bf);
++       int leaveok(WINDOW * win, bool bf);
++       int scrollok(WINDOW * win, bool bf);
+ 
+        int setscrreg(int top, int bot);
+-       int wsetscrreg(WINDOW *win, int top, int bot);
++       int wsetscrreg(WINDOW * win, int top, int bot);
+ 
+ 
+ 
                                                                                                                                                                                DESCRIPTION
                                                                                                                                                                                +-       These routines set options that  change  the  style  of  output  within
+-       curses.   All options are initially FALSE, unless otherwise stated.  It
+-       is not necessary to turn these options off before calling endwin(3x).
++       These functions configure properties  of  curses  windows  that  affect
++       their  manner of output.  Boolean-valued properties are initially FALSE
++       except where noted.  endwin(3x) resets any terminal modes corresponding
++       to  these  properties;  an  application  need not restore their initial
++       values.
+ 
+ 
+ 
                                                                                                                                                                                clearok
                                                                                                                                                                                +-       If clearok is called with TRUE as argument, the next call  to  wrefresh
+-       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 win argument to clearok is the global  variable  curscr,  the  next
+-       call  to  wrefresh  with any window causes the screen to be cleared and
+-       repainted from scratch.
++       Setting win's clearok property to TRUE causes the next wrefresh call on
++       it  to clear the terminal screen and redraw it entirely.  This property
++       is useful to restore  the  contents  of  the  screen  (perhaps  because
++       another  process  has  written  to  the  terminal), or in some cases to
++       achieve  a  more  pleasing  visual  effect.   If  win  is  curscr  (see
++       curs_variables(3x)),  the  next  wrefresh call on any window causes the
++       terminal screen to clear and redraw as  above.   wrefresh  resets  this
++       property to FALSE.
+ 
+ 
+ 
                                                                                                                                                                                idcok
                                                                                                                                                                                +-       If idcok is called with FALSE as  second  argument,  curses  no  longer
+-       considers   using  the  hardware  insert/delete  character  feature  of
+-       terminals so equipped.  Use of character insert/delete  is  enabled  by
+-       default.   Calling idcok with TRUE as second argument re-enables use of
+-       character insertion and deletion.
++       (This  property  defaults TRUE.)  Setting win's idcok property to FALSE
++       prevents curses from using the insert/delete character capabilities  of
++       terminal types possessing them according to the terminfo database.
+ 
+ 
+ 
                                                                                                                                                                                idlok
                                                                                                                                                                                +-       If idlok is called with TRUE as second argument, curses considers using
+-       the  hardware  insert/delete  line  feature  of  terminals so equipped.
+-       Calling idlok with FALSE  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.
+-       It  is  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, curses redraws the
+-       changed portions of all lines.
++       Setting  win's  idlok  property to TRUE causes curses to consider using
++       the insert/delete line capabilities of terminal types  possessing  them
++       according  to  the  terminfo  database.   Enable  this  option  if  the
++       application explicitly requires these operations, as a full-screen text
++       editor  might;  otherwise  the  results may be visually annoying to the
++       user.
+ 
+ 
+ 
                                                                                                                                                                                immedok
                                                                                                                                                                                +        If immedok is called with TRUE as second argument, any  change  in  the
+-       window  image,  such  as  the  ones caused by waddch, wclrtobot, wscrl,
++       window  image,  such  as  the  ones caused by waddch, wclrtobot, wscrl,
+        etc., automatically causes a call to wrefresh.  However, it may degrade
+        performance  considerably,  due to repeated calls to wrefresh.  Calling
+        immedok with FALSE as second argument restores  the  default  behavior,
+@@ -200,7 +198,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-01                  curs_outopts(3x)
++ncurses 6.5                       2025-03-01                  curs_outopts(3x)
+ 
                                                                                                                                                                                
+ 
                                                                                                                                                                                
+ 
                                                                                                                                                                                  
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.5-20250222+/doc/html/man/infocmp.1m.html	2025-02-15 20:06:28.000000000 +0000
++++ ncurses-6.5-20250301/doc/html/man/infocmp.1m.html	2025-02-23 14:05:31.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: infocmp.1m,v 1.124 2025/02/15 19:37:37 tom Exp @
++  * @Id: infocmp.1m,v 1.126 2025/02/18 00:05:00 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-infocmp 1m 2025-02-15 ncurses 6.5 User commands
++infocmp 1m 2025-02-17 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                  infocmp 1m 2025-02-15 ncurses 6.5 User commands
                                                                                                                                                                                  
++
                                                                                                                                                                                  infocmp 1m 2025-02-17 ncurses 6.5 User commands
                                                                                                                                                                                  
+ 
                                                                                                                                                                                  + infocmp(1m)                      User commands                     infocmp(1m)
+ 
+@@ -62,12 +62,12 @@
+        compiled entry in the terminfo database  in  a  variety  of  selectable
+        formats,  compares such entries to each other, and rewrites an entry to
+        replace  "use"  expressions  with  the  content  of  other  entries  by
+-       reference.   A  terminfo  entry  entry  comprises a list of one or more
+-       terminal type identifiers, a human-readable description of the terminal
+-       type,  and  a  list  of  terminal  capabilities  that  characterize its
+-       programming interface.  In all  cases,  the  program  reports  Boolean-
+-       valued  capabilities  first, followed by numeric ones, and then string-
+-       valued capabilities.
++       reference.   A  terminfo entry comprises a list of one or more terminal
++       type identifiers, a human-readable description of  the  terminal  type,
++       and  a  list of terminal capabilities that characterize its programming
++       interface.   In  all  cases,   the   program   reports   Boolean-valued
++       capabilities  first,  followed  by numeric ones, and then string-valued
++       capabilities.
+ 
+ 
+ 
                                                                                                                                                                                  Default Options
                                                                                                                                                                                  +@@ -531,7 +531,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-15                       infocmp(1m)
++ncurses 6.5                       2025-02-17                       infocmp(1m)
+ 
                                                                                                                                                                                  
+ 
                                                                                                                                                                                  
+ 
                                                                                                                                                                                    
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.5-20250222+/doc/html/man/ncurses.3x.html	2025-02-15 15:07:49.000000000 +0000
++++ ncurses-6.5-20250301/doc/html/man/ncurses.3x.html	2025-03-01 22:03:53.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: ncurses.3x,v 1.243 2025/01/19 00:51:10 tom Exp @
++  * @Id: ncurses.3x,v 1.245 2025/03/01 21:43:30 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-ncurses 3x 2025-01-18 ncurses 6.5 Library calls
++ncurses 3x 2025-03-01 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                    ncurses 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                    
++
                                                                                                                                                                                    ncurses 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                                                    
+ 
                                                                                                                                                                                    + ncurses(3x)                      Library calls                     ncurses(3x)
+ 
+@@ -61,7 +61,7 @@
+        displays  with  output  optimized  to minimize screen updates.  ncurses
+        replaces the curses libraries from System V Release 4 Unix ("SVr4") and
+        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
+-       document describes ncurses version 6.5 (patch 20250215).
++       document describes ncurses version 6.5 (patch 20250301).
+ 
+        ncurses permits control of the terminal screen's contents;  abstraction
+        and  subdivision thereof with windows and pads; acquisition of keyboard
+@@ -181,7 +181,7 @@
+        Many terminals support configuration of character cell  foreground  and
+        background  colors  as  well  as  attributes, which cause characters to
+        render in such modes as boldfaced, underlined,  or  in  reverse  video.
+-       See curs_attr(3x).
++       See curs_color(3x) and curs_attr(3x).
+ 
+        curses  predefines  constants for a small set of forms-drawing graphics
+        corresponding to the DEC Alternate Character Set (ACS),  a  feature  of
+@@ -1500,7 +1500,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                       ncurses(3x)
++ncurses 6.5                       2025-03-01                       ncurses(3x)
+ 
                                                                                                                                                                                    
+ 
                                                                                                                                                                                    
+ 
                                                                                                                                                                                      
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.5-20250222+/doc/html/man/terminfo.5.html	2025-02-15 15:07:49.000000000 +0000
++++ ncurses-6.5-20250301/doc/html/man/terminfo.5.html	2025-02-23 14:05:32.000000000 +0000
+@@ -71,7 +71,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This document describes ncurses version 6.5 (patch 20250215).
++       This document describes ncurses version 6.5 (patch 20250301).
+ 
+ 
+ 
                                                                                                                                                    terminfo Entry Syntax
                                                                                                                                                    +@@ -1673,9 +1673,9 @@
+        works.
+ 
+        Finally, you can specify dch1 to delete a single  character,  dch  with
+-       one parameter, n, to delete ncharacters, and delete mode by giving smdc
+-       and rmdc to enter and exit delete mode (any mode the terminal needs  to
+-       be placed in for dch1 to work).
++       one  parameter,  n,  to  delete n characters, and delete mode by giving
++       smdc and rmdc to enter and exit delete  mode  (any  mode  the  terminal
++       needs to be placed in for dch1 to work).
+ 
+        A  command  to  erase  n  characters (equivalent to outputting n blanks
+        without moving the cursor) can be given as ech with one parameter.
+Index: doc/html/man/tput.1.html
+--- ncurses-6.5-20250222+/doc/html/man/tput.1.html	2025-02-15 20:06:29.000000000 +0000
++++ ncurses-6.5-20250301/doc/html/man/tput.1.html	2025-03-01 22:03:53.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tput.1,v 1.132 2025/02/15 19:35:19 tom Exp @
++  * @Id: tput.1,v 1.135 2025/03/01 21:45:34 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-tput 1 2025-02-15 ncurses 6.5 User commands
++tput 1 2025-03-01 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                    tput 1 2025-02-15 ncurses 6.5 User commands
                                                                                                                                                    
++
                                                                                                                                                    tput 1 2025-03-01 ncurses 6.5 User commands
                                                                                                                                                    
+ 
                                                                                                                                                    + tput(1)                          User commands                         tput(1)
+ 
+@@ -76,7 +76,7 @@
+        code.
+ 
+        terminfo(5) discusses terminal capabilities at length  and  presents  a
+-       complete list of cap-codes.
++       complete list of standard cap-codes.
+ 
+        When   retrieving  capability  values,  the  result  depends  upon  the
+        capability's type.
+@@ -445,17 +445,15 @@
+        o   SVr4 (1989) added color initialization  by  using  the  orig_colors
+            (oc) and orig_pair (op) capabilities in its init logic.
+ 
+-       Keith  Bostic  refactored BSD tput for shipment in 4.3BSD-Tahoe (1988),
+-       then replaced it the next year  with  a  new  implementation  based  on
+-       System V  tput.   Bostic's  version  similarly accepted some parameters
+-       named for terminfo (pseudo-)capabilities: clear,  init,  longname,  and
+-       reset.   However,  because  he  had only termcap available, it accepted
+-       termcap codes for other capabilities.  Also, Bostic's BSD tput did  not
+-       modify the terminal modes as the earlier BSD tset had done.
+-
+-       At  the  same time, Bostic added a shell script named "clear" that used
+-       tput to clear the screen.  Both of these appeared in  4.4BSD,  becoming
+-       the "modern" BSD implementation of tput.
++       Keith  Bostic  refactored  BSD tput for shipment in 4.3BSD-Reno (1990),
++       making it follow the interface  of  System V  tput  by  accepting  some
++       parameters  named  for  terminfo  (pseudo-)capabilities:  clear,  init,
++       longname, and reset.  However, because he had only  termcap  available,
++       it  accepted  termcap codes for other capabilities.  Also, Bostic's BSD
++       tput did not modify the terminal modes as  the  earlier  BSD  tset  had
++       done.  At the same time, Bostic added a shell script named "clear" that
++       used  tput  to  clear  the  screen.   These  became  the  "modern"  BSD
++       implementation of tput.
+ 
+        The  origin of ncurses tput lies outside both System V and BSD, in Ross
+        Ridge's mytinfo package, published  on  comp.sources.unix  in  December
+@@ -564,7 +562,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-15                           tput(1)
++ncurses 6.5                       2025-03-01                           tput(1)
+ 
                                                                                                                                                    
+ 
                                                                                                                                                    
+ 
                                                                                                                                                      
+Index: include/curses.h.in
+Prereq:  1.288 
+--- ncurses-6.5-20250222+/include/curses.h.in	2024-12-29 00:53:27.000000000 +0000
++++ ncurses-6.5-20250301/include/curses.h.in	2025-02-23 01:33:32.000000000 +0000
+@@ -33,7 +33,7 @@
+  *     and: Thomas E. Dickey                        1996-on                 *
+  ****************************************************************************/
+ 
+-/* $Id: curses.h.in,v 1.288 2024/12/29 00:53:27 tom Exp $ */
++/* $Id: curses.h.in,v 1.290 2025/02/23 01:33:32 tom Exp $ */
+ 
+ #ifndef __NCURSES_H
+ #define __NCURSES_H
+@@ -109,7 +109,7 @@
+  * User-definable tweak to disable the include of .
+  */
+ #ifndef NCURSES_ENABLE_STDBOOL_H
+-#define NCURSES_ENABLE_STDBOOL_H @cf_cv_header_stdbool_h@
++#define NCURSES_ENABLE_STDBOOL_H @USE_STDBOOL_H@
+ #endif
+ 
+ /*
+@@ -296,7 +296,7 @@
+ #include 
+ /* use whatever the C compiler decides bool really is */
+ #define NCURSES_BOOL bool
+-#elif !defined(__cplusplus) && !@cf_cv_cc_bool_type@
++#elif !defined(__cplusplus) && !@USE_BUILTIN_BOOL@
+ /* there is no predefined bool - use our own */
+ #undef bool
+ #define bool NCURSES_BOOL
+Index: include/nc_alloc.h
+Prereq:  1.30 
+--- ncurses-6.5-20250222+/include/nc_alloc.h	2021-11-20 23:33:38.000000000 +0000
++++ ncurses-6.5-20250301/include/nc_alloc.h	2025-03-01 15:02:06.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2019-2021,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2013,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /****************************************************************************
+  *  Author: Thomas E. Dickey                    1996-on                     *
+  ****************************************************************************/
+-/* $Id: nc_alloc.h,v 1.30 2021/11/20 23:33:38 tom Exp $ */
++/* $Id: nc_alloc.h,v 1.36 2025/03/01 15:02:06 tom Exp $ */
+ 
+ #ifndef NC_ALLOC_included
+ #define NC_ALLOC_included 1
+@@ -118,6 +118,27 @@
+ #define typeCalloc(type,elts) (type *)calloc((size_t)(elts),sizeof(type))
+ #define typeRealloc(type,elts,ptr) (type *)_nc_doalloc(ptr, (size_t)(elts)*sizeof(type))
+ 
++/* provide for using VLAs if supported, otherwise assume alloca() */
++
++#ifndef __STDC_VERSION__
++#define __STDC_VERSION__ 0
++#endif
++
++#ifndef __STDC_NO_VLA__
++#define __STDC_NO_VLA__ 1
++#endif
++
++#if __STDC_VERSION__ >= 19901L && (__STDC_VERSION__ < 201000L || !__STDC_NO_VLA__)
++#define MakeArray(name,type,count) type name[count]
++#else
++#if HAVE_ALLOCA_H
++#include 
++#elif HAVE_MALLOC_H
++#include 
++#endif
++#define MakeArray(name,type,count) type *name = (type*) alloca(sizeof(type) * (size_t) (count))
++#endif
++
+ #ifdef __cplusplus
+ }
+ #endif
+Index: include/nc_win32.h
+Prereq:  1.14 
+--- ncurses-6.5-20250222+/include/nc_win32.h	2024-10-19 21:06:23.000000000 +0000
++++ ncurses-6.5-20250301/include/nc_win32.h	2025-03-01 13:13:33.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2008-2010,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -31,7 +31,7 @@
+  * Author: Thomas Dickey, 2008-on                                           *
+  ****************************************************************************/
+ 
+-/* $Id: nc_win32.h,v 1.14 2024/10/19 21:06:23 tom Exp $ */
++/* $Id: nc_win32.h,v 1.15 2025/03/01 13:13:33 tom Exp $ */
+ 
+ #ifndef NC_WIN32_H
+ #define NC_WIN32_H 1
+@@ -176,8 +176,6 @@
+ extern NCURSES_EXPORT_VAR(ConsoleInfo) _nc_CONSOLE;
+ #define WINCONSOLE _nc_CONSOLE
+ 
+-#define TypeAlloca(type,count)(type*) _alloca(sizeof(type)*(size_t)(count))
+-
+ #endif /* EVENTLIST_2nd */
+ 
+ #ifdef __cplusplus
+Index: include/ncurses_defs
+Prereq:  1.113 
+--- ncurses-6.5-20250222+/include/ncurses_defs	2024-12-14 21:20:43.000000000 +0000
++++ ncurses-6.5-20250301/include/ncurses_defs	2025-03-01 15:06:22.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: ncurses_defs,v 1.113 2024/12/14 21:20:43 tom Exp $
++# $Id: ncurses_defs,v 1.116 2025/03/01 15:06:22 tom Exp $
+ ##############################################################################
+-# Copyright 2018-2023,2024 Thomas E. Dickey                                  #
++# Copyright 2018-2024,2025 Thomas E. Dickey                                  #
+ # Copyright 2000-2016,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -42,6 +42,7 @@
+ ETIP_NEEDS_MATH_H
+ GCC_NORETURN	/* nothing */
+ GCC_UNUSED	/* nothing */
++HAVE_ALLOCA_H
+ HAVE_ALLOC_PAIR
+ HAVE_ASSUME_DEFAULT_COLORS
+ HAVE_BIG_CORE
+@@ -112,6 +113,7 @@
+ HAVE_LOCALECONV
+ HAVE_LOCALE_H
+ HAVE_LONG_FILE_NAMES
++HAVE_MALLOC_H
+ HAVE_MATH_FUNCS
+ HAVE_MATH_H
+ HAVE_MBLEN
+@@ -275,6 +277,7 @@
+ USE_SAFE_SPRINTF
+ USE_SCROLL_HINTS
+ USE_SIGWINCH
++USE_STDBOOL_H
+ USE_STRING_HACKS
+ USE_SYMLINKS
+ USE_SYSMOUSE
+Index: man/MKterminfo.sh
+Prereq:  1.21 
+--- ncurses-6.5-20250222+/man/MKterminfo.sh	2025-02-20 00:14:25.000000000 +0000
++++ ncurses-6.5-20250301/man/MKterminfo.sh	2025-03-01 21:10:01.000000000 +0000
+@@ -1,5 +1,5 @@
+ #!/bin/sh
+-# $Id: MKterminfo.sh,v 1.21 2025/02/20 00:14:25 tom Exp $
++# $Id: MKterminfo.sh,v 1.22 2025/03/01 21:10:01 Branden.Robinson Exp $
+ #
+ # MKterminfo.sh -- generate terminfo.5 from Caps tabular data
+ #
+@@ -76,9 +76,6 @@
+ rm -f $sorted $temp $unsorted
+ 
+ cat $caps | sed -n "\
+-/^#%.TS/i.na
+-/^#%.TE/a\
+-.ad
+ /%%-STOP-HERE-%%/q
+ /^#%center/s, expand,,
+ /^#%lw25/s, lw6 , lw7 ,
+@@ -87,6 +84,7 @@
+ s/[	][	]*/	/g
+ s/$/T}/
+ s/	[A-Z0-9_()\-][A-Z0-9_()\-]*	[0-9\-][0-9\-]*	[Y\-][B\-][C\-][G\-][EK\-]\**	/	T{\\
++.ad l\
+ /
+ s/	bool	/	/p
+ s/	num	/	/p
+Index: man/curs_add_wch.3x
+Prereq:  1.102 
+--- ncurses-6.5-20250222+/man/curs_add_wch.3x	2025-02-01 23:54:03.000000000 +0000
++++ ncurses-6.5-20250301/man/curs_add_wch.3x	2025-03-01 21:16:45.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_add_wch.3x,v 1.102 2025/02/01 23:54:03 tom Exp $
+-.TH curs_add_wch 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_add_wch.3x,v 1.108 2025/03/01 21:16:45 tom Exp $
++.TH curs_add_wch 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -57,14 +57,14 @@
+ .nf
+ \fB#include 
+ .PP
+-\fBint add_wch(const cchar_t *\fIwch\fP);
+-\fBint wadd_wch(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fP);
+-\fBint mvadd_wch(int \fIy\fP, int \fIx\fP, const cchar_t *\fIwch\fP);
+-\fBint mvwadd_wch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP,
+-      const cchar_t *\fIwch\fP);
++\fBint add_wch(const cchar_t * \fIwch\fP);
++\fBint wadd_wch(WINDOW * \fIwin\fP, const cchar_t * \fIwch\fP);
++\fBint mvadd_wch(int \fIy\fP, int \fIx\fP, const cchar_t * \fIwch\fP);
++\fBint mvwadd_wch(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP,
++      const cchar_t * \fIwch\fP);
+ .PP
+-\fBint echo_wchar(const cchar_t *\fIwch\fP);
+-\fBint wecho_wchar(WINDOW *\fIwin\fP, const cchar_t *\fIwch\fP);
++\fBint echo_wchar(const cchar_t * \fIwch\fP);
++\fBint wecho_wchar(WINDOW * \fIwin\fP, const cchar_t *\fIwch\fP);
+ .PP
+ \fI/* (integer) constants */\fP
+ /*\fI .\|.\|. */ \fBWACS_BLOCK;\fR
+@@ -177,15 +177,23 @@
+ complex character until another spacing character is written to the
+ window or the cursor is moved.
+ .PP
+-If advancement occurs at the right margin,
+-.bP
+-the cursor automatically wraps to the beginning of the next line,
+-then,
+-.bP
+-if it was at the bottom of the scrolling region,
+-and if \fB\%scrollok\fP(3X) is enabled for
++If the cursor is not at the bottom of the scrolling region
++and advancement occurs at the right margin,
++the cursor automatically wraps to the beginning of the next line.
++.PP
++If the cursor is at the bottom of the scrolling region
++when advancement occurs at the right margin,
++and \fB\%scrollok\fP(3X) is enabled for
+ .IR win ,
+ the scrolling region scrolls up one line.
++Otherwise,
++advancement and scrolling do not occur,
++and
++.B \%waddch
++returns
++.BR ERR "."
++.\" Do we need to say something here about buggy terminals that might
++.\" scroll anyway?  xterm works fine...
+ .PP
+ If
+ .I wch
+@@ -270,8 +278,9 @@
+ .RB \%( acsc )
+ .I \%term\%info
+ capability does not define a terminal-specific replacement for it,
+-or if the terminal and locale configuration requires Unicode to access
+-these characters but the library is unable to use Unicode.
++or if the terminal type and locale configuration
++require Unicode to access these characters
++but the library is unable to use Unicode.
+ The \*(``acsc char\*('' column corresponds to how the characters are
+ specified in the
+ .B \%acs_chars
+@@ -470,10 +479,7 @@
+ .PP
+ In
+ .IR \%ncurses ,
+-.B \%wadd_wch
+-and
+-.B \%wecho_wchar
+-return
++they return
+ .B ERR
+ if
+ .bP
+@@ -491,7 +497,7 @@
+ not been called on
+ .I win
+ (or
+-.BR stdscr ","
++.BR \%stdscr ","
+ as applicable)
+ when writing to its bottom right location is attempted,
+ or
+@@ -512,14 +518,14 @@
+ may be implemented as macros.
+ .SH EXTENSIONS
+ The symbols
+-.RI \%( WACS_S3 ","
++.IR \%WACS_S3 ","
+ .IR \%WACS_S7 ","
+ .IR \%WACS_LEQUAL ","
+ .IR \%WACS_GEQUAL ","
+ .IR \%WACS_PI ","
+ .IR \%WACS_NEQUAL ","
+ and
+-.IR \%WACS_STERLING ")"
++.I \%WACS_STERLING
+ are not standard.
+ However,
+ many publicly available
+Index: man/curs_addch.3x
+Prereq:  1.122 
+--- ncurses-6.5-20250222+/man/curs_addch.3x	2025-02-01 23:54:03.000000000 +0000
++++ ncurses-6.5-20250301/man/curs_addch.3x	2025-03-01 21:16:45.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addch.3x,v 1.122 2025/02/01 23:54:03 tom Exp $
+-.TH curs_addch 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addch.3x,v 1.128 2025/03/01 21:16:45 tom Exp $
++.TH curs_addch 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -64,12 +64,12 @@
+ \fB#include 
+ .PP
+ \fBint addch(const chtype \fIch\fP);
+-\fBint waddch(WINDOW *\fIwin\fP, const chtype \fIch\fP);
++\fBint waddch(WINDOW * \fIwin\fP, const chtype \fIch\fP);
+ \fBint mvaddch(int \fIy\fP, int \fIx\fP, const chtype \fIch\fP);
+-\fBint mvwaddch(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype \fIch\fP);
++\fBint mvwaddch(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const chtype \fIch\fP);
+ .PP
+ \fBint echochar(const chtype \fIch\fP);
+-\fBint wechochar(WINDOW *\fIwin\fP, const chtype \fIch\fP);
++\fBint wechochar(WINDOW * \fIwin\fP, const chtype \fIch\fP);
+ .PP
+ \fI/* (integer) constants */\fP
+ /*\fI .\|.\|. */ \fBACS_BLOCK;\fR
+@@ -130,15 +130,23 @@
+ (A color pair selection is not honored unless initialized;
+ see \fB\%start_color\fP(3X).)
+ .PP
+-If advancement occurs at the right margin,
+-.bP
+-the cursor automatically wraps to the beginning of the next line,
+-then,
+-.bP
+-if it was at the bottom of the scrolling region,
+-and if \fB\%scrollok\fP(3X) is enabled for
++If the cursor is not at the bottom of the scrolling region
++and advancement occurs at the right margin,
++the cursor automatically wraps to the beginning of the next line.
++.PP
++If the cursor is at the bottom of the scrolling region
++when advancement occurs at the right margin,
++and \fB\%scrollok\fP(3X) is enabled for
+ .IR win ,
+ the scrolling region scrolls up one line.
++Otherwise,
++advancement and scrolling do not occur,
++and
++.B \%waddch
++returns
++.BR ERR "."
++.\" Do we need to say something here about buggy terminals that might
++.\" scroll anyway?  xterm works fine...
+ .PP
+ If
+ .I ch
+@@ -229,8 +237,9 @@
+ .RB \%( acsc )
+ .I \%term\%info
+ capability does not define a terminal-specific replacement for it,
+-or if the terminal and locale configuration requires Unicode to access
+-these characters but the library is unable to use Unicode.
++or if the terminal type and locale configuration
++require Unicode to access these characters
++but the library is unable to use Unicode.
+ The \*(``acsc char\*('' column corresponds to how the characters are
+ specified in the
+ .B \%acs_chars
+@@ -292,10 +301,7 @@
+ .PP
+ In
+ .IR \%ncurses ,
+-.B \%waddch
+-and
+-.B \%wechochar
+-return
++they return
+ .B ERR
+ if
+ .bP
+@@ -313,7 +319,7 @@
+ not been called on
+ .I win
+ (or
+-.BR stdscr ","
++.BR \%stdscr ","
+ as applicable)
+ when a write to its bottom right location is attempted,
+ or
+@@ -346,14 +352,14 @@
+ may be implemented as macros.
+ .SH EXTENSIONS
+ The symbols
+-.RI \%( ACS_S3 ","
++.IR \%ACS_S3 ","
+ .IR \%ACS_S7 ","
+ .IR \%ACS_LEQUAL ","
+ .IR \%ACS_GEQUAL ","
+ .IR \%ACS_PI ","
+ .IR \%ACS_NEQUAL ","
+ and
+-.IR \%ACS_STERLING ")"
++.I \%ACS_STERLING
+ were not documented in any publicly released System\ V
+ .\" And did not exist yet as late as SVr4.
+ .\" https://github.com/ryanwoodsmall/oldsysv/blob/master/\
+Index: man/curs_color.3x
+Prereq:  1.113 
+--- ncurses-6.5-20250222+/man/curs_color.3x	2025-01-19 00:49:39.000000000 +0000
++++ ncurses-6.5-20250301/man/curs_color.3x	2025-03-01 21:17:37.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_color.3x,v 1.113 2025/01/19 00:49:39 tom Exp $
+-.TH curs_color 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_color.3x,v 1.116 2025/03/01 21:17:37 tom Exp $
++.TH curs_color 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -306,12 +306,48 @@
+ but is actually whatever the terminal implements before color is initialized.
+ It cannot be modified by the application.
+ .SS has_colors
+-The \fB\%has_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.
++.B \%has_colors
++returns
++.B TRUE
++if the terminal supports colors and
++.B FALSE
++if it does not.
++\fB\%initscr\fP(3X) or \fB\%newterm\fP(3X) must be called first,
++but
++.B \%start_color
++need not be.
++An application might call
++.B \%has_colors
++to decide whether to use color
++or a video attribute like
++.B \%A_BOLD
++to render text.
++.PP
++Color support in
++.I curses
++requires that the terminal type description
++support the capabilities
++.B \%max_colors
++.RB \%( colors ),
++.B \%max_pairs
++.RB \%( pairs ),
++and any of
++.bP
++.B \%set_foreground
++.RB ( setf )
++and
++.B \%set_background
++.RB ( setb );
++.bP
++.B \%set_a_foreground
++.RB ( setaf )
++and
++.B \%set_a_background
++.RB ( setab );
++or
++.bP
++.B \%set_color_pair
++.RB ( scp ).
+ .SS can_change_color
+ The \fB\%can_change_color\fP routine requires no arguments.
+ It returns \fBTRUE\fP if the terminal supports colors
+@@ -511,7 +547,7 @@
+ the default colors extension notwithstanding,
+ or
+ .bP
+-color pairs identifiers outside the range
++color pair identifiers outside the range
+ .RB \%0- COLOR_PAIRS \-1
+ inclusive.
+ .RE
+@@ -549,7 +585,7 @@
+ .B \%COLORS
+ and
+ .B \%COLOR_PAIRS
+-values for each screen;
++values;
+ .B \%start_color
+ affects only the current screen.
+ The SVr4 and X/Open Curses interface was not really designed
+Index: man/curs_getcchar.3x
+Prereq:  1.56 
+--- ncurses-6.5-20250222+/man/curs_getcchar.3x	2025-02-01 23:46:11.000000000 +0000
++++ ncurses-6.5-20250301/man/curs_getcchar.3x	2025-02-23 13:48:31.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getcchar.3x,v 1.56 2025/02/01 23:46:11 tom Exp $
+-.TH curs_getcchar 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_getcchar.3x,v 1.57 2025/02/23 13:48:31 tom Exp $
++.TH curs_getcchar 3X 2025-02-23 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds ' \(aq
+ .\}
+@@ -49,9 +49,9 @@
+ .nf
+ \fB#include 
+ .PP
+-\fBint gettchar(const cchar_t * \fIwch\fP, wchar_t * \fIwc\fP,
++\fBint getcchar(const cchar_t * \fIwch\fP, wchar_t * \fIwc\fP,
+       attr_t * \fIattrs\fP, short * \fIpair\fP, void * \fIopts\fP);
+-\fBint settchar(cchar_t * \fIwch\fP, const wchar_t * \fIwc\fP,
++\fBint setcchar(cchar_t * \fIwch\fP, const wchar_t * \fIwc\fP,
+       const attr_t \fIattrs\fP, short \fIpair\fP, const void * \fIopts\fP);
+ .fi
+ .SH DESCRIPTION
+Index: man/curs_initscr.3x
+Prereq:  1.92 
+--- ncurses-6.5-20250222+/man/curs_initscr.3x	2025-02-02 00:01:55.000000000 +0000
++++ ncurses-6.5-20250301/man/curs_initscr.3x	2025-03-01 21:21:41.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_initscr.3x,v 1.92 2025/02/02 00:01:55 tom Exp $
+-.TH curs_initscr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_initscr.3x,v 1.95 2025/03/01 21:21:41 tom Exp $
++.TH curs_initscr 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -550,10 +550,10 @@
+ \fB\%def_prog_mode\fP(3X).
+ SVr4 uses the descriptor in
+ .IR SCREEN "."
+-.SS "Unset \fITERM\fP Variable"
++.SS "Unset \fITERM\fP Environment Variable"
+ If the
+ .I TERM
+-variable is missing or empty,
++variable is not set in the environment or has an empty value,
+ .I \%initscr
+ uses the value \*(``unknown\*('',
+ which normally corresponds to a terminal entry with the
+@@ -563,7 +563,7 @@
+ Generic entries are detected by \fB\%setupterm\fP(3X)
+ and cannot be used for full-screen operation.
+ Other implementations may handle
+-a missing/empty
++a missing or empty
+ .I TERM
+ variable differently.
+ .SS "Signal Handlers"
+@@ -589,6 +589,24 @@
+ Section \*(``NOTES\*('' above discusses
+ .IR \%ncurses 's
+ signal handlers.
++.SH HISTORY
++4BSD (1980)
++introduced
++.I \%initscr
++and
++.IR \%endwin "."
++.PP
++SVr2 (1984)
++added
++.I \%newterm
++and
++.IR \%set_term "."
++.PP
++SVr3.1 (1987)
++supplied
++.I \%delscreen
++and
++.IR \%isendwin "."
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_kernel\fP(3X),
+Index: man/curs_inopts.3x
+Prereq:  1.93 
+--- ncurses-6.5-20250222+/man/curs_inopts.3x	2025-02-02 00:02:25.000000000 +0000
++++ ncurses-6.5-20250301/man/curs_inopts.3x	2025-03-01 21:23:21.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inopts.3x,v 1.93 2025/02/02 00:02:25 tom Exp $
+-.TH curs_inopts 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inopts.3x,v 1.96 2025/03/01 21:23:21 tom Exp $
++.TH curs_inopts 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -402,7 +402,7 @@
+ in a signal handler if,
+ after the handler exits,
+ you want output to continue
+-as though the interrupt had not occurred.
++as though the signal had not occurred.
+ .\"
+ .SS "raw, noraw"
+ .B raw
+@@ -467,10 +467,12 @@
+ Normally,
+ a
+ .I curses
+-library checks the terminal for input while updating the screen.
+-If any is found,
+-the update is postponed until the next \fB\%wrefresh\fP(3X) or
+-\fB\%doupdate\fP(3X) call,
++library checks the terminal's input file descriptor for pending input
++with \fIpoll\fP(2) or \fI\%select\fP(2)
++while updating the screen;
++if it finds any,
++it postpones output
++until the next \fB\%wrefresh\fP(3X) or \fB\%doupdate\fP(3X) call,
+ allowing faster response to user key strokes.
+ The library tests the file descriptor corresponding to the
+ .I FILE
+@@ -588,6 +590,35 @@
+ calls leads to terminal driver control states that are hard to predict
+ or understand;
+ doing so is not recommended.
++.PP
++.I curses
++documentation uses the terms \*(``delay\*('' and \*(``timeout\*(''
++freely to describe two related but distinct aspects of input handling,
++at the risk of confusing the user.
++The functions
++.BR \%halfdelay ","
++.BR \%nodelay ","
++.BR \%notimeout ","
++.BR \%timeout ","
++and
++.B \%wtimeout
++all configure whether the input character reading function
++\%(\fBgetch\fP(3X) or \fB\%get_wch\fP(3X))
++waits for keyboard input,
++and for how long.
++Only
++.B \%keypad
++configures whether that function waits for further input
++if the first character it reads is ESC.
++X/Open Curses affords no means of configuring
++the length of this second delay,
++but an AIX and
++.I \%ncurses
++extension,
++.BR \%ESCDELAY ,
++is available both as an environment variable and a global symbol
++permitting the application to do so;
++see \fB\%ncurses\fP(3X) and \fBcurs_variables\fP(3X).
+ .SH EXTENSIONS
+ .I \%ncurses
+ provides four \*(``is_\*('' functions corresponding to
+@@ -661,9 +692,9 @@
+ .\" https://github.com/ryanwoodsmall/oldsysv/blob/master/sysv-pdp11_man/a_man/man7/termio.7
+ For best portability,
+ call
+-.B echo
++.I echo
+ or
+-.B \%noecho
++.I \%noecho
+ explicitly just after initialization,
+ even if your program retains the terminal's canonical (\*(``cooked\*('')
+ line discipline.
+@@ -677,7 +708,7 @@
+ .IR \%nonl "."
+ BSD
+ .I curses
+-did turn off these translations;
++turned off these translations;
+ System\ V
+ .I curses
+ did not.
+@@ -692,8 +723,8 @@
+ .B \%keypad
+ is first enabled,
+ .I \%ncurses
+-loads the key definitions for the current terminal description.
+-If the terminal description includes extended string capabilities,
++loads the key definitions for the current terminal type description.
++If that description includes extended string capabilities,
+ for example,
+ by using the
+ .B \-x
+Index: man/curs_ins_wch.3x
+Prereq:  1.46 
+--- ncurses-6.5-20250222+/man/curs_ins_wch.3x	2025-02-02 00:00:59.000000000 +0000
++++ ncurses-6.5-20250301/man/curs_ins_wch.3x	2025-03-01 21:25:47.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_ins_wch.3x,v 1.46 2025/02/02 00:00:59 tom Exp $
+-.TH curs_ins_wch 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_ins_wch.3x,v 1.48 2025/03/01 21:25:47 tom Exp $
++.TH curs_ins_wch 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -39,6 +39,11 @@
+ .ie t .ds '' ''
+ .el   .ds '' ""
+ .\}
++.
++.de bP
++.ie n  .IP \(bu 4
++.el    .IP \(bu 2
++..
+ .SH NAME
+ \fB\%ins_wch\fP,
+ \fB\%wins_wch\fP,
+@@ -52,27 +57,45 @@
+ \fBint ins_wch(const cchar_t * \fIwch\fP);
+ \fBint wins_wch(WINDOW * \fIwin\fP, const cchar_t * \fIwch\fP);
+ \fBint mvins_wch(int \fIy\fP, int \fIx\fP, const cchar_t * \fIwch\fP);
+-\fBint mvwins_wch(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, const cchar_t * \fIwch\fP);
++\fBint mvwins_wch(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP,
++      const cchar_t * \fIwch\fP);
+ .fi
+ .SH DESCRIPTION
+-These functions insert the
++.B \%wins_wch
++inserts the
+ .I curses
+ complex character
+ .I wch
+-at the cursor in the specified window
+-.I win
+-(or
+-.BR \%stdscr ).
++at the cursor position in the window
++.IR win "."
+ The character previously at the cursor and any to its right move one
+ cell to the right;
+-the rightmost character on the line is discarded.
+-The cursor does not advance.
++the formerly rightmost character on the line is discarded.
++Unlike \fB\%add_wch\fP(3X),
++.B \%wins_wch
++does not advance the cursor.
++\fB\%ncurses\fP(3X) describes the variants of this function.
+ .SH "RETURN VALUE"
+-These functions return \fBOK\fP on success and \fBERR\fP on failure.
++These functions return
++.B OK
++on success and
++.B ERR
++on failure.
+ .PP
+-Functions taking a
++In
++.IR \%ncurses ,
++they return
++.B ERR
++if
++.bP
++the
++.I curses
++screen has not been initialized,
++and
++.bP
++(for functions taking a
+ .I \%WINDOW
+-pointer argument fail if
++pointer argument)
+ .I win
+ is a null pointer.
+ .PP
+@@ -82,17 +105,17 @@
+ .IR x )
+ is outside the window boundaries.
+ .SH NOTES
+-\fB\%ins_wch\fP,
+-\fB\%mvins_wch\fP,
++.BR \%ins_wch ","
++.BR \%mvins_wch ","
+ and
+-\fB\%mvwins_wch\fP
++.B \%mvwins_wch
+ may be implemented as macros.
+ .PP
+-A terminal's
++.I curses
++does not necessarily employ the terminal's
+ .B \%insert_character
+ .RB ( ich1 )
+-capability
+-is not necessarily employed.
++capability to achieve insertion.
+ .SH PORTABILITY
+ X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+Index: man/curs_ins_wstr.3x
+Prereq:  1.58 
+--- ncurses-6.5-20250222+/man/curs_ins_wstr.3x	2025-02-01 22:54:32.000000000 +0000
++++ ncurses-6.5-20250301/man/curs_ins_wstr.3x	2025-03-01 21:30:14.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_ins_wstr.3x,v 1.58 2025/02/01 22:54:32 tom Exp $
+-.TH curs_ins_wstr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_ins_wstr.3x,v 1.60 2025/03/01 21:30:14 tom Exp $
++.TH curs_ins_wstr 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -98,7 +98,7 @@
+ does the same,
+ but inserts at most
+ .I n
+-characters,
++wide characters,
+ or as many as possible
+ (up to the end of the line)
+ if
+Index: man/curs_insch.3x
+Prereq:  1.51 
+--- ncurses-6.5-20250222+/man/curs_insch.3x	2025-02-02 00:00:59.000000000 +0000
++++ ncurses-6.5-20250301/man/curs_insch.3x	2025-03-01 21:26:42.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_insch.3x,v 1.51 2025/02/02 00:00:59 tom Exp $
+-.TH curs_insch 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_insch.3x,v 1.54 2025/03/01 21:26:42 tom Exp $
++.TH curs_insch 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -39,6 +39,11 @@
+ .ie t .ds '' ''
+ .el   .ds '' ""
+ .\}
++.
++.de bP
++.ie n  .IP \(bu 4
++.el    .IP \(bu 2
++..
+ .SH NAME
+ \fB\%insch\fP,
+ \fB\%winsch\fP,
+@@ -55,18 +60,20 @@
+ \fBint mvwinsch(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, chtype \fIch\fP);
+ .fi
+ .SH DESCRIPTION
+-These functions insert the
++.B \%winsch
++inserts the
+ .I curses
+ character
+ .I ch
+-at the cursor in the specified window
+-.I win
+-(or
+-.BR \%stdscr ).
++at the cursor position in the window
++.IR win "."
+ The character previously at the cursor and any to its right move one
+ cell to the right;
+-the rightmost character on the line is discarded.
+-The cursor does not advance.
++the formerly rightmost character on the line is discarded.
++Unlike \fB\%addch\fP(3X),
++.B \%winsch
++does not advance the cursor.
++\fB\%ncurses\fP(3X) describes the variants of this function.
+ .SH "RETURN VALUE"
+ These functions return
+ .B OK
+@@ -74,9 +81,20 @@
+ .B ERR
+ on failure.
+ .PP
+-Functions taking a
++In
++.IR \%ncurses ,
++they return
++.B ERR
++if
++.bP
++the
++.I curses
++screen has not been initialized,
++and
++.bP
++(for functions taking a
+ .I \%WINDOW
+-pointer argument fail if
++pointer argument)
+ .I win
+ is a null pointer.
+ .PP
+@@ -86,26 +104,26 @@
+ .IR x )
+ is outside the window boundaries.
+ .SH NOTES
+-.BR \%insch ,
+-.BR \%mvinsch ,
++.BR \%insch ","
++.BR \%mvinsch ","
+ and
+ .B \%mvwinsch
+ may be implemented as macros.
+ .PP
+-A terminal's
++.I curses
++does not necessarily employ the terminal's
+ .B \%insert_character
+ .RB ( ich1 )
+-capability
+-is not necessarily employed.
++capability to achieve insertion.
+ .SH PORTABILITY
+ X/Open Curses Issue\ 4 describes these functions.
++It specifies no error conditions for them.
+ .PP
+ SVr4 describes a successful return value only as
+ \*(``an integer value other than
+ .IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 509
+ .SH HISTORY
+-SVr2 (1984) introduced
+-.IR \%winsch "."
++SVr2 (1984) introduced these functions.
+ .SH "SEE ALSO"
+ \fB\%curs_ins_wch\fP(3X) describes comparable functions in the
+ wide-character
+Index: man/curs_instr.3x
+Prereq:  1.70 
+--- ncurses-6.5-20250222+/man/curs_instr.3x	2025-02-01 22:54:06.000000000 +0000
++++ ncurses-6.5-20250301/man/curs_instr.3x	2025-03-01 21:29:42.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_instr.3x,v 1.70 2025/02/01 22:54:06 tom Exp $
+-.TH curs_instr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_instr.3x,v 1.74 2025/03/01 21:29:42 tom Exp $
++.TH curs_instr 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -108,18 +108,23 @@
+ .PP
+ In
+ .IR \%ncurses ","
+-they return
++these functions return
+ .B ERR
+ if
+ .bP
++the
++.I curses
++screen has not been initialized,
++.bP
++(for functions taking a
++.I \%WINDOW
++pointer argument)
+ .I win
+-is
+-.I NULL
++is a null pointer,
+ or
+ .bP
+ .I str
+-is
+-.IR NULL "."
++is a null pointer.
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+@@ -169,20 +174,20 @@
+ It specifies no error conditions for them.
+ .PP
+ X/Open Curses Issues 4 and 7 both state that
+-.BR \%instr ","
+-.BR \%winstr ","
+-.BR \%mvinstr ","
++.IR \%instr ","
++.IR \%winstr ","
++.IR \%mvinstr ","
+ and
+-.B \%mvwinstr
++.I \%mvwinstr
+ return
+-.B OK
++.I OK
+ rather than a character count.
+ This is likely an erratum.
+ .bP
+ SVr3.1 and SVr4 implemented
+-.B \%winstr
++.I \%winstr
+ as a wrapper around
+-.BR \%winnstr ","
++.IR \%winnstr ","
+ returning the latter's return value.
+ X/Open Curses's specification thus may have been an editorial solecism
+ copied from System\ V's documentation
+@@ -207,9 +212,6 @@
+ .SH HISTORY
+ SVr3.1 (1987)
+ introduced these functions.
+-.IR winstr ","
+-.IR winnstr ","
+-and their variants.
+ .SH SEE ALSO
+ \fB\%curs_inwstr\fP(3X) describes comparable functions of the
+ .I \%ncurses
+Index: man/curs_inwstr.3x
+Prereq:  1.56 
+--- ncurses-6.5-20250222+/man/curs_inwstr.3x	2025-01-19 00:51:10.000000000 +0000
++++ ncurses-6.5-20250301/man/curs_inwstr.3x	2025-03-01 21:29:42.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inwstr.3x,v 1.56 2025/01/19 00:51:10 tom Exp $
+-.TH curs_inwstr 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inwstr.3x,v 1.60 2025/03/01 21:29:42 tom Exp $
++.TH curs_inwstr 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -101,8 +101,8 @@
+ these functions return the count of wide characters copied from
+ .I win
+ to
+-.IR wstr "."
+-They return
++.IR wstr ","
++or
+ .B ERR
+ upon failure.
+ .BR \%innwstr ","
+@@ -126,14 +126,19 @@
+ .B ERR
+ if
+ .bP
++the
++.I curses
++screen has not been initialized,
++.bP
++(for functions taking a
++.I \%WINDOW
++pointer argument)
+ .I win
+-is
+-.I NULL
++is a null pointer,
+ or
+ .bP
+ .I wstr
+-is
+-.IR NULL "."
++is a null pointer.
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+@@ -146,7 +151,7 @@
+ may be implemented as macros.
+ .PP
+ Reading a line that overflows the array pointed to by
+-.I str
++.I wstr
+ with
+ .BR \%inwstr ","
+ .BR \%winwstr ","
+@@ -184,11 +189,11 @@
+ .PP
+ Notwithstanding the foregoing,
+ X/Open Curses Issues 4 and 7 both state that
+-.BR \%innwstr ","
+-.BR \%winnwstr ","
+-.BR \%mvinnwstr ","
++.IR \%innwstr ","
++.IR \%winnwstr ","
++.IR \%mvinnwstr ","
+ and
+-.B \%mvwinnwstr
++.I \%mvwinnwstr
+ \*(``fail .\|.\|. [i]f the array is not large enough to contain any
+ complete characters\*(''.
+ Strictly interpreted,
+@@ -198,23 +203,23 @@
+ .IR win "."
+ .I \%ncurses
+ reports any truncation with
+-.BR ERR "."
++.IR ERR "."
+ .PP
+ X/Open Curses specifies
+-.BR \%inwstr ","
+-.BR \%winwstr ","
+-.BR \%mvinwstr ","
++.IR \%inwstr ","
++.IR \%winwstr ","
++.IR \%mvinwstr ","
+ and
+-.B \%mvwinwstr
++.I \%mvwinwstr
+ as returning
+-.B OK
++.I OK
+ rather than a (wide) character count,
+ unlike their non-wide counterparts
+-.BR \%instr ","
+-.BR \%winstr ","
+-.BR \%mvinstr ","
++.IR \%instr ","
++.IR \%winstr ","
++.IR \%mvinstr ","
+ and
+-.BR \%mvwinstr "."
++.IR \%mvwinstr "."
+ .I \%ncurses
+ regards this inconsistency as an error in the standard.
+ .SH HISTORY
+Index: man/curs_kernel.3x
+Prereq:  1.77 
+--- ncurses-6.5-20250222+/man/curs_kernel.3x	2025-02-15 15:13:55.000000000 +0000
++++ ncurses-6.5-20250301/man/curs_kernel.3x	2025-03-01 21:31:35.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_kernel.3x,v 1.77 2025/02/15 15:13:55 tom Exp $
+-.TH curs_kernel 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_kernel.3x,v 1.80 2025/03/01 21:31:35 tom Exp $
++.TH curs_kernel 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -232,29 +232,61 @@
+ .B \%ripoffline
+ provides access to the same facility that \fB\%slk_init\fP(3X) uses to
+ reduce the size of the screen.
+-\fB\%ripoffline\fP must be called before \fBinitscr\fP or
+-\fBnewterm\fP is called, to prepare these initial actions:
++The application must call
++.B \%ripoffline
++before \fB\%initscr\fP(3X) or \fB\%newterm\fP(3X)
++so that the functions prepare a
++.B \%stdscr
++of the correct size.
+ .bP
+-If \fIline\fP is positive, a line is removed from the top of \fBstdscr\fP.
++If
++.I line
++is positive,
++.B \%ripoffline
++removes a line from the top of
++.BR \%stdscr "."
+ .bP
+-if \fIline\fP is negative, a line is removed from the bottom.
++If
++.I line
++is negative,
++.B \%ripoffline
++removes a line from the bottom of
++.BR \%stdscr "."
+ .PP
+-When the resulting initialization is done inside \fBinitscr\fP, the
+-routine \fBinit\fP (supplied by the user) is called with two
+-arguments:
++When
++.B \%initscr
++initializes
++.IR curses ","
++it calls the
++.I init
++function supplied to
++.B \%ripoffline
++by the application with two arguments:
+ .bP
+-a window pointer to the one-line window that has been
+-allocated and
++a pointer to the one-line
++.I \%WINDOW
++that it allocates,
++and
+ .bP
+ an integer with the number of columns in the window.
+ .PP
+-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.
++Inside this
++.I init
++function,
++the values of the integer variables
++.B LINES
++and
++.B COLS
++(see \fB\%curs_variables\fP(3X))
++are not guaranteed to be reliable;
++it must not call \fB\%wrefresh\fP(3X) or \fB\%doupdate\fP(3X).
++A \fB\%wnoutrefresh\fP(3X) call is permissible.
+ .PP
+-\fBripoffline\fP can be called up to five times before calling \fBinitscr\fP or
+-\fBnewterm\fP.
++.B \%ripoffline
++can be called up to five times before
++.B \%initscr
++or
++.BR \%newterm "."
+ .SH RETURN VALUE
+ Except for
+ .BR \%curs_set ","
+@@ -374,7 +406,7 @@
+ .\" SVID 4, vol 3., p. 518
+ .PP
+ Older SVr4 man pages warn that the return value of
+-.B \%curs_set
++.I \%curs_set
+ \*(``is currently incorrect\*(''.
+ This implementation gets it right,
+ but counting on its correctness anywhere else may be unwise.
+@@ -382,7 +414,7 @@
+ X/Open Curses specifies
+ .I \%ripoffline
+ as returning
+-.B OK
++.I OK
+ with no possibility of failure
+ (\*(``[c]alls to
+ .I \%ripoffline
+@@ -406,7 +438,7 @@
+ and SVr4
+ .I curses
+ implement
+-.B \%mvcur
++.I \%mvcur
+ using the
+ .I SCREEN
+ object allocated in either \fB\%initscr\fP(3X) or \fB\%newterm\fP(3X).
+Index: man/curs_mouse.3x
+Prereq:  1.119 
+--- ncurses-6.5-20250222+/man/curs_mouse.3x	2025-02-15 19:36:18.000000000 +0000
++++ ncurses-6.5-20250301/man/curs_mouse.3x	2025-03-01 21:33:30.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_mouse.3x,v 1.119 2025/02/15 19:36:18 tom Exp $
+-.TH curs_mouse 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_mouse.3x,v 1.123 2025/03/01 21:33:30 tom Exp $
++.TH curs_mouse 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -149,7 +149,7 @@
+ indicating which of the specified mouse events can be reported.
+ .IP
+ If the screen is not initialized,
+-or the terminal interface does report mouse events,
++or the terminal interface does not report mouse events,
+ .B \%mousemask
+ returns 0.
+ .bP
+@@ -661,7 +661,8 @@
+ .I \%xterm
+ are
+ .I not
+-ignored in canonical mode if they have been enabled by
++ignored in canonical (\*(``cooked\*('') mode
++if they have been enabled by
+ .BR \%mousemask "."
+ Instead,
+ the
+@@ -685,9 +686,12 @@
+ for mouse clicks).
+ Other values of
+ .B \%key_mouse
+-are permitted under the same assumption,
++are permitted under the same assumption \(em
+ that is,
+-the report begins with that sequence.
++a mouse report begins with the value of the
++.B \%key_mouse
++.RB ( \%kmous )
++string capability.
+ .PP
+ Because there are no standard response sequences that serve to identify
+ terminals supporting the
+Index: man/curs_move.3x
+Prereq:  1.57 
+--- ncurses-6.5-20250222+/man/curs_move.3x	2025-02-01 22:50:42.000000000 +0000
++++ ncurses-6.5-20250301/man/curs_move.3x	2025-03-01 21:34:10.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_move.3x,v 1.57 2025/02/01 22:50:42 tom Exp $
+-.TH curs_move 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_move.3x,v 1.59 2025/03/01 21:34:10 tom Exp $
++.TH curs_move 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -67,9 +67,10 @@
+ is relative to the upper left-hand corner of the window,
+ which has coordinates
+ (0,\ 0).
+-\fB\%ncurses\fP(3X) describes the
+-.B \%move
+-variant of this function.
++.B move
++similarly moves the cursor in the
++.B \%stdscr
++window.
+ .SH RETURN VALUE
+ These functions return
+ .B OK
+@@ -101,7 +102,10 @@
+ .IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 503
+ .SH HISTORY
+ 4BSD (1980)
+-introduced these functions.
++introduced
++.I move
++and
++.IR \%wmove "."
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_refresh\fP(3X)
+Index: man/curs_outopts.3x
+Prereq:  1.81 
+--- ncurses-6.5-20250222+/man/curs_outopts.3x	2025-02-01 22:49:13.000000000 +0000
++++ ncurses-6.5-20250301/man/curs_outopts.3x	2025-03-01 21:42:22.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_outopts.3x,v 1.81 2025/02/01 22:49:13 tom Exp $
+-.TH curs_outopts 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_outopts.3x,v 1.89 2025/03/01 21:42:22 tom Exp $
++.TH curs_outopts 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -58,101 +58,179 @@
+ .nf
+ \fB#include 
+ .PP
+-\fBint clearok(WINDOW *\fIwin\fP, bool \fIbf\fP);
+-\fBvoid idcok(WINDOW *\fIwin\fP, bool \fIbf\fP);
+-\fBint idlok(WINDOW *\fIwin\fP, bool \fIbf\fP);
+-\fBvoid immedok(WINDOW *\fIwin\fP, bool \fIbf\fP);
+-\fBint leaveok(WINDOW *\fIwin\fP, bool \fIbf\fP);
+-\fBint scrollok(WINDOW *\fIwin\fP, bool \fIbf\fP);
++\fBint clearok(WINDOW * \fIwin\fP, bool \fIbf\fP);
++\fBvoid idcok(WINDOW * \fIwin\fP, bool \fIbf\fP);
++\fBint idlok(WINDOW * \fIwin\fP, bool \fIbf\fP);
++\fBvoid immedok(WINDOW * \fIwin\fP, bool \fIbf\fP);
++\fBint leaveok(WINDOW * \fIwin\fP, bool \fIbf\fP);
++\fBint scrollok(WINDOW * \fIwin\fP, bool \fIbf\fP);
+ .PP
+ \fBint setscrreg(int \fItop\fP, int \fIbot\fP);
+-\fBint wsetscrreg(WINDOW *\fIwin\fP, int \fItop\fP, int \fIbot\fP);
++\fBint wsetscrreg(WINDOW * \fIwin\fP, int \fItop\fP, int \fIbot\fP);
+ .fi
+ .SH DESCRIPTION
+-These routines set options that change the style of output within
+-\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).
++These functions configure properties of
++.I curses
++windows that affect their manner of output.
++Boolean-valued properties are initially
++.B FALSE
++except where noted.
++\fBendwin\fP(3X) resets any terminal modes corresponding to these
++properties;
++an application need not restore their initial values.
+ .SS clearok
+-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.
++Setting
++.IR win 's
++.B \%clearok
++property to
++.B TRUE
++causes the next
++.B \%wrefresh
++call on it to clear the terminal screen and redraw it entirely.
++This property is useful to restore the contents of the screen
++(perhaps because another process has written to the terminal),
++or in some cases to achieve a more pleasing visual effect.
+ If
+-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.
++.I \%win
++is
++.B \%curscr
++(see \fBcurs_variables\fP(3X)),
++the next
++.B \%wrefresh
++call on
++.I any
++window causes the terminal screen to clear and redraw as above.
++.B \%wrefresh
++resets this property to
++.BR FALSE "."
+ .SS idcok
+-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\fP with \fBTRUE\fP as second argument re-enables use
+-of character insertion and deletion.
++(This property defaults
++.BR TRUE ".)"
++Setting
++.IR win 's
++.B \%idcok
++property to
++.B FALSE
++prevents
++.I curses
++from using the insert/delete character capabilities of terminal types
++possessing them according to the
++.I \%term\%info
++database.
++.\" TODO: What's the historical rationale for the `idcok()` feature?
+ .SS idlok
+-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\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.
+-It is
+-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\fP redraws the changed portions of all lines.
++Setting
++.IR win 's
++.B \%idlok
++property to
++.B TRUE
++causes
++.I curses
++to consider
++using the insert/delete line capabilities of terminal types
++possessing them according to the
++.I \%term\%info
++database.
++Enable this option
++if the application explicitly requires these operations,
++as a full-screen text editor might;
++otherwise the results may be visually annoying to the user.
++.\" TODO: Substantiate that claim.
+ .SS immedok
+-If \fBimmedok\fP is called with \fBTRUE\fP as second argument,
++If
++.B \%immedok
++is called with
++.B TRUE
++as second argument,
+ any change in the window image,
+-such as the ones caused by \fBwaddch, wclrtobot, wscrl\fP,
+-etc., automatically causes a call to \fBwrefresh\fP.
++such as the ones caused by
++.BR \%waddch ","
++.BR \%wclrtobot ","
++.BR \%wscrl ","
++etc., automatically causes a call to
++.BR wrefresh "."
+ However, it may degrade performance considerably,
+-due to repeated calls to \fBwrefresh\fP.
+-Calling \fBimmedok\fP with \fBFALSE\fP as second argument
++due to repeated calls to
++.BR wrefresh "."
++Calling
++.B \%immedok
++with
++.B FALSE
++as second argument
+ restores the default behavior,
+ i.e., deferring screen updates until a refresh is needed.
+ .SS leaveok
+ Normally, the hardware cursor is left at the location of the window cursor
+ being refreshed.
+-The \fBleaveok\fP option allows the cursor to be left
++The
++.B \%leaveok
++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
+-The \fBscrollok\fP option controls what happens when the cursor of a window is
++The
++.B \%scrollok
++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\fP is \fBFALSE\fP), the cursor is left on the bottom
++If disabled,
++.RI ( bf
++is
++.BR FALSE "),"
++the cursor is left on the bottom
+ line.
+-If enabled, (\fIbf\fP is \fBTRUE\fP), the window is scrolled up one line
++If enabled,
++.RI ( bf
++is
++.BR TRUE "),"
++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\fP).
++also necessary to call
++.BR idlok ")."
+ .SS "setscrreg, wsetscrreg"
+-The \fBsetscrreg\fP and \fBwsetscrreg\fP routines allow the application
++The
++.B \%setscrreg
++and
++.B \%wsetscrreg
++routines allow the application
+ programmer to set a software scrolling region in a window.
+-The \fItop\fP and
+-\fIbot\fP parameters
++The
++.I top
++and
++.I bot
++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\fP are enabled, an attempt to move off the bottom margin line
++.B scrollok
++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\fP is enabled and the terminal
++If
++.B \%idlok
++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\fP and \fBwsetscrreg\fP return \fBOK\fP upon success
+-and \fBERR\fP upon failure.
++The functions
++.B \%setscrreg
++and
++.B \%wsetscrreg
++return
++.B OK
++upon success
++and
++.B ERR
++upon failure.
+ All other routines that return an integer always
+-return \fBOK\fP.
++return
++.BR OK "."
+ .PP
+ In this implementation,
+ .bP
+@@ -161,7 +239,7 @@
+ .B ERR
+ if the window pointer is null
+ .bP
+-\fBwsetscrreg\fP
++.B \%wsetscrreg
+ returns
+ .B ERR
+ if the scrolling region limits extend outside the
+@@ -175,7 +253,9 @@
+ .B \%setscrreg
+ may be implemented as macros.
+ .PP
+-The \fBimmedok\fP routine is useful for windows that are used as terminal
++The
++.B \%immedok
++routine is useful for windows that are used as terminal
+ emulators.
+ .SH PORTABILITY
+ X/Open Curses Issue\ 4 describes these functions.
+Index: man/make_sed.sh
+Prereq:  1.19 
+--- ncurses-6.5-20250222+/man/make_sed.sh	2023-12-07 01:16:43.000000000 +0000
++++ ncurses-6.5-20250301/man/make_sed.sh	2025-03-01 22:00:48.000000000 +0000
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+-# $Id: make_sed.sh,v 1.19 2023/12/07 01:16:43 tom Exp $
++# $Id: make_sed.sh,v 1.21 2025/03/01 22:00:48 tom Exp $
+ ##############################################################################
+-# Copyright 2020-2022,2023 Thomas E. Dickey                                  #
++# Copyright 2020-2023,2025 Thomas E. Dickey                                  #
+ # Copyright 1998-2005,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -79,7 +79,7 @@
+ sed	-e 's/"
++		print ""
++		print "#if USE_STDBOOL_H"
+ 		print "#include "
++		print "#endif"
+ 		print ""
+ 		print "#undef NCURSES_NOMACROS	/* _this_ file uses macros */"
+ 		print "#define NCURSES_NOMACROS 1"
+Index: ncurses/curses.priv.h
+Prereq:  1.700 
+--- ncurses-6.5-20250222+/ncurses/curses.priv.h	2025-01-18 14:41:58.000000000 +0000
++++ ncurses-6.5-20250301/ncurses/curses.priv.h	2025-03-01 17:17:12.000000000 +0000
+@@ -35,7 +35,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: curses.priv.h,v 1.700 2025/01/18 14:41:58 tom Exp $
++ * $Id: curses.priv.h,v 1.701 2025/03/01 17:17:12 tom Exp $
+  *
+  *	curses.priv.h
+  *
+@@ -2541,16 +2541,12 @@
+ #if defined(USE_WIN32CON_DRIVER)
+ #include 
+ extern NCURSES_EXPORT_VAR(TERM_DRIVER) _nc_WIN_DRIVER;
+-extern NCURSES_EXPORT(int)  _nc_mingw_isatty(int fd);
+-extern NCURSES_EXPORT(int)  _nc_mingw_isconsole(int fd);
+-extern NCURSES_EXPORT(int) _nc_mingw_console_read(
+-    SCREEN *sp,
+-    HANDLE  fd,
+-    int *buf);
+-extern NCURSES_EXPORT(int) _nc_mingw_testmouse(
+-    SCREEN * sp,
+-    HANDLE fd,
+-    int delay EVENTLIST_2nd(_nc_eventlist*));
++extern NCURSES_EXPORT(int) _nc_mingw_console_read(SCREEN *sp, HANDLE fd, int *buf);
++extern NCURSES_EXPORT(int) _nc_mingw_isatty(int fd);
++extern NCURSES_EXPORT(int) _nc_mingw_isconsole(int fd);
++extern NCURSES_EXPORT(int) _nc_mingw_tcflush(int fd, int queue);
++extern NCURSES_EXPORT(int) _nc_mingw_tcgetattr(int fd, struct termios *arg);
++extern NCURSES_EXPORT(int) _nc_mingw_testmouse(SCREEN *sp, HANDLE fd, int delay EVENTLIST_2nd(_nc_eventlist*));
+ #else
+ #endif
+ extern NCURSES_EXPORT_VAR(TERM_DRIVER) _nc_TINFO_DRIVER;
+Index: ncurses/tinfo/lib_win32con.c
+Prereq:  1.17 
+--- ncurses-6.5-20250222+/ncurses/tinfo/lib_win32con.c	2025-02-15 15:43:26.000000000 +0000
++++ ncurses-6.5-20250301/ncurses/tinfo/lib_win32con.c	2025-03-01 14:26:14.000000000 +0000
+@@ -38,7 +38,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_win32con.c,v 1.17 2025/02/15 15:43:26 tom Exp $")
++MODULE_ID("$Id: lib_win32con.c,v 1.18 2025/03/01 14:26:14 tom Exp $")
+ 
+ #if defined(_NC_WINDOWS)
+ 
+@@ -887,8 +887,7 @@
+ 			goto end;
+ 		    } else {
+ 			DWORD n = 0;
+-			INPUT_RECORD *pInpRec =
+-			TypeAlloca(INPUT_RECORD, nRead);
++			MakeArray(pInpRec, INPUT_RECORD, nRead);
+ 			if (pInpRec != NULL) {
+ 			    DWORD i;
+ 			    BOOL f;
+Index: ncurses/tty/lib_twait.c
+Prereq:  1.84 
+--- ncurses-6.5-20250222+/ncurses/tty/lib_twait.c	2025-01-24 20:39:23.000000000 +0000
++++ ncurses-6.5-20250301/ncurses/tty/lib_twait.c	2025-03-01 17:07:19.000000000 +0000
+@@ -76,7 +76,7 @@
+ #endif
+ #undef CUR
+ 
+-MODULE_ID("$Id: lib_twait.c,v 1.84 2025/01/24 20:39:23 tom Exp $")
++MODULE_ID("$Id: lib_twait.c,v 1.85 2025/03/01 17:07:19 tom Exp $")
+ 
+ /*
+  * Returns an elapsed time, in milliseconds (if possible).
+@@ -273,7 +273,7 @@
+     }
+ #endif
+ 
+-    result = poll(fds, (size_t) count, milliseconds);
++    result = (int) poll(fds, (size_t) count, milliseconds);
+ 
+ #ifdef NCURSES_WGETCH_EVENTS
+     if ((mode & TW_EVENT) && evl) {
+Index: ncurses/win32con/win32_driver.c
+Prereq:  1.5 
+--- ncurses-6.5-20250222+/ncurses/win32con/win32_driver.c	2025-02-20 01:15:57.000000000 +0000
++++ ncurses-6.5-20250301/ncurses/win32con/win32_driver.c	2025-03-01 14:26:14.000000000 +0000
+@@ -48,7 +48,7 @@
+ 
+ #define CUR TerminalType(my_term).
+ 
+-MODULE_ID("$Id: win32_driver.c,v 1.5 2025/02/20 01:15:57 tom Exp $")
++MODULE_ID("$Id: win32_driver.c,v 1.7 2025/03/01 14:26:14 tom Exp $")
+ 
+ #define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE)
+ #define EXP_OPTIMIZE 0
+@@ -171,7 +171,7 @@
+ 	    int y, int x, cchar_t *str, int limit)
+ {
+     int actual = 0;
+-    CHAR_INFO *ci = TypeAlloca(CHAR_INFO, limit);
++    MakeArray(ci, CHAR_INFO, limit);
+     COORD loc, siz;
+     SMALL_RECT rec;
+     int i;
+@@ -220,7 +220,7 @@
+ static BOOL
+ con_write8(TERMINAL_CONTROL_BLOCK * TCB, int y, int x, chtype *str, int n)
+ {
+-    CHAR_INFO *ci = TypeAlloca(CHAR_INFO, n);
++    MakeArray(ci, CHAR_INFO, n);
+     COORD loc, siz;
+     SMALL_RECT rec;
+     int i;
+@@ -415,7 +415,7 @@
+ 	if ((CurScreen(sp)->_clear || NewScreen(sp)->_clear)) {
+ 	    int x;
+ #if USE_WIDEC_SUPPORT
+-	    cchar_t *empty = TypeAlloca(cchar_t, Width);
++	    MakeArray(empty, cchar_t, Width);
+ 	    wchar_t blank[2] =
+ 	    {
+ 		L' ', L'\0'
+@@ -424,7 +424,7 @@
+ 	    for (x = 0; x < Width; x++)
+ 		setcchar(&empty[x], blank, 0, 0, NULL);
+ #else
+-	    chtype *empty = TypeAlloca(chtype, Width);
++	    MakeArray(empty, chtype, Width);
+ 
+ 	    for (x = 0; x < Width; x++)
+ 		empty[x] = ' ';
+@@ -589,8 +589,8 @@
+     int max_cells = (high * wide);
+     int i;
+ 
+-    CHAR_INFO *this_screen = TypeAlloca(CHAR_INFO, max_cells);
+-    CHAR_INFO *that_screen = TypeAlloca(CHAR_INFO, max_cells);
++    MakeArray(this_screen, CHAR_INFO, max_cells);
++    MakeArray(that_screen, CHAR_INFO, max_cells);
+     COORD this_size;
+     SMALL_RECT this_region;
+     COORD bufferCoord;
+Index: ncurses/win32con/win_driver.c
+Prereq:  1.77 
+--- ncurses-6.5-20250222+/ncurses/win32con/win_driver.c	2025-02-20 01:19:43.000000000 +0000
++++ ncurses-6.5-20250301/ncurses/win32con/win_driver.c	2025-03-01 17:17:46.000000000 +0000
+@@ -57,9 +57,7 @@
+ 
+ #define CONTROL_PRESSED (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)
+ 
+-MODULE_ID("$Id: win_driver.c,v 1.77 2025/02/20 01:19:43 tom Exp $")
+-
+-#define TypeAlloca(type,count) (type*) _alloca(sizeof(type) * (size_t) (count))
++MODULE_ID("$Id: win_driver.c,v 1.81 2025/03/01 17:17:46 tom Exp $")
+ 
+ #define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE)
+ 
+@@ -264,7 +262,7 @@
+ con_write16(TERMINAL_CONTROL_BLOCK * TCB, int y, int x, cchar_t *str, int limit)
+ {
+     int actual = 0;
+-    CHAR_INFO *ci = TypeAlloca(CHAR_INFO, limit);
++    MakeArray(ci, CHAR_INFO, limit);
+     COORD loc, siz;
+     SMALL_RECT rec;
+     int i;
+@@ -313,7 +311,7 @@
+ static BOOL
+ con_write8(TERMINAL_CONTROL_BLOCK * TCB, int y, int x, chtype *str, int n)
+ {
+-    CHAR_INFO *ci = TypeAlloca(CHAR_INFO, n);
++    MakeArray(ci, CHAR_INFO, n);
+     COORD loc, siz;
+     SMALL_RECT rec;
+     int i;
+@@ -512,7 +510,7 @@
+ 	if ((CurScreen(sp)->_clear || NewScreen(sp)->_clear)) {
+ 	    int x;
+ #if USE_WIDEC_SUPPORT
+-	    cchar_t *empty = TypeAlloca(cchar_t, Width);
++	    MakeArray(empty, cchar_t, Width);
+ 	    wchar_t blank[2] =
+ 	    {
+ 		L' ', L'\0'
+@@ -521,7 +519,7 @@
+ 	    for (x = 0; x < Width; x++)
+ 		setcchar(&empty[x], blank, 0, 0, NULL);
+ #else
+-	    chtype *empty = TypeAlloca(chtype, Width);
++	    MakeArray(empty, chtype, Width);
+ 
+ 	    for (x = 0; x < Width; x++)
+ 		empty[x] = ' ';
+@@ -685,8 +683,8 @@
+     int max_cells = (high * wide);
+     int i;
+ 
+-    CHAR_INFO *this_screen = TypeAlloca(CHAR_INFO, max_cells);
+-    CHAR_INFO *that_screen = TypeAlloca(CHAR_INFO, max_cells);
++    MakeArray(this_screen, CHAR_INFO, max_cells);
++    MakeArray(that_screen, CHAR_INFO, max_cells);
+     COORD this_size;
+     SMALL_RECT this_region;
+     COORD bufferCoord;
+@@ -1964,7 +1962,7 @@
+      a test for mintty. This is called from the NC_ISATTY macro
+      defined in curses.priv.h
+  */
+-int
++NCURSES_EXPORT(int)
+ _nc_mingw_isatty(int fd)
+ {
+     int result = 0;
+@@ -1985,7 +1983,7 @@
+      with the terminal escape sequences that are sent by
+      terminfo.
+  */
+-int
++NCURSES_EXPORT(int)
+ _nc_mingw_isconsole(int fd)
+ {
+     HANDLE hdl = get_handle(fd);
+@@ -2012,7 +2010,7 @@
+     }                                                         \
+     assert(term != NULL)
+ 
+-int
++NCURSES_EXPORT(int)
+ _nc_mingw_tcsetattr(
+ 		       int fd,
+ 		       int optional_action GCC_UNUSED,
+@@ -2051,7 +2049,7 @@
+     return code;
+ }
+ 
+-int
++NCURSES_EXPORT(int)
+ _nc_mingw_tcgetattr(int fd, struct termios *arg)
+ {
+     TC_PROLOGUE(fd);
+@@ -2063,7 +2061,7 @@
+     return code;
+ }
+ 
+-int
++NCURSES_EXPORT(int)
+ _nc_mingw_tcflush(int fd, int queue)
+ {
+     int code = ERR;
+@@ -2078,7 +2076,7 @@
+     return code;
+ }
+ 
+-int
++NCURSES_EXPORT(int)
+ _nc_mingw_testmouse(
+ 		       SCREEN *sp,
+ 		       HANDLE fd,
+@@ -2102,7 +2100,7 @@
+     return rc;
+ }
+ 
+-int
++NCURSES_EXPORT(int)
+ _nc_mingw_console_read(
+ 			  SCREEN *sp,
+ 			  HANDLE fd,
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250222+/package/debian-mingw/changelog	2025-02-20 09:14:10.000000000 +0000
++++ ncurses-6.5-20250301/package/debian-mingw/changelog	2025-02-23 01:08:08.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250222) unstable; urgency=low
++ncurses6td (6.5+20250301) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Thu, 20 Feb 2025 04:14:10 -0500
++ -- Thomas E. Dickey   Sat, 22 Feb 2025 20:08:08 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250222+/package/debian-mingw64/changelog	2025-02-20 09:14:10.000000000 +0000
++++ ncurses-6.5-20250301/package/debian-mingw64/changelog	2025-02-23 01:08:08.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250222) unstable; urgency=low
++ncurses6td (6.5+20250301) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Thu, 20 Feb 2025 04:14:10 -0500
++ -- Thomas E. Dickey   Sat, 22 Feb 2025 20:08:08 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250222+/package/debian/changelog	2025-02-20 09:14:10.000000000 +0000
++++ ncurses-6.5-20250301/package/debian/changelog	2025-02-23 01:08:08.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250222) unstable; urgency=low
++ncurses6td (6.5+20250301) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Thu, 20 Feb 2025 04:14:10 -0500
++ -- Thomas E. Dickey   Sat, 22 Feb 2025 20:08:08 -0500
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.691 
+--- ncurses-6.5-20250222+/package/mingw-ncurses.nsi	2025-02-20 09:14:10.000000000 +0000
++++ ncurses-6.5-20250301/package/mingw-ncurses.nsi	2025-02-23 01:08:08.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.691 2025/02/20 09:14:10 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.692 2025/02/23 01:08:08 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0222"
++!define VERSION_MMDD  "0301"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250222+/package/mingw-ncurses.spec	2025-02-20 09:14:10.000000000 +0000
++++ ncurses-6.5-20250301/package/mingw-ncurses.spec	2025-02-23 01:08:08.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250222
++Release: 20250301
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20250222+/package/ncurses.spec	2025-02-20 09:14:10.000000000 +0000
++++ ncurses-6.5-20250301/package/ncurses.spec	2025-02-23 01:08:08.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250222
++Release: 20250301
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20250222+/package/ncursest.spec	2025-02-20 09:14:10.000000000 +0000
++++ ncurses-6.5-20250301/package/ncursest.spec	2025-02-23 01:08:08.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250222
++Release: 20250301
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250308.patch b/packages/ncurses/6.5/ncurses-6.5-20250308.patch
new file mode 100644
index 0000000000..825837f870
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250308.patch
@@ -0,0 +1,2208 @@
+# ncurses 6.5 - patch 20250308 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250308.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Mar  9 01:40:42 UTC 2025
+# ------------------------------------------------------------------------------
+# NEWS                              |    8 +
+# VERSION                           |    2 
+# dist.mk                           |    4 
+# doc/html/man/curs_add_wch.3x.html |  169 +++++++++++++++++------------------
+# doc/html/man/curs_addch.3x.html   |  173 ++++++++++++++++++------------------
+# doc/html/man/curs_initscr.3x.html |  119 ++++++++++++------------
+# doc/html/man/curs_inopts.3x.html  |   60 +++++++-----
+# doc/html/man/curs_ins_wch.3x.html |   10 +-
+# doc/html/man/curs_insch.3x.html   |   10 +-
+# doc/html/man/curs_kernel.3x.html  |   28 +++--
+# doc/html/man/curs_move.3x.html    |   10 +-
+# doc/html/man/curs_outopts.3x.html |   81 ++++++++--------
+# doc/html/man/ncurses.3x.html      |    2 
+# doc/html/man/terminfo.5.html      |    2 
+# include/curses.h.in               |    4 
+# include/nc_win32.h                |    4 
+# man/curs_add_wch.3x               |   10 +-
+# man/curs_addch.3x                 |   10 +-
+# man/curs_initscr.3x               |   31 +++---
+# man/curs_inopts.3x                |   40 +++++---
+# man/curs_ins_wch.3x               |    6 -
+# man/curs_insch.3x                 |    6 -
+# man/curs_kernel.3x                |   35 ++++++-
+# man/curs_move.3x                  |    9 -
+# man/curs_outopts.3x               |   20 ++--
+# ncurses/base/lib_getch.c          |    6 -
+# ncurses/base/lib_initscr.c        |   10 +-
+# ncurses/tinfo/lib_win32con.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 
+# 35 files changed, 488 insertions(+), 409 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4257 
+--- ncurses-6.5-20250301+/NEWS	2025-03-01 21:57:13.000000000 +0000
++++ ncurses-6.5-20250308/NEWS	2025-03-09 00:39:13.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4257 2025/03/01 21:57:13 tom Exp $
++-- $Id: NEWS,v 1.4259 2025/03/09 00:39:13 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.
+ 
++20250308
++	+ remove test in wgetch which applied notimeout to the initial read
++	  of a character (patch by Branden Robinson).
++	+ improve formatting/style of manpages (patches by Branden Robinson).
++	+ fix a few compiler-warnings in MinGW port.
++
+ 20250301
+ 	+ add color to vt525 (Branden Robinson)
+ 	+ add vt520-w and vt525-w (Branden Robinson)
+Index: VERSION
+--- ncurses-6.5-20250301+/VERSION	2025-03-01 10:08:08.000000000 +0000
++++ ncurses-6.5-20250308/VERSION	2025-03-08 11:56:38.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250301
++5:0:10	6.5	20250308
+Index: dist.mk
+Prereq:  1.1658 
+--- ncurses-6.5-20250301+/dist.mk	2025-03-01 10:08:08.000000000 +0000
++++ ncurses-6.5-20250308/dist.mk	2025-03-08 11:56:38.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1658 2025/03/01 10:08:08 tom Exp $
++# $Id: dist.mk,v 1.1659 2025/03/08 11:56: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 = 5
+-NCURSES_PATCH = 20250301
++NCURSES_PATCH = 20250308
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/curs_add_wch.3x.html
+--- ncurses-6.5-20250301+/doc/html/man/curs_add_wch.3x.html	2025-03-01 22:03:50.000000000 +0000
++++ ncurses-6.5-20250308/doc/html/man/curs_add_wch.3x.html	2025-03-09 00:55:53.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_add_wch.3x,v 1.108 2025/03/01 21:16:45 tom Exp @
++  * @Id: curs_add_wch.3x,v 1.110 2025/03/08 23:01:20 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_add_wch 3x 2025-03-01 ncurses 6.5 Library calls
++curs_add_wch 3x 2025-03-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                      curs_add_wch 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                      
++
                                                                                                                                                      curs_add_wch 3x 2025-03-08 ncurses 6.5 Library calls
                                                                                                                                                      
+ 
                                                                                                                                                      + curs_add_wch(3x)                 Library calls                curs_add_wch(3x)
+ 
+@@ -156,58 +156,59 @@
+ 
+        If the cursor is at the bottom of the scrolling region when advancement
+        occurs at the right margin, and scrollok(3x) is enabled  for  win,  the
+-       scrolling  region  scrolls  up  one  line.   Otherwise, advancement and
+-       scrolling do not occur, and waddch returns ERR.
++       cursor  wraps  as  above  and the scrolling region scrolls up one line.
++       Otherwise, advancement and scrolling do not occur, and  waddch  returns
++       ERR.
+ 
+-       If wch is a backspace, carriage return, line feed, or tab,  the  cursor
++       If  wch  is a backspace, carriage return, line feed, or tab, the cursor
+        moves appropriately within the window.
+ 
+-       o   Backspace  moves  the cursor one character left; at the left margin
++       o   Backspace moves the cursor one character left; at the  left  margin
+            of a window, it does nothing.
+ 
+-       o   Carriage return moves the cursor to the left  margin  on  the  same
++       o   Carriage  return  moves  the  cursor to the left margin on the same
+            line of the window.
+ 
+-       o   Line  feed  does a clrtoeol(3x), then advances as if from the right
++       o   Line feed does a clrtoeol(3x), then advances as if from  the  right
+            margin.
+ 
+-       o   Tab advances the cursor to the next tab stop (possibly on the  next
+-           line);  these  are placed at every eighth column by default.  Alter
+-           the   tab   interval    with    the    TABSIZE    extension;    see
++       o   Tab  advances the cursor to the next tab stop (possibly on the next
++           line); these are placed at every eighth column by  default.   Alter
++           the    tab    interval    with    the    TABSIZE   extension;   see
+            curs_variables(3x).
+ 
+-       If  wch  is  any other nonprintable character, it is drawn in printable
+-       form using the same convention as wunctrl(3x).  Calling win_wch(3x)  on
+-       the  location of a nonprintable character does not return the character
++       If wch is any other nonprintable character, it is  drawn  in  printable
++       form  using the same convention as wunctrl(3x).  Calling win_wch(3x) on
++       the location of a nonprintable character does not return the  character
+        itself, but its wunctrl(3x) representation.
+ 
+-       A cchar_t can be copied from  place  to  place  using  win_wch(3x)  and
+-       wadd_wch.   See  curs_attr(3x)  for values of predefined constants that
++       A  cchar_t  can  be  copied  from  place to place using win_wch(3x) and
++       wadd_wch.  See curs_attr(3x) for values of  predefined  constants  that
+        can be usefully "or"ed with characters.  A complex character whose only
+-       character  component  is  a  wide  space,  and  whose only attribute is
+-       WA_NORMAL, is a  blank  character,  and  therefore  combines  with  the
++       character component is a  wide  space,  and  whose  only  attribute  is
++       WA_NORMAL,  is  a  blank  character,  and  therefore  combines with the
+        background character; see curs_bkgrnd(3x).
+ 
+ 
+ 
                                                                                                                                                      wecho_wchar
                                                                                                                                                      +-       echo_wchar   and  wecho_wchar  are  equivalent  to  calling  (w)add_wch
+-       followed by (w)refresh on  stdscr  or  the  specified  window.   curses
+-       interprets  these  functions  as  a  hint  that only a single (complex)
+-       character is being output; for non-control characters,  a  considerable
++       echo_wchar  and  wecho_wchar  are  equivalent  to  calling   (w)add_wch
++       followed  by  (w)refresh  on  stdscr  or  the specified window.  curses
++       interprets these functions as a  hint  that  only  a  single  (complex)
++       character  is  being output; for non-control characters, a considerable
+        performance gain may be enjoyed by employing them.
+ 
+ 
+ 
                                                                                                                                                      Forms-Drawing Characters
                                                                                                                                                      +-       curses  defines  macros  starting  with  WACS_  that  can  be used with
+-       wadd_wch to  write  line-drawing  and  other  symbols  to  the  screen.
+-       ncurses  terms  these forms-drawing characters.  The ACS default listed
+-       below is used if the acs_chars  (acsc)  terminfo  capability  does  not
+-       define  a terminal-specific replacement for it, or if the terminal type
++       curses defines macros  starting  with  WACS_  that  can  be  used  with
++       wadd_wch  to  write  line-drawing  and  other  symbols  to  the screen.
++       ncurses terms these forms-drawing characters.  The ACS  default  listed
++       below  is  used  if  the  acs_chars (acsc) terminfo capability does not
++       define a terminal-specific replacement for it, or if the terminal  type
+        and locale configuration require Unicode to access these characters but
+        the  library  is  unable  to  use  Unicode.   The  "acsc  char"  column
+        corresponds to how the characters are specified in the acs_chars (acsc)
+        string capability, and the characters in it may appear on the screen if
+-       the terminal type's database entry incorrectly advertises ACS  support.
++       the  terminal type's database entry incorrectly advertises ACS support.
+        The name "ACS" originates in the Alternate Character Set feature of the
+        DEC VT100 terminal.
+ 
+@@ -244,11 +245,11 @@
+        WACS_TTEE       U+252c    +         w      top tee
+        WACS_UARROW     U+2191    ^         -      arrow pointing up
+        WACS_ULCORNER   U+250c    +         l      upper left-hand corner
+-       WACS_URCORNER   U+2510    +         k      upper right-hand corner
+ 
++       WACS_URCORNER   U+2510    +         k      upper right-hand corner
+        WACS_VLINE      U+2502    |         x      vertical line
+ 
+-       The ncurses wide API also defines symbols for  thick  lines  (acsc  "J"
++       The  ncurses  wide  API  also defines symbols for thick lines (acsc "J"
+        through "N", "T" through "X", and "Q"):
+ 
+                          Unicode   ASCII     acsc
+@@ -283,9 +284,9 @@
+        WACS_D_URCORNER   U+2557    +         B      double upper right corner
+        WACS_D_VLINE      U+2551    |         Y      double vertical line
+ 
+-       Unicode's  descriptions  for  these  characters  differs  slightly from
+-       ncurses, by introducing the term "light"  (along  with  less  important
+-       details).   Here are its descriptions for the normal, thick, and double
++       Unicode's descriptions  for  these  characters  differs  slightly  from
++       ncurses,  by  introducing  the  term "light" (along with less important
++       details).  Here are its descriptions for the normal, thick, and  double
+        horizontal lines:
+ 
+        o   U+2500 BOX DRAWINGS LIGHT HORIZONTAL
+@@ -302,31 +303,31 @@
+ 
+        o   the curses screen has not been initialized,
+ 
+-       o   (for functions taking a WINDOW pointer  argument)  win  is  a  null
++       o   (for  functions  taking  a  WINDOW  pointer argument) win is a null
+            pointer,
+ 
+-       o   wrapping  to  a new line is impossible because scrollok(3x) has not
+-           been called on win (or stdscr, as applicable) when writing  to  its
++       o   wrapping to a new line is impossible because scrollok(3x)  has  not
++           been  called  on win (or stdscr, as applicable) when writing to its
+            bottom right location is attempted, or
+ 
+-       o   it  is  not  possible  to  add  a  complete character at the cursor
++       o   it is not possible to  add  a  complete  character  at  the  cursor
+            position.
+ 
+-       Functions prefixed with "mv" first perform cursor movement and fail  if
++       Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                      NOTES
                                                                                                                                                      +-       add_wch,  mvadd_wch,  mvwadd_wch,  and echo_wchar may be implemented as
++       add_wch, mvadd_wch, mvwadd_wch, and echo_wchar may  be  implemented  as
+        macros.
+ 
+ 
+ 
                                                                                                                                                      EXTENSIONS
                                                                                                                                                      +-       The  symbols  WACS_S3,  WACS_S7,  WACS_LEQUAL,  WACS_GEQUAL,   WACS_PI,
+-       WACS_NEQUAL,   and  WACS_STERLING  are  not  standard.   However,  many
+-       publicly  available   terminfo   entries   include   acs_chars   (acsc)
+-       capabilities  in which their key characters (pryz{|}) are embedded, and
+-       a second-hand list of their character descriptions has come  to  light.
++       The   symbols  WACS_S3,  WACS_S7,  WACS_LEQUAL,  WACS_GEQUAL,  WACS_PI,
++       WACS_NEQUAL,  and  WACS_STERLING  are  not  standard.   However,   many
++       publicly   available   terminfo   entries   include   acs_chars  (acsc)
++       capabilities in which their key characters (pryz{|}) are embedded,  and
++       a  second-hand  list of their character descriptions has come to light.
+        The ncurses developers invented WACS-prefixed names for them.
+ 
+ 
+@@ -334,59 +335,59 @@
+        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       These functions are described in X/Open Curses Issue 4.   It  specifies
++       These  functions  are described in X/Open Curses Issue 4.  It specifies
+        no error conditions for them.
+ 
+-       The  defaults specified for forms-drawing characters apply in the POSIX
+-       locale.  X/Open Curses makes it clear that the WACS_ symbols should  be
+-       defined  as  a  pointer  to  cchar_t  data,  e.g., in the discussion of
++       The defaults specified for forms-drawing characters apply in the  POSIX
++       locale.   X/Open Curses makes it clear that the WACS_ symbols should be
++       defined as a pointer to  cchar_t  data,  e.g.,  in  the  discussion  of
+        border_set.  A few implementations are problematic:
+ 
+        o   NetBSD curses defines the symbols as a wchar_t within a cchar_t.
+ 
+-       o   HP-UX 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
++       o   HP-UX  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.
+ 
+-       X/Open  Curses  does  not  specify  symbols for thick- or double-lines.
++       X/Open Curses does not specify  symbols  for  thick-  or  double-lines.
+        SVr4 curses implementations defined their line-drawing symbols in terms
+-       of  intermediate symbols.  ncurses extends those symbols, providing new
++       of intermediate symbols.  ncurses extends those symbols, providing  new
+        definitions not found in SVr4 implementations.
+ 
+-       Not all  Unicode-capable  terminals  provide  support  for  VT100-style
++       Not  all  Unicode-capable  terminals  provide  support  for VT100-style
+        alternate character sets (i.e., the acsc_chars (acsc) capability), with
+-       their corresponding line-drawing characters.   X/Open  Curses  did  not
++       their  corresponding  line-drawing  characters.   X/Open Curses did not
+        address the aspect of integrating Unicode with line-drawing characters.
+-       Existing implementations of System V curses (AIX, HP-UX,  Solaris)  use
+-       only  the  acsc_chars (acsc) character-mapping to provide this feature.
+-       As a result, those  implementations  can  use  only  single-byte  line-
+-       drawing  characters.   ncurses  5.3  (2002) provided a table of Unicode
+-       values to solve these problems.  NetBSD curses incorporated that  table
++       Existing  implementations  of System V curses (AIX, HP-UX, Solaris) use
++       only the acsc_chars (acsc) character-mapping to provide  this  feature.
++       As  a  result,  those  implementations  can  use only single-byte line-
++       drawing characters.  ncurses 5.3 (2002) provided  a  table  of  Unicode
++       values  to solve these problems.  NetBSD curses incorporated that table
+        in 2010.
+ 
+-       ncurses   uses   the  Unicode  values  instead  of  the  terminal  type
++       ncurses  uses  the  Unicode  values  instead  of  the   terminal   type
+        description's acsc_chars (acsc) mapping as discussed in ncurses(3x) for
+-       the  environment  variable  NCURSES_NO_UTF8_ACS.   In contrast, for the
++       the environment variable NCURSES_NO_UTF8_ACS.   In  contrast,  for  the
+        same cases, the line-drawing characters described in addch(3x) will use
+        only the ASCII default values.
+ 
+-       Having  Unicode available does not solve all of the problems with line-
++       Having Unicode available does not solve all of the problems with  line-
+        drawing for curses:
+ 
+-       o   The closest Unicode equivalents to the VT100 graphics S1,  S3,  S7,
+-           and  S9 frequently are not displayed at the regular intervals which
++       o   The  closest  Unicode equivalents to the VT100 graphics S1, S3, S7,
++           and S9 frequently are not displayed at the regular intervals  which
+            the terminal used.
+ 
+-       o   The lantern is a special case.  It originated with  the  AT&T  4410
+-           terminal  in the early 1980s.  There is no accessible documentation
++       o   The  lantern  is  a special case.  It originated with the AT&T 4410
++           terminal in the early 1980s.  There is no accessible  documentation
+            depicting the lantern symbol on the AT&T terminal.
+ 
+            Lacking documentation, most readers assume that a storm lantern was
+            intended.  But there are several possibilities, all with problems.
+ 
+-           Unicode  6.0  (2010)  does provide two lantern symbols: U+1F383 and
+-           U+1F3EE.  Those were not available  in  2002,  and  are  irrelevant
++           Unicode 6.0 (2010) does provide two lantern  symbols:  U+1F383  and
++           U+1F3EE.   Those  were  not  available  in 2002, and are irrelevant
+            since they lie outside the Basic Multilingual Plane and as a result
+            are unavailable on many terminals.  They are not storm lanterns, in
+            any case.
+@@ -394,20 +395,20 @@
+            Most storm lanterns have a tapering glass chimney (to guard against
+            tipping); some have a wire grid protecting the chimney.
+ 
+-           For the tapering appearance,  U+2603 was adequate.   In  use  on  a
++           For  the  tapering  appearance,   U+2603 was adequate.  In use on a
+            terminal, no one can tell what the image represents.  Unicode calls
+            it a snowman.
+ 
+            Others have suggested these alternatives: <section> U+00A7 (section
+-           mark),  <Theta>  U+0398 (theta), <Phi> U+03A6 (phi), <delta> U+03B4
++           mark), <Theta> U+0398 (theta), <Phi> U+03A6 (phi),  <delta>  U+03B4
+            (delta),  U+2327 (x in a rectangle),  U+256C (forms double vertical
+            and horizontal), and  U+2612 (ballot box with x).
+ 
+ 
+ 
                                                                                                                                                      Complex Characters
                                                                                                                                                      +-       The  complex  character  type  cchar_t  can  store  more  than one wide
+-       character (wchar_t).  X/Open Curses does not mention this  possibility,
+-       specifying  behavior  only  where  wch  is  a  single character, either
++       The complex character  type  cchar_t  can  store  more  than  one  wide
++       character  (wchar_t).  X/Open Curses does not mention this possibility,
++       specifying behavior only  where  wch  is  a  single  character,  either
+        spacing or non-spacing.
+ 
+        ncurses assumes that wch is constructed using setcchar(3x), and in turn
+@@ -418,22 +419,22 @@
+ 
+        o   holds one non-spacing character.
+ 
+-       In the latter case, ncurses  adds  the  non-spacing  character  to  the
++       In  the  latter  case,  ncurses  adds  the non-spacing character to the
+        active complex character.
+ 
+ 
+ 
                                                                                                                                                      HISTORY
                                                                                                                                                      +-       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
++       X/Open Curses Issue 4 (1995) initially specified these functions.   The
+        System V  Interface  Definition  (SVID)  Version 4  of  the  same  year
+-       specified  functions named waddwch (and the usual variants), echowchar,
++       specified functions named waddwch (and the usual variants),  echowchar,
+        and wechowchar.  These were later additions to SVr4.x, not appearing in
+-       the  first SVr4 (1989).  They differed from X/Open's later wadd_wch and
+-       wecho_wchar in that they each took an argument of type wchar_t  instead
++       the first SVr4 (1989).  They differed from X/Open's later wadd_wch  and
++       wecho_wchar  in that they each took an argument of type wchar_t instead
+        of cchar_t.  SVID defined no  WACS_ symbols.
+ 
+-       X/Open  Curses  Issue 4  also  defined  many  of  the  WACS_ constants,
++       X/Open Curses  Issue 4  also  defined  many  of  the  WACS_  constants,
+        excepting  WACS_GEQUAL,  WACS_LEQUAL,  WACS_NEQUAL,  WACS_PI,  WACS_S3,
+-       WACS_S7,  and  WACS_STERLING;  and  those  for drawing thick and double
++       WACS_S7, and WACS_STERLING; and those  for  drawing  thick  and  double
+        lines.
+ 
+        ncurses 5.3 (2002) furnished the remaining WACS_ constants.
+@@ -444,12 +445,12 @@
+        its non-wide-character configuration.
+ 
+        curses(3x),   curs_addwstr(3x),   curs_add_wchstr(3x),   curs_attr(3x),
+-       curs_bkgrnd(3x), curs_clear(3x),  curs_getcchar(3x),  curs_outopts(3x),
++       curs_bkgrnd(3x),  curs_clear(3x),  curs_getcchar(3x), curs_outopts(3x),
+        curs_refresh(3x), curs_variables(3x), putwc(3)
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-01                  curs_add_wch(3x)
++ncurses 6.5                       2025-03-08                  curs_add_wch(3x)
+ 
                                                                                                                                                      
+ 
                                                                                                                                                      
+ 
                                                                                                                                                        
+Index: doc/html/man/curs_addch.3x.html
+--- ncurses-6.5-20250301+/doc/html/man/curs_addch.3x.html	2025-03-01 22:03:50.000000000 +0000
++++ ncurses-6.5-20250308/doc/html/man/curs_addch.3x.html	2025-03-09 00:55:53.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addch.3x,v 1.128 2025/03/01 21:16:45 tom Exp @
++  * @Id: curs_addch.3x,v 1.130 2025/03/08 23:01:20 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addch 3x 2025-03-01 ncurses 6.5 Library calls
++curs_addch 3x 2025-03-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                        curs_addch 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                        
++
                                                                                                                                                        curs_addch 3x 2025-03-08 ncurses 6.5 Library calls
                                                                                                                                                        
+ 
                                                                                                                                                        + curs_addch(3x)                   Library calls                  curs_addch(3x)
+ 
+@@ -117,59 +117,60 @@
+ 
+        If the cursor is at the bottom of the scrolling region when advancement
+        occurs at the right margin, and scrollok(3x) is enabled  for  win,  the
+-       scrolling  region  scrolls  up  one  line.   Otherwise, advancement and
+-       scrolling do not occur, and waddch returns ERR.
++       cursor  wraps  as  above  and the scrolling region scrolls up one line.
++       Otherwise, advancement and scrolling do not occur, and  waddch  returns
++       ERR.
+ 
+-       If ch is a backspace, carriage return, line feed, or  tab,  the  cursor
++       If  ch  is  a backspace, carriage return, line feed, or tab, the cursor
+        moves appropriately within the window.
+ 
+-       o   Backspace  moves  the cursor one character left; at the left margin
++       o   Backspace moves the cursor one character left; at the  left  margin
+            of a window, it does nothing.
+ 
+-       o   Carriage return moves the cursor to the left  margin  on  the  same
++       o   Carriage  return  moves  the  cursor to the left margin on the same
+            line of the window.
+ 
+-       o   Line  feed  does a clrtoeol(3x), then advances as if from the right
++       o   Line feed does a clrtoeol(3x), then advances as if from  the  right
+            margin.
+ 
+-       o   Tab advances the cursor to the next tab stop (possibly on the  next
+-           line);  these  are placed at every eighth column by default.  Alter
+-           the   tab   interval    with    the    TABSIZE    extension;    see
++       o   Tab  advances the cursor to the next tab stop (possibly on the next
++           line); these are placed at every eighth column by  default.   Alter
++           the    tab    interval    with    the    TABSIZE   extension;   see
+            curs_variables(3x).
+ 
+-       If  ch  is  any  other nonprintable character, it is drawn in printable
++       If ch is any other nonprintable character, it  is  drawn  in  printable
+        form using the same convention as unctrl(3x).  Calling winch(3x) on the
+-       location  of  a  nonprintable  character  does not return the character
++       location of a nonprintable character  does  not  return  the  character
+        itself, but its unctrl(3x) representation.
+ 
+-       The object or expression ch may contain attributes and/or a color  pair
+-       identifier.   (A  chtype  can  be  copied  from  place  to  place using
+-       winch(3x) and waddch.)  See  curs_attr(3x)  for  values  of  predefined
+-       constants  that  can  be  usefully  "or"ed with characters.  A ch whose
+-       character component is a space, and whose only attribute  is  A_NORMAL,
+-       is  a  blank  character,  and  therefore  combines  with the background
++       The  object or expression ch may contain attributes and/or a color pair
++       identifier.  (A  chtype  can  be  copied  from  place  to  place  using
++       winch(3x)  and  waddch.)   See  curs_attr(3x)  for values of predefined
++       constants that can be usefully "or"ed  with  characters.   A  ch  whose
++       character  component  is a space, and whose only attribute is A_NORMAL,
++       is a blank  character,  and  therefore  combines  with  the  background
+        character; see curs_bkgd(3x).
+ 
+ 
+ 
                                                                                                                                                        wechochar
                                                                                                                                                        +-       echochar and wechochar are equivalent to calling (w)addch  followed  by
+-       (w)refresh  on stdscr or the specified window.  curses interprets these
+-       functions as a hint to its optimizer that only a single character  cell
+-       in  the  window  is  being  altered  between refreshes; for non-control
++       echochar  and  wechochar are equivalent to calling (w)addch followed by
++       (w)refresh on stdscr or the specified window.  curses interprets  these
++       functions  as a hint to its optimizer that only a single character cell
++       in the window is  being  altered  between  refreshes;  for  non-control
+        characters, a considerable performance gain may be enjoyed by employing
+        them.
+ 
+ 
+ 
                                                                                                                                                        Forms-Drawing Characters
                                                                                                                                                        +-       curses  defines  macros starting with ACS_ that can be used with waddch
+-       to write line-drawing and other symbols to the screen.   ncurses  terms
+-       these  forms-drawing  characters.  The ACS default listed below is used
++       curses defines macros starting with ACS_ that can be used  with  waddch
++       to  write  line-drawing and other symbols to the screen.  ncurses terms
++       these forms-drawing characters.  The ACS default listed below  is  used
+        if the acs_chars (acsc) terminfo capability does not define a terminal-
+-       specific  replacement  for  it,  or  if  the  terminal  type and locale
+-       configuration require  Unicode  to  access  these  characters  but  the
+-       library  is  unable to use Unicode.  The "acsc char" column corresponds
+-       to how the characters are specified  in  the  acs_chars  (acsc)  string
+-       capability,  and  the  characters in it may appear on the screen if the
++       specific replacement for  it,  or  if  the  terminal  type  and  locale
++       configuration  require  Unicode  to  access  these  characters  but the
++       library is unable to use Unicode.  The "acsc char"  column  corresponds
++       to  how  the  characters  are  specified in the acs_chars (acsc) string
++       capability, and the characters in it may appear on the  screen  if  the
+        terminal type's database entry incorrectly advertises ACS support.  The
+        name "ACS" originates in the Alternate Character Set feature of the DEC
+        VT100 terminal.
+@@ -219,27 +220,27 @@
+ 
+        o   the curses screen has not been initialized,
+ 
+-       o   (for functions taking a WINDOW pointer  argument)  win  is  a  null
++       o   (for  functions  taking  a  WINDOW  pointer argument) win is a null
+            pointer,
+ 
+-       o   wrapping  to  a new line is impossible because scrollok(3x) has not
+-           been called on win (or stdscr, as applicable) when a write  to  its
++       o   wrapping to a new line is impossible because scrollok(3x)  has  not
++           been  called  on win (or stdscr, as applicable) when a write to its
+            bottom right location is attempted, or
+ 
+-       o   it  is  not  possible  to  add  a  complete character at the cursor
++       o   it is not possible to  add  a  complete  character  at  the  cursor
+            position.
+ 
+        The last may be due to different causes:
+ 
+-       o   conversion of a wide character to a  multibyte  character  sequence
++       o   conversion  of  a  wide character to a multibyte character sequence
+            can fail, or
+ 
+-       o   at  least one of the bytes resulting from wide character conversion
+-           to a multibyte character sequence cannot be added  to  the  window.
+-           See  section  "PORTABILITY"  below regarding the use of waddch with
++       o   at least one of the bytes resulting from wide character  conversion
++           to  a  multibyte  character sequence cannot be added to the window.
++           See section "PORTABILITY" below regarding the use  of  waddch  with
+            wide characters.
+ 
+-       Functions prefixed with "mv" first perform cursor movement and fail  if
++       Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+@@ -249,11 +250,11 @@
+ 
+ 
                                                                                                                                                        EXTENSIONS
                                                                                                                                                        +        The symbols ACS_S3, ACS_S7, ACS_LEQUAL, ACS_GEQUAL, ACS_PI, ACS_NEQUAL,
+-       and ACS_STERLING were not documented in any publicly released  System V
+-       and  are  not  standard.   However,  many  publicly  available terminfo
+-       entries include  acs_chars  (acsc)  capabilities  in  which  their  key
+-       characters  (pryz{|})  are  embedded,  and  a second-hand list of their
+-       character descriptions has  come  to  light.   The  ncurses  developers
++       and  ACS_STERLING were not documented in any publicly released System V
++       and are  not  standard.   However,  many  publicly  available  terminfo
++       entries  include  acs_chars  (acsc)  capabilities  in  which  their key
++       characters (pryz{|}) are embedded, and  a  second-hand  list  of  their
++       character  descriptions  has  come  to  light.   The ncurses developers
+        invented ACS-prefixed names for them.
+ 
+ 
+@@ -264,79 +265,79 @@
+        X/Open Curses Issue 4 describes these functions.  It specifies no error
+        conditions for them.
+ 
+-       SVr4  describes  a  successful  return  value only as "an integer value
++       SVr4 describes a successful return value  only  as  "an  integer  value
+        other than ERR".
+ 
+-       The defaults specified for forms-drawing characters apply in the  POSIX
++       The  defaults specified for forms-drawing characters apply in the POSIX
+        locale.
+ 
+ 
+ 
                                                                                                                                                        ACS Symbols
                                                                                                                                                        +-       X/Open  Curses  states  that  the  ACS_ definitions are char constants.
++       X/Open Curses states that the  ACS_  definitions  are  char  constants.
+        Some implementations are problematic.
+ 
+-       o   Solaris curses, for example, defines the ACS symbols as  constants;
++       o   Solaris  curses, for example, defines the ACS symbols as constants;
+            others define them as elements of an array.
+ 
+-           SVr4  used  an array, acs_map, as does ncurses.  NetBSD curses also
+-           uses an array, actually  named  _acs_char,  with  a  "#define"  for
++           SVr4 used an array, acs_map, as does ncurses.  NetBSD  curses  also
++           uses  an  array,  actually  named  _acs_char,  with a "#define" for
+            compatibility.
+ 
+-       o   HP-UX  curses  equates  some  of  the ACS_ symbols to the analogous
+-           WACS_ symbols as if the ACS_  symbols  were  wide  characters  (see
+-           curs_add_wch(3x)).   The  misdefined  symbols  are  the  arrows and
++       o   HP-UX curses equates some of the  ACS_  symbols  to  the  analogous
++           WACS_  symbols  as  if  the  ACS_ symbols were wide characters (see
++           curs_add_wch(3x)).  The  misdefined  symbols  are  the  arrows  and
+            others that are not used for line drawing.
+ 
+-       o   X/Open Curses (Issues 2 through 7) has a  typographical  error  for
+-           the  ACS_LANTERN  symbol,  equating  its  "VT100+ Character" to "I"
+-           (capital I), while the header  files  for  SVr4  curses  and  other
++       o   X/Open  Curses  (Issues 2  through 7) has a typographical error for
++           the ACS_LANTERN symbol, equating  its  "VT100+  Character"  to  "I"
++           (capital  I),  while  the  header  files  for SVr4 curses and other
+            implementations use "i" (small i).
+ 
+-           None  of  the terminal descriptions on Unix platforms use uppercase
+-           I, except  for  Solaris  (in  its  terminfo  entry  for  screen(1),
+-           apparently  based on the X/Open documentation around 1995).  On the
+-           other hand, its gs6300 (AT&T PC6300 with EMOTS  Terminal  Emulator)
++           None of the terminal descriptions on Unix platforms  use  uppercase
++           I,  except  for  Solaris  (in  its  terminfo  entry  for screen(1),
++           apparently based on the X/Open documentation around 1995).  On  the
++           other  hand,  its gs6300 (AT&T PC6300 with EMOTS Terminal Emulator)
+            description uses lowercase i.
+ 
+        The displayed values of ACS_ constants depend on
+ 
+        o   the  ncurses  ABI--for  example,  wide-character  versus  non-wide-
+-           character configurations  (the  former  is  capable  of  displaying
++           character  configurations  (the  former  is  capable  of displaying
+            Unicode while the latter is not), and
+ 
+        o   whether the locale uses UTF-8 encoding.
+ 
+-       In  certain  cases,  the  terminal  is  unable to display forms-drawing
+-       characters  except  by  using  UTF-8;  see  the   discussion   of   the
++       In certain cases, the  terminal  is  unable  to  display  forms-drawing
++       characters   except   by   using  UTF-8;  see  the  discussion  of  the
+        NCURSES_NO_UTF8_ACS environment variable in ncurses(3x).
+ 
+ 
+ 
                                                                                                                                                        Character Set
                                                                                                                                                        +-       X/Open  Curses  assumes  that the parameter passed to waddch contains a
+-       single character.  That character may have been more  than  eight  bits
+-       wide  in  an  SVr3 or SVr4 implementation, but X/Open Curses leaves the
+-       width of a non-wide character code unspecified.  The  standard  further
+-       does  not specify the internal structure of a chtype, though the use of
+-       bit operations to combine the character  code  with  attributes  and  a
++       X/Open Curses assumes that the parameter passed to  waddch  contains  a
++       single  character.   That  character may have been more than eight bits
++       wide in an SVr3 or SVr4 implementation, but X/Open  Curses  leaves  the
++       width  of  a non-wide character code unspecified.  The standard further
++       does not specify the internal structure of a chtype, though the use  of
++       bit  operations  to  combine  the  character code with attributes and a
+        color pair identifier into a chtype for passage to waddch is common.  A
+        portable application uses only the macros discussed in curs_attr(3x) to
+        manipulate a chtype.
+ 
+        In ncurses, chtype holds an eight-bit character, but the library allows
+-       a multibyte character sequence to be passed via a succession  of  calls
+-       to  waddch.   Other  implementations  do  not;  a waddch call transmits
+-       exactly one character, which may be rendered  in  one  or  more  screen
+-       locations  depending  on  whether  it  is  printable  (see unctrl(3x)).
+-       Depending on the locale, ncurses  inspects  the  byte  passed  in  each
+-       waddch  call  and  checks whether the latest call continues a multibyte
+-       character.   When  a  character  is  complete,  ncurses  displays   the
+-       character   and  advances  the  cursor.   If  the  calling  application
++       a  multibyte  character sequence to be passed via a succession of calls
++       to waddch.  Other implementations  do  not;  a  waddch  call  transmits
++       exactly  one  character,  which  may  be rendered in one or more screen
++       locations depending  on  whether  it  is  printable  (see  unctrl(3x)).
++       Depending  on  the  locale,  ncurses  inspects  the byte passed in each
++       waddch call and checks whether the latest call  continues  a  multibyte
++       character.    When  a  character  is  complete,  ncurses  displays  the
++       character  and  advances  the  cursor.   If  the  calling   application
+        interrupts the succession of bytes in a multibyte character sequence by
+-       changing  the  current  location--for  example, with wmove(3x)--ncurses
++       changing the current  location--for  example,  with  wmove(3x)--ncurses
+        discards the incomplete character.
+ 
+        For  portability  to  other  implementations,  do  not  rely  upon  the
+-       foregoing  behavior.  Check whether a character can be represented as a
++       foregoing behavior.  Check whether a character can be represented as  a
+        single byte in the current locale.
+ 
+        o   If it can, call either waddch or wadd_wch.
+@@ -347,24 +348,24 @@
+ 
                                                                                                                                                        HISTORY
                                                                                                                                                        +        4BSD (1980) introduced waddch and its variants.
+ 
+-       SVr3 (1987) added the echochar and wechochar functions and most of  the
+-       ACS_  constants, except for ACS_GEQUAL, ACS_LEQUAL, ACS_NEQUAL, ACS_PI,
++       SVr3  (1987) added the echochar and wechochar functions and most of the
++       ACS_ constants, except for ACS_GEQUAL, ACS_LEQUAL, ACS_NEQUAL,  ACS_PI,
+        ACS_S3, ACS_S7, and ACS_STERLING.
+ 
+        ncurses 1.9.6 (1995) furnished the remaining ACS_ constants.
+ 
+ 
+ 
                                                                                                                                                        SEE ALSO
                                                                                                                                                        +-       curs_add_wch(3x) describes comparable functions of the ncurses  library
++       curs_add_wch(3x)  describes comparable functions of the ncurses library
+        in its wide-character configuration (ncursesw).
+ 
+        curses(3x),    curs_addchstr(3x),    curs_addstr(3x),    curs_attr(3x),
+-       curs_bkgd(3x),   curs_clear(3x),    curs_inch(3x),    curs_outopts(3x),
++       curs_bkgd(3x),    curs_clear(3x),    curs_inch(3x),   curs_outopts(3x),
+        curs_refresh(3x), curs_variables(3x), putchar(3)
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-01                    curs_addch(3x)
++ncurses 6.5                       2025-03-08                    curs_addch(3x)
+ 
                                                                                                                                                        
+ 
                                                                                                                                                        
+ 
                                                                                                                                                          
+Index: doc/html/man/curs_initscr.3x.html
+--- ncurses-6.5-20250301+/doc/html/man/curs_initscr.3x.html	2025-03-01 22:03:50.000000000 +0000
++++ ncurses-6.5-20250308/doc/html/man/curs_initscr.3x.html	2025-03-09 00:55:54.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_initscr.3x,v 1.95 2025/03/01 21:21:41 tom Exp @
++  * @Id: curs_initscr.3x,v 1.100 2025/03/08 23:07:43 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_initscr 3x 2025-03-01 ncurses 6.5 Library calls
++curs_initscr 3x 2025-03-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                          curs_initscr 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                          
++
                                                                                                                                                          curs_initscr 3x 2025-03-08 ncurses 6.5 Library calls
                                                                                                                                                          
+ 
                                                                                                                                                          + curs_initscr(3x)                 Library calls                curs_initscr(3x)
+ 
+@@ -98,8 +98,8 @@
+        An application that manages multiple terminals should call newterm once
+        for each such device instead of initscr.  newterm's arguments are
+ 
+-       o   the  type  of  the  associated  terminal,  or  NULL to use the TERM
+-           environment variable;
++       o   the  type  of the associated terminal, or a null pointer to use the
++           TERM environment variable;
+ 
+        o   an output stream outf connected to the terminal; and
+ 
+@@ -170,7 +170,8 @@
+ 
+ 
+ 
                                                                                                                                                          RETURN VALUE
                                                                                                                                                          +-       endwin returns OK on success and ERR on failure.
++       delscreen  returns  no  value.  endwin returns OK on success and ERR on
++       failure.  isendwin returns TRUE or FALSE as described above.
+ 
+        In ncurses,
+ 
+@@ -178,64 +179,64 @@
+ 
+            o   the terminal was not initialized,
+ 
+-           o   endwin is called more than once without updating the screen, or
++           o   it is called more than once without updating the screen, or
+ 
+-           o   reset_shell_mode(3x) returns ERR.
++           o   its call of reset_shell_mode(3x) returns ERR.
+ 
+-       o   newterm  returns  ERR  if it cannot allocate storage for the SCREEN
+-           data structure or the top-level windows  thereof:  curscr,  newscr,
+-           and stdscr.
++       o   newterm returns ERR if it cannot allocate storage  for  the  SCREEN
++           structure  or  the  WINDOW structures automatically associated with
++           it: curscr, newscr, and stdscr.
+ 
+-       Functions  that  return  pointers  return  NULL  on error.  In ncurses,
+-       set_term does not fail, and initscr exits the application  if  it  does
+-       not operate successfully.
++       Functions that return pointers  return  null  pointers  on  error.   In
++       ncurses,  set_term  does not fail, and initscr exits the application if
++       it does not operate successfully.
+ 
+ 
+ 
                                                                                                                                                          NOTES
                                                                                                                                                          +-       ncurses  establishes signal handlers when a function that initializes a
+-       SCREEN, either initscr or newterm, is first called.  Applications  that
+-       wish  to  handle  the  following signals themselves should set up their
++       ncurses establishes signal handlers when a function that initializes  a
++       SCREEN,  either initscr or newterm, is first called.  Applications that
++       wish to handle the following signals themselves  should  set  up  their
+        corresponding handlers after initializing the screen.
+ 
+-       SIGINT ncurses's handler attempts to  clean  up  the  screen  on  exit.
++       SIGINT ncurses's  handler  attempts  to  clean  up  the screen on exit.
+               Although it usually works as expected, there are limitations.
+ 
+               o   Walking the SCREEN list is unsafe, since all list management
+                   is done without any signal blocking.
+ 
+               o   When an application has been built with the _REENTRANT macro
+-                  defined  (and  corresponding  system support), set_term uses
++                  defined (and corresponding system  support),  set_term  uses
+                   functions that could deadlock or misbehave in other ways.
+ 
+-              o   endwin calls other functions, many of which use stdio(3)  or
++              o   endwin  calls other functions, many of which use stdio(3) or
+                   other library functions that are clearly unsafe.
+ 
+        SIGTERM
+-              ncurses  uses  the  same  handler  as  for SIGINT, with the same
+-              limitations.  It is not mentioned in X/Open Curses, but is  more
+-              suitable  for  this  purpose  than  SIGQUIT  (which  is  used in
++              ncurses uses the same handler  as  for  SIGINT,  with  the  same
++              limitations.   It is not mentioned in X/Open Curses, but is more
++              suitable for  this  purpose  than  SIGQUIT  (which  is  used  in
+               debugging).
+ 
+        SIGTSTP
+-              ncurses's handler manages the  terminal-generated  stop  signal,
++              ncurses's  handler  manages  the terminal-generated stop signal,
+               used  in  job  control.   When  resuming  the  process,  ncurses
+               discards  pending  input  with  flushinp(3x)  and  repaints  the
+-              screen,  assuming  that it has been completely altered.  It also
++              screen, assuming that it has been completely altered.   It  also
+               updates the saved terminal modes with def_shell_mode(3x).
+ 
+        SIGWINCH
+               ncurses  handles  changes  to  the  terminal's  window  size,  a
+               phenomenon  ignored  in  standardization  efforts.   It  sets  a
+-              (signal-safe) variable that is later tested  by  wgetch(3x)  and
++              (signal-safe)  variable  that  is later tested by wgetch(3x) and
+               wget_wch(3x).
+ 
+               o   wgetch returns the key code KEY_RESIZE.
+ 
+-              o   wget_wch  returns KEY_CODE_YES and sets its wch parameter to
++              o   wget_wch returns KEY_CODE_YES and sets its wch parameter  to
+                   KEY_RESIZE.
+ 
+-              At the same time, ncurses calls  resizeterm(3x)  to  adjust  the
+-              standard  screen  stdscr,  and  update  global variables such as
++              At  the  same  time,  ncurses calls resizeterm(3x) to adjust the
++              standard screen stdscr, and  update  global  variables  such  as
+               LINES and COLS.
+ 
+ 
+@@ -245,79 +246,79 @@
+ 
+ 
+ 
                                                                                                                                                          Differences
                                                                                                                                                          +-       X/Open  Curses  specifies  that  portable  applications  must  not call
++       X/Open Curses  specifies  that  portable  applications  must  not  call
+        initscr more than once.
+ 
+-       o   The portable way to use initscr is  once  only,  using  refresh  to
++       o   The  portable  way  to  use  initscr is once only, using refresh to
+            restore the screen after endwin.
+ 
+        o   ncurses permits use of initscr after endwin.
+ 
+-       initscr  in  BSD,  from  its inception (1980) through the Net/2 release
+-       (1991) returned ERR cast to a WINDOW pointer when detecting  an  error.
+-       4.4BSD  (1995)  instead  returned  a  null pointer.  Neither exited the
+-       application.  It is safe but redundant to check  the  return  value  of
++       initscr in BSD, from its inception (1980)  through  the  Net/2  release
++       (1991)  returned  ERR cast to a WINDOW pointer when detecting an error.
++       4.4BSD (1995) instead returned a  null  pointer.   Neither  exited  the
++       application.   It  is  safe  but redundant to check the return value of
+        initscr in X/Open Curses.
+ 
+-       Calling  endwin  does not dispose of the memory allocated by initscr or
++       Calling endwin does not dispose of the memory allocated by  initscr  or
+        newterm.  Deleting a SCREEN provides a way to do this.
+ 
+-       o   X/Open Curses does not say what happens to WINDOWs  when  delscreen
+-           "frees  storage  associated  with  the  SCREEN"  nor  does the SVr4
++       o   X/Open  Curses  does not say what happens to WINDOWs when delscreen
++           "frees storage associated  with  the  SCREEN"  nor  does  the  SVr4
+            documentation help, adding that it should be called after endwin if
+            a SCREEN is no longer needed.
+ 
+-       o   However,  WINDOWs are implicitly associated with a SCREEN, so it is
++       o   However, WINDOWs are implicitly associated with a SCREEN, so it  is
+            reasonable to expect delscreen to dispose of them.
+ 
+-       o   SVr4 deletes the standard WINDOW structures stdscr  and  curscr  as
++       o   SVr4  deletes  the  standard WINDOW structures stdscr and curscr as
+            well as a work area newscr.  It ignores other windows.
+ 
+-       o   Since  version  4.0  (1996),  ncurses  has maintained a list of all
+-           windows for each screen, using that  information  to  delete  those
++       o   Since version 4.0 (1996), ncurses has  maintained  a  list  of  all
++           windows  for  each  screen,  using that information to delete those
+            windows when delscreen is called.
+ 
+-       o   NetBSD  copied  this  feature of ncurses in 2001.  PDCurses follows
++       o   NetBSD copied this feature of ncurses in  2001.   PDCurses  follows
+            the SVr4 model, deleting only the standard WINDOW structures.
+ 
+ 
+ 
                                                                                                                                                          High-level versus Low-level
                                                                                                                                                          +-       Different implementations may disagree  regarding  the  level  of  some
+-       functions.   For  example,  SCREEN  (returned  by newterm) and TERMINAL
+-       (returned by  setupterm(3x))  hold  file  descriptors  for  the  output
++       Different  implementations  may  disagree  regarding  the level of some
++       functions.  For example, SCREEN  (returned  by  newterm)  and  TERMINAL
++       (returned  by  setupterm(3x))  hold  file  descriptors  for  the output
+        stream.  If an application switches screens using set_term, or switches
+        terminals using set_curterm(3x), applications which use the output file
+-       descriptor  can  have  different  behavior depending on which structure
++       descriptor can have different behavior  depending  on  which  structure
+        holds the corresponding descriptor.
+ 
+-       o   NetBSD's  baudrate  function  uses  the  descriptor  in   TERMINAL.
++       o   NetBSD's   baudrate  function  uses  the  descriptor  in  TERMINAL.
+            ncurses and SVr4 use the descriptor in SCREEN.
+ 
+-       o   NetBSD  and ncurses use the descriptor in TERMINAL for terminal I/O
+-           modes, e.g., def_shell_mode(3x), def_prog_mode(3x).  SVr4 uses  the
++       o   NetBSD and ncurses use the descriptor in TERMINAL for terminal  I/O
++           modes,  e.g., def_shell_mode(3x), def_prog_mode(3x).  SVr4 uses the
+            descriptor in SCREEN.
+ 
+    Unset TERM Environment Variable
+-       If  the  TERM  variable  is  not set in the environment or has an empty
+-       value, initscr uses the value "unknown", which normally corresponds  to
++       If the TERM variable is not set in the  environment  or  has  an  empty
++       value,  initscr uses the value "unknown", which normally corresponds to
+        a terminal entry with the generic (gn) capability.  Generic entries are
+        detected by setupterm(3x) and cannot be used for full-screen operation.
+-       Other  implementations  may  handle  a  missing  or empty TERM variable
++       Other implementations may handle  a  missing  or  empty  TERM  variable
+        differently.
+ 
+ 
+ 
                                                                                                                                                          Signal Handlers
                                                                                                                                                          +        Quoting X/Open Curses Issue 7, section 3.1.1:
+ 
+-            Curses implementations may provide for  special  handling  of  the
+-            SIGINT,  SIGQUIT,  and  SIGTSTP  signals  if  their disposition is
++            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...
+ 
+-            Any special handling for these signals may remain  in  effect  for
++            Any  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.
+ 
+-            None of the Curses functions are required to be safe with  respect
++            None  of the Curses functions are required to be safe with respect
+             to signals...
+ 
+        Section "NOTES" above discusses ncurses's signal handlers.
+@@ -332,12 +333,12 @@
+ 
+ 
+ 
                                                                                                                                                          SEE ALSO
                                                                                                                                                          +-       curses(3x),     curs_kernel(3x),     curs_refresh(3x),    curs_slk(3x),
++       curses(3x),    curs_kernel(3x),     curs_refresh(3x),     curs_slk(3x),
+        curs_terminfo(3x), curs_util(3x), curs_variables(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-01                  curs_initscr(3x)
++ncurses 6.5                       2025-03-08                  curs_initscr(3x)
+ 
                                                                                                                                                          
+ 
                                                                                                                                                          
+ 
                                                                                                                                                            
+Index: doc/html/man/curs_inopts.3x.html
+--- ncurses-6.5-20250301+/doc/html/man/curs_inopts.3x.html	2025-03-01 22:03:51.000000000 +0000
++++ ncurses-6.5-20250308/doc/html/man/curs_inopts.3x.html	2025-03-09 00:55:54.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inopts.3x,v 1.96 2025/03/01 21:23:21 tom Exp @
++  * @Id: curs_inopts.3x,v 1.100 2025/03/08 23:09:30 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inopts 3x 2025-03-01 ncurses 6.5 Library calls
++curs_inopts 3x 2025-03-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                            curs_inopts 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                            
++
                                                                                                                                                            curs_inopts 3x 2025-03-08 ncurses 6.5 Library calls
                                                                                                                                                            
+ 
                                                                                                                                                            + curs_inopts(3x)                  Library calls                 curs_inopts(3x)
+ 
+@@ -153,15 +153,19 @@
+ 
+ 
                                                                                                                                                            keypad
                                                                                                                                                            +        keypad enables recognition of a terminal's function keys.   If  enabled
+-       (bf  is  TRUE),  the  input  character reading function returns a value
+-       representing the function key, such as KEY_LEFT.   (Wide-character  API
+-       users:  wget_wch(3x)  returns KEY_CODE_YES to indicate the availability
+-       of a function key code in its  wch  parameter.)   If  disabled  (bf  is
+-       FALSE),  curses  does not treat function keys specially and the program
+-       has to interpret escape sequences itself.  If the terminal's keypad can
+-       be  turned on (made to transmit) and off (made to work locally), keypad
+-       configures it consistently  with  the  bf  parameter.   By  default,  a
+-       window's keypad mode is off.
++       (bf  is  TRUE) then when an input character reading function reads ESC,
++       it waits for further input corresponding to an escape sequence  defined
++       by  the terminal type description.  If a valid sequence is entered, the
++       input character reading  function  returns  a  value  representing  the
++       function   key,   such   as   KEY_LEFT.    (Wide-character  API  users:
++       wget_wch(3x) returns KEY_CODE_YES to indicate  the  availability  of  a
++       function  key  code in its wch parameter.)  If the sequence is invalid,
++       the input character reading function returns only its  last  character.
++       If  disabled  (bf  is  FALSE),  curses  does  not  treat  function keys
++       specially and the program has to interpret escape sequences itself.  If
++       the terminal's keypad can be turned on (made to transmit) and off (made
++       to work  locally),  keypad  configures  it  consistently  with  the  bf
++       parameter.  By default, a window's keypad mode is off.
+ 
+ 
+ 
                                                                                                                                                            meta
                                                                                                                                                            +@@ -198,8 +202,10 @@
+        sets  a  timer  while  waiting  for the next character.  notimeout(win,
+        TRUE)  disables  this  timer.   The  purpose  of  the  timeout  is   to
+        distinguish  sequences produced by a function key from those typed by a
+-       user.  To configure the timeout rather than disabling it, see  wtimeout
+-       below.
++       user.  If this timer is disabled, curses waits forever  for  subsequent
++       keystrokes  until  it  determines  the  escape  sequence to be valid or
++       invalid.  To configure the timeout duration rather than  disabling  it,
++       see wtimeout below.
+ 
+ 
+ 
                                                                                                                                                            qiflush, noqiflush
                                                                                                                                                            +@@ -243,8 +249,8 @@
+ 
+ 
                                                                                                                                                            typeahead
                                                                                                                                                            +        Normally, a curses library checks the terminal's input file  descriptor
+-       for  pending input with poll(2) or select(2) while updating the screen;
+-       if it finds any, it postpones output until  the  next  wrefresh(3x)  or
++       for activity with poll(2) or select(2) while updating the screen; if it
++       finds  any,  it  postpones  output  until  the  next  wrefresh(3x)   or
+        doupdate(3x)  call,  allowing faster response to user key strokes.  The
+        library tests the file descriptor  corresponding  to  the  FILE  stream
+        pointer passed to newterm(3x) (or stdin if initscr(3x) was called), for
+@@ -285,15 +291,17 @@
+ 
+        curses  documentation  uses  the  terms "delay" and "timeout" freely to
+        describe two related but distinct aspects of  input  handling,  at  the
+-       risk   of  confusing  the  user.   The  functions  halfdelay,  nodelay,
+-       notimeout, timeout,  and  wtimeout  all  configure  whether  the  input
+-       character   reading  function  (getch(3x)  or  get_wch(3x))  waits  for
+-       keyboard input, and for how long.  Only keypad configures whether  that
+-       function  waits  for  further  input if the first character it reads is
+-       ESC.  X/Open Curses affords no means of configuring the length of  this
+-       second  delay, but an AIX and ncurses extension, ESCDELAY, is available
+-       both as an environment variable and  a  global  symbol  permitting  the
+-       application to do so; see ncurses(3x) and curs_variables(3x).
++       risk of confusing the user.  The functions halfdelay, nodelay, timeout,
++       and wtimeout configure whether the  input  character  reading  function
++       (getch(3x)  or  get_wch(3x)) waits for keyboard input to begin, and for
++       how long.  keypad configures whether that function  waits  for  further
++       input if the first character it reads is ESC.  Calling notimeout, which
++       has nothing to do  with  timeout  or  wtimeout,  makes  this  delay  in
++       expectation  of further keystrokes effectively infinite.  X/Open Curses
++       affords no means of otherwise configuring the  length  of  this  second
++       delay, but an AIX and ncurses extension, ESCDELAY, is available both as
++       an environment variable and a global symbol permitting the  application
++       to do so; see ncurses(3x) and curs_variables(3x).
+ 
+ 
+ 
                                                                                                                                                            EXTENSIONS
                                                                                                                                                            +@@ -401,7 +409,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-01                   curs_inopts(3x)
++ncurses 6.5                       2025-03-08                   curs_inopts(3x)
+ 
                                                                                                                                                            
+ 
                                                                                                                                                            
+ 
                                                                                                                                                              
+Index: doc/html/man/curs_ins_wch.3x.html
+--- ncurses-6.5-20250301+/doc/html/man/curs_ins_wch.3x.html	2025-03-01 22:03:51.000000000 +0000
++++ ncurses-6.5-20250308/doc/html/man/curs_ins_wch.3x.html	2025-03-09 00:55:54.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_ins_wch.3x,v 1.48 2025/03/01 21:25:47 tom Exp @
++  * @Id: curs_ins_wch.3x,v 1.50 2025/03/08 23:10:02 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_ins_wch 3x 2025-03-01 ncurses 6.5 Library calls
++curs_ins_wch 3x 2025-03-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                              curs_ins_wch 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                              
++
                                                                                                                                                              curs_ins_wch 3x 2025-03-08 ncurses 6.5 Library calls
                                                                                                                                                              
+ 
                                                                                                                                                              + curs_ins_wch(3x)                 Library calls                curs_ins_wch(3x)
+ 
+@@ -75,7 +75,7 @@
+ 
+        In ncurses, they return ERR if
+ 
+-       o   the curses screen has not been initialized, and
++       o   the curses screen has not been initialized, or
+ 
+        o   (for  functions  taking  a  WINDOW  pointer argument) win is a null
+            pointer.
+@@ -113,7 +113,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-01                  curs_ins_wch(3x)
++ncurses 6.5                       2025-03-08                  curs_ins_wch(3x)
+ 
                                                                                                                                                              
+ 
                                                                                                                                                              
+ 
                                                                                                                                                                
+Index: doc/html/man/curs_insch.3x.html
+--- ncurses-6.5-20250301+/doc/html/man/curs_insch.3x.html	2025-03-01 22:03:51.000000000 +0000
++++ ncurses-6.5-20250308/doc/html/man/curs_insch.3x.html	2025-03-09 00:55:54.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_insch.3x,v 1.54 2025/03/01 21:26:42 tom Exp @
++  * @Id: curs_insch.3x,v 1.56 2025/03/08 23:10:02 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_insch 3x 2025-03-01 ncurses 6.5 Library calls
++curs_insch 3x 2025-03-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                curs_insch 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                                
++
                                                                                                                                                                curs_insch 3x 2025-03-08 ncurses 6.5 Library calls
                                                                                                                                                                
+ 
                                                                                                                                                                + curs_insch(3x)                   Library calls                  curs_insch(3x)
+ 
+@@ -73,7 +73,7 @@
+ 
+        In ncurses, they return ERR if
+ 
+-       o   the curses screen has not been initialized, and
++       o   the curses screen has not been initialized, or
+ 
+        o   (for functions taking a WINDOW pointer  argument)  win  is  a  null
+            pointer.
+@@ -109,7 +109,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-01                    curs_insch(3x)
++ncurses 6.5                       2025-03-08                    curs_insch(3x)
+ 
                                                                                                                                                                
+ 
                                                                                                                                                                
+ 
                                                                                                                                                                  
+Index: doc/html/man/curs_kernel.3x.html
+--- ncurses-6.5-20250301+/doc/html/man/curs_kernel.3x.html	2025-03-01 22:03:51.000000000 +0000
++++ ncurses-6.5-20250308/doc/html/man/curs_kernel.3x.html	2025-03-09 00:55:54.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_kernel.3x,v 1.80 2025/03/01 21:31:35 tom Exp @
++  * @Id: curs_kernel.3x,v 1.84 2025/03/08 23:17:33 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_kernel 3x 2025-03-01 ncurses 6.5 Library calls
++curs_kernel 3x 2025-03-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                  curs_kernel 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                                  
++
                                                                                                                                                                  curs_kernel 3x 2025-03-08 ncurses 6.5 Library calls
                                                                                                                                                                  
+ 
                                                                                                                                                                  + curs_kernel(3x)                  Library calls                 curs_kernel(3x)
+ 
+@@ -155,14 +155,14 @@
+ 
                                                                                                                                                                  ripoffline
                                                                                                                                                                  +        ripoffline provides access to the same facility that slk_init(3x)  uses
+        to reduce the size of the screen.  The application must call ripoffline
+-       before initscr(3x) or newterm(3x)  so  that  the  functions  prepare  a
+-       stdscr of the correct size.
++       before initscr(3x) or newterm(3x) so that the latter functions  prepare
++       a stdscr of the correct size.
+ 
+-       o   If  line  is  positive,  ripoffline  removes a line from the top of
+-           stdscr.
++       o   If line is positive, ripoffline removes a line from the top of what
++           will become stdscr.
+ 
+        o   If line is negative, ripoffline removes a line from the  bottom  of
+-           stdscr.
++           what will become stdscr.
+ 
+        When initscr initializes curses, it calls the init function supplied to
+        ripoffline by the application with two arguments:
+@@ -212,6 +212,16 @@
+        There is no way for ncurses to determine the initial cursor  visibility
+        to restore it.
+ 
++       While  the init function called by ripoffline is specified to return an
++       int, ncurses pays no attention to its return value.
++
++       If ripoffline cannot allocate memory for the required WINDOW  structure
++       backing  the  ripped-off  line,  it stores a null pointer to the WINDOW
++       pointer  argument  supplied  by  the  init  function  the   application
++       specifies.  The application must check this argument for validity after
++       calling initscr and prior  to  performing  curses  operations  on  that
++       window.
++
+ 
+ 
                                                                                                                                                                  EXTENSIONS
                                                                                                                                                                  +        In  ncurses, mvcur accepts -1 for either or both old coordinates.  This
+@@ -267,7 +277,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-01                   curs_kernel(3x)
++ncurses 6.5                       2025-03-08                   curs_kernel(3x)
+ 
                                                                                                                                                                  
+ 
                                                                                                                                                                  
+ 
                                                                                                                                                                    
+Index: doc/html/man/curs_move.3x.html
+--- ncurses-6.5-20250301+/doc/html/man/curs_move.3x.html	2025-03-01 22:03:51.000000000 +0000
++++ ncurses-6.5-20250308/doc/html/man/curs_move.3x.html	2025-03-09 00:55:54.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_move.3x,v 1.59 2025/03/01 21:34:10 tom Exp @
++  * @Id: curs_move.3x,v 1.61 2025/03/08 23:18:46 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_move 3x 2025-03-01 ncurses 6.5 Library calls
++curs_move 3x 2025-03-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                    curs_move 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                                    
++
                                                                                                                                                                    curs_move 3x 2025-03-08 ncurses 6.5 Library calls
                                                                                                                                                                    
+ 
                                                                                                                                                                    + curs_move(3x)                    Library calls                   curs_move(3x)
+ 
+@@ -86,7 +86,7 @@
+ 
+ 
+ 
                                                                                                                                                                    HISTORY
                                                                                                                                                                    +-       4BSD (1980) introduced move and wmove.
++       4BSD (1980) introduced these functions.
+ 
+ 
+ 
                                                                                                                                                                    SEE ALSO
                                                                                                                                                                    +@@ -94,7 +94,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-01                     curs_move(3x)
++ncurses 6.5                       2025-03-08                     curs_move(3x)
+ 
                                                                                                                                                                    
+ 
                                                                                                                                                                    
+ 
                                                                                                                                                                      
+Index: doc/html/man/curs_outopts.3x.html
+--- ncurses-6.5-20250301+/doc/html/man/curs_outopts.3x.html	2025-03-01 22:03:51.000000000 +0000
++++ ncurses-6.5-20250308/doc/html/man/curs_outopts.3x.html	2025-03-09 00:55:54.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_outopts.3x,v 1.89 2025/03/01 21:42:22 tom Exp @
++  * @Id: curs_outopts.3x,v 1.91 2025/03/08 23:19:30 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_outopts 3x 2025-03-01 ncurses 6.5 Library calls
++curs_outopts 3x 2025-03-08 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                      curs_outopts 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                                      
++
                                                                                                                                                                      curs_outopts 3x 2025-03-08 ncurses 6.5 Library calls
                                                                                                                                                                      
+ 
                                                                                                                                                                      + curs_outopts(3x)                 Library calls                curs_outopts(3x)
+ 
+@@ -100,66 +100,67 @@
+ 
+ 
+ 
                                                                                                                                                                      immedok
                                                                                                                                                                      +-       If immedok is called with TRUE as second argument, any  change  in  the
+-       window  image,  such  as  the  ones caused by waddch, wclrtobot, wscrl,
+-       etc., automatically causes a call to wrefresh.  However, it may degrade
+-       performance  considerably,  due to repeated calls to wrefresh.  Calling
+-       immedok with FALSE as second argument restores  the  default  behavior,
+-       i.e., deferring screen updates until a refresh is needed.
++       If immedok is called with TRUE  as  second  argument,  changes  to  the
++       window  image,  such  as  those  caused by waddch, wclrtobot, or wscrl,
++       automatically cause a call to wrefresh.  However, doing so may  degrade
++       performance  considerably  when many such calls occur.  Calling immedok
++       with FALSE as second argument restores the default behavior,  deferring
++       screen  updates until a refresh is needed or explicitly directed by the
++       application.
+ 
+ 
+ 
                                                                                                                                                                      leaveok
                                                                                                                                                                      +-       Normally,  the  hardware  cursor  is left at the location of the window
+-       cursor being refreshed.  The leaveok 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
++       Normally, the hardware cursor is left at the  location  of  the  window
++       cursor  being  refreshed.   The  leaveok 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.
+ 
+ 
+ 
                                                                                                                                                                      scrollok
                                                                                                                                                                      +-       The  scrollok  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, (bf is FALSE), the cursor  is
+-       left  on  the  bottom  line.   If  enabled, (bf is TRUE), the window is
++       The scrollok 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, (bf is FALSE), the cursor is
++       left on the bottom line.  If enabled,  (bf  is  TRUE),  the  window  is
+        scrolled up one line (Note that to get the physical scrolling effect on
+        the terminal, it is also necessary to call idlok).
+ 
+ 
+ 
                                                                                                                                                                      setscrreg, wsetscrreg
                                                                                                                                                                      +-       The  setscrreg and wsetscrreg routines allow the application programmer
+-       to set a software scrolling region  in  a  window.   The  top  and  bot
+-       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  scrollok  are  enabled,  an attempt to move off the bottom
++       The setscrreg and wsetscrreg routines allow the application  programmer
++       to  set  a  software  scrolling  region  in  a window.  The top and bot
++       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 scrollok 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
++       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 idlok is enabled and the terminal has either a scrolling  region  or
++       scrolling region capability in the terminal, like that  in  the  VT100.
++       If  idlok  is enabled and the terminal has either a scrolling region or
+        insert/delete line capability, they will probably be used by the output
+        routines.)
+ 
+ 
+ 
                                                                                                                                                                      RETURN VALUE
                                                                                                                                                                      +-       The functions setscrreg and wsetscrreg return OK upon success  and  ERR
+-       upon  failure.  All other routines that return an integer always return
++       The  functions  setscrreg and wsetscrreg return OK upon success and ERR
++       upon failure.  All other routines that return an integer always  return
+        OK.
+ 
+        In this implementation,
+ 
+-       o   those functions that have a window pointer will return ERR  if  the
++       o   those  functions  that have a window pointer will return ERR if the
+            window pointer is null
+ 
+-       o   wsetscrreg  returns  ERR  if  the  scrolling  region  limits extend
++       o   wsetscrreg returns  ERR  if  the  scrolling  region  limits  extend
+            outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                                      NOTES
                                                                                                                                                                      +-       clearok, leaveok, scrollok, idcok, and setscrreg may be implemented  as
++       clearok,  leaveok, scrollok, idcok, and setscrreg may be implemented as
+        macros.
+ 
+-       The  immedok  routine  is  useful for windows that are used as terminal
++       The immedok routine is useful for windows that  are  used  as  terminal
+        emulators.
+ 
+ 
+@@ -167,13 +168,13 @@
+        X/Open Curses Issue 4 describes these functions.  It specifies no error
+        conditions for them.
+ 
+-       Some  historic  curses implementations, as an undocumented feature, did
+-       the  equivalent  of  "clearok(...,   1)"   when   touchwin(stdstr)   or
++       Some historic curses implementations, as an undocumented  feature,  did
++       the   equivalent   of   "clearok(...,   1)"  when  touchwin(stdstr)  or
+        clear(stdstr) were used.  This trick does not work with ncurses.
+ 
+-       Early  System V  curses  implementations  specified  that with scrollok
+-       enabled, any window modification triggering  a  scroll  also  forced  a
+-       physical  refresh.   X/Open  Curses  does not require this, and ncurses
++       Early System V curses  implementations  specified  that  with  scrollok
++       enabled,  any  window  modification  triggering  a scroll also forced a
++       physical refresh.  X/Open Curses does not  require  this,  and  ncurses
+        avoids doing so to better optimize vertical motions upon a wrefresh.
+ 
+        X/Open Curses does not mention that the cursor should be made invisible
+@@ -188,17 +189,17 @@
+ 
+        SVr3.1 (1987) implemented idcok and immedok.
+ 
+-       ncurses formerly treated nl and nonl as both input and output  options,
++       ncurses  formerly treated nl and nonl as both input and output options,
+        but no longer; see curs_inopts(3x).
+ 
+ 
+ 
                                                                                                                                                                      SEE ALSO
                                                                                                                                                                      +-       curses(3x),     curs_addch(3x),    curs_clear(3x),    curs_initscr(3x),
++       curses(3x),    curs_addch(3x),    curs_clear(3x),     curs_initscr(3x),
+        curs_refresh(3x), curs_scroll(3x), curs_variables(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-01                  curs_outopts(3x)
++ncurses 6.5                       2025-03-08                  curs_outopts(3x)
+ 
                                                                                                                                                                      
+ 
                                                                                                                                                                      
+ 
                                                                                                                                                                        
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.5-20250301+/doc/html/man/ncurses.3x.html	2025-03-01 22:03:53.000000000 +0000
++++ ncurses-6.5-20250308/doc/html/man/ncurses.3x.html	2025-03-09 00:47:46.000000000 +0000
+@@ -61,7 +61,7 @@
+        displays  with  output  optimized  to minimize screen updates.  ncurses
+        replaces the curses libraries from System V Release 4 Unix ("SVr4") and
+        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
+-       document describes ncurses version 6.5 (patch 20250301).
++       document describes ncurses version 6.5 (patch 20250308).
+ 
+        ncurses permits control of the terminal screen's contents;  abstraction
+        and  subdivision thereof with windows and pads; acquisition of keyboard
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.5-20250301+/doc/html/man/terminfo.5.html	2025-02-23 14:05:32.000000000 +0000
++++ ncurses-6.5-20250308/doc/html/man/terminfo.5.html	2025-03-09 00:47:46.000000000 +0000
+@@ -71,7 +71,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This document describes ncurses version 6.5 (patch 20250301).
++       This document describes ncurses version 6.5 (patch 20250308).
+ 
+ 
+ 
                                                                                                                                                    terminfo Entry Syntax
                                                                                                                                                    +Index: include/curses.h.in
+Prereq:  1.290 
+--- ncurses-6.5-20250301+/include/curses.h.in	2025-02-23 01:33:32.000000000 +0000
++++ ncurses-6.5-20250308/include/curses.h.in	2025-02-23 01:33:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -33,7 +33,7 @@
+  *     and: Thomas E. Dickey                        1996-on                 *
+  ****************************************************************************/
+ 
+-/* $Id: curses.h.in,v 1.290 2025/02/23 01:33:32 tom Exp $ */
++/* $Id: curses.h.in,v 1.291 2025/02/23 01:33:32 tom Exp $ */
+ 
+ #ifndef __NCURSES_H
+ #define __NCURSES_H
+Index: include/nc_win32.h
+Prereq:  1.15 
+--- ncurses-6.5-20250301+/include/nc_win32.h	2025-03-01 13:13:33.000000000 +0000
++++ ncurses-6.5-20250308/include/nc_win32.h	2025-03-08 14:21:17.000000000 +0000
+@@ -31,7 +31,7 @@
+  * Author: Thomas Dickey, 2008-on                                           *
+  ****************************************************************************/
+ 
+-/* $Id: nc_win32.h,v 1.15 2025/03/01 13:13:33 tom Exp $ */
++/* $Id: nc_win32.h,v 1.16 2025/03/08 14:21:17 tom Exp $ */
+ 
+ #ifndef NC_WIN32_H
+ #define NC_WIN32_H 1
+@@ -100,7 +100,7 @@
+ extern NCURSES_EXPORT(int)    _nc_console_isatty(int fd);
+ extern NCURSES_EXPORT(int)    _nc_console_test(int fd);
+ extern NCURSES_EXPORT(int)    _nc_console_read(SCREEN *sp,HANDLE hdl,int *buf);
+-extern NCURSES_EXPORT(int)    _nc_console_twait(SCREEN *, HANDLE,int,int,int * EVENTLIST_2nd(_nc_eventlist * evl));
++extern NCURSES_EXPORT(int)    _nc_console_twait(const SCREEN *sp, HANDLE hdl,int mode,int msec,int *left EVENTLIST_2nd(_nc_eventlist * evl));
+ extern NCURSES_EXPORT(WORD)   _nc_console_MapColor(bool fore, int color);
+ extern NCURSES_EXPORT(void)   _nc_console_selectActiveHandle(void);
+ extern NCURSES_EXPORT(bool)   _nc_console_get_SBI(void);
+Index: man/curs_add_wch.3x
+Prereq:  1.108 
+--- ncurses-6.5-20250301+/man/curs_add_wch.3x	2025-03-01 21:16:45.000000000 +0000
++++ ncurses-6.5-20250308/man/curs_add_wch.3x	2025-03-08 23:01:20.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_add_wch.3x,v 1.108 2025/03/01 21:16:45 tom Exp $
+-.TH curs_add_wch 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_add_wch.3x,v 1.110 2025/03/08 23:01:20 tom Exp $
++.TH curs_add_wch 3X 2025-03-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -185,6 +185,7 @@
+ when advancement occurs at the right margin,
+ and \fB\%scrollok\fP(3X) is enabled for
+ .IR win ,
++the cursor wraps as above and
+ the scrolling region scrolls up one line.
+ Otherwise,
+ advancement and scrolling do not occur,
+@@ -192,8 +193,9 @@
+ .B \%waddch
+ returns
+ .BR ERR "."
+-.\" Do we need to say something here about buggy terminals that might
+-.\" scroll anyway?  xterm works fine...
++.\" Does writing to the bottom-right character cell of the screen work
++.\" when `scrollok()` is disabled and the terminal lacks `ich` and
++.\" `ich1` capabilities?
+ .PP
+ If
+ .I wch
+Index: man/curs_addch.3x
+Prereq:  1.128 
+--- ncurses-6.5-20250301+/man/curs_addch.3x	2025-03-01 21:16:45.000000000 +0000
++++ ncurses-6.5-20250308/man/curs_addch.3x	2025-03-08 23:01:20.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addch.3x,v 1.128 2025/03/01 21:16:45 tom Exp $
+-.TH curs_addch 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addch.3x,v 1.130 2025/03/08 23:01:20 tom Exp $
++.TH curs_addch 3X 2025-03-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -138,6 +138,7 @@
+ when advancement occurs at the right margin,
+ and \fB\%scrollok\fP(3X) is enabled for
+ .IR win ,
++the cursor wraps as above and
+ the scrolling region scrolls up one line.
+ Otherwise,
+ advancement and scrolling do not occur,
+@@ -145,8 +146,9 @@
+ .B \%waddch
+ returns
+ .BR ERR "."
+-.\" Do we need to say something here about buggy terminals that might
+-.\" scroll anyway?  xterm works fine...
++.\" Does writing to the bottom-right character cell of the screen work
++.\" when `scrollok()` is disabled and the terminal lacks `ich` and
++.\" `ich1` capabilities?
+ .PP
+ If
+ .I ch
+Index: man/curs_initscr.3x
+Prereq:  1.95 
+--- ncurses-6.5-20250301+/man/curs_initscr.3x	2025-03-01 21:21:41.000000000 +0000
++++ ncurses-6.5-20250308/man/curs_initscr.3x	2025-03-08 23:07:43.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_initscr.3x,v 1.95 2025/03/01 21:21:41 tom Exp $
+-.TH curs_initscr 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_initscr.3x,v 1.100 2025/03/08 23:07:43 tom Exp $
++.TH curs_initscr 3X 2025-03-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -129,9 +129,7 @@
+ the
+ .I type
+ of the associated terminal,
+-or
+-.I NULL
+-to use the
++or a null pointer to use the
+ .I TERM
+ environment variable;
+ .bP
+@@ -275,12 +273,20 @@
+ structure
+ is no longer needed.
+ .SH RETURN VALUE
++.B \%delscreen
++returns no value.
+ .B \%endwin
+ returns
+ .B OK
+ on success and
+ .B ERR
+ on failure.
++.B \%isendwin
++returns
++.B TRUE
++or
++.B FALSE
++as described above.
+ .PP
+ In
+ .IR \%ncurses ","
+@@ -293,11 +299,10 @@
+ .bP
+ the terminal was not initialized,
+ .bP
+-.B \%endwin
+-is called more than once without updating the screen,
++it is called more than once without updating the screen,
+ or
+ .bP
+-\fB\%reset_shell_mode\fP(3X) returns
++its call of \fB\%reset_shell_mode\fP(3X) returns
+ .BR ERR "."
+ .RE
+ .bP
+@@ -306,16 +311,16 @@
+ .B ERR
+ if it cannot allocate storage for the
+ .I SCREEN
+-data structure
+-or the top-level windows thereof:
++structure
++or the
++.I WINDOW
++structures automatically associated with it:
+ .BR \%curscr ","
+ .BR \%newscr ","
+ and
+ .BR \%stdscr "."
+ .PP
+-Functions that return pointers return
+-.I NULL
+-on error.
++Functions that return pointers return null pointers on error.
+ In
+ .IR \%ncurses ","
+ .B \%set_term
+Index: man/curs_inopts.3x
+Prereq:  1.96 
+--- ncurses-6.5-20250301+/man/curs_inopts.3x	2025-03-01 21:23:21.000000000 +0000
++++ ncurses-6.5-20250308/man/curs_inopts.3x	2025-03-08 23:09:30.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inopts.3x,v 1.96 2025/03/01 21:23:21 tom Exp $
+-.TH curs_inopts 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inopts.3x,v 1.100 2025/03/08 23:09:30 tom Exp $
++.TH curs_inopts 3X 2025-03-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -260,9 +260,13 @@
+ enabled
+ .RI ( bf
+ is
+-.BR TRUE ),
+-the input character reading function returns a value representing
+-the function key,
++.BR TRUE ")"
++then when an input character reading function reads ESC,
++it waits for further input corresponding to an escape sequence
++defined by the terminal type description.
++If a valid sequence is entered,
++the input character reading function
++returns a value representing the function key,
+ such as
+ .BR KEY_LEFT "."
+ (Wide-character API users:
+@@ -271,6 +275,8 @@
+ to indicate the availability of a function key code in its
+ .I wch
+ parameter.)
++If the sequence is invalid,
++the input character reading function returns only its last character.
+ If disabled
+ .RI ( bf
+ is
+@@ -362,7 +368,11 @@
+ disables this timer.
+ The purpose of the timeout is to distinguish sequences produced by a
+ function key from those typed by a user.
+-To configure the timeout rather than disabling it,
++If this timer is disabled,
++.I curses
++waits forever for subsequent keystrokes
++until it determines the escape sequence to be valid or invalid.
++To configure the timeout duration rather than disabling it,
+ see
+ .B \%wtimeout
+ below.
+@@ -467,7 +477,7 @@
+ Normally,
+ a
+ .I curses
+-library checks the terminal's input file descriptor for pending input
++library checks the terminal's input file descriptor for activity
+ with \fIpoll\fP(2) or \fI\%select\fP(2)
+ while updating the screen;
+ if it finds any,
+@@ -598,19 +608,25 @@
+ The functions
+ .BR \%halfdelay ","
+ .BR \%nodelay ","
+-.BR \%notimeout ","
+ .BR \%timeout ","
+ and
+ .B \%wtimeout
+-all configure whether the input character reading function
++configure whether the input character reading function
+ \%(\fBgetch\fP(3X) or \fB\%get_wch\fP(3X))
+-waits for keyboard input,
++waits for keyboard input to begin,
+ and for how long.
+-Only
+ .B \%keypad
+ configures whether that function waits for further input
+ if the first character it reads is ESC.
+-X/Open Curses affords no means of configuring
++Calling
++.BR \%notimeout ","
++which has nothing to do with
++.B \%timeout
++or
++.BR \%wtimeout ","
++makes this delay in expectation of further keystrokes
++effectively infinite.
++X/Open Curses affords no means of otherwise configuring
+ the length of this second delay,
+ but an AIX and
+ .I \%ncurses
+Index: man/curs_ins_wch.3x
+Prereq:  1.48 
+--- ncurses-6.5-20250301+/man/curs_ins_wch.3x	2025-03-01 21:25:47.000000000 +0000
++++ ncurses-6.5-20250308/man/curs_ins_wch.3x	2025-03-08 23:10:02.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_ins_wch.3x,v 1.48 2025/03/01 21:25:47 tom Exp $
+-.TH curs_ins_wch 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_ins_wch.3x,v 1.50 2025/03/08 23:10:02 tom Exp $
++.TH curs_ins_wch 3X 2025-03-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -91,7 +91,7 @@
+ the
+ .I curses
+ screen has not been initialized,
+-and
++or
+ .bP
+ (for functions taking a
+ .I \%WINDOW
+Index: man/curs_insch.3x
+Prereq:  1.54 
+--- ncurses-6.5-20250301+/man/curs_insch.3x	2025-03-01 21:26:42.000000000 +0000
++++ ncurses-6.5-20250308/man/curs_insch.3x	2025-03-08 23:10:02.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_insch.3x,v 1.54 2025/03/01 21:26:42 tom Exp $
+-.TH curs_insch 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_insch.3x,v 1.56 2025/03/08 23:10:02 tom Exp $
++.TH curs_insch 3X 2025-03-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -90,7 +90,7 @@
+ the
+ .I curses
+ screen has not been initialized,
+-and
++or
+ .bP
+ (for functions taking a
+ .I \%WINDOW
+Index: man/curs_kernel.3x
+Prereq:  1.80 
+--- ncurses-6.5-20250301+/man/curs_kernel.3x	2025-03-01 21:31:35.000000000 +0000
++++ ncurses-6.5-20250308/man/curs_kernel.3x	2025-03-08 23:17:33.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_kernel.3x,v 1.80 2025/03/01 21:31:35 tom Exp $
+-.TH curs_kernel 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_kernel.3x,v 1.84 2025/03/08 23:17:33 tom Exp $
++.TH curs_kernel 3X 2025-03-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -235,7 +235,7 @@
+ The application must call
+ .B \%ripoffline
+ before \fB\%initscr\fP(3X) or \fB\%newterm\fP(3X)
+-so that the functions prepare a
++so that the latter functions prepare a
+ .B \%stdscr
+ of the correct size.
+ .bP
+@@ -243,14 +243,14 @@
+ .I line
+ is positive,
+ .B \%ripoffline
+-removes a line from the top of
++removes a line from the top of what will become
+ .BR \%stdscr "."
+ .bP
+ If
+ .I line
+ is negative,
+ .B \%ripoffline
+-removes a line from the bottom of
++removes a line from the bottom of what will become
+ .BR \%stdscr "."
+ .PP
+ When
+@@ -354,6 +354,31 @@
+ There is no way for
+ .I \%ncurses
+ to determine the initial cursor visibility to restore it.
++.PP
++While the
++.I init
++function called by
++.B \%ripoffline
++is specified to return an
++.IR int ","
++.I \%ncurses
++pays no attention to its return value.
++.PP
++If
++.B \%ripoffline
++cannot allocate memory for the required
++.I \%WINDOW
++structure backing the ripped-off line,
++it stores a null pointer to the
++.I \%WINDOW
++pointer argument supplied by the
++.I init
++function the application specifies.
++The application must check this argument for validity after calling
++.B \%initscr
++and prior to performing
++.I curses
++operations on that window.
+ .SH EXTENSIONS
+ In
+ .IR \%ncurses ","
+Index: man/curs_move.3x
+Prereq:  1.59 
+--- ncurses-6.5-20250301+/man/curs_move.3x	2025-03-01 21:34:10.000000000 +0000
++++ ncurses-6.5-20250308/man/curs_move.3x	2025-03-08 23:18:46.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_move.3x,v 1.59 2025/03/01 21:34:10 tom Exp $
+-.TH curs_move 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_move.3x,v 1.61 2025/03/08 23:18:46 tom Exp $
++.TH curs_move 3X 2025-03-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -102,10 +102,7 @@
+ .IR ERR \*(''. \" Courier roman in source; SVID 4, vol. 3, p. 503
+ .SH HISTORY
+ 4BSD (1980)
+-introduced
+-.I move
+-and
+-.IR \%wmove "."
++introduced these functions.
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_refresh\fP(3X)
+Index: man/curs_outopts.3x
+Prereq:  1.89 
+--- ncurses-6.5-20250301+/man/curs_outopts.3x	2025-03-01 21:42:22.000000000 +0000
++++ ncurses-6.5-20250308/man/curs_outopts.3x	2025-03-08 23:19:30.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_outopts.3x,v 1.89 2025/03/01 21:42:22 tom Exp $
+-.TH curs_outopts 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_outopts.3x,v 1.91 2025/03/08 23:19:30 tom Exp $
++.TH curs_outopts 3X 2025-03-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -142,23 +142,25 @@
+ is called with
+ .B TRUE
+ as second argument,
+-any change in the window image,
+-such as the ones caused by
++changes to the window image,
++such as those caused by
+ .BR \%waddch ","
+ .BR \%wclrtobot ","
++or
+ .BR \%wscrl ","
+-etc., automatically causes a call to
+-.BR wrefresh "."
+-However, it may degrade performance considerably,
+-due to repeated calls to
++automatically cause a call to
+ .BR wrefresh "."
++However,
++doing so may degrade performance considerably
++when many such calls occur.
+ Calling
+ .B \%immedok
+ with
+ .B FALSE
+ as second argument
+ restores the default behavior,
+-i.e., deferring screen updates until a refresh is needed.
++deferring screen updates until a refresh is needed
++or explicitly directed by the application.
+ .SS leaveok
+ Normally, the hardware cursor is left at the location of the window cursor
+ being refreshed.
+Index: ncurses/base/lib_getch.c
+Prereq:  1.148 
+--- ncurses-6.5-20250301+/ncurses/base/lib_getch.c	2024-12-07 17:40:33.000000000 +0000
++++ ncurses-6.5-20250308/ncurses/base/lib_getch.c	2025-03-09 00:43:49.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -44,7 +44,7 @@
+ #define NEED_KEY_EVENT
+ #include 
+ 
+-MODULE_ID("$Id: lib_getch.c,v 1.148 2024/12/07 17:40:33 tom Exp $")
++MODULE_ID("$Id: lib_getch.c,v 1.150 2025/03/09 00:43:49 tom Exp $")
+ 
+ #include 
+ 
+@@ -513,7 +513,7 @@
+ 
+     recur_wrefresh(win);
+ 
+-    if (win->_notimeout || (win->_delay >= 0) || (IsCbreak(sp) > 1)) {
++    if ((win->_delay >= 0) || (IsCbreak(sp) > 1)) {
+ 	if (head == -1) {	/* fifo is empty */
+ 	    int delay;
+ 
+Index: ncurses/base/lib_initscr.c
+Prereq:  1.49 
+--- ncurses-6.5-20250301+/ncurses/base/lib_initscr.c	2024-12-07 20:00:48.000000000 +0000
++++ ncurses-6.5-20250308/ncurses/base/lib_initscr.c	2025-03-09 00:49:14.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -46,7 +46,7 @@
+ #include 		/* needed for ISC */
+ #endif
+ 
+-MODULE_ID("$Id: lib_initscr.c,v 1.49 2024/12/07 20:00:48 tom Exp $")
++MODULE_ID("$Id: lib_initscr.c,v 1.52 2025/03/09 00:49:14 tom Exp $")
+ 
+ NCURSES_EXPORT(WINDOW *)
+ initscr(void)
+@@ -70,7 +70,8 @@
+ 	(void) VALID_TERM_ENV(env, "unknown");
+ 
+ 	if ((name = strdup(env)) == NULL) {
+-	    fprintf(stderr, "Error opening allocating $TERM.\n");
++	    fprintf(stderr, "ncurses: cannot allocate %d bytes of"
++		    "memory for $TERM; exiting\n", (int) strlen(env));
+ 	    ExitProgram(EXIT_FAILURE);
+ 	}
+ #ifdef __CYGWIN__
+@@ -91,7 +92,8 @@
+ 	}
+ #endif
+ 	if (newterm(name, stdout, stdin) == NULL) {
+-	    fprintf(stderr, "Error opening terminal: %s.\n", name);
++	    fprintf(stderr, "ncurses: cannot initialize terminal type"
++		    " ($TERM=\"%s\"); exiting\n", name);
+ 	    ExitProgram(EXIT_FAILURE);
+ 	}
+ 
+Index: ncurses/tinfo/lib_win32con.c
+Prereq:  1.18 
+--- ncurses-6.5-20250301+/ncurses/tinfo/lib_win32con.c	2025-03-01 14:26:14.000000000 +0000
++++ ncurses-6.5-20250308/ncurses/tinfo/lib_win32con.c	2025-03-08 14:20:11.000000000 +0000
+@@ -38,7 +38,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_win32con.c,v 1.18 2025/03/01 14:26:14 tom Exp $")
++MODULE_ID("$Id: lib_win32con.c,v 1.19 2025/03/08 14:20:11 tom Exp $")
+ 
+ #if defined(_NC_WINDOWS)
+ 
+@@ -632,7 +632,7 @@
+                      RIGHTMOST_BUTTON_PRESSED)
+ 
+ static mmask_t
+-decode_mouse(SCREEN *sp, int mask)
++decode_mouse(const SCREEN *sp, int mask)
+ {
+     mmask_t result = 0;
+ 
+@@ -828,7 +828,7 @@
+ 
+ NCURSES_EXPORT(int)
+ _nc_console_twait(
+-		     SCREEN *sp,
++		     const SCREEN *sp,
+ 		     HANDLE hdl,
+ 		     int mode,
+ 		     int milliseconds,
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250301+/package/debian-mingw/changelog	2025-02-23 01:08:08.000000000 +0000
++++ ncurses-6.5-20250308/package/debian-mingw/changelog	2025-03-08 11:56:38.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250301) unstable; urgency=low
++ncurses6td (6.5+20250308) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 22 Feb 2025 20:08:08 -0500
++ -- Thomas E. Dickey   Sat, 08 Mar 2025 06:56:38 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250301+/package/debian-mingw64/changelog	2025-02-23 01:08:08.000000000 +0000
++++ ncurses-6.5-20250308/package/debian-mingw64/changelog	2025-03-08 11:56:38.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250301) unstable; urgency=low
++ncurses6td (6.5+20250308) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 22 Feb 2025 20:08:08 -0500
++ -- Thomas E. Dickey   Sat, 08 Mar 2025 06:56:38 -0500
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250301+/package/debian/changelog	2025-02-23 01:08:08.000000000 +0000
++++ ncurses-6.5-20250308/package/debian/changelog	2025-03-08 11:56:38.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250301) unstable; urgency=low
++ncurses6td (6.5+20250308) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 22 Feb 2025 20:08:08 -0500
++ -- Thomas E. Dickey   Sat, 08 Mar 2025 06:56:38 -0500
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.692 
+--- ncurses-6.5-20250301+/package/mingw-ncurses.nsi	2025-02-23 01:08:08.000000000 +0000
++++ ncurses-6.5-20250308/package/mingw-ncurses.nsi	2025-03-08 11:56:38.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.692 2025/02/23 01:08:08 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.693 2025/03/08 11:56:38 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0301"
++!define VERSION_MMDD  "0308"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250301+/package/mingw-ncurses.spec	2025-02-23 01:08:08.000000000 +0000
++++ ncurses-6.5-20250308/package/mingw-ncurses.spec	2025-03-08 11:56:38.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250301
++Release: 20250308
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20250301+/package/ncurses.spec	2025-02-23 01:08:08.000000000 +0000
++++ ncurses-6.5-20250308/package/ncurses.spec	2025-03-08 11:56:38.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250301
++Release: 20250308
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20250301+/package/ncursest.spec	2025-02-23 01:08:08.000000000 +0000
++++ ncurses-6.5-20250308/package/ncursest.spec	2025-03-08 11:56:38.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250301
++Release: 20250308
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250315.patch b/packages/ncurses/6.5/ncurses-6.5-20250315.patch
new file mode 100644
index 0000000000..1e49041a82
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250315.patch
@@ -0,0 +1,2230 @@
+# ncurses 6.5 - patch 20250315 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250315.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Mar 16 00:57:16 UTC 2025
+# ------------------------------------------------------------------------------
+# NEWS                                 |    5 
+# VERSION                              |    2 
+# dist.mk                              |    4 
+# doc/html/man/curs_add_wch.3x.html    |   90 +++++++-------
+# doc/html/man/curs_add_wchstr.3x.html |   29 ++--
+# doc/html/man/curs_addch.3x.html      |   54 ++++----
+# doc/html/man/curs_addchstr.3x.html   |   21 +--
+# doc/html/man/curs_addstr.3x.html     |   25 ++--
+# doc/html/man/curs_addwstr.3x.html    |   27 ++--
+# doc/html/man/curs_getch.3x.html      |  173 +++++++++++++++------------
+# doc/html/man/curs_initscr.3x.html    |   12 -
+# doc/html/man/curs_inopts.3x.html     |  206 ++++++++++++++++-----------------
+# doc/html/man/ncurses.3x.html         |    2 
+# doc/html/man/resizeterm.3x.html      |   16 +-
+# doc/html/man/terminfo.5.html         |    2 
+# man/curs_add_wch.3x                  |   47 +++----
+# man/curs_add_wchstr.3x               |   25 ++--
+# man/curs_addch.3x                    |   59 ++++-----
+# man/curs_addchstr.3x                 |   25 ++--
+# man/curs_addstr.3x                   |   23 ++-
+# man/curs_addwstr.3x                  |   23 ++-
+# man/curs_getch.3x                    |   77 ++++++++----
+# man/curs_initscr.3x                  |   10 -
+# man/curs_inopts.3x                   |   14 --
+# man/resizeterm.3x                    |   20 ++-
+# 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 
+# 32 files changed, 545 insertions(+), 468 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4259 
+--- ncurses-6.5-20250308+/NEWS	2025-03-09 00:39:13.000000000 +0000
++++ ncurses-6.5-20250315/NEWS	2025-03-15 23:56:46.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4259 2025/03/09 00:39:13 tom Exp $
++-- $Id: NEWS,v 1.4261 2025/03/15 23:56:46 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.
+ 
++20250315
++	+ improve formatting/style of manpages (patches by Branden Robinson).
++
+ 20250308
+ 	+ remove test in wgetch which applied notimeout to the initial read
+ 	  of a character (patch by Branden Robinson).
+Index: VERSION
+--- ncurses-6.5-20250308+/VERSION	2025-03-08 11:56:38.000000000 +0000
++++ ncurses-6.5-20250315/VERSION	2025-03-15 11:18:45.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250308
++5:0:10	6.5	20250315
+Index: dist.mk
+Prereq:  1.1659 
+--- ncurses-6.5-20250308+/dist.mk	2025-03-08 11:56:38.000000000 +0000
++++ ncurses-6.5-20250315/dist.mk	2025-03-15 11:18:45.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1659 2025/03/08 11:56:38 tom Exp $
++# $Id: dist.mk,v 1.1660 2025/03/15 11:18:45 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 = 5
+-NCURSES_PATCH = 20250308
++NCURSES_PATCH = 20250315
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/curs_add_wch.3x.html
+--- ncurses-6.5-20250308+/doc/html/man/curs_add_wch.3x.html	2025-03-09 00:55:53.000000000 +0000
++++ ncurses-6.5-20250315/doc/html/man/curs_add_wch.3x.html	2025-03-15 22:08:51.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_add_wch.3x,v 1.110 2025/03/08 23:01:20 tom Exp @
++  * @Id: curs_add_wch.3x,v 1.112 2025/03/15 20:38:41 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_add_wch 3x 2025-03-08 ncurses 6.5 Library calls
++curs_add_wch 3x 2025-03-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                    curs_add_wch 3x 2025-03-08 ncurses 6.5 Library calls
                                                                                                                                                    
++
                                                                                                                                                    curs_add_wch 3x 2025-03-15 ncurses 6.5 Library calls
                                                                                                                                                    
+ 
                                                                                                                                                    + curs_add_wch(3x)                 Library calls                curs_add_wch(3x)
+ 
+@@ -133,62 +133,62 @@
+        function.
+ 
+        Construct  a curses complex character from a wchar_t with setcchar(3x).
++       A cchar_t can be copied from  place  to  place  using  win_wch(3x)  and
++       wadd_wch.   See  curs_attr(3x)  for values of predefined constants that
++       can be usefully "or"ed with characters.  A complex character whose only
++       character  component  is  a  wide  space,  and  whose only attribute is
++       WA_NORMAL, is a  blank  character,  and  therefore  combines  with  the
++       window's background character; see curs_bkgrnd(3x).
++
+        Much behavior depends on whether the wide characters in wch are spacing
+        or non-spacing; see subsection "Complex Characters" below.
+ 
+-       o   If  wch  contains  a  spacing  character, then any character at the
+-           cursor is first removed.   The  complex  character  wch,  with  its
+-           attributes  and  color  pair  identifier,  becomes  the base of the
++       o   If wch contains a spacing character,  then  any  character  at  the
++           cursor  is  first  removed.   The  complex  character wch, with its
++           attributes and color pair  identifier,  becomes  the  base  of  the
+            active complex character.
+ 
+        o   If wch contains only non-spacing characters, they are combined with
+-           the  active  complex  character.  curses ignores its attributes and
++           the active complex character.  curses ignores  its  attributes  and
+            color pair identifier, and does not advance the cursor.
+ 
+-       Further non-spacing characters added with wadd_wch are not  written  at
+-       the  new  cursor position but combine with the active complex character
+-       until another spacing character is written to the window or the  cursor
++       Further  non-spacing  characters added with wadd_wch are not written at
++       the new cursor position but combine with the active  complex  character
++       until  another spacing character is written to the window or the cursor
+        is moved.
+ 
+-       If  the  cursor  is  not  at  the  bottom  of  the scrolling region and
+-       advancement occurs at the right margin, the cursor automatically  wraps
++       If the cursor is  not  at  the  bottom  of  the  scrolling  region  and
++       advancement  occurs at the right margin, the cursor automatically wraps
+        to the beginning of the next line.
+ 
+        If the cursor is at the bottom of the scrolling region when advancement
+-       occurs at the right margin, and scrollok(3x) is enabled  for  win,  the
+-       cursor  wraps  as  above  and the scrolling region scrolls up one line.
+-       Otherwise, advancement and scrolling do not occur, and  waddch  returns
++       occurs  at  the  right margin, and scrollok(3x) is enabled for win, the
++       cursor wraps as above and the scrolling region  scrolls  up  one  line.
++       Otherwise,  advancement  and scrolling do not occur, and waddch returns
+        ERR.
+ 
+-       If  wch  is a backspace, carriage return, line feed, or tab, the cursor
++       If wch is a backspace, carriage return, line feed, or tab,  the  cursor
+        moves appropriately within the window.
+ 
+-       o   Backspace moves the cursor one character left; at the  left  margin
++       o   Backspace  moves  the cursor one character left; at the left margin
+            of a window, it does nothing.
+ 
+-       o   Carriage  return  moves  the  cursor to the left margin on the same
++       o   Carriage return moves the cursor to the left  margin  on  the  same
+            line of the window.
+ 
+-       o   Line feed does a clrtoeol(3x), then advances as if from  the  right
++       o   Line  feed  does a clrtoeol(3x), then advances as if from the right
+            margin.
+ 
+-       o   Tab  advances the cursor to the next tab stop (possibly on the next
+-           line); these are placed at every eighth column by  default.   Alter
+-           the    tab    interval    with    the    TABSIZE   extension;   see
++       o   Tab advances the cursor to the next tab stop (possibly on the  next
++           line);  these  are placed at every eighth column by default.  Alter
++           the   tab   interval    with    the    TABSIZE    extension;    see
+            curs_variables(3x).
+ 
+-       If wch is any other nonprintable character, it is  drawn  in  printable
+-       form  using the same convention as wunctrl(3x).  Calling win_wch(3x) on
+-       the location of a nonprintable character does not return the  character
++       If  wch  is  any other nonprintable character, it is drawn in printable
++       form using the same convention as wunctrl(3x).  Calling win_wch(3x)  on
++       the  location of a nonprintable character does not return the character
+        itself, but its wunctrl(3x) representation.
+ 
+-       A  cchar_t  can  be  copied  from  place to place using win_wch(3x) and
+-       wadd_wch.  See curs_attr(3x) for values of  predefined  constants  that
+-       can be usefully "or"ed with characters.  A complex character whose only
+-       character component is a  wide  space,  and  whose  only  attribute  is
+-       WA_NORMAL,  is  a  blank  character,  and  therefore  combines with the
+-       background character; see curs_bkgrnd(3x).
+-
+ 
+ 
                                                                                                                                                    wecho_wchar
                                                                                                                                                    +        echo_wchar  and  wecho_wchar  are  equivalent  to  calling   (w)add_wch
+@@ -201,16 +201,16 @@
+ 
                                                                                                                                                    Forms-Drawing Characters
                                                                                                                                                    +        curses defines macros  starting  with  WACS_  that  can  be  used  with
+        wadd_wch  to  write  line-drawing  and  other  symbols  to  the screen.
+-       ncurses terms these forms-drawing characters.  The ACS  default  listed
+-       below  is  used  if  the  acs_chars (acsc) terminfo capability does not
+-       define a terminal-specific replacement for it, or if the terminal  type
+-       and locale configuration require Unicode to access these characters but
+-       the  library  is  unable  to  use  Unicode.   The  "acsc  char"  column
+-       corresponds to how the characters are specified in the acs_chars (acsc)
+-       string capability, and the characters in it may appear on the screen if
+-       the  terminal type's database entry incorrectly advertises ACS support.
+-       The name "ACS" originates in the Alternate Character Set feature of the
+-       DEC VT100 terminal.
++       ncurses terms these forms-drawing  characters.   curses  uses  the  ACS
++       default  listed  below  if the terminal type lacks the acs_chars (acsc)
++       capability; that capability does  not  define  a  replacement  for  the
++       character;  or  if  the  terminal type and locale configuration require
++       Unicode to access these characters, but the library is  unable  to  use
++       Unicode.   The "acsc char" column corresponds to how the characters are
++       specified in the acs_chars (acsc) string capability, and the characters
++       in  it  may  appear on the screen if the terminal type's database entry
++       incorrectly advertises ACS support.  The name "ACS" originates  in  the
++       Alternate Character Set feature of the DEC VT100 terminal.
+ 
+                        Unicode   ACS       acsc
+        Symbol          Default   Default   char   Glyph Name
+@@ -299,7 +299,7 @@
+ 
                                                                                                                                                    RETURN VALUE
                                                                                                                                                    +        These functions return OK on success and ERR on failure.
+ 
+-       In ncurses, they return ERR if
++       In ncurses, these functions fail if
+ 
+        o   the curses screen has not been initialized,
+ 
+@@ -325,7 +325,7 @@
+ 
                                                                                                                                                    EXTENSIONS
                                                                                                                                                    +        The   symbols  WACS_S3,  WACS_S7,  WACS_LEQUAL,  WACS_GEQUAL,  WACS_PI,
+        WACS_NEQUAL,  and  WACS_STERLING  are  not  standard.   However,   many
+-       publicly   available   terminfo   entries   include   acs_chars  (acsc)
++       publicly   available   terminfo   entries   include   acs_chars  (acsc)
+        capabilities in which their key characters (pryz{|}) are embedded,  and
+        a  second-hand  list of their character descriptions has come to light.
+        The ncurses developers invented WACS-prefixed names for them.
+@@ -450,7 +450,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-08                  curs_add_wch(3x)
++ncurses 6.5                       2025-03-15                  curs_add_wch(3x)
+ 
                                                                                                                                                    
+ 
                                                                                                                                                    
+ 
                                                                                                                                                      
+Index: doc/html/man/curs_add_wchstr.3x.html
+--- ncurses-6.5-20250308+/doc/html/man/curs_add_wchstr.3x.html	2025-02-02 00:43:56.000000000 +0000
++++ ncurses-6.5-20250315/doc/html/man/curs_add_wchstr.3x.html	2025-03-15 22:08:51.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_add_wchstr.3x,v 1.55 2025/02/01 22:57:57 tom Exp @
++  * @Id: curs_add_wchstr.3x,v 1.57 2025/03/15 20:41:04 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_add_wchstr 3x 2025-02-01 ncurses 6.5 Library calls
++curs_add_wchstr 3x 2025-03-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                      curs_add_wchstr 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                      
++
                                                                                                                                                      curs_add_wchstr 3x 2025-03-15 ncurses 6.5 Library calls
                                                                                                                                                      
+ 
                                                                                                                                                      + curs_add_wchstr(3x)              Library calls             curs_add_wchstr(3x)
+ 
+@@ -97,18 +97,21 @@
+ 
                                                                                                                                                      RETURN VALUE
                                                                                                                                                      +        These functions return OK on success and ERR on failure.
+ 
+-       In ncurses, they return ERR if
++       In ncurses, these functions fail if
+ 
+-       o   win is NULL or
++       o   the curses screen has not been initialized,
+ 
+-       o   wchstr is NULL.
++       o   wchstr is a null pointer, or
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
++       o   (for  functions  taking  a  WINDOW  pointer argument) win is a null
++           pointer.
++
++       Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                      NOTES
                                                                                                                                                      +-       All of these  functions  except  wadd_wchnstr  may  be  implemented  as
++       All  of  these  functions  except  wadd_wchnstr  may  be implemented as
+        macros.
+ 
+ 
+@@ -118,10 +121,10 @@
+ 
+ 
+ 
                                                                                                                                                      HISTORY
                                                                                                                                                      +-       X/Open Curses Issue 4 (1995) initially specified these functions.   The
+-       System V  Interface  Definition  Version 4  of  the same year specified
+-       functions named waddwchstr and waddwchnstr (and  the  usual  variants).
+-       These  were  later additions to SVr4.x, not appearing in the first SVr4
++       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
++       System V Interface Definition Version 4  of  the  same  year  specified
++       functions  named  waddwchstr  and waddwchnstr (and the usual variants).
++       These were later additions to SVr4.x, not appearing in the  first  SVr4
+        (1989).  They differed from X/Open's later wadd_wchstr and wadd_wchnstr
+        in that they each took an argument of type wchar_t instead of cchar_t.
+ 
+@@ -134,7 +137,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-01               curs_add_wchstr(3x)
++ncurses 6.5                       2025-03-15               curs_add_wchstr(3x)
+ 
                                                                                                                                                      
+ 
                                                                                                                                                      
+ 
                                                                                                                                                        
+Index: doc/html/man/curs_addch.3x.html
+--- ncurses-6.5-20250308+/doc/html/man/curs_addch.3x.html	2025-03-09 00:55:53.000000000 +0000
++++ ncurses-6.5-20250315/doc/html/man/curs_addch.3x.html	2025-03-15 22:08:51.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addch.3x,v 1.130 2025/03/08 23:01:20 tom Exp @
++  * @Id: curs_addch.3x,v 1.132 2025/03/15 20:40:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addch 3x 2025-03-08 ncurses 6.5 Library calls
++curs_addch 3x 2025-03-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                        curs_addch 3x 2025-03-08 ncurses 6.5 Library calls
                                                                                                                                                        
++
                                                                                                                                                        curs_addch 3x 2025-03-15 ncurses 6.5 Library calls
                                                                                                                                                        
+ 
                                                                                                                                                        + curs_addch(3x)                   Library calls                  curs_addch(3x)
+ 
+@@ -106,11 +106,19 @@
+        the   cursor   position,   analogously  to  the  standard  C  library's
+        putchar(3).  ncurses(3x) describes the variants of this function.
+ 
+-       Construct a curses character from a  char  by  assignment.   Subsection
+-       "Video  Attributes"  of  attron(3x)  describes  how  to  manipulate its
+-       attributes and color pair.  (A color  pair  selection  is  not  honored
++       Construct a curses character from a char  by  assignment  or  typecast.
++       Subsection "Video Attributes" of attron(3x) describes how to manipulate
++       its attributes and color pair.  (A color pair selection is not  honored
+        unless initialized; see start_color(3x).)
+ 
++       The  object or expression ch may contain attributes and/or a color pair
++       identifier.  (A  chtype  can  be  copied  from  place  to  place  using
++       winch(3x)  and  waddch.)   See  curs_attr(3x)  for values of predefined
++       constants that can be usefully "or"ed  with  characters.   A  ch  whose
++       character  component  is a space, and whose only attribute is A_NORMAL,
++       is  a  blank  character,  and  therefore  combines  with  the  window's
++       background character; see curs_bkgd(3x).
++
+        If  the  cursor  is  not  at  the  bottom  of  the scrolling region and
+        advancement occurs at the right margin, the cursor automatically  wraps
+        to the beginning of the next line.
+@@ -143,14 +151,6 @@
+        location of a nonprintable character  does  not  return  the  character
+        itself, but its unctrl(3x) representation.
+ 
+-       The  object or expression ch may contain attributes and/or a color pair
+-       identifier.  (A  chtype  can  be  copied  from  place  to  place  using
+-       winch(3x)  and  waddch.)   See  curs_attr(3x)  for values of predefined
+-       constants that can be usefully "or"ed  with  characters.   A  ch  whose
+-       character  component  is a space, and whose only attribute is A_NORMAL,
+-       is a blank  character,  and  therefore  combines  with  the  background
+-       character; see curs_bkgd(3x).
+-
+ 
+ 
                                                                                                                                                        wechochar
                                                                                                                                                        +        echochar  and  wechochar are equivalent to calling (w)addch followed by
+@@ -164,16 +164,16 @@
+ 
                                                                                                                                                        Forms-Drawing Characters
                                                                                                                                                        +        curses defines macros starting with ACS_ that can be used  with  waddch
+        to  write  line-drawing and other symbols to the screen.  ncurses terms
+-       these forms-drawing characters.  The ACS default listed below  is  used
+-       if the acs_chars (acsc) terminfo capability does not define a terminal-
+-       specific replacement for  it,  or  if  the  terminal  type  and  locale
+-       configuration  require  Unicode  to  access  these  characters  but the
+-       library is unable to use Unicode.  The "acsc char"  column  corresponds
+-       to  how  the  characters  are  specified in the acs_chars (acsc) string
+-       capability, and the characters in it may appear on the  screen  if  the
+-       terminal type's database entry incorrectly advertises ACS support.  The
+-       name "ACS" originates in the Alternate Character Set feature of the DEC
+-       VT100 terminal.
++       these forms-drawing characters.  curses uses  the  ACS  default  listed
++       below  if the terminal type lacks the acs_chars (acsc) capability; that
++       capability does not define a replacement for the character; or  if  the
++       terminal  type and locale configuration require Unicode to access these
++       characters, but the library is unable to use Unicode.  The "acsc  char"
++       column corresponds to how the characters are specified in the acs_chars
++       (acsc) string capability, and the characters in it may  appear  on  the
++       screen if the terminal type's database entry incorrectly advertises ACS
++       support.  The name "ACS" originates  in  the  Alternate  Character  Set
++       feature of the DEC VT100 terminal.
+ 
+                       ACS       acsc
+        Symbol         Default   char   Glyph Name
+@@ -216,7 +216,7 @@
+ 
                                                                                                                                                        RETURN VALUE
                                                                                                                                                        +        These functions return OK on success and ERR on failure.
+ 
+-       In ncurses, they return ERR if
++       In ncurses, these functions fail if
+ 
+        o   the curses screen has not been initialized,
+ 
+@@ -252,7 +252,7 @@
+        The symbols ACS_S3, ACS_S7, ACS_LEQUAL, ACS_GEQUAL, ACS_PI, ACS_NEQUAL,
+        and  ACS_STERLING were not documented in any publicly released System V
+        and are  not  standard.   However,  many  publicly  available  terminfo
+-       entries  include  acs_chars  (acsc)  capabilities  in  which  their key
++       entries  include  acs_chars  (acsc)  capabilities  in  which  their key
+        characters (pryz{|}) are embedded, and  a  second-hand  list  of  their
+        character  descriptions  has  come  to  light.   The ncurses developers
+        invented ACS-prefixed names for them.
+@@ -365,7 +365,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-08                    curs_addch(3x)
++ncurses 6.5                       2025-03-15                    curs_addch(3x)
+ 
                                                                                                                                                        
+ 
                                                                                                                                                        
+ 
                                                                                                                                                          
+Index: doc/html/man/curs_addchstr.3x.html
+--- ncurses-6.5-20250308+/doc/html/man/curs_addchstr.3x.html	2025-02-02 00:43:57.000000000 +0000
++++ ncurses-6.5-20250315/doc/html/man/curs_addchstr.3x.html	2025-03-15 22:08:51.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addchstr.3x,v 1.60 2025/02/01 22:50:42 tom Exp @
++  * @Id: curs_addchstr.3x,v 1.62 2025/03/15 20:41:04 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addchstr 3x 2025-02-01 ncurses 6.5 Library calls
++curs_addchstr 3x 2025-03-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                          curs_addchstr 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                          
++
                                                                                                                                                          curs_addchstr 3x 2025-03-15 ncurses 6.5 Library calls
                                                                                                                                                          
+ 
                                                                                                                                                          + curs_addchstr(3x)                Library calls               curs_addchstr(3x)
+ 
+@@ -91,13 +91,16 @@
+ 
                                                                                                                                                          RETURN VALUE
                                                                                                                                                          +        These functions return OK on success and ERR on failure.
+ 
+-       In ncurses, they return ERR if
++       In ncurses, these functions fail if
+ 
+-       o   win is NULL or
++       o   the curses screen has not been initialized,
+ 
+-       o   chstr is NULL.
++       o   chstr is a null pointer, or
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
++       o   (for  functions  taking  a  WINDOW  pointer argument) win is a null
++           pointer.
++
++       Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+@@ -109,7 +112,7 @@
+        X/Open Curses Issue 4 describes these functions.  It specifies no error
+        conditions for them.
+ 
+-       SVr4  describes  a  successful  return  value only as "an integer value
++       SVr4 describes a successful return value  only  as  "an  integer  value
+        other than ERR".
+ 
+ 
+@@ -125,7 +128,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-01                 curs_addchstr(3x)
++ncurses 6.5                       2025-03-15                 curs_addchstr(3x)
+ 
                                                                                                                                                          
+ 
                                                                                                                                                          
+ 
                                                                                                                                                            
+Index: doc/html/man/curs_addstr.3x.html
+--- ncurses-6.5-20250308+/doc/html/man/curs_addstr.3x.html	2025-02-02 00:43:57.000000000 +0000
++++ ncurses-6.5-20250315/doc/html/man/curs_addstr.3x.html	2025-03-15 22:08:51.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addstr.3x,v 1.67 2025/02/01 22:48:11 tom Exp @
++  * @Id: curs_addstr.3x,v 1.69 2025/03/15 20:41:04 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addstr 3x 2025-02-01 ncurses 6.5 Library calls
++curs_addstr 3x 2025-03-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                            curs_addstr 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                            
++
                                                                                                                                                            curs_addstr 3x 2025-03-15 ncurses 6.5 Library calls
                                                                                                                                                            
+ 
                                                                                                                                                            + curs_addstr(3x)                  Library calls                 curs_addstr(3x)
+ 
+@@ -77,15 +77,18 @@
+ 
                                                                                                                                                            RETURN VALUE
                                                                                                                                                            +        These functions return OK on success and ERR on failure.
+ 
+-       In ncurses, they return ERR if
++       In ncurses, these functions fail if
+ 
+-       o   win is NULL,
++       o   the curses screen has not been initialized,
+ 
+-       o   str is NULL, or
++       o   str is a null pointer,
++
++       o   (for functions taking a WINDOW pointer  argument)  win  is  a  null
++           pointer, or
+ 
+        o   an internal waddch(3x) call returns ERR.
+ 
+-       Functions prefixed with "mv" first perform cursor movement and fail  if
++       Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+@@ -97,12 +100,12 @@
+        X/Open Curses Issue 4 describes these functions.  It specifies no error
+        conditions for them.
+ 
+-       SVr4 describes a successful return value  only  as  "an  integer  value
++       SVr4  describes  a  successful  return  value only as "an integer value
+        other than ERR".
+ 
+ 
+ 
                                                                                                                                                            HISTORY
                                                                                                                                                            +-       4BSD  (1980)  introduced  waddstr  along  with its variants, the latter
++       4BSD (1980) introduced waddstr along  with  its  variants,  the  latter
+        defined as macros.
+ 
+        SVr3.1 (1987) added waddnstr (and its variants) redefining waddstr as a
+@@ -110,14 +113,14 @@
+ 
+ 
+ 
                                                                                                                                                            SEE ALSO
                                                                                                                                                            +-       curs_addwstr(3x)  describes comparable functions of the ncurses library
++       curs_addwstr(3x) describes comparable functions of the ncurses  library
+        in its wide-character configuration (ncursesw).
+ 
+        curses(3x), curs_addch(3x), curs_addchstr(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-01                   curs_addstr(3x)
++ncurses 6.5                       2025-03-15                   curs_addstr(3x)
+ 
                                                                                                                                                            
+ 
                                                                                                                                                            
+ 
                                                                                                                                                              
+Index: doc/html/man/curs_addwstr.3x.html
+--- ncurses-6.5-20250308+/doc/html/man/curs_addwstr.3x.html	2025-02-02 00:43:57.000000000 +0000
++++ ncurses-6.5-20250315/doc/html/man/curs_addwstr.3x.html	2025-03-15 22:08:51.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addwstr.3x,v 1.58 2025/02/01 22:54:32 tom Exp @
++  * @Id: curs_addwstr.3x,v 1.60 2025/03/15 20:41:04 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addwstr 3x 2025-02-01 ncurses 6.5 Library calls
++curs_addwstr 3x 2025-03-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                              curs_addwstr 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                              
++
                                                                                                                                                              curs_addwstr 3x 2025-03-15 ncurses 6.5 Library calls
                                                                                                                                                              
+ 
                                                                                                                                                              + curs_addwstr(3x)                 Library calls                curs_addwstr(3x)
+ 
+@@ -81,15 +81,18 @@
+ 
                                                                                                                                                              RETURN VALUE
                                                                                                                                                              +        These functions return OK on success and ERR on failure.
+ 
+-       In ncurses, they return ERR if
++       In ncurses, these functions fail if
+ 
+-       o   win is NULL,
++       o   the curses screen has not been initialized,
+ 
+-       o   wstr is NULL, or
++       o   wstr is a null pointer,
++
++       o   (for  functions  taking  a  WINDOW  pointer argument) win is a null
++           pointer, or
+ 
+        o   an internal wadd_wch(3x) call returns ERR.
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
++       Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+@@ -100,26 +103,26 @@
+ 
                                                                                                                                                              PORTABILITY
                                                                                                                                                              +        X/Open Curses Issue 4 describes these functions.
+ 
+-       SVr4 describes a successful return value  only  as  "an  integer  value
++       SVr4  describes  a  successful  return  value only as "an integer value
+        other than ERR".
+ 
+ 
+ 
                                                                                                                                                              HISTORY
                                                                                                                                                              +-       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
+-       System V Interface Definition Version 4  of  the  same  year  specified
++       X/Open Curses Issue 4 (1995) initially specified these functions.   The
++       System V  Interface  Definition  Version 4  of  the same year specified
+        functions named waddwstr and waddnwstr (and the usual variants).  These
+        were later additions to SVr4.x, not appearing in the first SVr4 (1989).
+ 
+ 
+ 
                                                                                                                                                              SEE ALSO
                                                                                                                                                              +-       curs_addstr(3x) describes comparable functions of the  ncurses  library
++       curs_addstr(3x)  describes  comparable functions of the ncurses library
+        in its non-wide-character configuration.
+ 
+        curses(3x), curs_add_wch(3x), curs_add_wchstr(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-01                  curs_addwstr(3x)
++ncurses 6.5                       2025-03-15                  curs_addwstr(3x)
+ 
                                                                                                                                                              
+ 
                                                                                                                                                              
+ 
                                                                                                                                                                
+Index: doc/html/man/curs_getch.3x.html
+--- ncurses-6.5-20250308+/doc/html/man/curs_getch.3x.html	2025-02-15 20:06:26.000000000 +0000
++++ ncurses-6.5-20250315/doc/html/man/curs_getch.3x.html	2025-03-15 22:08:52.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_getch.3x,v 1.119 2025/02/15 19:35:55 tom Exp @
++  * @Id: curs_getch.3x,v 1.121 2025/03/15 22:04:20 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_getch 3x 2025-02-15 ncurses 6.5 Library calls
++curs_getch 3x 2025-03-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                curs_getch 3x 2025-02-15 ncurses 6.5 Library calls
                                                                                                                                                                
++
                                                                                                                                                                curs_getch 3x 2025-03-15 ncurses 6.5 Library calls
                                                                                                                                                                
+ 
                                                                                                                                                                + curs_getch(3x)                   Library calls                  curs_getch(3x)
+ 
+@@ -138,22 +138,35 @@
+        escape character ESC.  This fact implies that curses cannot distinguish
+        a  user's  press  of  the  escape  key (assuming it sends ESC) from the
+        beginning of a function key's character sequence without waiting to see
+-       if,  and  how  soon,  further input arrives.  When curses reads such an
+-       ambiguous character, it sets a timer.  If the remainder of the sequence
+-       does  not  arrive within the designated time, wgetch returns the prefix
+-       character; otherwise, it returns the function key code corresponding to
+-       the unique sequence defined by the terminal.  Consequently, a user of a
+-       curses application may experience a  delay  after  the  escape  key  is
+-       pressed  while curses disambiguates the input; see section "EXTENSIONS"
+-       below.  If the window is in "no time-out"  mode,  the  timer  does  not
+-       expire;  it  is  an infinite (or very large) value.  See notimeout(3x).
+-       Because function key sequences usually begin with ESC, the terminal may
+-       appear  to  hang  in no time-out mode after the user presses the escape
+-       key.  Generally, further typing "awakens" curses.
++       if, and how soon, further input arrives.
++
++       o   If  the  escape  sequence  matches  a  string capability defining a
++           function key for the terminal type (such  as  key_home  (khome)  or
++           key_up  (kuu1)), wgetch returns the function key code corresponding
++           to the unique sequence defined by the terminal.
++
++       o   If the escape sequence matches no function  keys  defined  for  the
++           terminal  type,  wgetch  returns the code of the last (most recent)
++           character it has read.
++
++       o   If wgetch cannot decide the validity of the input as a function key
++           because  it  has not read enough characters to disambiguate it, the
++           function waits until it has this information or the  escape  delay,
++           configured  by  the  global  variable  ESCDELAY  (an extension; see
++           section "EXTENSIONS" below) or the environment variable of the same
++           name (see section "ENVIRONMENT" of ncurses(3x)), also an extension,
++           elapses.
++
++       Consequently, a user of a curses application that employs  keypad  mode
++       may  experience a pause or "hang" after the escape key is pressed while
++       curses collects sufficient characters to disambiguate  the  input.   If
++       the  window  is  in "no time-out" mode, the escape delay is effectively
++       infinite; see notimeout(3x).  In the event of  such  a  pause,  further
++       typing "awakens" curses.
+ 
+ 
+ 
                                                                                                                                                                Ungetting Characters
                                                                                                                                                                +-       ungetch places c into the input queue to be returned by the  next  call
++       ungetch  places  c into the input queue to be returned by the next call
+        to wgetch.  A single input queue serves all windows associated with the
+        screen.
+ 
+@@ -161,16 +174,16 @@
+ 
                                                                                                                                                                Predefined Key Codes
                                                                                                                                                                +        The header file curses.h defines the following function key codes.
+ 
+-       o   Except for the special case of KEY_RESIZE, a window's  keypad  mode
++       o   Except  for  the special case of KEY_RESIZE, a window's keypad mode
+            must be enabled for wgetch to read these codes from it.
+ 
+-       o   Not  all  of  these  are  necessarily  supported  on any particular
++       o   Not all of  these  are  necessarily  supported  on  any  particular
+            terminal.
+ 
+-       o   The  naming  convention  may  seem  obscure,  with  some   apparent
+-           misspellings  (such  as "RSUME" for "resume"); the names correspond
+-           to  the  terminfo  capability  names  for  the   keys,   and   were
+-           standardized  before  the  IBM  PC/AT  keyboard  layout  achieved a
++       o   The   naming  convention  may  seem  obscure,  with  some  apparent
++           misspellings (such as "RSUME" for "resume"); the  names  correspond
++           to   the   terminfo   capability  names  for  the  keys,  and  were
++           standardized before  the  IBM  PC/AT  keyboard  layout  achieved  a
+            dominant position in industry.
+ 
+               Symbol          Key name
+@@ -180,7 +193,6 @@
+               KEY_UP          Arrow keys
+               KEY_LEFT
+               KEY_RIGHT
+-
+               KEY_HOME        Home key (upward+left arrow)
+               KEY_BACKSPACE   Backspace
+               KEY_F0          Function keys; space for 64 keys is reserved
+@@ -236,6 +248,7 @@
+               KEY_RESIZE      Screen resized
+               KEY_RESTART     Restart key
+               KEY_RESUME      Resume key
++
+               KEY_SAVE        Save key
+               KEY_SELECT      Select key
+               KEY_SUSPEND     Suspend key
+@@ -246,7 +259,6 @@
+               KEY_SCOMMAND    Shifted command key
+               KEY_SCOPY       Shifted copy key
+               KEY_SCREATE     Shifted create key
+-
+               KEY_SDC         Shifted delete character key
+               KEY_SDL         Shifted delete line key
+               KEY_SEND        Shifted end key
+@@ -280,23 +292,23 @@
+                                    +-----+------+-------+
+                                    | C1  | down |  C3   |
+                                    +-----+------+-------+
+-       Two of the symbols in the list above do not correspond  to  a  physical
++       Two  of  the  symbols in the list above do not correspond to a physical
+        key.
+ 
+-       o   wgetch  returns  KEY_RESIZE,  even  if  the window's keypad mode is
++       o   wgetch returns KEY_RESIZE, even if  the  window's  keypad  mode  is
+            disabled, if ncurses has handled a SIGWINCH signal since wgetch was
+            called; see initscr(3x) and resizeterm(3x).
+ 
+-       o   wgetch  returns KEY_MOUSE to indicate that a mouse event is pending
+-           collection; see curs_mouse(3x).  Receipt of this  code  requires  a
+-           window's  keypad  mode  to  be  enabled, because to interpret mouse
+-           input (as with xterm(1)'s mouse protocol),  ncurses  must  read  an
++       o   wgetch returns KEY_MOUSE to indicate that a mouse event is  pending
++           collection;  see  curs_mouse(3x).   Receipt of this code requires a
++           window's keypad mode to be  enabled,  because  to  interpret  mouse
++           input  (as  with  xterm(1)'s  mouse protocol), ncurses must read an
+            escape sequence, as with a function key.
+ 
+ 
+ 
                                                                                                                                                                Testing Key Codes
                                                                                                                                                                +-       In  ncurses,  has_key  returns  a  Boolean value indicating whether the
+-       terminal type recognizes its parameter as a key code value.   See  also
++       In ncurses, has_key returns a  Boolean  value  indicating  whether  the
++       terminal  type  recognizes its parameter as a key code value.  See also
+        define_key(3x) and key_defined(3x).
+ 
+ 
+@@ -307,78 +319,78 @@
+ 
+        o   its timeout expires without any data arriving, or
+ 
+-       o   execution  was  interrupted by a signal, in which case errno is set
++       o   execution was interrupted by a signal, in which case errno  is  set
+            to EINTR.
+ 
+-       ungetch returns OK on success and ERR on  failure.   ungetch  fails  if
++       ungetch  returns  OK  on  success and ERR on failure.  ungetch fails if
+        there is no more room in the input queue.
+ 
+        has_key returns TRUE or FALSE.
+ 
+-       Functions  taking  a  WINDOW  pointer  argument  fail  if win is a null
++       Functions taking a WINDOW pointer  argument  fail  if  win  is  a  null
+        pointer.
+ 
+-       Functions prefixed with "mv" first perform cursor movement and fail  if
++       Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                                NOTES
                                                                                                                                                                +        getch, mvgetch, and mvwgetch may be implemented as macros.
+ 
+-       curses  discourages assignment of the ESC key to a discrete function by
++       curses discourages assignment of the ESC key to a discrete function  by
+        the programmer because the library requires a delay while it awaits the
+        potential remainder of a terminal escape sequence.
+ 
+-       Some  key  strokes  are  indistinguishable from control characters; for
+-       example, KEY_ENTER may be the same as ^M, and KEY_BACKSPACE may be  the
+-       same  as ^H or ^?.  Consult the terminfo entry for the terminal type to
+-       determine whether this  is  the  case;  see  infocmp(1).   Some  curses
++       Some key strokes are indistinguishable  from  control  characters;  for
++       example,  KEY_ENTER may be the same as ^M, and KEY_BACKSPACE may be the
++       same as ^H or ^?.  Consult the terminfo entry for the terminal type  to
++       determine  whether  this  is  the  case;  see  infocmp(1).  Some curses
+        implementations, including ncurses, honor the terminfo key definitions;
+        others treat such control characters specially.
+ 
+-       curses distinguishes the Enter  keys  in  the  alphabetic  and  numeric
+-       keypad  sections  of a keyboard because (most) terminals do.  KEY_ENTER
+-       refers to the key on the numeric keypad and, like other function  keys,
++       curses  distinguishes  the  Enter  keys  in  the alphabetic and numeric
++       keypad sections of a keyboard because (most) terminals  do.   KEY_ENTER
++       refers  to the key on the numeric keypad and, like other function keys,
+        is reliably recognized only if the window's keypad mode is enabled.
+ 
+-       o   The  terminfo  key_enter  (kent) capability describes the character
+-           (sequence) sent by the  Enter  key  of  a  terminal's  numeric  (or
++       o   The terminfo key_enter (kent) capability  describes  the  character
++           (sequence)  sent  by  the  Enter  key  of  a terminal's numeric (or
+            similar) keypad.
+ 
+        o   "Enter or send" is X/Open Curses's description of this key.
+ 
+-       curses  treats the Enter or Return key in the alphabetic section of the
++       curses treats the Enter or Return key in the alphabetic section of  the
+        keyboard differently.
+ 
+        o   It usually produces a control code for carriage return (^M) or line
+            feed (^J).
+ 
+-       o   Depending  on  the  terminal  mode (raw, cbreak, or canonical), and
+-           whether nl(3x) or nonl(3x)  has  been  called,  wgetch  may  return
+-           either  a  carriage return or line feed upon an Enter or Return key
++       o   Depending on the terminal mode (raw,  cbreak,  or  canonical),  and
++           whether  nl(3x)  or  nonl(3x)  has  been  called, wgetch may return
++           either a carriage return or line feed upon an Enter or  Return  key
+            stroke.
+ 
+-       Use of wgetch with echo(3x) and neither cbreak(3x) nor raw(3x)  is  not
++       Use  of  wgetch with echo(3x) and neither cbreak(3x) nor raw(3x) is not
+        well-defined.
+ 
+-       Historically,  the  list of key code macros above was influenced by the
+-       keyboard of the AT&T 7300 (also known variously as the  "3B1",  "Safari
+-       4",  and  "UNIX  PC"),  a  1985 machine rich in function keys.  Today's
+-       computer keyboards are based on that of the IBM PC/AT and tend to  have
++       Historically, the list of key code macros above was influenced  by  the
++       keyboard  of  the AT&T 7300 (also known variously as the "3B1", "Safari
++       4", and "UNIX PC"), a 1985 machine  rich  in  function  keys.   Today's
++       computer  keyboards are based on that of the IBM PC/AT and tend to have
+        fewer.  A curses application can expect such a keyboard to transmit key
+-       codes  KEY_UP,  KEY_DOWN,  KEY_LEFT,  KEY_RIGHT,   KEY_HOME,   KEY_END,
+-       KEY_PPAGE  (Page  Up),  KEY_NPAGE  (Page Down), KEY_IC (Insert), KEY_DC
++       codes   KEY_UP,   KEY_DOWN,  KEY_LEFT,  KEY_RIGHT,  KEY_HOME,  KEY_END,
++       KEY_PPAGE (Page Up), KEY_NPAGE (Page  Down),  KEY_IC  (Insert),  KEY_DC
+        (Delete), KEY_A1, KEY_A3, KEY_B2, KEY_C1, KEY_C3, and KEY_F(n) for 1 <=
+        n <= 12.
+ 
+ 
+ 
                                                                                                                                                                EXTENSIONS
                                                                                                                                                                +        In ncurses, when a window's "no time-out" mode is not set, the ESCDELAY
+-       variable configures the duration of the timer used  to  disambiguate  a
+-       function  key character sequence from a series of key strokes beginning
++       variable  configures  the  duration of the timer used to disambiguate a
++       function key character sequence from a series of key strokes  beginning
+        with ESC typed by the user; see curs_variables(3x).
+ 
+-       has_key is an ncurses extension, and  is  not  found  in  SVr4  curses,
++       has_key  is  an  ncurses  extension,  and  is not found in SVr4 curses,
+        4.4BSD curses, or any other previous curses implementation.
+ 
+ 
+@@ -386,53 +398,59 @@
+        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       Except as noted in section "EXTENSIONS" above,  X/Open  Curses  Issue 4
++       Except  as  noted  in section "EXTENSIONS" above, X/Open Curses Issue 4
+        describes these functions.  It specifies no error conditions for them.
+ 
+-       SVr4  describes  a  successful  return  value only as "an integer value
++       SVr4 describes a successful return value  only  as  "an  integer  value
+        other than ERR".
+ 
+        wgetch reads only single-byte characters.
+ 
+-       The echo behavior of these functions on  input  of  KEY_  or  backspace
++       The  echo  behavior  of  these  functions on input of KEY_ or backspace
+        characters is not documented in SVr4 curses.
+ 
+-       The  behavior  of  wgetch  in  the  presence  of signal handlers is not
+-       documented in SVr4 curses and is  unspecified  by  X/Open  Curses.   In
+-       historical  curses  implementations, it varied depending on whether the
+-       operating system's dispatch of a signal  to  a  handler  interrupted  a
++       The behavior of wgetch in  the  presence  of  signal  handlers  is  not
++       documented  in  SVr4  curses  and  is unspecified by X/Open Curses.  In
++       historical curses implementations, it varied depending on  whether  the
++       operating  system's  dispatch  of  a  signal to a handler interrupted a
+        read(2) call in progress, and also (in some implementations) whether an
+-       input timeout or non-blocking mode had been  set.   A  portable  curses
+-       application  prepares  for  two  cases:  (a)  signal  receipt  does not
++       input  timeout  or  non-blocking  mode had been set.  A portable curses
++       application prepares  for  two  cases:  (a)  signal  receipt  does  not
+        interrupt wgetch; or (b) signal receipt interrupts wgetch and causes it
+        to return ERR with errno set to EINTR.
+ 
+        KEY_MOUSE is mentioned in X/Open Curses, along with a few related term-
+-       info capabilities, but no higher-level functions use the feature.   The
++       info  capabilities, but no higher-level functions use the feature.  The
+        implementation in ncurses is an extension.
+ 
+-       KEY_RESIZE  and  has_key  are extensions first implemented for ncurses.
++       KEY_RESIZE and has_key are extensions first  implemented  for  ncurses.
+        By  2022,  PDCurses  and  NetBSD  curses  had  added  them  along  with
+        KEY_MOUSE.
+ 
+ 
++
                                                                                                                                                                HISTORY
                                                                                                                                                                ++       4BSD (1980) introduced wgetch and its variants.
++
++       ncurses 1.9.9g (1996) added has_key.
++
++
+ 
                                                                                                                                                                SEE ALSO
                                                                                                                                                                +-       ECMA-6  "7-bit  coded  Character  Set" <https://ecma-international.org/
++       ECMA-6 "7-bit  coded  Character  Set"  <https://ecma-international.org/
+        publications-and-standards/standards/ecma-6/>
+ 
+-       ECMA-48  "Control  Functions  for  Coded  Character   Sets"   <https://
++       ECMA-48   "Control   Functions  for  Coded  Character  Sets"  <https://
+        ecma-international.org/publications-and-standards/standards/ecma-48/>
+ 
+-       curs_get_wch(3x)  describes comparable functions of the ncurses library
++       curs_get_wch(3x) describes comparable functions of the ncurses  library
+        in its wide-character configuration (ncursesw).
+ 
+-       curses(3x),    curs_addch(3x),     curs_inopts(3x),     curs_mouse(3x),
+-       curs_move(3x),  curs_outopts(3x), curs_refresh(3x), curs_variables(3x),
++       curses(3x),     curs_addch(3x),     curs_inopts(3x),    curs_mouse(3x),
++       curs_move(3x), curs_outopts(3x), curs_refresh(3x),  curs_variables(3x),
+        resizeterm(3x), ascii(7)
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-15                    curs_getch(3x)
++ncurses 6.5                       2025-03-15                    curs_getch(3x)
+ 
                                                                                                                                                                
+ 
                                                                                                                                                                
+ 
+ 
                                                                                                                                                                
+Index: doc/html/man/curs_initscr.3x.html
+--- ncurses-6.5-20250308+/doc/html/man/curs_initscr.3x.html	2025-03-09 00:55:54.000000000 +0000
++++ ncurses-6.5-20250315/doc/html/man/curs_initscr.3x.html	2025-03-15 22:08:52.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_initscr.3x,v 1.100 2025/03/08 23:07:43 tom Exp @
++  * @Id: curs_initscr.3x,v 1.102 2025/03/15 21:11:24 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_initscr 3x 2025-03-08 ncurses 6.5 Library calls
++curs_initscr 3x 2025-03-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                curs_initscr 3x 2025-03-08 ncurses 6.5 Library calls
                                                                                                                                                                
++
                                                                                                                                                                curs_initscr 3x 2025-03-15 ncurses 6.5 Library calls
                                                                                                                                                                
+ 
                                                                                                                                                                + curs_initscr(3x)                 Library calls                curs_initscr(3x)
+ 
+@@ -104,8 +104,8 @@
+        o   an output stream outf connected to the terminal; and
+ 
+        o   an input stream inf  connected  to  the  terminal.   It  returns  a
+-           variable  of  structure  type  SCREEN  *, which should be saved for
+-           later use with set_term and delscreen.
++           variable of pointer-to-SCREEN type, which should be saved for later
++           use with set_term and delscreen.
+ 
+        newterm passes the file descriptor of the output stream to the terminfo
+        function setupterm(3x), which returns a pointer to a TERMINAL structure
+@@ -338,7 +338,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-08                  curs_initscr(3x)
++ncurses 6.5                       2025-03-15                  curs_initscr(3x)
+ 
                                                                                                                                                                
+ 
                                                                                                                                                                
+ 
                                                                                                                                                                  
+Index: doc/html/man/curs_inopts.3x.html
+--- ncurses-6.5-20250308+/doc/html/man/curs_inopts.3x.html	2025-03-09 00:55:54.000000000 +0000
++++ ncurses-6.5-20250315/doc/html/man/curs_inopts.3x.html	2025-03-15 22:08:52.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inopts.3x,v 1.100 2025/03/08 23:09:30 tom Exp @
++  * @Id: curs_inopts.3x,v 1.102 2025/03/15 21:11:52 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inopts 3x 2025-03-08 ncurses 6.5 Library calls
++curs_inopts 3x 2025-03-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                  curs_inopts 3x 2025-03-08 ncurses 6.5 Library calls
                                                                                                                                                                  
++
                                                                                                                                                                  curs_inopts 3x 2025-03-15 ncurses 6.5 Library calls
                                                                                                                                                                  
+ 
                                                                                                                                                                  + curs_inopts(3x)                  Library calls                 curs_inopts(3x)
+ 
+@@ -155,17 +155,17 @@
+        keypad enables recognition of a terminal's function keys.   If  enabled
+        (bf  is  TRUE) then when an input character reading function reads ESC,
+        it waits for further input corresponding to an escape sequence  defined
+-       by  the terminal type description.  If a valid sequence is entered, the
+-       input character reading  function  returns  a  value  representing  the
+-       function   key,   such   as   KEY_LEFT.    (Wide-character  API  users:
+-       wget_wch(3x) returns KEY_CODE_YES to indicate  the  availability  of  a
+-       function  key  code in its wch parameter.)  If the sequence is invalid,
+-       the input character reading function returns only its  last  character.
+-       If  disabled  (bf  is  FALSE),  curses  does  not  treat  function keys
+-       specially and the program has to interpret escape sequences itself.  If
+-       the terminal's keypad can be turned on (made to transmit) and off (made
+-       to work  locally),  keypad  configures  it  consistently  with  the  bf
+-       parameter.  By default, a window's keypad mode is off.
++       by  the  terminal  type description.  If a valid sequence populates the
++       input stream, the input character  reading  function  returns  a  value
++       representing  the  function key, such as KEY_LEFT.  (Wide-character API
++       users: wget_wch(3x) returns KEY_CODE_YES to indicate  the  availability
++       of  a  function  key  code  in  its wch parameter.)  If the sequence is
++       invalid, the input character reading function  returns  only  its  last
++       character.   If  disabled (bf is FALSE), curses does not treat function
++       keys specially and  the  program  has  to  interpret  escape  sequences
++       itself.   If  the terminal's keypad can be turned on (made to transmit)
++       and off (made to work locally), keypad configures it consistently  with
++       the bf parameter.  By default, a window's keypad mode is off.
+ 
+ 
+ 
                                                                                                                                                                  meta
                                                                                                                                                                  +@@ -204,70 +204,69 @@
+        distinguish  sequences produced by a function key from those typed by a
+        user.  If this timer is disabled, curses waits forever  for  subsequent
+        keystrokes  until  it  determines  the  escape  sequence to be valid or
+-       invalid.  To configure the timeout duration rather than  disabling  it,
+-       see wtimeout below.
++       invalid.
+ 
+ 
+ 
                                                                                                                                                                  qiflush, noqiflush
                                                                                                                                                                  +-       qiflush  and noqiflush configure the terminal driver's treatment of its
++       qiflush and noqiflush configure the terminal driver's treatment of  its
+        input and output queues when it handles the interrupt, suspend, or quit
+        characters under the canonical ("cooked") or cbreak line disciplines on
+-       POSIX systems; see termios(3).  The default behavior is inherited  from
+-       the  terminal driver settings.  Calling qiflush configures the terminal
+-       to flush the queues (discarding  their  contents)  when  any  of  these
+-       events  occurs, giving the impression of faster response to user input,
+-       but making the  library's  model  of  the  screen  contents  incorrect.
++       POSIX  systems; see termios(3).  The default behavior is inherited from
++       the terminal driver settings.  Calling qiflush configures the  terminal
++       to  flush  the  queues  (discarding  their  contents) when any of these
++       events occurs, giving the impression of faster response to user  input,
++       but  making  the  library's  model  of  the  screen contents incorrect.
+        Calling noqiflush prevents such flushing, but might frustrate impatient
+-       users on slow connections if a  curses  update  of  the  screen  is  in
++       users  on  slow  connections  if  a  curses  update of the screen is in
+        progress when the event occurs; see typeahead below for a mitigation of
+-       this problem.  You may want to call noqiflush in a signal  handler  if,
+-       after  the  handler  exits,  you  want output to continue as though the
++       this  problem.   You may want to call noqiflush in a signal handler if,
++       after the handler exits, you want output  to  continue  as  though  the
+        signal had not occurred.
+ 
+ 
+ 
                                                                                                                                                                  raw, noraw
                                                                                                                                                                  +        raw configures the terminal to read input in raw mode, which is similar
+-       to  cbreak  mode  (see  cbreak above) except that it furthermore passes
+-       through the terminal's configured interrupt, quit,  suspend,  and  flow
+-       control   characters  uninterpreted  to  the  application,  instead  of
+-       generating a signal or  acting  on  I/O  flow.   The  behavior  of  the
+-       terminal's   "Break"   key   (if   any)   depends  on  terminal  driver
+-       configuration parameters that curses does not handle.   noraw  restores
++       to cbreak mode (see cbreak above) except  that  it  furthermore  passes
++       through  the  terminal's  configured interrupt, quit, suspend, and flow
++       control  characters  uninterpreted  to  the  application,  instead   of
++       generating  a  signal  or  acting  on  I/O  flow.   The behavior of the
++       terminal's  "Break"  key  (if   any)   depends   on   terminal   driver
++       configuration  parameters  that curses does not handle.  noraw restores
+        the terminal's canonical ("cooked") line discipline.
+ 
+ 
+ 
                                                                                                                                                                  timeout, wtimeout
                                                                                                                                                                  +-       wtimeout  configures  whether a curses input character reading function
+-       called on window win uses blocking or non-blocking reads.  If delay  is
+-       negative,  curses uses a blocking read, waiting indefinitely for input.
+-       If delay is zero, the read is non-blocking; an input character  reading
+-       function  returns ERR if no input is pending.  If delay is positive, an
+-       input character reading function blocks  for  delay  milliseconds,  and
+-       returns  ERR  if the delay elapses and there is still no input pending.
++       wtimeout configures whether a curses input character  reading  function
++       called  on window win uses blocking or non-blocking reads.  If delay is
++       negative, curses uses a blocking read, waiting indefinitely for  input.
++       If  delay is zero, the read is non-blocking; an input character reading
++       function returns ERR if no input is pending.  If delay is positive,  an
++       input  character  reading  function  blocks for delay milliseconds, and
++       returns ERR if the delay elapses and there is still no  input  pending.
+        timeout calls wtimeout on stdscr.
+ 
+ 
+ 
                                                                                                                                                                  typeahead
                                                                                                                                                                  +-       Normally, a curses library checks the terminal's input file  descriptor
++       Normally,  a curses library checks the terminal's input file descriptor
+        for activity with poll(2) or select(2) while updating the screen; if it
+-       finds  any,  it  postpones  output  until  the  next  wrefresh(3x)   or
+-       doupdate(3x)  call,  allowing faster response to user key strokes.  The
+-       library tests the file descriptor  corresponding  to  the  FILE  stream
++       finds   any,  it  postpones  output  until  the  next  wrefresh(3x)  or
++       doupdate(3x) call, allowing faster response to user key  strokes.   The
++       library  tests  the  file  descriptor  corresponding to the FILE stream
+        pointer passed to newterm(3x) (or stdin if initscr(3x) was called), for
+-       pending input.  typeahead instructs curses to test file  descriptor  fd
++       pending  input.   typeahead instructs curses to test file descriptor fd
+        instead.  An fd of -1 disables the check.
+ 
+ 
+ 
                                                                                                                                                                  RETURN VALUE
                                                                                                                                                                  +        timeout and wtimeout return no value.
+ 
+-       cbreak,  nocbreak,  echo,  noecho,  halfdelay, intrflush, keypad, meta,
+-       nodelay, notimeout, nl, nonl, raw, noraw, and typeahead  return  OK  on
++       cbreak, nocbreak, echo, noecho,  halfdelay,  intrflush,  keypad,  meta,
++       nodelay,  notimeout,  nl,  nonl, raw, noraw, and typeahead return OK on
+        success and ERR on failure.
+ 
+        In ncurses, the functions in the previous paragraph return ERR if
+ 
+-       o   the  library's  TERMINAL  structure  for  the  device  has not been
++       o   the library's TERMINAL  structure  for  the  device  has  not  been
+            initialized with initscr(3x), newterm(3x), or setupterm(3x), or
+ 
+        o   win is a null pointer (except with intrflush and meta, which ignore
+@@ -275,7 +274,7 @@
+ 
+        Further, halfdelay returns ERR if delay is outside the range 1..255.
+ 
+-       See  section  "EXTENSIONS"  below  for  the return values of is_cbreak,
++       See section "EXTENSIONS" below for  the  return  values  of  is_cbreak,
+        is_echo, is_nl, and is_raw.
+ 
+ 
+@@ -283,29 +282,29 @@
+        echo, noecho, halfdelay, intrflush, meta, nl, nonl, nodelay, notimeout,
+        noqiflush, qiflush, timeout, and wtimeout may be implemented as macros.
+ 
+-       noraw  and  nocbreak follow historical practice in that they attempt to
+-       restore the terminal's canonical ("cooked") line  discipline  from  raw
+-       and  cbreak, respectively.  Mixing raw/noraw calls with cbreak/nocbreak
+-       calls leads to terminal driver control states that are hard to  predict
++       noraw and nocbreak follow historical practice in that they  attempt  to
++       restore  the  terminal's  canonical ("cooked") line discipline from raw
++       and cbreak, respectively.  Mixing raw/noraw calls with  cbreak/nocbreak
++       calls  leads to terminal driver control states that are hard to predict
+        or understand; doing so is not recommended.
+ 
+-       curses  documentation  uses  the  terms "delay" and "timeout" freely to
+-       describe two related but distinct aspects of  input  handling,  at  the
++       curses documentation uses the terms "delay"  and  "timeout"  freely  to
++       describe  two  related  but  distinct aspects of input handling, at the
+        risk of confusing the user.  The functions halfdelay, nodelay, timeout,
+-       and wtimeout configure whether the  input  character  reading  function
+-       (getch(3x)  or  get_wch(3x)) waits for keyboard input to begin, and for
+-       how long.  keypad configures whether that function  waits  for  further
++       and  wtimeout  configure  whether  the input character reading function
++       (getch(3x) or get_wch(3x)) waits for keyboard input to begin,  and  for
++       how  long.   keypad  configures whether that function waits for further
+        input if the first character it reads is ESC.  Calling notimeout, which
+-       has nothing to do  with  timeout  or  wtimeout,  makes  this  delay  in
+-       expectation  of further keystrokes effectively infinite.  X/Open Curses
+-       affords no means of otherwise configuring the  length  of  this  second
++       has  nothing  to  do  with  timeout  or  wtimeout,  makes this delay in
++       expectation of further characters effectively infinite.  X/Open  Curses
++       affords  no  means  of  otherwise configuring the length of this second
+        delay, but an AIX and ncurses extension, ESCDELAY, is available both as
+-       an environment variable and a global symbol permitting the  application
++       an  environment variable and a global symbol permitting the application
+        to do so; see ncurses(3x) and curs_variables(3x).
+ 
+ 
+ 
                                                                                                                                                                  EXTENSIONS
                                                                                                                                                                  +-       ncurses  provides  four  "is_" functions corresponding to cbreak, echo,
++       ncurses provides four "is_" functions corresponding  to  cbreak,  echo,
+        nl, and raw, permitting their states to be queried by the application.
+ 
+                             Query       Set      Reset
+@@ -321,7 +320,7 @@
+ 
+        0    if the option is unset, or
+ 
+-       -1   if the library's TERMINAL structure for the device  has  not  been
++       -1   if  the  library's  TERMINAL structure for the device has not been
+             initialized.
+ 
+ 
+@@ -329,52 +328,52 @@
+        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       Except as noted in section "EXTENSIONS" above,  X/Open  Curses  Issue 4
++       Except  as  noted  in section "EXTENSIONS" above, X/Open Curses Issue 4
+        describes these functions.  It specifies no error conditions for them.
+ 
+-       SVr4  describes  a  successful  return  value only as "an integer value
++       SVr4 describes a successful return value  only  as  "an  integer  value
+        other than ERR".
+ 
+-       ncurses follows X/Open Curses and the historical practice  of  System V
+-       curses,  clearing  the  terminal driver's "echo" flag when initializing
+-       the screen.  BSD curses did not, but its raw function turned it off  as
+-       a  side  effect.   For best portability, call echo or noecho explicitly
+-       just after initialization, even if your program retains the  terminal's
++       ncurses  follows  X/Open Curses and the historical practice of System V
++       curses, clearing the terminal driver's "echo"  flag  when  initializing
++       the  screen.  BSD curses did not, but its raw function turned it off as
++       a side effect.  For best portability, call echo  or  noecho  explicitly
++       just  after initialization, even if your program retains the terminal's
+        canonical ("cooked") line discipline.
+ 
+-       X/Open  Curses  is  ambiguous  regarding whether raw should disable the
+-       carriage return and line feed translation feature controlled by nl  and
+-       nonl.   BSD  curses  turned off these translations; System V curses did
+-       not.  ncurses does so, on the assumption that a  programmer  requesting
+-       raw  input  wants  a  clean  (ideally, 8-bit clean) connection that the
++       X/Open Curses is ambiguous regarding whether  raw  should  disable  the
++       carriage  return and line feed translation feature controlled by nl and
++       nonl.  BSD curses turned off these translations;  System V  curses  did
++       not.   ncurses  does so, on the assumption that a programmer requesting
++       raw input wants a clean (ideally,  8-bit  clean)  connection  that  the
+        operating system will not alter.
+ 
+        When keypad is first enabled, ncurses loads the key definitions for the
+        current  terminal  type  description.   If  that  description  includes
+-       extended string capabilities, for example, by using the  -x  option  of
++       extended  string  capabilities,  for example, by using the -x option of
+        tic(1), then ncurses also defines keys for the capabilities whose names
+-       begin with "k".  Corresponding key codes are generated  and  (depending
+-       on  previous  loads  of  terminal  descriptions)  may  differ  from one
+-       execution of a program to  the  next.   The  generated  key  codes  are
++       begin  with  "k".  Corresponding key codes are generated and (depending
++       on previous  loads  of  terminal  descriptions)  may  differ  from  one
++       execution  of  a  program  to  the  next.   The generated key codes are
+        recognized by keyname(3x), which then returns a name beginning with "k"
+-       denoting the terminfo capability name rather than "K", used for  curses
++       denoting  the terminfo capability name rather than "K", used for curses
+        key names.  On the other hand, an application can use define_key(3x) to
+-       bind a specific key to a  string  of  the  programmer's  choice.   This
+-       feature   enables  an  application  to  check  for  its  presence  with
++       bind  a  specific  key  to  a  string of the programmer's choice.  This
++       feature  enables  an  application  to  check  for  its  presence   with
+        tigetstr(3x), and reassign the key code to match its own needs.
+ 
+        Low-level applications can use tigetstr(3x) to obtain the definition of
+-       any  string  capability.   curses  applications use the input character
++       any string capability.  curses applications  use  the  input  character
+        reading function to obtain key codes from input and rely upon the order
+-       in  which  the string capabilities are loaded.  Multiple key capability
+-       strings can have the  same  value,  but  the  input  character  reading
+-       function  can  report  only  one key code.  Most curses implementations
+-       (including ncurses) load key definitions in the order  they  appear  in
++       in which the string capabilities are loaded.  Multiple  key  capability
++       strings  can  have  the  same  value,  but  the input character reading
++       function can report only one key  code.   Most  curses  implementations
++       (including  ncurses)  load  key definitions in the order they appear in
+        the strfnames array of string capability names; see term_variables(3x).
+-       The last capability read using a particular definition  determines  the
+-       key  code  to  be  reported.   In ncurses, extended capabilities can be
+-       interpreted as key definitions.  These are loaded after the  predefined
+-       keys,  and  if  a capability's value is the same as a previously loaded
++       The  last  capability read using a particular definition determines the
++       key code to be reported.  In  ncurses,  extended  capabilities  can  be
++       interpreted  as key definitions.  These are loaded after the predefined
++       keys, and if a capability's value is the same as  a  previously  loaded
+        key definition, the library uses the later definition.
+ 
+ 
+@@ -385,22 +384,23 @@
+        support it with cbreak, nocbreak, intrflush, keypad, meta, nodelay, and
+        typeahead.
+ 
+-       SVr3 (1987) added halfdelay,  notimeout,  and  wtimeout.   qiflush  and
+-       noqiflush  appeared in SVr3.1 (1987), at which point intrflush became a
+-       wrapper for either of these functions, depending on the  value  of  its
++       SVr3  (1987)  added  halfdelay,  notimeout,  and wtimeout.  qiflush and
++       noqiflush appeared in SVr3.1 (1987), at which point intrflush became  a
++       wrapper  for  either  of these functions, depending on the value of its
+        Boolean argument.  SVr3.1 also added timeout.
+ 
+        ncurses 6.5 (2024) introduced is_cbreak, is_echo, is_nl, and is_raw.
+ 
+-       Formerly,  ncurses  used  nl  and  nonl  to  control  the conversion of
+-       newlines to carriage return/line feed  on  output  as  well  as  input.
+-       X/Open  Curses  documents  the  use  of these functions only for input.
+-       This difference arose from converting the pcurses source (1986),  which
+-       used  ioctl(2)  calls  and  the sgttyb structure, to termios (the POSIX
+-       terminal API).  In the former, both input and  output  were  controlled
+-       via a single option "CRMOD", while the latter separates these features.
+-       Because that conversion interferes with  output  optimization,  ncurses
+-       6.2 (2020) amended nl and nonl to eliminate their effect on output.
++       Formerly, ncurses used  nl  and  nonl  to  control  the  conversion  of
++       newlines  to  carriage  return/line  feed  on  output as well as input.
++       X/Open Curses documents the use of  these  functions  only  for  input.
++       This  difference arose from converting the pcurses source (1986), which
++       used ioctl(2) calls and the sgttyb structure,  to  termios  (the  POSIX
++       terminal  API).   In the former, both input and output conversions were
++       controlled via a single option  "CRMOD",  while  the  latter  separates
++       these   features.   Because  that  conversion  interferes  with  output
++       optimization, ncurses 6.2 (2020) amended nl and nonl to eliminate their
++       effect on output.
+ 
+ 
+ 
                                                                                                                                                                  SEE ALSO
                                                                                                                                                                  +@@ -409,7 +409,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-08                   curs_inopts(3x)
++ncurses 6.5                       2025-03-15                   curs_inopts(3x)
+ 
                                                                                                                                                                  
+ 
                                                                                                                                                                  
+ 
                                                                                                                                                                    
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.5-20250308+/doc/html/man/ncurses.3x.html	2025-03-09 00:47:46.000000000 +0000
++++ ncurses-6.5-20250315/doc/html/man/ncurses.3x.html	2025-03-15 22:08:54.000000000 +0000
+@@ -61,7 +61,7 @@
+        displays  with  output  optimized  to minimize screen updates.  ncurses
+        replaces the curses libraries from System V Release 4 Unix ("SVr4") and
+        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
+-       document describes ncurses version 6.5 (patch 20250308).
++       document describes ncurses version 6.5 (patch 20250315).
+ 
+        ncurses permits control of the terminal screen's contents;  abstraction
+        and  subdivision thereof with windows and pads; acquisition of keyboard
+Index: doc/html/man/resizeterm.3x.html
+--- ncurses-6.5-20250308+/doc/html/man/resizeterm.3x.html	2024-12-28 21:43:58.000000000 +0000
++++ ncurses-6.5-20250315/doc/html/man/resizeterm.3x.html	2025-03-15 22:08:54.000000000 +0000
+@@ -28,19 +28,19 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey 1996-on
+-  * @Id: resizeterm.3x,v 1.58 2024/12/28 21:18:35 tom Exp @
++  * @Id: resizeterm.3x,v 1.60 2025/03/15 21:12:18 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-resizeterm 3x 2024-12-28 ncurses 6.5 Library calls
++resizeterm 3x 2025-03-15 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                    resizeterm 3x 2024-12-28 ncurses 6.5 Library calls
                                                                                                                                                                    
++
                                                                                                                                                                    resizeterm 3x 2025-03-15 ncurses 6.5 Library calls
                                                                                                                                                                    
+ 
                                                                                                                                                                    + resizeterm(3x)                   Library calls                  resizeterm(3x)
+ 
+@@ -73,10 +73,10 @@
+            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
++       If the application has not set  up  a  handler  for  SIGWINCH  when  it
++       initializes  ncurses  (by  calling  initscr(3x)  or  newterm(3x)), then
++       ncurses establishes a SIGWINCH handler that notifies the library when a
++       window-resizing  event  has  occurred.   The  library  checks  for this
+        notification
+ 
+        o   when reading input data,
+@@ -192,7 +192,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-12-28                    resizeterm(3x)
++ncurses 6.5                       2025-03-15                    resizeterm(3x)
+ 
                                                                                                                                                                    
+ 
                                                                                                                                                                    
+ 
                                                                                                                                                                      
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.5-20250308+/doc/html/man/terminfo.5.html	2025-03-09 00:47:46.000000000 +0000
++++ ncurses-6.5-20250315/doc/html/man/terminfo.5.html	2025-03-15 22:08:55.000000000 +0000
+@@ -71,7 +71,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This document describes ncurses version 6.5 (patch 20250308).
++       This document describes ncurses version 6.5 (patch 20250315).
+ 
+ 
+ 
                                                                                                                                                    terminfo Entry Syntax
                                                                                                                                                    +Index: man/curs_add_wch.3x
+Prereq:  1.110 
+--- ncurses-6.5-20250308+/man/curs_add_wch.3x	2025-03-08 23:01:20.000000000 +0000
++++ ncurses-6.5-20250315/man/curs_add_wch.3x	2025-03-15 20:38:41.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_add_wch.3x,v 1.110 2025/03/08 23:01:20 tom Exp $
+-.TH curs_add_wch 3X 2025-03-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_add_wch.3x,v 1.112 2025/03/15 20:38:41 tom Exp $
++.TH curs_add_wch 3X 2025-03-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -144,6 +144,20 @@
+ from a
+ .I wchar_t
+ with \fB\%setcchar\fP(3X).
++A
++.I \%cchar_t
++can be copied from place to place using \fB\%win_wch\fP(3X) and
++.BR \%wadd_wch "."
++See \fB\%curs_attr\fP(3X) for values of predefined constants that can be
++usefully \*(``or\*(''ed with characters.
++A complex character whose only character component is a wide space,
++and whose only attribute is
++.BR \%WA_NORMAL ,
++is a
++.IR "blank character" ","
++and therefore combines with the window's background character;
++see \fB\%curs_bkgrnd\fP(3X).
++.PP
+ Much behavior depends on whether the wide characters in
+ .I wch
+ are spacing or non-spacing;
+@@ -233,20 +247,6 @@
+ Calling \fB\%win_wch\fP(3X) on the location of a nonprintable character
+ does not return the character itself,
+ but its \fB\%wunctrl\fP(3X) representation.
+-.PP
+-A
+-.I \%cchar_t
+-can be copied from place to place using \fB\%win_wch\fP(3X) and
+-.BR \%wadd_wch "."
+-See \fB\%curs_attr\fP(3X) for values of predefined constants that can be
+-usefully \*(``or\*(''ed with characters.
+-A complex character whose only character component is a wide space,
+-and whose only attribute is
+-.BR \%WA_NORMAL ,
+-is a
+-.IR "blank character" ","
+-and therefore combines with the background character;
+-see \fB\%curs_bkgrnd\fP(3X).
+ .SS wecho_wchar
+ .B \%echo_wchar
+ and
+@@ -275,13 +275,14 @@
+ .I \%ncurses
+ terms these
+ .I "forms-drawing characters."
+-The ACS default listed below is used if the
++.I curses
++uses the ACS default listed below if the terminal type lacks the
+ .B \%acs_chars
+ .RB \%( acsc )
+-.I \%term\%info
+-capability does not define a terminal-specific replacement for it,
++capability;
++that capability does not define a replacement for the character;
+ or if the terminal type and locale configuration
+-require Unicode to access these characters
++require Unicode to access these characters,
+ but the library is unable to use Unicode.
+ The \*(``acsc char\*('' column corresponds to how the characters are
+ specified in the
+@@ -481,9 +482,7 @@
+ .PP
+ In
+ .IR \%ncurses ,
+-they return
+-.B ERR
+-if
++these functions fail if
+ .bP
+ the
+ .I curses
+@@ -533,7 +532,7 @@
+ many publicly available
+ .I \%term\%info
+ entries include
+-.I \%acs_chars
++.B \%acs_chars
+ .RB \%( acsc )
+ capabilities in which their key characters
+ .RB ( pryz{|} )
+Index: man/curs_add_wchstr.3x
+Prereq:  1.55 
+--- ncurses-6.5-20250308+/man/curs_add_wchstr.3x	2025-02-01 22:57:57.000000000 +0000
++++ ncurses-6.5-20250315/man/curs_add_wchstr.3x	2025-03-15 20:41:04.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_add_wchstr.3x,v 1.55 2025/02/01 22:57:57 tom Exp $
+-.TH curs_add_wchstr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_add_wchstr.3x,v 1.57 2025/03/15 20:41:04 tom Exp $
++.TH curs_add_wchstr 3X 2025-03-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -118,18 +118,21 @@
+ .PP
+ In
+ .IR \%ncurses ","
+-they return
+-.B ERR
+-if
++these functions fail if
+ .bP
+-.I win
+-is
+-.I NULL
+-or
++the
++.I curses
++screen has not been initialized,
+ .bP
+ .I wchstr
+-is
+-.IR NULL "."
++is a null pointer,
++or
++.bP
++(for functions taking a
++.I \%WINDOW
++pointer argument)
++.I win
++is a null pointer.
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+Index: man/curs_addch.3x
+Prereq:  1.130 
+--- ncurses-6.5-20250308+/man/curs_addch.3x	2025-03-08 23:01:20.000000000 +0000
++++ ncurses-6.5-20250315/man/curs_addch.3x	2025-03-15 20:40:50.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addch.3x,v 1.130 2025/03/08 23:01:20 tom Exp $
+-.TH curs_addch 3X 2025-03-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addch.3x,v 1.132 2025/03/15 20:40:50 tom Exp $
++.TH curs_addch 3X 2025-03-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -124,12 +124,31 @@
+ character
+ from a
+ .I char
+-by assignment.
++by assignment or typecast.
+ Subsection \*(``Video Attributes\*('' of \fB\%attron\fP(3X) describes
+ how to manipulate its attributes and color pair.
+ (A color pair selection is not honored unless initialized;
+ see \fB\%start_color\fP(3X).)
+ .PP
++The object or expression
++.I ch
++may contain attributes and/or a color pair identifier.
++(A
++.I \%chtype
++can be copied from place to place using \fB\%winch\fP(3X) and
++.BR \%waddch .)
++See \fB\%curs_attr\fP(3X) for values of predefined constants that can be
++usefully \*(``or\*(''ed with characters.
++A
++.I ch
++whose character component is a space,
++and whose only attribute is
++.BR \%A_NORMAL ,
++is a
++.IR "blank character" ","
++and therefore combines with the window's background character;
++see \fB\%curs_bkgd\fP(3X).
++.PP
+ If the cursor is not at the bottom of the scrolling region
+ and advancement occurs at the right margin,
+ the cursor automatically wraps to the beginning of the next line.
+@@ -186,25 +205,6 @@
+ Calling \fB\%winch\fP(3X) on the location of a nonprintable character
+ does not return the character itself,
+ but its \fB\%unctrl\fP(3X) representation.
+-.PP
+-The object or expression
+-.I ch
+-may contain attributes and/or a color pair identifier.
+-(A
+-.I \%chtype
+-can be copied from place to place using \fB\%winch\fP(3X) and
+-.BR \%waddch .)
+-See \fB\%curs_attr\fP(3X) for values of predefined constants that can be
+-usefully \*(``or\*(''ed with characters.
+-A
+-.I ch
+-whose character component is a space,
+-and whose only attribute is
+-.BR \%A_NORMAL ,
+-is a
+-.IR "blank character" ","
+-and therefore combines with the background character;
+-see \fB\%curs_bkgd\fP(3X).
+ .SS wechochar
+ .B \%echochar
+ and
+@@ -234,13 +234,14 @@
+ .I \%ncurses
+ terms these
+ .I "forms-drawing characters."
+-The ACS default listed below is used if the
++.I curses
++uses the ACS default listed below if the terminal type lacks the
+ .B \%acs_chars
+ .RB \%( acsc )
+-.I \%term\%info
+-capability does not define a terminal-specific replacement for it,
++capability;
++that capability does not define a replacement for the character;
+ or if the terminal type and locale configuration
+-require Unicode to access these characters
++require Unicode to access these characters,
+ but the library is unable to use Unicode.
+ The \*(``acsc char\*('' column corresponds to how the characters are
+ specified in the
+@@ -303,9 +304,7 @@
+ .PP
+ In
+ .IR \%ncurses ,
+-they return
+-.B ERR
+-if
++these functions fail if
+ .bP
+ the
+ .I curses
+@@ -371,7 +370,7 @@
+ many publicly available
+ .I \%term\%info
+ entries include
+-.I \%acs_chars
++.B \%acs_chars
+ .RB \%( acsc )
+ capabilities in which their key characters
+ .RB ( pryz{|} )
+Index: man/curs_addchstr.3x
+Prereq:  1.60 
+--- ncurses-6.5-20250308+/man/curs_addchstr.3x	2025-02-01 22:50:42.000000000 +0000
++++ ncurses-6.5-20250315/man/curs_addchstr.3x	2025-03-15 20:41:04.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addchstr.3x,v 1.60 2025/02/01 22:50:42 tom Exp $
+-.TH curs_addchstr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addchstr.3x,v 1.62 2025/03/15 20:41:04 tom Exp $
++.TH curs_addchstr 3X 2025-03-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -116,18 +116,21 @@
+ .PP
+ In
+ .IR \%ncurses ","
+-they return
+-.B ERR
+-if
++these functions fail if
+ .bP
+-.I win
+-is
+-.I NULL
+-or
++the
++.I curses
++screen has not been initialized,
+ .bP
+ .I chstr
+-is
+-.IR NULL "."
++is a null pointer,
++or
++.bP
++(for functions taking a
++.I \%WINDOW
++pointer argument)
++.I win
++is a null pointer.
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+Index: man/curs_addstr.3x
+Prereq:  1.67 
+--- ncurses-6.5-20250308+/man/curs_addstr.3x	2025-02-01 22:48:11.000000000 +0000
++++ ncurses-6.5-20250315/man/curs_addstr.3x	2025-03-15 20:41:04.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addstr.3x,v 1.67 2025/02/01 22:48:11 tom Exp $
+-.TH curs_addstr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addstr.3x,v 1.69 2025/03/15 20:41:04 tom Exp $
++.TH curs_addstr 3X 2025-03-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -99,17 +99,20 @@
+ .PP
+ In
+ .IR \%ncurses ","
+-they return
+-.B ERR
+-if
++these functions fail if
+ .bP
+-.I win
+-is
+-.IR NULL ","
++the
++.I curses
++screen has not been initialized,
+ .bP
+ .I str
+-is
+-.IR NULL ","
++is a null pointer,
++.bP
++(for functions taking a
++.I \%WINDOW
++pointer argument)
++.I win
++is a null pointer,
+ or
+ .bP
+ an internal \fB\%waddch\fP(3X) call returns
+Index: man/curs_addwstr.3x
+Prereq:  1.58 
+--- ncurses-6.5-20250308+/man/curs_addwstr.3x	2025-02-01 22:54:32.000000000 +0000
++++ ncurses-6.5-20250315/man/curs_addwstr.3x	2025-03-15 20:41:04.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addwstr.3x,v 1.58 2025/02/01 22:54:32 tom Exp $
+-.TH curs_addwstr 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addwstr.3x,v 1.60 2025/03/15 20:41:04 tom Exp $
++.TH curs_addwstr 3X 2025-03-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -110,17 +110,20 @@
+ .PP
+ In
+ .IR \%ncurses ","
+-they return
+-.B ERR
+-if
++these functions fail if
+ .bP
+-.I win
+-is
+-.IR NULL ","
++the
++.I curses
++screen has not been initialized,
+ .bP
+ .I wstr
+-is
+-.IR NULL ","
++is a null pointer,
++.bP
++(for functions taking a
++.I \%WINDOW
++pointer argument)
++.I win
++is a null pointer,
+ or
+ .bP
+ an internal \fB\%wadd_wch\fP(3X) call returns
+Index: man/curs_getch.3x
+Prereq:  1.119 
+--- ncurses-6.5-20250308+/man/curs_getch.3x	2025-02-15 19:35:55.000000000 +0000
++++ ncurses-6.5-20250315/man/curs_getch.3x	2025-03-15 22:04:20.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getch.3x,v 1.119 2025/02/15 19:35:55 tom Exp $
+-.TH curs_getch 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_getch.3x,v 1.121 2025/03/15 22:04:20 tom Exp $
++.TH curs_getch 3X 2025-03-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -221,35 +221,55 @@
+ waiting to see if,
+ and how soon,
+ further input arrives.
+-When
+-.I curses
+-reads such an ambiguous character,
+-it sets a timer.
+-If the remainder of the sequence does not arrive within the designated
+-time,
++.bP
++If the escape sequence
++matches a string capability defining a function key
++for the terminal type
++(such as
++.B \%key_home
++.RB \%( khome )
++or
++.B \%key_up
++.RB \%( kuu1 )),
+ .B \%wgetch
+-returns the prefix character;
+-otherwise,
+-it returns the function key code corresponding to the unique sequence
++returns the function key code corresponding to the unique sequence
+ defined by the terminal.
++.bP
++If the escape sequence matches no function keys
++defined for the terminal type,
++.B \%wgetch
++returns the code of the last
++(most recent)
++character it has read.
++.bP
++If
++.B \%wgetch
++cannot decide the validity of the input as a function key
++because it has not read enough characters to disambiguate it,
++the function waits until it has this information or the
++.IR "escape delay" ","
++configured by the global variable
++.I \%ESCDELAY
++(an extension;
++see section \*(``EXTENSIONS\*('' below)
++or the environment variable of the same name
++(see section \*(``ENVIRONMENT\*('' of \fB\%ncurses\fP(3X)),
++also an extension,
++elapses.
++.PP
+ Consequently,
+ a user of a
+ .I curses
+-application may experience a delay after the escape key is pressed
++application that employs keypad mode
++may experience a pause or \*(``hang\*(''
++after the escape key is pressed
+ while
+ .I curses
+-disambiguates the input;
+-see section \*(``EXTENSIONS\*('' below.
++collects sufficient characters to disambiguate the input.
+ If the window is in \*(``no time-out\*('' mode,
+-the timer does not expire;
+-it is an infinite
+-(or very large)
+-value.
+-See \fB\%notimeout\fP(3X).
+-Because function key sequences usually begin with ESC,
+-the terminal may appear to hang in no time-out mode after the user
+-presses the escape key.
+-Generally,
++the escape delay is effectively infinite;
++see \fB\%notimeout\fP(3X).
++In the event of such a pause,
+ further typing \*(``awakens\*(''
+ .IR curses "."
+ .SS "Ungetting Characters"
+@@ -290,6 +310,7 @@
+ Symbol	Key name
+ =
+ KEY_BREAK	Break key
++.ne 4
+ KEY_DOWN	Arrow keys
+ KEY_UP	\^
+ KEY_LEFT	\^
+@@ -709,6 +730,16 @@
+ .\" https://web.archive.org/web/20200923185647/https://man.netbsd.org/curses_input.3
+ had added them along with
+ .IR \%KEY_MOUSE "."
++.SH HISTORY
++4BSD (1980)
++introduced
++.I \%wgetch
++and its variants.
++.PP
++.I \%ncurses
++1.9.9g (1996)
++added
++.IR \%has_key "."
+ .SH SEE ALSO
+ ECMA-6 \*(``7-bit coded Character Set\*(''
+ \%  Sat, 08 Mar 2025 06:56:38 -0500
++ -- Thomas E. Dickey   Sat, 15 Mar 2025 07:18:45 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250308+/package/debian-mingw64/changelog	2025-03-08 11:56:38.000000000 +0000
++++ ncurses-6.5-20250315/package/debian-mingw64/changelog	2025-03-15 11:18:45.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250308) unstable; urgency=low
++ncurses6td (6.5+20250315) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 08 Mar 2025 06:56:38 -0500
++ -- Thomas E. Dickey   Sat, 15 Mar 2025 07:18:45 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250308+/package/debian/changelog	2025-03-08 11:56:38.000000000 +0000
++++ ncurses-6.5-20250315/package/debian/changelog	2025-03-15 11:18:45.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250308) unstable; urgency=low
++ncurses6td (6.5+20250315) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 08 Mar 2025 06:56:38 -0500
++ -- Thomas E. Dickey   Sat, 15 Mar 2025 07:18:45 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.693 
+--- ncurses-6.5-20250308+/package/mingw-ncurses.nsi	2025-03-08 11:56:38.000000000 +0000
++++ ncurses-6.5-20250315/package/mingw-ncurses.nsi	2025-03-15 11:18:45.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.693 2025/03/08 11:56:38 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.694 2025/03/15 11:18:45 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0308"
++!define VERSION_MMDD  "0315"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250308+/package/mingw-ncurses.spec	2025-03-08 11:56:38.000000000 +0000
++++ ncurses-6.5-20250315/package/mingw-ncurses.spec	2025-03-15 11:18:45.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250308
++Release: 20250315
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20250308+/package/ncurses.spec	2025-03-08 11:56:38.000000000 +0000
++++ ncurses-6.5-20250315/package/ncurses.spec	2025-03-15 11:18:45.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250308
++Release: 20250315
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20250308+/package/ncursest.spec	2025-03-08 11:56:38.000000000 +0000
++++ ncurses-6.5-20250315/package/ncursest.spec	2025-03-15 11:18:45.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250308
++Release: 20250315
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250322.patch b/packages/ncurses/6.5/ncurses-6.5-20250322.patch
new file mode 100644
index 0000000000..b91c19a6e7
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250322.patch
@@ -0,0 +1,428 @@
+# ncurses 6.5 - patch 20250322 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250322.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Mar 23 00:26:35 UTC 2025
+# ------------------------------------------------------------------------------
+# Ada95/src/Makefile.in             |   16 +++++++++++-----
+# NEWS                              |    8 +++++++-
+# VERSION                           |    2 +-
+# dist.mk                           |    4 ++--
+# doc/html/man/curs_outopts.3x.html |    8 ++++----
+# doc/html/man/ncurses.3x.html      |    2 +-
+# doc/html/man/terminfo.5.html      |    2 +-
+# doc/html/man/user_caps.5.html     |    8 ++++----
+# man/curs_outopts.3x               |    7 +++++--
+# man/user_caps.5                   |   16 ++++++++++++++--
+# ncurses/base/lib_mouse.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 +-
+# 18 files changed, 64 insertions(+), 36 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/src/Makefile.in
+Prereq:  1.97 
+--- ncurses-6.5-20250315+/Ada95/src/Makefile.in	2024-08-10 18:18:44.000000000 +0000
++++ ncurses-6.5-20250322/Ada95/src/Makefile.in	2025-03-22 21:39:31.000000000 +0000
+@@ -1,5 +1,5 @@
+ ##############################################################################
+-# Copyright 2018-2021,2024 Thomas E. Dickey                                  #
++# Copyright 2018-2024,2025 Thomas E. Dickey                                  #
+ # Copyright 1999-2016,2018 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -29,7 +29,7 @@
+ #
+ #  Author:  Juergen Pfeifer, 1996
+ #
+-#  $Id: Makefile.in,v 1.97 2024/08/10 18:18:44 tom Exp $
++#  $Id: Makefile.in,v 1.99 2025/03/22 21:39:31 tom Exp $
+ #
+ .SUFFIXES:
+ 
+@@ -284,9 +284,11 @@
+ 	$(BUILD_DIR)/static-obj
+ 
+ @USE_GNAT_PROJECTS@$(BUILD_DIR_LIB)/$(STATIC_LIBNAME) :: \
+-@USE_GNAT_PROJECTS@		$(ABASE)-trace.adb \
+-@USE_GNAT_PROJECTS@		$(STATIC_C_OBJS) \
+ @USE_GNAT_PROJECTS@		$(STATIC_DIRS)
++@USE_GNAT_PROJECTS@$(BUILD_DIR_LIB)/$(STATIC_LIBNAME) :: \
++@USE_GNAT_PROJECTS@		$(ABASE)-trace.adb \
++@USE_GNAT_PROJECTS@		$(STATIC_C_OBJS)
++@USE_GNAT_PROJECTS@	@echo "Making $@"
+ @USE_GNAT_PROJECTS@	@cf_ada_config@gprconfig --batch --config=Ada --config=C,,,,@cf_ada_config_C@
+ @USE_GNAT_PROJECTS@	-rm -f $(GNAT_PROJECT)
+ @USE_GNAT_PROJECTS@	$(SHELL) $(srcdir)/library-cfg.sh static library.gpr $(CFLAGS_NORMAL) >$(GNAT_PROJECT)
+@@ -320,6 +322,7 @@
+ #NEW:BEGIN
+ #@USE_GNAT_LIBRARIES@install \
+ #@USE_GNAT_LIBRARIES@install.libs ::
++#@USE_GNAT_LIBRARIES@	@echo "Making $@"
+ #@USE_GNAT_LIBRARIES@	@cf_ada_config@gprconfig --batch --config=Ada --config=C,,,,@cf_ada_config_C@
+ #@USE_GNAT_LIBRARIES@	-rm -f $(GNAT_PROJECT)
+ #@USE_GNAT_LIBRARIES@	$(SHELL) $(srcdir)/library-cfg.sh static library.gpr $(CFLAGS_NORMAL) >$(GNAT_PROJECT)
+@@ -344,6 +347,7 @@
+ #NEW:BEGIN
+ #@USE_GNAT_LIBRARIES@uninstall \
+ #@USE_GNAT_LIBRARIES@uninstall.libs ::
++#@USE_GNAT_LIBRARIES@	@echo "Making $@"
+ #@USE_GNAT_LIBRARIES@	@cf_ada_config@gprconfig --batch --config=Ada --config=C,,,,@cf_ada_config_C@
+ #@USE_GNAT_LIBRARIES@	-rm -f $(GNAT_PROJECT)
+ #@USE_GNAT_LIBRARIES@	$(SHELL) $(srcdir)/library-cfg.sh static library.gpr $(CFLAGS_NORMAL) >$(GNAT_PROJECT)
+@@ -369,9 +373,11 @@
+ 
+ @MAKE_ADA_SHAREDLIB@all :: $(BUILD_DIR_LIB)/$(SHARED_LIBNAME)
+ @MAKE_ADA_SHAREDLIB@$(BUILD_DIR_LIB)/$(SHARED_LIBNAME) :: \
++@MAKE_ADA_SHAREDLIB@		$(SHARED_DIRS)
++@MAKE_ADA_SHAREDLIB@$(BUILD_DIR_LIB)/$(SHARED_LIBNAME) :: \
+ @MAKE_ADA_SHAREDLIB@		$(ABASE)-trace.adb \
+-@MAKE_ADA_SHAREDLIB@		$(SHARED_DIRS) \
+ @MAKE_ADA_SHAREDLIB@		$(SHARED_OBJS)
++@MAKE_ADA_SHAREDLIB@	@echo "Making $@"
+ @MAKE_ADA_SHAREDLIB@	cp $(SHARED_OBJS) $(BUILD_DIR)/dynamic-obj/
+ @MAKE_ADA_SHAREDLIB@	@cf_ada_config@gprconfig --batch --config=Ada --config=C,,,,@cf_ada_config_C@
+ @MAKE_ADA_SHAREDLIB@	-rm -f $(GNAT_PROJECT)
+Index: NEWS
+Prereq:  1.4261 
+--- ncurses-6.5-20250315+/NEWS	2025-03-15 23:56:46.000000000 +0000
++++ ncurses-6.5-20250322/NEWS	2025-03-22 23:18:22.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4261 2025/03/15 23:56:46 tom Exp $
++-- $Id: NEWS,v 1.4264 2025/03/22 23:18:22 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.
+ 
++20250322
++	+ add a null pointer check in mouse-initialization, for the
++	  experimental Windows driver (patch by Daniel Starke).
++	+ improve makefile dependency in Ada95/src
++	+ add note in user_caps.5 addressing a quibble about dates.
++
+ 20250315
+ 	+ improve formatting/style of manpages (patches by Branden Robinson).
+ 
+Index: VERSION
+--- ncurses-6.5-20250315+/VERSION	2025-03-15 11:18:45.000000000 +0000
++++ ncurses-6.5-20250322/VERSION	2025-03-22 10:41:37.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250315
++5:0:10	6.5	20250322
+Index: dist.mk
+Prereq:  1.1660 
+--- ncurses-6.5-20250315+/dist.mk	2025-03-15 11:18:45.000000000 +0000
++++ ncurses-6.5-20250322/dist.mk	2025-03-22 10:41:37.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1660 2025/03/15 11:18:45 tom Exp $
++# $Id: dist.mk,v 1.1661 2025/03/22 10:41:37 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 = 5
+-NCURSES_PATCH = 20250315
++NCURSES_PATCH = 20250322
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/curs_outopts.3x.html
+--- ncurses-6.5-20250315+/doc/html/man/curs_outopts.3x.html	2025-03-09 00:55:54.000000000 +0000
++++ ncurses-6.5-20250322/doc/html/man/curs_outopts.3x.html	2025-03-22 22:52:51.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_outopts.3x,v 1.91 2025/03/08 23:19:30 tom Exp @
++  * @Id: curs_outopts.3x,v 1.93 2025/03/22 22:46:52 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_outopts 3x 2025-03-08 ncurses 6.5 Library calls
++curs_outopts 3x 2025-03-22 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                    curs_outopts 3x 2025-03-08 ncurses 6.5 Library calls
                                                                                                                                                    
++
                                                                                                                                                    curs_outopts 3x 2025-03-22 ncurses 6.5 Library calls
                                                                                                                                                    
+ 
                                                                                                                                                    + curs_outopts(3x)                 Library calls                curs_outopts(3x)
+ 
+@@ -199,7 +199,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-08                  curs_outopts(3x)
++ncurses 6.5                       2025-03-22                  curs_outopts(3x)
+ 
                                                                                                                                                    
+ 
                                                                                                                                                    
+ 
                                                                                                                                                      
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.5-20250315+/doc/html/man/ncurses.3x.html	2025-03-15 22:08:54.000000000 +0000
++++ ncurses-6.5-20250322/doc/html/man/ncurses.3x.html	2025-03-22 22:52:53.000000000 +0000
+@@ -61,7 +61,7 @@
+        displays  with  output  optimized  to minimize screen updates.  ncurses
+        replaces the curses libraries from System V Release 4 Unix ("SVr4") and
+        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
+-       document describes ncurses version 6.5 (patch 20250315).
++       document describes ncurses version 6.5 (patch 20250322).
+ 
+        ncurses permits control of the terminal screen's contents;  abstraction
+        and  subdivision thereof with windows and pads; acquisition of keyboard
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.5-20250315+/doc/html/man/terminfo.5.html	2025-03-15 22:08:55.000000000 +0000
++++ ncurses-6.5-20250322/doc/html/man/terminfo.5.html	2025-03-22 22:52:53.000000000 +0000
+@@ -71,7 +71,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This document describes ncurses version 6.5 (patch 20250315).
++       This document describes ncurses version 6.5 (patch 20250322).
+ 
+ 
+ 
                                                                                                                                                    terminfo Entry Syntax
                                                                                                                                                    +Index: doc/html/man/user_caps.5.html
+--- ncurses-6.5-20250315+/doc/html/man/user_caps.5.html	2024-06-08 23:12:52.000000000 +0000
++++ ncurses-6.5-20250322/doc/html/man/user_caps.5.html	2025-03-22 22:52:53.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: user_caps.5,v 1.51 2024/06/08 21:01:53 tom Exp @
++  * @Id: user_caps.5,v 1.53 2025/03/22 22:27:44 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-user_caps 5 2024-06-08 ncurses 6.5 File formats
++user_caps 5 2025-03-22 ncurses 6.5 File formats
+ 
+ 
+ 
+ 
+-
                                                                                                                                                    user_caps 5 2024-06-08 ncurses 6.5 File formats
                                                                                                                                                    
++
                                                                                                                                                    user_caps 5 2025-03-22 ncurses 6.5 File formats
                                                                                                                                                    
+ 
                                                                                                                                                    + user_caps(5)                     File formats                     user_caps(5)
+ 
+@@ -403,7 +403,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                      user_caps(5)
++ncurses 6.5                       2025-03-22                      user_caps(5)
+ 
                                                                                                                                                    
+ 
                                                                                                                                                    
+ 
                                                                                                                                                      
+Index: man/curs_outopts.3x
+Prereq:  1.91 
+--- ncurses-6.5-20250315+/man/curs_outopts.3x	2025-03-08 23:19:30.000000000 +0000
++++ ncurses-6.5-20250322/man/curs_outopts.3x	2025-03-22 22:46:52.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_outopts.3x,v 1.91 2025/03/08 23:19:30 tom Exp $
+-.TH curs_outopts 3X 2025-03-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_outopts.3x,v 1.93 2025/03/22 22:46:52 tom Exp $
++.TH curs_outopts 3X 2025-03-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -118,6 +118,9 @@
+ .I \%term\%info
+ database.
+ .\" TODO: What's the historical rationale for the `idcok()` feature?
++.\" TED: Solaris SVr4 source uses this to bypass some logic which may not work
++.\" with terminals that use "magic cookies" (cells where the video attribute
++.\" changes and no actual character is stored).
+ .SS idlok
+ Setting
+ .IR win 's
+Index: man/user_caps.5
+Prereq:  1.51 
+--- ncurses-6.5-20250315+/man/user_caps.5	2024-06-08 21:01:53.000000000 +0000
++++ ncurses-6.5-20250322/man/user_caps.5	2025-03-22 22:27:44.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: user_caps.5,v 1.51 2024/06/08 21:01:53 tom Exp $
+-.TH user_caps 5 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
++.\" $Id: user_caps.5,v 1.53 2025/03/22 22:27:44 tom Exp $
++.TH user_caps 5 2025-03-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -64,6 +64,18 @@
+ .\" the standard, so lacks a "HISTORY" section.  However, `tigetstr()`
+ .\" and `tputs()` are identified in the same document as new to Issue 4,
+ .\" so GBR conjectures that the list came in at the same time.
++.\"
++.\" TED: the list is reflected in term.h, seen in examples from AIX 3 and 4,
++.\" HP-UX 9, OSF/1, Solaris 2.4, dating from 1992-1994 -- all before 1996.
++.\" The AIX 4 file has copyright dates starting in 1984;
++.\" the Solaris file cites 1988 (the others have no copyright comments).
++.\" Those term.h files note in a comment that it is generated by a script with
++.\" a data file, i.e.,
++.\"	term.h - this file is automatically made from caps and maketerm.ex.
++.\" illumos-gate has related source, with a "caps" file having AT&T copyright
++.\" for 1988, and UCB copyright for 1982, 1986, 1988.  That 1982 is interesting
++.\" (hinting that something may have been in the initial releated of System V)
++.\" but the first release with tic appears to be SVr2 in 1984.
+ .PP
+ Most of the \fIextensions\fP in this fixed repertoire were additions
+ to the tables of Boolean, numeric and string capabilities.
+Index: ncurses/base/lib_mouse.c
+Prereq:  1.208 
+--- ncurses-6.5-20250315+/ncurses/base/lib_mouse.c	2025-02-15 15:12:21.000000000 +0000
++++ ncurses-6.5-20250322/ncurses/base/lib_mouse.c	2025-03-22 23:14:11.000000000 +0000
+@@ -85,7 +85,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_mouse.c,v 1.208 2025/02/15 15:12:21 tom Exp $")
++MODULE_ID("$Id: lib_mouse.c,v 1.209 2025/03/22 23:14:11 Daniel.Starke Exp $")
+ 
+ #include 
+ 
+@@ -761,7 +761,8 @@
+     /* we know how to recognize mouse events under "xterm" */
+     if (NonEmpty(key_mouse)) {
+ 	init_xterm_mouse(sp);
+-    } else if (strstr(SP_TERMTYPE term_names, "xterm") != NULL) {
++    } else if (SP_TERMTYPE term_names != NULL
++	       && strstr(SP_TERMTYPE term_names, "xterm") != NULL) {
+ 	if (_nc_add_to_try(&(sp->_keytry), xterm_kmous, KEY_MOUSE) == OK)
+ 	    init_xterm_mouse(sp);
+     }
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250315+/package/debian-mingw/changelog	2025-03-15 11:18:45.000000000 +0000
++++ ncurses-6.5-20250322/package/debian-mingw/changelog	2025-03-22 10:41:37.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250315) unstable; urgency=low
++ncurses6td (6.5+20250322) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 15 Mar 2025 07:18:45 -0400
++ -- Thomas E. Dickey   Sat, 22 Mar 2025 06:41:37 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250315+/package/debian-mingw64/changelog	2025-03-15 11:18:45.000000000 +0000
++++ ncurses-6.5-20250322/package/debian-mingw64/changelog	2025-03-22 10:41:37.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250315) unstable; urgency=low
++ncurses6td (6.5+20250322) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 15 Mar 2025 07:18:45 -0400
++ -- Thomas E. Dickey   Sat, 22 Mar 2025 06:41:37 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250315+/package/debian/changelog	2025-03-15 11:18:45.000000000 +0000
++++ ncurses-6.5-20250322/package/debian/changelog	2025-03-22 10:41:37.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250315) unstable; urgency=low
++ncurses6td (6.5+20250322) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 15 Mar 2025 07:18:45 -0400
++ -- Thomas E. Dickey   Sat, 22 Mar 2025 06:41:37 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.694 
+--- ncurses-6.5-20250315+/package/mingw-ncurses.nsi	2025-03-15 11:18:45.000000000 +0000
++++ ncurses-6.5-20250322/package/mingw-ncurses.nsi	2025-03-22 10:41:37.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.694 2025/03/15 11:18:45 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.695 2025/03/22 10:41:37 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0315"
++!define VERSION_MMDD  "0322"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250315+/package/mingw-ncurses.spec	2025-03-15 11:18:45.000000000 +0000
++++ ncurses-6.5-20250322/package/mingw-ncurses.spec	2025-03-22 10:41:37.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250315
++Release: 20250322
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20250315+/package/ncurses.spec	2025-03-15 11:18:45.000000000 +0000
++++ ncurses-6.5-20250322/package/ncurses.spec	2025-03-22 10:41:37.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250315
++Release: 20250322
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20250315+/package/ncursest.spec	2025-03-15 11:18:45.000000000 +0000
++++ ncurses-6.5-20250322/package/ncursest.spec	2025-03-22 10:41:37.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250315
++Release: 20250322
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250329.patch b/packages/ncurses/6.5/ncurses-6.5-20250329.patch
new file mode 100644
index 0000000000..bd9e65f4db
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250329.patch
@@ -0,0 +1,530 @@
+# ncurses 6.5 - patch 20250329 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250329.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sat Mar 29 23:30:04 UTC 2025
+# ------------------------------------------------------------------------------
+# NEWS                             |   12 ++++++++++-
+# VERSION                          |    2 -
+# dist.mk                          |    4 +--
+# include/nc_win32.h               |    3 +-
+# misc/terminfo.src                |   10 ++++++---
+# ncurses/tinfo/MKfallback.sh      |    8 +++----
+# ncurses/tinfo/lib_win32con.c     |   40 ++++++++++++++++++-------------------
+# ncurses/tinfo/parse_entry.c      |    4 ++-
+# ncurses/tinfo/tinfo_driver.c     |   18 +++++++++++++---
+# ncurses/win32con/win32_driver.c  |    8 +++----
+# ncurses/win32con/win_driver.c    |    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 -
+# 18 files changed, 84 insertions(+), 55 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4264 
+--- ncurses-6.5-20250322+/NEWS	2025-03-22 23:18:22.000000000 +0000
++++ ncurses-6.5-20250329/NEWS	2025-03-29 22:52:37.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4264 2025/03/22 23:18:22 tom Exp $
++-- $Id: NEWS,v 1.4267 2025/03/29 22:52:37 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.
+ 
++20250329
++	+ add XM/xm to ms-terminal, to enable mouse with experimental Windows
++	  driver -TD
++	+ add -x option to infocmp in MKfallback.sh
++	+ improve experimental Windows driver by restoring the scroll buffer
++	  and console mode, e.g., when reset_prog_mode or endwin is called
++	  (patch by Daniel Starke).
++	+ add a buffer-limit check in postprocess_termcap (report/testcase by
++	  Yifan Zhang).
++
+ 20250322
+ 	+ add a null pointer check in mouse-initialization, for the
+ 	  experimental Windows driver (patch by Daniel Starke).
+Index: VERSION
+--- ncurses-6.5-20250322+/VERSION	2025-03-22 10:41:37.000000000 +0000
++++ ncurses-6.5-20250329/VERSION	2025-03-29 11:09:16.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250322
++5:0:10	6.5	20250329
+Index: dist.mk
+Prereq:  1.1661 
+--- ncurses-6.5-20250322+/dist.mk	2025-03-22 10:41:37.000000000 +0000
++++ ncurses-6.5-20250329/dist.mk	2025-03-29 11:09:16.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1661 2025/03/22 10:41:37 tom Exp $
++# $Id: dist.mk,v 1.1662 2025/03/29 11:09:16 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 = 5
+-NCURSES_PATCH = 20250322
++NCURSES_PATCH = 20250329
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: include/nc_win32.h
+Prereq:  1.16 
+--- ncurses-6.5-20250322+/include/nc_win32.h	2025-03-08 14:21:17.000000000 +0000
++++ ncurses-6.5-20250329/include/nc_win32.h	2025-03-29 16:45:33.000000000 +0000
+@@ -31,7 +31,7 @@
+  * Author: Thomas Dickey, 2008-on                                           *
+  ****************************************************************************/
+ 
+-/* $Id: nc_win32.h,v 1.16 2025/03/08 14:21:17 tom Exp $ */
++/* $Id: nc_win32.h,v 1.17 2025/03/29 16:45:33 Daniel.Starke Exp $ */
+ 
+ #ifndef NC_WIN32_H
+ #define NC_WIN32_H 1
+@@ -109,6 +109,7 @@
+ extern NCURSES_EXPORT(int)    _nc_console_keyok(int keycode,int flag);
+ extern NCURSES_EXPORT(bool)   _nc_console_keyExist(int keycode);
+ extern NCURSES_EXPORT(bool)   _nc_console_checkinit(bool initFlag, bool assumeTermInfo);
++extern NCURSES_EXPORT(bool)   _nc_console_restore(void);
+ extern NCURSES_EXPORT(int)    _nc_console_vt_supported(void);
+ 
+ #ifdef _NC_CHECK_MINTTY
+Index: misc/terminfo.src
+--- ncurses-6.5-20250322+/misc/terminfo.src	2025-03-01 21:54:30.000000000 +0000
++++ ncurses-6.5-20250329/misc/terminfo.src	2025-03-29 22:49:47.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.1175 $
+-#	$Date: 2025/03/01 21:54:30 $
++#	$Revision: 1.1176 $
++#	$Date: 2025/03/29 22:49:47 $
+ #
+ # 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
+@@ -4760,7 +4760,7 @@
+ 	use=bracketed+paste, use=xterm+pcfkeys, use=ansi+rep,
+ 	use=xterm+sm+1006, use=ecma+index, use=ecma+italics,
+ 	use=ecma+strikeout, use=vt420+lrmm, use=xterm-basic,
+-	use=xterm+focus, use=xterm+tmux,
++	use=xterm+focus, use=xterm+tmux, use=xterm+sm+1003,
+ 
+ #### Visual Studio
+ # Visual Studio Code 1.45.0 uses xterm.js 12.8.1 (see https://xtermjs.org/).
+@@ -27808,4 +27808,8 @@
+ #	+ add color to vt525 (Branden Robinson)
+ #	+ add vt520-w and vt525-w (Branden Robinson)
+ #
++# 2025-03-29
++#	+ add XM/xm to ms-terminal, to enable mouse with experimental Windows
++#	  driver -TD
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: ncurses/tinfo/MKfallback.sh
+Prereq:  1.28 
+--- ncurses-6.5-20250322+/ncurses/tinfo/MKfallback.sh	2024-12-21 18:45:15.000000000 +0000
++++ ncurses-6.5-20250329/ncurses/tinfo/MKfallback.sh	2025-03-29 22:48:05.000000000 +0000
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ ##############################################################################
+-# Copyright 2020,2023 Thomas E. Dickey                                       #
++# Copyright 2020-2023,2025 Thomas E. Dickey                                  #
+ # Copyright 1998-2019,2020 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: MKfallback.sh,v 1.28 2024/12/21 18:45:15 tom Exp $
++# $Id: MKfallback.sh,v 1.29 2025/03/29 22:48:05 tom Exp $
+ #
+ # MKfallback.sh -- create fallback table for entry reads
+ #
+@@ -95,7 +95,7 @@
+ 	for x in "$@"
+ 	do
+ 		echo "/* $x */"
+-		"$infocmp_path" -E "$x" | sed -e 's/[ 	]short[ 	]/ NCURSES_INT2 /g'
++		"$infocmp_path" -x -E "$x" | sed -e 's/[ 	]short[ 	]/ NCURSES_INT2 /g'
+ 	done
+ 
+ 	cat <
+ 
+-MODULE_ID("$Id: lib_win32con.c,v 1.19 2025/03/08 14:20:11 tom Exp $")
++MODULE_ID("$Id: lib_win32con.c,v 1.21 2025/03/29 19:36:13 tom Exp $")
+ 
+ #if defined(_NC_WINDOWS)
+ 
+@@ -259,36 +259,20 @@
+ 	T(("lib_win32con:_nc_console_setmode %s", _nc_trace_ttymode(arg)));
+ 	if (hdl == WINCONSOLE.inp) {
+ 	    dwFlag = arg->dwFlagIn | ENABLE_MOUSE_INPUT | VT_FLAG_IN;
+-	    if (WINCONSOLE.isTermInfoConsole)
+-		dwFlag |= (VT_FLAG_IN);
+-	    else
+-		dwFlag &= (DWORD) ~ (VT_FLAG_IN);
+ 	    TRCTTYIN(dwFlag);
+ 	    SetConsoleMode(hdl, dwFlag);
+ 
+ 	    alt = OutHandle();
+ 	    dwFlag = arg->dwFlagOut;
+-	    if (WINCONSOLE.isTermInfoConsole)
+-		dwFlag |= (VT_FLAG_OUT);
+-	    else
+-		dwFlag |= (VT_FLAG_OUT);
+ 	    TRCTTYOUT(dwFlag);
+ 	    SetConsoleMode(alt, dwFlag);
+ 	} else {
+ 	    dwFlag = arg->dwFlagOut;
+-	    if (WINCONSOLE.isTermInfoConsole)
+-		dwFlag |= (VT_FLAG_OUT);
+-	    else
+-		dwFlag |= (VT_FLAG_OUT);
+ 	    TRCTTYOUT(dwFlag);
+ 	    SetConsoleMode(hdl, dwFlag);
+ 
+ 	    alt = WINCONSOLE.inp;
+ 	    dwFlag = arg->dwFlagIn | ENABLE_MOUSE_INPUT;
+-	    if (WINCONSOLE.isTermInfoConsole)
+-		dwFlag |= (VT_FLAG_IN);
+-	    else
+-		dwFlag &= (DWORD) ~ (VT_FLAG_IN);
+ 	    TRCTTYIN(dwFlag);
+ 	    SetConsoleMode(alt, dwFlag);
+ 	    T(("effective mode set %s", _nc_trace_ttymode(&TRCTTY)));
+@@ -404,7 +388,6 @@
+     return result;
+ }
+ 
+-#if 0
+ static bool
+ restore_original_screen(void)
+ {
+@@ -426,7 +409,7 @@
+ 		     bufferCoord,
+ 		     &save_region)) {
+ 	result = TRUE;
+-	mvcur(-1, -1, LINES - 2, 0);
++	SetConsoleCursorPosition(WINCONSOLE.hdl, WINCONSOLE.save_SBI.dwCursorPosition);
+ 	T(("... restore original screen contents ok %dx%d (%d,%d - %d,%d)",
+ 	   WINCONSOLE.save_size.Y,
+ 	   WINCONSOLE.save_size.X,
+@@ -439,7 +422,6 @@
+     }
+     return result;
+ }
+-#endif
+ 
+ static bool
+ read_screen_data(void)
+@@ -1247,5 +1229,23 @@
+     }
+     returnBool(res);
+ }
++
++NCURSES_EXPORT(bool)
++_nc_console_restore(void)
++{
++    bool res = FALSE;
++
++    T((T_CALLED("lib_win32con::_nc_console_restore")));
++    if (WINCONSOLE.hdl != INVALID_HANDLE_VALUE) {
++	res = TRUE;
++	if (!WINCONSOLE.buffered) {
++	    _nc_console_set_scrollback(TRUE, &WINCONSOLE.save_SBI);
++	    if (!restore_original_screen())
++		res = FALSE;
++	}
++	SetConsoleCursorInfo(WINCONSOLE.hdl, &WINCONSOLE.save_CI);
++    }
++    returnBool(res);
++}
+ 
+ #endif // _NC_WINDOWS
+Index: ncurses/tinfo/parse_entry.c
+Prereq:  1.115 
+--- ncurses-6.5-20250322+/ncurses/tinfo/parse_entry.c	2025-02-20 09:11:49.000000000 +0000
++++ ncurses-6.5-20250329/ncurses/tinfo/parse_entry.c	2025-03-24 22:27:29.000000000 +0000
+@@ -48,7 +48,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: parse_entry.c,v 1.115 2025/02/20 09:11:49 tom Exp $")
++MODULE_ID("$Id: parse_entry.c,v 1.116 2025/03/24 22:27:29 tom Exp $")
+ 
+ #ifdef LINT
+ static short const parametrized[] =
+@@ -990,6 +990,8 @@
+ 	    bp = tp->Strings[from_ptr->nte_index];
+ 	    if (VALID_STRING(bp)) {
+ 		for (dp = buf2; *bp; bp++) {
++		    if ((size_t) (dp - buf2) >= (sizeof(buf2) - sizeof(TERMTYPE2)))
++			  break;
+ 		    if (bp[0] == '$' && bp[1] == '<') {
+ 			while (*bp && *bp != '>') {
+ 			    ++bp;
+Index: ncurses/tinfo/tinfo_driver.c
+Prereq:  1.79 
+--- ncurses-6.5-20250322+/ncurses/tinfo/tinfo_driver.c	2025-02-20 01:30:20.000000000 +0000
++++ ncurses-6.5-20250329/ncurses/tinfo/tinfo_driver.c	2025-03-29 19:28:44.000000000 +0000
+@@ -52,7 +52,7 @@
+ # endif
+ #endif
+ 
+-MODULE_ID("$Id: tinfo_driver.c,v 1.79 2025/02/20 01:30:20 tom Exp $")
++MODULE_ID("$Id: tinfo_driver.c,v 1.82 2025/03/29 19:28:44 tom Exp $")
+ 
+ /*
+  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
+@@ -489,7 +489,8 @@
+ 		/*
+ 		 * If environment variables are used, update them.
+ 		 */
+-		if ((sp == NULL || !sp->_filtered) && _nc_getenv_num("LINES") > 0) {
++		if ((sp == NULL || !sp->_filtered)
++		    && _nc_getenv_num("LINES") > 0) {
+ 		    _nc_setenv_num("LINES", *linep);
+ 		}
+ 		if (_nc_getenv_num("COLUMNS") > 0) {
+@@ -604,6 +605,8 @@
+     AssertTCB();
+     sp = TCB->csp;
+ 
++    T((T_CALLED("tinfo:drv_mode(%p,%d,%d)"), (void *) sp, progFlag, defFlag));
++
+     if (progFlag)		/* prog mode */
+     {
+ 	if (defFlag) {
+@@ -628,6 +631,10 @@
+ 		    if (sp->_keypad_on)
+ 			_nc_keypad(sp, TRUE);
+ 		}
++#if defined(EXP_WIN32_DRIVER)
++		if (!WINCONSOLE.buffered)
++		    _nc_console_set_scrollback(FALSE, &WINCONSOLE.SBI);
++#endif
+ 		code = OK;
+ 	    }
+ 	}
+@@ -656,9 +663,13 @@
+ 		NCURSES_SP_NAME(_nc_flush) (sp);
+ 	    }
+ 	    code = drv_sgmode(TCB, TRUE, &(_term->Ottyb));
++#if defined(EXP_WIN32_DRIVER)
++	    if (!_nc_console_restore())
++		code = ERR;
++#endif
+ 	}
+     }
+-    return (code);
++    returnCode(code);
+ }
+ 
+ static void
+@@ -1540,6 +1551,7 @@
+ #endif
+ 	if (strcmp(DriverTable[i].name, res->td_name(TCB)) == 0) {
+ 	    if (res->td_CanHandle(TCB, name, errret)) {
++		T(("matched driver %s with TERM=%s", DriverTable[i].name, name));
+ 		use = res;
+ 		break;
+ 	    }
+Index: ncurses/win32con/win32_driver.c
+Prereq:  1.7 
+--- ncurses-6.5-20250322+/ncurses/win32con/win32_driver.c	2025-03-01 14:26:14.000000000 +0000
++++ ncurses-6.5-20250329/ncurses/win32con/win32_driver.c	2025-03-29 19:31:07.000000000 +0000
+@@ -48,7 +48,7 @@
+ 
+ #define CUR TerminalType(my_term).
+ 
+-MODULE_ID("$Id: win32_driver.c,v 1.7 2025/03/01 14:26:14 tom Exp $")
++MODULE_ID("$Id: win32_driver.c,v 1.8 2025/03/29 19:31:07 tom Exp $")
+ 
+ #define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE)
+ #define EXP_OPTIMIZE 0
+@@ -762,12 +762,12 @@
+     TERMINAL *_term = (TERMINAL *) TCB;
+     int code = ERR;
+ 
++    T((T_CALLED("win32con::wcon_mode(%p, progFlag=%d, defFlag=%d)"),
++       TCB, progFlag, defFlag));
++
+     if (validateConsoleHandle()) {
+ 	sp = TCB->csp;
+ 
+-	T((T_CALLED("win32con::wcon_mode(%p, progFlag=%d, defFlag=%d)"),
+-	   TCB, progFlag, defFlag));
+-
+ 	WINCONSOLE.progMode = progFlag;
+ 	WINCONSOLE.lastOut = progFlag ? WINCONSOLE.hdl : WINCONSOLE.out;
+ 	SetConsoleActiveScreenBuffer(WINCONSOLE.lastOut);
+Index: ncurses/win32con/win_driver.c
+Prereq:  1.81 
+--- ncurses-6.5-20250322+/ncurses/win32con/win_driver.c	2025-03-01 17:17:46.000000000 +0000
++++ ncurses-6.5-20250329/ncurses/win32con/win_driver.c	2025-03-29 19:31:24.000000000 +0000
+@@ -57,7 +57,7 @@
+ 
+ #define CONTROL_PRESSED (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)
+ 
+-MODULE_ID("$Id: win_driver.c,v 1.81 2025/03/01 17:17:46 tom Exp $")
++MODULE_ID("$Id: win_driver.c,v 1.82 2025/03/29 19:31:24 tom Exp $")
+ 
+ #define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE)
+ 
+@@ -1015,12 +1015,12 @@
+     TERMINAL *_term = (TERMINAL *) TCB;
+     int code = ERR;
+ 
++    T((T_CALLED("win32con::wcon_mode(%p, prog=%d, def=%d)"),
++       TCB, progFlag, defFlag));
++
+     if (okConsoleHandle(TCB)) {
+ 	sp = TCB->csp;
+ 
+-	T((T_CALLED("win32con::wcon_mode(%p, prog=%d, def=%d)"),
+-	   TCB, progFlag, defFlag));
+-
+ 	CON.progMode = progFlag;
+ 	CON.lastOut = progFlag ? CON.hdl : CON.out;
+ 	SetConsoleActiveScreenBuffer(CON.lastOut);
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250322+/package/debian-mingw/changelog	2025-03-22 10:41:37.000000000 +0000
++++ ncurses-6.5-20250329/package/debian-mingw/changelog	2025-03-29 11:09:16.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250322) unstable; urgency=low
++ncurses6td (6.5+20250329) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 22 Mar 2025 06:41:37 -0400
++ -- Thomas E. Dickey   Sat, 29 Mar 2025 07:09:16 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250322+/package/debian-mingw64/changelog	2025-03-22 10:41:37.000000000 +0000
++++ ncurses-6.5-20250329/package/debian-mingw64/changelog	2025-03-29 11:09:16.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250322) unstable; urgency=low
++ncurses6td (6.5+20250329) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 22 Mar 2025 06:41:37 -0400
++ -- Thomas E. Dickey   Sat, 29 Mar 2025 07:09:16 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250322+/package/debian/changelog	2025-03-22 10:41:37.000000000 +0000
++++ ncurses-6.5-20250329/package/debian/changelog	2025-03-29 11:09:16.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250322) unstable; urgency=low
++ncurses6td (6.5+20250329) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 22 Mar 2025 06:41:37 -0400
++ -- Thomas E. Dickey   Sat, 29 Mar 2025 07:09:16 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.695 
+--- ncurses-6.5-20250322+/package/mingw-ncurses.nsi	2025-03-22 10:41:37.000000000 +0000
++++ ncurses-6.5-20250329/package/mingw-ncurses.nsi	2025-03-29 11:09:16.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.695 2025/03/22 10:41:37 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.696 2025/03/29 11:09:16 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0322"
++!define VERSION_MMDD  "0329"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250322+/package/mingw-ncurses.spec	2025-03-22 10:41:37.000000000 +0000
++++ ncurses-6.5-20250329/package/mingw-ncurses.spec	2025-03-29 11:09:16.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250322
++Release: 20250329
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20250322+/package/ncurses.spec	2025-03-22 10:41:37.000000000 +0000
++++ ncurses-6.5-20250329/package/ncurses.spec	2025-03-29 11:09:16.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250322
++Release: 20250329
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20250322+/package/ncursest.spec	2025-03-22 10:41:37.000000000 +0000
++++ ncurses-6.5-20250329/package/ncursest.spec	2025-03-29 11:09:16.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250322
++Release: 20250329
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250405.patch b/packages/ncurses/6.5/ncurses-6.5-20250405.patch
new file mode 100644
index 0000000000..5b42a98e33
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250405.patch
@@ -0,0 +1,7855 @@
+# ncurses 6.5 - patch 20250405 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250405.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Apr  6 00:25:52 UTC 2025
+# ------------------------------------------------------------------------------
+# NEWS                                   |   13 
+# VERSION                                |    2 
+# dist.mk                                |    4 
+# doc/html/man/adacursesw6-config.1.html |   10 
+# doc/html/man/clear.1.html              |    8 
+# doc/html/man/curs_add_wch.3x.html      |   10 
+# doc/html/man/curs_addch.3x.html        |   14 
+# doc/html/man/curs_attr.3x.html         |    8 
+# doc/html/man/curs_color.3x.html        |  316 +++++++--------
+# doc/html/man/curs_delch.3x.html        |   21 -
+# doc/html/man/curs_deleteln.3x.html     |   10 
+# doc/html/man/curs_extend.3x.html       |   10 
+# doc/html/man/curs_get_wch.3x.html      |   59 +-
+# doc/html/man/curs_get_wstr.3x.html     |  127 +++---
+# doc/html/man/curs_getch.3x.html        |  207 +++++-----
+# doc/html/man/curs_getstr.3x.html       |   30 -
+# doc/html/man/curs_inopts.3x.html       |   10 
+# doc/html/man/curs_mouse.3x.html        |  115 ++---
+# doc/html/man/curs_move.3x.html         |   19 
+# doc/html/man/curs_outopts.3x.html      |   92 ++--
+# doc/html/man/curs_printw.3x.html       |   39 +
+# doc/html/man/curs_scanw.3x.html        |   61 +-
+# doc/html/man/curs_scroll.3x.html       |   27 -
+# doc/html/man/curs_terminfo.3x.html     |  266 ++++++------
+# doc/html/man/curs_util.3x.html         |   38 -
+# doc/html/man/curs_variables.3x.html    |   48 +-
+# doc/html/man/ncurses.3x.html           |  639 +++++++++++++++----------------
+# doc/html/man/resizeterm.3x.html        |   15 
+# doc/html/man/scr_dump.5.html           |    8 
+# doc/html/man/tabs.1.html               |    8 
+# doc/html/man/term.5.html               |   10 
+# doc/html/man/terminfo.5.html           |    2 
+# doc/html/man/tput.1.html               |    8 
+# doc/html/man/user_caps.5.html          |    6 
+# man/MKada_config.in                    |    8 
+# man/clear.1                            |    6 
+# man/curs_add_wch.3x                    |    8 
+# man/curs_addch.3x                      |   17 
+# man/curs_attr.3x                       |    8 
+# man/curs_color.3x                      |   52 +-
+# man/curs_delch.3x                      |   25 -
+# man/curs_deleteln.3x                   |    6 
+# man/curs_extend.3x                     |    8 
+# man/curs_get_wch.3x                    |   42 +-
+# man/curs_get_wstr.3x                   |   48 +-
+# man/curs_getch.3x                      |  125 +++---
+# man/curs_getstr.3x                     |   36 +
+# man/curs_inopts.3x                     |    6 
+# man/curs_mouse.3x                      |   25 -
+# man/curs_move.3x                       |   34 +
+# man/curs_outopts.3x                    |  111 +++--
+# man/curs_printw.3x                     |  111 +++--
+# man/curs_scanw.3x                      |  118 +++--
+# man/curs_scroll.3x                     |    7 
+# man/curs_terminfo.3x                   |   94 ++--
+# man/curs_util.3x                       |   51 +-
+# man/curs_variables.3x                  |   27 -
+# man/ncurses.3x                         |  139 ++++--
+# man/resizeterm.3x                      |    7 
+# man/scr_dump.5                         |   18 
+# man/tabs.1                             |    6 
+# man/term.5                             |    8 
+# man/terminfo.tail                      |    8 
+# man/tput.1                             |    6 
+# man/user_caps.5                        |    8 
+# misc/terminfo.src                      |  106 +++--
+# 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                        |  140 +++++-
+# 74 files changed, 2121 insertions(+), 1580 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4267 
+--- ncurses-6.5-20250329+/NEWS	2025-03-29 22:52:37.000000000 +0000
++++ ncurses-6.5-20250405/NEWS	2025-04-05 22:31:28.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4267 2025/03/29 22:52:37 tom Exp $
++-- $Id: NEWS,v 1.4271 2025/04/05 22:31:28 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.
+ 
++20250405
++	+ improve formatting/style of manpages (patches by Branden Robinson).
++	+ improve infocmp -E/-e fallback feature (report by Ville Rissanen):
++	  + prefix names with "ti_" if they begin with a digit, e.g., 9term
++	  + escape backslashes and double-quotes in description fields
++	+ modify infocmp -E/-e fallback feature to reduce stricter compiler
++	  warnings for the extended capability data.
++	+ add sclp -TD
++	+ add op to vt525 -TD
++	+ update contour -TD
++
+ 20250329
+ 	+ add XM/xm to ms-terminal, to enable mouse with experimental Windows
+ 	  driver -TD
+Index: VERSION
+--- ncurses-6.5-20250329+/VERSION	2025-03-29 11:09:16.000000000 +0000
++++ ncurses-6.5-20250405/VERSION	2025-04-05 09:48:54.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250329
++5:0:10	6.5	20250405
+Index: dist.mk
+Prereq:  1.1662 
+--- ncurses-6.5-20250329+/dist.mk	2025-03-29 11:09:16.000000000 +0000
++++ ncurses-6.5-20250405/dist.mk	2025-04-05 09:48:54.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1662 2025/03/29 11:09:16 tom Exp $
++# $Id: dist.mk,v 1.1663 2025/04/05 09: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 = 5
+-NCURSES_PATCH = 20250329
++NCURSES_PATCH = 20250405
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/adacursesw6-config.1.html
+--- ncurses-6.5-20250329+/doc/html/man/adacursesw6-config.1.html	2024-04-27 18:38:45.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/adacursesw6-config.1.html	2025-04-05 22:33:03.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-adacursesw6\-config 1 2024-04-20 ncurses 6.5 User commands
++adacursesw6\-config 1 2025-04-05 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                      adacursesw6\-config 1 2024-04-20 ncurses 6.5 User commands
                                                                                                                                                      
++
                                                                                                                                                      adacursesw6\-config 1 2025-04-05 ncurses 6.5 User commands
                                                                                                                                                      
+ 
                                                                                                                                                      + adacursesw6-config(1)            User commands           adacursesw6-config(1)
+ 
+@@ -128,7 +128,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-04-20             adacursesw6-config(1)
++ncurses 6.5                       2025-04-05             adacursesw6-config(1)
+ 
                                                                                                                                                      
+ 
                                                                                                                                                      
+ 
                                                                                                                                                        
+Index: doc/html/man/clear.1.html
+--- ncurses-6.5-20250329+/doc/html/man/clear.1.html	2025-01-19 00:54:58.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/clear.1.html	2025-04-05 22:33:03.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: clear.1,v 1.51 2025/01/19 00:49:39 tom Exp @
++  * @Id: clear.1,v 1.53 2025/04/05 21:56:26 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-clear 1 2025-01-18 ncurses 6.5 User commands
++clear 1 2025-04-05 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                        clear 1 2025-01-18 ncurses 6.5 User commands
                                                                                                                                                        
++
                                                                                                                                                        clear 1 2025-04-05 ncurses 6.5 User commands
                                                                                                                                                        
+ 
                                                                                                                                                        + clear(1)                         User commands                        clear(1)
+ 
+@@ -148,7 +148,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                          clear(1)
++ncurses 6.5                       2025-04-05                          clear(1)
+ 
                                                                                                                                                        
+ 
                                                                                                                                                        
+ 
                                                                                                                                                          
+Index: doc/html/man/curs_add_wch.3x.html
+--- ncurses-6.5-20250329+/doc/html/man/curs_add_wch.3x.html	2025-03-15 22:08:51.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/curs_add_wch.3x.html	2025-04-05 22:33:03.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_add_wch.3x,v 1.112 2025/03/15 20:38:41 tom Exp @
++  * @Id: curs_add_wch.3x,v 1.114 2025/04/05 21:58:37 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_add_wch 3x 2025-03-15 ncurses 6.5 Library calls
++curs_add_wch 3x 2025-04-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                          curs_add_wch 3x 2025-03-15 ncurses 6.5 Library calls
                                                                                                                                                          
++
                                                                                                                                                          curs_add_wch 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                          
+ 
                                                                                                                                                          + curs_add_wch(3x)                 Library calls                curs_add_wch(3x)
+ 
+@@ -163,7 +163,7 @@
+ 
+        If the cursor is at the bottom of the scrolling region when advancement
+        occurs  at  the  right margin, and scrollok(3x) is enabled for win, the
+-       cursor wraps as above and the scrolling region  scrolls  up  one  line.
++       scrolling region scrolls up one line and the  cursor  wraps  as  above.
+        Otherwise,  advancement  and scrolling do not occur, and waddch returns
+        ERR.
+ 
+@@ -450,7 +450,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-15                  curs_add_wch(3x)
++ncurses 6.5                       2025-04-05                  curs_add_wch(3x)
+ 
                                                                                                                                                          
+ 
                                                                                                                                                          
+ 
                                                                                                                                                            
+Index: doc/html/man/curs_addch.3x.html
+--- ncurses-6.5-20250329+/doc/html/man/curs_addch.3x.html	2025-03-15 22:08:51.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/curs_addch.3x.html	2025-04-05 22:33:03.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addch.3x,v 1.132 2025/03/15 20:40:50 tom Exp @
++  * @Id: curs_addch.3x,v 1.135 2025/04/05 21:58:37 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addch 3x 2025-03-15 ncurses 6.5 Library calls
++curs_addch 3x 2025-04-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                            curs_addch 3x 2025-03-15 ncurses 6.5 Library calls
                                                                                                                                                            
++
                                                                                                                                                            curs_addch 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                            
+ 
                                                                                                                                                            + curs_addch(3x)                   Library calls                  curs_addch(3x)
+ 
+@@ -125,7 +125,7 @@
+ 
+        If the cursor is at the bottom of the scrolling region when advancement
+        occurs at the right margin, and scrollok(3x) is enabled  for  win,  the
+-       cursor  wraps  as  above  and the scrolling region scrolls up one line.
++       scrolling  region  scrolls  up  one line and the cursor wraps as above.
+        Otherwise, advancement and scrolling do not occur, and  waddch  returns
+        ERR.
+ 
+@@ -301,7 +301,7 @@
+ 
+        The displayed values of ACS_ constants depend on
+ 
+-       o   the  ncurses  ABI--for  example,  wide-character  versus  non-wide-
++       o   the ncurses ABI -- for  example,  wide-character  versus  non-wide-
+            character  configurations  (the  former  is  capable  of displaying
+            Unicode while the latter is not), and
+ 
+@@ -333,7 +333,7 @@
+        character.    When  a  character  is  complete,  ncurses  displays  the
+        character  and  advances  the  cursor.   If  the  calling   application
+        interrupts the succession of bytes in a multibyte character sequence by
+-       changing the current  location--for  example,  with  wmove(3x)--ncurses
++       changing the current location -- for example, with wmove(3x) -- ncurses
+        discards the incomplete character.
+ 
+        For  portability  to  other  implementations,  do  not  rely  upon  the
+@@ -365,7 +365,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-15                    curs_addch(3x)
++ncurses 6.5                       2025-04-05                    curs_addch(3x)
+ 
                                                                                                                                                            
+ 
                                                                                                                                                            
+ 
                                                                                                                                                              
+Index: doc/html/man/curs_attr.3x.html
+--- ncurses-6.5-20250329+/doc/html/man/curs_attr.3x.html	2025-02-15 20:06:25.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/curs_attr.3x.html	2025-04-05 22:33:03.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_attr.3x,v 1.136 2025/02/15 19:35:37 tom Exp @
++  * @Id: curs_attr.3x,v 1.138 2025/04/05 21:56:26 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_attr 3x 2025-02-15 ncurses 6.5 Library calls
++curs_attr 3x 2025-04-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                              curs_attr 3x 2025-02-15 ncurses 6.5 Library calls
                                                                                                                                                              
++
                                                                                                                                                              curs_attr 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                              
+ 
                                                                                                                                                              + curs_attr(3x)                    Library calls                   curs_attr(3x)
+ 
+@@ -493,7 +493,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-15                     curs_attr(3x)
++ncurses 6.5                       2025-04-05                     curs_attr(3x)
+ 
                                                                                                                                                              
+ 
                                                                                                                                                              
+ 
                                                                                                                                                                
+Index: doc/html/man/curs_color.3x.html
+--- ncurses-6.5-20250329+/doc/html/man/curs_color.3x.html	2025-03-01 22:03:50.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/curs_color.3x.html	2025-04-05 22:33:03.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_color.3x,v 1.116 2025/03/01 21:17:37 tom Exp @
++  * @Id: curs_color.3x,v 1.118 2025/04/05 21:59:03 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_color 3x 2025-03-01 ncurses 6.5 Library calls
++curs_color 3x 2025-04-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                curs_color 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                                
++
                                                                                                                                                                curs_color 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                
+ 
                                                                                                                                                                + curs_color(3x)                   Library calls                  curs_color(3x)
+ 
+@@ -159,118 +159,110 @@
+ 
+ 
+ 
                                                                                                                                                                CONSTANTS
                                                                                                                                                                +-       In <curses.h> the following macros are defined.  These are the standard
+-       colors (ISO-6429).  curses also assumes that COLOR_BLACK is the default
+-       background color for all terminals.
+-
+-             COLOR_BLACK
+-             COLOR_RED
+-             COLOR_GREEN
+-             COLOR_YELLOW
+-             COLOR_BLUE
+-             COLOR_MAGENTA
+-             COLOR_CYAN
+-             COLOR_WHITE
++       ISO 6429 and ECMA-48 define eight standard colors (also known as "ANSI"
++       colors).   curses.h  defines object-like macros COLOR_BLACK, COLOR_RED,
++       COLOR_GREEN, COLOR_YELLOW, COLOR_BLUE, COLOR_MAGENTA,  COLOR_CYAN,  and
++       COLOR_WHITE  accordingly.   curses  assumes  that  COLOR_BLACK  is  the
++       default  background  color  for  all  terminals.   ncurses  offers   an
++       extension  to  override that assumption; see assume_default_colors(3x).
++       Some terminals support additional colors that lack standard names.
+ 
+-       Some terminals support more than the eight (8)  "ANSI"  colors.   There
+-       are no standard names for those additional colors.
+-
+-       A_COLOR  is  a  bit  mask  that extracts a color pair identifier from a
+-       chtype.
++       A_COLOR is a bit mask  that,  when  bitwise  "and"-ed  with  a  chtype,
++       extracts its color pair identifier.
+ 
+ 
+ 
                                                                                                                                                                VARIABLES
                                                                                                                                                                + 
+ 
                                                                                                                                                                COLORS
                                                                                                                                                                +-       is initialized by start_color to  the  maximum  number  of  colors  the
++       is  initialized  by  start_color  to  the  maximum number of colors the
+        terminal can support.
+ 
+ 
+ 
                                                                                                                                                                COLOR_PAIRS
                                                                                                                                                                +-       is  initialized by start_color to the maximum number of color pairs the
++       is initialized by start_color to the maximum number of color pairs  the
+        terminal can support.  Often, its value is the product COLORS x COLORS,
+        but this is not always true.
+ 
+-       o   A  few  terminals  use the HLS color space (see start_color below),
++       o   A few terminals use the HLS color space  (see  start_color  below),
+            ignoring this rule; and
+ 
+-       o   terminals supporting a large number of colors are  limited  to  the
++       o   terminals  supporting  a  large number of colors are limited to the
+            number of color pairs that a signed short value can represent.
+ 
+ 
+ 
                                                                                                                                                                FUNCTIONS
                                                                                                                                                                + 
+ 
                                                                                                                                                                start_color
                                                                                                                                                                +-       The  start_color  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
++       The start_color 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 initscr.  start_color does this:
+ 
+-       o   It  initializes  two  global  variables,  COLORS  and   COLOR_PAIRS
++       o   It   initializes  two  global  variables,  COLORS  and  COLOR_PAIRS
+            (respectively defining the maximum number of colors and color pairs
+            the terminal can support).
+ 
+-       o   It initializes the special color pair 0 to the  default  foreground
++       o   It  initializes  the special color pair 0 to the default foreground
+            and background colors.  No other color pairs are initialized.
+ 
+-       o   It  restores the colors on the terminal to the values they had when
++       o   It restores the colors on the terminal to the values they had  when
+            the terminal was just turned on.
+ 
+-       o   If the terminal supports the initc  (initialize_color)  capability,
+-           start_color  initializes  its  internal table representing the red,
++       o   If  the  terminal supports the initc (initialize_color) capability,
++           start_color initializes its internal table  representing  the  red,
+            green, and blue components of the color palette.
+ 
+            The components depend on whether the terminal uses CGA (aka "ANSI")
+-           or  HLS  (i.e.,  the  hls  (hue_lightness_saturation) capability is
+-           set).  The table  is  initialized  first  for  eight  basic  colors
+-           (black,  red, green, yellow, blue, magenta, cyan, and white), using
++           or HLS (i.e.,  the  hls  (hue_lightness_saturation)  capability  is
++           set).   The  table  is  initialized  first  for  eight basic colors
++           (black, red, green, yellow, blue, magenta, cyan, and white),  using
+            weights that depend upon the CGA/HLS choice.  For "ANSI" colors the
+-           weights  are  680  or 0 depending on whether the corresponding red,
+-           green, or blue component is used or not.  That permits  using  1000
+-           to  represent  bold/bright  colors.  After the initial eight colors
+-           (if the terminal supports more than eight  colors)  the  components
+-           are  initialized  using the same pattern, but with weights of 1000.
++           weights are 680 or 0 depending on whether  the  corresponding  red,
++           green,  or  blue component is used or not.  That permits using 1000
++           to represent bold/bright colors.  After the  initial  eight  colors
++           (if  the  terminal  supports more than eight colors) the components
++           are initialized using the same pattern, but with weights  of  1000.
+            SVr4 uses a similar scheme, but uses 1000 for the components of the
+            initial eight colors.
+ 
+            start_color does not attempt to set the terminal's color palette to
+-           match its built-in table.  An application  may  use  init_color  to
++           match  its  built-in  table.   An application may use init_color to
+            alter the internal table along with the terminal's color.
+ 
+-       These  limits  apply  to  color values and color pairs.  Values outside
++       These limits apply to color values and  color  pairs.   Values  outside
+        these limits are not valid, and may result in a runtime error:
+ 
+-       o   COLORS  corresponds   to   the   terminal   database's   max_colors
++       o   COLORS   corresponds   to   the   terminal   database's  max_colors
+            capability, (see terminfo(5)).
+ 
+-       o   color  values  are  expected  to  be  in  the  range 0 to COLORS-1,
++       o   color values are expected  to  be  in  the  range  0  to  COLORS-1,
+            inclusive (including 0 and COLORS-1).
+ 
+-       o   a special color value -1 is used in certain extended  functions  to
++       o   a  special  color value -1 is used in certain extended functions to
+            denote the default color (see use_default_colors(3x)).
+ 
+-       o   COLOR_PAIRS   corresponds  to  the  terminal  database's  max_pairs
++       o   COLOR_PAIRS  corresponds  to  the  terminal  database's   max_pairs
+            capability, (see terminfo(5)).
+ 
+-       o   valid color pair values  are  in  the  range  1  to  COLOR_PAIRS-1,
++       o   valid  color  pair  values  are  in  the  range 1 to COLOR_PAIRS-1,
+            inclusive.
+ 
+        o   color pair 0 is special; it denotes "no color".
+ 
+-           Color  pair  0  is  assumed  to  be white on black, but is actually
+-           whatever the terminal implements before color is  initialized.   It
++           Color pair 0 is assumed to be  white  on  black,  but  is  actually
++           whatever  the  terminal implements before color is initialized.  It
+            cannot be modified by the application.
+ 
+ 
+ 
                                                                                                                                                                has_colors
                                                                                                                                                                +        has_colors returns TRUE if the terminal supports colors and FALSE if it
+-       does not.   initscr(3x)  or  newterm(3x)  must  be  called  first,  but
+-       start_color  need  not  be.   An  application  might call has_colors to
+-       decide whether to use color or a video attribute like A_BOLD to  render
++       does  not.   initscr(3x)  or  newterm(3x)  must  be  called  first, but
++       start_color need not be.   An  application  might  call  has_colors  to
++       decide  whether to use color or a video attribute like A_BOLD to render
+        text.
+ 
+-       Color  support  in  curses  requires that the terminal type description
+-       support the capabilities max_colors (colors),  max_pairs  (pairs),  and
++       Color support in curses requires that  the  terminal  type  description
++       support  the  capabilities  max_colors (colors), max_pairs (pairs), and
+        any of
+ 
+        o   set_foreground (setf) and set_background (setb);
+@@ -282,208 +274,208 @@
+ 
+ 
                                                                                                                                                                can_change_color
                                                                                                                                                                +        The can_change_color routine requires no arguments.  It returns TRUE if
+-       the terminal supports colors and can change their  definitions;  other,
+-       it   returns   FALSE.    This  routine  facilitates  writing  terminal-
++       the  terminal  supports colors and can change their definitions; other,
++       it  returns  FALSE.   This  routine   facilitates   writing   terminal-
+        independent programs.
+ 
+ 
+ 
                                                                                                                                                                init_pair
                                                                                                                                                                +        The init_pair routine changes the definition of a color pair.  It takes
+-       three  arguments:  the  number  of  the  color  pair to be changed, the
++       three arguments: the number of  the  color  pair  to  be  changed,  the
+        foreground color number, and the background color number.  For portable
+        applications:
+ 
+-       o   The  first  argument  must be a valid color pair value.  If default
+-           colors are used (see use_default_colors(3x))  the  upper  limit  is
+-           adjusted  to  allow  for  extra  pairs which use a default color in
++       o   The first argument must be a valid color pair  value.   If  default
++           colors  are  used  (see  use_default_colors(3x)) the upper limit is
++           adjusted to allow for extra pairs which  use  a  default  color  in
+            foreground and/or background.
+ 
+        o   The second and third arguments must be valid color values.
+ 
+-       If the color pair was previously initialized, the screen  is  refreshed
+-       and  all  occurrences  of  that  color  pair  are  changed  to  the new
++       If  the  color pair was previously initialized, the screen is refreshed
++       and all  occurrences  of  that  color  pair  are  changed  to  the  new
+        definition.
+ 
+-       As an extension, ncurses allows  you  to  set  color  pair  0  via  the
+-       assume_default_colors(3x)  routine,  or  to  specify the use of default
++       As  an  extension,  ncurses  allows  you  to  set  color pair 0 via the
++       assume_default_colors(3x) routine, or to specify  the  use  of  default
+        colors (color number -1) if you first invoke the use_default_colors(3x)
+        routine.
+ 
+ 
+ 
                                                                                                                                                                init_extended_pair
                                                                                                                                                                +-       Because  init_pair  uses  signed shorts for its parameters, that limits
++       Because init_pair uses signed shorts for its  parameters,  that  limits
+        color  pairs  and  color-values  to  32767  on  modern  hardware.   The
+-       extension  init_extended_pair  uses  ints for the color pair and color-
++       extension init_extended_pair uses ints for the color  pair  and  color-
+        value, allowing a larger number of colors to be supported.
+ 
+ 
+ 
                                                                                                                                                                init_color
                                                                                                                                                                +-       The init_color routine changes the definition of  a  color.   It  takes
++       The  init_color  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).
+ 
+-       o   The first argument must be a valid color value; default colors  are
+-           not  allowed  here.   (See the section Colors for the default color
++       o   The  first argument must be a valid color value; default colors are
++           not allowed here.  (See the section Colors for  the  default  color
+            index.)
+ 
+-       o   Each of the last three arguments must be a value  in  the  range  0
++       o   Each  of  the  last  three arguments must be a value in the range 0
+            through 1000.
+ 
+-       When  init_color  is  used, all occurrences of that color on the screen
++       When init_color is used, all occurrences of that color  on  the  screen
+        immediately change to the new definition.
+ 
+ 
+ 
                                                                                                                                                                init_extended_color
                                                                                                                                                                +-       Because init_color uses signed shorts for its parameters,  that  limits
+-       color-values  and  their  red,  green,  and blue components to 32767 on
+-       modern hardware.  The extension init_extended_color uses ints  for  the
+-       color  value  and  for  setting  the  red,  green, and blue components,
++       Because  init_color  uses signed shorts for its parameters, that limits
++       color-values and their red, green, and  blue  components  to  32767  on
++       modern  hardware.   The extension init_extended_color uses ints for the
++       color value and for  setting  the  red,  green,  and  blue  components,
+        allowing a larger number of colors to be supported.
+ 
+ 
+ 
                                                                                                                                                                color_content
                                                                                                                                                                +        The color_content 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  shorts  for
+-       storing  the  information  about  the  amounts  of red, green, and blue
++       of the red, green, and blue (RGB) components in a color.   It  requires
++       four  arguments:  the  color  number, and three addresses of shorts for
++       storing the information about the  amounts  of  red,  green,  and  blue
+        components in the given color.
+ 
+-       o   The first argument must be a valid color  value,  i.e.,  0  through
++       o   The  first  argument  must  be a valid color value, i.e., 0 through
+            COLORS-1, inclusive.
+ 
+-       o   The  values that are stored at the addresses pointed to by the last
+-           three arguments are in the range  0  (no  component)  through  1000
++       o   The values that are stored at the addresses pointed to by the  last
++           three  arguments  are  in  the  range 0 (no component) through 1000
+            (maximum amount of component), inclusive.
+ 
+ 
+ 
                                                                                                                                                                extended_color_content
                                                                                                                                                                +-       Because  color_content  uses  signed  shorts  for  its parameters, that
+-       limits color-values and their red, green, and blue components to  32767
++       Because color_content uses  signed  shorts  for  its  parameters,  that
++       limits  color-values and their red, green, and blue components to 32767
+        on modern hardware.  The extension extended_color_content uses ints for
+-       the color value and for returning the red, green, and blue  components,
++       the  color value and for returning the red, green, and blue components,
+        allowing a larger number of colors to be supported.
+ 
+ 
+ 
                                                                                                                                                                pair_content
                                                                                                                                                                +-       The  pair_content  routine allows programmers to find out what colors a
+-       given color pair consists of.  It requires three arguments:  the  color
++       The pair_content 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 shorts for storing the foreground and
+        the background color numbers.
+ 
+-       o   The first argument must be a valid color value, i.e., in the  range
++       o   The  first argument must be a valid color value, i.e., in the range
+            1 through COLOR_PAIRS-1, inclusive.
+ 
+-       o   The  values  that  are  stored  at  the addresses pointed to by the
+-           second and third arguments are  in  the  range  0  through  COLORS,
++       o   The values that are stored at  the  addresses  pointed  to  by  the
++           second  and  third  arguments  are  in  the range 0 through COLORS,
+            inclusive.
+ 
+ 
+ 
                                                                                                                                                                extended_pair_content
                                                                                                                                                                +        Because pair_content uses signed shorts for its parameters, that limits
+        color pair and color-values to 32767 on modern hardware.  The extension
+-       extended_pair_content  uses  ints  for the color pair and for returning
+-       the foreground and background  colors,  allowing  a  larger  number  of
++       extended_pair_content uses ints for the color pair  and  for  returning
++       the  foreground  and  background  colors,  allowing  a larger number of
+        colors to be supported.
+ 
+ 
+ 
                                                                                                                                                                reset_color_pairs
                                                                                                                                                                +-       The  extension  reset_color_pairs  tells  ncurses to discard all of the
+-       color pair information which was set with init_pair.  It  also  touches
+-       the  current-  and  standard-screens, allowing an application to switch
++       The extension reset_color_pairs tells ncurses to  discard  all  of  the
++       color  pair  information which was set with init_pair.  It also touches
++       the current- and standard-screens, allowing an  application  to  switch
+        color palettes rapidly.
+ 
+ 
+ 
                                                                                                                                                                COLOR_PAIR
                                                                                                                                                                +        COLOR_PAIR(n) 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 attr_set  (which  pass
+-       the  color  pair  as  a  separate  parameter)  rather  than  the legacy
++       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 attr_set (which pass
++       the color  pair  as  a  separate  parameter)  rather  than  the  legacy
+        functions such as attrset.
+ 
+ 
+ 
                                                                                                                                                                PAIR_NUMBER
                                                                                                                                                                +-       PAIR_NUMBER(attr)  extracts  the  color  information  from   its   attr
+-       parameter  and  returns  it  as  a color pair number; it is the inverse
++       PAIR_NUMBER(attr)   extracts   the  color  information  from  its  attr
++       parameter and returns it as a color pair  number;  it  is  the  inverse
+        operation of COLOR_PAIR.
+ 
+ 
+ 
                                                                                                                                                                RETURN VALUE
                                                                                                                                                                +-       can_change_color and  has_colors  return  TRUE  or  FALSE.   The  other
++       can_change_color  and  has_colors  return  TRUE  or  FALSE.   The other
+        functions return OK on success and ERR on failure.
+ 
+-       In   ncurses,  functions  returning  an  int  recognize  several  error
++       In  ncurses,  functions  returning  an  int  recognize  several   error
+        conditions.
+ 
+-       o   All return  ERR  if  the  screen  has  not  been  initialized;  see
++       o   All  return  ERR  if  the  screen  has  not  been  initialized; see
+            initscr(3x) or newterm(3x).
+ 
+-       o   All  except  start_color  return  ERR  if  start_color has not been
++       o   All except start_color return  ERR  if  start_color  has  not  been
+            called, or itself returned ERR.
+ 
+-       o   start_color returns ERR if it cannot allocate memory for its  color
++       o   start_color  returns ERR if it cannot allocate memory for its color
+            pair table.
+ 
+-       o   init_color  returns  ERR  if  the  terminal  type  does not support
+-           assignable color values; that is, if the  initialize_color  (initc)
++       o   init_color returns ERR  if  the  terminal  type  does  not  support
++           assignable  color  values; that is, if the initialize_color (initc)
+            capability is absent from its description.
+ 
+-       o   init_color  returns  ERR if any of its r, g, b arguments is outside
++       o   init_color returns ERR if any of its r, g, b arguments  is  outside
+            the range 0-1000 inclusive.
+ 
+-       o   init_pair,  init_color,  init_extended_pair,   init_extended_color,
+-           color_content,     pair_content,     extended_color_content,    and
++       o   init_pair,   init_color,  init_extended_pair,  init_extended_color,
++           color_content,    pair_content,     extended_color_content,     and
+            extended_pair_content return ERR on attempts to use
+ 
+-           o   color identifiers outside the range 0-COLORS-1  inclusive,  the
++           o   color  identifiers  outside the range 0-COLORS-1 inclusive, the
+                default colors extension notwithstanding, or
+ 
+-           o   color   pair  identifiers  outside  the  range  0-COLOR_PAIRS-1
++           o   color  pair  identifiers  outside  the  range   0-COLOR_PAIRS-1
+                inclusive.
+ 
+ 
+ 
                                                                                                                                                                NOTES
                                                                                                                                                                +-       In ncurses, init_pair accepts negative foreground and background  color
+-       arguments  to  support  its  use_default_colors(3x) extension, but only
++       In  ncurses, init_pair accepts negative foreground and background color
++       arguments to support its  use_default_colors(3x)  extension,  but  only
+        after the latter function has been called.
+ 
+-       The assumption that COLOR_BLACK is the  terminal's  default  background
++       The  assumption  that  COLOR_BLACK is the terminal's default background
+        color  can  be  overridden  using  ncurses's  assume_default_colors(3x)
+        extension.
+ 
+-       In ncurses, each pointer passed to color_content and  pair_content  can
++       In  ncurses,  each pointer passed to color_content and pair_content can
+        be  null,  in  which  case  the  library  ignores  it,  permitting  the
+        application to disregard unnecessary information.
+ 
+-       In ncurses, each screen has a color  activation  flag,  color  palette,
++       In  ncurses,  each  screen  has a color activation flag, color palette,
+        color  pair  table,  and  associated  COLORS  and  COLOR_PAIRS  values;
+-       start_color affects only the  current  screen.   The  SVr4  and  X/Open
+-       Curses  interface was not really designed with this in mind; historical
++       start_color  affects  only  the  current  screen.   The SVr4 and X/Open
++       Curses interface was not really designed with this in mind;  historical
+        implementations may use a single shared color palette.
+ 
+-       Setting an implicit background color via  a  color  pair  affects  only
+-       character  cells  that  a character write operation explicitly touches.
+-       To change the background color used when parts of a window are  blanked
++       Setting  an  implicit  background  color  via a color pair affects only
++       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 curs_bkgd(3x).
+ 
+-       Several  caveats  apply  to IBM PC-compatible machines of the 80486 era
++       Several caveats apply to IBM PC-compatible machines of  the  80486  era
+        and earlier with CGA/EGA/VGA video.
+ 
+-       o   COLOR_YELLOW  is  actually   brown.    To   get   yellow,   combine
++       o   COLOR_YELLOW   is   actually   brown.    To   get  yellow,  combine
+            COLOR_YELLOW with the A_BOLD attribute.
+ 
+-       o   The  A_BLINK attribute should in theory make the background bright.
+-           This often fails to work, and even VGA  controllers  for  which  it
+-           mostly  works,  such as those from Paradise and compatibles, do the
++       o   The A_BLINK attribute should in theory make the background  bright.
++           This  often  fails  to  work, and even VGA controllers for which it
++           mostly works, such as those from Paradise and compatibles,  do  the
+            wrong thing when you try to set a bright "yellow" background -- you
+            get a blinking yellow foreground instead.
+ 
+-       o   Color  RGB  values  are  not configurable on these devices (in text
++       o   Color RGB values are not configurable on  these  devices  (in  text
+            mode).
+ 
+ 
+ 
                                                                                                                                                                EXTENSIONS
                                                                                                                                                                +-       The functions marked as extensions originated in ncurses, and  are  not
+-       found  in  SVr4  curses,  4.4BSD  curses,  or any other previous curses
++       The  functions  marked as extensions originated in ncurses, and are not
++       found in SVr4 curses, 4.4BSD  curses,  or  any  other  previous  curses
+        implementation.
+ 
+ 
+@@ -494,78 +486,78 @@
+        X/Open Curses Issue 4 describes these functions.  It specifies no error
+        conditions for them.
+ 
+-       ncurses satisfies X/Open  Curses's  minimum  maximums  for  COLORS  and
++       ncurses  satisfies  X/Open  Curses's  minimum  maximums  for COLORS and
+        COLOR_PAIRS.
+ 
+-       X/Open  Curses  does  not  specify a limit for the number of colors and
++       X/Open Curses does not specify a limit for the  number  of  colors  and
+        color pairs which a terminal can support.  However, in its use of short
+-       for  the  parameters,  it carries over SVr4's implementation detail for
+-       the compiled terminfo  database,  which  uses  signed  16-bit  numbers.
++       for the parameters, it carries over SVr4's  implementation  detail  for
++       the  compiled  terminfo  database,  which  uses  signed 16-bit numbers.
+        ncurses  provides  extended  versions  of  the  functions  using  short
+-       parameters,  allowing  applications  to  use  larger  color  and   pair
++       parameters,   allowing  applications  to  use  larger  color  and  pair
+        identifiers.
+ 
+-       SVr4  curses returns ERR from pair_content if its pair argument was not
+-       initialized using init_pairs, and from color_content  if  the  terminal
++       SVr4 curses returns ERR from pair_content if its pair argument was  not
++       initialized  using  init_pairs,  and from color_content if the terminal
+        does not support changing colors.  ncurses does neither.
+ 
+ 
+ 
                                                                                                                                                                HISTORY
                                                                                                                                                                +-       SVr3.2  (1987)  introduced color support with all of the symbols in the
+-       synopsis above except those marked as extensions.   It  reserved  color
+-       pair  0  as  the terminal's initial, "uncolored" state, and limited the
+-       number of possible color pairs to 64, because the color pair datum  was
++       SVr3.2 (1987) introduced color support with all of the symbols  in  the
++       synopsis  above  except  those marked as extensions.  It reserved color
++       pair 0 as the terminal's initial, "uncolored" state,  and  limited  the
++       number  of possible color pairs to 64, because the color pair datum was
+        encoded in six bits of a chtype.
+ 
+-       SVr4  made  only  internal changes, such as moving the storage of color
+-       state from the SCREEN structure (pointed to  by  SP)  to  the  TERMINAL
++       SVr4 made only internal changes, such as moving the  storage  of  color
++       state  from  the  SCREEN  structure  (pointed to by SP) to the TERMINAL
+        structure (pointed to by cur_term).
+ 
+-       Other  curses  implementations impose different limits on the number of
++       Other curses implementations impose different limits on the  number  of
+        colors and color pairs.
+ 
+-       o   PCCurses (1987-1990) provided for  only  8  colors  (and  therefore
++       o   PCCurses  (1987-1990)  provided  for  only  8 colors (and therefore
+            required at most 8x8 = 64 color pairs).
+ 
+        o   PDCurses  (1992-present)  inherited  the  8-color  limitation  from
+-           PCCurses, but changed this  to  256  in  version  2.5  (2001),  and
++           PCCurses,  but  changed  this  to  256  in  version 2.5 (2001), and
+            widened its chtype from 16 to 32 bits.
+ 
+        o   X/Open  Curses  (1992-present)  specified  a  new  structure  type,
+-           cchar_t, to store the character code, attribute  flags,  and  color
+-           pair  identifier,  allowing  an increased range of color pairs.  It
+-           specifies a short as  storing  identifiers  for  colors  and  color
+-           pairs,  limiting  portable  values  to 15 bits; negative values are
++           cchar_t,  to  store  the character code, attribute flags, and color
++           pair identifier, allowing an increased range of  color  pairs.   It
++           specifies  a  short  as  storing  identifiers  for colors and color
++           pairs, limiting portable values to 15  bits;  negative  values  are
+            invalid in System V.
+ 
+-       o   ncurses (1992-present), in its non-wide configuration, uses 8  bits
++       o   ncurses  (1992-present), in its non-wide configuration, uses 8 bits
+            of chtype for the color pair identifier.
+ 
+-           Version  5.3 (2002) offered a wide-character interface, but encoded
++           Version 5.3 (2002) offered a wide-character interface, but  encoded
+            the color pair identifier with attributes in the character type.
+ 
+-           Since version 6 (2015), ncurses uses a separate int for  the  color
+-           pair  identifier  in  a cchar_t, introducing extension functions to
+-           manage the wider type.  When a color pair value  fits  in  8  bits,
++           Since  version  6 (2015), ncurses uses a separate int for the color
++           pair identifier in a cchar_t, introducing  extension  functions  to
++           manage  the  wider  type.   When a color pair value fits in 8 bits,
+            ncurses permits color pair data to be manipulated via the functions
+-           taking chtype arguments, even  when  a  curses  window  uses  wide-
++           taking  chtype  arguments,  even  when  a  curses window uses wide-
+            character cells.
+ 
+-       o   NetBSD  curses  used 6 bits for the color pair identifier from 2000
+-           (when it first added color support) until  2004.   At  that  point,
+-           NetBSD  widened  the  color  pair  identifier to use 9 bits.  As of
+-           2025, that size is unchanged.  Like ncurses before version  6,  the
+-           NetBSD  color  pair  datum  is  stored  in  the attributes field of
++       o   NetBSD curses used 6 bits for the color pair identifier  from  2000
++           (when  it  first  added  color support) until 2004.  At that point,
++           NetBSD widened the color pair identifier to  use  9  bits.   As  of
++           2025,  that  size is unchanged.  Like ncurses before version 6, the
++           NetBSD color pair datum  is  stored  in  the  attributes  field  of
+            cchar_t, limiting the number of color pairs.
+ 
+ 
+ 
                                                                                                                                                                SEE ALSO
                                                                                                                                                                +-       curses(3x),   curs_attr(3x),   curs_initscr(3x),    curs_variables(3x),
++       curses(3x),    curs_attr(3x),   curs_initscr(3x),   curs_variables(3x),
+        default_colors(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-01                    curs_color(3x)
++ncurses 6.5                       2025-04-05                    curs_color(3x)
+ 
                                                                                                                                                                
+ 
                                                                                                                                                                
+ 
                                                                                                                                                                  
+Index: doc/html/man/curs_delch.3x.html
+--- ncurses-6.5-20250329+/doc/html/man/curs_delch.3x.html	2025-01-19 00:54:58.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/curs_delch.3x.html	2025-04-05 22:33:03.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_delch.3x,v 1.47 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_delch.3x,v 1.49 2025/04/05 21:59:53 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_delch 3x 2025-01-18 ncurses 6.5 Library calls
++curs_delch 3x 2025-04-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                  curs_delch 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                  
++
                                                                                                                                                                  curs_delch 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                  
+ 
                                                                                                                                                                  + curs_delch(3x)                   Library calls                  curs_delch(3x)
+ 
+@@ -73,16 +73,21 @@
+ 
                                                                                                                                                                  RETURN VALUE
                                                                                                                                                                  +        These functions return OK on success and ERR on failure.
+ 
+-       In ncurses, they return ERR if win is NULL.
++       In ncurses, these functions fail if
+ 
+-       Functions prefixed with "mv" first perform cursor movement and fail  if
++       o   the curses screen has not been initialized, or
++
++       o   (for functions taking a WINDOW pointer  argument)  win  is  a  null
++           pointer.
++
++       Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                                  NOTES
                                                                                                                                                                  +        delch, mvdelch, and mvwdelch may be implemented as macros.
+ 
+-       A  terminal's  delete_character  (dch1)  capability  is not necessarily
++       A terminal's delete_character  (dch1)  capability  is  not  necessarily
+        employed.
+ 
+ 
+@@ -90,7 +95,7 @@
+        X/Open Curses Issue 4 describes these functions.  It specifies no error
+        conditions for them.
+ 
+-       SVr4  describes  a  successful  return  value only as "an integer value
++       SVr4 describes a successful return value  only  as  "an  integer  value
+        other than ERR".
+ 
+ 
+@@ -103,7 +108,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                    curs_delch(3x)
++ncurses 6.5                       2025-04-05                    curs_delch(3x)
+ 
                                                                                                                                                                  
+ 
                                                                                                                                                                  
+ 
                                                                                                                                                                    
+Index: doc/html/man/curs_deleteln.3x.html
+--- ncurses-6.5-20250329+/doc/html/man/curs_deleteln.3x.html	2025-02-02 00:43:57.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/curs_deleteln.3x.html	2025-04-05 22:33:03.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_deleteln.3x,v 1.51 2025/02/01 22:49:56 tom Exp @
++  * @Id: curs_deleteln.3x,v 1.53 2025/04/05 22:00:17 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_deleteln 3x 2025-02-01 ncurses 6.5 Library calls
++curs_deleteln 3x 2025-04-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                    curs_deleteln 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                    
++
                                                                                                                                                                    curs_deleteln 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                    
+ 
                                                                                                                                                                    + curs_deleteln(3x)                Library calls               curs_deleteln(3x)
+ 
+@@ -79,8 +79,6 @@
+        negative,  respectively,  as  if  by  repeatedly  calling  winsertln or
+        wdeleteln.
+ 
+-       ncurses(3x) describes the variants of these functions.
+-
+ 
+ 
                                                                                                                                                                    RETURN VALUE
                                                                                                                                                                    +        These functions return OK on success and ERR on failure.
+@@ -115,7 +113,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-01                 curs_deleteln(3x)
++ncurses 6.5                       2025-04-05                 curs_deleteln(3x)
+ 
                                                                                                                                                                    
+ 
                                                                                                                                                                    
+ 
                                                                                                                                                                      
+Index: doc/html/man/curs_extend.3x.html
+--- ncurses-6.5-20250329+/doc/html/man/curs_extend.3x.html	2025-01-19 00:54:58.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/curs_extend.3x.html	2025-04-05 22:33:03.000000000 +0000
+@@ -28,19 +28,19 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey 1999-on
+-  * @Id: curs_extend.3x,v 1.54 2025/01/19 00:49:39 tom Exp @
++  * @Id: curs_extend.3x,v 1.56 2025/04/05 22:01:03 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_extend 3x 2025-01-18 ncurses 6.5 Library calls
++curs_extend 3x 2025-04-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                      curs_extend 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                      
++
                                                                                                                                                                      curs_extend 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                      
+ 
                                                                                                                                                                      + curs_extend(3x)                  Library calls                 curs_extend(3x)
+ 
+@@ -76,7 +76,7 @@
+        curs_termcap(3x)  interfaces.   Normally  these names are available for
+        use, since the essential decision is made through use  of  tic(1)'s  -x
+        option  to  include  such  extensions  in  terminal  type descriptions.
+-       use_extended_names  can  prevent   ncurses   from   recognizing   these
++       use_extended_names(FALSE)  prevents  ncurses  from  recognizing   these
+        capabilities  to  ensure  compatibility  with  other implementations of
+        curses.
+ 
+@@ -116,7 +116,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                   curs_extend(3x)
++ncurses 6.5                       2025-04-05                   curs_extend(3x)
+ 
                                                                                                                                                                      
+ 
                                                                                                                                                                      
+ 
                                                                                                                                                                        
+Index: doc/html/man/curs_get_wch.3x.html
+--- ncurses-6.5-20250329+/doc/html/man/curs_get_wch.3x.html	2025-02-15 20:06:26.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/curs_get_wch.3x.html	2025-04-05 22:33:03.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_get_wch.3x,v 1.66 2025/02/15 19:35:48 tom Exp @
++  * @Id: curs_get_wch.3x,v 1.69 2025/04/05 22:03:24 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_get_wch 3x 2025-02-15 ncurses 6.5 Library calls
++curs_get_wch 3x 2025-04-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                        curs_get_wch 3x 2025-02-15 ncurses 6.5 Library calls
                                                                                                                                                                        
++
                                                                                                                                                                        curs_get_wch 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                        
+ 
                                                                                                                                                                        + curs_get_wch(3x)                 Library calls                curs_get_wch(3x)
+ 
+@@ -116,21 +116,29 @@
+ 
+ 
                                                                                                                                                                        RETURN VALUE
                                                                                                                                                                        +        wget_wch returns OK when it reads a wide character,  KEY_CODE_YES  when
+-       it reads a function key code, and ERR on failure.  wget_wch fails if
++       it  reads  a  function key code, and ERR on failure.  wget_wch fails if
++       its timeout expires without any data arriving, which cannot  happen  if
++       nodelay(3x) is in effect on the window.
+ 
+-       o   its timeout expires without any data arriving, or
++       In ncurses, wget_wch also fails if
+ 
+-       o   execution  was  interrupted by a signal, in which case errno is set
+-           to EINTR.
++       o   the curses screen has not been initialized,
++
++       o   (for  functions  taking  a  WINDOW  pointer argument) win is a null
++           pointer, or
+ 
+-       Functions taking a WINDOW pointer  argument  fail  if  win  is  a  null
+-       pointer.
++       o   execution was interrupted by a signal, in which case errno  is  set
++           to EINTR.
+ 
+        Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+-       unget_wch returns OK on success and ERR if there is no more room in the
+-       input queue.
++       unget_wch returns OK on  success  and  ERR  on  failure.   In  ncurses,
++       unget_wch fails if
++
++       o   the curses screen has not been initialized, or
++
++       o   there is no more room in the input queue.
+ 
+ 
+ 
                                                                                                                                                                        NOTES
                                                                                                                                                                        +@@ -139,13 +147,12 @@
+        All of these functions except wget_wch and unget_wch may be implemented
+        as macros.
+ 
+-       Unlike wgetch(3x), wget_wch and its variants store  the  value  of  the
+-       input  character  in  an additional wch parameter instead of the return
+-       value.
+-
+-       Unlike ungetch, unget_wch cannot distinguish function  key  codes  from
+-       conventional   character  codes.   An  application  can  overcome  this
+-       limitation by pushing function key codes with ungetch and  subsequently
++       Unlike wgetch(3x), wget_wch stores the value of the input character  in
++       an additional wch parameter instead of the return value.
++
++       Unlike  ungetch,  unget_wch  cannot distinguish function key codes from
++       conventional  character  codes.   An  application  can  overcome   this
++       limitation  by pushing function key codes with ungetch and subsequently
+        checking the return value of wget_wch for a match with KEY_CODE_YES.
+ 
+ 
+@@ -160,18 +167,18 @@
+        X/Open Curses Issue 4 describes these functions.  It specifies no error
+        conditions for them.
+ 
+-       See  the  "PORTABILITY" section of wgetch(3x) regarding the interaction
++       See the "PORTABILITY" section of wgetch(3x) regarding  the  interaction
+        of wget_wch with signal handlers.
+ 
+ 
+ 
                                                                                                                                                                        HISTORY
                                                                                                                                                                        +-       X/Open Curses Issue 4 (1995) initially specified these functions.   The
+-       System V  Interface  Definition  Version 4  of  the same year specified
++       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
++       System V Interface Definition Version 4  of  the  same  year  specified
+        functions named wgetwch (with its variants) ungetwch.  These were later
+-       additions  to  SVr4.x,  not  appearing  in the first SVr4 (1989).  They
++       additions to SVr4.x, not appearing in  the  first  SVr4  (1989).   They
+        differ from X/Open's later wget_wch and unget_wch in that wgetwch takes
+-       no  wch  argument,  but  returns the (wide) key code as an int (with no
+-       provision for distinguishing a  character  code  from  a  function  key
++       no wch argument, but returns the (wide) key code as  an  int  (with  no
++       provision  for  distinguishing  a  character  code  from a function key
+        code); and ungetwch takes a non-const int argument.
+ 
+ 
+@@ -179,12 +186,12 @@
+        curs_getch(3x) describes comparable functions of the ncurses library in
+        its non-wide-character configuration.
+ 
+-       curses(3x),    curs_add_wch(3x),    curs_inopts(3x),     curs_move(3x),
++       curses(3x),     curs_add_wch(3x),    curs_inopts(3x),    curs_move(3x),
+        curs_refresh(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-15                  curs_get_wch(3x)
++ncurses 6.5                       2025-04-05                  curs_get_wch(3x)
+ 
                                                                                                                                                                        
+ 
                                                                                                                                                                        
+ 
                                                                                                                                                                          
+Index: doc/html/man/curs_get_wstr.3x.html
+--- ncurses-6.5-20250329+/doc/html/man/curs_get_wstr.3x.html	2025-02-15 15:07:46.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/curs_get_wstr.3x.html	2025-04-05 22:57:19.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_get_wstr.3x,v 1.70 2025/02/15 14:55:47 tom Exp @
++  * @Id: curs_get_wstr.3x,v 1.75 2025/04/05 22:36:46 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_get_wstr 3x 2025-02-15 ncurses 6.5 Library calls
++curs_get_wstr 3x 2025-04-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                          curs_get_wstr 3x 2025-02-15 ncurses 6.5 Library calls
                                                                                                                                                                          
++
                                                                                                                                                                          curs_get_wstr 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                          
+ 
                                                                                                                                                                          + curs_get_wstr(3x)                Library calls               curs_get_wstr(3x)
+ 
+@@ -80,36 +80,36 @@
+        o   always terminates the string with a null wide character (after  any
+            WEOF);
+ 
+-       o   interprets   the   screen's   erase   and   kill   characters  (see
++       o   interprets  the  screen's  wide erase and wide kill characters (see
+            erasewchar(3x) and killwchar(3x));
+ 
+        o   recognizes function keys only if  the  screen's  keypad  option  is
+            enabled (see keypad(3x));
+ 
+        o   treats the function keys KEY_LEFT and KEY_BACKSPACE the same as the
+-           erase character; and
++           wide erase character; and
+ 
+-       o   discards function key inputs other than those treated as the  erase
+-           character, calling beep(3x).
++       o   discards function key inputs other than those treated as  the  wide
++           erase or wide kill characters, calling beep(3x).
+ 
+-       The  erase  character  replaces  the character at the end of the buffer
+-       with a null wide character, while the kill character does the same  for
+-       the entire buffer.
++       The  wide  erase  character  replaces  the  character at the end of the
++       buffer with a null wide character, while the wide kill  character  does
++       the same for the entire buffer.
+ 
+        If  the  screen's  echo  option  is  enabled  (see echo(3x)), wget_wstr
+        updates win with wadd_wch(3x).  Further,
+ 
+-       o   the erase character and its function key synonyms move  the  cursor
+-           to the left, and
++       o   the wide erase character and its function  key  synonyms  move  the
++           cursor to the left, and
+ 
+-       o   the  kill character returns the cursor to where it was located when
+-           wget_wstr was called.
++       o   the  wide kill character returns the cursor to where it was located
++           when wget_wstr was called.
+ 
+        wgetn_wstr is similar, but reads at most n wide characters, aiding  the
+-       application  to  avoid overrunning the buffer to which wstr points.  An
+-       attempt  to  input  more  than  n  wide  characters  (other  than   the
+-       terminating line feed or carriage return) is ignored with a beep.  If n
+-       is negative, wgetn_wstr reads  up  to  LINE_MAX  wide  characters  (see
++       application  to  avoid  overrunning  the  buffer  to which wstr points.
++       curses ignores an attempt to input more than n wide  characters  (other
++       than  the  terminating line feed or carriage return), calling beep(3x).
++       If n is negative, wgetn_wstr reads up to LINE_MAX wide characters  (see
+        sysconf(3)).
+ 
+        ncurses(3x) describes the variants of these functions.
+@@ -118,36 +118,41 @@
+ 
                                                                                                                                                                          RETURN VALUE
                                                                                                                                                                          +        These functions return OK on success and ERR on failure.
+ 
+-       In ncurses, they return ERR if
++       In ncurses, these functions fail if
+ 
+-       o   win is NULL, or
++       o   the curses screen has not been initialized,
+ 
+-       o   if an internal wget_wch(3x) call fails.
++       o   (for  functions  taking  a  WINDOW  pointer argument) win is a null
++           pointer,
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
++       o   str is a null pointer, or
++
++       o   an internal wget_wch(3x) call fails.
++
++       Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                                          NOTES
                                                                                                                                                                          +        All of these functions except wgetn_wstr may be implemented as macros.
+ 
+-       Reading input that overruns  the  buffer  pointed  to  by  wstr  causes
+-       undefined   results.    Use   the  n-infixed  functions,  and  allocate
++       Reading  input  that  overruns  the  buffer  pointed  to by wstr causes
++       undefined  results.   Use  the  n-infixed   functions,   and   allocate
+        sufficient storage for wstr -- at least n+1 times sizeof(wchar_t).
+ 
+-       These functions cannot store a KEY_ value in wstr because there  is  no
++       These  functions  cannot store a KEY_ value in wstr because there is no
+        way to distinguish it from a valid wchar_t value.
+ 
+-       While  these  functions  conceptually  implement  a  series of calls to
+-       wget_wch, they also temporarily change properties of the curses  screen
+-       to  permit simple editing of the input buffer.  Each function saves the
+-       screen's state, calls nl(3x), and,  if  the  screen  was  in  canonical
+-       ("cooked")  mode,  cbreak(3x).  Before returning, it restores the saved
+-       screen state.  Other implementations differ in detail, affecting  which
+-       control   characters  they  can  accept  in  the  buffer;  see  section
++       While these functions conceptually  implement  a  series  of  calls  to
++       wget_wch,  they also temporarily change properties of the curses screen
++       to permit simple editing of the input buffer.  Each function saves  the
++       screen's  state,  calls  nl(3x),  and,  if  the screen was in canonical
++       ("cooked") mode, cbreak(3x).  Before returning, it restores  the  saved
++       screen  state.  Other implementations differ in detail, affecting which
++       control  characters  they  can  accept  in  the  buffer;  see   section
+        "PORTABILITY" below.
+ 
+-       Unlike getstr(3x) and related  functions  of  ncurses's  non-wide  API,
++       Unlike  getstr(3x)  and  related  functions  of ncurses's non-wide API,
+        these functions do not return KEY_RESIZE if a SIGWINCH event interrupts
+        the function.
+ 
+@@ -164,75 +169,75 @@
+        X/Open Curses Issue 4 describes these functions.  It specifies no error
+        conditions for them.
+ 
+-       Issue 4  documented these functions as passing an array of wchar_t, but
+-       that was an error, conflicting  with  the  following  language  in  the
++       Issue 4 documented these functions as passing an array of wchar_t,  but
++       that  was  an  error,  conflicting  with  the following language in 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
++              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.
+ 
+-       get_wch  can  return a negative value (WEOF), but wchar_t is a unsigned
+-       type.  All of the  vendors  implement  these  functions  using  wint_t,
++       get_wch can return a negative value (WEOF), but wchar_t is  a  unsigned
++       type.   All  of  the  vendors  implement  these functions using wint_t,
+        following the Issue 7 standard.
+ 
+-       X/Open  Curses  Issue 7  is  unclear  whether the terminating null wide
+-       character counts toward  the  length  parameter  n.   A  similar  issue
+-       affected   wgetnstr   in   Issue 4,  Version 2;  Issue 7  revised  that
+-       function's  description  to  address  the  issue,  but  not   that   of
++       X/Open Curses Issue 7 is unclear  whether  the  terminating  null  wide
++       character  counts  toward  the  length  parameter  n.   A similar issue
++       affected  wgetnstr  in  Issue 4,  Version 2;   Issue 7   revised   that
++       function's   description   to  address  the  issue,  but  not  that  of
+        wget_nwstr, leaving it ambiguous.  ncurses counts the terminator in the
+        length.
+ 
+-       X/Open Curses does  not  specify  what  happens  if  the  length  n  is
++       X/Open  Curses  does  not  specify  what  happens  if  the  length n is
+        negative.
+ 
+-       o   For  consistency  with  wgetnstr, ncurses 6.2 uses a limit based on
++       o   For consistency with wgetnstr, ncurses 6.2 uses a  limit  based  on
+            LINE_MAX.
+ 
+-       o   Some other implementations (such as Solaris xcurses) do  the  same,
++       o   Some  other  implementations (such as Solaris xcurses) do the same,
+            while others (PDCurses) do not permit a negative n.
+ 
+-       o   NetBSD 7  curses  imitates  ncurses  6.1  and  earlier,  treating a
++       o   NetBSD 7 curses  imitates  ncurses  6.1  and  earlier,  treating  a
+            negative n as an unbounded count of wide characters.
+ 
+        Implementations vary in their handling of input control characters.
+ 
+        o   While they may enable the screen's echo option, some do not take it
+-           out  of  raw  mode,  and  may  take  cbreak  mode into account when
+-           deciding whether to handle echoing within wgetn_wstr or to rely  on
++           out of raw mode,  and  may  take  cbreak  mode  into  account  when
++           deciding  whether to handle echoing within wgetn_wstr or to rely on
+            it as a side effect of calling wget_wch.
+ 
+-           Since  1995,  ncurses has provided handlers for SIGINTR and SIGQUIT
+-           events, which are typically generated at the keyboard with  ^C  and
++           Since 1995, ncurses has provided handlers for SIGINTR  and  SIGQUIT
++           events,  which  are typically generated at the keyboard with ^C and
+            ^\ respectively.  In cbreak mode, those handlers catch a signal and
+-           stop  the  program,  whereas  other  implementations  write   those
++           stop   the  program,  whereas  other  implementations  write  those
+            characters into the buffer.
+ 
+-       o   Starting  with ncurses 6.3 (2021), wgetn_wstr preserves raw mode if
+-           the screen was already in that state, allowing  one  to  enter  the
+-           characters  the  terminal  interprets  as interrupt and quit events
++       o   Starting with ncurses 6.3 (2021), wgetn_wstr preserves raw mode  if
++           the  screen  was  already  in that state, allowing one to enter the
++           characters the terminal interprets as  interrupt  and  quit  events
+            into the buffer, for consistency with SVr4 curses's wgetnstr.
+ 
+ 
+ 
                                                                                                                                                                          HISTORY
                                                                                                                                                                          +-       X/Open Curses Issue 4 (1995) initially specified these functions.   The
+-       System V  Interface  Definition  Version 4  of  the same year specified
++       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
++       System V Interface Definition Version 4  of  the  same  year  specified
+        functions named wgetwstr and wgetnwstr (and the usual variants).  These
+        were later additions to SVr4.x, not appearing in the first SVr4 (1989).
+-       Except in name, their declarations did not differ from  X/Open's  later
+-       wget_wstr  and wgetn_wstr until X/Open Curses Issue 7 (2009) eventually
++       Except  in  name, their declarations did not differ from X/Open's later
++       wget_wstr and wgetn_wstr until X/Open Curses Issue 7 (2009)  eventually
+        changed the type of the buffer argument to a pointer to wint_t.
+ 
+ 
+ 
                                                                                                                                                                          SEE ALSO
                                                                                                                                                                          +-       curs_getstr(3x) describes comparable functions of the  ncurses  library
++       curs_getstr(3x)  describes  comparable functions of the ncurses library
+        in its non-wide-character configuration.
+ 
+        curses(3x), curs_get_wch(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-15                 curs_get_wstr(3x)
++ncurses 6.5                       2025-04-05                 curs_get_wstr(3x)
+ 
                                                                                                                                                                          
+ 
                                                                                                                                                                          
+ 
                                                                                                                                                                            
+Index: doc/html/man/curs_getch.3x.html
+--- ncurses-6.5-20250329+/doc/html/man/curs_getch.3x.html	2025-03-15 22:08:52.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/curs_getch.3x.html	2025-04-05 22:33:03.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_getch.3x,v 1.121 2025/03/15 22:04:20 tom Exp @
++  * @Id: curs_getch.3x,v 1.127 2025/04/05 22:04:30 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_getch 3x 2025-03-15 ncurses 6.5 Library calls
++curs_getch 3x 2025-04-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                            curs_getch 3x 2025-03-15 ncurses 6.5 Library calls
                                                                                                                                                                            
++
                                                                                                                                                                            curs_getch 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                            
+ 
                                                                                                                                                                            + curs_getch(3x)                   Library calls                  curs_getch(3x)
+ 
+@@ -111,24 +111,26 @@
+ 
+ 
+ 
                                                                                                                                                                            Keypad Mode
                                                                                                                                                                            +-       To curses, key strokes not from the alphabetic section of the  keyboard
+-       (those    corresponding    to    the    ECMA-6    character    set--see
+-       ascii(7)--optionally modified by either the control or shift keys)  are
+-       treated as function keys.  (In curses, the term "function key" includes
+-       but is not limited to keycaps engraved with "F1", "PF1",  and  so  on.)
+-       If  the  window  is  in  keypad  mode,  these  produce  a  numeric code
+-       corresponding to the KEY_ symbols listed in subsection "Predefined  Key
+-       Codes"  below;  otherwise,  they transmit a sequence of codes typically
+-       starting with the escape character, and which must  be  collected  with
+-       multiple wgetch calls.
++       Call keypad(3x) on a window to configure keypad mode when reading input
++       from  it.   In  keypad  mode,  curses  treats  key strokes not from the
++       alphabetic section of the keyboard (those corresponding to  the  ECMA-6
++       character  set  --  see  ascii(7)  -- optionally modified by either the
++       control or  shift  keys)  as  function  keys.   (In  curses,  the  term
++       "function  key"  includes  but  is not limited to keycaps engraved with
++       "F1", "PF1", and so on.)   If  a  window  is  in  keypad  mode,  wgetch
++       translates  these  key  strokes  to a numeric code corresponding to the
++       KEY_ symbols listed in subsection "Predefined Key Codes" below.   If  a
++       window  is  not  in  keypad  mode,  wgetch  returns a sequence of codes
++       typically starting with the escape  character,  which  the  application
++       must collect individually with multiple wgetch calls.
+ 
+        o   The  curses.h  header  file  declares many predefined function keys
+-           whose names begin with KEY_; these object-like macros  have  values
+-           outside the range of eight-bit character codes.
++           whose names begin with KEY_; these object-like macros have  integer
++           values outside the range of eight-bit character codes.
+ 
+        o   In   ncurses,   user-defined  function  keys  are  configured  with
+            define_key(3x); they have no names, but are also expected  to  have
+-           values outside the range of eight-bit codes.
++           integer values outside the range of eight-bit character codes.
+ 
+        A  variable  intended  to hold a function key code must thus be of type
+        short or larger.
+@@ -146,27 +148,28 @@
+            to the unique sequence defined by the terminal.
+ 
+        o   If the escape sequence matches no function  keys  defined  for  the
+-           terminal  type,  wgetch  returns the code of the last (most recent)
+-           character it has read.
++           terminal  type,  call  wgetch repeatedly to obtain the codes of the
++           individual characters of the sequence, in the order  they  occurred
++           in the input.
+ 
+        o   If wgetch cannot decide the validity of the input as a function key
+-           because  it  has not read enough characters to disambiguate it, the
+-           function waits until it has this information or the  escape  delay,
+-           configured  by  the  global  variable  ESCDELAY  (an extension; see
+-           section "EXTENSIONS" below) or the environment variable of the same
+-           name (see section "ENVIRONMENT" of ncurses(3x)), also an extension,
+-           elapses.
+-
+-       Consequently, a user of a curses application that employs  keypad  mode
+-       may  experience a pause or "hang" after the escape key is pressed while
+-       curses collects sufficient characters to disambiguate  the  input.   If
+-       the  window  is  in "no time-out" mode, the escape delay is effectively
+-       infinite; see notimeout(3x).  In the event of  such  a  pause,  further
++           because it has not read enough characters to disambiguate  it,  the
++           function  waits  until  it has this information or the escape delay
++           elapses.  Configure the  escape  delay  with  the  global  variable
++           ESCDELAY,  an  extension  (see  section "EXTENSIONS" below), or the
++           environment variable of the same name (see section "ENVIRONMENT" of
++           ncurses(3x)), also an extension.
++
++       Consequently,  a  user of a curses application that employs keypad mode
++       may experience a pause or "hang" after pressing the  escape  key  while
++       curses  collects  sufficient  characters to disambiguate the input.  If
++       the window is in "no time-out" mode, the escape  delay  is  effectively
++       infinite;  see  notimeout(3x).   In  the event of such a pause, further
+        typing "awakens" curses.
+ 
+ 
+ 
                                                                                                                                                                            Ungetting Characters
                                                                                                                                                                            +-       ungetch  places  c into the input queue to be returned by the next call
++       ungetch places c into the input queue to be returned by the  next  call
+        to wgetch.  A single input queue serves all windows associated with the
+        screen.
+ 
+@@ -174,16 +177,16 @@
+ 
                                                                                                                                                                            Predefined Key Codes
                                                                                                                                                                            +        The header file curses.h defines the following function key codes.
+ 
+-       o   Except  for  the special case of KEY_RESIZE, a window's keypad mode
++       o   Except for the special case of KEY_RESIZE, a window's  keypad  mode
+            must be enabled for wgetch to read these codes from it.
+ 
+-       o   Not all of  these  are  necessarily  supported  on  any  particular
++       o   Not  all  of  these  are  necessarily  supported  on any particular
+            terminal.
+ 
+-       o   The   naming  convention  may  seem  obscure,  with  some  apparent
+-           misspellings (such as "RSUME" for "resume"); the  names  correspond
+-           to   the   terminfo   capability  names  for  the  keys,  and  were
+-           standardized before  the  IBM  PC/AT  keyboard  layout  achieved  a
++       o   The  naming  convention  may  seem  obscure,  with  some   apparent
++           misspellings  (such  as "RSUME" for "resume"); the names correspond
++           to  the  terminfo  capability  names  for  the   keys,   and   were
++           standardized  before  the  IBM  PC/AT  keyboard  layout  achieved a
+            dominant position in industry.
+ 
+               Symbol          Key name
+@@ -245,10 +248,10 @@
+               KEY_REFERENCE   Ref(erence) key
+               KEY_REFRESH     Refresh key
+               KEY_REPLACE     Replace key
++
+               KEY_RESIZE      Screen resized
+               KEY_RESTART     Restart key
+               KEY_RESUME      Resume key
+-
+               KEY_SAVE        Save key
+               KEY_SELECT      Select key
+               KEY_SUSPEND     Suspend key
+@@ -292,105 +295,113 @@
+                                    +-----+------+-------+
+                                    | C1  | down |  C3   |
+                                    +-----+------+-------+
+-       Two  of  the  symbols in the list above do not correspond to a physical
++       Two of the symbols in the list above do not correspond  to  a  physical
+        key.
+ 
+-       o   wgetch returns KEY_RESIZE, even if  the  window's  keypad  mode  is
++       o   wgetch  returns  KEY_RESIZE,  even  if  the window's keypad mode is
+            disabled, if ncurses has handled a SIGWINCH signal since wgetch was
+            called; see initscr(3x) and resizeterm(3x).
+ 
+-       o   wgetch returns KEY_MOUSE to indicate that a mouse event is  pending
+-           collection;  see  curs_mouse(3x).   Receipt of this code requires a
+-           window's keypad mode to be  enabled,  because  to  interpret  mouse
+-           input  (as  with  xterm(1)'s  mouse protocol), ncurses must read an
++       o   wgetch  returns KEY_MOUSE to indicate that a mouse event is pending
++           collection; see curs_mouse(3x).  Receipt of this  code  requires  a
++           window's  keypad  mode  to  be  enabled, because to interpret mouse
++           input (as with xterm(1)'s mouse protocol),  ncurses  must  read  an
+            escape sequence, as with a function key.
+ 
+ 
+ 
                                                                                                                                                                            Testing Key Codes
                                                                                                                                                                            +-       In ncurses, has_key returns a  Boolean  value  indicating  whether  the
+-       terminal  type  recognizes its parameter as a key code value.  See also
++       In  ncurses,  has_key  returns  a  Boolean value indicating whether the
++       terminal type recognizes its parameter as a key code value.   See  also
+        define_key(3x) and key_defined(3x).
+ 
+ 
+ 
                                                                                                                                                                            RETURN VALUE
                                                                                                                                                                            +        wgetch returns a key code identifying the key event as described above,
+        which may include KEY_RESIZE or KEY_MOUSE indicating non-key events, or
+-       ERR on failure.  wgetch fails if
++       ERR  on  failure.  wgetch fails if its timeout expires without any data
++       arriving, which cannot happen  if  nodelay(3x)  is  in  effect  on  the
++       window.
++
++       In ncurses, wgetch also fails if
+ 
+-       o   its timeout expires without any data arriving, or
++       o   the curses screen has not been initialized,
++
++       o   (for  functions  taking  a  WINDOW  pointer argument) win is a null
++           pointer, or
+ 
+        o   execution was interrupted by a signal, in which case errno  is  set
+            to EINTR.
+ 
+-       ungetch  returns  OK  on  success and ERR on failure.  ungetch fails if
+-       there is no more room in the input queue.
++       Functions  prefixed with "mv" first perform cursor movement and fail if
++       the position (y, x) is outside the window boundaries.
++
++       ungetch returns OK on success and ERR on failure.  In ncurses,  ungetch
++       fails if
+ 
+-       has_key returns TRUE or FALSE.
++       o   the curses screen has not been initialized, or
+ 
+-       Functions taking a WINDOW pointer  argument  fail  if  win  is  a  null
+-       pointer.
++       o   there is no more room in the input queue.
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
+-       the position (y, x) is outside the window boundaries.
++       has_key returns TRUE or FALSE.
+ 
+ 
+ 
                                                                                                                                                                            NOTES
                                                                                                                                                                            +        getch, mvgetch, and mvwgetch may be implemented as macros.
+ 
+-       curses discourages assignment of the ESC key to a discrete function  by
++       curses  discourages assignment of the ESC key to a discrete function by
+        the programmer because the library requires a delay while it awaits the
+        potential remainder of a terminal escape sequence.
+ 
+-       Some key strokes are indistinguishable  from  control  characters;  for
+-       example,  KEY_ENTER may be the same as ^M, and KEY_BACKSPACE may be the
+-       same as ^H or ^?.  Consult the terminfo entry for the terminal type  to
+-       determine  whether  this  is  the  case;  see  infocmp(1).  Some curses
++       Some  key  strokes  are  indistinguishable from control characters; for
++       example, KEY_ENTER may be the same as ^M, and KEY_BACKSPACE may be  the
++       same  as ^H or ^?.  Consult the terminfo entry for the terminal type to
++       determine whether this  is  the  case;  see  infocmp(1).   Some  curses
+        implementations, including ncurses, honor the terminfo key definitions;
+        others treat such control characters specially.
+ 
+-       curses  distinguishes  the  Enter  keys  in  the alphabetic and numeric
+-       keypad sections of a keyboard because (most) terminals  do.   KEY_ENTER
+-       refers  to the key on the numeric keypad and, like other function keys,
++       curses distinguishes the Enter  keys  in  the  alphabetic  and  numeric
++       keypad  sections  of a keyboard because (most) terminals do.  KEY_ENTER
++       refers to the key on the numeric keypad and, like other function  keys,
+        is reliably recognized only if the window's keypad mode is enabled.
+ 
+-       o   The terminfo key_enter (kent) capability  describes  the  character
+-           (sequence)  sent  by  the  Enter  key  of  a terminal's numeric (or
++       o   The  terminfo  key_enter  (kent) capability describes the character
++           (sequence) sent by the  Enter  key  of  a  terminal's  numeric  (or
+            similar) keypad.
+ 
+        o   "Enter or send" is X/Open Curses's description of this key.
+ 
+-       curses treats the Enter or Return key in the alphabetic section of  the
++       curses  treats the Enter or Return key in the alphabetic section of the
+        keyboard differently.
+ 
+        o   It usually produces a control code for carriage return (^M) or line
+            feed (^J).
+ 
+-       o   Depending on the terminal mode (raw,  cbreak,  or  canonical),  and
+-           whether  nl(3x)  or  nonl(3x)  has  been  called, wgetch may return
+-           either a carriage return or line feed upon an Enter or  Return  key
++       o   Depending  on  the  terminal  mode (raw, cbreak, or canonical), and
++           whether nl(3x) or nonl(3x)  has  been  called,  wgetch  may  return
++           either  a  carriage return or line feed upon an Enter or Return key
+            stroke.
+ 
+-       Use  of  wgetch with echo(3x) and neither cbreak(3x) nor raw(3x) is not
++       Use of wgetch with echo(3x) and neither cbreak(3x) nor raw(3x)  is  not
+        well-defined.
+ 
+-       Historically, the list of key code macros above was influenced  by  the
+-       keyboard  of  the AT&T 7300 (also known variously as the "3B1", "Safari
+-       4", and "UNIX PC"), a 1985 machine  rich  in  function  keys.   Today's
+-       computer  keyboards are based on that of the IBM PC/AT and tend to have
++       Historically,  the  list of key code macros above was influenced by the
++       keyboard of the AT&T 7300 (also known variously as the  "3B1",  "Safari
++       4",  and  "UNIX  PC"),  a  1985 machine rich in function keys.  Today's
++       computer keyboards are based on that of the IBM PC/AT and tend to  have
+        fewer.  A curses application can expect such a keyboard to transmit key
+-       codes   KEY_UP,   KEY_DOWN,  KEY_LEFT,  KEY_RIGHT,  KEY_HOME,  KEY_END,
+-       KEY_PPAGE (Page Up), KEY_NPAGE (Page  Down),  KEY_IC  (Insert),  KEY_DC
++       codes  KEY_UP,  KEY_DOWN,  KEY_LEFT,  KEY_RIGHT,   KEY_HOME,   KEY_END,
++       KEY_PPAGE  (Page  Up),  KEY_NPAGE  (Page Down), KEY_IC (Insert), KEY_DC
+        (Delete), KEY_A1, KEY_A3, KEY_B2, KEY_C1, KEY_C3, and KEY_F(n) for 1 <=
+        n <= 12.
+ 
+ 
+ 
                                                                                                                                                                            EXTENSIONS
                                                                                                                                                                            +        In ncurses, when a window's "no time-out" mode is not set, the ESCDELAY
+-       variable  configures  the  duration of the timer used to disambiguate a
+-       function key character sequence from a series of key strokes  beginning
++       variable configures the duration of the timer used  to  disambiguate  a
++       function  key character sequence from a series of key strokes beginning
+        with ESC typed by the user; see curs_variables(3x).
+ 
+-       has_key  is  an  ncurses  extension,  and  is not found in SVr4 curses,
++       has_key is an ncurses extension, and  is  not  found  in  SVr4  curses,
+        4.4BSD curses, or any other previous curses implementation.
+ 
+ 
+@@ -398,32 +409,32 @@
+        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       Except  as  noted  in section "EXTENSIONS" above, X/Open Curses Issue 4
++       Except as noted in section "EXTENSIONS" above,  X/Open  Curses  Issue 4
+        describes these functions.  It specifies no error conditions for them.
+ 
+-       SVr4 describes a successful return value  only  as  "an  integer  value
++       SVr4  describes  a  successful  return  value only as "an integer value
+        other than ERR".
+ 
+        wgetch reads only single-byte characters.
+ 
+-       The  echo  behavior  of  these  functions on input of KEY_ or backspace
++       The echo behavior of these functions on  input  of  KEY_  or  backspace
+        characters is not documented in SVr4 curses.
+ 
+-       The behavior of wgetch in  the  presence  of  signal  handlers  is  not
+-       documented  in  SVr4  curses  and  is unspecified by X/Open Curses.  In
+-       historical curses implementations, it varied depending on  whether  the
+-       operating  system's  dispatch  of  a  signal to a handler interrupted a
++       The  behavior  of  wgetch  in  the  presence  of signal handlers is not
++       documented in SVr4 curses and is  unspecified  by  X/Open  Curses.   In
++       historical  curses  implementations, it varied depending on whether the
++       operating system's dispatch of a signal  to  a  handler  interrupted  a
+        read(2) call in progress, and also (in some implementations) whether an
+-       input  timeout  or  non-blocking  mode had been set.  A portable curses
+-       application prepares  for  two  cases:  (a)  signal  receipt  does  not
++       input timeout or non-blocking mode had been  set.   A  portable  curses
++       application  prepares  for  two  cases:  (a)  signal  receipt  does not
+        interrupt wgetch; or (b) signal receipt interrupts wgetch and causes it
+        to return ERR with errno set to EINTR.
+ 
+        KEY_MOUSE is mentioned in X/Open Curses, along with a few related term-
+-       info  capabilities, but no higher-level functions use the feature.  The
++       info capabilities, but no higher-level functions use the feature.   The
+        implementation in ncurses is an extension.
+ 
+-       KEY_RESIZE and has_key are extensions first  implemented  for  ncurses.
++       KEY_RESIZE  and  has_key  are extensions first implemented for ncurses.
+        By  2022,  PDCurses  and  NetBSD  curses  had  added  them  along  with
+        KEY_MOUSE.
+ 
+@@ -431,26 +442,28 @@
+ 
                                                                                                                                                                            HISTORY
                                                                                                                                                                            +        4BSD (1980) introduced wgetch and its variants.
+ 
+-       ncurses 1.9.9g (1996) added has_key.
++       SVr3 (1987) added ungetch.
++
++       ncurses 1.9.9g (1996) furnished the has_key extension.
+ 
+ 
+ 
                                                                                                                                                                            SEE ALSO
                                                                                                                                                                            +-       ECMA-6 "7-bit  coded  Character  Set"  <https://ecma-international.org/
++       ECMA-6  "7-bit  coded  Character  Set" <https://ecma-international.org/
+        publications-and-standards/standards/ecma-6/>
+ 
+-       ECMA-48   "Control   Functions  for  Coded  Character  Sets"  <https://
++       ECMA-48  "Control  Functions  for  Coded  Character   Sets"   <https://
+        ecma-international.org/publications-and-standards/standards/ecma-48/>
+ 
+-       curs_get_wch(3x) describes comparable functions of the ncurses  library
++       curs_get_wch(3x)  describes comparable functions of the ncurses library
+        in its wide-character configuration (ncursesw).
+ 
+-       curses(3x),     curs_addch(3x),     curs_inopts(3x),    curs_mouse(3x),
+-       curs_move(3x), curs_outopts(3x), curs_refresh(3x),  curs_variables(3x),
++       curses(3x),    curs_addch(3x),     curs_inopts(3x),     curs_mouse(3x),
++       curs_move(3x),  curs_outopts(3x), curs_refresh(3x), curs_variables(3x),
+        resizeterm(3x), ascii(7)
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-15                    curs_getch(3x)
++ncurses 6.5                       2025-04-05                    curs_getch(3x)
+ 
                                                                                                                                                                            
+ 
                                                                                                                                                                            
+ 
                                                                                                                                                                              
+Index: doc/html/man/curs_getstr.3x.html
+--- ncurses-6.5-20250329+/doc/html/man/curs_getstr.3x.html	2025-02-02 00:43:57.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/curs_getstr.3x.html	2025-04-05 22:33:03.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_getstr.3x,v 1.85 2025/02/01 22:49:13 tom Exp @
++  * @Id: curs_getstr.3x,v 1.89 2025/04/05 22:07:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_getstr 3x 2025-02-01 ncurses 6.5 Library calls
++curs_getstr 3x 2025-04-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                              curs_getstr 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                              
++
                                                                                                                                                                              curs_getstr 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                              
+ 
                                                                                                                                                                              + curs_getstr(3x)                  Library calls                 curs_getstr(3x)
+ 
+@@ -85,7 +85,7 @@
+            erase character; and
+ 
+        o   discards  function key inputs other than those treated as the erase
+-           character, calling beep(3x).
++           or kill characters, calling beep(3x).
+ 
+        The erase character replaces the character at the  end  of  the  buffer
+        with  a  null character, while the kill character does the same for the
+@@ -101,10 +101,11 @@
+            wgetstr was called.
+ 
+        wgetnstr  is  similar,  but  reads  at  most  n  characters, aiding the
+-       application to avoid overrunning the buffer to which  str  points.   An
+-       attempt  to  input  more  than n characters (other than the terminating
+-       line feed or carriage  return)  is  ignored  with  a  beep.   If  n  is
+-       negative, wgetn_wstr reads up to LINE_MAX characters (see sysconf(3)).
++       application to avoid  overrunning  the  buffer  to  which  str  points.
++       curses  ignores  an attempt to input more than n characters (other than
++       the terminating line feed or carriage return), calling beep(3x).  If  n
++       is   negative,   wgetn_wstr   reads  up  to  LINE_MAX  characters  (see
++       sysconf(3)).
+ 
+        ncurses(3x) describes the variants of these functions.
+ 
+@@ -112,11 +113,16 @@
+ 
                                                                                                                                                                              RETURN VALUE
                                                                                                                                                                              +        These functions return OK on success and ERR on failure.
+ 
+-       In ncurses, they return ERR if
++       In ncurses, these functions fail if
+ 
+-       o   win is NULL, or
++       o   the curses screen has not been initialized,
+ 
+-       o   if an internal wgetch(3x) call fails.
++       o   (for functions taking a WINDOW pointer  argument)  win  is  a  null
++           pointer,
++
++       o   str is a null pointer, or
++
++       o   an internal wgetch(3x) call fails.
+ 
+        Further,  in  ncurses,  these functions return KEY_RESIZE if a SIGWINCH
+        event interrupts the function.
+@@ -266,7 +272,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-01                   curs_getstr(3x)
++ncurses 6.5                       2025-04-05                   curs_getstr(3x)
+ 
                                                                                                                                                                              
+ 
                                                                                                                                                                              
+ 
                                                                                                                                                                                
+Index: doc/html/man/curs_inopts.3x.html
+--- ncurses-6.5-20250329+/doc/html/man/curs_inopts.3x.html	2025-03-15 22:08:52.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/curs_inopts.3x.html	2025-04-05 22:33:04.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inopts.3x,v 1.102 2025/03/15 21:11:52 tom Exp @
++  * @Id: curs_inopts.3x,v 1.104 2025/04/05 22:07:49 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inopts 3x 2025-03-15 ncurses 6.5 Library calls
++curs_inopts 3x 2025-04-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                curs_inopts 3x 2025-03-15 ncurses 6.5 Library calls
                                                                                                                                                                                
++
                                                                                                                                                                                curs_inopts 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                                
+ 
                                                                                                                                                                                + curs_inopts(3x)                  Library calls                 curs_inopts(3x)
+ 
+@@ -292,7 +292,7 @@
+        describe  two  related  but  distinct aspects of input handling, at the
+        risk of confusing the user.  The functions halfdelay, nodelay, timeout,
+        and  wtimeout  configure  whether  the input character reading function
+-       (getch(3x) or get_wch(3x)) waits for keyboard input to begin,  and  for
++       (wgetch(3x) or wget_wch(3x)) waits for keyboard input to begin, and for
+        how  long.   keypad  configures whether that function waits for further
+        input if the first character it reads is ESC.  Calling notimeout, which
+        has  nothing  to  do  with  timeout  or  wtimeout,  makes this delay in
+@@ -409,7 +409,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-15                   curs_inopts(3x)
++ncurses 6.5                       2025-04-05                   curs_inopts(3x)
+ 
                                                                                                                                                                                
+ 
                                                                                                                                                                                
+ 
                                                                                                                                                                                  
+Index: doc/html/man/curs_mouse.3x.html
+--- ncurses-6.5-20250329+/doc/html/man/curs_mouse.3x.html	2025-03-01 22:03:51.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/curs_mouse.3x.html	2025-04-05 22:33:04.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_mouse.3x,v 1.123 2025/03/01 21:33:30 tom Exp @
++  * @Id: curs_mouse.3x,v 1.126 2025/04/05 22:08:22 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_mouse 3x 2025-03-01 ncurses 6.5 Library calls
++curs_mouse 3x 2025-04-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                  curs_mouse 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                                                  
++
                                                                                                                                                                                  curs_mouse 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                                  
+ 
                                                                                                                                                                                  + curs_mouse(3x)                   Library calls                  curs_mouse(3x)
+ 
+@@ -98,9 +98,9 @@
+        bit set indicating the event type.
+ 
+        ncurses  ignores  mouse  events  when  input is in canonical ("cooked")
+-       mode, and produces an error beep when canonical mode is simulated in  a
+-       window  by  a  function  such  as getstr(3x) that expects a linefeed to
+-       terminate its input loop.
++       mode, and produces an error beep when  they  occur  while  the  library
++       simulates canonical mode in a window, as with getstr(3x), which expects
++       a line feed to terminate its input loop.
+ 
+ 
+ 
                                                                                                                                                                                  has_mouse
                                                                                                                                                                                  +@@ -233,18 +233,17 @@
+        events separated by more than the mouse interval as a "long press", or,
+        with motion, as a "drag".
+ 
+-       Calling  mouseinterval(0)  disables  click  resolution.   When  ncurses
+-       detects  a  mouse  event,  it  awaits further input activity up to this
+-       interval, and then checks for a subsequent mouse  event  which  can  be
+-       combined  with  the  first event.  If the timeout expires without input
+-       activity (which would happen with  a  zero  interval),  then  no  click
+-       resolution occurs.
++       When ncurses detects a mouse event, it awaits further input activity up
++       to  this  interval,  and then checks for a subsequent mouse event which
++       can be combined with the first event.  If the timeout  expires  without
++       input   activity,   then   no   click   resolution   occurs.    Calling
++       mouseinterval(0) disables click resolution.
+ 
+-       This    function    returns   the   previous   interval   value.    Use
++       mouseinterval   returns   the    previous    interval    value.     Use
+        mouseinterval(-1) to obtain the interval without altering it.
+ 
+        The  mouse  interval  is  set  to  one  sixth  of  a  second  when  the
+-       corresponding   screen   is   initialized,   e.g.,  in  initscr(3x)  or
++       corresponding  screen  is  initialized,   e.g.,   in   initscr(3x)   or
+        setupterm(3x).
+ 
+ 
+@@ -268,16 +267,16 @@
+ 
+        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).
+ 
+ 
+ 
                                                                                                                                                                                  NOTES
                                                                                                                                                                                  +-       The   order   of  the  MEVENT  structure  members  is  not  guaranteed.
++       The  order  of  the  MEVENT  structure  members  is   not   guaranteed.
+        Additional fields may be added to the structure in the future.
+ 
+-       Under ncurses, these calls are implemented using either xterm's  built-
++       Under  ncurses, these calls are implemented using either xterm's built-
+        in mouse-tracking API or platform-specific drivers including
+ 
+           o   Alessandro Rubini's gpm server
+@@ -286,12 +285,12 @@
+ 
+           o   OS/2 EMX
+ 
+-       If  you  are  using  an unsupported configuration, mouse events are not
++       If you are using an unsupported configuration,  mouse  events  are  not
+        visible to ncurses (and the mousemask function always returns 0).
+ 
+-       If the  terminal  type  possesses  the  (nonstandard)  terminfo  string
+-       capability  XM,  ncurses's xterm mouse driver uses it when initializing
+-       the terminal for mouse operation.  The default, if  XM  is  not  found,
++       If  the  terminal  type  possesses  the  (nonstandard)  terminfo string
++       capability XM, ncurses's xterm mouse driver uses it  when  initializing
++       the  terminal  for  mouse  operation.  The default, if XM is not found,
+        corresponds to private mode 1000 of xterm.
+ 
+           \E[?1000%?%p1%{1}%=%th%el%;
+@@ -300,47 +299,47 @@
+ 
+           \E[?1006;1000%?%p1%{1}%=%th%el%;
+ 
+-       The  id  member  of the mouse event structure is not presently used; no
+-       terminal type or operating system interface supports  reporting  events
+-       from  distinguishable  pointing  devices.  If you synthesize an MEVENT,
++       The id member of the mouse event structure is not  presently  used;  no
++       terminal  type  or operating system interface supports reporting events
++       from distinguishable pointing devices.  If you  synthesize  an  MEVENT,
+        use an id of 0.
+ 
+        The z member of the mouse event structure is not presently used.  It is
+-       intended  for  use with touch screens (which may be pressure-sensitive)
++       intended 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.
+ 
+ 
+ 
                                                                                                                                                                                  EXTENSIONS
                                                                                                                                                                                  +-       These  functions  are  ncurses  extensions,  and  are not found in SVr4
+-       curses, 4.4BSD curses, or any  other  previous  curses  implementation.
+-       (SVr4  curses  did have a getmouse function, which took no argument and
++       These functions are ncurses extensions,  and  are  not  found  in  SVr4
++       curses,  4.4BSD  curses,  or  any other previous curses implementation.
++       (SVr4 curses did have a getmouse function, which took no  argument  and
+        returned an unsigned long.)
+ 
+ 
+ 
                                                                                                                                                                                  PORTABILITY
                                                                                                                                                                                  +        Applications employing the ncurses mouse extension should condition its
+-       use  on the visibility of the NCURSES_MOUSE_VERSION preprocessor macro.
+-       When the interface changes, the  macro's  value  increments.   Multiple
+-       versions   are  available  when  ncurses  is  configured;  see  section
++       use on the visibility of the NCURSES_MOUSE_VERSION preprocessor  macro.
++       When  the  interface  changes,  the macro's value increments.  Multiple
++       versions  are  available  when  ncurses  is  configured;  see   section
+        "ALTERNATE CONFIGURATIONS" of ncurses(3x).  The following values may be
+        specified.
+ 
+           1  has definitions for reserved events.  The mask uses 28 bits.
+ 
+-          2  adds  definitions  for  button  5,  removes  the  definitions for
++          2  adds definitions  for  button  5,  removes  the  definitions  for
+              reserved events.  The mask uses 29 bits.
+ 
+ 
+ 
                                                                                                                                                                                  HISTORY
                                                                                                                                                                                  +-       SVr4 (1989) added mouse support to its  variant  of  xterm(1).   It  is
++       SVr4  (1989)  added  mouse  support  to its variant of xterm(1).  It is
+        mentioned in a few places, with little supporting documentation.
+ 
+-       o   Its  "libcurses"  manual  page  lists  functions  for  this feature
++       o   Its "libcurses"  manual  page  lists  functions  for  this  feature
+            prototyped in curses.h.
+ 
+                extern int mouse_set(long int);
+@@ -359,46 +358,46 @@
+                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 (getm)
++           For instance, the SVr4 curses library  used  the  get_mouse  (getm)
+            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
++           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
+            (reqmp) capability.
+ 
+-           Those  features  required a terminal program that had been modified
++           Those features required a terminal program that had  been  modified
+            to work with SVr4 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
++       in  PDCurses 2.3 using the SVr4 interface.  PDCurses, however, does not
++       use video terminals,  making  it  unnecessary  to  be  concerned  about
+        compatibility with the escape sequences.
+ 
+ 
+ 
                                                                                                                                                                                  BUGS
                                                                                                                                                                                  +        Mouse events from xterm are not ignored in canonical ("cooked") mode if
+-       they  have  been enabled by mousemask.  Instead, the xterm mouse report
++       they have been enabled by mousemask.  Instead, the xterm  mouse  report
+        sequence appears in the string read.
+ 
+-       An ncurses window must enable keypad(3x)  to  correctly  receive  mouse
+-       event  reports  from  xterm  since they are encoded like function keys.
++       An  ncurses  window  must  enable keypad(3x) to correctly receive mouse
++       event reports from xterm since they are  encoded  like  function  keys.
+        Set the terminal's terminfo capability key_mouse (kmous) to "\E[M" (the
+-       beginning  of  the response from xterm for mouse clicks).  Other values
+-       of key_mouse are permitted under the same  assumption  --  that  is,  a
+-       mouse  report  begins  with  the  value of the key_mouse (kmous) string
++       beginning of the response from xterm for mouse clicks).   Other  values
++       of  key_mouse  are  permitted  under  the same assumption -- that is, a
++       mouse report begins with the value  of  the  key_mouse  (kmous)  string
+        capability.
+ 
+        Because there are no standard response sequences that serve to identify
+-       terminals  supporting the xterm mouse protocol, ncurses assumes that if
+-       key_mouse (kmous) is defined in the terminal  description,  or  if  the
+-       terminal  type's  primary  name  or aliases contain the string "xterm",
++       terminals supporting the xterm mouse protocol, ncurses assumes that  if
++       key_mouse  (kmous)  is  defined  in the terminal description, or if the
++       terminal type's primary name or aliases  contain  the  string  "xterm",
+        then the terminal may send mouse events.  ncurses checks the kmous cap-
+-       code  first,  allowing  use of newer xterm mouse protocols, such as its
++       code first, allowing use of newer xterm mouse protocols,  such  as  its
+        private mode 1006.
+ 
+ 
+@@ -408,7 +407,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-01                    curs_mouse(3x)
++ncurses 6.5                       2025-04-05                    curs_mouse(3x)
+ 
                                                                                                                                                                                  
+ 
                                                                                                                                                                                  
+ 
                                                                                                                                                                                    
+Index: doc/html/man/curs_move.3x.html
+--- ncurses-6.5-20250329+/doc/html/man/curs_move.3x.html	2025-03-09 00:55:54.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/curs_move.3x.html	2025-04-05 22:33:04.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_move.3x,v 1.61 2025/03/08 23:18:46 tom Exp @
++  * @Id: curs_move.3x,v 1.63 2025/04/05 22:08:55 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_move 3x 2025-03-08 ncurses 6.5 Library calls
++curs_move 3x 2025-04-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                    curs_move 3x 2025-03-08 ncurses 6.5 Library calls
                                                                                                                                                                                    
++
                                                                                                                                                                                    curs_move 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                                    
+ 
                                                                                                                                                                                    + curs_move(3x)                    Library calls                   curs_move(3x)
+ 
+@@ -66,11 +66,14 @@
+ 
+ 
+ 
                                                                                                                                                                                    RETURN VALUE
                                                                                                                                                                                    +-       These functions return OK on success and ERR on failure.
++       These  functions  return OK on success and ERR on failure.  In ncurses,
++       these functions fail if
+ 
+-       They fail if the position (y, x) is outside the window boundaries.
++       o   the curses screen has not been initialized,
+ 
+-       In ncurses, wmove fails if win is NULL.
++       o   (for wmove) win is a null pointer, or
++
++       o   the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                                                    NOTES
                                                                                                                                                                                    +@@ -81,7 +84,7 @@
+        X/Open Curses Issue 4 describes these functions.  It specifies no error
+        conditions for them.
+ 
+-       SVr4 describes a successful return value  only  as  "an  integer  value
++       SVr4  describes  a  successful  return  value only as "an integer value
+        other than ERR".
+ 
+ 
+@@ -94,7 +97,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-08                     curs_move(3x)
++ncurses 6.5                       2025-04-05                     curs_move(3x)
+ 
                                                                                                                                                                                    
+ 
                                                                                                                                                                                    
+ 
                                                                                                                                                                                      
+Index: doc/html/man/curs_outopts.3x.html
+--- ncurses-6.5-20250329+/doc/html/man/curs_outopts.3x.html	2025-03-22 22:52:51.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/curs_outopts.3x.html	2025-04-05 22:57:19.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_outopts.3x,v 1.93 2025/03/22 22:46:52 tom Exp @
++  * @Id: curs_outopts.3x,v 1.98 2025/04/05 22:40:21 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_outopts 3x 2025-03-22 ncurses 6.5 Library calls
++curs_outopts 3x 2025-04-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                      curs_outopts 3x 2025-03-22 ncurses 6.5 Library calls
                                                                                                                                                                                      
++
                                                                                                                                                                                      curs_outopts 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                                      
+ 
                                                                                                                                                                                      + curs_outopts(3x)                 Library calls                curs_outopts(3x)
+ 
+@@ -110,36 +110,36 @@
+ 
+ 
+ 
                                                                                                                                                                                      leaveok
                                                                                                                                                                                      +-       Normally, the hardware cursor is left at the  location  of  the  window
+-       cursor  being  refreshed.   The  leaveok 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.
++       Normally, curses leaves the hardware cursor  at  the  library's  cursor
++       location  of the window being refreshed.  The leaveok option allows the
++       cursor to be left wherever the update  happens  to  leave  it.   It  is
++       useful  for  applications that do not employ a visible cursor, since it
++       reduces the need for cursor motions.
+ 
+ 
+ 
                                                                                                                                                                                      scrollok
                                                                                                                                                                                      +-       The scrollok 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, (bf is FALSE), the cursor is
+-       left on the bottom line.  If enabled,  (bf  is  TRUE),  the  window  is
+-       scrolled up one line (Note that to get the physical scrolling effect on
+-       the terminal, it is also necessary to call idlok).
++       The scrollok option controls what happens when a window's cursor  moves
++       off the edge of the window or scrolling region, either as a result of a
++       newline occurring on the bottom line, or writing to the last  character
++       of  the last line.  If disabled (bf is FALSE), curses leaves the cursor
++       on the bottom line of the window.  If  enabled  (bf  is  TRUE),  curses
++       scrolls  the window up one line.  (To get the physical scrolling effect
++       on the terminal, the application must also enable idlok).
+ 
+ 
+ 
                                                                                                                                                                                      setscrreg, wsetscrreg
                                                                                                                                                                                      +-       The setscrreg and wsetscrreg routines allow the application  programmer
+-       to  set  a  software  scrolling  region  in  a window.  The top and bot
+-       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 scrollok 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  idlok  is enabled and the terminal has either a scrolling region or
+-       insert/delete line capability, they will probably be used by the output
+-       routines.)
++       The wsetscrreg and setscrreg functions allow the application to  set  a
++       software   scrolling   region   in  the  specified  window  or  stdscr,
++       respectively.  The top and bot 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 scrollok 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.  (This process has nothing to do with
++       the scrolling region capability of the terminal, as found  in  the  DEC
++       VT100.)   If  idlok  is enabled and the terminal has either a scrolling
++       region or insert/delete line capability, they will probably be used  by
++       the output routines.)
+ 
+ 
+ 
                                                                                                                                                                                      RETURN VALUE
                                                                                                                                                                                      +@@ -147,20 +147,27 @@
+        upon failure.  All other routines that return an integer always  return
+        OK.
+ 
+-       In this implementation,
++       In ncurses, these functions fail if
+ 
+-       o   those  functions  that have a window pointer will return ERR if the
+-           window pointer is null
++       o   the curses screen has not been initialized,
+ 
+-       o   wsetscrreg returns  ERR  if  the  scrolling  region  limits  extend
+-           outside the window boundaries.
++       o   (for  functions  taking  a  WINDOW  pointer argument) win is a null
++           pointer, or
++
++       o   (for setscrreg and wsetscrreg) the  function  is  passed  arguments
++           describing  a  scrolling region with limits that extend outside the
++           window boundaries.
+ 
+ 
+ 
                                                                                                                                                                                      NOTES
                                                                                                                                                                                      +-       clearok,  leaveok, scrollok, idcok, and setscrreg may be implemented as
++       clearok, leaveok, scrollok, idcok, and setscrreg may be implemented  as
+        macros.
+ 
+-       The immedok routine is useful for windows that  are  used  as  terminal
++       Unlike  the  other functions described by this page, setscrreg does not
++       accept a pointer-to-WINDOW parameter,  but  operates  on  stdscr.   Use
++       wsetscrreg to configure the scrolling region of a selected window.
++
++       The  immedok  routine  is  useful for windows that are used as terminal
+        emulators.
+ 
+ 
+@@ -168,18 +175,19 @@
+        X/Open Curses Issue 4 describes these functions.  It specifies no error
+        conditions for them.
+ 
+-       Some historic curses implementations, as an undocumented  feature,  did
+-       the   equivalent   of   "clearok(...,   1)"  when  touchwin(stdstr)  or
++       Some  historic  curses implementations, as an undocumented feature, did
++       the  equivalent  of  "clearok(...,   1)"   when   touchwin(stdstr)   or
+        clear(stdstr) were used.  This trick does not work with ncurses.
+ 
+-       Early System V curses  implementations  specified  that  with  scrollok
+-       enabled,  any  window  modification  triggering  a scroll also forced a
+-       physical refresh.  X/Open Curses does not  require  this,  and  ncurses
++       Early  System V  curses  implementations  specified  that with scrollok
++       enabled, any window modification triggering  a  scroll  also  forced  a
++       physical  refresh.   X/Open  Curses  does not require this, and ncurses
+        avoids doing so to better optimize vertical motions upon a wrefresh.
+ 
+        X/Open Curses does not mention that the cursor should be made invisible
+-       as a side-effect of leaveok.  SVr4 curses documentation notes this, but
+-       the code neglects it.  Use curs_set(3x) to make the cursor invisible.
++       as  a  side-effect  of  leaveok.   SVr4 curses documentation notes this
++       behavior, but the code neglects to implement it.  Use  curs_set(3x)  to
++       make the cursor invisible.
+ 
+ 
+ 
                                                                                                                                                                                      HISTORY
                                                                                                                                                                                      +@@ -199,7 +207,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-22                  curs_outopts(3x)
++ncurses 6.5                       2025-04-05                  curs_outopts(3x)
+ 
                                                                                                                                                                                      
+ 
                                                                                                                                                                                      
+ 
                                                                                                                                                                                        
+Index: doc/html/man/curs_printw.3x.html
+--- ncurses-6.5-20250329+/doc/html/man/curs_printw.3x.html	2025-01-19 00:54:59.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/curs_printw.3x.html	2025-04-05 22:33:04.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_printw.3x,v 1.57 2025/01/19 00:51:10 tom Exp @
++  * @Id: curs_printw.3x,v 1.60 2025/04/05 22:20:25 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_printw 3x 2025-01-18 ncurses 6.5 Library calls
++curs_printw 3x 2025-04-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                        curs_printw 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                        
++
                                                                                                                                                                                        curs_printw 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                                        
+ 
                                                                                                                                                                                        + curs_printw(3x)                  Library calls                 curs_printw(3x)
+ 
+@@ -114,31 +114,34 @@
+ 
+ 
+ 
                                                                                                                                                                                        HISTORY
                                                                                                                                                                                        +-       While printw was implemented in 4BSD (November  1980),  it  was  unused
+-       until  4.2BSD  (August  1983), which employed it for games.  That early
+-       version of curses preceded the ANSI C standard of 1989.  It did not use
+-       varargs.h,  though  that  had been available since Seventh Edition Unix
++       4BSD (1980) introduced wprintw and its variants.  It implemented all as
++       functions, not macros; this initial distribution of curses preceded the
++       ANSI C standard of 1989, prior to which a variadic macro  facility  was
++       not  widely  available.   printw  went unused in Berkeley distributions
++       until 4.1cBSD (1983), which employed it in games.  4BSD's  wprintw  did
++       not  use varargs.h, which had been available since Seventh Edition Unix
+        (1979).  In 1991 (a couple of years after SVr4 was generally available,
+        and  after  the C standard was published), other developers updated the
+        library, using stdarg.h internally in 4.4BSD curses.   Even  with  this
+        improvement,  BSD  curses  did  not  use  function prototypes (nor even
+        declare functions) in curses.h until 1992.
+ 
+-       SVr2 (1984) documented printw and wprintw tersely as "printf on stdscr"
+-       and "printf on win", respectively.
++       4BSD documented printw and wprintw tersely as "printf  on  stdscr"  and
++       "printf on win", respectively.
+ 
+-       SVr3  (1987)  added  mvprintw  and mvwprintw, with a three-line summary
+-       asserting that they were analogous to printf(3),  explaining  that  the
+-       string  that  printf(3) would write to the standard output stream would
+-       instead be output  using  waddstr  to  the  given  window.   SVr3  also
+-       implemented  vwprintw,  describing  its  third  parameter as a va_list,
+-       defined in varargs.h, and referred the reader to the manual  pages  for
++       SVr3  summarized the functions in three lines, asserting that they were
++       analogous to printf(3), explaining that the string that printf(3) would
++       write  to  the  standard  output  stream  would instead be output using
++       waddstr to the given window.
++
++       SVr3 added vwprintw, describing  its  third  parameter  as  a  va_list,
++       defined  in  varargs.h, and referred the reader to the manual pages for
+        varargs and vprintf for detailed descriptions.
+ 
+-       SVr4  (1989)  introduced  no new variations of printw, but provided for
++       SVr4 (1989) introduced no new variations of printw,  but  provided  for
+        using either varargs.h or stdarg.h to define the va_list type.
+ 
+-       X/Open Curses Issue 4 (1995), defined vw_printw  to  replace  vwprintw,
++       X/Open  Curses  Issue 4  (1995), defined vw_printw to replace vwprintw,
+        stating that its va_list type is defined in stdarg.h.
+ 
+ 
+@@ -147,7 +150,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                   curs_printw(3x)
++ncurses 6.5                       2025-04-05                   curs_printw(3x)
+ 
                                                                                                                                                                                        
+ 
                                                                                                                                                                                        
+ 
                                                                                                                                                                                          
+Index: doc/html/man/curs_scanw.3x.html
+--- ncurses-6.5-20250329+/doc/html/man/curs_scanw.3x.html	2025-01-19 00:54:59.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/curs_scanw.3x.html	2025-04-05 22:33:04.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_scanw.3x,v 1.57 2025/01/19 00:51:10 tom Exp @
++  * @Id: curs_scanw.3x,v 1.60 2025/04/05 22:20:10 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_scanw 3x 2025-01-18 ncurses 6.5 Library calls
++curs_scanw 3x 2025-04-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                          curs_scanw 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                          
++
                                                                                                                                                                                          curs_scanw 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                                          
+ 
                                                                                                                                                                                          + curs_scanw(3x)                   Library calls                  curs_scanw(3x)
+ 
+@@ -141,36 +141,35 @@
+ 
+ 
+ 
                                                                                                                                                                                          HISTORY
                                                                                                                                                                                          +-       scanw  was  implemented  in 4BSD (November 1980); that early version of
+-       curses preceded the ANSI C standard of 1989.  The function  was  unused
+-       in  Berkeley  distributions  for  over  ten  years, until 4.4BSD, which
+-       employed it in a game.  The 4BSD scanw did not  use  varargs.h,  though
+-       that  had been available since Seventh Edition Unix (1979).  In 1991 (a
+-       couple of years after SVr4 was generally available,  and  after  the  C
+-       standard  was  published),  other developers updated the library, using
+-       stdarg.h internally in 4.4BSD curses.  Even with this improvement,  BSD
+-       curses  did not use function prototypes (nor even declare functions) in
+-       curses.h until 1992.
+-
+-       SVr2 (1984) documented scanw  and  wscanw  tersely  as  "scanf  through
+-       stdscr" and "scanf through win", respectively.
+-
+-       SVr3 (1987) added mvscanw, and mvwscanw, stating
+-
+-              "[t]hese routines correspond to scanf(3S), as do their arguments
+-              and return values.  wgetstr() is called on the window,  and  the
+-              resulting line is used as input for the scan."
+-
+-       SVr3  also  implemented  vwscanw,  describing  its third parameter as a
+-       va_list, defined in varargs.h, and referred the reader  to  the  manual
+-       pages  for varargs and vprintf for detailed descriptions.  (Because the
+-       SVr3 documentation does not mention vscanf, the  reference  to  vprintf
+-       might not be an error).
++       4BSD  (1980) introduced wscanw and its variants.  It implemented all as
++       functions, not macros; this initial distribution of curses preceded the
++       ANSI  C  standard of 1989, prior to which a variadic macro facility was
++       not widely available.  scanw  went  unused  in  Berkeley  distributions
++       until  4.3BSD-Reno  (1990), which employed it in a game.  4BSD's wscanw
++       did not use varargs.h, which had been available since  Seventh  Edition
++       Unix  (1979).   In  1991  (a  couple  of years after SVr4 was generally
++       available, and after the C standard was  published),  other  developers
++       updated  the library, using stdarg.h internally in 4.4BSD curses.  Even
++       with this improvement, BSD curses did not use function prototypes  (nor
++       even declare functions) in curses.h until 1992.
++
++       4BSD  documented scanw and wscanw tersely as "scanf through stdscr" and
++       "scanf through win", respectively.  SVr3 (1987) stated
++
++              [t]hese routines correspond to scanf(3S), as do their  arguments
++              and  return  values.  wgetstr() is called on the window, and the
++              resulting line is used as input for the scan.
++
++       SVr3 added vwscanw,  describing  its  third  parameter  as  a  va_list,
++       defined  in  varargs.h, and referred the reader to the manual pages for
++       varargs  and  vprintf  for  detailed   descriptions.    (Because   SVr3
++       documentation  does  not mention vscanf, the reference to vprintf might
++       not be an error).
+ 
+-       SVr4  (1989)  introduced  no  new variations of scanw, but provided for
++       SVr4 (1989) introduced no new variations of  scanw,  but  provided  for
+        using either varargs.h or stdarg.h to define the va_list type.
+ 
+-       X/Open Curses Issue 4 (1995),  defined  vw_scanw  to  replace  vwscanw,
++       X/Open  Curses  Issue 4  (1995),  defined  vw_scanw to replace vwscanw,
+        stating that its va_list type is defined in stdarg.h.
+ 
+ 
+@@ -179,7 +178,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                    curs_scanw(3x)
++ncurses 6.5                       2025-04-05                    curs_scanw(3x)
+ 
                                                                                                                                                                                          
+ 
                                                                                                                                                                                          
+ 
                                                                                                                                                                                            
+Index: doc/html/man/curs_scroll.3x.html
+--- ncurses-6.5-20250329+/doc/html/man/curs_scroll.3x.html	2025-02-02 00:43:58.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/curs_scroll.3x.html	2025-04-05 22:33:04.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_scroll.3x,v 1.57 2025/02/02 00:02:49 tom Exp @
++  * @Id: curs_scroll.3x,v 1.59 2025/04/05 22:20:39 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_scroll 3x 2025-02-01 ncurses 6.5 Library calls
++curs_scroll 3x 2025-04-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                            curs_scroll 3x 2025-02-01 ncurses 6.5 Library calls
                                                                                                                                                                                            
++
                                                                                                                                                                                            curs_scroll 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                                            
+ 
                                                                                                                                                                                            + curs_scroll(3x)                  Library calls                 curs_scroll(3x)
+ 
+@@ -86,7 +86,8 @@
+ 
+        o   the curses screen has not been initialized,
+ 
+-       o   win is a null pointer, or
++       o   (for  functions  taking  a  WINDOW  pointer argument) win is a null
++           pointer, or
+ 
+        o   scrolling is not enabled in the window (as by scrollok(3x)).
+ 
+@@ -94,7 +95,7 @@
+ 
                                                                                                                                                                                            NOTES
                                                                                                                                                                                            +        scroll and scrl may be implemented as macros.
+ 
+-       Unusually,  there  is  no wscroll function; scroll behaves as one would
++       Unusually, there is no wscroll function; scroll behaves  as  one  would
+        expect wscroll to, accepting a WINDOW pointer argument.
+ 
+ 
+@@ -102,16 +103,16 @@
+        X/Open Curses Issue 4 describes these functions.  It specifies no error
+        conditions for them.
+ 
+-       SVr4  describes  a  successful  return  value only as "an integer value
++       SVr4 describes a successful return value  only  as  "an  integer  value
+        other than ERR".
+ 
+-       SVr4  indicates  that  the   optimization   of   physically   scrolling
+-       immediately  if  the scroll region is the entire screen "is" performed,
+-       not "may be" performed.  ncurses deliberately does not  guarantee  that
+-       this  occurs,  to  leave open the possibility of better optimization of
++       SVr4   indicates   that   the   optimization  of  physically  scrolling
++       immediately if the scroll region is the entire screen  "is"  performed,
++       not  "may  be" performed.  ncurses deliberately does not guarantee that
++       this occurs, to leave open the possibility of  better  optimization  of
+        multiple scroll actions on the next update.
+ 
+-       Neither SVr4 curses nor X/Open Curses specify whether  these  functions
++       Neither  SVr4  curses nor X/Open Curses specify whether these functions
+        zero  the  attributes  or  color  pair  identifier  of  the  background
+        character.  In ncurses, they do not.
+ 
+@@ -119,7 +120,7 @@
+ 
                                                                                                                                                                                            HISTORY
                                                                                                                                                                                            +        4BSD (1980) introduced scroll, defining it as a function.
+ 
+-       SVr3.1 (1987) added scrl  and  wscrl,  redefining  scroll  as  a  macro
++       SVr3.1  (1987)  added  scrl  and  wscrl,  redefining  scroll as a macro
+        wrapping the latter.
+ 
+ 
+@@ -128,7 +129,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-01                   curs_scroll(3x)
++ncurses 6.5                       2025-04-05                   curs_scroll(3x)
+ 
                                                                                                                                                                                            
+ 
                                                                                                                                                                                            
+ 
                                                                                                                                                                                              
+Index: doc/html/man/curs_terminfo.3x.html
+--- ncurses-6.5-20250329+/doc/html/man/curs_terminfo.3x.html	2025-02-15 15:46:52.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/curs_terminfo.3x.html	2025-04-05 22:33:04.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_terminfo.3x,v 1.162 2025/02/15 15:24:18 tom Exp @
++  * @Id: curs_terminfo.3x,v 1.164 2025/04/05 22:21:02 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_terminfo 3x 2025-02-15 ncurses 6.5 Library calls
++curs_terminfo 3x 2025-04-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                              curs_terminfo 3x 2025-02-15 ncurses 6.5 Library calls
                                                                                                                                                                                              
++
                                                                                                                                                                                              curs_terminfo 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                                              
+ 
                                                                                                                                                                                              + curs_terminfo(3x)                Library calls               curs_terminfo(3x)
+ 
+@@ -214,10 +214,10 @@
+        numeric, and string capabilities use the values from nterm.  It returns
+        the old value of cur_term.
+ 
+-       del_curterm  frees  the memory pointed to by oterm, making it available
+-       for further use.  If oterm is the same as cur_term, references  to  any
+-       of  the  terminfo  Boolean, numeric, and string capabilities thereafter
+-       may refer to invalid memory locations until setupterm is called again.
++       del_curterm  releases  the memory pointed to by oterm.  If oterm is the
++       same as cur_term, references to any of the terminfo  Boolean,  numeric,
++       and   string  capabilities  thereafter  may  refer  to  invalid  memory
++       locations until setupterm is called again.
+ 
+        restartterm is similar to setupterm, but  is  intended  for  use  after
+        restoring  program  memory  to  a  previous  state  (for  example, when
+@@ -230,62 +230,61 @@
+ 
+ 
+ 
                                                                                                                                                                                              Formatting Output
                                                                                                                                                                                              +-       tparm  instantiates  the  string  str with parameters pi.  A pointer is
+-       returned to the result of str with the parameters applied.  Application
+-       developers should keep in mind these quirks of the interface:
++       tparm  instantiates  the  string  str with parameters pi.  It returns a
++       pointer to a character string  representing  str  with  the  parameters
++       applied  to "%" expressions within.  Application developers should keep
++       in mind some quirks of the interface.
+ 
+-       o   Although  tparm's actual parameters may be integers or strings, the
++       o   Although tparm's actual parameters may be integers or strings,  the
+            prototype expects long (integer) values.
+ 
+-       o   Aside from  the  set_attributes  (sgr)  capability,  most  terminal
++       o   Aside  from  the  set_attributes  (sgr)  capability,  most terminal
+            capabilities require no more than one or two parameters.
+ 
+-       o   Padding  information  is  ignored  by  tparm;  it is interpreted by
++       o   Padding information is ignored  by  tparm;  it  is  interpreted  by
+            tputs.
+ 
+-       o   The capability string is  null-terminated.   Use  "\200"  where  an
++       o   The  capability  string  is  null-terminated.   Use "\200" where an
+            ASCII NUL is needed in the output.
+ 
+-       tiparm  is  a  newer  form  of  tparm which uses stdarg.h rather than a
+-       fixed-parameter list.  Its numeric  parameters  are  ints  rather  than
++       tiparm is a newer form of tparm that uses stdarg.h rather than a fixed-
++       length  parameter  list.   Its  numeric parameters are ints rather than
+        longs.
+ 
+-       Both  tparm  and  tiparm  assume that the application passes parameters
+-       consistent with the terminal description.  Two extensions are  provided
+-       as alternatives to deal with untrusted data.
+-
+-       o   tiparm_s  is an extension which is a safer formatting function than
+-           tparm or tiparm, because it allows the developer to tell the curses
+-           library  how  many  parameters to expect in the parameter list, and
+-           which may be string parameters.
++       tparm  and  tiparm  assume  that  the  application  passes   parameters
++       consistent   with  the  terminal  description.   ncurses  provides  two
++       extensions as alternatives to deal with untrusted data.
++
++       o   The tiparm_s extension is a safer formatting function than tparm or
++           tiparm,  because it allows the developer to tell the curses library
++           how many parameters to expect in the parameter list, and which  may
++           be string parameters.
+ 
+-           The mask parameter has one bit set for each of the  parameters  (up
++           The  mask  parameter has one bit set for each of the parameters (up
+            to 9) passed as char pointers rather than numbers.
+ 
+-       o   The   extension  tiscan_s  allows  the  application  to  inspect  a
++       o   The  extension  tiscan_s  allows  the  application  to  inspect   a
+            formatting capability to see what the curses library would assume.
+ 
+ 
+ 
                                                                                                                                                                                              Output Functions
                                                                                                                                                                                              +-       String capabilities can contain padding, a  time  delay  (accommodating
++       String  capabilities  can  contain padding, a time delay (accommodating
+        performance limitations of hardware terminals) expressed as $<n>, where
+        n is a nonnegative integral count of milliseconds.  If n exceeds 30,000
+-       (thirty seconds), it is capped at that value.
++       (thirty seconds), ncurses caps it at that value.
+ 
+-       tputs  interprets  time-delay information in the string str and outputs
+-       it, executing the delays:
++       tputs interprets time delays in the string str and acts upon them.
+ 
+-       o   The str parameter must be a terminfo string variable or the  return
+-           value of tparm or tiparm.
++       o   The str parameter must be  a  terminfo  string  capability  or  the
++           return value of tparm or tiparm.
+ 
+        o   affcnt is the number of lines affected, or 1 if not applicable.
+ 
+        o   putc is a putchar-like function to which the characters are passed,
+            one at a time.
+ 
+-           If tputs processes  a  time-delay,  it  uses  the  delay_output(3x)
+-           function,  routing  any  resulting  padding characters through this
+-           function.
++       tputs processes each time delay  with  the  delay_output(3x)  function,
++       routing any resulting padding characters through this function.
+ 
+        putp calls "tputs(str, 1, putchar)".  The output of putp always goes to
+        stdout, rather than the filedes specified in setupterm.
+@@ -296,30 +295,30 @@
+ 
+        vidattr is like vidputs, except that it outputs through putchar(3).
+ 
+-       vid_attr  and vid_puts correspond to vidattr and vidputs, respectively.
+-       They use multiple parameters to represent the character attributes  and
++       vid_attr and vid_puts correspond to vidattr and vidputs,  respectively.
++       They  use multiple parameters to represent the character attributes and
+        color; namely,
+ 
+        o   attrs, of type attr_t, for the attributes and
+ 
+        o   pair, of type short, for the color pair number.
+ 
+-       Use  the  attribute  constants  prefixed  with  "WA_" with vid_attr and
++       Use the attribute constants  prefixed  with  "WA_"  with  vid_attr  and
+        vid_puts.
+ 
+-       X/Open Curses reserves the opts argument for future  use,  saying  that
+-       applications  must  provide  a  null pointer for that argument; but see
++       X/Open  Curses  reserves  the opts argument for future use, saying that
++       applications must provide a null pointer for  that  argument;  but  see
+        section "EXTENSIONS" below.
+ 
+-       While putp is a lower-level function that  does  not  use  higher-level
+-       curses  state,  ncurses declares it in curses.h because System V did so
++       While  putp  is  a  lower-level function that does not use higher-level
++       curses state, ncurses declares it in curses.h because System V  did  so
+        (see section "HISTORY" below).
+ 
+ 
+ 
                                                                                                                                                                                              Terminal Capability Functions
                                                                                                                                                                                              +-       tigetflag, tigetnum, and tigetstr return the value  of  the  capability
+-       corresponding  to  the terminfo cap-code, such as xenl, passed to them.
+-       The cap-code for each capability is given in the table column  of  that
++       tigetflag,  tigetnum,  and  tigetstr return the value of the capability
++       corresponding to the terminfo cap-code, such as xenl, passed  to  them.
++       The  cap-code  for each capability is given in the table column of that
+        name in the "Predefined Capabilities" section of terminfo(5).
+ 
+        These functions return special values to denote errors.
+@@ -362,29 +361,29 @@
+ 
+ 
                                                                                                                                                                                              Releasing Memory
                                                                                                                                                                                              +        Each successful call to setupterm allocates memory to hold the terminal
+-       description.  As a side effect, it  sets  cur_term  to  point  to  this
++       description.   As  a  side  effect,  it  sets cur_term to point to this
+        memory.  If an application calls
+               del_curterm(cur_term);
+        the memory will be freed.
+ 
+-       The  formatting functions tparm and tiparm extend the storage allocated
++       The formatting functions tparm and tiparm extend the storage  allocated
+        by setupterm as follows.
+ 
+-       o   They add the "static" terminfo  variables  [a-z].   Before  ncurses
++       o   They  add  the  "static"  terminfo variables [a-z].  Before ncurses
+            6.3, those were shared by all screens.  With ncurses 6.3, those are
+            allocated per screen.  See terminfo(5).
+ 
+-       o   To improve performance, ncurses 6.3 caches the result of  analyzing
+-           terminfo  strings  for  their parameter types.  That is stored as a
++       o   To  improve performance, ncurses 6.3 caches the result of analyzing
++           terminfo strings for their parameter types.  That is  stored  as  a
+            binary tree referenced from the TERMINAL structure.
+ 
+        The higher-level initscr and newterm functions use setupterm.  Normally
+-       they  do  not free this memory, but it is possible to do that using the
++       they do not free this memory, but it is possible to do that  using  the
+        delscreen(3x) function.
+ 
+ 
+ 
                                                                                                                                                                                              RETURN VALUE
                                                                                                                                                                                              +-       Functions that return integers return ERR  upon  failure  and  OK  upon
++       Functions  that  return  integers  return  ERR upon failure and OK upon
+        success.
+ 
+        In ncurses,
+@@ -398,40 +397,40 @@
+             fails if the associated call to setupterm returns ERR.
+ 
+        setupterm
+-            fails  if  it cannot allocate enough memory, or create the initial
+-            windows (stdscr, curscr, and newscr).  Other error conditions  are
++            fails if it cannot allocate enough memory, or create  the  initial
++            windows  (stdscr, curscr, and newscr).  Other error conditions are
+             documented above.
+ 
+        tparm
+-            returns  a null pointer if the capability would require unexpected
+-            parameters; that  is,  too  many,  too  few,  or  incorrect  types
++            returns a null pointer if the capability would require  unexpected
++            parameters;  that  is,  too  many,  too  few,  or  incorrect types
+             (strings where integers are expected, or vice versa).
+ 
+        tputs
+-            fails  if  the  string  parameter is null.  It does not detect I/O
+-            errors: X/Open Curses states that tputs ignores the  return  value
++            fails if the string parameter is null.  It  does  not  detect  I/O
++            errors:  X/Open  Curses states that tputs ignores the return value
+             of the output function putc.
+ 
+ 
+ 
                                                                                                                                                                                              NOTES
                                                                                                                                                                                              +-       The  vid_attr function in ncurses is a special case.  It was originally
++       The vid_attr function in ncurses is a special case.  It was  originally
+        implemented based on a draft of X/Open Curses, as a macro, before other
+-       parts  of the ncurses wide-character API were developed, and unlike the
+-       other wide-character functions,  is  also  provided  in  the  non-wide-
++       parts of the ncurses wide-character API were developed, and unlike  the
++       other  wide-character  functions,  is  also  provided  in the non-wide-
+        character configuration.
+ 
+ 
+ 
                                                                                                                                                                                              EXTENSIONS
                                                                                                                                                                                              +-       The  functions  marked as extensions originated in ncurses, and are not
+-       found in SVr4 curses, 4.4BSD  curses,  or  any  other  previous  curses
++       The functions marked as extensions originated in ncurses, and  are  not
++       found  in  SVr4  curses,  4.4BSD  curses,  or any other previous curses
+        implementation.
+ 
+-       ncurses  allows  opts  to be a pointer to int, which overrides the pair
++       ncurses allows opts to be a pointer to int, which  overrides  the  pair
+        (short) argument.
+ 
+ 
+ 
                                                                                                                                                                                              PORTABILITY
                                                                                                                                                                                              +-       Except for setterm, X/Open Curses Issue 4  describes  these  functions.
++       Except  for  setterm,  X/Open Curses Issue 4 describes these functions.
+        It specifies no error conditions for them.
+ 
+        SVr4 describes a successful return value except where "otherwise noted"
+@@ -439,8 +438,8 @@
+ 
+ 
+ 
                                                                                                                                                                                              Header Files
                                                                                                                                                                                              +-       On legacy curses systems, include curses.h and term.h in that order  to
+-       make   visible  the  definitions  of  the  string  arrays  storing  the
++       On  legacy curses systems, include curses.h and term.h in that order to
++       make  visible  the  definitions  of  the  string  arrays  storing   the
+        capability names and codes.
+ 
+ 
+@@ -449,12 +448,11 @@
+        (see section "HISTORY" below).  They include crmode, fixterm, gettmode,
+        nocrmode, resetterm, saveterm, and setterm.
+ 
+-       In SVr4, these are found in  curses.h,  but  except  for  setterm,  are
++       In  SVr4,  these  are  found  in  curses.h, but except for setterm, are
+        likewise macros.  The one function, setterm, is mentioned in the manual
+        page.  It further notes that setterm was replaced by setupterm, stating
+        that the call
+               setupterm(term, 1, (int *)0)
+-
+        provides the same functionality as
+               setterm(term)
+        and discouraging the latter for new programs.
+@@ -465,115 +463,115 @@
+        is not specified by X/Open Curses, but is assumed by some applications.
+ 
+        Other implementations may not declare the capability name arrays.  Some
+-       provide  them  without  declaring them.  X/Open Curses does not specify
++       provide them without declaring them.  X/Open Curses  does  not  specify
+        them.
+ 
+-       Extended terminal capability names, as defined by  "tic  -x",  are  not
++       Extended  terminal  capability  names,  as defined by "tic -x", are not
+        stored in the arrays described here.
+ 
+ 
+ 
                                                                                                                                                                                              Output Buffering
                                                                                                                                                                                              +-       Older  versions  of  ncurses assumed that the file descriptor passed to
+-       setupterm from initscr or newterm used buffered I/O, and wrote  to  the
+-       corresponding  stdio  stream.   In  addition to the limitation that the
+-       terminal was  left  in  block-buffered  mode  on  exit  (like  System V
+-       curses),  it  was  problematic because ncurses did not allow a reliable
++       Older versions of ncurses assumed that the file  descriptor  passed  to
++       setupterm  from  initscr or newterm used buffered I/O, and wrote to the
++       corresponding stdio stream.  In addition to  the  limitation  that  the
++       terminal  was  left  in  block-buffered  mode  on  exit  (like System V
++       curses), it was problematic because ncurses did not  allow  a  reliable
+        way to clean up on receiving SIGTSTP.
+ 
+-       ncurses 6.x uses output  buffers  managed  directly  by  ncurses.   The
+-       lower-level  functions described here that write to the terminal device
+-       do so via the standard output stream; they thus  are  not  signal-safe.
+-       The  higher-level  functions  in  ncurses  employ alternate versions of
++       ncurses  6.x  uses  output  buffers  managed  directly by ncurses.  The
++       lower-level functions described here that write to the terminal  device
++       do  so  via  the standard output stream; they thus are not signal-safe.
++       The higher-level functions in  ncurses  employ  alternate  versions  of
+        these functions using a more reliable buffering scheme.
+ 
+ 
+ 
                                                                                                                                                                                              Function Prototypes
                                                                                                                                                                                              +-       The X/Open Curses prototypes  are  based  on  the  SVr4  curses  header
+-       declarations,  which  were  defined at the same time the C language was
++       The  X/Open  Curses  prototypes  are  based  on  the SVr4 curses header
++       declarations, which were defined at the same time the  C  language  was
+        first standardized in the late 1980s.
+ 
+-       o   X/Open Curses uses const  less  effectively  than  a  later  design
+-           might,  sometimes applying it needlessly to values that are already
+-           constant, and in most cases overlooking  parameters  that  normally
+-           would  benefit  from  const.  Passing const-qualified parameters to
+-           functions that do not declare them const may  prevent  the  program
+-           from  compiling.   On  the  other  hand,  "writable strings" are an
+-           obsolescent C language feature.
++       o   X/Open  Curses  uses  const  less  effectively  than a later design
++           might, sometimes applying it needlessly to function parameters that
++           are  passed  by  value  (and  therefore  copied), and in most cases
++           overlooking parameters that  normally  would  benefit  from  const.
++           Passing const-qualified parameters to functions that do not declare
++           them const may prevent the program from compiling.   On  the  other
++           hand, "writable strings" are an obsolescent C language feature.
+ 
+-           As an extension, ncurses can be configured to change  the  function
+-           prototypes  to  use  the  const keyword.  The ncurses ABI 6 enables
++           As  an  extension, ncurses can be configured to change the function
++           prototypes to use the const keyword.  The  ncurses  ABI  6  enables
+            this feature by default.
+ 
+-       o   X/Open Curses prototypes tparm with a fixed number  of  parameters,
++       o   X/Open  Curses  prototypes tparm with a fixed number of parameters,
+            rather than a variable argument list.
+ 
+            ncurses uses a variable argument list, but can be configured to use
+-           the fixed-parameter list.   Portable  applications  should  provide
++           the  fixed-parameter  list.   Portable  applications should provide
+            nine parameters after the format; zeroes are fine for this purpose.
+ 
+-           In  response  to review comments by Thomas E. Dickey, X/Open Curses
++           In response to review comments by Thomas E. Dickey,  X/Open  Curses
+            Issue 7 proposed the tiparm function in mid-2009.
+ 
+-           While tiparm is always provided  in  ncurses,  the  older  form  is
+-           available  only  as  a  build-time  configuration  option.   If not
++           While  tiparm  is  always  provided  in  ncurses, the older form is
++           available only  as  a  build-time  configuration  option.   If  not
+            specially configured, tparm is the same as tiparm.
+ 
+        Both forms of tparm have drawbacks.
+ 
+-       o   Most calls to tparm require only one or  two  parameters.   Passing
++       o   Most  calls  to  tparm require only one or two parameters.  Passing
+            nine on each call is awkward.
+ 
+-           Using  long  for the numeric parameter type is a workaround to make
+-           the parameter use the same amount of stack  memory  as  a  pointer.
+-           That  approach  dates  to the mid-1980s, before C was standardized.
+-           Since ANSI C (1989), C language standards do not require a  pointer
++           Using long for the numeric parameter type is a workaround  to  make
++           the  parameter  use  the  same amount of stack memory as a pointer.
++           That approach dates to the mid-1980s, before  C  was  standardized.
++           Since  ANSI C (1989), C language standards do not require a pointer
+            to fit in a long).
+ 
+-       o   Providing  the  right  number of parameters for a variadic function
++       o   Providing the right number of parameters for  a  variadic  function
+            such  as  tiparm  can  be  a  problem,  in  particular  for  string
+-           parameters.   However,  only a few terminfo capabilities use string
+-           parameters (for instance, the ones used for  programmable  function
++           parameters.  However, only a few terminfo capabilities  use  string
++           parameters  (for  instance, the ones used for programmable function
+            keys).
+ 
+            The ncurses library checks usage of these capabilities, and returns
+-           ERR if the capability mishandles string parameters.  But it  cannot
++           ERR  if the capability mishandles string parameters.  But it cannot
+            check if a calling program provides strings in the right places for
+            the tparm calls.
+ 
+-           ncurses's tput(1) checks its  use  of  these  capabilities  with  a
++           ncurses's  tput(1)  checks  its  use  of  these capabilities with a
+            table, so that it calls tparm correctly.
+ 
+    Special TERM treatment
+-       If  ncurses is configured to use the terminal driver, as with the MinGW
+-       port,
++       If ncurses is configured to use a terminal driver that does not  employ
++       the POSIX termios API, as with the MinGW port,
+ 
+-       o   setupterm interprets a missing/empty TERM variable as  the  special
+-           value "unknown".
++       o   setupterm  interprets  a  missing  or  empty  TERM  variable as the
++           special value "unknown".
+ 
+            SVr4 curses uses the special value "dumb".
+ 
+-           The  difference  between  the  two  is  that  the  former  uses the
+-           generic_type (gn) terminfo capability, while the latter  does  not.
++           The difference  between  the  two  is  that  the  former  uses  the
++           generic_type  (gn)  terminfo capability, while the latter does not.
+            A generic terminal is unsuitable for full-screen applications.
+ 
+-       o   setupterm  allows  explicit  use  of  the Microsoft Windows console
+-           driver by checking whether the TERM environment  variable  has  the
++       o   setupterm allows explicit use  of  the  Microsoft  Windows  console
++           driver  by  checking  whether the TERM environment variable has the
+            value "#win32con" or an abbreviation of that string.
+ 
+ 
+ 
                                                                                                                                                                                              Other Portability Issues
                                                                                                                                                                                              +-       In  SVr4,  set_curterm  returns  an  int, OK or ERR.  We have chosen to
++       In SVr4, set_curterm returns an int, OK or  ERR.   We  have  chosen  to
+        implement the X/Open Curses semantics.
+ 
+        In SVr4, the third argument of tputs has the type "int (*)(char)".
+ 
+-       At least one implementation of X/Open Curses (Solaris xcurses)  returns
++       At  least one implementation of X/Open Curses (Solaris xcurses) returns
+        a value other than OK or ERR from tputs.  It instead returns the length
+        of the string, and does no error checking.
+ 
+ 
+ 
                                                                                                                                                                                              HISTORY
                                                                                                                                                                                              +-       SVr2 (1984) introduced the terminfo feature.   Its  programming  manual
++       SVr2  (1984)  introduced  the terminfo feature.  Its programming manual
+        mentioned the following low-level functions.
+ 
+        Function    Description
+@@ -593,7 +591,7 @@
+        vidattr     like vidputs, but output through putchar
+        vidputs     write string to terminal, applying specified attributes
+ 
+-       The  programming  manual  also mentioned functions provided for termcap
++       The programming manual also mentioned functions  provided  for  termcap
+        compatibility (commenting that they "may go away at a later date").
+ 
+        Function   Description
+@@ -605,11 +603,11 @@
+        tgoto      apply parameters to given capability
+        tputs      write characters via a function parameter, applying padding
+ 
+-       Early terminfo programs obtained capability values  from  the  TERMINAL
++       Early  terminfo  programs  obtained capability values from the TERMINAL
+        structure initialized by setupterm.
+ 
+-       SVr3   (1987)   extended  terminfo  by  adding  functions  to  retrieve
+-       capability values (like the termcap interface), and reusing  tgoto  and
++       SVr3  (1987)  extended  terminfo  by  adding  functions   to   retrieve
++       capability  values  (like the termcap interface), and reusing tgoto and
+        tputs.
+ 
+        Function    Description
+@@ -618,7 +616,7 @@
+        tigetnum    get numeric entry for given id
+        tigetstr    get string entry for given id
+ 
+-       SVr3  also  replaced several of the SVr2 terminfo functions that had no
++       SVr3 also replaced several of the SVr2 terminfo functions that  had  no
+        counterpart in the termcap interface, documenting them as obsolete.
+ 
+        Function    Replaced by
+@@ -631,37 +629,37 @@
+        saveterm    def_prog_mode
+        setterm     setupterm
+ 
+-       SVr3 kept the mvcur, vidattr, and vidputs functions, along  with  putp,
+-       tparm,  and  tputs.   The latter were needed to support padding, and to
+-       handle capabilities accessed by functions such as vidattr  (which  used
++       SVr3  kept  the mvcur, vidattr, and vidputs functions, along with putp,
++       tparm, and tputs.  The latter were needed to support  padding,  and  to
++       handle  capabilities  accessed by functions such as vidattr (which used
+        more than the two parameters supported by tgoto).
+ 
+-       SVr3   introduced   the   functions   for  switching  between  terminal
+-       descriptions;  for  example,  set_curterm.   Some   changes   reflected
++       SVr3  introduced  the  functions   for   switching   between   terminal
++       descriptions;   for   example,  set_curterm.   Some  changes  reflected
+        incremental improvements to the SVr2 library.
+ 
+-       o   The  TERMINAL  type  definition  was introduced in SVr3.01, for the
++       o   The TERMINAL type definition was introduced  in  SVr3.01,  for  the
+            term structure provided in SVr2.
+ 
+-       o   Various global variables such as boolnames were  mentioned  in  the
+-           programming  manual  at  this  point, though the variables had been
++       o   Various  global  variables  such as boolnames were mentioned in the
++           programming manual at this point, though  the  variables  had  been
+            provided in SVr2.
+ 
+        SVr4 (1989) added the vid_attr and vid_puts functions.
+ 
+-       Other low-level functions are declared in the curses  header  files  of
+-       Unix  systems,  but  none are documented.  Those noted as "obsolete" by
++       Other  low-level  functions  are declared in the curses header files of
++       Unix systems, but none are documented.  Those noted  as  "obsolete"  by
+        SVr3 remained in use by System V's vi(1) editor.
+ 
+ 
+ 
                                                                                                                                                                                              SEE ALSO
                                                                                                                                                                                              +        curses(3x),   curs_initscr(3x),   curs_kernel(3x),   curs_memleaks(3x),
+-       curs_termcap(3x),   curs_variables(3x),   putc(3),  term_variables(3x),
++       curs_termcap(3x),  curs_variables(3x),   putc(3),   term_variables(3x),
+        terminfo(5)
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-15                 curs_terminfo(3x)
++ncurses 6.5                       2025-04-05                 curs_terminfo(3x)
+ 
                                                                                                                                                                                              
+ 
                                                                                                                                                                                              
+ 
                                                                                                                                                                                                
+Index: doc/html/man/curs_util.3x.html
+--- ncurses-6.5-20250329+/doc/html/man/curs_util.3x.html	2025-02-15 20:06:27.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/curs_util.3x.html	2025-04-05 22:33:05.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_util.3x,v 1.139 2025/02/15 18:38:01 tom Exp @
++  * @Id: curs_util.3x,v 1.141 2025/04/05 22:22:48 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_util 3x 2025-02-15 ncurses 6.5 Library calls
++curs_util 3x 2025-04-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                curs_util 3x 2025-02-15 ncurses 6.5 Library calls
                                                                                                                                                                                                
++
                                                                                                                                                                                                curs_util 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                                                
+ 
                                                                                                                                                                                                + curs_util(3x)                    Library calls                   curs_util(3x)
+ 
+@@ -292,9 +292,9 @@
+        The  limitation  to  30  seconds and the use of napms differ from other
+        implementations.
+ 
+-       o   SVr4 curses does not delay if no padding character is available.
++       o   SVr4 curses does not delay if no padding character is available.
+ 
+-       o   NetBSD curses uses napms when no padding  character  is  available,
++       o   NetBSD curses uses napms when no padding  character  is  available,
+            but  does  not  take  timing  into  account  when using the padding
+            character.
+ 
+@@ -331,20 +331,20 @@
+            source, the functions (along with scr_init, etc.)  originated  with
+            the University of California, Berkeley (in 1982) and were later (in
+            1988) incorporated into SVr4.  Oddly, there are no  such  functions
+-           in the 4.3BSD curses sources.
++           in the 4.3BSD curses sources.
+ 
+        o   Most implementations simply dump the binary WINDOW structure to the
+            file.  These include SVr4 curses, NetBSD curses, and  PDCurses,  as
+            well  as  older  ncurses versions.  This implementation (as well as
+-           the X/Open variant of Solaris  curses,  dated  1995)  uses  textual
+-           dumps.
++           xcurses, the X/Open variant of Solaris  curses,  dated  1995)  uses
++           textual dumps.
+ 
+-           The  implementations  that use binary dumps use block-I/O (write(2)
+-           and read(2) functions).  Those that use textual dumps use buffered-
++           The  implementations  that use binary dumps use block I/O (write(2)
++           and read(2) functions).  Those that use textual dumps use  buffered
+            I/O.  A few applications may happen to write extra data in the file
+            using these functions.  Doing that can  run  into  problems  mixing
+-           block-  and  buffered-I/O.  This implementation reduces the problem
+-           on writes by flushing the output.  However,  reading  from  a  file
++           block and buffered I/O.  This implementation reduces the problem on
++           writes by flushing  the  output.   However,  reading  from  a  file
+            written using mixed schemes may not be successful.
+ 
+ 
+@@ -364,7 +364,7 @@
+            "~A", etc., analogous to "^@", "^A", C0 controls.
+ 
+            X/Open Curses does not document whether unctrl can be called before
+-           initializing curses.  This implementation permits that, and returns
++           initializing curses.  This implementation permits that, and returns
+            the "~@", etc., values in that case.
+ 
+        o   parameter values outside the 0 to 255 range.  unctrl returns a null
+@@ -383,22 +383,22 @@
+        Likewise, the meta(3x) function allows the caller to change the  output
+        of  keyname,  i.e.,  it  determines  whether to use the "M-" prefix for
+        "meta"   keys   (codes   in   the   range   128    to    255).     Both
+-       use_legacy_coding(3x)   and  meta(3x)  succeed  only  after  curses  is
++       use_legacy_coding(3x)   and  meta(3x)  succeed  only  after  curses  is
+        initialized.  X/Open Curses does not document the  treatment  of  codes
+        128 to 159.  When treating them as "meta" keys (or if keyname is called
+-       before  initializing  curses),  this  implementation  returns   strings
++       before  initializing  curses),  this  implementation  returns   strings
+        "M-^@", "M-^A", etc.
+ 
+        X/Open Curses documents unctrl as declared in <unctrl.h>, which ncurses
+        does.  However, ncurses' <curses.h> includes <unctrl.h>,  matching  the
+-       behavior of SVr4 curses.  Other implementations may not do that.
++       behavior of SVr4 curses.  Other implementations may not do that.
+ 
+ 
+ 
                                                                                                                                                                                                use_env, use_tioctl
                                                                                                                                                                                                +        If  ncurses  is  configured  to provide the sp-functions extension, the
+        state of use_env and use_tioctl may be  updated  before  creating  each
+        screen  rather  than  once  only  (curs_sp_funcs(3x)).  This feature of
+-       use_env is not provided by other implementations of curses.
++       use_env is not provided by other implementations of curses.
+ 
+ 
+ 
                                                                                                                                                                                                HISTORY
                                                                                                                                                                                                +@@ -410,7 +410,7 @@
+        and  putwin,  reading  and  writing  window  dumps  with  fread(3)  and
+        fwrite(3), respectively.
+ 
+-       SVr4 (1989) supplied use_env.
++       SVr4 (1989) furnished use_env.
+ 
+        X/Open Curses Issue 4 (1995) specified key_name and wunctrl.
+ 
+@@ -424,7 +424,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-15                     curs_util(3x)
++ncurses 6.5                       2025-04-05                     curs_util(3x)
+ 
                                                                                                                                                                                                
+ 
                                                                                                                                                                                                
+ 
                                                                                                                                                                                                  
+Index: doc/html/man/curs_variables.3x.html
+--- ncurses-6.5-20250329+/doc/html/man/curs_variables.3x.html	2025-01-19 00:55:00.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/curs_variables.3x.html	2025-04-05 22:33:05.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_variables.3x,v 1.58 2025/01/19 00:51:10 tom Exp @
++  * @Id: curs_variables.3x,v 1.62 2025/04/05 22:24:24 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_variables 3x 2025-01-18 ncurses 6.5 Library calls
++curs_variables 3x 2025-04-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                  curs_variables 3x 2025-01-18 ncurses 6.5 Library calls
                                                                                                                                                                                                  
++
                                                                                                                                                                                                  curs_variables 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                  + curs_variables(3x)               Library calls              curs_variables(3x)
+ 
+@@ -159,44 +159,46 @@
+ 
                                                                                                                                                                                                  curscr, newscr, stdscr
                                                                                                                                                                                                  +        When a curses application calls initscr(3x) or newterm(3x), the library
+        creates  a  window  named  stdscr that is the same size as the terminal
+-       screen and is the implicit window used by functions that interact  with
+-       a  window  but  do  not  take  a parameter identifying one; many curses
+-       functions use it.  An application need not use stdscr; it might  prefer
++       screen, (minus any lines reserved by  ripoffline(3x)  or  slk_init(3x))
++       and  is  the  implicit  window  used  by functions that interact with a
++       window but do  not  take  a  parameter  identifying  one;  many  curses
++       functions  use it.  An application need not use stdscr; it might prefer
+        to tile the display into multiple windows instead.
+ 
+-       The  library  records  updates to the terminal screen in a window named
+-       curscr.  This object  is  referred  to  as  the  "physical  screen"  in
++       The library records updates to the terminal screen in  a  window  named
++       curscr.   This  object  is  referred  to  as  the  "physical screen" in
+        curs_refresh(3x) and curs_outopts(3x).
+ 
+-       ncurses  collects  pending  updates  to the terminal screen in a window
+-       named newscr.  This object is referred to as the  "virtual  screen"  in
+-       the  curs_kernel(3x), curs_refresh(3x), and curs_outopts(3x).  When the
+-       screen is refreshed, curses determines a minimal set of  updates  using
++       ncurses collects pending updates to the terminal  screen  in  a  window
++       named  newscr.   This  object is referred to as the "virtual screen" in
++       the curs_kernel(3x), curs_refresh(3x), and curs_outopts(3x).  When  the
++       screen  is  refreshed, curses determines a minimal set of updates using
+        the terminal's capabilities to make curscr look like newscr.
+ 
+ 
+ 
                                                                                                                                                                                                  COLORS
                                                                                                                                                                                                  +-       Once  curses  is  initialized,  COLORS  contains  the  number of colors
++       Once curses is  initialized,  COLORS  contains  the  number  of  colors
+        supported by the terminal; see curs_color(3x).
+ 
+ 
+ 
                                                                                                                                                                                                  COLOR_PAIRS
                                                                                                                                                                                                  +-       Once curses is initialized, COLOR_PAIRS contains the  number  of  color
++       Once  curses  is  initialized, COLOR_PAIRS contains the number of color
+        pairs supported by the terminal; see curs_color(3x).
+ 
+ 
+ 
                                                                                                                                                                                                  COLS, LINES
                                                                                                                                                                                                  +-       Once  curses  is initialized, COLS and LINES contain the screen's width
+-       and height in character cells, respectively; that  is,  the  number  of
++       Once curses is initialized, COLS and LINES contain the  screen's  width
++       and  height  in  character  cells, respectively; that is, the number of
+        columns and lines.
+ 
+ 
+ 
                                                                                                                                                                                                  ESCDELAY
                                                                                                                                                                                                  +-       For  curses  to  distinguish  the ESC character resulting from a user's
+-       press of the "Escape" key on the input device  from  one  beginning  an
+-       escape sequence (as commonly produced by function keys), it waits after
+-       the escape character to see if further characters are available on  the
+-       input stream within a short interval.  ESCDELAY stores this interval in
++       When  reading  key  strokes  from  a  window  in  keypad  mode,  curses
++       distinguishes  the  ESC  character resulting from a user's press of the
++       "Escape" key on the input device from one beginning an escape  sequence
++       (commonly  produced  by  function  keys),  by  waiting after the escape
++       character to see if further  characters  are  available  on  the  input
++       stream  within  a  short  interval.   ESCDELAY  stores this interval in
+        milliseconds.
+ 
+        If keypad(3x) is disabled for the  curses  window  receiving  input,  a
+@@ -281,14 +283,14 @@
+        [UAX  #29]  "Unicode  Standard  Annex  #29:  Unicode Text Segmentation"
+        <https://unicode.org/reports/tr29/>
+ 
+-       getcchar(3x) further discusses CCHARW_MAX.
++       getcchar(3x) further discusses the ncurses extension CCHARW_MAX.
+ 
+        curses(3x),   curs_color(3x),    curs_opaque(3x),    curs_terminfo(3x),
+        curs_threads(3x), term_variables(3x), terminfo(5)
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                curs_variables(3x)
++ncurses 6.5                       2025-04-05                curs_variables(3x)
+ 
                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                  
+ 
                                                                                                                                                                                                    
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.5-20250329+/doc/html/man/ncurses.3x.html	2025-03-22 22:52:53.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/ncurses.3x.html	2025-04-05 22:57:21.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: ncurses.3x,v 1.245 2025/03/01 21:43:30 tom Exp @
++  * @Id: ncurses.3x,v 1.252 2025/04/05 22:54:19 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-ncurses 3x 2025-03-01 ncurses 6.5 Library calls
++ncurses 3x 2025-04-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                    ncurses 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                                                                    
++
                                                                                                                                                                                                    ncurses 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                    + ncurses(3x)                      Library calls                     ncurses(3x)
+ 
+@@ -61,7 +61,7 @@
+        displays  with  output  optimized  to minimize screen updates.  ncurses
+        replaces the curses libraries from System V Release 4 Unix ("SVr4") and
+        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
+-       document describes ncurses version 6.5 (patch 20250322).
++       document describes ncurses version 6.5 (patch 20250405).
+ 
+        ncurses permits control of the terminal screen's contents;  abstraction
+        and  subdivision thereof with windows and pads; acquisition of keyboard
+@@ -124,8 +124,8 @@
+        initscr(3x) or newterm(3x) must be called to initialize  curses  before
+        use of any functions that access or manipulate windows or screens.
+ 
+-       To  get  character-at-a-time  input  without echoing--most interactive,
+-       screen-oriented programs want this--use the following sequence.
++       To  get  character-at-a-time input without echoing -- most interactive,
++       screen-oriented programs want this -- use the following sequence.
+ 
+            initscr(); cbreak(); noecho();
+ 
+@@ -134,7 +134,7 @@
+            noqiflush();
+            keypad(stdscr, TRUE);
+ 
+-       A curses program then often enters an event loop of  some  sort.   Call
++       A curses program  then  often  enters  an  event-handling  loop.   Call
+        endwin(3x) before exiting.
+ 
+ 
+@@ -265,9 +265,9 @@
+                  type.   In either case, they are accessed via an integral bit
+                  mask.
+ 
+-                 Each cell of a WINDOW is stored as a chtype.   X/Open  Curses
+-                 does  not  specify  the  sizes of the character code or color
+-                 pair identifier, nor  the  quantity  of  attribute  bits,  in
++                 ncurses stores each cell of a WINDOW  as  a  chtype.   X/Open
++                 Curses  does  not  specify the sizes of the character code or
++                 color pair identifier, nor the quantity of attribute bits, in
+                  chtype;  these  are  implementation-dependent.   ncurses uses
+                  eight bits for the character code.  An application  requiring
+                  a  wider  character  type, for instance to represent Unicode,
+@@ -282,7 +282,7 @@
+                  variants to their non-wide  counterparts;  where  a  non-wide
+                  function  name contains "ch" or "str", prefix it with "_w" to
+                  obtain the wide counterpart.   For  example,  waddch  becomes
+-                 wadd_wch.  Another exception is ins_nwstr (and its variants),
++                 wadd_wch.   An  exception  is  ins_nwstr  (and its variants),
+                  spelled thus instead of "insn_wstr".   (Exceptions  that  add
+                  only "w" comprise addwstr, inwstr, and their variants.)
+ 
+@@ -310,31 +310,32 @@
+                           structure,  not  combined  into  an  integer  as  in
+                           chtype.
+ 
+-                 Each  cell  of a WINDOW is stored as a cchar_t.  setcchar(3x)
+-                 and getcchar(3x) store and retrieve cchar_t data.
++                 ncurses   stores   each  cell  of  a  WINDOW  as  a  cchar_t.
++                 setcchar(3x) and  getcchar(3x)  store  and  retrieve  cchar_t
++                 data.
+ 
+-                 The wide library API of ncurses depends  on  two  data  types
++                 The  wide  library  API  of ncurses depends on two data types
+                  standardized by ISO C95.
+ 
+-                 wchar_t  stores  a wide character.  Like chtype, it may be an
+-                          alias of int.  Depending on the character  encoding,
+-                          a  wide  character  may  be spacing, meaning that it
+-                          occupies a character cell by  itself  and  typically
+-                          accompanies   cursor  advancement,  or  non-spacing,
+-                          meaning that it occupies the same cell as a  spacing
+-                          character,  is often regarded as a "modifier" of the
+-                          base glyph with which  it  combines,  and  typically
++                 wchar_t  stores a wide character.  Like chtype, it may be  an
++                          alias  of int.  Depending on the character encoding,
++                          a wide character may be  spacing,  meaning  that  it
++                          occupies  a  character  cell by itself and typically
++                          accompanies  cursor  advancement,  or   non-spacing,
++                          meaning  that it occupies the same cell as a spacing
++                          character, is often regarded as a "modifier" of  the
++                          base  glyph  with  which  it combines, and typically
+                           does not advance the cursor.
+ 
+-                 wint_t   can   store   a   wchar_t   or  the  constant  WEOF,
+-                          analogously to the int-sized character  manipulation
++                 wint_t   can  store  a  wchar_t   or   the   constant   WEOF,
++                          analogously  to the int-sized character manipulation
+                           functions of ISO C and its constant EOF.
+ 
+ 
+ 
                                                                                                                                                                                                    Function Name Index
                                                                                                                                                                                                    +        The following table lists the curses functions provided in the non-wide
+-       and wide APIs and the  corresponding  man  pages  that  describe  them.
+-       Those  flagged  with  "*"  are  ncurses-specific,  neither described by
++       and  wide  APIs  and  the  corresponding  man pages that describe them.
++       Those flagged with  "*"  are  ncurses-specific,  neither  described  by
+        X/Open Curses nor present in SVr4.
+ 
+                     curses Function Name     Man Page
+@@ -385,8 +386,8 @@
+                     curses_version           curs_extend(3x)*
+                     def_prog_mode            curs_kernel(3x)
+                     def_shell_mode           curs_kernel(3x)
+-
+                     define_key               define_key(3x)*
++
+                     del_curterm              curs_terminfo(3x)
+                     delay_output             curs_util(3x)
+                     delch                    curs_delch(3x)
+@@ -452,9 +453,9 @@
+                     immedok                  curs_outopts(3x)
+                     in_wch                   curs_in_wch(3x)
+                     in_wchnstr               curs_in_wchstr(3x)
+-
+                     in_wchstr                curs_in_wchstr(3x)
+                     inch                     curs_inch(3x)
++
+                     inchnstr                 curs_inchstr(3x)
+                     inchstr                  curs_inchstr(3x)
+                     init_color               curs_color(3x)
+@@ -519,10 +520,10 @@
+                     mvaddchstr               curs_addchstr(3x)
+                     mvaddnstr                curs_addstr(3x)
+                     mvaddnwstr               curs_addwstr(3x)
+-
+                     mvaddstr                 curs_addstr(3x)
+                     mvaddwstr                curs_addwstr(3x)
+                     mvchgat                  curs_attr(3x)
++
+                     mvcur                    curs_kernel(3x)
+                     mvdelch                  curs_delch(3x)
+                     mvderwin                 curs_window(3x)
+@@ -586,11 +587,11 @@
+                     mvwins_nwstr             curs_ins_wstr(3x)
+                     mvwins_wch               curs_ins_wch(3x)
+                     mvwins_wstr              curs_ins_wstr(3x)
+-
+                     mvwinsch                 curs_insch(3x)
+                     mvwinsnstr               curs_insstr(3x)
+                     mvwinsstr                curs_insstr(3x)
+                     mvwinstr                 curs_instr(3x)
++
+                     mvwinwstr                curs_inwstr(3x)
+                     mvwprintw                curs_printw(3x)
+                     mvwscanw                 curs_scanw(3x)
+@@ -653,12 +654,12 @@
+                     slk_attr_on              curs_slk(3x)
+                     slk_attr_set             curs_slk(3x)
+                     slk_attroff              curs_slk(3x)
+-
+                     slk_attron               curs_slk(3x)
+                     slk_attrset              curs_slk(3x)
+                     slk_clear                curs_slk(3x)
+                     slk_color                curs_slk(3x)
+                     slk_init                 curs_slk(3x)
++
+                     slk_label                curs_slk(3x)
+                     slk_noutrefresh          curs_slk(3x)
+                     slk_refresh              curs_slk(3x)
+@@ -720,13 +721,13 @@
+                     wadd_wchnstr             curs_add_wchstr(3x)
+                     wadd_wchstr              curs_add_wchstr(3x)
+                     waddch                   curs_addch(3x)
+-
+                     waddchnstr               curs_addchstr(3x)
+                     waddchstr                curs_addchstr(3x)
+                     waddnstr                 curs_addstr(3x)
+                     waddnwstr                curs_addwstr(3x)
+                     waddstr                  curs_addstr(3x)
+                     waddwstr                 curs_addwstr(3x)
++
+                     wattr_get                curs_attr(3x)
+                     wattr_off                curs_attr(3x)
+                     wattr_on                 curs_attr(3x)
+@@ -787,7 +788,6 @@
+                     wnoutrefresh             curs_refresh(3x)
+                     wprintw                  curs_printw(3x)
+                     wredrawln                curs_refresh(3x)
+-
+                     wrefresh                 curs_refresh(3x)
+                     wresize                  wresize(3x)*
+                     wscanw                   curs_scanw(3x)
+@@ -795,6 +795,7 @@
+                     wsetscrreg               curs_outopts(3x)
+                     wstandend                curs_attr(3x)
+                     wstandout                curs_attr(3x)
++
+                     wsyncdown                curs_window(3x)
+                     wsyncup                  curs_window(3x)
+                     wtimeout                 curs_inopts(3x)
+@@ -803,43 +804,43 @@
+                     wvline                   curs_border(3x)
+                     wvline_set               curs_border_set(3x)
+ 
+-       ncurses's   screen-pointer   extension   adds   additional    functions
+-       corresponding  to  many  of  the  above, each with an "_sp" suffix; see
++       ncurses's    screen-pointer   extension   adds   additional   functions
++       corresponding to many of the above, each  with  an  "_sp"  suffix;  see
+        curs_sp_funcs(3x).
+ 
+-       The availability of some extensions is  configurable  when  ncurses  is
+-       compiled;  see  sections  "ALTERNATE  CONFIGURATIONS"  and "EXTENSIONS"
++       The  availability  of  some  extensions is configurable when ncurses is
++       compiled; see  sections  "ALTERNATE  CONFIGURATIONS"  and  "EXTENSIONS"
+        below.
+ 
+ 
+ 
                                                                                                                                                                                                    RETURN VALUE
                                                                                                                                                                                                    +-       Unless otherwise noted,  functions  that  return  integers  return  the
+-       constants  OK  on  success  and ERR on failure; see curs_variables(3x).
+-       Functions that return pointers  return  NULL  on  failure.   Typically,
+-       ncurses  treats  a  null  pointer  passed  as a function parameter as a
+-       failure.  Functions prefixed with "mv" first  perform  cursor  movement
++       Unless  otherwise  noted,  functions  that  return  integers return the
++       constants OK on success and ERR  on  failure;  see  curs_variables(3x).
++       Functions  that  return  pointers  return  NULL on failure.  Typically,
++       ncurses treats a null pointer passed  as  a  function  parameter  as  a
++       failure.   Functions  prefixed  with "mv" first perform cursor movement
+        and fail if the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                                                                    ENVIRONMENT
                                                                                                                                                                                                    +-       The  following  symbols  from  the  process  environment  customize the
+-       runtime  behavior  of  ncurses  applications.   The  library   may   be
+-       configured   to   disregard   the  variables  TERMINFO,  TERMINFO_DIRS,
+-       TERMPATH, and HOME, if  the  user  is  the  superuser  (root),  or  the
++       The following  symbols  from  the  process  environment  customize  the
++       runtime   behavior   of  ncurses  applications.   The  library  may  be
++       configured  to  disregard  the   variables   TERMINFO,   TERMINFO_DIRS,
++       TERMPATH,  and  HOME,  if  the  user  is  the  superuser (root), or the
+        application uses setuid(2) or setgid(2).
+ 
+ 
+ 
                                                                                                                                                                                                    BAUDRATE
                                                                                                                                                                                                    +-       The  debugging  library  checks  this variable when the application has
+-       redirected output to a file.  ncurses interprets its integral value  as
+-       the  terminal's line speed in bits per second.  If that value is absent
+-       or invalid, ncurses uses  9600.   This  feature  allows  developers  to
+-       construct  repeatable  test  cases  that take into account optimization
++       The debugging library checks this variable  when  the  application  has
++       redirected  output to a file.  ncurses interprets its integral value as
++       the terminal's line speed in bits per second.  If that value is  absent
++       or  invalid,  ncurses  uses  9600.   This  feature allows developers to
++       construct repeatable test cases that  take  into  account  optimization
+        decisions that depend on the terminal's line speed.
+ 
+ 
+ 
                                                                                                                                                                                                    CC (command character)
                                                                                                                                                                                                    +-       When set, the command_character  (cmdch)  capability  value  of  loaded
++       When  set,  the  command_character  (cmdch)  capability value of loaded
+        terminfo entries changes to the value of this variable.  Very few term-
+        info entries provide this feature.
+ 
+@@ -850,192 +851,192 @@
+ 
+ 
                                                                                                                                                                                                    COLUMNS
                                                                                                                                                                                                    +        This  variable  specifies  the  width  of  the  screen  in  characters.
+-       Applications  running  in  a  windowing environment usually are able to
+-       obtain the width of the window in which they  are  executing.   ncurses
+-       enforces  an  upper limit of 512 when reading the value.  If COLUMNS is
+-       not defined and the terminal's screen size is not  available  from  the
+-       terminal  driver, ncurses uses the size specified by the columns (cols)
+-       capability of the terminal type's entry in the  terminfo  database,  if
++       Applications running in a windowing environment  usually  are  able  to
++       obtain  the  width  of the window in which they are executing.  ncurses
++       enforces an upper limit of 512 when reading the value.  If  COLUMNS  is
++       not  defined  and  the terminal's screen size is not available from the
++       terminal driver, ncurses uses the size specified by the columns  (cols)
++       capability  of  the  terminal type's entry in the terminfo database, if
+        any.
+ 
+-       It  is  important  that  your  application use the correct screen size.
+-       Automatic  detection  thereof  is  not  always  possible   because   an
+-       application  may  be  running  on  a  host  that  does  not  honor NAWS
+-       (Negotiations About Window Size) or as a different  user  ID  than  the
+-       owner  of  the  terminal  device  file.   Setting  COLUMNS and/or LINES
+-       overrides the library's use  of  the  screen  size  obtained  from  the
++       It is important that your application  use  the  correct  screen  size.
++       Automatic   detection   thereof  is  not  always  possible  because  an
++       application may  be  running  on  a  host  that  does  not  honor  NAWS
++       (Negotiations  About  Window  Size)  or as a different user ID than the
++       owner of the  terminal  device  file.   Setting  COLUMNS  and/or  LINES
++       overrides  the  library's  use  of  the  screen  size obtained from the
+        operating system.
+ 
+-       The  COLUMNS  and LINES variables may be specified independently.  This
+-       property is useful to circumvent misfeatures of  legacy  terminal  type
+-       descriptions;  xterm(1)  descriptions  specifying  65  lines  were once
+-       notorious.   For  best  results,  avoid  specifying  cols   and   lines
++       The COLUMNS and LINES variables may be specified  independently.   This
++       property  is  useful  to circumvent misfeatures of legacy terminal type
++       descriptions; xterm(1)  descriptions  specifying  65  lines  were  once
++       notorious.    For   best  results,  avoid  specifying  cols  and  lines
+        capability codes in terminfo descriptions of terminal emulators.
+ 
+-       use_env(3x)  can  disable use of the process environment in determining
+-       the screen size.  use_tioctl(3x) can update COLUMNS and LINES to  match
++       use_env(3x) can disable use of the process environment  in  determining
++       the  screen size.  use_tioctl(3x) can update COLUMNS and LINES to match
+        the screen size obtained from system calls or the terminal database.
+ 
+ 
+ 
                                                                                                                                                                                                    ESCDELAY
                                                                                                                                                                                                    +-       For  curses  to  distinguish  the ESC character resulting from a user's
+-       press of the "Escape" key on the input device  from  one  beginning  an
++       For curses to distinguish the ESC character  resulting  from  a  user's
++       press  of  the  "Escape"  key on the input device from one beginning an
+        escape sequence (as commonly produced by function keys), it waits after
+-       receiving the  escape  character  to  see  if  further  characters  are
+-       available  on  the  input  stream  within  a  short interval.  A global
+-       variable ESCDELAY stores this interval in  milliseconds.   The  default
++       receiving  the  escape  character  to  see  if  further  characters are
++       available on the input  stream  within  a  short  interval.   A  global
++       variable  ESCDELAY  stores  this interval in milliseconds.  The default
+        value of 1000 (one second) is adequate for most uses.  This environment
+-       variable overrides it; ncurses enforces an upper limit  of  30,000  (30
++       variable  overrides  it;  ncurses enforces an upper limit of 30,000 (30
+        seconds) when reading the value.
+ 
+-       The  most common instance where you may wish to change this value is to
++       The most common instance where you may wish to change this value is  to
+        work with a remote host over a slow communication channel.  If the host
+-       running  a  curses  application  does  not receive the characters of an
+-       escape sequence in a timely manner, the library can interpret  them  as
++       running a curses application does not  receive  the  characters  of  an
++       escape  sequence  in a timely manner, the library can interpret them as
+        multiple key stroke events.
+ 
+        xterm(1) mouse events are a form of escape sequence; therefore, if your
+-       application makes heavy use  of  multiple-clicking,  you  may  wish  to
+-       lengthen  the  default value because the delay applies to the composite
++       application  makes  heavy  use  of  multiple-clicking,  you may wish to
++       lengthen the default value because the delay applies to  the  composite
+        multi-click event as well as the individual clicks.
+ 
+-       Portable applications should not rely upon the presence of ESCDELAY  in
+-       either  form,  but  setting  the  environment  variable rather than the
++       Portable  applications should not rely upon the presence of ESCDELAY in
++       either form, but setting  the  environment  variable  rather  than  the
+        global variable does not create problems when compiling an application.
+ 
+-       If keypad(3x) is disabled for the  curses  window  receiving  input,  a
++       If  keypad(3x)  is  disabled  for  the curses window receiving input, a
+        program must disambiguate escape sequences itself.
+ 
+ 
+ 
                                                                                                                                                                                                    HOME
                                                                                                                                                                                                    +-       ncurses  may read and write auxiliary terminal descriptions in .termcap
++       ncurses may read and write auxiliary terminal descriptions in  .termcap
+        and .terminfo files in the user's home directory.
+ 
+ 
+ 
                                                                                                                                                                                                    LINES
                                                                                                                                                                                                    +-       This counterpart to COLUMNS specifies  the  height  of  the  screen  in
+-       characters.   The  corresponding terminfo capability and code is lines.
++       This  counterpart  to  COLUMNS  specifies  the  height of the screen in
++       characters.  The corresponding terminfo capability and code  is  lines.
+        See the description of the COLUMNS variable above.
+ 
+ 
+ 
                                                                                                                                                                                                    MOUSE_BUTTONS_123
                                                                                                                                                                                                    +-       (OS/2 EMX port only) OS/2 numbers a three-button  mouse  inconsistently
+-       with  other platforms, such that 1 is the left button, 2 the right, and
+-       3 the middle.  This variable customizes  the  mouse  button  numbering.
+-       Its  value  must be three digits 1-3 in any order.  By default, ncurses
++       (OS/2  EMX  port only) OS/2 numbers a three-button mouse inconsistently
++       with other platforms, such that 1 is the left button, 2 the right,  and
++       3  the  middle.   This  variable customizes the mouse button numbering.
++       Its value must be three digits 1-3 in any order.  By  default,  ncurses
+        assumes a numbering of "132".
+ 
+ 
+ 
                                                                                                                                                                                                    NCURSES_ASSUMED_COLORS
                                                                                                                                                                                                    +-       If set, this  variable  overrides  the  ncurses  library's  compiled-in
+-       assumption  that  the terminal's default colors are white on black; see
+-       default_colors(3x).  Set the foreground  and  background  color  values
+-       with  this  environment  variable  by  assigning  it two integer values
++       If  set,  this  variable  overrides  the  ncurses library's compiled-in
++       assumption that the terminal's default colors are white on  black;  see
++       default_colors(3x).   Set  the  foreground  and background color values
++       with this environment variable  by  assigning  it  two  integer  values
+        separated  by  a  comma,  indicating  foregound  and  background  color
+        numbers, respectively.
+ 
+-       For  example,  to tell ncurses not to assume anything about the colors,
+-       use a value of "-1,-1".  To make the  default  color  scheme  green  on
+-       black,  use  "2,0".   ncurses accepts integral values from -1 up to the
++       For example, to tell ncurses not to assume anything about  the  colors,
++       use  a  value  of  "-1,-1".   To make the default color scheme green on
++       black, use "2,0".  ncurses accepts integral values from -1  up  to  the
+        value of the terminfo max_colors (colors) capability.
+ 
+ 
+ 
                                                                                                                                                                                                    NCURSES_CONSOLE2
                                                                                                                                                                                                    +-       (MinGW  port  only)  The  Console2  program  defectively  handles   the
+-       Microsoft  Console  API  call  CreateConsoleScreenBuffer.  Applications
+-       that use it will hang.  However, it is possible to simulate the  action
+-       of  this  call  by mapping coordinates, explicitly saving and restoring
+-       the original screen contents.  Setting the environment  variable  NCGDB
++       (MinGW   port  only)  The  Console2  program  defectively  handles  the
++       Microsoft Console  API  call  CreateConsoleScreenBuffer.   Applications
++       that  use it will hang.  However, it is possible to simulate the action
++       of this call by mapping coordinates, explicitly  saving  and  restoring
++       the  original  screen contents.  Setting the environment variable NCGDB
+        has the same effect.
+ 
+ 
+ 
                                                                                                                                                                                                    NCURSES_GPM_TERMS
                                                                                                                                                                                                    +-       (Linux  only) When ncurses is configured to use the GPM interface, this
+-       variable may list  one  or  more  terminal  type  names,  delimited  by
+-       vertical  bars  (|) or colons (:), against which the TERM variable (see
+-       below) is matched.  An empty value disables the  GPM  interface,  using
+-       ncurses's  built-in  support  for xterm(1) mouse protocols instead.  If
+-       the variable is absent, ncurses attempts to open GPM if  TERM  contains
++       (Linux only) When ncurses is configured to use the GPM interface,  this
++       variable  may  list  one  or  more  terminal  type  names, delimited by
++       vertical bars (|) or colons (:), against which the TERM  variable  (see
++       below)  is  matched.   An empty value disables the GPM interface, using
++       ncurses's built-in support for xterm(1) mouse  protocols  instead.   If
++       the  variable  is absent, ncurses attempts to open GPM if TERM contains
+        "linux".
+ 
+ 
+ 
                                                                                                                                                                                                    NCURSES_NO_HARD_TABS
                                                                                                                                                                                                    +-       ncurses  may  use  tab  characters in cursor movement optimization.  In
+-       some cases, your terminal driver may not  handle  them  properly.   Set
++       ncurses may use tab characters in  cursor  movement  optimization.   In
++       some  cases,  your  terminal  driver may not handle them properly.  Set
+        this environment variable to any value to disable the feature.  You can
+        also adjust your stty(1) settings to avoid the problem.
+ 
+ 
+ 
                                                                                                                                                                                                    NCURSES_NO_MAGIC_COOKIE
                                                                                                                                                                                                    +-       Many terminals store video attributes as  a  property  of  a  character
+-       cell,  as  curses  does.   Historically, some recorded changes in video
+-       attributes as data that  logically  occupies  character  cells  on  the
+-       display,  switching attributes on or off, similarly to tags in a markup
+-       language; these are termed "magic cookies", and  must  be  subsequently
+-       overprinted.   If  the  terminfo  entry for your terminal type does not
++       Many  terminals  store  video  attributes  as a property of a character
++       cell, as curses does.  Historically, some  recorded  changes  in  video
++       attributes  as  data  that  logically  occupies  character cells on the
++       display, switching attributes on or off, similarly to tags in a  markup
++       language;  these  are  termed "magic cookies", and must be subsequently
++       overprinted.  If the terminfo entry for your  terminal  type  does  not
+        adequately describe its handling of magic cookies, set this variable to
+        any value to instruct ncurses to disable attributes entirely.
+ 
+ 
+ 
                                                                                                                                                                                                    NCURSES_NO_PADDING
                                                                                                                                                                                                    +        Most  terminal  type  descriptions  in  the  terminfo  database  detail
+-       hardware  devices.   Many  people  use  curses-based  applications   in
+-       terminal  emulator programs that run in a windowing environment.  These
+-       programs can duplicate all of the  important  features  of  a  hardware
+-       terminal,  but  often lack their limitations.  Chief among these absent
++       hardware   devices.   Many  people  use  curses-based  applications  in
++       terminal emulator programs that run in a windowing environment.   These
++       programs  can  duplicate  all  of  the important features of a hardware
++       terminal, but often lack their limitations.  Chief among  these  absent
+        drawbacks is the problem of data flow management; that is, limiting the
+-       speed  of  communication  to  what the hardware could handle.  Unless a
+-       hardware terminal is interfaced into  a  terminal  concentrator  (which
+-       does  flow  control), an application must manage flow itself to prevent
++       speed of communication to what the hardware  could  handle.   Unless  a
++       hardware  terminal  is  interfaced  into a terminal concentrator (which
++       does flow control), an application must manage flow itself  to  prevent
+        overruns and data loss.
+ 
+-       A solution that comes at no hardware cost  is  for  an  application  to
+-       pause  after  directing  a  terminal  to  execute  an operation that it
+-       performs slowly, such as clearing  the  display.   Many  terminal  type
+-       descriptions,  including that for the VT100, embed delay specifications
+-       in capabilities.  You may  wish  to  use  these  terminal  descriptions
+-       without  paying the performance penalty.  Set NCURSES_NO_PADDING to any
+-       value to disable all but mandatory padding.  Mandatory padding is  used
++       A  solution  that  comes  at  no hardware cost is for an application to
++       pause after directing a  terminal  to  execute  an  operation  that  it
++       performs  slowly,  such  as  clearing  the display.  Many terminal type
++       descriptions, including that for the VT100, embed delay  specifications
++       in  capabilities.   You  may  wish  to  use these terminal descriptions
++       without paying the performance penalty.  Set NCURSES_NO_PADDING to  any
++       value  to disable all but mandatory padding.  Mandatory padding is used
+        by such terminal capabilities as flash_screen (flash).
+ 
+ 
+ 
                                                                                                                                                                                                    NCURSES_NO_SETBUF
                                                                                                                                                                                                    +-       (Obsolete)  Prior to internal changes developed in ncurses 5.9 (patches
+-       20120825 through 20130126), the library used setbuf(3) to enable  fully
+-       buffered  output  when initializing the terminal.  This was done, as in
+-       SVr4 curses, to increase performance.  For testing  purposes,  both  of
+-       ncurses  and  of  certain applications, this feature was made optional.
+-       Setting this variable disabled output  buffering,  leaving  the  output
++       (Obsolete) Prior to internal changes developed in ncurses 5.9  (patches
++       20120825  through 20130126), the library used setbuf(3) to enable fully
++       buffered output when initializing the terminal.  This was done,  as  in
++       SVr4  curses,  to  increase performance.  For testing purposes, both of
++       ncurses and of certain applications, this feature  was  made  optional.
++       Setting  this  variable  disabled  output buffering, leaving the output
+        stream in the original (usually line-buffered) mode.
+ 
+-       Nowadays,  ncurses performs its own buffering and does not require this
+-       workaround; it does not modify the buffering  of  the  standard  output
+-       stream.   This  approach makes signal handling, as for interrupts, more
+-       robust.  A drawback  is  that  certain  unconventional  programs  mixed
+-       stdio(3)  calls  with ncurses calls and (usually) got the behavior they
+-       expected.  This is no longer the case; ncurses does not  write  to  the
++       Nowadays, ncurses performs its own buffering and does not require  this
++       workaround;  it  does  not  modify the buffering of the standard output
++       stream.  This approach makes signal handling, as for  interrupts,  more
++       robust.   A  drawback  is  that  certain  unconventional programs mixed
++       stdio(3) calls with ncurses calls and (usually) got the  behavior  they
++       expected.   This  is  no longer the case; ncurses does not write to the
+        standard output file descriptor through a stdio-buffered stream.
+ 
+-       As  a  special case, low-level API calls such as putp(3x) still use the
+-       standard output stream.  High-level curses calls such as printw(3x)  do
++       As a special case, low-level API calls such as putp(3x) still  use  the
++       standard  output stream.  High-level curses calls such as printw(3x) do
+        not.
+ 
+ 
+ 
                                                                                                                                                                                                    NCURSES_NO_UTF8_ACS
                                                                                                                                                                                                    +-       At  initialization,  ncurses inspects the TERM environment variable for
+-       special  cases  where   VT100   forms-drawing   characters   (and   the
+-       corresponding  alternate character set terminfo capabilities) are known
++       At initialization, ncurses inspects the TERM environment  variable  for
++       special   cases   where   VT100   forms-drawing   characters  (and  the
++       corresponding alternate character set terminfo capabilities) are  known
+        to  be  unsupported  by  terminal  types  that  otherwise  claim  VT100
+        compatibility.  Specifically, when running in a UTF-8 locale, the Linux
+-       virtual console device and the GNU screen(1) program ignore them.   Set
++       virtual  console device and the GNU screen(1) program ignore them.  Set
+        this  variable  to  a  nonzero  value  to  instruct  ncurses  that  the
+        terminal's ACS support is broken; the library then outputs Unicode code
+        points that correspond to the forms-drawing characters.  Set it to zero
+        (or a non-integer) to disable the special check for terminal type names
+-       matching  "linux" or "screen", directing ncurses to assume that the ACS
++       matching "linux" or "screen", directing ncurses to assume that the  ACS
+        feature works if the terminal type description advertises it.
+ 
+-       As an alternative to use  of  this  variable,  ncurses  checks  for  an
++       As  an  alternative  to  use  of  this  variable, ncurses checks for an
+        extended terminfo numeric capability U8 that can be compiled using "tic
+        -x".  Examples follow.
+ 
+@@ -1048,62 +1049,62 @@
+           xterm-utf8|xterm relying on UTF-8 line-graphics,
+                   U8#1, use=xterm,
+ 
+-       The two-character name "U8" was chosen to permit its use via  ncurses's
++       The  two-character name "U8" was chosen to permit its use via ncurses's
+        termcap interface.
+ 
+ 
+ 
                                                                                                                                                                                                    NCURSES_TRACE
                                                                                                                                                                                                    +-       At  initialization, ncurses (in its debugging configuration) checks for
+-       this variable's presence.  If  defined  with  an  integral  value,  the
++       At initialization, ncurses (in its debugging configuration) checks  for
++       this  variable's  presence.   If  defined  with  an integral value, the
+        library calls curses_trace(3x) with that value as the argument.
+ 
+ 
+ 
                                                                                                                                                                                                    TERM
                                                                                                                                                                                                    +-       The  TERM variable denotes the terminal type.  Each is distinct, though
+-       many are similar.  It is commonly set by  terminal  emulators  to  help
+-       applications  find  a  workable  terminal  description.   Some choose a
+-       popular approximation such as "ansi", "vt100", or "xterm"  rather  than
+-       an  exact  fit to their capabilities.  Not infrequently, an application
+-       will have problems with that approach; for example, a  key  stroke  may
+-       not  operate  correctly,  or  produce  no  effect  but  seeming garbage
++       The TERM variable denotes the terminal type.  Each is distinct,  though
++       many  are  similar.   It  is commonly set by terminal emulators to help
++       applications find a  workable  terminal  description.   Some  choose  a
++       popular  approximation  such as "ansi", "vt100", or "xterm" rather than
++       an exact fit to their capabilities.  Not infrequently,  an  application
++       will  have  problems  with that approach; for example, a key stroke may
++       not operate  correctly,  or  produce  no  effect  but  seeming  garbage
+        characters on the screen.
+ 
+-       Setting TERM has no effect on hardware operation; it  affects  the  way
+-       applications  communicate  with  the  terminal.  Likewise, as a general
+-       rule (xterm(1) being a rare exception), terminal emulators  that  allow
++       Setting  TERM  has  no effect on hardware operation; it affects the way
++       applications communicate with the terminal.   Likewise,  as  a  general
++       rule  (xterm(1)  being a rare exception), terminal emulators that allow
+        you to specify TERM as a parameter or configuration value do not change
+        their behavior to match that setting.
+ 
+ 
+ 
                                                                                                                                                                                                    TERMCAP
                                                                                                                                                                                                    +        If ncurses is configured with termcap support, it checks for a terminal
+-       type  description  in  termcap  format if one in terminfo format is not
+-       available.  Setting this variable directs ncurses to ignore  the  usual
+-       termcap  database  location, /etc/termcap; see TERMPATH below.  TERMCAP
+-       should contain either a terminal description  (with  newlines  stripped
+-       out),  or  a file name indicating where the information required by the
++       type description in termcap format if one in  terminfo  format  is  not
++       available.   Setting  this variable directs ncurses to ignore the usual
++       termcap database location, /etc/termcap; see TERMPATH  below.   TERMCAP
++       should  contain  either  a terminal description (with newlines stripped
++       out), or a file name indicating where the information required  by  the
+        TERM environment variable is stored.
+ 
+ 
+ 
                                                                                                                                                                                                    TERMINFO
                                                                                                                                                                                                    +-       ncurses can be configured to read terminal type  description  databases
+-       in  various locations using different formats.  This variable overrides
++       ncurses  can  be configured to read terminal type description databases
++       in various locations using different formats.  This variable  overrides
+        the default location.
+ 
+-       o   Descriptions in terminfo format are normally stored in a  directory
++       o   Descriptions  in terminfo format are normally stored in a directory
+            tree using subdirectories named for the common first letters of the
+-           terminal types named therein.  This is the scheme used in System V.
++           terminal types named therein.  System V used this scheme.
+ 
+        o   If ncurses is configured to use hashed databases, then TERMINFO may
+-           name  its  location,  such  as  /usr/share/terminfo.db, rather than
++           name its location,  such  as  /usr/share/terminfo.db,  rather  than
+            /usr/share/terminfo/.
+ 
+-       The hashed database uses less disk space and is a  little  faster  than
++       The  hashed  database  uses less disk space and is a little faster than
+        the directory tree.  However, some applications assume the existence of
+        the directory tree, and read it directly rather than using the terminfo
+        API.
+ 
+-       o   If  ncurses  is  configured with termcap support, this variable may
++       o   If ncurses is configured with termcap support,  this  variable  may
+            contain the location of a termcap file.
+ 
+        o   If the value of TERMINFO begins with "hex:" or "b64:", ncurses uses
+@@ -1113,10 +1114,10 @@
+                   TERMINFO=$(infocmp -0 -Q2 -q)
+                   export TERMINFO
+ 
+-           The compiled description is used only  if  it  corresponds  to  the
++           ncurses uses the compiled description only if it corresponds to the
+            terminal type identified by TERM.
+ 
+-       Setting  TERMINFO  is  the  simplest,  but  not the only, way to direct
++       Setting TERMINFO is the simplest, but  not  the  only,  way  to  direct
+        ncurses to a terminal database.  The search path is as follows.
+ 
+        o   the last terminal database to which the running ncurses application
+@@ -1134,16 +1135,16 @@
+ 
+ 
+ 
                                                                                                                                                                                                    TERMINFO_DIRS
                                                                                                                                                                                                    +-       This  variable  specifies  a  list of locations, akin to PATH, in which
+-       ncurses searches  for  the  terminal  type  descriptions  described  by
+-       TERMINFO  above.   The  list  items are separated by colons on Unix and
+-       semicolons on  OS/2  EMX.   System V  terminfo  lacks  a  corresponding
++       This variable specifies a list of locations, akin  to  PATH,  in  which
++       ncurses  searches  for  the  terminal  type  descriptions  described by
++       TERMINFO above.  The list items are separated by  colons  on  Unix  and
++       semicolons  on  OS/2  EMX.   System V  terminfo  lacks  a corresponding
+        feature; TERMINFO_DIRS is an ncurses extension.
+ 
+ 
+ 
                                                                                                                                                                                                    TERMPATH
                                                                                                                                                                                                    +        If TERMCAP does not hold a terminal type description or file name, then
+-       ncurses checks the contents of TERMPATH, a list of locations,  akin  to
++       ncurses  checks  the contents of TERMPATH, a list of locations, akin to
+        PATH, in which it searches for termcap terminal type descriptions.  The
+        list items are separated by colons on Unix and semicolons on OS/2 EMX.
+ 
+@@ -1153,9 +1154,9 @@
+ 
+ 
+ 
                                                                                                                                                                                                    ALTERNATE CONFIGURATIONS
                                                                                                                                                                                                    +-       Many different ncurses configurations are possible, determined  by  the
+-       options  given  to the configure script when building the library.  Run
+-       the script with the --help option to peruse them all.   A  few  are  of
++       Many  different  ncurses configurations are possible, determined by the
++       options given to the configure script when building the  library.   Run
++       the  script  with  the  --help option to peruse them all.  A few are of
+        particular significance to the application developer employing ncurses.
+ 
+        --disable-overwrite
+@@ -1164,24 +1165,24 @@
+ 
+                 #include <curses.h>
+ 
+-            This option is used to avoid file name conflicts  between  ncurses
+-            and  an existing curses installation on the system.  If ncurses is
+-            installed disabling overwrite, it  puts  its  header  files  in  a
++            This  option  is used to avoid file name conflicts between ncurses
++            and an existing curses installation on the system.  If ncurses  is
++            installed  disabling  overwrite,  it  puts  its  header files in a
+             subdirectory.  Here is an example.
+ 
+                 #include <ncurses/curses.h>
+ 
+-            Installation  also  omits  a  symbolic  link  that would cause the
+-            compiler's -lcurses option  to  link  object  files  with  ncurses
++            Installation also omits a  symbolic  link  that  would  cause  the
++            compiler's  -lcurses  option  to  link  object  files with ncurses
+             instead of the system curses library.
+ 
+-            The  directory  used  by this configuration of ncurses is shown in
++            The directory used by this configuration of ncurses  is  shown  in
+             section "SYNOPSIS" above.
+ 
+        --enable-widec
+-            The  configure  script   renames   the   library   and   (if   the
+-            --disable-overwrite  option  is  used)  puts the header files in a
+-            different subdirectory.  All of  the  library  names  have  a  "w"
++            The   configure   script   renames   the   library   and  (if  the
++            --disable-overwrite option is used) puts the  header  files  in  a
++            different  subdirectory.   All  of  the  library  names have a "w"
+             appended to them, i.e., instead of
+ 
+                 -lncurses
+@@ -1190,65 +1191,67 @@
+ 
+                 -lncursesw
+ 
+-            You  must  also  enable  the wide-character features in the header
+-            file when compiling for the  wide-character  library  to  use  the
+-            extended  (wide-character)  functions.   The  symbol which enables
++            You must also enable the wide-character  features  in  the  header
++            file  when  compiling  for  the  wide-character library to use the
++            extended (wide-character) functions.   The  symbol  which  enables
+             these features has changed since X/Open Curses Issue 4:
+ 
+-            o   Originally, the wide-character  feature  required  the  symbol
++            o   Originally,  the  wide-character  feature  required the symbol
+                 _XOPEN_SOURCE_EXTENDED  but  that  was  only  valid  for  XPG4
+                 (1996).
+ 
+-            o   Later, that was deemed conflicting with _XOPEN_SOURCE  defined
+-                to 500.
++            o   Later, that was deemed conflicting with an _XOPEN_SOURCE value
++                of 500.
+ 
+-            o   As  of  mid-2018,  none of the features in this implementation
+-                require a _XOPEN_SOURCE feature greater  than  600.   However,
++            o   As of mid-2018, none of the features  in  this  implementation
++                require  a  _XOPEN_SOURCE  feature greater than 600.  However,
+                 X/Open Curses Issue 7 (2009) recommends defining it to 700.
+ 
+-            o   Alternatively,   you   can  enable  the  feature  by  defining
+-                NCURSES_WIDECHAR with the caveat that some other  header  file
+-                than  curses.h  may require a specific value for _XOPEN_SOURCE
++            o   Alternatively,  you  can  enable  the  feature   by   defining
++                NCURSES_WIDECHAR  with  the caveat that some header file other
++                than curses.h may require a specific value  for  _XOPEN_SOURCE
+                 (or a system-specific symbol).
+ 
+-            The curses.h header file installed for the wide-character  library
+-            is  designed  to be compatible with the non-wide library's header.
+-            Only the size of the WINDOW structure  differs;  few  applications
+-            require more than pointers to WINDOWs.
++            The  curses.h header file installed for the wide-character library
++            is designed to be compatible with the non-wide  library's  header.
++            Only  the  size  of the WINDOW structure differs; few applications
++            require more than pointers to WINDOW.
+ 
+             If  the  headers  are  installed  allowing  overwrite,  the  wide-
+-            character library's headers should be  installed  last,  to  allow
++            character  library's  headers  should  be installed last, to allow
+             applications to be built using either library from the same set of
+             headers.
+ 
+        --with-pthread
+-            The configure script renames the  library.   All  of  the  library
+-            names  have  a  "t"  appended  to  them  (before  any "w" added by
++            The  configure  script  renames  the  library.  All of the library
++            names have a "t"  appended  to  them  (before  any  "w"  added  by
+             --enable-widec).
+ 
+-            The global variables such as LINES are replaced by macros to allow
+-            read-only access.  At the same time, setter-functions are provided
+-            to set these values.  Some applications  (very  few)  may  require
++            ncursest and ncursestw replace global variables such as LINES with
++            macros allowing read-only access.  At the same time, they  provide
++            functions  to  set  these  values.   Very few applications require
+             changes to work with this convention.
+ 
+        --with-shared
+        --with-normal
+        --with-debug
+        --with-profile
+-            The  shared  and  normal  (static)  library  names differ by their
+-            suffixes, e.g., libncurses.so and  libncurses.a.   The  debug  and
+-            profiling  libraries  add  a  "_g"  and  a  "_p" to the root names
+-            respectively, e.g., libncurses_g.a and libncurses_p.a.
++            The shared and normal  (static)  library  names  differ  by  their
++            suffixes,  e.g.,  libncurses.so  and  libncurses.a.  The debug and
++            profiling libraries add a "_g" and a "_p" to the  roots  of  these
++            respective  names, forming libncurses_g.so and libncurses_p.a, for
++            example.
+ 
+        --with-termlib
+-            Low-level functions which do not depend upon whether  the  library
+-            supports wide-characters, are provided in the tinfo library.
+-
+-            By  doing  this, it is possible to share the tinfo library between
+-            wide/normal configurations as well  as  reduce  the  size  of  the
+-            library when only low-level functions are needed.
++            This option configures ncurses to provide low-level functions that
++            do  not  depend  upon  wide-character  support  in a library names
++            tinfo.
++
++            This arrangement enables tinfo to be shared  between  ncurses  and
++            ncursesw  libraries  as well as application linking and/or loading
++            times when it requires only low-level functions.
+ 
+-            Those functions are described in these pages:
++            The following pages describe low-level curses functions.
+ 
+             o   curs_extend(3x) - miscellaneous curses extensions
+ 
+@@ -1265,10 +1268,10 @@
+             o   curs_util(3x) - miscellaneous curses utility routines
+ 
+        --with-trace
+-            The  trace  function normally resides in the debug library, but it
+-            is sometimes useful to  configure  this  in  the  shared  library.
+-            Configure scripts should check for the function's existence rather
+-            than assuming it is always in the debug library.
++            The trace function normally resides in the debug library,  but  it
++            is  sometimes useful to expose it in the shared or static library.
++            Configuration scripts should check for  the  function's  existence
++            rather than assuming it is confined to the debug library.
+ 
+ 
+ 
                                                                                                                                                                                                    FILES
                                                                                                                                                                                                    +@@ -1280,213 +1283,213 @@
+ 
+ 
+ 
                                                                                                                                                                                                    NOTES
                                                                                                                                                                                                    +-       X/Open Curses permits most functions it specifies to be made  available
++       X/Open  Curses permits most functions it specifies to be made available
+        as macros as well.  ncurses does so
+ 
+        o   for functions that return values via their parameters,
+ 
+        o   to support obsolete features,
+ 
+-       o   to  reuse functions (for example, those that move the cursor before
++       o   to reuse functions (for example, those that move the cursor  before
+            another operation), and
+ 
+        o   in a few special cases.
+ 
+-       If the standard  output  file  descriptor  of  an  ncurses  program  is
+-       redirected  to  something  that  is  not a terminal device, the library
+-       writes screen updates to the standard error file descriptor.  This  was
++       If  the  standard  output  file  descriptor  of  an  ncurses program is
++       redirected to something that is not  a  terminal  device,  the  library
++       writes  screen updates to the standard error file descriptor.  This was
+        an undocumented feature of SVr3 curses.
+ 
+-       See  subsection  "Header  Files"  below  regarding  symbols  exposed by
++       See subsection  "Header  Files"  below  regarding  symbols  exposed  by
+        inclusion of curses.h.
+ 
+ 
+ 
                                                                                                                                                                                                    EXTENSIONS
                                                                                                                                                                                                    +-       ncurses enables an application  to  capture  mouse  events  on  certain
++       ncurses  enables  an  application  to  capture  mouse events on certain
+        terminals, including xterm(1); see curs_mouse(3x).
+ 
+-       ncurses  provides  a  means of responding to window resizing events, as
+-       when running in a GUI terminal emulator application such as xterm;  see
++       ncurses provides a means of responding to window  resizing  events,  as
++       when  running in a GUI terminal emulator application such as xterm; see
+        resizeterm(3x) and wresize(3x).
+ 
+        ncurses allows an application to query the terminal for the presence of
+        a wide variety of special keys; see has_key(3x).
+ 
+        ncurses extends the fixed set of function key capabilities specified by
+-       X/Open   Curses  by  allowing  the  application  programmer  to  define
+-       additional key events at runtime; see define_key(3x),  key_defined(3x),
++       X/Open  Curses  by  allowing  the  application  programmer  to   define
++       additional  key events at runtime; see define_key(3x), key_defined(3x),
+        keybound(3x), and keyok(3x).
+ 
+-       ncurses   can   exploit  the  capabilities  of  terminals  implementing
+-       ISO 6429/ECMA-48  SGR 39  and  SGR 49   sequences,   which   allow   an
+-       application  to  reset  the  terminal  to  its  original foreground and
+-       background colors.  From a user's perspective, the application is  able
+-       to  draw colored text on a background whose color is set independently,
++       ncurses  can  exploit  the  capabilities  of   terminals   implementing
++       ISO 6429/ECMA-48   SGR 39   and   SGR 49   sequences,  which  allow  an
++       application to reset  the  terminal  to  its  original  foreground  and
++       background  colors.  From a user's perspective, the application is able
++       to draw colored text on a background whose color is set  independently,
+        providing better control over color contrasts.  See default_colors(3x).
+ 
+-       An ncurses application  can  eschew  knowledge  of  SCREEN  and  WINDOW
+-       structure   internals,   instead   using  accessor  functions  such  as
++       An  ncurses  application  can  eschew  knowledge  of  SCREEN and WINDOW
++       structure  internals,  instead  using  accessor   functions   such   as
+        is_cbreak(3x) and is_scrollok(3x).
+ 
+-       ncurses enables an application  to  direct  its  output  to  a  printer
++       ncurses  enables  an  application  to  direct  its  output to a printer
+        attached to the terminal device; see curs_print(3x).
+ 
+-       ncurses  offers slk_attr(3x) as a counterpart of attr_get(3x) for soft-
+-       label key lines, and extended_slk_color(3x) as a form of  slk_color(3x)
+-       that  can  gather  color  information  from  them  when many colors are
++       ncurses offers slk_attr(3x) as a counterpart of attr_get(3x) for  soft-
++       label  key lines, and extended_slk_color(3x) as a form of slk_color(3x)
++       that can gather color  information  from  them  when  many  colors  are
+        supported.
+ 
+-       ncurses   permits   modification   of   unctrl(3x)'s   behavior;    see
++       ncurses    permits   modification   of   unctrl(3x)'s   behavior;   see
+        use_legacy_coding(3x).
+ 
+-       Rudimentary  support  for multi-threaded applications may be available;
++       Rudimentary support for multi-threaded applications may  be  available;
+        see curs_threads(3x).
+ 
+-       Functions that ease the management of multiple screens can be  exposed;
++       Functions  that ease the management of multiple screens can be exposed;
+        see curs_sp_funcs(3x).
+ 
+-       To  aid  applications  to  debug their memory usage, ncurses optionally
+-       offers functions  to  more  aggressively  free  memory  it  dynamically
++       To aid applications to debug their  memory  usage,  ncurses  optionally
++       offers  functions  to  more  aggressively  free  memory  it dynamically
+        allocates itself; see curs_memleaks(3x).
+ 
+-       The  library  facilitates auditing and troubleshooting of its behavior;
++       The library facilitates auditing and troubleshooting of  its  behavior;
+        see curs_trace(3x).
+ 
+-       Compiling ncurses with the option -DUSE_GETCAP causes it to  fall  back
+-       to  reading /etc/termcap if the terminal setup code cannot find a term-
++       Compiling  ncurses  with the option -DUSE_GETCAP causes it to fall back
++       to reading /etc/termcap if the terminal setup code cannot find a  term-
+        info  entry  corresponding  to  TERM.   Use  of  this  feature  is  not
+-       recommended,  as  it essentially includes an entire termcap compiler in
+-       the ncurses startup code, at a cost in  memory  usage  and  application
++       recommended, as it essentially includes an entire termcap  compiler  in
++       the  ncurses  startup  code,  at a cost in memory usage and application
+        launch latency.
+ 
+-       PDCurses   and  NetBSD  curses  incorporate  some  ncurses  extensions.
++       PDCurses  and  NetBSD  curses  incorporate  some  ncurses   extensions.
+        Individual man pages indicate where this is the case.
+ 
+ 
+ 
                                                                                                                                                                                                    PORTABILITY
                                                                                                                                                                                                    +        X/Open Curses defines two levels of conformance, "base" and "enhanced".
+        The latter includes several additional features, such as wide-character
+-       and color support.  ncurses intends base-level conformance with  X/Open
+-       Curses,  and  supports  all  features  of its enhanced level except the
++       and  color support.  ncurses intends base-level conformance with X/Open
++       Curses, and supports all features of  its  enhanced  level  except  the
+        untic utility.
+ 
+-       Differences between X/Open Curses and ncurses  are  documented  in  the
++       Differences  between  X/Open  Curses  and ncurses are documented in the
+        "PORTABILITY" sections of applicable man pages.
+ 
+ 
+ 
                                                                                                                                                                                                    Error Checking
                                                                                                                                                                                                    +-       In  many cases, X/Open Curses is vague about error conditions, omitting
++       In many cases, X/Open Curses is vague about error conditions,  omitting
+        some of the SVr4 documentation.
+ 
+-       Unlike other implementations, ncurses checks pointer  parameters,  such
+-       as  those to WINDOW structures, to ensure that they are not null.  This
+-       is done primarily to guard  against  programmer  error.   The  standard
++       Unlike  other  implementations, ncurses checks pointer parameters, such
++       as those to WINDOW structures, to ensure that they are not null.   This
++       is  done  primarily  to  guard  against programmer error.  The standard
+        interface does not provide a way for the library to tell an application
+-       which of several possible errors occurred.  An application that  relies
+-       on  ncurses  to  check  its function parameters for validity limits its
++       which  of several possible errors occurred.  An application that relies
++       on ncurses to check its function parameters  for  validity  limits  its
+        portability and robustness.
+ 
+ 
+ 
                                                                                                                                                                                                    Padding Differences
                                                                                                                                                                                                    +-       In historical curses implementations, delays embedded in  the  terminfo
+-       capabilities  carriage_return  (cr),  scroll_forward (ind), cursor_left
++       In  historical  curses implementations, delays embedded in the terminfo
++       capabilities carriage_return (cr),  scroll_forward  (ind),  cursor_left
+        (cub1), form_feed (ff), and tab (ht) activated corresponding delay bits
+-       in  the  Unix terminal driver.  ncurses performs all padding by sending
+-       NUL bytes to the device.  This method is slightly more  expensive,  but
+-       narrows   the   interface   to   the   Unix  kernel  significantly  and
++       in the Unix terminal driver.  ncurses performs all padding  by  sending
++       NUL  bytes  to the device.  This method is slightly more expensive, but
++       narrows  the  interface  to   the   Unix   kernel   significantly   and
+        correspondingly increases the package's portability.
+ 
+ 
+ 
                                                                                                                                                                                                    Header Files
                                                                                                                                                                                                    +-       The header file curses.h itself includes the header files  stdio.h  and
++       The  header  file curses.h itself includes the header files stdio.h and
+        unctrl.h.
+ 
+        X/Open Curses has more to say,
+ 
+-           The  inclusion  of  curses.h  may make visible all symbols from the
++           The inclusion of curses.h may make visible  all  symbols  from  the
+            headers stdio.h, term.h, termios.h, and wchar.h.
+ 
+        but does not finish the story.  A more complete account follows.
+ 
+        o   The first curses, in 4BSD, provided a curses.h file.
+ 
+-           BSD curses code included curses.h and  unctrl.h  from  an  internal
++           BSD  curses  code  included  curses.h and unctrl.h from an internal
+            header file curses.ext, where "ext" abbreviated "externs".
+ 
+-           The  implementations of printw and scanw used undocumented internal
+-           functions of the standard I/O library (_doprnt  and  _doscan),  but
++           The implementations of printw and scanw used undocumented  internal
++           functions  of  the  standard I/O library (_doprnt and _doscan), but
+            nothing in curses.h itself relied upon stdio.h.
+ 
+-       o   SVr2  curses  added  newterm, which relies upon stdio.h because its
++       o   SVr2 curses added newterm, which relies upon  stdio.h  because  its
+            function prototype employs the FILE type.
+ 
+            SVr4 curses added putwin and getwin, which also use stdio.h.
+ 
+            X/Open Curses specifies all three of these functions.
+ 
+-           SVr4 curses and X/Open Curses  do  not  require  the  developer  to
+-           include  stdio.h  before  curses.h.  Both document use of curses as
++           SVr4  curses  and  X/Open  Curses  do  not require the developer to
++           include stdio.h before curses.h.  Both document use  of  curses  as
+            requiring only curses.h.
+ 
+            As a result, standard curses.h always includes stdio.h.
+ 
+-       o   X/Open Curses and SVr4 curses  are  inconsistent  with  respect  to
++       o   X/Open  Curses  and  SVr4  curses  are inconsistent with respect to
+            unctrl.h.
+ 
+-           As  noted in curs_util(3x), ncurses includes unctrl.h from curses.h
++           As noted in curs_util(3x), ncurses includes unctrl.h from  curses.h
+            (as SVr4 does).
+ 
+-       o   X/Open Curses's comments about term.h and termios.h  may  refer  to
++       o   X/Open  Curses's  comments  about term.h and termios.h may refer to
+            HP-UX and AIX.
+ 
+-           HP-UX  curses includes term.h from curses.h to declare setupterm in
++           HP-UX curses includes term.h from curses.h to declare setupterm  in
+            curses.h, but ncurses and Solaris curses do not.
+ 
+-           AIX curses includes  term.h  and  termios.h.   Again,  ncurses  and
++           AIX  curses  includes  term.h  and  termios.h.   Again, ncurses and
+            Solaris curses do not.
+ 
+-       o   X/Open  Curses  says that curses.h may include term.h, but does not
++       o   X/Open Curses says that curses.h may include term.h, but  does  not
+            require it to do so.
+ 
+-           Some programs use functions declared in both curses.h  and  term.h,
+-           and  must  include  both header files in the same module.  Very old
+-           versions of  AIX  curses  required  inclusion  of  curses.h  before
++           Some  programs  use functions declared in both curses.h and term.h,
++           and must include both header files in the same  module.   Very  old
++           versions  of  AIX  curses  required  inclusion  of  curses.h before
+            term.h.
+ 
+-           The  header  files supplied by ncurses include the standard library
+-           headers required for its  declarations,  so  ncurses's  own  header
+-           files  can  be  included in any order.  For portability even to old
++           The header files supplied by ncurses include the  standard  library
++           headers  required  for  its  declarations,  so ncurses's own header
++           files can be included in any order.  For portability  even  to  old
+            AIX systems, include curses.h before term.h.
+ 
+-       o   X/Open Curses says "may make visible" because  including  a  header
+-           file  does  not  necessarily  make visible all of the symbols in it
++       o   X/Open  Curses  says  "may make visible" because including a header
++           file does not necessarily make visible all of  the  symbols  in  it
+            (consider #ifdef and similar).
+ 
+-           For instance, ncurses's curses.h may include wchar.h if the  proper
+-           symbol  is defined, and if ncurses is configured for wide-character
+-           support.  If wchar.h is included, its symbols may be  made  visible
++           For  instance, ncurses's curses.h may include wchar.h if the proper
++           symbol is defined, and if ncurses is configured for  wide-character
++           support.   If  wchar.h is included, its symbols may be made visible
+            depending on the value of the _XOPEN_SOURCE feature test macro.
+ 
+        o   X/Open Curses mandates an application's inclusion of one standard C
+-           library header in a  special  case:  stdarg.h  before  curses.h  to
+-           prototype  the  functions  vw_printw  and  vw_scanw (as well as the
+-           obsolete vwprintw and vwscanw).  Each of  these  takes  a  variadic
++           library  header  in  a  special  case:  stdarg.h before curses.h to
++           prototype the functions vw_printw and  vw_scanw  (as  well  as  the
++           obsolete  vwprintw  and  vwscanw).   Each of these takes a variadic
+            argument list, a va_list parameter, like that of printf(3).
+ 
+-           SVr3  curses  introduced  the  two  obsolete  functions, and X/Open
+-           Curses the others.   In  between,  SVr4  curses  provided  for  the
+-           possibility  that  an application might include either varargs.h or
+-           stdarg.h.  These represented  contrasting  approaches  to  handling
+-           variadic  argument  lists.   The older interface, varargs.h, used a
+-           pointer to char for variadic functions' va_list parameter.   Later,
+-           the  list  acquired its own standard data type, va_list, defined in
+-           stdarg.h, empowering the compiler to check the types of a  function
+-           call's  actual  parameters  against the formal ones declared in its
++           SVr3 curses introduced  the  two  obsolete  functions,  and  X/Open
++           Curses  the  others.   In  between,  SVr4  curses  provided for the
++           possibility that an application might include either  varargs.h  or
++           stdarg.h.   These  represented  contrasting  approaches to handling
++           variadic argument lists.  The older interface,  varargs.h,  used  a
++           pointer  to char for variadic functions' va_list parameter.  Later,
++           the list acquired its own standard data type, va_list,  defined  in
++           stdarg.h,  empowering the compiler to check the types of a function
++           call's actual parameters against the formal ones  declared  in  its
+            prototype.
+ 
+-           No  conforming  implementations  of  X/Open   Curses   require   an
++           No   conforming   implementations   of  X/Open  Curses  require  an
+            application to include stdarg.h before curses.h because they either
+-           have allowed for a special type, or,  like  ncurses,  they  include
++           have  allowed  for  a  special type, or, like ncurses, they include
+            stdarg.h themselves to provide a portable interface.
+ 
+ 
+@@ -1500,7 +1503,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-01                       ncurses(3x)
++ncurses 6.5                       2025-04-05                       ncurses(3x)
+ 
                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                    
+ 
                                                                                                                                                                                                      
+Index: doc/html/man/resizeterm.3x.html
+--- ncurses-6.5-20250329+/doc/html/man/resizeterm.3x.html	2025-03-15 22:08:54.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/resizeterm.3x.html	2025-04-05 22:33:06.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-resizeterm 3x 2025-03-15 ncurses 6.5 Library calls
++resizeterm 3x 2025-04-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                      resizeterm 3x 2025-03-15 ncurses 6.5 Library calls
                                                                                                                                                                                                      
++
                                                                                                                                                                                                      resizeterm 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                      + resizeterm(3x)                   Library calls                  resizeterm(3x)
+ 
+@@ -94,8 +94,6 @@
+        proper layout will rely upon the application.
+ 
+ 
+-
                                                                                                                                                                                                      FUNCTIONS
                                                                                                                                                                                                      +-
+ 
                                                                                                                                                                                                      resizeterm
                                                                                                                                                                                                      +        The function resizeterm resizes the standard and current windows (i.e.,
+        stdscr  and  curscr)  to  the  specified  dimensions, and adjusts other
+@@ -192,14 +190,13 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-15                    resizeterm(3x)
++ncurses 6.5                       2025-04-05                    resizeterm(3x)
+ 
                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                      
+ 
                                                                                                                                                                                                        
+ 
                                                                                                                                                                                                      • NAME
                                                                                                                                                                                                        • 
+ 
                                                                                                                                                                                                      • SYNOPSIS
                                                                                                                                                                                                        • 
+-
                                                                                                                                                                                                      • DESCRIPTION
                                                                                                                                                                                                        • 
+-
                                                                                                                                                                                                      • FUNCTIONS
++
                                                                                                                                                                                                      • DESCRIPTION
+ 
                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                        • resizeterm
                                                                                                                                                                                                          • 
+ 
                                                                                                                                                                                                        • resize_term
                                                                                                                                                                                                          • 
+Index: doc/html/man/scr_dump.5.html
+--- ncurses-6.5-20250329+/doc/html/man/scr_dump.5.html	2025-01-19 00:55:01.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/scr_dump.5.html	2025-04-05 22:33:06.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: scr_dump.5,v 1.50 2025/01/19 00:51:10 tom Exp @
++  * @Id: scr_dump.5,v 1.52 2025/04/05 21:56:26 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-scr_dump 5 2025-01-18 ncurses 6.5 File formats
++scr_dump 5 2025-04-05 ncurses 6.5 File formats
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                          scr_dump 5 2025-01-18 ncurses 6.5 File formats
                                                                                                                                                                                                          
++
                                                                                                                                                                                                          scr_dump 5 2025-04-05 ncurses 6.5 File formats
                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                          + scr_dump(5)                      File formats                      scr_dump(5)
+ 
+@@ -390,7 +390,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                       scr_dump(5)
++ncurses 6.5                       2025-04-05                       scr_dump(5)
+ 
                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                          
+ 
                                                                                                                                                                                                            
+Index: doc/html/man/tabs.1.html
+--- ncurses-6.5-20250329+/doc/html/man/tabs.1.html	2025-02-15 15:07:49.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/tabs.1.html	2025-04-05 22:33:06.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tabs.1,v 1.70 2025/02/15 14:55:00 tom Exp @
++  * @Id: tabs.1,v 1.72 2025/04/05 21:56:26 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-tabs 1 2025-02-15 ncurses 6.5 User commands
++tabs 1 2025-04-05 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                            tabs 1 2025-02-15 ncurses 6.5 User commands
                                                                                                                                                                                                            
++
                                                                                                                                                                                                            tabs 1 2025-04-05 ncurses 6.5 User commands
                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                            + tabs(1)                          User commands                         tabs(1)
+ 
+@@ -257,7 +257,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-02-15                           tabs(1)
++ncurses 6.5                       2025-04-05                           tabs(1)
+ 
                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                            
+ 
                                                                                                                                                                                                              
+Index: doc/html/man/term.5.html
+--- ncurses-6.5-20250329+/doc/html/man/term.5.html	2024-06-15 20:39:31.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/term.5.html	2025-04-05 22:33:06.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-term 5 2024-06-15 ncurses 6.5 File formats
++term 5 2025-04-05 ncurses 6.5 File formats
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                                              term 5 2024-06-15 ncurses 6.5 File formats
                                                                                                                                                                                                              
++
                                                                                                                                                                                                              term 5 2025-04-05 ncurses 6.5 File formats
                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                              + term(5)                          File formats                          term(5)
+ 
+@@ -397,7 +397,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-15                           term(5)
++ncurses 6.5                       2025-04-05                           term(5)
+ 
                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                              
+ 
                                                                                                                                                                                                                
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.5-20250329+/doc/html/man/terminfo.5.html	2025-03-22 22:52:53.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/terminfo.5.html	2025-04-05 22:33:07.000000000 +0000
+@@ -71,7 +71,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This document describes ncurses version 6.5 (patch 20250322).
++       This document describes ncurses version 6.5 (patch 20250405).
+ 
+ 
+ 
                                                                                                                                                    terminfo Entry Syntax
                                                                                                                                                    +Index: doc/html/man/tput.1.html
+--- ncurses-6.5-20250329+/doc/html/man/tput.1.html	2025-03-01 22:03:53.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/tput.1.html	2025-04-05 22:33:07.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tput.1,v 1.135 2025/03/01 21:45:34 tom Exp @
++  * @Id: tput.1,v 1.137 2025/04/05 21:56:26 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-tput 1 2025-03-01 ncurses 6.5 User commands
++tput 1 2025-04-05 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                    tput 1 2025-03-01 ncurses 6.5 User commands
                                                                                                                                                    
++
                                                                                                                                                    tput 1 2025-04-05 ncurses 6.5 User commands
                                                                                                                                                    
+ 
                                                                                                                                                    + tput(1)                          User commands                         tput(1)
+ 
+@@ -562,7 +562,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-01                           tput(1)
++ncurses 6.5                       2025-04-05                           tput(1)
+ 
                                                                                                                                                    
+ 
                                                                                                                                                    
+ 
                                                                                                                                                      
+Index: doc/html/man/user_caps.5.html
+--- ncurses-6.5-20250329+/doc/html/man/user_caps.5.html	2025-03-22 22:52:53.000000000 +0000
++++ ncurses-6.5-20250405/doc/html/man/user_caps.5.html	2025-04-06 00:21:39.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-user_caps 5 2025-03-22 ncurses 6.5 File formats
++user_caps 5 2025-04-05 ncurses 6.5 File formats
+ 
+ 
+ 
+Index: man/MKada_config.in
+Prereq:  1.35 
+--- ncurses-6.5-20250329+/man/MKada_config.in	2024-04-20 21:13:27.000000000 +0000
++++ ncurses-6.5-20250405/man/MKada_config.in	2025-04-05 22:26:08.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2019-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2010-2014,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: MKada_config.in,v 1.35 2024/04/20 21:13:27 tom Exp $
+-.TH adacurses@USE_CFG_SUFFIX@\-config 1 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: MKada_config.in,v 1.37 2025/04/05 22:26:08 tom Exp $
++.TH adacurses@USE_CFG_SUFFIX@\-config 1 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ds C adacurses@USE_CFG_SUFFIX@\-config
+ .ie \n(.g \{\
+ .ds `` \(lq
+@@ -97,6 +97,7 @@
+ .PP
+ .if \n(LL>67n .RS 4
+ .EX
++.nf
+ with Terminal_Interface.Curses; use Terminal_Interface.Curses;
+ 
+ procedure Hello is
+@@ -127,6 +128,7 @@
+ 
+    End_Windows;
+ end Hello;
++.fi
+ .EE
+ .if \n(LL>67n .RE
+ .ne 2
+Index: man/clear.1
+Prereq:  1.51 
+--- ncurses-6.5-20250329+/man/clear.1	2025-01-19 00:49:39.000000000 +0000
++++ ncurses-6.5-20250405/man/clear.1	2025-04-05 21:56:26.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: clear.1,v 1.51 2025/01/19 00:49:39 tom Exp $
+-.TH @CLEAR@ 1 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: clear.1,v 1.53 2025/04/05 21:56:26 tom Exp $
++.TH @CLEAR@ 1 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -113,8 +113,10 @@
+ .PP
+ .RS 4
+ .EX
++.nf
+ /usr/bin/tput ${1:+\-T$1} clear 2> /dev/null
+ exit
++.fi
+ .EE
+ .RE
+ .PP
+Index: man/curs_add_wch.3x
+Prereq:  1.112 
+--- ncurses-6.5-20250329+/man/curs_add_wch.3x	2025-03-15 20:38:41.000000000 +0000
++++ ncurses-6.5-20250405/man/curs_add_wch.3x	2025-04-05 21:58:37.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_add_wch.3x,v 1.112 2025/03/15 20:38:41 tom Exp $
+-.TH curs_add_wch 3X 2025-03-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_add_wch.3x,v 1.114 2025/04/05 21:58:37 tom Exp $
++.TH curs_add_wch 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -199,8 +199,8 @@
+ when advancement occurs at the right margin,
+ and \fB\%scrollok\fP(3X) is enabled for
+ .IR win ,
+-the cursor wraps as above and
+-the scrolling region scrolls up one line.
++the scrolling region scrolls up one line
++and the cursor wraps as above.
+ Otherwise,
+ advancement and scrolling do not occur,
+ and
+Index: man/curs_addch.3x
+Prereq:  1.132 
+--- ncurses-6.5-20250329+/man/curs_addch.3x	2025-03-15 20:40:50.000000000 +0000
++++ ncurses-6.5-20250405/man/curs_addch.3x	2025-04-05 21:58:37.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addch.3x,v 1.132 2025/03/15 20:40:50 tom Exp $
+-.TH curs_addch 3X 2025-03-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addch.3x,v 1.135 2025/04/05 21:58:37 tom Exp $
++.TH curs_addch 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -157,8 +157,8 @@
+ when advancement occurs at the right margin,
+ and \fB\%scrollok\fP(3X) is enabled for
+ .IR win ,
+-the cursor wraps as above and
+-the scrolling region scrolls up one line.
++the scrolling region scrolls up one line
++and the cursor wraps as above.
+ Otherwise,
+ advancement and scrolling do not occur,
+ and
+@@ -467,7 +467,8 @@
+ .bP
+ the
+ .I \%ncurses
+-ABI\(emfor example,
++ABI \(em
++for example,
+ wide-character versus non-wide-character configurations
+ (the former is capable of displaying Unicode while the latter is not),
+ and
+@@ -525,9 +526,9 @@
+ .I \%ncurses
+ displays the character and advances the cursor.
+ If the calling application interrupts the succession of bytes in
+-a multibyte character sequence by changing the current location\(emfor
+-example,
+-with \fB\%wmove\fP(3X)\(em\c
++a multibyte character sequence by changing the current location \(em
++for example,
++with \fB\%wmove\fP(3X) \(em
+ .I \%ncurses
+ discards the incomplete character.
+ .PP
+Index: man/curs_attr.3x
+Prereq:  1.136 
+--- ncurses-6.5-20250329+/man/curs_attr.3x	2025-02-15 19:35:37.000000000 +0000
++++ ncurses-6.5-20250405/man/curs_attr.3x	2025-04-05 21:56:26.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_attr.3x,v 1.136 2025/02/15 19:35:37 tom Exp $
+-.TH curs_attr 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_attr.3x,v 1.138 2025/04/05 21:56:26 tom Exp $
++.TH curs_attr 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -174,8 +174,10 @@
+ .PP
+ .RS 4
+ .EX
++.nf
+ attrset(A_BOLD | COLOR_PAIR(\fIpair\fP));
+ attr_set(A_BOLD, \fIpair\fP, NULL);
++.fi
+ .EE
+ .RE
+ .PP
+@@ -197,8 +199,10 @@
+ .PP
+ .RS 4
+ .EX
++.nf
+ int value = A_BOLD | COLOR_PAIR(\fIinput\fP);
+ int \fIoutput\fP = PAIR_NUMBER(value);
++.fi
+ .EE
+ .RE
+ .PP
+Index: man/curs_color.3x
+Prereq:  1.116 
+--- ncurses-6.5-20250329+/man/curs_color.3x	2025-03-01 21:17:37.000000000 +0000
++++ ncurses-6.5-20250405/man/curs_color.3x	2025-04-05 21:59:03.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_color.3x,v 1.116 2025/03/01 21:17:37 tom Exp $
+-.TH curs_color 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_color.3x,v 1.118 2025/04/05 21:59:03 tom Exp $
++.TH curs_color 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -193,28 +193,36 @@
+ Consequently those calls use only the window attribute or
+ the background character.
+ .SH CONSTANTS
+-In \fB\%\fP the following macros are defined.
+-These are the standard colors (ISO-6429).
+-\fIcurses\fP also assumes that \fB\%COLOR_BLACK\fP is the default
+-background color for all terminals.
+-.PP
+-.nf
+-      \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.
+-There are no standard names for those additional colors.
++ISO\ 6429 and ECMA-48
++define eight standard colors
++(also known as \*(``ANSI\*('' colors).
++.I curses\.h
++defines object-like macros
++.BR \%COLOR_BLACK ","
++.BR \%COLOR_RED ","
++.BR \%COLOR_GREEN ","
++.BR \%COLOR_YELLOW ","
++.BR \%COLOR_BLUE ","
++.BR \%COLOR_MAGENTA ","
++.BR \%COLOR_CYAN ","
++and
++.B \%COLOR_WHITE
++accordingly.
++.I curses
++assumes that
++.B \%COLOR_BLACK
++is the default background color for all terminals.
++.I \%ncurses
++offers an extension to override that assumption;
++see \fB\%assume_default_colors\fP(3X).
++Some terminals support additional colors that lack standard names.
+ .PP
+ .B \%A_COLOR
+-is a bit mask that extracts a color pair identifier from a
+-.IR \%chtype "."
++is a bit mask that,
++when bitwise \*(``and\*(''-ed with a
++.IR \%chtype ","
++.\" XXX: and right-shifted by...?
++extracts its color pair identifier.
+ .SH VARIABLES
+ .SS COLORS
+ is initialized by \fB\%start_color\fP to the maximum number of colors
+Index: man/curs_delch.3x
+Prereq:  1.47 
+--- ncurses-6.5-20250329+/man/curs_delch.3x	2025-01-19 00:49:39.000000000 +0000
++++ ncurses-6.5-20250405/man/curs_delch.3x	2025-04-05 21:59:53.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_delch.3x,v 1.47 2025/01/19 00:49:39 tom Exp $
+-.TH curs_delch 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_delch.3x,v 1.49 2025/04/05 21:59:53 tom Exp $
++.TH curs_delch 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -39,6 +39,11 @@
+ .ie t .ds '' ''
+ .el   .ds '' ""
+ .\}
++.
++.de bP
++.ie n  .IP \(bu 4
++.el    .IP \(bu 2
++..
+ .SH NAME
+ \fB\%delch\fP,
+ \fB\%wdelch\fP,
+@@ -78,12 +83,18 @@
+ .PP
+ In
+ .IR \%ncurses ,
+-they return
+-.B ERR
+-if
++these functions fail if
++.bP
++the
++.I curses
++screen has not been initialized,
++or
++.bP
++(for functions taking a
++.I \%WINDOW
++pointer argument)
+ .I win
+-is
+-.IR NULL "."
++is a null pointer.
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+Index: man/curs_deleteln.3x
+Prereq:  1.51 
+--- ncurses-6.5-20250329+/man/curs_deleteln.3x	2025-02-01 22:49:56.000000000 +0000
++++ ncurses-6.5-20250405/man/curs_deleteln.3x	2025-04-05 22:00:17.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_deleteln.3x,v 1.51 2025/02/01 22:49:56 tom Exp $
+-.TH curs_deleteln 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_deleteln.3x,v 1.53 2025/04/05 22:00:17 tom Exp $
++.TH curs_deleteln 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -96,8 +96,6 @@
+ .B \%winsertln
+ or
+ .BR \%wdeleteln "."
+-.PP
+-\fB\%ncurses\fP(3X) describes the variants of these functions.
+ .SH RETURN VALUE
+ These functions return
+ .B OK
+Index: man/curs_extend.3x
+Prereq:  1.54 
+--- ncurses-6.5-20250329+/man/curs_extend.3x	2025-01-19 00:49:39.000000000 +0000
++++ ncurses-6.5-20250405/man/curs_extend.3x	2025-04-05 22:01:03.000000000 +0000
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1999-on
+ .\"
+-.\" $Id: curs_extend.3x,v 1.54 2025/01/19 00:49:39 tom Exp $
+-.TH curs_extend 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_extend.3x,v 1.56 2025/04/05 22:01:03 tom Exp $
++.TH curs_extend 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -77,8 +77,8 @@
+ is made through use of \fB\%@TIC@\fP(1)'s
+ .B \-x
+ option to include such extensions in terminal type descriptions.
+-.B \%use_extended_names
+-can prevent
++.B \%use_extended_names(FALSE)
++prevents
+ .I \%ncurses
+ from recognizing these capabilities
+ to ensure compatibility with other implementations of
+Index: man/curs_get_wch.3x
+Prereq:  1.66 
+--- ncurses-6.5-20250329+/man/curs_get_wch.3x	2025-02-15 19:35:48.000000000 +0000
++++ ncurses-6.5-20250405/man/curs_get_wch.3x	2025-04-05 22:03:24.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_get_wch.3x,v 1.66 2025/02/15 19:35:48 tom Exp $
+-.TH curs_get_wch 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_get_wch.3x,v 1.69 2025/04/05 22:03:24 tom Exp $
++.TH curs_get_wch 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -181,8 +181,23 @@
+ on failure.
+ .B \%wget_wch
+ fails if
+-.bP
+ its timeout expires without any data arriving,
++which cannot happen if \fB\%nodelay\fP(3X) is in effect on the window.
++.PP
++In
++.IR \%ncurses ,
++.B \%wget_wch
++also fails if
++.bP
++the
++.I curses
++screen has not been initialized,
++.bP
++(for functions taking a
++.I \%WINDOW
++pointer argument)
++.I win
++is a null pointer,
+ or
+ .bP
+ execution was interrupted by a signal,
+@@ -191,12 +206,6 @@
+ is set to
+ .IR \%EINTR "."
+ .PP
+-Functions taking a
+-.I \%WINDOW
+-pointer argument fail if
+-.I win
+-is a null pointer.
+-.PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+ .RI ( y ,
+@@ -208,7 +217,18 @@
+ .B OK
+ on success and
+ .B ERR
+-if there is no more room in the input queue.
++on failure.
++In
++.IR \%ncurses ,
++.B \%unget_wch
++fails if
++.bP
++the
++.I curses
++screen has not been initialized,
++or
++.bP
++there is no more room in the input queue.
+ .SH NOTES
+ See the \*(``NOTES\*('' section of \fB\%wgetch\fP(3X).
+ .PP
+@@ -220,7 +240,7 @@
+ .PP
+ Unlike \fB\%wgetch\fP(3X),
+ .B \%wget_wch
+-and its variants store the value of the input character in an additional
++stores the value of the input character in an additional
+ .I wch
+ parameter instead of the return value.
+ .PP
+Index: man/curs_get_wstr.3x
+Prereq:  1.70 
+--- ncurses-6.5-20250329+/man/curs_get_wstr.3x	2025-02-15 14:55:47.000000000 +0000
++++ ncurses-6.5-20250405/man/curs_get_wstr.3x	2025-04-05 22:36:46.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_get_wstr.3x,v 1.70 2025/02/15 14:55:47 tom Exp $
+-.TH curs_get_wstr 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_get_wstr.3x,v 1.75 2025/04/05 22:36:46 tom Exp $
++.TH curs_get_wstr 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -97,7 +97,7 @@
+ (after any
+ .IR WEOF );
+ .bP
+-interprets the screen's erase and kill characters
++interprets the screen's wide erase and wide kill characters
+ (see \fB\%erasewchar\fP(3X) and \fB\%killwchar\fP(3X));
+ .bP
+ recognizes function keys only if the screen's keypad option is enabled
+@@ -107,16 +107,16 @@
+ .B \%KEY_LEFT
+ and
+ .B \%KEY_BACKSPACE
+-the same as the erase character;
++the same as the wide erase character;
+ and
+ .bP
+-discards function key inputs other than those treated as the erase
+-character,
++discards function key inputs other than those
++treated as the wide erase or wide kill characters,
+ calling \fBbeep\fP(3X).
+ .PP
+-The erase character replaces the character at the end of the buffer with
+-a null wide character,
+-while the kill character does the same for the entire buffer.
++The wide erase character replaces the character at the end of the buffer
++with a null wide character,
++while the wide kill character does the same for the entire buffer.
+ .PP
+ If the screen's echo option is enabled
+ (see \fBecho\fP(3X)),
+@@ -126,12 +126,12 @@
+ with \fB\%wadd_wch\fP(3X).
+ Further,
+ .bP
+-the erase character
++the wide erase character
+ and its function key synonyms
+ move the cursor to the left,
+ and
+ .bP
+-the kill character returns the cursor to where it was located when
++the wide kill character returns the cursor to where it was located when
+ .B \%wget_wstr
+ was called.
+ .PP
+@@ -143,11 +143,12 @@
+ aiding the application to avoid overrunning the buffer to which
+ .I wstr
+ points.
+-An attempt to input more than
++.I curses
++ignores an attempt to input more than
+ .I n
+ wide characters
+-(other than the terminating line feed or carriage return)
+-is ignored with a beep.
++(other than the terminating line feed or carriage return),
++calling \fBbeep\fP(3X).
+ If
+ .I n
+ is negative,
+@@ -168,16 +169,23 @@
+ .PP
+ In
+ .IR \%ncurses ","
+-they return
+-.B ERR
+-if
++these functions fail if
+ .bP
++the
++.I curses
++screen has not been initialized,
++.bP
++(for functions taking a
++.I \%WINDOW
++pointer argument)
+ .I win
+-is
+-.IR NULL ","
++is a null pointer,
++.bP
++.I str
++is a null pointer,
+ or
+ .bP
+-if an internal \fB\%wget_wch\fP(3X) call fails.
++an internal \fB\%wget_wch\fP(3X) call fails.
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+ fail if the position
+Index: man/curs_getch.3x
+Prereq:  1.121 
+--- ncurses-6.5-20250329+/man/curs_getch.3x	2025-03-15 22:04:20.000000000 +0000
++++ ncurses-6.5-20250405/man/curs_getch.3x	2025-04-05 22:04:30.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getch.3x,v 1.121 2025/03/15 22:04:20 tom Exp $
+-.TH curs_getch 3X 2025-03-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_getch.3x,v 1.127 2025/04/05 22:04:30 tom Exp $
++.TH curs_getch 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -163,13 +163,16 @@
+ .B \%wgetch
+ returns the character code for line feed instead.
+ .SS "Keypad Mode"
+-To
+-.IR curses ","
+-key strokes not from the alphabetic section of the keyboard
+-(those corresponding to the ECMA-6 character set\(emsee
+-\fI\%ascii\fP(7)\(emoptionally modified by either the control or shift
+-keys)
+-are treated as
++Call \fB\%keypad\fP(3X) on a window to configure keypad mode
++when reading input from it.
++In
++.IR "keypad mode" ","
++.I curses
++treats key strokes not from the alphabetic section of the keyboard
++(those corresponding to the ECMA-6 character set \(em
++see \fI\%ascii\fP(7) \(em
++optionally modified by either the control or shift keys)
++as
+ .I function
+ keys.
+ (In
+@@ -178,14 +181,16 @@
+ engraved with \*(``F1\*('',
+ \*(``PF1\*('',
+ and so on.)
+-If the window is in keypad mode,
+-these produce a numeric code corresponding to the
++If a window is in keypad mode,
++.B \%wgetch
++translates these key strokes to a numeric code corresponding to the
+ .B KEY_
+-symbols listed in subsection \*(``Predefined Key Codes\*('' below;
+-otherwise,
+-they transmit a sequence of codes typically starting with the escape
+-character,
+-and which must be collected with multiple
++symbols listed in subsection \*(``Predefined Key Codes\*('' below.
++If a window is not in keypad mode,
++.B \%wgetch
++returns a sequence of codes
++typically starting with the escape character,
++which the application must collect individually with multiple
+ .B \%wgetch
+ calls.
+ .bP
+@@ -195,16 +200,16 @@
+ .I "predefined function keys"
+ whose names begin with
+ .BR KEY_ ";"
+-these object-like macros have values outside the range of eight-bit
+-character codes.
++these object-like macros
++have integer values outside the range of eight-bit character codes.
+ .bP
+ In
+ .IR \%ncurses ","
+ .I "user-defined function keys"
+ are configured with \fB\%define_key\fP(3X);
+ they have no names,
+-but are also expected to have values outside the range of eight-bit
+-codes.
++but are also expected to
++have integer values outside the range of eight-bit character codes.
+ .PP
+ A variable intended to hold a function key code must thus be of type
+ .I short
+@@ -237,33 +242,34 @@
+ .bP
+ If the escape sequence matches no function keys
+ defined for the terminal type,
++call
+ .B \%wgetch
+-returns the code of the last
+-(most recent)
+-character it has read.
++repeatedly to obtain
++the codes of the individual characters of the sequence,
++in the order they occurred in the input.
+ .bP
+ If
+ .B \%wgetch
+ cannot decide the validity of the input as a function key
+ because it has not read enough characters to disambiguate it,
+ the function waits until it has this information or the
+-.IR "escape delay" ","
+-configured by the global variable
+-.I \%ESCDELAY
+-(an extension;
+-see section \*(``EXTENSIONS\*('' below)
++.I "escape delay"
++elapses.
++Configure the escape delay
++with the global variable
++.IR \%ESCDELAY ","
++an extension
++(see section \*(``EXTENSIONS\*('' below),
+ or the environment variable of the same name
+ (see section \*(``ENVIRONMENT\*('' of \fB\%ncurses\fP(3X)),
+-also an extension,
+-elapses.
++also an extension.
+ .PP
+ Consequently,
+ a user of a
+ .I curses
+ application that employs keypad mode
+ may experience a pause or \*(``hang\*(''
+-after the escape key is pressed
+-while
++after pressing the escape key while
+ .I curses
+ collects sufficient characters to disambiguate the input.
+ If the window is in \*(``no time-out\*('' mode,
+@@ -471,8 +477,23 @@
+ on failure.
+ .B \%wgetch
+ fails if
+-.bP
+ its timeout expires without any data arriving,
++which cannot happen if \fB\%nodelay\fP(3X) is in effect on the window.
++.PP
++In
++.IR \%ncurses ,
++.B \%wgetch
++also fails if
++.bP
++the
++.I curses
++screen has not been initialized,
++.bP
++(for functions taking a
++.I \%WINDOW
++pointer argument)
++.I win
++is a null pointer,
+ or
+ .bP
+ execution was interrupted by a signal,
+@@ -481,32 +502,35 @@
+ is set to
+ .IR \%EINTR "."
+ .PP
++Functions prefixed with \*(``mv\*('' first perform cursor movement and
++fail if the position
++.RI ( y ,
++.IR x ")"
++is outside the window boundaries.
++.PP
+ .B \%ungetch
+ returns
+ .B OK
+ on success and
+ .B ERR
+ on failure.
++In
++.IR \%ncurses ,
+ .B \%ungetch
+-fails if there is no more room in the input queue.
++fails if
++.bP
++the
++.I curses
++screen has not been initialized,
++or
++.bP
++there is no more room in the input queue.
+ .PP
+ .B \%has_key
+ returns
+ .B TRUE
+ or
+ .BR FALSE "."
+-.PP
+-Functions taking a
+-.I \%WINDOW
+-pointer argument fail if
+-.I win
+-is a null pointer.
+-.PP
+-Functions prefixed with \*(``mv\*('' first perform cursor movement and
+-fail if the position
+-.RI ( y ,
+-.IR x ")"
+-is outside the window boundaries.
+ .SH NOTES
+ .BR \%getch ","
+ .BR \%mvgetch ","
+@@ -736,10 +760,15 @@
+ .I \%wgetch
+ and its variants.
+ .PP
++SVr3 (1987)
++added
++.IR \%ungetch "."
++.PP
+ .I \%ncurses
+ 1.9.9g (1996)
+-added
+-.IR \%has_key "."
++furnished the
++.I \%has_key
++extension.
+ .SH SEE ALSO
+ ECMA-6 \*(``7-bit coded Character Set\*(''
+ \%.
++.PP
++SVr3 added
++.IR \%vwprintw ","
++describing its third parameter as a
++.IR \%va_list ","
++defined in
++.IR \%varargs.h ","
++and referred the reader to the manual pages for
++.I \%varargs
++and
++.I \%vprintf
++for detailed descriptions.
++.PP
++SVr4 (1989) introduced no new variations of
++.IR \%printw ","
++but provided for using either
++.I \%varargs.h
++or
++.I \%stdarg.h
++to define the
++.I \%va_list
++type.
+ .\" either header declares "va_list", but only one can be used
+ .PP
+ X/Open Curses Issue\ 4 (1995),
+-defined \fB\%vw_printw\fP to replace \fB\%vwprintw\fP,
+-stating that its \fI\%va_list\fP type is defined in \fI\%stdarg.h\fP.
++defined
++.I \%vw_printw
++to replace
++.IR \%vwprintw ","
++stating that its
++.I \%va_list
++type is defined in
++.IR \%stdarg.h "."
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_addstr\fP(3X),
+Index: man/curs_scanw.3x
+Prereq:  1.57 
+--- ncurses-6.5-20250329+/man/curs_scanw.3x	2025-01-19 00:51:10.000000000 +0000
++++ ncurses-6.5-20250405/man/curs_scanw.3x	2025-04-05 22:20:10.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_scanw.3x,v 1.57 2025/01/19 00:51:10 tom Exp $
+-.TH curs_scanw 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_scanw.3x,v 1.60 2025/04/05 22:20:10 tom Exp $
++.TH curs_scanw 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -185,65 +185,111 @@
+ and check the value of the corresponding variable to determine how many
+ conversions succeeded.
+ .SH HISTORY
+-\fB\%scanw\fP was implemented in 4BSD
+-(November 1980);
++4BSD (1980)
++introduced
++.I \%wscanw
++and its variants.
+ .\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/src/lib/\
+ .\"  libcurses/scanw.c
+-that early version of
++.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/src/lib/\
++.\"  libcurses/mvscanw.c
++It implemented all as functions,
++not macros;
++this initial distribution of
+ .I curses
+-preceded the ANSI C standard of 1989.
+-The function was unused in Berkeley distributions for over ten years,
+-until 4.4BSD,
++preceded the ANSI C standard of 1989,
++prior to which a variadic macro facility was not widely available.
++.I \%scanw
++went unused in Berkeley distributions until 4.3BSD-Reno (1990),
+ which employed it in a game.
+-The 4BSD \fB\%scanw\fP did not use \fI\%varargs.h\fP,
+-though that had been available since Seventh Edition Unix (1979).
++.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4.3BSD-Reno/src/\
++.\"  games/chess/uxdsp.c
++4BSD's
++.I \%wscanw
++did not use
++.IR \%varargs.h ","
++which had been available since Seventh Edition Unix (1979).
+ .\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=V7/usr/include/\
+ .\"  varargs.h
+ In 1991
+ (a couple of years after SVr4 was generally available,
+ and after the C standard was published),
+ other developers updated the library,
+-using \fI\%stdarg.h\fP internally in 4.4BSD
++using
++.I \%stdarg.h
++internally in 4.4BSD
+ .IR curses .
+ Even with this improvement,
+ BSD
+ .I curses
+ did not use function prototypes
+ (nor even declare functions)
+-in \fI\%curses.h\fP until 1992.
++in
++.I \%curses.h
++until 1992.
+ .PP
+-SVr2 (1984) documented \fB\%scanw\fP and \fB\%wscanw\fP tersely as
+-\*(``scanf through \fB\%stdscr\fP\*('' and
+-\*(``scanf through \fIwin\fP\*('',
++4BSD documented
++.I \%scanw
++and
++.I \%wscanw
++tersely as \*(``scanf through
++.IR \%stdscr "\*(''"
++and \*(``scanf through
++.IR win "\*('',"
+ respectively.
+-.PP
+-SVr3 (1987) added
+-\fB\%mvscanw\fP, and
+-\fB\%mvwscanw\fP, stating
++.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/man/man3/\
++.\"  curses.3
++SVr3 (1987)
++stated
+ .RS
+ .PP
+-\*(``[t]hese routines correspond to \fIscanf\fP(3S),
++[t]hese routines correspond to \fIscanf\fP(3S),
+ as do their arguments and return values.
+-\fB\%wgetstr\fP() is called on the window,
+-and the resulting line is used as input for the scan.\*(''
++.IR \%wgetstr "()"
++is called on the window,
++and the resulting line is used as input for the scan.
+ .RE
+-.PP
+-SVr3 also implemented \fB\%vwscanw\fP,
+-describing its third parameter as a \fI\%va_list\fP,
+-defined in \fI\%varargs.h\fP,
+-and referred the reader to the manual pages for \fI\%varargs\fP and
+-\fI\%vprintf\fP for detailed descriptions.
+-(Because the SVr3 documentation does not mention \fI\%vscanf\fP,
+-the reference to \fI\%vprintf\fP might not be an error).
+-.PP
+-SVr4 (1989) introduced no new variations of \fI\%scanw\fP,
+-but provided for using either \fI\%varargs.h\fP or \fI\%stdarg.h\fP to
+-define the \fI\%va_list\fP type.
++.\" GBR can't find a source to cite for this quotation,
++.\" even after checking
++.\" .
++.PP
++SVr3 added
++.IR \%vwscanw ","
++describing its third parameter as a
++.IR \%va_list ","
++defined in
++.IR \%varargs.h ","
++and referred the reader to the manual pages for
++.I \%varargs
++and
++.I \%vprintf
++for detailed descriptions.
++(Because SVr3 documentation does not mention
++.IR \%vscanf ","
++the reference to
++.I \%vprintf
++might not be an error).
++.PP
++SVr4 (1989) introduced no new variations of
++.IR \%scanw ","
++but provided for using either
++.I \%varargs.h
++or
++.I \%stdarg.h
++to define the
++.I \%va_list
++type.
+ .\" either header declares "va_list", but only one can be used
+ .PP
+ X/Open Curses Issue\ 4 (1995),
+-defined \fI\%vw_scanw\fP to replace \fI\%vwscanw\fP,
+-stating that its \fI\%va_list\fP type is defined in \fI\%stdarg.h\fP.
++defined
++.I \%vw_scanw
++to replace
++.IR \%vwscanw ","
++stating that its
++.I \%va_list
++type is defined in
++.IR \%stdarg.h "."
+ .SH SEE ALSO
+ \fB\%curses\fP(3X),
+ \fB\%curs_getstr\fP(3X),
+Index: man/curs_scroll.3x
+Prereq:  1.57 
+--- ncurses-6.5-20250329+/man/curs_scroll.3x	2025-02-02 00:02:49.000000000 +0000
++++ ncurses-6.5-20250405/man/curs_scroll.3x	2025-04-05 22:20:39.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_scroll.3x,v 1.57 2025/02/02 00:02:49 tom Exp $
+-.TH curs_scroll 3X 2025-02-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_scroll.3x,v 1.59 2025/04/05 22:20:39 tom Exp $
++.TH curs_scroll 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -122,6 +122,9 @@
+ .I curses
+ screen has not been initialized,
+ .bP
++(for functions taking a
++.I \%WINDOW
++pointer argument)
+ .I win
+ is a null pointer,
+ or
+Index: man/curs_terminfo.3x
+Prereq:  1.162 
+--- ncurses-6.5-20250329+/man/curs_terminfo.3x	2025-02-15 15:24:18.000000000 +0000
++++ ncurses-6.5-20250405/man/curs_terminfo.3x	2025-04-05 22:21:02.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_terminfo.3x,v 1.162 2025/02/15 15:24:18 tom Exp $
+-.TH curs_terminfo 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_terminfo.3x,v 1.164 2025/04/05 22:21:02 tom Exp $
++.TH curs_terminfo 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -354,9 +354,8 @@
+ .BR \%cur_term "."
+ .PP
+ .B \%del_curterm
+-frees the memory pointed to by
+-.IR \%oterm ","
+-making it available for further use.
++releases the memory pointed to by
++.IR \%oterm "."
+ If
+ .I \%oterm
+ is
+@@ -395,11 +394,11 @@
+ .I str
+ with parameters
+ .IR pi "."
+-A pointer is returned to the result of
++It returns a pointer to a character string representing
+ .I str
+-with the parameters applied.
+-Application developers should keep in mind these quirks of the
+-interface:
++with the parameters applied to \*(``%\*('' expressions within.
++.\" XXX: Whose responsibility is it to free that string?
++Application developers should keep in mind some quirks of the interface.
+ .bP
+ Although \fB\%tparm\fP's actual parameters may be integers or strings,
+ the prototype expects
+@@ -418,33 +417,45 @@
+ The capability string is null-terminated.
+ Use \*(``\e200\*('' where an ASCII NUL is needed in the output.
+ .PP
+-\fB\%tiparm\fP is a newer form of \fB\%tparm\fP which uses
++\fB\%tiparm\fP is a newer form of \fB\%tparm\fP that uses
+ .I \%stdarg.h
+-rather than a fixed-parameter list.
++rather than a fixed-length parameter list.
+ Its numeric parameters are
+ .IR int s
+ rather than
+ .IR long "s."
+ .PP
+-Both \fB\%tparm\fP and \fB\%tiparm\fP assume that the application passes
+-parameters consistent with the terminal description.
+-Two extensions are provided as alternatives to deal with untrusted data.
++.B \%tparm
++and
++.B \%tiparm
++assume that the application
++passes parameters consistent with the terminal description.
++.I \%ncurses
++provides two extensions as alternatives to deal with untrusted data.
+ .bP
+-\fB\%tiparm_s\fP is an extension which is a safer formatting function
+-than \fB\%tparm\fR or \fB\%tiparm\fR,
++The
++.B \%tiparm_s
++extension is a safer formatting function than
++.B \%tparm
++or
++.BR \%tiparm ","
+ because it allows the developer to tell the
+ .I curses
+ library how many parameters to expect in the parameter list,
+ and which may be string parameters.
+ .IP
+-The \fImask\fP parameter has one bit set for each of the parameters
++The
++.I mask
++parameter has one bit set for each of the parameters
+ (up to 9)
+ passed as
+ .I char
+ pointers rather than numbers.
+ .bP
+-The extension \fB\%tiscan_s\fP allows the application to inspect a
+-formatting capability to see what the
++The extension
++.B \%tiscan_s
++allows the application
++to inspect a formatting capability to see what the
+ .I curses
+ library would assume.
+ .\" ********************************************************************
+@@ -453,22 +464,29 @@
+ .IR padding ","
+ a time delay
+ (accommodating performance limitations of hardware terminals)
+-expressed as \fB$<\fIn\fB>\fR,
+-where \fIn\fP is a nonnegative integral count of milliseconds.
+-If \fIn\fP exceeds 30,000
++expressed as
++.BI $< n >\c
++,
++where
++.I n
++is a nonnegative integral count of milliseconds.
++If
++.I n
++exceeds 30,000
+ (thirty seconds),
+-it is capped at that value.
++.I \%ncurses
++caps it at that value.
+ .PP
+-\fB\%tputs\fP interprets time-delay information in the string
++.B \%tputs
++interprets time delays in the string
+ .I str
+-and outputs it,
+-executing the delays:
++and acts upon them.
+ .bP
+ The
+ .I str
+ parameter must be a
+ .I \%term\%info
+-string variable or the return value of
++string capability or the return value of
+ .B \%tparm
+ or
+ .BR \%tiparm "."
+@@ -484,9 +502,9 @@
+ .IR \%putchar -like
+ function to which the characters are passed,
+ one at a time.
+-.IP
+-If \fB\%tputs\fP processes a time-delay,
+-it uses the \fB\%delay_output\fP(3X) function,
++.PP
++.B \%tputs
++processes each time delay with the \fB\%delay_output\fP(3X) function,
+ routing any resulting padding characters through this function.
+ .PP
+ \fB\%putp\fR calls
+@@ -882,9 +900,11 @@
+ X/Open Curses uses
+ .I \%const
+ less effectively than a later design might,
+-sometimes applying it needlessly to values that are already constant,
+-and in most cases overlooking parameters that normally would benefit
+-from
++sometimes applying it needlessly to function parameters
++that are passed by value
++(and therefore copied),
++and in most cases overlooking parameters
++that normally would benefit from
+ .IR \%const "."
+ Passing
+ .IR \%const -qualified
+@@ -980,12 +1000,14 @@
+ .SS "Special \fITERM\fP treatment"
+ If
+ .I \%ncurses
+-is configured to use the terminal driver,
+-.\" XXX: as opposed to the Unix terminal driver, termio(s)?
++is configured to use a terminal driver
++that does not employ the POSIX
++.I \%termios
++API,
+ as with the MinGW port,
+ .bP
+ .I \%setupterm
+-interprets a missing/empty
++interprets a missing or empty
+ .I TERM
+ variable as the special value \*(``unknown\*(''.
+ .IP
+Index: man/curs_util.3x
+Prereq:  1.139 
+--- ncurses-6.5-20250329+/man/curs_util.3x	2025-02-15 18:38:01.000000000 +0000
++++ ncurses-6.5-20250405/man/curs_util.3x	2025-04-05 22:22:48.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_util.3x,v 1.139 2025/02/15 18:38:01 tom Exp $
+-.TH curs_util 3X 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_util.3x,v 1.141 2025/04/05 22:22:48 tom Exp $
++.TH curs_util 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -229,7 +229,8 @@
+ using a value in those to override the results
+ from the operating system or terminal database.
+ .IP
+-\fI\%curses\fP also updates the screen size in response to
++.I curses
++also updates the screen size in response to
+ \fBSIGWINCH\fP,
+ unless overridden by the \fILINES\fP or \fI\%COLUMNS\fP environment
+ variables,
+@@ -380,9 +381,13 @@
+ and the use of \fBnapms\fP
+ differ from other implementations.
+ .bP
+-SVr4 curses does not delay if no padding character is available.
++SVr4
++.I curses
++does not delay if no padding character is available.
+ .bP
+-NetBSD curses uses \fBnapms\fP when no padding character is available,
++NetBSD
++.I curses
++uses \fBnapms\fP when no padding character is available,
+ but does not take timing into account when using the padding character.
+ .PP
+ Neither limits the delay.
+@@ -427,9 +432,13 @@
+ (in 1988)
+ incorporated into SVr4.
+ Oddly,
+-there are no such functions in the 4.3BSD curses sources.
++there are no such functions in the 4.3BSD
++.I curses
++sources.
+ .bP
+-Most implementations simply dump the binary \fI\%WINDOW\fP structure
++Most implementations simply dump the binary
++.I \%WINDOW
++structure
+ to the file.
+ These include SVr4
+ .IR curses ,
+@@ -439,16 +448,19 @@
+ .IR \%PDCurses ,
+ as well as older \fI\%ncurses\fP versions.
+ This implementation
+-(as well as the X/Open variant of Solaris curses,
++(as well as
++.IR \%xcurses ","
++the X/Open variant of Solaris
++.IR curses ","
+ dated 1995)
+ uses textual dumps.
+ .IP
+-The implementations that use binary dumps use block-I/O
++The implementations that use binary dumps use block I/O
+ (\fIwrite\fP(2) and \fIread\fP(2) functions).
+-Those that use textual dumps use buffered-I/O.
++Those that use textual dumps use buffered I/O.
+ A few applications may happen to write extra data in the file using
+ these functions.
+-Doing that can run into problems mixing block- and buffered-I/O.
++Doing that can run into problems mixing block and buffered I/O.
+ This implementation reduces the problem on writes by flushing the
+ output.
+ However,
+@@ -480,7 +492,8 @@
+ C0 controls.
+ .IP
+ X/Open Curses does not document whether \fBunctrl\fP can be called
+-before initializing curses.
++before initializing
++.IR curses "."
+ This implementation permits that,
+ and returns the \*(``\*~@\*('',
+ etc.,
+@@ -511,10 +524,12 @@
+ it determines whether to use the \*(``M\-\*('' prefix
+ for \*(``meta\*('' keys (codes in the range 128 to 255).
+ Both \fB\%use_legacy_coding\fP(3X) and \fBmeta\fP(3X) succeed only after
+-curses is initialized.
++.I curses
++is initialized.
+ X/Open Curses does not document the treatment of codes 128 to 159.
+ When treating them as \*(``meta\*('' keys
+-(or if \fBkeyname\fP is called before initializing curses),
++(or if \fBkeyname\fP is called before initializing
++.IR curses "),"
+ this implementation returns strings \*(``M\-\*^@\*('',
+ \*(``M\-\*^A\*('',
+ etc.
+@@ -523,7 +538,8 @@
+ which \fI\%ncurses\fP does.
+ However,
+ \fI\%ncurses\fP' \fB\fP includes \fB\fP,
+-matching the behavior of SVr4 curses.
++matching the behavior of SVr4
++.IR curses "."
+ Other implementations may not do that.
+ .SS "use_env, use_tioctl"
+ If \fI\%ncurses\fP is configured to provide the sp-functions extension,
+@@ -531,7 +547,8 @@
+ creating each \fIscreen\fP rather than once only
+ (\fBcurs_sp_funcs\fP(3X)).
+ This feature of \fBuse_env\fP
+-is not provided by other implementations of curses.
++is not provided by other implementations of
++.IR curses "."
+ .SH HISTORY
+ 4BSD (1980)
+ introduced
+@@ -558,7 +575,7 @@
+ with \fI\%fread\fP(3) and \fI\%fwrite\fP(3),
+ respectively.
+ .PP
+-SVr4 (1989) supplied
++SVr4 (1989) furnished
+ .IR \%use_env "."
+ .PP
+ X/Open Curses Issue\ 4 (1995) specified
+Index: man/curs_variables.3x
+Prereq:  1.58 
+--- ncurses-6.5-20250329+/man/curs_variables.3x	2025-01-19 00:51:10.000000000 +0000
++++ ncurses-6.5-20250405/man/curs_variables.3x	2025-04-05 22:24:24.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_variables.3x,v 1.58 2025/01/19 00:51:10 tom Exp $
+-.TH curs_variables 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_variables.3x,v 1.62 2025/04/05 22:24:24 tom Exp $
++.TH curs_variables 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -240,7 +240,9 @@
+ \fB\%initscr\fP(3X) or \fB\%newterm\fP(3X),
+ the library creates a window named
+ .B \%stdscr
+-that is the same size as the terminal screen
++that is the same size as the terminal screen,
++(minus any lines reserved by
++\fB\%ripoffline\fP(3X) or \fB\%slk_init\fP(3X))
+ and is the implicit window used by functions
+ that interact with a window
+ but do not take a parameter identifying one;
+@@ -287,14 +289,15 @@
+ that is,
+ the number of columns and lines.
+ .SS ESCDELAY
+-For
++When reading key strokes from a window in keypad mode,
+ .I curses
+-to distinguish the ESC character resulting from a user's press of the
+-\*(``Escape\*('' key on the input device from one beginning an
+-.I "escape sequence"
+-(as commonly produced by function keys),
+-it waits after the escape character to see if further characters are
+-available on the input stream within a short interval.
++distinguishes the ESC character resulting from a user's press of the
++\*(``Escape\*('' key on the input device
++from one beginning an escape sequence
++(commonly produced by function keys),
++by waiting after the escape character
++to see if further characters are available
++on the input stream within a short interval.
+ .B \%ESCDELAY
+ stores this interval in milliseconds.
+ .PP
+@@ -421,7 +424,9 @@
+ .UE
+ .PP
+ \fB\%getcchar\fP(3X)
+-further discusses
++further discusses the
++.I \%ncurses
++extension
+ .BR \%CCHARW_MAX "."
+ .PP
+ \fB\%curses\fP(3X),
+Index: man/ncurses.3x
+Prereq:  1.245 
+--- ncurses-6.5-20250329+/man/ncurses.3x	2025-03-01 21:43:30.000000000 +0000
++++ ncurses-6.5-20250405/man/ncurses.3x	2025-04-05 22:54:19.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: ncurses.3x,v 1.245 2025/03/01 21:43:30 tom Exp $
+-.TH ncurses 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: ncurses.3x,v 1.252 2025/04/05 22:54:19 tom Exp $
++.TH ncurses 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -203,8 +203,10 @@
+ before use of any functions
+ that access or manipulate windows or screens.
+ .PP
+-To get character-at-a-time input without echoing\(emmost interactive,
+-screen-oriented programs want this\(emuse the following sequence.
++To get character-at-a-time input without echoing \(em
++most interactive,
++screen-oriented programs want this \(em
++use the following sequence.
+ .PP
+ .RS 4
+ .EX
+@@ -216,14 +218,16 @@
+ .PP
+ .RS 4
+ .EX
++.nf
+ noqiflush();
+ keypad(stdscr, TRUE);
++.fi
+ .EE
+ .RE
+ .PP
+ A
+ .I curses
+-program then often enters an event loop of some sort.
++program then often enters an event-handling loop.
+ Call \fB\%endwin\fP(3X) before exiting.
+ .SS Overview
+ A
+@@ -483,9 +487,10 @@
+ In either case,
+ they are accessed via an integral bit mask.
+ .IP
+-Each cell of a
++.I \%ncurses
++stores each cell of a
+ .I \%WINDOW
+-is stored as a
++as a
+ .IR \%chtype .
+ X/Open Curses does not specify the sizes of the character code or
+ color pair identifier,
+@@ -514,7 +519,7 @@
+ prefix it with \*(``_w\*('' to obtain the wide counterpart.
+ For example,
+ \fB\%waddch\fP becomes \fB\%wadd_wch\fP.
+-Another exception is
++An exception is
+ .B \%ins_nwstr
+ (and its variants),
+ spelled thus instead of \*(``insn_wstr\*(''.
+@@ -565,9 +570,10 @@
+ not combined into an integer as in
+ .IR \%chtype .
+ .PP
+-Each cell of a
++.I \%ncurses
++stores each cell of a
+ .I \%WINDOW
+-is stored as a
++as a
+ .IR \%cchar_t .
+ \fB\%setcchar\fP(3X) and \fB\%getcchar\fP(3X)
+ store and retrieve
+@@ -1495,6 +1501,7 @@
+ .PP
+ .RS 3
+ .EX
++.nf
+ # linux console, if patched to provide working
+ # VT100 shift\-in/shift\-out, with corresponding font.
+ linux\-vt100|linux console with VT100 line\-graphics,
+@@ -1503,6 +1510,7 @@
+ # uxterm with vt100Graphics resource set to false
+ xterm\-utf8|xterm relying on UTF\-8 line\-graphics,
+         U8#1, use=xterm,
++.nf
+ .EE
+ .RE
+ .PP
+@@ -1582,7 +1590,7 @@
+ .I \%term\%info
+ format are normally stored in a directory tree using subdirectories
+ named for the common first letters of the terminal types named therein.
+-This is the scheme used in System\ V.
++System\ V used this scheme.
+ .bP
+ If
+ .I \%ncurses
+@@ -1624,13 +1632,16 @@
+ .RS 4
+ .IP
+ .EX
++.nf
+ TERMINFO=$(infocmp \-0 \-Q2 \-q)
+ export TERMINFO
++.fi
+ .EE
+ .RE
+ .IP
+-The compiled description is used only if it corresponds to the terminal
+-type identified by
++.I \%ncurses
++uses the compiled description only if it corresponds
++to the terminal type identified by
+ .IR TERM .
+ .PP
+ Setting
+@@ -1742,9 +1753,11 @@
+ .PP
+ .RS 4
+ .EX
++.nf
+ .\" The dummy character prevents undesired rewriting of the next line on
+ .\" installation of the man page.
+ \fB#\&include \fP
++.fi
+ .EE
+ .RE
+ .PP
+@@ -1810,26 +1823,42 @@
+ The symbol which enables these features has changed
+ since X/Open Curses Issue\ 4:
+ .bP
+-Originally, the wide-character feature required the symbol
+-\fB_XOPEN_SOURCE_EXTENDED\fP
++Originally,
++the wide-character feature required the symbol
++.B \%_XOPEN_SOURCE_EXTENDED
+ but that was only valid for XPG4 (1996).
+ .bP
+-Later, that was deemed conflicting with \fB_XOPEN_SOURCE\fP defined to 500.
++Later,
++that was deemed conflicting with an
++.B \%_XOPEN_SOURCE
++value of 500.
+ .bP
+ As of mid-2018,
+-none of the features in this implementation require a \fB_XOPEN_SOURCE\fP
++none of the features in this implementation require a
++.B \%_XOPEN_SOURCE
+ feature greater than 600.
+-However, X/Open Curses Issue\ 7 (2009) recommends defining it to 700.
++However,
++X/Open Curses Issue\ 7 (2009) recommends defining it to 700.
+ .bP
+-Alternatively, you can enable the feature by defining \fBNCURSES_WIDECHAR\fP
+-with the caveat that some other header file than \fBcurses.h\fP
+-may require a specific value for \fB_XOPEN_SOURCE\fP
++Alternatively,
++you can enable the feature by defining
++.B \%NCURSES_WIDECHAR
++with the caveat that some header file other than
++.I \%curses.h
++may require a specific value for
++.B \%_XOPEN_SOURCE
+ (or a system-specific symbol).
+ .PP
+-The \fI\%curses.h\fP header file installed for the wide-character
+-library is designed to be compatible with the non-wide library's header.
+-Only the size of the \fI\%WINDOW\fP structure differs;
+-few applications require more than pointers to \fI\%WINDOW\fPs.
++The
++.I \%curses.h
++header file installed
++for the wide-character library
++is designed to be compatible with the non-wide library's header.
++Only the size of the
++.I \%WINDOW
++structure differs;
++few applications require more than pointers to
++.IR \%WINDOW "."
+ .PP
+ If the headers are installed allowing overwrite,
+ the wide-character library's headers should be installed last,
+@@ -1843,10 +1872,17 @@
+ (before any \*(``w\*('' added by
+ .BR \%\-\-enable\-widec ).
+ .IP
+-The global variables such as \fBLINES\fP are replaced by macros to
+-allow read-only access.
+-At the same time, setter-functions are provided to set these values.
+-Some applications (very few) may require changes to work with this convention.
++.I \%ncursest
++and
++.I \%ncursestw
++replace global variables such as
++.B \%LINES
++with macros allowing read-only access.
++At the same time,
++they provide functions to set these values.
++Very few applications require changes
++to work with this convention.
++.\" see definition of NCURSES_WRAPPED_VAR
+ .TP 5
+ .B \-\-with\-shared
+ .tQ
+@@ -1856,20 +1892,37 @@
+ .tQ
+ .B \-\-with\-profile
+ The shared and normal (static) library names differ by their suffixes,
+-e.g., \fBlibncurses.so\fP and \fBlibncurses.a\fP.
++e.g.,
++.I \%libncurses.so
++and
++.IR \%libncurses.a "."
+ The debug and profiling libraries add a \*(``_g\*(''
+-and a \*(``_p\*('' to the root names respectively,
+-e.g., \fBlibncurses_g.a\fP and \fBlibncurses_p.a\fP.
++and a \*(``_p\*('' to the roots of these respective names,
++forming
++.I \%libncurses_g.so
++and
++.IR \%libncurses_p.a ","
++for example.
+ .TP 5
+ .B \-\-with\-termlib
+-Low-level functions which do not depend upon whether the library
+-supports wide-characters, are provided in the tinfo library.
++This option configures
++.I \%ncurses
++to provide low-level functions that do not depend
++upon wide-character support in a library names
++.IR \%tinfo "."
+ .IP
+-By doing this, it is possible to share the tinfo library between
+-wide/normal configurations as well as reduce the size of the library
+-when only low-level functions are needed.
++This arrangement enables
++.I \%tinfo
++to be shared between
++.I \%ncurses
++and
++.I \%ncursesw
++libraries as well as application linking and/or loading times
++when it requires only low-level functions.
+ .IP
+-Those functions are described in these pages:
++The following pages describe low-level
++.I curses
++functions.
+ .RS
+ .bP
+ \fB\%curs_extend\fP(3X) \- miscellaneous \fIcurses\fP extensions
+@@ -1889,10 +1942,12 @@
+ .RE
+ .TP 5
+ .B \-\-with\-trace
+-The \fBtrace\fP function normally resides in the debug library,
+-but it is sometimes useful to configure this in the shared library.
+-Configure scripts should check for the function's existence rather
+-than assuming it is always in the debug library.
++The
++.B trace
++function normally resides in the debug library,
++but it is sometimes useful to expose it in the shared or static library.
++Configuration scripts should check for the function's existence rather
++than assuming it is confined to the debug library.
+ .SH FILES
+ .TP
+ .I @DATADIR@/tabset
+Index: man/resizeterm.3x
+Prereq:  1.60 
+--- ncurses-6.5-20250329+/man/resizeterm.3x	2025-03-15 21:12:18.000000000 +0000
++++ ncurses-6.5-20250405/man/resizeterm.3x	2025-04-05 22:26:38.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1996-on
+ .\"
+-.\" $Id: resizeterm.3x,v 1.60 2025/03/15 21:12:18 tom Exp $
+-.TH resizeterm 3X 2025-03-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: resizeterm.3x,v 1.63 2025/04/05 22:26:38 tom Exp $
++.TH resizeterm 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .de bP
+ .ie n  .IP \(bu 4
+ .el    .IP \(bu 2
+@@ -89,7 +89,6 @@
+ An application which establishes its own \fB\%SIGWINCH\fP handler
+ can call \fB\%resizeterm\fP, but in that case, the library will not
+ see \fB\%SIGWINCH\fP, and proper layout will rely upon the application.
+-.SH FUNCTIONS
+ .SS resizeterm
+ The function \fB\%resizeterm\fP resizes the standard and current windows
+ (i.e., \fB\%stdscr\fP and \fB\%curscr\fP)
+Index: man/scr_dump.5
+Prereq:  1.50 
+--- ncurses-6.5-20250329+/man/scr_dump.5	2025-01-19 00:51:10.000000000 +0000
++++ ncurses-6.5-20250405/man/scr_dump.5	2025-04-05 21:56:26.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: scr_dump.5,v 1.50 2025/01/19 00:51:10 tom Exp $
+-.TH scr_dump 5 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
++.\" $Id: scr_dump.5,v 1.52 2025/04/05 21:56:26 tom Exp $
++.TH scr_dump 5 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -87,6 +87,7 @@
+ .PP
+ .RS 4
+ .EX
++.nf
+ #
+ # ncurses5 (and before) did not use a magic number,
+ # making screen dumps "data".
+@@ -94,6 +95,7 @@
+ # ncurses6 (2015) uses this format, ignoring byte-order
+ 0    string    \e210\e210\e210\e210ncurses    ncurses6 screen image
+ #
++.fi
+ .EE
+ .RE
+ .RE
+@@ -173,12 +175,14 @@
+ .PP
+ .RS 4
+ .EX
++.nf
+ /* terminfo magic number */
+ #define MAGNUM  0432
+ 
+ /* curses screen dump magic number */
+ #define SVR2_DUMP_MAGIC_NUMBER  0433
+ #define SVR3_DUMP_MAGIC_NUMBER  0434
++.fi
+ .EE
+ .RE
+ .PP
+@@ -193,8 +197,10 @@
+ .PP
+ .RS 4
+ .EX
++.nf
+ /* curses screen dump magic number */
+ #define SVR4_DUMP_MAGIC_NUMBER  0435
++.fi
+ .EE
+ .RE
+ .PP
+@@ -315,6 +321,7 @@
+ .PP
+ .RS 4
+ .EX
++.nf
+ #include 
+ 
+ int
+@@ -339,6 +346,7 @@
+     endwin();
+     return 0;
+ }
++.fi
+ .EE
+ .RE
+ .PP
+@@ -346,6 +354,7 @@
+ .PP
+ .RS 4
+ .EX
++.nf
+ \e210\e210\e210\e210ncurses 6.0.20170415
+ _cury=5
+ _curx=11
+@@ -368,6 +377,7 @@
+ 8:\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es
+ 9:\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es
+ 10:\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es\es
++.fi
+ .EE
+ .RE
+ .PP
+@@ -391,6 +401,7 @@
+ .PP
+ .RS 4
+ .EX
++.nf
+ MAX=10,20
+ BEG=0,0
+ SCROLL=0,10
+@@ -424,6 +435,7 @@
+ 9,0,0,1,
+ 9,19,0,0,
+ CUR=11,5
++.fi
+ .EE
+ .RE
+ .PP
+@@ -439,6 +451,7 @@
+ .PP
+ .RS 4
+ .EX
++.nf
+ 0000000 1c 01 c3 d6 f3 58 05 00 0b 00 0a 00 14 00 00 00
+ 0000020 00 00 02 00 00 00 00 00 00 00 00 00 00 00 00 00
+ 0000040 00 00 b8 1a 06 08 cc 1a 06 08 00 00 09 00 10 00
+@@ -461,6 +474,7 @@
+ 0001620 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+ *
+ 0002371
++.fi
+ .EE
+ .RE
+ .SH AUTHORS
+Index: man/tabs.1
+Prereq:  1.70 
+--- ncurses-6.5-20250329+/man/tabs.1	2025-02-15 14:55:00.000000000 +0000
++++ ncurses-6.5-20250405/man/tabs.1	2025-04-05 21:56:26.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tabs.1,v 1.70 2025/02/15 14:55:00 tom Exp $
+-.TH @TABS@ 1 2025-02-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: tabs.1,v 1.72 2025/04/05 21:56:26 tom Exp $
++.TH @TABS@ 1 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -128,8 +128,10 @@
+ .PP
+ .RS 4
+ .EX
++.nf
+ @TABS@ 1,6,11,16,21
+ @TABS@ 1 6 11 16 21
++.fi
+ .EE
+ .RE
+ .PP
+Index: man/term.5
+Prereq:  1.80 
+--- ncurses-6.5-20250329+/man/term.5	2024-06-15 20:23:33.000000000 +0000
++++ ncurses-6.5-20250405/man/term.5	2025-04-05 22:26:47.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: term.5,v 1.80 2024/06/15 20:23:33 tom Exp $
+-.TH term 5 2024-06-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
++.\" $Id: term.5,v 1.83 2025/04/05 22:26:47 tom Exp $
++.TH term 5 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -506,12 +506,14 @@
+ a popular though rather stupid early terminal.
+ .PP
+ .EX
++.nf
+ adm3a|lsi adm3a,
+         am,
+         cols#80, lines#24,
+         bel=\*^G, clear=\e032$<1>, cr=\*^M, cub1=\*^H, cud1=\*^J,
+         cuf1=\*^L, cup=\eE=%p1%{32}%+%c%p2%{32}%+%c, cuu1=\*^K,
+         home=\*^\*^, ind=\*^J,
++.fi
+ .EE
+ .PP
+ A hexadecimal dump of its compiled terminal description
+Index: man/terminfo.tail
+Prereq:  1.157 
+--- ncurses-6.5-20250329+/man/terminfo.tail	2025-02-17 23:55:31.000000000 +0000
++++ ncurses-6.5-20250405/man/terminfo.tail	2025-04-05 21:56:26.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: terminfo.tail,v 1.157 2025/02/17 23:55:31 tom Exp $
++.\" $Id: terminfo.tail,v 1.158 2025/04/05 21:56:26 Branden.Robinson Exp $
+ .ps +1
+ .SS "User-Defined Capabilities"
+ .
+@@ -87,6 +87,7 @@
+ of what a \fBterminfo\fP entry for a modern terminal typically looks like.
+ .PP
+ .EX
++.nf
+ \s-2ansi|ansi/pc\-term compatible with color,
+         am, mc5i, mir, msgr,
+         colors#8, cols#80, it#8, lines#24, ncv#3, pairs#64,
+@@ -117,6 +118,7 @@
+         sgr0=\eE[0;10m, smacs=\eE[11m, smpch=\eE[11m, smso=\eE[7m,
+         smul=\eE[4m, tbc=\eE[3g, u6=\eE[%i%d;%dR, u7=\eE[6n,
+         u8=\eE[?%[;0123456789]c, u9=\eE[c, vpa=\eE[%i%p1%dd,
++.fi
+ .EE
+ .PP
+ Entries may continue onto multiple lines by placing white space at
+@@ -449,11 +451,13 @@
+ while the Lear Siegler \s-1ADM-3\s0 is described as
+ .PP
+ .EX
++.nf
+ .\".in -2
+ \s-1adm3\||\|3\||\|lsi adm3,
+         am, bel=\*^G, clear=\*^Z, cols#80, cr=\*^M, cub1=\*^H, cud1=\*^J,
+         ind=\*^J, lines#24,\s+1
+ .\".in +2
++.fi
+ .EE
+ .SS "Parameterized Strings"
+ Cursor addressing and other strings requiring parameters
+@@ -1146,8 +1150,10 @@
+ Putting this all together into the sgr sequence gives:
+ .PP
+ .EX
++.nf
+     sgr=\eE[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p4%t;5%;
+         %?%p1%p3%|%t;7%;%?%p7%t;8%;m%?%p9%t\e016%e\e017%;,
++.fi
+ .EE
+ .PP
+ Remember that if you specify sgr, you must also specify sgr0.
+Index: man/tput.1
+Prereq:  1.135 
+--- ncurses-6.5-20250329+/man/tput.1	2025-03-01 21:45:34.000000000 +0000
++++ ncurses-6.5-20250405/man/tput.1	2025-04-05 21:56:26.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tput.1,v 1.135 2025/03/01 21:45:34 tom Exp $
+-.TH @TPUT@ 1 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: tput.1,v 1.137 2025/04/05 21:56:26 tom Exp $
++.TH @TPUT@ 1 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -1050,11 +1050,13 @@
+ option can be profitably used with a shell \*(``here document\*(''.
+ .IP
+ .EX
++.nf
+ .RB $\  "@TPUT@ \-S <\  clear
+ .RB >\  "cup 10 10"
+ .RB >\  bold
+ .RB >\  !
++.fi
+ .EE
+ .IP
+ The foregoing
+Index: man/user_caps.5
+Prereq:  1.53 
+--- ncurses-6.5-20250329+/man/user_caps.5	2025-03-22 22:27:44.000000000 +0000
++++ ncurses-6.5-20250405/man/user_caps.5	2025-04-06 00:20:20.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2017 Free Software Foundation, Inc.                            *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: user_caps.5,v 1.53 2025/03/22 22:27:44 tom Exp $
+-.TH user_caps 5 2025-03-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
++.\" $Id: user_caps.5,v 1.55 2025/04/06 00:20:20 tom Exp $
++.TH user_caps 5 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -74,7 +74,7 @@
+ .\"	term.h - this file is automatically made from caps and maketerm.ex.
+ .\" illumos-gate has related source, with a "caps" file having AT&T copyright
+ .\" for 1988, and UCB copyright for 1982, 1986, 1988.  That 1982 is interesting
+-.\" (hinting that something may have been in the initial releated of System V)
++.\" (hinting that something may have been in the initial releases of System V)
+ .\" but the first release with tic appears to be SVr2 in 1984.
+ .PP
+ Most of the \fIextensions\fP in this fixed repertoire were additions
+Index: misc/terminfo.src
+--- ncurses-6.5-20250329+/misc/terminfo.src	2025-03-29 22:49:47.000000000 +0000
++++ ncurses-6.5-20250405/misc/terminfo.src	2025-04-05 20:08:00.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.1176 $
+-#	$Date: 2025/03/29 22:49:47 $
++#	$Revision: 1.1180 $
++#	$Date: 2025/04/05 20:08:00 $
+ #
+ # 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
+@@ -1245,6 +1245,24 @@
+ 	use=ansi+arrows, use=linux+lockeys, use=linux+sfkeys,
+ 	use=vt220+pcedit, use=vt220+cvis, use=vt220+ufkeys,
+ 
++# https://lists.gnu.org/archive/html/bug-ncurses/2025-04/msg00014.html
++sclp|IBM s390 driver for Linux,
++	xon,
++	cols#80, lines#24,
++	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
++	bel=^G, blink=\E[5m, cr=\r, cub1=^H, cud1=\n,
++	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
++	dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el1=\E[1K,
++	enacs=\E)0, ht=^I, ich=\E[%p1%d@, ind=\ED, is2=\Ec, kbs=^H,
++	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
++	kdch1=\E[3~, kf5=\E[E, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM,
++	rmacs=\E(B$<4>, rmso=\E[27m, rmul=\E[24m, sc=\E7,
++	sgr=\E[0%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e
++	    \E(B%;$<2>,
++	sgr0=\E[m\E(B, smacs=\E(0$<2>, smso=\E[7m, smul=\E[4m,
++	use=klone+color, use=ansi+cpr, use=ansi+erase,
++	use=ansi+local, use=linux+sfkeys, use=vt220+ufkeys,
++
+ #### Mach
+ #
+ 
+@@ -3060,9 +3078,13 @@
+ vt520-w|DEC VT520 in wide mode,
+ 	cols#132, use=vt520,
+ 
++# See "4.7.5 Visual Attributes Control Functions" and
++# "Table 5–15 (Cont.) Visual Character Attribute Values"
++# in EK-VT520-RM
+ vt525|DEC VT525,
+ 	colors#8, pairs#64,
+-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, use=vt520,
++	op=\E[39;49m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
++	use=vt520,
+ 
+ vt525-w|DEC VT525 in wide mode,
+ 	cols#132, use=vt525,
+@@ -8180,6 +8202,21 @@
+ # - cannot run, because the package is not signed.
+ #
+ # Fedora rawhide
++# contour-terminal-0.6.1.7494-2.fc42.x86_64
++# - most core dumps are finally gone, works when 3D acceleration is disabled.
++# - fails mir and related "in" tests in tack.
++# - function-keys do not match developer's version.
++# - sitm/ritm (italics) still do not work.
++# - private mode 12 (cursor) does not work.
++# - source code references Unicode values to a page which has none:
++#   https://vt100.net/docs/vt102-ug/chapter5.html#T5-13
++#   (actual source for this information is xterm)
++# - identifies as a VT525 with sixel graphics, UDK, rectangle editing and color.
++# - adds a control sequence to retrieve contents of entire screen.
++# - dumps core in vttest for rectangle editing
++# - UDK feature does not work
++# - fails vttest for REP, SL, SR, CBT, CHT, VPR
++# - sixel feature needs some work (most of my testcases do not work) -TD
+ # contour-terminal-0.3.12.262-6.fc39.x86_64
+ # - dumps core, cannot test
+ #
+@@ -8221,28 +8258,31 @@
+ #
+ # Developer's terminfo (compiled-in) uses some extensions.
+ contour|contour-latest|Contour Terminal Emulator,
+-	am, bce, eslok, hs, km, mc5i, mir, msgr, npc, xenl, xvpa,
++	am, bce, mc5i, msgr, npc, xenl, xvpa, AX, XT,
+ 	cols#80, lines#24, pairs#0x7fff,
+-	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+-	dim=\E[2m, dsl=\E[$~, ech=\E[%p1%dX, el1=\E[1K,
+-	flash=\E[?5h$<100/>\E[?5l, fsl=\E[$}, hpa=\E[%i%p1%dG,
+-	ind=\n, indn=\E[%p1%dS, invis=\E[8m, ka1=, ka3=, kbs=^?, kc1=,
+-	kc3=, kcbt=\E[Z, kend=\EOF, khlp=, kmous=\E[M, kund=,
+-	oc=\E]104\E\\, op=\E[39;49m, rev=\E[7m, ri=\EM,
+-	rin=\E[%p1%dT, rmam=\E[?7l, rmkx=\E[?1l, rmso=\E[27m,
+-	rmul=\E[24m, rs1=\E]\E\\\Ec,
+-	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,
+-	sgr0=\E(B\E[m, smam=\E[?7h, smkx=\E[?1h, smso=\E[7m,
+-	smul=\E[4m, tsl=\E[2$~\E[1$}\E[H\E[2J, vpa=\E[%i%p1%dd,
++	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, dim=\E[2m,
++	ech=\E[%p1%dX, el1=\E[1K, flash=\E[?5h$<100/>\E[?5l,
++	ind=\n, ka1=, ka3=, kbs=^?, kc1=, kc3=, kcbt=\E[Z, kend=\EOF,
++	kf13=\E[O2P, kf14=\E[O2Q, kf15=\E[O2R, kf16=\E[O2S,
++	kf25=\E[O5P, kf26=\E[O5Q, kf27=\E[O5R, kf28=\E[O5S,
++	kf37=\E[O6P, kf38=\E[O6Q, kf39=\E[O6R, kf40=\E[O6S,
++	kf49=\E[O3P, kf50=\E[O3Q, kf51=\E[O3R, kf52=\E[O3S,
++	kf61=\E[O4P, kf62=\E[O4Q, kf63=\E[O4R, khlp=, kmous=\E[M,
++	kund=, oc=\E]104\E\\, op=\E[39;49m, ri=\EM, rmam=\E[?7l,
++	rmkx=\E[?1l, rmso=\E[27m, rmul=\E[24m, rs1=\E]\E\\\Ec,
++	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p5%t;2%;
++	    %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
++	sgr0=\E(B\E[m, smam=\E[?7h, smkx=\E[?1h,
+ 	Cs=\E]12;%p1%s\E\\, E3=\E[3J, Rmol=\E[55m, Se=\E[ q,
+ 	Smol=\E[53m, Smulx=\E[4:%p1%dm, Ss=\E[%p1%d q,
+ 	use=ansi+apparrows, use=ansi+cup, use=ansi+csr,
+-	use=ansi+erase, use=ansi+idc, use=ansi+idl,
+-	use=ansi+inittabs, use=ansi+local, use=ansi+rep,
+-	use=att610+cvis, use=ecma+italics, use=ecma+strikeout,
++	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
++	use=ansi+inittabs, use=ansi+local, use=ansi+rca2,
++	use=ansi+sgrbold, use=bracketed+paste, use=dec+sl,
++	use=ecma+index, use=vt220+cvis, use=ecma+strikeout,
+ 	use=xterm+256color, use=xterm+acs, use=xterm+alt1049,
+ 	use=xterm+pcc2, use=xterm+pce2, use=xterm+pcf2,
++	use=report+version,
+ 
+ contour-direct|Contour terminal with direct colors,
+ 	use=xterm+direct, use=contour,
+@@ -19646,16 +19686,14 @@
+ 	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,
+-	kRIT=^L, ka1=^^, kb2=\EJ, kbs=^H, kc1=\ET, kc3=\EK, kcbt=\EI,
+-	kcub1=^H, kcud1=\n, kcuf1=^L, kcuu1=^K, kdch1=\EW, kend=\ET,
+-	kf1=^A@\r, kf10=^AI\r, kf11=^AJ\r, kf12=^AK\r, kf13=^AL\r,
+-	kf14=^AM\r, kf15=^AN\r, kf16=^AO\r, kf17=^A`\r, kf18=^Aa\r,
+-	kf19=^Ab\r, kf2=^AA\r, kf20=^Ac\r, kf21=^Ad\r, kf22=^Ae\r,
+-	kf23=^Af\r, kf24=^Ag\r, kf25=^Ah\r, kf26=^Ai\r, kf27=^Aj\r,
+-	kf28=^Ak\r, kf29=^Al\r, kf3=^AB\r, kf30=^Am\r, kf31=^An\r,
+-	kf32=^Ao\r, kf4=^AC\r, kf5=^AD\r, kf6=^AE\r, kf7=^AF\r,
+-	kf8=^AG\r, kf9=^AH\r, khome=^^, kich1=\Eq, knp=\EK, kpp=\EJ,
+-	kprt=\EP, mc0=\EP, mc4=^T, mc5=^R,
++	kRIT=^L, ka1=^^, kb2=\EJ, kc1=\ET, kc3=\EK, kcbt=\EI, kcub1=^H,
++	kcud1=\n, kcuf1=^L, kcuu1=^K, kdch1=\EW, kend=\ET,
++	kf12=^AK\r, kf13=^AL\r, kf14=^AM\r, kf15=^AN\r, kf16=^AO\r,
++	kf17=^A`\r, kf18=^Aa\r, kf19=^Ab\r, kf20=^Ac\r, kf21=^Ad\r,
++	kf22=^Ae\r, kf23=^Af\r, kf24=^Ag\r, kf25=^Ah\r, kf26=^Ai\r,
++	kf27=^Aj\r, kf28=^Ak\r, kf29=^Al\r, kf30=^Am\r, kf31=^An\r,
++	kf32=^Ao\r, khome=^^, kich1=\Eq, knp=\EK, kpp=\EJ, kprt=\EP,
++	mc0=\EP, mc4=^T, mc5=^R,
+ 	mrcup=\Ew@%p1%{48}%+%c%p2%{32}%+%c%p3%{32}%+%c$<10>,
+ 	nel=\037$<5>, rev=\EG4, ri=\Ej$<5>, rmacs=\EH\003\EcB0,
+ 	rmam=\Ed., rmir=\Er, rmso=\EG0, rmul=\EG0, rmxon=\Ec20,
+@@ -19670,7 +19708,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,
+-	use=ncr260vp+sl,
++	use=ncr260vp+sl, use=tvi920b+fn, use=ansi+arrows,
++	use=ansi+apparrows,
+ ncr260wy325wpp|NCR 2900/260 Wyse 325 wide mode,
+ 	cols#132,
+ 	cup=\Ea%i%p1%dR%p2%dC$<30>,
+@@ -27812,4 +27851,11 @@
+ #	+ add XM/xm to ms-terminal, to enable mouse with experimental Windows
+ #	  driver -TD
+ #
++# 2025-04-03
++#	+ add sclp -TD
++#	+ add op to vt525 -TD
++#
++# 2025-0405
++#	+ update contour -TD
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250329+/package/debian-mingw/changelog	2025-03-29 11:09:16.000000000 +0000
++++ ncurses-6.5-20250405/package/debian-mingw/changelog	2025-04-05 09:48:54.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250329) unstable; urgency=low
++ncurses6td (6.5+20250405) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 29 Mar 2025 07:09:16 -0400
++ -- Thomas E. Dickey   Sat, 05 Apr 2025 05:48:54 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250329+/package/debian-mingw64/changelog	2025-03-29 11:09:16.000000000 +0000
++++ ncurses-6.5-20250405/package/debian-mingw64/changelog	2025-04-05 09:48:54.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250329) unstable; urgency=low
++ncurses6td (6.5+20250405) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 29 Mar 2025 07:09:16 -0400
++ -- Thomas E. Dickey   Sat, 05 Apr 2025 05:48:54 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250329+/package/debian/changelog	2025-03-29 11:09:16.000000000 +0000
++++ ncurses-6.5-20250405/package/debian/changelog	2025-04-05 09:48:54.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250329) unstable; urgency=low
++ncurses6td (6.5+20250405) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 29 Mar 2025 07:09:16 -0400
++ -- Thomas E. Dickey   Sat, 05 Apr 2025 05:48:54 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.696 
+--- ncurses-6.5-20250329+/package/mingw-ncurses.nsi	2025-03-29 11:09:16.000000000 +0000
++++ ncurses-6.5-20250405/package/mingw-ncurses.nsi	2025-04-05 09:48:54.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.696 2025/03/29 11:09:16 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.697 2025/04/05 09:48:54 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0329"
++!define VERSION_MMDD  "0405"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250329+/package/mingw-ncurses.spec	2025-03-29 11:09:16.000000000 +0000
++++ ncurses-6.5-20250405/package/mingw-ncurses.spec	2025-04-05 09:48:54.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250329
++Release: 20250405
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20250329+/package/ncurses.spec	2025-03-29 11:09:16.000000000 +0000
++++ ncurses-6.5-20250405/package/ncurses.spec	2025-04-05 09:48:54.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250329
++Release: 20250405
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20250329+/package/ncursest.spec	2025-03-29 11:09:16.000000000 +0000
++++ ncurses-6.5-20250405/package/ncursest.spec	2025-04-05 09:48:54.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250329
++Release: 20250405
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/infocmp.c
+Prereq:  1.171 
+--- ncurses-6.5-20250329+/progs/infocmp.c	2024-12-21 17:02:07.000000000 +0000
++++ ncurses-6.5-20250405/progs/infocmp.c	2025-04-05 19:14:18.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 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.171 2024/12/21 17:02:07 tom Exp $")
++MODULE_ID("$Id: infocmp.c,v 1.174 2025/04/05 19:14:18 tom Exp $")
+ 
+ #ifndef ACTUAL_TIC
+ #define ACTUAL_TIC "tic"
+@@ -1291,30 +1291,67 @@
+     ExitProgram(EXIT_FAILURE);
+ }
+ 
++#define isName(c) ((c) == '_' || isalnum(UChar(c)))
++
+ static char *
+-any_initializer(const char *fmt, const char *type)
++safe_name(const char *format, const char *prefix, const char *name)
+ {
+-    static char *initializer;
++    static char *result;
+     static size_t need;
+     char *s;
+ 
+-    if (initializer == NULL) {
+-	need = (strlen(entries->tterm.term_names)
+-		+ strlen(type)
+-		+ strlen(fmt));
+-	initializer = (char *) malloc(need + 1);
+-	if (initializer == NULL)
+-	    failed("any_initializer");
++    if (result == NULL) {
++	need = (strlen(prefix)
++		+ strlen(name)
++		+ strlen(format));
++	result = (char *) malloc(need + 1);
++	if (result == NULL)
++	    failed("safe_name");
+     }
+ 
+-    _nc_STRCPY(initializer, entries->tterm.term_names, need);
+-    for (s = initializer; *s != 0 && *s != '|'; s++) {
+-	if (!isalnum(UChar(*s)))
++    _nc_STRCPY(result, "", need);
++    if (isdigit(UChar(*prefix)))
++	_nc_STRCAT(result, "ti_", need);
++    _nc_STRCAT(result, prefix, need);
++    for (s = result; *s != 0 && *s != '|'; s++) {
++	if (!isName(*s))
+ 	    *s = '_';
+     }
+     *s = 0;
+-    _nc_SPRINTF(s, _nc_SLIMIT(need) fmt, type);
+-    return initializer;
++    if (isdigit(UChar(*name)) && !*prefix)
++	*s++ = '_';
++    _nc_SPRINTF(s, _nc_SLIMIT(need) format, name);
++    return result;
++}
++
++/*
++ * escape contents of a double-quoted string.
++ */
++static char *
++safe_string(const char *source)
++{
++    static char *result;
++    static size_t need;
++    char *d;
++    if (result == NULL) {
++	need = 2 * strlen(source) + 1;
++	result = (char *) malloc(need + 1);
++    }
++    for (d = result; *source != '\0'; ++source) {
++	char ch = *source;
++	if (ch == '"' || ch == '\\') {
++	    *d++ = '\\';
++	}
++	*d++ = ch;
++    }
++    *d = '\0';
++    return result;
++}
++
++static char *
++any_initializer(const char *fmt, const char *type)
++{
++    return safe_name(fmt, entries->tterm.term_names, type);
+ }
+ 
+ static char *
+@@ -1329,6 +1366,53 @@
+     return any_initializer("_s_%s", type);
+ }
+ 
++#if NCURSES_XNAMES
++static char *
++name_of(const char *name)
++{
++    return safe_name("name_of_%s", "", name);
++}
++
++static void
++dump_extended_name(const char *name)
++{
++    static char **known;
++    static size_t dumped;
++    static size_t length;
++
++    if (name != NULL) {
++	bool found = FALSE;
++	if (length != 0) {
++	    size_t check;
++	    for (check = 0; check < dumped; ++check) {
++		if (!strcmp(name, known[check])) {
++		    found = TRUE;
++		    break;
++		}
++	    }
++	}
++	if (!found) {
++	    if (dumped + 2 > length) {
++		length += 100;
++		known = realloc(known, length * sizeof(*known));
++	    }
++	    printf("\n");
++	    printf("#ifndef %s\n", safe_name("extension_%s", "", name));
++	    printf("static char %s[] = \"%s\";\n", name_of(name), name);
++	    printf("#define %s 1\n", safe_name("extension_%s", "", name));
++	    printf("#endif\n");
++	    known[dumped] = strdup(name);
++	}
++    } else {
++	while (dumped != 0) {
++	    free(known[--dumped]);
++	}
++	free(known);
++	length = 0;
++    }
++}
++#endif
++
+ /* dump C initializers for the terminal type */
+ static void
+ dump_initializers(const TERMTYPE2 *term)
+@@ -1337,7 +1421,7 @@
+     const char *str = NULL;
+ 
+     printf("\nstatic char %s[] = \"%s\";\n\n",
+-	   name_initializer("alias"), entries->tterm.term_names);
++	   name_initializer("alias"), safe_string(entries->tterm.term_names));
+ 
+     for_each_string(n, term) {
+ 	if (VALID_STRING(term->Strings[n])) {
+@@ -1434,19 +1518,29 @@
+     if ((NUM_BOOLEANS(term) != BOOLCOUNT)
+ 	|| (NUM_NUMBERS(term) != NUMCOUNT)
+ 	|| (NUM_STRINGS(term) != STRCOUNT)) {
++	for (n = BOOLCOUNT; n < NUM_BOOLEANS(term); ++n) {
++	    dump_extended_name(ExtBoolname(term, (int) n, boolnames));
++	}
++	for (n = NUMCOUNT; n < NUM_NUMBERS(term); ++n) {
++	    dump_extended_name(ExtNumname(term, (int) n, numnames));
++	}
++	for (n = STRCOUNT; n < NUM_STRINGS(term); ++n) {
++	    dump_extended_name(ExtStrname(term, (int) n, strnames));
++	}
++	printf("\n");
+ 	(void) printf("static char * %s[] = %s\n",
+ 		      name_initializer("string_ext"), L_CURL);
+ 	for (n = BOOLCOUNT; n < NUM_BOOLEANS(term); ++n) {
+-	    (void) printf("\t/* %3u: bool */\t\"%s\",\n",
+-			  n, ExtBoolname(term, (int) n, boolnames));
++	    (void) printf("\t/* %3u: bool */\t%s,\n",
++			  n, name_of(ExtBoolname(term, (int) n, boolnames)));
+ 	}
+ 	for (n = NUMCOUNT; n < NUM_NUMBERS(term); ++n) {
+-	    (void) printf("\t/* %3u: num */\t\"%s\",\n",
+-			  n, ExtNumname(term, (int) n, numnames));
++	    (void) printf("\t/* %3u: num */\t%s,\n",
++			  n, name_of(ExtNumname(term, (int) n, numnames)));
+ 	}
+ 	for (n = STRCOUNT; n < NUM_STRINGS(term); ++n) {
+-	    (void) printf("\t/* %3u: str */\t\"%s\",\n",
+-			  n, ExtStrname(term, (int) n, strnames));
++	    (void) printf("\t/* %3u: str */\t%s,\n",
++			  n, name_of(ExtStrname(term, (int) n, strnames)));
+ 	}
+ 	(void) printf("%s;\n", R_CURL);
+     }
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250412.patch b/packages/ncurses/6.5/ncurses-6.5-20250412.patch
new file mode 100644
index 0000000000..b323383dae
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250412.patch
@@ -0,0 +1,1732 @@
+# ncurses 6.5 - patch 20250412 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250412.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sat Apr 12 23:35:07 UTC 2025
+# ------------------------------------------------------------------------------
+# NEWS                             |    7 
+# VERSION                          |    2 
+# dist.mk                          |    4 
+# misc/terminfo.src                |  769 +++++++++++++++++++------------------
+# 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 
+# 11 files changed, 432 insertions(+), 372 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4271 
+--- ncurses-6.5-20250405+/NEWS	2025-04-05 22:31:28.000000000 +0000
++++ ncurses-6.5-20250412/NEWS	2025-04-12 21:08:43.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4271 2025/04/05 22:31:28 tom Exp $
++-- $Id: NEWS,v 1.4273 2025/04/12 21:08:43 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.
+ 
++20250412
++	+ add pangoterm -TD
++	+ add kf1 to kf5 to sclp (report by Werner Fink)
++	+ add vt100+pf1-pf4 -TD
++
+ 20250405
+ 	+ improve formatting/style of manpages (patches by Branden Robinson).
+ 	+ improve infocmp -E/-e fallback feature (report by Ville Rissanen):
+Index: VERSION
+--- ncurses-6.5-20250405+/VERSION	2025-04-05 09:48:54.000000000 +0000
++++ ncurses-6.5-20250412/VERSION	2025-04-12 10:27:36.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250405
++5:0:10	6.5	20250412
+Index: dist.mk
+Prereq:  1.1663 
+--- ncurses-6.5-20250405+/dist.mk	2025-04-05 09:48:54.000000000 +0000
++++ ncurses-6.5-20250412/dist.mk	2025-04-12 10:27:36.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1663 2025/04/05 09:48:54 tom Exp $
++# $Id: dist.mk,v 1.1664 2025/04/12 10:27:36 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 = 5
+-NCURSES_PATCH = 20250405
++NCURSES_PATCH = 20250412
+ 
+ # 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.5-20250405+/misc/terminfo.src	2025-04-05 20:08:00.000000000 +0000
++++ ncurses-6.5-20250412/misc/terminfo.src	2025-04-12 21:05:39.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.1180 $
+-#	$Date: 2025/04/05 20:08:00 $
++#	$Revision: 1.1184 $
++#	$Date: 2025/04/12 21:05:39 $
+ #
+ # 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
+@@ -836,14 +836,13 @@
+ 	cuf1=\EC, cup=\E[%i%p1%d;%p2%dH, cuu1=\EA, dch1=\Ea,
+ 	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K,
+ 	el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il1=\EL,
+-	ind=\n, is2=\E<\E)0, kdch1=^?, kf1=\EOP, kf10=\EOY, kf11=\Ep,
+-	kf12=\Eq, kf13=\Er, kf14=\Es, kf15=\Et, kf16=\Eu, kf17=\Ev,
+-	kf18=\Ew, kf19=\Ex, kf2=\EOQ, kf20=\Ey, kf3=\EOR, kf4=\EOS,
+-	kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX, khlp=\EH,
+-	khome=\E\EE, kich1=\EI, knp=\Eb, kpp=\E\Ea, kund=\EK,
+-	ll=\E[24H, nel=\EE, oc=\E[30;47m, op=\E[30;47m, rev=\E[7m,
+-	ri=\EM, rmacs=^O, rmcup=\E[?7h, rmir=\Ei, rmkx=\E[?1l\E>,
+-	rmso=\E[m, rmul=\E[m,
++	ind=\n, is2=\E<\E)0, kdch1=^?, kf10=\EOY, kf11=\Ep, kf12=\Eq,
++	kf13=\Er, kf14=\Es, kf15=\Et, kf16=\Eu, kf17=\Ev, kf18=\Ew,
++	kf19=\Ex, kf20=\Ey, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW,
++	kf9=\EOX, khlp=\EH, khome=\E\EE, kich1=\EI, knp=\Eb,
++	kpp=\E\Ea, kund=\EK, ll=\E[24H, nel=\EE, oc=\E[30;47m,
++	op=\E[30;47m, rev=\E[7m, ri=\EM, rmacs=^O, rmcup=\E[?7h,
++	rmir=\Ei, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+ 	rs1=\E<\E[20l\E[?3;6;9l\E[r\Eq\E(B\017\E)0\E>,
+ 	setb=\E[4%p1%'0'%+%Pa%?%ga%'0'%=%t0%e%ga%'1'%=%t4%e%ga%'2'%=
+ 	     %t2%e%ga%'3'%=%t6%e%ga%'4'%=%t1%e%ga%'5'%=%t5%e%ga%'6'
+@@ -854,6 +853,7 @@
+ 	sgr0=\E[m, smacs=^N, smcup=\E[?7l, smir=\Eh,
+ 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ 	use=ansi+apparrows, use=ansi+csr, use=ansi+local,
++	use=vt100+pf1-pf4,
+ 
+ # The entries for stv52 and stv52pc probably need a revision.
+ stv52|MiNT virtual console,
+@@ -1255,13 +1255,14 @@
+ 	dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el1=\E[1K,
+ 	enacs=\E)0, ht=^I, ich=\E[%p1%d@, ind=\ED, is2=\Ec, kbs=^H,
+ 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+-	kdch1=\E[3~, kf5=\E[E, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM,
++	kdch1=\E[3~, kf5=\E[15~, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM,
+ 	rmacs=\E(B$<4>, rmso=\E[27m, rmul=\E[24m, sc=\E7,
+ 	sgr=\E[0%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e
+ 	    \E(B%;$<2>,
+ 	sgr0=\E[m\E(B, smacs=\E(0$<2>, smso=\E[7m, smul=\E[4m,
+ 	use=klone+color, use=ansi+cpr, use=ansi+erase,
+-	use=ansi+local, use=linux+sfkeys, use=vt220+ufkeys,
++	use=ansi+local, use=linux+sfkeys, use=vt100+pf1-pf4,
++	use=vt220+ufkeys,
+ 
+ #### Mach
+ #
+@@ -1273,11 +1274,11 @@
+ 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\Ec, cr=\r, cub1=^H,
+ 	cud1=\n, cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K,
+ 	home=\E[H, ht=^I, ind=\n, kbs=^?, kdch1=\E[9, kend=\E[Y,
+-	kf1=\EOP, kf10=\EOY, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT,
+-	kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX, kich1=\E[@, kll=\E[F,
+-	knp=\E[U, kpp=\E[V, rev=\E[7m, rmso=\E[0m, rmul=\E[24m,
+-	sgr0=\E[0m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
+-	use=ansi+idl, use=ansi+local,
++	kf10=\EOY, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX,
++	kich1=\E[@, kll=\E[F, knp=\E[U, kpp=\E[V, rev=\E[7m,
++	rmso=\E[0m, rmul=\E[24m, sgr0=\E[0m, smso=\E[7m,
++	smul=\E[4m, use=ansi+arrows, use=ansi+idl,
++	use=ansi+local, use=vt100+pf1-pf4,
+ 
+ mach-bold|Mach console with bold instead of underline,
+ 	rmul=\E[0m, smul=\E[1m, use=mach,
+@@ -1342,10 +1343,9 @@
+ 	bel=^G, cbt=\E[Z, clear=\Ec, cr=\r, cub1=^H, cvvis=\E[34l,
+ 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX,
+ 	el1=\E[1K, flash=\Eg, ht=^I, ich=\E[%p1%d@, ind=\E[S,
+-	kb2=\E[G, kbs=^?, kcbt=\E[Z, kf1=\EOP, kf2=\EOQ, kf3=\EOR,
+-	kf4=\EOS, khome=\E[1~, kmous=\E[M, kspd=^Z, nel=\r\n,
+-	op=\E[39;49m, ri=\E[T, rmir=\E[4l, rmso=\E[27m,
+-	rmul=\E[24m, rs1=\EM\E[?1000l,
++	kb2=\E[G, kbs=^?, kcbt=\E[Z, khome=\E[1~, kmous=\E[M,
++	kspd=^Z, nel=\r\n, op=\E[39;49m, ri=\E[T, rmir=\E[4l,
++	rmso=\E[27m, rmul=\E[24m, rs1=\EM\E[?1000l,
+ 	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;
+ 	    2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
+ 	smir=\E[4h, grbom=\E[>1l, gsbom=\E[>1h,
+@@ -1353,8 +1353,8 @@
+ 	use=ansi+erase, use=ansi+idl, use=ansi+local,
+ 	use=ansi+rca2, use=ansi+sgrbold, use=vt220+pcedit,
+ 	use=ecma+index, use=ecma+italics, use=klone+acs,
+-	use=klone+color, use=linux+sfkeys, use=xterm+r5+fkeys,
+-	use=vt220+cvis,
++	use=klone+color, use=linux+sfkeys, use=vt100+pf1-pf4,
++	use=vt220+cvis, use=xterm+r5+fkeys,
+ 
+ #### QNX
+ #
+@@ -1472,14 +1472,13 @@
+ 	kLFT=\E[d, kNXT=\E[u, kOPT=\ENz, kPRV=\E[v, kRIT=\E[c,
+ 	kcan=\E[S, kcbt=\E[Z, kclo=\ENc, kclr=\ENa, kcmd=\E[G,
+ 	kcpy=\E[g, kctab=\E[z, kdch1=\E[P, kdl1=\E[p, kend=\E[Y,
+-	kext=\E[y, kf1=\EOP, kf10=\EOY, kf11=\EOZ, kf12=\EOA,
+-	kf13=\EOp, kf14=\EOq, kf15=\EOr, kf16=\EOs, kf17=\EOt,
+-	kf18=\EOu, kf19=\EOv, kf2=\EOQ, kf20=\EOw, kf21=\EOx,
+-	kf22=\EOy, kf23=\EOz, kf24=\EOa, kf25=\E[1~, kf26=\E[2~,
+-	kf27=\E[3~, kf28=\E[4~, kf29=\E[5~, kf3=\EOR, kf30=\E[6~,
+-	kf31=\E[7~, kf32=\E[8~, kf33=\E[9~, kf34=\E[10~,
+-	kf35=\E[11~, kf36=\E[12~, kf37=\E[17~, kf38=\E[18~,
+-	kf39=\E[19~, kf4=\EOS, kf40=\E[20~, kf41=\E[21~,
++	kext=\E[y, kf10=\EOY, kf11=\EOZ, kf12=\EOA, kf13=\EOp,
++	kf14=\EOq, kf15=\EOr, kf16=\EOs, kf17=\EOt, kf18=\EOu,
++	kf19=\EOv, kf20=\EOw, kf21=\EOx, kf22=\EOy, kf23=\EOz,
++	kf24=\EOa, kf25=\E[1~, kf26=\E[2~, kf27=\E[3~, kf28=\E[4~,
++	kf29=\E[5~, kf30=\E[6~, kf31=\E[7~, kf32=\E[8~, kf33=\E[9~,
++	kf34=\E[10~, kf35=\E[11~, kf36=\E[12~, kf37=\E[17~,
++	kf38=\E[18~, kf39=\E[19~, kf40=\E[20~, kf41=\E[21~,
+ 	kf42=\E[22~, kf43=\E[23~, kf44=\E[24~, kf45=\E[25~,
+ 	kf46=\E[26~, kf47=\E[27~, kf48=\E[28~, kf5=\EOT, kf6=\EOU,
+ 	kf7=\EOV, kf8=\EOW, kf9=\EOX, kfnd=\ENf, khlp=\ENh,
+@@ -1501,7 +1500,7 @@
+ 	tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH, use=ansi+arrows,
+ 	use=ansi+local, use=ansi+rep, use=ansi+inittabs,
+ 	use=ansi+sgrbold, use=att610+cvis0, use=decid+cpr,
+-	use=ecma+index,
++	use=ecma+index, use=vt100+pf1-pf4,
+ #
+ qansi|QNX ANSI with console writes,
+ 	daisy, xhpa, use=qansi-g,
+@@ -1813,9 +1812,9 @@
+ #	OpenBSD implements a color variation
+ 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~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[17~,
+-	kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, kf9=\E[21~, use=pcvtXX,
++	is2=\E[1;25r\E[25;1H, kf10=\E[29~, kf11=\E[23~,
++	kf12=\E[24~, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~,
++	kf8=\E[20~, kf9=\E[21~, use=vt100+pf1-pf4, use=pcvtXX,
+ 	use=ecma+color, use=vt220+sfkeys,
+ 
+ # Terminfo entries to enable the use of the ncurses library in colour on a
+@@ -2183,11 +2182,10 @@
+ 	acsc=0\333a\260f\370g\361h\261j\331k\277l\332m\300n\305q
+ 	     \304t\303u\264v\301w\302x\263y\363z\362~\371,
+ 	cvvis@, hpa=\E[%i%p1%dG, hts=\EH, kdch1=\E[3~, kent=\r,
+-	kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ,
+-	kf3=\EOR, kf4=\EOS, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
+-	kf8=\E[19~, kf9=\E[20~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
+-	rmir=\E[4l, smir=\E[4h, tbc=\E[3g, use=vt220+cvis,
+-	use=cons25,
++	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf5=\E[15~,
++	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
++	kich1=\E[2~, knp=\E[6~, kpp=\E[5~, rmir=\E[4l, smir=\E[4h,
++	tbc=\E[3g, use=vt100+pf1-pf4, use=vt220+cvis, use=cons25,
+ 
+ teken-2022|teken as of 2022,
+ 	am, bce, eo, mir, msgr, npc, NQ,
+@@ -2203,8 +2201,8 @@
+ 	use=ansi+tabs, use=klone+color,
+ 
+ teken-vt+fkeys|teken's xterm special keys,
+-	kend=\E[F, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+-	khome=\E[H, use=vt220+pcedit, use=xterm+r5+fkeys,
++	kend=\E[F, khome=\E[H, use=vt100+pf1-pf4,
++	use=vt220+pcedit, use=xterm+r5+fkeys,
+ 
+ teken-sc+fkeys|teken's syscons special keys,
+ 	kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W,
+@@ -2439,9 +2437,10 @@
+ # support:
+ vt100+keypad|DEC VT100 numeric keypad no fkeys,
+ 	ka1=\EOq, ka3=\EOs, kb2=\EOr, kc1=\EOp, kc3=\EOn,
++vt100+pf1-pf4|DEC VT100 PF1-PF4,
++	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+ vt100+pfkeys|DEC VT100 numeric keypad (kf1-kf4),
+-	kent=\EOM, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+-	use=vt100+keypad,
++	kent=\EOM, use=vt100+pf1-pf4, use=vt100+keypad,
+ vt100+fnkeys|DEC VT100 numeric keypad (kf0-kf10),
+ 	kf0=\EOy, kf10=\EOx, kf5=\EOt, kf6=\EOu, kf7=\EOv, kf8=\EOl,
+ 	kf9=\EOw, use=vt100+pfkeys,
+@@ -2616,13 +2615,13 @@
+ 	cuf1=\E[C$<2/>, cup=\E[%i%p1%d;%p2%dH$<5/>,
+ 	cuu1=\E[A$<2/>, ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H,
+ 	ht=^I, is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\EOD,
+-	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf2=\EOQ,
+-	kf3=\EOR, kf4=\EOS, nel=\r\n, rev=\E[7m$<2/>, ri=\EM$<5/>,
+-	rmam=\E[?7h, rmkx=\E[?1l\E>, rmso=\E[m$<2/>,
+-	rmul=\E[m$<2/>,
++	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, nel=\r\n,
++	rev=\E[7m$<2/>, ri=\EM$<5/>, rmam=\E[?7h, rmkx=\E[?1l\E>,
++	rmso=\E[m$<2/>, rmul=\E[m$<2/>,
+ 	rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+ 	sgr0=\E[m$<2/>, smam=\E[?7h, smkx=\E[?1h\E=,
+ 	smso=\E[7m$<2/>, smul=\E[4m$<2/>, use=ansi+csr,
++	use=vt100+pf1-pf4,
+ 
+ # vt132 - like vt100 but slower and has ins/del line and such.
+ # I'm told that / are backwards in the terminal from the
+@@ -2651,19 +2650,18 @@
+ 	cup=\E[%i%p1%d;%p2%dH$<10>, dch1=\E[P, ed=\E[J$<50>,
+ 	el=\E[K$<3>, home=\E[H, ht=^I,
+ 	if=/usr/share/tabset/vt100, ind=\ED$<20/>,
+-	is2=\E[1;24r\E[24;1H, kf1=\EOP, kf10=\E[29~, kf2=\EOQ,
+-	kf3=\EOR, kf4=\EOS, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~,
+-	kf8=\E[20~, kf9=\E[21~, khome=\E[1~, kich1=\E[2~,
+-	rev=\E[7m$<2>, rf=/usr/share/tabset/vt100,
+-	ri=\EM$<14/>, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l,
+-	rmso=\E[27m, rmul=\E[24m,
+-	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
++	is2=\E[1;24r\E[24;1H, kf10=\E[29~, kf5=\E[17~,
++	kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, kf9=\E[21~,
++	khome=\E[1~, kich1=\E[2~, rev=\E[7m$<2>,
++	rf=/usr/share/tabset/vt100, ri=\EM$<14/>,
++	rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, rmso=\E[27m,
++	rmul=\E[24m, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
+ 	    %p9%t\E(0%e\E(B%;$<2>,
+ 	sgr0=\E[m$<2>, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h,
+ 	smso=\E[7m, smul=\E[4m, use=ansi+arrows, use=ansi+csr,
+-	use=ansi+idl1, use=ansi+local1, use=vt220+pcedit,
+-	use=vt220+cvis,
++	use=ansi+idl1, use=ansi+local1, use=vt100+pf1-pf4,
++	use=vt220+pcedit, use=vt220+cvis,
+ 
+ # Here's a picture of the Sun/PC editing keypad:
+ #	+--------+--------+--------+
+@@ -2711,19 +2709,19 @@
+ 	enacs=\E)0, flash=\E[?5h$<200/>\E[?5l, ht=^I, hts=\EH,
+ 	ich=\E[%p1%d@, if=/usr/share/tabset/vt100, ind=\ED,
+ 	is2=\E[?7h\E[>\E[?1l\E F\E[?4l, kbs=^H, kcub1=\E[D,
+-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf13=\E[25~,
++	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf13=\E[25~,
+ 	kf14=\E[26~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
+-	kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS, khlp=\E[28~,
+-	krdo=\E[29~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, nel=\EE,
+-	rev=\E[7m, ri=\EM, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l,
+-	rmso=\E[27m, rmul=\E[24m, rs1=\E[?3l,
++	kf20=\E[34~, khlp=\E[28~, krdo=\E[29~, lf1=pf1, lf2=pf2,
++	lf3=pf3, lf4=pf4, nel=\EE, rev=\E[7m, ri=\EM, rmacs=\E(B$<4>,
++	rmam=\E[?7l, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
++	rs1=\E[?3l,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
+ 	    %p9%t\E(0%e\E(B%;$<2>,
+ 	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=ansi+csr,
+ 	use=ansi+cup, use=ansi+pp, use=ansi+enq, use=ansi+erase,
+-	use=ansi+idl, use=ansi+local, use=vt220+vtedit,
+-	use=vt220+ufkeys,
++	use=ansi+idl, use=ansi+local, use=vt100+pf1-pf4,
++	use=vt220+vtedit, use=vt220+ufkeys,
+ 
+ vt220|vt200|DEC VT220,
+ 	use=vt220+cvis, use=vt220-base,
+@@ -2745,20 +2743,20 @@
+ 	il=\233%p1%dL, il1=\233L, ind=\ED,
+ 	is2=\233?7h\233>\233?1l\E F\233?4l, kbs=^H,
+ 	kcub1=\233D, kcud1=\233B, kcuf1=\233C, kcuu1=\233A,
+-	kdch1=\2333~, kf1=\EOP, kf10=\23321~, kf11=\23323~,
+-	kf12=\23324~, kf13=\23325~, kf14=\23326~, kf17=\23331~,
+-	kf18=\23332~, kf19=\23333~, kf2=\EOQ, kf20=\23334~,
+-	kf3=\EOR, kf4=\EOS, kf6=\23317~, kf7=\23318~, kf8=\23319~,
+-	kf9=\23320~, kfnd=\2331~, khlp=\23328~, khome=\233H,
+-	kich1=\2332~, knp=\2336~, kpp=\2335~, krdo=\23329~,
+-	kslt=\2334~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, mc0=\233i,
+-	mc4=\2334i, mc5=\2335i, nel=\EE, rc=\E8, rev=\2337m, ri=\EM,
+-	rmacs=\E(B, rmam=\233?7l, rmir=\2334l, rmso=\23327m,
+-	rmul=\23324m, rs1=\233?3l, sc=\E7,
++	kdch1=\2333~, kf10=\23321~, kf11=\23323~, kf12=\23324~,
++	kf13=\23325~, kf14=\23326~, kf17=\23331~, kf18=\23332~,
++	kf19=\23333~, kf20=\23334~, kf6=\23317~, kf7=\23318~,
++	kf8=\23319~, kf9=\23320~, kfnd=\2331~, khlp=\23328~,
++	khome=\233H, kich1=\2332~, knp=\2336~, kpp=\2335~,
++	krdo=\23329~, kslt=\2334~, lf1=pf1, lf2=pf2, lf3=pf3,
++	lf4=pf4, mc0=\233i, mc4=\2334i, mc5=\2335i, nel=\EE, rc=\E8,
++	rev=\2337m, ri=\EM, rmacs=\E(B, rmam=\233?7l, rmir=\2334l,
++	rmso=\23327m, rmul=\23324m, rs1=\233?3l, sc=\E7,
+ 	sgr=\2330%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m
+ 	    %?%p9%t\E(0%e\E(B%;$<2>,
+ 	sgr0=\2330m\E(B, smacs=\E(0, smam=\233?7h, smir=\2334h,
+-	smso=\2337m, smul=\2334m, tbc=\2333g, use=vt220+cvis8,
++	smso=\2337m, smul=\2334m, tbc=\2333g, use=vt100+pf1-pf4,
++	use=vt220+cvis8,
+ 
+ # vt220d:
+ # This VT220 description regards F6--F10 as the second block of function keys
+@@ -2809,12 +2807,12 @@
+ 	is2=\E[61"p\E[H\E[?3l\E[?4l\E[?1h\E[?5l\E[?6l\E[?7h\E[?8h\E[
+ 	    ?25h\E>\E[m,
+ 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\r\ED,
+-	rf=/usr/share/tabset/vt100, ri=\EM, rmdc=, rmir=\E[4l,
+-	rmkx=\E[?1l\E>, rmso=\E[27m$<5/>, rmul=\E[24m,
+-	rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, smdc=,
+-	smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m$<5/>, smul=\E[4m,
+-	use=ansi+csr, use=ansi+erase, use=vt220+cvis,
++	nel=\r\ED, rf=/usr/share/tabset/vt100, ri=\EM, rmdc=,
++	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m$<5/>,
++	rmul=\E[24m, rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
++	smdc=, smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m$<5/>,
++	smul=\E[4m, use=ansi+csr, use=ansi+erase,
++	use=vt100+pf1-pf4, use=vt220+cvis,
+ 
+ # This was DEC's VT320.  Use the purpose-built one below instead
+ #vt320|DEC VT320 in VT100 emulation mode,
+@@ -2909,9 +2907,8 @@
+ 	is2=\E<\E\sF\E>\E[?1h\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r
+ 	    \E[24;1H,
+ 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf6=\E[17~,
+-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, lf1=pf1, lf2=pf2,
+-	lf3=pf3, lf4=pf4, nel=\r\ED, rev=\E[7m,
++	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, lf1=pf1,
++	lf2=pf2, lf3=pf3, lf4=pf4, nel=\r\ED, rev=\E[7m,
+ 	rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B,
+ 	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
+ 	rmul=\E[24m, rs1=\E[?3l,
+@@ -2920,7 +2917,8 @@
+ 	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
+ 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ 	tsl=\E[2$~\E[1$}\E[1;%dH, use=ansi+csr, use=ansi+erase,
+-	use=ansi+idl, use=ansi+local, use=vt220+cvis,
++	use=ansi+idl, use=ansi+local, use=vt100+pf1-pf4,
++	use=vt220+cvis,
+ 
+ # Left/right margins are supported in xterm since patch #279 (2012/05/10)
+ vt420+lrmm|VT420 left/right margins,
+@@ -2960,9 +2958,8 @@
+ 	is2=\E<\E\sF\E>\E[?1h\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r
+ 	    \E[24;1H,
+ 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf6=\E[17~,
+-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, lf1=pf1, lf2=pf2,
+-	lf3=pf3, lf4=pf4, nel=\r\ED, rev=\E[7m,
++	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, lf1=pf1,
++	lf2=pf2, lf3=pf3, lf4=pf4, nel=\r\ED, rev=\E[7m,
+ 	rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B,
+ 	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
+ 	rs1=\E<\E[?3l\E[!p\E[?7h,
+@@ -2972,7 +2969,7 @@
+ 	smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ 	tsl=\E[2$~\E[1$}\E[1;%dH, use=ansi+csr, use=ansi+cup,
+ 	use=ansi+idc, use=ansi+idl, use=ansi+local, use=dec+sl,
+-	use=vt220+cvis,
++	use=vt100+pf1-pf4, use=vt220+cvis,
+ 
+ # (vt420: I removed , it collided with .  I also restored
+ # a missing  -- esr)
+@@ -2989,10 +2986,10 @@
+ 	hts=\EH, ich=\E[%p1%d@, if=/usr/share/tabset/vt300,
+ 	ind=\ED, is2=\E[1;24r\E[24;1H, is3=\E[?67h\E[64;1"p,
+ 	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+-	kf1=\EOP, kf10=\E[29~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+-	kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, kf9=\E[21~,
+-	nel=\EE, rev=\E[7m$<2>, rf=/usr/share/tabset/vt300,
+-	ri=\EM, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, rmkx=\E>,
++	kf10=\E[29~, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~,
++	kf8=\E[20~, kf9=\E[21~, nel=\EE, rev=\E[7m$<2>,
++	rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B$<4>,
++	rmam=\E[?7l, rmir=\E[4l, rmkx=\E>,
+ 	rmsc=\E[?0;0r\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+ 	rmso=\E[27m, rmul=\E[24m, rs3=\E[?67h\E[64;1"p,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
+@@ -3000,8 +2997,8 @@
+ 	sgr0=\E[m\E(B$<2>, smacs=\E(0$<2>, smam=\E[?7h,
+ 	smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ 	use=ansi+csr, use=ansi+enq, use=ansi+idl, use=ansi+pp,
+-	use=ansi+local, use=dec+sl, use=vt220+cvis,
+-	use=vt420+lrmm, use=vt220+vtedit,
++	use=ansi+local, use=dec+sl, use=vt100+pf1-pf4,
++	use=vt220+cvis, use=vt420+lrmm, use=vt220+vtedit,
+ 
+ # DEC VT220 and up support DECUDK (user-defined keys).  DECUDK (i.e., pfx)
+ # takes two parameters, the key and the string.  Translating the key is
+@@ -3079,7 +3076,7 @@
+ 	cols#132, use=vt520,
+ 
+ # See "4.7.5 Visual Attributes Control Functions" and
+-# "Table 5–15 (Cont.) Visual Character Attribute Values"
++# "Table 5-15 (Cont.) Visual Character Attribute Values"
+ # in EK-VT520-RM
+ vt525|DEC VT525,
+ 	colors#8, pairs#64,
+@@ -3135,10 +3132,9 @@
+ # The missing "=" in smkx is not a typo (here), but an error in tkterm.
+ tt|tkterm|Don Libes' tk text widget terminal emulator,
+ 	clear=\E[H\E[J, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
+-	cup=\E[%p1%d;%p2%dH, cuu1=\E[A, ind=\n, kf1=\EOP, kf2=\EOQ,
+-	kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW,
+-	kf9=\EOX, rmkx=\E[?1l\E>, rmso=\E[m, smkx=\E[?1h\E,
+-	smso=\E[7m,
++	cup=\E[%p1%d;%p2%dH, cuu1=\E[A, ind=\n, kf5=\EOT, kf6=\EOU,
++	kf7=\EOV, kf8=\EOW, kf9=\EOX, rmkx=\E[?1l\E>, rmso=\E[m,
++	smkx=\E[?1h\E, smso=\E[7m, use=vt100+pf1-pf4,
+ 
+ ######## APPLE
+ 
+@@ -4292,8 +4288,7 @@
+ 	use=putty+fnkeys+esc,
+ 
+ putty+fnkeys+xterm|Xterm R6 fn-keys for PuTTY,
+-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+-	use=putty+fnkeys+esc,
++	use=vt100+pf1-pf4, use=putty+fnkeys+esc,
+ 
+ putty+fnkeys+vt400|VT400 fn-keys for PuTTY,
+ 	use=putty+fnkeys+esc,
+@@ -4301,9 +4296,9 @@
+ # Shifted F1 is F11.  F13-F20 inherit from the defaults, and the last distinct
+ # key is F20.
+ putty+fnkeys+vt100|VT100+ fn-keys for PuTTY,
+-	kf1=\EOP, kf10=\EOY, kf11=\EOZ, kf12=\EO[, kf2=\EOQ,
+-	kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW,
+-	kf9=\EOX, use=putty+fnkeys+esc,
++	kf10=\EOY, kf11=\EOZ, kf12=\EO[, kf5=\EOT, kf6=\EOU,
++	kf7=\EOV, kf8=\EOW, kf9=\EOX, use=vt100+pf1-pf4,
++	use=putty+fnkeys+esc,
+ 
+ # Unlike xterm-sco, this leaves kmous ambiguous with kf1.
+ #
+@@ -4314,8 +4309,7 @@
+ # F37-F48 - control/shift
+ #
+ putty+fnkeys+sco|SCO fn-keys for PuTTY,
+-	kbeg=\E[E, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+-	kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W,
++	kbeg=\E[E, kdch1=^?, kf1=\E[M, kf10=\E[V, kf11=\E[W,
+ 	kf12=\E[X, kf13=\E[Y, kf14=\E[Z, kf15=\E[a, kf16=\E[b,
+ 	kf17=\E[c, kf18=\E[d, kf19=\E[e, kf2=\E[N, kf20=\E[f,
+ 	kf21=\E[g, kf22=\E[h, kf23=\E[i, kf24=\E[j, kf25=\E[k,
+@@ -4324,8 +4318,8 @@
+ 	kf35=\E[u, kf36=\E[v, kf37=\E[w, kf38=\E[x, kf39=\E[y,
+ 	kf4=\E[P, kf40=\E[z, kf41=\E[@, kf42=\E[[, kf43=\E[\\,
+ 	kf44=\E[], kf45=\E[\^, kf46=\E[_, kf47=\E[`, kf48=\E[{,
+-	kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, khome=\E[H,
+-	kich1=\E[L, knp=\E[G, kpp=\E[I,
++	kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, kich1=\E[L,
++	knp=\E[G, kpp=\E[I, use=vt100+noapp,
+ 
+ #### mintty
+ # https://github.com/mintty/mintty
+@@ -4863,11 +4857,11 @@
+ 	cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+ 	cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, ed=\E[J, el=\E[K,
+ 	home=\E[H, ht=^I, ind=\n, is2=\E\E[m\E[?7h\E[?1;4l, kbs=^H,
+-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP,
+-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, rev=\E[7m, ri=\EM, rmam=\E[?7l,
+-	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, use=ansi+idl,
++	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, rev=\E[7m,
++	ri=\EM, rmam=\E[?7l, 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, use=ansi+idl,
++	use=vt100+pf1-pf4,
+ 
+ # csl is extension which clears the status line
+ x10term+sl|status-line for X10 xterm,
+@@ -4970,7 +4964,7 @@
+ # This is the stock xterm entry supplied with XFree86 3.3, which uses VT100
+ # codes for F1-F4 except while in VT220 mode.
+ xterm-xf86-v33|xterm terminal emulator (XFree86 3.3 Window System),
+-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=xterm-xf86-v32,
++	use=vt100+pf1-pf4, use=xterm-xf86-v32,
+ 
+ # This version was released in XFree86 3.3.3 (November 1998).
+ # Besides providing printer support, it exploits a new feature that allows
+@@ -5065,7 +5059,7 @@
+ 	kbs=^H,
+ 
+ # Use this fragment for terminals that always use DEL for "backspace".
+-linux+kbs|fragment for "backspace" key,
++linux+kbs|Linux fragment for "backspace" key,
+ 	kbs=^?,
+ #
+ # This fragment describes as much of XFree86 xterm's "pc-style" function
+@@ -5108,9 +5102,8 @@
+ 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+ 	use=vt100+noapp+pc,
+ 
+-xterm+noapp|fragment with cursor keys in normal mode,
+-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kend=\E[F,
+-	khome=\E[H,
++xterm+noapp|alias for vt100+noapp,
++	use=vt100+noapp,
+ 
+ xterm+app|fragment with cursor keys in application mode,
+ 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+@@ -5193,41 +5186,39 @@
+ # Here are corresponding fragments from xterm patch #216:
+ #
+ xterm+pcf0|fragment with modifyFunctionKeys:0,
+-	kf1=\EOP, kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R, kf16=\EO2S,
+-	kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, kf2=\EOQ,
++	kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R, kf16=\EO2S,
++	kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~,
+ 	kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~,
+ 	kf23=\E[23;2~, kf24=\E[24;2~, kf25=\EO5P, kf26=\EO5Q,
+-	kf27=\EO5R, kf28=\EO5S, 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~, kf37=\EO6P, kf38=\EO6Q, kf39=\EO6R,
+-	kf4=\EOS, kf40=\EO6S, kf41=\E[15;6~, kf42=\E[17;6~,
+-	kf43=\E[18;6~, kf44=\E[19;6~, kf45=\E[20;6~,
+-	kf46=\E[21;6~, kf47=\E[23;6~, kf48=\E[24;6~, kf49=\EO3P,
+-	kf50=\EO3Q, kf51=\EO3R, kf52=\EO3S, kf53=\E[15;3~,
+-	kf54=\E[17;3~, kf55=\E[18;3~, kf56=\E[19;3~,
+-	kf57=\E[20;3~, kf58=\E[21;3~, kf59=\E[23;3~,
+-	kf60=\E[24;3~, kf61=\EO4P, kf62=\EO4Q, kf63=\EO4R,
+-	use=xterm+nopcfkeys,
+-#
+-xterm+pcf2|fragment with modifyFunctionKeys:2,
+-	kf1=\EOP, 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~, kf37=\E[1;6P, kf38=\E[1;6Q,
+-	kf39=\E[1;6R, kf4=\EOS, kf40=\E[1;6S, kf41=\E[15;6~,
++	kf27=\EO5R, kf28=\EO5S, kf29=\E[15;5~, 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~, kf37=\EO6P,
++	kf38=\EO6Q, kf39=\EO6R, kf40=\EO6S, kf41=\E[15;6~,
+ 	kf42=\E[17;6~, kf43=\E[18;6~, kf44=\E[19;6~,
+ 	kf45=\E[20;6~, kf46=\E[21;6~, kf47=\E[23;6~,
+-	kf48=\E[24;6~, kf49=\E[1;3P, kf50=\E[1;3Q, kf51=\E[1;3R,
+-	kf52=\E[1;3S, kf53=\E[15;3~, kf54=\E[17;3~,
++	kf48=\E[24;6~, kf49=\EO3P, kf50=\EO3Q, kf51=\EO3R,
++	kf52=\EO3S, kf53=\E[15;3~, kf54=\E[17;3~, kf55=\E[18;3~,
++	kf56=\E[19;3~, kf57=\E[20;3~, kf58=\E[21;3~,
++	kf59=\E[23;3~, kf60=\E[24;3~, kf61=\EO4P, kf62=\EO4Q,
++	kf63=\EO4R, use=vt100+pf1-pf4, use=xterm+nopcfkeys,
++#
++xterm+pcf2|fragment with modifyFunctionKeys:2,
++	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~,
++	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~, 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~,
++	kf37=\E[1;6P, kf38=\E[1;6Q, kf39=\E[1;6R, kf40=\E[1;6S,
++	kf41=\E[15;6~, kf42=\E[17;6~, kf43=\E[18;6~,
++	kf44=\E[19;6~, kf45=\E[20;6~, kf46=\E[21;6~,
++	kf47=\E[23;6~, kf48=\E[24;6~, kf49=\E[1;3P, kf50=\E[1;3Q,
++	kf51=\E[1;3R, kf52=\E[1;3S, kf53=\E[15;3~, kf54=\E[17;3~,
+ 	kf55=\E[18;3~, kf56=\E[19;3~, kf57=\E[20;3~,
+ 	kf58=\E[21;3~, kf59=\E[23;3~, kf60=\E[24;3~,
+ 	kf61=\E[1;4P, kf62=\E[1;4Q, kf63=\E[1;4R,
+-	use=xterm+nopcfkeys,
++	use=vt100+pf1-pf4, use=xterm+nopcfkeys,
+ #
+ # Chunks from xterm #230:
+ xterm+pce2|fragment with modifyCursorKeys:2 editing-keys,
+@@ -5424,6 +5415,10 @@
+ 	      ;%p1%d%;m,
+ 	setb@, setf@,
+ 
++xterm+256setaf2|xterm 256-color (set-only with colon),
++	ccc@,
++	initc@, use=xterm+256setaf,
++
+ # 88-colors is a compile-time feature of XFree86 xterm beginning with
+ # xterm patch #115 (1999/9/18) -TD
+ #
+@@ -6168,8 +6163,8 @@
+ # 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=linux+kbs, use=xterm-color,
++	kdch1=^?, use=linux+kbs, use=vt100+pf1-pf4,
++	use=xterm-color,
+ 
+ # GNOME Terminal 1.4.0.4 (Redhat 7.2)
+ #
+@@ -6191,11 +6186,11 @@
+ #	it hangs in tack after running function-keys test.
+ gnome-rh72|GNOME Terminal in RedHat 7,
+ 	bce, km@,
+-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, rmam=\E[?7l,
++	rmam=\E[?7l,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\016%e
+ 	    \017%;,
+-	sgr0=\E[0m\017, smam=\E[?7h, tbc@, use=vt220+cvis,
+-	use=linux+kbs, use=xterm-color,
++	sgr0=\E[0m\017, smam=\E[?7h, tbc@, use=linux+kbs,
++	use=vt100+pf1-pf4, use=vt220+cvis, use=xterm-color,
+ 
+ # GNOME Terminal 2.0.1 (Redhat 8.0)
+ #
+@@ -6871,8 +6866,7 @@
+ # Removed kDN6, etc (control+shift) since rxvt does not implement this -TD
+ rxvt+pcfkeys|rxvt fragment for PC-style fkeys,
+ 	kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d,
+-	kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, kcub1=\E[D, kcud1=\E[B,
+-	kcuf1=\E[C, kcuu1=\E[A, kel=\E[8\^, kend=\E[8~,
++	kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, kel=\E[8\^, kend=\E[8~,
+ 	kf21=\E[23$, kf22=\E[24$, kf23=\E[11\^, kf24=\E[12\^,
+ 	kf25=\E[13\^, kf26=\E[14\^, kf27=\E[15\^, kf28=\E[17\^,
+ 	kf29=\E[18\^, kf30=\E[19\^, kf31=\E[20\^, kf32=\E[21\^,
+@@ -6884,7 +6878,7 @@
+ 	kHOM5=\E[7\^, kHOM6=\E[7@, kIC5=\E[2\^, kIC6=\E[2@,
+ 	kLFT5=\EOd, kNXT5=\E[6\^, kNXT6=\E[6@, kPRV5=\E[5\^,
+ 	kPRV6=\E[5@, kRIT5=\EOc, kUP=\E[a, kUP5=\EOa,
+-	use=vt220+vtedit, use=xterm+nopcfkeys,
++	use=vt100+noapp, use=vt220+vtedit, use=xterm+nopcfkeys,
+ 
+ # rxvt was originally "xvt", first announced in April 1993:
+ #------------------------------------------------------------------------------
+@@ -7038,7 +7032,7 @@
+ # Based on rxvt 2.4.8, it has a few differences in key bindings
+ aterm|AfterStep terminal,
+ 	XT,
+-	kbs=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=rxvt,
++	kbs=^?, use=vt100+pf1-pf4, use=rxvt,
+ 
+ #### XITERM
+ # xiterm  0.5-5.2
+@@ -7284,16 +7278,16 @@
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
+ 	cvvis=\E[?25h, dim=\E[2m, home=\E[H, il1=\E[L, ind=\n,
+-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+ 	kdch1=\E[3~, kend=\E[4~, kf11=\E[22~, kf12=\E[23~,
+-	khome=\E[1~, knp=\E[6~, kpp=\E[5~, rmacs=\E[10m,
+-	rmam=\E[?7l, rs1=\E[H\E[J\E[m\Ec, setab=\E[4%p1%dm,
++	khome=\E[1~, knp=\E[6~, kpp=\E[5~, rmam=\E[?7l,
++	rs1=\E[H\E[J\E[m\Ec, setab=\E[4%p1%dm,
+ 	setaf=\E[3%p1%dm,
+ 	sgr=\E[0;10%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
+ 	    %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
+-	sgr0=\E[0;10m, smacs=\E[11m, smam=\E[?7h, smso=\E[3m,
+-	smul=\E[4m, use=ansi+erase, use=ansi+local, use=ansi+sgr,
+-	use=linux+lockeys, use=vt220+cvis, use=vt220+ufkeys,
++	sgr0=\E[0;10m, smam=\E[?7h, smso=\E[3m, smul=\E[4m,
++	use=ansi+cup, use=ansi+erase, use=ansi+local,
++	use=ansi+sgr, use=klone+acs, use=linux+lockeys,
++	use=vt100+noapp, use=vt220+cvis, use=vt220+ufkeys,
+ 	use=xterm+alt1049,
+ 
+ #### MGR
+@@ -7481,15 +7475,14 @@
+ 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+ 	dch1=\E[P, ed=\E[J, el=\E[K, home=\E[H, hpa=\E[%i%p1%dG,
+ 	ht=^I, ich=\E[%p1%d@, ind=\n, kbs=^?, kdch1=\E[3~,
+-	kend=\E[4~, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+-	khome=\E[1~, knp=\E[6~, kpp=\E[5~, rev=\E[7m, rmso=\E[m,
+-	rmul=\E[m,
++	kend=\E[4~, khome=\E[1~, knp=\E[6~, kpp=\E[5~, rev=\E[7m,
++	rmso=\E[m, rmul=\E[m,
+ 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
+ 	    %t;7%;m,
+ 	sgr0=\E[0m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
+ 	use=ansi+csr, use=ansi+idl, use=vt220+cvis,
+-	use=ecma+index, use=klone+color, use=xterm+r5+fkeys,
+-	use=xterm+acs,
++	use=ecma+index, use=klone+color, use=vt100+pf1-pf4,
++	use=xterm+r5+fkeys, use=xterm+acs,
+ 
+ st-16color|stterm-16color|simpleterm with 16-colors,
+ 	use=ibm+16color, use=st,
+@@ -7586,20 +7579,19 @@
+ 	flash=^G, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n,
+ 	is1=\E[?47l\E=\E[?1l,
+ 	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^?,
+-	kf1=\EOP, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
+-	kf16=\E[29~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, khome=\E[1~,
+-	rev=\E[7m, ri=\EM, rmacs=\E(B, rmir=\E[4l, rmso=\E[27m,
+-	rmul=\E[24m, rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>,
+-	s0ds=\E(B, s1ds=\E(0,
++	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
++	khome=\E[1~, rev=\E[7m, ri=\EM, rmacs=\E(B, rmir=\E[4l,
++	rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
++	rs2=\E[!p\E[?3;4l\E[4l\E>, s0ds=\E(B, s1ds=\E(0,
+ 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p5%t;2%;%?%p1%p3%|%t;7
+ 	    %;m%?%p9%t\E(0%e\E(B%;,
+ 	sgr0=\E[m\E(B, smacs=\E(0, smir=\E[4h, smso=\E[7m,
+ 	smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=ansi+arrows,
+ 	use=ansi+csr, use=ansi+enq, use=ansi+idl, use=ansi+local,
+ 	use=bracketed+paste, use=ecma+italics, use=ecma+index,
+-	use=vt220+cvis, use=vt220+pcedit, use=xterm+r5+fkeys,
+-	use=xterm+256setaf, use=xterm+sl-twm,
+-	use=xterm+alt1049,
++	use=vt100+pf1-pf4, use=vt220+cvis, use=vt220+pcedit,
++	use=xterm+r5+fkeys, use=xterm+256setaf,
++	use=xterm+sl-twm, use=xterm+alt1049,
+ 
+ #### TERMINOLOGY
+ # https://www.enlightenment.org/about-terminology
+@@ -7791,7 +7783,7 @@
+ # derived from alacritty
+ rio|fork of alacritty,
+ 	use=alacritty,
+-rio-direct|fork of alacritty,
++rio-direct|rio with direct-colors,
+ 	use=alacritty-direct,
+ 
+ #### Kitty
+@@ -8091,6 +8083,78 @@
+ 
+ ######## Miscellaneous
+ 
++#### pangoterm
++# https://www.leonerd.org.uk/code/pangoterm/
++# https://github.com/bfredl/pangoterm
++# https://github.com/neovim/libvterm
++#
++# which says:
++# "A GTK/Pango-based terminal that uses libvterm to provide terminal
++# emulation."
++#
++# This probably has few users, because it cannot put the cursor reliably in the
++# right place (i.e., it appears several columns to the right).  It is included
++# here because it implements what Evans refers to as "fixterms" but sets TERM
++# to "xterm".
++#
++# vttest:
++# - no 80/132 column mode
++# - no blink mode
++# - no protected modes
++# - fails wrapping tests
++# - no VT52
++# - responds to ENQ with illegal character
++# - no SRM
++# - no origin mode
++# - identifies as VT100 with AVO
++# - responds to secondary DA as \E[>0;100;0c
++# - responds to DECREQTPARM with illegal character
++# - no application-keypad
++# - has application cursor-keys
++# - backspace key sends DEL, does not support toggle for BS
++# - keyboard does not provide LF
++# - has DECTCEM and ECH
++# - has REP, SD and SL
++# - has CBT, CHT, CNL, CPL
++# - has ISO 6429 colors
++# - BCE tests partially work (text is cleared incorrectly)
++# - lacks any other VT220 or higher features.
++# - xterm mouse except for modes 9 and 1001
++# wraptest:
++# - 6/25 differences from xterm
++# tack:
++# - no dim mode
++# - no invisible mode
++# - has italics
++# - has strike-out mode
++pangoterm|terminal using libvterm,
++	am, bce, mir, msgr, npc, xenl, AX, XT,
++	colors#8, cols#80, lines#24, pairs#64,
++	bel=^G, blink@, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
++	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
++	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,
++	ich=\E[%p1%d@, ind=\n, invis@, is2=\E[!p, kbs=^?, kcbt=\E[Z,
++	nel=\EE, op=\E[39;49m, ri=\EM, rmam=\E[?7l, rmir=\E[4l,
++	rmkx=\E[?1l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec, rs2=\E[!p,
++	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
++	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
++	    %t;7%;m,
++	sgr0=\E(B\E[m, smam=\E[?7h, smir=\E[4h, smkx=\E[?1h,
++	vpa=\E[%i%p1%dd, rv=\E\\[>0;100;0c, use=ecma+index,
++	use=ansi+rep, use=ecma+strikeout, use=xterm+pcfkeys,
++	use=bracketed+paste, use=vt420+lrmm, use=xterm+focus,
++	use=xterm+sm+1006, use=ecma+italics, use=ansi+csr,
++	use=ansi+enq, use=ansi+idl, use=ansi+inittabs,
++	use=ansi+local, use=ansi+sgrbold, use=xterm+alt+title,
++	use=att610+cvis, use=xterm+acs,
++
++pangoterm-256color|pangoterm with 256-colors,
++	use=xterm+256setaf2, use=pangoterm,
++
++pangoterm-direct|pangoterm with direct-colors,
++	use=xterm+direct, use=pangoterm,
++
+ #### WezTerm
+ # https://wezfurlong.org/wezterm/
+ # https://github.com/wez/wezterm
+@@ -8599,19 +8663,18 @@
+ 	cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, cvvis=\E[34l,
+ 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, el1=\E[1K, flash=\Eg,
+ 	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, indn=\E[%p1%dS, is2=\E)0,
+-	kbs=^?, kcbt=\E[Z, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+-	khome=\E[1~, kmous=\E[M, nel=\EE, rev=\E[7m, ri=\EM,
+-	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[23m, rmul=\E[24m,
+-	rs2=\Ec\E[?1000l\E[?25h,
++	kbs=^?, kcbt=\E[Z, khome=\E[1~, kmous=\E[M, nel=\EE,
++	rev=\E[7m, ri=\EM, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[23m,
++	rmul=\E[24m, rs2=\Ec\E[?1000l\E[?25h,
+ 	sgr=\E[0%?%p6%t;1%;%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;
+ 	    5%;%?%p5%t;2%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smir=\E[4h, smkx=\E[?1h\E=, smso=\E[3m,
+ 	smul=\E[4m, vpa=\E[%i%p1%dd, E0=\E(B, S0=\E(%p1%c,
+ 	use=ansi+apparrows, use=ansi+csr, use=ansi+erase,
+ 	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+-	use=xterm+kbs, use=vt220+pcedit, use=xterm+alt1049,
+-	use=ecma+color, use=vt100+enq, use=vt100+4bsd,
+-	use=xterm+r5+fkeys,
++	use=ecma+color, use=vt100+pf1-pf4, use=vt220+pcedit,
++	use=xterm+alt1049, use=xterm+kbs, use=vt100+enq,
++	use=vt100+4bsd, use=xterm+r5+fkeys,
+ 
+ screen|VT 100/ANSI X3.64 virtual terminal,
+ 	use=screen4,
+@@ -8691,8 +8754,7 @@
+ # and some keys from "screen." are ignored.  Here is an entry which
+ # covers those (tested with screen 4.00.02) -TD
+ screen+fkeys|function-keys according to screen,
+-	kend=\E[4~, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kfnd@,
+-	khome=\E[1~, kslt@,
++	kend=\E[4~, kfnd@, khome=\E[1~, kslt@, use=vt100+pf1-pf4,
+ 
+ # See explanation before "screen" entry.  Cancel italics so that applications
+ # do not assume screen supports the feature.  Add this tweak to entries which
+@@ -8830,11 +8892,11 @@
+ 	cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, dch=\E[%p1%dP,
+ 	dch1=\E[P, home=\E[H, ich=\E[%p1%d@, ind=\n, is2=\E)0,
+ 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\EE, rev=\E[7m,
+-	ri=\EM, rmir=\E[4l, rmkx=\E>, rmso=\E[23m, rmul=\E[24m,
+-	rs1=\Ec, sgr0=\E[m, smir=\E[4h, smkx=\E=, smso=\E[3m,
+-	smul=\E[4m, use=ansi+csr, use=ansi+erase, use=ansi+idl,
+-	use=ansi+inittabs, use=ansi+local,
++	nel=\EE, rev=\E[7m, ri=\EM, rmir=\E[4l, rmkx=\E>,
++	rmso=\E[23m, rmul=\E[24m, rs1=\Ec, sgr0=\E[m, smir=\E[4h,
++	smkx=\E=, smso=\E[3m, smul=\E[4m, use=ansi+csr,
++	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
++	use=ansi+local, use=vt100+pf1-pf4,
+ 
+ # screen 4.0 was released 2003-07-21, and as of March 2019, its terminfo file
+ # was last updated in 2009 to include 256-color support.  The most recent
+@@ -9050,7 +9112,7 @@
+ 	smso=\E[7m, smul=\E[4m, tbc=\E[3g, u8=\E[?62;1;6c,
+ 	use=ansi+arrows, use=ansi+csr, use=ansi+idl,
+ 	use=ansi+local, use=vt220+cvis, use=xterm+acs,
+-	use=xterm+sl, use=ansi+enq,
++	use=vt100+pf1-pf4, use=xterm+sl, use=ansi+enq,
+ 
+ ncsa|NCSA Telnet 2.7 for Macintosh in VT220-8 mode (color),
+ 	use=ncsa-m, use=klone+color,
+@@ -9067,10 +9129,10 @@
+ # some keyboards and many applications require these as F1-F4.
+ #
+ 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~, kf2=\EOQ, kf3=\EOR,
+-	kf4=\EOS, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+-	use=ncsa, use=vt220+sfkeys,
++	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
++	kf14=\E[26~, kf15=\E[28~, kf6=\E[17~, kf7=\E[18~,
++	kf8=\E[19~, kf9=\E[20~, use=vt100+pf1-pf4, use=ncsa,
++	use=vt220+sfkeys,
+ 
+ #### Pilot Pro Palm-Top
+ #
+@@ -9148,9 +9210,9 @@
+ 	bel=^G, clear=^L, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
+ 	dch=\E[%p1%dP, dch1=\E[P, ed=\E[J, el=\E[K, ht=^I,
+ 	ich=\E[%p1%d@, ich1=\E[@, ind=\n, is1=\E[1r, kcub1=\E[D,
+-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ,
+-	kf3=\EOR, kf4=\EOS, khome=\E[H, rmso=\E[m, sgr0=\E[m,
+-	smso=\E[7m, use=ansi+idl, use=ansi+local1,
++	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, rmso=\E[m,
++	sgr0=\E[m, smso=\E[7m, use=ansi+idl, use=ansi+local1,
++	use=vt100+pf1-pf4,
+ 
+ # From: Alexander Lukyanov , 14 Nov 1995
+ #  capability later corrected by J.T. Conklin 
+@@ -9349,17 +9411,15 @@
+ 	OTbs, OTpt, am, xenl,
+ 	cols#80,
+ 	OTnl=\n, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J,
+-	cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+-	cuu1=\E[A, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+-	if=/usr/share/tabset/vt100,
++	cr=\r, cub1=^H, cud1=\n, ht=^I, if=/usr/share/tabset/vt100,
+ 	is2=\E[?7h\E[?1h\E[?3l\E7\E8, kbs=^H, kcub1=\EOD,
+-	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOY, kf1=\EOP,
+-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV,
+-	kf8=\EOW, kf9=\EOX, rev=\E[7m, ri=\EM, rmkx=\E[?1l\E>,
+-	rmso=\E[m, rmul=\E[m,
++	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOY, kf3=\EOR,
++	kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX, rev=\E[7m,
++	ri=\EM, rmkx=\E[?1l\E>,
+ 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[r, sgr0=\E[m,
+-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, use=ansi+csr,
+-	use=ansi+idl,
++	smkx=\E[?1h\E=, use=ansi+csr, use=ansi+cup,
++	use=ansi+erase, use=ansi+idl, use=ansi+local1,
++	use=ansi+sgrul, use=ansi+sgrso, use=vt100+pf1-pf4,
+ #
+ # (news-29: this had :TY=ascii: --esr)
+ news-29|Sony NEWS VT100 emulator with 29 lines,
+@@ -9401,11 +9461,11 @@
+ 	cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+ 	cuu1=\E[A, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+ 	if=/usr/share/tabset/vt100, kbs=^H, kcub1=\E[D,
+-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ,
+-	kf3=\EOR, kf4=\EOS, rev=\E[7m, ri=\EM, rmkx=\E[?1l\E>,
+-	rmso=\E[m, rmul=\E[m,
++	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, rev=\E[7m, ri=\EM,
++	rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+ 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sgr0=\E[m,
+ 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, use=ansi+csr,
++	use=vt100+pf1-pf4,
+ #
+ # (nwp512: this had :DE=^H:, which I think means  --esr)
+ nwp512|news|nwp514|news40|vt100-bm|nwp512-o|nwp514-o|news-o|news40-o|vt100-bm-o|old Sony VT100 emulator 40 lines,
+@@ -9461,11 +9521,11 @@
+ 	cuu1=\E[A$<2/>, dl1=\E[M, ed=\E[J$<30/>, el=\E[K$<3/>,
+ 	flash=\E[?5h\0\0\0\0\0\0\0\0\0\0\0\0\0\E[?5l,
+ 	il1=\E[L, is2=\E[?5l\E[?1l\E>\E[?7h\E[?8h, kcub1=\E[D,
+-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ,
+-	kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\E#W, khome=\E[H,
+-	ri=\EM$<5/>, rmso=\E[m$<2/>, rmul=\E[m$<2/>,
++	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf5=\EOT, kf6=\E#W,
++	khome=\E[H, ri=\EM$<5/>, rmso=\E[m$<2/>, rmul=\E[m$<2/>,
+ 	rs2=\E7\E[r\E8\E[?5l\E[?1l\E>\E[?7h\E[?8h,
+ 	smso=\E[7m$<2/>, smul=\E[4m$<2/>, use=ansi+local1,
++	use=vt100+pf1-pf4,
+ # (news517: this had :TY=sjis:. --esr)
+ nwp517|nwp-517|nwp-517 VT200 80 cols 30 rows,
+ 	cols#80, lines#30,
+@@ -9856,15 +9916,14 @@
+ 	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
+ 	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dim=\E[2m,
+ 	ech=\E[%p1%dX, el1=\E[1K, home=\E[H, ht=^I, hts=\EH,
+-	kdch1=^?, kend=\E[Y, kf1=\EOP, kf10=\EOY, kf11=\EOZ,
+-	kf12=\EOA, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU,
+-	kf7=\EOV, kf8=\EOW, kf9=\EOX, kich1=\E[@, nel=\r\n,
+-	op=\E[39;49m, rc=\E8, rev=\E[7m, rmacs=\E[10m,
++	kdch1=^?, kend=\E[Y, kf10=\EOY, kf11=\EOZ, kf12=\EOA,
++	kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX, kich1=\E[@,
++	nel=\r\n, op=\E[39;49m, rc=\E8, rev=\E[7m, rmacs=\E[10m,
+ 	rmpch=\E[10m, rmso=\E[27m, rmul=\E[m, rs1=\Ec\E]R, sc=\E7,
+ 	sgr0=\E[0;10m, smacs=\E[11m, smpch=\E[11m, smso=\E[7m,
+ 	smul=\E[4m, tbc=\E[3g, use=ansi+arrows, use=ansi+cpr,
+ 	use=ansi+erase, use=ansi+idc, use=klone+color,
+-	use=vt220+cvis,
++	use=vt100+pf1-pf4, use=vt220+cvis,
+ 
+ #### Microsoft (miscellaneous)
+ 
+@@ -9920,12 +9979,12 @@
+ 	cuu1=\E[A$<2/>, ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H,
+ 	ht=^I, hts=\EH$<2/>, ind=\ED$<5/>, is2=\E[1;24r\E[24;1H,
+ 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\r\ED$<5/>,
+-	rc=\E8, rev=\E[7m$<2/>, rf=/usr/share/tabset/vt100,
+-	ri=\EM$<5/>, rmso=\E[m$<2/>, rmul=\E[m$<2/>,
++	nel=\r\ED$<5/>, rc=\E8, rev=\E[7m$<2/>,
++	rf=/usr/share/tabset/vt100, ri=\EM$<5/>,
++	rmso=\E[m$<2/>, rmul=\E[m$<2/>,
+ 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7,
+ 	sgr0=\E[m$<2/>, smso=\E[7m$<2/>, smul=\E[4m$<2/>,
+-	tbc=\E[3g$<2/>,
++	tbc=\E[3g$<2/>, use=vt100+pf1-pf4,
+ 
+ # From: Federico Bianchi
+ # This is the entry for the OpenNT terminal.
+@@ -11261,15 +11320,14 @@
+ 	cuf1=\E[C$<2>, cup=\E[%i%p1%d;%p2%dH$<5>,
+ 	cuu1=\E[A$<2>, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I,
+ 	hts=\EH, ind=\n, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
+-	kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+-	rev=\E[7m$<2>, ri=\EM$<5>, rmam=\E[?7l, rmkx=\E[?1l\E>,
+-	rmso=\E[m$<2>, rmul=\E[m$<2>,
++	kcuu1=\EOA, rev=\E[7m$<2>, ri=\EM$<5>, rmam=\E[?7l,
++	rmkx=\E[?1l\E>, rmso=\E[m$<2>, rmul=\E[m$<2>,
+ 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+ 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
+ 	    %;m$<2>,
+ 	sgr0=\E[m$<2>, smam=\E[?7h, smkx=\E[?1h\E=,
+ 	smso=\E[7m$<2>, smul=\E[4m$<2>, tbc=\E[3g, use=ansi+csr,
+-	use=ansi+local,
++	use=ansi+local, use=vt100+pf1-pf4,
+ 
+ qvt103-w|Qume qvt103 132 cols,
+ 	cols#132, lines#24,
+@@ -12992,12 +13050,11 @@
+ 	is2=\E7\E[1r\E8\E[2;3;4;13;20;34;39;36l\E[12;16;34h\E[?1;3;4
+ 	    ;5;10;18l\E[?7;8;25h\E>\E[?5W\E(B\017\E[4i,
+ 	kbs=^H, kcbt=\E[z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
+-	kcuu1=\EOA, kf1=\EOP, kf17=\E[K, kf18=\E[31~, kf19=\E[32~,
+-	kf2=\EOQ, kf20=\E[33~, kf21=\E[34~, kf22=\E[35~,
+-	kf23=\E[1~, kf24=\E[2~, kf3=\EOR, kf4=\EOS, kf5=\E[M,
+-	ll=\E[24E, mc0=\E[?19h, nel=\EE, prot=\E[1"q, ri=\EM,
+-	rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l,
+-	rmso=\E[27m, rmul=\E[24m,
++	kcuu1=\EOA, kf17=\E[K, kf18=\E[31~, kf19=\E[32~,
++	kf20=\E[33~, kf21=\E[34~, kf22=\E[35~, kf23=\E[1~,
++	kf24=\E[2~, kf5=\E[M, ll=\E[24E, mc0=\E[?19h, nel=\EE,
++	prot=\E[1"q, ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l,
++	rmkx=\E[?1l, rmso=\E[27m, rmul=\E[24m,
+ 	rs2=\E[61"p\E[40h\E[?6l\E[1r\E[2;3;4;13;20;34;39;36l\E[12;16
+ 	    ;34h\E[?1;3;4;5;10;18l\E[?7;8;25h\E>\E[?5W\E(B\017\E[24E
+ 	    \E[4i,
+@@ -13005,7 +13062,8 @@
+ 	    %p5%t;2%;%?%p7%t;8%;m\E[%?%p8%t1%;"q%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017\E["q, smacs=^N, smam=\E[?7h, smir=\E[4h,
+ 	smkx=\E[?1h, vpa=\E[%i%p1%dd, use=ansi+csr, use=ansi+idl,
+-	use=ansi+pp, use=ansi+sgrbold, use=vt220+ufkeys,
++	use=ansi+pp, use=ansi+sgrbold, use=vt100+pf1-pf4,
++	use=vt220+ufkeys,
+ 
+ #   This is the american terminal. Here tabs work fine.
+ # From: Francesco Potorti` , 24 Aug 1998
+@@ -13545,10 +13603,9 @@
+ #	Function key set for the PC compatible keyboard
+ #
+ wy370-EPC|Wyse 370 with 102 key keyboard,
+-	kcbt=\E[Z, kend=\E[1~, kent=\EOM, kf1=\EOP, kf2=\EOQ,
+-	kf3=\EOR, kf4=\EOS, kf5=\E[M, kich1=\E[2~, knp=\E[U,
+-	kpp=\E[V, use=ansi+arrows, use=vt220+ufkeys,
+-	use=wy370-nk,
++	kcbt=\E[Z, kend=\E[1~, kent=\EOM, kf5=\E[M, kich1=\E[2~,
++	knp=\E[U, kpp=\E[V, use=ansi+arrows, use=vt100+pf1-pf4,
++	use=vt220+ufkeys, use=wy370-nk,
+ #
+ #	Wyse 370 with visual bell.
+ wy370-vb|Wyse 370 with visible bell,
+@@ -13910,8 +13967,7 @@
+ 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
+ 	ind=\n, is2=\E>\E F\E[?1h\E[?7h\E[r\E[2$~, kbs=^H,
+ 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdl1=\E[3~,
+-	kf0=\E[21~, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
++	kf0=\E[21~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+ 	kich1=\E[2~, knp=\E[6~, kpp=\E[5~, mc0=\E[0i, mc4=\E[4i,
+ 	mc5=\E[5i, nel=\r\n, rev=\E[7m, ri=\EM, rin=\E[%p1%dL,
+ 	rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>,
+@@ -13922,7 +13978,7 @@
+ 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ 	tsl=\E[1$}\r\E[K, vpa=\E[%i%p1%dd, use=ansi+csr,
+ 	use=ansi+erase, use=ansi+idl, use=ansi+local, use=dec+sl,
+-	use=vt220+cvis,
++	use=vt100+pf1-pf4, use=vt220+cvis,
+ 
+ # From: Joseph Gil  13 Dec 1991
+ # ACS capabilities from Philippe De Muyter   30 May 1996
+@@ -13938,15 +13994,15 @@
+ 	hts=\EH, ich=\E[%p1%d@, il1=\E[L$<3/>, ind=\ED,
+ 	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H,
+ 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf6=\E[17~,
+-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, lf1=pf1, lf2=pf2,
+-	lf3=pf3, lf4=pf4, nel=\r\ED, rev=\E[7m,
++	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, lf1=pf1,
++	lf2=pf2, lf3=pf3, lf4=pf4, nel=\r\ED, rev=\E[7m,
+ 	rf=/usr/share/tabset/vt100, ri=\EM, rmacs=^O,
+ 	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
+ 	rmul=\E[24m, rs1=\E[?3l, sgr0=\E[m, smacs=^N, smam=\E[?7h,
+ 	smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+ 	tbc=\E[3g, tsl=\E[2$~\E[1$}\E[1;%dH, use=ansi+csr,
+-	use=ansi+idl, use=ansi+local, use=vt220+cvis,
++	use=ansi+idl, use=ansi+local, use=vt100+pf1-pf4,
++	use=vt220+cvis,
+ 
+ ######## NON-ANSI TERMINAL EMULATIONS
+ #
+@@ -14162,9 +14218,8 @@
+ 	    \s\s\sf6\s\s\s\s\s\s\s\s\s\s\s\EOU\E[7;03q\s\s\sf7\s\s
+ 	    \s\s\s\s\s\s\s\s\s\EOV\E[8;03q\s\s\sf8\s\s\s\s\s\s\s\s
+ 	    \s\s\s\EOW,
+-	kclr=\E[2J, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT,
+-	kf6=\EOU, kf7=\EOV, kf8=\EOW, kll=\E[24;1H, ll=\E[24H,
+-	nel=\r\n,
++	kclr=\E[2J, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW,
++	kll=\E[24;1H, ll=\E[24H, nel=\r\n,
+ 	pfx=\E[%p1%1d;%p2%l%2.2dq\s\s\sf%p1%1d\s\s\s\s\s\s\s\s\s\s
+ 	    \s%p2%s,
+ 	pln=\E[%p1%d;00q%p2%:-16s, ri=\EM, rmacs=^O,
+@@ -14174,6 +14229,7 @@
+ 	sgr0=\E[m\017, smacs=^N, tsl=\E7\E[25;%p1%{1}%+%dH,
+ 	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
+ 	use=ansi+erase, use=ansi+local1, use=ansi+sgrbold,
++	use=vt100+pf1-pf4,
+ 
+ att4410v1-w|att5410v1-w|tty5410v1-w|AT&T 4410/5410 132 columns - version 1,
+ 	cols#132, wsl#132,
+@@ -14409,13 +14465,13 @@
+ 	cup=\E[%i%p1%d;%p2%dH, cuu1=\EA, dch=\E[%p1%dP, dch1=\EP,
+ 	dim=\EW, dl=\E[%p1%dM, dl1=\EM, ed=\EJ, el=\Ez, home=\E[H,
+ 	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E\^, il=\E[%p1%dL,
+-	il1=\EL, ind=\n, is2=\E[20l\E[?7h, kclr=\EJ, kf1=\EOP,
+-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\EE, rev=\E}, ri=\ET,
+-	rmacs=\E(B, rmso=\E~, rmul=\EZ,
++	il1=\EL, ind=\n, is2=\E[20l\E[?7h, kclr=\EJ, nel=\EE,
++	rev=\E}, ri=\ET, rmacs=\E(B, rmso=\E~, rmul=\EZ,
+ 	sgr=\EX\E~\EZ\E4\E(B%?%p1%p3%|%t\E}%;%?%p2%t\E\\%;%?%p4%p6%|
+ 	    %t\E3%;%?%p5%t\EW%;%?%p9%t\E(0%;,
+ 	sgr0=\EX\E~\EZ\E4\E(B, smacs=\E(0, smso=\E}, smul=\E\\,
+ 	tbc=\EF, use=ansi+arrows, use=ansi+local,
++	use=vt100+pf1-pf4,
+ 
+ att4424-1|tty4424-1|Teletype 4424 in display function group I,
+ 	kclr@, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, khome@,
+@@ -14433,9 +14489,9 @@
+ 	bel=^G, clear=\E[2;H\E[J, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
+ 	cup=\E[%i%p1%2d;%p2%2dH\E[B, cuu1=\E[A, dch1=\EP,
+ 	dl1=\EM, el=\E[K, ht=^I, ich1=\E\^, il1=\EL, ind=\n, ip=$<2/>,
+-	is2=\E[m\E[2;24r, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+-	nel=\r\n, ri=\ET, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
+-	smso=\E[7m, smul=\E[4m, use=ansi+arrows,
++	is2=\E[m\E[2;24r, nel=\r\n, ri=\ET, rmso=\E[m, rmul=\E[m,
++	sgr0=\E[m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
++	use=vt100+pf1-pf4,
+ 
+ # The Teletype 5425 is really version 2 of the Teletype 5420. It
+ # is quite similar, except for some minor differences. No page
+@@ -14492,14 +14548,14 @@
+ 	cr=\r, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\EP,
+ 	ed=\E[J, el=\E[0K, home=\E[H, hpa=\E[%p1%dG, ht=^I, hts=\E1,
+ 	ich=\E[%p1%d@, ich1=\E\^, il1=\EL, ind=\n, is1=\Ec\E[?7h,
+-	is2=\E[m\E[1;24r, kbs=^H, kcbt=\EO, kclr=\E[2J, kf1=\EOP,
+-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV,
+-	kf8=\EOW, khome=\E[H, kll=\E[24;1H, ll=\E[24H, nel=\r\n,
+-	rc=\E8, rev=\E[7m, ri=\ET, rmacs=\E(B, rmam=\E[?7l,
+-	rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y, sc=\E7,
+-	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smso=\E[5m,
++	is2=\E[m\E[1;24r, kbs=^H, kcbt=\EO, kclr=\E[2J, kf5=\EOT,
++	kf6=\EOU, kf7=\EOV, kf8=\EOW, khome=\E[H, kll=\E[24;1H,
++	ll=\E[24H, nel=\r\n, rc=\E8, rev=\E[7m, ri=\ET, rmacs=\E(B,
++	rmam=\E[?7l, rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y,
++	sc=\E7, sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smso=\E[5m,
+ 	smul=\E[4m, tbc=\E[3g, vpa=\E[%p1%dd, use=ansi+idl,
+-	use=ansi+local, use=ecma+index, use=vt52+arrows,
++	use=ansi+local, use=ecma+index, use=vt100+pf1-pf4,
++	use=vt52+arrows,
+ 
+ # Terminfo entry for the AT&T 510 A Personal Terminal
+ # Function keys 9 - 16 are available only after the
+@@ -15968,11 +16024,11 @@
+ 	cup=\E[%i%p1%2d;%p2%2dH, cvvis=\E[?1l\E[?4l\E[?7h,
+ 	dch1=\E[P, dl1=\E[M, if=/usr/share/tabset/vt100,
+ 	il1=\E[L, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+-	kf0=\EOT, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOm,
+-	kf6=\EOl, kf7=\EOM, kf8=\EOn, rc=\E8, ri=\EM, rmacs=^O,
+-	rmir=\E[4l, rmkx=\E>, rmso=\E[m, rmul=\E[m, sc=\E7, smacs=^N,
+-	smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m,
+-	use=ansi+erase, use=ansi+local1,
++	kf0=\EOT, kf5=\EOm, kf6=\EOl, kf7=\EOM, kf8=\EOn, rc=\E8,
++	ri=\EM, rmacs=^O, rmir=\E[4l, rmkx=\E>, rmso=\E[m, rmul=\E[m,
++	sc=\E7, smacs=^N, smir=\E[4h, smkx=\E=, smso=\E[7m,
++	smul=\E[4m, use=ansi+erase, use=ansi+local1,
++	use=vt100+pf1-pf4,
+ 
+ # From: David S. Lawyer, June 1997:
+ # The CIT 101-e was made in Japan in 1983-4 and imported by CIE
+@@ -16001,13 +16057,13 @@
+ 	is2=\E<\E>\E[?1l\E[?3l\E[?4l\E[?5h\E[?7h\E[?8h\E[3g\E[>5g\E(
+ 	    B\E[m\E[20l\E[1;24r\E[24;1H,
+ 	kbs=^?, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\EE, rev=\E[7m,
+-	ri=\EM, rmcup=, rmso=\E[m, rmul=\E[m, rs1=\Ec\E[?7h\E[>5g,
+-	sgr0=\E[m, smcup=\E[>5g\E[?7h\E[?5h, smso=\E[7m,
+-	smul=\E[4m, u6=\E[%i%p1%d;%p2%dR, u8=\E[?6c,
+-	use=ansi+enq, use=ansi+csr, use=ansi+erase, use=ansi+idc,
+-	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+-	use=ecma+index,
++	nel=\EE, rev=\E[7m, ri=\EM, rmcup=, rmso=\E[m, rmul=\E[m,
++	rs1=\Ec\E[?7h\E[>5g, sgr0=\E[m,
++	smcup=\E[>5g\E[?7h\E[?5h, smso=\E[7m, smul=\E[4m,
++	u6=\E[%i%p1%d;%p2%dR, u8=\E[?6c, use=ansi+enq,
++	use=ansi+csr, use=ansi+erase, use=ansi+idc, use=ansi+idl,
++	use=ansi+inittabs, use=ansi+local, use=ecma+index,
++	use=vt100+pf1-pf4,
+ 
+ cit101e-n|CIT-101e w/o am,
+ 	am@,
+@@ -16640,9 +16696,8 @@
+ 	is2=\E[1*q\E[2!t\E[7!t\E[=4;101;119;122l\E[=107;118;207h\E)1
+ 	    \E[1Q\EW\E[!y\E[!z\E>\E[0:0:32!r\E[0*w\E[w\E2\r\n\E[2;27
+ 	    !t,
+-	kdch1=\E\002\r, ked=\E\004\r, kf1=\EOP, kf2=\EOQ, kf3=\EOR,
+-	kf4=\EOS, kich1=\E\001\r, kil1=\E\003\r, ll=\E[24H,
+-	mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
++	kdch1=\E\002\r, ked=\E\004\r, kich1=\E\001\r,
++	kil1=\E\003\r, ll=\E[24H, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
+ 	pfloc=\E[%p1%d;0u#%p2%s#, pfx=\E[%p1%d;1u#%p2%s#,
+ 	prot=\E[99m, ri=\EM$<4>, rmacs=\016$<1>,
+ 	rmcup=\E[w\E2\r\n, rmkx=\E[!z\E[0;2u, rmso=\E[7!{,
+@@ -16654,7 +16709,7 @@
+ 	smcup=\E[=4l\E[1;24w\E2\r, smkx=\E[1!z\E[0;3u,
+ 	vpa=\E[%p1%{1}%+%dd, use=ansi+arrows, use=ansi+csr,
+ 	use=ansi+idc1, use=ansi+inittabs, use=ansi+local,
+-	use=ansi+rep, use=ansi+sgrbold,
++	use=ansi+rep, use=ansi+sgrbold, use=vt100+pf1-pf4,
+ 
+ avt-rv-ns|Concept AVT in reverse video mode/no status line,
+ 	flash=\E[=205l$<200>\E[=205h, is1=\E[=103l\E[=205h,
+@@ -17491,9 +17546,9 @@
+ 	cols#80, lines#24,
+ 	bel=^G, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
+ 	cup=\E[%i%p1%02d;%p2%02dH, cuu1=\E[A, ind=\n, kcub1=\E[D,
+-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ,
+-	kf3=\EOR, kf4=\EOS, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
+-	smso=\E[7m, smul=\E[4m, use=ansi+erase,
++	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, rmso=\E[m, rmul=\E[m,
++	sgr0=\E[m, smso=\E[7m, smul=\E[4m, use=ansi+erase,
++	use=vt100+pf1-pf4,
+ 
+ cs10-w|Datamedia Color Scan 10 with 132 columns,
+ 	cols#132,
+@@ -17819,11 +17874,11 @@
+ 	ed=\E[J$<10/>, el=\E[K, ht=^I,
+ 	if=/usr/share/tabset/vt100, il1=\E[L,
+ 	is2=\E<\E=\E[?3l\E[?7l\E(B\E[J\E7\E[;r\E8\E[m\E[q,
+-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP,
+-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, khome=\E[H, ri=\EM,
+-	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m,
++	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, khome=\E[H,
++	ri=\EM, rmam=\E[?7l, 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, use=ansi+local1,
++	use=vt100+pf1-pf4,
+ 
+ go140w|graphon go-140 in 132 column mode,
+ 	am,
+@@ -17839,14 +17894,14 @@
+ 	blink=\E[5m, bold=\E[1m, cub1=^H, cud1=\n, cuf1=\E[C,
+ 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M,
+ 	home=\E[H, ht=^I, il1=\E[L, ind=\ED,
+-	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, kf1=\EOP,
+-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, rev=\E[7m,
++	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, rev=\E[7m,
+ 	rf=/usr/share/tabset/vt100, ri=\EM, rmam=\E[?7l,
+ 	rmcup=\E[!p\E[?7h\E[2;1;1#w, rmir=\E[4l, rmkx=\E>,
+ 	rmso=\E[27m, rmul=\E[24m, rs1=\E[!p\E[?7h\E[2;1;1#w,
+ 	sgr0=\E[m, smam=\E[?7h, smcup=\E[2;0#w\E[1;25r,
+ 	smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m,
+ 	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
++	use=vt100+pf1-pf4,
+ 
+ #### Harris (Beehive)
+ #
+@@ -18176,13 +18231,12 @@
+ 	cuf1=\E[C$<2/>, cup=\E[%i%p1%d;%p2%dH$<5/>,
+ 	cuu1=\E[A$<2/>, ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H,
+ 	ht=^I, is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\EOD,
+-	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf2=\EOQ,
+-	kf3=\EOR, kf4=\EOS, rev=\E[7m$<2/>,
++	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, rev=\E[7m$<2/>,
+ 	rf=/usr/share/tabset/vt100, ri=\EM$<5/>,
+ 	rmkx=\E[?1l\E>, rmso=\E[m$<2/>, rmul=\E[m$<2/>,
+ 	rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+ 	sgr0=\E[m$<2/>, smkx=\E[?1h\E=, smso=\E[7m$<2/>,
+-	smul=\E[4m$<2/>, use=ansi+csr,
++	smul=\E[4m$<2/>, use=ansi+csr, use=vt100+pf1-pf4,
+ 
+ #### IBM
+ #
+@@ -19372,13 +19426,13 @@
+ 	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, ind=\ED,
+ 	is2=\E(B\E[2l\E>\E[20l\E[?3l\E[?5h\E[?7h\E[1;24r\E[24;1H\E[H
+ 	    \E[J,
+-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, ll=\E[24;1H, nel=\EE,
+-	rf=/usr/share/tabset/vt100, ri=\EM, rmam=\E[?7l,
+-	rmso=\E[0m, rmul=\E[24m,
++	ll=\E[24;1H, nel=\EE, rf=/usr/share/tabset/vt100, ri=\EM,
++	rmam=\E[?7l, rmso=\E[0m, rmul=\E[24m,
+ 	rs1=\E(B\E[2l\E>\E[20l\E[?3l\E[?5h\E[?7h\E[H\E[J,
+ 	sgr0=\E[m, smam=\E[?7h, smso=\E[7m, smul=\E[4m, tbc=\E[g,
+ 	tsl=\E[25;1H, use=ansi+arrows, use=ansi+csr,
+ 	use=ansi+erase, use=ansi+idl, use=ansi+local,
++	use=vt100+pf1-pf4,
+ 
+ # Fri Aug  5 08:11:57 1983
+ # This entry works for the ergo 4000 with the following setups:
+@@ -19397,12 +19451,11 @@
+ 	ed=\E[0J$<15>, el=\E[0K$<13>, ht=^I, il1=\E[1L$<5*>,
+ 	ind=\ED$<20*>,
+ 	is2=\E<\E=\E[?1l\E[?4l\E[?5l\E[?7h\E[?8h$<300>,
+-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP,
+-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, lf1=pf1, lf2=pf2, lf3=pf3,
+-	lf4=pf4, ri=\EM$<20*>, rmam=\E[?7l, rmir=\E[4l,
+-	rmkx=\E=$<4>, rmso=\E[m$<20>, sgr0=\E[m$<20>,
++	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, lf1=pf1,
++	lf2=pf2, lf3=pf3, lf4=pf4, ri=\EM$<20*>, rmam=\E[?7l,
++	rmir=\E[4l, rmkx=\E=$<4>, rmso=\E[m$<20>, sgr0=\E[m$<20>,
+ 	smam=\E[?7m, smir=\E[4h$<6>, smkx=\E=$<4>,
+-	smso=\E[7m$<20>, use=ansi+local1,
++	smso=\E[7m$<20>, use=ansi+local1, use=vt100+pf1-pf4,
+ 
+ #### NCR
+ #
+@@ -19902,10 +19955,10 @@
+ 	home=\E[H$<2>$<80>, il=\E[%p1%dL$<80>,
+ 	il1=\E[B\E[L$<80>, ind=\ED,
+ 	is2=\E[12h\E[?10l\E%/0n\E[P\031\E[?3l\E(B\E)0$<200>,
+-	kLFT=\E[D, kRIT=\E[C, ka1=\E[H, kent=\r, kf1=\EOP, kf2=\EOQ,
+-	kf3=\EOR, kf4=\EOS, mc0=\E[i$<100>, nel=\EE, rc=\E8,
+-	rev=\E[7m$<30>, ri=\EM$<50>, rmacs=\017$<90>,
+-	rmir=\E[4l$<80>, rmso=\E[0m$<30>, rmul=\E[0m$<30>,
++	kLFT=\E[D, kRIT=\E[C, ka1=\E[H, kent=\r, mc0=\E[i$<100>,
++	nel=\EE, rc=\E8, rev=\E[7m$<30>, ri=\EM$<50>,
++	rmacs=\017$<90>, rmir=\E[4l$<80>, rmso=\E[0m$<30>,
++	rmul=\E[0m$<30>,
+ 	rs2=\Ec\E[12;31h\E[?3;4;5;10l\E[?6;7;19;25h\E[33;34l\E[0m\E(
+ 	    B\E)0\E%/0n\E[P\031$<200>,
+ 	sc=\E7,
+@@ -19914,6 +19967,7 @@
+ 	sgr0=\017\E[0m$<120>, smacs=\016$<90>, smir=\E[4h$<80>,
+ 	smso=\E[7m$<30>, smul=\E[4m$<30>, tbc=\E[3g$<40>,
+ 	tsl=\E[>+1$<70>, use=decid+cpr, use=vt100+4bsd,
++	use=vt100+pf1-pf4,
+ ncrvt100wan|NCRVT100WPP|ncrvt100wpp|NCR VT100 emulation of the 2900 terminal,
+ 	cols#132,
+ 	is2=\E[12h\E[?10l\E%/0n\E[P\031\E[?3h\E(B\E)0$<200>,
+@@ -20237,14 +20291,13 @@
+ 	cup=\010\E[%i%p1%d;%p2%dH, dch1=\E[0P, dl1=\E[0M,
+ 	ed=\E[0J, el=\E[0K, enacs=\E(B\E)0, home=\E[H, ht=^I,
+ 	ich1=\E[0@, il1=\E[0L, ind=\n, is2=\E[?3l\E)0\E(B,
+-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kend=\E[K,
+-	kf1=\E[1~, kf10=\E[10~, kf2=\E[2~, kf3=\E[3~, kf4=\E[4~,
+-	kf5=\E[5~, kf6=\E[6~, kf7=\E[7~, kf8=\E[8~, kf9=\E[9~,
+-	khome=\E[G, kich1=\E[@, knp=\E[26~, kpp=\E[25~, lf0=f1,
+-	lf1=f2, lf2=f3, lf3=f4, lf4=f5, lf5=f6, lf6=f7, lf7=f8, lf8=f9,
+-	lf9=f10, ri=\EM, rmacs=^O, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
+-	smacs=^N, smso=\E[7m, smul=\E[4m, use=ansi+local1,
+-	use=vt220+cvis,
++	kend=\E[K, kf1=\E[1~, kf10=\E[10~, kf2=\E[2~, kf3=\E[3~,
++	kf4=\E[4~, kf5=\E[5~, kf6=\E[6~, kf7=\E[7~, kf8=\E[8~,
++	kf9=\E[9~, khome=\E[G, kich1=\E[@, knp=\E[26~, kpp=\E[25~,
++	lf0=f1, lf1=f2, lf2=f3, lf3=f4, lf4=f5, lf5=f6, lf6=f7, lf7=f8,
++	lf8=f9, lf9=f10, ri=\EM, rmacs=^O, sgr0=\E[m, smacs=^N,
++	use=ansi+cup, use=ansi+local1, use=ansi+sgrso,
++	use=ansi+sgrul, use=vt100+noapp, use=vt220+cvis,
+ pt210|TRS-80 PT-210 printing terminal,
+ 	hc, os,
+ 	cols#80,
+@@ -21466,10 +21519,10 @@
+ 	ind=\ED,
+ 	is2=\E>\E[?1h\E[?7h\E[?5l\017\E(B\E[m\E[20l\E[1;24r\E[24;1H,
+ 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU,
+-	kf7=\EOV, kf8=\EOW, nel=\r\ED, rev=\E[7m, ri=\E[T,
+-	rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smir=\E[4h,
+-	smso=\E[7m, smul=\E[4m, use=ansi+csr,
++	kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, nel=\r\ED, rev=\E[7m,
++	ri=\E[T, rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
++	smir=\E[4h, smso=\E[7m, smul=\E[4m, use=ansi+csr,
++	use=vt100+pf1-pf4,
+ 
+ # basis from Peter Harrison, Computer Graphics Lab, San Francisco
+ #   ucbvax!ucsfmis!harrison ...uucp / ucbvax!ucsfmis!harrison@BERKELEY ...ARPA
+@@ -22076,10 +22129,10 @@
+ 	bel=^G, clear=\E[H\E[J$<150>, cr=\r, cub1=^H,
+ 	cup=%i\E[%p1%d;%p2%dH, dl1=\E[M$<2*>, ed=\E[J$<150>,
+ 	el=\E[K$<2>, ht=^I, il1=\E[L$<2*>, ind=\n$<280>,
+-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP,
+-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, lf1=PF1, lf2=PF2, lf3=PF3,
+-	lf4=PF4, rmkx=\E>, rmso=\E[m, sgr0=\E[m, smkx=\E=,
+-	smso=\E[7m, use=ansi+csr, use=ansi+local1,
++	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, lf1=PF1,
++	lf2=PF2, lf3=PF3, lf4=PF4, rmkx=\E>, rmso=\E[m, sgr0=\E[m,
++	smkx=\E=, smso=\E[7m, use=ansi+csr, use=ansi+local1,
++	use=vt100+pf1-pf4,
+ 
+ bg1.25rv|BBN BitGraph 1.25 (reverse video),
+ 	flash=\E[?5l$<200/>\E[?5h, is2=\E>\E[?5h\E[?7h,
+@@ -22296,20 +22349,20 @@
+ 	is2=\E[?2h\E[?3l\E[?5l\E[?7h\E[?8h\E>\E[?1l\E\sF\E[?42l\E[?4
+ 	    l,
+ 	is3=\E[0$}\E[?25h\E[2l\E[H\E[J, ka1=\EOw, ka3=\EOy,
+-	kb2=\EOu, kc1=\EOq, kc3=\EOs, kf1=\EOP, kf2=\EOQ, kf3=\EOR,
+-	kf4=\EOS, khlp=\E[28~, krdo=\E[29~, lf1=pf1, lf2=pf2,
+-	lf3=pf3, lf4=pf4, nel=\EE, rev=\E[7m, ri=\EM, rmacs=\E(B,
+-	rmam=\E[?7l, rmcup=\E[?7h, rmir=\E[4l, rmkx=\E[?1l\E>,
+-	rmso=\E[27m, rmul=\E[24m, rs1=\E[!p, rs2=\E[?3l, s0ds=\E(B,
+-	s1ds=\E(0,
++	kb2=\EOu, kc1=\EOq, kc3=\EOs, khlp=\E[28~, krdo=\E[29~,
++	lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, nel=\EE, rev=\E[7m, ri=\EM,
++	rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?7h, rmir=\E[4l,
++	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=\E[!p,
++	rs2=\E[?3l, s0ds=\E(B, s1ds=\E(0,
+ 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
+ 	    %;m%?%p9%t\E(0%e\E(B%;,
+ 	sgr0=\E[0m\E(B, smacs=\E(0, smam=\E[?7h,
+ 	smcup=\E[?7l\E[?1l\E(B, smir=\E[4h, smso=\E[7m,
+ 	smul=\E[4m, tsl=\E[1$}\E[2$~, use=ansi+enq, use=ansi+csr,
+ 	use=ansi+erase, use=ansi+idl, use=ansi+local,
+-	use=ansi+pp, use=dec+sl, use=vt100+4bsd, use=vt220+cvis,
+-	use=vt220+vtedit, use=vt220+sfkeys, use=vt220+ufkeys,
++	use=ansi+pp, use=dec+sl, use=vt100+4bsd,
++	use=vt100+pf1-pf4, use=vt220+cvis, use=vt220+vtedit,
++	use=vt220+sfkeys, use=vt220+ufkeys,
+ 
+ bq300-rv|Bull VT320 reverse 80 columns,
+ 	flash=\E[?5l$<50>\E[?5h,
+@@ -22762,11 +22815,10 @@
+ 	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+ 	cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, ht=^I, ind=\n,
+ 	is2=\E>\E[?3l\E[?4l\E[?5l\E[?20l\E[?7h\E[?8h,
+-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP,
+-	kf2=\EOQ, kf3=\EOR, kf4=\EOS, khome=\E[H, ri=\EM,
+-	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
++	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, khome=\E[H,
++	ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+ 	sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7;31m,
+-	smul=\E[4m, use=ansi+local,
++	smul=\E[4m, use=ansi+local, use=vt100+pf1-pf4,
+ 
+ # DEC PRO-350 console (VT220-style).  The 350 was DEC's attempt to produce
+ # a PC differentiated from the IBM clones.  It was a total, ludicrous,
+@@ -22860,13 +22912,12 @@
+ 	cup=\E[%i%p1%d;%p2%dH$<5/>, cuu1=\E[A$<2/>,
+ 	ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H, ht=^I,
+ 	ind=\ED$<5/>, is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\E[D,
+-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ,
+-	kf3=\EOR, kf4=\EOS, rev=\E[7m$<2/>,
++	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, rev=\E[7m$<2/>,
+ 	rf=/usr/share/tabset/vt100, ri=\EM$<5/>, rmam=\E[7l,
+ 	rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m$<2/>,
+ 	rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+ 	sgr0=\E[m$<2/>, smam=\E[7l, smkx=\E[?1h\E=, smso=\E[7m,
+-	smul=\E[4m$<2/>, use=ansi+csr,
++	smul=\E[4m$<2/>, use=ansi+csr, use=vt100+pf1-pf4,
+ 
+ #### Evans & Sutherland
+ #
+@@ -23215,11 +23266,11 @@
+ 	cols#80, it#8, lines#24,
+ 	clear=\E[H\E[2J, cnorm=\Ez56;2;0;0z\Ez73z\Ez4;1;1z,
+ 	cr=\r, cub1=^H, cvvis=\Ez4;2;1z\Ez56;2;80;24z, dch1=\E[P,
+-	ht=^I, ind=\ED, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+-	nel=\r\ED, rc=\E8, ri=\EM, rmdc=\E[4l, rmir=\E[4l, sc=\E7,
+-	sgr0=\E[m, smdc=\E[4h, smir=\E[4h, use=ansi+arrows,
+-	use=ansi+cup, use=ansi+erase, use=ansi+idl,
+-	use=ansi+local, use=ansi+sgrso,
++	ht=^I, ind=\ED, nel=\r\ED, rc=\E8, ri=\EM, rmdc=\E[4l,
++	rmir=\E[4l, sc=\E7, sgr0=\E[m, smdc=\E[4h, smir=\E[4h,
++	use=ansi+arrows, use=ansi+cup, use=ansi+erase,
++	use=ansi+idl, use=ansi+local, use=ansi+sgrso,
++	use=vt100+pf1-pf4,
+ 
+ graphos-30|graphos III with 30 lines,
+ 	lines#30,
+@@ -23289,10 +23340,9 @@
+ 	flash=\E[?5h\E[0q\E[1;2q\E[?5l\E[0q\E[4;3q,
+ 	home=\E[H, ht=^I, is2=\E<\E[1;48r\E[0q\E[3;4q\E=\E[?1h,
+ 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, rev=\E[7m, ri=\EM,
+-	rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, rs1=\E=\E[0q\E>,
+-	sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+-	use=ansi+csr,
++	rev=\E[7m, ri=\EM, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
++	rs1=\E=\E[0q\E>, sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m,
++	smul=\E[4m, use=ansi+csr, use=vt100+pf1-pf4,
+ 
+ #### Morrow Designs
+ #
+@@ -23737,11 +23787,11 @@
+ 	csr=%i\E[%p1%d;%p2%dr, cup=%i\E[%p1%d;%p2%dH,
+ 	cvvis=\E[?31h, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+ 	hts=\EH, il1=\E[L, ind=\ED, kbs=^H, kcub1=\E[D, kcud1=\E[B,
+-	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kf1=\EOP, kf2=\EOQ,
+-	kf3=\EOR, kf4=\EOS, kf5=\E[16~, kf6=\E[17~, kf7=\E[18~,
+-	kf8=\E[19~, kf9=\E[20~, kich1=\E[@, rc=\E8, rev=\E[7m,
+-	ri=\EM, rmso=\E[m, rmul=\E[m, sc=\E7, sgr0=\E[m, smso=\E[7m,
+-	smul=\E[4m, tbc=\E[3g, use=ansi+local1, use=vt220+cvis,
++	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kf5=\E[16~, kf6=\E[17~,
++	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kich1=\E[@, rc=\E8,
++	rev=\E[7m, ri=\EM, rmso=\E[m, rmul=\E[m, sc=\E7, sgr0=\E[m,
++	smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=ansi+local1,
++	use=vt100+pf1-pf4, use=vt220+cvis,
+ ti924-8|Texas Instruments 924 VDT 8859/1 8 bit CTRL,
+ 	am, xon,
+ 	cols#80, it#8, lines#24,
+@@ -23894,16 +23944,16 @@
+ 	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[1M, ech=\E[%p1%dX, ed=\E[J,
+ 	el=\E[K, home=\E[H, hpa=\E[%i%p1%dG, ich=\E[%p1%d@,
+ 	ich1=\E[1@, il=\E[%p1%dL, il1=\E[1L, ind=\E[S, invis=\E[9m,
+-	is2=\E[0;10;39m, kcbt=^], kdch1=\E[P, kend=\E[Y, kf1=\EOP,
+-	kf10=\EOY, kf11=\EOZ, kf12=\EOA, kf2=\EOQ, kf3=\EOR,
+-	kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX,
+-	kich1=\E[@, knp=\E[U, kpp=\E[V, krmir=\E0, nel=\r\E[S,
+-	rc=\E8, ri=\E[T, rmacs=\E[10m, sc=\E7,
++	is2=\E[0;10;39m, kcbt=^], kdch1=\E[P, kend=\E[Y, kf10=\EOY,
++	kf11=\EOZ, kf12=\EOA, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW,
++	kf9=\EOX, kich1=\E[@, knp=\E[U, kpp=\E[V, krmir=\E0,
++	nel=\r\E[S, rc=\E8, ri=\E[T, rmacs=\E[10m, sc=\E7,
+ 	sgr=\E[10m\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t;
+ 	    2%;%?%p6%t;1%;%?%p9%t;12%e;10%;%?%p7%t;9%;m,
+ 	sgr0=\E[0;10m, smacs=\E[12m, vpa=\E[%i%p1%dd,
+ 	use=ansi+arrows, use=ansi+inittabs, use=ansi+local,
+ 	use=ansi+sgrbold, use=ecma+index, use=klone+color,
++	use=vt100+pf1-pf4,
+ 
+ # (pc6300plus: removed ":KM=/usr/lib/ua/kmap.s5:"; renamed BO/EE/CI/CV -- esr)
+ pc6300plus|AT&T 6300 plus,
+@@ -24174,7 +24224,7 @@
+ 	cols#128, lines#57,
+ 	bel=^G, clear=^L, cr=\r, cub1=^H, cud1=\n, cuu1=^K, ht=^I,
+ 	ind=\n, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
++	use=vt100+pf1-pf4,
+ 
+ #### Other consoles
+ # The following is a version of the ibm-pc entry distributed with PC/IX,
+@@ -24319,11 +24369,11 @@
+ 	ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H, ht=^I,
+ 	ich1=\E[1@$<7/>, il1=\E[1L$<9/>, is2=\E[1;24r\E[24;1H,
+ 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\r\n,
+-	rev=\E[7m$<2/>, rf=/usr/share/tabset/vt100,
++	nel=\r\n, rev=\E[7m$<2/>, rf=/usr/share/tabset/vt100,
+ 	ri=\EM$<5/>, rmkx=\E>\E[?1l, rmso=\E[m$<2/>,
+ 	rmul=\E[m$<2/>, rs1=\E>, sgr0=\E[m$<2/>, smkx=\E=\E[?1h,
+ 	smso=\E[7m$<2/>, smul=\E[4m$<2/>, use=ansi+csr,
++	use=vt100+pf1-pf4,
+ 
+ # From: Rick Thomas 
+ # (xtalk: I added / based on the init string.
+@@ -24493,10 +24543,10 @@
+ 	bel=^G, clear=\E[1;1H\E[2J, cnorm=\E[>12h, cr=\r, cub1=^H,
+ 	cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A,
+ 	cvvis=\E[>12l, ed=\E[J, el=\E[K, ht=^I, ind=\ED, kcub1=\E[D,
+-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ,
+-	kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW,
+-	ri=\EM, rmacs=\E[m, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
+-	smacs=\E[1m, smso=\E[7m, smul=\E[4m,
++	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf5=\EOT, kf6=\EOU,
++	kf7=\EOV, kf8=\EOW, ri=\EM, rmacs=\E[m, rmso=\E[m, rmul=\E[m,
++	sgr0=\E[m, smacs=\E[1m, smso=\E[7m, smul=\E[4m,
++	use=vt100+pf1-pf4,
+ digilog|digilog 333,
+ 	OTbs,
+ 	cols#80, lines#16,
+@@ -27855,7 +27905,12 @@
+ #	+ add sclp -TD
+ #	+ add op to vt525 -TD
+ #
+-# 2025-0405
++# 2025-04-05
+ #	+ update contour -TD
+ #
++# 2025-04-12
++#	+ add pangoterm -TD
++#	+ add kf1 to kf5 to sclp (report by Werner Fink)
++#	+ add vt100+pf1-pf4 -TD
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250405+/package/debian-mingw/changelog	2025-04-05 09:48:54.000000000 +0000
++++ ncurses-6.5-20250412/package/debian-mingw/changelog	2025-04-12 10:27:36.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250405) unstable; urgency=low
++ncurses6td (6.5+20250412) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 05 Apr 2025 05:48:54 -0400
++ -- Thomas E. Dickey   Sat, 12 Apr 2025 06:27:36 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250405+/package/debian-mingw64/changelog	2025-04-05 09:48:54.000000000 +0000
++++ ncurses-6.5-20250412/package/debian-mingw64/changelog	2025-04-12 10:27:36.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250405) unstable; urgency=low
++ncurses6td (6.5+20250412) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 05 Apr 2025 05:48:54 -0400
++ -- Thomas E. Dickey   Sat, 12 Apr 2025 06:27:36 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250405+/package/debian/changelog	2025-04-05 09:48:54.000000000 +0000
++++ ncurses-6.5-20250412/package/debian/changelog	2025-04-12 10:27:36.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250405) unstable; urgency=low
++ncurses6td (6.5+20250412) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 05 Apr 2025 05:48:54 -0400
++ -- Thomas E. Dickey   Sat, 12 Apr 2025 06:27:36 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.697 
+--- ncurses-6.5-20250405+/package/mingw-ncurses.nsi	2025-04-05 09:48:54.000000000 +0000
++++ ncurses-6.5-20250412/package/mingw-ncurses.nsi	2025-04-12 10:27:36.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.697 2025/04/05 09:48:54 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.698 2025/04/12 10:27:36 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0405"
++!define VERSION_MMDD  "0412"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250405+/package/mingw-ncurses.spec	2025-04-05 09:48:54.000000000 +0000
++++ ncurses-6.5-20250412/package/mingw-ncurses.spec	2025-04-12 10:27:36.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250405
++Release: 20250412
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20250405+/package/ncurses.spec	2025-04-05 09:48:54.000000000 +0000
++++ ncurses-6.5-20250412/package/ncurses.spec	2025-04-12 10:27:36.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250405
++Release: 20250412
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20250405+/package/ncursest.spec	2025-04-05 09:48:54.000000000 +0000
++++ ncurses-6.5-20250412/package/ncursest.spec	2025-04-12 10:27:36.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250405
++Release: 20250412
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250419.patch b/packages/ncurses/6.5/ncurses-6.5-20250419.patch
new file mode 100644
index 0000000000..b3e03b6244
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250419.patch
@@ -0,0 +1,1214 @@
+# ncurses 6.5 - patch 20250419 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250419.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Apr 20 00:10:18 UTC 2025
+# ------------------------------------------------------------------------------
+# NEWS                              |    6 -
+# VERSION                           |    2 
+# dist.mk                           |    4 
+# doc/html/man/curs_add_wch.3x.html |  197 ++++++++++++++++++++----------------
+# doc/html/man/curs_addch.3x.html   |  192 +++++++++++++++++++----------------
+# doc/html/man/curs_printw.3x.html  |    8 -
+# doc/html/man/ncurses.3x.html      |    2 
+# doc/html/man/terminfo.5.html      |    2 
+# doc/html/man/user_caps.5.html     |    4 
+# man/curs_add_wch.3x               |   72 +++++++++----
+# man/curs_addch.3x                 |   72 +++++++++----
+# man/curs_printw.3x                |   17 ++-
+# 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 
+# 19 files changed, 359 insertions(+), 241 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4273 
+--- ncurses-6.5-20250412+/NEWS	2025-04-12 21:08:43.000000000 +0000
++++ ncurses-6.5-20250419/NEWS	2025-04-19 23:31:31.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4273 2025/04/12 21:08:43 tom Exp $
++-- $Id: NEWS,v 1.4275 2025/04/19 23:31:31 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.
+ 
++20250419
++	+ add note on scrolling and lower-right corner to waddch and wadd_wch
++	  manual pages.
++
+ 20250412
+ 	+ add pangoterm -TD
+ 	+ add kf1 to kf5 to sclp (report by Werner Fink)
+Index: VERSION
+--- ncurses-6.5-20250412+/VERSION	2025-04-12 10:27:36.000000000 +0000
++++ ncurses-6.5-20250419/VERSION	2025-04-19 10:37:06.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250412
++5:0:10	6.5	20250419
+Index: dist.mk
+Prereq:  1.1664 
+--- ncurses-6.5-20250412+/dist.mk	2025-04-12 10:27:36.000000000 +0000
++++ ncurses-6.5-20250419/dist.mk	2025-04-19 10:37:06.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1664 2025/04/12 10:27:36 tom Exp $
++# $Id: dist.mk,v 1.1665 2025/04/19 10:37:06 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 = 5
+-NCURSES_PATCH = 20250412
++NCURSES_PATCH = 20250419
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/curs_add_wch.3x.html
+--- ncurses-6.5-20250412+/doc/html/man/curs_add_wch.3x.html	2025-04-05 22:33:03.000000000 +0000
++++ ncurses-6.5-20250419/doc/html/man/curs_add_wch.3x.html	2025-04-19 23:33:02.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_add_wch.3x,v 1.114 2025/04/05 21:58:37 tom Exp @
++  * @Id: curs_add_wch.3x,v 1.115 2025/04/19 22:53:52 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_add_wch 3x 2025-04-05 ncurses 6.5 Library calls
++curs_add_wch 3x 2025-04-19 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                      curs_add_wch 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                      
++
                                                                                                                                                      curs_add_wch 3x 2025-04-19 ncurses 6.5 Library calls
                                                                                                                                                      
+ 
                                                                                                                                                      + curs_add_wch(3x)                 Library calls                curs_add_wch(3x)
+ 
+@@ -157,16 +157,6 @@
+        until  another spacing character is written to the window or the cursor
+        is moved.
+ 
+-       If the cursor is  not  at  the  bottom  of  the  scrolling  region  and
+-       advancement  occurs at the right margin, the cursor automatically wraps
+-       to the beginning of the next line.
+-
+-       If the cursor is at the bottom of the scrolling region when advancement
+-       occurs  at  the  right margin, and scrollok(3x) is enabled for win, the
+-       scrolling region scrolls up one line and the  cursor  wraps  as  above.
+-       Otherwise,  advancement  and scrolling do not occur, and waddch returns
+-       ERR.
+-
+        If wch is a backspace, carriage return, line feed, or tab,  the  cursor
+        moves appropriately within the window.
+ 
+@@ -180,36 +170,69 @@
+            margin.
+ 
+        o   Tab advances the cursor to the next tab stop (possibly on the  next
+-           line);  these  are placed at every eighth column by default.  Alter
+-           the   tab   interval    with    the    TABSIZE    extension;    see
++           line); these are placed at every eighth column by default.
++
++           Alter   the   tab   interval   with   the  TABSIZE  extension;  see
+            curs_variables(3x).
+ 
+-       If  wch  is  any other nonprintable character, it is drawn in printable
+-       form using the same convention as wunctrl(3x).  Calling win_wch(3x)  on
+-       the  location of a nonprintable character does not return the character
++       If wch is any other nonprintable character, it is  drawn  in  printable
++       form  using the same convention as wunctrl(3x).  Calling win_wch(3x) on
++       the location of a nonprintable character does not return the  character
+        itself, but its wunctrl(3x) representation.
+ 
++       Adding  spacing characters with wadd_wch causes it to wrap at the right
++       margin of the window:
++
++       o   If the cursor is not at the bottom  of  the  scrolling  region  and
++           advancement  occurs  at  the right margin, the cursor automatically
++           wraps to the beginning of the next line.
++
++       o   If the cursor is  at  the  bottom  of  the  scrolling  region  when
++           advancement occurs at the right margin, and scrollok(3x) is enabled
++           for win, the scrolling region scrolls up one line  and  the  cursor
++           wraps as above.  Otherwise, advancement and scrolling do not occur,
++           and wadd_wch returns ERR.
++
++       A window's margins may coincide with the screen boundaries.   This  may
++       be  a  problem  when  ncurses  updates  the  screen to match the curses
++       window.  When their right and bottom  margins  coincide,  ncurses  uses
++       different strategies to handle the variations of scrolling and wrapping
++       at the lower-right corner by depending on the terminal capabilities:
++
++       o   If the terminal does not automatically wrap as characters are added
++           at  the right margin (i.e., auto right margins), ncurses writes the
++           character directly.
++
++       o   If the terminal has auto right margins, but also  has  capabilities
++           for  turning auto margins off and on, ncurses turns the auto margin
++           feature off temporarily when writing to the lower-right corner.
++
++       o   If the terminal has an insertion mode which can be turned  off  and
++           on,  ncurses  writes  the  character  just  before  the lower-right
++           corner, and then inserts a character to push the  update  into  the
++           corner.
++
+ 
+ 
                                                                                                                                                      wecho_wchar
                                                                                                                                                      +-       echo_wchar  and  wecho_wchar  are  equivalent  to  calling   (w)add_wch
+-       followed  by  (w)refresh  on  stdscr  or  the specified window.  curses
+-       interprets these functions as a  hint  that  only  a  single  (complex)
+-       character  is  being output; for non-control characters, a considerable
++       echo_wchar   and  wecho_wchar  are  equivalent  to  calling  (w)add_wch
++       followed by (w)refresh on  stdscr  or  the  specified  window.   curses
++       interprets  these  functions  as  a  hint  that only a single (complex)
++       character is being output; for non-control characters,  a  considerable
+        performance gain may be enjoyed by employing them.
+ 
+ 
+ 
                                                                                                                                                      Forms-Drawing Characters
                                                                                                                                                      +-       curses defines macros  starting  with  WACS_  that  can  be  used  with
+-       wadd_wch  to  write  line-drawing  and  other  symbols  to  the screen.
+-       ncurses terms these forms-drawing  characters.   curses  uses  the  ACS
+-       default  listed  below  if the terminal type lacks the acs_chars (acsc)
+-       capability; that capability does  not  define  a  replacement  for  the
+-       character;  or  if  the  terminal type and locale configuration require
+-       Unicode to access these characters, but the library is  unable  to  use
+-       Unicode.   The "acsc char" column corresponds to how the characters are
++       curses  defines  macros  starting  with  WACS_  that  can  be used with
++       wadd_wch to  write  line-drawing  and  other  symbols  to  the  screen.
++       ncurses  terms  these  forms-drawing  characters.   curses uses the ACS
++       default listed below if the terminal type lacks  the  acs_chars  (acsc)
++       capability;  that  capability  does  not  define  a replacement for the
++       character; or if the terminal type  and  locale  configuration  require
++       Unicode  to  access  these characters, but the library is unable to use
++       Unicode.  The "acsc char" column corresponds to how the characters  are
+        specified in the acs_chars (acsc) string capability, and the characters
+-       in  it  may  appear on the screen if the terminal type's database entry
+-       incorrectly advertises ACS support.  The name "ACS" originates  in  the
++       in it may appear on the screen if the terminal  type's  database  entry
++       incorrectly  advertises  ACS support.  The name "ACS" originates in the
+        Alternate Character Set feature of the DEC VT100 terminal.
+ 
+                        Unicode   ACS       acsc
+@@ -222,6 +245,7 @@
+        WACS_CKBOARD    U+2592    :         a      checker board (stipple)
+        WACS_DARROW     U+2193    v         .      arrow pointing down
+        WACS_DEGREE     U+00b0    '         f      degree symbol
++
+        WACS_DIAMOND    U+25c6    +         `      diamond
+        WACS_GEQUAL     U+2265    >         >      greater-than-or-equal-to
+        WACS_HLINE      U+2500    -         q      horizontal line
+@@ -245,11 +269,10 @@
+        WACS_TTEE       U+252c    +         w      top tee
+        WACS_UARROW     U+2191    ^         -      arrow pointing up
+        WACS_ULCORNER   U+250c    +         l      upper left-hand corner
+-
+        WACS_URCORNER   U+2510    +         k      upper right-hand corner
+        WACS_VLINE      U+2502    |         x      vertical line
+ 
+-       The  ncurses  wide  API  also defines symbols for thick lines (acsc "J"
++       The ncurses wide API also defines symbols for  thick  lines  (acsc  "J"
+        through "N", "T" through "X", and "Q"):
+ 
+                          Unicode   ASCII     acsc
+@@ -284,9 +307,9 @@
+        WACS_D_URCORNER   U+2557    +         B      double upper right corner
+        WACS_D_VLINE      U+2551    |         Y      double vertical line
+ 
+-       Unicode's descriptions  for  these  characters  differs  slightly  from
+-       ncurses,  by  introducing  the  term "light" (along with less important
+-       details).  Here are its descriptions for the normal, thick, and  double
++       Unicode's  descriptions  for  these  characters  differs  slightly from
++       ncurses, by introducing the term "light"  (along  with  less  important
++       details).   Here are its descriptions for the normal, thick, and double
+        horizontal lines:
+ 
+        o   U+2500 BOX DRAWINGS LIGHT HORIZONTAL
+@@ -303,31 +326,31 @@
+ 
+        o   the curses screen has not been initialized,
+ 
+-       o   (for  functions  taking  a  WINDOW  pointer argument) win is a null
++       o   (for functions taking a WINDOW pointer  argument)  win  is  a  null
+            pointer,
+ 
+-       o   wrapping to a new line is impossible because scrollok(3x)  has  not
+-           been  called  on win (or stdscr, as applicable) when writing to its
++       o   wrapping  to  a new line is impossible because scrollok(3x) has not
++           been called on win (or stdscr, as applicable) when writing  to  its
+            bottom right location is attempted, or
+ 
+-       o   it is not possible to  add  a  complete  character  at  the  cursor
++       o   it  is  not  possible  to  add  a  complete character at the cursor
+            position.
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
++       Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                      NOTES
                                                                                                                                                      +-       add_wch, mvadd_wch, mvwadd_wch, and echo_wchar may  be  implemented  as
++       add_wch,  mvadd_wch,  mvwadd_wch,  and echo_wchar may be implemented as
+        macros.
+ 
+ 
+ 
                                                                                                                                                      EXTENSIONS
                                                                                                                                                      +-       The   symbols  WACS_S3,  WACS_S7,  WACS_LEQUAL,  WACS_GEQUAL,  WACS_PI,
+-       WACS_NEQUAL,  and  WACS_STERLING  are  not  standard.   However,   many
+-       publicly   available   terminfo   entries   include   acs_chars  (acsc)
+-       capabilities in which their key characters (pryz{|}) are embedded,  and
+-       a  second-hand  list of their character descriptions has come to light.
++       The  symbols  WACS_S3,  WACS_S7,  WACS_LEQUAL,  WACS_GEQUAL,   WACS_PI,
++       WACS_NEQUAL,   and  WACS_STERLING  are  not  standard.   However,  many
++       publicly  available   terminfo   entries   include   acs_chars   (acsc)
++       capabilities  in which their key characters (pryz{|}) are embedded, and
++       a second-hand list of their character descriptions has come  to  light.
+        The ncurses developers invented WACS-prefixed names for them.
+ 
+ 
+@@ -335,59 +358,59 @@
+        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       These  functions  are described in X/Open Curses Issue 4.  It specifies
++       These functions are described in X/Open Curses Issue 4.   It  specifies
+        no error conditions for them.
+ 
+-       The defaults specified for forms-drawing characters apply in the  POSIX
+-       locale.   X/Open Curses makes it clear that the WACS_ symbols should be
+-       defined as a pointer to  cchar_t  data,  e.g.,  in  the  discussion  of
++       The  defaults specified for forms-drawing characters apply in the POSIX
++       locale.  X/Open Curses makes it clear that the WACS_ symbols should  be
++       defined  as  a  pointer  to  cchar_t  data,  e.g., in the discussion of
+        border_set.  A few implementations are problematic:
+ 
+        o   NetBSD curses defines the symbols as a wchar_t within a cchar_t.
+ 
+-       o   HP-UX  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
++       o   HP-UX 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.
+ 
+-       X/Open Curses does not specify  symbols  for  thick-  or  double-lines.
++       X/Open  Curses  does  not  specify  symbols for thick- or double-lines.
+        SVr4 curses implementations defined their line-drawing symbols in terms
+-       of intermediate symbols.  ncurses extends those symbols, providing  new
++       of  intermediate symbols.  ncurses extends those symbols, providing new
+        definitions not found in SVr4 implementations.
+ 
+-       Not  all  Unicode-capable  terminals  provide  support  for VT100-style
++       Not all  Unicode-capable  terminals  provide  support  for  VT100-style
+        alternate character sets (i.e., the acsc_chars (acsc) capability), with
+-       their  corresponding  line-drawing  characters.   X/Open Curses did not
++       their corresponding line-drawing characters.   X/Open  Curses  did  not
+        address the aspect of integrating Unicode with line-drawing characters.
+-       Existing  implementations  of System V curses (AIX, HP-UX, Solaris) use
+-       only the acsc_chars (acsc) character-mapping to provide  this  feature.
+-       As  a  result,  those  implementations  can  use only single-byte line-
+-       drawing characters.  ncurses 5.3 (2002) provided  a  table  of  Unicode
+-       values  to solve these problems.  NetBSD curses incorporated that table
++       Existing implementations of System V curses (AIX, HP-UX,  Solaris)  use
++       only  the  acsc_chars (acsc) character-mapping to provide this feature.
++       As a result, those  implementations  can  use  only  single-byte  line-
++       drawing  characters.   ncurses  5.3  (2002) provided a table of Unicode
++       values to solve these problems.  NetBSD curses incorporated that  table
+        in 2010.
+ 
+-       ncurses  uses  the  Unicode  values  instead  of  the   terminal   type
++       ncurses   uses   the  Unicode  values  instead  of  the  terminal  type
+        description's acsc_chars (acsc) mapping as discussed in ncurses(3x) for
+-       the environment variable NCURSES_NO_UTF8_ACS.   In  contrast,  for  the
++       the  environment  variable  NCURSES_NO_UTF8_ACS.   In contrast, for the
+        same cases, the line-drawing characters described in addch(3x) will use
+        only the ASCII default values.
+ 
+-       Having Unicode available does not solve all of the problems with  line-
++       Having  Unicode available does not solve all of the problems with line-
+        drawing for curses:
+ 
+-       o   The  closest  Unicode equivalents to the VT100 graphics S1, S3, S7,
+-           and S9 frequently are not displayed at the regular intervals  which
++       o   The closest Unicode equivalents to the VT100 graphics S1,  S3,  S7,
++           and  S9 frequently are not displayed at the regular intervals which
+            the terminal used.
+ 
+-       o   The  lantern  is  a special case.  It originated with the AT&T 4410
+-           terminal in the early 1980s.  There is no accessible  documentation
++       o   The lantern is a special case.  It originated with  the  AT&T  4410
++           terminal  in the early 1980s.  There is no accessible documentation
+            depicting the lantern symbol on the AT&T terminal.
+ 
+            Lacking documentation, most readers assume that a storm lantern was
+            intended.  But there are several possibilities, all with problems.
+ 
+-           Unicode 6.0 (2010) does provide two lantern  symbols:  U+1F383  and
+-           U+1F3EE.   Those  were  not  available  in 2002, and are irrelevant
++           Unicode  6.0  (2010)  does provide two lantern symbols: U+1F383 and
++           U+1F3EE.  Those were not available  in  2002,  and  are  irrelevant
+            since they lie outside the Basic Multilingual Plane and as a result
+            are unavailable on many terminals.  They are not storm lanterns, in
+            any case.
+@@ -395,20 +418,20 @@
+            Most storm lanterns have a tapering glass chimney (to guard against
+            tipping); some have a wire grid protecting the chimney.
+ 
+-           For  the  tapering  appearance,   U+2603 was adequate.  In use on a
++           For the tapering appearance,  U+2603 was adequate.   In  use  on  a
+            terminal, no one can tell what the image represents.  Unicode calls
+            it a snowman.
+ 
+            Others have suggested these alternatives: <section> U+00A7 (section
+-           mark), <Theta> U+0398 (theta), <Phi> U+03A6 (phi),  <delta>  U+03B4
++           mark),  <Theta>  U+0398 (theta), <Phi> U+03A6 (phi), <delta> U+03B4
+            (delta),  U+2327 (x in a rectangle),  U+256C (forms double vertical
+            and horizontal), and  U+2612 (ballot box with x).
+ 
+ 
+ 
                                                                                                                                                      Complex Characters
                                                                                                                                                      +-       The complex character  type  cchar_t  can  store  more  than  one  wide
+-       character  (wchar_t).  X/Open Curses does not mention this possibility,
+-       specifying behavior only  where  wch  is  a  single  character,  either
++       The  complex  character  type  cchar_t  can  store  more  than one wide
++       character (wchar_t).  X/Open Curses does not mention this  possibility,
++       specifying  behavior  only  where  wch  is  a  single character, either
+        spacing or non-spacing.
+ 
+        ncurses assumes that wch is constructed using setcchar(3x), and in turn
+@@ -419,22 +442,22 @@
+ 
+        o   holds one non-spacing character.
+ 
+-       In  the  latter  case,  ncurses  adds  the non-spacing character to the
++       In the latter case, ncurses  adds  the  non-spacing  character  to  the
+        active complex character.
+ 
+ 
+ 
                                                                                                                                                      HISTORY
                                                                                                                                                      +-       X/Open Curses Issue 4 (1995) initially specified these functions.   The
++       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
+        System V  Interface  Definition  (SVID)  Version 4  of  the  same  year
+-       specified functions named waddwch (and the usual variants),  echowchar,
++       specified  functions named waddwch (and the usual variants), echowchar,
+        and wechowchar.  These were later additions to SVr4.x, not appearing in
+-       the first SVr4 (1989).  They differed from X/Open's later wadd_wch  and
+-       wecho_wchar  in that they each took an argument of type wchar_t instead
++       the  first SVr4 (1989).  They differed from X/Open's later wadd_wch and
++       wecho_wchar in that they each took an argument of type wchar_t  instead
+        of cchar_t.  SVID defined no  WACS_ symbols.
+ 
+-       X/Open Curses  Issue 4  also  defined  many  of  the  WACS_  constants,
++       X/Open  Curses  Issue 4  also  defined  many  of  the  WACS_ constants,
+        excepting  WACS_GEQUAL,  WACS_LEQUAL,  WACS_NEQUAL,  WACS_PI,  WACS_S3,
+-       WACS_S7, and WACS_STERLING; and those  for  drawing  thick  and  double
++       WACS_S7,  and  WACS_STERLING;  and  those  for drawing thick and double
+        lines.
+ 
+        ncurses 5.3 (2002) furnished the remaining WACS_ constants.
+@@ -445,12 +468,12 @@
+        its non-wide-character configuration.
+ 
+        curses(3x),   curs_addwstr(3x),   curs_add_wchstr(3x),   curs_attr(3x),
+-       curs_bkgrnd(3x),  curs_clear(3x),  curs_getcchar(3x), curs_outopts(3x),
++       curs_bkgrnd(3x), curs_clear(3x),  curs_getcchar(3x),  curs_outopts(3x),
+        curs_refresh(3x), curs_variables(3x), putwc(3)
+ 
+ 
+ 
+-ncurses 6.5                       2025-04-05                  curs_add_wch(3x)
++ncurses 6.5                       2025-04-19                  curs_add_wch(3x)
+ 
                                                                                                                                                      
+ 
                                                                                                                                                      
+ 
                                                                                                                                                        
+Index: doc/html/man/curs_addch.3x.html
+--- ncurses-6.5-20250412+/doc/html/man/curs_addch.3x.html	2025-04-05 22:33:03.000000000 +0000
++++ ncurses-6.5-20250419/doc/html/man/curs_addch.3x.html	2025-04-19 23:33:03.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addch.3x,v 1.135 2025/04/05 21:58:37 tom Exp @
++  * @Id: curs_addch.3x,v 1.136 2025/04/19 22:53:46 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addch 3x 2025-04-05 ncurses 6.5 Library calls
++curs_addch 3x 2025-04-19 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                        curs_addch 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                        
++
                                                                                                                                                        curs_addch 3x 2025-04-19 ncurses 6.5 Library calls
                                                                                                                                                        
+ 
                                                                                                                                                        + curs_addch(3x)                   Library calls                  curs_addch(3x)
+ 
+@@ -119,16 +119,6 @@
+        is  a  blank  character,  and  therefore  combines  with  the  window's
+        background character; see curs_bkgd(3x).
+ 
+-       If  the  cursor  is  not  at  the  bottom  of  the scrolling region and
+-       advancement occurs at the right margin, the cursor automatically  wraps
+-       to the beginning of the next line.
+-
+-       If the cursor is at the bottom of the scrolling region when advancement
+-       occurs at the right margin, and scrollok(3x) is enabled  for  win,  the
+-       scrolling  region  scrolls  up  one line and the cursor wraps as above.
+-       Otherwise, advancement and scrolling do not occur, and  waddch  returns
+-       ERR.
+-
+        If  ch  is  a backspace, carriage return, line feed, or tab, the cursor
+        moves appropriately within the window.
+ 
+@@ -142,37 +132,70 @@
+            margin.
+ 
+        o   Tab  advances the cursor to the next tab stop (possibly on the next
+-           line); these are placed at every eighth column by  default.   Alter
+-           the    tab    interval    with    the    TABSIZE   extension;   see
++           line); these are placed at every eighth column by default.
++
++           Alter  the  tab  interval   with   the   TABSIZE   extension;   see
+            curs_variables(3x).
+ 
+-       If ch is any other nonprintable character, it  is  drawn  in  printable
++       If  ch  is  any  other nonprintable character, it is drawn in printable
+        form using the same convention as unctrl(3x).  Calling winch(3x) on the
+-       location of a nonprintable character  does  not  return  the  character
++       location  of  a  nonprintable  character  does not return the character
+        itself, but its unctrl(3x) representation.
+ 
++       Adding printable characters with waddch causes it to wrap at the  right
++       margin of the window:
++
++       o   If  the  cursor  is  not  at the bottom of the scrolling region and
++           advancement occurs at the right margin,  the  cursor  automatically
++           wraps to the beginning of the next line.
++
++       o   If  the  cursor  is  at  the  bottom  of  the scrolling region when
++           advancement occurs at the right margin, and scrollok(3x) is enabled
++           for  win,  the  scrolling region scrolls up one line and the cursor
++           wraps as above.  Otherwise, advancement and scrolling do not occur,
++           and waddch returns ERR.
++
++       A  window's  margins may coincide with the screen boundaries.  This may
++       be a problem when ncurses  updates  the  screen  to  match  the  curses
++       window.   When  their  right  and bottom margins coincide, ncurses uses
++       different strategies to handle the variations of scrolling and wrapping
++       at the lower-right corner by depending on the terminal capabilities:
++
++       o   If the terminal does not automatically wrap as characters are added
++           at the right margin (i.e., auto right margins), ncurses writes  the
++           character directly.
++
++       o   If  the  terminal has auto right margins, but also has capabilities
++           for turning auto margins off and on, ncurses turns the auto  margin
++           feature off temporarily when writing to the lower-right corner.
++
++       o   If  the  terminal has an insertion mode which can be turned off and
++           on, ncurses  writes  the  character  just  before  the  lower-right
++           corner,  and  then  inserts a character to push the update into the
++           corner.
++
+ 
+ 
                                                                                                                                                        wechochar
                                                                                                                                                        +-       echochar  and  wechochar are equivalent to calling (w)addch followed by
+-       (w)refresh on stdscr or the specified window.  curses interprets  these
+-       functions  as a hint to its optimizer that only a single character cell
+-       in the window is  being  altered  between  refreshes;  for  non-control
++       echochar and wechochar are equivalent to calling (w)addch  followed  by
++       (w)refresh  on stdscr or the specified window.  curses interprets these
++       functions as a hint to its optimizer that only a single character  cell
++       in  the  window  is  being  altered  between refreshes; for non-control
+        characters, a considerable performance gain may be enjoyed by employing
+        them.
+ 
+ 
+ 
                                                                                                                                                        Forms-Drawing Characters
                                                                                                                                                        +-       curses defines macros starting with ACS_ that can be used  with  waddch
+-       to  write  line-drawing and other symbols to the screen.  ncurses terms
+-       these forms-drawing characters.  curses uses  the  ACS  default  listed
+-       below  if the terminal type lacks the acs_chars (acsc) capability; that
+-       capability does not define a replacement for the character; or  if  the
+-       terminal  type and locale configuration require Unicode to access these
+-       characters, but the library is unable to use Unicode.  The "acsc  char"
++       curses  defines  macros starting with ACS_ that can be used with waddch
++       to write line-drawing and other symbols to the screen.   ncurses  terms
++       these  forms-drawing  characters.   curses  uses the ACS default listed
++       below if the terminal type lacks the acs_chars (acsc) capability;  that
++       capability  does  not define a replacement for the character; or if the
++       terminal type and locale configuration require Unicode to access  these
++       characters,  but the library is unable to use Unicode.  The "acsc char"
+        column corresponds to how the characters are specified in the acs_chars
+-       (acsc) string capability, and the characters in it may  appear  on  the
++       (acsc)  string  capability,  and the characters in it may appear on the
+        screen if the terminal type's database entry incorrectly advertises ACS
+-       support.  The name "ACS" originates  in  the  Alternate  Character  Set
++       support.   The  name  "ACS"  originates  in the Alternate Character Set
+        feature of the DEC VT100 terminal.
+ 
+                       ACS       acsc
+@@ -180,7 +203,6 @@
+        ------------------------------------------------------------------------
+        ACS_BLOCK      #         0      solid square block
+        ACS_BOARD      #         h      board of squares
+-
+        ACS_BTEE       +         v      bottom tee
+        ACS_BULLET     o         ~      bullet
+        ACS_CKBOARD    :         a      checker board (stipple)
+@@ -220,27 +242,27 @@
+ 
+        o   the curses screen has not been initialized,
+ 
+-       o   (for  functions  taking  a  WINDOW  pointer argument) win is a null
++       o   (for functions taking a WINDOW pointer  argument)  win  is  a  null
+            pointer,
+ 
+-       o   wrapping to a new line is impossible because scrollok(3x)  has  not
+-           been  called  on win (or stdscr, as applicable) when a write to its
++       o   wrapping  to  a new line is impossible because scrollok(3x) has not
++           been called on win (or stdscr, as applicable) when a write  to  its
+            bottom right location is attempted, or
+ 
+-       o   it is not possible to  add  a  complete  character  at  the  cursor
++       o   it  is  not  possible  to  add  a  complete character at the cursor
+            position.
+ 
+        The last may be due to different causes:
+ 
+-       o   conversion  of  a  wide character to a multibyte character sequence
++       o   conversion of a wide character to a  multibyte  character  sequence
+            can fail, or
+ 
+-       o   at least one of the bytes resulting from wide character  conversion
+-           to  a  multibyte  character sequence cannot be added to the window.
+-           See section "PORTABILITY" below regarding the use  of  waddch  with
++       o   at  least one of the bytes resulting from wide character conversion
++           to a multibyte character sequence cannot be added  to  the  window.
++           See  section  "PORTABILITY"  below regarding the use of waddch with
+            wide characters.
+ 
+-       Functions  prefixed with "mv" first perform cursor movement and fail if
++       Functions prefixed with "mv" first perform cursor movement and fail  if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+@@ -250,11 +272,11 @@
+ 
+ 
                                                                                                                                                        EXTENSIONS
                                                                                                                                                        +        The symbols ACS_S3, ACS_S7, ACS_LEQUAL, ACS_GEQUAL, ACS_PI, ACS_NEQUAL,
+-       and  ACS_STERLING were not documented in any publicly released System V
+-       and are  not  standard.   However,  many  publicly  available  terminfo
+-       entries  include  acs_chars  (acsc)  capabilities  in  which  their key
+-       characters (pryz{|}) are embedded, and  a  second-hand  list  of  their
+-       character  descriptions  has  come  to  light.   The ncurses developers
++       and ACS_STERLING were not documented in any publicly released  System V
++       and  are  not  standard.   However,  many  publicly  available terminfo
++       entries include  acs_chars  (acsc)  capabilities  in  which  their  key
++       characters  (pryz{|})  are  embedded,  and  a second-hand list of their
++       character descriptions has  come  to  light.   The  ncurses  developers
+        invented ACS-prefixed names for them.
+ 
+ 
+@@ -265,79 +287,79 @@
+        X/Open Curses Issue 4 describes these functions.  It specifies no error
+        conditions for them.
+ 
+-       SVr4 describes a successful return value  only  as  "an  integer  value
++       SVr4  describes  a  successful  return  value only as "an integer value
+        other than ERR".
+ 
+-       The  defaults specified for forms-drawing characters apply in the POSIX
++       The defaults specified for forms-drawing characters apply in the  POSIX
+        locale.
+ 
+ 
+ 
                                                                                                                                                        ACS Symbols
                                                                                                                                                        +-       X/Open Curses states that the  ACS_  definitions  are  char  constants.
++       X/Open  Curses  states  that  the  ACS_ definitions are char constants.
+        Some implementations are problematic.
+ 
+-       o   Solaris  curses, for example, defines the ACS symbols as constants;
++       o   Solaris curses, for example, defines the ACS symbols as  constants;
+            others define them as elements of an array.
+ 
+-           SVr4 used an array, acs_map, as does ncurses.  NetBSD  curses  also
+-           uses  an  array,  actually  named  _acs_char,  with a "#define" for
++           SVr4  used  an array, acs_map, as does ncurses.  NetBSD curses also
++           uses an array, actually  named  _acs_char,  with  a  "#define"  for
+            compatibility.
+ 
+-       o   HP-UX curses equates some of the  ACS_  symbols  to  the  analogous
+-           WACS_  symbols  as  if  the  ACS_ symbols were wide characters (see
+-           curs_add_wch(3x)).  The  misdefined  symbols  are  the  arrows  and
++       o   HP-UX  curses  equates  some  of  the ACS_ symbols to the analogous
++           WACS_ symbols as if the ACS_  symbols  were  wide  characters  (see
++           curs_add_wch(3x)).   The  misdefined  symbols  are  the  arrows and
+            others that are not used for line drawing.
+ 
+-       o   X/Open  Curses  (Issues 2  through 7) has a typographical error for
+-           the ACS_LANTERN symbol, equating  its  "VT100+  Character"  to  "I"
+-           (capital  I),  while  the  header  files  for SVr4 curses and other
++       o   X/Open Curses (Issues 2 through 7) has a  typographical  error  for
++           the  ACS_LANTERN  symbol,  equating  its  "VT100+ Character" to "I"
++           (capital I), while the header  files  for  SVr4  curses  and  other
+            implementations use "i" (small i).
+ 
+-           None of the terminal descriptions on Unix platforms  use  uppercase
+-           I,  except  for  Solaris  (in  its  terminfo  entry  for screen(1),
+-           apparently based on the X/Open documentation around 1995).  On  the
+-           other  hand,  its gs6300 (AT&T PC6300 with EMOTS Terminal Emulator)
++           None  of  the terminal descriptions on Unix platforms use uppercase
++           I, except  for  Solaris  (in  its  terminfo  entry  for  screen(1),
++           apparently  based on the X/Open documentation around 1995).  On the
++           other hand, its gs6300 (AT&T PC6300 with EMOTS  Terminal  Emulator)
+            description uses lowercase i.
+ 
+        The displayed values of ACS_ constants depend on
+ 
+-       o   the ncurses ABI -- for  example,  wide-character  versus  non-wide-
+-           character  configurations  (the  former  is  capable  of displaying
++       o   the  ncurses  ABI  --  for example, wide-character versus non-wide-
++           character configurations  (the  former  is  capable  of  displaying
+            Unicode while the latter is not), and
+ 
+        o   whether the locale uses UTF-8 encoding.
+ 
+-       In certain cases, the  terminal  is  unable  to  display  forms-drawing
+-       characters   except   by   using  UTF-8;  see  the  discussion  of  the
++       In  certain  cases,  the  terminal  is  unable to display forms-drawing
++       characters  except  by  using  UTF-8;  see  the   discussion   of   the
+        NCURSES_NO_UTF8_ACS environment variable in ncurses(3x).
+ 
+ 
+ 
                                                                                                                                                        Character Set
                                                                                                                                                        +-       X/Open Curses assumes that the parameter passed to  waddch  contains  a
+-       single  character.   That  character may have been more than eight bits
+-       wide in an SVr3 or SVr4 implementation, but X/Open  Curses  leaves  the
+-       width  of  a non-wide character code unspecified.  The standard further
+-       does not specify the internal structure of a chtype, though the use  of
+-       bit  operations  to  combine  the  character code with attributes and a
++       X/Open  Curses  assumes  that the parameter passed to waddch contains a
++       single character.  That character may have been more  than  eight  bits
++       wide  in  an  SVr3 or SVr4 implementation, but X/Open Curses leaves the
++       width of a non-wide character code unspecified.  The  standard  further
++       does  not specify the internal structure of a chtype, though the use of
++       bit operations to combine the character  code  with  attributes  and  a
+        color pair identifier into a chtype for passage to waddch is common.  A
+        portable application uses only the macros discussed in curs_attr(3x) to
+        manipulate a chtype.
+ 
+        In ncurses, chtype holds an eight-bit character, but the library allows
+-       a  multibyte  character sequence to be passed via a succession of calls
+-       to waddch.  Other implementations  do  not;  a  waddch  call  transmits
+-       exactly  one  character,  which  may  be rendered in one or more screen
+-       locations depending  on  whether  it  is  printable  (see  unctrl(3x)).
+-       Depending  on  the  locale,  ncurses  inspects  the byte passed in each
+-       waddch call and checks whether the latest call  continues  a  multibyte
+-       character.    When  a  character  is  complete,  ncurses  displays  the
+-       character  and  advances  the  cursor.   If  the  calling   application
++       a multibyte character sequence to be passed via a succession  of  calls
++       to  waddch.   Other  implementations  do  not;  a waddch call transmits
++       exactly one character, which may be rendered  in  one  or  more  screen
++       locations  depending  on  whether  it  is  printable  (see unctrl(3x)).
++       Depending on the locale, ncurses  inspects  the  byte  passed  in  each
++       waddch  call  and  checks whether the latest call continues a multibyte
++       character.   When  a  character  is  complete,  ncurses  displays   the
++       character   and  advances  the  cursor.   If  the  calling  application
+        interrupts the succession of bytes in a multibyte character sequence by
+        changing the current location -- for example, with wmove(3x) -- ncurses
+        discards the incomplete character.
+ 
+        For  portability  to  other  implementations,  do  not  rely  upon  the
+-       foregoing behavior.  Check whether a character can be represented as  a
++       foregoing  behavior.  Check whether a character can be represented as a
+        single byte in the current locale.
+ 
+        o   If it can, call either waddch or wadd_wch.
+@@ -348,24 +370,24 @@
+ 
                                                                                                                                                        HISTORY
                                                                                                                                                        +        4BSD (1980) introduced waddch and its variants.
+ 
+-       SVr3  (1987) added the echochar and wechochar functions and most of the
+-       ACS_ constants, except for ACS_GEQUAL, ACS_LEQUAL, ACS_NEQUAL,  ACS_PI,
++       SVr3 (1987) added the echochar and wechochar functions and most of  the
++       ACS_  constants, except for ACS_GEQUAL, ACS_LEQUAL, ACS_NEQUAL, ACS_PI,
+        ACS_S3, ACS_S7, and ACS_STERLING.
+ 
+        ncurses 1.9.6 (1995) furnished the remaining ACS_ constants.
+ 
+ 
+ 
                                                                                                                                                        SEE ALSO
                                                                                                                                                        +-       curs_add_wch(3x)  describes comparable functions of the ncurses library
++       curs_add_wch(3x) describes comparable functions of the ncurses  library
+        in its wide-character configuration (ncursesw).
+ 
+        curses(3x),    curs_addchstr(3x),    curs_addstr(3x),    curs_attr(3x),
+-       curs_bkgd(3x),    curs_clear(3x),    curs_inch(3x),   curs_outopts(3x),
++       curs_bkgd(3x),   curs_clear(3x),    curs_inch(3x),    curs_outopts(3x),
+        curs_refresh(3x), curs_variables(3x), putchar(3)
+ 
+ 
+ 
+-ncurses 6.5                       2025-04-05                    curs_addch(3x)
++ncurses 6.5                       2025-04-19                    curs_addch(3x)
+ 
                                                                                                                                                        
+ 
                                                                                                                                                        
+ 
                                                                                                                                                          
+Index: doc/html/man/curs_printw.3x.html
+--- ncurses-6.5-20250412+/doc/html/man/curs_printw.3x.html	2025-04-05 22:33:04.000000000 +0000
++++ ncurses-6.5-20250419/doc/html/man/curs_printw.3x.html	2025-04-19 23:33:04.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_printw.3x,v 1.60 2025/04/05 22:20:25 tom Exp @
++  * @Id: curs_printw.3x,v 1.61 2025/04/19 23:28:38 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_printw 3x 2025-04-05 ncurses 6.5 Library calls
++curs_printw 3x 2025-04-19 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                          curs_printw 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                          
++
                                                                                                                                                          curs_printw 3x 2025-04-19 ncurses 6.5 Library calls
                                                                                                                                                          
+ 
                                                                                                                                                          + curs_printw(3x)                  Library calls                 curs_printw(3x)
+ 
+@@ -150,7 +150,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-04-05                   curs_printw(3x)
++ncurses 6.5                       2025-04-19                   curs_printw(3x)
+ 
                                                                                                                                                          
+ 
                                                                                                                                                          
+ 
                                                                                                                                                            
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.5-20250412+/doc/html/man/ncurses.3x.html	2025-04-05 22:57:21.000000000 +0000
++++ ncurses-6.5-20250419/doc/html/man/ncurses.3x.html	2025-04-19 23:33:06.000000000 +0000
+@@ -61,7 +61,7 @@
+        displays  with  output  optimized  to minimize screen updates.  ncurses
+        replaces the curses libraries from System V Release 4 Unix ("SVr4") and
+        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
+-       document describes ncurses version 6.5 (patch 20250405).
++       document describes ncurses version 6.5 (patch 20250419).
+ 
+        ncurses permits control of the terminal screen's contents;  abstraction
+        and  subdivision thereof with windows and pads; acquisition of keyboard
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.5-20250412+/doc/html/man/terminfo.5.html	2025-04-05 22:33:07.000000000 +0000
++++ ncurses-6.5-20250419/doc/html/man/terminfo.5.html	2025-04-19 23:33:06.000000000 +0000
+@@ -71,7 +71,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This document describes ncurses version 6.5 (patch 20250405).
++       This document describes ncurses version 6.5 (patch 20250419).
+ 
+ 
+ 
                                                                                                                                                    terminfo Entry Syntax
                                                                                                                                                    +Index: doc/html/man/user_caps.5.html
+--- ncurses-6.5-20250412+/doc/html/man/user_caps.5.html	2025-04-06 00:21:39.000000000 +0000
++++ ncurses-6.5-20250419/doc/html/man/user_caps.5.html	2025-04-19 23:33:06.000000000 +0000
+@@ -40,7 +40,7 @@
+ 
+ 
+ 
+-
                                                                                                                                                    user_caps 5 2025-03-22 ncurses 6.5 File formats
                                                                                                                                                    
++
                                                                                                                                                    user_caps 5 2025-04-05 ncurses 6.5 File formats
                                                                                                                                                    
+ 
                                                                                                                                                    + user_caps(5)                     File formats                     user_caps(5)
+ 
+@@ -403,7 +403,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-22                      user_caps(5)
++ncurses 6.5                       2025-04-05                      user_caps(5)
+ 
                                                                                                                                                    
+ 
                                                                                                                                                    
+ 
                                                                                                                                                      
+Index: man/curs_add_wch.3x
+Prereq:  1.114 
+--- ncurses-6.5-20250412+/man/curs_add_wch.3x	2025-04-05 21:58:37.000000000 +0000
++++ ncurses-6.5-20250419/man/curs_add_wch.3x	2025-04-19 22:53:52.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_add_wch.3x,v 1.114 2025/04/05 21:58:37 tom Exp $
+-.TH curs_add_wch 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_add_wch.3x,v 1.115 2025/04/19 22:53:52 tom Exp $
++.TH curs_add_wch 3X 2025-04-19 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -191,26 +191,6 @@
+ complex character until another spacing character is written to the
+ window or the cursor is moved.
+ .PP
+-If the cursor is not at the bottom of the scrolling region
+-and advancement occurs at the right margin,
+-the cursor automatically wraps to the beginning of the next line.
+-.PP
+-If the cursor is at the bottom of the scrolling region
+-when advancement occurs at the right margin,
+-and \fB\%scrollok\fP(3X) is enabled for
+-.IR win ,
+-the scrolling region scrolls up one line
+-and the cursor wraps as above.
+-Otherwise,
+-advancement and scrolling do not occur,
+-and
+-.B \%waddch
+-returns
+-.BR ERR "."
+-.\" Does writing to the bottom-right character cell of the screen work
+-.\" when `scrollok()` is disabled and the terminal lacks `ich` and
+-.\" `ich1` capabilities?
+-.PP
+ If
+ .I wch
+ is a
+@@ -234,6 +214,7 @@
+ Tab advances the cursor to the next tab stop
+ (possibly on the next line);
+ these are placed at every eighth column by default.
++.IP
+ Alter the tab interval with the
+ .B \%TABSIZE
+ extension;
+@@ -247,6 +228,53 @@
+ Calling \fB\%win_wch\fP(3X) on the location of a nonprintable character
+ does not return the character itself,
+ but its \fB\%wunctrl\fP(3X) representation.
++.PP
++Adding spacing characters with \fB\%wadd_wch\fP
++causes it to wrap at the right margin of the window:
++.bP
++If the cursor is not at the bottom of the scrolling region
++and advancement occurs at the right margin,
++the cursor automatically wraps to the beginning of the next line.
++.bP
++If the cursor is at the bottom of the scrolling region
++when advancement occurs at the right margin,
++and \fB\%scrollok\fP(3X) is enabled for
++.IR win ,
++the scrolling region scrolls up one line
++and the cursor wraps as above.
++Otherwise,
++advancement and scrolling do not occur,
++and
++.B \%wadd_wch
++returns
++.BR ERR "."
++.PP
++A window's margins may coincide with the screen boundaries.
++This may be a problem when
++.I \%ncurses
++updates the screen to match the curses window.
++When their right and bottom margins coincide,
++.I \%ncurses
++uses different strategies to handle the variations of scrolling and wrapping
++at the lower-right corner
++by depending on the terminal capabilities:
++.bP
++If the terminal does not automatically wrap as characters
++are added at the right margin
++(i.e., auto right margins),
++.I \%ncurses
++writes the character directly.
++.bP
++If the terminal has auto right margins,
++but also has capabilities for turning auto margins off and on,
++.I \%ncurses
++turns the auto margin feature off temporarily
++when writing to the lower-right corner.
++.bP
++If the terminal has an insertion mode which can be turned off and on,
++.I \%ncurses
++writes the character just before the lower-right corner,
++and then inserts a character to push the update into the corner.
+ .SS wecho_wchar
+ .B \%echo_wchar
+ and
+Index: man/curs_addch.3x
+Prereq:  1.135 
+--- ncurses-6.5-20250412+/man/curs_addch.3x	2025-04-05 21:58:37.000000000 +0000
++++ ncurses-6.5-20250419/man/curs_addch.3x	2025-04-19 22:53:46.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addch.3x,v 1.135 2025/04/05 21:58:37 tom Exp $
+-.TH curs_addch 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addch.3x,v 1.136 2025/04/19 22:53:46 tom Exp $
++.TH curs_addch 3X 2025-04-19 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -149,26 +149,6 @@
+ and therefore combines with the window's background character;
+ see \fB\%curs_bkgd\fP(3X).
+ .PP
+-If the cursor is not at the bottom of the scrolling region
+-and advancement occurs at the right margin,
+-the cursor automatically wraps to the beginning of the next line.
+-.PP
+-If the cursor is at the bottom of the scrolling region
+-when advancement occurs at the right margin,
+-and \fB\%scrollok\fP(3X) is enabled for
+-.IR win ,
+-the scrolling region scrolls up one line
+-and the cursor wraps as above.
+-Otherwise,
+-advancement and scrolling do not occur,
+-and
+-.B \%waddch
+-returns
+-.BR ERR "."
+-.\" Does writing to the bottom-right character cell of the screen work
+-.\" when `scrollok()` is disabled and the terminal lacks `ich` and
+-.\" `ich1` capabilities?
+-.PP
+ If
+ .I ch
+ is a
+@@ -192,6 +172,7 @@
+ Tab advances the cursor to the next tab stop
+ (possibly on the next line);
+ these are placed at every eighth column by default.
++.IP
+ Alter the tab interval with the
+ .B \%TABSIZE
+ extension;
+@@ -205,6 +186,53 @@
+ Calling \fB\%winch\fP(3X) on the location of a nonprintable character
+ does not return the character itself,
+ but its \fB\%unctrl\fP(3X) representation.
++.PP
++Adding printable characters with \fB\%waddch\fP
++causes it to wrap at the right margin of the window:
++.bP
++If the cursor is not at the bottom of the scrolling region
++and advancement occurs at the right margin,
++the cursor automatically wraps to the beginning of the next line.
++.bP
++If the cursor is at the bottom of the scrolling region
++when advancement occurs at the right margin,
++and \fB\%scrollok\fP(3X) is enabled for
++.IR win ,
++the scrolling region scrolls up one line
++and the cursor wraps as above.
++Otherwise,
++advancement and scrolling do not occur,
++and
++.B \%waddch
++returns
++.BR ERR "."
++.PP
++A window's margins may coincide with the screen boundaries.
++This may be a problem when
++.I \%ncurses
++updates the screen to match the curses window.
++When their right and bottom margins coincide,
++.I \%ncurses
++uses different strategies to handle the variations of scrolling and wrapping
++at the lower-right corner
++by depending on the terminal capabilities:
++.bP
++If the terminal does not automatically wrap as characters
++are added at the right margin
++(i.e., auto right margins),
++.I \%ncurses
++writes the character directly.
++.bP
++If the terminal has auto right margins,
++but also has capabilities for turning auto margins off and on,
++.I \%ncurses
++turns the auto margin feature off temporarily
++when writing to the lower-right corner.
++.bP
++If the terminal has an insertion mode which can be turned off and on,
++.I \%ncurses
++writes the character just before the lower-right corner,
++and then inserts a character to push the update into the corner.
+ .SS wechochar
+ .B \%echochar
+ and
+Index: man/curs_printw.3x
+Prereq:  1.60 
+--- ncurses-6.5-20250412+/man/curs_printw.3x	2025-04-05 22:20:25.000000000 +0000
++++ ncurses-6.5-20250419/man/curs_printw.3x	2025-04-19 23:28:38.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_printw.3x,v 1.60 2025/04/05 22:20:25 tom Exp $
+-.TH curs_printw 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_printw.3x,v 1.61 2025/04/19 23:28:38 tom Exp $
++.TH curs_printw 3X 2025-04-19 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -209,6 +209,19 @@
+ .\" GBR can't find a source to cite for this paraphrase,
+ .\" even after checking
+ .\" .
++.\"
++.\" The indicated paraphrase is from page 432:
++.\" Unix System V Programmer's Reference Manual
++.\" Prentice-Hall
++.\" ISBN 0-13-940479-1
++.\" (bitsavers has 3rd printing from 1987)
++.\"
++.\" This lists mvprintw without detail, and printw as "printf on stdscr":
++.\" Unix Programmer's Manual
++.\" System Calls and Library Routines
++.\" CBS College Publishing's UNIX System Library
++.\" Holt, Rinehard and Winston, 1986
++.\" ISBN 0-03-009314-7
+ .PP
+ SVr3 added
+ .IR \%vwprintw ","
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250412+/package/debian-mingw/changelog	2025-04-12 10:27:36.000000000 +0000
++++ ncurses-6.5-20250419/package/debian-mingw/changelog	2025-04-19 10:37:06.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250412) unstable; urgency=low
++ncurses6td (6.5+20250419) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 12 Apr 2025 06:27:36 -0400
++ -- Thomas E. Dickey   Sat, 19 Apr 2025 06:37:06 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250412+/package/debian-mingw64/changelog	2025-04-12 10:27:36.000000000 +0000
++++ ncurses-6.5-20250419/package/debian-mingw64/changelog	2025-04-19 10:37:06.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250412) unstable; urgency=low
++ncurses6td (6.5+20250419) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 12 Apr 2025 06:27:36 -0400
++ -- Thomas E. Dickey   Sat, 19 Apr 2025 06:37:06 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250412+/package/debian/changelog	2025-04-12 10:27:36.000000000 +0000
++++ ncurses-6.5-20250419/package/debian/changelog	2025-04-19 10:37:06.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250412) unstable; urgency=low
++ncurses6td (6.5+20250419) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 12 Apr 2025 06:27:36 -0400
++ -- Thomas E. Dickey   Sat, 19 Apr 2025 06:37:06 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.698 
+--- ncurses-6.5-20250412+/package/mingw-ncurses.nsi	2025-04-12 10:27:36.000000000 +0000
++++ ncurses-6.5-20250419/package/mingw-ncurses.nsi	2025-04-19 10:37:06.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.698 2025/04/12 10:27:36 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.699 2025/04/19 10:37:06 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0412"
++!define VERSION_MMDD  "0419"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250412+/package/mingw-ncurses.spec	2025-04-12 10:27:36.000000000 +0000
++++ ncurses-6.5-20250419/package/mingw-ncurses.spec	2025-04-19 10:37:06.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250412
++Release: 20250419
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20250412+/package/ncurses.spec	2025-04-12 10:27:36.000000000 +0000
++++ ncurses-6.5-20250419/package/ncurses.spec	2025-04-19 10:37:06.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250412
++Release: 20250419
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20250412+/package/ncursest.spec	2025-04-12 10:27:36.000000000 +0000
++++ ncurses-6.5-20250419/package/ncursest.spec	2025-04-19 10:37:06.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250412
++Release: 20250419
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250426.patch b/packages/ncurses/6.5/ncurses-6.5-20250426.patch
new file mode 100644
index 0000000000..932afe304c
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250426.patch
@@ -0,0 +1,721 @@
+# ncurses 6.5 - patch 20250426 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250426.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Apr 27 00:01:37 UTC 2025
+# ------------------------------------------------------------------------------
+# NEWS                             |    7 +
+# VERSION                          |    2 
+# dist.mk                          |    4 -
+# doc/html/man/curs_addch.3x.html  |  133 ++++++++++++++++++++++++-------------
+# doc/html/man/ncurses.3x.html     |    2 
+# doc/html/man/terminfo.5.html     |    2 
+# man/curs_addch.3x                |   66 +++++++++++++++++-
+# misc/terminfo.src                |   98 +++++++++++++++++++--------
+# 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, 241 insertions(+), 95 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4275 
+--- ncurses-6.5-20250419+/NEWS	2025-04-19 23:31:31.000000000 +0000
++++ ncurses-6.5-20250426/NEWS	2025-04-26 20:14:16.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4275 2025/04/19 23:31:31 tom Exp $
++-- $Id: NEWS,v 1.4277 2025/04/26 20:14:16 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.
+ 
++20250426
++	+ expand note on extensions in curs_addch.3x
++	+ add illumos, sun-16color, sun-256color, sun-direct -TD
++	+ add wyse+cvis -TD
++
+ 20250419
+ 	+ add note on scrolling and lower-right corner to waddch and wadd_wch
+ 	  manual pages.
+Index: VERSION
+--- ncurses-6.5-20250419+/VERSION	2025-04-19 10:37:06.000000000 +0000
++++ ncurses-6.5-20250426/VERSION	2025-04-26 10:13:45.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250419
++5:0:10	6.5	20250426
+Index: dist.mk
+Prereq:  1.1665 
+--- ncurses-6.5-20250419+/dist.mk	2025-04-19 10:37:06.000000000 +0000
++++ ncurses-6.5-20250426/dist.mk	2025-04-26 10:13:45.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1665 2025/04/19 10:37:06 tom Exp $
++# $Id: dist.mk,v 1.1666 2025/04/26 10:13:45 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 = 5
+-NCURSES_PATCH = 20250419
++NCURSES_PATCH = 20250426
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/curs_addch.3x.html
+--- ncurses-6.5-20250419+/doc/html/man/curs_addch.3x.html	2025-04-19 23:33:03.000000000 +0000
++++ ncurses-6.5-20250426/doc/html/man/curs_addch.3x.html	2025-04-26 20:32:39.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addch.3x,v 1.136 2025/04/19 22:53:46 tom Exp @
++  * @Id: curs_addch.3x,v 1.137 2025/04/26 19:57:22 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addch 3x 2025-04-19 ncurses 6.5 Library calls
++curs_addch 3x 2025-04-26 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                      curs_addch 3x 2025-04-19 ncurses 6.5 Library calls
                                                                                                                                                      
++
                                                                                                                                                      curs_addch 3x 2025-04-26 ncurses 6.5 Library calls
                                                                                                                                                      
+ 
                                                                                                                                                      + curs_addch(3x)                   Library calls                  curs_addch(3x)
+ 
+@@ -276,8 +276,51 @@
+        and  are  not  standard.   However,  many  publicly  available terminfo
+        entries include  acs_chars  (acsc)  capabilities  in  which  their  key
+        characters  (pryz{|})  are  embedded,  and  a second-hand list of their
+-       character descriptions has  come  to  light.   The  ncurses  developers
+-       invented ACS-prefixed names for them.
++       character descriptions has come to  light,  which  identifies  them  as
++       VT100 special characters.
++
++       The DEC Special Character and Line Drawing Set (VT100) is indexed by an
++       ASCII character in the range 96 (`) to 126 (~).  That  index  character
++       is  part  of  the  definition  for  the curses ACS_ symbols.  The VT100
++       special characters can be categorized in three groups:
++
++       o   useful graphic symbols with a  standard  ACS_  symbol,  (e.g.,  the
++           line-drawing symbols),
++
++       o   possibly useful characters (these non-standard symbols),
++
++       o   representations  of  control characters (e.g., newline and vertical
++           tabulation).
++
++       A few ACS_ symbols do not  fit  into  DEC's  VT100  scheme.   The  AT&T
++       Teletype  5410v1  arrow  symbols  and ACS_BLOCK use indices outside the
++       range 96 to 126.  Two of the  Teletype  symbols  use  indices  in  that
++       range, with different meaning versus the VT100:
++
++       o   ACS_BOARD corresponds to the VT100 symbol for newline
++
++       o   ACS_LANTERN corresponds to the VT100 symbol for vertical tabulation
++
++       AT&T defined ACS_ names for the most useful graphic symbols, as well as
++       for its own.  Its header file commented:
++
++       /*
++        * Standard alternate character set.  The current ACS world is evolving,
++        * so we support only a widely available subset: the line drawing characters
++        * from the VT100, plus a few from the Teletype 5410v1.  Eventually there
++        * may be support of more sophisticated ACS line drawing, such as that
++        * in the Teletype 5410, the HP line drawing set, and the like.  There may
++        * be support for some non line oriented characters as well.
++        *
++        * Line drawing ACS names are of the form ACS_trbl, where t is the top, r
++        * is the right, b is the bottom, and l is the left.  t, r, b, and l might
++        * be B (blank), S (single), D (double), or T (thick).  The subset defined
++        * here only uses B and S.
++        */
++
++       Although these less-useful graphic symbols were not given  names,  they
++       were  used  in  terminfo entries.  The ncurses developers invented ACS-
++       prefixed names for them.
+ 
+ 
+ 
                                                                                                                                                      PORTABILITY
                                                                                                                                                      +@@ -287,79 +330,79 @@
+        X/Open Curses Issue 4 describes these functions.  It specifies no error
+        conditions for them.
+ 
+-       SVr4  describes  a  successful  return  value only as "an integer value
++       SVr4 describes a successful return value  only  as  "an  integer  value
+        other than ERR".
+ 
+-       The defaults specified for forms-drawing characters apply in the  POSIX
++       The  defaults specified for forms-drawing characters apply in the POSIX
+        locale.
+ 
+ 
+ 
                                                                                                                                                      ACS Symbols
                                                                                                                                                      +-       X/Open  Curses  states  that  the  ACS_ definitions are char constants.
++       X/Open Curses states that the  ACS_  definitions  are  char  constants.
+        Some implementations are problematic.
+ 
+-       o   Solaris curses, for example, defines the ACS symbols as  constants;
++       o   Solaris  curses, for example, defines the ACS symbols as constants;
+            others define them as elements of an array.
+ 
+-           SVr4  used  an array, acs_map, as does ncurses.  NetBSD curses also
+-           uses an array, actually  named  _acs_char,  with  a  "#define"  for
++           SVr4 used an array, acs_map, as does ncurses.  NetBSD  curses  also
++           uses  an  array,  actually  named  _acs_char,  with a "#define" for
+            compatibility.
+ 
+-       o   HP-UX  curses  equates  some  of  the ACS_ symbols to the analogous
+-           WACS_ symbols as if the ACS_  symbols  were  wide  characters  (see
+-           curs_add_wch(3x)).   The  misdefined  symbols  are  the  arrows and
++       o   HP-UX curses equates some of the  ACS_  symbols  to  the  analogous
++           WACS_  symbols  as  if  the  ACS_ symbols were wide characters (see
++           curs_add_wch(3x)).  The  misdefined  symbols  are  the  arrows  and
+            others that are not used for line drawing.
+ 
+-       o   X/Open Curses (Issues 2 through 7) has a  typographical  error  for
+-           the  ACS_LANTERN  symbol,  equating  its  "VT100+ Character" to "I"
+-           (capital I), while the header  files  for  SVr4  curses  and  other
++       o   X/Open  Curses  (Issues 2  through 7) has a typographical error for
++           the ACS_LANTERN symbol, equating  its  "VT100+  Character"  to  "I"
++           (capital  I),  while  the  header  files  for SVr4 curses and other
+            implementations use "i" (small i).
+ 
+-           None  of  the terminal descriptions on Unix platforms use uppercase
+-           I, except  for  Solaris  (in  its  terminfo  entry  for  screen(1),
+-           apparently  based on the X/Open documentation around 1995).  On the
+-           other hand, its gs6300 (AT&T PC6300 with EMOTS  Terminal  Emulator)
++           None of the terminal descriptions on Unix platforms  use  uppercase
++           I,  except  for  Solaris  (in  its  terminfo  entry  for screen(1),
++           apparently based on the X/Open documentation around 1995).  On  the
++           other  hand,  its gs6300 (AT&T PC6300 with EMOTS Terminal Emulator)
+            description uses lowercase i.
+ 
+        The displayed values of ACS_ constants depend on
+ 
+-       o   the  ncurses  ABI  --  for example, wide-character versus non-wide-
+-           character configurations  (the  former  is  capable  of  displaying
++       o   the ncurses ABI -- for  example,  wide-character  versus  non-wide-
++           character  configurations  (the  former  is  capable  of displaying
+            Unicode while the latter is not), and
+ 
+        o   whether the locale uses UTF-8 encoding.
+ 
+-       In  certain  cases,  the  terminal  is  unable to display forms-drawing
+-       characters  except  by  using  UTF-8;  see  the   discussion   of   the
++       In certain cases, the  terminal  is  unable  to  display  forms-drawing
++       characters   except   by   using  UTF-8;  see  the  discussion  of  the
+        NCURSES_NO_UTF8_ACS environment variable in ncurses(3x).
+ 
+ 
+ 
                                                                                                                                                      Character Set
                                                                                                                                                      +-       X/Open  Curses  assumes  that the parameter passed to waddch contains a
+-       single character.  That character may have been more  than  eight  bits
+-       wide  in  an  SVr3 or SVr4 implementation, but X/Open Curses leaves the
+-       width of a non-wide character code unspecified.  The  standard  further
+-       does  not specify the internal structure of a chtype, though the use of
+-       bit operations to combine the character  code  with  attributes  and  a
++       X/Open Curses assumes that the parameter passed to  waddch  contains  a
++       single  character.   That  character may have been more than eight bits
++       wide in an SVr3 or SVr4 implementation, but X/Open  Curses  leaves  the
++       width  of  a non-wide character code unspecified.  The standard further
++       does not specify the internal structure of a chtype, though the use  of
++       bit  operations  to  combine  the  character code with attributes and a
+        color pair identifier into a chtype for passage to waddch is common.  A
+        portable application uses only the macros discussed in curs_attr(3x) to
+        manipulate a chtype.
+ 
+        In ncurses, chtype holds an eight-bit character, but the library allows
+-       a multibyte character sequence to be passed via a succession  of  calls
+-       to  waddch.   Other  implementations  do  not;  a waddch call transmits
+-       exactly one character, which may be rendered  in  one  or  more  screen
+-       locations  depending  on  whether  it  is  printable  (see unctrl(3x)).
+-       Depending on the locale, ncurses  inspects  the  byte  passed  in  each
+-       waddch  call  and  checks whether the latest call continues a multibyte
+-       character.   When  a  character  is  complete,  ncurses  displays   the
+-       character   and  advances  the  cursor.   If  the  calling  application
++       a  multibyte  character sequence to be passed via a succession of calls
++       to waddch.  Other implementations  do  not;  a  waddch  call  transmits
++       exactly  one  character,  which  may  be rendered in one or more screen
++       locations depending  on  whether  it  is  printable  (see  unctrl(3x)).
++       Depending  on  the  locale,  ncurses  inspects  the byte passed in each
++       waddch call and checks whether the latest call  continues  a  multibyte
++       character.    When  a  character  is  complete,  ncurses  displays  the
++       character  and  advances  the  cursor.   If  the  calling   application
+        interrupts the succession of bytes in a multibyte character sequence by
+        changing the current location -- for example, with wmove(3x) -- ncurses
+        discards the incomplete character.
+ 
+        For  portability  to  other  implementations,  do  not  rely  upon  the
+-       foregoing  behavior.  Check whether a character can be represented as a
++       foregoing behavior.  Check whether a character can be represented as  a
+        single byte in the current locale.
+ 
+        o   If it can, call either waddch or wadd_wch.
+@@ -370,24 +413,24 @@
+ 
                                                                                                                                                      HISTORY
                                                                                                                                                      +        4BSD (1980) introduced waddch and its variants.
+ 
+-       SVr3 (1987) added the echochar and wechochar functions and most of  the
+-       ACS_  constants, except for ACS_GEQUAL, ACS_LEQUAL, ACS_NEQUAL, ACS_PI,
++       SVr3  (1987) added the echochar and wechochar functions and most of the
++       ACS_ constants, except for ACS_GEQUAL, ACS_LEQUAL, ACS_NEQUAL,  ACS_PI,
+        ACS_S3, ACS_S7, and ACS_STERLING.
+ 
+        ncurses 1.9.6 (1995) furnished the remaining ACS_ constants.
+ 
+ 
+ 
                                                                                                                                                      SEE ALSO
                                                                                                                                                      +-       curs_add_wch(3x) describes comparable functions of the ncurses  library
++       curs_add_wch(3x)  describes comparable functions of the ncurses library
+        in its wide-character configuration (ncursesw).
+ 
+        curses(3x),    curs_addchstr(3x),    curs_addstr(3x),    curs_attr(3x),
+-       curs_bkgd(3x),   curs_clear(3x),    curs_inch(3x),    curs_outopts(3x),
++       curs_bkgd(3x),    curs_clear(3x),    curs_inch(3x),   curs_outopts(3x),
+        curs_refresh(3x), curs_variables(3x), putchar(3)
+ 
+ 
+ 
+-ncurses 6.5                       2025-04-19                    curs_addch(3x)
++ncurses 6.5                       2025-04-26                    curs_addch(3x)
+ 
                                                                                                                                                      
+ 
                                                                                                                                                      
+ 
                                                                                                                                                        
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.5-20250419+/doc/html/man/ncurses.3x.html	2025-04-19 23:33:06.000000000 +0000
++++ ncurses-6.5-20250426/doc/html/man/ncurses.3x.html	2025-04-26 20:32:44.000000000 +0000
+@@ -61,7 +61,7 @@
+        displays  with  output  optimized  to minimize screen updates.  ncurses
+        replaces the curses libraries from System V Release 4 Unix ("SVr4") and
+        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
+-       document describes ncurses version 6.5 (patch 20250419).
++       document describes ncurses version 6.5 (patch 20250426).
+ 
+        ncurses permits control of the terminal screen's contents;  abstraction
+        and  subdivision thereof with windows and pads; acquisition of keyboard
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.5-20250419+/doc/html/man/terminfo.5.html	2025-04-19 23:33:06.000000000 +0000
++++ ncurses-6.5-20250426/doc/html/man/terminfo.5.html	2025-04-26 20:32:44.000000000 +0000
+@@ -71,7 +71,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This document describes ncurses version 6.5 (patch 20250419).
++       This document describes ncurses version 6.5 (patch 20250426).
+ 
+ 
+ 
                                                                                                                                                    terminfo Entry Syntax
                                                                                                                                                    +Index: man/curs_addch.3x
+Prereq:  1.136 
+--- ncurses-6.5-20250419+/man/curs_addch.3x	2025-04-19 22:53:46.000000000 +0000
++++ ncurses-6.5-20250426/man/curs_addch.3x	2025-04-26 19:57:22.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addch.3x,v 1.136 2025/04/19 22:53:46 tom Exp $
+-.TH curs_addch 3X 2025-04-19 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addch.3x,v 1.137 2025/04/26 19:57:22 tom Exp $
++.TH curs_addch 3X 2025-04-26 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -403,8 +403,66 @@
+ capabilities in which their key characters
+ .RB ( pryz{|} )
+ are embedded,
+-and a second-hand list of their character descriptions has come to
+-light.
++and a second-hand list of their character descriptions has come to light,
++which identifies them as VT100 special characters.
++.PP
++The DEC Special Character and Line Drawing Set (VT100) is indexed by
++an ASCII character in the range 96 (`) to 126 (~).
++That index character is part of the definition for the curses
++.B \%ACS_
++symbols.
++The VT100 special characters can be categorized in three groups:
++.bP
++useful graphic symbols with a standard
++.B \%ACS_
++symbol,
++(e.g., the line-drawing symbols),
++.bP
++possibly useful characters (these non-standard symbols),
++.bP
++representations of control characters (e.g., newline and vertical tabulation).
++.PP
++A few
++.B \%ACS_
++symbols do not fit into DEC's VT100 scheme.
++The AT&T Teletype 5410v1 arrow symbols and
++.B \%ACS_BLOCK
++use indices outside the range 96 to 126.
++Two of the Teletype symbols use indices in that range,
++with different meaning versus the VT100:
++.bP
++.B \%ACS_BOARD
++corresponds to the VT100 symbol for newline
++.bP
++.B \%ACS_LANTERN
++corresponds to the VT100 symbol for vertical tabulation
++.PP
++AT&T defined
++.B \%ACS_
++names for the most useful graphic symbols,
++as well as for its own.
++Its header file commented:
++.sp
++.EX
++/*
++ * Standard alternate character set.  The current ACS world is evolving,
++ * so we support only a widely available subset: the line drawing characters
++ * from the VT100, plus a few from the Teletype 5410v1.  Eventually there
++ * may be support of more sophisticated ACS line drawing, such as that
++ * in the Teletype 5410, the HP line drawing set, and the like.  There may
++ * be support for some non line oriented characters as well.
++ *
++ * Line drawing ACS names are of the form ACS_trbl, where t is the top, r
++ * is the right, b is the bottom, and l is the left.  t, r, b, and l might
++ * be B (blank), S (single), D (double), or T (thick).  The subset defined
++ * here only uses B and S.
++ */
++.EE
++.PP
++Although these less-useful graphic symbols were not given names,
++they were used in
++.I \%terminfo
++entries.
+ The
+ .I \%ncurses
+ developers invented ACS-prefixed names for them.
+Index: misc/terminfo.src
+--- ncurses-6.5-20250419+/misc/terminfo.src	2025-04-12 21:05:39.000000000 +0000
++++ ncurses-6.5-20250426/misc/terminfo.src	2025-04-26 20:10:42.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.1184 $
+-#	$Date: 2025/04/12 21:05:39 $
++#	$Revision: 1.1186 $
++#	$Date: 2025/04/26 20:10:42 $
+ #
+ # 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
+@@ -1152,19 +1152,18 @@
+ kon|kon2|Kanji ON Linux console,
+ 	am, bce, ccc, eo, mir, msgr, xenl, xon,
+ 	it#8, ncv#18,
+-	bel=^G, civis=\E[?25l, cnorm=\E[?25h, cr=\r, cub1=^H,
+-	cud1=\n, dim=\E[2m, dsl=\E[?H\E[?E, el1=\E[1K, fsl=\E[?F,
+-	ht=^I, hts=\EH, ind=\n,
++	bel=^G, cr=\r, cub1=^H, cud1=\n, dim=\E[2m, dsl=\E[?H\E[?E,
++	el1=\E[1K, fsl=\E[?F, ht=^I, hts=\EH, ind=\n,
+ 	initc=\E]P%p1%x%p2%02x%p3%02x%p4%02x, kb2=\E[G, kbs=^?,
+ 	khome=\E[1~, kspd=^Z, nel=\r\n, ri=\EM, rmso=\E[27m,
+ 	rmul=\E[24m, rs1=\Ec,
+ 	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
+ 	    %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
+ 	sgr0=\E[0;10m, tbc=\E[3g, tsl=\E[?T, u8=\E[?6c,
+-	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
+-	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+-	use=ansi+local, use=ansi+sgrbold, use=ansi+rca2,
+-	use=dec+sl, use=ecma+sgr, use=klone+color,
++	use=vt220+cvis, use=ansi+arrows, use=ansi+csr,
++	use=ansi+cup, use=ansi+enq, use=ansi+erase, use=ansi+idc,
++	use=ansi+idl, use=ansi+local, use=ansi+sgrbold,
++	use=ansi+rca2, use=dec+sl, use=ecma+sgr, use=klone+color,
+ 	use=linux+lockeys, use=linux+sfkeys, use=vt220+ufkeys,
+ 	use=vt220+pcedit,
+ 
+@@ -8658,8 +8657,7 @@
+ 	ncv@, U8#1,
+ 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
+ 	     yzz{{||}}~~,
+-	blink=\E[5m, bold=\E[1m, civis=\E[?25l,
+-	cnorm=\E[34h\E[?25h, cub1=^H, cud1=\n,
++	blink=\E[5m, bold=\E[1m, cub1=^H, cud1=\n,
+ 	cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, cvvis=\E[34l,
+ 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, el1=\E[1K, flash=\Eg,
+ 	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, indn=\E[%p1%dS, is2=\E)0,
+@@ -8674,7 +8672,7 @@
+ 	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+ 	use=ecma+color, use=vt100+pf1-pf4, use=vt220+pcedit,
+ 	use=xterm+alt1049, use=xterm+kbs, use=vt100+enq,
+-	use=vt100+4bsd, use=xterm+r5+fkeys,
++	use=vt100+4bsd, use=xterm+r5+fkeys, use=wyse+cvis,
+ 
+ screen|VT 100/ANSI X3.64 virtual terminal,
+ 	use=screen4,
+@@ -9323,6 +9321,42 @@
+ 	sgr=\E[0%?%p6%t;1%;%?%p1%p3%|%t;7%;m, use=ansi+local,
+ 	use=sun, use=klone+color,
+ 
++# These date from March 2017:
++# https://www.illumos.org/issues/10360 terminfo: sun-color has 256 colors
++# https://www.illumos.org/issues/10359 terminfo: add underline for sun-color
++#
++# https://www.illumos.org/issues/14919 tem: implement xenl
++# https://illumos.topicbox.com/groups/developer/T58d08b48578a674d-M491357a8bb9a7d39b114097f
++#
++# The developer chose to modify the existing "sun-color" (changing the number
++# of colors and color-pairs without adjusting setaf and setab) rather than
++# following the advice given in review to add a new terminal description.  As a
++# result, some ncurses applications will render color incorrectly, while a few
++# hard-coded applications may work as intended.
++#
++# These variants are based on reading the source code.
++# https://github.com/tsoome/illumos-gate/blob/loader/usr/src/boot/sys/boot/common/tem.c
++illumos|Illumos framebuffer console,
++	xenl,
++	blink=\E[5m, dim=\E[2m, rmam=\E[?7l, rmso=\E[27m,
++	rmul=\E[24m,
++	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?
++	    %p4%t;5%;m,
++	sgr0=\E[0m, smam=\E[?7h, smul=\E[4m, use=ecma+index,
++	use=ansi+tabs, use=ansi+rca, use=vt220+cvis,
++	use=sun-color, use=ansi+apparrows,
++#
++# Referring to these as "sun-" is misleading, but close to the intent of the
++# developer -TD
++sun-16color|Illumos framebuffer console with 16 colors,
++	use=ibm+16color, use=illumos,
++
++sun-256color|Illumos framebuffer console with 256 colors,
++	use=xterm+256setaf, use=illumos,
++
++sun-direct|Illumos framebuffer console with direct-color,
++	use=xterm+indirect, use=illumos,
++
+ #### Iris consoles
+ #
+ 
+@@ -13038,10 +13072,9 @@
+ 	am, km, mir, msgr, xenl,
+ 	cols#80, it#8, lines#25, vt#3,
+ 	acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx{{||}}~~,
+-	bel=^G, cbt=\E[Z, civis=\E[?25l, clear=\E[H\E[J$<200>,
+-	cnorm=\E[34h\E[?25h, cr=\r, cub=\E[%p1%dD$<1>,
+-	cub1=\010$<1>, cud=\E[%p1%dB, cud1=\ED,
+-	cuf=\E[%p1%dC$<1>, cuf1=\E[C$<1>,
++	bel=^G, cbt=\E[Z, clear=\E[H\E[J$<200>, cr=\r,
++	cub=\E[%p1%dD$<1>, cub1=\010$<1>, cud=\E[%p1%dB,
++	cud1=\ED, cuf=\E[%p1%dC$<1>, cuf1=\E[C$<1>,
+ 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EM,
+ 	cvvis=\E[34l\E[?25h, dim=\E[2m, ech=\E[%p1%dX,
+ 	ed=\E[J$<8*>, el=\E[K$<1>, el1=\E[1K$<1>, enacs=\E)0,
+@@ -13063,7 +13096,12 @@
+ 	sgr0=\E[m\017\E["q, smacs=^N, smam=\E[?7h, smir=\E[4h,
+ 	smkx=\E[?1h, vpa=\E[%i%p1%dd, use=ansi+csr, use=ansi+idl,
+ 	use=ansi+pp, use=ansi+sgrbold, use=vt100+pf1-pf4,
+-	use=vt220+ufkeys,
++	use=vt220+ufkeys, use=wyse+cvis,
++
++# http://www.bitsavers.org/pdf/wyse/WY-99/880411-02A_WY-99GT_User_Manual_198703.pdf
++# "CSI 34 h" is WYULCURM, "Block cursor on" vs "Underline cursor on"
++wyse+cvis|Wyse cursor-mode,
++	civis=\E[?25l, cnorm=\E[34h\E[?25h,
+ 
+ #   This is the american terminal. Here tabs work fine.
+ # From: Francesco Potorti` , 24 Aug 1998
+@@ -13374,8 +13412,7 @@
+ wy185|wyse185|Wyse 185,
+ 	hs, km, mir, xenl, xon,
+ 	wsl#80,
+-	civis=\E[?25l, clear=\E[H\E[J$<40>,
+-	cnorm=\E[34h\E[?25h, csr=\E[%i%p1%d;%p2%dr$<20>,
++	clear=\E[H\E[J$<40>, csr=\E[%i%p1%d;%p2%dr$<20>,
+ 	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
+ 	cvvis=\E[?25h\E[34l, dch=\E[%p1%dP$<3>, dch1=\E[P$<3>,
+ 	dim=\E[2m, dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>,
+@@ -13398,7 +13435,7 @@
+ 	use=ansi+arrows, use=ansi+inittabs, use=ansi+local,
+ 	use=ansi+pp, use=ansi+sgrbold, use=decid+cpr,
+ 	use=vt100+4bsd, use=vt220+vtedit, use=vt220+keypad,
+-	use=vt220+sfkeys, use=vt220+ufkeys,
++	use=vt220+sfkeys, use=vt220+ufkeys, use=wyse+cvis,
+ #
+ #	Wyse 185 with 24 data lines and top status (terminal status)
+ wy185-24|wyse185-24|Wyse 185 with 24 data lines,
+@@ -13546,8 +13583,7 @@
+ 	am, ccc, hs, mir, msgr, xenl, xon,
+ 	colors#64, cols#80, lines#24, ncv#48, pairs#64, wsl#80,
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+-	bel=^G, civis=\E[?25l, clear=\E[H\E[J$<40>,
+-	cnorm=\E[34h\E[?25h, cr=\r, cub1=^H, cud1=\n,
++	bel=^G, clear=\E[H\E[J$<40>, cr=\r, cub1=^H, cud1=\n,
+ 	cup=\E[%i%p1%d;%p2%dH$<1>, cvvis=\E[?25h\E[34l,
+ 	dch=\E[%p1%dP$<1*>, dch1=\E[P$<1>, dclk=\E[31h,
+ 	dim=\E[2m, dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>, dsl=\E[40l,
+@@ -13580,7 +13616,7 @@
+ 	u1=\E[?38l\E)0, u2=\E[92;52"p, u3=\E~B, u4=\E[92;76"p,
+ 	u5=\E%!1\E[90;1"p, vpa=\E[%i%p1%dd, use=ansi+csr,
+ 	use=ansi+inittabs, use=ansi+local, use=ansi+pp,
+-	use=ansi+sgrbold, use=decid+cpr,
++	use=ansi+sgrbold, use=decid+cpr, use=wyse+cvis,
+ #
+ #	Function key set for the ASCII (wy-50 compatible) keyboard
+ #	This is the default 370.
+@@ -13700,11 +13736,11 @@
+ 	am, hs, km, mir, xenl, xon,
+ 	cols#80, it#8, lines#24, wsl#80,
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+-	bel=^G, civis=\E[?25l, clear=\E[H\E[J$<40>,
+-	cnorm=\E[34h\E[?25h, cr=\r, csr=\E[%i%p1%d;%p2%dr$<20>,
+-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
+-	cvvis=\E[?25h\E[34l, dch=\E[%p1%dP$<3>, dch1=\E[P$<30>,
+-	dim=\E[2m, dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>, dsl=\E[0$~,
++	bel=^G, clear=\E[H\E[J$<40>, cr=\r,
++	csr=\E[%i%p1%d;%p2%dr$<20>, cub1=^H, cud1=\n,
++	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[?25h\E[34l,
++	dch=\E[%p1%dP$<3>, dch1=\E[P$<30>, dim=\E[2m,
++	dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>, dsl=\E[0$~,
+ 	ech=\E[%p1%dX, ed=\E[J$<40>, el=\E[K, el1=\E[1K,
+ 	enacs=\E)0, fsl=\E[0$}, home=\E[H, hpa=\E[%i%p1%d`,
+ 	ich=\E[%p1%d@$<2>, il=\E[%p1%dL$<3*>, il1=\E[L$<3>,
+@@ -13724,7 +13760,7 @@
+ 	use=ansi+arrows, use=ansi+csr, use=ansi+local,
+ 	use=ansi+pp, use=ansi+sgrbold, use=ansi+tabs,
+ 	use=decid+cpr, use=vt220+vtedit, use=vt220+keypad,
+-	use=vt220+sfkeys, use=vt220+ufkeys,
++	use=vt220+sfkeys, use=vt220+ufkeys, use=wyse+cvis,
+ #
+ #       Wyse 520 with 24 data lines and status (terminal status)
+ wy520-24|wyse520-24|Wyse 520 with 24 data lines,
+@@ -27913,4 +27949,8 @@
+ #	+ add kf1 to kf5 to sclp (report by Werner Fink)
+ #	+ add vt100+pf1-pf4 -TD
+ #
++# 2025-04-26
++#	+ add illumos, sun-16color, sun-256color, sun-direct -TD
++#	+ add wyse+cvis -TD
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250419+/package/debian-mingw/changelog	2025-04-19 10:37:06.000000000 +0000
++++ ncurses-6.5-20250426/package/debian-mingw/changelog	2025-04-26 10:13:45.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250419) unstable; urgency=low
++ncurses6td (6.5+20250426) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 19 Apr 2025 06:37:06 -0400
++ -- Thomas E. Dickey   Sat, 26 Apr 2025 06:13:45 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250419+/package/debian-mingw64/changelog	2025-04-19 10:37:06.000000000 +0000
++++ ncurses-6.5-20250426/package/debian-mingw64/changelog	2025-04-26 10:13:45.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250419) unstable; urgency=low
++ncurses6td (6.5+20250426) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 19 Apr 2025 06:37:06 -0400
++ -- Thomas E. Dickey   Sat, 26 Apr 2025 06:13:45 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250419+/package/debian/changelog	2025-04-19 10:37:06.000000000 +0000
++++ ncurses-6.5-20250426/package/debian/changelog	2025-04-26 10:13:45.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250419) unstable; urgency=low
++ncurses6td (6.5+20250426) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 19 Apr 2025 06:37:06 -0400
++ -- Thomas E. Dickey   Sat, 26 Apr 2025 06:13:45 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.699 
+--- ncurses-6.5-20250419+/package/mingw-ncurses.nsi	2025-04-19 10:37:06.000000000 +0000
++++ ncurses-6.5-20250426/package/mingw-ncurses.nsi	2025-04-26 10:13:45.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.699 2025/04/19 10:37:06 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.700 2025/04/26 10:13:45 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0419"
++!define VERSION_MMDD  "0426"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250419+/package/mingw-ncurses.spec	2025-04-19 10:37:06.000000000 +0000
++++ ncurses-6.5-20250426/package/mingw-ncurses.spec	2025-04-26 10:13:45.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250419
++Release: 20250426
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20250419+/package/ncurses.spec	2025-04-19 10:37:06.000000000 +0000
++++ ncurses-6.5-20250426/package/ncurses.spec	2025-04-26 10:13:45.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250419
++Release: 20250426
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20250419+/package/ncursest.spec	2025-04-19 10:37:06.000000000 +0000
++++ ncurses-6.5-20250426/package/ncursest.spec	2025-04-26 10:13:45.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250419
++Release: 20250426
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250503.patch b/packages/ncurses/6.5/ncurses-6.5-20250503.patch
new file mode 100644
index 0000000000..d271e42eab
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250503.patch
@@ -0,0 +1,5061 @@
+# ncurses 6.5 - patch 20250503 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250503.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sat May  3 22:44:24 UTC 2025
+# ------------------------------------------------------------------------------
+# NEWS                             |   15 
+# VERSION                          |    2 
+# dist.mk                          |    4 
+# misc/terminfo.src                | 2674 ++++++++++++++++++-------------------
+# 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 
+# 11 files changed, 1358 insertions(+), 1359 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4277 
+--- ncurses-6.5-20250426+/NEWS	2025-04-26 20:14:16.000000000 +0000
++++ ncurses-6.5-20250503/NEWS	2025-05-03 22:02:34.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4277 2025/04/26 20:14:16 tom Exp $
++-- $Id: NEWS,v 1.4279 2025/05/03 22:02:34 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,19 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20250503
++	+ update/correct some of the rv/xr strings, checked with tack -TD
++	+ use ansi+rca in sclp -TD
++	+ use vt220+pcedit in sclp (Werner Fink)
++	+ move some building blocks from illumos to sun-color, based on
++	  illumos source-history -TD
++	+ improve use-clauses: ansi+cup, ansi+idl1, ansi+rca, ansi+rca2,
++	  ansi+sgrso, ansi+sgrul -TD
++	+ add ecma+standout, ecma+underline -TD
++	+ add rv code for alacritty -TD
++	+ add rv/xr codes for contour, ghostty, iterm2, kitty, konsole,
++	  vscode, vte, wezterm -TD
++
+ 20250426
+ 	+ expand note on extensions in curs_addch.3x
+ 	+ add illumos, sun-16color, sun-256color, sun-direct -TD
+Index: VERSION
+--- ncurses-6.5-20250426+/VERSION	2025-04-26 10:13:45.000000000 +0000
++++ ncurses-6.5-20250503/VERSION	2025-05-03 09:39:03.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250426
++5:0:10	6.5	20250503
+Index: dist.mk
+Prereq:  1.1666 
+--- ncurses-6.5-20250426+/dist.mk	2025-04-26 10:13:45.000000000 +0000
++++ ncurses-6.5-20250503/dist.mk	2025-05-03 09:39:03.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1666 2025/04/26 10:13:45 tom Exp $
++# $Id: dist.mk,v 1.1667 2025/05/03 09:39:03 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 = 5
+-NCURSES_PATCH = 20250426
++NCURSES_PATCH = 20250503
+ 
+ # 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.5-20250426+/misc/terminfo.src	2025-04-26 20:10:42.000000000 +0000
++++ ncurses-6.5-20250503/misc/terminfo.src	2025-05-03 21:56:32.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.1186 $
+-#	$Date: 2025/04/26 20:10:42 $
++#	$Revision: 1.1188 $
++#	$Date: 2025/05/03 21:56:32 $
+ #
+ # 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
+@@ -423,11 +423,10 @@
+ # , but this isn't a documented feature of ANSI.SYS.
+ klone+sgr|attribute control for ansi.sys displays,
+ 	blink=\E[5m, bold=\E[1m, rev=\E[7m, rmpch=\E[10m,
+-	rmso=\E[m, rmul=\E[m,
+ 	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6
+ 	    %t;1%;%?%p9%t;11%;m,
+-	sgr0=\E[0;10m, smpch=\E[11m, smso=\E[7m, smul=\E[4m,
+-	use=klone+acs,
++	sgr0=\E[0;10m, smpch=\E[11m, use=ansi+sgrso,
++	use=ansi+sgrul, use=klone+acs,
+ 
+ # Most Intel boxes do not treat "invis" (invisible) text.
+ klone+sgr8|attribute control for ansi.sys displays with invis,
+@@ -475,9 +474,15 @@
+ ecma+italics|ECMA-48 italics,
+ 	ritm=\E[23m, sitm=\E[3m,
+ 
++ecma+standout|ECMA-48 standout,
++	rmso=\E[27m, smso=\E[7m,
++
++ecma+underline|ECMA-48 underline,
++	rmul=\E[24m, smul=\E[4m,
++
+ # Attribute control for ECMA-48-compatible terminals
+ ecma+sgr|attribute capabilities for true ECMA-48 terminals,
+-	rmso=\E[27m, rmul=\E[24m, use=klone+sgr8,
++	use=ecma+underline, use=ecma+standout, use=klone+sgr8,
+ 
+ ecma+strikeout|ECMA-48 strikeout/crossed-out,
+ 	rmxx=\E[29m, smxx=\E[9m,
+@@ -494,10 +499,10 @@
+ ibcs2|Intel Binary Compatibility Standard prescriptions,
+ 	cbt=\E[Z, clear=\Ec, cub1=\E[1D, cud1=\E[1B, cuf1=\E[1C,
+ 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[1A, dch=\E[%p1%dP,
+-	dispc=\E=%p1%dg, ech=\E[%p1%dX, hpa=\E[%i%p1%dG, hts=\EH,
+-	ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, rc=\E7,
+-	rmam=\E[?7l, sc=\E7, smam=\E[?7h, tbc=\E[g,
+-	vpa=\E[%i%p1%dd, use=ansi+local, use=ecma+index,
++	dispc=\E=%p1%dg, ech=\E[%p1%dX, hts=\EH, ich=\E[%p1%d@,
++	ich1=\E[@, il=\E[%p1%dL, rc=\E7, rmam=\E[?7l, sc=\E7,
++	smam=\E[?7h, tbc=\E[g, use=ansi+local, use=ansi+rca2,
++	use=ecma+index,
+ 
+ #### ANSI/ECMA-48 terminals and terminal emulators
+ #
+@@ -559,12 +564,12 @@
+ ansi77|ANSI 3.64 standard 1977 version,
+ 	OTbs, am, mir,
+ 	cols#80, it#8, lines#24,
+-	bel=^G, clear=\E[;H\E[2J, cr=\r, cub1=^H,
+-	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M$<5*/>,
+-	ed=\E[J, el=\E[K, home=\E[H, ht=^I, il1=\E[L$<5*/>, ind=\ED,
+-	kf1=\EOP, kf2=\EOR, kf4=\EOS, nel=\r\ED, ri=\EM, rmir=\E[4l,
+-	rmso=\E[m, rmul=\E[m, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+-	use=ansi+arrows, use=ansi+csr, use=ansi+local1,
++	bel=^G, clear=\E[;H\E[2J, cr=\r, cub1=^H, dch1=\E[P,
++	dl1=\E[M$<5*/>, ed=\E[J, el=\E[K, ht=^I, il1=\E[L$<5*/>,
++	ind=\ED, kf1=\EOP, kf2=\EOR, kf4=\EOS, nel=\r\ED, ri=\EM,
++	rmir=\E[4l, smir=\E[4h, use=ansi+arrows, use=ansi+csr,
++	use=ansi+cup, use=ansi+local1, use=ansi+sgrso,
++	use=ansi+sgrul,
+ 
+ # Procomm and some other ANSI emulations don't recognize all of the ANSI-
+ # standard capabilities.  This entry deletes , , , , and
+@@ -579,8 +584,8 @@
+ pcansi-m|pcansi-mono|ibm-pc terminal programs claiming to be ANSI (mono mode),
+ 	OTbs, am, mir, msgr,
+ 	cols#80, lines#24,
+-	bel=^G, cr=\r, dch1=\E[P, dl1=\E[M, il1=\E[L, ind=\n,
+-	use=ansi+arrows, use=ansi+cup, use=ansi+erase,
++	bel=^G, cr=\r, dch1=\E[P, ind=\n, use=ansi+arrows,
++	use=ansi+cup, use=ansi+erase, use=ansi+idl1,
+ 	use=ansi+inittabs, use=ansi+local1, use=klone+sgr-dumb,
+ 
+ pcansi-25-m|pcansi25m|ibm-pc terminal programs with 25 lines (mono mode),
+@@ -606,10 +611,10 @@
+ ansi-m|ansi-mono|ANSI X3.64-1979 terminal with ANSI.SYS compatible attributes,
+ 	mc5i,
+ 	dch=\E[%p1%dP, dl=\E[%p1%dM, ech=\E[%p1%dX, el1=\E[1K,
+-	hpa=\E[%i%p1%dG, ht=\E[I, ich=\E[%p1%d@, il=\E[%p1%dL,
+-	kcbt=\E[Z, kich1=\E[L, mc4=\E[4i, mc5=\E[5i, nel=\r\E[S,
++	ht=\E[I, ich=\E[%p1%d@, il=\E[%p1%dL, kcbt=\E[Z,
++	kich1=\E[L, mc4=\E[4i, mc5=\E[5i, nel=\r\E[S,
+ 	rep=%p1%c\E[%p2%{1}%-%db, s0ds=\E(B, s1ds=\E)B,
+-	s2ds=\E*B, s3ds=\E+B, vpa=\E[%i%p1%dd, use=ansi+local,
++	s2ds=\E*B, s3ds=\E+B, use=ansi+local, use=ansi+rca2,
+ 	use=ecma+index, use=pcansi-m,
+ 
+ # ECMA-48 addresses three of the four capabilities here:
+@@ -686,10 +691,10 @@
+ ansi.sys-old|ANSI.SYS under PC-DOS 2.0,
+ 	OTbs, am, mir, msgr, xon,
+ 	cols#80, lines#25,
+-	clear=\E[2J, cub1=^H, cup=\E[%i%p1%d;%p2%dH, el=\E[k,
+-	home=\E[H, is2=\E[m\E[?7h, kcub1=^H, kcud1=\n, kcuf1=^L,
+-	kcuu1=^K, khome=^^, pfkey=\E[0;%p1%{58}%+%d;%p2"%s"p,
+-	rc=\E[u, rmam=\E[?7l, sc=\E[s, smam=\E[?7h, use=ansi+cpr,
++	clear=\E[2J, cub1=^H, el=\E[k, is2=\E[m\E[?7h, kcub1=^H,
++	kcud1=\n, kcuf1=^L, kcuu1=^K, khome=^^,
++	pfkey=\E[0;%p1%{58}%+%d;%p2"%s"p, rc=\E[u, rmam=\E[?7l,
++	sc=\E[s, smam=\E[?7h, use=ansi+cpr, use=ansi+cup,
+ 	use=ansi+local1, use=klone+color, use=klone+sgr8,
+ 
+ # Keypad:	Home=\0G	Up=\0H	PrPag=\0I
+@@ -833,16 +838,15 @@
+ 	     yzz{{||}}~~,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, civis=\Ef,
+ 	clear=\E[2J\E[H, cnorm=\Ee, cr=\r, cub1=^H, cud1=\EB,
+-	cuf1=\EC, cup=\E[%i%p1%d;%p2%dH, cuu1=\EA, dch1=\Ea,
+-	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K,
+-	el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il1=\EL,
+-	ind=\n, is2=\E<\E)0, kdch1=^?, kf10=\EOY, kf11=\Ep, kf12=\Eq,
+-	kf13=\Er, kf14=\Es, kf15=\Et, kf16=\Eu, kf17=\Ev, kf18=\Ew,
+-	kf19=\Ex, kf20=\Ey, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW,
+-	kf9=\EOX, khlp=\EH, khome=\E\EE, kich1=\EI, knp=\Eb,
+-	kpp=\E\Ea, kund=\EK, ll=\E[24H, nel=\EE, oc=\E[30;47m,
+-	op=\E[30;47m, rev=\E[7m, ri=\EM, rmacs=^O, rmcup=\E[?7h,
+-	rmir=\Ei, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
++	cuf1=\EC, cuu1=\EA, dch1=\Ea, dim=\E[2m, dl=\E[%p1%dM,
++	dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, ht=^I, hts=\EH,
++	ich=\E[%p1%d@, il1=\EL, ind=\n, is2=\E<\E)0, kdch1=^?,
++	kf10=\EOY, kf11=\Ep, kf12=\Eq, kf13=\Er, kf14=\Es, kf15=\Et,
++	kf16=\Eu, kf17=\Ev, kf18=\Ew, kf19=\Ex, kf20=\Ey, kf5=\EOT,
++	kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX, khlp=\EH,
++	khome=\E\EE, kich1=\EI, knp=\Eb, kpp=\E\Ea, kund=\EK,
++	ll=\E[24H, nel=\EE, oc=\E[30;47m, op=\E[30;47m, rev=\E[7m,
++	ri=\EM, rmacs=^O, rmcup=\E[?7h, rmir=\Ei, rmkx=\E[?1l\E>,
+ 	rs1=\E<\E[20l\E[?3;6;9l\E[r\Eq\E(B\017\E)0\E>,
+ 	setb=\E[4%p1%'0'%+%Pa%?%ga%'0'%=%t0%e%ga%'1'%=%t4%e%ga%'2'%=
+ 	     %t2%e%ga%'3'%=%t6%e%ga%'4'%=%t1%e%ga%'5'%=%t5%e%ga%'6'
+@@ -851,9 +855,9 @@
+ 	     %t2%e%ga%'3'%=%t6%e%ga%'4'%=%t1%e%ga%'5'%=%t5%e%ga%'6'
+ 	     %=%t3%e7%;m,
+ 	sgr0=\E[m, smacs=^N, smcup=\E[?7l, smir=\Eh,
+-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+-	use=ansi+apparrows, use=ansi+csr, use=ansi+local,
+-	use=vt100+pf1-pf4,
++	smkx=\E[?1h\E=, tbc=\E[3g, use=ansi+apparrows,
++	use=ansi+csr, use=ansi+cup, use=ansi+local,
++	use=ansi+sgrso, use=ansi+sgrul, use=vt100+pf1-pf4,
+ 
+ # The entries for stv52 and stv52pc probably need a revision.
+ stv52|MiNT virtual console,
+@@ -924,18 +928,17 @@
+ beterm|BeOS Terminal,
+ 	am, eo, mir, msgr, xenl, xon,
+ 	cols#80, it#8, lines#25, ncv#5,
+-	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
+-	cup=\E[%i%p1%d;%p2%dH, ech=\E[%p1%dX, el1=\E[1K,
+-	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n,
+-	kf10=\E[20~, kf11=\E[21~, kf12=\E[22~, kf6=\E[16~,
+-	kf7=\E[17~, kf8=\E[18~, kf9=\E[19~, khome=\E[1~, kspd=^Z,
+-	nel=\r\n, op=\E[m, rev=\E[7m, ri=\EM, rmkx=\E[?4l, rmso=\E[m,
+-	rmul=\E[24m, rs1=\Ec, setb=\E[%p1%{40}%+%cm,
+-	setf=\E[%p1%{30}%+%cm, sgr0=\E[0;10m, smkx=\E[?4h,
+-	smso=\E[7m, smul=\E[4m, u6=\E[%i%p1%d;%p2%dR, u7=\E[6n,
+-	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
+-	use=ansi+erase, use=ansi+idc, use=ansi+idl,
+-	use=ansi+local, use=klone+color, use=vt220+pcedit,
++	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n, ech=\E[%p1%dX,
++	el1=\E[1K, ht=^I, hts=\EH, ind=\n, kf10=\E[20~, kf11=\E[21~,
++	kf12=\E[22~, kf6=\E[16~, kf7=\E[17~, kf8=\E[18~,
++	kf9=\E[19~, khome=\E[1~, kspd=^Z, nel=\r\n, op=\E[m,
++	rev=\E[7m, ri=\EM, rmkx=\E[?4l, rs1=\Ec,
++	setb=\E[%p1%{40}%+%cm, setf=\E[%p1%{30}%+%cm,
++	sgr0=\E[0;10m, smkx=\E[?4h, u6=\E[%i%p1%d;%p2%dR,
++	u7=\E[6n, use=ecma+underline, use=ansi+arrows,
++	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idc,
++	use=ansi+idl, use=ansi+local, use=ansi+rca2,
++	use=ansi+sgrso, use=klone+color, use=vt220+pcedit,
+ 	use=xterm+r5+fkeys,
+ 
+ #### Linux consoles
+@@ -972,19 +975,18 @@
+ 	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i
+ 	     \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u
+ 	     \264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
+-	bel=^G, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
+-	dim=\E[2m, ech=\E[%p1%dX, el1=\E[1K,
+-	flash=\E[?5h$<200/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
+-	ht=^I, hts=\EH, ind=\n, kb2=\E[G, kbs=^?, kcbt=\E[Z,
+-	khome=\E[1~, kmous=\E[M, kspd=^Z, nel=\r\n, ri=\EM,
+-	rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]R,
++	bel=^G, cr=\r, cub1=^H, cud1=\n, dim=\E[2m, ech=\E[%p1%dX,
++	el1=\E[1K, flash=\E[?5h$<200/>\E[?5l, ht=^I, hts=\EH,
++	ind=\n, kb2=\E[G, kbs=^?, kcbt=\E[Z, khome=\E[1~, kmous=\E[M,
++	kspd=^Z, nel=\r\n, ri=\EM, rmam=\E[?7l, rs1=\Ec\E]R,
+ 	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
+ 	    %t;2%;%?%p6%t;1%;%?%p9%t;11%;m,
+-	smam=\E[?7h, tbc=\E[3g, vpa=\E[%i%p1%dd, use=ansi+arrows,
+-	use=ansi+csr, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+-	use=ansi+local, use=vt220+pcedit, use=vt102+enq,
+-	use=klone+sgr, use=ecma+color, use=linux+lockeys,
+-	use=linux+sfkeys, use=vt220+ufkeys,
++	smam=\E[?7h, tbc=\E[3g, use=ecma+underline,
++	use=ecma+standout, use=ansi+arrows, use=ansi+csr,
++	use=ansi+cup, use=ansi+erase, use=ansi+idc, use=ansi+idl,
++	use=ansi+local, use=ansi+rca2, use=vt220+pcedit,
++	use=vt102+enq, use=klone+sgr, use=ecma+color,
++	use=linux+lockeys, use=linux+sfkeys, use=vt220+ufkeys,
+ 
+ # VT220 uses F1-F5 for "local" manipulation, normally not sending anything to
+ # the host.  Rather than adapt the numbering scheme used by xterm, Linux used
+@@ -1155,15 +1157,15 @@
+ 	bel=^G, cr=\r, cub1=^H, cud1=\n, dim=\E[2m, dsl=\E[?H\E[?E,
+ 	el1=\E[1K, fsl=\E[?F, ht=^I, hts=\EH, ind=\n,
+ 	initc=\E]P%p1%x%p2%02x%p3%02x%p4%02x, kb2=\E[G, kbs=^?,
+-	khome=\E[1~, kspd=^Z, nel=\r\n, ri=\EM, rmso=\E[27m,
+-	rmul=\E[24m, rs1=\Ec,
++	khome=\E[1~, kspd=^Z, nel=\r\n, ri=\EM, rs1=\Ec,
+ 	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
+ 	    %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
+ 	sgr0=\E[0;10m, tbc=\E[3g, tsl=\E[?T, u8=\E[?6c,
+-	use=vt220+cvis, use=ansi+arrows, use=ansi+csr,
+-	use=ansi+cup, use=ansi+enq, use=ansi+erase, use=ansi+idc,
+-	use=ansi+idl, use=ansi+local, use=ansi+sgrbold,
+-	use=ansi+rca2, use=dec+sl, use=ecma+sgr, use=klone+color,
++	use=ecma+underline, use=ecma+standout, use=vt220+cvis,
++	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
++	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
++	use=ansi+local, use=ansi+sgrbold, use=ansi+rca2,
++	use=dec+sl, use=ecma+sgr, use=klone+color,
+ 	use=linux+lockeys, use=linux+sfkeys, use=vt220+ufkeys,
+ 	use=vt220+pcedit,
+ 
+@@ -1235,14 +1237,14 @@
+ 	am, bce,
+ 	colors#8, cols#80, lines#24, pairs#64,
+ 	acsc=aajjkkllmmqqttuuxx, bold=\E[1m, clear=\E[H\E[2J,
+-	cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, ed=\E[J,
+-	el=\E[K, home=\E[H, ind=\n, kb2=\E[G, kbs=^?, kcbt=\E[Z,
+-	khome=\E[1~, kmous=\E[M, kspd=^Z, nel=\r\n,
+-	op=\E[49m\E[39m, rev=\E[7m, ri=\EM, rmacs=^O, rmso=\E[27m,
+-	rmul=\E[24m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+-	sgr0=\E[0m, smacs=^N, smso=\E[7m, smul=\E[4m,
+-	use=ansi+arrows, use=linux+lockeys, use=linux+sfkeys,
+-	use=vt220+pcedit, use=vt220+cvis, use=vt220+ufkeys,
++	cr=\r, cub1=^H, cud1=\n, ed=\E[J, el=\E[K, ind=\n, kb2=\E[G,
++	kbs=^?, kcbt=\E[Z, khome=\E[1~, kmous=\E[M, kspd=^Z,
++	nel=\r\n, op=\E[49m\E[39m, rev=\E[7m, ri=\EM, rmacs=^O,
++	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[0m, smacs=^N,
++	smul=\E[4m, use=ecma+underline, use=ecma+standout,
++	use=ansi+arrows, use=ansi+cup, use=linux+lockeys,
++	use=linux+sfkeys, use=vt220+pcedit, use=vt220+cvis,
++	use=vt220+ufkeys,
+ 
+ # https://lists.gnu.org/archive/html/bug-ncurses/2025-04/msg00014.html
+ sclp|IBM s390 driver for Linux,
+@@ -1251,17 +1253,17 @@
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	bel=^G, blink=\E[5m, cr=\r, cub1=^H, cud1=\n,
+ 	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+-	dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el1=\E[1K,
+-	enacs=\E)0, ht=^I, ich=\E[%p1%d@, ind=\ED, is2=\Ec, kbs=^H,
+-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+-	kdch1=\E[3~, kf5=\E[15~, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM,
+-	rmacs=\E(B$<4>, rmso=\E[27m, rmul=\E[24m, sc=\E7,
++	dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, el1=\E[1K,
++	enacs=\E)0, ht=^I, ich=\E[%p1%d@, ind=\ED, is2=\Ec,
++	kf5=\E[15~, khome=\E[1~, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM,
++	rmacs=\E(B$<4>, sc=\E7,
+ 	sgr=\E[0%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e
+ 	    \E(B%;$<2>,
+-	sgr0=\E[m\E(B, smacs=\E(0$<2>, smso=\E[7m, smul=\E[4m,
+-	use=klone+color, use=ansi+cpr, use=ansi+erase,
+-	use=ansi+local, use=linux+sfkeys, use=vt100+pf1-pf4,
+-	use=vt220+ufkeys,
++	sgr0=\E[m\E(B, smacs=\E(0$<2>, smul=\E[4m,
++	use=ecma+underline, use=ecma+standout, use=klone+color,
++	use=ansi+arrows, use=ansi+cpr, use=ansi+erase,
++	use=ansi+local, use=ansi+rca, use=linux+sfkeys,
++	use=vt100+pf1-pf4, use=vt220+ufkeys, use=vt220+pcedit,
+ 
+ #### Mach
+ #
+@@ -1271,20 +1273,19 @@
+ 	am, km, NQ,
+ 	cols#80, it#8, lines#25,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\Ec, cr=\r, cub1=^H,
+-	cud1=\n, cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K,
+-	home=\E[H, ht=^I, ind=\n, kbs=^?, kdch1=\E[9, kend=\E[Y,
+-	kf10=\EOY, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX,
+-	kich1=\E[@, kll=\E[F, knp=\E[U, kpp=\E[V, rev=\E[7m,
+-	rmso=\E[0m, rmul=\E[24m, sgr0=\E[0m, smso=\E[7m,
+-	smul=\E[4m, use=ansi+arrows, use=ansi+idl,
+-	use=ansi+local, use=vt100+pf1-pf4,
++	cud1=\n, ed=\E[J, el=\E[K, ht=^I, ind=\n, kbs=^?, kdch1=\E[9,
++	kend=\E[Y, kf10=\EOY, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW,
++	kf9=\EOX, kich1=\E[@, kll=\E[F, knp=\E[U, kpp=\E[V,
++	rev=\E[7m, rmso=\E[0m, sgr0=\E[0m, use=ecma+underline,
++	use=ansi+arrows, use=ansi+cup, use=ansi+idl,
++	use=ansi+local, use=ansi+sgrso, use=vt100+pf1-pf4,
+ 
+ mach-bold|Mach console with bold instead of underline,
+ 	rmul=\E[0m, smul=\E[1m, use=mach,
+ mach-color|Mach console with ANSI color,
+ 	colors#8, pairs#64,
+-	dim=\E[2m, invis=\E[8m, op=\E[37;40m, rmso=\E[27m,
+-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, use=mach,
++	dim=\E[2m, invis=\E[8m, op=\E[37;40m, setab=\E[4%p1%dm,
++	setaf=\E[3%p1%dm, use=ecma+standout, use=mach,
+ 
+ # From: Samuel Thibault
+ # Source: git://git.sv.gnu.org/hurd/gnumach.git
+@@ -1304,8 +1305,8 @@
+ 
+ mach-gnu-color|GNU Mach console with ANSI color,
+ 	colors#8, pairs#64,
+-	op=\E[37;40m, rmso=\E[27m, setab=\E[4%p1%dm,
+-	setaf=\E[3%p1%dm, use=mach-gnu,
++	op=\E[37;40m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
++	use=ecma+standout, use=mach-gnu,
+ 
+ # From: Marcus Brinkmann
+ # http://git.savannah.gnu.org/cgit/hurd/hurd.git/log/console/
+@@ -1344,10 +1345,11 @@
+ 	el1=\E[1K, flash=\Eg, ht=^I, ich=\E[%p1%d@, ind=\E[S,
+ 	kb2=\E[G, kbs=^?, kcbt=\E[Z, khome=\E[1~, kmous=\E[M,
+ 	kspd=^Z, nel=\r\n, op=\E[39;49m, ri=\E[T, rmir=\E[4l,
+-	rmso=\E[27m, rmul=\E[24m, rs1=\EM\E[?1000l,
++	rs1=\EM\E[?1000l,
+ 	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;
+ 	    2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
+ 	smir=\E[4h, grbom=\E[>1l, gsbom=\E[>1h,
++	use=ecma+underline, use=ecma+standout,
+ 	use=ansi+apparrows, use=ansi+csr, use=ansi+cup,
+ 	use=ansi+erase, use=ansi+idl, use=ansi+local,
+ 	use=ansi+rca2, use=ansi+sgrbold, use=vt220+pcedit,
+@@ -1486,7 +1488,7 @@
+ 	kpp=\E[V, kref=\ENl, kres=\ENp, krfr=\ENg, kri=\E[b,
+ 	krpl=\ENr, krst=\ENj, ksav=\ENq, kslt=\E[T, ktbc=\ENd,
+ 	kund=\ENu, ll=\E[99H, nel=\EE, op=\E[39;49m, ri=\E[T,
+-	rmacs=^O, rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m,
++	rmacs=^O, rmam=\E[?7l,
+ 	rs1=\017\E[?7h\E[0;39;49m$<2>\E>\E[?1l,
+ 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+ 	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
+@@ -1496,7 +1498,8 @@
+ 	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
+ 	    %|%t;7%;%?%p7%t;9%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h,
+-	tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH, use=ansi+arrows,
++	tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH,
++	use=ecma+underline, use=ecma+standout, use=ansi+arrows,
+ 	use=ansi+local, use=ansi+rep, use=ansi+inittabs,
+ 	use=ansi+sgrbold, use=att610+cvis0, use=decid+cpr,
+ 	use=ecma+index, use=vt100+pf1-pf4,
+@@ -1555,26 +1558,26 @@
+ 	     yszr{c}\034~\207,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z,
+ 	civis=\E[=14;12C, clear=\E[H\E[2J, cnorm=\E[=10;12C,
+-	cub1=^H, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[=0;12C,
+-	dch=\E[%p1%dP, dch1=\E[P, dispc=\E[=%p1%dg, ed=\E[m\E[J,
+-	el=\E[m\E[K, el1=\E[1K, home=\E[H, ht=^I, hts=\EH,
+-	ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, invis=\E[8m, kbeg=\E[E,
+-	kcbt=\E[Z, kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V,
+-	kf11=\E[W, kf12=\E[X, kf13=\E[Y, kf15=\E[a, kf16=\E[b,
+-	kf17=\E[c, kf18=\E[d, kf19=\E[e, kf2=\E[N, kf20=\E[f,
+-	kf21=\E[g, kf22=\E[h, kf23=\E[i, kf24=\E[j, kf25=\E[k,
+-	kf26=\E[l, kf27=\E[m, kf28=\E[n, kf29=\E[o, kf3=\E[O,
+-	kf30=\E[p, kf31=\E[q, kf32=\E[r, kf33=\E[s, kf34=\E[t,
+-	kf35=\E[u, kf36=\E[v, kf37=\E[w, kf38=\E[x, kf39=\E[y,
+-	kf4=\E[P, kf40=\E[z, kf41=\E[@, kf42=\E[[, kf43=\E[\\,
+-	kf44=\E[], kf45=\E[\^, kf46=\E[_, kf47=\E[`, kf48=\E[{,
+-	kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, kich1=\E[L,
+-	knp=\E[G, kpp=\E[I, op=\E[0;37;40m, rc=\E8, rev=\E[7m,
+-	ri=\E[T, rmacs=\E[10m, rmam=\E[?7l, rmso=\E[m, rmul=\E[m,
++	cub1=^H, cvvis=\E[=0;12C, dch=\E[%p1%dP, dch1=\E[P,
++	dispc=\E[=%p1%dg, ed=\E[m\E[J, el=\E[m\E[K, el1=\E[1K,
++	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, ind=\E[S,
++	invis=\E[8m, kbeg=\E[E, kcbt=\E[Z, kdch1=^?, kend=\E[F,
++	kf1=\E[M, kf10=\E[V, kf11=\E[W, kf12=\E[X, kf13=\E[Y,
++	kf15=\E[a, kf16=\E[b, kf17=\E[c, kf18=\E[d, kf19=\E[e,
++	kf2=\E[N, kf20=\E[f, kf21=\E[g, kf22=\E[h, kf23=\E[i,
++	kf24=\E[j, kf25=\E[k, kf26=\E[l, kf27=\E[m, kf28=\E[n,
++	kf29=\E[o, kf3=\E[O, kf30=\E[p, kf31=\E[q, kf32=\E[r,
++	kf33=\E[s, kf34=\E[t, kf35=\E[u, kf36=\E[v, kf37=\E[w,
++	kf38=\E[x, kf39=\E[y, kf4=\E[P, kf40=\E[z, kf41=\E[@,
++	kf42=\E[[, kf43=\E[\\, kf44=\E[], kf45=\E[\^, kf46=\E[_,
++	kf47=\E[`, kf48=\E[{, kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T,
++	kf9=\E[U, kich1=\E[L, knp=\E[G, kpp=\E[I, op=\E[0;37;40m,
++	rc=\E8, rev=\E[7m, ri=\E[T, rmacs=\E[10m, rmam=\E[?7l,
+ 	sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+-	sgr0=\E[0;10m, smacs=\E[12m, smam=\E[?7h, smso=\E[7m,
+-	smul=\E[4m, use=ansi+arrows, use=ansi+idl,
+-	use=ansi+local, use=ecma+index,
++	sgr0=\E[0;10m, smacs=\E[12m, smam=\E[?7h,
++	use=ansi+arrows, use=ansi+cup, use=ansi+idl,
++	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
++	use=ecma+index,
+ 
+ scoansi-new|SCO Extended ANSI standard crt (5.0.6),
+ 	km,
+@@ -1633,9 +1636,8 @@
+ 	cols#80, it#8, lines#40,
+ 	bel=^G, bold=\E[1m, clear=\E[H\E[2J,
+ 	cnorm=\E[9/y\E[12/y\E[=6l, cr=\r, cud1=\n,
+-	cup=\E[%i%p1%d;%p2%dH,
+ 	cvvis=\E[10/y\E[=1h\E[=2l\E[=6h, ed=\E[J, el=\E[K,
+-	el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ind=\ED,
++	el1=\E[1K, ht=^I, hts=\EH, ind=\ED,
+ 	is2=\E[?1l\E>\E[?7h\E[100g\E[0m\E7\E[r\E8, kDC=\E[P,
+ 	kEND=\E[147q, kHOM=\E[143q, kLFT=\E[158q, kPRT=\E[210q,
+ 	kRIT=\E[167q, kSPD=\E[218q, kcbt=\E[Z, kdch1=^?,
+@@ -1645,9 +1647,10 @@
+ 	kf8=\E[008q, kf9=\E[009q, kich1=\E[139q, knp=\E[154q,
+ 	kpp=\E[150q, kprt=\E[209q, krmir=\E[146q, kspd=\E[217q,
+ 	nel=\EE, pfkey=\EP101;%p1%d.y%p2%s\E\\, rc=\E8,
+-	rev=\E[7m, ri=\EM, rmam=\E[?7l, rmso=\E[m, rmul=\E[m, sc=\E7,
+-	sgr0=\E[m, smam=\E[?7h, smso=\E[1;7m, smul=\E[4m,
+-	tbc=\E[3g, use=ansi+arrows, use=ansi+idl, use=ansi+local,
++	rev=\E[7m, ri=\EM, rmam=\E[?7l, rmso=\E[m, sc=\E7, sgr0=\E[m,
++	smam=\E[?7h, smso=\E[1;7m, tbc=\E[3g, use=ansi+arrows,
++	use=ansi+cup, use=ansi+idl, use=ansi+local,
++	use=ansi+sgrul,
+ 
+ iris-ansi-ap|IRIS ANSI in application-keypad mode,
+ 	is2=\E[?1l\E=\E[?7h, kent=\EOM, use=iris-ansi,
+@@ -1657,10 +1660,10 @@
+ iris-color|xwsh|IRIX ANSI with color,
+ 	ncv#33,
+ 	csr=\E[%i%p1%d;%p2%dr, dch=\E[%p1%dP, dim=\E[2m,
+-	ech=\E[%p1%dX, ich=\E[%p1%d@, rmul=\E[24m, rs1=\Ec,
++	ech=\E[%p1%dX, ich=\E[%p1%d@, rs1=\Ec,
+ 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+-	use=ecma+italics, use=vt100+enq, use=klone+color,
+-	use=iris-ansi-ap,
++	use=ecma+underline, use=ecma+italics, use=vt100+enq,
++	use=klone+color, use=iris-ansi-ap,
+ 
+ #### OpenBSD consoles
+ #
+@@ -1691,15 +1694,15 @@
+ pccon+sgr+acs0|sgr and simple ASCII pseudographics for OpenBSD PC console,
+ 	acsc=+>\,<-\^.v0#`+a:f\\h#i#j+k+l+m+n+o~p-q-r-s_t+u+v+w+x|y#
+ 	     z#{*|!}#~o,
+-	bold=\E[1m, rev=\E[7m, rmso=\E[27m,
++	bold=\E[1m, rev=\E[7m,
+ 	sgr=\E[0%?%p1%p3%|%t;7%;%?%p6%t;1%;%?%p2%t;4%;m,
+-	sgr0=\E[m, smso=\E[7m,
++	sgr0=\E[m, use=ecma+standout,
+ pccon+sgr+acs|sgr and default ASCII pseudographics for OpenBSD PC console,
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+-	bold=\E[1m, enacs=\E)0, rev=\E[7m, rmacs=\E(B, rmso=\E[27m,
++	bold=\E[1m, enacs=\E)0, rev=\E[7m, rmacs=\E(B,
+ 	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, smso=\E[7m,
++	sgr0=\E[m\E(B, smacs=\E(0, use=ecma+standout,
+ # underline renders as color
+ pccon+colors|ANSI colors for OpenBSD PC console,
+ 	bce,
+@@ -1712,12 +1715,12 @@
+ pccon+base|base capabilities for OpenBSD PC console,
+ 	am, km, mc5i, msgr, npc, nxon, xenl, xon,
+ 	cols#80, it#8, lines#24,
+-	bel=^G, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
+-	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, el1=\E[1K,
+-	home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\ED, nel=\EE,
+-	ri=\EM, rmam=\E[?7l, rmul=\E[24m, rs2=\Ec, smam=\E[?7h,
+-	smul=\E[4m, tbc=\E[3g, use=ansi+cpr, use=ansi+csr,
+-	use=ansi+erase, use=ansi+idl, use=ansi+local,
++	bel=^G, cr=\r, cub1=^H, cud1=\n, dch=\E[%p1%dP, dch1=\E[P,
++	ech=\E[%p1%dX, el1=\E[1K, ht=^I, hts=\EH, ich=\E[%p1%d@,
++	ind=\ED, nel=\EE, ri=\EM, rmam=\E[?7l, rs2=\Ec, smam=\E[?7h,
++	smul=\E[4m, tbc=\E[3g, use=ecma+underline, use=ansi+cpr,
++	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idl,
++	use=ansi+local,
+ 
+ pccon0-m|OpenBSD PC console without colors & with simple ASCII pseudographics,
+ 	use=pccon+sgr+acs0, use=pccon+base, use=pccon+keys,
+@@ -1748,19 +1751,19 @@
+ 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
+ 	     yzz~~,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H,
+-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+-	el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\ED,
++	dch=\E[%p1%dP, dch1=\E[P, el1=\E[1K, ht=^I, hts=\EH,
++	ich=\E[%p1%d@, ind=\ED,
+ 	is1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, kbs=^?,
+ 	kdch1=\E[3~, kf1=\E[17~, kf2=\E[18~, kf3=\E[19~,
+ 	kf4=\E[20~, kf5=\E[21~, kf6=\E[23~, kf7=\E[24~, kf8=\E[25~,
+ 	khome=\E[1~, kich1=\E[2~, kll=\E[4~, knp=\E[6~, kpp=\E[5~,
+ 	nel=\EE, rev=\E[7m, rf=/usr/share/tabset/vt100, ri=\EM,
+ 	rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>,
+-	rmso=\E[27m, rmul=\E[24m,
+ 	rs1=\Ec\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sgr0=\E[m,
+ 	smacs=\E(0, smam=\E[?7h, smir=\E[4h, smkx=\E[?1h\E=,
+-	smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=ansi+apparrows,
+-	use=ansi+csr, use=ansi+erase, use=ansi+idl,
++	smul=\E[4m, tbc=\E[3g, use=ecma+underline,
++	use=ecma+standout, use=ansi+apparrows, use=ansi+csr,
++	use=ansi+cup, use=ansi+erase, use=ansi+idl,
+ 	use=ansi+local, use=decid+cpr, use=ecma+index,
+ 	use=vt220+cvis,
+ 
+@@ -1950,17 +1953,17 @@
+ 	OTbs, OTpt, am, bce, bw, eo, km, msgr, npc,
+ 	colors#8, cols#80, it#8, lines#18, pairs#64,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cr=\r, cub1=^H,
+-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+-	dim=\E[30;1m, ech=\E[%p1%dX, el1=\E[1K, home=\E[H,
+-	hpa=\E[%i%p1%d`, ht=^I, ich=\E[%p1%d@, ich1=\E[@, ind=\E[S,
+-	kb2=\E[E, kcbt=\E[Z, kdch1=^?, kend=\E[F, kf1=\E[M,
+-	kf10=\E[V, kf11=\E[W, kf12=\E[X, kf2=\E[N, kf3=\E[O,
+-	kf4=\E[P, kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U,
+-	kich1=\E[L, knp=\E[G, kpp=\E[I, nel=\E[E, op=\E[x, rev=\E[7m,
+-	ri=\E[T, rmso=\E[m, rs2=\E[x\E[m\Ec, setb=\E[4%p1%dm,
+-	setf=\E[3%p1%dm, sgr0=\E[m, smso=\E[7m, vpa=\E[%i%p1%dd,
+-	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
+-	use=ansi+idl, use=ansi+local, use=ecma+index,
++	dch=\E[%p1%dP, dch1=\E[P, dim=\E[30;1m, ech=\E[%p1%dX,
++	el1=\E[1K, hpa=\E[%i%p1%d`, ht=^I, ich=\E[%p1%d@,
++	ich1=\E[@, ind=\E[S, kb2=\E[E, kcbt=\E[Z, kdch1=^?,
++	kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W, kf12=\E[X,
++	kf2=\E[N, kf3=\E[O, kf4=\E[P, kf5=\E[Q, kf6=\E[R, kf7=\E[S,
++	kf8=\E[T, kf9=\E[U, kich1=\E[L, knp=\E[G, kpp=\E[I, nel=\E[E,
++	op=\E[x, rev=\E[7m, ri=\E[T, rs2=\E[x\E[m\Ec,
++	setb=\E[4%p1%dm, setf=\E[3%p1%dm, sgr0=\E[m,
++	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
++	use=ansi+cup, use=ansi+erase, use=ansi+idl,
++	use=ansi+local, use=ansi+sgrso, use=ecma+index,
+ 
+ #### FreeBSD console entries
+ 
+@@ -1998,27 +2001,27 @@
+ 	am, bce, bw, eo, msgr, npc,
+ 	cols#80, it#8, lines#25, ncv#21,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cnorm=\E[=0C,
+-	cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[=1C,
+-	dch=\E[%p1%dP, dch1=\E[P, dim=\E[30;1m, ech=\E[%p1%dX,
+-	home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich=\E[%p1%d@,
+-	ich1=\E[@, ind=\E[S, kb2=\E[E, kcbt=\E[Z, kdch1=^?,
+-	kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W, kf12=\E[X,
+-	kf13=\E[Y, kf14=\E[Z, kf15=\E[a, kf16=\E[b, kf17=\E[c,
+-	kf18=\E[d, kf19=\E[e, kf2=\E[N, kf20=\E[f, kf21=\E[g,
+-	kf22=\E[h, kf23=\E[i, kf24=\E[j, kf25=\E[k, kf26=\E[l,
+-	kf27=\E[m, kf28=\E[n, kf29=\E[o, kf3=\E[O, kf30=\E[p,
+-	kf31=\E[q, kf32=\E[r, kf33=\E[s, kf34=\E[t, kf35=\E[u,
+-	kf36=\E[v, kf37=\E[w, kf38=\E[x, kf39=\E[y, kf4=\E[P,
+-	kf40=\E[z, kf41=\E[@, kf42=\E[[, kf43=\E[\\, kf44=\E[],
+-	kf45=\E[\^, kf46=\E[_, kf47=\E[`, kf48=\E[{, kf5=\E[Q,
+-	kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, kich1=\E[L, knp=\E[G,
+-	kpp=\E[I, nel=\E[E, op=\E[x, rc=\E8, rev=\E[7m, ri=\E[T,
+-	rmso=\E[m, rs2=\E[x\E[m\Ec, sc=\E7,
++	cr=\r, cub1=^H, cvvis=\E[=1C, dch=\E[%p1%dP, dch1=\E[P,
++	dim=\E[30;1m, ech=\E[%p1%dX, hpa=\E[%i%p1%d`, ht=^I,
++	ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, kb2=\E[E, kcbt=\E[Z,
++	kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W,
++	kf12=\E[X, kf13=\E[Y, kf14=\E[Z, kf15=\E[a, kf16=\E[b,
++	kf17=\E[c, kf18=\E[d, kf19=\E[e, kf2=\E[N, kf20=\E[f,
++	kf21=\E[g, kf22=\E[h, kf23=\E[i, kf24=\E[j, kf25=\E[k,
++	kf26=\E[l, kf27=\E[m, kf28=\E[n, kf29=\E[o, kf3=\E[O,
++	kf30=\E[p, kf31=\E[q, kf32=\E[r, kf33=\E[s, kf34=\E[t,
++	kf35=\E[u, kf36=\E[v, kf37=\E[w, kf38=\E[x, kf39=\E[y,
++	kf4=\E[P, kf40=\E[z, kf41=\E[@, kf42=\E[[, kf43=\E[\\,
++	kf44=\E[], kf45=\E[\^, kf46=\E[_, kf47=\E[`, kf48=\E[{,
++	kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, kich1=\E[L,
++	knp=\E[G, kpp=\E[I, nel=\E[E, op=\E[x, rc=\E8, rev=\E[7m,
++	ri=\E[T, rs2=\E[x\E[m\Ec, sc=\E7,
+ 	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=ansi+arrows,
+-	use=ansi+erase, use=ansi+idl, use=ansi+local,
+-	use=ecma+index, use=klone+color,
++	sgr0=\E[m, vpa=\E[%i%p1%dd, use=ansi+arrows,
++	use=ansi+cup, use=ansi+erase, use=ansi+idl,
++	use=ansi+local, use=ansi+sgrso, use=ecma+index,
++	use=klone+color,
+ 
+ cons25|ansis|ansi80x25|FreeBSD console (25-line ANSI mode),
+ 	acsc=-\030.^Y0\333`\004a\260f\370g\361h\261i\025j\331k\277l
+@@ -2029,9 +2032,8 @@
+ 	kbs=^?, kdch1=\E[3~, use=cons25,
+ 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,
++	bold@, dim@, op@, setab@, setaf@,
++	sgr=\E[0%?%p1%t;2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;m, use=ansi+sgrul, use=cons25,
+ cons30|ansi80x30|FreeBSD console (30-line ANSI mode),
+ 	lines#30, use=cons25,
+ cons30-m|ansi80x30-mono|FreeBSD console (30-line mono ANSI mode),
+@@ -2055,10 +2057,10 @@
+ 	use=cons25w,
+ cons25r-m|pc3r-m|ibmpc3r-mono|cons25-koi8r-m|FreeBSD console w/koi8-r cyrillic (mono),
+ 	colors@, pairs@,
+-	op@, rmul=\E[m, setab@, setaf@,
++	op@, setab@, setaf@,
+ 	sgr=\E[0%?%p1%t;2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
+ 	    %t;30;1%;%?%p6%t;1%;m,
+-	smul=\E[4m, use=cons25r,
++	use=ansi+sgrul, use=cons25r,
+ cons50r|cons50-koi8r|FreeBSD console w/koi8-r cyrillic (50 lines),
+ 	lines#50, use=cons25r,
+ cons50r-m|cons50-koi8r-m|FreeBSD console w/koi8-r cyrillic (50-line mono),
+@@ -2075,9 +2077,8 @@
+ 	use=cons25w,
+ cons25l1-m|cons25-iso-m|FreeBSD console w/iso 8859-1 chars (mono),
+ 	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=cons25l1,
++	bold@, dim@, op@, setab@, setaf@,
++	sgr=\E[0%?%p1%t;2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;m, use=ansi+sgrul, use=cons25l1,
+ cons50l1|cons50-iso8859|FreeBSD console w/iso 8859-1 chars (50 lines),
+ 	lines#50, use=cons25l1,
+ cons50l1-m|cons50-iso-m|FreeBSD console w/iso 8859-1 chars (50-line mono),
+@@ -2191,11 +2192,11 @@
+ 	cols#80, it#8, lines#25, ncv#21, U8#1,
+ 	bold=\E[1m, cr=\r, cub1=^H, dim=\E[30;1m, ech=\E[%p1%dX,
+ 	ind=\E[S, kent=\r, nel=\E[E, op=\E[x, rev=\E[7m, ri=\E[T,
+-	rmso=\E[27m, rs2=\E[x\E[m\Ec,
++	rs2=\E[x\E[m\Ec,
+ 	sgr=\E[0%?%p1%t;2;7%;%?%p3%t;7%;%?%p5%t;30;1%;%?%p6%t;1%;m,
+-	sgr0=\E[m, use=vt220+cvis, use=ecma+index,
+-	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
+-	use=ansi+erase, use=ansi+idc, use=ansi+idl,
++	sgr0=\E[m, use=ecma+standout, use=vt220+cvis,
++	use=ecma+index, use=ansi+arrows, use=ansi+csr,
++	use=ansi+cup, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+ 	use=ansi+local, use=ansi+rca2, use=ansi+sgrso,
+ 	use=ansi+tabs, use=klone+color,
+ 
+@@ -2241,9 +2242,9 @@
+ oldpc3|oldibmpc3|old IBM PC BSD/386 console,
+ 	OTbs, km,
+ 	lines#25,
+-	bel=^G, bold=\E[=15F, cr=\r, cud1=\n, dim=\E[=8F, dl1=\E[M,
+-	ht=^I, il1=\E[L, ind=\n, kich1=\E[L, kll=\E[F, knp=\E[G,
+-	kpp=\E[I, nel=\r\n, sgr0=\E[=R, use=ansi+arrows,
++	bel=^G, bold=\E[=15F, cr=\r, cud1=\n, dim=\E[=8F, ht=^I,
++	ind=\n, kich1=\E[L, kll=\E[F, knp=\E[G, kpp=\E[I, nel=\r\n,
++	sgr0=\E[=R, use=ansi+arrows, use=ansi+idl1,
+ 
+ # Description of BSD/OS console emulator in version 1.1, 2.0, 2.1
+ # Note, the emulator supports many of the additional console features
+@@ -2264,14 +2265,13 @@
+ bsdos-pc-m|bsdos-pc-mono|BSD/OS PC console mono,
+ 	OTbs, am, eo, km, xon,
+ 	cols#80, it#8, lines#25,
+-	bel=^G, clear=\Ec, cr=\r, cub1=^H, cud1=\n,
+-	cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+-	ind=\n, kich1=\E[L, kll=\E[F, knp=\E[G, kpp=\E[I, nel=\r\n,
+-	rc=\E8, sc=\E7,
++	bel=^G, clear=\Ec, cr=\r, cub1=^H, cud1=\n, ed=\E[J, el=\E[K,
++	ht=^I, ind=\n, kich1=\E[L, kll=\E[F, knp=\E[G, kpp=\E[I,
++	nel=\r\n, rc=\E8, sc=\E7,
+ 	sgr=\E[0;10%?%p1%t;7%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7
+ 	    %t;8%;%?%p9%t;11%;m%?%p5%t\E[=8F%;,
+-	use=ansi+arrows, use=ansi+idl, use=ansi+local,
+-	use=klone+sgr8,
++	use=ansi+arrows, use=ansi+cup, use=ansi+idl,
++	use=ansi+local, use=klone+sgr8,
+ 
+ # Old names for BSD/OS PC console used in releases before 4.1.
+ pc3|BSD/OS on the PC console,
+@@ -2554,8 +2554,8 @@
+ # 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,
++	blink@, bold@, rev@, rmul@, sgr@, sgr0@, smul@, use=ansi+sgrso,
++	use=vt100,
+ vt100-nav-w|vt100-w-nav|DEC VT100 132 cols 14 lines (no advanced video option),
+ 	cols#132, lines#14, use=vt100-nav,
+ 
+@@ -2581,7 +2581,7 @@
+ # This entry (or vt102-nsgr) is probably the right thing to use for
+ # these.
+ vt102|DEC VT102,
+-	dch1=\E[P, dl1=\E[M, il1=\E[L, rmir=\E[4l, smir=\E[4h,
++	dch1=\E[P, rmir=\E[4l, smir=\E[4h, use=ansi+idl1,
+ 	use=vt100,
+ vt102-w|DEC VT102 in wide mode,
+ 	cols#132,
+@@ -2647,20 +2647,19 @@
+ 	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
+ 	clear=\E[H\E[2J$<50>, cr=\r, cub1=^H,
+ 	cup=\E[%i%p1%d;%p2%dH$<10>, dch1=\E[P, ed=\E[J$<50>,
+-	el=\E[K$<3>, home=\E[H, ht=^I,
+-	if=/usr/share/tabset/vt100, ind=\ED$<20/>,
+-	is2=\E[1;24r\E[24;1H, kf10=\E[29~, kf5=\E[17~,
+-	kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, kf9=\E[21~,
+-	khome=\E[1~, kich1=\E[2~, rev=\E[7m$<2>,
+-	rf=/usr/share/tabset/vt100, ri=\EM$<14/>,
+-	rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, rmso=\E[27m,
+-	rmul=\E[24m, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
++	el=\E[K$<3>, ht=^I, if=/usr/share/tabset/vt100,
++	ind=\ED$<20/>, is2=\E[1;24r\E[24;1H, kf10=\E[29~,
++	kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, kf9=\E[21~,
++	khome=\E[1~, rev=\E[7m$<2>, rf=/usr/share/tabset/vt100,
++	ri=\EM$<14/>, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l,
++	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
+ 	    %p9%t\E(0%e\E(B%;$<2>,
+ 	sgr0=\E[m$<2>, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h,
+-	smso=\E[7m, smul=\E[4m, use=ansi+arrows, use=ansi+csr,
+-	use=ansi+idl1, use=ansi+local1, use=vt100+pf1-pf4,
+-	use=vt220+pcedit, use=vt220+cvis,
++	smul=\E[4m, use=ecma+underline, use=ecma+standout,
++	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
++	use=ansi+idl1, use=ansi+local1, use=ansi+sgrso,
++	use=vt100+pf1-pf4, use=vt220+pcedit, use=vt220+cvis,
+ 
+ # Here's a picture of the Sun/PC editing keypad:
+ #	+--------+--------+--------+
+@@ -2712,15 +2711,15 @@
+ 	kf14=\E[26~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
+ 	kf20=\E[34~, khlp=\E[28~, krdo=\E[29~, lf1=pf1, lf2=pf2,
+ 	lf3=pf3, lf4=pf4, nel=\EE, rev=\E[7m, ri=\EM, rmacs=\E(B$<4>,
+-	rmam=\E[?7l, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
+-	rs1=\E[?3l,
++	rmam=\E[?7l, rmir=\E[4l, rs1=\E[?3l,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
+ 	    %p9%t\E(0%e\E(B%;$<2>,
+ 	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=ansi+csr,
+-	use=ansi+cup, use=ansi+pp, use=ansi+enq, use=ansi+erase,
+-	use=ansi+idl, use=ansi+local, use=vt100+pf1-pf4,
+-	use=vt220+vtedit, use=vt220+ufkeys,
++	smul=\E[4m, tbc=\E[3g, use=ecma+underline,
++	use=ecma+standout, use=ansi+csr, use=ansi+cup,
++	use=ansi+pp, use=ansi+enq, use=ansi+erase, use=ansi+idl,
++	use=ansi+local, use=vt100+pf1-pf4, use=vt220+vtedit,
++	use=vt220+ufkeys,
+ 
+ vt220|vt200|DEC VT220,
+ 	use=vt220+cvis, use=vt220-base,
+@@ -2800,18 +2799,18 @@
+ vt200-js|vt220-js|DEC VT200 series with jump scroll,
+ 	am, msgr,
+ 	cols#80,
+-	bel=^G, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
+-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M,
+-	home=\E[H, ht=^I, il1=\E[L, ind=\ED,
++	bel=^G, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, cuu1=\E[A,
++	dch1=\E[P, ht=^I, ind=\ED,
+ 	is2=\E[61"p\E[H\E[?3l\E[?4l\E[?1h\E[?5l\E[?6l\E[?7h\E[?8h\E[
+ 	    ?25h\E>\E[m,
+ 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+ 	nel=\r\ED, rf=/usr/share/tabset/vt100, ri=\EM, rmdc=,
+ 	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m$<5/>,
+-	rmul=\E[24m, rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+-	smdc=, smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m$<5/>,
+-	smul=\E[4m, use=ansi+csr, use=ansi+erase,
+-	use=vt100+pf1-pf4, use=vt220+cvis,
++	rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, smdc=,
++	smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m$<5/>, smul=\E[4m,
++	use=ecma+underline, use=ansi+csr, use=ansi+cup,
++	use=ansi+erase, use=ansi+idl1, use=vt100+pf1-pf4,
++	use=vt220+cvis,
+ 
+ # This was DEC's VT320.  Use the purpose-built one below instead
+ #vt320|DEC VT320 in VT100 emulation mode,
+@@ -2899,25 +2898,24 @@
+ 	cols#80, it#8, lines#24, vt#3,
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
+-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+-	dsl=\E[2$~\r\E[1$}\E[K\E[$},
+-	flash=\E[?5h$<200/>\E[?5l, fsl=\E[$}, home=\E[H, ht=^I,
+-	hts=\EH, ich=\E[%p1%d@, ind=\ED,
++	dch=\E[%p1%dP, dch1=\E[P, dsl=\E[2$~\r\E[1$}\E[K\E[$},
++	flash=\E[?5h$<200/>\E[?5l, fsl=\E[$}, ht=^I, hts=\EH,
++	ich=\E[%p1%d@, ind=\ED,
+ 	is2=\E<\E\sF\E>\E[?1h\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r
+ 	    \E[24;1H,
+ 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+ 	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, lf1=pf1,
+ 	lf2=pf2, lf3=pf3, lf4=pf4, nel=\r\ED, rev=\E[7m,
+ 	rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B,
+-	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
+-	rmul=\E[24m, rs1=\E[?3l,
++	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rs1=\E[?3l,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
+ 	    %p9%t\E(0%e\E(B%;$<2>,
+ 	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
+-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+-	tsl=\E[2$~\E[1$}\E[1;%dH, use=ansi+csr, use=ansi+erase,
+-	use=ansi+idl, use=ansi+local, use=vt100+pf1-pf4,
+-	use=vt220+cvis,
++	smkx=\E[?1h\E=, smul=\E[4m, tbc=\E[3g,
++	tsl=\E[2$~\E[1$}\E[1;%dH, use=ecma+underline,
++	use=ecma+standout, use=ansi+csr, use=ansi+cup,
++	use=ansi+erase, use=ansi+idl, use=ansi+local,
++	use=vt100+pf1-pf4, use=vt220+cvis,
+ 
+ # Left/right margins are supported in xterm since patch #279 (2012/05/10)
+ vt420+lrmm|VT420 left/right margins,
+@@ -2947,7 +2945,7 @@
+ # (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, mir, msgr, xenl, xon,
++	am, 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,
+@@ -2960,15 +2958,15 @@
+ 	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, lf1=pf1,
+ 	lf2=pf2, lf3=pf3, lf4=pf4, nel=\r\ED, rev=\E[7m,
+ 	rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B,
+-	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
+-	rs1=\E<\E[?3l\E[!p\E[?7h,
++	rmam=\E[?7l, rmkx=\E[?1l\E>, rs1=\E<\E[?3l\E[!p\E[?7h,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
+ 	    %p9%t\E(0%e\E(B%;$<2>,
+ 	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=,
+-	smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+-	tsl=\E[2$~\E[1$}\E[1;%dH, use=ansi+csr, use=ansi+cup,
+-	use=ansi+idc, use=ansi+idl, use=ansi+local, use=dec+sl,
+-	use=vt100+pf1-pf4, use=vt220+cvis,
++	smul=\E[4m, tbc=\E[3g, tsl=\E[2$~\E[1$}\E[1;%dH,
++	use=ecma+underline, use=ecma+standout, use=ansi+csr,
++	use=ansi+cup, use=ansi+idc, use=ansi+idl, use=ansi+local,
++	use=ansi+sgrso, use=dec+sl, use=vt100+pf1-pf4,
++	use=vt220+cvis,
+ 
+ # (vt420: I removed , it collided with .  I also restored
+ # a missing  -- esr)
+@@ -2990,14 +2988,15 @@
+ 	rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B$<4>,
+ 	rmam=\E[?7l, rmir=\E[4l, rmkx=\E>,
+ 	rmsc=\E[?0;0r\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+-	rmso=\E[27m, rmul=\E[24m, rs3=\E[?67h\E[64;1"p,
++	rs3=\E[?67h\E[64;1"p,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
+ 	    %p9%t\E(0%e\E(B%;$<2>,
+ 	sgr0=\E[m\E(B$<2>, smacs=\E(0$<2>, smam=\E[?7h,
+-	smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+-	use=ansi+csr, use=ansi+enq, use=ansi+idl, use=ansi+pp,
+-	use=ansi+local, use=dec+sl, use=vt100+pf1-pf4,
+-	use=vt220+cvis, use=vt420+lrmm, use=vt220+vtedit,
++	smir=\E[4h, smkx=\E=, tbc=\E[3g, use=ecma+underline,
++	use=ecma+standout, use=ansi+csr, use=ansi+enq,
++	use=ansi+idl, use=ansi+pp, use=ansi+local, use=dec+sl,
++	use=vt100+pf1-pf4, use=vt220+cvis, use=vt420+lrmm,
++	use=vt220+vtedit,
+ 
+ # DEC VT220 and up support DECUDK (user-defined keys).  DECUDK (i.e., pfx)
+ # takes two parameters, the key and the string.  Translating the key is
+@@ -3132,8 +3131,8 @@
+ tt|tkterm|Don Libes' tk text widget terminal emulator,
+ 	clear=\E[H\E[J, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
+ 	cup=\E[%p1%d;%p2%dH, cuu1=\E[A, ind=\n, kf5=\EOT, kf6=\EOU,
+-	kf7=\EOV, kf8=\EOW, kf9=\EOX, rmkx=\E[?1l\E>, rmso=\E[m,
+-	smkx=\E[?1h\E, smso=\E[7m, use=vt100+pf1-pf4,
++	kf7=\EOV, kf8=\EOW, kf9=\EOX, rmkx=\E[?1l\E>,
++	smkx=\E[?1h\E, use=ansi+sgrso, use=vt100+pf1-pf4,
+ 
+ ######## APPLE
+ 
+@@ -3462,12 +3461,11 @@
+ # vt52, vt100, vt102 and xterm.
+ nsterm-16color|AppKit Terminal.app v240.2+ with Mac OS X version 10.5,
+ 	bw@, mir, npc,
+-	flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG,
+-	kdch1=\E[3~, kend=\E[F, kf18=\E[22~, kf5=\E[15~,
+-	khome=\E[H, knp=\E[6~, kpp=\E[5~, vpa=\E[%i%p1%dd,
+-	kLFT5=\E[5D, kRIT5=\E[5C, use=ansi+idc, use=vt220+cvis,
+-	use=vt220+sfkeys, use=vt220+ufkeys, use=xterm+alt47,
+-	use=nsterm-c-s-acs,
++	flash=\E[?5h$<200/>\E[?5l, kdch1=\E[3~, kend=\E[F,
++	kf18=\E[22~, kf5=\E[15~, khome=\E[H, knp=\E[6~, kpp=\E[5~,
++	kLFT5=\E[5D, kRIT5=\E[5C, use=ansi+idc, use=ansi+rca2,
++	use=vt220+cvis, use=vt220+sfkeys, use=vt220+ufkeys,
++	use=xterm+alt47, use=nsterm-c-s-acs,
+ 
+ # The versions of Terminal.app in Mac OS X version 10.3.x seem to have
+ # the background color erase feature. The newer version 240.2 in Mac OS X
+@@ -3588,8 +3586,9 @@
+ #
+ # Improved rmso/rmul -TD
+ nsterm-build400|Terminal.app in OS X 10.13,
+-	rmso=\E[27m, rmul=\E[24m, use=xterm+sm+1006,
+-	use=ecma+italics, use=nsterm-build361,
++	use=ecma+underline, use=ecma+standout,
++	use=xterm+sm+1006, use=ecma+italics,
++	use=nsterm-build361,
+ 
+ nsterm-build440|Terminal.app in MacOS 11.6.8,
+ 	use=xterm+alt1049, use=nsterm-build400,
+@@ -3639,19 +3638,19 @@
+ 	wsl#50,
+ 	blink=\E[5m, bold=\E[1m, cub1=^H, cud1=\n,
+ 	cup=\E[%i%p1%d;%p2%dH, el1=\E[1K,
+-	flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG,
+-	kLFT=\E[1;2D, kRIT=\E[1;2C, kbs=^?, kcbt=\E[Z, kdch1=\E[3~,
+-	kend=\EOF, knp=\E[6~, kpp=\E[5~, op=\E[0m, rev=\E[7m, ri=\EM,
+-	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
++	flash=\E[?5h$<200/>\E[?5l, kLFT=\E[1;2D, kRIT=\E[1;2C,
++	kbs=^?, kcbt=\E[Z, kdch1=\E[3~, kend=\EOF, knp=\E[6~,
++	kpp=\E[5~, op=\E[0m, rev=\E[7m, ri=\EM, rmam=\E[?7l,
++	rmkx=\E[?1l\E>,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?
+ 	    %p9%t\016%e\017%;,
+-	sgr0=\E[m\017, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m,
+-	smul=\E[4m, vpa=\E[%i%p1%dd, kEND5=\E[1;5F,
+-	kHOM5=\E[1;5H, use=ansi+apparrows, use=ansi+csr,
+-	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+-	use=ansi+local, use=vt100+4bsd, use=vt100+keypad,
+-	use=vt100+pfkeys, use=xterm+r5+fkeys, use=xterm+alt47,
+-	use=xterm+sl-twm, use=xterm+x11mouse,
++	sgr0=\E[m\017, smam=\E[?7h, smkx=\E[?1h\E=,
++	kEND5=\E[1;5F, kHOM5=\E[1;5H, use=ansi+apparrows,
++	use=ansi+csr, use=ansi+enq, use=ansi+erase, use=ansi+idc,
++	use=ansi+idl, use=ansi+local, use=ansi+rca2,
++	use=ansi+sgrso, use=ansi+sgrul, use=vt100+4bsd,
++	use=vt100+keypad, use=vt100+pfkeys, use=xterm+r5+fkeys,
++	use=xterm+alt47, use=xterm+sl-twm, use=xterm+x11mouse,
+ 	use=xterm+256setaf, use=vt220+cvis,
+ 
+ # iTerm2
+@@ -3745,7 +3744,6 @@
+ 	kf19=\E[18;2~, kf20=\E[19;2~, kf21=\E[20;2~,
+ 	kf22=\E[21;2~, kf23=\E[23;2~, kf24=\E[24;2~,
+ 	kind=\E[1;2B, kri=\E[1;2A, nel=\EE, op=\E[39;49m,
+-	rmso=\E[27m, rmul=\E[24m,
+ 	rs2=\E[!p\E[?3;4l\E[4l\E>\E[?1000l,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
+ 	    %p5%t;2%;m%?%p9%t\016%e\017%;,
+@@ -3758,9 +3756,12 @@
+ 	kLFT6=\E[1;6D, kNXT3=\E\E[6~, kPRV3=\E\E[5~,
+ 	kRIT3=\E\E[C, kRIT4=\E[1;10C, kRIT5=\E[1;5C,
+ 	kRIT6=\E[1;6C, kUP3=\E\E[A, kUP4=\E[1;10A, kUP5=\E[1;5A,
+-	kUP6=\E[1;6A, use=ecma+index, use=xterm+alt+title,
+-	use=ecma+italics, use=iterm, use=bracketed+paste,
+-	use=kitty+setal,
++	kUP6=\E[1;6A, rv=\E\\[>64;[1-6][0-9];0c, smxx=\E[9m,
++	xr=\EP>\\|iTerm2 ([1-9][.0-9])\E\\\\,
++	use=ecma+underline, use=ecma+standout, use=ecma+index,
++	use=report+version, use=report+da2,
++	use=xterm+alt+title, use=ecma+italics, use=iterm,
++	use=bracketed+paste, use=kitty+setal,
+ 
+ # xnuppc - Darwin PowerPC Console (a.k.a. "darwin")
+ #
+@@ -4205,8 +4206,8 @@
+ 	am, bce, bw, ccc, mir, msgr, xenl, xon, XT,
+ 	it#8, ncv#22, U8#1,
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+-	bel=^G, cr=\r, cub1=^H, cud1=\ED, cup=\E[%i%p1%d;%p2%dH,
+-	cuu1=\EM, dch=\E[%p1%dP, dch1=\E[P,
++	bel=^G, cr=\r, cub1=^H, cud1=\ED, cuu1=\EM, dch=\E[%p1%dP,
++	dch1=\E[P,
+ 	dispc=%?%p1%{8}%=%t\E%%G\342\227\230\E%%@%e%p1%{10}%=%t\E%%G
+ 	      \342\227\231\E%%@%e%p1%{12}%=%t\E%%G\342\231\0\E%%@%e
+ 	      %p1%{13}%=%t\E%%G\342\231\252\E%%@%e%p1%{14}%=%t\E%%G
+@@ -4214,24 +4215,23 @@
+ 	      %e%p1%{27}%=%t\E%%G\342\206\220\E%%@%e%p1%{155}%=%t\E
+ 	      %%G\340\202\242\E%%@%e%p1%c%;,
+ 	ech=\E[%p1%dX, el1=\E[1K, enacs=\E(B\E)0,
+-	flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
+-	ind=\n,
++	flash=\E[?5h$<100/>\E[?5l, ind=\n,
+ 	initc=\E]P%p1%x%p2%{255}%*%{1000}%/%02x%p3%{255}%*%{1000}%/
+ 	      %02x%p4%{255}%*%{1000}%/%02x,
+ 	is2=\E7\E[r\E[m\E[?7h\E[?1;4;6l\E[4l\E8\E>\E]R,
+ 	kbs=^?, kcbt=\E[Z, khome=\E[1~, kind=\E[B, kri=\E[A, kspd=^Z,
+ 	nel=\r\n, oc=\E]R, op=\E[39;49m, ri=\EM, rmacs=^O,
+-	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
+-	rmul=\E[24m,
++	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>,
+ 	rs2=\E<\E["p\E[50;6"p\Ec\E[?3l\E]R\E[?1000l,
+ 	s0ds=\E[10m, s1ds=\E[11m, s2ds=\E[12m,
+ 	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, smam=\E[?7h, smir=\E[4h,
+-	smkx=\E[?1h\E=, vpa=\E[%i%p1%dd, E3=\E[3J,
+-	use=ansi+apparrows, use=ansi+csr, use=ansi+erase,
+-	use=ansi+idl, use=ansi+local, use=ansi+tabs,
+-	use=ansi+rep, use=bracketed+paste, use=ecma+index,
++	smkx=\E[?1h\E=, E3=\E[3J, use=ecma+underline,
++	use=ecma+standout, use=ansi+apparrows, use=ansi+csr,
++	use=ansi+cup, use=ansi+erase, use=ansi+idl,
++	use=ansi+local, use=ansi+tabs, use=ansi+rep,
++	use=bracketed+paste, use=ecma+index, use=ansi+rca2,
+ 	use=ecma+strikeout, use=klone+color, use=klone+sgr,
+ 	use=putty+cursor, use=putty+fnkeys, use=vt220+pcedit,
+ 	use=xterm+alt1049, use=vt102+enq, use=xterm+sm+1006,
+@@ -4433,14 +4433,13 @@
+ 	blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cuf1=\E[C,
+ 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP,
+ 	dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
+-	flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG,
+-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf6=\E[17~,
+-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, op=\E[100m, rev=\E[7m,
+-	ri=\EM, rmso=\E[27m, rmul=\E[24m, sgr0=\E[0m\017,
+-	smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd,
+-	use=xterm+r5+lockeys, use=ansi+idl, use=vt220+vtedit,
+-	use=vt100+enq, use=klone+color, use=vt100,
+-	use=vt220+cvis, use=vt220+sfkeys,
++	flash=\E[?5h$<200/>\E[?5l, kf10=\E[21~, kf11=\E[23~,
++	kf12=\E[24~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
++	kf9=\E[20~, op=\E[100m, rev=\E[7m, ri=\EM, sgr0=\E[0m\017,
++	smul=\E[4m, use=ecma+underline, use=ecma+standout,
++	use=ansi+idl, use=ansi+rca2, use=vt100+enq,
++	use=klone+color, use=vt220+cvis, use=vt220+vtedit,
++	use=vt220+sfkeys, use=xterm+r5+lockeys, use=vt100,
+ 
+ # Version 4.59 has regular VT100 line-drawing (so it is no longer necessary
+ # to choose a Windows OEM font).
+@@ -4571,8 +4570,8 @@
+ #
+ # The cnorm/civis definitions added in 2015 are unrelated to any standard.
+ ms-vt100-16color|VT-UTF-8 and VT100+,
+-	civis=\E[?h, cnorm=\E[?l, rmso=\E[27m, rmul=\E[24m,
+-	use=ibm+16color, use=ms-vt100+,
++	civis=\E[?h, cnorm=\E[?l, use=ecma+underline,
++	use=ecma+standout, use=ibm+16color, use=ms-vt100+,
+ 
+ # Based on
+ # https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences
+@@ -4824,10 +4823,11 @@
+ # - color-palette cannot be changed
+ vscode|xterm.js|Visual Studio Code terminal using xterm.js,
+ 	npc,
+-	kcbt=\E[Z, rmkx=\E[?1l, smkx=\E[?1h, use=linux+kbs,
+-	use=xterm+256setaf, use=ecma+index, use=xterm+focus,
+-	use=xterm+sm+1006, use=xterm+pcfkeys, use=ecma+italics,
+-	use=xterm-basic, use=bracketed+paste,
++	kcbt=\E[Z, rmkx=\E[?1l, smkx=\E[?1h, rv=\E\\[>0;276;0c,
++	use=linux+kbs, use=report+da2, use=xterm+256setaf,
++	use=ecma+index, use=xterm+focus, use=xterm+sm+1006,
++	use=xterm+pcfkeys, use=ecma+italics, use=xterm-basic,
++	use=bracketed+paste,
+ vscode-direct|Visual Studio Code with direct-colors,
+ 	use=xterm+indirect, use=vscode,
+ 
+@@ -4853,14 +4853,13 @@
+ 	OTbs, am, km, mir, msgr, xenl, xon,
+ 	cols#80, it#8, lines#65,
+ 	bold=\E[1m, clear=\E[H\E[2J, csr=\E[%i%p1%d;%p2%dr,
+-	cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+-	cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, ed=\E[J, el=\E[K,
+-	home=\E[H, ht=^I, ind=\n, is2=\E\E[m\E[?7h\E[?1;4l, kbs=^H,
+-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, rev=\E[7m,
+-	ri=\EM, rmam=\E[?7l, 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, use=ansi+idl,
+-	use=vt100+pf1-pf4,
++	cub1=^H, cud1=\n, cuf1=\E[C, cuu1=\E[A, dch=\E[%p1%dP,
++	dch1=\E[P, ed=\E[J, el=\E[K, ht=^I, ind=\n,
++	is2=\E\E[m\E[?7h\E[?1;4l, kbs=^H, kcub1=\EOD, kcud1=\EOB,
++	kcuf1=\EOC, kcuu1=\EOA, rev=\E[7m, ri=\EM, rmam=\E[?7l,
++	rmir=\E[4l, rmkx=\E[?1l\E>, sgr0=\E[m, smam=\E[?7h,
++	smir=\E[4h, smkx=\E[?1h\E=, use=ansi+cup, use=ansi+idl,
++	use=ansi+sgrso, use=ansi+sgrul, use=vt100+pf1-pf4,
+ 
+ # csl is extension which clears the status line
+ x10term+sl|status-line for X10 xterm,
+@@ -4876,17 +4875,17 @@
+ 	OTbs, am, km, msgr, xenl,
+ 	cols#80, it#8, lines#24,
+ 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+-	cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+-	hts=\EH, ind=\n, kdl1=\E[31~, kel=\E[8~, kf0=\EOq,
+-	khome=\E[1~, kil1=\E[30~, kmous=\E[M, rev=\E[7m, ri=\EM,
+-	rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
++	ed=\E[J, el=\E[K, ht=^I, hts=\EH, ind=\n, kdl1=\E[31~,
++	kel=\E[8~, kf0=\EOq, khome=\E[1~, kil1=\E[30~, kmous=\E[M,
++	rev=\E[7m, ri=\EM, rmkx=\E[?1l\E>,
+ 	rs2=\E>\E[?1;3;4;5;6l\E[4l\E[?7h\E[m\E[r\E[2J\E[H,
+ 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
+ 	    %;m,
+-	sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+-	tbc=\E[3g, use=xterm+kbs, use=ansi+apparrows,
+-	use=ansi+csr, use=ansi+idc, use=ansi+idl, use=ansi+local,
+-	use=vt220+pcedit, use=vt100+enq, use=xterm+r5+fkeys,
++	sgr0=\E[m, smkx=\E[?1h\E=, tbc=\E[3g, use=xterm+kbs,
++	use=ansi+apparrows, use=ansi+csr, use=ansi+cup,
++	use=ansi+idc, use=ansi+idl, use=ansi+local,
++	use=ansi+sgrso, use=ansi+sgrul, use=vt220+pcedit,
++	use=vt100+enq, use=xterm+r5+fkeys,
+ 
+ # X11R5 used function-keys based on, but different from VT220, assigning keys
+ # F1-R5 (unlike VT220), and limiting to F12 (perhaps influenced by other
+@@ -4937,14 +4936,12 @@
+ 	cols#80, lines#24, ncv@,
+ 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+-	cup=\E[%i%p1%d;%p2%dH, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
+-	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l,
+-	home=\E[H, hpa=\E[%i%p1%dG, ind=\n,
++	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0,
++	flash=\E[?5h$<100/>\E[?5l, ind=\n,
+ 	is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>,
+ 	kbeg=\EOE, kbs=^?, kdch1=^?, kend=\EOF, kfnd=\E[1~,
+ 	kmous=\E[M, kslt=\E[4~, meml=\El, memu=\Em, rev=\E[7m,
+-	ri=\EM, rmacs=^O, rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m,
+-	rmul=\E[24m, rs1=^O,
++	ri=\EM, rmacs=^O, rmam=\E[?7l, rmkx=\E[?1l\E>, rs1=^O,
+ 	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>,
+ 	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
+ 	     %=%t3%e%p1%d%;m,
+@@ -4953,12 +4950,13 @@
+ 	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, smam=\E[?7h, smkx=\E[?1h\E=,
+-	smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd,
+-	use=ansi+apparrows, use=ansi+csr, use=ansi+idc,
+-	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+-	use=xterm+alt47, use=xterm+kbs, use=vt100+enq,
+-	use=xterm+r5+fkeys, use=ecma+color, use=vt220+cvis,
+-	use=vt220+keypad, use=vt220+pcedit, use=vt220+sfkeys,
++	smul=\E[4m, use=ecma+underline, use=ecma+standout,
++	use=ansi+apparrows, use=ansi+csr, use=ansi+cup,
++	use=ansi+idc, use=ansi+idl, use=ansi+inittabs,
++	use=ansi+local, use=ansi+rca2, use=xterm+alt47,
++	use=xterm+kbs, use=vt100+enq, use=xterm+r5+fkeys,
++	use=ecma+color, use=vt220+cvis, use=vt220+keypad,
++	use=vt220+pcedit, use=vt220+sfkeys,
+ 
+ # This is the stock xterm entry supplied with XFree86 3.3, which uses VT100
+ # codes for F1-F4 except while in VT220 mode.
+@@ -5019,7 +5017,7 @@
+ att610+cvis0|AT&T 610 cursor-visibility,
+ 	civis=\E[?25l, cnorm=\E[?12l\E[?25h,
+ att610+cvis|AT&T 610 cursor-visibility with blink,
+-	civis=\E[?25l, cnorm=\E[?12l\E[?25h, cvvis=\E[?12;25h,
++	cvvis=\E[?12;25h, use=att610+cvis0,
+ 
+ # This version was released in XFree86 4.4.
+ xterm-xf86-v44|xterm terminal emulator (XFree86 4.4 Window System),
+@@ -5036,8 +5034,8 @@
+ 	use=xterm+keypad, use=xterm-basic,
+ 
+ xterm-p370|xterm patch #370,
+-	rv=\E\\[41;[1-6][0-9][0-9];0c,
+-	xr=\EP>\\|XTerm\\([1-9][0-9]+\\)\E\\\\,
++	rv=\E\\[>41;[1-6][0-9][0-9];0c,
++	xr=\EP>\\|XTerm\\(([1-9][0-9]+)\\)\E\\\\,
+ 	use=ecma+index, use=ansi+rep, use=ecma+strikeout,
+ 	use=xterm+pcfkeys, use=xterm+nofkeys,
+ 	use=bracketed+paste, use=report+version,
+@@ -5327,14 +5325,13 @@
+ 	OTbs, am, bce, mir, msgr, xenl, AX, XT,
+ 	colors#8, cols#80, lines#24, pairs#64,
+ 	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+-	dim=\E[2m, 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,
++	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX,
++	ed=\E[J, el=\E[K, el1=\E[1K, flash=\E[?5h$<100/>\E[?5l,
+ 	ich=\E[%p1%d@, ind=\n, is2=\E[!p\E[?3;4l\E[4l\E>,
+ 	kmous=\E[M, meml=\El, memu=\Em, op=\E[39;49m, ri=\EM,
+-	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
+-	rmul=\E[24m, rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>,
+-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
++	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rs1=\Ec,
++	rs2=\E[!p\E[?3;4l\E[4l\E>, setab=\E[4%p1%dm,
++	setaf=\E[3%p1%dm,
+ 	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
+ 	     %=%t3%e%p1%d%;m,
+ 	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
+@@ -5342,9 +5339,10 @@
+ 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
+ 	    %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
+ 	sgr0=\E(B\E[m, smam=\E[?7h, smir=\E[4h, smkx=\E[?1h\E=,
+-	vpa=\E[%i%p1%dd, E3=\E[3J, use=ansi+csr, use=ansi+enq,
+-	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+-	use=ansi+pp, use=ansi+sgrbold, use=xterm+kbs,
++	E3=\E[3J, use=ecma+underline, use=ecma+standout,
++	use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+idl,
++	use=ansi+inittabs, use=ansi+local, use=ansi+pp,
++	use=ansi+rca2, use=ansi+sgrbold, use=xterm+kbs,
+ 	use=xterm+alt+title, use=att610+cvis, use=xterm+acs,
+ 	use=xterm+meta,
+ 
+@@ -5819,6 +5817,8 @@
+ # The response is a DSR sequence identifying the version: DCS > | text ST
+ # For example:
+ #	^[P>|XTerm(354)^[\
++# tack expects this string to be a regular expression, so some characters such
++# as "|" are escaped.
+ report+version|Report xterm name and version (XTVERSION),
+ 	XR=\E[>0q, xr=\EP>\\|[ -~]+\E\\\\, use=report+da2,
+ 
+@@ -5827,8 +5827,10 @@
+ # - the second as the patch number for xterm, and
+ # - the third parameter as zero.
+ # Other terminals may provide useful responses, though few are documented.
++# Some are hardcoded to match some (usually old) version of xterm.  For the
++# others, rv is a regular expression which tack can match.
+ report+da2|report secondary device attributes (DA2),
+-	RV=\E[>c, rv=\E\\[[0-9]+;[0-9]+;[0-9]+c,
++	RV=\E[>c, rv=\E\\[>[0-9]+;[0-9]+;[0-9]+c,
+ 
+ #### XTERM Mouse
+ # The xterm mouse protocol is used by other terminal emulators.
+@@ -6074,20 +6076,20 @@
+ 	cols#80, it#8, lines#65, ncv@,
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, ed=\E[J,
+-	el=\E[K, el1=\E[1K, enacs=\E(B\E)0, home=\E[H, ht=^I,
+-	ich=\E[%p1%d@, ind=\n, is1=\E[r\E[m\E[?7h\E[?4;6l\E[4l,
+-	kend=\E[8~, khome=\E[7~, kich1=\E[2~, kmous=\E[M,
+-	knp=\E[6~, kpp=\E[5~, rev=\E[7m, ri=\EM, rmacs=^O,
+-	rmam=\E[?7l, rmcup=\E>\E[?41;1r, rmir=\E[4l, rmso=\E[27m,
+-	rmul=\E[24m,
++	dch=\E[%p1%dP, dch1=\E[P, ed=\E[J, el=\E[K, el1=\E[1K,
++	enacs=\E(B\E)0, ht=^I, ich=\E[%p1%d@, ind=\n,
++	is1=\E[r\E[m\E[?7h\E[?4;6l\E[4l, kend=\E[8~,
++	khome=\E[7~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~,
++	rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l,
++	rmcup=\E>\E[?41;1r, rmir=\E[4l,
+ 	rs1=\E(B\017\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E<,
+ 	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[0m\017, smacs=^N, smam=\E[?7h,
+-	smcup=\E[?1;41s\E[?1;41h\E=, smir=\E[4h, smso=\E[7m,
+-	smul=\E[4m, use=xterm+r5+fkeys, use=ansi+apparrows,
+-	use=ansi+csr, use=ansi+idl, use=ansi+local,
++	smcup=\E[?1;41s\E[?1;41h\E=, smir=\E[4h, smul=\E[4m,
++	use=ecma+underline, use=ecma+standout,
++	use=xterm+r5+fkeys, use=ansi+apparrows, use=ansi+csr,
++	use=ansi+cup, use=ansi+idl, use=ansi+local,
+ 	use=decid+cpr, use=ecma+color, use=vt220+keypad,
+ 
+ # The IRAF source has a terminfo using "xterm-r5", but line-drawing does not
+@@ -6214,9 +6216,9 @@
+ # bce and msgr are repaired.
+ gnome-rh90|GNOME Terminal in RedHat 9,
+ 	bce, msgr, XT,
+-	hpa=\E[%i%p1%dG, kLFT=\EO2D, kRIT=\EO2C, kb2=\E[E,
+-	kcbt=\E[Z, tbc=\E[3g, vpa=\E[%i%p1%dd, use=xterm+pcf0,
+-	use=xterm+pcfkeys, use=gnome-rh80,
++	kLFT=\EO2D, kRIT=\EO2C, kb2=\E[E, kcbt=\E[Z, tbc=\E[3g,
++	use=ansi+rca2, use=xterm+pcf0, use=xterm+pcfkeys,
++	use=gnome-rh80,
+ 
+ # GNOME Terminal 2.14.2 (Fedora Core 5)
+ # Ed Catmur notes that gnome-terminal has recognized soft-reset since May 2002.
+@@ -6259,9 +6261,10 @@
+ # Testing with tack shows that flash does not/has not worked -TD
+ vte-2012|VTE 0.34.1,
+ 	ncv#16,
+-	dim=\E[2m, flash@, invis=\E[8m, rmso=\E[27m, rmul=\E[24m,
++	dim=\E[2m, flash@, invis=\E[8m,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p5%t;2%;%?%p7%t;8%;%?%p1%p3
+ 	    %|%t;7%;m%?%p9%t\016%e\017%;,
++	use=ecma+underline, use=ecma+standout,
+ 	use=ecma+italics, use=vte-2008,
+ # Version 3.6.1 sets TERM to xterm-256color (still hardcoded), which has
+ # 61 differences from a correct entry for gnome terminal.
+@@ -6353,8 +6356,12 @@
+ # - AT&T cursor-blinking
+ # - meta mode, as documented in terminfo(5)
+ # - xterm's extension to clear scrollback
++vte-2022|VTE aka GNOME Terminal,
++	xr=\EP>\\|VTE\\(([0-9])\\)\E\\\\, use=report+version,
++	use=report+da2, use=vte-2018,
++
+ vte|VTE aka GNOME Terminal,
+-	use=vte-2018,
++	use=vte-2022,
+ 
+ vte-256color|VTE with xterm 256-colors,
+ 	use=xterm+256color, use=vte,
+@@ -6417,22 +6424,21 @@
+ 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
+ 	     yzz{{||}}~~,
+ 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+-	cup=\E[%i%p1%d;%p2%dH, 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, ind=\n, invis=\E[8m,
+-	is2=\E[!p\E[?3;4l\E[4l\E>, kb2=\EOE, kbs=^?, kcbt=\E[Z,
++	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
++	flash=\E[?5h$<100/>\E[?5l, ind=\n, invis=\E[8m,
++	is2=\E[!p\E[?3;4l\E[4l\E>, kb2=\EOE, kcbt=\E[Z,
+ 	kent=\EOM, kmous=\E[M, rev=\E[7m, ri=\EM, rmacs=\E(B,
+-	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
+-	rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>,
++	rmam=\E[?7l, rmkx=\E[?1l\E>, rs1=\Ec,
++	rs2=\E[!p\E[?3;4l\E[4l\E>,
+ 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
+ 	    %t;7%;%?%p7%t;8%;m,
+ 	sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=,
+-	smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd, use=ansi+csr,
+-	use=ansi+enq, use=ansi+idc, use=ansi+idl,
+-	use=ansi+inittabs, use=ecma+index, use=ecma+italics,
+-	use=ansi+local, use=xterm+alt1049, use=xterm+256color,
+-	use=ecma+color, use=vt220+cvis, use=xterm+pcfkeys,
+-	use=xterm+sl-twm,
++	use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+idc,
++	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
++	use=ansi+rca2, use=ecma+index, use=ecma+italics,
++	use=ecma+underline, use=ecma+standout, use=linux+kbs,
++	use=xterm+alt1049, use=xterm+256color, use=ecma+color,
++	use=vt220+cvis, use=xterm+pcfkeys, use=xterm+sl-twm,
+ 
+ #### Other GNOME
+ # Multi-GNOME-Terminal 1.6.2
+@@ -6506,15 +6512,16 @@
+ konsole-base|KDE console window (common),
+ 	bce, km@, npc, XT,
+ 	ncv@,
+-	ech=\E[%p1%dX, flash=\E[?5h$<100/>\E[?5l,
+-	hpa=\E[%i%p1%dG, kend=\E[4~, kf1@, kf10@, kf11@, kf12@, kf13@,
+-	kf14@, kf15@, kf16@, kf17@, kf18@, kf19@, kf2@, kf20@, kf3@, kf4@,
+-	kf5@, kf6@, kf7@, kf8@, kf9@, kfnd@, khome=\E[1~, kslt@,
+-	rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
++	ech=\E[%p1%dX, flash=\E[?5h$<100/>\E[?5l, kend=\E[4~,
++	kf1@, kf10@, kf11@, kf12@, kf13@, kf14@, kf15@, kf16@, kf17@, kf18@,
++	kf19@, kf2@, kf20@, kf3@, kf4@, kf5@, kf6@, kf7@, kf8@, kf9@, kfnd@,
++	khome=\E[1~, kslt@, rmam=\E[?7l, rs1=\Ec,
+ 	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?25h,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
+ 	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+-	sgr0=\E[0m\017, smam=\E[?7h, vpa=\E[%i%p1%dd,
++	sgr0=\E[0m\017, smam=\E[?7h, rv=\E\\[>1;115;0c,
++	xr=\EP>\\|Konsole ([1-9][.0-9])\E\\\\,
++	use=ecma+underline, use=ecma+standout, use=ansi+rca2,
+ 	use=ansi+sgrdim, use=ecma+index, use=xterm+focus,
+ 	use=xterm+sm+1006, use=ecma+strikeout,
+ 	use=ecma+italics, use=ecma+color, use=xterm-r6,
+@@ -6704,25 +6711,25 @@
+ 	colors#8, cols#80, lines#24, pairs#64,
+ 	acsc=00``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+-	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=,
+-	home=\E[H, hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ind=\n,
++	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
++	el1=\E[1K, enacs=, ich=\E[%p1%d@, ind=\n,
+ 	is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^?,
+ 	kcbt=\E[Z, kend=\EOF, kent=\EOM, kind=\EO1;2B, kmous=\E[M,
+ 	kri=\EO1;2A, mc0=\E[i, nel=\EE, op=\E[39;49m, rev=\E[7m,
+ 	ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l,
+-	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
++	rmkx=\E[?1l\E>, rs1=\Ec,
+ 	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l,
+ 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+ 	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, smir=\E[4h,
+-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, u8=\E[?1;2c,
+-	vpa=\E[%i%p1%dd, use=ansi+apparrows, use=ansi+csr,
++	smkx=\E[?1h\E=, smul=\E[4m, u8=\E[?1;2c,
++	use=ecma+underline, use=ecma+standout,
++	use=ansi+apparrows, use=ansi+csr, use=ansi+cup,
+ 	use=ansi+enq, use=ansi+idl, use=ansi+inittabs,
+-	use=ansi+local, use=vt220+vtedit, use=xterm+alt1049,
+-	use=ecma+index, use=mlterm+pcfkeys, use=vt220+cvis,
+-	use=xterm+r6f2,
++	use=ansi+local, use=ansi+rca2, use=vt220+vtedit,
++	use=xterm+alt1049, use=ecma+index, use=mlterm+pcfkeys,
++	use=vt220+cvis, use=xterm+r6f2,
+ 
+ # The insert/delete/home/end keys do not respond to modifiers because mlterm
+ # looks in its termcap to decide which string to send.  If it used terminfo
+@@ -6771,17 +6778,18 @@
+ 	is1=\E[?47l\E=\E[?1l,
+ 	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l,
+ 	kcbt=\E[Z, kmous=\E[M, rev=\E[7m, ri=\EM, rmir=\E[4l,
+-	rmkx=\E>, rmso=\E[27m, rmul=\E[24m,
++	rmkx=\E>,
+ 	rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
+ 	rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?
+ 	    25h,
+ 	s0ds=\E(B, s1ds=\E(0,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?
+ 	    %p9%t\016%e\017%;,
+-	sgr0=\E[0m\017, smir=\E[4h, smkx=\E=, smso=\E[7m,
+-	smul=\E[4m, use=ansi+csr, use=ansi+idl, use=ansi+local,
+-	use=xterm+alt47, use=vt100+enq, use=vt100+4bsd,
+-	use=rxvt+pcfkeys, use=vt220+cvis, use=vt220+keypad,
++	sgr0=\E[0m\017, smir=\E[4h, smkx=\E=, smul=\E[4m,
++	use=ecma+underline, use=ecma+standout, use=ansi+csr,
++	use=ansi+idl, use=ansi+local, use=xterm+alt47,
++	use=vt100+enq, use=vt100+4bsd, use=rxvt+pcfkeys,
++	use=vt220+cvis, use=vt220+keypad,
+ 
+ # Key Codes from rxvt reference:
+ #
+@@ -6929,8 +6937,8 @@
+ # with the default background color.
+ rxvt|rxvt-color|rxvt terminal emulator (X Window System),
+ 	ncv@,
+-	hpa=\E[%i%p1%dG, kf0=\E[21~, sgr0=\E[m\017,
+-	vpa=\E[%i%p1%dd, use=rxvt-basic, use=ecma+color,
++	kf0=\E[21~, sgr0=\E[m\017, use=ansi+rca2, use=rxvt-basic,
++	use=ecma+color,
+ rxvt-256color|rxvt 2.7.9 with xterm 256-colors,
+ 	use=xterm+256color, use=rxvt,
+ rxvt-88color|rxvt 2.7.9 with xterm 88-colors,
+@@ -7004,22 +7012,21 @@
+ 	blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cub1=^H,
+ 	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+ 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
+-	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, is1=\E[?47l\E>\E[?1l,
++	ich=\E[%p1%d@, is1=\E[?47l\E>\E[?1l,
+ 	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kNXT@,
+ 	kPRV@, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, kbeg=\EOu, kc1=\E[8~,
+ 	kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M, mc4=\E[4i,
+ 	mc5=\E[5i, rev=\E[7m, ri=\EM, rmam=\E[?7l, rmir=\E[4l, rmkx=,
+-	rmso=\E[27m, rmul=\E[24m,
+ 	rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
+ 	rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?
+ 	    25h,
+ 	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, smam=\E[?7h, smir=\E[4h, smkx=, smso=\E[7m,
+-	smul=\E[4m, vpa=\E[%i%p1%dd, use=ansi+csr, use=ansi+idl,
+-	use=ansi+local, use=xterm+alt47, use=vt100+enq,
+-	use=rxvt+pcfkeys, use=ecma+color, use=vt100+4bsd,
+-	use=vt220+cvis,
++	sgr0=\E[m\017, smam=\E[?7h, smir=\E[4h, smkx=, smul=\E[4m,
++	use=ecma+underline, use=ecma+standout, use=ansi+csr,
++	use=ansi+idl, use=ansi+local, use=ansi+rca2,
++	use=xterm+alt47, use=vt100+enq, use=rxvt+pcfkeys,
++	use=ecma+color, use=vt100+4bsd, use=vt220+cvis,
+ 
+ Eterm-256color|Eterm with xterm 256-colors,
+ 	use=xterm+256color, use=Eterm,
+@@ -7165,10 +7172,9 @@
+ 	cols#80, it#8, lines#24, vt#200,
+ 	acsc=aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
+ 	blink=\E[0;5m, bold=\E[0;1m, clear=\E[2J\E[H, cr=\r,
+-	cub1=\E[1D, cud1=\E[1B, cuf1=\E[1C,
+-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[1A, dch=\E[%p1%dP,
+-	dch1=\E[1P, dl=\E[%p1%dM, dl1=\E[1M, ed=\E[0J, el=\E[0K,
+-	el1=\E[1K, enacs=\E)0, home=\E[H, ht=^I, hts=\EH,
++	cub1=\E[1D, cud1=\E[1B, cuf1=\E[1C, cuu1=\E[1A,
++	dch=\E[%p1%dP, dch1=\E[1P, dl=\E[%p1%dM, dl1=\E[1M,
++	ed=\E[0J, el=\E[0K, el1=\E[1K, enacs=\E)0, ht=^I, hts=\EH,
+ 	if=/usr/share/tabset/vt300, il=\E[%p1%dL, il1=\E[1L,
+ 	ind=\ED, is2=\E>\E[?1l\E[?3l\E[4l\E[?7h, kbs=^H,
+ 	kcmd=\E[29~, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
+@@ -7185,7 +7191,8 @@
+ 	    2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smcup=\E[?1l\E=, smkx=\E=,
+ 	smso=\E[0;7m, smul=\E[0;4m, tbc=\E[3g, use=ansi+csr,
+-	use=ansi+local, use=vt220+vtedit, use=vt220+cvis,
++	use=ansi+cup, use=ansi+local, use=vt220+vtedit,
++	use=vt220+cvis,
+ 
+ #### MVTERM
+ # A commercial product, Reportedly a version of Xterm with an OPEN LOOK UI,
+@@ -7205,13 +7212,13 @@
+ 	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, ed=\E[J,
+ 	el=\E[K, ich=\E[%p1%d@, ich1=\E[@, kcub1=\EOD, kcud1=\EOB,
+ 	kcuf1=\EOC, kcuu1=\EOA, op=\E[100m, rev=\E[7m, ri=\EM,
+-	rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
++	rmkx=\E[?1l\E>, rmso=\E[m,
+ 	rs2=\E>\E[1;3;4;5;6l\E[?7h\E[100m\E[m\E[r\E[2J\E[H,
+ 	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, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+-	use=ansi+csr, use=ansi+idl, use=ansi+local,
++	sgr0=\E[m\017, smkx=\E[?1h\E=, smso=\E[7m, use=ansi+csr,
++	use=ansi+idl, use=ansi+local, use=ansi+sgrul,
+ 	use=xterm+alt47, use=vt100+fnkeys, use=vt100+4bsd,
+ 	use=x10term+sl,
+ 
+@@ -7224,15 +7231,15 @@
+ 	am, bw, mir, msgr,
+ 	it#8,
+ 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+-	bel=^G, cr=\r, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
+-	dim=\E[2m, ech=\E[%p1%dX, home=\E[H, hpa=\E[%i%p1%d`,
+-	ht=^I, ich1=, ind=\E[S, is2=\E)0\017, kbs=^H, nel=\EE, ri=\E[T,
+-	rmacs=^O, rmso=\E[27m, rmul=\E[24m,
++	bel=^G, cr=\r, dch=\E[%p1%dP, dim=\E[2m, ech=\E[%p1%dX,
++	hpa=\E[%i%p1%d`, ht=^I, ich1=, ind=\E[S, is2=\E)0\017,
++	kbs=^H, nel=\EE, ri=\E[T, rmacs=^O,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
+ 	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+-	sgr0=\E[m\017, smacs=^N, vpa=\E[%i%p1%dd, use=ansi+erase,
+-	use=ansi+idc1, use=ansi+idl, use=ansi+local,
+-	use=ansi+sgrbold, use=ecma+index,
++	sgr0=\E[m\017, smacs=^N, vpa=\E[%i%p1%dd,
++	use=ecma+underline, use=ecma+standout, use=ansi+cup,
++	use=ansi+erase, use=ansi+idc1, use=ansi+idl,
++	use=ansi+local, use=ansi+sgrbold, use=ecma+index,
+ 
+ # mterm normally sets $TERM to "mterm"
+ mterm|mouse-sun|Der Mouse term,
+@@ -7249,21 +7256,20 @@
+ 	am, mir, msgr, xenl,
+ 	colors#8, it#8, pairs#64,
+ 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+-	bel=^G, cr=\r, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
+-	dim=\E[2m, ech=\E[%p1%dX, enacs=\E(B\E)0, home=\E[H,
+-	hpa=\E[%i%p1%d`, ht=^I, ich1=, ind=\E[S, is2=\E)0\E[r\017,
+-	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+-	nel=\EE, op=\E[0m, ri=\E[T, rmacs=^O, rmam=\E[?7l,
+-	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
+-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
++	bel=^G, cr=\r, dch=\E[%p1%dP, dim=\E[2m, ech=\E[%p1%dX,
++	enacs=\E(B\E)0, hpa=\E[%i%p1%d`, ht=^I, ich1=, ind=\E[S,
++	is2=\E)0\E[r\017, kbs=^H, kcub1=\EOD, kcud1=\EOB,
++	kcuf1=\EOC, kcuu1=\EOA, nel=\EE, op=\E[0m, ri=\E[T, rmacs=^O,
++	rmam=\E[?7l, rmkx=\E[?1l\E>, setab=\E[4%p1%dm,
++	setaf=\E[3%p1%dm,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
+ 	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=,
+-	vpa=\E[%i%p1%dd, use=ansi+cpr, use=ansi+csr,
+-	use=ansi+erase, use=ansi+idc1, use=ansi+idl,
+-	use=ansi+local, use=ansi+sgrbold, use=vt220+vtedit,
+-	use=ecma+index, use=vt220+cvis, use=vt220+sfkeys,
+-	use=xterm+r5+fkeys,
++	vpa=\E[%i%p1%dd, use=ecma+underline, use=ecma+standout,
++	use=ansi+cpr, use=ansi+csr, use=ansi+cup, use=ansi+erase,
++	use=ansi+idc1, use=ansi+idl, use=ansi+local,
++	use=ansi+sgrbold, use=vt220+vtedit, use=ecma+index,
++	use=vt220+cvis, use=vt220+sfkeys, use=xterm+r5+fkeys,
+ 
+ #### VWM
+ # http://vwm.sourceforge.net/
+@@ -7275,11 +7281,10 @@
+ 	am, bce, ccc, mir, msgr, npc, xenl, xon,
+ 	colors#8, pairs#64,
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+-	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
+-	cvvis=\E[?25h, dim=\E[2m, home=\E[H, il1=\E[L, ind=\n,
+-	kdch1=\E[3~, kend=\E[4~, kf11=\E[22~, kf12=\E[23~,
+-	khome=\E[1~, knp=\E[6~, kpp=\E[5~, rmam=\E[?7l,
+-	rs1=\E[H\E[J\E[m\Ec, setab=\E[4%p1%dm,
++	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cvvis=\E[?25h, dim=\E[2m,
++	il1=\E[L, ind=\n, kdch1=\E[3~, kend=\E[4~, kf11=\E[22~,
++	kf12=\E[23~, khome=\E[1~, knp=\E[6~, kpp=\E[5~,
++	rmam=\E[?7l, rs1=\E[H\E[J\E[m\Ec, setab=\E[4%p1%dm,
+ 	setaf=\E[3%p1%dm,
+ 	sgr=\E[0;10%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
+ 	    %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
+@@ -7420,18 +7425,17 @@
+ 	clear=\E[H\E[2J, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
+ 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX,
+ 	ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
+-	flash=\E[?5h$<100/>\E[?5l, hpa=\E[%i%p1%dG,
+-	ich=\E[%p1%d@, is2=\E[4l\E>\E[?1034l, kDC=\E[3;2~,
+-	kEND=\E[1;2F, kHOM=\E[1;2H, kIC=\E[2;2~, kLFT=\E[1;2D,
+-	kNXT=\E[6;2~, kPRV=\E[5;2~, kRIT=\E[1;2C, ka1=\E[1~,
+-	ka3=\E[5~, kb2=\EOu, kbs=^?, kc1=\E[4~, kc3=\E[6~, kcbt=\E[Z,
+-	kclr=\E[3;5~, kdl1=\E[3;2~, ked=\E[1;5F, kel=\E[1;2F,
+-	khome=\E[1~, kil1=\E[2;5~, kind=\E[1;2B, kmous=\E[M,
+-	kri=\E[1;2A, krmir=\E[2;2~, mc0=\E[i, mc4=\E[4i, mc5=\E[5i,
++	flash=\E[?5h$<100/>\E[?5l, ich=\E[%p1%d@,
++	is2=\E[4l\E>\E[?1034l, kDC=\E[3;2~, kEND=\E[1;2F,
++	kHOM=\E[1;2H, kIC=\E[2;2~, kLFT=\E[1;2D, kNXT=\E[6;2~,
++	kPRV=\E[5;2~, kRIT=\E[1;2C, ka1=\E[1~, ka3=\E[5~, kb2=\EOu,
++	kbs=^?, kc1=\E[4~, kc3=\E[6~, kcbt=\E[Z, kclr=\E[3;5~,
++	kdl1=\E[3;2~, ked=\E[1;5F, kel=\E[1;2F, khome=\E[1~,
++	kil1=\E[2;5~, kind=\E[1;2B, kmous=\E[M, kri=\E[1;2A,
++	krmir=\E[2;2~, mc0=\E[i, mc4=\E[4i, mc5=\E[5i,
+ 	op=\E[39;49m, ri=\EM, rmacs=\E(B, rmir=\E[4l,
+-	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
+-	rs2=\E[4l\E>\E[?1034l, setab=\E[4%p1%dm,
+-	setaf=\E[3%p1%dm,
++	rmkx=\E[?1l\E>, rs1=\Ec, rs2=\E[4l\E>\E[?1034l,
++	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+ 	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
+ 	     %=%t3%e%p1%d%;m,
+ 	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
+@@ -7439,14 +7443,14 @@
+ 	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,
+ 	smacs=\E(0, smir=\E[4h, smkx=\E[?1h\E=, u8=\E[?1;2c,
+-	vpa=\E[%i%p1%dd, Se=\E[2 q, Ss=\E[%p1%d q,
+-	use=ansi+apparrows, use=ansi+csr, use=ansi+enq,
+-	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+-	use=ansi+sgrbold, use=vt100+4bsd, use=vt100+pfkeys,
+-	use=vt220+pcedit, use=ecma+index, use=xterm+alt1049,
+-	use=vt220+cvis, use=xterm+sl, use=ecma+italics,
+-	use=ecma+strikeout, use=bracketed+paste,
+-	use=xterm+pcf2,
++	Se=\E[2 q, Ss=\E[%p1%d q, use=ecma+underline,
++	use=ecma+standout, use=ansi+apparrows, use=ansi+csr,
++	use=ansi+enq, use=ansi+idl, use=ansi+inittabs,
++	use=ansi+local, use=ansi+rca2, use=ansi+sgrbold,
++	use=vt100+4bsd, use=vt100+pfkeys, use=vt220+pcedit,
++	use=ecma+index, use=xterm+alt1049, use=vt220+cvis,
++	use=xterm+sl, use=ecma+italics, use=ecma+strikeout,
++	use=bracketed+paste, use=xterm+pcf2,
+ #
+ # st-0.1.1
+ #
+@@ -7471,17 +7475,16 @@
+ 	cols#80, it#8, lines#24,
+ 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, 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,
+-	dch1=\E[P, ed=\E[J, el=\E[K, home=\E[H, hpa=\E[%i%p1%dG,
+-	ht=^I, ich=\E[%p1%d@, ind=\n, kbs=^?, kdch1=\E[3~,
+-	kend=\E[4~, khome=\E[1~, knp=\E[6~, kpp=\E[5~, rev=\E[7m,
+-	rmso=\E[m, rmul=\E[m,
++	cuu=\E[%p1%dA, cuu1=\E[A, dch1=\E[P, ed=\E[J, el=\E[K,
++	hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@, ind=\n, kbs=^?,
++	kdch1=\E[3~, kend=\E[4~, khome=\E[1~, knp=\E[6~, kpp=\E[5~,
++	rev=\E[7m,
+ 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
+ 	    %t;7%;m,
+-	sgr0=\E[0m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
+-	use=ansi+csr, use=ansi+idl, use=vt220+cvis,
+-	use=ecma+index, use=klone+color, use=vt100+pf1-pf4,
+-	use=xterm+r5+fkeys, use=xterm+acs,
++	sgr0=\E[0m, use=ansi+arrows, use=ansi+csr, use=ansi+cup,
++	use=ansi+idl, use=ansi+sgrso, use=ansi+sgrul,
++	use=vt220+cvis, use=ecma+index, use=klone+color,
++	use=vt100+pf1-pf4, use=xterm+r5+fkeys, use=xterm+acs,
+ 
+ st-16color|stterm-16color|simpleterm with 16-colors,
+ 	use=ibm+16color, use=st,
+@@ -7573,24 +7576,24 @@
+ 	cols#80, it#8, lines#24, lm#0,
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+-	dim=\E[2m, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0,
+-	flash=^G, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n,
++	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ed=\E[J, el=\E[K,
++	el1=\E[1K, enacs=\E(B\E)0, flash=^G, ht=^I, hts=\EH, ind=\n,
+ 	is1=\E[?47l\E=\E[?1l,
+ 	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^?,
+ 	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
+ 	khome=\E[1~, rev=\E[7m, ri=\EM, rmacs=\E(B, rmir=\E[4l,
+-	rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
+-	rs2=\E[!p\E[?3;4l\E[4l\E>, s0ds=\E(B, s1ds=\E(0,
++	rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, s0ds=\E(B, s1ds=\E(0,
+ 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p5%t;2%;%?%p1%p3%|%t;7
+ 	    %;m%?%p9%t\E(0%e\E(B%;,
+-	sgr0=\E[m\E(B, smacs=\E(0, smir=\E[4h, smso=\E[7m,
+-	smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=ansi+arrows,
+-	use=ansi+csr, use=ansi+enq, use=ansi+idl, use=ansi+local,
+-	use=bracketed+paste, use=ecma+italics, use=ecma+index,
+-	use=vt100+pf1-pf4, use=vt220+cvis, use=vt220+pcedit,
+-	use=xterm+r5+fkeys, use=xterm+256setaf,
+-	use=xterm+sl-twm, use=xterm+alt1049,
++	sgr0=\E[m\E(B, smacs=\E(0, smir=\E[4h, smul=\E[4m,
++	tbc=\E[3g, use=ecma+underline, use=ecma+standout,
++	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
++	use=ansi+enq, use=ansi+idl, use=ansi+local,
++	use=ansi+rca2, use=bracketed+paste, use=ecma+italics,
++	use=ecma+index, use=vt100+pf1-pf4, use=vt220+cvis,
++	use=vt220+pcedit, use=xterm+r5+fkeys,
++	use=xterm+256setaf, use=xterm+sl-twm,
++	use=xterm+alt1049,
+ 
+ #### TERMINOLOGY
+ # https://www.enlightenment.org/about-terminology
+@@ -7772,7 +7775,8 @@
+ alacritty+common|base fragment for alacritty,
+ 	km@, npc,
+ 	kb2=\EOE, kcbt=\E[Z, kent=\EOM, Se=\E[0 q,
+-	Smulx=\E[4:%p1%dm, use=ecma+index, use=xterm+focus,
++	Smulx=\E[4:%p1%dm, rv=\E\\[>0;25[0-9][0-9];1c,
++	use=ecma+index, use=report+da2, use=xterm+focus,
+ 	use=xterm+sm+1006, use=xterm-basic, use=xterm+app,
+ 	use=ansi+rep, use=xterm+tmux, use=ecma+strikeout,
+ 	use=xterm+sl-twm, use=ecma+italics, use=xterm+pce2,
+@@ -7907,22 +7911,24 @@
+ 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
+ 	     yzz{{||}}~~,
+ 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+-	dim=\E[2m, 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,
+-	ich=\E[%p1%d@, ind=\n, kBEG=\E[1;2E, kbeg=\EOE, kbs=^?,
+-	kcbt=\E[Z, op=\E[39;49m, 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,
++	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX,
++	ed=\E[J, el=\E[K, el1=\E[1K, flash=\E[?5h$<100/>\E[?5l,
++	ich=\E[%p1%d@, ind=\n, kBEG=\E[1;2E, kbeg=\EOE, kcbt=\E[Z,
++	op=\E[39;49m, rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l,
++	rmir=\E[4l, rmkx=\E[?1l, rs1=\E]\E\\\Ec,
+ 	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, vpa=\E[%i%p1%dd,
+-	Smulx=\E[4:%p1%dm, use=ansi+csr, use=ansi+enq,
+-	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
++	smkx=\E[?1h, Smulx=\E[4:%p1%dm,
++	rv=\E\\[>1;4[0-9][0-9][0-9];41c,
++	xr=\EP>\\|kitty\\([0-9]+\\.[0-9]+\\.[0-9]+\\)\E\\
++	   \\,
++	use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+idl,
++	use=ansi+inittabs, use=ansi+local, use=ansi+rca2,
+ 	use=ansi+rep, use=xterm+focus, use=xterm+sm+1006,
+-	use=ecma+index, use=xterm+pcfkeys, use=xterm+sl-twm,
+-	use=ecma+strikeout, use=ecma+italics,
++	use=ecma+index, use=ecma+strikeout, use=ecma+italics,
++	use=ecma+standout, use=ecma+underline, use=linux+kbs,
++	use=report+da2, use=xterm+pcfkeys, use=xterm+sl-twm,
+ 	use=xterm+alt1049, use=att610+cvis, use=xterm+tmux,
+ 	use=bracketed+paste, use=report+version,
+ 
+@@ -7981,20 +7987,19 @@
+ 	flash=\E]555\E\\, ind=\n, is2=\E[!p\E[4l\E>, kbs=^?,
+ 	kcbt=\E[Z, nel=\EE, oc=\E]104\E\\, op=\E[39;49m, ri=\EM,
+ 	rmam=\E[?7l, rmkx=\E[?1l\E>, rmm=\E[?1036h\E[?1034l,
+-	rmso=\E[27m, rmul=\E[24m, rs1=\Ec, rs2=\E[!p\E[4l\E>,
++	rs1=\Ec, rs2=\E[!p\E[4l\E>,
+ 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
+ 	    %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
+ 	sgr0=\E(B\E[m, smam=\E[?7h, smkx=\E[?1h\E=,
+ 	smm=\E[?1036l\E[?1034h, E3=\E[3J, Smulx=\E[4:%p1%dm,
+-	rv=\E\\[>1;[0-9][0-9][0-9][0-9][0-9][0-9];0c,
+-	xr=\EP>\\|foot\\([0-9]+\\.[0-9]+\\.[0-9]+(-[0-9]+-g[a-f[0-9]
+-	   +)?\\)?\E\\\\,
+-	use=att610+cvis, use=ansi+csr, use=ansi+cup,
+-	use=ansi+enq, use=ansi+local, use=ansi+idc, use=ansi+idl,
+-	use=ansi+rca2, use=ansi+rep, use=ansi+tabs,
+-	use=ansi+sgrbold, use=ecma+index, use=ecma+italics,
+-	use=ecma+strikeout, use=kitty+setal, use=xterm+acs,
+-	use=xterm+alt+title, use=xterm+pcfkeys,
++	rv=\E\\[>1;[0-9];0c,
++	xr=\EP>\\|foot\\([0-9][.0-9](-.*)?\\)?\E\\\\,
++	use=ecma+underline, use=ecma+standout, use=att610+cvis,
++	use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+local,
++	use=ansi+idc, use=ansi+idl, use=ansi+rca2, use=ansi+rep,
++	use=ansi+tabs, use=ansi+sgrbold, use=ecma+index,
++	use=ecma+italics, use=ecma+strikeout, use=kitty+setal,
++	use=xterm+acs, use=xterm+alt+title, use=xterm+pcfkeys,
+ 	use=xterm+sm+1006, use=xterm+tmux2, use=xterm+sl-alt,
+ 	use=bracketed+paste, use=report+version,
+ 	use=xterm+focus,
+@@ -8130,23 +8135,23 @@
+ 	am, bce, mir, msgr, npc, xenl, AX, XT,
+ 	colors#8, cols#80, lines#24, pairs#64,
+ 	bel=^G, blink@, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n,
+-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+-	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,
+-	ich=\E[%p1%d@, ind=\n, invis@, is2=\E[!p, kbs=^?, kcbt=\E[Z,
+-	nel=\EE, op=\E[39;49m, ri=\EM, rmam=\E[?7l, rmir=\E[4l,
+-	rmkx=\E[?1l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec, rs2=\E[!p,
+-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
++	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
++	el1=\E[1K, flash=\E[?5h$<100/>\E[?5l, ich=\E[%p1%d@,
++	ind=\n, invis@, is2=\E[!p, kbs=^?, kcbt=\E[Z, nel=\EE,
++	op=\E[39;49m, ri=\EM, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l,
++	rs1=\Ec, rs2=\E[!p, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+ 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
+ 	    %t;7%;m,
+ 	sgr0=\E(B\E[m, smam=\E[?7h, smir=\E[4h, smkx=\E[?1h,
+-	vpa=\E[%i%p1%dd, rv=\E\\[>0;100;0c, use=ecma+index,
+-	use=ansi+rep, use=ecma+strikeout, use=xterm+pcfkeys,
++	rv=\E\\[>0;100;0c, use=ecma+underline,
++	use=ecma+standout, use=ecma+index, use=ansi+rep,
++	use=ecma+strikeout, use=xterm+pcfkeys,
+ 	use=bracketed+paste, use=vt420+lrmm, use=xterm+focus,
+ 	use=xterm+sm+1006, use=ecma+italics, use=ansi+csr,
+-	use=ansi+enq, use=ansi+idl, use=ansi+inittabs,
+-	use=ansi+local, use=ansi+sgrbold, use=xterm+alt+title,
+-	use=att610+cvis, use=xterm+acs,
++	use=ansi+cup, use=ansi+enq, use=ansi+idl,
++	use=ansi+inittabs, use=ansi+local, use=ansi+rca2,
++	use=ansi+sgrbold, use=xterm+alt+title, use=att610+cvis,
++	use=xterm+acs,
+ 
+ pangoterm-256color|pangoterm with 256-colors,
+ 	use=xterm+256setaf2, use=pangoterm,
+@@ -8234,19 +8239,19 @@
+ 	el1=\E[1K, flash=\E[?5h$<100/>\E[?5l, ind=\n,
+ 	is2=\E[!p\E[?3;4l\E[4l\E>, kbs=^?, kcbt=\E[Z, kend=\EOF,
+ 	op=\E[39;49m, ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>,
+-	rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]104\007,
+-	rs2=\E[!p\E[?3;4l\E[4l\E>,
++	rs1=\Ec\E]104\007, rs2=\E[!p\E[?3;4l\E[4l\E>,
+ 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
+ 	    %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
+ 	sgr0=\E(B\E[m, smam=\E[?7h, smkx=\E[?1h\E=, Smol=\E[53m,
+-	Smulx=\E[4:%p1%dm,
+-	xr=\EP>\\|WezTerm\\([1-9][0-9-]+\\)\E\\\\,
++	Smulx=\E[4:%p1%dm, rv=\E\\[>1;277;0c,
++	xr=\EP>\\|WezTerm ([0-9]+)(-[[:xdigit:]]+)+\E\\\\,
++	use=ecma+underline, use=ecma+standout,
+ 	use=ansi+apparrows, use=ansi+csr, use=ansi+cup,
+ 	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+ 	use=ansi+inittabs, use=ansi+local, use=ansi+rca2,
+ 	use=ansi+rep, use=ansi+sgrdim, use=bracketed+paste,
+ 	use=ecma+index, use=ecma+italics, use=ecma+strikeout,
+-	use=report+version, use=vt220+cvis,
++	use=report+da2, use=report+version, use=vt220+cvis,
+ 	use=xterm+256color2, use=xterm+acs,
+ 	use=xterm+alt+title, use=xterm+focus, use=xterm+pcc2,
+ 	use=xterm+pce2, use=xterm+pcf2, use=xterm+sl-alt,
+@@ -8332,12 +8337,14 @@
+ 	kf49=\E[O3P, kf50=\E[O3Q, kf51=\E[O3R, kf52=\E[O3S,
+ 	kf61=\E[O4P, kf62=\E[O4Q, kf63=\E[O4R, khlp=, kmous=\E[M,
+ 	kund=, oc=\E]104\E\\, op=\E[39;49m, ri=\EM, rmam=\E[?7l,
+-	rmkx=\E[?1l, rmso=\E[27m, rmul=\E[24m, rs1=\E]\E\\\Ec,
++	rmkx=\E[?1l, rs1=\E]\E\\\Ec,
+ 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p5%t;2%;
+ 	    %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
+ 	sgr0=\E(B\E[m, smam=\E[?7h, smkx=\E[?1h,
+ 	Cs=\E]12;%p1%s\E\\, E3=\E[3J, Rmol=\E[55m, Se=\E[ q,
+ 	Smol=\E[53m, Smulx=\E[4:%p1%dm, Ss=\E[%p1%d q,
++	xr=\EP>\\|contour ([0-9]\\.[0-9]\\.[0-9])\E\\\\,
++	use=ecma+underline, use=ecma+standout,
+ 	use=ansi+apparrows, use=ansi+cup, use=ansi+csr,
+ 	use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+ 	use=ansi+inittabs, use=ansi+local, use=ansi+rca2,
+@@ -8496,13 +8503,15 @@
+ 	sgr0=\E(B\E[m, smam=\E[?7h, smcup=\E[?1049h,
+ 	smkx=\E[?1h\E=, E3=\E[3J, Ms=\E]52;%p1%s;%p2%s\007,
+ 	Se=\E[2 q, Smulx=\E[4:%p1%dm, Ss=\E[%p1%d q,
+-	xr=\EP>\\|ghostty [!-z]+\E\\, use=ansi+apparrows,
+-	use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+erase,
+-	use=ansi+idc, use=ansi+idl, use=ansi+inittabs,
+-	use=ansi+local, use=ansi+local1, use=ansi+rca2,
+-	use=ansi+rep, use=ansi+sgrso, use=ansi+sgrul,
+-	use=ansi+tabs, use=ecma+index, use=ecma+italics,
+-	use=ecma+strikeout, use=report+version, use=vt220+cvis,
++	rv=\E\\[>[0-9];[0-9];[0-9]c,
++	xr=\EP>\\|ghostty %[0-9.]([[:print:]])*\E\\\\,
++	use=linux+kbs, use=ansi+apparrows, use=ansi+csr,
++	use=ansi+cup, use=ansi+enq, use=ansi+erase, use=ansi+idc,
++	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
++	use=ansi+rca2, use=ansi+rep, use=ansi+sgrso,
++	use=ansi+sgrul, use=ansi+tabs, use=ecma+index,
++	use=ecma+italics, use=ecma+strikeout,
++	use=report+version, use=vt220+cvis,
+ 	use=xterm+256color2, use=xterm+acs,
+ 	use=xterm+alt+title, use=bracketed+paste,
+ 	use=kitty+setal, use=vt420+lrmm, use=xterm+focus,
+@@ -8541,24 +8550,23 @@
+ 	am, mir, xenl,
+ 	cols#80, lines#24,
+ 	bel=^G, bold=\E[1m, cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H,
+-	cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+-	el1=\E[1K, home=\E[H, ht=^I, ich=\E[%p1%d@, ind=\n,
+-	rev=\E[7m, rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
+-	smir=\E[4h, smso=\E[7m, smul=\E[4m, use=ansi+cpr,
+-	use=ansi+erase, use=ansi+idl, use=ansi+local,
+-	use=xterm+alt47,
++	cud1=\n, dch=\E[%p1%dP, dch1=\E[P, el1=\E[1K, ht=^I,
++	ich=\E[%p1%d@, ind=\n, rev=\E[7m, rmir=\E[4l, sgr0=\E[m,
++	smir=\E[4h, use=ansi+cpr, use=ansi+cup, use=ansi+erase,
++	use=ansi+idl, use=ansi+local, use=ansi+sgrso,
++	use=ansi+sgrul, use=xterm+alt47,
+ 
+ # The codes supported by the term.el terminal emulation in GNU Emacs 22.2
+ eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96,
+ 	msgr,
+ 	colors#8, pairs#64,
+-	kbs=^?, khome=\E[1~, op=\E[39;49m, ri=\EM, rmso=\E[27m,
+-	rmul=\E[24m, rs1=\Ec, setab=\E[%p1%'('%+%dm,
+-	setaf=\E[%p1%{30}%+%dm,
++	kbs=^?, khome=\E[1~, op=\E[39;49m, ri=\EM, rs1=\Ec,
++	setab=\E[%p1%'('%+%dm, setaf=\E[%p1%{30}%+%dm,
+ 	sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;%?
+ 	    %p7%t;8%;m,
+-	sgr0=\E[m, use=ansi+apparrows, use=ansi+csr,
+-	use=ansi+sgr, use=vt220+pcedit, use=eterm,
++	sgr0=\E[m, use=ecma+underline, use=ecma+standout,
++	use=ansi+apparrows, use=ansi+csr, use=ansi+sgr,
++	use=vt220+pcedit, use=eterm,
+ 
+ # shell.el can "do" color, though not nearly as well.
+ #
+@@ -8576,9 +8584,8 @@
+ dumb-emacs-ansi|Emacs dumb terminal with ANSI color codes,
+ 	am, hc,
+ 	it#8, ncv#13,
+-	bold=\E[1m, cud1=\n, ht=^I, ind=\n, op=\E[39;49m,
+-	rmul=\E[24m, sgr0=\E[m, smul=\E[4m, use=ecma+italics,
+-	use=klone+color,
++	bold=\E[1m, cud1=\n, ht=^I, ind=\n, op=\E[39;49m, sgr0=\E[m,
++	use=ecma+underline, use=ecma+italics, use=klone+color,
+ 
+ #### Screen
+ 
+@@ -8660,19 +8667,20 @@
+ 	blink=\E[5m, bold=\E[1m, cub1=^H, cud1=\n,
+ 	cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, cvvis=\E[34l,
+ 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, el1=\E[1K, flash=\Eg,
+-	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, indn=\E[%p1%dS, is2=\E)0,
+-	kbs=^?, kcbt=\E[Z, khome=\E[1~, kmous=\E[M, nel=\EE,
+-	rev=\E[7m, ri=\EM, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[23m,
+-	rmul=\E[24m, rs2=\Ec\E[?1000l\E[?25h,
++	ich=\E[%p1%d@, indn=\E[%p1%dS, is2=\E)0, kbs=^?, kcbt=\E[Z,
++	khome=\E[1~, kmous=\E[M, nel=\EE, rev=\E[7m, ri=\EM,
++	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[23m,
++	rs2=\Ec\E[?1000l\E[?25h,
+ 	sgr=\E[0%?%p6%t;1%;%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;
+ 	    5%;%?%p5%t;2%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smir=\E[4h, smkx=\E[?1h\E=, smso=\E[3m,
+-	smul=\E[4m, vpa=\E[%i%p1%dd, E0=\E(B, S0=\E(%p1%c,
++	E0=\E(B, S0=\E(%p1%c, use=ecma+underline,
+ 	use=ansi+apparrows, use=ansi+csr, use=ansi+erase,
+ 	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+-	use=ecma+color, use=vt100+pf1-pf4, use=vt220+pcedit,
+-	use=xterm+alt1049, use=xterm+kbs, use=vt100+enq,
+-	use=vt100+4bsd, use=xterm+r5+fkeys, use=wyse+cvis,
++	use=ansi+rca2, use=ecma+color, use=vt100+pf1-pf4,
++	use=vt220+pcedit, use=xterm+alt1049, use=xterm+kbs,
++	use=vt100+enq, use=vt100+4bsd, use=xterm+r5+fkeys,
++	use=wyse+cvis,
+ 
+ screen|VT 100/ANSI X3.64 virtual terminal,
+ 	use=screen4,
+@@ -8878,23 +8886,22 @@
+ 	ed=\E[J, el=\E[K, ich1=, ind=\n, kbs=^H, kf0=\E~, kf1=\ES,
+ 	kf2=\ET, kf3=\EU, kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER,
+ 	kf9=\E0I, khome=\EH, nel=\r\n, rc=\E8, ri=\EM, rmso=\E[23m,
+-	rmul=\E[24m, rs1=\Ec, sc=\E7, sgr0=\E[m, smso=\E[3m,
+-	smul=\E[4m, use=ansi+idc, use=ansi+idl,
+-	use=ansi+inittabs, use=ansi+local, use=vt52+arrows,
++	rs1=\Ec, sc=\E7, sgr0=\E[m, smso=\E[3m, use=ecma+underline,
++	use=ansi+idc, use=ansi+idl, use=ansi+inittabs,
++	use=ansi+local, use=vt52+arrows,
+ 
+ # (screen3: removed unknown ":xv:LP:G0:" -- esr)
+ screen3|VT 100/ANSI X3.64 virtual terminal (old 3.x),
+ 	km, mir, msgr,
+ 	cols#80, lines#24,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
+-	cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, dch=\E[%p1%dP,
+-	dch1=\E[P, home=\E[H, ich=\E[%p1%d@, ind=\n, is2=\E)0,
+-	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+-	nel=\EE, rev=\E[7m, ri=\EM, rmir=\E[4l, rmkx=\E>,
+-	rmso=\E[23m, rmul=\E[24m, rs1=\Ec, sgr0=\E[m, smir=\E[4h,
+-	smkx=\E=, smso=\E[3m, smul=\E[4m, use=ansi+csr,
+-	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
+-	use=ansi+local, use=vt100+pf1-pf4,
++	cuu1=\EM, dch=\E[%p1%dP, dch1=\E[P, ich=\E[%p1%d@, ind=\n,
++	is2=\E)0, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
++	kcuu1=\EOA, nel=\EE, rev=\E[7m, ri=\EM, rmir=\E[4l, rmkx=\E>,
++	rmso=\E[23m, rs1=\Ec, sgr0=\E[m, smir=\E[4h, smkx=\E=,
++	smso=\E[3m, use=ecma+underline, use=ansi+csr,
++	use=ansi+cup, use=ansi+erase, use=ansi+idl,
++	use=ansi+inittabs, use=ansi+local, use=vt100+pf1-pf4,
+ 
+ # screen 4.0 was released 2003-07-21, and as of March 2019, its terminfo file
+ # was last updated in 2009 to include 256-color support.  The most recent
+@@ -8915,10 +8922,9 @@
+ # The same development branch has some support for direct-colors, but none
+ # of this has been documented.
+ screen5|VT 100/ANSI X3.64 virtual terminal (someday),
+-	rmso=\E[27m,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
+ 	    %p5%t;2%;m%?%p9%t\016%e\017%;,
+-	smso=\E[7m, use=ecma+italics, use=ecma+index,
++	use=ecma+standout, use=ecma+italics, use=ecma+index,
+ 	use=screen-base,
+ 
+ #### Tmux
+@@ -8932,10 +8938,10 @@
+ # various entries such as screen.xterm-new provide a way to more closely
+ # match the terminal.
+ tmux|tmux terminal multiplexer,
+-	invis=\E[8m, rmso=\E[27m,
++	invis=\E[8m,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
+ 	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+-	smso=\E[7m, E3=\E[3J, Smulx=\E[4:%p1%dm,
++	E3=\E[3J, Smulx=\E[4:%p1%dm, use=ecma+standout,
+ 	use=ecma+italics, use=ecma+strikeout, use=xterm+edit,
+ 	use=xterm+pcfkeys, use=xterm+sl, use=xterm+tmux,
+ 	use=screen, use=bracketed+paste, use=report+version,
+@@ -9020,27 +9026,26 @@
+ 	ncv@,
+ 	blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cub1=^H, cud1=\n,
+ 	cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, el1=\E[1K,
+-	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ich1=\E[@,
+-	is1=\E[?47l\E=\E[?1l,
++	ich=\E[%p1%d@, ich1=\E[@, is1=\E[?47l\E=\E[?1l,
+ 	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l,
+ 	kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d,
+ 	kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, ka1=\EOw, ka3=\EOy,
+ 	kb2=\EOu, kbs=^?, kc1=\EOq, kc3=\EOs, kcbt=\E[Z, kel=\E[8\^,
+ 	kend=\E[8~, kent=\EOM, kf0=\E[21~, kf21=\E[23$,
+ 	kf22=\E[24$, khome=\E[7~, kind=\E[a, kmous=\E[M, kri=\E[b,
+-	rev=\E[7m, ri=\EM, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
++	rev=\E[7m, ri=\EM, rmir=\E[4l,
+ 	rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
+ 	rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?
+ 	    25h,
+ 	s0ds=\E(B, s1ds=\E(0,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?
+ 	    %p9%t\016%e\017%;,
+-	sgr0=\E[m\017, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+-	vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr,
+-	use=ansi+idl, use=ansi+local, use=xterm+alt47,
+-	use=vt220+vtedit, use=vt220+cvis, use=ecma+color,
+-	use=ecma+italics, use=vt100+4bsd, use=vt220+sfkeys,
+-	use=xterm+r5+fkeys,
++	sgr0=\E[m\017, smir=\E[4h, use=ecma+underline,
++	use=ecma+standout, use=ansi+arrows, use=ansi+csr,
++	use=ansi+idl, use=ansi+local, use=ansi+rca2,
++	use=xterm+alt47, use=vt220+vtedit, use=vt220+cvis,
++	use=ecma+color, use=ecma+italics, use=vt100+4bsd,
++	use=vt220+sfkeys, use=xterm+r5+fkeys,
+ 
+ dvtm-256color|dynamic virtual terminal manager with 256 colors,
+ 	colors#0x100, pairs#0x10000,
+@@ -9089,10 +9094,9 @@
+ ncsa-m|ncsa-vt220-8|NCSA Telnet 2.6 for Macintosh in VT220-8 mode,
+ 	am, km, mir, msgr, xenl,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
+-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
+-	dch1=\E[P, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
+-	flash=\E[?5h$<100/>\E[?5l, home=\E[H, ht=^I, hts=\EH,
+-	ich=\E[%p1%d@, if=/usr/share/tabset/vt100,
++	cub1=^H, cud1=\n, dch=\E[%p1%dP, dch1=\E[P, ed=\E[J, el=\E[K,
++	el1=\E[1K, enacs=\E)0, flash=\E[?5h$<100/>\E[?5l, ht=^I,
++	hts=\EH, ich=\E[%p1%d@, if=/usr/share/tabset/vt100,
+ 	ind=\n$<150*>,
+ 	is2=\E7\E[r\E[m\E[?7h\E[?1;4;6l\E[4l\E8\E>,
+ 	kdch1=\E[4~, kend=\E[5~, kf1=\E[17~, kf10=\E[28~,
+@@ -9101,16 +9105,16 @@
+ 	kf6=\E[23~, kf7=\E[24~, kf8=\E[25~, kf9=\E[26~, khlp=\E[1~,
+ 	khome=\E[2~, knp=\E[6~, kpp=\E[3~, mc4=\E[4i, mc5=\E[5i,
+ 	rev=\E[7m, rf=/usr/share/tabset/vt100, ri=\EM,
+-	rmam=\E[?7l, rmcup=\E[2J\E8, rmir=\E[4l, rmso=\E[27m,
+-	rmul=\E[24m,
++	rmam=\E[?7l, rmcup=\E[2J\E8, rmir=\E[4l,
+ 	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;4;6l\E[4l\E>,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?
+ 	    %p9%t\E(0%e\E(B%;,
+ 	sgr0=\E[m\E(B, smam=\E[?7h, smcup=\E7, smir=\E[4h,
+-	smso=\E[7m, smul=\E[4m, tbc=\E[3g, u8=\E[?62;1;6c,
+-	use=ansi+arrows, use=ansi+csr, use=ansi+idl,
+-	use=ansi+local, use=vt220+cvis, use=xterm+acs,
+-	use=vt100+pf1-pf4, use=xterm+sl, use=ansi+enq,
++	tbc=\E[3g, u8=\E[?62;1;6c, use=ecma+underline,
++	use=ecma+standout, use=ansi+arrows, use=ansi+csr,
++	use=ansi+idl, use=ansi+local, use=ansi+cup,
++	use=vt220+cvis, use=xterm+acs, use=vt100+pf1-pf4,
++	use=xterm+sl, use=ansi+enq,
+ 
+ ncsa|NCSA Telnet 2.7 for Macintosh in VT220-8 mode (color),
+ 	use=ncsa-m, use=klone+color,
+@@ -9193,10 +9197,9 @@
+ 	am, xon,
+ 	cols#80, lines#25,
+ 	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
+-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M,
+-	el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, nel=\r\n,
+-	rev=\E[7m, rmso=\E[m, sgr0=\E[m, smso=\E[7m,
+-	use=ansi+arrows,
++	cuu1=\E[A, dch1=\E[P, el=\E[K, ht=^I, ich1=\E[@, nel=\r\n,
++	rev=\E[7m, sgr0=\E[m, use=ansi+arrows, use=ansi+cup,
++	use=ansi+idl1, use=ansi+sgrso,
+ 
+ #### Sun consoles
+ #
+@@ -9208,8 +9211,8 @@
+ 	bel=^G, clear=^L, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
+ 	dch=\E[%p1%dP, dch1=\E[P, ed=\E[J, el=\E[K, ht=^I,
+ 	ich=\E[%p1%d@, ich1=\E[@, ind=\n, is1=\E[1r, kcub1=\E[D,
+-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, rmso=\E[m,
+-	sgr0=\E[m, smso=\E[7m, use=ansi+idl, use=ansi+local1,
++	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, sgr0=\E[m,
++	use=ansi+idl, use=ansi+local1, use=ansi+sgrso,
+ 	use=vt100+pf1-pf4,
+ 
+ # From: Alexander Lukyanov , 14 Nov 1995
+@@ -9226,10 +9229,9 @@
+ 	kf3=\E[226z, kf4=\E[227z, kf5=\E[228z, kf6=\E[229z,
+ 	kf7=\E[230z, kf8=\E[231z, kf9=\E[232z, khome=\E[214z,
+ 	kich1=\E[247z, knp=\E[222z, kopt=\E[194z, kpp=\E[216z,
+-	kres=\E[193z, kund=\E[195z, rev=\E[7m, rmso=\E[m, rmul@,
+-	rs2=\E[s, sgr=\E[0%?%p1%p3%|%t;7%;m, sgr0=\E[m,
+-	smso=\E[7m, u8=\E[1t, u9=\E[11t, use=ansi+arrows,
+-	use=ansi+idl,
++	kres=\E[193z, kund=\E[195z, rev=\E[7m, rmul@, rs2=\E[s,
++	sgr=\E[0%?%p1%p3%|%t;7%;m, sgr0=\E[m, u8=\E[1t,
++	u9=\E[11t, use=ansi+arrows, use=ansi+idl, use=ansi+sgrso,
+ 
+ # On some versions of CGSIX framebuffer firmware (SparcStation 5), /
+ # flake out on the last line.  Unfortunately, without them the terminal has no
+@@ -9319,7 +9321,8 @@
+ 	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
+ 	     %=%t3%e%p1%d%;m,
+ 	sgr=\E[0%?%p6%t;1%;%?%p1%p3%|%t;7%;m, use=ansi+local,
+-	use=sun, use=klone+color,
++	use=ansi+rca, use=ansi+tabs, use=ecma+index, use=sun,
++	use=klone+color,
+ 
+ # These date from March 2017:
+ # https://www.illumos.org/issues/10360 terminfo: sun-color has 256 colors
+@@ -9335,16 +9338,15 @@
+ # hard-coded applications may work as intended.
+ #
+ # These variants are based on reading the source code.
+-# https://github.com/tsoome/illumos-gate/blob/loader/usr/src/boot/sys/boot/common/tem.c
++# https://github.com/illumos/illumos-gate/blob/loader/usr/src/boot/sys/boot/common/tem.c
+ illumos|Illumos framebuffer console,
+ 	xenl,
+-	blink=\E[5m, dim=\E[2m, rmam=\E[?7l, rmso=\E[27m,
+-	rmul=\E[24m,
++	blink=\E[5m, dim=\E[2m, rmam=\E[?7l,
+ 	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?
+ 	    %p4%t;5%;m,
+-	sgr0=\E[0m, smam=\E[?7h, smul=\E[4m, use=ecma+index,
+-	use=ansi+tabs, use=ansi+rca, use=vt220+cvis,
+-	use=sun-color, use=ansi+apparrows,
++	sgr0=\E[0m, smam=\E[?7h, use=ecma+underline,
++	use=ecma+standout, use=vt220+cvis, use=sun-color,
++	use=ansi+apparrows,
+ #
+ # Referring to these as "sun-" is misleading, but close to the intent of the
+ # developer -TD
+@@ -9428,9 +9430,9 @@
+ 	am, xt,
+ 	cols#80, it#8, lines#24,
+ 	bel=^G, clear=^L, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
+-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, el=\E[K, home=\E[H,
+-	ht=^I, ind=\n, kbs=^H, kcub1=^H, kcud1=\n, nel=\r\n,
+-	rmso=\E[4;1m, sgr0=\E[m, smso=\E[4;2m,
++	cuu1=\E[A, el=\E[K, ht=^I, ind=\n, kbs=^H, kcub1=^H, kcud1=\n,
++	nel=\r\n, rmso=\E[4;1m, sgr0=\E[m, smso=\E[4;2m,
++	use=ansi+cup,
+ nextshell|NeXT Shell application,
+ 	am,
+ 	cols#80,
+@@ -9492,14 +9494,13 @@
+ 	OTbs, OTpt, am, xenl,
+ 	cols#80, vt#3,
+ 	OTnl=\n, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[;H\E[2J,
+-	cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+-	cuu1=\E[A, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+-	if=/usr/share/tabset/vt100, kbs=^H, kcub1=\E[D,
+-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, rev=\E[7m, ri=\EM,
+-	rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
++	cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, cuu1=\E[A, ed=\E[J,
++	el=\E[K, ht=^I, if=/usr/share/tabset/vt100, kbs=^H,
++	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, rev=\E[7m,
++	ri=\EM, rmkx=\E[?1l\E>,
+ 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sgr0=\E[m,
+-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, use=ansi+csr,
+-	use=vt100+pf1-pf4,
++	smkx=\E[?1h\E=, use=ansi+csr, use=ansi+cup,
++	use=ansi+sgrso, use=ansi+sgrul, use=vt100+pf1-pf4,
+ #
+ # (nwp512: this had :DE=^H:, which I think means  --esr)
+ nwp512|news|nwp514|news40|vt100-bm|nwp512-o|nwp514-o|news-o|news40-o|vt100-bm-o|old Sony VT100 emulator 40 lines,
+@@ -9552,14 +9553,14 @@
+ 	OTbs, OTpt, am, xenl,
+ 	cols#80, lines#24,
+ 	clear=\E[;H\E[2J$<20/>, cup=\E[%i%p1%d;%p2%dH,
+-	cuu1=\E[A$<2/>, dl1=\E[M, ed=\E[J$<30/>, el=\E[K$<3/>,
++	cuu1=\E[A$<2/>, ed=\E[J$<30/>, el=\E[K$<3/>,
+ 	flash=\E[?5h\0\0\0\0\0\0\0\0\0\0\0\0\0\E[?5l,
+-	il1=\E[L, is2=\E[?5l\E[?1l\E>\E[?7h\E[?8h, kcub1=\E[D,
++	is2=\E[?5l\E[?1l\E>\E[?7h\E[?8h, kcub1=\E[D,
+ 	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf5=\EOT, kf6=\E#W,
+ 	khome=\E[H, ri=\EM$<5/>, rmso=\E[m$<2/>, rmul=\E[m$<2/>,
+ 	rs2=\E7\E[r\E8\E[?5l\E[?1l\E>\E[?7h\E[?8h,
+ 	smso=\E[7m$<2/>, smul=\E[4m$<2/>, use=ansi+local1,
+-	use=vt100+pf1-pf4,
++	use=ansi+idl1, use=vt100+pf1-pf4,
+ # (news517: this had :TY=sjis:. --esr)
+ nwp517|nwp-517|nwp-517 VT200 80 cols 30 rows,
+ 	cols#80, lines#30,
+@@ -9583,22 +9584,21 @@
+ 	am, mir, msgr, xenl, xon,
+ 	cols#80, it#8, lines#24, lm#0, ncv@,
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+-	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
+-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+-	dim=\E[2m, ech=\E[%p1%dX, el1=\E[1K, enacs=\E(B\E)0,
+-	flash=\E[?5h$<200>\E[?5l, home=\E[H, ht=^I, hts=\EH,
++	bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n, dch=\E[%p1%dP,
++	dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX, el1=\E[1K,
++	enacs=\E(B\E)0, flash=\E[?5h$<200>\E[?5l, ht=^I, hts=\EH,
+ 	ich=\E[%p1%d@, ind=\ED, is2=\E F\E>\E[?1l\E[?7h\E[?45l,
+ 	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+ 	khlp=\E[28~, nel=\EE, ri=\EM, rmacs=^O, rmam=\E[?7l,
+-	rmir=\E[4l, rmso=\E[22;27m, rmul=\E[24m,
++	rmir=\E[4l, rmso=\E[22;27m,
+ 	sgr=\E[0%?%p1%t;2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
+ 	    %t;2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
+-	smso=\E[2;7m, smul=\E[4m, tbc=\E[3g, use=ansi+csr,
+-	use=ansi+erase, use=ansi+idl, use=ansi+local,
+-	use=ansi+sgr, use=decid+cpr, use=ecma+color,
+-	use=vt220+cvis, use=vt220+sfkeys, use=vt220+vtedit,
+-	use=xterm+r5+fkeys,
++	smso=\E[2;7m, tbc=\E[3g, use=ecma+underline,
++	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idl,
++	use=ansi+local, use=ansi+sgr, use=decid+cpr,
++	use=ecma+color, use=vt220+cvis, use=vt220+sfkeys,
++	use=vt220+vtedit, use=xterm+r5+fkeys,
+ 
+ ######## Non-Unix Consoles
+ #
+@@ -9641,12 +9641,12 @@
+ 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>, cup=\E[%i%p1%d;%p2%dH, el=\E[K,
+-	home=\E[H, ht=^I, kb2=\E[G, kbs=^H, kcub1=\0K, kcud1=\0P,
+-	kcuf1=\0M, kcuu1=\0H, kf0=\0D, kf1=\0;, kf2=\0<, kf3=\0=,
+-	kf4=\0>, kf5=\0?, kf6=\0@, kf7=\0A, kf8=\0B, kf9=\0C,
+-	khome=\0G, kich1=\0R, kll=\0O, knp=\0Q, kpp=\0I, nel=\r\n,
+-	rev=\E[7m, sgr0=\E[0m, use=ansi+local1,
++	clear=\E[H\E[2J$<50>, el=\E[K, ht=^I, kb2=\E[G, kbs=^H,
++	kcub1=\0K, kcud1=\0P, kcuf1=\0M, kcuu1=\0H, kf0=\0D, kf1=\0;,
++	kf2=\0<, kf3=\0=, kf4=\0>, kf5=\0?, kf6=\0@, kf7=\0A, kf8=\0B,
++	kf9=\0C, khome=\0G, kich1=\0R, kll=\0O, knp=\0Q, kpp=\0I,
++	nel=\r\n, rev=\E[7m, sgr0=\E[0m, use=ansi+local1,
++	use=ansi+cup,
+ 
+ #### Cygwin
+ 
+@@ -9719,16 +9719,16 @@
+ 	bel=^G, bold=\E[1m, cr=\r, cub1=^H, el1=\E[1K, fsl=^G, ht=^I,
+ 	ind=\n, invis=\E[8m, kb2=\E[G, khome=\E[1~, kspd=^Z,
+ 	nel=\r\n, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
+-	rmpch=\E[10m, rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]R,
+-	sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
++	rmpch=\E[10m, rs1=\Ec\E]R, sc=\E7, setab=\E[4%p1%dm,
++	setaf=\E[3%p1%dm,
+ 	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p6%t;1%;%?%p7
+ 	    %t;8%;%?%p9%t;11%;m,
+-	sgr0=\E[0;10m, smpch=\E[11m, smso=\E[7m, smul=\E[4m,
+-	tsl=\E];, use=ansi+arrows, use=ansi+cup, use=ansi+erase,
+-	use=ansi+idc, use=ansi+idl, use=ansi+local,
+-	use=ansi+rca2, use=vt220+pcedit, use=vt102+enq,
+-	use=klone+acs, use=linux+lockeys, use=vt220+sfkeys,
+-	use=vt220+ufkeys, use=xterm+alt47,
++	sgr0=\E[0;10m, smpch=\E[11m, tsl=\E];,
++	use=ecma+underline, use=ecma+standout, use=ansi+arrows,
++	use=ansi+cup, use=ansi+erase, use=ansi+idc, use=ansi+idl,
++	use=ansi+local, use=ansi+rca2, use=vt220+pcedit,
++	use=vt102+enq, use=klone+acs, use=linux+lockeys,
++	use=vt220+sfkeys, use=vt220+ufkeys, use=xterm+alt47,
+ 
+ # I've supplied this so that you can help test new values and add other
+ # features.  Cheers, earnie_boyd@yahoo.com.
+@@ -9740,18 +9740,17 @@
+ 	am, eo, mir, msgr, xon,
+ 	cols#80, lines#24,
+ 	bel=^G, cr=\r, dim=\E[2m, el1=\E[1K,
+-	flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG, ind=\n,
+-	kNXT=\E[6$, kPRV=\E[5$, kb2=\E[G, kcbt=\E[Z, khome=\E[1~,
+-	kspd=^Z, nel=\r\n, op=\E[39;49m, rc=\E8, ri=\EM, rs1=\Ec\E]R,
+-	sc=\E7,
++	flash=\E[?5h$<200/>\E[?5l, ind=\n, kNXT=\E[6$,
++	kPRV=\E[5$, kb2=\E[G, kcbt=\E[Z, khome=\E[1~, kspd=^Z,
++	nel=\r\n, op=\E[39;49m, rc=\E8, ri=\EM, rs1=\Ec\E]R, sc=\E7,
+ 	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
+ 	    %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%;m,
+-	sgr0=\E[0;10m, vpa=\E[%i%p1%dd, use=ansi+arrows,
+-	use=ansi+cup, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+-	use=ansi+inittabs, use=ansi+local, use=ansi+sgrbold,
+-	use=klone+acs, use=klone+color, use=linux+lockeys,
+-	use=vt102+enq, use=vt220+pcedit, use=vt220+cvis,
+-	use=vt220+sfkeys, use=vt220+ufkeys,
++	sgr0=\E[0;10m, use=ansi+arrows, use=ansi+cup,
++	use=ansi+erase, use=ansi+idc, use=ansi+idl,
++	use=ansi+inittabs, use=ansi+local, use=ansi+rca2,
++	use=ansi+sgrbold, use=klone+acs, use=klone+color,
++	use=linux+lockeys, use=vt102+enq, use=vt220+pcedit,
++	use=vt220+cvis, use=vt220+sfkeys, use=vt220+ufkeys,
+ 
+ #### DJGPP
+ 
+@@ -9925,15 +9924,14 @@
+ 	OTbs, am, AX,
+ 	colors#8, cols#80, it#8, lines#25, ncv#3, pairs#64,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[1v,
+-	clear=\E[H\E[2J, cnorm=\E[v, cr=\r,
+-	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[2v, dch=\E[%p1%dP,
+-	dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+-	ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, invis=\E[8m,
++	clear=\E[H\E[2J, cnorm=\E[v, cr=\r, cvvis=\E[2v,
++	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
++	ht=^I, ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, invis=\E[8m,
+ 	kf0=\E[21~, kf10=\E[21~, kf6=\E[17~, kf7=\E[18~,
+ 	kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kll=\E[4~, nel=\r\n,
+-	rev=\E[7m, ri=\E[T, rmso=\E[m, setab=\E[4%p1%dm,
+-	setaf=\E[3%p1%dm, sgr0=\E[m, smso=\E[7m, smul=\E[4m,
+-	use=ansi+arrows, use=ansi+idl, use=ansi+local,
++	rev=\E[7m, ri=\E[T, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
++	sgr0=\E[m, smul=\E[4m, use=ansi+arrows, use=ansi+cup,
++	use=ansi+idl, use=ansi+local, use=ansi+sgrso,
+ 	use=linux+lockeys, use=vt220+pcedit, use=ecma+index,
+ 
+ #### U/Win
+@@ -9948,16 +9946,16 @@
+ 	     \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u
+ 	     \264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
+-	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dim=\E[2m,
+-	ech=\E[%p1%dX, el1=\E[1K, home=\E[H, ht=^I, hts=\EH,
+-	kdch1=^?, kend=\E[Y, kf10=\EOY, kf11=\EOZ, kf12=\EOA,
+-	kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX, kich1=\E[@,
+-	nel=\r\n, op=\E[39;49m, rc=\E8, rev=\E[7m, rmacs=\E[10m,
+-	rmpch=\E[10m, rmso=\E[27m, rmul=\E[m, rs1=\Ec\E]R, sc=\E7,
+-	sgr0=\E[0;10m, smacs=\E[11m, smpch=\E[11m, smso=\E[7m,
+-	smul=\E[4m, tbc=\E[3g, use=ansi+arrows, use=ansi+cpr,
+-	use=ansi+erase, use=ansi+idc, use=klone+color,
+-	use=vt100+pf1-pf4, use=vt220+cvis,
++	cuf1=\E[C, cuu1=\E[A, dim=\E[2m, ech=\E[%p1%dX, el1=\E[1K,
++	ht=^I, hts=\EH, kdch1=^?, kend=\E[Y, kf10=\EOY, kf11=\EOZ,
++	kf12=\EOA, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX,
++	kich1=\E[@, nel=\r\n, op=\E[39;49m, rc=\E8, rev=\E[7m,
++	rmacs=\E[10m, rmpch=\E[10m, rs1=\Ec\E]R, sc=\E7,
++	sgr0=\E[0;10m, smacs=\E[11m, smpch=\E[11m, tbc=\E[3g,
++	use=ecma+standout, use=ansi+arrows, use=ansi+cpr,
++	use=ansi+cup, use=ansi+erase, use=ansi+idc,
++	use=ansi+sgrul, use=klone+color, use=vt100+pf1-pf4,
++	use=vt220+cvis,
+ 
+ #### Microsoft (miscellaneous)
+ 
+@@ -9995,10 +9993,11 @@
+ 	am, bw, msgr,
+ 	cols#80, it#8, lines#25,
+ 	bel=^G, clear=\E[2J, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
+-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, ed=\E[J, el=\E[K,
+-	home=\E[H, ht=^I, ind=\E[S, kbs=^H, kcub1=\E[D, kcud1=\E[V,
+-	kcuf1=\E[C, kcuu1=\E[A, nel=\r\E[S, rc=\E[u, rev=\E[7m,
+-	ri=\E[T, rmso=\E[m, sc=\E[s, sgr0=\E[0m, smso=\E[7m,
++	cuu1=\E[A, ed=\E[J, el=\E[K, ht=^I, ind=\E[S, kbs=^H,
++	kcub1=\E[D, kcud1=\E[V, kcuf1=\E[C, kcuu1=\E[A, nel=\r\E[S,
++	rc=\E[u, rev=\E[7m, ri=\E[T, sc=\E[s, sgr0=\E[0m,
++	use=ansi+cup, use=ansi+sgrso,
++
+ # From: jew@venus.sunquest.com
+ # Date: 19 Feb 93 23:41:07 GMT
+ # Here's  a  combination of  ansi and  vt100 termcap
+@@ -10048,28 +10047,27 @@
+ 	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j
+ 	     \331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v
+ 	     \301w\302x\263y\363z\362{\343|\330}\234~\376,
+-	bel=^G, bold=\E[1m, clear=\E[2J, cr=\r, cud1=\n,
+-	cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+-	ind=\E[S, kLFT=\EF\^, kRIT=\EF$, kcbt=\E[Z, kdch1=^?,
+-	kend=\E[U, kf0=\EFA, kf1=\EF1, kf10=\EFA, kf11=\EFB,
+-	kf12=\EFC, kf13=\EFD, kf14=\EFE, kf15=\EFF, kf16=\EFG,
+-	kf17=\EFH, kf18=\EFI, kf19=\EFJ, kf2=\EF2, kf20=\EFK,
+-	kf21=\EFL, kf22=\EFM, kf23=\EFN, kf24=\EFO, kf25=\EFP,
+-	kf26=\EFQ, kf27=\EFR, kf28=\EFS, kf29=\EFT, kf3=\EF3,
+-	kf30=\EFU, kf31=\EFV, kf32=\EFW, kf33=\EFX, kf34=\EFY,
+-	kf35=\EFZ, kf36=\EFa, kf37=\EFb, kf38=\EFc, kf39=\EFd,
+-	kf4=\EF4, kf40=\EFe, kf41=\EFf, kf42=\EFg, kf43=\EFh,
+-	kf44=\EFi, kf45=\EFj, kf46=\EFk, kf47=\EFm, kf48=\EFn,
+-	kf49=\EFo, kf5=\EF5, kf50=\EFp, kf51=\EFq, kf52=\EFr,
+-	kf53=\EFs, kf54=\EFt, kf55=\EFu, kf56=\EFv, kf57=\EFw,
+-	kf58=\EFx, kf59=\EFy, kf6=\EF6, kf60=\EFz, kf7=\EF7,
+-	kf8=\EF8, kf9=\EF9, kich1=\E[L, kind=\EF+, kll=\E[U,
+-	knp=\E[T, kpp=\E[S, kri=\EF-, ll=\E[U, nel=\r\n, op=\E[m,
+-	rc=\E[u, rev=\E[7m, ri=\E[T, rmcup=\E[2b\E[u\r\E[K,
+-	rmso=\E[m, rmul=\E[m, rs1=\Ec, sc=\E[s, sgr0=\E[0m,
+-	smcup=\E[s\E[1b, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
+-	use=ansi+idl, use=ansi+local, use=ecma+index,
+-	use=klone+color,
++	bel=^G, bold=\E[1m, clear=\E[2J, cr=\r, cud1=\n, ed=\E[J,
++	el=\E[K, ht=^I, ind=\E[S, kLFT=\EF\^, kRIT=\EF$, kcbt=\E[Z,
++	kdch1=^?, kend=\E[U, kf0=\EFA, kf1=\EF1, kf10=\EFA,
++	kf11=\EFB, kf12=\EFC, kf13=\EFD, kf14=\EFE, kf15=\EFF,
++	kf16=\EFG, kf17=\EFH, kf18=\EFI, kf19=\EFJ, kf2=\EF2,
++	kf20=\EFK, kf21=\EFL, kf22=\EFM, kf23=\EFN, kf24=\EFO,
++	kf25=\EFP, kf26=\EFQ, kf27=\EFR, kf28=\EFS, kf29=\EFT,
++	kf3=\EF3, kf30=\EFU, kf31=\EFV, kf32=\EFW, kf33=\EFX,
++	kf34=\EFY, kf35=\EFZ, kf36=\EFa, kf37=\EFb, kf38=\EFc,
++	kf39=\EFd, kf4=\EF4, kf40=\EFe, kf41=\EFf, kf42=\EFg,
++	kf43=\EFh, kf44=\EFi, kf45=\EFj, kf46=\EFk, kf47=\EFm,
++	kf48=\EFn, kf49=\EFo, kf5=\EF5, kf50=\EFp, kf51=\EFq,
++	kf52=\EFr, kf53=\EFs, kf54=\EFt, kf55=\EFu, kf56=\EFv,
++	kf57=\EFw, kf58=\EFx, kf59=\EFy, kf6=\EF6, kf60=\EFz,
++	kf7=\EF7, kf8=\EF8, kf9=\EF9, kich1=\E[L, kind=\EF+,
++	kll=\E[U, knp=\E[T, kpp=\E[S, kri=\EF-, ll=\E[U, nel=\r\n,
++	op=\E[m, rc=\E[u, rev=\E[7m, ri=\E[T,
++	rmcup=\E[2b\E[u\r\E[K, rs1=\Ec, sc=\E[s, sgr0=\E[0m,
++	smcup=\E[s\E[1b, use=ansi+arrows, use=ansi+cup,
++	use=ansi+idl, use=ansi+local, use=ansi+sgrso,
++	use=ansi+sgrul, use=ecma+index, use=klone+color,
+ 
+ opennt-35|ntconsole-35|OpenNT-term35 compatible with color,
+ 	lines#35, use=opennt,
+@@ -10147,9 +10145,8 @@
+ altos2|alt2|altos-2|Altos II,
+ 	cols#80, it#8, lines#24, xmc#0,
+ 	clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\E[1B, cuf1=\E[1C,
+-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[1A, dch1=\E[P, dl1=\E[M,
+-	ed=\E[J, el=\E[K, home=\E[H, ht=^I, ich1=\E[@,
+-	if=/usr/share/tabset/vt100, il1=\E[L, ind=\n,
++	cuu1=\E[1A, dch1=\E[P, ed=\E[J, el=\E[K, ht=^I, ich1=\E[@,
++	if=/usr/share/tabset/vt100, ind=\n,
+ 	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, kDL=^Am\r,
+ 	kEOL=^An\r, kcbt=^AK\r, kclr=^AL\r, kdch1=^AM\r, kel=^AN\r,
+ 	kf0=^AI\r, kf1=^A@\r, kf2=^AA\r, kf3=^AB\r, kf32=^A`\r,
+@@ -10157,8 +10154,9 @@
+ 	kf38=^Af\r, kf39=^Ag\r, kf4=^AC\r, kf40=^Ah\r, kf41=^Ai\r,
+ 	kf42=^Aj\r, kf43=^Ak\r, kf5=^AD\r, kf6=^AE\r, kf7=^AF\r,
+ 	kf8=^AG\r, kf9=^AH\r, khome=\E[f, kil1=^AJ\r, kind=^AO\r,
+-	nel=\r\n, rmam=\E[?7l, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
+-	smam=\E[?7h, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
++	nel=\r\n, rmam=\E[?7l, sgr0=\E[m, smam=\E[?7h,
++	use=ansi+arrows, use=ansi+cup, use=ansi+idl1,
++	use=ansi+sgrso, use=ansi+sgrul,
+ 
+ # (altos3: had extension capabilities
+ #	:c0=^A`\r:c1=^Aa\r:c2=^Ab\r:c3=^Ac\r:\
+@@ -10642,18 +10640,18 @@
+ 	cols#80, lines#25,
+ 	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
+ 	     \263,
+-	bel=^G, cbt=\E[Z, clear=\E[2J\E[H, cr=\r,
+-	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, ed=\E[J,
+-	el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, ind=\n,
++	bel=^G, cbt=\E[Z, clear=\E[2J\E[H, cr=\r, dch1=\E[P, ed=\E[J,
++	el=\E[K, ht=^I, ich1=\E[@, ind=\n,
+ 	is2=\E[44"p\E[?7h\E[>10h\E[>12h\EP1;1|3/7F\E\\,
+ 	kcbt=\E[Z, kend=\E[4~, kf1=\E[17~, kf10=\E[28~, kf2=\E[18~,
+ 	kf3=\E[19~, kf4=\E[20~, kf5=\E[21~, kf6=\E[23~, kf7=\E[24~,
+ 	kf8=\E[25~, kf9=\E[26~, khome=\E[1~, knp=\E[6~, kpp=\E[5~,
+ 	rmam=\E[?7l, rmsc=\E[>11l\EP1**x0/11;1/13\E[m\E\\,
+-	rmso=\E[m, rmul=\E[m, sgr0=\E[m, smam=\E[?7h,
+-	smsc=\E[>11h\EPO**x0/65;1/67\E\\$<250>, smso=\E[7m,
+-	smul=\E[4m, xoffc=g, xonc=e, use=ansi+arrows,
+-	use=ansi+local1, use=vt220+cvis,
++	sgr0=\E[m, smam=\E[?7h,
++	smsc=\E[>11h\EPO**x0/65;1/67\E\\$<250>, xoffc=g,
++	xonc=e, use=ansi+arrows, use=ansi+cup, use=ansi+idl1,
++	use=ansi+local1, use=ansi+sgrso, use=ansi+sgrul,
++	use=vt220+cvis,
+ #
+ # (hp2392: copied  here from hpex -- esr)
+ hp2392|239x series,
+@@ -10851,14 +10849,13 @@
+ gator|HP 9000 model 237 emulating AAA,
+ 	bw, km, mir, ul,
+ 	cols#128, it#8, lines#47,
+-	bel=^G, cbt=\E[Z, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
+-	cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, dch=\E[%p1%dP$<4/>,
+-	dch1=\E[P, dl=\E[%p1%dM$<1*/>, dl1=\E[M, home=\E[H,
++	bel=^G, cbt=\E[Z, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, cuu1=\EM,
++	dch=\E[%p1%dP$<4/>, dch1=\E[P, dl=\E[%p1%dM$<1*/>,
+ 	hpa=\E[%i%p1%d`, ht=^I, ich=\E[%p1%d@$<4/>, ich1=\E[@,
+-	il=\E[%p1%dL$<1*/>, il1=\E[L, kbs=^H, kcub1=^H, kcud1=\n,
+-	nel=\r\n, rep=%p1%c\E[%p2%db$<1*/>, rev=\E[7m, rmso=\E[m,
+-	rmul=\E[m, sgr0=\E[m, smso=\E[7m, smul=\E[4m,
+-	use=ansi+erase,
++	il=\E[%p1%dL$<1*/>, kbs=^H, kcub1=^H, kcud1=\n, nel=\r\n,
++	rep=%p1%c\E[%p2%db$<1*/>, rev=\E[7m, sgr0=\E[m,
++	use=ansi+cup, use=ansi+erase, use=ansi+idl1,
++	use=ansi+sgrso, use=ansi+sgrul,
+ 
+ gator-52|HP 9000 model 237 emulating VT52,
+ 	cols#128, lines#47, use=vt52-basic,
+@@ -10883,9 +10880,8 @@
+ dku7003|Honeywell Bull DKU 7003 all features described,
+ 	msgr,
+ 	xmc#1,
+-	blink=\E[5m, bold=\E[7m, dim=\E[2m, rev=\E[7m, rmso=\E[m,
+-	rmul=\E[m, sgr0=\E[m, smso=\E[7m, smul=\E[4m,
+-	use=dku7003-dumb,
++	blink=\E[5m, bold=\E[7m, dim=\E[2m, rev=\E[7m, sgr0=\E[m,
++	use=ansi+sgrso, use=ansi+sgrul, use=dku7003-dumb,
+ 
+ #### Lear-Siegler (LSI adm)
+ #
+@@ -11270,11 +11266,11 @@
+ 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl1=\E[M, ed=\E[J\E[r,
+ 	el=\E[K\E[t, flash=\E$$<200/>\E$P, home=\E$B, ht=^I,
+ 	il1=\E[L\E[t, ind=\n, khome=\E$A, nel=\r\n, rmcup=,
+-	rmir=\E[4l, rmkx=\E[>13l, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
++	rmir=\E[4l, rmkx=\E[>13l, rmso=\E[m, sgr0=\E[m,
+ 	smcup=\E[>1l\E[>2l\E[>16l\E[4l\E[>9l\E[20l\E[>3l\E[>7h\E[>12
+ 	      l\E[1Q,
+-	smir=\E[4h, smkx=\E[>13h, smso=\E[2;7m, smul=\E[4m,
+-	use=ansi+arrows, use=ansi+local,
++	smir=\E[4h, smkx=\E[>13h, smso=\E[2;7m, use=ansi+arrows,
++	use=ansi+local, use=ansi+sgrul,
+ 
+ pt100w|pt200w|wrenw|fenixw|Prime pt100/pt200 in 132-column mode,
+ 	cols#132,
+@@ -12403,16 +12399,15 @@
+ 	cols#80, it#8, lines#24,
+ 	acsc=, cbt=\E[Z, clear=\E[H\E[2J, csr=\E[%i%p1%d;%p2%dr,
+ 	cub1=^H, cud1=\ED, cuf1=\E[C, cup=\E[%i%p1%d;%p2%df,
+-	cuu1=\EM, cvvis=\E[1Q, dch1=\E[P, dl1=\E[M, dsl=\Eg\Ef\r,
+-	ed=\E[J, el=\E[K, flash=\E[5m$<200/>\E[m, home=\E[H,
+-	hpa=\E[%i%p1%dG, ht=^I, il1=\E[L,
++	cuu1=\EM, cvvis=\E[1Q, dch1=\E[P, dsl=\Eg\Ef\r, ed=\E[J,
++	el=\E[K, flash=\E[5m$<200/>\E[m, home=\E[H, ht=^I,
+ 	is2=\E<\E[?21l\E[19h\E[1Q\E[10l\E[7l\E[H\E[2J,
+ 	kf1=\E?a, kf2=\E?b, kf3=\E?c, kf4=\E?d, kf5=\E?e, kf6=\E?f,
+ 	kf7=\E?g, kf8=\E?h, kf9=\E?i, ri=\EM, rmacs=\E(B,
+-	rmam=\E[?7h, rmcup=, rmir=\E[4l, rmso=\E[m, rmul=\E[m,
+-	sgr0=\E[m, smacs=\E(B, smam=\E[?7l,
+-	smcup=\E[?20l\E[?7h\E[1Q, smir=\E[4h, smso=\E[7m,
+-	smul=\E[4m, vpa=\E[%i%p1%dd, use=ansi+arrows,
++	rmam=\E[?7h, rmcup=, rmir=\E[4l, sgr0=\E[m, smacs=\E(B,
++	smam=\E[?7l, smcup=\E[?20l\E[?7h\E[1Q, smir=\E[4h,
++	use=ansi+arrows, use=ansi+idl1, use=ansi+rca2,
++	use=ansi+sgrso, use=ansi+sgrul,
+ 
+ tvi970-vb|TeleVideo 970 with visual bell,
+ 	flash=\E[?5h\0\0\0\0\0\0\0\0\0\0\0\0\0\E[?5l,
+@@ -12572,15 +12567,15 @@
+ 	am, bw, mir, xenl,
+ 	cols#80, lines#24,
+ 	bel=^G, cbt=\E[Z, clear=\E[H\E[2J, cr=\r, cub1=^H,
+-	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P$<40>, dl1=\E[M, ed=\E[J,
+-	el=\E[K, home=\E[H, ht=^I, il1=\E[L, ind=\n,
++	dch1=\E[P$<40>, ed=\E[J, el=\E[K, ht=^I, ind=\n,
+ 	is2=\E[7s\E[2;3;4;20;?5;?6l\E[12;?7h\E[1Q\E[0;1(D\E[8s,
+ 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+ 	kf1=\E_A\E\\, kf2=\E_B\E\\, kf3=\E_C\E\\, kf4=\E_D\E\\,
+ 	kf5=\E_E\E\\, kf6=\E_F\E\\, kf7=\E_G\E\\, kf8=\E_H\E\\,
+ 	kf9=\E_I\E\\, khome=\E[H, ri=\EM, rmam=\E[?7l, rmir=\E[4l,
+-	rmso=\E[m, rmul=\E[m, sgr0=\E[m, smam=\E[?7h, smir=\E[4h,
+-	smso=\E[1m, smul=\E[4m, use=ansi+local1,
++	rmso=\E[m, sgr0=\E[m, smam=\E[?7h, smir=\E[4h, smso=\E[1m,
++	use=ansi+cup, use=ansi+idl1, use=ansi+local1,
++	use=ansi+sgrul,
+ 
+ # some of the vi300s have older firmware that has the command
+ # sequence for setting editing extent reversed.
+@@ -12624,9 +12619,9 @@
+ 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P,
+ 	dsl=\EP2;1~\E\\, ed=\E[J, el=\E[K, fsl=\E\\, ind=\ED,
+ 	is1=\E>\E[?3l\E[?4l\E[?7h\E[?8h\E[1;24r, rev=\E[7m,
+-	ri=\EM, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
+-	sgr0=\E[m\017$<2>, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+-	tsl=\EP2~, use=ansi+idl1, use=decid+cpr, use=vt100+4bsd,
++	ri=\EM, rmir=\E[4l, sgr0=\E[m\017$<2>, smir=\E[4h,
++	tsl=\EP2~, use=ecma+underline, use=ecma+standout,
++	use=ansi+idl1, use=decid+cpr, use=vt100+4bsd,
+ 
+ #### Wyse (wy)
+ #
+@@ -13075,11 +13070,10 @@
+ 	bel=^G, cbt=\E[Z, clear=\E[H\E[J$<200>, cr=\r,
+ 	cub=\E[%p1%dD$<1>, cub1=\010$<1>, cud=\E[%p1%dB,
+ 	cud1=\ED, cuf=\E[%p1%dC$<1>, cuf1=\E[C$<1>,
+-	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EM,
+-	cvvis=\E[34l\E[?25h, dim=\E[2m, ech=\E[%p1%dX,
+-	ed=\E[J$<8*>, el=\E[K$<1>, el1=\E[1K$<1>, enacs=\E)0,
+-	flash=\E[?5h$<30/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
+-	ht=^I, ich=\E[%p1%d@, ind=\n$<1>,
++	cuu=\E[%p1%dA, cuu1=\EM, cvvis=\E[34l\E[?25h, dim=\E[2m,
++	ech=\E[%p1%dX, ed=\E[J$<8*>, el=\E[K$<1>, el1=\E[1K$<1>,
++	enacs=\E)0, flash=\E[?5h$<30/>\E[?5l, ht=^I,
++	ich=\E[%p1%d@, ind=\n$<1>,
+ 	is2=\E7\E[1r\E8\E[2;3;4;13;20;34;39;36l\E[12;16;34h\E[?1;3;4
+ 	    ;5;10;18l\E[?7;8;25h\E>\E[?5W\E(B\017\E[4i,
+ 	kbs=^H, kcbt=\E[z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
+@@ -13087,15 +13081,16 @@
+ 	kf20=\E[33~, kf21=\E[34~, kf22=\E[35~, kf23=\E[1~,
+ 	kf24=\E[2~, kf5=\E[M, ll=\E[24E, mc0=\E[?19h, nel=\EE,
+ 	prot=\E[1"q, ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l,
+-	rmkx=\E[?1l, rmso=\E[27m, rmul=\E[24m,
++	rmkx=\E[?1l,
+ 	rs2=\E[61"p\E[40h\E[?6l\E[1r\E[2;3;4;13;20;34;39;36l\E[12;16
+ 	    ;34h\E[?1;3;4;5;10;18l\E[?7;8;25h\E>\E[?5W\E(B\017\E[24E
+ 	    \E[4i,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%O%t;7%;%?%p4%t;5%;%?
+ 	    %p5%t;2%;%?%p7%t;8%;m\E[%?%p8%t1%;"q%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017\E["q, smacs=^N, smam=\E[?7h, smir=\E[4h,
+-	smkx=\E[?1h, vpa=\E[%i%p1%dd, use=ansi+csr, use=ansi+idl,
+-	use=ansi+pp, use=ansi+sgrbold, use=vt100+pf1-pf4,
++	smkx=\E[?1h, use=ecma+underline, use=ecma+standout,
++	use=ansi+csr, use=ansi+cup, use=ansi+idl, use=ansi+pp,
++	use=ansi+rca2, use=ansi+sgrbold, use=vt100+pf1-pf4,
+ 	use=vt220+ufkeys, use=wyse+cvis,
+ 
+ # http://www.bitsavers.org/pdf/wyse/WY-99/880411-02A_WY-99GT_User_Manual_198703.pdf
+@@ -13259,13 +13254,13 @@
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	bel=^G, clear=\E[H\E[J$<30>, cr=\r,
+ 	csr=\E[%i%p1%d;%p2%dr$<2>, cub1=^H, cud1=\n,
+-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP$<3*>,
+-	dch1=\E[P$<3>, dim=\E[0t\E[2m, dl=\E[%p1%dM$<1*>,
+-	dl1=\E[M, dsl=\E[>\,\001\001\E[>-\001\001,
+-	ech=\E[%p1%dX, ed=\E[J$<30>, el=\E[K$<3>, el1=\E[1K$<3>,
+-	enacs=\E)0, flash=\E[30h\E\,$<250/>\E[30l, fsl=^A,
+-	home=\E[H, hpa=\E[%i%p1%dG, ich=\E[%p1%d@$<1*>,
+-	il=\E[%p1%dL$<2*>, il1=\E[L$<2>, ind=\n$<2>, ip=$<1>,
++	dch=\E[%p1%dP$<3*>, dch1=\E[P$<3>, dim=\E[0t\E[2m,
++	dl=\E[%p1%dM$<1*>, dl1=\E[M,
++	dsl=\E[>\,\001\001\E[>-\001\001, ech=\E[%p1%dX,
++	ed=\E[J$<30>, el=\E[K$<3>, el1=\E[1K$<3>, enacs=\E)0,
++	flash=\E[30h\E\,$<250/>\E[30l, fsl=^A, hpa=\E[%i%p1%dG,
++	ich=\E[%p1%d@$<1*>, il=\E[%p1%dL$<2*>, il1=\E[L$<2>,
++	ind=\n$<2>, ip=$<1>,
+ 	is1=\E[2;4;20;30l\E[?1;10l\E[12h\E[?7;8;25h,
+ 	is2=\E>\E(B\E)0\017, is3=\E[m, kdl1=\E[M, kel=\E[K,
+ 	kf1=\E[?5i, kf2=\E[?3i, kf21=\E[35~, kf3=\E[2i, kf4=\E[@,
+@@ -13280,10 +13275,10 @@
+ 	    \016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
+ 	smkx=\E[?1l\E[?7h\E=, smso=\E[1t\E[7m, smul=\E[2t\E[4m,
+-	tsl=\E[>\,\001, use=ansi+arrows, use=ansi+local,
+-	use=ansi+pp, use=ansi+tabs, use=decid+cpr,
+-	use=vt220+cvis, use=vt220+keypad, use=vt220+sfkeys,
+-	use=vt220+ufkeys,
++	tsl=\E[>\,\001, use=ansi+arrows, use=ansi+cup,
++	use=ansi+local, use=ansi+pp, use=ansi+tabs,
++	use=decid+cpr, use=vt220+cvis, use=vt220+keypad,
++	use=vt220+sfkeys, use=vt220+ufkeys,
+ #
+ #	This terminal description uses the non-hidden attribute mode
+ #	(with magic cookie).
+@@ -13425,17 +13420,17 @@
+ 	is3=\E>\E(B\E)0\017\E[m, kcbt=\E[Z, khlp=\E[28~,
+ 	khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i,
+ 	rc=\E8, ri=\EM$<2>, rmam=\E[?7l, rmcup=\E[ R, rmir=\E[4l,
+-	rmkx=\E>, rmso=\E[27m, rmul=\E[24m,
+-	rs1=\E[13l\E[3l\E\\\E[63;1"p\E[!p, rs2=\E[35h\E[?3l,
+-	rs3=\E[?5l\E[47h\E[40l\E[r, sc=\E7,
++	rmkx=\E>, rs1=\E[13l\E[3l\E\\\E[63;1"p\E[!p,
++	rs2=\E[35h\E[?3l, rs3=\E[?5l\E[47h\E[40l\E[r, sc=\E7,
+ 	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?
+ 	    %p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smam=\E[?7h, smcup=\E[ Q, smir=\E[4h,
+ 	smkx=\E[?1l\E=, tsl=\E7\E[99;%i%p1%dH, vpa=\E[%i%p1%dd,
+-	use=ansi+arrows, use=ansi+inittabs, use=ansi+local,
+-	use=ansi+pp, use=ansi+sgrbold, use=decid+cpr,
+-	use=vt100+4bsd, use=vt220+vtedit, use=vt220+keypad,
+-	use=vt220+sfkeys, use=vt220+ufkeys, use=wyse+cvis,
++	use=ecma+underline, use=ecma+standout, use=ansi+arrows,
++	use=ansi+inittabs, use=ansi+local, use=ansi+pp,
++	use=ansi+sgrbold, use=decid+cpr, use=vt100+4bsd,
++	use=vt220+vtedit, use=vt220+keypad, use=vt220+sfkeys,
++	use=vt220+ufkeys, use=wyse+cvis,
+ #
+ #	Wyse 185 with 24 data lines and top status (terminal status)
+ wy185-24|wyse185-24|Wyse 185 with 24 data lines,
+@@ -13604,19 +13599,19 @@
+ 	oc=\E[60w\E[63;0w\E[66;1;4w\E[66;2;13w\E[66;3;16w\E[66;4;49w
+ 	   \E[66;5;51w\E[66;6;61w\E[66;7;64w,
+ 	op=\E[m, ri=\EM$<2>, rmacs=^O, rmam=\E[?7l, rmclk=\E[31l,
+-	rmcup=\E[ R, rmir=\E[4l, rmkx=\E>, rmso=\E[27m,
+-	rmul=\E[24m, rs1=\E[13l\E[3l\E!p\E[?4i,
+-	rs2=\E[35h\E[?3l$<8>, rs3=\E[?5l, setb=\E[62;%p1%dw,
+-	setf=\E[61;%p1%dw,
++	rmcup=\E[ R, rmir=\E[4l, rmkx=\E>,
++	rs1=\E[13l\E[3l\E!p\E[?4i, rs2=\E[35h\E[?3l$<8>,
++	rs3=\E[?5l, setb=\E[62;%p1%dw, setf=\E[61;%p1%dw,
+ 	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?
+ 	    %p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smcup=\E[ Q,
+ 	smir=\E[4h, smkx=\E[?1l\E=,
+ 	tsl=\E[40l\E[40h\E7\E[99;%i%p1%dH, u0=\E[?38h\E8,
+ 	u1=\E[?38l\E)0, u2=\E[92;52"p, u3=\E~B, u4=\E[92;76"p,
+-	u5=\E%!1\E[90;1"p, vpa=\E[%i%p1%dd, use=ansi+csr,
+-	use=ansi+inittabs, use=ansi+local, use=ansi+pp,
+-	use=ansi+sgrbold, use=decid+cpr, use=wyse+cvis,
++	u5=\E%!1\E[90;1"p, vpa=\E[%i%p1%dd, use=ecma+underline,
++	use=ecma+standout, use=ansi+csr, use=ansi+inittabs,
++	use=ansi+local, use=ansi+pp, use=ansi+sgrbold,
++	use=decid+cpr, use=wyse+cvis,
+ #
+ #	Function key set for the ASCII (wy-50 compatible) keyboard
+ #	This is the default 370.
+@@ -13738,18 +13733,17 @@
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	bel=^G, clear=\E[H\E[J$<40>, cr=\r,
+ 	csr=\E[%i%p1%d;%p2%dr$<20>, cub1=^H, cud1=\n,
+-	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[?25h\E[34l,
+-	dch=\E[%p1%dP$<3>, dch1=\E[P$<30>, dim=\E[2m,
+-	dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>, dsl=\E[0$~,
++	cvvis=\E[?25h\E[34l, dch=\E[%p1%dP$<3>, dch1=\E[P$<30>,
++	dim=\E[2m, dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>, dsl=\E[0$~,
+ 	ech=\E[%p1%dX, ed=\E[J$<40>, el=\E[K, el1=\E[1K,
+-	enacs=\E)0, fsl=\E[0$}, home=\E[H, hpa=\E[%i%p1%d`,
++	enacs=\E)0, fsl=\E[0$}, hpa=\E[%i%p1%d`,
+ 	ich=\E[%p1%d@$<2>, il=\E[%p1%dL$<3*>, il1=\E[L$<3>,
+ 	ind=\n$<2>, ip=$<4>, is1=\E[?5W,
+ 	is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25;67h,
+ 	is3=\E>\E(B\E)0\017\E[m, kcbt=\E[Z, ked=\E[1~, kel=\E[4~,
+ 	khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3,
+ 	lf4=PF4, mc0=\E[0i, ri=\EM$<2>, rmacs=^O, rmam=\E[?7l,
+-	rmcup=\E[ R, rmir=\E[4l, rmul=\E[24m,
++	rmcup=\E[ R, rmir=\E[4l,
+ 	rs1=\E[13l\E[3l\E\\\E[63;1"p\E[!p, rs2=\E[35h\E[?3l,
+ 	rs3=\E[?5l\E[47h\E[40l\E[r,
+ 	sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?
+@@ -13757,10 +13751,11 @@
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h,
+ 	smcup=\E[ Q\E[?67;8h, smir=\E[4h,
+ 	tsl=\E[2$~\E[1$}\E[%i%p1%d`, vpa=\E[%i%p1%dd,
+-	use=ansi+arrows, use=ansi+csr, use=ansi+local,
+-	use=ansi+pp, use=ansi+sgrbold, use=ansi+tabs,
+-	use=decid+cpr, use=vt220+vtedit, use=vt220+keypad,
+-	use=vt220+sfkeys, use=vt220+ufkeys, use=wyse+cvis,
++	use=ecma+underline, use=ansi+arrows, use=ansi+csr,
++	use=ansi+cup, use=ansi+local, use=ansi+pp,
++	use=ansi+sgrbold, use=ansi+tabs, use=decid+cpr,
++	use=vt220+vtedit, use=vt220+keypad, use=vt220+sfkeys,
++	use=vt220+ufkeys, use=wyse+cvis,
+ #
+ #       Wyse 520 with 24 data lines and status (terminal status)
+ wy520-24|wyse520-24|Wyse 520 with 24 data lines,
+@@ -13974,6 +13969,7 @@
+ 	is2=\EO\Eq\EG\Ev\EJ\EY7\sK5\sMS\sKermit\s2.27\s+automatic
+ 	    \smargins\s3-17-85\n,
+ 	use=msk227,
++
+ # MS-DOS Kermit 2.27 UCB 227.14 for the IBM PC
+ # Automatic margins now default.  Use ansi  for highlights.
+ # Define function keys.
+@@ -13985,8 +13981,9 @@
+ 	is2=\EO\Eq\EG\Ev\EJ\EY7\sK6\sMS\sKermit\s2.27\sUCB\s227.14
+ 	    \sIBM\sPC\s3-17-85\n,
+ 	kf0=\E0, kf1=\E1, kf2=\E2, kf3=\E3, kf4=\E4, kf5=\E5, kf6=\E6,
+-	kf7=\E7, kf8=\E8, kf9=\E9, rev=\E[7m, rmso=\E[m, rmul=\E[m,
+-	sgr0=\E[m, smso=\E[1m, smul=\E[4m, use=mskermit227,
++	kf7=\E7, kf8=\E8, kf9=\E9, rev=\E[7m, rmso=\E[m, sgr0=\E[m,
++	smso=\E[1m, use=ansi+sgrul, use=mskermit227,
++
+ # This was designed for a VT320 emulator, but it is probably a good start
+ # at support for the VT320 itself.
+ # Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu.
+@@ -13996,24 +13993,23 @@
+ 	cols#80, it#8, lines#49, pb#9600, vt#3,
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, cmdch=\E, cr=\r, cub1=^H,
+-	cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+-	ech=\E[%p1%dX,
++	cud1=\n, dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX,
+ 	flash=\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[
+ 	      ?5l,
+-	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
+-	ind=\n, is2=\E>\E F\E[?1h\E[?7h\E[r\E[2$~, kbs=^H,
+-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdl1=\E[3~,
+-	kf0=\E[21~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
++	ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\n,
++	is2=\E>\E F\E[?1h\E[?7h\E[r\E[2$~, kbs=^H, kcub1=\EOD,
++	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdl1=\E[3~, kf0=\E[21~,
++	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+ 	kich1=\E[2~, knp=\E[6~, kpp=\E[5~, mc0=\E[0i, mc4=\E[4i,
+ 	mc5=\E[5i, nel=\r\n, rev=\E[7m, ri=\EM, rin=\E[%p1%dL,
+ 	rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>,
+-	rmso=\E[27m, rmul=\E[24m,
+ 	rs1=\E(B\E)B\E>\E\sF\E[4;20l\E[12h\E[?1;5;6;38;42l\E[?7;25h
+ 	    \E[4i\E[?4i\E[m\E[r\E[2$~,
+ 	sgr0=\E[m, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
+-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+-	tsl=\E[1$}\r\E[K, vpa=\E[%i%p1%dd, use=ansi+csr,
+-	use=ansi+erase, use=ansi+idl, use=ansi+local, use=dec+sl,
++	smkx=\E[?1h\E=, tbc=\E[3g, tsl=\E[1$}\r\E[K,
++	use=ecma+underline, use=ecma+standout, use=ansi+cup,
++	use=ansi+csr, use=ansi+erase, use=ansi+idl,
++	use=ansi+local, use=ansi+rca2, use=dec+sl,
+ 	use=vt100+pf1-pf4, use=vt220+cvis,
+ 
+ # From: Joseph Gil  13 Dec 1991
+@@ -14024,21 +14020,21 @@
+ 	cols#80, it#8, lines#24, vt#3,
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[;H\E[2J, cr=\r,
+-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP,
+-	dch1=\E[P, dsl=\E[2$~\r\E[1$}\E[K\E[$}, ed=\E[J, el=\E[K,
+-	flash=\E[?5h$<100/>\E[?5l, fsl=\E[$}, home=\E[H, ht=^I,
+-	hts=\EH, ich=\E[%p1%d@, il1=\E[L$<3/>, ind=\ED,
++	cub1=^H, cud1=\n, dch=\E[%p1%dP, dch1=\E[P,
++	dsl=\E[2$~\r\E[1$}\E[K\E[$}, ed=\E[J, el=\E[K,
++	flash=\E[?5h$<100/>\E[?5l, fsl=\E[$}, ht=^I, hts=\EH,
++	ich=\E[%p1%d@, il1=\E[L$<3/>, ind=\ED,
+ 	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H,
+ 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+ 	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, lf1=pf1,
+ 	lf2=pf2, lf3=pf3, lf4=pf4, nel=\r\ED, rev=\E[7m,
+ 	rf=/usr/share/tabset/vt100, ri=\EM, rmacs=^O,
+-	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
+-	rmul=\E[24m, rs1=\E[?3l, sgr0=\E[m, smacs=^N, smam=\E[?7h,
+-	smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+-	tbc=\E[3g, tsl=\E[2$~\E[1$}\E[1;%dH, use=ansi+csr,
+-	use=ansi+idl, use=ansi+local, use=vt100+pf1-pf4,
+-	use=vt220+cvis,
++	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rs1=\E[?3l,
++	sgr0=\E[m, smacs=^N, smam=\E[?7h, smir=\E[4h,
++	smkx=\E[?1h\E=, tbc=\E[3g, tsl=\E[2$~\E[1$}\E[1;%dH,
++	use=ecma+underline, use=ecma+standout, use=ansi+csr,
++	use=ansi+cup, use=ansi+idl, use=ansi+local,
++	use=vt100+pf1-pf4, use=vt220+cvis,
+ 
+ ######## NON-ANSI TERMINAL EMULATIONS
+ #
+@@ -14213,17 +14209,17 @@
+ att2300|sv80|AT&T 2300 Video Information Terminal 80 column mode,
+ 	am, eo, mir, msgr, xon,
+ 	cols#80, it#8, lines#24,
+-	bel=^G, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
+-	dch=\E[%p1%dP, dch1=\E[P, el1=\E[1K, home=\E[H, ht=^I,
+-	ich=\E[%p1%d@, ind=\n, kcbt=\E[Z, kclr=\E[J, kdch1=\E[P,
+-	kdl1=\E[M, kf1=\E[1r, kf10=\E[10r, kf11=\E[11r,
+-	kf12=\E[12r, kf13=\E[13r, kf14=\E[14r, kf15=\E[15r,
+-	kf16=\E[16r, kf2=\E[2r, kf3=\E[3r, kf4=\E[4r, kf5=\E[5r,
+-	kf6=\E[6r, kf7=\E[7r, kf8=\E[8r, kf9=\E[9r, kich1=\E[@,
+-	kil1=\E[L, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rev=\E[7m,
+-	rmir=\E[4l, rmso=\E[m, sgr0=\E[m, smir=\E[4h, smso=\E[7m,
+-	use=ansi+arrows, use=ansi+cpr, use=ansi+erase,
+-	use=ansi+idl, use=ansi+local,
++	bel=^G, cr=\r, cub1=^H, cud1=\n, dch=\E[%p1%dP, dch1=\E[P,
++	el1=\E[1K, ht=^I, ich=\E[%p1%d@, ind=\n, kcbt=\E[Z,
++	kclr=\E[J, kdch1=\E[P, kdl1=\E[M, kf1=\E[1r, kf10=\E[10r,
++	kf11=\E[11r, kf12=\E[12r, kf13=\E[13r, kf14=\E[14r,
++	kf15=\E[15r, kf16=\E[16r, kf2=\E[2r, kf3=\E[3r, kf4=\E[4r,
++	kf5=\E[5r, kf6=\E[6r, kf7=\E[7r, kf8=\E[8r, kf9=\E[9r,
++	kich1=\E[@, kil1=\E[L, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
++	rev=\E[7m, rmir=\E[4l, sgr0=\E[m, smir=\E[4h,
++	use=ansi+arrows, use=ansi+cpr, use=ansi+cup,
++	use=ansi+erase, use=ansi+idl, use=ansi+local,
++	use=ansi+sgrso,
+ 
+ att2350|AT&T 2350 Video Information Terminal 80 column mode,
+ 	mc0@, mc4@, mc5@, use=att2300,
+@@ -14245,8 +14241,7 @@
+ 	acsc=++\,\,--..00``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyz
+ 	     z{{||}}~~,
+ 	bel=^G, bold=\E[2;7m, cr=\r, cub1=^H, dch1=\E[P, dim=\E[2m,
+-	dl1=\E[M, fsl=\E8, ht=^I, ich1=\E[@, il1=\E[L, ind=\n,
+-	is1=\E[?3l\E)0,
++	fsl=\E8, ht=^I, ich1=\E[@, ind=\n, is1=\E[?3l\E)0,
+ 	is3=\E[1;03q\s\s\sf1\s\s\s\s\s\s\s\s\s\s\s\EOP\E[2;03q\s\s
+ 	    \sf2\s\s\s\s\s\s\s\s\s\s\s\EOQ\E[3;03q\s\s\sf3\s\s\s\s
+ 	    \s\s\s\s\s\s\s\EOR\E[4;03q\s\s\sf4\s\s\s\s\s\s\s\s\s\s
+@@ -14264,8 +14259,8 @@
+ 	    %|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, tsl=\E7\E[25;%p1%{1}%+%dH,
+ 	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
+-	use=ansi+erase, use=ansi+local1, use=ansi+sgrbold,
+-	use=vt100+pf1-pf4,
++	use=ansi+erase, use=ansi+idl1, use=ansi+local1,
++	use=ansi+sgrbold, use=vt100+pf1-pf4,
+ 
+ att4410v1-w|att5410v1-w|tty5410v1-w|AT&T 4410/5410 132 columns - version 1,
+ 	cols#132, wsl#132,
+@@ -14289,18 +14284,18 @@
+ 	bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
+ 	clear=\E[H\E[J$<50>, cr=\r, cub1=^H, cud1=\n,
+ 	cuf1=\E[C$<2>, cup=\E[%i%p1%d;%p2%dH$<5>,
+-	cuu1=\E[A$<2>, dch1=\E[P, dl1=\E[M, ed=\E[J$<50>,
+-	el=\E[K$<3>, el1=\E[1K$<3>, enacs=\E(B\E)0, home=\E[H,
+-	ht=^I, hts=\EH, ich1=\E[@, il1=\E[L, ind=\n, kbs=^H,
+-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+-	rev=\E[7m$<2>, ri=\EM$<5>, rmacs=^O, rmam=\E[?7l,
+-	rmkx=\E[?1l\E>, rmso=\E[m$<2>, rmul=\E[m$<2>,
+-	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
++	cuu1=\E[A$<2>, dch1=\E[P, ed=\E[J$<50>, el=\E[K$<3>,
++	el1=\E[1K$<3>, enacs=\E(B\E)0, home=\E[H, ht=^I, hts=\EH,
++	ich1=\E[@, ind=\n, kbs=^H, kcub1=\EOD, kcud1=\EOB,
++	kcuf1=\EOC, kcuu1=\EOA, rev=\E[7m$<2>, ri=\EM$<5>,
++	rmacs=^O, rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m$<2>,
++	rmul=\E[m$<2>, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+ 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5
+ 	    %;m%?%p9%t\016%e\017%;$<2>,
+ 	sgr0=\E[m\017$<2>, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=,
+ 	smso=\E[1;7m$<2>, smul=\E[4m$<2>, tbc=\E[3g,
+-	use=ansi+csr, use=decid+cpr, use=vt100+fnkeys,
++	use=ansi+csr, use=ansi+idl1, use=decid+cpr,
++	use=vt100+fnkeys,
+ 
+ #
+ # Teletype Model 5420 -- A souped up 5410, with multiple windows,
+@@ -14408,12 +14403,10 @@
+ 	cols#80, lh#2, lines#24, lm#78, lw#8, nlab#8, wsl#55,
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	cbt=\E[1Z, clear=\EH\EJ, cnorm=\E[11;0j, cr=\EG, cub1=^H,
+-	cud1=\E[1B, cuf1=\E[1C, cup=\E[%i%p1%d;%p2%dH,
+-	cuu1=\E[1A, cvvis=\E[11;1j, dch=\E[%p1%dP, dch1=\E[P,
+-	ech=\E[%p1%ds\E[%p1%dD, ed=\E[0J, el=\E[0K, el1=\E[1K,
+-	flash=\E[?5h$<200>\E[?5l, fsl=\E8, home=\E[H,
+-	hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@, ich1=\E[@, ind=\n,
+-	indn=\E[%p1%dE,
++	cud1=\E[1B, cuf1=\E[1C, cuu1=\E[1A, cvvis=\E[11;1j,
++	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%ds\E[%p1%dD,
++	ed=\E[0J, el=\E[0K, el1=\E[1K, flash=\E[?5h$<200>\E[?5l,
++	fsl=\E8, ich=\E[%p1%d@, ich1=\E[@, ind=\n, indn=\E[%p1%dE,
+ 	is1=\E[0;23r\Ex\Ey\E[2;0j\E[3;3j\E[4;0j\E[5;0j\E[6;0j\E[7;0j
+ 	    \E[8;0j\E[9;1j\E[10;0j\E[15;0j\E[16;1j\E[19;0j\E[20;1j
+ 	    \E[29;0j\E[1;24r,
+@@ -14432,10 +14425,10 @@
+ 	sgr=\E[0%?%p1%p5%|%t;2%;%?%p2%p6%|%t;4%;%?%p4%t;5%;%?%p3%p1
+ 	    %|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;%?%p8%t\EV%;,
+ 	sgr0=\E[m\017, smacs=^N, smkx=\E[19;1j, smln=\E~,
+-	tsl=\E7\E[25;%p1%{8}%+%dH, vpa=\E[%p1%{1}%+%dd,
+-	use=ansi+arrows, use=ansi+csr, use=ansi+idl,
+-	use=ansi+inittabs, use=ansi+local, use=ansi+sgrdim,
+-	use=decid+cpr,
++	tsl=\E7\E[25;%p1%{8}%+%dH, use=ansi+arrows,
++	use=ansi+csr, use=ansi+cup, use=ansi+idl,
++	use=ansi+inittabs, use=ansi+local, use=ansi+rca,
++	use=ansi+sgrdim, use=decid+cpr,
+ 
+ att5420_2-w|AT&T 5420 model 2 in 132 column mode,
+ 	cols#132,
+@@ -14448,9 +14441,8 @@
+ 	am, xon,
+ 	cols#80, lines#24,
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+-	bel=^G, blink=\E[5m, clear=\E[H\E[2J, cr=\r,
+-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[1P,
+-	dim=\E[2m, ed=\E[0J, el=\E[0K, home=\E[H, ich=\E[%p1%d@,
++	bel=^G, blink=\E[5m, clear=\E[H\E[2J, cr=\r, dch=\E[%p1%dP,
++	dch1=\E[1P, dim=\E[2m, ed=\E[0J, el=\E[0K, ich=\E[%p1%d@,
+ 	ich1=\E[1@, il1=\E[1L, ind=\n, is1=\E[?3l,
+ 	is2=\E)0\E?6l\E?5l, kclr=\E[%%, kcub1=\E@, kcud1=\EU,
+ 	kcuf1=\EA, kcuu1=\ES, kent=\E[, kf1=\E[h, kf10=\E[m,
+@@ -14458,9 +14450,9 @@
+ 	kf18=\E[K, kf19=\E[L, kf2=\E[i, kf20=\E[E, kf21=\E[_,
+ 	kf22=\E[M, kf23=\E[N, kf24=\E[O, kf3=\E[j, kf6=\E[k,
+ 	kf7=\E[l, kf8=\E[f, kf9=\E[w, khome=\Ec, rc=\E8, rev=\E[7m,
+-	rmacs=^O, rmso=\E[m, rmul=\E[m, sc=\E7, sgr0=\E[m\017,
+-	smacs=^N, smso=\E[7m, smul=\E[4m, use=ansi+idl,
+-	use=ansi+local,
++	rmacs=^O, sc=\E7, sgr0=\E[m\017, smacs=^N, use=ansi+cup,
++	use=ansi+idl, use=ansi+local, use=ansi+sgrso,
++	use=ansi+sgrul,
+ 
+ att4418-w|att5418-w|AT&T 5418 132 cols,
+ 	cols#132,
+@@ -14498,15 +14490,15 @@
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	bel=^G, blink=\E3, bold=\E3, cbt=\EO, clear=\E[H\E[2J, cr=\r,
+ 	csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\EB, cuf1=\EC,
+-	cup=\E[%i%p1%d;%p2%dH, cuu1=\EA, dch=\E[%p1%dP, dch1=\EP,
+-	dim=\EW, dl=\E[%p1%dM, dl1=\EM, ed=\EJ, el=\Ez, home=\E[H,
+-	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E\^, il=\E[%p1%dL,
+-	il1=\EL, ind=\n, is2=\E[20l\E[?7h, kclr=\EJ, nel=\EE,
+-	rev=\E}, ri=\ET, rmacs=\E(B, rmso=\E~, rmul=\EZ,
++	cuu1=\EA, dch=\E[%p1%dP, dch1=\EP, dim=\EW, dl=\E[%p1%dM,
++	dl1=\EM, ed=\EJ, el=\Ez, ht=^I, hts=\EH, ich=\E[%p1%d@,
++	ich1=\E\^, il=\E[%p1%dL, il1=\EL, ind=\n, is2=\E[20l\E[?7h,
++	kclr=\EJ, nel=\EE, rev=\E}, ri=\ET, rmacs=\E(B, rmso=\E~,
++	rmul=\EZ,
+ 	sgr=\EX\E~\EZ\E4\E(B%?%p1%p3%|%t\E}%;%?%p2%t\E\\%;%?%p4%p6%|
+ 	    %t\E3%;%?%p5%t\EW%;%?%p9%t\E(0%;,
+ 	sgr0=\EX\E~\EZ\E4\E(B, smacs=\E(0, smso=\E}, smul=\E\\,
+-	tbc=\EF, use=ansi+arrows, use=ansi+local,
++	tbc=\EF, use=ansi+arrows, use=ansi+cup, use=ansi+local,
+ 	use=vt100+pf1-pf4,
+ 
+ att4424-1|tty4424-1|Teletype 4424 in display function group I,
+@@ -14525,8 +14517,8 @@
+ 	bel=^G, clear=\E[2;H\E[J, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
+ 	cup=\E[%i%p1%2d;%p2%2dH\E[B, cuu1=\E[A, dch1=\EP,
+ 	dl1=\EM, el=\E[K, ht=^I, ich1=\E\^, il1=\EL, ind=\n, ip=$<2/>,
+-	is2=\E[m\E[2;24r, nel=\r\n, ri=\ET, rmso=\E[m, rmul=\E[m,
+-	sgr0=\E[m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
++	is2=\E[m\E[2;24r, nel=\r\n, ri=\ET, sgr0=\E[m,
++	use=ansi+arrows, use=ansi+sgrso, use=ansi+sgrul,
+ 	use=vt100+pf1-pf4,
+ 
+ # The Teletype 5425 is really version 2 of the Teletype 5420. It
+@@ -14544,8 +14536,8 @@
+ 	bold=\E[2;7m, cnorm=\E[12;0j, cub1=^H, cud1=\n,
+ 	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[12;1j, dch=\E[%p1%dP,
+ 	dch1=\E[P, dim=\E[2m, ech=\E[%p1%ds\E[%p1%dD, el1=\E[1K,
+-	flash=\E[?5h$<200>\E[?5l, fsl=\E8, hpa=\E[%p1%{1}%+%dG,
+-	ich=\E[%p1%d@, indn=\E[%p1%dE, is1=\E<\E[?3l$<100>,
++	flash=\E[?5h$<200>\E[?5l, fsl=\E8, ich=\E[%p1%d@,
++	indn=\E[%p1%dE, is1=\E<\E[?3l$<100>,
+ 	is2=\E[m\017\E[1;2;3;4;6l\E[12;13;14;20l\E[?6;97;99l\E[?7h
+ 	    \E[4i\Ex\E[25;1j\212,
+ 	is3=\E[?5l, kbeg=\Et, kcbt=\E[Z, kclr=\E[J, kdch1=\E[P,
+@@ -14562,9 +14554,9 @@
+ 	    %|%t;7%;%?%p7%t;8%;m%?%p8%t\EV%;%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smam=\E[?7h, smir=\E[4h,
+ 	smkx=\E[21;1j\E[25;4j\Eent\E~, smln=\E~,
+-	tsl=\E7\E[25;%p1%{8}%+%dH, vpa=\E[%p1%{1}%+%dd,
+-	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
+-	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
++	tsl=\E7\E[25;%p1%{8}%+%dH, use=ansi+arrows,
++	use=ansi+csr, use=ansi+erase, use=ansi+idl,
++	use=ansi+inittabs, use=ansi+local, use=ansi+rca,
+ 	use=ansi+sgrbold, use=decid+cpr, use=vt100+4bsd,
+ 
+ att5425-nl|tty5425-nl|att4425-nl|AT&T 4425/5425 80 columns no labels,
+@@ -14581,16 +14573,16 @@
+ 	cols#80, lines#24, lm#48,
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	bel=^G, bold=\E[5m, clear=\E[H\E[2J\E[1U\E[H\E[2J\E[1V,
+-	cr=\r, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\EP,
+-	ed=\E[J, el=\E[0K, home=\E[H, hpa=\E[%p1%dG, ht=^I, hts=\E1,
+-	ich=\E[%p1%d@, ich1=\E\^, il1=\EL, ind=\n, is1=\Ec\E[?7h,
+-	is2=\E[m\E[1;24r, kbs=^H, kcbt=\EO, kclr=\E[2J, kf5=\EOT,
+-	kf6=\EOU, kf7=\EOV, kf8=\EOW, khome=\E[H, kll=\E[24;1H,
+-	ll=\E[24H, nel=\r\n, rc=\E8, rev=\E[7m, ri=\ET, rmacs=\E(B,
+-	rmam=\E[?7l, rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y,
+-	sc=\E7, sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smso=\E[5m,
+-	smul=\E[4m, tbc=\E[3g, vpa=\E[%p1%dd, use=ansi+idl,
+-	use=ansi+local, use=ecma+index, use=vt100+pf1-pf4,
++	cr=\r, dch=\E[%p1%dP, dch1=\EP, ed=\E[J, el=\E[0K,
++	hpa=\E[%p1%dG, ht=^I, hts=\E1, ich=\E[%p1%d@, ich1=\E\^,
++	il1=\EL, ind=\n, is1=\Ec\E[?7h, is2=\E[m\E[1;24r, kbs=^H,
++	kcbt=\EO, kclr=\E[2J, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW,
++	khome=\E[H, kll=\E[24;1H, ll=\E[24H, nel=\r\n, rc=\E8,
++	rev=\E[7m, ri=\ET, rmacs=\E(B, rmam=\E[?7l, rmso=\E[m,
++	rs2=\Ec\E[?3l\E[2;0y, sc=\E7, sgr0=\E[m\E(B, smacs=\E(0,
++	smam=\E[?7h, smso=\E[5m, tbc=\E[3g, vpa=\E[%p1%dd,
++	use=ansi+cup, use=ansi+idl, use=ansi+local,
++	use=ansi+sgrul, use=ecma+index, use=vt100+pf1-pf4,
+ 	use=vt52+arrows,
+ 
+ # Terminfo entry for the AT&T 510 A Personal Terminal
+@@ -14607,9 +14599,8 @@
+ 	acsc=+g\,h-f.e`bhrisjjkkllmmnnqqttuuvvwwxx{{||}}~~,
+ 	bel=^G, blink=\E[5m, bold=\E[2;7m, civis=\E[11;0|,
+ 	clear=\E[H\E[J, cnorm=\E[11;3|, cr=\r, cub1=^H,
+-	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[11;2|, dch=\E[%p1%dP,
+-	dch1=\E[P, dim=\E[2m, ed=\E[0J, el=\E[0K, el1=\E[1K,
+-	enacs=\E(B\E)1, ff=^L, home=\E[H, ind=\n,
++	cvvis=\E[11;2|, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
++	ed=\E[0J, el=\E[0K, el1=\E[1K, enacs=\E(B\E)1, ff=^L, ind=\n,
+ 	is1=\E(B\E)1\E[2l, is3=\E[21;1|\212, kLFT=\E[u,
+ 	kRIT=\E[v, kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B,
+ 	kcuf1=\E[C, kcuu1=\E[A, kf1=\EOm, kf10=\EOd, kf11=\EOe,
+@@ -14617,13 +14608,12 @@
+ 	kf2=\EOV, kf3=\EOu, kf4=\ENj, kf5=\ENe, kf6=\ENf, kf7=\ENh,
+ 	kf8=\E[H, kf9=\EOc, kind=\E[S, kri=\E[T, mc0=\E[0i,
+ 	mc4=\E[?8i, mc5=\E[?4i, nel=\EE, pln=\E[%p1%dp%p2%:-16s,
+-	rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmkx=\E[19;0|,
+-	rmso=\E[m, rmul=\E[m, sc=\E7,
++	rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmkx=\E[19;0|, sc=\E7,
+ 	sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6
+ 	    %|%t;7%;m%?%p9%t\016%e\017%;,
+-	sgr0=\E[m\017, smacs=^N, smkx=\E[19;1|, smso=\E[7m,
+-	smul=\E[4m, use=ansi+cpr, use=ansi+idl, use=ansi+local,
+-	use=ansi+tabs,
++	sgr0=\E[m\017, smacs=^N, smkx=\E[19;1|, use=ansi+cpr,
++	use=ansi+cup, use=ansi+idl, use=ansi+local,
++	use=ansi+sgrso, use=ansi+sgrul, use=ansi+tabs,
+ 
+ # Terminfo entry for the AT&T 510 D Personal Terminal
+ # Function keys 9 through 16 are accessed by bringing up the
+@@ -14639,27 +14629,25 @@
+ 	cols#80, lh#2, lines#24, lm#48, lw#7, nlab#8,
+ 	acsc=+g\,h-f.e`bhrisjjkkllmmnnqqttuuvvwwxx{{||}}~~,
+ 	bel=^G, bold=\E[2;7m, clear=\E[H\E[J, cnorm=\E[11;3|,
+-	cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[11;2|,
+-	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ed=\E[0J, el=\E[0K,
+-	el1=\E[1K, enacs=\E(B\E)1, ff=^L, home=\E[H,
+-	hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@, ind=\n,
+-	is1=\E(B\E)1\E[5;0|, is3=\E[21;1|\212, kLFT=\E[u,
+-	kRIT=\E[v, kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B,
+-	kcuf1=\E[C, kcuu1=\E[A, kf1=\EOm, kf10=\EOd, kf11=\EOe,
+-	kf12=\EOf, kf13=\EOg, kf14=\EOh, kf15=\EOi, kf16=\EOj,
+-	kf2=\EOV, kf3=\EOu, kf4=\ENj, kf5=\ENe, kf6=\ENf, kf7=\ENh,
+-	kf8=\E[H, kf9=\EOc, kind=\E[S, kri=\E[T, ll=\E#2, mc0=\E[0i,
+-	mc4=\E[?8i, mc5=\E[?4i, mgc=\E:, nel=\EE,
++	cr=\r, cub1=^H, cvvis=\E[11;2|, dch=\E[%p1%dP, dch1=\E[P,
++	dim=\E[2m, ed=\E[0J, el=\E[0K, el1=\E[1K, enacs=\E(B\E)1,
++	ff=^L, ich=\E[%p1%d@, ind=\n, is1=\E(B\E)1\E[5;0|,
++	is3=\E[21;1|\212, kLFT=\E[u, kRIT=\E[v, kbs=^H, kcbt=\E[Z,
++	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOm,
++	kf10=\EOd, kf11=\EOe, kf12=\EOf, kf13=\EOg, kf14=\EOh,
++	kf15=\EOi, kf16=\EOj, kf2=\EOV, kf3=\EOu, kf4=\ENj, kf5=\ENe,
++	kf6=\ENf, kf7=\ENh, kf8=\E[H, kf9=\EOc, kind=\E[S, kri=\E[T,
++	ll=\E#2, mc0=\E[0i, mc4=\E[?8i, mc5=\E[?4i, mgc=\E:, nel=\EE,
+ 	pln=\E[%p1%dp%p2%:-16s, rc=\E8, ri=\EM, rmacs=^O,
+ 	rmir=\E[4l, rmkx=\E[19;0|, rmln=\E<, rmxon=\E[29;1|,
+ 	rs2=\E[5;0|, sc=\E7,
+ 	sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6
+ 	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smgl=\E4, smgr=\E5, smir=\E[4h,
+-	smkx=\E[19;1|, smln=\E?, smxon=\E[29;0|,
+-	vpa=\E[%p1%{1}%+%dd, use=ansi+cpr, use=ansi+idl,
+-	use=ansi+local, use=ansi+rep, use=ansi+sgrbold,
+-	use=ansi+tabs, use=ecma+index,
++	smkx=\E[19;1|, smln=\E?, smxon=\E[29;0|, use=ansi+cpr,
++	use=ansi+cup, use=ansi+idl, use=ansi+local, use=ansi+rep,
++	use=ansi+sgrbold, use=ansi+tabs, use=ecma+index,
++	use=ansi+rca,
+ 
+ # (att500: I merged this with the att513 entry, att500 just used att513 -- esr)
+ att500|att513|AT&T 513 using page mode,
+@@ -14667,11 +14655,9 @@
+ 	cols#80, lh#2, lines#24, lw#8, nlab#8,
+ 	acsc=+g\,h-f.e`bhrisjjkkllmmnnqqttuuvvwwxx{{||}}~~,
+ 	bel=^G, bold=\E[2;7m, cnorm=\E[11;0|, cr=\r,
+-	csr=%i\E[%p1%d;%p2%dr, cub1=^H, cud1=\n,
+-	cup=\E[%i%p1%d;%p2%dH, cvvis=\E[11;1|, dch=\E[%p1%dP,
+-	dch1=\E[P$<1>, dim=\E[2m, el1=\E[1K, enacs=\E(B\E)1,
+-	home=\E[H, hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@, ind=\n,
+-	indn=\E[%p1%dE,
++	csr=%i\E[%p1%d;%p2%dr, cub1=^H, cud1=\n, cvvis=\E[11;1|,
++	dch=\E[%p1%dP, dch1=\E[P$<1>, dim=\E[2m, el1=\E[1K,
++	enacs=\E(B\E)1, ich=\E[%p1%d@, ind=\n, indn=\E[%p1%dE,
+ 	is1=\E?\E[3;3|\E[10;0|\E[21;1|\212\E[6;1|\E[1{\E[?99l,
+ 	kBEG=\ENB, kCAN=\EOW, kCMD=\EOU, kCPY=\END, kCRT=\EON,
+ 	kDC=\ENF, kDL=\ENE, kEND=\ENN, kEOL=\EOA, kEXT=\EOK,
+@@ -14704,9 +14690,9 @@
+ 	sgr=\E[0%?%p1%p5%|%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
+ 	    %|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smir=\E[4h,
+-	smkx=\E[19;1|\E[21;4|\Eent, smln=\E?,
+-	vpa=\E[%p1%{1}%+%dd, use=ansi+arrows, use=ansi+erase,
+-	use=ansi+idl, use=ansi+local, use=ansi+rep,
++	smkx=\E[19;1|\E[21;4|\Eent, smln=\E?, use=ansi+arrows,
++	use=ansi+cup, use=ansi+erase, use=ansi+idl,
++	use=ansi+local, use=ansi+rca, use=ansi+rep,
+ 	use=ansi+sgrbold, use=ansi+tabs, use=decid+cpr,
+ 
+ # 01-07-88:
+@@ -14757,12 +14743,11 @@
+ att5620-1|tty5620-1|dmd1|Teletype 5620 with old ROMs,
+ 	am, xon,
+ 	cols#88, it#8, lines#70, vt#3,
+-	bel=^G, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
+-	dch=\E[%p1%dP, dch1=\E[P, home=\E[H, ht=^I, ich=\E[%p1%d@,
+-	ich1=\E[@, ind=\n, kclr=\E[2J, kll=\E[70;1H, nel=\r\n,
+-	rc=\E8, ri=\E[T, rs1=\Ec, sc=\E7, use=ansi+arrows,
+-	use=ansi+erase, use=ansi+idl, use=ansi+local1,
+-	use=ecma+index,
++	bel=^G, cr=\r, cub1=^H, cud1=\n, dch=\E[%p1%dP, dch1=\E[P,
++	ht=^I, ich=\E[%p1%d@, ich1=\E[@, ind=\n, kclr=\E[2J,
++	kll=\E[70;1H, nel=\r\n, rc=\E8, ri=\E[T, rs1=\Ec, sc=\E7,
++	use=ansi+arrows, use=ansi+cup, use=ansi+erase,
++	use=ansi+idl, use=ansi+local1, use=ecma+index,
+ 
+ # 5620 terminfo  (2.0 or later ROMS with char attributes)
+ # The following SET-UP modes are assumed for normal operation:
+@@ -14779,12 +14764,12 @@
+ att5620|dmd|tty5620|ttydmd|5620|AT&T 5620 terminal 88 columns,
+ 	OTbs, am, msgr, npc, xon,
+ 	cols#88, it#8, lines#70,
+-	bel=^G, bold=\E[2m, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
+-	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, home=\E[H, ht=^I,
+-	ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, kclr=\E[2J,
+-	kll=\E[70;1H, nel=\n, pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8,
+-	rev=\E[7m, ri=\E[T, rmso=\E[0m, rmul=\E[0m, rs1=\Ec, sc=\E7,
+-	sgr0=\E[0m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
++	bel=^G, bold=\E[2m, cr=\r, cub1=^H, dch=\E[%p1%dP, dch1=\E[P,
++	dim=\E[2m, ht=^I, ich=\E[%p1%d@, ich1=\E[@, ind=\E[S,
++	kclr=\E[2J, kll=\E[70;1H, nel=\n,
++	pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8, rev=\E[7m, ri=\E[T,
++	rmso=\E[0m, rmul=\E[0m, rs1=\Ec, sc=\E7, sgr0=\E[0m,
++	smso=\E[7m, smul=\E[4m, use=ansi+arrows, use=ansi+cup,
+ 	use=ansi+erase, use=ansi+idl, use=ansi+local1,
+ 	use=ecma+index,
+ 
+@@ -14810,8 +14795,8 @@
+ 	cols#80, lines#24, lw#8, nlab#8, wsl#80,
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cr=\r, cub1=^H,
+-	cup=\E[%i%p1%d;%p2%dH, dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M,
+-	el1=\E[1K, fsl=\E8, ht=^I, il1=\E[L, ind=\n, invis=\E[8m,
++	cup=\E[%i%p1%d;%p2%dH, dim=\E[2m, dl=\E[%p1%dM,
++	el1=\E[1K, fsl=\E8, ht=^I, ind=\n, invis=\E[8m,
+ 	is1=\E[8;0|\E[?\E[13;20l\E[?\E[12h, is2=\E[m\017,
+ 	kLFT=\E[ A, kRIT=\E[ @, kcbt=\E[Z, kclr=\E[2J, kdch1=\E[P,
+ 	kdl1=\E[M, kend=\E[24;1H, kf1=\EOc, kf10=\ENp, kf11=\ENq,
+@@ -14828,11 +14813,11 @@
+ 	mc5=\E[?5i, nel=\EE,
+ 	pfx=\E[%p1%d;%p2%l%02dq   F%p1%1d           %p2%s,
+ 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8, rev=\E[7m,
+-	rmacs=^O, rmln=\E[2p, rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l,
+-	sc=\E7, sgr0=\E[m\017, smacs=\E)0\016, smln=\E[p,
+-	smso=\E[7m, smul=\E[4m, tsl=\E7\E[25;%i%p1%dx,
++	rmacs=^O, rmln=\E[2p, rs2=\Ec\E[?3l, sc=\E7, sgr0=\E[m\017,
++	smacs=\E)0\016, smln=\E[p, tsl=\E7\E[25;%i%p1%dx,
+ 	use=ansi+arrows, use=ansi+cpr, use=ansi+erase,
+-	use=ansi+idc, use=ansi+local1,
++	use=ansi+idc, use=ansi+idl1, use=ansi+local1,
++	use=ansi+sgrso, use=ansi+sgrul,
+ 
+ att605-pc|AT&T 605 in pc term mode,
+ 	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
+@@ -14993,21 +14978,21 @@
+ att630|AT&T 630 windowing terminal,
+ 	OTbs, am, da, db, mir, msgr, npc, xon,
+ 	cols#80, it#8, lines#60, lm#0,
+-	bel=^G, blink=\E[5m, cbt=\E[Z, cr=\r, cub1=^H,
+-	cup=\E[%i%p1%d;%p2%dH, dim=\E[2m, el1=\E[1K, home=\E[H,
+-	ht=^I, ind=\ED, is2=\E[m, kcbt=\E[Z, kclr=\E[2J, kdch1=\E[P,
+-	kdl1=\E[M, kent=\r, kf10=\ENp, kf11=\ENq, kf12=\ENr,
+-	kf13=\ENs, kf14=\ENt, kf15=\ENu, kf16=\ENv, kf17=\ENw,
+-	kf18=\ENx, kf19=\ENy, kf20=\ENz, kf21=\EN{, kf22=\EN|,
+-	kf23=\EN}, kf24=\EN~, kf9=\ENo, kich1=\E[@, kil1=\E[L,
+-	mc4=\E[?4i, mc5=\E[?5i, nel=\r\n,
++	bel=^G, blink=\E[5m, cbt=\E[Z, cr=\r, cub1=^H, dim=\E[2m,
++	el1=\E[1K, ht=^I, ind=\ED, is2=\E[m, kcbt=\E[Z, kclr=\E[2J,
++	kdch1=\E[P, kdl1=\E[M, kent=\r, kf10=\ENp, kf11=\ENq,
++	kf12=\ENr, kf13=\ENs, kf14=\ENt, kf15=\ENu, kf16=\ENv,
++	kf17=\ENw, kf18=\ENx, kf19=\ENy, kf20=\ENz, kf21=\EN{,
++	kf22=\EN|, kf23=\EN}, kf24=\EN~, kf9=\ENo, kich1=\E[@,
++	kil1=\E[L, mc4=\E[?4i, mc5=\E[?5i, nel=\r\n,
+ 	pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8, rev=\E[7m, ri=\EM,
+-	rmso=\E[m, rmul=\E[m, rs2=\Ec, sc=\E7,
++	rs2=\Ec, sc=\E7,
+ 	sgr=\E[0%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%p4%|%t;7
+ 	    %;m,
+-	sgr0=\E[m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
+-	use=ansi+cpr, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+-	use=ansi+local, use=ecma+index,
++	sgr0=\E[m, use=ansi+arrows, use=ansi+cpr, use=ansi+cup,
++	use=ansi+erase, use=ansi+idc, use=ansi+idl,
++	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
++	use=ecma+index,
+ 
+ att630-24|5630-24|5630DMD-24|630MTG-24|AT&T 630 windowing terminal 24 lines,
+ 	lines#24, use=att630,
+@@ -15093,10 +15078,10 @@
+ 	am, eslok, hs, mir, msgr, xenl, xon,
+ 	cols#80, lh#2, lines#24, lw#8, nlab#8, wsl#80,
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+-	bel=^G, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
+-	cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
+-	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<200>\E[?5l,
+-	fln=4\,4, fsl=\E8, home=\E[H, ich=\E[%p1%d@, ind=\ED,
++	bel=^G, cr=\r, cub1=^H, cvvis=\E[?12;25h, dch=\E[%p1%dP,
++	dch1=\E[P, dim=\E[2m, el1=\E[1K, enacs=\E(B\E)0,
++	flash=\E[?5h$<200>\E[?5l, fln=4\,4, fsl=\E8,
++	ich=\E[%p1%d@, ind=\ED,
+ 	is2=\E[50;4|\E[53;0|\E[8;0|\E[?4;13;15l\E[13;20l\E[?7h\E[12h
+ 	    \E(B\E)0\E[?31l\E[0m\017,
+ 	is3=\E(B\E)0, kLFT=\E[ A, kRIT=\E[ @, kcbt=\E[Z,
+@@ -15114,13 +15099,14 @@
+ 	pfx=\E[%p1%d;%p2%l%02dq%?%p1%{9}%<%t\s\s\sF%p1%1d\s\s\s\s\s
+ 	    \s\s\s\s\s\s%;%p2%s,
+ 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, ri=\EM, rmacs=^O,
+-	rmir=\E[4l, rmln=\E[2p, rmso=\E[27m, rmul=\E[24m,
+-	rmxon=\E[53;3|, rs1=\Ec\E[?3;5l\E[56;0|,
++	rmir=\E[4l, rmln=\E[2p, rmxon=\E[53;3|,
++	rs1=\Ec\E[?3;5l\E[56;0|,
+ 	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
+ 	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smir=\E[4h, smln=\E[p,
+-	smxon=\E[53;0|, tsl=\E7\E[99;%i%p1%dx, use=ansi+arrows,
+-	use=ansi+csr, use=ansi+erase, use=ansi+idl,
++	smxon=\E[53;0|, tsl=\E7\E[99;%i%p1%dx,
++	use=ecma+underline, use=ecma+standout, use=ansi+arrows,
++	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idl,
+ 	use=ansi+inittabs, use=ansi+local, use=ansi+rep,
+ 	use=ansi+sgrbold, use=decid+cpr, use=dec+pp,
+ 	use=att610+cvis0,
+@@ -15163,13 +15149,14 @@
+ 	    %<%tq\s\s\sSYS\s\s\s\s\sF%p1%:-2d\s\s%e;0;3q%;%p2%s,
+ 	pfxl=\E[%p1%d;%p2%l%02d;0;0q%p3%:-16.16s%p2%s,
+ 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, ri=\EM, rmacs=^O,
+-	rmam=\E[?7l, rmir=\E[4l, rmln=\E[?13h, rmso=\E[27m,
+-	rmul=\E[24m, rmxon=\E[?21l, rs2=\Ec\E[?3l,
++	rmam=\E[?7l, rmir=\E[4l, rmln=\E[?13h, rmxon=\E[?21l,
++	rs2=\Ec\E[?3l,
+ 	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
+ 	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
+ 	smln=\E[?13l, smxon=\E[?21h, swidm=\E#6,
+-	tsl=\E7\E[;%i%p1%dx, use=ansi+arrows, use=ansi+csr,
++	tsl=\E7\E[;%i%p1%dx, use=ecma+underline,
++	use=ecma+standout, use=ansi+arrows, use=ansi+csr,
+ 	use=ansi+cup, use=ansi+erase, use=ansi+idl,
+ 	use=ansi+local, use=ansi+rep, use=ansi+sgrbold,
+ 	use=decid+cpr, use=dec+pp, use=att610+cvis,
+@@ -15365,9 +15352,9 @@
+ 	kf3=\E[03s, kf4=\E[04s, kf5=\E[05s, kf6=\E[06s,
+ 	krfr=\E[27s, mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m,
+ 	rmacs=\E[10m, rmam=\E[11;1j, rmir=\E[4l, rmso=\E[m,
+-	rmul=\E[m, rs1=\Ec, sc=\E7, sgr0=\E[m, smacs=\E[11m,
+-	smam=\E[11;0j, smir=\E[4h, smso=\E[1m, smul=\E[4m,
+-	use=ansi+cpr, use=ansi+idl, use=ansi+local,
++	rs1=\Ec, sc=\E7, sgr0=\E[m, smacs=\E[11m, smam=\E[11;0j,
++	smir=\E[4h, smso=\E[1m, use=ansi+cpr, use=ansi+idl,
++	use=ansi+local, use=ansi+sgrul,
+ 
+ # The following Terminfo entry describes functions which are supported by
+ # the AT&T 5430/pt505 terminal software version 1.
+@@ -15632,8 +15619,8 @@
+ 	cols#80,
+ 	bel=^G, clear=\E[H\E[J$<156>, cr=\r, cub1=^H, cud1=^K,
+ 	dch=\E[%p1%dP, dch1=\E[P, ed=\E[J, el=\E[K$<5>,
+-	hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@$<4*>, ich1=\E[@$<4>,
+-	il1=\E[L$<3>, ind=^K, is1=\E[m\E7\E[H\E9\E8,
++	ich=\E[%p1%d@$<4*>, ich1=\E[@$<4>, il1=\E[L$<3>, ind=^K,
++	is1=\E[m\E7\E[H\E9\E8,
+ 	is3=\E[1Q\E[>20;30l\EP`+x~M\E\\, kcbt=\E[Z, kclr=\E[J,
+ 	kdch1=\E[P, kdl1=\E[M, kf1=\EOA, kf10=\EOJ, kf11=\EOK,
+ 	kf12=\EOL, kf13=\EOM, kf14=\EON, kf15=\EOO, kf16=\EOP,
+@@ -15647,9 +15634,9 @@
+ 	rmm=\E[>52l, sc=\E7, sgr0=\E[m,
+ 	smkx=\EP`>z~[[J`8xz~[[A`4xz~[[D`6xz~[[C`2xz~[[B\E
+ 	     \\,
+-	smm=\E[>52h, vpa=\E[%p1%{1}%+%dd, use=ansi+arrows,
+-	use=ansi+cup, use=ansi+idl, use=ansi+inittabs,
+-	use=ansi+local, use=ansi+rep, use=ansi+sgrbold,
++	smm=\E[>52h, use=ansi+arrows, use=ansi+cup, use=ansi+idl,
++	use=ansi+inittabs, use=ansi+local, use=ansi+rca,
++	use=ansi+rep, use=ansi+sgrbold,
+ 
+ aaa+rv|Ann Arbor Ambassador in reverse video,
+ 	blink=\E[5;7m, bold=\E[1;7m, invis=\E[7;8m,
+@@ -16037,14 +16024,13 @@
+ 	OTbs, am, xenl,
+ 	cols#80, lines#24,
+ 	bel=^G, clear=\E[H\E[2J, cnorm=\E[V\E8, cub1=^H,
+-	cup=\E[%i%p1%d;%p2%dH, cvvis=\E7\E[U, dch1=\E[P,
+-	dl1=\E[M, ed=\E[J, el=\E[K, flash=\E[?5h$<200/>\E[?5l,
+-	ich1=\E[@, il1=\E[L,
++	cup=\E[%i%p1%d;%p2%dH, cvvis=\E7\E[U, dch1=\E[P, ed=\E[J,
++	el=\E[K, flash=\E[?5h$<200/>\E[?5l, ich1=\E[@,
+ 	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[3g\E[>5g,
+ 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+-	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+-	sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m,
+-	smul=\E[4m, use=ansi+local1,
++	rmam=\E[?7l, rmkx=\E[?1l\E>, sgr0=\E[m, smam=\E[?7h,
++	smkx=\E[?1h\E=, use=ansi+idl1, use=ansi+local1,
++	use=ansi+sgrso, use=ansi+sgrul,
+ 
+ # CIE Terminals CIT-101e from Geoff Kuenning  via BRL
+ # The following termcap entry was created from the Callan cd100 entry.  The
+@@ -16058,13 +16044,12 @@
+ 	cols#80, it#8, lines#24,
+ 	acsc=, cnorm=, csr=\E[%i%p1%2d;%p2%2dr,
+ 	cup=\E[%i%p1%2d;%p2%2dH, cvvis=\E[?1l\E[?4l\E[?7h,
+-	dch1=\E[P, dl1=\E[M, if=/usr/share/tabset/vt100,
+-	il1=\E[L, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+-	kf0=\EOT, kf5=\EOm, kf6=\EOl, kf7=\EOM, kf8=\EOn, rc=\E8,
+-	ri=\EM, rmacs=^O, rmir=\E[4l, rmkx=\E>, rmso=\E[m, rmul=\E[m,
+-	sc=\E7, smacs=^N, smir=\E[4h, smkx=\E=, smso=\E[7m,
+-	smul=\E[4m, use=ansi+erase, use=ansi+local1,
+-	use=vt100+pf1-pf4,
++	dch1=\E[P, if=/usr/share/tabset/vt100, kcub1=\E[D,
++	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf0=\EOT, kf5=\EOm,
++	kf6=\EOl, kf7=\EOM, kf8=\EOn, rc=\E8, ri=\EM, rmacs=^O,
++	rmir=\E[4l, rmkx=\E>, sc=\E7, smacs=^N, smir=\E[4h, smkx=\E=,
++	use=ansi+erase, use=ansi+idl1, use=ansi+local1,
++	use=ansi+sgrso, use=ansi+sgrul, use=vt100+pf1-pf4,
+ 
+ # From: David S. Lawyer, June 1997:
+ # The CIT 101-e was made in Japan in 1983-4 and imported by CIE
+@@ -16087,18 +16072,17 @@
+ 	am, eo, mir, msgr, xenl, xon,
+ 	cols#80, lines#24,
+ 	OTnl=\EM, bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[1v,
+-	cnorm=\E[0;3;4v, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
+-	cvvis=\E[3;5v, flash=\E[?5l$<200/>\E[?5h, home=\E[H,
+-	hpa=\E[%i%p1%dG, ind=\n,
++	cnorm=\E[0;3;4v, cr=\r, cub1=^H, cvvis=\E[3;5v,
++	flash=\E[?5l$<200/>\E[?5h, hpa=\E[%i%p1%dG, ind=\n,
+ 	is2=\E<\E>\E[?1l\E[?3l\E[?4l\E[?5h\E[?7h\E[?8h\E[3g\E[>5g\E(
+ 	    B\E[m\E[20l\E[1;24r\E[24;1H,
+ 	kbs=^?, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+-	nel=\EE, rev=\E[7m, ri=\EM, rmcup=, rmso=\E[m, rmul=\E[m,
+-	rs1=\Ec\E[?7h\E[>5g, sgr0=\E[m,
+-	smcup=\E[>5g\E[?7h\E[?5h, smso=\E[7m, smul=\E[4m,
++	nel=\EE, rev=\E[7m, ri=\EM, rmcup=, rs1=\Ec\E[?7h\E[>5g,
++	sgr0=\E[m, smcup=\E[>5g\E[?7h\E[?5h,
+ 	u6=\E[%i%p1%d;%p2%dR, u8=\E[?6c, use=ansi+enq,
+-	use=ansi+csr, use=ansi+erase, use=ansi+idc, use=ansi+idl,
+-	use=ansi+inittabs, use=ansi+local, use=ecma+index,
++	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idc,
++	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
++	use=ansi+sgrso, use=ansi+sgrul, use=ecma+index,
+ 	use=vt100+pf1-pf4,
+ 
+ cit101e-n|CIT-101e w/o am,
+@@ -16128,20 +16112,19 @@
+ 	OTbs, OTpt, mir, msgr, xon,
+ 	OTkn#10, cols#80, lines#64, vt#3,
+ 	acsc=, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J,
+-	cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, cuu1=\EM,
+-	dch1=\E[P, ed=\EJ, el=\EK, home=\E[H, ind=\n, is2=\E<\E)0,
+-	kcbt=\E[Z, kdch1=\E[P, kdl1=\E[M, ked=\EJ, kel=\EK, kf0=\EOP,
+-	kf1=\EOQ, kf2=\EOR, kf3=\EOS, kf4=\EOU, kf5=\EOV, kf6=\EOW,
+-	kf7=\EOX, kf8=\EOY, kf9=\EOZ, khome=\E[H, kich1=\E[4h,
+-	kil1=\E[L, krmir=\E[4l, lf0=PF1, lf1=PF2, lf2=PF3, lf3=PF4,
+-	lf4=F15, lf5=F16, lf6=F17, lf7=F18, lf8=F19, lf9=F20,
+-	ll=\E[64H, nel=\EE, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l,
+-	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
++	cr=\r, cub1=^H, cud1=\n, cuu1=\EM, dch1=\E[P, ed=\EJ, el=\EK,
++	ind=\n, is2=\E<\E)0, kcbt=\E[Z, kdch1=\E[P, kdl1=\E[M,
++	ked=\EJ, kel=\EK, kf0=\EOP, kf1=\EOQ, kf2=\EOR, kf3=\EOS,
++	kf4=\EOU, kf5=\EOV, kf6=\EOW, kf7=\EOX, kf8=\EOY, kf9=\EOZ,
++	khome=\E[H, kich1=\E[4h, kil1=\E[L, krmir=\E[4l, lf0=PF1,
++	lf1=PF2, lf2=PF3, lf3=PF4, lf4=F15, lf5=F16, lf6=F17, lf7=F18,
++	lf8=F19, lf9=F20, ll=\E[64H, nel=\EE, rev=\E[7m, ri=\EM,
++	rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>,
+ 	rs1=\E<\E2\E[20l\E[?6l\E[r\E[m\E[q\E(B\017\E)0\E>,
+ 	sgr0=\E[m, smacs=^N, smam=\E[?7h, smir=\E[4h,
+-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+-	use=ansi+apparrows, use=ansi+csr, use=ansi+idl,
+-	use=ansi+inittabs, use=ansi+local,
++	smkx=\E[?1h\E=, use=ansi+apparrows, use=ansi+csr,
++	use=ansi+cup, use=ansi+idl, use=ansi+inittabs,
++	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
+ 
+ # C. Itoh printers begin here
+ citoh|ci8510|8510|C. Itoh 8510a,
+@@ -16279,9 +16262,8 @@
+ 	cols#80, lines#25,
+ 	acsc=0_aaffggh jjkkllmmnnooqqssttuuvvwwxx, bel=^G,
+ 	blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[2J, cr=\r,
+-	csr=\E[%i%p1%d;%p2%dr, cup=\E[%i%p1%d;%p2%dH,
+-	dch=\E[%p1%dX, dch1=\E[X, dim=\E[2m, ed=\E[J, el=\E[K,
+-	flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
++	csr=\E[%i%p1%d;%p2%dr, dch=\E[%p1%dX, dch1=\E[X,
++	dim=\E[2m, ed=\E[J, el=\E[K, flash=\E[?5h$<100/>\E[?5l,
+ 	ht=^I, ind=\n, invis=\E[8m,
+ 	is2=\E0;2m\E[1;25r\E[25;1H\E[?3l\E[?7h\E[?8h,
+ 	ka1=\E[f, ka3=\EOQ, kb2=\EOP, kc1=\EOR, kc3=\EOS, kdch1=^?,
+@@ -16293,9 +16275,9 @@
+ 	lf9=A funcl0=A send, nel=\r\n, rev=\E[7m, rmacs=\E[3l,
+ 	rmam=\E[?7l, rmkx=\E>, rmso=\E[0;2m, rmul=\E[0m,
+ 	sgr0=\E[0;2m, smacs=\E3h, smam=\E?7h, smkx=\E=,
+-	smso=\E[2;7m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
+-	use=ansi+arrows, use=ansi+idc, use=ansi+idl,
+-	use=ansi+local,
++	smso=\E[2;7m, smul=\E[4m, tbc=\E[3g, use=ansi+arrows,
++	use=ansi+cup, use=ansi+idc, use=ansi+idl, use=ansi+local,
++	use=ansi+rca2,
+ 
+ #### Human Designed Systems (Concept)
+ #
+@@ -16685,9 +16667,9 @@
+ 	cols#80, lines#24, lm#0,
+ 	acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
+ 	blink=\E[0;5m, bold=\E[0;1m, civis=\E[6+{, cnorm=\E[+{,
+-	cr=\r, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+-	dsl=\E[2!w\r\n\E[!w, el1=\E[1K, fsl=\E[!w, home=\E[H,
+-	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ind=\ED, invis=\E[0;8m,
++	cr=\r, dch=\E[%p1%dP, dch1=\E[P, dsl=\E[2!w\r\n\E[!w,
++	el1=\E[1K, fsl=\E[!w, ich=\E[%p1%d@, ind=\ED,
++	invis=\E[0;8m,
+ 	is2=\E)0\017\E[m\E[=107;207h\E[90;3u\E[92;3u\E[43;1u\177\E$P
+ 	    \177\E[44;1u\177\E$Q\177\E[45;1u\177\E$R\177\E[46;1u
+ 	    \177\E$S\177\E[200;1u\177\E$A\177\E[201;1u\177\E$B\177
+@@ -16712,10 +16694,10 @@
+ 	sgr=\E[0%?%p1%p6%O%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%O%t;7
+ 	    %;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ 	sgr0=\E[m\017, smacs=^N, smir=\E[4h, smso=\E[0;1;7m,
+-	smul=\E[0;4m, tsl=\E[2!w\E[%i%p1%dG, vpa=\E[%i%p1%dd,
+-	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
+-	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+-	use=ansi+pp,
++	smul=\E[0;4m, tsl=\E[2!w\E[%i%p1%dG, use=ansi+arrows,
++	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idl,
++	use=ansi+inittabs, use=ansi+local, use=ansi+pp,
++	use=ansi+rca2,
+ 
+ #  through  included to specify padding needed in raw mode.
+ # (avt-ns: added empty  to suppress a tic warning --esr)
+@@ -16723,10 +16705,9 @@
+ 	OTbs, am, eo, mir, ul, xenl, xon,
+ 	cols#80, lines#24, lm#192,
+ 	acsc=, bel=^G, clear=\E[H\E[J$<38>, cnorm=\E[=119l, cr=\r,
+-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[=119h,
+-	dim=\E[1!{, dl=\E[%p1%dM$<4*>, dl1=\E[M$<4>,
+-	ed=\E[J$<96>, el=\E[K$<6>, home=\E[H,
+-	hpa=\E[%p1%{1}%+%dG, ht=\011$<4>, ich=\E[%p1%d@,
++	cub1=^H, cud1=\n, cvvis=\E[=119h, dim=\E[1!{,
++	dl=\E[%p1%dM$<4*>, dl1=\E[M$<4>, ed=\E[J$<96>,
++	el=\E[K$<6>, ht=\011$<4>, ich=\E[%p1%d@,
+ 	il=\E[%p1%dL$<4*>, il1=\E[L$<4>, ind=\n$<8>, ip=$<4>,
+ 	is1=\E[=103l\E[=205l,
+ 	is2=\E[1*q\E[2!t\E[7!t\E[=4;101;119;122l\E[=107;118;207h\E)1
+@@ -16743,9 +16724,10 @@
+ 	    \016%;$<1>,
+ 	sgr0=\E[m\016$<1>, smacs=\017$<1>,
+ 	smcup=\E[=4l\E[1;24w\E2\r, smkx=\E[1!z\E[0;3u,
+-	vpa=\E[%p1%{1}%+%dd, use=ansi+arrows, use=ansi+csr,
++	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
+ 	use=ansi+idc1, use=ansi+inittabs, use=ansi+local,
+-	use=ansi+rep, use=ansi+sgrbold, use=vt100+pf1-pf4,
++	use=ansi+rca, use=ansi+rep, use=ansi+sgrbold,
++	use=vt100+pf1-pf4,
+ 
+ avt-rv-ns|Concept AVT in reverse video mode/no status line,
+ 	flash=\E[=205l$<200>\E[=205h, is1=\E[=103l\E[=205h,
+@@ -17019,10 +17001,10 @@
+ dg210|dg-ansi|Data General 210/211,
+ 	am,
+ 	cols#80, lines#24,
+-	OTnl=\E[B, clear=\E[2J, cup=\E[%i%p1%d;%p2%dH, ed=\E[J,
+-	el=\E[K, home=\E[H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
+-	kcuu1=\E[A, khome=\E[H, nel=\r\E[H\E[A\n, rmso=\E[0;m,
+-	rmul=\E[0;m, smso=\E[7;m, smul=\E[4;m, use=ansi+local1,
++	OTnl=\E[B, clear=\E[2J, ed=\E[J, el=\E[K, kcub1=\E[D,
++	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[H,
++	nel=\r\E[H\E[A\n, rmso=\E[0;m, rmul=\E[0;m, smso=\E[7;m,
++	smul=\E[4;m, use=ansi+cup, use=ansi+local1,
+ 
+ # From: Peter N. Wan 
+ # courtesy of Carlos Rucalde of Vantage Software, Inc.
+@@ -17050,17 +17032,18 @@
+ 	OTbs, am, msgr, ul,
+ 	cols#80, it#8, lines#24,
+ 	OTnl=\ED, blink=\E[5m, clear=\E[2J, cub1=^H,
+-	cup=\E[%i%p1%2d;%p2%2dH, dch1=\E[P, dim=\E[2m, dl1=\E[M,
+-	ed=\E[J, el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L,
+-	ind=\E[S, is2=^^F@, kbs=\E[D, kf0=\E[001z, kf1=\E[002z,
+-	kf2=\E[003z, kf3=\E[004z, kf4=\E[005z, kf5=\E[006z,
+-	kf6=\E[007z, kf7=\E[008z, kf8=\E[009z, kf9=\E[00:z, lf0=f1,
+-	lf1=f2, lf2=f3, lf3=f4, lf4=f5, lf5=f6, lf6=f7, lf7=f8, lf9=f10,
+-	mc0=\E[i, rev=\E[7m, ri=\E[T, rmso=\E[m, rmul=\E[05,
++	cup=\E[%i%p1%2d;%p2%2dH, dch1=\E[P, dim=\E[2m, ed=\E[J,
++	el=\E[K, home=\E[H, ht=^I, ich1=\E[@, ind=\E[S, is2=^^F@,
++	kbs=\E[D, kf0=\E[001z, kf1=\E[002z, kf2=\E[003z,
++	kf3=\E[004z, kf4=\E[005z, kf5=\E[006z, kf6=\E[007z,
++	kf7=\E[008z, kf8=\E[009z, kf9=\E[00:z, lf0=f1, lf1=f2,
++	lf2=f3, lf3=f4, lf4=f5, lf5=f6, lf6=f7, lf7=f8, lf9=f10,
++	mc0=\E[i, rev=\E[7m, ri=\E[T, rmul=\E[05,
+ 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;
+ 	    %?%p1%p3%|%t;7%;m,
+-	sgr0=\E(B\E[m, smso=\E[7m, smul=\E[4m, u8=\E[5n, u9=\E[0n,
+-	use=ansi+arrows, use=ansi+cpr, use=ansi+local1,
++	sgr0=\E(B\E[m, smul=\E[4m, u8=\E[5n, u9=\E[0n,
++	use=ansi+arrows, use=ansi+cpr, use=ansi+idl1,
++	use=ansi+local1, use=ansi+sgrso,
+ 
+ # From: Wayne Throop  (not official)
+ # Data General 605x
+@@ -17103,13 +17086,13 @@
+ 	am, bw, msgr, xon,
+ 	cols#80, lines#24,
+ 	bel=^G, blink=\E[5m, bold=\E[4;7m, clear=\E[2J, cr=\r,
+-	cub1=^H, cup=\E[%i%p1%d;%p2%dH, dim=\E[2m, ed=\E[J,
+-	el=\E[K, el1=\E[1K, home=\E[H, ind=\n, is1=\E[<0;<1;<4l,
+-	ll=\E[H\E[A, nel=\n, rev=\E[7m, rmso=\E[m, rmul=\E[m,
++	cub1=^H, dim=\E[2m, ed=\E[J, el=\E[K, el1=\E[1K, ind=\n,
++	is1=\E[<0;<1;<4l, ll=\E[H\E[A, nel=\n, rev=\E[7m,
++	rmso=\E[m,
+ 	sgr=\E[%?%p4%t5;%;%?%p2%p6%|%t4;%;%?%p1%p5%|%t2;%;%?%p1%p3%|
+ 	    %p6%|%t7;%;m,
+-	sgr0=\E[m, smso=\E[2;7m, smul=\E[4m, use=ansi+local,
+-	use=dgkeys+7b,
++	sgr0=\E[m, smso=\E[2;7m, use=ansi+cup, use=ansi+local,
++	use=ansi+sgrul, use=dgkeys+7b,
+ 
+ # DASHER D210 series terminals in DG mode.
+ # Like D200, but adds clear to end-of-screen and needs XON/XOFF.
+@@ -17582,8 +17565,8 @@
+ 	cols#80, lines#24,
+ 	bel=^G, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
+ 	cup=\E[%i%p1%02d;%p2%02dH, cuu1=\E[A, ind=\n, kcub1=\E[D,
+-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, rmso=\E[m, rmul=\E[m,
+-	sgr0=\E[m, smso=\E[7m, smul=\E[4m, use=ansi+erase,
++	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, sgr0=\E[m,
++	use=ansi+erase, use=ansi+sgrso, use=ansi+sgrul,
+ 	use=vt100+pf1-pf4,
+ 
+ cs10-w|Datamedia Color Scan 10 with 132 columns,
+@@ -17668,8 +17651,8 @@
+ dm80|dmdt80|dt80|Datamedia dt80/1,
+ 	clear=\E[2J\E[H, cuf1=\E[C, cup=%i\E[%p1%d;%p2%dH,
+ 	cuu1=\E[A, ed=\E[J, el=\E[K, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
+-	ri=\EM, rmso=\E[m, rmul=\E[m, sgr0=\E[m\017$<2>,
+-	smso=\E[7m, smul=\E[4m, use=vt100+4bsd,
++	ri=\EM, sgr0=\E[m\017$<2>, use=ansi+sgrso,
++	use=ansi+sgrul, 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
+@@ -17802,8 +17785,8 @@
+ 	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H,
+ 	cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, ind=\ED,
+ 	is2=\E[H\E[2J, kcub1=^_, kcud1=^], kcuf1=^^, kcuu1=^\,
+-	ri=\EM, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smso=\E[7m,
+-	smul=\E[4m, use=ansi+local1,
++	ri=\EM, sgr0=\E[m, use=ansi+local1, use=ansi+sgrso,
++	use=ansi+sgrul,
+ 
+ #### Liberty Electronics (Freedom)
+ #
+@@ -17906,14 +17889,13 @@
+ 	OTbs,
+ 	cols#80, it#8, lines#24,
+ 	clear=\E[H\E[2J$<10/>, cub1=^H,
+-	cup=\E[%i%p1%2d;%p2%2dH, dch1=\E[P, dl1=\E[M,
+-	ed=\E[J$<10/>, el=\E[K, ht=^I,
+-	if=/usr/share/tabset/vt100, il1=\E[L,
++	cup=\E[%i%p1%2d;%p2%2dH, dch1=\E[P, ed=\E[J$<10/>,
++	el=\E[K, ht=^I, if=/usr/share/tabset/vt100,
+ 	is2=\E<\E=\E[?3l\E[?7l\E(B\E[J\E7\E[;r\E8\E[m\E[q,
+ 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, khome=\E[H,
+-	ri=\EM, rmam=\E[?7l, 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, use=ansi+local1,
++	ri=\EM, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, sgr0=\E[m,
++	smam=\E[?7h, smir=\E[4h, smkx=\E[?1h\E=, use=ansi+idl1,
++	use=ansi+local1, use=ansi+sgrso, use=ansi+sgrul,
+ 	use=vt100+pf1-pf4,
+ 
+ go140w|graphon go-140 in 132 column mode,
+@@ -17928,16 +17910,15 @@
+ 	OTbs, am, mir, xenl,
+ 	cols#80, it#8, lines#25, vt#3,
+ 	blink=\E[5m, bold=\E[1m, cub1=^H, cud1=\n, cuf1=\E[C,
+-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M,
+-	home=\E[H, ht=^I, il1=\E[L, ind=\ED,
++	cuu1=\E[A, dch1=\E[P, ht=^I, ind=\ED,
+ 	is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, rev=\E[7m,
+ 	rf=/usr/share/tabset/vt100, ri=\EM, rmam=\E[?7l,
+ 	rmcup=\E[!p\E[?7h\E[2;1;1#w, rmir=\E[4l, rmkx=\E>,
+-	rmso=\E[27m, rmul=\E[24m, rs1=\E[!p\E[?7h\E[2;1;1#w,
+-	sgr0=\E[m, smam=\E[?7h, smcup=\E[2;0#w\E[1;25r,
+-	smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m,
+-	use=ansi+arrows, use=ansi+csr, use=ansi+erase,
+-	use=vt100+pf1-pf4,
++	rs1=\E[!p\E[?7h\E[2;1;1#w, sgr0=\E[m, smam=\E[?7h,
++	smcup=\E[2;0#w\E[1;25r, smir=\E[4h, smkx=\E=,
++	use=ecma+underline, use=ecma+standout, use=ansi+arrows,
++	use=ansi+csr, use=ansi+cup, use=ansi+erase,
++	use=ansi+idl1, use=vt100+pf1-pf4,
+ 
+ #### Harris (Beehive)
+ #
+@@ -18353,26 +18334,26 @@
+ 	cols#80, it#8, lines#25,
+ 	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
+ 	     \263,
+-	bel=^G, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH,
+-	dch1=\E[P, ech=\E[%p1%dX, home=\E[H, hpa=\E[%i%p1%dG,
+-	ind=\E[S, is2=\Ec, kcbt=\E[Z, kclr=\E[144q, kdch1=\E[P,
+-	ked=\E[148q, kel=\E[142q, kend=\E[146q, kf1=\E[001q,
+-	kf10=\E[010q, kf11=\E[011q, kf12=\E[012q, kf13=\E[013q,
+-	kf14=\E[014q, kf15=\E[015q, kf16=\E[016q, kf17=\E[017q,
+-	kf18=\E[018q, kf19=\E[019q, kf2=\E[002q, kf20=\E[020q,
+-	kf21=\E[021q, kf22=\E[022q, kf23=\E[023q, kf24=\E[024q,
+-	kf25=\E[025q, kf26=\E[026q, kf27=\E[027q, kf28=\E[028q,
+-	kf29=\E[029q, kf3=\E[003q, kf30=\E[030q, kf31=\E[031q,
+-	kf32=\E[032q, kf33=\E[033q, kf34=\E[034q, kf35=\E[035q,
+-	kf36=\E[036q, kf4=\E[004q, kf5=\E[005q, kf6=\E[006q,
+-	kf7=\E[007q, kf8=\E[008q, kf9=\E[009q, kich1=\E[139q,
+-	kil1=\E[140q, kind=\E[151q, knp=\E[154q, kpp=\E[150q,
+-	kri=\E[155q, krmir=\E[4l, ri=\E[T, rmir=\E[4l, rs2=\Ec,
++	bel=^G, cr=\r, cub1=^H, cud1=\n, dch1=\E[P, ech=\E[%p1%dX,
++	hpa=\E[%i%p1%dG, ind=\E[S, is2=\Ec, kcbt=\E[Z,
++	kclr=\E[144q, kdch1=\E[P, ked=\E[148q, kel=\E[142q,
++	kend=\E[146q, kf1=\E[001q, kf10=\E[010q, kf11=\E[011q,
++	kf12=\E[012q, kf13=\E[013q, kf14=\E[014q, kf15=\E[015q,
++	kf16=\E[016q, kf17=\E[017q, kf18=\E[018q, kf19=\E[019q,
++	kf2=\E[002q, kf20=\E[020q, kf21=\E[021q, kf22=\E[022q,
++	kf23=\E[023q, kf24=\E[024q, kf25=\E[025q, kf26=\E[026q,
++	kf27=\E[027q, kf28=\E[028q, kf29=\E[029q, kf3=\E[003q,
++	kf30=\E[030q, kf31=\E[031q, kf32=\E[032q, kf33=\E[033q,
++	kf34=\E[034q, kf35=\E[035q, kf36=\E[036q, kf4=\E[004q,
++	kf5=\E[005q, kf6=\E[006q, kf7=\E[007q, kf8=\E[008q,
++	kf9=\E[009q, kich1=\E[139q, kil1=\E[140q, kind=\E[151q,
++	knp=\E[154q, kpp=\E[150q, kri=\E[155q, krmir=\E[4l,
++	ri=\E[T, rmir=\E[4l, rs2=\Ec,
+ 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
+ 	    %;%?%p7%t;8%;m,
+-	smir=\E[4h, use=ansi+arrows, use=ansi+erase,
+-	use=ansi+idl, use=ansi+local, use=ansi+sgrbold,
+-	use=ecma+index,
++	smir=\E[4h, use=ansi+arrows, use=ansi+cup,
++	use=ansi+erase, use=ansi+idl, use=ansi+local,
++	use=ansi+sgrbold, use=ecma+index,
+ 
+ ibmaed|IBM Experimental display,
+ 	OTbs, am, eo, msgr,
+@@ -18474,14 +18455,14 @@
+ 	am, xon,
+ 	cols#80, lines#25,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
+-	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P,
+-	dl1=\E[M, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, ind=\n,
++	cuf1=\E[C, cuu1=\E[A, dch1=\E[P, ht=^I, ich1=\E[@, ind=\n,
+ 	invis=\E[8m, kf1=\E[001q, kf2=\E[002q, kf3=\E[003q,
+ 	kf4=\E[004q, kf5=\E[005q, kf6=\E[006q, kf7=\E[007q,
+ 	kf8=\E[008q, kf9=\E[009q, knp=\E[153q, kpp=\E[159q,
+-	ktbc=\E[010q, rev=\E[7m, rmir=\E6, rmso=\E[m, rmul=\E[m,
+-	sgr0=\E[m, smir=\E6, smso=\E[7m, smul=\E[4m,
+-	use=ansi+arrows, use=ansi+erase, use=ibm+color,
++	ktbc=\E[010q, rev=\E[7m, rmir=\E6, sgr0=\E[m, smir=\E6,
++	use=ansi+arrows, use=ansi+cup, use=ansi+erase,
++	use=ansi+idl1, use=ansi+sgrso, use=ansi+sgrul,
++	use=ibm+color,
+ 
+ ibm-system1|system1|IBM system/1 computer,
+ 	am, xt,
+@@ -18499,9 +18480,8 @@
+ 	acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x
+ 	     \263,
+ 	bel=^G, cbt=\E[Z, clear=\E[H\E[J, cr=\r, cub1=^H, cud1=\n,
+-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+-	ech=\E[%p1%dX, ed=\E[2J, el=\E[0K, home=\E[H,
+-	hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ind=\ED, is2=\Ec,
++	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, ed=\E[2J,
++	el=\E[0K, hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ind=\ED, is2=\Ec,
+ 	kcbt=\E[Z, kclr=\E[144q, kdch1=\E[P, ked=\E[148q,
+ 	kel=\E[142q, kend=\E[146q, kf1=\E[001q, kf10=\E[010q,
+ 	kf11=\E[011q, kf12=\E[012q, kf13=\E[013q, kf14=\E[014q,
+@@ -18519,8 +18499,8 @@
+ 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
+ 	    %;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
+ 	smacs=\E(0, smir=\E[4h, tbc=\E[3g, use=ansi+arrows,
+-	use=ansi+idl, use=ansi+local, use=ansi+sgrbold,
+-	use=ecma+index,
++	use=ansi+cup, use=ansi+idl, use=ansi+local,
++	use=ansi+sgrbold, use=ecma+index,
+ 
+ # "Megapel" refers to the display adapter, which was used with the IBM RT
+ # aka IBM 6150.
+@@ -18599,8 +18579,8 @@
+ 	cols#80, lines#25,
+ 	bel=^G, clear=\E[2J, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
+ 	cup=\E[%i%p1%3d;%p2%3dH, cuu1=\E[A,
+-	dch1=\E[4h\E[2Q\E[P\E[4l\E[0Q, dl1=\E[M, el=\E[N,
+-	il1=\E[L, ind=\n, rmir=\E[4l\E[0Q, smir=\E[4h\E[2Q,
++	dch1=\E[4h\E[2Q\E[P\E[4l\E[0Q, el=\E[N, ind=\n,
++	rmir=\E[4l\E[0Q, smir=\E[4h\E[2Q, use=ansi+idl1,
+ 
+ # (addrinfo: removed obsolete ":bc=^Z:" -- esr)
+ addrinfo|cursor-addressable Infoton,
+@@ -18925,17 +18905,16 @@
+ 	am, bw, ul,
+ 	cols#80, lines#24, xmc#0,
+ 	bel=^G, cbt=\E[Z, clear=\E[H\E[2J, cr=\r,
+-	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, ed=\E[J,
+-	el=\E[K,
++	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, ed=\E[J, el=\E[K,
+ 	flash=\E[;;;;;;;;;2;;u$<200/>\E[;;;;;;;;;1;;u,
+-	hpa=\E[%p1%{1}%+%dG, ht=^I, ich1=\E[@, il1=\E[L, ind=\E[S,
+-	kbs=^H, kcub1=\ED\r, kcud1=\EB\r, kcuf1=\EC\r, kcuu1=\EA\r,
++	hpa=\E[%p1%{1}%+%dG, ht=^I, ich1=\E[@, ind=\E[S, kbs=^H,
++	kcub1=\ED\r, kcud1=\EB\r, kcuf1=\EC\r, kcuu1=\EA\r,
+ 	kf0=\E@\r, kf1=\EP\r, kf2=\EQ\r, kf3=\ES\r, kf4=\ET\r,
+ 	kf5=\EU\r, kf6=\EV\r, kf7=\EW\r, kf8=\EX\r, kf9=\EY\r,
+ 	khome=\ER\r, lf0=REFRSH, lf1=DEL CH, lf2=TABSET, lf3=GOTO,
+ 	lf4=+PAGE, lf5=+SRCH, lf6=-PAGE, lf7=-SRCH, lf8=LEFT,
+ 	lf9=RIGHT, ri=\E[T, rmso=\E[2 D, rmul=\E[2 D, smso=\E[6 D,
+-	smul=\E[18 D, use=ansi+local1,
++	smul=\E[18 D, use=ansi+idl1, use=ansi+local1,
+ 
+ #### Kimtron (abm, kt)
+ #
+@@ -19223,22 +19202,22 @@
+ 	cols#80, lines#24, vt#3, wsl#72,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[<4l, clear=^L,
+ 	cnorm=\E[<4h, cr=\r, csr=\E[%i%p1%d;%p2%d%%v, cub1=^H,
+-	cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+-	dsl=\E[%}\024, ech=\E[%p1%dX, ed=\E[J$<10>, el=\E[K,
+-	fsl=^T, home=\E[H, hpa=\E[%i%p1%d`, ind=\n,
+-	is2=\E[&p\E[<12l\E F, kclr=^L, kf13=\E[25~, kf14=\E[26~,
+-	kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
+-	nel=\r\n, prot=\E[32%{, rc=\E[%z, rep=\E[%p2%db%p1%c,
+-	rev=\E[7m, ri=\E[L, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
++	cud1=\n, dch=\E[%p1%dP, dch1=\E[P, dsl=\E[%}\024,
++	ech=\E[%p1%dX, ed=\E[J$<10>, el=\E[K, fsl=^T,
++	hpa=\E[%i%p1%d`, ind=\n, is2=\E[&p\E[<12l\E F, kclr=^L,
++	kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~,
++	kf17=\E[31~, kf18=\E[32~, nel=\r\n, prot=\E[32%{, rc=\E[%z,
++	rep=\E[%p2%db%p1%c, rev=\E[7m, ri=\E[L, rmir=\E[4l,
+ 	rs2=\E[&p\E[<12l\E\sF\E[3g\E[9;17;25;33;41;49;57;65;73
+ 	    \sN,
+ 	sc=\E[%y,
+ 	sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;m%?
+ 	    %p8%t\E[32%%{%;%?%p9%t\016%e\017%;,
+-	sgr0=\E[0m\017, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+-	tsl=\E[%i%p1%d%%}, vpa=\E[%i%p1%dd, use=ansi+arrows,
+-	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+-	use=ansi+pp, use=xterm+r5+fkeys,
++	sgr0=\E[0m\017, smir=\E[4h, tsl=\E[%i%p1%d%%},
++	vpa=\E[%i%p1%dd, use=ecma+underline, use=ecma+standout,
++	use=ansi+arrows, use=ansi+cup, use=ansi+idl,
++	use=ansi+inittabs, use=ansi+local, use=ansi+pp,
++	use=xterm+r5+fkeys,
+ 
+ # p9-w: Prism-9 in 132 column mode
+ # --------------------------------
+@@ -19456,19 +19435,19 @@
+ mt4520-rv|micro-term 4520 reverse video,
+ 	am, hs, msgr, xenl, xon,
+ 	cols#80, it#8, lines#24, wsl#80,
+-	bel=^G, cnorm=\E[0V\E8, cr=\r, cup=\E[%i%p1%d;%p2%dH,
+-	cvvis=\E7\E[0U, dch=\E[%p1%dP, dch1=\E[P,
+-	flash=\E[?5l$<200/>\E[?5h, fsl=\E[?5l\E[?5h, home=\E[H,
+-	ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, ind=\ED,
++	bel=^G, cnorm=\E[0V\E8, cr=\r, cvvis=\E7\E[0U,
++	dch=\E[%p1%dP, dch1=\E[P, flash=\E[?5l$<200/>\E[?5h,
++	fsl=\E[?5l\E[?5h, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@,
++	ind=\ED,
+ 	is2=\E(B\E[2l\E>\E[20l\E[?3l\E[?5h\E[?7h\E[1;24r\E[24;1H\E[H
+ 	    \E[J,
+ 	ll=\E[24;1H, nel=\EE, rf=/usr/share/tabset/vt100, ri=\EM,
+-	rmam=\E[?7l, rmso=\E[0m, rmul=\E[24m,
++	rmam=\E[?7l, rmso=\E[0m,
+ 	rs1=\E(B\E[2l\E>\E[20l\E[?3l\E[?5h\E[?7h\E[H\E[J,
+-	sgr0=\E[m, smam=\E[?7h, smso=\E[7m, smul=\E[4m, tbc=\E[g,
+-	tsl=\E[25;1H, use=ansi+arrows, use=ansi+csr,
+-	use=ansi+erase, use=ansi+idl, use=ansi+local,
+-	use=vt100+pf1-pf4,
++	sgr0=\E[m, smam=\E[?7h, smso=\E[7m, tbc=\E[g, tsl=\E[25;1H,
++	use=ecma+underline, use=ansi+arrows, use=ansi+csr,
++	use=ansi+cup, use=ansi+erase, use=ansi+idl,
++	use=ansi+local, use=vt100+pf1-pf4,
+ 
+ # Fri Aug  5 08:11:57 1983
+ # This entry works for the ergo 4000 with the following setups:
+@@ -19661,7 +19640,7 @@
+ 	kf33=\E[8~, kf34=\E[9~, kf35=\E[10~, kf5=\E[M, khlp=\E[28~,
+ 	krdo=\E[29~, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8,
+ 	ri=\EM$<5>, rmacs=\017$<20>, rmam=\E[?7l, rmir=\E[4l,
+-	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
++	rmkx=\E[?1l\E>,
+ 	rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<
+ 	    200>,
+ 	sc=\E7,
+@@ -19669,7 +19648,8 @@
+ 	    %;%?%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=, tbc=\E[3g,
+-	vpa=\E[%p1%dd$<40>, use=ansi+sgrbold, use=decid+cpr,
++	vpa=\E[%p1%dd$<40>, use=ecma+underline,
++	use=ecma+standout, use=ansi+sgrbold, use=decid+cpr,
+ 	use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad,
+ 	use=ncr260vt+sl, use=vt220+sfkeys, use=vt220+ufkeys,
+ 
+@@ -19715,7 +19695,7 @@
+ 	kf33=\E[8~, kf34=\E[9~, kf35=\E[10~, kf5=\E[M, khlp=\E[28~,
+ 	krdo=\E[29~, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8,
+ 	ri=\EM$<5>, rmacs=\017$<20>, rmam=\E[?7l, rmir=\E[4l,
+-	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
++	rmkx=\E[?1l\E>,
+ 	rs2=\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>,
+ 	sc=\E7,
+@@ -19723,7 +19703,8 @@
+ 	    %;%?%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=, tbc=\E[3g,
+-	vpa=\E[%p1%dd$<40>, use=ansi+sgrbold, use=decid+cpr,
++	vpa=\E[%p1%dd$<40>, use=ecma+underline,
++	use=ecma+standout, use=ansi+sgrbold, use=decid+cpr,
+ 	use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad,
+ 	use=ncr260vt+sl, use=vt220+sfkeys, use=vt220+ufkeys,
+ 
+@@ -20308,17 +20289,18 @@
+ 	cols#80, lines#24, xmc#1,
+ 	acsc=jjkkllmmnnqqttuuvvwwxx, bel=^G, clear=\E[H\E[2J,
+ 	cr=\r, csr=\E[%p1%2d;%p2%2dr, cub1=^H,
+-	cup=\010\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, ed=\E[J,
+-	el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, ind=\n,
+-	is2=\E[?3l\E)0\E(B, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
+-	kcuu1=\E[A, kf1=\E[?3i, kf10=\E[?5i, kf2=\E[2i, kf3=\E[@,
+-	kf4=\E[M, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, kf8=\E[20~,
+-	kf9=\E[21~, khome=\E[H, knp=\E[29~, kpp=\E[28~, lf1=f1,
+-	lf2=f2, lf3=f3, lf4=f4, lf5=f5, lf6=f6, lf7=f7, lf8=f8, ri=\EM,
+-	rmacs=^O, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smacs=^N,
+-	smso=\E[7m, smul=\E[4m, use=ansi+local1, use=vt220+cvis,
++	cup=\010\E[%i%p1%d;%p2%dH, dch1=\E[P, ed=\E[J, el=\E[K,
++	home=\E[H, ht=^I, ich1=\E[@, ind=\n, is2=\E[?3l\E)0\E(B,
++	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\E[?3i,
++	kf10=\E[?5i, kf2=\E[2i, kf3=\E[@, kf4=\E[M, kf5=\E[17~,
++	kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, kf9=\E[21~, khome=\E[H,
++	knp=\E[29~, kpp=\E[28~, lf1=f1, lf2=f2, lf3=f3, lf4=f4, lf5=f5,
++	lf6=f6, lf7=f7, lf8=f8, ri=\EM, rmacs=^O, sgr0=\E[m, smacs=^N,
++	use=ansi+idl1, use=ansi+local1, use=ansi+sgrso,
++	use=ansi+sgrul, use=vt220+cvis,
+ dt100w|dt-100w|Tandy DT-100 terminal (wide mode),
+ 	cols#132, use=dt100,
++
+ dt110|Tandy DT-110 emulating ANSI,
+ 	xon,
+ 	cols#80, lines#24,
+@@ -20478,6 +20460,7 @@
+ 	is2=\037com\s33\r\n!sto\s9\,17\,25\,33\,41\,49\,57\,65\,73
+ 	    \r,
+ 	rmcup=\037com 33\r, smcup=!com 31\r, use=tek4025,
++
+ tek4105|Tektronix 4105,
+ 	OTbs, am, mir, msgr, ul, xenl, xt,
+ 	cols#79, it#8, lines#29,
+@@ -20529,22 +20512,22 @@
+ 	OTkn#8, cols#80, lines#30, vt#3,
+ 	acsc=, bel=^G, blink=\E[5m, bold=\E[1m,
+ 	civis=\E%!0\ETD00\E%!1, cnorm=\E%!0\ETD10\E%!1, cr=\r,
+-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, cuu1=\EM,
+-	cvvis=\E%!0\ETD70\E%!1, dch=\E[%p1%dP, dch1=\E[P,
+-	ech=\E[%p1%dX, home=\E[H, ind=\n, is2=\E%!1, kbs=^H,
+-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOA,
+-	kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EOP, kf5=\EOQ, kf6=\EOR,
+-	kf7=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5, lf5=F6, lf6=F8,
+-	ll=\E[30;H, nel=\EE, rev=\E[7m, ri=\EM, rmacs=^O,
+-	rmcup=\E%!0\ELBH=\E%!1, rmir=\E[4l, rmkx=\E[?1l\E>,
+-	rmso=\E[m, rmul=\E[m,
++	cub1=^H, cud1=\n, cuu1=\EM, cvvis=\E%!0\ETD70\E%!1,
++	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, ind=\n, is2=\E%!1,
++	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
++	kf0=\EOA, kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EOP, kf5=\EOQ,
++	kf6=\EOR, kf7=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5,
++	lf5=F6, lf6=F8, ll=\E[30;H, nel=\EE, rev=\E[7m, ri=\EM,
++	rmacs=^O, rmcup=\E%!0\ELBH=\E%!1, rmir=\E[4l,
++	rmkx=\E[?1l\E>,
+ 	rs2=\030\E%!0\EKC\E\014\EKR0\EKF0\ENM0\ELBH=\ETF8000010F40
+ 	    \ELI100\ELLA>\ELM0\EKE0\ENF1\EKS0\END0\E%!1\Ec\E[?3;5l
+ 	    \E[?7;8h\E[r\E[m\E>,
+ 	sgr0=\E[m, smacs=^N, smcup=\E[?6l, smir=\E[4h,
+-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, use=ansi+csr,
++	smkx=\E[?1h\E=, use=ansi+csr, use=ansi+cup,
+ 	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
+-	use=ansi+local, use=ecma+index,
++	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
++	use=ecma+index,
+ 
+ # Tektronix 4106/4107/4109 from BRL
+ # The following setup modes are assumed for normal operation:
+@@ -20572,22 +20555,22 @@
+ 	cols#80, lines#32, vt#3,
+ 	acsc=, bel=^G, blink=\E[5m, bold=\E[1m,
+ 	civis=\E%!0\ETD00\E%!1, cnorm=\E%!0\ETD10\E%!1, cr=\r,
+-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, cuu1=\EM,
+-	cvvis=\E%!0\ETD70\E%!1, dch=\E[%p1%dP, dch1=\E[P,
+-	ech=\E[%p1%dX, home=\E[H, ind=\n, is2=\E%!1, kbs=^H,
+-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOA,
+-	kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EOP, kf5=\EOQ, kf6=\EOR,
+-	kf7=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5, lf5=F6, lf6=F8,
+-	ll=\E[32;H, nel=\EE, rev=\E[7m, ri=\EM, rmacs=^O,
+-	rmcup=\E%!0\ELBH=\E%!1, rmir=\E[4l, rmkx=\E[?1l\E>,
+-	rmso=\E[m, rmul=\E[m,
++	cub1=^H, cud1=\n, cuu1=\EM, cvvis=\E%!0\ETD70\E%!1,
++	dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, ind=\n, is2=\E%!1,
++	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
++	kf0=\EOA, kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EOP, kf5=\EOQ,
++	kf6=\EOR, kf7=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5,
++	lf5=F6, lf6=F8, ll=\E[32;H, nel=\EE, rev=\E[7m, ri=\EM,
++	rmacs=^O, rmcup=\E%!0\ELBH=\E%!1, rmir=\E[4l,
++	rmkx=\E[?1l\E>, rmso=\E[m,
+ 	rs1=\030\E%!0\EKC\E\014\EKR0\EKF0\ENM0\ELBH=\ETF8000010F40
+ 	    \ELI100\ELLB0\ELM0\EKE0\ENF1\EKS0\END0\ERE0\E%!1\Ec\E[?3
+ 	    ;5l\E[?7;8h\E[r\E[m\E>,
+ 	sgr0=\E[m, smacs=^N, smcup=\E[?6l, smir=\E[4h,
+-	smkx=\E[?1h\E=, smso=\E[7;42m, smul=\E[4m, use=ansi+csr,
+-	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
+-	use=ansi+local, use=ecma+index,
++	smkx=\E[?1h\E=, smso=\E[7;42m, use=ansi+csr,
++	use=ansi+cup, use=ansi+erase, use=ansi+idl,
++	use=ansi+inittabs, use=ansi+local, use=ansi+sgrul,
++	use=ecma+index,
+ 
+ # Refer to:
+ # TEK Programmer's Reference
+@@ -20656,14 +20639,15 @@
+ 	cols#80, lines#34,
+ 	cbt=\E[Z, clear=\E[2J\E[0;0H, cub1=^H, cud1=\E[B,
+ 	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, dch1=\E[P,
+-	dl1=\E[M, ed=\E[0J, el=\E[0K, ich1=\E[@, il1=\E[L,
+-	ind=\E7\E[0;0H\E[M\E8, is2=\E3!1, ri=\E7\E[0;0H\E[L\E8,
+-	rmso=\E[m, rmul=\E[m, sgr0=\E[m, smso=\E[7m, smul=\E[4m,
++	ed=\E[0J, el=\E[0K, ich1=\E[@, ind=\E7\E[0;0H\E[M\E8,
++	is2=\E3!1, ri=\E7\E[0;0H\E[L\E8, sgr0=\E[m,
++	use=ansi+idl1, use=ansi+sgrso, use=ansi+sgrul,
+ tek4112-nd|Tektronix 4112 not in dialog area,
+ 	OTns,
+ 	cuu1=^K, use=tek4112,
+ tek4112-5|Tektronix 4112 in 5 line dialog area,
+ 	lines#5, use=tek4112,
++
+ # (tek4113: this used to have "", someone's mistake;
+ # removed ", ", which had been commented out in 8.3.
+ # Note, the !0 and !1 sequences in /// were
+@@ -20698,16 +20682,15 @@
+ 	cols#80, it#8, lines#34,
+ 	cbt=\E[Z, clear=\E[H\E[2J,
+ 	cnorm=\E%!0\ELBG8\E%!1\E[34;1H,
+-	cup=\E[%i%p1%d;%p2%dH, cvvis=\E%!0\ELBB2\E%!1,
+-	dch1=\E[P, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+-	if=/usr/share/tabset/vt100, il1=\E[L,
++	cvvis=\E%!0\ELBB2\E%!1, dch1=\E[P, ed=\E[J, el=\E[K, ht=^I,
++	if=/usr/share/tabset/vt100,
+ 	is2=\E%!0\E%\014\ELV0\EKA1\ELBB2\ENU@=\ELLB2\ELM0\ELV1\EKYA?
+ 	    \E%!1\E[<1l\E[?7h\E[?8h\E[34;1H\E[34B\E[m,
+ 	kbs=^H, ri=\EM, rmam=\E[?7l,
+ 	rmcup=\E%!0\ELBG8\E%!1\E[34;1H\E[J, rmir=\E[4l,
+-	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, use=ansi+local1,
++	rmkx=\E>, sgr0=\E[m, smam=\E[?7h, smcup=\E%!0\ELBB2\E%!1,
++	smir=\E[4h, smkx=\E=, use=ansi+cup, use=ansi+idl1,
++	use=ansi+local1, use=ansi+sgrso, use=ansi+sgrul,
+ tek4115|Tektronix 4115 entry with more ANSI capabilities (new),
+ 	am, xon,
+ 	cols#80, lines#34,
+@@ -20743,17 +20726,16 @@
+ 	am, bw, mir, msgr, ul, xenl,
+ 	cols#80, it#8, lines#32,
+ 	blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J$<156/>,
+-	cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+-	cuu1=\EM, dch1=\E[P$<4/>, dl1=\E[M$<3/>, ed=\E[J,
+-	el=\E[K$<5/>, home=\E[H, ht=^I, ich1=\E[@$<4/>,
+-	il1=\E[L$<3/>, ind=\E[S, invis=\E[=6;<5,
++	cub1=^H, cud1=\n, cuf1=\E[C, cuu1=\EM, dch1=\E[P$<4/>,
++	dl1=\E[M$<3/>, ed=\E[J, el=\E[K$<5/>, ht=^I,
++	ich1=\E[@$<4/>, il1=\E[L$<3/>, ind=\E[S, invis=\E[=6;<5,
+ 	is2=\E%!0\ELBP0\E%!1\E[H\E[2g\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8
+ 	    C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[8C\EH\E[J,
+ 	kcub1=\E[D, kcud1=\ED, kcuf1=\E[C, kcuu1=\EM, khome=\E[H,
+ 	rev=\E[7m, ri=\E[T,
+-	rmcup=\E[?6h\E%!0\ELBP0\E%!1\E[32;1f, rmso=\E[m,
+-	rmul=\E[m, sgr0=\E[m, smcup=\E[?6l\E[H\E[J, smso=\E[7m,
+-	smul=\E[4m, tbc=\E[1g,
++	rmcup=\E[?6h\E%!0\ELBP0\E%!1\E[32;1f, sgr0=\E[m,
++	smcup=\E[?6l\E[H\E[J, tbc=\E[1g, use=ansi+cup,
++	use=ansi+sgrso, use=ansi+sgrul,
+ 
+ # From:   Thu Oct 31 12:54:27 1985
+ # (tek4404: There was a "\!" in  that I replaced with "\E!".
+@@ -20762,13 +20744,13 @@
+ 	OTbs,
+ 	cols#80, it#8, lines#32,
+ 	blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cub1=^H, cud1=\n,
+-	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P,
+-	dl1=\E[1M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, hts=\E[2I,
+-	il1=\E[1L, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+-	rmcup=\E[1;1H\E[0J\E[?6h\E[?1l, rmir=\E[4l,
+-	rmkx=\E[?1h, rmso=\E[27m, rmul=\E[m, sgr0=\E[m,
++	cuf1=\E[C, cuu1=\E[A, dch1=\E[P, dl1=\E[1M, ed=\E[J, el=\E[K,
++	ht=^I, hts=\E[2I, il1=\E[1L, kcub1=\E[D, kcud1=\E[B,
++	kcuf1=\E[C, kcuu1=\E[A, rmcup=\E[1;1H\E[0J\E[?6h\E[?1l,
++	rmir=\E[4l, rmkx=\E[?1h, sgr0=\E[m,
+ 	smcup=\E%\E!1\E[1;32r\E[?6l\E>, smir=\E[4h,
+-	smkx=\E[?1l, smso=\E[7m, smul=\E[4m, use=ansi+csr,
++	smkx=\E[?1l, use=ecma+standout, use=ansi+csr,
++	use=ansi+cup, use=ansi+sgrul,
+ 
+ # Some unknown person wrote:
+ # I added the is string - straight Unix has ESC ; in the login
+@@ -20802,11 +20784,10 @@
+ 	colors#8, cols#80, it#8, lines#30, ncv#49, pairs#63,
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	bel=^G, blink=\E[5m, bold=\E[=7;<4m, cbt=\E[Z,
+-	clear=\E[2J\E[H, cr=\r, cup=\E[%i%p1%d;%p2%dH,
+-	dch1=\E[1P, dim=\E[=1;<6m, dl=\E[%p1%dM, dl1=\E[1M,
+-	ech=\E%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
+-	home=\E[H, ht=^I, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[1L,
+-	ind=\ED,
++	clear=\E[2J\E[H, cr=\r, dch1=\E[1P, dim=\E[=1;<6m,
++	dl=\E[%p1%dM, dl1=\E[1M, ech=\E%p1%dX, ed=\E[J, el=\E[K,
++	el1=\E[1K, enacs=\E)0, ht=^I, ich=\E[%p1%d@, il=\E[%p1%dL,
++	il1=\E[1L, ind=\ED,
+ 	initc=\E%%!0\ETF4%?%p1%{0}%=%t0%e%p1%{1}%=%t4%e%p1%{2}%=%t3
+ 	      %e%p1%{3}%=%t5%e%p1%{4}%=%t2%e%p1%{5}%=%t6%e%p1%{6}%=
+ 	      %t7%e1%;%?%p2%{125}%<%t0%e%p2%{250}%<%tA2%e%p2%{375}%<
+@@ -20824,7 +20805,7 @@
+ 	oc=\E%!0\ETFB000001F4F4F42F40030F404A4C\E[m\014, kbs=^H, kcub1=\E[D, kcud1=\E[B,
+-	kcuf1=\E[C, kcuu1=\E[A, rmacs=\E[10m, rmso=\E[m, rmul=\E[m,
+-	sgr0=\E[m, smacs=\E[11m, smso=\E[7m, smul=\E[4m,
+-	use=ansi+local1,
++	cnorm=\E[5l, cub1=^H, dch1=\E[P, ed=\E[J, el=\E[K, ht=^I,
++	ich1=\E[@, is2=\E>\E[m\014, kbs=^H, kcub1=\E[D, kcud1=\E[B,
++	kcuf1=\E[C, kcuu1=\E[A, rmacs=\E[10m, sgr0=\E[m,
++	smacs=\E[11m, use=ansi+cup, use=ansi+idl1,
++	use=ansi+local1, use=ansi+sgrso, use=ansi+sgrul,
+ liswb|Apple Lisa console display (white on black),
+ 	is2=\E>\E[0;7m\014, rmso=\E[0;7m, rmul=\E[0;7m,
+ 	smso=\E[m, smul=\E[4m, use=lisa,
+@@ -21186,14 +21167,14 @@
+ 	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,
+-	cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K,
+-	home=\E[H, ht=^I, hts=\EH, ind=\n, kbs=^H, kcub1=\EOD,
+-	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOP, kf1=\EOQ,
+-	kf2=\EOR, kf3=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, rev=\E[7m,
+-	ri=\EM, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
++	cub1=^H, cud1=\n, ed=\E[J, el=\E[K, ht=^I, hts=\EH, ind=\n,
++	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
++	kf0=\EOP, kf1=\EOQ, kf2=\EOR, kf3=\EOS, lf0=F1, lf1=F2, lf2=F3,
++	lf3=F4, rev=\E[7m, ri=\EM, rmkx=\E[?1l\E>,
+ 	rs1=\E>\E[?1l\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r,
+-	sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+-	tbc=\E[3g, use=ansi+csr, use=ansi+local,
++	sgr0=\E[m, smkx=\E[?1h\E=, tbc=\E[3g, use=ansi+csr,
++	use=ansi+cup, use=ansi+local, use=ansi+sgrso,
++	use=ansi+sgrul,
+ 
+ # Lisaterm in 132 column ("wide") mode.
+ lisaterm-w|Apple Lisa with Lisaterm in 132 column mode,
+@@ -21285,15 +21266,14 @@
+ 	OTbs, am, bw, xenl,
+ 	cols#80, lines#24,
+ 	acsc=, bel=^G, blink=\E[7;2m, bold=\E[1m, cbt=\E[Z,
+-	civis=\E[0 p, cnorm=\E[ p, cup=\E[%i%p1%d;%p2%dH,
+-	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, home=\E[H,
+-	ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, invis=\E[8m,
++	civis=\E[0 p, cnorm=\E[ p, dch=\E[%p1%dP, dch1=\E[P,
++	dim=\E[2m, ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, invis=\E[8m,
+ 	is2=\E[20l, kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
+ 	kcuu1=\E[A, kf0=\E[9~, kf1=\E[0~, kf2=\E[1~, kf3=\E[2~,
+ 	kf4=\E[3~, kf5=\E[4~, kf6=\E[5~, kf7=\E[6~, kf8=\E[7~,
+-	kf9=\E[8~, rev=\E[7m, ri=\E[T, rmacs=^O, rmso=\E[m,
+-	rmul=\E[m, rs1=\Ec, sgr0=\E[m, smacs=^N, smso=\E[7m,
+-	smul=\E[4m, use=ansi+erase, use=ansi+idl, use=ansi+local,
++	kf9=\E[8~, rev=\E[7m, ri=\E[T, rmacs=^O, rs1=\Ec, sgr0=\E[m,
++	smacs=^N, use=ansi+cup, use=ansi+erase, use=ansi+idl,
++	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
+ 	use=ecma+index,
+ 
+ # From: Hans Verkuil , 4 Dec 1995
+@@ -21348,13 +21328,14 @@
+ 	kf8=\E[7~, kf9=\E[8~, khlp=\E[?~, khome=\E[44~, kll=\E[45~,
+ 	kmous=\E[M, knp=\E[42~, kpp=\E[41~, nel=\EE, oc=\E[0m,
+ 	rev=\E[7m, ri=\EM, rmcup=\E[?7h\E[r\E[J, rmkx=\E[?1l,
+-	rmso=\E[21m, rmul=\E[24m, rs1=\Ec,
++	rmso=\E[21m, rs1=\Ec,
+ 	rs2=\E[>?2;18l\E[>?26;?6;20;>?15;?7;>?22;>?8h,
+ 	setab=\E[%?%p1%{8}%>%t%'F'%p1%+%d%e4%p1%d%;m,
+ 	setaf=\E[%?%p1%{8}%>%t%'2'%p1%+%d%e3%p1%d%;m,
+ 	sgr0=\E[0m\017\E[30;85;>15m, smcup=\E[?7h, smkx=\E[?1h,
+-	smso=\E[1m, smul=\E[4m, use=ansi+arrows, use=ansi+erase,
+-	use=ansi+local, use=ecma+index,
++	smso=\E[1m, smul=\E[4m, use=ecma+underline,
++	use=ansi+arrows, use=ansi+erase, use=ansi+local,
++	use=ecma+index,
+ 
+ # MorphOS on Genesi Pegasos
+ # By Pavel Fedin 
+@@ -21491,12 +21472,12 @@
+ 	xon, NQ,
+ 	cols#80, it#8, lines#25,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[0J, cr=\r,
+-	cub1=^H, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+-	ed=\E[0J, el=\E[K, home=\E[H, ht=^I, ich=\E[%p1%d@,
+-	ich1=\E[@, ind=\n, kf0=\E[Y, kf1=\E[V, kf2=\E[U, kf3=\E[T,
+-	kf4=\E[S, kf5=\E[G, nel=\r\n, rev=\E[7m, ri=\EM, rmso=\E[0m,
+-	rmul=\E[0m, sgr0=\E[0m, smso=\E[7m, smul=\E[4m,
+-	use=ansi+arrows, use=ansi+idl, use=ansi+local,
++	cub1=^H, dch=\E[%p1%dP, dch1=\E[P, ed=\E[0J, el=\E[K, ht=^I,
++	ich=\E[%p1%d@, ich1=\E[@, ind=\n, kf0=\E[Y, kf1=\E[V,
++	kf2=\E[U, kf3=\E[T, kf4=\E[S, kf5=\E[G, nel=\r\n, rev=\E[7m,
++	ri=\EM, rmso=\E[0m, rmul=\E[0m, sgr0=\E[0m, smso=\E[7m,
++	smul=\E[4m, use=ansi+arrows, use=ansi+cup, use=ansi+idl,
++	use=ansi+local,
+ 
+ # The linewrap option can be specified by editing /usr/include/minix/config.h
+ # before recompiling the minix 1.5 kernel.
+@@ -21550,14 +21531,13 @@
+ 	cols#82, it#8, lines#25,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, clear=^]^_, cnorm=\E[?7h,
+ 	cr=\r, cub1=^H, cud1=\n, cuf1=^X, cup=\E[%i%p1%d;%p2%dH,
+-	cuu1=^Z, cvvis=\E[?7l, dch1=\E[1P, dl1=\E[M, ed=^_, el=^^,
+-	home=^], ht=^I, if=/usr/share/tabset/vt100, il1=\E[L,
+-	ind=\ED,
++	cuu1=^Z, cvvis=\E[?7l, dch1=\E[1P, ed=^_, el=^^, home=^],
++	ht=^I, if=/usr/share/tabset/vt100, ind=\ED,
+ 	is2=\E>\E[?1h\E[?7h\E[?5l\017\E(B\E[m\E[20l\E[1;24r\E[24;1H,
+ 	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+ 	kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, nel=\r\ED, rev=\E[7m,
+-	ri=\E[T, rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
+-	smir=\E[4h, smso=\E[7m, smul=\E[4m, use=ansi+csr,
++	ri=\E[T, rmir=\E[4l, sgr0=\E[m, smir=\E[4h, use=ansi+csr,
++	use=ansi+idl1, use=ansi+sgrso, use=ansi+sgrul,
+ 	use=vt100+pf1-pf4,
+ 
+ # basis from Peter Harrison, Computer Graphics Lab, San Francisco
+@@ -21610,18 +21590,17 @@
+ 	cols#80, it#8, lines#24, wsl#72, xmc#0,
+ 	acsc=aaffggjjkkllmmnnooqqssttuuvvwwxx, bel=^G,
+ 	blink=\E[5m, bold=\E[1m, civis=\E[<1h, cnorm=\E[<1l, cr=\r,
+-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+-	flash=^G, fsl=\n, home=\E[H, ht=^I, ind=\n, ip=$<7/>,
+-	is1=\E:1}\Ec\E[?4l\E[12h, is2=\Ec\E[12h\E)0,
++	dch=\E[%p1%dP, dch1=\E[P, flash=^G, fsl=\n, ht=^I, ind=\n,
++	ip=$<7/>, is1=\E:1}\Ec\E[?4l\E[12h, is2=\Ec\E[12h\E)0,
+ 	is3=\E[?3l, kclr=\E[2J, kdch1=\E[P, kdl1=\E[M, kf0=\EOp,
+ 	kf1=\EOq, kf10=\EOp, kf2=\EOr, kf3=\EOs, kf4=\EOt, kf5=\EOu,
+ 	kf6=\EOv, kf7=\EOw, kf8=\EOx, kf9=\EOy, kich1=\E[4h,
+ 	kil1=\E[4l, knp=\EOn, kpp=\EOR, ll=\E[24;80H, mc0=\E[i,
+ 	nel=\r\n, rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l,
+-	rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E[?4l\E[12h,
+-	rs2=\Ec\E)0, sgr0=\E[m, smacs=^N, smir=\E[4h, smso=\E[7m,
+-	smul=\E[4m, tsl=^_@A, use=ansi+arrows, use=ansi+cpr,
+-	use=ansi+csr, use=ansi+erase, use=ansi+idl,
++	rs1=\Ec\E[?4l\E[12h, rs2=\Ec\E)0, sgr0=\E[m, smacs=^N,
++	smir=\E[4h, tsl=^_@A, use=ecma+underline,
++	use=ecma+standout, use=ansi+arrows, use=ansi+cpr,
++	use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idl,
+ 	use=ansi+local,
+ 
+ # From: Alexandre Montaron , 18 Jun 1998, updated 19 Sep 2016
+@@ -21699,15 +21678,13 @@
+ 	kf22=\EOP#, kf23@, kf24@, kf3=\EOs, kf4=\EOt, kf5=\EOu,
+ 	kf6=\EOv, kf7=\EOw, kf8=\EOx, kf9=\EOy, khlp=\EOm, knp=\EOn,
+ 	kpp=\EOR, krfr=\EOS, lf1@, lf2@, lf3@, lf4@, lf5@, lf6@, nel=\EE,
+-	op@, rc=\E8, rep@, rev=\E[7m, ri=\EM, rmkx@, rmso=\E[27m,
+-	rmul=\E[24m,
++	op@, rc=\E8, rep@, rev=\E[7m, ri=\EM, rmkx@,
+ 	rs2=\036\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[
+ 	    H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M
+ 	    \E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2
+ 	    M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[
+ 	    2M\E[H\E[J\E[m,
+ 	sc=\E7, setab@, setaf@, setb@, setf@, sgr@, sgr0=\E[m, smkx@,
+-	smso=\E[7m, smul=\E[4m,
+ 	tsl=\037@%?%p1%{63}%<%t%p1%'A'%+%c%e\177%p1%{62}%-%Pa%?%ga
+ 	    %{1}%&%t\011%;%?%ga%{2}%&%t\011\011%;%?%ga%{4}%&%t\011
+ 	    \011\011\011%;%?%ga%{07}%>%t\011\011\011\011\011\011
+@@ -21728,7 +21705,7 @@
+ 	   \365o\,\366o\,\372u\,\373u\,\374u\,\375y\,\377y\,\267.\,
+ 	   \327x\,\367/\,\261\E7\E[4m+\E8\E[C\,\,0\017%\016\,x|\,y
+ 	   \E7\E[4m<\E8\E[C\,z\E7\E[4m>\E8\E[C\,g\E7\E[4m+\E8\E[C,
+-	use=minitel1b,
++	use=ecma+underline, use=ecma+standout, use=minitel1b,
+ 
+ minitel1-nb|minitel 1 (40cols) noir & blanc sans couleurs avec bold et dim ...,
+ 	colors@, pairs@,
+@@ -21844,8 +21821,8 @@
+ screen.minitel1b-80|screen.minitel2-80|screen.minitel12-80|Screen specific for minitel1b-80 minitel2-80 and minitel12-80,
+ 	colors@, ncv@, pairs@,
+ 	bold=\E[1m, kent=\EOM, kf13@, kf14@, kf15@, kf16@, kf17@, kf18@,
+-	kf19@, kf20@, kf21@, kf22@, kf23@, kf24@, khlp=\EOm, op@,
+-	rmul=\E[24m, setab@, setaf@, setb@, setf@, smul=\E[4m,
++	kf19@, kf20@, kf21@, kf22@, kf23@, kf24@, khlp=\EOm, op@, setab@,
++	setaf@, setb@, setf@, use=ecma+underline,
+ 	use=screen.minitel1b,
+ 
+ screen.minitel1-nb|Screen specific for minitel1-nb,
+@@ -21873,16 +21850,14 @@
+ 	      %{255}%&%02X,
+ 	is2=\E]R\E]P3FFFF80\E[?8c, ka1=\EOw, ka3=\EOy, kb2=\E[G,
+ 	kbs=^?, kc1=\EOq, kc3=\EOs, kcbt=\E^I, kclr=\E\r,
+-	kdl1=\E\E[A, kent=\EOM, kf2=\E[[B, khome=\E[1~,
+-	kil1=\E\E[B, kmous=\E[M, nel=\EE, oc=\E]R\E]P3FFFF80,
+-	op=\E[39;49m, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l,
+-	rmir=\E[4l, rmpch=\E[10m, rmso=\E[27m, rs1=\Ec,
+-	rs3=\E[37;40m\E[8], sgr0=\E[m, smacs=^N, smam=\E[?7h,
+-	smir=\E[4h, smpch=\E[11m, smso=\E[7m, tbc=\E[3g,
+-	vpa=\E[%i%p1%dd, .VN=\E[?5l, .VR=\E[?5h, .am@,
+-	.ich=\E[%p1%d@, .ich1=\E[@, .ll=\E[99H, .rmcup=,
+-	.rmul=\E[24m, .smcup=\E]R\E]P3FFFF80\E[?8c,
+-	.smul=\E[4m,
++	kdl1=\E\E[A, kent=\EOM, khome=\E[1~, kil1=\E\E[B,
++	kmous=\E[M, nel=\EE, oc=\E]R\E]P3FFFF80, op=\E[39;49m,
++	rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l,
++	rmpch=\E[10m, rs1=\Ec, rs3=\E[37;40m\E[8], sgr0=\E[m,
++	smacs=^N, smam=\E[?7h, smir=\E[4h, smpch=\E[11m, tbc=\E[3g,
++	.VN=\E[?5l, .VR=\E[?5h, .am@, .ich=\E[%p1%d@, .ich1=\E[@,
++	.ll=\E[99H, .rmcup=, .smcup=\E]R\E]P3FFFF80\E[?8c,
++	.smul=\E[4m, .use=ecma+underline,
+ 	E3=\E[99H\E[2J\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
+ 	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
+ 	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
+@@ -21891,8 +21866,9 @@
+ 	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
+ 	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
+ 	   \n\n\n\n\n\n\n\n\n\n,
+-	use=ansi+arrows, use=ansi+csr, use=ansi+cup,
+-	use=ansi+erase, use=ansi+idl, use=ansi+local1,
++	use=ecma+standout, use=ansi+arrows, use=ansi+csr,
++	use=ansi+cup, use=ansi+erase, use=ansi+idl,
++	use=ansi+local1, use=ansi+rca2, use=ansi+sgrso,
+ 	use=klone+color, use=linux+decid, use=linux+lockeys,
+ 	use=vt220+pcedit, use=vt220+cvis, use=vt220+sfkeys,
+ 	use=vt220+ufkeys,
+@@ -21977,13 +21953,13 @@
+ # Putty :
+ 
+ putty-m1|Putty Minitel 1 "like" Couleurs,
+-	dim@, rmul=\E[24m, smul=\E[4m, .E3=\E[300S,
++	dim@, .E3=\E[300S, use=ecma+underline,
+ 	use=xterm+r5+lockeys, use=xterm+alt47,
+ 	use=putty+screen, use=xterm+sl-twm, use=ecma+index,
+ 	use=linux-m1,
+ 
+ putty-m1b|Putty Minitel 1B "like" Monochrome (Gris/Blanc/Noir),
+-	dim@, rmul=\E[24m, smul=\E[4m, .E3=\E[300S,
++	dim@, .E3=\E[300S, use=ecma+underline,
+ 	use=xterm+r5+lockeys, use=xterm+alt47,
+ 	use=putty+screen, use=xterm+sl-twm, use=ecma+index,
+ 	use=linux-m1b,
+@@ -21991,7 +21967,7 @@
+ putty-m2|Putty Minitel 2 "like" Couleurs (Vert/Blanc/Noir),
+ 	acsc=``aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{
+ 	     {||}}~~,
+-	dim@, rmul=\E[24m, smul=\E[4m, .E3=\E[300S,
++	dim@, .E3=\E[300S, use=ecma+underline,
+ 	use=xterm+r5+lockeys, use=xterm+alt47,
+ 	use=putty+screen, use=xterm+sl-twm, use=ecma+index,
+ 	use=linux-m2,
+@@ -22000,10 +21976,10 @@
+ 	.WS=\E[8;%p1%d;%p2%dt, Z0=\E[?3h, Z1=\E[?3l,
+ 
+ putty-screen|PuTTY with screen resizing extensions,
+-	WS=\E[8;%p1%d;%p2%dt, Z0=\E[?3h, Z1=\E[?3l, use=putty,
++	WS=\E[8;%p1%d;%p2%dt, use=putty+screen, use=putty,
+ 
+ screen.putty-m1|Putty m1 specific for screen,
+-	dim@, rmul=\E[24m, smul=\E[4m, E3@, use=screen.linux-m1,
++	dim@, E3@, use=ecma+underline, use=screen.linux-m1,
+ 
+ screen.putty-m1b|Putty m1b specific for screen,
+ 	colors@, pairs@,
+@@ -22166,8 +22142,8 @@
+ 	cup=%i\E[%p1%d;%p2%dH, dl1=\E[M$<2*>, ed=\E[J$<150>,
+ 	el=\E[K$<2>, ht=^I, il1=\E[L$<2*>, ind=\n$<280>,
+ 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, lf1=PF1,
+-	lf2=PF2, lf3=PF3, lf4=PF4, rmkx=\E>, rmso=\E[m, sgr0=\E[m,
+-	smkx=\E=, smso=\E[7m, use=ansi+csr, use=ansi+local1,
++	lf2=PF2, lf3=PF3, lf4=PF4, rmkx=\E>, sgr0=\E[m, smkx=\E=,
++	use=ansi+csr, use=ansi+local1, use=ansi+sgrso,
+ 	use=vt100+pf1-pf4,
+ 
+ bg1.25rv|BBN BitGraph 1.25 (reverse video),
+@@ -22183,8 +22159,8 @@
+ 	cup=%i\E[%p1%d;%p2%dH, dl1=\E[M$<2*>, ed=\E[J$<150>,
+ 	el=\E[K$<2>, ht=^I, il1=\E[L$<2*>, ind=\n$<280>, kf1=\EP,
+ 	kf2=\EQ, kf3=\ER, kf4=\ES, lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4,
+-	ll=\E[64;1H, rmam=\E[?7l, rmkx=\E>, rmso=\E[m, sgr0=\E[m,
+-	smam=\E[?7h, smkx=\E=, smso=\E[7m, use=ansi+local1,
++	ll=\E[64;1H, rmam=\E[?7l, rmkx=\E>, sgr0=\E[m, smam=\E[?7h,
++	smkx=\E=, use=ansi+local1, use=ansi+sgrso,
+ 	use=vt52+arrows,
+ 
+ #### Bull (bq, dku, vip)
+@@ -22261,8 +22237,8 @@
+ 	bel=^G, blink=\E[0;5m, civis=\E[1r, clear=\E[2J,
+ 	cnorm=\E[r, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%df,
+ 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[0;2m,
+-	dsl=\EPY99:98\E\\\E[0;98v\E[2J\E[v, fsl=\E[v,
+-	home=\E[H, ht=\E[I, ind=\n, invis=\E[0;8m,
++	dsl=\EPY99:98\E\\\E[0;98v\E[2J\E[v, fsl=\E[v, ht=\E[I,
++	ind=\n, invis=\E[0;8m,
+ 	is1=\E[?=h\Ec\E`\E[?>h\EPY99:98\E\\,
+ 	is2=\E[5;>;12;18;?h\EPY99:98\E\\,
+ 	smir=\E[4h, smso=\E[0;7m, smul=\E[0;4m,
+ 	tsl=\EPY99:98\E\\\E[0;98v\E[2;7m, use=ansi+arrows,
+-	use=ansi+erase, use=ansi+idl, use=ansi+inittabs,
+-	use=ansi+local, use=ansi+sgrdim, use=dec+sl,
++	use=ansi+cup, use=ansi+erase, use=ansi+idl,
++	use=ansi+inittabs, use=ansi+local, use=ansi+sgrdim,
++	use=dec+sl,
+ 
+ tws2102-sna|dku7102-sna|Bull Questar tws2102 for SNA,
+ 	dsl=\E[0;98v\E[2J\E[v, fsl=\E[v, is3=\Eb, tsl=\E[0;98v,
+@@ -22388,13 +22365,14 @@
+ 	kb2=\EOu, kc1=\EOq, kc3=\EOs, khlp=\E[28~, krdo=\E[29~,
+ 	lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, nel=\EE, rev=\E[7m, ri=\EM,
+ 	rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?7h, rmir=\E[4l,
+-	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=\E[!p,
+-	rs2=\E[?3l, s0ds=\E(B, s1ds=\E(0,
++	rmkx=\E[?1l\E>, rs1=\E[!p, rs2=\E[?3l, s0ds=\E(B,
++	s1ds=\E(0,
+ 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
+ 	    %;m%?%p9%t\E(0%e\E(B%;,
+ 	sgr0=\E[0m\E(B, smacs=\E(0, smam=\E[?7h,
+-	smcup=\E[?7l\E[?1l\E(B, smir=\E[4h, smso=\E[7m,
+-	smul=\E[4m, tsl=\E[1$}\E[2$~, use=ansi+enq, use=ansi+csr,
++	smcup=\E[?7l\E[?1l\E(B, smir=\E[4h, smul=\E[4m,
++	tsl=\E[1$}\E[2$~, use=ecma+underline,
++	use=ecma+standout, use=ansi+enq, use=ansi+csr,
+ 	use=ansi+erase, use=ansi+idl, use=ansi+local,
+ 	use=ansi+pp, use=dec+sl, use=vt100+4bsd,
+ 	use=vt100+pf1-pf4, use=vt220+cvis, use=vt220+vtedit,
+@@ -22852,9 +22830,9 @@
+ 	cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, ht=^I, ind=\n,
+ 	is2=\E>\E[?3l\E[?4l\E[?5l\E[?20l\E[?7h\E[?8h,
+ 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, khome=\E[H,
+-	ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+-	sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7;31m,
+-	smul=\E[4m, use=ansi+local, use=vt100+pf1-pf4,
++	ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, sgr0=\E[m,
++	smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7;31m,
++	use=ansi+local, use=ansi+sgrul, use=vt100+pf1-pf4,
+ 
+ # DEC PRO-350 console (VT220-style).  The 350 was DEC's attempt to produce
+ # a PC differentiated from the IBM clones.  It was a total, ludicrous,
+@@ -22915,8 +22893,7 @@
+ 	hc,
+ 	cols#80, lines#66,
+ 	bel=^G, cr=\r, cud1=\n, hd=\EK, ht=^I, hu=\EL, ind=\n, nel=\r\n,
+-	rmso=\E[22m, rmul=\E[24m, sgr0=\E[m, smso=\E[1m,
+-	smul=\E[4m,
++	rmso=\E[22m, sgr0=\E[m, smso=\E[1m, use=ecma+underline,
+ ln03-w|DEC ln03 laser printer 132 cols,
+ 	cols#132,
+ 	kbs=^H, kcub1=^H, kcud1=\n, use=ln03,
+@@ -22950,10 +22927,11 @@
+ 	ind=\ED$<5/>, is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\E[D,
+ 	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, rev=\E[7m$<2/>,
+ 	rf=/usr/share/tabset/vt100, ri=\EM$<5/>, rmam=\E[7l,
+-	rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m$<2/>,
++	rmkx=\E[?1l\E>, rmul=\E[m$<2/>,
+ 	rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+-	sgr0=\E[m$<2/>, smam=\E[7l, smkx=\E[?1h\E=, smso=\E[7m,
+-	smul=\E[4m$<2/>, use=ansi+csr, use=vt100+pf1-pf4,
++	sgr0=\E[m$<2/>, smam=\E[7l, smkx=\E[?1h\E=,
++	smul=\E[4m$<2/>, use=ansi+csr, use=ansi+sgrso,
++	use=vt100+pf1-pf4,
+ 
+ #### Evans & Sutherland
+ #
+@@ -23024,15 +23002,16 @@
+ 	OTbs, am, mir, msgr,
+ 	cols#80, it#8, lines#24,
+ 	acsc=, bel=^G, clear=\E[2J, cnorm=\E[>4l, cr=\r, cub1=^H,
+-	cud1=\E[1B, cuf1=\E[1C, cup=\E[%i%p1%d;%p2%dH,
+-	cuu1=\E[1A, cvvis=\E[>4h, dch1=\E[1P, dl1=\E[1M$<1*>,
+-	ed=\E[J, el=\E[K, home=\E[H, ht=^I, il1=\E[1L$<1*>, ind=\n,
++	cud1=\E[1B, cuf1=\E[1C, cuu1=\E[1A, cvvis=\E[>4h,
++	dch1=\E[1P, dl1=\E[1M$<1*>, ed=\E[J, el=\E[K, ht=^I,
++	il1=\E[1L$<1*>, ind=\n,
+ 	is2=\E<\E[>1;2;3;4;5;6;7;8;9l\E[m\E[11m\E[?7h,
+ 	kbs=^H, kcub1=\E[1D, kcud1=\E[1B, kcuf1=\E[1C, kcuu1=\E[1A,
+ 	kf1=\EOS, kf2=\EOT, kf3=\EOU, kf4=\EOV, kf5=\EOW, kf6=\EOP,
+ 	kf7=\EOQ, kf8=\EOR, khome=\E[H, lf6=blue, lf7=red, lf8=white,
+-	ri=\EM, rmacs=\E[11m, rmam=\E[?7l, rmir=\E[4l, rmso=\E[m,
+-	smacs=\E[10m, smam=\E[?7h, smir=\E[4h, smso=\E[7m,
++	ri=\EM, rmacs=\E[11m, rmam=\E[?7l, rmir=\E[4l,
++	smacs=\E[10m, smam=\E[?7h, smir=\E[4h, use=ansi+cup,
++	use=ansi+sgrso,
+ h19-bs|Heathkit w/keypad shifted,
+ 	rmkx=\Eu, smkx=\Et, use=h19-b,
+ h19-us|h19us|h19-smul|Heathkit w/keypad shifted/underscore cursor,
+@@ -23138,18 +23117,19 @@
+ 	OTkn#10, cols#80, it#8, lines#24,
+ 	OTbc=\ED, bel=^G, blink=\E[5m, bold=\E[2m, clear=\E[2J,
+ 	cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\n,
+-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[1P,
+-	dim=\E[2m, dsl=\E[>1l, ed=\E[J, el=\E[K, fsl=\E[u\E[>5l,
+-	home=\E[H, ht=^I, hts=\EH, if=/usr/share/tabset/vt100,
+-	ind=\ED, kclr=\E[J, ked=\E[J, kf0=\E[~, kf1=\EOS, kf2=\EOT,
+-	kf3=\EOU, kf4=\EOV, kf5=\EOW, kf6=\EOP, kf7=\EOQ, kf8=\EOR,
+-	kf9=\EOX, khome=\E[H, lf0=help, mc0=\E#7, nel=\r\ED, rc=\E[r,
+-	rev=\E[7m, ri=\EM, rmcup=\E[?7h, rmso=\E[m, rmul=\E[m,
++	dch=\E[%p1%dP, dch1=\E[1P, dim=\E[2m, dsl=\E[>1l, ed=\E[J,
++	el=\E[K, fsl=\E[u\E[>5l, ht=^I, hts=\EH,
++	if=/usr/share/tabset/vt100, ind=\ED, kclr=\E[J, ked=\E[J,
++	kf0=\E[~, kf1=\EOS, kf2=\EOT, kf3=\EOU, kf4=\EOV, kf5=\EOW,
++	kf6=\EOP, kf7=\EOQ, kf8=\EOR, kf9=\EOX, khome=\E[H, lf0=help,
++	mc0=\E#7, nel=\r\ED, rc=\E[r, rev=\E[7m, ri=\EM,
++	rmcup=\E[?7h, rmso=\E[m,
+ 	rs1=\E<\E[1;24r\E[24;1H\E[?7h\E[>4h\E[>1;2;3;5;6;7;8;9l\E[m
+ 	    \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,
+-	use=ansi+apparrows, use=ansi+idl, use=ansi+local,
++	sc=\E[s, sgr0=\E[m, smcup=\E[?7l, smso=\E[7;2m, tbc=\E[3g,
++	tsl=\E[s\E[>5;1h\E[25;%i%dH\E[1K, use=ansi+apparrows,
++	use=ansi+cup, use=ansi+idl, use=ansi+local,
++	use=ansi+sgrul,
+ 
+ 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
+@@ -23170,19 +23150,19 @@
+ 	acsc=0a``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
+ 	blink=\E[5m, bold=\E[1m, cbt=\E[1Z, civis=\E[>5h,
+ 	clear=\E[2J\E[H, cnorm=\E[>5l, cr=\r,
+-	csr=\E[%i%p1%d;%p2%dr, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
+-	dch=\E[%p1%dP, dch1=\E[1P, dim=\E[2m, dl=\E[%p1%dM,
+-	dl1=\E[1M, dsl=\E[>1l, ed=\E[0J, el=\E[0K, el1=\E[1K,
+-	fsl=\E[u, home=\E[H, il=\E[%p1%dL, il1=\E[1L, ind=\n,
+-	is2=\E<\E[>1;3;5;6;7l\E[0m\E[2J, ka1=\EOw, ka3=\EOu,
+-	kb2=\EOy, kc1=\EOq, kc3=\EOs, ked=\E[J, kf1=\EOS, kf2=\EOT,
+-	kf3=\EOU, kf4=\EOV, kf5=\EOW, kf6=\EOP, kf7=\EOQ, kf8=\EOR,
+-	kf9=\EOX, khlp=\E[~, ll=\E[24;1H, mc0=\E[?19h\E[i, rc=\E[u,
+-	rev=\E[7m, rmacs=\E(B, rmir=\E[4l, rmkx=\E[>7l, rmso=\E[0m,
+-	rmul=\E[0m, rs2=\E<\Ec\0, sc=\E[s, sgr0=\E[0m, smacs=\E(0,
+-	smir=\E[4h, smkx=\E[>7h, smso=\E[7m, smul=\E[4m,
++	csr=\E[%i%p1%d;%p2%dr, cub1=^H, dch=\E[%p1%dP,
++	dch1=\E[1P, dim=\E[2m, dl=\E[%p1%dM, dl1=\E[1M, dsl=\E[>1l,
++	ed=\E[0J, el=\E[0K, el1=\E[1K, fsl=\E[u, il=\E[%p1%dL,
++	il1=\E[1L, ind=\n, is2=\E<\E[>1;3;5;6;7l\E[0m\E[2J,
++	ka1=\EOw, ka3=\EOu, kb2=\EOy, kc1=\EOq, kc3=\EOs, ked=\E[J,
++	kf1=\EOS, kf2=\EOT, kf3=\EOU, kf4=\EOV, kf5=\EOW, kf6=\EOP,
++	kf7=\EOQ, kf8=\EOR, kf9=\EOX, khlp=\E[~, ll=\E[24;1H,
++	mc0=\E[?19h\E[i, rc=\E[u, rev=\E[7m, rmacs=\E(B,
++	rmir=\E[4l, rmkx=\E[>7l, rmso=\E[0m, rmul=\E[0m,
++	rs2=\E<\Ec\0, sc=\E[s, sgr0=\E[0m, smacs=\E(0, smir=\E[4h,
++	smkx=\E[>7h, smso=\E[7m, smul=\E[4m,
+ 	tsl=\E[s\E[>1h\E[25;%i%p1%dH, use=ansi+arrows,
+-	use=ansi+local, use=ansi+pp, use=ansi+tabs,
++	use=ansi+cup, use=ansi+local, use=ansi+pp, use=ansi+tabs,
+ 
+ # From: Brad Brahms 
+ z100|h100|z110|z-100|h-100|Heath/Zenith z-100 pc with color monitor,
+@@ -23371,14 +23351,13 @@
+ 	OTbs, OTpt, am, xenl,
+ 	cols#80, it#8, lines#48, vt#3,
+ 	OTnl=\n, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[;H\E[2J,
+-	cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+-	cuu1=\E[A, ed=\E[J, el=\E[K,
+-	flash=\E[?5h\E[0q\E[1;2q\E[?5l\E[0q\E[4;3q,
+-	home=\E[H, ht=^I, is2=\E<\E[1;48r\E[0q\E[3;4q\E=\E[?1h,
+-	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+-	rev=\E[7m, ri=\EM, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+-	rs1=\E=\E[0q\E>, sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m,
+-	smul=\E[4m, use=ansi+csr, use=vt100+pf1-pf4,
++	cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, cuu1=\E[A, ed=\E[J,
++	el=\E[K, flash=\E[?5h\E[0q\E[1;2q\E[?5l\E[0q\E[4;3q,
++	ht=^I, is2=\E<\E[1;48r\E[0q\E[3;4q\E=\E[?1h, kbs=^H,
++	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, rev=\E[7m,
++	ri=\EM, rmkx=\E[?1l\E>, rs1=\E=\E[0q\E>, sgr0=\E[m,
++	smkx=\E[?1h\E=, use=ansi+csr, use=ansi+cup,
++	use=ansi+sgrso, use=ansi+sgrul, use=vt100+pf1-pf4,
+ 
+ #### Morrow Designs
+ #
+@@ -23465,13 +23444,12 @@
+ 	hts=\EH, ind=\n, is2=\E)0, kbs=^H, kcub1=\E[D, kcud1=\E[B,
+ 	kcuf1=\E[C, kcuu1=\E[A, kf0=\EOP, kf1=\EOQ, kf2=\EOR,
+ 	kf3=\EOS, lf0=PF1, lf1=PF2, lf2=PF3, lf3=PF4, ll=\E[24;1H,
+-	nel=\EE, rev=\E[7m, ri=\EM, rmacs=^O, rmkx=\E>, rmso=\E[m,
+-	rmul=\E[m,
++	nel=\EE, rev=\E[7m, ri=\EM, rmacs=^O, rmkx=\E>,
+ 	rs1=\E[1w\E[>37m\E[>39m\E[1v\E[20l\E[?3l\E[?6l\E[>5h\E[>6h
+ 	    \E[>7h\E[>8l\E[>9h\E[>10l\E[1;24r\E[m\E[q\E(B\017\E)0\E#
+ 	    5\E>,
+-	sgr0=\E[m, smacs=^N, smkx=\E=, smso=\E[7m, smul=\E[4m,
+-	tbc=\E[3g, use=ansi+csr, use=ansi+local,
++	sgr0=\E[m, smacs=^N, smkx=\E=, tbc=\E[3g, use=ansi+csr,
++	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
+ 
+ # [TO DO: Check out: short forms of ho/cl and ll; reset (\Ec)].
+ rt6221-w|Ramtek 6221 160x48,
+@@ -23531,9 +23509,9 @@
+ 	am, msgr,
+ 	cols#80, it#8, lines#26,
+ 	clear=\E[;H\E[2J$<50/>, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C,
+-	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, el=\E[K, home=\E[H,
+-	ht=^I, ind=\n, kbs=^H, kcub1=^H, kcud1=\n, nel=\r\n, rev=^_\s,
+-	rmso=^_!, rmul=^_#, sgr0=^_!, smso=^_\s, smul=^_",
++	cuu1=\E[A, el=\E[K, ht=^I, ind=\n, kbs=^H, kcub1=^H, kcud1=\n,
++	nel=\r\n, rev=^_\s, rmso=^_!, rmul=^_#, sgr0=^_!, smso=^_\s,
++	smul=^_", use=ansi+cup,
+ 
+ #### Soroc
+ #
+@@ -23660,9 +23638,9 @@
+ tab132|tab|tab132-15|tab 132/15,
+ 	da, db,
+ 	OTdN@, lm#96,
+-	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, il1=\E[L,
++	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P,
+ 	is2=\E[?7h\E[?3l\E[?5l, rmir=\E[4l, rmkx@, smir=\E[4h,
+-	smkx@, use=decid+cpr, use=vt100+4bsd,
++	smkx@, use=ansi+idl1, use=decid+cpr, use=vt100+4bsd,
+ tab132-w|tab132 in wide mode,
+ 	cols#132,
+ 	is2=\E[?7h\E[?3h\E[?5l, use=tab132,
+@@ -23741,13 +23719,12 @@
+ 	am, da, db, mir, xhp, xt,
+ 	cols#80, lines#24,
+ 	bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H,
+-	cup=%i\E[%p1%d;%p2%df, dch1=\E[P, dl1=\E[M, ed=\E[0J,
+-	el=\E[0K, home=\E[H, ht=^I, il1=\E[L, ind=\n, kf1=^Z1,
+-	kf10=^Z0, kf2=^Z2, kf3=^Z3, kf4=^Z4, kf5=^Z5, kf6=^Z6, kf7=^Z7,
+-	kf8=^Z8, kf9=^Z9, ri=\E[T, rmcup=\E[V\E[24;1f\E[?38h,
+-	rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
+-	smcup=\E[U\E[?38l, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+-	use=ansi+local1,
++	cup=%i\E[%p1%d;%p2%df, dch1=\E[P, ed=\E[0J, el=\E[0K,
++	home=\E[H, ht=^I, ind=\n, kf1=^Z1, kf10=^Z0, kf2=^Z2, kf3=^Z3,
++	kf4=^Z4, kf5=^Z5, kf6=^Z6, kf7=^Z7, kf8=^Z8, kf9=^Z9, ri=\E[T,
++	rmcup=\E[V\E[24;1f\E[?38h, rmir=\E[4l, sgr0=\E[m,
++	smcup=\E[U\E[?38l, smir=\E[4h, use=ansi+idl1,
++	use=ansi+local1, use=ansi+sgrso, use=ansi+sgrul,
+ 
+ #### Texas Instruments (ti)
+ #
+@@ -23787,15 +23764,14 @@
+ 	da, db, in,
+ 	cbt=\E[Z, clear=\E[H\E[2J$<6>, dch=\E[%p1%dP$<250>,
+ 	ech=\E[%p1%dX$<20>, ed=\E[J$<6>, el=\E[0K,
+-	enacs=\E(B\E)0, ff=^L, flash=\E[?5h\E[?5l$<6>,
+-	hpa=\E[%p1%{1}%+%dG, hts=\E[0W, ich=\E[%p1%d@$<250>,
+-	il=\E[%p1%dL$<36>, ip=$<10>, is2=\E[1;24r\E[24;1H,
+-	kcmd=\E[29~, kdch1=\E[P, kent=\n, kf1=\E[17~, kf10=\E[28~,
+-	kf11=\E[29~, kf12=\E[31~, kf2=\E[18~, kf3=\E[19~,
+-	kf4=\E[20~, kf5=\E[21~, kf6=\E[23~, kf7=\E[24~, kf8=\E[25~,
+-	kf9=\E[26~, khome=\E[H, kich1=\E[@, knp=\E[S, kpp=\E[T,
+-	kprt=^X, prot=\E&, rmacs=\017$<2>, rs2=\E[!p, sgr@,
+-	smacs=\016$<2>, vpa=\E[%p1%{1}%+%dd, use=vt220,
++	enacs=\E(B\E)0, ff=^L, flash=\E[?5h\E[?5l$<6>, hts=\E[0W,
++	ich=\E[%p1%d@$<250>, il=\E[%p1%dL$<36>, ip=$<10>,
++	is2=\E[1;24r\E[24;1H, kcmd=\E[29~, kdch1=\E[P, kent=\n,
++	kf1=\E[17~, kf10=\E[28~, kf11=\E[29~, kf12=\E[31~,
++	kf2=\E[18~, kf3=\E[19~, kf4=\E[20~, kf5=\E[21~, kf6=\E[23~,
++	kf7=\E[24~, kf8=\E[25~, kf9=\E[26~, khome=\E[H, kich1=\E[@,
++	knp=\E[S, kpp=\E[T, kprt=^X, prot=\E&, rmacs=\017$<2>,
++	rs2=\E[!p, sgr@, smacs=\016$<2>, use=ansi+rca, use=vt220,
+ #
+ # Texas Instruments 916 VDT 8 bit control mode
+ #
+@@ -23821,25 +23797,25 @@
+ 	cols#80, it#8, lines#24,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[2J\E[H, cr=\r,
+ 	csr=%i\E[%p1%d;%p2%dr, cup=%i\E[%p1%d;%p2%dH,
+-	cvvis=\E[?31h, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+-	hts=\EH, il1=\E[L, ind=\ED, kbs=^H, kcub1=\E[D, kcud1=\E[B,
+-	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kf5=\E[16~, kf6=\E[17~,
+-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kich1=\E[@, rc=\E8,
+-	rev=\E[7m, ri=\EM, rmso=\E[m, rmul=\E[m, sc=\E7, sgr0=\E[m,
+-	smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=ansi+local1,
++	cvvis=\E[?31h, ed=\E[J, el=\E[K, home=\E[H, ht=^I, hts=\EH,
++	ind=\ED, kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
++	kcuu1=\E[A, kdch1=\E[P, kf5=\E[16~, kf6=\E[17~, kf7=\E[18~,
++	kf8=\E[19~, kf9=\E[20~, kich1=\E[@, rc=\E8, rev=\E[7m,
++	ri=\EM, sc=\E7, sgr0=\E[m, tbc=\E[3g, use=ansi+idl1,
++	use=ansi+local1, use=ansi+sgrso, use=ansi+sgrul,
+ 	use=vt100+pf1-pf4, use=vt220+cvis,
+ ti924-8|Texas Instruments 924 VDT 8859/1 8 bit CTRL,
+ 	am, xon,
+ 	cols#80, it#8, lines#24,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[2J\E[H, cr=\r,
+ 	csr=%i\E[%p1%d;%p2%dr, cup=%i\E[%p1%d;%p2%dH,
+-	cvvis=\E[?31h, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+-	hts=\EH, il1=\E[L, ind=\ED, kbs=^H, kcub1=\E[D, kcud1=\E[B,
+-	kcuf1=\E[C, kcuu1=\E[A, kdch1=\233P, kf1=\217P, kf2=\217Q,
+-	kf3=\217R, kf4=\217S, kf5=\23316~, kf6=\23317~,
+-	kf7=\23318~, kf8=\23319~, kf9=\23320~, kich1=\233@, rc=\E8,
+-	rev=\E[7m, ri=\EM, rmso=\E[m, rmul=\E[m, sc=\E7, sgr0=\E[m,
+-	smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=ansi+local1,
++	cvvis=\E[?31h, ed=\E[J, el=\E[K, home=\E[H, ht=^I, hts=\EH,
++	ind=\ED, kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
++	kcuu1=\E[A, kdch1=\233P, kf1=\217P, kf2=\217Q, kf3=\217R,
++	kf4=\217S, kf5=\23316~, kf6=\23317~, kf7=\23318~,
++	kf8=\23319~, kf9=\23320~, kich1=\233@, rc=\E8, rev=\E[7m,
++	ri=\EM, sc=\E7, sgr0=\E[m, tbc=\E[3g, use=ansi+idl1,
++	use=ansi+local1, use=ansi+sgrso, use=ansi+sgrul,
+ 	use=vt220+cvis,
+ ti924w|Texas Instruments 924 VDT 7 bit - 132 column mode,
+ 	cols#132, use=ti924,
+@@ -23866,14 +23842,14 @@
+ 	am, bce, eo, xenl, xon,
+ 	colors#8, cols#80, it#8, lines#25, pairs#64,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[2J\E[H,
+-	cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H,
+-	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, ed=\E[J,
+-	el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, ind=\E[S,
+-	kend=\E[F, kf0=\E[V, kf1=\E[M, kf2=\E[N, kf3=\E[O, kf4=\E[P,
+-	kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, knp=\E[G,
+-	kpp=\E[I, op=\E[37;40m, ri=\E[T, rmso=\E[m, rmul=\E[m,
+-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[m,
+-	smso=\E[7m, smul=\E[4m, use=ansi+arrows, use=ansi+local1,
++	cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, dch1=\E[P, ed=\E[J,
++	el=\E[K, ht=^I, ich1=\E[@, ind=\E[S, kend=\E[F, kf0=\E[V,
++	kf1=\E[M, kf2=\E[N, kf3=\E[O, kf4=\E[P, kf5=\E[Q, kf6=\E[R,
++	kf7=\E[S, kf8=\E[T, kf9=\E[U, knp=\E[G, kpp=\E[I,
++	op=\E[37;40m, ri=\E[T, setab=\E[4%p1%dm,
++	setaf=\E[3%p1%dm, sgr0=\E[m, use=ansi+arrows,
++	use=ansi+cup, use=ansi+idl1, use=ansi+local1,
++	use=ansi+sgrso, use=ansi+sgrul,
+ #
+ #       928 VDT 7 bit control mode
+ #
+@@ -23976,9 +23952,8 @@
+ 	cols#80, lines#25,
+ 	acsc=``a1fxgqh0jYk?lZm@nEooppqDrrsstCu4vAwBx3yyzz{{||}}~~,
+ 	bel=^G, civis=\E[=C, clear=\E[2J\E[H, cnorm=\E[=1C, cr=\r,
+-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+-	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[1M, ech=\E[%p1%dX, ed=\E[J,
+-	el=\E[K, home=\E[H, hpa=\E[%i%p1%dG, ich=\E[%p1%d@,
++	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM,
++	dl1=\E[1M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, ich=\E[%p1%d@,
+ 	ich1=\E[1@, il=\E[%p1%dL, il1=\E[1L, ind=\E[S, invis=\E[9m,
+ 	is2=\E[0;10;39m, kcbt=^], kdch1=\E[P, kend=\E[Y, kf10=\EOY,
+ 	kf11=\EOZ, kf12=\EOA, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW,
+@@ -23986,10 +23961,10 @@
+ 	nel=\r\E[S, rc=\E8, ri=\E[T, rmacs=\E[10m, sc=\E7,
+ 	sgr=\E[10m\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t;
+ 	    2%;%?%p6%t;1%;%?%p9%t;12%e;10%;%?%p7%t;9%;m,
+-	sgr0=\E[0;10m, smacs=\E[12m, vpa=\E[%i%p1%dd,
+-	use=ansi+arrows, use=ansi+inittabs, use=ansi+local,
+-	use=ansi+sgrbold, use=ecma+index, use=klone+color,
+-	use=vt100+pf1-pf4,
++	sgr0=\E[0;10m, smacs=\E[12m, use=ansi+arrows,
++	use=ansi+cup, use=ansi+inittabs, use=ansi+local,
++	use=ansi+rca2, use=ansi+sgrbold, use=ecma+index,
++	use=klone+color, use=vt100+pf1-pf4,
+ 
+ # (pc6300plus: removed ":KM=/usr/lib/ua/kmap.s5:"; renamed BO/EE/CI/CV -- esr)
+ pc6300plus|AT&T 6300 plus,
+@@ -24002,9 +23977,9 @@
+ 	ich1=\E[1@, il1=\E[1L, ind=\n, invis=\E[9m, kbs=^H,
+ 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOc,
+ 	kf10=\EOu, kf2=\EOd, kf3=\EOe, kf4=\EOf, kf5=\EOg, kf6=\EOh,
+-	kf7=\EOi, kf8=\EOj, kf9=\EOk, nel=\r\n, rev=\E[7m, rmso=\E[m,
+-	rmul=\E[m, sgr0=\E[m, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+-	use=ansi+local1,
++	kf7=\EOi, kf8=\EOj, kf9=\EOk, nel=\r\n, rev=\E[7m, sgr0=\E[m,
++	tbc=\E[3g, use=ansi+local1, use=ansi+sgrso,
++	use=ansi+sgrul,
+ 
+ # From: Benjamin C. W. Sittler 
+ #
+@@ -24127,25 +24102,24 @@
+ 	am, xon,
+ 	cols#80, it#8, lines#24,
+ 	bel=^G, blink=\E[9m, bold=\E[1m, cbt=\E^I, civis=\E[=1C,
+-	clear=\E[2J\E[H, cnorm=\E[=0C, cr=\r, cub1=^H,
+-	cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dim=\E[2m, ed=\E[0J,
+-	el=\E[0K, home=\E[H, ich1=\E[@, ind=\n, invis=\E[9m,
+-	is1=\017\E[=1w, kBEG=\ENB, kCAN=\EOW, kCPY=\END, kCRT=\EON,
+-	kDC=\ENF, kDL=\ENE, kEND=\ENN, kEOL=\EOA, kFND=\EOX,
+-	kHLP=\EOM, kHOM=\ENM, kIC=\ENJ, kLFT=\ENK, kMOV=\ENC,
+-	kNXT=\ENH, kOPT=\EOR, kPRV=\ENG, kRDO=\EOT, kRIT=\ENL,
+-	kRPL=\EOY, kSAV=\EOO, kUND=\EOS, kbeg=\ENb, kcan=\EOw,
+-	kcbt=\E[Z, kclo=\EOV, kclr=\E[J, kcmd=\EOu, kcpy=\ENd,
+-	kcrt=\EOn, kdch1=\ENf, ked=\E[J, kel=\EOa, kend=\E0,
+-	kext=\EOk, kf1=\EOc, kf2=\EOd, kf3=\EOe, kf4=\EOf, kf5=\EOg,
+-	kf6=\EOh, kf7=\EOi, kf8=\EOj, kfnd=\EOx, khlp=\EOm,
+-	kich1=\ENj, kind=\E[B, kmov=\ENc, kmrk=\ENi, knp=\E[U,
+-	knxt=\ENh, kopn=\EOv, kopt=\EOr, kpp=\E[V, kprt=\EOz,
+-	kprv=\ENg, krdo=\EOt, kref=\EOb, krfr=\ENa, kri=\E[A,
+-	krpl=\EOy, krst=\EOB, ksav=\EOo, kslt=\ENI, kund=\EOs,
+-	nel=\EE, rev=\E[7m, ri=\EM, rmso=\E[m, rmul=\E[m,
+-	sgr0=\E[0;10m, smso=\E[7m, smul=\E[4m, use=ansi+arrows,
+-	use=ansi+idl, use=ansi+local,
++	clear=\E[2J\E[H, cnorm=\E[=0C, cr=\r, cub1=^H, dch1=\E[P,
++	dim=\E[2m, ed=\E[0J, el=\E[0K, ich1=\E[@, ind=\n,
++	invis=\E[9m, is1=\017\E[=1w, kBEG=\ENB, kCAN=\EOW,
++	kCPY=\END, kCRT=\EON, kDC=\ENF, kDL=\ENE, kEND=\ENN,
++	kEOL=\EOA, kFND=\EOX, kHLP=\EOM, kHOM=\ENM, kIC=\ENJ,
++	kLFT=\ENK, kMOV=\ENC, kNXT=\ENH, kOPT=\EOR, kPRV=\ENG,
++	kRDO=\EOT, kRIT=\ENL, kRPL=\EOY, kSAV=\EOO, kUND=\EOS,
++	kbeg=\ENb, kcan=\EOw, kcbt=\E[Z, kclo=\EOV, kclr=\E[J,
++	kcmd=\EOu, kcpy=\ENd, kcrt=\EOn, kdch1=\ENf, ked=\E[J,
++	kel=\EOa, kend=\E0, kext=\EOk, kf1=\EOc, kf2=\EOd, kf3=\EOe,
++	kf4=\EOf, kf5=\EOg, kf6=\EOh, kf7=\EOi, kf8=\EOj, kfnd=\EOx,
++	khlp=\EOm, kich1=\ENj, kind=\E[B, kmov=\ENc, kmrk=\ENi,
++	knp=\E[U, knxt=\ENh, kopn=\EOv, kopt=\EOr, kpp=\E[V,
++	kprt=\EOz, kprv=\ENg, krdo=\EOt, kref=\EOb, krfr=\ENa,
++	kri=\E[A, krpl=\EOy, krst=\EOB, ksav=\EOo, kslt=\ENI,
++	kund=\EOs, nel=\EE, rev=\E[7m, ri=\EM, sgr0=\E[0;10m,
++	use=ansi+arrows, use=ansi+cup, use=ansi+idl,
++	use=ansi+local, use=ansi+sgrso, use=ansi+sgrul,
+ 
+ #### Convergent Technology
+ #
+@@ -24242,10 +24216,10 @@
+ 	OTbs, km, mir,
+ 	cols#80, it#8, lines#24,
+ 	clear=\E[2J, cub1=^H, cup=\E[%i%p1%d;%p2%dH, dch1=\E[P,
+-	dl1=\E[M, ed=\E[J, el=\E[K, ht=^I, il1=\E[L,
+-	is2=\EGc\EGb\EGw, kbs=^H, kcub1=\EOD, kcud1=\EOB,
+-	kcuf1=\EOC, kcuu1=\EOA, rmir=\E[4l, rmso=\E[m, rmul=\EGau,
+-	smir=\E[4h, smso=\E[7m, smul=\EGu, use=ansi+local1,
++	ed=\E[J, el=\E[K, ht=^I, is2=\EGc\EGb\EGw, kbs=^H,
++	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, rmir=\E[4l,
++	rmul=\EGau, smir=\E[4h, smul=\EGu, use=ansi+idl1,
++	use=ansi+local1, use=ansi+sgrso,
+ masscomp1|masscomp large screen version 1,
+ 	cols#104, lines#36, use=masscomp,
+ masscomp2|masscomp large screen version 2,
+@@ -24274,8 +24248,8 @@
+ 	am, bw, eo,
+ 	cols#80, lines#24,
+ 	clear=\Ec, cub1=^H, cup=\E[%i%p1%2d;%p2%2dH, ed=\E[J,
+-	el=\E[K, home=\E[H, rmso=\E[m, rmul=\E[m, sgr0=\E[m,
+-	smso=\E[7m, smul=\E[4m, use=ansi+local1,
++	el=\E[K, home=\E[H, sgr0=\E[m, use=ansi+local1,
++	use=ansi+sgrso, use=ansi+sgrul,
+ 
+ # (ibmpcx: this entry used to be known as ibmx.
+ # It formerly included the following extension capabilities:
+@@ -24291,11 +24265,11 @@
+ ibmpcx|xenix|ibmx|IBM PC xenix console display,
+ 	OTbs, am, msgr,
+ 	cols#80, lines#25,
+-	clear=^L, cub1=^H, cup=\E[%p1%d;%p2%dH, dch1=\E[P,
+-	dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ich1=\E[@, il1=\E[L,
+-	kend=\E[d, kf1=\E[K, kf2=\E[L, kf3=\E[M, kf4=\E[N,
+-	khome=\E[Y, knp=\E[e, kpp=\E[Z, use=ansi+arrows,
+-	use=ansi+local1, use=klone+acs, use=klone+sgr8,
++	clear=^L, cub1=^H, cup=\E[%p1%d;%p2%dH, dch1=\E[P, ed=\E[J,
++	el=\E[K, home=\E[H, ich1=\E[@, kend=\E[d, kf1=\E[K, kf2=\E[L,
++	kf3=\E[M, kf4=\E[N, khome=\E[Y, knp=\E[e, kpp=\E[Z,
++	use=ansi+arrows, use=ansi+idl1, use=ansi+local1,
++	use=klone+acs, use=klone+sgr8,
+ 
+ ######## OTHER OBSOLETE TYPES
+ #
+@@ -24372,16 +24346,15 @@
+ 	acsc=++\,\,--..``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyz
+ 	     z{{||}}~~,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n,
+-	cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P,
+-	home=\E[H, ht=^I, ich=\E[%p1%d@, ich1=\E[@, ind=\n, is2=\E[m,
+-	kcbt=^R^I, kf1=\E[0s, kf2=\E[24s, kf3=\E[1s, kf4=\E[23s,
+-	kf5=\E[2s, kf6=\E[22s, kf7=\E[3s, kf8=\E[21s, mc4=\E[4i,
+-	mc5=\E[5i, op=\E[?;m, rev=\E[7m, ri=\E[L, rmacs=\E[10m,
+-	rs1=\Ec, setb=\E[?;%p1%dm,
++	dch=\E[%p1%dP, dch1=\E[P, ht=^I, ich=\E[%p1%d@, ich1=\E[@,
++	ind=\n, is2=\E[m, kcbt=^R^I, kf1=\E[0s, kf2=\E[24s,
++	kf3=\E[1s, kf4=\E[23s, kf5=\E[2s, kf6=\E[22s, kf7=\E[3s,
++	kf8=\E[21s, mc4=\E[4i, mc5=\E[5i, op=\E[?;m, rev=\E[7m,
++	ri=\E[L, rmacs=\E[10m, rs1=\Ec, setb=\E[?;%p1%dm,
+ 	setf=\E[?%?%p1%{0}%=%t0%e%p1%{1}%=%t2%e%p1%{1}%-%d%;m,
+ 	sgr0=\E[m\E[10m, smacs=\E[11m, smso=\E[1m, smul=\E[4m,
+-	use=ansi+arrows, use=ansi+erase, use=ansi+idl,
+-	use=ansi+local,
++	use=ansi+arrows, use=ansi+cup, use=ansi+erase,
++	use=ansi+idl, use=ansi+local,
+ 
+ # From:  29 Oct 85 05:40:18 GMT
+ # MS-Kermit with Heath-19 emulation mode enabled
+@@ -24580,8 +24553,8 @@
+ 	cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A,
+ 	cvvis=\E[>12l, ed=\E[J, el=\E[K, ht=^I, ind=\ED, kcub1=\E[D,
+ 	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf5=\EOT, kf6=\EOU,
+-	kf7=\EOV, kf8=\EOW, ri=\EM, rmacs=\E[m, rmso=\E[m, rmul=\E[m,
+-	sgr0=\E[m, smacs=\E[1m, smso=\E[7m, smul=\E[4m,
++	kf7=\EOV, kf8=\EOW, ri=\EM, rmacs=\E[m, sgr0=\E[m,
++	smacs=\E[1m, use=ansi+sgrso, use=ansi+sgrul,
+ 	use=vt100+pf1-pf4,
+ digilog|digilog 333,
+ 	OTbs,
+@@ -24702,14 +24675,14 @@
+ v3220|LANPAR Vision II model 3220/3221/3222,
+ 	OTbs, am, mir, xenl,
+ 	cols#80, it#8, lines#24,
+-	cub1=^H, cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, ht=^I,
+-	il1=\E[L, is2=\E>\E[?3l\E[?7h\E[?8h\E[p, kcub1=\E[D,
+-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf0=\E[1~, kf1=\E[2~,
+-	kf2=\E[3~, kf3=\E[4~, kf4=\E[5~, kf5=\E[6~, kf6=\E[OP,
+-	kf7=\E[OQ, kf8=\E[OR, kf9=\E[OS, khome=\E[H, ri=\EM,
+-	rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, rmso=\E[m, rmul=\E[m,
+-	sgr0=\E[m, smam=\E[?7h, smir=\E[4h, smkx=\E=, smso=\E[7m,
+-	smul=\E[4m, use=ansi+erase, use=ansi+local1,
++	cub1=^H, cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, ht=^I,
++	is2=\E>\E[?3l\E[?7h\E[?8h\E[p, kcub1=\E[D, kcud1=\E[B,
++	kcuf1=\E[C, kcuu1=\E[A, kf0=\E[1~, kf1=\E[2~, kf2=\E[3~,
++	kf3=\E[4~, kf4=\E[5~, kf5=\E[6~, kf6=\E[OP, kf7=\E[OQ,
++	kf8=\E[OR, kf9=\E[OS, khome=\E[H, ri=\EM, rmam=\E[?7l,
++	rmir=\E[4l, rmkx=\E>, sgr0=\E[m, smam=\E[?7h, smir=\E[4h,
++	smkx=\E=, use=ansi+erase, use=ansi+idl1, use=ansi+local1,
++	use=ansi+sgrso, use=ansi+sgrul,
+ ######## ICH/ICH1 VERSUS RMIR/SMIR
+ #
+ # Some non-curses applications get confused if both ich/ich1 and rmir/smir
+@@ -27953,4 +27926,17 @@
+ #	+ add illumos, sun-16color, sun-256color, sun-direct -TD
+ #	+ add wyse+cvis -TD
+ #
++# 2025-05-03
++#	+ update/correct some of the rv/xr strings, checked with tack -TD
++#	+ use ansi+rca in sclp -TD
++#	+ use vt220+pcedit in sclp (Werner Fink)
++#	+ move some building blocks from illumos to sun-color, based on
++#	  illumos source-history -TD
++#	+ improve use-clauses: ansi+cup, ansi+idl1, ansi+rca, ansi+rca2,
++#	  ansi+sgrso, ansi+sgrul -TD
++#	+ add ecma+standout, ecma+underline -TD
++#	+ add rv code for alacritty -TD
++#	+ add rv/xr codes for contour, ghostty, iterm2, kitty, konsole,
++#	  vscode, vte, wezterm -TD
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250426+/package/debian-mingw/changelog	2025-04-26 10:13:45.000000000 +0000
++++ ncurses-6.5-20250503/package/debian-mingw/changelog	2025-05-03 09:39:03.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250426) unstable; urgency=low
++ncurses6td (6.5+20250503) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 26 Apr 2025 06:13:45 -0400
++ -- Thomas E. Dickey   Sat, 03 May 2025 05:39:03 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250426+/package/debian-mingw64/changelog	2025-04-26 10:13:45.000000000 +0000
++++ ncurses-6.5-20250503/package/debian-mingw64/changelog	2025-05-03 09:39:03.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250426) unstable; urgency=low
++ncurses6td (6.5+20250503) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 26 Apr 2025 06:13:45 -0400
++ -- Thomas E. Dickey   Sat, 03 May 2025 05:39:03 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250426+/package/debian/changelog	2025-04-26 10:13:45.000000000 +0000
++++ ncurses-6.5-20250503/package/debian/changelog	2025-05-03 09:39:03.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250426) unstable; urgency=low
++ncurses6td (6.5+20250503) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 26 Apr 2025 06:13:45 -0400
++ -- Thomas E. Dickey   Sat, 03 May 2025 05:39:03 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.700 
+--- ncurses-6.5-20250426+/package/mingw-ncurses.nsi	2025-04-26 10:13:45.000000000 +0000
++++ ncurses-6.5-20250503/package/mingw-ncurses.nsi	2025-05-03 09:39:03.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.700 2025/04/26 10:13:45 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.701 2025/05/03 09:39:03 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0426"
++!define VERSION_MMDD  "0503"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250426+/package/mingw-ncurses.spec	2025-04-26 10:13:45.000000000 +0000
++++ ncurses-6.5-20250503/package/mingw-ncurses.spec	2025-05-03 09:39:03.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250426
++Release: 20250503
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20250426+/package/ncurses.spec	2025-04-26 10:13:45.000000000 +0000
++++ ncurses-6.5-20250503/package/ncurses.spec	2025-05-03 09:39:03.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250426
++Release: 20250503
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20250426+/package/ncursest.spec	2025-04-26 10:13:45.000000000 +0000
++++ ncurses-6.5-20250503/package/ncursest.spec	2025-05-03 09:39:03.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250426
++Release: 20250503
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250510.patch b/packages/ncurses/6.5/ncurses-6.5-20250510.patch
new file mode 100644
index 0000000000..ecae367acd
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250510.patch
@@ -0,0 +1,432 @@
+# ncurses 6.5 - patch 20250510 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250510.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sat May 10 23:36:33 UTC 2025
+# ------------------------------------------------------------------------------
+# NEWS                             |    8 +-
+# VERSION                          |    2 
+# dist.mk                          |    4 -
+# misc/terminfo.src                |  135 +++++++++++++++++++++++++------------
+# 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 
+# 11 files changed, 114 insertions(+), 57 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4279 
+--- ncurses-6.5-20250503+/NEWS	2025-05-03 22:02:34.000000000 +0000
++++ ncurses-6.5-20250510/NEWS	2025-05-10 23:07:14.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4279 2025/05/03 22:02:34 tom Exp $
++-- $Id: NEWS,v 1.4281 2025/05/10 23:07:14 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.
+ 
++20250510
++	+ add rv/xr codes for domterm, mintty, mlterm -TD
++	+ add xr code for putty -TD
++	+ update teraterm to 5.0 -TD
++	+ add rlogin-color -TD
++
+ 20250503
+ 	+ update/correct some of the rv/xr strings, checked with tack -TD
+ 	+ use ansi+rca in sclp -TD
+Index: VERSION
+--- ncurses-6.5-20250503+/VERSION	2025-05-03 09:39:03.000000000 +0000
++++ ncurses-6.5-20250510/VERSION	2025-05-10 09:45:42.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250503
++5:0:10	6.5	20250510
+Index: dist.mk
+Prereq:  1.1667 
+--- ncurses-6.5-20250503+/dist.mk	2025-05-03 09:39:03.000000000 +0000
++++ ncurses-6.5-20250510/dist.mk	2025-05-10 09:45:42.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1667 2025/05/03 09:39:03 tom Exp $
++# $Id: dist.mk,v 1.1668 2025/05/10 09:45:42 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 = 5
+-NCURSES_PATCH = 20250503
++NCURSES_PATCH = 20250510
+ 
+ # 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.5-20250503+/misc/terminfo.src	2025-05-03 21:56:32.000000000 +0000
++++ ncurses-6.5-20250510/misc/terminfo.src	2025-05-10 21:24:30.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.1188 $
+-#	$Date: 2025/05/03 21:56:32 $
++#	$Revision: 1.1193 $
++#	$Date: 2025/05/10 21:24:30 $
+ #
+ # 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
+@@ -4227,13 +4227,14 @@
+ 	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, smam=\E[?7h, smir=\E[4h,
+-	smkx=\E[?1h\E=, E3=\E[3J, use=ecma+underline,
+-	use=ecma+standout, use=ansi+apparrows, use=ansi+csr,
+-	use=ansi+cup, use=ansi+erase, use=ansi+idl,
+-	use=ansi+local, use=ansi+tabs, use=ansi+rep,
+-	use=bracketed+paste, use=ecma+index, use=ansi+rca2,
+-	use=ecma+strikeout, use=klone+color, use=klone+sgr,
+-	use=putty+cursor, use=putty+fnkeys, use=vt220+pcedit,
++	smkx=\E[?1h\E=, E3=\E[3J, rv=\E\\[>0;136;0c,
++	use=ecma+underline, use=ecma+standout,
++	use=ansi+apparrows, use=ansi+csr, use=ansi+cup,
++	use=ansi+erase, use=ansi+idl, use=ansi+local,
++	use=ansi+tabs, use=ansi+rep, use=bracketed+paste,
++	use=ecma+index, use=ansi+rca2, use=ecma+strikeout,
++	use=klone+color, use=klone+sgr, use=putty+cursor,
++	use=putty+fnkeys, use=report+da2, use=vt220+pcedit,
+ 	use=xterm+alt1049, use=vt102+enq, use=xterm+sm+1006,
+ 	use=xterm+sl, use=vt100+fnkeys, use=putty+keypad,
+ 	use=vt220+cvis,
+@@ -4360,11 +4361,16 @@
+ 	rsupm=\E[75m, smm@, smpch=\E[11m, sshm=\E[1:2m,
+ 	ssubm=\E[74m, ssupm=\E[73m, Rmol=\E[55m, Smol=\E[53m,
+ 	Smulx=\E[4:%p1%dm, blink2=\E[6m, norm=\E[22m,
+-	opaq=\E[28m, smul2=\E[21m, use=linux+kbs, use=ansi+rep,
+-	use=ecma+strikeout, use=ecma+index, use=vt420+lrmm,
+-	use=xterm+focus, use=xterm+sm+1006, use=xterm+pcfkeys,
+-	use=xterm+tmux, use=ecma+italics, use=xterm-basic,
+-	use=bracketed+paste, use=report+version,
++	opaq=\E[28m, rv=\E\\[>77;[0-9];0c, smul2=\E[21m,
++	xr=\EP>\\|mintty ([1-9][.0-9]+)\E\\\\, use=linux+kbs,
++	use=ansi+rep, use=ecma+strikeout, use=ecma+index,
++	use=mintty+keypad, use=vt420+lrmm, use=xterm+focus,
++	use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm+tmux,
++	use=ecma+italics, use=xterm-basic, use=bracketed+paste,
++	use=report+version,
++mintty+keypad|mintty special numeric keypad,
++	kbeg=\EOE, kpADD=\EOk, kpDIV=\EOo, kpMUL=\EOj, kpSUB=\EOm,
++
+ # 2019-06-09: These capabilities are commented-out for compatibility with
+ # existing releases 5.9-6.1, and may be considered for inclusion after the
+ # release of ncurses 6.2:
+@@ -4425,7 +4431,7 @@
+ # "resize -s"), though it does not pass SIGWINCH to the application if the
+ # user resizes the window with the mouse.
+ teraterm2.3|Tera Term Pro 2.3,
+-	km,
++	km, npc,
+ 	ncv#43, vt@,
+ 	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i
+ 	     \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u
+@@ -4433,7 +4439,7 @@
+ 	blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cuf1=\E[C,
+ 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP,
+ 	dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
+-	flash=\E[?5h$<200/>\E[?5l, kf10=\E[21~, kf11=\E[23~,
++	flash=\E[?5h$<100/>\E[?5l, kf10=\E[21~, kf11=\E[23~,
+ 	kf12=\E[24~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
+ 	kf9=\E[20~, op=\E[100m, rev=\E[7m, ri=\EM, sgr0=\E[0m\017,
+ 	smul=\E[4m, use=ecma+underline, use=ecma+standout,
+@@ -4454,7 +4460,7 @@
+ #	- it recognizes the dtterm window controls for reporting size in
+ #	  characters and pixels.
+ #	- it passes SIGWINCH.
+-teraterm4.59|Tera Term Pro 4.59,
++teraterm4.59|Tera Term 4.59,
+ 	bce, xenl@,
+ 	ncv#41,
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+@@ -4484,13 +4490,47 @@
+ #	+ recognizes xterm's original direct-colors sequences, but result is
+ #	  poor.
+ #	+ no UTF-8 apparent when UTF-8 is set, with font Lucida Control
+-teraterm4.97|Tera Term Pro 4.97,
++teraterm4.97|Tera Term 4.97,
+ 	XT, use=ecma+color, use=xterm+sm+1006, use=teraterm4.59,
+ teraterm-256color|TeraTerm with xterm 256-colors,
+ 	use=xterm+256setaf, use=teraterm,
++teraterm5.0|Tera Term 5.0,
++	xenl,
++	rv=\E\\[>32;331;0c, use=bracketed+paste, use=dec+sl,
++	use=xterm+keypad, use=report+da2, use=teraterm4.97,
+ 
+ teraterm|Tera Term,
+-	use=teraterm4.97,
++	use=teraterm5.0,
++
++#### RLogin
++# RLogin 2.30.4
++# https://github.com/kmiya-culti/RLogin
++rlogin-color,
++	OTbs, OTpt, am, bce, km, mir, msgr, npc, xenl,
++	OTkn#12, colors#0x100, cols#80, lines#24, pairs#0x10000,
++	OTrs=\E[!p\E[?3;4l\E[4l\E>\E]104\007, bel=^G,
++	bold=\E[1m, civis=\E[?25l, clear=\E[H\E[2J,
++	cnorm=\E[?25h, cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H,
++	cud1=\n, dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, ed=\E[J,
++	el=\E[K, el1=\E[1K, flash=\E[?5h$<100/>\E[?5l,
++	ich=\E[%p1%d@, ind=\n,
++	is2=\E[!p\E[?3;4l\E[4l\E>\E]104\007, kbeg=\EOE,
++	kcbt=\E[Z, kend=\EOF, kf5=\E[15~, kll=\EOF, kmous=\E[M,
++	kslt=\EOF, meml=\El, memu=\Em, op=\E[39;49m, rc=\E8, ri=\EM,
++	rmam=\E[?7l, rmcup=\E[?1049l, rmir=\E[4l, rmkx=\E[?1l\E>,
++	rmso=\E[27m, rmul=\E[24m, rs1=\Ec, sc=\E7,
++	setab=\E[48;5;%p1%dm, setaf=\E[38;5;%p1%dm,
++	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
++	    %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
++	sgr0=\E[m, smam=\E[?7h, smcup=\E[?1049h, smir=\E[4h,
++	smkx=\E[?1h\E=, rv=\E\\[>65;331;0c,
++	xr=\EP>\\|RLogin\\(([1-9][.0-9]+)\\)\E\\\\,
++	use=ansi+apparrows, use=ansi+cup, use=ansi+idl,
++	use=ansi+inittabs, use=ansi+local, use=ansi+rca2,
++	use=ansi+sgrdim, use=ecma+index, use=ecma+italics,
++	use=ecma+strikeout, use=vt420+lrmm, use=decid+cpr,
++	use=report+da2, use=report+version, use=vt100+pf1-pf4,
++	use=vt220+pcedit, use=vt220+ufkeys, use=xterm+acs,
+ 
+ #### Command prompt
+ 
+@@ -4769,12 +4809,13 @@
+ 	use=xterm+direct, use=ms+terminal,
+ ms+terminal|building block for Windows terminal,
+ 	npc,
+-	cud1=\E[B, kcbt=\E[Z, oc@, rmkx=\E[?1l, rmm@, smkx=\E[?1h,
+-	smm@, rv=\E\\[>0;10;1c, use=linux+kbs,
++	cud1=\E[B, kbeg=\EOE, kcbt=\E[Z, oc@, rmkx=\E[?1l, rmm@,
++	smkx=\E[?1h, smm@, rv=\E\\[>0;10;1c, use=linux+kbs,
+ 	use=bracketed+paste, use=xterm+pcfkeys, use=ansi+rep,
+ 	use=xterm+sm+1006, use=ecma+index, use=ecma+italics,
+-	use=ecma+strikeout, use=vt420+lrmm, use=xterm-basic,
+-	use=xterm+focus, use=xterm+tmux, use=xterm+sm+1003,
++	use=ecma+strikeout, use=report+da2, use=vt420+lrmm,
++	use=xterm-basic, use=xterm+focus, use=xterm+tmux,
++	use=xterm+sm+1003,
+ 
+ #### Visual Studio
+ # Visual Studio Code 1.45.0 uses xterm.js 12.8.1 (see https://xtermjs.org/).
+@@ -6512,10 +6553,10 @@
+ konsole-base|KDE console window (common),
+ 	bce, km@, npc, XT,
+ 	ncv@,
+-	ech=\E[%p1%dX, flash=\E[?5h$<100/>\E[?5l, kend=\E[4~,
+-	kf1@, kf10@, kf11@, kf12@, kf13@, kf14@, kf15@, kf16@, kf17@, kf18@,
+-	kf19@, kf2@, kf20@, kf3@, kf4@, kf5@, kf6@, kf7@, kf8@, kf9@, kfnd@,
+-	khome=\E[1~, kslt@, rmam=\E[?7l, rs1=\Ec,
++	ech=\E[%p1%dX, flash=\E[?5h$<100/>\E[?5l, kf1@, kf10@,
++	kf11@, kf12@, kf13@, kf14@, kf15@, kf16@, kf17@, kf18@, kf19@, kf2@,
++	kf20@, kf3@, kf4@, kf5@, kf6@, kf7@, kf8@, kf9@, kfnd@, kslt@,
++	rmam=\E[?7l, rs1=\Ec,
+ 	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?25h,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
+ 	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+@@ -6526,7 +6567,7 @@
+ 	use=xterm+sm+1006, use=ecma+strikeout,
+ 	use=ecma+italics, use=ecma+color, use=xterm-r6,
+ 	use=vt220+cvis, use=bracketed+paste,
+-	use=report+version,
++	use=report+version, use=xterm+pc+edit,
+ 
+ # The keytab feature was introduced in 0.9.12 (February 2000) with "linux" and
+ # "vt100" key-table files along with a compiled-in default key-table.
+@@ -6680,6 +6721,8 @@
+ 	is2=\E[!p\E[?3;4l\E>, rs2=\E[!p\E[?3;4l\E>,
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;%?
+ 	    %p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
++	rv=\E\\[>24;279;0c,
++	xr=\EP>\\|mlterm\\([0-9][.0-9](-.*)?\\)?\E\\\\,
+ 	use=ansi+enq, use=ansi+rep, use=ecma+italics,
+ 	use=ecma+strikeout, use=xterm+app, use=xterm+pcf2,
+ 	use=xterm+pcc2, use=xterm+pce2, use=xterm+meta,
+@@ -6723,13 +6766,12 @@
+ 	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, smir=\E[4h,
+-	smkx=\E[?1h\E=, smul=\E[4m, u8=\E[?1;2c,
+-	use=ecma+underline, use=ecma+standout,
+-	use=ansi+apparrows, use=ansi+csr, use=ansi+cup,
+-	use=ansi+enq, use=ansi+idl, use=ansi+inittabs,
+-	use=ansi+local, use=ansi+rca2, use=vt220+vtedit,
+-	use=xterm+alt1049, use=ecma+index, use=mlterm+pcfkeys,
+-	use=vt220+cvis, use=xterm+r6f2,
++	smkx=\E[?1h\E=, u8=\E[?1;2c, use=ecma+underline,
++	use=ecma+standout, use=ansi+apparrows, use=ansi+csr,
++	use=ansi+cup, use=ansi+enq, use=ansi+idl,
++	use=ansi+inittabs, use=ansi+local, use=ansi+rca2,
++	use=vt220+vtedit, use=xterm+alt1049, use=ecma+index,
++	use=mlterm+pcfkeys, use=vt220+cvis, use=xterm+r6f2,
+ 
+ # The insert/delete/home/end keys do not respond to modifiers because mlterm
+ # looks in its termcap to decide which string to send.  If it used terminfo
+@@ -7323,8 +7365,9 @@
+ 	kopn=\E[198z, kpp=\E[216z, kund=\E[195z, use=mgr,
+ mgr-linux|Mgr window with Linux keyboard,
+ 	ka1=\E[H, ka3=\E[5~, kb2=\E[G, kc1=\E[Y, kc3=\E[6~,
+-	kdch1=\E[3~, kend=\E[4~, kf0=\E[[J, khome=\E[1~, knp=\E[6~,
+-	kpp=\E[5~, use=linux+lockeys, use=vt220+ufkeys, use=mgr,
++	kdch1=\E[3~, kf0=\E[[J, knp=\E[6~, kpp=\E[5~,
++	use=linux+lockeys, use=vt220+ufkeys, use=xterm+pc+edit,
++	use=mgr,
+ 
+ #### SIMPLETERM
+ # st.suckless.org
+@@ -8080,10 +8123,12 @@
+ 	bel@, blink@, dim@, invis@, kcbt=\E[Z, ritm@, rmkx=\E[?1l,
+ 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
+ 	    %t;7%;m,
+-	sitm@, smkx=\E[?1h, use=linux+kbs, use=xterm+256setaf,
+-	use=ecma+index, use=xterm+focus, use=xterm+sm+1006,
+-	use=xterm+pcfkeys, use=xterm-basic,
+-	use=bracketed+paste,
++	sitm@, smkx=\E[?1h, rv=\E\\[>990;[0-9];0c,
++	xr=\EP>\\|DomTerm\\([0-9][.0-9]\\)?\E\\\\,
++	use=bracketed+paste, use=linux+kbs, use=xterm+256setaf,
++	use=ecma+index, use=report+da2, use=report+version,
++	use=xterm+focus, use=xterm+sm+1006, use=xterm+pcfkeys,
++	use=xterm-basic,
+ 
+ ######## Miscellaneous
+ 
+@@ -27936,7 +27981,13 @@
+ #	  ansi+sgrso, ansi+sgrul -TD
+ #	+ add ecma+standout, ecma+underline -TD
+ #	+ add rv code for alacritty -TD
+-#	+ add rv/xr codes for contour, ghostty, iterm2, kitty, konsole,
++#	+ add rv/xr codes for contour, foot, ghostty, iterm2, kitty, konsole,
+ #	  vscode, vte, wezterm -TD
+ #
++# 2025-05-10
++#	+ add rv/xr codes for domterm, mintty, mlterm -TD
++#	+ add xr code for putty -TD
++#	+ update teraterm to 5.0 -TD
++#	+ add rlogin-color -TD
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250503+/package/debian-mingw/changelog	2025-05-03 09:39:03.000000000 +0000
++++ ncurses-6.5-20250510/package/debian-mingw/changelog	2025-05-10 09:45:42.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250503) unstable; urgency=low
++ncurses6td (6.5+20250510) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 03 May 2025 05:39:03 -0400
++ -- Thomas E. Dickey   Sat, 10 May 2025 05:45:42 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250503+/package/debian-mingw64/changelog	2025-05-03 09:39:03.000000000 +0000
++++ ncurses-6.5-20250510/package/debian-mingw64/changelog	2025-05-10 09:45:42.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250503) unstable; urgency=low
++ncurses6td (6.5+20250510) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 03 May 2025 05:39:03 -0400
++ -- Thomas E. Dickey   Sat, 10 May 2025 05:45:42 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250503+/package/debian/changelog	2025-05-03 09:39:03.000000000 +0000
++++ ncurses-6.5-20250510/package/debian/changelog	2025-05-10 09:45:42.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250503) unstable; urgency=low
++ncurses6td (6.5+20250510) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 03 May 2025 05:39:03 -0400
++ -- Thomas E. Dickey   Sat, 10 May 2025 05:45:42 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.701 
+--- ncurses-6.5-20250503+/package/mingw-ncurses.nsi	2025-05-03 09:39:03.000000000 +0000
++++ ncurses-6.5-20250510/package/mingw-ncurses.nsi	2025-05-10 09:45:42.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.701 2025/05/03 09:39:03 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.702 2025/05/10 09:45:42 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0503"
++!define VERSION_MMDD  "0510"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250503+/package/mingw-ncurses.spec	2025-05-03 09:39:03.000000000 +0000
++++ ncurses-6.5-20250510/package/mingw-ncurses.spec	2025-05-10 09:45:42.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250503
++Release: 20250510
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20250503+/package/ncurses.spec	2025-05-03 09:39:03.000000000 +0000
++++ ncurses-6.5-20250510/package/ncurses.spec	2025-05-10 09:45:42.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250503
++Release: 20250510
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20250503+/package/ncursest.spec	2025-05-03 09:39:03.000000000 +0000
++++ ncurses-6.5-20250510/package/ncursest.spec	2025-05-10 09:45:42.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250503
++Release: 20250510
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250517.patch b/packages/ncurses/6.5/ncurses-6.5-20250517.patch
new file mode 100644
index 0000000000..ed91f87263
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250517.patch
@@ -0,0 +1,18436 @@
+# ncurses 6.5 - patch 20250517 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250517.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sat May 17 23:47:09 UTC 2025
+# ------------------------------------------------------------------------------
+# NEWS                             |    9 
+# VERSION                          |    2 
+# aclocal.m4                       |    6 
+# configure                        | 5170 ++++++++++++++++++-------------------
+# configure.in                     |   25 
+# dist.mk                          |    4 
+# include/curses.h.in              |   18 
+# include/curses.tail              |   50 
+# include/ncurses_defs             |    3 
+# misc/terminfo.src                |   50 
+# ncurses/curses.priv.h            |   10 
+# 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/ncurses.c                   |   62 
+# 19 files changed, 2780 insertions(+), 2651 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4281 
+--- ncurses-6.5-20250510+/NEWS	2025-05-10 23:07:14.000000000 +0000
++++ ncurses-6.5-20250517/NEWS	2025-05-17 18:56:42.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4281 2025/05/10 23:07:14 tom Exp $
++-- $Id: NEWS,v 1.4283 2025/05/17 18:56:42 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.
+ 
++20250517
++	+ initial changes for some ABI 7 features:
++	  + disable wgetch-events
++	  + add feature for extending mouse-buttons
++	  + add feature for extending direct-color support
++	+ use bracketed+paste in nsterm, rlogin-color, screen, terminology -TD
++
+ 20250510
+ 	+ add rv/xr codes for domterm, mintty, mlterm -TD
+ 	+ add xr code for putty -TD
+Index: VERSION
+--- ncurses-6.5-20250510+/VERSION	2025-05-10 09:45:42.000000000 +0000
++++ ncurses-6.5-20250517/VERSION	2025-05-17 10:17:12.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250510
++5:0:10	6.5	20250517
+Index: aclocal.m4
+Prereq:  1.1104 
+--- ncurses-6.5-20250510+/aclocal.m4	2025-02-23 01:49:45.000000000 +0000
++++ ncurses-6.5-20250517/aclocal.m4	2025-05-17 18:54:28.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1104 2025/02/23 01:49:45 tom Exp $
++dnl $Id: aclocal.m4,v 1.1105 2025/05/17 18:54:28 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -79,6 +79,7 @@
+ cf_dft_ext_colors=no
+ cf_dft_ext_const=no
+ cf_dft_ext_mouse=no
++cf_dft_ext_mouse2=no
+ cf_dft_ext_putwin=no
+ cf_dft_ext_spfuncs=no
+ cf_dft_filter_syms=no
+@@ -86,6 +87,7 @@
+ cf_dft_mmask_t=auto
+ cf_dft_opaque_curses=no
+ cf_dft_ordinate_type=short
++cf_dft_rgb_color=no
+ cf_dft_signed_char=no
+ cf_dft_tparm_arg=long
+ cf_dft_widec=no
+@@ -114,8 +116,10 @@
+ case x$cf_cv_abi_default in
+ (x[[789]])
+ 	cf_dft_ccharw_max=6
++	cf_dft_ext_mouse2=yes
+ 	cf_dft_mmask_t=uint64_t
+ 	cf_dft_ordinate_type=int
++	cf_dft_rgb_color=yes
+ 	cf_dft_signed_char=yes
+ 	# also: remove the wgetch-events feature in ABI 7
+ 	;;
+Index: configure
+--- ncurses-6.5-20250510+/configure	2025-03-01 15:05:41.000000000 +0000
++++ ncurses-6.5-20250517/configure	2025-05-17 20:39:08.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.794 .
++# From configure.in Revision: 1.797 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20250126.
+ #
+@@ -824,6 +824,7 @@
+   --enable-term-driver    enable terminal-driver
+   --enable-const          compile with extra/non-standard const
+   --enable-ext-colors     compile for 256-color support
++  --enable-rgb-color      compile for extended direct-color
+   --enable-ext-mouse      compile for extended mouse-encoding
+   --enable-ext-putwin     compile with extended putwin/screendump
+   --enable-no-padding     compile with $NCURSES_NO_PADDING code
+@@ -1078,7 +1079,7 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+   if test -r "$ac_site_file"; then
+-    { echo "$as_me:1081: loading site script $ac_site_file" >&5
++    { echo "$as_me:1082: loading site script $ac_site_file" >&5
+ echo "$as_me: loading site script $ac_site_file" >&6;}
+     cat "$ac_site_file" >&5
+     . "$ac_site_file"
+@@ -1089,7 +1090,7 @@
+   # Some versions of bash will fail to source /dev/null (special
+   # files actually), so we avoid doing that.
+   if test -f "$cache_file"; then
+-    { echo "$as_me:1092: loading cache $cache_file" >&5
++    { echo "$as_me:1093: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+       [\\/]* | ?:[\\/]* ) . $cache_file;;
+@@ -1097,7 +1098,7 @@
+     esac
+   fi
+ else
+-  { echo "$as_me:1100: creating cache $cache_file" >&5
++  { echo "$as_me:1101: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+@@ -1113,21 +1114,21 @@
+   eval ac_new_val="\$ac_env_${ac_var}_value"
+   case "$ac_old_set,$ac_new_set" in
+     set,)
+-      { echo "$as_me:1116: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++      { echo "$as_me:1117: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,set)
+-      { echo "$as_me:1120: error: \`$ac_var' was not set in the previous run" >&5
++      { echo "$as_me:1121: error: \`$ac_var' was not set in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,);;
+     *)
+       if test "x$ac_old_val" != "x$ac_new_val"; then
+-        { echo "$as_me:1126: error: \`$ac_var' has changed since the previous run:" >&5
++        { echo "$as_me:1127: error: \`$ac_var' has changed since the previous run:" >&5
+ echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+-        { echo "$as_me:1128:   former value:  $ac_old_val" >&5
++        { echo "$as_me:1129:   former value:  $ac_old_val" >&5
+ echo "$as_me:   former value:  $ac_old_val" >&2;}
+-        { echo "$as_me:1130:   current value: $ac_new_val" >&5
++        { echo "$as_me:1131:   current value: $ac_new_val" >&5
+ echo "$as_me:   current value: $ac_new_val" >&2;}
+         ac_cache_corrupted=:
+       fi;;
+@@ -1146,9 +1147,9 @@
+   fi
+ done
+ if "$ac_cache_corrupted"; then
+-  { echo "$as_me:1149: error: changes in the environment can compromise the build" >&5
++  { echo "$as_me:1150: error: changes in the environment can compromise the build" >&5
+ echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  { { echo "$as_me:1151: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++  { { echo "$as_me:1152: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1177,10 +1178,10 @@
+ echo "#! $SHELL" >conftest.sh
+ echo  "exit 0"   >>conftest.sh
+ chmod +x conftest.sh
+-if { (echo "$as_me:1180: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:1181: PATH=\".;.\"; conftest.sh") >&5
+   (PATH=".;."; conftest.sh) 2>&5
+   ac_status=$?
+-  echo "$as_me:1183: \$? = $ac_status" >&5
++  echo "$as_me:1184: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+   ac_path_separator=';'
+ else
+@@ -1197,7 +1198,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:1200: checking for $ac_word" >&5
++echo "$as_me:1201: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_GREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1212,7 +1213,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_GREP="$ac_prog"
+-echo "$as_me:1215: found $ac_dir/$ac_word" >&5
++echo "$as_me:1216: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1220,10 +1221,10 @@
+ fi
+ GREP=$ac_cv_prog_GREP
+ if test -n "$GREP"; then
+-  echo "$as_me:1223: result: $GREP" >&5
++  echo "$as_me:1224: result: $GREP" >&5
+ echo "${ECHO_T}$GREP" >&6
+ else
+-  echo "$as_me:1226: result: no" >&5
++  echo "$as_me:1227: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1231,7 +1232,7 @@
+ done
+ test -n "$GREP" || GREP=": "
+ 
+-echo "$as_me:1234: checking for egrep" >&5
++echo "$as_me:1235: checking for egrep" >&5
+ echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+ if test "${ac_cv_path_EGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1243,7 +1244,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:1246: checking for $ac_word" >&5
++echo "$as_me:1247: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_EGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1260,7 +1261,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_EGREP="$ac_dir/$ac_word"
+-   echo "$as_me:1263: found $ac_dir/$ac_word" >&5
++   echo "$as_me:1264: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -1271,10 +1272,10 @@
+ EGREP=$ac_cv_path_EGREP
+ 
+ if test -n "$EGREP"; then
+-  echo "$as_me:1274: result: $EGREP" >&5
++  echo "$as_me:1275: result: $EGREP" >&5
+ echo "${ECHO_T}$EGREP" >&6
+ else
+-  echo "$as_me:1277: result: no" >&5
++  echo "$as_me:1278: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1282,12 +1283,12 @@
+ done
+ test -n "$EGREP" || EGREP=": "
+ 
+-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:1285: error: cannot find workable egrep" >&5
++     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:1286: error: cannot find workable egrep" >&5
+ echo "$as_me: error: cannot find workable egrep" >&2;}
+    { (exit 1); exit 1; }; }
+    fi
+ fi
+-echo "$as_me:1290: result: $ac_cv_path_EGREP" >&5
++echo "$as_me:1291: result: $ac_cv_path_EGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_EGREP" >&6
+  EGREP="$ac_cv_path_EGREP"
+ 
+@@ -1298,11 +1299,11 @@
+ cf_cv_abi_default=${NCURSES_MAJOR}
+ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
+ cf_cv_timestamp=`date`
+-echo "$as_me:1301: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&5
++echo "$as_me:1302: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&5
+ echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&6
+ 
+ if test -f "$srcdir/VERSION" ; then
+-	echo "$as_me:1305: checking for package version" >&5
++	echo "$as_me:1306: checking for package version" >&5
+ echo $ECHO_N "checking for package version... $ECHO_C" >&6
+ 
+ 	# if there are not enough fields, cut returns the last one...
+@@ -1314,39 +1315,39 @@
+ 	VERSION="$cf_field1"
+ 
+ 	VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'`
+-	test -z "$VERSION_MAJOR" && { { echo "$as_me:1317: error: missing major-version" >&5
++	test -z "$VERSION_MAJOR" && { { echo "$as_me:1318: error: missing major-version" >&5
+ echo "$as_me: error: missing major-version" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ 	VERSION_MINOR=`echo "$cf_field2" | sed -e 's/^[^.]*\.//' -e 's/-.*//'`
+-	test -z "$VERSION_MINOR" && { { echo "$as_me:1322: error: missing minor-version" >&5
++	test -z "$VERSION_MINOR" && { { echo "$as_me:1323: error: missing minor-version" >&5
+ echo "$as_me: error: missing minor-version" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-	echo "$as_me:1326: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
++	echo "$as_me:1327: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
+ echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6
+ 
+-	echo "$as_me:1329: checking for package patch date" >&5
++	echo "$as_me:1330: checking for package patch date" >&5
+ echo $ECHO_N "checking for package patch date... $ECHO_C" >&6
+ 	VERSION_PATCH=`echo "$cf_field3" | sed -e 's/^[^-]*-//'`
+ 	case .$VERSION_PATCH in
+ 	(.)
+-		{ { echo "$as_me:1334: error: missing patch-date $VERSION_PATCH" >&5
++		{ { echo "$as_me:1335: error: missing patch-date $VERSION_PATCH" >&5
+ echo "$as_me: error: missing patch-date $VERSION_PATCH" >&2;}
+    { (exit 1); exit 1; }; }
+ 		;;
+ 	(.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9])
+ 		;;
+ 	(*)
+-		{ { echo "$as_me:1341: error: illegal patch-date $VERSION_PATCH" >&5
++		{ { echo "$as_me:1342: error: illegal patch-date $VERSION_PATCH" >&5
+ echo "$as_me: error: illegal patch-date $VERSION_PATCH" >&2;}
+    { (exit 1); exit 1; }; }
+ 		;;
+ 	esac
+-	echo "$as_me:1346: result: $VERSION_PATCH" >&5
++	echo "$as_me:1347: result: $VERSION_PATCH" >&5
+ echo "${ECHO_T}$VERSION_PATCH" >&6
+ else
+-	{ { echo "$as_me:1349: error: did not find $srcdir/VERSION" >&5
++	{ { echo "$as_me:1350: error: did not find $srcdir/VERSION" >&5
+ echo "$as_me: error: did not find $srcdir/VERSION" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1354,19 +1355,19 @@
+ # show the actual data that we have for versions:
+ test -n "$verbose" && echo "	ABI VERSION $VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:1357: testing ABI VERSION $VERSION ..." 1>&5
++echo "${as_me:-configure}:1358: testing ABI VERSION $VERSION ..." 1>&5
+ 
+ test -n "$verbose" && echo "	VERSION_MAJOR $VERSION_MAJOR" 1>&6
+ 
+-echo "${as_me:-configure}:1361: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
++echo "${as_me:-configure}:1362: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
+ 
+ test -n "$verbose" && echo "	VERSION_MINOR $VERSION_MINOR" 1>&6
+ 
+-echo "${as_me:-configure}:1365: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
++echo "${as_me:-configure}:1366: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
+ 
+ test -n "$verbose" && echo "	VERSION_PATCH $VERSION_PATCH" 1>&6
+ 
+-echo "${as_me:-configure}:1369: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
++echo "${as_me:-configure}:1370: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
+ 
+ 	PROGRAM=NCURSES
+ 	PACKAGE=ncurses
+@@ -1388,7 +1389,7 @@
+ # Check whether --with-rel-version or --without-rel-version was given.
+ if test "${with_rel_version+set}" = set; then
+   withval="$with_rel_version"
+-  { echo "$as_me:1391: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
++  { echo "$as_me:1392: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
+ echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;}
+  cf_cv_rel_version=$withval
+ fi;
+@@ -1402,13 +1403,13 @@
+   (0)
+  	;;
+   (*)
+-	{ { echo "$as_me:1405: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
++	{ { echo "$as_me:1406: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
+ echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;}
+    { (exit 1); exit 1; }; }
+  	;;
+   esac
+ else
+-  { { echo "$as_me:1411: error: Release major-version value is empty" >&5
++  { { echo "$as_me:1412: error: Release major-version value is empty" >&5
+ echo "$as_me: error: Release major-version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1418,13 +1419,13 @@
+   (0)
+  	;;
+   (*)
+-	{ { echo "$as_me:1421: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
++	{ { echo "$as_me:1422: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
+ echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;}
+    { (exit 1); exit 1; }; }
+  	;;
+   esac
+ else
+-  { { echo "$as_me:1427: error: Release minor-version value is empty" >&5
++  { { echo "$as_me:1428: error: Release minor-version value is empty" >&5
+ echo "$as_me: error: Release minor-version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1437,7 +1438,7 @@
+ 
+ 	if test "x$cf_cv_abi_version" != "x$withval"
+ 	then
+-		{ echo "$as_me:1440: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
++		{ echo "$as_me:1441: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
+ echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
+ 		case "$cf_cv_rel_version" in
+ 		(5.*)
+@@ -1456,13 +1457,13 @@
+   (0)
+  	;;
+   (*)
+-	{ { echo "$as_me:1459: error: ABI version is not a number: $cf_cv_abi_version" >&5
++	{ { echo "$as_me:1460: error: ABI version is not a number: $cf_cv_abi_version" >&5
+ echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;}
+    { (exit 1); exit 1; }; }
+  	;;
+   esac
+ else
+-  { { echo "$as_me:1465: error: ABI version value is empty" >&5
++  { { echo "$as_me:1466: error: ABI version value is empty" >&5
+ echo "$as_me: error: ABI version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1495,7 +1496,7 @@
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:1498: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++  { { echo "$as_me:1499: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+ echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1505,11 +1506,11 @@
+ 
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+-  { { echo "$as_me:1508: error: cannot run $ac_config_sub" >&5
++  { { echo "$as_me:1509: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:1512: checking build system type" >&5
++echo "$as_me:1513: checking build system type" >&5
+ echo $ECHO_N "checking build system type... $ECHO_C" >&6
+ if test "${ac_cv_build+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1518,23 +1519,23 @@
+ test -z "$ac_cv_build_alias" &&
+   ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+-  { { echo "$as_me:1521: error: cannot guess build type; you must specify one" >&5
++  { { echo "$as_me:1522: error: cannot guess build type; you must specify one" >&5
+ echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+    { (exit 1); exit 1; }; }
+ ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` ||
+-  { { echo "$as_me:1525: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++  { { echo "$as_me:1526: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1530: result: $ac_cv_build" >&5
++echo "$as_me:1531: result: $ac_cv_build" >&5
+ echo "${ECHO_T}$ac_cv_build" >&6
+ build=$ac_cv_build
+ build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+-echo "$as_me:1537: checking host system type" >&5
++echo "$as_me:1538: checking host system type" >&5
+ echo $ECHO_N "checking host system type... $ECHO_C" >&6
+ if test "${ac_cv_host+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1543,12 +1544,12 @@
+ test -z "$ac_cv_host_alias" &&
+   ac_cv_host_alias=$ac_cv_build_alias
+ ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` ||
+-  { { echo "$as_me:1546: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++  { { echo "$as_me:1547: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1551: result: $ac_cv_host" >&5
++echo "$as_me:1552: result: $ac_cv_host" >&5
+ echo "${ECHO_T}$ac_cv_host" >&6
+ host=$ac_cv_host
+ host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1556,7 +1557,7 @@
+ host_os=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+ if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
+-	echo "$as_me:1559: checking target system type" >&5
++	echo "$as_me:1560: checking target system type" >&5
+ echo $ECHO_N "checking target system type... $ECHO_C" >&6
+ if test "${ac_cv_target+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1565,12 +1566,12 @@
+ test "x$ac_cv_target_alias" = "x" &&
+   ac_cv_target_alias=$ac_cv_host_alias
+ ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` ||
+-  { { echo "$as_me:1568: error: $ac_config_sub $ac_cv_target_alias failed" >&5
++  { { echo "$as_me:1569: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1573: result: $ac_cv_target" >&5
++echo "$as_me:1574: result: $ac_cv_target" >&5
+ echo "${ECHO_T}$ac_cv_target" >&6
+ target=$ac_cv_target
+ target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1602,13 +1603,13 @@
+ fi
+ 
+ test -z "$system_name" && system_name="$cf_cv_system_name"
+-test -n "$cf_cv_system_name" && echo "$as_me:1605: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1606: result: Configuring for $cf_cv_system_name" >&5
+ echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
+ 
+ if test ".$system_name" != ".$cf_cv_system_name" ; then
+-	echo "$as_me:1609: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++	echo "$as_me:1610: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+ echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
+-	{ { echo "$as_me:1611: error: \"Please remove config.cache and try again.\"" >&5
++	{ { echo "$as_me:1612: error: \"Please remove config.cache and try again.\"" >&5
+ echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1616,7 +1617,7 @@
+ # Check whether --with-system-type or --without-system-type was given.
+ if test "${with_system_type+set}" = set; then
+   withval="$with_system_type"
+-  { echo "$as_me:1619: WARNING: overriding system type to $withval" >&5
++  { echo "$as_me:1620: WARNING: overriding system type to $withval" >&5
+ echo "$as_me: WARNING: overriding system type to $withval" >&2;}
+ 	cf_cv_system_name=$withval
+ 	host_os=$withval
+@@ -1627,7 +1628,7 @@
+ cf_user_CFLAGS="$CFLAGS"
+ 
+ ###	Default install-location
+-echo "$as_me:1630: checking for fgrep" >&5
++echo "$as_me:1631: checking for fgrep" >&5
+ echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
+ if test "${ac_cv_path_FGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1639,7 +1640,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:1642: checking for $ac_word" >&5
++echo "$as_me:1643: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_FGREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1656,7 +1657,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_FGREP="$ac_dir/$ac_word"
+-   echo "$as_me:1659: found $ac_dir/$ac_word" >&5
++   echo "$as_me:1660: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -1667,10 +1668,10 @@
+ FGREP=$ac_cv_path_FGREP
+ 
+ if test -n "$FGREP"; then
+-  echo "$as_me:1670: result: $FGREP" >&5
++  echo "$as_me:1671: result: $FGREP" >&5
+ echo "${ECHO_T}$FGREP" >&6
+ else
+-  echo "$as_me:1673: result: no" >&5
++  echo "$as_me:1674: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1678,16 +1679,16 @@
+ done
+ test -n "$FGREP" || FGREP=": "
+ 
+-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1681: error: cannot find workable fgrep" >&5
++     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1682: error: cannot find workable fgrep" >&5
+ echo "$as_me: error: cannot find workable fgrep" >&2;}
+    { (exit 1); exit 1; }; }
+    fi
+ fi
+-echo "$as_me:1686: result: $ac_cv_path_FGREP" >&5
++echo "$as_me:1687: result: $ac_cv_path_FGREP" >&5
+ echo "${ECHO_T}$ac_cv_path_FGREP" >&6
+  FGREP="$ac_cv_path_FGREP"
+ 
+-echo "$as_me:1690: checking for prefix" >&5
++echo "$as_me:1691: checking for prefix" >&5
+ echo $ECHO_N "checking for prefix... $ECHO_C" >&6
+ if test "x$prefix" = "xNONE" ; then
+ 	case "$cf_cv_system_name" in
+@@ -1699,11 +1700,11 @@
+ 		;;
+ 	esac
+ fi
+-echo "$as_me:1702: result: $prefix" >&5
++echo "$as_me:1703: result: $prefix" >&5
+ echo "${ECHO_T}$prefix" >&6
+ 
+ if test "x$prefix" = "xNONE" ; then
+-echo "$as_me:1706: checking for default include-directory" >&5
++echo "$as_me:1707: checking for default include-directory" >&5
+ echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
+ test -n "$verbose" && echo 1>&6
+ for cf_symbol in \
+@@ -1726,7 +1727,7 @@
+ 	fi
+ 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
+ done
+-echo "$as_me:1729: result: $includedir" >&5
++echo "$as_me:1730: result: $includedir" >&5
+ echo "${ECHO_T}$includedir" >&6
+ fi
+ 
+@@ -1738,6 +1739,7 @@
+ cf_dft_ext_colors=no
+ cf_dft_ext_const=no
+ cf_dft_ext_mouse=no
++cf_dft_ext_mouse2=no
+ cf_dft_ext_putwin=no
+ cf_dft_ext_spfuncs=no
+ cf_dft_filter_syms=no
+@@ -1745,6 +1747,7 @@
+ cf_dft_mmask_t=auto
+ cf_dft_opaque_curses=no
+ cf_dft_ordinate_type=short
++cf_dft_rgb_color=no
+ cf_dft_signed_char=no
+ cf_dft_tparm_arg=long
+ cf_dft_widec=no
+@@ -1773,8 +1776,10 @@
+ case x$cf_cv_abi_default in
+ (x[789])
+ 	cf_dft_ccharw_max=6
++	cf_dft_ext_mouse2=yes
+ 	cf_dft_mmask_t=uint64_t
+ 	cf_dft_ordinate_type=int
++	cf_dft_rgb_color=yes
+ 	cf_dft_signed_char=yes
+ 	# also: remove the wgetch-events feature in ABI 7
+ 	;;
+@@ -1791,20 +1796,20 @@
+   (0)
+  	;;
+   (*)
+-	{ { echo "$as_me:1794: error: ABI altered is not a number: $withval" >&5
++	{ { echo "$as_me:1799: error: ABI altered is not a number: $withval" >&5
+ echo "$as_me: error: ABI altered is not a number: $withval" >&2;}
+    { (exit 1); exit 1; }; }
+  	;;
+   esac
+ else
+-  { { echo "$as_me:1800: error: ABI altered value is empty" >&5
++  { { echo "$as_me:1805: error: ABI altered value is empty" >&5
+ echo "$as_me: error: ABI altered value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ 	if test "$cf_cv_abi_version" != "$withval"
+ 	then
+-		{ echo "$as_me:1807: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
++		{ echo "$as_me:1812: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5
+ echo "$as_me: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&2;}
+ 		cf_cv_abi_version=$withval
+ 	fi
+@@ -1834,7 +1839,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:1837: checking for $ac_word" >&5
++echo "$as_me:1842: 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
+@@ -1851,7 +1856,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:1854: found $ac_dir/$ac_word" >&5
++   echo "$as_me:1859: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -1863,10 +1868,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+ 
+ if test -n "$cf_TEMP_gnat"; then
+-  echo "$as_me:1866: result: $cf_TEMP_gnat" >&5
++  echo "$as_me:1871: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+-  echo "$as_me:1869: result: no" >&5
++  echo "$as_me:1874: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1876,7 +1881,7 @@
+ 		unset cf_cv_gnat_version
+ 		unset cf_TEMP_gnat
+ 
+-echo "$as_me:1879: checking for $cf_prog_gnat version" >&5
++echo "$as_me:1884: 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
+@@ -1887,7 +1892,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:1890: result: $cf_cv_gnat_version" >&5
++echo "$as_me:1895: 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
+@@ -1916,7 +1921,7 @@
+ 			cd conftest.src
+ 			for cf_gprconfig in Ada C
+ 			do
+-				echo "$as_me:1919: checking for gprconfig name for $cf_gprconfig" >&5
++				echo "$as_me:1924: 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
+@@ -1935,10 +1940,10 @@
+ 				if test -n "$cf_gprconfig_value"
+ 				then
+ 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+-					echo "$as_me:1938: result: $cf_gprconfig_value" >&5
++					echo "$as_me:1943: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ 				else
+-					echo "$as_me:1941: result: missing" >&5
++					echo "$as_me:1946: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ 					cf_ada_config="#"
+ 					break
+@@ -1951,7 +1956,7 @@
+ 	if test "x$cf_ada_config" != "x#"
+ 	then
+ 
+-echo "$as_me:1954: checking for gnat version" >&5
++echo "$as_me:1959: 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
+@@ -1962,7 +1967,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:1965: result: $cf_cv_gnat_version" >&5
++echo "$as_me:1970: 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
+ 
+@@ -1971,7 +1976,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ echo "$as_me:1974: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:1979: 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
+ 	;;
+@@ -1979,7 +1984,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:1982: checking for $ac_word" >&5
++echo "$as_me:1987: 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
+@@ -1994,7 +1999,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:1997: found $ac_dir/$ac_word" >&5
++echo "$as_me:2002: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2003,20 +2008,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:2006: result: $M4_exists" >&5
++  echo "$as_me:2011: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:2009: result: no" >&5
++  echo "$as_me:2014: 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:2015: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++			{ echo "$as_me:2020: 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:2019: checking if GNAT works" >&5
++			echo "$as_me:2024: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf ./conftest* ./*~conftest*
+@@ -2044,7 +2049,7 @@
+ fi
+ rm -rf ./conftest* ./*~conftest*
+ 
+-			echo "$as_me:2047: result: $cf_cv_prog_gnat_correct" >&5
++			echo "$as_me:2052: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 		fi
+ 	else
+@@ -2060,7 +2065,7 @@
+ 		# Here is a workaround.
+ 		# Extract the first word of "gnatgcc", so it can be a program name with args.
+ set dummy gnatgcc; ac_word=$2
+-echo "$as_me:2063: checking for $ac_word" >&5
++echo "$as_me:2068: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_cf_cv_path_gnatgcc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2077,7 +2082,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_cf_cv_path_gnatgcc="$ac_dir/$ac_word"
+-   echo "$as_me:2080: found $ac_dir/$ac_word" >&5
++   echo "$as_me:2085: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -2089,16 +2094,16 @@
+ cf_cv_path_gnatgcc=$ac_cv_path_cf_cv_path_gnatgcc
+ 
+ if test -n "$cf_cv_path_gnatgcc"; then
+-  echo "$as_me:2092: result: $cf_cv_path_gnatgcc" >&5
++  echo "$as_me:2097: result: $cf_cv_path_gnatgcc" >&5
+ echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
+ else
+-  echo "$as_me:2095: result: no" >&5
++  echo "$as_me:2100: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 		if test "$cf_cv_path_gnatgcc" != no
+ 		then
+-			echo "$as_me:2101: checking for improvement" >&5
++			echo "$as_me:2106: checking for improvement" >&5
+ echo $ECHO_N "checking for improvement... $ECHO_C" >&6
+ 			cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null`
+ 			case "x$cf_file_gnatgcc" in
+@@ -2109,7 +2114,7 @@
+ 				cf_cv_path_gnatgcc=no
+ 				;;
+ 			esac
+-			echo "$as_me:2112: result: $cf_cv_path_gnatgcc" >&5
++			echo "$as_me:2117: result: $cf_cv_path_gnatgcc" >&5
+ echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6
+ 			test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc
+ 			cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc"
+@@ -2134,7 +2139,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:2137: checking for $ac_word" >&5
++echo "$as_me:2142: 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
+@@ -2149,7 +2154,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:2152: found $ac_dir/$ac_word" >&5
++echo "$as_me:2157: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2157,10 +2162,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:2160: result: $CC" >&5
++  echo "$as_me:2165: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:2163: result: no" >&5
++  echo "$as_me:2168: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2173,7 +2178,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:2176: checking for $ac_word" >&5
++echo "$as_me:2181: 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
+@@ -2188,7 +2193,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:2191: found $ac_dir/$ac_word" >&5
++echo "$as_me:2196: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2196,10 +2201,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:2199: result: $ac_ct_CC" >&5
++  echo "$as_me:2204: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:2202: result: no" >&5
++  echo "$as_me:2207: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2209,32 +2214,32 @@
+   CC=$ac_ct_CC
+ fi
+ 
+-test -z "$CC" && { { echo "$as_me:2212: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:2217: 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:2217:" \
++echo "$as_me:2222:" \
+      "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo "$2"`
+-{ (eval echo "$as_me:2220: \"$ac_compiler --version &5\"") >&5
++{ (eval echo "$as_me:2225: \"$ac_compiler --version &5\"") >&5
+   (eval $ac_compiler --version &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2223: \$? = $ac_status" >&5
++  echo "$as_me:2228: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:2225: \"$ac_compiler -v &5\"") >&5
++{ (eval echo "$as_me:2230: \"$ac_compiler -v &5\"") >&5
+   (eval $ac_compiler -v &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2228: \$? = $ac_status" >&5
++  echo "$as_me:2233: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:2230: \"$ac_compiler -V &5\"") >&5
++{ (eval echo "$as_me:2235: \"$ac_compiler -V &5\"") >&5
+   (eval $ac_compiler -V &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2233: \$? = $ac_status" >&5
++  echo "$as_me:2238: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2237 "configure"
++#line 2242 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2250,13 +2255,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:2253: checking for C compiler default output" >&5
++echo "$as_me:2258: 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:2256: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:2261: \"$ac_link_default\"") >&5
+   (eval $ac_link_default) 2>&5
+   ac_status=$?
+-  echo "$as_me:2259: \$? = $ac_status" >&5
++  echo "$as_me:2264: \$? = $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
+@@ -2279,34 +2284,34 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:2282: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:2287: 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:2288: result: $ac_file" >&5
++echo "$as_me:2293: 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:2293: checking whether the C compiler works" >&5
++echo "$as_me:2298: 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:2299: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2304: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2302: \$? = $ac_status" >&5
++  echo "$as_me:2307: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+-	{ { echo "$as_me:2309: error: cannot run C compiled programs.
++	{ { echo "$as_me:2314: 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;}
+@@ -2314,24 +2319,24 @@
+     fi
+   fi
+ fi
+-echo "$as_me:2317: result: yes" >&5
++echo "$as_me:2322: 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:2324: checking whether we are cross compiling" >&5
++echo "$as_me:2329: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:2326: result: $cross_compiling" >&5
++echo "$as_me:2331: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+ 
+-echo "$as_me:2329: checking for executable suffix" >&5
++echo "$as_me:2334: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:2331: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2336: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2334: \$? = $ac_status" >&5
++  echo "$as_me:2339: \$? = $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
+@@ -2347,25 +2352,25 @@
+   esac
+ done
+ else
+-  { { echo "$as_me:2350: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:2355: 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:2356: result: $ac_cv_exeext" >&5
++echo "$as_me:2361: 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:2362: checking for object suffix" >&5
++echo "$as_me:2367: 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 2368 "configure"
++#line 2373 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2377,10 +2382,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:2380: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2385: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2383: \$? = $ac_status" >&5
++  echo "$as_me:2388: \$? = $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
+@@ -2392,24 +2397,24 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:2395: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:2400: 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:2402: result: $ac_cv_objext" >&5
++echo "$as_me:2407: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:2406: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:2411: 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 2412 "configure"
++#line 2417 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2424,16 +2429,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2427: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2432: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2430: \$? = $ac_status" >&5
++  echo "$as_me:2435: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2433: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2438: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2436: \$? = $ac_status" >&5
++  echo "$as_me:2441: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -2445,19 +2450,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:2448: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:2453: 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:2454: checking whether $CC accepts -g" >&5
++echo "$as_me:2459: 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 2460 "configure"
++#line 2465 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2469,16 +2474,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2472: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2477: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2475: \$? = $ac_status" >&5
++  echo "$as_me:2480: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2478: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2483: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2481: \$? = $ac_status" >&5
++  echo "$as_me:2486: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cc_g=yes
+ else
+@@ -2488,7 +2493,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:2491: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:2496: 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
+@@ -2515,16 +2520,16 @@
+ #endif
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2518: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2523: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2521: \$? = $ac_status" >&5
++  echo "$as_me:2526: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2524: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2529: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2527: \$? = $ac_status" >&5
++  echo "$as_me:2532: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   for ac_declaration in \
+    ''\
+@@ -2536,7 +2541,7 @@
+    'void exit (int);'
+ do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2539 "configure"
++#line 2544 "configure"
+ #include "confdefs.h"
+ #include 
+ $ac_declaration
+@@ -2549,16 +2554,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2552: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2557: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2555: \$? = $ac_status" >&5
++  echo "$as_me:2560: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2558: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2563: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2561: \$? = $ac_status" >&5
++  echo "$as_me:2566: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -2568,7 +2573,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2571 "configure"
++#line 2576 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -2580,16 +2585,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2583: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2588: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2586: \$? = $ac_status" >&5
++  echo "$as_me:2591: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2589: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2594: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2592: \$? = $ac_status" >&5
++  echo "$as_me:2597: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -2619,11 +2624,11 @@
+ 
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+-	echo "$as_me:2622: checking version of $CC" >&5
++	echo "$as_me:2627: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+-	echo "$as_me:2626: result: $GCC_VERSION" >&5
++	echo "$as_me:2631: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+ 
+@@ -2632,12 +2637,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:2635: checking if this is really Intel C compiler" >&5
++		echo "$as_me:2640: 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 2640 "configure"
++#line 2645 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2654,16 +2659,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2657: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2662: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2660: \$? = $ac_status" >&5
++  echo "$as_me:2665: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2663: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2668: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2666: \$? = $ac_status" >&5
++  echo "$as_me:2671: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -2674,7 +2679,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:2677: result: $INTEL_COMPILER" >&5
++		echo "$as_me:2682: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ 		;;
+ 	esac
+@@ -2683,11 +2688,11 @@
+ CLANG_COMPILER=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:2686: checking if this is really Clang C compiler" >&5
++	echo "$as_me:2691: 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 2690 "configure"
++#line 2695 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2704,16 +2709,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2707: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2712: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2710: \$? = $ac_status" >&5
++  echo "$as_me:2715: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2713: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2718: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2716: \$? = $ac_status" >&5
++  echo "$as_me:2721: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_COMPILER=yes
+ 
+@@ -2723,7 +2728,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:2726: result: $CLANG_COMPILER" >&5
++	echo "$as_me:2731: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+ 
+@@ -2732,30 +2737,30 @@
+ if test "x$CLANG_COMPILER" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:2735: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:2740: 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:2742: checking version of $CC" >&5
++	echo "$as_me:2747: 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:2746: result: $CLANG_VERSION" >&5
++	echo "$as_me:2751: 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:2753: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:2758: 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 2758 "configure"
++#line 2763 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -2769,16 +2774,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:2772: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2777: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2775: \$? = $ac_status" >&5
++  echo "$as_me:2780: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:2778: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2783: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2781: \$? = $ac_status" >&5
++  echo "$as_me:2786: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -2789,13 +2794,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:2792: result: $cf_clang_optok" >&5
++		echo "$as_me:2797: 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}:2798: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:2803: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -2804,7 +2809,7 @@
+ 	done
+ fi
+ 
+-echo "$as_me:2807: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:2812: 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
+@@ -2812,7 +2817,7 @@
+   ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2815 "configure"
++#line 2820 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -2859,16 +2864,16 @@
+ do
+   CC="$ac_save_CC $ac_arg"
+   rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2862: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2867: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2865: \$? = $ac_status" >&5
++  echo "$as_me:2870: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2868: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2873: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2871: \$? = $ac_status" >&5
++  echo "$as_me:2876: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -2885,10 +2890,10 @@
+ 
+ case "x$ac_cv_prog_cc_stdc" in
+   x|xno)
+-    echo "$as_me:2888: result: none needed" >&5
++    echo "$as_me:2893: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+   *)
+-    echo "$as_me:2891: result: $ac_cv_prog_cc_stdc" >&5
++    echo "$as_me:2896: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+     CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+@@ -2896,13 +2901,13 @@
+ # This should have been defined by AC_PROG_CC
+ : "${CC:=cc}"
+ 
+-echo "$as_me:2899: checking \$CFLAGS variable" >&5
++echo "$as_me:2904: checking \$CFLAGS variable" >&5
+ echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
+ case "x$CFLAGS" in
+ (*-[IUD]*)
+-	echo "$as_me:2903: result: broken" >&5
++	echo "$as_me:2908: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2905: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
++	{ echo "$as_me:2910: 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=
+@@ -3010,18 +3015,18 @@
+ 	done
+ 	;;
+ (*)
+-	echo "$as_me:3013: result: ok" >&5
++	echo "$as_me:3018: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+ 
+-echo "$as_me:3018: checking \$CC variable" >&5
++echo "$as_me:3023: checking \$CC variable" >&5
+ echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+ case "$CC" in
+ (*[\ \	]-*)
+-	echo "$as_me:3022: result: broken" >&5
++	echo "$as_me:3027: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:3024: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++	{ echo "$as_me:3029: 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/[ ]*[ ]-[^ ].*//'`
+@@ -3138,19 +3143,19 @@
+ 	done
+ 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
+ 
+-echo "${as_me:-configure}:3141: testing resulting CC: '$CC' ..." 1>&5
++echo "${as_me:-configure}:3146: testing resulting CC: '$CC' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:3145: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
++echo "${as_me:-configure}:3150: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:3149: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
++echo "${as_me:-configure}:3154: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+ 
+ 	;;
+ (*)
+-	echo "$as_me:3153: result: ok" >&5
++	echo "$as_me:3158: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+@@ -3164,7 +3169,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:3167: checking how to run the C preprocessor" >&5
++echo "$as_me:3172: 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
+@@ -3185,18 +3190,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 3188 "configure"
++#line 3193 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:3193: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3198: \"$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:3199: \$? = $ac_status" >&5
++  echo "$as_me:3204: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3219,17 +3224,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3222 "configure"
++#line 3227 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:3226: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3231: \"$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:3232: \$? = $ac_status" >&5
++  echo "$as_me:3237: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3266,7 +3271,7 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:3269: result: $CPP" >&5
++echo "$as_me:3274: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -3276,18 +3281,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 3279 "configure"
++#line 3284 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:3284: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3289: \"$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:3290: \$? = $ac_status" >&5
++  echo "$as_me:3295: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3310,17 +3315,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3313 "configure"
++#line 3318 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:3317: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:3322: \"$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:3323: \$? = $ac_status" >&5
++  echo "$as_me:3328: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -3348,7 +3353,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:3351: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:3356: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -3361,14 +3366,14 @@
+ ac_main_return="return"
+ 
+ if test $ac_cv_c_compiler_gnu = yes; then
+-    echo "$as_me:3364: checking whether $CC needs -traditional" >&5
++    echo "$as_me:3369: 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 3371 "configure"
++#line 3376 "configure"
+ #include "confdefs.h"
+ #include 
+ int Autoconf = TIOCGETP;
+@@ -3383,7 +3388,7 @@
+ 
+   if test $ac_cv_prog_gcc_traditional = no; then
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3386 "configure"
++#line 3391 "configure"
+ #include "confdefs.h"
+ #include 
+ int Autoconf = TCGETA;
+@@ -3396,14 +3401,14 @@
+ 
+   fi
+ fi
+-echo "$as_me:3399: result: $ac_cv_prog_gcc_traditional" >&5
++echo "$as_me:3404: 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:3406: checking whether $CC understands -c and -o together" >&5
++echo "$as_me:3411: 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
+@@ -3418,15 +3423,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:3421: \"$ac_try\"") >&5
++if { (eval echo "$as_me:3426: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3424: \$? = $ac_status" >&5
++  echo "$as_me:3429: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:3426: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:3431: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3429: \$? = $ac_status" >&5
++  echo "$as_me:3434: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CC_c_o=yes
+@@ -3437,10 +3442,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CC_c_o" = yes; then
+-  echo "$as_me:3440: result: yes" >&5
++  echo "$as_me:3445: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:3443: result: no" >&5
++  echo "$as_me:3448: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3454,7 +3459,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:3457: checking for $ac_word" >&5
++echo "$as_me:3462: 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
+@@ -3471,7 +3476,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:3474: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3479: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3482,10 +3487,10 @@
+ LDCONFIG=$ac_cv_path_LDCONFIG
+ 
+ if test -n "$LDCONFIG"; then
+-  echo "$as_me:3485: result: $LDCONFIG" >&5
++  echo "$as_me:3490: result: $LDCONFIG" >&5
+ echo "${ECHO_T}$LDCONFIG" >&6
+ else
+-  echo "$as_me:3488: result: no" >&5
++  echo "$as_me:3493: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3493,7 +3498,7 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:3496: checking if you want to ensure bool is consistent with C++" >&5
++echo "$as_me:3501: 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.
+@@ -3503,7 +3508,7 @@
+ else
+   cf_with_cxx=yes
+ fi;
+-echo "$as_me:3506: result: $cf_with_cxx" >&5
++echo "$as_me:3511: result: $cf_with_cxx" >&5
+ echo "${ECHO_T}$cf_with_cxx" >&6
+ if test "X$cf_with_cxx" = Xno ; then
+ 	CXX=""
+@@ -3521,7 +3526,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:3524: checking for $ac_word" >&5
++echo "$as_me:3529: 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
+@@ -3536,7 +3541,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:3539: found $ac_dir/$ac_word" >&5
++echo "$as_me:3544: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3544,10 +3549,10 @@
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+-  echo "$as_me:3547: result: $CXX" >&5
++  echo "$as_me:3552: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$as_me:3550: result: no" >&5
++  echo "$as_me:3555: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3560,7 +3565,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:3563: checking for $ac_word" >&5
++echo "$as_me:3568: 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
+@@ -3575,7 +3580,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:3578: found $ac_dir/$ac_word" >&5
++echo "$as_me:3583: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3583,10 +3588,10 @@
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+-  echo "$as_me:3586: result: $ac_ct_CXX" >&5
++  echo "$as_me:3591: result: $ac_ct_CXX" >&5
+ echo "${ECHO_T}$ac_ct_CXX" >&6
+ else
+-  echo "$as_me:3589: result: no" >&5
++  echo "$as_me:3594: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3598,32 +3603,32 @@
+ fi
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:3601:" \
++echo "$as_me:3606:" \
+      "checking for C++ compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:3604: \"$ac_compiler --version &5\"") >&5
++{ (eval echo "$as_me:3609: \"$ac_compiler --version &5\"") >&5
+   (eval $ac_compiler --version &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:3607: \$? = $ac_status" >&5
++  echo "$as_me:3612: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:3609: \"$ac_compiler -v &5\"") >&5
++{ (eval echo "$as_me:3614: \"$ac_compiler -v &5\"") >&5
+   (eval $ac_compiler -v &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:3612: \$? = $ac_status" >&5
++  echo "$as_me:3617: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:3614: \"$ac_compiler -V &5\"") >&5
++{ (eval echo "$as_me:3619: \"$ac_compiler -V &5\"") >&5
+   (eval $ac_compiler -V &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:3617: \$? = $ac_status" >&5
++  echo "$as_me:3622: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 
+-echo "$as_me:3620: checking whether we are using the GNU C++ compiler" >&5
++echo "$as_me:3625: 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 3626 "configure"
++#line 3631 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3638,16 +3643,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3641: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3646: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3644: \$? = $ac_status" >&5
++  echo "$as_me:3649: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3647: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3652: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3650: \$? = $ac_status" >&5
++  echo "$as_me:3655: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -3659,19 +3664,19 @@
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:3662: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "$as_me:3667: 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:3668: checking whether $CXX accepts -g" >&5
++echo "$as_me:3673: 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 3674 "configure"
++#line 3679 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3683,16 +3688,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3686: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3691: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3689: \$? = $ac_status" >&5
++  echo "$as_me:3694: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3692: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3697: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3695: \$? = $ac_status" >&5
++  echo "$as_me:3700: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cxx_g=yes
+ else
+@@ -3702,7 +3707,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3705: result: $ac_cv_prog_cxx_g" >&5
++echo "$as_me:3710: 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
+@@ -3729,7 +3734,7 @@
+    'void exit (int);'
+ do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3732 "configure"
++#line 3737 "configure"
+ #include "confdefs.h"
+ #include 
+ $ac_declaration
+@@ -3742,16 +3747,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3745: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3750: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3748: \$? = $ac_status" >&5
++  echo "$as_me:3753: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3751: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3756: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3754: \$? = $ac_status" >&5
++  echo "$as_me:3759: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -3761,7 +3766,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3764 "configure"
++#line 3769 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -3773,16 +3778,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3776: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3781: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3779: \$? = $ac_status" >&5
++  echo "$as_me:3784: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3782: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3787: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3785: \$? = $ac_status" >&5
++  echo "$as_me:3790: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -3816,7 +3821,7 @@
+ 	then
+ 		# Several of the C++ configurations do not work, particularly when
+ 		# cross-compiling (20140913 -TD)
+-		echo "$as_me:3819: checking if $CXX works" >&5
++		echo "$as_me:3824: checking if $CXX works" >&5
+ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
+ 
+ 		save_CPPFLAGS="$CPPFLAGS"
+@@ -3824,7 +3829,7 @@
+ 		CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3827 "configure"
++#line 3832 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -3841,16 +3846,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3844: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3849: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3847: \$? = $ac_status" >&5
++  echo "$as_me:3852: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3850: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3855: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3853: \$? = $ac_status" >&5
++  echo "$as_me:3858: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_works=yes
+ else
+@@ -3861,11 +3866,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CPPFLAGS="$save_CPPFLAGS"
+ 
+-		echo "$as_me:3864: result: $cf_cxx_works" >&5
++		echo "$as_me:3869: result: $cf_cxx_works" >&5
+ echo "${ECHO_T}$cf_cxx_works" >&6
+ 		if test "x$cf_cxx_works" = xno
+ 		then
+-			{ echo "$as_me:3868: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
++			{ echo "$as_me:3873: 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
+@@ -3881,7 +3886,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:3884: checking for $ac_word" >&5
++echo "$as_me:3889: 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
+@@ -3898,7 +3903,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:3901: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3906: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3909,17 +3914,17 @@
+ CXX=$ac_cv_path_CXX
+ 
+ if test -n "$CXX"; then
+-  echo "$as_me:3912: result: $CXX" >&5
++  echo "$as_me:3917: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$as_me:3915: result: no" >&5
++  echo "$as_me:3920: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 	fi
+ 	case "x$CXX" in
+ 	(x|xg++)
+-		{ echo "$as_me:3922: WARNING: You don't have any C++ compiler, too bad" >&5
++		{ echo "$as_me:3927: 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="";
+ 		;;
+@@ -3928,7 +3933,7 @@
+ 
+ GXX_VERSION=none
+ if test "$GXX" = yes; then
+-	echo "$as_me:3931: checking version of ${CXX:-g++}" >&5
++	echo "$as_me:3936: checking version of ${CXX:-g++}" >&5
+ echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
+ 	GXX_VERSION="`${CXX:-g++} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	if test -z "$GXX_VERSION"
+@@ -3936,7 +3941,7 @@
+ 		GXX_VERSION=unknown
+ 		GXX=no
+ 	fi
+-	echo "$as_me:3939: result: $GXX_VERSION" >&5
++	echo "$as_me:3944: result: $GXX_VERSION" >&5
+ echo "${ECHO_T}$GXX_VERSION" >&6
+ fi
+ 
+@@ -3944,12 +3949,12 @@
+ ([1-9][0-9].*)
+ 	;;
+ (1.*|2.[0-6]*)
+-	{ echo "$as_me:3947: WARNING: templates do not work" >&5
++	{ echo "$as_me:3952: WARNING: templates do not work" >&5
+ echo "$as_me: WARNING: templates do not work" >&2;}
+ 	;;
+ esac
+ 
+-echo "$as_me:3952: checking if you want to build C++ binding and demo" >&5
++echo "$as_me:3957: 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.
+@@ -3959,15 +3964,15 @@
+ else
+   cf_with_cxx_binding=$cf_with_cxx
+ fi;
+-echo "$as_me:3962: result: $cf_with_cxx_binding" >&5
++echo "$as_me:3967: result: $cf_with_cxx_binding" >&5
+ echo "${ECHO_T}$cf_with_cxx_binding" >&6
+ 
+-echo "$as_me:3965: checking if you want to build with Ada" >&5
++echo "$as_me:3970: 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:3967: result: $cf_with_ada" >&5
++echo "$as_me:3972: result: $cf_with_ada" >&5
+ echo "${ECHO_T}$cf_with_ada" >&6
+ 
+-echo "$as_me:3970: checking if you want to install terminal database" >&5
++echo "$as_me:3975: 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.
+@@ -3977,10 +3982,10 @@
+ else
+   cf_with_db_install=yes
+ fi;
+-echo "$as_me:3980: result: $cf_with_db_install" >&5
++echo "$as_me:3985: result: $cf_with_db_install" >&5
+ echo "${ECHO_T}$cf_with_db_install" >&6
+ 
+-echo "$as_me:3983: checking if you want to install manpages" >&5
++echo "$as_me:3988: 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.
+@@ -3990,10 +3995,10 @@
+ else
+   cf_with_manpages=yes
+ fi;
+-echo "$as_me:3993: result: $cf_with_manpages" >&5
++echo "$as_me:3998: result: $cf_with_manpages" >&5
+ echo "${ECHO_T}$cf_with_manpages" >&6
+ 
+-echo "$as_me:3996: checking if you want to build programs such as tic" >&5
++echo "$as_me:4001: 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.
+@@ -4003,10 +4008,10 @@
+ else
+   cf_with_progs=yes
+ fi;
+-echo "$as_me:4006: result: $cf_with_progs" >&5
++echo "$as_me:4011: result: $cf_with_progs" >&5
+ echo "${ECHO_T}$cf_with_progs" >&6
+ 
+-echo "$as_me:4009: checking if you want to build test-programs" >&5
++echo "$as_me:4014: 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.
+@@ -4016,10 +4021,10 @@
+ else
+   cf_with_tests=yes
+ fi;
+-echo "$as_me:4019: result: $cf_with_tests" >&5
++echo "$as_me:4024: result: $cf_with_tests" >&5
+ echo "${ECHO_T}$cf_with_tests" >&6
+ 
+-echo "$as_me:4022: checking if you wish to install curses.h" >&5
++echo "$as_me:4027: 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.
+@@ -4029,7 +4034,7 @@
+ else
+   with_curses_h=yes
+ fi;
+-echo "$as_me:4032: result: $with_curses_h" >&5
++echo "$as_me:4037: result: $with_curses_h" >&5
+ echo "${ECHO_T}$with_curses_h" >&6
+ 
+ modules_to_build="ncurses"
+@@ -4053,7 +4058,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:4056: 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_prog_AWK+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4068,7 +4073,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+-echo "$as_me:4071: found $ac_dir/$ac_word" >&5
++echo "$as_me:4076: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4076,17 +4081,17 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "$as_me:4079: result: $AWK" >&5
++  echo "$as_me:4084: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+-  echo "$as_me:4082: result: no" >&5
++  echo "$as_me:4087: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   test -n "$AWK" && break
+ done
+ 
+-test -z "$AWK" && { { echo "$as_me:4089: error: No awk program found" >&5
++test -z "$AWK" && { { echo "$as_me:4094: error: No awk program found" >&5
+ echo "$as_me: error: No awk program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -4113,7 +4118,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:4116: checking for a BSD compatible install" >&5
++echo "$as_me:4121: 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
+@@ -4162,7 +4167,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:4165: result: $INSTALL" >&5
++echo "$as_me:4170: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -4187,7 +4192,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:4190: checking for $ac_word" >&5
++echo "$as_me:4195: 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
+@@ -4202,7 +4207,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LINT="$ac_prog"
+-echo "$as_me:4205: found $ac_dir/$ac_word" >&5
++echo "$as_me:4210: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4210,10 +4215,10 @@
+ fi
+ LINT=$ac_cv_prog_LINT
+ if test -n "$LINT"; then
+-  echo "$as_me:4213: result: $LINT" >&5
++  echo "$as_me:4218: result: $LINT" >&5
+ echo "${ECHO_T}$LINT" >&6
+ else
+-  echo "$as_me:4216: result: no" >&5
++  echo "$as_me:4221: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4229,18 +4234,18 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:4232: checking whether ln -s works" >&5
++echo "$as_me:4237: 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:4236: result: yes" >&5
++  echo "$as_me:4241: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:4239: result: no, using $LN_S" >&5
++  echo "$as_me:4244: result: no, using $LN_S" >&5
+ echo "${ECHO_T}no, using $LN_S" >&6
+ fi
+ 
+-echo "$as_me:4243: checking if $LN_S -f options work" >&5
++echo "$as_me:4248: 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
+@@ -4252,12 +4257,12 @@
+ 	cf_prog_ln_sf=no
+ fi
+ rm -f conf$$.dst conf$$src
+-echo "$as_me:4255: result: $cf_prog_ln_sf" >&5
++echo "$as_me:4260: 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:4260: checking for long file names" >&5
++echo "$as_me:4265: 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
+@@ -4296,7 +4301,7 @@
+   rm -rf "$ac_xdir" 2>/dev/null
+ done
+ fi
+-echo "$as_me:4299: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:4304: 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
+ 
+@@ -4315,7 +4320,7 @@
+   withval="$with_config_suffix"
+   case "x$withval" in
+ 	(xyes|xno)
+-		{ echo "$as_me:4318: WARNING: expected a value for config-suffix option" >&5
++		{ echo "$as_me:4323: 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"
+@@ -4325,7 +4330,7 @@
+ 
+ # If we find pkg-config, check if we should install the ".pc" files.
+ 
+-echo "$as_me:4328: checking if you want to use pkg-config" >&5
++echo "$as_me:4333: 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.
+@@ -4335,7 +4340,7 @@
+ else
+   cf_pkg_config=yes
+ fi;
+-echo "$as_me:4338: result: $cf_pkg_config" >&5
++echo "$as_me:4343: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+ 
+ case "$cf_pkg_config" in
+@@ -4347,7 +4352,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:4350: checking for $ac_word" >&5
++echo "$as_me:4355: 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
+@@ -4364,7 +4369,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:4367: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4372: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -4375,10 +4380,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:4378: result: $PKG_CONFIG" >&5
++  echo "$as_me:4383: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+-  echo "$as_me:4381: result: no" >&5
++  echo "$as_me:4386: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4387,7 +4392,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:4390: checking for $ac_word" >&5
++echo "$as_me:4395: 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
+@@ -4404,7 +4409,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:4407: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4412: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -4416,10 +4421,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ 
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  echo "$as_me:4419: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:4424: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+-  echo "$as_me:4422: result: no" >&5
++  echo "$as_me:4427: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4460,24 +4465,24 @@
+ 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4463: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++	{ { echo "$as_me:4468: 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:4470: WARNING: pkg-config is not installed" >&5
++	{ echo "$as_me:4475: 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:4476: checking for pkg-config library directory" >&5
++	echo "$as_me:4481: checking for pkg-config library directory" >&5
+ echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
+ 	;;
+ (*)
+-	echo "$as_me:4480: checking for $PKG_CONFIG library directory" >&5
++	echo "$as_me:4485: checking for $PKG_CONFIG library directory" >&5
+ echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
+ 	;;
+ esac
+@@ -4504,7 +4509,7 @@
+ case "x$cf_search_path" in
+ (xlibdir)
+ 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+-	echo "$as_me:4507: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:4512: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+@@ -4515,16 +4520,16 @@
+ 	;;
+ (x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+ 	PKG_CONFIG_LIBDIR="$cf_search_path"
+-	echo "$as_me:4518: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:4523: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+ (xyes|xauto)
+-	echo "$as_me:4523: result: auto" >&5
++	echo "$as_me:4528: 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:4527: checking for search-list" >&5
++	echo "$as_me:4532: checking for search-list" >&5
+ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+ 	if test "x$PKG_CONFIG" != xnone
+ 	then
+@@ -4559,11 +4564,11 @@
+ "`
+ 	fi
+ 
+-	echo "$as_me:4562: result: $cf_search_path" >&5
++	echo "$as_me:4567: result: $cf_search_path" >&5
+ echo "${ECHO_T}$cf_search_path" >&6
+ 	;;
+ (*)
+-	{ { echo "$as_me:4566: error: Unexpected option value: $cf_search_path" >&5
++	{ { echo "$as_me:4571: error: Unexpected option value: $cf_search_path" >&5
+ echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -4571,7 +4576,7 @@
+ 
+ if test -n "$cf_search_path"
+ then
+-	echo "$as_me:4574: checking for first directory" >&5
++	echo "$as_me:4579: 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
+@@ -4582,7 +4587,7 @@
+ 			break
+ 		fi
+ 	done
+-	echo "$as_me:4585: result: $cf_pkg_config_path" >&5
++	echo "$as_me:4590: result: $cf_pkg_config_path" >&5
+ echo "${ECHO_T}$cf_pkg_config_path" >&6
+ 
+ 	if test "x$cf_pkg_config_path" != xnone ; then
+@@ -4592,7 +4597,7 @@
+ 
+ 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+ 	then
+-		echo "$as_me:4595: checking for workaround" >&5
++		echo "$as_me:4600: checking for workaround" >&5
+ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+ 		if test "$prefix" = "NONE" ; then
+ 			cf_prefix="$ac_default_prefix"
+@@ -4615,17 +4620,17 @@
+ 			esac
+ 		done
+ 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+-		echo "$as_me:4618: result: $PKG_CONFIG_LIBDIR" >&5
++		echo "$as_me:4623: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	fi
+ fi
+ 
+ if test "x$PKG_CONFIG" != xnone
+ then
+-	echo "$as_me:4625: checking if we should install .pc files for $PKG_CONFIG" >&5
++	echo "$as_me:4630: 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:4628: checking if we should install .pc files" >&5
++	echo "$as_me:4633: checking if we should install .pc files" >&5
+ echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
+ fi
+ 
+@@ -4636,7 +4641,7 @@
+ else
+   enable_pc_files=no
+ fi;
+-echo "$as_me:4639: result: $enable_pc_files" >&5
++echo "$as_me:4644: result: $enable_pc_files" >&5
+ echo "${ECHO_T}$enable_pc_files" >&6
+ 
+ if test "x$enable_pc_files" != xno
+@@ -4644,7 +4649,7 @@
+ 	MAKE_PC_FILES=
+ 	case "x$PKG_CONFIG_LIBDIR" in
+ 	(xno|xnone|xyes|x)
+-		{ echo "$as_me:4647: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
++		{ echo "$as_me:4652: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+ echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
+ 		;;
+ 	(*)
+@@ -4673,7 +4678,7 @@
+ 	cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4676: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
++	{ { echo "$as_me:4681: 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; }; }
+ 	;;
+@@ -4687,7 +4692,7 @@
+ 
+ if test -z "$MAKE_PC_FILES"
+ then
+-	echo "$as_me:4690: checking for suffix to add to pkg-config files" >&5
++	echo "$as_me:4695: checking for suffix to add to pkg-config files" >&5
+ echo $ECHO_N "checking for suffix to add to pkg-config files... $ECHO_C" >&6
+ 
+ # Check whether --with-pc-suffix or --without-pc-suffix was given.
+@@ -4702,13 +4707,13 @@
+ 	esac
+ fi;
+ 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
+-	echo "$as_me:4705: result: $PC_MODULE_SUFFIX" >&5
++	echo "$as_me:4710: result: $PC_MODULE_SUFFIX" >&5
+ echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
+ 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
+ 
+ fi
+ 
+-echo "$as_me:4711: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:4716: 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.
+@@ -4718,11 +4723,11 @@
+ else
+   enable_mixedcase=auto
+ fi;
+-echo "$as_me:4721: result: $enable_mixedcase" >&5
++echo "$as_me:4726: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+ 
+-echo "$as_me:4725: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:4730: 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
+@@ -4749,7 +4754,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:4752: result: $cf_cv_mixedcase" >&5
++echo "$as_me:4757: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -4768,7 +4773,7 @@
+ fi
+ 
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:4771: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:4776: 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
+@@ -4788,16 +4793,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:4791: result: yes" >&5
++  echo "$as_me:4796: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:4795: result: no" >&5
++  echo "$as_me:4800: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+-echo "$as_me:4800: checking for \".PHONY\" make-support" >&5
++echo "$as_me:4805: 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
+@@ -4852,7 +4857,7 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:4855: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:4860: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+@@ -4863,7 +4868,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:4866: checking for $ac_word" >&5
++echo "$as_me:4871: 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
+@@ -4878,7 +4883,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:4881: found $ac_dir/$ac_word" >&5
++echo "$as_me:4886: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4886,10 +4891,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:4889: result: $CTAGS" >&5
++  echo "$as_me:4894: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:4892: result: no" >&5
++  echo "$as_me:4897: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4900,7 +4905,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:4903: checking for $ac_word" >&5
++echo "$as_me:4908: 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
+@@ -4915,7 +4920,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:4918: found $ac_dir/$ac_word" >&5
++echo "$as_me:4923: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4923,10 +4928,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:4926: result: $ETAGS" >&5
++  echo "$as_me:4931: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:4929: result: no" >&5
++  echo "$as_me:4934: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4935,7 +4940,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:4938: 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_MAKE_LOWER_TAGS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4950,7 +4955,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:4953: found $ac_dir/$ac_word" >&5
++echo "$as_me:4958: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4959,17 +4964,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:4962: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:4967: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:4965: result: no" >&5
++  echo "$as_me:4970: 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:4972: checking for $ac_word" >&5
++echo "$as_me:4977: 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
+@@ -4984,7 +4989,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:4987: found $ac_dir/$ac_word" >&5
++echo "$as_me:4992: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4993,10 +4998,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:4996: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:5001: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:4999: result: no" >&5
++  echo "$as_me:5004: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5016,7 +5021,7 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:5019: checking for makeflags variable" >&5
++echo "$as_me:5024: 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
+@@ -5046,7 +5051,7 @@
+ 			;;
+ 		(*)
+ 
+-echo "${as_me:-configure}:5049: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:5054: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -5054,13 +5059,13 @@
+ 	rm -f cf_makeflags.tmp
+ 
+ fi
+-echo "$as_me:5057: result: $cf_cv_makeflags" >&5
++echo "$as_me:5062: 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:5063: 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_RANLIB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5075,7 +5080,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:5078: found $ac_dir/$ac_word" >&5
++echo "$as_me:5083: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5083,10 +5088,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:5086: result: $RANLIB" >&5
++  echo "$as_me:5091: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:5089: result: no" >&5
++  echo "$as_me:5094: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5095,7 +5100,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:5098: checking for $ac_word" >&5
++echo "$as_me:5103: 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
+@@ -5110,7 +5115,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:5113: found $ac_dir/$ac_word" >&5
++echo "$as_me:5118: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5119,10 +5124,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:5122: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:5127: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:5125: result: no" >&5
++  echo "$as_me:5130: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5134,7 +5139,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:5137: checking for $ac_word" >&5
++echo "$as_me:5142: 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
+@@ -5149,7 +5154,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:5152: found $ac_dir/$ac_word" >&5
++echo "$as_me:5157: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5157,10 +5162,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:5160: result: $LD" >&5
++  echo "$as_me:5165: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:5163: result: no" >&5
++  echo "$as_me:5168: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5169,7 +5174,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:5172: checking for $ac_word" >&5
++echo "$as_me:5177: 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
+@@ -5184,7 +5189,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:5187: found $ac_dir/$ac_word" >&5
++echo "$as_me:5192: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5193,10 +5198,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:5196: result: $ac_ct_LD" >&5
++  echo "$as_me:5201: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:5199: result: no" >&5
++  echo "$as_me:5204: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5208,7 +5213,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:5211: checking for $ac_word" >&5
++echo "$as_me:5216: 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
+@@ -5223,7 +5228,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:5226: found $ac_dir/$ac_word" >&5
++echo "$as_me:5231: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5231,10 +5236,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:5234: result: $AR" >&5
++  echo "$as_me:5239: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:5237: result: no" >&5
++  echo "$as_me:5242: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5243,7 +5248,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:5246: checking for $ac_word" >&5
++echo "$as_me:5251: 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
+@@ -5258,7 +5263,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:5261: found $ac_dir/$ac_word" >&5
++echo "$as_me:5266: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5267,10 +5272,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:5270: result: $ac_ct_AR" >&5
++  echo "$as_me:5275: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:5273: result: no" >&5
++  echo "$as_me:5278: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5282,7 +5287,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:5285: checking for $ac_word" >&5
++echo "$as_me:5290: 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
+@@ -5297,7 +5302,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:5300: found $ac_dir/$ac_word" >&5
++echo "$as_me:5305: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5305,10 +5310,10 @@
+ fi
+ NM=$ac_cv_prog_NM
+ if test -n "$NM"; then
+-  echo "$as_me:5308: result: $NM" >&5
++  echo "$as_me:5313: result: $NM" >&5
+ echo "${ECHO_T}$NM" >&6
+ else
+-  echo "$as_me:5311: result: no" >&5
++  echo "$as_me:5316: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5317,7 +5322,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:5320: checking for $ac_word" >&5
++echo "$as_me:5325: 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
+@@ -5332,7 +5337,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:5335: found $ac_dir/$ac_word" >&5
++echo "$as_me:5340: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5341,10 +5346,10 @@
+ fi
+ ac_ct_NM=$ac_cv_prog_ac_ct_NM
+ if test -n "$ac_ct_NM"; then
+-  echo "$as_me:5344: result: $ac_ct_NM" >&5
++  echo "$as_me:5349: result: $ac_ct_NM" >&5
+ echo "${ECHO_T}$ac_ct_NM" >&6
+ else
+-  echo "$as_me:5347: result: no" >&5
++  echo "$as_me:5352: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5356,7 +5361,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:5359: checking for $ac_word" >&5
++echo "$as_me:5364: 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
+@@ -5371,7 +5376,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:5374: found $ac_dir/$ac_word" >&5
++echo "$as_me:5379: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5379,10 +5384,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:5382: result: $AR" >&5
++  echo "$as_me:5387: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:5385: result: no" >&5
++  echo "$as_me:5390: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5391,7 +5396,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:5394: checking for $ac_word" >&5
++echo "$as_me:5399: 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
+@@ -5406,7 +5411,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:5409: found $ac_dir/$ac_word" >&5
++echo "$as_me:5414: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5415,10 +5420,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:5418: result: $ac_ct_AR" >&5
++  echo "$as_me:5423: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:5421: result: no" >&5
++  echo "$as_me:5426: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5427,7 +5432,7 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-echo "$as_me:5430: checking for options to update archives" >&5
++echo "$as_me:5435: 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
+@@ -5464,13 +5469,13 @@
+ 			rm -f conftest.a
+ 
+ 			cat >"conftest.$ac_ext" <&5
++			if { (eval echo "$as_me:5475: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5473: \$? = $ac_status" >&5
++  echo "$as_me:5478: \$? = $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
+@@ -5481,7 +5486,7 @@
+ 			else
+ 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-echo "${as_me:-configure}:5484: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:5489: testing cannot compile test-program ..." 1>&5
+ 
+ 				break
+ 			fi
+@@ -5491,7 +5496,7 @@
+ 	esac
+ 
+ fi
+-echo "$as_me:5494: result: $cf_cv_ar_flags" >&5
++echo "$as_me:5499: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+ if test -n "$ARFLAGS" ; then
+@@ -5502,7 +5507,7 @@
+ 	ARFLAGS=$cf_cv_ar_flags
+ fi
+ 
+-echo "$as_me:5505: checking for an installation directory prefix" >&5
++echo "$as_me:5510: checking for an installation directory prefix" >&5
+ echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-install-prefix or --without-install-prefix was given.
+@@ -5515,10 +5520,10 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:5518: result: ${DESTDIR:-(none)}" >&5
++echo "$as_me:5523: result: ${DESTDIR:-(none)}" >&5
+ echo "${ECHO_T}${DESTDIR:-(none)}" >&6
+ 
+-echo "$as_me:5521: checking if installation directory prefix should be merged" >&5
++echo "$as_me:5526: checking if installation directory prefix should be merged" >&5
+ echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6
+ 
+ # Check whether --enable-install-prefix or --disable-install-prefix was given.
+@@ -5535,7 +5540,7 @@
+ 	cf_install_prefix=no
+ 
+ fi;
+-echo "$as_me:5538: result: $cf_install_prefix" >&5
++echo "$as_me:5543: result: $cf_install_prefix" >&5
+ echo "${ECHO_T}$cf_install_prefix" >&6
+ 
+ if test "$cf_install_prefix" = yes ; then
+@@ -5576,7 +5581,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:5579: checking for $ac_word" >&5
++echo "$as_me:5584: 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
+@@ -5591,7 +5596,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:5594: found $ac_dir/$ac_word" >&5
++echo "$as_me:5599: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5599,10 +5604,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:5602: result: $BUILD_CC" >&5
++  echo "$as_me:5607: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:5605: result: no" >&5
++  echo "$as_me:5610: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5611,12 +5616,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+ 
+ fi;
+-	echo "$as_me:5614: checking for native build C compiler" >&5
++	echo "$as_me:5619: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:5616: result: $BUILD_CC" >&5
++	echo "$as_me:5621: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:5619: checking for native build C preprocessor" >&5
++	echo "$as_me:5624: 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.
+@@ -5626,10 +5631,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:5629: result: $BUILD_CPP" >&5
++	echo "$as_me:5634: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:5632: checking for native build C flags" >&5
++	echo "$as_me:5637: 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.
+@@ -5637,10 +5642,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:5640: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:5645: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:5643: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:5648: 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.
+@@ -5648,10 +5653,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:5651: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:5656: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:5654: checking for native build linker-flags" >&5
++	echo "$as_me:5659: 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.
+@@ -5659,10 +5664,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:5662: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:5667: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:5665: checking for native build linker-libraries" >&5
++	echo "$as_me:5670: 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.
+@@ -5670,7 +5675,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:5673: result: $BUILD_LIBS" >&5
++	echo "$as_me:5678: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -5679,7 +5684,7 @@
+ 
+ 	: ${BUILD_CC:='${CC}'}
+ 
+-	echo "$as_me:5682: checking if the build-compiler \"$BUILD_CC\" works" >&5
++	echo "$as_me:5687: checking if the build-compiler \"$BUILD_CC\" works" >&5
+ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
+ 
+ 	cf_save_crossed=$cross_compiling
+@@ -5693,7 +5698,7 @@
+   cf_ok_build_cc=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5696 "configure"
++#line 5701 "configure"
+ #include "confdefs.h"
+ #include 
+ 		int main(int argc, char *argv[])
+@@ -5703,15 +5708,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:5706: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5711: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5709: \$? = $ac_status" >&5
++  echo "$as_me:5714: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:5711: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5716: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5714: \$? = $ac_status" >&5
++  echo "$as_me:5719: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_ok_build_cc=yes
+ else
+@@ -5726,12 +5731,12 @@
+ 	cross_compiling=$cf_save_crossed
+ 	ac_link=$cf_save_ac_link
+ 
+-	echo "$as_me:5729: result: $cf_ok_build_cc" >&5
++	echo "$as_me:5734: result: $cf_ok_build_cc" >&5
+ echo "${ECHO_T}$cf_ok_build_cc" >&6
+ 
+ 	if test "$cf_ok_build_cc" != yes
+ 	then
+-		{ { echo "$as_me:5734: error: Cross-build requires two compilers.
++		{ { echo "$as_me:5739: 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;}
+@@ -5756,7 +5761,7 @@
+ ### shared, for example.
+ cf_list_models=""
+ 
+-echo "$as_me:5759: checking if libtool -version-number should be used" >&5
++echo "$as_me:5764: 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.
+@@ -5773,7 +5778,7 @@
+ 	cf_libtool_version=yes
+ 
+ fi;
+-echo "$as_me:5776: result: $cf_libtool_version" >&5
++echo "$as_me:5781: result: $cf_libtool_version" >&5
+ echo "${ECHO_T}$cf_libtool_version" >&6
+ 
+ if test "$cf_libtool_version" = yes ; then
+@@ -5782,25 +5787,25 @@
+ 	LIBTOOL_VERSION="-version-info"
+ 	case "x$VERSION" in
+ 	(x)
+-		{ echo "$as_me:5785: WARNING: VERSION was not set" >&5
++		{ echo "$as_me:5790: 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}:5792: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5797: 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}:5799: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5804: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:5803: WARNING: unexpected VERSION value: $VERSION" >&5
++		{ echo "$as_me:5808: WARNING: unexpected VERSION value: $VERSION" >&5
+ echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
+ 		;;
+ 	esac
+@@ -5822,7 +5827,7 @@
+ LIB_INSTALL=
+ LIB_UNINSTALL=
+ 
+-echo "$as_me:5825: checking if you want to build libraries with libtool" >&5
++echo "$as_me:5830: 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.
+@@ -5832,7 +5837,7 @@
+ else
+   with_libtool=no
+ fi;
+-echo "$as_me:5835: result: $with_libtool" >&5
++echo "$as_me:5840: result: $with_libtool" >&5
+ echo "${ECHO_T}$with_libtool" >&6
+ if test "$with_libtool" != "no"; then
+ 
+@@ -5861,7 +5866,7 @@
+ 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:5864: error: expected a pathname, not \"$with_libtool\"" >&5
++	{ { echo "$as_me:5869: error: expected a pathname, not \"$with_libtool\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -5874,7 +5879,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:5877: checking for $ac_word" >&5
++echo "$as_me:5882: 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
+@@ -5889,7 +5894,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:5892: found $ac_dir/$ac_word" >&5
++echo "$as_me:5897: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5897,10 +5902,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5900: result: $LIBTOOL" >&5
++  echo "$as_me:5905: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5903: result: no" >&5
++  echo "$as_me:5908: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5913,7 +5918,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:5916: checking for $ac_word" >&5
++echo "$as_me:5921: 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
+@@ -5928,7 +5933,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:5931: found $ac_dir/$ac_word" >&5
++echo "$as_me:5936: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5936,10 +5941,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:5939: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:5944: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:5942: result: no" >&5
++  echo "$as_me:5947: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5970,7 +5975,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:5973: checking for $ac_word" >&5
++echo "$as_me:5978: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LIBTOOL+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5985,7 +5990,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:5988: found $ac_dir/$ac_word" >&5
++echo "$as_me:5993: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5993,10 +5998,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5996: result: $LIBTOOL" >&5
++  echo "$as_me:6001: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5999: result: no" >&5
++  echo "$as_me:6004: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6009,7 +6014,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:6012: checking for $ac_word" >&5
++echo "$as_me:6017: 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
+@@ -6024,7 +6029,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:6027: found $ac_dir/$ac_word" >&5
++echo "$as_me:6032: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -6032,10 +6037,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:6035: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:6040: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:6038: result: no" >&5
++  echo "$as_me:6043: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6057,7 +6062,7 @@
+ 		fi
+ 	fi
+ 	if test -z "$LIBTOOL" ; then
+-		{ { echo "$as_me:6060: error: Cannot find libtool" >&5
++		{ { echo "$as_me:6065: error: Cannot find libtool" >&5
+ echo "$as_me: error: Cannot find libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -6073,7 +6078,7 @@
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+ then
+-	echo "$as_me:6076: checking version of $LIBTOOL" >&5
++	echo "$as_me:6081: checking version of $LIBTOOL" >&5
+ echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+@@ -6084,7 +6089,7 @@
+ fi
+ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+ 
+-	echo "$as_me:6087: result: $cf_cv_libtool_version" >&5
++	echo "$as_me:6092: result: $cf_cv_libtool_version" >&5
+ echo "${ECHO_T}$cf_cv_libtool_version" >&6
+ 
+ 	if test -n "$cf_cv_libtool_version"
+@@ -6094,19 +6099,19 @@
+ 		(*...GNU-libtool...*)
+ 			;;
+ 		(*)
+-			{ { echo "$as_me:6097: error: This is not GNU libtool" >&5
++			{ { echo "$as_me:6102: 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:6103: error: No version found for $LIBTOOL" >&5
++		{ { echo "$as_me:6108: 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:6109: error: GNU libtool has not been found" >&5
++	{ { echo "$as_me:6114: error: GNU libtool has not been found" >&5
+ echo "$as_me: error: GNU libtool has not been found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6142,7 +6147,7 @@
+ 
+ else
+ 
+-echo "$as_me:6145: checking if you want to build shared libraries" >&5
++echo "$as_me:6150: 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.
+@@ -6152,11 +6157,11 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:6155: result: $with_shared" >&5
++echo "$as_me:6160: 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:6159: checking if you want to build static libraries" >&5
++echo "$as_me:6164: 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.
+@@ -6166,11 +6171,11 @@
+ else
+   with_normal=yes
+ fi;
+-echo "$as_me:6169: result: $with_normal" >&5
++echo "$as_me:6174: 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:6173: checking if you want to build debug libraries" >&5
++echo "$as_me:6178: 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.
+@@ -6180,11 +6185,11 @@
+ else
+   with_debug=yes
+ fi;
+-echo "$as_me:6183: result: $with_debug" >&5
++echo "$as_me:6188: 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:6187: checking if you want to build profiling libraries" >&5
++echo "$as_me:6192: 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.
+@@ -6194,7 +6199,7 @@
+ else
+   with_profile=no
+ fi;
+-echo "$as_me:6197: result: $with_profile" >&5
++echo "$as_me:6202: result: $with_profile" >&5
+ echo "${ECHO_T}$with_profile" >&6
+ test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
+ 
+@@ -6202,7 +6207,7 @@
+ 
+ if test "X$cf_with_cxx_binding" != Xno; then
+ if test "x$with_shared" = "xyes"; then
+-echo "$as_me:6205: checking if you want to build C++ shared libraries" >&5
++echo "$as_me:6210: 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.
+@@ -6212,26 +6217,26 @@
+ else
+   with_shared_cxx=no
+ fi;
+-echo "$as_me:6215: result: $with_shared_cxx" >&5
++echo "$as_me:6220: result: $with_shared_cxx" >&5
+ echo "${ECHO_T}$with_shared_cxx" >&6
+ fi
+ fi
+ 
+ ###############################################################################
+ 
+-echo "$as_me:6222: checking for specified models" >&5
++echo "$as_me:6227: 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:6226: result: $cf_list_models" >&5
++echo "$as_me:6231: 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:6231: checking for default model" >&5
++echo "$as_me:6236: 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:6234: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:6239: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+ 
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+@@ -6245,7 +6250,7 @@
+ LIB_DIR=../lib
+ LIB_2ND=../../lib
+ 
+-echo "$as_me:6248: checking if you want to have a library-prefix" >&5
++echo "$as_me:6253: 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.
+@@ -6255,7 +6260,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:6258: result: $with_lib_prefix" >&5
++echo "$as_me:6263: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test "$with_lib_prefix" = auto
+@@ -6286,24 +6291,24 @@
+ 
+ LIB_SUFFIX=
+ 
+-	echo "$as_me:6289: checking for PATH separator" >&5
++	echo "$as_me:6294: 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:6296: result: $PATH_SEPARATOR" >&5
++	echo "$as_me:6301: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+ 
+ # headers needed for checks...
+-echo "$as_me:6300: checking for ANSI C header files" >&5
++echo "$as_me:6305: 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 6306 "configure"
++#line 6311 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -6311,13 +6316,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:6314: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:6319: \"$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:6320: \$? = $ac_status" >&5
++  echo "$as_me:6325: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6339,7 +6344,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 6342 "configure"
++#line 6347 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6357,7 +6362,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 6360 "configure"
++#line 6365 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6378,7 +6383,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6381 "configure"
++#line 6386 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -6404,15 +6409,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6407: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6412: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6410: \$? = $ac_status" >&5
++  echo "$as_me:6415: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:6412: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6417: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6415: \$? = $ac_status" >&5
++  echo "$as_me:6420: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6425,7 +6430,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:6428: result: $ac_cv_header_stdc" >&5
++echo "$as_me:6433: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -6441,28 +6446,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6444: checking for $ac_header" >&5
++echo "$as_me:6449: 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 6450 "configure"
++#line 6455 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6456: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6461: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6459: \$? = $ac_status" >&5
++  echo "$as_me:6464: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6462: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6467: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6465: \$? = $ac_status" >&5
++  echo "$as_me:6470: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -6472,7 +6477,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6475: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6480: 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:6490: checking whether exit is declared" >&5
+ echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
+ if test "${ac_cv_have_decl_exit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6491 "configure"
++#line 6496 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -6503,16 +6508,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6506: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6511: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6509: \$? = $ac_status" >&5
++  echo "$as_me:6514: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6512: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6517: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6515: \$? = $ac_status" >&5
++  echo "$as_me:6520: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_have_decl_exit=yes
+ else
+@@ -6522,19 +6527,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6525: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:6530: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+ 
+ 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:6531: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:6536: 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 6537 "configure"
++#line 6542 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -6549,16 +6554,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6552: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6557: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6555: \$? = $ac_status" >&5
++  echo "$as_me:6560: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6558: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6563: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6561: \$? = $ac_status" >&5
++  echo "$as_me:6566: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -6568,7 +6573,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6571: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6576: 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:6589: 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
+@@ -6589,7 +6594,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6592 "configure"
++#line 6597 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6608,16 +6613,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6611: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6616: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6614: \$? = $ac_status" >&5
++  echo "$as_me:6619: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6617: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6622: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6620: \$? = $ac_status" >&5
++  echo "$as_me:6625: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -6628,14 +6633,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6631: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:6636: 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:6638: checking for opendir in -lx" >&5
++  echo "$as_me:6643: 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
+@@ -6643,7 +6648,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6646 "configure"
++#line 6651 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6662,16 +6667,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6665: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6670: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6668: \$? = $ac_status" >&5
++  echo "$as_me:6673: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6671: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6676: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6674: \$? = $ac_status" >&5
++  echo "$as_me:6679: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -6682,7 +6687,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6685: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:6690: 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"
+@@ -6692,7 +6697,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:6695: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:6700: 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.
+@@ -6702,10 +6707,10 @@
+ else
+   with_termlib=no
+ fi;
+-echo "$as_me:6705: result: $with_termlib" >&5
++echo "$as_me:6710: result: $with_termlib" >&5
+ echo "${ECHO_T}$with_termlib" >&6
+ 
+-echo "$as_me:6708: checking if you want to build a separate tic library" >&5
++echo "$as_me:6713: 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.
+@@ -6715,7 +6720,7 @@
+ else
+   with_ticlib=no
+ fi;
+-echo "$as_me:6718: result: $with_ticlib" >&5
++echo "$as_me:6723: result: $with_ticlib" >&5
+ echo "${ECHO_T}$with_ticlib" >&6
+ 
+ if test X"$CC_G_OPT" = X"" ; then
+@@ -6728,7 +6733,7 @@
+ 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
+ fi
+ 
+-echo "$as_me:6731: checking for default loader flags" >&5
++echo "$as_me:6736: 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=''   ;;
+@@ -6737,13 +6742,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:6740: result: ${LD_MODEL:-(none)}" >&5
++echo "$as_me:6745: result: ${LD_MODEL:-(none)}" >&5
+ echo "${ECHO_T}${LD_MODEL:-(none)}" >&6
+ 
+ case "$DFT_LWR_MODEL" in
+ (shared)
+ 
+-echo "$as_me:6746: checking if rpath option should be used" >&5
++echo "$as_me:6751: 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.
+@@ -6753,10 +6758,10 @@
+ else
+   cf_cv_enable_rpath=no
+ fi;
+-echo "$as_me:6756: result: $cf_cv_enable_rpath" >&5
++echo "$as_me:6761: result: $cf_cv_enable_rpath" >&5
+ echo "${ECHO_T}$cf_cv_enable_rpath" >&6
+ 
+-echo "$as_me:6759: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:6764: 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.
+@@ -6766,7 +6771,7 @@
+ else
+   cf_cv_do_relink=yes
+ fi;
+-echo "$as_me:6769: result: $cf_cv_do_relink" >&5
++echo "$as_me:6774: result: $cf_cv_do_relink" >&5
+ echo "${ECHO_T}$cf_cv_do_relink" >&6
+ 	;;
+ esac
+@@ -6777,7 +6782,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:6780: checking for an rpath option" >&5
++	echo "$as_me:6785: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -6808,12 +6813,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:6811: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:6816: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:6816: checking if we need a space after rpath option" >&5
++		echo "$as_me:6821: 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"
+ 
+@@ -6834,7 +6839,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6837 "configure"
++#line 6842 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -6846,16 +6851,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6849: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6854: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6852: \$? = $ac_status" >&5
++  echo "$as_me:6857: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6855: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6860: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6858: \$? = $ac_status" >&5
++  echo "$as_me:6863: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -6865,7 +6870,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:6868: result: $cf_rpath_space" >&5
++		echo "$as_me:6873: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -6887,7 +6892,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:6890: checking whether to use release or ABI version in shared library file names" >&5
++	echo "$as_me:6895: checking whether to use release or ABI version in shared library file names" >&5
+ echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
+ 
+ # Check whether --with-shlib-version or --without-shlib-version was given.
+@@ -6902,9 +6907,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:6905: result: $withval" >&5
++		echo "$as_me:6910: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:6907: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:6912: 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; }; }
+ 		;;
+@@ -6913,7 +6918,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:6916: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:6921: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -6936,14 +6941,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:6939: checking which $CC option to use" >&5
++		echo "$as_me:6944: 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 6946 "configure"
++#line 6951 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6955,16 +6960,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6958: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6963: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6961: \$? = $ac_status" >&5
++  echo "$as_me:6966: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6964: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6969: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6967: \$? = $ac_status" >&5
++  echo "$as_me:6972: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -6973,7 +6978,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		done
+-		echo "$as_me:6976: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:6981: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -7044,7 +7049,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:7047: checking if ld -search_paths_first works" >&5
++		echo "$as_me:7052: 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
+@@ -7053,7 +7058,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7056 "configure"
++#line 7061 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -7065,16 +7070,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7068: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7073: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7071: \$? = $ac_status" >&5
++  echo "$as_me:7076: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7074: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7079: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7077: \$? = $ac_status" >&5
++  echo "$as_me:7082: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -7085,7 +7090,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:7088: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:7093: 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"
+@@ -7435,7 +7440,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7438 "configure"
++#line 7443 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7447,16 +7452,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7450: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7455: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7453: \$? = $ac_status" >&5
++  echo "$as_me:7458: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7456: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7461: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7459: \$? = $ac_status" >&5
++  echo "$as_me:7464: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -7493,7 +7498,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:7496: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:7501: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -7503,7 +7508,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <
+ int main(int argc, char *argv[])
+ {
+@@ -7515,18 +7520,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:7518: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:7523: 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:7520: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:7525: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7523: \$? = $ac_status" >&5
++  echo "$as_me:7528: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-				echo "$as_me:7525: result: yes" >&5
++				echo "$as_me:7530: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:7529: result: no" >&5
++				echo "$as_me:7534: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -7541,17 +7546,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:7544: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:7549: 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}:7548: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7553: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ for model in $cf_list_models ; do
+ 	case "$model" in
+ 	(libtool)
+ 
+-echo "$as_me:7554: checking for additional libtool options" >&5
++echo "$as_me:7559: 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.
+@@ -7561,7 +7566,7 @@
+ else
+   with_libtool_opts=no
+ fi;
+-echo "$as_me:7564: result: $with_libtool_opts" >&5
++echo "$as_me:7569: result: $with_libtool_opts" >&5
+ echo "${ECHO_T}$with_libtool_opts" >&6
+ 
+ case .$with_libtool_opts in
+@@ -7572,7 +7577,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:7575: checking if exported-symbols file should be used" >&5
++echo "$as_me:7580: 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.
+@@ -7587,7 +7592,7 @@
+ 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
+ 
+ fi
+-echo "$as_me:7590: result: $with_export_syms" >&5
++echo "$as_me:7595: result: $with_export_syms" >&5
+ echo "${ECHO_T}$with_export_syms" >&6
+ if test "x$with_export_syms" != xno
+ then
+@@ -7598,15 +7603,15 @@
+ 		;;
+ 	(shared)
+ 		if test "$CC_SHARED_OPTS" = "unknown"; then
+-			{ { echo "$as_me:7601: error: Shared libraries are not supported in this version" >&5
++			{ { echo "$as_me:7606: 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:7606: checking if current CFLAGS link properly" >&5
++		echo "$as_me:7611: 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 7609 "configure"
++#line 7614 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7618,16 +7623,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7621: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7626: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7624: \$? = $ac_status" >&5
++  echo "$as_me:7629: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7627: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7632: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7630: \$? = $ac_status" >&5
++  echo "$as_me:7635: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cflags_work=yes
+ else
+@@ -7636,13 +7641,13 @@
+ cf_cflags_work=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:7639: result: $cf_cflags_work" >&5
++		echo "$as_me:7644: 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}:7645: testing try to work around by appending shared-options ..." 1>&5
++echo "${as_me:-configure}:7650: testing try to work around by appending shared-options ..." 1>&5
+ 
+ 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
+ 		fi
+@@ -7650,7 +7655,7 @@
+ if test "$with_libtool" = "yes" ; then
+ 	:
+ elif test "$with_shared" = "yes" ; then
+-echo "$as_me:7653: checking if versioned-symbols file should be used" >&5
++echo "$as_me:7658: 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.
+@@ -7668,18 +7673,18 @@
+ (xno)
+ 	;;
+ (x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+-	test -f "$with_versioned_syms" || { { echo "$as_me:7671: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:7676: 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:7676: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:7681: 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:7682: result: $with_versioned_syms" >&5
++echo "$as_me:7687: result: $with_versioned_syms" >&5
+ echo "${ECHO_T}$with_versioned_syms" >&6
+ 
+ RESULTING_SYMS=
+@@ -7695,7 +7700,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}:7698: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7703: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		LIB_CREATE="$MK_SHARED_LIB"
+ 		;;
+@@ -7704,12 +7709,12 @@
+ 		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}:7707: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7712: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		LIB_CREATE="$MK_SHARED_LIB"
+ 		;;
+ 	(*)
+-		{ echo "$as_me:7712: WARNING: this system does not support versioned-symbols" >&5
++		{ echo "$as_me:7717: WARNING: this system does not support versioned-symbols" >&5
+ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
+ 		;;
+ 	esac
+@@ -7721,7 +7726,7 @@
+ 	# symbols.
+ 	if test "x$VERSIONED_SYMS" != "x"
+ 	then
+-		echo "$as_me:7724: checking if wildcards can be used to selectively omit symbols" >&5
++		echo "$as_me:7729: 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
+ 
+@@ -7758,7 +7763,7 @@
+ } submodule_1.0;
+ EOF
+ 		cat >conftest.$ac_ext <&5
++		echo "$as_me:7797: result: $WILDCARD_SYMS" >&5
+ echo "${ECHO_T}$WILDCARD_SYMS" >&6
+ 		rm -f conftest.*
+ 	fi
+@@ -7804,7 +7809,7 @@
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+ 
+-echo "$as_me:7807: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:7812: 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.
+@@ -7814,27 +7819,27 @@
+ else
+   with_gpm=maybe
+ fi;
+-echo "$as_me:7817: result: $with_gpm" >&5
++echo "$as_me:7822: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7821: checking for gpm.h" >&5
++	echo "$as_me:7826: 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 7827 "configure"
++#line 7832 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:7831: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7836: \"$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:7837: \$? = $ac_status" >&5
++  echo "$as_me:7842: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7853,7 +7858,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7856: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:7861: 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
+ 
+@@ -7864,7 +7869,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}:7867: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:7872: testing assuming we really have GPM library ..." 1>&5
+ 
+ cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+@@ -7872,7 +7877,7 @@
+ 
+ 			with_gpm=yes
+ 		else
+-			echo "$as_me:7875: checking for Gpm_Open in -lgpm" >&5
++			echo "$as_me:7880: 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
+@@ -7880,7 +7885,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7883 "configure"
++#line 7888 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7899,16 +7904,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7902: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7907: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7905: \$? = $ac_status" >&5
++  echo "$as_me:7910: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7908: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7913: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7911: \$? = $ac_status" >&5
++  echo "$as_me:7916: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -7919,18 +7924,18 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7922: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:7927: 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:7929: WARNING: Cannot link with GPM library" >&5
++					{ echo "$as_me:7934: WARNING: Cannot link with GPM library" >&5
+ echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
+ 					with_gpm=no
+ 				else
+-					{ { echo "$as_me:7933: error: Cannot link with GPM library" >&5
++					{ { echo "$as_me:7938: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+    { (exit 1); exit 1; }; }
+ 				fi
+@@ -7941,7 +7946,7 @@
+ 
+ else
+ 
+-		test "$with_gpm" != maybe && { echo "$as_me:7944: WARNING: Cannot find GPM header" >&5
++		test "$with_gpm" != maybe && { echo "$as_me:7949: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ 		with_gpm=no
+ 
+@@ -7950,7 +7955,7 @@
+ fi
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7953: checking if you want to load GPM dynamically" >&5
++	echo "$as_me:7958: 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.
+@@ -7960,18 +7965,18 @@
+ else
+   with_dlsym=yes
+ fi;
+-	echo "$as_me:7963: result: $with_dlsym" >&5
++	echo "$as_me:7968: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ 	if test "x$with_dlsym" = xyes ; then
+ 
+ cf_have_dlsym=no
+-echo "$as_me:7968: checking for dlsym" >&5
++echo "$as_me:7973: 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 7974 "configure"
++#line 7979 "configure"
+ #include "confdefs.h"
+ #define dlsym autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -8002,16 +8007,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8005: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8010: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8008: \$? = $ac_status" >&5
++  echo "$as_me:8013: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8011: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8016: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8014: \$? = $ac_status" >&5
++  echo "$as_me:8019: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_dlsym=yes
+ else
+@@ -8021,14 +8026,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8024: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:8029: 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:8031: checking for dlsym in -ldl" >&5
++echo "$as_me:8036: 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
+@@ -8036,7 +8041,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8039 "configure"
++#line 8044 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8055,16 +8060,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8058: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8063: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8061: \$? = $ac_status" >&5
++  echo "$as_me:8066: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8064: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8069: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8067: \$? = $ac_status" >&5
++  echo "$as_me:8072: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dl_dlsym=yes
+ else
+@@ -8075,7 +8080,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8078: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:8083: 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
+ 
+@@ -8104,10 +8109,10 @@
+ LIBS="$cf_add_libs"
+  }
+ 
+-	echo "$as_me:8107: checking whether able to link to dl*() functions" >&5
++	echo "$as_me:8112: 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 8110 "configure"
++#line 8115 "configure"
+ #include "confdefs.h"
+ 
+ 	#include 
+@@ -8128,16 +8133,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8131: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8136: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8134: \$? = $ac_status" >&5
++  echo "$as_me:8139: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8137: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8142: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8140: \$? = $ac_status" >&5
++  echo "$as_me:8145: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ cat >>confdefs.h <<\EOF
+@@ -8148,15 +8153,15 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-		{ { echo "$as_me:8151: error: Cannot link test program for libdl" >&5
++		{ { echo "$as_me:8156: 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:8156: result: ok" >&5
++	echo "$as_me:8161: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+-	{ { echo "$as_me:8159: error: Cannot find dlsym function" >&5
++	{ { echo "$as_me:8164: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8164,12 +8169,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}:8167: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:8172: testing assuming soname for gpm is $with_gpm ..." 1>&5
+ 
+ 			cf_cv_gpm_soname="$with_gpm"
+ 		else
+ 
+-echo "$as_me:8172: checking for soname of gpm library" >&5
++echo "$as_me:8177: 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
+@@ -8203,15 +8208,15 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-	if { (eval echo "$as_me:8206: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:8211: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8209: \$? = $ac_status" >&5
++  echo "$as_me:8214: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:8211: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:8216: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8214: \$? = $ac_status" >&5
++  echo "$as_me:8219: \$? = $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
+@@ -8222,7 +8227,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:8225: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:8230: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+ 
+ 		fi
+@@ -8290,7 +8295,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+ 
+-echo "$as_me:8293: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:8298: 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
+@@ -8298,7 +8303,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8301 "configure"
++#line 8306 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8317,16 +8322,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8320: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8325: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8323: \$? = $ac_status" >&5
++  echo "$as_me:8328: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8326: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8331: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8329: \$? = $ac_status" >&5
++  echo "$as_me:8334: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -8337,11 +8342,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8340: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:8345: 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:8344: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:8349: 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
+@@ -8365,15 +8370,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:8368: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:8373: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8371: \$? = $ac_status" >&5
++  echo "$as_me:8376: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:8373: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:8378: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8376: \$? = $ac_status" >&5
++  echo "$as_me:8381: \$? = $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
+@@ -8385,11 +8390,11 @@
+ fi
+ 
+ fi
+-echo "$as_me:8388: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:8393: 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:8392: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++	{ echo "$as_me:8397: 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
+ 
+@@ -8397,7 +8402,7 @@
+ 
+ fi
+ 
+-echo "$as_me:8400: checking if you want to use PCRE2 for regular-expressions" >&5
++echo "$as_me:8405: 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.
+@@ -8406,7 +8411,7 @@
+ 
+ fi;
+ test -z "$with_pcre2" && with_pcre2=no
+-echo "$as_me:8409: result: $with_pcre2" >&5
++echo "$as_me:8414: result: $with_pcre2" >&5
+ echo "${ECHO_T}$with_pcre2" >&6
+ 
+ if test "x$with_pcre2" != xno ; then
+@@ -8417,17 +8422,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}:8420: testing found package $cf_with_pcre2 ..." 1>&5
++echo "${as_me:-configure}:8425: 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}:8426: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:8431: 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}:8430: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:8435: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ for cf_required in $cf_with_pcre2
+ do
+@@ -8565,7 +8570,7 @@
+ fi
+ 
+ 	done
+-	cf_with_pcre2_ok=yes || { { echo "$as_me:8568: error: Cannot find PCRE2 library" >&5
++	cf_with_pcre2_ok=yes || { { echo "$as_me:8573: error: Cannot find PCRE2 library" >&5
+ echo "$as_me: error: Cannot find PCRE2 library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -8578,7 +8583,7 @@
+ 	(*pcre2-posix*|*pcreposix*)
+ 		;;
+ 	(*)
+-		echo "$as_me:8581: checking for regcomp in -lpcre2-posix" >&5
++		echo "$as_me:8586: 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
+@@ -8586,7 +8591,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcre2-posix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8589 "configure"
++#line 8594 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8605,16 +8610,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8608: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8613: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8611: \$? = $ac_status" >&5
++  echo "$as_me:8616: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8614: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8619: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8617: \$? = $ac_status" >&5
++  echo "$as_me:8622: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcre2_posix_regcomp=yes
+ else
+@@ -8625,7 +8630,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8628: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
++echo "$as_me:8633: 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
+ 
+@@ -8646,7 +8651,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  echo "$as_me:8649: checking for regcomp in -lpcreposix" >&5
++  echo "$as_me:8654: 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
+@@ -8654,7 +8659,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcreposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8657 "configure"
++#line 8662 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8673,16 +8678,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8676: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8681: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8679: \$? = $ac_status" >&5
++  echo "$as_me:8684: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8682: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8687: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8685: \$? = $ac_status" >&5
++  echo "$as_me:8690: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcreposix_regcomp=yes
+ else
+@@ -8693,7 +8698,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8696: result: $ac_cv_lib_pcreposix_regcomp" >&5
++echo "$as_me:8701: 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
+ 
+@@ -8714,7 +8719,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  { { echo "$as_me:8717: error: Cannot find PCRE2 POSIX library" >&5
++  { { echo "$as_me:8722: error: Cannot find PCRE2 POSIX library" >&5
+ echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8729,23 +8734,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:8732: checking for $ac_header" >&5
++echo "$as_me:8737: 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 8738 "configure"
++#line 8743 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8742: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8747: \"$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:8748: \$? = $ac_status" >&5
++  echo "$as_me:8753: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8764,7 +8769,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8767: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8772: 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:8785: 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 8786 "configure"
++#line 8791 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -8814,16 +8819,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8817: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8822: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8820: \$? = $ac_status" >&5
++  echo "$as_me:8825: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8823: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8828: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8826: \$? = $ac_status" >&5
++  echo "$as_me:8831: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -8833,7 +8838,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8836: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:8841: 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:8850: checking if you want to use sysmouse" >&5
++echo "$as_me:8855: 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.
+@@ -8859,7 +8864,7 @@
+ fi;
+ 	if test "$cf_with_sysmouse" != no ; then
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8862 "configure"
++#line 8867 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8882,16 +8887,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8885: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8890: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8888: \$? = $ac_status" >&5
++  echo "$as_me:8893: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8891: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8896: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8894: \$? = $ac_status" >&5
++  echo "$as_me:8899: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_with_sysmouse=yes
+ else
+@@ -8901,7 +8906,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	fi
+-echo "$as_me:8904: result: $cf_with_sysmouse" >&5
++echo "$as_me:8909: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -8911,7 +8916,7 @@
+ fi
+ 
+ # pretend that ncurses==ncursesw==ncursest
+-echo "$as_me:8914: checking if you want to disable library suffixes" >&5
++echo "$as_me:8919: 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.
+@@ -8928,13 +8933,13 @@
+ 	disable_lib_suffixes=no
+ 
+ fi;
+-echo "$as_me:8931: result: $disable_lib_suffixes" >&5
++echo "$as_me:8936: 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:8937: checking if rpath-hack should be disabled" >&5
++echo "$as_me:8942: 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.
+@@ -8952,22 +8957,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:8955: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:8960: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:8960: checking for updated LDFLAGS" >&5
++echo "$as_me:8965: 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:8963: result: maybe" >&5
++	echo "$as_me:8968: 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:8970: checking for $ac_word" >&5
++echo "$as_me:8975: 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
+@@ -8982,7 +8987,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:8985: found $ac_dir/$ac_word" >&5
++echo "$as_me:8990: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8990,10 +8995,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:8993: result: $cf_ldd_prog" >&5
++  echo "$as_me:8998: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:8996: result: no" >&5
++  echo "$as_me:9001: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9007,7 +9012,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9010 "configure"
++#line 9015 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9019,16 +9024,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9022: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9027: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9025: \$? = $ac_status" >&5
++  echo "$as_me:9030: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9028: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9033: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9031: \$? = $ac_status" >&5
++  echo "$as_me:9036: \$? = $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`
+@@ -9056,7 +9061,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:9059: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:9064: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -9068,11 +9073,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9071: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9076: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9075: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9080: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -9109,7 +9114,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:9112: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9117: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -9122,11 +9127,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9125: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9130: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:9129: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9134: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -9163,7 +9168,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:9166: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9171: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -9176,14 +9181,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:9179: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9184: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9183: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9188: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:9186: result: no" >&5
++	echo "$as_me:9191: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9197,7 +9202,7 @@
+ EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
+ if test -n "$EXTRA_PKG_LDFLAGS"
+ then
+-	echo "$as_me:9200: checking if you want to disable extra LDFLAGS for package-scripts" >&5
++	echo "$as_me:9205: 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.
+@@ -9214,7 +9219,7 @@
+ 	disable_pkg_ldflags=no
+ 
+ fi;
+-	echo "$as_me:9217: result: $disable_pkg_ldflags" >&5
++	echo "$as_me:9222: result: $disable_pkg_ldflags" >&5
+ echo "${ECHO_T}$disable_pkg_ldflags" >&6
+ 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
+ fi
+@@ -9222,7 +9227,7 @@
+ ###############################################################################
+ 
+ ###	use option --with-extra-suffix to append suffix to headers and libraries
+-echo "$as_me:9225: checking for extra suffix to append to header/library paths" >&5
++echo "$as_me:9230: checking for extra suffix to append to header/library paths" >&5
+ echo $ECHO_N "checking for extra suffix to append to header/library paths... $ECHO_C" >&6
+ EXTRA_SUFFIX=
+ 
+@@ -9241,11 +9246,11 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:9244: result: ${EXTRA_SUFFIX:-(none)}" >&5
++echo "$as_me:9249: result: ${EXTRA_SUFFIX:-(none)}" >&5
+ echo "${ECHO_T}${EXTRA_SUFFIX:-(none)}" >&6
+ 
+ ###	use option --disable-overwrite to leave out the link to -lcurses
+-echo "$as_me:9248: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:9253: 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.
+@@ -9255,10 +9260,10 @@
+ else
+   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:9258: result: $with_overwrite" >&5
++echo "$as_me:9263: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+ 
+-echo "$as_me:9261: checking if external terminfo-database is used" >&5
++echo "$as_me:9266: 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.
+@@ -9268,7 +9273,7 @@
+ else
+   use_database=yes
+ fi;
+-echo "$as_me:9271: result: $use_database" >&5
++echo "$as_me:9276: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+ 
+ case "$host_os" in
+@@ -9284,7 +9289,7 @@
+ if test "$use_database" != no ; then
+ 	NCURSES_USE_DATABASE=1
+ 
+-	echo "$as_me:9287: checking which terminfo source-file will be installed" >&5
++	echo "$as_me:9292: 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.
+@@ -9292,10 +9297,10 @@
+   withval="$with_database"
+   TERMINFO_SRC=$withval
+ fi;
+-	echo "$as_me:9295: result: $TERMINFO_SRC" >&5
++	echo "$as_me:9300: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+ 
+-	echo "$as_me:9298: checking whether to use hashed database instead of directory/tree" >&5
++	echo "$as_me:9303: 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.
+@@ -9305,13 +9310,13 @@
+ else
+   with_hashed_db=no
+ fi;
+-	echo "$as_me:9308: result: $with_hashed_db" >&5
++	echo "$as_me:9313: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ 	with_hashed_db=no
+ fi
+ 
+-echo "$as_me:9314: checking for list of fallback terminal descriptions" >&5
++echo "$as_me:9319: checking for list of fallback terminal descriptions" >&5
+ echo $ECHO_N "checking for list of fallback terminal descriptions... $ECHO_C" >&6
+ 
+ # Check whether --with-fallbacks or --without-fallbacks was given.
+@@ -9321,7 +9326,7 @@
+ else
+   with_fallback=
+ fi;
+-echo "$as_me:9324: result: ${with_fallback:-(none)}" >&5
++echo "$as_me:9329: result: ${with_fallback:-(none)}" >&5
+ echo "${ECHO_T}${with_fallback:-(none)}" >&6
+ 
+ case ".$with_fallback" in
+@@ -9329,7 +9334,7 @@
+ 	FALLBACK_LIST=
+ 	;;
+ (.yes)
+-	{ echo "$as_me:9332: WARNING: expected a list of terminal descriptions" >&5
++	{ echo "$as_me:9337: WARNING: expected a list of terminal descriptions" >&5
+ echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
+ 	;;
+ (*)
+@@ -9345,7 +9350,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:9348: checking for $ac_word" >&5
++echo "$as_me:9353: 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
+@@ -9360,7 +9365,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:9363: found $ac_dir/$ac_word" >&5
++echo "$as_me:9368: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9368,10 +9373,10 @@
+ fi
+ TIC=$ac_cv_prog_TIC
+ if test -n "$TIC"; then
+-  echo "$as_me:9371: result: $TIC" >&5
++  echo "$as_me:9376: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:9374: result: no" >&5
++  echo "$as_me:9379: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9380,7 +9385,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:9383: checking for $ac_word" >&5
++echo "$as_me:9388: 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
+@@ -9395,7 +9400,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:9398: found $ac_dir/$ac_word" >&5
++echo "$as_me:9403: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9403,10 +9408,10 @@
+ fi
+ ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
+ if test -n "$ac_ct_TIC"; then
+-  echo "$as_me:9406: result: $ac_ct_TIC" >&5
++  echo "$as_me:9411: result: $ac_ct_TIC" >&5
+ echo "${ECHO_T}$ac_ct_TIC" >&6
+ else
+-  echo "$as_me:9409: result: no" >&5
++  echo "$as_me:9414: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9418,7 +9423,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:9421: checking for $ac_word" >&5
++echo "$as_me:9426: 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
+@@ -9433,7 +9438,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:9436: found $ac_dir/$ac_word" >&5
++echo "$as_me:9441: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9441,10 +9446,10 @@
+ fi
+ INFOCMP=$ac_cv_prog_INFOCMP
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:9444: result: $INFOCMP" >&5
++  echo "$as_me:9449: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:9447: result: no" >&5
++  echo "$as_me:9452: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9453,7 +9458,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:9456: checking for $ac_word" >&5
++echo "$as_me:9461: 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
+@@ -9468,7 +9473,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:9471: found $ac_dir/$ac_word" >&5
++echo "$as_me:9476: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9476,10 +9481,10 @@
+ fi
+ ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
+ if test -n "$ac_ct_INFOCMP"; then
+-  echo "$as_me:9479: result: $ac_ct_INFOCMP" >&5
++  echo "$as_me:9484: result: $ac_ct_INFOCMP" >&5
+ echo "${ECHO_T}$ac_ct_INFOCMP" >&6
+ else
+-  echo "$as_me:9482: result: no" >&5
++  echo "$as_me:9487: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9494,10 +9499,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:9497: checking for tic program for fallbacks" >&5
++  echo "$as_me:9502: checking for tic program for fallbacks" >&5
+ echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
+ 		TIC=$withval
+-		echo "$as_me:9500: result: $TIC" >&5
++		echo "$as_me:9505: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -9523,7 +9528,7 @@
+ 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9526: error: expected a pathname, not \"$TIC\"" >&5
++	{ { echo "$as_me:9531: error: expected a pathname, not \"$TIC\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9536,7 +9541,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:9539: checking for $ac_word" >&5
++echo "$as_me:9544: 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
+@@ -9553,7 +9558,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:9556: found $ac_dir/$ac_word" >&5
++   echo "$as_me:9561: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -9564,10 +9569,10 @@
+ TIC=$ac_cv_path_TIC
+ 
+ if test -n "$TIC"; then
+-  echo "$as_me:9567: result: $TIC" >&5
++  echo "$as_me:9572: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:9570: result: no" >&5
++  echo "$as_me:9575: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9624,7 +9629,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:9627: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9632: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:9647: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -9648,10 +9653,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:9651: checking for infocmp program for fallbacks" >&5
++  echo "$as_me:9656: checking for infocmp program for fallbacks" >&5
+ echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
+ 		INFOCMP=$withval
+-		echo "$as_me:9654: result: $INFOCMP" >&5
++		echo "$as_me:9659: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -9677,7 +9682,7 @@
+ 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9680: error: expected a pathname, not \"$INFOCMP\"" >&5
++	{ { echo "$as_me:9685: error: expected a pathname, not \"$INFOCMP\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9690,7 +9695,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:9693: checking for $ac_word" >&5
++echo "$as_me:9698: 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
+@@ -9707,7 +9712,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:9710: found $ac_dir/$ac_word" >&5
++   echo "$as_me:9715: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -9718,10 +9723,10 @@
+ INFOCMP=$ac_cv_path_INFOCMP
+ 
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:9721: result: $INFOCMP" >&5
++  echo "$as_me:9726: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:9724: result: no" >&5
++  echo "$as_me:9729: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9778,7 +9783,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:9781: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9786: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:9801: WARNING: no infocmp program found for fallbacks" >&5
+ echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -9803,7 +9808,7 @@
+ 	test -z "$INFOCMP" && FALLBACK_LIST=
+ 	if test -z "$FALLBACK_LIST"
+ 	then
+-		{ echo "$as_me:9806: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
++		{ echo "$as_me:9811: 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
+@@ -9811,7 +9816,7 @@
+ USE_FALLBACKS=
+ test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
+ 
+-echo "$as_me:9814: checking if you want modern xterm or antique" >&5
++echo "$as_me:9819: 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.
+@@ -9825,7 +9830,7 @@
+ (no) with_xterm_new=xterm-old;;
+ (*)	 with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:9828: result: $with_xterm_new" >&5
++echo "$as_me:9833: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+ 
+@@ -9838,7 +9843,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9841: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:9846: 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.
+@@ -9862,13 +9867,13 @@
+ 	with_xterm_kbs=$withval
+ 	;;
+ esac
+-echo "$as_me:9865: result: $with_xterm_kbs" >&5
++echo "$as_me:9870: result: $with_xterm_kbs" >&5
+ echo "${ECHO_T}$with_xterm_kbs" >&6
+ XTERM_KBS=$with_xterm_kbs
+ 
+ if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
+ then
+-	{ echo "$as_me:9871: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
++	{ echo "$as_me:9876: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
+ echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;}
+ fi
+ 
+@@ -9878,7 +9883,7 @@
+ 	MAKE_TERMINFO="#"
+ else
+ 
+-echo "$as_me:9881: checking for list of terminfo directories" >&5
++echo "$as_me:9886: 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.
+@@ -9916,7 +9921,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9919: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:9924: 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; }; }
+ 	;;
+@@ -9939,7 +9944,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9942: result: $TERMINFO_DIRS" >&5
++echo "$as_me:9947: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <&5
++	{ echo "$as_me:9956: 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:9957: checking for default terminfo directory" >&5
++echo "$as_me:9962: 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.
+@@ -9988,7 +9993,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9991: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:9996: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9997,7 +10002,7 @@
+ fi
+ eval TERMINFO="$withval"
+ 
+-echo "$as_me:10000: result: $TERMINFO" >&5
++echo "$as_me:10005: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:10016: 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.
+@@ -10020,7 +10025,7 @@
+   with_big_core=no
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10023 "configure"
++#line 10028 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10034,15 +10039,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10037: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10042: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10040: \$? = $ac_status" >&5
++  echo "$as_me:10045: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10042: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10047: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10045: \$? = $ac_status" >&5
++  echo "$as_me:10050: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_big_core=yes
+ else
+@@ -10054,7 +10059,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi;
+-echo "$as_me:10057: result: $with_big_core" >&5
++echo "$as_me:10062: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10064,7 +10069,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:10067: checking if big-strings option selected" >&5
++echo "$as_me:10072: 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.
+@@ -10088,14 +10093,14 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:10091: result: $with_big_strings" >&5
++echo "$as_me:10096: 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:10098: checking if you want termcap-fallback support" >&5
++echo "$as_me:10103: 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.
+@@ -10105,14 +10110,14 @@
+ else
+   with_termcap=no
+ fi;
+-echo "$as_me:10108: result: $with_termcap" >&5
++echo "$as_me:10113: 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:10115: error: You have disabled the database w/o specifying fallbacks" >&5
++			{ { echo "$as_me:10120: 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
+@@ -10125,13 +10130,13 @@
+ else
+ 
+ 	if test "$with_ticlib" != no ; then
+-		{ { echo "$as_me:10128: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++		{ { echo "$as_me:10133: 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:10134: checking for list of termcap files" >&5
++	echo "$as_me:10139: 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.
+@@ -10169,7 +10174,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:10172: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:10177: 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; }; }
+ 	;;
+@@ -10192,7 +10197,7 @@
+ 	;;
+ esac
+ 
+-	echo "$as_me:10195: result: $TERMPATH" >&5
++	echo "$as_me:10200: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ 	test -n "$TERMPATH" &&
+ cat >>confdefs.h <&5
++	echo "$as_me:10208: 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.
+@@ -10210,14 +10215,14 @@
+ else
+   with_getcap=no
+ fi;
+-	echo "$as_me:10213: result: $with_getcap" >&5
++	echo "$as_me:10218: 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:10220: checking if translated termcaps will be cached in ~/.terminfo" >&5
++	echo "$as_me:10225: 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.
+@@ -10227,7 +10232,7 @@
+ else
+   with_getcap_cache=no
+ fi;
+-	echo "$as_me:10230: result: $with_getcap_cache" >&5
++	echo "$as_me:10235: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ 	test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10237,7 +10242,7 @@
+ fi
+ 
+ ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:10240: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:10245: 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.
+@@ -10247,14 +10252,14 @@
+ else
+   with_home_terminfo=yes
+ fi;
+-echo "$as_me:10250: result: $with_home_terminfo" >&5
++echo "$as_me:10255: 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:10257: checking if you want to permit root to use ncurses environment variables" >&5
++echo "$as_me:10262: 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.
+@@ -10264,14 +10269,14 @@
+ else
+   with_root_environ=yes
+ fi;
+-echo "$as_me:10267: result: $with_root_environ" >&5
++echo "$as_me:10272: 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:10274: checking if you want to permit setuid programs to access all files" >&5
++echo "$as_me:10279: 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-access or --disable-root-access was given.
+@@ -10281,14 +10286,14 @@
+ else
+   with_root_access=yes
+ fi;
+-echo "$as_me:10284: result: $with_root_access" >&5
++echo "$as_me:10289: result: $with_root_access" >&5
+ echo "${ECHO_T}$with_root_access" >&6
+ test "x$with_root_access" = xyes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_ROOT_ACCESS 1
+ EOF
+ 
+-echo "$as_me:10291: checking if you want to permit setuid use of ncurses environment variables" >&5
++echo "$as_me:10296: checking if you want to permit setuid use of ncurses environment variables" >&5
+ echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
+ 
+ # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
+@@ -10298,7 +10303,7 @@
+ else
+   with_setuid_environ=$with_root_environ
+ fi;
+-echo "$as_me:10301: result: $with_setuid_environ" >&5
++echo "$as_me:10306: result: $with_setuid_environ" >&5
+ echo "${ECHO_T}$with_setuid_environ" >&6
+ test "x$with_setuid_environ" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10313,23 +10318,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:10316: checking for $ac_header" >&5
++echo "$as_me:10321: 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 10322 "configure"
++#line 10327 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10326: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:10331: \"$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:10332: \$? = $ac_status" >&5
++  echo "$as_me:10337: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10348,7 +10353,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:10351: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:10356: 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:10371: 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 10372 "configure"
++#line 10377 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10400,16 +10405,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10403: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10408: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10406: \$? = $ac_status" >&5
++  echo "$as_me:10411: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10409: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10414: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10412: \$? = $ac_status" >&5
++  echo "$as_me:10417: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -10419,7 +10424,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10422: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10427: 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:10444: 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 10445 "configure"
++#line 10450 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10473,16 +10478,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10476: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10481: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10479: \$? = $ac_status" >&5
++  echo "$as_me:10484: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10482: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10487: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10485: \$? = $ac_status" >&5
++  echo "$as_me:10490: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -10492,7 +10497,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10495: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10500: 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:10511: 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
+@@ -10516,7 +10521,7 @@
+ 			eval 'ac_cv_func_'$cf_func'=error'
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10519 "configure"
++#line 10524 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -10550,15 +10555,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10553: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10558: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10556: \$? = $ac_status" >&5
++  echo "$as_me:10561: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10558: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10563: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10561: \$? = $ac_status" >&5
++  echo "$as_me:10566: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -10576,7 +10581,7 @@
+ 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+ 
+ fi
+-echo "$as_me:10579: result: $cf_cv_link_funcs" >&5
++echo "$as_me:10584: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ 	test "$ac_cv_func_link"    = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -10596,7 +10601,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:10599: checking if tic should use symbolic links" >&5
++	echo "$as_me:10604: 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.
+@@ -10606,21 +10611,21 @@
+ else
+   with_symlinks=no
+ fi;
+-	echo "$as_me:10609: result: $with_symlinks" >&5
++	echo "$as_me:10614: 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:10616: checking if tic should use hard links" >&5
++	echo "$as_me:10621: 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:10623: result: $with_links" >&5
++	echo "$as_me:10628: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+ 
+@@ -10636,7 +10641,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:10639: checking if you want broken-linker support code" >&5
++echo "$as_me:10644: 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.
+@@ -10646,7 +10651,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:10649: result: $with_broken_linker" >&5
++echo "$as_me:10654: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : "${BROKEN_LINKER:=0}"
+@@ -10660,7 +10665,7 @@
+ fi
+ 
+ ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:10663: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:10668: 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.
+@@ -10670,7 +10675,7 @@
+ else
+   with_bsdpad=no
+ fi;
+-echo "$as_me:10673: result: $with_bsdpad" >&5
++echo "$as_me:10678: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10689,14 +10694,14 @@
+ # Check to define _XOPEN_SOURCE "automatically"
+ CPPFLAGS_before_XOPEN="$CPPFLAGS"
+ 
+-echo "$as_me:10692: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:10697: 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 10699 "configure"
++#line 10704 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10715,16 +10720,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10718: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10723: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10721: \$? = $ac_status" >&5
++  echo "$as_me:10726: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10724: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10729: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10727: \$? = $ac_status" >&5
++  echo "$as_me:10732: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -10735,7 +10740,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10738: result: $cf_cv_posix_visible" >&5
++echo "$as_me:10743: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -10777,14 +10782,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:10780: checking if this is the GNU C library" >&5
++echo "$as_me:10785: 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 10787 "configure"
++#line 10792 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10803,16 +10808,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10806: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10811: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10809: \$? = $ac_status" >&5
++  echo "$as_me:10814: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10812: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10817: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10815: \$? = $ac_status" >&5
++  echo "$as_me:10820: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -10823,7 +10828,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10826: result: $cf_cv_gnu_library" >&5
++echo "$as_me:10831: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -10831,7 +10836,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:10834: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:10839: 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
+@@ -10843,7 +10848,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10846 "configure"
++#line 10851 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10862,16 +10867,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10865: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10870: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10868: \$? = $ac_status" >&5
++  echo "$as_me:10873: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10871: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10876: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10874: \$? = $ac_status" >&5
++  echo "$as_me:10879: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -10883,12 +10888,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:10886: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:10891: 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:10891: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:10896: 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
+@@ -10993,7 +10998,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10996 "configure"
++#line 11001 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -11013,16 +11018,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11016: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11021: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11019: \$? = $ac_status" >&5
++  echo "$as_me:11024: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11022: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11027: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11025: \$? = $ac_status" >&5
++  echo "$as_me:11030: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -11033,7 +11038,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11036: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:11041: 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
+@@ -11042,14 +11047,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:11045: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:11050: 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 11052 "configure"
++#line 11057 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11064,16 +11069,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11067: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11072: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11070: \$? = $ac_status" >&5
++  echo "$as_me:11075: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11073: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11078: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11076: \$? = $ac_status" >&5
++  echo "$as_me:11081: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -11180,7 +11185,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11183 "configure"
++#line 11188 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11195,16 +11200,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11198: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11203: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11201: \$? = $ac_status" >&5
++  echo "$as_me:11206: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11204: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11209: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11207: \$? = $ac_status" >&5
++  echo "$as_me:11212: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -11219,12 +11224,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11222: result: $cf_cv_gnu_source" >&5
++echo "$as_me:11227: 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:11227: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:11232: 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
+@@ -11234,7 +11239,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11237 "configure"
++#line 11242 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11249,16 +11254,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11252: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11257: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11255: \$? = $ac_status" >&5
++  echo "$as_me:11260: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11258: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11263: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11261: \$? = $ac_status" >&5
++  echo "$as_me:11266: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -11269,7 +11274,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11272: result: $cf_cv_default_source" >&5
++echo "$as_me:11277: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -11309,16 +11314,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:11312: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11317: 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}:11318: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11323: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11321 "configure"
++#line 11326 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11333,16 +11338,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11336: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11341: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11339: \$? = $ac_status" >&5
++  echo "$as_me:11344: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11342: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11347: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11345: \$? = $ac_status" >&5
++  echo "$as_me:11350: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11363,7 +11368,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11366 "configure"
++#line 11371 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11378,16 +11383,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11381: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11386: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11384: \$? = $ac_status" >&5
++  echo "$as_me:11389: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11387: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11392: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11390: \$? = $ac_status" >&5
++  echo "$as_me:11395: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11398,7 +11403,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11401: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11406: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11406,10 +11411,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11409: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11414: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11412 "configure"
++#line 11417 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11424,16 +11429,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11427: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11432: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11430: \$? = $ac_status" >&5
++  echo "$as_me:11435: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11433: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11438: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11436: \$? = $ac_status" >&5
++  echo "$as_me:11441: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11449,7 +11454,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11452: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11457: 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
+@@ -11566,7 +11571,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:11569: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:11574: 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
+@@ -11598,14 +11603,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:11601: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:11606: 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 11608 "configure"
++#line 11613 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11623,16 +11628,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11626: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11631: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11629: \$? = $ac_status" >&5
++  echo "$as_me:11634: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11632: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11637: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11635: \$? = $ac_status" >&5
++  echo "$as_me:11640: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11644,7 +11649,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11647 "configure"
++#line 11652 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11662,16 +11667,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11665: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11670: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11668: \$? = $ac_status" >&5
++  echo "$as_me:11673: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11671: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11676: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11674: \$? = $ac_status" >&5
++  echo "$as_me:11679: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11686,7 +11691,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11689: result: $cf_cv_xopen_source" >&5
++echo "$as_me:11694: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -11846,16 +11851,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:11849: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11854: 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}:11855: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11860: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11858 "configure"
++#line 11863 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11870,16 +11875,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11873: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11878: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11876: \$? = $ac_status" >&5
++  echo "$as_me:11881: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11879: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11884: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11882: \$? = $ac_status" >&5
++  echo "$as_me:11887: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11900,7 +11905,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11903 "configure"
++#line 11908 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11915,16 +11920,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11918: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11923: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11921: \$? = $ac_status" >&5
++  echo "$as_me:11926: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11924: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11929: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11927: \$? = $ac_status" >&5
++  echo "$as_me:11932: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11935,7 +11940,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11938: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11943: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11943,10 +11948,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11946: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11951: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11949 "configure"
++#line 11954 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11961,16 +11966,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11964: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11969: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11967: \$? = $ac_status" >&5
++  echo "$as_me:11972: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11970: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11975: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11973: \$? = $ac_status" >&5
++  echo "$as_me:11978: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11986,7 +11991,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11989: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11994: 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
+@@ -12099,10 +12104,10 @@
+ 	if test "$cf_cv_xopen_source" = no ; then
+ 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+ 
+-echo "${as_me:-configure}:12102: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:12107: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12105 "configure"
++#line 12110 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12120,23 +12125,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12123: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12128: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12126: \$? = $ac_status" >&5
++  echo "$as_me:12131: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12129: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12134: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12132: \$? = $ac_status" >&5
++  echo "$as_me:12137: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-			{ echo "$as_me:12139: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++			{ echo "$as_me:12144: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ 			CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -12159,7 +12164,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}:12162: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12167: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -12171,7 +12176,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}:12174: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:12179: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -12259,7 +12264,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:12262: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:12267: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -12269,7 +12274,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:12272: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:12277: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -12279,7 +12284,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}:12282: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:12287: 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"
+@@ -12291,10 +12296,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:12294: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:12299: 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 12297 "configure"
++#line 12302 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12309,16 +12314,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12312: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12317: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12315: \$? = $ac_status" >&5
++  echo "$as_me:12320: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12318: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12323: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12321: \$? = $ac_status" >&5
++  echo "$as_me:12326: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -12327,12 +12332,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:12330: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:12335: 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 12335 "configure"
++#line 12340 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12347,16 +12352,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12350: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12355: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12353: \$? = $ac_status" >&5
++  echo "$as_me:12358: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12356: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12361: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12359: \$? = $ac_status" >&5
++  echo "$as_me:12364: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -12367,19 +12372,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:12370: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:12375: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:12375: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:12380: 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 12382 "configure"
++#line 12387 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12397,16 +12402,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12400: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12405: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12403: \$? = $ac_status" >&5
++  echo "$as_me:12408: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12406: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12411: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12409: \$? = $ac_status" >&5
++  echo "$as_me:12414: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12418,7 +12423,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12421 "configure"
++#line 12426 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12436,16 +12441,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12439: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12444: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12442: \$? = $ac_status" >&5
++  echo "$as_me:12447: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12445: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12450: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12448: \$? = $ac_status" >&5
++  echo "$as_me:12453: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12460,7 +12465,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12463: result: $cf_cv_xopen_source" >&5
++echo "$as_me:12468: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -12611,14 +12616,14 @@
+ 
+ # Work around breakage on OS X
+ 
+-echo "$as_me:12614: checking if SIGWINCH is defined" >&5
++echo "$as_me:12619: 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 12621 "configure"
++#line 12626 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12633,23 +12638,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12636: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12641: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12639: \$? = $ac_status" >&5
++  echo "$as_me:12644: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12642: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12647: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12645: \$? = $ac_status" >&5
++  echo "$as_me:12650: \$? = $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 12652 "configure"
++#line 12657 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -12667,16 +12672,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12670: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12675: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12673: \$? = $ac_status" >&5
++  echo "$as_me:12678: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12676: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12681: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12679: \$? = $ac_status" >&5
++  echo "$as_me:12684: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -12690,11 +12695,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12693: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:12698: 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:12697: checking for actual SIGWINCH definition" >&5
++echo "$as_me:12702: 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
+@@ -12705,7 +12710,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12708 "configure"
++#line 12713 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -12727,16 +12732,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12730: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12735: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12733: \$? = $ac_status" >&5
++  echo "$as_me:12738: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12736: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12741: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12739: \$? = $ac_status" >&5
++  echo "$as_me:12744: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -12750,7 +12755,7 @@
+ done
+ 
+ fi
+-echo "$as_me:12753: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:12758: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -12760,13 +12765,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:12763: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:12768: 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 12769 "configure"
++#line 12774 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12780,16 +12785,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12783: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12788: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12786: \$? = $ac_status" >&5
++  echo "$as_me:12791: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12789: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12794: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12792: \$? = $ac_status" >&5
++  echo "$as_me:12797: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -12800,7 +12805,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12803: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:12808: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test "$am_cv_langinfo_codeset" = yes; then
+ 
+@@ -12814,7 +12819,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+ 
+-echo "$as_me:12817: checking if you want wide-character code" >&5
++echo "$as_me:12822: 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.
+@@ -12824,7 +12829,7 @@
+ else
+   with_widec=$cf_dft_widec
+ fi;
+-echo "$as_me:12827: result: $with_widec" >&5
++echo "$as_me:12832: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ 
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -12846,7 +12851,7 @@
+ 	(*_XOPEN_SOURCE=*)
+ 		;;
+ 	(*)
+-		{ echo "$as_me:12849: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
++		{ echo "$as_me:12854: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
+ 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
+ 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
+@@ -12859,23 +12864,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:12862: checking for $ac_header" >&5
++echo "$as_me:12867: 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 12868 "configure"
++#line 12873 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:12872: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12877: \"$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:12878: \$? = $ac_status" >&5
++  echo "$as_me:12883: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12894,7 +12899,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:12897: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:12902: 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:12912: 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 12914 "configure"
++#line 12919 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12933,16 +12938,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12936: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12941: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12939: \$? = $ac_status" >&5
++  echo "$as_me:12944: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12942: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12947: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12945: \$? = $ac_status" >&5
++  echo "$as_me:12950: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_h_okay=yes
+ else
+@@ -12952,16 +12957,16 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12955: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:12960: 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:12961: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:12966: 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 12964 "configure"
++#line 12969 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12977,16 +12982,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12980: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12985: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12983: \$? = $ac_status" >&5
++  echo "$as_me:12988: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12986: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12991: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12989: \$? = $ac_status" >&5
++  echo "$as_me:12994: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=no
+ else
+@@ -12995,16 +13000,16 @@
+ cf_result=yes
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:12998: result: $cf_result" >&5
++echo "$as_me:13003: 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:13004: checking checking for compatible value versus " >&5
++	echo "$as_me:13009: 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 13007 "configure"
++#line 13012 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -13020,16 +13025,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13023: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13028: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13026: \$? = $ac_status" >&5
++  echo "$as_me:13031: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13029: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13034: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13032: \$? = $ac_status" >&5
++  echo "$as_me:13037: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -13038,7 +13043,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:13041: result: $cf_result" >&5
++	echo "$as_me:13046: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = no ; then
+ 		# perhaps we can override it - try...
+@@ -13048,7 +13053,7 @@
+ 
+ fi
+ 
+-echo "$as_me:13051: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:13056: 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
+@@ -13119,7 +13124,7 @@
+   cf_cv_wcwidth_graphics=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13122 "configure"
++#line 13127 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13164,15 +13169,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:13167: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13172: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13170: \$? = $ac_status" >&5
++  echo "$as_me:13175: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:13172: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13177: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13175: \$? = $ac_status" >&5
++  echo "$as_me:13180: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wcwidth_graphics=yes
+ else
+@@ -13185,7 +13190,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:13188: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:13193: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+ 
+ 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -13196,13 +13201,13 @@
+ for ac_func in putwc btowc wctob wmemchr 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:13199: checking for $ac_func" >&5
++echo "$as_me:13204: 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 13205 "configure"
++#line 13210 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13233,16 +13238,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13236: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13241: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13239: \$? = $ac_status" >&5
++  echo "$as_me:13244: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13242: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13247: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13245: \$? = $ac_status" >&5
++  echo "$as_me:13250: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -13252,7 +13257,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13255: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:13260: 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:13275: 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 13276 "configure"
++#line 13281 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13280: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:13285: \"$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:13286: \$? = $ac_status" >&5
++  echo "$as_me:13291: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13302,7 +13307,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:13305: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:13310: 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:13320: 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
+@@ -13320,7 +13325,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13323 "configure"
++#line 13328 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13337,16 +13342,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13340: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13345: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13343: \$? = $ac_status" >&5
++  echo "$as_me:13348: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13346: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13351: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13349: \$? = $ac_status" >&5
++  echo "$as_me:13354: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -13358,12 +13363,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:13361: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13366: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13366 "configure"
++#line 13371 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13376,16 +13381,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13379: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13384: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13382: \$? = $ac_status" >&5
++  echo "$as_me:13387: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13385: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13390: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13388: \$? = $ac_status" >&5
++  echo "$as_me:13393: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -13399,7 +13404,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13402 "configure"
++#line 13407 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13412,16 +13417,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13415: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13420: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13418: \$? = $ac_status" >&5
++  echo "$as_me:13423: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13421: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13426: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13424: \$? = $ac_status" >&5
++  echo "$as_me:13429: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -13438,9 +13443,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:13441: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:13446: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:13443: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13448: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13531,7 +13536,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}:13534: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13539: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -13539,7 +13544,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13542 "configure"
++#line 13547 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13552,21 +13557,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13555: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13560: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13558: \$? = $ac_status" >&5
++  echo "$as_me:13563: \$? = $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:13566: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13564: \$? = $ac_status" >&5
++  echo "$as_me:13569: \$? = $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}:13569: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13574: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13584,7 +13589,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:13587: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13592: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -13659,13 +13664,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}:13662: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13667: 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 13668 "configure"
++#line 13673 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13678,21 +13683,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13681: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13686: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13684: \$? = $ac_status" >&5
++  echo "$as_me:13689: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13687: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13692: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13690: \$? = $ac_status" >&5
++  echo "$as_me:13695: \$? = $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}:13695: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13700: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -13734,7 +13739,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13737: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:13742: 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
+@@ -13772,7 +13777,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13775 "configure"
++#line 13780 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13784,16 +13789,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13787: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13792: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13790: \$? = $ac_status" >&5
++  echo "$as_me:13795: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13793: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13798: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13796: \$? = $ac_status" >&5
++  echo "$as_me:13801: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13810,7 +13815,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}:13813: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:13818: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -13846,7 +13851,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}:13849: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:13854: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -13878,14 +13883,14 @@
+ 	fi
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:13881: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:13886: 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 13888 "configure"
++#line 13893 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13903,23 +13908,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13906: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13911: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13909: \$? = $ac_status" >&5
++  echo "$as_me:13914: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13912: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13917: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13915: \$? = $ac_status" >&5
++  echo "$as_me:13920: \$? = $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 13922 "configure"
++#line 13927 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13938,16 +13943,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13941: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13946: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13944: \$? = $ac_status" >&5
++  echo "$as_me:13949: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13947: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13952: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13950: \$? = $ac_status" >&5
++  echo "$as_me:13955: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -13959,7 +13964,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13962: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:13967: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -13977,14 +13982,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:13980: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:13985: 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 13987 "configure"
++#line 13992 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14002,23 +14007,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14005: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14010: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14008: \$? = $ac_status" >&5
++  echo "$as_me:14013: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14011: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14016: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14014: \$? = $ac_status" >&5
++  echo "$as_me:14019: \$? = $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 14021 "configure"
++#line 14026 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14037,16 +14042,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14040: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14045: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14043: \$? = $ac_status" >&5
++  echo "$as_me:14048: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14046: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14051: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14049: \$? = $ac_status" >&5
++  echo "$as_me:14054: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -14058,7 +14063,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14061: result: $cf_cv_wchar_t" >&5
++echo "$as_me:14066: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -14081,14 +14086,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:14084: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:14089: 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 14091 "configure"
++#line 14096 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14106,23 +14111,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14109: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14114: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14112: \$? = $ac_status" >&5
++  echo "$as_me:14117: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14115: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14120: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14118: \$? = $ac_status" >&5
++  echo "$as_me:14123: \$? = $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 14125 "configure"
++#line 14130 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14141,16 +14146,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14144: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14149: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14147: \$? = $ac_status" >&5
++  echo "$as_me:14152: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14150: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14155: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14153: \$? = $ac_status" >&5
++  echo "$as_me:14158: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -14162,7 +14167,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14165: result: $cf_cv_wint_t" >&5
++echo "$as_me:14170: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -14194,7 +14199,7 @@
+ fi
+ 
+ ###   use option --disable-lp64 to allow long chtype
+-echo "$as_me:14197: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:14202: 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.
+@@ -14204,7 +14209,7 @@
+ else
+   with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:14207: result: $with_lp64" >&5
++echo "$as_me:14212: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+ 
+ if test "x$with_lp64" = xyes ; then
+@@ -14220,7 +14225,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:14223: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:14228: 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
+@@ -14232,7 +14237,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 14235 "configure"
++#line 14240 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14252,16 +14257,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14255: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14260: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14258: \$? = $ac_status" >&5
++  echo "$as_me:14263: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14261: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14266: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14264: \$? = $ac_status" >&5
++  echo "$as_me:14269: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14271,16 +14276,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14274: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14279: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14277: \$? = $ac_status" >&5
++  echo "$as_me:14282: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14280: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14285: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14283: \$? = $ac_status" >&5
++  echo "$as_me:14288: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -14294,13 +14299,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:14297: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:14302: 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:14303: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:14308: 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
+@@ -14308,7 +14313,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14311 "configure"
++#line 14316 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14328,16 +14333,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14331: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14336: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14334: \$? = $ac_status" >&5
++  echo "$as_me:14339: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14337: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14342: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14340: \$? = $ac_status" >&5
++  echo "$as_me:14345: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14346,7 +14351,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14349 "configure"
++#line 14354 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -14367,16 +14372,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14370: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14375: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14373: \$? = $ac_status" >&5
++  echo "$as_me:14378: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14376: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14381: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14379: \$? = $ac_status" >&5
++  echo "$as_me:14384: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -14387,7 +14392,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14390: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:14395: 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
+ 
+@@ -14397,7 +14402,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:14400: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:14405: 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
+@@ -14405,7 +14410,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14408 "configure"
++#line 14413 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14425,16 +14430,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14428: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14433: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14431: \$? = $ac_status" >&5
++  echo "$as_me:14436: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14434: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14439: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14437: \$? = $ac_status" >&5
++  echo "$as_me:14442: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14443,7 +14448,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14446 "configure"
++#line 14451 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -14464,16 +14469,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14467: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14472: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14470: \$? = $ac_status" >&5
++  echo "$as_me:14475: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14473: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14478: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14476: \$? = $ac_status" >&5
++  echo "$as_me:14481: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -14484,7 +14489,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14487: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:14492: 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
+ 
+@@ -14497,7 +14502,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:14500: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:14505: 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
+@@ -14505,7 +14510,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14508 "configure"
++#line 14513 "configure"
+ #include "confdefs.h"
+ #include 
+     #include 
+@@ -14520,16 +14525,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14523: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14528: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14526: \$? = $ac_status" >&5
++  echo "$as_me:14531: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14529: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14534: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14532: \$? = $ac_status" >&5
++  echo "$as_me:14537: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14538,7 +14543,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14541 "configure"
++#line 14546 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -14554,16 +14559,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14557: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14562: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14560: \$? = $ac_status" >&5
++  echo "$as_me:14565: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14563: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14568: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14566: \$? = $ac_status" >&5
++  echo "$as_me:14571: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -14574,7 +14579,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14577: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:14582: 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
+ 
+@@ -14588,13 +14593,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:14591: checking for fseeko" >&5
++echo "$as_me:14596: 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 14597 "configure"
++#line 14602 "configure"
+ #include "confdefs.h"
+ #include 
+                              #include 
+@@ -14608,16 +14613,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14611: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14616: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14614: \$? = $ac_status" >&5
++  echo "$as_me:14619: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14617: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14622: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14620: \$? = $ac_status" >&5
++  echo "$as_me:14625: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -14627,7 +14632,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14630: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:14635: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -14666,14 +14671,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:14669: checking whether to use struct dirent64" >&5
++	echo "$as_me:14674: 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 14676 "configure"
++#line 14681 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -14700,16 +14705,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14703: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14708: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14706: \$? = $ac_status" >&5
++  echo "$as_me:14711: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14709: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14714: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14712: \$? = $ac_status" >&5
++  echo "$as_me:14717: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -14720,7 +14725,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14723: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:14728: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -14730,7 +14735,7 @@
+ 	fi
+ 
+ ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:14733: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:14738: 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.
+@@ -14740,14 +14745,14 @@
+ else
+   with_tparm_varargs=yes
+ fi;
+-echo "$as_me:14743: result: $with_tparm_varargs" >&5
++echo "$as_me:14748: 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:14750: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:14755: 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.
+@@ -14757,14 +14762,14 @@
+ else
+   with_tic_depends=yes
+ fi;
+-echo "$as_me:14760: result: $with_tic_depends" >&5
++echo "$as_me:14765: 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:14767: checking if you want to enable wattr* macros" >&5
++echo "$as_me:14772: 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.
+@@ -14776,15 +14781,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ 	NCURSES_WATTR_MACROS=0
+-	echo "$as_me:14779: result: no" >&5
++	echo "$as_me:14784: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ else
+ 	NCURSES_WATTR_MACROS=1
+-	echo "$as_me:14783: result: yes" >&5
++	echo "$as_me:14788: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ fi
+ 
+-echo "$as_me:14787: checking for X11 rgb file" >&5
++echo "$as_me:14792: 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.
+@@ -14846,7 +14851,7 @@
+ 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:14849: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:14854: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14854,7 +14859,7 @@
+ 
+ fi
+ 
+-echo "$as_me:14857: result: $RGB_PATH" >&5
++echo "$as_me:14862: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:14877: 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.
+@@ -14879,17 +14884,17 @@
+ else
+   NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:14882: result: $NCURSES_BOOL" >&5
++echo "$as_me:14887: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ case x$NCURSES_BOOL in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14886: error: expected a type name for bool" >&5
++	{ { echo "$as_me:14891: error: expected a type name for bool" >&5
+ echo "$as_me: error: expected a type name for bool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+-echo "$as_me:14892: checking for alternate terminal capabilities file" >&5
++echo "$as_me:14897: 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.
+@@ -14901,16 +14906,16 @@
+ fi;
+ if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
+ then
+-	{ echo "$as_me:14904: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
++	{ echo "$as_me:14909: 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:14908: result: $TERMINFO_CAPS" >&5
++echo "$as_me:14913: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+ 
+ ###   use option --with-chtype to override chtype's type
+ 
+-echo "$as_me:14913: checking for type of chtype" >&5
++echo "$as_me:14918: 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.
+@@ -14920,11 +14925,11 @@
+ else
+   NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:14923: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:14928: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ case x$NCURSES_CHTYPE in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14927: error: expected a type name for chtype" >&5
++	{ { echo "$as_me:14932: error: expected a type name for chtype" >&5
+ echo "$as_me: error: expected a type name for chtype" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14932,7 +14937,7 @@
+ 
+ ###   use option --with-ospeed to override ospeed's type
+ 
+-echo "$as_me:14935: checking for type of ospeed" >&5
++echo "$as_me:14940: 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.
+@@ -14942,11 +14947,11 @@
+ else
+   NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:14945: result: $NCURSES_OSPEED" >&5
++echo "$as_me:14950: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ case x$NCURSES_OSPEED in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14949: error: expected a type name for ospeed" >&5
++	{ { echo "$as_me:14954: error: expected a type name for ospeed" >&5
+ echo "$as_me: error: expected a type name for ospeed" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14954,7 +14959,7 @@
+ 
+ ###   use option --with-mmask-t to override mmask_t's type
+ 
+-echo "$as_me:14957: checking for type of mmask-t" >&5
++echo "$as_me:14962: 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.
+@@ -14964,18 +14969,18 @@
+ else
+   NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:14967: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:14972: result: $NCURSES_MMASK_T" >&5
+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+ case x$NCURSES_MMASK_T in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14971: error: expected a type name for mmask-t" >&5
++	{ { echo "$as_me:14976: error: expected a type name for mmask-t" >&5
+ echo "$as_me: error: expected a type name for mmask-t" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ ###   use option --with-ccharw-max to override CCHARW_MAX size
+-echo "$as_me:14978: checking for size CCHARW_MAX" >&5
++echo "$as_me:14983: 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.
+@@ -14985,16 +14990,16 @@
+ else
+   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
+ fi;
+-echo "$as_me:14988: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:14993: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+ 
+-echo "$as_me:14991: checking for signed char" >&5
++echo "$as_me:14996: 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 14997 "configure"
++#line 15002 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15009,16 +15014,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15012: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15017: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15015: \$? = $ac_status" >&5
++  echo "$as_me:15020: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15018: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15023: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15021: \$? = $ac_status" >&5
++  echo "$as_me:15026: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -15028,10 +15033,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15031: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:15036: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:15034: checking size of signed char" >&5
++echo "$as_me:15039: 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
+@@ -15040,7 +15045,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15043 "configure"
++#line 15048 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15052,21 +15057,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15055: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15060: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15058: \$? = $ac_status" >&5
++  echo "$as_me:15063: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15061: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15066: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15064: \$? = $ac_status" >&5
++  echo "$as_me:15069: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15069 "configure"
++#line 15074 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15078,16 +15083,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15081: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15086: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15084: \$? = $ac_status" >&5
++  echo "$as_me:15089: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15087: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15092: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15090: \$? = $ac_status" >&5
++  echo "$as_me:15095: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -15103,7 +15108,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15106 "configure"
++#line 15111 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15115,16 +15120,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15118: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15123: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15121: \$? = $ac_status" >&5
++  echo "$as_me:15126: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15124: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15129: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15127: \$? = $ac_status" >&5
++  echo "$as_me:15132: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -15140,7 +15145,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 15143 "configure"
++#line 15148 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15152,16 +15157,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15155: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15160: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15158: \$? = $ac_status" >&5
++  echo "$as_me:15163: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15161: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15166: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15164: \$? = $ac_status" >&5
++  echo "$as_me:15169: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -15174,12 +15179,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:15177: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:15182: 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 15182 "configure"
++#line 15187 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15195,15 +15200,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:15198: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15203: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15201: \$? = $ac_status" >&5
++  echo "$as_me:15206: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:15203: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15208: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15206: \$? = $ac_status" >&5
++  echo "$as_me:15211: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -15219,7 +15224,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:15222: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:15227: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:15238: checking whether to use signed chars for Boolean array in term.h" >&5
+ echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
+ 
+ # Check whether --enable-signed-char or --disable-signed-char was given.
+@@ -15240,13 +15245,13 @@
+ else
+   with_signed_char=$cf_dft_signed_char
+ fi;
+-echo "$as_me:15243: result: $with_signed_char" >&5
++echo "$as_me:15248: 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:15249: checking for type of tparm-arg" >&5
++echo "$as_me:15254: checking for type of tparm-arg" >&5
+ echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6
+ 
+ # Check whether --with-tparm-arg or --without-tparm-arg was given.
+@@ -15256,18 +15261,18 @@
+ else
+   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:15259: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:15264: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+ case x$NCURSES_TPARM_ARG in
+ (x|xyes|xno)
+-	{ { echo "$as_me:15263: error: expected a type name for tparm-arg" >&5
++	{ { echo "$as_me:15268: error: expected a type name for tparm-arg" >&5
+ echo "$as_me: error: expected a type name for tparm-arg" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:15270: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:15275: 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.
+@@ -15277,7 +15282,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:15280: result: $with_rcs_ids" >&5
++echo "$as_me:15285: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15286,7 +15291,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:15289: checking format of man-pages" >&5
++echo "$as_me:15294: 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.
+@@ -15377,10 +15382,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:15380: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:15385: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+-	{ echo "$as_me:15383: WARNING: Unexpected manpage-format $cf_unknown" >&5
++	{ echo "$as_me:15388: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+ 
+@@ -15421,7 +15426,7 @@
+ esac
+ done
+ 
+-echo "$as_me:15424: checking for manpage renaming" >&5
++echo "$as_me:15429: 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.
+@@ -15450,15 +15455,15 @@
+ elif test "$MANPAGE_RENAMES" = no ; then
+ 	:
+ elif test ! -f "$MANPAGE_RENAMES" ; then
+-	{ { echo "$as_me:15453: error: not a filename: $MANPAGE_RENAMES" >&5
++	{ { echo "$as_me:15458: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-echo "$as_me:15458: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:15463: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+ 
+-echo "$as_me:15461: checking if manpage aliases will be installed" >&5
++echo "$as_me:15466: 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.
+@@ -15469,7 +15474,7 @@
+   MANPAGE_ALIASES=yes
+ fi;
+ 
+-echo "$as_me:15472: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:15477: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+ 
+ case "x$LN_S" in
+@@ -15483,7 +15488,7 @@
+ 
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:15486: checking if manpage symlinks should be used" >&5
++echo "$as_me:15491: 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.
+@@ -15496,17 +15501,17 @@
+ 
+ if test "$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+-	{ echo "$as_me:15499: WARNING: cannot make symlinks" >&5
++	{ echo "$as_me:15504: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ 	MANPAGE_SYMLINKS=no
+ fi
+ fi
+ 
+-echo "$as_me:15505: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:15510: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+ 
+-echo "$as_me:15509: checking for manpage tbl" >&5
++echo "$as_me:15514: 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.
+@@ -15517,7 +15522,7 @@
+   MANPAGE_TBL=no
+ fi;
+ 
+-echo "$as_me:15520: result: $MANPAGE_TBL" >&5
++echo "$as_me:15525: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+ 
+ if test "$prefix" = "NONE" ; then
+@@ -15838,7 +15843,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15841: checking if you want to build with function extensions" >&5
++echo "$as_me:15846: 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.
+@@ -15848,7 +15853,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:15851: result: $with_ext_funcs" >&5
++echo "$as_me:15856: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -15905,7 +15910,7 @@
+ 	GENERATED_EXT_FUNCS=
+ fi
+ 
+-echo "$as_me:15908: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:15913: 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.
+@@ -15915,7 +15920,7 @@
+ else
+   with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:15918: result: $with_sp_funcs" >&5
++echo "$as_me:15923: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ 	NCURSES_SP_FUNCS=1
+@@ -15934,7 +15939,7 @@
+ 	GENERATED_SP_FUNCS=
+ fi
+ 
+-echo "$as_me:15937: checking if you want to build with terminal-driver" >&5
++echo "$as_me:15942: 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.
+@@ -15944,7 +15949,7 @@
+ else
+   with_term_driver=no
+ fi;
+-echo "$as_me:15947: result: $with_term_driver" >&5
++echo "$as_me:15952: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+ 
+@@ -15953,19 +15958,19 @@
+ EOF
+ 
+ 	if test "x$with_termlib" != xno ; then
+-		{ { echo "$as_me:15956: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:15961: 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:15961: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:15966: 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:15968: checking for extended use of const keyword" >&5
++echo "$as_me:15973: 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.
+@@ -15975,7 +15980,7 @@
+ else
+   with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:15978: result: $with_ext_const" >&5
++echo "$as_me:15983: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -15983,7 +15988,9 @@
+ fi
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:15986: checking if you want to use extended colors" >&5
++NCURSES_EXT_COLORS=0
++NCURSES_RGB_COLORS=0
++echo "$as_me:15993: 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.
+@@ -15993,12 +16000,11 @@
+ else
+   with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:15996: result: $with_ext_colors" >&5
++echo "$as_me:16003: 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:16001: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:16007: 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)
+@@ -16009,7 +16015,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16012: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16018: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16034,10 +16040,31 @@
+ EOF
+ 
+ 	fi
++	###   use option --enable-rgb-color to extend support for direct-color
++	echo "$as_me:16044: checking if you want to extend support for direct color" >&5
++echo $ECHO_N "checking if you want to extend support for direct color... $ECHO_C" >&6
++
++# Check whether --enable-ext-colors or --disable-ext-colors was given.
++if test "${enable_ext_colors+set}" = set; then
++  enableval="$enable_ext_colors"
++  with_rgb_color=$enableval
++else
++  with_rgb_color=$cf_dft_rgb_color
++fi;
++	echo "$as_me:16054: result: $with_rgb_color" >&5
++echo "${ECHO_T}$with_rgb_color" >&6
++	if test "x$with_rgb_color" = xyes ; then
++		NCURSES_RGB_COLORS=1
++
++cat >>confdefs.h <<\EOF
++#define NCURSES_RGB_COLORS 1
++EOF
++
++	fi
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:16040: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:16067: 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.
+@@ -16047,7 +16074,7 @@
+ else
+   with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:16050: result: $with_ext_mouse" >&5
++echo "$as_me:16077: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ if test "x$with_ext_mouse" = xyes ; then
+ 
+@@ -16057,7 +16084,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16060: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16087: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16074,7 +16101,7 @@
+ fi
+ 
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:16077: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:16104: 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.
+@@ -16084,7 +16111,7 @@
+ else
+   with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:16087: result: $with_ext_putwin" >&5
++echo "$as_me:16114: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+ 
+@@ -16094,7 +16121,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16097: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:16124: 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.
+@@ -16104,7 +16131,7 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:16107: result: $with_no_padding" >&5
++echo "$as_me:16134: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16112,7 +16139,7 @@
+ EOF
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:16115: checking if you want SIGWINCH handler" >&5
++echo "$as_me:16142: 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.
+@@ -16122,7 +16149,7 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:16125: result: $with_sigwinch" >&5
++echo "$as_me:16152: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ if test "x$with_sigwinch" = xyes
+ then
+@@ -16137,7 +16164,7 @@
+ fi
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:16140: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:16167: 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.
+@@ -16147,7 +16174,7 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:16150: result: $with_tcap_names" >&5
++echo "$as_me:16177: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ if test "x$with_tcap_names" = xyes; then
+@@ -16161,7 +16188,7 @@
+ 
+ ##############################################################################
+ 
+-echo "$as_me:16164: checking if you want to link with the pthread library" >&5
++echo "$as_me:16191: 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.
+@@ -16171,27 +16198,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:16174: result: $with_pthread" >&5
++echo "$as_me:16201: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:16178: checking for pthread.h" >&5
++	echo "$as_me:16205: 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 16184 "configure"
++#line 16211 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16188: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16215: \"$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:16194: \$? = $ac_status" >&5
++  echo "$as_me:16221: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16210,7 +16237,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16213: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:16240: 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
+ 
+@@ -16220,7 +16247,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:16223: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:16250: 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"
+ 
+@@ -16241,7 +16268,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16244 "configure"
++#line 16271 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16258,16 +16285,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16261: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16288: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16264: \$? = $ac_status" >&5
++  echo "$as_me:16291: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16267: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16294: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16270: \$? = $ac_status" >&5
++  echo "$as_me:16297: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -16277,7 +16304,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:16280: result: $with_pthread" >&5
++	    echo "$as_me:16307: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -16305,7 +16332,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:16308: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:16335: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -16315,13 +16342,13 @@
+ fi
+ 
+ if test "x$with_pthread" != xno; then
+-	echo "$as_me:16318: checking for pthread_kill" >&5
++	echo "$as_me:16345: 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 16324 "configure"
++#line 16351 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16352,16 +16379,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16355: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16382: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16358: \$? = $ac_status" >&5
++  echo "$as_me:16385: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16361: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16388: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16364: \$? = $ac_status" >&5
++  echo "$as_me:16391: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_pthread_kill=yes
+ else
+@@ -16371,11 +16398,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16374: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:16401: 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:16378: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:16405: 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.
+@@ -16385,7 +16412,7 @@
+ else
+   use_pthreads_eintr=no
+ fi;
+-		echo "$as_me:16388: result: $use_pthreads_eintr" >&5
++		echo "$as_me:16415: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ 		if test "x$use_pthreads_eintr" = xyes ; then
+ 
+@@ -16396,7 +16423,7 @@
+ 		fi
+ fi
+ 
+-	echo "$as_me:16399: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:16426: 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.
+@@ -16406,18 +16433,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-	echo "$as_me:16409: result: $use_weak_symbols" >&5
++	echo "$as_me:16436: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ 	if test "x$use_weak_symbols" = xyes ; then
+ 
+-echo "$as_me:16413: checking if $CC supports weak symbols" >&5
++echo "$as_me:16440: 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 16420 "configure"
++#line 16447 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16443,16 +16470,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16446: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16473: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16449: \$? = $ac_status" >&5
++  echo "$as_me:16476: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16452: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16479: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16455: \$? = $ac_status" >&5
++  echo "$as_me:16482: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -16463,7 +16490,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16466: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:16493: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ 	else
+@@ -16513,7 +16540,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:16516: checking if you want reentrant code" >&5
++echo "$as_me:16543: 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.
+@@ -16523,7 +16550,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:16526: result: $with_reentrant" >&5
++echo "$as_me:16553: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -16612,7 +16639,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16615: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16642: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16624,7 +16651,7 @@
+ 	NCURSES_SIZE_T=$cf_dft_ordinate_type
+ fi
+ 
+-echo "$as_me:16627: checking whether curses library structures should be opaque" >&5
++echo "$as_me:16654: checking whether curses library structures should be opaque" >&5
+ echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
+@@ -16646,16 +16673,16 @@
+ 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16649: result: $enable_opaque_curses" >&5
++echo "$as_me:16676: 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:16654: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:16681: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:16658: checking whether form library structures should be opaque" >&5
++echo "$as_me:16685: checking whether form library structures should be opaque" >&5
+ echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-form or --disable-opaque-form was given.
+@@ -16672,10 +16699,10 @@
+ 	enable_opaque_form=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16675: result: $enable_opaque_form" >&5
++echo "$as_me:16702: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+ 
+-echo "$as_me:16678: checking whether menu library structures should be opaque" >&5
++echo "$as_me:16705: checking whether menu library structures should be opaque" >&5
+ echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
+@@ -16692,10 +16719,10 @@
+ 	enable_opaque_menu=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16695: result: $enable_opaque_menu" >&5
++echo "$as_me:16722: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+ 
+-echo "$as_me:16698: checking whether panel library structures should be opaque" >&5
++echo "$as_me:16725: checking whether panel library structures should be opaque" >&5
+ echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
+@@ -16712,7 +16739,7 @@
+ 	enable_opaque_panel=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16715: result: $enable_opaque_panel" >&5
++echo "$as_me:16742: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+ 
+ NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -16722,7 +16749,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:16725: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:16752: 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.
+@@ -16732,7 +16759,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:16735: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:16762: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -16745,7 +16772,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:16748: checking if you want all development code" >&5
++echo "$as_me:16775: 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.
+@@ -16755,11 +16782,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:16758: result: $with_develop" >&5
++echo "$as_me:16785: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###   use option --enable-check-size to detect screensize with CPR
+-echo "$as_me:16762: checking if you want to check screensize of serial terminals" >&5
++echo "$as_me:16789: checking if you want to check screensize of serial terminals" >&5
+ echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
+ 
+ # Check whether --enable-check-size or --disable-check-size was given.
+@@ -16769,7 +16796,7 @@
+ else
+   enable_check_size=$with_develop
+ fi;
+-echo "$as_me:16772: result: $enable_check_size" >&5
++echo "$as_me:16799: result: $enable_check_size" >&5
+ echo "${ECHO_T}$enable_check_size" >&6
+ test "x$enable_check_size" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16777,7 +16804,7 @@
+ EOF
+ 
+ ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
+-echo "$as_me:16780: checking if you want hard-tabs code" >&5
++echo "$as_me:16807: 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.
+@@ -16787,7 +16814,7 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:16790: result: $enable_hard_tabs" >&5
++echo "$as_me:16817: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16795,7 +16822,7 @@
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:16798: checking if you want limited support for xmc" >&5
++echo "$as_me:16825: 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.
+@@ -16805,7 +16832,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:16808: result: $enable_xmc_glitch" >&5
++echo "$as_me:16835: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16815,7 +16842,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:16818: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:16845: 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.
+@@ -16825,7 +16852,7 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:16828: result: $with_assumed_color" >&5
++echo "$as_me:16855: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16833,7 +16860,7 @@
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:16836: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:16863: 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.
+@@ -16843,7 +16870,7 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:16846: result: $with_hashmap" >&5
++echo "$as_me:16873: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16851,7 +16878,7 @@
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:16854: checking if you want colorfgbg code" >&5
++echo "$as_me:16881: 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.
+@@ -16861,7 +16888,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:16864: result: $with_colorfgbg" >&5
++echo "$as_me:16891: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16869,7 +16896,7 @@
+ EOF
+ 
+ ###   use option --enable-fvisibility to turn on use of gcc-specific feature
+-echo "$as_me:16872: checking if you want to use gcc -fvisibility option" >&5
++echo "$as_me:16899: 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.
+@@ -16879,14 +16906,14 @@
+ else
+   cf_with_fvisibility=no
+ fi;
+-echo "$as_me:16882: result: $cf_with_fvisibility" >&5
++echo "$as_me:16909: 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:16889: checking if $CC -fvisibility=hidden option works" >&5
++echo "$as_me:16916: 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
+@@ -16895,7 +16922,7 @@
+     cf_save_cflags="$CFLAGS"
+     CFLAGS="$CFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16898 "configure"
++#line 16925 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16911,16 +16938,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16914: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16941: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16917: \$? = $ac_status" >&5
++  echo "$as_me:16944: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16920: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16947: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16923: \$? = $ac_status" >&5
++  echo "$as_me:16950: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden=yes
+ else
+@@ -16932,7 +16959,7 @@
+     CFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16935: result: $cf_cv_fvisibility_hidden" >&5
++echo "$as_me:16962: result: $cf_cv_fvisibility_hidden" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
+ 
+ 	if test "x$cf_cv_fvisibility_hidden" = xyes
+@@ -17047,7 +17074,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:17050: checking if $CXX -fvisibility=hidden option works" >&5
++echo "$as_me:17077: 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
+@@ -17056,7 +17083,7 @@
+     cf_save_cflags="$CXXFLAGS"
+     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17059 "configure"
++#line 17086 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -17072,16 +17099,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17075: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17102: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17078: \$? = $ac_status" >&5
++  echo "$as_me:17105: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17081: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17108: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17084: \$? = $ac_status" >&5
++  echo "$as_me:17111: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden2=yes
+ else
+@@ -17093,7 +17120,7 @@
+     CXXFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:17096: result: $cf_cv_fvisibility_hidden2" >&5
++echo "$as_me:17123: result: $cf_cv_fvisibility_hidden2" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
+ 
+ 		if test "x$cf_cv_fvisibility_hidden2" = xyes
+@@ -17216,7 +17243,7 @@
+ fi
+ 
+ ###   use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:17219: checking if you want interop bindings" >&5
++echo "$as_me:17246: 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.
+@@ -17226,13 +17253,13 @@
+ else
+   with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:17229: result: $with_exp_interop" >&5
++echo "$as_me:17256: 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:17235: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:17262: 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.
+@@ -17242,13 +17269,13 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:17245: result: $with_safe_sprintf" >&5
++echo "$as_me:17272: 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:17251: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:17278: 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.
+@@ -17258,7 +17285,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:17261: result: $with_scroll_hints" >&5
++echo "$as_me:17288: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -17267,7 +17294,12 @@
+ 
+ fi
+ 
+-echo "$as_me:17270: checking if you want wgetch-events code" >&5
++case x$cf_cv_abi_default in
++(x[789])
++	NCURSES_WGETCH_EVENTS=0
++	;;
++(*)
++echo "$as_me:17302: 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.
+@@ -17277,7 +17309,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:17280: result: $with_wgetch_events" >&5
++echo "$as_me:17312: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ if test "x$with_wgetch_events" = xyes ; then
+ 
+@@ -17289,10 +17321,11 @@
+ else
+ 	NCURSES_WGETCH_EVENTS=0
+ fi
++esac
+ 
+ case "$cf_cv_system_name" in
+ (*mingw32*|*mingw64*|*-msvc*)
+-	echo "$as_me:17295: checking if you want experimental-Windows driver" >&5
++	echo "$as_me:17328: 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.
+@@ -17302,7 +17335,7 @@
+ else
+   with_exp_win32=no
+ fi;
+-	echo "$as_me:17305: result: $with_exp_win32" >&5
++	echo "$as_me:17338: result: $with_exp_win32" >&5
+ echo "${ECHO_T}$with_exp_win32" >&6
+ 	if test "x$with_exp_win32" = xyes
+ 	then
+@@ -17328,7 +17361,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:17331: checking if you want to see long compiling messages" >&5
++echo "$as_me:17364: 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.
+@@ -17362,7 +17395,7 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:17365: result: $enableval" >&5
++echo "$as_me:17398: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ if test "x$enable_echo" = xyes; then
+@@ -17375,7 +17408,7 @@
+ 
+ # --disable-stripping is used for debugging
+ 
+-echo "$as_me:17378: checking if you want to install stripped executables" >&5
++echo "$as_me:17411: 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.
+@@ -17392,7 +17425,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:17395: result: $enable_stripping" >&5
++echo "$as_me:17428: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -17403,7 +17436,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:17406: checking if install accepts -p option" >&5
++echo "$as_me:17439: 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
+@@ -17434,10 +17467,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:17437: result: $cf_cv_install_p" >&5
++echo "$as_me:17470: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:17440: checking if install needs to be told about ownership" >&5
++echo "$as_me:17473: 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)
+@@ -17448,7 +17481,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17451: result: $with_install_o" >&5
++echo "$as_me:17484: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -17459,7 +17492,7 @@
+ 
+ if test -n "$INSTALL_OPT_S"
+ then
+-	echo "$as_me:17462: checking if you want to specify strip-program" >&5
++	echo "$as_me:17495: checking if you want to specify strip-program" >&5
+ echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
+ 
+ # Check whether --with-strip-program or --without-strip-program was given.
+@@ -17469,11 +17502,11 @@
+ else
+   with_strip_program=no
+ fi;
+-	echo "$as_me:17472: result: $with_strip_program" >&5
++	echo "$as_me:17505: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ 	if test "$with_strip_program" != no
+ 	then
+-		echo "$as_me:17476: checking if strip-program is supported with this installer" >&5
++		echo "$as_me:17509: checking if strip-program is supported with this installer" >&5
+ echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
+ 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
+ 		check_install_strip=no
+@@ -17494,11 +17527,11 @@
+ 				done
+ 			fi
+ 		fi
+-		echo "$as_me:17497: result: $check_install_strip" >&5
++		echo "$as_me:17530: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ 		case "$check_install_strip" in
+ 		(no)
+-			{ echo "$as_me:17501: WARNING: $cf_install_program does not support strip program option" >&5
++			{ echo "$as_me:17534: WARNING: $cf_install_program does not support strip program option" >&5
+ echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
+ 			with_strip_program=no
+ 			;;
+@@ -17513,7 +17546,7 @@
+ 			chmod +x "$INSTALL"
+ 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
+ 
+-echo "${as_me:-configure}:17516: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:17549: testing created $INSTALL ..." 1>&5
+ 
+ 			;;
+ 		(option)
+@@ -17539,7 +17572,7 @@
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+ 
+-echo "$as_me:17542: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:17575: 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.
+@@ -17556,17 +17589,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:17559: result: $enable_stdnoreturn" >&5
++echo "$as_me:17592: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:17563: checking for C11 _Noreturn feature" >&5
++echo "$as_me:17596: 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 17569 "configure"
++#line 17602 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17582,16 +17615,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17585: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17618: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17588: \$? = $ac_status" >&5
++  echo "$as_me:17621: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17591: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17624: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17594: \$? = $ac_status" >&5
++  echo "$as_me:17627: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -17602,7 +17635,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17605: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:17638: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -17658,16 +17691,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17661: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17694: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17666: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17699: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17670: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17703: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17706,16 +17739,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17709: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17742: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17714: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17747: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17718: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17751: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17754,23 +17787,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17757: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17790: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17762: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17795: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17766: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17799: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:17773: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:17806: 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.
+@@ -17787,7 +17820,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:17790: result: $enable_warnings" >&5
++echo "$as_me:17823: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -17811,7 +17844,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17814 "configure"
++#line 17847 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17826,26 +17859,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17829: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17862: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17832: \$? = $ac_status" >&5
++  echo "$as_me:17865: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17835: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17868: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17838: \$? = $ac_status" >&5
++  echo "$as_me:17871: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:17841: checking for X11/Xt const-feature" >&5
++echo "$as_me:17874: 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 17848 "configure"
++#line 17881 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -17863,16 +17896,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17866: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17899: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17869: \$? = $ac_status" >&5
++  echo "$as_me:17902: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17872: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17905: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17875: \$? = $ac_status" >&5
++  echo "$as_me:17908: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -17887,7 +17920,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17890: result: $cf_cv_const_x_string" >&5
++echo "$as_me:17923: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -17916,7 +17949,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:17968: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -17948,12 +17981,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17951: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17984: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17954: \$? = $ac_status" >&5
++  echo "$as_me:17987: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17956: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17989: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -17961,7 +17994,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:17964: checking for $CC warning options..." >&5
++	{ echo "$as_me:17997: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -17984,12 +18017,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:17987: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18020: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17990: \$? = $ac_status" >&5
++  echo "$as_me:18023: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17992: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18025: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -17997,7 +18030,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:18000: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:18033: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -18007,7 +18040,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:18010: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:18043: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -18040,10 +18073,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:18043: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:18076: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -18093,12 +18126,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:18096: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18129: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18099: \$? = $ac_status" >&5
++  echo "$as_me:18132: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18101: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:18134: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -18170,12 +18203,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:18173: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:18206: 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 18178 "configure"
++#line 18211 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18192,16 +18225,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18195: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18228: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18198: \$? = $ac_status" >&5
++  echo "$as_me:18231: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18201: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18234: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18204: \$? = $ac_status" >&5
++  echo "$as_me:18237: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -18212,7 +18245,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:18215: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:18248: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -18221,11 +18254,11 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:18224: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:18257: 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 18228 "configure"
++#line 18261 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18242,16 +18275,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18245: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18278: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18248: \$? = $ac_status" >&5
++  echo "$as_me:18281: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18251: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18284: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18254: \$? = $ac_status" >&5
++  echo "$as_me:18287: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_CPLUSPLUS=yes
+ 
+@@ -18261,7 +18294,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:18264: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:18297: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -18270,30 +18303,30 @@
+ if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:18273: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:18306: 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:18280: checking version of $CC" >&5
++	echo "$as_me:18313: 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:18284: result: $CLANG_VERSION" >&5
++	echo "$as_me:18317: 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:18291: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:18324: 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 18296 "configure"
++#line 18329 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -18307,16 +18340,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18310: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18343: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18313: \$? = $ac_status" >&5
++  echo "$as_me:18346: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18316: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18349: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18319: \$? = $ac_status" >&5
++  echo "$as_me:18352: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -18327,13 +18360,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:18330: result: $cf_clang_optok" >&5
++		echo "$as_me:18363: 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}:18336: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:18369: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -18350,7 +18383,7 @@
+ ac_main_return="return"
+ 
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:18404: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -18385,12 +18418,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:18388: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18421: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18391: \$? = $ac_status" >&5
++  echo "$as_me:18424: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18393: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18426: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -18399,7 +18432,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:18402: checking for $CXX warning options..." >&5
++	{ echo "$as_me:18435: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -18429,16 +18462,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:18432: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18465: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18435: \$? = $ac_status" >&5
++  echo "$as_me:18468: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18437: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18470: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:18441: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18474: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -18456,7 +18489,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:18459: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:18492: 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.
+@@ -18466,7 +18499,7 @@
+ else
+   enable_string_hacks=no
+ fi;
+-echo "$as_me:18469: result: $enable_string_hacks" >&5
++echo "$as_me:18502: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+ 
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -18475,15 +18508,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:18478: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:18511: 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:18480: checking for strlcat" >&5
++	echo "$as_me:18513: 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 18486 "configure"
++#line 18519 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18514,16 +18547,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18517: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18550: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18520: \$? = $ac_status" >&5
++  echo "$as_me:18553: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18523: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18556: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18526: \$? = $ac_status" >&5
++  echo "$as_me:18559: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -18533,7 +18566,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18536: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:18569: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+ 
+@@ -18543,7 +18576,7 @@
+ 
+ else
+ 
+-		echo "$as_me:18546: checking for strlcat in -lbsd" >&5
++		echo "$as_me:18579: 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
+@@ -18551,7 +18584,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18554 "configure"
++#line 18587 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18570,16 +18603,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18573: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18606: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18576: \$? = $ac_status" >&5
++  echo "$as_me:18609: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18579: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18612: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18582: \$? = $ac_status" >&5
++  echo "$as_me:18615: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -18590,7 +18623,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18593: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:18626: 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
+ 
+@@ -18613,23 +18646,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18616: checking for $ac_header" >&5
++echo "$as_me:18649: 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 18622 "configure"
++#line 18655 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18626: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18659: \"$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:18632: \$? = $ac_status" >&5
++  echo "$as_me:18665: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18648,7 +18681,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18651: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18684: 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:18705: 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 18678 "configure"
++#line 18711 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18706,16 +18739,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18709: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18742: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18712: \$? = $ac_status" >&5
++  echo "$as_me:18745: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18715: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18748: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18718: \$? = $ac_status" >&5
++  echo "$as_me:18751: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -18725,7 +18758,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18728: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:18761: 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:18774: 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.
+@@ -18748,7 +18781,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:18751: result: $with_assertions" >&5
++echo "$as_me:18784: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -18764,7 +18797,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:18767: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:18800: 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.
+@@ -18786,7 +18819,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:18789: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:18822: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18900,23 +18933,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:18903: checking for dmalloc.h" >&5
++	echo "$as_me:18936: 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 18909 "configure"
++#line 18942 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:18913: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18946: \"$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:18919: \$? = $ac_status" >&5
++  echo "$as_me:18952: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18935,11 +18968,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18938: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:18971: 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:18942: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:18975: 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
+@@ -18947,7 +18980,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18950 "configure"
++#line 18983 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18966,16 +18999,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18969: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19002: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18972: \$? = $ac_status" >&5
++  echo "$as_me:19005: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18975: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19008: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18978: \$? = $ac_status" >&5
++  echo "$as_me:19011: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -18986,7 +19019,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18989: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:19022: 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:19037: 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.
+@@ -19023,7 +19056,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:19026: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:19059: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19137,23 +19170,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:19140: checking for dbmalloc.h" >&5
++	echo "$as_me:19173: 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 19146 "configure"
++#line 19179 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:19150: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:19183: \"$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:19156: \$? = $ac_status" >&5
++  echo "$as_me:19189: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19172,11 +19205,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:19175: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:19208: 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:19179: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:19212: 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
+@@ -19184,7 +19217,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19187 "configure"
++#line 19220 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19203,16 +19236,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19206: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19239: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19209: \$? = $ac_status" >&5
++  echo "$as_me:19242: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19212: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19245: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19215: \$? = $ac_status" >&5
++  echo "$as_me:19248: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -19223,7 +19256,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19226: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:19259: 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:19274: 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.
+@@ -19260,7 +19293,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:19263: result: ${with_valgrind:-no}" >&5
++echo "$as_me:19296: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19373,7 +19406,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19376: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:19409: 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.
+@@ -19384,7 +19417,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:19387: result: $with_no_leaks" >&5
++echo "$as_me:19420: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -19436,7 +19469,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19439: checking whether to add trace feature to all models" >&5
++echo "$as_me:19472: 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.
+@@ -19446,7 +19479,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:19449: result: $cf_with_trace" >&5
++echo "$as_me:19482: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -19466,7 +19499,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:19469: checking if we want to use GNAT projects" >&5
++echo "$as_me:19502: 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.
+@@ -19483,7 +19516,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:19486: result: $enable_gnat_projects" >&5
++echo "$as_me:19519: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -19496,14 +19529,14 @@
+ 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+ 	fi
+ 
+-echo "$as_me:19499: checking if ssp library is needed" >&5
++echo "$as_me:19532: 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 19506 "configure"
++#line 19539 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19520,16 +19553,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19523: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19556: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19526: \$? = $ac_status" >&5
++  echo "$as_me:19559: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19529: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19562: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19532: \$? = $ac_status" >&5
++  echo "$as_me:19565: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -19539,7 +19572,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19542 "configure"
++#line 19575 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19556,16 +19589,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19559: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19592: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19562: \$? = $ac_status" >&5
++  echo "$as_me:19595: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19565: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19598: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19568: \$? = $ac_status" >&5
++  echo "$as_me:19601: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -19579,7 +19612,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19582: result: $cf_cv_need_libssp" >&5
++echo "$as_me:19615: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -19608,14 +19641,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19611: checking if -lm needed for math functions" >&5
++echo "$as_me:19644: 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 19618 "configure"
++#line 19651 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19631,16 +19664,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19634: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19667: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19637: \$? = $ac_status" >&5
++  echo "$as_me:19670: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19640: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19673: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19643: \$? = $ac_status" >&5
++  echo "$as_me:19676: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -19650,7 +19683,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19653: result: $cf_cv_need_libm" >&5
++echo "$as_me:19686: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ 
+ if test "$cf_cv_need_libm" = yes
+@@ -19658,14 +19691,14 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lm"
+-	echo "$as_me:19661: checking if -lm is available for math functions" >&5
++	echo "$as_me:19694: checking if -lm is available for math functions" >&5
+ echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
+ if test "${cf_cv_have_libm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19668 "configure"
++#line 19701 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19681,16 +19714,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19684: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19717: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19687: \$? = $ac_status" >&5
++  echo "$as_me:19720: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19690: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19723: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19693: \$? = $ac_status" >&5
++  echo "$as_me:19726: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_libm=yes
+ else
+@@ -19700,7 +19733,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19703: result: $cf_cv_have_libm" >&5
++echo "$as_me:19736: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ 	LIBS="$cf_save_LIBS"
+ 
+@@ -19722,13 +19755,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:19725: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:19758: 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 19731 "configure"
++#line 19764 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -19744,16 +19777,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19747: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19780: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19750: \$? = $ac_status" >&5
++  echo "$as_me:19783: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19753: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19786: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19756: \$? = $ac_status" >&5
++  echo "$as_me:19789: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -19763,7 +19796,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19766: result: $ac_cv_header_time" >&5
++echo "$as_me:19799: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -19778,7 +19811,7 @@
+ case "$host_os" in
+ (mingw*)
+ 	# -lsystre -ltre -lintl -liconv
+-	echo "$as_me:19781: checking for regcomp in -lsystre" >&5
++	echo "$as_me:19814: 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
+@@ -19786,7 +19819,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsystre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19789 "configure"
++#line 19822 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19805,16 +19838,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19808: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19841: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19811: \$? = $ac_status" >&5
++  echo "$as_me:19844: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19814: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19847: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19817: \$? = $ac_status" >&5
++  echo "$as_me:19850: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_systre_regcomp=yes
+ else
+@@ -19825,11 +19858,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19828: result: $ac_cv_lib_systre_regcomp" >&5
++echo "$as_me:19861: 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:19832: checking for libiconv_open in -liconv" >&5
++		echo "$as_me:19865: 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
+@@ -19837,7 +19870,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19840 "configure"
++#line 19873 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19856,16 +19889,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19859: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19892: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19862: \$? = $ac_status" >&5
++  echo "$as_me:19895: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19865: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19898: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19868: \$? = $ac_status" >&5
++  echo "$as_me:19901: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_iconv_libiconv_open=yes
+ else
+@@ -19876,7 +19909,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19879: result: $ac_cv_lib_iconv_libiconv_open" >&5
++echo "$as_me:19912: 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
+ 
+@@ -19898,7 +19931,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19901: checking for libintl_gettext in -lintl" >&5
++		echo "$as_me:19934: 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
+@@ -19906,7 +19939,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19909 "configure"
++#line 19942 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19925,16 +19958,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19928: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19961: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19931: \$? = $ac_status" >&5
++  echo "$as_me:19964: \$? = $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:19967: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19937: \$? = $ac_status" >&5
++  echo "$as_me:19970: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_intl_libintl_gettext=yes
+ else
+@@ -19945,7 +19978,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_intl_libintl_gettext" >&5
++echo "$as_me:19981: 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
+ 
+@@ -19967,7 +20000,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19970: checking for tre_regcomp in -ltre" >&5
++		echo "$as_me:20003: 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
+@@ -19975,7 +20008,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19978 "configure"
++#line 20011 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19994,16 +20027,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19997: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20030: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20000: \$? = $ac_status" >&5
++  echo "$as_me:20033: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20003: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20036: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20006: \$? = $ac_status" >&5
++  echo "$as_me:20039: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_tre_tre_regcomp=yes
+ else
+@@ -20014,7 +20047,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20017: result: $ac_cv_lib_tre_tre_regcomp" >&5
++echo "$as_me:20050: 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
+ 
+@@ -20056,7 +20089,7 @@
+ 
+ else
+ 
+-		echo "$as_me:20059: checking for regcomp in -lgnurx" >&5
++		echo "$as_me:20092: 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
+@@ -20064,7 +20097,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgnurx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20067 "configure"
++#line 20100 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20083,16 +20116,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20086: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20119: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20089: \$? = $ac_status" >&5
++  echo "$as_me:20122: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20092: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20125: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20095: \$? = $ac_status" >&5
++  echo "$as_me:20128: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gnurx_regcomp=yes
+ else
+@@ -20103,7 +20136,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20106: result: $ac_cv_lib_gnurx_regcomp" >&5
++echo "$as_me:20139: 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
+ 
+@@ -20131,13 +20164,13 @@
+ 	;;
+ (*)
+ 	cf_regex_libs="regex re"
+-	echo "$as_me:20134: checking for regcomp" >&5
++	echo "$as_me:20167: 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 20140 "configure"
++#line 20173 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20168,16 +20201,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20171: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20204: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20174: \$? = $ac_status" >&5
++  echo "$as_me:20207: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20177: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20210: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20180: \$? = $ac_status" >&5
++  echo "$as_me:20213: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -20187,7 +20220,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20190: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:20223: 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
+@@ -20196,7 +20229,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:20199: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:20232: 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
+@@ -20204,7 +20237,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20207 "configure"
++#line 20240 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20223,16 +20256,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20226: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20259: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20229: \$? = $ac_status" >&5
++  echo "$as_me:20262: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20232: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20265: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20235: \$? = $ac_status" >&5
++  echo "$as_me:20268: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -20243,7 +20276,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20246: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:20279: 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
+ 
+@@ -20275,13 +20308,13 @@
+ esac
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:20278: checking for compile" >&5
++	echo "$as_me:20311: 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 20284 "configure"
++#line 20317 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20312,16 +20345,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20315: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20348: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20318: \$? = $ac_status" >&5
++  echo "$as_me:20351: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20321: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20354: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20324: \$? = $ac_status" >&5
++  echo "$as_me:20357: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -20331,13 +20364,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20334: result: $ac_cv_func_compile" >&5
++echo "$as_me:20367: 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:20340: checking for compile in -lgen" >&5
++		echo "$as_me:20373: 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
+@@ -20345,7 +20378,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20348 "configure"
++#line 20381 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20364,16 +20397,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20367: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20400: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20370: \$? = $ac_status" >&5
++  echo "$as_me:20403: \$? = $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:20406: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20376: \$? = $ac_status" >&5
++  echo "$as_me:20409: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -20384,7 +20417,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20387: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:20420: 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
+ 
+@@ -20412,11 +20445,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:20415: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:20448: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:20419: checking for regular-expression headers" >&5
++echo "$as_me:20452: 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
+@@ -20428,7 +20461,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20431 "configure"
++#line 20464 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -20445,16 +20478,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20448: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20481: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20451: \$? = $ac_status" >&5
++  echo "$as_me:20484: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20454: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20487: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20457: \$? = $ac_status" >&5
++  echo "$as_me:20490: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20471,7 +20504,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20474 "configure"
++#line 20507 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -20492,16 +20525,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20495: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20528: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20498: \$? = $ac_status" >&5
++  echo "$as_me:20531: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20501: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20534: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20504: \$? = $ac_status" >&5
++  echo "$as_me:20537: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20517,11 +20550,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:20520: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:20553: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case "$cf_cv_regex_hdrs" in
+-	(no)		{ echo "$as_me:20524: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:20557: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -20561,23 +20594,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20564: checking for $ac_header" >&5
++echo "$as_me:20597: 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 20570 "configure"
++#line 20603 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20574: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20607: \"$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:20580: \$? = $ac_status" >&5
++  echo "$as_me:20613: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20596,7 +20629,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20599: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20632: 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:20645: 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 20618 "configure"
++#line 20651 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20622: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20655: \"$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:20628: \$? = $ac_status" >&5
++  echo "$as_me:20661: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20644,7 +20677,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20647: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20680: 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:20690: 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
+@@ -20664,7 +20697,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20667 "configure"
++#line 20700 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20677,16 +20710,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20680: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20713: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20683: \$? = $ac_status" >&5
++  echo "$as_me:20716: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20686: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20719: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20689: \$? = $ac_status" >&5
++  echo "$as_me:20722: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -20698,7 +20731,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20701: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20734: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -20715,14 +20748,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20718: checking if external environ is declared" >&5
++echo "$as_me:20751: 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 20725 "configure"
++#line 20758 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -20735,16 +20768,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20738: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20771: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20741: \$? = $ac_status" >&5
++  echo "$as_me:20774: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20744: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20777: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20747: \$? = $ac_status" >&5
++  echo "$as_me:20780: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_environ=yes
+ else
+@@ -20755,7 +20788,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20758: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20791: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+ 
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20770,14 +20803,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:20773: checking if external environ exists" >&5
++echo "$as_me:20806: 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 20780 "configure"
++#line 20813 "configure"
+ #include "confdefs.h"
+ 
+ #undef environ
+@@ -20792,16 +20825,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20795: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20828: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20798: \$? = $ac_status" >&5
++  echo "$as_me:20831: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20801: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20834: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20804: \$? = $ac_status" >&5
++  echo "$as_me:20837: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_environ=yes
+ else
+@@ -20812,7 +20845,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20815: result: $cf_cv_have_environ" >&5
++echo "$as_me:20848: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+ 
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20825,13 +20858,13 @@
+ 
+ fi
+ 
+-echo "$as_me:20828: checking for getenv" >&5
++echo "$as_me:20861: 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 20834 "configure"
++#line 20867 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20862,16 +20895,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20865: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20898: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20868: \$? = $ac_status" >&5
++  echo "$as_me:20901: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20871: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20904: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20874: \$? = $ac_status" >&5
++  echo "$as_me:20907: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_getenv=yes
+ else
+@@ -20881,19 +20914,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20884: result: $ac_cv_func_getenv" >&5
++echo "$as_me:20917: 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:20890: checking for $ac_func" >&5
++echo "$as_me:20923: 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 20896 "configure"
++#line 20929 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20924,16 +20957,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20927: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20960: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20930: \$? = $ac_status" >&5
++  echo "$as_me:20963: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20933: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20966: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20936: \$? = $ac_status" >&5
++  echo "$as_me:20969: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -20943,7 +20976,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20946: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:20979: 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:20989: 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
+@@ -20963,7 +20996,7 @@
+   cf_cv_consistent_getenv=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20966 "configure"
++#line 20999 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21068,15 +21101,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21071: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21104: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21074: \$? = $ac_status" >&5
++  echo "$as_me:21107: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21076: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21109: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21079: \$? = $ac_status" >&5
++  echo "$as_me:21112: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_consistent_getenv=yes
+ else
+@@ -21089,7 +21122,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:21092: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:21125: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+ 
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -21104,18 +21137,18 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ 	test "x$cf_with_trace" = xyes
+ then
+-	{ echo "$as_me:21107: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++	{ echo "$as_me:21140: 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:21111: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:21144: 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 21118 "configure"
++#line 21151 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21135,16 +21168,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21138: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21171: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21141: \$? = $ac_status" >&5
++  echo "$as_me:21174: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21144: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21177: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21147: \$? = $ac_status" >&5
++  echo "$as_me:21180: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -21156,7 +21189,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21159: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:21192: 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
+@@ -21171,13 +21204,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:21174: checking for an ANSI C-conforming const" >&5
++echo "$as_me:21207: 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 21180 "configure"
++#line 21213 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21239,16 +21272,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21242: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21275: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21245: \$? = $ac_status" >&5
++  echo "$as_me:21278: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21248: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21281: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21251: \$? = $ac_status" >&5
++  echo "$as_me:21284: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -21258,7 +21291,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21261: result: $ac_cv_c_const" >&5
++echo "$as_me:21294: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -21268,7 +21301,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21271: checking for inline" >&5
++echo "$as_me:21304: 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
+@@ -21276,7 +21309,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21279 "configure"
++#line 21312 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo (void) {return 0; }
+@@ -21285,16 +21318,16 @@
+ 
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21288: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21321: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21291: \$? = $ac_status" >&5
++  echo "$as_me:21324: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21294: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21327: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21297: \$? = $ac_status" >&5
++  echo "$as_me:21330: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -21305,7 +21338,7 @@
+ done
+ 
+ fi
+-echo "$as_me:21308: result: $ac_cv_c_inline" >&5
++echo "$as_me:21341: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -21331,7 +21364,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:21334: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:21367: 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
+@@ -21340,7 +21373,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21343 "configure"
++#line 21376 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -21352,16 +21385,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21355: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21388: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21358: \$? = $ac_status" >&5
++  echo "$as_me:21391: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21361: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21394: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21364: \$? = $ac_status" >&5
++  echo "$as_me:21397: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -21373,7 +21406,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:21376: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:21409: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -21479,7 +21512,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:21482: checking for signal global datatype" >&5
++echo "$as_me:21515: 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
+@@ -21491,7 +21524,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21494 "configure"
++#line 21527 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21515,16 +21548,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21518: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21551: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21521: \$? = $ac_status" >&5
++  echo "$as_me:21554: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21524: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21557: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21527: \$? = $ac_status" >&5
++  echo "$as_me:21560: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21538,7 +21571,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21541: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21574: 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:21583: 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
+@@ -21557,7 +21590,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21560 "configure"
++#line 21593 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21592,15 +21625,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21595: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21628: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21598: \$? = $ac_status" >&5
++  echo "$as_me:21631: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21600: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21633: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21603: \$? = $ac_status" >&5
++  echo "$as_me:21636: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21615,7 +21648,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21618: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21651: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:21663: 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 21637 "configure"
++#line 21670 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21646,16 +21679,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21649: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21682: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21652: \$? = $ac_status" >&5
++  echo "$as_me:21685: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21655: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21688: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21658: \$? = $ac_status" >&5
++  echo "$as_me:21691: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -21667,7 +21700,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21670: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21703: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -21683,14 +21716,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:21686: checking if external errno is declared" >&5
++echo "$as_me:21719: 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 21693 "configure"
++#line 21726 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21704,16 +21737,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21707: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21740: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21710: \$? = $ac_status" >&5
++  echo "$as_me:21743: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21713: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21746: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21716: \$? = $ac_status" >&5
++  echo "$as_me:21749: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -21724,7 +21757,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21727: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21760: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21739,14 +21772,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:21742: checking if external errno exists" >&5
++echo "$as_me:21775: 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 21749 "configure"
++#line 21782 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -21761,16 +21794,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21764: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21797: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21767: \$? = $ac_status" >&5
++  echo "$as_me:21800: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21770: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21803: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21773: \$? = $ac_status" >&5
++  echo "$as_me:21806: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -21781,7 +21814,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21784: result: $cf_cv_have_errno" >&5
++echo "$as_me:21817: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21794,7 +21827,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21797: checking if data-only library module links" >&5
++echo "$as_me:21830: 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
+@@ -21802,20 +21835,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:21841: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21811: \$? = $ac_status" >&5
++  echo "$as_me:21844: \$? = $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:21868: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21838: \$? = $ac_status" >&5
++  echo "$as_me:21871: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -21848,7 +21881,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21851 "configure"
++#line 21884 "configure"
+ #include "confdefs.h"
+ 
+ 	extern int testfunc(void);
+@@ -21859,15 +21892,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21862: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21895: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21865: \$? = $ac_status" >&5
++  echo "$as_me:21898: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21867: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21900: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21870: \$? = $ac_status" >&5
++  echo "$as_me:21903: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -21882,7 +21915,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21885: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21918: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21897,13 +21930,13 @@
+ ###	Checks for library functions.
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:21900: checking for clock_gettime" >&5
++echo "$as_me:21933: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21906 "configure"
++#line 21939 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21934,16 +21967,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21937: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21970: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21940: \$? = $ac_status" >&5
++  echo "$as_me:21973: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21943: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21976: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21946: \$? = $ac_status" >&5
++  echo "$as_me:21979: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -21953,12 +21986,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21956: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:21989: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:21961: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:21994: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21966,7 +21999,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21969 "configure"
++#line 22002 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -21985,16 +22018,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21988: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22021: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21991: \$? = $ac_status" >&5
++  echo "$as_me:22024: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21994: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22027: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21997: \$? = $ac_status" >&5
++  echo "$as_me:22030: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -22005,7 +22038,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22008: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:22041: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -22017,14 +22050,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:22020: checking if clock_gettime links" >&5
++echo "$as_me:22053: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22027 "configure"
++#line 22060 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22042,16 +22075,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22045: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22078: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22048: \$? = $ac_status" >&5
++  echo "$as_me:22081: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22051: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22084: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22054: \$? = $ac_status" >&5
++  echo "$as_me:22087: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -22062,7 +22095,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22065: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:22098: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -22076,13 +22109,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:22079: checking for gettimeofday" >&5
++echo "$as_me:22112: 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 22085 "configure"
++#line 22118 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22113,16 +22146,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22116: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22149: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22119: \$? = $ac_status" >&5
++  echo "$as_me:22152: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22122: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22155: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22125: \$? = $ac_status" >&5
++  echo "$as_me:22158: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -22132,7 +22165,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22135: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:22168: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -22142,7 +22175,7 @@
+ 
+ else
+ 
+-echo "$as_me:22145: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:22178: 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
+@@ -22150,7 +22183,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22153 "configure"
++#line 22186 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22169,16 +22202,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22172: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22205: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22175: \$? = $ac_status" >&5
++  echo "$as_me:22208: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22178: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22211: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22181: \$? = $ac_status" >&5
++  echo "$as_me:22214: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -22189,7 +22222,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22192: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:22225: 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
+ 
+@@ -22248,13 +22281,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:22251: checking for $ac_func" >&5
++echo "$as_me:22284: 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 22257 "configure"
++#line 22290 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22285,16 +22318,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22288: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22321: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22291: \$? = $ac_status" >&5
++  echo "$as_me:22324: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22294: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22327: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22297: \$? = $ac_status" >&5
++  echo "$as_me:22330: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -22304,7 +22337,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22307: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:22340: 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:22350: 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 22324 "configure"
++#line 22357 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22336,16 +22369,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22339: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22372: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22342: \$? = $ac_status" >&5
++  echo "$as_me:22375: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22345: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22378: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22348: \$? = $ac_status" >&5
++  echo "$as_me:22381: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_PATH_TTYS=yes
+ else
+@@ -22355,7 +22388,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22358: result: $cf_cv_PATH_TTYS" >&5
++echo "$as_me:22391: result: $cf_cv_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
+ 
+ if test $cf_cv_PATH_TTYS = no
+@@ -22377,7 +22410,7 @@
+ 
+ if test $cf_cv_PATH_TTYS != no
+ then
+-	echo "$as_me:22380: checking if _PATH_TTYS file exists" >&5
++	echo "$as_me:22413: 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
+@@ -22387,7 +22420,7 @@
+   cf_cv_have_PATH_TTYS=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22390 "configure"
++#line 22423 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22400,15 +22433,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22403: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22436: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22406: \$? = $ac_status" >&5
++  echo "$as_me:22439: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22408: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22441: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22411: \$? = $ac_status" >&5
++  echo "$as_me:22444: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_PATH_TTYS=yes
+ else
+@@ -22420,7 +22453,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22423: result: $cf_cv_have_PATH_TTYS" >&5
++echo "$as_me:22456: 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
+@@ -22432,14 +22465,14 @@
+ #define HAVE_PATH_TTYS 1
+ EOF
+ 
+-	echo "$as_me:22435: checking for getttynam" >&5
++	echo "$as_me:22468: 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 22442 "configure"
++#line 22475 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22451,16 +22484,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22454: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22487: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22457: \$? = $ac_status" >&5
++  echo "$as_me:22490: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22460: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22493: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22463: \$? = $ac_status" >&5
++  echo "$as_me:22496: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_getttynam=yes
+ else
+@@ -22470,7 +22503,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22473: result: $cf_cv_func_getttynam" >&5
++echo "$as_me:22506: 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
+@@ -22480,7 +22513,7 @@
+ 
+ if test "x$ac_cv_func_getopt" = xno && \
+    test "x$cf_with_progs$cf_with_tests" != xnono; then
+-	{ { echo "$as_me:22483: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:22516: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -22489,7 +22522,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:22492: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:22525: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -22502,14 +22535,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:22505: checking for terminal-capability database functions" >&5
++echo "$as_me:22538: 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 22512 "configure"
++#line 22545 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22529,16 +22562,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22532: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22565: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22535: \$? = $ac_status" >&5
++  echo "$as_me:22568: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22538: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22571: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22541: \$? = $ac_status" >&5
++  echo "$as_me:22574: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -22549,7 +22582,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22552: result: $cf_cv_cgetent" >&5
++echo "$as_me:22585: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -22559,14 +22592,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:22562: checking if cgetent uses const parameter" >&5
++echo "$as_me:22595: 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 22569 "configure"
++#line 22602 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -22589,16 +22622,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22592: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22625: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22595: \$? = $ac_status" >&5
++  echo "$as_me:22628: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22598: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22631: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22601: \$? = $ac_status" >&5
++  echo "$as_me:22634: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -22609,7 +22642,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22612: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:22645: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -22623,14 +22656,14 @@
+ 
+ fi
+ 
+-echo "$as_me:22626: checking for isascii" >&5
++echo "$as_me:22659: 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 22633 "configure"
++#line 22666 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22642,16 +22675,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22645: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22678: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22648: \$? = $ac_status" >&5
++  echo "$as_me:22681: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22651: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22684: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22654: \$? = $ac_status" >&5
++  echo "$as_me:22687: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -22662,7 +22695,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22665: result: $cf_cv_have_isascii" >&5
++echo "$as_me:22698: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -22670,10 +22703,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:22673: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:22706: 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 22676 "configure"
++#line 22709 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22687,16 +22720,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22690: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22723: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22693: \$? = $ac_status" >&5
++  echo "$as_me:22726: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22696: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22729: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22699: \$? = $ac_status" >&5
++  echo "$as_me:22732: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=no
+ else
+@@ -22704,7 +22737,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22707 "configure"
++#line 22740 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22719,16 +22752,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22722: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22755: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22725: \$? = $ac_status" >&5
++  echo "$as_me:22758: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22728: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22761: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22731: \$? = $ac_status" >&5
++  echo "$as_me:22764: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=yes
+ 
+@@ -22744,11 +22777,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:22747: result: $sigact_bad" >&5
++echo "$as_me:22780: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:22751: checking if nanosleep really works" >&5
++echo "$as_me:22784: 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
+@@ -22758,7 +22791,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22761 "configure"
++#line 22794 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22784,15 +22817,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22787: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22820: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22790: \$? = $ac_status" >&5
++  echo "$as_me:22823: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22792: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22825: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22795: \$? = $ac_status" >&5
++  echo "$as_me:22828: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -22804,7 +22837,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22807: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:22840: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -22821,23 +22854,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22824: checking for $ac_header" >&5
++echo "$as_me:22857: 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 22830 "configure"
++#line 22863 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22834: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22867: \"$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:22840: \$? = $ac_status" >&5
++  echo "$as_me:22873: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22856,7 +22889,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22859: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22892: 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:22909: 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 22879 "configure"
++#line 22912 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22888,16 +22921,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22891: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22924: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22894: \$? = $ac_status" >&5
++  echo "$as_me:22927: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22897: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22930: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22900: \$? = $ac_status" >&5
++  echo "$as_me:22933: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=no
+ else
+@@ -22905,7 +22938,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22908 "configure"
++#line 22941 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22919,16 +22952,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22922: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22955: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22925: \$? = $ac_status" >&5
++  echo "$as_me:22958: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22928: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22961: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22931: \$? = $ac_status" >&5
++  echo "$as_me:22964: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=unknown
+ else
+@@ -22944,19 +22977,19 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:22947: result: $termios_bad" >&5
++	echo "$as_me:22980: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:22952: checking for tcgetattr" >&5
++echo "$as_me:22985: 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 22959 "configure"
++#line 22992 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22984,16 +23017,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22987: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23020: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22990: \$? = $ac_status" >&5
++  echo "$as_me:23023: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22993: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23026: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22996: \$? = $ac_status" >&5
++  echo "$as_me:23029: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -23003,21 +23036,21 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23006: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:23039: 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:23013: checking for vsscanf function or workaround" >&5
++echo "$as_me:23046: 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 23020 "configure"
++#line 23053 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23043,16 +23076,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23046: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23079: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23049: \$? = $ac_status" >&5
++  echo "$as_me:23082: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23052: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23085: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23055: \$? = $ac_status" >&5
++  echo "$as_me:23088: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -23060,7 +23093,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23063 "configure"
++#line 23096 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23082,16 +23115,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23085: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23118: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23088: \$? = $ac_status" >&5
++  echo "$as_me:23121: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23091: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23124: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23094: \$? = $ac_status" >&5
++  echo "$as_me:23127: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -23099,7 +23132,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23102 "configure"
++#line 23135 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23121,16 +23154,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23124: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23157: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23127: \$? = $ac_status" >&5
++  echo "$as_me:23160: \$? = $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:23163: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23133: \$? = $ac_status" >&5
++  echo "$as_me:23166: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -23145,7 +23178,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23148: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:23181: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case "$cf_cv_func_vsscanf" in
+@@ -23171,23 +23204,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:23174: checking for $ac_header" >&5
++echo "$as_me:23207: 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 23180 "configure"
++#line 23213 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23184: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23217: \"$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:23190: \$? = $ac_status" >&5
++  echo "$as_me:23223: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23206,7 +23239,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23209: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23242: 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:23252: 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
+@@ -23227,7 +23260,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23230 "configure"
++#line 23263 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23262,15 +23295,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23265: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23298: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23268: \$? = $ac_status" >&5
++  echo "$as_me:23301: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23270: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23303: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23273: \$? = $ac_status" >&5
++  echo "$as_me:23306: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -23285,16 +23318,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:23288: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:23321: 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:23291: checking for mkstemp" >&5
++	echo "$as_me:23324: 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 23297 "configure"
++#line 23330 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23325,16 +23358,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23328: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23361: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23331: \$? = $ac_status" >&5
++  echo "$as_me:23364: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23334: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23367: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23337: \$? = $ac_status" >&5
++  echo "$as_me:23370: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -23344,7 +23377,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23347: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:23380: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -23365,21 +23398,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:23368: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:23401: 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:23371: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:23404: 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:23377: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:23410: 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 23382 "configure"
++#line 23415 "configure"
+ #include "confdefs.h"
+ #include 
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -23396,15 +23429,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23399: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23432: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23402: \$? = $ac_status" >&5
++  echo "$as_me:23435: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23404: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23437: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23407: \$? = $ac_status" >&5
++  echo "$as_me:23440: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -23417,7 +23450,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:23420: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:23453: 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
+ 
+@@ -23428,13 +23461,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:23431: checking for intptr_t" >&5
++echo "$as_me:23464: 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 23437 "configure"
++#line 23470 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23449,16 +23482,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23452: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23485: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23455: \$? = $ac_status" >&5
++  echo "$as_me:23488: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23458: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23491: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23461: \$? = $ac_status" >&5
++  echo "$as_me:23494: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -23468,7 +23501,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23471: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:23504: 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
+   :
+@@ -23480,13 +23513,13 @@
+ 
+ fi
+ 
+-echo "$as_me:23483: checking for ssize_t" >&5
++echo "$as_me:23516: 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 23489 "configure"
++#line 23522 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23501,16 +23534,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23504: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23537: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23507: \$? = $ac_status" >&5
++  echo "$as_me:23540: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23510: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23543: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23513: \$? = $ac_status" >&5
++  echo "$as_me:23546: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -23520,7 +23553,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23523: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:23556: 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
+   :
+@@ -23532,14 +23565,14 @@
+ 
+ fi
+ 
+-echo "$as_me:23535: checking for type sigaction_t" >&5
++echo "$as_me:23568: 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 23542 "configure"
++#line 23575 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23552,16 +23585,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23555: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23588: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23558: \$? = $ac_status" >&5
++  echo "$as_me:23591: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23561: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23594: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23564: \$? = $ac_status" >&5
++  echo "$as_me:23597: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -23572,14 +23605,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:23575: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:23608: 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:23582: checking declaration of size-change" >&5
++echo "$as_me:23615: 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
+@@ -23600,7 +23633,7 @@
+ 
+ 	fi
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23603 "configure"
++#line 23636 "configure"
+ #include "confdefs.h"
+ #include 
+ #ifdef HAVE_TERMIOS_H
+@@ -23650,16 +23683,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23653: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23686: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23656: \$? = $ac_status" >&5
++  echo "$as_me:23689: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23659: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23692: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23662: \$? = $ac_status" >&5
++  echo "$as_me:23695: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -23678,7 +23711,7 @@
+ done
+ 
+ fi
+-echo "$as_me:23681: result: $cf_cv_sizechange" >&5
++echo "$as_me:23714: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -23696,13 +23729,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:23699: checking for memmove" >&5
++echo "$as_me:23732: 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 23705 "configure"
++#line 23738 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23733,16 +23766,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23736: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23769: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23739: \$? = $ac_status" >&5
++  echo "$as_me:23772: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23742: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23775: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23745: \$? = $ac_status" >&5
++  echo "$as_me:23778: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -23752,19 +23785,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23755: result: $ac_cv_func_memmove" >&5
++echo "$as_me:23788: 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:23761: checking for bcopy" >&5
++echo "$as_me:23794: 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 23767 "configure"
++#line 23800 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23795,16 +23828,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23798: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23831: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23801: \$? = $ac_status" >&5
++  echo "$as_me:23834: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23804: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23837: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23807: \$? = $ac_status" >&5
++  echo "$as_me:23840: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -23814,11 +23847,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23817: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:23850: 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:23821: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:23854: 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
+@@ -23828,7 +23861,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23831 "configure"
++#line 23864 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23844,15 +23877,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23847: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23880: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23850: \$? = $ac_status" >&5
++  echo "$as_me:23883: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23852: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23885: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23855: \$? = $ac_status" >&5
++  echo "$as_me:23888: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -23865,7 +23898,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:23868: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:23901: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -23892,13 +23925,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23895: checking for $ac_func" >&5
++echo "$as_me:23928: 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 23901 "configure"
++#line 23934 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23929,16 +23962,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23932: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23965: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23935: \$? = $ac_status" >&5
++  echo "$as_me:23968: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23938: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23971: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23941: \$? = $ac_status" >&5
++  echo "$as_me:23974: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23948,7 +23981,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23951: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23984: 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:23994: 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
+@@ -23968,7 +24001,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23971 "configure"
++#line 24004 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24021,15 +24054,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24024: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24057: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24027: \$? = $ac_status" >&5
++  echo "$as_me:24060: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24029: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24062: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24032: \$? = $ac_status" >&5
++  echo "$as_me:24065: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -24041,21 +24074,21 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24044: result: $cf_cv_working_poll" >&5
++echo "$as_me:24077: 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:24051: checking if MB_LEN_MAX is usable" >&5
++echo "$as_me:24084: checking if MB_LEN_MAX is usable" >&5
+ echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
+ if test "${cf_cv_mb_len_max+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24058 "configure"
++#line 24091 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24075,16 +24108,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24078: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24111: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24081: \$? = $ac_status" >&5
++  echo "$as_me:24114: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24084: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24117: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24087: \$? = $ac_status" >&5
++  echo "$as_me:24120: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mb_len_max=yes
+ else
+@@ -24094,7 +24127,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24097: result: $cf_cv_mb_len_max" >&5
++echo "$as_me:24130: result: $cf_cv_mb_len_max" >&5
+ echo "${ECHO_T}$cf_cv_mb_len_max" >&6
+ if test "$cf_cv_mb_len_max" = yes
+ then
+@@ -24104,18 +24137,18 @@
+ EOF
+ 
+ else
+-	{ echo "$as_me:24107: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
++	{ echo "$as_me:24140: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+ echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
+ fi
+ 
+-echo "$as_me:24111: checking for va_copy" >&5
++echo "$as_me:24144: 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 24118 "configure"
++#line 24151 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24132,16 +24165,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24135: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24168: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24138: \$? = $ac_status" >&5
++  echo "$as_me:24171: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24141: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24174: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24144: \$? = $ac_status" >&5
++  echo "$as_me:24177: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -24151,7 +24184,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24154: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:24187: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -24163,14 +24196,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:24166: checking for __va_copy" >&5
++echo "$as_me:24199: 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 24173 "configure"
++#line 24206 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24187,16 +24220,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24190: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24223: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24193: \$? = $ac_status" >&5
++  echo "$as_me:24226: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24196: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24229: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24199: \$? = $ac_status" >&5
++  echo "$as_me:24232: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -24206,7 +24239,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24209: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:24242: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -24218,14 +24251,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:24221: checking for __builtin_va_copy" >&5
++echo "$as_me:24254: 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 24228 "configure"
++#line 24261 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24242,16 +24275,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24245: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24278: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24248: \$? = $ac_status" >&5
++  echo "$as_me:24281: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24251: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24284: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24254: \$? = $ac_status" >&5
++  echo "$as_me:24287: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -24261,7 +24294,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24264: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:24297: 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 &&
+@@ -24279,14 +24312,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:24282: checking if we can simply copy va_list" >&5
++	echo "$as_me:24315: 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 24289 "configure"
++#line 24322 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24303,16 +24336,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24306: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24339: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24309: \$? = $ac_status" >&5
++  echo "$as_me:24342: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24312: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24345: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24315: \$? = $ac_status" >&5
++  echo "$as_me:24348: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -24322,19 +24355,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24325: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:24358: 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:24330: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:24363: 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 24337 "configure"
++#line 24370 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24351,16 +24384,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24354: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24387: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24357: \$? = $ac_status" >&5
++  echo "$as_me:24390: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24360: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24393: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24363: \$? = $ac_status" >&5
++  echo "$as_me:24396: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -24370,7 +24403,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24373: result: $cf_cv_array_va_list" >&5
++echo "$as_me:24406: 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
+@@ -24381,13 +24414,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:24384: checking for pid_t" >&5
++echo "$as_me:24417: 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 24390 "configure"
++#line 24423 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24402,16 +24435,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24405: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24438: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24408: \$? = $ac_status" >&5
++  echo "$as_me:24441: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24411: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24444: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24414: \$? = $ac_status" >&5
++  echo "$as_me:24447: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -24421,7 +24454,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24424: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:24457: 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
+   :
+@@ -24436,23 +24469,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:24439: checking for $ac_header" >&5
++echo "$as_me:24472: 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 24445 "configure"
++#line 24478 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:24449: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:24482: \"$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:24455: \$? = $ac_status" >&5
++  echo "$as_me:24488: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -24471,7 +24504,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24474: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:24507: 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:24520: 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 24493 "configure"
++#line 24526 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -24521,16 +24554,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24524: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24557: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24527: \$? = $ac_status" >&5
++  echo "$as_me:24560: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24530: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24563: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24533: \$? = $ac_status" >&5
++  echo "$as_me:24566: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -24540,7 +24573,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24543: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:24576: 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:24588: 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
+@@ -24575,15 +24608,15 @@
+       }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24578: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24611: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24581: \$? = $ac_status" >&5
++  echo "$as_me:24614: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24583: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24616: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24586: \$? = $ac_status" >&5
++  echo "$as_me:24619: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -24595,7 +24628,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24598: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:24631: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -24609,12 +24642,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:24612: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24645: 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:24617: checking for working vfork" >&5
++  echo "$as_me:24650: 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
+@@ -24623,7 +24656,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24626 "configure"
++#line 24659 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include 
+@@ -24716,15 +24749,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24719: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24752: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24722: \$? = $ac_status" >&5
++  echo "$as_me:24755: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24724: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24757: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24727: \$? = $ac_status" >&5
++  echo "$as_me:24760: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -24736,13 +24769,13 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24739: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:24772: 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:24745: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24778: 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
+ 
+@@ -24767,7 +24800,7 @@
+ 
+ fi
+ 
+-echo "$as_me:24770: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:24803: 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
+@@ -24777,7 +24810,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24780 "configure"
++#line 24813 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24812,15 +24845,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24815: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24848: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24818: \$? = $ac_status" >&5
++  echo "$as_me:24851: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24820: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24853: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24823: \$? = $ac_status" >&5
++  echo "$as_me:24856: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fopen_bin_r=yes
+ else
+@@ -24833,20 +24866,20 @@
+ fi
+ 
+ fi
+-echo "$as_me:24836: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:24869: 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
+ #define USE_FOPEN_BIN_R 1
+ EOF
+ 
+-	echo "$as_me:24843: checking for cc_t" >&5
++	echo "$as_me:24876: checking for cc_t" >&5
+ echo $ECHO_N "checking for cc_t... $ECHO_C" >&6
+ if test "${ac_cv_type_cc_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24849 "configure"
++#line 24882 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24864,16 +24897,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24867: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24900: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24870: \$? = $ac_status" >&5
++  echo "$as_me:24903: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24873: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24906: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24876: \$? = $ac_status" >&5
++  echo "$as_me:24909: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_cc_t=yes
+ else
+@@ -24883,7 +24916,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24886: result: $ac_cv_type_cc_t" >&5
++echo "$as_me:24919: result: $ac_cv_type_cc_t" >&5
+ echo "${ECHO_T}$ac_cv_type_cc_t" >&6
+ if test "$ac_cv_type_cc_t" = yes; then
+ 
+@@ -24893,13 +24926,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:24896: checking for speed_t" >&5
++	echo "$as_me:24929: checking for speed_t" >&5
+ echo $ECHO_N "checking for speed_t... $ECHO_C" >&6
+ if test "${ac_cv_type_speed_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24902 "configure"
++#line 24935 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24917,16 +24950,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24920: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24953: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24923: \$? = $ac_status" >&5
++  echo "$as_me:24956: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24926: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24959: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24929: \$? = $ac_status" >&5
++  echo "$as_me:24962: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_speed_t=yes
+ else
+@@ -24936,7 +24969,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24939: result: $ac_cv_type_speed_t" >&5
++echo "$as_me:24972: result: $ac_cv_type_speed_t" >&5
+ echo "${ECHO_T}$ac_cv_type_speed_t" >&6
+ if test "$ac_cv_type_speed_t" = yes; then
+ 
+@@ -24946,13 +24979,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:24949: checking for tcflag_t" >&5
++	echo "$as_me:24982: checking for tcflag_t" >&5
+ echo $ECHO_N "checking for tcflag_t... $ECHO_C" >&6
+ if test "${ac_cv_type_tcflag_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24955 "configure"
++#line 24988 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24970,16 +25003,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24973: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25006: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24976: \$? = $ac_status" >&5
++  echo "$as_me:25009: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24979: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25012: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24982: \$? = $ac_status" >&5
++  echo "$as_me:25015: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_tcflag_t=yes
+ else
+@@ -24989,7 +25022,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24992: result: $ac_cv_type_tcflag_t" >&5
++echo "$as_me:25025: result: $ac_cv_type_tcflag_t" >&5
+ echo "${ECHO_T}$ac_cv_type_tcflag_t" >&6
+ if test "$ac_cv_type_tcflag_t" = yes; then
+ 
+@@ -24999,13 +25032,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:25002: checking for sigset_t" >&5
++	echo "$as_me:25035: checking for sigset_t" >&5
+ echo $ECHO_N "checking for sigset_t... $ECHO_C" >&6
+ if test "${ac_cv_type_sigset_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25008 "configure"
++#line 25041 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25023,16 +25056,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25026: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25059: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25029: \$? = $ac_status" >&5
++  echo "$as_me:25062: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25032: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25065: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25035: \$? = $ac_status" >&5
++  echo "$as_me:25068: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_sigset_t=yes
+ else
+@@ -25042,7 +25075,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:25045: result: $ac_cv_type_sigset_t" >&5
++echo "$as_me:25078: result: $ac_cv_type_sigset_t" >&5
+ echo "${ECHO_T}$ac_cv_type_sigset_t" >&6
+ if test "$ac_cv_type_sigset_t" = yes; then
+ 
+@@ -25054,7 +25087,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:25057: checking for openpty in -lutil" >&5
++echo "$as_me:25090: 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
+@@ -25062,7 +25095,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25065 "configure"
++#line 25098 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -25081,16 +25114,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25084: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25117: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25087: \$? = $ac_status" >&5
++  echo "$as_me:25120: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25090: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25123: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25093: \$? = $ac_status" >&5
++  echo "$as_me:25126: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -25101,7 +25134,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:25104: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:25137: 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
+@@ -25109,7 +25142,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:25112: checking for openpty header" >&5
++echo "$as_me:25145: 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
+@@ -25136,7 +25169,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25139 "configure"
++#line 25172 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -25154,16 +25187,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25157: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25190: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25160: \$? = $ac_status" >&5
++  echo "$as_me:25193: \$? = $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:25196: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25166: \$? = $ac_status" >&5
++  echo "$as_me:25199: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -25181,7 +25214,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:25184: result: $cf_cv_func_openpty" >&5
++echo "$as_me:25217: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -25254,7 +25287,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25257 "configure"
++#line 25290 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -25266,16 +25299,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25269: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25302: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25272: \$? = $ac_status" >&5
++  echo "$as_me:25305: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25275: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25308: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25278: \$? = $ac_status" >&5
++  echo "$as_me:25311: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25292,7 +25325,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}:25295: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25328: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25328,7 +25361,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}:25331: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25364: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25339,7 +25372,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:25342: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:25375: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -25411,7 +25444,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25414 "configure"
++#line 25447 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -25423,16 +25456,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25426: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25459: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25429: \$? = $ac_status" >&5
++  echo "$as_me:25462: \$? = $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:25465: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25435: \$? = $ac_status" >&5
++  echo "$as_me:25468: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25449,7 +25482,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}:25452: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25485: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25529,7 +25562,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}:25532: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25565: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25546,23 +25579,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:25549: checking for db.h" >&5
++echo "$as_me:25582: 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 25555 "configure"
++#line 25588 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:25559: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25592: \"$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:25565: \$? = $ac_status" >&5
++  echo "$as_me:25598: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -25581,11 +25614,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25584: result: $ac_cv_header_db_h" >&5
++echo "$as_me:25617: 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:25588: checking for version of db" >&5
++echo "$as_me:25621: 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
+@@ -25596,10 +25629,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:25599: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:25632: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25602 "configure"
++#line 25635 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25629,16 +25662,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25632: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25665: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25635: \$? = $ac_status" >&5
++  echo "$as_me:25668: \$? = $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:25671: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25641: \$? = $ac_status" >&5
++  echo "$as_me:25674: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -25652,16 +25685,16 @@
+ done
+ 
+ fi
+-echo "$as_me:25655: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:25688: 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:25659: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:25692: 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:25664: checking for db libraries" >&5
++echo "$as_me:25697: 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
+@@ -25691,10 +25724,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:25694: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:25727: testing checking for library $cf_db_libs ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25697 "configure"
++#line 25730 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25749,16 +25782,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25752: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25785: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25755: \$? = $ac_status" >&5
++  echo "$as_me:25788: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25758: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25791: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25761: \$? = $ac_status" >&5
++  echo "$as_me:25794: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -25778,11 +25811,11 @@
+ done
+ 
+ fi
+-echo "$as_me:25781: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:25814: 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:25785: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:25818: 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
+@@ -25808,7 +25841,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:25811: error: Cannot find db.h" >&5
++	{ { echo "$as_me:25844: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -25823,14 +25856,14 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:25826: checking if we can include stdbool.h" >&5
++echo "$as_me:25859: checking if we can include stdbool.h" >&5
+ echo $ECHO_N "checking if we can include stdbool.h... $ECHO_C" >&6
+ if test "${cf_cv_header_stdbool_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25833 "configure"
++#line 25866 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25845,23 +25878,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25848: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25881: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25851: \$? = $ac_status" >&5
++  echo "$as_me:25884: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25854: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25887: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25857: \$? = $ac_status" >&5
++  echo "$as_me:25890: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25864 "configure"
++#line 25897 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -25873,16 +25906,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25876: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25909: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25879: \$? = $ac_status" >&5
++  echo "$as_me:25912: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25882: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25915: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25885: \$? = $ac_status" >&5
++  echo "$as_me:25918: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=no
+ else
+@@ -25893,7 +25926,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:25896: result: $cf_cv_header_stdbool_h" >&5
++echo "$as_me:25929: result: $cf_cv_header_stdbool_h" >&5
+ echo "${ECHO_T}$cf_cv_header_stdbool_h" >&6
+ 
+ if test "$cf_cv_header_stdbool_h" = yes
+@@ -25901,14 +25934,14 @@
+ else	USE_STDBOOL_H=0
+ fi
+ 
+-echo "$as_me:25904: checking for builtin bool type" >&5
++echo "$as_me:25937: 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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25911 "configure"
++#line 25944 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25922,16 +25955,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25925: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25958: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25928: \$? = $ac_status" >&5
++  echo "$as_me:25961: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25931: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25964: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25934: \$? = $ac_status" >&5
++  echo "$as_me:25967: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cc_bool_type=yes
+ else
+@@ -25941,7 +25974,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:25944: result: $cf_cv_cc_bool_type" >&5
++echo "$as_me:25977: result: $cf_cv_cc_bool_type" >&5
+ echo "${ECHO_T}$cf_cv_cc_bool_type" >&6
+ 
+ if test "$cf_cv_cc_bool_type" = yes; then
+@@ -25968,10 +26001,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:25971: checking if we already have C++ library" >&5
++	echo "$as_me:26004: 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 25974 "configure"
++#line 26007 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -25985,16 +26018,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25988: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26021: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25991: \$? = $ac_status" >&5
++  echo "$as_me:26024: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25994: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26027: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25997: \$? = $ac_status" >&5
++  echo "$as_me:26030: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -26003,7 +26036,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-	echo "$as_me:26006: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:26039: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -26022,7 +26055,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:26025: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:26058: 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
+@@ -26048,7 +26081,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26051 "configure"
++#line 26084 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -26062,16 +26095,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26065: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26098: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26068: \$? = $ac_status" >&5
++  echo "$as_me:26101: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26071: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26104: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26074: \$? = $ac_status" >&5
++  echo "$as_me:26107: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -26083,7 +26116,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:26086: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:26119: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -26105,7 +26138,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:26108: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:26141: 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
+@@ -26120,15 +26153,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:26123: \"$ac_try\"") >&5
++if { (eval echo "$as_me:26156: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26126: \$? = $ac_status" >&5
++  echo "$as_me:26159: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:26128: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:26161: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26131: \$? = $ac_status" >&5
++  echo "$as_me:26164: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -26139,10 +26172,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+-  echo "$as_me:26142: result: yes" >&5
++  echo "$as_me:26175: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:26145: result: no" >&5
++  echo "$as_me:26178: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -26162,7 +26195,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:26165: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:26198: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -26183,7 +26216,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26186 "configure"
++#line 26219 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -26197,16 +26230,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26200: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26233: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26203: \$? = $ac_status" >&5
++  echo "$as_me:26236: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26206: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26239: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26209: \$? = $ac_status" >&5
++  echo "$as_me:26242: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -26243,7 +26276,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26246 "configure"
++#line 26279 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26257,16 +26290,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26260: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26293: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26263: \$? = $ac_status" >&5
++  echo "$as_me:26296: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26266: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26299: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26269: \$? = $ac_status" >&5
++  echo "$as_me:26302: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -26299,7 +26332,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	LIBS="$cf_save"
+-	echo "$as_me:26302: result: $cf_cxx_library" >&5
++	echo "$as_me:26335: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -26315,7 +26348,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:26318: checking how to run the C++ preprocessor" >&5
++echo "$as_me:26351: 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
+@@ -26332,18 +26365,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 26335 "configure"
++#line 26368 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26340: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26373: \"$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:26346: \$? = $ac_status" >&5
++  echo "$as_me:26379: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26366,17 +26399,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26369 "configure"
++#line 26402 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26373: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26406: \"$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:26379: \$? = $ac_status" >&5
++  echo "$as_me:26412: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26413,7 +26446,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:26416: result: $CXXCPP" >&5
++echo "$as_me:26449: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -26423,18 +26456,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 26426 "configure"
++#line 26459 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26431: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26464: \"$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:26437: \$? = $ac_status" >&5
++  echo "$as_me:26470: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26457,17 +26490,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26460 "configure"
++#line 26493 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26464: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26497: \"$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:26470: \$? = $ac_status" >&5
++  echo "$as_me:26503: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26495,7 +26528,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:26498: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:26531: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -26510,23 +26543,23 @@
+ for ac_header in new exception typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:26513: checking for $ac_header" >&5
++echo "$as_me:26546: 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 26519 "configure"
++#line 26552 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26523: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26556: \"$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:26529: \$? = $ac_status" >&5
++  echo "$as_me:26562: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26545,7 +26578,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26548: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26581: 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:26594: 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 26567 "configure"
++#line 26600 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26571: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26604: \"$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:26577: \$? = $ac_status" >&5
++  echo "$as_me:26610: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26593,7 +26626,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26596: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26629: 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:26640: 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 26610 "configure"
++#line 26643 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26624,16 +26657,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26627: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26660: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26630: \$? = $ac_status" >&5
++  echo "$as_me:26663: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26633: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26666: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26636: \$? = $ac_status" >&5
++  echo "$as_me:26669: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -26642,7 +26675,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:26645: result: $cf_iostream_namespace" >&5
++	echo "$as_me:26678: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -26653,14 +26686,14 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:26656: checking for builtin bool type" >&5
++echo "$as_me:26689: 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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26663 "configure"
++#line 26696 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26674,16 +26707,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26677: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26710: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26680: \$? = $ac_status" >&5
++  echo "$as_me:26713: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26683: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26716: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26686: \$? = $ac_status" >&5
++  echo "$as_me:26719: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_builtin_bool=yes
+ else
+@@ -26693,16 +26726,16 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26696: result: $cf_cv_builtin_bool" >&5
++echo "$as_me:26729: result: $cf_cv_builtin_bool" >&5
+ echo "${ECHO_T}$cf_cv_builtin_bool" >&6
+ 
+-echo "$as_me:26699: checking for bool" >&5
++echo "$as_me:26732: 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 26705 "configure"
++#line 26738 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26737,16 +26770,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26740: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26773: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26743: \$? = $ac_status" >&5
++  echo "$as_me:26776: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26746: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26779: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26749: \$? = $ac_status" >&5
++  echo "$as_me:26782: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -26756,10 +26789,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26759: result: $ac_cv_type_bool" >&5
++echo "$as_me:26792: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:26762: checking size of bool" >&5
++echo "$as_me:26795: 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
+@@ -26768,7 +26801,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26771 "configure"
++#line 26804 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26800,21 +26833,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26803: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26836: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26806: \$? = $ac_status" >&5
++  echo "$as_me:26839: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26809: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26842: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26812: \$? = $ac_status" >&5
++  echo "$as_me:26845: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26817 "configure"
++#line 26850 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26846,16 +26879,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26849: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26882: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26852: \$? = $ac_status" >&5
++  echo "$as_me:26885: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26855: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26888: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26858: \$? = $ac_status" >&5
++  echo "$as_me:26891: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -26871,7 +26904,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26874 "configure"
++#line 26907 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26903,16 +26936,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26906: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26939: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26909: \$? = $ac_status" >&5
++  echo "$as_me:26942: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26912: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26945: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26915: \$? = $ac_status" >&5
++  echo "$as_me:26948: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -26928,7 +26961,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 26931 "configure"
++#line 26964 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26960,16 +26993,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26963: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26996: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26966: \$? = $ac_status" >&5
++  echo "$as_me:26999: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26969: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27002: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26972: \$? = $ac_status" >&5
++  echo "$as_me:27005: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -26982,12 +27015,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:26985: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27018: 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 26990 "configure"
++#line 27023 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27023,15 +27056,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27026: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27059: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27029: \$? = $ac_status" >&5
++  echo "$as_me:27062: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27031: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27064: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27034: \$? = $ac_status" >&5
++  echo "$as_me:27067: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27047,13 +27080,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27050: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27083: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27089: 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
+@@ -27072,7 +27105,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27075 "configure"
++#line 27108 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27113,15 +27146,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27116: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27149: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27119: \$? = $ac_status" >&5
++  echo "$as_me:27152: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27121: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27154: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27124: \$? = $ac_status" >&5
++  echo "$as_me:27157: \$? = $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
+@@ -27138,19 +27171,19 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:27141: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:27174: 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:27148: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:27181: 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:27153: checking for special defines needed for etip.h" >&5
++echo "$as_me:27186: 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"
+@@ -27168,7 +27201,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 27171 "configure"
++#line 27204 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -27182,16 +27215,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27185: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27218: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27188: \$? = $ac_status" >&5
++  echo "$as_me:27221: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27191: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27224: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27194: \$? = $ac_status" >&5
++  echo "$as_me:27227: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:27248: result: ${cf_result:-(none)}" >&5
+ echo "${ECHO_T}${cf_result:-(none)}" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27220: checking if $CXX accepts override keyword" >&5
++echo "$as_me:27253: checking if $CXX accepts override keyword" >&5
+ echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
+ if test "${cf_cv_cpp_override+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27234,7 +27267,7 @@
+   cf_cv_cpp_override=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27237 "configure"
++#line 27270 "configure"
+ #include "confdefs.h"
+ 
+ class base
+@@ -27253,15 +27286,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27256: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27289: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27259: \$? = $ac_status" >&5
++  echo "$as_me:27292: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27261: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27294: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27264: \$? = $ac_status" >&5
++  echo "$as_me:27297: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_override=yes
+ else
+@@ -27280,7 +27313,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27283: result: $cf_cv_cpp_override" >&5
++echo "$as_me:27316: result: $cf_cv_cpp_override" >&5
+ echo "${ECHO_T}$cf_cv_cpp_override" >&6
+ fi
+ test "$cf_cv_cpp_override" = yes &&
+@@ -27289,7 +27322,7 @@
+ EOF
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27292: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:27325: 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
+@@ -27306,7 +27339,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27309 "configure"
++#line 27342 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -27325,15 +27358,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27328: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27361: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27331: \$? = $ac_status" >&5
++  echo "$as_me:27364: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27333: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27366: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27336: \$? = $ac_status" >&5
++  echo "$as_me:27369: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -27352,7 +27385,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27355: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:27388: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -27362,7 +27395,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:27365: checking if $CXX accepts static_cast" >&5
++echo "$as_me:27398: 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
+@@ -27376,7 +27409,7 @@
+ ac_main_return="return"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27379 "configure"
++#line 27412 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -27420,16 +27453,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27423: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27456: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27426: \$? = $ac_status" >&5
++  echo "$as_me:27459: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27429: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27462: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27432: \$? = $ac_status" >&5
++  echo "$as_me:27465: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -27447,7 +27480,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27450: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:27483: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -27495,13 +27528,13 @@
+ 		USE_STDBOOL_H=0
+ 	else
+ 
+-echo "$as_me:27498: checking for bool" >&5
++echo "$as_me:27531: 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 27504 "configure"
++#line 27537 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27536,16 +27569,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27539: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27572: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27542: \$? = $ac_status" >&5
++  echo "$as_me:27575: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27545: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27578: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27548: \$? = $ac_status" >&5
++  echo "$as_me:27581: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -27555,10 +27588,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27558: result: $ac_cv_type_bool" >&5
++echo "$as_me:27591: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:27561: checking size of bool" >&5
++echo "$as_me:27594: 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
+@@ -27567,7 +27600,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27570 "configure"
++#line 27603 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27599,21 +27632,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27602: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27635: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27605: \$? = $ac_status" >&5
++  echo "$as_me:27638: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27608: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27641: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27611: \$? = $ac_status" >&5
++  echo "$as_me:27644: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27616 "configure"
++#line 27649 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27645,16 +27678,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27648: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27681: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27651: \$? = $ac_status" >&5
++  echo "$as_me:27684: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27654: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27687: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27657: \$? = $ac_status" >&5
++  echo "$as_me:27690: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -27670,7 +27703,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27673 "configure"
++#line 27706 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27702,16 +27735,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27705: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27738: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27708: \$? = $ac_status" >&5
++  echo "$as_me:27741: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27711: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27744: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27714: \$? = $ac_status" >&5
++  echo "$as_me:27747: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27727,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 27730 "configure"
++#line 27763 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27759,16 +27792,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27762: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27795: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27765: \$? = $ac_status" >&5
++  echo "$as_me:27798: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27768: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27801: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27771: \$? = $ac_status" >&5
++  echo "$as_me:27804: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27781,12 +27814,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27784: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27817: 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 27789 "configure"
++#line 27822 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27822,15 +27855,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27825: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27858: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27828: \$? = $ac_status" >&5
++  echo "$as_me:27861: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27830: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27863: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27833: \$? = $ac_status" >&5
++  echo "$as_me:27866: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27846,13 +27879,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27849: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27882: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27888: 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
+@@ -27871,7 +27904,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27874 "configure"
++#line 27907 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27912,15 +27945,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27915: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27948: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27918: \$? = $ac_status" >&5
++  echo "$as_me:27951: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27920: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27953: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27923: \$? = $ac_status" >&5
++  echo "$as_me:27956: \$? = $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
+@@ -27937,14 +27970,14 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:27940: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:27973: 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:27947: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:27980: 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
+@@ -27975,7 +28008,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:27978: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:28011: 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
+@@ -27986,7 +28019,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:27989: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:28022: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -28003,10 +28036,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:28006: result: $ADAFLAGS" >&5
++	echo "$as_me:28039: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:28009: checking if GNATPREP supports -T option" >&5
++echo "$as_me:28042: 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
+@@ -28016,11 +28049,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:28019: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:28052: 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:28023: checking if GNAT supports generics" >&5
++echo "$as_me:28056: 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])
+@@ -28030,7 +28063,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:28033: result: $cf_gnat_generics" >&5
++echo "$as_me:28066: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -28042,7 +28075,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:28045: checking if GNAT supports SIGINT" >&5
++echo "$as_me:28078: 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
+@@ -28090,7 +28123,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:28093: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:28126: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -28103,7 +28136,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:28106: checking if GNAT supports project files" >&5
++echo "$as_me:28139: 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]*)
+@@ -28166,15 +28199,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:28169: result: $cf_gnat_projects" >&5
++echo "$as_me:28202: 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:28175: checking if GNAT supports libraries" >&5
++	echo "$as_me:28208: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:28177: result: $cf_gnat_libraries" >&5
++	echo "$as_me:28210: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -28194,7 +28227,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:28197: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:28230: 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
+@@ -28206,7 +28239,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:28209: checking for Ada95 compiler" >&5
++echo "$as_me:28242: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -28217,12 +28250,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:28220: result: $cf_ada_compiler" >&5
++echo "$as_me:28253: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:28225: checking for Ada95 include directory" >&5
++echo "$as_me:28258: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -28256,7 +28289,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28259: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28292: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28265,10 +28298,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:28268: result: $ADA_INCLUDE" >&5
++echo "$as_me:28301: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:28271: checking for Ada95 object directory" >&5
++echo "$as_me:28304: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -28302,7 +28335,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28305: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28338: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28311,10 +28344,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:28314: result: $ADA_OBJECTS" >&5
++echo "$as_me:28347: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:28317: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:28350: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -28335,11 +28368,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:28338: result: $with_ada_sharedlib" >&5
++echo "$as_me:28371: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+-	{ echo "$as_me:28342: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++	{ echo "$as_me:28375: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+ 
+@@ -28357,7 +28390,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:28360: checking for Ada95 curses library name" >&5
++echo "$as_me:28393: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -28373,7 +28406,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28376: result: $ADA_LIBNAME" >&5
++echo "$as_me:28409: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -28384,13 +28417,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:28387: checking for wchar_t" >&5
++	echo "$as_me:28420: 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 28393 "configure"
++#line 28426 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28405,16 +28438,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28408: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28441: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28411: \$? = $ac_status" >&5
++  echo "$as_me:28444: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28414: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28447: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28417: \$? = $ac_status" >&5
++  echo "$as_me:28450: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -28424,10 +28457,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:28427: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:28460: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:28430: checking size of wchar_t" >&5
++echo "$as_me:28463: 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
+@@ -28436,7 +28469,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28439 "configure"
++#line 28472 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28448,21 +28481,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28451: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28484: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28454: \$? = $ac_status" >&5
++  echo "$as_me:28487: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28457: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28490: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28460: \$? = $ac_status" >&5
++  echo "$as_me:28493: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28465 "configure"
++#line 28498 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28474,16 +28507,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28477: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28510: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28480: \$? = $ac_status" >&5
++  echo "$as_me:28513: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28483: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28516: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28486: \$? = $ac_status" >&5
++  echo "$as_me:28519: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -28499,7 +28532,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28502 "configure"
++#line 28535 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28511,16 +28544,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28514: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28547: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28517: \$? = $ac_status" >&5
++  echo "$as_me:28550: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28520: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28553: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28523: \$? = $ac_status" >&5
++  echo "$as_me:28556: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -28536,7 +28569,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 28539 "configure"
++#line 28572 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28548,16 +28581,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28551: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28584: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28554: \$? = $ac_status" >&5
++  echo "$as_me:28587: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28557: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28590: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28560: \$? = $ac_status" >&5
++  echo "$as_me:28593: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -28570,12 +28603,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:28573: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:28606: 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 28578 "configure"
++#line 28611 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28591,15 +28624,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:28594: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28627: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28597: \$? = $ac_status" >&5
++  echo "$as_me:28630: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:28599: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28632: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28602: \$? = $ac_status" >&5
++  echo "$as_me:28635: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -28615,7 +28648,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:28618: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:28651: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&6
+ 
+-echo "${as_me:-configure}:28631: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:28664: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -28646,7 +28679,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:28649: checking for library subsets" >&5
++echo "$as_me:28682: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -28700,7 +28733,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:28703: result: $LIB_SUBSETS" >&5
++echo "$as_me:28736: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -28731,7 +28764,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:28734: checking default library suffix" >&5
++echo "$as_me:28767: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28742,10 +28775,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:28745: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:28778: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:28748: checking default library-dependency suffix" >&5
++echo "$as_me:28781: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -28828,10 +28861,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:28831: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28864: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:28834: checking default object directory" >&5
++echo "$as_me:28867: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28847,11 +28880,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:28850: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28883: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28854: checking c++ library-dependency suffix" >&5
++echo "$as_me:28887: 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++)
+@@ -28944,7 +28977,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:28947: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:28980: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -29120,19 +29153,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:29123: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:29156: 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:29132: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:29165: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:29135: \$? = $ac_status" >&5
++  echo "$as_me:29168: \$? = $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
+@@ -29143,10 +29176,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 29146 "configure"
++#line 29179 "configure"
+ #include "confdefs.h"
+ 
+-#line 29149 "configure"
++#line 29182 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -29161,16 +29194,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:29164: \"$ac_link\"") >&5
++if { (eval echo "$as_me:29197: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:29167: \$? = $ac_status" >&5
++  echo "$as_me:29200: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:29170: \"$ac_try\"") >&5
++  { (eval echo "$as_me:29203: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:29173: \$? = $ac_status" >&5
++  echo "$as_me:29206: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -29193,7 +29226,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:29196: result: $cf_ldflags_static" >&5
++	echo "$as_me:29229: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test "$cf_ldflags_static" != yes
+@@ -29209,7 +29242,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29212: checking where we will install curses.h" >&5
++echo "$as_me:29245: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -29219,7 +29252,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:29222: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:29255: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -29227,7 +29260,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:29230: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:29263: 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
+@@ -29252,7 +29285,7 @@
+ 
+ # pkgsrc uses these
+ 
+-echo "$as_me:29255: checking for desired basename for form library" >&5
++echo "$as_me:29288: 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.
+@@ -29272,10 +29305,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29275: result: $FORM_NAME" >&5
++echo "$as_me:29308: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:29278: checking for desired basename for menu library" >&5
++echo "$as_me:29311: 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.
+@@ -29295,10 +29328,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29298: result: $MENU_NAME" >&5
++echo "$as_me:29331: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:29301: checking for desired basename for panel library" >&5
++echo "$as_me:29334: 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.
+@@ -29318,10 +29351,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29321: result: $PANEL_NAME" >&5
++echo "$as_me:29354: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:29324: checking for desired basename for cxx library" >&5
++echo "$as_me:29357: 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.
+@@ -29341,13 +29374,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29344: result: $CXX_NAME" >&5
++echo "$as_me:29377: 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:29350: checking for src modules" >&5
++echo "$as_me:29383: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -29406,7 +29439,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:29409: result: $cf_cv_src_modules" >&5
++echo "$as_me:29442: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -29567,7 +29600,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:29570: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:29603: 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//'`
+@@ -29578,7 +29611,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:29581: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
++echo "$as_me:29614: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -29594,7 +29627,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:29597: result: $PKG_CFLAGS" >&5
++echo "$as_me:29630: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ case "$cf_cv_system_name" in
+@@ -29666,7 +29699,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
+ 
+-echo "${as_me:-configure}:29669: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
++echo "${as_me:-configure}:29702: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+ 
+ fi
+ 
+@@ -29693,7 +29726,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:29696: checking for linker search path" >&5
++echo "$as_me:29729: 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
+@@ -29741,7 +29774,7 @@
+ 			cf_pathlist="$cf_pathlist /lib /usr/lib"
+ 			;;
+ 		(*)
+-			{ echo "$as_me:29744: WARNING: problem with Solaris architecture" >&5
++			{ echo "$as_me:29777: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ 			;;
+ 		esac
+@@ -29782,7 +29815,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:29785: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29818: 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'`
+@@ -29868,7 +29901,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29871: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29904: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -30049,7 +30082,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:30052: error: ambiguous option: $1
++    { { echo "$as_me:30085: 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;}
+@@ -30068,7 +30101,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:30071: error: unrecognized option: $1
++  -*) { { echo "$as_me:30104: 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;}
+@@ -30200,7 +30233,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:30203: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:30236: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -30477,6 +30510,7 @@
+ s,@GENERATED_SP_FUNCS@,$GENERATED_SP_FUNCS,;t t
+ s,@NCURSES_CONST@,$NCURSES_CONST,;t t
+ s,@NCURSES_EXT_COLORS@,$NCURSES_EXT_COLORS,;t t
++s,@NCURSES_RGB_COLORS@,$NCURSES_RGB_COLORS,;t t
+ s,@NCURSES_MOUSE_VERSION@,$NCURSES_MOUSE_VERSION,;t t
+ s,@cf_cv_enable_sigwinch@,$cf_cv_enable_sigwinch,;t t
+ s,@NCURSES_XNAMES@,$NCURSES_XNAMES,;t t
+@@ -30729,7 +30763,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:30732: creating $ac_file" >&5
++    { echo "$as_me:30766: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -30747,7 +30781,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30750: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30784: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -30760,7 +30794,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30763: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30797: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30776,7 +30810,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:30779: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:30813: 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;}
+@@ -30785,7 +30819,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:30788: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:30822: 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;}
+@@ -30830,7 +30864,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:30833: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:30867: 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;}
+@@ -30841,7 +30875,7 @@
+     $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:30844: WARNING: Some variables may not be substituted:
++      { echo "$as_me:30878: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30890,7 +30924,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:30893: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:30927: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -30901,7 +30935,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30904: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30938: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -30914,7 +30948,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30917: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30951: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30972,7 +31006,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:30975: $ac_file is unchanged" >&5
++      { echo "$as_me:31009: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -31359,7 +31393,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}:31362: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:31396: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: configure.in
+Prereq:  1.794 
+--- ncurses-6.5-20250510+/configure.in	2025-03-01 15:05:13.000000000 +0000
++++ ncurses-6.5-20250517/configure.in	2025-05-17 20:38:51.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.794 2025/03/01 15:05:13 tom Exp $
++dnl $Id: configure.in,v 1.797 2025/05/17 20:38:51 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.794 $)
++AC_REVISION($Revision: 1.797 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -1195,13 +1195,14 @@
+ AC_SUBST(NCURSES_CONST)
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
++NCURSES_EXT_COLORS=0
++NCURSES_RGB_COLORS=0
+ AC_MSG_CHECKING(if you want to use extended colors)
+ AC_ARG_ENABLE(ext-colors,
+ 	[  --enable-ext-colors     compile for 256-color support],
+ 	[with_ext_colors=$enableval],
+ 	[with_ext_colors=$cf_dft_ext_colors])
+ AC_MSG_RESULT($with_ext_colors)
+-NCURSES_EXT_COLORS=0
+ if test "x$with_ext_colors" = xyes ; then
+ 	if test "x$with_widec" != xyes ; then
+ 		AC_MSG_WARN(This option applies only to wide-character library)
+@@ -1214,8 +1215,20 @@
+ 		AC_DEFINE(HAVE_INIT_EXTENDED_COLOR,1,[Define to 1 to enable init_extended_color() function in test-programs])
+ 		AC_DEFINE(HAVE_RESET_COLOR_PAIRS,1,[Define to 1 to enable reset_color_pairs() function in test-programs])
+ 	fi
++	###   use option --enable-rgb-color to extend support for direct-color
++	AC_MSG_CHECKING(if you want to extend support for direct color)
++	AC_ARG_ENABLE(ext-colors,
++		[  --enable-rgb-color      compile for extended direct-color],
++		[with_rgb_color=$enableval],
++		[with_rgb_color=$cf_dft_rgb_color])
++	AC_MSG_RESULT($with_rgb_color)
++	if test "x$with_rgb_color" = xyes ; then
++		NCURSES_RGB_COLORS=1
++		AC_DEFINE(NCURSES_RGB_COLORS,1,[Define to 1 to compile for extended direct-color support])
++	fi
+ fi
+ AC_SUBST(NCURSES_EXT_COLORS)
++AC_SUBST(NCURSES_RGB_COLORS)
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+ AC_MSG_CHECKING(if you want to use extended mouse encoding)
+@@ -1564,6 +1577,11 @@
+ test "x$with_scroll_hints" = xyes && AC_DEFINE(USE_SCROLL_HINTS,1,[Define to 1 to compile without scroll-hints code])
+ fi
+ 
++case x$cf_cv_abi_default in
++(x[[789]])
++	NCURSES_WGETCH_EVENTS=0
++	;;
++(*)
+ AC_MSG_CHECKING(if you want wgetch-events code)
+ AC_ARG_ENABLE(wgetch-events,
+ 	[  --enable-wgetch-events  compile with wgetch-events code],
+@@ -1576,6 +1594,7 @@
+ else
+ 	NCURSES_WGETCH_EVENTS=0
+ fi
++esac
+ AC_SUBST(NCURSES_WGETCH_EVENTS)
+ 
+ case "$cf_cv_system_name" in
+Index: dist.mk
+Prereq:  1.1668 
+--- ncurses-6.5-20250510+/dist.mk	2025-05-10 09:45:42.000000000 +0000
++++ ncurses-6.5-20250517/dist.mk	2025-05-17 10:17:12.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1668 2025/05/10 09:45:42 tom Exp $
++# $Id: dist.mk,v 1.1669 2025/05/17 10:17:12 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 = 5
+-NCURSES_PATCH = 20250510
++NCURSES_PATCH = 20250517
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: include/curses.h.in
+Prereq:  1.291 
+--- ncurses-6.5-20250510+/include/curses.h.in	2025-02-23 01:33:32.000000000 +0000
++++ ncurses-6.5-20250517/include/curses.h.in	2025-05-17 20:16:50.000000000 +0000
+@@ -33,7 +33,7 @@
+  *     and: Thomas E. Dickey                        1996-on                 *
+  ****************************************************************************/
+ 
+-/* $Id: curses.h.in,v 1.291 2025/02/23 01:33:32 tom Exp $ */
++/* $Id: curses.h.in,v 1.294 2025/05/17 20:16:50 tom Exp $ */
+ 
+ #ifndef __NCURSES_H
+ #define __NCURSES_H
+@@ -489,11 +489,14 @@
+ {
+     attr_t	attr;
+     wchar_t	chars[CCHARW_MAX];
+-#if @NCURSES_EXT_COLORS@
++#if @NCURSES_EXT_COLORS@	/* NCURSES_EXT_COLORS */
+ #undef NCURSES_EXT_COLORS
+ #define NCURSES_EXT_COLORS @NCURSES_PATCH@
+     int		ext_color;	/* color pair, must be more than 16-bits */
++#if @NCURSES_RGB_COLORS@	/* NCURSES_RGB_COLORS */
++    int		rgb_color;	/* extra data for direct-color (rgb) */
+ #endif
++#endif /* NCURSES_EXT_COLORS */
+ }
+ cchar_t;
+ 
+@@ -1143,8 +1146,12 @@
+ #define A_DIM		NCURSES_BITS(@cf_cv_1UL@,12)
+ #define A_BOLD		NCURSES_BITS(@cf_cv_1UL@,13)
+ #define A_ALTCHARSET	NCURSES_BITS(@cf_cv_1UL@,14)
++
++/* SVr4 curses marks these as "subject to change" */
+ #define A_INVIS		NCURSES_BITS(@cf_cv_1UL@,15)
+ #define A_PROTECT	NCURSES_BITS(@cf_cv_1UL@,16)
++
++/* X/Open features not found in SVr4 curses */
+ #define A_HORIZONTAL	NCURSES_BITS(@cf_cv_1UL@,17)
+ #define A_LEFT		NCURSES_BITS(@cf_cv_1UL@,18)
+ #define A_LOW		NCURSES_BITS(@cf_cv_1UL@,19)
+@@ -1154,7 +1161,12 @@
+ 
+ #if @NCURSES_EXT_FUNCS@
+ #define A_ITALIC	NCURSES_BITS(@cf_cv_1UL@,23)	/* ncurses extension */
+-#endif
++#if @NCURSES_RGB_COLORS@	/* NCURSES_RGB_COLORS */
++#define A_FOREGROUND	NCURSES_BITS(@cf_cv_1UL@,17)	/* ncurses extension */
++#define A_BACKGROUND	NCURSES_BITS(@cf_cv_1UL@,18)	/* ncurses extension */
++#define A_DIRECT	(A_FOREGROUND|A_BACKGROUND)
++#endif /* NCURSES_RGB_COLORS */
++#endif /* NCURSES_EXT_FUNCS */
+ 
+ /*
+  * Most of the pseudo functions are macros that either provide compatibility
+Index: include/curses.tail
+Prereq:  1.27 
+--- ncurses-6.5-20250510+/include/curses.tail	2023-08-05 19:43:46.000000000 +0000
++++ ncurses-6.5-20250517/include/curses.tail	2025-05-17 20:32:15.000000000 +0000
+@@ -1,4 +1,4 @@
+-/* $Id: curses.tail,v 1.27 2023/08/05 19:43:46 tom Exp $ */
++/* $Id: curses.tail,v 1.28 2025/05/17 20:32:15 tom Exp $ */
+ /*
+  * vile:cmode:
+  * This file is part of ncurses, designed to be appended after curses.h.in
+@@ -62,7 +62,51 @@
+ #define	BUTTON_ALT		NCURSES_MOUSE_MASK(6, 0004L)
+ #define	REPORT_MOUSE_POSITION	NCURSES_MOUSE_MASK(6, 0010L)
+ 
+-#else
++/*
++ * If mmask_T is 64-bits, we can define another 6 button stanzas, for a total
++ * of 11, which happens to be the maximum number supported in the X11 protocol.
++ */
++#if NCURSES_MOUSE_VERSION > 2
++
++#define	BUTTON6_RELEASED	NCURSES_MOUSE_MASK(6, NCURSES_BUTTON_RELEASED)
++#define	BUTTON6_PRESSED		NCURSES_MOUSE_MASK(6, NCURSES_BUTTON_PRESSED)
++#define	BUTTON6_CLICKED		NCURSES_MOUSE_MASK(6, NCURSES_BUTTON_CLICKED)
++#define	BUTTON6_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(6, NCURSES_DOUBLE_CLICKED)
++#define	BUTTON6_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(6, NCURSES_TRIPLE_CLICKED)
++
++#define	BUTTON7_RELEASED	NCURSES_MOUSE_MASK(7, NCURSES_BUTTON_RELEASED)
++#define	BUTTON7_PRESSED		NCURSES_MOUSE_MASK(7, NCURSES_BUTTON_PRESSED)
++#define	BUTTON7_CLICKED		NCURSES_MOUSE_MASK(7, NCURSES_BUTTON_CLICKED)
++#define	BUTTON7_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(7, NCURSES_DOUBLE_CLICKED)
++#define	BUTTON7_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(7, NCURSES_TRIPLE_CLICKED)
++
++#define	BUTTON8_RELEASED	NCURSES_MOUSE_MASK(8, NCURSES_BUTTON_RELEASED)
++#define	BUTTON8_PRESSED		NCURSES_MOUSE_MASK(8, NCURSES_BUTTON_PRESSED)
++#define	BUTTON8_CLICKED		NCURSES_MOUSE_MASK(8, NCURSES_BUTTON_CLICKED)
++#define	BUTTON8_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(8, NCURSES_DOUBLE_CLICKED)
++#define	BUTTON8_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(8, NCURSES_TRIPLE_CLICKED)
++
++#define	BUTTON9_RELEASED	NCURSES_MOUSE_MASK(9, NCURSES_BUTTON_RELEASED)
++#define	BUTTON9_PRESSED		NCURSES_MOUSE_MASK(9, NCURSES_BUTTON_PRESSED)
++#define	BUTTON9_CLICKED		NCURSES_MOUSE_MASK(9, NCURSES_BUTTON_CLICKED)
++#define	BUTTON9_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(9, NCURSES_DOUBLE_CLICKED)
++#define	BUTTON9_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(9, NCURSES_TRIPLE_CLICKED)
++
++#define	BUTTON10_RELEASED	NCURSES_MOUSE_MASK(10, NCURSES_BUTTON_RELEASED)
++#define	BUTTON10_PRESSED	NCURSES_MOUSE_MASK(10, NCURSES_BUTTON_PRESSED)
++#define	BUTTON10_CLICKED	NCURSES_MOUSE_MASK(10, NCURSES_BUTTON_CLICKED)
++#define	BUTTON10_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(10, NCURSES_DOUBLE_CLICKED)
++#define	BUTTON10_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(10, NCURSES_TRIPLE_CLICKED)
++
++#define	BUTTON11_RELEASED	NCURSES_MOUSE_MASK(11, NCURSES_BUTTON_RELEASED)
++#define	BUTTON11_PRESSED	NCURSES_MOUSE_MASK(11, NCURSES_BUTTON_PRESSED)
++#define	BUTTON11_CLICKED	NCURSES_MOUSE_MASK(11, NCURSES_BUTTON_CLICKED)
++#define	BUTTON11_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(11, NCURSES_DOUBLE_CLICKED)
++#define	BUTTON11_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(11, NCURSES_TRIPLE_CLICKED)
++
++#endif
++
++#else	/* NCURSES_MOUSE_VERSION == 1 */
+ 
+ #define	BUTTON1_RESERVED_EVENT	NCURSES_MOUSE_MASK(1, NCURSES_RESERVED_EVENT)
+ #define	BUTTON2_RESERVED_EVENT	NCURSES_MOUSE_MASK(2, NCURSES_RESERVED_EVENT)
+@@ -74,7 +118,7 @@
+ #define	BUTTON_ALT		NCURSES_MOUSE_MASK(5, 0004L)
+ #define	REPORT_MOUSE_POSITION	NCURSES_MOUSE_MASK(5, 0010L)
+ 
+-#endif
++#endif	/* NCURSES_MOUSE_VERSION >= 1 */
+ 
+ #define	ALL_MOUSE_EVENTS	(REPORT_MOUSE_POSITION - 1)
+ 
+Index: include/ncurses_defs
+Prereq:  1.116 
+--- ncurses-6.5-20250510+/include/ncurses_defs	2025-03-01 15:06:22.000000000 +0000
++++ ncurses-6.5-20250517/include/ncurses_defs	2025-05-17 22:22:40.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: ncurses_defs,v 1.116 2025/03/01 15:06:22 tom Exp $
++# $Id: ncurses_defs,v 1.117 2025/05/17 22:22:40 tom Exp $
+ ##############################################################################
+ # Copyright 2018-2024,2025 Thomas E. Dickey                                  #
+ # Copyright 2000-2016,2017 Free Software Foundation, Inc.                    #
+@@ -248,6 +248,7 @@
+ NCURSES_NO_PADDING
+ NCURSES_OSPEED_COMPAT
+ NCURSES_PATHSEP	':'
++NCURSES_RGB_COLORS
+ NCURSES_WIDECHAR
+ NEED_PTEM_H
+ NO_LEAKS
+Index: misc/terminfo.src
+--- ncurses-6.5-20250510+/misc/terminfo.src	2025-05-10 21:24:30.000000000 +0000
++++ ncurses-6.5-20250517/misc/terminfo.src	2025-05-17 15:47:19.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.1193 $
+-#	$Date: 2025/05/10 21:24:30 $
++#	$Revision: 1.1197 $
++#	$Date: 2025/05/17 15:47:19 $
+ #
+ # 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
+@@ -3526,7 +3526,8 @@
+ # Earlier reports state that these differences also apply to OS X 10.7 (Lion),
+ #	TERM_PROGRAM_VERSION=303
+ nsterm-build309|Terminal.app in OS X 10.8,
+-	use=xterm+256setaf, use=nsterm-bce,
++	use=bracketed+paste, use=xterm+256setaf,
++	use=nsterm-bce,
+ 
+ # removed bogus kDC7 -TD
+ nsterm-build326|Terminal.app in OS X 10.9,
+@@ -4527,10 +4528,11 @@
+ 	xr=\EP>\\|RLogin\\(([1-9][.0-9]+)\\)\E\\\\,
+ 	use=ansi+apparrows, use=ansi+cup, use=ansi+idl,
+ 	use=ansi+inittabs, use=ansi+local, use=ansi+rca2,
+-	use=ansi+sgrdim, use=ecma+index, use=ecma+italics,
+-	use=ecma+strikeout, use=vt420+lrmm, use=decid+cpr,
+-	use=report+da2, use=report+version, use=vt100+pf1-pf4,
+-	use=vt220+pcedit, use=vt220+ufkeys, use=xterm+acs,
++	use=ansi+sgrdim, use=bracketed+paste, use=ecma+index,
++	use=ecma+italics, use=ecma+strikeout, use=vt420+lrmm,
++	use=decid+cpr, use=report+da2, use=report+version,
++	use=vt100+pf1-pf4, use=vt220+pcedit, use=vt220+ufkeys,
++	use=xterm+acs,
+ 
+ #### Command prompt
+ 
+@@ -7701,8 +7703,9 @@
+ 	kLFT3=\E[1;3D, kLFT4=\E[1;4D, kLFT5=\E[1;5D,
+ 	kLFT6=\E[1;6D, kLFT7=\E[1;7D, kRIT3=\E[1;3C,
+ 	kRIT4=\E[1;4C, kRIT5=\E[1;5C, kRIT6=\E[1;6C,
+-	kRIT7=\E[1;7C, kUP=\E[1;2A, use=ansi+enq, use=xterm+pcf0,
+-	use=vt100, use=xterm+256setaf,
++	kRIT7=\E[1;7C, kUP=\E[1;2A, use=ansi+enq,
++	use=bracketed+paste, use=xterm+pcf0, use=vt100,
++	use=xterm+256setaf,
+ 
+ # 2017-11-11:
+ # Tested terminology 1.0.0
+@@ -8722,10 +8725,10 @@
+ 	E0=\E(B, S0=\E(%p1%c, use=ecma+underline,
+ 	use=ansi+apparrows, use=ansi+csr, use=ansi+erase,
+ 	use=ansi+idl, use=ansi+inittabs, use=ansi+local,
+-	use=ansi+rca2, use=ecma+color, use=vt100+pf1-pf4,
+-	use=vt220+pcedit, use=xterm+alt1049, use=xterm+kbs,
+-	use=vt100+enq, use=vt100+4bsd, use=xterm+r5+fkeys,
+-	use=wyse+cvis,
++	use=ansi+rca2, use=bracketed+paste, use=ecma+color,
++	use=vt100+pf1-pf4, use=vt220+pcedit, use=xterm+alt1049,
++	use=xterm+kbs, use=vt100+enq, use=vt100+4bsd,
++	use=xterm+r5+fkeys, use=wyse+cvis,
+ 
+ screen|VT 100/ANSI X3.64 virtual terminal,
+ 	use=screen4,
+@@ -8954,19 +8957,17 @@
+ screen4|VT 100/ANSI X3.64 virtual terminal (4.x),
+ 	use=ecma+index, use=screen-base,
+ 
+-# As of December 2022, screen 5.0 has not been released.
+-#
+-# However,
++# screen 5.0 was released in August 2024.  As of May 2025, few systems use it.
+ #
+ #	https://savannah.gnu.org/bugs/?36676
+ #
+-# mentions a change to implement italics which should be in a version 5,
+-# (implemented 2016-11-05, but merged 2017-07-09).  That does away with the
+-# longstanding use of SGR 3 for standout, and interprets it as italics.
+-#
+-# The same development branch has some support for direct-colors, but none
+-# of this has been documented.
+-screen5|VT 100/ANSI X3.64 virtual terminal (someday),
++# mentions a change to implement italics (implemented 2016-11-05, merged
++# 2017-07-09), this may do away with the longstanding use of SGR 3 for
++# standout, interpreting it as italics.
++#
++# This version has limited support for direct-colors, but does not use the
++# outer terminal's $TERM in deciding if or how to apply this.
++screen5|VT 100/ANSI X3.64 virtual terminal (5.x),
+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
+ 	    %p5%t;2%;m%?%p9%t\016%e\017%;,
+ 	use=ecma+standout, use=ecma+italics, use=ecma+index,
+@@ -27990,4 +27991,7 @@
+ #	+ update teraterm to 5.0 -TD
+ #	+ add rlogin-color -TD
+ #
++# 2025-05-17
++#	+ use bracketed+paste in nsterm, rlogin-color, screen, terminology -TD
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: ncurses/curses.priv.h
+Prereq:  1.701 
+--- ncurses-6.5-20250510+/ncurses/curses.priv.h	2025-03-01 17:17:12.000000000 +0000
++++ ncurses-6.5-20250517/ncurses/curses.priv.h	2025-05-17 20:43:18.000000000 +0000
+@@ -35,7 +35,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: curses.priv.h,v 1.701 2025/03/01 17:17:12 tom Exp $
++ * $Id: curses.priv.h,v 1.702 2025/05/17 20:43:18 tom Exp $
+  *
+  *	curses.priv.h
+  *
+@@ -1408,6 +1408,12 @@
+ #define NulColor	/* nothing */
+ #endif
+ 
++#if NCURSES_RGB_COLORS
++#define NulDirect	, 0
++#else
++#define NulDirect	/* nothing */
++#endif
++
+ #if CCHARW_MAX > 6
+ #define NulChar		0,0,0,0,0
+ #elif CCHARW_MAX > 5
+@@ -1429,7 +1435,7 @@
+ #define RemAttr(c,a)	AttrOf(c) &= ~((a) & A_ATTRIBUTES)
+ #define SetAttr(c,a)	AttrOf(c) =   ((a) & A_ATTRIBUTES) | WidecExt(c)
+ 
+-#define NewChar2(c,a)	{ a, { c, NulChar } NulColor }
++#define NewChar2(c,a)	{ a, { c, NulChar } NulColor NulDirect }
+ #define NewChar(ch)	NewChar2(ChCharOf(ch), ChAttrOf(ch))
+ 
+ #if CCHARW_MAX > 1
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250510+/package/debian-mingw/changelog	2025-05-10 09:45:42.000000000 +0000
++++ ncurses-6.5-20250517/package/debian-mingw/changelog	2025-05-17 10:17:12.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250510) unstable; urgency=low
++ncurses6td (6.5+20250517) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 10 May 2025 05:45:42 -0400
++ -- Thomas E. Dickey   Sat, 17 May 2025 06:17:12 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250510+/package/debian-mingw64/changelog	2025-05-10 09:45:42.000000000 +0000
++++ ncurses-6.5-20250517/package/debian-mingw64/changelog	2025-05-17 10:17:12.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250510) unstable; urgency=low
++ncurses6td (6.5+20250517) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 10 May 2025 05:45:42 -0400
++ -- Thomas E. Dickey   Sat, 17 May 2025 06:17:12 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250510+/package/debian/changelog	2025-05-10 09:45:42.000000000 +0000
++++ ncurses-6.5-20250517/package/debian/changelog	2025-05-17 10:17:12.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250510) unstable; urgency=low
++ncurses6td (6.5+20250517) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 10 May 2025 05:45:42 -0400
++ -- Thomas E. Dickey   Sat, 17 May 2025 06:17:12 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.702 
+--- ncurses-6.5-20250510+/package/mingw-ncurses.nsi	2025-05-10 09:45:42.000000000 +0000
++++ ncurses-6.5-20250517/package/mingw-ncurses.nsi	2025-05-17 10:17:12.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.702 2025/05/10 09:45:42 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.703 2025/05/17 10:17:12 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0510"
++!define VERSION_MMDD  "0517"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250510+/package/mingw-ncurses.spec	2025-05-10 09:45:42.000000000 +0000
++++ ncurses-6.5-20250517/package/mingw-ncurses.spec	2025-05-17 10:17:12.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250510
++Release: 20250517
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20250510+/package/ncurses.spec	2025-05-10 09:45:42.000000000 +0000
++++ ncurses-6.5-20250517/package/ncurses.spec	2025-05-17 10:17:12.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250510
++Release: 20250517
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20250510+/package/ncursest.spec	2025-05-10 09:45:42.000000000 +0000
++++ ncurses-6.5-20250517/package/ncursest.spec	2025-05-17 10:17:12.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250510
++Release: 20250517
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/ncurses.c
+Prereq:  1.545 
+--- ncurses-6.5-20250510+/test/ncurses.c	2024-12-07 23:22:39.000000000 +0000
++++ ncurses-6.5-20250517/test/ncurses.c	2025-05-17 23:01:22.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 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.545 2024/12/07 23:22:39 tom Exp $
++$Id: ncurses.c,v 1.548 2025/05/17 23:01:22 tom Exp $
+ 
+ ***************************************************************************/
+ 
+@@ -519,49 +519,47 @@
+ 		_nc_STRCAT(buf, s, sizeof(buf)); \
+ 		_nc_STRCAT(buf, ", ", sizeof(buf)); \
+ 	}
++#define MOUSE_ONE(b, m, s) \
++	SHOW(m, s "-" #b)
++#define MOUSE_ALL(b) do { \
++	MOUSE_ONE(b, NCURSES_MOUSE_MASK(b, NCURSES_BUTTON_RELEASED), "release"); \
++	MOUSE_ONE(b, NCURSES_MOUSE_MASK(b, NCURSES_BUTTON_PRESSED), "press"); \
++	MOUSE_ONE(b, NCURSES_MOUSE_MASK(b, NCURSES_BUTTON_CLICKED), "click"); \
++	MOUSE_ONE(b, NCURSES_MOUSE_MASK(b, NCURSES_DOUBLE_CLICKED), "doubleclick"); \
++	MOUSE_ONE(b, NCURSES_MOUSE_MASK(b, NCURSES_TRIPLE_CLICKED), "tripleclick"); \
++    } while (0)
+ 
+-    SHOW(BUTTON1_RELEASED, "release-1");
+-    SHOW(BUTTON1_PRESSED, "press-1");
+-    SHOW(BUTTON1_CLICKED, "click-1");
+-    SHOW(BUTTON1_DOUBLE_CLICKED, "doubleclick-1");
+-    SHOW(BUTTON1_TRIPLE_CLICKED, "tripleclick-1");
++    MOUSE_ALL(1);
+ #if NCURSES_MOUSE_VERSION == 1
+-    SHOW(BUTTON1_RESERVED_EVENT, "reserved-1");
++    MOUSE_ONE(1, BUTTON1_RESERVED_EVENT, "reserved");
+ #endif
+ 
+-    SHOW(BUTTON2_RELEASED, "release-2");
+-    SHOW(BUTTON2_PRESSED, "press-2");
+-    SHOW(BUTTON2_CLICKED, "click-2");
+-    SHOW(BUTTON2_DOUBLE_CLICKED, "doubleclick-2");
+-    SHOW(BUTTON2_TRIPLE_CLICKED, "tripleclick-2");
++    MOUSE_ALL(2);
+ #if NCURSES_MOUSE_VERSION == 1
+-    SHOW(BUTTON2_RESERVED_EVENT, "reserved-2");
++    MOUSE_ONE(2, BUTTON2_RESERVED_EVENT, "reserved");
+ #endif
+ 
+-    SHOW(BUTTON3_RELEASED, "release-3");
+-    SHOW(BUTTON3_PRESSED, "press-3");
+-    SHOW(BUTTON3_CLICKED, "click-3");
+-    SHOW(BUTTON3_DOUBLE_CLICKED, "doubleclick-3");
+-    SHOW(BUTTON3_TRIPLE_CLICKED, "tripleclick-3");
++    MOUSE_ALL(3);
+ #if NCURSES_MOUSE_VERSION == 1
+-    SHOW(BUTTON3_RESERVED_EVENT, "reserved-3");
++    MOUSE_ONE(3, BUTTON3_RESERVED_EVENT, "reserved");
+ #endif
+ 
+-    SHOW(BUTTON4_RELEASED, "release-4");
+-    SHOW(BUTTON4_PRESSED, "press-4");
+-    SHOW(BUTTON4_CLICKED, "click-4");
+-    SHOW(BUTTON4_DOUBLE_CLICKED, "doubleclick-4");
+-    SHOW(BUTTON4_TRIPLE_CLICKED, "tripleclick-4");
++    MOUSE_ALL(4);
+ #if NCURSES_MOUSE_VERSION == 1
+-    SHOW(BUTTON4_RESERVED_EVENT, "reserved-4");
++    MOUSE_ONE(4, BUTTON4_RESERVED_EVENT, "reserved");
+ #endif
+ 
+-#if NCURSES_MOUSE_VERSION == 2
+-    SHOW(BUTTON5_RELEASED, "release-5");
+-    SHOW(BUTTON5_PRESSED, "press-5");
+-    SHOW(BUTTON5_CLICKED, "click-5");
+-    SHOW(BUTTON5_DOUBLE_CLICKED, "doubleclick-5");
+-    SHOW(BUTTON5_TRIPLE_CLICKED, "tripleclick-5");
++#if NCURSES_MOUSE_VERSION >= 2
++    MOUSE_ALL(5);
++#endif
++
++#if NCURSES_MOUSE_VERSION >= 3
++    MOUSE_ALL(6);
++    MOUSE_ALL(7);
++    MOUSE_ALL(8);
++    MOUSE_ALL(9);
++    MOUSE_ALL(10);
++    MOUSE_ALL(11);
+ #endif
+ 
+     SHOW(BUTTON_CTRL, "ctrl");
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250524.patch b/packages/ncurses/6.5/ncurses-6.5-20250524.patch
new file mode 100644
index 0000000000..e2ed08b815
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250524.patch
@@ -0,0 +1,347 @@
+# ncurses 6.5 - patch 20250524 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250524.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sat May 24 23:28:35 UTC 2025
+# ------------------------------------------------------------------------------
+# NEWS                             |    6 +++++-
+# VERSION                          |    2 +-
+# configure                        |    8 ++++----
+# configure.in                     |    6 +++---
+# dist.mk                          |    4 ++--
+# include/curses.h.in              |   28 ++++++++++++++--------------
+# 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 +-
+# 13 files changed, 40 insertions(+), 36 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.4283 
+--- ncurses-6.5-20250517+/NEWS	2025-05-17 18:56:42.000000000 +0000
++++ ncurses-6.5-20250524/NEWS	2025-05-24 18:58:06.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4283 2025/05/17 18:56:42 tom Exp $
++-- $Id: NEWS,v 1.4286 2025/05/24 18:58:06 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.
+ 
++20250524
++	+ correct option-name used in configure script, which resulted in size
++	  change for cchar_t (cf: 20250517).
++
+ 20250517
+ 	+ initial changes for some ABI 7 features:
+ 	  + disable wgetch-events
+Index: VERSION
+--- ncurses-6.5-20250517+/VERSION	2025-05-17 10:17:12.000000000 +0000
++++ ncurses-6.5-20250524/VERSION	2025-05-24 09:59:15.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250517
++5:0:10	6.5	20250524
+Index: configure
+--- ncurses-6.5-20250517+/configure	2025-05-17 20:39:08.000000000 +0000
++++ ncurses-6.5-20250524/configure	2025-05-24 18:52:44.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.797 .
++# From configure.in Revision: 1.798 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20250126.
+ #
+@@ -16044,9 +16044,9 @@
+ 	echo "$as_me:16044: checking if you want to extend support for direct color" >&5
+ echo $ECHO_N "checking if you want to extend support for direct color... $ECHO_C" >&6
+ 
+-# Check whether --enable-ext-colors or --disable-ext-colors was given.
+-if test "${enable_ext_colors+set}" = set; then
+-  enableval="$enable_ext_colors"
++# Check whether --enable-rgb-color or --disable-rgb-color was given.
++if test "${enable_rgb_color+set}" = set; then
++  enableval="$enable_rgb_color"
+   with_rgb_color=$enableval
+ else
+   with_rgb_color=$cf_dft_rgb_color
+Index: configure.in
+Prereq:  1.797 
+--- ncurses-6.5-20250517+/configure.in	2025-05-17 20:38:51.000000000 +0000
++++ ncurses-6.5-20250524/configure.in	2025-05-24 18:50:21.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.797 2025/05/17 20:38:51 tom Exp $
++dnl $Id: configure.in,v 1.798 2025/05/24 18:50:21 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.797 $)
++AC_REVISION($Revision: 1.798 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -1217,7 +1217,7 @@
+ 	fi
+ 	###   use option --enable-rgb-color to extend support for direct-color
+ 	AC_MSG_CHECKING(if you want to extend support for direct color)
+-	AC_ARG_ENABLE(ext-colors,
++	AC_ARG_ENABLE(rgb-color,
+ 		[  --enable-rgb-color      compile for extended direct-color],
+ 		[with_rgb_color=$enableval],
+ 		[with_rgb_color=$cf_dft_rgb_color])
+Index: dist.mk
+Prereq:  1.1669 
+--- ncurses-6.5-20250517+/dist.mk	2025-05-17 10:17:12.000000000 +0000
++++ ncurses-6.5-20250524/dist.mk	2025-05-24 09:59:15.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1669 2025/05/17 10:17:12 tom Exp $
++# $Id: dist.mk,v 1.1670 2025/05/24 09:59: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 = 5
+-NCURSES_PATCH = 20250517
++NCURSES_PATCH = 20250524
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: include/curses.h.in
+Prereq:  1.294 
+--- ncurses-6.5-20250517+/include/curses.h.in	2025-05-17 20:16:50.000000000 +0000
++++ ncurses-6.5-20250524/include/curses.h.in	2025-05-24 16:38:03.000000000 +0000
+@@ -33,7 +33,7 @@
+  *     and: Thomas E. Dickey                        1996-on                 *
+  ****************************************************************************/
+ 
+-/* $Id: curses.h.in,v 1.294 2025/05/17 20:16:50 tom Exp $ */
++/* $Id: curses.h.in,v 1.295 2025/05/24 16:38:03 tom Exp $ */
+ 
+ #ifndef __NCURSES_H
+ #define __NCURSES_H
+@@ -175,14 +175,14 @@
+  * KEY_RESIZE is an extended feature that relies upon the SIGWINCH handler
+  * in ncurses.
+  */
+-#if @NCURSES_EXT_FUNCS@
++#if @NCURSES_EXT_FUNCS@	/* NCURSES_EXT_FUNCS */
+ #ifndef NCURSES_SIGWINCH
+ #define NCURSES_SIGWINCH @cf_cv_enable_sigwinch@
+ #endif
+ #else
+ #undef NCURSES_SIGWINCH
+ #define NCURSES_SIGWINCH 0
+-#endif
++#endif /* NCURSES_EXT_FUNCS */
+ 
+ /*
+  * In certain environments, we must work around linker problems for data
+@@ -939,7 +939,7 @@
+ /*
+  * These functions are extensions - not in X/Open Curses.
+  */
+-#if @NCURSES_EXT_FUNCS@
++#if @NCURSES_EXT_FUNCS@	/* NCURSES_EXT_FUNCS */
+ #undef  NCURSES_EXT_FUNCS
+ #define NCURSES_EXT_FUNCS @NCURSES_PATCH@
+ typedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *);
+@@ -1002,15 +1002,15 @@
+ extern NCURSES_EXPORT(int) wgetdelay (const WINDOW *);		/* @GENERATED_EXT_FUNCS@ */
+ extern NCURSES_EXPORT(int) wgetscrreg (const WINDOW *, int *, int *); /* @GENERATED_EXT_FUNCS@ */
+ 
+-#else
++#else /* !NCURSES_EXT_FUNCS */
+ #define curses_version() NCURSES_VERSION
+-#endif
++#endif /* NCURSES_EXT_FUNCS */
+ 
+ /*
+  * Extra extension-functions, which pass a SCREEN pointer rather than using
+  * a global variable SP.
+  */
+-#if @NCURSES_SP_FUNCS@
++#if @NCURSES_SP_FUNCS@	/* NCURSES_SP_FUNCS */
+ #undef  NCURSES_SP_FUNCS
+ #define NCURSES_SP_FUNCS @NCURSES_PATCH@
+ #define NCURSES_SP_NAME(name) name##_sp
+@@ -1094,7 +1094,7 @@
+ extern NCURSES_EXPORT(void) NCURSES_SP_NAME(use_tioctl) (SCREEN*, bool); /* implemented:SP_FUNC */
+ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vidattr) (SCREEN*, chtype);	/* implemented:SP_FUNC */
+ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vidputs) (SCREEN*, chtype, NCURSES_SP_OUTC); /* implemented:SP_FUNC */
+-#if @NCURSES_EXT_FUNCS@
++#if @NCURSES_EXT_FUNCS@	/* NCURSES_EXT_FUNCS */
+ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(alloc_pair) (SCREEN*, int, int); /* implemented:EXT_SP_FUNC */
+ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(assume_default_colors) (SCREEN*, int, int);	/* implemented:EXT_SP_FUNC */
+ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(define_key) (SCREEN*, const char *, int);	/* implemented:EXT_SP_FUNC */
+@@ -1122,13 +1122,13 @@
+ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(set_tabsize) (SCREEN*, int);	/* implemented:EXT_SP_FUNC */
+ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_default_colors) (SCREEN*);	/* implemented:EXT_SP_FUNC */
+ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_legacy_coding) (SCREEN*, int);	/* implemented:EXT_SP_FUNC */
+-#endif
+-#else
++#endif /* NCURSES_EXT_FUNCS */
++#else /* !NCURSES_SP_FUNCS */
+ #undef  NCURSES_SP_FUNCS
+ #define NCURSES_SP_FUNCS 0
+ #define NCURSES_SP_NAME(name) name
+ #define NCURSES_SP_OUTC NCURSES_OUTC
+-#endif
++#endif /* NCURSES_SP_FUNCS */
+ 
+ /* attributes */
+ 
+@@ -1159,7 +1159,7 @@
+ #define A_TOP		NCURSES_BITS(@cf_cv_1UL@,21)
+ #define A_VERTICAL	NCURSES_BITS(@cf_cv_1UL@,22)
+ 
+-#if @NCURSES_EXT_FUNCS@
++#if @NCURSES_EXT_FUNCS@	/* NCURSES_EXT_FUNCS */
+ #define A_ITALIC	NCURSES_BITS(@cf_cv_1UL@,23)	/* ncurses extension */
+ #if @NCURSES_RGB_COLORS@	/* NCURSES_RGB_COLORS */
+ #define A_FOREGROUND	NCURSES_BITS(@cf_cv_1UL@,17)	/* ncurses extension */
+@@ -1453,7 +1453,7 @@
+ /*
+  * These macros are extensions - not in X/Open Curses.
+  */
+-#if @NCURSES_EXT_FUNCS@
++#if @NCURSES_EXT_FUNCS@	/* NCURSES_EXT_FUNCS */
+ #if !NCURSES_OPAQUE
+ #define is_cleared(win)		(NCURSES_OK_ADDR(win) ? (win)->_clear : FALSE)
+ #define is_idcok(win)		(NCURSES_OK_ADDR(win) ? (win)->_idcok : FALSE)
+@@ -1471,7 +1471,7 @@
+ #define wgetparent(win)		(NCURSES_OK_ADDR(win) ? (win)->_parent : 0)
+ #define wgetscrreg(win,t,b)	(NCURSES_OK_ADDR(win) ? (*(t) = (win)->_regtop, *(b) = (win)->_regbottom, OK) : ERR)
+ #endif
+-#endif
++#endif /* NCURSES_EXT_FUNCS */
+ 
+ /*
+  * X/Open says this returns a bool; SVr4 also checked for out-of-range line.
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250517+/package/debian-mingw/changelog	2025-05-17 10:17:12.000000000 +0000
++++ ncurses-6.5-20250524/package/debian-mingw/changelog	2025-05-24 09:59:15.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250517) unstable; urgency=low
++ncurses6td (6.5+20250524) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 17 May 2025 06:17:12 -0400
++ -- Thomas E. Dickey   Sat, 24 May 2025 05:59:15 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250517+/package/debian-mingw64/changelog	2025-05-17 10:17:12.000000000 +0000
++++ ncurses-6.5-20250524/package/debian-mingw64/changelog	2025-05-24 09:59:15.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250517) unstable; urgency=low
++ncurses6td (6.5+20250524) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 17 May 2025 06:17:12 -0400
++ -- Thomas E. Dickey   Sat, 24 May 2025 05:59:15 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250517+/package/debian/changelog	2025-05-17 10:17:12.000000000 +0000
++++ ncurses-6.5-20250524/package/debian/changelog	2025-05-24 09:59:15.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250517) unstable; urgency=low
++ncurses6td (6.5+20250524) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 17 May 2025 06:17:12 -0400
++ -- Thomas E. Dickey   Sat, 24 May 2025 05:59:15 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.703 
+--- ncurses-6.5-20250517+/package/mingw-ncurses.nsi	2025-05-17 10:17:12.000000000 +0000
++++ ncurses-6.5-20250524/package/mingw-ncurses.nsi	2025-05-24 09:59:15.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.703 2025/05/17 10:17:12 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.704 2025/05/24 09:59:15 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0517"
++!define VERSION_MMDD  "0524"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250517+/package/mingw-ncurses.spec	2025-05-17 10:17:12.000000000 +0000
++++ ncurses-6.5-20250524/package/mingw-ncurses.spec	2025-05-24 09:59:15.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250517
++Release: 20250524
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20250517+/package/ncurses.spec	2025-05-17 10:17:12.000000000 +0000
++++ ncurses-6.5-20250524/package/ncurses.spec	2025-05-24 09:59:15.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250517
++Release: 20250524
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20250517+/package/ncursest.spec	2025-05-17 10:17:12.000000000 +0000
++++ ncurses-6.5-20250524/package/ncursest.spec	2025-05-24 09:59:15.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250517
++Release: 20250524
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250531.patch b/packages/ncurses/6.5/ncurses-6.5-20250531.patch
new file mode 100644
index 0000000000..a7097226b4
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250531.patch
@@ -0,0 +1,304 @@
+# ncurses 6.5 - patch 20250531 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250531.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Jun  1 00:02:18 UTC 2025
+# ------------------------------------------------------------------------------
+# Ada95/aclocal.m4                 |    4 ++--
+# NEWS                             |    6 +++++-
+# VERSION                          |    2 +-
+# aclocal.m4                       |    4 ++--
+# dist.mk                          |    4 ++--
+# misc/run_tic.in                  |   31 ++++++++++++++++++-------------
+# 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 +-
+# 13 files changed, 41 insertions(+), 32 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/aclocal.m4
+Prereq:  1.227 
+--- ncurses-6.5-20250524+/Ada95/aclocal.m4	2025-02-23 01:57:36.000000000 +0000
++++ ncurses-6.5-20250531/Ada95/aclocal.m4	2025-02-23 01:57:36.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: aclocal.m4,v 1.227 2025/02/23 01:57:36 tom Exp $
++dnl $Id: aclocal.m4,v 1.228 2025/02/23 01:57:36 tom Exp $
+ dnl Macros used in NCURSES Ada95 auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -3107,7 +3107,7 @@
+ echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_NCURSES_ADDON version: 7 updated: 2024/06/01 17:37:13
++dnl CF_NCURSES_ADDON version: 8 updated: 2025/02/22 20:57:36
+ dnl ----------------
+ dnl Configure an ncurses add-on, built outside the ncurses tree.
+ AC_DEFUN([CF_NCURSES_ADDON],[
+Index: NEWS
+Prereq:  1.4286 
+--- ncurses-6.5-20250524+/NEWS	2025-05-24 18:58:06.000000000 +0000
++++ ncurses-6.5-20250531/NEWS	2025-05-31 22:33:49.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4286 2025/05/24 18:58:06 tom Exp $
++-- $Id: NEWS,v 1.4288 2025/05/31 22:33:49 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.
+ 
++20250531
++	+ improve logic in misc/run_tic.in for constructing symbolic link
++	  when $DESTDIR is set.
++
+ 20250524
+ 	+ correct option-name used in configure script, which resulted in size
+ 	  change for cchar_t (cf: 20250517).
+Index: VERSION
+--- ncurses-6.5-20250524+/VERSION	2025-05-24 09:59:15.000000000 +0000
++++ ncurses-6.5-20250531/VERSION	2025-05-31 10:03:25.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250524
++5:0:10	6.5	20250531
+Index: aclocal.m4
+Prereq:  1.1105 
+--- ncurses-6.5-20250524+/aclocal.m4	2025-05-17 18:54:28.000000000 +0000
++++ ncurses-6.5-20250531/aclocal.m4	2025-05-17 18:54:28.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1105 2025/05/17 18:54:28 tom Exp $
++dnl $Id: aclocal.m4,v 1.1106 2025/05/17 18:54:28 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -67,7 +67,7 @@
+ 	fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_ABI_DEFAULTS version: 5 updated: 2023/10/21 08:54:23
++dnl CF_ABI_DEFAULTS version: 6 updated: 2025/05/17 14:54:28
+ dnl ---------------
+ dnl Provide configure-script defaults for different ncurses ABIs.
+ AC_DEFUN([CF_ABI_DEFAULTS],[
+Index: dist.mk
+Prereq:  1.1670 
+--- ncurses-6.5-20250524+/dist.mk	2025-05-24 09:59:15.000000000 +0000
++++ ncurses-6.5-20250531/dist.mk	2025-05-31 10:03:25.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1670 2025/05/24 09:59:15 tom Exp $
++# $Id: dist.mk,v 1.1671 2025/05/31 10:03:25 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 = 5
+-NCURSES_PATCH = 20250524
++NCURSES_PATCH = 20250531
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: misc/run_tic.in
+Prereq:  1.41 
+--- ncurses-6.5-20250524+/misc/run_tic.in	2024-08-04 14:50:26.000000000 +0000
++++ ncurses-6.5-20250531/misc/run_tic.in	2025-05-31 22:31:56.000000000 +0000
+@@ -1,7 +1,7 @@
+ #!@SHELL@
+-# $Id: run_tic.in,v 1.41 2024/08/04 14:50:26 tom Exp $
++# $Id: run_tic.in,v 1.42 2025/05/31 22:31:56 tom Exp $
+ ##############################################################################
+-# Copyright 2019-2022,2024 Thomas E. Dickey                                  #
++# Copyright 2019-2024,2025 Thomas E. Dickey                                  #
+ # Copyright 2000-2012,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -62,12 +62,14 @@
+ : "${BINDIR:=@bindir@}"
+ : "${TICDIR:=$ticdir}"
+ 
++unset CDPATH
++
+ # Allow tic to run either from the install-path, or from the build-directory.
+ # Do not do this if we appear to be cross-compiling.  In that case, we rely
+ # on the host's copy of tic to compile the terminfo database.
+-if test "x$cross_compiling" = "xno"
++if test "$cross_compiling" = "no"
+ then
+-	if test -f ../progs/tic$suffix
++	if test -f ../progs/tic"$suffix"
+ 	then
+ 		case "$PATH" in
+ 		\@PATH_SEPARATOR@*)
+@@ -148,7 +150,7 @@
+ 
+ EOF
+ $tic_path -V
+-if ( $tic_path -x -s -o "$TERMINFO" $tic_source )
++if ( $tic_path -x -s -o "$TERMINFO" "$tic_source" )
+ then
+ 	echo "** built new $TERMINFO"
+ else
+@@ -168,7 +170,7 @@
+ 
+ EOF
+ $tic_path -V
+-if ( $tic_path -s -o "$TERMINFO" $tic_source )
++if ( $tic_path -s -o "$TERMINFO" "$tic_source" )
+ then
+ 	echo "** built new $TERMINFO"
+ else
+@@ -195,18 +197,21 @@
+ 			echo "Otherwise, remove $TICDIR and link it to $TERMINFO."
+ 		fi
+ 	else
+-		cd ${INSTALL_PREFIX} || exit
++		cd "${INSTALL_PREFIX}" || exit
+ 		# Construct a symbolic link that only assumes $ticdir has the
+ 		# same $prefix as the other installed directories.
+-		RELATIVE=`echo $ticdir|sed -e 's%^'$prefix'/%%'`
+-		if test "$RELATIVE" != "$ticdir" ; then
+-			RELATIVE=../`echo $ticdir|sed -e 's%^'$prefix'/%%' -e 's%^/%%'`
++		SOURCE=`echo "$ticdir"|sed -e 's%^'"$prefix"'/%%'`
++		if test "$SOURCE" != "$ticdir" ; then
++			SOURCE=../`echo "$ticdir"|sed -e 's%^'"$prefix"'/%%' -e 's%^/%%'`
+ 		fi
+-		if ( @LN_S@ "$RELATIVE" "$TICDIR" )
++		test -d lib || mkdir lib
++		cd lib || exit
++		TARGET=`pwd`/terminfo
++		if ( @LN_S@ "$SOURCE" terminfo )
+ 		then
+-			echo "** sym-linked $TICDIR for compatibility"
++			echo "** sym-linked $TARGET for compatibility"
+ 		else
+-			echo "** could not sym-link $TICDIR for compatibility"
++			echo "** could not sym-link $TARGET for compatibility"
+ 		fi
+ 	fi
+ fi
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250524+/package/debian-mingw/changelog	2025-05-24 09:59:15.000000000 +0000
++++ ncurses-6.5-20250531/package/debian-mingw/changelog	2025-05-31 10:03:25.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250524) unstable; urgency=low
++ncurses6td (6.5+20250531) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 24 May 2025 05:59:15 -0400
++ -- Thomas E. Dickey   Sat, 31 May 2025 06:03:25 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250524+/package/debian-mingw64/changelog	2025-05-24 09:59:15.000000000 +0000
++++ ncurses-6.5-20250531/package/debian-mingw64/changelog	2025-05-31 10:03:25.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250524) unstable; urgency=low
++ncurses6td (6.5+20250531) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 24 May 2025 05:59:15 -0400
++ -- Thomas E. Dickey   Sat, 31 May 2025 06:03:25 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250524+/package/debian/changelog	2025-05-24 09:59:15.000000000 +0000
++++ ncurses-6.5-20250531/package/debian/changelog	2025-05-31 10:03:25.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250524) unstable; urgency=low
++ncurses6td (6.5+20250531) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 24 May 2025 05:59:15 -0400
++ -- Thomas E. Dickey   Sat, 31 May 2025 06:03:25 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.704 
+--- ncurses-6.5-20250524+/package/mingw-ncurses.nsi	2025-05-24 09:59:15.000000000 +0000
++++ ncurses-6.5-20250531/package/mingw-ncurses.nsi	2025-05-31 10:03:25.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.704 2025/05/24 09:59:15 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.705 2025/05/31 10:03:25 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0524"
++!define VERSION_MMDD  "0531"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250524+/package/mingw-ncurses.spec	2025-05-24 09:59:15.000000000 +0000
++++ ncurses-6.5-20250531/package/mingw-ncurses.spec	2025-05-31 10:03:25.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250524
++Release: 20250531
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20250524+/package/ncurses.spec	2025-05-24 09:59:15.000000000 +0000
++++ ncurses-6.5-20250531/package/ncurses.spec	2025-05-31 10:03:25.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250524
++Release: 20250531
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20250524+/package/ncursest.spec	2025-05-24 09:59:15.000000000 +0000
++++ ncurses-6.5-20250531/package/ncursest.spec	2025-05-31 10:03:25.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250524
++Release: 20250531
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250614.patch b/packages/ncurses/6.5/ncurses-6.5-20250614.patch
new file mode 100644
index 0000000000..5185759345
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250614.patch
@@ -0,0 +1,7566 @@
+# ncurses 6.5 - patch 20250614 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250614.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sat Jun 14 23:22:00 UTC 2025
+# ------------------------------------------------------------------------------
+# Ada95/configure                                                              |   39 
+# Ada95/make-tar.sh                                                            |   42 
+# Ada95/package/debian/control                                                 |    3 
+# Ada95/package/debian/rules                                                   |   53 
+# Ada95/samples/sample-menu_demo-handler.adb                                   |    4 
+# MANIFEST                                                                     |    4 
+# NEWS                                                                         |    8 
+# VERSION                                                                      |    2 
+# dist.mk                                                                      |    4 
+# include/MKkey_defs.sh                                                        |    8 
+# install-sh                                                                   |   29 
+# misc/gen_edit.sh                                                             |   14 
+# misc/makellib                                                                |   28 
+# ncurses-6.5-20250614/Ada95/package/debian/adacurses.lintian-overrides        |    4 
+# ncurses-6.5-20250614/Ada95/package/debian/adacurses.triggers                 |    1 
+# ncurses-6.5-20250614/test/package/debian/ncurses-examples.lintian-overrides  |    7 
+# ncurses-6.5-20250614/test/package/debian/ncursest-examples.lintian-overrides |    7 
+# ncurses/tinfo/MKkeys_list.sh                                                 |   26 
+# ncurses/tinfo/MKuserdefs.sh                                                  |    6 
+# ncurses/tinfo/comp_scan.c                                                    |    4 
+# ncurses/tinfo/lib_cur_term.c                                                 |    4 
+# package/debian-mingw/changelog                                               |    4 
+# package/debian-mingw64/changelog                                             |    4 
+# package/debian/changelog                                                     |    4 
+# package/debian/ncurses6td.lintian-overrides                                  |    4 
+# package/debian/ncursest6td.lintian-overrides                                 |    4 
+# package/debian/rules                                                         |    5 
+# package/mingw-ncurses.nsi                                                    |    4 
+# package/mingw-ncurses.spec                                                   |    2 
+# package/ncurses.spec                                                         |    2 
+# package/ncursest.spec                                                        |    2 
+# progs/capconvert                                                             |   44 
+# test/aclocal.m4                                                              |   49 
+# test/combine.c                                                               |    4 
+# test/configure                                                               | 1848 +++++-----
+# test/make-tar.sh                                                             |   34 
+# test/package/debian/rules                                                    |   19 
+# test/savescreen.sh                                                           |   17 
+# test/test_mouse.c                                                            |    7 
+# test/tput-colorcube                                                          |   58 
+# test/tput-initc                                                              |   21 
+# 41 files changed, 1316 insertions(+), 1117 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/configure
+--- ncurses-6.5-20250531+/Ada95/configure	2025-01-11 00:55:54.000000000 +0000
++++ ncurses-6.5-20250614/Ada95/configure	2025-06-14 13:44:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ # From configure.in Revision: 1.94 .
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by Autoconf 2.52.20240618.
++# Generated by Autoconf 2.52.20250126.
+ #
+ # Copyright 2003-2022,2023	Thomas E. Dickey
+ # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+@@ -829,7 +829,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.52.20240618.  Invocation command line was
++generated by GNU Autoconf 2.52.20250126.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -18724,13 +18724,13 @@
+ #ifndef __cplusplus
+   /* Ultrix mips cc rejects this.  */
+   typedef int charset[2];
+-  const charset x; (void)x;
++  const charset x;
+   /* SunOS 4.1.1 cc rejects this.  */
+   char const *const *ccp;
+   char **p;
+   /* NEC SVR4.0.2 mips cc rejects this.  */
+   struct point {int x, y;};
+-  static struct point const zero = {0,0}; (void)zero;
++  static struct point const zero = {0,0};
+   /* AIX XL C 1.02.0.0 rejects this.
+      It does not let you subtract one const X* pointer from another in
+      an arm of an if-expression whose if-part is not a constant
+@@ -18746,7 +18746,7 @@
+     char const *s = 0 ? (char *) 0 : (char const *) 0;
+ 
+     *t++ = 0;
+-	(void)s;
++	(void)s; (void)x; (void)zero;
+   }
+   { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+     int x[] = {25, 17};
+@@ -19938,7 +19938,7 @@
+ cat >>"$CONFIG_STATUS" <&5
++    { echo "$as_me:20445: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -20463,7 +20460,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:20466: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:20463: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -20476,7 +20473,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:20479: error: cannot find input file: $f" >&5
++           { { echo "$as_me:20476: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -20492,7 +20489,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:20495: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:20492: 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;}
+@@ -20501,7 +20498,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:20504: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:20501: 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;}
+@@ -20546,7 +20543,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:20549: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:20546: 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;}
+@@ -20557,7 +20554,7 @@
+     $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:20560: WARNING: Some variables may not be substituted:
++      { echo "$as_me:20557: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -20606,7 +20603,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:20609: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:20606: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -20617,7 +20614,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:20620: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:20617: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -20630,7 +20627,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:20633: error: cannot find input file: $f" >&5
++           { { echo "$as_me:20630: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -20688,7 +20685,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:20691: $ac_file is unchanged" >&5
++      { echo "$as_me:20688: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+Index: Ada95/make-tar.sh
+Prereq:  1.23 
+--- ncurses-6.5-20250531+/Ada95/make-tar.sh	2022-11-05 20:29:41.000000000 +0000
++++ ncurses-6.5-20250614/Ada95/make-tar.sh	2025-06-14 15:09:23.000000000 +0000
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+-# $Id: make-tar.sh,v 1.23 2022/11/05 20:29:41 tom Exp $
++# $Id: make-tar.sh,v 1.24 2025/06/14 15:09:23 tom Exp $
+ ##############################################################################
+-# Copyright 2019-2021,2022 Thomas E. Dickey                                  #
++# Copyright 2019-2022,2025 Thomas E. Dickey                                  #
+ # Copyright 2010-2015,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -73,7 +73,7 @@
+ make_changelog() {
+ 	[ -f "$1" ] && chmod u+w "$1"
+ 	cat >"$1" <MANIFEST )
+-same_timestamp $BUILD/$ROOTNAME/MANIFEST
++touch "$BUILD/$ROOTNAME/MANIFEST"
++( cd "$BUILD/$ROOTNAME" && find . -type f -print | "$SOURCE/misc/csort" >MANIFEST )
++same_timestamp "$BUILD/$ROOTNAME/MANIFEST"
+ 
+-cd $BUILD || exit
++cd "$BUILD" || exit
+ 
+ # Remove build-artifacts.
+ find . -name RCS -exec rm -rf {} \;
+-find $BUILD/$ROOTNAME -type d -exec rmdir {} \; 2>/dev/null
+-find $BUILD/$ROOTNAME -type d -exec rmdir {} \; 2>/dev/null
+-find $BUILD/$ROOTNAME -type d -exec rmdir {} \; 2>/dev/null
++find "$BUILD/$ROOTNAME" -type d -exec rmdir {} \; 2>/dev/null
++find "$BUILD/$ROOTNAME" -type d -exec rmdir {} \; 2>/dev/null
++find "$BUILD/$ROOTNAME" -type d -exec rmdir {} \; 2>/dev/null
+ 
+ # There is no need for this script in the tar file.
+-rm -f $ROOTNAME/make-tar.sh
++rm -f "$ROOTNAME/make-tar.sh"
+ 
+ # Remove build-artifacts.
+ find . -name "*.gz" -exec rm -rf {} \;
+@@ -165,10 +165,10 @@
+ # Cleanup timestamps
+ [ -n "$TOUCH_DIRS" ] && "$TOUCH_DIRS" "$ROOTNAME"
+ 
+-tar cf - $TAR_OPTIONS $ROOTNAME | gzip >"$DESTDIR/$ROOTNAME.tar.gz"
++tar cf - $TAR_OPTIONS "$ROOTNAME" | gzip >"$DESTDIR/$ROOTNAME.tar.gz"
+ cd "$DESTDIR" || exit
+ 
+ pwd
+-ls -l $ROOTNAME.tar.gz
++ls -l "$ROOTNAME.tar.gz"
+ 
+ # vi:ts=4 sw=4
+Index: Ada95/package/debian/adacurses.lintian-overrides
+--- /dev/null	2025-06-14 09:32:42.175999955 +0000
++++ ncurses-6.5-20250614/Ada95/package/debian/adacurses.lintian-overrides	2025-06-14 19:16:06.000000000 +0000
+@@ -0,0 +1,4 @@
++# $Id: adacurses.lintian-overrides,v 1.1 2025/06/14 19:16:06 tom Exp $
++
++# dh_fixperms sets *.ali to 444, but lintian disagrees
++non-standard-file-perm 0444 != 0644 [usr/lib/ada/adalib/*.ali]
+Index: Ada95/package/debian/adacurses.triggers
+--- /dev/null	2025-06-14 09:32:42.175999955 +0000
++++ ncurses-6.5-20250614/Ada95/package/debian/adacurses.triggers	2025-06-14 20:52:45.000000000 +0000
+@@ -0,0 +1 @@
++activate-noawait ldconfig
+Index: Ada95/package/debian/control
+--- ncurses-6.5-20250531+/Ada95/package/debian/control	2022-11-19 21:27:49.000000000 +0000
++++ ncurses-6.5-20250614/Ada95/package/debian/control	2025-06-14 20:44:33.000000000 +0000
+@@ -3,9 +3,10 @@
+ Section: misc
+ Priority: optional
+ Build-Depends: debhelper (>= 5),
++  chrpath,
+   gnat,
+   gprbuild
+-Homepage: https://invisible-island.net/adacurses/
++Homepage: https://invisible-island.net/ncurses/ncurses-Ada95.html
+ Standards-Version: 4.6.1.0
+ 
+ Package: adacurses
+Index: Ada95/package/debian/rules
+--- ncurses-6.5-20250531+/Ada95/package/debian/rules	2024-06-08 19:53:02.000000000 +0000
++++ ncurses-6.5-20250614/Ada95/package/debian/rules	2025-06-14 20:41:28.000000000 +0000
+@@ -1,11 +1,18 @@
+ #!/usr/bin/make -f
+-# MAde with the aid of dh_make, by Craig Small
++# $Id: rules,v 1.18 2025/06/14 20:41:28 tom Exp $
++# Made with the aid of dh_make, by Craig Small
+ # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
+ # Some lines taken from debmake, by Cristoph Lameter.
+ 
+ # Uncomment this to turn on verbose mode.
+ #export DH_VERBOSE=1
+ 
++SHELL = /bin/bash
++DPKG_EXPORT_BUILDFLAGS = 1
++export DEB_BUILD_MAINT_OPTIONS := hardening=+all qa=+bug reproducible=+all
++
++include /usr/share/dpkg/buildflags.mk
++
+ # These are used for cross-compiling and for saving the configure script
+ # from having to guess our platform (since we know it already)
+ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+@@ -13,10 +20,7 @@
+ 
+ TARGET_DIR = $(CURDIR)/debian/adacurses
+ SAMPLE_DIR = $(TARGET_DIR)/usr/libexec/AdaCurses
+-
+-CFLAGS   = $(shell dpkg-buildflags --get CFLAGS) $(CC_NORMAL)
+-CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+-LDFLAGS  = $(shell dpkg-buildflags --get LDFLAGS)
++OUR_LIBDIR = /usr/lib/$(DEB_HOST_GNU_TYPE)
+ 
+ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+         CFLAGS += -O0
+@@ -27,16 +31,16 @@
+         INSTALL_PROGRAM += -s
+ endif
+ 
++verbose = # -v
+ 
+ configure: configure-stamp
+ configure-stamp:
+ 	dh_testdir
+ 
+-	CFLAGS="$(CFLAGS)" \
+-	CPPFLAGS="$(CPPFLAGS)" \
+-	LDFLAGS="$(LDFLAGS)" ./configure \
++	./configure \
+ 		--host=$(DEB_HOST_GNU_TYPE) \
+ 		--build=$(DEB_BUILD_GNU_TYPE) \
++		--libdir=$(OUR_LIBDIR) \
+ 		--prefix=/usr \
+ 		--disable-rpath-link \
+ 		--with-shared \
+@@ -62,14 +66,14 @@
+ 
+ 	rm -f configure-stamp build-stamp install-stamp
+ 
+-	dh_clean
++	dh_clean             $(verbose)
+ 
+ install: install-stamp
+ install-stamp: build-stamp
+ 	dh_testdir
+ 	dh_testroot
+-	dh_prep
+-	dh_installdirs
++	dh_prep		     $(verbose)
++	dh_installdirs	     $(verbose)
+ 
+ 	$(MAKE) install DESTDIR=$(TARGET_DIR)
+ 
+@@ -77,6 +81,8 @@
+ 	( cd samples && $(MAKE) install.examples DESTDIR=$(TARGET_DIR) BINDIR=$(SAMPLE_DIR) )
+ 	( cd doc && $(MAKE) install.html DESTDIR=$(TARGET_DIR) )
+ 
++	find $(TARGET_DIR) -type f -name '*.so*' -print -exec chrpath -d {} \;
++
+ 	touch install-stamp
+ 
+ # Build architecture-independent files here.
+@@ -87,18 +93,19 @@
+ binary-arch: build install
+ 	dh_testdir
+ 	dh_testroot
+-	dh_installdocs
+-	dh_installexamples
+-	dh_installchangelogs NEWS
+-	dh_strip
+-	dh_compress
+-	dh_fixperms
+-	dh_installdeb
+-	dh_makeshlibs
+-	dh_shlibdeps
+-	dh_gencontrol
+-	dh_md5sums
+-	dh_builddeb
++	dh_lintian           $(verbose)
++	dh_installdocs       $(verbose)
++	dh_installexamples   $(verbose)
++	dh_installchangelogs $(verbose)  NEWS
++	dh_strip             $(verbose)
++	dh_compress	     $(verbose)
++	dh_fixperms	     $(verbose)
++	dh_installdeb	     $(verbose)
++	dh_makeshlibs	     $(verbose)
++	dh_shlibdeps	     $(verbose) -l$(OUR_LIBDIR)
++	dh_gencontrol	     $(verbose)
++	dh_md5sums	     $(verbose)
++	dh_builddeb	     $(verbose)
+ 
+ binary: binary-indep binary-arch
+ .PHONY: build clean binary-indep binary-arch binary install install-stamp
+Index: Ada95/samples/sample-menu_demo-handler.adb
+--- ncurses-6.5-20250531+/Ada95/samples/sample-menu_demo-handler.adb	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20250614/Ada95/samples/sample-menu_demo-handler.adb	2020-02-02 23:34:34.000000000 +0000
+@@ -16,7 +16,7 @@
+ -- 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 :                 --
++-- 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.                   --
+@@ -36,7 +36,7 @@
+ ------------------------------------------------------------------------------
+ --  Author:  Juergen Pfeifer, 1996
+ --  Version Control
+---  $Revision: 1.17 $
++--  $Revision: 1.18 $
+ --  $Date: 2020/02/02 23:34:34 $
+ --  Binding Version 01.00
+ ------------------------------------------------------------------------------
+Index: MANIFEST
+--- ncurses-6.5-20250531+/MANIFEST	2024-06-08 15:02:30.000000000 +0000
++++ ncurses-6.5-20250614/MANIFEST	2025-06-14 21:01:04.000000000 +0000
+@@ -36,6 +36,8 @@
+ ./Ada95/mk-pkg.awk
+ ./Ada95/package/AdaCurses-doc.spec
+ ./Ada95/package/AdaCurses.spec
++./Ada95/package/debian/adacurses.lintian-overrides
++./Ada95/package/debian/adacurses.triggers
+ ./Ada95/package/debian/compat
+ ./Ada95/package/debian/control
+ ./Ada95/package/debian/copyright
+@@ -1190,6 +1192,8 @@
+ ./test/package/debian/control
+ ./test/package/debian/copyright
+ ./test/package/debian/docs
++./test/package/debian/ncurses-examples.lintian-overrides
++./test/package/debian/ncursest-examples.lintian-overrides
+ ./test/package/debian/rules
+ ./test/package/debian/source/format
+ ./test/package/debian/watch
+Index: NEWS
+Prereq:  1.4288 
+--- ncurses-6.5-20250531+/NEWS	2025-05-31 22:33:49.000000000 +0000
++++ ncurses-6.5-20250614/NEWS	2025-06-14 20:49:26.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4288 2025/05/31 22:33:49 tom Exp $
++-- $Id: NEWS,v 1.4292 2025/06/14 20:49:26 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.
+ 
++20250614
++	+ reduce lintian warnings for test-packages.
++	+ clean up some shellcheck warnings
++	+ improve test/configure checks for X libraries, reducing duplicates
++	+ fix some typos/errata in license text, to help with scripted checks
++
+ 20250531
+ 	+ improve logic in misc/run_tic.in for constructing symbolic link
+ 	  when $DESTDIR is set.
+Index: VERSION
+--- ncurses-6.5-20250531+/VERSION	2025-05-31 10:03:25.000000000 +0000
++++ ncurses-6.5-20250614/VERSION	2025-06-14 09:46:03.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250531
++5:0:10	6.5	20250614
+Index: dist.mk
+Prereq:  1.1671 
+--- ncurses-6.5-20250531+/dist.mk	2025-05-31 10:03:25.000000000 +0000
++++ ncurses-6.5-20250614/dist.mk	2025-06-14 09:46:03.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1671 2025/05/31 10:03:25 tom Exp $
++# $Id: dist.mk,v 1.1673 2025/06/14 09:46:03 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 = 5
+-NCURSES_PATCH = 20250531
++NCURSES_PATCH = 20250614
+ 
+ # 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.24 
+--- ncurses-6.5-20250531+/include/MKkey_defs.sh	2024-01-19 12:26:17.000000000 +0000
++++ ncurses-6.5-20250614/include/MKkey_defs.sh	2025-06-14 14:44:56.000000000 +0000
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+-# $Id: MKkey_defs.sh,v 1.24 2024/01/19 12:26:17 tom Exp $
++# $Id: MKkey_defs.sh,v 1.25 2025/06/14 14:44:56 tom Exp $
+ ##############################################################################
+-# Copyright 2019-2022,2024 Thomas E. Dickey                                  #
++# Copyright 2019-2024,2025 Thomas E. Dickey                                  #
+ # Copyright 2001-2013,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -110,8 +110,8 @@
+ }
+ 
+ BEGIN	{
+-	maxkey='$maxkey';
+-	pass='$pass';
++	maxkey='"$maxkey"';
++	pass='"$pass"';
+ 	key_max=1;
+ 	bits=1;
+ 	while (key_max < maxkey) {
+Index: install-sh
+--- ncurses-6.5-20250531+/install-sh	2020-11-30 16:41:23.000000000 +0000
++++ ncurses-6.5-20250614/install-sh	2025-06-08 23:02:33.000000000 +0000
+@@ -3,10 +3,18 @@
+ 
+ scriptversion=2020-11-14.01; # UTC
+ 
++# https://lists.gnu.org/archive/html/automake/2018-09/msg00002.html
++#
++# Originally X11R4 util/scripts/install.sh, the following comments, copyright
++# and license were added by an autoconf developer in 1998 (about nine years
++# later).  I have made a minor change to the wording, i.e., "copyright holders"
++# vs "X Consortium", for reusability -TD
++#
++# -----------------------------------------------------------------------------
+ # This originates from X11R5 (mit/util/scripts/install.sh), which was
+ # later released in X11R6 (xc/config/util/install.sh) with the
+ # following copyright and license.
+-#
++# -----------------------------------------------------------------------------
+ # Copyright (C) 1994 X Consortium
+ #
+ # Permission is hereby granted, free of charge, to any person obtaining a copy
+@@ -22,16 +30,15 @@
+ # 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
+-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-#
+-# Except as contained in this notice, the name of the X Consortium shall not
+-# be used in advertising or otherwise to promote the sale, use or other deal-
+-# ings in this Software without prior written authorization from the X Consor-
+-# tium.
+-#
+-#
++# ABOVE LISTED COPYRIGHT HOLDER(S) 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.
++# -----------------------------------------------------------------------------
+ # FSF changes to this file are in the public domain.
+ #
+ # Calling this script install-sh is preferred over install.sh, to prevent
+Index: misc/gen_edit.sh
+Prereq:  1.7 
+--- ncurses-6.5-20250531+/misc/gen_edit.sh	2021-09-04 15:55:29.000000000 +0000
++++ ncurses-6.5-20250614/misc/gen_edit.sh	2025-06-14 15:10:44.000000000 +0000
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ ##############################################################################
+-# Copyright 2020,2021 Thomas E. Dickey                                       #
++# Copyright 2020-2021,2025 Thomas E. Dickey                                  #
+ # Copyright 2004-2011,2012 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -30,7 +30,7 @@
+ #
+ # Author: Thomas E. Dickey
+ #
+-# $Id: gen_edit.sh,v 1.7 2021/09/04 15:55:29 tom Exp $
++# $Id: gen_edit.sh,v 1.8 2025/06/14 15:10:44 tom Exp $
+ # Generate a sed-script for converting the terminfo.src to the form which will
+ # be installed.
+ #
+@@ -48,13 +48,13 @@
+ # If we're not installing into /usr/share/, we'll have to adjust the location
+ # of the tabset files in terminfo.src (which are in a parallel directory).
+ TABSET=${datadir}/tabset
+-if test "x$TABSET" != "x/usr/share/tabset" ; then
++if [ "x$TABSET" != "x/usr/share/tabset" ] ; then
+ cat <&2
+ cat <&2
+ cat </dev/null`
+-	if test "x$system" = xLinux
++	if [ "$system" = Linux ]
+ 	then
+ 		case x`uname -r` in
+ 		x1.*)
+@@ -108,7 +108,7 @@
+ 	;;
+ esac
+ 
+-if test $WHICH_LINUX != $linux_dft
++if [ "$WHICH_LINUX" != "$linux_dft" ]
+ then
+ echo "** using $WHICH_LINUX terminal description for Linux console" >&2
+ cat <$data
++if [ $# != 0 ]
++then
++	sed -e "$tabs" "$@" >$data
++else
++	sed -e "$tabs" ../../include/Caps >$data
++fi
+ 
+ cat <
+ #include 
+ 
+-MODULE_ID("$Id: comp_scan.c,v 1.125 2024/12/07 21:17:54 tom Exp $")
++MODULE_ID("$Id: comp_scan.c,v 1.126 2024/12/07 21:17:54 tom Exp $")
+ 
+ /*
+  * Maximum length of string capability we'll accept before raising an error.
+Index: ncurses/tinfo/lib_cur_term.c
+Prereq:  1.51 
+--- ncurses-6.5-20250531+/ncurses/tinfo/lib_cur_term.c	2024-12-14 23:48:20.000000000 +0000
++++ ncurses-6.5-20250614/ncurses/tinfo/lib_cur_term.c	2024-12-14 23:48:20.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+-,* Copyright 2020-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2022,2024 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.51 2024/12/14 23:48:20 tom Exp $")
++MODULE_ID("$Id: lib_cur_term.c,v 1.52 2024/12/14 23:48:20 tom Exp $")
+ 
+ #undef CUR
+ #define CUR TerminalType(termp).
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250531+/package/debian-mingw/changelog	2025-05-31 10:03:25.000000000 +0000
++++ ncurses-6.5-20250614/package/debian-mingw/changelog	2025-06-14 09:46:03.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250531) unstable; urgency=low
++ncurses6td (6.5+20250614) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 31 May 2025 06:03:25 -0400
++ -- Thomas E. Dickey   Sat, 14 Jun 2025 05:46:03 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250531+/package/debian-mingw64/changelog	2025-05-31 10:03:25.000000000 +0000
++++ ncurses-6.5-20250614/package/debian-mingw64/changelog	2025-06-14 09:46:03.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250531) unstable; urgency=low
++ncurses6td (6.5+20250614) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 31 May 2025 06:03:25 -0400
++ -- Thomas E. Dickey   Sat, 14 Jun 2025 05:46:03 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250531+/package/debian/changelog	2025-05-31 10:03:25.000000000 +0000
++++ ncurses-6.5-20250614/package/debian/changelog	2025-06-14 09:46:03.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250531) unstable; urgency=low
++ncurses6td (6.5+20250614) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 31 May 2025 06:03:25 -0400
++ -- Thomas E. Dickey   Sat, 14 Jun 2025 05:46:03 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/debian/ncurses6td.lintian-overrides
+--- ncurses-6.5-20250531+/package/debian/ncurses6td.lintian-overrides	2024-06-08 15:03:11.000000000 +0000
++++ ncurses-6.5-20250614/package/debian/ncurses6td.lintian-overrides	2025-06-14 19:43:41.000000000 +0000
+@@ -1,8 +1,10 @@
++# $Id: ncurses6td.lintian-overrides,v 1.3 2025/06/14 19:43:41 tom Exp $
++
+ # This is intentional.
+ ncurses6td: package-name-doesnt-match-sonames libformw6-6 libmenuw6-6 libncurses++w6-6 libncursesw6-6 libpanelw6-6 libticw6-6 libtinfow6-6
+ 
+ # This is intentional.
+-ncurses6td: binary-without-manpage
++ncurses6td: no-manual-page
+ ncurses6td: non-dev-pkg-with-shlib-symlink
+ ncurses6td: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfow6.so.6.5]
+ 
+Index: package/debian/ncursest6td.lintian-overrides
+--- ncurses-6.5-20250531+/package/debian/ncursest6td.lintian-overrides	2024-06-08 15:02:57.000000000 +0000
++++ ncurses-6.5-20250614/package/debian/ncursest6td.lintian-overrides	2025-06-14 19:43:41.000000000 +0000
+@@ -1,8 +1,10 @@
++# $Id: ncursest6td.lintian-overrides,v 1.3 2025/06/14 19:43:41 tom Exp $
++
+ # This is intentional.
+ ncursest6td: package-name-doesnt-match-sonames libformtw6-6 libmenutw6-6 libncurses++tw6-6 libncursestw6-6 libpaneltw6-6 libtictw6-6 libtinfotw6-6
+ 
+ # This is intentional.
+-ncursest6td: binary-without-manpage
++ncursest6td: no-manual-page
+ ncursest6td: non-dev-pkg-with-shlib-symlink
+ ncursest6td: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfotw6.so.6.5]
+ 
+Index: package/debian/rules
+Prereq:  1.57 
+--- ncurses-6.5-20250531+/package/debian/rules	2024-06-08 17:51:52.000000000 +0000
++++ ncurses-6.5-20250614/package/debian/rules	2025-06-14 21:15:38.000000000 +0000
+@@ -1,13 +1,12 @@
+ #!/usr/bin/make -f
+-# $Id: rules,v 1.57 2024/06/08 17:51:52 tom Exp $
++# $Id: rules,v 1.58 2025/06/14 21:15:38 tom Exp $
+ 
+ # Uncomment this to turn on verbose mode.
+ #export DH_VERBOSE=1
+ 
+ SHELL = /bin/bash
+ DPKG_EXPORT_BUILDFLAGS = 1
+-
+-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
++export DEB_BUILD_MAINT_OPTIONS := hardening=+all qa=+bug reproducible=+all
+ 
+ include /usr/share/dpkg/buildflags.mk
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.705 
+--- ncurses-6.5-20250531+/package/mingw-ncurses.nsi	2025-05-31 10:03:25.000000000 +0000
++++ ncurses-6.5-20250614/package/mingw-ncurses.nsi	2025-06-14 09:46:03.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.705 2025/05/31 10:03:25 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.707 2025/06/14 09:46:03 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0531"
++!define VERSION_MMDD  "0614"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250531+/package/mingw-ncurses.spec	2025-05-31 10:03:25.000000000 +0000
++++ ncurses-6.5-20250614/package/mingw-ncurses.spec	2025-06-14 09:46:03.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250531
++Release: 20250614
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncurses.spec
+--- ncurses-6.5-20250531+/package/ncurses.spec	2025-05-31 10:03:25.000000000 +0000
++++ ncurses-6.5-20250614/package/ncurses.spec	2025-06-14 09:46:03.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250531
++Release: 20250614
+ License: X11
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+Index: package/ncursest.spec
+--- ncurses-6.5-20250531+/package/ncursest.spec	2025-05-31 10:03:25.000000000 +0000
++++ ncurses-6.5-20250614/package/ncursest.spec	2025-06-14 09:46:03.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250531
++Release: 20250614
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/capconvert
+Prereq:  1.12 
+--- ncurses-6.5-20250531+/progs/capconvert	2022-07-16 21:00:27.000000000 +0000
++++ ncurses-6.5-20250614/progs/capconvert	2025-06-14 15:16:35.000000000 +0000
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ ##############################################################################
+-# Copyright 2019-2021,2022 Thomas E. Dickey                                  #
++# Copyright 2019-2022,2025 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.12 2022/07/16 21:00:27 tom Exp $
++# $Id: capconvert,v 1.13 2025/06/14 15:16:35 tom Exp $
+ #
+ # capconvert -- automated conversion from termcap to terminfo
+ #
+@@ -42,12 +42,12 @@
+ # case they're on a workstation and probably don't.
+ 
+ # Check to make sure TERMINFO is not already defined
+-if test -n "$TERMINFO"
++if [ -n "$TERMINFO" ]
+ then
+ 	echo "TERMINFO is already defined in your environment.  This means"
+ 	echo "you already have a local terminfo tree, so you do not need any"
+ 	echo "conversion."
+-	if test ! -d "$TERMINFO" ; then
++	if [ ! -d "$TERMINFO" ] ; then
+ 		echo "Caution: TERMINFO does not point to a directory!"
+ 	fi
+ 	exit;
+@@ -62,17 +62,17 @@
+ 	/usr/local/lib/terminfo \
+ 	/usr/local/share/terminfo
+ do
+-	if test -d "$p" ; then
++	if [ -d "$p" ] ; then
+ 		terminfo=yes
+ 		break
+ 	fi
+ done
+ 
+-if test $terminfo = yes
++if [ $terminfo = yes ]
+ then
+ 	echo "Your system already has a system-wide terminfo tree."
+ 	echo ""
+-	if test -z "$TERMCAP"
++	if [ -z "$TERMCAP" ]
+ 	then
+ 		echo "You have no TERMCAP variable set, so we are done."
+ 		# Assumes the terminfo master covers all canned terminal types
+@@ -97,7 +97,7 @@
+ 
+ # Check if test -x works (it is not portable, but useful)
+ OPT="-x"
+-TMP=test$$; touch $TMP && chmod 755 $TMP
++TMP="test$$"; touch "$TMP" && chmod 755 "$TMP"
+ if test $OPT $TMP ; then
+ 	chmod 644 $TMP
+ 	test $OPT $TMP && OPT="-f"
+@@ -119,7 +119,7 @@
+ done
+ IFS="$save_ifs"
+ 
+-if test -n "$TIC"
++if [ -n "$TIC" ]
+ then
+ 	echo "I see tic at $TIC."
+ 	case $TIC in # (vi
+@@ -140,7 +140,7 @@
+ #
+ 
+ # Make the user a terminfo directory
+-if test -d "$HOME"/.terminfo
++if [ -d "$HOME"/.terminfo ]
+ then
+ 	echo "It appears you already have a private terminfo directory"
+ 	echo "at $HOME/.terminfo; this seems odd, because TERMINFO"
+@@ -158,7 +158,7 @@
+ echo "";
+ 
+ # Find a terminfo source to work from
+-if test -f ../misc/terminfo.src
++if [ -f ../misc/terminfo.src ]
+ then
+ 	echo "I see the terminfo master source is handy; I will use that."
+ 	master=../misc/terminfo.src
+@@ -189,7 +189,7 @@
+ 		do
+ 			echo "Please tell me which one to use:"
+ 			read master;
+-			if test -f "$master"
++			if [ -f "$master" ]
+ 			then
+ 				break
+ 			else
+@@ -209,11 +209,11 @@
+ 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 \
++	-e '1,/SPLIT HERE/w '"tsplit$$.01" \
++	-e '/SPLIT HERE/,$w '"tsplit$$.02" \
+ 	2>/dev/null
+-for x in tsplit$$.*; do eval $TIC "$x"; done
+-rm tsplit$$.*
++for x in ./tsplit$$.*; do eval "$TIC" "$x"; done
++rm ./tsplit$$.*
+ trap EXIT INT QUIT TERM HUP
+ #
+ echo "You now have a private tree under $HOME/.terminfo;"
+@@ -221,7 +221,7 @@
+ echo "and ncurses tic will automatically compile entries to it."
+ 
+ # We're done unless user has a .termcap file or equivalent named by TERMCAP
+-if test -z "$TERMCAP"
++if [ -z "$TERMCAP" ]
+ then
+ 	echo "You have no TERMCAP set, so we are done."
+ fi
+@@ -232,23 +232,23 @@
+ # we don't actually know what TERM will be nor even if it always has
+ # the same value for this user) we do the following three steps...
+ 
+-if test -f "$HOME"/.termcap
++if [ -f "$HOME"/.termcap ]
+ then
+ 	echo "I see you have a \$HOME/.termcap file.  I will compile that."
+-	eval $TIC "$HOME"/.termcap
++	eval "$TIC" "$HOME"/.termcap
+ 	echo "Done."
+ 	echo "Note that editing $HOME/.termcap will no longer change the data curses sees."
+-elif test -f "$TERMCAP"
++elif [ -f "$TERMCAP" ]
+ then
+ 	echo "Your TERMCAP names the file $TERMCAP.  I will compile that."
+-	eval $TIC "$TERMCAP"
++	eval "$TIC" "$TERMCAP"
+ 	echo "Done."
+ 	echo "Note that editing $TERMCAP will no longer change the data curses sees."
+ else
+ 	echo "Your TERMCAP value appears to be an entry in termcap format."
+ 	echo "I will compile it."
+ 	echo "$TERMCAP" >myterm$$
+-	eval $TIC myterm$$
++	eval "$TIC" myterm$$
+ 	rm myterm$$
+ 	echo "Done."
+ 	echo "Note that editing TERMCAP will no longer change the data curses sees."
+Index: test/aclocal.m4
+Prereq:  1.232 
+--- ncurses-6.5-20250531+/test/aclocal.m4	2025-01-12 18:41:15.000000000 +0000
++++ ncurses-6.5-20250614/test/aclocal.m4	2025-06-14 10:46:23.000000000 +0000
+@@ -27,7 +27,7 @@
+ dnl authorization.                                                           *
+ dnl***************************************************************************
+ dnl
+-dnl $Id: aclocal.m4,v 1.232 2025/01/12 18:41:15 tom Exp $
++dnl $Id: aclocal.m4,v 1.233 2025/06/14 10:46:23 tom Exp $
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+@@ -312,17 +312,51 @@
+ ifelse($2,,LIBS,[$2])="$cf_add_libs"
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_ADD_LIB_AFTER version: 3 updated: 2013/07/09 21:27:22
++dnl CF_ADD_LIB_AFTER version: 4 updated: 2025/06/14 06:46:23
+ dnl ----------------
+ dnl Add a given library after another, e.g., following the one it satisfies a
+ dnl dependency for.
+ dnl
+ dnl $1 = the first library
+ dnl $2 = its dependency
++dnl $3 = variable to update (default $LIBS)
+ AC_DEFUN([CF_ADD_LIB_AFTER],[
+-CF_VERBOSE(...before $LIBS)
+-LIBS=`echo "$LIBS" | sed -e "s/[[ 	]][[ 	]]*/ /g" -e "s%$1 %$1 $2 %" -e 's%  % %g'`
+-CF_VERBOSE(...after  $LIBS)
++cf_add_libs="[$]ifelse($3,,LIBS,[$3])"
++CF_VERBOSE(...before $cf_add_libs)
++for cf_add_1lib in $2; do
++	# filter duplicates
++	cf_found_2lib=no
++	for cf_add_2lib in $cf_add_libs; do
++		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
++			cf_found_2lib=yes
++			break
++		fi
++	done
++	# if not a duplicate, find the dependent library
++	if test "$cf_found_2lib" = no
++	then
++		cf_found_2lib=no
++		cf_add_2libs=
++		for cf_add_2lib in $cf_add_libs
++		do
++			test -n "$cf_add_2libs" && cf_add_2libs="$cf_add_2libs "
++			cf_add_2libs="$cf_add_2libs$cf_add_2lib"
++			if test "x$cf_add_2lib" = "x$1"
++			then
++				cf_found_2lib=yes
++				cf_add_2libs="$cf_add_2libs $cf_add_1lib"
++			fi
++		done
++		if test "$cf_found_2lib" = yes
++		then
++			cf_add_libs="$cf_add_2libs"
++		else
++			CF_VERBOSE(...missed $1)
++		fi
++	fi
++done
++CF_VERBOSE(...after  $cf_add_libs)
++ifelse($3,,LIBS,[$3])="$cf_add_libs"
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+ dnl CF_ADD_SUBDIR_PATH version: 5 updated: 2020/12/31 20:19:42
+@@ -4739,7 +4773,7 @@
+ fi # cf_cv_posix_visible
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_X_ATHENA version: 25 updated: 2023/01/11 04:05:23
++dnl CF_X_ATHENA version: 26 updated: 2025/06/14 06:46:23
+ dnl -----------
+ dnl Check for Xaw (Athena) libraries
+ dnl
+@@ -4809,8 +4843,6 @@
+ 			CF_UPPER(cf_x_athena_LIBS,HAVE_LIB_$cf_x_athena)
+ 			AC_DEFINE_UNQUOTED($cf_x_athena_LIBS)
+ 
+-			CF_TRIM_X_LIBS
+-
+ AC_CACHE_CHECK(for usable $cf_x_athena/Xmu package,cf_cv_xaw_compat,[
+ AC_TRY_LINK([
+ $ac_includes_default
+@@ -4836,7 +4868,6 @@
+ 						],[
+ 							CF_ADD_LIB_AFTER($cf_first_lib,-lXmu)
+ 						])
+-					CF_TRIM_X_LIBS
+ 					;;
+ 				esac
+ 			fi
+Index: test/combine.c
+Prereq:  1.26 
+--- ncurses-6.5-20250531+/test/combine.c	2024-12-07 22:22:51.000000000 +0000
++++ ncurses-6.5-20250614/test/combine.c	2024-12-07 22:22:51.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+-,* Copyright 2021-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2021-2022,2024 Thomas E. Dickey                                *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: combine.c,v 1.26 2024/12/07 22:22:51 tom Exp $
++ * $Id: combine.c,v 1.27 2024/12/07 22:22:51 tom Exp $
+  */
+ 
+ #include 
+Index: test/configure
+--- ncurses-6.5-20250531+/test/configure	2025-01-12 18:41:15.000000000 +0000
++++ ncurses-6.5-20250614/test/configure	2025-06-14 13:40:22.000000000 +0000
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by Autoconf 2.52.20240618.
++# Generated by Autoconf 2.52.20250126.
+ #
+ # Copyright 2003-2022,2023	Thomas E. Dickey
+ # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+@@ -812,7 +812,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.52.20240618.  Invocation command line was
++generated by GNU Autoconf 2.52.20250126.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -14123,27 +14123,14 @@
+ #define $cf_x_athena_LIBS 1
+ EOF
+ 
+-	for cf_trim_lib in Xmu Xt X11
+-	do
+-		case "$LIBS" in
+-		(*-l$cf_trim_lib\ *-l$cf_trim_lib*)
+-			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
+-			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
+-
+-echo "${as_me:-configure}:14133: testing ..trimmed $LIBS ..." 1>&5
+-
+-			;;
+-		esac
+-	done
+-
+-echo "$as_me:14139: checking for usable $cf_x_athena/Xmu package" >&5
++echo "$as_me:14126: checking for usable $cf_x_athena/Xmu package" >&5
+ echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
+ if test "${cf_cv_xaw_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14146 "configure"
++#line 14133 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14161,16 +14148,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14164: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14151: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14167: \$? = $ac_status" >&5
++  echo "$as_me:14154: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14170: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14157: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14173: \$? = $ac_status" >&5
++  echo "$as_me:14160: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xaw_compat=yes
+ else
+@@ -14180,7 +14167,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14183: result: $cf_cv_xaw_compat" >&5
++echo "$as_me:14170: result: $cf_cv_xaw_compat" >&5
+ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
+ 
+ 			if test "$cf_cv_xaw_compat" = no
+@@ -14192,7 +14179,7 @@
+ 				(*)
+ 					test -n "$verbose" && echo "	work around broken package" 1>&6
+ 
+-echo "${as_me:-configure}:14195: testing work around broken package ..." 1>&5
++echo "${as_me:-configure}:14182: testing work around broken package ..." 1>&5
+ 
+ 					cf_save_xmu="$LIBS"
+ 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
+@@ -14200,17 +14187,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
+ 	test -n "$verbose" && echo "	found package xmu" 1>&6
+ 
+-echo "${as_me:-configure}:14203: testing found package xmu ..." 1>&5
++echo "${as_me:-configure}:14190: testing found package xmu ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xmu" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xmu" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14209: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14196: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xmu LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14213: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14200: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ for cf_required in xmu
+ do
+@@ -14342,42 +14329,103 @@
+ 
+ 							LIBS="$cf_save_xmu"
+ 
+-test -n "$verbose" && echo "	...before $LIBS" 1>&6
++cf_add_libs="$LIBS"
++test -n "$verbose" && echo "	...before $cf_add_libs" 1>&6
++
++echo "${as_me:-configure}:14335: testing ...before $cf_add_libs ..." 1>&5
++
++for cf_add_1lib in $cf_pkgconfig_libs; do
++	# filter duplicates
++	cf_found_2lib=no
++	for cf_add_2lib in $cf_add_libs; do
++		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
++			cf_found_2lib=yes
++			break
++		fi
++	done
++	# if not a duplicate, find the dependent library
++	if test "$cf_found_2lib" = no
++	then
++		cf_found_2lib=no
++		cf_add_2libs=
++		for cf_add_2lib in $cf_add_libs
++		do
++			test -n "$cf_add_2libs" && cf_add_2libs="$cf_add_2libs "
++			cf_add_2libs="$cf_add_2libs$cf_add_2lib"
++			if test "x$cf_add_2lib" = "x$cf_first_lib"
++			then
++				cf_found_2lib=yes
++				cf_add_2libs="$cf_add_2libs $cf_add_1lib"
++			fi
++		done
++		if test "$cf_found_2lib" = yes
++		then
++			cf_add_libs="$cf_add_2libs"
++		else
++			test -n "$verbose" && echo "	...missed $cf_first_lib" 1>&6
++
++echo "${as_me:-configure}:14367: testing ...missed $cf_first_lib ..." 1>&5
+ 
+-echo "${as_me:-configure}:14347: testing ...before $LIBS ..." 1>&5
++		fi
++	fi
++done
++test -n "$verbose" && echo "	...after  $cf_add_libs" 1>&6
+ 
+-LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
+-test -n "$verbose" && echo "	...after  $LIBS" 1>&6
++echo "${as_me:-configure}:14374: testing ...after  $cf_add_libs ..." 1>&5
+ 
+-echo "${as_me:-configure}:14352: testing ...after  $LIBS ..." 1>&5
++LIBS="$cf_add_libs"
+ 
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+ 
+-test -n "$verbose" && echo "	...before $LIBS" 1>&6
++cf_add_libs="$LIBS"
++test -n "$verbose" && echo "	...before $cf_add_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14360: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:14385: testing ...before $cf_add_libs ..." 1>&5
+ 
+-LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
+-test -n "$verbose" && echo "	...after  $LIBS" 1>&6
++for cf_add_1lib in -lXmu; do
++	# filter duplicates
++	cf_found_2lib=no
++	for cf_add_2lib in $cf_add_libs; do
++		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
++			cf_found_2lib=yes
++			break
++		fi
++	done
++	# if not a duplicate, find the dependent library
++	if test "$cf_found_2lib" = no
++	then
++		cf_found_2lib=no
++		cf_add_2libs=
++		for cf_add_2lib in $cf_add_libs
++		do
++			test -n "$cf_add_2libs" && cf_add_2libs="$cf_add_2libs "
++			cf_add_2libs="$cf_add_2libs$cf_add_2lib"
++			if test "x$cf_add_2lib" = "x$cf_first_lib"
++			then
++				cf_found_2lib=yes
++				cf_add_2libs="$cf_add_2libs $cf_add_1lib"
++			fi
++		done
++		if test "$cf_found_2lib" = yes
++		then
++			cf_add_libs="$cf_add_2libs"
++		else
++			test -n "$verbose" && echo "	...missed $cf_first_lib" 1>&6
+ 
+-echo "${as_me:-configure}:14365: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:14417: testing ...missed $cf_first_lib ..." 1>&5
+ 
+-fi
++		fi
++	fi
++done
++test -n "$verbose" && echo "	...after  $cf_add_libs" 1>&6
+ 
+-	for cf_trim_lib in Xmu Xt X11
+-	do
+-		case "$LIBS" in
+-		(*-l$cf_trim_lib\ *-l$cf_trim_lib*)
+-			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
+-			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
++echo "${as_me:-configure}:14424: testing ...after  $cf_add_libs ..." 1>&5
+ 
+-echo "${as_me:-configure}:14376: testing ..trimmed $LIBS ..." 1>&5
++LIBS="$cf_add_libs"
+ 
+-			;;
+-		esac
+-	done
++fi
+ 
+ 					;;
+ 				esac
+@@ -14398,17 +14446,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
+ 	test -n "$verbose" && echo "	found package Xext" 1>&6
+ 
+-echo "${as_me:-configure}:14401: testing found package Xext ..." 1>&5
++echo "${as_me:-configure}:14449: testing found package Xext ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "Xext" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "Xext" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14407: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14455: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package Xext LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14411: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14459: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ for cf_required in Xext
+ do
+@@ -14543,7 +14591,7 @@
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+ 
+-	echo "$as_me:14546: checking for XextCreateExtension in -lXext" >&5
++	echo "$as_me:14594: checking for XextCreateExtension in -lXext" >&5
+ echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14551,7 +14599,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXext  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14554 "configure"
++#line 14602 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14570,16 +14618,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14573: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14621: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14576: \$? = $ac_status" >&5
++  echo "$as_me:14624: \$? = $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:14627: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14582: \$? = $ac_status" >&5
++  echo "$as_me:14630: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_Xext_XextCreateExtension=yes
+ else
+@@ -14590,7 +14638,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14593: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
++echo "$as_me:14641: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
+ if test "$ac_cv_lib_Xext_XextCreateExtension" = yes; then
+ 
+@@ -14626,17 +14674,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
+ 	test -n "$verbose" && echo "	found package x11" 1>&6
+ 
+-echo "${as_me:-configure}:14629: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:14677: testing found package x11 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "x11" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14635: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14683: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14639: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14687: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ for cf_required in x11
+ do
+@@ -14770,24 +14818,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:14773: WARNING: unable to find X11 library" >&5
++	{ echo "$as_me:14821: WARNING: unable to find X11 library" >&5
+ echo "$as_me: WARNING: unable to find X11 library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then
+ 	test -n "$verbose" && echo "	found package ice" 1>&6
+ 
+-echo "${as_me:-configure}:14780: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:14828: testing found package ice ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "ice" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14786: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14834: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14790: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14838: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ for cf_required in ice
+ do
+@@ -14921,24 +14969,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:14924: WARNING: unable to find ICE library" >&5
++	{ echo "$as_me:14972: WARNING: unable to find ICE library" >&5
+ echo "$as_me: WARNING: unable to find ICE library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
+ 	test -n "$verbose" && echo "	found package sm" 1>&6
+ 
+-echo "${as_me:-configure}:14931: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:14979: testing found package sm ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "sm" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:14937: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:14985: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:14941: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:14989: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ for cf_required in sm
+ do
+@@ -15072,24 +15120,24 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:15075: WARNING: unable to find SM library" >&5
++	{ echo "$as_me:15123: WARNING: unable to find SM library" >&5
+ echo "$as_me: WARNING: unable to find SM library" >&2;}
+ fi
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
+ 	test -n "$verbose" && echo "	found package xt" 1>&6
+ 
+-echo "${as_me:-configure}:15082: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:15130: testing found package xt ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xt" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15088: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15136: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15092: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15140: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ for cf_required in xt
+ do
+@@ -15223,7 +15271,7 @@
+ else
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+-	{ echo "$as_me:15226: WARNING: unable to find Xt library" >&5
++	{ echo "$as_me:15274: WARNING: unable to find Xt library" >&5
+ echo "$as_me: WARNING: unable to find Xt library" >&2;}
+ fi
+ 
+@@ -15236,17 +15284,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
+ 	test -n "$verbose" && echo "	found package xt" 1>&6
+ 
+-echo "${as_me:-configure}:15239: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:15287: testing found package xt ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xt" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15245: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15293: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15249: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15297: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ for cf_required in xt
+ do
+@@ -15381,14 +15429,14 @@
+ 		;;
+ 	(*)
+ # we have an "xt" package, but it may omit Xt's dependency on X11
+-echo "$as_me:15384: checking for usable X dependency" >&5
++echo "$as_me:15432: checking for usable X dependency" >&5
+ echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
+ if test "${cf_cv_xt_x11_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15391 "configure"
++#line 15439 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -15408,16 +15456,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15411: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15459: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15414: \$? = $ac_status" >&5
++  echo "$as_me:15462: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15417: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15465: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15420: \$? = $ac_status" >&5
++  echo "$as_me:15468: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xt_x11_compat=yes
+ else
+@@ -15427,30 +15475,30 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15430: result: $cf_cv_xt_x11_compat" >&5
++echo "$as_me:15478: result: $cf_cv_xt_x11_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
+ 		if test "$cf_cv_xt_x11_compat" = no
+ 		then
+ 			test -n "$verbose" && echo "	work around broken X11 dependency" 1>&6
+ 
+-echo "${as_me:-configure}:15436: testing work around broken X11 dependency ..." 1>&5
++echo "${as_me:-configure}:15484: testing work around broken X11 dependency ..." 1>&5
+ 
+ 			# 2010/11/19 - good enough until a working Xt on Xcb is delivered.
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
+ 	test -n "$verbose" && echo "	found package x11" 1>&6
+ 
+-echo "${as_me:-configure}:15443: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:15491: testing found package x11 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "x11" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15449: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15497: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15453: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15501: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ for cf_required in x11
+ do
+@@ -15585,14 +15633,51 @@
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+ 
+-test -n "$verbose" && echo "	...before $LIBS" 1>&6
++cf_add_libs="$LIBS"
++test -n "$verbose" && echo "	...before $cf_add_libs" 1>&6
++
++echo "${as_me:-configure}:15639: testing ...before $cf_add_libs ..." 1>&5
++
++for cf_add_1lib in -lX11; do
++	# filter duplicates
++	cf_found_2lib=no
++	for cf_add_2lib in $cf_add_libs; do
++		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
++			cf_found_2lib=yes
++			break
++		fi
++	done
++	# if not a duplicate, find the dependent library
++	if test "$cf_found_2lib" = no
++	then
++		cf_found_2lib=no
++		cf_add_2libs=
++		for cf_add_2lib in $cf_add_libs
++		do
++			test -n "$cf_add_2libs" && cf_add_2libs="$cf_add_2libs "
++			cf_add_2libs="$cf_add_2libs$cf_add_2lib"
++			if test "x$cf_add_2lib" = "x-lXt"
++			then
++				cf_found_2lib=yes
++				cf_add_2libs="$cf_add_2libs $cf_add_1lib"
++			fi
++		done
++		if test "$cf_found_2lib" = yes
++		then
++			cf_add_libs="$cf_add_2libs"
++		else
++			test -n "$verbose" && echo "	...missed -lXt" 1>&6
++
++echo "${as_me:-configure}:15671: testing ...missed -lXt ..." 1>&5
+ 
+-echo "${as_me:-configure}:15590: testing ...before $LIBS ..." 1>&5
++		fi
++	fi
++done
++test -n "$verbose" && echo "	...after  $cf_add_libs" 1>&6
+ 
+-LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
+-test -n "$verbose" && echo "	...after  $LIBS" 1>&6
++echo "${as_me:-configure}:15678: testing ...after  $cf_add_libs ..." 1>&5
+ 
+-echo "${as_me:-configure}:15595: testing ...after  $LIBS ..." 1>&5
++LIBS="$cf_add_libs"
+ 
+ fi
+ 
+@@ -15600,14 +15685,14 @@
+ 		;;
+ 	esac
+ 
+-echo "$as_me:15603: checking for usable X Toolkit package" >&5
++echo "$as_me:15688: checking for usable X Toolkit package" >&5
+ echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
+ if test "${cf_cv_xt_ice_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15610 "configure"
++#line 15695 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -15623,16 +15708,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15626: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15711: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15629: \$? = $ac_status" >&5
++  echo "$as_me:15714: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15632: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15717: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15635: \$? = $ac_status" >&5
++  echo "$as_me:15720: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xt_ice_compat=yes
+ else
+@@ -15642,7 +15727,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15645: result: $cf_cv_xt_ice_compat" >&5
++echo "$as_me:15730: result: $cf_cv_xt_ice_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
+ 
+ 	if test "$cf_cv_xt_ice_compat" = no
+@@ -15656,22 +15741,22 @@
+ 			(*)
+ 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
+ 
+-echo "${as_me:-configure}:15659: testing work around broken ICE dependency ..." 1>&5
++echo "${as_me:-configure}:15744: testing work around broken ICE dependency ..." 1>&5
+ 
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then
+ 	test -n "$verbose" && echo "	found package ice" 1>&6
+ 
+-echo "${as_me:-configure}:15664: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:15749: testing found package ice ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "ice" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15670: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15755: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15674: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15759: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ for cf_required in ice
+ do
+@@ -15804,17 +15889,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
+ 	test -n "$verbose" && echo "	found package sm" 1>&6
+ 
+-echo "${as_me:-configure}:15807: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:15892: testing found package sm ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "sm" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:15813: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:15898: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:15817: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:15902: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ for cf_required in sm
+ do
+@@ -15955,14 +16040,51 @@
+ 	cf_pkgconfig_incs=
+ 	cf_pkgconfig_libs=
+ 
+-test -n "$verbose" && echo "	...before $LIBS" 1>&6
++cf_add_libs="$LIBS"
++test -n "$verbose" && echo "	...before $cf_add_libs" 1>&6
++
++echo "${as_me:-configure}:16046: testing ...before $cf_add_libs ..." 1>&5
++
++for cf_add_1lib in $X_PRE_LIBS; do
++	# filter duplicates
++	cf_found_2lib=no
++	for cf_add_2lib in $cf_add_libs; do
++		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
++			cf_found_2lib=yes
++			break
++		fi
++	done
++	# if not a duplicate, find the dependent library
++	if test "$cf_found_2lib" = no
++	then
++		cf_found_2lib=no
++		cf_add_2libs=
++		for cf_add_2lib in $cf_add_libs
++		do
++			test -n "$cf_add_2libs" && cf_add_2libs="$cf_add_2libs "
++			cf_add_2libs="$cf_add_2libs$cf_add_2lib"
++			if test "x$cf_add_2lib" = "x-lXt"
++			then
++				cf_found_2lib=yes
++				cf_add_2libs="$cf_add_2libs $cf_add_1lib"
++			fi
++		done
++		if test "$cf_found_2lib" = yes
++		then
++			cf_add_libs="$cf_add_2libs"
++		else
++			test -n "$verbose" && echo "	...missed -lXt" 1>&6
++
++echo "${as_me:-configure}:16078: testing ...missed -lXt ..." 1>&5
+ 
+-echo "${as_me:-configure}:15960: testing ...before $LIBS ..." 1>&5
++		fi
++	fi
++done
++test -n "$verbose" && echo "	...after  $cf_add_libs" 1>&6
+ 
+-LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
+-test -n "$verbose" && echo "	...after  $LIBS" 1>&6
++echo "${as_me:-configure}:16085: testing ...after  $cf_add_libs ..." 1>&5
+ 
+-echo "${as_me:-configure}:15965: testing ...after  $LIBS ..." 1>&5
++LIBS="$cf_add_libs"
+ 
+ fi
+ 
+@@ -15982,7 +16104,7 @@
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15985: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16107: testing checking additions to CFLAGS ..." 1>&5
+ 
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -16067,7 +16189,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:16070: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:16192: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -16077,7 +16199,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:16080: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:16202: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -16087,7 +16209,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}:16090: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:16212: 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"
+@@ -16096,7 +16218,7 @@
+ 
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16099 "configure"
++#line 16221 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -16108,16 +16230,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16111: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16233: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16114: \$? = $ac_status" >&5
++  echo "$as_me:16236: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16117: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16239: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16120: \$? = $ac_status" >&5
++  echo "$as_me:16242: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -16125,12 +16247,12 @@
+ cat "conftest.$ac_ext" >&5
+ test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16128: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16250: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+ 
+ 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
+ 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16133: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16255: testing but keeping change to \$CPPFLAGS ..." 1>&5
+ 
+ 	 fi
+ 	 CFLAGS="$cf_check_cflags"
+@@ -16138,13 +16260,13 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+ 
+-	echo "$as_me:16141: checking for XOpenDisplay" >&5
++	echo "$as_me:16263: checking for XOpenDisplay" >&5
+ echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
+ if test "${ac_cv_func_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16147 "configure"
++#line 16269 "configure"
+ #include "confdefs.h"
+ #define XOpenDisplay autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16175,16 +16297,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16178: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16300: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16181: \$? = $ac_status" >&5
++  echo "$as_me:16303: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16184: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16306: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16187: \$? = $ac_status" >&5
++  echo "$as_me:16309: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_XOpenDisplay=yes
+ else
+@@ -16194,13 +16316,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16197: result: $ac_cv_func_XOpenDisplay" >&5
++echo "$as_me:16319: result: $ac_cv_func_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
+ if test "$ac_cv_func_XOpenDisplay" = yes; then
+   :
+ else
+ 
+-	echo "$as_me:16203: checking for XOpenDisplay in -lX11" >&5
++	echo "$as_me:16325: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16208,7 +16330,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16211 "configure"
++#line 16333 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16227,16 +16349,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16230: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16352: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16233: \$? = $ac_status" >&5
++  echo "$as_me:16355: \$? = $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:16358: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16239: \$? = $ac_status" >&5
++  echo "$as_me:16361: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -16247,7 +16369,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16250: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:16372: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then
+ 
+@@ -16271,13 +16393,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:16274: checking for XtAppInitialize" >&5
++	echo "$as_me:16396: checking for XtAppInitialize" >&5
+ echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
+ if test "${ac_cv_func_XtAppInitialize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16280 "configure"
++#line 16402 "configure"
+ #include "confdefs.h"
+ #define XtAppInitialize autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16308,16 +16430,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16311: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16433: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16314: \$? = $ac_status" >&5
++  echo "$as_me:16436: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16317: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16439: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16320: \$? = $ac_status" >&5
++  echo "$as_me:16442: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_XtAppInitialize=yes
+ else
+@@ -16327,13 +16449,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16330: result: $ac_cv_func_XtAppInitialize" >&5
++echo "$as_me:16452: result: $ac_cv_func_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
+ if test "$ac_cv_func_XtAppInitialize" = yes; then
+   :
+ else
+ 
+-	echo "$as_me:16336: checking for XtAppInitialize in -lXt" >&5
++	echo "$as_me:16458: checking for XtAppInitialize in -lXt" >&5
+ echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
+ if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16341,7 +16463,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16344 "configure"
++#line 16466 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16360,16 +16482,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16363: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16485: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16366: \$? = $ac_status" >&5
++  echo "$as_me:16488: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16369: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16491: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16372: \$? = $ac_status" >&5
++  echo "$as_me:16494: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_Xt_XtAppInitialize=yes
+ else
+@@ -16380,7 +16502,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16383: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
++echo "$as_me:16505: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
+ if test "$ac_cv_lib_Xt_XtAppInitialize" = yes; then
+ 
+@@ -16397,7 +16519,7 @@
+ fi
+ 
+ if test "$cf_have_X_LIBS" = no ; then
+-	{ echo "$as_me:16400: WARNING: Unable to successfully link X Toolkit library (-lXt) with
++	{ echo "$as_me:16522: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+ test program.  You will have to check and add the proper libraries by hand
+ to makefile." >&5
+ echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+@@ -16438,14 +16560,14 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
+ 
+-			echo "$as_me:16441: checking for $cf_test in $cf_path" >&5
++			echo "$as_me:16563: checking for $cf_test in $cf_path" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
+ 		else
+-			echo "$as_me:16444: checking for $cf_test" >&5
++			echo "$as_me:16566: checking for $cf_test" >&5
+ echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
+ 		fi
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16448 "configure"
++#line 16570 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16459,16 +16581,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16462: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16584: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16465: \$? = $ac_status" >&5
++  echo "$as_me:16587: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16468: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16590: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16471: \$? = $ac_status" >&5
++  echo "$as_me:16593: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -16477,7 +16599,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-		echo "$as_me:16480: result: $cf_result" >&5
++		echo "$as_me:16602: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
+@@ -16493,7 +16615,7 @@
+ done
+ 
+ if test -z "$cf_x_athena_inc" ; then
+-	{ echo "$as_me:16496: WARNING: Unable to find Athena header files" >&5
++	{ echo "$as_me:16618: WARNING: Unable to find Athena header files" >&5
+ echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
+ elif test "$cf_x_athena_inc" != default ; then
+ 
+@@ -16558,10 +16680,10 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-		echo "$as_me:16561: checking for $cf_test in $cf_libs" >&5
++		echo "$as_me:16683: checking for $cf_test in $cf_libs" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16564 "configure"
++#line 16686 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -16578,16 +16700,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16581: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16703: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16584: \$? = $ac_status" >&5
++  echo "$as_me:16706: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16587: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16709: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16590: \$? = $ac_status" >&5
++  echo "$as_me:16712: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -16596,7 +16718,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:16599: result: $cf_result" >&5
++		echo "$as_me:16721: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
+@@ -16613,7 +16735,7 @@
+ done
+ 
+ if test -z "$cf_x_athena_lib" ; then
+-	{ { echo "$as_me:16616: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
++	{ { echo "$as_me:16738: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+ echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -16647,7 +16769,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:16650: checking for $ac_word" >&5
++echo "$as_me:16772: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16662,7 +16784,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:16665: found $ac_dir/$ac_word" >&5
++echo "$as_me:16787: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -16670,10 +16792,10 @@
+ fi
+ XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
+ if test -n "$XCURSES_CONFIG"; then
+-  echo "$as_me:16673: result: $XCURSES_CONFIG" >&5
++  echo "$as_me:16795: result: $XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$XCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:16676: result: no" >&5
++  echo "$as_me:16798: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -16686,7 +16808,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:16689: checking for $ac_word" >&5
++echo "$as_me:16811: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16701,7 +16823,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
+-echo "$as_me:16704: found $ac_dir/$ac_word" >&5
++echo "$as_me:16826: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -16709,10 +16831,10 @@
+ fi
+ ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
+ if test -n "$ac_ct_XCURSES_CONFIG"; then
+-  echo "$as_me:16712: result: $ac_ct_XCURSES_CONFIG" >&5
++  echo "$as_me:16834: result: $ac_ct_XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:16715: result: no" >&5
++  echo "$as_me:16837: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -16847,7 +16969,7 @@
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16850: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16972: testing checking additions to CFLAGS ..." 1>&5
+ 
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -16932,7 +17054,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:16935: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:17057: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -16942,7 +17064,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:16945: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:17067: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -16952,7 +17074,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}:16955: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:17077: 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"
+@@ -16961,7 +17083,7 @@
+ 
+ if test "x$cf_check_cflags" != "x$CFLAGS" ; then
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16964 "configure"
++#line 17086 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -16973,16 +17095,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16976: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17098: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16979: \$? = $ac_status" >&5
++  echo "$as_me:17101: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16982: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17104: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16985: \$? = $ac_status" >&5
++  echo "$as_me:17107: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -16990,12 +17112,12 @@
+ cat "conftest.$ac_ext" >&5
+ test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16993: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17115: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+ 
+ 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
+ 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16998: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17120: testing but keeping change to \$CPPFLAGS ..." 1>&5
+ 
+ 	 fi
+ 	 CFLAGS="$cf_check_cflags"
+@@ -17003,7 +17125,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:17006: checking for XOpenDisplay in -lX11" >&5
++echo "$as_me:17128: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17011,7 +17133,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17014 "configure"
++#line 17136 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17030,16 +17152,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17033: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17155: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17036: \$? = $ac_status" >&5
++  echo "$as_me:17158: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17039: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17161: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17042: \$? = $ac_status" >&5
++  echo "$as_me:17164: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -17050,7 +17172,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17053: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:17175: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then
+ 
+@@ -17072,7 +17194,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17075: checking for XCurses library" >&5
++echo "$as_me:17197: checking for XCurses library" >&5
+ echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
+ if test "${cf_cv_lib_XCurses+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17095,7 +17217,7 @@
+ LIBS="$cf_add_libs"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17098 "configure"
++#line 17220 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17110,16 +17232,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17113: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17235: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17116: \$? = $ac_status" >&5
++  echo "$as_me:17238: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17119: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17241: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17122: \$? = $ac_status" >&5
++  echo "$as_me:17244: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_lib_XCurses=yes
+ else
+@@ -17130,7 +17252,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17133: result: $cf_cv_lib_XCurses" >&5
++echo "$as_me:17255: result: $cf_cv_lib_XCurses" >&5
+ echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
+ 
+ fi
+@@ -17145,23 +17267,23 @@
+ #define XCURSES 1
+ EOF
+ 
+-	echo "$as_me:17148: checking for xcurses.h" >&5
++	echo "$as_me:17270: checking for xcurses.h" >&5
+ echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
+ if test "${ac_cv_header_xcurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17154 "configure"
++#line 17276 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:17158: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:17280: \"$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:17164: \$? = $ac_status" >&5
++  echo "$as_me:17286: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17180,7 +17302,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17183: result: $ac_cv_header_xcurses_h" >&5
++echo "$as_me:17305: result: $ac_cv_header_xcurses_h" >&5
+ echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
+ if test "$ac_cv_header_xcurses_h" = yes; then
+ 
+@@ -17191,26 +17313,26 @@
+ fi
+ 
+ else
+-	{ { echo "$as_me:17194: error: Cannot link with XCurses" >&5
++	{ { echo "$as_me:17316: error: Cannot link with XCurses" >&5
+ echo "$as_me: error: Cannot link with XCurses" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ 	;;
+ (*)
+-	{ { echo "$as_me:17201: error: unexpected screen-value: $cf_cv_screen" >&5
++	{ { echo "$as_me:17323: error: unexpected screen-value: $cf_cv_screen" >&5
+ echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+-echo "$as_me:17207: checking for _nc_init_pthreads" >&5
++echo "$as_me:17329: checking for _nc_init_pthreads" >&5
+ echo $ECHO_N "checking for _nc_init_pthreads... $ECHO_C" >&6
+ if test "${ac_cv_func__nc_init_pthreads+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17213 "configure"
++#line 17335 "configure"
+ #include "confdefs.h"
+ #define _nc_init_pthreads autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17241,16 +17363,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17244: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17366: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17247: \$? = $ac_status" >&5
++  echo "$as_me:17369: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17250: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17372: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17253: \$? = $ac_status" >&5
++  echo "$as_me:17375: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func__nc_init_pthreads=yes
+ else
+@@ -17260,7 +17382,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17263: result: $ac_cv_func__nc_init_pthreads" >&5
++echo "$as_me:17385: result: $ac_cv_func__nc_init_pthreads" >&5
+ echo "${ECHO_T}$ac_cv_func__nc_init_pthreads" >&6
+ if test "$ac_cv_func__nc_init_pthreads" = yes; then
+   cf_cv_ncurses_pthreads=yes
+@@ -17295,7 +17417,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17298: checking for X11 rgb file" >&5
++echo "$as_me:17420: 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.
+@@ -17357,7 +17479,7 @@
+ 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:17360: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:17482: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -17365,7 +17487,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17368: result: $RGB_PATH" >&5
++echo "$as_me:17490: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:17531: 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.
+@@ -17426,10 +17548,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17429: result: $FORM_NAME" >&5
++echo "$as_me:17551: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:17432: checking for desired basename for menu library" >&5
++echo "$as_me:17554: 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.
+@@ -17449,10 +17571,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17452: result: $MENU_NAME" >&5
++echo "$as_me:17574: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:17455: checking for desired basename for panel library" >&5
++echo "$as_me:17577: 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.
+@@ -17472,10 +17594,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17475: result: $PANEL_NAME" >&5
++echo "$as_me:17597: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:17478: checking if you want to check for panel functions" >&5
++echo "$as_me:17600: checking if you want to check for panel functions" >&5
+ echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-panel or --disable-panel was given.
+@@ -17492,7 +17614,7 @@
+ 	cf_enable_panel=$cf_default_panel
+ 
+ fi;
+-echo "$as_me:17495: result: $cf_enable_panel" >&5
++echo "$as_me:17617: result: $cf_enable_panel" >&5
+ echo "${ECHO_T}$cf_enable_panel" >&6
+ if test $cf_enable_panel = yes
+ then
+@@ -17503,13 +17625,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:17506: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
++	echo "$as_me:17628: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists "$PANEL_NAME$cf_cv_libtype" ; then
+-		echo "$as_me:17509: result: yes" >&5
++		echo "$as_me:17631: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:17512: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
++		echo "$as_me:17634: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CFLAGS="$CFLAGS"
+@@ -17659,7 +17781,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17662 "configure"
++#line 17784 "configure"
+ #include "confdefs.h"
+ #include <$PANEL_NAME.h>
+ int
+@@ -17671,37 +17793,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17674: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17796: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17677: \$? = $ac_status" >&5
++  echo "$as_me:17799: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17680: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17802: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17683: \$? = $ac_status" >&5
++  echo "$as_me:17805: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17689 "configure"
++#line 17811 "configure"
+ #include "confdefs.h"
+ #include <$PANEL_NAME.h>
+ 				int main(void)
+ 				{ (void) new_panel ( 0 ); return 0; }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17696: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17818: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17699: \$? = $ac_status" >&5
++  echo "$as_me:17821: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17701: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17823: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17704: \$? = $ac_status" >&5
++  echo "$as_me:17826: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -17718,7 +17840,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:17721: result: $cf_have_curses_lib" >&5
++		echo "$as_me:17843: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" = "yes"
+@@ -17739,7 +17861,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh`
+-echo "$as_me:17742: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
++echo "$as_me:17864: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17747,7 +17869,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$PANEL_NAME$cf_cv_libtype  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17750 "configure"
++#line 17872 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17766,16 +17888,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17769: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17891: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17772: \$? = $ac_status" >&5
++  echo "$as_me:17894: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17775: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17897: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17778: \$? = $ac_status" >&5
++  echo "$as_me:17900: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -17786,7 +17908,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17789: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:17911: 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
+ 
+@@ -17819,7 +17941,7 @@
+ 	cf_curses_headers="$cf_curses_headers panel.h"
+ fi
+ 
+-echo "$as_me:17822: checking if you want to check for menu functions" >&5
++echo "$as_me:17944: checking if you want to check for menu functions" >&5
+ echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-menu or --disable-menu was given.
+@@ -17836,7 +17958,7 @@
+ 	cf_enable_menu=$cf_default_menu
+ 
+ fi;
+-echo "$as_me:17839: result: $cf_enable_menu" >&5
++echo "$as_me:17961: result: $cf_enable_menu" >&5
+ echo "${ECHO_T}$cf_enable_menu" >&6
+ if test $cf_enable_menu = yes
+ then
+@@ -17845,14 +17967,14 @@
+ 		;;
+ 	(curses*)
+ 
+-echo "$as_me:17848: checking for NetBSD menu.h" >&5
++echo "$as_me:17970: checking for NetBSD menu.h" >&5
+ echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_menu_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17855 "configure"
++#line 17977 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -17870,16 +17992,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17873: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17995: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17876: \$? = $ac_status" >&5
++  echo "$as_me:17998: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17879: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18001: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17882: \$? = $ac_status" >&5
++  echo "$as_me:18004: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_netbsd_menu_h=yes
+ 
+@@ -17891,7 +18013,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17894: result: $cf_cv_netbsd_menu_h" >&5
++echo "$as_me:18016: result: $cf_cv_netbsd_menu_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
+ 
+ test "$cf_cv_netbsd_menu_h" = yes &&
+@@ -17908,13 +18030,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:17911: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
++	echo "$as_me:18033: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists "$MENU_NAME$cf_cv_libtype" ; then
+-		echo "$as_me:17914: result: yes" >&5
++		echo "$as_me:18036: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:17917: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
++		echo "$as_me:18039: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CFLAGS="$CFLAGS"
+@@ -18064,7 +18186,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18067 "configure"
++#line 18189 "configure"
+ #include "confdefs.h"
+ #include <$MENU_NAME.h>
+ int
+@@ -18076,37 +18198,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18079: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18201: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18082: \$? = $ac_status" >&5
++  echo "$as_me:18204: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18085: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18207: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18088: \$? = $ac_status" >&5
++  echo "$as_me:18210: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18094 "configure"
++#line 18216 "configure"
+ #include "confdefs.h"
+ #include <$MENU_NAME.h>
+ 				int main(void)
+ 				{ (void) menu_driver ( 0,0 ); return 0; }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:18101: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18223: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18104: \$? = $ac_status" >&5
++  echo "$as_me:18226: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:18106: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18228: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18109: \$? = $ac_status" >&5
++  echo "$as_me:18231: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -18123,7 +18245,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:18126: result: $cf_have_curses_lib" >&5
++		echo "$as_me:18248: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" = "yes"
+@@ -18144,7 +18266,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh`
+-echo "$as_me:18147: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
++echo "$as_me:18269: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18152,7 +18274,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$MENU_NAME$cf_cv_libtype  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18155 "configure"
++#line 18277 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18171,16 +18293,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18174: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18296: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18177: \$? = $ac_status" >&5
++  echo "$as_me:18299: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18180: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18302: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18183: \$? = $ac_status" >&5
++  echo "$as_me:18305: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -18191,7 +18313,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18194: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:18316: 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
+ 
+@@ -18224,7 +18346,7 @@
+ 	cf_curses_headers="$cf_curses_headers menu.h"
+ fi
+ 
+-echo "$as_me:18227: checking if you want to check for form functions" >&5
++echo "$as_me:18349: checking if you want to check for form functions" >&5
+ echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
+ 
+ # Check whether --enable-form or --disable-form was given.
+@@ -18241,7 +18363,7 @@
+ 	cf_enable_form=$cf_default_form
+ 
+ fi;
+-echo "$as_me:18244: result: $cf_enable_form" >&5
++echo "$as_me:18366: result: $cf_enable_form" >&5
+ echo "${ECHO_T}$cf_enable_form" >&6
+ if test $cf_enable_form = yes
+ then
+@@ -18250,14 +18372,14 @@
+ 		;;
+ 	(curses*)
+ 
+-echo "$as_me:18253: checking for NetBSD form.h" >&5
++echo "$as_me:18375: checking for NetBSD form.h" >&5
+ echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_form_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18260 "configure"
++#line 18382 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -18276,16 +18398,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18279: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18401: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18282: \$? = $ac_status" >&5
++  echo "$as_me:18404: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18285: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18407: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18288: \$? = $ac_status" >&5
++  echo "$as_me:18410: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_netbsd_form_h=yes
+ 
+@@ -18297,7 +18419,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:18300: result: $cf_cv_netbsd_form_h" >&5
++echo "$as_me:18422: result: $cf_cv_netbsd_form_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
+ 
+ test "$cf_cv_netbsd_form_h" = yes &&
+@@ -18314,13 +18436,13 @@
+ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
+ 	:
+ elif test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:18317: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
++	echo "$as_me:18439: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists "$FORM_NAME$cf_cv_libtype" ; then
+-		echo "$as_me:18320: result: yes" >&5
++		echo "$as_me:18442: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:18323: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
++		echo "$as_me:18445: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
+ echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
+ 
+ 		cf_save_CFLAGS="$CFLAGS"
+@@ -18470,7 +18592,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18473 "configure"
++#line 18595 "configure"
+ #include "confdefs.h"
+ #include <$FORM_NAME.h>
+ int
+@@ -18482,37 +18604,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18485: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18607: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18488: \$? = $ac_status" >&5
++  echo "$as_me:18610: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18491: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18613: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18494: \$? = $ac_status" >&5
++  echo "$as_me:18616: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_curses_lib=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18500 "configure"
++#line 18622 "configure"
+ #include "confdefs.h"
+ #include <$FORM_NAME.h>
+ 				int main(void)
+ 				{ (void) form_driver ( 0,0 ); return 0; }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:18507: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18629: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18510: \$? = $ac_status" >&5
++  echo "$as_me:18632: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:18512: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18634: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18515: \$? = $ac_status" >&5
++  echo "$as_me:18637: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_curses_lib=yes
+ else
+@@ -18529,7 +18651,7 @@
+ cf_have_curses_lib=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:18532: result: $cf_have_curses_lib" >&5
++		echo "$as_me:18654: result: $cf_have_curses_lib" >&5
+ echo "${ECHO_T}$cf_have_curses_lib" >&6
+ 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
+ 		if test "$cf_have_curses_lib" = "yes"
+@@ -18550,7 +18672,7 @@
+ fi
+ if test "$cf_have_curses_lib" = no; then
+ 	as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh`
+-echo "$as_me:18553: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
++echo "$as_me:18675: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18558,7 +18680,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$FORM_NAME$cf_cv_libtype  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18561 "configure"
++#line 18683 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18577,16 +18699,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18580: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18702: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18583: \$? = $ac_status" >&5
++  echo "$as_me:18705: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18586: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18708: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18589: \$? = $ac_status" >&5
++  echo "$as_me:18711: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -18597,7 +18719,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18600: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:18722: 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
+ 
+@@ -18635,23 +18757,23 @@
+ for ac_header in $cf_curses_headers
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18638: checking for $ac_header" >&5
++echo "$as_me:18760: 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 18644 "configure"
++#line 18766 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18648: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18770: \"$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:18654: \$? = $ac_status" >&5
++  echo "$as_me:18776: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18670,7 +18792,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18673: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18795: 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:18805: 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 18689 "configure"
++#line 18811 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -18702,16 +18824,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18705: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18827: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18708: \$? = $ac_status" >&5
++  echo "$as_me:18830: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18711: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18833: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18714: \$? = $ac_status" >&5
++  echo "$as_me:18836: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -18721,7 +18843,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18724: result: $ac_cv_header_time" >&5
++echo "$as_me:18846: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -18742,23 +18864,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18745: checking for $ac_header" >&5
++echo "$as_me:18867: 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 18751 "configure"
++#line 18873 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18755: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18877: \"$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:18761: \$? = $ac_status" >&5
++  echo "$as_me:18883: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18777,7 +18899,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18780: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18902: 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:18915: 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 18799 "configure"
++#line 18921 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18803: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18925: \"$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:18809: \$? = $ac_status" >&5
++  echo "$as_me:18931: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18825,7 +18947,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18828: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18950: 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:18960: 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
+@@ -18845,7 +18967,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18848 "configure"
++#line 18970 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -18858,16 +18980,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18861: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18983: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18864: \$? = $ac_status" >&5
++  echo "$as_me:18986: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18867: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18989: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18870: \$? = $ac_status" >&5
++  echo "$as_me:18992: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -18879,7 +19001,7 @@
+ done
+ 
+ fi
+-echo "$as_me:18882: result: $cf_cv_getopt_header" >&5
++echo "$as_me:19004: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -18897,13 +19019,13 @@
+ fi
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:18900: checking for clock_gettime" >&5
++echo "$as_me:19022: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18906 "configure"
++#line 19028 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18934,16 +19056,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18937: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19059: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18940: \$? = $ac_status" >&5
++  echo "$as_me:19062: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18943: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19065: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18946: \$? = $ac_status" >&5
++  echo "$as_me:19068: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -18953,12 +19075,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18956: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:19078: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:18961: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:19083: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18966,7 +19088,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18969 "configure"
++#line 19091 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18985,16 +19107,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18988: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19110: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18991: \$? = $ac_status" >&5
++  echo "$as_me:19113: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18994: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19116: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18997: \$? = $ac_status" >&5
++  echo "$as_me:19119: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -19005,7 +19127,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19008: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:19130: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -19017,14 +19139,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:19020: checking if clock_gettime links" >&5
++echo "$as_me:19142: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19027 "configure"
++#line 19149 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -19042,16 +19164,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19045: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19167: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19048: \$? = $ac_status" >&5
++  echo "$as_me:19170: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19051: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19173: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19054: \$? = $ac_status" >&5
++  echo "$as_me:19176: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -19062,7 +19184,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:19065: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:19187: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -19076,13 +19198,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:19079: checking for gettimeofday" >&5
++echo "$as_me:19201: 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 19085 "configure"
++#line 19207 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19113,16 +19235,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19116: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19238: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19119: \$? = $ac_status" >&5
++  echo "$as_me:19241: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19122: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19244: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19125: \$? = $ac_status" >&5
++  echo "$as_me:19247: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -19132,7 +19254,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19135: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:19257: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -19142,7 +19264,7 @@
+ 
+ else
+ 
+-echo "$as_me:19145: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:19267: 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
+@@ -19150,7 +19272,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19153 "configure"
++#line 19275 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19169,16 +19291,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19172: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19294: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19175: \$? = $ac_status" >&5
++  echo "$as_me:19297: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19178: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19300: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19181: \$? = $ac_status" >&5
++  echo "$as_me:19303: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -19189,7 +19311,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19192: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:19314: 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
+ 
+@@ -19227,13 +19349,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:19230: checking for $ac_func" >&5
++echo "$as_me:19352: 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 19236 "configure"
++#line 19358 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19264,16 +19386,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19267: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19389: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19270: \$? = $ac_status" >&5
++  echo "$as_me:19392: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19273: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19395: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19276: \$? = $ac_status" >&5
++  echo "$as_me:19398: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -19283,7 +19405,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19286: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:19408: 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:19419: checking if we can use termcap.h" >&5
+ echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
+ if test "${cf_cv_have_termcap_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19304 "configure"
++#line 19426 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19322,16 +19444,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19325: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19447: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19328: \$? = $ac_status" >&5
++  echo "$as_me:19450: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19331: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19453: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19334: \$? = $ac_status" >&5
++  echo "$as_me:19456: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_termcap_h=yes
+ else
+@@ -19341,7 +19463,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19344: result: $cf_cv_have_termcap_h" >&5
++echo "$as_me:19466: result: $cf_cv_have_termcap_h" >&5
+ echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
+ if test "x$cf_cv_have_termcap_h" = xyes
+ then
+@@ -19351,14 +19473,14 @@
+ EOF
+ 
+ else
+-echo "$as_me:19354: checking if we can use ncurses/termcap.h" >&5
++echo "$as_me:19476: checking if we can use ncurses/termcap.h" >&5
+ echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
+ if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19361 "configure"
++#line 19483 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19379,16 +19501,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19382: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19504: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19385: \$? = $ac_status" >&5
++  echo "$as_me:19507: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19388: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19510: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19391: \$? = $ac_status" >&5
++  echo "$as_me:19513: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_ncurses_termcap_h=yes
+ else
+@@ -19398,7 +19520,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19401: result: $cf_cv_have_ncurses_termcap_h" >&5
++echo "$as_me:19523: result: $cf_cv_have_ncurses_termcap_h" >&5
+ echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
+ test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -19408,7 +19530,7 @@
+ fi
+ 
+ if test "x$ac_cv_func_getopt" = xno; then
+-	{ { echo "$as_me:19411: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:19533: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -19427,13 +19549,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:19430: checking for $ac_func" >&5
++echo "$as_me:19552: 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 19436 "configure"
++#line 19558 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19464,16 +19586,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19467: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19589: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19470: \$? = $ac_status" >&5
++  echo "$as_me:19592: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19473: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19595: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19476: \$? = $ac_status" >&5
++  echo "$as_me:19598: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -19483,7 +19605,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19486: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:19608: 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:19620: checking definition to turn on extended curses functions" >&5
+ echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
+ if test "${cf_cv_need_xopen_extension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19503,7 +19625,7 @@
+ 
+ cf_cv_need_xopen_extension=unknown
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19506 "configure"
++#line 19628 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -19536,16 +19658,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19539: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19661: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19542: \$? = $ac_status" >&5
++  echo "$as_me:19664: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19545: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19667: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19548: \$? = $ac_status" >&5
++  echo "$as_me:19670: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_xopen_extension=none
+ else
+@@ -19555,7 +19677,7 @@
+ 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19558 "configure"
++#line 19680 "configure"
+ #include "confdefs.h"
+ 
+ #define $cf_try_xopen_extension 1
+@@ -19581,16 +19703,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19584: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19706: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19587: \$? = $ac_status" >&5
++  echo "$as_me:19709: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19590: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19712: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19593: \$? = $ac_status" >&5
++  echo "$as_me:19715: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
+ else
+@@ -19604,7 +19726,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:19607: result: $cf_cv_need_xopen_extension" >&5
++echo "$as_me:19729: result: $cf_cv_need_xopen_extension" >&5
+ echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
+ 
+ case "$cf_cv_need_xopen_extension" in
+@@ -19616,7 +19738,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19619: checking for term.h" >&5
++echo "$as_me:19741: checking for term.h" >&5
+ echo $ECHO_N "checking for term.h... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19637,7 +19759,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19640 "configure"
++#line 19762 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19651,16 +19773,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19654: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19776: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19657: \$? = $ac_status" >&5
++  echo "$as_me:19779: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19660: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19782: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19663: \$? = $ac_status" >&5
++  echo "$as_me:19785: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_term_header=$cf_header
+ 	 break
+@@ -19679,7 +19801,7 @@
+ 	for cf_header in ncurses/term.h ncursesw/term.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19682 "configure"
++#line 19804 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19697,16 +19819,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19700: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19822: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19703: \$? = $ac_status" >&5
++  echo "$as_me:19825: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19706: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19828: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19709: \$? = $ac_status" >&5
++  echo "$as_me:19831: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_term_header=$cf_header
+ 			 break
+@@ -19721,7 +19843,7 @@
+ esac
+ 
+ fi
+-echo "$as_me:19724: result: $cf_cv_term_header" >&5
++echo "$as_me:19846: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ case "$cf_cv_term_header" in
+@@ -19748,7 +19870,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19751: checking for unctrl.h" >&5
++echo "$as_me:19873: checking for unctrl.h" >&5
+ echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
+ if test "${cf_cv_unctrl_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19769,7 +19891,7 @@
+ for cf_header in $cf_header_list
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19772 "configure"
++#line 19894 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -19783,16 +19905,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19786: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19908: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19789: \$? = $ac_status" >&5
++  echo "$as_me:19911: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19792: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19914: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19795: \$? = $ac_status" >&5
++  echo "$as_me:19917: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unctrl_header=$cf_header
+ 	 break
+@@ -19805,12 +19927,12 @@
+ done
+ 
+ fi
+-echo "$as_me:19808: result: $cf_cv_unctrl_header" >&5
++echo "$as_me:19930: result: $cf_cv_unctrl_header" >&5
+ echo "${ECHO_T}$cf_cv_unctrl_header" >&6
+ 
+ case "$cf_cv_unctrl_header" in
+ (no)
+-	{ echo "$as_me:19813: WARNING: unctrl.h header not found" >&5
++	{ echo "$as_me:19935: WARNING: unctrl.h header not found" >&5
+ echo "$as_me: WARNING: unctrl.h header not found" >&2;}
+ 	;;
+ esac
+@@ -19908,10 +20030,10 @@
+ 
+ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 
+-	echo "$as_me:19911: checking for ${cf_func}" >&5
++	echo "$as_me:20033: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:19914: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:20036: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19920,7 +20042,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19923 "configure"
++#line 20045 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -19953,16 +20075,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19956: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20078: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19959: \$? = $ac_status" >&5
++  echo "$as_me:20081: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19962: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20084: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19965: \$? = $ac_status" >&5
++  echo "$as_me:20087: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -19978,7 +20100,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:19981: result: $cf_result" >&5
++	echo "$as_me:20103: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" != no; then
+ 		cat >>confdefs.h <&5
++	echo "$as_me:20118: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:19999: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:20121: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20005,7 +20127,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20008 "configure"
++#line 20130 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -20038,16 +20160,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20041: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20163: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20044: \$? = $ac_status" >&5
++  echo "$as_me:20166: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20047: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20169: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20050: \$? = $ac_status" >&5
++  echo "$as_me:20172: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -20063,7 +20185,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:20066: result: $cf_result" >&5
++	echo "$as_me:20188: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" != no; then
+ 		cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF
+-#line 20090 "configure"
++#line 20212 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20107,21 +20229,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20110: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20232: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20113: \$? = $ac_status" >&5
++  echo "$as_me:20235: \$? = $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:20238: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20119: \$? = $ac_status" >&5
++  echo "$as_me:20241: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
+ 
+-echo "${as_me:-configure}:20124: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
++echo "${as_me:-configure}:20246: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+ 
+ 		cat >>confdefs.h <&5
++echo "$as_me:20266: checking for ncurses extended functions" >&5
+ echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20151 "configure"
++#line 20273 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20163,16 +20285,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20166: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20288: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20169: \$? = $ac_status" >&5
++  echo "$as_me:20291: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20172: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20294: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20175: \$? = $ac_status" >&5
++  echo "$as_me:20297: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_ext_funcs=defined
+ else
+@@ -20180,7 +20302,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20183 "configure"
++#line 20305 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20205,16 +20327,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20208: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20330: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20211: \$? = $ac_status" >&5
++  echo "$as_me:20333: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20214: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20336: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20217: \$? = $ac_status" >&5
++  echo "$as_me:20339: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_ext_funcs=yes
+ else
+@@ -20228,7 +20350,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20231: result: $cf_cv_ncurses_ext_funcs" >&5
++echo "$as_me:20353: result: $cf_cv_ncurses_ext_funcs" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
+ test "$cf_cv_ncurses_ext_funcs" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -20242,11 +20364,11 @@
+ 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
+ 	then
+ 		cf_define_xpg5=no
+-		echo "$as_me:20245: checking if _XPG5 should be defined to enable wide-characters" >&5
++		echo "$as_me:20367: checking if _XPG5 should be defined to enable wide-characters" >&5
+ echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20249 "configure"
++#line 20371 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20259,16 +20381,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20262: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20384: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20265: \$? = $ac_status" >&5
++  echo "$as_me:20387: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20268: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20390: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20271: \$? = $ac_status" >&5
++  echo "$as_me:20393: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -20277,7 +20399,7 @@
+ cf_save_cppflags="$CPPFLAGS"
+ 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20280 "configure"
++#line 20402 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20290,16 +20412,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20293: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20415: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20296: \$? = $ac_status" >&5
++  echo "$as_me:20418: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20299: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20421: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20302: \$? = $ac_status" >&5
++  echo "$as_me:20424: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_define_xpg5=yes
+ else
+@@ -20310,7 +20432,7 @@
+ 			 CPPFLAGS="$cf_save_cppflags"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-		echo "$as_me:20313: result: $cf_define_xpg5" >&5
++		echo "$as_me:20435: result: $cf_define_xpg5" >&5
+ echo "${ECHO_T}$cf_define_xpg5" >&6
+ 
+ 		if test "$cf_define_xpg5" = yes
+@@ -20319,14 +20441,14 @@
+ 		fi
+ 	fi
+ 
+-	echo "$as_me:20322: checking for wide-character functions" >&5
++	echo "$as_me:20444: checking for wide-character functions" >&5
+ echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
+ if test "${cf_cv_widechar_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20329 "configure"
++#line 20451 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20343,16 +20465,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20346: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20468: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20349: \$? = $ac_status" >&5
++  echo "$as_me:20471: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20352: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20474: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20355: \$? = $ac_status" >&5
++  echo "$as_me:20477: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_widechar_funcs=yes
+ else
+@@ -20363,7 +20485,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20366: result: $cf_cv_widechar_funcs" >&5
++echo "$as_me:20488: result: $cf_cv_widechar_funcs" >&5
+ echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
+ 	if test "$cf_cv_widechar_funcs" != no ; then
+ 
+@@ -20384,14 +20506,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20387: checking if $cf_cv_screen library uses pthreads" >&5
++echo "$as_me:20509: checking if $cf_cv_screen library uses pthreads" >&5
+ echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
+ if test "${cf_cv_use_pthreads+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20394 "configure"
++#line 20516 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20409,16 +20531,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20412: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20534: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20415: \$? = $ac_status" >&5
++  echo "$as_me:20537: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20418: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20540: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20421: \$? = $ac_status" >&5
++  echo "$as_me:20543: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_use_pthreads=yes
+ else
+@@ -20429,21 +20551,21 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20432: result: $cf_cv_use_pthreads" >&5
++echo "$as_me:20554: result: $cf_cv_use_pthreads" >&5
+ echo "${ECHO_T}$cf_cv_use_pthreads" >&6
+ test $cf_cv_use_pthreads = yes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_PTHREADS 1
+ EOF
+ 
+-echo "$as_me:20439: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:20561: 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 20446 "configure"
++#line 20568 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20463,16 +20585,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20466: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20588: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20469: \$? = $ac_status" >&5
++  echo "$as_me:20591: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20472: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20594: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20475: \$? = $ac_status" >&5
++  echo "$as_me:20597: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -20484,7 +20606,7 @@
+ 
+ fi
+ 
+-echo "$as_me:20487: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:20609: 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
+@@ -20493,7 +20615,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:20496: checking for openpty in -lutil" >&5
++echo "$as_me:20618: 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
+@@ -20501,7 +20623,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20504 "configure"
++#line 20626 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20520,16 +20642,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20523: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20645: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20526: \$? = $ac_status" >&5
++  echo "$as_me:20648: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20529: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20651: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20532: \$? = $ac_status" >&5
++  echo "$as_me:20654: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -20540,7 +20662,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20543: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:20665: 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
+@@ -20548,7 +20670,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:20551: checking for openpty header" >&5
++echo "$as_me:20673: 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
+@@ -20575,7 +20697,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20578 "configure"
++#line 20700 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20593,16 +20715,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20596: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20718: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20599: \$? = $ac_status" >&5
++  echo "$as_me:20721: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20602: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20724: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20605: \$? = $ac_status" >&5
++  echo "$as_me:20727: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -20620,7 +20742,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:20623: result: $cf_cv_func_openpty" >&5
++echo "$as_me:20745: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -20654,7 +20776,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:20657: checking for function curses_version" >&5
++echo "$as_me:20779: checking for function curses_version" >&5
+ echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
+ if test "${cf_cv_func_curses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20664,7 +20786,7 @@
+   cf_cv_func_curses_version=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20667 "configure"
++#line 20789 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -20680,15 +20802,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:20683: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20805: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20686: \$? = $ac_status" >&5
++  echo "$as_me:20808: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:20688: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20810: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20691: \$? = $ac_status" >&5
++  echo "$as_me:20813: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_curses_version=yes
+ 
+@@ -20703,14 +20825,14 @@
+ fi
+ rm -f core
+ fi
+-echo "$as_me:20706: result: $cf_cv_func_curses_version" >&5
++echo "$as_me:20828: result: $cf_cv_func_curses_version" >&5
+ echo "${ECHO_T}$cf_cv_func_curses_version" >&6
+ test "$cf_cv_func_curses_version" = yes &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_CURSES_VERSION 1
+ EOF
+ 
+-echo "$as_me:20713: checking for alternate character set array" >&5
++echo "$as_me:20835: checking for alternate character set array" >&5
+ echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_acs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20720,7 +20842,7 @@
+ for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20723 "configure"
++#line 20845 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -20736,16 +20858,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20739: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20861: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20742: \$? = $ac_status" >&5
++  echo "$as_me:20864: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20745: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20867: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20748: \$? = $ac_status" >&5
++  echo "$as_me:20870: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_acs_map=$name; break
+ else
+@@ -20756,7 +20878,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20759: result: $cf_cv_curses_acs_map" >&5
++echo "$as_me:20881: result: $cf_cv_curses_acs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
+ 
+ test "$cf_cv_curses_acs_map" != unknown &&
+@@ -20766,7 +20888,7 @@
+ 
+ if test "$cf_enable_widec" = yes; then
+ 
+-echo "$as_me:20769: checking for wide alternate character set array" >&5
++echo "$as_me:20891: checking for wide alternate character set array" >&5
+ echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20776,7 +20898,7 @@
+ 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20779 "configure"
++#line 20901 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20792,16 +20914,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20795: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20917: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20798: \$? = $ac_status" >&5
++  echo "$as_me:20920: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20801: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20923: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20804: \$? = $ac_status" >&5
++  echo "$as_me:20926: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_wacs_map=$name
+ 	 break
+@@ -20812,7 +20934,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	done
+ fi
+-echo "$as_me:20815: result: $cf_cv_curses_wacs_map" >&5
++echo "$as_me:20937: result: $cf_cv_curses_wacs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
+ 
+ test "$cf_cv_curses_wacs_map" != unknown &&
+@@ -20820,7 +20942,7 @@
+ #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
+ EOF
+ 
+-echo "$as_me:20823: checking for wide alternate character constants" >&5
++echo "$as_me:20945: checking for wide alternate character constants" >&5
+ echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_symbols+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20830,7 +20952,7 @@
+ if test "$cf_cv_curses_wacs_map" != unknown
+ then
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20833 "configure"
++#line 20955 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20847,16 +20969,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20850: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20972: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20853: \$? = $ac_status" >&5
++  echo "$as_me:20975: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20856: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20978: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20859: \$? = $ac_status" >&5
++  echo "$as_me:20981: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -20866,7 +20988,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ else
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20869 "configure"
++#line 20991 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20882,16 +21004,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20885: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21007: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20888: \$? = $ac_status" >&5
++  echo "$as_me:21010: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20891: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21013: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20894: \$? = $ac_status" >&5
++  echo "$as_me:21016: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -20902,7 +21024,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:20905: result: $cf_cv_curses_wacs_symbols" >&5
++echo "$as_me:21027: result: $cf_cv_curses_wacs_symbols" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
+ 
+ test "$cf_cv_curses_wacs_symbols" != no &&
+@@ -20912,10 +21034,10 @@
+ 
+ fi
+ 
+-echo "$as_me:20915: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21037: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20918 "configure"
++#line 21040 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -20933,16 +21055,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20936: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21058: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20939: \$? = $ac_status" >&5
++  echo "$as_me:21061: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20942: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21064: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20945: \$? = $ac_status" >&5
++  echo "$as_me:21067: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -20951,7 +21073,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:20954: result: $cf_result" >&5
++echo "$as_me:21076: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -20972,14 +21094,14 @@
+ if test "$cf_enable_widec" = yes; then
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:20975: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:21097: 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 20982 "configure"
++#line 21104 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20997,23 +21119,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21000: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21122: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21003: \$? = $ac_status" >&5
++  echo "$as_me:21125: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21006: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21128: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21009: \$? = $ac_status" >&5
++  echo "$as_me:21131: \$? = $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 21016 "configure"
++#line 21138 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21032,16 +21154,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21035: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21157: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21038: \$? = $ac_status" >&5
++  echo "$as_me:21160: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21041: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21163: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21044: \$? = $ac_status" >&5
++  echo "$as_me:21166: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -21053,7 +21175,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21056: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:21178: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -21076,14 +21198,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:21079: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:21201: 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 21086 "configure"
++#line 21208 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21101,23 +21223,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21104: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21226: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21107: \$? = $ac_status" >&5
++  echo "$as_me:21229: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21110: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21232: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21113: \$? = $ac_status" >&5
++  echo "$as_me:21235: \$? = $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 21120 "configure"
++#line 21242 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21136,16 +21258,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21139: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21261: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21142: \$? = $ac_status" >&5
++  echo "$as_me:21264: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21145: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21267: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21148: \$? = $ac_status" >&5
++  echo "$as_me:21270: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -21157,7 +21279,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21160: result: $cf_cv_wchar_t" >&5
++echo "$as_me:21282: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -21180,14 +21302,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:21183: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:21305: 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 21190 "configure"
++#line 21312 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21205,23 +21327,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21208: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21330: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21211: \$? = $ac_status" >&5
++  echo "$as_me:21333: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21214: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21336: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21217: \$? = $ac_status" >&5
++  echo "$as_me:21339: \$? = $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 21224 "configure"
++#line 21346 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21240,16 +21362,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21243: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21365: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21246: \$? = $ac_status" >&5
++  echo "$as_me:21368: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21249: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21371: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21252: \$? = $ac_status" >&5
++  echo "$as_me:21374: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -21261,7 +21383,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21264: result: $cf_cv_wint_t" >&5
++echo "$as_me:21386: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -21285,10 +21407,10 @@
+ 
+ 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
+ 
+-echo "$as_me:21288: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21410: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21291 "configure"
++#line 21413 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21306,16 +21428,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21309: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21431: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21312: \$? = $ac_status" >&5
++  echo "$as_me:21434: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21315: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21437: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21318: \$? = $ac_status" >&5
++  echo "$as_me:21440: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21324,7 +21446,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21327: result: $cf_result" >&5
++echo "$as_me:21449: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -21346,10 +21468,10 @@
+ 
+ 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
+ 
+-echo "$as_me:21349: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21471: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21352 "configure"
++#line 21474 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21367,16 +21489,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21370: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21492: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21373: \$? = $ac_status" >&5
++  echo "$as_me:21495: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21376: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21498: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21379: \$? = $ac_status" >&5
++  echo "$as_me:21501: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21385,7 +21507,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21388: result: $cf_result" >&5
++echo "$as_me:21510: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -21407,10 +21529,10 @@
+ 
+ 	if test "$NCURSES_OK_WINT_T" = 0 ; then
+ 
+-echo "$as_me:21410: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21532: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21413 "configure"
++#line 21535 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -21428,16 +21550,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21431: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21553: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21434: \$? = $ac_status" >&5
++  echo "$as_me:21556: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21437: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21559: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21440: \$? = $ac_status" >&5
++  echo "$as_me:21562: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21446,7 +21568,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21449: result: $cf_result" >&5
++echo "$as_me:21571: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test "$cf_result" = yes ; then
+ 
+@@ -21475,11 +21597,11 @@
+ boolfnames \
+ ttytype
+ do
+-echo "$as_me:21478: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:21600: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21482 "configure"
++#line 21604 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -21512,16 +21634,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21515: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21637: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21518: \$? = $ac_status" >&5
++  echo "$as_me:21640: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21521: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21643: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21524: \$? = $ac_status" >&5
++  echo "$as_me:21646: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ 
+@@ -21531,7 +21653,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21534: result: $cf_result" >&5
++echo "$as_me:21656: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test "$cf_result" = yes ; then
+@@ -21543,14 +21665,14 @@
+ EOF
+ 
+ else
+-	echo "$as_me:21546: checking for data $cf_data in library" >&5
++	echo "$as_me:21668: checking for data $cf_data in library" >&5
+ echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6
+ 	# BSD linkers insist on making weak linkage, but resolve at runtime.
+ 	if test "$cross_compiling" = yes; then
+ 
+ 	# cross-compiling
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21553 "configure"
++#line 21675 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -21589,16 +21711,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21592: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21714: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21595: \$? = $ac_status" >&5
++  echo "$as_me:21717: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21598: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21720: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21601: \$? = $ac_status" >&5
++  echo "$as_me:21723: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -21610,7 +21732,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21613 "configure"
++#line 21735 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -21642,15 +21764,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21645: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21767: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21648: \$? = $ac_status" >&5
++  echo "$as_me:21770: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21650: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21772: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21653: \$? = $ac_status" >&5
++  echo "$as_me:21775: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ 
+@@ -21662,7 +21784,7 @@
+ fi
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-	echo "$as_me:21665: result: $cf_result" >&5
++	echo "$as_me:21787: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = yes ; then
+ 
+@@ -21679,7 +21801,7 @@
+ 
+ if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
+ then
+-	echo "$as_me:21682: checking for X" >&5
++	echo "$as_me:21804: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
+ # Check whether --with-x or --without-x was given.
+@@ -21783,17 +21905,17 @@
+   # Guess where to find include files, by looking for Intrinsic.h.
+   # First, try using that file with no special directory specified.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21786 "configure"
++#line 21908 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:21790: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:21912: \"$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:21796: \$? = $ac_status" >&5
++  echo "$as_me:21918: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -21826,7 +21948,7 @@
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21829 "configure"
++#line 21951 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -21838,16 +21960,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21841: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21963: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21844: \$? = $ac_status" >&5
++  echo "$as_me:21966: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21847: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21969: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21850: \$? = $ac_status" >&5
++  echo "$as_me:21972: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -21885,7 +22007,7 @@
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:21888: result: $have_x" >&5
++  echo "$as_me:22010: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+   no_x=yes
+ else
+@@ -21895,7 +22017,7 @@
+   # Update the cache value to reflect the command line values.
+   ac_cv_have_x="have_x=yes \
+ 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  echo "$as_me:21898: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "$as_me:22020: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+@@ -21922,11 +22044,11 @@
+     # others require no space.  Words are not sufficient . . . .
+     case `(uname -sr) 2>/dev/null` in
+     "SunOS 5"*)
+-      echo "$as_me:21925: checking whether -R must be followed by a space" >&5
++      echo "$as_me:22047: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+       cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21929 "configure"
++#line 22051 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21938,16 +22060,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21941: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22063: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21944: \$? = $ac_status" >&5
++  echo "$as_me:22066: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21947: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22069: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21950: \$? = $ac_status" >&5
++  echo "$as_me:22072: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_nospace=yes
+ else
+@@ -21957,13 +22079,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+       if test $ac_R_nospace = yes; then
+-	echo "$as_me:21960: result: no" >&5
++	echo "$as_me:22082: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	X_LIBS="$X_LIBS -R$x_libraries"
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21966 "configure"
++#line 22088 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21975,16 +22097,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21978: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22100: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21981: \$? = $ac_status" >&5
++  echo "$as_me:22103: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21984: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22106: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21987: \$? = $ac_status" >&5
++  echo "$as_me:22109: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_R_space=yes
+ else
+@@ -21994,11 +22116,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	if test $ac_R_space = yes; then
+-	  echo "$as_me:21997: result: yes" >&5
++	  echo "$as_me:22119: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ 	else
+-	  echo "$as_me:22001: result: neither works" >&5
++	  echo "$as_me:22123: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ 	fi
+       fi
+@@ -22018,7 +22140,7 @@
+     # the Alpha needs dnet_stub (dnet does not exist).
+     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22021 "configure"
++#line 22143 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22037,22 +22159,22 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22040: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22162: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22043: \$? = $ac_status" >&5
++  echo "$as_me:22165: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22046: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22168: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22049: \$? = $ac_status" >&5
++  echo "$as_me:22171: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:22055: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:22177: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22060,7 +22182,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22063 "configure"
++#line 22185 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22079,16 +22201,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22082: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22204: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22085: \$? = $ac_status" >&5
++  echo "$as_me:22207: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22088: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22210: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22091: \$? = $ac_status" >&5
++  echo "$as_me:22213: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -22099,14 +22221,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22102: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:22224: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      echo "$as_me:22109: checking for dnet_ntoa in -ldnet_stub" >&5
++      echo "$as_me:22231: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22114,7 +22236,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22117 "configure"
++#line 22239 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22133,16 +22255,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22136: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22258: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22139: \$? = $ac_status" >&5
++  echo "$as_me:22261: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22142: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22264: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22145: \$? = $ac_status" >&5
++  echo "$as_me:22267: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -22153,7 +22275,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22156: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:22278: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -22172,13 +22294,13 @@
+     # on Irix 5.2, according to T.E. Dickey.
+     # The functions gethostbyname, getservbyname, and inet_addr are
+     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+-    echo "$as_me:22175: checking for gethostbyname" >&5
++    echo "$as_me:22297: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22181 "configure"
++#line 22303 "configure"
+ #include "confdefs.h"
+ #define gethostbyname autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22209,16 +22331,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22212: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22334: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22215: \$? = $ac_status" >&5
++  echo "$as_me:22337: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22218: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22340: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22221: \$? = $ac_status" >&5
++  echo "$as_me:22343: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gethostbyname=yes
+ else
+@@ -22228,11 +22350,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22231: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:22353: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+-      echo "$as_me:22235: checking for gethostbyname in -lnsl" >&5
++      echo "$as_me:22357: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22240,7 +22362,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22243 "configure"
++#line 22365 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22259,16 +22381,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22262: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22384: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22265: \$? = $ac_status" >&5
++  echo "$as_me:22387: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22268: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22390: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22271: \$? = $ac_status" >&5
++  echo "$as_me:22393: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -22279,14 +22401,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22282: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:22404: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test "$ac_cv_lib_nsl_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+-        echo "$as_me:22289: checking for gethostbyname in -lbsd" >&5
++        echo "$as_me:22411: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22294,7 +22416,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22297 "configure"
++#line 22419 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22313,16 +22435,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22316: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22438: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22319: \$? = $ac_status" >&5
++  echo "$as_me:22441: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22322: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22444: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22325: \$? = $ac_status" >&5
++  echo "$as_me:22447: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -22333,7 +22455,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22336: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:22458: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test "$ac_cv_lib_bsd_gethostbyname" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -22349,13 +22471,13 @@
+     # variants that don't use the nameserver (or something).  -lsocket
+     # must be given before -lnsl if both are needed.  We assume that
+     # if connect needs -lnsl, so does gethostbyname.
+-    echo "$as_me:22352: checking for connect" >&5
++    echo "$as_me:22474: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22358 "configure"
++#line 22480 "configure"
+ #include "confdefs.h"
+ #define connect autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22386,16 +22508,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22389: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22511: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22392: \$? = $ac_status" >&5
++  echo "$as_me:22514: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22395: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22517: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22398: \$? = $ac_status" >&5
++  echo "$as_me:22520: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_connect=yes
+ else
+@@ -22405,11 +22527,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22408: result: $ac_cv_func_connect" >&5
++echo "$as_me:22530: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+ 
+     if test $ac_cv_func_connect = no; then
+-      echo "$as_me:22412: checking for connect in -lsocket" >&5
++      echo "$as_me:22534: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22417,7 +22539,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22420 "configure"
++#line 22542 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22436,16 +22558,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22439: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22561: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22442: \$? = $ac_status" >&5
++  echo "$as_me:22564: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22445: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22567: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22448: \$? = $ac_status" >&5
++  echo "$as_me:22570: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_socket_connect=yes
+ else
+@@ -22456,7 +22578,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22459: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:22581: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test "$ac_cv_lib_socket_connect" = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -22465,13 +22587,13 @@
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    echo "$as_me:22468: checking for remove" >&5
++    echo "$as_me:22590: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22474 "configure"
++#line 22596 "configure"
+ #include "confdefs.h"
+ #define remove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22502,16 +22624,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22505: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22627: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22508: \$? = $ac_status" >&5
++  echo "$as_me:22630: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22511: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22633: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22514: \$? = $ac_status" >&5
++  echo "$as_me:22636: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_remove=yes
+ else
+@@ -22521,11 +22643,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22524: result: $ac_cv_func_remove" >&5
++echo "$as_me:22646: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+ 
+     if test $ac_cv_func_remove = no; then
+-      echo "$as_me:22528: checking for remove in -lposix" >&5
++      echo "$as_me:22650: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22533,7 +22655,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22536 "configure"
++#line 22658 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22552,16 +22674,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22555: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22677: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22558: \$? = $ac_status" >&5
++  echo "$as_me:22680: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22561: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22683: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22564: \$? = $ac_status" >&5
++  echo "$as_me:22686: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_posix_remove=yes
+ else
+@@ -22572,7 +22694,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22575: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:22697: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test "$ac_cv_lib_posix_remove" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -22581,13 +22703,13 @@
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    echo "$as_me:22584: checking for shmat" >&5
++    echo "$as_me:22706: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22590 "configure"
++#line 22712 "configure"
+ #include "confdefs.h"
+ #define shmat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22618,16 +22740,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22621: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22743: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22624: \$? = $ac_status" >&5
++  echo "$as_me:22746: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22627: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22749: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22630: \$? = $ac_status" >&5
++  echo "$as_me:22752: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_shmat=yes
+ else
+@@ -22637,11 +22759,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22640: result: $ac_cv_func_shmat" >&5
++echo "$as_me:22762: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+ 
+     if test $ac_cv_func_shmat = no; then
+-      echo "$as_me:22644: checking for shmat in -lipc" >&5
++      echo "$as_me:22766: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22649,7 +22771,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22652 "configure"
++#line 22774 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22668,16 +22790,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22671: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22793: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22674: \$? = $ac_status" >&5
++  echo "$as_me:22796: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22677: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22799: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22680: \$? = $ac_status" >&5
++  echo "$as_me:22802: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+@@ -22688,7 +22810,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22691: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:22813: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test "$ac_cv_lib_ipc_shmat" = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -22706,7 +22828,7 @@
+   # These have to be linked with before -lX11, unlike the other
+   # libraries we check for below, so use a different variable.
+   # John Interrante, Karl Berry
+-  echo "$as_me:22709: checking for IceConnectionNumber in -lICE" >&5
++  echo "$as_me:22831: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22714,7 +22836,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22717 "configure"
++#line 22839 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22733,16 +22855,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22736: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22858: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22739: \$? = $ac_status" >&5
++  echo "$as_me:22861: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22742: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22864: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22745: \$? = $ac_status" >&5
++  echo "$as_me:22867: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -22753,7 +22875,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22756: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:22878: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -22800,16 +22922,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22803: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22925: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22808: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22930: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22812: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22934: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -22848,16 +22970,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22851: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:22973: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22856: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:22978: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22860: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:22982: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -22896,23 +23018,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22899: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23021: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22904: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23026: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:22908: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:23030: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:22915: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:23037: 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.
+@@ -22929,7 +23051,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:22932: result: $enable_warnings" >&5
++echo "$as_me:23054: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -22952,10 +23074,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:22955: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:23077: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -23005,12 +23127,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:23008: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:23130: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23011: \$? = $ac_status" >&5
++  echo "$as_me:23133: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:23013: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:23135: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -23088,7 +23210,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23091 "configure"
++#line 23213 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23103,26 +23225,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23106: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23228: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23109: \$? = $ac_status" >&5
++  echo "$as_me:23231: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23112: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23234: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23115: \$? = $ac_status" >&5
++  echo "$as_me:23237: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:23118: checking for X11/Xt const-feature" >&5
++echo "$as_me:23240: 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 23125 "configure"
++#line 23247 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -23140,16 +23262,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23143: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23265: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23146: \$? = $ac_status" >&5
++  echo "$as_me:23268: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23149: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23271: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23152: \$? = $ac_status" >&5
++  echo "$as_me:23274: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -23164,7 +23286,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:23167: result: $cf_cv_const_x_string" >&5
++echo "$as_me:23289: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -23193,7 +23315,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:23334: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -23225,12 +23347,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:23228: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:23350: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23231: \$? = $ac_status" >&5
++  echo "$as_me:23353: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:23233: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:23355: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -23238,7 +23360,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:23241: checking for $CC warning options..." >&5
++	{ echo "$as_me:23363: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -23261,12 +23383,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:23264: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:23386: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23267: \$? = $ac_status" >&5
++  echo "$as_me:23389: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:23269: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:23391: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -23274,7 +23396,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:23277: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:23399: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -23284,7 +23406,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:23287: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:23409: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -23301,7 +23423,7 @@
+ 
+ fi
+ 
+-echo "$as_me:23304: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:23426: 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.
+@@ -23323,7 +23445,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:23326: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:23448: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -23437,23 +23559,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:23440: checking for dmalloc.h" >&5
++	echo "$as_me:23562: 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 23446 "configure"
++#line 23568 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:23450: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23572: \"$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:23456: \$? = $ac_status" >&5
++  echo "$as_me:23578: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23472,11 +23594,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23475: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:23597: 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:23479: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:23601: 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
+@@ -23484,7 +23606,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23487 "configure"
++#line 23609 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -23503,16 +23625,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23506: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23628: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23509: \$? = $ac_status" >&5
++  echo "$as_me:23631: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23512: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23634: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23515: \$? = $ac_status" >&5
++  echo "$as_me:23637: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -23523,7 +23645,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23526: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:23648: 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:23663: 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.
+@@ -23560,7 +23682,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:23563: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:23685: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -23674,23 +23796,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:23677: checking for dbmalloc.h" >&5
++	echo "$as_me:23799: 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 23683 "configure"
++#line 23805 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:23687: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23809: \"$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:23693: \$? = $ac_status" >&5
++  echo "$as_me:23815: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23709,11 +23831,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23712: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:23834: 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:23716: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:23838: 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
+@@ -23721,7 +23843,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23724 "configure"
++#line 23846 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -23740,16 +23862,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23743: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23865: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23746: \$? = $ac_status" >&5
++  echo "$as_me:23868: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23749: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23871: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23752: \$? = $ac_status" >&5
++  echo "$as_me:23874: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -23760,7 +23882,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:23763: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:23885: 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:23900: 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.
+@@ -23797,7 +23919,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:23800: result: ${with_valgrind:-no}" >&5
++echo "$as_me:23922: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -23910,7 +24032,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:23913: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:24035: 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.
+@@ -23921,7 +24043,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:23924: result: $with_no_leaks" >&5
++echo "$as_me:24046: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -23939,7 +24061,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:23942: checking for an rpath option" >&5
++	echo "$as_me:24064: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -23970,12 +24092,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:23973: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:24095: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:23978: checking if we need a space after rpath option" >&5
++		echo "$as_me:24100: 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"
+ 
+@@ -23996,7 +24118,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23999 "configure"
++#line 24121 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -24008,16 +24130,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24011: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24133: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24014: \$? = $ac_status" >&5
++  echo "$as_me:24136: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24017: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24139: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24020: \$? = $ac_status" >&5
++  echo "$as_me:24142: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -24027,14 +24149,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:24030: result: $cf_rpath_space" >&5
++		echo "$as_me:24152: 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:24037: checking if rpath-hack should be disabled" >&5
++echo "$as_me:24159: 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.
+@@ -24052,22 +24174,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:24055: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:24177: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:24060: checking for updated LDFLAGS" >&5
++echo "$as_me:24182: 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:24063: result: maybe" >&5
++	echo "$as_me:24185: 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:24070: checking for $ac_word" >&5
++echo "$as_me:24192: 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
+@@ -24082,7 +24204,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:24085: found $ac_dir/$ac_word" >&5
++echo "$as_me:24207: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -24090,10 +24212,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:24093: result: $cf_ldd_prog" >&5
++  echo "$as_me:24215: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:24096: result: no" >&5
++  echo "$as_me:24218: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -24107,7 +24229,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24110 "configure"
++#line 24232 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -24119,16 +24241,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24122: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24244: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24125: \$? = $ac_status" >&5
++  echo "$as_me:24247: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24128: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24250: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24131: \$? = $ac_status" >&5
++  echo "$as_me:24253: \$? = $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`
+@@ -24156,7 +24278,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:24159: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:24281: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -24168,11 +24290,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:24171: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:24293: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:24175: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:24297: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -24209,7 +24331,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:24212: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:24334: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -24222,11 +24344,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:24225: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:24347: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:24229: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:24351: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -24263,7 +24385,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:24266: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:24388: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -24276,14 +24398,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:24279: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:24401: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:24283: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:24405: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:24286: result: no" >&5
++	echo "$as_me:24408: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -24373,7 +24495,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:24376: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:24498: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -24509,7 +24631,7 @@
+ cat >>"$CONFIG_STATUS" <&5
+ echo "$as_me: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -24573,7 +24695,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:24576: error: unrecognized option: $1
++  -*) { { echo "$as_me:24698: 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;}
+@@ -24592,7 +24714,7 @@
+ ## Running config.status.  ##
+ ## ----------------------- ##
+ 
+-This file was extended by $as_me 2.52.20240618, executed with
++This file was extended by $as_me 2.52.20250126, executed with
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+   CONFIG_LINKS    = $CONFIG_LINKS
+@@ -24623,7 +24745,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:24626: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:24748: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -24940,7 +25062,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:24943: creating $ac_file" >&5
++    { echo "$as_me:25065: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -24958,7 +25080,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:24961: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:25083: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -24971,7 +25093,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:24974: error: cannot find input file: $f" >&5
++           { { echo "$as_me:25096: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -24987,7 +25109,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:24990: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:25112: 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;}
+@@ -24996,7 +25118,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:24999: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:25121: 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;}
+@@ -25041,7 +25163,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:25044: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:25166: 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;}
+@@ -25052,7 +25174,7 @@
+     $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:25055: WARNING: Some variables may not be substituted:
++      { echo "$as_me:25177: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -25101,7 +25223,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:25104: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:25226: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -25112,7 +25234,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:25115: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:25237: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -25125,7 +25247,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:25128: error: cannot find input file: $f" >&5
++           { { echo "$as_me:25250: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -25183,7 +25305,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:25186: $ac_file is unchanged" >&5
++      { echo "$as_me:25308: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+Index: test/make-tar.sh
+Prereq:  1.21 
+--- ncurses-6.5-20250531+/test/make-tar.sh	2022-11-05 19:41:33.000000000 +0000
++++ ncurses-6.5-20250614/test/make-tar.sh	2025-06-14 15:07:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+-# $Id: make-tar.sh,v 1.21 2022/11/05 19:41:33 tom Exp $
++# $Id: make-tar.sh,v 1.22 2025/06/14 15:07:50 tom Exp $
+ ##############################################################################
+-# Copyright 2019-2021,2022 Thomas E. Dickey                                  #
++# Copyright 2019-2022,2025 Thomas E. Dickey                                  #
+ # Copyright 2010-2015,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -74,7 +74,7 @@
+ make_changelog() {
+ 	[ -f "$1" ] && chmod u+w "$1"
+ 	cat >"$1" <MANIFEST )
+-same_timestamp $BUILD/$ROOTNAME/MANIFEST
++touch "$BUILD/$ROOTNAME"/MANIFEST
++( cd "$BUILD/$ROOTNAME" && find . -type f -print | "$SOURCE/misc/csort" >MANIFEST )
++same_timestamp "$BUILD/$ROOTNAME"/MANIFEST
+ 
+-cd $BUILD || exit
++cd "$BUILD" || exit
+ 
+ # Remove build-artifacts.
+ find . -name RCS -exec rm -rf {} \;
+-find $BUILD/$ROOTNAME -type d -exec rmdir {} \; 2>/dev/null
+-find $BUILD/$ROOTNAME -type d -exec rmdir {} \; 2>/dev/null
+-find $BUILD/$ROOTNAME -type d -exec rmdir {} \; 2>/dev/null
++find "$BUILD/$ROOTNAME" -type d -exec rmdir {} \; 2>/dev/null
++find "$BUILD/$ROOTNAME" -type d -exec rmdir {} \; 2>/dev/null
++find "$BUILD/$ROOTNAME" -type d -exec rmdir {} \; 2>/dev/null
+ 
+ # There is no need for this script in the tar file.
+-rm -f $ROOTNAME/make-tar.sh
++rm -f "$ROOTNAME"/make-tar.sh
+ 
+ # Remove build-artifacts.
+ find . -name "*.gz" -exec rm -rf {} \;
+@@ -154,10 +154,10 @@
+ # Cleanup timestamps
+ [ -n "$TOUCH_DIRS" ] && "$TOUCH_DIRS" "$ROOTNAME"
+ 
+-tar cf - $TAR_OPTIONS $ROOTNAME | gzip >"$DESTDIR/$ROOTNAME.tar.gz"
++tar cf - $TAR_OPTIONS "$ROOTNAME" | gzip >"$DESTDIR/$ROOTNAME.tar.gz"
+ cd "$DESTDIR" || exit
+ 
+ pwd
+-ls -l $ROOTNAME.tar.gz
++ls -l "$ROOTNAME".tar.gz
+ 
+ # vi:ts=4 sw=4
+Index: test/package/debian/ncurses-examples.lintian-overrides
+--- /dev/null	2025-06-14 09:32:42.175999955 +0000
++++ ncurses-6.5-20250614/test/package/debian/ncurses-examples.lintian-overrides	2025-06-14 21:12:31.000000000 +0000
+@@ -0,0 +1,7 @@
++# $Id: ncurses-examples.lintian-overrides,v 1.1 2025/06/14 21:12:31 tom Exp $
++
++# "function" is used in an awk script
++bash-term-in-posix-shell 'function scaled(' [usr/libexec/ncurses-examples/tput-initc:*]
++
++# workaround for lintian bug
++incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/libexec/ncurses-examples/tracemunch]
+Index: test/package/debian/ncursest-examples.lintian-overrides
+--- /dev/null	2025-06-14 09:32:42.175999955 +0000
++++ ncurses-6.5-20250614/test/package/debian/ncursest-examples.lintian-overrides	2025-06-14 21:12:31.000000000 +0000
+@@ -0,0 +1,7 @@
++# $Id: ncursest-examples.lintian-overrides,v 1.1 2025/06/14 21:12:31 tom Exp $
++
++# "function" is used in an awk script
++bash-term-in-posix-shell 'function scaled(' [usr/libexec/ncursest-examples/tput-initc:*]
++
++# workaround for lintian bug
++incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/libexec/ncursest-examples/tracemunch]
+Index: test/package/debian/rules
+--- ncurses-6.5-20250531+/test/package/debian/rules	2024-06-08 19:41:08.000000000 +0000
++++ ncurses-6.5-20250614/test/package/debian/rules	2025-06-14 21:15:59.000000000 +0000
+@@ -1,11 +1,15 @@
+ #!/usr/bin/make -f
+-# Made with the aid of dh_make, by Craig Small
+-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
+-# Some lines taken from debmake, by Cristoph Lameter.
++# $Id: rules,v 1.15 2025/06/14 21:15:59 tom Exp $
+ 
+ # Uncomment this to turn on verbose mode.
+ #export DH_VERBOSE=1
+ 
++SHELL = /bin/bash
++DPKG_EXPORT_BUILDFLAGS = 1
++export DEB_BUILD_MAINT_OPTIONS := hardening=+all qa=+bug reproducible=+all
++
++include /usr/share/dpkg/buildflags.mk
++
+ # packages
+ NCURSES_PKG = ncurses-examples
+ NCURSEST_PKG = ncursest-examples
+@@ -18,10 +22,6 @@
+ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ 
+-CFLAGS   = $(shell dpkg-buildflags --get CFLAGS)
+-CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+-LDFLAGS  = $(shell dpkg-buildflags --get LDFLAGS)
+-
+ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+         CFLAGS += -O0
+ else
+@@ -34,9 +34,7 @@
+ verbose = # -v
+ 
+ configure = \
+-	CFLAGS="$(CFLAGS)" \
+-	CPPFLAGS="$(CPPFLAGS)" \
+-	LDFLAGS="$(LDFLAGS)" ../../configure \
++	../../configure \
+ 		--host=$(DEB_HOST_GNU_TYPE) \
+ 		--build=$(DEB_BUILD_GNU_TYPE) \
+ 		--prefix=/usr \
+@@ -153,6 +151,7 @@
+ 	rm -f $(PACKAGES.arch:%=install-%-stamp)
+ 	dh_testdir
+ 	dh_testroot
++	dh_lintian           $(verbose) $(PACKAGES.arch:%=-p%)
+ 	dh_installdocs       $(verbose) $(PACKAGES.arch:%=-p%)
+ 	dh_installchangelogs $(verbose) $(PACKAGES.arch:%=-p%)  NEWS
+ 	dh_strip             $(verbose) $(PACKAGES.arch:%=-p%)
+Index: test/savescreen.sh
+Prereq:  1.8 
+--- ncurses-6.5-20250531+/test/savescreen.sh	2022-07-16 16:34:34.000000000 +0000
++++ ncurses-6.5-20250614/test/savescreen.sh	2025-06-14 15:06:24.000000000 +0000
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ ##############################################################################
+-# Copyright 2020,2022 Thomas E. Dickey                                       #
++# Copyright 2020-2022,2025 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.8 2022/07/16 16:34:34 tom Exp $
++# $Id: savescreen.sh,v 1.9 2025/06/14 15:06:24 tom Exp $
+ #
+ # Use this script to exercise "savescreen".
+ # It starts by generating a series of temporary-filenames, which are passed
+@@ -40,27 +40,26 @@
+ trap "rm -rf $MY_DIR; exit 1" 1 2 3
+ trap "rm -rf $MY_DIR" 0
+ umask 077
+-mkdir $MY_DIR || exit 1
++mkdir "$MY_DIR" || exit 1
+ 
+ PARAMS=
+ NFILES=4
+ PREFIX=$MY_DIR/savescreen
+ n=0
+ BEGINS=$PREFIX-$n.tmp
+-while test $n != $NFILES
++while [ "$n" != $NFILES ]
+ do
+ 	LATEST=$PREFIX-$n.tmp
+ 	PARAMS="$PARAMS $LATEST"
+-	n=`expr $n + 1`
++	n=`expr "$n" + 1`
+ done
+ 
+ ${0%.sh} $PARAMS
+-if test -f $BEGINS
++if [ -f "$BEGINS" ]
+ then
+-	while test -f $BEGINS
++	while [ -f "$BEGINS" ]
+ 	do
+-		"${0%.sh}" -r $PARAMS
+-		test $? != 0 && break
++		"${0%.sh}" -r $PARAMS || break
+ 	done
+ else
+ 	echo "No screens were saved"
+Index: test/test_mouse.c
+Prereq:  1.36 
+--- ncurses-6.5-20250531+/test/test_mouse.c	2025-01-18 15:03:25.000000000 +0000
++++ ncurses-6.5-20250614/test/test_mouse.c	2025-06-07 19:13:02.000000000 +0000
+@@ -20,9 +20,14 @@
+  * 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: test_mouse.c,v 1.36 2025/01/18 15:03:25 tom Exp $
++ * $Id: test_mouse.c,v 1.37 2025/06/07 19:13:02 tom Exp $
+  *
+  * Author: Leonid S Usov
+  *
+Index: test/tput-colorcube
+Prereq:  1.2 
+--- ncurses-6.5-20250531+/test/tput-colorcube	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20250614/test/tput-colorcube	2025-06-14 14:45:23.000000000 +0000
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ ##############################################################################
+-# Copyright 2020 Thomas E. Dickey                                            #
++# Copyright 2020,2025 Thomas E. Dickey                                       #
+ # Copyright 2016 Free Software Foundation, Inc.                              #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -27,12 +27,12 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: tput-colorcube,v 1.2 2020/02/02 23:34:34 tom Exp $
++# $Id: tput-colorcube,v 1.3 2025/06/14 14:45:23 tom Exp $
+ # Use this script to print an xterm-style color cube, e.g., as done in
+ # the xterm 88colors2.pl and 256colors2.pl scripts.
+ 
+ failed() {
+-	printf "?? $*\n" >&2
++	printf "?? %s\n" "$1" >&2
+ 	exit 1
+ }
+ 
+@@ -51,13 +51,13 @@
+ 	failed "expected one parameter or none"
+ fi
+ 
+-colors=$(tput -T $myterm colors 2>/dev/null)
+-if [ ${colors:-0} -le 0 ]
++colors=$(tput -T "$myterm" colors 2>/dev/null)
++if [ "${colors:-0}" -le 0 ]
+ then
+ 	myterm=${myterm%%-color}
+-	colors=$(tput -T $myterm colors 2>/dev/null)
++	colors=$(tput -T "$myterm" colors 2>/dev/null)
+ fi
+-if [ ${colors:-0} -le 0 ]
++if [ "${colors:-0}" -le 0 ]
+ then
+ 	failed "terminal $myterm does not support color"
+ fi
+@@ -67,25 +67,25 @@
+ color=0
+ inrow=$colors
+ to_do=$colors
+-[ $colors -gt 256 ] && colors=256
+-[ $inrow  -gt   8 ] && inrow=8
+-[ $to_do  -gt  16 ] && to_do=16
+-while [ $color -lt $to_do ]
++[ "$colors" -gt 256 ] && colors=256
++[ "$inrow"  -gt   8 ] && inrow=8
++[ "$to_do"  -gt  16 ] && to_do=16
++while [ "$color" -lt "$to_do" ]
+ do
+-	[ $color = $inrow ] && newline
+-	tput setab $color
++	[ "$color" = "$inrow" ] && newline
++	tput setab "$color"
+ 	printf '  '
+-	color=$(expr $color + 1)
++	color=$(expr "$color" + 1)
+ done
+ newline
+ 
+-[ $colors -le 16 ] && exit
++[ "$colors" -le 16 ] && exit
+ 
+-if [ $colors = 256 ]
++if [ "$colors" = 256 ]
+ then
+ 	cube=6
+ 	ramp=232
+-elif [ $colors -ge 88 ]
++elif [ "$colors" -ge 88 ]
+ then
+ 	cube=4
+ 	ramp=80
+@@ -94,38 +94,38 @@
+ fi
+ 
+ printf "\n"
+-printf "Color cube, ${cube}x${cube}x${cube}:\n"
++printf "Color cube, %dx%dx%d:\n" $cube $cube $cube
+ g=0
+ cube2=$(expr $cube \* $cube)
+-while [ $g -lt $cube ]
++while [ "$g" -lt "$cube" ]
+ do
+ 	r=0
+-	while [ $r -lt $cube ]
++	while [ "$r" -lt "$cube" ]
+ 	do
+ 		b=0
+-		while [ $b -lt $cube ]
++		while [ "$b" -lt "$cube" ]
+ 		do
+-			color=$(expr 16 + \( $r \* $cube2 \) + \( $g \* $cube \) + $b)
+-			tput setab $color
++			color=$(expr 16 + \( "$r" \* "$cube2" \) + \( "$g" \* "$cube" \) + "$b")
++			tput setab "$color"
+ 			printf '  '
+-			b=$(expr $b + 1)
++			b=$(expr "$b" + 1)
+ 		done
+ 		tput op
+ 		printf ' '
+-		r=$(expr $r + 1)
++		r=$(expr "$r" + 1)
+ 	done
+ 	newline
+-	g=$(expr $g + 1)
++	g=$(expr "$g" + 1)
+ done
+ 
+ printf "\n"
+ printf "Grayscale ramp:\n"
+ color=$ramp
+-while [ $color -lt $colors ]
++while [ "$color" -lt "$colors" ]
+ do
+-	tput setab $color
++	tput setab "$color"
+ 	printf '  '
+-	color=$(expr $color + 1)
++	color=$(expr "$color" + 1)
+ done
+ newline
+ # vi:ts=4 sw=4
+Index: test/tput-initc
+Prereq:  1.6 
+--- ncurses-6.5-20250531+/test/tput-initc	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.5-20250614/test/tput-initc	2025-06-14 14:06:55.000000000 +0000
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ ##############################################################################
+-# Copyright 2020 Thomas E. Dickey                                            #
++# Copyright 2020,2025 Thomas E. Dickey                                       #
+ # Copyright 2016 Free Software Foundation, Inc.                              #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -27,14 +27,14 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: tput-initc,v 1.6 2020/02/02 23:34:34 tom Exp $
++# $Id: tput-initc,v 1.7 2025/06/14 14:06:55 tom Exp $
+ # Some of the ".dat" files in ncurses' test-directory give r/g/b numbers for
+ # default palettes of xterm and Linux console.  This script reads the numbers
+ # and (assuming the same or compatible terminal) uses tput to (re)initialize
+ # the palette using those numbers.
+ 
+ failed() {
+-	printf "?? $*\n" >&2
++	printf "?? %s\n" "$1" >&2
+ 	exit 1
+ }
+ 
+@@ -70,7 +70,7 @@
+ 		;;
+ 	esac
+ done
+-shift $(expr $OPTIND - 1)
++shift "$(expr "$OPTIND" - 1)"
+ 
+ if [ $# = 1 ]
+ then
+@@ -93,22 +93,21 @@
+ fi
+ 
+ myterm=${file%%.dat}
+-colors=$(tput -T $myterm colors 2>/dev/null)
+-if [ ${colors:-0} -le 0 ]
++colors=$(tput -T "$myterm" colors 2>/dev/null)
++if [ "${colors:-0}" -le 0 ]
+ then
+ 	myterm=${myterm%%-color}
+-	colors=$(tput -T $myterm colors 2>/dev/null)
++	colors=$(tput -T "$myterm" colors 2>/dev/null)
+ fi
+-if [ ${colors:-0} -le 0 ]
++if [ "${colors:-0}" -le 0 ]
+ then
+ 	failed "terminal $myterm does not support color"
+ fi
+ 
+-cat $file |\
+ awk	-v opt_r=$opt_r \
+ 	-v opt_s=$opt_s \
+-	-v colors=$colors \
+-	-v myterm=$myterm '
++	-v colors="$colors" \
++	-v myterm="$myterm" < "$file" '
+ BEGIN {
+ 	limit = 1000;
+ 	range = -1;
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250621.patch b/packages/ncurses/6.5/ncurses-6.5-20250621.patch
new file mode 100644
index 0000000000..65f46b1e6e
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250621.patch
@@ -0,0 +1,2186 @@
+# ncurses 6.5 - patch 20250621 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250621.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Jun 22 00:16:20 UTC 2025
+# ------------------------------------------------------------------------------
+# Ada95/aclocal.m4                         |   20 +--
+# Ada95/make-tar.sh                        |   19 +-
+# Ada95/package/AdaCurses-doc.spec         |    7 -
+# Ada95/package/AdaCurses.spec             |    7 -
+# Ada95/package/debian/copyright           |  131 ++++++++------------
+# NEWS                                     |   11 +
+# VERSION                                  |    2 
+# aclocal.m4                               |   28 ++--
+# configure                                |   18 +-
+# dist.mk                                  |    4 
+# ncurses/base/lib_mouse.c                 |    3 
+# ncurses/base/lib_nl.c                    |    8 -
+# ncurses/curses.priv.h                    |   16 ++
+# ncurses/tinfo/lib_raw.c                  |    5 
+# ncurses/tinfo/lib_win32con.c             |   10 -
+# ncurses/tinfo/lib_win32util.c            |    6 
+# ncurses/trace/lib_tracebits.c            |    6 
+# ncurses/widechar/lib_ins_wch.c           |   42 ++++--
+# ncurses/win32con/win32_driver.c          |    9 -
+# ncurses/win32con/win_driver.c            |   11 -
+# package/debian-mingw/changelog           |    4 
+# package/debian-mingw/copyright           |  185 ++++++++++++++---------------
+# package/debian-mingw64/changelog         |    4 
+# package/debian-mingw64/copyright         |  185 ++++++++++++++---------------
+# package/debian/changelog                 |    4 
+# package/debian/copyright                 |  185 ++++++++++++++---------------
+# package/mingw-ncurses.nsi                |    4 
+# package/mingw-ncurses.spec               |    7 -
+# package/ncurses.spec                     |    7 -
+# package/ncursest.spec                    |    7 -
+# test/make-tar.sh                         |    8 -
+# test/package/debian-mingw/copyright      |  137 +++++++++------------
+# test/package/debian-mingw64/copyright    |  137 +++++++++------------
+# test/package/debian/copyright            |  137 +++++++++------------
+# test/package/mingw-ncurses-examples.spec |    7 -
+# test/package/ncurses-examples.spec       |    7 -
+# 36 files changed, 692 insertions(+), 696 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/aclocal.m4
+Prereq:  1.228 
+--- ncurses-6.5-20250614+/Ada95/aclocal.m4	2025-02-23 01:57:36.000000000 +0000
++++ ncurses-6.5-20250621/Ada95/aclocal.m4	2025-06-21 10:49:01.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: aclocal.m4,v 1.228 2025/02/23 01:57:36 tom Exp $
++dnl $Id: aclocal.m4,v 1.229 2025/06/21 10:49:01 tom Exp $
+ dnl Macros used in NCURSES Ada95 auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -2786,7 +2786,7 @@
+ 	test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LINK_DATAONLY version: 15 updated: 2023/12/03 10:03:10
++dnl CF_LINK_DATAONLY version: 16 updated: 2025/06/21 06:49:01
+ dnl ----------------
+ dnl Some systems have a non-ANSI linker that doesn't pull in modules that have
+ dnl only data (i.e., no functions), for example NeXT.  On those systems we'll
+@@ -2802,10 +2802,10 @@
+ int	testdata[[3]] = { 123, 456, 789 };
+ EOF
+ 	if AC_TRY_EVAL(ac_compile) ; then
+-		mv conftest.o data.o && \
+-		( $AR $ARFLAGS conftest.a data.o ) 2>&AC_FD_CC 1>/dev/null
++		mv conftest.$OBJEXT data.$OBJEXT && \
++		( $AR $ARFLAGS conftest.a data.$OBJEXT ) 2>&AC_FD_CC 1>/dev/null
+ 	fi
+-	rm -f conftest.$ac_ext data.o
++	rm -f conftest.$ac_ext data.$OBJEXT
+ 	cat >conftest.$ac_ext <&AC_FD_CC 1>/dev/null
++		mv conftest.$OBJEXT func.$OBJEXT && \
++		( $AR $ARFLAGS conftest.a func.$OBJEXT ) 2>&AC_FD_CC 1>/dev/null
+ 	fi
+-	rm -f conftest.$ac_ext func.o
++	rm -f conftest.$ac_ext func.$OBJEXT
+ 	( eval $RANLIB conftest.a ) 2>&AC_FD_CC >/dev/null
+ 	cf_saveLIBS="$LIBS"
+ 	LIBS="conftest.a $LIBS"
+@@ -4209,7 +4209,7 @@
+ done
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_SHARED_OPTS version: 112 updated: 2024/12/14 16:09:34
++dnl CF_SHARED_OPTS version: 113 updated: 2025/06/21 06:49:01
+ dnl --------------
+ dnl --------------
+ dnl Attempt to determine the appropriate CC/LD options for creating a shared
+@@ -4504,7 +4504,7 @@
+ 				-L*)
+ 					ldopts+=("\`echo \"\[$]1\" | sed \"s/^-L/-LIBPATH:/\"\`")
+ 					;;
+-				*.obj | *.o)
++				*.obj | *.$OBJEXT)
+ 					ldopts+=("\[$]1")
+ 					;;
+ 				-Wl,*)
+Index: Ada95/make-tar.sh
+Prereq:  1.24 
+--- ncurses-6.5-20250614+/Ada95/make-tar.sh	2025-06-14 15:09:23.000000000 +0000
++++ ncurses-6.5-20250621/Ada95/make-tar.sh	2025-06-20 19:42:53.000000000 +0000
+@@ -1,5 +1,5 @@
+ #!/bin/sh
+-# $Id: make-tar.sh,v 1.24 2025/06/14 15:09:23 tom Exp $
++# $Id: make-tar.sh,v 1.26 2025/06/20 19:42:53 tom Exp $
+ ##############################################################################
+ # Copyright 2019-2022,2025 Thomas E. Dickey                                  #
+ # Copyright 2010-2015,2017 Free Software Foundation, Inc.                    #
+@@ -44,6 +44,7 @@
+ 
+ # make timestamps of generated files predictable
+ same_timestamp() {
++	[ -f ../NEWS ] || echo "OOPS $1"
+ 	touch -r ../NEWS "$1"
+ }
+ 
+@@ -61,10 +62,12 @@
+ # The rpm spec-file in the ncurses tree is a template.  Fill in the version
+ # information from dist.mk
+ edit_specfile() {
++	RPM_DATE=`date +'%a %b %d %Y' -d "$NCURSES_PATCH"`
+ 	sed \
+ 		-e "s/\\/$NCURSES_MAJOR/g" \
+ 		-e "s/\\/$NCURSES_MINOR/g" \
+-		-e "s/\\/$NCURSES_PATCH/g" "$1" >"$1.new"
++		-e "s/\\/$NCURSES_PATCH/g" \
++		-e "s/\\/$RPM_DATE/g" "$1" >"$1.new"
+ 	chmod u+w "$1"
+ 	mv "$1.new" "$1"
+ 	same_timestamp "$1"
+@@ -92,7 +95,7 @@
+ 
+ BUILD=$TMPDIR/make-tar$$
+ trap "cd /; rm -rf $BUILD; exit 1" 1 2 3 15
+-trap "cd /; rm -rf $BUILD" 0
++trap "cd /; rm -rf $BUILD; exit 0" 0
+ 
+ umask 077
+ if ! ( mkdir "$BUILD" )
+@@ -110,7 +113,7 @@
+ do
+ 	for j in COPYING config.guess config.sub install-sh tar-copy.sh
+ 	do
+-		[ -f $i/$j ] && cp -p "$i/$j" "$BUILD/$ROOTNAME/"
++		[ -f "$i/$j" ] && cp -p "$i/$j" "$BUILD/$ROOTNAME"/
+ 	done
+ done
+ 
+@@ -141,9 +144,9 @@
+ 
+ # cleanup empty directories (an artifact of ncurses source archives)
+ 
+-touch "$BUILD/$ROOTNAME/MANIFEST"
++touch "$BUILD/$ROOTNAME"/MANIFEST
+ ( cd "$BUILD/$ROOTNAME" && find . -type f -print | "$SOURCE/misc/csort" >MANIFEST )
+-same_timestamp "$BUILD/$ROOTNAME/MANIFEST"
++same_timestamp "$BUILD/$ROOTNAME"/MANIFEST
+ 
+ cd "$BUILD" || exit
+ 
+@@ -154,7 +157,7 @@
+ find "$BUILD/$ROOTNAME" -type d -exec rmdir {} \; 2>/dev/null
+ 
+ # There is no need for this script in the tar file.
+-rm -f "$ROOTNAME/make-tar.sh"
++rm -f "$ROOTNAME"/make-tar.sh
+ 
+ # Remove build-artifacts.
+ find . -name "*.gz" -exec rm -rf {} \;
+@@ -169,6 +172,6 @@
+ cd "$DESTDIR" || exit
+ 
+ pwd
+-ls -l "$ROOTNAME.tar.gz"
++ls -l "$ROOTNAME".tar.gz
+ 
+ # vi:ts=4 sw=4
+Index: Ada95/package/AdaCurses-doc.spec
+Prereq:  1.8 
+--- ncurses-6.5-20250614+/Ada95/package/AdaCurses-doc.spec	2024-06-08 13:54:31.000000000 +0000
++++ ncurses-6.5-20250621/Ada95/package/AdaCurses-doc.spec	2025-06-21 18:34:55.000000000 +0000
+@@ -3,11 +3,11 @@
+ %define AppVersion MAJOR.MINOR
+ %define AppRelease YYYYMMDD
+ %define AppPackage %{AppProgram}-doc
+-# $Id: AdaCurses-doc.spec,v 1.8 2024/06/08 13:54:31 tom Exp $
++# $Id: AdaCurses-doc.spec,v 1.10 2025/06/21 18:34:55 tom Exp $
+ Name: %{AppPackage}
+ Version: %{AppVersion}
+ Release: %{AppRelease}
+-License: MIT
++License: X11 License Distribution Modification Variant
+ Group: Applications/Development
+ URL: https://invisible-island.net/%{AppProgram}
+ Source0: %{AppProgram}-%{AppRelease}.tgz
+@@ -51,6 +51,9 @@
+ %changelog
+ # each patch should add its ChangeLog entries here
+ 
++* RPM_DATE Thomas Dickey
++- testing ncurses MAJOR.MINOR.YYYYMMDD
++
+ * Sat Nov 16 2019 Thomas Dickey
+ - modify clean-rule to work around Fedora NFS bugs.
+ 
+Index: Ada95/package/AdaCurses.spec
+Prereq:  1.34 
+--- ncurses-6.5-20250614+/Ada95/package/AdaCurses.spec	2024-06-08 13:53:14.000000000 +0000
++++ ncurses-6.5-20250621/Ada95/package/AdaCurses.spec	2025-06-21 18:34:55.000000000 +0000
+@@ -2,11 +2,11 @@
+ %define AppProgram AdaCurses
+ %define AppVersion MAJOR.MINOR
+ %define AppRelease YYYYMMDD
+-# $Id: AdaCurses.spec,v 1.34 2024/06/08 13:53:14 tom Exp $
++# $Id: AdaCurses.spec,v 1.36 2025/06/21 18:34:55 tom Exp $
+ Name: %{AppProgram}
+ Version: %{AppVersion}
+ Release: %{AppRelease}
+-License: MIT
++License: X11 License Distribution Modification Variant
+ Group: Applications/Development
+ URL: https://invisible-island.net/%{AppProgram}
+ Source0: %{AppProgram}-%{AppRelease}.tgz
+@@ -107,6 +107,9 @@
+ %changelog
+ # each patch should add its ChangeLog entries here
+ 
++* RPM_DATE Thomas Dickey
++- testing ncurses MAJOR.MINOR.YYYYMMDD
++
+ * Sat Dec 17 2022 Thomas Dickey
+ - install sample programs in libexec
+ 
+Index: Ada95/package/debian/copyright
+--- ncurses-6.5-20250614+/Ada95/package/debian/copyright	2025-01-04 10:55:52.000000000 +0000
++++ ncurses-6.5-20250621/Ada95/package/debian/copyright	2025-06-21 17:09:36.000000000 +0000
+@@ -1,79 +1,60 @@
+-Upstream source https://invisible-island.net/ncurses/Ada95.html
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: AdaCurses
++Upstream-Contact: Thomas E. Dickey 
++Source: https://invisible-island.net/ncurses/Ada95.html
+ 
+-Current ncurses maintainer: Thomas Dickey 
+-
+--------------------------------------------------------------------------------
+ Files: *
+ Copyright: 2017-2024,2025 by Thomas E. Dickey
+ Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+-License: X11
+-
+-Files: aclocal.m4 package
+-Copyright: 2010-2024,2025 by Thomas E. Dickey
+-License: X11
+-
+-    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.
+-
+--------------------------------------------------------------------------------
+-Files: install-sh
+-Copyright:  1994 X Consortium
+-License: X11
+-
+-    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, 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
+-    X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+-    AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+-    TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-
+-    Except as contained in this notice, the name of the X Consortium shall not
+-    be used in advertising or otherwise to promote the sale, use or other deal-
+-    ings in this Software without prior written authorization from the X Consor-
+-    tium.
+-
+-    FSF changes to this file are in the public domain.
+-
+-    Calling this script install-sh is preferred over install.sh, to prevent
+-    `make' implicit rules from creating a file called install from it
+-    when there is no Makefile.
+-
+-    This script is compatible with the BSD install script, but was written
+-    from scratch.  It can only install one file at a time, a restriction
+-    shared with many OS's install programs.
+-
+-On Debian systems, the complete text of the GNU General
+-Public License can be found in '/usr/share/common-licenses/GPL-2'
+-
+--- vile: txtmode file-encoding=utf-8
++License:   X11 License Distribution Modification Variant
++ 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.
++Comment:
++ https://invisible-island.net/ncurses/ncurses-license.html
++
++Files:     install-sh
++Copyright: 1994 X Consortium
++License:   X11
++ 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, 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 LISTED COPYRIGHT HOLDER(S) 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.
++Comment: vile: txtmode file-encoding=utf-8
+Index: NEWS
+Prereq:  1.4292 
+--- ncurses-6.5-20250614+/NEWS	2025-06-14 20:49:26.000000000 +0000
++++ ncurses-6.5-20250621/NEWS	2025-06-21 23:43:58.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4292 2025/06/14 20:49:26 tom Exp $
++-- $Id: NEWS,v 1.4301 2025/06/21 23:43:58 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.
+ 
++20250621
++	+ revise loop in wins_nwstr, to ensure that non-spacing characters are
++	  combined with the base spacing character (report by Karl Knechtel).
++	+ fixes for port using clang-cl or cl MSVC (report by Kirill Makurin).
++	+ improve test-packages:
++	  + convert debian*/copyright to DEP-5 format.
++	  + modify ".spec" test-files to work around timestamp-clamping in
++	    recent Fedora releases.
++
+ 20250614
+ 	+ reduce lintian warnings for test-packages.
+ 	+ clean up some shellcheck warnings
+Index: VERSION
+--- ncurses-6.5-20250614+/VERSION	2025-06-14 09:46:03.000000000 +0000
++++ ncurses-6.5-20250621/VERSION	2025-06-21 07:53:07.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250614
++5:0:10	6.5	20250621
+Index: aclocal.m4
+Prereq:  1.1106 
+--- ncurses-6.5-20250614+/aclocal.m4	2025-05-17 18:54:28.000000000 +0000
++++ ncurses-6.5-20250621/aclocal.m4	2025-06-21 10:50:24.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1106 2025/05/17 18:54:28 tom Exp $
++dnl $Id: aclocal.m4,v 1.1107 2025/06/21 10:50:24 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -4372,7 +4372,7 @@
+ ])
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LDFLAGS_STATIC version: 14 updated: 2021/01/02 17:09:14
++dnl CF_LDFLAGS_STATIC version: 15 updated: 2025/06/21 06:49:01
+ dnl -----------------
+ dnl Check for compiler/linker flags used to temporarily force usage of static
+ dnl libraries.  This depends on the compiler and platform.  Use this to help
+@@ -4429,7 +4429,7 @@
+ int cf_ldflags_static(FILE *fp) { return fflush(fp); }
+ EOF
+ 	if AC_TRY_EVAL(ac_compile) ; then
+-		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&AC_FD_CC 1>/dev/null
++		( $AR $ARFLAGS libconftest.a conftest.$OBJEXT ) 2>&AC_FD_CC 1>/dev/null
+ 		( eval $RANLIB libconftest.a ) 2>&AC_FD_CC >/dev/null
+ 	fi
+ 	rm -f conftest.*
+@@ -5475,7 +5475,7 @@
+ 	test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LINK_DATAONLY version: 15 updated: 2023/12/03 10:03:10
++dnl CF_LINK_DATAONLY version: 16 updated: 2025/06/21 06:49:01
+ dnl ----------------
+ dnl Some systems have a non-ANSI linker that doesn't pull in modules that have
+ dnl only data (i.e., no functions), for example NeXT.  On those systems we'll
+@@ -5491,10 +5491,10 @@
+ int	testdata[[3]] = { 123, 456, 789 };
+ EOF
+ 	if AC_TRY_EVAL(ac_compile) ; then
+-		mv conftest.o data.o && \
+-		( $AR $ARFLAGS conftest.a data.o ) 2>&AC_FD_CC 1>/dev/null
++		mv conftest.$OBJEXT data.$OBJEXT && \
++		( $AR $ARFLAGS conftest.a data.$OBJEXT ) 2>&AC_FD_CC 1>/dev/null
+ 	fi
+-	rm -f conftest.$ac_ext data.o
++	rm -f conftest.$ac_ext data.$OBJEXT
+ 	cat >conftest.$ac_ext <&AC_FD_CC 1>/dev/null
++		mv conftest.$OBJEXT func.$OBJEXT && \
++		( $AR $ARFLAGS conftest.a func.$OBJEXT ) 2>&AC_FD_CC 1>/dev/null
+ 	fi
+-	rm -f conftest.$ac_ext func.o
++	rm -f conftest.$ac_ext func.$OBJEXT
+ 	( eval $RANLIB conftest.a ) 2>&AC_FD_CC >/dev/null
+ 	cf_saveLIBS="$LIBS"
+ 	LIBS="conftest.a $LIBS"
+@@ -7547,7 +7547,7 @@
+ done
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_SHARED_OPTS version: 112 updated: 2024/12/14 16:09:34
++dnl CF_SHARED_OPTS version: 113 updated: 2025/06/21 06:49:01
+ dnl --------------
+ dnl --------------
+ dnl Attempt to determine the appropriate CC/LD options for creating a shared
+@@ -7842,7 +7842,7 @@
+ 				-L*)
+ 					ldopts+=("\`echo \"\[$]1\" | sed \"s/^-L/-LIBPATH:/\"\`")
+ 					;;
+-				*.obj | *.o)
++				*.obj | *.$OBJEXT)
+ 					ldopts+=("\[$]1")
+ 					;;
+ 				-Wl,*)
+@@ -9378,7 +9378,7 @@
+ fi
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_WITH_LIBTOOL version: 36 updated: 2021/01/01 13:31:04
++dnl CF_WITH_LIBTOOL version: 37 updated: 2025/06/21 06:49:01
+ dnl ---------------
+ dnl Provide a configure option to incorporate libtool.  Define several useful
+ dnl symbols for the makefile rules.
+@@ -9462,7 +9462,7 @@
+ 	fi
+ ])dnl
+ 	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${libdir} ${LIBTOOL_VERSION} `cut -f1 ${top_srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
+-	LIB_OBJECT='${OBJECTS:.o=.lo}'
++	LIB_OBJECT='${OBJECTS:.$OBJEXT=.lo}'
+ 	LIB_SUFFIX=.la
+ 	LIB_CLEAN='${LIBTOOL} --mode=clean'
+ 	LIB_COMPILE='${LIBTOOL} --mode=compile'
+Index: configure
+--- ncurses-6.5-20250614+/configure	2025-05-24 18:52:44.000000000 +0000
++++ ncurses-6.5-20250621/configure	2025-06-21 11:22:57.000000000 +0000
+@@ -6067,7 +6067,7 @@
+    { (exit 1); exit 1; }; }
+ 	fi
+ 	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${libdir} ${LIBTOOL_VERSION} `cut -f1 ${top_srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
+-	LIB_OBJECT='${OBJECTS:.o=.lo}'
++	LIB_OBJECT='${OBJECTS:.$OBJEXT=.lo}'
+ 	LIB_SUFFIX=.la
+ 	LIB_CLEAN='${LIBTOOL} --mode=clean'
+ 	LIB_COMPILE='${LIBTOOL} --mode=compile'
+@@ -7234,7 +7234,7 @@
+ 				-L*)
+ 					ldopts+=("\`echo \"\$1\" | sed \"s/^-L/-LIBPATH:/\"\`")
+ 					;;
+-				*.obj | *.o)
++				*.obj | *.$OBJEXT)
+ 					ldopts+=("\$1")
+ 					;;
+ 				-Wl,*)
+@@ -21843,10 +21843,10 @@
+   ac_status=$?
+   echo "$as_me:21844: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		mv conftest.o data.o && \
+-		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
++		mv conftest.$OBJEXT data.$OBJEXT && \
++		( $AR $ARFLAGS conftest.a data.$OBJEXT ) 2>&5 1>/dev/null
+ 	fi
+-	rm -f conftest.$ac_ext data.o
++	rm -f conftest.$ac_ext data.$OBJEXT
+ 	cat >conftest.$ac_ext <&5
+   (exit "$ac_status"); }; then
+-		mv conftest.o func.o && \
+-		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
++		mv conftest.$OBJEXT func.$OBJEXT && \
++		( $AR $ARFLAGS conftest.a func.$OBJEXT ) 2>&5 1>/dev/null
+ 	fi
+-	rm -f conftest.$ac_ext func.o
++	rm -f conftest.$ac_ext func.$OBJEXT
+ 	( eval $RANLIB conftest.a ) 2>&5 >/dev/null
+ 	cf_saveLIBS="$LIBS"
+ 	LIBS="conftest.a $LIBS"
+@@ -29167,7 +29167,7 @@
+   ac_status=$?
+   echo "$as_me:29168: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
++		( $AR $ARFLAGS libconftest.a conftest.$OBJEXT ) 2>&5 1>/dev/null
+ 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
+ 	fi
+ 	rm -f conftest.*
+Index: dist.mk
+Prereq:  1.1673 
+--- ncurses-6.5-20250614+/dist.mk	2025-06-14 09:46:03.000000000 +0000
++++ ncurses-6.5-20250621/dist.mk	2025-06-21 07:53:07.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1673 2025/06/14 09:46:03 tom Exp $
++# $Id: dist.mk,v 1.1674 2025/06/21 07:53: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 = 5
+-NCURSES_PATCH = 20250614
++NCURSES_PATCH = 20250621
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: ncurses/base/lib_mouse.c
+Prereq:  1.209 
+--- ncurses-6.5-20250614+/ncurses/base/lib_mouse.c	2025-03-22 23:14:11.000000000 +0000
++++ ncurses-6.5-20250621/ncurses/base/lib_mouse.c	2025-06-21 14:24:38.000000000 +0000
+@@ -70,7 +70,6 @@
+  */
+ 
+ #ifdef __EMX__
+-#  include 
+ #  define  INCL_DOS
+ #  define  INCL_VIO
+ #  define  INCL_KBD
+@@ -85,7 +84,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_mouse.c,v 1.209 2025/03/22 23:14:11 Daniel.Starke Exp $")
++MODULE_ID("$Id: lib_mouse.c,v 1.210 2025/06/21 14:24:38 tom Exp $")
+ 
+ #include 
+ 
+Index: ncurses/base/lib_nl.c
+Prereq:  1.15 
+--- ncurses-6.5-20250614+/ncurses/base/lib_nl.c	2024-12-07 20:00:48.000000000 +0000
++++ ncurses-6.5-20250621/ncurses/base/lib_nl.c	2025-06-21 14:27:02.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2000,2009 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -45,11 +45,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_nl.c,v 1.15 2024/12/07 20:00:48 tom Exp $")
+-
+-#ifdef __EMX__
+-#include 
+-#endif
++MODULE_ID("$Id: lib_nl.c,v 1.16 2025/06/21 14:27:02 tom Exp $")
+ 
+ NCURSES_EXPORT(int)
+ NCURSES_SP_NAME(nl) (NCURSES_SP_DCL0)
+Index: ncurses/curses.priv.h
+Prereq:  1.702 
+--- ncurses-6.5-20250614+/ncurses/curses.priv.h	2025-05-17 20:43:18.000000000 +0000
++++ ncurses-6.5-20250621/ncurses/curses.priv.h	2025-06-21 20:42:05.000000000 +0000
+@@ -35,7 +35,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: curses.priv.h,v 1.702 2025/05/17 20:43:18 tom Exp $
++ * $Id: curses.priv.h,v 1.704 2025/06/21 20:42:05 tom Exp $
+  *
+  *	curses.priv.h
+  *
+@@ -2518,6 +2518,20 @@
+ #include 
+ #endif
+ 
++#ifdef _NC_WINDOWS
++#if (defined(_NC_MINGW) || defined(__MINGW32__) || defined(__MINGW64__))
++#include 
++#else
++#include 
++#endif
++#include 
++#elif defined(_NC_WINDOWS_NATIVE)
++#include 
++#include 
++#elif defined(__EMX__)
++#include 
++#endif
++
+ /*
+  * Entrypoints using an extra parameter with the terminal driver.
+  */
+Index: ncurses/tinfo/lib_raw.c
+Prereq:  1.32 
+--- ncurses-6.5-20250614+/ncurses/tinfo/lib_raw.c	2024-12-07 18:24:47.000000000 +0000
++++ ncurses-6.5-20250621/ncurses/tinfo/lib_raw.c	2025-06-21 14:27:09.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -50,14 +50,13 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_raw.c,v 1.32 2024/12/07 18:24:47 tom Exp $")
++MODULE_ID("$Id: lib_raw.c,v 1.33 2025/06/21 14:27:09 tom Exp $")
+ 
+ #if HAVE_SYS_TERMIO_H
+ #include 		/* needed for ISC */
+ #endif
+ 
+ #ifdef __EMX__
+-#include 
+ #define _nc_setmode(mode) setmode(SP_PARM->_ifd, mode)
+ #else
+ #define _nc_setmode(mode)	/* nothing */
+Index: ncurses/tinfo/lib_win32con.c
+Prereq:  1.21 
+--- ncurses-6.5-20250614+/ncurses/tinfo/lib_win32con.c	2025-03-29 19:36:13.000000000 +0000
++++ ncurses-6.5-20250621/ncurses/tinfo/lib_win32con.c	2025-06-21 14:23:15.000000000 +0000
+@@ -38,18 +38,10 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_win32con.c,v 1.21 2025/03/29 19:36:13 tom Exp $")
++MODULE_ID("$Id: lib_win32con.c,v 1.22 2025/06/21 14:23:15 tom Exp $")
+ 
+ #if defined(_NC_WINDOWS)
+ 
+-#ifdef _NC_MINGW
+-#include 
+-#else
+-#include 
+-#endif
+-
+-#include 
+-
+ #if USE_WIDEC_SUPPORT
+ #define write_screen WriteConsoleOutputW
+ #define read_screen  ReadConsoleOutputW
+Index: ncurses/tinfo/lib_win32util.c
+Prereq:  1.5 
+--- ncurses-6.5-20250614+/ncurses/tinfo/lib_win32util.c	2024-08-31 15:55:16.000000000 +0000
++++ ncurses-6.5-20250621/ncurses/tinfo/lib_win32util.c	2025-06-21 14:27:43.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -34,15 +34,13 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_win32util.c,v 1.5 2024/08/31 15:55:16 tom Exp $")
++MODULE_ID("$Id: lib_win32util.c,v 1.6 2025/06/21 14:27:43 tom Exp $")
+ 
+ #ifdef _NC_WINDOWS_NATIVE
+-#include 
+ 
+ #ifdef _NC_CHECK_MINTTY
+ #define PSAPI_VERSION 2
+ #include 
+-#include 
+ 
+ #define array_length(a) (sizeof(a)/sizeof(a[0]))
+ 
+Index: ncurses/trace/lib_tracebits.c
+Prereq:  1.34 
+--- ncurses-6.5-20250614+/ncurses/trace/lib_tracebits.c	2025-02-20 01:02:09.000000000 +0000
++++ ncurses-6.5-20250621/ncurses/trace/lib_tracebits.c	2025-06-21 14:24:25.000000000 +0000
+@@ -35,16 +35,12 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_tracebits.c,v 1.34 2025/02/20 01:02:09 tom Exp $")
++MODULE_ID("$Id: lib_tracebits.c,v 1.35 2025/06/21 14:24:25 tom Exp $")
+ 
+ #if HAVE_SYS_TERMIO_H
+ #include 		/* needed for ISC */
+ #endif
+ 
+-#ifdef __EMX__
+-#include 
+-#endif
+-
+ /* may be undefined if we're using termio.h */
+ #ifndef TOSTOP
+ #define TOSTOP 0
+Index: ncurses/widechar/lib_ins_wch.c
+Prereq:  1.32 
+--- ncurses-6.5-20250614+/ncurses/widechar/lib_ins_wch.c	2025-02-20 01:02:09.000000000 +0000
++++ ncurses-6.5-20250621/ncurses/widechar/lib_ins_wch.c	2025-06-21 22:26:21.000000000 +0000
+@@ -40,7 +40,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_ins_wch.c,v 1.32 2025/02/20 01:02:09 tom Exp $")
++MODULE_ID("$Id: lib_ins_wch.c,v 1.34 2025/06/21 22:26:21 tom Exp $")
+ 
+ /*
+  * Insert the given character, updating the current location to simplify
+@@ -100,6 +100,14 @@
+     returnCode(code);
+ }
+ 
++static int
++flush_wchars(WINDOW *win, wchar_t *wchars)
++{
++    cchar_t tmp_cchar;
++    (void) setcchar(&tmp_cchar, wchars, WA_NORMAL, (short) 0, (void *) 0);
++    return _nc_insert_wch(win, &tmp_cchar);
++}
++
+ NCURSES_EXPORT(int)
+ wins_nwstr(WINDOW *win, const wchar_t *wstr, int n)
+ {
+@@ -121,27 +129,37 @@
+ 	    SCREEN *sp = _nc_screen_of(win);
+ 	    NCURSES_SIZE_T oy = win->_cury;
+ 	    NCURSES_SIZE_T ox = win->_curx;
++	    wchar_t tmp_wchars[1 + CCHARW_MAX];
++	    int num_wchars = 0;
+ 
+ 	    for (cp = wstr; ((cp - wstr) < n) && (*cp != L'\0'); cp++) {
+ 		int len = _nc_wacs_width(*cp);
+ 
+-		if ((len >= 0 && len != 1) || !is7bits(*cp)) {
+-		    cchar_t tmp_cchar;
+-		    wchar_t tmp_wchar = *cp;
+-		    memset(&tmp_cchar, 0, sizeof(tmp_cchar));
+-		    (void) setcchar(&tmp_cchar,
+-				    &tmp_wchar,
+-				    WA_NORMAL,
+-				    (short) 0,
+-				    (void *) 0);
+-		    code = _nc_insert_wch(win, &tmp_cchar);
+-		} else {
++		if (is7bits(*cp) && len <= 0) {
++		    if (num_wchars) {
++			if ((code = flush_wchars(win, tmp_wchars)) != OK)
++			    break;
++			num_wchars = 0;
++		    }
+ 		    /* tabs, other ASCII stuff */
+ 		    code = _nc_insert_ch(sp, win, (chtype) (*cp));
++		} else {
++		    if (num_wchars > 0 && len > 0) {
++			if ((code = flush_wchars(win, tmp_wchars)) != OK)
++			    break;
++			num_wchars = 0;
++		    }
++		    if (num_wchars < CCHARW_MAX) {
++			tmp_wchars[num_wchars++] = *cp;
++			tmp_wchars[num_wchars] = L'\0';
++		    }
+ 		}
+ 		if (code != OK)
+ 		    break;
+ 	    }
++	    if (code == OK && num_wchars) {
++		code = flush_wchars(win, tmp_wchars);
++	    }
+ 
+ 	    win->_curx = ox;
+ 	    win->_cury = oy;
+Index: ncurses/win32con/win32_driver.c
+Prereq:  1.8 
+--- ncurses-6.5-20250614+/ncurses/win32con/win32_driver.c	2025-03-29 19:31:07.000000000 +0000
++++ ncurses-6.5-20250621/ncurses/win32con/win32_driver.c	2025-06-21 14:19:28.000000000 +0000
+@@ -38,17 +38,12 @@
+  */
+ 
+ #include 
++
+ #ifdef _NC_WINDOWS
+-#if (defined(__MINGW32__) || defined(__MINGW64__))
+-#include 
+-#else
+-#include 
+-#endif
+-#include 
+ 
+ #define CUR TerminalType(my_term).
+ 
+-MODULE_ID("$Id: win32_driver.c,v 1.8 2025/03/29 19:31:07 tom Exp $")
++MODULE_ID("$Id: win32_driver.c,v 1.9 2025/06/21 14:19:28 tom Exp $")
+ 
+ #define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE)
+ #define EXP_OPTIMIZE 0
+Index: ncurses/win32con/win_driver.c
+Prereq:  1.82 
+--- ncurses-6.5-20250614+/ncurses/win32con/win_driver.c	2025-03-29 19:31:24.000000000 +0000
++++ ncurses-6.5-20250621/ncurses/win32con/win_driver.c	2025-06-21 14:25:02.000000000 +0000
+@@ -41,15 +41,6 @@
+ 
+ #include 
+ 
+-#ifdef _WIN32
+-#include 
+-#else
+-#include 
+-#include 
+-#endif
+-
+-#include 
+-
+ #define PSAPI_VERSION 2
+ #include 
+ 
+@@ -57,7 +48,7 @@
+ 
+ #define CONTROL_PRESSED (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)
+ 
+-MODULE_ID("$Id: win_driver.c,v 1.82 2025/03/29 19:31:24 tom Exp $")
++MODULE_ID("$Id: win_driver.c,v 1.83 2025/06/21 14:25:02 tom Exp $")
+ 
+ #define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE)
+ 
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250614+/package/debian-mingw/changelog	2025-06-14 09:46:03.000000000 +0000
++++ ncurses-6.5-20250621/package/debian-mingw/changelog	2025-06-20 07:53:07.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250614) unstable; urgency=low
++ncurses6td (6.5+20250621) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 14 Jun 2025 05:46:03 -0400
++ -- Thomas E. Dickey   Fri, 20 Jun 2025 03:53:07 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw/copyright
+--- ncurses-6.5-20250614+/package/debian-mingw/copyright	2025-01-04 10:55:16.000000000 +0000
++++ ncurses-6.5-20250621/package/debian-mingw/copyright	2025-06-21 16:55:28.000000000 +0000
+@@ -1,100 +1,105 @@
+-Upstream source https://invisible-island.net/ncurses/ncurses.html
+-This package is used for testing builds of ncurses.
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: ncurses
++Upstream-Contact: Thomas E. Dickey 
++Source: https://invisible-island.net/ncurses/ncurses.html
+ 
+-Current ncurses maintainer: Thomas Dickey 
+-
+--------------------------------------------------------------------------------
+ Files: *
+ Copyright: 2017-2024,2025 by Thomas E. Dickey
+-Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+-License: X11
++           1998-2016,2017 Free Software Foundation, Inc.
++License:   X11 License Distribution Modification Variant
++ 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.
++Comment:
++ https://invisible-island.net/ncurses/ncurses-license.html
+ 
+-Files: aclocal.m4 package
++Files:     aclocal.m4 package
+ Copyright: 1996-2024,2025 by Thomas E. Dickey
+-License: X11
++License:   X11 License Distribution Modification Variant
+ 
+-Files: doc/html/NCURSES-Programming-HOWTO.html
++Files:     doc/html/NCURSES-Programming-HOWTO.html
+ Copyright: 2001 by Pradeep Padala
+-License: X11
++License:   X11 License Distribution Modification Variant
+ 
+-    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.
+-
+--------------------------------------------------------------------------------
+-Files: install-sh
+-Copyright:  1994 X Consortium
+-License: X11
+-
+-    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, 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
+-    X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+-    AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+-    TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-
+-    Except as contained in this notice, the name of the X Consortium shall not
+-    be used in advertising or otherwise to promote the sale, use or other deal-
+-    ings in this Software without prior written authorization from the X Consor-
+-    tium.
++Files:     misc/ncu2openbsd
++           ncurses/wcwidth.h
++Copyright: 2002-2024 by Thomas E. Dickey
++License:   X11
++
++Files:     install-sh
++Copyright: 1994 X Consortium
++License:   X11
++ 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, 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 LISTED COPYRIGHT HOLDER(S) 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.
+ 
+--------------------------------------------------------------------------------
+-Files: progs/tset.c ncurses/tinfo/read_termcap.c
++Files:     ncurses/tinfo/read_termcap.c
++           progs/tset.c 
+ Copyright: 1980,1991,1992,1993 The Regents of the University of California.
+-License: BSD
+-
+-    Redistribution and use in source and binary forms, with or without
+-    modification, are permitted provided that the following conditions
+-    are met:
+-    1. Redistributions of source code must retain the above copyright
+-       notice, this list of conditions and the following disclaimer.
+-    2. Redistributions in binary form must reproduce the above copyright
+-       notice, this list of conditions and the following disclaimer in the
+-       documentation and/or other materials provided with the distribution.
+-    3. Neither the name of the University nor the names of its contributors
+-       may be used to endorse or promote products derived from this software
+-       without specific prior written permission.
+-
+-    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+-    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+-    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+-    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+-    SUCH DAMAGE.
+-
+--- vile: txtmode file-encoding=utf-8
++License:   BSD-3-Clause
++ Redistribution and use in source and binary forms, with or without
++ modification, are permitted provided that the following conditions
++ are met:
++ 1. Redistributions of source code must retain the above copyright
++    notice, this list of conditions and the following disclaimer.
++ 2. Redistributions in binary form must reproduce the above copyright
++    notice, this list of conditions and the following disclaimer in the
++    documentation and/or other materials provided with the distribution.
++ 3. Neither the name of the University nor the names of its contributors
++    may be used to endorse or promote products derived from this software
++    without specific prior written permission.
++ .
++ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ SUCH DAMAGE.
++
++Files:     test/terminal.xbm
++Copyright: 1988 Evans & Sutherland Computer Corporation, Salt Lake City, Utah
++License:   StandardML-NJ
++Comment: vile: txtmode file-encoding=utf-8
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250614+/package/debian-mingw64/changelog	2025-06-14 09:46:03.000000000 +0000
++++ ncurses-6.5-20250621/package/debian-mingw64/changelog	2025-06-20 07:53:07.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250614) unstable; urgency=low
++ncurses6td (6.5+20250621) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 14 Jun 2025 05:46:03 -0400
++ -- Thomas E. Dickey   Fri, 20 Jun 2025 03:53:07 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/copyright
+--- ncurses-6.5-20250614+/package/debian-mingw64/copyright	2025-01-04 10:55:34.000000000 +0000
++++ ncurses-6.5-20250621/package/debian-mingw64/copyright	2025-06-21 16:55:28.000000000 +0000
+@@ -1,100 +1,105 @@
+-Upstream source https://invisible-island.net/ncurses/ncurses.html
+-This package is used for testing builds of ncurses.
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: ncurses
++Upstream-Contact: Thomas E. Dickey 
++Source: https://invisible-island.net/ncurses/ncurses.html
+ 
+-Current ncurses maintainer: Thomas Dickey 
+-
+--------------------------------------------------------------------------------
+ Files: *
+ Copyright: 2017-2024,2025 by Thomas E. Dickey
+-Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+-License: X11
++           1998-2016,2017 Free Software Foundation, Inc.
++License:   X11 License Distribution Modification Variant
++ 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.
++Comment:
++ https://invisible-island.net/ncurses/ncurses-license.html
+ 
+-Files: aclocal.m4 package
++Files:     aclocal.m4 package
+ Copyright: 1996-2024,2025 by Thomas E. Dickey
+-License: X11
++License:   X11 License Distribution Modification Variant
+ 
+-Files: doc/html/NCURSES-Programming-HOWTO.html
++Files:     doc/html/NCURSES-Programming-HOWTO.html
+ Copyright: 2001 by Pradeep Padala
+-License: X11
++License:   X11 License Distribution Modification Variant
+ 
+-    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.
+-
+--------------------------------------------------------------------------------
+-Files: install-sh
+-Copyright:  1994 X Consortium
+-License: X11
+-
+-    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, 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
+-    X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+-    AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+-    TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-
+-    Except as contained in this notice, the name of the X Consortium shall not
+-    be used in advertising or otherwise to promote the sale, use or other deal-
+-    ings in this Software without prior written authorization from the X Consor-
+-    tium.
++Files:     misc/ncu2openbsd
++           ncurses/wcwidth.h
++Copyright: 2002-2024 by Thomas E. Dickey
++License:   X11
++
++Files:     install-sh
++Copyright: 1994 X Consortium
++License:   X11
++ 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, 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 LISTED COPYRIGHT HOLDER(S) 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.
+ 
+--------------------------------------------------------------------------------
+-Files: progs/tset.c ncurses/tinfo/read_termcap.c
++Files:     ncurses/tinfo/read_termcap.c
++           progs/tset.c 
+ Copyright: 1980,1991,1992,1993 The Regents of the University of California.
+-License: BSD
+-
+-    Redistribution and use in source and binary forms, with or without
+-    modification, are permitted provided that the following conditions
+-    are met:
+-    1. Redistributions of source code must retain the above copyright
+-       notice, this list of conditions and the following disclaimer.
+-    2. Redistributions in binary form must reproduce the above copyright
+-       notice, this list of conditions and the following disclaimer in the
+-       documentation and/or other materials provided with the distribution.
+-    3. Neither the name of the University nor the names of its contributors
+-       may be used to endorse or promote products derived from this software
+-       without specific prior written permission.
+-
+-    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+-    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+-    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+-    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+-    SUCH DAMAGE.
+-
+--- vile: txtmode file-encoding=utf-8
++License:   BSD-3-Clause
++ Redistribution and use in source and binary forms, with or without
++ modification, are permitted provided that the following conditions
++ are met:
++ 1. Redistributions of source code must retain the above copyright
++    notice, this list of conditions and the following disclaimer.
++ 2. Redistributions in binary form must reproduce the above copyright
++    notice, this list of conditions and the following disclaimer in the
++    documentation and/or other materials provided with the distribution.
++ 3. Neither the name of the University nor the names of its contributors
++    may be used to endorse or promote products derived from this software
++    without specific prior written permission.
++ .
++ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ SUCH DAMAGE.
++
++Files:     test/terminal.xbm
++Copyright: 1988 Evans & Sutherland Computer Corporation, Salt Lake City, Utah
++License:   StandardML-NJ
++Comment: vile: txtmode file-encoding=utf-8
+Index: package/debian/changelog
+--- ncurses-6.5-20250614+/package/debian/changelog	2025-06-14 09:46:03.000000000 +0000
++++ ncurses-6.5-20250621/package/debian/changelog	2025-06-20 07:53:07.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250614) unstable; urgency=low
++ncurses6td (6.5+20250621) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 14 Jun 2025 05:46:03 -0400
++ -- Thomas E. Dickey   Fri, 20 Jun 2025 03:53:07 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/debian/copyright
+--- ncurses-6.5-20250614+/package/debian/copyright	2025-01-04 10:54:57.000000000 +0000
++++ ncurses-6.5-20250621/package/debian/copyright	2025-06-21 16:55:28.000000000 +0000
+@@ -1,100 +1,105 @@
+-Upstream source https://invisible-island.net/ncurses/ncurses.html
+-This package is used for testing builds of ncurses.
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: ncurses
++Upstream-Contact: Thomas E. Dickey 
++Source: https://invisible-island.net/ncurses/ncurses.html
+ 
+-Current ncurses maintainer: Thomas Dickey 
+-
+--------------------------------------------------------------------------------
+ Files: *
+ Copyright: 2017-2024,2025 by Thomas E. Dickey
+-Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+-License: X11
++           1998-2016,2017 Free Software Foundation, Inc.
++License:   X11 License Distribution Modification Variant
++ 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.
++Comment:
++ https://invisible-island.net/ncurses/ncurses-license.html
+ 
+-Files: aclocal.m4 package
++Files:     aclocal.m4 package
+ Copyright: 1996-2024,2025 by Thomas E. Dickey
+-License: X11
++License:   X11 License Distribution Modification Variant
+ 
+-Files: doc/html/NCURSES-Programming-HOWTO.html
++Files:     doc/html/NCURSES-Programming-HOWTO.html
+ Copyright: 2001 by Pradeep Padala
+-License: X11
++License:   X11 License Distribution Modification Variant
+ 
+-    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.
+-
+--------------------------------------------------------------------------------
+-Files: install-sh
+-Copyright:  1994 X Consortium
+-License: X11
+-
+-    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, 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
+-    X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+-    AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+-    TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-
+-    Except as contained in this notice, the name of the X Consortium shall not
+-    be used in advertising or otherwise to promote the sale, use or other deal-
+-    ings in this Software without prior written authorization from the X Consor-
+-    tium.
++Files:     misc/ncu2openbsd
++           ncurses/wcwidth.h
++Copyright: 2002-2024 by Thomas E. Dickey
++License:   X11
++
++Files:     install-sh
++Copyright: 1994 X Consortium
++License:   X11
++ 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, 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 LISTED COPYRIGHT HOLDER(S) 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.
+ 
+--------------------------------------------------------------------------------
+-Files: progs/tset.c ncurses/tinfo/read_termcap.c
++Files:     ncurses/tinfo/read_termcap.c
++           progs/tset.c 
+ Copyright: 1980,1991,1992,1993 The Regents of the University of California.
+-License: BSD
+-
+-    Redistribution and use in source and binary forms, with or without
+-    modification, are permitted provided that the following conditions
+-    are met:
+-    1. Redistributions of source code must retain the above copyright
+-       notice, this list of conditions and the following disclaimer.
+-    2. Redistributions in binary form must reproduce the above copyright
+-       notice, this list of conditions and the following disclaimer in the
+-       documentation and/or other materials provided with the distribution.
+-    3. Neither the name of the University nor the names of its contributors
+-       may be used to endorse or promote products derived from this software
+-       without specific prior written permission.
+-
+-    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+-    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+-    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+-    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+-    SUCH DAMAGE.
+-
+--- vile: txtmode file-encoding=utf-8
++License:   BSD-3-Clause
++ Redistribution and use in source and binary forms, with or without
++ modification, are permitted provided that the following conditions
++ are met:
++ 1. Redistributions of source code must retain the above copyright
++    notice, this list of conditions and the following disclaimer.
++ 2. Redistributions in binary form must reproduce the above copyright
++    notice, this list of conditions and the following disclaimer in the
++    documentation and/or other materials provided with the distribution.
++ 3. Neither the name of the University nor the names of its contributors
++    may be used to endorse or promote products derived from this software
++    without specific prior written permission.
++ .
++ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ SUCH DAMAGE.
++
++Files:     test/terminal.xbm
++Copyright: 1988 Evans & Sutherland Computer Corporation, Salt Lake City, Utah
++License:   StandardML-NJ
++Comment: vile: txtmode file-encoding=utf-8
+Index: package/mingw-ncurses.nsi
+Prereq:  1.707 
+--- ncurses-6.5-20250614+/package/mingw-ncurses.nsi	2025-06-14 09:46:03.000000000 +0000
++++ ncurses-6.5-20250621/package/mingw-ncurses.nsi	2025-06-20 07:53:07.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.707 2025/06/14 09:46:03 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.708 2025/06/20 07:53:07 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0614"
++!define VERSION_MMDD  "0621"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250614+/package/mingw-ncurses.spec	2025-06-14 09:46:03.000000000 +0000
++++ ncurses-6.5-20250621/package/mingw-ncurses.spec	2025-06-21 18:33:41.000000000 +0000
+@@ -3,8 +3,8 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250614
+-License: X11
++Release: 20250621
++License: X11 License Distribution Modification Variant
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+ Source: https://invisible-island.net/archives/ncurses/ncurses-%{version}-%{release}.tgz
+@@ -144,6 +144,9 @@
+ 
+ %changelog
+ 
++* Fri Jun 20 2025 Thomas E. Dickey
++- testing ncurses 6.5-20250621
++
+ * Sat Feb 25 2023 Thomas Dickey
+ - amend URLs per rpmlint
+ 
+Index: package/ncurses.spec
+--- ncurses-6.5-20250614+/package/ncurses.spec	2025-06-14 09:46:03.000000000 +0000
++++ ncurses-6.5-20250621/package/ncurses.spec	2025-06-21 18:32:55.000000000 +0000
+@@ -1,8 +1,8 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250614
+-License: X11
++Release: 20250621
++License: X11 License Distribution Modification Variant
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+ Source: https://invisible-island.net/archives/ncurses/ncurses-%{version}-%{release}.tgz
+@@ -134,6 +134,9 @@
+ 
+ %changelog
+ 
++* Fri Jun 20 2025 Thomas E. Dickey
++- testing ncurses 6.5-20250621
++
+ * Sat Feb 25 2023 Thomas Dickey
+ - amend URLs per rpmlint
+ 
+Index: package/ncursest.spec
+--- ncurses-6.5-20250614+/package/ncursest.spec	2025-06-14 09:46:03.000000000 +0000
++++ ncurses-6.5-20250621/package/ncursest.spec	2025-06-21 18:33:41.000000000 +0000
+@@ -1,8 +1,8 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250614
+-License: X11
++Release: 20250621
++License: X11 License Distribution Modification Variant
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+ # URL: https://invisible-island.net/ncurses/
+@@ -142,6 +142,9 @@
+ 
+ %changelog
+ 
++* Fri Jun 20 2025 Thomas E. Dickey
++- testing ncurses 6.5-20250621
++
+ * Tue Dec 24 2019 Thomas Dickey
+ - drop custom CC_NORMAL warning flags because setting CFLAGS interferes with
+   matching Fedora's PIE/PIC configuration.  Also, generate debug/debug-source
+Index: test/make-tar.sh
+Prereq:  1.22 
+--- ncurses-6.5-20250614+/test/make-tar.sh	2025-06-14 15:07:50.000000000 +0000
++++ ncurses-6.5-20250621/test/make-tar.sh	2025-06-20 19:38:25.000000000 +0000
+@@ -1,5 +1,5 @@
+ #!/bin/sh
+-# $Id: make-tar.sh,v 1.22 2025/06/14 15:07:50 tom Exp $
++# $Id: make-tar.sh,v 1.23 2025/06/20 19:38:25 tom Exp $
+ ##############################################################################
+ # Copyright 2019-2022,2025 Thomas E. Dickey                                  #
+ # Copyright 2010-2015,2017 Free Software Foundation, Inc.                    #
+@@ -62,10 +62,12 @@
+ # The rpm spec-file in the ncurses tree is a template.  Fill in the version
+ # information from dist.mk
+ edit_specfile() {
++	RPM_DATE=`date +'%a %b %d %Y' -d "$NCURSES_PATCH"`
+ 	sed \
+ 		-e "s/\\/$NCURSES_MAJOR/g" \
+ 		-e "s/\\/$NCURSES_MINOR/g" \
+-		-e "s/\\/$NCURSES_PATCH/g" "$1" >"$1.new"
++		-e "s/\\/$NCURSES_PATCH/g" \
++		-e "s/\\/$RPM_DATE/g" "$1" >"$1.new"
+ 	chmod u+w "$1"
+ 	mv "$1.new" "$1"
+ 	same_timestamp "$1"
+@@ -104,7 +106,7 @@
+ umask 022
+ mkdir "$BUILD/$ROOTNAME"
+ 
+-cp -p -r ./* "$BUILD/$ROOTNAME"/ || exit
++cp -p -r ./* "$BUILD/$ROOTNAME/" || exit
+ 
+ # Add the config.* utility scripts from the top-level directory.
+ for i in . ..
+Index: test/package/debian-mingw/copyright
+--- ncurses-6.5-20250614+/test/package/debian-mingw/copyright	2025-01-04 10:56:36.000000000 +0000
++++ ncurses-6.5-20250621/test/package/debian-mingw/copyright	2025-06-21 17:55:04.000000000 +0000
+@@ -1,79 +1,68 @@
+-Upstream source https://invisible-island.net/ncurses/ncurses-examples.html
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: ncurses-examples
++Upstream-Contact: Thomas E. Dickey 
++Source: https://invisible-island.net/ncurses/ncurses-examples.html
+ 
+-Current ncurses maintainer: Thomas Dickey 
+-
+--------------------------------------------------------------------------------
+ Files: *
+-Copyright: 2017-2024,2025 Thomas E. Dickey
+-Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+-License: X11
++Copyright: 2017-2024,2025 by Thomas E. Dickey
++           1998-2016,2017 Free Software Foundation, Inc.
++License:   X11 License Distribution Modification Variant
++ 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.
++Comment:
++ https://invisible-island.net/ncurses/ncurses-license.html
+ 
+-Files: aclocal.m4 package
++Files:     aclocal.m4 package
+ Copyright: 2003-2024,2025 by Thomas E. Dickey
+-License: X11
+-
+-    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.
+-
+--------------------------------------------------------------------------------
+-Files: install-sh
+-Copyright:  1994 X Consortium
+-License: X11
+-
+-    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, 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
+-    X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+-    AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+-    TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-
+-    Except as contained in this notice, the name of the X Consortium shall not
+-    be used in advertising or otherwise to promote the sale, use or other deal-
+-    ings in this Software without prior written authorization from the X Consor-
+-    tium.
+-
+-    FSF changes to this file are in the public domain.
+-
+-    Calling this script install-sh is preferred over install.sh, to prevent
+-    `make' implicit rules from creating a file called install from it
+-    when there is no Makefile.
+-
+-    This script is compatible with the BSD install script, but was written
+-    from scratch.  It can only install one file at a time, a restriction
+-    shared with many OS's install programs.
+-
+-On Debian systems, the complete text of the GNU General
+-Public License can be found in '/usr/share/common-licenses/GPL-2'
++License:   X11 License Distribution Modification Variant
+ 
+--- vile: txtmode file-encoding=utf-8
++Files:     install-sh
++Copyright: 1994 X Consortium
++License:   X11
++ 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, 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 LISTED COPYRIGHT HOLDER(S) 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.
++
++Files:     terminal.xbm
++Copyright: 1988 Evans & Sutherland Computer Corporation, Salt Lake City, Utah
++License:   StandardML-NJ
++Comment: vile: txtmode file-encoding=utf-8
+Index: test/package/debian-mingw64/copyright
+--- ncurses-6.5-20250614+/test/package/debian-mingw64/copyright	2025-01-04 10:56:53.000000000 +0000
++++ ncurses-6.5-20250621/test/package/debian-mingw64/copyright	2025-06-21 17:55:04.000000000 +0000
+@@ -1,79 +1,68 @@
+-Upstream source https://invisible-island.net/ncurses/ncurses-examples.html
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: ncurses-examples
++Upstream-Contact: Thomas E. Dickey 
++Source: https://invisible-island.net/ncurses/ncurses-examples.html
+ 
+-Current ncurses maintainer: Thomas Dickey 
+-
+--------------------------------------------------------------------------------
+ Files: *
+-Copyright: 2017-2024,2025 Thomas E. Dickey
+-Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+-License: X11
++Copyright: 2017-2024,2025 by Thomas E. Dickey
++           1998-2016,2017 Free Software Foundation, Inc.
++License:   X11 License Distribution Modification Variant
++ 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.
++Comment:
++ https://invisible-island.net/ncurses/ncurses-license.html
+ 
+-Files: aclocal.m4 package
++Files:     aclocal.m4 package
+ Copyright: 2003-2024,2025 by Thomas E. Dickey
+-License: X11
+-
+-    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.
+-
+--------------------------------------------------------------------------------
+-Files: install-sh
+-Copyright:  1994 X Consortium
+-License: X11
+-
+-    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, 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
+-    X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+-    AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+-    TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-
+-    Except as contained in this notice, the name of the X Consortium shall not
+-    be used in advertising or otherwise to promote the sale, use or other deal-
+-    ings in this Software without prior written authorization from the X Consor-
+-    tium.
+-
+-    FSF changes to this file are in the public domain.
+-
+-    Calling this script install-sh is preferred over install.sh, to prevent
+-    `make' implicit rules from creating a file called install from it
+-    when there is no Makefile.
+-
+-    This script is compatible with the BSD install script, but was written
+-    from scratch.  It can only install one file at a time, a restriction
+-    shared with many OS's install programs.
+-
+-On Debian systems, the complete text of the GNU General
+-Public License can be found in '/usr/share/common-licenses/GPL-2'
++License:   X11 License Distribution Modification Variant
+ 
+--- vile: txtmode file-encoding=utf-8
++Files:     install-sh
++Copyright: 1994 X Consortium
++License:   X11
++ 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, 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 LISTED COPYRIGHT HOLDER(S) 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.
++
++Files:     terminal.xbm
++Copyright: 1988 Evans & Sutherland Computer Corporation, Salt Lake City, Utah
++License:   StandardML-NJ
++Comment: vile: txtmode file-encoding=utf-8
+Index: test/package/debian/copyright
+--- ncurses-6.5-20250614+/test/package/debian/copyright	2025-01-04 10:56:09.000000000 +0000
++++ ncurses-6.5-20250621/test/package/debian/copyright	2025-06-21 17:55:04.000000000 +0000
+@@ -1,79 +1,68 @@
+-Upstream source https://invisible-island.net/ncurses/ncurses-examples.html
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: ncurses-examples
++Upstream-Contact: Thomas E. Dickey 
++Source: https://invisible-island.net/ncurses/ncurses-examples.html
+ 
+-Current ncurses maintainer: Thomas Dickey 
+-
+--------------------------------------------------------------------------------
+ Files: *
+-Copyright: 2017-2024,2025 Thomas E. Dickey
+-Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+-License: X11
++Copyright: 2017-2024,2025 by Thomas E. Dickey
++           1998-2016,2017 Free Software Foundation, Inc.
++License:   X11 License Distribution Modification Variant
++ 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.
++Comment:
++ https://invisible-island.net/ncurses/ncurses-license.html
+ 
+-Files: aclocal.m4 package
++Files:     aclocal.m4 package
+ Copyright: 2003-2024,2025 by Thomas E. Dickey
+-License: X11
+-
+-    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.
+-
+--------------------------------------------------------------------------------
+-Files: install-sh
+-Copyright:  1994 X Consortium
+-License: X11
+-
+-    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, 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
+-    X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+-    AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+-    TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-
+-    Except as contained in this notice, the name of the X Consortium shall not
+-    be used in advertising or otherwise to promote the sale, use or other deal-
+-    ings in this Software without prior written authorization from the X Consor-
+-    tium.
+-
+-    FSF changes to this file are in the public domain.
+-
+-    Calling this script install-sh is preferred over install.sh, to prevent
+-    `make' implicit rules from creating a file called install from it
+-    when there is no Makefile.
+-
+-    This script is compatible with the BSD install script, but was written
+-    from scratch.  It can only install one file at a time, a restriction
+-    shared with many OS's install programs.
+-
+-On Debian systems, the complete text of the GNU General
+-Public License can be found in '/usr/share/common-licenses/GPL-2'
++License:   X11 License Distribution Modification Variant
+ 
+--- vile: txtmode file-encoding=utf-8
++Files:     install-sh
++Copyright: 1994 X Consortium
++License:   X11
++ 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, 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 LISTED COPYRIGHT HOLDER(S) 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.
++
++Files:     terminal.xbm
++Copyright: 1988 Evans & Sutherland Computer Corporation, Salt Lake City, Utah
++License:   StandardML-NJ
++Comment: vile: txtmode file-encoding=utf-8
+Index: test/package/mingw-ncurses-examples.spec
+Prereq:  1.11 
+--- ncurses-6.5-20250614+/test/package/mingw-ncurses-examples.spec	2023-02-25 23:10:34.000000000 +0000
++++ ncurses-6.5-20250621/test/package/mingw-ncurses-examples.spec	2025-06-21 18:35:49.000000000 +0000
+@@ -4,11 +4,11 @@
+ %global AppProgram ncurses-examples
+ %global AppVersion MAJOR.MINOR
+ %global AppRelease YYYYMMDD
+-# $Id: mingw-ncurses-examples.spec,v 1.11 2023/02/25 23:10:34 tom Exp $
++# $Id: mingw-ncurses-examples.spec,v 1.13 2025/06/21 18:35:49 tom Exp $
+ Name: mingw32-ncurses6-examples
+ Version: %{AppVersion}
+ Release: %{AppRelease}
+-License: X11
++License: X11 License Distribution Modification Variant
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/%{AppProgram}.html
+ Source: https://invisible-island.net/archives/%{AppProgram}/%{AppProgram}-%{release}.tgz
+@@ -113,6 +113,9 @@
+ 
+ %changelog
+ 
++* RPM_DATE Thomas Dickey
++- testing ncurses MAJOR.MINOR.YYYYMMDD
++
+ * Sat Feb 25 2023 Thomas Dickey
+ - use libexecdir for programs rather than subdir of bindir
+ - amend URLs per rpmlint
+Index: test/package/ncurses-examples.spec
+Prereq:  1.22 
+--- ncurses-6.5-20250614+/test/package/ncurses-examples.spec	2023-02-25 23:10:49.000000000 +0000
++++ ncurses-6.5-20250621/test/package/ncurses-examples.spec	2025-06-21 18:35:49.000000000 +0000
+@@ -3,11 +3,11 @@
+ %global AltProgram ncursest-examples
+ %global AppVersion MAJOR.MINOR
+ %global AppRelease YYYYMMDD
+-# $Id: ncurses-examples.spec,v 1.22 2023/02/25 23:10:49 tom Exp $
++# $Id: ncurses-examples.spec,v 1.24 2025/06/21 18:35:49 tom Exp $
+ Name: %{AppProgram}
+ Version: %{AppVersion}
+ Release: %{AppRelease}
+-License: MIT
++License: X11 License Distribution Modification Variant
+ Group: Applications/Development
+ URL: https://invisible-island.net/ncurses/%{AppProgram}.html
+ Source: https://invisible-island.net/archives/%{AppProgram}/%{AppProgram}-%{release}.tgz
+@@ -97,6 +97,9 @@
+ %changelog
+ # each patch should add its ChangeLog entries here
+ 
++* RPM_DATE Thomas Dickey
++- testing ncurses MAJOR.MINOR.YYYYMMDD
++
+ * Sat Feb 25 2023 Thomas Dickey
+ - amend URLs per rpmlint
+ 
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250628.patch b/packages/ncurses/6.5/ncurses-6.5-20250628.patch
new file mode 100644
index 0000000000..8674ef13ec
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250628.patch
@@ -0,0 +1,406 @@
+# ncurses 6.5 - patch 20250628 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250628.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Jun 29 00:04:15 UTC 2025
+# ------------------------------------------------------------------------------
+# Ada95/configure                  |   14 +++++++-------
+# NEWS                             |    8 +++++++-
+# VERSION                          |    2 +-
+# dist.mk                          |    4 ++--
+# ncurses/curses.priv.h            |    9 ++++-----
+# ncurses/tinfo/lib_baudrate.c     |    5 +++--
+# ncurses/tinfo/lib_win32util.c    |    3 ++-
+# package/debian-mingw/changelog   |    4 ++--
+# package/debian-mingw64/changelog |    4 ++--
+# package/debian/changelog         |    4 ++--
+# package/mingw-ncurses.nsi        |    4 ++--
+# package/mingw-ncurses.spec       |    6 +++---
+# package/ncurses.spec             |    6 +++---
+# package/ncursest.spec            |    6 +++---
+# test/picsmap.c                   |   10 ++++++----
+# test/test.priv.h                 |    6 +++---
+# 16 files changed, 52 insertions(+), 43 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/configure
+--- ncurses-6.5-20250621+/Ada95/configure	2025-06-14 13:44:50.000000000 +0000
++++ ncurses-6.5-20250628/Ada95/configure	2025-06-22 08:49:14.000000000 +0000
+@@ -13542,7 +13542,7 @@
+ 				-L*)
+ 					ldopts+=("\`echo \"\$1\" | sed \"s/^-L/-LIBPATH:/\"\`")
+ 					;;
+-				*.obj | *.o)
++				*.obj | *.$OBJEXT)
+ 					ldopts+=("\$1")
+ 					;;
+ 				-Wl,*)
+@@ -18823,10 +18823,10 @@
+   ac_status=$?
+   echo "$as_me:18824: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		mv conftest.o data.o && \
+-		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
++		mv conftest.$OBJEXT data.$OBJEXT && \
++		( $AR $ARFLAGS conftest.a data.$OBJEXT ) 2>&5 1>/dev/null
+ 	fi
+-	rm -f conftest.$ac_ext data.o
++	rm -f conftest.$ac_ext data.$OBJEXT
+ 	cat >conftest.$ac_ext <&5
+   (exit "$ac_status"); }; then
+-		mv conftest.o func.o && \
+-		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
++		mv conftest.$OBJEXT func.$OBJEXT && \
++		( $AR $ARFLAGS conftest.a func.$OBJEXT ) 2>&5 1>/dev/null
+ 	fi
+-	rm -f conftest.$ac_ext func.o
++	rm -f conftest.$ac_ext func.$OBJEXT
+ 	( eval $RANLIB conftest.a ) 2>&5 >/dev/null
+ 	cf_saveLIBS="$LIBS"
+ 	LIBS="conftest.a $LIBS"
+Index: NEWS
+Prereq:  1.4301 
+--- ncurses-6.5-20250621+/NEWS	2025-06-21 23:43:58.000000000 +0000
++++ ncurses-6.5-20250628/NEWS	2025-06-28 22:47:22.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4301 2025/06/21 23:43:58 tom Exp $
++-- $Id: NEWS,v 1.4305 2025/06/28 22:47:22 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.
+ 
++20250628
++	+ fix a few compiler-warnings.
++	+ simplify include for wchar.h in Windows port by removing the platform
++	  ifdef's (report by Karl Knechtel).
++	+ regen Ada95/configure (report by Sven Joachim).
++
+ 20250621
+ 	+ revise loop in wins_nwstr, to ensure that non-spacing characters are
+ 	  combined with the base spacing character (report by Karl Knechtel).
+Index: VERSION
+--- ncurses-6.5-20250621+/VERSION	2025-06-21 07:53:07.000000000 +0000
++++ ncurses-6.5-20250628/VERSION	2025-06-28 08:49:47.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250621
++5:0:10	6.5	20250628
+Index: dist.mk
+Prereq:  1.1674 
+--- ncurses-6.5-20250621+/dist.mk	2025-06-21 07:53:07.000000000 +0000
++++ ncurses-6.5-20250628/dist.mk	2025-06-28 08:49:47.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1674 2025/06/21 07:53:07 tom Exp $
++# $Id: dist.mk,v 1.1675 2025/06/28 08:49: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 = 5
+-NCURSES_PATCH = 20250621
++NCURSES_PATCH = 20250628
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: ncurses/curses.priv.h
+Prereq:  1.704 
+--- ncurses-6.5-20250621+/ncurses/curses.priv.h	2025-06-21 20:42:05.000000000 +0000
++++ ncurses-6.5-20250628/ncurses/curses.priv.h	2025-06-28 17:42:24.000000000 +0000
+@@ -35,7 +35,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: curses.priv.h,v 1.704 2025/06/21 20:42:05 tom Exp $
++ * $Id: curses.priv.h,v 1.705 2025/06/28 17:42:24 tom Exp $
+  *
+  *	curses.priv.h
+  *
+@@ -2519,15 +2519,14 @@
+ #endif
+ 
+ #ifdef _NC_WINDOWS
+-#if (defined(_NC_MINGW) || defined(__MINGW32__) || defined(__MINGW64__))
++#if USE_WIDEC_SUPPORT
+ #include 
+-#else
+-#include 
+ #endif
++#include 
+ #include 
+ #elif defined(_NC_WINDOWS_NATIVE)
+-#include 
+ #include 
++#include 
+ #elif defined(__EMX__)
+ #include 
+ #endif
+Index: ncurses/tinfo/lib_baudrate.c
+Prereq:  1.46 
+--- ncurses-6.5-20250621+/ncurses/tinfo/lib_baudrate.c	2024-12-07 20:05:08.000000000 +0000
++++ ncurses-6.5-20250628/ncurses/tinfo/lib_baudrate.c	2025-06-28 17:23:28.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2024 Thomas E. Dickey                                     *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -84,7 +84,7 @@
+ #undef USE_OLD_TTY
+ #endif /* USE_OLD_TTY */
+ 
+-MODULE_ID("$Id: lib_baudrate.c,v 1.46 2024/12/07 20:05:08 tom Exp $")
++MODULE_ID("$Id: lib_baudrate.c,v 1.47 2025/06/28 17:23:28 tom Exp $")
+ 
+ /*
+  *	int
+@@ -269,6 +269,7 @@
+     T((T_CALLED("baudrate(%p)"), (void *) SP_PARM));
+ 
+ #if defined(EXP_WIN32_DRIVER)
++    (void) SP_PARM;
+     result = OK;
+ #else
+     /*
+Index: ncurses/tinfo/lib_win32util.c
+Prereq:  1.6 
+--- ncurses-6.5-20250621+/ncurses/tinfo/lib_win32util.c	2025-06-21 14:27:43.000000000 +0000
++++ ncurses-6.5-20250628/ncurses/tinfo/lib_win32util.c	2025-06-28 16:58:13.000000000 +0000
+@@ -33,8 +33,9 @@
+  ****************************************************************************/
+ 
+ #include 
++#include 
+ 
+-MODULE_ID("$Id: lib_win32util.c,v 1.6 2025/06/21 14:27:43 tom Exp $")
++MODULE_ID("$Id: lib_win32util.c,v 1.7 2025/06/28 16:58:13 tom Exp $")
+ 
+ #ifdef _NC_WINDOWS_NATIVE
+ 
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250621+/package/debian-mingw/changelog	2025-06-20 07:53:07.000000000 +0000
++++ ncurses-6.5-20250628/package/debian-mingw/changelog	2025-06-22 08:49:47.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250621) unstable; urgency=low
++ncurses6td (6.5+20250628) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Fri, 20 Jun 2025 03:53:07 -0400
++ -- Thomas E. Dickey   Sun, 22 Jun 2025 04:49:47 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250621+/package/debian-mingw64/changelog	2025-06-20 07:53:07.000000000 +0000
++++ ncurses-6.5-20250628/package/debian-mingw64/changelog	2025-06-22 08:49:47.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250621) unstable; urgency=low
++ncurses6td (6.5+20250628) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Fri, 20 Jun 2025 03:53:07 -0400
++ -- Thomas E. Dickey   Sun, 22 Jun 2025 04:49:47 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250621+/package/debian/changelog	2025-06-20 07:53:07.000000000 +0000
++++ ncurses-6.5-20250628/package/debian/changelog	2025-06-22 08:49:47.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250621) unstable; urgency=low
++ncurses6td (6.5+20250628) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Fri, 20 Jun 2025 03:53:07 -0400
++ -- Thomas E. Dickey   Sun, 22 Jun 2025 04:49:47 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.708 
+--- ncurses-6.5-20250621+/package/mingw-ncurses.nsi	2025-06-20 07:53:07.000000000 +0000
++++ ncurses-6.5-20250628/package/mingw-ncurses.nsi	2025-06-22 08:49:47.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.708 2025/06/20 07:53:07 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.709 2025/06/22 08:49:47 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0621"
++!define VERSION_MMDD  "0628"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250621+/package/mingw-ncurses.spec	2025-06-21 18:33:41.000000000 +0000
++++ ncurses-6.5-20250628/package/mingw-ncurses.spec	2025-06-22 08:49:47.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250621
++Release: 20250628
+ License: X11 License Distribution Modification Variant
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+@@ -144,8 +144,8 @@
+ 
+ %changelog
+ 
+-* Fri Jun 20 2025 Thomas E. Dickey
+-- testing ncurses 6.5-20250621
++* Sun Jun 22 2025 Thomas E. Dickey
++- testing ncurses 6.5-20250628
+ 
+ * Sat Feb 25 2023 Thomas Dickey
+ - amend URLs per rpmlint
+Index: package/ncurses.spec
+--- ncurses-6.5-20250621+/package/ncurses.spec	2025-06-21 18:32:55.000000000 +0000
++++ ncurses-6.5-20250628/package/ncurses.spec	2025-06-22 08:49:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250621
++Release: 20250628
+ License: X11 License Distribution Modification Variant
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+@@ -134,8 +134,8 @@
+ 
+ %changelog
+ 
+-* Fri Jun 20 2025 Thomas E. Dickey
+-- testing ncurses 6.5-20250621
++* Sun Jun 22 2025 Thomas E. Dickey
++- testing ncurses 6.5-20250628
+ 
+ * Sat Feb 25 2023 Thomas Dickey
+ - amend URLs per rpmlint
+Index: package/ncursest.spec
+--- ncurses-6.5-20250621+/package/ncursest.spec	2025-06-21 18:33:41.000000000 +0000
++++ ncurses-6.5-20250628/package/ncursest.spec	2025-06-22 08:49:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250621
++Release: 20250628
+ License: X11 License Distribution Modification Variant
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+@@ -142,8 +142,8 @@
+ 
+ %changelog
+ 
+-* Fri Jun 20 2025 Thomas E. Dickey
+-- testing ncurses 6.5-20250621
++* Sun Jun 22 2025 Thomas E. Dickey
++- testing ncurses 6.5-20250628
+ 
+ * Tue Dec 24 2019 Thomas Dickey
+ - drop custom CC_NORMAL warning flags because setting CFLAGS interferes with
+Index: test/picsmap.c
+Prereq:  1.153 
+--- ncurses-6.5-20250621+/test/picsmap.c	2024-12-07 22:48:03.000000000 +0000
++++ ncurses-6.5-20250628/test/picsmap.c	2025-06-28 22:48:52.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 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.153 2024/12/07 22:48:03 tom Exp $
++ * $Id: picsmap.c,v 1.154 2025/06/28 22:48:52 tom Exp $
+  *
+  * Author: Thomas E. Dickey
+  *
+@@ -948,7 +948,8 @@
+     for (n = 0; data[n] != NULL; ++n) {
+ 	if (strlen(t = data[n]) >= sizeof(buf) - 1)
+ 	    continue;
+-	t = strcpy(buf, t);
++	_nc_STRCPY(buf, t, sizeof(buf));
++	t = buf;
+ 	if (*(s = skip_s(t)) == '!')
+ 	    continue;
+ 
+@@ -1157,7 +1158,8 @@
+     for (n = 0; data[n] != NULL; ++n) {
+ 	if (strlen(s = data[n]) >= sizeof(buf) - 1)
+ 	    continue;
+-	s = strcpy(buf, s);
++	_nc_STRCPY(buf, s, sizeof(buf));
++	s = buf;
+ 	switch (state) {
+ 	case 0:
+ 	    if (match_c(s, " /* XPM */ ")) {
+Index: test/test.priv.h
+Prereq:  1.221 
+--- ncurses-6.5-20250621+/test/test.priv.h	2025-01-18 15:07:25.000000000 +0000
++++ ncurses-6.5-20250628/test/test.priv.h	2025-06-28 22:43:32.000000000 +0000
+@@ -30,7 +30,7 @@
+ /****************************************************************************
+  *  Author: Thomas E. Dickey                    1996-on                     *
+  ****************************************************************************/
+-/* $Id: test.priv.h,v 1.221 2025/01/18 15:07:25 tom Exp $ */
++/* $Id: test.priv.h,v 1.222 2025/06/28 22:43:32 tom Exp $ */
+ 
+ #ifndef __TEST_PRIV_H
+ #define __TEST_PRIV_H 1
+@@ -752,7 +752,7 @@
+ ," -V       show version of curses"
+ 
+ #if HAVE_CURSES_VERSION
+-#define format_version(buffer, size) strcpy(buffer, curses_version())
++#define format_version(buffer, size) _nc_STRCPY(buffer, curses_version(), size)
+ #elif defined(NCURSES_VERSION_MAJOR) && defined(NCURSES_VERSION_MINOR) && defined(NCURSES_VERSION_PATCH)
+ #define format_version(buffer, size) \
+ 	_nc_SPRINTF(buffer, _nc_SLIMIT(size) "ncurses %d.%d.%d", \
+@@ -760,7 +760,7 @@
+ 		    NCURSES_VERSION_MINOR, \
+ 		    NCURSES_VERSION_PATCH)
+ #else
+-#define format_version(buffer, size) strcpy(buffer, "ncurses-examples")
++#define format_version(buffer, size) _nc_STRCPY(buffer, "ncurses-examples", size)
+ #endif
+ 
+ #define VERSION_COMMON() \
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250705.patch b/packages/ncurses/6.5/ncurses-6.5-20250705.patch
new file mode 100644
index 0000000000..29c962c344
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250705.patch
@@ -0,0 +1,31149 @@
+# ncurses 6.5 - patch 20250705 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250705.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sat Jul  5 23:52:25 UTC 2025
+# ------------------------------------------------------------------------------
+# Ada95/aclocal.m4                    |   12 
+# Ada95/configure                     | 2558 +++++++++----------
+# NEWS                                |   15 
+# VERSION                             |    2 
+# aclocal.m4                          |   12 
+# configure                           | 4358 +++++++++++++++++-----------------
+# dist.mk                             |    4 
+# doc/html/man/curs_add_wch.3x.html   |   16 
+# doc/html/man/curs_addch.3x.html     |   10 
+# doc/html/man/curs_color.3x.html     |   97 
+# doc/html/man/curs_deleteln.3x.html  |   10 
+# doc/html/man/curs_get_wstr.3x.html  |   10 
+# doc/html/man/curs_getch.3x.html     |   68 
+# doc/html/man/curs_getstr.3x.html    |  145 -
+# doc/html/man/curs_initscr.3x.html   |   99 
+# doc/html/man/curs_inopts.3x.html    |   97 
+# doc/html/man/curs_instr.3x.html     |   14 
+# doc/html/man/curs_mouse.3x.html     |   32 
+# doc/html/man/curs_outopts.3x.html   |   83 
+# doc/html/man/curs_printw.3x.html    |   12 
+# doc/html/man/curs_scanw.3x.html     |   10 
+# doc/html/man/curs_util.3x.html      |   10 
+# doc/html/man/curs_variables.3x.html |   48 
+# doc/html/man/infotocap.1m.html      |   10 
+# doc/html/man/key_defined.3x.html    |   12 
+# doc/html/man/ncurses.3x.html        |   66 
+# doc/html/man/resizeterm.3x.html     |   22 
+# doc/html/man/terminfo.5.html        |    2 
+# doc/html/man/tput.1.html            |  304 +-
+# include/curses.h.in                 |   28 
+# man/curs_add_wch.3x                 |    7 
+# man/curs_addch.3x                   |    7 
+# man/curs_color.3x                   |   18 
+# man/curs_deleteln.3x                |    6 
+# man/curs_get_wstr.3x                |    6 
+# man/curs_getch.3x                   |   35 
+# man/curs_getstr.3x                  |   19 
+# man/curs_initscr.3x                 |   49 
+# man/curs_inopts.3x                  |   10 
+# man/curs_instr.3x                   |   11 
+# man/curs_mouse.3x                   |   16 
+# man/curs_outopts.3x                 |   46 
+# man/curs_printw.3x                  |    8 
+# man/curs_scanw.3x                   |    6 
+# man/curs_util.3x                    |    6 
+# man/curs_variables.3x               |   92 
+# man/infotocap.1m                    |   43 
+# man/key_defined.3x                  |    8 
+# man/manhtml.aliases                 |    7 
+# man/ncurses.3x                      |   24 
+# man/resizeterm.3x                   |   31 
+# man/tput.1                          |   11 
+# misc/run_tic.in                     |   14 
+# ncurses/curses.priv.h               |   19 
+# ncurses/tinfo/lib_win32con.c        |    6 
+# ncurses/tty/lib_mvcur.c             |   44 
+# ncurses/win32con/win_driver.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          |    6 
+# package/ncurses.spec                |    6 
+# package/ncursest.spec               |    6 
+# test/back_ground.c                  |    9 
+# test/background.c                   |    9 
+# test/blue.c                         |    9 
+# test/bs.c                           |    9 
+# test/cardfile.c                     |    9 
+# test/chgat.c                        |    9 
+# test/clip_printw.c                  |    9 
+# test/color_content.c                |    9 
+# test/color_set.c                    |    9 
+# test/combine.c                      |    9 
+# test/demo_altkeys.c                 |    7 
+# test/demo_defkey.c                  |    9 
+# test/demo_forms.c                   |    9 
+# test/demo_keyok.c                   |    9 
+# test/demo_menus.c                   |    9 
+# test/demo_new_pair.c                |    9 
+# test/demo_panels.c                  |    9 
+# test/demo_tabs.c                    |    9 
+# test/demo_termcap.c                 |    7 
+# test/demo_terminfo.c                |    7 
+# test/ditto.c                        |    7 
+# test/dots.c                         |    9 
+# test/dots_curses.c                  |    9 
+# test/dots_mvcur.c                   |    9 
+# test/dots_termcap.c                 |    9 
+# test/dots_xcurses.c                 |    9 
+# test/dup_field.c                    |    7 
+# test/echochar.c                     |    9 
+# test/extended_color.c               |    9 
+# test/filter.c                       |    7 
+# test/firework.c                     |    9 
+# test/firstlast.c                    |    9 
+# test/foldkeys.c                     |    7 
+# test/form_driver_w.c                |    9 
+# test/gdc.c                          |    9 
+# test/hanoi.c                        |    9 
+# test/hashtest.c                     |    9 
+# test/inch_wide.c                    |    9 
+# test/inchs.c                        |    9 
+# test/ins_wide.c                     |    9 
+# test/insdelln.c                     |    9 
+# test/inserts.c                      |    9 
+# test/key_names.c                    |    9 
+# test/keynames.c                     |    9 
+# test/knight.c                       |    9 
+# test/list_keys.c                    |    9 
+# test/lrtest.c                       |    9 
+# test/move_field.c                   |    7 
+# test/movewindow.c                   |    7 
+# test/ncurses.c                      |    7 
+# test/newdemo.c                      |    7 
+# test/padview.c                      |    9 
+# test/pair_content.c                 |    9 
+# test/picsmap.c                      |    7 
+# test/railroad.c                     |    9 
+# test/rain.c                         |    9 
+# test/redraw.c                       |    7 
+# test/savescreen.c                   |    9 
+# test/sp_tinfo.c                     |    9 
+# test/tclock.c                       |    7 
+# test/test.priv.h                    |   16 
+# test/test_add_wchstr.c              |    9 
+# test/test_addchstr.c                |    9 
+# test/test_addstr.c                  |    9 
+# test/test_addwstr.c                 |    9 
+# test/test_arrays.c                  |    9 
+# test/test_delwin.c                  |    9 
+# test/test_endwin.c                  |    9 
+# test/test_get_wstr.c                |    9 
+# test/test_getstr.c                  |    9 
+# test/test_instr.c                   |    9 
+# test/test_inwstr.c                  |    9 
+# test/test_mouse.c                   |    7 
+# test/test_opaque.c                  |    7 
+# test/test_setupterm.c               |    9 
+# test/test_sgr.c                     |    7 
+# test/test_termattrs.c               |    9 
+# test/test_tparm.c                   |    7 
+# test/test_unget_wch.c               |    9 
+# test/test_vid_puts.c                |    9 
+# test/test_vidputs.c                 |    9 
+# test/testaddch.c                    |    9 
+# test/testcurs.c                     |    7 
+# test/testscanw.c                    |    9 
+# test/view.c                         |    9 
+# test/worm.c                         |   46 
+# test/xmas.c                         |    7 
+# 151 files changed, 4750 insertions(+), 4792 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/aclocal.m4
+Prereq:  1.229 
+--- ncurses-6.5-20250628+/Ada95/aclocal.m4	2025-06-21 10:49:01.000000000 +0000
++++ ncurses-6.5-20250705/Ada95/aclocal.m4	2025-07-05 20:20:37.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: aclocal.m4,v 1.229 2025/06/21 10:49:01 tom Exp $
++dnl $Id: aclocal.m4,v 1.230 2025/07/05 20:20:37 tom Exp $
+ dnl Macros used in NCURSES Ada95 auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -2854,16 +2854,18 @@
+ 
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_MAKEFLAGS version: 21 updated: 2021/09/04 06:47:34
++dnl CF_MAKEFLAGS version: 22 updated: 2025/07/05 16:17:37
+ dnl ------------
+ dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
+ dnl options to lower-levels.  It is very useful for "make -n" -- if we have it.
+-dnl (GNU 'make' does both, something POSIX 'make', which happens to make the
+-dnl ${MAKEFLAGS} variable incompatible because it adds the assignments :-)
++dnl POSIX accommodates both by pretending they are the same variable, adding
++dnl the behavior of the latter to the former.
+ AC_DEFUN([CF_MAKEFLAGS],
+ [AC_REQUIRE([AC_PROG_FGREP])dnl
+ 
+ AC_CACHE_CHECK(for makeflags variable, cf_cv_makeflags,[
++	cf_save_makeflags="$MAKEFLAGS"; unset MAKEFLAGS
++	cf_save_mflags="$MFLAGS";       unset MFLAGS
+ 	cf_cv_makeflags=''
+ 	for cf_option in '-${MAKEFLAGS}' '${MFLAGS}'
+ 	do
+@@ -2891,6 +2893,8 @@
+ 			;;
+ 		esac
+ 	done
++	test -n "$cf_save_makeflags" && MAKEFLAGS="$cf_save_makeflags"
++	test -n "$cf_save_mflags"    && MFLAGS="$cf_save_mflags"
+ 	rm -f cf_makeflags.tmp
+ ])
+ 
+Index: Ada95/configure
+--- ncurses-6.5-20250628+/Ada95/configure	2025-06-22 08:49:14.000000000 +0000
++++ ncurses-6.5-20250705/Ada95/configure	2025-07-05 20:21:33.000000000 +0000
+@@ -4138,6 +4138,8 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
++	cf_save_makeflags="$MAKEFLAGS"; unset MAKEFLAGS
++	cf_save_mflags="$MFLAGS";       unset MFLAGS
+ 	cf_cv_makeflags=''
+ 	for cf_option in '-${MAKEFLAGS}' '${MFLAGS}'
+ 	do
+@@ -4162,21 +4164,23 @@
+ 			;;
+ 		(*)
+ 
+-echo "${as_me:-configure}:4165: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:4167: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+ 
+ 			;;
+ 		esac
+ 	done
++	test -n "$cf_save_makeflags" && MAKEFLAGS="$cf_save_makeflags"
++	test -n "$cf_save_mflags"    && MFLAGS="$cf_save_mflags"
+ 	rm -f cf_makeflags.tmp
+ 
+ fi
+-echo "$as_me:4173: result: $cf_cv_makeflags" >&5
++echo "$as_me:4177: 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:4179: checking for $ac_word" >&5
++echo "$as_me:4183: 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
+@@ -4191,7 +4195,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:4194: found $ac_dir/$ac_word" >&5
++echo "$as_me:4198: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4199,10 +4203,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:4202: result: $RANLIB" >&5
++  echo "$as_me:4206: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:4205: result: no" >&5
++  echo "$as_me:4209: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4211,7 +4215,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:4214: checking for $ac_word" >&5
++echo "$as_me:4218: 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
+@@ -4226,7 +4230,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:4229: found $ac_dir/$ac_word" >&5
++echo "$as_me:4233: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4235,10 +4239,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:4238: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:4242: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:4241: result: no" >&5
++  echo "$as_me:4245: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4250,7 +4254,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:4253: checking for $ac_word" >&5
++echo "$as_me:4257: 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
+@@ -4265,7 +4269,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:4268: found $ac_dir/$ac_word" >&5
++echo "$as_me:4272: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4273,10 +4277,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:4276: result: $LD" >&5
++  echo "$as_me:4280: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:4279: result: no" >&5
++  echo "$as_me:4283: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4285,7 +4289,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:4288: checking for $ac_word" >&5
++echo "$as_me:4292: 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
+@@ -4300,7 +4304,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:4303: found $ac_dir/$ac_word" >&5
++echo "$as_me:4307: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4309,10 +4313,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:4312: result: $ac_ct_LD" >&5
++  echo "$as_me:4316: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:4315: result: no" >&5
++  echo "$as_me:4319: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4324,7 +4328,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:4327: checking for $ac_word" >&5
++echo "$as_me:4331: 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
+@@ -4339,7 +4343,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:4342: found $ac_dir/$ac_word" >&5
++echo "$as_me:4346: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4347,10 +4351,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:4350: result: $AR" >&5
++  echo "$as_me:4354: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:4353: result: no" >&5
++  echo "$as_me:4357: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4359,7 +4363,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:4362: checking for $ac_word" >&5
++echo "$as_me:4366: 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
+@@ -4374,7 +4378,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:4377: found $ac_dir/$ac_word" >&5
++echo "$as_me:4381: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4383,10 +4387,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:4386: result: $ac_ct_AR" >&5
++  echo "$as_me:4390: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:4389: result: no" >&5
++  echo "$as_me:4393: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4398,7 +4402,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:4401: checking for $ac_word" >&5
++echo "$as_me:4405: 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
+@@ -4413,7 +4417,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:4416: found $ac_dir/$ac_word" >&5
++echo "$as_me:4420: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4421,10 +4425,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:4424: result: $AR" >&5
++  echo "$as_me:4428: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:4427: result: no" >&5
++  echo "$as_me:4431: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4433,7 +4437,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:4436: checking for $ac_word" >&5
++echo "$as_me:4440: 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
+@@ -4448,7 +4452,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:4451: found $ac_dir/$ac_word" >&5
++echo "$as_me:4455: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4457,10 +4461,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:4460: result: $ac_ct_AR" >&5
++  echo "$as_me:4464: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:4463: result: no" >&5
++  echo "$as_me:4467: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4469,7 +4473,7 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-echo "$as_me:4472: checking for options to update archives" >&5
++echo "$as_me:4476: 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
+@@ -4506,13 +4510,13 @@
+ 			rm -f conftest.a
+ 
+ 			cat >"conftest.$ac_ext" <&5
++			if { (eval echo "$as_me:4516: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4515: \$? = $ac_status" >&5
++  echo "$as_me:4519: \$? = $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
+@@ -4523,7 +4527,7 @@
+ 			else
+ 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-echo "${as_me:-configure}:4526: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:4530: testing cannot compile test-program ..." 1>&5
+ 
+ 				break
+ 			fi
+@@ -4533,7 +4537,7 @@
+ 	esac
+ 
+ fi
+-echo "$as_me:4536: result: $cf_cv_ar_flags" >&5
++echo "$as_me:4540: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+ if test -n "$ARFLAGS" ; then
+@@ -4544,17 +4548,17 @@
+ 	ARFLAGS=$cf_cv_ar_flags
+ fi
+ 
+-	echo "$as_me:4547: checking for PATH separator" >&5
++	echo "$as_me:4551: 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:4554: result: $PATH_SEPARATOR" >&5
++	echo "$as_me:4558: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+ 
+-echo "$as_me:4557: checking for an installation directory prefix" >&5
++echo "$as_me:4561: checking for an installation directory prefix" >&5
+ echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-install-prefix or --without-install-prefix was given.
+@@ -4567,10 +4571,10 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:4570: result: ${DESTDIR:-(none)}" >&5
++echo "$as_me:4574: result: ${DESTDIR:-(none)}" >&5
+ echo "${ECHO_T}${DESTDIR:-(none)}" >&6
+ 
+-echo "$as_me:4573: checking if installation directory prefix should be merged" >&5
++echo "$as_me:4577: checking if installation directory prefix should be merged" >&5
+ echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6
+ 
+ # Check whether --enable-install-prefix or --disable-install-prefix was given.
+@@ -4587,7 +4591,7 @@
+ 	cf_install_prefix=no
+ 
+ fi;
+-echo "$as_me:4590: result: $cf_install_prefix" >&5
++echo "$as_me:4594: result: $cf_install_prefix" >&5
+ echo "${ECHO_T}$cf_install_prefix" >&6
+ 
+ if test "$cf_install_prefix" = yes ; then
+@@ -4621,7 +4625,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:4624: checking for $ac_word" >&5
++echo "$as_me:4628: 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
+@@ -4636,7 +4640,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:4639: found $ac_dir/$ac_word" >&5
++echo "$as_me:4643: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4644,10 +4648,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:4647: result: $BUILD_CC" >&5
++  echo "$as_me:4651: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:4650: result: no" >&5
++  echo "$as_me:4654: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4656,12 +4660,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+ 
+ fi;
+-	echo "$as_me:4659: checking for native build C compiler" >&5
++	echo "$as_me:4663: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:4661: result: $BUILD_CC" >&5
++	echo "$as_me:4665: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:4664: checking for native build C preprocessor" >&5
++	echo "$as_me:4668: 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.
+@@ -4671,10 +4675,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:4674: result: $BUILD_CPP" >&5
++	echo "$as_me:4678: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:4677: checking for native build C flags" >&5
++	echo "$as_me:4681: 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.
+@@ -4682,10 +4686,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:4685: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:4689: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:4688: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:4692: 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.
+@@ -4693,10 +4697,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:4696: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:4700: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:4699: checking for native build linker-flags" >&5
++	echo "$as_me:4703: 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.
+@@ -4704,10 +4708,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:4707: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:4711: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:4710: checking for native build linker-libraries" >&5
++	echo "$as_me:4714: 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.
+@@ -4715,7 +4719,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:4718: result: $BUILD_LIBS" >&5
++	echo "$as_me:4722: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -4724,7 +4728,7 @@
+ 
+ 	: ${BUILD_CC:='${CC}'}
+ 
+-	echo "$as_me:4727: checking if the build-compiler \"$BUILD_CC\" works" >&5
++	echo "$as_me:4731: checking if the build-compiler \"$BUILD_CC\" works" >&5
+ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
+ 
+ 	cf_save_crossed=$cross_compiling
+@@ -4738,7 +4742,7 @@
+   cf_ok_build_cc=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4741 "configure"
++#line 4745 "configure"
+ #include "confdefs.h"
+ #include 
+ 		int main(int argc, char *argv[])
+@@ -4748,15 +4752,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:4751: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4755: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4754: \$? = $ac_status" >&5
++  echo "$as_me:4758: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:4756: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4760: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4759: \$? = $ac_status" >&5
++  echo "$as_me:4763: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_ok_build_cc=yes
+ else
+@@ -4771,12 +4775,12 @@
+ 	cross_compiling=$cf_save_crossed
+ 	ac_link=$cf_save_ac_link
+ 
+-	echo "$as_me:4774: result: $cf_ok_build_cc" >&5
++	echo "$as_me:4778: result: $cf_ok_build_cc" >&5
+ echo "${ECHO_T}$cf_ok_build_cc" >&6
+ 
+ 	if test "$cf_ok_build_cc" != yes
+ 	then
+-		{ { echo "$as_me:4779: error: Cross-build requires two compilers.
++		{ { echo "$as_me:4783: 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;}
+@@ -4801,7 +4805,7 @@
+ ### shared, for example.
+ cf_list_models=""
+ 
+-echo "$as_me:4804: checking if you want to build shared C-objects" >&5
++echo "$as_me:4808: 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.
+@@ -4811,27 +4815,27 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:4814: result: $with_shared" >&5
++echo "$as_me:4818: result: $with_shared" >&5
+ echo "${ECHO_T}$with_shared" >&6
+ test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
+ 
+-echo "$as_me:4818: checking for specified models" >&5
++echo "$as_me:4822: 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:4821: result: $cf_list_models" >&5
++echo "$as_me:4825: 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:4826: checking for default model" >&5
++echo "$as_me:4830: 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:4829: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:4833: 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:4834: checking for specific curses-directory" >&5
++echo "$as_me:4838: 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.
+@@ -4841,7 +4845,7 @@
+ else
+   cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:4844: result: $cf_cv_curses_dir" >&5
++echo "$as_me:4848: 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"
+@@ -4870,7 +4874,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4873: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:4877: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -4906,7 +4910,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4909 "configure"
++#line 4913 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4918,16 +4922,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4921: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4925: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4924: \$? = $ac_status" >&5
++  echo "$as_me:4928: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4927: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4931: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4930: \$? = $ac_status" >&5
++  echo "$as_me:4934: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -4944,7 +4948,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}:4947: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4951: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -4980,7 +4984,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}:4983: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:4987: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -4995,13 +4999,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:4998: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:5002: 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:5001: result: yes" >&5
++		echo "$as_me:5005: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:5004: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:5008: 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
+ 
+@@ -5134,7 +5138,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5137 "configure"
++#line 5141 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5146,37 +5150,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:5149: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5153: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5152: \$? = $ac_status" >&5
++  echo "$as_me:5156: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:5155: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5159: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5158: \$? = $ac_status" >&5
++  echo "$as_me:5162: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5164 "configure"
++#line 5168 "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:5171: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5175: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5174: \$? = $ac_status" >&5
++  echo "$as_me:5178: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:5176: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5180: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5179: \$? = $ac_status" >&5
++  echo "$as_me:5183: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -5364,7 +5368,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5367 "configure"
++#line 5371 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5376,37 +5380,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:5379: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5383: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5382: \$? = $ac_status" >&5
++  echo "$as_me:5386: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:5385: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5389: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5388: \$? = $ac_status" >&5
++  echo "$as_me:5392: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5394 "configure"
++#line 5398 "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:5401: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5405: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5404: \$? = $ac_status" >&5
++  echo "$as_me:5408: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:5406: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5410: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5409: \$? = $ac_status" >&5
++  echo "$as_me:5413: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -5423,7 +5427,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:5426: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:5430: 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"
+@@ -5439,7 +5443,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:5442: checking for terminfo header" >&5
++echo "$as_me:5446: 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
+@@ -5457,7 +5461,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5460 "configure"
++#line 5464 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -5472,16 +5476,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5475: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5479: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5478: \$? = $ac_status" >&5
++  echo "$as_me:5482: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5481: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5485: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5484: \$? = $ac_status" >&5
++  echo "$as_me:5488: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -5497,7 +5501,7 @@
+ done
+ 
+ fi
+-echo "$as_me:5500: result: $cf_cv_term_header" >&5
++echo "$as_me:5504: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -5532,7 +5536,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:5535: result: no" >&5
++		echo "$as_me:5539: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -5548,7 +5552,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:5551: checking for $ac_word" >&5
++echo "$as_me:5555: 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
+@@ -5563,7 +5567,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:5566: found $ac_dir/$ac_word" >&5
++echo "$as_me:5570: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5571,10 +5575,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:5574: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:5578: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:5577: result: no" >&5
++  echo "$as_me:5581: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5587,7 +5591,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:5590: checking for $ac_word" >&5
++echo "$as_me:5594: 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
+@@ -5602,7 +5606,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:5605: found $ac_dir/$ac_word" >&5
++echo "$as_me:5609: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5610,10 +5614,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:5613: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:5617: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:5616: result: no" >&5
++  echo "$as_me:5620: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5770,7 +5774,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:5773: checking if we have identified curses headers" >&5
++echo "$as_me:5777: 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
+@@ -5782,7 +5786,7 @@
+ 	curses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5785 "configure"
++#line 5789 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -5794,16 +5798,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5797: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5801: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5800: \$? = $ac_status" >&5
++  echo "$as_me:5804: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5803: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5807: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5806: \$? = $ac_status" >&5
++  echo "$as_me:5810: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -5814,11 +5818,11 @@
+ done
+ 
+ fi
+-echo "$as_me:5817: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:5821: 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:5821: error: No curses header-files found" >&5
++	{ { echo "$as_me:5825: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -5828,23 +5832,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:5831: checking for $ac_header" >&5
++echo "$as_me:5835: 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 5837 "configure"
++#line 5841 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:5841: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:5845: \"$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:5847: \$? = $ac_status" >&5
++  echo "$as_me:5851: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -5863,7 +5867,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:5866: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:5870: 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 5922 "configure"
++#line 5926 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5931,16 +5935,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5934: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5938: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5937: \$? = $ac_status" >&5
++  echo "$as_me:5941: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5940: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5944: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5943: \$? = $ac_status" >&5
++  echo "$as_me:5947: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5957,7 +5961,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}:5960: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5964: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -5976,7 +5980,7 @@
+ 
+ }
+ 
+-echo "$as_me:5979: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:5983: 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
+@@ -5988,7 +5992,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5991 "configure"
++#line 5995 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -6012,16 +6016,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6015: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6019: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6018: \$? = $ac_status" >&5
++  echo "$as_me:6022: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6021: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6025: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6024: \$? = $ac_status" >&5
++  echo "$as_me:6028: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -6036,14 +6040,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:6039: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:6043: 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:6046: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:6050: 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
+@@ -6164,7 +6168,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6167 "configure"
++#line 6171 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6176,16 +6180,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6179: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6183: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6182: \$? = $ac_status" >&5
++  echo "$as_me:6186: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6185: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6189: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6188: \$? = $ac_status" >&5
++  echo "$as_me:6192: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6202,7 +6206,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}:6205: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6209: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -6225,7 +6229,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6228 "configure"
++#line 6232 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -6249,16 +6253,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6252: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6256: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6255: \$? = $ac_status" >&5
++  echo "$as_me:6259: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6258: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6262: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6261: \$? = $ac_status" >&5
++  echo "$as_me:6265: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -6279,12 +6283,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6282: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6286: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:6287: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:6291: 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%/[^/]*$%%'`
+@@ -6320,7 +6324,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6323 "configure"
++#line 6327 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6332,16 +6336,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6335: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6339: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6338: \$? = $ac_status" >&5
++  echo "$as_me:6342: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6341: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6345: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6344: \$? = $ac_status" >&5
++  echo "$as_me:6348: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6358,7 +6362,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}:6361: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6365: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -6406,7 +6410,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:6409: checking for terminfo header" >&5
++echo "$as_me:6413: 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
+@@ -6424,7 +6428,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6427 "configure"
++#line 6431 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -6439,16 +6443,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6442: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6446: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6445: \$? = $ac_status" >&5
++  echo "$as_me:6449: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6448: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6452: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6451: \$? = $ac_status" >&5
++  echo "$as_me:6455: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -6464,7 +6468,7 @@
+ done
+ 
+ fi
+-echo "$as_me:6467: result: $cf_cv_term_header" >&5
++echo "$as_me:6471: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -6502,7 +6506,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:6505: checking for ncurses version" >&5
++echo "$as_me:6509: 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
+@@ -6528,10 +6532,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:6531: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:6535: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6534: \$? = $ac_status" >&5
++  echo "$as_me:6538: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -6541,7 +6545,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6544 "configure"
++#line 6548 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -6568,15 +6572,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6571: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6575: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6574: \$? = $ac_status" >&5
++  echo "$as_me:6578: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:6576: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6580: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6579: \$? = $ac_status" >&5
++  echo "$as_me:6583: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -6590,7 +6594,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:6593: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:6597: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -6603,7 +6607,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:6606: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:6610: 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
+@@ -6611,7 +6615,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6614 "configure"
++#line 6618 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6630,16 +6634,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6633: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6637: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6636: \$? = $ac_status" >&5
++  echo "$as_me:6640: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6639: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6643: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6642: \$? = $ac_status" >&5
++  echo "$as_me:6646: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -6650,10 +6654,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6653: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:6657: 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:6656: checking for initscr in -lgpm" >&5
++  echo "$as_me:6660: 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
+@@ -6661,7 +6665,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6664 "configure"
++#line 6668 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6680,16 +6684,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6683: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6687: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6686: \$? = $ac_status" >&5
++  echo "$as_me:6690: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6689: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6693: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6692: \$? = $ac_status" >&5
++  echo "$as_me:6696: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -6700,7 +6704,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6703: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:6707: 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"
+@@ -6715,7 +6719,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:6718: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:6722: 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
+@@ -6723,7 +6727,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6726 "configure"
++#line 6730 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6742,16 +6746,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6745: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6749: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6748: \$? = $ac_status" >&5
++  echo "$as_me:6752: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6751: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6755: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6754: \$? = $ac_status" >&5
++  echo "$as_me:6758: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -6762,7 +6766,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6765: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:6769: 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"
+@@ -6811,13 +6815,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:6814: checking for initscr" >&5
++	echo "$as_me:6818: 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 6820 "configure"
++#line 6824 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -6848,16 +6852,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6851: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6855: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6854: \$? = $ac_status" >&5
++  echo "$as_me:6858: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6857: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6861: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6860: \$? = $ac_status" >&5
++  echo "$as_me:6864: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -6867,18 +6871,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6870: result: $ac_cv_func_initscr" >&5
++echo "$as_me:6874: 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:6877: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:6881: 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 6881 "configure"
++#line 6885 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6890,25 +6894,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6893: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6897: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6896: \$? = $ac_status" >&5
++  echo "$as_me:6900: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6899: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6903: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6902: \$? = $ac_status" >&5
++  echo "$as_me:6906: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:6904: result: yes" >&5
++  echo "$as_me:6908: 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:6911: result: no" >&5
++echo "$as_me:6915: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -6976,11 +6980,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:6979: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:6983: 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 6983 "configure"
++#line 6987 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6992,25 +6996,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6995: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6999: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6998: \$? = $ac_status" >&5
++  echo "$as_me:7002: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7001: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7005: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7004: \$? = $ac_status" >&5
++  echo "$as_me:7008: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:7006: result: yes" >&5
++  echo "$as_me:7010: 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:7013: result: no" >&5
++echo "$as_me:7017: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -7025,7 +7029,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:7028: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:7032: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7033,7 +7037,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:7036: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:7040: 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
+@@ -7043,7 +7047,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7046 "configure"
++#line 7050 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7055,23 +7059,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7058: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7062: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7061: \$? = $ac_status" >&5
++  echo "$as_me:7065: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7064: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7068: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7067: \$? = $ac_status" >&5
++  echo "$as_me:7071: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:7069: result: yes" >&5
++  echo "$as_me:7073: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:7074: result: no" >&5
++echo "$as_me:7078: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -7089,7 +7093,7 @@
+ 	NCURSES_CONFIG=none
+ fi
+ 
+-echo "$as_me:7092: checking for specified curses library type" >&5
++echo "$as_me:7096: checking for specified curses library type" >&5
+ echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
+ 
+ # Check whether --with-screen or --without-screen was given.
+@@ -7103,7 +7107,7 @@
+ case $cf_cv_screen in
+ (curses|curses_*)
+ 
+-echo "$as_me:7106: checking for extra include directories" >&5
++echo "$as_me:7110: checking for extra include directories" >&5
+ echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
+ if test "${cf_cv_curses_incdir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7129,7 +7133,7 @@
+ esac
+ 
+ fi
+-echo "$as_me:7132: result: $cf_cv_curses_incdir" >&5
++echo "$as_me:7136: result: $cf_cv_curses_incdir" >&5
+ echo "${ECHO_T}$cf_cv_curses_incdir" >&6
+ if test "$cf_cv_curses_incdir" != no
+ then
+@@ -7139,7 +7143,7 @@
+ 
+ fi
+ 
+-echo "$as_me:7142: checking if we have identified curses headers" >&5
++echo "$as_me:7146: 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
+@@ -7151,7 +7155,7 @@
+ 	curses.h  ncurses/ncurses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7154 "configure"
++#line 7158 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -7163,16 +7167,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7166: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7170: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7169: \$? = $ac_status" >&5
++  echo "$as_me:7173: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7172: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7176: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7175: \$? = $ac_status" >&5
++  echo "$as_me:7179: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -7183,11 +7187,11 @@
+ done
+ 
+ fi
+-echo "$as_me:7186: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:7190: 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:7190: error: No curses header-files found" >&5
++	{ { echo "$as_me:7194: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7197,23 +7201,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:7200: checking for $ac_header" >&5
++echo "$as_me:7204: 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 7206 "configure"
++#line 7210 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7210: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7214: \"$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:7216: \$? = $ac_status" >&5
++  echo "$as_me:7220: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7232,7 +7236,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7235: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7239: 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:7249: 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
+@@ -7260,7 +7264,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7263 "configure"
++#line 7267 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -7275,16 +7279,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7278: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7282: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7281: \$? = $ac_status" >&5
++  echo "$as_me:7285: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7284: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7288: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7287: \$? = $ac_status" >&5
++  echo "$as_me:7291: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -7300,7 +7304,7 @@
+ done
+ 
+ fi
+-echo "$as_me:7303: result: $cf_cv_term_header" >&5
++echo "$as_me:7307: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -7332,7 +7336,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:7335: checking for ncurses version" >&5
++echo "$as_me:7339: 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
+@@ -7358,10 +7362,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:7361: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:7365: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7364: \$? = $ac_status" >&5
++  echo "$as_me:7368: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -7371,7 +7375,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7374 "configure"
++#line 7378 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -7398,15 +7402,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:7401: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7405: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7404: \$? = $ac_status" >&5
++  echo "$as_me:7408: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:7406: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7410: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7409: \$? = $ac_status" >&5
++  echo "$as_me:7413: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -7420,17 +7424,17 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:7423: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:7427: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:7430: checking if we have identified curses libraries" >&5
++echo "$as_me:7434: checking if we have identified curses libraries" >&5
+ echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7433 "configure"
++#line 7437 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7442,16 +7446,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7445: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7449: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7448: \$? = $ac_status" >&5
++  echo "$as_me:7452: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7451: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7455: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7454: \$? = $ac_status" >&5
++  echo "$as_me:7458: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -7460,13 +7464,13 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-echo "$as_me:7463: result: $cf_result" >&5
++echo "$as_me:7467: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test "$cf_result" = no ; then
+ case "$host_os" in
+ (freebsd*)
+-	echo "$as_me:7469: checking for tgoto in -lmytinfo" >&5
++	echo "$as_me:7473: 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
+@@ -7474,7 +7478,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7477 "configure"
++#line 7481 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7493,16 +7497,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7496: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7500: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7499: \$? = $ac_status" >&5
++  echo "$as_me:7503: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7502: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7506: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7505: \$? = $ac_status" >&5
++  echo "$as_me:7509: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -7513,7 +7517,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7516: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:7520: 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
+ 
+@@ -7543,7 +7547,7 @@
+ 	# term.h) for cur_colr
+ 	if test "x$cf_cv_screen" = "xcurses_colr"
+ 	then
+-		echo "$as_me:7546: checking for initscr in -lcur_colr" >&5
++		echo "$as_me:7550: checking for initscr in -lcur_colr" >&5
+ echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
+ if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7551,7 +7555,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcur_colr  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7554 "configure"
++#line 7558 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7570,16 +7574,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7573: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7577: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7576: \$? = $ac_status" >&5
++  echo "$as_me:7580: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7579: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7583: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7582: \$? = $ac_status" >&5
++  echo "$as_me:7586: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_cur_colr_initscr=yes
+ else
+@@ -7590,7 +7594,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7593: result: $ac_cv_lib_cur_colr_initscr" >&5
++echo "$as_me:7597: result: $ac_cv_lib_cur_colr_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
+ if test "$ac_cv_lib_cur_colr_initscr" = yes; then
+ 
+@@ -7614,7 +7618,7 @@
+ 
+ else
+ 
+-		echo "$as_me:7617: checking for initscr in -lHcurses" >&5
++		echo "$as_me:7621: checking for initscr in -lHcurses" >&5
+ echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
+ if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7622,7 +7626,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lHcurses  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7625 "configure"
++#line 7629 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7641,16 +7645,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7644: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7648: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7647: \$? = $ac_status" >&5
++  echo "$as_me:7651: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7650: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7654: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7653: \$? = $ac_status" >&5
++  echo "$as_me:7657: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_Hcurses_initscr=yes
+ else
+@@ -7661,7 +7665,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7664: result: $ac_cv_lib_Hcurses_initscr" >&5
++echo "$as_me:7668: result: $ac_cv_lib_Hcurses_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
+ if test "$ac_cv_lib_Hcurses_initscr" = yes; then
+ 
+@@ -7719,7 +7723,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}:7722: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7726: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7748,7 +7752,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}:7751: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7755: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7779,7 +7783,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}:7782: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7786: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7814,7 +7818,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}:7817: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7821: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7858,13 +7862,13 @@
+ 	# because it may be needed to link the test-case for initscr.
+ 	if test "x$cf_term_lib" = x
+ 	then
+-		echo "$as_me:7861: checking for tgoto" >&5
++		echo "$as_me:7865: checking for tgoto" >&5
+ echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
+ if test "${ac_cv_func_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7867 "configure"
++#line 7871 "configure"
+ #include "confdefs.h"
+ #define tgoto autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7895,16 +7899,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7898: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7902: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7901: \$? = $ac_status" >&5
++  echo "$as_me:7905: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7904: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7908: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7907: \$? = $ac_status" >&5
++  echo "$as_me:7911: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_tgoto=yes
+ else
+@@ -7914,7 +7918,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7917: result: $ac_cv_func_tgoto" >&5
++echo "$as_me:7921: result: $ac_cv_func_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_func_tgoto" >&6
+ if test "$ac_cv_func_tgoto" = yes; then
+   cf_term_lib=predefined
+@@ -7923,7 +7927,7 @@
+ 			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
+ 			do
+ 				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
+-echo "$as_me:7926: checking for tgoto in -l$cf_term_lib" >&5
++echo "$as_me:7930: checking for tgoto in -l$cf_term_lib" >&5
+ echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7931,7 +7935,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_term_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7934 "configure"
++#line 7938 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7950,16 +7954,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7953: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7957: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7956: \$? = $ac_status" >&5
++  echo "$as_me:7960: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7959: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7963: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7962: \$? = $ac_status" >&5
++  echo "$as_me:7966: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -7970,7 +7974,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7973: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:7977: 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
+ 
+@@ -7993,10 +7997,10 @@
+ 		do
+ 			LIBS="-l$cf_curs_lib $cf_save_LIBS"
+ 			if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
+-				echo "$as_me:7996: checking if we can link with $cf_curs_lib library" >&5
++				echo "$as_me:8000: checking if we can link with $cf_curs_lib library" >&5
+ echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7999 "configure"
++#line 8003 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8008,16 +8012,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8011: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8015: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8014: \$? = $ac_status" >&5
++  echo "$as_me:8018: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8017: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8021: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8020: \$? = $ac_status" >&5
++  echo "$as_me:8024: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -8026,16 +8030,16 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-				echo "$as_me:8029: result: $cf_result" >&5
++				echo "$as_me:8033: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 				test "$cf_result" = yes && break
+ 			elif test "$cf_curs_lib" = "$cf_term_lib" ; then
+ 				cf_result=no
+ 			elif test "$cf_term_lib" != predefined ; then
+-				echo "$as_me:8035: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
++				echo "$as_me:8039: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+ echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8038 "configure"
++#line 8042 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8047,16 +8051,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8050: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8054: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8053: \$? = $ac_status" >&5
++  echo "$as_me:8057: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8056: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8060: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8059: \$? = $ac_status" >&5
++  echo "$as_me:8063: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=no
+ else
+@@ -8065,7 +8069,7 @@
+ 
+ 					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
+ 					cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8068 "configure"
++#line 8072 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8077,16 +8081,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8080: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8084: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8083: \$? = $ac_status" >&5
++  echo "$as_me:8087: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8086: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8090: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8089: \$? = $ac_status" >&5
++  echo "$as_me:8093: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -8098,13 +8102,13 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-				echo "$as_me:8101: result: $cf_result" >&5
++				echo "$as_me:8105: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 				test "$cf_result" != error && break
+ 			fi
+ 		done
+ 	fi
+-	test "$cf_curs_lib" = unknown && { { echo "$as_me:8107: error: no curses library found" >&5
++	test "$cf_curs_lib" = unknown && { { echo "$as_me:8111: error: no curses library found" >&5
+ echo "$as_me: error: no curses library found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8116,23 +8120,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:8119: checking for $ac_header" >&5
++echo "$as_me:8123: 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 8125 "configure"
++#line 8129 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8129: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8133: \"$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:8135: \$? = $ac_status" >&5
++  echo "$as_me:8139: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8151,7 +8155,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8154: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8158: 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:8168: 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
+@@ -8169,7 +8173,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8172 "configure"
++#line 8176 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -8186,16 +8190,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8189: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8193: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8192: \$? = $ac_status" >&5
++  echo "$as_me:8196: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8195: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8199: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8198: \$? = $ac_status" >&5
++  echo "$as_me:8202: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -8207,12 +8211,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:8210: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8214: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8215 "configure"
++#line 8219 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8225,16 +8229,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8228: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8232: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8231: \$? = $ac_status" >&5
++  echo "$as_me:8235: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8234: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8238: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8237: \$? = $ac_status" >&5
++  echo "$as_me:8241: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -8248,7 +8252,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8251 "configure"
++#line 8255 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8261,16 +8265,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8264: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8268: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8267: \$? = $ac_status" >&5
++  echo "$as_me:8271: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8270: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8274: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8273: \$? = $ac_status" >&5
++  echo "$as_me:8277: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -8287,9 +8291,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:8290: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:8294: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:8292: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8296: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -8380,7 +8384,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}:8383: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8387: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -8388,7 +8392,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8391 "configure"
++#line 8395 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8401,21 +8405,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8404: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8408: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8407: \$? = $ac_status" >&5
++  echo "$as_me:8411: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8410: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8414: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8413: \$? = $ac_status" >&5
++  echo "$as_me:8417: \$? = $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}:8418: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8422: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -8433,7 +8437,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:8436: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8440: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -8508,13 +8512,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}:8511: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8515: 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 8517 "configure"
++#line 8521 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8527,21 +8531,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8530: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8534: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8533: \$? = $ac_status" >&5
++  echo "$as_me:8537: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8536: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8540: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8539: \$? = $ac_status" >&5
++  echo "$as_me:8543: \$? = $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}:8544: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8548: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -8583,7 +8587,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8586: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:8590: 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
+@@ -8621,7 +8625,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8624 "configure"
++#line 8628 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8633,16 +8637,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8636: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8640: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8639: \$? = $ac_status" >&5
++  echo "$as_me:8643: \$? = $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:8646: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8645: \$? = $ac_status" >&5
++  echo "$as_me:8649: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -8659,7 +8663,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}:8662: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8666: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8695,7 +8699,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}:8698: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:8702: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -8725,13 +8729,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:8728: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:8732: 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:8731: result: yes" >&5
++		echo "$as_me:8735: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:8734: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:8738: 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
+ 
+@@ -8864,7 +8868,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8867 "configure"
++#line 8871 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8876,37 +8880,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8879: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8883: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8882: \$? = $ac_status" >&5
++  echo "$as_me:8886: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8885: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8889: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8888: \$? = $ac_status" >&5
++  echo "$as_me:8892: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8894 "configure"
++#line 8898 "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:8901: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8905: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8904: \$? = $ac_status" >&5
++  echo "$as_me:8908: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:8906: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8910: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8909: \$? = $ac_status" >&5
++  echo "$as_me:8913: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -9094,7 +9098,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9097 "configure"
++#line 9101 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9106,37 +9110,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9109: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9113: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9112: \$? = $ac_status" >&5
++  echo "$as_me:9116: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9115: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9119: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9118: \$? = $ac_status" >&5
++  echo "$as_me:9122: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9124 "configure"
++#line 9128 "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:9131: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9135: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9134: \$? = $ac_status" >&5
++  echo "$as_me:9138: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9136: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9140: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9139: \$? = $ac_status" >&5
++  echo "$as_me:9143: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -9153,7 +9157,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:9156: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:9160: 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"
+@@ -9169,7 +9173,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:9172: checking for terminfo header" >&5
++echo "$as_me:9176: 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
+@@ -9187,7 +9191,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9190 "configure"
++#line 9194 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9202,16 +9206,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9205: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9209: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9208: \$? = $ac_status" >&5
++  echo "$as_me:9212: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9211: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9215: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9214: \$? = $ac_status" >&5
++  echo "$as_me:9218: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -9227,7 +9231,7 @@
+ done
+ 
+ fi
+-echo "$as_me:9230: result: $cf_cv_term_header" >&5
++echo "$as_me:9234: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9262,7 +9266,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:9265: result: no" >&5
++		echo "$as_me:9269: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -9278,7 +9282,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:9281: checking for $ac_word" >&5
++echo "$as_me:9285: 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
+@@ -9293,7 +9297,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:9296: found $ac_dir/$ac_word" >&5
++echo "$as_me:9300: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9301,10 +9305,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:9304: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:9308: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:9307: result: no" >&5
++  echo "$as_me:9311: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9317,7 +9321,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:9320: checking for $ac_word" >&5
++echo "$as_me:9324: 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
+@@ -9332,7 +9336,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:9335: found $ac_dir/$ac_word" >&5
++echo "$as_me:9339: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9340,10 +9344,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:9343: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:9347: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:9346: result: no" >&5
++  echo "$as_me:9350: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9500,7 +9504,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:9503: checking if we have identified curses headers" >&5
++echo "$as_me:9507: 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
+@@ -9512,7 +9516,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9515 "configure"
++#line 9519 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -9524,16 +9528,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9527: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9531: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9530: \$? = $ac_status" >&5
++  echo "$as_me:9534: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9533: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9537: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9536: \$? = $ac_status" >&5
++  echo "$as_me:9540: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -9544,11 +9548,11 @@
+ done
+ 
+ fi
+-echo "$as_me:9547: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:9551: 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:9551: error: No curses header-files found" >&5
++	{ { echo "$as_me:9555: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -9558,23 +9562,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:9561: checking for $ac_header" >&5
++echo "$as_me:9565: 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 9567 "configure"
++#line 9571 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:9571: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:9575: \"$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:9577: \$? = $ac_status" >&5
++  echo "$as_me:9581: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9593,7 +9597,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:9596: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:9600: 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 9652 "configure"
++#line 9656 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9661,16 +9665,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9664: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9668: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9667: \$? = $ac_status" >&5
++  echo "$as_me:9671: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9670: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9674: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9673: \$? = $ac_status" >&5
++  echo "$as_me:9677: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9687,7 +9691,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}:9690: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9694: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9706,7 +9710,7 @@
+ 
+ }
+ 
+-echo "$as_me:9709: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:9713: 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
+@@ -9718,7 +9722,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9721 "configure"
++#line 9725 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -9742,16 +9746,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9745: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9749: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9748: \$? = $ac_status" >&5
++  echo "$as_me:9752: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9751: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9755: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9754: \$? = $ac_status" >&5
++  echo "$as_me:9758: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -9766,14 +9770,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:9769: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:9773: 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:9776: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:9780: 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
+@@ -9894,7 +9898,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9897 "configure"
++#line 9901 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9906,16 +9910,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9909: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9913: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9912: \$? = $ac_status" >&5
++  echo "$as_me:9916: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9915: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9919: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9918: \$? = $ac_status" >&5
++  echo "$as_me:9922: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9932,7 +9936,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}:9935: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9939: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9955,7 +9959,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9958 "configure"
++#line 9962 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -9979,16 +9983,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9982: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9986: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9985: \$? = $ac_status" >&5
++  echo "$as_me:9989: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9988: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9992: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9991: \$? = $ac_status" >&5
++  echo "$as_me:9995: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -10009,12 +10013,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10012: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10016: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:10017: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:10021: 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%/[^/]*$%%'`
+@@ -10050,7 +10054,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10053 "configure"
++#line 10057 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10062,16 +10066,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10065: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10069: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10068: \$? = $ac_status" >&5
++  echo "$as_me:10072: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10071: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10075: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10074: \$? = $ac_status" >&5
++  echo "$as_me:10078: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10088,7 +10092,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}:10091: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10095: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10136,7 +10140,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:10139: checking for terminfo header" >&5
++echo "$as_me:10143: 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
+@@ -10154,7 +10158,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10157 "configure"
++#line 10161 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -10169,16 +10173,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10172: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10176: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10175: \$? = $ac_status" >&5
++  echo "$as_me:10179: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10178: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10182: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10181: \$? = $ac_status" >&5
++  echo "$as_me:10185: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -10194,7 +10198,7 @@
+ done
+ 
+ fi
+-echo "$as_me:10197: result: $cf_cv_term_header" >&5
++echo "$as_me:10201: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10232,7 +10236,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:10235: checking for ncurses version" >&5
++echo "$as_me:10239: 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
+@@ -10258,10 +10262,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:10261: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:10265: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10264: \$? = $ac_status" >&5
++  echo "$as_me:10268: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -10271,7 +10275,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10274 "configure"
++#line 10278 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -10298,15 +10302,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10301: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10305: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10304: \$? = $ac_status" >&5
++  echo "$as_me:10308: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10306: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10310: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10309: \$? = $ac_status" >&5
++  echo "$as_me:10313: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -10320,7 +10324,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:10323: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:10327: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -10333,7 +10337,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:10336: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:10340: 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
+@@ -10341,7 +10345,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10344 "configure"
++#line 10348 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10360,16 +10364,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10363: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10367: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10366: \$? = $ac_status" >&5
++  echo "$as_me:10370: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10369: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10373: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10372: \$? = $ac_status" >&5
++  echo "$as_me:10376: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -10380,10 +10384,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10383: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:10387: 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:10386: checking for initscr in -lgpm" >&5
++  echo "$as_me:10390: 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
+@@ -10391,7 +10395,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10394 "configure"
++#line 10398 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10410,16 +10414,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10413: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10417: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10416: \$? = $ac_status" >&5
++  echo "$as_me:10420: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10419: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10423: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10422: \$? = $ac_status" >&5
++  echo "$as_me:10426: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -10430,7 +10434,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10433: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:10437: 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"
+@@ -10445,7 +10449,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:10448: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:10452: 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
+@@ -10453,7 +10457,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10456 "configure"
++#line 10460 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10472,16 +10476,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10475: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10479: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10478: \$? = $ac_status" >&5
++  echo "$as_me:10482: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10481: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10485: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10484: \$? = $ac_status" >&5
++  echo "$as_me:10488: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -10492,7 +10496,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10495: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:10499: 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"
+@@ -10541,13 +10545,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:10544: checking for initscr" >&5
++	echo "$as_me:10548: 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 10550 "configure"
++#line 10554 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10578,16 +10582,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10581: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10585: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10584: \$? = $ac_status" >&5
++  echo "$as_me:10588: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10587: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10591: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10590: \$? = $ac_status" >&5
++  echo "$as_me:10594: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -10597,18 +10601,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10600: result: $ac_cv_func_initscr" >&5
++echo "$as_me:10604: 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:10607: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:10611: 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 10611 "configure"
++#line 10615 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10620,25 +10624,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10623: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10627: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10626: \$? = $ac_status" >&5
++  echo "$as_me:10630: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10629: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10633: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10632: \$? = $ac_status" >&5
++  echo "$as_me:10636: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:10634: result: yes" >&5
++  echo "$as_me:10638: 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:10641: result: no" >&5
++echo "$as_me:10645: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -10706,11 +10710,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:10709: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:10713: 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 10713 "configure"
++#line 10717 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10722,25 +10726,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10725: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10729: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10728: \$? = $ac_status" >&5
++  echo "$as_me:10732: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10731: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10735: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10734: \$? = $ac_status" >&5
++  echo "$as_me:10738: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:10736: result: yes" >&5
++  echo "$as_me:10740: 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:10743: result: no" >&5
++echo "$as_me:10747: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -10755,7 +10759,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:10758: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:10762: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -10763,7 +10767,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:10766: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:10770: 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
+@@ -10773,7 +10777,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10776 "configure"
++#line 10780 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10785,23 +10789,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10788: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10792: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10791: \$? = $ac_status" >&5
++  echo "$as_me:10795: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10794: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10798: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10797: \$? = $ac_status" >&5
++  echo "$as_me:10801: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:10799: result: yes" >&5
++  echo "$as_me:10803: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:10804: result: no" >&5
++echo "$as_me:10808: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -10826,13 +10830,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:10829: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:10833: 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:10832: result: yes" >&5
++		echo "$as_me:10836: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:10835: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:10839: 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
+ 
+@@ -10965,7 +10969,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10968 "configure"
++#line 10972 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10977,37 +10981,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10980: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10984: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10983: \$? = $ac_status" >&5
++  echo "$as_me:10987: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10986: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10990: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10989: \$? = $ac_status" >&5
++  echo "$as_me:10993: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10995 "configure"
++#line 10999 "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:11002: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11006: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11005: \$? = $ac_status" >&5
++  echo "$as_me:11009: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:11007: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11011: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11010: \$? = $ac_status" >&5
++  echo "$as_me:11014: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -11195,7 +11199,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11198 "configure"
++#line 11202 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11207,37 +11211,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11210: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11214: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11213: \$? = $ac_status" >&5
++  echo "$as_me:11217: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11216: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11220: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11219: \$? = $ac_status" >&5
++  echo "$as_me:11223: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11225 "configure"
++#line 11229 "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:11232: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11236: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11235: \$? = $ac_status" >&5
++  echo "$as_me:11239: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:11237: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11241: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11240: \$? = $ac_status" >&5
++  echo "$as_me:11244: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -11254,7 +11258,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:11257: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:11261: 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"
+@@ -11270,7 +11274,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:11273: checking for terminfo header" >&5
++echo "$as_me:11277: 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
+@@ -11288,7 +11292,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11291 "configure"
++#line 11295 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -11303,16 +11307,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11306: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11310: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11309: \$? = $ac_status" >&5
++  echo "$as_me:11313: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11312: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11316: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11315: \$? = $ac_status" >&5
++  echo "$as_me:11319: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -11328,7 +11332,7 @@
+ done
+ 
+ fi
+-echo "$as_me:11331: result: $cf_cv_term_header" >&5
++echo "$as_me:11335: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -11363,7 +11367,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:11366: result: no" >&5
++		echo "$as_me:11370: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -11379,7 +11383,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:11382: checking for $ac_word" >&5
++echo "$as_me:11386: 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
+@@ -11394,7 +11398,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:11397: found $ac_dir/$ac_word" >&5
++echo "$as_me:11401: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -11402,10 +11406,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:11405: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:11409: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:11408: result: no" >&5
++  echo "$as_me:11412: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -11418,7 +11422,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:11421: checking for $ac_word" >&5
++echo "$as_me:11425: 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
+@@ -11433,7 +11437,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:11436: found $ac_dir/$ac_word" >&5
++echo "$as_me:11440: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -11441,10 +11445,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:11444: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:11448: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:11447: result: no" >&5
++  echo "$as_me:11451: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -11601,7 +11605,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:11604: checking if we have identified curses headers" >&5
++echo "$as_me:11608: 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
+@@ -11613,7 +11617,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11616 "configure"
++#line 11620 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -11625,16 +11629,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11628: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11632: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11631: \$? = $ac_status" >&5
++  echo "$as_me:11635: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11634: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11638: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11637: \$? = $ac_status" >&5
++  echo "$as_me:11641: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -11645,11 +11649,11 @@
+ done
+ 
+ fi
+-echo "$as_me:11648: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:11652: 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:11652: error: No curses header-files found" >&5
++	{ { echo "$as_me:11656: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -11659,23 +11663,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:11662: checking for $ac_header" >&5
++echo "$as_me:11666: 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 11668 "configure"
++#line 11672 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:11672: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:11676: \"$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:11678: \$? = $ac_status" >&5
++  echo "$as_me:11682: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11694,7 +11698,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:11697: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:11701: 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 11753 "configure"
++#line 11757 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11762,16 +11766,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11765: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11769: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11768: \$? = $ac_status" >&5
++  echo "$as_me:11772: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11771: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11775: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11774: \$? = $ac_status" >&5
++  echo "$as_me:11778: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11788,7 +11792,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}:11791: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11795: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -11807,7 +11811,7 @@
+ 
+ }
+ 
+-echo "$as_me:11810: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:11814: 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
+@@ -11819,7 +11823,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11822 "configure"
++#line 11826 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -11843,16 +11847,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11846: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11850: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11849: \$? = $ac_status" >&5
++  echo "$as_me:11853: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11852: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11856: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11855: \$? = $ac_status" >&5
++  echo "$as_me:11859: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -11867,14 +11871,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:11870: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:11874: 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:11877: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:11881: 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
+@@ -11995,7 +11999,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11998 "configure"
++#line 12002 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12007,16 +12011,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12010: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12014: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12013: \$? = $ac_status" >&5
++  echo "$as_me:12017: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12016: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12020: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12019: \$? = $ac_status" >&5
++  echo "$as_me:12023: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -12033,7 +12037,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}:12036: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:12040: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -12056,7 +12060,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12059 "configure"
++#line 12063 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -12080,16 +12084,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12083: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12087: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12086: \$? = $ac_status" >&5
++  echo "$as_me:12090: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12089: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12093: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12092: \$? = $ac_status" >&5
++  echo "$as_me:12096: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -12110,12 +12114,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:12113: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:12117: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:12118: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:12122: 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%/[^/]*$%%'`
+@@ -12151,7 +12155,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12154 "configure"
++#line 12158 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12163,16 +12167,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12166: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12170: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12169: \$? = $ac_status" >&5
++  echo "$as_me:12173: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12172: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12176: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12175: \$? = $ac_status" >&5
++  echo "$as_me:12179: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -12189,7 +12193,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}:12192: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:12196: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -12237,7 +12241,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:12240: checking for terminfo header" >&5
++echo "$as_me:12244: 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
+@@ -12255,7 +12259,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12258 "configure"
++#line 12262 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -12270,16 +12274,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12273: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12277: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12276: \$? = $ac_status" >&5
++  echo "$as_me:12280: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12279: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12283: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12282: \$? = $ac_status" >&5
++  echo "$as_me:12286: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -12295,7 +12299,7 @@
+ done
+ 
+ fi
+-echo "$as_me:12298: result: $cf_cv_term_header" >&5
++echo "$as_me:12302: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -12333,7 +12337,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:12336: checking for ncurses version" >&5
++echo "$as_me:12340: 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
+@@ -12359,10 +12363,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:12362: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:12366: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12365: \$? = $ac_status" >&5
++  echo "$as_me:12369: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -12372,7 +12376,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12375 "configure"
++#line 12379 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12399,15 +12403,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:12402: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12406: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12405: \$? = $ac_status" >&5
++  echo "$as_me:12409: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:12407: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12411: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12410: \$? = $ac_status" >&5
++  echo "$as_me:12414: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -12421,7 +12425,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:12424: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:12428: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -12434,7 +12438,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:12437: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:12441: 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
+@@ -12442,7 +12446,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12445 "configure"
++#line 12449 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12461,16 +12465,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12464: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12468: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12467: \$? = $ac_status" >&5
++  echo "$as_me:12471: \$? = $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:12474: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12473: \$? = $ac_status" >&5
++  echo "$as_me:12477: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -12481,10 +12485,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12484: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:12488: 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:12487: checking for initscr in -lgpm" >&5
++  echo "$as_me:12491: 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
+@@ -12492,7 +12496,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12495 "configure"
++#line 12499 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12511,16 +12515,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12514: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12518: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12517: \$? = $ac_status" >&5
++  echo "$as_me:12521: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12520: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12524: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12523: \$? = $ac_status" >&5
++  echo "$as_me:12527: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -12531,7 +12535,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12534: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:12538: 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"
+@@ -12546,7 +12550,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:12549: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:12553: 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
+@@ -12554,7 +12558,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12557 "configure"
++#line 12561 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12573,16 +12577,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12576: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12580: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12579: \$? = $ac_status" >&5
++  echo "$as_me:12583: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12582: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12586: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12585: \$? = $ac_status" >&5
++  echo "$as_me:12589: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -12593,7 +12597,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12596: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:12600: 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"
+@@ -12642,13 +12646,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:12645: checking for initscr" >&5
++	echo "$as_me:12649: 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 12651 "configure"
++#line 12655 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12679,16 +12683,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12682: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12686: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12685: \$? = $ac_status" >&5
++  echo "$as_me:12689: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12688: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12692: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12691: \$? = $ac_status" >&5
++  echo "$as_me:12695: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -12698,18 +12702,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12701: result: $ac_cv_func_initscr" >&5
++echo "$as_me:12705: 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:12708: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:12712: 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 12712 "configure"
++#line 12716 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12721,25 +12725,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12724: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12728: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12727: \$? = $ac_status" >&5
++  echo "$as_me:12731: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12730: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12734: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12733: \$? = $ac_status" >&5
++  echo "$as_me:12737: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:12735: result: yes" >&5
++  echo "$as_me:12739: 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:12742: result: no" >&5
++echo "$as_me:12746: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -12807,11 +12811,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:12810: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:12814: 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 12814 "configure"
++#line 12818 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12823,25 +12827,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12826: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12830: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12829: \$? = $ac_status" >&5
++  echo "$as_me:12833: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12832: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12836: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12835: \$? = $ac_status" >&5
++  echo "$as_me:12839: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:12837: result: yes" >&5
++  echo "$as_me:12841: 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:12844: result: no" >&5
++echo "$as_me:12848: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -12856,7 +12860,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:12859: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:12863: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -12864,7 +12868,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:12867: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:12871: 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
+@@ -12874,7 +12878,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12877 "configure"
++#line 12881 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12886,23 +12890,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12889: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12893: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12892: \$? = $ac_status" >&5
++  echo "$as_me:12896: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12895: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12899: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12898: \$? = $ac_status" >&5
++  echo "$as_me:12902: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:12900: result: yes" >&5
++  echo "$as_me:12904: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:12905: result: no" >&5
++echo "$as_me:12909: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -12922,7 +12926,7 @@
+ 
+ 	;;
+ (*)
+-	{ { echo "$as_me:12925: error: unexpected screen-value: $cf_cv_screen" >&5
++	{ { echo "$as_me:12929: error: unexpected screen-value: $cf_cv_screen" >&5
+ echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -12961,10 +12965,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:12964: \"$cf_try\"") >&5
++		{ (eval echo "$as_me:12968: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12967: \$? = $ac_status" >&5
++  echo "$as_me:12971: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 		if test -f conftest.out ; then
+ 			cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ 	][ 	]*//" conftest.out`
+@@ -12982,17 +12986,17 @@
+ 
+ cf_cv_timestamp=`date`
+ 
+-echo "$as_me:12985: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
++echo "$as_me:12989: 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:12988: checking if KEY_RESIZE is supported" >&5
++echo "$as_me:12992: checking if KEY_RESIZE is supported" >&5
+ echo $ECHO_N "checking if KEY_RESIZE is supported... $ECHO_C" >&6
+ if test "${cf_cv_curses_resizes+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12995 "configure"
++#line 12999 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -13004,16 +13008,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13007: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13011: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13010: \$? = $ac_status" >&5
++  echo "$as_me:13014: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13013: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13017: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13016: \$? = $ac_status" >&5
++  echo "$as_me:13020: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_resizes=yes
+ else
+@@ -13023,12 +13027,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13026: result: $cf_cv_curses_resizes" >&5
++echo "$as_me:13030: result: $cf_cv_curses_resizes" >&5
+ echo "${ECHO_T}$cf_cv_curses_resizes" >&6
+ cf_cv_enable_sigwinch=0
+ test "$cf_cv_curses_resizes" = yes && cf_cv_enable_sigwinch=1
+ 
+-echo "$as_me:13031: checking if you want to have a library-prefix" >&5
++echo "$as_me:13035: 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.
+@@ -13038,7 +13042,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:13041: result: $with_lib_prefix" >&5
++echo "$as_me:13045: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test "$with_lib_prefix" = auto
+@@ -13076,7 +13080,7 @@
+ 	test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
+ fi
+ 
+-echo "$as_me:13079: checking for default loader flags" >&5
++echo "$as_me:13083: 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=''   ;;
+@@ -13084,13 +13088,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:13087: result: $LD_MODEL" >&5
++echo "$as_me:13091: 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:13093: checking for an rpath option" >&5
++	echo "$as_me:13097: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -13121,12 +13125,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:13124: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:13128: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:13129: checking if we need a space after rpath option" >&5
++		echo "$as_me:13133: 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"
+ 
+@@ -13147,7 +13151,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13150 "configure"
++#line 13154 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -13159,16 +13163,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13162: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13166: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13165: \$? = $ac_status" >&5
++  echo "$as_me:13169: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13168: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13172: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13171: \$? = $ac_status" >&5
++  echo "$as_me:13175: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -13178,7 +13182,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:13181: result: $cf_rpath_space" >&5
++		echo "$as_me:13185: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -13200,7 +13204,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:13203: checking whether to use release or ABI version in shared library file names" >&5
++	echo "$as_me:13207: checking whether to use release or ABI version in shared library file names" >&5
+ echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
+ 
+ # Check whether --with-shlib-version or --without-shlib-version was given.
+@@ -13215,9 +13219,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:13218: result: $withval" >&5
++		echo "$as_me:13222: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:13220: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:13224: 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; }; }
+ 		;;
+@@ -13226,7 +13230,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:13229: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:13233: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -13249,14 +13253,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:13252: checking which $CC option to use" >&5
++		echo "$as_me:13256: 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 13259 "configure"
++#line 13263 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13268,16 +13272,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13271: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13275: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13274: \$? = $ac_status" >&5
++  echo "$as_me:13278: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13277: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13281: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13280: \$? = $ac_status" >&5
++  echo "$as_me:13284: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -13286,7 +13290,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		done
+-		echo "$as_me:13289: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:13293: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -13357,7 +13361,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:13360: checking if ld -search_paths_first works" >&5
++		echo "$as_me:13364: 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
+@@ -13366,7 +13370,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13369 "configure"
++#line 13373 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -13378,16 +13382,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13381: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13385: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13384: \$? = $ac_status" >&5
++  echo "$as_me:13388: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13387: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13391: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13390: \$? = $ac_status" >&5
++  echo "$as_me:13394: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -13398,7 +13402,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:13401: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:13405: 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"
+@@ -13748,7 +13752,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13751 "configure"
++#line 13755 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13760,16 +13764,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13763: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13767: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13766: \$? = $ac_status" >&5
++  echo "$as_me:13770: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13769: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13773: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13772: \$? = $ac_status" >&5
++  echo "$as_me:13776: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -13806,7 +13810,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:13809: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:13813: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -13816,7 +13820,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <
+ int main(int argc, char *argv[])
+ {
+@@ -13828,18 +13832,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:13831: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:13835: 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:13833: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:13837: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13836: \$? = $ac_status" >&5
++  echo "$as_me:13840: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-				echo "$as_me:13838: result: yes" >&5
++				echo "$as_me:13842: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:13842: result: no" >&5
++				echo "$as_me:13846: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -13854,17 +13858,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:13857: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:13861: 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}:13861: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:13865: 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:13867: checking if you want to link sample programs with rpath option" >&5
++	echo "$as_me:13871: 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.
+@@ -13874,7 +13878,7 @@
+ else
+   with_rpath_link=yes
+ fi;
+-	echo "$as_me:13877: result: $with_rpath_link" >&5
++	echo "$as_me:13881: result: $with_rpath_link" >&5
+ echo "${ECHO_T}$with_rpath_link" >&6
+ 	if test "$with_rpath_link" = no
+ 	then
+@@ -13887,7 +13891,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:13890: checking if you want broken-linker support code" >&5
++echo "$as_me:13894: 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.
+@@ -13897,7 +13901,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:13900: result: $with_broken_linker" >&5
++echo "$as_me:13904: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : "${BROKEN_LINKER:=0}"
+@@ -13912,14 +13916,14 @@
+ 
+ # Check to define _XOPEN_SOURCE "automatically"
+ 
+-echo "$as_me:13915: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:13919: 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 13922 "configure"
++#line 13926 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13938,16 +13942,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13941: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13945: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13944: \$? = $ac_status" >&5
++  echo "$as_me:13948: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13947: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13951: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13950: \$? = $ac_status" >&5
++  echo "$as_me:13954: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -13958,7 +13962,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13961: result: $cf_cv_posix_visible" >&5
++echo "$as_me:13965: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -14000,14 +14004,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:14003: checking if this is the GNU C library" >&5
++echo "$as_me:14007: 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 14010 "configure"
++#line 14014 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14026,16 +14030,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14029: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14033: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14032: \$? = $ac_status" >&5
++  echo "$as_me:14036: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14035: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14039: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14038: \$? = $ac_status" >&5
++  echo "$as_me:14042: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -14046,7 +14050,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14049: result: $cf_cv_gnu_library" >&5
++echo "$as_me:14053: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -14054,7 +14058,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:14057: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:14061: 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
+@@ -14066,7 +14070,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14069 "configure"
++#line 14073 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14085,16 +14089,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14088: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14092: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14091: \$? = $ac_status" >&5
++  echo "$as_me:14095: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14094: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14098: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14097: \$? = $ac_status" >&5
++  echo "$as_me:14101: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -14106,12 +14110,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:14109: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:14113: 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:14114: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:14118: 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
+@@ -14216,7 +14220,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14219 "configure"
++#line 14223 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -14236,16 +14240,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14239: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14243: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14242: \$? = $ac_status" >&5
++  echo "$as_me:14246: \$? = $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:14249: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14248: \$? = $ac_status" >&5
++  echo "$as_me:14252: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -14256,7 +14260,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14259: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:14263: 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
+@@ -14265,14 +14269,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:14268: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:14272: 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 14275 "configure"
++#line 14279 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14287,16 +14291,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14290: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14294: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14293: \$? = $ac_status" >&5
++  echo "$as_me:14297: \$? = $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:14300: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14299: \$? = $ac_status" >&5
++  echo "$as_me:14303: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -14403,7 +14407,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14406 "configure"
++#line 14410 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14418,16 +14422,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14421: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14425: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14424: \$? = $ac_status" >&5
++  echo "$as_me:14428: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14427: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14431: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14430: \$? = $ac_status" >&5
++  echo "$as_me:14434: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -14442,12 +14446,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14445: result: $cf_cv_gnu_source" >&5
++echo "$as_me:14449: 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:14450: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:14454: 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
+@@ -14457,7 +14461,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14460 "configure"
++#line 14464 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14472,16 +14476,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14475: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14479: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14478: \$? = $ac_status" >&5
++  echo "$as_me:14482: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14481: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14485: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14484: \$? = $ac_status" >&5
++  echo "$as_me:14488: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -14492,7 +14496,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14495: result: $cf_cv_default_source" >&5
++echo "$as_me:14499: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -14532,16 +14536,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:14535: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:14539: 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}:14541: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:14545: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14544 "configure"
++#line 14548 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14556,16 +14560,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14559: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14563: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14562: \$? = $ac_status" >&5
++  echo "$as_me:14566: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14565: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14569: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14568: \$? = $ac_status" >&5
++  echo "$as_me:14572: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -14586,7 +14590,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14589 "configure"
++#line 14593 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14601,16 +14605,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14604: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14608: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14607: \$? = $ac_status" >&5
++  echo "$as_me:14611: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14610: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14614: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14613: \$? = $ac_status" >&5
++  echo "$as_me:14617: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -14621,7 +14625,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:14624: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:14628: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -14629,10 +14633,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:14632: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:14636: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14635 "configure"
++#line 14639 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14647,16 +14651,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14650: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14654: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14653: \$? = $ac_status" >&5
++  echo "$as_me:14657: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14656: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14660: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14659: \$? = $ac_status" >&5
++  echo "$as_me:14663: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -14672,7 +14676,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14675: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:14679: 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
+@@ -14789,7 +14793,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:14792: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:14796: 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
+@@ -14821,14 +14825,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:14824: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:14828: 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 14831 "configure"
++#line 14835 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14846,16 +14850,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14849: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14853: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14852: \$? = $ac_status" >&5
++  echo "$as_me:14856: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14855: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14859: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14858: \$? = $ac_status" >&5
++  echo "$as_me:14862: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -14867,7 +14871,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14870 "configure"
++#line 14874 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14885,16 +14889,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14888: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14892: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14891: \$? = $ac_status" >&5
++  echo "$as_me:14895: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14894: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14898: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14897: \$? = $ac_status" >&5
++  echo "$as_me:14901: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -14909,7 +14913,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14912: result: $cf_cv_xopen_source" >&5
++echo "$as_me:14916: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -15069,16 +15073,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:15072: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:15076: 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}:15078: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:15082: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15081 "configure"
++#line 15085 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -15093,16 +15097,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15096: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15100: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15099: \$? = $ac_status" >&5
++  echo "$as_me:15103: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15102: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15106: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15105: \$? = $ac_status" >&5
++  echo "$as_me:15109: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -15123,7 +15127,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15126 "configure"
++#line 15130 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -15138,16 +15142,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15141: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15145: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15144: \$? = $ac_status" >&5
++  echo "$as_me:15148: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15147: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15151: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15150: \$? = $ac_status" >&5
++  echo "$as_me:15154: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -15158,7 +15162,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:15161: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:15165: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -15166,10 +15170,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:15169: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:15173: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15172 "configure"
++#line 15176 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -15184,16 +15188,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15187: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15191: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15190: \$? = $ac_status" >&5
++  echo "$as_me:15194: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15193: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15197: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15196: \$? = $ac_status" >&5
++  echo "$as_me:15200: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -15209,7 +15213,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15212: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:15216: 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
+@@ -15322,10 +15326,10 @@
+ 	if test "$cf_cv_xopen_source" = no ; then
+ 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+ 
+-echo "${as_me:-configure}:15325: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:15329: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15328 "configure"
++#line 15332 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -15343,23 +15347,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15346: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15350: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15349: \$? = $ac_status" >&5
++  echo "$as_me:15353: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15352: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15356: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15355: \$? = $ac_status" >&5
++  echo "$as_me:15359: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-			{ echo "$as_me:15362: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++			{ echo "$as_me:15366: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ 			CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -15382,7 +15386,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}:15385: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15389: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -15394,7 +15398,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}:15397: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:15401: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -15482,7 +15486,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:15485: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:15489: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -15492,7 +15496,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:15495: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:15499: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -15502,7 +15506,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}:15505: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:15509: 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"
+@@ -15514,10 +15518,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:15517: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:15521: 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 15520 "configure"
++#line 15524 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -15532,16 +15536,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15535: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15539: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15538: \$? = $ac_status" >&5
++  echo "$as_me:15542: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15541: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15545: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15544: \$? = $ac_status" >&5
++  echo "$as_me:15548: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -15550,12 +15554,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:15553: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:15557: 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 15558 "configure"
++#line 15562 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -15570,16 +15574,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15573: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15577: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15576: \$? = $ac_status" >&5
++  echo "$as_me:15580: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15579: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15583: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15582: \$? = $ac_status" >&5
++  echo "$as_me:15586: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -15590,19 +15594,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:15593: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:15597: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:15598: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:15602: 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 15605 "configure"
++#line 15609 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -15620,16 +15624,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15623: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15627: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15626: \$? = $ac_status" >&5
++  echo "$as_me:15630: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15629: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15633: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15632: \$? = $ac_status" >&5
++  echo "$as_me:15636: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -15641,7 +15645,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15644 "configure"
++#line 15648 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -15659,16 +15663,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15662: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15666: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15665: \$? = $ac_status" >&5
++  echo "$as_me:15669: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15668: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15672: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15671: \$? = $ac_status" >&5
++  echo "$as_me:15675: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -15683,7 +15687,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15686: result: $cf_cv_xopen_source" >&5
++echo "$as_me:15690: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -15830,13 +15834,13 @@
+ fi
+ fi # cf_cv_posix_visible
+ 
+-echo "$as_me:15833: checking for ANSI C header files" >&5
++echo "$as_me:15837: 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 15839 "configure"
++#line 15843 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -15844,13 +15848,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:15847: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:15851: \"$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:15853: \$? = $ac_status" >&5
++  echo "$as_me:15857: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15872,7 +15876,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 15875 "configure"
++#line 15879 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -15890,7 +15894,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 15893 "configure"
++#line 15897 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -15911,7 +15915,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15914 "configure"
++#line 15918 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -15937,15 +15941,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:15940: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15944: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15943: \$? = $ac_status" >&5
++  echo "$as_me:15947: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:15945: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15949: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15948: \$? = $ac_status" >&5
++  echo "$as_me:15952: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -15958,7 +15962,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:15961: result: $ac_cv_header_stdc" >&5
++echo "$as_me:15965: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -15974,28 +15978,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:15977: checking for $ac_header" >&5
++echo "$as_me:15981: 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 15983 "configure"
++#line 15987 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15989: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15993: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15992: \$? = $ac_status" >&5
++  echo "$as_me:15996: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15995: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15999: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15998: \$? = $ac_status" >&5
++  echo "$as_me:16002: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -16005,7 +16009,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16008: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:16012: 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:16022: checking whether exit is declared" >&5
+ echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
+ if test "${ac_cv_have_decl_exit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16024 "configure"
++#line 16028 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16036,16 +16040,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16039: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16043: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16042: \$? = $ac_status" >&5
++  echo "$as_me:16046: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16045: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16049: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16048: \$? = $ac_status" >&5
++  echo "$as_me:16052: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_have_decl_exit=yes
+ else
+@@ -16055,7 +16059,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16058: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:16062: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+ 
+ # Check whether --enable-largefile or --disable-largefile was given.
+@@ -16065,7 +16069,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:16068: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:16072: 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
+@@ -16077,7 +16081,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 16080 "configure"
++#line 16084 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -16097,16 +16101,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16100: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16104: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16103: \$? = $ac_status" >&5
++  echo "$as_me:16107: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16106: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16110: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16109: \$? = $ac_status" >&5
++  echo "$as_me:16113: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -16116,16 +16120,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16119: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16123: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16122: \$? = $ac_status" >&5
++  echo "$as_me:16126: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16125: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16129: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16128: \$? = $ac_status" >&5
++  echo "$as_me:16132: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -16139,13 +16143,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:16142: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:16146: 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:16148: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:16152: 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
+@@ -16153,7 +16157,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16156 "configure"
++#line 16160 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -16173,16 +16177,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16176: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16180: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16179: \$? = $ac_status" >&5
++  echo "$as_me:16183: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16182: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16186: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16185: \$? = $ac_status" >&5
++  echo "$as_me:16189: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -16191,7 +16195,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16194 "configure"
++#line 16198 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -16212,16 +16216,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16215: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16219: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16218: \$? = $ac_status" >&5
++  echo "$as_me:16222: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16221: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16225: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16224: \$? = $ac_status" >&5
++  echo "$as_me:16228: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -16232,7 +16236,7 @@
+   break
+ done
+ fi
+-echo "$as_me:16235: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:16239: 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
+ 
+@@ -16242,7 +16246,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:16245: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:16249: 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
+@@ -16250,7 +16254,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16253 "configure"
++#line 16257 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -16270,16 +16274,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16273: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16277: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16276: \$? = $ac_status" >&5
++  echo "$as_me:16280: \$? = $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:16283: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16282: \$? = $ac_status" >&5
++  echo "$as_me:16286: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -16288,7 +16292,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16291 "configure"
++#line 16295 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -16309,16 +16313,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16312: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16316: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16315: \$? = $ac_status" >&5
++  echo "$as_me:16319: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16318: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16322: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16321: \$? = $ac_status" >&5
++  echo "$as_me:16325: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -16329,7 +16333,7 @@
+   break
+ done
+ fi
+-echo "$as_me:16332: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:16336: 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
+ 
+@@ -16342,7 +16346,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:16345: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:16349: 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
+@@ -16350,7 +16354,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16353 "configure"
++#line 16357 "configure"
+ #include "confdefs.h"
+ #include 
+     #include 
+@@ -16365,16 +16369,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16368: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16372: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16371: \$? = $ac_status" >&5
++  echo "$as_me:16375: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16374: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16378: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16377: \$? = $ac_status" >&5
++  echo "$as_me:16381: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -16383,7 +16387,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16386 "configure"
++#line 16390 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -16399,16 +16403,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16402: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16406: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16405: \$? = $ac_status" >&5
++  echo "$as_me:16409: \$? = $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:16412: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16411: \$? = $ac_status" >&5
++  echo "$as_me:16415: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -16419,7 +16423,7 @@
+   break
+ done
+ fi
+-echo "$as_me:16422: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:16426: 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
+ 
+@@ -16433,13 +16437,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:16436: checking for fseeko" >&5
++echo "$as_me:16440: 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 16442 "configure"
++#line 16446 "configure"
+ #include "confdefs.h"
+ #include 
+                              #include 
+@@ -16453,16 +16457,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16456: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16460: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16459: \$? = $ac_status" >&5
++  echo "$as_me:16463: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16462: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16466: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16465: \$? = $ac_status" >&5
++  echo "$as_me:16469: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -16472,7 +16476,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16475: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:16479: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -16511,14 +16515,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:16514: checking whether to use struct dirent64" >&5
++	echo "$as_me:16518: 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 16521 "configure"
++#line 16525 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -16545,16 +16549,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16548: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16552: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16551: \$? = $ac_status" >&5
++  echo "$as_me:16555: \$? = $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:16558: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16557: \$? = $ac_status" >&5
++  echo "$as_me:16561: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -16565,7 +16569,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16568: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:16572: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -16575,7 +16579,7 @@
+ 	fi
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:16578: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:16582: 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.
+@@ -16585,7 +16589,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:16588: result: $with_rcs_ids" >&5
++echo "$as_me:16592: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "$with_rcs_ids" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -16595,7 +16599,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:16598: checking if you want to build with function extensions" >&5
++echo "$as_me:16602: 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.
+@@ -16605,7 +16609,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:16608: result: $with_ext_funcs" >&5
++echo "$as_me:16612: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "$with_ext_funcs" = yes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -16623,7 +16627,7 @@
+ fi
+ 
+ ###   use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:16626: checking for extended use of const keyword" >&5
++echo "$as_me:16630: 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.
+@@ -16633,7 +16637,7 @@
+ else
+   with_ext_const=no
+ fi;
+-echo "$as_me:16636: result: $with_ext_const" >&5
++echo "$as_me:16640: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "$with_ext_const" = yes ; then
+@@ -16643,7 +16647,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:16646: checking if you want all development code" >&5
++echo "$as_me:16650: 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.
+@@ -16653,7 +16657,7 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:16656: result: $with_develop" >&5
++echo "$as_me:16660: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###############################################################################
+@@ -16662,7 +16666,7 @@
+ # This is still experimental (20080329), but should ultimately be moved to
+ # the script-block --with-normal, etc.
+ 
+-echo "$as_me:16665: checking if you want to link with the pthread library" >&5
++echo "$as_me:16669: 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.
+@@ -16672,27 +16676,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:16675: result: $with_pthread" >&5
++echo "$as_me:16679: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:16679: checking for pthread.h" >&5
++	echo "$as_me:16683: 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 16685 "configure"
++#line 16689 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16689: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16693: \"$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:16695: \$? = $ac_status" >&5
++  echo "$as_me:16699: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16711,7 +16715,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16714: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:16718: 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
+ 
+@@ -16721,7 +16725,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:16724: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:16728: 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"
+ 
+@@ -16742,7 +16746,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16745 "configure"
++#line 16749 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16759,16 +16763,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16762: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16766: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16765: \$? = $ac_status" >&5
++  echo "$as_me:16769: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16768: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16772: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16771: \$? = $ac_status" >&5
++  echo "$as_me:16775: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -16778,7 +16782,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:16781: result: $with_pthread" >&5
++	    echo "$as_me:16785: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -16806,7 +16810,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:16809: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:16813: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -16815,7 +16819,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16818: checking if you want to use weak-symbols for pthreads" >&5
++echo "$as_me:16822: 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.
+@@ -16825,18 +16829,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-echo "$as_me:16828: result: $use_weak_symbols" >&5
++echo "$as_me:16832: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ if test "$use_weak_symbols" = yes ; then
+ 
+-echo "$as_me:16832: checking if $CC supports weak symbols" >&5
++echo "$as_me:16836: 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 16839 "configure"
++#line 16843 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16862,16 +16866,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16865: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16869: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16868: \$? = $ac_status" >&5
++  echo "$as_me:16872: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16871: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16875: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16874: \$? = $ac_status" >&5
++  echo "$as_me:16878: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -16882,7 +16886,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16885: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:16889: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ else
+@@ -16911,13 +16915,13 @@
+ fi
+ 
+ # OpenSUSE is installing ncurses6, using reentrant option.
+-echo "$as_me:16914: checking for _nc_TABSIZE" >&5
++echo "$as_me:16918: 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 16920 "configure"
++#line 16924 "configure"
+ #include "confdefs.h"
+ #define _nc_TABSIZE autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16948,16 +16952,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16951: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16955: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16954: \$? = $ac_status" >&5
++  echo "$as_me:16958: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16957: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16961: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16960: \$? = $ac_status" >&5
++  echo "$as_me:16964: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func__nc_TABSIZE=yes
+ else
+@@ -16967,7 +16971,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16970: result: $ac_cv_func__nc_TABSIZE" >&5
++echo "$as_me:16974: 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
+@@ -16979,7 +16983,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:16982: checking if you want experimental reentrant code" >&5
++echo "$as_me:16986: 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.
+@@ -16989,7 +16993,7 @@
+ else
+   with_reentrant=$assume_reentrant
+ fi;
+-echo "$as_me:16992: result: $with_reentrant" >&5
++echo "$as_me:16996: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "$with_reentrant" = yes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -17012,7 +17016,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:17015: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:17019: 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.
+@@ -17022,7 +17026,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:17025: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:17029: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -17036,7 +17040,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:17039: checking if you want to see long compiling messages" >&5
++echo "$as_me:17043: 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.
+@@ -17070,10 +17074,10 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:17073: result: $enableval" >&5
++echo "$as_me:17077: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+-echo "$as_me:17076: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:17080: 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.
+@@ -17090,17 +17094,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:17093: result: $enable_stdnoreturn" >&5
++echo "$as_me:17097: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:17097: checking for C11 _Noreturn feature" >&5
++echo "$as_me:17101: 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 17103 "configure"
++#line 17107 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17116,16 +17120,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17119: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17123: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17122: \$? = $ac_status" >&5
++  echo "$as_me:17126: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17125: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17129: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17128: \$? = $ac_status" >&5
++  echo "$as_me:17132: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -17136,7 +17140,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17139: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:17143: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -17192,16 +17196,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17195: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17199: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17200: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17204: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17204: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17208: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17240,16 +17244,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17243: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17247: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17248: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17252: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17252: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17256: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17288,23 +17292,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17291: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17295: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17296: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17300: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17300: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17304: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:17307: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:17311: 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.
+@@ -17321,7 +17325,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:17324: result: $enable_warnings" >&5
++echo "$as_me:17328: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -17345,7 +17349,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17348 "configure"
++#line 17352 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17360,26 +17364,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17363: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17367: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17366: \$? = $ac_status" >&5
++  echo "$as_me:17370: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17369: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17373: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17372: \$? = $ac_status" >&5
++  echo "$as_me:17376: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:17375: checking for X11/Xt const-feature" >&5
++echo "$as_me:17379: 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 17382 "configure"
++#line 17386 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -17397,16 +17401,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17400: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17404: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17403: \$? = $ac_status" >&5
++  echo "$as_me:17407: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17406: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17410: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17409: \$? = $ac_status" >&5
++  echo "$as_me:17413: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -17421,7 +17425,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17424: result: $cf_cv_const_x_string" >&5
++echo "$as_me:17428: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -17450,7 +17454,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:17473: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -17482,12 +17486,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17485: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17489: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17488: \$? = $ac_status" >&5
++  echo "$as_me:17492: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17490: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17494: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -17495,7 +17499,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:17498: checking for $CC warning options..." >&5
++	{ echo "$as_me:17502: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -17518,12 +17522,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:17521: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17525: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17524: \$? = $ac_status" >&5
++  echo "$as_me:17528: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17526: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17530: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -17531,7 +17535,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17534: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17538: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17541,7 +17545,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17544: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17548: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17574,10 +17578,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:17577: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:17581: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -17627,12 +17631,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:17630: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17634: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17633: \$? = $ac_status" >&5
++  echo "$as_me:17637: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17635: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:17639: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -17700,7 +17704,7 @@
+ fi
+ 
+ ###	use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:17703: checking if you want to enable runtime assertions" >&5
++echo "$as_me:17707: 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.
+@@ -17710,7 +17714,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:17713: result: $with_assertions" >&5
++echo "$as_me:17717: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -17763,7 +17767,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17766: checking whether to add trace feature to all models" >&5
++echo "$as_me:17770: 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.
+@@ -17773,7 +17777,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:17776: result: $cf_with_trace" >&5
++echo "$as_me:17780: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "$cf_with_trace" = yes ; then
+@@ -17787,7 +17791,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:17790: checking if we want to use GNAT projects" >&5
++echo "$as_me:17794: 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.
+@@ -17804,21 +17808,21 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:17807: result: $enable_gnat_projects" >&5
++echo "$as_me:17811: 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:17814: checking if ssp library is needed" >&5
++echo "$as_me:17818: 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 17821 "configure"
++#line 17825 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17835,16 +17839,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17838: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17842: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17841: \$? = $ac_status" >&5
++  echo "$as_me:17845: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17844: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17848: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17847: \$? = $ac_status" >&5
++  echo "$as_me:17851: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -17854,7 +17858,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17857 "configure"
++#line 17861 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17871,16 +17875,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17874: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17878: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17877: \$? = $ac_status" >&5
++  echo "$as_me:17881: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17880: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17884: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17883: \$? = $ac_status" >&5
++  echo "$as_me:17887: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -17894,7 +17898,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17897: result: $cf_cv_need_libssp" >&5
++echo "$as_me:17901: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -17922,13 +17926,13 @@
+ (*)
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:17925: checking for clock_gettime" >&5
++echo "$as_me:17929: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17931 "configure"
++#line 17935 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17959,16 +17963,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17962: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17966: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17965: \$? = $ac_status" >&5
++  echo "$as_me:17969: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17968: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17972: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17971: \$? = $ac_status" >&5
++  echo "$as_me:17975: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -17978,12 +17982,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17981: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:17985: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:17986: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:17990: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17991,7 +17995,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17994 "configure"
++#line 17998 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18010,16 +18014,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18013: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18017: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18016: \$? = $ac_status" >&5
++  echo "$as_me:18020: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18019: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18023: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18022: \$? = $ac_status" >&5
++  echo "$as_me:18026: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -18030,7 +18034,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18033: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:18037: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -18042,14 +18046,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:18045: checking if clock_gettime links" >&5
++echo "$as_me:18049: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18052 "configure"
++#line 18056 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -18067,16 +18071,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18070: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18074: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18073: \$? = $ac_status" >&5
++  echo "$as_me:18077: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18076: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18080: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18079: \$? = $ac_status" >&5
++  echo "$as_me:18083: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -18087,7 +18091,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:18090: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:18094: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -18101,13 +18105,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:18104: checking for gettimeofday" >&5
++echo "$as_me:18108: 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 18110 "configure"
++#line 18114 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18138,16 +18142,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18141: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18145: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18144: \$? = $ac_status" >&5
++  echo "$as_me:18148: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18147: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18151: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18150: \$? = $ac_status" >&5
++  echo "$as_me:18154: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -18157,7 +18161,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18160: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:18164: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -18167,7 +18171,7 @@
+ 
+ else
+ 
+-echo "$as_me:18170: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:18174: 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
+@@ -18175,7 +18179,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18178 "configure"
++#line 18182 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18194,16 +18198,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18197: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18201: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18200: \$? = $ac_status" >&5
++  echo "$as_me:18204: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18203: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18207: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18206: \$? = $ac_status" >&5
++  echo "$as_me:18210: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -18214,7 +18218,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18217: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:18221: 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
+ 
+@@ -18247,13 +18251,13 @@
+ esac
+ 
+ ###	Checks for header files.
+-echo "$as_me:18250: checking for signed char" >&5
++echo "$as_me:18254: 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 18256 "configure"
++#line 18260 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -18268,16 +18272,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18271: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18275: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18274: \$? = $ac_status" >&5
++  echo "$as_me:18278: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18277: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18281: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18280: \$? = $ac_status" >&5
++  echo "$as_me:18284: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -18287,10 +18291,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18290: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:18294: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:18293: checking size of signed char" >&5
++echo "$as_me:18297: 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
+@@ -18299,7 +18303,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18302 "configure"
++#line 18306 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -18311,21 +18315,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18314: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18318: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18317: \$? = $ac_status" >&5
++  echo "$as_me:18321: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18320: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18324: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18323: \$? = $ac_status" >&5
++  echo "$as_me:18327: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18328 "configure"
++#line 18332 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -18337,16 +18341,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18340: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18344: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18343: \$? = $ac_status" >&5
++  echo "$as_me:18347: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18346: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18350: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18349: \$? = $ac_status" >&5
++  echo "$as_me:18353: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -18362,7 +18366,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18365 "configure"
++#line 18369 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -18374,16 +18378,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18377: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18381: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18380: \$? = $ac_status" >&5
++  echo "$as_me:18384: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18383: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18387: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18386: \$? = $ac_status" >&5
++  echo "$as_me:18390: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -18399,7 +18403,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 18402 "configure"
++#line 18406 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -18411,16 +18415,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18414: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18418: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18417: \$? = $ac_status" >&5
++  echo "$as_me:18421: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18420: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18424: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18423: \$? = $ac_status" >&5
++  echo "$as_me:18427: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -18433,12 +18437,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:18436: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:18440: 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 18441 "configure"
++#line 18445 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -18454,15 +18458,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:18457: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18461: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18460: \$? = $ac_status" >&5
++  echo "$as_me:18464: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:18462: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18466: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18465: \$? = $ac_status" >&5
++  echo "$as_me:18469: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -18478,7 +18482,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:18481: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:18485: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:18494: 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 18496 "configure"
++#line 18500 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -18508,16 +18512,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18511: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18515: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18514: \$? = $ac_status" >&5
++  echo "$as_me:18518: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18517: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18521: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18520: \$? = $ac_status" >&5
++  echo "$as_me:18524: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -18527,7 +18531,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18530: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18534: 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:18547: 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
+@@ -18548,7 +18552,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18551 "configure"
++#line 18555 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18567,16 +18571,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18570: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18574: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18573: \$? = $ac_status" >&5
++  echo "$as_me:18577: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18576: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18580: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18579: \$? = $ac_status" >&5
++  echo "$as_me:18583: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -18587,14 +18591,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18590: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:18594: 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:18597: checking for opendir in -lx" >&5
++  echo "$as_me:18601: 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
+@@ -18602,7 +18606,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18605 "configure"
++#line 18609 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18621,16 +18625,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18624: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18628: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18627: \$? = $ac_status" >&5
++  echo "$as_me:18631: \$? = $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:18634: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18633: \$? = $ac_status" >&5
++  echo "$as_me:18637: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -18641,7 +18645,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18644: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:18648: 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"
+@@ -18649,13 +18653,13 @@
+ 
+ fi
+ 
+-echo "$as_me:18652: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:18656: 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 18658 "configure"
++#line 18662 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -18671,16 +18675,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18674: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18678: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18677: \$? = $ac_status" >&5
++  echo "$as_me:18681: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18680: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18684: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18683: \$? = $ac_status" >&5
++  echo "$as_me:18687: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -18690,7 +18694,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18693: result: $ac_cv_header_time" >&5
++echo "$as_me:18697: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -18708,13 +18712,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:18711: checking for an ANSI C-conforming const" >&5
++echo "$as_me:18715: 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 18717 "configure"
++#line 18721 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18776,16 +18780,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18779: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18783: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18782: \$? = $ac_status" >&5
++  echo "$as_me:18786: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18785: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18789: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18788: \$? = $ac_status" >&5
++  echo "$as_me:18792: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -18795,7 +18799,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18798: result: $ac_cv_c_const" >&5
++echo "$as_me:18802: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -18807,7 +18811,7 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:18810: checking if data-only library module links" >&5
++echo "$as_me:18814: 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
+@@ -18815,20 +18819,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:18825: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18824: \$? = $ac_status" >&5
++  echo "$as_me:18828: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+ 		mv conftest.$OBJEXT data.$OBJEXT && \
+ 		( $AR $ARFLAGS conftest.a data.$OBJEXT ) 2>&5 1>/dev/null
+ 	fi
+ 	rm -f conftest.$ac_ext data.$OBJEXT
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:18852: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18851: \$? = $ac_status" >&5
++  echo "$as_me:18855: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.$OBJEXT func.$OBJEXT && \
+ 		( $AR $ARFLAGS conftest.a func.$OBJEXT ) 2>&5 1>/dev/null
+@@ -18861,7 +18865,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18864 "configure"
++#line 18868 "configure"
+ #include "confdefs.h"
+ 
+ 	extern int testfunc(void);
+@@ -18872,15 +18876,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:18875: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18879: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18878: \$? = $ac_status" >&5
++  echo "$as_me:18882: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:18880: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18884: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18883: \$? = $ac_status" >&5
++  echo "$as_me:18887: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -18895,7 +18899,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18898: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:18902: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -18914,23 +18918,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18917: checking for $ac_header" >&5
++echo "$as_me:18921: 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 18923 "configure"
++#line 18927 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18927: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18931: \"$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:18933: \$? = $ac_status" >&5
++  echo "$as_me:18937: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18949,7 +18953,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18952: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18956: 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:18966: 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
+@@ -18970,7 +18974,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18973 "configure"
++#line 18977 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -19005,15 +19009,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:19008: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19012: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19011: \$? = $ac_status" >&5
++  echo "$as_me:19015: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:19013: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19017: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19016: \$? = $ac_status" >&5
++  echo "$as_me:19020: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -19028,16 +19032,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:19031: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:19035: 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:19034: checking for mkstemp" >&5
++	echo "$as_me:19038: 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 19040 "configure"
++#line 19044 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19068,16 +19072,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19071: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19075: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19074: \$? = $ac_status" >&5
++  echo "$as_me:19078: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19077: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19081: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19080: \$? = $ac_status" >&5
++  echo "$as_me:19084: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -19087,7 +19091,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19090: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:19094: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -19108,7 +19112,7 @@
+ if test "$cf_with_ada" != "no" ; then
+ 	if test	"$cf_cv_prog_gnat_correct" = yes; then
+ 
+-	echo "$as_me:19111: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:19115: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -19125,10 +19129,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:19128: result: $ADAFLAGS" >&5
++	echo "$as_me:19132: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:19131: checking if GNATPREP supports -T option" >&5
++echo "$as_me:19135: 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
+@@ -19138,11 +19142,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:19141: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:19145: 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:19145: checking if GNAT supports generics" >&5
++echo "$as_me:19149: 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])
+@@ -19152,7 +19156,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:19155: result: $cf_gnat_generics" >&5
++echo "$as_me:19159: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -19164,7 +19168,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:19167: checking if GNAT supports SIGINT" >&5
++echo "$as_me:19171: 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
+@@ -19212,7 +19216,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:19215: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:19219: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -19225,7 +19229,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:19228: checking if GNAT supports project files" >&5
++echo "$as_me:19232: 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]*)
+@@ -19288,15 +19292,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:19291: result: $cf_gnat_projects" >&5
++echo "$as_me:19295: 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:19297: checking if GNAT supports libraries" >&5
++	echo "$as_me:19301: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:19299: result: $cf_gnat_libraries" >&5
++	echo "$as_me:19303: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -19316,7 +19320,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:19319: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:19323: 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
+@@ -19328,7 +19332,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:19331: checking for Ada95 compiler" >&5
++echo "$as_me:19335: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -19339,12 +19343,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:19342: result: $cf_ada_compiler" >&5
++echo "$as_me:19346: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 		cf_ada_package=terminal_interface
+ 
+-echo "$as_me:19347: checking for Ada95 include directory" >&5
++echo "$as_me:19351: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -19378,7 +19382,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:19381: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:19385: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -19387,10 +19391,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:19390: result: $ADA_INCLUDE" >&5
++echo "$as_me:19394: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:19393: checking for Ada95 object directory" >&5
++echo "$as_me:19397: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -19424,7 +19428,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:19427: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:19431: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -19433,10 +19437,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:19436: result: $ADA_OBJECTS" >&5
++echo "$as_me:19440: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:19439: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:19443: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -19457,11 +19461,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:19460: result: $with_ada_sharedlib" >&5
++echo "$as_me:19464: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+-	{ echo "$as_me:19464: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++	{ echo "$as_me:19468: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+ 
+@@ -19479,7 +19483,7 @@
+ 
+ 		# allow the Ada binding to be renamed
+ 
+-echo "$as_me:19482: checking for Ada95 curses library name" >&5
++echo "$as_me:19486: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -19495,16 +19499,16 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19498: result: $ADA_LIBNAME" >&5
++echo "$as_me:19502: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 	else
+-		{ { echo "$as_me:19502: error: No usable Ada compiler found" >&5
++		{ { echo "$as_me:19506: 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:19507: error: The Ada compiler is needed for this package" >&5
++	{ { echo "$as_me:19511: 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
+@@ -19544,7 +19548,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:19547: checking default library suffix" >&5
++echo "$as_me:19551: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -19555,10 +19559,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:19558: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:19562: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:19561: checking default library-dependency suffix" >&5
++echo "$as_me:19565: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -19641,10 +19645,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:19644: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:19648: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:19647: checking default object directory" >&5
++echo "$as_me:19651: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -19660,7 +19664,7 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:19663: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:19667: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ ### Set up low-level terminfo dependencies for makefiles.
+@@ -19802,7 +19806,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:19805: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:19809: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -19983,7 +19987,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:19986: error: ambiguous option: $1
++    { { echo "$as_me:19990: 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;}
+@@ -20002,7 +20006,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:20005: error: unrecognized option: $1
++  -*) { { echo "$as_me:20009: 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;}
+@@ -20077,7 +20081,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:20080: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:20084: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -20442,7 +20446,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:20445: creating $ac_file" >&5
++    { echo "$as_me:20449: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -20460,7 +20464,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:20463: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:20467: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -20473,7 +20477,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:20476: error: cannot find input file: $f" >&5
++           { { echo "$as_me:20480: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -20489,7 +20493,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:20492: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:20496: 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;}
+@@ -20498,7 +20502,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:20501: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:20505: 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;}
+@@ -20543,7 +20547,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:20546: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:20550: 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;}
+@@ -20554,7 +20558,7 @@
+     $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:20557: WARNING: Some variables may not be substituted:
++      { echo "$as_me:20561: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -20603,7 +20607,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:20606: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:20610: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -20614,7 +20618,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:20617: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:20621: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -20627,7 +20631,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:20630: error: cannot find input file: $f" >&5
++           { { echo "$as_me:20634: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -20685,7 +20689,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:20688: $ac_file is unchanged" >&5
++      { echo "$as_me:20692: $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.4305 
+--- ncurses-6.5-20250628+/NEWS	2025-06-28 22:47:22.000000000 +0000
++++ ncurses-6.5-20250705/NEWS	2025-07-05 20:44:20.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4305 2025/06/28 22:47:22 tom Exp $
++-- $Id: NEWS,v 1.4310 2025/07/05 20:44:20 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,10 +46,21 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20250705
++	+ when installing the terminfo database, check if symbolic links are
++	  supported before attemping to link lib/terminfo from share/terminfo
++	  (report by Kirill Makurin).
++	+ modify configure check for MAKEFILES/MFLAGS to ignore existing value
++	  of these environment variables (report by Stas Sergeev).
++	+ reserve -c/-l options in test/*.c for command/logging like vttest.
++	+ add options to test/worm.c for benchmarking (Nibby Nebbulous)
++	+ improve formatting/style of manpages (patches by Branden Robinson).
++	+ improve readability of header-files (patches by Branden Robinson).
++
+ 20250628
+ 	+ fix a few compiler-warnings.
+ 	+ simplify include for wchar.h in Windows port by removing the platform
+-	  ifdef's (report by Karl Knechtel).
++	  ifdef's (report by Kirill Makurin).
+ 	+ regen Ada95/configure (report by Sven Joachim).
+ 
+ 20250621
+Index: VERSION
+--- ncurses-6.5-20250628+/VERSION	2025-06-28 08:49:47.000000000 +0000
++++ ncurses-6.5-20250705/VERSION	2025-07-05 09:49:36.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250628
++5:0:10	6.5	20250705
+Index: aclocal.m4
+Prereq:  1.1107 
+--- ncurses-6.5-20250628+/aclocal.m4	2025-06-21 10:50:24.000000000 +0000
++++ ncurses-6.5-20250705/aclocal.m4	2025-07-05 20:19:35.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1107 2025/06/21 10:50:24 tom Exp $
++dnl $Id: aclocal.m4,v 1.1108 2025/07/05 20:19:35 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -5610,16 +5610,18 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_MAKEFLAGS version: 21 updated: 2021/09/04 06:47:34
++dnl CF_MAKEFLAGS version: 22 updated: 2025/07/05 16:17:37
+ dnl ------------
+ dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
+ dnl options to lower-levels.  It is very useful for "make -n" -- if we have it.
+-dnl (GNU 'make' does both, something POSIX 'make', which happens to make the
+-dnl ${MAKEFLAGS} variable incompatible because it adds the assignments :-)
++dnl POSIX accommodates both by pretending they are the same variable, adding
++dnl the behavior of the latter to the former.
+ AC_DEFUN([CF_MAKEFLAGS],
+ [AC_REQUIRE([AC_PROG_FGREP])dnl
+ 
+ AC_CACHE_CHECK(for makeflags variable, cf_cv_makeflags,[
++	cf_save_makeflags="$MAKEFLAGS"; unset MAKEFLAGS
++	cf_save_mflags="$MFLAGS";       unset MFLAGS
+ 	cf_cv_makeflags=''
+ 	for cf_option in '-${MAKEFLAGS}' '${MFLAGS}'
+ 	do
+@@ -5647,6 +5649,8 @@
+ 			;;
+ 		esac
+ 	done
++	test -n "$cf_save_makeflags" && MAKEFLAGS="$cf_save_makeflags"
++	test -n "$cf_save_mflags"    && MFLAGS="$cf_save_mflags"
+ 	rm -f cf_makeflags.tmp
+ ])
+ 
+Index: configure
+--- ncurses-6.5-20250628+/configure	2025-06-21 11:22:57.000000000 +0000
++++ ncurses-6.5-20250705/configure	2025-07-05 20:20:09.000000000 +0000
+@@ -5027,6 +5027,8 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
++	cf_save_makeflags="$MAKEFLAGS"; unset MAKEFLAGS
++	cf_save_mflags="$MFLAGS";       unset MFLAGS
+ 	cf_cv_makeflags=''
+ 	for cf_option in '-${MAKEFLAGS}' '${MFLAGS}'
+ 	do
+@@ -5051,21 +5053,23 @@
+ 			;;
+ 		(*)
+ 
+-echo "${as_me:-configure}:5054: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:5056: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+ 
+ 			;;
+ 		esac
+ 	done
++	test -n "$cf_save_makeflags" && MAKEFLAGS="$cf_save_makeflags"
++	test -n "$cf_save_mflags"    && MFLAGS="$cf_save_mflags"
+ 	rm -f cf_makeflags.tmp
+ 
+ fi
+-echo "$as_me:5062: result: $cf_cv_makeflags" >&5
++echo "$as_me:5066: 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:5068: checking for $ac_word" >&5
++echo "$as_me:5072: 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
+@@ -5080,7 +5084,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:5083: found $ac_dir/$ac_word" >&5
++echo "$as_me:5087: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5088,10 +5092,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:5091: result: $RANLIB" >&5
++  echo "$as_me:5095: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:5094: result: no" >&5
++  echo "$as_me:5098: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5100,7 +5104,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:5103: checking for $ac_word" >&5
++echo "$as_me:5107: 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
+@@ -5115,7 +5119,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:5118: found $ac_dir/$ac_word" >&5
++echo "$as_me:5122: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5124,10 +5128,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:5127: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:5131: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:5130: result: no" >&5
++  echo "$as_me:5134: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5139,7 +5143,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:5142: checking for $ac_word" >&5
++echo "$as_me:5146: 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
+@@ -5154,7 +5158,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:5157: found $ac_dir/$ac_word" >&5
++echo "$as_me:5161: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5162,10 +5166,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:5165: result: $LD" >&5
++  echo "$as_me:5169: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:5168: result: no" >&5
++  echo "$as_me:5172: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5174,7 +5178,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:5177: checking for $ac_word" >&5
++echo "$as_me:5181: 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
+@@ -5189,7 +5193,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:5192: found $ac_dir/$ac_word" >&5
++echo "$as_me:5196: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5198,10 +5202,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:5201: result: $ac_ct_LD" >&5
++  echo "$as_me:5205: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:5204: result: no" >&5
++  echo "$as_me:5208: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5213,7 +5217,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:5216: checking for $ac_word" >&5
++echo "$as_me:5220: 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
+@@ -5228,7 +5232,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:5231: found $ac_dir/$ac_word" >&5
++echo "$as_me:5235: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5236,10 +5240,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:5239: result: $AR" >&5
++  echo "$as_me:5243: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:5242: result: no" >&5
++  echo "$as_me:5246: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5248,7 +5252,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:5251: checking for $ac_word" >&5
++echo "$as_me:5255: 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
+@@ -5263,7 +5267,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:5266: found $ac_dir/$ac_word" >&5
++echo "$as_me:5270: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5272,10 +5276,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:5275: result: $ac_ct_AR" >&5
++  echo "$as_me:5279: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:5278: result: no" >&5
++  echo "$as_me:5282: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5287,7 +5291,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:5290: checking for $ac_word" >&5
++echo "$as_me:5294: 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
+@@ -5302,7 +5306,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:5305: found $ac_dir/$ac_word" >&5
++echo "$as_me:5309: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5310,10 +5314,10 @@
+ fi
+ NM=$ac_cv_prog_NM
+ if test -n "$NM"; then
+-  echo "$as_me:5313: result: $NM" >&5
++  echo "$as_me:5317: result: $NM" >&5
+ echo "${ECHO_T}$NM" >&6
+ else
+-  echo "$as_me:5316: result: no" >&5
++  echo "$as_me:5320: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5322,7 +5326,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:5325: checking for $ac_word" >&5
++echo "$as_me:5329: 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
+@@ -5337,7 +5341,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:5340: found $ac_dir/$ac_word" >&5
++echo "$as_me:5344: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5346,10 +5350,10 @@
+ fi
+ ac_ct_NM=$ac_cv_prog_ac_ct_NM
+ if test -n "$ac_ct_NM"; then
+-  echo "$as_me:5349: result: $ac_ct_NM" >&5
++  echo "$as_me:5353: result: $ac_ct_NM" >&5
+ echo "${ECHO_T}$ac_ct_NM" >&6
+ else
+-  echo "$as_me:5352: result: no" >&5
++  echo "$as_me:5356: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5361,7 +5365,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:5364: checking for $ac_word" >&5
++echo "$as_me:5368: 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
+@@ -5376,7 +5380,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:5379: found $ac_dir/$ac_word" >&5
++echo "$as_me:5383: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5384,10 +5388,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:5387: result: $AR" >&5
++  echo "$as_me:5391: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:5390: result: no" >&5
++  echo "$as_me:5394: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5396,7 +5400,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:5399: checking for $ac_word" >&5
++echo "$as_me:5403: 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
+@@ -5411,7 +5415,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:5414: found $ac_dir/$ac_word" >&5
++echo "$as_me:5418: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5420,10 +5424,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:5423: result: $ac_ct_AR" >&5
++  echo "$as_me:5427: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:5426: result: no" >&5
++  echo "$as_me:5430: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5432,7 +5436,7 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-echo "$as_me:5435: checking for options to update archives" >&5
++echo "$as_me:5439: 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
+@@ -5469,13 +5473,13 @@
+ 			rm -f conftest.a
+ 
+ 			cat >"conftest.$ac_ext" <&5
++			if { (eval echo "$as_me:5479: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5478: \$? = $ac_status" >&5
++  echo "$as_me:5482: \$? = $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
+@@ -5486,7 +5490,7 @@
+ 			else
+ 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-echo "${as_me:-configure}:5489: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:5493: testing cannot compile test-program ..." 1>&5
+ 
+ 				break
+ 			fi
+@@ -5496,7 +5500,7 @@
+ 	esac
+ 
+ fi
+-echo "$as_me:5499: result: $cf_cv_ar_flags" >&5
++echo "$as_me:5503: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+ if test -n "$ARFLAGS" ; then
+@@ -5507,7 +5511,7 @@
+ 	ARFLAGS=$cf_cv_ar_flags
+ fi
+ 
+-echo "$as_me:5510: checking for an installation directory prefix" >&5
++echo "$as_me:5514: checking for an installation directory prefix" >&5
+ echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-install-prefix or --without-install-prefix was given.
+@@ -5520,10 +5524,10 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:5523: result: ${DESTDIR:-(none)}" >&5
++echo "$as_me:5527: result: ${DESTDIR:-(none)}" >&5
+ echo "${ECHO_T}${DESTDIR:-(none)}" >&6
+ 
+-echo "$as_me:5526: checking if installation directory prefix should be merged" >&5
++echo "$as_me:5530: checking if installation directory prefix should be merged" >&5
+ echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6
+ 
+ # Check whether --enable-install-prefix or --disable-install-prefix was given.
+@@ -5540,7 +5544,7 @@
+ 	cf_install_prefix=no
+ 
+ fi;
+-echo "$as_me:5543: result: $cf_install_prefix" >&5
++echo "$as_me:5547: result: $cf_install_prefix" >&5
+ echo "${ECHO_T}$cf_install_prefix" >&6
+ 
+ if test "$cf_install_prefix" = yes ; then
+@@ -5581,7 +5585,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:5584: checking for $ac_word" >&5
++echo "$as_me:5588: 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
+@@ -5596,7 +5600,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:5599: found $ac_dir/$ac_word" >&5
++echo "$as_me:5603: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5604,10 +5608,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:5607: result: $BUILD_CC" >&5
++  echo "$as_me:5611: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:5610: result: no" >&5
++  echo "$as_me:5614: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5616,12 +5620,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+ 
+ fi;
+-	echo "$as_me:5619: checking for native build C compiler" >&5
++	echo "$as_me:5623: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:5621: result: $BUILD_CC" >&5
++	echo "$as_me:5625: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:5624: checking for native build C preprocessor" >&5
++	echo "$as_me:5628: 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.
+@@ -5631,10 +5635,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:5634: result: $BUILD_CPP" >&5
++	echo "$as_me:5638: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:5637: checking for native build C flags" >&5
++	echo "$as_me:5641: 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.
+@@ -5642,10 +5646,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:5645: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:5649: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:5648: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:5652: 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.
+@@ -5653,10 +5657,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:5656: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:5660: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:5659: checking for native build linker-flags" >&5
++	echo "$as_me:5663: 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.
+@@ -5664,10 +5668,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:5667: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:5671: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:5670: checking for native build linker-libraries" >&5
++	echo "$as_me:5674: 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.
+@@ -5675,7 +5679,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:5678: result: $BUILD_LIBS" >&5
++	echo "$as_me:5682: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -5684,7 +5688,7 @@
+ 
+ 	: ${BUILD_CC:='${CC}'}
+ 
+-	echo "$as_me:5687: checking if the build-compiler \"$BUILD_CC\" works" >&5
++	echo "$as_me:5691: checking if the build-compiler \"$BUILD_CC\" works" >&5
+ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
+ 
+ 	cf_save_crossed=$cross_compiling
+@@ -5698,7 +5702,7 @@
+   cf_ok_build_cc=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5701 "configure"
++#line 5705 "configure"
+ #include "confdefs.h"
+ #include 
+ 		int main(int argc, char *argv[])
+@@ -5708,15 +5712,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:5711: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5715: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5714: \$? = $ac_status" >&5
++  echo "$as_me:5718: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:5716: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5720: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5719: \$? = $ac_status" >&5
++  echo "$as_me:5723: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_ok_build_cc=yes
+ else
+@@ -5731,12 +5735,12 @@
+ 	cross_compiling=$cf_save_crossed
+ 	ac_link=$cf_save_ac_link
+ 
+-	echo "$as_me:5734: result: $cf_ok_build_cc" >&5
++	echo "$as_me:5738: result: $cf_ok_build_cc" >&5
+ echo "${ECHO_T}$cf_ok_build_cc" >&6
+ 
+ 	if test "$cf_ok_build_cc" != yes
+ 	then
+-		{ { echo "$as_me:5739: error: Cross-build requires two compilers.
++		{ { echo "$as_me:5743: 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;}
+@@ -5761,7 +5765,7 @@
+ ### shared, for example.
+ cf_list_models=""
+ 
+-echo "$as_me:5764: checking if libtool -version-number should be used" >&5
++echo "$as_me:5768: 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.
+@@ -5778,7 +5782,7 @@
+ 	cf_libtool_version=yes
+ 
+ fi;
+-echo "$as_me:5781: result: $cf_libtool_version" >&5
++echo "$as_me:5785: result: $cf_libtool_version" >&5
+ echo "${ECHO_T}$cf_libtool_version" >&6
+ 
+ if test "$cf_libtool_version" = yes ; then
+@@ -5787,25 +5791,25 @@
+ 	LIBTOOL_VERSION="-version-info"
+ 	case "x$VERSION" in
+ 	(x)
+-		{ echo "$as_me:5790: WARNING: VERSION was not set" >&5
++		{ echo "$as_me:5794: 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}:5797: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5801: 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}:5804: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5808: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:5808: WARNING: unexpected VERSION value: $VERSION" >&5
++		{ echo "$as_me:5812: WARNING: unexpected VERSION value: $VERSION" >&5
+ echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
+ 		;;
+ 	esac
+@@ -5827,7 +5831,7 @@
+ LIB_INSTALL=
+ LIB_UNINSTALL=
+ 
+-echo "$as_me:5830: checking if you want to build libraries with libtool" >&5
++echo "$as_me:5834: 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.
+@@ -5837,7 +5841,7 @@
+ else
+   with_libtool=no
+ fi;
+-echo "$as_me:5840: result: $with_libtool" >&5
++echo "$as_me:5844: result: $with_libtool" >&5
+ echo "${ECHO_T}$with_libtool" >&6
+ if test "$with_libtool" != "no"; then
+ 
+@@ -5866,7 +5870,7 @@
+ 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:5869: error: expected a pathname, not \"$with_libtool\"" >&5
++	{ { echo "$as_me:5873: error: expected a pathname, not \"$with_libtool\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -5879,7 +5883,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:5882: checking for $ac_word" >&5
++echo "$as_me:5886: 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
+@@ -5894,7 +5898,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:5897: found $ac_dir/$ac_word" >&5
++echo "$as_me:5901: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5902,10 +5906,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5905: result: $LIBTOOL" >&5
++  echo "$as_me:5909: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5908: result: no" >&5
++  echo "$as_me:5912: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5918,7 +5922,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:5921: checking for $ac_word" >&5
++echo "$as_me:5925: 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
+@@ -5933,7 +5937,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:5936: found $ac_dir/$ac_word" >&5
++echo "$as_me:5940: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5941,10 +5945,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:5944: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:5948: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:5947: result: no" >&5
++  echo "$as_me:5951: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5975,7 +5979,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:5978: checking for $ac_word" >&5
++echo "$as_me:5982: 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
+@@ -5990,7 +5994,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:5993: found $ac_dir/$ac_word" >&5
++echo "$as_me:5997: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5998,10 +6002,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:6001: result: $LIBTOOL" >&5
++  echo "$as_me:6005: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:6004: result: no" >&5
++  echo "$as_me:6008: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6014,7 +6018,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:6017: checking for $ac_word" >&5
++echo "$as_me:6021: 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
+@@ -6029,7 +6033,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:6032: found $ac_dir/$ac_word" >&5
++echo "$as_me:6036: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -6037,10 +6041,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:6040: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:6044: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:6043: result: no" >&5
++  echo "$as_me:6047: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6062,7 +6066,7 @@
+ 		fi
+ 	fi
+ 	if test -z "$LIBTOOL" ; then
+-		{ { echo "$as_me:6065: error: Cannot find libtool" >&5
++		{ { echo "$as_me:6069: error: Cannot find libtool" >&5
+ echo "$as_me: error: Cannot find libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -6078,7 +6082,7 @@
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+ then
+-	echo "$as_me:6081: checking version of $LIBTOOL" >&5
++	echo "$as_me:6085: checking version of $LIBTOOL" >&5
+ echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+@@ -6089,7 +6093,7 @@
+ fi
+ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+ 
+-	echo "$as_me:6092: result: $cf_cv_libtool_version" >&5
++	echo "$as_me:6096: result: $cf_cv_libtool_version" >&5
+ echo "${ECHO_T}$cf_cv_libtool_version" >&6
+ 
+ 	if test -n "$cf_cv_libtool_version"
+@@ -6099,19 +6103,19 @@
+ 		(*...GNU-libtool...*)
+ 			;;
+ 		(*)
+-			{ { echo "$as_me:6102: error: This is not GNU libtool" >&5
++			{ { echo "$as_me:6106: 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:6108: error: No version found for $LIBTOOL" >&5
++		{ { echo "$as_me:6112: 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:6114: error: GNU libtool has not been found" >&5
++	{ { echo "$as_me:6118: error: GNU libtool has not been found" >&5
+ echo "$as_me: error: GNU libtool has not been found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6147,7 +6151,7 @@
+ 
+ else
+ 
+-echo "$as_me:6150: checking if you want to build shared libraries" >&5
++echo "$as_me:6154: 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.
+@@ -6157,11 +6161,11 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:6160: result: $with_shared" >&5
++echo "$as_me:6164: 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:6164: checking if you want to build static libraries" >&5
++echo "$as_me:6168: 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.
+@@ -6171,11 +6175,11 @@
+ else
+   with_normal=yes
+ fi;
+-echo "$as_me:6174: result: $with_normal" >&5
++echo "$as_me:6178: 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:6178: checking if you want to build debug libraries" >&5
++echo "$as_me:6182: 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.
+@@ -6185,11 +6189,11 @@
+ else
+   with_debug=yes
+ fi;
+-echo "$as_me:6188: result: $with_debug" >&5
++echo "$as_me:6192: 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:6192: checking if you want to build profiling libraries" >&5
++echo "$as_me:6196: 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.
+@@ -6199,7 +6203,7 @@
+ else
+   with_profile=no
+ fi;
+-echo "$as_me:6202: result: $with_profile" >&5
++echo "$as_me:6206: result: $with_profile" >&5
+ echo "${ECHO_T}$with_profile" >&6
+ test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
+ 
+@@ -6207,7 +6211,7 @@
+ 
+ if test "X$cf_with_cxx_binding" != Xno; then
+ if test "x$with_shared" = "xyes"; then
+-echo "$as_me:6210: checking if you want to build C++ shared libraries" >&5
++echo "$as_me:6214: 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.
+@@ -6217,26 +6221,26 @@
+ else
+   with_shared_cxx=no
+ fi;
+-echo "$as_me:6220: result: $with_shared_cxx" >&5
++echo "$as_me:6224: result: $with_shared_cxx" >&5
+ echo "${ECHO_T}$with_shared_cxx" >&6
+ fi
+ fi
+ 
+ ###############################################################################
+ 
+-echo "$as_me:6227: checking for specified models" >&5
++echo "$as_me:6231: 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:6231: result: $cf_list_models" >&5
++echo "$as_me:6235: 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:6236: checking for default model" >&5
++echo "$as_me:6240: 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:6239: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:6243: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+ 
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+@@ -6250,7 +6254,7 @@
+ LIB_DIR=../lib
+ LIB_2ND=../../lib
+ 
+-echo "$as_me:6253: checking if you want to have a library-prefix" >&5
++echo "$as_me:6257: 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.
+@@ -6260,7 +6264,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:6263: result: $with_lib_prefix" >&5
++echo "$as_me:6267: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test "$with_lib_prefix" = auto
+@@ -6291,24 +6295,24 @@
+ 
+ LIB_SUFFIX=
+ 
+-	echo "$as_me:6294: checking for PATH separator" >&5
++	echo "$as_me:6298: 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:6301: result: $PATH_SEPARATOR" >&5
++	echo "$as_me:6305: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+ 
+ # headers needed for checks...
+-echo "$as_me:6305: checking for ANSI C header files" >&5
++echo "$as_me:6309: 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 6311 "configure"
++#line 6315 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -6316,13 +6320,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:6319: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:6323: \"$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:6325: \$? = $ac_status" >&5
++  echo "$as_me:6329: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6344,7 +6348,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 6347 "configure"
++#line 6351 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6362,7 +6366,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 6365 "configure"
++#line 6369 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6383,7 +6387,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6386 "configure"
++#line 6390 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -6409,15 +6413,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6412: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6416: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6415: \$? = $ac_status" >&5
++  echo "$as_me:6419: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:6417: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6421: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6420: \$? = $ac_status" >&5
++  echo "$as_me:6424: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6430,7 +6434,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:6433: result: $ac_cv_header_stdc" >&5
++echo "$as_me:6437: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -6446,28 +6450,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6449: checking for $ac_header" >&5
++echo "$as_me:6453: 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 6455 "configure"
++#line 6459 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6461: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6465: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6464: \$? = $ac_status" >&5
++  echo "$as_me:6468: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6467: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6471: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6470: \$? = $ac_status" >&5
++  echo "$as_me:6474: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -6477,7 +6481,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6480: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6484: 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:6494: checking whether exit is declared" >&5
+ echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
+ if test "${ac_cv_have_decl_exit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6496 "configure"
++#line 6500 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -6508,16 +6512,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6511: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6515: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6514: \$? = $ac_status" >&5
++  echo "$as_me:6518: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6517: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6521: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6520: \$? = $ac_status" >&5
++  echo "$as_me:6524: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_have_decl_exit=yes
+ else
+@@ -6527,19 +6531,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6530: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:6534: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+ 
+ 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:6536: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:6540: 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 6542 "configure"
++#line 6546 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -6554,16 +6558,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6557: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6561: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6560: \$? = $ac_status" >&5
++  echo "$as_me:6564: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6563: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6567: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6566: \$? = $ac_status" >&5
++  echo "$as_me:6570: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -6573,7 +6577,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6576: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6580: 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:6593: 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
+@@ -6594,7 +6598,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6597 "configure"
++#line 6601 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6613,16 +6617,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6616: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6620: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6619: \$? = $ac_status" >&5
++  echo "$as_me:6623: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6622: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6626: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6625: \$? = $ac_status" >&5
++  echo "$as_me:6629: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -6633,14 +6637,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6636: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:6640: 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:6643: checking for opendir in -lx" >&5
++  echo "$as_me:6647: 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
+@@ -6648,7 +6652,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6651 "configure"
++#line 6655 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6667,16 +6671,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6670: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6674: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6673: \$? = $ac_status" >&5
++  echo "$as_me:6677: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6676: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6680: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6679: \$? = $ac_status" >&5
++  echo "$as_me:6683: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -6687,7 +6691,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6690: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:6694: 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"
+@@ -6697,7 +6701,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:6700: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:6704: 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.
+@@ -6707,10 +6711,10 @@
+ else
+   with_termlib=no
+ fi;
+-echo "$as_me:6710: result: $with_termlib" >&5
++echo "$as_me:6714: result: $with_termlib" >&5
+ echo "${ECHO_T}$with_termlib" >&6
+ 
+-echo "$as_me:6713: checking if you want to build a separate tic library" >&5
++echo "$as_me:6717: 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.
+@@ -6720,7 +6724,7 @@
+ else
+   with_ticlib=no
+ fi;
+-echo "$as_me:6723: result: $with_ticlib" >&5
++echo "$as_me:6727: result: $with_ticlib" >&5
+ echo "${ECHO_T}$with_ticlib" >&6
+ 
+ if test X"$CC_G_OPT" = X"" ; then
+@@ -6733,7 +6737,7 @@
+ 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
+ fi
+ 
+-echo "$as_me:6736: checking for default loader flags" >&5
++echo "$as_me:6740: 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=''   ;;
+@@ -6742,13 +6746,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:6745: result: ${LD_MODEL:-(none)}" >&5
++echo "$as_me:6749: result: ${LD_MODEL:-(none)}" >&5
+ echo "${ECHO_T}${LD_MODEL:-(none)}" >&6
+ 
+ case "$DFT_LWR_MODEL" in
+ (shared)
+ 
+-echo "$as_me:6751: checking if rpath option should be used" >&5
++echo "$as_me:6755: 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.
+@@ -6758,10 +6762,10 @@
+ else
+   cf_cv_enable_rpath=no
+ fi;
+-echo "$as_me:6761: result: $cf_cv_enable_rpath" >&5
++echo "$as_me:6765: result: $cf_cv_enable_rpath" >&5
+ echo "${ECHO_T}$cf_cv_enable_rpath" >&6
+ 
+-echo "$as_me:6764: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:6768: 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.
+@@ -6771,7 +6775,7 @@
+ else
+   cf_cv_do_relink=yes
+ fi;
+-echo "$as_me:6774: result: $cf_cv_do_relink" >&5
++echo "$as_me:6778: result: $cf_cv_do_relink" >&5
+ echo "${ECHO_T}$cf_cv_do_relink" >&6
+ 	;;
+ esac
+@@ -6782,7 +6786,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:6785: checking for an rpath option" >&5
++	echo "$as_me:6789: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -6813,12 +6817,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:6816: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:6820: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:6821: checking if we need a space after rpath option" >&5
++		echo "$as_me:6825: 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"
+ 
+@@ -6839,7 +6843,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6842 "configure"
++#line 6846 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -6851,16 +6855,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6854: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6858: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6857: \$? = $ac_status" >&5
++  echo "$as_me:6861: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6860: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6864: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6863: \$? = $ac_status" >&5
++  echo "$as_me:6867: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -6870,7 +6874,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:6873: result: $cf_rpath_space" >&5
++		echo "$as_me:6877: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -6892,7 +6896,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:6895: checking whether to use release or ABI version in shared library file names" >&5
++	echo "$as_me:6899: checking whether to use release or ABI version in shared library file names" >&5
+ echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
+ 
+ # Check whether --with-shlib-version or --without-shlib-version was given.
+@@ -6907,9 +6911,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:6910: result: $withval" >&5
++		echo "$as_me:6914: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:6912: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:6916: 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; }; }
+ 		;;
+@@ -6918,7 +6922,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:6921: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:6925: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -6941,14 +6945,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:6944: checking which $CC option to use" >&5
++		echo "$as_me:6948: 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 6951 "configure"
++#line 6955 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6960,16 +6964,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6963: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6967: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6966: \$? = $ac_status" >&5
++  echo "$as_me:6970: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6969: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6973: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6972: \$? = $ac_status" >&5
++  echo "$as_me:6976: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -6978,7 +6982,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		done
+-		echo "$as_me:6981: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:6985: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -7049,7 +7053,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:7052: checking if ld -search_paths_first works" >&5
++		echo "$as_me:7056: 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
+@@ -7058,7 +7062,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7061 "configure"
++#line 7065 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -7070,16 +7074,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7073: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7077: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7076: \$? = $ac_status" >&5
++  echo "$as_me:7080: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7079: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7083: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7082: \$? = $ac_status" >&5
++  echo "$as_me:7086: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -7090,7 +7094,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:7093: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:7097: 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"
+@@ -7440,7 +7444,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7443 "configure"
++#line 7447 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7452,16 +7456,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7455: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7459: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7458: \$? = $ac_status" >&5
++  echo "$as_me:7462: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7461: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7465: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7464: \$? = $ac_status" >&5
++  echo "$as_me:7468: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -7498,7 +7502,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:7501: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:7505: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -7508,7 +7512,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <
+ int main(int argc, char *argv[])
+ {
+@@ -7520,18 +7524,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:7523: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:7527: 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:7525: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:7529: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7528: \$? = $ac_status" >&5
++  echo "$as_me:7532: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-				echo "$as_me:7530: result: yes" >&5
++				echo "$as_me:7534: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:7534: result: no" >&5
++				echo "$as_me:7538: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -7546,17 +7550,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:7549: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:7553: 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}:7553: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7557: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ for model in $cf_list_models ; do
+ 	case "$model" in
+ 	(libtool)
+ 
+-echo "$as_me:7559: checking for additional libtool options" >&5
++echo "$as_me:7563: 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.
+@@ -7566,7 +7570,7 @@
+ else
+   with_libtool_opts=no
+ fi;
+-echo "$as_me:7569: result: $with_libtool_opts" >&5
++echo "$as_me:7573: result: $with_libtool_opts" >&5
+ echo "${ECHO_T}$with_libtool_opts" >&6
+ 
+ case .$with_libtool_opts in
+@@ -7577,7 +7581,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:7580: checking if exported-symbols file should be used" >&5
++echo "$as_me:7584: 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.
+@@ -7592,7 +7596,7 @@
+ 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
+ 
+ fi
+-echo "$as_me:7595: result: $with_export_syms" >&5
++echo "$as_me:7599: result: $with_export_syms" >&5
+ echo "${ECHO_T}$with_export_syms" >&6
+ if test "x$with_export_syms" != xno
+ then
+@@ -7603,15 +7607,15 @@
+ 		;;
+ 	(shared)
+ 		if test "$CC_SHARED_OPTS" = "unknown"; then
+-			{ { echo "$as_me:7606: error: Shared libraries are not supported in this version" >&5
++			{ { echo "$as_me:7610: 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:7611: checking if current CFLAGS link properly" >&5
++		echo "$as_me:7615: 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 7614 "configure"
++#line 7618 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7623,16 +7627,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7626: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7630: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7629: \$? = $ac_status" >&5
++  echo "$as_me:7633: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7632: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7636: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7635: \$? = $ac_status" >&5
++  echo "$as_me:7639: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cflags_work=yes
+ else
+@@ -7641,13 +7645,13 @@
+ cf_cflags_work=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:7644: result: $cf_cflags_work" >&5
++		echo "$as_me:7648: 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}:7650: testing try to work around by appending shared-options ..." 1>&5
++echo "${as_me:-configure}:7654: testing try to work around by appending shared-options ..." 1>&5
+ 
+ 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
+ 		fi
+@@ -7655,7 +7659,7 @@
+ if test "$with_libtool" = "yes" ; then
+ 	:
+ elif test "$with_shared" = "yes" ; then
+-echo "$as_me:7658: checking if versioned-symbols file should be used" >&5
++echo "$as_me:7662: 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.
+@@ -7673,18 +7677,18 @@
+ (xno)
+ 	;;
+ (x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+-	test -f "$with_versioned_syms" || { { echo "$as_me:7676: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:7680: 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:7681: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:7685: 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:7687: result: $with_versioned_syms" >&5
++echo "$as_me:7691: result: $with_versioned_syms" >&5
+ echo "${ECHO_T}$with_versioned_syms" >&6
+ 
+ RESULTING_SYMS=
+@@ -7700,7 +7704,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}:7703: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7707: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		LIB_CREATE="$MK_SHARED_LIB"
+ 		;;
+@@ -7709,12 +7713,12 @@
+ 		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}:7712: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7716: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		LIB_CREATE="$MK_SHARED_LIB"
+ 		;;
+ 	(*)
+-		{ echo "$as_me:7717: WARNING: this system does not support versioned-symbols" >&5
++		{ echo "$as_me:7721: WARNING: this system does not support versioned-symbols" >&5
+ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
+ 		;;
+ 	esac
+@@ -7726,7 +7730,7 @@
+ 	# symbols.
+ 	if test "x$VERSIONED_SYMS" != "x"
+ 	then
+-		echo "$as_me:7729: checking if wildcards can be used to selectively omit symbols" >&5
++		echo "$as_me:7733: 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
+ 
+@@ -7763,7 +7767,7 @@
+ } submodule_1.0;
+ EOF
+ 		cat >conftest.$ac_ext <&5
++		echo "$as_me:7801: result: $WILDCARD_SYMS" >&5
+ echo "${ECHO_T}$WILDCARD_SYMS" >&6
+ 		rm -f conftest.*
+ 	fi
+@@ -7809,7 +7813,7 @@
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+ 
+-echo "$as_me:7812: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:7816: 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.
+@@ -7819,27 +7823,27 @@
+ else
+   with_gpm=maybe
+ fi;
+-echo "$as_me:7822: result: $with_gpm" >&5
++echo "$as_me:7826: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7826: checking for gpm.h" >&5
++	echo "$as_me:7830: 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 7832 "configure"
++#line 7836 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:7836: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7840: \"$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:7842: \$? = $ac_status" >&5
++  echo "$as_me:7846: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7858,7 +7862,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7861: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:7865: 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
+ 
+@@ -7869,7 +7873,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}:7872: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:7876: testing assuming we really have GPM library ..." 1>&5
+ 
+ cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+@@ -7877,7 +7881,7 @@
+ 
+ 			with_gpm=yes
+ 		else
+-			echo "$as_me:7880: checking for Gpm_Open in -lgpm" >&5
++			echo "$as_me:7884: 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
+@@ -7885,7 +7889,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7888 "configure"
++#line 7892 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7904,16 +7908,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7907: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7911: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7910: \$? = $ac_status" >&5
++  echo "$as_me:7914: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7913: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7917: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7916: \$? = $ac_status" >&5
++  echo "$as_me:7920: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -7924,18 +7928,18 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7927: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:7931: 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:7934: WARNING: Cannot link with GPM library" >&5
++					{ echo "$as_me:7938: WARNING: Cannot link with GPM library" >&5
+ echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
+ 					with_gpm=no
+ 				else
+-					{ { echo "$as_me:7938: error: Cannot link with GPM library" >&5
++					{ { echo "$as_me:7942: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+    { (exit 1); exit 1; }; }
+ 				fi
+@@ -7946,7 +7950,7 @@
+ 
+ else
+ 
+-		test "$with_gpm" != maybe && { echo "$as_me:7949: WARNING: Cannot find GPM header" >&5
++		test "$with_gpm" != maybe && { echo "$as_me:7953: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ 		with_gpm=no
+ 
+@@ -7955,7 +7959,7 @@
+ fi
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7958: checking if you want to load GPM dynamically" >&5
++	echo "$as_me:7962: 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.
+@@ -7965,18 +7969,18 @@
+ else
+   with_dlsym=yes
+ fi;
+-	echo "$as_me:7968: result: $with_dlsym" >&5
++	echo "$as_me:7972: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ 	if test "x$with_dlsym" = xyes ; then
+ 
+ cf_have_dlsym=no
+-echo "$as_me:7973: checking for dlsym" >&5
++echo "$as_me:7977: 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 7979 "configure"
++#line 7983 "configure"
+ #include "confdefs.h"
+ #define dlsym autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -8007,16 +8011,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8010: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8014: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8013: \$? = $ac_status" >&5
++  echo "$as_me:8017: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8016: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8020: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8019: \$? = $ac_status" >&5
++  echo "$as_me:8023: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_dlsym=yes
+ else
+@@ -8026,14 +8030,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8029: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:8033: 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:8036: checking for dlsym in -ldl" >&5
++echo "$as_me:8040: 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
+@@ -8041,7 +8045,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8044 "configure"
++#line 8048 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8060,16 +8064,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8063: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8067: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8066: \$? = $ac_status" >&5
++  echo "$as_me:8070: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8069: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8073: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8072: \$? = $ac_status" >&5
++  echo "$as_me:8076: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dl_dlsym=yes
+ else
+@@ -8080,7 +8084,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8083: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:8087: 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
+ 
+@@ -8109,10 +8113,10 @@
+ LIBS="$cf_add_libs"
+  }
+ 
+-	echo "$as_me:8112: checking whether able to link to dl*() functions" >&5
++	echo "$as_me:8116: 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 8115 "configure"
++#line 8119 "configure"
+ #include "confdefs.h"
+ 
+ 	#include 
+@@ -8133,16 +8137,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8136: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8140: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8139: \$? = $ac_status" >&5
++  echo "$as_me:8143: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8142: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8146: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8145: \$? = $ac_status" >&5
++  echo "$as_me:8149: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ cat >>confdefs.h <<\EOF
+@@ -8153,15 +8157,15 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-		{ { echo "$as_me:8156: error: Cannot link test program for libdl" >&5
++		{ { echo "$as_me:8160: 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:8161: result: ok" >&5
++	echo "$as_me:8165: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+-	{ { echo "$as_me:8164: error: Cannot find dlsym function" >&5
++	{ { echo "$as_me:8168: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8169,12 +8173,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}:8172: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:8176: testing assuming soname for gpm is $with_gpm ..." 1>&5
+ 
+ 			cf_cv_gpm_soname="$with_gpm"
+ 		else
+ 
+-echo "$as_me:8177: checking for soname of gpm library" >&5
++echo "$as_me:8181: 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
+@@ -8208,15 +8212,15 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-	if { (eval echo "$as_me:8211: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:8215: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8214: \$? = $ac_status" >&5
++  echo "$as_me:8218: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:8216: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:8220: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8219: \$? = $ac_status" >&5
++  echo "$as_me:8223: \$? = $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
+@@ -8227,7 +8231,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:8230: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:8234: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+ 
+ 		fi
+@@ -8295,7 +8299,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+ 
+-echo "$as_me:8298: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:8302: 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
+@@ -8303,7 +8307,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8306 "configure"
++#line 8310 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8322,16 +8326,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8325: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8329: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8328: \$? = $ac_status" >&5
++  echo "$as_me:8332: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8331: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8335: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8334: \$? = $ac_status" >&5
++  echo "$as_me:8338: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -8342,11 +8346,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8345: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:8349: 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:8349: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:8353: 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
+@@ -8370,15 +8374,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:8373: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:8377: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8376: \$? = $ac_status" >&5
++  echo "$as_me:8380: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:8378: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:8382: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8381: \$? = $ac_status" >&5
++  echo "$as_me:8385: \$? = $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
+@@ -8390,11 +8394,11 @@
+ fi
+ 
+ fi
+-echo "$as_me:8393: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:8397: 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:8397: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++	{ echo "$as_me:8401: 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
+ 
+@@ -8402,7 +8406,7 @@
+ 
+ fi
+ 
+-echo "$as_me:8405: checking if you want to use PCRE2 for regular-expressions" >&5
++echo "$as_me:8409: 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.
+@@ -8411,7 +8415,7 @@
+ 
+ fi;
+ test -z "$with_pcre2" && with_pcre2=no
+-echo "$as_me:8414: result: $with_pcre2" >&5
++echo "$as_me:8418: result: $with_pcre2" >&5
+ echo "${ECHO_T}$with_pcre2" >&6
+ 
+ if test "x$with_pcre2" != xno ; then
+@@ -8422,17 +8426,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}:8425: testing found package $cf_with_pcre2 ..." 1>&5
++echo "${as_me:-configure}:8429: 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}:8431: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:8435: 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}:8435: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:8439: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ for cf_required in $cf_with_pcre2
+ do
+@@ -8570,7 +8574,7 @@
+ fi
+ 
+ 	done
+-	cf_with_pcre2_ok=yes || { { echo "$as_me:8573: error: Cannot find PCRE2 library" >&5
++	cf_with_pcre2_ok=yes || { { echo "$as_me:8577: error: Cannot find PCRE2 library" >&5
+ echo "$as_me: error: Cannot find PCRE2 library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -8583,7 +8587,7 @@
+ 	(*pcre2-posix*|*pcreposix*)
+ 		;;
+ 	(*)
+-		echo "$as_me:8586: checking for regcomp in -lpcre2-posix" >&5
++		echo "$as_me:8590: 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
+@@ -8591,7 +8595,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcre2-posix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8594 "configure"
++#line 8598 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8610,16 +8614,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8613: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8617: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8616: \$? = $ac_status" >&5
++  echo "$as_me:8620: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8619: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8623: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8622: \$? = $ac_status" >&5
++  echo "$as_me:8626: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcre2_posix_regcomp=yes
+ else
+@@ -8630,7 +8634,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8633: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
++echo "$as_me:8637: 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
+ 
+@@ -8651,7 +8655,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  echo "$as_me:8654: checking for regcomp in -lpcreposix" >&5
++  echo "$as_me:8658: 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
+@@ -8659,7 +8663,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcreposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8662 "configure"
++#line 8666 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8678,16 +8682,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8681: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8685: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8684: \$? = $ac_status" >&5
++  echo "$as_me:8688: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8687: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8691: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8690: \$? = $ac_status" >&5
++  echo "$as_me:8694: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcreposix_regcomp=yes
+ else
+@@ -8698,7 +8702,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8701: result: $ac_cv_lib_pcreposix_regcomp" >&5
++echo "$as_me:8705: 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
+ 
+@@ -8719,7 +8723,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  { { echo "$as_me:8722: error: Cannot find PCRE2 POSIX library" >&5
++  { { echo "$as_me:8726: error: Cannot find PCRE2 POSIX library" >&5
+ echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8734,23 +8738,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:8737: checking for $ac_header" >&5
++echo "$as_me:8741: 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 8743 "configure"
++#line 8747 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8747: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8751: \"$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:8753: \$? = $ac_status" >&5
++  echo "$as_me:8757: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8769,7 +8773,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8772: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8776: 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:8789: 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 8791 "configure"
++#line 8795 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -8819,16 +8823,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8822: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8826: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8825: \$? = $ac_status" >&5
++  echo "$as_me:8829: \$? = $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:8832: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8831: \$? = $ac_status" >&5
++  echo "$as_me:8835: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -8838,7 +8842,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8841: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:8845: 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:8855: checking if you want to use sysmouse" >&5
++echo "$as_me:8859: 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.
+@@ -8864,7 +8868,7 @@
+ fi;
+ 	if test "$cf_with_sysmouse" != no ; then
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8867 "configure"
++#line 8871 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8887,16 +8891,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8890: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8894: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8893: \$? = $ac_status" >&5
++  echo "$as_me:8897: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8896: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8900: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8899: \$? = $ac_status" >&5
++  echo "$as_me:8903: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_with_sysmouse=yes
+ else
+@@ -8906,7 +8910,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	fi
+-echo "$as_me:8909: result: $cf_with_sysmouse" >&5
++echo "$as_me:8913: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -8916,7 +8920,7 @@
+ fi
+ 
+ # pretend that ncurses==ncursesw==ncursest
+-echo "$as_me:8919: checking if you want to disable library suffixes" >&5
++echo "$as_me:8923: 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.
+@@ -8933,13 +8937,13 @@
+ 	disable_lib_suffixes=no
+ 
+ fi;
+-echo "$as_me:8936: result: $disable_lib_suffixes" >&5
++echo "$as_me:8940: 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:8942: checking if rpath-hack should be disabled" >&5
++echo "$as_me:8946: 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.
+@@ -8957,22 +8961,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:8960: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:8964: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:8965: checking for updated LDFLAGS" >&5
++echo "$as_me:8969: 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:8968: result: maybe" >&5
++	echo "$as_me:8972: 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:8975: checking for $ac_word" >&5
++echo "$as_me:8979: 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
+@@ -8987,7 +8991,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:8990: found $ac_dir/$ac_word" >&5
++echo "$as_me:8994: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8995,10 +8999,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:8998: result: $cf_ldd_prog" >&5
++  echo "$as_me:9002: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:9001: result: no" >&5
++  echo "$as_me:9005: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9012,7 +9016,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9015 "configure"
++#line 9019 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9024,16 +9028,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9027: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9031: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9030: \$? = $ac_status" >&5
++  echo "$as_me:9034: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9033: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9037: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9036: \$? = $ac_status" >&5
++  echo "$as_me:9040: \$? = $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`
+@@ -9061,7 +9065,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:9064: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:9068: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -9073,11 +9077,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9076: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9080: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9080: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9084: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -9114,7 +9118,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:9117: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9121: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -9127,11 +9131,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9130: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9134: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:9134: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9138: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -9168,7 +9172,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:9171: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9175: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -9181,14 +9185,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:9184: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9188: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9188: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9192: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:9191: result: no" >&5
++	echo "$as_me:9195: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9202,7 +9206,7 @@
+ EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
+ if test -n "$EXTRA_PKG_LDFLAGS"
+ then
+-	echo "$as_me:9205: checking if you want to disable extra LDFLAGS for package-scripts" >&5
++	echo "$as_me:9209: 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.
+@@ -9219,7 +9223,7 @@
+ 	disable_pkg_ldflags=no
+ 
+ fi;
+-	echo "$as_me:9222: result: $disable_pkg_ldflags" >&5
++	echo "$as_me:9226: result: $disable_pkg_ldflags" >&5
+ echo "${ECHO_T}$disable_pkg_ldflags" >&6
+ 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
+ fi
+@@ -9227,7 +9231,7 @@
+ ###############################################################################
+ 
+ ###	use option --with-extra-suffix to append suffix to headers and libraries
+-echo "$as_me:9230: checking for extra suffix to append to header/library paths" >&5
++echo "$as_me:9234: checking for extra suffix to append to header/library paths" >&5
+ echo $ECHO_N "checking for extra suffix to append to header/library paths... $ECHO_C" >&6
+ EXTRA_SUFFIX=
+ 
+@@ -9246,11 +9250,11 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:9249: result: ${EXTRA_SUFFIX:-(none)}" >&5
++echo "$as_me:9253: result: ${EXTRA_SUFFIX:-(none)}" >&5
+ echo "${ECHO_T}${EXTRA_SUFFIX:-(none)}" >&6
+ 
+ ###	use option --disable-overwrite to leave out the link to -lcurses
+-echo "$as_me:9253: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:9257: 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.
+@@ -9260,10 +9264,10 @@
+ else
+   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:9263: result: $with_overwrite" >&5
++echo "$as_me:9267: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+ 
+-echo "$as_me:9266: checking if external terminfo-database is used" >&5
++echo "$as_me:9270: 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.
+@@ -9273,7 +9277,7 @@
+ else
+   use_database=yes
+ fi;
+-echo "$as_me:9276: result: $use_database" >&5
++echo "$as_me:9280: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+ 
+ case "$host_os" in
+@@ -9289,7 +9293,7 @@
+ if test "$use_database" != no ; then
+ 	NCURSES_USE_DATABASE=1
+ 
+-	echo "$as_me:9292: checking which terminfo source-file will be installed" >&5
++	echo "$as_me:9296: 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.
+@@ -9297,10 +9301,10 @@
+   withval="$with_database"
+   TERMINFO_SRC=$withval
+ fi;
+-	echo "$as_me:9300: result: $TERMINFO_SRC" >&5
++	echo "$as_me:9304: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+ 
+-	echo "$as_me:9303: checking whether to use hashed database instead of directory/tree" >&5
++	echo "$as_me:9307: 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.
+@@ -9310,13 +9314,13 @@
+ else
+   with_hashed_db=no
+ fi;
+-	echo "$as_me:9313: result: $with_hashed_db" >&5
++	echo "$as_me:9317: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ 	with_hashed_db=no
+ fi
+ 
+-echo "$as_me:9319: checking for list of fallback terminal descriptions" >&5
++echo "$as_me:9323: checking for list of fallback terminal descriptions" >&5
+ echo $ECHO_N "checking for list of fallback terminal descriptions... $ECHO_C" >&6
+ 
+ # Check whether --with-fallbacks or --without-fallbacks was given.
+@@ -9326,7 +9330,7 @@
+ else
+   with_fallback=
+ fi;
+-echo "$as_me:9329: result: ${with_fallback:-(none)}" >&5
++echo "$as_me:9333: result: ${with_fallback:-(none)}" >&5
+ echo "${ECHO_T}${with_fallback:-(none)}" >&6
+ 
+ case ".$with_fallback" in
+@@ -9334,7 +9338,7 @@
+ 	FALLBACK_LIST=
+ 	;;
+ (.yes)
+-	{ echo "$as_me:9337: WARNING: expected a list of terminal descriptions" >&5
++	{ echo "$as_me:9341: WARNING: expected a list of terminal descriptions" >&5
+ echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
+ 	;;
+ (*)
+@@ -9350,7 +9354,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:9353: checking for $ac_word" >&5
++echo "$as_me:9357: 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
+@@ -9365,7 +9369,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:9368: found $ac_dir/$ac_word" >&5
++echo "$as_me:9372: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9373,10 +9377,10 @@
+ fi
+ TIC=$ac_cv_prog_TIC
+ if test -n "$TIC"; then
+-  echo "$as_me:9376: result: $TIC" >&5
++  echo "$as_me:9380: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:9379: result: no" >&5
++  echo "$as_me:9383: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9385,7 +9389,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:9388: checking for $ac_word" >&5
++echo "$as_me:9392: 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
+@@ -9400,7 +9404,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:9403: found $ac_dir/$ac_word" >&5
++echo "$as_me:9407: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9408,10 +9412,10 @@
+ fi
+ ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
+ if test -n "$ac_ct_TIC"; then
+-  echo "$as_me:9411: result: $ac_ct_TIC" >&5
++  echo "$as_me:9415: result: $ac_ct_TIC" >&5
+ echo "${ECHO_T}$ac_ct_TIC" >&6
+ else
+-  echo "$as_me:9414: result: no" >&5
++  echo "$as_me:9418: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9423,7 +9427,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:9426: checking for $ac_word" >&5
++echo "$as_me:9430: 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
+@@ -9438,7 +9442,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:9441: found $ac_dir/$ac_word" >&5
++echo "$as_me:9445: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9446,10 +9450,10 @@
+ fi
+ INFOCMP=$ac_cv_prog_INFOCMP
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:9449: result: $INFOCMP" >&5
++  echo "$as_me:9453: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:9452: result: no" >&5
++  echo "$as_me:9456: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9458,7 +9462,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:9461: checking for $ac_word" >&5
++echo "$as_me:9465: 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
+@@ -9473,7 +9477,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:9476: found $ac_dir/$ac_word" >&5
++echo "$as_me:9480: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9481,10 +9485,10 @@
+ fi
+ ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
+ if test -n "$ac_ct_INFOCMP"; then
+-  echo "$as_me:9484: result: $ac_ct_INFOCMP" >&5
++  echo "$as_me:9488: result: $ac_ct_INFOCMP" >&5
+ echo "${ECHO_T}$ac_ct_INFOCMP" >&6
+ else
+-  echo "$as_me:9487: result: no" >&5
++  echo "$as_me:9491: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9499,10 +9503,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:9502: checking for tic program for fallbacks" >&5
++  echo "$as_me:9506: checking for tic program for fallbacks" >&5
+ echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
+ 		TIC=$withval
+-		echo "$as_me:9505: result: $TIC" >&5
++		echo "$as_me:9509: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -9528,7 +9532,7 @@
+ 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9531: error: expected a pathname, not \"$TIC\"" >&5
++	{ { echo "$as_me:9535: error: expected a pathname, not \"$TIC\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9541,7 +9545,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:9544: checking for $ac_word" >&5
++echo "$as_me:9548: 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
+@@ -9558,7 +9562,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:9561: found $ac_dir/$ac_word" >&5
++   echo "$as_me:9565: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -9569,10 +9573,10 @@
+ TIC=$ac_cv_path_TIC
+ 
+ if test -n "$TIC"; then
+-  echo "$as_me:9572: result: $TIC" >&5
++  echo "$as_me:9576: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:9575: result: no" >&5
++  echo "$as_me:9579: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9629,7 +9633,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:9632: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9636: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:9651: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -9653,10 +9657,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:9656: checking for infocmp program for fallbacks" >&5
++  echo "$as_me:9660: checking for infocmp program for fallbacks" >&5
+ echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
+ 		INFOCMP=$withval
+-		echo "$as_me:9659: result: $INFOCMP" >&5
++		echo "$as_me:9663: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -9682,7 +9686,7 @@
+ 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9685: error: expected a pathname, not \"$INFOCMP\"" >&5
++	{ { echo "$as_me:9689: error: expected a pathname, not \"$INFOCMP\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9695,7 +9699,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:9698: checking for $ac_word" >&5
++echo "$as_me:9702: 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
+@@ -9712,7 +9716,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:9715: found $ac_dir/$ac_word" >&5
++   echo "$as_me:9719: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -9723,10 +9727,10 @@
+ INFOCMP=$ac_cv_path_INFOCMP
+ 
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:9726: result: $INFOCMP" >&5
++  echo "$as_me:9730: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:9729: result: no" >&5
++  echo "$as_me:9733: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9783,7 +9787,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:9786: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9790: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:9805: WARNING: no infocmp program found for fallbacks" >&5
+ echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -9808,7 +9812,7 @@
+ 	test -z "$INFOCMP" && FALLBACK_LIST=
+ 	if test -z "$FALLBACK_LIST"
+ 	then
+-		{ echo "$as_me:9811: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
++		{ echo "$as_me:9815: 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
+@@ -9816,7 +9820,7 @@
+ USE_FALLBACKS=
+ test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
+ 
+-echo "$as_me:9819: checking if you want modern xterm or antique" >&5
++echo "$as_me:9823: 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.
+@@ -9830,7 +9834,7 @@
+ (no) with_xterm_new=xterm-old;;
+ (*)	 with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:9833: result: $with_xterm_new" >&5
++echo "$as_me:9837: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+ 
+@@ -9843,7 +9847,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9846: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:9850: 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.
+@@ -9867,13 +9871,13 @@
+ 	with_xterm_kbs=$withval
+ 	;;
+ esac
+-echo "$as_me:9870: result: $with_xterm_kbs" >&5
++echo "$as_me:9874: result: $with_xterm_kbs" >&5
+ echo "${ECHO_T}$with_xterm_kbs" >&6
+ XTERM_KBS=$with_xterm_kbs
+ 
+ if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
+ then
+-	{ echo "$as_me:9876: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
++	{ echo "$as_me:9880: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
+ echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;}
+ fi
+ 
+@@ -9883,7 +9887,7 @@
+ 	MAKE_TERMINFO="#"
+ else
+ 
+-echo "$as_me:9886: checking for list of terminfo directories" >&5
++echo "$as_me:9890: 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.
+@@ -9921,7 +9925,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9924: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:9928: 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; }; }
+ 	;;
+@@ -9944,7 +9948,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9947: result: $TERMINFO_DIRS" >&5
++echo "$as_me:9951: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <&5
++	{ echo "$as_me:9960: 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:9962: checking for default terminfo directory" >&5
++echo "$as_me:9966: 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.
+@@ -9993,7 +9997,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9996: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:10000: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -10002,7 +10006,7 @@
+ fi
+ eval TERMINFO="$withval"
+ 
+-echo "$as_me:10005: result: $TERMINFO" >&5
++echo "$as_me:10009: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:10020: 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.
+@@ -10025,7 +10029,7 @@
+   with_big_core=no
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10028 "configure"
++#line 10032 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10039,15 +10043,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10042: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10046: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10045: \$? = $ac_status" >&5
++  echo "$as_me:10049: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10047: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10051: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10050: \$? = $ac_status" >&5
++  echo "$as_me:10054: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_big_core=yes
+ else
+@@ -10059,7 +10063,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi;
+-echo "$as_me:10062: result: $with_big_core" >&5
++echo "$as_me:10066: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10069,7 +10073,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:10072: checking if big-strings option selected" >&5
++echo "$as_me:10076: 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.
+@@ -10093,14 +10097,14 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:10096: result: $with_big_strings" >&5
++echo "$as_me:10100: 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:10103: checking if you want termcap-fallback support" >&5
++echo "$as_me:10107: 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.
+@@ -10110,14 +10114,14 @@
+ else
+   with_termcap=no
+ fi;
+-echo "$as_me:10113: result: $with_termcap" >&5
++echo "$as_me:10117: 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:10120: error: You have disabled the database w/o specifying fallbacks" >&5
++			{ { echo "$as_me:10124: 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
+@@ -10130,13 +10134,13 @@
+ else
+ 
+ 	if test "$with_ticlib" != no ; then
+-		{ { echo "$as_me:10133: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++		{ { echo "$as_me:10137: 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:10139: checking for list of termcap files" >&5
++	echo "$as_me:10143: 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.
+@@ -10174,7 +10178,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:10177: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:10181: 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; }; }
+ 	;;
+@@ -10197,7 +10201,7 @@
+ 	;;
+ esac
+ 
+-	echo "$as_me:10200: result: $TERMPATH" >&5
++	echo "$as_me:10204: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ 	test -n "$TERMPATH" &&
+ cat >>confdefs.h <&5
++	echo "$as_me:10212: 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.
+@@ -10215,14 +10219,14 @@
+ else
+   with_getcap=no
+ fi;
+-	echo "$as_me:10218: result: $with_getcap" >&5
++	echo "$as_me:10222: 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:10225: checking if translated termcaps will be cached in ~/.terminfo" >&5
++	echo "$as_me:10229: 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.
+@@ -10232,7 +10236,7 @@
+ else
+   with_getcap_cache=no
+ fi;
+-	echo "$as_me:10235: result: $with_getcap_cache" >&5
++	echo "$as_me:10239: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ 	test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10242,7 +10246,7 @@
+ fi
+ 
+ ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:10245: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:10249: 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.
+@@ -10252,14 +10256,14 @@
+ else
+   with_home_terminfo=yes
+ fi;
+-echo "$as_me:10255: result: $with_home_terminfo" >&5
++echo "$as_me:10259: 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:10262: checking if you want to permit root to use ncurses environment variables" >&5
++echo "$as_me:10266: 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.
+@@ -10269,14 +10273,14 @@
+ else
+   with_root_environ=yes
+ fi;
+-echo "$as_me:10272: result: $with_root_environ" >&5
++echo "$as_me:10276: 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:10279: checking if you want to permit setuid programs to access all files" >&5
++echo "$as_me:10283: 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-access or --disable-root-access was given.
+@@ -10286,14 +10290,14 @@
+ else
+   with_root_access=yes
+ fi;
+-echo "$as_me:10289: result: $with_root_access" >&5
++echo "$as_me:10293: result: $with_root_access" >&5
+ echo "${ECHO_T}$with_root_access" >&6
+ test "x$with_root_access" = xyes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_ROOT_ACCESS 1
+ EOF
+ 
+-echo "$as_me:10296: checking if you want to permit setuid use of ncurses environment variables" >&5
++echo "$as_me:10300: checking if you want to permit setuid use of ncurses environment variables" >&5
+ echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
+ 
+ # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
+@@ -10303,7 +10307,7 @@
+ else
+   with_setuid_environ=$with_root_environ
+ fi;
+-echo "$as_me:10306: result: $with_setuid_environ" >&5
++echo "$as_me:10310: result: $with_setuid_environ" >&5
+ echo "${ECHO_T}$with_setuid_environ" >&6
+ test "x$with_setuid_environ" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10318,23 +10322,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:10321: checking for $ac_header" >&5
++echo "$as_me:10325: 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 10327 "configure"
++#line 10331 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10331: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:10335: \"$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:10337: \$? = $ac_status" >&5
++  echo "$as_me:10341: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10353,7 +10357,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:10356: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:10360: 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:10375: 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 10377 "configure"
++#line 10381 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10405,16 +10409,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10408: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10412: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10411: \$? = $ac_status" >&5
++  echo "$as_me:10415: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10414: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10418: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10417: \$? = $ac_status" >&5
++  echo "$as_me:10421: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -10424,7 +10428,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10427: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10431: 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:10448: 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 10450 "configure"
++#line 10454 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10478,16 +10482,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10481: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10485: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10484: \$? = $ac_status" >&5
++  echo "$as_me:10488: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10487: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10491: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10490: \$? = $ac_status" >&5
++  echo "$as_me:10494: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -10497,7 +10501,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10500: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10504: 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:10515: 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
+@@ -10521,7 +10525,7 @@
+ 			eval 'ac_cv_func_'$cf_func'=error'
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10524 "configure"
++#line 10528 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -10555,15 +10559,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10558: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10562: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10561: \$? = $ac_status" >&5
++  echo "$as_me:10565: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10563: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10567: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10566: \$? = $ac_status" >&5
++  echo "$as_me:10570: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -10581,7 +10585,7 @@
+ 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+ 
+ fi
+-echo "$as_me:10584: result: $cf_cv_link_funcs" >&5
++echo "$as_me:10588: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ 	test "$ac_cv_func_link"    = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -10601,7 +10605,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:10604: checking if tic should use symbolic links" >&5
++	echo "$as_me:10608: 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.
+@@ -10611,21 +10615,21 @@
+ else
+   with_symlinks=no
+ fi;
+-	echo "$as_me:10614: result: $with_symlinks" >&5
++	echo "$as_me:10618: 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:10621: checking if tic should use hard links" >&5
++	echo "$as_me:10625: 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:10628: result: $with_links" >&5
++	echo "$as_me:10632: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+ 
+@@ -10641,7 +10645,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:10644: checking if you want broken-linker support code" >&5
++echo "$as_me:10648: 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.
+@@ -10651,7 +10655,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:10654: result: $with_broken_linker" >&5
++echo "$as_me:10658: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : "${BROKEN_LINKER:=0}"
+@@ -10665,7 +10669,7 @@
+ fi
+ 
+ ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:10668: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:10672: 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.
+@@ -10675,7 +10679,7 @@
+ else
+   with_bsdpad=no
+ fi;
+-echo "$as_me:10678: result: $with_bsdpad" >&5
++echo "$as_me:10682: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10694,14 +10698,14 @@
+ # Check to define _XOPEN_SOURCE "automatically"
+ CPPFLAGS_before_XOPEN="$CPPFLAGS"
+ 
+-echo "$as_me:10697: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:10701: 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 10704 "configure"
++#line 10708 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10720,16 +10724,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10723: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10727: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10726: \$? = $ac_status" >&5
++  echo "$as_me:10730: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10729: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10733: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10732: \$? = $ac_status" >&5
++  echo "$as_me:10736: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -10740,7 +10744,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10743: result: $cf_cv_posix_visible" >&5
++echo "$as_me:10747: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -10782,14 +10786,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:10785: checking if this is the GNU C library" >&5
++echo "$as_me:10789: 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 10792 "configure"
++#line 10796 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10808,16 +10812,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10811: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10815: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10814: \$? = $ac_status" >&5
++  echo "$as_me:10818: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10817: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10821: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10820: \$? = $ac_status" >&5
++  echo "$as_me:10824: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -10828,7 +10832,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10831: result: $cf_cv_gnu_library" >&5
++echo "$as_me:10835: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -10836,7 +10840,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:10839: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:10843: 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
+@@ -10848,7 +10852,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10851 "configure"
++#line 10855 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10867,16 +10871,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10870: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10874: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10873: \$? = $ac_status" >&5
++  echo "$as_me:10877: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10876: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10880: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10879: \$? = $ac_status" >&5
++  echo "$as_me:10883: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -10888,12 +10892,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:10891: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:10895: 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:10896: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:10900: 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
+@@ -10998,7 +11002,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11001 "configure"
++#line 11005 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -11018,16 +11022,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11021: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11025: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11024: \$? = $ac_status" >&5
++  echo "$as_me:11028: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11027: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11031: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11030: \$? = $ac_status" >&5
++  echo "$as_me:11034: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -11038,7 +11042,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11041: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:11045: 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
+@@ -11047,14 +11051,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:11050: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:11054: 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 11057 "configure"
++#line 11061 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11069,16 +11073,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11072: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11076: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11075: \$? = $ac_status" >&5
++  echo "$as_me:11079: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11078: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11082: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11081: \$? = $ac_status" >&5
++  echo "$as_me:11085: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -11185,7 +11189,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11188 "configure"
++#line 11192 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11200,16 +11204,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11203: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11207: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11206: \$? = $ac_status" >&5
++  echo "$as_me:11210: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11209: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11213: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11212: \$? = $ac_status" >&5
++  echo "$as_me:11216: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -11224,12 +11228,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11227: result: $cf_cv_gnu_source" >&5
++echo "$as_me:11231: 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:11232: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:11236: 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
+@@ -11239,7 +11243,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11242 "configure"
++#line 11246 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11254,16 +11258,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11257: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11261: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11260: \$? = $ac_status" >&5
++  echo "$as_me:11264: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11263: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11267: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11266: \$? = $ac_status" >&5
++  echo "$as_me:11270: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -11274,7 +11278,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11277: result: $cf_cv_default_source" >&5
++echo "$as_me:11281: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -11314,16 +11318,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:11317: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11321: 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}:11323: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11327: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11326 "configure"
++#line 11330 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11338,16 +11342,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11341: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11345: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11344: \$? = $ac_status" >&5
++  echo "$as_me:11348: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11347: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11351: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11350: \$? = $ac_status" >&5
++  echo "$as_me:11354: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11368,7 +11372,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11371 "configure"
++#line 11375 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11383,16 +11387,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11386: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11390: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11389: \$? = $ac_status" >&5
++  echo "$as_me:11393: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11392: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11396: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11395: \$? = $ac_status" >&5
++  echo "$as_me:11399: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11403,7 +11407,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11406: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11410: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11411,10 +11415,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11414: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11418: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11417 "configure"
++#line 11421 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11429,16 +11433,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11432: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11436: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11435: \$? = $ac_status" >&5
++  echo "$as_me:11439: \$? = $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:11442: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11441: \$? = $ac_status" >&5
++  echo "$as_me:11445: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11454,7 +11458,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11457: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11461: 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
+@@ -11571,7 +11575,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:11574: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:11578: 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
+@@ -11603,14 +11607,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:11606: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:11610: 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 11613 "configure"
++#line 11617 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11628,16 +11632,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11631: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11635: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11634: \$? = $ac_status" >&5
++  echo "$as_me:11638: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11637: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11641: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11640: \$? = $ac_status" >&5
++  echo "$as_me:11644: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11649,7 +11653,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11652 "configure"
++#line 11656 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11667,16 +11671,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11670: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11674: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11673: \$? = $ac_status" >&5
++  echo "$as_me:11677: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11676: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11680: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11679: \$? = $ac_status" >&5
++  echo "$as_me:11683: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11691,7 +11695,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11694: result: $cf_cv_xopen_source" >&5
++echo "$as_me:11698: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -11851,16 +11855,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:11854: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11858: 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}:11860: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11864: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11863 "configure"
++#line 11867 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11875,16 +11879,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11878: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11882: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11881: \$? = $ac_status" >&5
++  echo "$as_me:11885: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11884: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11888: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11887: \$? = $ac_status" >&5
++  echo "$as_me:11891: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11905,7 +11909,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11908 "configure"
++#line 11912 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11920,16 +11924,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11923: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11927: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11926: \$? = $ac_status" >&5
++  echo "$as_me:11930: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11929: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11933: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11932: \$? = $ac_status" >&5
++  echo "$as_me:11936: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11940,7 +11944,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11943: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11947: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11948,10 +11952,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11951: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11955: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11954 "configure"
++#line 11958 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11966,16 +11970,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11969: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11973: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11972: \$? = $ac_status" >&5
++  echo "$as_me:11976: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11975: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11979: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11978: \$? = $ac_status" >&5
++  echo "$as_me:11982: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11991,7 +11995,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11994: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11998: 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
+@@ -12104,10 +12108,10 @@
+ 	if test "$cf_cv_xopen_source" = no ; then
+ 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+ 
+-echo "${as_me:-configure}:12107: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:12111: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12110 "configure"
++#line 12114 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12125,23 +12129,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12128: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12132: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12131: \$? = $ac_status" >&5
++  echo "$as_me:12135: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12134: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12138: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12137: \$? = $ac_status" >&5
++  echo "$as_me:12141: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-			{ echo "$as_me:12144: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++			{ echo "$as_me:12148: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ 			CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -12164,7 +12168,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}:12167: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12171: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -12176,7 +12180,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}:12179: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:12183: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -12264,7 +12268,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:12267: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:12271: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -12274,7 +12278,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:12277: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:12281: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -12284,7 +12288,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}:12287: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:12291: 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"
+@@ -12296,10 +12300,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:12299: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:12303: 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 12302 "configure"
++#line 12306 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12314,16 +12318,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12317: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12321: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12320: \$? = $ac_status" >&5
++  echo "$as_me:12324: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12323: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12327: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12326: \$? = $ac_status" >&5
++  echo "$as_me:12330: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -12332,12 +12336,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:12335: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:12339: 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 12340 "configure"
++#line 12344 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12352,16 +12356,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12355: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12359: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12358: \$? = $ac_status" >&5
++  echo "$as_me:12362: \$? = $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:12365: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12364: \$? = $ac_status" >&5
++  echo "$as_me:12368: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -12372,19 +12376,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:12375: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:12379: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:12380: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:12384: 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 12387 "configure"
++#line 12391 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12402,16 +12406,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12405: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12409: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12408: \$? = $ac_status" >&5
++  echo "$as_me:12412: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12411: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12415: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12414: \$? = $ac_status" >&5
++  echo "$as_me:12418: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12423,7 +12427,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12426 "configure"
++#line 12430 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12441,16 +12445,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12444: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12448: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12447: \$? = $ac_status" >&5
++  echo "$as_me:12451: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12450: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12454: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12453: \$? = $ac_status" >&5
++  echo "$as_me:12457: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12465,7 +12469,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12468: result: $cf_cv_xopen_source" >&5
++echo "$as_me:12472: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -12616,14 +12620,14 @@
+ 
+ # Work around breakage on OS X
+ 
+-echo "$as_me:12619: checking if SIGWINCH is defined" >&5
++echo "$as_me:12623: 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 12626 "configure"
++#line 12630 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12638,23 +12642,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12641: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12645: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12644: \$? = $ac_status" >&5
++  echo "$as_me:12648: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12647: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12651: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12650: \$? = $ac_status" >&5
++  echo "$as_me:12654: \$? = $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 12657 "configure"
++#line 12661 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -12672,16 +12676,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12675: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12679: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12678: \$? = $ac_status" >&5
++  echo "$as_me:12682: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12681: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12685: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12684: \$? = $ac_status" >&5
++  echo "$as_me:12688: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -12695,11 +12699,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12698: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:12702: 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:12702: checking for actual SIGWINCH definition" >&5
++echo "$as_me:12706: 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
+@@ -12710,7 +12714,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12713 "configure"
++#line 12717 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -12732,16 +12736,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12735: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12739: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12738: \$? = $ac_status" >&5
++  echo "$as_me:12742: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12741: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12745: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12744: \$? = $ac_status" >&5
++  echo "$as_me:12748: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -12755,7 +12759,7 @@
+ done
+ 
+ fi
+-echo "$as_me:12758: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:12762: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -12765,13 +12769,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:12768: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:12772: 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 12774 "configure"
++#line 12778 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12785,16 +12789,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12788: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12792: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12791: \$? = $ac_status" >&5
++  echo "$as_me:12795: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12794: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12798: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12797: \$? = $ac_status" >&5
++  echo "$as_me:12801: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -12805,7 +12809,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12808: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:12812: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test "$am_cv_langinfo_codeset" = yes; then
+ 
+@@ -12819,7 +12823,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+ 
+-echo "$as_me:12822: checking if you want wide-character code" >&5
++echo "$as_me:12826: 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.
+@@ -12829,7 +12833,7 @@
+ else
+   with_widec=$cf_dft_widec
+ fi;
+-echo "$as_me:12832: result: $with_widec" >&5
++echo "$as_me:12836: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ 
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -12851,7 +12855,7 @@
+ 	(*_XOPEN_SOURCE=*)
+ 		;;
+ 	(*)
+-		{ echo "$as_me:12854: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
++		{ echo "$as_me:12858: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
+ 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
+ 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
+@@ -12864,23 +12868,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:12867: checking for $ac_header" >&5
++echo "$as_me:12871: 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 12873 "configure"
++#line 12877 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:12877: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12881: \"$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:12883: \$? = $ac_status" >&5
++  echo "$as_me:12887: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12899,7 +12903,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:12902: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:12906: 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:12916: 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 12919 "configure"
++#line 12923 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12938,16 +12942,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12941: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12945: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12944: \$? = $ac_status" >&5
++  echo "$as_me:12948: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12947: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12951: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12950: \$? = $ac_status" >&5
++  echo "$as_me:12954: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_h_okay=yes
+ else
+@@ -12957,16 +12961,16 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12960: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:12964: 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:12966: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:12970: 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 12969 "configure"
++#line 12973 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12982,16 +12986,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12985: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12989: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12988: \$? = $ac_status" >&5
++  echo "$as_me:12992: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12991: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12995: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12994: \$? = $ac_status" >&5
++  echo "$as_me:12998: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=no
+ else
+@@ -13000,16 +13004,16 @@
+ cf_result=yes
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:13003: result: $cf_result" >&5
++echo "$as_me:13007: 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:13009: checking checking for compatible value versus " >&5
++	echo "$as_me:13013: 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 13012 "configure"
++#line 13016 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -13025,16 +13029,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13028: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13032: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13031: \$? = $ac_status" >&5
++  echo "$as_me:13035: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13034: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13038: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13037: \$? = $ac_status" >&5
++  echo "$as_me:13041: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -13043,7 +13047,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:13046: result: $cf_result" >&5
++	echo "$as_me:13050: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = no ; then
+ 		# perhaps we can override it - try...
+@@ -13053,7 +13057,7 @@
+ 
+ fi
+ 
+-echo "$as_me:13056: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:13060: 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
+@@ -13124,7 +13128,7 @@
+   cf_cv_wcwidth_graphics=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13127 "configure"
++#line 13131 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13169,15 +13173,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:13172: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13176: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13175: \$? = $ac_status" >&5
++  echo "$as_me:13179: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:13177: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13181: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13180: \$? = $ac_status" >&5
++  echo "$as_me:13184: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wcwidth_graphics=yes
+ else
+@@ -13190,7 +13194,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:13193: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:13197: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+ 
+ 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -13201,13 +13205,13 @@
+ for ac_func in putwc btowc wctob wmemchr 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:13204: checking for $ac_func" >&5
++echo "$as_me:13208: 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 13210 "configure"
++#line 13214 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13238,16 +13242,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13241: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13245: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13244: \$? = $ac_status" >&5
++  echo "$as_me:13248: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13247: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13251: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13250: \$? = $ac_status" >&5
++  echo "$as_me:13254: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -13257,7 +13261,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13260: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:13264: 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:13279: 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 13281 "configure"
++#line 13285 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13285: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:13289: \"$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:13291: \$? = $ac_status" >&5
++  echo "$as_me:13295: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13307,7 +13311,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:13310: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:13314: 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:13324: 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
+@@ -13325,7 +13329,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13328 "configure"
++#line 13332 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13342,16 +13346,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13345: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13349: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13348: \$? = $ac_status" >&5
++  echo "$as_me:13352: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13351: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13355: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13354: \$? = $ac_status" >&5
++  echo "$as_me:13358: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -13363,12 +13367,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:13366: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13370: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13371 "configure"
++#line 13375 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13381,16 +13385,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13384: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13388: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13387: \$? = $ac_status" >&5
++  echo "$as_me:13391: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13390: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13394: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13393: \$? = $ac_status" >&5
++  echo "$as_me:13397: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -13404,7 +13408,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13407 "configure"
++#line 13411 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13417,16 +13421,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13420: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13424: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13423: \$? = $ac_status" >&5
++  echo "$as_me:13427: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13426: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13430: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13429: \$? = $ac_status" >&5
++  echo "$as_me:13433: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -13443,9 +13447,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:13446: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:13450: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:13448: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13452: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13536,7 +13540,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}:13539: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13543: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -13544,7 +13548,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13547 "configure"
++#line 13551 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13557,21 +13561,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13560: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13564: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13563: \$? = $ac_status" >&5
++  echo "$as_me:13567: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13566: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13570: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13569: \$? = $ac_status" >&5
++  echo "$as_me:13573: \$? = $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}:13574: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13578: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13589,7 +13593,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:13592: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13596: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -13664,13 +13668,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}:13667: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13671: 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 13673 "configure"
++#line 13677 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13683,21 +13687,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13686: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13690: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13689: \$? = $ac_status" >&5
++  echo "$as_me:13693: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13692: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13696: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13695: \$? = $ac_status" >&5
++  echo "$as_me:13699: \$? = $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}:13700: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13704: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -13739,7 +13743,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13742: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:13746: 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
+@@ -13777,7 +13781,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13780 "configure"
++#line 13784 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13789,16 +13793,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13792: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13796: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13795: \$? = $ac_status" >&5
++  echo "$as_me:13799: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13798: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13802: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13801: \$? = $ac_status" >&5
++  echo "$as_me:13805: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13815,7 +13819,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}:13818: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:13822: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -13851,7 +13855,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}:13854: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:13858: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -13883,14 +13887,14 @@
+ 	fi
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:13886: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:13890: 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 13893 "configure"
++#line 13897 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13908,23 +13912,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13911: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13915: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13914: \$? = $ac_status" >&5
++  echo "$as_me:13918: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13917: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13921: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13920: \$? = $ac_status" >&5
++  echo "$as_me:13924: \$? = $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 13927 "configure"
++#line 13931 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13943,16 +13947,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13946: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13950: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13949: \$? = $ac_status" >&5
++  echo "$as_me:13953: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13952: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13956: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13955: \$? = $ac_status" >&5
++  echo "$as_me:13959: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -13964,7 +13968,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13967: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:13971: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -13982,14 +13986,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:13985: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:13989: 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 13992 "configure"
++#line 13996 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14007,23 +14011,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14010: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14014: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14013: \$? = $ac_status" >&5
++  echo "$as_me:14017: \$? = $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:14020: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14019: \$? = $ac_status" >&5
++  echo "$as_me:14023: \$? = $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 14026 "configure"
++#line 14030 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14042,16 +14046,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14045: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14049: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14048: \$? = $ac_status" >&5
++  echo "$as_me:14052: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14051: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14055: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14054: \$? = $ac_status" >&5
++  echo "$as_me:14058: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -14063,7 +14067,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14066: result: $cf_cv_wchar_t" >&5
++echo "$as_me:14070: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -14086,14 +14090,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:14089: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:14093: 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 14096 "configure"
++#line 14100 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14111,23 +14115,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14114: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14118: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14117: \$? = $ac_status" >&5
++  echo "$as_me:14121: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14120: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14124: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14123: \$? = $ac_status" >&5
++  echo "$as_me:14127: \$? = $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 14130 "configure"
++#line 14134 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14146,16 +14150,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14149: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14153: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14152: \$? = $ac_status" >&5
++  echo "$as_me:14156: \$? = $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:14159: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14158: \$? = $ac_status" >&5
++  echo "$as_me:14162: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -14167,7 +14171,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14170: result: $cf_cv_wint_t" >&5
++echo "$as_me:14174: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -14199,7 +14203,7 @@
+ fi
+ 
+ ###   use option --disable-lp64 to allow long chtype
+-echo "$as_me:14202: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:14206: 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.
+@@ -14209,7 +14213,7 @@
+ else
+   with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:14212: result: $with_lp64" >&5
++echo "$as_me:14216: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+ 
+ if test "x$with_lp64" = xyes ; then
+@@ -14225,7 +14229,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:14228: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:14232: 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
+@@ -14237,7 +14241,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 14240 "configure"
++#line 14244 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14257,16 +14261,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14260: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14264: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14263: \$? = $ac_status" >&5
++  echo "$as_me:14267: \$? = $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:14270: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14269: \$? = $ac_status" >&5
++  echo "$as_me:14273: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14276,16 +14280,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14279: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14283: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14282: \$? = $ac_status" >&5
++  echo "$as_me:14286: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14285: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14289: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14288: \$? = $ac_status" >&5
++  echo "$as_me:14292: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -14299,13 +14303,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:14302: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:14306: 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:14308: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:14312: 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
+@@ -14313,7 +14317,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14316 "configure"
++#line 14320 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14333,16 +14337,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14336: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14340: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14339: \$? = $ac_status" >&5
++  echo "$as_me:14343: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14342: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14346: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14345: \$? = $ac_status" >&5
++  echo "$as_me:14349: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14351,7 +14355,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14354 "configure"
++#line 14358 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -14372,16 +14376,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14375: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14379: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14378: \$? = $ac_status" >&5
++  echo "$as_me:14382: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14381: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14385: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14384: \$? = $ac_status" >&5
++  echo "$as_me:14388: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -14392,7 +14396,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14395: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:14399: 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
+ 
+@@ -14402,7 +14406,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:14405: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:14409: 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
+@@ -14410,7 +14414,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14413 "configure"
++#line 14417 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14430,16 +14434,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14433: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14437: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14436: \$? = $ac_status" >&5
++  echo "$as_me:14440: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14439: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14443: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14442: \$? = $ac_status" >&5
++  echo "$as_me:14446: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14448,7 +14452,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14451 "configure"
++#line 14455 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -14469,16 +14473,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14472: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14476: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14475: \$? = $ac_status" >&5
++  echo "$as_me:14479: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14478: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14482: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14481: \$? = $ac_status" >&5
++  echo "$as_me:14485: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -14489,7 +14493,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14492: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:14496: 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
+ 
+@@ -14502,7 +14506,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:14505: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:14509: 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
+@@ -14510,7 +14514,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14513 "configure"
++#line 14517 "configure"
+ #include "confdefs.h"
+ #include 
+     #include 
+@@ -14525,16 +14529,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14528: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14532: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14531: \$? = $ac_status" >&5
++  echo "$as_me:14535: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14534: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14538: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14537: \$? = $ac_status" >&5
++  echo "$as_me:14541: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14543,7 +14547,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14546 "configure"
++#line 14550 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -14559,16 +14563,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14562: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14566: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14565: \$? = $ac_status" >&5
++  echo "$as_me:14569: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14568: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14572: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14571: \$? = $ac_status" >&5
++  echo "$as_me:14575: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -14579,7 +14583,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14582: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:14586: 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
+ 
+@@ -14593,13 +14597,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:14596: checking for fseeko" >&5
++echo "$as_me:14600: 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 14602 "configure"
++#line 14606 "configure"
+ #include "confdefs.h"
+ #include 
+                              #include 
+@@ -14613,16 +14617,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14616: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14620: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14619: \$? = $ac_status" >&5
++  echo "$as_me:14623: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14622: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14626: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14625: \$? = $ac_status" >&5
++  echo "$as_me:14629: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -14632,7 +14636,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14635: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:14639: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -14671,14 +14675,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:14674: checking whether to use struct dirent64" >&5
++	echo "$as_me:14678: 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 14681 "configure"
++#line 14685 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -14705,16 +14709,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14708: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14712: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14711: \$? = $ac_status" >&5
++  echo "$as_me:14715: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14714: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14718: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14717: \$? = $ac_status" >&5
++  echo "$as_me:14721: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -14725,7 +14729,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14728: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:14732: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -14735,7 +14739,7 @@
+ 	fi
+ 
+ ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:14738: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:14742: 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.
+@@ -14745,14 +14749,14 @@
+ else
+   with_tparm_varargs=yes
+ fi;
+-echo "$as_me:14748: result: $with_tparm_varargs" >&5
++echo "$as_me:14752: 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:14755: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:14759: 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.
+@@ -14762,14 +14766,14 @@
+ else
+   with_tic_depends=yes
+ fi;
+-echo "$as_me:14765: result: $with_tic_depends" >&5
++echo "$as_me:14769: 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:14772: checking if you want to enable wattr* macros" >&5
++echo "$as_me:14776: 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.
+@@ -14781,15 +14785,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ 	NCURSES_WATTR_MACROS=0
+-	echo "$as_me:14784: result: no" >&5
++	echo "$as_me:14788: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ else
+ 	NCURSES_WATTR_MACROS=1
+-	echo "$as_me:14788: result: yes" >&5
++	echo "$as_me:14792: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ fi
+ 
+-echo "$as_me:14792: checking for X11 rgb file" >&5
++echo "$as_me:14796: 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.
+@@ -14851,7 +14855,7 @@
+ 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:14854: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:14858: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14859,7 +14863,7 @@
+ 
+ fi
+ 
+-echo "$as_me:14862: result: $RGB_PATH" >&5
++echo "$as_me:14866: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:14881: 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.
+@@ -14884,17 +14888,17 @@
+ else
+   NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:14887: result: $NCURSES_BOOL" >&5
++echo "$as_me:14891: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ case x$NCURSES_BOOL in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14891: error: expected a type name for bool" >&5
++	{ { echo "$as_me:14895: error: expected a type name for bool" >&5
+ echo "$as_me: error: expected a type name for bool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+-echo "$as_me:14897: checking for alternate terminal capabilities file" >&5
++echo "$as_me:14901: 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.
+@@ -14906,16 +14910,16 @@
+ fi;
+ if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
+ then
+-	{ echo "$as_me:14909: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
++	{ echo "$as_me:14913: 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:14913: result: $TERMINFO_CAPS" >&5
++echo "$as_me:14917: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+ 
+ ###   use option --with-chtype to override chtype's type
+ 
+-echo "$as_me:14918: checking for type of chtype" >&5
++echo "$as_me:14922: 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.
+@@ -14925,11 +14929,11 @@
+ else
+   NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:14928: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:14932: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ case x$NCURSES_CHTYPE in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14932: error: expected a type name for chtype" >&5
++	{ { echo "$as_me:14936: error: expected a type name for chtype" >&5
+ echo "$as_me: error: expected a type name for chtype" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14937,7 +14941,7 @@
+ 
+ ###   use option --with-ospeed to override ospeed's type
+ 
+-echo "$as_me:14940: checking for type of ospeed" >&5
++echo "$as_me:14944: 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.
+@@ -14947,11 +14951,11 @@
+ else
+   NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:14950: result: $NCURSES_OSPEED" >&5
++echo "$as_me:14954: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ case x$NCURSES_OSPEED in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14954: error: expected a type name for ospeed" >&5
++	{ { echo "$as_me:14958: error: expected a type name for ospeed" >&5
+ echo "$as_me: error: expected a type name for ospeed" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14959,7 +14963,7 @@
+ 
+ ###   use option --with-mmask-t to override mmask_t's type
+ 
+-echo "$as_me:14962: checking for type of mmask-t" >&5
++echo "$as_me:14966: 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.
+@@ -14969,18 +14973,18 @@
+ else
+   NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:14972: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:14976: result: $NCURSES_MMASK_T" >&5
+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+ case x$NCURSES_MMASK_T in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14976: error: expected a type name for mmask-t" >&5
++	{ { echo "$as_me:14980: error: expected a type name for mmask-t" >&5
+ echo "$as_me: error: expected a type name for mmask-t" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ ###   use option --with-ccharw-max to override CCHARW_MAX size
+-echo "$as_me:14983: checking for size CCHARW_MAX" >&5
++echo "$as_me:14987: 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.
+@@ -14990,16 +14994,16 @@
+ else
+   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
+ fi;
+-echo "$as_me:14993: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:14997: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+ 
+-echo "$as_me:14996: checking for signed char" >&5
++echo "$as_me:15000: 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 15002 "configure"
++#line 15006 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15014,16 +15018,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15017: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15021: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15020: \$? = $ac_status" >&5
++  echo "$as_me:15024: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15023: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15027: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15026: \$? = $ac_status" >&5
++  echo "$as_me:15030: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -15033,10 +15037,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15036: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:15040: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:15039: checking size of signed char" >&5
++echo "$as_me:15043: 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
+@@ -15045,7 +15049,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15048 "configure"
++#line 15052 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15057,21 +15061,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15060: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15064: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15063: \$? = $ac_status" >&5
++  echo "$as_me:15067: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15066: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15070: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15069: \$? = $ac_status" >&5
++  echo "$as_me:15073: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15074 "configure"
++#line 15078 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15083,16 +15087,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15086: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15090: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15089: \$? = $ac_status" >&5
++  echo "$as_me:15093: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15092: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15096: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15095: \$? = $ac_status" >&5
++  echo "$as_me:15099: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -15108,7 +15112,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15111 "configure"
++#line 15115 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15120,16 +15124,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15123: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15127: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15126: \$? = $ac_status" >&5
++  echo "$as_me:15130: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15129: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15133: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15132: \$? = $ac_status" >&5
++  echo "$as_me:15136: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -15145,7 +15149,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 15148 "configure"
++#line 15152 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15157,16 +15161,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15160: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15164: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15163: \$? = $ac_status" >&5
++  echo "$as_me:15167: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15166: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15170: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15169: \$? = $ac_status" >&5
++  echo "$as_me:15173: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -15179,12 +15183,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:15182: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:15186: 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 15187 "configure"
++#line 15191 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15200,15 +15204,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:15203: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15207: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15206: \$? = $ac_status" >&5
++  echo "$as_me:15210: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:15208: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15212: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15211: \$? = $ac_status" >&5
++  echo "$as_me:15215: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -15224,7 +15228,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:15227: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:15231: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:15242: checking whether to use signed chars for Boolean array in term.h" >&5
+ echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
+ 
+ # Check whether --enable-signed-char or --disable-signed-char was given.
+@@ -15245,13 +15249,13 @@
+ else
+   with_signed_char=$cf_dft_signed_char
+ fi;
+-echo "$as_me:15248: result: $with_signed_char" >&5
++echo "$as_me:15252: 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:15254: checking for type of tparm-arg" >&5
++echo "$as_me:15258: checking for type of tparm-arg" >&5
+ echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6
+ 
+ # Check whether --with-tparm-arg or --without-tparm-arg was given.
+@@ -15261,18 +15265,18 @@
+ else
+   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:15264: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:15268: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+ case x$NCURSES_TPARM_ARG in
+ (x|xyes|xno)
+-	{ { echo "$as_me:15268: error: expected a type name for tparm-arg" >&5
++	{ { echo "$as_me:15272: error: expected a type name for tparm-arg" >&5
+ echo "$as_me: error: expected a type name for tparm-arg" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:15275: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:15279: 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.
+@@ -15282,7 +15286,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:15285: result: $with_rcs_ids" >&5
++echo "$as_me:15289: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15291,7 +15295,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:15294: checking format of man-pages" >&5
++echo "$as_me:15298: 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.
+@@ -15382,10 +15386,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:15385: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:15389: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+-	{ echo "$as_me:15388: WARNING: Unexpected manpage-format $cf_unknown" >&5
++	{ echo "$as_me:15392: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+ 
+@@ -15426,7 +15430,7 @@
+ esac
+ done
+ 
+-echo "$as_me:15429: checking for manpage renaming" >&5
++echo "$as_me:15433: 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.
+@@ -15455,15 +15459,15 @@
+ elif test "$MANPAGE_RENAMES" = no ; then
+ 	:
+ elif test ! -f "$MANPAGE_RENAMES" ; then
+-	{ { echo "$as_me:15458: error: not a filename: $MANPAGE_RENAMES" >&5
++	{ { echo "$as_me:15462: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-echo "$as_me:15463: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:15467: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+ 
+-echo "$as_me:15466: checking if manpage aliases will be installed" >&5
++echo "$as_me:15470: 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.
+@@ -15474,7 +15478,7 @@
+   MANPAGE_ALIASES=yes
+ fi;
+ 
+-echo "$as_me:15477: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:15481: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+ 
+ case "x$LN_S" in
+@@ -15488,7 +15492,7 @@
+ 
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:15491: checking if manpage symlinks should be used" >&5
++echo "$as_me:15495: 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.
+@@ -15501,17 +15505,17 @@
+ 
+ if test "$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+-	{ echo "$as_me:15504: WARNING: cannot make symlinks" >&5
++	{ echo "$as_me:15508: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ 	MANPAGE_SYMLINKS=no
+ fi
+ fi
+ 
+-echo "$as_me:15510: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:15514: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+ 
+-echo "$as_me:15514: checking for manpage tbl" >&5
++echo "$as_me:15518: 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.
+@@ -15522,7 +15526,7 @@
+   MANPAGE_TBL=no
+ fi;
+ 
+-echo "$as_me:15525: result: $MANPAGE_TBL" >&5
++echo "$as_me:15529: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+ 
+ if test "$prefix" = "NONE" ; then
+@@ -15843,7 +15847,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15846: checking if you want to build with function extensions" >&5
++echo "$as_me:15850: 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.
+@@ -15853,7 +15857,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:15856: result: $with_ext_funcs" >&5
++echo "$as_me:15860: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -15910,7 +15914,7 @@
+ 	GENERATED_EXT_FUNCS=
+ fi
+ 
+-echo "$as_me:15913: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:15917: 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.
+@@ -15920,7 +15924,7 @@
+ else
+   with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:15923: result: $with_sp_funcs" >&5
++echo "$as_me:15927: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ 	NCURSES_SP_FUNCS=1
+@@ -15939,7 +15943,7 @@
+ 	GENERATED_SP_FUNCS=
+ fi
+ 
+-echo "$as_me:15942: checking if you want to build with terminal-driver" >&5
++echo "$as_me:15946: 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.
+@@ -15949,7 +15953,7 @@
+ else
+   with_term_driver=no
+ fi;
+-echo "$as_me:15952: result: $with_term_driver" >&5
++echo "$as_me:15956: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+ 
+@@ -15958,19 +15962,19 @@
+ EOF
+ 
+ 	if test "x$with_termlib" != xno ; then
+-		{ { echo "$as_me:15961: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:15965: 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:15966: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:15970: 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:15973: checking for extended use of const keyword" >&5
++echo "$as_me:15977: 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.
+@@ -15980,7 +15984,7 @@
+ else
+   with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:15983: result: $with_ext_const" >&5
++echo "$as_me:15987: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -15990,7 +15994,7 @@
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+ NCURSES_EXT_COLORS=0
+ NCURSES_RGB_COLORS=0
+-echo "$as_me:15993: checking if you want to use extended colors" >&5
++echo "$as_me:15997: 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.
+@@ -16000,11 +16004,11 @@
+ else
+   with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:16003: result: $with_ext_colors" >&5
++echo "$as_me:16007: result: $with_ext_colors" >&5
+ echo "${ECHO_T}$with_ext_colors" >&6
+ if test "x$with_ext_colors" = xyes ; then
+ 	if test "x$with_widec" != xyes ; then
+-		{ echo "$as_me:16007: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:16011: 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)
+@@ -16015,7 +16019,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16018: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16022: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16041,7 +16045,7 @@
+ 
+ 	fi
+ 	###   use option --enable-rgb-color to extend support for direct-color
+-	echo "$as_me:16044: checking if you want to extend support for direct color" >&5
++	echo "$as_me:16048: checking if you want to extend support for direct color" >&5
+ echo $ECHO_N "checking if you want to extend support for direct color... $ECHO_C" >&6
+ 
+ # Check whether --enable-rgb-color or --disable-rgb-color was given.
+@@ -16051,7 +16055,7 @@
+ else
+   with_rgb_color=$cf_dft_rgb_color
+ fi;
+-	echo "$as_me:16054: result: $with_rgb_color" >&5
++	echo "$as_me:16058: result: $with_rgb_color" >&5
+ echo "${ECHO_T}$with_rgb_color" >&6
+ 	if test "x$with_rgb_color" = xyes ; then
+ 		NCURSES_RGB_COLORS=1
+@@ -16064,7 +16068,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:16067: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:16071: 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.
+@@ -16074,7 +16078,7 @@
+ else
+   with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:16077: result: $with_ext_mouse" >&5
++echo "$as_me:16081: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ if test "x$with_ext_mouse" = xyes ; then
+ 
+@@ -16084,7 +16088,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16087: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16091: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16101,7 +16105,7 @@
+ fi
+ 
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:16104: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:16108: 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.
+@@ -16111,7 +16115,7 @@
+ else
+   with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:16114: result: $with_ext_putwin" >&5
++echo "$as_me:16118: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+ 
+@@ -16121,7 +16125,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16124: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:16128: 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.
+@@ -16131,7 +16135,7 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:16134: result: $with_no_padding" >&5
++echo "$as_me:16138: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16139,7 +16143,7 @@
+ EOF
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:16142: checking if you want SIGWINCH handler" >&5
++echo "$as_me:16146: 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.
+@@ -16149,7 +16153,7 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:16152: result: $with_sigwinch" >&5
++echo "$as_me:16156: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ if test "x$with_sigwinch" = xyes
+ then
+@@ -16164,7 +16168,7 @@
+ fi
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:16167: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:16171: 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.
+@@ -16174,7 +16178,7 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:16177: result: $with_tcap_names" >&5
++echo "$as_me:16181: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ if test "x$with_tcap_names" = xyes; then
+@@ -16188,7 +16192,7 @@
+ 
+ ##############################################################################
+ 
+-echo "$as_me:16191: checking if you want to link with the pthread library" >&5
++echo "$as_me:16195: 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.
+@@ -16198,27 +16202,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:16201: result: $with_pthread" >&5
++echo "$as_me:16205: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:16205: checking for pthread.h" >&5
++	echo "$as_me:16209: 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 16211 "configure"
++#line 16215 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16215: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16219: \"$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:16221: \$? = $ac_status" >&5
++  echo "$as_me:16225: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16237,7 +16241,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16240: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:16244: 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
+ 
+@@ -16247,7 +16251,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:16250: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:16254: 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"
+ 
+@@ -16268,7 +16272,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16271 "configure"
++#line 16275 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16285,16 +16289,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16288: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16292: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16291: \$? = $ac_status" >&5
++  echo "$as_me:16295: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16294: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16298: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16297: \$? = $ac_status" >&5
++  echo "$as_me:16301: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -16304,7 +16308,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:16307: result: $with_pthread" >&5
++	    echo "$as_me:16311: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -16332,7 +16336,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:16335: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:16339: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -16342,13 +16346,13 @@
+ fi
+ 
+ if test "x$with_pthread" != xno; then
+-	echo "$as_me:16345: checking for pthread_kill" >&5
++	echo "$as_me:16349: 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 16351 "configure"
++#line 16355 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16379,16 +16383,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16382: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16386: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16385: \$? = $ac_status" >&5
++  echo "$as_me:16389: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16388: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16392: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16391: \$? = $ac_status" >&5
++  echo "$as_me:16395: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_pthread_kill=yes
+ else
+@@ -16398,11 +16402,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16401: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:16405: 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:16405: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:16409: 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.
+@@ -16412,7 +16416,7 @@
+ else
+   use_pthreads_eintr=no
+ fi;
+-		echo "$as_me:16415: result: $use_pthreads_eintr" >&5
++		echo "$as_me:16419: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ 		if test "x$use_pthreads_eintr" = xyes ; then
+ 
+@@ -16423,7 +16427,7 @@
+ 		fi
+ fi
+ 
+-	echo "$as_me:16426: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:16430: 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.
+@@ -16433,18 +16437,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-	echo "$as_me:16436: result: $use_weak_symbols" >&5
++	echo "$as_me:16440: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ 	if test "x$use_weak_symbols" = xyes ; then
+ 
+-echo "$as_me:16440: checking if $CC supports weak symbols" >&5
++echo "$as_me:16444: 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 16447 "configure"
++#line 16451 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16470,16 +16474,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16473: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16477: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16476: \$? = $ac_status" >&5
++  echo "$as_me:16480: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16479: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16483: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16482: \$? = $ac_status" >&5
++  echo "$as_me:16486: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -16490,7 +16494,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16493: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:16497: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ 	else
+@@ -16540,7 +16544,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:16543: checking if you want reentrant code" >&5
++echo "$as_me:16547: 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.
+@@ -16550,7 +16554,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:16553: result: $with_reentrant" >&5
++echo "$as_me:16557: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -16639,7 +16643,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16642: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16646: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16651,7 +16655,7 @@
+ 	NCURSES_SIZE_T=$cf_dft_ordinate_type
+ fi
+ 
+-echo "$as_me:16654: checking whether curses library structures should be opaque" >&5
++echo "$as_me:16658: checking whether curses library structures should be opaque" >&5
+ echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
+@@ -16673,16 +16677,16 @@
+ 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16676: result: $enable_opaque_curses" >&5
++echo "$as_me:16680: 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:16681: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:16685: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:16685: checking whether form library structures should be opaque" >&5
++echo "$as_me:16689: checking whether form library structures should be opaque" >&5
+ echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-form or --disable-opaque-form was given.
+@@ -16699,10 +16703,10 @@
+ 	enable_opaque_form=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16702: result: $enable_opaque_form" >&5
++echo "$as_me:16706: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+ 
+-echo "$as_me:16705: checking whether menu library structures should be opaque" >&5
++echo "$as_me:16709: checking whether menu library structures should be opaque" >&5
+ echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
+@@ -16719,10 +16723,10 @@
+ 	enable_opaque_menu=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16722: result: $enable_opaque_menu" >&5
++echo "$as_me:16726: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+ 
+-echo "$as_me:16725: checking whether panel library structures should be opaque" >&5
++echo "$as_me:16729: checking whether panel library structures should be opaque" >&5
+ echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
+@@ -16739,7 +16743,7 @@
+ 	enable_opaque_panel=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16742: result: $enable_opaque_panel" >&5
++echo "$as_me:16746: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+ 
+ NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -16749,7 +16753,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:16752: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:16756: 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.
+@@ -16759,7 +16763,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:16762: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:16766: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -16772,7 +16776,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:16775: checking if you want all development code" >&5
++echo "$as_me:16779: 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.
+@@ -16782,11 +16786,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:16785: result: $with_develop" >&5
++echo "$as_me:16789: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###   use option --enable-check-size to detect screensize with CPR
+-echo "$as_me:16789: checking if you want to check screensize of serial terminals" >&5
++echo "$as_me:16793: checking if you want to check screensize of serial terminals" >&5
+ echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
+ 
+ # Check whether --enable-check-size or --disable-check-size was given.
+@@ -16796,7 +16800,7 @@
+ else
+   enable_check_size=$with_develop
+ fi;
+-echo "$as_me:16799: result: $enable_check_size" >&5
++echo "$as_me:16803: result: $enable_check_size" >&5
+ echo "${ECHO_T}$enable_check_size" >&6
+ test "x$enable_check_size" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16804,7 +16808,7 @@
+ EOF
+ 
+ ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
+-echo "$as_me:16807: checking if you want hard-tabs code" >&5
++echo "$as_me:16811: 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.
+@@ -16814,7 +16818,7 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:16817: result: $enable_hard_tabs" >&5
++echo "$as_me:16821: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16822,7 +16826,7 @@
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:16825: checking if you want limited support for xmc" >&5
++echo "$as_me:16829: 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.
+@@ -16832,7 +16836,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:16835: result: $enable_xmc_glitch" >&5
++echo "$as_me:16839: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16842,7 +16846,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:16845: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:16849: 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.
+@@ -16852,7 +16856,7 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:16855: result: $with_assumed_color" >&5
++echo "$as_me:16859: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16860,7 +16864,7 @@
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:16863: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:16867: 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.
+@@ -16870,7 +16874,7 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:16873: result: $with_hashmap" >&5
++echo "$as_me:16877: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16878,7 +16882,7 @@
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:16881: checking if you want colorfgbg code" >&5
++echo "$as_me:16885: 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.
+@@ -16888,7 +16892,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:16891: result: $with_colorfgbg" >&5
++echo "$as_me:16895: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16896,7 +16900,7 @@
+ EOF
+ 
+ ###   use option --enable-fvisibility to turn on use of gcc-specific feature
+-echo "$as_me:16899: checking if you want to use gcc -fvisibility option" >&5
++echo "$as_me:16903: 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.
+@@ -16906,14 +16910,14 @@
+ else
+   cf_with_fvisibility=no
+ fi;
+-echo "$as_me:16909: result: $cf_with_fvisibility" >&5
++echo "$as_me:16913: 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:16916: checking if $CC -fvisibility=hidden option works" >&5
++echo "$as_me:16920: 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
+@@ -16922,7 +16926,7 @@
+     cf_save_cflags="$CFLAGS"
+     CFLAGS="$CFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16925 "configure"
++#line 16929 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16938,16 +16942,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16941: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16945: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16944: \$? = $ac_status" >&5
++  echo "$as_me:16948: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16947: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16951: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16950: \$? = $ac_status" >&5
++  echo "$as_me:16954: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden=yes
+ else
+@@ -16959,7 +16963,7 @@
+     CFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16962: result: $cf_cv_fvisibility_hidden" >&5
++echo "$as_me:16966: result: $cf_cv_fvisibility_hidden" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
+ 
+ 	if test "x$cf_cv_fvisibility_hidden" = xyes
+@@ -17074,7 +17078,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:17077: checking if $CXX -fvisibility=hidden option works" >&5
++echo "$as_me:17081: 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
+@@ -17083,7 +17087,7 @@
+     cf_save_cflags="$CXXFLAGS"
+     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17086 "configure"
++#line 17090 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -17099,16 +17103,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17102: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17106: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17105: \$? = $ac_status" >&5
++  echo "$as_me:17109: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17108: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17112: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17111: \$? = $ac_status" >&5
++  echo "$as_me:17115: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden2=yes
+ else
+@@ -17120,7 +17124,7 @@
+     CXXFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:17123: result: $cf_cv_fvisibility_hidden2" >&5
++echo "$as_me:17127: result: $cf_cv_fvisibility_hidden2" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
+ 
+ 		if test "x$cf_cv_fvisibility_hidden2" = xyes
+@@ -17243,7 +17247,7 @@
+ fi
+ 
+ ###   use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:17246: checking if you want interop bindings" >&5
++echo "$as_me:17250: 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.
+@@ -17253,13 +17257,13 @@
+ else
+   with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:17256: result: $with_exp_interop" >&5
++echo "$as_me:17260: 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:17262: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:17266: 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.
+@@ -17269,13 +17273,13 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:17272: result: $with_safe_sprintf" >&5
++echo "$as_me:17276: 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:17278: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:17282: 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.
+@@ -17285,7 +17289,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:17288: result: $with_scroll_hints" >&5
++echo "$as_me:17292: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -17299,7 +17303,7 @@
+ 	NCURSES_WGETCH_EVENTS=0
+ 	;;
+ (*)
+-echo "$as_me:17302: checking if you want wgetch-events code" >&5
++echo "$as_me:17306: 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.
+@@ -17309,7 +17313,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:17312: result: $with_wgetch_events" >&5
++echo "$as_me:17316: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ if test "x$with_wgetch_events" = xyes ; then
+ 
+@@ -17325,7 +17329,7 @@
+ 
+ case "$cf_cv_system_name" in
+ (*mingw32*|*mingw64*|*-msvc*)
+-	echo "$as_me:17328: checking if you want experimental-Windows driver" >&5
++	echo "$as_me:17332: 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.
+@@ -17335,7 +17339,7 @@
+ else
+   with_exp_win32=no
+ fi;
+-	echo "$as_me:17338: result: $with_exp_win32" >&5
++	echo "$as_me:17342: result: $with_exp_win32" >&5
+ echo "${ECHO_T}$with_exp_win32" >&6
+ 	if test "x$with_exp_win32" = xyes
+ 	then
+@@ -17361,7 +17365,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:17364: checking if you want to see long compiling messages" >&5
++echo "$as_me:17368: 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.
+@@ -17395,7 +17399,7 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:17398: result: $enableval" >&5
++echo "$as_me:17402: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ if test "x$enable_echo" = xyes; then
+@@ -17408,7 +17412,7 @@
+ 
+ # --disable-stripping is used for debugging
+ 
+-echo "$as_me:17411: checking if you want to install stripped executables" >&5
++echo "$as_me:17415: 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.
+@@ -17425,7 +17429,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:17428: result: $enable_stripping" >&5
++echo "$as_me:17432: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -17436,7 +17440,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:17439: checking if install accepts -p option" >&5
++echo "$as_me:17443: 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
+@@ -17467,10 +17471,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:17470: result: $cf_cv_install_p" >&5
++echo "$as_me:17474: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:17473: checking if install needs to be told about ownership" >&5
++echo "$as_me:17477: 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)
+@@ -17481,7 +17485,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17484: result: $with_install_o" >&5
++echo "$as_me:17488: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -17492,7 +17496,7 @@
+ 
+ if test -n "$INSTALL_OPT_S"
+ then
+-	echo "$as_me:17495: checking if you want to specify strip-program" >&5
++	echo "$as_me:17499: checking if you want to specify strip-program" >&5
+ echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
+ 
+ # Check whether --with-strip-program or --without-strip-program was given.
+@@ -17502,11 +17506,11 @@
+ else
+   with_strip_program=no
+ fi;
+-	echo "$as_me:17505: result: $with_strip_program" >&5
++	echo "$as_me:17509: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ 	if test "$with_strip_program" != no
+ 	then
+-		echo "$as_me:17509: checking if strip-program is supported with this installer" >&5
++		echo "$as_me:17513: checking if strip-program is supported with this installer" >&5
+ echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
+ 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
+ 		check_install_strip=no
+@@ -17527,11 +17531,11 @@
+ 				done
+ 			fi
+ 		fi
+-		echo "$as_me:17530: result: $check_install_strip" >&5
++		echo "$as_me:17534: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ 		case "$check_install_strip" in
+ 		(no)
+-			{ echo "$as_me:17534: WARNING: $cf_install_program does not support strip program option" >&5
++			{ echo "$as_me:17538: WARNING: $cf_install_program does not support strip program option" >&5
+ echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
+ 			with_strip_program=no
+ 			;;
+@@ -17546,7 +17550,7 @@
+ 			chmod +x "$INSTALL"
+ 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
+ 
+-echo "${as_me:-configure}:17549: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:17553: testing created $INSTALL ..." 1>&5
+ 
+ 			;;
+ 		(option)
+@@ -17572,7 +17576,7 @@
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+ 
+-echo "$as_me:17575: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:17579: 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.
+@@ -17589,17 +17593,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:17592: result: $enable_stdnoreturn" >&5
++echo "$as_me:17596: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:17596: checking for C11 _Noreturn feature" >&5
++echo "$as_me:17600: 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 17602 "configure"
++#line 17606 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17615,16 +17619,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17618: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17622: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17621: \$? = $ac_status" >&5
++  echo "$as_me:17625: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17624: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17628: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17627: \$? = $ac_status" >&5
++  echo "$as_me:17631: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -17635,7 +17639,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17638: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:17642: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -17691,16 +17695,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17694: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17698: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17699: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17703: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17703: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17707: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17739,16 +17743,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17742: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17746: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17747: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17751: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17751: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17755: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17787,23 +17791,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17790: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17794: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17795: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17799: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17799: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17803: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:17806: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:17810: 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.
+@@ -17820,7 +17824,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:17823: result: $enable_warnings" >&5
++echo "$as_me:17827: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -17844,7 +17848,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17847 "configure"
++#line 17851 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17859,26 +17863,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17862: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17866: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17865: \$? = $ac_status" >&5
++  echo "$as_me:17869: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17868: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17872: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17871: \$? = $ac_status" >&5
++  echo "$as_me:17875: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:17874: checking for X11/Xt const-feature" >&5
++echo "$as_me:17878: 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 17881 "configure"
++#line 17885 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -17896,16 +17900,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17899: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17903: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17902: \$? = $ac_status" >&5
++  echo "$as_me:17906: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17905: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17909: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17908: \$? = $ac_status" >&5
++  echo "$as_me:17912: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -17920,7 +17924,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17923: result: $cf_cv_const_x_string" >&5
++echo "$as_me:17927: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -17949,7 +17953,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:17972: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -17981,12 +17985,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17984: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17988: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17987: \$? = $ac_status" >&5
++  echo "$as_me:17991: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17989: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17993: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -17994,7 +17998,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:17997: checking for $CC warning options..." >&5
++	{ echo "$as_me:18001: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -18017,12 +18021,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:18020: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18024: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18023: \$? = $ac_status" >&5
++  echo "$as_me:18027: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18025: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18029: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -18030,7 +18034,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:18033: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:18037: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -18040,7 +18044,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:18043: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:18047: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -18073,10 +18077,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:18076: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:18080: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -18126,12 +18130,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:18129: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18133: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18132: \$? = $ac_status" >&5
++  echo "$as_me:18136: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18134: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:18138: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -18203,12 +18207,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:18206: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:18210: 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 18211 "configure"
++#line 18215 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18225,16 +18229,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18228: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18232: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18231: \$? = $ac_status" >&5
++  echo "$as_me:18235: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18234: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18238: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18237: \$? = $ac_status" >&5
++  echo "$as_me:18241: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -18245,7 +18249,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:18248: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:18252: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -18254,11 +18258,11 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:18257: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:18261: 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 18261 "configure"
++#line 18265 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18275,16 +18279,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18278: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18282: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18281: \$? = $ac_status" >&5
++  echo "$as_me:18285: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18284: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18288: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18287: \$? = $ac_status" >&5
++  echo "$as_me:18291: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_CPLUSPLUS=yes
+ 
+@@ -18294,7 +18298,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:18297: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:18301: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -18303,30 +18307,30 @@
+ if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:18306: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:18310: 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:18313: checking version of $CC" >&5
++	echo "$as_me:18317: 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:18317: result: $CLANG_VERSION" >&5
++	echo "$as_me:18321: 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:18324: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:18328: 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 18329 "configure"
++#line 18333 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -18340,16 +18344,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18343: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18347: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18346: \$? = $ac_status" >&5
++  echo "$as_me:18350: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18349: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18353: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18352: \$? = $ac_status" >&5
++  echo "$as_me:18356: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -18360,13 +18364,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:18363: result: $cf_clang_optok" >&5
++		echo "$as_me:18367: 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}:18369: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:18373: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -18383,7 +18387,7 @@
+ ac_main_return="return"
+ 
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:18408: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -18418,12 +18422,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:18421: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18425: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18424: \$? = $ac_status" >&5
++  echo "$as_me:18428: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18426: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18430: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -18432,7 +18436,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:18435: checking for $CXX warning options..." >&5
++	{ echo "$as_me:18439: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -18462,16 +18466,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:18465: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18469: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18468: \$? = $ac_status" >&5
++  echo "$as_me:18472: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18470: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18474: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:18474: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18478: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -18489,7 +18493,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:18492: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:18496: 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.
+@@ -18499,7 +18503,7 @@
+ else
+   enable_string_hacks=no
+ fi;
+-echo "$as_me:18502: result: $enable_string_hacks" >&5
++echo "$as_me:18506: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+ 
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -18508,15 +18512,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:18511: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:18515: 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:18513: checking for strlcat" >&5
++	echo "$as_me:18517: 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 18519 "configure"
++#line 18523 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18547,16 +18551,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18550: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18554: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18553: \$? = $ac_status" >&5
++  echo "$as_me:18557: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18556: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18560: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18559: \$? = $ac_status" >&5
++  echo "$as_me:18563: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -18566,7 +18570,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18569: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:18573: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+ 
+@@ -18576,7 +18580,7 @@
+ 
+ else
+ 
+-		echo "$as_me:18579: checking for strlcat in -lbsd" >&5
++		echo "$as_me:18583: 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
+@@ -18584,7 +18588,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18587 "configure"
++#line 18591 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18603,16 +18607,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18606: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18610: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18609: \$? = $ac_status" >&5
++  echo "$as_me:18613: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18612: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18616: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18615: \$? = $ac_status" >&5
++  echo "$as_me:18619: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -18623,7 +18627,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18626: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:18630: 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
+ 
+@@ -18646,23 +18650,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18649: checking for $ac_header" >&5
++echo "$as_me:18653: 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 18655 "configure"
++#line 18659 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18659: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18663: \"$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:18665: \$? = $ac_status" >&5
++  echo "$as_me:18669: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18681,7 +18685,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18684: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18688: 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:18709: 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 18711 "configure"
++#line 18715 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18739,16 +18743,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18742: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18746: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18745: \$? = $ac_status" >&5
++  echo "$as_me:18749: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18748: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18752: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18751: \$? = $ac_status" >&5
++  echo "$as_me:18755: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -18758,7 +18762,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18761: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:18765: 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:18778: 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.
+@@ -18781,7 +18785,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:18784: result: $with_assertions" >&5
++echo "$as_me:18788: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -18797,7 +18801,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:18800: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:18804: 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.
+@@ -18819,7 +18823,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:18822: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:18826: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18933,23 +18937,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:18936: checking for dmalloc.h" >&5
++	echo "$as_me:18940: 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 18942 "configure"
++#line 18946 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:18946: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18950: \"$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:18952: \$? = $ac_status" >&5
++  echo "$as_me:18956: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18968,11 +18972,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18971: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:18975: 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:18975: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:18979: 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
+@@ -18980,7 +18984,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18983 "configure"
++#line 18987 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18999,16 +19003,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19002: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19006: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19005: \$? = $ac_status" >&5
++  echo "$as_me:19009: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19008: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19012: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19011: \$? = $ac_status" >&5
++  echo "$as_me:19015: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -19019,7 +19023,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19022: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:19026: 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:19041: 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.
+@@ -19056,7 +19060,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:19059: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:19063: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19170,23 +19174,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:19173: checking for dbmalloc.h" >&5
++	echo "$as_me:19177: 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 19179 "configure"
++#line 19183 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:19183: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:19187: \"$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:19189: \$? = $ac_status" >&5
++  echo "$as_me:19193: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19205,11 +19209,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:19208: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:19212: 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:19212: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:19216: 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
+@@ -19217,7 +19221,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19220 "configure"
++#line 19224 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19236,16 +19240,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19239: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19243: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19242: \$? = $ac_status" >&5
++  echo "$as_me:19246: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19245: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19249: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19248: \$? = $ac_status" >&5
++  echo "$as_me:19252: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -19256,7 +19260,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19259: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:19263: 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:19278: 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.
+@@ -19293,7 +19297,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:19296: result: ${with_valgrind:-no}" >&5
++echo "$as_me:19300: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19406,7 +19410,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19409: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:19413: 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.
+@@ -19417,7 +19421,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:19420: result: $with_no_leaks" >&5
++echo "$as_me:19424: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -19469,7 +19473,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19472: checking whether to add trace feature to all models" >&5
++echo "$as_me:19476: 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.
+@@ -19479,7 +19483,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:19482: result: $cf_with_trace" >&5
++echo "$as_me:19486: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -19499,7 +19503,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:19502: checking if we want to use GNAT projects" >&5
++echo "$as_me:19506: 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.
+@@ -19516,7 +19520,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:19519: result: $enable_gnat_projects" >&5
++echo "$as_me:19523: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -19529,14 +19533,14 @@
+ 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+ 	fi
+ 
+-echo "$as_me:19532: checking if ssp library is needed" >&5
++echo "$as_me:19536: 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 19539 "configure"
++#line 19543 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19553,16 +19557,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19556: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19560: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19559: \$? = $ac_status" >&5
++  echo "$as_me:19563: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19562: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19566: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19565: \$? = $ac_status" >&5
++  echo "$as_me:19569: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -19572,7 +19576,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19575 "configure"
++#line 19579 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19589,16 +19593,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19592: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19596: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19595: \$? = $ac_status" >&5
++  echo "$as_me:19599: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19598: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19602: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19601: \$? = $ac_status" >&5
++  echo "$as_me:19605: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -19612,7 +19616,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19615: result: $cf_cv_need_libssp" >&5
++echo "$as_me:19619: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -19641,14 +19645,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19644: checking if -lm needed for math functions" >&5
++echo "$as_me:19648: 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 19651 "configure"
++#line 19655 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19664,16 +19668,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19667: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19671: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19670: \$? = $ac_status" >&5
++  echo "$as_me:19674: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19673: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19677: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19676: \$? = $ac_status" >&5
++  echo "$as_me:19680: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -19683,7 +19687,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19686: result: $cf_cv_need_libm" >&5
++echo "$as_me:19690: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ 
+ if test "$cf_cv_need_libm" = yes
+@@ -19691,14 +19695,14 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lm"
+-	echo "$as_me:19694: checking if -lm is available for math functions" >&5
++	echo "$as_me:19698: checking if -lm is available for math functions" >&5
+ echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
+ if test "${cf_cv_have_libm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19701 "configure"
++#line 19705 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19714,16 +19718,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19717: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19721: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19720: \$? = $ac_status" >&5
++  echo "$as_me:19724: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19723: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19727: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19726: \$? = $ac_status" >&5
++  echo "$as_me:19730: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_libm=yes
+ else
+@@ -19733,7 +19737,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19736: result: $cf_cv_have_libm" >&5
++echo "$as_me:19740: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ 	LIBS="$cf_save_LIBS"
+ 
+@@ -19755,13 +19759,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:19758: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:19762: 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 19764 "configure"
++#line 19768 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -19777,16 +19781,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19780: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19784: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19783: \$? = $ac_status" >&5
++  echo "$as_me:19787: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19786: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19790: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19789: \$? = $ac_status" >&5
++  echo "$as_me:19793: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -19796,7 +19800,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19799: result: $ac_cv_header_time" >&5
++echo "$as_me:19803: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -19811,7 +19815,7 @@
+ case "$host_os" in
+ (mingw*)
+ 	# -lsystre -ltre -lintl -liconv
+-	echo "$as_me:19814: checking for regcomp in -lsystre" >&5
++	echo "$as_me:19818: 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
+@@ -19819,7 +19823,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsystre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19822 "configure"
++#line 19826 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19838,16 +19842,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19841: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19845: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19844: \$? = $ac_status" >&5
++  echo "$as_me:19848: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19847: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19851: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19850: \$? = $ac_status" >&5
++  echo "$as_me:19854: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_systre_regcomp=yes
+ else
+@@ -19858,11 +19862,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19861: result: $ac_cv_lib_systre_regcomp" >&5
++echo "$as_me:19865: 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:19865: checking for libiconv_open in -liconv" >&5
++		echo "$as_me:19869: 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
+@@ -19870,7 +19874,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19873 "configure"
++#line 19877 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19889,16 +19893,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19892: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19896: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19895: \$? = $ac_status" >&5
++  echo "$as_me:19899: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19898: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19902: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19901: \$? = $ac_status" >&5
++  echo "$as_me:19905: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_iconv_libiconv_open=yes
+ else
+@@ -19909,7 +19913,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19912: result: $ac_cv_lib_iconv_libiconv_open" >&5
++echo "$as_me:19916: 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
+ 
+@@ -19931,7 +19935,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19934: checking for libintl_gettext in -lintl" >&5
++		echo "$as_me:19938: 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
+@@ -19939,7 +19943,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19942 "configure"
++#line 19946 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19958,16 +19962,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19961: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19965: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19964: \$? = $ac_status" >&5
++  echo "$as_me:19968: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19967: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19971: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19970: \$? = $ac_status" >&5
++  echo "$as_me:19974: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_intl_libintl_gettext=yes
+ else
+@@ -19978,7 +19982,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19981: result: $ac_cv_lib_intl_libintl_gettext" >&5
++echo "$as_me:19985: 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
+ 
+@@ -20000,7 +20004,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:20003: checking for tre_regcomp in -ltre" >&5
++		echo "$as_me:20007: 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
+@@ -20008,7 +20012,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20011 "configure"
++#line 20015 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20027,16 +20031,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20030: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20034: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20033: \$? = $ac_status" >&5
++  echo "$as_me:20037: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20036: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20040: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20039: \$? = $ac_status" >&5
++  echo "$as_me:20043: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_tre_tre_regcomp=yes
+ else
+@@ -20047,7 +20051,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20050: result: $ac_cv_lib_tre_tre_regcomp" >&5
++echo "$as_me:20054: 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
+ 
+@@ -20089,7 +20093,7 @@
+ 
+ else
+ 
+-		echo "$as_me:20092: checking for regcomp in -lgnurx" >&5
++		echo "$as_me:20096: 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
+@@ -20097,7 +20101,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgnurx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20100 "configure"
++#line 20104 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20116,16 +20120,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20119: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20123: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20122: \$? = $ac_status" >&5
++  echo "$as_me:20126: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20125: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20129: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20128: \$? = $ac_status" >&5
++  echo "$as_me:20132: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gnurx_regcomp=yes
+ else
+@@ -20136,7 +20140,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20139: result: $ac_cv_lib_gnurx_regcomp" >&5
++echo "$as_me:20143: 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
+ 
+@@ -20164,13 +20168,13 @@
+ 	;;
+ (*)
+ 	cf_regex_libs="regex re"
+-	echo "$as_me:20167: checking for regcomp" >&5
++	echo "$as_me:20171: 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 20173 "configure"
++#line 20177 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20201,16 +20205,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20204: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20208: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20207: \$? = $ac_status" >&5
++  echo "$as_me:20211: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20210: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20214: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20213: \$? = $ac_status" >&5
++  echo "$as_me:20217: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -20220,7 +20224,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20223: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:20227: 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
+@@ -20229,7 +20233,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:20232: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:20236: 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
+@@ -20237,7 +20241,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20240 "configure"
++#line 20244 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20256,16 +20260,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20259: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20263: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20262: \$? = $ac_status" >&5
++  echo "$as_me:20266: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20265: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20269: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20268: \$? = $ac_status" >&5
++  echo "$as_me:20272: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -20276,7 +20280,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20279: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:20283: 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
+ 
+@@ -20308,13 +20312,13 @@
+ esac
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:20311: checking for compile" >&5
++	echo "$as_me:20315: 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 20317 "configure"
++#line 20321 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20345,16 +20349,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20348: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20352: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20351: \$? = $ac_status" >&5
++  echo "$as_me:20355: \$? = $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:20358: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20357: \$? = $ac_status" >&5
++  echo "$as_me:20361: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -20364,13 +20368,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20367: result: $ac_cv_func_compile" >&5
++echo "$as_me:20371: 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:20373: checking for compile in -lgen" >&5
++		echo "$as_me:20377: 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
+@@ -20378,7 +20382,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20381 "configure"
++#line 20385 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20397,16 +20401,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20400: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20404: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20403: \$? = $ac_status" >&5
++  echo "$as_me:20407: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20406: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20410: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20409: \$? = $ac_status" >&5
++  echo "$as_me:20413: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -20417,7 +20421,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20420: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:20424: 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
+ 
+@@ -20445,11 +20449,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:20448: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:20452: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:20452: checking for regular-expression headers" >&5
++echo "$as_me:20456: 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
+@@ -20461,7 +20465,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20464 "configure"
++#line 20468 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -20478,16 +20482,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20481: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20485: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20484: \$? = $ac_status" >&5
++  echo "$as_me:20488: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20487: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20491: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20490: \$? = $ac_status" >&5
++  echo "$as_me:20494: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20504,7 +20508,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20507 "configure"
++#line 20511 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -20525,16 +20529,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20528: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20532: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20531: \$? = $ac_status" >&5
++  echo "$as_me:20535: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20534: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20538: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20537: \$? = $ac_status" >&5
++  echo "$as_me:20541: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20550,11 +20554,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:20553: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:20557: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case "$cf_cv_regex_hdrs" in
+-	(no)		{ echo "$as_me:20557: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:20561: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -20594,23 +20598,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20597: checking for $ac_header" >&5
++echo "$as_me:20601: 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 20603 "configure"
++#line 20607 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20607: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20611: \"$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:20613: \$? = $ac_status" >&5
++  echo "$as_me:20617: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20629,7 +20633,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20632: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20636: 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:20649: 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 20651 "configure"
++#line 20655 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20655: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20659: \"$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:20661: \$? = $ac_status" >&5
++  echo "$as_me:20665: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20677,7 +20681,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20680: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20684: 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:20694: 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
+@@ -20697,7 +20701,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20700 "configure"
++#line 20704 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20710,16 +20714,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20713: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20717: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20716: \$? = $ac_status" >&5
++  echo "$as_me:20720: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20719: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20723: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20722: \$? = $ac_status" >&5
++  echo "$as_me:20726: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -20731,7 +20735,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20734: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20738: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -20748,14 +20752,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20751: checking if external environ is declared" >&5
++echo "$as_me:20755: 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 20758 "configure"
++#line 20762 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -20768,16 +20772,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20771: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20775: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20774: \$? = $ac_status" >&5
++  echo "$as_me:20778: \$? = $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:20781: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20780: \$? = $ac_status" >&5
++  echo "$as_me:20784: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_environ=yes
+ else
+@@ -20788,7 +20792,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20791: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20795: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+ 
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20803,14 +20807,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:20806: checking if external environ exists" >&5
++echo "$as_me:20810: 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 20813 "configure"
++#line 20817 "configure"
+ #include "confdefs.h"
+ 
+ #undef environ
+@@ -20825,16 +20829,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20828: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20832: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20831: \$? = $ac_status" >&5
++  echo "$as_me:20835: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20834: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20838: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20837: \$? = $ac_status" >&5
++  echo "$as_me:20841: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_environ=yes
+ else
+@@ -20845,7 +20849,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20848: result: $cf_cv_have_environ" >&5
++echo "$as_me:20852: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+ 
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20858,13 +20862,13 @@
+ 
+ fi
+ 
+-echo "$as_me:20861: checking for getenv" >&5
++echo "$as_me:20865: 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 20867 "configure"
++#line 20871 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20895,16 +20899,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20898: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20902: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20901: \$? = $ac_status" >&5
++  echo "$as_me:20905: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20904: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20908: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20907: \$? = $ac_status" >&5
++  echo "$as_me:20911: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_getenv=yes
+ else
+@@ -20914,19 +20918,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20917: result: $ac_cv_func_getenv" >&5
++echo "$as_me:20921: 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:20923: checking for $ac_func" >&5
++echo "$as_me:20927: 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 20929 "configure"
++#line 20933 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20957,16 +20961,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20960: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20964: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20963: \$? = $ac_status" >&5
++  echo "$as_me:20967: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20966: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20970: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20969: \$? = $ac_status" >&5
++  echo "$as_me:20973: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -20976,7 +20980,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20979: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:20983: 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:20993: 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
+@@ -20996,7 +21000,7 @@
+   cf_cv_consistent_getenv=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20999 "configure"
++#line 21003 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21101,15 +21105,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21104: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21108: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21107: \$? = $ac_status" >&5
++  echo "$as_me:21111: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21109: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21113: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21112: \$? = $ac_status" >&5
++  echo "$as_me:21116: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_consistent_getenv=yes
+ else
+@@ -21122,7 +21126,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:21125: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:21129: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+ 
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -21137,18 +21141,18 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ 	test "x$cf_with_trace" = xyes
+ then
+-	{ echo "$as_me:21140: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++	{ echo "$as_me:21144: 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:21144: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:21148: 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 21151 "configure"
++#line 21155 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21168,16 +21172,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21171: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21175: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21174: \$? = $ac_status" >&5
++  echo "$as_me:21178: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21177: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21181: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21180: \$? = $ac_status" >&5
++  echo "$as_me:21184: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -21189,7 +21193,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21192: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:21196: 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
+@@ -21204,13 +21208,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:21207: checking for an ANSI C-conforming const" >&5
++echo "$as_me:21211: 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 21213 "configure"
++#line 21217 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21272,16 +21276,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21275: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21279: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21278: \$? = $ac_status" >&5
++  echo "$as_me:21282: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21281: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21285: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21284: \$? = $ac_status" >&5
++  echo "$as_me:21288: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -21291,7 +21295,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21294: result: $ac_cv_c_const" >&5
++echo "$as_me:21298: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -21301,7 +21305,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21304: checking for inline" >&5
++echo "$as_me:21308: 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
+@@ -21309,7 +21313,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21312 "configure"
++#line 21316 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo (void) {return 0; }
+@@ -21318,16 +21322,16 @@
+ 
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21321: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21325: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21324: \$? = $ac_status" >&5
++  echo "$as_me:21328: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21327: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21331: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21330: \$? = $ac_status" >&5
++  echo "$as_me:21334: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -21338,7 +21342,7 @@
+ done
+ 
+ fi
+-echo "$as_me:21341: result: $ac_cv_c_inline" >&5
++echo "$as_me:21345: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -21364,7 +21368,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:21367: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:21371: 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
+@@ -21373,7 +21377,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21376 "configure"
++#line 21380 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -21385,16 +21389,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21388: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21392: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21391: \$? = $ac_status" >&5
++  echo "$as_me:21395: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21394: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21398: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21397: \$? = $ac_status" >&5
++  echo "$as_me:21401: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -21406,7 +21410,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:21409: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:21413: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -21512,7 +21516,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:21515: checking for signal global datatype" >&5
++echo "$as_me:21519: 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
+@@ -21524,7 +21528,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21527 "configure"
++#line 21531 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21548,16 +21552,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21551: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21555: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21554: \$? = $ac_status" >&5
++  echo "$as_me:21558: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21557: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21561: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21560: \$? = $ac_status" >&5
++  echo "$as_me:21564: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21571,7 +21575,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21574: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21578: 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:21587: 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
+@@ -21590,7 +21594,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21593 "configure"
++#line 21597 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21625,15 +21629,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21628: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21632: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21631: \$? = $ac_status" >&5
++  echo "$as_me:21635: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21633: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21637: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21636: \$? = $ac_status" >&5
++  echo "$as_me:21640: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21648,7 +21652,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21651: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21655: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:21667: 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 21670 "configure"
++#line 21674 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21679,16 +21683,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21682: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21686: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21685: \$? = $ac_status" >&5
++  echo "$as_me:21689: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21688: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21692: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21691: \$? = $ac_status" >&5
++  echo "$as_me:21695: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -21700,7 +21704,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21703: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21707: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -21716,14 +21720,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:21719: checking if external errno is declared" >&5
++echo "$as_me:21723: 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 21726 "configure"
++#line 21730 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21737,16 +21741,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21740: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21744: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21743: \$? = $ac_status" >&5
++  echo "$as_me:21747: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21746: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21750: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21749: \$? = $ac_status" >&5
++  echo "$as_me:21753: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -21757,7 +21761,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21760: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21764: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21772,14 +21776,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:21775: checking if external errno exists" >&5
++echo "$as_me:21779: 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 21782 "configure"
++#line 21786 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -21794,16 +21798,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21797: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21801: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21800: \$? = $ac_status" >&5
++  echo "$as_me:21804: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21803: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21807: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21806: \$? = $ac_status" >&5
++  echo "$as_me:21810: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -21814,7 +21818,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21817: result: $cf_cv_have_errno" >&5
++echo "$as_me:21821: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21827,7 +21831,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21830: checking if data-only library module links" >&5
++echo "$as_me:21834: 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
+@@ -21835,20 +21839,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:21845: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21844: \$? = $ac_status" >&5
++  echo "$as_me:21848: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+ 		mv conftest.$OBJEXT data.$OBJEXT && \
+ 		( $AR $ARFLAGS conftest.a data.$OBJEXT ) 2>&5 1>/dev/null
+ 	fi
+ 	rm -f conftest.$ac_ext data.$OBJEXT
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:21872: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21871: \$? = $ac_status" >&5
++  echo "$as_me:21875: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.$OBJEXT func.$OBJEXT && \
+ 		( $AR $ARFLAGS conftest.a func.$OBJEXT ) 2>&5 1>/dev/null
+@@ -21881,7 +21885,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21884 "configure"
++#line 21888 "configure"
+ #include "confdefs.h"
+ 
+ 	extern int testfunc(void);
+@@ -21892,15 +21896,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21895: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21899: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21898: \$? = $ac_status" >&5
++  echo "$as_me:21902: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21900: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21904: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21903: \$? = $ac_status" >&5
++  echo "$as_me:21907: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -21915,7 +21919,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21918: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21922: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21930,13 +21934,13 @@
+ ###	Checks for library functions.
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:21933: checking for clock_gettime" >&5
++echo "$as_me:21937: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21939 "configure"
++#line 21943 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21967,16 +21971,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21970: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21974: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21973: \$? = $ac_status" >&5
++  echo "$as_me:21977: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21976: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21980: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21979: \$? = $ac_status" >&5
++  echo "$as_me:21983: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -21986,12 +21990,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21989: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:21993: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:21994: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:21998: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21999,7 +22003,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22002 "configure"
++#line 22006 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22018,16 +22022,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22021: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22025: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22024: \$? = $ac_status" >&5
++  echo "$as_me:22028: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22027: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22031: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22030: \$? = $ac_status" >&5
++  echo "$as_me:22034: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -22038,7 +22042,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22041: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:22045: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -22050,14 +22054,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:22053: checking if clock_gettime links" >&5
++echo "$as_me:22057: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22060 "configure"
++#line 22064 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22075,16 +22079,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22078: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22082: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22081: \$? = $ac_status" >&5
++  echo "$as_me:22085: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22084: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22088: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22087: \$? = $ac_status" >&5
++  echo "$as_me:22091: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -22095,7 +22099,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22098: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:22102: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -22109,13 +22113,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:22112: checking for gettimeofday" >&5
++echo "$as_me:22116: 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 22118 "configure"
++#line 22122 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22146,16 +22150,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22149: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22153: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22152: \$? = $ac_status" >&5
++  echo "$as_me:22156: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22155: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22159: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22158: \$? = $ac_status" >&5
++  echo "$as_me:22162: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -22165,7 +22169,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22168: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:22172: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -22175,7 +22179,7 @@
+ 
+ else
+ 
+-echo "$as_me:22178: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:22182: 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
+@@ -22183,7 +22187,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22186 "configure"
++#line 22190 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22202,16 +22206,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22205: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22209: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22208: \$? = $ac_status" >&5
++  echo "$as_me:22212: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22211: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22215: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22214: \$? = $ac_status" >&5
++  echo "$as_me:22218: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -22222,7 +22226,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22225: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:22229: 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
+ 
+@@ -22281,13 +22285,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:22284: checking for $ac_func" >&5
++echo "$as_me:22288: 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 22290 "configure"
++#line 22294 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22318,16 +22322,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22321: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22325: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22324: \$? = $ac_status" >&5
++  echo "$as_me:22328: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22327: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22331: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22330: \$? = $ac_status" >&5
++  echo "$as_me:22334: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -22337,7 +22341,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22340: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:22344: 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:22354: 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 22357 "configure"
++#line 22361 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22369,16 +22373,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22372: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22376: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22375: \$? = $ac_status" >&5
++  echo "$as_me:22379: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22378: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22382: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22381: \$? = $ac_status" >&5
++  echo "$as_me:22385: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_PATH_TTYS=yes
+ else
+@@ -22388,7 +22392,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22391: result: $cf_cv_PATH_TTYS" >&5
++echo "$as_me:22395: result: $cf_cv_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
+ 
+ if test $cf_cv_PATH_TTYS = no
+@@ -22410,7 +22414,7 @@
+ 
+ if test $cf_cv_PATH_TTYS != no
+ then
+-	echo "$as_me:22413: checking if _PATH_TTYS file exists" >&5
++	echo "$as_me:22417: 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
+@@ -22420,7 +22424,7 @@
+   cf_cv_have_PATH_TTYS=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22423 "configure"
++#line 22427 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22433,15 +22437,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22436: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22440: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22439: \$? = $ac_status" >&5
++  echo "$as_me:22443: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22441: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22445: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22444: \$? = $ac_status" >&5
++  echo "$as_me:22448: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_PATH_TTYS=yes
+ else
+@@ -22453,7 +22457,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22456: result: $cf_cv_have_PATH_TTYS" >&5
++echo "$as_me:22460: 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
+@@ -22465,14 +22469,14 @@
+ #define HAVE_PATH_TTYS 1
+ EOF
+ 
+-	echo "$as_me:22468: checking for getttynam" >&5
++	echo "$as_me:22472: 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 22475 "configure"
++#line 22479 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22484,16 +22488,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22487: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22491: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22490: \$? = $ac_status" >&5
++  echo "$as_me:22494: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22493: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22497: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22496: \$? = $ac_status" >&5
++  echo "$as_me:22500: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_getttynam=yes
+ else
+@@ -22503,7 +22507,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22506: result: $cf_cv_func_getttynam" >&5
++echo "$as_me:22510: 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
+@@ -22513,7 +22517,7 @@
+ 
+ if test "x$ac_cv_func_getopt" = xno && \
+    test "x$cf_with_progs$cf_with_tests" != xnono; then
+-	{ { echo "$as_me:22516: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:22520: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -22522,7 +22526,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:22525: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:22529: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -22535,14 +22539,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:22538: checking for terminal-capability database functions" >&5
++echo "$as_me:22542: 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 22545 "configure"
++#line 22549 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22562,16 +22566,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22565: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22569: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22568: \$? = $ac_status" >&5
++  echo "$as_me:22572: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22571: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22575: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22574: \$? = $ac_status" >&5
++  echo "$as_me:22578: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -22582,7 +22586,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22585: result: $cf_cv_cgetent" >&5
++echo "$as_me:22589: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -22592,14 +22596,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:22595: checking if cgetent uses const parameter" >&5
++echo "$as_me:22599: 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 22602 "configure"
++#line 22606 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -22622,16 +22626,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22625: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22629: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22628: \$? = $ac_status" >&5
++  echo "$as_me:22632: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22631: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22635: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22634: \$? = $ac_status" >&5
++  echo "$as_me:22638: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -22642,7 +22646,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22645: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:22649: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -22656,14 +22660,14 @@
+ 
+ fi
+ 
+-echo "$as_me:22659: checking for isascii" >&5
++echo "$as_me:22663: 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 22666 "configure"
++#line 22670 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22675,16 +22679,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22678: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22682: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22681: \$? = $ac_status" >&5
++  echo "$as_me:22685: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22684: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22688: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22687: \$? = $ac_status" >&5
++  echo "$as_me:22691: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -22695,7 +22699,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22698: result: $cf_cv_have_isascii" >&5
++echo "$as_me:22702: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -22703,10 +22707,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:22706: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:22710: 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 22709 "configure"
++#line 22713 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22720,16 +22724,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22723: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22727: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22726: \$? = $ac_status" >&5
++  echo "$as_me:22730: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22729: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22733: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22732: \$? = $ac_status" >&5
++  echo "$as_me:22736: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=no
+ else
+@@ -22737,7 +22741,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22740 "configure"
++#line 22744 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22752,16 +22756,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22755: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22759: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22758: \$? = $ac_status" >&5
++  echo "$as_me:22762: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22761: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22765: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22764: \$? = $ac_status" >&5
++  echo "$as_me:22768: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=yes
+ 
+@@ -22777,11 +22781,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:22780: result: $sigact_bad" >&5
++echo "$as_me:22784: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:22784: checking if nanosleep really works" >&5
++echo "$as_me:22788: 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
+@@ -22791,7 +22795,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22794 "configure"
++#line 22798 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22817,15 +22821,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22820: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22824: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22823: \$? = $ac_status" >&5
++  echo "$as_me:22827: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22825: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22829: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22828: \$? = $ac_status" >&5
++  echo "$as_me:22832: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -22837,7 +22841,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22840: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:22844: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -22854,23 +22858,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22857: checking for $ac_header" >&5
++echo "$as_me:22861: 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 22863 "configure"
++#line 22867 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22867: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22871: \"$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:22873: \$? = $ac_status" >&5
++  echo "$as_me:22877: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22889,7 +22893,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22892: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22896: 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:22913: 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 22912 "configure"
++#line 22916 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22921,16 +22925,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22924: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22928: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22927: \$? = $ac_status" >&5
++  echo "$as_me:22931: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22930: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22934: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22933: \$? = $ac_status" >&5
++  echo "$as_me:22937: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=no
+ else
+@@ -22938,7 +22942,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22941 "configure"
++#line 22945 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22952,16 +22956,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22955: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22959: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22958: \$? = $ac_status" >&5
++  echo "$as_me:22962: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22961: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22965: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22964: \$? = $ac_status" >&5
++  echo "$as_me:22968: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=unknown
+ else
+@@ -22977,19 +22981,19 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:22980: result: $termios_bad" >&5
++	echo "$as_me:22984: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:22985: checking for tcgetattr" >&5
++echo "$as_me:22989: 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 22992 "configure"
++#line 22996 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23017,16 +23021,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23020: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23024: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23023: \$? = $ac_status" >&5
++  echo "$as_me:23027: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23026: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23030: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23029: \$? = $ac_status" >&5
++  echo "$as_me:23033: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -23036,21 +23040,21 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23039: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:23043: 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:23046: checking for vsscanf function or workaround" >&5
++echo "$as_me:23050: 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 23053 "configure"
++#line 23057 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23076,16 +23080,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23079: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23083: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23082: \$? = $ac_status" >&5
++  echo "$as_me:23086: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23085: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23089: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23088: \$? = $ac_status" >&5
++  echo "$as_me:23092: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -23093,7 +23097,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23096 "configure"
++#line 23100 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23115,16 +23119,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23118: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23122: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23121: \$? = $ac_status" >&5
++  echo "$as_me:23125: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23124: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23128: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23127: \$? = $ac_status" >&5
++  echo "$as_me:23131: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -23132,7 +23136,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23135 "configure"
++#line 23139 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23154,16 +23158,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23157: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23161: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23160: \$? = $ac_status" >&5
++  echo "$as_me:23164: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23163: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23167: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23166: \$? = $ac_status" >&5
++  echo "$as_me:23170: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -23178,7 +23182,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23181: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:23185: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case "$cf_cv_func_vsscanf" in
+@@ -23204,23 +23208,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:23207: checking for $ac_header" >&5
++echo "$as_me:23211: 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 23213 "configure"
++#line 23217 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23217: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23221: \"$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:23223: \$? = $ac_status" >&5
++  echo "$as_me:23227: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23239,7 +23243,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23242: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23246: 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:23256: 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
+@@ -23260,7 +23264,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23263 "configure"
++#line 23267 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23295,15 +23299,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23298: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23302: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23301: \$? = $ac_status" >&5
++  echo "$as_me:23305: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23303: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23307: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23306: \$? = $ac_status" >&5
++  echo "$as_me:23310: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -23318,16 +23322,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:23321: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:23325: 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:23324: checking for mkstemp" >&5
++	echo "$as_me:23328: 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 23330 "configure"
++#line 23334 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23358,16 +23362,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23361: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23365: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23364: \$? = $ac_status" >&5
++  echo "$as_me:23368: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23367: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23371: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23370: \$? = $ac_status" >&5
++  echo "$as_me:23374: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -23377,7 +23381,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23380: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:23384: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -23398,21 +23402,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:23401: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:23405: 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:23404: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:23408: 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:23410: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:23414: 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 23415 "configure"
++#line 23419 "configure"
+ #include "confdefs.h"
+ #include 
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -23429,15 +23433,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23432: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23436: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23435: \$? = $ac_status" >&5
++  echo "$as_me:23439: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23437: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23441: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23440: \$? = $ac_status" >&5
++  echo "$as_me:23444: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -23450,7 +23454,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:23453: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:23457: 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
+ 
+@@ -23461,13 +23465,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:23464: checking for intptr_t" >&5
++echo "$as_me:23468: 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 23470 "configure"
++#line 23474 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23482,16 +23486,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23485: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23489: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23488: \$? = $ac_status" >&5
++  echo "$as_me:23492: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23491: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23495: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23494: \$? = $ac_status" >&5
++  echo "$as_me:23498: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -23501,7 +23505,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23504: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:23508: 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
+   :
+@@ -23513,13 +23517,13 @@
+ 
+ fi
+ 
+-echo "$as_me:23516: checking for ssize_t" >&5
++echo "$as_me:23520: 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 23522 "configure"
++#line 23526 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23534,16 +23538,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23537: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23541: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23540: \$? = $ac_status" >&5
++  echo "$as_me:23544: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23543: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23547: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23546: \$? = $ac_status" >&5
++  echo "$as_me:23550: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -23553,7 +23557,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23556: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:23560: 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
+   :
+@@ -23565,14 +23569,14 @@
+ 
+ fi
+ 
+-echo "$as_me:23568: checking for type sigaction_t" >&5
++echo "$as_me:23572: 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 23575 "configure"
++#line 23579 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23585,16 +23589,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23588: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23592: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23591: \$? = $ac_status" >&5
++  echo "$as_me:23595: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23594: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23598: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23597: \$? = $ac_status" >&5
++  echo "$as_me:23601: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -23605,14 +23609,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:23608: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:23612: 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:23615: checking declaration of size-change" >&5
++echo "$as_me:23619: 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
+@@ -23633,7 +23637,7 @@
+ 
+ 	fi
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23636 "configure"
++#line 23640 "configure"
+ #include "confdefs.h"
+ #include 
+ #ifdef HAVE_TERMIOS_H
+@@ -23683,16 +23687,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23686: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23690: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23689: \$? = $ac_status" >&5
++  echo "$as_me:23693: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23692: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23696: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23695: \$? = $ac_status" >&5
++  echo "$as_me:23699: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -23711,7 +23715,7 @@
+ done
+ 
+ fi
+-echo "$as_me:23714: result: $cf_cv_sizechange" >&5
++echo "$as_me:23718: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -23729,13 +23733,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:23732: checking for memmove" >&5
++echo "$as_me:23736: 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 23738 "configure"
++#line 23742 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23766,16 +23770,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23769: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23773: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23772: \$? = $ac_status" >&5
++  echo "$as_me:23776: \$? = $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:23779: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23778: \$? = $ac_status" >&5
++  echo "$as_me:23782: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -23785,19 +23789,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23788: result: $ac_cv_func_memmove" >&5
++echo "$as_me:23792: 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:23794: checking for bcopy" >&5
++echo "$as_me:23798: 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 23800 "configure"
++#line 23804 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23828,16 +23832,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23831: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23835: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23834: \$? = $ac_status" >&5
++  echo "$as_me:23838: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23837: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23841: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23840: \$? = $ac_status" >&5
++  echo "$as_me:23844: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -23847,11 +23851,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23850: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:23854: 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:23854: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:23858: 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
+@@ -23861,7 +23865,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23864 "configure"
++#line 23868 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23877,15 +23881,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23880: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23884: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23883: \$? = $ac_status" >&5
++  echo "$as_me:23887: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23885: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23889: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23888: \$? = $ac_status" >&5
++  echo "$as_me:23892: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -23898,7 +23902,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:23901: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:23905: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -23925,13 +23929,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23928: checking for $ac_func" >&5
++echo "$as_me:23932: 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 23934 "configure"
++#line 23938 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23962,16 +23966,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23965: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23969: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23968: \$? = $ac_status" >&5
++  echo "$as_me:23972: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23971: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23975: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23974: \$? = $ac_status" >&5
++  echo "$as_me:23978: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23981,7 +23985,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23984: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23988: 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:23998: 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
+@@ -24001,7 +24005,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24004 "configure"
++#line 24008 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24054,15 +24058,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24057: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24061: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24060: \$? = $ac_status" >&5
++  echo "$as_me:24064: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24062: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24066: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24065: \$? = $ac_status" >&5
++  echo "$as_me:24069: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -24074,21 +24078,21 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24077: result: $cf_cv_working_poll" >&5
++echo "$as_me:24081: 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:24084: checking if MB_LEN_MAX is usable" >&5
++echo "$as_me:24088: checking if MB_LEN_MAX is usable" >&5
+ echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
+ if test "${cf_cv_mb_len_max+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24091 "configure"
++#line 24095 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24108,16 +24112,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24111: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24115: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24114: \$? = $ac_status" >&5
++  echo "$as_me:24118: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24117: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24121: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24120: \$? = $ac_status" >&5
++  echo "$as_me:24124: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mb_len_max=yes
+ else
+@@ -24127,7 +24131,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24130: result: $cf_cv_mb_len_max" >&5
++echo "$as_me:24134: result: $cf_cv_mb_len_max" >&5
+ echo "${ECHO_T}$cf_cv_mb_len_max" >&6
+ if test "$cf_cv_mb_len_max" = yes
+ then
+@@ -24137,18 +24141,18 @@
+ EOF
+ 
+ else
+-	{ echo "$as_me:24140: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
++	{ echo "$as_me:24144: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+ echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
+ fi
+ 
+-echo "$as_me:24144: checking for va_copy" >&5
++echo "$as_me:24148: 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 24151 "configure"
++#line 24155 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24165,16 +24169,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24168: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24172: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24171: \$? = $ac_status" >&5
++  echo "$as_me:24175: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24174: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24178: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24177: \$? = $ac_status" >&5
++  echo "$as_me:24181: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -24184,7 +24188,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24187: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:24191: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -24196,14 +24200,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:24199: checking for __va_copy" >&5
++echo "$as_me:24203: 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 24206 "configure"
++#line 24210 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24220,16 +24224,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24223: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24227: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24226: \$? = $ac_status" >&5
++  echo "$as_me:24230: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24229: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24233: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24232: \$? = $ac_status" >&5
++  echo "$as_me:24236: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -24239,7 +24243,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24242: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:24246: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -24251,14 +24255,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:24254: checking for __builtin_va_copy" >&5
++echo "$as_me:24258: 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 24261 "configure"
++#line 24265 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24275,16 +24279,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24278: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24282: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24281: \$? = $ac_status" >&5
++  echo "$as_me:24285: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24284: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24288: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24287: \$? = $ac_status" >&5
++  echo "$as_me:24291: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -24294,7 +24298,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24297: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:24301: 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 &&
+@@ -24312,14 +24316,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:24315: checking if we can simply copy va_list" >&5
++	echo "$as_me:24319: 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 24322 "configure"
++#line 24326 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24336,16 +24340,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24339: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24343: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24342: \$? = $ac_status" >&5
++  echo "$as_me:24346: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24345: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24349: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24348: \$? = $ac_status" >&5
++  echo "$as_me:24352: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -24355,19 +24359,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24358: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:24362: 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:24363: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:24367: 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 24370 "configure"
++#line 24374 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24384,16 +24388,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24387: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24391: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24390: \$? = $ac_status" >&5
++  echo "$as_me:24394: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24393: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24397: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24396: \$? = $ac_status" >&5
++  echo "$as_me:24400: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -24403,7 +24407,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24406: result: $cf_cv_array_va_list" >&5
++echo "$as_me:24410: 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
+@@ -24414,13 +24418,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:24417: checking for pid_t" >&5
++echo "$as_me:24421: 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 24423 "configure"
++#line 24427 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24435,16 +24439,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24438: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24442: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24441: \$? = $ac_status" >&5
++  echo "$as_me:24445: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24444: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24448: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24447: \$? = $ac_status" >&5
++  echo "$as_me:24451: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -24454,7 +24458,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24457: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:24461: 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
+   :
+@@ -24469,23 +24473,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:24472: checking for $ac_header" >&5
++echo "$as_me:24476: 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 24478 "configure"
++#line 24482 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:24482: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:24486: \"$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:24488: \$? = $ac_status" >&5
++  echo "$as_me:24492: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -24504,7 +24508,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24507: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:24511: 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:24524: 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 24526 "configure"
++#line 24530 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -24554,16 +24558,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24557: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24561: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24560: \$? = $ac_status" >&5
++  echo "$as_me:24564: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24563: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24567: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24566: \$? = $ac_status" >&5
++  echo "$as_me:24570: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -24573,7 +24577,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24576: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:24580: 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:24592: 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
+@@ -24608,15 +24612,15 @@
+       }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24611: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24615: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24614: \$? = $ac_status" >&5
++  echo "$as_me:24618: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24616: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24620: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24619: \$? = $ac_status" >&5
++  echo "$as_me:24623: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -24628,7 +24632,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24631: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:24635: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -24642,12 +24646,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:24645: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24649: 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:24650: checking for working vfork" >&5
++  echo "$as_me:24654: 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
+@@ -24656,7 +24660,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24659 "configure"
++#line 24663 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include 
+@@ -24749,15 +24753,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24752: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24756: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24755: \$? = $ac_status" >&5
++  echo "$as_me:24759: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24757: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24761: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24760: \$? = $ac_status" >&5
++  echo "$as_me:24764: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -24769,13 +24773,13 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24772: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:24776: 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:24778: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24782: 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
+ 
+@@ -24800,7 +24804,7 @@
+ 
+ fi
+ 
+-echo "$as_me:24803: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:24807: 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
+@@ -24810,7 +24814,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24813 "configure"
++#line 24817 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24845,15 +24849,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24848: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24852: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24851: \$? = $ac_status" >&5
++  echo "$as_me:24855: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24853: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24857: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24856: \$? = $ac_status" >&5
++  echo "$as_me:24860: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fopen_bin_r=yes
+ else
+@@ -24866,20 +24870,20 @@
+ fi
+ 
+ fi
+-echo "$as_me:24869: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:24873: 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
+ #define USE_FOPEN_BIN_R 1
+ EOF
+ 
+-	echo "$as_me:24876: checking for cc_t" >&5
++	echo "$as_me:24880: checking for cc_t" >&5
+ echo $ECHO_N "checking for cc_t... $ECHO_C" >&6
+ if test "${ac_cv_type_cc_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24882 "configure"
++#line 24886 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24897,16 +24901,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24900: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24904: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24903: \$? = $ac_status" >&5
++  echo "$as_me:24907: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24906: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24910: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24909: \$? = $ac_status" >&5
++  echo "$as_me:24913: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_cc_t=yes
+ else
+@@ -24916,7 +24920,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24919: result: $ac_cv_type_cc_t" >&5
++echo "$as_me:24923: result: $ac_cv_type_cc_t" >&5
+ echo "${ECHO_T}$ac_cv_type_cc_t" >&6
+ if test "$ac_cv_type_cc_t" = yes; then
+ 
+@@ -24926,13 +24930,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:24929: checking for speed_t" >&5
++	echo "$as_me:24933: checking for speed_t" >&5
+ echo $ECHO_N "checking for speed_t... $ECHO_C" >&6
+ if test "${ac_cv_type_speed_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24935 "configure"
++#line 24939 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24950,16 +24954,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24953: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24957: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24956: \$? = $ac_status" >&5
++  echo "$as_me:24960: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24959: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24963: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24962: \$? = $ac_status" >&5
++  echo "$as_me:24966: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_speed_t=yes
+ else
+@@ -24969,7 +24973,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24972: result: $ac_cv_type_speed_t" >&5
++echo "$as_me:24976: result: $ac_cv_type_speed_t" >&5
+ echo "${ECHO_T}$ac_cv_type_speed_t" >&6
+ if test "$ac_cv_type_speed_t" = yes; then
+ 
+@@ -24979,13 +24983,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:24982: checking for tcflag_t" >&5
++	echo "$as_me:24986: checking for tcflag_t" >&5
+ echo $ECHO_N "checking for tcflag_t... $ECHO_C" >&6
+ if test "${ac_cv_type_tcflag_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24988 "configure"
++#line 24992 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25003,16 +25007,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25006: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25010: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25009: \$? = $ac_status" >&5
++  echo "$as_me:25013: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25012: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25016: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25015: \$? = $ac_status" >&5
++  echo "$as_me:25019: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_tcflag_t=yes
+ else
+@@ -25022,7 +25026,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:25025: result: $ac_cv_type_tcflag_t" >&5
++echo "$as_me:25029: result: $ac_cv_type_tcflag_t" >&5
+ echo "${ECHO_T}$ac_cv_type_tcflag_t" >&6
+ if test "$ac_cv_type_tcflag_t" = yes; then
+ 
+@@ -25032,13 +25036,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:25035: checking for sigset_t" >&5
++	echo "$as_me:25039: checking for sigset_t" >&5
+ echo $ECHO_N "checking for sigset_t... $ECHO_C" >&6
+ if test "${ac_cv_type_sigset_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25041 "configure"
++#line 25045 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25056,16 +25060,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25059: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25063: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25062: \$? = $ac_status" >&5
++  echo "$as_me:25066: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25065: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25069: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25068: \$? = $ac_status" >&5
++  echo "$as_me:25072: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_sigset_t=yes
+ else
+@@ -25075,7 +25079,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:25078: result: $ac_cv_type_sigset_t" >&5
++echo "$as_me:25082: result: $ac_cv_type_sigset_t" >&5
+ echo "${ECHO_T}$ac_cv_type_sigset_t" >&6
+ if test "$ac_cv_type_sigset_t" = yes; then
+ 
+@@ -25087,7 +25091,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:25090: checking for openpty in -lutil" >&5
++echo "$as_me:25094: 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
+@@ -25095,7 +25099,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25098 "configure"
++#line 25102 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -25114,16 +25118,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25117: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25121: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25120: \$? = $ac_status" >&5
++  echo "$as_me:25124: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25123: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25127: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25126: \$? = $ac_status" >&5
++  echo "$as_me:25130: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -25134,7 +25138,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:25137: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:25141: 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
+@@ -25142,7 +25146,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:25145: checking for openpty header" >&5
++echo "$as_me:25149: 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
+@@ -25169,7 +25173,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25172 "configure"
++#line 25176 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -25187,16 +25191,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25190: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25194: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25193: \$? = $ac_status" >&5
++  echo "$as_me:25197: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25196: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25200: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25199: \$? = $ac_status" >&5
++  echo "$as_me:25203: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -25214,7 +25218,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:25217: result: $cf_cv_func_openpty" >&5
++echo "$as_me:25221: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -25287,7 +25291,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25290 "configure"
++#line 25294 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -25299,16 +25303,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25302: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25306: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25305: \$? = $ac_status" >&5
++  echo "$as_me:25309: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25308: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25312: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25311: \$? = $ac_status" >&5
++  echo "$as_me:25315: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25325,7 +25329,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}:25328: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25332: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25361,7 +25365,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}:25364: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25368: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25372,7 +25376,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:25375: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:25379: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -25444,7 +25448,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25447 "configure"
++#line 25451 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -25456,16 +25460,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25459: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25463: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25462: \$? = $ac_status" >&5
++  echo "$as_me:25466: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25465: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25469: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25468: \$? = $ac_status" >&5
++  echo "$as_me:25472: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25482,7 +25486,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}:25485: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25489: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25562,7 +25566,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}:25565: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25569: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25579,23 +25583,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:25582: checking for db.h" >&5
++echo "$as_me:25586: 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 25588 "configure"
++#line 25592 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:25592: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25596: \"$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:25598: \$? = $ac_status" >&5
++  echo "$as_me:25602: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -25614,11 +25618,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25617: result: $ac_cv_header_db_h" >&5
++echo "$as_me:25621: 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:25621: checking for version of db" >&5
++echo "$as_me:25625: 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
+@@ -25629,10 +25633,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:25632: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:25636: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25635 "configure"
++#line 25639 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25662,16 +25666,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25665: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25669: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25668: \$? = $ac_status" >&5
++  echo "$as_me:25672: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25671: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25675: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25674: \$? = $ac_status" >&5
++  echo "$as_me:25678: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -25685,16 +25689,16 @@
+ done
+ 
+ fi
+-echo "$as_me:25688: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:25692: 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:25692: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:25696: 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:25697: checking for db libraries" >&5
++echo "$as_me:25701: 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
+@@ -25724,10 +25728,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:25727: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:25731: testing checking for library $cf_db_libs ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25730 "configure"
++#line 25734 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25782,16 +25786,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25785: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25789: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25788: \$? = $ac_status" >&5
++  echo "$as_me:25792: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25791: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25795: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25794: \$? = $ac_status" >&5
++  echo "$as_me:25798: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -25811,11 +25815,11 @@
+ done
+ 
+ fi
+-echo "$as_me:25814: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:25818: 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:25818: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:25822: 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
+@@ -25841,7 +25845,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:25844: error: Cannot find db.h" >&5
++	{ { echo "$as_me:25848: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -25856,14 +25860,14 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:25859: checking if we can include stdbool.h" >&5
++echo "$as_me:25863: checking if we can include stdbool.h" >&5
+ echo $ECHO_N "checking if we can include stdbool.h... $ECHO_C" >&6
+ if test "${cf_cv_header_stdbool_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25866 "configure"
++#line 25870 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25878,23 +25882,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25881: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25885: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25884: \$? = $ac_status" >&5
++  echo "$as_me:25888: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25887: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25891: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25890: \$? = $ac_status" >&5
++  echo "$as_me:25894: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25897 "configure"
++#line 25901 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -25906,16 +25910,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25909: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25913: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25912: \$? = $ac_status" >&5
++  echo "$as_me:25916: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25915: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25919: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25918: \$? = $ac_status" >&5
++  echo "$as_me:25922: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=no
+ else
+@@ -25926,7 +25930,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:25929: result: $cf_cv_header_stdbool_h" >&5
++echo "$as_me:25933: result: $cf_cv_header_stdbool_h" >&5
+ echo "${ECHO_T}$cf_cv_header_stdbool_h" >&6
+ 
+ if test "$cf_cv_header_stdbool_h" = yes
+@@ -25934,14 +25938,14 @@
+ else	USE_STDBOOL_H=0
+ fi
+ 
+-echo "$as_me:25937: checking for builtin bool type" >&5
++echo "$as_me:25941: 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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25944 "configure"
++#line 25948 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25955,16 +25959,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25958: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25962: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25961: \$? = $ac_status" >&5
++  echo "$as_me:25965: \$? = $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:25968: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25967: \$? = $ac_status" >&5
++  echo "$as_me:25971: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cc_bool_type=yes
+ else
+@@ -25974,7 +25978,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:25977: result: $cf_cv_cc_bool_type" >&5
++echo "$as_me:25981: result: $cf_cv_cc_bool_type" >&5
+ echo "${ECHO_T}$cf_cv_cc_bool_type" >&6
+ 
+ if test "$cf_cv_cc_bool_type" = yes; then
+@@ -26001,10 +26005,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:26004: checking if we already have C++ library" >&5
++	echo "$as_me:26008: 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 26007 "configure"
++#line 26011 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -26018,16 +26022,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26021: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26025: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26024: \$? = $ac_status" >&5
++  echo "$as_me:26028: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26027: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26031: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26030: \$? = $ac_status" >&5
++  echo "$as_me:26034: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -26036,7 +26040,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-	echo "$as_me:26039: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:26043: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -26055,7 +26059,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:26058: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:26062: 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
+@@ -26081,7 +26085,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26084 "configure"
++#line 26088 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -26095,16 +26099,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26098: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26102: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26101: \$? = $ac_status" >&5
++  echo "$as_me:26105: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26104: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26108: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26107: \$? = $ac_status" >&5
++  echo "$as_me:26111: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -26116,7 +26120,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:26119: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:26123: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -26138,7 +26142,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:26141: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:26145: 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
+@@ -26153,15 +26157,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:26156: \"$ac_try\"") >&5
++if { (eval echo "$as_me:26160: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26159: \$? = $ac_status" >&5
++  echo "$as_me:26163: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:26161: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:26165: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26164: \$? = $ac_status" >&5
++  echo "$as_me:26168: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -26172,10 +26176,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+-  echo "$as_me:26175: result: yes" >&5
++  echo "$as_me:26179: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:26178: result: no" >&5
++  echo "$as_me:26182: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -26195,7 +26199,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:26198: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:26202: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -26216,7 +26220,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26219 "configure"
++#line 26223 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -26230,16 +26234,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26233: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26237: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26236: \$? = $ac_status" >&5
++  echo "$as_me:26240: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26239: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26243: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26242: \$? = $ac_status" >&5
++  echo "$as_me:26246: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -26276,7 +26280,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26279 "configure"
++#line 26283 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26290,16 +26294,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26293: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26297: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26296: \$? = $ac_status" >&5
++  echo "$as_me:26300: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26299: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26303: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26302: \$? = $ac_status" >&5
++  echo "$as_me:26306: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -26332,7 +26336,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	LIBS="$cf_save"
+-	echo "$as_me:26335: result: $cf_cxx_library" >&5
++	echo "$as_me:26339: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -26348,7 +26352,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:26351: checking how to run the C++ preprocessor" >&5
++echo "$as_me:26355: 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
+@@ -26365,18 +26369,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 26368 "configure"
++#line 26372 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26373: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26377: \"$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:26379: \$? = $ac_status" >&5
++  echo "$as_me:26383: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26399,17 +26403,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26402 "configure"
++#line 26406 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26406: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26410: \"$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:26412: \$? = $ac_status" >&5
++  echo "$as_me:26416: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26446,7 +26450,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:26449: result: $CXXCPP" >&5
++echo "$as_me:26453: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -26456,18 +26460,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 26459 "configure"
++#line 26463 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26464: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26468: \"$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:26470: \$? = $ac_status" >&5
++  echo "$as_me:26474: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26490,17 +26494,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26493 "configure"
++#line 26497 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26497: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26501: \"$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:26503: \$? = $ac_status" >&5
++  echo "$as_me:26507: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26528,7 +26532,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:26531: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:26535: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -26543,23 +26547,23 @@
+ for ac_header in new exception typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:26546: checking for $ac_header" >&5
++echo "$as_me:26550: 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 26552 "configure"
++#line 26556 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26556: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26560: \"$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:26562: \$? = $ac_status" >&5
++  echo "$as_me:26566: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26578,7 +26582,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26581: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26585: 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:26598: 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 26600 "configure"
++#line 26604 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26604: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26608: \"$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:26610: \$? = $ac_status" >&5
++  echo "$as_me:26614: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26626,7 +26630,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26629: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26633: 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:26644: 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 26643 "configure"
++#line 26647 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26657,16 +26661,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26660: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26664: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26663: \$? = $ac_status" >&5
++  echo "$as_me:26667: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26666: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26670: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26669: \$? = $ac_status" >&5
++  echo "$as_me:26673: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -26675,7 +26679,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:26678: result: $cf_iostream_namespace" >&5
++	echo "$as_me:26682: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -26686,14 +26690,14 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:26689: checking for builtin bool type" >&5
++echo "$as_me:26693: 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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26696 "configure"
++#line 26700 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26707,16 +26711,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26710: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26714: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26713: \$? = $ac_status" >&5
++  echo "$as_me:26717: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26716: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26720: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26719: \$? = $ac_status" >&5
++  echo "$as_me:26723: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_builtin_bool=yes
+ else
+@@ -26726,16 +26730,16 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26729: result: $cf_cv_builtin_bool" >&5
++echo "$as_me:26733: result: $cf_cv_builtin_bool" >&5
+ echo "${ECHO_T}$cf_cv_builtin_bool" >&6
+ 
+-echo "$as_me:26732: checking for bool" >&5
++echo "$as_me:26736: 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 26738 "configure"
++#line 26742 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26770,16 +26774,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26773: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26777: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26776: \$? = $ac_status" >&5
++  echo "$as_me:26780: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26779: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26783: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26782: \$? = $ac_status" >&5
++  echo "$as_me:26786: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -26789,10 +26793,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26792: result: $ac_cv_type_bool" >&5
++echo "$as_me:26796: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:26795: checking size of bool" >&5
++echo "$as_me:26799: 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
+@@ -26801,7 +26805,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26804 "configure"
++#line 26808 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26833,21 +26837,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26836: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26840: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26839: \$? = $ac_status" >&5
++  echo "$as_me:26843: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26842: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26846: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26845: \$? = $ac_status" >&5
++  echo "$as_me:26849: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26850 "configure"
++#line 26854 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26879,16 +26883,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26882: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26886: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26885: \$? = $ac_status" >&5
++  echo "$as_me:26889: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26888: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26892: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26891: \$? = $ac_status" >&5
++  echo "$as_me:26895: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -26904,7 +26908,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26907 "configure"
++#line 26911 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26936,16 +26940,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26939: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26943: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26942: \$? = $ac_status" >&5
++  echo "$as_me:26946: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26945: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26949: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26948: \$? = $ac_status" >&5
++  echo "$as_me:26952: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -26961,7 +26965,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 26964 "configure"
++#line 26968 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26993,16 +26997,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26996: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27000: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26999: \$? = $ac_status" >&5
++  echo "$as_me:27003: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27002: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27006: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27005: \$? = $ac_status" >&5
++  echo "$as_me:27009: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27015,12 +27019,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27018: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27022: 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 27023 "configure"
++#line 27027 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27056,15 +27060,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27059: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27063: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27062: \$? = $ac_status" >&5
++  echo "$as_me:27066: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27064: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27068: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27067: \$? = $ac_status" >&5
++  echo "$as_me:27071: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27080,13 +27084,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27083: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27087: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27093: 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
+@@ -27105,7 +27109,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27108 "configure"
++#line 27112 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27146,15 +27150,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27149: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27153: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27152: \$? = $ac_status" >&5
++  echo "$as_me:27156: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27154: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27158: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27157: \$? = $ac_status" >&5
++  echo "$as_me:27161: \$? = $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
+@@ -27171,19 +27175,19 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:27174: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:27178: 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:27181: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:27185: 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:27186: checking for special defines needed for etip.h" >&5
++echo "$as_me:27190: 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"
+@@ -27201,7 +27205,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 27204 "configure"
++#line 27208 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -27215,16 +27219,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27218: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27222: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27221: \$? = $ac_status" >&5
++  echo "$as_me:27225: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27224: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27228: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27227: \$? = $ac_status" >&5
++  echo "$as_me:27231: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:27252: result: ${cf_result:-(none)}" >&5
+ echo "${ECHO_T}${cf_result:-(none)}" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27253: checking if $CXX accepts override keyword" >&5
++echo "$as_me:27257: checking if $CXX accepts override keyword" >&5
+ echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
+ if test "${cf_cv_cpp_override+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27267,7 +27271,7 @@
+   cf_cv_cpp_override=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27270 "configure"
++#line 27274 "configure"
+ #include "confdefs.h"
+ 
+ class base
+@@ -27286,15 +27290,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27289: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27293: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27292: \$? = $ac_status" >&5
++  echo "$as_me:27296: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27294: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27298: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27297: \$? = $ac_status" >&5
++  echo "$as_me:27301: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_override=yes
+ else
+@@ -27313,7 +27317,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27316: result: $cf_cv_cpp_override" >&5
++echo "$as_me:27320: result: $cf_cv_cpp_override" >&5
+ echo "${ECHO_T}$cf_cv_cpp_override" >&6
+ fi
+ test "$cf_cv_cpp_override" = yes &&
+@@ -27322,7 +27326,7 @@
+ EOF
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27325: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:27329: 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
+@@ -27339,7 +27343,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27342 "configure"
++#line 27346 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -27358,15 +27362,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27361: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27365: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27364: \$? = $ac_status" >&5
++  echo "$as_me:27368: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27366: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27370: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27369: \$? = $ac_status" >&5
++  echo "$as_me:27373: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -27385,7 +27389,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27388: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:27392: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -27395,7 +27399,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:27398: checking if $CXX accepts static_cast" >&5
++echo "$as_me:27402: 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
+@@ -27409,7 +27413,7 @@
+ ac_main_return="return"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27412 "configure"
++#line 27416 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -27453,16 +27457,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27456: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27460: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27459: \$? = $ac_status" >&5
++  echo "$as_me:27463: \$? = $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:27466: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27465: \$? = $ac_status" >&5
++  echo "$as_me:27469: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -27480,7 +27484,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27483: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:27487: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -27528,13 +27532,13 @@
+ 		USE_STDBOOL_H=0
+ 	else
+ 
+-echo "$as_me:27531: checking for bool" >&5
++echo "$as_me:27535: 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 27537 "configure"
++#line 27541 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27569,16 +27573,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27572: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27576: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27575: \$? = $ac_status" >&5
++  echo "$as_me:27579: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27578: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27582: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27581: \$? = $ac_status" >&5
++  echo "$as_me:27585: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -27588,10 +27592,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27591: result: $ac_cv_type_bool" >&5
++echo "$as_me:27595: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:27594: checking size of bool" >&5
++echo "$as_me:27598: 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
+@@ -27600,7 +27604,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27603 "configure"
++#line 27607 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27632,21 +27636,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27635: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27639: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27638: \$? = $ac_status" >&5
++  echo "$as_me:27642: \$? = $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:27645: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27644: \$? = $ac_status" >&5
++  echo "$as_me:27648: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27649 "configure"
++#line 27653 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27678,16 +27682,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27681: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27685: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27684: \$? = $ac_status" >&5
++  echo "$as_me:27688: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27687: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27691: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27690: \$? = $ac_status" >&5
++  echo "$as_me:27694: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -27703,7 +27707,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27706 "configure"
++#line 27710 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27735,16 +27739,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27738: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27742: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27741: \$? = $ac_status" >&5
++  echo "$as_me:27745: \$? = $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:27748: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27747: \$? = $ac_status" >&5
++  echo "$as_me:27751: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27760,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 27763 "configure"
++#line 27767 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27792,16 +27796,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27795: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27799: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27798: \$? = $ac_status" >&5
++  echo "$as_me:27802: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27801: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27805: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27804: \$? = $ac_status" >&5
++  echo "$as_me:27808: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27814,12 +27818,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27817: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27821: 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 27822 "configure"
++#line 27826 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27855,15 +27859,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27858: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27862: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27861: \$? = $ac_status" >&5
++  echo "$as_me:27865: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27863: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27867: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27866: \$? = $ac_status" >&5
++  echo "$as_me:27870: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27879,13 +27883,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27882: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27886: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27892: 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
+@@ -27904,7 +27908,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27907 "configure"
++#line 27911 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27945,15 +27949,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27948: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27952: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27951: \$? = $ac_status" >&5
++  echo "$as_me:27955: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27953: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27957: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27956: \$? = $ac_status" >&5
++  echo "$as_me:27960: \$? = $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
+@@ -27970,14 +27974,14 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:27973: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:27977: 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:27980: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:27984: 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
+@@ -28008,7 +28012,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:28011: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:28015: 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
+@@ -28019,7 +28023,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:28022: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:28026: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -28036,10 +28040,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:28039: result: $ADAFLAGS" >&5
++	echo "$as_me:28043: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:28042: checking if GNATPREP supports -T option" >&5
++echo "$as_me:28046: 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
+@@ -28049,11 +28053,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:28052: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:28056: 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:28056: checking if GNAT supports generics" >&5
++echo "$as_me:28060: 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])
+@@ -28063,7 +28067,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:28066: result: $cf_gnat_generics" >&5
++echo "$as_me:28070: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -28075,7 +28079,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:28078: checking if GNAT supports SIGINT" >&5
++echo "$as_me:28082: 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
+@@ -28123,7 +28127,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:28126: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:28130: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -28136,7 +28140,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:28139: checking if GNAT supports project files" >&5
++echo "$as_me:28143: 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]*)
+@@ -28199,15 +28203,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:28202: result: $cf_gnat_projects" >&5
++echo "$as_me:28206: 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:28208: checking if GNAT supports libraries" >&5
++	echo "$as_me:28212: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:28210: result: $cf_gnat_libraries" >&5
++	echo "$as_me:28214: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -28227,7 +28231,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:28230: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:28234: 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
+@@ -28239,7 +28243,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:28242: checking for Ada95 compiler" >&5
++echo "$as_me:28246: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -28250,12 +28254,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:28253: result: $cf_ada_compiler" >&5
++echo "$as_me:28257: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:28258: checking for Ada95 include directory" >&5
++echo "$as_me:28262: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -28289,7 +28293,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28292: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28296: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28298,10 +28302,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:28301: result: $ADA_INCLUDE" >&5
++echo "$as_me:28305: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:28304: checking for Ada95 object directory" >&5
++echo "$as_me:28308: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -28335,7 +28339,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28338: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28342: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28344,10 +28348,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:28347: result: $ADA_OBJECTS" >&5
++echo "$as_me:28351: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:28350: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:28354: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -28368,11 +28372,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:28371: result: $with_ada_sharedlib" >&5
++echo "$as_me:28375: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+-	{ echo "$as_me:28375: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++	{ echo "$as_me:28379: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+ 
+@@ -28390,7 +28394,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:28393: checking for Ada95 curses library name" >&5
++echo "$as_me:28397: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -28406,7 +28410,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28409: result: $ADA_LIBNAME" >&5
++echo "$as_me:28413: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -28417,13 +28421,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:28420: checking for wchar_t" >&5
++	echo "$as_me:28424: 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 28426 "configure"
++#line 28430 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28438,16 +28442,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28441: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28445: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28444: \$? = $ac_status" >&5
++  echo "$as_me:28448: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28447: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28451: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28450: \$? = $ac_status" >&5
++  echo "$as_me:28454: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -28457,10 +28461,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:28460: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:28464: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:28463: checking size of wchar_t" >&5
++echo "$as_me:28467: 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
+@@ -28469,7 +28473,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28472 "configure"
++#line 28476 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28481,21 +28485,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28484: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28488: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28487: \$? = $ac_status" >&5
++  echo "$as_me:28491: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28490: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28494: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28493: \$? = $ac_status" >&5
++  echo "$as_me:28497: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28498 "configure"
++#line 28502 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28507,16 +28511,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28510: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28514: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28513: \$? = $ac_status" >&5
++  echo "$as_me:28517: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28516: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28520: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28519: \$? = $ac_status" >&5
++  echo "$as_me:28523: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -28532,7 +28536,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28535 "configure"
++#line 28539 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28544,16 +28548,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28547: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28551: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28550: \$? = $ac_status" >&5
++  echo "$as_me:28554: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28553: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28557: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28556: \$? = $ac_status" >&5
++  echo "$as_me:28560: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -28569,7 +28573,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 28572 "configure"
++#line 28576 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28581,16 +28585,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28584: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28588: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28587: \$? = $ac_status" >&5
++  echo "$as_me:28591: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28590: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28594: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28593: \$? = $ac_status" >&5
++  echo "$as_me:28597: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -28603,12 +28607,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:28606: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:28610: 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 28611 "configure"
++#line 28615 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28624,15 +28628,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:28627: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28631: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28630: \$? = $ac_status" >&5
++  echo "$as_me:28634: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:28632: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28636: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28635: \$? = $ac_status" >&5
++  echo "$as_me:28639: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -28648,7 +28652,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:28651: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:28655: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&6
+ 
+-echo "${as_me:-configure}:28664: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:28668: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -28679,7 +28683,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:28682: checking for library subsets" >&5
++echo "$as_me:28686: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -28733,7 +28737,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:28736: result: $LIB_SUBSETS" >&5
++echo "$as_me:28740: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -28764,7 +28768,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:28767: checking default library suffix" >&5
++echo "$as_me:28771: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28775,10 +28779,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:28778: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:28782: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:28781: checking default library-dependency suffix" >&5
++echo "$as_me:28785: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -28861,10 +28865,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:28864: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28868: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:28867: checking default object directory" >&5
++echo "$as_me:28871: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28880,11 +28884,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:28883: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28887: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28887: checking c++ library-dependency suffix" >&5
++echo "$as_me:28891: 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++)
+@@ -28977,7 +28981,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:28980: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:28984: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -29153,19 +29157,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:29156: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:29160: 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:29165: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:29169: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:29168: \$? = $ac_status" >&5
++  echo "$as_me:29172: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+ 		( $AR $ARFLAGS libconftest.a conftest.$OBJEXT ) 2>&5 1>/dev/null
+ 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
+@@ -29176,10 +29180,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 29179 "configure"
++#line 29183 "configure"
+ #include "confdefs.h"
+ 
+-#line 29182 "configure"
++#line 29186 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -29194,16 +29198,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:29197: \"$ac_link\"") >&5
++if { (eval echo "$as_me:29201: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:29200: \$? = $ac_status" >&5
++  echo "$as_me:29204: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:29203: \"$ac_try\"") >&5
++  { (eval echo "$as_me:29207: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:29206: \$? = $ac_status" >&5
++  echo "$as_me:29210: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -29226,7 +29230,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:29229: result: $cf_ldflags_static" >&5
++	echo "$as_me:29233: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test "$cf_ldflags_static" != yes
+@@ -29242,7 +29246,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29245: checking where we will install curses.h" >&5
++echo "$as_me:29249: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -29252,7 +29256,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:29255: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:29259: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -29260,7 +29264,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:29263: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:29267: 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
+@@ -29285,7 +29289,7 @@
+ 
+ # pkgsrc uses these
+ 
+-echo "$as_me:29288: checking for desired basename for form library" >&5
++echo "$as_me:29292: 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.
+@@ -29305,10 +29309,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29308: result: $FORM_NAME" >&5
++echo "$as_me:29312: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:29311: checking for desired basename for menu library" >&5
++echo "$as_me:29315: 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.
+@@ -29328,10 +29332,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29331: result: $MENU_NAME" >&5
++echo "$as_me:29335: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:29334: checking for desired basename for panel library" >&5
++echo "$as_me:29338: 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.
+@@ -29351,10 +29355,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29354: result: $PANEL_NAME" >&5
++echo "$as_me:29358: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:29357: checking for desired basename for cxx library" >&5
++echo "$as_me:29361: 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.
+@@ -29374,13 +29378,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29377: result: $CXX_NAME" >&5
++echo "$as_me:29381: 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:29383: checking for src modules" >&5
++echo "$as_me:29387: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -29439,7 +29443,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:29442: result: $cf_cv_src_modules" >&5
++echo "$as_me:29446: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -29600,7 +29604,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:29603: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:29607: 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//'`
+@@ -29611,7 +29615,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:29614: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
++echo "$as_me:29618: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -29627,7 +29631,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:29630: result: $PKG_CFLAGS" >&5
++echo "$as_me:29634: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ case "$cf_cv_system_name" in
+@@ -29699,7 +29703,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
+ 
+-echo "${as_me:-configure}:29702: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
++echo "${as_me:-configure}:29706: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+ 
+ fi
+ 
+@@ -29726,7 +29730,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:29729: checking for linker search path" >&5
++echo "$as_me:29733: 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
+@@ -29774,7 +29778,7 @@
+ 			cf_pathlist="$cf_pathlist /lib /usr/lib"
+ 			;;
+ 		(*)
+-			{ echo "$as_me:29777: WARNING: problem with Solaris architecture" >&5
++			{ echo "$as_me:29781: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ 			;;
+ 		esac
+@@ -29815,7 +29819,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:29818: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29822: 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'`
+@@ -29901,7 +29905,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29904: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29908: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -30082,7 +30086,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:30085: error: ambiguous option: $1
++    { { echo "$as_me:30089: 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;}
+@@ -30101,7 +30105,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:30104: error: unrecognized option: $1
++  -*) { { echo "$as_me:30108: 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;}
+@@ -30233,7 +30237,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:30236: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:30240: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -30763,7 +30767,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:30766: creating $ac_file" >&5
++    { echo "$as_me:30770: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -30781,7 +30785,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30784: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30788: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -30794,7 +30798,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30797: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30801: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30810,7 +30814,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:30813: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:30817: 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;}
+@@ -30819,7 +30823,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:30822: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:30826: 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;}
+@@ -30864,7 +30868,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:30867: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:30871: 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;}
+@@ -30875,7 +30879,7 @@
+     $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:30878: WARNING: Some variables may not be substituted:
++      { echo "$as_me:30882: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30924,7 +30928,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:30927: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:30931: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -30935,7 +30939,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30938: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30942: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -30948,7 +30952,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30951: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30955: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -31006,7 +31010,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:31009: $ac_file is unchanged" >&5
++      { echo "$as_me:31013: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -31393,7 +31397,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}:31396: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:31400: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: dist.mk
+Prereq:  1.1675 
+--- ncurses-6.5-20250628+/dist.mk	2025-06-28 08:49:47.000000000 +0000
++++ ncurses-6.5-20250705/dist.mk	2025-07-05 09:49:36.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1675 2025/06/28 08:49:47 tom Exp $
++# $Id: dist.mk,v 1.1676 2025/07/05 09:49:36 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 = 5
+-NCURSES_PATCH = 20250628
++NCURSES_PATCH = 20250705
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/curs_add_wch.3x.html
+--- ncurses-6.5-20250628+/doc/html/man/curs_add_wch.3x.html	2025-04-19 23:33:02.000000000 +0000
++++ ncurses-6.5-20250705/doc/html/man/curs_add_wch.3x.html	2025-07-05 13:12:24.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_add_wch.3x,v 1.115 2025/04/19 22:53:52 tom Exp @
++  * @Id: curs_add_wch.3x,v 1.117 2025/07/05 12:43:18 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_add_wch 3x 2025-04-19 ncurses 6.5 Library calls
++curs_add_wch 3x 2025-07-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                    curs_add_wch 3x 2025-04-19 ncurses 6.5 Library calls
                                                                                                                                                    
++
                                                                                                                                                    curs_add_wch 3x 2025-07-05 ncurses 6.5 Library calls
                                                                                                                                                    
+ 
                                                                                                                                                    + curs_add_wch(3x)                 Library calls                curs_add_wch(3x)
+ 
+@@ -175,10 +175,10 @@
+            Alter   the   tab   interval   with   the  TABSIZE  extension;  see
+            curs_variables(3x).
+ 
+-       If wch is any other nonprintable character, it is  drawn  in  printable
+-       form  using the same convention as wunctrl(3x).  Calling win_wch(3x) on
+-       the location of a nonprintable character does not return the  character
+-       itself, but its wunctrl(3x) representation.
++       If wch  is  any  other  nonprintable  character,  curses  draws  it  in
++       printable  form  using  the  same  convention  as wunctrl(3x).  Calling
++       win_wch(3x) on the location of a nonprintable character does not return
++       the character itself, but its wunctrl(3x) representation.
+ 
+        Adding  spacing characters with wadd_wch causes it to wrap at the right
+        margin of the window:
+@@ -473,7 +473,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-04-19                  curs_add_wch(3x)
++ncurses 6.5                       2025-07-05                  curs_add_wch(3x)
+ 
                                                                                                                                                    
+ 
                                                                                                                                                    
+ 
                                                                                                                                                      
+Index: doc/html/man/curs_addch.3x.html
+--- ncurses-6.5-20250628+/doc/html/man/curs_addch.3x.html	2025-04-26 20:32:39.000000000 +0000
++++ ncurses-6.5-20250705/doc/html/man/curs_addch.3x.html	2025-07-05 13:12:24.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addch.3x,v 1.137 2025/04/26 19:57:22 tom Exp @
++  * @Id: curs_addch.3x,v 1.139 2025/07/05 12:43:18 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_addch 3x 2025-04-26 ncurses 6.5 Library calls
++curs_addch 3x 2025-07-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                      curs_addch 3x 2025-04-26 ncurses 6.5 Library calls
                                                                                                                                                      
++
                                                                                                                                                      curs_addch 3x 2025-07-05 ncurses 6.5 Library calls
                                                                                                                                                      
+ 
                                                                                                                                                      + curs_addch(3x)                   Library calls                  curs_addch(3x)
+ 
+@@ -137,7 +137,7 @@
+            Alter  the  tab  interval   with   the   TABSIZE   extension;   see
+            curs_variables(3x).
+ 
+-       If  ch  is  any  other nonprintable character, it is drawn in printable
++       If ch is any other nonprintable character, curses draws it in printable
+        form using the same convention as unctrl(3x).  Calling winch(3x) on the
+        location  of  a  nonprintable  character  does not return the character
+        itself, but its unctrl(3x) representation.
+@@ -430,7 +430,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-04-26                    curs_addch(3x)
++ncurses 6.5                       2025-07-05                    curs_addch(3x)
+ 
                                                                                                                                                      
+ 
                                                                                                                                                      
+ 
                                                                                                                                                        
+Index: doc/html/man/curs_color.3x.html
+--- ncurses-6.5-20250628+/doc/html/man/curs_color.3x.html	2025-04-05 22:33:03.000000000 +0000
++++ ncurses-6.5-20250705/doc/html/man/curs_color.3x.html	2025-07-05 13:12:25.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_color.3x,v 1.118 2025/04/05 21:59:03 tom Exp @
++  * @Id: curs_color.3x,v 1.122 2025/07/05 12:45:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_color 3x 2025-04-05 ncurses 6.5 Library calls
++curs_color 3x 2025-07-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                        curs_color 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                        
++
                                                                                                                                                        curs_color 3x 2025-07-05 ncurses 6.5 Library calls
                                                                                                                                                        
+ 
                                                                                                                                                        + curs_color(3x)                   Library calls                  curs_color(3x)
+ 
+@@ -139,9 +139,7 @@
+        in an internal function called from waddch:
+ 
+        o   If the parameter passed to waddch is blank, and it uses the special
+-           color pair 0,
+-
+-           o   curses next checks the window attribute.
++           color pair 0, curses next checks the window attribute.
+ 
+            o   If the window attribute does not use color pair 0, curses  uses
+                the color pair from the window attribute.
+@@ -460,22 +458,23 @@
+        Several caveats apply to IBM PC-compatible machines of  the  80486  era
+        and earlier with CGA/EGA/VGA video.
+ 
+-       o   COLOR_YELLOW   is   actually   brown.    To   get  yellow,  combine
+-           COLOR_YELLOW with the A_BOLD attribute.
+-
+-       o   The A_BLINK attribute should in theory make the background  bright.
+-           This  often  fails  to  work, and even VGA controllers for which it
+-           mostly works, such as those from Paradise and compatibles,  do  the
++       o   COLOR_YELLOW  was  frequently converted, in the analog domain, to a
++           shade of brown if the intensity bit was not set.   To  get  yellow,
++           combine COLOR_YELLOW with the A_BOLD attribute.
++
++       o   The  A_BLINK attribute should in theory make the background bright.
++           This often fails to work, and even VGA  controllers  for  which  it
++           mostly  works,  such as those from Paradise and compatibles, do the
+            wrong thing when you try to set a bright "yellow" background -- you
+            get a blinking yellow foreground instead.
+ 
+-       o   Color RGB values are not configurable on  these  devices  (in  text
++       o   Color  RGB  values  are  not configurable on these devices (in text
+            mode).
+ 
+ 
+ 
                                                                                                                                                        EXTENSIONS
                                                                                                                                                        +-       The  functions  marked as extensions originated in ncurses, and are not
+-       found in SVr4 curses, 4.4BSD  curses,  or  any  other  previous  curses
++       The functions marked as extensions originated in ncurses, and  are  not
++       found  in  SVr4  curses,  4.4BSD  curses,  or any other previous curses
+        implementation.
+ 
+ 
+@@ -486,78 +485,78 @@
+        X/Open Curses Issue 4 describes these functions.  It specifies no error
+        conditions for them.
+ 
+-       ncurses  satisfies  X/Open  Curses's  minimum  maximums  for COLORS and
++       ncurses satisfies X/Open  Curses's  minimum  maximums  for  COLORS  and
+        COLOR_PAIRS.
+ 
+-       X/Open Curses does not specify a limit for the  number  of  colors  and
++       X/Open  Curses  does  not  specify a limit for the number of colors and
+        color pairs which a terminal can support.  However, in its use of short
+-       for the parameters, it carries over SVr4's  implementation  detail  for
+-       the  compiled  terminfo  database,  which  uses  signed 16-bit numbers.
++       for  the  parameters,  it carries over SVr4's implementation detail for
++       the compiled terminfo  database,  which  uses  signed  16-bit  numbers.
+        ncurses  provides  extended  versions  of  the  functions  using  short
+-       parameters,   allowing  applications  to  use  larger  color  and  pair
++       parameters,  allowing  applications  to  use  larger  color  and   pair
+        identifiers.
+ 
+-       SVr4 curses returns ERR from pair_content if its pair argument was  not
+-       initialized  using  init_pairs,  and from color_content if the terminal
++       SVr4  curses returns ERR from pair_content if its pair argument was not
++       initialized using init_pairs, and from color_content  if  the  terminal
+        does not support changing colors.  ncurses does neither.
+ 
+ 
+ 
                                                                                                                                                        HISTORY
                                                                                                                                                        +-       SVr3.2 (1987) introduced color support with all of the symbols  in  the
+-       synopsis  above  except  those marked as extensions.  It reserved color
+-       pair 0 as the terminal's initial, "uncolored" state,  and  limited  the
+-       number  of possible color pairs to 64, because the color pair datum was
+-       encoded in six bits of a chtype.
++       SVr3.2  (1987)  introduced  color  support  to  curses  with all of the
++       symbols in the synopsis above except those marked  as  extensions.   It
++       reserved color pair 0 as the terminal's initial, "uncolored" state, and
++       limited the number of possible color pairs to  64,  because  the  color
++       pair datum was encoded in six bits of a chtype.
+ 
+-       SVr4 made only internal changes, such as moving the  storage  of  color
+-       state  from  the  SCREEN  structure  (pointed to by SP) to the TERMINAL
++       SVr4  made  only  internal changes, such as moving the storage of color
++       state from the SCREEN structure (pointed to  by  SP)  to  the  TERMINAL
+        structure (pointed to by cur_term).
+ 
+-       Other curses implementations impose different limits on the  number  of
++       Other  curses  implementations impose different limits on the number of
+        colors and color pairs.
+ 
+-       o   PCCurses  (1987-1990)  provided  for  only  8 colors (and therefore
++       o   PCCurses (1987-1990) provided for  only  8  colors  (and  therefore
+            required at most 8x8 = 64 color pairs).
+ 
+        o   PDCurses  (1992-present)  inherited  the  8-color  limitation  from
+-           PCCurses,  but  changed  this  to  256  in  version 2.5 (2001), and
++           PCCurses, but changed this  to  256  in  version  2.5  (2001),  and
+            widened its chtype from 16 to 32 bits.
+ 
+        o   X/Open  Curses  (1992-present)  specified  a  new  structure  type,
+-           cchar_t,  to  store  the character code, attribute flags, and color
+-           pair identifier, allowing an increased range of  color  pairs.   It
+-           specifies  a  short  as  storing  identifiers  for colors and color
+-           pairs, limiting portable values to 15  bits;  negative  values  are
++           cchar_t, to store the character code, attribute  flags,  and  color
++           pair  identifier,  allowing  an increased range of color pairs.  It
++           specifies a short as  storing  identifiers  for  colors  and  color
++           pairs,  limiting  portable  values  to 15 bits; negative values are
+            invalid in System V.
+ 
+-       o   ncurses  (1992-present), in its non-wide configuration, uses 8 bits
++       o   ncurses (1992-present), in its non-wide configuration, uses 8  bits
+            of chtype for the color pair identifier.
+ 
+-           Version 5.3 (2002) offered a wide-character interface, but  encoded
++           Version  5.3 (2002) offered a wide-character interface, but encoded
+            the color pair identifier with attributes in the character type.
+ 
+-           Since  version  6 (2015), ncurses uses a separate int for the color
+-           pair identifier in a cchar_t, introducing  extension  functions  to
+-           manage  the  wider  type.   When a color pair value fits in 8 bits,
++           Since version 6 (2015), ncurses uses a separate int for  the  color
++           pair  identifier  in  a cchar_t, introducing extension functions to
++           manage the wider type.  When a color pair value  fits  in  8  bits,
+            ncurses permits color pair data to be manipulated via the functions
+-           taking  chtype  arguments,  even  when  a  curses window uses wide-
++           taking chtype arguments, even  when  a  curses  window  uses  wide-
+            character cells.
+ 
+-       o   NetBSD curses used 6 bits for the color pair identifier  from  2000
+-           (when  it  first  added  color support) until 2004.  At that point,
+-           NetBSD widened the color pair identifier to  use  9  bits.   As  of
+-           2025,  that  size is unchanged.  Like ncurses before version 6, the
+-           NetBSD color pair datum  is  stored  in  the  attributes  field  of
++       o   NetBSD  curses  used 6 bits for the color pair identifier from 2000
++           (when it first added color support) until  2004.   At  that  point,
++           NetBSD  widened  the  color  pair  identifier to use 9 bits.  As of
++           2025, that size is unchanged.  Like ncurses before version  6,  the
++           NetBSD  color  pair  datum  is  stored  in  the attributes field of
+            cchar_t, limiting the number of color pairs.
+ 
+ 
+ 
                                                                                                                                                        SEE ALSO
                                                                                                                                                        +-       curses(3x),    curs_attr(3x),   curs_initscr(3x),   curs_variables(3x),
++       curses(3x),   curs_attr(3x),   curs_initscr(3x),    curs_variables(3x),
+        default_colors(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2025-04-05                    curs_color(3x)
++ncurses 6.5                       2025-07-05                    curs_color(3x)
+ 
                                                                                                                                                        
+ 
                                                                                                                                                        
+ 
                                                                                                                                                          
+Index: doc/html/man/curs_deleteln.3x.html
+--- ncurses-6.5-20250628+/doc/html/man/curs_deleteln.3x.html	2025-04-05 22:33:03.000000000 +0000
++++ ncurses-6.5-20250705/doc/html/man/curs_deleteln.3x.html	2025-07-05 13:12:25.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_deleteln.3x,v 1.53 2025/04/05 22:00:17 tom Exp @
++  * @Id: curs_deleteln.3x,v 1.55 2025/07/05 12:46:36 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_deleteln 3x 2025-04-05 ncurses 6.5 Library calls
++curs_deleteln 3x 2025-07-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                          curs_deleteln 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                          
++
                                                                                                                                                          curs_deleteln 3x 2025-07-05 ncurses 6.5 Library calls
                                                                                                                                                          
+ 
                                                                                                                                                          + curs_deleteln(3x)                Library calls               curs_deleteln(3x)
+ 
+@@ -77,7 +77,7 @@
+ 
+        winsdelln inserts or deletes  n lines  in  win  as  n  is  positive  or
+        negative,  respectively,  as  if  by  repeatedly  calling  winsertln or
+-       wdeleteln.
++       wdeleteln.  winsdelln(..., 0) performs no operation.
+ 
+ 
+ 
                                                                                                                                                          RETURN VALUE
                                                                                                                                                          +@@ -113,7 +113,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-04-05                 curs_deleteln(3x)
++ncurses 6.5                       2025-07-05                 curs_deleteln(3x)
+ 
                                                                                                                                                          
+ 
                                                                                                                                                          
+ 
                                                                                                                                                            
+Index: doc/html/man/curs_get_wstr.3x.html
+--- ncurses-6.5-20250628+/doc/html/man/curs_get_wstr.3x.html	2025-04-05 22:57:19.000000000 +0000
++++ ncurses-6.5-20250705/doc/html/man/curs_get_wstr.3x.html	2025-07-05 13:12:25.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_get_wstr.3x,v 1.75 2025/04/05 22:36:46 tom Exp @
++  * @Id: curs_get_wstr.3x,v 1.77 2025/07/05 12:52:35 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_get_wstr 3x 2025-04-05 ncurses 6.5 Library calls
++curs_get_wstr 3x 2025-07-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                            curs_get_wstr 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                            
++
                                                                                                                                                            curs_get_wstr 3x 2025-07-05 ncurses 6.5 Library calls
                                                                                                                                                            
+ 
                                                                                                                                                            + curs_get_wstr(3x)                Library calls               curs_get_wstr(3x)
+ 
+@@ -125,7 +125,7 @@
+        o   (for  functions  taking  a  WINDOW  pointer argument) win is a null
+            pointer,
+ 
+-       o   str is a null pointer, or
++       o   wstr is a null pointer, or
+ 
+        o   an internal wget_wch(3x) call fails.
+ 
+@@ -237,7 +237,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-04-05                 curs_get_wstr(3x)
++ncurses 6.5                       2025-07-05                 curs_get_wstr(3x)
+ 
                                                                                                                                                            
+ 
                                                                                                                                                            
+ 
                                                                                                                                                              
+Index: doc/html/man/curs_getch.3x.html
+--- ncurses-6.5-20250628+/doc/html/man/curs_getch.3x.html	2025-04-05 22:33:03.000000000 +0000
++++ ncurses-6.5-20250705/doc/html/man/curs_getch.3x.html	2025-07-05 13:12:25.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_getch.3x,v 1.127 2025/04/05 22:04:30 tom Exp @
++  * @Id: curs_getch.3x,v 1.130 2025/07/05 13:06:45 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_getch 3x 2025-04-05 ncurses 6.5 Library calls
++curs_getch 3x 2025-07-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                              curs_getch 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                              
++
                                                                                                                                                              curs_getch 3x 2025-07-05 ncurses 6.5 Library calls
                                                                                                                                                              
+ 
                                                                                                                                                              + curs_getch(3x)                   Library calls                  curs_getch(3x)
+ 
+@@ -74,20 +74,21 @@
+        function.
+ 
+        When input is pending, wgetch returns an integer  identifying  the  key
+-       event; for alphanumeric and punctuation keys, this value corresponds to
+-       the character encoding used by the terminal.  Use of the control key as
+-       a  modifier,  by  holding  it down while pressing and releasing another
+-       key, often results in a distinct code.   The  behavior  of  other  keys
+-       depends  on whether win is in keypad mode; see subsection "Keypad Mode"
+-       below.
+-
+-       If no input is pending, then if the no-delay flag is set in the  window
+-       (see  nodelay(3x)),  the  function returns ERR; otherwise, curses waits
+-       until the terminal has  input.   If  cbreak(3x)  or  raw(3x)  has  been
+-       called,  this  happens after one character is read.  If nocbreak(3x) or
+-       noraw(3x) has been called, it occurs when the  next  newline  is  read.
+-       (Because  the  terminal's  canonical or "cooked" mode is line-buffered,
+-       multiple wgetch calls may then be necessary to empty the input  queue.)
++       event;  for  alphanumeric  and  punctuation  keys,  the  space bar, and
++       (usually) the Backspace, Tab,  Return,  and  Escape  keys,  this  value
++       corresponds to the character encoding used by the terminal.  Use of the
++       control key as a modifier,  by  holding  it  down  while  pressing  and
++       releasing  another key, often results in a distinct code.  The behavior
++       of other keys depends on whether win is in keypad mode; see  subsection
++       "Keypad Mode" below.
++
++       If  no input is pending, then if the no-delay flag is set in the window
++       (see nodelay(3x)), the function returns ERR;  otherwise,  curses  waits
++       until  the  terminal  has  input.   If  cbreak(3x)  or raw(3x) has been
++       called, this happens after curses reads one key event.  If nocbreak(3x)
++       or  noraw(3x)  has  been called, it occurs when curses reads a newline.
++       (Because the terminal's canonical or "cooked"  mode  is  line-buffered,
++       multiple  wgetch calls may then be necessary to empty the input queue.)
+        If halfdelay(3x) has been called, curses waits until input is available
+        or the specified delay elapses.
+ 
+@@ -95,11 +96,12 @@
+        the returned character c to the window (at the cursor position) per the
+        following rules.
+ 
+-       o   If c matches the terminal's erase  character  (see  erasechar(3x)),
+-           the  cursor  moves  leftward  one  position and the new position is
+-           erased as if wmove(3x) and then wdelch(3x) were called.   When  the
+-           window's   keypad   mode  is  enabled  (see  below),  KEY_LEFT  and
+-           KEY_BACKSPACE are handled the same way.
++       o   If  c  matches  the terminal's erase character (see erasechar(3x)),
++           and the cursor is not at the window's leftmost column,  the  cursor
++           moves  leftward  one  position and the new position is erased as if
++           wmove(3x) and then  wdelch(3x)  were  called.   When  the  window's
++           keypad  mode is enabled (see below), KEY_LEFT and KEY_BACKSPACE are
++           handled the same way.
+ 
+        o   curses writes any other c to the window, as with wechochar(3x).
+ 
+@@ -119,9 +121,9 @@
+        "function  key"  includes  but  is not limited to keycaps engraved with
+        "F1", "PF1", and so on.)   If  a  window  is  in  keypad  mode,  wgetch
+        translates  these  key  strokes  to a numeric code corresponding to the
+-       KEY_ symbols listed in subsection "Predefined Key Codes" below.   If  a
+-       window  is  not  in  keypad  mode,  wgetch  returns a sequence of codes
+-       typically starting with the escape  character,  which  the  application
++       KEY_ symbols listed in subsection "Predefined Key Codes" below.  If the
++       window  is  not  in  keypad  mode,  the  input queue populates with the
++       characters of the function key's escape sequence, which the application
+        must collect individually with multiple wgetch calls.
+ 
+        o   The  curses.h  header  file  declares many predefined function keys
+@@ -156,7 +158,7 @@
+            because it has not read enough characters to disambiguate  it,  the
+            function  waits  until  it has this information or the escape delay
+            elapses.  Configure the  escape  delay  with  the  global  variable
+-           ESCDELAY,  an  extension  (see  section "EXTENSIONS" below), or the
++           ESCDELAY,  an  extension  (see  section "EXTENSIONS" below), or the
+            environment variable of the same name (see section "ENVIRONMENT" of
+            ncurses(3x)), also an extension.
+ 
+@@ -248,9 +250,9 @@
+               KEY_REFERENCE   Ref(erence) key
+               KEY_REFRESH     Refresh key
+               KEY_REPLACE     Replace key
+-
+               KEY_RESIZE      Screen resized
+               KEY_RESTART     Restart key
++
+               KEY_RESUME      Resume key
+               KEY_SAVE        Save key
+               KEY_SELECT      Select key
+@@ -299,7 +301,7 @@
+        key.
+ 
+        o   wgetch  returns  KEY_RESIZE,  even  if  the window's keypad mode is
+-           disabled, if ncurses has handled a SIGWINCH signal since wgetch was
++           disabled, if ncurses has handled a SIGWINCH signal since wgetch was
+            called; see initscr(3x) and resizeterm(3x).
+ 
+        o   wgetch  returns KEY_MOUSE to indicate that a mouse event is pending
+@@ -329,8 +331,8 @@
+        o   (for  functions  taking  a  WINDOW  pointer argument) win is a null
+            pointer, or
+ 
+-       o   execution was interrupted by a signal, in which case errno  is  set
+-           to EINTR.
++       o   execution was interrupted by a signal, in which  case  the  library
++           sets errno to EINTR.
+ 
+        Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+@@ -427,8 +429,8 @@
+        read(2) call in progress, and also (in some implementations) whether an
+        input timeout or non-blocking mode had been  set.   A  portable  curses
+        application  prepares  for  two  cases:  (a)  signal  receipt  does not
+-       interrupt wgetch; or (b) signal receipt interrupts wgetch and causes it
+-       to return ERR with errno set to EINTR.
++       interrupt wgetch; and (b) signal receipt interrupts wgetch  and  causes
++       it to return ERR with errno set to EINTR.
+ 
+        KEY_MOUSE is mentioned in X/Open Curses, along with a few related term-
+        info capabilities, but no higher-level functions use the feature.   The
+@@ -463,7 +465,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-04-05                    curs_getch(3x)
++ncurses 6.5                       2025-07-05                    curs_getch(3x)
+ 
                                                                                                                                                              
+ 
                                                                                                                                                              
+ 
                                                                                                                                                                
+Index: doc/html/man/curs_getstr.3x.html
+--- ncurses-6.5-20250628+/doc/html/man/curs_getstr.3x.html	2025-04-05 22:33:03.000000000 +0000
++++ ncurses-6.5-20250705/doc/html/man/curs_getstr.3x.html	2025-07-05 13:12:25.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_getstr.3x,v 1.89 2025/04/05 22:07:21 tom Exp @
++  * @Id: curs_getstr.3x,v 1.92 2025/07/05 12:52:05 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_getstr 3x 2025-04-05 ncurses 6.5 Library calls
++curs_getstr 3x 2025-07-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                curs_getstr 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                
++
                                                                                                                                                                curs_getstr 3x 2025-07-05 ncurses 6.5 Library calls
                                                                                                                                                                
+ 
                                                                                                                                                                + curs_getstr(3x)                  Library calls                 curs_getstr(3x)
+ 
+@@ -87,24 +87,27 @@
+        o   discards  function key inputs other than those treated as the erase
+            or kill characters, calling beep(3x).
+ 
+-       The erase character replaces the character at the  end  of  the  buffer
+-       with  a  null character, while the kill character does the same for the
+-       entire buffer.
++       If any characters have been written to  the  input  buffer,  the  erase
++       character  replaces the character at the current position in the buffer
++       with a null character, then decrements the position by  one;  the  kill
++       character  does  the  same repeatedly, backtracking to the beginning of
++       the buffer.
+ 
+        If the screen's echo option is enabled (see echo(3x)), wgetstr  updates
+        win with waddch(3x).  Further,
+ 
+        o   the  erase  character and its function key synonyms move the cursor
+-           to the left, and
++           to the left (if not already where it was located when  wgetstr  was
++           called) and
+ 
+-       o   the kill character returns the cursor to where it was located  when
++       o   the  kill character returns the cursor to where it was located when
+            wgetstr was called.
+ 
+-       wgetnstr  is  similar,  but  reads  at  most  n  characters, aiding the
+-       application to avoid  overrunning  the  buffer  to  which  str  points.
+-       curses  ignores  an attempt to input more than n characters (other than
+-       the terminating line feed or carriage return), calling beep(3x).  If  n
+-       is   negative,   wgetn_wstr   reads  up  to  LINE_MAX  characters  (see
++       wgetnstr is similar,  but  reads  at  most  n  characters,  aiding  the
++       application  to  avoid  overrunning  the  buffer  to  which str points.
++       curses ignores an attempt to input more than n characters  (other  than
++       the  terminating line feed or carriage return), calling beep(3x).  If n
++       is  negative,  wgetn_wstr  reads  up  to   LINE_MAX   characters   (see
+        sysconf(3)).
+ 
+        ncurses(3x) describes the variants of these functions.
+@@ -117,39 +120,39 @@
+ 
+        o   the curses screen has not been initialized,
+ 
+-       o   (for functions taking a WINDOW pointer  argument)  win  is  a  null
++       o   (for  functions  taking  a  WINDOW  pointer argument) win is a null
+            pointer,
+ 
+        o   str is a null pointer, or
+ 
+        o   an internal wgetch(3x) call fails.
+ 
+-       Further,  in  ncurses,  these functions return KEY_RESIZE if a SIGWINCH
++       Further, in ncurses, these functions return KEY_RESIZE  if  a  SIGWINCH
+        event interrupts the function.
+ 
+-       Functions prefixed with "mv" first perform cursor movement and fail  if
++       Functions  prefixed with "mv" first perform cursor movement and fail if
+        the position (y, x) is outside the window boundaries.
+ 
+ 
+ 
                                                                                                                                                                NOTES
                                                                                                                                                                +        All of these functions except wgetnstr may be implemented as macros.
+ 
+-       Reading  input  that  overruns  the  buffer  pointed  to  by str causes
+-       undefined  results.   Use  the  n-infixed   functions,   and   allocate
++       Reading input that  overruns  the  buffer  pointed  to  by  str  causes
++       undefined   results.    Use   the  n-infixed  functions,  and  allocate
+        sufficient storage for str -- at least n+1 times sizeof(char).
+ 
+-       While  these  functions  conceptually  implement  a  series of calls to
++       While these functions conceptually  implement  a  series  of  calls  to
+        wgetch, they also temporarily change properties of the curses screen to
+-       permit  simple  editing  of  the input buffer.  Each function saves the
+-       screen's state, calls nl(3x), and,  if  the  screen  was  in  canonical
+-       ("cooked")  mode,  cbreak(3x).  Before returning, it restores the saved
+-       screen state.  Other implementations differ in detail, affecting  which
+-       control   characters  they  can  accept  in  the  buffer;  see  section
++       permit simple editing of the input buffer.   Each  function  saves  the
++       screen's  state,  calls  nl(3x),  and,  if  the screen was in canonical
++       ("cooked") mode, cbreak(3x).  Before returning, it restores  the  saved
++       screen  state.  Other implementations differ in detail, affecting which
++       control  characters  they  can  accept  in  the  buffer;  see   section
+        "PORTABILITY" below.
+ 
+ 
+ 
                                                                                                                                                                EXTENSIONS
                                                                                                                                                                +-       getnstr, wgetnstr, mvgetnstr, and mvwgetnstr's handing  of  negative  n
++       getnstr,  wgetnstr,  mvgetnstr,  and mvwgetnstr's handing of negative n
+        values is an ncurses extension.
+ 
+        The return value KEY_RESIZE is an ncurses extension.
+@@ -160,97 +163,97 @@
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+        X/Open Curses Issue 4 describes these functions.  It specifies no error
+-       conditions  for them, but indicates that wgetnstr and its variants read
++       conditions for them, but indicates that wgetnstr and its variants  read
+        "the entire multi-byte sequence associated with a character" and "fail"
+        if n and str together do not describe a buffer "large enough to contain
+-       any complete characters".   In  ncurses,  however,  wgetch  reads  only
++       any  complete  characters".   In  ncurses,  however,  wgetch reads only
+        single-byte characters, so this scenario does not arise.
+ 
+-       SVr4  describes  a  successful  return  value only as "an integer value
++       SVr4 describes a successful return value  only  as  "an  integer  value
+        other than ERR".
+ 
+-       SVr3 and early SVr4 curses  implementations  did  not  reject  function
++       SVr3  and  early  SVr4  curses  implementations did not reject function
+        keys; the SVr4 documentation asserted that, like the screen's erase and
+        kill characters, they were
+ 
+               interpreted, as well as any special keys (such as function keys,
+               "home" key, "clear" key, etc.)
+ 
+-       without  further  detail.   It lied.  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 code's KEY_
+-       constant value.  (The same  language,  unchanged  except  for  styling,
+-       survived  into  X/Open  Curses  Issue 4, Version 2 but disappeared from
++       without further detail.  It lied.  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  code's  KEY_
++       constant  value.   (The  same  language,  unchanged except for styling,
++       survived into X/Open Curses Issue 4,  Version 2  but  disappeared  from
+        Issue 7.)
+ 
+        A draft of X/Open Curses Issue 5 (which never saw final release) stated
+-       that  these  functions "read at most n bytes" but did not state whether
+-       the terminating null  character  counted  toward  that  limit.   X/Open
+-       Curses  Issue 7  changed  that  to say they "read at most n-1 bytes" to
+-       allow  for  the  terminating  null  character.   As   of   2018,   some
++       that these functions "read at most n bytes" but did not  state  whether
++       the  terminating  null  character  counted  toward  that limit.  X/Open
++       Curses Issue 7 changed that to say they "read at  most  n-1  bytes"  to
++       allow   for   the   terminating  null  character.   As  of  2018,  some
+        implementations count it, some do not.
+ 
+        o   ncurses 6.1 and PDCurses do not count the null character toward the
+            limit, while Solaris and NetBSD curses do.
+ 
+-       o   Solaris  xcurses  offers   both   behaviors:   its   wide-character
+-           wgetn_wstr  reserves  room  for a wide null character, but its non-
+-           wide wgetnstr does not consistently count a null  character  toward
++       o   Solaris   xcurses   offers   both   behaviors:  its  wide-character
++           wgetn_wstr reserves room for a wide null character,  but  its  non-
++           wide  wgetnstr  does not consistently count a null character toward
+            the limit.
+ 
+-       X/Open  Curses  does  not  specify  what  happens  if  the  length n is
++       X/Open Curses does  not  specify  what  happens  if  the  length  n  is
+        negative.
+ 
+-       o   ncurses 6.2 uses LINE_MAX  or  a  larger  (system-dependent)  value
++       o   ncurses  6.2  uses  LINE_MAX  or  a larger (system-dependent) value
+            provided  by  sysconf(3).   If  neither  LINE_MAX  nor  sysconf  is
+-           available, ncurses  uses  the  POSIX  minimum  value  for  LINE_MAX
+-           (2048).   In  either  case,  it reserves a byte for the terminating
++           available,  ncurses  uses  the  POSIX  minimum  value  for LINE_MAX
++           (2048).  In either case, it reserves a  byte  for  the  terminating
+            null character.
+ 
+-       o   In SVr4 curses, a negative n tells  wgetnstr  to  assume  that  the
+-           caller's  buffer  is  large enough to hold the result; that is, the
+-           function then acts like wgetstr.  X/Open Curses  does  not  mention
+-           this  behavior  (or  anything  related  to  nonpositive  n values),
+-           however most curses libraries implement it.   Most  implementations
+-           nevertheless  enforce  an  upper  limit  on the count of bytes they
++       o   In  SVr4  curses,  a  negative  n tells wgetnstr to assume that the
++           caller's buffer is large enough to hold the result;  that  is,  the
++           function  then  acts  like wgetstr.  X/Open Curses does not mention
++           this behavior  (or  anything  related  to  nonpositive  n  values),
++           however  most  curses libraries implement it.  Most implementations
++           nevertheless enforce an upper limit on  the  count  of  bytes  they
+            write to the destination buffer str.
+ 
+-       o   BSD  curses  lacked  wgetnstr,  and  its  wgetstr  wrote   to   str
++       o   BSD   curses   lacked  wgetnstr,  and  its  wgetstr  wrote  to  str
+            unboundedly, as did that in SVr2.
+ 
+-       o   PDCurses,  and  SVr3  and  later,  and  Solaris  curses  limit both
+-           functions to writing 256  bytes.   Other  System V-based  platforms
++       o   PDCurses, and  SVr3  and  later,  and  Solaris  curses  limit  both
++           functions  to  writing  256  bytes.  Other System V-based platforms
+            likely use the same limit.
+ 
+-       o   Solaris   xcurses   limits   the   write  to  LINE_MAX  bytes  (see
++       o   Solaris  xcurses  limits  the  write   to   LINE_MAX   bytes   (see
+            sysconf(3)).
+ 
+-       o   NetBSD 7 curses imposes no particular limit on the  length  of  the
+-           write,  but does validate n to ensure that it is greater than zero.
+-           A comment in NetBSD's source  code  asserts  that  SUSv2  specifies
++       o   NetBSD  7  curses  imposes no particular limit on the length of the
++           write, but does validate n to ensure that it is greater than  zero.
++           A  comment  in  NetBSD's  source  code asserts that SUSv2 specifies
+            this.
+ 
+        Implementations vary in their handling of input control characters.
+ 
+        o   While they may enable the screen's echo option, some do not take it
+-           out of raw mode,  and  may  take  cbreak  mode  into  account  when
++           out  of  raw  mode,  and  may  take  cbreak  mode into account when
+            deciding whether to handle echoing within wgetnstr or to rely on it
+            as a side effect of calling wgetch.
+ 
+-       o   Originally, ncurses, like its progenitor pcurses, had its  wgetnstr
+-           call  noraw  and cbreak before accepting input.  That may have been
+-           done to make function keys work; it is not  necessary  with  modern
++       o   Originally,  ncurses, like its progenitor pcurses, had its wgetnstr
++           call noraw and cbreak before accepting input.  That may  have  been
++           done  to  make  function keys work; it is not necessary with modern
+            ncurses.
+ 
+-           Since  1995,  ncurses has provided handlers for SIGINTR and SIGQUIT
+-           events, which are typically generated at the keyboard with  ^C  and
++           Since 1995, ncurses has provided handlers for SIGINTR  and  SIGQUIT
++           events,  which  are typically generated at the keyboard with ^C and
+            ^\ respectively.  In cbreak mode, those handlers catch a signal and
+-           stop  the  program,  whereas  other  implementations  write   those
++           stop   the  program,  whereas  other  implementations  write  those
+            characters into the buffer.
+ 
+-       o   Starting  with  ncurses  6.3 (2021), wgetnstr preserves raw mode if
+-           the screen was already in that state, allowing  one  to  enter  the
+-           characters  the  terminal  interprets  as interrupt and quit events
++       o   Starting with ncurses 6.3 (2021), wgetnstr preserves  raw  mode  if
++           the  screen  was  already  in that state, allowing one to enter the
++           characters the terminal interprets as  interrupt  and  quit  events
+            into the buffer, for better compatibility with SVr4 curses.
+ 
+ 
+@@ -259,7 +262,7 @@
+ 
+        SVr3.1 (1987) added wgetnstr, but none of its variants.
+ 
+-       X/Open  Curses  Issue 4  (1995)  specified  getnstr,   mvgetnstr,   and
++       X/Open   Curses   Issue 4  (1995)  specified  getnstr,  mvgetnstr,  and
+        mvwgetnstr.
+ 
+ 
+@@ -267,12 +270,12 @@
+        curs_get_wstr(3x) describes comparable functions of the ncurses library
+        in its wide-character configuration (ncursesw).
+ 
+-       curses(3x),    curs_addch(3x),     curs_getch(3x),     curs_inopts(3x),
++       curses(3x),     curs_addch(3x),     curs_getch(3x),    curs_inopts(3x),
+        curs_termattrs(3x),
+ 
+ 
+ 
+-ncurses 6.5                       2025-04-05                   curs_getstr(3x)
++ncurses 6.5                       2025-07-05                   curs_getstr(3x)
+ 
                                                                                                                                                                
+ 
                                                                                                                                                                
+ 
                                                                                                                                                                  
+Index: doc/html/man/curs_initscr.3x.html
+--- ncurses-6.5-20250628+/doc/html/man/curs_initscr.3x.html	2025-03-15 22:08:52.000000000 +0000
++++ ncurses-6.5-20250705/doc/html/man/curs_initscr.3x.html	2025-07-05 14:24:31.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_initscr.3x,v 1.102 2025/03/15 21:11:24 tom Exp @
++  * @Id: curs_initscr.3x,v 1.105 2025/07/05 13:30:33 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_initscr 3x 2025-03-15 ncurses 6.5 Library calls
++curs_initscr 3x 2025-07-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                  curs_initscr 3x 2025-03-15 ncurses 6.5 Library calls
                                                                                                                                                                  
++
                                                                                                                                                                  curs_initscr 3x 2025-07-05 ncurses 6.5 Library calls
                                                                                                                                                                  
+ 
                                                                                                                                                                  + curs_initscr(3x)                 Library calls                curs_initscr(3x)
+ 
+@@ -103,38 +103,40 @@
+ 
+        o   an output stream outf connected to the terminal; and
+ 
+-       o   an input stream inf  connected  to  the  terminal.   It  returns  a
+-           variable of pointer-to-SCREEN type, which should be saved for later
+-           use with set_term and delscreen.
++       o   an input stream inf connected to the terminal.
++
++       newterm returns a variable of pointer-to-SCREEN type, which  should  be
++       saved for later use with set_term and delscreen.
+ 
+        newterm passes the file descriptor of the output stream to the terminfo
+        function setupterm(3x), which returns a pointer to a TERMINAL structure
+        that newterm stores in the SCREEN it returns to the application.
+ 
+        An application that needs to inspect a terminal type's capabilities, so
+-       that  it  can  continue  to run in a line-oriented mode if the terminal
+-       cannot support a screen-oriented program, would also use  newterm.   If
++       that it can continue to run in a line-oriented  mode  if  the  terminal
++       cannot  support  a screen-oriented program, would also use newterm.  If
+        at most one terminal connection is needed, the programmer could perform
+-       such a capability test, decide which mode in  which  to  operate,  then
+-       call  delscreen  on  the  pointer returned by newterm, and proceed with
++       such  a  capability  test,  decide which mode in which to operate, then
++       call delscreen on the pointer returned by  newterm,  and  proceed  with
+        either initscr or a non-curses interface.
+ 
+ 
+ 
                                                                                                                                                                  endwin
                                                                                                                                                                  +-       The program must also call endwin for each terminal being  used  before
+-       exiting  from curses.  If newterm is called more than once for the same
++       The  program  must also call endwin for each terminal being used before
++       exiting from curses.  If newterm is called more than once for the  same
+        terminal, the first terminal referred to must be the last one for which
+        endwin is called.
+ 
+-       A  program  should always call endwin before exiting the application or
++       A program should always call endwin before exiting the  application  or
+        temporarily suspending curses's management of the terminal.  endwin:
+ 
+-       o   resets colors to correspond with the default color pair 0,
++       o   if  start_color(3x)  has  been  called, resets colors to correspond
++           with the default color pair 0,
+ 
+        o   moves the cursor to the lower left-hand corner of the screen,
+ 
+-       o   clears the remainder of the  line  so  that  it  uses  the  default
+-           colors,
++       o   clears the remainder of  the  line  (if  start_color(3x)  has  been
++           called, it also restores the default color pair),
+ 
+        o   sets the cursor to normal visibility (see curs_set(3x)),
+ 
+@@ -156,17 +158,17 @@
+        set_term re-orients the curses library's operations to another terminal
+        when the application has arranged to manage more than one with newterm.
+        set_term expects a SCREEN pointer previously returned by newterm as  an
+-       argument,  and  returns  the previous one.  set_term is the only curses
+-       API function that manipulates SCREEN pointers; all others  affect  only
+-       the current terminal.
++       argument,  and returns the previous one.  set_term is the only standard
++       curses API function that manipulates SCREEN pointers; all others affect
++       only the current terminal (but see curs_sp_funcs(3x)).
+ 
+ 
+ 
                                                                                                                                                                  delscreen
                                                                                                                                                                  +        delscreen  frees  the  storage  backing  the  supplied  SCREEN  pointer
+        argument.  endwin does not, so that an application can resume  managing
+        a  terminal  with  curses  after  a (possibly conditional or temporary)
+-       suspension; see curs_kernel(3x).  Call delscreen after  endwin  when  a
+-       particular SCREEN structure is no longer needed.
++       suspension; see curs_kernel(3x).  Use delscreen after endwin  when  the
++       application has no more need of a screen but will not soon exit.
+ 
+ 
+ 
                                                                                                                                                                  RETURN VALUE
                                                                                                                                                                  +@@ -181,7 +183,7 @@
+ 
+            o   it is called more than once without updating the screen, or
+ 
+-           o   its call of reset_shell_mode(3x) returns ERR.
++           o   its call of reset_shell_mode(3x) returns ERR; and
+ 
+        o   newterm returns ERR if it cannot allocate storage  for  the  SCREEN
+            structure  or  the  WINDOW structures automatically associated with
+@@ -236,8 +238,8 @@
+                   KEY_RESIZE.
+ 
+               At  the  same  time,  ncurses calls resizeterm(3x) to adjust the
+-              standard screen stdscr, and  update  global  variables  such  as
+-              LINES and COLS.
++              standard screen stdscr and update global variables such as LINES
++              and COLS.
+ 
+ 
+ 
                                                                                                                                                                  PORTABILITY
                                                                                                                                                                  +@@ -268,8 +270,8 @@
+            documentation help, adding that it should be called after endwin if
+            a SCREEN is no longer needed.
+ 
+-       o   However, WINDOWs are implicitly associated with a SCREEN, so it  is
+-           reasonable to expect delscreen to dispose of them.
++       o   However, every WINDOW is implicitly associated with a SCREEN, so it
++           is reasonable to expect delscreen to dispose of them.
+ 
+        o   SVr4  deletes  the  standard WINDOW structures stdscr and curscr as
+            well as a work area newscr.  It ignores other windows.
+@@ -279,46 +281,47 @@
+            windows when delscreen is called.
+ 
+        o   NetBSD copied this feature of ncurses in  2001.   PDCurses  follows
+-           the SVr4 model, deleting only the standard WINDOW structures.
++           the  SVr4  model,  deleting only the standard WINDOW structures and
++           newscr.
+ 
+ 
+-
                                                                                                                                                                  High-level versus Low-level
                                                                                                                                                                  +-       Different  implementations  may  disagree  regarding  the level of some
+-       functions.  For example, SCREEN  (returned  by  newterm)  and  TERMINAL
+-       (returned  by  setupterm(3x))  hold  file  descriptors  for  the output
+-       stream.  If an application switches screens using set_term, or switches
+-       terminals using set_curterm(3x), applications which use the output file
+-       descriptor can have different behavior  depending  on  which  structure
+-       holds the corresponding descriptor.
++
                                                                                                                                                                  High-level versus Low-level Functions
                                                                                                                                                                  ++       Implementations disagree regarding the level of abstraction  applicable
++       to  a  function or property.  For example, SCREEN (returned by newterm)
++       and TERMINAL (returned by setupterm(3x)) hold file descriptors for  the
++       output  stream.   If an application switches screens using set_term, or
++       switches terminals using set_curterm(3x), applications using the output
++       file  descriptor  can  behave  differently  depending  on the structure
++       holding the corresponding descriptor.
+ 
+-       o   NetBSD's   baudrate  function  uses  the  descriptor  in  TERMINAL.
++       o   NetBSD's  baudrate  function  uses  the  descriptor  in   TERMINAL.
+            ncurses and SVr4 use the descriptor in SCREEN.
+ 
+-       o   NetBSD and ncurses use the descriptor in TERMINAL for terminal  I/O
+-           modes,  e.g., def_shell_mode(3x), def_prog_mode(3x).  SVr4 uses the
++       o   NetBSD  and ncurses use the descriptor in TERMINAL for terminal I/O
++           modes, e.g., def_shell_mode(3x), def_prog_mode(3x).  SVr4 uses  the
+            descriptor in SCREEN.
+ 
+    Unset TERM Environment Variable
+-       If the TERM variable is not set in the  environment  or  has  an  empty
+-       value,  initscr uses the value "unknown", which normally corresponds to
++       If  the  TERM  variable  is  not set in the environment or has an empty
++       value, initscr uses the value "unknown", which normally corresponds  to
+        a terminal entry with the generic (gn) capability.  Generic entries are
+        detected by setupterm(3x) and cannot be used for full-screen operation.
+-       Other implementations may handle  a  missing  or  empty  TERM  variable
++       Other  implementations  may  handle  a  missing  or empty TERM variable
+        differently.
+ 
+ 
+ 
                                                                                                                                                                  Signal Handlers
                                                                                                                                                                  +        Quoting X/Open Curses Issue 7, section 3.1.1:
+ 
+-            Curses  implementations  may  provide  for special handling of the
+-            SIGINT, SIGQUIT, and  SIGTSTP  signals  if  their  disposition  is
++            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...
+ 
+-            Any  special  handling  for these signals may remain in effect for
++            Any 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.
+ 
+-            None  of the Curses functions are required to be safe with respect
++            None of the Curses functions are required to be safe with  respect
+             to signals...
+ 
+        Section "NOTES" above discusses ncurses's signal handlers.
+@@ -333,12 +336,12 @@
+ 
+ 
+ 
                                                                                                                                                                  SEE ALSO
                                                                                                                                                                  +-       curses(3x),    curs_kernel(3x),     curs_refresh(3x),     curs_slk(3x),
++       curses(3x),     curs_kernel(3x),     curs_refresh(3x),    curs_slk(3x),
+        curs_terminfo(3x), curs_util(3x), curs_variables(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-15                  curs_initscr(3x)
++ncurses 6.5                       2025-07-05                  curs_initscr(3x)
+ 
                                                                                                                                                                  
+ 
                                                                                                                                                                  
+ 
                                                                                                                                                                    
+@@ -359,7 +362,7 @@
+ 
                                                                                                                                                                  • PORTABILITY
+ 
+ 
                                                                                                                                                                    • 
+Index: doc/html/man/curs_inopts.3x.html
+--- ncurses-6.5-20250628+/doc/html/man/curs_inopts.3x.html	2025-04-05 22:33:04.000000000 +0000
++++ ncurses-6.5-20250705/doc/html/man/curs_inopts.3x.html	2025-07-05 13:12:25.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inopts.3x,v 1.104 2025/04/05 22:07:49 tom Exp @
++  * @Id: curs_inopts.3x,v 1.107 2025/07/05 12:55:10 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_inopts 3x 2025-04-05 ncurses 6.5 Library calls
++curs_inopts 3x 2025-07-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                    curs_inopts 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                    
++
                                                                                                                                                                    curs_inopts 3x 2025-07-05 ncurses 6.5 Library calls
                                                                                                                                                                    
+ 
                                                                                                                                                                    + curs_inopts(3x)                  Library calls                 curs_inopts(3x)
+ 
+@@ -299,12 +299,13 @@
+        expectation of further characters effectively infinite.  X/Open  Curses
+        affords  no  means  of  otherwise configuring the length of this second
+        delay, but an AIX and ncurses extension, ESCDELAY, is available both as
+-       an  environment variable and a global symbol permitting the application
+-       to do so; see ncurses(3x) and curs_variables(3x).
++       an  environment  variable  and  a global symbol permitting the user and
++       application,   respectively,   to   do   so;   see   ncurses(3x)    and
++       curs_variables(3x).
+ 
+ 
+ 
                                                                                                                                                                    EXTENSIONS
                                                                                                                                                                    +-       ncurses provides four "is_" functions corresponding  to  cbreak,  echo,
++       ncurses  provides  four  "is_" functions corresponding to cbreak, echo,
+        nl, and raw, permitting their states to be queried by the application.
+ 
+                             Query       Set      Reset
+@@ -320,7 +321,7 @@
+ 
+        0    if the option is unset, or
+ 
+-       -1   if  the  library's  TERMINAL structure for the device has not been
++       -1   if the library's TERMINAL structure for the device  has  not  been
+             initialized.
+ 
+ 
+@@ -328,52 +329,52 @@
+        Applications employing ncurses extensions should condition their use on
+        the visibility of the NCURSES_VERSION preprocessor macro.
+ 
+-       Except  as  noted  in section "EXTENSIONS" above, X/Open Curses Issue 4
++       Except as noted in section "EXTENSIONS" above,  X/Open  Curses  Issue 4
+        describes these functions.  It specifies no error conditions for them.
+ 
+-       SVr4 describes a successful return value  only  as  "an  integer  value
++       SVr4  describes  a  successful  return  value only as "an integer value
+        other than ERR".
+ 
+-       ncurses  follows  X/Open Curses and the historical practice of System V
+-       curses, clearing the terminal driver's "echo"  flag  when  initializing
+-       the  screen.  BSD curses did not, but its raw function turned it off as
+-       a side effect.  For best portability, call echo  or  noecho  explicitly
+-       just  after initialization, even if your program retains the terminal's
++       ncurses follows X/Open Curses and the historical practice  of  System V
++       curses,  clearing  the  terminal driver's "echo" flag when initializing
++       the screen.  BSD curses did not, but its raw function turned it off  as
++       a  side  effect.   For best portability, call echo or noecho explicitly
++       just after initialization, even if your program retains the  terminal's
+        canonical ("cooked") line discipline.
+ 
+-       X/Open Curses is ambiguous regarding whether  raw  should  disable  the
+-       carriage  return and line feed translation feature controlled by nl and
+-       nonl.  BSD curses turned off these translations;  System V  curses  did
+-       not.   ncurses  does so, on the assumption that a programmer requesting
+-       raw input wants a clean (ideally,  8-bit  clean)  connection  that  the
++       X/Open  Curses  is  ambiguous  regarding whether raw should disable the
++       carriage return and line feed translation feature controlled by nl  and
++       nonl.   BSD  curses  turned off these translations; System V curses did
++       not.  ncurses does so, on the assumption that a  programmer  requesting
++       raw  input  wants  a  clean  (ideally, 8-bit clean) connection that the
+        operating system will not alter.
+ 
+        When keypad is first enabled, ncurses loads the key definitions for the
+        current  terminal  type  description.   If  that  description  includes
+-       extended  string  capabilities,  for example, by using the -x option of
++       extended string capabilities, for example, by using the  -x  option  of
+        tic(1), then ncurses also defines keys for the capabilities whose names
+-       begin  with  "k".  Corresponding key codes are generated and (depending
+-       on previous  loads  of  terminal  descriptions)  may  differ  from  one
+-       execution  of  a  program  to  the  next.   The generated key codes are
++       begin with "k".  Corresponding key codes are generated  and  (depending
++       on  previous  loads  of  terminal  descriptions)  may  differ  from one
++       execution of a program to  the  next.   The  generated  key  codes  are
+        recognized by keyname(3x), which then returns a name beginning with "k"
+-       denoting  the terminfo capability name rather than "K", used for curses
++       denoting the terminfo capability name rather than "K", used for  curses
+        key names.  On the other hand, an application can use define_key(3x) to
+-       bind  a  specific  key  to  a  string of the programmer's choice.  This
+-       feature  enables  an  application  to  check  for  its  presence   with
++       bind a specific key to a  string  of  the  programmer's  choice.   This
++       feature   enables  an  application  to  check  for  its  presence  with
+        tigetstr(3x), and reassign the key code to match its own needs.
+ 
+        Low-level applications can use tigetstr(3x) to obtain the definition of
+-       any string capability.  curses applications  use  the  input  character
++       any  string  capability.   curses  applications use the input character
+        reading function to obtain key codes from input and rely upon the order
+-       in which the string capabilities are loaded.  Multiple  key  capability
+-       strings  can  have  the  same  value,  but  the input character reading
+-       function can report only one key  code.   Most  curses  implementations
+-       (including  ncurses)  load  key definitions in the order they appear in
++       in  which  the string capabilities are loaded.  Multiple key capability
++       strings can have the  same  value,  but  the  input  character  reading
++       function  can  report  only  one key code.  Most curses implementations
++       (including ncurses) load key definitions in the order  they  appear  in
+        the strfnames array of string capability names; see term_variables(3x).
+-       The  last  capability read using a particular definition determines the
+-       key code to be reported.  In  ncurses,  extended  capabilities  can  be
+-       interpreted  as key definitions.  These are loaded after the predefined
+-       keys, and if a capability's value is the same as  a  previously  loaded
++       The last capability read using a particular definition  determines  the
++       key  code  to  be  reported.   In ncurses, extended capabilities can be
++       interpreted as key definitions.  These are loaded after the  predefined
++       keys,  and  if  a capability's value is the same as a previously loaded
+        key definition, the library uses the later definition.
+ 
+ 
+@@ -384,32 +385,32 @@
+        support it with cbreak, nocbreak, intrflush, keypad, meta, nodelay, and
+        typeahead.
+ 
+-       SVr3  (1987)  added  halfdelay,  notimeout,  and wtimeout.  qiflush and
+-       noqiflush appeared in SVr3.1 (1987), at which point intrflush became  a
+-       wrapper  for  either  of these functions, depending on the value of its
++       SVr3 (1987) added halfdelay,  notimeout,  and  wtimeout.   qiflush  and
++       noqiflush  appeared in SVr3.1 (1987), at which point intrflush became a
++       wrapper for either of these functions, depending on the  value  of  its
+        Boolean argument.  SVr3.1 also added timeout.
+ 
+        ncurses 6.5 (2024) introduced is_cbreak, is_echo, is_nl, and is_raw.
+ 
+-       Formerly, ncurses used  nl  and  nonl  to  control  the  conversion  of
+-       newlines  to  carriage  return/line  feed  on  output as well as input.
+-       X/Open Curses documents the use of  these  functions  only  for  input.
+-       This  difference arose from converting the pcurses source (1986), which
+-       used ioctl(2) calls and the sgttyb structure,  to  termios  (the  POSIX
+-       terminal  API).   In the former, both input and output conversions were
+-       controlled via a single option  "CRMOD",  while  the  latter  separates
+-       these   features.   Because  that  conversion  interferes  with  output
++       Formerly,  ncurses  used  nl  and  nonl  to  control  the conversion of
++       newlines to carriage return/line feed  on  output  as  well  as  input.
++       X/Open  Curses  documents  the  use  of these functions only for input.
++       This difference arose from converting the pcurses source (1986),  which
++       used  ioctl(2)  calls  and  the sgttyb structure, to termios (the POSIX
++       terminal API).  In the former, both input and output  conversions  were
++       controlled  via  a  single  option  "CRMOD", while the latter separates
++       these  features.   Because  that  conversion  interferes  with   output
+        optimization, ncurses 6.2 (2020) amended nl and nonl to eliminate their
+        effect on output.
+ 
+ 
+ 
                                                                                                                                                                    SEE ALSO
                                                                                                                                                                    +-       curses(3x),     curs_getch(3x),     curs_initscr(3x),    curs_util(3x),
++       curses(3x),    curs_getch(3x),     curs_initscr(3x),     curs_util(3x),
+        define_key(3x), termios(3), term_variables(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2025-04-05                   curs_inopts(3x)
++ncurses 6.5                       2025-07-05                   curs_inopts(3x)
+ 
                                                                                                                                                                    
+ 
                                                                                                                                                                    
+ 
                                                                                                                                                                      
+Index: doc/html/man/curs_instr.3x.html
+--- ncurses-6.5-20250628+/doc/html/man/curs_instr.3x.html	2025-03-01 22:03:51.000000000 +0000
++++ ncurses-6.5-20250705/doc/html/man/curs_instr.3x.html	2025-07-05 13:12:25.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_instr.3x,v 1.74 2025/03/01 21:29:42 tom Exp @
++  * @Id: curs_instr.3x,v 1.76 2025/07/05 12:55:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_instr 3x 2025-03-01 ncurses 6.5 Library calls
++curs_instr 3x 2025-07-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                      curs_instr 3x 2025-03-01 ncurses 6.5 Library calls
                                                                                                                                                                      
++
                                                                                                                                                                      curs_instr 3x 2025-07-05 ncurses 6.5 Library calls
                                                                                                                                                                      
+ 
                                                                                                                                                                      + curs_instr(3x)                   Library calls                  curs_instr(3x)
+ 
+@@ -77,10 +77,10 @@
+ 
+ 
+ 
                                                                                                                                                                      RETURN VALUE
                                                                                                                                                                      +-       These functions return the count of characters copied from win to  str,
+-       or ERR upon failure.
++       These functions return the count of characters copied from win  to  str
++       (not counting the null terminator), or ERR upon failure.
+ 
+-       In ncurses, these functions return ERR if
++       In ncurses, these functions fail if
+ 
+        o   the curses screen has not been initialized,
+ 
+@@ -144,7 +144,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-03-01                    curs_instr(3x)
++ncurses 6.5                       2025-07-05                    curs_instr(3x)
+ 
                                                                                                                                                                      
+ 
                                                                                                                                                                      
+ 
                                                                                                                                                                        
+Index: doc/html/man/curs_mouse.3x.html
+--- ncurses-6.5-20250628+/doc/html/man/curs_mouse.3x.html	2025-04-05 22:33:04.000000000 +0000
++++ ncurses-6.5-20250705/doc/html/man/curs_mouse.3x.html	2025-07-05 14:24:31.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_mouse.3x,v 1.126 2025/04/05 22:08:22 tom Exp @
++  * @Id: curs_mouse.3x,v 1.129 2025/07/05 12:57:40 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_mouse 3x 2025-04-05 ncurses 6.5 Library calls
++curs_mouse 3x 2025-07-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                        curs_mouse 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                        
++
                                                                                                                                                                        curs_mouse 3x 2025-07-05 ncurses 6.5 Library calls
                                                                                                                                                                        
+ 
                                                                                                                                                                        + curs_mouse(3x)                   Library calls                  curs_mouse(3x)
+ 
+@@ -99,22 +99,24 @@
+ 
+        ncurses  ignores  mouse  events  when  input is in canonical ("cooked")
+        mode, and produces an error beep when  they  occur  while  the  library
+-       simulates canonical mode in a window, as with getstr(3x), which expects
+-       a line feed to terminate its input loop.
++       simulates  canonical  mode  in  a  window,  as  with  getstr(3x) (wide-
++       character API users:  get_wstr(3x)),  which  expects  a  line  feed  to
++       terminate its input loop.
+ 
+ 
+ 
                                                                                                                                                                        has_mouse
                                                                                                                                                                        +-       The terminal type  or  operating  system  interface  must  support  the
+-       encoding  of  mouse  events.  has_mouse returns TRUE if ncurses's mouse
++       The  terminal  type  or  operating  system  interface  must support the
++       encoding of mouse events.  has_mouse returns TRUE  if  ncurses's  mouse
+        driver initialized successfully, and FALSE otherwise.
+ 
+ 
+ 
                                                                                                                                                                        mousemask
                                                                                                                                                                        +-       Use mousemask to select the varieties of mouse event  your  application
++       Use  mousemask  to select the varieties of mouse event your application
+        wishes to receive.  By default, ncurses reports no mouse events.
+ 
+-       o   The  function  returns an updated copy of new-mask indicating which
+-           of the specified mouse events can be reported.
++       o   The function returns an updated copy of new-mask  indicating  which
++           event  types  of  interest  are  reportable by the terminal's mouse
++           protocol.
+ 
+            If the screen is not initialized, or the  terminal  interface  does
+            not report mouse events, mousemask returns 0.
+@@ -174,10 +176,10 @@
+ 
+ 
+ 
                                                                                                                                                                        getmouse
                                                                                                                                                                        +-       Once a class of mouse events has been made visible in a window, calling
+-       the  input  character  reading  function  on  that  window  may  return
+-       KEY_MOUSE  as an indicator that a mouse event is enqueued.  To read the
+-       event data and pop the  event  off  the  queue,  call  getmouse,  which
++       When  a  window is configured to report a non-empty set of event types,
++       calling the input character reading function on that window may  return
++       KEY_MOUSE to indicate availability of an enqueued mouse event.  To read
++       the event data and remove it  from  the  queue,  call  getmouse,  which
+        returns  OK  if  a  mouse  event is visible in the given window and ERR
+        otherwise.  When getmouse returns OK, it deposits data  describing  the
+        mouse  event  in  the  event pointer you supply.  A subsequent getmouse
+@@ -407,7 +409,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-04-05                    curs_mouse(3x)
++ncurses 6.5                       2025-07-05                    curs_mouse(3x)
+ 
                                                                                                                                                                        
+ 
                                                                                                                                                                        
+ 
                                                                                                                                                                          
+Index: doc/html/man/curs_outopts.3x.html
+--- ncurses-6.5-20250628+/doc/html/man/curs_outopts.3x.html	2025-04-05 22:57:19.000000000 +0000
++++ ncurses-6.5-20250705/doc/html/man/curs_outopts.3x.html	2025-07-05 13:12:25.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_outopts.3x,v 1.98 2025/04/05 22:40:21 tom Exp @
++  * @Id: curs_outopts.3x,v 1.104 2025/07/05 13:01:50 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_outopts 3x 2025-04-05 ncurses 6.5 Library calls
++curs_outopts 3x 2025-07-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                          curs_outopts 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                          
++
                                                                                                                                                                          curs_outopts 3x 2025-07-05 ncurses 6.5 Library calls
                                                                                                                                                                          
+ 
                                                                                                                                                                          + curs_outopts(3x)                 Library calls                curs_outopts(3x)
+ 
+@@ -102,11 +102,11 @@
+ 
                                                                                                                                                                          immedok
                                                                                                                                                                          +        If immedok is called with TRUE  as  second  argument,  changes  to  the
+        window  image,  such  as  those  caused by waddch, wclrtobot, or wscrl,
+-       automatically cause a call to wrefresh.  However, doing so may  degrade
+-       performance  considerably  when many such calls occur.  Calling immedok
+-       with FALSE as second argument restores the default behavior,  deferring
+-       screen  updates until a refresh is needed or explicitly directed by the
+-       application.
++       automatically cause a call to wrefresh.   Setting  a  window's  immedok
++       property  may  degrade performance considerably if writes are frequent.
++       Calling immedok with FALSE as  second  argument  restores  the  default
++       behavior,  deferring  screen  updates  until  a  refresh  is  needed or
++       explicitly directed by the application.
+ 
+ 
+ 
                                                                                                                                                                          leaveok
                                                                                                                                                                          +@@ -119,27 +119,27 @@
+ 
+ 
                                                                                                                                                                          scrollok
                                                                                                                                                                          +        The scrollok option controls what happens when a window's cursor  moves
+-       off the edge of the window or scrolling region, either as a result of a
+-       newline occurring on the bottom line, or writing to the last  character
+-       of  the last line.  If disabled (bf is FALSE), curses leaves the cursor
+-       on the bottom line of the window.  If  enabled  (bf  is  TRUE),  curses
+-       scrolls  the window up one line.  (To get the physical scrolling effect
+-       on the terminal, the application must also enable idlok).
++       off  the  edge of the window or scrolling region, as a result of either
++       (1) writing a newline anywhere on its bottom line,  or  (2)  writing  a
++       character  that  advances the cursor to the last position on its bottom
++       line.  If disabled (bf is FALSE),  curses  leaves  the  cursor  on  the
++       bottom line of the window.  If enabled (bf is TRUE), curses scrolls the
++       window up one line.  (To get  the  physical  scrolling  effect  on  the
++       terminal, the application must also enable idlok).
+ 
+ 
+ 
                                                                                                                                                                          setscrreg, wsetscrreg
                                                                                                                                                                          +-       The wsetscrreg and setscrreg functions allow the application to  set  a
+-       software   scrolling   region   in  the  specified  window  or  stdscr,
+-       respectively.  The top and bot 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 scrollok 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.  (This process has nothing to do with
+-       the scrolling region capability of the terminal, as found  in  the  DEC
+-       VT100.)   If  idlok  is enabled and the terminal has either a scrolling
+-       region or insert/delete line capability, they will probably be used  by
+-       the output routines.)
++       The  wsetscrreg  and setscrreg functions allow the application to set a
++       software  scrolling  region  in  the  specified   window   or   stdscr,
++       respectively.   The  top and bot parameters are the line numbers of the
++       top and bottom margin of the scrolling  region.   If  this  option  and
++       scrollok  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.
++       (This process has nothing to do with the scrolling region capability of
++       the  terminal, as found in the DEC VT100.)  If idlok is enabled and the
++       terminal  has  either  a  scrolling  region   or   insert/delete   line
++       capability, they will probably be used by the output routines.
+ 
+ 
+ 
                                                                                                                                                                          RETURN VALUE
                                                                                                                                                                          +@@ -167,26 +167,33 @@
+        accept a pointer-to-WINDOW parameter,  but  operates  on  stdscr.   Use
+        wsetscrreg to configure the scrolling region of a selected window.
+ 
+-       The  immedok  routine  is  useful for windows that are used as terminal
+-       emulators.
++       Historically,  applications used idcok(FALSE) to accommodate the "magic
++       cookie" feature of some terminal types; see  subsection  "Highlighting,
++       Underlining,  and Visible Bells" of terminfo(5).  When updating a line,
++       the presence of character cells with magic cookies  in  them  made  the
++       curses library's computations of characters to be rewritten inaccurate.
++       A  better  solution  is  to  indicate  the  magic_cookie_glitch   (xmc)
++       capability in the terminal's type description.
++
++       immedok is useful for windows that are used as terminal emulators.
+ 
+ 
+ 
                                                                                                                                                                          PORTABILITY
                                                                                                                                                                          +        X/Open Curses Issue 4 describes these functions.  It specifies no error
+        conditions for them.
+ 
+-       Some  historic  curses implementations, as an undocumented feature, did
+-       the  equivalent  of  "clearok(...,   1)"   when   touchwin(stdstr)   or
++       Some historic curses implementations, as an undocumented  feature,  did
++       the   equivalent   of   "clearok(...,   1)"  when  touchwin(stdstr)  or
+        clear(stdstr) were used.  This trick does not work with ncurses.
+ 
+-       Early  System V  curses  implementations  specified  that with scrollok
+-       enabled, any window modification triggering  a  scroll  also  forced  a
+-       physical  refresh.   X/Open  Curses  does not require this, and ncurses
++       Early System V curses  implementations  specified  that  with  scrollok
++       enabled,  any  window  modification  triggering  a scroll also forced a
++       physical refresh.  X/Open Curses does not  require  this,  and  ncurses
+        avoids doing so to better optimize vertical motions upon a wrefresh.
+ 
+        X/Open Curses does not mention that the cursor should be made invisible
+-       as  a  side-effect  of  leaveok.   SVr4 curses documentation notes this
+-       behavior, but the code neglects to implement it.  Use  curs_set(3x)  to
++       as a side-effect of leaveok.   SVr4  curses  documentation  notes  this
++       behavior,  but  the code neglects to implement it.  Use curs_set(3x) to
+        make the cursor invisible.
+ 
+ 
+@@ -197,17 +204,17 @@
+ 
+        SVr3.1 (1987) implemented idcok and immedok.
+ 
+-       ncurses  formerly treated nl and nonl as both input and output options,
++       ncurses formerly treated nl and nonl as both input and output  options,
+        but no longer; see curs_inopts(3x).
+ 
+ 
+ 
                                                                                                                                                                          SEE ALSO
                                                                                                                                                                          +-       curses(3x),    curs_addch(3x),    curs_clear(3x),     curs_initscr(3x),
++       curses(3x),     curs_addch(3x),    curs_clear(3x),    curs_initscr(3x),
+        curs_refresh(3x), curs_scroll(3x), curs_variables(3x)
+ 
+ 
+ 
+-ncurses 6.5                       2025-04-05                  curs_outopts(3x)
++ncurses 6.5                       2025-07-05                  curs_outopts(3x)
+ 
                                                                                                                                                                          
+ 
                                                                                                                                                                          
+ 
                                                                                                                                                                            
+Index: doc/html/man/curs_printw.3x.html
+--- ncurses-6.5-20250628+/doc/html/man/curs_printw.3x.html	2025-04-19 23:33:04.000000000 +0000
++++ ncurses-6.5-20250705/doc/html/man/curs_printw.3x.html	2025-07-05 13:12:25.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_printw.3x,v 1.61 2025/04/19 23:28:38 tom Exp @
++  * @Id: curs_printw.3x,v 1.63 2025/07/05 13:02:27 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_printw 3x 2025-04-19 ncurses 6.5 Library calls
++curs_printw 3x 2025-07-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                            curs_printw 3x 2025-04-19 ncurses 6.5 Library calls
                                                                                                                                                                            
++
                                                                                                                                                                            curs_printw 3x 2025-07-05 ncurses 6.5 Library calls
                                                                                                                                                                            
+ 
                                                                                                                                                                            + curs_printw(3x)                  Library calls                 curs_printw(3x)
+ 
+@@ -130,8 +130,8 @@
+        "printf on win", respectively.
+ 
+        SVr3  summarized the functions in three lines, asserting that they were
+-       analogous to printf(3), explaining that the string that printf(3) would
+-       write  to  the  standard  output  stream  would instead be output using
++       analogous to printf(3) and explaining that the  string  that  printf(3)
++       would write to the standard output stream would instead be output using
+        waddstr to the given window.
+ 
+        SVr3 added vwprintw, describing  its  third  parameter  as  a  va_list,
+@@ -150,7 +150,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-04-19                   curs_printw(3x)
++ncurses 6.5                       2025-07-05                   curs_printw(3x)
+ 
                                                                                                                                                                            
+ 
                                                                                                                                                                            
+ 
                                                                                                                                                                              
+Index: doc/html/man/curs_scanw.3x.html
+--- ncurses-6.5-20250628+/doc/html/man/curs_scanw.3x.html	2025-04-05 22:33:04.000000000 +0000
++++ ncurses-6.5-20250705/doc/html/man/curs_scanw.3x.html	2025-07-05 13:12:25.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_scanw.3x,v 1.60 2025/04/05 22:20:10 tom Exp @
++  * @Id: curs_scanw.3x,v 1.62 2025/07/05 13:03:05 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_scanw 3x 2025-04-05 ncurses 6.5 Library calls
++curs_scanw 3x 2025-07-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                              curs_scanw 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                              
++
                                                                                                                                                                              curs_scanw 3x 2025-07-05 ncurses 6.5 Library calls
                                                                                                                                                                              
+ 
                                                                                                                                                                              + curs_scanw(3x)                   Library calls                  curs_scanw(3x)
+ 
+@@ -169,7 +169,7 @@
+        SVr4 (1989) introduced no new variations of  scanw,  but  provided  for
+        using either varargs.h or stdarg.h to define the va_list type.
+ 
+-       X/Open  Curses  Issue 4  (1995),  defined  vw_scanw to replace vwscanw,
++       X/Open  Curses  Issue 4  (1995)  defined  vw_scanw  to replace vwscanw,
+        stating that its va_list type is defined in stdarg.h.
+ 
+ 
+@@ -178,7 +178,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-04-05                    curs_scanw(3x)
++ncurses 6.5                       2025-07-05                    curs_scanw(3x)
+ 
                                                                                                                                                                              
+ 
                                                                                                                                                                              
+ 
                                                                                                                                                                                
+Index: doc/html/man/curs_util.3x.html
+--- ncurses-6.5-20250628+/doc/html/man/curs_util.3x.html	2025-04-05 22:33:05.000000000 +0000
++++ ncurses-6.5-20250705/doc/html/man/curs_util.3x.html	2025-07-05 13:12:26.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_util.3x,v 1.141 2025/04/05 22:22:48 tom Exp @
++  * @Id: curs_util.3x,v 1.143 2025/07/05 13:06:45 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_util 3x 2025-04-05 ncurses 6.5 Library calls
++curs_util 3x 2025-07-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                curs_util 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                                
++
                                                                                                                                                                                curs_util 3x 2025-07-05 ncurses 6.5 Library calls
                                                                                                                                                                                
+ 
                                                                                                                                                                                + curs_util(3x)                    Library calls                   curs_util(3x)
+ 
+@@ -178,7 +178,7 @@
+            in  those  to  override  the  results  from the operating system or
+            terminal database.
+ 
+-           curses also updates the screen size in response to SIGWINCH, unless
++           curses also updates the screen size in response to SIGWINCH, unless
+            overridden by the LINES or COLUMNS environment variables,
+ 
+ 
+@@ -424,7 +424,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-04-05                     curs_util(3x)
++ncurses 6.5                       2025-07-05                     curs_util(3x)
+ 
                                                                                                                                                                                
+ 
                                                                                                                                                                                
+ 
                                                                                                                                                                                  
+Index: doc/html/man/curs_variables.3x.html
+--- ncurses-6.5-20250628+/doc/html/man/curs_variables.3x.html	2025-04-05 22:33:05.000000000 +0000
++++ ncurses-6.5-20250705/doc/html/man/curs_variables.3x.html	2025-07-05 13:12:26.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_variables.3x,v 1.62 2025/04/05 22:24:24 tom Exp @
++  * @Id: curs_variables.3x,v 1.65 2025/07/05 13:04:08 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-curs_variables 3x 2025-04-05 ncurses 6.5 Library calls
++curs_variables 3x 2025-07-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                  curs_variables 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                                  
++
                                                                                                                                                                                  curs_variables 3x 2025-07-05 ncurses 6.5 Library calls
                                                                                                                                                                                  
+ 
                                                                                                                                                                                  + curs_variables(3x)               Library calls              curs_variables(3x)
+ 
+@@ -123,7 +123,7 @@
+        standards,  each of which also defined a Boolean data type.  The curses
+        library requires an integral type bool.
+ 
+-       ncurses' configure script attempts to discover the data  type  used  by
++       ncurses's configure script attempts to discover the data type  used  by
+        the system's C and C++ compilers, to reuse for the curses bool.
+ 
+ 
+@@ -196,9 +196,9 @@
+        When  reading  key  strokes  from  a  window  in  keypad  mode,  curses
+        distinguishes  the  ESC  character resulting from a user's press of the
+        "Escape" key on the input device from one beginning an escape  sequence
+-       (commonly  produced  by  function  keys),  by  waiting after the escape
+-       character to see if further  characters  are  available  on  the  input
+-       stream  within  a  short  interval.   ESCDELAY  stores this interval in
++       (commonly  produced  by  function keys), by waiting after receiving the
++       escape character to see if further  characters  are  available  on  the
++       input stream within a short interval.  ESCDELAY stores this interval in
+        milliseconds.
+ 
+        If keypad(3x) is disabled for the  curses  window  receiving  input,  a
+@@ -244,16 +244,16 @@
+        TABSIZE is a feature of SVr4 curses.
+ 
+        o   SVr4  initially  sets  TABSIZE  from  the  terminal   description's
+-           init_tabs   capability.    After   that,   it  can  be  altered  by
++           init_tabs  (it)  capability.   After  that,  it  can  be altered by
+            applications using SVr4 curses.
+ 
+-       o   SVr4 curses uses the value of TABSIZE to compute  the  position  of
+-           tab  stops when updating both the virtual screen with addch(3x) and
+-           the physical screen with mvcur(3x).
+-
+-       o   ncurses uses the value  of  TABSIZE  only  to  update  the  virtual
+-           screen.   It  uses  the  terminal  description's  "it"  (init_tabs)
+-           capability for computing hardware tabs (that is, tab stops  on  the
++       o   SVr4 curses uses TABSIZE's value to compute  the  position  of  tab
++           stops  when updating both the virtual screen with addch(3x) and the
++           physical screen with mvcur(3x).
++
++       o   In ncurses, TABSIZE's value affects only the virtual  screen.   The
++           library   uses  the  terminal  type  description's  init_tabs  (it)
++           capability to compute hardware tabs (that  is,  tab  stops  on  the
+            physical screen).
+ 
+        o   Other  implementations  differ.  For instance, NetBSD curses allows
+@@ -261,22 +261,22 @@
+            not.
+ 
+            NetBSD curses does not support hardware tabs; it uses the init_tabs
+-           capability and the TABSIZE variable only for updating  the  virtual
++           (it) capability and the TABSIZE variable only to update the virtual
+            screen.
+ 
+        ESCDELAY is a feature of AIX curses.
+ 
+-       o   In AIX, the units for ESCDELAY are fifths of milliseconds.
++       o   AIX treats ESCDELAY's value as counting fifths of milliseconds.
+ 
+-       o   The default value for AIX's ESCDELAY equals 0.1 seconds.
++       o   AIX's default ESCDELAY equals 0.1 seconds.
+ 
+        o   AIX  also  enforces a limit of 10,000 seconds for ESCDELAY; ncurses
+-           does not enforce any upper limit.
++           does not enforce an upper limit.
+ 
+-       ncurses has long used ESCDELAY with units of  milliseconds,  making  it
+-       impossible  to  be  completely compatible with AIX.  Consequently, most
+-       users have decided either to override the value, or to  rely  upon  its
+-       default.
++       ncurses has long interpreted  ESCDELAY  as  a  count  of  milliseconds,
++       making   it   impossible   to   be   completely  compatible  with  AIX.
++       Consequently, most users have decided either to override the value,  or
++       to rely upon its default.
+ 
+ 
+ 
                                                                                                                                                                                  SEE ALSO
                                                                                                                                                                                  +@@ -290,7 +290,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-04-05                curs_variables(3x)
++ncurses 6.5                       2025-07-05                curs_variables(3x)
+ 
                                                                                                                                                                                  
+ 
                                                                                                                                                                                  
+ 
                                                                                                                                                                                    
+Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.5-20250628+/doc/html/man/infotocap.1m.html	2025-01-19 00:55:00.000000000 +0000
++++ ncurses-6.5-20250705/doc/html/man/infotocap.1m.html	2025-07-05 13:12:27.000000000 +0000
+@@ -27,19 +27,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: infotocap.1m,v 1.48 2025/01/19 00:51:10 tom Exp @
++  * @Id: infotocap.1m,v 1.50 2025/07/05 13:04:38 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-infotocap 1m 2025-01-18 ncurses 6.5 User commands
++infotocap 1m 2025-07-05 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                    infotocap 1m 2025-01-18 ncurses 6.5 User commands
                                                                                                                                                                                    
++
                                                                                                                                                                                    infotocap 1m 2025-07-05 ncurses 6.5 User commands
                                                                                                                                                                                    
+ 
                                                                                                                                                                                    + infotocap(1m)                    User commands                   infotocap(1m)
+ 
+@@ -58,7 +58,7 @@
+ 
+ 
                                                                                                                                                                                    DESCRIPTION
                                                                                                                                                                                    +        infotocap  translates  terminal  descriptions.   It looks in each given
+-       text file for terminfo entries and, for each one found,  it  writes  an
++       text file for terminfo entries and,  for  each  one  found,  writes  an
+        analogous  termcap description to the standard output stream.  terminfo
+        "use" capabilities  translate  to  termcap  tc  capabilities.   Because
+        termcap  is  a  less expressive format than terminfo, some capabilities
+@@ -90,7 +90,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-01-18                     infotocap(1m)
++ncurses 6.5                       2025-07-05                     infotocap(1m)
+ 
                                                                                                                                                                                    
+ 
                                                                                                                                                                                    
+ 
                                                                                                                                                                                      
+Index: doc/html/man/key_defined.3x.html
+--- ncurses-6.5-20250628+/doc/html/man/key_defined.3x.html	2024-06-08 23:29:41.000000000 +0000
++++ ncurses-6.5-20250705/doc/html/man/key_defined.3x.html	2025-07-05 13:12:27.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+ 
+ 
+ 
+-key_defined 3x 2024-06-08 ncurses 6.5 Library calls
++key_defined 3x 2025-07-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                      key_defined 3x 2024-06-08 ncurses 6.5 Library calls
                                                                                                                                                                                      
++
                                                                                                                                                                                      key_defined 3x 2025-07-05 ncurses 6.5 Library calls
                                                                                                                                                                                      
+ 
                                                                                                                                                                                      + key_defined(3x)                  Library calls                 key_defined(3x)
+ 
+@@ -70,7 +70,7 @@
+ 
+ 
+ 
                                                                                                                                                                                      EXTENSIONS
                                                                                                                                                                                      +-       define_key is an ncurses extension.
++       key_defined is an ncurses extension.
+ 
+ 
+ 
                                                                                                                                                                                      PORTABILITY
                                                                                                                                                                                      +@@ -87,7 +87,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2024-06-08                   key_defined(3x)
++ncurses 6.5                       2025-07-05                   key_defined(3x)
+ 
                                                                                                                                                                                      
+ 
                                                                                                                                                                                      
+ 
                                                                                                                                                                                        
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.5-20250628+/doc/html/man/ncurses.3x.html	2025-04-26 20:32:44.000000000 +0000
++++ ncurses-6.5-20250705/doc/html/man/ncurses.3x.html	2025-07-05 13:12:27.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: ncurses.3x,v 1.252 2025/04/05 22:54:19 tom Exp @
++  * @Id: ncurses.3x,v 1.255 2025/07/05 12:42:14 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-ncurses 3x 2025-04-05 ncurses 6.5 Library calls
++ncurses 3x 2025-07-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                        ncurses 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                                        
++
                                                                                                                                                                                        ncurses 3x 2025-07-05 ncurses 6.5 Library calls
                                                                                                                                                                                        
+ 
                                                                                                                                                                                        + ncurses(3x)                      Library calls                     ncurses(3x)
+ 
+@@ -61,7 +61,7 @@
+        displays  with  output  optimized  to minimize screen updates.  ncurses
+        replaces the curses libraries from System V Release 4 Unix ("SVr4") and
+        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
+-       document describes ncurses version 6.5 (patch 20250426).
++       document describes ncurses version 6.5 (patch 20250705).
+ 
+        ncurses permits control of the terminal screen's contents;  abstraction
+        and  subdivision thereof with windows and pads; acquisition of keyboard
+@@ -250,8 +250,8 @@
+ 
+ 
                                                                                                                                                                                        Wide and Non-wide Character Configurations
                                                                                                                                                                                        +        This  man  page  primarily  surveys  functions  that  appear   in   any
+-       configuration of the library.  There are two common configurations; see
+-       section "ALTERNATE CONFIGURATIONS" below.
++       configuration of the library.  There are two common configurations; for
++       others, see section "ALTERNATE CONFIGURATIONS" below.
+ 
+        ncurses   is the library in its "non-wide" configuration, handling only
+                  eight-bit  characters.   It  stores a character combined with
+@@ -938,44 +938,46 @@
+        For example, to tell ncurses not to assume anything about  the  colors,
+        use  a  value  of  "-1,-1".   To make the default color scheme green on
+        black, use "2,0".  ncurses accepts integral values from -1  up  to  the
+-       value of the terminfo max_colors (colors) capability.
++       value  of  the terminfo max_colors (colors) capability for the selected
++       terminal type.
+ 
+ 
+ 
                                                                                                                                                                                        NCURSES_CONSOLE2
                                                                                                                                                                                        +-       (MinGW   port  only)  The  Console2  program  defectively  handles  the
+-       Microsoft Console  API  call  CreateConsoleScreenBuffer.   Applications
+-       that  use it will hang.  However, it is possible to simulate the action
+-       of this call by mapping coordinates, explicitly  saving  and  restoring
+-       the  original  screen contents.  Setting the environment variable NCGDB
++       (MinGW  port  only)  The  Console2  program  defectively  handles   the
++       Microsoft  Console  API  call  CreateConsoleScreenBuffer.  Applications
++       that use it will hang.  However, it is possible to simulate the  action
++       of  this  call  by mapping coordinates, explicitly saving and restoring
++       the original screen contents.  Setting the environment  variable  NCGDB
+        has the same effect.
+ 
+ 
+ 
                                                                                                                                                                                        NCURSES_GPM_TERMS
                                                                                                                                                                                        +-       (Linux only) When ncurses is configured to use the GPM interface,  this
+-       variable  may  list  one  or  more  terminal  type  names, delimited by
+-       vertical bars (|) or colons (:), against which the TERM  variable  (see
+-       below)  is  matched.   An empty value disables the GPM interface, using
+-       ncurses's built-in support for xterm(1) mouse  protocols  instead.   If
+-       the  variable  is absent, ncurses attempts to open GPM if TERM contains
++       (Linux  only) When ncurses is configured to use the GPM interface, this
++       variable may list  one  or  more  terminal  type  names,  delimited  by
++       vertical  bars  (|) or colons (:), against which the TERM variable (see
++       below) is matched.  An empty value disables the  GPM  interface,  using
++       ncurses's  built-in  support  for xterm(1) mouse protocols instead.  If
++       the variable is absent, ncurses attempts to open GPM if  TERM  contains
+        "linux".
+ 
+ 
+ 
                                                                                                                                                                                        NCURSES_NO_HARD_TABS
                                                                                                                                                                                        +-       ncurses may use tab characters in  cursor  movement  optimization.   In
+-       some  cases,  your  terminal  driver may not handle them properly.  Set
++       ncurses  may  use  tab  characters in cursor movement optimization.  In
++       some cases, your terminal driver may not  handle  them  properly.   Set
+        this environment variable to any value to disable the feature.  You can
+        also adjust your stty(1) settings to avoid the problem.
+ 
+ 
+ 
                                                                                                                                                                                        NCURSES_NO_MAGIC_COOKIE
                                                                                                                                                                                        +-       Many  terminals  store  video  attributes  as a property of a character
+-       cell, as curses does.  Historically, some  recorded  changes  in  video
+-       attributes  as  data  that  logically  occupies  character cells on the
+-       display, switching attributes on or off, similarly to tags in a  markup
+-       language;  these  are  termed "magic cookies", and must be subsequently
+-       overprinted.  If the terminfo entry for your  terminal  type  does  not
+-       adequately describe its handling of magic cookies, set this variable to
+-       any value to instruct ncurses to disable attributes entirely.
++       Many terminals store video attributes  as  properties  of  a  character
++       cell,  as  curses  does.   Historically, some recorded changes in video
++       attributes as data that  logically  occupied  character  cells  on  the
++       display,  switching attributes on or off, similarly to tags in a markup
++       language, which then had to be overprinted to depict the cells' desired
++       contents;  these are termed "magic cookies".  If the terminfo entry for
++       your terminal type does not adequately describe its handling  of  magic
++       cookies,  set this variable to any value to instruct ncurses to disable
++       attributes entirely.
+ 
+ 
+ 
                                                                                                                                                                                        NCURSES_NO_PADDING
                                                                                                                                                                                        +@@ -1244,12 +1246,12 @@
+ 
+        --with-termlib
+             This option configures ncurses to provide low-level functions that
+-            do  not  depend  upon  wide-character  support  in a library names
++            do  not  depend  upon  wide-character  support  in a library named
+             tinfo.
+ 
+             This arrangement enables tinfo to be shared  between  ncurses  and
+-            ncursesw  libraries  as well as application linking and/or loading
+-            times when it requires only low-level functions.
++            ncursesw  libraries  and  reduces  an application's linking and/or
++            loading times when it requires only low-level functions.
+ 
+             The following pages describe low-level curses functions.
+ 
+@@ -1503,7 +1505,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-04-05                       ncurses(3x)
++ncurses 6.5                       2025-07-05                       ncurses(3x)
+ 
                                                                                                                                                                                        
+ 
                                                                                                                                                                                        
+ 
                                                                                                                                                                                          
+Index: doc/html/man/resizeterm.3x.html
+--- ncurses-6.5-20250628+/doc/html/man/resizeterm.3x.html	2025-04-05 22:33:06.000000000 +0000
++++ ncurses-6.5-20250705/doc/html/man/resizeterm.3x.html	2025-07-05 13:12:28.000000000 +0000
+@@ -28,19 +28,19 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey 1996-on
+-  * @Id: resizeterm.3x,v 1.63 2025/04/05 22:26:38 tom Exp @
++  * @Id: resizeterm.3x,v 1.65 2025/07/05 13:06:45 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-resizeterm 3x 2025-04-05 ncurses 6.5 Library calls
++resizeterm 3x 2025-07-05 ncurses 6.5 Library calls
+ 
+ 
+ 
+ 
+-
                                                                                                                                                                                          resizeterm 3x 2025-04-05 ncurses 6.5 Library calls
                                                                                                                                                                                          
++
                                                                                                                                                                                          resizeterm 3x 2025-07-05 ncurses 6.5 Library calls
                                                                                                                                                                                          
+ 
                                                                                                                                                                                          + resizeterm(3x)                   Library calls                  resizeterm(3x)
+ 
+@@ -89,8 +89,8 @@
+        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
++       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.
+ 
+ 
+@@ -104,7 +104,7 @@
+ 
                                                                                                                                                                                          resize_term
                                                                                                                                                                                          +        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
++       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
+@@ -138,13 +138,13 @@
+ 
+ 
                                                                                                                                                                                          NOTES
                                                                                                                                                                                          +        While these functions are intended to  be  used  to  support  a  signal
+-       handler  (i.e.,  for  SIGWINCH), care should be taken to avoid invoking
++       handler  (i.e.,  for  SIGWINCH), care should be taken to avoid invoking
+        them in a context where malloc or realloc may  have  been  interrupted,
+        since it uses those functions.
+ 
+-       If ncurses is configured to supply its own SIGWINCH handler,
++       If ncurses is configured to supply its own SIGWINCH handler,
+ 
+-       o   on receipt of a SIGWINCH, the handler sets a flag
++       o   on receipt of a SIGWINCH, the handler sets a flag
+ 
+        o   which is tested in wgetch(3x), doupdate(3x) and restartterm(3x),
+ 
+@@ -163,7 +163,7 @@
+ 
+        If the environment variables LINES or COLUMNS are set,  this  overrides
+        the  library's  use  of  the  window  size  obtained from the operating
+-       system.  Thus, even if a SIGWINCH is received, no  screen  size  change
++       system.  Thus, even if a SIGWINCH is received, no  screen  size  change
+        may be recorded.
+ 
+ 
+@@ -190,7 +190,7 @@
+ 
+ 
+ 
+-ncurses 6.5                       2025-04-05                    resizeterm(3x)
++ncurses 6.5                       2025-07-05                    resizeterm(3x)
+ 
                                                                                                                                                                                          
+ 
                                                                                                                                                                                          
+ 
                                                                                                                                                                                            
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.5-20250628+/doc/html/man/terminfo.5.html	2025-04-26 20:32:44.000000000 +0000
++++ ncurses-6.5-20250705/doc/html/man/terminfo.5.html	2025-07-05 13:12:28.000000000 +0000
+@@ -71,7 +71,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This document describes ncurses version 6.5 (patch 20250426).
++       This document describes ncurses version 6.5 (patch 20250705).
+ 
+ 
+ 
                                                                                                                                                    terminfo Entry Syntax
                                                                                                                                                    +Index: doc/html/man/tput.1.html
+--- ncurses-6.5-20250628+/doc/html/man/tput.1.html	2025-04-05 22:33:07.000000000 +0000
++++ ncurses-6.5-20250705/doc/html/man/tput.1.html	2025-07-05 13:12:28.000000000 +0000
+@@ -28,19 +28,19 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tput.1,v 1.137 2025/04/05 21:56:26 tom Exp @
++  * @Id: tput.1,v 1.139 2025/07/05 13:06:18 tom Exp @
+ -->
+ 
+ 
+ 
+ 
+ 
+-tput 1 2025-04-05 ncurses 6.5 User commands
++tput 1 2025-07-05 ncurses 6.5 User commands
+ 
+ 
+ 
+ 
+-
                                                                                                                                                    tput 1 2025-04-05 ncurses 6.5 User commands
                                                                                                                                                    
++
                                                                                                                                                    tput 1 2025-07-05 ncurses 6.5 User commands
                                                                                                                                                    
+ 
                                                                                                                                                    + tput(1)                          User commands                         tput(1)
+ 
+@@ -76,51 +76,52 @@
+        code.
+ 
+        terminfo(5) discusses terminal capabilities at length  and  presents  a
+-       complete list of standard cap-codes.
++       complete  list  of standardized cap-codes.  user_caps(5) presents other
++       widely used but non-standard capabilities.
+ 
+-       When   retrieving  capability  values,  the  result  depends  upon  the
++       When  retrieving  capability  values,  the  result  depends  upon   the
+        capability's type.
+ 
+-       Boolean  tput sets its exit status to 0 if the terminal possesses  cap-
++       Boolean  tput  sets its exit status to 0 if the terminal possesses cap-
+                 code, and 1 if it does not.
+ 
+-       numeric  tput  writes  cap-code's  decimal value to the standard output
++       numeric  tput writes cap-code's decimal value to  the  standard  output
+                 stream if defined (-1 if it is not) followed by a newline.
+ 
+-       string   tput writes cap-code's value to the standard output stream  if
++       string   tput  writes cap-code's value to the standard output stream if
+                 defined, without a trailing newline.
+ 
+-       Before  using  a value returned on the standard output, the application
+-       should test tput 's exit status to be sure it is 0; see  section  "EXIT
++       Before using a value returned on the standard output,  the  application
++       should  test  tput 's exit status to be sure it is 0; see section "EXIT
+        STATUS" below.
+ 
+ 
+ 
                                                                                                                                                    Operands
                                                                                                                                                    +-       Generally,  an  operand  is  a  cap-code,  a  capability  code from the
+-       terminal database, or a parameter thereto.  Three others are  specially
++       Generally, an operand  is  a  cap-code,  a  capability  code  from  the
++       terminal  database, or a parameter thereto.  Three others are specially
+        recognized by tput: init, reset, and longname.  Although these resemble
+-       capability codes, they in fact receive special handling; we  term  them
++       capability  codes,  they in fact receive special handling; we term them
+        "pseudo-capabilities".
+ 
+        cap-code   indicates a capability from the terminal database.
+ 
+-                  If  cap-code  is  of  string type and takes parameters, tput
+-                  interprets arguments following cap-code as  the  parameters,
++                  If cap-code is of string type  and  takes  parameters,  tput
++                  interprets  arguments  following cap-code as the parameters,
+                   up to the (fixed) quantity the capability requires.
+ 
+-                  Most   parameters   are   numeric.    Only  a  few  terminal
++                  Most  parameters  are  numeric.    Only   a   few   terminal
+                   capabilities require string parameters; tput uses a table to
+                   decide  which  to  pass  as  strings.   Normally  tput  uses
+                   tparm(3x) to perform the substitution.  If no parameters are
+-                  given  for  the  capability,  tput writes the string without
++                  given for the capability, tput  writes  the  string  without
+                   performing the substitution.
+ 
+-       init       initializes the  terminal.   If  the  terminal  database  is
+-                  present  and  an  entry for the user's terminal type exists,
++       init       initializes  the  terminal.   If  the  terminal  database is
++                  present and an entry for the user's  terminal  type  exists,
+                   the following occur.
+ 
+-                  (1)  tput  retrieves  the  terminal's  mode  settings.    It
+-                       successively  tests  the file descriptors corresponding
++                  (1)  tput   retrieves  the  terminal's  mode  settings.   It
++                       successively tests the file  descriptors  corresponding
+                        to
+ 
+                        o   the standard error stream,
+@@ -131,37 +132,37 @@
+ 
+                        o   /dev/tty
+ 
+-                       to obtain terminal settings.   Having  retrieved  them,
+-                       tput  remembers  which  descriptor  to  use for further
++                       to  obtain  terminal  settings.  Having retrieved them,
++                       tput remembers which  descriptor  to  use  for  further
+                        updates.
+ 
+-                  (2)  If the terminal dimensions cannot be obtained from  the
+-                       operating  system, but the environment or terminal type
+-                       database  entry  describes  them,  tput   updates   the
++                  (2)  If  the terminal dimensions cannot be obtained from the
++                       operating system, but the environment or terminal  type
++                       database   entry   describes  them,  tput  updates  the
+                        operating system's notion of them.
+ 
+                   (3)  tput updates the terminal modes.
+ 
+-                       o   Any  delays  specified  in  the entry (for example,
+-                           when a newline is sent) are  set  in  the  terminal
++                       o   Any delays specified in  the  entry  (for  example,
++                           when  a  newline  is  sent) are set in the terminal
+                            driver.
+ 
+-                       o   Tab   expansion   is  turned  on  or  off  per  the
++                       o   Tab  expansion  is  turned  on  or  off   per   the
+                            specification in the entry, and
+ 
+-                       o   if tabs are not expanded, standard  tabs  (every  8
++                       o   if  tabs  are  not expanded, standard tabs (every 8
+                            spaces) are set.
+ 
+-                  (4)  If  initialization capabilities, detailed in subsection
+-                       "Tabs and Initialization" of terminfo(5), are  present,
++                  (4)  If initialization capabilities, detailed in  subsection
++                       "Tabs  and Initialization" of terminfo(5), are present,
+                        tput writes them to the standard output stream.
+ 
+                   (5)  tput flushes the standard output stream.
+ 
+-                  If  an  entry  lacks  the information needed for an activity
++                  If an entry lacks the information  needed  for  an  activity
+                   above, that activity is silently skipped.
+ 
+-       reset      re-initializes  the  terminal.    A   reset   differs   from
++       reset      re-initializes   the   terminal.    A   reset  differs  from
+                   initialization in two ways.
+ 
+                   (1)  tput sets the terminal modes to a "sane" state,
+@@ -175,36 +176,36 @@
+                        o   setting  any  special  input  characters  to  their
+                            default values.
+ 
+-                  (2)  If any reset capabilities are defined for the  terminal
+-                       type,   tput   writes   them   to  the  output  stream.
+-                       Otherwise,  tput  uses   any   defined   initialization
+-                       capabilities.    Reset  capabilities  are  detailed  in
++                  (2)  If  any reset capabilities are defined for the terminal
++                       type,  tput  writes  them   to   the   output   stream.
++                       Otherwise,   tput   uses   any  defined  initialization
++                       capabilities.   Reset  capabilities  are  detailed   in
+                        subsection "Tabs and Initialization" of terminfo(5).
+ 
+-       longname   A terminfo entry begins with one or more names by  which  an
+-                  application  can  refer  to  the  entry,  before the list of
+-                  terminal capabilities.   The  names  are  separated  by  "|"
+-                  characters.   X/Open  Curses  terms  the last name the "long
++       longname   A  terminfo  entry begins with one or more names by which an
++                  application can refer to  the  entry,  before  the  list  of
++                  terminal  capabilities.   The  names  are  separated  by "|"
++                  characters.  X/Open Curses terms the  last  name  the  "long
+                   name", and indicates that it may include blanks.
+ 
+-                  tic warns if the last  name  does  not  include  blanks,  to
+-                  accommodate  old terminfo entries that treated the long name
+-                  as an optional feature.  The long name is often referred  to
++                  tic  warns  if  the  last  name  does not include blanks, to
++                  accommodate old terminfo entries that treated the long  name
++                  as  an optional feature.  The long name is often referred to
+                   as the description field.
+ 
+-                  If  the  terminal  database  is present and an entry for the
++                  If the terminal database is present and  an  entry  for  the
+                   user's terminal type exists, tput reports its description to
+                   the standard output stream, without a trailing newline.  See
+                   terminfo(5).
+ 
+-       Note: Redirecting the output of "tput init" or "tput reset" to  a  file
++       Note:  Redirecting  the output of "tput init" or "tput reset" to a file
+        will capture only part of their actions.  Changes to the terminal modes
+-       are not affected by file descriptor  redirection,  since  the  terminal
++       are  not  affected  by  file descriptor redirection, since the terminal
+        modes are altered via ioctl(2).
+ 
+ 
+ 
                                                                                                                                                    Aliases
                                                                                                                                                    +-       If  tput  is  invoked  via  link  with any of the names clear, init, or
++       If tput is invoked via link with any  of  the  names  clear,  init,  or
+        reset, it operates as if run with the corresponding (pseudo-)capability
+        operand.  For example, executing a link named reset that points to tput
+        has the same effect as "tput reset".
+@@ -216,46 +217,46 @@
+ 
+        init   has the same name as another program in widespread use.
+ 
+-       reset  is  provided  by  the  tset(1)  utility  (also  via a link named
++       reset  is provided by the  tset(1)  utility  (also  via  a  link  named
+               reset).
+ 
+ 
+ 
                                                                                                                                                    Terminal Size
                                                                                                                                                    +-       Besides the pseudo-capabilities (such as init), tput treats  the  lines
+-       and  cols  cap-codes specially: it may call setupterm(3x) to obtain the
++       Besides  the  pseudo-capabilities (such as init), tput treats the lines
++       and cols cap-codes specially: it may call setupterm(3x) to  obtain  the
+        terminal size.
+ 
+        o   First, tput attempts to obtain these capabilities from the terminal
+-           database.   This generally fails for terminal emulators, which lack
++           database.  This generally fails for terminal emulators, which  lack
+            a fixed window size and thus omit the capabilities.
+ 
+-       o   It then asks the operating system for the  terminal's  size,  which
+-           generally  works,  unless  the connection is via a serial line that
++       o   It  then  asks  the operating system for the terminal's size, which
++           generally works, unless the connection is via a  serial  line  that
+            does not support "NAWS": negotiations about window size.
+ 
+-       o   Finally, it inspects the environment variables LINES  and  COLUMNS,
++       o   Finally,  it  inspects the environment variables LINES and COLUMNS,
+            which may override the terminal size.
+ 
+-       If  the  -T  option is given, tput ignores the environment variables by
++       If the -T option is given, tput ignores the  environment  variables  by
+        calling  use_tioctl(TRUE),  relying  upon  the  operating  system  (or,
+        ultimately, the terminal database).
+ 
+ 
+ 
                                                                                                                                                    OPTIONS
                                                                                                                                                    +-       -S       retrieves  more  than  one  capability per invocation of tput.
+-                The capabilities must be passed  to  tput  from  the  standard
+-                input  stream  instead  of  from the command line (see section
+-                "EXAMPLES" below).  Only one cap-code  is  allowed  per  line.
+-                The  -S  option  changes  the  meanings  of  the  0 and 1 exit
++       -S       retrieves more than one capability  per  invocation  of  tput.
++                The  capabilities  must  be  passed  to tput from the standard
++                input stream instead of from the  command  line  (see  section
++                "EXAMPLES"  below).   Only  one  cap-code is allowed per line.
++                The -S option changes  the  meanings  of  the  0  and  1  exit
+                 statuses (see section "EXIT STATUS" below).
+ 
+-                Some capabilities use string parameters  rather  than  numeric
+-                ones.   tput  employs  a  built-in  table  and the presence of
+-                parameters in its input to decide how to interpret  them,  and
++                Some  capabilities  use  string parameters rather than numeric
++                ones.  tput employs a  built-in  table  and  the  presence  of
++                parameters  in  its input to decide how to interpret them, and
+                 whether to use tparm(3x).
+ 
+        -T type  indicates  the  terminal's  type.   Normally  this  option  is
+-                unnecessary,  because  a  default  is  taken  from  the   TERM
++                unnecessary,   because  a  default  is  taken  from  the  TERM
+                 environment variable.  If specified, the environment variables
+                 LINES and COLUMNS are also ignored.
+ 
+@@ -264,7 +265,7 @@
+        -V       reports the version of ncurses associated with tput, and exits
+                 with a successful status.
+ 
+-       -x       prevents  "tput clear" from attempting to clear the scrollback
++       -x       prevents "tput clear" from attempting to clear the  scrollback
+                 buffer.
+ 
+ 
+@@ -290,14 +291,14 @@
+ 
+ 
+ 
                                                                                                                                                    ENVIRONMENT
                                                                                                                                                    +-       tput reads up to three environment variables if the -T  option  is  not
++       tput  reads  up  to three environment variables if the -T option is not
+        specified.
+ 
+        COLUMNS  specifies the width of the screen in characters.
+ 
+        LINES    specifies the height of the screen in characters.
+ 
+-       TERM     denotes  the  terminal  type.  Each terminal type is distinct,
++       TERM     denotes the terminal type.  Each terminal  type  is  distinct,
+                 though many are similar.
+ 
+ 
+@@ -310,158 +311,158 @@
+ 
+ 
+ 
                                                                                                                                                    PORTABILITY
                                                                                                                                                    +-       Over time ncurses tput has  differed  from  that  of  System V  in  two
++       Over  time  ncurses  tput  has  differed  from  that of System V in two
+        important respects, one now mostly historical.
+ 
+-       o   "tput  cap-code" writes to the standard output, which need not be a
+-           terminal device.  However, the operands  that  manipulate  terminal
++       o   "tput cap-code" writes to the standard output, which need not be  a
++           terminal  device.   However,  the operands that manipulate terminal
+            modes might not use the standard output.
+ 
+-           System V  tput's  init  and  reset  operands use logic from 4.1cBSD
++           System V tput's init and reset  operands  use  logic  from  4.1cBSD
+            tset,  manipulating  terminal  modes.   It  checks  the  same  file
+-           descriptors  (and  /dev/tty) for association with a terminal device
+-           as ncurses now does, and if none are, finally assumes a  1200  baud
++           descriptors (and /dev/tty) for association with a  terminal  device
++           as  ncurses  now does, and if none are, finally assumes a 1200 baud
+            terminal.  When updating terminal modes, it ignores errors.
+ 
+-           Until  ncurses  6.1  (see  section  "HISTORY"  below), tput did not
++           Until ncurses 6.1 (see  section  "HISTORY"  below),  tput  did  not
+            modify  terminal  modes.   It  now  employs  a  scheme  similar  to
+            System V, using functions shared with tset (and ultimately based on
+-           4.4BSD tset).  If it is not able to open a terminal (for  instance,
++           4.4BSD  tset).  If it is not able to open a terminal (for instance,
+            when run by cron(1)), tput exits with an error status.
+ 
+-       o   System V  tput  assumes  that  the  type  of  a cap-code operand is
+-           numeric if all the characters of its value are decimal numbers;  if
++       o   System V tput assumes that  the  type  of  a  cap-code  operand  is
++           numeric  if all the characters of its value are decimal numbers; if
+            they are not, it treats cap-code as a string capability.
+ 
+            Most implementations that provide support for cap-code operands use
+-           the tparm(3x) function to expand  its  parameters.   That  function
+-           expects  a mixture of numeric and string parameters, requiring tput
++           the  tparm(3x)  function  to  expand its parameters.  That function
++           expects a mixture of numeric and string parameters, requiring  tput
+            to know which type to use.
+ 
+-           ncurses tput uses a table to determine the parameter types for  the
+-           standard  cap-code  operands,  and  an internal function to analyze
++           ncurses  tput uses a table to determine the parameter types for the
++           standard cap-code operands, and an  internal  function  to  analyze
+            nonstandard cap-code operands.
+ 
+-           While more reliable than System V's utility, a portability  problem
+-           is  introduced  by this analysis.  An OpenBSD developer adapted the
+-           internal library function from ncurses to  port  NetBSD's  termcap-
+-           based  tput to terminfo, and modified it to interpret multiple cap-
+-           codes (and parameters) on the command line.  Portable  applications
+-           should  not  rely  upon  this feature; ncurses offers it to support
++           While  more reliable than System V's utility, a portability problem
++           is introduced by this analysis.  An OpenBSD developer  adapted  the
++           internal  library  function  from ncurses to port NetBSD's termcap-
++           based tput to terminfo, and modified it to interpret multiple  cap-
++           codes  (and parameters) on the command line.  Portable applications
++           should not rely upon this feature; ncurses  offers  it  to  support
+            applications written specifically for OpenBSD.
+ 
+-       This implementation, unlike others, accepts both termcap  and  terminfo
+-       cap-codes  if  termcap  support is compiled in.  In that case, however,
++       This  implementation,  unlike others, accepts both termcap and terminfo
++       cap-codes if termcap support is compiled in.  In  that  case,  however,
+        the predefined termcap and terminfo codes have two ambiguities; ncurses
+        assumes the terminfo code.
+ 
+-       o   The  cap-code  dl means delete_line to termcap but parm_delete_line
++       o   The cap-code dl means delete_line to termcap  but  parm_delete_line
+            to terminfo.  termcap uses the code DL for parm_delete_line.  term-
+            info uses the code dl1 for delete_line.
+ 
+-       o   The  cap-code  ed  means exit_delete_mode to termcap but clr_eos to
++       o   The cap-code ed means exit_delete_mode to termcap  but  clr_eos  to
+            terminfo.  termcap uses the code cd for clr_eos.  terminfo uses the
+            code rmdc for exit_delete_mode.
+ 
+-       The   longname  operand,  -S  option,  and  the  parameter-substitution
+-       features used in the cup example below, were not supported in  AT&T/USL
++       The  longname  operand,  -S  option,  and  the   parameter-substitution
++       features  used in the cup example below, were not supported in AT&T/USL
+        curses before SVr4 (1989).  Later, 4.3BSD-Reno (1990) added support for
+        longname,  and  in  1994,  NetBSD  added  support  for  the  parameter-
+        substitution features.
+ 
+-       IEEE   Std   1003.1/The   Open   Group   Base   Specifications  Issue 7
+-       (POSIX.1-2008) documents only the clear, init, and reset  operands.   A
++       IEEE  Std   1003.1/The   Open   Group   Base   Specifications   Issue 7
++       (POSIX.1-2008)  documents  only the clear, init, and reset operands.  A
+        few observations of interest arise from that selection.
+ 
+        o   ncurses supports clear as it does any other standard cap-code.  The
+-           others  (init  and  longname)  do  not   correspond   to   terminal
++           others   (init   and   longname)  do  not  correspond  to  terminal
+            capabilities.
+ 
+-       o   The  tput on SVr4-based systems such as Solaris, IRIX64, and HP-UX,
++       o   The tput on SVr4-based systems such as Solaris, IRIX64, and  HP-UX,
+            as well as others such as AIX and Tru64, also support standard cap-
+            code operands.
+ 
+        o   A few platforms such as FreeBSD recognize termcap codes rather than
+            terminfo capability codes in their respective tput commands.  Since
+-           2010,  NetBSD's  tput  uses  terminfo codes.  Before that, it (like
++           2010, NetBSD's tput uses terminfo codes.   Before  that,  it  (like
+            FreeBSD) recognized termcap codes.
+ 
+-           Beginning in 2021, FreeBSD uses ncurses tput, configured  for  both
++           Beginning  in  2021, FreeBSD uses ncurses tput, configured for both
+            terminfo (tested first) and termcap (as a fallback).
+ 
+        Because (apparently) all certified Unix systems support the full set of
+-       capability codes, the reason for documenting only  a  few  may  not  be
++       capability  codes,  the  reason  for  documenting only a few may not be
+        apparent.
+ 
+        o   X/Open Curses Issue 7 documents tput differently, with cap-code and
+            the other features used in this implementation.
+ 
+-       o   That is, there are two standards for tput:  POSIX  (a  subset)  and
+-           X/Open  Curses (the full implementation).  POSIX documents a subset
+-           to avoid the  complication  of  including  X/Open  Curses  and  the
++       o   That  is,  there  are  two standards for tput: POSIX (a subset) and
++           X/Open Curses (the full implementation).  POSIX documents a  subset
++           to  avoid  the  complication  of  including  X/Open  Curses and the
+            terminal capability database.
+ 
+-       o   While  it  is  certainly  possible  to write a tput program without
+-           using curses, no system with a  curses  implementation  provides  a
++       o   While it is certainly possible to  write  a  tput  program  without
++           using  curses,  no  system  with a curses implementation provides a
+            tput utility that does not also support standard cap-codes.
+ 
+-       X/Open   Curses  Issue 7  (2009)  is  the  first  version  to  document
++       X/Open  Curses  Issue 7  (2009)  is  the  first  version  to   document
+        utilities.  However that part of X/Open Curses does not follow existing
+        practice (that is, System V curses behavior).
+ 
+-       o   It  assigns  exit status 4 to "invalid operand", which may have the
+-           same meaning as "unknown capability".   For  instance,  the  source
++       o   It assigns exit status 4 to "invalid operand", which may  have  the
++           same  meaning  as  "unknown  capability".  For instance, the source
+            code for Solaris xcurses uses the term "invalid" in this case.
+ 
+-       o   It  assigns  exit  status  255  to  a  numeric variable that is not
++       o   It assigns exit status 255  to  a  numeric  variable  that  is  not
+            specified in the terminfo database.  That likely is a documentation
+-           error,  mistaking  the  "-1"  written  to  the  standard  output to
++           error, mistaking  the  "-1"  written  to  the  standard  output  to
+            indicate an absent or canceled numeric capability for an (unsigned)
+            exit status.
+ 
+        The various System V implementations (AIX, HP-UX, Solaris) use the same
+        exit statuses as ncurses.
+ 
+-       NetBSD curses  documents  exit  statuses  that  correspond  to  neither
++       NetBSD  curses  documents  exit  statuses  that  correspond  to neither
+        ncurses nor X/Open Curses.
+ 
+ 
+ 
                                                                                                                                                    HISTORY
                                                                                                                                                    +-       Bill  Joy  wrote  a  tput command during development of 4BSD in October
+-       1980.  This initial version only cleared the screen, and did  not  ship
++       Bill Joy wrote a tput command during development  of  4BSD  in  October
++       1980.   This  initial version only cleared the screen, and did not ship
+        with official distributions.
+ 
+        System V developed a different tput command.
+ 
+-       o   SVr2  (1984) provided a rudimentary tput that checked the parameter
+-           against each predefined capability and returned  the  corresponding
+-           value.    This   version   of   tput  did  not  use  tparm(3x)  for
++       o   SVr2 (1984) provided a rudimentary tput that checked the  parameter
++           against  each  predefined capability and returned the corresponding
++           value.   This  version  of  tput  did   not   use   tparm(3x)   for
+            parameterized capabilities.
+ 
+-       o   SVr3 (1987) replaced that  with  a  more  extensive  program  whose
+-           support  for  init  and reset operands (more than half the program)
++       o   SVr3  (1987)  replaced  that  with  a  more extensive program whose
++           support for init and reset operands (more than  half  the  program)
+            incorporated the reset feature of BSD tset written by Eric Allman.
+ 
+-       o   SVr4 (1989) added color initialization  by  using  the  orig_colors
++       o   SVr4  (1989)  added  color  initialization by using the orig_colors
+            (oc) and orig_pair (op) capabilities in its init logic.
+ 
+-       Keith  Bostic  refactored  BSD tput for shipment in 4.3BSD-Reno (1990),
+-       making it follow the interface  of  System V  tput  by  accepting  some
++       Keith Bostic refactored BSD tput for shipment  in  4.3BSD-Reno  (1990),
++       making  it  follow  the  interface  of  System V tput by accepting some
+        parameters  named  for  terminfo  (pseudo-)capabilities:  clear,  init,
+-       longname, and reset.  However, because he had only  termcap  available,
+-       it  accepted  termcap codes for other capabilities.  Also, Bostic's BSD
+-       tput did not modify the terminal modes as  the  earlier  BSD  tset  had
++       longname,  and  reset.  However, because he had only termcap available,
++       it accepted termcap codes for other capabilities.  Also,  Bostic's  BSD
++       tput  did  not  modify  the  terminal modes as the earlier BSD tset had
+        done.  At the same time, Bostic added a shell script named "clear" that
+        used  tput  to  clear  the  screen.   These  became  the  "modern"  BSD
+        implementation of tput.
+ 
+-       The  origin of ncurses tput lies outside both System V and BSD, in Ross
+-       Ridge's mytinfo package, published  on  comp.sources.unix  in  December
+-       1992.   Ridge's  program  made  more  sophisticated use of the terminal
++       The origin of ncurses tput lies outside both System V and BSD, in  Ross
++       Ridge's  mytinfo  package,  published  on comp.sources.unix in December
++       1992.  Ridge's program made more  sophisticated  use  of  the  terminal
+        capabilities than the BSD program.  Eric Raymond used that tput program
+-       (and  other  parts  of mytinfo) in ncurses in June 1995.  Incorporating
+-       the portions dealing with terminal capabilities almost without  change,
+-       Raymond  made  improvements  to  the  way  command-line parameters were
++       (and other parts of mytinfo) in ncurses in  June  1995.   Incorporating
++       the  portions dealing with terminal capabilities almost without change,
++       Raymond made improvements  to  the  way  command-line  parameters  were
+        handled.
+ 
+        Before ncurses 6.1 (2018), its tset and tput utilities differed.
+@@ -469,31 +470,31 @@
+        o   tset was more effective, resetting the terminal's modes and special
+            input characters.
+ 
+-       o   On  the  other hand, tset's repertoire of terminal capabilities for
++       o   On the other hand, tset's repertoire of terminal  capabilities  for
+            resetting the terminal was more limited; it had only equivalents of
+-           reset_1string  (rs1), reset_2string (rs2), and reset_file (rf), and
++           reset_1string (rs1), reset_2string (rs2), and reset_file (rf),  and
+            not the tab stop and margin update features of tput.
+ 
+        The reset program is traditionally an alias for tset due to its ability
+        to reset the terminal's modes and special input characters.
+ 
+-       As  of  ncurses  6.1,  the  "reset"  features  of  the two programs are
++       As of ncurses 6.1,  the  "reset"  features  of  the  two  programs  are
+        (mostly) the same.  Two minor differences remain.
+ 
+-       o   When issuing a reset, the tset program checks  whether  the  device
+-           appears  to  be  a  pseudoterminal  (as might be used by a terminal
++       o   When  issuing  a  reset, the tset program checks whether the device
++           appears to be a pseudoterminal (as might  be  used  by  a  terminal
+            emulator program), and, if it does not, waits one second in case it
+            is communicating with a hardware terminal.
+ 
+-       o   The  two  programs  write  the  terminal  initialization strings to
+-           different streams; that is, standard error for  tset  and  standard
++       o   The two programs  write  the  terminal  initialization  strings  to
++           different  streams;  that  is, standard error for tset and standard
+            output for tput.
+ 
+ 
+ 
                                                                                                                                                    EXAMPLES
                                                                                                                                                    +        tput init
+               Initialize the terminal according to the type of terminal in the
+-              TERM environment variable.  If  the  system  does  not  reliably
++              TERM  environment  variable.   If  the  system does not reliably
+               initialize the terminal upon login, this command can be included
+               in $HOME/.profile after exporting the TERM environment variable.
+ 
+@@ -505,11 +506,11 @@
+               Set cursor to normal visibility.
+ 
+        tput home
+-              Move  the  cursor  to line 0, column 0: the upper left corner of
++              Move the cursor to line 0, column 0: the upper  left  corner  of
+               the screen, usually known as the "home" cursor position.
+ 
+        tput clear
+-              Clear the screen: write the clear_screen capability's  value  to
++              Clear  the  screen: write the clear_screen capability's value to
+               the standard output stream.
+ 
+        tput cols
+@@ -519,29 +520,29 @@
+               Report the number of columns used by an ADM-3A terminal.
+ 
+        strong=`tput smso` normal=`tput rmso`
+-              Set  shell variables to capability values: strong and normal, to
+-              begin and end, respectively, stand-out mode  for  the  terminal.
++              Set shell variables to capability values: strong and normal,  to
++              begin  and  end,  respectively, stand-out mode for the terminal.
+               One might use these to present a prompt.
+ 
+                      printf "${strong}Username:${normal} "
+ 
+        tput hc
+-              Indicate  via  exit  status  whether the terminal is a hard copy
++              Indicate via exit status whether the terminal  is  a  hard  copy
+               device.
+ 
+        tput cup 23 4
+               Move the cursor to line 23, column 4.
+ 
+        tput cup
+-              Report the value of the cursor_address  (cup)  capability  (used
++              Report  the  value  of the cursor_address (cup) capability (used
+               for cursor movement), with no parameters substituted.
+ 
+        tput longname
+-              Report  the terminfo database's description of the terminal type
++              Report the terminfo database's description of the terminal  type
+               specified in the TERM environment variable.
+ 
+        tput -S
+-              Process multiple capabilities.  The -S option can be  profitably
++              Process  multiple capabilities.  The -S option can be profitably
+               used with a shell "here document".
+ 
+               $ tput -S <<!
+@@ -550,7 +551,7 @@
+               > bold
+               > !
+ 
+-              The  foregoing  clears  the screen, moves the cursor to position
++              The foregoing clears the screen, moves the  cursor  to  position
+               (10, 10) and turns on bold (extra bright) mode.
+ 
+        tput clear cup 10 10 bold
+@@ -558,11 +559,12 @@
+ 
+ 
+ 
                                                                                                                                                    SEE ALSO
                                                                                                                                                    +-       clear(1), stty(1), tabs(1), tset(1), curs_termcap(3x), terminfo(5)
++       clear(1),  stty(1),  tabs(1),  tset(1),  curs_termcap(3x), terminfo(5),
++       user_caps(5)
+ 
+ 
+ 
+-ncurses 6.5                       2025-04-05                           tput(1)
++ncurses 6.5                       2025-07-05                           tput(1)
+ 
                                                                                                                                                    
+ 
                                                                                                                                                    
+ 
                                                                                                                                                      
+Index: include/curses.h.in
+Prereq:  1.295 
+--- ncurses-6.5-20250628+/include/curses.h.in	2025-05-24 16:38:03.000000000 +0000
++++ ncurses-6.5-20250705/include/curses.h.in	2025-07-05 12:39:32.000000000 +0000
+@@ -33,7 +33,7 @@
+  *     and: Thomas E. Dickey                        1996-on                 *
+  ****************************************************************************/
+ 
+-/* $Id: curses.h.in,v 1.295 2025/05/24 16:38:03 tom Exp $ */
++/* $Id: curses.h.in,v 1.296 2025/07/05 12:39:32 Branden.Robinson Exp $ */
+ 
+ #ifndef __NCURSES_H
+ #define __NCURSES_H
+@@ -232,7 +232,7 @@
+ #undef	NCURSES_CH_T
+ #define NCURSES_CH_T @NCURSES_CH_T@
+ 
+-#if @cf_cv_enable_lp64@ && defined(_LP64)
++#if @cf_cv_enable_lp64@ /* cf_cv_enable_lp64 */ && defined(_LP64)
+ typedef unsigned chtype;
+ typedef unsigned mmask_t;
+ #else
+@@ -296,7 +296,7 @@
+ #include 
+ /* use whatever the C compiler decides bool really is */
+ #define NCURSES_BOOL bool
+-#elif !defined(__cplusplus) && !@USE_BUILTIN_BOOL@
++#elif !defined(__cplusplus) && !@USE_BUILTIN_BOOL@ /* USE_BUILTIN_BOOL */
+ /* there is no predefined bool - use our own */
+ #undef bool
+ #define bool NCURSES_BOOL
+@@ -351,7 +351,7 @@
+ 
+ /* line graphics */
+ 
+-#if @BROKEN_LINKER@ || NCURSES_REENTRANT
++#if @BROKEN_LINKER@ /* BROKEN_LINKER */ || NCURSES_REENTRANT
+ NCURSES_WRAPPED_VAR(chtype*, acs_map);
+ #define acs_map NCURSES_PUBLIC_VAR(acs_map())
+ #else
+@@ -459,22 +459,22 @@
+ 
+ #if NCURSES_WIDECHAR
+ 
+-#if @NCURSES_LIBUTF8@
++#if @NCURSES_LIBUTF8@ /* NCURSES_LIBUTF8 */
+ #ifdef mblen			/* libutf8.h defines it w/o undefining first */
+ #undef mblen
+ #endif
+ #include 
+ #endif
+ 
+-#if @NEED_WCHAR_H@
++#if @NEED_WCHAR_H@ /* NEED_WCHAR_H */
+ #include 		/* ...to get mbstate_t, etc. */
+ #endif
+ 
+-#if @NCURSES_WCHAR_T@
++#if @NCURSES_WCHAR_T@ /* NCURSES_WCHAR_T */
+ typedef unsigned short wchar_t@NCURSES_OK_WCHAR_T@;
+ #endif
+ 
+-#if @NCURSES_WINT_T@
++#if @NCURSES_WINT_T@ /* NCURSES_WINT_T */
+ typedef unsigned int wint_t@NCURSES_OK_WCHAR_T@;
+ #endif
+ 
+@@ -552,7 +552,7 @@
+ 
+ 	NCURSES_SIZE_T _yoffset; /* real begy is _begy + _yoffset */
+ 
+-#if NCURSES_WIDECHAR
++#if NCURSES_WIDECHAR /* NCURSES_WIDECHAR */
+ 	cchar_t  _bkgrnd;	/* current background char/attribute pair */
+ #if @NCURSES_EXT_COLORS@
+ 	int	_color;		/* current color-pair for non-space character */
+@@ -1240,7 +1240,7 @@
+ 
+ #if !NCURSES_OPAQUE
+ #if NCURSES_WATTR_MACROS
+-#if NCURSES_WIDECHAR && @NCURSES_EXT_COLORS@
++#if NCURSES_WIDECHAR && @NCURSES_EXT_COLORS@ /* NCURSES_EXT_COLORS */
+ #define wattrset(win,at) \
+ 	(NCURSES_OK_ADDR(win) \
+ 	  ? ((win)->_color = NCURSES_CAST(int, PAIR_NUMBER(at)), \
+@@ -1392,7 +1392,7 @@
+ 
+ #if !NCURSES_OPAQUE
+ #if NCURSES_WATTR_MACROS
+-#if NCURSES_WIDECHAR && @NCURSES_EXT_COLORS@
++#if NCURSES_WIDECHAR && @NCURSES_EXT_COLORS@ /* NCURSES_EXT_COLORS */
+ #define wattr_set(win,a,p,opts) \
+ 	(NCURSES_OK_ADDR(win) \
+ 	 ? ((void)((win)->_attrs = ((a) & ~A_COLOR), \
+@@ -1412,7 +1412,7 @@
+ 		   : OK), \
+ 	    OK) \
+ 	 : ERR)
+-#else /* !(NCURSES_WIDECHAR && NCURSES_EXE_COLORS) */
++#else /* !(NCURSES_WIDECHAR && NCURSES_EXT_COLORS) */
+ #define wattr_set(win,a,p,opts) \
+ 	 (NCURSES_OK_ADDR(win) \
+ 	  ? ((void)((win)->_attrs = (((a) & ~A_COLOR) | \
+@@ -1429,7 +1429,7 @@
+ 		   : OK), \
+ 	    OK) \
+ 	 : ERR)
+-#endif /* (NCURSES_WIDECHAR && NCURSES_EXE_COLORS) */
++#endif /* (NCURSES_WIDECHAR && NCURSES_EXT_COLORS) */
+ #endif /* NCURSES_WATTR_MACROS */
+ #endif /* NCURSES_OPAQUE */
+ 
+@@ -1445,7 +1445,7 @@
+ /*
+  * Export fallback function for use in C++ binding.
+  */
+-#if !@HAVE_VSSCANF@
++#if !@HAVE_VSSCANF@ /* HAVE_VSSCANF */
+ #define vsscanf(a,b,c) _nc_vsscanf(a,b,c)
+ NCURSES_EXPORT(int) vsscanf(const char *, const char *, va_list);
+ #endif
+Index: man/curs_add_wch.3x
+Prereq:  1.115 
+--- ncurses-6.5-20250628+/man/curs_add_wch.3x	2025-04-19 22:53:52.000000000 +0000
++++ ncurses-6.5-20250705/man/curs_add_wch.3x	2025-07-05 12:43:18.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_add_wch.3x,v 1.115 2025/04/19 22:53:52 tom Exp $
+-.TH curs_add_wch 3X 2025-04-19 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_add_wch.3x,v 1.117 2025/07/05 12:43:18 tom Exp $
++.TH curs_add_wch 3X 2025-07-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -223,7 +223,8 @@
+ If
+ .I wch
+ is any other nonprintable character,
+-it is drawn in printable form using the same convention as
++.I curses
++draws it in printable form using the same convention as
+ \fB\%wunctrl\fP(3X).
+ Calling \fB\%win_wch\fP(3X) on the location of a nonprintable character
+ does not return the character itself,
+Index: man/curs_addch.3x
+Prereq:  1.137 
+--- ncurses-6.5-20250628+/man/curs_addch.3x	2025-04-26 19:57:22.000000000 +0000
++++ ncurses-6.5-20250705/man/curs_addch.3x	2025-07-05 12:43:18.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addch.3x,v 1.137 2025/04/26 19:57:22 tom Exp $
+-.TH curs_addch 3X 2025-04-26 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_addch.3x,v 1.139 2025/07/05 12:43:18 tom Exp $
++.TH curs_addch 3X 2025-07-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -181,7 +181,8 @@
+ If
+ .I ch
+ is any other nonprintable character,
+-it is drawn in printable form using the same convention as
++.I curses
++draws it in printable form using the same convention as
+ \fB\%unctrl\fP(3X).
+ Calling \fB\%winch\fP(3X) on the location of a nonprintable character
+ does not return the character itself,
+Index: man/curs_color.3x
+Prereq:  1.118 
+--- ncurses-6.5-20250628+/man/curs_color.3x	2025-04-05 21:59:03.000000000 +0000
++++ ncurses-6.5-20250705/man/curs_color.3x	2025-07-05 12:45:50.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_color.3x,v 1.118 2025/04/05 21:59:03 tom Exp $
+-.TH curs_color 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_color.3x,v 1.122 2025/07/05 12:45:50 tom Exp $
++.TH curs_color 3X 2025-07-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -171,9 +171,8 @@
+ .bP
+ If the parameter passed to \fB\%waddch\fP is \fIblank\fP,
+ and it uses the special color pair 0,
+-.RS
+-.bP
+ \fIcurses\fP next checks the window attribute.
++.RS
+ .bP
+ If the window attribute does not use color pair 0,
+ \fIcurses\fP uses the color pair from the window attribute.
+@@ -611,7 +610,10 @@
+ with CGA/EGA/VGA video.
+ .bP
+ .B \%COLOR_YELLOW
+-is actually brown.
++was frequently converted,
++in the analog domain,
++to a shade of brown if the intensity bit was not set.
++.\" https://nerdlypleasures.blogspot.com/2023/03/the-saga-of-color-brown-in-early-years.html
+ To get yellow,
+ combine
+ .B \%COLOR_YELLOW
+@@ -690,8 +692,10 @@
+ .I \%ncurses
+ does neither.
+ .SH HISTORY
+-SVr3.2 (1987) introduced color support with all of the symbols in the
+-synopsis above except those marked as extensions.
++SVr3.2 (1987) introduced color support to
++.I curses
++with all of the symbols
++in the synopsis above except those marked as extensions.
+ It reserved color pair 0 as the terminal's initial,
+ \*(``uncolored\*('' state,
+ .\" "we assume that color 0 is always a default background.", SVr3.2
+Index: man/curs_deleteln.3x
+Prereq:  1.53 
+--- ncurses-6.5-20250628+/man/curs_deleteln.3x	2025-04-05 22:00:17.000000000 +0000
++++ ncurses-6.5-20250705/man/curs_deleteln.3x	2025-07-05 12:46:36.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_deleteln.3x,v 1.53 2025/04/05 22:00:17 tom Exp $
+-.TH curs_deleteln 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_deleteln.3x,v 1.55 2025/07/05 12:46:36 tom Exp $
++.TH curs_deleteln 3X 2025-07-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -96,6 +96,8 @@
+ .B \%winsertln
+ or
+ .BR \%wdeleteln "."
++.BR \%winsdelln( ".\|.\|." ", 0)"
++performs no operation.
+ .SH RETURN VALUE
+ These functions return
+ .B OK
+Index: man/curs_get_wstr.3x
+Prereq:  1.75 
+--- ncurses-6.5-20250628+/man/curs_get_wstr.3x	2025-04-05 22:36:46.000000000 +0000
++++ ncurses-6.5-20250705/man/curs_get_wstr.3x	2025-07-05 12:52:35.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_get_wstr.3x,v 1.75 2025/04/05 22:36:46 tom Exp $
+-.TH curs_get_wstr 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_get_wstr.3x,v 1.77 2025/07/05 12:52:35 tom Exp $
++.TH curs_get_wstr 3X 2025-07-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -181,7 +181,7 @@
+ .I win
+ is a null pointer,
+ .bP
+-.I str
++.I wstr
+ is a null pointer,
+ or
+ .bP
+Index: man/curs_getch.3x
+Prereq:  1.127 
+--- ncurses-6.5-20250628+/man/curs_getch.3x	2025-04-05 22:04:30.000000000 +0000
++++ ncurses-6.5-20250705/man/curs_getch.3x	2025-07-05 13:06:45.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getch.3x,v 1.127 2025/04/05 22:04:30 tom Exp $
+-.TH curs_getch 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_getch.3x,v 1.130 2025/07/05 13:06:45 tom Exp $
++.TH curs_getch 3X 2025-07-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -86,6 +86,11 @@
+ .B \%wgetch
+ returns an integer identifying the key event;
+ for alphanumeric and punctuation keys,
++the space bar,
++and (usually) the Backspace,
++Tab,
++Return,
++and Escape keys,
+ this value corresponds to the character encoding used by the terminal.
+ Use of the control key as a modifier,
+ by holding it down while pressing and releasing another key,
+@@ -105,10 +110,14 @@
+ waits until the terminal has input.
+ If \fB\%cbreak\fP(3X) or \fB\%raw\fP(3X)
+ has been called,
+-this happens after one character is read.
++this happens after
++.I curses
++reads one key event.
+ If \fB\%nocbreak\fP(3X) or \fB\%noraw\fP(3X)
+ has been called,
+-it occurs when the next newline is read.
++it occurs when
++.I curses
++reads a newline. \" "newline" because canonical mode normalizes NL/CR
+ (Because the terminal's canonical or \*(``cooked\*('' mode
+ is line-buffered,
+ multiple
+@@ -132,6 +141,7 @@
+ .I c
+ matches the terminal's erase character
+ (see \fB\%erasechar\fP(3X)),
++and the cursor is not at the window's leftmost column,
+ the cursor moves leftward one position
+ and the new position is erased
+ as if \fB\%wmove\fP(3X) and then \fB\%wdelch\fP(3X) were called.
+@@ -186,10 +196,9 @@
+ translates these key strokes to a numeric code corresponding to the
+ .B KEY_
+ symbols listed in subsection \*(``Predefined Key Codes\*('' below.
+-If a window is not in keypad mode,
+-.B \%wgetch
+-returns a sequence of codes
+-typically starting with the escape character,
++If the window is not in keypad mode,
++the input queue populates with
++the characters of the function key's escape sequence,
+ which the application must collect individually with multiple
+ .B \%wgetch
+ calls.
+@@ -257,7 +266,7 @@
+ elapses.
+ Configure the escape delay
+ with the global variable
+-.IR \%ESCDELAY ","
++.BR \%ESCDELAY ","
+ an extension
+ (see section \*(``EXTENSIONS\*('' below),
+ or the environment variable of the same name
+@@ -439,7 +448,7 @@
+ if
+ .I \%ncurses
+ has handled a
+-.B \%SIGWINCH
++.I \%SIGWINCH
+ signal since
+ .B \%wgetch
+ was called;
+@@ -497,9 +506,9 @@
+ or
+ .bP
+ execution was interrupted by a signal,
+-in which case
++in which case the library sets
+ .I \%errno
+-is set to
++to
+ .IR \%EINTR "."
+ .PP
+ Functions prefixed with \*(``mv\*('' first perform cursor movement and
+@@ -720,7 +729,7 @@
+ application prepares for two cases:
+ (a) signal receipt does not interrupt
+ .IR \%wgetch ";"
+-or
++and
+ (b) signal receipt interrupts
+ .I \%wgetch
+ and causes it to return
+Index: man/curs_getstr.3x
+Prereq:  1.89 
+--- ncurses-6.5-20250628+/man/curs_getstr.3x	2025-04-05 22:07:21.000000000 +0000
++++ ncurses-6.5-20250705/man/curs_getstr.3x	2025-07-05 12:52:05.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getstr.3x,v 1.89 2025/04/05 22:07:21 tom Exp $
+-.TH curs_getstr 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_getstr.3x,v 1.92 2025/07/05 12:52:05 tom Exp $
++.TH curs_getstr 3X 2025-07-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -108,9 +108,13 @@
+ treated as the erase or kill characters,
+ calling \fBbeep\fP(3X).
+ .PP
+-The erase character replaces the character at the end of the buffer with
+-a null character,
+-while the kill character does the same for the entire buffer.
++If any characters have been written to the input buffer,
++the erase character replaces the character
++at the current position in the buffer
++with a null character,
++then decrements the position by one;
++the kill character does the same repeatedly,
++backtracking to the beginning of the buffer.
+ .PP
+ If the screen's echo option is enabled
+ (see \fBecho\fP(3X)),
+@@ -122,7 +126,10 @@
+ .bP
+ the erase character
+ and its function key synonyms
+-move the cursor to the left,
++move the cursor to the left
++(if not already where it was located when
++.B \%wgetstr
++was called)
+ and
+ .bP
+ the kill character returns the cursor to where it was located when
+Index: man/curs_initscr.3x
+Prereq:  1.102 
+--- ncurses-6.5-20250628+/man/curs_initscr.3x	2025-03-15 21:11:24.000000000 +0000
++++ ncurses-6.5-20250705/man/curs_initscr.3x	2025-07-05 13:30:33.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_initscr.3x,v 1.102 2025/03/15 21:11:24 tom Exp $
+-.TH curs_initscr 3X 2025-03-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_initscr.3x,v 1.105 2025/07/05 13:30:33 tom Exp $
++.TH curs_initscr 3X 2025-07-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -141,7 +141,9 @@
+ an input stream
+ .I inf
+ connected to the terminal.
+-It returns a variable of
++.PP
++.B \%newterm
++returns a variable of
+ .RI pointer-to- SCREEN
+ type,
+ which should be saved for later use with
+@@ -198,11 +200,14 @@
+ management of the terminal.
+ .BR \%endwin ":"
+ .bP
++if \fB\%start_color\fP(3X) has been called,
+ resets colors to correspond with the default color pair 0,
+ .bP
+ moves the cursor to the lower left-hand corner of the screen,
+ .bP
+-clears the remainder of the line so that it uses the default colors,
++clears the remainder of the line
++(if \fB\%start_color\fP(3X) has been called,
++it also restores the default color pair),
+ .bP
+ sets the cursor to normal visibility
+ (see \fB\%curs_set\fP(3X)),
+@@ -245,12 +250,13 @@
+ as an argument,
+ and returns the previous one.
+ .B \%set_term
+-is the only
++is the only standard
+ .I curses
+ API function that manipulates
+ .I SCREEN
+ pointers;
+-all others affect only the current terminal.
++all others affect only the current terminal
++(but see \fBcurs_sp_funcs\fP(3X)).
+ .SS delscreen
+ .B \%delscreen
+ frees the storage backing the supplied
+@@ -264,14 +270,12 @@
+ (possibly conditional or temporary)
+ suspension;
+ see \fB\%curs_kernel\fP(3X).
+-Call
++Use
+ .B \%delscreen
+ after
+ .B \%endwin
+-when a particular
+-.I SCREEN
+-structure
+-is no longer needed.
++when the application has no more need of a screen
++but will not soon exit.
+ .SH RETURN VALUE
+ .B \%delscreen
+ returns no value.
+@@ -303,7 +307,8 @@
+ or
+ .bP
+ its call of \fB\%reset_shell_mode\fP(3X) returns
+-.BR ERR "."
++.BR ERR ";"
++and
+ .RE
+ .bP
+ .B \%newterm
+@@ -418,7 +423,7 @@
+ .I \%ncurses
+ calls \fB\%resizeterm\fP(3X)
+ to adjust the standard screen
+-.BR \%stdscr ","
++.B \%stdscr
+ and update global variables such as
+ .B LINES
+ and
+@@ -487,8 +492,9 @@
+ is no longer needed.
+ .bP
+ However,
+-.IR \%WINDOW s
+-are implicitly associated with a
++every
++.I \%WINDOW
++is implicitly associated with a
+ .IR SCREEN ","
+ so it is reasonable to expect
+ .I \%delscreen
+@@ -519,9 +525,11 @@
+ follows the SVr4 model,
+ deleting only the standard
+ .I \%WINDOW
+-structures.
+-.SS "High-level versus Low-level"
+-Different implementations may disagree regarding the level of some functions.
++structures and
++.IR \%newscr "."
++.SS "High-level versus Low-level Functions"
++Implementations disagree
++regarding the level of abstraction applicable to a function or property.
+ For example,
+ .I SCREEN
+ (returned by
+@@ -533,8 +541,9 @@
+ If an application switches screens using
+ .IR \%set_term ","
+ or switches terminals using \fB\%set_curterm\fP(3X),
+-applications which use the output file descriptor can have different
+-behavior depending on which structure holds the corresponding descriptor.
++applications
++using the output file descriptor can behave differently
++depending on the structure holding the corresponding descriptor.
+ .bP
+ NetBSD's
+ .I \%baudrate
+Index: man/curs_inopts.3x
+Prereq:  1.104 
+--- ncurses-6.5-20250628+/man/curs_inopts.3x	2025-04-05 22:07:49.000000000 +0000
++++ ncurses-6.5-20250705/man/curs_inopts.3x	2025-07-05 12:55:10.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inopts.3x,v 1.104 2025/04/05 22:07:49 tom Exp $
+-.TH curs_inopts 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_inopts.3x,v 1.107 2025/07/05 12:55:10 tom Exp $
++.TH curs_inopts 3X 2025-07-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -629,7 +629,9 @@
+ extension,
+ .BR \%ESCDELAY ,
+ is available both as an environment variable and a global symbol
+-permitting the application to do so;
++permitting the user and application,
++respectively,
++to do so;
+ see \fB\%ncurses\fP(3X) and \fBcurs_variables\fP(3X).
+ .SH EXTENSIONS
+ .I \%ncurses
+@@ -861,7 +863,7 @@
+ (the POSIX terminal API).
+ In the former,
+ both input and output conversions were controlled via a single option
+-\*(``CRMOD\*('',
++\%\*(``CRMOD\*('',
+ while the latter separates these features.
+ Because that conversion interferes with output optimization,
+ .I \%ncurses
+Index: man/curs_instr.3x
+Prereq:  1.74 
+--- ncurses-6.5-20250628+/man/curs_instr.3x	2025-03-01 21:29:42.000000000 +0000
++++ ncurses-6.5-20250705/man/curs_instr.3x	2025-07-05 12:55:50.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_instr.3x,v 1.74 2025/03/01 21:29:42 tom Exp $
+-.TH curs_instr 3X 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_instr.3x,v 1.76 2025/07/05 12:55:50 tom Exp $
++.TH curs_instr 3X 2025-07-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -101,16 +101,15 @@
+ These functions return the count of characters copied from
+ .I win
+ to
+-.IR str ","
++.I str
++(not counting the null terminator),
+ or
+ .B ERR
+ upon failure.
+ .PP
+ In
+ .IR \%ncurses ","
+-these functions return
+-.B ERR
+-if
++these functions fail if
+ .bP
+ the
+ .I curses
+Index: man/curs_mouse.3x
+Prereq:  1.126 
+--- ncurses-6.5-20250628+/man/curs_mouse.3x	2025-04-05 22:08:22.000000000 +0000
++++ ncurses-6.5-20250705/man/curs_mouse.3x	2025-07-05 12:57:40.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_mouse.3x,v 1.126 2025/04/05 22:08:22 tom Exp $
+-.TH curs_mouse 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_mouse.3x,v 1.129 2025/07/05 12:57:40 tom Exp $
++.TH curs_mouse 3X 2025-07-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -122,7 +122,8 @@
+ ignores mouse events when input is in canonical (\*(``cooked\*('') mode,
+ and produces an error beep when they occur
+ while the library simulates canonical mode in a window,
+-as with \fB\%getstr\fP(3X),
++as with \fB\%getstr\fP(3X)
++(wide-character API users: \fB\%get_wstr\fP(3X)),
+ which expects a line feed to terminate its input loop.
+ .SS has_mouse
+ The terminal type or operating system interface
+@@ -147,7 +148,8 @@
+ .bP
+ The function returns an updated copy of
+ .I new-mask
+-indicating which of the specified mouse events can be reported.
++indicating which event types of interest
++are reportable by the terminal's mouse protocol.
+ .IP
+ If the screen is not initialized,
+ or the terminal interface does not report mouse events,
+@@ -218,11 +220,11 @@
+ _
+ .TE
+ .SS getmouse
+-Once a class of mouse events has been made visible in a window,
++When a window is configured to report a non-empty set of event types,
+ calling the input character reading function on that window may return
+ .B \%KEY_MOUSE
+-as an indicator that a mouse event is enqueued.
+-To read the event data and pop the event off the queue,
++to indicate availability of an enqueued mouse event.
++To read the event data and remove it from the queue,
+ call
+ .BR \%getmouse ","
+ which returns
+Index: man/curs_outopts.3x
+Prereq:  1.98 
+--- ncurses-6.5-20250628+/man/curs_outopts.3x	2025-04-05 22:40:21.000000000 +0000
++++ ncurses-6.5-20250705/man/curs_outopts.3x	2025-07-05 13:01:50.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_outopts.3x,v 1.98 2025/04/05 22:40:21 tom Exp $
+-.TH curs_outopts 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_outopts.3x,v 1.104 2025/07/05 13:01:50 tom Exp $
++.TH curs_outopts 3X 2025-07-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -117,10 +117,6 @@
+ possessing them according to the
+ .I \%term\%info
+ database.
+-.\" TODO: What's the historical rationale for the `idcok()` feature?
+-.\" TED: Solaris SVr4 source uses this to bypass some logic which may not work
+-.\" with terminals that use "magic cookies" (cells where the video attribute
+-.\" changes and no actual character is stored).
+ .SS idlok
+ Setting
+ .IR win 's
+@@ -153,9 +149,10 @@
+ .BR \%wscrl ","
+ automatically cause a call to
+ .BR wrefresh "."
+-However,
+-doing so may degrade performance considerably
+-when many such calls occur.
++Setting a window's
++.B \%immedok
++property may degrade performance considerably
++if writes are frequent.
+ Calling
+ .B \%immedok
+ with
+@@ -180,8 +177,11 @@
+ .B \%scrollok
+ option controls what happens when a window's cursor
+ moves off the edge of the window or scrolling region,
+-either as a result of a newline occurring on the bottom line,
+-or writing to the last character of the last line.
++as a result of either
++(1) writing a newline anywhere on its bottom line,
++or
++(2) writing a character that advances the cursor to the last position
++on its bottom line.
+ If disabled
+ .RI ( bf
+ is
+@@ -213,7 +213,6 @@
+ 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
+ .B scrollok
+ are enabled,
+@@ -228,7 +227,7 @@
+ .B \%idlok
+ is enabled and the terminal
+ has either a scrolling region or insert/delete line capability,
+-they will probably be used by the output routines.)
++they will probably be used by the output routines.
+ .SH RETURN VALUE
+ The functions
+ .B \%setscrreg
+@@ -285,10 +284,25 @@
+ .B \%wsetscrreg
+ to configure the scrolling region of a selected window.
+ .PP
+-The
++Historically,
++applications used
++.B \%idcok(FALSE)
++to accommodate the \*(``magic cookie\*('' feature
++of some terminal types;
++see subsection \*(``Highlighting, Underlining, and Visible Bells\*(''
++of \fB\%terminfo\fP(5).
++When updating a line,
++the presence of character cells with magic cookies in them
++made the
++.I curses
++library's computations of characters to be rewritten inaccurate.
++A better solution is to indicate the
++.B \%magic_cookie_glitch
++.RB ( xmc )
++capability in the terminal's type description.
++.PP
+ .B \%immedok
+-routine is useful for windows that are used as terminal
+-emulators.
++is useful for windows that are used as terminal emulators.
+ .SH PORTABILITY
+ X/Open Curses Issue\ 4 describes these functions.
+ It specifies no error conditions for them.
+Index: man/curs_printw.3x
+Prereq:  1.61 
+--- ncurses-6.5-20250628+/man/curs_printw.3x	2025-04-19 23:28:38.000000000 +0000
++++ ncurses-6.5-20250705/man/curs_printw.3x	2025-07-05 13:02:27.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_printw.3x,v 1.61 2025/04/19 23:28:38 tom Exp $
+-.TH curs_printw 3X 2025-04-19 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_printw.3x,v 1.63 2025/07/05 13:02:27 tom Exp $
++.TH curs_printw 3X 2025-07-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -201,8 +201,8 @@
+ .\"  curses.3
+ .PP
+ SVr3 summarized the functions in three lines,
+-asserting that they were analogous to \fI\%printf\fP(3),
+-explaining that the string that \fI\%printf\fP(3) would write to the
++asserting that they were analogous to \fI\%printf\fP(3)
++and explaining that the string that \fI\%printf\fP(3) would write to the
+ standard output stream would instead be output using
+ .I \%waddstr
+ to the given window.
+Index: man/curs_scanw.3x
+Prereq:  1.60 
+--- ncurses-6.5-20250628+/man/curs_scanw.3x	2025-04-05 22:20:10.000000000 +0000
++++ ncurses-6.5-20250705/man/curs_scanw.3x	2025-07-05 13:03:05.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_scanw.3x,v 1.60 2025/04/05 22:20:10 tom Exp $
+-.TH curs_scanw 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_scanw.3x,v 1.62 2025/07/05 13:03:05 tom Exp $
++.TH curs_scanw 3X 2025-07-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -281,7 +281,7 @@
+ type.
+ .\" either header declares "va_list", but only one can be used
+ .PP
+-X/Open Curses Issue\ 4 (1995),
++X/Open Curses Issue\ 4 (1995)
+ defined
+ .I \%vw_scanw
+ to replace
+Index: man/curs_util.3x
+Prereq:  1.141 
+--- ncurses-6.5-20250628+/man/curs_util.3x	2025-04-05 22:22:48.000000000 +0000
++++ ncurses-6.5-20250705/man/curs_util.3x	2025-07-05 13:06:45.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_util.3x,v 1.141 2025/04/05 22:22:48 tom Exp $
+-.TH curs_util 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_util.3x,v 1.143 2025/07/05 13:06:45 tom Exp $
++.TH curs_util 3X 2025-07-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -231,7 +231,7 @@
+ .IP
+ .I curses
+ also updates the screen size in response to
+-\fBSIGWINCH\fP,
++.IR \%SIGWINCH ","
+ unless overridden by the \fILINES\fP or \fI\%COLUMNS\fP environment
+ variables,
+ .SS use_tioctl
+Index: man/curs_variables.3x
+Prereq:  1.62 
+--- ncurses-6.5-20250628+/man/curs_variables.3x	2025-04-05 22:24:24.000000000 +0000
++++ ncurses-6.5-20250705/man/curs_variables.3x	2025-07-05 13:04:08.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_variables.3x,v 1.62 2025/04/05 22:24:24 tom Exp $
+-.TH curs_variables 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: curs_variables.3x,v 1.65 2025/07/05 13:04:08 tom Exp $
++.TH curs_variables 3X 2025-07-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -189,7 +189,8 @@
+ each of which also defined a Boolean data type.
+ The \fIcurses\fP library requires an integral type \fIbool\fP.
+ .PP
+-\fB\%ncurses\fP' configure script attempts to discover the
++.IR \%ncurses 's
++configure script attempts to discover the
+ data type used by the system's C and C++ compilers,
+ to reuse for the \fIcurses\fP \fIbool\fP.
+ .SS "\fIchtype\fP"
+@@ -295,7 +296,7 @@
+ \*(``Escape\*('' key on the input device
+ from one beginning an escape sequence
+ (commonly produced by function keys),
+-by waiting after the escape character
++by waiting after receiving the escape character
+ to see if further characters are available
+ on the input stream within a short interval.
+ .B \%ESCDELAY
+@@ -372,47 +373,82 @@
+ When the update of \fB\%newscr\fP is complete,
+ \fIcurses\fP modifies \fB\%curscr\fP to match \fB\%newscr\fP.
+ .PP
+-\fB\%TABSIZE\fP is a feature of SVr4 \fIcurses\fP.
++.B \%TABSIZE
++is a feature of SVr4
++.IR curses "."
+ .bP
+-SVr4 initially sets \fB\%TABSIZE\fP from the terminal description's
+-\fB\%init_tabs\fP capability.
++SVr4 initially sets
++.B \%TABSIZE
++from the terminal description's
++.B \%init_tabs
++.RB ( it )
++capability.
+ After that,
+-it can be altered by applications using SVr4 \fIcurses\fP.
++it can be altered by applications using SVr4
++.IR curses "."
+ .bP
+-SVr4 \fIcurses\fP uses the value of \fB\%TABSIZE\fP to compute the
+-position of tab stops when updating both
++SVr4
++.I curses
++uses
++.BR \%TABSIZE 's
++value to compute the position of tab stops when updating both
+ the virtual screen with \fB\%addch\fP(3X) and
+ the physical screen with \fB\%mvcur\fP(3X).
+ .bP
+-\fI\%ncurses\fP uses the value of \fB\%TABSIZE\fP only to update the
+-virtual screen.
+-It uses the terminal description's \*(``\fBit\fP\*(''
+-\%(\fBinit_tabs\fP) capability for computing hardware tabs
++In
++.IR \%ncurses ","
++.BR \%TABSIZE 's
++value affects only the virtual screen.
++The library uses the terminal type description's
++.B \%init_tabs
++.RB ( it )
++capability to compute hardware tabs
+ (that is,
+ tab stops on the physical screen).
+ .bP
+ Other implementations differ.
+ For instance,
+-NetBSD \fIcurses\fP allows \fB\%TABSIZE\fP to be set through an
+-environment variable.
+-\fI\%ncurses\fP does not.
++NetBSD
++.I curses
++allows
++.B \%TABSIZE
++to be set through an environment variable.
++.I \%ncurses
++does not.
+ .IP
+-NetBSD \fIcurses\fP does not support hardware tabs;
+-it uses the \fB\%init_tabs\fP capability and the \fB\%TABSIZE\fP
+-variable only for updating the virtual screen.
++NetBSD
++.I curses
++does not support hardware tabs;
++it uses the
++.B \%init_tabs
++.RB ( it )
++capability and the
++.B \%TABSIZE
++variable only to update the virtual screen.
+ .PP
+-\fB\%ESCDELAY\fP is a feature of AIX \fIcurses\fP.
++.B \%ESCDELAY
++is a feature of AIX
++.IR curses "."
+ .bP
+-In AIX,
+-the units for \fB\%ESCDELAY\fP are \fIfifths\fP of milliseconds.
++AIX treats
++.BR \%ESCDELAY 's
++value as counting
++.I fifths
++of milliseconds.
+ .bP
+-The default value for AIX's \fB\%ESCDELAY\fP equals 0.1 seconds.
++AIX's default
++.B \%ESCDELAY
++equals 0.1 seconds.
+ .bP
+-AIX also enforces a limit of 10,000 seconds for \fB\%ESCDELAY\fP;
+-\fI\%ncurses\fP does not enforce any upper limit.
++AIX also enforces a limit of 10,000 seconds for
++.BR \%ESCDELAY ";"
++.I \%ncurses
++does not enforce an upper limit.
+ .PP
+-\fI\%ncurses\fP has long used \fB\%ESCDELAY\fP with units of
+-milliseconds,
++.I \%ncurses
++has long interpreted
++.B \%ESCDELAY
++as a count of milliseconds,
+ making it impossible to be completely compatible with AIX.
+ Consequently,
+ most users have decided either to override the value,
+Index: man/infotocap.1m
+Prereq:  1.48 
+--- ncurses-6.5-20250628+/man/infotocap.1m	2025-01-19 00:51:10.000000000 +0000
++++ ncurses-6.5-20250705/man/infotocap.1m	2025-07-05 13:04:38.000000000 +0000
+@@ -27,8 +27,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: infotocap.1m,v 1.48 2025/01/19 00:51:10 tom Exp $
+-.TH @INFOTOCAP@ 1M 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: infotocap.1m,v 1.50 2025/07/05 13:04:38 tom Exp $
++.TH @INFOTOCAP@ 1M 2025-07-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -51,30 +51,47 @@
+ .P
+ .B "@INFOTOCAP@ \-V"
+ .SH DESCRIPTION
+-\fB\%@INFOTOCAP@\fP translates terminal descriptions.
+-It looks in each given text \fIfile\fP for \fI\%terminfo\fP entries and,
++.B \%@INFOTOCAP@
++translates terminal descriptions.
++It looks in each given text
++.I file
++for
++.I \%terminfo
++entries and,
+ for each one found,
+-it writes an analogous \fI\%termcap\fP description to the standard
+-output stream.
+-\fI\%terminfo\fP \*(``\fBuse\fP\*('' capabilities translate to
+-\fI\%termcap\fP \fBtc\fP capabilities.
+-Because \fI\%termcap\fP is a less expressive format than
+-\fI\%terminfo\fP,
++writes an analogous
++.I \%termcap
++description to the standard output stream.
++.I \%terminfo
++.RB \*(`` use \*(''
++capabilities translate to
++.I \%termcap
++.B tc
++capabilities.
++Because
++.I \%termcap
++is a less expressive format than
++.IR \%terminfo ,
+ some capabilities cannot be translated.
+ .PP
+ This utility is implemented as a link to \fB\%@TIC@\fP(1M),
+ with the latter's
+ .B \-C
+ option implied.
+-You can use other \fB\%@TIC@\fP options such as
++You can use other
++.B \%@TIC@
++options such as
+ .BR \-1 ,
+ .BR \-f ,
+ .BR \-v ,
+ .BR \-w ,
+ and
+ .BR \-x .
+-The \fB\-V\fP option reports the version of \fI\%ncurses\fP associated
+-with this program and exits with a successful status.
++The
++.B \-V
++option reports the version of
++.I \%ncurses
++associated with this program and exits with a successful status.
+ .SH FILES
+ .TP
+ .I @TERMINFO@
+Index: man/key_defined.3x
+Prereq:  1.38 
+--- ncurses-6.5-20250628+/man/key_defined.3x	2024-06-08 23:25:34.000000000 +0000
++++ ncurses-6.5-20250705/man/key_defined.3x	2025-07-05 13:08:02.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2023,2024 Thomas E. Dickey                                *
++.\" Copyright 2018-2024,2025 Thomas E. Dickey                                *
+ .\" Copyright 2003-2006,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey 2003
+ .\"
+-.\" $Id: key_defined.3x,v 1.38 2024/06/08 23:25:34 tom Exp $
+-.TH key_defined 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: key_defined.3x,v 1.40 2025/07/05 13:08:02 tom Exp $
++.TH key_defined 3X 2025-07-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .SH NAME
+ \fB\%key_defined\fP \-
+ test whether a \fIcurses\fP function key code is defined
+@@ -66,7 +66,7 @@
+ returns
+ .BR \-1 "."
+ .SH EXTENSIONS
+-.B \%define_key
++.B \%key_defined
+ is an
+ .I \%ncurses
+ extension.
+Index: man/manhtml.aliases
+Prereq:  1.47 
+--- ncurses-6.5-20250628+/man/manhtml.aliases	2025-02-02 00:58:13.000000000 +0000
++++ ncurses-6.5-20250705/man/manhtml.aliases	2025-07-05 13:28:49.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: manhtml.aliases,v 1.47 2025/02/02 00:58:13 tom Exp $
++# $Id: manhtml.aliases,v 1.48 2025/07/05 13:28:49 tom Exp $
+ #***************************************************************************
+ # Copyright 2019-2024,2025 Thomas E. Dickey                                *
+ # Copyright 2013,2017 Free Software Foundation, Inc.                       *
+@@ -58,6 +58,7 @@
+ filter(3X)		curs_util(3X)
+ flushinp(3X)		curs_util(3X)
+ get_wch(3X)		curs_get_wch(3X)
++get_wstr(3X)		curs_get_wstr(3X)
+ getcchar(3X)		curs_getcchar(3X)
+ getch(3X)		curs_getch(3X)
+ getstr(3X)		curs_getstr(3X)
+@@ -72,10 +73,10 @@
+ initscr(3X)		curs_initscr(3X)
+ is_cbreak(3X)		curs_inopts(3X)
+ is_scrollok(3X)		curs_opaque(3X)
+-killchar(3X)		curs_termattrs(3X)
+-killwchar(3X)		curs_termattrs(3X)
+ keyname(3X)		curs_util(3X)
+ keypad(3X)		curs_inopts(3X)
++killchar(3X)		curs_termattrs(3X)
++killwchar(3X)		curs_termattrs(3X)
+ longname(3X)		curs_termattrs(3X)
+ meta(3X)		curs_inopts(3X)
+ move(3X)		curs_move(3X)
+Index: man/ncurses.3x
+Prereq:  1.252 
+--- ncurses-6.5-20250628+/man/ncurses.3x	2025-04-05 22:54:19.000000000 +0000
++++ ncurses-6.5-20250705/man/ncurses.3x	2025-07-05 12:42:14.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: ncurses.3x,v 1.252 2025/04/05 22:54:19 tom Exp $
+-.TH ncurses 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: ncurses.3x,v 1.255 2025/07/05 12:42:14 tom Exp $
++.TH ncurses 3X 2025-07-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -452,6 +452,7 @@
+ This man page primarily surveys functions that appear in any
+ configuration of the library.
+ There are two common configurations;
++for others,
+ see section \*(``ALTERNATE CONFIGURATIONS\*('' below.
+ .TP 10 \" "ncursesw" + 2n
+ .I \%ncurses
+@@ -1311,7 +1312,7 @@
+ .I \%term\%info
+ .B \%max_colors
+ .RB ( colors )
+-capability.
++capability for the selected terminal type.
+ .SS "\fINCURSES_CONSOLE2\fP"
+ (MinGW port only)
+ The
+@@ -1359,18 +1360,18 @@
+ Set this environment variable to any value to disable the feature.
+ You can also adjust your \fI\%stty\fP(1) settings to avoid the problem.
+ .SS "\fINCURSES_NO_MAGIC_COOKIE\fP"
+-Many terminals store video attributes as a property of a character cell,
++Many terminals store video attributes as properties of a character cell,
+ as
+ .I curses
+ does.
+ Historically,
+ some recorded changes in video attributes as data that logically
+-.I occupies
++.I occupied
+ character cells on the display,
+ switching attributes on or off,
+-similarly to tags in a markup language;
+-these are termed \*(``magic cookies\*('',
+-and must be subsequently overprinted.
++similarly to tags in a markup language,
++which then had to be overprinted to depict the cells' desired contents;
++these are termed \*(``magic cookies\*(''.
+ If the
+ .I \%term\%info
+ entry for your terminal type does not adequately describe its handling
+@@ -1510,7 +1511,7 @@
+ # uxterm with vt100Graphics resource set to false
+ xterm\-utf8|xterm relying on UTF\-8 line\-graphics,
+         U8#1, use=xterm,
+-.nf
++.fi
+ .EE
+ .RE
+ .PP
+@@ -1908,7 +1909,7 @@
+ This option configures
+ .I \%ncurses
+ to provide low-level functions that do not depend
+-upon wide-character support in a library names
++upon wide-character support in a library named
+ .IR \%tinfo "."
+ .IP
+ This arrangement enables
+@@ -1917,7 +1918,8 @@
+ .I \%ncurses
+ and
+ .I \%ncursesw
+-libraries as well as application linking and/or loading times
++libraries
++and reduces an application's linking and/or loading times
+ when it requires only low-level functions.
+ .IP
+ The following pages describe low-level
+Index: man/resizeterm.3x
+Prereq:  1.63 
+--- ncurses-6.5-20250628+/man/resizeterm.3x	2025-04-05 22:26:38.000000000 +0000
++++ ncurses-6.5-20250705/man/resizeterm.3x	2025-07-05 13:06:45.000000000 +0000
+@@ -29,8 +29,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1996-on
+ .\"
+-.\" $Id: resizeterm.3x,v 1.63 2025/04/05 22:26:38 tom Exp $
+-.TH resizeterm 3X 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
++.\" $Id: resizeterm.3x,v 1.65 2025/07/05 13:06:45 tom Exp $
++.TH resizeterm 3X 2025-07-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+ .de bP
+ .ie n  .IP \(bu 4
+ .el    .IP \(bu 2
+@@ -86,9 +86,13 @@
+ When the library has found that the terminal's window-size has
+ changed, it calls \fB\%resizeterm\fP to update its data structures.
+ .PP
+-An application which establishes its own \fB\%SIGWINCH\fP handler
++An application which establishes its own
++.I \%SIGWINCH
++handler
+ can call \fB\%resizeterm\fP, but in that case, the library will not
+-see \fB\%SIGWINCH\fP, and proper layout will rely upon the application.
++see
++.IR \%SIGWINCH ","
++and proper layout will rely upon the application.
+ .SS resizeterm
+ The function \fB\%resizeterm\fP resizes the standard and current windows
+ (i.e., \fB\%stdscr\fP and \fB\%curscr\fP)
+@@ -99,7 +103,9 @@
+ Most of the work for \fB\%resizeterm\fP is
+ done by the inner function \fB\%resize_term\fP.
+ The outer function \fB\%resizeterm\fP adds bookkeeping
+-for the \fB\%SIGWINCH\fP handler,
++for the
++.I \%SIGWINCH
++handler,
+ as well as repainting the soft-key area (see \fB\%slk_touch\fP(3X)).
+ .PP
+ The \fB\%resize_term\fP function attempts to resize all windows.
+@@ -132,14 +138,19 @@
+ 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 \fB\%SIGWINCH\fP), care should be taken to avoid invoking them in a
++(i.e., for
++.IR \%SIGWINCH "),"
++care should be taken to avoid invoking them in a
+ context where \fB\%malloc\fP or \fB\%realloc\fP may have been interrupted,
+ since it uses those functions.
+ .PP
+-If \fI\%ncurses\fP is configured to supply its own \fB\%SIGWINCH\fP
++If \fI\%ncurses\fP is configured to supply its own
++.I \%SIGWINCH
+ handler,
+ .bP
+-on receipt of a \fB\%SIGWINCH\fP, the handler sets a flag
++on receipt of a
++.IR \%SIGWINCH ","
++the handler sets a flag
+ .bP
+ which is tested in
+ \fB\%wgetch\fP(3X),
+@@ -163,7 +174,9 @@
+ If the environment variables \fILINES\fP or \fI\%COLUMNS\fP are set,
+ this overrides the library's use of the window size obtained from
+ the operating system.
+-Thus, even if a \fB\%SIGWINCH\fP is received,
++Thus, even if a
++.I \%SIGWINCH
++is received,
+ no screen size change may be recorded.
+ .SH PORTABILITY
+ It is possible to resize the screen with SVr4 \fIcurses\fP,
+Index: man/tput.1
+Prereq:  1.137 
+--- ncurses-6.5-20250628+/man/tput.1	2025-04-05 21:56:26.000000000 +0000
++++ ncurses-6.5-20250705/man/tput.1	2025-07-05 13:06:18.000000000 +0000
+@@ -28,8 +28,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tput.1,v 1.137 2025/04/05 21:56:26 tom Exp $
+-.TH @TPUT@ 1 2025-04-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
++.\" $Id: tput.1,v 1.139 2025/07/05 13:06:18 tom Exp $
++.TH @TPUT@ 1 2025-07-05 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+ .ie \n(.g \{\
+ .ds `` \(lq
+ .ds '' \(rq
+@@ -78,8 +78,10 @@
+ .IR cap-code .
+ .PP
+ \fB\%terminfo\fP(5) discusses terminal capabilities at length
+-and presents a complete list of standard
++and presents a complete list of standardized
+ .IR cap-codes .
++\fB\%user_caps\fP(5) presents other widely used
++but non-standard capabilities.
+ .PP
+ When retrieving capability values,
+ the result depends upon the capability's type.
+@@ -1077,4 +1079,5 @@
+ \fB\%@TABS@\fP(1),
+ \fB\%@TSET@\fP(1),
+ \fB\%curs_termcap\fP(3X),
+-\fB\%terminfo\fP(5)
++\fB\%terminfo\fP(5),
++\fB\%user_caps\fP(5)
+Index: misc/run_tic.in
+Prereq:  1.42 
+--- ncurses-6.5-20250628+/misc/run_tic.in	2025-05-31 22:31:56.000000000 +0000
++++ ncurses-6.5-20250705/misc/run_tic.in	2025-07-05 20:40:18.000000000 +0000
+@@ -1,5 +1,5 @@
+ #!@SHELL@
+-# $Id: run_tic.in,v 1.42 2025/05/31 22:31:56 tom Exp $
++# $Id: run_tic.in,v 1.43 2025/07/05 20:40:18 tom Exp $
+ ##############################################################################
+ # Copyright 2019-2024,2025 Thomas E. Dickey                                  #
+ # Copyright 2000-2012,2017 Free Software Foundation, Inc.                    #
+@@ -179,6 +179,18 @@
+ fi
+ fi
+ 
++# Check if we are using symbolic links, or just pretending.
++case "@LN_S@" in
++cp\ *)
++	TICDIR="$TERMINFO"
++	echo "** assuming we cannot make symbolic links to a directory"
++	;;
++*)
++	echo "** assuming we can make symbolic links to a directory"
++	;;
++esac
++
++
+ # Make a symbolic link to provide compatibility with applications that expect
+ # to find terminfo under /usr/lib.  That is, we'll _try_ to do that.  Not
+ # all systems support symbolic links, and those that do provide a variety
+Index: ncurses/curses.priv.h
+Prereq:  1.705 
+--- ncurses-6.5-20250628+/ncurses/curses.priv.h	2025-06-28 17:42:24.000000000 +0000
++++ ncurses-6.5-20250705/ncurses/curses.priv.h	2025-07-05 12:38:04.000000000 +0000
+@@ -35,7 +35,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: curses.priv.h,v 1.705 2025/06/28 17:42:24 tom Exp $
++ * $Id: curses.priv.h,v 1.707 2025/07/05 12:38:04 Branden.Robinson Exp $
+  *
+  *	curses.priv.h
+  *
+@@ -1874,7 +1874,7 @@
+ 		? sp->_dch_cost \
+ 		: ((delete_character != NULL) \
+ 			? (sp->_dch1_cost * count) \
+-			: INFINITY))
++			: NC_INFINITY))
+ 
+ #define InsCharCost(sp,count) \
+ 		((parm_ich != NULL) \
+@@ -1883,7 +1883,7 @@
+ 		  ? sp->_smir_cost + sp->_rmir_cost + (sp->_ip_cost * count) \
+ 		  : ((insert_character != NULL) \
+ 		    ? ((sp->_ich1_cost + sp->_ip_cost) * count) \
+-		    : INFINITY)))
++		    : NC_INFINITY)))
+ 
+ #if USE_XMC_SUPPORT
+ #define UpdateAttrs(sp,c) if (!SameAttrOf(SCREEN_ATTRS(sp), c)) { \
+@@ -2055,8 +2055,12 @@
+ /* lib_insch.c */
+ extern NCURSES_EXPORT(int) _nc_insert_ch(SCREEN *, WINDOW *, chtype);
+ 
++/* lib_mouse.c */
++extern NCURSES_EXPORT(bool) _nc_has_mouse (const SCREEN *);
++
+ /* lib_mvcur.c */
+-#define INFINITY	1000000	/* cost: too high to use */
++#define NC_INFINITY	1000000	/* cost: too high to use */
++#define BAUDBYTE	9	/* 9 = 7 bits + 1 parity + 1 stop */
+ 
+ extern NCURSES_EXPORT(int) _nc_mvcur(int yold, int xold, int ynew, int xnew);
+ 
+@@ -2070,13 +2074,6 @@
+ extern NCURSES_EXPORT(void) _nc_screen_resume (void);
+ extern NCURSES_EXPORT(void) _nc_screen_wrap (void);
+ 
+-/* lib_mouse.c */
+-extern NCURSES_EXPORT(bool) _nc_has_mouse (const SCREEN *);
+-
+-/* lib_mvcur.c */
+-#define INFINITY	1000000	/* cost: too high to use */
+-#define BAUDBYTE	9	/* 9 = 7 bits + 1 parity + 1 stop */
+-
+ /* lib_setup.c */
+ extern NCURSES_EXPORT(char *) _nc_get_locale(void);
+ extern NCURSES_EXPORT(bool)   _nc_unicode_locale(void);
+Index: ncurses/tinfo/lib_win32con.c
+Prereq:  1.22 
+--- ncurses-6.5-20250628+/ncurses/tinfo/lib_win32con.c	2025-06-21 14:23:15.000000000 +0000
++++ ncurses-6.5-20250705/ncurses/tinfo/lib_win32con.c	2025-07-05 12:36:24.000000000 +0000
+@@ -38,7 +38,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: lib_win32con.c,v 1.22 2025/06/21 14:23:15 tom Exp $")
++MODULE_ID("$Id: lib_win32con.c,v 1.23 2025/07/05 12:36:24 Branden.Robinson Exp $")
+ 
+ #if defined(_NC_WINDOWS)
+ 
+@@ -591,7 +591,7 @@
+ static int
+ Adjust(int milliseconds, int diff)
+ {
+-    if (milliseconds != INFINITY) {
++    if (milliseconds != NC_INFINITY) {
+ 	milliseconds -= diff;
+ 	if (milliseconds < 0)
+ 	    milliseconds = 0;
+@@ -832,7 +832,7 @@
+ 		      hdl, milliseconds, mode));
+ 
+     if (milliseconds < 0)
+-	milliseconds = INFINITY;
++	milliseconds = NC_INFINITY;
+ 
+     memset(&inp_rec, 0, sizeof(inp_rec));
+ 
+Index: ncurses/tty/lib_mvcur.c
+Prereq:  1.165 
+--- ncurses-6.5-20250628+/ncurses/tty/lib_mvcur.c	2025-02-01 21:53:19.000000000 +0000
++++ ncurses-6.5-20250705/ncurses/tty/lib_mvcur.c	2025-07-05 12:36:24.000000000 +0000
+@@ -160,7 +160,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_mvcur.c,v 1.165 2025/02/01 21:53:19 tom Exp $")
++MODULE_ID("$Id: lib_mvcur.c,v 1.166 2025/07/05 12:36:24 Branden.Robinson Exp $")
+ 
+ #define WANT_CHAR(sp, y, x) NewScreen(sp)->_line[y].text[x]	/* desired state */
+ 
+@@ -223,7 +223,7 @@
+ /* compute the cost of a given operation */
+ {
+     if (cap == NULL)
+-	return (INFINITY);
++	return (NC_INFINITY);
+     else {
+ 	const char *cp;
+ 	float cum_cost = 0.0;
+@@ -287,7 +287,7 @@
+ /* compute the effective character-count for an operation (round up) */
+ {
+     int cost = NCURSES_SP_NAME(_nc_msec_cost) (NCURSES_SP_ARGx cap, affcnt);
+-    if (cost != INFINITY)
++    if (cost != NC_INFINITY)
+ 	cost = (cost + SP_PARM->_char_padding - 1) / SP_PARM->_char_padding;
+     return cost;
+ }
+@@ -370,8 +370,8 @@
+ 	SP_PARM->_ht_cost = CostOf(tab, 0);
+ 	SP_PARM->_cbt_cost = CostOf(back_tab, 0);
+     } else {
+-	SP_PARM->_ht_cost = INFINITY;
+-	SP_PARM->_cbt_cost = INFINITY;
++	SP_PARM->_ht_cost = NC_INFINITY;
++	SP_PARM->_cbt_cost = NC_INFINITY;
+     }
+ #endif /* USE_HARD_TABS */
+     SP_PARM->_cub1_cost = CostOf(cursor_left, 0);
+@@ -543,12 +543,12 @@
+ 	    if (_nc_safe_strcat(target, src)) {
+ 		total += num;
+ 	    } else {
+-		total = INFINITY;
++		total = NC_INFINITY;
+ 		break;
+ 	    }
+ 	}
+     } else {
+-	total = INFINITY;
++	total = NC_INFINITY;
+     }
+     return total;
+ }
+@@ -578,7 +578,7 @@
+     (void) _nc_str_copy(&save, target);
+ 
+     if (to_y != from_y) {
+-	vcost = INFINITY;
++	vcost = NC_INFINITY;
+ 
+ 	if (row_address != NULL
+ 	    && _nc_safe_strcat(target, TIPARM_1(row_address, to_y))) {
+@@ -617,8 +617,8 @@
+ 	    }
+ 	}
+ 
+-	if (vcost == INFINITY)
+-	    return (INFINITY);
++	if (vcost == NC_INFINITY)
++	    return (NC_INFINITY);
+     }
+ 
+     save = *target;
+@@ -627,7 +627,7 @@
+ 	char str[OPT_SIZE];
+ 	string_desc check;
+ 
+-	hcost = INFINITY;
++	hcost = NC_INFINITY;
+ 
+ 	if (column_address
+ 	    && _nc_safe_strcat(_nc_str_copy(target, &save),
+@@ -658,7 +658,7 @@
+ 		    for (fr = from_x; (nxt = NEXTTAB(fr)) <= to_x; fr = nxt) {
+ 			lhcost = repeated_append(&check, lhcost,
+ 						 SP_PARM->_ht_cost, 1, tab);
+-			if (lhcost == INFINITY)
++			if (lhcost == NC_INFINITY)
+ 			    break;
+ 		    }
+ 
+@@ -751,7 +751,7 @@
+ 			lhcost = repeated_append(&check, lhcost,
+ 						 SP_PARM->_cbt_cost,
+ 						 1, back_tab);
+-			if (lhcost == INFINITY)
++			if (lhcost == NC_INFINITY)
+ 			    break;
+ 		    }
+ 
+@@ -770,8 +770,8 @@
+ 	    }
+ 	}
+ 
+-	if (hcost == INFINITY)
+-	    return (INFINITY);
++	if (hcost == NC_INFINITY)
++	    return (NC_INFINITY);
+     }
+ 
+     return (vcost + hcost);
+@@ -798,7 +798,7 @@
+ {
+     string_desc result;
+     char buffer[OPT_SIZE];
+-    int tactic = 0, newcost, usecost = INFINITY;
++    int tactic = 0, newcost, usecost = NC_INFINITY;
+     int t5_cr_cost;
+ 
+ #if defined(MAIN) || defined(NCURSES_TEST)
+@@ -846,7 +846,7 @@
+ 	&& ((newcost = relative_move(NCURSES_SP_ARGx
+ 				     NullResult,
+ 				     yold, xold,
+-				     ynew, xnew, ovw)) != INFINITY)
++				     ynew, xnew, ovw)) != NC_INFINITY)
+ 	&& newcost < usecost) {
+ 	tactic = 1;
+ 	usecost = newcost;
+@@ -857,7 +857,7 @@
+ 	&& ((newcost = relative_move(NCURSES_SP_ARGx
+ 				     NullResult,
+ 				     yold, 0,
+-				     ynew, xnew, ovw)) != INFINITY)
++				     ynew, xnew, ovw)) != NC_INFINITY)
+ 	&& SP_PARM->_cr_cost + newcost < usecost) {
+ 	tactic = 2;
+ 	usecost = SP_PARM->_cr_cost + newcost;
+@@ -868,7 +868,7 @@
+ 	&& ((newcost = relative_move(NCURSES_SP_ARGx
+ 				     NullResult,
+ 				     0, 0,
+-				     ynew, xnew, ovw)) != INFINITY)
++				     ynew, xnew, ovw)) != NC_INFINITY)
+ 	&& SP_PARM->_home_cost + newcost < usecost) {
+ 	tactic = 3;
+ 	usecost = SP_PARM->_home_cost + newcost;
+@@ -879,7 +879,7 @@
+ 	&& ((newcost = relative_move(NCURSES_SP_ARGx
+ 				     NullResult,
+ 				     screen_lines(SP_PARM) - 1, 0,
+-				     ynew, xnew, ovw)) != INFINITY)
++				     ynew, xnew, ovw)) != NC_INFINITY)
+ 	&& SP_PARM->_ll_cost + newcost < usecost) {
+ 	tactic = 4;
+ 	usecost = SP_PARM->_ll_cost + newcost;
+@@ -895,7 +895,7 @@
+ 	&& ((newcost = relative_move(NCURSES_SP_ARGx
+ 				     NullResult,
+ 				     yold - 1, screen_columns(SP_PARM) - 1,
+-				     ynew, xnew, ovw)) != INFINITY)
++				     ynew, xnew, ovw)) != NC_INFINITY)
+ 	&& t5_cr_cost + SP_PARM->_cub1_cost + newcost < usecost) {
+ 	tactic = 5;
+ 	usecost = t5_cr_cost + SP_PARM->_cub1_cost + newcost;
+@@ -956,7 +956,7 @@
+ 		       (int) diff, diff / 288);
+ #endif /* MAIN */
+ 
+-    if (usecost != INFINITY) {
++    if (usecost != NC_INFINITY) {
+ 	TR(TRACE_MOVE, ("mvcur tactic %d", tactic));
+ 	TPUTS_TRACE("mvcur");
+ 	NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
+Index: ncurses/win32con/win_driver.c
+Prereq:  1.83 
+--- ncurses-6.5-20250628+/ncurses/win32con/win_driver.c	2025-06-21 14:25:02.000000000 +0000
++++ ncurses-6.5-20250705/ncurses/win32con/win_driver.c	2025-07-05 12:36:24.000000000 +0000
+@@ -48,7 +48,7 @@
+ 
+ #define CONTROL_PRESSED (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)
+ 
+-MODULE_ID("$Id: win_driver.c,v 1.83 2025/06/21 14:25:02 tom Exp $")
++MODULE_ID("$Id: win_driver.c,v 1.84 2025/07/05 12:36:24 Branden.Robinson Exp $")
+ 
+ #define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE)
+ 
+@@ -1463,7 +1463,7 @@
+ static int
+ Adjust(int milliseconds, int diff)
+ {
+-    if (milliseconds != INFINITY) {
++    if (milliseconds != NC_INFINITY) {
+ 	milliseconds -= diff;
+ 	if (milliseconds < 0)
+ 	    milliseconds = 0;
+@@ -1544,7 +1544,7 @@
+ 		      milliseconds, mode));
+ 
+     if (milliseconds < 0)
+-	milliseconds = INFINITY;
++	milliseconds = NC_INFINITY;
+ 
+     memset(&inp_rec, 0, sizeof(inp_rec));
+ 
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250628+/package/debian-mingw/changelog	2025-06-22 08:49:47.000000000 +0000
++++ ncurses-6.5-20250705/package/debian-mingw/changelog	2025-07-05 09:49:36.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250628) unstable; urgency=low
++ncurses6td (6.5+20250705) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 22 Jun 2025 04:49:47 -0400
++ -- Thomas E. Dickey   Sat, 05 Jul 2025 05:49:36 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250628+/package/debian-mingw64/changelog	2025-06-22 08:49:47.000000000 +0000
++++ ncurses-6.5-20250705/package/debian-mingw64/changelog	2025-07-05 09:49:36.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250628) unstable; urgency=low
++ncurses6td (6.5+20250705) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 22 Jun 2025 04:49:47 -0400
++ -- Thomas E. Dickey   Sat, 05 Jul 2025 05:49:36 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250628+/package/debian/changelog	2025-06-22 08:49:47.000000000 +0000
++++ ncurses-6.5-20250705/package/debian/changelog	2025-07-05 09:49:36.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250628) unstable; urgency=low
++ncurses6td (6.5+20250705) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 22 Jun 2025 04:49:47 -0400
++ -- Thomas E. Dickey   Sat, 05 Jul 2025 05:49:36 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.709 
+--- ncurses-6.5-20250628+/package/mingw-ncurses.nsi	2025-06-22 08:49:47.000000000 +0000
++++ ncurses-6.5-20250705/package/mingw-ncurses.nsi	2025-07-05 09:49:36.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.709 2025/06/22 08:49:47 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.710 2025/07/05 09:49:36 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0628"
++!define VERSION_MMDD  "0705"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250628+/package/mingw-ncurses.spec	2025-06-22 08:49:47.000000000 +0000
++++ ncurses-6.5-20250705/package/mingw-ncurses.spec	2025-07-05 09:49:36.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250628
++Release: 20250705
+ License: X11 License Distribution Modification Variant
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+@@ -144,8 +144,8 @@
+ 
+ %changelog
+ 
+-* Sun Jun 22 2025 Thomas E. Dickey
+-- testing ncurses 6.5-20250628
++* Sat Jul 05 2025 Thomas E. Dickey
++- testing ncurses 6.5-20250705
+ 
+ * Sat Feb 25 2023 Thomas Dickey
+ - amend URLs per rpmlint
+Index: package/ncurses.spec
+--- ncurses-6.5-20250628+/package/ncurses.spec	2025-06-22 08:49:47.000000000 +0000
++++ ncurses-6.5-20250705/package/ncurses.spec	2025-07-05 09:49:36.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250628
++Release: 20250705
+ License: X11 License Distribution Modification Variant
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+@@ -134,8 +134,8 @@
+ 
+ %changelog
+ 
+-* Sun Jun 22 2025 Thomas E. Dickey
+-- testing ncurses 6.5-20250628
++* Sat Jul 05 2025 Thomas E. Dickey
++- testing ncurses 6.5-20250705
+ 
+ * Sat Feb 25 2023 Thomas Dickey
+ - amend URLs per rpmlint
+Index: package/ncursest.spec
+--- ncurses-6.5-20250628+/package/ncursest.spec	2025-06-22 08:49:47.000000000 +0000
++++ ncurses-6.5-20250705/package/ncursest.spec	2025-07-05 09:49:36.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250628
++Release: 20250705
+ License: X11 License Distribution Modification Variant
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+@@ -142,8 +142,8 @@
+ 
+ %changelog
+ 
+-* Sun Jun 22 2025 Thomas E. Dickey
+-- testing ncurses 6.5-20250628
++* Sat Jul 05 2025 Thomas E. Dickey
++- testing ncurses 6.5-20250705
+ 
+ * Tue Dec 24 2019 Thomas Dickey
+ - drop custom CC_NORMAL warning flags because setting CFLAGS interferes with
+Index: test/back_ground.c
+Prereq:  1.14 
+--- ncurses-6.5-20250628+/test/back_ground.c	2024-11-30 18:36:56.000000000 +0000
++++ ncurses-6.5-20250705/test/back_ground.c	2025-07-05 15:18:31.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2021-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2021-2024,2025 Thomas E. Dickey                                *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: back_ground.c,v 1.14 2024/11/30 18:36:56 tom Exp $
++ * $Id: back_ground.c,v 1.15 2025/07/05 15:18:31 tom Exp $
+  */
+ 
+ #include 
+@@ -254,11 +254,8 @@
+ 	case 'W':
+ 	    fill_char = decode_wchar(optarg);
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/background.c
+Prereq:  1.29 
+--- ncurses-6.5-20250628+/test/background.c	2024-11-30 18:37:15.000000000 +0000
++++ ncurses-6.5-20250705/test/background.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2003-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: background.c,v 1.29 2024/11/30 18:37:15 tom Exp $
++ * $Id: background.c,v 1.30 2025/07/05 15:21:56 tom Exp $
+  */
+ 
+ #define NEED_COLOR_CODE 1
+@@ -207,11 +207,8 @@
+ 	    if (!open_dump(optarg))
+ 		usage(FALSE);
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/blue.c
+Prereq:  1.57 
+--- ncurses-6.5-20250628+/test/blue.c	2024-12-07 22:27:13.000000000 +0000
++++ ncurses-6.5-20250705/test/blue.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -37,7 +37,7 @@
+  *****************************************************************************/
+ 
+ /*
+- * $Id: blue.c,v 1.57 2024/12/07 22:27:13 tom Exp $
++ * $Id: blue.c,v 1.58 2025/07/05 15:21:56 tom Exp $
+  */
+ 
+ #include 
+@@ -492,11 +492,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/bs.c
+Prereq:  1.82 
+--- ncurses-6.5-20250628+/test/bs.c	2024-12-07 22:18:28.000000000 +0000
++++ ncurses-6.5-20250705/test/bs.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -35,7 +35,7 @@
+  * v2.0 featuring strict ANSI/POSIX conformance, November 1993.
+  * v2.1 with ncurses mouse support, September 1995
+  *
+- * $Id: bs.c,v 1.82 2024/12/07 22:18:28 tom Exp $
++ * $Id: bs.c,v 1.83 2025/07/05 15:21:56 tom Exp $
+  */
+ 
+ #include 
+@@ -1233,11 +1233,8 @@
+ 	case 'p':
+ 	    closepack = 1;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/cardfile.c
+Prereq:  1.54 
+--- ncurses-6.5-20250628+/test/cardfile.c	2024-12-07 22:27:13.000000000 +0000
++++ ncurses-6.5-20250705/test/cardfile.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1999-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: cardfile.c,v 1.54 2024/12/07 22:27:13 tom Exp $
++ * $Id: cardfile.c,v 1.55 2025/07/05 15:21:56 tom Exp $
+  *
+  * File format: text beginning in column 1 is a title; other text is content.
+  */
+@@ -583,11 +583,8 @@
+ 	case 'C':
+ 	    try_color = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/chgat.c
+Prereq:  1.24 
+--- ncurses-6.5-20250628+/test/chgat.c	2024-12-07 22:27:13.000000000 +0000
++++ ncurses-6.5-20250705/test/chgat.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2006-2012,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: chgat.c,v 1.24 2024/12/07 22:27:13 tom Exp $
++ * $Id: chgat.c,v 1.25 2025/07/05 15:21:56 tom Exp $
+  *
+  * test-driver for chgat/wchgat/mvchgat/mvwchgat
+  */
+@@ -376,11 +376,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/clip_printw.c
+Prereq:  1.26 
+--- ncurses-6.5-20250628+/test/clip_printw.c	2024-12-07 22:22:51.000000000 +0000
++++ ncurses-6.5-20250705/test/clip_printw.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: clip_printw.c,v 1.26 2024/12/07 22:22:51 tom Exp $
++ * $Id: clip_printw.c,v 1.27 2025/07/05 15:21:56 tom Exp $
+  *
+  * demonstrate how to use printw with/without wrapping.
+  */
+@@ -444,11 +444,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/color_content.c
+Prereq:  1.22 
+--- ncurses-6.5-20250628+/test/color_content.c	2024-12-07 22:22:51.000000000 +0000
++++ ncurses-6.5-20250705/test/color_content.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: color_content.c,v 1.22 2024/12/07 22:22:51 tom Exp $
++ * $Id: color_content.c,v 1.23 2025/07/05 15:21:56 tom Exp $
+  */
+ 
+ #define NEED_TIME_H
+@@ -274,11 +274,8 @@
+ 	    x_opt = 1;
+ 	    break;
+ #endif
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/color_set.c
+Prereq:  1.12 
+--- ncurses-6.5-20250628+/test/color_set.c	2022-12-10 23:36:59.000000000 +0000
++++ ncurses-6.5-20250705/test/color_set.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2020,2022 Thomas E. Dickey                                *
++ * Copyright 2020,2022,2025 Thomas E. Dickey                                *
+  * Copyright 2003-2012,2014 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: color_set.c,v 1.12 2022/12/10 23:36:59 tom Exp $
++ * $Id: color_set.c,v 1.13 2025/07/05 15:21:56 tom Exp $
+  */
+ 
+ #include 
+@@ -64,11 +64,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/combine.c
+Prereq:  1.27 
+--- ncurses-6.5-20250628+/test/combine.c	2024-12-07 22:22:51.000000000 +0000
++++ ncurses-6.5-20250705/test/combine.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2021-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2021-2024,2025 Thomas E. Dickey                                *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: combine.c,v 1.27 2024/12/07 22:22:51 tom Exp $
++ * $Id: combine.c,v 1.28 2025/07/05 15:21:56 tom Exp $
+  */
+ 
+ #include 
+@@ -228,11 +228,8 @@
+ 	case 'r':
+ 	    r_opt = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/demo_altkeys.c
+Prereq:  1.19 
+--- ncurses-6.5-20250628+/test/demo_altkeys.c	2025-01-11 14:54:49.000000000 +0000
++++ ncurses-6.5-20250705/test/demo_altkeys.c	2025-07-05 15:11:35.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_altkeys.c,v 1.19 2025/01/11 14:54:49 tom Exp $
++ * $Id: demo_altkeys.c,v 1.20 2025/07/05 15:11:35 tom Exp $
+  *
+  * Demonstrate the define_key() function.
+  * Thomas Dickey - 2005/10/22
+@@ -100,11 +100,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/demo_defkey.c
+Prereq:  1.37 
+--- ncurses-6.5-20250628+/test/demo_defkey.c	2024-12-07 22:22:51.000000000 +0000
++++ ncurses-6.5-20250705/test/demo_defkey.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 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: demo_defkey.c,v 1.37 2024/12/07 22:22:51 tom Exp $
++ * $Id: demo_defkey.c,v 1.38 2025/07/05 15:21:56 tom Exp $
+  *
+  * Demonstrate the define_key() function.
+  * Thomas Dickey - 2002/11/23
+@@ -240,11 +240,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/demo_forms.c
+Prereq:  1.68 
+--- ncurses-6.5-20250628+/test/demo_forms.c	2024-12-07 22:27:13.000000000 +0000
++++ ncurses-6.5-20250705/test/demo_forms.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2003-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_forms.c,v 1.68 2024/12/07 22:27:13 tom Exp $
++ * $Id: demo_forms.c,v 1.69 2025/07/05 15:21:56 tom Exp $
+  *
+  * Demonstrate a variety of functions from the form library.
+  * Thomas Dickey - 2003/4/26
+@@ -606,11 +606,8 @@
+ 	case 't':
+ 	    t_value = optarg;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/demo_keyok.c
+Prereq:  1.11 
+--- ncurses-6.5-20250628+/test/demo_keyok.c	2024-12-07 22:22:51.000000000 +0000
++++ ncurses-6.5-20250705/test/demo_keyok.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2002-2006,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_keyok.c,v 1.11 2024/12/07 22:22:51 tom Exp $
++ * $Id: demo_keyok.c,v 1.12 2025/07/05 15:21:56 tom Exp $
+  *
+  * Demonstrate the keyok() function.
+  * Thomas Dickey - 2002/11/23
+@@ -66,11 +66,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/demo_menus.c
+Prereq:  1.86 
+--- ncurses-6.5-20250628+/test/demo_menus.c	2024-12-07 22:27:13.000000000 +0000
++++ ncurses-6.5-20250705/test/demo_menus.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2003-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_menus.c,v 1.86 2024/12/07 22:27:13 tom Exp $
++ * $Id: demo_menus.c,v 1.87 2025/07/05 15:21:56 tom Exp $
+  *
+  * Demonstrate a variety of functions from the menu library.
+  * Thomas Dickey - 2005/4/9
+@@ -1026,11 +1026,8 @@
+ 	    curses_trace((unsigned) strtoul(optarg, NULL, 0));
+ 	    break;
+ #endif
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/demo_new_pair.c
+Prereq:  1.32 
+--- ncurses-6.5-20250628+/test/demo_new_pair.c	2024-12-07 22:22:51.000000000 +0000
++++ ncurses-6.5-20250705/test/demo_new_pair.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 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: demo_new_pair.c,v 1.32 2024/12/07 22:22:51 tom Exp $
++ * $Id: demo_new_pair.c,v 1.33 2025/07/05 15:21:56 tom Exp $
+  *
+  * Demonstrate the alloc_pair() function.
+  */
+@@ -226,11 +226,8 @@
+ 	case 'w':
+ 	    use_wide = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/demo_panels.c
+Prereq:  1.53 
+--- ncurses-6.5-20250628+/test/demo_panels.c	2024-12-07 22:27:13.000000000 +0000
++++ ncurses-6.5-20250705/test/demo_panels.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2003-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_panels.c,v 1.53 2024/12/07 22:27:13 tom Exp $
++ * $Id: demo_panels.c,v 1.54 2025/07/05 15:21:56 tom Exp $
+  *
+  * Demonstrate a variety of functions from the panel library.
+  */
+@@ -797,11 +797,8 @@
+ 	case 'x':
+ 	    unboxed = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/demo_tabs.c
+Prereq:  1.12 
+--- ncurses-6.5-20250628+/test/demo_tabs.c	2024-11-30 18:47:39.000000000 +0000
++++ ncurses-6.5-20250705/test/demo_tabs.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -29,7 +29,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: demo_tabs.c,v 1.12 2024/11/30 18:47:39 tom Exp $
++ * $Id: demo_tabs.c,v 1.13 2025/07/05 15:21:56 tom Exp $
+  *
+  * A simple demo of tabs in curses.
+  */
+@@ -77,11 +77,8 @@
+ 	case 't':
+ 	    curses_stops = atoi(optarg);
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/demo_termcap.c
+Prereq:  1.74 
+--- ncurses-6.5-20250628+/test/demo_termcap.c	2025-01-11 14:54:49.000000000 +0000
++++ ncurses-6.5-20250705/test/demo_termcap.c	2025-07-05 15:11:35.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: demo_termcap.c,v 1.74 2025/01/11 14:54:49 tom Exp $
++ * $Id: demo_termcap.c,v 1.75 2025/07/05 15:11:35 tom Exp $
+  *
+  * A simple demo of the termcap interface.
+  */
+@@ -840,11 +840,8 @@
+ 	    break;
+ #endif
+ #endif
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/demo_terminfo.c
+Prereq:  1.63 
+--- ncurses-6.5-20250628+/test/demo_terminfo.c	2025-01-11 14:54:49.000000000 +0000
++++ ncurses-6.5-20250705/test/demo_terminfo.c	2025-07-05 15:11:35.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: demo_terminfo.c,v 1.63 2025/01/11 14:54:49 tom Exp $
++ * $Id: demo_terminfo.c,v 1.64 2025/07/05 15:11:35 tom Exp $
+  *
+  * A simple demo of the terminfo interface.
+  */
+@@ -864,11 +864,8 @@
+ 	    x_opt = TRUE;
+ 	    break;
+ #endif
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/ditto.c
+Prereq:  1.61 
+--- ncurses-6.5-20250628+/test/ditto.c	2025-02-09 00:18:00.000000000 +0000
++++ ncurses-6.5-20250705/test/ditto.c	2025-07-05 15:11:35.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey (1998-on)
+  *
+- * $Id: ditto.c,v 1.61 2025/02/09 00:18:00 tom Exp $
++ * $Id: ditto.c,v 1.62 2025/07/05 15:11:35 tom Exp $
+  *
+  * The program illustrates how to set up multiple screens from a single
+  * program.
+@@ -420,11 +420,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/dots.c
+Prereq:  1.47 
+--- ncurses-6.5-20250628+/test/dots.c	2024-12-07 22:27:13.000000000 +0000
++++ ncurses-6.5-20250705/test/dots.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1999-2013,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey  1999
+  *
+- * $Id: dots.c,v 1.47 2024/12/07 22:27:13 tom Exp $
++ * $Id: dots.c,v 1.48 2025/07/05 15:21:56 tom Exp $
+  *
+  * A simple demo of the terminfo interface.
+  */
+@@ -179,11 +179,8 @@
+ 	case 's':
+ 	    s_option = atoi(optarg);
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/dots_curses.c
+Prereq:  1.27 
+--- ncurses-6.5-20250628+/test/dots_curses.c	2024-12-07 22:32:11.000000000 +0000
++++ ncurses-6.5-20250705/test/dots_curses.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2014,2017 Free Software Foundation, Inc.                       *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: dots_curses.c,v 1.27 2024/12/07 22:32:11 tom Exp $
++ * $Id: dots_curses.c,v 1.28 2025/07/05 15:21:56 tom Exp $
+  *
+  * A simple demo of the curses interface used for comparison with termcap.
+  */
+@@ -161,11 +161,8 @@
+ 	case 's':
+ 	    s_option = atoi(optarg);
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/dots_mvcur.c
+Prereq:  1.33 
+--- ncurses-6.5-20250628+/test/dots_mvcur.c	2024-12-07 22:32:11.000000000 +0000
++++ ncurses-6.5-20250705/test/dots_mvcur.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2007-2013,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey - 2007
+  *
+- * $Id: dots_mvcur.c,v 1.33 2024/12/07 22:32:11 tom Exp $
++ * $Id: dots_mvcur.c,v 1.34 2025/07/05 15:21:56 tom Exp $
+  *
+  * A simple demo of the terminfo interface, and mvcur.
+  */
+@@ -182,11 +182,8 @@
+ 	case 's':
+ 	    s_option = atoi(optarg);
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/dots_termcap.c
+Prereq:  1.37 
+--- ncurses-6.5-20250628+/test/dots_termcap.c	2024-12-07 22:32:11.000000000 +0000
++++ ncurses-6.5-20250705/test/dots_termcap.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2013-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: dots_termcap.c,v 1.37 2024/12/07 22:32:11 tom Exp $
++ * $Id: dots_termcap.c,v 1.38 2025/07/05 15:21:56 tom Exp $
+  *
+  * A simple demo of the termcap interface.
+  */
+@@ -254,11 +254,8 @@
+ 	case 's':
+ 	    s_option = atoi(optarg);
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/dots_xcurses.c
+Prereq:  1.32 
+--- ncurses-6.5-20250628+/test/dots_xcurses.c	2024-12-07 22:32:11.000000000 +0000
++++ ncurses-6.5-20250705/test/dots_xcurses.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2017 Free Software Foundation, Inc.                            *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: dots_xcurses.c,v 1.32 2024/12/07 22:32:11 tom Exp $
++ * $Id: dots_xcurses.c,v 1.33 2025/07/05 15:21:56 tom Exp $
+  *
+  * A simple demo of the wide-curses interface used for comparison with termcap.
+  */
+@@ -192,11 +192,8 @@
+ 	    x_option = TRUE;
+ 	    break;
+ #endif
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/dup_field.c
+Prereq:  1.13 
+--- ncurses-6.5-20250628+/test/dup_field.c	2025-01-11 14:54:49.000000000 +0000
++++ ncurses-6.5-20250705/test/dup_field.c	2025-07-05 15:11:35.000000000 +0000
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: dup_field.c,v 1.13 2025/01/11 14:54:49 tom Exp $
++ * $Id: dup_field.c,v 1.14 2025/07/05 15:11:35 tom Exp $
+  *
+  * Demonstrate dup_field().
+  */
+@@ -406,11 +406,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/echochar.c
+Prereq:  1.27 
+--- ncurses-6.5-20250628+/test/echochar.c	2024-12-07 23:03:07.000000000 +0000
++++ ncurses-6.5-20250705/test/echochar.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2006-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: echochar.c,v 1.27 2024/12/07 23:03:07 tom Exp $
++ * $Id: echochar.c,v 1.28 2025/07/05 15:21:56 tom Exp $
+  *
+  * Demonstrate the echochar function (compare to dots.c).
+  * Thomas Dickey - 2006/11/4
+@@ -117,11 +117,8 @@
+ 	case 'r':
+ 	    opt_r = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/extended_color.c
+Prereq:  1.20 
+--- ncurses-6.5-20250628+/test/extended_color.c	2022-12-10 22:28:50.000000000 +0000
++++ ncurses-6.5-20250705/test/extended_color.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2022 Thomas E. Dickey                                *
++ * Copyright 2018-2022,2025 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: extended_color.c,v 1.20 2022/12/10 22:28:50 tom Exp $
++ * $Id: extended_color.c,v 1.21 2025/07/05 15:21:56 tom Exp $
+  */
+ 
+ #include 
+@@ -173,11 +173,8 @@
+ 	    opt_s = TRUE;
+ 	    break;
+ #endif
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/filter.c
+Prereq:  1.42 
+--- ncurses-6.5-20250628+/test/filter.c	2025-02-08 13:06:10.000000000 +0000
++++ ncurses-6.5-20250705/test/filter.c	2025-07-05 15:11:35.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+  * Author:  Thomas E. Dickey 1998
+  *
+- * $Id: filter.c,v 1.42 2025/02/08 13:06:10 tom Exp $
++ * $Id: filter.c,v 1.43 2025/07/05 15:11:35 tom Exp $
+  *
+  * An example of the 'filter()' function in ncurses, this program prompts
+  * for commands and executes them (like a command shell).  It illustrates
+@@ -365,11 +365,8 @@
+ 	case 'p':
+ 	    p_option = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/firework.c
+Prereq:  1.40 
+--- ncurses-6.5-20250628+/test/firework.c	2022-12-04 00:40:11.000000000 +0000
++++ ncurses-6.5-20250705/test/firework.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
++ * Copyright 2019-2022,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: firework.c,v 1.40 2022/12/04 00:40:11 tom Exp $
++ * $Id: firework.c,v 1.41 2025/07/05 15:21:56 tom Exp $
+  */
+ #include 
+ 
+@@ -181,11 +181,8 @@
+ 	    d_option = TRUE;
+ 	    break;
+ #endif
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/firstlast.c
+Prereq:  1.10 
+--- ncurses-6.5-20250628+/test/firstlast.c	2022-12-10 23:31:31.000000000 +0000
++++ ncurses-6.5-20250705/test/firstlast.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2022 Thomas E. Dickey                                     *
++ * Copyright 2020-2022,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+  * This test was written by Alexander V. Lukyanov to demonstrate difference
+  * between ncurses 4.1 and SVR4 curses
+  *
+- * $Id: firstlast.c,v 1.10 2022/12/10 23:31:31 tom Exp $
++ * $Id: firstlast.c,v 1.11 2025/07/05 15:21:56 tom Exp $
+  */
+ 
+ #include 
+@@ -99,11 +99,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/foldkeys.c
+Prereq:  1.15 
+--- ncurses-6.5-20250628+/test/foldkeys.c	2025-01-11 14:54:49.000000000 +0000
++++ ncurses-6.5-20250705/test/foldkeys.c	2025-07-05 15:11:35.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey, 2006
+  *
+- * $Id: foldkeys.c,v 1.15 2025/01/11 14:54:49 tom Exp $
++ * $Id: foldkeys.c,v 1.16 2025/07/05 15:11:35 tom Exp $
+  *
+  * Demonstrate a method for altering key definitions at runtime.
+  *
+@@ -223,11 +223,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/form_driver_w.c
+Prereq:  1.19 
+--- ncurses-6.5-20250628+/test/form_driver_w.c	2024-12-07 22:32:11.000000000 +0000
++++ ncurses-6.5-20250705/test/form_driver_w.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2013-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -32,7 +32,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: form_driver_w.c,v 1.19 2024/12/07 22:32:11 tom Exp $
++ * $Id: form_driver_w.c,v 1.20 2025/07/05 15:21:56 tom Exp $
+  *
+  * Test form_driver_w (int, int, wchar_t), a wide char aware
+  * replacement of form_driver.
+@@ -88,11 +88,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/gdc.c
+Prereq:  1.64 
+--- ncurses-6.5-20250628+/test/gdc.c	2024-12-07 22:32:11.000000000 +0000
++++ ncurses-6.5-20250705/test/gdc.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -34,7 +34,7 @@
+  * modified 10-18-89 for curses (jrl)
+  * 10-18-89 added signal handling
+  *
+- * $Id: gdc.c,v 1.64 2024/12/07 22:32:11 tom Exp $
++ * $Id: gdc.c,v 1.65 2025/07/05 15:21:56 tom Exp $
+  */
+ 
+ #include 
+@@ -276,11 +276,8 @@
+ 	    hascustomtime = TRUE;
+ 	    starts = parse_time(optarg);
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/hanoi.c
+Prereq:  1.47 
+--- ncurses-6.5-20250628+/test/hanoi.c	2022-12-04 00:40:11.000000000 +0000
++++ ncurses-6.5-20250705/test/hanoi.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2021,2022 Thomas E. Dickey                                *
++ * Copyright 2019-2022,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -42,7 +42,7 @@
+  *
+  *	Date: 05.Nov.90
+  *
+- * $Id: hanoi.c,v 1.47 2022/12/04 00:40:11 tom Exp $
++ * $Id: hanoi.c,v 1.48 2025/07/05 15:21:56 tom Exp $
+  */
+ 
+ #include 
+@@ -289,11 +289,8 @@
+ 	case 'X':
+ 	    AutoFlag = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/hashtest.c
+Prereq:  1.42 
+--- ncurses-6.5-20250628+/test/hashtest.c	2024-11-30 18:54:40.000000000 +0000
++++ ncurses-6.5-20250705/test/hashtest.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2013,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -31,7 +31,7 @@
+  *
+  * Generate timing statistics for vertical-motion optimization.
+  *
+- * $Id: hashtest.c,v 1.42 2024/11/30 18:54:40 tom Exp $
++ * $Id: hashtest.c,v 1.43 2025/07/05 15:21:56 tom Exp $
+  */
+ 
+ #include 
+@@ -218,11 +218,8 @@
+ 	case 'x':
+ 	    extend_corner = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/inch_wide.c
+Prereq:  1.15 
+--- ncurses-6.5-20250628+/test/inch_wide.c	2024-12-07 22:32:11.000000000 +0000
++++ ncurses-6.5-20250705/test/inch_wide.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2007-2010,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: inch_wide.c,v 1.15 2024/12/07 22:32:11 tom Exp $
++ * $Id: inch_wide.c,v 1.16 2025/07/05 15:21:56 tom Exp $
+  */
+ /*
+        int in_wch(cchar_t *wcval);
+@@ -289,11 +289,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/inchs.c
+Prereq:  1.21 
+--- ncurses-6.5-20250628+/test/inchs.c	2024-12-07 22:32:11.000000000 +0000
++++ ncurses-6.5-20250705/test/inchs.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2007-2012,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: inchs.c,v 1.21 2024/12/07 22:32:11 tom Exp $
++ * $Id: inchs.c,v 1.22 2025/07/05 15:21:56 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  */
+@@ -301,11 +301,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/ins_wide.c
+Prereq:  1.32 
+--- ncurses-6.5-20250628+/test/ins_wide.c	2024-12-07 22:32:11.000000000 +0000
++++ ncurses-6.5-20250705/test/ins_wide.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 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: ins_wide.c,v 1.32 2024/12/07 22:32:11 tom Exp $
++ * $Id: ins_wide.c,v 1.33 2025/07/05 15:21:56 tom Exp $
+  *
+  * Demonstrate the wins_wstr() and wins_wch functions.
+  * Thomas Dickey - 2002/11/23
+@@ -500,11 +500,8 @@
+ 	case 'w':
+ 	    w_opt = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/insdelln.c
+Prereq:  1.18 
+--- ncurses-6.5-20250628+/test/insdelln.c	2024-12-07 22:32:11.000000000 +0000
++++ ncurses-6.5-20250705/test/insdelln.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2008-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: insdelln.c,v 1.18 2024/12/07 22:32:11 tom Exp $
++ * $Id: insdelln.c,v 1.19 2025/07/05 15:21:56 tom Exp $
+  *
+  * test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln
+  */
+@@ -398,11 +398,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/inserts.c
+Prereq:  1.36 
+--- ncurses-6.5-20250628+/test/inserts.c	2024-12-07 22:33:32.000000000 +0000
++++ ncurses-6.5-20250705/test/inserts.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 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: inserts.c,v 1.36 2024/12/07 22:33:32 tom Exp $
++ * $Id: inserts.c,v 1.37 2025/07/05 15:21:56 tom Exp $
+  *
+  * Demonstrate the winsstr() and winsch functions.
+  * Thomas Dickey - 2002/10/19
+@@ -429,11 +429,8 @@
+ 	case 'w':
+ 	    w_opt = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/key_names.c
+Prereq:  1.12 
+--- ncurses-6.5-20250628+/test/key_names.c	2024-12-07 23:00:37.000000000 +0000
++++ ncurses-6.5-20250705/test/key_names.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2007-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: key_names.c,v 1.12 2024/12/07 23:00:37 tom Exp $
++ * $Id: key_names.c,v 1.13 2025/07/05 15:21:56 tom Exp $
+  */
+ 
+ #include 
+@@ -76,11 +76,8 @@
+ 	case 's':
+ 	    do_setup = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/keynames.c
+Prereq:  1.14 
+--- ncurses-6.5-20250628+/test/keynames.c	2024-12-07 23:00:37.000000000 +0000
++++ ncurses-6.5-20250705/test/keynames.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2006,2008 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: keynames.c,v 1.14 2024/12/07 23:00:37 tom Exp $
++ * $Id: keynames.c,v 1.15 2025/07/05 15:21:56 tom Exp $
+  */
+ 
+ #include 
+@@ -73,11 +73,8 @@
+ 	case 's':
+ 	    do_setup = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/knight.c
+Prereq:  1.53 
+--- ncurses-6.5-20250628+/test/knight.c	2024-10-05 19:38:58.000000000 +0000
++++ ncurses-6.5-20250705/test/knight.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2013,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -34,7 +34,7 @@
+  * Eric S. Raymond  July 22 1995.  Mouse support
+  * added September 20th 1995.
+  *
+- * $Id: knight.c,v 1.53 2024/10/05 19:38:58 tom Exp $
++ * $Id: knight.c,v 1.54 2025/07/05 15:21:56 tom Exp $
+  */
+ 
+ #include 
+@@ -944,11 +944,8 @@
+ 	    }
+ 	    xlimit = ylimit = ch;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/list_keys.c
+Prereq:  1.37 
+--- ncurses-6.5-20250628+/test/list_keys.c	2024-12-07 22:33:32.000000000 +0000
++++ ncurses-6.5-20250705/test/list_keys.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2016,2017 Free Software Foundation, Inc.                       *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: list_keys.c,v 1.37 2024/12/07 22:33:32 tom Exp $
++ * $Id: list_keys.c,v 1.38 2025/07/05 15:21:56 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -479,11 +479,8 @@
+ 	    x_opt = TRUE;
+ 	    break;
+ #endif
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/lrtest.c
+Prereq:  1.29 
+--- ncurses-6.5-20250628+/test/lrtest.c	2022-12-10 23:44:18.000000000 +0000
++++ ncurses-6.5-20250705/test/lrtest.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
++ * Copyright 2019-2022,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -35,7 +35,7 @@
+  * This can't be part of the ncurses test-program, because ncurses rips off the
+  * bottom line to do labels.
+  *
+- * $Id: lrtest.c,v 1.29 2022/12/10 23:44:18 tom Exp $
++ * $Id: lrtest.c,v 1.30 2025/07/05 15:21:56 tom Exp $
+  */
+ 
+ #include 
+@@ -119,11 +119,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/move_field.c
+Prereq:  1.21 
+--- ncurses-6.5-20250628+/test/move_field.c	2025-01-11 14:54:49.000000000 +0000
++++ ncurses-6.5-20250705/test/move_field.c	2025-07-05 15:11:35.000000000 +0000
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: move_field.c,v 1.21 2025/01/11 14:54:49 tom Exp $
++ * $Id: move_field.c,v 1.22 2025/07/05 15:11:35 tom Exp $
+  *
+  * Demonstrate move_field().
+  */
+@@ -503,11 +503,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/movewindow.c
+Prereq:  1.58 
+--- ncurses-6.5-20250628+/test/movewindow.c	2025-01-11 14:54:49.000000000 +0000
++++ ncurses-6.5-20250705/test/movewindow.c	2025-07-05 15:11:35.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: movewindow.c,v 1.58 2025/01/11 14:54:49 tom Exp $
++ * $Id: movewindow.c,v 1.59 2025/07/05 15:11:35 tom Exp $
+  *
+  * Demonstrate move functions for windows and derived windows from the curses
+  * library.
+@@ -705,11 +705,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/ncurses.c
+Prereq:  1.548 
+--- ncurses-6.5-20250628+/test/ncurses.c	2025-05-17 23:01:22.000000000 +0000
++++ ncurses-6.5-20250705/test/ncurses.c	2025-07-05 15:11:35.000000000 +0000
+@@ -41,7 +41,7 @@
+    Author: Eric S. Raymond  1993
+            Thomas E. Dickey (beginning revision 1.27 in 1996).
+ 
+-$Id: ncurses.c,v 1.548 2025/05/17 23:01:22 tom Exp $
++$Id: ncurses.c,v 1.549 2025/07/05 15:11:35 tom Exp $
+ 
+ ***************************************************************************/
+ 
+@@ -7979,11 +7979,8 @@
+ 	    xterm_colors = TRUE;
+ 	    break;
+ #endif
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/newdemo.c
+Prereq:  1.49 
+--- ncurses-6.5-20250628+/test/newdemo.c	2025-02-15 15:15:25.000000000 +0000
++++ ncurses-6.5-20250705/test/newdemo.c	2025-07-05 15:11:35.000000000 +0000
+@@ -2,7 +2,7 @@
+  *  newdemo.c	-	A demo program using PDCurses. The program illustrate
+  *  	 		the use of colours for text output.
+  *
+- * $Id: newdemo.c,v 1.49 2025/02/15 15:15:25 tom Exp $
++ * $Id: newdemo.c,v 1.50 2025/07/05 15:11:35 tom Exp $
+  */
+ 
+ #include 
+@@ -250,11 +250,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/padview.c
+Prereq:  1.28 
+--- ncurses-6.5-20250628+/test/padview.c	2024-12-21 17:34:13.000000000 +0000
++++ ncurses-6.5-20250705/test/padview.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 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 @@
+ /*
+  * clone of view.c, using pads
+  *
+- * $Id: padview.c,v 1.28 2024/12/21 17:34:13 tom Exp $
++ * $Id: padview.c,v 1.29 2025/07/05 15:21:56 tom Exp $
+  */
+ 
+ #include 
+@@ -349,11 +349,8 @@
+ 	    curses_trace(TRACE_CALLS);
+ 	    break;
+ #endif
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/pair_content.c
+Prereq:  1.25 
+--- ncurses-6.5-20250628+/test/pair_content.c	2024-12-07 22:45:15.000000000 +0000
++++ ncurses-6.5-20250705/test/pair_content.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: pair_content.c,v 1.25 2024/12/07 22:45:15 tom Exp $
++ * $Id: pair_content.c,v 1.26 2025/07/05 15:21:56 tom Exp $
+  */
+ 
+ #define NEED_TIME_H
+@@ -267,11 +267,8 @@
+ 	    x_opt = 1;
+ 	    break;
+ #endif
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/picsmap.c
+Prereq:  1.154 
+--- ncurses-6.5-20250628+/test/picsmap.c	2025-06-28 22:48:52.000000000 +0000
++++ ncurses-6.5-20250705/test/picsmap.c	2025-07-05 15:11:35.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: picsmap.c,v 1.154 2025/06/28 22:48:52 tom Exp $
++ * $Id: picsmap.c,v 1.155 2025/07/05 15:11:35 tom Exp $
+  *
+  * Author: Thomas E. Dickey
+  *
+@@ -1788,11 +1788,8 @@
+ 	    }
+ 	    break;
+ #endif
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/railroad.c
+Prereq:  1.28 
+--- ncurses-6.5-20250628+/test/railroad.c	2024-12-07 22:48:03.000000000 +0000
++++ ncurses-6.5-20250705/test/railroad.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2000-2013,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey - 2000
+  *
+- * $Id: railroad.c,v 1.28 2024/12/07 22:48:03 tom Exp $
++ * $Id: railroad.c,v 1.29 2025/07/05 15:21:56 tom Exp $
+  *
+  * A simple demo of the termcap interface.
+  */
+@@ -262,11 +262,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/rain.c
+Prereq:  1.63 
+--- ncurses-6.5-20250628+/test/rain.c	2024-12-07 22:46:42.000000000 +0000
++++ ncurses-6.5-20250705/test/rain.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: rain.c,v 1.63 2024/12/07 22:46:42 tom Exp $
++ * $Id: rain.c,v 1.64 2025/07/05 15:21:56 tom Exp $
+  */
+ #include 
+ #include 
+@@ -356,11 +356,8 @@
+ 	    d_option = TRUE;
+ 	    break;
+ #endif
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/redraw.c
+Prereq:  1.20 
+--- ncurses-6.5-20250628+/test/redraw.c	2025-02-09 00:18:18.000000000 +0000
++++ ncurses-6.5-20250705/test/redraw.c	2025-07-05 15:11:35.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: redraw.c,v 1.20 2025/02/09 00:18:18 tom Exp $
++ * $Id: redraw.c,v 1.21 2025/07/05 15:11:35 tom Exp $
+  *
+  * Demonstrate the redrawwin() and wredrawln() functions.
+  * Thomas Dickey - 2006/11/4
+@@ -224,11 +224,8 @@
+ 	case 'n':
+ 	    no_init = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/savescreen.c
+Prereq:  1.67 
+--- ncurses-6.5-20250628+/test/savescreen.c	2024-12-07 22:46:42.000000000 +0000
++++ ncurses-6.5-20250705/test/savescreen.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2006-2017,2018 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: savescreen.c,v 1.67 2024/12/07 22:46:42 tom Exp $
++ * $Id: savescreen.c,v 1.68 2025/07/05 15:21:56 tom Exp $
+  *
+  * Demonstrate save/restore functions from the curses library.
+  * Thomas Dickey - 2007/7/14
+@@ -309,11 +309,8 @@
+ 	case 'r':
+ 	    replaying = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/sp_tinfo.c
+Prereq:  1.30 
+--- ncurses-6.5-20250628+/test/sp_tinfo.c	2024-12-07 23:03:07.000000000 +0000
++++ ncurses-6.5-20250705/test/sp_tinfo.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2017 Free Software Foundation, Inc.                            *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: sp_tinfo.c,v 1.30 2024/12/07 23:03:07 tom Exp $
++ * $Id: sp_tinfo.c,v 1.31 2025/07/05 15:21:56 tom Exp $
+  *
+  * TOTO: add option for non-sp-funcs interface
+  */
+@@ -319,11 +319,8 @@
+ 	case 't':
+ 	    opt_t = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/tclock.c
+Prereq:  1.51 
+--- ncurses-6.5-20250628+/test/tclock.c	2025-02-15 15:15:36.000000000 +0000
++++ ncurses-6.5-20250705/test/tclock.c	2025-07-05 15:11:35.000000000 +0000
+@@ -1,4 +1,4 @@
+-/* $Id: tclock.c,v 1.51 2025/02/15 15:15:36 tom Exp $ */
++/* $Id: tclock.c,v 1.52 2025/07/05 15:11:35 tom Exp $ */
+ 
+ #define NEED_TIME_H
+ #include 
+@@ -161,11 +161,8 @@
+ 	    d_option = TRUE;
+ 	    break;
+ #endif
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/test.priv.h
+Prereq:  1.222 
+--- ncurses-6.5-20250628+/test/test.priv.h	2025-06-28 22:43:32.000000000 +0000
++++ ncurses-6.5-20250705/test/test.priv.h	2025-07-05 15:16:13.000000000 +0000
+@@ -30,7 +30,7 @@
+ /****************************************************************************
+  *  Author: Thomas E. Dickey                    1996-on                     *
+  ****************************************************************************/
+-/* $Id: test.priv.h,v 1.222 2025/06/28 22:43:32 tom Exp $ */
++/* $Id: test.priv.h,v 1.224 2025/07/05 15:16:13 tom Exp $ */
+ 
+ #ifndef __TEST_PRIV_H
+ #define __TEST_PRIV_H 1
+@@ -743,14 +743,26 @@
+ #define HELP_KEY_2	KEY_F(1)
+ 
+ /* our "standard" options for getopt, needed for help2man */
++#define OPTS_COMMAND	'c'
++#define OPTS_LOGGING	'l'
+ #define OPTS_USAGE	'h'
+ #define OPTS_VERSION	'V'
+-#define OPTS_COMMON	"hV"
++#define OPTS_COMMON	"c:l:hV"
+ #define USAGE_COMMON	\
+  "Common options:"\
+ ," -h       show this message"\
+ ," -V       show version of curses"
+ 
++/* reserve -c/-l for command/logging */
++#define CASE_COMMON \
++	case OPTS_COMMAND: \
++	case OPTS_LOGGING: \
++	    usage(ch == OPTS_USAGE); \
++	    ExitProgram(EXIT_FAILURE); \
++	case OPTS_VERSION: \
++	    show_version(argv); \
++	    ExitProgram(EXIT_SUCCESS)
++
+ #if HAVE_CURSES_VERSION
+ #define format_version(buffer, size) _nc_STRCPY(buffer, curses_version(), size)
+ #elif defined(NCURSES_VERSION_MAJOR) && defined(NCURSES_VERSION_MINOR) && defined(NCURSES_VERSION_PATCH)
+Index: test/test_add_wchstr.c
+Prereq:  1.36 
+--- ncurses-6.5-20250628+/test/test_add_wchstr.c	2024-12-07 22:41:11.000000000 +0000
++++ ncurses-6.5-20250705/test/test_add_wchstr.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2009-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_add_wchstr.c,v 1.36 2024/12/07 22:41:11 tom Exp $
++ * $Id: test_add_wchstr.c,v 1.37 2025/07/05 15:21:56 tom Exp $
+  *
+  * Demonstrate the waddwchstr() and wadd_wch functions.
+  * Thomas Dickey - 2009/9/12
+@@ -591,11 +591,8 @@
+ 	case 'w':
+ 	    w_opt = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/test_addchstr.c
+Prereq:  1.31 
+--- ncurses-6.5-20250628+/test/test_addchstr.c	2024-12-07 22:41:11.000000000 +0000
++++ ncurses-6.5-20250705/test/test_addchstr.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2009-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_addchstr.c,v 1.31 2024/12/07 22:41:11 tom Exp $
++ * $Id: test_addchstr.c,v 1.32 2025/07/05 15:21:56 tom Exp $
+  *
+  * Demonstrate the waddchstr() and waddch functions.
+  * Thomas Dickey - 2009/9/12
+@@ -509,11 +509,8 @@
+ 	case 'w':
+ 	    w_opt = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/test_addstr.c
+Prereq:  1.22 
+--- ncurses-6.5-20250628+/test/test_addstr.c	2024-12-07 22:41:11.000000000 +0000
++++ ncurses-6.5-20250705/test/test_addstr.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2009-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_addstr.c,v 1.22 2024/12/07 22:41:11 tom Exp $
++ * $Id: test_addstr.c,v 1.23 2025/07/05 15:21:56 tom Exp $
+  *
+  * Demonstrate the waddstr() and waddch functions.
+  * Thomas Dickey - 2009/9/12
+@@ -420,11 +420,8 @@
+ 	case 'w':
+ 	    w_opt = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/test_addwstr.c
+Prereq:  1.24 
+--- ncurses-6.5-20250628+/test/test_addwstr.c	2024-12-07 22:41:11.000000000 +0000
++++ ncurses-6.5-20250705/test/test_addwstr.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2009-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_addwstr.c,v 1.24 2024/12/07 22:41:11 tom Exp $
++ * $Id: test_addwstr.c,v 1.25 2025/07/05 15:21:56 tom Exp $
+  *
+  * Demonstrate the waddwstr() and wadd_wch functions.
+  * Thomas Dickey - 2009/9/12
+@@ -512,11 +512,8 @@
+ 	case 'w':
+ 	    w_opt = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/test_arrays.c
+Prereq:  1.15 
+--- ncurses-6.5-20250628+/test/test_arrays.c	2024-12-07 22:46:42.000000000 +0000
++++ ncurses-6.5-20250705/test/test_arrays.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2007-2010,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_arrays.c,v 1.15 2024/12/07 22:46:42 tom Exp $
++ * $Id: test_arrays.c,v 1.16 2025/07/05 15:21:56 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -188,11 +188,8 @@
+ 	case 't':
+ 	    opt_t = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/test_delwin.c
+Prereq:  1.5 
+--- ncurses-6.5-20250628+/test/test_delwin.c	2023-05-27 20:34:51.000000000 +0000
++++ ncurses-6.5-20250705/test/test_delwin.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2022,2023 Thomas E. Dickey                                     *
++ * Copyright 2022-2023,2025 Thomas E. Dickey                                *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -27,7 +27,7 @@
+  ****************************************************************************/
+ 
+ /*
+- * $Id: test_delwin.c,v 1.5 2023/05/27 20:34:51 tom Exp $
++ * $Id: test_delwin.c,v 1.6 2025/07/05 15:21:56 tom Exp $
+  */
+ #include 
+ 
+@@ -82,11 +82,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/test_endwin.c
+Prereq:  1.4 
+--- ncurses-6.5-20250628+/test/test_endwin.c	2024-11-30 17:34:56.000000000 +0000
++++ ncurses-6.5-20250705/test/test_endwin.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2023,2024 Thomas E. Dickey                                     *
++ * Copyright 2023-2024,2025 Thomas E. Dickey                                *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_endwin.c,v 1.4 2024/11/30 17:34:56 tom Exp $
++ * $Id: test_endwin.c,v 1.5 2025/07/05 15:21:56 tom Exp $
+  */
+ #include 
+ 
+@@ -91,11 +91,8 @@
+ 	case 's':
+ 	    opt_s = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/test_get_wstr.c
+Prereq:  1.17 
+--- ncurses-6.5-20250628+/test/test_get_wstr.c	2024-12-07 22:46:42.000000000 +0000
++++ ncurses-6.5-20250705/test/test_get_wstr.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2007-2011,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_get_wstr.c,v 1.17 2024/12/07 22:46:42 tom Exp $
++ * $Id: test_get_wstr.c,v 1.18 2025/07/05 15:21:56 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -384,11 +384,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/test_getstr.c
+Prereq:  1.20 
+--- ncurses-6.5-20250628+/test/test_getstr.c	2024-12-07 22:46:42.000000000 +0000
++++ ncurses-6.5-20250705/test/test_getstr.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2007-2012,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_getstr.c,v 1.20 2024/12/07 22:46:42 tom Exp $
++ * $Id: test_getstr.c,v 1.21 2025/07/05 15:21:56 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -391,11 +391,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/test_instr.c
+Prereq:  1.16 
+--- ncurses-6.5-20250628+/test/test_instr.c	2024-12-07 22:46:42.000000000 +0000
++++ ncurses-6.5-20250705/test/test_instr.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2007-2010,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_instr.c,v 1.16 2024/12/07 22:46:42 tom Exp $
++ * $Id: test_instr.c,v 1.17 2025/07/05 15:21:56 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -290,11 +290,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/test_inwstr.c
+Prereq:  1.12 
+--- ncurses-6.5-20250628+/test/test_inwstr.c	2024-12-07 22:46:42.000000000 +0000
++++ ncurses-6.5-20250705/test/test_inwstr.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2007-2010,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_inwstr.c,v 1.12 2024/12/07 22:46:42 tom Exp $
++ * $Id: test_inwstr.c,v 1.13 2025/07/05 15:21:56 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -291,11 +291,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/test_mouse.c
+Prereq:  1.37 
+--- ncurses-6.5-20250628+/test/test_mouse.c	2025-06-07 19:13:02.000000000 +0000
++++ ncurses-6.5-20250705/test/test_mouse.c	2025-07-05 15:11:35.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_mouse.c,v 1.37 2025/06/07 19:13:02 tom Exp $
++ * $Id: test_mouse.c,v 1.38 2025/07/05 15:11:35 tom Exp $
+  *
+  * Author: Leonid S Usov
+  *
+@@ -258,11 +258,8 @@
+ 		putenv(my_environ);
+ 	    }
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/test_opaque.c
+Prereq:  1.19 
+--- ncurses-6.5-20250628+/test/test_opaque.c	2025-02-08 13:03:06.000000000 +0000
++++ ncurses-6.5-20250705/test/test_opaque.c	2025-07-05 15:11:35.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_opaque.c,v 1.19 2025/02/08 13:03:06 tom Exp $
++ * $Id: test_opaque.c,v 1.20 2025/07/05 15:11:35 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -501,11 +501,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/test_setupterm.c
+Prereq:  1.18 
+--- ncurses-6.5-20250628+/test/test_setupterm.c	2024-12-07 23:03:07.000000000 +0000
++++ ncurses-6.5-20250705/test/test_setupterm.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2023,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2015,2016 Free Software Foundation, Inc.                       *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: test_setupterm.c,v 1.18 2024/12/07 23:03:07 tom Exp $
++ * $Id: test_setupterm.c,v 1.19 2025/07/05 15:21:56 tom Exp $
+  *
+  * A simple demo of setupterm/restartterm.
+  */
+@@ -207,11 +207,8 @@
+ 	    r_opt = TRUE;
+ 	    break;
+ #endif
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/test_sgr.c
+Prereq:  1.27 
+--- ncurses-6.5-20250628+/test/test_sgr.c	2025-01-11 14:54:49.000000000 +0000
++++ ncurses-6.5-20250705/test/test_sgr.c	2025-07-05 15:11:35.000000000 +0000
+@@ -30,7 +30,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: test_sgr.c,v 1.27 2025/01/11 14:54:49 tom Exp $
++ * $Id: test_sgr.c,v 1.28 2025/07/05 15:11:35 tom Exp $
+  *
+  * A simple demo of the sgr/sgr0 terminal capabilities.
+  */
+@@ -353,11 +353,8 @@
+ 	case 'q':
+ 	    q_opt = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/test_termattrs.c
+Prereq:  1.8 
+--- ncurses-6.5-20250628+/test/test_termattrs.c	2022-12-10 23:23:27.000000000 +0000
++++ ncurses-6.5-20250705/test/test_termattrs.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2022 Thomas E. Dickey                                     *
++ * Copyright 2020-2022,2025 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: test_termattrs.c,v 1.8 2022/12/10 23:23:27 tom Exp $
++ * $Id: test_termattrs.c,v 1.9 2025/07/05 15:21:56 tom Exp $
+  *
+  * Demonstrate the termattrs and term_attrs functions.
+  */
+@@ -170,11 +170,8 @@
+ 	    w_opt = TRUE;
+ 	    break;
+ #endif
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/test_tparm.c
+Prereq:  1.44 
+--- ncurses-6.5-20250628+/test/test_tparm.c	2025-02-15 15:42:37.000000000 +0000
++++ ncurses-6.5-20250705/test/test_tparm.c	2025-07-05 15:11:35.000000000 +0000
+@@ -29,7 +29,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: test_tparm.c,v 1.44 2025/02/15 15:42:37 tom Exp $
++ * $Id: test_tparm.c,v 1.45 2025/07/05 15:11:35 tom Exp $
+  *
+  * Exercise tparm/tiparm, either for all possible capabilities with fixed
+  * parameters, or one capability with specific combinations of parameters.
+@@ -456,11 +456,8 @@
+ 	case 'v':
+ 	    ++v_opt;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/test_unget_wch.c
+Prereq:  1.4 
+--- ncurses-6.5-20250628+/test/test_unget_wch.c	2022-12-10 23:31:31.000000000 +0000
++++ ncurses-6.5-20250705/test/test_unget_wch.c	2025-07-05 15:21:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2022 Thomas E. Dickey                                          *
++ * Copyright 2022,2025 Thomas E. Dickey                                     *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_unget_wch.c,v 1.4 2022/12/10 23:31:31 tom Exp $
++ * $Id: test_unget_wch.c,v 1.5 2025/07/05 15:21:56 tom Exp $
+  *
+  * Demonstrate the unget_wch and unget functions.
+  */
+@@ -62,11 +62,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/test_vid_puts.c
+Prereq:  1.18 
+--- ncurses-6.5-20250628+/test/test_vid_puts.c	2024-12-07 23:03:19.000000000 +0000
++++ ncurses-6.5-20250705/test/test_vid_puts.c	2025-07-05 15:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2013-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_vid_puts.c,v 1.18 2024/12/07 23:03:19 tom Exp $
++ * $Id: test_vid_puts.c,v 1.19 2025/07/05 15:22:23 tom Exp $
+  *
+  * Demonstrate the vid_puts and vid_attr functions.
+  * Thomas Dickey - 2013/01/12
+@@ -134,11 +134,8 @@
+ 	case 'p':
+ 	    p_opt = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/test_vidputs.c
+Prereq:  1.17 
+--- ncurses-6.5-20250628+/test/test_vidputs.c	2024-12-07 22:53:07.000000000 +0000
++++ ncurses-6.5-20250705/test/test_vidputs.c	2025-07-05 15:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2020-2024,2025 Thomas E. Dickey                                *
+  * Copyright 2013-2014,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: test_vidputs.c,v 1.17 2024/12/07 22:53:07 tom Exp $
++ * $Id: test_vidputs.c,v 1.18 2025/07/05 15:22:23 tom Exp $
+  *
+  * Demonstrate the vidputs and vidattr functions.
+  * Thomas Dickey - 2013/01/12
+@@ -134,11 +134,8 @@
+ 	case 'p':
+ 	    p_opt = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/testaddch.c
+Prereq:  1.15 
+--- ncurses-6.5-20250628+/test/testaddch.c	2022-12-10 23:44:18.000000000 +0000
++++ ncurses-6.5-20250705/test/testaddch.c	2025-07-05 15:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2022 Thomas E. Dickey                                     *
++ * Copyright 2020-2022,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2013,2014 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+  * This is an example written by Alexander V. Lukyanov ,
+  * to demonstrate an inconsistency between ncurses and SVr4 curses.
+  *
+- * $Id: testaddch.c,v 1.15 2022/12/10 23:44:18 tom Exp $
++ * $Id: testaddch.c,v 1.16 2025/07/05 15:22:23 tom Exp $
+  */
+ #include 
+ 
+@@ -70,11 +70,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/testcurs.c
+Prereq:  1.60 
+--- ncurses-6.5-20250628+/test/testcurs.c	2024-12-07 22:53:07.000000000 +0000
++++ ncurses-6.5-20250705/test/testcurs.c	2025-07-05 15:11:35.000000000 +0000
+@@ -6,7 +6,7 @@
+  *  wrs(5/28/93) -- modified to be consistent (perform identically) with either
+  *                  PDCurses or under Unix System V, R4
+  *
+- * $Id: testcurs.c,v 1.60 2024/12/07 22:53:07 tom Exp $
++ * $Id: testcurs.c,v 1.61 2025/07/05 15:11:35 tom Exp $
+  */
+ 
+ #include 
+@@ -708,11 +708,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/testscanw.c
+Prereq:  1.16 
+--- ncurses-6.5-20250628+/test/testscanw.c	2024-10-05 19:27:33.000000000 +0000
++++ ncurses-6.5-20250705/test/testscanw.c	2025-07-05 15:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2002,2006 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -30,7 +30,7 @@
+  * Date:  1997/03/17
+  * From:  bayern@morpheus.cis.yale.edu
+  *
+- * $Id: testscanw.c,v 1.16 2024/10/05 19:27:33 tom Exp $
++ * $Id: testscanw.c,v 1.17 2025/07/05 15:22:23 tom Exp $
+  */
+ #include 
+ 
+@@ -65,11 +65,8 @@
+ 
+     while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+ 	switch (ch) {
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/view.c
+Prereq:  1.150 
+--- ncurses-6.5-20250628+/test/view.c	2024-12-07 22:53:07.000000000 +0000
++++ ncurses-6.5-20250705/test/view.c	2025-07-05 15:22:23.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2019-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2019-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -52,7 +52,7 @@
+  * scroll operation worked, and the refresh() code only had to do a
+  * partial repaint.
+  *
+- * $Id: view.c,v 1.150 2024/12/07 22:53:07 tom Exp $
++ * $Id: view.c,v 1.151 2025/07/05 15:22:23 tom Exp $
+  */
+ 
+ #include 
+@@ -473,11 +473,8 @@
+ 	    curses_trace(TRACE_CALLS);
+ 	    break;
+ #endif
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+Index: test/worm.c
+Prereq:  1.93 
+--- ncurses-6.5-20250628+/test/worm.c	2024-11-30 18:53:39.000000000 +0000
++++ ncurses-6.5-20250705/test/worm.c	2025-07-05 15:11:35.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2022,2024 Thomas E. Dickey                                *
++ * Copyright 2018-2024,2025 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -53,7 +53,7 @@
+   traces will be dumped.  The program stops and waits for one character of
+   input at the beginning and end of the interval.
+ 
+-  $Id: worm.c,v 1.93 2024/11/30 18:53:39 tom Exp $
++  $Id: worm.c,v 1.95 2025/07/05 15:11:35 tom Exp $
+ */
+ 
+ #include 
+@@ -97,7 +97,7 @@
+ static unsigned long sequence = 0;
+ static bool quitting = FALSE;
+ 
+-static WORM worm[MAX_WORMS];
++static WORM *worm;
+ static int max_refs;
+ static int **refs;
+ static int last_x, last_y;
+@@ -105,6 +105,8 @@
+ static const char *field;
+ static int length = 16, number = 3;
+ static chtype trail = ' ';
++static bool from_center = FALSE;
++static int max_iterations = -1;
+ 
+ static unsigned pending;
+ 
+@@ -118,7 +120,6 @@
+ #else
+ #define Locked(statement) statement
+ #endif
+-
+ /* *INDENT-OFF* */
+ static const struct options {
+     int nopts;
+@@ -271,7 +272,9 @@
+     attrs = w->attrs | (is_pending ? A_REVERSE : 0);
+ 
+     if ((x = w->xpos[h = w->head]) < 0) {
+-	wmove(win, y = w->ypos[h] = last_y, x = w->xpos[h] = 0);
++	y = w->ypos[h] = (from_center ? (LINES / 2) : last_y);
++	x = w->xpos[h] = (from_center ? (COLS / 2) : 0);
++	wmove(win, y, x);
+ 	waddch(win, attrs);
+ 	refs[y][x]++;
+     } else {
+@@ -460,7 +463,9 @@
+ 	," -d       invoke use_default_colors"
+ #endif
+ 	," -f       fill screen with copies of \"WORM\" at start"
++	," -i NUM   maximum iterations before exiting"
+ 	," -M NUM   set length of worms"
++	," -m       start worms from the middle of the screen"
+ 	," -n NUM   set number of worms"
+ 	," -t       leave trail of \".\""
+ #ifdef TRACE
+@@ -487,13 +492,14 @@
+     struct worm *w;
+     int *ip;
+     bool done = FALSE;
++    int iteration_count = 0;
+ #if HAVE_USE_DEFAULT_COLORS
+     bool opt_d = FALSE;
+ #endif
+ 
+     setlocale(LC_ALL, "");
+ 
+-    while ((ch = getopt(argc, argv, OPTS_COMMON "M:Ndfn:t")) != -1) {
++    while ((ch = getopt(argc, argv, OPTS_COMMON "M:Ndfi:mn:t")) != -1) {
+ 	switch (ch) {
+ #if HAVE_USE_DEFAULT_COLORS
+ 	case 'd':
+@@ -503,14 +509,24 @@
+ 	case 'f':
+ 	    field = "WORM";
+ 	    break;
++	case 'i':
++	    if ((max_iterations = atoi(optarg)) < 1) {
++		fprintf(stderr, "%s: Invalid maximum iterations %d\n", *argv,
++			max_iterations);
++		usage(FALSE);
++	    }
++	    break;
+ 	case 'M':
+ 	    if ((length = atoi(optarg)) < 2 || length > MAX_LENGTH) {
+ 		fprintf(stderr, "%s: Invalid length\n", *argv);
+ 		usage(FALSE);
+ 	    }
+ 	    break;
++	case 'm':
++	    from_center = !from_center;
++	    break;
+ 	case 'n':
+-	    if ((number = atoi(optarg)) < 1 || number > MAX_WORMS) {
++	    if ((number = atoi(optarg)) < 1) {
+ 		fprintf(stderr, "%s: Invalid number of worms\n", *argv);
+ 		usage(FALSE);
+ 	    }
+@@ -523,11 +539,8 @@
+ 	    _nc_optimize_enable ^= OPTIMIZE_ALL;	/* declared by ncurses */
+ 	    break;
+ #endif /* TRACE */
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
+@@ -545,6 +558,11 @@
+     last_y = LINES - 1;
+     last_x = COLS - 1;
+ 
++    worm = typeMalloc(WORM, (size_t) number);
++    if (worm == NULL) {
++	fprintf(stderr, "%s: not enough memory for %d worms\n", *argv, number);
++	ExitProgram(EXIT_FAILURE);
++    }
+ #ifdef A_COLOR
+     if (has_colors()) {
+ 	int bg = COLOR_BLACK;
+@@ -647,7 +665,11 @@
+ 	}
+ 
+ 	done = draw_all_worms();
+-	napms(10);
++	if (max_iterations < 0) {
++	    napms(10);
++	} else if (iteration_count++ > max_iterations) {
++	    done = TRUE;
++	}
+ 	USING_WINDOW1(stdscr, wrefresh, safe_wrefresh);
+     }
+ 
+Index: test/xmas.c
+Prereq:  1.40 
+--- ncurses-6.5-20250628+/test/xmas.c	2024-12-07 22:53:07.000000000 +0000
++++ ncurses-6.5-20250705/test/xmas.c	2025-07-05 15:11:35.000000000 +0000
+@@ -92,7 +92,7 @@
+ /******************************************************************************/
+ 
+ /*
+- * $Id: xmas.c,v 1.40 2024/12/07 22:53:07 tom Exp $
++ * $Id: xmas.c,v 1.41 2025/07/05 15:11:35 tom Exp $
+  */
+ #include 
+ 
+@@ -690,11 +690,8 @@
+ 	case 'q':
+ 	    opt_q = TRUE;
+ 	    break;
+-	case OPTS_VERSION:
+-	    show_version(argv);
+-	    ExitProgram(EXIT_SUCCESS);
+ 	default:
+-	    usage(ch == OPTS_USAGE);
++	    CASE_COMMON;
+ 	    /* NOTREACHED */
+ 	}
+     }
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250712.patch b/packages/ncurses/6.5/ncurses-6.5-20250712.patch
new file mode 100644
index 0000000000..2b7542cb90
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250712.patch
@@ -0,0 +1,991 @@
+# ncurses 6.5 - patch 20250712 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250712.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sat Jul 12 23:39:02 UTC 2025
+# ------------------------------------------------------------------------------
+# Ada95/Makefile.in                |    8 ++---
+# Ada95/src/Makefile.in            |    4 +-
+# Makefile.in                      |   10 +++---
+# Makefile.os2                     |    6 +--
+# NEWS                             |    9 ++++-
+# VERSION                          |    2 -
+# aclocal.m4                       |    4 +-
+# c++/Makefile.in                  |    5 +--
+# configure                        |   57 ++++++++++++++++++++-----------------
+# configure.in                     |   11 +++----
+# dist.mk                          |    4 +-
+# form/Makefile.in                 |   13 +++++++-
+# include/MKterm.h.awk.in          |   37 ++++++++++--------------
+# menu/Makefile.in                 |   13 +++++++-
+# misc/Makefile.in                 |    5 +--
+# ncurses/Makefile.in              |    8 +++--
+# package/debian-mingw/changelog   |    4 +-
+# package/debian-mingw64/changelog |    4 +-
+# package/debian/changelog         |    4 +-
+# package/mingw-ncurses.nsi        |    4 +-
+# package/mingw-ncurses.spec       |    6 +--
+# package/ncurses.spec             |    6 +--
+# package/ncursest.spec            |    6 +--
+# panel/Makefile.in                |   13 +++++++-
+# progs/Makefile.in                |    8 +++--
+# test/Makefile.in                 |   11 +++++--
+# 26 files changed, 153 insertions(+), 109 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/Makefile.in
+Prereq:  1.31 
+--- ncurses-6.5-20250705+/Ada95/Makefile.in	2024-08-11 00:24:28.000000000 +0000
++++ ncurses-6.5-20250712/Ada95/Makefile.in	2025-07-12 10:48:01.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.31 2024/08/11 00:24:28 tom Exp $
++# $Id: Makefile.in,v 1.33 2025/07/12 10:48:01 tom Exp $
+ ##############################################################################
+-# Copyright 2020-2022,2024 Thomas E. Dickey                                  #
++# Copyright 2020-2024,2025 Thomas E. Dickey                                  #
+ # Copyright 1998-2010,2015 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -31,7 +31,7 @@
+ #  Author:  Juergen Pfeifer, 1996
+ #
+ #  Version Control
+-#  $Revision: 1.31 $
++#  $Revision: 1.33 $
+ #
+ SHELL		= @SHELL@
+ VPATH		= @srcdir@
+@@ -57,7 +57,7 @@
+ INSTALL		= @INSTALL@ @INSTALL_OPT_O@
+ INSTALL_SCRIPT	= @INSTALL@
+ 
+-TOP_MFLAGS	= @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)"
++TOP_MFLAGS	= DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)"
+ @SET_MAKE@
+ 
+ ################################################################################
+Index: Ada95/src/Makefile.in
+Prereq:  1.99 
+--- ncurses-6.5-20250705+/Ada95/src/Makefile.in	2025-03-22 21:39:31.000000000 +0000
++++ ncurses-6.5-20250712/Ada95/src/Makefile.in	2025-07-12 10:40:39.000000000 +0000
+@@ -29,7 +29,7 @@
+ #
+ #  Author:  Juergen Pfeifer, 1996
+ #
+-#  $Id: Makefile.in,v 1.99 2025/03/22 21:39:31 tom Exp $
++#  $Id: Makefile.in,v 1.100 2025/07/12 10:40:39 tom Exp $
+ #
+ .SUFFIXES:
+ 
+@@ -37,7 +37,7 @@
+ VPATH		= @srcdir@
+ THIS		= Makefile
+ 
+-ADA_MFLAGS 	= @cf_cv_makeflags@
++ADA_MFLAGS 	= 
+ @SET_MAKE@
+ 
+ MODEL		= ../../@DFT_OBJ_SUBDIR@
+Index: Makefile.in
+Prereq:  1.46 
+--- ncurses-6.5-20250705+/Makefile.in	2022-10-01 22:53:36.000000000 +0000
++++ ncurses-6.5-20250712/Makefile.in	2025-07-12 10:48:01.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.46 2022/10/01 22:53:36 tom Exp $
++# $Id: Makefile.in,v 1.48 2025/07/12 10:48:01 tom Exp $
+ ##############################################################################
+-# Copyright 2018-2021,2022 Thomas E. Dickey                                  #
++# Copyright 2018-2022,2025 Thomas E. Dickey                                  #
+ # Copyright 1998-2014,2015 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -35,9 +35,9 @@
+ SHELL 		= @SHELL@
+ VPATH		= @srcdir@
+ 
+-DESTDIR=@DESTDIR@
+-RPATH_LIST=@RPATH_LIST@
+-TOP_MFLAGS = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)"
++DESTDIR		= @DESTDIR@
++RPATH_LIST	= @RPATH_LIST@
++TOP_MFLAGS	= DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)"
+ 
+ @SET_MAKE@
+ 
+Index: Makefile.os2
+Prereq:  1.13 
+--- ncurses-6.5-20250705+/Makefile.os2	2021-06-17 21:20:30.000000000 +0000
++++ ncurses-6.5-20250712/Makefile.os2	2025-07-12 10:48:01.000000000 +0000
+@@ -1,5 +1,5 @@
+ ##############################################################################
+-# Copyright 2020,2021 Thomas E. Dickey                                       #
++# Copyright 2020-2021,2025 Thomas E. Dickey                                  #
+ # Copyright 1998-2000,2006 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: Makefile.os2,v 1.13 2021/06/17 21:20:30 tom Exp $
++# $Id: Makefile.os2,v 1.15 2025/07/12 10:48:01 tom Exp $
+ #
+ # Wrapper Makefile for ncurses library under OS/2.
+ # Author:  Juan Jose Garcia Ripoll .
+@@ -247,7 +247,7 @@
+ os2dist :
+ 	$(MAKE) -f Makefile.os2 os2clean
+ 	./configure --without-debug --with-install-prefix=`pwd|sed -e 's@^.:@@'`/$(OS2NAME)
+-	$(MAKE) -f Makefile.os2 $(CF_MFLAGS) install.os2
++	$(MAKE) -f Makefile.os2 install.os2
+ 	-rm -f $(OS2NAME).zip
+ 	echo NCurses-$(NCURSES_MAJOR).$(NCURSES_MINOR)-$(NCURSES_PATCH) for emx > $(OS2NAME)/FILE_ID.DIZ
+ 	echo Binary release. >> $(OS2NAME)/FILE_ID.DIZ
+Index: NEWS
+Prereq:  1.4310 
+--- ncurses-6.5-20250705+/NEWS	2025-07-05 20:44:20.000000000 +0000
++++ ncurses-6.5-20250712/NEWS	2025-07-12 22:55:35.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4310 2025/07/05 20:44:20 tom Exp $
++-- $Id: NEWS,v 1.4314 2025/07/12 22:55:35 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,11 +46,16 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20250712
++	+ improve readability of term.h
++	+ modify recursive make rules to avoid interference with GNU make's
++	  "-j" option (report by Stas Sergeev).
++
+ 20250705
+ 	+ when installing the terminfo database, check if symbolic links are
+ 	  supported before attemping to link lib/terminfo from share/terminfo
+ 	  (report by Kirill Makurin).
+-	+ modify configure check for MAKEFILES/MFLAGS to ignore existing value
++	+ modify configure check for MAKEFLAGS/MFLAGS to ignore existing value
+ 	  of these environment variables (report by Stas Sergeev).
+ 	+ reserve -c/-l options in test/*.c for command/logging like vttest.
+ 	+ add options to test/worm.c for benchmarking (Nibby Nebbulous)
+Index: VERSION
+--- ncurses-6.5-20250705+/VERSION	2025-07-05 09:49:36.000000000 +0000
++++ ncurses-6.5-20250712/VERSION	2025-07-12 09:16:32.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250705
++5:0:10	6.5	20250712
+Index: aclocal.m4
+Prereq:  1.1108 
+--- ncurses-6.5-20250705+/aclocal.m4	2025-07-05 20:19:35.000000000 +0000
++++ ncurses-6.5-20250712/aclocal.m4	2025-07-12 16:15:49.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1108 2025/07/05 20:19:35 tom Exp $
++dnl $Id: aclocal.m4,v 1.1110 2025/07/12 16:15:49 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -8513,7 +8513,7 @@
+ AC_DEFUN([CF_STRUCT_TERMIOS],[
+ AC_REQUIRE([CF_XOPEN_SOURCE])
+ 
+-AC_CHECK_HEADERS( \
++AC_CHECK_HEADERS( sgtty.h \
+ termio.h \
+ termios.h \
+ unistd.h \
+Index: c++/Makefile.in
+Prereq:  1.135 
+--- ncurses-6.5-20250705+/c++/Makefile.in	2024-08-11 15:48:44.000000000 +0000
++++ ncurses-6.5-20250712/c++/Makefile.in	2025-07-12 10:48:01.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.135 2024/08/11 15:48:44 tom Exp $
++# $Id: Makefile.in,v 1.137 2025/07/12 10:48:01 tom Exp $
+ ##############################################################################
+-# Copyright 2018-2021,2024 Thomas E. Dickey                                  #
++# Copyright 2018-2024,2025 Thomas E. Dickey                                  #
+ # Copyright 1998-2015,2016 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -38,7 +38,6 @@
+ SHELL		= @SHELL@
+ VPATH		= @srcdir@
+ 
+-CF_MFLAGS 	= @cf_cv_makeflags@
+ @SET_MAKE@
+ x		= @EXEEXT@
+ o		= .@OBJEXT@
+Index: configure
+--- ncurses-6.5-20250705+/configure	2025-07-05 20:20:09.000000000 +0000
++++ ncurses-6.5-20250712/configure	2025-07-12 16:44:54.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.798 .
++# From configure.in Revision: 1.799 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20250126.
+ #
+@@ -22849,7 +22849,7 @@
+ #define HAVE_NANOSLEEP 1
+ EOF
+ 
+-for ac_header in \
++for ac_header in sgtty.h \
+ termio.h \
+ termios.h \
+ unistd.h \
+@@ -29556,6 +29556,12 @@
+ 	HAVE_STDINT_H=0
+ fi
+ 
++if test "x$ac_cv_header_sgtty_h" = xyes ; then
++	HAVE_SGTTY_H=1
++else
++	HAVE_SGTTY_H=0
++fi
++
+ if test "x$ac_cv_header_termio_h" = xyes ; then
+ 	HAVE_TERMIO_H=1
+ else
+@@ -29604,7 +29610,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:29607: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:29613: 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//'`
+@@ -29615,7 +29621,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:29618: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
++echo "$as_me:29624: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -29631,7 +29637,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:29634: result: $PKG_CFLAGS" >&5
++echo "$as_me:29640: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ case "$cf_cv_system_name" in
+@@ -29703,7 +29709,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
+ 
+-echo "${as_me:-configure}:29706: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
++echo "${as_me:-configure}:29712: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+ 
+ fi
+ 
+@@ -29730,7 +29736,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:29733: checking for linker search path" >&5
++echo "$as_me:29739: 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
+@@ -29778,7 +29784,7 @@
+ 			cf_pathlist="$cf_pathlist /lib /usr/lib"
+ 			;;
+ 		(*)
+-			{ echo "$as_me:29781: WARNING: problem with Solaris architecture" >&5
++			{ echo "$as_me:29787: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ 			;;
+ 		esac
+@@ -29819,7 +29825,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:29822: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29828: 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'`
+@@ -29905,7 +29911,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29908: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29914: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -30086,7 +30092,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:30089: error: ambiguous option: $1
++    { { echo "$as_me:30095: 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;}
+@@ -30105,7 +30111,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:30108: error: unrecognized option: $1
++  -*) { { echo "$as_me:30114: 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;}
+@@ -30237,7 +30243,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:30240: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:30246: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -30620,6 +30626,7 @@
+ s,@NCURSES_SHLIB2@,$NCURSES_SHLIB2,;t t
+ s,@HAVE_TCGETATTR@,$HAVE_TCGETATTR,;t t
+ s,@HAVE_STDINT_H@,$HAVE_STDINT_H,;t t
++s,@HAVE_SGTTY_H@,$HAVE_SGTTY_H,;t t
+ s,@HAVE_TERMIO_H@,$HAVE_TERMIO_H,;t t
+ s,@HAVE_TERMIOS_H@,$HAVE_TERMIOS_H,;t t
+ s,@cross_compiling@,$cross_compiling,;t t
+@@ -30767,7 +30774,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:30770: creating $ac_file" >&5
++    { echo "$as_me:30777: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -30785,7 +30792,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30788: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30795: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -30798,7 +30805,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30801: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30808: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30814,7 +30821,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:30817: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:30824: 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;}
+@@ -30823,7 +30830,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:30826: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:30833: 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;}
+@@ -30868,7 +30875,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:30871: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:30878: 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;}
+@@ -30879,7 +30886,7 @@
+     $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:30882: WARNING: Some variables may not be substituted:
++      { echo "$as_me:30889: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30928,7 +30935,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:30931: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:30938: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -30939,7 +30946,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30942: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30949: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -30952,7 +30959,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30955: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30962: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -31010,7 +31017,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:31013: $ac_file is unchanged" >&5
++      { echo "$as_me:31020: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -31397,7 +31404,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}:31400: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:31407: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: configure.in
+Prereq:  1.798 
+--- ncurses-6.5-20250705+/configure.in	2025-05-24 18:50:21.000000000 +0000
++++ ncurses-6.5-20250712/configure.in	2025-07-12 16:43:47.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.798 2025/05/24 18:50:21 tom Exp $
++dnl $Id: configure.in,v 1.799 2025/07/12 16:43:47 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.798 $)
++AC_REVISION($Revision: 1.799 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -2372,9 +2372,10 @@
+ AC_DEFINE_UNQUOTED(NCURSES_VERSION_STRING, "${NCURSES_MAJOR}.${NCURSES_MINOR}.${NCURSES_PATCH}",[Define to 1 if machine has ample memory for tic])
+ 
+ ### Define substitutions for header files to avoid name-pollution
+-CF_SUBST_IF(["x$cf_cv_have_tcgetattr" = xyes], HAVE_TCGETATTR, 1, 0)
+-CF_SUBST_IF(["x$ac_cv_header_stdint_h" = xyes], HAVE_STDINT_H, 1, 0)
+-CF_SUBST_IF(["x$ac_cv_header_termio_h" = xyes], HAVE_TERMIO_H, 1, 0)
++CF_SUBST_IF(["x$cf_cv_have_tcgetattr" = xyes],   HAVE_TCGETATTR, 1, 0)
++CF_SUBST_IF(["x$ac_cv_header_stdint_h" = xyes],  HAVE_STDINT_H,  1, 0)
++CF_SUBST_IF(["x$ac_cv_header_sgtty_h" = xyes],   HAVE_SGTTY_H,   1, 0)
++CF_SUBST_IF(["x$ac_cv_header_termio_h" = xyes],  HAVE_TERMIO_H,  1, 0)
+ CF_SUBST_IF(["x$ac_cv_header_termios_h" = xyes], HAVE_TERMIOS_H, 1, 0)
+ 
+ ################################################################################
+Index: dist.mk
+Prereq:  1.1676 
+--- ncurses-6.5-20250705+/dist.mk	2025-07-05 09:49:36.000000000 +0000
++++ ncurses-6.5-20250712/dist.mk	2025-07-12 09:16:32.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1676 2025/07/05 09:49:36 tom Exp $
++# $Id: dist.mk,v 1.1677 2025/07/12 09:16:32 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 = 5
+-NCURSES_PATCH = 20250705
++NCURSES_PATCH = 20250712
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: form/Makefile.in
+Prereq:  1.74 
+--- ncurses-6.5-20250705+/form/Makefile.in	2024-08-11 00:51:41.000000000 +0000
++++ ncurses-6.5-20250712/form/Makefile.in	2025-07-12 14:59:19.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.74 2024/08/11 00:51:41 tom Exp $
++# $Id: Makefile.in,v 1.75 2025/07/12 14:59:19 tom Exp $
+ ##############################################################################
+-# Copyright 2020-2021,2024 Thomas E. Dickey                                  #
++# Copyright 2020-2024,2025 Thomas E. Dickey                                  #
+ # Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -47,6 +47,9 @@
+ VPATH		= @srcdir@
+ THIS		= Makefile
+ 
++TOP_MFLAGS	= DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)"
++@SET_MAKE@
++
+ x		= @EXEEXT@
+ o		= .@OBJEXT@
+ 
+@@ -203,6 +206,12 @@
+ 
+ realclean :: distclean
+ 
++# These rules are used to allow "make -n" to work on a clean directory-tree
++../include/curses.h \
++../include/ncurses_def.h \
++../include/term.h :
++	( cd ../include && $(MAKE) $(TOP_MFLAGS) )
++
+ ../include/mf_common.h \
+ ../include/eti.h :
+ 	( cd ../menu && $(MAKE) $@ )
+Index: include/MKterm.h.awk.in
+Prereq:  1.87 
+--- ncurses-6.5-20250705+/include/MKterm.h.awk.in	2024-12-28 21:42:15.000000000 +0000
++++ ncurses-6.5-20250712/include/MKterm.h.awk.in	2025-07-12 22:57:22.000000000 +0000
+@@ -26,7 +26,7 @@
+ 	lcurl = "{";
+ 	rcurl = "}";
+ 	print  "/****************************************************************************"
+-	print  " * Copyright 2018-2023,2024 Thomas E. Dickey                                *"
++	print  " * Copyright 2018-2024,2025 Thomas E. Dickey                                *"
+ 	print  " * Copyright 1998-2013,2017 Free Software Foundation, Inc.                  *"
+ 	print  " *                                                                          *"
+ 	print  " * Permission is hereby granted, free of charge, to any person obtaining a  *"
+@@ -60,7 +60,7 @@
+ 	print  "/*    and: Thomas E. Dickey                        1995-on                  */"
+ 	print  "/****************************************************************************/"
+ 	print  ""
+-	print  "/* $Id: MKterm.h.awk.in,v 1.87 2024/12/28 21:42:15 tom Exp $ */"
++	print  "/* $Id: MKterm.h.awk.in,v 1.88 2025/07/12 22:57:22 tom Exp $ */"
+ 	print  ""
+ 	print  "/*"
+ 	print  "**	term.h -- Definition of struct term"
+@@ -116,52 +116,47 @@
+ 	print  "#undef  NCURSES_XNAMES"
+ 	print  "#define NCURSES_XNAMES @NCURSES_XNAMES@"
+ 	print  ""
+-	print  "/* We will use these symbols to hide differences between"
++	print  "/* We use these symbols to hide differences between"
+ 	print  " * termios/termio/sgttyb interfaces."
+ 	print  " */"
+ 	print  "#undef  TTY"
+ 	print  "#undef  SET_TTY"
+ 	print  "#undef  GET_TTY"
+ 	print  ""
+-	print  "/* Assume POSIX termio if we have the header and function */"
+-	print  "/* #if HAVE_TERMIOS_H && HAVE_TCGETATTR */"
+-	print  "#if @HAVE_TERMIOS_H@ && @HAVE_TCGETATTR@"
++	print  "#if @HAVE_TERMIOS_H@ && @HAVE_TCGETATTR@	/* #if HAVE_TERMIOS_H && HAVE_TCGETATTR */"
+ 	print  ""
+ 	print  "#undef  TERMIOS"
+ 	print  "#define TERMIOS 1"
+-	print  ""
+ 	print  "#include "
+ 	print  "#define TTY struct termios"
+ 	print  ""
+-	print  "#else /* !HAVE_TERMIOS_H */"
+-	print  ""
+-	print  "/* #if HAVE_TERMIO_H */"
+-	print  "#if @HAVE_TERMIO_H@"
++	print  "#elif @HAVE_TERMIO_H@	/* HAVE_TERMIO_H */"
+ 	print  ""
+ 	print  "#undef  TERMIOS"
+ 	print  "#define TERMIOS 1"
+-	print  ""
+ 	print  "#include "
+ 	print  "#define TTY struct termio"
+ 	print  ""
+-	print  "#else /* !HAVE_TERMIO_H */"
++	print  "#elif (defined(_WIN32) || defined(_WIN64))"
+ 	print  ""
+-	print  "#if (defined(_WIN32) || defined(_WIN64))"
+-	print  "/* configured with --enable-exp-win32? */"
+-	print  "#if @EXP_WIN32_DRIVER@"
++	print  "#if @EXP_WIN32_DRIVER@	/* EXP_WIN32_DRIVER */"
+ 	print  "#include "
+ 	print  "#define TTY struct winconmode"
+-	print  "#else"
++	print  "#else	/* MINGW32 */"
+ 	print  "#include "
+ 	print  "#define TTY struct termios"
+ 	print  "#endif"
+-	print  "#else"
++	print  ""
++	print  "#elif @HAVE_SGTTY_H@	/* HAVE_SGTTY_H */"
++	print  ""
+ 	print  "#undef TERMIOS"
+ 	print  "#include "
+ 	print  "#include "
+ 	print  "#define TTY struct sgttyb"
+-	print  "#endif /* MINGW32 */"
+-	print  "#endif /* HAVE_TERMIO_H */"
++	print  ""
++	print  "#else"
++	print  ""
++	print  "#error no termio/termios/sgtty found"
+ 	print  ""
+ 	print  "#endif /* HAVE_TERMIOS_H */"
+ 	print  ""
+@@ -172,7 +167,7 @@
+ 	print  "#elif @EXP_WIN32_DRIVER@ && (defined(_WIN32) || defined(_WIN64))"
+ 	print  "#define GET_TTY(fd, buf) _nc_console_getmode(_nc_console_fd2handle(fd),buf)"
+ 	print  "#define SET_TTY(fd, buf) _nc_console_setmode(_nc_console_fd2handle(fd),buf)"
+-	print  "#else"
++	print  "#elif @HAVE_SGTTY_H@	/* HAVE_SGTTY_H */"
+ 	print  "#define GET_TTY(fd, buf) gtty(fd, buf)"
+ 	print  "#define SET_TTY(fd, buf) stty(fd, buf)"
+ 	print  "#endif"
+Index: menu/Makefile.in
+Prereq:  1.72 
+--- ncurses-6.5-20250705+/menu/Makefile.in	2024-08-11 00:51:30.000000000 +0000
++++ ncurses-6.5-20250712/menu/Makefile.in	2025-07-12 14:59:29.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.72 2024/08/11 00:51:30 tom Exp $
++# $Id: Makefile.in,v 1.73 2025/07/12 14:59:29 tom Exp $
+ ##############################################################################
+-# Copyright 2020-2021,2024 Thomas E. Dickey                                  #
++# Copyright 2020-2024,2025 Thomas E. Dickey                                  #
+ # Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -47,6 +47,9 @@
+ VPATH		= @srcdir@
+ THIS		= Makefile
+ 
++TOP_MFLAGS	= DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)"
++@SET_MAKE@
++
+ x		= @EXEEXT@
+ o		= .@OBJEXT@
+ 
+@@ -209,6 +212,12 @@
+ 
+ realclean :: distclean
+ 
++# These rules are used to allow "make -n" to work on a clean directory-tree
++../include/curses.h \
++../include/ncurses_def.h \
++../include/term.h :
++	( cd ../include && $(MAKE) $(TOP_MFLAGS) )
++
+ ###############################################################################
+ # The remainder of this file is automatically generated during configuration
+ ###############################################################################
+Index: misc/Makefile.in
+Prereq:  1.83 
+--- ncurses-6.5-20250705+/misc/Makefile.in	2024-08-10 18:06:18.000000000 +0000
++++ ncurses-6.5-20250712/misc/Makefile.in	2025-07-12 10:48:01.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.83 2024/08/10 18:06:18 tom Exp $
++# $Id: Makefile.in,v 1.85 2025/07/12 10:48:01 tom Exp $
+ ##############################################################################
+-# Copyright 2018-2021,2024 Thomas E. Dickey                                  #
++# Copyright 2018-2024,2025 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,6 @@
+ VPATH		= @srcdir@
+ THIS		= Makefile
+ 
+-CF_MFLAGS 	= @cf_cv_makeflags@
+ @SET_MAKE@
+ 
+ DESTDIR		= @DESTDIR@
+Index: ncurses/Makefile.in
+Prereq:  1.185 
+--- ncurses-6.5-20250705+/ncurses/Makefile.in	2024-08-10 18:07:57.000000000 +0000
++++ ncurses-6.5-20250712/ncurses/Makefile.in	2025-07-12 14:41:48.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.185 2024/08/10 18:07:57 tom Exp $
++# $Id: Makefile.in,v 1.189 2025/07/12 14:41:48 tom Exp $
+ ##############################################################################
+-# Copyright 2018-2022,2024 Thomas E. Dickey                                  #
++# Copyright 2018-2024,2025 Thomas E. Dickey                                  #
+ # Copyright 1998-2017,2018 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -50,7 +50,7 @@
+ VPATH		= @srcdir@
+ THIS		= Makefile
+ 
+-TOP_MFLAGS	= @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)"
++TOP_MFLAGS	= DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)"
+ @SET_MAKE@
+ 
+ x		= @EXEEXT@
+@@ -325,7 +325,9 @@
+ realclean :: distclean
+ 
+ # These rules are used to allow "make -n" to work on a clean directory-tree
++../include/curses.h \
+ ../include/hashsize.h \
++../include/ncurses_def.h \
+ ../include/parametrized.h \
+ ../include/term.h :
+ 	( cd ../include && $(MAKE) $(TOP_MFLAGS) )
+Index: package/debian-mingw/changelog
+--- ncurses-6.5-20250705+/package/debian-mingw/changelog	2025-07-05 09:49:36.000000000 +0000
++++ ncurses-6.5-20250712/package/debian-mingw/changelog	2025-07-12 09:16:32.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250705) unstable; urgency=low
++ncurses6td (6.5+20250712) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 05 Jul 2025 05:49:36 -0400
++ -- Thomas E. Dickey   Tue, 08 Jul 2025 10:00:51 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.5-20250705+/package/debian-mingw64/changelog	2025-07-05 09:49:36.000000000 +0000
++++ ncurses-6.5-20250712/package/debian-mingw64/changelog	2025-07-12 09:16:32.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250705) unstable; urgency=low
++ncurses6td (6.5+20250712) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 05 Jul 2025 05:49:36 -0400
++ -- Thomas E. Dickey   Tue, 08 Jul 2025 10:00:51 -0400
+ 
+ ncurses6 (5.9+20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.5-20250705+/package/debian/changelog	2025-07-05 09:49:36.000000000 +0000
++++ ncurses-6.5-20250712/package/debian/changelog	2025-07-12 09:16:32.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6td (6.5+20250705) unstable; urgency=low
++ncurses6td (6.5+20250712) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 05 Jul 2025 05:49:36 -0400
++ -- Thomas E. Dickey   Tue, 08 Jul 2025 10:00:51 -0400
+ 
+ ncurses6 (5.9+20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.710 
+--- ncurses-6.5-20250705+/package/mingw-ncurses.nsi	2025-07-05 09:49:36.000000000 +0000
++++ ncurses-6.5-20250712/package/mingw-ncurses.nsi	2025-07-12 09:16:32.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.710 2025/07/05 09:49:36 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.711 2025/07/12 09:16:32 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "5"
+ !define VERSION_YYYY  "2025"
+-!define VERSION_MMDD  "0705"
++!define VERSION_MMDD  "0712"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.5-20250705+/package/mingw-ncurses.spec	2025-07-05 09:49:36.000000000 +0000
++++ ncurses-6.5-20250712/package/mingw-ncurses.spec	2025-07-12 09:16:32.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.5
+-Release: 20250705
++Release: 20250712
+ License: X11 License Distribution Modification Variant
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+@@ -144,8 +144,8 @@
+ 
+ %changelog
+ 
+-* Sat Jul 05 2025 Thomas E. Dickey
+-- testing ncurses 6.5-20250705
++* Sat Jul 12 2025 Thomas E. Dickey
++- testing ncurses 6.5-20250712
+ 
+ * Sat Feb 25 2023 Thomas Dickey
+ - amend URLs per rpmlint
+Index: package/ncurses.spec
+--- ncurses-6.5-20250705+/package/ncurses.spec	2025-07-05 09:49:36.000000000 +0000
++++ ncurses-6.5-20250712/package/ncurses.spec	2025-07-12 09:16:32.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.5
+-Release: 20250705
++Release: 20250712
+ License: X11 License Distribution Modification Variant
+ Group: Development/Libraries
+ URL: https://invisible-island.net/ncurses/
+@@ -134,8 +134,8 @@
+ 
+ %changelog
+ 
+-* Sat Jul 05 2025 Thomas E. Dickey
+-- testing ncurses 6.5-20250705
++* Sat Jul 12 2025 Thomas E. Dickey
++- testing ncurses 6.5-20250712
+ 
+ * Sat Feb 25 2023 Thomas Dickey
+ - amend URLs per rpmlint
+Index: package/ncursest.spec
+--- ncurses-6.5-20250705+/package/ncursest.spec	2025-07-05 09:49:36.000000000 +0000
++++ ncurses-6.5-20250712/package/ncursest.spec	2025-07-12 09:16:32.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.5
+-Release: 20250705
++Release: 20250712
+ License: X11 License Distribution Modification Variant
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+@@ -142,8 +142,8 @@
+ 
+ %changelog
+ 
+-* Sat Jul 05 2025 Thomas E. Dickey
+-- testing ncurses 6.5-20250705
++* Sat Jul 12 2025 Thomas E. Dickey
++- testing ncurses 6.5-20250712
+ 
+ * Tue Dec 24 2019 Thomas Dickey
+ - drop custom CC_NORMAL warning flags because setting CFLAGS interferes with
+Index: panel/Makefile.in
+Prereq:  1.77 
+--- ncurses-6.5-20250705+/panel/Makefile.in	2024-08-10 18:19:45.000000000 +0000
++++ ncurses-6.5-20250712/panel/Makefile.in	2025-07-12 14:59:39.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.77 2024/08/10 18:19:45 tom Exp $
++# $Id: Makefile.in,v 1.78 2025/07/12 14:59:39 tom Exp $
+ ##############################################################################
+-# Copyright 2020-2021,2024 Thomas E. Dickey                                  #
++# Copyright 2020-2024,2025 Thomas E. Dickey                                  #
+ # Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -47,6 +47,9 @@
+ VPATH		= @srcdir@
+ THIS		= Makefile
+ 
++TOP_MFLAGS	= DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)"
++@SET_MAKE@
++
+ x		= @EXEEXT@
+ o		= .@OBJEXT@
+ 
+@@ -203,6 +206,12 @@
+ 
+ realclean :: distclean
+ 
++# These rules are used to allow "make -n" to work on a clean directory-tree
++../include/curses.h \
++../include/ncurses_def.h \
++../include/term.h :
++	( cd ../include && $(MAKE) $(TOP_MFLAGS) )
++
+ ###############################################################################
+ # The remainder of this file is automatically generated during configuration
+ ###############################################################################
+Index: progs/Makefile.in
+Prereq:  1.117 
+--- ncurses-6.5-20250705+/progs/Makefile.in	2024-08-24 22:51:58.000000000 +0000
++++ ncurses-6.5-20250712/progs/Makefile.in	2025-07-12 14:45:33.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.117 2024/08/24 22:51:58 tom Exp $
++# $Id: Makefile.in,v 1.120 2025/07/12 14:45:33 tom Exp $
+ ##############################################################################
+-# Copyright 2020-2021,2024 Thomas E. Dickey                                  #
++# Copyright 2020-2024,2025 Thomas E. Dickey                                  #
+ # Copyright 1998-2016,2018 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -47,7 +47,7 @@
+ VPATH		= @srcdir@
+ THIS		= Makefile
+ 
+-TOP_MFLAGS	= @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)"
++TOP_MFLAGS	= DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)"
+ @SET_MAKE@
+ 
+ x		= @EXEEXT@
+@@ -353,7 +353,9 @@
+ realclean :: distclean
+ 
+ # These rules are used to allow "make -n" to work on a clean directory-tree
++../include/curses.h \
+ ../include/hashsize.h \
++../include/ncurses_def.h \
+ ../include/parametrized.h \
+ ../include/term.h :
+ 	( cd ../include && $(MAKE) $(TOP_MFLAGS) )
+Index: test/Makefile.in
+Prereq:  1.131 
+--- ncurses-6.5-20250705+/test/Makefile.in	2024-08-10 18:19:56.000000000 +0000
++++ ncurses-6.5-20250712/test/Makefile.in	2025-07-12 14:59:48.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.131 2024/08/10 18:19:56 tom Exp $
++# $Id: Makefile.in,v 1.132 2025/07/12 14:59:48 tom Exp $
+ ##############################################################################
+-# Copyright 2020-2021,2024 Thomas E. Dickey                                  #
++# Copyright 2020-2024,2025 Thomas E. Dickey                                  #
+ # Copyright 1998-2017,2018 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -38,6 +38,7 @@
+ SHELL		= @SHELL@
+ VPATH		= @srcdir@
+ 
++TOP_MFLAGS	= DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)"
+ @SET_MAKE@
+ 
+ destdir		=
+@@ -174,4 +175,10 @@
+ 		done"
+ 	-@rm -f headers.*
+ 
++# These rules are used to allow "make -n" to work on a clean directory-tree
++../include/curses.h \
++../include/ncurses_def.h \
++../include/term.h :
++	( cd ../include && $(MAKE) $(TOP_MFLAGS) )
++
+ # The rest is generated from the "programs" and "modules" files...
diff --git a/packages/ncurses/6.5/ncurses-6.5-20250720.patch b/packages/ncurses/6.5/ncurses-6.5-20250720.patch
new file mode 100644
index 0000000000..d65c236018
--- /dev/null
+++ b/packages/ncurses/6.5/ncurses-6.5-20250720.patch
@@ -0,0 +1,24530 @@
+# ncurses 6.5 - patch 20250720 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.5 is at
+#   https://invisible-island.net/archives/ncurses/
+#   https://invisible-mirror.net/archives/ncurses/
+#   https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.5 can be found at
+#   https://invisible-island.net/archives/ncurses/6.5
+#   https://invisible-mirror.net/archives/ncurses/6.5
+#
+# ------------------------------------------------------------------------------
+# https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20250720.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Jul 20 20:27:00 UTC 2025
+# ------------------------------------------------------------------------------
+# Ada95/aclocal.m4                        |   49 
+# Ada95/configure                         | 2598 ++++++++---------
+# Ada95/configure.in                      |    7 
+# Ada95/src/Makefile.in                   |    4 
+# INSTALL                                 |   10 
+# NEWS                                    |   10 
+# VERSION                                 |    2 
+# aclocal.m4                              |   49 
+# configure                               | 4414 ++++++++++++++----------------
+# configure.in                            |   19 
+# dist.mk                                 |    4 
+# doc/html/Ada95.html                     |    6 
+# doc/html/NCURSES-Programming-HOWTO.html |   36 
+# include/curses.h.in                     |   18 
+# include/unctrl.h.in                     |    6 
+# man/manlinks.sed                        |    6 
+# misc/terminfo.src                       |   22 
+# 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               |    4 
+# package/mingw-ncurses.spec              |    6 
+# package/ncurses.spec                    |    6 
+# package/ncursest.spec                   |    6 
+# progs/modules                           |    6 
+# test/aclocal.m4                         |   18 
+# test/modules                            |    8 
+# 30 files changed, 3585 insertions(+), 3747 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/aclocal.m4
+Prereq:  1.230 
+--- ncurses-6.5-20250712+/Ada95/aclocal.m4	2025-07-05 20:20:37.000000000 +0000
++++ ncurses-6.5-20250720/Ada95/aclocal.m4	2025-07-19 16:38:31.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: aclocal.m4,v 1.230 2025/07/05 20:20:37 tom Exp $
++dnl $Id: aclocal.m4,v 1.231 2025/07/19 16:38:31 tom Exp $
+ dnl Macros used in NCURSES Ada95 auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -2854,53 +2854,6 @@
+ 
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_MAKEFLAGS version: 22 updated: 2025/07/05 16:17:37
+-dnl ------------
+-dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
+-dnl options to lower-levels.  It is very useful for "make -n" -- if we have it.
+-dnl POSIX accommodates both by pretending they are the same variable, adding
+-dnl the behavior of the latter to the former.
+-AC_DEFUN([CF_MAKEFLAGS],
+-[AC_REQUIRE([AC_PROG_FGREP])dnl
+-
+-AC_CACHE_CHECK(for makeflags variable, cf_cv_makeflags,[
+-	cf_save_makeflags="$MAKEFLAGS"; unset MAKEFLAGS
+-	cf_save_mflags="$MFLAGS";       unset MFLAGS
+-	cf_cv_makeflags=''
+-	for cf_option in '-${MAKEFLAGS}' '${MFLAGS}'
+-	do
+-		cat >cf_makeflags.tmp </dev/null | ${FGREP-fgrep} -v "ing directory" | sed -e 's,[[ 	]]*$,,'`
+-		case "$cf_result" in
+-		(.*k|.*kw)
+-			cf_result="`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`"
+-			case "$cf_result" in
+-			(.*CC=*)	cf_cv_makeflags=
+-				;;
+-			(*)	cf_cv_makeflags=$cf_option
+-				;;
+-			esac
+-			break
+-			;;
+-		(.-)
+-			;;
+-		(*)
+-			CF_MSG_LOG(given option \"$cf_option\", no match \"$cf_result\")
+-			;;
+-		esac
+-	done
+-	test -n "$cf_save_makeflags" && MAKEFLAGS="$cf_save_makeflags"
+-	test -n "$cf_save_mflags"    && MFLAGS="$cf_save_mflags"
+-	rm -f cf_makeflags.tmp
+-])
+-
+-AC_SUBST(cf_cv_makeflags)
+-])dnl
+-dnl ---------------------------------------------------------------------------
+ dnl CF_MAKE_PHONY version: 3 updated: 2021/01/08 16:08:21
+ dnl -------------
+ dnl Check if the make-program handles a ".PHONY" target, e.g,. a target which
+Index: Ada95/configure
+--- ncurses-6.5-20250712+/Ada95/configure	2025-07-05 20:21:33.000000000 +0000
++++ ncurses-6.5-20250720/Ada95/configure	2025-07-19 16:40:05.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.94 .
++# From configure.in Revision: 1.95 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20250126.
+ #
+@@ -4132,55 +4132,10 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:4135: 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
+-else
+-
+-	cf_save_makeflags="$MAKEFLAGS"; unset MAKEFLAGS
+-	cf_save_mflags="$MFLAGS";       unset MFLAGS
+-	cf_cv_makeflags=''
+-	for cf_option in '-${MAKEFLAGS}' '${MFLAGS}'
+-	do
+-		cat >cf_makeflags.tmp </dev/null | ${FGREP-fgrep} -v "ing directory" | sed -e 's,[ 	]*$,,'`
+-		case "$cf_result" in
+-		(.*k|.*kw)
+-			cf_result="`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`"
+-			case "$cf_result" in
+-			(.*CC=*)	cf_cv_makeflags=
+-				;;
+-			(*)	cf_cv_makeflags=$cf_option
+-				;;
+-			esac
+-			break
+-			;;
+-		(.-)
+-			;;
+-		(*)
+-
+-echo "${as_me:-configure}:4167: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+-
+-			;;
+-		esac
+-	done
+-	test -n "$cf_save_makeflags" && MAKEFLAGS="$cf_save_makeflags"
+-	test -n "$cf_save_mflags"    && MFLAGS="$cf_save_mflags"
+-	rm -f cf_makeflags.tmp
+-
+-fi
+-echo "$as_me:4177: 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:4183: checking for $ac_word" >&5
++echo "$as_me:4138: 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
+@@ -4195,7 +4150,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:4198: found $ac_dir/$ac_word" >&5
++echo "$as_me:4153: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4203,10 +4158,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:4206: result: $RANLIB" >&5
++  echo "$as_me:4161: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:4209: result: no" >&5
++  echo "$as_me:4164: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4215,7 +4170,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:4218: checking for $ac_word" >&5
++echo "$as_me:4173: 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
+@@ -4230,7 +4185,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:4233: found $ac_dir/$ac_word" >&5
++echo "$as_me:4188: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4239,10 +4194,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:4242: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:4197: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:4245: result: no" >&5
++  echo "$as_me:4200: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4254,7 +4209,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:4257: checking for $ac_word" >&5
++echo "$as_me:4212: 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
+@@ -4269,7 +4224,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:4272: found $ac_dir/$ac_word" >&5
++echo "$as_me:4227: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4277,10 +4232,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:4280: result: $LD" >&5
++  echo "$as_me:4235: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:4283: result: no" >&5
++  echo "$as_me:4238: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4289,7 +4244,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:4292: checking for $ac_word" >&5
++echo "$as_me:4247: 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
+@@ -4304,7 +4259,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:4307: found $ac_dir/$ac_word" >&5
++echo "$as_me:4262: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4313,10 +4268,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:4316: result: $ac_ct_LD" >&5
++  echo "$as_me:4271: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:4319: result: no" >&5
++  echo "$as_me:4274: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4328,7 +4283,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:4331: checking for $ac_word" >&5
++echo "$as_me:4286: 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
+@@ -4343,7 +4298,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:4346: found $ac_dir/$ac_word" >&5
++echo "$as_me:4301: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4351,10 +4306,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:4354: result: $AR" >&5
++  echo "$as_me:4309: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:4357: result: no" >&5
++  echo "$as_me:4312: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4363,7 +4318,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:4366: checking for $ac_word" >&5
++echo "$as_me:4321: 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
+@@ -4378,7 +4333,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:4381: found $ac_dir/$ac_word" >&5
++echo "$as_me:4336: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4387,10 +4342,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:4390: result: $ac_ct_AR" >&5
++  echo "$as_me:4345: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:4393: result: no" >&5
++  echo "$as_me:4348: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4402,7 +4357,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:4405: checking for $ac_word" >&5
++echo "$as_me:4360: 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
+@@ -4417,7 +4372,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:4420: found $ac_dir/$ac_word" >&5
++echo "$as_me:4375: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4425,10 +4380,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:4428: result: $AR" >&5
++  echo "$as_me:4383: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:4431: result: no" >&5
++  echo "$as_me:4386: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4437,7 +4392,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:4440: checking for $ac_word" >&5
++echo "$as_me:4395: 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
+@@ -4452,7 +4407,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:4455: found $ac_dir/$ac_word" >&5
++echo "$as_me:4410: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4461,10 +4416,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:4464: result: $ac_ct_AR" >&5
++  echo "$as_me:4419: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:4467: result: no" >&5
++  echo "$as_me:4422: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4473,7 +4428,7 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-echo "$as_me:4476: checking for options to update archives" >&5
++echo "$as_me:4431: 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
+@@ -4510,13 +4465,13 @@
+ 			rm -f conftest.a
+ 
+ 			cat >"conftest.$ac_ext" <&5
++			if { (eval echo "$as_me:4471: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4519: \$? = $ac_status" >&5
++  echo "$as_me:4474: \$? = $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
+@@ -4527,7 +4482,7 @@
+ 			else
+ 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-echo "${as_me:-configure}:4530: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:4485: testing cannot compile test-program ..." 1>&5
+ 
+ 				break
+ 			fi
+@@ -4537,7 +4492,7 @@
+ 	esac
+ 
+ fi
+-echo "$as_me:4540: result: $cf_cv_ar_flags" >&5
++echo "$as_me:4495: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+ if test -n "$ARFLAGS" ; then
+@@ -4548,17 +4503,17 @@
+ 	ARFLAGS=$cf_cv_ar_flags
+ fi
+ 
+-	echo "$as_me:4551: checking for PATH separator" >&5
++	echo "$as_me:4506: 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:4558: result: $PATH_SEPARATOR" >&5
++	echo "$as_me:4513: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+ 
+-echo "$as_me:4561: checking for an installation directory prefix" >&5
++echo "$as_me:4516: checking for an installation directory prefix" >&5
+ echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-install-prefix or --without-install-prefix was given.
+@@ -4571,10 +4526,10 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:4574: result: ${DESTDIR:-(none)}" >&5
++echo "$as_me:4529: result: ${DESTDIR:-(none)}" >&5
+ echo "${ECHO_T}${DESTDIR:-(none)}" >&6
+ 
+-echo "$as_me:4577: checking if installation directory prefix should be merged" >&5
++echo "$as_me:4532: checking if installation directory prefix should be merged" >&5
+ echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6
+ 
+ # Check whether --enable-install-prefix or --disable-install-prefix was given.
+@@ -4591,7 +4546,7 @@
+ 	cf_install_prefix=no
+ 
+ fi;
+-echo "$as_me:4594: result: $cf_install_prefix" >&5
++echo "$as_me:4549: result: $cf_install_prefix" >&5
+ echo "${ECHO_T}$cf_install_prefix" >&6
+ 
+ if test "$cf_install_prefix" = yes ; then
+@@ -4625,7 +4580,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:4628: checking for $ac_word" >&5
++echo "$as_me:4583: 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
+@@ -4640,7 +4595,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:4643: found $ac_dir/$ac_word" >&5
++echo "$as_me:4598: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4648,10 +4603,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:4651: result: $BUILD_CC" >&5
++  echo "$as_me:4606: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:4654: result: no" >&5
++  echo "$as_me:4609: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4660,12 +4615,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+ 
+ fi;
+-	echo "$as_me:4663: checking for native build C compiler" >&5
++	echo "$as_me:4618: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:4665: result: $BUILD_CC" >&5
++	echo "$as_me:4620: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:4668: checking for native build C preprocessor" >&5
++	echo "$as_me:4623: 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.
+@@ -4675,10 +4630,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:4678: result: $BUILD_CPP" >&5
++	echo "$as_me:4633: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:4681: checking for native build C flags" >&5
++	echo "$as_me:4636: 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.
+@@ -4686,10 +4641,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:4689: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:4644: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:4692: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:4647: 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.
+@@ -4697,10 +4652,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:4700: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:4655: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:4703: checking for native build linker-flags" >&5
++	echo "$as_me:4658: 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.
+@@ -4708,10 +4663,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:4711: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:4666: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:4714: checking for native build linker-libraries" >&5
++	echo "$as_me:4669: 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.
+@@ -4719,7 +4674,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:4722: result: $BUILD_LIBS" >&5
++	echo "$as_me:4677: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -4728,7 +4683,7 @@
+ 
+ 	: ${BUILD_CC:='${CC}'}
+ 
+-	echo "$as_me:4731: checking if the build-compiler \"$BUILD_CC\" works" >&5
++	echo "$as_me:4686: checking if the build-compiler \"$BUILD_CC\" works" >&5
+ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
+ 
+ 	cf_save_crossed=$cross_compiling
+@@ -4742,7 +4697,7 @@
+   cf_ok_build_cc=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4745 "configure"
++#line 4700 "configure"
+ #include "confdefs.h"
+ #include 
+ 		int main(int argc, char *argv[])
+@@ -4752,15 +4707,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:4755: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4710: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4758: \$? = $ac_status" >&5
++  echo "$as_me:4713: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:4760: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4715: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4763: \$? = $ac_status" >&5
++  echo "$as_me:4718: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_ok_build_cc=yes
+ else
+@@ -4775,12 +4730,12 @@
+ 	cross_compiling=$cf_save_crossed
+ 	ac_link=$cf_save_ac_link
+ 
+-	echo "$as_me:4778: result: $cf_ok_build_cc" >&5
++	echo "$as_me:4733: result: $cf_ok_build_cc" >&5
+ echo "${ECHO_T}$cf_ok_build_cc" >&6
+ 
+ 	if test "$cf_ok_build_cc" != yes
+ 	then
+-		{ { echo "$as_me:4783: error: Cross-build requires two compilers.
++		{ { echo "$as_me:4738: 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;}
+@@ -4805,7 +4760,7 @@
+ ### shared, for example.
+ cf_list_models=""
+ 
+-echo "$as_me:4808: checking if you want to build shared C-objects" >&5
++echo "$as_me:4763: 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.
+@@ -4815,27 +4770,27 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:4818: result: $with_shared" >&5
++echo "$as_me:4773: result: $with_shared" >&5
+ echo "${ECHO_T}$with_shared" >&6
+ test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
+ 
+-echo "$as_me:4822: checking for specified models" >&5
++echo "$as_me:4777: 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:4825: result: $cf_list_models" >&5
++echo "$as_me:4780: 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:4830: checking for default model" >&5
++echo "$as_me:4785: 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:4833: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:4788: 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:4838: checking for specific curses-directory" >&5
++echo "$as_me:4793: 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.
+@@ -4845,7 +4800,7 @@
+ else
+   cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:4848: result: $cf_cv_curses_dir" >&5
++echo "$as_me:4803: 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"
+@@ -4874,7 +4829,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4877: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:4832: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -4910,7 +4865,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4913 "configure"
++#line 4868 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4922,16 +4877,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4925: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4880: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4928: \$? = $ac_status" >&5
++  echo "$as_me:4883: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4931: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4886: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4934: \$? = $ac_status" >&5
++  echo "$as_me:4889: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -4948,7 +4903,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}:4951: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4906: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -4984,7 +4939,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}:4987: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:4942: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -4999,13 +4954,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:5002: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:4957: 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:5005: result: yes" >&5
++		echo "$as_me:4960: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:5008: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:4963: 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
+ 
+@@ -5138,7 +5093,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5141 "configure"
++#line 5096 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5150,37 +5105,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:5153: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5108: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5156: \$? = $ac_status" >&5
++  echo "$as_me:5111: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:5159: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5114: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5162: \$? = $ac_status" >&5
++  echo "$as_me:5117: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5168 "configure"
++#line 5123 "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:5175: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5130: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5178: \$? = $ac_status" >&5
++  echo "$as_me:5133: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:5180: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5135: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5183: \$? = $ac_status" >&5
++  echo "$as_me:5138: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -5368,7 +5323,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5371 "configure"
++#line 5326 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5380,37 +5335,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:5383: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5338: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5386: \$? = $ac_status" >&5
++  echo "$as_me:5341: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:5389: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5344: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5392: \$? = $ac_status" >&5
++  echo "$as_me:5347: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5398 "configure"
++#line 5353 "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:5405: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5360: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5408: \$? = $ac_status" >&5
++  echo "$as_me:5363: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:5410: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5365: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5413: \$? = $ac_status" >&5
++  echo "$as_me:5368: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -5427,7 +5382,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:5430: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:5385: 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"
+@@ -5443,7 +5398,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:5446: checking for terminfo header" >&5
++echo "$as_me:5401: 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
+@@ -5461,7 +5416,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5464 "configure"
++#line 5419 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -5476,16 +5431,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5479: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5434: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5482: \$? = $ac_status" >&5
++  echo "$as_me:5437: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5485: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5440: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5488: \$? = $ac_status" >&5
++  echo "$as_me:5443: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -5501,7 +5456,7 @@
+ done
+ 
+ fi
+-echo "$as_me:5504: result: $cf_cv_term_header" >&5
++echo "$as_me:5459: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -5536,7 +5491,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:5539: result: no" >&5
++		echo "$as_me:5494: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -5552,7 +5507,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:5555: checking for $ac_word" >&5
++echo "$as_me:5510: 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
+@@ -5567,7 +5522,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:5570: found $ac_dir/$ac_word" >&5
++echo "$as_me:5525: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5575,10 +5530,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:5578: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:5533: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:5581: result: no" >&5
++  echo "$as_me:5536: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5591,7 +5546,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:5594: checking for $ac_word" >&5
++echo "$as_me:5549: 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
+@@ -5606,7 +5561,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:5609: found $ac_dir/$ac_word" >&5
++echo "$as_me:5564: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5614,10 +5569,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:5617: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:5572: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:5620: result: no" >&5
++  echo "$as_me:5575: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5774,7 +5729,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:5777: checking if we have identified curses headers" >&5
++echo "$as_me:5732: 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
+@@ -5786,7 +5741,7 @@
+ 	curses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5789 "configure"
++#line 5744 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -5798,16 +5753,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5801: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5756: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5804: \$? = $ac_status" >&5
++  echo "$as_me:5759: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5807: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5762: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5810: \$? = $ac_status" >&5
++  echo "$as_me:5765: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -5818,11 +5773,11 @@
+ done
+ 
+ fi
+-echo "$as_me:5821: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:5776: 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:5825: error: No curses header-files found" >&5
++	{ { echo "$as_me:5780: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -5832,23 +5787,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:5835: checking for $ac_header" >&5
++echo "$as_me:5790: 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 5841 "configure"
++#line 5796 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:5845: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:5800: \"$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:5851: \$? = $ac_status" >&5
++  echo "$as_me:5806: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -5867,7 +5822,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:5870: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:5825: 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 5926 "configure"
++#line 5881 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5935,16 +5890,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5938: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5893: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5941: \$? = $ac_status" >&5
++  echo "$as_me:5896: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5944: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5899: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5947: \$? = $ac_status" >&5
++  echo "$as_me:5902: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5961,7 +5916,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}:5964: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5919: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -5980,7 +5935,7 @@
+ 
+ }
+ 
+-echo "$as_me:5983: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:5938: 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
+@@ -5992,7 +5947,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5995 "configure"
++#line 5950 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -6016,16 +5971,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6019: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5974: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6022: \$? = $ac_status" >&5
++  echo "$as_me:5977: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6025: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5980: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6028: \$? = $ac_status" >&5
++  echo "$as_me:5983: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -6040,14 +5995,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:6043: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:5998: 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:6050: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:6005: 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
+@@ -6168,7 +6123,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6171 "configure"
++#line 6126 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6180,16 +6135,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6183: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6138: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6186: \$? = $ac_status" >&5
++  echo "$as_me:6141: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6189: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6144: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6192: \$? = $ac_status" >&5
++  echo "$as_me:6147: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6206,7 +6161,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}:6209: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6164: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -6229,7 +6184,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6232 "configure"
++#line 6187 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -6253,16 +6208,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6256: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6211: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6259: \$? = $ac_status" >&5
++  echo "$as_me:6214: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6262: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6217: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6265: \$? = $ac_status" >&5
++  echo "$as_me:6220: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -6283,12 +6238,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6286: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6241: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:6291: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:6246: 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%/[^/]*$%%'`
+@@ -6324,7 +6279,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6327 "configure"
++#line 6282 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6336,16 +6291,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6339: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6294: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6342: \$? = $ac_status" >&5
++  echo "$as_me:6297: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6345: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6300: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6348: \$? = $ac_status" >&5
++  echo "$as_me:6303: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6362,7 +6317,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}:6365: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6320: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -6410,7 +6365,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:6413: checking for terminfo header" >&5
++echo "$as_me:6368: 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
+@@ -6428,7 +6383,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6431 "configure"
++#line 6386 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -6443,16 +6398,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6446: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6401: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6449: \$? = $ac_status" >&5
++  echo "$as_me:6404: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6452: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6407: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6455: \$? = $ac_status" >&5
++  echo "$as_me:6410: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -6468,7 +6423,7 @@
+ done
+ 
+ fi
+-echo "$as_me:6471: result: $cf_cv_term_header" >&5
++echo "$as_me:6426: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -6506,7 +6461,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:6509: checking for ncurses version" >&5
++echo "$as_me:6464: 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
+@@ -6532,10 +6487,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:6535: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:6490: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6538: \$? = $ac_status" >&5
++  echo "$as_me:6493: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -6545,7 +6500,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6548 "configure"
++#line 6503 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -6572,15 +6527,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6575: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6530: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6578: \$? = $ac_status" >&5
++  echo "$as_me:6533: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:6580: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6535: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6583: \$? = $ac_status" >&5
++  echo "$as_me:6538: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -6594,7 +6549,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:6597: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:6552: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -6607,7 +6562,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:6610: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:6565: 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
+@@ -6615,7 +6570,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6618 "configure"
++#line 6573 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6634,16 +6589,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6637: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6592: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6640: \$? = $ac_status" >&5
++  echo "$as_me:6595: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6643: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6598: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6646: \$? = $ac_status" >&5
++  echo "$as_me:6601: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -6654,10 +6609,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6657: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:6612: 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:6660: checking for initscr in -lgpm" >&5
++  echo "$as_me:6615: 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
+@@ -6665,7 +6620,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6668 "configure"
++#line 6623 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6684,16 +6639,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6687: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6642: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6690: \$? = $ac_status" >&5
++  echo "$as_me:6645: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6693: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6648: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6696: \$? = $ac_status" >&5
++  echo "$as_me:6651: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -6704,7 +6659,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6707: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:6662: 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"
+@@ -6719,7 +6674,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:6722: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:6677: 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
+@@ -6727,7 +6682,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6730 "configure"
++#line 6685 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6746,16 +6701,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6749: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6704: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6752: \$? = $ac_status" >&5
++  echo "$as_me:6707: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6755: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6710: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6758: \$? = $ac_status" >&5
++  echo "$as_me:6713: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -6766,7 +6721,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6769: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:6724: 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"
+@@ -6815,13 +6770,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:6818: checking for initscr" >&5
++	echo "$as_me:6773: 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 6824 "configure"
++#line 6779 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -6852,16 +6807,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6855: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6810: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6858: \$? = $ac_status" >&5
++  echo "$as_me:6813: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6861: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6816: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6864: \$? = $ac_status" >&5
++  echo "$as_me:6819: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -6871,18 +6826,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6874: result: $ac_cv_func_initscr" >&5
++echo "$as_me:6829: 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:6881: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:6836: 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 6885 "configure"
++#line 6840 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6894,25 +6849,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6897: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6852: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6900: \$? = $ac_status" >&5
++  echo "$as_me:6855: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6903: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6858: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6906: \$? = $ac_status" >&5
++  echo "$as_me:6861: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:6908: result: yes" >&5
++  echo "$as_me:6863: 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:6915: result: no" >&5
++echo "$as_me:6870: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -6980,11 +6935,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:6983: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:6938: 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 6987 "configure"
++#line 6942 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6996,25 +6951,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6999: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6954: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7002: \$? = $ac_status" >&5
++  echo "$as_me:6957: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7005: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6960: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7008: \$? = $ac_status" >&5
++  echo "$as_me:6963: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:7010: result: yes" >&5
++  echo "$as_me:6965: 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:7017: result: no" >&5
++echo "$as_me:6972: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -7029,7 +6984,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:7032: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:6987: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7037,7 +6992,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:7040: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:6995: 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
+@@ -7047,7 +7002,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7050 "configure"
++#line 7005 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7059,23 +7014,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7062: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7017: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7065: \$? = $ac_status" >&5
++  echo "$as_me:7020: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7068: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7023: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7071: \$? = $ac_status" >&5
++  echo "$as_me:7026: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:7073: result: yes" >&5
++  echo "$as_me:7028: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:7078: result: no" >&5
++echo "$as_me:7033: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -7093,7 +7048,7 @@
+ 	NCURSES_CONFIG=none
+ fi
+ 
+-echo "$as_me:7096: checking for specified curses library type" >&5
++echo "$as_me:7051: checking for specified curses library type" >&5
+ echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
+ 
+ # Check whether --with-screen or --without-screen was given.
+@@ -7107,7 +7062,7 @@
+ case $cf_cv_screen in
+ (curses|curses_*)
+ 
+-echo "$as_me:7110: checking for extra include directories" >&5
++echo "$as_me:7065: checking for extra include directories" >&5
+ echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
+ if test "${cf_cv_curses_incdir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7133,7 +7088,7 @@
+ esac
+ 
+ fi
+-echo "$as_me:7136: result: $cf_cv_curses_incdir" >&5
++echo "$as_me:7091: result: $cf_cv_curses_incdir" >&5
+ echo "${ECHO_T}$cf_cv_curses_incdir" >&6
+ if test "$cf_cv_curses_incdir" != no
+ then
+@@ -7143,7 +7098,7 @@
+ 
+ fi
+ 
+-echo "$as_me:7146: checking if we have identified curses headers" >&5
++echo "$as_me:7101: 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
+@@ -7155,7 +7110,7 @@
+ 	curses.h  ncurses/ncurses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7158 "configure"
++#line 7113 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -7167,16 +7122,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7170: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7125: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7173: \$? = $ac_status" >&5
++  echo "$as_me:7128: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7176: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7131: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7179: \$? = $ac_status" >&5
++  echo "$as_me:7134: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -7187,11 +7142,11 @@
+ done
+ 
+ fi
+-echo "$as_me:7190: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:7145: 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:7194: error: No curses header-files found" >&5
++	{ { echo "$as_me:7149: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7201,23 +7156,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:7204: checking for $ac_header" >&5
++echo "$as_me:7159: 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 7210 "configure"
++#line 7165 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7214: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7169: \"$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:7220: \$? = $ac_status" >&5
++  echo "$as_me:7175: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7236,7 +7191,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7239: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7194: 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:7204: 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
+@@ -7264,7 +7219,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7267 "configure"
++#line 7222 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -7279,16 +7234,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7282: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7237: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7285: \$? = $ac_status" >&5
++  echo "$as_me:7240: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7288: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7243: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7291: \$? = $ac_status" >&5
++  echo "$as_me:7246: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -7304,7 +7259,7 @@
+ done
+ 
+ fi
+-echo "$as_me:7307: result: $cf_cv_term_header" >&5
++echo "$as_me:7262: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -7336,7 +7291,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:7339: checking for ncurses version" >&5
++echo "$as_me:7294: 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
+@@ -7362,10 +7317,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:7365: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:7320: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7368: \$? = $ac_status" >&5
++  echo "$as_me:7323: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -7375,7 +7330,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7378 "configure"
++#line 7333 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -7402,15 +7357,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:7405: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7360: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7408: \$? = $ac_status" >&5
++  echo "$as_me:7363: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:7410: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7365: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7413: \$? = $ac_status" >&5
++  echo "$as_me:7368: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -7424,17 +7379,17 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:7427: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:7382: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:7434: checking if we have identified curses libraries" >&5
++echo "$as_me:7389: checking if we have identified curses libraries" >&5
+ echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7437 "configure"
++#line 7392 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7446,16 +7401,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7449: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7404: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7452: \$? = $ac_status" >&5
++  echo "$as_me:7407: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7455: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7410: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7458: \$? = $ac_status" >&5
++  echo "$as_me:7413: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -7464,13 +7419,13 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-echo "$as_me:7467: result: $cf_result" >&5
++echo "$as_me:7422: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test "$cf_result" = no ; then
+ case "$host_os" in
+ (freebsd*)
+-	echo "$as_me:7473: checking for tgoto in -lmytinfo" >&5
++	echo "$as_me:7428: 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
+@@ -7478,7 +7433,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7481 "configure"
++#line 7436 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7497,16 +7452,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7500: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7455: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7503: \$? = $ac_status" >&5
++  echo "$as_me:7458: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7506: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7461: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7509: \$? = $ac_status" >&5
++  echo "$as_me:7464: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -7517,7 +7472,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7520: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:7475: 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
+ 
+@@ -7547,7 +7502,7 @@
+ 	# term.h) for cur_colr
+ 	if test "x$cf_cv_screen" = "xcurses_colr"
+ 	then
+-		echo "$as_me:7550: checking for initscr in -lcur_colr" >&5
++		echo "$as_me:7505: checking for initscr in -lcur_colr" >&5
+ echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
+ if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7555,7 +7510,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcur_colr  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7558 "configure"
++#line 7513 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7574,16 +7529,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7577: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7532: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7580: \$? = $ac_status" >&5
++  echo "$as_me:7535: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7583: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7538: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7586: \$? = $ac_status" >&5
++  echo "$as_me:7541: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_cur_colr_initscr=yes
+ else
+@@ -7594,7 +7549,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7597: result: $ac_cv_lib_cur_colr_initscr" >&5
++echo "$as_me:7552: result: $ac_cv_lib_cur_colr_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
+ if test "$ac_cv_lib_cur_colr_initscr" = yes; then
+ 
+@@ -7618,7 +7573,7 @@
+ 
+ else
+ 
+-		echo "$as_me:7621: checking for initscr in -lHcurses" >&5
++		echo "$as_me:7576: checking for initscr in -lHcurses" >&5
+ echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
+ if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7626,7 +7581,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lHcurses  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7629 "configure"
++#line 7584 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7645,16 +7600,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7648: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7603: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7651: \$? = $ac_status" >&5
++  echo "$as_me:7606: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7654: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7609: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7657: \$? = $ac_status" >&5
++  echo "$as_me:7612: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_Hcurses_initscr=yes
+ else
+@@ -7665,7 +7620,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7668: result: $ac_cv_lib_Hcurses_initscr" >&5
++echo "$as_me:7623: result: $ac_cv_lib_Hcurses_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
+ if test "$ac_cv_lib_Hcurses_initscr" = yes; then
+ 
+@@ -7723,7 +7678,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}:7726: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7681: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7752,7 +7707,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}:7755: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7710: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7783,7 +7738,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}:7786: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7741: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7818,7 +7773,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}:7821: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7776: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7862,13 +7817,13 @@
+ 	# because it may be needed to link the test-case for initscr.
+ 	if test "x$cf_term_lib" = x
+ 	then
+-		echo "$as_me:7865: checking for tgoto" >&5
++		echo "$as_me:7820: checking for tgoto" >&5
+ echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
+ if test "${ac_cv_func_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7871 "configure"
++#line 7826 "configure"
+ #include "confdefs.h"
+ #define tgoto autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7899,16 +7854,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7902: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7857: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7905: \$? = $ac_status" >&5
++  echo "$as_me:7860: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7908: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7863: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7911: \$? = $ac_status" >&5
++  echo "$as_me:7866: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_tgoto=yes
+ else
+@@ -7918,7 +7873,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7921: result: $ac_cv_func_tgoto" >&5
++echo "$as_me:7876: result: $ac_cv_func_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_func_tgoto" >&6
+ if test "$ac_cv_func_tgoto" = yes; then
+   cf_term_lib=predefined
+@@ -7927,7 +7882,7 @@
+ 			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
+ 			do
+ 				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
+-echo "$as_me:7930: checking for tgoto in -l$cf_term_lib" >&5
++echo "$as_me:7885: checking for tgoto in -l$cf_term_lib" >&5
+ echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7935,7 +7890,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_term_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7938 "configure"
++#line 7893 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7954,16 +7909,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7957: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7912: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7960: \$? = $ac_status" >&5
++  echo "$as_me:7915: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7963: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7918: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7966: \$? = $ac_status" >&5
++  echo "$as_me:7921: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -7974,7 +7929,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7977: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:7932: 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
+ 
+@@ -7997,10 +7952,10 @@
+ 		do
+ 			LIBS="-l$cf_curs_lib $cf_save_LIBS"
+ 			if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
+-				echo "$as_me:8000: checking if we can link with $cf_curs_lib library" >&5
++				echo "$as_me:7955: checking if we can link with $cf_curs_lib library" >&5
+ echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8003 "configure"
++#line 7958 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8012,16 +7967,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8015: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7970: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8018: \$? = $ac_status" >&5
++  echo "$as_me:7973: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8021: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7976: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8024: \$? = $ac_status" >&5
++  echo "$as_me:7979: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -8030,16 +7985,16 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-				echo "$as_me:8033: result: $cf_result" >&5
++				echo "$as_me:7988: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 				test "$cf_result" = yes && break
+ 			elif test "$cf_curs_lib" = "$cf_term_lib" ; then
+ 				cf_result=no
+ 			elif test "$cf_term_lib" != predefined ; then
+-				echo "$as_me:8039: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
++				echo "$as_me:7994: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+ echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8042 "configure"
++#line 7997 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8051,16 +8006,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8054: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8009: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8057: \$? = $ac_status" >&5
++  echo "$as_me:8012: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8060: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8015: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8063: \$? = $ac_status" >&5
++  echo "$as_me:8018: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=no
+ else
+@@ -8069,7 +8024,7 @@
+ 
+ 					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
+ 					cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8072 "configure"
++#line 8027 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8081,16 +8036,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8084: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8039: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8087: \$? = $ac_status" >&5
++  echo "$as_me:8042: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8090: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8045: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8093: \$? = $ac_status" >&5
++  echo "$as_me:8048: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -8102,13 +8057,13 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-				echo "$as_me:8105: result: $cf_result" >&5
++				echo "$as_me:8060: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 				test "$cf_result" != error && break
+ 			fi
+ 		done
+ 	fi
+-	test "$cf_curs_lib" = unknown && { { echo "$as_me:8111: error: no curses library found" >&5
++	test "$cf_curs_lib" = unknown && { { echo "$as_me:8066: error: no curses library found" >&5
+ echo "$as_me: error: no curses library found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8120,23 +8075,23 @@
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:8123: checking for $ac_header" >&5
++echo "$as_me:8078: 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 8129 "configure"
++#line 8084 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8133: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8088: \"$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:8139: \$? = $ac_status" >&5
++  echo "$as_me:8094: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8155,7 +8110,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8158: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8113: 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:8123: 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
+@@ -8173,7 +8128,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8176 "configure"
++#line 8131 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -8190,16 +8145,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8193: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8148: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8196: \$? = $ac_status" >&5
++  echo "$as_me:8151: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8199: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8154: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8202: \$? = $ac_status" >&5
++  echo "$as_me:8157: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -8211,12 +8166,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:8214: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8169: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8219 "configure"
++#line 8174 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8229,16 +8184,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8232: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8187: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8235: \$? = $ac_status" >&5
++  echo "$as_me:8190: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8238: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8193: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8241: \$? = $ac_status" >&5
++  echo "$as_me:8196: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -8252,7 +8207,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8255 "configure"
++#line 8210 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8265,16 +8220,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8268: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8223: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8271: \$? = $ac_status" >&5
++  echo "$as_me:8226: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8274: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8229: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8277: \$? = $ac_status" >&5
++  echo "$as_me:8232: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -8291,9 +8246,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:8294: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:8249: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:8296: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8251: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -8384,7 +8339,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}:8387: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8342: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -8392,7 +8347,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8395 "configure"
++#line 8350 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8405,21 +8360,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8408: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8363: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8411: \$? = $ac_status" >&5
++  echo "$as_me:8366: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8414: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8369: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8417: \$? = $ac_status" >&5
++  echo "$as_me:8372: \$? = $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}:8422: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8377: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -8437,7 +8392,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:8440: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8395: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -8512,13 +8467,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}:8515: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8470: 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 8521 "configure"
++#line 8476 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8531,21 +8486,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8534: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8489: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8537: \$? = $ac_status" >&5
++  echo "$as_me:8492: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8540: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8495: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8543: \$? = $ac_status" >&5
++  echo "$as_me:8498: \$? = $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}:8548: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8503: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -8587,7 +8542,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8590: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:8545: 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
+@@ -8625,7 +8580,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8628 "configure"
++#line 8583 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8637,16 +8592,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8640: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8595: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8643: \$? = $ac_status" >&5
++  echo "$as_me:8598: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8646: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8601: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8649: \$? = $ac_status" >&5
++  echo "$as_me:8604: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -8663,7 +8618,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}:8666: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8621: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8699,7 +8654,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}:8702: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:8657: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -8729,13 +8684,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:8732: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:8687: 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:8735: result: yes" >&5
++		echo "$as_me:8690: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:8738: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:8693: 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
+ 
+@@ -8868,7 +8823,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8871 "configure"
++#line 8826 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8880,37 +8835,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8883: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8838: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8886: \$? = $ac_status" >&5
++  echo "$as_me:8841: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8889: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8844: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8892: \$? = $ac_status" >&5
++  echo "$as_me:8847: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8898 "configure"
++#line 8853 "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:8905: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8860: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8908: \$? = $ac_status" >&5
++  echo "$as_me:8863: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:8910: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8865: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8913: \$? = $ac_status" >&5
++  echo "$as_me:8868: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -9098,7 +9053,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9101 "configure"
++#line 9056 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9110,37 +9065,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9113: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9068: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9116: \$? = $ac_status" >&5
++  echo "$as_me:9071: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9119: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9074: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9122: \$? = $ac_status" >&5
++  echo "$as_me:9077: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9128 "configure"
++#line 9083 "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:9135: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9090: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9138: \$? = $ac_status" >&5
++  echo "$as_me:9093: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9140: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9095: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9143: \$? = $ac_status" >&5
++  echo "$as_me:9098: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -9157,7 +9112,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:9160: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:9115: 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"
+@@ -9173,7 +9128,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:9176: checking for terminfo header" >&5
++echo "$as_me:9131: 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
+@@ -9191,7 +9146,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9194 "configure"
++#line 9149 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9206,16 +9161,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9209: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9164: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9212: \$? = $ac_status" >&5
++  echo "$as_me:9167: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9215: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9170: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9218: \$? = $ac_status" >&5
++  echo "$as_me:9173: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -9231,7 +9186,7 @@
+ done
+ 
+ fi
+-echo "$as_me:9234: result: $cf_cv_term_header" >&5
++echo "$as_me:9189: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9266,7 +9221,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:9269: result: no" >&5
++		echo "$as_me:9224: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -9282,7 +9237,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:9285: checking for $ac_word" >&5
++echo "$as_me:9240: 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
+@@ -9297,7 +9252,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:9300: found $ac_dir/$ac_word" >&5
++echo "$as_me:9255: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9305,10 +9260,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:9308: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:9263: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:9311: result: no" >&5
++  echo "$as_me:9266: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9321,7 +9276,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:9324: checking for $ac_word" >&5
++echo "$as_me:9279: 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
+@@ -9336,7 +9291,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:9339: found $ac_dir/$ac_word" >&5
++echo "$as_me:9294: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9344,10 +9299,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:9347: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:9302: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:9350: result: no" >&5
++  echo "$as_me:9305: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9504,7 +9459,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:9507: checking if we have identified curses headers" >&5
++echo "$as_me:9462: 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
+@@ -9516,7 +9471,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9519 "configure"
++#line 9474 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -9528,16 +9483,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9531: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9486: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9534: \$? = $ac_status" >&5
++  echo "$as_me:9489: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9537: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9492: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9540: \$? = $ac_status" >&5
++  echo "$as_me:9495: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -9548,11 +9503,11 @@
+ done
+ 
+ fi
+-echo "$as_me:9551: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:9506: 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:9555: error: No curses header-files found" >&5
++	{ { echo "$as_me:9510: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -9562,23 +9517,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:9565: checking for $ac_header" >&5
++echo "$as_me:9520: 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 9571 "configure"
++#line 9526 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:9575: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:9530: \"$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:9581: \$? = $ac_status" >&5
++  echo "$as_me:9536: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9597,7 +9552,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:9600: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:9555: 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 9656 "configure"
++#line 9611 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9665,16 +9620,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9668: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9623: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9671: \$? = $ac_status" >&5
++  echo "$as_me:9626: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9674: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9629: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9677: \$? = $ac_status" >&5
++  echo "$as_me:9632: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9691,7 +9646,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}:9694: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9649: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9710,7 +9665,7 @@
+ 
+ }
+ 
+-echo "$as_me:9713: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:9668: 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
+@@ -9722,7 +9677,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9725 "configure"
++#line 9680 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -9746,16 +9701,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9749: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9704: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9752: \$? = $ac_status" >&5
++  echo "$as_me:9707: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9755: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9710: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9758: \$? = $ac_status" >&5
++  echo "$as_me:9713: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -9770,14 +9725,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:9773: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:9728: 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:9780: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:9735: 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
+@@ -9898,7 +9853,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9901 "configure"
++#line 9856 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9910,16 +9865,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9913: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9868: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9916: \$? = $ac_status" >&5
++  echo "$as_me:9871: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9919: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9874: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9922: \$? = $ac_status" >&5
++  echo "$as_me:9877: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -9936,7 +9891,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}:9939: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9894: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -9959,7 +9914,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9962 "configure"
++#line 9917 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -9983,16 +9938,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9986: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9941: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9989: \$? = $ac_status" >&5
++  echo "$as_me:9944: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9992: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9947: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9995: \$? = $ac_status" >&5
++  echo "$as_me:9950: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -10013,12 +9968,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10016: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9971: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:10021: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:9976: 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%/[^/]*$%%'`
+@@ -10054,7 +10009,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10057 "configure"
++#line 10012 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10066,16 +10021,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10069: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10024: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10072: \$? = $ac_status" >&5
++  echo "$as_me:10027: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10075: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10030: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10078: \$? = $ac_status" >&5
++  echo "$as_me:10033: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10092,7 +10047,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}:10095: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10050: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10140,7 +10095,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:10143: checking for terminfo header" >&5
++echo "$as_me:10098: 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
+@@ -10158,7 +10113,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10161 "configure"
++#line 10116 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -10173,16 +10128,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10176: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10131: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10179: \$? = $ac_status" >&5
++  echo "$as_me:10134: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10182: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10137: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10185: \$? = $ac_status" >&5
++  echo "$as_me:10140: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -10198,7 +10153,7 @@
+ done
+ 
+ fi
+-echo "$as_me:10201: result: $cf_cv_term_header" >&5
++echo "$as_me:10156: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10236,7 +10191,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:10239: checking for ncurses version" >&5
++echo "$as_me:10194: 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
+@@ -10262,10 +10217,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:10265: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:10220: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10268: \$? = $ac_status" >&5
++  echo "$as_me:10223: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -10275,7 +10230,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10278 "configure"
++#line 10233 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -10302,15 +10257,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10305: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10260: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10308: \$? = $ac_status" >&5
++  echo "$as_me:10263: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10310: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10265: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10313: \$? = $ac_status" >&5
++  echo "$as_me:10268: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -10324,7 +10279,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:10327: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:10282: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -10337,7 +10292,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:10340: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:10295: 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
+@@ -10345,7 +10300,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10348 "configure"
++#line 10303 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10364,16 +10319,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10367: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10322: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10370: \$? = $ac_status" >&5
++  echo "$as_me:10325: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10373: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10328: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10376: \$? = $ac_status" >&5
++  echo "$as_me:10331: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -10384,10 +10339,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10387: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:10342: 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:10390: checking for initscr in -lgpm" >&5
++  echo "$as_me:10345: 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
+@@ -10395,7 +10350,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10398 "configure"
++#line 10353 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10414,16 +10369,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10417: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10372: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10420: \$? = $ac_status" >&5
++  echo "$as_me:10375: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10423: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10378: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10426: \$? = $ac_status" >&5
++  echo "$as_me:10381: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -10434,7 +10389,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10437: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:10392: 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"
+@@ -10449,7 +10404,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:10452: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:10407: 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
+@@ -10457,7 +10412,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10460 "configure"
++#line 10415 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10476,16 +10431,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10479: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10434: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10482: \$? = $ac_status" >&5
++  echo "$as_me:10437: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10485: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10440: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10488: \$? = $ac_status" >&5
++  echo "$as_me:10443: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -10496,7 +10451,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10499: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:10454: 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"
+@@ -10545,13 +10500,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:10548: checking for initscr" >&5
++	echo "$as_me:10503: 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 10554 "configure"
++#line 10509 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10582,16 +10537,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10585: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10540: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10588: \$? = $ac_status" >&5
++  echo "$as_me:10543: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10591: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10546: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10594: \$? = $ac_status" >&5
++  echo "$as_me:10549: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -10601,18 +10556,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10604: result: $ac_cv_func_initscr" >&5
++echo "$as_me:10559: 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:10611: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:10566: 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 10615 "configure"
++#line 10570 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10624,25 +10579,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10627: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10582: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10630: \$? = $ac_status" >&5
++  echo "$as_me:10585: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10633: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10588: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10636: \$? = $ac_status" >&5
++  echo "$as_me:10591: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:10638: result: yes" >&5
++  echo "$as_me:10593: 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:10645: result: no" >&5
++echo "$as_me:10600: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -10710,11 +10665,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:10713: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:10668: 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 10717 "configure"
++#line 10672 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10726,25 +10681,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10729: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10684: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10732: \$? = $ac_status" >&5
++  echo "$as_me:10687: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10735: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10690: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10738: \$? = $ac_status" >&5
++  echo "$as_me:10693: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:10740: result: yes" >&5
++  echo "$as_me:10695: 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:10747: result: no" >&5
++echo "$as_me:10702: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -10759,7 +10714,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:10762: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:10717: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -10767,7 +10722,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:10770: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:10725: 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
+@@ -10777,7 +10732,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10780 "configure"
++#line 10735 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10789,23 +10744,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10792: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10747: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10795: \$? = $ac_status" >&5
++  echo "$as_me:10750: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10798: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10753: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10801: \$? = $ac_status" >&5
++  echo "$as_me:10756: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:10803: result: yes" >&5
++  echo "$as_me:10758: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:10808: result: no" >&5
++echo "$as_me:10763: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -10830,13 +10785,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:10833: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:10788: 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:10836: result: yes" >&5
++		echo "$as_me:10791: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:10839: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:10794: 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
+ 
+@@ -10969,7 +10924,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10972 "configure"
++#line 10927 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -10981,37 +10936,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10984: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10939: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10987: \$? = $ac_status" >&5
++  echo "$as_me:10942: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10990: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10945: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10993: \$? = $ac_status" >&5
++  echo "$as_me:10948: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10999 "configure"
++#line 10954 "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:11006: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10961: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11009: \$? = $ac_status" >&5
++  echo "$as_me:10964: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:11011: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10966: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11014: \$? = $ac_status" >&5
++  echo "$as_me:10969: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -11199,7 +11154,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11202 "configure"
++#line 11157 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11211,37 +11166,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11214: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11169: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11217: \$? = $ac_status" >&5
++  echo "$as_me:11172: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11220: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11175: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11223: \$? = $ac_status" >&5
++  echo "$as_me:11178: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11229 "configure"
++#line 11184 "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:11236: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11191: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11239: \$? = $ac_status" >&5
++  echo "$as_me:11194: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:11241: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11196: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11244: \$? = $ac_status" >&5
++  echo "$as_me:11199: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -11258,7 +11213,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:11261: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:11216: 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"
+@@ -11274,7 +11229,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:11277: checking for terminfo header" >&5
++echo "$as_me:11232: 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
+@@ -11292,7 +11247,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11295 "configure"
++#line 11250 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -11307,16 +11262,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11310: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11265: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11313: \$? = $ac_status" >&5
++  echo "$as_me:11268: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11316: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11271: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11319: \$? = $ac_status" >&5
++  echo "$as_me:11274: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -11332,7 +11287,7 @@
+ done
+ 
+ fi
+-echo "$as_me:11335: result: $cf_cv_term_header" >&5
++echo "$as_me:11290: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -11367,7 +11322,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:11370: result: no" >&5
++		echo "$as_me:11325: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -11383,7 +11338,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:11386: checking for $ac_word" >&5
++echo "$as_me:11341: 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
+@@ -11398,7 +11353,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:11401: found $ac_dir/$ac_word" >&5
++echo "$as_me:11356: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -11406,10 +11361,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:11409: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:11364: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:11412: result: no" >&5
++  echo "$as_me:11367: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -11422,7 +11377,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:11425: checking for $ac_word" >&5
++echo "$as_me:11380: 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
+@@ -11437,7 +11392,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:11440: found $ac_dir/$ac_word" >&5
++echo "$as_me:11395: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -11445,10 +11400,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:11448: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:11403: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:11451: result: no" >&5
++  echo "$as_me:11406: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -11605,7 +11560,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:11608: checking if we have identified curses headers" >&5
++echo "$as_me:11563: 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
+@@ -11617,7 +11572,7 @@
+ 	curses.h $cf_cv_screen/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11620 "configure"
++#line 11575 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -11629,16 +11584,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11632: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11587: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11635: \$? = $ac_status" >&5
++  echo "$as_me:11590: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11638: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11593: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11641: \$? = $ac_status" >&5
++  echo "$as_me:11596: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -11649,11 +11604,11 @@
+ done
+ 
+ fi
+-echo "$as_me:11652: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:11607: 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:11656: error: No curses header-files found" >&5
++	{ { echo "$as_me:11611: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -11663,23 +11618,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:11666: checking for $ac_header" >&5
++echo "$as_me:11621: 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 11672 "configure"
++#line 11627 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:11676: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:11631: \"$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:11682: \$? = $ac_status" >&5
++  echo "$as_me:11637: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11698,7 +11653,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:11701: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:11656: 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 11757 "configure"
++#line 11712 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11766,16 +11721,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11769: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11724: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11772: \$? = $ac_status" >&5
++  echo "$as_me:11727: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11775: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11730: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11778: \$? = $ac_status" >&5
++  echo "$as_me:11733: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11792,7 +11747,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}:11795: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11750: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -11811,7 +11766,7 @@
+ 
+ }
+ 
+-echo "$as_me:11814: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:11769: 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
+@@ -11823,7 +11778,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11826 "configure"
++#line 11781 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -11847,16 +11802,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11850: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11805: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11853: \$? = $ac_status" >&5
++  echo "$as_me:11808: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11856: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11811: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11859: \$? = $ac_status" >&5
++  echo "$as_me:11814: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -11871,14 +11826,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:11874: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:11829: 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:11881: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:11836: 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
+@@ -11999,7 +11954,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12002 "configure"
++#line 11957 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12011,16 +11966,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12014: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11969: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12017: \$? = $ac_status" >&5
++  echo "$as_me:11972: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11975: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12023: \$? = $ac_status" >&5
++  echo "$as_me:11978: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -12037,7 +11992,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}:12040: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:11995: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -12060,7 +12015,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12063 "configure"
++#line 12018 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -12084,16 +12039,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12087: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12042: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12090: \$? = $ac_status" >&5
++  echo "$as_me:12045: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12093: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12048: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12096: \$? = $ac_status" >&5
++  echo "$as_me:12051: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -12114,12 +12069,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:12117: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:12072: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:12122: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:12077: 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%/[^/]*$%%'`
+@@ -12155,7 +12110,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12158 "configure"
++#line 12113 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12167,16 +12122,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12170: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12125: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12173: \$? = $ac_status" >&5
++  echo "$as_me:12128: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12176: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12131: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12179: \$? = $ac_status" >&5
++  echo "$as_me:12134: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -12193,7 +12148,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}:12196: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:12151: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -12241,7 +12196,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:12244: checking for terminfo header" >&5
++echo "$as_me:12199: 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
+@@ -12259,7 +12214,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12262 "configure"
++#line 12217 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -12274,16 +12229,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12277: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12232: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12280: \$? = $ac_status" >&5
++  echo "$as_me:12235: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12283: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12238: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12286: \$? = $ac_status" >&5
++  echo "$as_me:12241: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -12299,7 +12254,7 @@
+ done
+ 
+ fi
+-echo "$as_me:12302: result: $cf_cv_term_header" >&5
++echo "$as_me:12257: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -12337,7 +12292,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:12340: checking for ncurses version" >&5
++echo "$as_me:12295: 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
+@@ -12363,10 +12318,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:12366: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:12321: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12369: \$? = $ac_status" >&5
++  echo "$as_me:12324: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -12376,7 +12331,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12379 "configure"
++#line 12334 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12403,15 +12358,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:12406: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12361: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12409: \$? = $ac_status" >&5
++  echo "$as_me:12364: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:12411: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12366: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12414: \$? = $ac_status" >&5
++  echo "$as_me:12369: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -12425,7 +12380,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:12428: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:12383: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -12438,7 +12393,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:12441: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:12396: 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
+@@ -12446,7 +12401,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12449 "configure"
++#line 12404 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12465,16 +12420,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12468: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12423: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12471: \$? = $ac_status" >&5
++  echo "$as_me:12426: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12474: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12429: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12477: \$? = $ac_status" >&5
++  echo "$as_me:12432: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -12485,10 +12440,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12488: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:12443: 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:12491: checking for initscr in -lgpm" >&5
++  echo "$as_me:12446: 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
+@@ -12496,7 +12451,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12499 "configure"
++#line 12454 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12515,16 +12470,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12518: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12473: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12521: \$? = $ac_status" >&5
++  echo "$as_me:12476: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12524: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12479: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12527: \$? = $ac_status" >&5
++  echo "$as_me:12482: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -12535,7 +12490,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12538: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:12493: 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"
+@@ -12550,7 +12505,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:12553: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:12508: 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
+@@ -12558,7 +12513,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12561 "configure"
++#line 12516 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12577,16 +12532,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12580: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12535: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12583: \$? = $ac_status" >&5
++  echo "$as_me:12538: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12586: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12541: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12589: \$? = $ac_status" >&5
++  echo "$as_me:12544: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -12597,7 +12552,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12600: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:12555: 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"
+@@ -12646,13 +12601,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:12649: checking for initscr" >&5
++	echo "$as_me:12604: 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 12655 "configure"
++#line 12610 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12683,16 +12638,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12686: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12641: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12689: \$? = $ac_status" >&5
++  echo "$as_me:12644: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12692: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12647: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12695: \$? = $ac_status" >&5
++  echo "$as_me:12650: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -12702,18 +12657,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12705: result: $ac_cv_func_initscr" >&5
++echo "$as_me:12660: 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:12712: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:12667: 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 12716 "configure"
++#line 12671 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12725,25 +12680,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12728: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12683: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12731: \$? = $ac_status" >&5
++  echo "$as_me:12686: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12734: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12689: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12737: \$? = $ac_status" >&5
++  echo "$as_me:12692: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:12739: result: yes" >&5
++  echo "$as_me:12694: 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:12746: result: no" >&5
++echo "$as_me:12701: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -12811,11 +12766,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:12814: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:12769: 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 12818 "configure"
++#line 12773 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12827,25 +12782,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12830: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12785: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12833: \$? = $ac_status" >&5
++  echo "$as_me:12788: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12836: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12791: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12839: \$? = $ac_status" >&5
++  echo "$as_me:12794: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:12841: result: yes" >&5
++  echo "$as_me:12796: 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:12848: result: no" >&5
++echo "$as_me:12803: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -12860,7 +12815,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:12863: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:12818: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -12868,7 +12823,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:12871: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:12826: 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
+@@ -12878,7 +12833,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12881 "configure"
++#line 12836 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -12890,23 +12845,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12893: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12848: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12896: \$? = $ac_status" >&5
++  echo "$as_me:12851: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12899: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12854: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12902: \$? = $ac_status" >&5
++  echo "$as_me:12857: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:12904: result: yes" >&5
++  echo "$as_me:12859: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:12909: result: no" >&5
++echo "$as_me:12864: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -12926,7 +12881,7 @@
+ 
+ 	;;
+ (*)
+-	{ { echo "$as_me:12929: error: unexpected screen-value: $cf_cv_screen" >&5
++	{ { echo "$as_me:12884: error: unexpected screen-value: $cf_cv_screen" >&5
+ echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -12965,10 +12920,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:12968: \"$cf_try\"") >&5
++		{ (eval echo "$as_me:12923: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12971: \$? = $ac_status" >&5
++  echo "$as_me:12926: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 		if test -f conftest.out ; then
+ 			cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ 	][ 	]*//" conftest.out`
+@@ -12986,17 +12941,17 @@
+ 
+ cf_cv_timestamp=`date`
+ 
+-echo "$as_me:12989: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
++echo "$as_me:12944: 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:12992: checking if KEY_RESIZE is supported" >&5
++echo "$as_me:12947: checking if KEY_RESIZE is supported" >&5
+ echo $ECHO_N "checking if KEY_RESIZE is supported... $ECHO_C" >&6
+ if test "${cf_cv_curses_resizes+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12999 "configure"
++#line 12954 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -13008,16 +12963,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13011: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12966: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13014: \$? = $ac_status" >&5
++  echo "$as_me:12969: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13017: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12972: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13020: \$? = $ac_status" >&5
++  echo "$as_me:12975: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_curses_resizes=yes
+ else
+@@ -13027,12 +12982,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13030: result: $cf_cv_curses_resizes" >&5
++echo "$as_me:12985: result: $cf_cv_curses_resizes" >&5
+ echo "${ECHO_T}$cf_cv_curses_resizes" >&6
+ cf_cv_enable_sigwinch=0
+ test "$cf_cv_curses_resizes" = yes && cf_cv_enable_sigwinch=1
+ 
+-echo "$as_me:13035: checking if you want to have a library-prefix" >&5
++echo "$as_me:12990: 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.
+@@ -13042,7 +12997,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:13045: result: $with_lib_prefix" >&5
++echo "$as_me:13000: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test "$with_lib_prefix" = auto
+@@ -13080,7 +13035,7 @@
+ 	test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
+ fi
+ 
+-echo "$as_me:13083: checking for default loader flags" >&5
++echo "$as_me:13038: 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=''   ;;
+@@ -13088,13 +13043,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:13091: result: $LD_MODEL" >&5
++echo "$as_me:13046: 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:13097: checking for an rpath option" >&5
++	echo "$as_me:13052: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -13125,12 +13080,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:13128: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:13083: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:13133: checking if we need a space after rpath option" >&5
++		echo "$as_me:13088: 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"
+ 
+@@ -13151,7 +13106,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13154 "configure"
++#line 13109 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -13163,16 +13118,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13166: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13121: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13169: \$? = $ac_status" >&5
++  echo "$as_me:13124: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13172: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13127: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13175: \$? = $ac_status" >&5
++  echo "$as_me:13130: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -13182,7 +13137,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:13185: result: $cf_rpath_space" >&5
++		echo "$as_me:13140: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -13204,7 +13159,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:13207: checking whether to use release or ABI version in shared library file names" >&5
++	echo "$as_me:13162: checking whether to use release or ABI version in shared library file names" >&5
+ echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
+ 
+ # Check whether --with-shlib-version or --without-shlib-version was given.
+@@ -13219,9 +13174,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:13222: result: $withval" >&5
++		echo "$as_me:13177: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:13224: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:13179: 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; }; }
+ 		;;
+@@ -13230,7 +13185,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:13233: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:13188: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -13253,14 +13208,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:13256: checking which $CC option to use" >&5
++		echo "$as_me:13211: 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 13263 "configure"
++#line 13218 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13272,16 +13227,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13275: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13230: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13278: \$? = $ac_status" >&5
++  echo "$as_me:13233: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13281: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13236: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13284: \$? = $ac_status" >&5
++  echo "$as_me:13239: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -13290,7 +13245,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		done
+-		echo "$as_me:13293: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:13248: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -13361,7 +13316,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:13364: checking if ld -search_paths_first works" >&5
++		echo "$as_me:13319: 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
+@@ -13370,7 +13325,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13373 "configure"
++#line 13328 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -13382,16 +13337,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13385: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13340: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13388: \$? = $ac_status" >&5
++  echo "$as_me:13343: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13391: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13346: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13394: \$? = $ac_status" >&5
++  echo "$as_me:13349: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -13402,7 +13357,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:13405: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:13360: 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"
+@@ -13752,7 +13707,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13755 "configure"
++#line 13710 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13764,16 +13719,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13767: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13722: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13770: \$? = $ac_status" >&5
++  echo "$as_me:13725: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13773: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13728: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13776: \$? = $ac_status" >&5
++  echo "$as_me:13731: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -13810,7 +13765,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:13813: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:13768: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -13820,7 +13775,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <
+ int main(int argc, char *argv[])
+ {
+@@ -13832,18 +13787,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:13835: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:13790: 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:13837: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:13792: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13840: \$? = $ac_status" >&5
++  echo "$as_me:13795: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-				echo "$as_me:13842: result: yes" >&5
++				echo "$as_me:13797: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:13846: result: no" >&5
++				echo "$as_me:13801: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -13858,17 +13813,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:13861: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:13816: 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}:13865: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:13820: 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:13871: checking if you want to link sample programs with rpath option" >&5
++	echo "$as_me:13826: 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.
+@@ -13878,7 +13833,7 @@
+ else
+   with_rpath_link=yes
+ fi;
+-	echo "$as_me:13881: result: $with_rpath_link" >&5
++	echo "$as_me:13836: result: $with_rpath_link" >&5
+ echo "${ECHO_T}$with_rpath_link" >&6
+ 	if test "$with_rpath_link" = no
+ 	then
+@@ -13891,7 +13846,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:13894: checking if you want broken-linker support code" >&5
++echo "$as_me:13849: 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.
+@@ -13901,7 +13856,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:13904: result: $with_broken_linker" >&5
++echo "$as_me:13859: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : "${BROKEN_LINKER:=0}"
+@@ -13916,14 +13871,14 @@
+ 
+ # Check to define _XOPEN_SOURCE "automatically"
+ 
+-echo "$as_me:13919: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:13874: 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 13926 "configure"
++#line 13881 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13942,16 +13897,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13945: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13900: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13948: \$? = $ac_status" >&5
++  echo "$as_me:13903: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13951: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13906: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13954: \$? = $ac_status" >&5
++  echo "$as_me:13909: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -13962,7 +13917,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13965: result: $cf_cv_posix_visible" >&5
++echo "$as_me:13920: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -14004,14 +13959,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:14007: checking if this is the GNU C library" >&5
++echo "$as_me:13962: 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 14014 "configure"
++#line 13969 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14030,16 +13985,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14033: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13988: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14036: \$? = $ac_status" >&5
++  echo "$as_me:13991: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14039: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13994: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14042: \$? = $ac_status" >&5
++  echo "$as_me:13997: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -14050,7 +14005,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14053: result: $cf_cv_gnu_library" >&5
++echo "$as_me:14008: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -14058,7 +14013,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:14061: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:14016: 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
+@@ -14070,7 +14025,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14073 "configure"
++#line 14028 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14089,16 +14044,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14092: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14047: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14095: \$? = $ac_status" >&5
++  echo "$as_me:14050: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14098: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14053: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14101: \$? = $ac_status" >&5
++  echo "$as_me:14056: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -14110,12 +14065,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:14113: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:14068: 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:14118: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:14073: 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
+@@ -14220,7 +14175,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14223 "configure"
++#line 14178 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -14240,16 +14195,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14243: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14198: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14246: \$? = $ac_status" >&5
++  echo "$as_me:14201: \$? = $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:14204: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14252: \$? = $ac_status" >&5
++  echo "$as_me:14207: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -14260,7 +14215,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14263: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:14218: 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
+@@ -14269,14 +14224,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:14272: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:14227: 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 14279 "configure"
++#line 14234 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14291,16 +14246,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14294: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14249: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14297: \$? = $ac_status" >&5
++  echo "$as_me:14252: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14300: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14255: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14303: \$? = $ac_status" >&5
++  echo "$as_me:14258: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -14407,7 +14362,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14410 "configure"
++#line 14365 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14422,16 +14377,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14425: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14380: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14428: \$? = $ac_status" >&5
++  echo "$as_me:14383: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14431: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14386: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14434: \$? = $ac_status" >&5
++  echo "$as_me:14389: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -14446,12 +14401,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14449: result: $cf_cv_gnu_source" >&5
++echo "$as_me:14404: 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:14454: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:14409: 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
+@@ -14461,7 +14416,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14464 "configure"
++#line 14419 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14476,16 +14431,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14479: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14434: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14482: \$? = $ac_status" >&5
++  echo "$as_me:14437: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14485: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14440: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14488: \$? = $ac_status" >&5
++  echo "$as_me:14443: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -14496,7 +14451,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14499: result: $cf_cv_default_source" >&5
++echo "$as_me:14454: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -14536,16 +14491,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:14539: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:14494: 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}:14545: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:14500: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14548 "configure"
++#line 14503 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14560,16 +14515,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14563: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14518: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14566: \$? = $ac_status" >&5
++  echo "$as_me:14521: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14569: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14524: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14572: \$? = $ac_status" >&5
++  echo "$as_me:14527: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -14590,7 +14545,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14593 "configure"
++#line 14548 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14605,16 +14560,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14608: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14563: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14611: \$? = $ac_status" >&5
++  echo "$as_me:14566: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14614: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14569: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14617: \$? = $ac_status" >&5
++  echo "$as_me:14572: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -14625,7 +14580,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:14628: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:14583: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -14633,10 +14588,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:14636: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:14591: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14639 "configure"
++#line 14594 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14651,16 +14606,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14654: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14609: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14657: \$? = $ac_status" >&5
++  echo "$as_me:14612: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14660: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14615: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14663: \$? = $ac_status" >&5
++  echo "$as_me:14618: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -14676,7 +14631,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14679: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:14634: 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
+@@ -14793,7 +14748,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:14796: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:14751: 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
+@@ -14825,14 +14780,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:14828: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:14783: 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 14835 "configure"
++#line 14790 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14850,16 +14805,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14853: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14808: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14856: \$? = $ac_status" >&5
++  echo "$as_me:14811: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14859: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14814: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14862: \$? = $ac_status" >&5
++  echo "$as_me:14817: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -14871,7 +14826,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14874 "configure"
++#line 14829 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14889,16 +14844,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14892: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14847: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14895: \$? = $ac_status" >&5
++  echo "$as_me:14850: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14898: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14853: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14901: \$? = $ac_status" >&5
++  echo "$as_me:14856: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -14913,7 +14868,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14916: result: $cf_cv_xopen_source" >&5
++echo "$as_me:14871: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -15073,16 +15028,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:15076: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:15031: 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}:15082: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:15037: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15085 "configure"
++#line 15040 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -15097,16 +15052,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15100: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15055: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15103: \$? = $ac_status" >&5
++  echo "$as_me:15058: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15106: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15061: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15109: \$? = $ac_status" >&5
++  echo "$as_me:15064: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -15127,7 +15082,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15130 "configure"
++#line 15085 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -15142,16 +15097,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15145: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15100: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15148: \$? = $ac_status" >&5
++  echo "$as_me:15103: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15151: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15106: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15154: \$? = $ac_status" >&5
++  echo "$as_me:15109: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -15162,7 +15117,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:15165: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:15120: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -15170,10 +15125,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:15173: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:15128: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15176 "configure"
++#line 15131 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -15188,16 +15143,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15191: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15146: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15194: \$? = $ac_status" >&5
++  echo "$as_me:15149: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15197: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15152: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15200: \$? = $ac_status" >&5
++  echo "$as_me:15155: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -15213,7 +15168,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15216: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:15171: 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
+@@ -15326,10 +15281,10 @@
+ 	if test "$cf_cv_xopen_source" = no ; then
+ 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+ 
+-echo "${as_me:-configure}:15329: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:15284: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15332 "configure"
++#line 15287 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -15347,23 +15302,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15350: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15305: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15353: \$? = $ac_status" >&5
++  echo "$as_me:15308: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15356: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15311: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15359: \$? = $ac_status" >&5
++  echo "$as_me:15314: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-			{ echo "$as_me:15366: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++			{ echo "$as_me:15321: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ 			CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -15386,7 +15341,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}:15389: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15344: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -15398,7 +15353,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}:15401: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:15356: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -15486,7 +15441,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:15489: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:15444: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -15496,7 +15451,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:15499: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:15454: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -15506,7 +15461,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}:15509: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:15464: 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"
+@@ -15518,10 +15473,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:15521: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:15476: 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 15524 "configure"
++#line 15479 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -15536,16 +15491,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15539: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15494: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15542: \$? = $ac_status" >&5
++  echo "$as_me:15497: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15545: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15500: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15548: \$? = $ac_status" >&5
++  echo "$as_me:15503: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -15554,12 +15509,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:15557: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:15512: 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 15562 "configure"
++#line 15517 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -15574,16 +15529,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15577: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15532: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15580: \$? = $ac_status" >&5
++  echo "$as_me:15535: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15583: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15538: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15586: \$? = $ac_status" >&5
++  echo "$as_me:15541: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -15594,19 +15549,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:15597: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:15552: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:15602: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:15557: 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 15609 "configure"
++#line 15564 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -15624,16 +15579,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15627: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15582: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15630: \$? = $ac_status" >&5
++  echo "$as_me:15585: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15633: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15588: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15636: \$? = $ac_status" >&5
++  echo "$as_me:15591: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -15645,7 +15600,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15648 "configure"
++#line 15603 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -15663,16 +15618,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15666: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15621: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15669: \$? = $ac_status" >&5
++  echo "$as_me:15624: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15672: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15627: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15675: \$? = $ac_status" >&5
++  echo "$as_me:15630: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -15687,7 +15642,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15690: result: $cf_cv_xopen_source" >&5
++echo "$as_me:15645: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -15834,13 +15789,13 @@
+ fi
+ fi # cf_cv_posix_visible
+ 
+-echo "$as_me:15837: checking for ANSI C header files" >&5
++echo "$as_me:15792: 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 15843 "configure"
++#line 15798 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -15848,13 +15803,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:15851: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:15806: \"$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:15857: \$? = $ac_status" >&5
++  echo "$as_me:15812: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15876,7 +15831,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 15879 "configure"
++#line 15834 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -15894,7 +15849,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 15897 "configure"
++#line 15852 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -15915,7 +15870,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15918 "configure"
++#line 15873 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -15941,15 +15896,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:15944: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15899: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15947: \$? = $ac_status" >&5
++  echo "$as_me:15902: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:15949: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15904: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15952: \$? = $ac_status" >&5
++  echo "$as_me:15907: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -15962,7 +15917,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:15965: result: $ac_cv_header_stdc" >&5
++echo "$as_me:15920: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -15978,28 +15933,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:15981: checking for $ac_header" >&5
++echo "$as_me:15936: 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 15987 "configure"
++#line 15942 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15993: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15948: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15996: \$? = $ac_status" >&5
++  echo "$as_me:15951: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15999: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15954: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16002: \$? = $ac_status" >&5
++  echo "$as_me:15957: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -16009,7 +15964,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16012: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:15967: 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:15977: checking whether exit is declared" >&5
+ echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
+ if test "${ac_cv_have_decl_exit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16028 "configure"
++#line 15983 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16040,16 +15995,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16043: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15998: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16046: \$? = $ac_status" >&5
++  echo "$as_me:16001: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16049: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16004: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16052: \$? = $ac_status" >&5
++  echo "$as_me:16007: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_have_decl_exit=yes
+ else
+@@ -16059,7 +16014,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16062: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:16017: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+ 
+ # Check whether --enable-largefile or --disable-largefile was given.
+@@ -16069,7 +16024,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:16072: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:16027: 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
+@@ -16081,7 +16036,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 16084 "configure"
++#line 16039 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -16101,16 +16056,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16104: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16059: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16107: \$? = $ac_status" >&5
++  echo "$as_me:16062: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16110: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16065: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16113: \$? = $ac_status" >&5
++  echo "$as_me:16068: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -16120,16 +16075,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16123: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16078: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16126: \$? = $ac_status" >&5
++  echo "$as_me:16081: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16129: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16084: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16132: \$? = $ac_status" >&5
++  echo "$as_me:16087: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -16143,13 +16098,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:16146: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:16101: 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:16152: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:16107: 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
+@@ -16157,7 +16112,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16160 "configure"
++#line 16115 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -16177,16 +16132,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16180: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16135: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16183: \$? = $ac_status" >&5
++  echo "$as_me:16138: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16186: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16141: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16189: \$? = $ac_status" >&5
++  echo "$as_me:16144: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -16195,7 +16150,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16198 "configure"
++#line 16153 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -16216,16 +16171,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16219: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16174: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16222: \$? = $ac_status" >&5
++  echo "$as_me:16177: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16225: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16180: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16228: \$? = $ac_status" >&5
++  echo "$as_me:16183: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -16236,7 +16191,7 @@
+   break
+ done
+ fi
+-echo "$as_me:16239: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:16194: 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
+ 
+@@ -16246,7 +16201,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:16249: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:16204: 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
+@@ -16254,7 +16209,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16257 "configure"
++#line 16212 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -16274,16 +16229,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16277: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16232: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16280: \$? = $ac_status" >&5
++  echo "$as_me:16235: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16283: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16238: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16286: \$? = $ac_status" >&5
++  echo "$as_me:16241: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -16292,7 +16247,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16295 "configure"
++#line 16250 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -16313,16 +16268,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16316: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16271: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16319: \$? = $ac_status" >&5
++  echo "$as_me:16274: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16322: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16277: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16325: \$? = $ac_status" >&5
++  echo "$as_me:16280: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -16333,7 +16288,7 @@
+   break
+ done
+ fi
+-echo "$as_me:16336: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:16291: 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
+ 
+@@ -16346,7 +16301,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:16349: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:16304: 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
+@@ -16354,7 +16309,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16357 "configure"
++#line 16312 "configure"
+ #include "confdefs.h"
+ #include 
+     #include 
+@@ -16369,16 +16324,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16372: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16327: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16375: \$? = $ac_status" >&5
++  echo "$as_me:16330: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16378: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16333: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16381: \$? = $ac_status" >&5
++  echo "$as_me:16336: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -16387,7 +16342,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16390 "configure"
++#line 16345 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -16403,16 +16358,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16406: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16361: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16409: \$? = $ac_status" >&5
++  echo "$as_me:16364: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16412: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16367: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16415: \$? = $ac_status" >&5
++  echo "$as_me:16370: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -16423,7 +16378,7 @@
+   break
+ done
+ fi
+-echo "$as_me:16426: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:16381: 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
+ 
+@@ -16437,13 +16392,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:16440: checking for fseeko" >&5
++echo "$as_me:16395: 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 16446 "configure"
++#line 16401 "configure"
+ #include "confdefs.h"
+ #include 
+                              #include 
+@@ -16457,16 +16412,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16460: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16415: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16463: \$? = $ac_status" >&5
++  echo "$as_me:16418: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16466: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16421: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16469: \$? = $ac_status" >&5
++  echo "$as_me:16424: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -16476,7 +16431,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16479: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:16434: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -16515,14 +16470,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:16518: checking whether to use struct dirent64" >&5
++	echo "$as_me:16473: 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 16525 "configure"
++#line 16480 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -16549,16 +16504,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16552: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16507: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16555: \$? = $ac_status" >&5
++  echo "$as_me:16510: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16558: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16513: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16561: \$? = $ac_status" >&5
++  echo "$as_me:16516: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -16569,7 +16524,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16572: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:16527: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -16579,7 +16534,7 @@
+ 	fi
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:16582: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:16537: 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.
+@@ -16589,7 +16544,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:16592: result: $with_rcs_ids" >&5
++echo "$as_me:16547: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "$with_rcs_ids" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -16599,7 +16554,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:16602: checking if you want to build with function extensions" >&5
++echo "$as_me:16557: 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.
+@@ -16609,7 +16564,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:16612: result: $with_ext_funcs" >&5
++echo "$as_me:16567: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "$with_ext_funcs" = yes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -16627,7 +16582,7 @@
+ fi
+ 
+ ###   use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:16630: checking for extended use of const keyword" >&5
++echo "$as_me:16585: 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.
+@@ -16637,7 +16592,7 @@
+ else
+   with_ext_const=no
+ fi;
+-echo "$as_me:16640: result: $with_ext_const" >&5
++echo "$as_me:16595: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "$with_ext_const" = yes ; then
+@@ -16647,7 +16602,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:16650: checking if you want all development code" >&5
++echo "$as_me:16605: 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.
+@@ -16657,7 +16612,7 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:16660: result: $with_develop" >&5
++echo "$as_me:16615: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###############################################################################
+@@ -16666,7 +16621,7 @@
+ # This is still experimental (20080329), but should ultimately be moved to
+ # the script-block --with-normal, etc.
+ 
+-echo "$as_me:16669: checking if you want to link with the pthread library" >&5
++echo "$as_me:16624: 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.
+@@ -16676,27 +16631,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:16679: result: $with_pthread" >&5
++echo "$as_me:16634: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:16683: checking for pthread.h" >&5
++	echo "$as_me:16638: 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 16689 "configure"
++#line 16644 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16693: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16648: \"$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:16699: \$? = $ac_status" >&5
++  echo "$as_me:16654: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16715,7 +16670,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16718: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:16673: 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
+ 
+@@ -16725,7 +16680,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:16728: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:16683: 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"
+ 
+@@ -16746,7 +16701,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16749 "configure"
++#line 16704 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16763,16 +16718,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16766: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16721: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16769: \$? = $ac_status" >&5
++  echo "$as_me:16724: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16772: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16727: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16775: \$? = $ac_status" >&5
++  echo "$as_me:16730: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -16782,7 +16737,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:16785: result: $with_pthread" >&5
++	    echo "$as_me:16740: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -16810,7 +16765,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:16813: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:16768: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -16819,7 +16774,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16822: checking if you want to use weak-symbols for pthreads" >&5
++echo "$as_me:16777: 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.
+@@ -16829,18 +16784,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-echo "$as_me:16832: result: $use_weak_symbols" >&5
++echo "$as_me:16787: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ if test "$use_weak_symbols" = yes ; then
+ 
+-echo "$as_me:16836: checking if $CC supports weak symbols" >&5
++echo "$as_me:16791: 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 16843 "configure"
++#line 16798 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16866,16 +16821,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16869: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16824: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16872: \$? = $ac_status" >&5
++  echo "$as_me:16827: \$? = $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:16830: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16878: \$? = $ac_status" >&5
++  echo "$as_me:16833: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -16886,7 +16841,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16889: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:16844: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ else
+@@ -16915,13 +16870,13 @@
+ fi
+ 
+ # OpenSUSE is installing ncurses6, using reentrant option.
+-echo "$as_me:16918: checking for _nc_TABSIZE" >&5
++echo "$as_me:16873: 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 16924 "configure"
++#line 16879 "configure"
+ #include "confdefs.h"
+ #define _nc_TABSIZE autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16952,16 +16907,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16955: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16910: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16958: \$? = $ac_status" >&5
++  echo "$as_me:16913: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16961: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16916: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16964: \$? = $ac_status" >&5
++  echo "$as_me:16919: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func__nc_TABSIZE=yes
+ else
+@@ -16971,7 +16926,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16974: result: $ac_cv_func__nc_TABSIZE" >&5
++echo "$as_me:16929: 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
+@@ -16983,7 +16938,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:16986: checking if you want experimental reentrant code" >&5
++echo "$as_me:16941: 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.
+@@ -16993,7 +16948,7 @@
+ else
+   with_reentrant=$assume_reentrant
+ fi;
+-echo "$as_me:16996: result: $with_reentrant" >&5
++echo "$as_me:16951: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "$with_reentrant" = yes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -17016,7 +16971,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:17019: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:16974: 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.
+@@ -17026,7 +16981,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:17029: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:16984: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -17040,7 +16995,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:17043: checking if you want to see long compiling messages" >&5
++echo "$as_me:16998: 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.
+@@ -17074,10 +17029,10 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:17077: result: $enableval" >&5
++echo "$as_me:17032: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+-echo "$as_me:17080: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:17035: 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.
+@@ -17094,17 +17049,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:17097: result: $enable_stdnoreturn" >&5
++echo "$as_me:17052: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:17101: checking for C11 _Noreturn feature" >&5
++echo "$as_me:17056: 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 17107 "configure"
++#line 17062 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17120,16 +17075,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17123: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17078: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17126: \$? = $ac_status" >&5
++  echo "$as_me:17081: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17129: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17084: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17132: \$? = $ac_status" >&5
++  echo "$as_me:17087: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -17140,7 +17095,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17143: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:17098: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -17196,16 +17151,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17199: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17154: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17204: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17159: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17208: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17163: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17244,16 +17199,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17247: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17202: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17252: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17207: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17256: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17211: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17292,23 +17247,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17295: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17250: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17300: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17255: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17304: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17259: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:17311: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:17266: 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.
+@@ -17325,7 +17280,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:17328: result: $enable_warnings" >&5
++echo "$as_me:17283: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -17349,7 +17304,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17352 "configure"
++#line 17307 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17364,26 +17319,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17367: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17322: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17370: \$? = $ac_status" >&5
++  echo "$as_me:17325: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17373: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17328: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17376: \$? = $ac_status" >&5
++  echo "$as_me:17331: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:17379: checking for X11/Xt const-feature" >&5
++echo "$as_me:17334: 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 17386 "configure"
++#line 17341 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -17401,16 +17356,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17404: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17359: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17407: \$? = $ac_status" >&5
++  echo "$as_me:17362: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17410: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17365: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17413: \$? = $ac_status" >&5
++  echo "$as_me:17368: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -17425,7 +17380,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17428: result: $cf_cv_const_x_string" >&5
++echo "$as_me:17383: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -17454,7 +17409,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:17428: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -17486,12 +17441,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17489: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17444: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17492: \$? = $ac_status" >&5
++  echo "$as_me:17447: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17494: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17449: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -17499,7 +17454,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:17502: checking for $CC warning options..." >&5
++	{ echo "$as_me:17457: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -17522,12 +17477,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:17525: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17480: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17528: \$? = $ac_status" >&5
++  echo "$as_me:17483: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17530: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17485: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -17535,7 +17490,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17538: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17493: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17545,7 +17500,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17548: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17503: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17578,10 +17533,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:17581: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:17536: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -17631,12 +17586,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:17634: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17589: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17637: \$? = $ac_status" >&5
++  echo "$as_me:17592: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17639: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:17594: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -17704,7 +17659,7 @@
+ fi
+ 
+ ###	use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:17707: checking if you want to enable runtime assertions" >&5
++echo "$as_me:17662: 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.
+@@ -17714,7 +17669,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:17717: result: $with_assertions" >&5
++echo "$as_me:17672: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -17767,7 +17722,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17770: checking whether to add trace feature to all models" >&5
++echo "$as_me:17725: 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.
+@@ -17777,7 +17732,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:17780: result: $cf_with_trace" >&5
++echo "$as_me:17735: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "$cf_with_trace" = yes ; then
+@@ -17791,7 +17746,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:17794: checking if we want to use GNAT projects" >&5
++echo "$as_me:17749: 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.
+@@ -17808,21 +17763,21 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:17811: result: $enable_gnat_projects" >&5
++echo "$as_me:17766: 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:17818: checking if ssp library is needed" >&5
++echo "$as_me:17773: 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 17825 "configure"
++#line 17780 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17839,16 +17794,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17842: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17797: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17845: \$? = $ac_status" >&5
++  echo "$as_me:17800: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17848: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17803: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17851: \$? = $ac_status" >&5
++  echo "$as_me:17806: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -17858,7 +17813,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17861 "configure"
++#line 17816 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17875,16 +17830,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17878: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17833: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17881: \$? = $ac_status" >&5
++  echo "$as_me:17836: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17884: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17839: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17887: \$? = $ac_status" >&5
++  echo "$as_me:17842: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -17898,7 +17853,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17901: result: $cf_cv_need_libssp" >&5
++echo "$as_me:17856: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -17926,13 +17881,13 @@
+ (*)
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:17929: checking for clock_gettime" >&5
++echo "$as_me:17884: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17935 "configure"
++#line 17890 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17963,16 +17918,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17966: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17921: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17969: \$? = $ac_status" >&5
++  echo "$as_me:17924: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17972: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17927: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17975: \$? = $ac_status" >&5
++  echo "$as_me:17930: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -17982,12 +17937,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17985: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:17940: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:17990: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:17945: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17995,7 +17950,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17998 "configure"
++#line 17953 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18014,16 +17969,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18017: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17972: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18020: \$? = $ac_status" >&5
++  echo "$as_me:17975: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18023: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17978: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18026: \$? = $ac_status" >&5
++  echo "$as_me:17981: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -18034,7 +17989,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18037: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:17992: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -18046,14 +18001,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:18049: checking if clock_gettime links" >&5
++echo "$as_me:18004: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18056 "configure"
++#line 18011 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -18071,16 +18026,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18074: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18029: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18077: \$? = $ac_status" >&5
++  echo "$as_me:18032: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18080: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18035: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18083: \$? = $ac_status" >&5
++  echo "$as_me:18038: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -18091,7 +18046,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:18094: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:18049: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -18105,13 +18060,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:18108: checking for gettimeofday" >&5
++echo "$as_me:18063: 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 18114 "configure"
++#line 18069 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18142,16 +18097,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18145: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18100: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18148: \$? = $ac_status" >&5
++  echo "$as_me:18103: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18151: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18106: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18154: \$? = $ac_status" >&5
++  echo "$as_me:18109: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -18161,7 +18116,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18164: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:18119: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -18171,7 +18126,7 @@
+ 
+ else
+ 
+-echo "$as_me:18174: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:18129: 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
+@@ -18179,7 +18134,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18182 "configure"
++#line 18137 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18198,16 +18153,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18201: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18156: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18204: \$? = $ac_status" >&5
++  echo "$as_me:18159: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18207: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18162: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18210: \$? = $ac_status" >&5
++  echo "$as_me:18165: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -18218,7 +18173,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18221: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:18176: 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
+ 
+@@ -18251,13 +18206,13 @@
+ esac
+ 
+ ###	Checks for header files.
+-echo "$as_me:18254: checking for signed char" >&5
++echo "$as_me:18209: 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 18260 "configure"
++#line 18215 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -18272,16 +18227,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18275: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18230: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18278: \$? = $ac_status" >&5
++  echo "$as_me:18233: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18281: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18236: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18284: \$? = $ac_status" >&5
++  echo "$as_me:18239: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -18291,10 +18246,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18294: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:18249: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:18297: checking size of signed char" >&5
++echo "$as_me:18252: 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
+@@ -18303,7 +18258,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18306 "configure"
++#line 18261 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -18315,21 +18270,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18318: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18273: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18321: \$? = $ac_status" >&5
++  echo "$as_me:18276: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18324: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18279: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18327: \$? = $ac_status" >&5
++  echo "$as_me:18282: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18332 "configure"
++#line 18287 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -18341,16 +18296,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18344: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18299: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18347: \$? = $ac_status" >&5
++  echo "$as_me:18302: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18350: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18305: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18353: \$? = $ac_status" >&5
++  echo "$as_me:18308: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -18366,7 +18321,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18369 "configure"
++#line 18324 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -18378,16 +18333,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18381: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18336: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18384: \$? = $ac_status" >&5
++  echo "$as_me:18339: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18387: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18342: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18390: \$? = $ac_status" >&5
++  echo "$as_me:18345: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -18403,7 +18358,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 18406 "configure"
++#line 18361 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -18415,16 +18370,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18418: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18373: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18421: \$? = $ac_status" >&5
++  echo "$as_me:18376: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18424: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18379: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18427: \$? = $ac_status" >&5
++  echo "$as_me:18382: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -18437,12 +18392,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:18440: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:18395: 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 18445 "configure"
++#line 18400 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -18458,15 +18413,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:18461: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18416: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18464: \$? = $ac_status" >&5
++  echo "$as_me:18419: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:18466: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18421: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18469: \$? = $ac_status" >&5
++  echo "$as_me:18424: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -18482,7 +18437,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:18485: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:18440: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:18449: 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 18500 "configure"
++#line 18455 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -18512,16 +18467,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18515: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18470: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18518: \$? = $ac_status" >&5
++  echo "$as_me:18473: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18521: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18476: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18524: \$? = $ac_status" >&5
++  echo "$as_me:18479: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -18531,7 +18486,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18534: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18489: 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:18502: 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
+@@ -18552,7 +18507,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18555 "configure"
++#line 18510 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18571,16 +18526,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18574: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18529: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18577: \$? = $ac_status" >&5
++  echo "$as_me:18532: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18580: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18535: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18583: \$? = $ac_status" >&5
++  echo "$as_me:18538: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -18591,14 +18546,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18594: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:18549: 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:18601: checking for opendir in -lx" >&5
++  echo "$as_me:18556: 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
+@@ -18606,7 +18561,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18609 "configure"
++#line 18564 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18625,16 +18580,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18628: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18583: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18631: \$? = $ac_status" >&5
++  echo "$as_me:18586: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18634: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18589: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18637: \$? = $ac_status" >&5
++  echo "$as_me:18592: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -18645,7 +18600,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18648: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:18603: 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"
+@@ -18653,13 +18608,13 @@
+ 
+ fi
+ 
+-echo "$as_me:18656: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:18611: 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 18662 "configure"
++#line 18617 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -18675,16 +18630,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18678: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18633: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18681: \$? = $ac_status" >&5
++  echo "$as_me:18636: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18684: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18639: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18687: \$? = $ac_status" >&5
++  echo "$as_me:18642: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -18694,7 +18649,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18697: result: $ac_cv_header_time" >&5
++echo "$as_me:18652: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -18712,13 +18667,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:18715: checking for an ANSI C-conforming const" >&5
++echo "$as_me:18670: 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 18721 "configure"
++#line 18676 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18780,16 +18735,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18783: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18738: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18786: \$? = $ac_status" >&5
++  echo "$as_me:18741: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18789: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18744: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18792: \$? = $ac_status" >&5
++  echo "$as_me:18747: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -18799,7 +18754,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18802: result: $ac_cv_c_const" >&5
++echo "$as_me:18757: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -18811,7 +18766,7 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:18814: checking if data-only library module links" >&5
++echo "$as_me:18769: 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
+@@ -18819,20 +18774,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:18780: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18828: \$? = $ac_status" >&5
++  echo "$as_me:18783: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+ 		mv conftest.$OBJEXT data.$OBJEXT && \
+ 		( $AR $ARFLAGS conftest.a data.$OBJEXT ) 2>&5 1>/dev/null
+ 	fi
+ 	rm -f conftest.$ac_ext data.$OBJEXT
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:18807: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18855: \$? = $ac_status" >&5
++  echo "$as_me:18810: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.$OBJEXT func.$OBJEXT && \
+ 		( $AR $ARFLAGS conftest.a func.$OBJEXT ) 2>&5 1>/dev/null
+@@ -18865,7 +18820,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18868 "configure"
++#line 18823 "configure"
+ #include "confdefs.h"
+ 
+ 	extern int testfunc(void);
+@@ -18876,15 +18831,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:18879: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18834: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18882: \$? = $ac_status" >&5
++  echo "$as_me:18837: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:18884: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18839: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18887: \$? = $ac_status" >&5
++  echo "$as_me:18842: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -18899,7 +18854,7 @@
+ 
+ fi
+ 
+-echo "$as_me:18902: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:18857: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -18918,23 +18873,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18921: checking for $ac_header" >&5
++echo "$as_me:18876: 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 18927 "configure"
++#line 18882 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18931: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18886: \"$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:18937: \$? = $ac_status" >&5
++  echo "$as_me:18892: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18953,7 +18908,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18956: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18911: 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:18921: 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
+@@ -18974,7 +18929,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18977 "configure"
++#line 18932 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -19009,15 +18964,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:19012: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18967: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19015: \$? = $ac_status" >&5
++  echo "$as_me:18970: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:19017: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18972: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19020: \$? = $ac_status" >&5
++  echo "$as_me:18975: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -19032,16 +18987,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:19035: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:18990: 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:19038: checking for mkstemp" >&5
++	echo "$as_me:18993: 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 19044 "configure"
++#line 18999 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19072,16 +19027,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19075: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19030: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19078: \$? = $ac_status" >&5
++  echo "$as_me:19033: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19081: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19036: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19084: \$? = $ac_status" >&5
++  echo "$as_me:19039: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -19091,7 +19046,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19094: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:19049: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -19112,7 +19067,7 @@
+ if test "$cf_with_ada" != "no" ; then
+ 	if test	"$cf_cv_prog_gnat_correct" = yes; then
+ 
+-	echo "$as_me:19115: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:19070: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -19129,10 +19084,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:19132: result: $ADAFLAGS" >&5
++	echo "$as_me:19087: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:19135: checking if GNATPREP supports -T option" >&5
++echo "$as_me:19090: 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
+@@ -19142,11 +19097,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:19145: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:19100: 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:19149: checking if GNAT supports generics" >&5
++echo "$as_me:19104: 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])
+@@ -19156,7 +19111,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:19159: result: $cf_gnat_generics" >&5
++echo "$as_me:19114: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -19168,7 +19123,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:19171: checking if GNAT supports SIGINT" >&5
++echo "$as_me:19126: 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
+@@ -19216,7 +19171,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:19219: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:19174: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -19229,7 +19184,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:19232: checking if GNAT supports project files" >&5
++echo "$as_me:19187: 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]*)
+@@ -19292,15 +19247,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:19295: result: $cf_gnat_projects" >&5
++echo "$as_me:19250: 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:19301: checking if GNAT supports libraries" >&5
++	echo "$as_me:19256: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:19303: result: $cf_gnat_libraries" >&5
++	echo "$as_me:19258: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -19320,7 +19275,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:19323: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:19278: 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
+@@ -19332,7 +19287,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:19335: checking for Ada95 compiler" >&5
++echo "$as_me:19290: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -19343,12 +19298,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:19346: result: $cf_ada_compiler" >&5
++echo "$as_me:19301: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 		cf_ada_package=terminal_interface
+ 
+-echo "$as_me:19351: checking for Ada95 include directory" >&5
++echo "$as_me:19306: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -19382,7 +19337,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:19385: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:19340: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -19391,10 +19346,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:19394: result: $ADA_INCLUDE" >&5
++echo "$as_me:19349: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:19397: checking for Ada95 object directory" >&5
++echo "$as_me:19352: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -19428,7 +19383,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:19431: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:19386: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -19437,10 +19392,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:19440: result: $ADA_OBJECTS" >&5
++echo "$as_me:19395: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:19443: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:19398: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -19461,11 +19416,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:19464: result: $with_ada_sharedlib" >&5
++echo "$as_me:19419: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+-	{ echo "$as_me:19468: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++	{ echo "$as_me:19423: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+ 
+@@ -19483,7 +19438,7 @@
+ 
+ 		# allow the Ada binding to be renamed
+ 
+-echo "$as_me:19486: checking for Ada95 curses library name" >&5
++echo "$as_me:19441: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -19499,16 +19454,16 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19502: result: $ADA_LIBNAME" >&5
++echo "$as_me:19457: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 	else
+-		{ { echo "$as_me:19506: error: No usable Ada compiler found" >&5
++		{ { echo "$as_me:19461: 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:19511: error: The Ada compiler is needed for this package" >&5
++	{ { echo "$as_me:19466: 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
+@@ -19548,7 +19503,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:19551: checking default library suffix" >&5
++echo "$as_me:19506: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -19559,10 +19514,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:19562: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:19517: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:19565: checking default library-dependency suffix" >&5
++echo "$as_me:19520: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -19645,10 +19600,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:19648: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:19603: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:19651: checking default object directory" >&5
++echo "$as_me:19606: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -19664,7 +19619,7 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:19667: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:19622: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ ### Set up low-level terminfo dependencies for makefiles.
+@@ -19806,7 +19761,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:19809: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:19764: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -19987,7 +19942,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:19990: error: ambiguous option: $1
++    { { echo "$as_me:19945: 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;}
+@@ -20006,7 +19961,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:20009: error: unrecognized option: $1
++  -*) { { echo "$as_me:19964: 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;}
+@@ -20081,7 +20036,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:20084: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:20039: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -20217,7 +20172,6 @@
+ s,@ETAGS@,$ETAGS,;t t
+ s,@MAKE_LOWER_TAGS@,$MAKE_LOWER_TAGS,;t t
+ s,@MAKE_UPPER_TAGS@,$MAKE_UPPER_TAGS,;t t
+-s,@cf_cv_makeflags@,$cf_cv_makeflags,;t t
+ s,@RANLIB@,$RANLIB,;t t
+ s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+ s,@LD@,$LD,;t t
+@@ -20446,7 +20400,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:20449: creating $ac_file" >&5
++    { echo "$as_me:20403: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -20464,7 +20418,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:20467: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:20421: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -20477,7 +20431,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:20480: error: cannot find input file: $f" >&5
++           { { echo "$as_me:20434: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -20493,7 +20447,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:20496: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:20450: 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;}
+@@ -20502,7 +20456,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:20505: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:20459: 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;}
+@@ -20547,7 +20501,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:20550: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:20504: 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;}
+@@ -20558,7 +20512,7 @@
+     $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:20561: WARNING: Some variables may not be substituted:
++      { echo "$as_me:20515: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -20607,7 +20561,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:20610: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:20564: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -20618,7 +20572,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:20621: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:20575: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -20631,7 +20585,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:20634: error: cannot find input file: $f" >&5
++           { { echo "$as_me:20588: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -20689,7 +20643,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:20692: $ac_file is unchanged" >&5
++      { echo "$as_me:20646: $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.94 
+--- ncurses-6.5-20250712+/Ada95/configure.in	2024-08-11 00:22:07.000000000 +0000
++++ ncurses-6.5-20250720/Ada95/configure.in	2025-07-19 16:39:35.000000000 +0000
+@@ -1,5 +1,5 @@
+ dnl***************************************************************************
+-dnl Copyright 2018-2023,2024 Thomas E. Dickey                                *
++dnl Copyright 2018-2024,2025 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.94 2024/08/11 00:22:07 tom Exp $
++dnl $Id: configure.in,v 1.95 2025/07/19 16:39:35 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.94 $)
++AC_REVISION($Revision: 1.95 $)
+ AC_INIT(gen/gen.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -106,7 +106,6 @@
+ AC_PROG_MAKE_SET
+ CF_MAKE_PHONY
+ CF_MAKE_TAGS
+-CF_MAKEFLAGS
+ 
+ dnl These are standard among *NIX systems, but not when cross-compiling
+ AC_CHECK_TOOL(RANLIB, ranlib, ':')
+Index: Ada95/src/Makefile.in
+Prereq:  1.100 
+--- ncurses-6.5-20250712+/Ada95/src/Makefile.in	2025-07-12 10:40:39.000000000 +0000
++++ ncurses-6.5-20250720/Ada95/src/Makefile.in	2025-07-13 09:05:41.000000000 +0000
+@@ -29,7 +29,7 @@
+ #
+ #  Author:  Juergen Pfeifer, 1996
+ #
+-#  $Id: Makefile.in,v 1.100 2025/07/12 10:40:39 tom Exp $
++#  $Id: Makefile.in,v 1.101 2025/07/13 09:05:41 tom Exp $
+ #
+ .SUFFIXES:
+ 
+@@ -37,7 +37,7 @@
+ VPATH		= @srcdir@
+ THIS		= Makefile
+ 
+-ADA_MFLAGS 	= 
++ADA_MFLAGS 	=
+ @SET_MAKE@
+ 
+ MODEL		= ../../@DFT_OBJ_SUBDIR@
+Index: INSTALL
+Prereq:  1.258 
+--- ncurses-6.5-20250712+/INSTALL	2024-12-28 21:37:40.000000000 +0000
++++ ncurses-6.5-20250720/INSTALL	2025-07-13 09:08:38.000000000 +0000
+@@ -1,5 +1,5 @@
+ -------------------------------------------------------------------------------
+--- Copyright 2018-2023,2024 Thomas E. Dickey                                 --
++-- Copyright 2018-2024,2025 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: INSTALL,v 1.258 2024/12/28 21:37:40 Branden.Robinson Exp $
++-- $Id: INSTALL,v 1.260 2025/07/13 09:08:38 tom Exp $
+ ---------------------------------------------------------------------
+              How to install Ncurses/Terminfo on your system
+ ---------------------------------------------------------------------
+@@ -1189,11 +1189,11 @@
+     --with-pkg-config-libdir[=DIR]
+ 	If pkg-config was found, override the automatic check for its library
+ 	path.  The optional DIR value can be
+-	
++
+ 	"auto", automatically use pkg-config's library directory, or
+-	
++
+ 	"libdir", use a ${libdir}/pkgconfig (based on the configuration), or
+-	
++
+ 	a directory path, i.e., beginning with "/".
+ 
+ 	The configure script allows only a single directory, because
+Index: NEWS
+Prereq:  1.4314 
+--- ncurses-6.5-20250712+/NEWS	2025-07-12 22:55:35.000000000 +0000
++++ ncurses-6.5-20250720/NEWS	2025-07-20 09:03:59.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.4314 2025/07/12 22:55:35 tom Exp $
++-- $Id: NEWS,v 1.4317 2025/07/20 09:03:59 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.
+ 
++20250720
++	+ further improve readability of header-files
++	+ add a consistency-check for termio(s)/tty headers, to help with
++	  cross-compiles (report by Stas Sergeev).
++	+ remove some unused configure-macros
++	+ add xterm+keypad to pccon+base -TD
++	+ trim trailing blanks from a few files (report by Stas Sergeev).
++
+ 20250712
+ 	+ improve readability of term.h
+ 	+ modify recursive make rules to avoid interference with GNU make's
+Index: VERSION
+--- ncurses-6.5-20250712+/VERSION	2025-07-12 09:16:32.000000000 +0000
++++ ncurses-6.5-20250720/VERSION	2025-07-20 09:03:59.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.5	20250712
++5:0:10	6.5	20250720
+Index: aclocal.m4
+Prereq:  1.1110 
+--- ncurses-6.5-20250712+/aclocal.m4	2025-07-12 16:15:49.000000000 +0000
++++ ncurses-6.5-20250720/aclocal.m4	2025-07-19 16:19:51.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1110 2025/07/12 16:15:49 tom Exp $
++dnl $Id: aclocal.m4,v 1.1111 2025/07/19 16:19:51 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -5610,53 +5610,6 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_MAKEFLAGS version: 22 updated: 2025/07/05 16:17:37
+-dnl ------------
+-dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
+-dnl options to lower-levels.  It is very useful for "make -n" -- if we have it.
+-dnl POSIX accommodates both by pretending they are the same variable, adding
+-dnl the behavior of the latter to the former.
+-AC_DEFUN([CF_MAKEFLAGS],
+-[AC_REQUIRE([AC_PROG_FGREP])dnl
+-
+-AC_CACHE_CHECK(for makeflags variable, cf_cv_makeflags,[
+-	cf_save_makeflags="$MAKEFLAGS"; unset MAKEFLAGS
+-	cf_save_mflags="$MFLAGS";       unset MFLAGS
+-	cf_cv_makeflags=''
+-	for cf_option in '-${MAKEFLAGS}' '${MFLAGS}'
+-	do
+-		cat >cf_makeflags.tmp </dev/null | ${FGREP-fgrep} -v "ing directory" | sed -e 's,[[ 	]]*$,,'`
+-		case "$cf_result" in
+-		(.*k|.*kw)
+-			cf_result="`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`"
+-			case "$cf_result" in
+-			(.*CC=*)	cf_cv_makeflags=
+-				;;
+-			(*)	cf_cv_makeflags=$cf_option
+-				;;
+-			esac
+-			break
+-			;;
+-		(.-)
+-			;;
+-		(*)
+-			CF_MSG_LOG(given option \"$cf_option\", no match \"$cf_result\")
+-			;;
+-		esac
+-	done
+-	test -n "$cf_save_makeflags" && MAKEFLAGS="$cf_save_makeflags"
+-	test -n "$cf_save_mflags"    && MFLAGS="$cf_save_mflags"
+-	rm -f cf_makeflags.tmp
+-])
+-
+-AC_SUBST(cf_cv_makeflags)
+-])dnl
+-dnl ---------------------------------------------------------------------------
+ dnl CF_MAKE_PHONY version: 3 updated: 2021/01/08 16:08:21
+ dnl -------------
+ dnl Check if the make-program handles a ".PHONY" target, e.g,. a target which
+Index: configure
+--- ncurses-6.5-20250712+/configure	2025-07-12 16:44:54.000000000 +0000
++++ ncurses-6.5-20250720/configure	2025-07-19 17:00:40.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.799 .
++# From configure.in Revision: 1.801 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20250126.
+ #
+@@ -5021,55 +5021,10 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:5024: 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
+-else
+-
+-	cf_save_makeflags="$MAKEFLAGS"; unset MAKEFLAGS
+-	cf_save_mflags="$MFLAGS";       unset MFLAGS
+-	cf_cv_makeflags=''
+-	for cf_option in '-${MAKEFLAGS}' '${MFLAGS}'
+-	do
+-		cat >cf_makeflags.tmp </dev/null | ${FGREP-fgrep} -v "ing directory" | sed -e 's,[ 	]*$,,'`
+-		case "$cf_result" in
+-		(.*k|.*kw)
+-			cf_result="`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`"
+-			case "$cf_result" in
+-			(.*CC=*)	cf_cv_makeflags=
+-				;;
+-			(*)	cf_cv_makeflags=$cf_option
+-				;;
+-			esac
+-			break
+-			;;
+-		(.-)
+-			;;
+-		(*)
+-
+-echo "${as_me:-configure}:5056: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+-
+-			;;
+-		esac
+-	done
+-	test -n "$cf_save_makeflags" && MAKEFLAGS="$cf_save_makeflags"
+-	test -n "$cf_save_mflags"    && MFLAGS="$cf_save_mflags"
+-	rm -f cf_makeflags.tmp
+-
+-fi
+-echo "$as_me:5066: 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:5072: checking for $ac_word" >&5
++echo "$as_me:5027: 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
+@@ -5084,7 +5039,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:5087: found $ac_dir/$ac_word" >&5
++echo "$as_me:5042: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5092,10 +5047,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:5095: result: $RANLIB" >&5
++  echo "$as_me:5050: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:5098: result: no" >&5
++  echo "$as_me:5053: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5104,7 +5059,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:5107: checking for $ac_word" >&5
++echo "$as_me:5062: 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
+@@ -5119,7 +5074,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:5122: found $ac_dir/$ac_word" >&5
++echo "$as_me:5077: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5128,10 +5083,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:5131: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:5086: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:5134: result: no" >&5
++  echo "$as_me:5089: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5143,7 +5098,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:5146: checking for $ac_word" >&5
++echo "$as_me:5101: 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
+@@ -5158,7 +5113,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:5161: found $ac_dir/$ac_word" >&5
++echo "$as_me:5116: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5166,10 +5121,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:5169: result: $LD" >&5
++  echo "$as_me:5124: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:5172: result: no" >&5
++  echo "$as_me:5127: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5178,7 +5133,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:5181: checking for $ac_word" >&5
++echo "$as_me:5136: 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
+@@ -5193,7 +5148,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:5196: found $ac_dir/$ac_word" >&5
++echo "$as_me:5151: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5202,10 +5157,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:5205: result: $ac_ct_LD" >&5
++  echo "$as_me:5160: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:5208: result: no" >&5
++  echo "$as_me:5163: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5217,7 +5172,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:5220: 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_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5232,7 +5187,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:5235: found $ac_dir/$ac_word" >&5
++echo "$as_me:5190: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5240,10 +5195,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:5243: result: $AR" >&5
++  echo "$as_me:5198: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:5246: result: no" >&5
++  echo "$as_me:5201: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5252,7 +5207,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:5255: checking for $ac_word" >&5
++echo "$as_me:5210: 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
+@@ -5267,7 +5222,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:5270: found $ac_dir/$ac_word" >&5
++echo "$as_me:5225: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5276,10 +5231,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:5279: result: $ac_ct_AR" >&5
++  echo "$as_me:5234: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:5282: result: no" >&5
++  echo "$as_me:5237: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5291,7 +5246,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:5294: checking for $ac_word" >&5
++echo "$as_me:5249: 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
+@@ -5306,7 +5261,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:5309: found $ac_dir/$ac_word" >&5
++echo "$as_me:5264: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5314,10 +5269,10 @@
+ fi
+ NM=$ac_cv_prog_NM
+ if test -n "$NM"; then
+-  echo "$as_me:5317: result: $NM" >&5
++  echo "$as_me:5272: result: $NM" >&5
+ echo "${ECHO_T}$NM" >&6
+ else
+-  echo "$as_me:5320: result: no" >&5
++  echo "$as_me:5275: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5326,7 +5281,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:5329: checking for $ac_word" >&5
++echo "$as_me:5284: 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
+@@ -5341,7 +5296,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:5344: found $ac_dir/$ac_word" >&5
++echo "$as_me:5299: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5350,10 +5305,10 @@
+ fi
+ ac_ct_NM=$ac_cv_prog_ac_ct_NM
+ if test -n "$ac_ct_NM"; then
+-  echo "$as_me:5353: result: $ac_ct_NM" >&5
++  echo "$as_me:5308: result: $ac_ct_NM" >&5
+ echo "${ECHO_T}$ac_ct_NM" >&6
+ else
+-  echo "$as_me:5356: result: no" >&5
++  echo "$as_me:5311: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5365,7 +5320,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:5368: checking for $ac_word" >&5
++echo "$as_me:5323: 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
+@@ -5380,7 +5335,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:5383: found $ac_dir/$ac_word" >&5
++echo "$as_me:5338: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5388,10 +5343,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:5391: result: $AR" >&5
++  echo "$as_me:5346: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:5394: result: no" >&5
++  echo "$as_me:5349: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5400,7 +5355,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:5403: checking for $ac_word" >&5
++echo "$as_me:5358: 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
+@@ -5415,7 +5370,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:5418: found $ac_dir/$ac_word" >&5
++echo "$as_me:5373: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5424,10 +5379,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:5427: result: $ac_ct_AR" >&5
++  echo "$as_me:5382: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:5430: result: no" >&5
++  echo "$as_me:5385: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5436,7 +5391,7 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-echo "$as_me:5439: checking for options to update archives" >&5
++echo "$as_me:5394: 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
+@@ -5473,13 +5428,13 @@
+ 			rm -f conftest.a
+ 
+ 			cat >"conftest.$ac_ext" <&5
++			if { (eval echo "$as_me:5434: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5482: \$? = $ac_status" >&5
++  echo "$as_me:5437: \$? = $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
+@@ -5490,7 +5445,7 @@
+ 			else
+ 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-echo "${as_me:-configure}:5493: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:5448: testing cannot compile test-program ..." 1>&5
+ 
+ 				break
+ 			fi
+@@ -5500,7 +5455,7 @@
+ 	esac
+ 
+ fi
+-echo "$as_me:5503: result: $cf_cv_ar_flags" >&5
++echo "$as_me:5458: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+ if test -n "$ARFLAGS" ; then
+@@ -5511,7 +5466,7 @@
+ 	ARFLAGS=$cf_cv_ar_flags
+ fi
+ 
+-echo "$as_me:5514: checking for an installation directory prefix" >&5
++echo "$as_me:5469: checking for an installation directory prefix" >&5
+ echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-install-prefix or --without-install-prefix was given.
+@@ -5524,10 +5479,10 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:5527: result: ${DESTDIR:-(none)}" >&5
++echo "$as_me:5482: result: ${DESTDIR:-(none)}" >&5
+ echo "${ECHO_T}${DESTDIR:-(none)}" >&6
+ 
+-echo "$as_me:5530: checking if installation directory prefix should be merged" >&5
++echo "$as_me:5485: checking if installation directory prefix should be merged" >&5
+ echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6
+ 
+ # Check whether --enable-install-prefix or --disable-install-prefix was given.
+@@ -5544,7 +5499,7 @@
+ 	cf_install_prefix=no
+ 
+ fi;
+-echo "$as_me:5547: result: $cf_install_prefix" >&5
++echo "$as_me:5502: result: $cf_install_prefix" >&5
+ echo "${ECHO_T}$cf_install_prefix" >&6
+ 
+ if test "$cf_install_prefix" = yes ; then
+@@ -5585,7 +5540,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:5588: checking for $ac_word" >&5
++echo "$as_me:5543: 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
+@@ -5600,7 +5555,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:5603: found $ac_dir/$ac_word" >&5
++echo "$as_me:5558: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5608,10 +5563,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:5611: result: $BUILD_CC" >&5
++  echo "$as_me:5566: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:5614: result: no" >&5
++  echo "$as_me:5569: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5620,12 +5575,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+ 
+ fi;
+-	echo "$as_me:5623: checking for native build C compiler" >&5
++	echo "$as_me:5578: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:5625: result: $BUILD_CC" >&5
++	echo "$as_me:5580: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:5628: checking for native build C preprocessor" >&5
++	echo "$as_me:5583: 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.
+@@ -5635,10 +5590,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:5638: result: $BUILD_CPP" >&5
++	echo "$as_me:5593: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:5641: checking for native build C flags" >&5
++	echo "$as_me:5596: 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.
+@@ -5646,10 +5601,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:5649: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:5604: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:5652: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:5607: 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.
+@@ -5657,10 +5612,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:5660: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:5615: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:5663: checking for native build linker-flags" >&5
++	echo "$as_me:5618: 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.
+@@ -5668,10 +5623,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:5671: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:5626: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:5674: checking for native build linker-libraries" >&5
++	echo "$as_me:5629: 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.
+@@ -5679,7 +5634,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:5682: result: $BUILD_LIBS" >&5
++	echo "$as_me:5637: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -5688,7 +5643,7 @@
+ 
+ 	: ${BUILD_CC:='${CC}'}
+ 
+-	echo "$as_me:5691: checking if the build-compiler \"$BUILD_CC\" works" >&5
++	echo "$as_me:5646: checking if the build-compiler \"$BUILD_CC\" works" >&5
+ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
+ 
+ 	cf_save_crossed=$cross_compiling
+@@ -5702,7 +5657,7 @@
+   cf_ok_build_cc=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5705 "configure"
++#line 5660 "configure"
+ #include "confdefs.h"
+ #include 
+ 		int main(int argc, char *argv[])
+@@ -5712,15 +5667,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:5715: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5670: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5718: \$? = $ac_status" >&5
++  echo "$as_me:5673: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:5720: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5675: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5723: \$? = $ac_status" >&5
++  echo "$as_me:5678: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_ok_build_cc=yes
+ else
+@@ -5735,12 +5690,12 @@
+ 	cross_compiling=$cf_save_crossed
+ 	ac_link=$cf_save_ac_link
+ 
+-	echo "$as_me:5738: result: $cf_ok_build_cc" >&5
++	echo "$as_me:5693: result: $cf_ok_build_cc" >&5
+ echo "${ECHO_T}$cf_ok_build_cc" >&6
+ 
+ 	if test "$cf_ok_build_cc" != yes
+ 	then
+-		{ { echo "$as_me:5743: error: Cross-build requires two compilers.
++		{ { echo "$as_me:5698: 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;}
+@@ -5765,7 +5720,7 @@
+ ### shared, for example.
+ cf_list_models=""
+ 
+-echo "$as_me:5768: checking if libtool -version-number should be used" >&5
++echo "$as_me:5723: 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.
+@@ -5782,7 +5737,7 @@
+ 	cf_libtool_version=yes
+ 
+ fi;
+-echo "$as_me:5785: result: $cf_libtool_version" >&5
++echo "$as_me:5740: result: $cf_libtool_version" >&5
+ echo "${ECHO_T}$cf_libtool_version" >&6
+ 
+ if test "$cf_libtool_version" = yes ; then
+@@ -5791,25 +5746,25 @@
+ 	LIBTOOL_VERSION="-version-info"
+ 	case "x$VERSION" in
+ 	(x)
+-		{ echo "$as_me:5794: WARNING: VERSION was not set" >&5
++		{ echo "$as_me:5749: 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}:5801: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5756: 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}:5808: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5763: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:5812: WARNING: unexpected VERSION value: $VERSION" >&5
++		{ echo "$as_me:5767: WARNING: unexpected VERSION value: $VERSION" >&5
+ echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
+ 		;;
+ 	esac
+@@ -5831,7 +5786,7 @@
+ LIB_INSTALL=
+ LIB_UNINSTALL=
+ 
+-echo "$as_me:5834: checking if you want to build libraries with libtool" >&5
++echo "$as_me:5789: 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.
+@@ -5841,7 +5796,7 @@
+ else
+   with_libtool=no
+ fi;
+-echo "$as_me:5844: result: $with_libtool" >&5
++echo "$as_me:5799: result: $with_libtool" >&5
+ echo "${ECHO_T}$with_libtool" >&6
+ if test "$with_libtool" != "no"; then
+ 
+@@ -5870,7 +5825,7 @@
+ 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:5873: error: expected a pathname, not \"$with_libtool\"" >&5
++	{ { echo "$as_me:5828: error: expected a pathname, not \"$with_libtool\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -5883,7 +5838,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:5886: checking for $ac_word" >&5
++echo "$as_me:5841: 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
+@@ -5898,7 +5853,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:5901: found $ac_dir/$ac_word" >&5
++echo "$as_me:5856: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5906,10 +5861,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5909: result: $LIBTOOL" >&5
++  echo "$as_me:5864: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5912: result: no" >&5
++  echo "$as_me:5867: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5922,7 +5877,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:5925: checking for $ac_word" >&5
++echo "$as_me:5880: 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
+@@ -5937,7 +5892,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:5940: found $ac_dir/$ac_word" >&5
++echo "$as_me:5895: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5945,10 +5900,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:5948: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:5903: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:5951: result: no" >&5
++  echo "$as_me:5906: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5979,7 +5934,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:5982: checking for $ac_word" >&5
++echo "$as_me:5937: 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
+@@ -5994,7 +5949,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:5997: found $ac_dir/$ac_word" >&5
++echo "$as_me:5952: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -6002,10 +5957,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:6005: result: $LIBTOOL" >&5
++  echo "$as_me:5960: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:6008: result: no" >&5
++  echo "$as_me:5963: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6018,7 +5973,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:6021: checking for $ac_word" >&5
++echo "$as_me:5976: 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
+@@ -6033,7 +5988,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:6036: found $ac_dir/$ac_word" >&5
++echo "$as_me:5991: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -6041,10 +5996,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:6044: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:5999: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:6047: result: no" >&5
++  echo "$as_me:6002: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -6066,7 +6021,7 @@
+ 		fi
+ 	fi
+ 	if test -z "$LIBTOOL" ; then
+-		{ { echo "$as_me:6069: error: Cannot find libtool" >&5
++		{ { echo "$as_me:6024: error: Cannot find libtool" >&5
+ echo "$as_me: error: Cannot find libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -6082,7 +6037,7 @@
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+ then
+-	echo "$as_me:6085: checking version of $LIBTOOL" >&5
++	echo "$as_me:6040: checking version of $LIBTOOL" >&5
+ echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+@@ -6093,7 +6048,7 @@
+ fi
+ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+ 
+-	echo "$as_me:6096: result: $cf_cv_libtool_version" >&5
++	echo "$as_me:6051: result: $cf_cv_libtool_version" >&5
+ echo "${ECHO_T}$cf_cv_libtool_version" >&6
+ 
+ 	if test -n "$cf_cv_libtool_version"
+@@ -6103,19 +6058,19 @@
+ 		(*...GNU-libtool...*)
+ 			;;
+ 		(*)
+-			{ { echo "$as_me:6106: error: This is not GNU libtool" >&5
++			{ { echo "$as_me:6061: 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:6112: error: No version found for $LIBTOOL" >&5
++		{ { echo "$as_me:6067: 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:6118: error: GNU libtool has not been found" >&5
++	{ { echo "$as_me:6073: error: GNU libtool has not been found" >&5
+ echo "$as_me: error: GNU libtool has not been found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6151,7 +6106,7 @@
+ 
+ else
+ 
+-echo "$as_me:6154: checking if you want to build shared libraries" >&5
++echo "$as_me:6109: 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.
+@@ -6161,11 +6116,11 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:6164: result: $with_shared" >&5
++echo "$as_me:6119: 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:6168: checking if you want to build static libraries" >&5
++echo "$as_me:6123: 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.
+@@ -6175,11 +6130,11 @@
+ else
+   with_normal=yes
+ fi;
+-echo "$as_me:6178: result: $with_normal" >&5
++echo "$as_me:6133: 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:6182: checking if you want to build debug libraries" >&5
++echo "$as_me:6137: 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.
+@@ -6189,11 +6144,11 @@
+ else
+   with_debug=yes
+ fi;
+-echo "$as_me:6192: result: $with_debug" >&5
++echo "$as_me:6147: 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:6196: checking if you want to build profiling libraries" >&5
++echo "$as_me:6151: 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.
+@@ -6203,7 +6158,7 @@
+ else
+   with_profile=no
+ fi;
+-echo "$as_me:6206: result: $with_profile" >&5
++echo "$as_me:6161: result: $with_profile" >&5
+ echo "${ECHO_T}$with_profile" >&6
+ test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
+ 
+@@ -6211,7 +6166,7 @@
+ 
+ if test "X$cf_with_cxx_binding" != Xno; then
+ if test "x$with_shared" = "xyes"; then
+-echo "$as_me:6214: checking if you want to build C++ shared libraries" >&5
++echo "$as_me:6169: 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.
+@@ -6221,26 +6176,26 @@
+ else
+   with_shared_cxx=no
+ fi;
+-echo "$as_me:6224: result: $with_shared_cxx" >&5
++echo "$as_me:6179: result: $with_shared_cxx" >&5
+ echo "${ECHO_T}$with_shared_cxx" >&6
+ fi
+ fi
+ 
+ ###############################################################################
+ 
+-echo "$as_me:6231: checking for specified models" >&5
++echo "$as_me:6186: 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:6235: result: $cf_list_models" >&5
++echo "$as_me:6190: 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:6240: checking for default model" >&5
++echo "$as_me:6195: 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:6243: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:6198: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+ 
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+@@ -6254,7 +6209,7 @@
+ LIB_DIR=../lib
+ LIB_2ND=../../lib
+ 
+-echo "$as_me:6257: checking if you want to have a library-prefix" >&5
++echo "$as_me:6212: 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.
+@@ -6264,7 +6219,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:6267: result: $with_lib_prefix" >&5
++echo "$as_me:6222: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test "$with_lib_prefix" = auto
+@@ -6295,24 +6250,24 @@
+ 
+ LIB_SUFFIX=
+ 
+-	echo "$as_me:6298: checking for PATH separator" >&5
++	echo "$as_me:6253: 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:6305: result: $PATH_SEPARATOR" >&5
++	echo "$as_me:6260: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+ 
+ # headers needed for checks...
+-echo "$as_me:6309: checking for ANSI C header files" >&5
++echo "$as_me:6264: 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 6315 "configure"
++#line 6270 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -6320,13 +6275,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:6323: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:6278: \"$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:6329: \$? = $ac_status" >&5
++  echo "$as_me:6284: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6348,7 +6303,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 6351 "configure"
++#line 6306 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6366,7 +6321,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 6369 "configure"
++#line 6324 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -6387,7 +6342,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6390 "configure"
++#line 6345 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -6413,15 +6368,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6416: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6371: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6419: \$? = $ac_status" >&5
++  echo "$as_me:6374: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:6421: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6376: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6424: \$? = $ac_status" >&5
++  echo "$as_me:6379: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -6434,7 +6389,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:6437: result: $ac_cv_header_stdc" >&5
++echo "$as_me:6392: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -6450,28 +6405,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6453: checking for $ac_header" >&5
++echo "$as_me:6408: 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 6459 "configure"
++#line 6414 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6465: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6420: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6468: \$? = $ac_status" >&5
++  echo "$as_me:6423: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6471: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6426: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6474: \$? = $ac_status" >&5
++  echo "$as_me:6429: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -6481,7 +6436,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6484: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6439: 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:6449: checking whether exit is declared" >&5
+ echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
+ if test "${ac_cv_have_decl_exit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6500 "configure"
++#line 6455 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -6512,16 +6467,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6515: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6470: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6518: \$? = $ac_status" >&5
++  echo "$as_me:6473: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6521: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6476: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6524: \$? = $ac_status" >&5
++  echo "$as_me:6479: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_have_decl_exit=yes
+ else
+@@ -6531,19 +6486,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6534: result: $ac_cv_have_decl_exit" >&5
++echo "$as_me:6489: result: $ac_cv_have_decl_exit" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
+ 
+ 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:6540: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:6495: 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 6546 "configure"
++#line 6501 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -6558,16 +6513,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6561: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6516: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6564: \$? = $ac_status" >&5
++  echo "$as_me:6519: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6567: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6522: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6570: \$? = $ac_status" >&5
++  echo "$as_me:6525: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -6577,7 +6532,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6580: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6535: 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:6548: 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
+@@ -6598,7 +6553,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6601 "configure"
++#line 6556 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6617,16 +6572,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6620: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6575: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6623: \$? = $ac_status" >&5
++  echo "$as_me:6578: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6626: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6581: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6629: \$? = $ac_status" >&5
++  echo "$as_me:6584: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -6637,14 +6592,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6640: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:6595: 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:6647: checking for opendir in -lx" >&5
++  echo "$as_me:6602: 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
+@@ -6652,7 +6607,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6655 "configure"
++#line 6610 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6671,16 +6626,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6674: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6629: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6677: \$? = $ac_status" >&5
++  echo "$as_me:6632: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6680: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6635: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6683: \$? = $ac_status" >&5
++  echo "$as_me:6638: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -6691,7 +6646,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6694: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:6649: 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"
+@@ -6701,7 +6656,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:6704: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:6659: 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.
+@@ -6711,10 +6666,10 @@
+ else
+   with_termlib=no
+ fi;
+-echo "$as_me:6714: result: $with_termlib" >&5
++echo "$as_me:6669: result: $with_termlib" >&5
+ echo "${ECHO_T}$with_termlib" >&6
+ 
+-echo "$as_me:6717: checking if you want to build a separate tic library" >&5
++echo "$as_me:6672: 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.
+@@ -6724,7 +6679,7 @@
+ else
+   with_ticlib=no
+ fi;
+-echo "$as_me:6727: result: $with_ticlib" >&5
++echo "$as_me:6682: result: $with_ticlib" >&5
+ echo "${ECHO_T}$with_ticlib" >&6
+ 
+ if test X"$CC_G_OPT" = X"" ; then
+@@ -6737,7 +6692,7 @@
+ 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
+ fi
+ 
+-echo "$as_me:6740: checking for default loader flags" >&5
++echo "$as_me:6695: 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=''   ;;
+@@ -6746,13 +6701,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:6749: result: ${LD_MODEL:-(none)}" >&5
++echo "$as_me:6704: result: ${LD_MODEL:-(none)}" >&5
+ echo "${ECHO_T}${LD_MODEL:-(none)}" >&6
+ 
+ case "$DFT_LWR_MODEL" in
+ (shared)
+ 
+-echo "$as_me:6755: checking if rpath option should be used" >&5
++echo "$as_me:6710: 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.
+@@ -6762,10 +6717,10 @@
+ else
+   cf_cv_enable_rpath=no
+ fi;
+-echo "$as_me:6765: result: $cf_cv_enable_rpath" >&5
++echo "$as_me:6720: result: $cf_cv_enable_rpath" >&5
+ echo "${ECHO_T}$cf_cv_enable_rpath" >&6
+ 
+-echo "$as_me:6768: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:6723: 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.
+@@ -6775,7 +6730,7 @@
+ else
+   cf_cv_do_relink=yes
+ fi;
+-echo "$as_me:6778: result: $cf_cv_do_relink" >&5
++echo "$as_me:6733: result: $cf_cv_do_relink" >&5
+ echo "${ECHO_T}$cf_cv_do_relink" >&6
+ 	;;
+ esac
+@@ -6786,7 +6741,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:6789: checking for an rpath option" >&5
++	echo "$as_me:6744: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -6817,12 +6772,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:6820: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:6775: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:6825: checking if we need a space after rpath option" >&5
++		echo "$as_me:6780: 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"
+ 
+@@ -6843,7 +6798,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6846 "configure"
++#line 6801 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -6855,16 +6810,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6858: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6813: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6861: \$? = $ac_status" >&5
++  echo "$as_me:6816: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6864: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6819: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6867: \$? = $ac_status" >&5
++  echo "$as_me:6822: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -6874,7 +6829,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:6877: result: $cf_rpath_space" >&5
++		echo "$as_me:6832: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -6896,7 +6851,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:6899: checking whether to use release or ABI version in shared library file names" >&5
++	echo "$as_me:6854: checking whether to use release or ABI version in shared library file names" >&5
+ echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6
+ 
+ # Check whether --with-shlib-version or --without-shlib-version was given.
+@@ -6911,9 +6866,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:6914: result: $withval" >&5
++		echo "$as_me:6869: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:6916: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:6871: 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; }; }
+ 		;;
+@@ -6922,7 +6877,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:6925: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:6880: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -6945,14 +6900,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:6948: checking which $CC option to use" >&5
++		echo "$as_me:6903: 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 6955 "configure"
++#line 6910 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6964,16 +6919,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6967: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6922: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6970: \$? = $ac_status" >&5
++  echo "$as_me:6925: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6973: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6928: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6976: \$? = $ac_status" >&5
++  echo "$as_me:6931: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -6982,7 +6937,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		done
+-		echo "$as_me:6985: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:6940: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -7053,7 +7008,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:7056: checking if ld -search_paths_first works" >&5
++		echo "$as_me:7011: 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
+@@ -7062,7 +7017,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7065 "configure"
++#line 7020 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -7074,16 +7029,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7077: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7032: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7080: \$? = $ac_status" >&5
++  echo "$as_me:7035: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7083: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7038: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7086: \$? = $ac_status" >&5
++  echo "$as_me:7041: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -7094,7 +7049,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:7097: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:7052: 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"
+@@ -7444,7 +7399,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7447 "configure"
++#line 7402 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7456,16 +7411,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7459: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7414: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7462: \$? = $ac_status" >&5
++  echo "$as_me:7417: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7465: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7420: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7468: \$? = $ac_status" >&5
++  echo "$as_me:7423: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -7502,7 +7457,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:7505: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:7460: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -7512,7 +7467,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <
+ int main(int argc, char *argv[])
+ {
+@@ -7524,18 +7479,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:7527: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:7482: 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:7529: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:7484: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7532: \$? = $ac_status" >&5
++  echo "$as_me:7487: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-				echo "$as_me:7534: result: yes" >&5
++				echo "$as_me:7489: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:7538: result: no" >&5
++				echo "$as_me:7493: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -7550,17 +7505,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:7553: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:7508: 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}:7557: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7512: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ for model in $cf_list_models ; do
+ 	case "$model" in
+ 	(libtool)
+ 
+-echo "$as_me:7563: checking for additional libtool options" >&5
++echo "$as_me:7518: 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.
+@@ -7570,7 +7525,7 @@
+ else
+   with_libtool_opts=no
+ fi;
+-echo "$as_me:7573: result: $with_libtool_opts" >&5
++echo "$as_me:7528: result: $with_libtool_opts" >&5
+ echo "${ECHO_T}$with_libtool_opts" >&6
+ 
+ case .$with_libtool_opts in
+@@ -7581,7 +7536,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:7584: checking if exported-symbols file should be used" >&5
++echo "$as_me:7539: 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.
+@@ -7596,7 +7551,7 @@
+ 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
+ 
+ fi
+-echo "$as_me:7599: result: $with_export_syms" >&5
++echo "$as_me:7554: result: $with_export_syms" >&5
+ echo "${ECHO_T}$with_export_syms" >&6
+ if test "x$with_export_syms" != xno
+ then
+@@ -7607,15 +7562,15 @@
+ 		;;
+ 	(shared)
+ 		if test "$CC_SHARED_OPTS" = "unknown"; then
+-			{ { echo "$as_me:7610: error: Shared libraries are not supported in this version" >&5
++			{ { echo "$as_me:7565: 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:7615: checking if current CFLAGS link properly" >&5
++		echo "$as_me:7570: 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 7618 "configure"
++#line 7573 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7627,16 +7582,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7630: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7585: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7633: \$? = $ac_status" >&5
++  echo "$as_me:7588: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7636: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7591: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7639: \$? = $ac_status" >&5
++  echo "$as_me:7594: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cflags_work=yes
+ else
+@@ -7645,13 +7600,13 @@
+ cf_cflags_work=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:7648: result: $cf_cflags_work" >&5
++		echo "$as_me:7603: 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}:7654: testing try to work around by appending shared-options ..." 1>&5
++echo "${as_me:-configure}:7609: testing try to work around by appending shared-options ..." 1>&5
+ 
+ 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
+ 		fi
+@@ -7659,7 +7614,7 @@
+ if test "$with_libtool" = "yes" ; then
+ 	:
+ elif test "$with_shared" = "yes" ; then
+-echo "$as_me:7662: checking if versioned-symbols file should be used" >&5
++echo "$as_me:7617: 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.
+@@ -7677,18 +7632,18 @@
+ (xno)
+ 	;;
+ (x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
+-	test -f "$with_versioned_syms" || { { echo "$as_me:7680: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:7635: 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:7685: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:7640: 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:7691: result: $with_versioned_syms" >&5
++echo "$as_me:7646: result: $with_versioned_syms" >&5
+ echo "${ECHO_T}$with_versioned_syms" >&6
+ 
+ RESULTING_SYMS=
+@@ -7704,7 +7659,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}:7707: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7662: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		LIB_CREATE="$MK_SHARED_LIB"
+ 		;;
+@@ -7713,12 +7668,12 @@
+ 		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}:7716: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:7671: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		LIB_CREATE="$MK_SHARED_LIB"
+ 		;;
+ 	(*)
+-		{ echo "$as_me:7721: WARNING: this system does not support versioned-symbols" >&5
++		{ echo "$as_me:7676: WARNING: this system does not support versioned-symbols" >&5
+ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
+ 		;;
+ 	esac
+@@ -7730,7 +7685,7 @@
+ 	# symbols.
+ 	if test "x$VERSIONED_SYMS" != "x"
+ 	then
+-		echo "$as_me:7733: checking if wildcards can be used to selectively omit symbols" >&5
++		echo "$as_me:7688: 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
+ 
+@@ -7767,7 +7722,7 @@
+ } submodule_1.0;
+ EOF
+ 		cat >conftest.$ac_ext <&5
++		echo "$as_me:7756: result: $WILDCARD_SYMS" >&5
+ echo "${ECHO_T}$WILDCARD_SYMS" >&6
+ 		rm -f conftest.*
+ 	fi
+@@ -7813,7 +7768,7 @@
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+ 
+-echo "$as_me:7816: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:7771: 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.
+@@ -7823,27 +7778,27 @@
+ else
+   with_gpm=maybe
+ fi;
+-echo "$as_me:7826: result: $with_gpm" >&5
++echo "$as_me:7781: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7830: checking for gpm.h" >&5
++	echo "$as_me:7785: 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 7836 "configure"
++#line 7791 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:7840: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7795: \"$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:7846: \$? = $ac_status" >&5
++  echo "$as_me:7801: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7862,7 +7817,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7865: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:7820: 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
+ 
+@@ -7873,7 +7828,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}:7876: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:7831: testing assuming we really have GPM library ..." 1>&5
+ 
+ cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+@@ -7881,7 +7836,7 @@
+ 
+ 			with_gpm=yes
+ 		else
+-			echo "$as_me:7884: checking for Gpm_Open in -lgpm" >&5
++			echo "$as_me:7839: 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
+@@ -7889,7 +7844,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7892 "configure"
++#line 7847 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7908,16 +7863,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7911: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7866: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7914: \$? = $ac_status" >&5
++  echo "$as_me:7869: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7917: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7872: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7920: \$? = $ac_status" >&5
++  echo "$as_me:7875: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -7928,18 +7883,18 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7931: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:7886: 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:7938: WARNING: Cannot link with GPM library" >&5
++					{ echo "$as_me:7893: WARNING: Cannot link with GPM library" >&5
+ echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
+ 					with_gpm=no
+ 				else
+-					{ { echo "$as_me:7942: error: Cannot link with GPM library" >&5
++					{ { echo "$as_me:7897: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+    { (exit 1); exit 1; }; }
+ 				fi
+@@ -7950,7 +7905,7 @@
+ 
+ else
+ 
+-		test "$with_gpm" != maybe && { echo "$as_me:7953: WARNING: Cannot find GPM header" >&5
++		test "$with_gpm" != maybe && { echo "$as_me:7908: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ 		with_gpm=no
+ 
+@@ -7959,7 +7914,7 @@
+ fi
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7962: checking if you want to load GPM dynamically" >&5
++	echo "$as_me:7917: 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.
+@@ -7969,18 +7924,18 @@
+ else
+   with_dlsym=yes
+ fi;
+-	echo "$as_me:7972: result: $with_dlsym" >&5
++	echo "$as_me:7927: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ 	if test "x$with_dlsym" = xyes ; then
+ 
+ cf_have_dlsym=no
+-echo "$as_me:7977: checking for dlsym" >&5
++echo "$as_me:7932: 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 7983 "configure"
++#line 7938 "configure"
+ #include "confdefs.h"
+ #define dlsym autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -8011,16 +7966,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8014: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7969: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8017: \$? = $ac_status" >&5
++  echo "$as_me:7972: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7975: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8023: \$? = $ac_status" >&5
++  echo "$as_me:7978: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_dlsym=yes
+ else
+@@ -8030,14 +7985,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8033: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:7988: 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:8040: checking for dlsym in -ldl" >&5
++echo "$as_me:7995: 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
+@@ -8045,7 +8000,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8048 "configure"
++#line 8003 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8064,16 +8019,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8067: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8022: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8070: \$? = $ac_status" >&5
++  echo "$as_me:8025: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8073: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8028: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8076: \$? = $ac_status" >&5
++  echo "$as_me:8031: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dl_dlsym=yes
+ else
+@@ -8084,7 +8039,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8087: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:8042: 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
+ 
+@@ -8113,10 +8068,10 @@
+ LIBS="$cf_add_libs"
+  }
+ 
+-	echo "$as_me:8116: checking whether able to link to dl*() functions" >&5
++	echo "$as_me:8071: 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 8119 "configure"
++#line 8074 "configure"
+ #include "confdefs.h"
+ 
+ 	#include 
+@@ -8137,16 +8092,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8140: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8095: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8143: \$? = $ac_status" >&5
++  echo "$as_me:8098: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8146: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8101: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8149: \$? = $ac_status" >&5
++  echo "$as_me:8104: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ cat >>confdefs.h <<\EOF
+@@ -8157,15 +8112,15 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-		{ { echo "$as_me:8160: error: Cannot link test program for libdl" >&5
++		{ { echo "$as_me:8115: 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:8165: result: ok" >&5
++	echo "$as_me:8120: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+-	{ { echo "$as_me:8168: error: Cannot find dlsym function" >&5
++	{ { echo "$as_me:8123: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8173,12 +8128,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}:8176: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:8131: testing assuming soname for gpm is $with_gpm ..." 1>&5
+ 
+ 			cf_cv_gpm_soname="$with_gpm"
+ 		else
+ 
+-echo "$as_me:8181: checking for soname of gpm library" >&5
++echo "$as_me:8136: 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
+@@ -8212,15 +8167,15 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-	if { (eval echo "$as_me:8215: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:8170: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8218: \$? = $ac_status" >&5
++  echo "$as_me:8173: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:8220: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:8175: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8223: \$? = $ac_status" >&5
++  echo "$as_me:8178: \$? = $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
+@@ -8231,7 +8186,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:8234: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:8189: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+ 
+ 		fi
+@@ -8299,7 +8254,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+ 
+-echo "$as_me:8302: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:8257: 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
+@@ -8307,7 +8262,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8310 "configure"
++#line 8265 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8326,16 +8281,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8329: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8284: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8332: \$? = $ac_status" >&5
++  echo "$as_me:8287: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8335: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8290: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8338: \$? = $ac_status" >&5
++  echo "$as_me:8293: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -8346,11 +8301,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8349: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:8304: 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:8353: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:8308: 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
+@@ -8374,15 +8329,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:8377: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:8332: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8380: \$? = $ac_status" >&5
++  echo "$as_me:8335: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:8382: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:8337: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8385: \$? = $ac_status" >&5
++  echo "$as_me:8340: \$? = $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
+@@ -8394,11 +8349,11 @@
+ fi
+ 
+ fi
+-echo "$as_me:8397: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:8352: 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:8401: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++	{ echo "$as_me:8356: 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
+ 
+@@ -8406,7 +8361,7 @@
+ 
+ fi
+ 
+-echo "$as_me:8409: checking if you want to use PCRE2 for regular-expressions" >&5
++echo "$as_me:8364: 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.
+@@ -8415,7 +8370,7 @@
+ 
+ fi;
+ test -z "$with_pcre2" && with_pcre2=no
+-echo "$as_me:8418: result: $with_pcre2" >&5
++echo "$as_me:8373: result: $with_pcre2" >&5
+ echo "${ECHO_T}$with_pcre2" >&6
+ 
+ if test "x$with_pcre2" != xno ; then
+@@ -8426,17 +8381,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}:8429: testing found package $cf_with_pcre2 ..." 1>&5
++echo "${as_me:-configure}:8384: 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}:8435: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:8390: 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}:8439: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:8394: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ for cf_required in $cf_with_pcre2
+ do
+@@ -8574,7 +8529,7 @@
+ fi
+ 
+ 	done
+-	cf_with_pcre2_ok=yes || { { echo "$as_me:8577: error: Cannot find PCRE2 library" >&5
++	cf_with_pcre2_ok=yes || { { echo "$as_me:8532: error: Cannot find PCRE2 library" >&5
+ echo "$as_me: error: Cannot find PCRE2 library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -8587,7 +8542,7 @@
+ 	(*pcre2-posix*|*pcreposix*)
+ 		;;
+ 	(*)
+-		echo "$as_me:8590: checking for regcomp in -lpcre2-posix" >&5
++		echo "$as_me:8545: 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
+@@ -8595,7 +8550,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcre2-posix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8598 "configure"
++#line 8553 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8614,16 +8569,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8617: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8572: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8620: \$? = $ac_status" >&5
++  echo "$as_me:8575: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8623: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8578: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8626: \$? = $ac_status" >&5
++  echo "$as_me:8581: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcre2_posix_regcomp=yes
+ else
+@@ -8634,7 +8589,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8637: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
++echo "$as_me:8592: 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
+ 
+@@ -8655,7 +8610,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  echo "$as_me:8658: checking for regcomp in -lpcreposix" >&5
++  echo "$as_me:8613: 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
+@@ -8663,7 +8618,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcreposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8666 "configure"
++#line 8621 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8682,16 +8637,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8685: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8640: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8688: \$? = $ac_status" >&5
++  echo "$as_me:8643: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8691: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8646: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8694: \$? = $ac_status" >&5
++  echo "$as_me:8649: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcreposix_regcomp=yes
+ else
+@@ -8702,7 +8657,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8705: result: $ac_cv_lib_pcreposix_regcomp" >&5
++echo "$as_me:8660: 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
+ 
+@@ -8723,7 +8678,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  { { echo "$as_me:8726: error: Cannot find PCRE2 POSIX library" >&5
++  { { echo "$as_me:8681: error: Cannot find PCRE2 POSIX library" >&5
+ echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8738,23 +8693,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:8741: checking for $ac_header" >&5
++echo "$as_me:8696: 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 8747 "configure"
++#line 8702 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8751: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8706: \"$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:8757: \$? = $ac_status" >&5
++  echo "$as_me:8712: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8773,7 +8728,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8776: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8731: 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:8744: 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 8795 "configure"
++#line 8750 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -8823,16 +8778,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8826: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8781: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8829: \$? = $ac_status" >&5
++  echo "$as_me:8784: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8832: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8787: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8835: \$? = $ac_status" >&5
++  echo "$as_me:8790: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -8842,7 +8797,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:8845: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:8800: 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:8859: checking if you want to use sysmouse" >&5
++echo "$as_me:8814: 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.
+@@ -8868,7 +8823,7 @@
+ fi;
+ 	if test "$cf_with_sysmouse" != no ; then
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8871 "configure"
++#line 8826 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8891,16 +8846,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8894: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8849: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8897: \$? = $ac_status" >&5
++  echo "$as_me:8852: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8900: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8855: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8903: \$? = $ac_status" >&5
++  echo "$as_me:8858: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_with_sysmouse=yes
+ else
+@@ -8910,7 +8865,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	fi
+-echo "$as_me:8913: result: $cf_with_sysmouse" >&5
++echo "$as_me:8868: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -8920,7 +8875,7 @@
+ fi
+ 
+ # pretend that ncurses==ncursesw==ncursest
+-echo "$as_me:8923: checking if you want to disable library suffixes" >&5
++echo "$as_me:8878: 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.
+@@ -8937,13 +8892,13 @@
+ 	disable_lib_suffixes=no
+ 
+ fi;
+-echo "$as_me:8940: result: $disable_lib_suffixes" >&5
++echo "$as_me:8895: 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:8946: checking if rpath-hack should be disabled" >&5
++echo "$as_me:8901: 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.
+@@ -8961,22 +8916,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:8964: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:8919: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:8969: checking for updated LDFLAGS" >&5
++echo "$as_me:8924: 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:8972: result: maybe" >&5
++	echo "$as_me:8927: 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:8979: checking for $ac_word" >&5
++echo "$as_me:8934: 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
+@@ -8991,7 +8946,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:8994: found $ac_dir/$ac_word" >&5
++echo "$as_me:8949: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8999,10 +8954,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:9002: result: $cf_ldd_prog" >&5
++  echo "$as_me:8957: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:9005: result: no" >&5
++  echo "$as_me:8960: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9016,7 +8971,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9019 "configure"
++#line 8974 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9028,16 +8983,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9031: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8986: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9034: \$? = $ac_status" >&5
++  echo "$as_me:8989: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9037: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8992: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9040: \$? = $ac_status" >&5
++  echo "$as_me:8995: \$? = $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`
+@@ -9065,7 +9020,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:9068: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:9023: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -9077,11 +9032,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9080: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9035: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9084: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9039: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -9118,7 +9073,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:9121: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9076: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -9131,11 +9086,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9134: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9089: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:9138: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9093: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -9172,7 +9127,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:9175: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:9130: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -9185,14 +9140,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:9188: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:9143: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:9192: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:9147: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:9195: result: no" >&5
++	echo "$as_me:9150: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9206,7 +9161,7 @@
+ EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
+ if test -n "$EXTRA_PKG_LDFLAGS"
+ then
+-	echo "$as_me:9209: checking if you want to disable extra LDFLAGS for package-scripts" >&5
++	echo "$as_me:9164: 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.
+@@ -9223,7 +9178,7 @@
+ 	disable_pkg_ldflags=no
+ 
+ fi;
+-	echo "$as_me:9226: result: $disable_pkg_ldflags" >&5
++	echo "$as_me:9181: result: $disable_pkg_ldflags" >&5
+ echo "${ECHO_T}$disable_pkg_ldflags" >&6
+ 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
+ fi
+@@ -9231,7 +9186,7 @@
+ ###############################################################################
+ 
+ ###	use option --with-extra-suffix to append suffix to headers and libraries
+-echo "$as_me:9234: checking for extra suffix to append to header/library paths" >&5
++echo "$as_me:9189: checking for extra suffix to append to header/library paths" >&5
+ echo $ECHO_N "checking for extra suffix to append to header/library paths... $ECHO_C" >&6
+ EXTRA_SUFFIX=
+ 
+@@ -9250,11 +9205,11 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:9253: result: ${EXTRA_SUFFIX:-(none)}" >&5
++echo "$as_me:9208: result: ${EXTRA_SUFFIX:-(none)}" >&5
+ echo "${ECHO_T}${EXTRA_SUFFIX:-(none)}" >&6
+ 
+ ###	use option --disable-overwrite to leave out the link to -lcurses
+-echo "$as_me:9257: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:9212: 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.
+@@ -9264,10 +9219,10 @@
+ else
+   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:9267: result: $with_overwrite" >&5
++echo "$as_me:9222: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+ 
+-echo "$as_me:9270: checking if external terminfo-database is used" >&5
++echo "$as_me:9225: 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.
+@@ -9277,7 +9232,7 @@
+ else
+   use_database=yes
+ fi;
+-echo "$as_me:9280: result: $use_database" >&5
++echo "$as_me:9235: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+ 
+ case "$host_os" in
+@@ -9293,7 +9248,7 @@
+ if test "$use_database" != no ; then
+ 	NCURSES_USE_DATABASE=1
+ 
+-	echo "$as_me:9296: checking which terminfo source-file will be installed" >&5
++	echo "$as_me:9251: 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.
+@@ -9301,10 +9256,10 @@
+   withval="$with_database"
+   TERMINFO_SRC=$withval
+ fi;
+-	echo "$as_me:9304: result: $TERMINFO_SRC" >&5
++	echo "$as_me:9259: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+ 
+-	echo "$as_me:9307: checking whether to use hashed database instead of directory/tree" >&5
++	echo "$as_me:9262: 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.
+@@ -9314,13 +9269,13 @@
+ else
+   with_hashed_db=no
+ fi;
+-	echo "$as_me:9317: result: $with_hashed_db" >&5
++	echo "$as_me:9272: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ 	with_hashed_db=no
+ fi
+ 
+-echo "$as_me:9323: checking for list of fallback terminal descriptions" >&5
++echo "$as_me:9278: checking for list of fallback terminal descriptions" >&5
+ echo $ECHO_N "checking for list of fallback terminal descriptions... $ECHO_C" >&6
+ 
+ # Check whether --with-fallbacks or --without-fallbacks was given.
+@@ -9330,7 +9285,7 @@
+ else
+   with_fallback=
+ fi;
+-echo "$as_me:9333: result: ${with_fallback:-(none)}" >&5
++echo "$as_me:9288: result: ${with_fallback:-(none)}" >&5
+ echo "${ECHO_T}${with_fallback:-(none)}" >&6
+ 
+ case ".$with_fallback" in
+@@ -9338,7 +9293,7 @@
+ 	FALLBACK_LIST=
+ 	;;
+ (.yes)
+-	{ echo "$as_me:9341: WARNING: expected a list of terminal descriptions" >&5
++	{ echo "$as_me:9296: WARNING: expected a list of terminal descriptions" >&5
+ echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
+ 	;;
+ (*)
+@@ -9354,7 +9309,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:9357: checking for $ac_word" >&5
++echo "$as_me:9312: 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
+@@ -9369,7 +9324,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:9372: found $ac_dir/$ac_word" >&5
++echo "$as_me:9327: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9377,10 +9332,10 @@
+ fi
+ TIC=$ac_cv_prog_TIC
+ if test -n "$TIC"; then
+-  echo "$as_me:9380: result: $TIC" >&5
++  echo "$as_me:9335: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:9383: result: no" >&5
++  echo "$as_me:9338: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9389,7 +9344,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:9392: checking for $ac_word" >&5
++echo "$as_me:9347: 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
+@@ -9404,7 +9359,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:9407: found $ac_dir/$ac_word" >&5
++echo "$as_me:9362: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9412,10 +9367,10 @@
+ fi
+ ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
+ if test -n "$ac_ct_TIC"; then
+-  echo "$as_me:9415: result: $ac_ct_TIC" >&5
++  echo "$as_me:9370: result: $ac_ct_TIC" >&5
+ echo "${ECHO_T}$ac_ct_TIC" >&6
+ else
+-  echo "$as_me:9418: result: no" >&5
++  echo "$as_me:9373: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9427,7 +9382,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:9430: checking for $ac_word" >&5
++echo "$as_me:9385: 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
+@@ -9442,7 +9397,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:9445: found $ac_dir/$ac_word" >&5
++echo "$as_me:9400: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9450,10 +9405,10 @@
+ fi
+ INFOCMP=$ac_cv_prog_INFOCMP
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:9453: result: $INFOCMP" >&5
++  echo "$as_me:9408: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:9456: result: no" >&5
++  echo "$as_me:9411: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9462,7 +9417,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:9465: checking for $ac_word" >&5
++echo "$as_me:9420: 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
+@@ -9477,7 +9432,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:9480: found $ac_dir/$ac_word" >&5
++echo "$as_me:9435: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9485,10 +9440,10 @@
+ fi
+ ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
+ if test -n "$ac_ct_INFOCMP"; then
+-  echo "$as_me:9488: result: $ac_ct_INFOCMP" >&5
++  echo "$as_me:9443: result: $ac_ct_INFOCMP" >&5
+ echo "${ECHO_T}$ac_ct_INFOCMP" >&6
+ else
+-  echo "$as_me:9491: result: no" >&5
++  echo "$as_me:9446: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9503,10 +9458,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:9506: checking for tic program for fallbacks" >&5
++  echo "$as_me:9461: checking for tic program for fallbacks" >&5
+ echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
+ 		TIC=$withval
+-		echo "$as_me:9509: result: $TIC" >&5
++		echo "$as_me:9464: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -9532,7 +9487,7 @@
+ 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9535: error: expected a pathname, not \"$TIC\"" >&5
++	{ { echo "$as_me:9490: error: expected a pathname, not \"$TIC\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9545,7 +9500,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:9548: checking for $ac_word" >&5
++echo "$as_me:9503: 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
+@@ -9562,7 +9517,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:9565: found $ac_dir/$ac_word" >&5
++   echo "$as_me:9520: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -9573,10 +9528,10 @@
+ TIC=$ac_cv_path_TIC
+ 
+ if test -n "$TIC"; then
+-  echo "$as_me:9576: result: $TIC" >&5
++  echo "$as_me:9531: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:9579: result: no" >&5
++  echo "$as_me:9534: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9633,7 +9588,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:9636: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9591: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:9606: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -9657,10 +9612,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:9660: checking for infocmp program for fallbacks" >&5
++  echo "$as_me:9615: checking for infocmp program for fallbacks" >&5
+ echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
+ 		INFOCMP=$withval
+-		echo "$as_me:9663: result: $INFOCMP" >&5
++		echo "$as_me:9618: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -9686,7 +9641,7 @@
+ 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9689: error: expected a pathname, not \"$INFOCMP\"" >&5
++	{ { echo "$as_me:9644: error: expected a pathname, not \"$INFOCMP\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9699,7 +9654,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:9702: checking for $ac_word" >&5
++echo "$as_me:9657: 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
+@@ -9716,7 +9671,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:9719: found $ac_dir/$ac_word" >&5
++   echo "$as_me:9674: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -9727,10 +9682,10 @@
+ INFOCMP=$ac_cv_path_INFOCMP
+ 
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:9730: result: $INFOCMP" >&5
++  echo "$as_me:9685: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:9733: result: no" >&5
++  echo "$as_me:9688: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9787,7 +9742,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:9790: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:9745: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:9760: WARNING: no infocmp program found for fallbacks" >&5
+ echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -9812,7 +9767,7 @@
+ 	test -z "$INFOCMP" && FALLBACK_LIST=
+ 	if test -z "$FALLBACK_LIST"
+ 	then
+-		{ echo "$as_me:9815: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
++		{ echo "$as_me:9770: 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
+@@ -9820,7 +9775,7 @@
+ USE_FALLBACKS=
+ test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
+ 
+-echo "$as_me:9823: checking if you want modern xterm or antique" >&5
++echo "$as_me:9778: 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.
+@@ -9834,7 +9789,7 @@
+ (no) with_xterm_new=xterm-old;;
+ (*)	 with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:9837: result: $with_xterm_new" >&5
++echo "$as_me:9792: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+ 
+@@ -9847,7 +9802,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9850: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:9805: 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.
+@@ -9871,13 +9826,13 @@
+ 	with_xterm_kbs=$withval
+ 	;;
+ esac
+-echo "$as_me:9874: result: $with_xterm_kbs" >&5
++echo "$as_me:9829: result: $with_xterm_kbs" >&5
+ echo "${ECHO_T}$with_xterm_kbs" >&6
+ XTERM_KBS=$with_xterm_kbs
+ 
+ if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
+ then
+-	{ echo "$as_me:9880: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
++	{ echo "$as_me:9835: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5
+ echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;}
+ fi
+ 
+@@ -9887,7 +9842,7 @@
+ 	MAKE_TERMINFO="#"
+ else
+ 
+-echo "$as_me:9890: checking for list of terminfo directories" >&5
++echo "$as_me:9845: 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.
+@@ -9925,7 +9880,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9928: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:9883: 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; }; }
+ 	;;
+@@ -9948,7 +9903,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9951: result: $TERMINFO_DIRS" >&5
++echo "$as_me:9906: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <&5
++	{ echo "$as_me:9915: 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:9966: checking for default terminfo directory" >&5
++echo "$as_me:9921: 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.
+@@ -9997,7 +9952,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:10000: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:9955: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -10006,7 +9961,7 @@
+ fi
+ eval TERMINFO="$withval"
+ 
+-echo "$as_me:10009: result: $TERMINFO" >&5
++echo "$as_me:9964: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:9975: 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.
+@@ -10029,7 +9984,7 @@
+   with_big_core=no
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10032 "configure"
++#line 9987 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10043,15 +9998,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10046: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10001: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10049: \$? = $ac_status" >&5
++  echo "$as_me:10004: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10051: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10006: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10054: \$? = $ac_status" >&5
++  echo "$as_me:10009: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_big_core=yes
+ else
+@@ -10063,7 +10018,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi;
+-echo "$as_me:10066: result: $with_big_core" >&5
++echo "$as_me:10021: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10073,7 +10028,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:10076: checking if big-strings option selected" >&5
++echo "$as_me:10031: 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.
+@@ -10097,14 +10052,14 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:10100: result: $with_big_strings" >&5
++echo "$as_me:10055: 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:10107: checking if you want termcap-fallback support" >&5
++echo "$as_me:10062: 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.
+@@ -10114,14 +10069,14 @@
+ else
+   with_termcap=no
+ fi;
+-echo "$as_me:10117: result: $with_termcap" >&5
++echo "$as_me:10072: 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:10124: error: You have disabled the database w/o specifying fallbacks" >&5
++			{ { echo "$as_me:10079: 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
+@@ -10134,13 +10089,13 @@
+ else
+ 
+ 	if test "$with_ticlib" != no ; then
+-		{ { echo "$as_me:10137: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++		{ { echo "$as_me:10092: 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:10143: checking for list of termcap files" >&5
++	echo "$as_me:10098: 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.
+@@ -10178,7 +10133,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:10181: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:10136: 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; }; }
+ 	;;
+@@ -10201,7 +10156,7 @@
+ 	;;
+ esac
+ 
+-	echo "$as_me:10204: result: $TERMPATH" >&5
++	echo "$as_me:10159: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ 	test -n "$TERMPATH" &&
+ cat >>confdefs.h <&5
++	echo "$as_me:10167: 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.
+@@ -10219,14 +10174,14 @@
+ else
+   with_getcap=no
+ fi;
+-	echo "$as_me:10222: result: $with_getcap" >&5
++	echo "$as_me:10177: 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:10229: checking if translated termcaps will be cached in ~/.terminfo" >&5
++	echo "$as_me:10184: 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.
+@@ -10236,7 +10191,7 @@
+ else
+   with_getcap_cache=no
+ fi;
+-	echo "$as_me:10239: result: $with_getcap_cache" >&5
++	echo "$as_me:10194: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ 	test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -10246,7 +10201,7 @@
+ fi
+ 
+ ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:10249: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:10204: 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.
+@@ -10256,14 +10211,14 @@
+ else
+   with_home_terminfo=yes
+ fi;
+-echo "$as_me:10259: result: $with_home_terminfo" >&5
++echo "$as_me:10214: 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:10266: checking if you want to permit root to use ncurses environment variables" >&5
++echo "$as_me:10221: 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.
+@@ -10273,14 +10228,14 @@
+ else
+   with_root_environ=yes
+ fi;
+-echo "$as_me:10276: result: $with_root_environ" >&5
++echo "$as_me:10231: 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:10283: checking if you want to permit setuid programs to access all files" >&5
++echo "$as_me:10238: 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-access or --disable-root-access was given.
+@@ -10290,14 +10245,14 @@
+ else
+   with_root_access=yes
+ fi;
+-echo "$as_me:10293: result: $with_root_access" >&5
++echo "$as_me:10248: result: $with_root_access" >&5
+ echo "${ECHO_T}$with_root_access" >&6
+ test "x$with_root_access" = xyes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_ROOT_ACCESS 1
+ EOF
+ 
+-echo "$as_me:10300: checking if you want to permit setuid use of ncurses environment variables" >&5
++echo "$as_me:10255: checking if you want to permit setuid use of ncurses environment variables" >&5
+ echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6
+ 
+ # Check whether --enable-setuid-environ or --disable-setuid-environ was given.
+@@ -10307,7 +10262,7 @@
+ else
+   with_setuid_environ=$with_root_environ
+ fi;
+-echo "$as_me:10310: result: $with_setuid_environ" >&5
++echo "$as_me:10265: result: $with_setuid_environ" >&5
+ echo "${ECHO_T}$with_setuid_environ" >&6
+ test "x$with_setuid_environ" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10322,23 +10277,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:10325: checking for $ac_header" >&5
++echo "$as_me:10280: 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 10331 "configure"
++#line 10286 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10335: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:10290: \"$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:10341: \$? = $ac_status" >&5
++  echo "$as_me:10296: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10357,7 +10312,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:10360: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:10315: 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:10330: 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 10381 "configure"
++#line 10336 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10409,16 +10364,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10412: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10367: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10415: \$? = $ac_status" >&5
++  echo "$as_me:10370: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10418: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10373: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10421: \$? = $ac_status" >&5
++  echo "$as_me:10376: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -10428,7 +10383,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10431: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10386: 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:10403: 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 10454 "configure"
++#line 10409 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -10482,16 +10437,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10485: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10440: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10488: \$? = $ac_status" >&5
++  echo "$as_me:10443: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10491: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10446: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10494: \$? = $ac_status" >&5
++  echo "$as_me:10449: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -10501,7 +10456,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:10504: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:10459: 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:10470: 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
+@@ -10525,7 +10480,7 @@
+ 			eval 'ac_cv_func_'$cf_func'=error'
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10528 "configure"
++#line 10483 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -10559,15 +10514,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10562: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10517: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10565: \$? = $ac_status" >&5
++  echo "$as_me:10520: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10567: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10522: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10570: \$? = $ac_status" >&5
++  echo "$as_me:10525: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -10585,7 +10540,7 @@
+ 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+ 
+ fi
+-echo "$as_me:10588: result: $cf_cv_link_funcs" >&5
++echo "$as_me:10543: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ 	test "$ac_cv_func_link"    = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -10605,7 +10560,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:10608: checking if tic should use symbolic links" >&5
++	echo "$as_me:10563: 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.
+@@ -10615,21 +10570,21 @@
+ else
+   with_symlinks=no
+ fi;
+-	echo "$as_me:10618: result: $with_symlinks" >&5
++	echo "$as_me:10573: 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:10625: checking if tic should use hard links" >&5
++	echo "$as_me:10580: 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:10632: result: $with_links" >&5
++	echo "$as_me:10587: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+ 
+@@ -10645,7 +10600,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:10648: checking if you want broken-linker support code" >&5
++echo "$as_me:10603: 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.
+@@ -10655,7 +10610,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:10658: result: $with_broken_linker" >&5
++echo "$as_me:10613: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : "${BROKEN_LINKER:=0}"
+@@ -10669,7 +10624,7 @@
+ fi
+ 
+ ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:10672: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:10627: 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.
+@@ -10679,7 +10634,7 @@
+ else
+   with_bsdpad=no
+ fi;
+-echo "$as_me:10682: result: $with_bsdpad" >&5
++echo "$as_me:10637: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -10698,14 +10653,14 @@
+ # Check to define _XOPEN_SOURCE "automatically"
+ CPPFLAGS_before_XOPEN="$CPPFLAGS"
+ 
+-echo "$as_me:10701: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:10656: 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 10708 "configure"
++#line 10663 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10724,16 +10679,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10727: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10682: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10730: \$? = $ac_status" >&5
++  echo "$as_me:10685: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10733: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10688: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10736: \$? = $ac_status" >&5
++  echo "$as_me:10691: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -10744,7 +10699,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10747: result: $cf_cv_posix_visible" >&5
++echo "$as_me:10702: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -10786,14 +10741,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:10789: checking if this is the GNU C library" >&5
++echo "$as_me:10744: 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 10796 "configure"
++#line 10751 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10812,16 +10767,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10815: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10770: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10818: \$? = $ac_status" >&5
++  echo "$as_me:10773: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10821: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10776: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10824: \$? = $ac_status" >&5
++  echo "$as_me:10779: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -10832,7 +10787,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10835: result: $cf_cv_gnu_library" >&5
++echo "$as_me:10790: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -10840,7 +10795,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:10843: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:10798: 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
+@@ -10852,7 +10807,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10855 "configure"
++#line 10810 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10871,16 +10826,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10874: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10829: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10877: \$? = $ac_status" >&5
++  echo "$as_me:10832: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10880: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10835: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10883: \$? = $ac_status" >&5
++  echo "$as_me:10838: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -10892,12 +10847,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:10895: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:10850: 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:10900: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:10855: 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
+@@ -11002,7 +10957,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11005 "configure"
++#line 10960 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -11022,16 +10977,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11025: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10980: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11028: \$? = $ac_status" >&5
++  echo "$as_me:10983: \$? = $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:10986: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11034: \$? = $ac_status" >&5
++  echo "$as_me:10989: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -11042,7 +10997,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11045: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:11000: 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
+@@ -11051,14 +11006,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:11054: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:11009: 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 11061 "configure"
++#line 11016 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11073,16 +11028,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11076: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11031: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11079: \$? = $ac_status" >&5
++  echo "$as_me:11034: \$? = $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:11037: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11085: \$? = $ac_status" >&5
++  echo "$as_me:11040: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -11189,7 +11144,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11192 "configure"
++#line 11147 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11204,16 +11159,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11207: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11162: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11210: \$? = $ac_status" >&5
++  echo "$as_me:11165: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11213: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11168: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11216: \$? = $ac_status" >&5
++  echo "$as_me:11171: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -11228,12 +11183,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11231: result: $cf_cv_gnu_source" >&5
++echo "$as_me:11186: 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:11236: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:11191: 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
+@@ -11243,7 +11198,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11246 "configure"
++#line 11201 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11258,16 +11213,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11261: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11216: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11264: \$? = $ac_status" >&5
++  echo "$as_me:11219: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11267: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11222: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11270: \$? = $ac_status" >&5
++  echo "$as_me:11225: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -11278,7 +11233,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11281: result: $cf_cv_default_source" >&5
++echo "$as_me:11236: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -11318,16 +11273,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:11321: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11276: 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}:11327: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11282: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11330 "configure"
++#line 11285 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11342,16 +11297,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11345: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11300: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11348: \$? = $ac_status" >&5
++  echo "$as_me:11303: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11351: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11306: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11354: \$? = $ac_status" >&5
++  echo "$as_me:11309: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11372,7 +11327,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11375 "configure"
++#line 11330 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11387,16 +11342,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11390: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11345: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11393: \$? = $ac_status" >&5
++  echo "$as_me:11348: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11396: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11351: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11399: \$? = $ac_status" >&5
++  echo "$as_me:11354: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11407,7 +11362,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11410: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11365: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11415,10 +11370,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11418: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11373: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11421 "configure"
++#line 11376 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11433,16 +11388,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11436: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11391: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11439: \$? = $ac_status" >&5
++  echo "$as_me:11394: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11442: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11397: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11445: \$? = $ac_status" >&5
++  echo "$as_me:11400: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11458,7 +11413,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11461: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11416: 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
+@@ -11575,7 +11530,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:11578: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:11533: 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
+@@ -11607,14 +11562,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:11610: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:11565: 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 11617 "configure"
++#line 11572 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11632,16 +11587,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11635: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11590: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11638: \$? = $ac_status" >&5
++  echo "$as_me:11593: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11641: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11596: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11644: \$? = $ac_status" >&5
++  echo "$as_me:11599: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11653,7 +11608,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11656 "configure"
++#line 11611 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -11671,16 +11626,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11674: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11629: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11677: \$? = $ac_status" >&5
++  echo "$as_me:11632: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11680: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11635: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11683: \$? = $ac_status" >&5
++  echo "$as_me:11638: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11695,7 +11650,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11698: result: $cf_cv_xopen_source" >&5
++echo "$as_me:11653: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -11855,16 +11810,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:11858: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:11813: 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}:11864: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11819: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11867 "configure"
++#line 11822 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11879,16 +11834,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11882: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11837: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11885: \$? = $ac_status" >&5
++  echo "$as_me:11840: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11888: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11843: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11891: \$? = $ac_status" >&5
++  echo "$as_me:11846: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11909,7 +11864,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11912 "configure"
++#line 11867 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11924,16 +11879,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11927: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11882: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11930: \$? = $ac_status" >&5
++  echo "$as_me:11885: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11933: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11888: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11936: \$? = $ac_status" >&5
++  echo "$as_me:11891: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11944,7 +11899,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11947: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11902: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11952,10 +11907,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11955: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11910: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11958 "configure"
++#line 11913 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11970,16 +11925,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11973: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11928: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11976: \$? = $ac_status" >&5
++  echo "$as_me:11931: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11979: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11934: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11982: \$? = $ac_status" >&5
++  echo "$as_me:11937: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11995,7 +11950,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11998: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11953: 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
+@@ -12108,10 +12063,10 @@
+ 	if test "$cf_cv_xopen_source" = no ; then
+ 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
+ 
+-echo "${as_me:-configure}:12111: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
++echo "${as_me:-configure}:12066: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12114 "configure"
++#line 12069 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12129,23 +12084,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12132: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12087: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12135: \$? = $ac_status" >&5
++  echo "$as_me:12090: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12138: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12093: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12141: \$? = $ac_status" >&5
++  echo "$as_me:12096: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-			{ echo "$as_me:12148: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
++			{ echo "$as_me:12103: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+ echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+ 			CPPFLAGS="$cf_save_xopen_cppflags"
+ fi
+@@ -12168,7 +12123,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}:12171: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12126: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -12180,7 +12135,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}:12183: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:12138: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -12268,7 +12223,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:12271: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:12226: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -12278,7 +12233,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:12281: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:12236: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -12288,7 +12243,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}:12291: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:12246: 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"
+@@ -12300,10 +12255,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:12303: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:12258: 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 12306 "configure"
++#line 12261 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12318,16 +12273,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12321: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12276: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12324: \$? = $ac_status" >&5
++  echo "$as_me:12279: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12327: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12282: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12330: \$? = $ac_status" >&5
++  echo "$as_me:12285: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -12336,12 +12291,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:12339: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:12294: 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 12344 "configure"
++#line 12299 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12356,16 +12311,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12359: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12314: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12362: \$? = $ac_status" >&5
++  echo "$as_me:12317: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12365: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12320: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12368: \$? = $ac_status" >&5
++  echo "$as_me:12323: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -12376,19 +12331,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:12379: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:12334: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:12384: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:12339: 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 12391 "configure"
++#line 12346 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12406,16 +12361,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12409: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12364: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12412: \$? = $ac_status" >&5
++  echo "$as_me:12367: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12415: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12370: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12418: \$? = $ac_status" >&5
++  echo "$as_me:12373: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12427,7 +12382,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12430 "configure"
++#line 12385 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12445,16 +12400,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12448: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12403: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12451: \$? = $ac_status" >&5
++  echo "$as_me:12406: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12454: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12409: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12457: \$? = $ac_status" >&5
++  echo "$as_me:12412: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -12469,7 +12424,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12472: result: $cf_cv_xopen_source" >&5
++echo "$as_me:12427: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -12620,14 +12575,14 @@
+ 
+ # Work around breakage on OS X
+ 
+-echo "$as_me:12623: checking if SIGWINCH is defined" >&5
++echo "$as_me:12578: 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 12630 "configure"
++#line 12585 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12642,23 +12597,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12645: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12600: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12648: \$? = $ac_status" >&5
++  echo "$as_me:12603: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12651: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12606: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12654: \$? = $ac_status" >&5
++  echo "$as_me:12609: \$? = $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 12661 "configure"
++#line 12616 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -12676,16 +12631,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12679: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12634: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12682: \$? = $ac_status" >&5
++  echo "$as_me:12637: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12685: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12640: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12688: \$? = $ac_status" >&5
++  echo "$as_me:12643: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -12699,11 +12654,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12702: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:12657: 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:12706: checking for actual SIGWINCH definition" >&5
++echo "$as_me:12661: 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
+@@ -12714,7 +12669,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12717 "configure"
++#line 12672 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -12736,16 +12691,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12739: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12694: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12742: \$? = $ac_status" >&5
++  echo "$as_me:12697: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12745: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12700: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12748: \$? = $ac_status" >&5
++  echo "$as_me:12703: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -12759,7 +12714,7 @@
+ done
+ 
+ fi
+-echo "$as_me:12762: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:12717: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -12769,13 +12724,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:12772: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:12727: 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 12778 "configure"
++#line 12733 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12789,16 +12744,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12792: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12747: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12795: \$? = $ac_status" >&5
++  echo "$as_me:12750: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12798: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12753: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12801: \$? = $ac_status" >&5
++  echo "$as_me:12756: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -12809,7 +12764,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12812: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:12767: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test "$am_cv_langinfo_codeset" = yes; then
+ 
+@@ -12823,7 +12778,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+ 
+-echo "$as_me:12826: checking if you want wide-character code" >&5
++echo "$as_me:12781: 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.
+@@ -12833,7 +12788,7 @@
+ else
+   with_widec=$cf_dft_widec
+ fi;
+-echo "$as_me:12836: result: $with_widec" >&5
++echo "$as_me:12791: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ 
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -12855,7 +12810,7 @@
+ 	(*_XOPEN_SOURCE=*)
+ 		;;
+ 	(*)
+-		{ echo "$as_me:12858: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
++		{ echo "$as_me:12813: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;}
+ 		# CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR"
+ 		CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR"
+@@ -12868,23 +12823,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:12871: checking for $ac_header" >&5
++echo "$as_me:12826: 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 12877 "configure"
++#line 12832 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:12881: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12836: \"$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:12887: \$? = $ac_status" >&5
++  echo "$as_me:12842: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12903,7 +12858,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:12906: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:12861: 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:12871: 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 12923 "configure"
++#line 12878 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -12942,16 +12897,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12945: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12900: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12948: \$? = $ac_status" >&5
++  echo "$as_me:12903: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12951: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12906: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12954: \$? = $ac_status" >&5
++  echo "$as_me:12909: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_h_okay=yes
+ else
+@@ -12961,16 +12916,16 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12964: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:12919: 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:12970: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:12925: 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 12973 "configure"
++#line 12928 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12986,16 +12941,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12989: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12944: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12992: \$? = $ac_status" >&5
++  echo "$as_me:12947: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12995: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12950: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12998: \$? = $ac_status" >&5
++  echo "$as_me:12953: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=no
+ else
+@@ -13004,16 +12959,16 @@
+ cf_result=yes
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:13007: result: $cf_result" >&5
++echo "$as_me:12962: 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:13013: checking checking for compatible value versus " >&5
++	echo "$as_me:12968: 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 13016 "configure"
++#line 12971 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -13029,16 +12984,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13032: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12987: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13035: \$? = $ac_status" >&5
++  echo "$as_me:12990: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13038: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12993: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13041: \$? = $ac_status" >&5
++  echo "$as_me:12996: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -13047,7 +13002,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:13050: result: $cf_result" >&5
++	echo "$as_me:13005: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = no ; then
+ 		# perhaps we can override it - try...
+@@ -13057,7 +13012,7 @@
+ 
+ fi
+ 
+-echo "$as_me:13060: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:13015: 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
+@@ -13128,7 +13083,7 @@
+   cf_cv_wcwidth_graphics=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13131 "configure"
++#line 13086 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13173,15 +13128,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:13176: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13131: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13179: \$? = $ac_status" >&5
++  echo "$as_me:13134: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:13181: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13136: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13184: \$? = $ac_status" >&5
++  echo "$as_me:13139: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wcwidth_graphics=yes
+ else
+@@ -13194,7 +13149,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:13197: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:13152: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+ 
+ 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -13205,13 +13160,13 @@
+ for ac_func in putwc btowc wctob wmemchr 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:13208: checking for $ac_func" >&5
++echo "$as_me:13163: 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 13214 "configure"
++#line 13169 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -13242,16 +13197,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13245: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13200: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13248: \$? = $ac_status" >&5
++  echo "$as_me:13203: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13251: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13206: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13254: \$? = $ac_status" >&5
++  echo "$as_me:13209: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -13261,7 +13216,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13264: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:13219: 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:13234: 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 13285 "configure"
++#line 13240 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13289: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:13244: \"$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:13295: \$? = $ac_status" >&5
++  echo "$as_me:13250: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13311,7 +13266,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:13314: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:13269: 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:13279: 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
+@@ -13329,7 +13284,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13332 "configure"
++#line 13287 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -13346,16 +13301,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13349: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13304: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13352: \$? = $ac_status" >&5
++  echo "$as_me:13307: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13355: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13310: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13358: \$? = $ac_status" >&5
++  echo "$as_me:13313: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -13367,12 +13322,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:13370: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13325: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13375 "configure"
++#line 13330 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13385,16 +13340,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13388: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13343: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13391: \$? = $ac_status" >&5
++  echo "$as_me:13346: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13394: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13349: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13397: \$? = $ac_status" >&5
++  echo "$as_me:13352: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -13408,7 +13363,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13411 "configure"
++#line 13366 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13421,16 +13376,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13424: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13379: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13427: \$? = $ac_status" >&5
++  echo "$as_me:13382: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13430: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13385: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13433: \$? = $ac_status" >&5
++  echo "$as_me:13388: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -13447,9 +13402,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:13450: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:13405: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:13452: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13407: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13540,7 +13495,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}:13543: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13498: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -13548,7 +13503,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13551 "configure"
++#line 13506 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13561,21 +13516,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13564: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13519: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13567: \$? = $ac_status" >&5
++  echo "$as_me:13522: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13570: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13525: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13573: \$? = $ac_status" >&5
++  echo "$as_me:13528: \$? = $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}:13578: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13533: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -13593,7 +13548,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:13596: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:13551: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -13668,13 +13623,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}:13671: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13626: 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 13677 "configure"
++#line 13632 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13687,21 +13642,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13690: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13645: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13693: \$? = $ac_status" >&5
++  echo "$as_me:13648: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13696: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13651: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13699: \$? = $ac_status" >&5
++  echo "$as_me:13654: \$? = $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}:13704: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:13659: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -13743,7 +13698,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13746: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:13701: 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
+@@ -13781,7 +13736,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13784 "configure"
++#line 13739 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13793,16 +13748,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13796: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13751: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13799: \$? = $ac_status" >&5
++  echo "$as_me:13754: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13802: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13757: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13805: \$? = $ac_status" >&5
++  echo "$as_me:13760: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13819,7 +13774,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}:13822: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:13777: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -13855,7 +13810,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}:13858: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:13813: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -13887,14 +13842,14 @@
+ 	fi
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:13890: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:13845: 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 13897 "configure"
++#line 13852 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13912,23 +13867,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13915: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13870: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13918: \$? = $ac_status" >&5
++  echo "$as_me:13873: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13921: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13876: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13924: \$? = $ac_status" >&5
++  echo "$as_me:13879: \$? = $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 13931 "configure"
++#line 13886 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13947,16 +13902,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13950: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13905: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13953: \$? = $ac_status" >&5
++  echo "$as_me:13908: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13956: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13911: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13959: \$? = $ac_status" >&5
++  echo "$as_me:13914: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -13968,7 +13923,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13971: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:13926: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -13986,14 +13941,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:13989: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:13944: 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 13996 "configure"
++#line 13951 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14011,23 +13966,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14014: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13969: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14017: \$? = $ac_status" >&5
++  echo "$as_me:13972: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13975: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14023: \$? = $ac_status" >&5
++  echo "$as_me:13978: \$? = $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 14030 "configure"
++#line 13985 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14046,16 +14001,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14049: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14004: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14052: \$? = $ac_status" >&5
++  echo "$as_me:14007: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14055: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14010: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14058: \$? = $ac_status" >&5
++  echo "$as_me:14013: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -14067,7 +14022,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14070: result: $cf_cv_wchar_t" >&5
++echo "$as_me:14025: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -14090,14 +14045,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:14093: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:14048: 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 14100 "configure"
++#line 14055 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14115,23 +14070,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14118: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14073: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14121: \$? = $ac_status" >&5
++  echo "$as_me:14076: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14124: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14079: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14127: \$? = $ac_status" >&5
++  echo "$as_me:14082: \$? = $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 14134 "configure"
++#line 14089 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14150,16 +14105,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14153: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14108: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14156: \$? = $ac_status" >&5
++  echo "$as_me:14111: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14159: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14114: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14162: \$? = $ac_status" >&5
++  echo "$as_me:14117: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -14171,7 +14126,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14174: result: $cf_cv_wint_t" >&5
++echo "$as_me:14129: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -14203,7 +14158,7 @@
+ fi
+ 
+ ###   use option --disable-lp64 to allow long chtype
+-echo "$as_me:14206: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:14161: 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.
+@@ -14213,7 +14168,7 @@
+ else
+   with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:14216: result: $with_lp64" >&5
++echo "$as_me:14171: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+ 
+ if test "x$with_lp64" = xyes ; then
+@@ -14229,7 +14184,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:14232: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:14187: 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
+@@ -14241,7 +14196,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 14244 "configure"
++#line 14199 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14261,16 +14216,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14264: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14219: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14267: \$? = $ac_status" >&5
++  echo "$as_me:14222: \$? = $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:14225: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14273: \$? = $ac_status" >&5
++  echo "$as_me:14228: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14280,16 +14235,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14283: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14238: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14286: \$? = $ac_status" >&5
++  echo "$as_me:14241: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14289: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14244: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14292: \$? = $ac_status" >&5
++  echo "$as_me:14247: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -14303,13 +14258,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:14306: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:14261: 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:14312: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:14267: 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
+@@ -14317,7 +14272,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14320 "configure"
++#line 14275 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14337,16 +14292,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14340: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14295: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14343: \$? = $ac_status" >&5
++  echo "$as_me:14298: \$? = $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:14301: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14349: \$? = $ac_status" >&5
++  echo "$as_me:14304: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14355,7 +14310,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14358 "configure"
++#line 14313 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -14376,16 +14331,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14379: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14334: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14382: \$? = $ac_status" >&5
++  echo "$as_me:14337: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14385: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14340: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14388: \$? = $ac_status" >&5
++  echo "$as_me:14343: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -14396,7 +14351,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14399: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:14354: 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
+ 
+@@ -14406,7 +14361,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:14409: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:14364: 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
+@@ -14414,7 +14369,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14417 "configure"
++#line 14372 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14434,16 +14389,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14437: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14392: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14440: \$? = $ac_status" >&5
++  echo "$as_me:14395: \$? = $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:14398: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14446: \$? = $ac_status" >&5
++  echo "$as_me:14401: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14452,7 +14407,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14455 "configure"
++#line 14410 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -14473,16 +14428,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14476: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14431: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14479: \$? = $ac_status" >&5
++  echo "$as_me:14434: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14482: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14437: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14485: \$? = $ac_status" >&5
++  echo "$as_me:14440: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -14493,7 +14448,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14496: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:14451: 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
+ 
+@@ -14506,7 +14461,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:14509: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:14464: 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
+@@ -14514,7 +14469,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14517 "configure"
++#line 14472 "configure"
+ #include "confdefs.h"
+ #include 
+     #include 
+@@ -14529,16 +14484,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14532: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14487: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14535: \$? = $ac_status" >&5
++  echo "$as_me:14490: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14538: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14493: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14541: \$? = $ac_status" >&5
++  echo "$as_me:14496: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14547,7 +14502,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14550 "configure"
++#line 14505 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -14563,16 +14518,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14566: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14521: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14569: \$? = $ac_status" >&5
++  echo "$as_me:14524: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14572: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14527: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14575: \$? = $ac_status" >&5
++  echo "$as_me:14530: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -14583,7 +14538,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14586: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:14541: 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
+ 
+@@ -14597,13 +14552,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:14600: checking for fseeko" >&5
++echo "$as_me:14555: 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 14606 "configure"
++#line 14561 "configure"
+ #include "confdefs.h"
+ #include 
+                              #include 
+@@ -14617,16 +14572,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14620: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14575: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14623: \$? = $ac_status" >&5
++  echo "$as_me:14578: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14626: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14581: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14629: \$? = $ac_status" >&5
++  echo "$as_me:14584: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -14636,7 +14591,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14639: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:14594: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -14675,14 +14630,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:14678: checking whether to use struct dirent64" >&5
++	echo "$as_me:14633: 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 14685 "configure"
++#line 14640 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -14709,16 +14664,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14712: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14667: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14715: \$? = $ac_status" >&5
++  echo "$as_me:14670: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14718: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14673: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14721: \$? = $ac_status" >&5
++  echo "$as_me:14676: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -14729,7 +14684,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14732: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:14687: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -14739,7 +14694,7 @@
+ 	fi
+ 
+ ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:14742: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:14697: 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.
+@@ -14749,14 +14704,14 @@
+ else
+   with_tparm_varargs=yes
+ fi;
+-echo "$as_me:14752: result: $with_tparm_varargs" >&5
++echo "$as_me:14707: 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:14759: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:14714: 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.
+@@ -14766,14 +14721,14 @@
+ else
+   with_tic_depends=yes
+ fi;
+-echo "$as_me:14769: result: $with_tic_depends" >&5
++echo "$as_me:14724: 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:14776: checking if you want to enable wattr* macros" >&5
++echo "$as_me:14731: 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.
+@@ -14785,15 +14740,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ 	NCURSES_WATTR_MACROS=0
+-	echo "$as_me:14788: result: no" >&5
++	echo "$as_me:14743: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ else
+ 	NCURSES_WATTR_MACROS=1
+-	echo "$as_me:14792: result: yes" >&5
++	echo "$as_me:14747: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ fi
+ 
+-echo "$as_me:14796: checking for X11 rgb file" >&5
++echo "$as_me:14751: 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.
+@@ -14855,7 +14810,7 @@
+ 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:14858: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:14813: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14863,7 +14818,7 @@
+ 
+ fi
+ 
+-echo "$as_me:14866: result: $RGB_PATH" >&5
++echo "$as_me:14821: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:14836: 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.
+@@ -14888,17 +14843,17 @@
+ else
+   NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:14891: result: $NCURSES_BOOL" >&5
++echo "$as_me:14846: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ case x$NCURSES_BOOL in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14895: error: expected a type name for bool" >&5
++	{ { echo "$as_me:14850: error: expected a type name for bool" >&5
+ echo "$as_me: error: expected a type name for bool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+-echo "$as_me:14901: checking for alternate terminal capabilities file" >&5
++echo "$as_me:14856: 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.
+@@ -14910,16 +14865,16 @@
+ fi;
+ if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
+ then
+-	{ echo "$as_me:14913: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
++	{ echo "$as_me:14868: 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:14917: result: $TERMINFO_CAPS" >&5
++echo "$as_me:14872: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+ 
+ ###   use option --with-chtype to override chtype's type
+ 
+-echo "$as_me:14922: checking for type of chtype" >&5
++echo "$as_me:14877: 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.
+@@ -14929,11 +14884,11 @@
+ else
+   NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:14932: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:14887: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ case x$NCURSES_CHTYPE in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14936: error: expected a type name for chtype" >&5
++	{ { echo "$as_me:14891: error: expected a type name for chtype" >&5
+ echo "$as_me: error: expected a type name for chtype" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14941,7 +14896,7 @@
+ 
+ ###   use option --with-ospeed to override ospeed's type
+ 
+-echo "$as_me:14944: checking for type of ospeed" >&5
++echo "$as_me:14899: 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.
+@@ -14951,11 +14906,11 @@
+ else
+   NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:14954: result: $NCURSES_OSPEED" >&5
++echo "$as_me:14909: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ case x$NCURSES_OSPEED in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14958: error: expected a type name for ospeed" >&5
++	{ { echo "$as_me:14913: error: expected a type name for ospeed" >&5
+ echo "$as_me: error: expected a type name for ospeed" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -14963,7 +14918,7 @@
+ 
+ ###   use option --with-mmask-t to override mmask_t's type
+ 
+-echo "$as_me:14966: checking for type of mmask-t" >&5
++echo "$as_me:14921: 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.
+@@ -14973,18 +14928,18 @@
+ else
+   NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:14976: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:14931: result: $NCURSES_MMASK_T" >&5
+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+ case x$NCURSES_MMASK_T in
+ (x|xyes|xno)
+-	{ { echo "$as_me:14980: error: expected a type name for mmask-t" >&5
++	{ { echo "$as_me:14935: error: expected a type name for mmask-t" >&5
+ echo "$as_me: error: expected a type name for mmask-t" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ ###   use option --with-ccharw-max to override CCHARW_MAX size
+-echo "$as_me:14987: checking for size CCHARW_MAX" >&5
++echo "$as_me:14942: 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.
+@@ -14994,16 +14949,16 @@
+ else
+   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
+ fi;
+-echo "$as_me:14997: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:14952: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+ 
+-echo "$as_me:15000: checking for signed char" >&5
++echo "$as_me:14955: 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 15006 "configure"
++#line 14961 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15018,16 +14973,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15021: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14976: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15024: \$? = $ac_status" >&5
++  echo "$as_me:14979: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15027: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14982: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15030: \$? = $ac_status" >&5
++  echo "$as_me:14985: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -15037,10 +14992,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15040: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:14995: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:15043: checking size of signed char" >&5
++echo "$as_me:14998: 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
+@@ -15049,7 +15004,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15052 "configure"
++#line 15007 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15061,21 +15016,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15064: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15019: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15067: \$? = $ac_status" >&5
++  echo "$as_me:15022: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15070: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15025: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15073: \$? = $ac_status" >&5
++  echo "$as_me:15028: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15078 "configure"
++#line 15033 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15087,16 +15042,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15090: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15045: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15093: \$? = $ac_status" >&5
++  echo "$as_me:15048: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15096: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15051: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15099: \$? = $ac_status" >&5
++  echo "$as_me:15054: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -15112,7 +15067,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15115 "configure"
++#line 15070 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15124,16 +15079,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15127: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15082: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15130: \$? = $ac_status" >&5
++  echo "$as_me:15085: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15133: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15088: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15136: \$? = $ac_status" >&5
++  echo "$as_me:15091: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -15149,7 +15104,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 15152 "configure"
++#line 15107 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15161,16 +15116,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15164: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15119: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15167: \$? = $ac_status" >&5
++  echo "$as_me:15122: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15170: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15125: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15173: \$? = $ac_status" >&5
++  echo "$as_me:15128: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -15183,12 +15138,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:15186: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:15141: 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 15191 "configure"
++#line 15146 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15204,15 +15159,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:15207: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15162: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15210: \$? = $ac_status" >&5
++  echo "$as_me:15165: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:15212: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15167: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15215: \$? = $ac_status" >&5
++  echo "$as_me:15170: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -15228,7 +15183,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:15231: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:15186: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:15197: checking whether to use signed chars for Boolean array in term.h" >&5
+ echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6
+ 
+ # Check whether --enable-signed-char or --disable-signed-char was given.
+@@ -15249,13 +15204,13 @@
+ else
+   with_signed_char=$cf_dft_signed_char
+ fi;
+-echo "$as_me:15252: result: $with_signed_char" >&5
++echo "$as_me:15207: 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:15258: checking for type of tparm-arg" >&5
++echo "$as_me:15213: checking for type of tparm-arg" >&5
+ echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6
+ 
+ # Check whether --with-tparm-arg or --without-tparm-arg was given.
+@@ -15265,18 +15220,18 @@
+ else
+   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:15268: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:15223: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+ case x$NCURSES_TPARM_ARG in
+ (x|xyes|xno)
+-	{ { echo "$as_me:15272: error: expected a type name for tparm-arg" >&5
++	{ { echo "$as_me:15227: error: expected a type name for tparm-arg" >&5
+ echo "$as_me: error: expected a type name for tparm-arg" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:15279: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:15234: 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.
+@@ -15286,7 +15241,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:15289: result: $with_rcs_ids" >&5
++echo "$as_me:15244: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15295,7 +15250,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:15298: checking format of man-pages" >&5
++echo "$as_me:15253: 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.
+@@ -15386,10 +15341,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:15389: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:15344: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+-	{ echo "$as_me:15392: WARNING: Unexpected manpage-format $cf_unknown" >&5
++	{ echo "$as_me:15347: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+ 
+@@ -15430,7 +15385,7 @@
+ esac
+ done
+ 
+-echo "$as_me:15433: checking for manpage renaming" >&5
++echo "$as_me:15388: 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.
+@@ -15459,15 +15414,15 @@
+ elif test "$MANPAGE_RENAMES" = no ; then
+ 	:
+ elif test ! -f "$MANPAGE_RENAMES" ; then
+-	{ { echo "$as_me:15462: error: not a filename: $MANPAGE_RENAMES" >&5
++	{ { echo "$as_me:15417: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-echo "$as_me:15467: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:15422: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+ 
+-echo "$as_me:15470: checking if manpage aliases will be installed" >&5
++echo "$as_me:15425: 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.
+@@ -15478,7 +15433,7 @@
+   MANPAGE_ALIASES=yes
+ fi;
+ 
+-echo "$as_me:15481: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:15436: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+ 
+ case "x$LN_S" in
+@@ -15492,7 +15447,7 @@
+ 
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:15495: checking if manpage symlinks should be used" >&5
++echo "$as_me:15450: 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.
+@@ -15505,17 +15460,17 @@
+ 
+ if test "$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+-	{ echo "$as_me:15508: WARNING: cannot make symlinks" >&5
++	{ echo "$as_me:15463: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ 	MANPAGE_SYMLINKS=no
+ fi
+ fi
+ 
+-echo "$as_me:15514: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:15469: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+ 
+-echo "$as_me:15518: checking for manpage tbl" >&5
++echo "$as_me:15473: 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.
+@@ -15526,7 +15481,7 @@
+   MANPAGE_TBL=no
+ fi;
+ 
+-echo "$as_me:15529: result: $MANPAGE_TBL" >&5
++echo "$as_me:15484: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+ 
+ if test "$prefix" = "NONE" ; then
+@@ -15847,7 +15802,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15850: checking if you want to build with function extensions" >&5
++echo "$as_me:15805: 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.
+@@ -15857,7 +15812,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:15860: result: $with_ext_funcs" >&5
++echo "$as_me:15815: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -15914,7 +15869,7 @@
+ 	GENERATED_EXT_FUNCS=
+ fi
+ 
+-echo "$as_me:15917: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:15872: 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.
+@@ -15924,7 +15879,7 @@
+ else
+   with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:15927: result: $with_sp_funcs" >&5
++echo "$as_me:15882: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ 	NCURSES_SP_FUNCS=1
+@@ -15943,7 +15898,7 @@
+ 	GENERATED_SP_FUNCS=
+ fi
+ 
+-echo "$as_me:15946: checking if you want to build with terminal-driver" >&5
++echo "$as_me:15901: 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.
+@@ -15953,7 +15908,7 @@
+ else
+   with_term_driver=no
+ fi;
+-echo "$as_me:15956: result: $with_term_driver" >&5
++echo "$as_me:15911: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+ 
+@@ -15962,19 +15917,19 @@
+ EOF
+ 
+ 	if test "x$with_termlib" != xno ; then
+-		{ { echo "$as_me:15965: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:15920: 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:15970: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:15925: 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:15977: checking for extended use of const keyword" >&5
++echo "$as_me:15932: 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.
+@@ -15984,7 +15939,7 @@
+ else
+   with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:15987: result: $with_ext_const" >&5
++echo "$as_me:15942: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -15994,7 +15949,7 @@
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+ NCURSES_EXT_COLORS=0
+ NCURSES_RGB_COLORS=0
+-echo "$as_me:15997: checking if you want to use extended colors" >&5
++echo "$as_me:15952: 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.
+@@ -16004,11 +15959,11 @@
+ else
+   with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:16007: result: $with_ext_colors" >&5
++echo "$as_me:15962: result: $with_ext_colors" >&5
+ echo "${ECHO_T}$with_ext_colors" >&6
+ if test "x$with_ext_colors" = xyes ; then
+ 	if test "x$with_widec" != xyes ; then
+-		{ echo "$as_me:16011: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:15966: 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)
+@@ -16019,7 +15974,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16022: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:15977: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16045,7 +16000,7 @@
+ 
+ 	fi
+ 	###   use option --enable-rgb-color to extend support for direct-color
+-	echo "$as_me:16048: checking if you want to extend support for direct color" >&5
++	echo "$as_me:16003: checking if you want to extend support for direct color" >&5
+ echo $ECHO_N "checking if you want to extend support for direct color... $ECHO_C" >&6
+ 
+ # Check whether --enable-rgb-color or --disable-rgb-color was given.
+@@ -16055,7 +16010,7 @@
+ else
+   with_rgb_color=$cf_dft_rgb_color
+ fi;
+-	echo "$as_me:16058: result: $with_rgb_color" >&5
++	echo "$as_me:16013: result: $with_rgb_color" >&5
+ echo "${ECHO_T}$with_rgb_color" >&6
+ 	if test "x$with_rgb_color" = xyes ; then
+ 		NCURSES_RGB_COLORS=1
+@@ -16068,7 +16023,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:16071: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:16026: 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.
+@@ -16078,7 +16033,7 @@
+ else
+   with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:16081: result: $with_ext_mouse" >&5
++echo "$as_me:16036: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ if test "x$with_ext_mouse" = xyes ; then
+ 
+@@ -16088,7 +16043,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16091: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16046: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16105,7 +16060,7 @@
+ fi
+ 
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:16108: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:16063: 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.
+@@ -16115,7 +16070,7 @@
+ else
+   with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:16118: result: $with_ext_putwin" >&5
++echo "$as_me:16073: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+ 
+@@ -16125,7 +16080,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16128: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:16083: 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.
+@@ -16135,7 +16090,7 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:16138: result: $with_no_padding" >&5
++echo "$as_me:16093: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16143,7 +16098,7 @@
+ EOF
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:16146: checking if you want SIGWINCH handler" >&5
++echo "$as_me:16101: 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.
+@@ -16153,7 +16108,7 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:16156: result: $with_sigwinch" >&5
++echo "$as_me:16111: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ if test "x$with_sigwinch" = xyes
+ then
+@@ -16168,7 +16123,7 @@
+ fi
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:16171: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:16126: 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.
+@@ -16178,7 +16133,7 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:16181: result: $with_tcap_names" >&5
++echo "$as_me:16136: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ if test "x$with_tcap_names" = xyes; then
+@@ -16192,7 +16147,7 @@
+ 
+ ##############################################################################
+ 
+-echo "$as_me:16195: checking if you want to link with the pthread library" >&5
++echo "$as_me:16150: 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.
+@@ -16202,27 +16157,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:16205: result: $with_pthread" >&5
++echo "$as_me:16160: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:16209: checking for pthread.h" >&5
++	echo "$as_me:16164: 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 16215 "configure"
++#line 16170 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:16219: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16174: \"$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:16225: \$? = $ac_status" >&5
++  echo "$as_me:16180: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16241,7 +16196,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:16244: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:16199: 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
+ 
+@@ -16251,7 +16206,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:16254: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:16209: 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"
+ 
+@@ -16272,7 +16227,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16275 "configure"
++#line 16230 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16289,16 +16244,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16292: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16247: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16295: \$? = $ac_status" >&5
++  echo "$as_me:16250: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16298: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16253: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16301: \$? = $ac_status" >&5
++  echo "$as_me:16256: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -16308,7 +16263,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:16311: result: $with_pthread" >&5
++	    echo "$as_me:16266: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -16336,7 +16291,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:16339: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:16294: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -16346,13 +16301,13 @@
+ fi
+ 
+ if test "x$with_pthread" != xno; then
+-	echo "$as_me:16349: checking for pthread_kill" >&5
++	echo "$as_me:16304: 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 16355 "configure"
++#line 16310 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16383,16 +16338,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16386: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16341: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16389: \$? = $ac_status" >&5
++  echo "$as_me:16344: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16392: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16347: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16395: \$? = $ac_status" >&5
++  echo "$as_me:16350: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_pthread_kill=yes
+ else
+@@ -16402,11 +16357,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16405: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:16360: 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:16409: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:16364: 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.
+@@ -16416,7 +16371,7 @@
+ else
+   use_pthreads_eintr=no
+ fi;
+-		echo "$as_me:16419: result: $use_pthreads_eintr" >&5
++		echo "$as_me:16374: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ 		if test "x$use_pthreads_eintr" = xyes ; then
+ 
+@@ -16427,7 +16382,7 @@
+ 		fi
+ fi
+ 
+-	echo "$as_me:16430: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:16385: 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.
+@@ -16437,18 +16392,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-	echo "$as_me:16440: result: $use_weak_symbols" >&5
++	echo "$as_me:16395: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ 	if test "x$use_weak_symbols" = xyes ; then
+ 
+-echo "$as_me:16444: checking if $CC supports weak symbols" >&5
++echo "$as_me:16399: 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 16451 "configure"
++#line 16406 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16474,16 +16429,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16477: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16432: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16480: \$? = $ac_status" >&5
++  echo "$as_me:16435: \$? = $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:16438: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16486: \$? = $ac_status" >&5
++  echo "$as_me:16441: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -16494,7 +16449,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16497: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:16452: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ 	else
+@@ -16544,7 +16499,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:16547: checking if you want reentrant code" >&5
++echo "$as_me:16502: 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.
+@@ -16554,7 +16509,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:16557: result: $with_reentrant" >&5
++echo "$as_me:16512: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -16643,7 +16598,7 @@
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+ 		cf_cv_abi_default=6
+-		{ echo "$as_me:16646: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
++		{ echo "$as_me:16601: WARNING: overriding ABI version to $cf_cv_abi_default" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;}
+ 		;;
+ 	esac
+@@ -16655,7 +16610,7 @@
+ 	NCURSES_SIZE_T=$cf_dft_ordinate_type
+ fi
+ 
+-echo "$as_me:16658: checking whether curses library structures should be opaque" >&5
++echo "$as_me:16613: checking whether curses library structures should be opaque" >&5
+ echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
+@@ -16677,16 +16632,16 @@
+ 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16680: result: $enable_opaque_curses" >&5
++echo "$as_me:16635: 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:16685: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:16640: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:16689: checking whether form library structures should be opaque" >&5
++echo "$as_me:16644: checking whether form library structures should be opaque" >&5
+ echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-form or --disable-opaque-form was given.
+@@ -16703,10 +16658,10 @@
+ 	enable_opaque_form=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16706: result: $enable_opaque_form" >&5
++echo "$as_me:16661: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+ 
+-echo "$as_me:16709: checking whether menu library structures should be opaque" >&5
++echo "$as_me:16664: checking whether menu library structures should be opaque" >&5
+ echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
+@@ -16723,10 +16678,10 @@
+ 	enable_opaque_menu=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16726: result: $enable_opaque_menu" >&5
++echo "$as_me:16681: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+ 
+-echo "$as_me:16729: checking whether panel library structures should be opaque" >&5
++echo "$as_me:16684: checking whether panel library structures should be opaque" >&5
+ echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
+@@ -16743,7 +16698,7 @@
+ 	enable_opaque_panel=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:16746: result: $enable_opaque_panel" >&5
++echo "$as_me:16701: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+ 
+ NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -16753,7 +16708,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:16756: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:16711: 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.
+@@ -16763,7 +16718,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:16766: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:16721: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -16776,7 +16731,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:16779: checking if you want all development code" >&5
++echo "$as_me:16734: 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.
+@@ -16786,11 +16741,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:16789: result: $with_develop" >&5
++echo "$as_me:16744: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###   use option --enable-check-size to detect screensize with CPR
+-echo "$as_me:16793: checking if you want to check screensize of serial terminals" >&5
++echo "$as_me:16748: checking if you want to check screensize of serial terminals" >&5
+ echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6
+ 
+ # Check whether --enable-check-size or --disable-check-size was given.
+@@ -16800,7 +16755,7 @@
+ else
+   enable_check_size=$with_develop
+ fi;
+-echo "$as_me:16803: result: $enable_check_size" >&5
++echo "$as_me:16758: result: $enable_check_size" >&5
+ echo "${ECHO_T}$enable_check_size" >&6
+ test "x$enable_check_size" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16808,7 +16763,7 @@
+ EOF
+ 
+ ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
+-echo "$as_me:16811: checking if you want hard-tabs code" >&5
++echo "$as_me:16766: 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.
+@@ -16818,7 +16773,7 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:16821: result: $enable_hard_tabs" >&5
++echo "$as_me:16776: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16826,7 +16781,7 @@
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:16829: checking if you want limited support for xmc" >&5
++echo "$as_me:16784: 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.
+@@ -16836,7 +16791,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:16839: result: $enable_xmc_glitch" >&5
++echo "$as_me:16794: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16846,7 +16801,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:16849: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:16804: 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.
+@@ -16856,7 +16811,7 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:16859: result: $with_assumed_color" >&5
++echo "$as_me:16814: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16864,7 +16819,7 @@
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:16867: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:16822: 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.
+@@ -16874,7 +16829,7 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:16877: result: $with_hashmap" >&5
++echo "$as_me:16832: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16882,7 +16837,7 @@
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:16885: checking if you want colorfgbg code" >&5
++echo "$as_me:16840: 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.
+@@ -16892,7 +16847,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:16895: result: $with_colorfgbg" >&5
++echo "$as_me:16850: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16900,7 +16855,7 @@
+ EOF
+ 
+ ###   use option --enable-fvisibility to turn on use of gcc-specific feature
+-echo "$as_me:16903: checking if you want to use gcc -fvisibility option" >&5
++echo "$as_me:16858: 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.
+@@ -16910,14 +16865,14 @@
+ else
+   cf_with_fvisibility=no
+ fi;
+-echo "$as_me:16913: result: $cf_with_fvisibility" >&5
++echo "$as_me:16868: 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:16920: checking if $CC -fvisibility=hidden option works" >&5
++echo "$as_me:16875: 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
+@@ -16926,7 +16881,7 @@
+     cf_save_cflags="$CFLAGS"
+     CFLAGS="$CFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16929 "configure"
++#line 16884 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16942,16 +16897,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16945: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16900: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16948: \$? = $ac_status" >&5
++  echo "$as_me:16903: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16951: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16906: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16954: \$? = $ac_status" >&5
++  echo "$as_me:16909: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden=yes
+ else
+@@ -16963,7 +16918,7 @@
+     CFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16966: result: $cf_cv_fvisibility_hidden" >&5
++echo "$as_me:16921: result: $cf_cv_fvisibility_hidden" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
+ 
+ 	if test "x$cf_cv_fvisibility_hidden" = xyes
+@@ -17078,7 +17033,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:17081: checking if $CXX -fvisibility=hidden option works" >&5
++echo "$as_me:17036: 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
+@@ -17087,7 +17042,7 @@
+     cf_save_cflags="$CXXFLAGS"
+     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17090 "configure"
++#line 17045 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -17103,16 +17058,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17106: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17061: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17109: \$? = $ac_status" >&5
++  echo "$as_me:17064: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17112: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17067: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17115: \$? = $ac_status" >&5
++  echo "$as_me:17070: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden2=yes
+ else
+@@ -17124,7 +17079,7 @@
+     CXXFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:17127: result: $cf_cv_fvisibility_hidden2" >&5
++echo "$as_me:17082: result: $cf_cv_fvisibility_hidden2" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
+ 
+ 		if test "x$cf_cv_fvisibility_hidden2" = xyes
+@@ -17247,7 +17202,7 @@
+ fi
+ 
+ ###   use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:17250: checking if you want interop bindings" >&5
++echo "$as_me:17205: 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.
+@@ -17257,13 +17212,13 @@
+ else
+   with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:17260: result: $with_exp_interop" >&5
++echo "$as_me:17215: 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:17266: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:17221: 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.
+@@ -17273,13 +17228,13 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:17276: result: $with_safe_sprintf" >&5
++echo "$as_me:17231: 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:17282: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:17237: 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.
+@@ -17289,7 +17244,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:17292: result: $with_scroll_hints" >&5
++echo "$as_me:17247: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -17303,7 +17258,7 @@
+ 	NCURSES_WGETCH_EVENTS=0
+ 	;;
+ (*)
+-echo "$as_me:17306: checking if you want wgetch-events code" >&5
++echo "$as_me:17261: 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.
+@@ -17313,7 +17268,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:17316: result: $with_wgetch_events" >&5
++echo "$as_me:17271: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ if test "x$with_wgetch_events" = xyes ; then
+ 
+@@ -17329,7 +17284,7 @@
+ 
+ case "$cf_cv_system_name" in
+ (*mingw32*|*mingw64*|*-msvc*)
+-	echo "$as_me:17332: checking if you want experimental-Windows driver" >&5
++	echo "$as_me:17287: 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.
+@@ -17339,7 +17294,7 @@
+ else
+   with_exp_win32=no
+ fi;
+-	echo "$as_me:17342: result: $with_exp_win32" >&5
++	echo "$as_me:17297: result: $with_exp_win32" >&5
+ echo "${ECHO_T}$with_exp_win32" >&6
+ 	if test "x$with_exp_win32" = xyes
+ 	then
+@@ -17365,7 +17320,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:17368: checking if you want to see long compiling messages" >&5
++echo "$as_me:17323: 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.
+@@ -17399,7 +17354,7 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:17402: result: $enableval" >&5
++echo "$as_me:17357: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ if test "x$enable_echo" = xyes; then
+@@ -17412,7 +17367,7 @@
+ 
+ # --disable-stripping is used for debugging
+ 
+-echo "$as_me:17415: checking if you want to install stripped executables" >&5
++echo "$as_me:17370: 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.
+@@ -17429,7 +17384,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:17432: result: $enable_stripping" >&5
++echo "$as_me:17387: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -17440,7 +17395,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:17443: checking if install accepts -p option" >&5
++echo "$as_me:17398: 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
+@@ -17471,10 +17426,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:17474: result: $cf_cv_install_p" >&5
++echo "$as_me:17429: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:17477: checking if install needs to be told about ownership" >&5
++echo "$as_me:17432: 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)
+@@ -17485,7 +17440,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:17488: result: $with_install_o" >&5
++echo "$as_me:17443: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -17496,7 +17451,7 @@
+ 
+ if test -n "$INSTALL_OPT_S"
+ then
+-	echo "$as_me:17499: checking if you want to specify strip-program" >&5
++	echo "$as_me:17454: checking if you want to specify strip-program" >&5
+ echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6
+ 
+ # Check whether --with-strip-program or --without-strip-program was given.
+@@ -17506,11 +17461,11 @@
+ else
+   with_strip_program=no
+ fi;
+-	echo "$as_me:17509: result: $with_strip_program" >&5
++	echo "$as_me:17464: result: $with_strip_program" >&5
+ echo "${ECHO_T}$with_strip_program" >&6
+ 	if test "$with_strip_program" != no
+ 	then
+-		echo "$as_me:17513: checking if strip-program is supported with this installer" >&5
++		echo "$as_me:17468: checking if strip-program is supported with this installer" >&5
+ echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6
+ 		cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'`
+ 		check_install_strip=no
+@@ -17531,11 +17486,11 @@
+ 				done
+ 			fi
+ 		fi
+-		echo "$as_me:17534: result: $check_install_strip" >&5
++		echo "$as_me:17489: result: $check_install_strip" >&5
+ echo "${ECHO_T}$check_install_strip" >&6
+ 		case "$check_install_strip" in
+ 		(no)
+-			{ echo "$as_me:17538: WARNING: $cf_install_program does not support strip program option" >&5
++			{ echo "$as_me:17493: WARNING: $cf_install_program does not support strip program option" >&5
+ echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;}
+ 			with_strip_program=no
+ 			;;
+@@ -17550,7 +17505,7 @@
+ 			chmod +x "$INSTALL"
+ 			test -n "$verbose" && echo "	created $INSTALL" 1>&6
+ 
+-echo "${as_me:-configure}:17553: testing created $INSTALL ..." 1>&5
++echo "${as_me:-configure}:17508: testing created $INSTALL ..." 1>&5
+ 
+ 			;;
+ 		(option)
+@@ -17576,7 +17531,7 @@
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+ 
+-echo "$as_me:17579: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:17534: 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.
+@@ -17593,17 +17548,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:17596: result: $enable_stdnoreturn" >&5
++echo "$as_me:17551: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:17600: checking for C11 _Noreturn feature" >&5
++echo "$as_me:17555: 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 17606 "configure"
++#line 17561 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17619,16 +17574,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17622: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17577: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17625: \$? = $ac_status" >&5
++  echo "$as_me:17580: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17628: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17583: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17631: \$? = $ac_status" >&5
++  echo "$as_me:17586: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -17639,7 +17594,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17642: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:17597: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -17695,16 +17650,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17698: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17653: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17703: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17658: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17707: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17662: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17743,16 +17698,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17746: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17701: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17751: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:17706: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17755: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17710: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -17791,23 +17746,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17794: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17749: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17799: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:17754: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:17803: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:17758: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:17810: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:17765: 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.
+@@ -17824,7 +17779,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:17827: result: $enable_warnings" >&5
++echo "$as_me:17782: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -17848,7 +17803,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17851 "configure"
++#line 17806 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -17863,26 +17818,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17866: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17821: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17869: \$? = $ac_status" >&5
++  echo "$as_me:17824: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17872: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17827: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17875: \$? = $ac_status" >&5
++  echo "$as_me:17830: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:17878: checking for X11/Xt const-feature" >&5
++echo "$as_me:17833: 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 17885 "configure"
++#line 17840 "configure"
+ #include "confdefs.h"
+ 
+ #undef  _CONST_X_STRING
+@@ -17900,16 +17855,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17903: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17858: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17906: \$? = $ac_status" >&5
++  echo "$as_me:17861: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17909: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17864: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17912: \$? = $ac_status" >&5
++  echo "$as_me:17867: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -17924,7 +17879,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:17927: result: $cf_cv_const_x_string" >&5
++echo "$as_me:17882: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -17953,7 +17908,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:17927: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -17985,12 +17940,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17988: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17943: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17991: \$? = $ac_status" >&5
++  echo "$as_me:17946: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17993: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17948: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -17998,7 +17953,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:18001: checking for $CC warning options..." >&5
++	{ echo "$as_me:17956: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -18021,12 +17976,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:18024: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17979: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18027: \$? = $ac_status" >&5
++  echo "$as_me:17982: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18029: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17984: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -18034,7 +17989,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:18037: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17992: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -18044,7 +17999,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:18047: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:18002: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -18077,10 +18032,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:18080: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:18035: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <
+ #include "confdefs.h"
+ #include "conftest.h"
+@@ -18130,12 +18085,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:18133: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18088: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18136: \$? = $ac_status" >&5
++  echo "$as_me:18091: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18138: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:18093: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -18207,12 +18162,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:18210: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:18165: 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 18215 "configure"
++#line 18170 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18229,16 +18184,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18232: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18187: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18235: \$? = $ac_status" >&5
++  echo "$as_me:18190: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18238: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18193: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18241: \$? = $ac_status" >&5
++  echo "$as_me:18196: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -18249,7 +18204,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:18252: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:18207: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -18258,11 +18213,11 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:18261: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:18216: 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 18265 "configure"
++#line 18220 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18279,16 +18234,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:18282: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18237: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18285: \$? = $ac_status" >&5
++  echo "$as_me:18240: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:18288: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18243: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18291: \$? = $ac_status" >&5
++  echo "$as_me:18246: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_CPLUSPLUS=yes
+ 
+@@ -18298,7 +18253,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:18301: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:18256: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -18307,30 +18262,30 @@
+ if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:18310: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:18265: 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:18317: checking version of $CC" >&5
++	echo "$as_me:18272: 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:18321: result: $CLANG_VERSION" >&5
++	echo "$as_me:18276: 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:18328: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:18283: 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 18333 "configure"
++#line 18288 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -18344,16 +18299,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18347: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18302: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18350: \$? = $ac_status" >&5
++  echo "$as_me:18305: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18353: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18308: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18356: \$? = $ac_status" >&5
++  echo "$as_me:18311: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -18364,13 +18319,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:18367: result: $cf_clang_optok" >&5
++		echo "$as_me:18322: 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}:18373: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:18328: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -18387,7 +18342,7 @@
+ ac_main_return="return"
+ 
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:18363: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -18422,12 +18377,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:18425: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18380: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18428: \$? = $ac_status" >&5
++  echo "$as_me:18383: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18430: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18385: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -18436,7 +18391,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:18439: checking for $CXX warning options..." >&5
++	{ echo "$as_me:18394: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -18466,16 +18421,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:18469: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:18424: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:18472: \$? = $ac_status" >&5
++  echo "$as_me:18427: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:18474: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18429: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:18478: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:18433: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -18493,7 +18448,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:18496: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:18451: 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.
+@@ -18503,7 +18458,7 @@
+ else
+   enable_string_hacks=no
+ fi;
+-echo "$as_me:18506: result: $enable_string_hacks" >&5
++echo "$as_me:18461: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+ 
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -18512,15 +18467,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:18515: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:18470: 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:18517: checking for strlcat" >&5
++	echo "$as_me:18472: 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 18523 "configure"
++#line 18478 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18551,16 +18506,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18554: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18509: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18557: \$? = $ac_status" >&5
++  echo "$as_me:18512: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18560: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18515: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18563: \$? = $ac_status" >&5
++  echo "$as_me:18518: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -18570,7 +18525,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18573: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:18528: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+ 
+@@ -18580,7 +18535,7 @@
+ 
+ else
+ 
+-		echo "$as_me:18583: checking for strlcat in -lbsd" >&5
++		echo "$as_me:18538: 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
+@@ -18588,7 +18543,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18591 "configure"
++#line 18546 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18607,16 +18562,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18610: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18565: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18613: \$? = $ac_status" >&5
++  echo "$as_me:18568: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18616: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18571: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18619: \$? = $ac_status" >&5
++  echo "$as_me:18574: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -18627,7 +18582,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18630: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:18585: 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
+ 
+@@ -18650,23 +18605,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:18653: checking for $ac_header" >&5
++echo "$as_me:18608: 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 18659 "configure"
++#line 18614 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:18663: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18618: \"$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:18669: \$? = $ac_status" >&5
++  echo "$as_me:18624: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18685,7 +18640,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18688: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:18643: 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:18664: 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 18715 "configure"
++#line 18670 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18743,16 +18698,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18746: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18701: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18749: \$? = $ac_status" >&5
++  echo "$as_me:18704: \$? = $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:18707: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18755: \$? = $ac_status" >&5
++  echo "$as_me:18710: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -18762,7 +18717,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18765: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:18720: 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:18733: 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.
+@@ -18785,7 +18740,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:18788: result: $with_assertions" >&5
++echo "$as_me:18743: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -18801,7 +18756,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:18804: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:18759: 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.
+@@ -18823,7 +18778,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:18826: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:18781: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18937,23 +18892,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:18940: checking for dmalloc.h" >&5
++	echo "$as_me:18895: 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 18946 "configure"
++#line 18901 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:18950: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18905: \"$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:18956: \$? = $ac_status" >&5
++  echo "$as_me:18911: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18972,11 +18927,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18975: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:18930: 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:18979: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:18934: 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
+@@ -18984,7 +18939,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18987 "configure"
++#line 18942 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19003,16 +18958,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19006: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18961: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19009: \$? = $ac_status" >&5
++  echo "$as_me:18964: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19012: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18967: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19015: \$? = $ac_status" >&5
++  echo "$as_me:18970: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -19023,7 +18978,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19026: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:18981: 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:18996: 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.
+@@ -19060,7 +19015,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:19063: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:19018: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19174,23 +19129,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:19177: checking for dbmalloc.h" >&5
++	echo "$as_me:19132: 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 19183 "configure"
++#line 19138 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:19187: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:19142: \"$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:19193: \$? = $ac_status" >&5
++  echo "$as_me:19148: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19209,11 +19164,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:19212: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:19167: 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:19216: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:19171: 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
+@@ -19221,7 +19176,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19224 "configure"
++#line 19179 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19240,16 +19195,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19243: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19198: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19246: \$? = $ac_status" >&5
++  echo "$as_me:19201: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19249: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19204: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19252: \$? = $ac_status" >&5
++  echo "$as_me:19207: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -19260,7 +19215,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19263: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:19218: 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:19233: 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.
+@@ -19297,7 +19252,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:19300: result: ${with_valgrind:-no}" >&5
++echo "$as_me:19255: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -19410,7 +19365,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19413: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:19368: 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.
+@@ -19421,7 +19376,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:19424: result: $with_no_leaks" >&5
++echo "$as_me:19379: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -19473,7 +19428,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19476: checking whether to add trace feature to all models" >&5
++echo "$as_me:19431: 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.
+@@ -19483,7 +19438,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:19486: result: $cf_with_trace" >&5
++echo "$as_me:19441: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -19503,7 +19458,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:19506: checking if we want to use GNAT projects" >&5
++echo "$as_me:19461: 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.
+@@ -19520,7 +19475,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:19523: result: $enable_gnat_projects" >&5
++echo "$as_me:19478: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -19533,14 +19488,14 @@
+ 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+ 	fi
+ 
+-echo "$as_me:19536: checking if ssp library is needed" >&5
++echo "$as_me:19491: 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 19543 "configure"
++#line 19498 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19557,16 +19512,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19560: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19515: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19563: \$? = $ac_status" >&5
++  echo "$as_me:19518: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19566: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19521: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19569: \$? = $ac_status" >&5
++  echo "$as_me:19524: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -19576,7 +19531,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19579 "configure"
++#line 19534 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -19593,16 +19548,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19596: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19551: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19599: \$? = $ac_status" >&5
++  echo "$as_me:19554: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19602: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19557: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19605: \$? = $ac_status" >&5
++  echo "$as_me:19560: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -19616,7 +19571,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19619: result: $cf_cv_need_libssp" >&5
++echo "$as_me:19574: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -19645,14 +19600,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:19648: checking if -lm needed for math functions" >&5
++echo "$as_me:19603: 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 19655 "configure"
++#line 19610 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19668,16 +19623,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19671: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19626: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19674: \$? = $ac_status" >&5
++  echo "$as_me:19629: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19677: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19632: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19680: \$? = $ac_status" >&5
++  echo "$as_me:19635: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -19687,7 +19642,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19690: result: $cf_cv_need_libm" >&5
++echo "$as_me:19645: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ 
+ if test "$cf_cv_need_libm" = yes
+@@ -19695,14 +19650,14 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lm"
+-	echo "$as_me:19698: checking if -lm is available for math functions" >&5
++	echo "$as_me:19653: checking if -lm is available for math functions" >&5
+ echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
+ if test "${cf_cv_have_libm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19705 "configure"
++#line 19660 "configure"
+ #include "confdefs.h"
+ 
+ 		#include 
+@@ -19718,16 +19673,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19721: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19676: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19724: \$? = $ac_status" >&5
++  echo "$as_me:19679: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19727: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19682: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19730: \$? = $ac_status" >&5
++  echo "$as_me:19685: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_libm=yes
+ else
+@@ -19737,7 +19692,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19740: result: $cf_cv_have_libm" >&5
++echo "$as_me:19695: result: $cf_cv_have_libm" >&5
+ echo "${ECHO_T}$cf_cv_have_libm" >&6
+ 	LIBS="$cf_save_LIBS"
+ 
+@@ -19759,13 +19714,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:19762: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:19717: 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 19768 "configure"
++#line 19723 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -19781,16 +19736,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19784: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19739: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19787: \$? = $ac_status" >&5
++  echo "$as_me:19742: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19790: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19745: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19793: \$? = $ac_status" >&5
++  echo "$as_me:19748: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -19800,7 +19755,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19803: result: $ac_cv_header_time" >&5
++echo "$as_me:19758: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -19815,7 +19770,7 @@
+ case "$host_os" in
+ (mingw*)
+ 	# -lsystre -ltre -lintl -liconv
+-	echo "$as_me:19818: checking for regcomp in -lsystre" >&5
++	echo "$as_me:19773: 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
+@@ -19823,7 +19778,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsystre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19826 "configure"
++#line 19781 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19842,16 +19797,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19845: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19800: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19848: \$? = $ac_status" >&5
++  echo "$as_me:19803: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19851: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19806: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19854: \$? = $ac_status" >&5
++  echo "$as_me:19809: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_systre_regcomp=yes
+ else
+@@ -19862,11 +19817,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19865: result: $ac_cv_lib_systre_regcomp" >&5
++echo "$as_me:19820: 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:19869: checking for libiconv_open in -liconv" >&5
++		echo "$as_me:19824: 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
+@@ -19874,7 +19829,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19877 "configure"
++#line 19832 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19893,16 +19848,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19896: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19851: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19899: \$? = $ac_status" >&5
++  echo "$as_me:19854: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19902: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19857: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19905: \$? = $ac_status" >&5
++  echo "$as_me:19860: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_iconv_libiconv_open=yes
+ else
+@@ -19913,7 +19868,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19916: result: $ac_cv_lib_iconv_libiconv_open" >&5
++echo "$as_me:19871: 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
+ 
+@@ -19935,7 +19890,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19938: checking for libintl_gettext in -lintl" >&5
++		echo "$as_me:19893: 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
+@@ -19943,7 +19898,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19946 "configure"
++#line 19901 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19962,16 +19917,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19965: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19920: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19968: \$? = $ac_status" >&5
++  echo "$as_me:19923: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19971: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19926: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19974: \$? = $ac_status" >&5
++  echo "$as_me:19929: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_intl_libintl_gettext=yes
+ else
+@@ -19982,7 +19937,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19985: result: $ac_cv_lib_intl_libintl_gettext" >&5
++echo "$as_me:19940: 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
+ 
+@@ -20004,7 +19959,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:20007: checking for tre_regcomp in -ltre" >&5
++		echo "$as_me:19962: 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
+@@ -20012,7 +19967,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20015 "configure"
++#line 19970 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20031,16 +19986,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20034: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19989: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20037: \$? = $ac_status" >&5
++  echo "$as_me:19992: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20040: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19995: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20043: \$? = $ac_status" >&5
++  echo "$as_me:19998: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_tre_tre_regcomp=yes
+ else
+@@ -20051,7 +20006,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20054: result: $ac_cv_lib_tre_tre_regcomp" >&5
++echo "$as_me:20009: 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
+ 
+@@ -20093,7 +20048,7 @@
+ 
+ else
+ 
+-		echo "$as_me:20096: checking for regcomp in -lgnurx" >&5
++		echo "$as_me:20051: 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
+@@ -20101,7 +20056,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgnurx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20104 "configure"
++#line 20059 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20120,16 +20075,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20123: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20078: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20126: \$? = $ac_status" >&5
++  echo "$as_me:20081: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20129: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20084: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20132: \$? = $ac_status" >&5
++  echo "$as_me:20087: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gnurx_regcomp=yes
+ else
+@@ -20140,7 +20095,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20143: result: $ac_cv_lib_gnurx_regcomp" >&5
++echo "$as_me:20098: 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
+ 
+@@ -20168,13 +20123,13 @@
+ 	;;
+ (*)
+ 	cf_regex_libs="regex re"
+-	echo "$as_me:20171: checking for regcomp" >&5
++	echo "$as_me:20126: 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 20177 "configure"
++#line 20132 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20205,16 +20160,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20208: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20163: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20211: \$? = $ac_status" >&5
++  echo "$as_me:20166: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20214: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20169: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20217: \$? = $ac_status" >&5
++  echo "$as_me:20172: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -20224,7 +20179,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20227: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:20182: 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
+@@ -20233,7 +20188,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:20236: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:20191: 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
+@@ -20241,7 +20196,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20244 "configure"
++#line 20199 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20260,16 +20215,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20263: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20218: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20266: \$? = $ac_status" >&5
++  echo "$as_me:20221: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20269: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20224: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20272: \$? = $ac_status" >&5
++  echo "$as_me:20227: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -20280,7 +20235,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20283: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:20238: 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
+ 
+@@ -20312,13 +20267,13 @@
+ esac
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:20315: checking for compile" >&5
++	echo "$as_me:20270: 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 20321 "configure"
++#line 20276 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20349,16 +20304,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20352: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20307: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20355: \$? = $ac_status" >&5
++  echo "$as_me:20310: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20358: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20313: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20361: \$? = $ac_status" >&5
++  echo "$as_me:20316: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -20368,13 +20323,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20371: result: $ac_cv_func_compile" >&5
++echo "$as_me:20326: 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:20377: checking for compile in -lgen" >&5
++		echo "$as_me:20332: 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
+@@ -20382,7 +20337,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20385 "configure"
++#line 20340 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -20401,16 +20356,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20404: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20359: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20407: \$? = $ac_status" >&5
++  echo "$as_me:20362: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20410: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20365: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20413: \$? = $ac_status" >&5
++  echo "$as_me:20368: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -20421,7 +20376,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:20424: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:20379: 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
+ 
+@@ -20449,11 +20404,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:20452: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:20407: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:20456: checking for regular-expression headers" >&5
++echo "$as_me:20411: 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
+@@ -20465,7 +20420,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20468 "configure"
++#line 20423 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -20482,16 +20437,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20485: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20440: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20488: \$? = $ac_status" >&5
++  echo "$as_me:20443: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20491: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20446: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20494: \$? = $ac_status" >&5
++  echo "$as_me:20449: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20508,7 +20463,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20511 "configure"
++#line 20466 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -20529,16 +20484,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20532: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20487: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20535: \$? = $ac_status" >&5
++  echo "$as_me:20490: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20538: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20493: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20541: \$? = $ac_status" >&5
++  echo "$as_me:20496: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20554,11 +20509,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:20557: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:20512: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case "$cf_cv_regex_hdrs" in
+-	(no)		{ echo "$as_me:20561: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:20516: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -20598,23 +20553,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20601: checking for $ac_header" >&5
++echo "$as_me:20556: 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 20607 "configure"
++#line 20562 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20611: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20566: \"$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:20617: \$? = $ac_status" >&5
++  echo "$as_me:20572: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20633,7 +20588,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20636: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20591: 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:20604: 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 20655 "configure"
++#line 20610 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20659: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20614: \"$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:20665: \$? = $ac_status" >&5
++  echo "$as_me:20620: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20681,7 +20636,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20684: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20639: 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:20649: 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
+@@ -20701,7 +20656,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20704 "configure"
++#line 20659 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20714,16 +20669,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20717: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20672: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20720: \$? = $ac_status" >&5
++  echo "$as_me:20675: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20723: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20678: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20726: \$? = $ac_status" >&5
++  echo "$as_me:20681: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -20735,7 +20690,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20738: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20693: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -20752,14 +20707,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20755: checking if external environ is declared" >&5
++echo "$as_me:20710: 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 20762 "configure"
++#line 20717 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -20772,16 +20727,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20775: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20730: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20778: \$? = $ac_status" >&5
++  echo "$as_me:20733: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20781: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20736: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20784: \$? = $ac_status" >&5
++  echo "$as_me:20739: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_environ=yes
+ else
+@@ -20792,7 +20747,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20795: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20750: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+ 
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20807,14 +20762,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:20810: checking if external environ exists" >&5
++echo "$as_me:20765: 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 20817 "configure"
++#line 20772 "configure"
+ #include "confdefs.h"
+ 
+ #undef environ
+@@ -20829,16 +20784,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20832: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20787: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20835: \$? = $ac_status" >&5
++  echo "$as_me:20790: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20838: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20793: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20841: \$? = $ac_status" >&5
++  echo "$as_me:20796: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_environ=yes
+ else
+@@ -20849,7 +20804,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20852: result: $cf_cv_have_environ" >&5
++echo "$as_me:20807: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+ 
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20862,13 +20817,13 @@
+ 
+ fi
+ 
+-echo "$as_me:20865: checking for getenv" >&5
++echo "$as_me:20820: 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 20871 "configure"
++#line 20826 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20899,16 +20854,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20902: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20857: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20905: \$? = $ac_status" >&5
++  echo "$as_me:20860: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20908: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20863: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20911: \$? = $ac_status" >&5
++  echo "$as_me:20866: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_getenv=yes
+ else
+@@ -20918,19 +20873,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20921: result: $ac_cv_func_getenv" >&5
++echo "$as_me:20876: 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:20927: checking for $ac_func" >&5
++echo "$as_me:20882: 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 20933 "configure"
++#line 20888 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20961,16 +20916,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20964: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20919: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20967: \$? = $ac_status" >&5
++  echo "$as_me:20922: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20970: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20925: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20973: \$? = $ac_status" >&5
++  echo "$as_me:20928: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -20980,7 +20935,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20983: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:20938: 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:20948: 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
+@@ -21000,7 +20955,7 @@
+   cf_cv_consistent_getenv=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21003 "configure"
++#line 20958 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21105,15 +21060,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21108: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21063: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21111: \$? = $ac_status" >&5
++  echo "$as_me:21066: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21113: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21068: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21116: \$? = $ac_status" >&5
++  echo "$as_me:21071: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_consistent_getenv=yes
+ else
+@@ -21126,7 +21081,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:21129: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:21084: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+ 
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -21141,18 +21096,18 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ 	test "x$cf_with_trace" = xyes
+ then
+-	{ echo "$as_me:21144: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++	{ echo "$as_me:21099: 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:21148: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:21103: 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 21155 "configure"
++#line 21110 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21172,16 +21127,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21175: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21130: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21178: \$? = $ac_status" >&5
++  echo "$as_me:21133: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21181: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21136: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21184: \$? = $ac_status" >&5
++  echo "$as_me:21139: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -21193,7 +21148,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21196: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:21151: 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
+@@ -21208,13 +21163,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:21211: checking for an ANSI C-conforming const" >&5
++echo "$as_me:21166: 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 21217 "configure"
++#line 21172 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21276,16 +21231,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21279: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21234: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21282: \$? = $ac_status" >&5
++  echo "$as_me:21237: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21285: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21240: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21288: \$? = $ac_status" >&5
++  echo "$as_me:21243: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -21295,7 +21250,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21298: result: $ac_cv_c_const" >&5
++echo "$as_me:21253: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -21305,7 +21260,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21308: checking for inline" >&5
++echo "$as_me:21263: 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
+@@ -21313,7 +21268,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21316 "configure"
++#line 21271 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo (void) {return 0; }
+@@ -21322,16 +21277,16 @@
+ 
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21325: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21280: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21328: \$? = $ac_status" >&5
++  echo "$as_me:21283: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21331: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21286: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21334: \$? = $ac_status" >&5
++  echo "$as_me:21289: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -21342,7 +21297,7 @@
+ done
+ 
+ fi
+-echo "$as_me:21345: result: $ac_cv_c_inline" >&5
++echo "$as_me:21300: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -21368,7 +21323,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:21371: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:21326: 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
+@@ -21377,7 +21332,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21380 "configure"
++#line 21335 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -21389,16 +21344,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21392: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21347: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21395: \$? = $ac_status" >&5
++  echo "$as_me:21350: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21398: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21353: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21401: \$? = $ac_status" >&5
++  echo "$as_me:21356: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -21410,7 +21365,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:21413: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:21368: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -21516,7 +21471,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:21519: checking for signal global datatype" >&5
++echo "$as_me:21474: 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
+@@ -21528,7 +21483,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21531 "configure"
++#line 21486 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21552,16 +21507,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21555: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21510: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21558: \$? = $ac_status" >&5
++  echo "$as_me:21513: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21561: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21516: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21564: \$? = $ac_status" >&5
++  echo "$as_me:21519: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21575,7 +21530,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21578: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21533: 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:21542: 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
+@@ -21594,7 +21549,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21597 "configure"
++#line 21552 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21629,15 +21584,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21632: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21587: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21635: \$? = $ac_status" >&5
++  echo "$as_me:21590: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21637: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21592: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21640: \$? = $ac_status" >&5
++  echo "$as_me:21595: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21652,7 +21607,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21655: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21610: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:21622: 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 21674 "configure"
++#line 21629 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21683,16 +21638,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21686: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21641: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21689: \$? = $ac_status" >&5
++  echo "$as_me:21644: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21692: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21647: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21695: \$? = $ac_status" >&5
++  echo "$as_me:21650: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -21704,7 +21659,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21707: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21662: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -21720,14 +21675,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:21723: checking if external errno is declared" >&5
++echo "$as_me:21678: 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 21730 "configure"
++#line 21685 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -21741,16 +21696,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21744: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21699: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21747: \$? = $ac_status" >&5
++  echo "$as_me:21702: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21750: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21705: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21753: \$? = $ac_status" >&5
++  echo "$as_me:21708: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -21761,7 +21716,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21764: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21719: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21776,14 +21731,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:21779: checking if external errno exists" >&5
++echo "$as_me:21734: 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 21786 "configure"
++#line 21741 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -21798,16 +21753,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21801: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21756: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21804: \$? = $ac_status" >&5
++  echo "$as_me:21759: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21807: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21762: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21810: \$? = $ac_status" >&5
++  echo "$as_me:21765: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -21818,7 +21773,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21821: result: $cf_cv_have_errno" >&5
++echo "$as_me:21776: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21831,7 +21786,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21834: checking if data-only library module links" >&5
++echo "$as_me:21789: 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
+@@ -21839,20 +21794,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:21800: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21848: \$? = $ac_status" >&5
++  echo "$as_me:21803: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+ 		mv conftest.$OBJEXT data.$OBJEXT && \
+ 		( $AR $ARFLAGS conftest.a data.$OBJEXT ) 2>&5 1>/dev/null
+ 	fi
+ 	rm -f conftest.$ac_ext data.$OBJEXT
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:21827: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21875: \$? = $ac_status" >&5
++  echo "$as_me:21830: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.$OBJEXT func.$OBJEXT && \
+ 		( $AR $ARFLAGS conftest.a func.$OBJEXT ) 2>&5 1>/dev/null
+@@ -21885,7 +21840,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21888 "configure"
++#line 21843 "configure"
+ #include "confdefs.h"
+ 
+ 	extern int testfunc(void);
+@@ -21896,15 +21851,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21899: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21854: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21902: \$? = $ac_status" >&5
++  echo "$as_me:21857: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21904: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21859: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21907: \$? = $ac_status" >&5
++  echo "$as_me:21862: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -21919,7 +21874,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21922: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21877: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21934,13 +21889,13 @@
+ ###	Checks for library functions.
+ 
+ cf_save_libs="$LIBS"
+-echo "$as_me:21937: checking for clock_gettime" >&5
++echo "$as_me:21892: checking for clock_gettime" >&5
+ echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
+ if test "${ac_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21943 "configure"
++#line 21898 "configure"
+ #include "confdefs.h"
+ #define clock_gettime autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21971,16 +21926,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21974: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21929: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21977: \$? = $ac_status" >&5
++  echo "$as_me:21932: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21980: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21935: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21983: \$? = $ac_status" >&5
++  echo "$as_me:21938: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_clock_gettime=yes
+ else
+@@ -21990,12 +21945,12 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21993: result: $ac_cv_func_clock_gettime" >&5
++echo "$as_me:21948: result: $ac_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
+ if test "$ac_cv_func_clock_gettime" = yes; then
+   cf_cv_test_clock_gettime=yes
+ else
+-  echo "$as_me:21998: checking for clock_gettime in -lrt" >&5
++  echo "$as_me:21953: checking for clock_gettime in -lrt" >&5
+ echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22003,7 +21958,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22006 "configure"
++#line 21961 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22022,16 +21977,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22025: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21980: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22028: \$? = $ac_status" >&5
++  echo "$as_me:21983: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22031: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21986: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22034: \$? = $ac_status" >&5
++  echo "$as_me:21989: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+@@ -22042,7 +21997,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22045: result: $ac_cv_lib_rt_clock_gettime" >&5
++echo "$as_me:22000: result: $ac_cv_lib_rt_clock_gettime" >&5
+ echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
+ if test "$ac_cv_lib_rt_clock_gettime" = yes; then
+   LIBS="-lrt $LIBS"
+@@ -22054,14 +22009,14 @@
+ fi
+ 
+ if test "$cf_cv_test_clock_gettime" = yes ; then
+-echo "$as_me:22057: checking if clock_gettime links" >&5
++echo "$as_me:22012: checking if clock_gettime links" >&5
+ echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
+ if test "${cf_cv_func_clock_gettime+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22064 "configure"
++#line 22019 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22079,16 +22034,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22082: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22037: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22085: \$? = $ac_status" >&5
++  echo "$as_me:22040: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22088: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22043: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22091: \$? = $ac_status" >&5
++  echo "$as_me:22046: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_clock_gettime=yes
+ else
+@@ -22099,7 +22054,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22102: result: $cf_cv_func_clock_gettime" >&5
++echo "$as_me:22057: result: $cf_cv_func_clock_gettime" >&5
+ echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
+ else
+ 	cf_cv_func_clock_gettime=no
+@@ -22113,13 +22068,13 @@
+ EOF
+ 
+ else
+-echo "$as_me:22116: checking for gettimeofday" >&5
++echo "$as_me:22071: 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 22122 "configure"
++#line 22077 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22150,16 +22105,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22153: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22108: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22156: \$? = $ac_status" >&5
++  echo "$as_me:22111: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22159: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22114: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22162: \$? = $ac_status" >&5
++  echo "$as_me:22117: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -22169,7 +22124,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22172: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:22127: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -22179,7 +22134,7 @@
+ 
+ else
+ 
+-echo "$as_me:22182: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:22137: 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
+@@ -22187,7 +22142,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22190 "configure"
++#line 22145 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22206,16 +22161,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22209: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22164: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22212: \$? = $ac_status" >&5
++  echo "$as_me:22167: \$? = $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:22170: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22218: \$? = $ac_status" >&5
++  echo "$as_me:22173: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -22226,7 +22181,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22229: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:22184: 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
+ 
+@@ -22285,13 +22240,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:22288: checking for $ac_func" >&5
++echo "$as_me:22243: 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 22294 "configure"
++#line 22249 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22322,16 +22277,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22325: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22280: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22328: \$? = $ac_status" >&5
++  echo "$as_me:22283: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22331: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22286: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22334: \$? = $ac_status" >&5
++  echo "$as_me:22289: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -22341,7 +22296,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22344: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:22299: 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:22309: 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 22361 "configure"
++#line 22316 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22373,16 +22328,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22376: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22331: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22379: \$? = $ac_status" >&5
++  echo "$as_me:22334: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22382: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22337: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22385: \$? = $ac_status" >&5
++  echo "$as_me:22340: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_PATH_TTYS=yes
+ else
+@@ -22392,7 +22347,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22395: result: $cf_cv_PATH_TTYS" >&5
++echo "$as_me:22350: result: $cf_cv_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
+ 
+ if test $cf_cv_PATH_TTYS = no
+@@ -22414,7 +22369,7 @@
+ 
+ if test $cf_cv_PATH_TTYS != no
+ then
+-	echo "$as_me:22417: checking if _PATH_TTYS file exists" >&5
++	echo "$as_me:22372: 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
+@@ -22424,7 +22379,7 @@
+   cf_cv_have_PATH_TTYS=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22427 "configure"
++#line 22382 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22437,15 +22392,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22440: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22395: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22443: \$? = $ac_status" >&5
++  echo "$as_me:22398: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22445: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22400: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22448: \$? = $ac_status" >&5
++  echo "$as_me:22403: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_PATH_TTYS=yes
+ else
+@@ -22457,7 +22412,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22460: result: $cf_cv_have_PATH_TTYS" >&5
++echo "$as_me:22415: 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
+@@ -22469,14 +22424,14 @@
+ #define HAVE_PATH_TTYS 1
+ EOF
+ 
+-	echo "$as_me:22472: checking for getttynam" >&5
++	echo "$as_me:22427: 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 22479 "configure"
++#line 22434 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22488,16 +22443,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22491: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22446: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22494: \$? = $ac_status" >&5
++  echo "$as_me:22449: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22497: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22452: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22500: \$? = $ac_status" >&5
++  echo "$as_me:22455: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_getttynam=yes
+ else
+@@ -22507,7 +22462,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22510: result: $cf_cv_func_getttynam" >&5
++echo "$as_me:22465: 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
+@@ -22517,7 +22472,7 @@
+ 
+ if test "x$ac_cv_func_getopt" = xno && \
+    test "x$cf_with_progs$cf_with_tests" != xnono; then
+-	{ { echo "$as_me:22520: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:22475: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -22526,7 +22481,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:22529: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:22484: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -22539,14 +22494,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:22542: checking for terminal-capability database functions" >&5
++echo "$as_me:22497: 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 22549 "configure"
++#line 22504 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22566,16 +22521,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22569: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22524: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22572: \$? = $ac_status" >&5
++  echo "$as_me:22527: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22575: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22530: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22578: \$? = $ac_status" >&5
++  echo "$as_me:22533: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -22586,7 +22541,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22589: result: $cf_cv_cgetent" >&5
++echo "$as_me:22544: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -22596,14 +22551,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:22599: checking if cgetent uses const parameter" >&5
++echo "$as_me:22554: 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 22606 "configure"
++#line 22561 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -22626,16 +22581,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22629: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22584: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22632: \$? = $ac_status" >&5
++  echo "$as_me:22587: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22635: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22590: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22638: \$? = $ac_status" >&5
++  echo "$as_me:22593: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -22646,7 +22601,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22649: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:22604: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -22660,14 +22615,14 @@
+ 
+ fi
+ 
+-echo "$as_me:22663: checking for isascii" >&5
++echo "$as_me:22618: 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 22670 "configure"
++#line 22625 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22679,16 +22634,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22682: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22637: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22685: \$? = $ac_status" >&5
++  echo "$as_me:22640: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22688: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22643: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22691: \$? = $ac_status" >&5
++  echo "$as_me:22646: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -22699,7 +22654,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22702: result: $cf_cv_have_isascii" >&5
++echo "$as_me:22657: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -22707,10 +22662,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:22710: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:22665: 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 22713 "configure"
++#line 22668 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22724,16 +22679,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22727: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22682: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22730: \$? = $ac_status" >&5
++  echo "$as_me:22685: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22733: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22688: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22736: \$? = $ac_status" >&5
++  echo "$as_me:22691: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=no
+ else
+@@ -22741,7 +22696,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22744 "configure"
++#line 22699 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22756,16 +22711,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22759: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22714: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22762: \$? = $ac_status" >&5
++  echo "$as_me:22717: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22765: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22720: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22768: \$? = $ac_status" >&5
++  echo "$as_me:22723: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=yes
+ 
+@@ -22781,11 +22736,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:22784: result: $sigact_bad" >&5
++echo "$as_me:22739: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:22788: checking if nanosleep really works" >&5
++echo "$as_me:22743: 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
+@@ -22795,7 +22750,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22798 "configure"
++#line 22753 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -22821,15 +22776,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22824: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22779: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22827: \$? = $ac_status" >&5
++  echo "$as_me:22782: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22829: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22784: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22832: \$? = $ac_status" >&5
++  echo "$as_me:22787: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -22841,7 +22796,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22844: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:22799: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -22858,23 +22813,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22861: checking for $ac_header" >&5
++echo "$as_me:22816: 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 22867 "configure"
++#line 22822 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22871: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22826: \"$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:22877: \$? = $ac_status" >&5
++  echo "$as_me:22832: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22893,7 +22848,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22896: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22851: 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:22868: 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 22916 "configure"
++#line 22871 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22925,16 +22880,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22928: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22883: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22931: \$? = $ac_status" >&5
++  echo "$as_me:22886: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22934: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22889: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22937: \$? = $ac_status" >&5
++  echo "$as_me:22892: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=no
+ else
+@@ -22942,7 +22897,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22945 "configure"
++#line 22900 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22956,16 +22911,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22959: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22914: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22962: \$? = $ac_status" >&5
++  echo "$as_me:22917: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22965: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22920: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22968: \$? = $ac_status" >&5
++  echo "$as_me:22923: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=unknown
+ else
+@@ -22981,19 +22936,19 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:22984: result: $termios_bad" >&5
++	echo "$as_me:22939: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:22989: checking for tcgetattr" >&5
++echo "$as_me:22944: 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 22996 "configure"
++#line 22951 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23021,16 +22976,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23024: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22979: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23027: \$? = $ac_status" >&5
++  echo "$as_me:22982: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23030: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22985: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23033: \$? = $ac_status" >&5
++  echo "$as_me:22988: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -23040,21 +22995,21 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23043: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:22998: 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:23050: checking for vsscanf function or workaround" >&5
++echo "$as_me:23005: 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 23057 "configure"
++#line 23012 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23080,16 +23035,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23083: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23038: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23086: \$? = $ac_status" >&5
++  echo "$as_me:23041: \$? = $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:23044: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23092: \$? = $ac_status" >&5
++  echo "$as_me:23047: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -23097,7 +23052,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23100 "configure"
++#line 23055 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23119,16 +23074,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23122: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23077: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23125: \$? = $ac_status" >&5
++  echo "$as_me:23080: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23128: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23083: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23131: \$? = $ac_status" >&5
++  echo "$as_me:23086: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -23136,7 +23091,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23139 "configure"
++#line 23094 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23158,16 +23113,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23161: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23116: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23164: \$? = $ac_status" >&5
++  echo "$as_me:23119: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23167: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23122: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23170: \$? = $ac_status" >&5
++  echo "$as_me:23125: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -23182,7 +23137,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23185: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:23140: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case "$cf_cv_func_vsscanf" in
+@@ -23208,23 +23163,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:23211: checking for $ac_header" >&5
++echo "$as_me:23166: 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 23217 "configure"
++#line 23172 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23221: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23176: \"$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:23227: \$? = $ac_status" >&5
++  echo "$as_me:23182: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23243,7 +23198,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23246: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23201: 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:23211: 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
+@@ -23264,7 +23219,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23267 "configure"
++#line 23222 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23299,15 +23254,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23302: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23257: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23305: \$? = $ac_status" >&5
++  echo "$as_me:23260: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23307: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23262: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23310: \$? = $ac_status" >&5
++  echo "$as_me:23265: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -23322,16 +23277,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:23325: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:23280: 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:23328: checking for mkstemp" >&5
++	echo "$as_me:23283: 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 23334 "configure"
++#line 23289 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23362,16 +23317,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23365: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23320: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23368: \$? = $ac_status" >&5
++  echo "$as_me:23323: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23371: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23326: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23374: \$? = $ac_status" >&5
++  echo "$as_me:23329: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -23381,7 +23336,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23384: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:23339: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -23402,21 +23357,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:23405: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:23360: 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:23408: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:23363: 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:23414: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:23369: 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 23419 "configure"
++#line 23374 "configure"
+ #include "confdefs.h"
+ #include 
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -23433,15 +23388,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23436: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23391: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23439: \$? = $ac_status" >&5
++  echo "$as_me:23394: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23441: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23396: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23444: \$? = $ac_status" >&5
++  echo "$as_me:23399: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -23454,7 +23409,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:23457: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:23412: 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
+ 
+@@ -23465,13 +23420,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:23468: checking for intptr_t" >&5
++echo "$as_me:23423: 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 23474 "configure"
++#line 23429 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23486,16 +23441,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23489: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23444: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23492: \$? = $ac_status" >&5
++  echo "$as_me:23447: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23495: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23450: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23498: \$? = $ac_status" >&5
++  echo "$as_me:23453: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -23505,7 +23460,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23508: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:23463: 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
+   :
+@@ -23517,13 +23472,13 @@
+ 
+ fi
+ 
+-echo "$as_me:23520: checking for ssize_t" >&5
++echo "$as_me:23475: 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 23526 "configure"
++#line 23481 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23538,16 +23493,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23541: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23496: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23544: \$? = $ac_status" >&5
++  echo "$as_me:23499: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23547: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23502: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23550: \$? = $ac_status" >&5
++  echo "$as_me:23505: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -23557,7 +23512,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23560: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:23515: 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
+   :
+@@ -23569,14 +23524,14 @@
+ 
+ fi
+ 
+-echo "$as_me:23572: checking for type sigaction_t" >&5
++echo "$as_me:23527: 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 23579 "configure"
++#line 23534 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23589,16 +23544,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23592: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23547: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23595: \$? = $ac_status" >&5
++  echo "$as_me:23550: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23598: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23553: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23601: \$? = $ac_status" >&5
++  echo "$as_me:23556: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -23609,14 +23564,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:23612: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:23567: 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:23619: checking declaration of size-change" >&5
++echo "$as_me:23574: 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
+@@ -23637,7 +23592,7 @@
+ 
+ 	fi
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23640 "configure"
++#line 23595 "configure"
+ #include "confdefs.h"
+ #include 
+ #ifdef HAVE_TERMIOS_H
+@@ -23687,16 +23642,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23690: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23645: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23693: \$? = $ac_status" >&5
++  echo "$as_me:23648: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23696: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23651: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23699: \$? = $ac_status" >&5
++  echo "$as_me:23654: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -23715,7 +23670,7 @@
+ done
+ 
+ fi
+-echo "$as_me:23718: result: $cf_cv_sizechange" >&5
++echo "$as_me:23673: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -23733,13 +23688,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:23736: checking for memmove" >&5
++echo "$as_me:23691: 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 23742 "configure"
++#line 23697 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23770,16 +23725,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23773: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23728: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23776: \$? = $ac_status" >&5
++  echo "$as_me:23731: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23779: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23734: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23782: \$? = $ac_status" >&5
++  echo "$as_me:23737: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -23789,19 +23744,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23792: result: $ac_cv_func_memmove" >&5
++echo "$as_me:23747: 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:23798: checking for bcopy" >&5
++echo "$as_me:23753: 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 23804 "configure"
++#line 23759 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23832,16 +23787,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23835: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23790: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23838: \$? = $ac_status" >&5
++  echo "$as_me:23793: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23841: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23796: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23844: \$? = $ac_status" >&5
++  echo "$as_me:23799: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -23851,11 +23806,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23854: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:23809: 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:23858: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:23813: 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
+@@ -23865,7 +23820,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23868 "configure"
++#line 23823 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -23881,15 +23836,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23884: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23839: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23887: \$? = $ac_status" >&5
++  echo "$as_me:23842: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23889: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23844: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23892: \$? = $ac_status" >&5
++  echo "$as_me:23847: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -23902,7 +23857,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:23905: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:23860: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -23929,13 +23884,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23932: checking for $ac_func" >&5
++echo "$as_me:23887: 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 23938 "configure"
++#line 23893 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23966,16 +23921,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23969: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23924: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23972: \$? = $ac_status" >&5
++  echo "$as_me:23927: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23975: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23930: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23978: \$? = $ac_status" >&5
++  echo "$as_me:23933: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23985,7 +23940,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23988: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23943: 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:23953: 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
+@@ -24005,7 +23960,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24008 "configure"
++#line 23963 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24058,15 +24013,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24061: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24016: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24064: \$? = $ac_status" >&5
++  echo "$as_me:24019: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24066: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24021: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24069: \$? = $ac_status" >&5
++  echo "$as_me:24024: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -24078,21 +24033,21 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24081: result: $cf_cv_working_poll" >&5
++echo "$as_me:24036: 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:24088: checking if MB_LEN_MAX is usable" >&5
++echo "$as_me:24043: checking if MB_LEN_MAX is usable" >&5
+ echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6
+ if test "${cf_cv_mb_len_max+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24095 "configure"
++#line 24050 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24112,16 +24067,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24115: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24070: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24118: \$? = $ac_status" >&5
++  echo "$as_me:24073: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24121: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24076: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24124: \$? = $ac_status" >&5
++  echo "$as_me:24079: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mb_len_max=yes
+ else
+@@ -24131,7 +24086,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24134: result: $cf_cv_mb_len_max" >&5
++echo "$as_me:24089: result: $cf_cv_mb_len_max" >&5
+ echo "${ECHO_T}$cf_cv_mb_len_max" >&6
+ if test "$cf_cv_mb_len_max" = yes
+ then
+@@ -24141,18 +24096,18 @@
+ EOF
+ 
+ else
+-	{ echo "$as_me:24144: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
++	{ echo "$as_me:24099: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5
+ echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;}
+ fi
+ 
+-echo "$as_me:24148: checking for va_copy" >&5
++echo "$as_me:24103: 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 24155 "configure"
++#line 24110 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24169,16 +24124,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24172: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24127: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24175: \$? = $ac_status" >&5
++  echo "$as_me:24130: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24178: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24133: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24181: \$? = $ac_status" >&5
++  echo "$as_me:24136: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -24188,7 +24143,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24191: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:24146: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -24200,14 +24155,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:24203: checking for __va_copy" >&5
++echo "$as_me:24158: 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 24210 "configure"
++#line 24165 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24224,16 +24179,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24227: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24182: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24230: \$? = $ac_status" >&5
++  echo "$as_me:24185: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24233: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24188: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24236: \$? = $ac_status" >&5
++  echo "$as_me:24191: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -24243,7 +24198,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24246: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:24201: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -24255,14 +24210,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:24258: checking for __builtin_va_copy" >&5
++echo "$as_me:24213: 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 24265 "configure"
++#line 24220 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24279,16 +24234,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24282: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24237: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24285: \$? = $ac_status" >&5
++  echo "$as_me:24240: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24288: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24243: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24291: \$? = $ac_status" >&5
++  echo "$as_me:24246: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -24298,7 +24253,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24301: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:24256: 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 &&
+@@ -24316,14 +24271,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:24319: checking if we can simply copy va_list" >&5
++	echo "$as_me:24274: 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 24326 "configure"
++#line 24281 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24340,16 +24295,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24343: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24298: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24346: \$? = $ac_status" >&5
++  echo "$as_me:24301: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24349: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24304: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24352: \$? = $ac_status" >&5
++  echo "$as_me:24307: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -24359,19 +24314,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24362: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:24317: 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:24367: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:24322: 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 24374 "configure"
++#line 24329 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24388,16 +24343,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24391: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24346: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24394: \$? = $ac_status" >&5
++  echo "$as_me:24349: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24397: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24352: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24400: \$? = $ac_status" >&5
++  echo "$as_me:24355: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -24407,7 +24362,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24410: result: $cf_cv_array_va_list" >&5
++echo "$as_me:24365: 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
+@@ -24418,13 +24373,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:24421: checking for pid_t" >&5
++echo "$as_me:24376: 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 24427 "configure"
++#line 24382 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -24439,16 +24394,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24442: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24397: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24445: \$? = $ac_status" >&5
++  echo "$as_me:24400: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24448: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24403: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24451: \$? = $ac_status" >&5
++  echo "$as_me:24406: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -24458,7 +24413,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24461: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:24416: 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
+   :
+@@ -24473,23 +24428,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:24476: checking for $ac_header" >&5
++echo "$as_me:24431: 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 24482 "configure"
++#line 24437 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:24486: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:24441: \"$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:24492: \$? = $ac_status" >&5
++  echo "$as_me:24447: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -24508,7 +24463,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24511: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:24466: 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:24479: 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 24530 "configure"
++#line 24485 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -24558,16 +24513,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24561: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24516: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24564: \$? = $ac_status" >&5
++  echo "$as_me:24519: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24567: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24522: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24570: \$? = $ac_status" >&5
++  echo "$as_me:24525: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -24577,7 +24532,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24580: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:24535: 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:24547: 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
+@@ -24612,15 +24567,15 @@
+       }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24615: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24570: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24618: \$? = $ac_status" >&5
++  echo "$as_me:24573: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24620: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24575: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24623: \$? = $ac_status" >&5
++  echo "$as_me:24578: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -24632,7 +24587,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24635: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:24590: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -24646,12 +24601,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:24649: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24604: 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:24654: checking for working vfork" >&5
++  echo "$as_me:24609: 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
+@@ -24660,7 +24615,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24663 "configure"
++#line 24618 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include 
+@@ -24753,15 +24708,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24756: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24711: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24759: \$? = $ac_status" >&5
++  echo "$as_me:24714: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24761: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24716: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24764: \$? = $ac_status" >&5
++  echo "$as_me:24719: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -24773,13 +24728,13 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:24776: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:24731: 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:24782: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:24737: 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
+ 
+@@ -24804,7 +24759,7 @@
+ 
+ fi
+ 
+-echo "$as_me:24807: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:24762: 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
+@@ -24814,7 +24769,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24817 "configure"
++#line 24772 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24849,15 +24804,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:24852: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24807: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24855: \$? = $ac_status" >&5
++  echo "$as_me:24810: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:24857: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24812: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24860: \$? = $ac_status" >&5
++  echo "$as_me:24815: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fopen_bin_r=yes
+ else
+@@ -24870,20 +24825,20 @@
+ fi
+ 
+ fi
+-echo "$as_me:24873: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:24828: 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
+ #define USE_FOPEN_BIN_R 1
+ EOF
+ 
+-	echo "$as_me:24880: checking for cc_t" >&5
++	echo "$as_me:24835: checking for cc_t" >&5
+ echo $ECHO_N "checking for cc_t... $ECHO_C" >&6
+ if test "${ac_cv_type_cc_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24886 "configure"
++#line 24841 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24901,16 +24856,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24904: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24859: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24907: \$? = $ac_status" >&5
++  echo "$as_me:24862: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24910: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24865: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24913: \$? = $ac_status" >&5
++  echo "$as_me:24868: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_cc_t=yes
+ else
+@@ -24920,7 +24875,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24923: result: $ac_cv_type_cc_t" >&5
++echo "$as_me:24878: result: $ac_cv_type_cc_t" >&5
+ echo "${ECHO_T}$ac_cv_type_cc_t" >&6
+ if test "$ac_cv_type_cc_t" = yes; then
+ 
+@@ -24930,13 +24885,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:24933: checking for speed_t" >&5
++	echo "$as_me:24888: checking for speed_t" >&5
+ echo $ECHO_N "checking for speed_t... $ECHO_C" >&6
+ if test "${ac_cv_type_speed_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24939 "configure"
++#line 24894 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24954,16 +24909,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24957: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24912: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24960: \$? = $ac_status" >&5
++  echo "$as_me:24915: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24963: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24918: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24966: \$? = $ac_status" >&5
++  echo "$as_me:24921: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_speed_t=yes
+ else
+@@ -24973,7 +24928,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:24976: result: $ac_cv_type_speed_t" >&5
++echo "$as_me:24931: result: $ac_cv_type_speed_t" >&5
+ echo "${ECHO_T}$ac_cv_type_speed_t" >&6
+ if test "$ac_cv_type_speed_t" = yes; then
+ 
+@@ -24983,13 +24938,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:24986: checking for tcflag_t" >&5
++	echo "$as_me:24941: checking for tcflag_t" >&5
+ echo $ECHO_N "checking for tcflag_t... $ECHO_C" >&6
+ if test "${ac_cv_type_tcflag_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24992 "configure"
++#line 24947 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25007,16 +24962,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25010: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24965: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25013: \$? = $ac_status" >&5
++  echo "$as_me:24968: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25016: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24971: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25019: \$? = $ac_status" >&5
++  echo "$as_me:24974: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_tcflag_t=yes
+ else
+@@ -25026,7 +24981,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:25029: result: $ac_cv_type_tcflag_t" >&5
++echo "$as_me:24984: result: $ac_cv_type_tcflag_t" >&5
+ echo "${ECHO_T}$ac_cv_type_tcflag_t" >&6
+ if test "$ac_cv_type_tcflag_t" = yes; then
+ 
+@@ -25036,13 +24991,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:25039: checking for sigset_t" >&5
++	echo "$as_me:24994: checking for sigset_t" >&5
+ echo $ECHO_N "checking for sigset_t... $ECHO_C" >&6
+ if test "${ac_cv_type_sigset_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25045 "configure"
++#line 25000 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25060,16 +25015,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25063: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25018: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25066: \$? = $ac_status" >&5
++  echo "$as_me:25021: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25069: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25024: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25072: \$? = $ac_status" >&5
++  echo "$as_me:25027: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_sigset_t=yes
+ else
+@@ -25079,7 +25034,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:25082: result: $ac_cv_type_sigset_t" >&5
++echo "$as_me:25037: result: $ac_cv_type_sigset_t" >&5
+ echo "${ECHO_T}$ac_cv_type_sigset_t" >&6
+ if test "$ac_cv_type_sigset_t" = yes; then
+ 
+@@ -25091,7 +25046,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:25094: checking for openpty in -lutil" >&5
++echo "$as_me:25049: 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
+@@ -25099,7 +25054,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25102 "configure"
++#line 25057 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -25118,16 +25073,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25121: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25076: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25124: \$? = $ac_status" >&5
++  echo "$as_me:25079: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25127: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25082: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25130: \$? = $ac_status" >&5
++  echo "$as_me:25085: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -25138,7 +25093,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:25141: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:25096: 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
+@@ -25146,7 +25101,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:25149: checking for openpty header" >&5
++echo "$as_me:25104: 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
+@@ -25173,7 +25128,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25176 "configure"
++#line 25131 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -25191,16 +25146,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25194: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25149: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25197: \$? = $ac_status" >&5
++  echo "$as_me:25152: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25200: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25155: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25203: \$? = $ac_status" >&5
++  echo "$as_me:25158: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -25218,7 +25173,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:25221: result: $cf_cv_func_openpty" >&5
++echo "$as_me:25176: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -25291,7 +25246,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25294 "configure"
++#line 25249 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -25303,16 +25258,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25306: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25261: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25309: \$? = $ac_status" >&5
++  echo "$as_me:25264: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25312: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25267: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25315: \$? = $ac_status" >&5
++  echo "$as_me:25270: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25329,7 +25284,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}:25332: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25287: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25365,7 +25320,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}:25368: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25323: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25376,7 +25331,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:25379: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:25334: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -25448,7 +25403,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25451 "configure"
++#line 25406 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -25460,16 +25415,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25463: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25418: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25466: \$? = $ac_status" >&5
++  echo "$as_me:25421: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25469: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25424: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25472: \$? = $ac_status" >&5
++  echo "$as_me:25427: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -25486,7 +25441,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}:25489: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:25444: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -25566,7 +25521,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}:25569: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:25524: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -25583,23 +25538,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:25586: checking for db.h" >&5
++echo "$as_me:25541: 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 25592 "configure"
++#line 25547 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:25596: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25551: \"$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:25602: \$? = $ac_status" >&5
++  echo "$as_me:25557: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -25618,11 +25573,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25621: result: $ac_cv_header_db_h" >&5
++echo "$as_me:25576: 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:25625: checking for version of db" >&5
++echo "$as_me:25580: 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
+@@ -25633,10 +25588,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:25636: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:25591: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25639 "configure"
++#line 25594 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25666,16 +25621,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25669: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25624: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25672: \$? = $ac_status" >&5
++  echo "$as_me:25627: \$? = $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:25630: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25678: \$? = $ac_status" >&5
++  echo "$as_me:25633: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -25689,16 +25644,16 @@
+ done
+ 
+ fi
+-echo "$as_me:25692: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:25647: 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:25696: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:25651: 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:25701: checking for db libraries" >&5
++echo "$as_me:25656: 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
+@@ -25728,10 +25683,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:25731: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:25686: testing checking for library $cf_db_libs ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25734 "configure"
++#line 25689 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25786,16 +25741,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25789: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25744: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25792: \$? = $ac_status" >&5
++  echo "$as_me:25747: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25795: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25750: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25798: \$? = $ac_status" >&5
++  echo "$as_me:25753: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -25815,11 +25770,11 @@
+ done
+ 
+ fi
+-echo "$as_me:25818: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:25773: 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:25822: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:25777: 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
+@@ -25845,7 +25800,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:25848: error: Cannot find db.h" >&5
++	{ { echo "$as_me:25803: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -25860,14 +25815,14 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:25863: checking if we can include stdbool.h" >&5
++echo "$as_me:25818: checking if we can include stdbool.h" >&5
+ echo $ECHO_N "checking if we can include stdbool.h... $ECHO_C" >&6
+ if test "${cf_cv_header_stdbool_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25870 "configure"
++#line 25825 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25882,23 +25837,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25885: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25840: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25888: \$? = $ac_status" >&5
++  echo "$as_me:25843: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25891: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25846: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25894: \$? = $ac_status" >&5
++  echo "$as_me:25849: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25901 "configure"
++#line 25856 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -25910,16 +25865,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25913: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25868: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25916: \$? = $ac_status" >&5
++  echo "$as_me:25871: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25919: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25874: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25922: \$? = $ac_status" >&5
++  echo "$as_me:25877: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=no
+ else
+@@ -25930,7 +25885,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:25933: result: $cf_cv_header_stdbool_h" >&5
++echo "$as_me:25888: result: $cf_cv_header_stdbool_h" >&5
+ echo "${ECHO_T}$cf_cv_header_stdbool_h" >&6
+ 
+ if test "$cf_cv_header_stdbool_h" = yes
+@@ -25938,14 +25893,14 @@
+ else	USE_STDBOOL_H=0
+ fi
+ 
+-echo "$as_me:25941: checking for builtin bool type" >&5
++echo "$as_me:25896: 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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25948 "configure"
++#line 25903 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -25959,16 +25914,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25962: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25917: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25965: \$? = $ac_status" >&5
++  echo "$as_me:25920: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25968: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25923: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25971: \$? = $ac_status" >&5
++  echo "$as_me:25926: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cc_bool_type=yes
+ else
+@@ -25978,7 +25933,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:25981: result: $cf_cv_cc_bool_type" >&5
++echo "$as_me:25936: result: $cf_cv_cc_bool_type" >&5
+ echo "${ECHO_T}$cf_cv_cc_bool_type" >&6
+ 
+ if test "$cf_cv_cc_bool_type" = yes; then
+@@ -26005,10 +25960,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:26008: checking if we already have C++ library" >&5
++	echo "$as_me:25963: 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 26011 "configure"
++#line 25966 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -26022,16 +25977,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26025: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25980: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26028: \$? = $ac_status" >&5
++  echo "$as_me:25983: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26031: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25986: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26034: \$? = $ac_status" >&5
++  echo "$as_me:25989: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -26040,7 +25995,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-	echo "$as_me:26043: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:25998: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -26059,7 +26014,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:26062: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:26017: 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
+@@ -26085,7 +26040,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26088 "configure"
++#line 26043 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -26099,16 +26054,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26102: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26057: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26105: \$? = $ac_status" >&5
++  echo "$as_me:26060: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26108: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26063: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26111: \$? = $ac_status" >&5
++  echo "$as_me:26066: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -26120,7 +26075,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:26123: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:26078: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -26142,7 +26097,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:26145: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:26100: 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
+@@ -26157,15 +26112,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:26160: \"$ac_try\"") >&5
++if { (eval echo "$as_me:26115: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26163: \$? = $ac_status" >&5
++  echo "$as_me:26118: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:26165: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:26120: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26168: \$? = $ac_status" >&5
++  echo "$as_me:26123: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -26176,10 +26131,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+-  echo "$as_me:26179: result: yes" >&5
++  echo "$as_me:26134: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:26182: result: no" >&5
++  echo "$as_me:26137: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -26199,7 +26154,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:26202: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:26157: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -26220,7 +26175,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26223 "configure"
++#line 26178 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -26234,16 +26189,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26237: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26192: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26240: \$? = $ac_status" >&5
++  echo "$as_me:26195: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26243: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26198: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26246: \$? = $ac_status" >&5
++  echo "$as_me:26201: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -26280,7 +26235,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26283 "configure"
++#line 26238 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26294,16 +26249,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:26297: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26252: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26300: \$? = $ac_status" >&5
++  echo "$as_me:26255: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:26303: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26258: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26306: \$? = $ac_status" >&5
++  echo "$as_me:26261: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -26336,7 +26291,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	LIBS="$cf_save"
+-	echo "$as_me:26339: result: $cf_cxx_library" >&5
++	echo "$as_me:26294: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -26352,7 +26307,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:26355: checking how to run the C++ preprocessor" >&5
++echo "$as_me:26310: 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
+@@ -26369,18 +26324,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 26372 "configure"
++#line 26327 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26377: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26332: \"$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:26383: \$? = $ac_status" >&5
++  echo "$as_me:26338: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26403,17 +26358,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26406 "configure"
++#line 26361 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26410: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26365: \"$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:26416: \$? = $ac_status" >&5
++  echo "$as_me:26371: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26450,7 +26405,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:26453: result: $CXXCPP" >&5
++echo "$as_me:26408: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -26460,18 +26415,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 26463 "configure"
++#line 26418 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:26468: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26423: \"$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:26474: \$? = $ac_status" >&5
++  echo "$as_me:26429: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26494,17 +26449,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26497 "configure"
++#line 26452 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:26501: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26456: \"$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:26507: \$? = $ac_status" >&5
++  echo "$as_me:26462: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26532,7 +26487,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:26535: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:26490: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -26547,23 +26502,23 @@
+ for ac_header in new exception typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:26550: checking for $ac_header" >&5
++echo "$as_me:26505: 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 26556 "configure"
++#line 26511 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26560: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26515: \"$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:26566: \$? = $ac_status" >&5
++  echo "$as_me:26521: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26582,7 +26537,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26585: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26540: 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:26553: 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 26604 "configure"
++#line 26559 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:26608: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:26563: \"$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:26614: \$? = $ac_status" >&5
++  echo "$as_me:26569: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -26630,7 +26585,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:26633: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:26588: 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:26599: 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 26647 "configure"
++#line 26602 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26661,16 +26616,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26664: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26619: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26667: \$? = $ac_status" >&5
++  echo "$as_me:26622: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26670: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26625: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26673: \$? = $ac_status" >&5
++  echo "$as_me:26628: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -26679,7 +26634,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:26682: result: $cf_iostream_namespace" >&5
++	echo "$as_me:26637: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -26690,14 +26645,14 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:26693: checking for builtin bool type" >&5
++echo "$as_me:26648: 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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26700 "configure"
++#line 26655 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26711,16 +26666,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26714: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26669: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26717: \$? = $ac_status" >&5
++  echo "$as_me:26672: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26720: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26675: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26723: \$? = $ac_status" >&5
++  echo "$as_me:26678: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_builtin_bool=yes
+ else
+@@ -26730,16 +26685,16 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26733: result: $cf_cv_builtin_bool" >&5
++echo "$as_me:26688: result: $cf_cv_builtin_bool" >&5
+ echo "${ECHO_T}$cf_cv_builtin_bool" >&6
+ 
+-echo "$as_me:26736: checking for bool" >&5
++echo "$as_me:26691: 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 26742 "configure"
++#line 26697 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26774,16 +26729,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26777: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26732: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26780: \$? = $ac_status" >&5
++  echo "$as_me:26735: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26783: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26738: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26786: \$? = $ac_status" >&5
++  echo "$as_me:26741: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -26793,10 +26748,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26796: result: $ac_cv_type_bool" >&5
++echo "$as_me:26751: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:26799: checking size of bool" >&5
++echo "$as_me:26754: 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
+@@ -26805,7 +26760,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26808 "configure"
++#line 26763 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26837,21 +26792,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26840: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26795: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26843: \$? = $ac_status" >&5
++  echo "$as_me:26798: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26846: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26801: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26849: \$? = $ac_status" >&5
++  echo "$as_me:26804: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26854 "configure"
++#line 26809 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26883,16 +26838,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26886: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26841: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26889: \$? = $ac_status" >&5
++  echo "$as_me:26844: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26892: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26847: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26895: \$? = $ac_status" >&5
++  echo "$as_me:26850: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -26908,7 +26863,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26911 "configure"
++#line 26866 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26940,16 +26895,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26943: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26898: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26946: \$? = $ac_status" >&5
++  echo "$as_me:26901: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26949: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26904: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26952: \$? = $ac_status" >&5
++  echo "$as_me:26907: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -26965,7 +26920,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 26968 "configure"
++#line 26923 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -26997,16 +26952,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27000: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26955: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27003: \$? = $ac_status" >&5
++  echo "$as_me:26958: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27006: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26961: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27009: \$? = $ac_status" >&5
++  echo "$as_me:26964: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27019,12 +26974,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27022: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:26977: 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 27027 "configure"
++#line 26982 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27060,15 +27015,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27063: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27018: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27066: \$? = $ac_status" >&5
++  echo "$as_me:27021: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27068: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27023: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27071: \$? = $ac_status" >&5
++  echo "$as_me:27026: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27084,13 +27039,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27087: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27042: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27048: 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
+@@ -27109,7 +27064,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27112 "configure"
++#line 27067 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27150,15 +27105,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27153: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27108: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27156: \$? = $ac_status" >&5
++  echo "$as_me:27111: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27158: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27113: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27161: \$? = $ac_status" >&5
++  echo "$as_me:27116: \$? = $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
+@@ -27175,19 +27130,19 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:27178: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:27133: 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:27185: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:27140: 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:27190: checking for special defines needed for etip.h" >&5
++echo "$as_me:27145: 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"
+@@ -27205,7 +27160,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 27208 "configure"
++#line 27163 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -27219,16 +27174,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27222: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27177: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27225: \$? = $ac_status" >&5
++  echo "$as_me:27180: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27228: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27183: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27231: \$? = $ac_status" >&5
++  echo "$as_me:27186: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:27207: result: ${cf_result:-(none)}" >&5
+ echo "${ECHO_T}${cf_result:-(none)}" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27257: checking if $CXX accepts override keyword" >&5
++echo "$as_me:27212: checking if $CXX accepts override keyword" >&5
+ echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6
+ if test "${cf_cv_cpp_override+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27271,7 +27226,7 @@
+   cf_cv_cpp_override=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27274 "configure"
++#line 27229 "configure"
+ #include "confdefs.h"
+ 
+ class base
+@@ -27290,15 +27245,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27293: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27248: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27296: \$? = $ac_status" >&5
++  echo "$as_me:27251: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27298: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27253: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27301: \$? = $ac_status" >&5
++  echo "$as_me:27256: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_override=yes
+ else
+@@ -27317,7 +27272,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27320: result: $cf_cv_cpp_override" >&5
++echo "$as_me:27275: result: $cf_cv_cpp_override" >&5
+ echo "${ECHO_T}$cf_cv_cpp_override" >&6
+ fi
+ test "$cf_cv_cpp_override" = yes &&
+@@ -27326,7 +27281,7 @@
+ EOF
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:27329: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:27284: 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
+@@ -27343,7 +27298,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27346 "configure"
++#line 27301 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -27362,15 +27317,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27365: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27320: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27368: \$? = $ac_status" >&5
++  echo "$as_me:27323: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27370: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27325: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27373: \$? = $ac_status" >&5
++  echo "$as_me:27328: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -27389,7 +27344,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27392: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:27347: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -27399,7 +27354,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:27402: checking if $CXX accepts static_cast" >&5
++echo "$as_me:27357: 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
+@@ -27413,7 +27368,7 @@
+ ac_main_return="return"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27416 "configure"
++#line 27371 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -27457,16 +27412,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27460: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27415: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27463: \$? = $ac_status" >&5
++  echo "$as_me:27418: \$? = $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:27421: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27469: \$? = $ac_status" >&5
++  echo "$as_me:27424: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -27484,7 +27439,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:27487: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:27442: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -27532,13 +27487,13 @@
+ 		USE_STDBOOL_H=0
+ 	else
+ 
+-echo "$as_me:27535: checking for bool" >&5
++echo "$as_me:27490: 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 27541 "configure"
++#line 27496 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27573,16 +27528,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27576: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27531: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27579: \$? = $ac_status" >&5
++  echo "$as_me:27534: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27582: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27537: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27585: \$? = $ac_status" >&5
++  echo "$as_me:27540: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -27592,10 +27547,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27595: result: $ac_cv_type_bool" >&5
++echo "$as_me:27550: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:27598: checking size of bool" >&5
++echo "$as_me:27553: 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
+@@ -27604,7 +27559,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27607 "configure"
++#line 27562 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27636,21 +27591,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27639: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27594: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27642: \$? = $ac_status" >&5
++  echo "$as_me:27597: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27645: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27600: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27648: \$? = $ac_status" >&5
++  echo "$as_me:27603: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27653 "configure"
++#line 27608 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27682,16 +27637,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27685: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27640: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27688: \$? = $ac_status" >&5
++  echo "$as_me:27643: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27691: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27646: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27694: \$? = $ac_status" >&5
++  echo "$as_me:27649: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -27707,7 +27662,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27710 "configure"
++#line 27665 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27739,16 +27694,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27742: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27697: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27745: \$? = $ac_status" >&5
++  echo "$as_me:27700: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27748: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27703: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27751: \$? = $ac_status" >&5
++  echo "$as_me:27706: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27764,7 +27719,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 27767 "configure"
++#line 27722 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27796,16 +27751,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27799: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27754: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27802: \$? = $ac_status" >&5
++  echo "$as_me:27757: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27805: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27760: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27808: \$? = $ac_status" >&5
++  echo "$as_me:27763: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27818,12 +27773,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27821: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27776: 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 27826 "configure"
++#line 27781 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27859,15 +27814,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27862: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27817: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27865: \$? = $ac_status" >&5
++  echo "$as_me:27820: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27867: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27822: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27870: \$? = $ac_status" >&5
++  echo "$as_me:27825: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -27883,13 +27838,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:27886: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:27841: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:27847: 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
+@@ -27908,7 +27863,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27911 "configure"
++#line 27866 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -27949,15 +27904,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27952: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27907: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27955: \$? = $ac_status" >&5
++  echo "$as_me:27910: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27957: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27912: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27960: \$? = $ac_status" >&5
++  echo "$as_me:27915: \$? = $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
+@@ -27974,14 +27929,14 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:27977: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:27932: 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:27984: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:27939: 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
+@@ -28012,7 +27967,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:28015: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:27970: 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
+@@ -28023,7 +27978,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:28026: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:27981: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -28040,10 +27995,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:28043: result: $ADAFLAGS" >&5
++	echo "$as_me:27998: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:28046: checking if GNATPREP supports -T option" >&5
++echo "$as_me:28001: 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
+@@ -28053,11 +28008,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:28056: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:28011: 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:28060: checking if GNAT supports generics" >&5
++echo "$as_me:28015: 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])
+@@ -28067,7 +28022,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:28070: result: $cf_gnat_generics" >&5
++echo "$as_me:28025: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -28079,7 +28034,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:28082: checking if GNAT supports SIGINT" >&5
++echo "$as_me:28037: 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
+@@ -28127,7 +28082,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:28130: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:28085: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -28140,7 +28095,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:28143: checking if GNAT supports project files" >&5
++echo "$as_me:28098: 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]*)
+@@ -28203,15 +28158,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:28206: result: $cf_gnat_projects" >&5
++echo "$as_me:28161: 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:28212: checking if GNAT supports libraries" >&5
++	echo "$as_me:28167: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:28214: result: $cf_gnat_libraries" >&5
++	echo "$as_me:28169: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -28231,7 +28186,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:28234: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:28189: 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
+@@ -28243,7 +28198,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:28246: checking for Ada95 compiler" >&5
++echo "$as_me:28201: checking for Ada95 compiler" >&5
+ echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -28254,12 +28209,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:28257: result: $cf_ada_compiler" >&5
++echo "$as_me:28212: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:28262: checking for Ada95 include directory" >&5
++echo "$as_me:28217: checking for Ada95 include directory" >&5
+ echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -28293,7 +28248,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28296: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28251: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28302,10 +28257,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:28305: result: $ADA_INCLUDE" >&5
++echo "$as_me:28260: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:28308: checking for Ada95 object directory" >&5
++echo "$as_me:28263: checking for Ada95 object directory" >&5
+ echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -28339,7 +28294,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:28342: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:28297: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -28348,10 +28303,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:28351: result: $ADA_OBJECTS" >&5
++echo "$as_me:28306: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:28354: checking whether to build an Ada95 shared library" >&5
++echo "$as_me:28309: checking whether to build an Ada95 shared library" >&5
+ echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -28372,11 +28327,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:28375: result: $with_ada_sharedlib" >&5
++echo "$as_me:28330: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ if test "x$cf_ada_sharedlib_warn" != xno
+ then
+-	{ echo "$as_me:28379: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
++	{ echo "$as_me:28334: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;}
+ fi
+ 
+@@ -28394,7 +28349,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:28397: checking for Ada95 curses library name" >&5
++echo "$as_me:28352: checking for Ada95 curses library name" >&5
+ echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -28410,7 +28365,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28413: result: $ADA_LIBNAME" >&5
++echo "$as_me:28368: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -28421,13 +28376,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:28424: checking for wchar_t" >&5
++	echo "$as_me:28379: 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 28430 "configure"
++#line 28385 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28442,16 +28397,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28445: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28400: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28448: \$? = $ac_status" >&5
++  echo "$as_me:28403: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28451: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28406: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28454: \$? = $ac_status" >&5
++  echo "$as_me:28409: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -28461,10 +28416,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:28464: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:28419: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:28467: checking size of wchar_t" >&5
++echo "$as_me:28422: 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
+@@ -28473,7 +28428,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28476 "configure"
++#line 28431 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28485,21 +28440,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28488: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28443: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28491: \$? = $ac_status" >&5
++  echo "$as_me:28446: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28494: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28449: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28497: \$? = $ac_status" >&5
++  echo "$as_me:28452: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28502 "configure"
++#line 28457 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28511,16 +28466,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28514: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28469: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28517: \$? = $ac_status" >&5
++  echo "$as_me:28472: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28520: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28475: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28523: \$? = $ac_status" >&5
++  echo "$as_me:28478: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -28536,7 +28491,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28539 "configure"
++#line 28494 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28548,16 +28503,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28551: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28506: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28554: \$? = $ac_status" >&5
++  echo "$as_me:28509: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28557: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28512: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28560: \$? = $ac_status" >&5
++  echo "$as_me:28515: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -28573,7 +28528,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 28576 "configure"
++#line 28531 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28585,16 +28540,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:28588: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:28543: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28591: \$? = $ac_status" >&5
++  echo "$as_me:28546: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:28594: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28549: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28597: \$? = $ac_status" >&5
++  echo "$as_me:28552: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -28607,12 +28562,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:28610: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:28565: 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 28615 "configure"
++#line 28570 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -28628,15 +28583,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:28631: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28586: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28634: \$? = $ac_status" >&5
++  echo "$as_me:28589: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:28636: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28591: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28639: \$? = $ac_status" >&5
++  echo "$as_me:28594: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -28652,7 +28607,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:28655: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:28610: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&6
+ 
+-echo "${as_me:-configure}:28668: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:28623: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -28683,7 +28638,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:28686: checking for library subsets" >&5
++echo "$as_me:28641: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -28737,7 +28692,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:28740: result: $LIB_SUBSETS" >&5
++echo "$as_me:28695: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -28768,7 +28723,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:28771: checking default library suffix" >&5
++echo "$as_me:28726: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28779,10 +28734,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:28782: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:28737: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:28785: checking default library-dependency suffix" >&5
++echo "$as_me:28740: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -28865,10 +28820,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:28868: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28823: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:28871: checking default object directory" >&5
++echo "$as_me:28826: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28884,11 +28839,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:28887: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28842: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28891: checking c++ library-dependency suffix" >&5
++echo "$as_me:28846: 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++)
+@@ -28981,7 +28936,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:28984: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:28939: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -29157,19 +29112,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:29160: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:29115: 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:29169: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:29124: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:29172: \$? = $ac_status" >&5
++  echo "$as_me:29127: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+ 		( $AR $ARFLAGS libconftest.a conftest.$OBJEXT ) 2>&5 1>/dev/null
+ 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
+@@ -29180,10 +29135,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 29183 "configure"
++#line 29138 "configure"
+ #include "confdefs.h"
+ 
+-#line 29186 "configure"
++#line 29141 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -29198,16 +29153,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:29201: \"$ac_link\"") >&5
++if { (eval echo "$as_me:29156: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:29204: \$? = $ac_status" >&5
++  echo "$as_me:29159: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:29207: \"$ac_try\"") >&5
++  { (eval echo "$as_me:29162: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:29210: \$? = $ac_status" >&5
++  echo "$as_me:29165: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -29230,7 +29185,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:29233: result: $cf_ldflags_static" >&5
++	echo "$as_me:29188: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test "$cf_ldflags_static" != yes
+@@ -29246,7 +29201,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29249: checking where we will install curses.h" >&5
++echo "$as_me:29204: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -29256,7 +29211,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:29259: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:29214: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -29264,7 +29219,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:29267: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:29222: 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
+@@ -29289,7 +29244,7 @@
+ 
+ # pkgsrc uses these
+ 
+-echo "$as_me:29292: checking for desired basename for form library" >&5
++echo "$as_me:29247: 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.
+@@ -29309,10 +29264,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29312: result: $FORM_NAME" >&5
++echo "$as_me:29267: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:29315: checking for desired basename for menu library" >&5
++echo "$as_me:29270: 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.
+@@ -29332,10 +29287,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29335: result: $MENU_NAME" >&5
++echo "$as_me:29290: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:29338: checking for desired basename for panel library" >&5
++echo "$as_me:29293: 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.
+@@ -29355,10 +29310,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29358: result: $PANEL_NAME" >&5
++echo "$as_me:29313: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:29361: checking for desired basename for cxx library" >&5
++echo "$as_me:29316: 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.
+@@ -29378,13 +29333,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:29381: result: $CXX_NAME" >&5
++echo "$as_me:29336: 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:29387: checking for src modules" >&5
++echo "$as_me:29342: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -29443,7 +29398,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:29446: result: $cf_cv_src_modules" >&5
++echo "$as_me:29401: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -29574,6 +29529,22 @@
+ 	HAVE_TERMIOS_H=0
+ fi
+ 
++case "x${ac_cv_header_termios_h}${ac_cv_header_termio_h}${ac_cv_header_sgtty_h}${cf_cv_have_tcgetattr}" in
++(*yes*)
++	;;
++(*)
++	case "$cf_cv_system_name" in
++	(*mingw32*|*mingw64*|*-msvc*)
++		;;
++	(*)
++		{ { echo "$as_me:29540: error: No termio/termios/sgtty found" >&5
++echo "$as_me: error: No termio/termios/sgtty found" >&2;}
++   { (exit 1); exit 1; }; }
++		;;
++	esac
++	;;
++esac
++
+ ################################################################################
+ test "x$use_database" = xyes && \
+ SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in"
+@@ -29610,7 +29581,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:29613: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:29584: 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//'`
+@@ -29621,7 +29592,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:29624: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
++echo "$as_me:29595: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -29637,7 +29608,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:29640: result: $PKG_CFLAGS" >&5
++echo "$as_me:29611: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ case "$cf_cv_system_name" in
+@@ -29709,7 +29680,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_default" 1>&6
+ 
+-echo "${as_me:-configure}:29712: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
++echo "${as_me:-configure}:29683: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5
+ 
+ fi
+ 
+@@ -29736,7 +29707,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:29739: checking for linker search path" >&5
++echo "$as_me:29710: 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
+@@ -29784,7 +29755,7 @@
+ 			cf_pathlist="$cf_pathlist /lib /usr/lib"
+ 			;;
+ 		(*)
+-			{ echo "$as_me:29787: WARNING: problem with Solaris architecture" >&5
++			{ echo "$as_me:29758: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ 			;;
+ 		esac
+@@ -29825,7 +29796,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:29828: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29799: 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'`
+@@ -29911,7 +29882,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29914: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29885: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -30092,7 +30063,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:30095: error: ambiguous option: $1
++    { { echo "$as_me:30066: 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;}
+@@ -30111,7 +30082,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:30114: error: unrecognized option: $1
++  -*) { { echo "$as_me:30085: 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;}
+@@ -30243,7 +30214,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:30246: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:30217: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -30401,7 +30372,6 @@
+ s,@ETAGS@,$ETAGS,;t t
+ s,@MAKE_LOWER_TAGS@,$MAKE_LOWER_TAGS,;t t
+ s,@MAKE_UPPER_TAGS@,$MAKE_UPPER_TAGS,;t t
+-s,@cf_cv_makeflags@,$cf_cv_makeflags,;t t
+ s,@RANLIB@,$RANLIB,;t t
+ s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+ s,@LD@,$LD,;t t
+@@ -30774,7 +30744,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:30777: creating $ac_file" >&5
++    { echo "$as_me:30747: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -30792,7 +30762,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30795: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30765: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo "$f";;
+@@ -30805,7 +30775,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30808: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30778: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30821,7 +30791,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:30824: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:30794: 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;}
+@@ -30830,7 +30800,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:30833: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:30803: 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;}
+@@ -30875,7 +30845,7 @@
+             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
+-              { echo "$as_me:30878: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:30848: 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;}
+@@ -30886,7 +30856,7 @@
+     $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:30889: WARNING: Some variables may not be substituted:
++      { echo "$as_me:30859: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30935,7 +30905,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:30938: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:30908: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -30946,7 +30916,7 @@
+       -) echo "$tmp"/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30949: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30919: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -30959,7 +30929,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30962: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30932: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -31017,7 +30987,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:31020: $ac_file is unchanged" >&5
++      { echo "$as_me:30990: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -31404,7 +31374,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}:31407: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:31377: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: configure.in
+Prereq:  1.799 
+--- ncurses-6.5-20250712+/configure.in	2025-07-12 16:43:47.000000000 +0000
++++ ncurses-6.5-20250720/configure.in	2025-07-19 16:53:38.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.799 2025/07/12 16:43:47 tom Exp $
++dnl $Id: configure.in,v 1.801 2025/07/19 16:53:38 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.799 $)
++AC_REVISION($Revision: 1.801 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -256,7 +256,6 @@
+ AC_PROG_MAKE_SET
+ CF_MAKE_PHONY
+ CF_MAKE_TAGS
+-CF_MAKEFLAGS
+ 
+ dnl These are standard among *NIX systems, but not when cross-compiling
+ AC_CHECK_TOOL(RANLIB, ranlib, ':')
+@@ -2378,6 +2377,20 @@
+ CF_SUBST_IF(["x$ac_cv_header_termio_h" = xyes],  HAVE_TERMIO_H,  1, 0)
+ CF_SUBST_IF(["x$ac_cv_header_termios_h" = xyes], HAVE_TERMIOS_H, 1, 0)
+ 
++case "x${ac_cv_header_termios_h}${ac_cv_header_termio_h}${ac_cv_header_sgtty_h}${cf_cv_have_tcgetattr}" in
++(*yes*)
++	;;
++(*)
++	case "$cf_cv_system_name" in
++	(*mingw32*|*mingw64*|*-msvc*)
++		;;
++	(*)
++		AC_MSG_ERROR(No termio/termios/sgtty found)
++		;;
++	esac
++	;;
++esac
++
+ ################################################################################
+ test "x$use_database" = xyes && \
+ SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in"
+Index: dist.mk
+Prereq:  1.1677 
+--- ncurses-6.5-20250712+/dist.mk	2025-07-12 09:16:32.000000000 +0000
++++ ncurses-6.5-20250720/dist.mk	2025-07-20 09:03:59.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1677 2025/07/12 09:16:32 tom Exp $
++# $Id: dist.mk,v 1.1679 2025/07/20 09:03:59 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 = 5
+-NCURSES_PATCH = 20250712
++NCURSES_PATCH = 20250720
+ 
+ # 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.18 
+--- ncurses-6.5-20250712+/doc/html/Ada95.html	2022-03-05 16:09:29.000000000 +0000
++++ ncurses-6.5-20250720/doc/html/Ada95.html	2025-07-13 09:08:38.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
                                                                                                    Revision
+             History
+@@ -37,6 +51,18 @@
+           
                                                                                                    Revision 2.12024-09-08Revised by: dickey
                                                                                                    Fixes for the sample
++            programs. Remove obsolete mailing addresses. Update
++            publication date.
                                                                                                    Revision 2.02022-12-03Revised by: dickey